From dd901eae47dee9305cff3330d28f79f0fbc3e9f8 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 19 Feb 2010 14:10:54 +0100
Subject: Introduced the internal virtual method
 QmlView::setRootObject(object).

Done-with: mae
---
 src/declarative/util/qmlview.cpp | 96 ++++++++++++++++++++++------------------
 src/declarative/util/qmlview.h   |  3 +-
 2 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index 4a6d697..a906554 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -429,52 +429,60 @@ void QmlView::continueExecute()
         return;
     }
 
-    if (obj) {
-        if (QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(obj)) {
-
-            d->scene.addItem(item);
-
-            QPerformanceLog::displayData();
-            QPerformanceLog::clear();
-            d->root = item;
-            d->qmlRoot = item;
-            connect(item, SIGNAL(widthChanged()), this, SLOT(sizeChanged()));
-            connect(item, SIGNAL(heightChanged()), this, SLOT(sizeChanged()));
-            if (d->initialSize.height() <= 0 && d->qmlRoot->width() > 0)
-                d->initialSize.setWidth(d->qmlRoot->width());
-            if (d->initialSize.height() <= 0 && d->qmlRoot->height() > 0)
-                d->initialSize.setHeight(d->qmlRoot->height());
-            resize(d->initialSize);
-
-            if (d->resizeMode == SizeRootObjectToView) {
-                d->qmlRoot->setWidth(width());
-                d->qmlRoot->setHeight(height());
-            } else {
-                QSize sz(d->qmlRoot->width(),d->qmlRoot->height());
-                emit sceneResized(sz);
-                resize(sz);
-            }
-            updateGeometry();
-        } else if (QGraphicsObject *item = qobject_cast<QGraphicsObject *>(obj)) {
-            d->scene.addItem(item);
-            qWarning() << "QmlView::resizeMode is not honored for components of type QGraphicsObject";
-        } else if (QWidget *wid = qobject_cast<QWidget *>(obj)) {
-            window()->setAttribute(Qt::WA_OpaquePaintEvent, false);
-            window()->setAttribute(Qt::WA_NoSystemBackground, false);
-            if (!layout()) {
-                setLayout(new QVBoxLayout);
-                layout()->setContentsMargins(0, 0, 0, 0);
-            } else if (layout()->count()) {
-                // Hide the QGraphicsView in GV mode.
-                QLayoutItem *item = layout()->itemAt(0);
-                if (item->widget())
-                    item->widget()->hide();
-            }
-            layout()->addWidget(wid);
-            emit sceneResized(wid->size());
+    setRootObject(obj);
+    emit statusChanged(status());
+}
+
+
+/*!
+  \internal
+*/
+void QmlView::setRootObject(QObject *obj)
+{
+    Q_D(QmlView);
+
+    if (QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(obj)) {
+        d->scene.addItem(item);
+
+        QPerformanceLog::displayData();
+        QPerformanceLog::clear();
+        d->root = item;
+        d->qmlRoot = item;
+        connect(item, SIGNAL(widthChanged()), this, SLOT(sizeChanged()));
+        connect(item, SIGNAL(heightChanged()), this, SLOT(sizeChanged()));
+        if (d->initialSize.height() <= 0 && d->qmlRoot->width() > 0)
+            d->initialSize.setWidth(d->qmlRoot->width());
+        if (d->initialSize.height() <= 0 && d->qmlRoot->height() > 0)
+            d->initialSize.setHeight(d->qmlRoot->height());
+        resize(d->initialSize);
+
+        if (d->resizeMode == SizeRootObjectToView) {
+            d->qmlRoot->setWidth(width());
+            d->qmlRoot->setHeight(height());
+        } else {
+            QSize sz(d->qmlRoot->width(),d->qmlRoot->height());
+            emit sceneResized(sz);
+            resize(sz);
         }
+        updateGeometry();
+    } else if (QGraphicsObject *item = qobject_cast<QGraphicsObject *>(obj)) {
+        d->scene.addItem(item);
+        qWarning() << "QmlView::resizeMode is not honored for components of type QGraphicsObject";
+    } else if (QWidget *wid = qobject_cast<QWidget *>(obj)) {
+        window()->setAttribute(Qt::WA_OpaquePaintEvent, false);
+        window()->setAttribute(Qt::WA_NoSystemBackground, false);
+        if (!layout()) {
+            setLayout(new QVBoxLayout);
+            layout()->setContentsMargins(0, 0, 0, 0);
+        } else if (layout()->count()) {
+            // Hide the QGraphicsView in GV mode.
+            QLayoutItem *item = layout()->itemAt(0);
+            if (item->widget())
+                item->widget()->hide();
+        }
+        layout()->addWidget(wid);
+        emit sceneResized(wid->size());
     }
-    emit statusChanged(status());
 }
 
 /*!
diff --git a/src/declarative/util/qmlview.h b/src/declarative/util/qmlview.h
index 1c6d865..7c9a97b 100644
--- a/src/declarative/util/qmlview.h
+++ b/src/declarative/util/qmlview.h
@@ -102,7 +102,8 @@ private Q_SLOTS:
 protected:
     virtual void resizeEvent(QResizeEvent *);
     virtual void paintEvent(QPaintEvent *event);
-    void timerEvent(QTimerEvent*);
+    virtual void timerEvent(QTimerEvent*);
+    virtual void setRootObject(QObject *obj);
 };
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From 94164f66a6f3272e63b2fe12f63fba91d16ab0f0 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 19 Feb 2010 15:21:35 +0100
Subject: Introduced a new parser for qmldir files.

---
 src/declarative/qml/qml.pri          |   6 +-
 src/declarative/qml/qmldirparser.cpp | 209 +++++++++++++++++++++++++++++++++++
 src/declarative/qml/qmldirparser_p.h | 123 +++++++++++++++++++++
 src/declarative/qml/qmlengine.cpp    |  34 +++---
 4 files changed, 352 insertions(+), 20 deletions(-)
 create mode 100644 src/declarative/qml/qmldirparser.cpp
 create mode 100644 src/declarative/qml/qmldirparser_p.h

diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index a8df61e..5e0c3e0 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -51,7 +51,8 @@ SOURCES += \
     $$PWD/qmllistscriptclass.cpp \
     $$PWD/qmlworkerscript.cpp \
     $$PWD/qmlimageprovider.cpp \
-    $$PWD/qmlnetworkaccessmanagerfactory.cpp
+    $$PWD/qmlnetworkaccessmanagerfactory.cpp \
+    $$PWD/qmldirparser.cpp
 HEADERS += \
     $$PWD/qmlparser_p.h \
     $$PWD/qmlglobal_p.h \
@@ -119,7 +120,8 @@ HEADERS += \
     $$PWD/qmlscriptclass_p.h \
     $$PWD/qmlguard_p.h \
     $$PWD/qmlimageprovider.h \
-    $$PWD/qmlnetworkaccessmanagerfactory.h
+    $$PWD/qmlnetworkaccessmanagerfactory.h \
+    $$PWD/qmldirparser_p.h
 QT += sql
 include(parser/parser.pri)
 include(rewriter/rewriter.pri)
diff --git a/src/declarative/qml/qmldirparser.cpp b/src/declarative/qml/qmldirparser.cpp
new file mode 100644
index 0000000..c7de233
--- /dev/null
+++ b/src/declarative/qml/qmldirparser.cpp
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmldirparser_p.h"
+#include "qmlerror.h"
+
+#include <QtCore/QTextStream>
+#include <QtCore/QtDebug>
+
+QT_BEGIN_NAMESPACE
+
+QmlDirParser::QmlDirParser()
+{
+}
+
+QmlDirParser::~QmlDirParser()
+{
+}
+
+QUrl QmlDirParser::url() const
+{
+    return _url;
+}
+
+void QmlDirParser::setUrl(const QUrl &url)
+{
+    _url = url;
+}
+
+QString QmlDirParser::source() const
+{
+    return _source;
+}
+
+void QmlDirParser::setSource(const QString &source)
+{
+    _source = source;
+}
+
+bool QmlDirParser::parse()
+{
+    _errors.clear();
+    _plugins.clear();
+    _components.clear();
+
+    QTextStream stream(&_source);
+    int lineNumber = 0;
+
+    forever {
+        ++lineNumber;
+
+        const QString line = stream.readLine();
+        if (line.isNull())
+            break;
+
+        QString sections[3];
+        int sectionCount = 0;
+
+        int index = 0;
+        const int length = line.length();
+
+        while (index != length) {
+            const QChar ch = line.at(index);
+
+            if (ch.isSpace()) {
+                do { ++index; }
+                while (index != length && line.at(index).isSpace());
+
+            } else if (ch == QLatin1Char('#')) {
+                // recognized a comment
+                break;
+
+            } else {
+                const int start = index;
+
+                do { ++index; }
+                while (index != length && !line.at(index).isSpace());
+
+                const QString lexeme = line.mid(start, index - start);
+
+                if (sectionCount >= 3) {
+                    reportError(lineNumber, start, QLatin1String("unexpected token"));
+
+                } else {
+                    sections[sectionCount++] = lexeme;
+                }
+            }
+        }
+
+        if (sectionCount == 0) {
+            continue; // no sections, no party.
+
+        } else if (sections[0] == QLatin1String("plugin")) {
+            if (sectionCount < 2) {
+                reportError(lineNumber, -1,
+                            QString::fromUtf8("plugin directive requires 2 arguments, but %1 were provided").arg(sectionCount + 1));
+
+                continue;
+            }
+
+            const Plugin entry(sections[1], sections[2]);
+
+            _plugins.append(entry);
+
+        } else if (sectionCount == 3) {
+            const QString &version = sections[1];
+            const int dotIndex = version.indexOf(QLatin1Char('.'));
+
+            if (dotIndex == -1) {
+                qWarning() << "expected '.'"; // ### use reportError
+
+            } else if (version.indexOf(QLatin1Char('.'), dotIndex + 1) != -1) {
+                qWarning() << "unexpected '.'"; // ### use reportError
+
+            } else {
+                bool validVersionNumber = false;
+                const int majorVersion = version.left(dotIndex).toInt(&validVersionNumber);
+
+                if (validVersionNumber) {
+                    const int minorVersion = version.mid(dotIndex + 1).toInt(&validVersionNumber);
+
+                    if (validVersionNumber) {
+                        const Component entry(sections[0], sections[2], majorVersion, minorVersion);
+
+                        _components.append(entry);
+                    }
+                }
+            }
+        } else {
+             // ### use reportError
+            qWarning() << "a component declaration requires 3 arguments, but" << (sectionCount + 1) << "were provided";
+        }
+    }
+
+    return hasError();
+}
+
+void QmlDirParser::reportError(int line, int column, const QString &description)
+{
+    QmlError error;
+    error.setUrl(_url);
+    error.setLine(line);
+    error.setColumn(column);
+    error.setDescription(description);
+    _errors.append(error);
+}
+
+bool QmlDirParser::hasError() const
+{
+    if (! _errors.isEmpty())
+        return true;
+
+    return false;
+}
+
+QList<QmlError> QmlDirParser::errors() const
+{
+    return _errors;
+}
+
+QList<QmlDirParser::Plugin> QmlDirParser::plugins() const
+{
+    return _plugins;
+}
+
+QList<QmlDirParser::Component> QmlDirParser::components() const
+{
+    return _components;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmldirparser_p.h b/src/declarative/qml/qmldirparser_p.h
new file mode 100644
index 0000000..ff8b0f8
--- /dev/null
+++ b/src/declarative/qml/qmldirparser_p.h
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLDIRPARSER_P_H
+#define QMLDIRPARSER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/QUrl>
+#include <QtCore/QHash>
+
+QT_BEGIN_NAMESPACE
+
+class QmlError;
+
+class QmlDirParser
+{
+    Q_DISABLE_COPY(QmlDirParser)
+
+public:
+    QmlDirParser();
+    ~QmlDirParser();
+
+    QUrl url() const;
+    void setUrl(const QUrl &url);
+
+    QString source() const;
+    void setSource(const QString &source);
+
+    bool parse();
+
+    bool hasError() const;
+    QList<QmlError> errors() const;
+
+    struct Plugin
+    {
+        Plugin() {}
+
+        Plugin(const QString &name, const QString &path)
+            : name(name), path(path) {}
+
+        QString name;
+        QString path;
+    };
+
+    struct Component
+    {
+        Component()
+            : majorVersion(0), minorVersion(0) {}
+
+        Component(const QString &typeName, const QString &fileName, int majorVersion, int minorVersion)
+            : typeName(typeName), fileName(fileName), majorVersion(majorVersion), minorVersion(minorVersion) {}
+
+        QString typeName;
+        QString fileName;
+        int majorVersion;
+        int minorVersion;
+    };
+
+    QList<Component> components() const;
+    QList<Plugin> plugins() const;
+
+private:
+    void reportError(int line, int column, const QString &message);
+
+private:
+    QList<QmlError> _errors;
+    QUrl _url;
+    QString _source;
+    QList<Component> _components;
+    QList<Plugin> _plugins;
+};
+
+QT_END_NAMESPACE
+
+#endif // QMLDIRPARSER_P_H
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index cf26f58..6f26a07 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -66,6 +66,7 @@
 #include "qmlscriptclass_p.h"
 #include "qmlnetworkaccessmanagerfactory.h"
 #include "qmlimageprovider.h"
+#include "qmldirparser_p.h"
 
 #include <qfxperf_p_p.h>
 
@@ -1262,24 +1263,21 @@ struct QmlEnginePrivate::ImportedNamespace {
                         qmldircontent = QString::fromUtf8(qmldir.readAll());
                     }
                 }
-                QString typespace = QString::fromUtf8(type)+QLatin1Char(' ');
-                QStringList lines = qmldircontent.split(QLatin1Char('\n'));
-                foreach (QString line, lines) {
-                    if (line.isEmpty() || line.at(0) == QLatin1Char('#'))
-                        continue;
-                    if (line.startsWith(typespace)) {
-                        int space1 = line.indexOf(QLatin1Char(' '));
-                        int space2 = space1 >=0 ? line.indexOf(QLatin1Char(' '),space1+1) : -1;
-                        QString mapversions = line.mid(space1+1,space2<0?line.length()-space1-1:space2-space1-1);
-                        int dot = mapversions.indexOf(QLatin1Char('.'));
-                        int mapvmaj = mapversions.left(dot).toInt();
-                        if (mapvmaj<=vmaj) {
-                            if (mapvmaj<vmaj || vmin >= mapversions.mid(dot+1).toInt()) {
-                                QStringRef mapfile = space2<0 ? QStringRef() : line.midRef(space2+1,line.length()-space2-1);
-                                if (url_return)
-                                    *url_return = url.resolved(QUrl(mapfile.toString()));
-                                return true;
-                            }
+
+                const QString typespace = QString::fromUtf8(type);
+
+                QmlDirParser qmldirParser;
+                qmldirParser.setUrl(url);
+                qmldirParser.setSource(qmldircontent);
+                qmldirParser.parse();
+
+                foreach (const QmlDirParser::Component &c, qmldirParser.components()) { // ### TODO: cache the components
+                    if (c.majorVersion < vmaj || (c.majorVersion == vmaj && vmin >= c.minorVersion)) {
+                        if (c.typeName == typespace) {
+                            if (url_return)
+                                *url_return = url.resolved(QUrl(c.fileName));
+
+                            return true;
                         }
                     }
                 }
-- 
cgit v0.12


From af9bee69a9d902cffb4b590012cba79328fd2a1b Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 19 Feb 2010 15:29:33 +0100
Subject: Added QmlExtensionPlugin and QmlExtensionInterface.

---
 src/declarative/qml/qml.pri                 |  9 +++++++--
 src/declarative/qml/qmlextensioninterface.h | 25 +++++++++++++++++++++++
 src/declarative/qml/qmlextensionplugin.cpp  | 12 +++++++++++
 src/declarative/qml/qmlextensionplugin.h    | 31 +++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 src/declarative/qml/qmlextensioninterface.h
 create mode 100644 src/declarative/qml/qmlextensionplugin.cpp
 create mode 100644 src/declarative/qml/qmlextensionplugin.h

diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 5e0c3e0..6c74863 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -52,7 +52,9 @@ SOURCES += \
     $$PWD/qmlworkerscript.cpp \
     $$PWD/qmlimageprovider.cpp \
     $$PWD/qmlnetworkaccessmanagerfactory.cpp \
-    $$PWD/qmldirparser.cpp
+    $$PWD/qmldirparser.cpp \
+    $$PWD/qmlextensionplugin.cpp
+
 HEADERS += \
     $$PWD/qmlparser_p.h \
     $$PWD/qmlglobal_p.h \
@@ -121,7 +123,10 @@ HEADERS += \
     $$PWD/qmlguard_p.h \
     $$PWD/qmlimageprovider.h \
     $$PWD/qmlnetworkaccessmanagerfactory.h \
-    $$PWD/qmldirparser_p.h
+    $$PWD/qmldirparser_p.h \
+    $$PWD/qmlextensioninterface.h \
+    $$PWD/qmlextensionplugin.h
+
 QT += sql
 include(parser/parser.pri)
 include(rewriter/rewriter.pri)
diff --git a/src/declarative/qml/qmlextensioninterface.h b/src/declarative/qml/qmlextensioninterface.h
new file mode 100644
index 0000000..d336e6e
--- /dev/null
+++ b/src/declarative/qml/qmlextensioninterface.h
@@ -0,0 +1,25 @@
+#ifndef QMLEXTENSIONINTERFACE_H
+#define QMLEXTENSIONINTERFACE_H
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QmlEngine;
+
+struct Q_DECLARATIVE_EXPORT QmlExtensionInterface
+{
+    virtual void initialize(QmlEngine *engine) = 0;
+};
+
+Q_DECLARE_INTERFACE(QmlExtensionInterface, "com.trolltech.Qt.QmlExtensionInterface/1.0")
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QMLEXTENSIONINTERFACE_H
diff --git a/src/declarative/qml/qmlextensionplugin.cpp b/src/declarative/qml/qmlextensionplugin.cpp
new file mode 100644
index 0000000..15ad44e
--- /dev/null
+++ b/src/declarative/qml/qmlextensionplugin.cpp
@@ -0,0 +1,12 @@
+
+#include "qmlextensionplugin.h"
+
+QmlExtensionPlugin::QmlExtensionPlugin(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QmlExtensionPlugin::~QmlExtensionPlugin()
+{
+}
+
diff --git a/src/declarative/qml/qmlextensionplugin.h b/src/declarative/qml/qmlextensionplugin.h
new file mode 100644
index 0000000..8f3194f
--- /dev/null
+++ b/src/declarative/qml/qmlextensionplugin.h
@@ -0,0 +1,31 @@
+#ifndef QMLEXTENSIONPLUGIN_H
+#define QMLEXTENSIONPLUGIN_H
+
+#include <QtCore/qplugin.h>
+
+#include "qmlextensioninterface.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QmlEngine;
+
+class Q_DECLARATIVE_EXPORT QmlExtensionPlugin : public QObject, public QmlExtensionInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QmlExtensionInterface)
+public:
+    explicit QmlExtensionPlugin(QObject *parent = 0);
+    ~QmlExtensionPlugin();
+
+    virtual void initialize(QmlEngine *engine) = 0;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QMLEXTENSIONPLUGIN_H
-- 
cgit v0.12


From 3731e214baeb44434f12f773b1c68e772f25323e Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 19 Feb 2010 18:16:36 +0100
Subject: Get rid of the unfriendly ImportedNamespace::isBuiltin flag.

The `isBuiltin' flag doesn't play nice with hybrid apps where the types
in a namespace are provided by both C++ and QML code.

Done-with: mae
---
 src/declarative/qml/qmlengine.cpp | 43 +++++++++++++++------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 6f26a07..7a60f9c 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1227,7 +1227,6 @@ struct QmlEnginePrivate::ImportedNamespace {
     QList<int> majversions;
     QList<int> minversions;
     QList<bool> isLibrary;
-    QList<bool> isBuiltin; // Types provided by C++ code (including plugins)
     QList<QString> qmlDirContent;
 
     bool find(const QByteArray& type, int *vmajor, int *vminor, QmlType** type_return, QUrl* url_return) const
@@ -1236,23 +1235,22 @@ struct QmlEnginePrivate::ImportedNamespace {
             int vmaj = majversions.at(i);
             int vmin = minversions.at(i);
 
-            if (isBuiltin.at(i)) {
-                QByteArray qt = uris.at(i).toUtf8();
-                qt += '/';
-                qt += type;
+            QByteArray qt = uris.at(i).toUtf8();
+            qt += '/';
+            qt += type;
+            if (qmlImportTrace())
+                qDebug() << "Look in" << qt;
+            QmlType *t = QmlMetaType::qmlType(qt,vmaj,vmin);
+            if (vmajor) *vmajor = vmaj;
+            if (vminor) *vminor = vmin;
+            if (t) {
                 if (qmlImportTrace())
-                    qDebug() << "Look in" << qt;
-                QmlType *t = QmlMetaType::qmlType(qt,vmaj,vmin);
-                if (vmajor) *vmajor = vmaj;
-                if (vminor) *vminor = vmin;
-                if (t) {
-                    if (qmlImportTrace())
-                        qDebug() << "Found" << qt;
-                    if (type_return)
-                        *type_return = t;
-                    return true;
-                }
+                    qDebug() << "Found" << qt;
+                if (type_return)
+                    *type_return = t;
+                return true;
             }
+
             QUrl url = QUrl(urls.at(i) + QLatin1Char('/') + QString::fromUtf8(type) + QLatin1String(".qml"));
             QString qmldircontent = qmlDirContent.at(i);
             if (vmaj>=0 || !qmldircontent.isEmpty()) {
@@ -1321,7 +1319,6 @@ public:
                 set.insert(prefix,(s=new QmlEnginePrivate::ImportedNamespace));
         }
         QString url = uri;
-        bool isbuiltin = false;
         if (importType == QmlScriptParser::Import::Library) {
             url.replace(QLatin1Char('.'),QLatin1Char('/'));
             bool found = false;
@@ -1334,16 +1331,11 @@ public:
                     break;
                 }
             }
-            if (!found) {
-                // XXX assume it is a built-in type qualifier
-                isbuiltin = true;
-            }
             QFactoryLoader *l = loader();
             QmlModuleFactoryInterface *factory =
                 qobject_cast<QmlModuleFactoryInterface*>(l->instance(uri));
             if (factory) {
                 factory->defineModuleOnce(uri);
-                isbuiltin = true;
             }
         } else {
             url = base.resolved(QUrl(url)).toString();
@@ -1353,7 +1345,6 @@ public:
         s->majversions.prepend(vmaj);
         s->minversions.prepend(vmin);
         s->isLibrary.prepend(importType == QmlScriptParser::Import::Library);
-        s->isBuiltin.prepend(isbuiltin);
         s->qmlDirContent.prepend(qmldircontent);
         return true;
     }
@@ -1376,10 +1367,11 @@ public:
         if (s) {
             if (s->find(unqualifiedtype,vmajor,vminor,type_return,url_return))
                 return true;
-            if (s->urls.count() == 1 && !s->isBuiltin[0] && !s->isLibrary[0] && url_return) {
+            if (s->urls.count() == 1 && !s->isLibrary[0] && url_return) {
                 *url_return = QUrl(s->urls[0]+QLatin1Char('/')).resolved(QUrl(QString::fromUtf8(unqualifiedtype) + QLatin1String(".qml")));
                 return true;
             }
+
         }
         if (url_return) {
             *url_return = base.resolved(QUrl(QString::fromUtf8(type + ".qml")));
@@ -1440,9 +1432,6 @@ static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePri
     QList<QmlType *> types = QmlMetaType::qmlTypes();
 
     for (int ii = 0; ii < set.uris.count(); ++ii) {
-        if (!set.isBuiltin.at(ii))
-            continue;
-
         QByteArray base = set.uris.at(ii).toUtf8() + '/';
         int major = set.majversions.at(ii);
         int minor = set.minversions.at(ii);
-- 
cgit v0.12


From 80fc5bf17e5f049a395d6a5612843c69c5b0fde1 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 22 Feb 2010 12:21:06 +0100
Subject: Introduced QmlEngine::importExtension.

importExtension can be used to import QmlExtensionInterface(s) into a QmlEngine.
---
 src/declarative/qml/qmlengine.cpp | 21 ++++++++++++++++++++-
 src/declarative/qml/qmlengine.h   |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 7a60f9c..1f5caa5 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -67,7 +67,7 @@
 #include "qmlnetworkaccessmanagerfactory.h"
 #include "qmlimageprovider.h"
 #include "qmldirparser_p.h"
-
+#include "qmlextensioninterface.h"
 #include <qfxperf_p_p.h>
 
 #include <QtCore/qmetaobject.h>
@@ -82,6 +82,7 @@
 #include <QDebug>
 #include <QMetaObject>
 #include <QStack>
+#include <QPluginLoader>
 #include <QtCore/qlibraryinfo.h>
 #include <QtCore/qthreadstorage.h>
 #include <QtCore/qthread.h>
@@ -1530,6 +1531,24 @@ void QmlEngine::addImportPath(const QString& path)
 }
 
 /*!
+  Imports the given \a extension into this QmlEngine.  Returns
+  true if the extension was successfully imported.
+
+  \sa QmlExtensionInterface
+*/
+bool QmlEngine::importExtension(const QString &fileName)
+{
+    QPluginLoader loader(fileName);
+
+    if (QmlExtensionInterface *iface = qobject_cast<QmlExtensionInterface *>(loader.instance())) {
+        iface->initialize(this);
+        return true;
+    }
+
+    return false;
+}
+
+/*!
   \property QmlEngine::offlineStoragePath
   \brief the directory for storing offline user data
 
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index 64d0b9d..13a67b0 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -78,6 +78,7 @@ public:
     void clearComponentCache();
 
     void addImportPath(const QString& dir);
+    bool importExtension(const QString &fileName);
 
     void setNetworkAccessManagerFactory(QmlNetworkAccessManagerFactory *);
     QmlNetworkAccessManagerFactory *networkAccessManagerFactory() const;
-- 
cgit v0.12


From e271f9c64f1be3a3608d2010a3561d512650f547 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 22 Feb 2010 13:52:46 +0100
Subject: Compile.

---
 src/declarative/util/qmlview.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index e990e83..8844430 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -427,8 +427,6 @@ void QmlView::continueExecute()
 */
 void QmlView::setRootObject(QObject *obj)
 {
-    Q_D(QmlView);
-
     if (QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(obj)) {
         d->scene.addItem(item);
 
-- 
cgit v0.12


From cdeb85498e4cbd37022ba2bf4dc594db2326d0a4 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 22 Feb 2010 14:02:08 +0100
Subject: Document the QmlExtensionPlugin interface.

---
 src/declarative/qml/qmlextensioninterface.h | 41 ++++++++++++++++
 src/declarative/qml/qmlextensionplugin.cpp  | 75 +++++++++++++++++++++++++++++
 src/declarative/qml/qmlextensionplugin.h    | 41 ++++++++++++++++
 3 files changed, 157 insertions(+)

diff --git a/src/declarative/qml/qmlextensioninterface.h b/src/declarative/qml/qmlextensioninterface.h
index d336e6e..d37a5bc 100644
--- a/src/declarative/qml/qmlextensioninterface.h
+++ b/src/declarative/qml/qmlextensioninterface.h
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #ifndef QMLEXTENSIONINTERFACE_H
 #define QMLEXTENSIONINTERFACE_H
 
diff --git a/src/declarative/qml/qmlextensionplugin.cpp b/src/declarative/qml/qmlextensionplugin.cpp
index 15ad44e..c1195d2 100644
--- a/src/declarative/qml/qmlextensionplugin.cpp
+++ b/src/declarative/qml/qmlextensionplugin.cpp
@@ -1,6 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 
 #include "qmlextensionplugin.h"
 
+QT_BEGIN_NAMESPACE
+
+/*!
+    \since 4.7
+    \class QmlExtensionPlugin
+    \brief The QmlExtensionPlugin class provides an abstract base for custom QML extension plugins.
+
+    \ingroup plugins
+
+    QmlExtensionPlugin is a plugin interface that makes it
+    possible to offer extensions that can be loaded dynamically into
+    applications using the QmlEngine class.
+
+    Writing a QML extension plugin is achieved by subclassing this
+    base class, reimplementing the pure virtual initialize()
+    function, and exporting the class using the Q_EXPORT_PLUGIN2()
+    macro. See \l {How to Create Qt Plugins} for details.
+
+    \sa QmlEngine::importExtension()
+*/
+
+/*!
+    \fn void QmlExtensionPlugin::initialize(QmlEngine *engine)
+
+    Initializes the extension specified in the given \a engine.
+*/
+
+/*!
+    Constructs a QML extension plugin with the given \a parent.
+
+    Note that this constructor is invoked automatically by the
+    Q_EXPORT_PLUGIN2() macro, so there is no need for calling it
+    explicitly.
+*/
 QmlExtensionPlugin::QmlExtensionPlugin(QObject *parent)
     : QObject(parent)
 {
@@ -10,3 +84,4 @@ QmlExtensionPlugin::~QmlExtensionPlugin()
 {
 }
 
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlextensionplugin.h b/src/declarative/qml/qmlextensionplugin.h
index 8f3194f..eda7d0c 100644
--- a/src/declarative/qml/qmlextensionplugin.h
+++ b/src/declarative/qml/qmlextensionplugin.h
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #ifndef QMLEXTENSIONPLUGIN_H
 #define QMLEXTENSIONPLUGIN_H
 
-- 
cgit v0.12


From 20fc9f2e264f34dd8580949ddbe5511b78ab0ac4 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 22 Feb 2010 15:54:36 +0100
Subject: Load QML extensions.

This allows projects which use the QtDeclarative module to register QML
types and functions through C++ extensions.

Reviewed-by: mae
---
 src/declarative/qml/qmldirparser.cpp        | 11 +++++
 src/declarative/qml/qmldirparser_p.h        |  2 +
 src/declarative/qml/qmlengine.cpp           | 67 +++++++++++++++++++----------
 src/declarative/qml/qmlengine.h             |  2 +-
 src/declarative/qml/qmlengine_p.h           |  1 +
 src/declarative/qml/qmlextensioninterface.h |  2 +-
 src/declarative/qml/qmlextensionplugin.h    |  2 +-
 7 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/src/declarative/qml/qmldirparser.cpp b/src/declarative/qml/qmldirparser.cpp
index c7de233..60beb72 100644
--- a/src/declarative/qml/qmldirparser.cpp
+++ b/src/declarative/qml/qmldirparser.cpp
@@ -48,6 +48,7 @@
 QT_BEGIN_NAMESPACE
 
 QmlDirParser::QmlDirParser()
+    : _isParsed(false)
 {
 }
 
@@ -72,11 +73,21 @@ QString QmlDirParser::source() const
 
 void QmlDirParser::setSource(const QString &source)
 {
+    _isParsed = false;
     _source = source;
 }
 
+bool QmlDirParser::isParsed() const
+{
+    return _isParsed;
+}
+
 bool QmlDirParser::parse()
 {
+    if (_isParsed)
+        return true;
+
+    _isParsed = true;
     _errors.clear();
     _plugins.clear();
     _components.clear();
diff --git a/src/declarative/qml/qmldirparser_p.h b/src/declarative/qml/qmldirparser_p.h
index ff8b0f8..c58c03f 100644
--- a/src/declarative/qml/qmldirparser_p.h
+++ b/src/declarative/qml/qmldirparser_p.h
@@ -74,6 +74,7 @@ public:
     QString source() const;
     void setSource(const QString &source);
 
+    bool isParsed() const;
     bool parse();
 
     bool hasError() const;
@@ -116,6 +117,7 @@ private:
     QString _source;
     QList<Component> _components;
     QList<Plugin> _plugins;
+    unsigned _isParsed: 1;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index ce2a693..d47db9b 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -97,7 +97,6 @@
 #include <QGraphicsObject>
 #include <QtCore/qcryptographichash.h>
 
-#include <private/qfactoryloader_p.h>
 #include <private/qobject_p.h>
 #include <private/qscriptdeclarativeclass_p.h>
 
@@ -1249,12 +1248,13 @@ struct QmlEnginePrivate::ImportedNamespace {
             QByteArray qt = uris.at(i).toUtf8();
             qt += '/';
             qt += type;
+
             if (qmlImportTrace())
                 qDebug() << "Look in" << qt;
             QmlType *t = QmlMetaType::qmlType(qt,vmaj,vmin);
-            if (vmajor) *vmajor = vmaj;
-            if (vminor) *vminor = vmin;
             if (t) {
+                if (vmajor) *vmajor = vmaj;
+                if (vminor) *vminor = vmin;
                 if (qmlImportTrace())
                     qDebug() << "Found" << qt;
                 if (type_return)
@@ -1273,7 +1273,7 @@ struct QmlEnginePrivate::ImportedNamespace {
                     }
                 }
 
-                const QString typespace = QString::fromUtf8(type);
+                const QString typeName = QString::fromUtf8(type);
 
                 QmlDirParser qmldirParser;
                 qmldirParser.setUrl(url);
@@ -1282,7 +1282,7 @@ struct QmlEnginePrivate::ImportedNamespace {
 
                 foreach (const QmlDirParser::Component &c, qmldirParser.components()) { // ### TODO: cache the components
                     if (c.majorVersion < vmaj || (c.majorVersion == vmaj && vmin >= c.minorVersion)) {
-                        if (c.typeName == typespace) {
+                        if (c.typeName == typeName) {
                             if (url_return)
                                 *url_return = url.resolved(QUrl(c.fileName));
 
@@ -1290,6 +1290,7 @@ struct QmlEnginePrivate::ImportedNamespace {
                         }
                     }
                 }
+
             } else {
                 // XXX search non-files too! (eg. zip files, see QT-524)
                 QFileInfo f(toLocalFileOrQrc(url));
@@ -1304,9 +1305,6 @@ struct QmlEnginePrivate::ImportedNamespace {
     }
 };
 
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
-    (QmlModuleFactoryInterface_iid, QLatin1String("/qmlmodules")))
-
 class QmlImportsPrivate {
 public:
     QmlImportsPrivate() : ref(1)
@@ -1319,7 +1317,9 @@ public:
             delete s;
     }
 
-    bool add(const QUrl& base, const QString& qmldircontent, const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType, const QStringList& importPath)
+    QSet<QString> qmlDirFilesForWhichPluginsHaveBeenLoaded;
+
+    bool add(const QUrl& base, const QString& qmldircontent, const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType, const QStringList& importPath, QmlEngine *engine)
     {
         QmlEnginePrivate::ImportedNamespace *s;
         if (prefix.isEmpty()) {
@@ -1331,26 +1331,48 @@ public:
         }
         QString url = uri;
         if (importType == QmlScriptParser::Import::Library) {
-            url.replace(QLatin1Char('.'),QLatin1Char('/'));
+            url.replace(QLatin1Char('.'), QLatin1Char('/'));
             bool found = false;
-            foreach (QString p, importPath) {
-                QString dir = p+QLatin1Char('/')+url;
+            QString content;
+            QString dir;
+            QStringList paths = importPath;
+            paths.prepend(QFileInfo(base.toLocalFile()).path());
+            foreach (const QString &p, paths) {
+                dir = p+QLatin1Char('/')+url;
                 QFileInfo fi(dir+QLatin1String("/qmldir"));
+                const QString absoluteFilePath = fi.absoluteFilePath();
+
                 if (fi.isFile()) {
-                    url = QUrl::fromLocalFile(fi.absolutePath()).toString();
                     found = true;
+
+                    url = QUrl::fromLocalFile(fi.absolutePath()).toString();
+
+                    QFile file(absoluteFilePath);
+                    if (file.open(QFile::ReadOnly))
+                        content = QString::fromUtf8(file.readAll());
+
+                    if (! qmlDirFilesForWhichPluginsHaveBeenLoaded.contains(absoluteFilePath)) {
+                        qmlDirFilesForWhichPluginsHaveBeenLoaded.insert(absoluteFilePath);
+
+                        QmlDirParser qmldirParser;
+                        qmldirParser.setSource(content);
+                        qmldirParser.parse();
+
+                        foreach (const QmlDirParser::Plugin &plugin, qmldirParser.plugins()) {
+                            const QFileInfo pluginFileInfo(dir + QDir::separator() + plugin.path, plugin.name);
+                            const QString pluginFilePath = pluginFileInfo.absoluteFilePath();
+                            engine->importExtension(pluginFilePath, uri);
+                        }
+                    }
+
                     break;
                 }
             }
-            QFactoryLoader *l = loader();
-            QmlModuleFactoryInterface *factory =
-                qobject_cast<QmlModuleFactoryInterface*>(l->instance(uri));
-            if (factory) {
-                factory->defineModuleOnce(uri);
-            }
+
         } else {
             url = base.resolved(QUrl(url)).toString();
         }
+
         s->uris.prepend(uri);
         s->urls.prepend(url);
         s->majversions.prepend(vmaj);
@@ -1546,12 +1568,12 @@ void QmlEngine::addImportPath(const QString& path)
 
   \sa QmlExtensionInterface
 */
-bool QmlEngine::importExtension(const QString &fileName)
+bool QmlEngine::importExtension(const QString &fileName, const QString &uri)
 {
     QPluginLoader loader(fileName);
 
     if (QmlExtensionInterface *iface = qobject_cast<QmlExtensionInterface *>(loader.instance())) {
-        iface->initialize(this);
+        iface->initialize(this, uri);
         return true;
     }
 
@@ -1604,7 +1626,8 @@ QString QmlEngine::offlineStoragePath() const
 */
 bool QmlEnginePrivate::addToImport(Imports* imports, const QString& qmldircontent, const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType) const
 {
-    bool ok = imports->d->add(imports->d->base,qmldircontent,uri,prefix,vmaj,vmin,importType,fileImportPath);
+    QmlEngine *engine = QmlEnginePrivate::get(const_cast<QmlEnginePrivate *>(this));
+    bool ok = imports->d->add(imports->d->base,qmldircontent,uri,prefix,vmaj,vmin,importType,fileImportPath, engine);
     if (qmlImportTrace())
         qDebug() << "QmlEngine::addToImport(" << imports << uri << prefix << vmaj << '.' << vmin << (importType==QmlScriptParser::Import::Library? "Library" : "File") << ": " << ok;
     return ok;
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index 13a67b0..dd2012a 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -78,7 +78,7 @@ public:
     void clearComponentCache();
 
     void addImportPath(const QString& dir);
-    bool importExtension(const QString &fileName);
+    bool importExtension(const QString &fileName, const QString &uri);
 
     void setNetworkAccessManagerFactory(QmlNetworkAccessManagerFactory *);
     QmlNetworkAccessManagerFactory *networkAccessManagerFactory() const;
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 3fe7991..d916286 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -263,6 +263,7 @@ public:
         QmlImportsPrivate *d;
     };
 
+
     bool addToImport(Imports*, const QString& qmlDirContent,const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType) const;
     bool resolveType(const Imports&, const QByteArray& type,
                      QmlType** type_return, QUrl* url_return,
diff --git a/src/declarative/qml/qmlextensioninterface.h b/src/declarative/qml/qmlextensioninterface.h
index d37a5bc..cbdd34c 100644
--- a/src/declarative/qml/qmlextensioninterface.h
+++ b/src/declarative/qml/qmlextensioninterface.h
@@ -54,7 +54,7 @@ class QmlEngine;
 
 struct Q_DECLARATIVE_EXPORT QmlExtensionInterface
 {
-    virtual void initialize(QmlEngine *engine) = 0;
+    virtual void initialize(QmlEngine *engine, const QString &uri) = 0;
 };
 
 Q_DECLARE_INTERFACE(QmlExtensionInterface, "com.trolltech.Qt.QmlExtensionInterface/1.0")
diff --git a/src/declarative/qml/qmlextensionplugin.h b/src/declarative/qml/qmlextensionplugin.h
index eda7d0c..82553e7 100644
--- a/src/declarative/qml/qmlextensionplugin.h
+++ b/src/declarative/qml/qmlextensionplugin.h
@@ -62,7 +62,7 @@ public:
     explicit QmlExtensionPlugin(QObject *parent = 0);
     ~QmlExtensionPlugin();
 
-    virtual void initialize(QmlEngine *engine) = 0;
+    virtual void initialize(QmlEngine *engine, const QString &uri) = 0;
 };
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From a2c998ecdabda8635151d0dcd29ba69354ab20ec Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Tue, 23 Feb 2010 10:50:58 +1000
Subject: Test bug QTBUG-5974

---
 tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
index e70c7f1..8513a3b 100644
--- a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
+++ b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
@@ -249,6 +249,10 @@ void tst_QmlListModel::static_types_data()
     QTest::newRow("bool")
         << "ListElement { foo: true }"
         << QVariant(true);
+
+    QTest::newRow("enum")
+        << "ListElement { foo: Text.AlignHCenter }"
+        << QVariant("QTBUG-5974:ListElement: constant script support for property value");
 }
 
 void tst_QmlListModel::static_types()
@@ -262,6 +266,10 @@ void tst_QmlListModel::static_types()
     QmlComponent component(&engine);
     component.setData(qml.toUtf8(),
                       QUrl::fromLocalFile(QString("dummy.qml")));
+
+    if (value.toString().startsWith("QTBUG-"))
+        QEXPECT_FAIL("",value.toString().toLatin1(),Abort);
+
     QVERIFY(!component.isError());
 
     QmlListModel *obj = qobject_cast<QmlListModel*>(component.create());
@@ -301,7 +309,7 @@ void tst_QmlListModel::error_data()
 
     QTest::newRow("bindings not allowed in ListElement")
         << "import Qt 4.6\nRectangle { id: rect; ListModel { ListElement { foo: rect.color } } }"
-        << "ListElement: cannot use script for property value";
+        << "ListElement: cannot use script for property value"; // but note QTBUG-5974
 
     QTest::newRow("random object list properties allowed in ListElement")
         << "import Qt 4.6\nListModel { ListElement { foo: [ ListElement { bar: 123 } ] } }"
-- 
cgit v0.12


From d7c472e23b678b2898d34a37166e61402818e271 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Tue, 23 Feb 2010 11:35:38 +1000
Subject: run qmlmoduleplugin test

---
 tests/auto/declarative/declarative.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index b4a0d0f..45b5218 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -44,6 +44,7 @@ SUBDIRS += \
            qmllistmodel \           # Cover
            qmlmetaproperty \        # Cover
            qmlmetatype \            # Cover
+           qmlmoduleplugin \        # Cover
            qmlnumberformatter \     # Cover
            qmlpixmapcache \         # Cover
            qmlpropertymap \         # Cover
-- 
cgit v0.12


From ce78e4124d57a3c517e6de88696a09ad399c703f Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 23 Feb 2010 11:08:37 +1000
Subject: Add documentation on QMLs memory management assumptions

---
 doc/src/declarative/extending.qdoc | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 0456f3f..d3e6c14 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -375,6 +375,37 @@ object will only be returned if it has previously been created.
 \l {Extending QML - Attached Properties Example} shows the complete code used to
 implement the rsvp attached property.
 
+\section1 Memory Management and QVariant types
+
+It is an elements responsibility to ensure that it does not access or return
+pointers to invalid objects.  QML makes the following guarentees:
+
+\list
+\o An object assigned to an QObject (or QObject-derived) pointer property will be 
+valid at the time of assignment.  
+
+Following assignment, it is the responsibility of the class to subsequently guard 
+this pointer, either through a class specific method or the generic QPointer class.
+
+\o An object assigned to a QVariant will be valid at the time of assignment.  
+
+When assigning an object to a QVariant property, QML will always use a QMetaType::QObjectStar 
+typed QVariant.  It is the responsibility of the class to guard the pointer.  A 
+general rule when writing a class that uses QVariant properties is to check the 
+type of the QVariant when it is set and if the type is not handled by your class, 
+reset it to an invalid variant.
+
+\o An object assigned to a QObject (or QObject-derived) list property will be 
+valid at the time of assignment.  
+
+Following assignment, it is the responsibility of the class to subsequently guard 
+this pointer, either through a class specific method or the generic QPointer class.
+\endlist
+
+Elements should assume that any QML assigned object can be deleted at any time, and
+respond accordingly.  If documented as such an element need not continue to work in 
+this situation, but it must not crash.
+
 \section1 Signal Support
 
 \snippet examples/declarative/extending/signal/example.qml 0
-- 
cgit v0.12


From c41f7c7a4dbb2ac0c76e20628aaedeabec6f4497 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Mon, 22 Feb 2010 17:26:20 +1000
Subject: Better support modelData for object list models.

modelData will now correctly return the actual object.
---
 src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index b96f399..9216793 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -415,7 +415,7 @@ int QmlGraphicsVisualDataModelDataMetaObject::createProperty(const char *name, c
         if (model->m_listAccessor->type() == QmlListAccessor::ListProperty) {
             model->ensureRoles();
             QObject *object = model->m_listAccessor->at(data->m_index).value<QObject*>();
-            if (object && object->property(name).isValid())
+            if (object && (object->property(name).isValid() || qstrcmp(name,"modelData")==0))
                 return QmlOpenMetaObject::createProperty(name, type);
         }
     }
-- 
cgit v0.12


From 5955a7bd3bcef20558238e2de0c66fac9eccdf57 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 23 Feb 2010 12:41:24 +1000
Subject: Small QmlMetaProperty code cleanup

---
 src/declarative/qml/qmlmetaproperty.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 7c273dc..332d126 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -811,22 +811,22 @@ bool QmlMetaPropertyPrivate::write(QObject *object, const QmlPropertyCache::Data
         return writeEnumProperty(prop, coreIdx, object, v, flags);
     }
 
-    int t = property.propType;
-    int vt = value.userType();
+    int propertyType = property.propType;
+    int variantType = value.userType();
 
     QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(context);
 
-    if (t == QVariant::Url) {
+    if (propertyType == QVariant::Url) {
 
         QUrl u;
         bool found = false;
-        if (vt == QVariant::Url) {
+        if (variantType == QVariant::Url) {
             u = value.toUrl();
             found = true;
-        } else if (vt == QVariant::ByteArray) {
+        } else if (variantType == QVariant::ByteArray) {
             u = QUrl(QString::fromUtf8(value.toByteArray()));
             found = true;
-        } else if (vt == QVariant::String) {
+        } else if (variantType == QVariant::String) {
             u = QUrl(value.toString());
             found = true;
         }
@@ -840,12 +840,12 @@ bool QmlMetaPropertyPrivate::write(QObject *object, const QmlPropertyCache::Data
         void *argv[] = { &u, 0, &status, &flags };
         QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, argv);
 
-    } else if (vt == t) {
+    } else if (variantType == propertyType) {
 
         void *a[] = { (void *)value.constData(), 0, &status, &flags };
         QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
 
-    } else if (qMetaTypeId<QVariant>() == t) {
+    } else if (qMetaTypeId<QVariant>() == propertyType) {
 
         void *a[] = { (void *)&value, 0, &status, &flags };
         QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
@@ -858,7 +858,7 @@ bool QmlMetaPropertyPrivate::write(QObject *object, const QmlPropertyCache::Data
             return false;
 
         QObject *o = *(QObject **)value.constData();
-        const QMetaObject *propMo = rawMetaObjectForType(enginePriv, t);
+        const QMetaObject *propMo = rawMetaObjectForType(enginePriv, propertyType);
 
         if (o) valMo = o->metaObject();
 
@@ -914,25 +914,25 @@ bool QmlMetaPropertyPrivate::write(QObject *object, const QmlPropertyCache::Data
         }
 
     } else {
-        Q_ASSERT(vt != t);
+        Q_ASSERT(variantType != propertyType);
 
         QVariant v = value;
-        if (v.convert((QVariant::Type)t)) {
+        if (v.convert((QVariant::Type)propertyType)) {
             void *a[] = { (void *)v.constData(), 0, &status, &flags};
             QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-        } else if ((uint)t >= QVariant::UserType && vt == QVariant::String) {
-            QmlMetaType::StringConverter con = QmlMetaType::customStringConverter(t);
+        } else if ((uint)propertyType >= QVariant::UserType && variantType == QVariant::String) {
+            QmlMetaType::StringConverter con = QmlMetaType::customStringConverter(propertyType);
             if (!con)
                 return false;
 
             QVariant v = con(value.toString());
-            if (v.userType() == t) {
+            if (v.userType() == propertyType) {
                 void *a[] = { (void *)v.constData(), 0, &status, &flags};
                 QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
             }
-        } else if (vt == QVariant::String) {
+        } else if (variantType == QVariant::String) {
             bool ok = false;
-            QVariant v = QmlStringConverters::variantFromString(value.toString(), t, &ok);
+            QVariant v = QmlStringConverters::variantFromString(value.toString(), propertyType, &ok);
             if (!ok)
                 return false;
 
-- 
cgit v0.12


From 0bc70bc54e1e67468db1dd11ec4fad3a178768c3 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 23 Feb 2010 12:45:21 +1000
Subject: Rename qmllist autotest to qmllistreference

---
 tests/auto/declarative/declarative.pro             |   2 +-
 tests/auto/declarative/qmllist/data/MyType.qml     |   5 -
 .../auto/declarative/qmllist/data/engineTypes.qml  |   9 -
 .../declarative/qmllist/data/variantToList.qml     |  10 -
 tests/auto/declarative/qmllist/qmllist.pro         |   5 -
 tests/auto/declarative/qmllist/tst_qmllist.cpp     | 574 ---------------------
 .../declarative/qmllistreference/data/MyType.qml   |   5 +
 .../qmllistreference/data/engineTypes.qml          |   9 +
 .../qmllistreference/data/variantToList.qml        |  10 +
 .../qmllistreference/qmllistreference.pro          |   5 +
 .../qmllistreference/tst_qmllistreference.cpp      | 574 +++++++++++++++++++++
 11 files changed, 604 insertions(+), 604 deletions(-)
 delete mode 100644 tests/auto/declarative/qmllist/data/MyType.qml
 delete mode 100644 tests/auto/declarative/qmllist/data/engineTypes.qml
 delete mode 100644 tests/auto/declarative/qmllist/data/variantToList.qml
 delete mode 100644 tests/auto/declarative/qmllist/qmllist.pro
 delete mode 100644 tests/auto/declarative/qmllist/tst_qmllist.cpp
 create mode 100644 tests/auto/declarative/qmllistreference/data/MyType.qml
 create mode 100644 tests/auto/declarative/qmllistreference/data/engineTypes.qml
 create mode 100644 tests/auto/declarative/qmllistreference/data/variantToList.qml
 create mode 100644 tests/auto/declarative/qmllistreference/qmllistreference.pro
 create mode 100644 tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 645f794..870c92b 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -39,7 +39,7 @@ SUBDIRS += \
            qmlinfo \                # Cover
            qmlinstruction \         # Cover
            qmllanguage \            # Cover
-           qmllist \                # Cover
+           qmllistreference \       # Cover
            qmllistmodel \           # Cover
            qmlmetaproperty \        # Cover
            qmlmetatype \            # Cover
diff --git a/tests/auto/declarative/qmllist/data/MyType.qml b/tests/auto/declarative/qmllist/data/MyType.qml
deleted file mode 100644
index d08f35b..0000000
--- a/tests/auto/declarative/qmllist/data/MyType.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int a
-}
diff --git a/tests/auto/declarative/qmllist/data/engineTypes.qml b/tests/auto/declarative/qmllist/data/engineTypes.qml
deleted file mode 100644
index 670aee4..0000000
--- a/tests/auto/declarative/qmllist/data/engineTypes.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property list<MyType> myList
-
-    myList: [ MyType { a: 1 },
-              MyType { a: 9 } ]
-
-}
diff --git a/tests/auto/declarative/qmllist/data/variantToList.qml b/tests/auto/declarative/qmllist/data/variantToList.qml
deleted file mode 100644
index 0c2d0aa..0000000
--- a/tests/auto/declarative/qmllist/data/variantToList.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property list<QtObject> myList;
-    myList: QtObject {}
-
-    property var value: myList
-    property int test: value.length
-}
-
diff --git a/tests/auto/declarative/qmllist/qmllist.pro b/tests/auto/declarative/qmllist/qmllist.pro
deleted file mode 100644
index b2145ed..0000000
--- a/tests/auto/declarative/qmllist/qmllist.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmllist.cpp
diff --git a/tests/auto/declarative/qmllist/tst_qmllist.cpp b/tests/auto/declarative/qmllist/tst_qmllist.cpp
deleted file mode 100644
index 76def1c..0000000
--- a/tests/auto/declarative/qmllist/tst_qmllist.cpp
+++ /dev/null
@@ -1,574 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QUrl>
-#include <QFileInfo>
-#include <QDir>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlprivate.h>
-#include <QDebug>
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    QFileInfo fileInfo(__FILE__);
-    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename));
-}
-
-inline QUrl TEST_FILE(const char *filename)
-{
-    return TEST_FILE(QLatin1String(filename));
-}
-
-class tst_QmlList : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QmlList() {}
-
-private slots:
-    void qmllistreference();
-    void qmllistreference_invalid();
-    void isValid();
-    void object();
-    void listElementType();
-    void canAppend();
-    void canAt();
-    void canClear();
-    void canCount();
-    void append();
-    void at();
-    void clear();
-    void count();
-    void copy();
-    void qmlmetaproperty();
-    void engineTypes();
-    void variantToList();
-};
-
-class TestType : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QmlListProperty<TestType> data READ dataProperty);
-    Q_PROPERTY(int intProperty READ intProperty);
-
-public:
-    TestType() : property(this, data) {}
-    QmlListProperty<TestType> dataProperty() { return property; }
-    int intProperty() const { return 10; }
-
-    QList<TestType *> data;
-    QmlListProperty<TestType> property;
-};
-QML_DECLARE_TYPE(TestType);
-QML_DEFINE_NOCREATE_TYPE(TestType);
-
-void tst_QmlList::qmllistreference()
-{
-    TestType tt;
-
-    QmlListReference r(&tt, "data");
-    QVERIFY(r.isValid() == true);
-    QCOMPARE(r.count(), 0);
-
-    tt.data.append(&tt);
-    QCOMPARE(r.count(), 1);
-}
-
-void tst_QmlList::qmllistreference_invalid()
-{
-    TestType tt;
-
-    // Invalid
-    {
-    QmlListReference r;
-    QVERIFY(r.isValid() == false);
-    QVERIFY(r.object() == 0);
-    QVERIFY(r.listElementType() == 0);
-    QVERIFY(r.canAt() == false);
-    QVERIFY(r.canClear() == false);
-    QVERIFY(r.canCount() == false);
-    QVERIFY(r.append(0) == false);
-    QVERIFY(r.at(10) == 0);
-    QVERIFY(r.clear() == false);
-    QVERIFY(r.count() == 0);
-    }
-
-    // Non-property
-    {
-    QmlListReference r(&tt, "blah");
-    QVERIFY(r.isValid() == false);
-    QVERIFY(r.object() == 0);
-    QVERIFY(r.listElementType() == 0);
-    QVERIFY(r.canAt() == false);
-    QVERIFY(r.canClear() == false);
-    QVERIFY(r.canCount() == false);
-    QVERIFY(r.append(0) == false);
-    QVERIFY(r.at(10) == 0);
-    QVERIFY(r.clear() == false);
-    QVERIFY(r.count() == 0);
-    }
-
-    // Non-list property
-    {
-    QmlListReference r(&tt, "intProperty");
-    QVERIFY(r.isValid() == false);
-    QVERIFY(r.object() == 0);
-    QVERIFY(r.listElementType() == 0);
-    QVERIFY(r.canAt() == false);
-    QVERIFY(r.canClear() == false);
-    QVERIFY(r.canCount() == false);
-    QVERIFY(r.append(0) == false);
-    QVERIFY(r.at(10) == 0);
-    QVERIFY(r.clear() == false);
-    QVERIFY(r.count() == 0);
-    }
-}
-
-void tst_QmlList::isValid()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.isValid() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.isValid() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.isValid() == true);
-    delete tt;
-    QVERIFY(ref.isValid() == false);
-    }
-}
-
-void tst_QmlList::object()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.object() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.object() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.object() == tt);
-    delete tt;
-    QVERIFY(ref.object() == 0);
-    }
-}
-
-void tst_QmlList::listElementType()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.listElementType() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.listElementType() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
-    delete tt;
-    QVERIFY(ref.listElementType() == 0);
-    }
-}
-
-void tst_QmlList::canAppend()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.canAppend() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.canAppend() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.canAppend() == true);
-    delete tt;
-    QVERIFY(ref.canAppend() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.append = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.canAppend() == false);
-    }
-}
-
-void tst_QmlList::canAt()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.canAt() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.canAt() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.canAt() == true);
-    delete tt;
-    QVERIFY(ref.canAt() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.at = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.canAt() == false);
-    }
-}
-
-void tst_QmlList::canClear()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.canClear() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.canClear() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.canClear() == true);
-    delete tt;
-    QVERIFY(ref.canClear() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.clear = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.canClear() == false);
-    }
-}
-
-void tst_QmlList::canCount()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.canCount() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.canCount() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.canCount() == true);
-    delete tt;
-    QVERIFY(ref.canCount() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.count = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.canCount() == false);
-    }
-}
-
-void tst_QmlList::append()
-{
-    TestType *tt = new TestType;
-    QObject object;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.append(tt) == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.append(tt) == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.append(tt) == true);
-    QVERIFY(tt->data.count() == 1);
-    QVERIFY(tt->data.at(0) == tt);
-    QVERIFY(ref.append(&object) == false);
-    QVERIFY(tt->data.count() == 1);
-    QVERIFY(tt->data.at(0) == tt);
-    QVERIFY(ref.append(0) == true);
-    QVERIFY(tt->data.count() == 2);
-    QVERIFY(tt->data.at(0) == tt);
-    QVERIFY(tt->data.at(1) == 0);
-    delete tt;
-    QVERIFY(ref.append(0) == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.append = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.append(&tt) == false);
-    }
-}
-
-void tst_QmlList::at()
-{
-    TestType *tt = new TestType;
-    tt->data.append(tt);
-    tt->data.append(0);
-    tt->data.append(tt);
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.at(0) == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.at(0) == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.at(0) == tt);
-    QVERIFY(ref.at(1) == 0);
-    QVERIFY(ref.at(2) == tt);
-    delete tt;
-    QVERIFY(ref.at(0) == 0);
-    }
-
-    {
-    TestType tt;
-    tt.data.append(&tt);
-    tt.property.at = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.at(0) == 0);
-    }
-}
-
-void tst_QmlList::clear()
-{
-    TestType *tt = new TestType;
-    tt->data.append(tt);
-    tt->data.append(0);
-    tt->data.append(tt);
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.clear() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.clear() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.clear() == true);
-    QVERIFY(tt->data.count() == 0);
-    delete tt;
-    QVERIFY(ref.clear() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.clear = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.clear() == false);
-    }
-}
-
-void tst_QmlList::count()
-{
-    TestType *tt = new TestType;
-    tt->data.append(tt);
-    tt->data.append(0);
-    tt->data.append(tt);
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.count() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.count() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.count() == 3);
-    tt->data.removeAt(1);
-    QVERIFY(ref.count() == 2);
-    delete tt;
-    QVERIFY(ref.count() == 0);
-    }
-
-    {
-    TestType tt;
-    tt.data.append(&tt);
-    tt.property.count = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.count() == 0);
-    }
-}
-
-void tst_QmlList::copy()
-{
-    TestType tt;
-    tt.data.append(&tt);
-    tt.data.append(0);
-    tt.data.append(&tt);
-
-    QmlListReference *r1 = new QmlListReference(&tt, "data");
-    QVERIFY(r1->count() == 3);
-
-    QmlListReference r2(*r1);
-    QmlListReference r3;
-    r3 = *r1;
-
-    QVERIFY(r2.count() == 3);
-    QVERIFY(r3.count() == 3);
-
-    delete r1;
-
-    QVERIFY(r2.count() == 3);
-    QVERIFY(r3.count() == 3);
-
-    tt.data.removeAt(2);
-
-    QVERIFY(r2.count() == 2);
-    QVERIFY(r3.count() == 2);
-}
-
-void tst_QmlList::qmlmetaproperty()
-{
-    TestType tt;
-    tt.data.append(&tt);
-    tt.data.append(0);
-    tt.data.append(&tt);
-
-    QmlMetaProperty prop(&tt, QLatin1String("data"));
-    QVariant v = prop.read();
-    QVERIFY(v.userType() == qMetaTypeId<QmlListReference>());
-    QmlListReference ref = qvariant_cast<QmlListReference>(v);
-    QVERIFY(ref.count() == 3);
-    QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
-}
-
-void tst_QmlList::engineTypes()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("engineTypes.qml"));
-
-    QObject *o = component.create();
-    QVERIFY(o);
-
-    QmlMetaProperty p1(o, QLatin1String("myList"));
-    QVERIFY(p1.propertyCategory() == QmlMetaProperty::Normal);
-
-    QmlMetaProperty p2(o, QLatin1String("myList"), engine.rootContext());
-    QVERIFY(p2.propertyCategory() == QmlMetaProperty::List);
-    QVariant v = p2.read();
-    QVERIFY(v.userType() == qMetaTypeId<QmlListReference>());
-    QmlListReference ref = qvariant_cast<QmlListReference>(v);
-    QVERIFY(ref.count() == 2);
-    QVERIFY(ref.listElementType());
-    QVERIFY(ref.listElementType() != &QObject::staticMetaObject);
-
-    delete o;
-}
-
-void tst_QmlList::variantToList()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("variantToList.qml"));
-
-    QObject *o = component.create();
-    QVERIFY(o);
-
-    QVERIFY(o->property("value").userType() == qMetaTypeId<QmlListReference>());
-    QCOMPARE(o->property("test").toInt(), 1);
-
-    delete o;
-}
-
-QTEST_MAIN(tst_QmlList)
-
-#include "tst_qmllist.moc"
diff --git a/tests/auto/declarative/qmllistreference/data/MyType.qml b/tests/auto/declarative/qmllistreference/data/MyType.qml
new file mode 100644
index 0000000..d08f35b
--- /dev/null
+++ b/tests/auto/declarative/qmllistreference/data/MyType.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    property int a
+}
diff --git a/tests/auto/declarative/qmllistreference/data/engineTypes.qml b/tests/auto/declarative/qmllistreference/data/engineTypes.qml
new file mode 100644
index 0000000..670aee4
--- /dev/null
+++ b/tests/auto/declarative/qmllistreference/data/engineTypes.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+    property list<MyType> myList
+
+    myList: [ MyType { a: 1 },
+              MyType { a: 9 } ]
+
+}
diff --git a/tests/auto/declarative/qmllistreference/data/variantToList.qml b/tests/auto/declarative/qmllistreference/data/variantToList.qml
new file mode 100644
index 0000000..0c2d0aa
--- /dev/null
+++ b/tests/auto/declarative/qmllistreference/data/variantToList.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+QtObject {
+    property list<QtObject> myList;
+    myList: QtObject {}
+
+    property var value: myList
+    property int test: value.length
+}
+
diff --git a/tests/auto/declarative/qmllistreference/qmllistreference.pro b/tests/auto/declarative/qmllistreference/qmllistreference.pro
new file mode 100644
index 0000000..fa49d5a
--- /dev/null
+++ b/tests/auto/declarative/qmllistreference/qmllistreference.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qmllistreference.cpp
diff --git a/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp b/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp
new file mode 100644
index 0000000..6122f1e
--- /dev/null
+++ b/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp
@@ -0,0 +1,574 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QUrl>
+#include <QFileInfo>
+#include <QDir>
+#include <QmlEngine>
+#include <QmlComponent>
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qmlprivate.h>
+#include <QDebug>
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    QFileInfo fileInfo(__FILE__);
+    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename));
+}
+
+inline QUrl TEST_FILE(const char *filename)
+{
+    return TEST_FILE(QLatin1String(filename));
+}
+
+class tst_qmllistreference : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmllistreference() {}
+
+private slots:
+    void qmllistreference();
+    void qmllistreference_invalid();
+    void isValid();
+    void object();
+    void listElementType();
+    void canAppend();
+    void canAt();
+    void canClear();
+    void canCount();
+    void append();
+    void at();
+    void clear();
+    void count();
+    void copy();
+    void qmlmetaproperty();
+    void engineTypes();
+    void variantToList();
+};
+
+class TestType : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QmlListProperty<TestType> data READ dataProperty);
+    Q_PROPERTY(int intProperty READ intProperty);
+
+public:
+    TestType() : property(this, data) {}
+    QmlListProperty<TestType> dataProperty() { return property; }
+    int intProperty() const { return 10; }
+
+    QList<TestType *> data;
+    QmlListProperty<TestType> property;
+};
+QML_DECLARE_TYPE(TestType);
+QML_DEFINE_NOCREATE_TYPE(TestType);
+
+void tst_qmllistreference::qmllistreference()
+{
+    TestType tt;
+
+    QmlListReference r(&tt, "data");
+    QVERIFY(r.isValid() == true);
+    QCOMPARE(r.count(), 0);
+
+    tt.data.append(&tt);
+    QCOMPARE(r.count(), 1);
+}
+
+void tst_qmllistreference::qmllistreference_invalid()
+{
+    TestType tt;
+
+    // Invalid
+    {
+    QmlListReference r;
+    QVERIFY(r.isValid() == false);
+    QVERIFY(r.object() == 0);
+    QVERIFY(r.listElementType() == 0);
+    QVERIFY(r.canAt() == false);
+    QVERIFY(r.canClear() == false);
+    QVERIFY(r.canCount() == false);
+    QVERIFY(r.append(0) == false);
+    QVERIFY(r.at(10) == 0);
+    QVERIFY(r.clear() == false);
+    QVERIFY(r.count() == 0);
+    }
+
+    // Non-property
+    {
+    QmlListReference r(&tt, "blah");
+    QVERIFY(r.isValid() == false);
+    QVERIFY(r.object() == 0);
+    QVERIFY(r.listElementType() == 0);
+    QVERIFY(r.canAt() == false);
+    QVERIFY(r.canClear() == false);
+    QVERIFY(r.canCount() == false);
+    QVERIFY(r.append(0) == false);
+    QVERIFY(r.at(10) == 0);
+    QVERIFY(r.clear() == false);
+    QVERIFY(r.count() == 0);
+    }
+
+    // Non-list property
+    {
+    QmlListReference r(&tt, "intProperty");
+    QVERIFY(r.isValid() == false);
+    QVERIFY(r.object() == 0);
+    QVERIFY(r.listElementType() == 0);
+    QVERIFY(r.canAt() == false);
+    QVERIFY(r.canClear() == false);
+    QVERIFY(r.canCount() == false);
+    QVERIFY(r.append(0) == false);
+    QVERIFY(r.at(10) == 0);
+    QVERIFY(r.clear() == false);
+    QVERIFY(r.count() == 0);
+    }
+}
+
+void tst_qmllistreference::isValid()
+{
+    TestType *tt = new TestType;
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.isValid() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.isValid() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.isValid() == true);
+    delete tt;
+    QVERIFY(ref.isValid() == false);
+    }
+}
+
+void tst_qmllistreference::object()
+{
+    TestType *tt = new TestType;
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.object() == 0);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.object() == 0);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.object() == tt);
+    delete tt;
+    QVERIFY(ref.object() == 0);
+    }
+}
+
+void tst_qmllistreference::listElementType()
+{
+    TestType *tt = new TestType;
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.listElementType() == 0);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.listElementType() == 0);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
+    delete tt;
+    QVERIFY(ref.listElementType() == 0);
+    }
+}
+
+void tst_qmllistreference::canAppend()
+{
+    TestType *tt = new TestType;
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.canAppend() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.canAppend() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.canAppend() == true);
+    delete tt;
+    QVERIFY(ref.canAppend() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.append = 0;
+    QmlListReference ref(&tt, "data");
+    QVERIFY(ref.canAppend() == false);
+    }
+}
+
+void tst_qmllistreference::canAt()
+{
+    TestType *tt = new TestType;
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.canAt() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.canAt() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.canAt() == true);
+    delete tt;
+    QVERIFY(ref.canAt() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.at = 0;
+    QmlListReference ref(&tt, "data");
+    QVERIFY(ref.canAt() == false);
+    }
+}
+
+void tst_qmllistreference::canClear()
+{
+    TestType *tt = new TestType;
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.canClear() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.canClear() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.canClear() == true);
+    delete tt;
+    QVERIFY(ref.canClear() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.clear = 0;
+    QmlListReference ref(&tt, "data");
+    QVERIFY(ref.canClear() == false);
+    }
+}
+
+void tst_qmllistreference::canCount()
+{
+    TestType *tt = new TestType;
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.canCount() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.canCount() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.canCount() == true);
+    delete tt;
+    QVERIFY(ref.canCount() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.count = 0;
+    QmlListReference ref(&tt, "data");
+    QVERIFY(ref.canCount() == false);
+    }
+}
+
+void tst_qmllistreference::append()
+{
+    TestType *tt = new TestType;
+    QObject object;
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.append(tt) == false);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.append(tt) == false);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.append(tt) == true);
+    QVERIFY(tt->data.count() == 1);
+    QVERIFY(tt->data.at(0) == tt);
+    QVERIFY(ref.append(&object) == false);
+    QVERIFY(tt->data.count() == 1);
+    QVERIFY(tt->data.at(0) == tt);
+    QVERIFY(ref.append(0) == true);
+    QVERIFY(tt->data.count() == 2);
+    QVERIFY(tt->data.at(0) == tt);
+    QVERIFY(tt->data.at(1) == 0);
+    delete tt;
+    QVERIFY(ref.append(0) == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.append = 0;
+    QmlListReference ref(&tt, "data");
+    QVERIFY(ref.append(&tt) == false);
+    }
+}
+
+void tst_qmllistreference::at()
+{
+    TestType *tt = new TestType;
+    tt->data.append(tt);
+    tt->data.append(0);
+    tt->data.append(tt);
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.at(0) == 0);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.at(0) == 0);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.at(0) == tt);
+    QVERIFY(ref.at(1) == 0);
+    QVERIFY(ref.at(2) == tt);
+    delete tt;
+    QVERIFY(ref.at(0) == 0);
+    }
+
+    {
+    TestType tt;
+    tt.data.append(&tt);
+    tt.property.at = 0;
+    QmlListReference ref(&tt, "data");
+    QVERIFY(ref.at(0) == 0);
+    }
+}
+
+void tst_qmllistreference::clear()
+{
+    TestType *tt = new TestType;
+    tt->data.append(tt);
+    tt->data.append(0);
+    tt->data.append(tt);
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.clear() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.clear() == false);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.clear() == true);
+    QVERIFY(tt->data.count() == 0);
+    delete tt;
+    QVERIFY(ref.clear() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.clear = 0;
+    QmlListReference ref(&tt, "data");
+    QVERIFY(ref.clear() == false);
+    }
+}
+
+void tst_qmllistreference::count()
+{
+    TestType *tt = new TestType;
+    tt->data.append(tt);
+    tt->data.append(0);
+    tt->data.append(tt);
+
+    {
+    QmlListReference ref;
+    QVERIFY(ref.count() == 0);
+    }
+
+    {
+    QmlListReference ref(tt, "blah");
+    QVERIFY(ref.count() == 0);
+    }
+
+    {
+    QmlListReference ref(tt, "data");
+    QVERIFY(ref.count() == 3);
+    tt->data.removeAt(1);
+    QVERIFY(ref.count() == 2);
+    delete tt;
+    QVERIFY(ref.count() == 0);
+    }
+
+    {
+    TestType tt;
+    tt.data.append(&tt);
+    tt.property.count = 0;
+    QmlListReference ref(&tt, "data");
+    QVERIFY(ref.count() == 0);
+    }
+}
+
+void tst_qmllistreference::copy()
+{
+    TestType tt;
+    tt.data.append(&tt);
+    tt.data.append(0);
+    tt.data.append(&tt);
+
+    QmlListReference *r1 = new QmlListReference(&tt, "data");
+    QVERIFY(r1->count() == 3);
+
+    QmlListReference r2(*r1);
+    QmlListReference r3;
+    r3 = *r1;
+
+    QVERIFY(r2.count() == 3);
+    QVERIFY(r3.count() == 3);
+
+    delete r1;
+
+    QVERIFY(r2.count() == 3);
+    QVERIFY(r3.count() == 3);
+
+    tt.data.removeAt(2);
+
+    QVERIFY(r2.count() == 2);
+    QVERIFY(r3.count() == 2);
+}
+
+void tst_qmllistreference::qmlmetaproperty()
+{
+    TestType tt;
+    tt.data.append(&tt);
+    tt.data.append(0);
+    tt.data.append(&tt);
+
+    QmlMetaProperty prop(&tt, QLatin1String("data"));
+    QVariant v = prop.read();
+    QVERIFY(v.userType() == qMetaTypeId<QmlListReference>());
+    QmlListReference ref = qvariant_cast<QmlListReference>(v);
+    QVERIFY(ref.count() == 3);
+    QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
+}
+
+void tst_qmllistreference::engineTypes()
+{
+    QmlEngine engine;
+    QmlComponent component(&engine, TEST_FILE("engineTypes.qml"));
+
+    QObject *o = component.create();
+    QVERIFY(o);
+
+    QmlMetaProperty p1(o, QLatin1String("myList"));
+    QVERIFY(p1.propertyCategory() == QmlMetaProperty::Normal);
+
+    QmlMetaProperty p2(o, QLatin1String("myList"), engine.rootContext());
+    QVERIFY(p2.propertyCategory() == QmlMetaProperty::List);
+    QVariant v = p2.read();
+    QVERIFY(v.userType() == qMetaTypeId<QmlListReference>());
+    QmlListReference ref = qvariant_cast<QmlListReference>(v);
+    QVERIFY(ref.count() == 2);
+    QVERIFY(ref.listElementType());
+    QVERIFY(ref.listElementType() != &QObject::staticMetaObject);
+
+    delete o;
+}
+
+void tst_qmllistreference::variantToList()
+{
+    QmlEngine engine;
+    QmlComponent component(&engine, TEST_FILE("variantToList.qml"));
+
+    QObject *o = component.create();
+    QVERIFY(o);
+
+    QVERIFY(o->property("value").userType() == qMetaTypeId<QmlListReference>());
+    QCOMPARE(o->property("test").toInt(), 1);
+
+    delete o;
+}
+
+QTEST_MAIN(tst_qmllistreference)
+
+#include "tst_qmllistreference.moc"
-- 
cgit v0.12


From c151647c01dd8034ee77a00520430cfb516a6a38 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 23 Feb 2010 12:56:39 +1000
Subject: Cleanup warnings in qmlmetaproperty test

---
 .../qmlmetaproperty/tst_qmlmetaproperty.cpp        | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
index 050cd3f..b763b6e 100644
--- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
@@ -129,7 +129,7 @@ void tst_qmlmetaproperty::qmlmetaproperty()
 {
     QmlMetaProperty prop;
 
-    QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+    QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
     QVERIFY(binding != 0);
     QGuard<QmlExpression> expression(new QmlExpression());
     QVERIFY(expression != 0);
@@ -218,7 +218,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object()
     {
         QmlMetaProperty prop(&object);
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
         QVERIFY(expression != 0);
@@ -264,7 +264,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object()
     {
         QmlMetaProperty prop(&dobject);
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
@@ -319,7 +319,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
     {
         QmlMetaProperty prop(&object, QString("defaultProperty"));
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
         QVERIFY(expression != 0);
@@ -365,7 +365,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
     {
         QmlMetaProperty prop(&dobject, QString("defaultProperty"));
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
@@ -414,7 +414,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
     {
         QmlMetaProperty prop(&dobject, QString("onClicked"));
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
@@ -468,7 +468,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context()
     {
         QmlMetaProperty prop(&object, engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
         QVERIFY(expression != 0);
@@ -514,7 +514,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context()
     {
         QmlMetaProperty prop(&dobject, engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
@@ -569,7 +569,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
     {
         QmlMetaProperty prop(&object, QString("defaultProperty"), engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
         QVERIFY(expression != 0);
@@ -615,7 +615,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
     {
         QmlMetaProperty prop(&dobject, QString("defaultProperty"), engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
@@ -664,7 +664,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
     {
         QmlMetaProperty prop(&dobject, QString("onClicked"), engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QString(), 0, 0));
+        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
         QGuard<QmlExpression> expression(new QmlExpression());
-- 
cgit v0.12


From 23316b14f28eb1b135b6e8e90fa6fdb34dc39b59 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 23 Feb 2010 13:06:22 +1000
Subject: Fix but in QmlMetaProperty assignment operator

QTBUG-8166
---
 src/declarative/qml/qmlmetaproperty.cpp            |  2 +
 .../qmlmetaproperty/tst_qmlmetaproperty.cpp        | 43 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 332d126..1742c43 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -378,7 +378,9 @@ QmlMetaProperty &QmlMetaProperty::operator=(const QmlMetaProperty &other)
     d->object = other.d->object;
 
     d->isDefaultProperty = other.d->isDefaultProperty;
+    d->isNameCached = other.d->isNameCached;
     d->core = other.d->core;
+    d->nameCache = other.d->nameCache;
 
     d->valueType = other.d->valueType;
 
diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
index b763b6e..c289641 100644
--- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
@@ -121,6 +121,7 @@ private slots:
     // Bugs
     void crashOnValueProperty();
 
+    void copy();
 private:
     QmlEngine engine;
 };
@@ -1131,6 +1132,48 @@ void tst_qmlmetaproperty::crashOnValueProperty()
     QCOMPARE(p.read(), QVariant(20));
 }
 
+void tst_qmlmetaproperty::copy()
+{
+    PropertyObject object;
+
+    QmlMetaProperty *property = new QmlMetaProperty(&object, QLatin1String("defaultProperty"));
+    QCOMPARE(property->name(), QString("defaultProperty"));
+    QCOMPARE(property->read(), QVariant(10));
+    QCOMPARE(property->type(), QmlMetaProperty::Property);
+    QCOMPARE(property->propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(property->propertyType(), (int)QVariant::Int);
+
+    QmlMetaProperty p1(*property);
+    QCOMPARE(p1.name(), QString("defaultProperty"));
+    QCOMPARE(p1.read(), QVariant(10));
+    QCOMPARE(p1.type(), QmlMetaProperty::Property);
+    QCOMPARE(p1.propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
+
+    QmlMetaProperty p2(&object, QLatin1String("url"));
+    QCOMPARE(p2.name(), QString("url"));
+    p2 = *property;
+    QCOMPARE(p2.name(), QString("defaultProperty"));
+    QCOMPARE(p2.read(), QVariant(10));
+    QCOMPARE(p2.type(), QmlMetaProperty::Property);
+    QCOMPARE(p2.propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
+
+    delete property; property = 0;
+
+    QCOMPARE(p1.name(), QString("defaultProperty"));
+    QCOMPARE(p1.read(), QVariant(10));
+    QCOMPARE(p1.type(), QmlMetaProperty::Property);
+    QCOMPARE(p1.propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
+
+    QCOMPARE(p2.name(), QString("defaultProperty"));
+    QCOMPARE(p2.read(), QVariant(10));
+    QCOMPARE(p2.type(), QmlMetaProperty::Property);
+    QCOMPARE(p2.propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
+}
+
 QTEST_MAIN(tst_qmlmetaproperty)
 
 #include "tst_qmlmetaproperty.moc"
-- 
cgit v0.12


From c48ce6292d52b6f0a2a0ba54109a426d33eb7842 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Tue, 23 Feb 2010 13:42:25 +1000
Subject: Work.

---
 tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
index 0d7f985..ddd1e5e 100644
--- a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
+++ b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
@@ -77,6 +77,11 @@ public:
     {
         return QStringList() << QLatin1String("com.nokia.AutoTestQmlPluginType");
     }
+
+    void defineModule(const QString& uri)
+    {
+        Q_ASSERT(uri == "com.nokia.AutoTestQmlPluginType");
+    }
 };
 
 #include "plugin.moc"
-- 
cgit v0.12


From e988763395625171bed001b5916d4da003d39aee Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Tue, 23 Feb 2010 13:58:24 +1000
Subject: Doc.

---
 doc/src/declarative/advtutorial1.qdoc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/src/declarative/advtutorial1.qdoc b/doc/src/declarative/advtutorial1.qdoc
index 2c99819..e7f4f1a 100644
--- a/doc/src/declarative/advtutorial1.qdoc
+++ b/doc/src/declarative/advtutorial1.qdoc
@@ -51,20 +51,20 @@ Here is the QML code for the basic elements. The game window:
 
 \snippet declarative/tutorials/samegame/samegame1/samegame.qml 0
 
-This gives you a basic game window, with room for the game canvas. A new game
-button and room to display the score. The one thing you may not recognize here
+This gives you a basic game window, with room for the game canvas, a new game
+button and room to display the score. One thing you may not recognize here
 is the \l SystemPalette item. This item provides access to the Qt system palette
 and is used to make the button look more like a system button (for exact native
-feel you would use a \l QPushButton). Since we want a fully functional button, 
-we use the QML elements Text and MouseArea inside a Rectangle to assemble a 
-button. Below is the code which we wrote to do this:
+feel you would use a \l QPushButton). In this case we've created our own custom
+Button element using the QML elements Text and MouseArea inside a Rectangle.
+Below is the code which we wrote to do this (Button.qml):
 
 \snippet declarative/tutorials/samegame/samegame1/Button.qml 0
 
 Note that this Button component was written to be fairly generic, in case we
 want to use a similarly styled button later.
 
-And here is a simple block:
+And here is a simple block (Block.qml):
 
 \snippet declarative/tutorials/samegame/samegame1/Block.qml 0
 
-- 
cgit v0.12


From f8eee22dcdd9b6b530c0e5c346e16552352ec03b Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Tue, 23 Feb 2010 15:40:22 +1000
Subject: Add XmlRole::isKey property for incremental data changes when
 reload() is called.

Task-number: QT-2831
---
 src/declarative/util/qmlxmllistmodel.cpp           | 175 +++++++++++---
 .../qmlxmllistmodel/tst_qmlxmllistmodel.cpp        | 254 +++++++++++++++++++++
 2 files changed, 400 insertions(+), 29 deletions(-)

diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp
index df2102a..5de4d6f 100644
--- a/src/declarative/util/qmlxmllistmodel.cpp
+++ b/src/declarative/util/qmlxmllistmodel.cpp
@@ -63,6 +63,8 @@ QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,XmlRole,QmlXmlListModelRole)
 QML_DEFINE_TYPE(Qt,4,6,XmlListModel,QmlXmlListModel)
 
+typedef QPair<int, int> QmlXmlListRange;
+
 /*!
     \qmlclass XmlRole QmlXmlListModelRole
     \brief The XmlRole element allows you to specify a role for an XmlListModel.
@@ -94,14 +96,26 @@ QML_DEFINE_TYPE(Qt,4,6,XmlListModel,QmlXmlListModel)
     \endqml
 */
 
+/*!
+    \qmlproperty bool XmlRole::isKey
+    Defines whether this is a key role.
+    
+    Key roles are used to to determine whether a set of values should
+    be updated or added to the XML list model when XmlListModel::reload()
+    is called.
+
+    \sa XmlListModel
+*/
+
 class Q_DECLARATIVE_EXPORT QmlXmlListModelRole : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(QString query READ query WRITE setQuery)
+    Q_PROPERTY(bool isKey READ isKey WRITE setIsKey)
 
 public:
-    QmlXmlListModelRole() {}
+    QmlXmlListModelRole() : m_isKey(false) {}
     ~QmlXmlListModelRole() {}
 
     QString name() const { return m_name; }
@@ -117,6 +131,9 @@ public:
         m_query = query;
     }
 
+    bool isKey() const { return m_isKey; }
+    void setIsKey(bool b) { m_isKey = b; }
+
     bool isValid() {
         return !m_name.isEmpty() && !m_query.isEmpty();
     }
@@ -124,6 +141,7 @@ public:
 private:
     QString m_name;
     QString m_query;
+    bool m_isKey;
 };
 QT_END_NAMESPACE
 QML_DECLARE_TYPE(QmlXmlListModelRole)
@@ -166,7 +184,6 @@ public:
 
     int doQuery(QString query, QString namespaces, QByteArray data, QmlXmlRoleList *roleObjects) {
         QMutexLocker locker(&m_mutex);
-        m_modelData.clear();
         m_size = 0;
         m_data = data;
         m_query = QLatin1String("doc($src)") + query;
@@ -188,6 +205,16 @@ public:
         return m_modelData;
     }
 
+    QList<QmlXmlListRange> insertedItemRanges() {
+        QMutexLocker locker(&m_mutex);
+        return m_insertedItemRanges;
+    }
+
+    QList<QmlXmlListRange> removedItemRanges() {
+        QMutexLocker locker(&m_mutex);
+        return m_removedItemRanges;
+    }
+
 Q_SIGNALS:
     void queryCompleted(int queryId, int size);
 
@@ -197,13 +224,12 @@ protected:
             m_mutex.lock();
             int queryId = m_queryId;
             doQueryJob();
-            if (m_size > 0)
-                doSubQueryJob();
+            doSubQueryJob();
             m_data.clear(); // no longer needed
             m_mutex.unlock();
 
             m_mutex.lock();
-            if (!m_abort && m_size > 0)
+            if (!m_abort)
                 emit queryCompleted(queryId, m_size);
             if (!m_restart)
                 m_condition.wait(&m_mutex);
@@ -216,6 +242,8 @@ protected:
 private:
     void doQueryJob();
     void doSubQueryJob();
+    void getValuesOfKeyRoles(QStringList *values, QXmlQuery *query) const;
+    void addIndexToRangeList(QList<QmlXmlListRange> *ranges, int index) const;
 
 private:
     QMutex m_mutex;
@@ -231,6 +259,9 @@ private:
     int m_queryId;
     const QmlXmlRoleList *m_roleObjects;
     QList<QList<QVariant> > m_modelData;
+    QStringList m_keysValues;
+    QList<QmlXmlListRange> m_insertedItemRanges;
+    QList<QmlXmlListRange> m_removedItemRanges;
 };
 
 void QmlXmlQuery::doQueryJob()
@@ -275,6 +306,40 @@ void QmlXmlQuery::doQueryJob()
         m_size = count;
 }
 
+void QmlXmlQuery::getValuesOfKeyRoles(QStringList *values, QXmlQuery *query) const
+{
+    QStringList keysQueries;
+    for (int i=0; i<m_roleObjects->count(); i++) {
+        if (m_roleObjects->at(i)->isKey())
+            keysQueries << m_roleObjects->at(i)->query();
+    }
+    QString keysQuery;
+    if (keysQueries.count() == 1)
+        keysQuery = m_prefix + keysQueries[0];
+    else if (keysQueries.count() > 1)
+        keysQuery = m_prefix + QLatin1String("concat(") + keysQueries.join(QLatin1String(",")) + QLatin1String(")");
+
+    if (!keysQuery.isEmpty()) {
+        query->setQuery(keysQuery);
+        QXmlResultItems resultItems;
+        query->evaluateTo(&resultItems);
+        QXmlItem item(resultItems.next());
+        while (!item.isNull()) {
+            values->append(item.toAtomicValue().toString());
+            item = resultItems.next();
+        }
+    }
+}
+
+void QmlXmlQuery::addIndexToRangeList(QList<QmlXmlListRange> *ranges, int index) const {
+    if (ranges->isEmpty())
+        ranges->append(qMakePair(index, 1));
+    else if (ranges->last().first + ranges->last().second == index)
+        ranges->last().second += 1;
+    else
+        ranges->append(qMakePair(index, 1));
+}
+
 void QmlXmlQuery::doSubQueryJob()
 {
     m_modelData.clear();
@@ -285,6 +350,35 @@ void QmlXmlQuery::doSubQueryJob()
     QXmlQuery subquery;
     subquery.bindVariable(QLatin1String("inputDocument"), &b);
 
+    QStringList keysValues;
+    getValuesOfKeyRoles(&keysValues, &subquery);
+
+    // See if any values of key roles have been inserted or removed.
+    m_insertedItemRanges.clear();
+    m_removedItemRanges.clear();
+    if (m_keysValues.isEmpty()) {
+        m_insertedItemRanges << qMakePair(0, m_size);
+    } else {
+        if (keysValues != m_keysValues) {
+            QStringList temp;
+            for (int i=0; i<m_keysValues.count(); i++) {
+                if (!keysValues.contains(m_keysValues[i]))
+                    addIndexToRangeList(&m_removedItemRanges, i);
+                else 
+                    temp << m_keysValues[i];
+            }
+
+            for (int i=0; i<keysValues.count(); i++) {
+                if (temp.count() == i || keysValues[i] != temp[i]) {
+                    temp.insert(i, keysValues[i]);
+                    addIndexToRangeList(&m_insertedItemRanges, i);
+                }
+            }
+        }
+    }
+    m_keysValues = keysValues;
+
+    // Get the new values for each role.
     //### we might be able to condense even further (query for everything in one go)
     for (int i = 0; i < m_roleObjects->size(); ++i) {
         QmlXmlListModelRole *role = m_roleObjects->at(i);
@@ -296,13 +390,13 @@ void QmlXmlQuery::doSubQueryJob()
             continue;
         }
         subquery.setQuery(m_prefix + QLatin1String("(let $v := ") + role->query() + QLatin1String(" return if ($v) then ") + role->query() + QLatin1String(" else \"\")"));
-        QXmlResultItems output3;
-        subquery.evaluateTo(&output3);
-        QXmlItem item(output3.next());
+        QXmlResultItems resultItems;
+        subquery.evaluateTo(&resultItems);
+        QXmlItem item(resultItems.next());
         QList<QVariant> resultList;
         while (!item.isNull()) {
             resultList << item.toAtomicValue(); //### we used to trim strings
-            item = output3.next();
+            item = resultItems.next();
         }
         //### should warn here if things have gone wrong.
         while (resultList.count() < m_size)
@@ -408,25 +502,40 @@ void QmlXmlRoleList::insert(int i, QmlXmlListModelRole *role)
 
 /*!
     \qmlclass XmlListModel QmlXmlListModel
-    \brief The XmlListModel element allows you to specify a model using XPath expressions.
+    \brief The XmlListModel element is used to specify a model using XPath expressions.
 
-    XmlListModel allows you to construct a model from XML data that can then be used as a data source
-    for the view classes (ListView, PathView, GridView) and any other classes that interact with model
-    data (like Repeater).
+    XmlListModel is used to create a model from XML data that can be used as a data source
+    for the view classes (such as ListView, PathView, GridView) and other classes that interact with model
+    data (such as Repeater).
 
-    The following is an example of a model containing news from a Yahoo RSS feed:
+    Here is an example of a model containing news from a Yahoo RSS feed:
     \qml
     XmlListModel {
         id: feedModel
         source: "http://rss.news.yahoo.com/rss/oceania"
         query: "/rss/channel/item"
         XmlRole { name: "title"; query: "title/string()" }
-        XmlRole { name: "link"; query: "link/string()" }
+        XmlRole { name: "pubDate"; query: "pubDate/string()" }
         XmlRole { name: "description"; query: "description/string()" }
     }
     \endqml
-    \note The model is currently static, so the above is really just a snapshot of an RSS feed. To force a
-    reload of the entire model, you can call the reload function.
+
+    You can also define certain roles as "keys" so that the model only adds data
+    that contains new values for these keys when reload() is called.
+
+    For example, if the roles above were defined like this:
+
+    \qml
+        XmlRole { name: "title"; query: "title/string()"; isKey: true }
+        XmlRole { name: "pubDate"; query: "pubDate/string()"; isKey: true }
+    \endqml
+
+    Then when reload() is called, the model will only add new items with a
+    "title" and "pubDate" value combination that is not already present in
+    the model.
+
+    This is useful to provide incremental updates and avoid repainting an
+    entire model in a view.
 */
 
 QmlXmlListModel::QmlXmlListModel(QObject *parent)
@@ -632,8 +741,13 @@ void QmlXmlListModel::componentComplete()
 /*!
     \qmlmethod XmlListModel::reload()
 
-    Reloads the model. All the existing model data will be removed, and the model
-    will be rebuilt from scratch.
+    Reloads the model.
+    
+    If no key roles have been specified, all existing model
+    data is removed, and the model is rebuilt from scratch.
+
+    Otherwise, items are only added if the model does not already
+    contain items with matching key role values.
 */
 void QmlXmlListModel::reload()
 {
@@ -645,12 +759,8 @@ void QmlXmlListModel::reload()
     d->qmlXmlQuery.abort();
     d->queryId = -1;
 
-    //clear existing data
-    int count = d->size;
-    d->size = 0;
-    d->data.clear();
-    if (count > 0)
-        emit itemsRemoved(0, count);
+    if (d->size < 0)
+        d->size = 0;
 
     if (d->src.isEmpty() && d->xml.isEmpty())
         return;
@@ -717,12 +827,19 @@ void QmlXmlListModel::queryCompleted(int id, int size)
     Q_D(QmlXmlListModel);
     if (id != d->queryId)
         return;
+    bool sizeChanged = size != d->size;
     d->size = size;
-    if (size > 0) {
-        d->data = d->qmlXmlQuery.modelData();
-        emit itemsInserted(0, d->size);
+    d->data = d->qmlXmlQuery.modelData();
+
+    QList<QmlXmlListRange> removed = d->qmlXmlQuery.removedItemRanges();
+    for (int i=0; i<removed.count(); i++)
+        emit itemsRemoved(removed[i].first, removed[i].second);
+    QList<QmlXmlListRange> inserted = d->qmlXmlQuery.insertedItemRanges();
+    for (int i=0; i<inserted.count(); i++)
+        emit itemsInserted(inserted[i].first, inserted[i].second);
+
+    if (sizeChanged)
         emit countChanged();
-    }
 }
 
 QT_END_NAMESPACE
diff --git a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp b/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp
index 966d7de..5d4682b 100644
--- a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp
+++ b/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 #include <qtest.h>
+#include <QtTest/qsignalspy.h>
+#include <QtCore/qtimer.h>
 
 #ifdef QTEST_XMLPATTERNS
 #include <QtDeclarative/qmlengine.h>
@@ -46,6 +48,12 @@
 #include <private/qmlxmllistmodel_p.h>
 #include "../../../shared/util.h"
 
+typedef QPair<int, int> QmlXmlListRange;
+typedef QList<QVariantList> QmlXmlModelData;
+
+Q_DECLARE_METATYPE(QList<QmlXmlListRange>)
+Q_DECLARE_METATYPE(QmlXmlModelData)
+
 class tst_qmlxmllistmodel : public QObject
 
 {
@@ -61,8 +69,47 @@ private slots:
     void roles();
     void roleErrors();
     void uniqueRoleNames();
+    void useKeys();
+    void useKeys_data();
+    void noKeysValueChanges();
+    void keysChanged();
 
 private:
+    QString makeItemXmlAndData(const QString &data, QmlXmlModelData *modelData = 0) const
+    {
+        if (modelData)
+            modelData->clear();
+        QString xml;
+
+        if (!data.isEmpty()) {
+            QStringList items = data.split(";");
+            foreach(const QString &item, items) {
+                QVariantList variants;
+                xml += QLatin1String("<item>");
+                QStringList fields = item.split(",");
+                foreach(const QString &field, fields) {
+                    QStringList values = field.split("=");
+                    Q_ASSERT(values.count() == 2);
+                    xml += QString("<%1>%2</%1>").arg(values[0], values[1]);
+                    if (!modelData)
+                        continue;
+                    bool isNum = false;
+                    int number = values[1].toInt(&isNum);
+                    if (isNum)
+                        variants << number;
+                    else
+                        variants << values[1];
+                }
+                xml += QLatin1String("</item>");
+                if (modelData)
+                    modelData->append(variants);
+            }
+        }
+
+        QString decl = "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>";
+        return decl + QLatin1String("<data>") + xml + QLatin1String("</data>");
+    }
+
     QmlEngine engine;
 };
 
@@ -194,6 +241,213 @@ void tst_qmlxmllistmodel::uniqueRoleNames()
     delete listModel;
 }
 
+void tst_qmlxmllistmodel::useKeys()
+{
+    // If using incremental updates through keys, the model should only
+    // insert & remove some of the items, instead of throwing everything
+    // away and causing the view to repaint the whole view.
+
+    QFETCH(QString, oldXml);
+    QFETCH(int, oldCount);
+    QFETCH(QString, newXml);
+    QFETCH(QmlXmlModelData, newData);
+    QFETCH(QList<QmlXmlListRange>, insertRanges);
+    QFETCH(QList<QmlXmlListRange>, removeRanges);
+
+    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+    QmlXmlListModel *model = qobject_cast<QmlXmlListModel*>(component.create());
+    QVERIFY(model != 0);
+    
+    model->setXml(oldXml);
+    QTRY_COMPARE(model->count(), oldCount);
+
+    QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int)));
+    QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
+    QSignalSpy spyCount(model, SIGNAL(countChanged()));
+
+    model->setXml(newXml);
+
+    if (oldCount != newData.count()) {
+        QTRY_COMPARE(model->count(), newData.count());
+        QCOMPARE(spyCount.count(), 1);
+    } else {
+        QTRY_VERIFY(spyInsert.count() > 0 || spyRemove.count() > 0);
+        QCOMPARE(spyCount.count(), 0);
+    }
+
+    QList<int> roles = model->roles();
+    for (int i=0; i<model->count(); i++) {
+        for (int j=0; j<roles.count(); j++)
+            QCOMPARE(model->data(i, roles[j]), newData[i][j]);
+    }
+
+    QCOMPARE(spyInsert.count(), insertRanges.count());
+    for (int i=0; i<spyInsert.count(); i++) {
+        QCOMPARE(spyInsert[i][0].toInt(), insertRanges[i].first);
+        QCOMPARE(spyInsert[i][1].toInt(), insertRanges[i].second);
+    }
+
+    QCOMPARE(spyRemove.count(), removeRanges.count());
+    for (int i=0; i<spyRemove.count(); i++) {
+        QCOMPARE(spyRemove[i][0].toInt(), removeRanges[i].first);
+        QCOMPARE(spyRemove[i][1].toInt(), removeRanges[i].second);
+    }
+}
+
+void tst_qmlxmllistmodel::useKeys_data()
+{
+    QTest::addColumn<QString>("oldXml");
+    QTest::addColumn<int>("oldCount");
+    QTest::addColumn<QString>("newXml");
+    QTest::addColumn<QmlXmlModelData>("newData");
+    QTest::addColumn<QList<QmlXmlListRange> >("insertRanges");
+    QTest::addColumn<QList<QmlXmlListRange> >("removeRanges");
+
+    QmlXmlModelData modelData;
+
+    QTest::newRow("append 1")
+        << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics", &modelData)
+        << modelData
+        << (QList<QmlXmlListRange>() << qMakePair(1, 1))
+        << QList<QmlXmlListRange>();
+
+    QTest::newRow("append multiple")
+        << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling", &modelData)
+        << modelData
+        << (QList<QmlXmlListRange>() << qMakePair(1, 2))
+        << QList<QmlXmlListRange>();
+
+    QTest::newRow("insert in different spots")
+        << makeItemXmlAndData("name=B,age=35,sport=Athletics") << 1
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf", &modelData)
+        << modelData
+        << (QList<QmlXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2))
+        << QList<QmlXmlListRange>();
+
+    QTest::newRow("insert in middle")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=D,age=55,sport=Golf") << 2
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf", &modelData)
+        << modelData
+        << (QList<QmlXmlListRange>() << qMakePair(1, 2))
+        << QList<QmlXmlListRange>();
+
+    QTest::newRow("remove first")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics") << 2
+        << makeItemXmlAndData("name=B,age=35,sport=Athletics", &modelData)
+        << modelData
+        << QList<QmlXmlListRange>()
+        << (QList<QmlXmlListRange>() << qMakePair(0, 1));
+
+    QTest::newRow("remove last")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics") << 2
+        << makeItemXmlAndData("name=A,age=25,sport=Football", &modelData)
+        << modelData
+        << QList<QmlXmlListRange>()
+        << (QList<QmlXmlListRange>() << qMakePair(1, 1));
+
+    QTest::newRow("remove from multiple spots")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf;name=E,age=65,sport=Fencing") << 5
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=C,age=45,sport=Curling", &modelData)
+        << modelData
+        << QList<QmlXmlListRange>()
+        << (QList<QmlXmlListRange>() << qMakePair(1, 1) << qMakePair(3,2));
+
+    QTest::newRow("remove all")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling") << 3
+        << makeItemXmlAndData("", &modelData)
+        << modelData
+        << QList<QmlXmlListRange>()
+        << (QList<QmlXmlListRange>() << qMakePair(0, 3));
+
+    QTest::newRow("replace item")
+        << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
+        << makeItemXmlAndData("name=ZZZ,age=25,sport=Football", &modelData)
+        << modelData
+        << (QList<QmlXmlListRange>() << qMakePair(0, 1))
+        << (QList<QmlXmlListRange>() << qMakePair(0, 1));
+
+    QTest::newRow("add and remove simultaneously")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf") << 4
+        << makeItemXmlAndData("name=B,age=35,sport=Athletics;name=E,age=65,sport=Fencing", &modelData)
+        << modelData
+        << (QList<QmlXmlListRange>() << qMakePair(1, 1))
+        << (QList<QmlXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2));
+}
+
+void tst_qmlxmllistmodel::noKeysValueChanges()
+{
+    // The 'key' roles are 'name' and 'age', as defined in roleKeys.qml.
+    // If a 'sport' value is changed, the model should not be reloaded,
+    // since 'sport' is not marked as a key.
+
+    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+    QmlXmlListModel *model = qobject_cast<QmlXmlListModel*>(component.create());
+    QVERIFY(model != 0);
+    
+    QString xml;
+    
+    xml = makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics");
+    model->setXml(xml);
+    QTRY_COMPARE(model->count(), 2);
+
+    QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int)));
+    QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
+    QSignalSpy spyCount(model, SIGNAL(countChanged()));
+
+    xml = makeItemXmlAndData("name=A,age=25,sport=AussieRules;name=B,age=35,sport=Athletics");
+    model->setXml(xml);
+
+    // wait for the new xml data to be set, and verify no signals were emitted
+    for (int i=0; i<50; i++) {
+        QTest::qWait(100);
+        if (model->data(0, model->roles()[2]).toString() != QLatin1String("AussieRules"))
+            break;
+    }
+    QCOMPARE(model->data(0, model->roles()[2]).toString(), QLatin1String("AussieRules"));
+
+    QVERIFY(spyInsert.count() == 0);
+    QVERIFY(spyRemove.count() == 0);
+    QVERIFY(spyCount.count() == 0);
+    
+    QCOMPARE(model->count(), 2);
+}
+
+void tst_qmlxmllistmodel::keysChanged()
+{
+    // If the key roles change, the next time the data is reloaded, it should
+    // delete all its data and build a clean model (i.e. same behaviour as
+    // if no keys are set).
+
+    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+    QmlXmlListModel *model = qobject_cast<QmlXmlListModel*>(component.create());
+    QVERIFY(model != 0);
+
+    QString xml = makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics");
+    model->setXml(xml);
+    QTRY_COMPARE(model->count(), 2);
+
+    QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int)));
+    QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
+    QSignalSpy spyCount(model, SIGNAL(countChanged()));
+
+    QVERIFY(QMetaObject::invokeMethod(model, "disableNameKey"));
+    model->setXml(xml);
+
+    QTRY_VERIFY(spyInsert.count() > 0 && spyRemove.count() > 0);
+
+    QCOMPARE(spyInsert.count(), 1);
+    QCOMPARE(spyInsert[0][0].toInt(), 0);
+    QCOMPARE(spyInsert[0][1].toInt(), 2);
+
+    QCOMPARE(spyRemove.count(), 1);
+    QCOMPARE(spyRemove[0][0].toInt(), 0);
+    QCOMPARE(spyRemove[0][1].toInt(), 2);
+
+    QCOMPARE(spyCount.count(), 0);
+}
+
 QTEST_MAIN(tst_qmlxmllistmodel)
 
 #include "tst_qmlxmllistmodel.moc"
-- 
cgit v0.12


From 66b8d89feb2850dbc06503fa66f5963d48616c1d Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Tue, 23 Feb 2010 15:40:26 +1000
Subject: Add support for setting the root index when using a
 QAbstractItemModel.

Task-number: QT-2777
---
 doc/src/declarative/elements.qdoc                  |   1 +
 .../graphicsitems/qmlgraphicsvisualitemmodel.cpp   | 165 ++++++++++++++++++++-
 .../graphicsitems/qmlgraphicsvisualitemmodel_p.h   |   7 +
 3 files changed, 169 insertions(+), 4 deletions(-)

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 682a2ac..b218b64 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -88,6 +88,7 @@ The following table lists the QML elements provided by the Qt Declarative module
 \o \l Binding
 \o \l ListModel, \l ListElement
 \o \l VisualItemModel
+\o \l VisualDataModel
 \o \l XmlListModel and XmlRole
 \o \l DateTimeFormatter
 \o \l NumberFormatter
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index b96f399..4f28da7 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -327,7 +327,7 @@ public:
         if (m_listModelInterface)
             return m_listModelInterface->count();
         if (m_abstractItemModel)
-            return m_abstractItemModel->rowCount();
+            return m_abstractItemModel->rowCount(m_root);
         if (m_listAccessor)
             return m_listAccessor->count();
         return 0;
@@ -348,6 +348,8 @@ public:
 
     QVariant m_modelVariant;
     QmlListAccessor *m_listAccessor;
+
+    QModelIndex m_root;
 };
 
 class QmlGraphicsVisualDataModelDataMetaObject : public QmlOpenMetaObject
@@ -461,7 +463,7 @@ QVariant QmlGraphicsVisualDataModelDataMetaObject::initialValue(int propId)
         QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
         if (it != model->m_roleNames.end()) {
             roleToProp.insert(*it, propId);
-            QModelIndex index = model->m_abstractItemModel->index(data->m_index, 0);
+            QModelIndex index = model->m_abstractItemModel->index(data->m_index, 0, model->m_root);
             return model->m_abstractItemModel->data(index, *it);
         }
     }
@@ -560,6 +562,39 @@ QmlGraphicsVisualDataModelData *QmlGraphicsVisualDataModelPrivate::data(QObject
 
 //---------------------------------------------------------------------------
 
+/*!
+    \qmlclass VisualDataModel QmlGraphicsVisualDataModel
+    \brief The VisualDataModel encapsulates a model and delegate
+
+    A VisualDataModel encapsulates a model and the delegate that will
+    be instantiated for items in the model.
+
+    It is usually not necessary to create a VisualDataModel directly,
+    since the QML views will create one internally.
+
+    The example below illustrates using a VisualDataModel with a ListView.
+
+    \code
+    VisualDataModel {
+        id: visualModel
+        model: myModel
+        delegate: Component {
+            Rectangle {
+                height: 25
+                width: 100
+                Text { text: "Name:" + name}
+            }
+        }
+    }
+    ListView {
+        width: 100
+        height: 100
+        anchors.fill: parent
+        model: visualModel
+    }
+    \endcode
+*/
+
 QmlGraphicsVisualDataModel::QmlGraphicsVisualDataModel()
 : QmlGraphicsVisualModel(*(new QmlGraphicsVisualDataModelPrivate(0)))
 {
@@ -579,6 +614,20 @@ QmlGraphicsVisualDataModel::~QmlGraphicsVisualDataModel()
         d->m_delegateDataType->release();
 }
 
+/*!
+    \qmlproperty model VisualDataModel::model
+    This property holds the model providing data for the VisualDataModel.
+
+    The model provides a set of data that is used to create the items
+    for a view.  For large or dynamic datasets the model is usually
+    provided by a C++ model object.  The C++ model object must be a \l
+    {QAbstractItemModel} subclass or a simple list.
+
+    Models can also be created directly in QML, using a \l{ListModel} or
+    \l{XmlListModel}.
+
+    \sa {qmlmodels}{Data Models}
+*/
 QVariant QmlGraphicsVisualDataModel::model() const
 {
     Q_D(const QmlGraphicsVisualDataModel);
@@ -682,6 +731,16 @@ void QmlGraphicsVisualDataModel::setModel(const QVariant &model)
     }
 }
 
+/*!
+    \qmlproperty component VisualDataModel::delegate
+
+    The delegate provides a template defining each item instantiated by a view.
+    The index is exposed as an accessible \c index property.  Properties of the
+    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
+
+    Here is an example delegate:
+    \snippet doc/src/snippets/declarative/listview/listview.qml 0
+*/
 QmlComponent *QmlGraphicsVisualDataModel::delegate() const
 {
     Q_D(const QmlGraphicsVisualDataModel);
@@ -705,6 +764,105 @@ void QmlGraphicsVisualDataModel::setDelegate(QmlComponent *delegate)
     }
 }
 
+/*!
+    \qmlproperty QModelIndex VisualDataModel::rootIndex
+
+    QAbstractItemModel provides a heirachical tree of data, whereas
+    QML only operates on list data. rootIndex allows the children of
+    any node in a QAbstractItemModel to be provided by this model.
+
+    This property only affects models of type QAbstractItemModel.
+
+    \code
+    // main.cpp
+    Q_DECLARE_METATYPE(QModelIndex)
+
+    class MyModel : public QDirModel
+    {
+        Q_OBJECT
+    public:
+        MyModel(QmlContext *ctxt) : QDirModel(), context(ctxt) {
+            QHash<int,QByteArray> roles = roleNames();
+            roles.insert(FilePathRole, "path");
+            setRoleNames(roles);
+            context->setContextProperty("myModel", this);
+            context->setContextProperty("myRoot", QVariant::fromValue(index(0,0,QModelIndex())));
+        }
+
+        Q_INVOKABLE void setRoot(const QString &path) {
+            QModelIndex root = index(path);
+            context->setContextProperty("myRoot", QVariant::fromValue(root));
+        }
+
+        QmlContext *context;
+    };
+
+    int main(int argc, char ** argv)
+    {
+        QApplication app(argc, argv);
+
+        QmlView view;
+        view.setSource(QUrl("qrc:view.qml"));
+
+        MyModel model(view.rootContext());
+
+        view.execute();
+        view.show();
+
+        return app.exec();
+    }
+
+    #include "main.moc"
+    \endcode
+
+    \code
+    // view.qml
+    import Qt 4.6
+
+    ListView {
+        width: 200
+        height: 200
+        model: VisualDataModel {
+            model: myModel
+            rootIndex: myRoot
+            delegate: Component {
+                Rectangle {
+                    height: 25; width: 100
+                    Text { text: path }
+                    MouseRegion {
+                        anchors.fill: parent;
+                        onClicked: myModel.setRoot(path)
+                    }
+                }
+            }
+        }
+    }
+    \endcode
+
+*/
+QModelIndex QmlGraphicsVisualDataModel::rootIndex() const
+{
+    Q_D(const QmlGraphicsVisualDataModel);
+    return d->m_root;
+}
+
+void QmlGraphicsVisualDataModel::setRootIndex(const QModelIndex &root)
+{
+    Q_D(QmlGraphicsVisualDataModel);
+    if (d->m_root != root) {
+        int oldCount = d->modelCount();
+        d->m_root = root;
+        int newCount = d->modelCount();
+        if (d->m_delegate && oldCount)
+            emit itemsRemoved(0, oldCount);
+        if (d->m_delegate && newCount)
+            emit itemsInserted(0, newCount);
+        if (newCount != oldCount)
+            emit countChanged();
+        emit rootIndexChanged();
+    }
+}
+
 QString QmlGraphicsVisualDataModel::part() const
 {
     Q_D(const QmlGraphicsVisualDataModel);
@@ -786,7 +944,6 @@ QmlGraphicsItem *QmlGraphicsVisualDataModel::item(int index, const QByteArray &v
 
     if (d->modelCount() <= 0 || !d->m_delegate)
         return 0;
-
     QObject *nobj = d->m_cache.getItem(index);
     if (!nobj) {
         QmlContext *ccontext = d->m_context;
@@ -943,7 +1100,7 @@ void QmlGraphicsVisualDataModel::_q_itemsChanged(int index, int count,
                     if (d->m_listModelInterface) {
                         data->setValue(propId, d->m_listModelInterface->data(ii, QList<int>() << role).value(role));
                     } else if (d->m_abstractItemModel) {
-                        QModelIndex index = d->m_abstractItemModel->index(ii, 0);
+                        QModelIndex index = d->m_abstractItemModel->index(ii, 0, d->m_root);
                         data->setValue(propId, d->m_abstractItemModel->data(index, role));
                     }
                 }
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
index 49f9b27..7dc41a8 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
@@ -49,6 +49,8 @@
 
 QT_BEGIN_HEADER
 
+Q_DECLARE_METATYPE(QModelIndex)
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
@@ -147,6 +149,7 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsVisualDataModel : public QmlGraphicsVisual
     Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate)
     Q_PROPERTY(QString part READ part WRITE setPart)
     Q_PROPERTY(QObject *parts READ parts CONSTANT)
+    Q_PROPERTY(QModelIndex rootIndex READ rootIndex WRITE setRootIndex NOTIFY rootIndexChanged)
     Q_CLASSINFO("DefaultProperty", "delegate")
 public:
     QmlGraphicsVisualDataModel();
@@ -159,6 +162,9 @@ public:
     QmlComponent *delegate() const;
     void setDelegate(QmlComponent *);
 
+    QModelIndex rootIndex() const;
+    void setRootIndex(const QModelIndex &root);
+
     QString part() const;
     void setPart(const QString &);
 
@@ -178,6 +184,7 @@ public:
 Q_SIGNALS:
     void createdPackage(int index, QmlPackage *package);
     void destroyingPackage(QmlPackage *package);
+    void rootIndexChanged();
 
 private Q_SLOTS:
     void _q_itemsChanged(int, int, const QList<int> &);
-- 
cgit v0.12


From cd8d8d49f78c1cbb8ad3546e66a461b9e6e29ff5 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 23 Feb 2010 14:24:20 +1000
Subject: Make QmlBinding (and friends) private

QmlBinding exposes way too many implementation details to be confident
about making it public right now.
---
 doc/src/declarative/extending.qdoc                 |  12 --
 src/declarative/qml/qml.pri                        |   2 +-
 src/declarative/qml/qmlbinding.cpp                 |   2 +-
 src/declarative/qml/qmlbinding.h                   | 132 ---------------------
 src/declarative/qml/qmlbinding_p.h                 |  76 +++++++++---
 src/declarative/qml/qmlbinding_p_p.h               |  89 ++++++++++++++
 src/declarative/qml/qmlcompiledbindings_p.h        |   2 +-
 src/declarative/qml/qmlcompiler.cpp                |   2 +-
 src/declarative/qml/qmlcomponent.cpp               |   2 +-
 src/declarative/qml/qmlengine.cpp                  |   2 +-
 src/declarative/qml/qmlenginedebug.cpp             |   2 +-
 src/declarative/qml/qmlmetaproperty.cpp            |   2 +-
 src/declarative/qml/qmlobjectscriptclass.cpp       |   2 +-
 src/declarative/qml/qmlpropertycache.cpp           |   4 +-
 src/declarative/qml/qmlvme.cpp                     |   4 +-
 src/declarative/util/qmlpropertychanges.cpp        |   2 +-
 src/declarative/util/qmlstate.cpp                  |   2 +-
 src/declarative/util/qmlstategroup.cpp             |   2 +-
 src/declarative/util/qmltransitionmanager.cpp      |   2 +-
 tests/auto/declarative/qmldebug/tst_qmldebug.cpp   |   2 +-
 .../qmlmetaproperty/tst_qmlmetaproperty.cpp        |   2 +-
 21 files changed, 169 insertions(+), 178 deletions(-)
 delete mode 100644 src/declarative/qml/qmlbinding.h
 create mode 100644 src/declarative/qml/qmlbinding_p_p.h

diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index d3e6c14..396ddab 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -557,18 +557,6 @@ to be used in bindings should have a NOTIFY signal instead.
 \l {Extending QML -  Binding Example} shows the BirthdayParty example updated to
 include NOTIFY signals for use in binding.
 
-\section1 Binding and Script Properties
-
-While generally no changes are needed to a C++ class to use property
-binding, sometimes more advanced interaction between the binding engine and
-an object is desirable.  To facilitate this, there is a special exception
-in the bind engine for allowing an object to access the binding directly.
-
-If a binding is assigned to a property with a type of QmlBinding
-pointer (ie. \c {QmlBinding *}), each time the binding value changes,
-a QmlBinding instance is assigned to that property.  The QmlBinding instance
-allows the object to read the binding and to evaluate the binding's current value.
-
 \section1 Extension Objects
 
 \snippet examples/declarative/extending/extended/example.qml 0
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 2313c37..f09a944 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -60,8 +60,8 @@ HEADERS += \
     $$PWD/qmlinstruction_p.h \
     $$PWD/qmlvmemetaobject_p.h \
     $$PWD/qml.h \
-    $$PWD/qmlbinding.h \
     $$PWD/qmlbinding_p.h \
+    $$PWD/qmlbinding_p_p.h \
     $$PWD/qmlmetaproperty.h \
     $$PWD/qmlmoduleplugin.h \
     $$PWD/qmlcomponent.h \
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
index feadd0f..9f93fee 100644
--- a/src/declarative/qml/qmlbinding.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmlbinding.h"
 #include "qmlbinding_p.h"
+#include "qmlbinding_p_p.h"
 
 #include "qml.h"
 #include "qmlcontext.h"
diff --git a/src/declarative/qml/qmlbinding.h b/src/declarative/qml/qmlbinding.h
deleted file mode 100644
index 151b71c..0000000
--- a/src/declarative/qml/qmlbinding.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLBINDING_H
-#define QMLBINDING_H
-
-#include "qml.h"
-#include "qmlpropertyvaluesource.h"
-#include "qmlexpression.h"
-
-#include <QtCore/QObject>
-#include <QtCore/QMetaProperty>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QmlAbstractBinding
-{
-public:
-    QmlAbstractBinding();
-    virtual ~QmlAbstractBinding();
-
-    virtual void destroy();
-
-    virtual QString expression() const;
-
-    void setEnabled(bool e) { setEnabled(e, QmlMetaProperty::DontRemoveBinding); }
-    virtual void setEnabled(bool, QmlMetaProperty::WriteFlags) = 0;
-    virtual int propertyIndex() = 0;
-
-    void update() { update(QmlMetaProperty::DontRemoveBinding); }
-    virtual void update(QmlMetaProperty::WriteFlags) = 0;
-
-    void addToObject(QObject *);
-    void removeFromObject();
-
-protected:
-    void clear();
-
-private:
-    friend class QmlDeclarativeData;
-    friend class QmlMetaProperty;
-    friend class QmlMetaPropertyPrivate;
-    friend class QmlVME;
-
-    QObject *m_object;
-    QmlAbstractBinding **m_mePtr;
-    QmlAbstractBinding **m_prevBinding;
-    QmlAbstractBinding  *m_nextBinding;
-};
-
-class QmlContext;
-class QmlBindingPrivate;
-class Q_DECLARATIVE_EXPORT QmlBinding : public QmlExpression, 
-                                        public QmlAbstractBinding
-{
-Q_OBJECT
-public:
-    QmlBinding(const QString &, QObject *, QmlContext *, QObject *parent=0);
-    QmlBinding(void *, QmlRefCount *, QObject *, QmlContext *, const QString &, int, 
-               QObject *parent);
-    ~QmlBinding();
-
-    void setTarget(const QmlMetaProperty &);
-    QmlMetaProperty property() const;
-
-    bool enabled() const;
-
-    // Inherited from  QmlAbstractBinding
-    virtual void setEnabled(bool, QmlMetaProperty::WriteFlags flags);
-    virtual int propertyIndex();
-    virtual void update(QmlMetaProperty::WriteFlags flags);
-    virtual QString expression() const;
-
-public Q_SLOTS:
-    void update() { update(QmlMetaProperty::DontRemoveBinding); }
-
-protected:
-    void emitValueChanged();
-
-private:
-    Q_DECLARE_PRIVATE(QmlBinding)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlBinding);
-
-QT_END_HEADER
-
-#endif // QMLBINDING_H
diff --git a/src/declarative/qml/qmlbinding_p.h b/src/declarative/qml/qmlbinding_p.h
index b4f88b5..4594476 100644
--- a/src/declarative/qml/qmlbinding_p.h
+++ b/src/declarative/qml/qmlbinding_p.h
@@ -53,36 +53,82 @@
 // We mean it.
 //
 
-#include "qmlbinding.h"
+#include "qml.h"
+#include "qmlpropertyvaluesource.h"
+#include "qmlexpression.h"
 
-#include "qmlmetaproperty.h"
-#include "qmlexpression_p.h"
+#include <QtCore/QObject>
+#include <QtCore/QMetaProperty>
 
 QT_BEGIN_NAMESPACE
 
-class QmlBindingData : public QmlExpressionData
+class Q_AUTOTEST_EXPORT QmlAbstractBinding
 {
 public:
-    QmlBindingData();
-    virtual ~QmlBindingData();
+    QmlAbstractBinding();
+    virtual ~QmlAbstractBinding();
 
-    bool updating:1;
-    bool enabled:1;
+    virtual void destroy();
 
-    QmlMetaProperty property;
+    virtual QString expression() const;
 
-    virtual void refresh();
+    void setEnabled(bool e) { setEnabled(e, QmlMetaProperty::DontRemoveBinding); }
+    virtual void setEnabled(bool, QmlMetaProperty::WriteFlags) = 0;
+    virtual int propertyIndex() = 0;
+
+    void update() { update(QmlMetaProperty::DontRemoveBinding); }
+    virtual void update(QmlMetaProperty::WriteFlags) = 0;
+
+    void addToObject(QObject *);
+    void removeFromObject();
+
+protected:
+    void clear();
+
+private:
+    friend class QmlDeclarativeData;
+    friend class QmlMetaProperty;
+    friend class QmlMetaPropertyPrivate;
+    friend class QmlVME;
+
+    QObject *m_object;
+    QmlAbstractBinding **m_mePtr;
+    QmlAbstractBinding **m_prevBinding;
+    QmlAbstractBinding  *m_nextBinding;
 };
 
-class QmlBindingPrivate : public QmlExpressionPrivate
+class QmlContext;
+class QmlBindingPrivate;
+class Q_AUTOTEST_EXPORT QmlBinding : public QmlExpression, public QmlAbstractBinding
 {
-    Q_DECLARE_PUBLIC(QmlBinding)
+Q_OBJECT
 public:
-    QmlBindingPrivate();
+    QmlBinding(const QString &, QObject *, QmlContext *, QObject *parent=0);
+    QmlBinding(void *, QmlRefCount *, QObject *, QmlContext *, const QString &, int, 
+               QObject *parent);
+    ~QmlBinding();
+
+    void setTarget(const QmlMetaProperty &);
+    QmlMetaProperty property() const;
+
+    bool enabled() const;
+
+    // Inherited from  QmlAbstractBinding
+    virtual void setEnabled(bool, QmlMetaProperty::WriteFlags flags);
+    virtual int propertyIndex();
+    virtual void update(QmlMetaProperty::WriteFlags flags);
+    virtual QString expression() const;
+
+public Q_SLOTS:
+    void update() { update(QmlMetaProperty::DontRemoveBinding); }
+
+protected:
+    void emitValueChanged();
 
-    QmlBindingData *bindingData() { return static_cast<QmlBindingData *>(data); }
-    const QmlBindingData *bindingData() const { return static_cast<const QmlBindingData *>(data); }
+private:
+    Q_DECLARE_PRIVATE(QmlBinding)
 };
+Q_DECLARE_METATYPE(QmlBinding*);
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/qmlbinding_p_p.h b/src/declarative/qml/qmlbinding_p_p.h
new file mode 100644
index 0000000..e5a06fc
--- /dev/null
+++ b/src/declarative/qml/qmlbinding_p_p.h
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLBINDING_P_P_H
+#define QMLBINDING_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qmlbinding_p.h"
+
+#include "qmlmetaproperty.h"
+#include "qmlexpression_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QmlBindingData : public QmlExpressionData
+{
+public:
+    QmlBindingData();
+    virtual ~QmlBindingData();
+
+    bool updating:1;
+    bool enabled:1;
+
+    QmlMetaProperty property;
+
+    virtual void refresh();
+};
+
+class QmlBindingPrivate : public QmlExpressionPrivate
+{
+    Q_DECLARE_PUBLIC(QmlBinding)
+public:
+    QmlBindingPrivate();
+
+    QmlBindingData *bindingData() { return static_cast<QmlBindingData *>(data); }
+    const QmlBindingData *bindingData() const { return static_cast<const QmlBindingData *>(data); }
+};
+
+QT_END_NAMESPACE
+
+#endif // QMLBINDING_P_P_H
diff --git a/src/declarative/qml/qmlcompiledbindings_p.h b/src/declarative/qml/qmlcompiledbindings_p.h
index 38fb2a3..056cc21 100644
--- a/src/declarative/qml/qmlcompiledbindings_p.h
+++ b/src/declarative/qml/qmlcompiledbindings_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qmlexpression_p.h"
-#include "qmlbinding.h"
+#include "qmlbinding_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index bbae201..10b6e4f 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -63,7 +63,7 @@
 #include "qmlscriptstring.h"
 #include "qmlglobal_p.h"
 #include "qmlscriptparser_p.h"
-#include "qmlbinding.h"
+#include "qmlbinding_p.h"
 #include "qmlcompiledbindings_p.h"
 
 #include <qfxperf_p_p.h>
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 87ecb8a..4ab4f70 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -49,8 +49,8 @@
 #include "qmlvme_p.h"
 #include "qml.h"
 #include "qmlengine.h"
-#include "qmlbinding.h"
 #include "qmlbinding_p.h"
+#include "qmlbinding_p_p.h"
 #include "qmlglobal_p.h"
 #include "qmlscriptparser_p.h"
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 97d8250..2460f52 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -51,7 +51,7 @@
 #include "qmlcomponent.h"
 #include "qmlmetaproperty_p.h"
 #include "qmlmoduleplugin.h"
-#include "qmlbinding_p.h"
+#include "qmlbinding_p_p.h"
 #include "qmlvme_p.h"
 #include "qmlenginedebug_p.h"
 #include "qmlstringconverters_p.h"
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 654157c..2ab709a 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -45,7 +45,7 @@
 #include "qmlengine.h"
 #include "qmlmetatype.h"
 #include "qmlmetaproperty.h"
-#include "qmlbinding.h"
+#include "qmlbinding_p.h"
 #include "qmlcontext_p.h"
 #include "qmlwatcher_p.h"
 
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 1742c43..ac619ec 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -44,7 +44,7 @@
 
 #include "qmlcompositetypedata_p.h"
 #include "qml.h"
-#include "qmlbinding.h"
+#include "qmlbinding_p.h"
 #include "qmlcontext.h"
 #include "qmlcontext_p.h"
 #include "qmlboundsignal_p.h"
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index 15ece1d..155a7d6 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -46,7 +46,7 @@
 #include "qmldeclarativedata_p.h"
 #include "qmltypenamescriptclass_p.h"
 #include "qmllistscriptclass_p.h"
-#include "qmlbinding.h"
+#include "qmlbinding_p.h"
 #include "qmlguard_p.h"
 #include "qmlvmemetaobject_p.h"
 
diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
index a3e655b..2d087b6 100644
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ b/src/declarative/qml/qmlpropertycache.cpp
@@ -42,8 +42,8 @@
 #include "qmlpropertycache_p.h"
 
 #include "qmlengine_p.h"
-#include "qmlbinding.h"
-#include "qdebug.h"
+#include "qmlbinding_p.h"
+#include <QtCore/qdebug.h>
 
 Q_DECLARE_METATYPE(QScriptValue);
 
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index 8655809..f8f1ff0 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -51,11 +51,11 @@
 #include "qmlengine.h"
 #include "qmlcontext.h"
 #include "qmlcomponent.h"
-#include "qmlbinding.h"
+#include "qmlbinding_p.h"
 #include "qmlengine_p.h"
 #include "qmlcomponent_p.h"
 #include "qmlvmemetaobject_p.h"
-#include "qmlbinding_p.h"
+#include "qmlbinding_p_p.h"
 #include "qmlcontext_p.h"
 #include "qmlcompiledbindings_p.h"
 #include "qmlglobal_p.h"
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index 068cb4d..0ce3604 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -47,7 +47,7 @@
 #include <qmlcustomparser_p.h>
 #include <qmlparser_p.h>
 #include <qmlexpression.h>
-#include <qmlbinding.h>
+#include <qmlbinding_p.h>
 #include <qmlcontext.h>
 #include <qmlguard_p.h>
 
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 4462b1f..ea99bd5 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -48,7 +48,7 @@
 #include "qmlanimation_p.h"
 #include "qmlanimation_p_p.h"
 
-#include <qmlbinding.h>
+#include <qmlbinding_p.h>
 #include <qmlglobal_p.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index 4ad77c8..7a5db1b 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -44,7 +44,7 @@
 #include "qmltransition_p.h"
 #include "qmlstate_p_p.h"
 
-#include <qmlbinding.h>
+#include <qmlbinding_p.h>
 #include <qmlglobal_p.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index f2a4d64..60d9a60 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -43,7 +43,7 @@
 
 #include "qmlstate_p_p.h"
 
-#include <qmlbinding.h>
+#include <qmlbinding_p.h>
 #include <qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/declarative/qmldebug/tst_qmldebug.cpp b/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
index ba07331..2f1a557 100644
--- a/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
+++ b/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
@@ -51,8 +51,8 @@
 #include <QtDeclarative/qmlexpression.h>
 #include <QtDeclarative/qmlmetatype.h>
 #include <QtDeclarative/qmlmetaproperty.h>
-#include <QtDeclarative/qmlbinding.h>
 
+#include <private/qmlbinding_p.h>
 #include <private/qmldebug_p.h>
 #include <private/qmlenginedebug_p.h>
 #include <private/qmldebugclient_p.h>
diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
index c289641..540d658 100644
--- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
@@ -43,7 +43,7 @@
 #include <QtDeclarative/qmlcomponent.h>
 #include <QtDeclarative/qmlmetaproperty.h>
 #include <private/qguard_p.h>
-#include <QtDeclarative/qmlbinding.h>
+#include <private/qmlbinding_p.h>
 #include <QtGui/QLineEdit>
 
 class MyQmlObject : public QObject
-- 
cgit v0.12


From 287a8757e348f56e2ae918d1aa5bf329c985f620 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 23 Feb 2010 16:18:33 +1000
Subject: QmlExpression API review

---
 .../graphicsitems/qmlgraphicsvisualitemmodel.cpp   |  3 --
 src/declarative/qml/qmlbinding.cpp                 | 10 ++--
 src/declarative/qml/qmlbinding_p_p.h               |  2 +
 src/declarative/qml/qmlboundsignal.cpp             |  3 +-
 src/declarative/qml/qmlenginedebug.cpp             |  5 +-
 src/declarative/qml/qmlexpression.cpp              | 62 ++++++++--------------
 src/declarative/qml/qmlexpression.h                | 11 ++--
 src/declarative/qml/qmlexpression_p.h              |  2 +
 src/declarative/qml/qmlwatcher.cpp                 |  1 +
 src/declarative/util/qmlanimation.cpp              |  1 -
 src/declarative/util/qmlpropertychanges.cpp        |  2 -
 src/declarative/util/qmlstateoperations.cpp        |  1 -
 tests/auto/declarative/qmlecmascript/testtypes.h   | 10 ++--
 .../tst_qmlgraphicslistview.cpp                    |  1 -
 .../tst_qmlgraphicspathview.cpp                    |  1 -
 15 files changed, 45 insertions(+), 70 deletions(-)

diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index bfa9e9b..9c11f25 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -187,7 +187,6 @@ QVariant QmlGraphicsVisualItemModel::evaluate(int index, const QString &expressi
     QmlContext *ctxt = new QmlContext(ccontext);
     ctxt->addDefaultObject(d->children.at(index));
     QmlExpression e(ctxt, expression, objectContext);
-    e.setTrackChange(false);
     QVariant value = e.value();
     delete ctxt;
     return value;
@@ -1057,7 +1056,6 @@ QVariant QmlGraphicsVisualDataModel::evaluate(int index, const QString &expressi
         QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(nobj);
         if (item) {
             QmlExpression e(qmlContext(item), expression, objectContext);
-            e.setTrackChange(false);
             value = e.value();
         }
     } else {
@@ -1067,7 +1065,6 @@ QVariant QmlGraphicsVisualDataModel::evaluate(int index, const QString &expressi
         QmlGraphicsVisualDataModelData *data = new QmlGraphicsVisualDataModelData(index, this);
         ctxt->addDefaultObject(data);
         QmlExpression e(ctxt, expression, objectContext);
-        e.setTrackChange(false);
         value = e.value();
         delete data;
         delete ctxt;
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
index 9f93fee..aeda28b 100644
--- a/src/declarative/qml/qmlbinding.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -85,12 +85,14 @@ QmlBinding::QmlBinding(void *data, QmlRefCount *rc, QObject *obj, QmlContext *ct
 : QmlExpression(ctxt, data, rc, obj, url, lineNumber, *new QmlBindingPrivate)
 {
     setParent(parent);
+    setNotifyOnValueChanged(true);
 }
 
 QmlBinding::QmlBinding(const QString &str, QObject *obj, QmlContext *ctxt, QObject *parent)
 : QmlExpression(ctxt, str, obj, *new QmlBindingPrivate)
 {
     setParent(parent);
+    setNotifyOnValueChanged(true);
 }
 
 QmlBinding::~QmlBinding()
@@ -198,17 +200,17 @@ void QmlBinding::update(QmlMetaProperty::WriteFlags flags)
     data->release();
 }
 
-void QmlBinding::emitValueChanged()
+void QmlBindingPrivate::emitValueChanged()
 {
-    update();
-    // don't bother calling valueChanged()
+    Q_Q(QmlBinding);
+    q->update();
 }
 
 void QmlBinding::setEnabled(bool e, QmlMetaProperty::WriteFlags flags)
 {
     Q_D(QmlBinding);
     d->bindingData()->enabled = e;
-    setTrackChange(e);
+    setNotifyOnValueChanged(e);
 
     QmlAbstractBinding::setEnabled(e, flags);
 
diff --git a/src/declarative/qml/qmlbinding_p_p.h b/src/declarative/qml/qmlbinding_p_p.h
index e5a06fc..131bacc 100644
--- a/src/declarative/qml/qmlbinding_p_p.h
+++ b/src/declarative/qml/qmlbinding_p_p.h
@@ -82,6 +82,8 @@ public:
 
     QmlBindingData *bindingData() { return static_cast<QmlBindingData *>(data); }
     const QmlBindingData *bindingData() const { return static_cast<const QmlBindingData *>(data); }
+
+    virtual void emitValueChanged();
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp
index a075899..db5fd61 100644
--- a/src/declarative/qml/qmlboundsignal.cpp
+++ b/src/declarative/qml/qmlboundsignal.cpp
@@ -124,7 +124,6 @@ QmlBoundSignal::QmlBoundSignal(QmlContext *ctxt, const QString &val,
     QMetaObject::connect(scope, m_signal.methodIndex(), this, evaluateIdx);
 
     m_expression = new QmlExpression(ctxt, val, scope);
-    m_expression->setTrackChange(false);
 }
 
 QmlBoundSignal::~QmlBoundSignal()
@@ -157,7 +156,7 @@ QmlExpression *QmlBoundSignal::setExpression(QmlExpression *e)
 {
     QmlExpression *rv = m_expression;
     m_expression = e;
-    if (m_expression) m_expression->setTrackChange(false);
+    if (m_expression) m_expression->setNotifyOnValueChanged(false);
     return rv;
 }
 
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 2ab709a..973e5e5 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -408,14 +408,13 @@ void QmlEngineDebugServer::messageReceived(const QByteArray &message)
         QmlContext *context = qmlContext(object);
         QVariant result;
         if (object && context) {
-            QmlExpression *exprObj = new QmlExpression(context, expr, object);
+            QmlExpression exprObj(context, expr, object);
             bool undefined = false;
-            QVariant value = exprObj->value(&undefined);
+            QVariant value = exprObj.value(&undefined);
             if (undefined)
                 result = QLatin1String("<undefined>");
             else
                 result = valueContents(value);
-            delete exprObj;
         } else {
             result = QLatin1String("<unknown context>");
         }
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 8f0c945..64b2d7f 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -70,7 +70,7 @@ bool QmlDelayedError::addError(QmlEnginePrivate *e)
 
 QmlExpressionData::QmlExpressionData()
 : q(0), dataRef(0), expressionFunctionValid(false), expressionRewritten(false), me(0), 
-  trackChange(true), isShared(false), line(-1), guardList(0), guardListLength(0)
+  trackChange(false), isShared(false), line(-1), guardList(0), guardListLength(0)
 {
 }
 
@@ -273,14 +273,6 @@ QString QmlExpression::expression() const
 }
 
 /*!
-    Clear the expression.
-*/
-void QmlExpression::clearExpression()
-{
-    setExpression(QString());
-}
-
-/*!
     Set the expression to \a expression.
 */
 void QmlExpression::setExpression(const QString &expression)
@@ -495,44 +487,34 @@ QVariant QmlExpression::value(bool *isUndefined)
 }
 
 /*!
-    Returns true if the expression results in a constant value.
-    QmlExpression::value() must have been invoked at least once before the
-    return from this method is valid.
- */
-bool QmlExpression::isConstant() const
-{
-    Q_D(const QmlExpression);
-    return !d->data->guardList;
-}
-
-/*!
-    Returns true if the changes are tracked in the expression's value.
+Returns true if the valueChanged() signal is emitted when the expression's evaluated
+value changes.
 */
-bool QmlExpression::trackChange() const
+bool QmlExpression::notifyOnValueChanged() const
 {
     Q_D(const QmlExpression);
     return d->data->trackChange;
 }
 
 /*!
-    Set whether changes are tracked in the expression's value to \a trackChange.
+Sets whether the valueChanged() signal is emitted when the expression's evaluated
+value changes.
 
-    If true, the QmlExpression will monitor properties involved in the
-    expression's evaluation, and call QmlExpression::valueChanged() if they have
-    changed.  This allows an application to ensure that any value associated
-    with the result of the expression remains up to date.
+If true, the QmlExpression will monitor properties involved in the expression's 
+evaluation, and emit QmlExpression::valueChanged() if they have changed.  This allows 
+an application to ensure that any value associated with the result of the expression 
+remains up to date.
 
-    If false, the QmlExpression will not montitor properties involved in the
-    expression's evaluation, and QmlExpression::valueChanged() will never be
-    called.  This is more efficient if an application wants a "one off"
-    evaluation of the expression.
+If false, the QmlExpression will not montitor properties involved in the expression's 
+evaluation, and QmlExpression::valueChanged() will never be emitted.  This is more efficient 
+if an application wants a "one off" evaluation of the expression.
 
-    By default, trackChange is true.
+By default, notifyOnChange is false.
 */
-void QmlExpression::setTrackChange(bool trackChange)
+void QmlExpression::setNotifyOnValueChanged(bool notifyOnChange)
 {
     Q_D(QmlExpression);
-    d->data->trackChange = trackChange;
+    d->data->trackChange = notifyOnChange;
 }
 
 /*!
@@ -618,7 +600,8 @@ QmlError QmlExpression::error() const
 /*! \internal */
 void QmlExpression::__q_notify()
 {
-    emitValueChanged();
+    Q_D(QmlExpression);
+    d->emitValueChanged();
 }
 
 void QmlExpressionPrivate::clearGuards()
@@ -765,13 +748,10 @@ void QmlExpressionPrivate::updateGuards(const QPODVector<QmlEnginePrivate::Captu
     calling QmlExpression::value()) before this signal will be emitted.
 */
 
-/*!
-    Subclasses can capture the emission of the valueChanged() signal by overriding
-    this function. They can choose whether to then call valueChanged().
-*/
-void QmlExpression::emitValueChanged()
+void QmlExpressionPrivate::emitValueChanged()
 {
-    emit valueChanged();
+    Q_Q(QmlExpression);
+    emit q->valueChanged();
 }
 
 QmlAbstractExpression::QmlAbstractExpression()
diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h
index 428eefa..61374f2 100644
--- a/src/declarative/qml/qmlexpression.h
+++ b/src/declarative/qml/qmlexpression.h
@@ -70,12 +70,10 @@ public:
     QmlContext *context() const;
 
     QString expression() const;
-    void clearExpression();
-    virtual void setExpression(const QString &);
-    bool isConstant() const;
+    void setExpression(const QString &);
 
-    bool trackChange() const;
-    void setTrackChange(bool);
+    bool notifyOnValueChanged() const;
+    void setNotifyOnValueChanged(bool);
 
     QString sourceFile() const;
     int lineNumber() const;
@@ -87,15 +85,12 @@ public:
     void clearError();
     QmlError error() const;
 
-public Q_SLOTS:
     QVariant value(bool *isUndefined = 0);
 
 Q_SIGNALS:
     void valueChanged();
 
 protected:
-    virtual void emitValueChanged();
-
     QmlExpression(QmlContext *, const QString &, QObject *, 
                   QmlExpressionPrivate &dd);
     QmlExpression(QmlContext *, void *, QmlRefCount *rc, QObject *me, const QString &,
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
index e52a199..e4bed05 100644
--- a/src/declarative/qml/qmlexpression_p.h
+++ b/src/declarative/qml/qmlexpression_p.h
@@ -177,6 +177,8 @@ public:
         return expr->q_func();
     }
 
+    virtual void emitValueChanged();
+
     static void exceptionToError(QScriptEngine *, QmlError &);
     static QScriptValue evalInObjectScope(QmlContext *, QObject *, const QString &);
     static QScriptValue evalInObjectScope(QmlContext *, QObject *, const QScriptProgram &);
diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp
index 59503de..a8a94c5 100644
--- a/src/declarative/qml/qmlwatcher.cpp
+++ b/src/declarative/qml/qmlwatcher.cpp
@@ -154,6 +154,7 @@ bool QmlWatcher::addWatch(int id, quint32 objectId, const QString &expr)
     QmlContext *context = qmlContext(object);
     if (context) {
         QmlExpression *exprObj = new QmlExpression(context, expr, object);
+        exprObj->setNotifyOnValueChanged(true);
         QmlWatchProxy *proxy = new QmlWatchProxy(id, exprObj, objectId, this);
         exprObj->setParent(proxy);
         m_proxies[id].append(proxy);
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index c044f97..6dcce58 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -793,7 +793,6 @@ void QmlScriptActionPrivate::execute()
     const QString &str = scriptStr.script();
     if (!str.isEmpty()) {
         QmlExpression expr(scriptStr.context(), str, scriptStr.scopeObject());
-        expr.setTrackChange(false);
         expr.value();
     }
 }
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index 0ce3604..3abbadd 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -277,14 +277,12 @@ void QmlPropertyChangesPrivate::decode()
         QmlMetaProperty prop = property(name);      //### better way to check for signal property?
         if (prop.type() & QmlMetaProperty::SignalProperty) {
             QmlExpression *expression = new QmlExpression(qmlContext(q), data.toString(), object);
-            expression->setTrackChange(false);
             QmlReplaceSignalHandler *handler = new QmlReplaceSignalHandler;
             handler->property = prop;
             handler->expression = expression;
             signalReplacements << handler;
         } else if (isScript) {
             QmlExpression *expression = new QmlExpression(qmlContext(q), data.toString(), object);
-            expression->setTrackChange(false);
             expressions << qMakePair(name, expression);
         } else {
             properties << qMakePair(name, data);
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index bd1f5f0..fff8774 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -373,7 +373,6 @@ void QmlStateChangeScript::execute()
     const QString &script = d->script.script();
     if (!script.isEmpty()) {
         QmlExpression expr(d->script.context(), script, d->script.scopeObject());
-        expr.setTrackChange(false);
         expr.value();
     }
 }
diff --git a/tests/auto/declarative/qmlecmascript/testtypes.h b/tests/auto/declarative/qmlecmascript/testtypes.h
index 0af72cb..f511c29 100644
--- a/tests/auto/declarative/qmlecmascript/testtypes.h
+++ b/tests/auto/declarative/qmlecmascript/testtypes.h
@@ -173,17 +173,21 @@ QML_DECLARE_TYPE(MyQmlContainer);
 
 class MyExpression : public QmlExpression
 {
+    Q_OBJECT
 public:
     MyExpression(QmlContext *ctxt, const QString &expr)
         : QmlExpression(ctxt, expr, 0), changed(false)
     {
+        QObject::connect(this, SIGNAL(valueChanged()), this, SLOT(expressionValueChanged()));
+        setNotifyOnValueChanged(true);
     }
 
-    void emitValueChanged() {
+    bool changed;
+
+public slots:
+    void expressionValueChanged() {
         changed = true;
-        QmlExpression::emitValueChanged();
     }
-    bool changed;
 };
 
 
diff --git a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
index 13ed41d..0876520 100644
--- a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
+++ b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
@@ -1322,7 +1322,6 @@ T *tst_QmlGraphicsListView::findItem(QGraphicsObject *parent, const QString &obj
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
                 QmlExpression e(qmlContext(item), "index", item);
-                e.setTrackChange(false);
                 if (e.value().toInt() == index)
                     return static_cast<T*>(item);
             } else {
diff --git a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp b/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
index b986a64..62b3cfc 100644
--- a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
+++ b/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
@@ -452,7 +452,6 @@ T *tst_QmlGraphicsPathView::findItem(QGraphicsObject *parent, const QString &obj
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
                 QmlExpression e(qmlContext(item), "index", item);
-                e.setTrackChange(false);
                 if (e.value().toInt() == index)
                     return static_cast<T*>(item);
             } else {
-- 
cgit v0.12


From c2988e5bc92c81e35e6b11092a2c4fa237cf9fdb Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Tue, 23 Feb 2010 16:39:30 +1000
Subject: Doc fix.

Task-number: QT-2831
---
 src/declarative/util/qmlxmllistmodel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp
index 7e66576..6c9c03e 100644
--- a/src/declarative/util/qmlxmllistmodel.cpp
+++ b/src/declarative/util/qmlxmllistmodel.cpp
@@ -635,9 +635,9 @@ void QmlXmlListModel::setXml(const QString &xml)
 }
 
 /*!
-    \qmlproperty url XmlListModel::query
+    \qmlproperty string XmlListModel::query
     An absolute XPath query representing the base query for the model items. The query should start with
-    a '/' or '//'.
+    '/' or '//'.
 */
 QString QmlXmlListModel::query() const
 {
-- 
cgit v0.12


From c38be88e5314f43efd7cb6a2e8140d006e77afbe Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Tue, 23 Feb 2010 16:44:58 +1000
Subject: Make executable outside dir.

---
 .../qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp b/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
index b51266a..21c0efc 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
+++ b/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
@@ -249,7 +249,7 @@ void tst_QmlGraphicsPositioners::test_vertical_animated()
 
 void tst_QmlGraphicsPositioners::test_grid()
 {
-    QmlView *canvas = createView("data/grid.qml");
+    QmlView *canvas = createView(SRCDIR "/data/grid.qml");
 
     canvas->execute();
 
@@ -278,7 +278,7 @@ void tst_QmlGraphicsPositioners::test_grid()
 
 void tst_QmlGraphicsPositioners::test_grid_spacing()
 {
-    QmlView *canvas = createView("data/grid-spacing.qml");
+    QmlView *canvas = createView(SRCDIR "/data/grid-spacing.qml");
 
     canvas->execute();
 
@@ -381,7 +381,7 @@ void tst_QmlGraphicsPositioners::test_grid_animated()
 
 void tst_QmlGraphicsPositioners::test_repeater()
 {
-    QmlView *canvas = createView("data/repeater.qml");
+    QmlView *canvas = createView(SRCDIR "/data/repeater.qml");
 
     canvas->execute();
 
-- 
cgit v0.12


From 5ffd6c0fba0ecc709551e414ed0649de15ac3754 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Tue, 23 Feb 2010 16:46:44 +1000
Subject: Remove QmlView::execute().  QmlView::setSource() does it all now.

Task-number: QT-2538
---
 demos/declarative/minehunt/main.cpp                |  4 +-
 examples/declarative/imageprovider/main.cpp        |  3 +-
 examples/declarative/objectlistmodel/main.cpp      |  3 +-
 .../graphicsitems/qmlgraphicsvisualitemmodel.cpp   |  3 +-
 src/declarative/util/qmlview.cpp                   | 60 ++++++++++++----------
 src/declarative/util/qmlview.h                     |  3 +-
 tests/auto/declarative/layouts/tst_layouts.cpp     |  1 -
 .../qmlanimations/tst_qmlanimations.cpp            |  1 -
 .../qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp  | 45 ++++++----------
 .../tst_qmlgraphicsgridview.cpp                    | 35 ++++++-------
 .../qmlgraphicsitem/tst_qmlgraphicsitem.cpp        |  5 +-
 .../tst_qmlgraphicslistview.cpp                    | 55 ++++++++++----------
 .../tst_qmlgraphicsmousearea.cpp                   |  1 -
 .../tst_qmlgraphicsparticles.cpp                   |  1 -
 .../tst_qmlgraphicspathview.cpp                    | 18 +++----
 .../tst_qmlgraphicspositioners.cpp                 | 19 -------
 .../tst_qmlgraphicsrepeater.cpp                    | 26 +++++-----
 .../tst_qmlgraphicstextedit.cpp                    |  7 ---
 .../tst_qmlgraphicstextinput.cpp                   |  7 ---
 tools/qmlviewer/qmlviewer.cpp                      |  6 +--
 20 files changed, 123 insertions(+), 180 deletions(-)

diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
index 0b862e3..a897919 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -167,13 +167,11 @@ MyWidget::MyWidget(int width, int height, QWidget *parent, Qt::WindowFlags flags
     canvas->setFixedSize(width, height);
     vbox->addWidget(canvas);
 
-    canvas->setSource(QUrl::fromLocalFile(fileName));
-
     QmlContext *ctxt = canvas->rootContext();
     ctxt->addDefaultObject(this);
     ctxt->setContextProperty("tiles", QVariant::fromValue<QList<Tile*>*>(&_tiles));//QTBUG-5675
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(fileName));
 }
 
 MyWidget::~MyWidget()
diff --git a/examples/declarative/imageprovider/main.cpp b/examples/declarative/imageprovider/main.cpp
index 9526105..eaaded2 100644
--- a/examples/declarative/imageprovider/main.cpp
+++ b/examples/declarative/imageprovider/main.cpp
@@ -75,7 +75,6 @@ int main(int argc, char ** argv)
     QApplication app(argc, argv);
 
     QmlView view;
-    view.setSource(QUrl("qrc:view.qml"));
 
     view.engine()->addImageProvider("colors", new ColorImageProvider);
 
@@ -91,7 +90,7 @@ int main(int argc, char ** argv)
     QmlContext *ctxt = view.rootContext();
     ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 
-    view.execute();
+    view.setSource(QUrl("qrc:view.qml"));
     view.show();
 
     return app.exec();
diff --git a/examples/declarative/objectlistmodel/main.cpp b/examples/declarative/objectlistmodel/main.cpp
index 9e38bea..7ea742b 100644
--- a/examples/declarative/objectlistmodel/main.cpp
+++ b/examples/declarative/objectlistmodel/main.cpp
@@ -59,7 +59,6 @@ int main(int argc, char ** argv)
     QApplication app(argc, argv);
 
     QmlView view;
-    view.setSource(QUrl("qrc:view.qml"));
 
     QList<QObject*> dataList;
     dataList.append(new DataObject("Item 1", "red"));
@@ -70,7 +69,7 @@ int main(int argc, char ** argv)
     QmlContext *ctxt = view.rootContext();
     ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 
-    view.execute();
+    view.setSource(QUrl("qrc:view.qml"));
     view.show();
 
     return app.exec();
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index bfa9e9b..a9d67ab 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -802,11 +802,10 @@ void QmlGraphicsVisualDataModel::setDelegate(QmlComponent *delegate)
         QApplication app(argc, argv);
 
         QmlView view;
-        view.setSource(QUrl("qrc:view.qml"));
 
         MyModel model(view.rootContext());
 
-        view.execute();
+        view.setSource(QUrl("qrc:view.qml"));
         view.show();
 
         return app.exec();
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index 400ae52..05c6460 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -132,6 +132,8 @@ public:
     QmlViewPrivate(QmlView *view)
         : q(view), root(0), component(0), resizeMode(QmlView::SizeViewToRootObject) {}
 
+    void execute();
+
     QmlView *q;
 
     QGuard<QGraphicsObject> root;
@@ -152,6 +154,20 @@ public:
     QGraphicsScene scene;
 };
 
+void QmlViewPrivate::execute()
+{
+    delete root;
+    delete component;
+    component = new QmlComponent(&engine, source, q);
+
+    if (!component->isLoading()) {
+        q->continueExecute();
+    } else {
+        QObject::connect(component, SIGNAL(statusChanged(QmlComponent::Status)), q, SLOT(continueExecute()));
+    }
+}
+
+
 /*!
     \class QmlView
     \brief The QmlView class provides a widget for displaying a Qt Declarative user interface.
@@ -188,9 +204,6 @@ public:
 
     QUrl url(fileName);
     view->setSource(url);
-    ...
-    view->execute();
-    ...
     view->show();
     \endcode
 
@@ -220,6 +233,19 @@ QmlView::QmlView(QWidget *parent)
     d->init();
 }
 
+/*!
+  \fn QmlView::QmlView(const QUrl &source, QWidget *parent)
+
+  Constructs a QmlView with the given QML \a source and \a parent.
+*/
+QmlView::QmlView(const QUrl &source, QWidget *parent)
+: QGraphicsView(parent), d(new QmlViewPrivate(this))
+{
+    setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
+    d->init();
+    setSource(source);
+}
+
 void QmlViewPrivate::init()
 {
 #ifdef Q_ENABLE_PERFORMANCE_LOG
@@ -254,15 +280,14 @@ QmlView::~QmlView()
 }
 
 /*!
-    Sets the source to the \a url.
-
-    Call \l execute() to load the QML and instantiate the component.
-
-    \sa execute()
+    Sets the source to the \a url, loads the QML component and instantiates it.
  */
 void QmlView::setSource(const QUrl& url)
 {
-    d->source = url;
+    if (url != d->source) {
+        d->source = url;
+        d->execute();
+    }
 }
 
 /*!
@@ -296,23 +321,6 @@ QmlContext* QmlView::rootContext()
     return d->engine.rootContext();
 }
 
-/*!
-    Loads and instantiates the QML component set by the \l setSource() method.
-
-    \sa setSource()
-*/
-void QmlView::execute()
-{
-    delete d->root;
-    delete d->component;
-    d->component = new QmlComponent(&d->engine, d->source, this);
-
-    if (!d->component->isLoading()) {
-        continueExecute();
-    } else {
-        connect(d->component, SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(continueExecute()));
-    }
-}
 
 /*!
   \enum QmlView::Status
diff --git a/src/declarative/util/qmlview.h b/src/declarative/util/qmlview.h
index 1d6ef1c..5f72781 100644
--- a/src/declarative/util/qmlview.h
+++ b/src/declarative/util/qmlview.h
@@ -67,6 +67,7 @@ class Q_DECLARATIVE_EXPORT QmlView : public QGraphicsView
 
 public:
     explicit QmlView(QWidget *parent = 0);
+    QmlView(const QUrl &source, QWidget *parent = 0);
     virtual ~QmlView();
 
     QUrl source() const;
@@ -74,7 +75,6 @@ public:
 
     QmlEngine* engine();
     QmlContext* rootContext();
-    void execute();
 
     QGraphicsObject *rootObject() const;
 
@@ -102,6 +102,7 @@ protected:
     virtual void paintEvent(QPaintEvent *event);
     void timerEvent(QTimerEvent*);
 
+    friend class QmlViewPrivate;
     QmlViewPrivate *d;
 };
 
diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp
index ee05574..53c1ede 100644
--- a/tests/auto/declarative/layouts/tst_layouts.cpp
+++ b/tests/auto/declarative/layouts/tst_layouts.cpp
@@ -67,7 +67,6 @@ void tst_QmlGraphicsLayouts::test_qml()
 {
     QmlView *canvas = createView(SRCDIR "/data/layouts.qml");
 
-    canvas->execute();
     qApp->processEvents();
     QmlGraphicsLayoutItem *left = static_cast<QmlGraphicsLayoutItem*>(canvas->rootObject()->findChild<QmlGraphicsItem*>("left"));
     QVERIFY(left != 0);
diff --git a/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp b/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
index 9eae308..1f6347e 100644
--- a/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
+++ b/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
@@ -261,7 +261,6 @@ void tst_qmlanimations::badTypes()
         QmlView *view = new QmlView;
         view->setSource(QUrl::fromLocalFile(SRCDIR "/data/badtype1.qml"));
 
-        view->execute();
         qApp->processEvents();
 
         delete view;
diff --git a/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp b/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp
index aa6b56a..721608e 100644
--- a/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp
+++ b/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp
@@ -104,7 +104,6 @@ void tst_qmlgraphicsanchors::basicAnchors()
     QmlView *view = new QmlView;
     view->setSource(QUrl::fromLocalFile(SRCDIR "/data/anchors.qml"));
 
-    view->execute();
     qApp->processEvents();
 
     //sibling horizontal
@@ -171,28 +170,28 @@ void tst_qmlgraphicsanchors::basicAnchors()
 void tst_qmlgraphicsanchors::loops()
 {
     {
-        QmlView *view = new QmlView;
-
-        view->setSource(QUrl::fromLocalFile(SRCDIR "/data/loop1.qml"));
+        QUrl source(QUrl::fromLocalFile(SRCDIR "/data/loop1.qml"));
 
-        QString expect = "QML Text (" + view->source().toString() + ":6:5" + ") Possible anchor loop detected on horizontal anchor.";
+        QString expect = "QML Text (" + source.toString() + ":6:5" + ") Possible anchor loop detected on horizontal anchor.";
         QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
         QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
         QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
-        view->execute();
+
+        QmlView *view = new QmlView;
+        view->setSource(source);
         qApp->processEvents();
 
         delete view;
     }
 
     {
-        QmlView *view = new QmlView;
+        QUrl source(QUrl::fromLocalFile(SRCDIR "/data/loop2.qml"));
 
-        view->setSource(QUrl::fromLocalFile(SRCDIR "/data/loop2.qml"));
-
-        QString expect = "QML Image (" + view->source().toString() + ":8:3" + ") Possible anchor loop detected on horizontal anchor.";
+        QString expect = "QML Image (" + source.toString() + ":8:3" + ") Possible anchor loop detected on horizontal anchor.";
         QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
-        view->execute();
+
+        QmlView *view = new QmlView;
+        view->setSource(source);
         qApp->processEvents();
 
         delete view;
@@ -370,14 +369,13 @@ void tst_qmlgraphicsanchors::nullItem_data()
 
 void tst_qmlgraphicsanchors::crash1()
 {
-    QmlView *view = new QmlView;
+    QUrl source(QUrl::fromLocalFile(SRCDIR "/data/crash1.qml"));
 
-    view->setSource(QUrl::fromLocalFile(SRCDIR "/data/crash1.qml"));
-
-    QString expect = "QML Text (" + view->source().toString() + ":4:5" + ") Possible anchor loop detected on fill.";
+    QString expect = "QML Text (" + source.toString() + ":4:5" + ") Possible anchor loop detected on fill.";
     QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
     QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); // XXX ideally, should be one message
-    view->execute();
+
+    QmlView *view = new QmlView(source);
     qApp->processEvents();
 
     delete view;
@@ -385,11 +383,8 @@ void tst_qmlgraphicsanchors::crash1()
 
 void tst_qmlgraphicsanchors::fill()
 {
-    QmlView *view = new QmlView;
-
-    view->setSource(QUrl::fromLocalFile(SRCDIR "/data/fill.qml"));
+    QmlView *view = new QmlView(QUrl::fromLocalFile(SRCDIR "/data/fill.qml"));
 
-    view->execute();
     qApp->processEvents();
     QmlGraphicsRectangle* rect = findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("filler"));
     QCOMPARE(rect->x(), 0.0 + 10.0);
@@ -411,11 +406,8 @@ void tst_qmlgraphicsanchors::fill()
 
 void tst_qmlgraphicsanchors::centerIn()
 {
-    QmlView *view = new QmlView;
-
-    view->setSource(QUrl::fromLocalFile(SRCDIR "/data/centerin.qml"));
+    QmlView *view = new QmlView(QUrl::fromLocalFile(SRCDIR "/data/centerin.qml"));
 
-    view->execute();
     qApp->processEvents();
     QmlGraphicsRectangle* rect = findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("centered"));
     QCOMPARE(rect->x(), 75.0 + 10);
@@ -431,11 +423,8 @@ void tst_qmlgraphicsanchors::centerIn()
 
 void tst_qmlgraphicsanchors::margins()
 {
-    QmlView *view = new QmlView;
-
-    view->setSource(QUrl::fromLocalFile(SRCDIR "/data/margins.qml"));
+    QmlView *view = new QmlView(QUrl::fromLocalFile(SRCDIR "/data/margins.qml"));
 
-    view->execute();
     qApp->processEvents();
     QmlGraphicsRectangle* rect = findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("filler"));
     QCOMPARE(rect->x(), 5.0);
diff --git a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp b/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
index 2520d4a..7c8501c 100644
--- a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
+++ b/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
@@ -68,7 +68,7 @@ private slots:
     void positionViewAtIndex();
 
 private:
-    QmlView *createView(const QString &filename);
+    QmlView *createView();
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &id, int index=-1);
     template<typename T>
@@ -142,7 +142,7 @@ tst_QmlGraphicsGridView::tst_QmlGraphicsGridView()
 
 void tst_QmlGraphicsGridView::items()
 {
-    QmlView *canvas = createView(SRCDIR "/data/gridview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     model.addItem("Fred", "12345");
@@ -157,7 +157,7 @@ void tst_QmlGraphicsGridView::items()
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
     QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
@@ -190,7 +190,7 @@ void tst_QmlGraphicsGridView::items()
 
 void tst_QmlGraphicsGridView::changed()
 {
-    QmlView *canvas = createView(SRCDIR "/data/gridview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     model.addItem("Fred", "12345");
@@ -205,7 +205,7 @@ void tst_QmlGraphicsGridView::changed()
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
     QmlGraphicsFlickable *gridview = findItem<QmlGraphicsFlickable>(canvas->rootObject(), "grid");
@@ -227,7 +227,7 @@ void tst_QmlGraphicsGridView::changed()
 
 void tst_QmlGraphicsGridView::inserted()
 {
-    QmlView *canvas = createView(SRCDIR "/data/gridview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     model.addItem("Fred", "12345");
@@ -238,7 +238,7 @@ void tst_QmlGraphicsGridView::inserted()
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
     QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
@@ -309,7 +309,7 @@ void tst_QmlGraphicsGridView::inserted()
 
 void tst_QmlGraphicsGridView::removed()
 {
-    QmlView *canvas = createView(SRCDIR "/data/gridview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 40; i++)
@@ -319,7 +319,7 @@ void tst_QmlGraphicsGridView::removed()
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
     QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
@@ -469,7 +469,7 @@ void tst_QmlGraphicsGridView::removed()
 
 void tst_QmlGraphicsGridView::moved()
 {
-    QmlView *canvas = createView(SRCDIR "/data/gridview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -479,7 +479,7 @@ void tst_QmlGraphicsGridView::moved()
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
     QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
@@ -580,7 +580,6 @@ void tst_QmlGraphicsGridView::currentIndex()
     QString filename(SRCDIR "/data/gridview-initCurrent.qml");
     canvas->setSource(QUrl::fromLocalFile(filename));
 
-    canvas->execute();
     qApp->processEvents();
 
     QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
@@ -690,7 +689,7 @@ void tst_QmlGraphicsGridView::currentIndex()
 
 void tst_QmlGraphicsGridView::changeFlow()
 {
-    QmlView *canvas = createView(SRCDIR "/data/gridview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -700,7 +699,7 @@ void tst_QmlGraphicsGridView::changeFlow()
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
     QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
@@ -795,7 +794,7 @@ void tst_QmlGraphicsGridView::properties()
 
 void tst_QmlGraphicsGridView::positionViewAtIndex()
 {
-    QmlView *canvas = createView(SRCDIR "/data/gridview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 40; i++)
@@ -805,7 +804,7 @@ void tst_QmlGraphicsGridView::positionViewAtIndex()
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
     QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
@@ -883,13 +882,11 @@ void tst_QmlGraphicsGridView::positionViewAtIndex()
     delete canvas;
 }
 
-QmlView *tst_QmlGraphicsGridView::createView(const QString &filename)
+QmlView *tst_QmlGraphicsGridView::createView()
 {
     QmlView *canvas = new QmlView(0);
     canvas->setFixedSize(240,320);
 
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
     return canvas;
 }
 
diff --git a/tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp b/tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp
index 820a6de..1bface4 100644
--- a/tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp
+++ b/tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp
@@ -112,14 +112,12 @@ void tst_QmlGraphicsItem::keys()
     QmlView *canvas = new QmlView(0);
     canvas->setFixedSize(240,320);
 
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keys.qml"));
-
     KeysTestObject *testObject = new KeysTestObject;
     canvas->rootContext()->setContextProperty("keysTestObject", testObject);
 
     canvas->rootContext()->setContextProperty("enableKeyHanding", QVariant(true));
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keys.qml"));
     canvas->show();
     qApp->processEvents();
 
@@ -195,7 +193,6 @@ void tst_QmlGraphicsItem::keyNavigation()
     canvas->setFixedSize(240,320);
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keynavigation.qml"));
-    canvas->execute();
     canvas->show();
     qApp->processEvents();
 
diff --git a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
index 13ed41d..e535aaa 100644
--- a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
+++ b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
@@ -88,7 +88,7 @@ private:
     template <class T> void removed(bool animated);
     template <class T> void moved();
     template <class T> void clear();
-    QmlView *createView(const QString &filename);
+    QmlView *createView();
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &id, int index=-1);
     template<typename T>
@@ -300,7 +300,7 @@ tst_QmlGraphicsListView::tst_QmlGraphicsListView()
 template <class T>
 void tst_QmlGraphicsListView::items()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview.qml");
+    QmlView *canvas = createView();
 
     T model;
     model.addItem("Fred", "12345");
@@ -313,7 +313,7 @@ void tst_QmlGraphicsListView::items()
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -380,7 +380,7 @@ void tst_QmlGraphicsListView::items()
 template <class T>
 void tst_QmlGraphicsListView::changed()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview.qml");
+    QmlView *canvas = createView();
 
     T model;
     model.addItem("Fred", "12345");
@@ -393,7 +393,7 @@ void tst_QmlGraphicsListView::changed()
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
     QmlGraphicsFlickable *listview = findItem<QmlGraphicsFlickable>(canvas->rootObject(), "list");
@@ -416,7 +416,7 @@ void tst_QmlGraphicsListView::changed()
 template <class T>
 void tst_QmlGraphicsListView::inserted()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview.qml");
+    QmlView *canvas = createView();
 
     T model;
     model.addItem("Fred", "12345");
@@ -429,7 +429,7 @@ void tst_QmlGraphicsListView::inserted()
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -509,7 +509,7 @@ void tst_QmlGraphicsListView::inserted()
 template <class T>
 void tst_QmlGraphicsListView::removed(bool animated)
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview.qml");
+    QmlView *canvas = createView();
 
     T model;
     for (int i = 0; i < 30; i++)
@@ -522,7 +522,7 @@ void tst_QmlGraphicsListView::removed(bool animated)
     testObject->setAnimate(animated);
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -652,7 +652,7 @@ void tst_QmlGraphicsListView::removed(bool animated)
 template <class T>
 void tst_QmlGraphicsListView::clear()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview.qml");
+    QmlView *canvas = createView();
 
     T model;
     for (int i = 0; i < 30; i++)
@@ -664,7 +664,7 @@ void tst_QmlGraphicsListView::clear()
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -689,7 +689,7 @@ void tst_QmlGraphicsListView::clear()
 template <class T>
 void tst_QmlGraphicsListView::moved()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview.qml");
+    QmlView *canvas = createView();
 
     T model;
     for (int i = 0; i < 30; i++)
@@ -701,7 +701,7 @@ void tst_QmlGraphicsListView::moved()
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -785,7 +785,7 @@ void tst_QmlGraphicsListView::moved()
 
 void tst_QmlGraphicsListView::enforceRange()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview-enforcerange.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -794,7 +794,7 @@ void tst_QmlGraphicsListView::enforceRange()
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview-enforcerange.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -830,7 +830,7 @@ void tst_QmlGraphicsListView::enforceRange()
 
 void tst_QmlGraphicsListView::spacing()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -842,7 +842,7 @@ void tst_QmlGraphicsListView::spacing()
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -888,7 +888,7 @@ void tst_QmlGraphicsListView::spacing()
 
 void tst_QmlGraphicsListView::sections()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview-sections.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -897,7 +897,7 @@ void tst_QmlGraphicsListView::sections()
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview-sections.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -975,7 +975,6 @@ void tst_QmlGraphicsListView::currentIndex()
     QString filename(SRCDIR "/data/listview-initCurrent.qml");
     canvas->setSource(QUrl::fromLocalFile(filename));
 
-    canvas->execute();
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -1055,9 +1054,9 @@ void tst_QmlGraphicsListView::currentIndex()
 
 void tst_QmlGraphicsListView::itemList()
 {
-    QmlView *canvas = createView(SRCDIR "/data/itemlist.qml");
+    QmlView *canvas = createView();
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/itemlist.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "view");
@@ -1096,7 +1095,7 @@ void tst_QmlGraphicsListView::itemList()
 
 void tst_QmlGraphicsListView::cacheBuffer()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -1108,7 +1107,7 @@ void tst_QmlGraphicsListView::cacheBuffer()
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -1148,7 +1147,7 @@ void tst_QmlGraphicsListView::cacheBuffer()
 
 void tst_QmlGraphicsListView::positionViewAtIndex()
 {
-    QmlView *canvas = createView(SRCDIR "/data/listview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 40; i++)
@@ -1160,7 +1159,7 @@ void tst_QmlGraphicsListView::positionViewAtIndex()
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
     QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
@@ -1295,13 +1294,11 @@ void tst_QmlGraphicsListView::qAbstractItemModel_clear()
     clear<TestModel2>();
 }
 
-QmlView *tst_QmlGraphicsListView::createView(const QString &filename)
+QmlView *tst_QmlGraphicsListView::createView()
 {
     QmlView *canvas = new QmlView(0);
     canvas->setFixedSize(240,320);
 
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
     return canvas;
 }
 
diff --git a/tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp b/tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp
index 869a7bd..22a12a9 100644
--- a/tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp
+++ b/tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp
@@ -56,7 +56,6 @@ private:
 void tst_QmlGraphicsMouseArea::dragProperties()
 {
     QmlView *canvas = createView(SRCDIR "/data/dragproperties.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
     QVERIFY(canvas->rootObject() != 0);
diff --git a/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp b/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
index a5c0b78..195c367 100644
--- a/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
+++ b/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
@@ -113,7 +113,6 @@ QmlView *tst_QmlGraphicsParticles::createView(const QString &filename)
     canvas->setFixedSize(240,320);
 
     canvas->setSource(QUrl::fromLocalFile(filename));
-    canvas->execute();
 
     return canvas;
 }
diff --git a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp b/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
index b986a64..bb1c1af 100644
--- a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
+++ b/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
@@ -69,7 +69,7 @@ private slots:
     void pathMoved();
 
 private:
-    QmlView *createView(const QString &filename);
+    QmlView *createView();
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &objectName, int index=-1);
     template<typename T>
@@ -191,7 +191,7 @@ void tst_QmlGraphicsPathView::initValues()
 
 void tst_QmlGraphicsPathView::items()
 {
-    QmlView *canvas = createView(SRCDIR "/data/pathview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     model.addItem("Fred", "12345");
@@ -201,7 +201,7 @@ void tst_QmlGraphicsPathView::items()
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview.qml"));
     qApp->processEvents();
 
     QmlGraphicsPathView *pathview = findItem<QmlGraphicsPathView>(canvas->rootObject(), "view");
@@ -304,7 +304,7 @@ void tst_QmlGraphicsPathView::path()
 
 void tst_QmlGraphicsPathView::dataModel()
 {
-    QmlView *canvas = createView(SRCDIR "/data/datamodel.qml");
+    QmlView *canvas = createView();
 
     QmlContext *ctxt = canvas->rootContext();
     TestObject *testObject = new TestObject;
@@ -323,7 +323,7 @@ void tst_QmlGraphicsPathView::dataModel()
 
     ctxt->setContextProperty("testData", &model);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/datamodel.qml"));
     qApp->processEvents();
 
     QmlGraphicsPathView *pathview = qobject_cast<QmlGraphicsPathView*>(canvas->rootObject());
@@ -384,7 +384,7 @@ void tst_QmlGraphicsPathView::dataModel()
 
 void tst_QmlGraphicsPathView::pathMoved()
 {
-    QmlView *canvas = createView(SRCDIR "/data/pathview.qml");
+    QmlView *canvas = createView();
 
     TestModel model;
     model.addItem("Ben", "12345");
@@ -395,7 +395,7 @@ void tst_QmlGraphicsPathView::pathMoved()
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview.qml"));
     qApp->processEvents();
 
     QmlGraphicsPathView *pathview = findItem<QmlGraphicsPathView>(canvas->rootObject(), "view");
@@ -425,13 +425,11 @@ void tst_QmlGraphicsPathView::pathMoved()
     delete canvas;
 }
 
-QmlView *tst_QmlGraphicsPathView::createView(const QString &filename)
+QmlView *tst_QmlGraphicsPathView::createView()
 {
     QmlView *canvas = new QmlView(0);
     canvas->setFixedSize(240,320);
 
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
     return canvas;
 }
 
diff --git a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp b/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
index b51266a..348f59b 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
+++ b/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
@@ -75,8 +75,6 @@ void tst_QmlGraphicsPositioners::test_horizontal()
 {
     QmlView *canvas = createView(SRCDIR "/data/horizontal.qml");
 
-    canvas->execute();
-
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -98,8 +96,6 @@ void tst_QmlGraphicsPositioners::test_horizontal_spacing()
 {
     QmlView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
 
-    canvas->execute();
-
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -121,8 +117,6 @@ void tst_QmlGraphicsPositioners::test_horizontal_animated()
 {
     QmlView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
 
-    canvas->execute();
-
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -163,8 +157,6 @@ void tst_QmlGraphicsPositioners::test_vertical()
 {
     QmlView *canvas = createView(SRCDIR "/data/vertical.qml");
 
-    canvas->execute();
-
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -186,8 +178,6 @@ void tst_QmlGraphicsPositioners::test_vertical_spacing()
 {
     QmlView *canvas = createView(SRCDIR "/data/vertical-spacing.qml");
 
-    canvas->execute();
-
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -209,8 +199,6 @@ void tst_QmlGraphicsPositioners::test_vertical_animated()
 {
     QmlView *canvas = createView(SRCDIR "/data/vertical-animated.qml");
 
-    canvas->execute();
-
     //Note that they animate in
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
     QVERIFY(one != 0);
@@ -251,8 +239,6 @@ void tst_QmlGraphicsPositioners::test_grid()
 {
     QmlView *canvas = createView("data/grid.qml");
 
-    canvas->execute();
-
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
     QVERIFY(one != 0);
     QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
@@ -280,8 +266,6 @@ void tst_QmlGraphicsPositioners::test_grid_spacing()
 {
     QmlView *canvas = createView("data/grid-spacing.qml");
 
-    canvas->execute();
-
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
     QVERIFY(one != 0);
     QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
@@ -308,7 +292,6 @@ void tst_QmlGraphicsPositioners::test_grid_spacing()
 void tst_QmlGraphicsPositioners::test_grid_animated()
 {
     QmlView *canvas = createView(SRCDIR "/data/grid-animated.qml");
-    canvas->execute();
 
     //Note that all animate in
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
@@ -383,8 +366,6 @@ void tst_QmlGraphicsPositioners::test_repeater()
 {
     QmlView *canvas = createView("data/repeater.qml");
 
-    canvas->execute();
-
     QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
     QVERIFY(one != 0);
 
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp b/tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp
index c971840..9f3ff45 100644
--- a/tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp
+++ b/tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp
@@ -68,7 +68,7 @@ private slots:
     void properties();
 
 private:
-    QmlView *createView(const QString &filename);
+    QmlView *createView();
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &id);
 };
@@ -164,14 +164,14 @@ tst_QmlGraphicsRepeater::tst_QmlGraphicsRepeater()
 
 void tst_QmlGraphicsRepeater::numberModel()
 {
-    QmlView *canvas = createView(SRCDIR "/data/intmodel.qml");
+    QmlView *canvas = createView();
 
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testData", 5);
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/intmodel.qml"));
     qApp->processEvents();
 
     QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
@@ -186,7 +186,7 @@ void tst_QmlGraphicsRepeater::numberModel()
 
 void tst_QmlGraphicsRepeater::objectList()
 {
-    QmlView *canvas = createView(SRCDIR "/data/objlist.qml");
+    QmlView *canvas = createView();
 
     QObjectList data;
     for(int i=0; i<100; i++){
@@ -197,7 +197,7 @@ void tst_QmlGraphicsRepeater::objectList()
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testData", QVariant::fromValue(data));
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/objlist.qml"));
     qApp->processEvents();
 
     QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
@@ -213,7 +213,7 @@ elements to test this.
 */
 void tst_QmlGraphicsRepeater::stringList()
 {
-    QmlView *canvas = createView(SRCDIR "/data/repeater.qml");
+    QmlView *canvas = createView();
 
     QStringList data;
     data << "One";
@@ -224,7 +224,7 @@ void tst_QmlGraphicsRepeater::stringList()
     QmlContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testData", data);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater.qml"));
     qApp->processEvents();
 
     QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
@@ -265,7 +265,7 @@ void tst_QmlGraphicsRepeater::stringList()
 
 void tst_QmlGraphicsRepeater::dataModel()
 {
-    QmlView *canvas = createView(SRCDIR "/data/repeater2.qml");
+    QmlView *canvas = createView();
     QmlContext *ctxt = canvas->rootContext();
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
@@ -277,7 +277,7 @@ void tst_QmlGraphicsRepeater::dataModel()
 
     ctxt->setContextProperty("testData", &testModel);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater2.qml"));
     qApp->processEvents();
 
     QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
@@ -297,12 +297,12 @@ void tst_QmlGraphicsRepeater::dataModel()
 
 void tst_QmlGraphicsRepeater::itemModel()
 {
-    QmlView *canvas = createView(SRCDIR "/data/itemlist.qml");
+    QmlView *canvas = createView();
     QmlContext *ctxt = canvas->rootContext();
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
-    canvas->execute();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/itemlist.qml"));
     qApp->processEvents();
 
     QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
@@ -354,13 +354,11 @@ void tst_QmlGraphicsRepeater::properties()
     QCOMPARE(delegateSpy.count(),1);
 }
 
-QmlView *tst_QmlGraphicsRepeater::createView(const QString &filename)
+QmlView *tst_QmlGraphicsRepeater::createView()
 {
     QmlView *canvas = new QmlView(0);
     canvas->setFixedSize(240,320);
 
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
     return canvas;
 }
 
diff --git a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp b/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp
index cc2f929..0d6ac77 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp
+++ b/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp
@@ -604,7 +604,6 @@ void tst_qmlgraphicstextedit::selection()
 void tst_qmlgraphicstextedit::inputMethodHints()
 {
     QmlView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
 
@@ -619,7 +618,6 @@ void tst_qmlgraphicstextedit::inputMethodHints()
 void tst_qmlgraphicstextedit::cursorDelegate()
 {
     QmlView* view = createView(SRCDIR "/data/cursorTest.qml");
-    view->execute();
     view->show();
     view->setFocus();
     QmlGraphicsTextEdit *textEditObject = view->rootObject()->findChild<QmlGraphicsTextEdit*>("textEditObject");
@@ -651,7 +649,6 @@ void tst_qmlgraphicstextedit::delegateLoading()
     server.serveDirectory(SRCDIR "/data/http");
     QmlView* view = new QmlView(0);
     view->setSource(QUrl("http://localhost:42332/cursorHttpTestPass.qml"));
-    view->execute();
     view->show();
     view->setFocus();
     QTRY_VERIFY(view->rootObject());//Wait for loading to finish.
@@ -665,12 +662,10 @@ void tst_qmlgraphicstextedit::delegateLoading()
     delegate = view->rootObject()->findChild<QmlGraphicsItem*>("delegateSlow");
     QVERIFY(delegate);
     view->setSource(QUrl("http://localhost:42332/cursorHttpTestFail1.qml"));
-    view->execute();
     view->show();
     view->setFocus();
     QTRY_VERIFY(!view->rootObject()); // there is fail item inside this test
     view->setSource(QUrl("http://localhost:42332/cursorHttpTestFail2.qml"));
-    view->execute();
     view->show();
     view->setFocus();
     QTRY_VERIFY(!view->rootObject()); // there is fail item inside this test
@@ -688,7 +683,6 @@ the extent of the text, then they should ignore the keys.
 void tst_qmlgraphicstextedit::navigation()
 {
     QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
 
@@ -711,7 +705,6 @@ void tst_qmlgraphicstextedit::navigation()
 void tst_qmlgraphicstextedit::readOnly()
 {
     QmlView *canvas = createView(SRCDIR "/data/readOnly.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
 
diff --git a/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp b/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp
index 8b45fc7..748cf5e 100644
--- a/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp
+++ b/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp
@@ -349,7 +349,6 @@ void tst_qmlgraphicstextinput::maxLength()
 {
     //QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
     QmlView *canvas = createView(SRCDIR "/data/maxLength.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
     QVERIFY(canvas->rootObject() != 0);
@@ -378,7 +377,6 @@ void tst_qmlgraphicstextinput::masks()
     //Not a comprehensive test of the possible masks, that's done elsewhere (QLineEdit)
     //QString componentStr = "import Qt 4.6\nTextInput {  inputMask: 'HHHHhhhh'; }";
     QmlView *canvas = createView(SRCDIR "/data/masks.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
     QVERIFY(canvas->rootObject() != 0);
@@ -403,7 +401,6 @@ void tst_qmlgraphicstextinput::validators()
     // here to ensure that their exposure to QML is working.
 
     QmlView *canvas = createView(SRCDIR "/data/validators.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
 
@@ -493,7 +490,6 @@ void tst_qmlgraphicstextinput::validators()
 void tst_qmlgraphicstextinput::inputMethodHints()
 {
     QmlView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
 
@@ -513,7 +509,6 @@ the extent of the text, then they should ignore the keys.
 void tst_qmlgraphicstextinput::navigation()
 {
     QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
 
@@ -546,7 +541,6 @@ void tst_qmlgraphicstextinput::navigation()
 void tst_qmlgraphicstextinput::cursorDelegate()
 {
     QmlView* view = createView(SRCDIR "/data/cursorTest.qml");
-    view->execute();
     view->show();
     view->setFocus();
     QmlGraphicsTextInput *textInputObject = view->rootObject()->findChild<QmlGraphicsTextInput*>("textInputObject");
@@ -574,7 +568,6 @@ void tst_qmlgraphicstextinput::cursorDelegate()
 void tst_qmlgraphicstextinput::readOnly()
 {
     QmlView *canvas = createView(SRCDIR "/data/readOnly.qml");
-    canvas->execute();
     canvas->show();
     canvas->setFocus();
 
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 626e4c4..f881cd7 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -1063,11 +1063,11 @@ void QmlViewer::openQml(const QString& file_or_url)
         }
     }
 
-    canvas->setSource(url);
-
     QTime t;
     t.start();
-    canvas->execute();
+
+    canvas->setSource(url);
+
     qWarning() << "Wall startup time:" << t.elapsed();
 
     if (!skin) {
-- 
cgit v0.12


From 23fb8f6e4f3f6fe4ae7611de84f09cc0095e240c Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Tue, 23 Feb 2010 15:41:25 +1000
Subject: Add missing NOTIFY signals to positioners, particles and webview

Reviewed-by: Aaron Kennedy
---
 .../graphicsitems/qmlgraphicsparticles.cpp         |  67 +++++++++++--
 .../graphicsitems/qmlgraphicsparticles_p.h         |  55 ++++++-----
 .../graphicsitems/qmlgraphicspositioners.cpp       |  27 ++++-
 .../graphicsitems/qmlgraphicspositioners_p.h       |  19 ++--
 .../graphicsitems/qmlgraphicswebview.cpp           |  20 +++-
 .../graphicsitems/qmlgraphicswebview_p.h           |  15 ++-
 .../qmlgraphicsparticles/data/particlemotion.qml   |  33 +++++++
 .../tst_qmlgraphicsparticles.cpp                   |  88 +++++++++++++++++
 .../data/propertychanges.qml                       |  39 ++++++++
 .../tst_qmlgraphicspositioners.cpp                 |  59 ++++++++++-
 .../qmlgraphicswebview/data/propertychanges.qml    |  33 +++++++
 .../qmlgraphicswebview/tst_qmlgraphicswebview.cpp  | 109 +++++++++++++++++++++
 12 files changed, 521 insertions(+), 43 deletions(-)
 create mode 100644 tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
 create mode 100644 tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml

diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
index 08fce74..e23f6f0 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
@@ -188,13 +188,13 @@ void QmlGraphicsParticleMotionLinear::advance(QmlGraphicsParticle &p, int interv
 */
 
 /*!
-    \qmlproperty int ParticleMotionGravity::xattractor
-    \qmlproperty int ParticleMotionGravity::yattractor
+    \qmlproperty qreal ParticleMotionGravity::xattractor
+    \qmlproperty qreal ParticleMotionGravity::yattractor
     These properties hold the x and y coordinates of the point attracting the particles.
 */
 
 /*!
-    \qmlproperty int ParticleMotionGravity::acceleration
+    \qmlproperty qreal ParticleMotionGravity::acceleration
     This property holds the acceleration to apply to the particles.
 */
 
@@ -213,6 +213,31 @@ void QmlGraphicsParticleMotionLinear::advance(QmlGraphicsParticle &p, int interv
     \brief the acceleration to apply to the particles.
 */
 
+void QmlGraphicsParticleMotionGravity::setXAttractor(qreal x)
+{
+    if (qFuzzyCompare(x, _xAttr))
+        return;
+    _xAttr = x;
+    emit xattractorChanged();
+}
+
+void QmlGraphicsParticleMotionGravity::setYAttractor(qreal y)
+{
+    if (qFuzzyCompare(y, _yAttr))
+        return;
+    _yAttr = y;
+    emit yattractorChanged();
+}
+
+void QmlGraphicsParticleMotionGravity::setAcceleration(qreal accel)
+{
+    qreal scaledAccel = accel/1000000.0;
+    if (qFuzzyCompare(scaledAccel, _accel))
+        return;
+    _accel = scaledAccel;
+    emit accelerationChanged();
+}
+
 void QmlGraphicsParticleMotionGravity::advance(QmlGraphicsParticle &p, int interval)
 {
     qreal xdiff = p.x - _xAttr;
@@ -276,14 +301,14 @@ Rectangle {
 */
 
 /*!
-    \qmlproperty int QmlGraphicsParticleMotionWander::xvariance
-    \qmlproperty int QmlGraphicsParticleMotionWander::yvariance
+    \qmlproperty qreal QmlGraphicsParticleMotionWander::xvariance
+    \qmlproperty qreal QmlGraphicsParticleMotionWander::yvariance
 
     These properties set the amount to wander in the x and y directions.
 */
 
 /*!
-    \qmlproperty int QmlGraphicsParticleMotionWander::pace
+    \qmlproperty qreal QmlGraphicsParticleMotionWander::pace
     This property holds how quickly the paricles will move from side to side.
 */
 
@@ -335,6 +360,33 @@ void QmlGraphicsParticleMotionWander::destroy(QmlGraphicsParticle &p)
         delete (Data*)p.data;
 }
 
+void QmlGraphicsParticleMotionWander::setXVariance(qreal var)
+{
+    qreal scaledVar = var / 1000.0;
+    if (qFuzzyCompare(scaledVar, _xvariance))
+        return;
+    _xvariance = scaledVar;
+    emit xvarianceChanged();
+}
+
+void QmlGraphicsParticleMotionWander::setYVariance(qreal var)
+{
+    qreal scaledVar = var / 1000.0;
+    if (qFuzzyCompare(scaledVar, _yvariance))
+        return;
+    _yvariance = scaledVar;
+    emit yvarianceChanged();
+}
+
+void QmlGraphicsParticleMotionWander::setPace(qreal pace)
+{
+    qreal scaledPace = pace / 1000.0;
+    if (qFuzzyCompare(scaledPace, _pace))
+        return;
+    _pace = scaledPace;
+    emit paceChanged();
+}
+
 //---------------------------------------------------------------------------
 class QmlGraphicsParticlesPainter : public QmlGraphicsItem
 {
@@ -1125,7 +1177,10 @@ QmlGraphicsParticleMotion *QmlGraphicsParticles::motion() const
 void QmlGraphicsParticles::setMotion(QmlGraphicsParticleMotion *motion)
 {
     Q_D(QmlGraphicsParticles);
+    if (motion == d->motion)
+        return;
     d->motion = motion;
+    emit motionChanged();
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
index 7f0f9cd..8e66335 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
@@ -77,27 +77,32 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsParticleMotionGravity : public QmlGraphics
 {
     Q_OBJECT
 
-    Q_PROPERTY(int xattractor READ xAttractor WRITE setXAttractor)
-    Q_PROPERTY(int yattractor READ yAttractor WRITE setYAttractor)
-    Q_PROPERTY(int acceleration READ acceleration WRITE setAcceleration)
+    Q_PROPERTY(qreal xattractor READ xAttractor WRITE setXAttractor NOTIFY xattractorChanged)
+    Q_PROPERTY(qreal yattractor READ yAttractor WRITE setYAttractor NOTIFY yattractorChanged)
+    Q_PROPERTY(qreal acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged)
 public:
     QmlGraphicsParticleMotionGravity(QObject *parent=0)
-        : QmlGraphicsParticleMotion(parent), _xAttr(0), _yAttr(0), _accel(0.00005) {}
+        : QmlGraphicsParticleMotion(parent), _xAttr(0.0), _yAttr(0.0), _accel(0.00005) {}
 
-    int xAttractor() const { return _xAttr; }
-    void setXAttractor(int x) { _xAttr = x; }
+    qreal xAttractor() const { return _xAttr; }
+    void setXAttractor(qreal x);
 
-    int yAttractor() const { return _yAttr; }
-    void setYAttractor(int y) { _yAttr = y; }
+    qreal yAttractor() const { return _yAttr; }
+    void setYAttractor(qreal y);
 
-    int acceleration() const { return int(_accel * 1000000); }
-    void setAcceleration(int accel) { _accel = qreal(accel)/1000000.0; }
+    qreal acceleration() const { return _accel * 1000000; }
+    void setAcceleration(qreal accel);
 
     virtual void advance(QmlGraphicsParticle &, int interval);
 
+Q_SIGNALS:
+    void xattractorChanged();
+    void yattractorChanged();
+    void accelerationChanged();
+
 private:
-    int _xAttr;
-    int _yAttr;
+    qreal _xAttr;
+    qreal _yAttr;
     qreal _accel;
 };
 
@@ -121,18 +126,23 @@ public:
         qreal y_var;
     };
 
-    Q_PROPERTY(int xvariance READ xVariance WRITE setXVariance)
-    int xVariance() const { return int(_xvariance * 1000); }
-    void setXVariance(int var) { _xvariance = var / 1000.0; }
+    Q_PROPERTY(qreal xvariance READ xVariance WRITE setXVariance NOTIFY xvarianceChanged)
+    qreal xVariance() const { return _xvariance * 1000.0; }
+    void setXVariance(qreal var);
 
-    Q_PROPERTY(int yvariance READ yVariance WRITE setYVariance)
-    int yVariance() const { return int(_yvariance * 1000); }
-    void setYVariance(int var) { _yvariance = var / 1000.0; }
+    Q_PROPERTY(qreal yvariance READ yVariance WRITE setYVariance NOTIFY yvarianceChanged)
+    qreal yVariance() const { return _yvariance * 1000.0; }
+    void setYVariance(qreal var);
 
-    Q_PROPERTY(int pace READ pace WRITE setPace)
-    int pace() const { return int(_pace * 1000); }
-    void setPace(int pace) { _pace = pace / 1000.0; }
+    Q_PROPERTY(qreal pace READ pace WRITE setPace NOTIFY paceChanged)
+    qreal pace() const { return _pace * 1000.0; }
+    void setPace(qreal pace);
 
+Q_SIGNALS:
+    void xvarianceChanged();
+    void yvarianceChanged();
+    void paceChanged();
+    
 private:
     QmlGraphicsParticles *particles;
     qreal _xvariance;
@@ -157,7 +167,7 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsParticles : public QmlGraphicsItem
     Q_PROPERTY(qreal angleDeviation READ angleDeviation WRITE setAngleDeviation NOTIFY angleDeviationChanged)
     Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity NOTIFY velocityChanged)
     Q_PROPERTY(qreal velocityDeviation READ velocityDeviation WRITE setVelocityDeviation NOTIFY velocityDeviationChanged)
-    Q_PROPERTY(QmlGraphicsParticleMotion *motion READ motion WRITE setMotion)
+    Q_PROPERTY(QmlGraphicsParticleMotion *motion READ motion WRITE setMotion NOTIFY motionChanged)
     Q_CLASSINFO("DefaultProperty", "motion")
 
 public:
@@ -225,6 +235,7 @@ Q_SIGNALS:
     void velocityChanged();
     void velocityDeviationChanged();
     void emittingChanged();
+    void motionChanged();
 
 private Q_SLOTS:
     void imageLoaded();
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
index 8adf239..805c912 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
@@ -138,7 +138,10 @@ QmlTransition *QmlGraphicsBasePositioner::move() const
 void QmlGraphicsBasePositioner::setMove(QmlTransition *mt)
 {
     Q_D(QmlGraphicsBasePositioner);
+    if (mt == d->moveTransition)
+        return;
     d->moveTransition = mt;
+    emit moveChanged();
 }
 
 QmlTransition *QmlGraphicsBasePositioner::add() const
@@ -150,7 +153,11 @@ QmlTransition *QmlGraphicsBasePositioner::add() const
 void QmlGraphicsBasePositioner::setAdd(QmlTransition *add)
 {
     Q_D(QmlGraphicsBasePositioner);
+    if (add == d->addTransition)
+        return;
+
     d->addTransition = add;
+    emit addChanged();
 }
 
 void QmlGraphicsBasePositioner::componentComplete()
@@ -362,7 +369,7 @@ Column {
     move: Transition {
         NumberAnimation {
             properties: "y"
-            ease: "easeOutBounce"
+            easing: "easeOutBounce"
         }
     }
 }
@@ -647,6 +654,24 @@ QmlGraphicsGrid::QmlGraphicsGrid(QmlGraphicsItem *parent) :
     many rows some rows will be of zero width.
 */
 
+void QmlGraphicsGrid::setColumns(const int columns)
+{
+    if (columns == _columns)
+        return;
+    _columns = columns;
+    prePositioning();
+    emit columnsChanged();
+}
+
+void QmlGraphicsGrid::setRows(const int rows)
+{
+    if (rows == _rows)
+        return;
+    _rows = rows;
+    prePositioning();
+    emit rowsChanged();
+}
+
 void QmlGraphicsGrid::doPositioning()
 {
     int c=_columns,r=_rows;//Actual number of rows/columns
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
index 1fb687a..2f905e5 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
@@ -62,8 +62,8 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsBasePositioner : public QmlGraphicsItem
     Q_OBJECT
 
     Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
-    Q_PROPERTY(QmlTransition *move READ move WRITE setMove)
-    Q_PROPERTY(QmlTransition *add READ add WRITE setAdd)
+    Q_PROPERTY(QmlTransition *move READ move WRITE setMove NOTIFY moveChanged)
+    Q_PROPERTY(QmlTransition *add READ add WRITE setAdd NOTIFY addChanged)
 public:
     enum PositionerType { None = 0x0, Horizontal = 0x1, Vertical = 0x2, Both = 0x3 };
     QmlGraphicsBasePositioner(PositionerType, QmlGraphicsItem *parent);
@@ -86,6 +86,8 @@ protected:
 
 Q_SIGNALS:
     void spacingChanged();
+    void moveChanged();
+    void addChanged();
 
 protected Q_SLOTS:
     virtual void doPositioning()=0;
@@ -134,16 +136,21 @@ private:
 class Q_DECLARATIVE_EXPORT QmlGraphicsGrid : public QmlGraphicsBasePositioner
 {
     Q_OBJECT
-    Q_PROPERTY(int rows READ rows WRITE setRows)
-    Q_PROPERTY(int columns READ columns WRITE setcolumns)
+    Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowChanged)
+    Q_PROPERTY(int columns READ columns WRITE setColumns NOTIFY columnsChanged)
 public:
     QmlGraphicsGrid(QmlGraphicsItem *parent=0);
 
     int rows() const {return _rows;}
-    void setRows(const int rows){_rows = rows;}
+    void setRows(const int rows);
 
     int columns() const {return _columns;}
-    void setcolumns(const int columns){_columns = columns;}
+    void setColumns(const int columns);
+
+Q_SIGNALS:
+    void rowsChanged();
+    void columnsChanged();
+
 protected Q_SLOTS:
     virtual void doPositioning();
 
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index 0c21f75..f9bbb22 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
@@ -483,6 +483,8 @@ void QmlGraphicsWebView::setRenderingEnabled(bool enabled)
     if (d->rendering == enabled)
         return;
     d->rendering = enabled;
+    emit renderingEnabledChanged();
+
     setCacheFrozen(!enabled);
     if (enabled)
         clearCache();
@@ -596,7 +598,10 @@ int QmlGraphicsWebView::pressGrabTime() const
 void QmlGraphicsWebView::setPressGrabTime(int ms)
 {
     Q_D(QmlGraphicsWebView);
+    if (d->pressTime == ms) 
+        return;
     d->pressTime = ms;
+    emit pressGrabTimeChanged();
 }
 
 void QmlGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
@@ -1024,6 +1029,7 @@ void QmlGraphicsWebView::setHtml(const QString &html, const QUrl &baseUrl)
         d->pending_url = baseUrl;
         d->pending_string = html;
     }
+    emit htmlChanged();
 }
 
 void QmlGraphicsWebView::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl)
@@ -1116,8 +1122,10 @@ QmlComponent *QmlGraphicsWebView::newWindowComponent() const
 void QmlGraphicsWebView::setNewWindowComponent(QmlComponent *newWindow)
 {
     Q_D(QmlGraphicsWebView);
-    delete d->newWindowComponent;
+    if (newWindow == d->newWindowComponent)
+        return;
     d->newWindowComponent = newWindow;
+    emit newWindowComponentChanged();
 }
 
 
@@ -1137,8 +1145,16 @@ QmlGraphicsItem *QmlGraphicsWebView::newWindowParent() const
 void QmlGraphicsWebView::setNewWindowParent(QmlGraphicsItem *parent)
 {
     Q_D(QmlGraphicsWebView);
-    delete d->newWindowParent;
+    if (parent == d->newWindowParent)
+        return;
+    if (d->newWindowParent && parent) {
+        QList<QGraphicsItem *> children = d->newWindowParent->childItems();
+        for (int i = 0; i < children.count(); ++i) {
+            children.at(i)->setParentItem(parent);
+        }
+    }
     d->newWindowParent = parent;
+    emit newWindowParentChanged();    
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
index 30ba0e4..ca63be9 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
@@ -97,9 +97,9 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsWebView : public QmlGraphicsPaintedItem
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
     Q_PROPERTY(QString statusText READ statusText NOTIFY statusTextChanged)
 
-    Q_PROPERTY(QString html READ html WRITE setHtml)
+    Q_PROPERTY(QString html READ html WRITE setHtml NOTIFY htmlChanged)
 
-    Q_PROPERTY(int pressGrabTime READ pressGrabTime WRITE setPressGrabTime)
+    Q_PROPERTY(int pressGrabTime READ pressGrabTime WRITE setPressGrabTime NOTIFY pressGrabTimeChanged)
 
     Q_PROPERTY(int preferredWidth READ preferredWidth WRITE setPreferredWidth NOTIFY preferredWidthChanged)
     Q_PROPERTY(int preferredHeight READ preferredHeight WRITE setPreferredHeight NOTIFY preferredHeightChanged)
@@ -116,10 +116,10 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsWebView : public QmlGraphicsPaintedItem
 
     Q_PROPERTY(QmlListProperty<QObject> javaScriptWindowObjects READ javaScriptWindowObjects CONSTANT)
 
-    Q_PROPERTY(QmlComponent* newWindowComponent READ newWindowComponent WRITE setNewWindowComponent)
-    Q_PROPERTY(QmlGraphicsItem* newWindowParent READ newWindowParent WRITE setNewWindowParent)
+    Q_PROPERTY(QmlComponent* newWindowComponent READ newWindowComponent WRITE setNewWindowComponent NOTIFY newWindowComponentChanged)
+    Q_PROPERTY(QmlGraphicsItem* newWindowParent READ newWindowParent WRITE setNewWindowParent NOTIFY newWindowParentChanged)
 
-    Q_PROPERTY(bool renderingEnabled READ renderingEnabled WRITE setRenderingEnabled)
+    Q_PROPERTY(bool renderingEnabled READ renderingEnabled WRITE setRenderingEnabled NOTIFY renderingEnabledChanged)
 
 public:
     QmlGraphicsWebView(QmlGraphicsItem *parent=0);
@@ -192,7 +192,12 @@ Q_SIGNALS:
     void titleChanged(const QString&);
     void iconChanged();
     void statusTextChanged();
+    void htmlChanged();
+    void pressGrabTimeChanged();
     void zoomFactorChanged();
+    void newWindowComponentChanged();
+    void newWindowParentChanged();
+    void renderingEnabledChanged();
 
     void loadStarted();
     void loadFinished();
diff --git a/tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml b/tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml
new file mode 100644
index 0000000..ace61fe
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml
@@ -0,0 +1,33 @@
+import Qt 4.6
+Rectangle {
+    width: 240
+    height: 320
+    color: "black"
+    Particles {
+        objectName: "particles"    
+        anchors.fill: parent
+        width: 1
+        height: 1
+        source: "particle.png"
+        lifeSpan: 5000
+        count: 200
+        angle: 270
+        angleDeviation: 45
+        velocity: 50
+        velocityDeviation: 30
+        ParticleMotionGravity {
+            objectName: "motionGravity"
+            yattractor: 1000
+            xattractor: 0
+            acceleration: 25
+        }
+    }
+    resources: [
+        ParticleMotionWander {
+            objectName: "motionWander"
+            xvariance: 30
+            yvariance: 30
+            pace: 100
+        }
+    ]
+}
\ No newline at end of file
diff --git a/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp b/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
index 195c367..9436772 100644
--- a/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
+++ b/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include <QtTest/QtTest>
+#include <QtTest/QSignalSpy>
 #include <qmlview.h>
 #include <private/qmlgraphicsparticles_p.h>
 
@@ -50,6 +51,8 @@ public:
 
 private slots:
     void properties();
+    void motionGravity();
+    void motionWander();
     void runs();
 private:
     QmlView *createView(const QString &filename);
@@ -98,6 +101,91 @@ void tst_QmlGraphicsParticles::properties()
     QCOMPARE(particles->emissionRate(), 12);
 }
 
+void tst_QmlGraphicsParticles::motionGravity()
+{
+    QmlView *canvas = createView(SRCDIR "/data/particlemotion.qml");
+    QVERIFY(canvas->rootObject());
+    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
+    QVERIFY(particles);
+
+    QmlGraphicsParticleMotionGravity* motionGravity = canvas->rootObject()->findChild<QmlGraphicsParticleMotionGravity*>("motionGravity");
+    QCOMPARE(particles->motion(), motionGravity);
+
+    QSignalSpy xattractorSpy(motionGravity, SIGNAL(xattractorChanged()));
+    QSignalSpy yattractorSpy(motionGravity, SIGNAL(yattractorChanged()));
+    QSignalSpy accelerationSpy(motionGravity, SIGNAL(accelerationChanged()));
+
+    QCOMPARE(motionGravity->xAttractor(), 0.0);
+    QCOMPARE(motionGravity->yAttractor(), 1000.0);
+    QCOMPARE(motionGravity->acceleration(), 25.0);
+
+    motionGravity->setXAttractor(20.0);
+    motionGravity->setYAttractor(10.0);
+    motionGravity->setAcceleration(10.0);
+
+    QCOMPARE(motionGravity->xAttractor(), 20.0);
+    QCOMPARE(motionGravity->yAttractor(), 10.0);
+    QCOMPARE(motionGravity->acceleration(), 10.0);
+
+    QCOMPARE(xattractorSpy.count(), 1);
+    QCOMPARE(yattractorSpy.count(), 1);
+    QCOMPARE(accelerationSpy.count(), 1);
+
+    motionGravity->setXAttractor(20.0);
+    motionGravity->setYAttractor(10.0);
+    motionGravity->setAcceleration(10.0);
+
+    QCOMPARE(xattractorSpy.count(), 1);
+    QCOMPARE(yattractorSpy.count(), 1);
+    QCOMPARE(accelerationSpy.count(), 1);
+}
+
+void tst_QmlGraphicsParticles::motionWander()
+{
+    QmlView *canvas = createView(SRCDIR "/data/particlemotion.qml");
+    QVERIFY(canvas->rootObject());
+    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
+    QVERIFY(particles);
+    
+    QSignalSpy motionSpy(particles, SIGNAL(motionChanged()));
+    QmlGraphicsParticleMotionWander* motionWander = canvas->rootObject()->findChild<QmlGraphicsParticleMotionWander*>("motionWander");
+    
+    particles->setMotion(motionWander);
+    QCOMPARE(particles->motion(),motionWander);
+    QCOMPARE(motionSpy.count(), 1);
+    
+    particles->setMotion(motionWander);
+    QCOMPARE(motionSpy.count(), 1);
+
+    QSignalSpy xvarianceSpy(motionWander, SIGNAL(xvarianceChanged()));
+    QSignalSpy yvarianceSpy(motionWander, SIGNAL(yvarianceChanged()));
+    QSignalSpy paceSpy(motionWander, SIGNAL(paceChanged()));
+
+    QCOMPARE(motionWander->xVariance(), 30.0);
+    QCOMPARE(motionWander->yVariance(), 30.0);
+    QCOMPARE(motionWander->pace(), 100.0);
+
+    motionWander->setXVariance(20.0);
+    motionWander->setYVariance(10.0);
+    motionWander->setPace(10.0);
+
+    QCOMPARE(motionWander->xVariance(), 20.0);
+    QCOMPARE(motionWander->yVariance(), 10.0);
+    QCOMPARE(motionWander->pace(), 10.0);
+
+    QCOMPARE(xvarianceSpy.count(), 1);
+    QCOMPARE(yvarianceSpy.count(), 1);
+    QCOMPARE(paceSpy.count(), 1);
+
+    motionWander->setXVariance(20.0);
+    motionWander->setYVariance(10.0);
+    motionWander->setPace(10.0);
+
+    QCOMPARE(xvarianceSpy.count(), 1);
+    QCOMPARE(yvarianceSpy.count(), 1);
+    QCOMPARE(paceSpy.count(), 1);
+}
+
 void tst_QmlGraphicsParticles::runs()
 {
     QmlView *canvas = createView(SRCDIR "/data/particles.qml");
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml b/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
new file mode 100644
index 0000000..c3dc7bf
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
@@ -0,0 +1,39 @@
+import Qt 4.6
+
+Grid {
+    id: myGrid
+    
+    width: 270
+    height: 270
+    x: 3
+    y: 3
+    columns: 4
+    spacing: 3
+    
+    add: columnTransition
+    move: columnTransition
+
+    Repeater {
+        model: 20
+        Rectangle { color: "black"; width: 50; height: 50 }
+    }
+
+    data: [
+    Transition {
+        id: rowTransition
+        objectName: "rowTransition"
+        NumberAnimation {
+            properties: "x,y";
+            easing: "easeOutInCubic"
+        }
+    },
+    Transition {
+        id: columnTransition
+        objectName: "columnTransition"
+        NumberAnimation {
+            properties: "x,y";
+            easing: "easeOutInCubic"
+        }
+    }
+    ]
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp b/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
index 348f59b..5089dc5 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
+++ b/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
@@ -42,6 +42,8 @@
 #include <private/qlistmodelinterface_p.h>
 #include <qmlview.h>
 #include <private/qmlgraphicsrectangle_p.h>
+#include <private/qmlgraphicspositioners_p.h>
+#include <private/qmltransition_p.h>
 #include <qmlexpression.h>
 #include "../../../shared/util.h"
 
@@ -61,7 +63,7 @@ private slots:
     void test_grid();
     void test_grid_spacing();
     void test_grid_animated();
-
+    void test_propertychanges();
     void test_repeater();
 private:
     QmlView *createView(const QString &filename);
@@ -361,6 +363,61 @@ void tst_QmlGraphicsPositioners::test_grid_animated()
     QTRY_COMPARE(five->y(), 50.0);
 
 }
+void tst_QmlGraphicsPositioners::test_propertychanges()
+{
+    QmlView *canvas = createView("data/propertychanges.qml");
+
+    QmlGraphicsGrid *grid = qobject_cast<QmlGraphicsGrid*>(canvas->rootObject());
+    QmlTransition *rowTransition = canvas->rootObject()->findChild<QmlTransition*>("rowTransition");
+    QmlTransition *columnTransition = canvas->rootObject()->findChild<QmlTransition*>("columnTransition");
+
+    QSignalSpy addSpy(grid, SIGNAL(addChanged()));
+    QSignalSpy moveSpy(grid, SIGNAL(moveChanged()));
+    QSignalSpy columnsSpy(grid, SIGNAL(columnsChanged()));
+    QSignalSpy rowsSpy(grid, SIGNAL(rowsChanged()));
+
+    QVERIFY(grid);
+    QVERIFY(rowTransition);
+    QVERIFY(columnTransition);
+    QCOMPARE(grid->add(), columnTransition);
+    QCOMPARE(grid->move(), columnTransition);
+    QCOMPARE(grid->columns(), 4);
+    QCOMPARE(grid->rows(), -1);
+
+    grid->setAdd(rowTransition);
+    grid->setMove(rowTransition);
+    QCOMPARE(grid->add(), rowTransition);
+    QCOMPARE(grid->move(), rowTransition);
+    QCOMPARE(addSpy.count(),1);
+    QCOMPARE(moveSpy.count(),1);
+
+    grid->setAdd(rowTransition);
+    grid->setMove(rowTransition);
+    QCOMPARE(addSpy.count(),1);
+    QCOMPARE(moveSpy.count(),1);
+
+    grid->setAdd(0);
+    grid->setMove(0);
+    QCOMPARE(addSpy.count(),2);
+    QCOMPARE(moveSpy.count(),2);
+
+    grid->setColumns(-1);
+    grid->setRows(3);
+    QCOMPARE(grid->columns(), -1);
+    QCOMPARE(grid->rows(), 3);
+    QCOMPARE(columnsSpy.count(),1);
+    QCOMPARE(rowsSpy.count(),1);
+
+    grid->setColumns(-1);
+    grid->setRows(3);
+    QCOMPARE(columnsSpy.count(),1);
+    QCOMPARE(rowsSpy.count(),1);
+
+    grid->setColumns(2);
+    grid->setRows(2);
+    QCOMPARE(columnsSpy.count(),2);
+    QCOMPARE(rowsSpy.count(),2);
+}
 
 void tst_QmlGraphicsPositioners::test_repeater()
 {
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml b/tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml
new file mode 100644
index 0000000..3dd4e51
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml
@@ -0,0 +1,33 @@
+import Qt 4.6
+
+Item {
+    width: 240
+    height: 160
+    Grid {
+        anchors.fill: parent
+        objectName: "newWindowParent"
+        id: newWindowParent
+    }
+
+    Row {
+        anchors.fill: parent
+        id: oldWindowParent
+        objectName: "oldWindowParent"
+    }
+
+    Loader {
+        sourceComponent: webViewComponent
+    }
+    Component {
+            id: webViewComponent
+            WebView {
+                id: webView
+                objectName: "webView"
+                newWindowComponent: webViewComponent
+                newWindowParent: oldWindowParent         
+                url: "basic.html"
+                renderingEnabled: true
+                pressGrabTime: 200
+            }
+    }
+}
\ No newline at end of file
diff --git a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
index f3c39f8..5815e22 100644
--- a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
+++ b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include <qtest.h>
+#include <QtTest/QSignalSpy>
 #include "../../../shared/util.h"
 #include <QtDeclarative/qmlengine.h>
 #include <QtDeclarative/qmlcomponent.h>
@@ -69,6 +70,10 @@ private slots:
     void javaScript();
     void cleanupTestCase();
     void pixelCache();
+    void newWindowParent();
+    void newWindowComponent();
+    void renderingEnabled();
+    void pressGrabTime();
 
 private:
     void checkNoErrors(const QmlComponent& component);
@@ -335,6 +340,10 @@ void tst_qmlgraphicswebview::setHtml()
     QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
     QVERIFY(wv != 0);
     QCOMPARE(wv->html(),QString("<html><head></head><body><p>This is a <b>string</b> set on the WebView</p></body></html>"));
+
+    QSignalSpy spy(wv, SIGNAL(htmlChanged()));
+    wv->setHtml(QString("<html><head><title>Basic</title></head><body><p>text</p></body></html>"));
+    QCOMPARE(spy.count(),1);
 }
 
 void tst_qmlgraphicswebview::elementAreaAt()
@@ -391,6 +400,106 @@ void tst_qmlgraphicswebview::pixelCache()
     QCOMPARE(wv->pixelsPainted(), expected*3); // repainted
 }
 
+void tst_qmlgraphicswebview::newWindowParent()
+{
+    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    checkNoErrors(component);
+    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
+    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
+    QVERIFY(rootItem != 0);
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+
+    QmlGraphicsItem* oldWindowParent = rootItem->findChild<QmlGraphicsItem*>("oldWindowParent");
+    QCOMPARE(wv->newWindowParent(), oldWindowParent);
+    QSignalSpy newWindowParentSpy(wv, SIGNAL(newWindowParentChanged()));
+
+    QmlGraphicsItem* newWindowParent = rootItem->findChild<QmlGraphicsItem*>("newWindowParent");
+    wv->setNewWindowParent(newWindowParent);
+    QVERIFY(oldWindowParent);
+    QVERIFY(oldWindowParent->childItems().count() == 0);
+    QCOMPARE(wv->newWindowParent(), newWindowParent);
+    QCOMPARE(newWindowParentSpy.count(),1);
+
+    wv->setNewWindowParent(newWindowParent);
+    QCOMPARE(newWindowParentSpy.count(),1);
+
+    wv->setNewWindowParent(0);
+    QCOMPARE(newWindowParentSpy.count(),2);
+}
+
+void tst_qmlgraphicswebview::newWindowComponent()
+{
+    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    checkNoErrors(component);
+    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
+    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
+    QVERIFY(rootItem != 0);
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+
+    QmlComponent substituteComponent(&engine);
+    substituteComponent.setData("import Qt 4.6; WebView { objectName: 'newWebView'; url: 'basic.html'; }", QUrl::fromLocalFile(""));
+    QSignalSpy newWindowComponentSpy(wv, SIGNAL(newWindowComponentChanged()));
+
+    wv->setNewWindowComponent(&substituteComponent);
+    QCOMPARE(wv->newWindowComponent(), &substituteComponent);
+    QCOMPARE(newWindowComponentSpy.count(),1);
+
+    wv->setNewWindowComponent(&substituteComponent);
+    QCOMPARE(newWindowComponentSpy.count(),1);
+
+    wv->setNewWindowComponent(0);
+    QCOMPARE(newWindowComponentSpy.count(),2);
+}
+
+void tst_qmlgraphicswebview::renderingEnabled()
+{
+    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    checkNoErrors(component);
+    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
+    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
+    QVERIFY(rootItem != 0);
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+
+    QVERIFY(wv->renderingEnabled());
+    QSignalSpy renderingEnabledSpy(wv, SIGNAL(renderingEnabledChanged()));
+
+    wv->setRenderingEnabled(false);
+    QVERIFY(!wv->renderingEnabled());
+    QCOMPARE(renderingEnabledSpy.count(),1);
+
+    wv->setRenderingEnabled(false);
+    QCOMPARE(renderingEnabledSpy.count(),1);
+
+    wv->setRenderingEnabled(true);
+    QCOMPARE(renderingEnabledSpy.count(),2);
+}
+
+void tst_qmlgraphicswebview::pressGrabTime()
+{
+    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    checkNoErrors(component);
+    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
+    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
+    QVERIFY(rootItem != 0);
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+    QCOMPARE(wv->pressGrabTime(), 200);
+    QSignalSpy pressGrabTimeSpy(wv, SIGNAL(pressGrabTimeChanged()));
+
+    wv->setPressGrabTime(100);
+    QCOMPARE(wv->pressGrabTime(), 100);
+    QCOMPARE(pressGrabTimeSpy.count(),1);
+
+    wv->setPressGrabTime(100);
+    QCOMPARE(pressGrabTimeSpy.count(),1);
+
+    wv->setPressGrabTime(0);
+    QCOMPARE(pressGrabTimeSpy.count(),2);
+}
+
 QTEST_MAIN(tst_qmlgraphicswebview)
 
 #include "tst_qmlgraphicswebview.moc"
-- 
cgit v0.12


From ab2497c20116399e963748adf0ed2bf691d42cbf Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Mon, 22 Feb 2010 18:51:40 +1000
Subject: Add QEasingCurve as builtin metatype

This is needed for qml, in order to be able to use easing as a valuetype.

Task-number: QTBUG-8235
Reviewed-by: thierry
Reviewed-by: janarve
---
 src/corelib/kernel/qmetatype.cpp             |  26 ++++++
 src/corelib/kernel/qmetatype.h               |   8 +-
 src/corelib/kernel/qvariant.cpp              |  55 ++++++++++++-
 src/corelib/kernel/qvariant.h                |  12 ++-
 src/corelib/tools/qeasingcurve.cpp           |  69 +++++++++++++++-
 src/corelib/tools/qeasingcurve.h             |  11 +++
 tests/auto/qeasingcurve/tst_qeasingcurve.cpp | 115 +++++++++++++++++++++++++++
 7 files changed, 285 insertions(+), 11 deletions(-)

diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 870baab..9e187d4 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -48,6 +48,7 @@
 #include "qstringlist.h"
 #include "qvector.h"
 #include "qlocale.h"
+#include "qeasingcurve.h"
 
 #ifdef QT_BOOTSTRAPPED
 # ifndef QT_NO_GEOM_VARIANT
@@ -176,6 +177,7 @@ QT_BEGIN_NAMESPACE
     \value QVector3D QVector3D
     \value QVector4D QVector4D
     \value QQuaternion QQuaternion
+    \value QEasingCurve QEasingCurve
 
     \value User  Base value for user types
 
@@ -256,6 +258,7 @@ static const struct { const char * typeName; int type; } types[] = {
     {"QPointF", QMetaType::QPointF},
     {"QRegExp", QMetaType::QRegExp},
     {"QVariantHash", QMetaType::QVariantHash},
+    {"QEasingCurve", QMetaType::QEasingCurve},
 
     /* All GUI types */
     {"QColorGroup", 63},
@@ -666,6 +669,11 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data)
         stream << *static_cast<const NS(QRegExp)*>(data);
         break;
 #endif
+#ifndef QT_BOOTSTRAPPED
+    case QMetaType::QEasingCurve:
+        stream << *static_cast<const NS(QEasingCurve)*>(data);
+        break;
+#endif
 #ifdef QT3_SUPPORT
     case QMetaType::QColorGroup:
 #endif
@@ -863,6 +871,11 @@ bool QMetaType::load(QDataStream &stream, int type, void *data)
         stream >> *static_cast< NS(QRegExp)*>(data);
         break;
 #endif
+#ifndef QT_BOOTSTRAPPED
+    case QMetaType::QEasingCurve:
+        stream >> *static_cast< NS(QEasingCurve)*>(data);
+        break;
+#endif
 #ifdef QT3_SUPPORT
     case QMetaType::QColorGroup:
 #endif
@@ -1007,6 +1020,10 @@ void *QMetaType::construct(int type, const void *copy)
         case QMetaType::QRegExp:
             return new NS(QRegExp)(*static_cast<const NS(QRegExp)*>(copy));
 #endif
+#ifndef QT_BOOTSTRAPPED
+        case QMetaType::QEasingCurve:
+            return new NS(QEasingCurve)(*static_cast<const NS(QEasingCurve)*>(copy));
+#endif
         case QMetaType::Void:
             return 0;
         default:
@@ -1098,6 +1115,10 @@ void *QMetaType::construct(int type, const void *copy)
         case QMetaType::QRegExp:
             return new NS(QRegExp);
 #endif
+#ifndef QT_BOOTSTRAPPED
+        case QMetaType::QEasingCurve:
+            return new NS(QEasingCurve);
+#endif
         case QMetaType::Void:
             return 0;
         default:
@@ -1253,6 +1274,11 @@ void QMetaType::destroy(int type, void *data)
         delete static_cast< NS(QRegExp)* >(data);
         break;
 #endif
+#ifndef QT_BOOTSTRAPPED
+    case QMetaType::QEasingCurve:
+        delete static_cast< NS(QEasingCurve)* >(data);
+        break;
+#endif
     case QMetaType::Void:
         break;
     default: {
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index c23caed..33126e8 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -69,7 +69,7 @@ public:
         QBitArray = 13, QDate = 14, QTime = 15, QDateTime = 16, QUrl = 17,
         QLocale = 18, QRect = 19, QRectF = 20, QSize = 21, QSizeF = 22,
         QLine = 23, QLineF = 24, QPoint = 25, QPointF = 26, QRegExp = 27,
-        QVariantHash = 28, LastCoreType = 28 /* QVariantHash */,
+        QVariantHash = 28, QEasingCurve = 29, LastCoreType = QEasingCurve,
 
         FirstGuiType = 63 /* QColorGroup */,
 #ifdef QT3_SUPPORT
@@ -81,12 +81,12 @@ public:
         QTextLength = 78, QTextFormat = 79, QMatrix = 80, QTransform = 81,
         QMatrix4x4 = 82, QVector2D = 83, QVector3D = 84, QVector4D = 85,
         QQuaternion = 86,
-        LastGuiType = 86 /* QQuaternion */,
+        LastGuiType = QQuaternion,
 
         FirstCoreExtType = 128 /* VoidStar */,
         VoidStar = 128, Long = 129, Short = 130, Char = 131, ULong = 132,
         UShort = 133, UChar = 134, Float = 135, QObjectStar = 136, QWidgetStar = 137,
-        LastCoreExtType = 137 /* QWidgetStar */,
+        LastCoreExtType = QWidgetStar,
 
 // This logic must match the one in qglobal.h
 #if defined(QT_COORD_TYPE)
@@ -290,6 +290,7 @@ class QPointF;
 #ifndef QT_NO_REGEXP
 class QRegExp;
 #endif
+class QEasingCurve;
 class QWidget;
 class QObject;
 
@@ -359,6 +360,7 @@ Q_DECLARE_BUILTIN_METATYPE(QPointF, QPointF)
 #ifndef QT_NO_REGEXP
 Q_DECLARE_BUILTIN_METATYPE(QRegExp, QRegExp)
 #endif
+Q_DECLARE_BUILTIN_METATYPE(QEasingCurve, QEasingCurve)
 
 #ifdef QT3_SUPPORT
 Q_DECLARE_BUILTIN_METATYPE(QColorGroup, QColorGroup)
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index e1b5825..384a3cd 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -46,6 +46,7 @@
 #include "qdebug.h"
 #include "qmap.h"
 #include "qdatetime.h"
+#include "qeasingcurve.h"
 #include "qlist.h"
 #include "qstring.h"
 #include "qstringlist.h"
@@ -146,6 +147,11 @@ static void construct(QVariant::Private *x, const void *copy)
         v_construct<QRegExp>(x, copy);
         break;
 #endif
+#ifndef QT_BOOTSTRAPPED
+    case QVariant::EasingCurve:
+        v_construct<QEasingCurve>(x, copy);
+        break;
+#endif
     case QVariant::Int:
         x->data.i = copy ? *static_cast<const int *>(copy) : 0;
         break;
@@ -259,6 +265,11 @@ static void clear(QVariant::Private *d)
         v_clear<QRegExp>(d);
         break;
 #endif
+#ifndef QT_BOOTSTRAPPED
+    case QVariant::EasingCurve:
+        v_clear<QEasingCurve>(d);
+        break;
+#endif
     case QVariant::LongLong:
     case QVariant::ULongLong:
     case QVariant::Double:
@@ -317,6 +328,9 @@ static bool isNull(const QVariant::Private *d)
     case QVariant::PointF:
         return v_cast<QPointF>(d)->isNull();
 #endif
+#ifndef QT_BOOTSTRAPPED
+    case QVariant::EasingCurve:
+#endif
     case QVariant::Url:
     case QVariant::Locale:
     case QVariant::RegExp:
@@ -435,6 +449,10 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b)
         return *v_cast<QTime>(a) == *v_cast<QTime>(b);
     case QVariant::DateTime:
         return *v_cast<QDateTime>(a) == *v_cast<QDateTime>(b);
+#ifndef QT_BOOTSTRAPPED
+    case QVariant::EasingCurve:
+        return *v_cast<QEasingCurve>(a) == *v_cast<QEasingCurve>(b);
+#endif
     case QVariant::ByteArray:
         return *v_cast<QByteArray>(a) == *v_cast<QByteArray>(b);
     case QVariant::BitArray:
@@ -1097,6 +1115,11 @@ static void streamDebug(QDebug dbg, const QVariant &v)
     case QVariant::DateTime:
         dbg.nospace() << v.toDateTime();
         break;
+#ifndef QT_BOOTSTRAPPED
+    case QVariant::EasingCurve:
+        dbg.nospace() << v.toEasingCurve();
+        break;
+#endif
     case QVariant::ByteArray:
         dbg.nospace() << v.toByteArray();
         break;
@@ -1265,6 +1288,7 @@ const QVariant::Handler *QVariant::handler = &qt_kernel_variant_handler;
     \value Date  a QDate
     \value DateTime  a QDateTime
     \value Double  a double
+    \value EasingCurve a QEasingCurve
     \value Font  a QFont
     \value Hash a QVariantHash
     \value Icon  a QIcon
@@ -1483,6 +1507,12 @@ QVariant::QVariant(const char *val)
 */
 
 /*!
+  \fn QVariant::QVariant(const QEasingCurve &val)
+
+    Constructs a new variant with an easing curve value, \a val.
+*/
+
+/*!
   \fn QVariant::QVariant(const QByteArray &val)
 
     Constructs a new variant with a bytearray value, \a val.
@@ -1681,6 +1711,10 @@ QVariant::QVariant(const QTime &val)
 { d.is_null = false; d.type = Time; v_construct<QTime>(&d, val); }
 QVariant::QVariant(const QDateTime &val)
 { d.is_null = false; d.type = DateTime; v_construct<QDateTime>(&d, val); }
+#ifndef QT_BOOTSTRAPPED
+QVariant::QVariant(const QEasingCurve &val)
+{ d.is_null = false; d.type = EasingCurve; v_construct<QEasingCurve>(&d, val); }
+#endif
 QVariant::QVariant(const QList<QVariant> &list)
 { d.is_null = false; d.type = List; v_construct<QVariantList>(&d, list); }
 QVariant::QVariant(const QMap<QString, QVariant> &map)
@@ -1870,7 +1904,7 @@ QVariant::Type QVariant::nameToType(const char *name)
 }
 
 #ifndef QT_NO_DATASTREAM
-enum { MapFromThreeCount = 35 };
+enum { MapFromThreeCount = 36 };
 static const ushort map_from_three[MapFromThreeCount] =
 {
     QVariant::Invalid,
@@ -1902,6 +1936,7 @@ static const ushort map_from_three[MapFromThreeCount] =
     QVariant::Date,
     QVariant::Time,
     QVariant::DateTime,
+    QVariant::EasingCurve,
     QVariant::ByteArray,
     QVariant::BitArray,
     QVariant::KeySequence,
@@ -2165,6 +2200,21 @@ QDateTime QVariant::toDateTime() const
 }
 
 /*!
+    \fn QEasingCurve QVariant::toEasingCurve() const
+
+    Returns the variant as a QEasingCurve if the variant has type() \l
+    EasingCurve; otherwise returns a default easing curve.
+
+    \sa canConvert(), convert()
+*/
+#ifndef QT_BOOTSTRAPPED
+QEasingCurve QVariant::toEasingCurve() const
+{
+    return qVariantToHelper<QEasingCurve>(d, EasingCurve, handler);
+}
+#endif
+
+/*!
     \fn QByteArray QVariant::toByteArray() const
 
     Returns the variant as a QByteArray if the variant has type() \l
@@ -2605,8 +2655,9 @@ static const quint32 qCanConvertMatrix[QVariant::LastCoreType + 1] =
 
 /*QRegExp*/       0,
 
-/*QHash*/         0
+/*QHash*/         0,
 
+/*QEasingCurve*/  0
 };
 
 /*!
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 1a9e43a..9628dbf 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -60,6 +60,7 @@ class QBitArray;
 class QDataStream;
 class QDate;
 class QDateTime;
+class QEasingCurve;
 class QLine;
 class QLineF;
 class QLocale;
@@ -128,9 +129,10 @@ class Q_CORE_EXPORT QVariant
         LineF = 24,
         Point = 25,
         PointF = 26,
-	RegExp = 27,
+        RegExp = 27,
         Hash = 28,
-        LastCoreType = Hash,
+        EasingCurve = 29,
+        LastCoreType = EasingCurve,
 
         // value 62 is internally reserved
 #ifdef QT3_SUPPORT
@@ -219,6 +221,9 @@ class Q_CORE_EXPORT QVariant
 #ifndef QT_NO_REGEXP
     QVariant(const QRegExp &regExp);
 #endif
+#ifndef QT_BOOTSTRAPPED
+    QVariant(const QEasingCurve &easing);
+#endif
     QVariant(Qt::GlobalColor color);
 
     QVariant& operator=(const QVariant &other);
@@ -280,6 +285,9 @@ class Q_CORE_EXPORT QVariant
 #ifndef QT_NO_REGEXP
     QRegExp toRegExp() const;
 #endif
+#ifndef QT_BOOTSTRAPPED
+    QEasingCurve toEasingCurve() const;
+#endif
 
 #ifdef QT3_SUPPORT
     inline QT3_SUPPORT int &asInt();
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index b6a2df4..6b26907 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -600,11 +600,11 @@ QEasingCurve::QEasingCurve(Type type)
     Construct a copy of \a other.
  */
 QEasingCurve::QEasingCurve(const QEasingCurve &other)
-: d_ptr(new QEasingCurvePrivate)
+    : d_ptr(new QEasingCurvePrivate)
 {
     // ### non-atomic, requires malloc on shallow copy
     *d_ptr = *other.d_ptr;
-    if(other.d_ptr->config)
+    if (other.d_ptr->config)
         d_ptr->config = other.d_ptr->config->copy();
 }
 
@@ -629,7 +629,7 @@ QEasingCurve &QEasingCurve::operator=(const QEasingCurve &other)
     }
 
     *d_ptr = *other.d_ptr;
-    if(other.d_ptr->config)
+    if (other.d_ptr->config)
         d_ptr->config = other.d_ptr->config->copy();
 
     return *this;
@@ -845,6 +845,67 @@ QDebug operator<<(QDebug debug, const QEasingCurve &item)
     }
     return debug;
 }
-#endif
+#endif // QT_NO_DEBUG_STREAM
+
+#ifndef QT_NO_DATASTREAM
+/*!
+    \fn QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing)
+    \relates QEasingCurve
+
+    Writes the given \a easing curve to the given \a stream and returns a
+    reference to the stream.
+
+    \sa {Format of the QDataStream Operators}
+*/
+
+QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing)
+{
+    stream << easing.d_ptr->type;
+    stream << intptr_t(easing.d_ptr->func);
+
+    bool hasConfig = easing.d_ptr->config;
+    stream << hasConfig;
+    if (hasConfig) {
+        stream << easing.d_ptr->config->_p;
+        stream << easing.d_ptr->config->_a;
+        stream << easing.d_ptr->config->_o;
+    }
+    return stream;
+}
+
+/*!
+    \fn QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing)
+    \relates QQuaternion
+
+    Reads an easing curve from the given \a stream into the given \a quaternion
+    and returns a reference to the stream.
+
+    \sa {Format of the QDataStream Operators}
+*/
+
+QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing)
+{
+    QEasingCurve::Type type;
+    int int_type;
+    stream >> int_type;
+    type = static_cast<QEasingCurve::Type>(int_type);
+    easing.setType(type);
+
+    intptr_t ptr_func;
+    stream >> ptr_func;
+    easing.d_ptr->func = QEasingCurve::EasingFunction(ptr_func);
+
+    bool hasConfig;
+    stream >> hasConfig;
+    if (hasConfig) {
+        QEasingCurveFunction *config = curveToFunctionObject(type);
+        stream >> config->_p;
+        stream >> config->_a;
+        stream >> config->_o;
+        easing.d_ptr->config = config;
+    }
+    return stream;
+}
+#endif // QT_NO_DATASTREAM
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h
index ae8822e..173fba4 100644
--- a/src/corelib/tools/qeasingcurve.h
+++ b/src/corelib/tools/qeasingcurve.h
@@ -100,13 +100,24 @@ public:
     qreal valueForProgress(qreal progress) const;
 private:
     QEasingCurvePrivate *d_ptr;
+#ifndef QT_NO_DEBUG_STREAM
     friend Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QEasingCurve &item);
+#endif
+#ifndef QT_NO_DATASTREAM
+    friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QEasingCurve&);
+    friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QEasingCurve &);
+#endif
 };
 
 #ifndef QT_NO_DEBUG_STREAM
 Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QEasingCurve &item);
 #endif
 
+#ifndef QT_NO_DATASTREAM
+Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QEasingCurve&);
+Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QEasingCurve &);
+#endif
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/tests/auto/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
index 12ddff1..abb4014 100644
--- a/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
+++ b/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
@@ -69,6 +69,10 @@ private slots:
     void valueForProgress();
     void setCustomType();
     void operators();
+    void dataStreamOperators_data();
+    void dataStreamOperators();
+    void properties();
+    void metaTypes();
 
 protected:
 };
@@ -505,6 +509,117 @@ void tst_QEasingCurve::operators()
     QVERIFY(curve2 == curve);
 }
 
+void tst_QEasingCurve::dataStreamOperators_data()
+{
+    QTest::addColumn<int>("type");
+    QTest::addColumn<qreal>("amplitude");
+    QTest::addColumn<qreal>("overshoot");
+    QTest::addColumn<qreal>("period");
+    QTest::addColumn<QEasingCurve>("easingCurve");
+    QTest::newRow("Linear") << int(QEasingCurve::Linear) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::Linear);
+    QTest::newRow("OutCubic") << int(QEasingCurve::OutCubic) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::OutCubic);
+    QTest::newRow("InOutSine") << int(QEasingCurve::InOutSine) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::InOutSine);
+    QEasingCurve inOutElastic(QEasingCurve::InOutElastic);
+    inOutElastic.setPeriod(1.5);
+    inOutElastic.setAmplitude(2.0);
+    QTest::newRow("InOutElastic") << int(QEasingCurve::InOutElastic) << 2.0 << -1.0 << 1.5 << inOutElastic;
+    QTest::newRow("OutInBack") << int(QEasingCurve::OutInBack) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::OutInBack);
+    QTest::newRow("OutCurve") << int(QEasingCurve::OutCurve) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::OutCurve);
+    QEasingCurve inOutBack(QEasingCurve::InOutBack);
+    inOutBack.setOvershoot(0.5);
+    QTest::newRow("InOutBack") << int(QEasingCurve::InOutBack) << -1.0 << 0.5 << -1.0 << inOutBack;
+}
+
+void tst_QEasingCurve::dataStreamOperators()
+{
+    QFETCH(int, type);
+    QFETCH(qreal, amplitude);
+    QFETCH(qreal, overshoot);
+    QFETCH(qreal, period);
+    QFETCH(QEasingCurve, easingCurve);
+
+    // operator <<
+    QEasingCurve curve;
+    curve.setType(QEasingCurve::Type(type));
+    if (amplitude != -1.0)
+        curve.setAmplitude(amplitude);
+    if (overshoot != -1.0)
+        curve.setOvershoot(overshoot);
+    if (period != -1.0)
+        curve.setPeriod(period);
+
+    QVERIFY(easingCurve == curve);
+
+    QByteArray array;
+    QDataStream out(&array, QIODevice::WriteOnly);
+    out << curve;
+
+    QDataStream in(array);
+    QEasingCurve curve2;
+    in >> curve2;
+
+    QVERIFY(curve2 == curve);
+}
+
+class tst_QEasingProperties : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing)
+public:
+    tst_QEasingProperties(QObject *parent = 0) : QObject(parent) {}
+
+    QEasingCurve easing() const { return e; }
+    void setEasing(const QEasingCurve& value) { e = value; }
+
+private:
+    QEasingCurve e;
+};
+
+// Test getting and setting easing properties via the metaobject system.
+void tst_QEasingCurve::properties()
+{
+    tst_QEasingProperties obj;
+
+    QEasingCurve inOutBack(QEasingCurve::InOutBack);
+    qreal overshoot = 1.5f;
+    inOutBack.setOvershoot(overshoot);
+    qreal amplitude = inOutBack.amplitude();
+    qreal period = inOutBack.period();
+
+    obj.setEasing(inOutBack);
+
+    QEasingCurve easing = qVariantValue<QEasingCurve>(obj.property("easing"));
+    QCOMPARE(easing.type(), QEasingCurve::InOutBack);
+    QCOMPARE(easing.overshoot(), overshoot);
+    QCOMPARE(easing.amplitude(), amplitude);
+    QCOMPARE(easing.period(), period);
+
+    QEasingCurve linear(QEasingCurve::Linear);
+    overshoot = linear.overshoot();
+    amplitude = linear.amplitude();
+    period = linear.period();
+
+    obj.setProperty("easing",
+                    qVariantFromValue(QEasingCurve(QEasingCurve::Linear)));
+
+    easing = qVariantValue<QEasingCurve>(obj.property("easing"));
+    QCOMPARE(easing.type(), QEasingCurve::Linear);
+    QCOMPARE(easing.overshoot(), overshoot);
+    QCOMPARE(easing.amplitude(), amplitude);
+    QCOMPARE(easing.period(), period);
+}
+
+void tst_QEasingCurve::metaTypes()
+{
+    QVERIFY(QMetaType::type("QEasingCurve") == QMetaType::QEasingCurve);
+
+    QCOMPARE(QByteArray(QMetaType::typeName(QMetaType::QEasingCurve)),
+             QByteArray("QEasingCurve"));
+
+    QVERIFY(QMetaType::isRegistered(QMetaType::QEasingCurve));
+
+    QVERIFY(qMetaTypeId<QEasingCurve>() == QMetaType::QEasingCurve);
+}
 
 QTEST_MAIN(tst_QEasingCurve)
 #include "tst_qeasingcurve.moc"
-- 
cgit v0.12


From 0a7ca8efdd292f317d4c95a80485d9d51f14a694 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Tue, 23 Feb 2010 13:29:04 +1000
Subject: Adds QmlEasingValueType to qml

Now it's possible to use easing curve types directly in qml as value
types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the
former ugly string format, like "easeOutBounce(amplitude:3.0)".

Reviewed-by: akennedy
---
 doc/src/declarative/animation.qdoc                 |  12 +-
 src/declarative/qml/qmlvaluetype.cpp               |  70 +++++++++
 src/declarative/qml/qmlvaluetype_p.h               |  57 +++++++
 src/declarative/util/qmlanimation.cpp              | 163 ++++++---------------
 src/declarative/util/qmlanimation_p.h              |   9 +-
 src/declarative/util/qmlanimation_p_p.h            |   2 +-
 .../qmlanimations/tst_qmlanimations.cpp            | 105 ++++++-------
 7 files changed, 237 insertions(+), 181 deletions(-)

diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index d80c3fa..892535e 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -72,9 +72,9 @@ Rectangle {
         y: 0
         y: SequentialAnimation {
             repeat: true
-            NumberAnimation { to: 200-img.height; easing: "easeOutBounce"; duration: 2000 }
+            NumberAnimation { to: 200-img.height; easing.type: "OutBounce"; duration: 2000 }
             PauseAnimation { duration: 1000 }
-            NumberAnimation { to: 0; easing: "easeOutQuad"; duration: 1000 }
+            NumberAnimation { to: 0; easing.type: "OutQuad"; duration: 1000 }
         }
     }
 }
@@ -135,7 +135,7 @@ transitions: [
     Transition {
         NumberAnimation {
             properties: "x,y"
-            easing: "easeOutBounce"
+            easing.type: "OutBounce"
             duration: 200
         }
     }
@@ -156,7 +156,7 @@ Transition {
     SequentialAnimation {
         NumberAnimation {
             duration: 1000
-            easing: "easeOutBounce"
+            easing.type: "OutBounce"
             // animate myItem's x and y if they have changed in the state
             target: myItem
             properties: "x,y"
@@ -198,7 +198,7 @@ Transition {
         ParallelAnimation {
             NumberAnimation {
                 duration: 1000
-                easing: "easeOutBounce"
+                easing.type: "OutBounce"
                 targets: box1
                 properties: "x,y"
             }
@@ -226,7 +226,7 @@ Rectangle {
     id: redRect
     color: "red"
     width: 100; height: 100
-    x: Behavior { NumberAnimation { duration: 300; easing: "InOutQuad" } }
+    x: Behavior { NumberAnimation { duration: 300; easing.type: "InOutQuad" } }
 }
 \endqml
 
diff --git a/src/declarative/qml/qmlvaluetype.cpp b/src/declarative/qml/qmlvaluetype.cpp
index 33c3e76..e3b4219 100644
--- a/src/declarative/qml/qmlvaluetype.cpp
+++ b/src/declarative/qml/qmlvaluetype.cpp
@@ -75,6 +75,8 @@ QmlValueType *QmlValueTypeFactory::valueType(int t)
         return new QmlRectFValueType;
     case QVariant::Vector3D:
         return new QmlVector3DValueType;
+    case QVariant::EasingCurve:
+        return new QmlEasingValueType;
     case QVariant::Font:
         return new QmlFontValueType;
     default:
@@ -473,6 +475,74 @@ void QmlVector3DValueType::setZ(qreal z)
     vector.setZ(z);
 }
 
+QmlEasingValueType::QmlEasingValueType(QObject *parent)
+: QmlValueType(parent)
+{
+}
+
+void QmlEasingValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &easing, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QmlEasingValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &easing, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant QmlEasingValueType::value()
+{
+    return QVariant(easing);
+}
+
+void QmlEasingValueType::setValue(QVariant value)
+{
+    easing = qvariant_cast<QEasingCurve>(value);
+}
+
+QmlEasingValueType::Type QmlEasingValueType::type() const
+{
+    return (QmlEasingValueType::Type)easing.type();
+}
+
+qreal QmlEasingValueType::amplitude() const
+{
+    return easing.amplitude();
+}
+
+qreal QmlEasingValueType::overshoot() const
+{
+    return easing.overshoot();
+}
+
+qreal QmlEasingValueType::period() const
+{
+    return easing.period();
+}
+
+void QmlEasingValueType::setType(QmlEasingValueType::Type type)
+{
+    easing.setType((QEasingCurve::Type)type);
+}
+
+void QmlEasingValueType::setAmplitude(qreal amplitude)
+{
+    easing.setAmplitude(amplitude);
+}
+
+void QmlEasingValueType::setOvershoot(qreal overshoot)
+{
+    easing.setOvershoot(overshoot);
+}
+
+void QmlEasingValueType::setPeriod(qreal period)
+{
+    easing.setPeriod(period);
+}
+
 QmlFontValueType::QmlFontValueType(QObject *parent)
 : QmlValueType(parent), hasPixelSize(false)
 {
diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h
index 0a152e8..6dd3703 100644
--- a/src/declarative/qml/qmlvaluetype_p.h
+++ b/src/declarative/qml/qmlvaluetype_p.h
@@ -57,6 +57,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
+#include <QtCore/qeasingcurve.h>
 #include <QtCore/qvariant.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qfont.h>
@@ -256,6 +257,62 @@ private:
     QVector3D vector;
 };
 
+class Q_AUTOTEST_EXPORT QmlEasingValueType : public QmlValueType
+{
+    Q_OBJECT
+    Q_ENUMS(Type)
+
+    Q_PROPERTY(QmlEasingValueType::Type type READ type WRITE setType)
+    Q_PROPERTY(qreal amplitude READ amplitude WRITE setAmplitude)
+    Q_PROPERTY(qreal overshoot READ overshoot WRITE setOvershoot)
+    Q_PROPERTY(qreal period READ period WRITE setPeriod)
+public:
+    enum Type {
+        Linear = QEasingCurve::Linear,
+        InQuad = QEasingCurve::InQuad, OutQuad = QEasingCurve::OutQuad,
+        InOutQuad = QEasingCurve::InOutQuad, OutInQuad = QEasingCurve::OutInQuad,
+        InCubic = QEasingCurve::InCubic, OutCubic = QEasingCurve::OutCubic,
+        InOutCubic = QEasingCurve::InOutCubic, OutInCubic = QEasingCurve::OutInCubic,
+        InQuart = QEasingCurve::InQuart, OutQuart = QEasingCurve::OutQuart,
+        InOutQuart = QEasingCurve::InOutQuart, OutInQuart = QEasingCurve::OutInQuart,
+        InQuint = QEasingCurve::InQuint, OutQuint = QEasingCurve::OutQuint,
+        InOutQuint = QEasingCurve::InOutQuint, OutInQuint = QEasingCurve::OutInQuint,
+        InSine = QEasingCurve::InSine, OutSine = QEasingCurve::OutSine,
+        InOutSine = QEasingCurve::InOutSine, OutInSine = QEasingCurve::OutInSine,
+        InExpo = QEasingCurve::InExpo, OutExpo = QEasingCurve::OutExpo,
+        InOutExpo = QEasingCurve::InOutExpo, OutInExpo = QEasingCurve::OutInExpo,
+        InCirc = QEasingCurve::InCirc, OutCirc = QEasingCurve::OutCirc,
+        InOutCirc = QEasingCurve::InOutCirc, OutInCirc = QEasingCurve::OutInCirc,
+        InElastic = QEasingCurve::InElastic, OutElastic = QEasingCurve::OutElastic,
+        InOutElastic = QEasingCurve::InOutElastic, OutInElastic = QEasingCurve::OutInElastic,
+        InBack = QEasingCurve::InBack, OutBack = QEasingCurve::OutBack,
+        InOutBack = QEasingCurve::InOutBack, OutInBack = QEasingCurve::OutInBack,
+        InBounce = QEasingCurve::InBounce, OutBounce = QEasingCurve::OutBounce,
+        InOutBounce = QEasingCurve::InOutBounce, OutInBounce = QEasingCurve::OutInBounce,
+        InCurve = QEasingCurve::InCurve, OutCurve = QEasingCurve::OutCurve,
+        SineCurve = QEasingCurve::SineCurve, CosineCurve = QEasingCurve::CosineCurve,
+    };
+
+    QmlEasingValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    Type type() const;
+    qreal amplitude() const;
+    qreal overshoot() const;
+    qreal period() const;
+    void setType(Type);
+    void setAmplitude(qreal);
+    void setOvershoot(qreal);
+    void setPeriod(qreal);
+
+private:
+    QEasingCurve easing;
+};
+
 class Q_AUTOTEST_EXPORT QmlFontValueType : public QmlValueType
 {
     Q_OBJECT
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 6dcce58..2f24167 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -66,79 +66,6 @@
 
 QT_BEGIN_NAMESPACE
 
-static QEasingCurve stringToCurve(const QString &curve, QObject *obj)
-{
-    QEasingCurve easingCurve;
-
-    QString normalizedCurve = curve;
-    bool hasParams = curve.contains(QLatin1Char('('));
-    QStringList props;
-
-    if (hasParams) {
-        QString easeName = curve.trimmed();
-        if (!easeName.endsWith(QLatin1Char(')'))) {
-            qmlInfo(obj) << QmlPropertyAnimation::tr("Unmatched parenthesis in easing function \"%1\"").arg(curve);
-            return easingCurve;
-        }
-
-        int idx = easeName.indexOf(QLatin1Char('('));
-        QString prop_str =
-            easeName.mid(idx + 1, easeName.length() - 1 - idx - 1);
-        normalizedCurve = easeName.left(idx);
-        if (!normalizedCurve.startsWith(QLatin1String("ease"))) {
-            qmlInfo(obj) << QmlPropertyAnimation::tr("Easing function \"%1\" must start with \"ease\"").arg(curve);
-            return easingCurve;
-        }
-
-        props = prop_str.split(QLatin1Char(','));
-    }
-
-    if (normalizedCurve.startsWith(QLatin1String("ease")))
-        normalizedCurve = normalizedCurve.mid(4);
-
-    static int index = QEasingCurve::staticMetaObject.indexOfEnumerator("Type");
-    static QMetaEnum me = QEasingCurve::staticMetaObject.enumerator(index);
-
-    int value = me.keyToValue(normalizedCurve.toUtf8().constData());
-    if (value < 0) {
-        qmlInfo(obj) << QmlPropertyAnimation::tr("Unknown easing curve \"%1\"").arg(curve);
-        return easingCurve;
-    }
-    easingCurve.setType((QEasingCurve::Type)value);
-
-    if (hasParams) {
-        foreach(const QString &str, props) {
-            int sep = str.indexOf(QLatin1Char(':'));
-
-            if (sep == -1) {
-                qmlInfo(obj) << QmlPropertyAnimation::tr("Improperly specified parameter in easing function \"%1\"").arg(curve);
-                continue;
-            }
-
-            QString propName = str.left(sep).trimmed();
-            bool isOk;
-            qreal propValue = str.mid(sep + 1).trimmed().toDouble(&isOk);
-
-            if (propName.isEmpty() || !isOk) {
-                qmlInfo(obj) << QmlPropertyAnimation::tr("Improperly specified parameter in easing function \"%1\"").arg(curve);
-                continue;
-            }
-
-            if (propName == QLatin1String("amplitude")) {
-                easingCurve.setAmplitude(propValue);
-            } else if (propName == QLatin1String("period")) {
-                easingCurve.setPeriod(propValue);
-            } else if (propName == QLatin1String("overshoot")) {
-                easingCurve.setOvershoot(propValue);
-            } else {
-                qmlInfo(obj) << QmlPropertyAnimation::tr("Unknown easing parameter \"%1\"").arg(propName);
-                continue;
-            }
-        }
-    }
-    return easingCurve;
-}
-
 QML_DEFINE_NOCREATE_TYPE(QmlAbstractAnimation)
 
 /*!
@@ -1927,195 +1854,195 @@ void QmlPropertyAnimation::setTo(const QVariant &t)
 }
 
 /*!
-    \qmlproperty string PropertyAnimation::easing
+    \qmlproperty QEasingCurve PropertyAnimation::easing
     \brief the easing curve used for the transition.
 
     Available values are:
 
     \table
     \row
-        \o \c easeLinear
+        \o \c Linear
         \o Easing curve for a linear (t) function: velocity is constant.
         \o \inlineimage qeasingcurve-linear.png
     \row
-        \o \c easeInQuad
+        \o \c InQuad
         \o Easing curve for a quadratic (t^2) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inquad.png
     \row
-        \o \c easeOutQuad
+        \o \c OutQuad
         \o Easing curve for a quadratic (t^2) function: decelerating to zero velocity.
         \o \inlineimage qeasingcurve-outquad.png
     \row
-        \o \c easeInOutQuad
+        \o \c InOutQuad
         \o Easing curve for a quadratic (t^2) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutquad.png
     \row
-        \o \c easeOutInQuad
+        \o \c OutInQuad
         \o Easing curve for a quadratic (t^2) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinquad.png
     \row
-        \o \c easeInCubic
+        \o \c InCubic
         \o Easing curve for a cubic (t^3) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-incubic.png
     \row
-        \o \c easeOutCubic
+        \o \c OutCubic
         \o Easing curve for a cubic (t^3) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outcubic.png
     \row
-        \o \c easeInOutCubic
+        \o \c InOutCubic
         \o Easing curve for a cubic (t^3) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutcubic.png
     \row
-        \o \c easeOutInCubic
+        \o \c OutInCubic
         \o Easing curve for a cubic (t^3) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outincubic.png
     \row
-        \o \c easeInQuart
+        \o \c InQuart
         \o Easing curve for a quartic (t^4) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inquart.png
     \row
-        \o \c easeOutQuart
+        \o \c OutQuart
         \o Easing curve for a cubic (t^4) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outquart.png
     \row
-        \o \c easeInOutQuart
+        \o \c InOutQuart
         \o Easing curve for a cubic (t^4) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutquart.png
     \row
-        \o \c easeOutInQuart
+        \o \c OutInQuart
         \o Easing curve for a cubic (t^4) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinquart.png
     \row
-        \o \c easeInQuint
+        \o \c InQuint
         \o Easing curve for a quintic (t^5) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inquint.png
     \row
-        \o \c easeOutQuint
+        \o \c OutQuint
         \o Easing curve for a cubic (t^5) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outquint.png
     \row
-        \o \c easeInOutQuint
+        \o \c InOutQuint
         \o Easing curve for a cubic (t^5) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutquint.png
     \row
-        \o \c easeOutInQuint
+        \o \c OutInQuint
         \o Easing curve for a cubic (t^5) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinquint.png
     \row
-        \o \c easeInSine
+        \o \c InSine
         \o Easing curve for a sinusoidal (sin(t)) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-insine.png
     \row
-        \o \c easeOutSine
+        \o \c OutSine
         \o Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outsine.png
     \row
-        \o \c easeInOutSine
+        \o \c InOutSine
         \o Easing curve for a sinusoidal (sin(t)) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutsine.png
     \row
-        \o \c easeOutInSine
+        \o \c OutInSine
         \o Easing curve for a sinusoidal (sin(t)) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinsine.png
     \row
-        \o \c easeInExpo
+        \o \c InExpo
         \o Easing curve for an exponential (2^t) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inexpo.png
     \row
-        \o \c easeOutExpo
+        \o \c OutExpo
         \o Easing curve for an exponential (2^t) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outexpo.png
     \row
-        \o \c easeInOutExpo
+        \o \c InOutExpo
         \o Easing curve for an exponential (2^t) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutexpo.png
     \row
-        \o \c easeOutInExpo
+        \o \c OutInExpo
         \o Easing curve for an exponential (2^t) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinexpo.png
     \row
-        \o \c easeInCirc
+        \o \c InCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-incirc.png
     \row
-        \o \c easeOutCirc
+        \o \c OutCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outcirc.png
     \row
-        \o \c easeInOutCirc
+        \o \c InOutCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutcirc.png
     \row
-        \o \c easeOutInCirc
+        \o \c OutInCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outincirc.png
     \row
-        \o \c easeInElastic
+        \o \c InElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: accelerating from zero velocity.
         \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
         \o \inlineimage qeasingcurve-inelastic.png
     \row
-        \o \c easeOutElastic
+        \o \c OutElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity.
         \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
         \o \inlineimage qeasingcurve-outelastic.png
     \row
-        \o \c easeInOutElastic
+        \o \c InOutElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutelastic.png
     \row
-        \o \c easeOutInElastic
+        \o \c OutInElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinelastic.png
     \row
-        \o \c easeInBack
+        \o \c InBack
         \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inback.png
     \row
-        \o \c easeOutBack
+        \o \c OutBack
         \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing out: decelerating to zero velocity.
         \o \inlineimage qeasingcurve-outback.png
     \row
-        \o \c easeInOutBack
+        \o \c InOutBack
         \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutback.png
     \row
-        \o \c easeOutInBack
+        \o \c OutInBack
         \o Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinback.png
     \row
-        \o \c easeInBounce
+        \o \c InBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inbounce.png
     \row
-        \o \c easeOutBounce
+        \o \c OutBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outbounce.png
     \row
-        \o \c easeInOutBounce
+        \o \c InOutBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutbounce.png
     \row
-        \o \c easeOutInBounce
+        \o \c OutInBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinbounce.png
     \endtable
 
 */
-QString QmlPropertyAnimation::easing() const
+QEasingCurve QmlPropertyAnimation::easing() const
 {
     Q_D(const QmlPropertyAnimation);
     return d->easing;
 }
 
-void QmlPropertyAnimation::setEasing(const QString &e)
+void QmlPropertyAnimation::setEasing(const QEasingCurve &e)
 {
     Q_D(QmlPropertyAnimation);
     if (d->easing == e)
         return;
 
     d->easing = e;
-    d->va->setEasingCurve(stringToCurve(d->easing, this));
+    d->va->setEasingCurve(d->easing);
     emit easingChanged(e);
 }
 
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 623ad8d..fd868bc 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -51,6 +51,7 @@
 #include <qmlscriptstring.h>
 
 #include <QtCore/qvariant.h>
+#include <QtCore/qeasingcurve.h>
 #include <QtCore/QAbstractAnimation>
 #include <QtGui/qcolor.h>
 
@@ -261,7 +262,7 @@ class Q_AUTOTEST_EXPORT QmlPropertyAnimation : public QmlAbstractAnimation
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
     Q_PROPERTY(QVariant from READ from WRITE setFrom NOTIFY fromChanged)
     Q_PROPERTY(QVariant to READ to WRITE setTo NOTIFY toChanged)
-    Q_PROPERTY(QString easing READ easing WRITE setEasing NOTIFY easingChanged)
+    Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged)
     Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
     Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged)
     Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
@@ -281,8 +282,8 @@ public:
     QVariant to() const;
     void setTo(const QVariant &);
 
-    QString easing() const;
-    void setEasing(const QString &);
+    QEasingCurve easing() const;
+    void setEasing(const QEasingCurve &);
 
     QObject *target() const;
     void setTarget(QObject *);
@@ -307,7 +308,7 @@ Q_SIGNALS:
     void durationChanged(int);
     void fromChanged(QVariant);
     void toChanged(QVariant);
-    void easingChanged(const QString &);
+    void easingChanged(const QEasingCurve &);
     void propertiesChanged(const QString &);
     void targetChanged(QObject *, const QString &);
 };
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h
index 056ce82..8c88f14 100644
--- a/src/declarative/util/qmlanimation_p_p.h
+++ b/src/declarative/util/qmlanimation_p_p.h
@@ -327,7 +327,7 @@ public:
     QVariant from;
     QVariant to;
 
-    QString easing;
+    QEasingCurve easing;
 
     QObject *target;
     QString propertyName;
diff --git a/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp b/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
index 1f6347e..00e099e 100644
--- a/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
+++ b/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
@@ -45,6 +45,7 @@
 #include <private/qmlgraphicsrectangle_p.h>
 #include <private/qmlanimation_p.h>
 #include <QVariantAnimation>
+#include <QEasingCurve>
 
 class tst_qmlanimations : public QObject
 {
@@ -67,11 +68,11 @@ private slots:
     void mixedTypes();
     void properties();
     void propertiesTransition();
-    void easingStringConversion();
     void invalidDuration();
     void attached();
     void propertyValueSourceDefaultStart();
     void dontStart();
+    void easingProperties();
 };
 
 #define QTIMED_COMPARE(lhs, rhs) do { \
@@ -517,57 +518,6 @@ void tst_qmlanimations::propertiesTransition()
     }*/
 }
 
-void tst_qmlanimations::easingStringConversion()
-{
-    QmlNumberAnimation *animation = new QmlNumberAnimation;
-    animation->setEasing("easeInOutQuad");
-    QCOMPARE(animation->easing(),QLatin1String("easeInOutQuad"));
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve(), QEasingCurve(QEasingCurve::InOutQuad));
-
-    animation->setEasing("OutQuad");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve(), QEasingCurve(QEasingCurve::OutQuad));
-
-    animation->setEasing("easeOutBounce(amplitude: 5)");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().type(), QEasingCurve::OutBounce);
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().amplitude(), qreal(5));
-
-    animation->setEasing("easeOutElastic(amplitude: 5, period: 3)");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().type(), QEasingCurve::OutElastic);
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().amplitude(), qreal(5));
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().period(), qreal(3));
-
-    animation->setEasing("easeInOutBack(overshoot: 2)");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().type(), QEasingCurve::InOutBack);
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().overshoot(), qreal(2));
-
-    QTest::ignoreMessage(QtWarningMsg, "QML NumberAnimation (unknown location) Unmatched parenthesis in easing function \"easeInOutBack(overshoot: 2\"");
-    animation->setEasing("easeInOutBack(overshoot: 2");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().type(), QEasingCurve::Linear);
-
-    QTest::ignoreMessage(QtWarningMsg, "QML NumberAnimation (unknown location) Easing function \"InOutBack(overshoot: 2)\" must start with \"ease\"");
-    animation->setEasing("InOutBack(overshoot: 2)");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().type(), QEasingCurve::Linear);
-
-    QTest::ignoreMessage(QtWarningMsg, "QML NumberAnimation (unknown location) Unknown easing curve \"NonExistantEase\"");
-    animation->setEasing("NonExistantEase");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().type(), QEasingCurve::Linear);
-
-    QTest::ignoreMessage(QtWarningMsg, "QML NumberAnimation (unknown location) Improperly specified parameter in easing function \"easeInOutElastic(amplitude 5)\"");
-    animation->setEasing("easeInOutElastic(amplitude 5)");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().type(), QEasingCurve::InOutElastic);
-
-    QTest::ignoreMessage(QtWarningMsg, "QML NumberAnimation (unknown location) Improperly specified parameter in easing function \"easeInOutElastic(amplitude: yes)\"");
-    animation->setEasing("easeInOutElastic(amplitude: yes)");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().type(), QEasingCurve::InOutElastic);
-    QVERIFY(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().amplitude() != qreal(5));
-
-    QTest::ignoreMessage(QtWarningMsg, "QML NumberAnimation (unknown location) Unknown easing parameter \"nonexistentproperty\"");
-    animation->setEasing("easeOutQuad(nonexistentproperty: 12)");
-    QCOMPARE(static_cast<QVariantAnimation*>(((QmlAbstractAnimation*)animation)->qtAnimation())->easingCurve().type(), QEasingCurve::OutQuad);
-
-    delete animation;
-}
-
 void tst_qmlanimations::invalidDuration()
 {
     QmlPropertyAnimation *animation = new QmlPropertyAnimation;
@@ -666,6 +616,57 @@ void tst_qmlanimations::dontStart()
     }
 }
 
+void tst_qmlanimations::easingProperties()
+{
+    {
+        QmlEngine engine;
+        QString componentStr = "import Qt 4.6\nNumberAnimation { easing.type: \"InOutQuad\" }";
+        QmlComponent animationComponent(&engine);
+        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
+
+        QVERIFY(animObject != 0);
+        QCOMPARE(animObject->easing().type(), QEasingCurve::InOutQuad);
+    }
+
+    {
+        QmlEngine engine;
+        QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"OutBounce\"; easing.amplitude: 5.0 }";
+        QmlComponent animationComponent(&engine);
+        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
+
+        QVERIFY(animObject != 0);
+        QCOMPARE(animObject->easing().type(), QEasingCurve::OutBounce);
+        QCOMPARE(animObject->easing().amplitude(), 5.0);
+    }
+
+    {
+        QmlEngine engine;
+        QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"OutElastic\"; easing.amplitude: 5.0; easing.period: 3.0}";
+        QmlComponent animationComponent(&engine);
+        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
+
+        QVERIFY(animObject != 0);
+        QCOMPARE(animObject->easing().type(), QEasingCurve::OutElastic);
+        QCOMPARE(animObject->easing().amplitude(), 5.0);
+        QCOMPARE(animObject->easing().period(), 3.0);
+    }
+
+    {
+        QmlEngine engine;
+        QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"InOutBack\"; easing.overshoot: 2 }";
+        QmlComponent animationComponent(&engine);
+        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
+
+        QVERIFY(animObject != 0);
+        QCOMPARE(animObject->easing().type(), QEasingCurve::InOutBack);
+        QCOMPARE(animObject->easing().overshoot(), 2.0);
+    }
+}
+
 QTEST_MAIN(tst_qmlanimations)
 
 #include "tst_qmlanimations.moc"
-- 
cgit v0.12


From 9701facad44f8e435f0efe6417ffb7d17d5712e7 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Tue, 23 Feb 2010 17:25:10 +1000
Subject: Updates all qml examples/demos to use the easing curve value type
 syntax

---
 demos/declarative/calculator/calculator.qml        |  4 +-
 demos/declarative/flickr/common/ImageDetails.qml   |  2 +-
 demos/declarative/flickr/common/MediaLineEdit.qml  |  2 +-
 demos/declarative/flickr/common/Star.qml           |  2 +-
 demos/declarative/flickr/flickr-desktop.qml        |  6 +-
 demos/declarative/flickr/flickr-mobile.qml         |  4 +-
 demos/declarative/flickr/mobile/GridDelegate.qml   |  6 +-
 demos/declarative/flickr/mobile/ImageDetails.qml   |  2 +-
 demos/declarative/flickr/mobile/TitleBar.qml       |  2 +-
 demos/declarative/minehunt/minehunt.qml            |  2 +-
 demos/declarative/twitter/content/HomeTitleBar.qml |  2 +-
 .../declarative/twitter/content/MultiTitleBar.qml  |  2 +-
 demos/declarative/twitter/content/TitleBar.qml     |  2 +-
 demos/declarative/twitter/twitter.qml              |  2 +-
 .../webbrowser/content/FlickableWebView.qml        |  6 +-
 .../content/RetractingWebBrowserHeader.qml         |  2 +-
 demos/declarative/webbrowser/webbrowser.qml        |  4 +-
 examples/declarative/animations/easing.qml         | 86 +++++++++++-----------
 .../declarative/animations/property-animation.qml  |  8 +-
 examples/declarative/behaviours/test.qml           |  6 +-
 .../border-image/content/MyBorderImage.qml         |  8 +-
 examples/declarative/connections/connections.qml   |  2 +-
 examples/declarative/fonts/hello.qml               |  2 +-
 examples/declarative/layouts/Button.qml            |  2 +-
 examples/declarative/layouts/positioners.qml       | 16 ++--
 examples/declarative/parallax/qml/Smiley.qml       |  8 +-
 .../declarative/slideswitch/content/Switch.qml     |  2 +-
 examples/declarative/states/transitions.qml        |  8 +-
 .../declarative/tutorials/helloworld/tutorial3.qml |  2 +-
 examples/declarative/xmldata/yahoonews.qml         |  2 +-
 .../qmlgraphicslistview/data/listview.qml          |  2 +-
 .../visual/Package_Views/packageviews.qml          |  2 +-
 .../declarative/visual/animation/easing/easing.qml | 84 ++++++++++-----------
 .../animation/pauseAnimation/pauseAnimation.qml    |  4 +-
 .../animation/propertyAction/propertyAction.qml    |  2 +-
 .../visual/animation/scriptAction/scriptAction.qml |  4 +-
 .../content/MyBorderImage.qml                      |  8 +-
 .../visual/qmlgraphicsflipable/test-flipable.qml   |  4 +-
 .../visual/qmlgraphicstextedit/cursorDelegate.qml  |  4 +-
 .../visual/qmlgraphicstextinput/cursorDelegate.qml |  4 +-
 .../declarative/visual/qmlspringfollow/follow.qml  |  4 +-
 41 files changed, 164 insertions(+), 162 deletions(-)

diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 54af7ad..66705e2 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -118,7 +118,7 @@ Rectangle {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x,y,width"; easing: "easeOutBounce"; duration: 500 }
-        NumberAnimation { properties: "opacity"; easing: "easeInOutQuad"; duration: 500 }
+        NumberAnimation { properties: "x,y,width"; easing.type: "OutBounce"; duration: 500 }
+        NumberAnimation { properties: "opacity"; easing.type: "InOutQuad"; duration: 500 }
     }
 }
diff --git a/demos/declarative/flickr/common/ImageDetails.qml b/demos/declarative/flickr/common/ImageDetails.qml
index 19cad06..ab94d7a 100644
--- a/demos/declarative/flickr/common/ImageDetails.qml
+++ b/demos/declarative/flickr/common/ImageDetails.qml
@@ -149,7 +149,7 @@ Flipable {
                     property: "smooth"
                     value: false
                 }
-                NumberAnimation { easing: "easeInOutQuad"; properties: "angle"; duration: 500 }
+                NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 500 }
                 PropertyAction {
                     target: bigImage
                     property: "smooth"
diff --git a/demos/declarative/flickr/common/MediaLineEdit.qml b/demos/declarative/flickr/common/MediaLineEdit.qml
index 3dfd1f3..9559f6a 100644
--- a/demos/declarative/flickr/common/MediaLineEdit.qml
+++ b/demos/declarative/flickr/common/MediaLineEdit.qml
@@ -42,7 +42,7 @@ Item {
     ]
     transitions: [
         Transition {
-            NumberAnimation { properties: "x,width"; duration: 500; easing: "easeInOutQuad" }
+            NumberAnimation { properties: "x,width"; duration: 500; easing.type: "InOutQuad" }
         }
     ]
 
diff --git a/demos/declarative/flickr/common/Star.qml b/demos/declarative/flickr/common/Star.qml
index 8cd47b4..748a5ec 100644
--- a/demos/declarative/flickr/common/Star.qml
+++ b/demos/declarative/flickr/common/Star.qml
@@ -38,7 +38,7 @@ Item {
         Transition {
             NumberAnimation {
                 properties: "opacity,scale,x,y"
-                easing: "easeOutBounce"
+                easing.type: "OutBounce"
             }
         }
     ]
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml
index 1ca3cdc..3a86347 100644
--- a/demos/declarative/flickr/flickr-desktop.qml
+++ b/demos/declarative/flickr/flickr-desktop.qml
@@ -86,14 +86,14 @@ Item {
                     from: "*"; to: "Details"
                     SequentialAnimation {
                         ParentAction { }
-                        NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                        NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing.type: "InOutQuad" }
                     }
                 },
                 Transition {
                     from: "Details"; to: "*"
                     SequentialAnimation {
                         ParentAction { }
-                        NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                        NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing.type: "InOutQuad" }
                         PropertyAction { targets: wrapper; properties: "z" }
                     }
                 }
@@ -180,7 +180,7 @@ Item {
         transitions: [
             Transition {
                 from: "*"; to: "*"
-                NumberAnimation { properties: "y"; duration: 1000; easing: "easeOutBounce(amplitude:0.5)" }
+                NumberAnimation { properties: "y"; duration: 1000; easing.type: "OutBounce"; easing.amplitude: 0.5 }
             }
         ]
     }
diff --git a/demos/declarative/flickr/flickr-mobile.qml b/demos/declarative/flickr/flickr-mobile.qml
index 0a89c4f..77ccd08 100644
--- a/demos/declarative/flickr/flickr-mobile.qml
+++ b/demos/declarative/flickr/flickr-mobile.qml
@@ -38,7 +38,7 @@ Item {
             }
 
             transitions: Transition {
-                NumberAnimation { properties: "x"; duration: 500; easing: "easeInOutQuad" }
+                NumberAnimation { properties: "x"; duration: 500; easing.type: "InOutQuad" }
             }
         }
 
@@ -76,7 +76,7 @@ Item {
         }
 
         transitions: Transition {
-            NumberAnimation { properties: "x"; duration: 500; easing: "easeInOutQuad" }
+            NumberAnimation { properties: "x"; duration: 500; easing.type: "InOutQuad" }
         }
     }
 }
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 0f5b69c..5722f10 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -23,7 +23,7 @@
          Item {
              anchors.centerIn: parent
              scale: 0.0
-             scale: Behavior { NumberAnimation { easing: "easeInOutQuad"} }
+             scale: Behavior { NumberAnimation { easing.type: "InOutQuad"} }
              id: scaleMe
 
              Rectangle { height: 79; width: 79; id: blackRect;  anchors.centerIn: parent; color: "black"; smooth: true }
@@ -55,13 +55,13 @@
                  Transition {
                      from: "Show"; to: "Details"
                      ParentAction { }
-                     NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" }
+                     NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" }
                  },
                  Transition {
                      from: "Details"; to: "Show"
                      SequentialAnimation {
                          ParentAction { }
-                         NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" }
+                         NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" }
                          PropertyAction { targets: wrapper; properties: "z" }
                      }
                  }
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 1963bf5..415764e 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -117,7 +117,7 @@ Flipable {
     transitions: Transition {
         SequentialAnimation {
             PropertyAction { target: bigImage; property: "smooth"; value: false }
-            NumberAnimation { easing: "easeInOutQuad"; properties: "angle"; duration: 500 }
+            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 500 }
             PropertyAction { target: bigImage; property: "smooth"; value: !flickable.moving }
         }
     }
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index 07b9762..0a06771 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -71,6 +71,6 @@ Item {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing: "easeInOutQuad" }
+        NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
     }
 }
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 92555c2..617a6ed 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -92,7 +92,7 @@ Item {
                                 }
                             }
                             NumberAnimation {
-                                easing: "easeInOutQuad"
+                                easing.type: "InOutQuad"
                                 properties: "angle"
                             }
                             ScriptAction{
diff --git a/demos/declarative/twitter/content/HomeTitleBar.qml b/demos/declarative/twitter/content/HomeTitleBar.qml
index 8054f2e..a206c87 100644
--- a/demos/declarative/twitter/content/HomeTitleBar.qml
+++ b/demos/declarative/twitter/content/HomeTitleBar.qml
@@ -115,7 +115,7 @@ Item {
     transitions: [
         Transition {
             from: "*"; to: "*"
-            NumberAnimation { properties: "x,y,width,height"; easing: "easeInOutQuad" }
+            NumberAnimation { properties: "x,y,width,height"; easing.type: "InOutQuad" }
         }
     ]
 }
diff --git a/demos/declarative/twitter/content/MultiTitleBar.qml b/demos/declarative/twitter/content/MultiTitleBar.qml
index ef7de65..e0205b8 100644
--- a/demos/declarative/twitter/content/MultiTitleBar.qml
+++ b/demos/declarative/twitter/content/MultiTitleBar.qml
@@ -18,7 +18,7 @@ Item {
         }
     ]
     transitions: [
-        Transition { NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" } }
+        Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } }
     ]
 }
 
diff --git a/demos/declarative/twitter/content/TitleBar.qml b/demos/declarative/twitter/content/TitleBar.qml
index 42a6115..149aa82 100644
--- a/demos/declarative/twitter/content/TitleBar.qml
+++ b/demos/declarative/twitter/content/TitleBar.qml
@@ -72,6 +72,6 @@ Item {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing: "easeInOutQuad" }
+        NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
     }
 }
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index d2abf28..b091b03 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -89,7 +89,7 @@ Item {
             }
         ]
         transitions: [
-            Transition { NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" } }
+            Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } }
         ]
     }
 }
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 7c46d4c..b60a95f 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -104,14 +104,14 @@ Flickable {
                     property: "scale"
                     from: 1
                     to: 0 // set before calling
-                    easing: "easeLinear"
+                    easing.type: "Linear"
                     duration: 200
                 }
                 NumberAnimation {
                     id: flickVX
                     target: flickable
                     property: "viewportX"
-                    easing: "easeLinear"
+                    easing.type: "Linear"
                     duration: 200
                     from: 0 // set before calling
                     to: 0 // set before calling
@@ -120,7 +120,7 @@ Flickable {
                     id: flickVY
                     target: flickable
                     property: "viewportY"
-                    easing: "easeLinear"
+                    easing.type: "Linear"
                     duration: 200
                     from: 0 // set before calling
                     to: 0 // set before calling
diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
index e58ab0a..f905150 100644
--- a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
+++ b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
@@ -98,7 +98,7 @@ Image {
             NumberAnimation {
                 targets: header
                 properties: "progressOff"
-                easing: "easeInOutQuad"
+                easing.type: "InOutQuad"
                 duration: 300
             }
         }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 934593c..faafd5d 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -98,7 +98,7 @@ Item {
                     Transition {
                         NumberAnimation {
                             properties: "opacity"
-                            easing: "easeInOutQuad"
+                            easing.type: "InOutQuad"
                             duration: 300
                         }
                     }
@@ -154,7 +154,7 @@ Item {
                     Transition {
                         NumberAnimation {
                             properties: "opacity"
-                            easing: "easeInOutQuad"
+                            easing.type: "InOutQuad"
                             duration: 320
                         }
                     }
diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animations/easing.qml
index 9b5bcc6..a7ba1c5 100644
--- a/examples/declarative/animations/easing.qml
+++ b/examples/declarative/animations/easing.qml
@@ -6,47 +6,47 @@ Rectangle {
 
     ListModel {
         id: easingTypes
-        ListElement { type: "easeLinear"; ballColor: "DarkRed" }
-        ListElement { type: "easeInQuad"; ballColor: "IndianRed" }
-        ListElement { type: "easeOutQuad"; ballColor: "Salmon" }
-        ListElement { type: "easeInOutQuad"; ballColor: "Tomato" }
-        ListElement { type: "easeOutInQuad"; ballColor: "DarkOrange" }
-        ListElement { type: "easeInCubic"; ballColor: "Gold" }
-        ListElement { type: "easeOutCubic"; ballColor: "Yellow" }
-        ListElement { type: "easeInOutCubic"; ballColor: "PeachPuff" }
-        ListElement { type: "easeOutInCubic"; ballColor: "Thistle" }
-        ListElement { type: "easeInQuart"; ballColor: "Orchid" }
-        ListElement { type: "easeOutQuart"; ballColor: "Purple" }
-        ListElement { type: "easeInOutQuart"; ballColor: "SlateBlue" }
-        ListElement { type: "easeOutInQuart"; ballColor: "Chartreuse" }
-        ListElement { type: "easeInQuint"; ballColor: "LimeGreen" }
-        ListElement { type: "easeOutQuint"; ballColor: "SeaGreen" }
-        ListElement { type: "easeInOutQuint"; ballColor: "DarkGreen" }
-        ListElement { type: "easeOutInQuint"; ballColor: "Olive" }
-        ListElement { type: "easeInSine"; ballColor: "DarkSeaGreen" }
-        ListElement { type: "easeOutSine"; ballColor: "Teal" }
-        ListElement { type: "easeInOutSine"; ballColor: "Turquoise" }
-        ListElement { type: "easeOutInSine"; ballColor: "SteelBlue" }
-        ListElement { type: "easeInExpo"; ballColor: "SkyBlue" }
-        ListElement { type: "easeOutExpo"; ballColor: "RoyalBlue" }
-        ListElement { type: "easeInOutExpo"; ballColor: "MediumBlue" }
-        ListElement { type: "easeOutInExpo"; ballColor: "MidnightBlue" }
-        ListElement { type: "easeInCirc"; ballColor: "CornSilk" }
-        ListElement { type: "easeOutCirc"; ballColor: "Bisque" }
-        ListElement { type: "easeInOutCirc"; ballColor: "RosyBrown" }
-        ListElement { type: "easeOutInCirc"; ballColor: "SandyBrown" }
-        ListElement { type: "easeInElastic"; ballColor: "DarkGoldenRod" }
-        ListElement { type: "easeOutElastic"; ballColor: "Chocolate" }
-        ListElement { type: "easeInOutElastic"; ballColor: "SaddleBrown" }
-        ListElement { type: "easeOutInElastic"; ballColor: "Brown" }
-        ListElement { type: "easeInBack"; ballColor: "Maroon" }
-        ListElement { type: "easeOutBack"; ballColor: "LavenderBlush" }
-        ListElement { type: "easeInOutBack"; ballColor: "MistyRose" }
-        ListElement { type: "easeOutInBack"; ballColor: "Gainsboro" }
-        ListElement { type: "easeOutBounce"; ballColor: "Silver" }
-        ListElement { type: "easeInBounce"; ballColor: "DimGray" }
-        ListElement { type: "easeInOutBounce"; ballColor: "SlateGray" }
-        ListElement { type: "easeOutInBounce"; ballColor: "DarkSlateGray" }
+        ListElement { type: "Linear"; ballColor: "DarkRed" }
+        ListElement { type: "InQuad"; ballColor: "IndianRed" }
+        ListElement { type: "OutQuad"; ballColor: "Salmon" }
+        ListElement { type: "InOutQuad"; ballColor: "Tomato" }
+        ListElement { type: "OutInQuad"; ballColor: "DarkOrange" }
+        ListElement { type: "InCubic"; ballColor: "Gold" }
+        ListElement { type: "OutCubic"; ballColor: "Yellow" }
+        ListElement { type: "InOutCubic"; ballColor: "PeachPuff" }
+        ListElement { type: "OutInCubic"; ballColor: "Thistle" }
+        ListElement { type: "InQuart"; ballColor: "Orchid" }
+        ListElement { type: "OutQuart"; ballColor: "Purple" }
+        ListElement { type: "InOutQuart"; ballColor: "SlateBlue" }
+        ListElement { type: "OutInQuart"; ballColor: "Chartreuse" }
+        ListElement { type: "InQuint"; ballColor: "LimeGreen" }
+        ListElement { type: "OutQuint"; ballColor: "SeaGreen" }
+        ListElement { type: "InOutQuint"; ballColor: "DarkGreen" }
+        ListElement { type: "OutInQuint"; ballColor: "Olive" }
+        ListElement { type: "InSine"; ballColor: "DarkSeaGreen" }
+        ListElement { type: "OutSine"; ballColor: "Teal" }
+        ListElement { type: "InOutSine"; ballColor: "Turquoise" }
+        ListElement { type: "OutInSine"; ballColor: "SteelBlue" }
+        ListElement { type: "InExpo"; ballColor: "SkyBlue" }
+        ListElement { type: "OutExpo"; ballColor: "RoyalBlue" }
+        ListElement { type: "InOutExpo"; ballColor: "MediumBlue" }
+        ListElement { type: "OutInExpo"; ballColor: "MidnightBlue" }
+        ListElement { type: "InCirc"; ballColor: "CornSilk" }
+        ListElement { type: "OutCirc"; ballColor: "Bisque" }
+        ListElement { type: "InOutCirc"; ballColor: "RosyBrown" }
+        ListElement { type: "OutInCirc"; ballColor: "SandyBrown" }
+        ListElement { type: "InElastic"; ballColor: "DarkGoldenRod" }
+        ListElement { type: "OutElastic"; ballColor: "Chocolate" }
+        ListElement { type: "InOutElastic"; ballColor: "SaddleBrown" }
+        ListElement { type: "OutInElastic"; ballColor: "Brown" }
+        ListElement { type: "InBack"; ballColor: "Maroon" }
+        ListElement { type: "OutBack"; ballColor: "LavenderBlush" }
+        ListElement { type: "InOutBack"; ballColor: "MistyRose" }
+        ListElement { type: "OutInBack"; ballColor: "Gainsboro" }
+        ListElement { type: "OutBounce"; ballColor: "Silver" }
+        ListElement { type: "InBounce"; ballColor: "DimGray" }
+        ListElement { type: "InOutBounce"; ballColor: "SlateGray" }
+        ListElement { type: "OutInBounce"; ballColor: "DarkSlateGray" }
     }
 
     Component {
@@ -80,8 +80,8 @@ Rectangle {
 
                 transitions: Transition {
                     ParallelAnimation {
-                        NumberAnimation { properties: "x"; easing: type; duration: 1000 }
-                        ColorAnimation { properties: "color"; easing: type; duration: 1000 }
+                        NumberAnimation { properties: "x"; easing.type: type; duration: 1000 }
+                        ColorAnimation { properties: "color"; easing.type: type; duration: 1000 }
                     }
                 }
             }
diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml
index 9f76ee5..537ee26 100644
--- a/examples/declarative/animations/property-animation.qml
+++ b/examples/declarative/animations/property-animation.qml
@@ -45,16 +45,16 @@ Item {
         y: SequentialAnimation {
             repeat: true
 
-            // Move from minHeight to maxHeight in 300ms, using the easeOutExpo easing function
+            // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
                 from: smiley.minHeight; to: smiley.maxHeight
-                easing: "easeOutExpo"; duration: 300
+                easing.type: "OutExpo"; duration: 300
             }
             
-            // Then move back to minHeight in 1 second, using the easeOutBounce easing function
+            // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-                easing: "easeOutBounce"; duration: 1000
+                easing.type: "OutBounce"; duration: 1000
             }
 
             // Then pause for 500ms
diff --git a/examples/declarative/behaviours/test.qml b/examples/declarative/behaviours/test.qml
index fc3f4bf..8fffd59 100644
--- a/examples/declarative/behaviours/test.qml
+++ b/examples/declarative/behaviours/test.qml
@@ -64,7 +64,8 @@ Rectangle {
                         property: "y"
                         from: 0
                         to: 10
-                        easing: "easeOutBounce(amplitude:30)"
+                        easing.type: "OutBounce"
+                        easing.amplitude: 30
                         duration: 250
                     }
                     NumberAnimation {
@@ -72,7 +73,8 @@ Rectangle {
                         property: "y"
                         from: 10
                         to: 0
-                        easing: "easeOutBounce(amplitude:30)"
+                        easing.type: "OutBounce"
+                        easing.amplitude: 30
                         duration: 250
                     }
                 }
diff --git a/examples/declarative/border-image/content/MyBorderImage.qml b/examples/declarative/border-image/content/MyBorderImage.qml
index a57acc7..ca886e9 100644
--- a/examples/declarative/border-image/content/MyBorderImage.qml
+++ b/examples/declarative/border-image/content/MyBorderImage.qml
@@ -19,14 +19,14 @@ Item {
 
         width: SequentialAnimation {
             repeat: true
-            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing: "easeInOutQuad"}
-            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing: "easeInOutQuad" }
+            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
         }
 
         height: SequentialAnimation {
             repeat: true
-            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing: "easeInOutQuad"}
-            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing: "easeInOutQuad" }
+            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
         }
 
         border.top: container.margin
diff --git a/examples/declarative/connections/connections.qml b/examples/declarative/connections/connections.qml
index 07f71bb..ef2cb54 100644
--- a/examples/declarative/connections/connections.qml
+++ b/examples/declarative/connections/connections.qml
@@ -14,7 +14,7 @@ Rectangle {
 
     Image {
         id: image; source: "content/bg1.jpg"; anchors.centerIn: parent; transformOrigin: Item.Center
-        rotation: Behavior { NumberAnimation { easing: "easeOutCubic"; duration: 300 } }
+        rotation: Behavior { NumberAnimation { easing.type: "OutCubic"; duration: 300 } }
     }
 
     Button {
diff --git a/examples/declarative/fonts/hello.qml b/examples/declarative/fonts/hello.qml
index c682477..fcc9580 100644
--- a/examples/declarative/fonts/hello.qml
+++ b/examples/declarative/fonts/hello.qml
@@ -11,7 +11,7 @@ Rectangle {
 
             font.letterSpacing: SequentialAnimation {
                 repeat: true;
-                NumberAnimation { from: 100; to: 300; easing: "easeInQuad"; duration: 3000 }
+                NumberAnimation { from: 100; to: 300; easing.type: "InQuad"; duration: 3000 }
                 ScriptAction { script: {
                     container.y = (screen.height / 4) + (Math.random() * screen.height / 2)
                     container.x = (screen.width / 4) + (Math.random() * screen.width / 2)
diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml
index 0bdb9fc..7cbf68a 100644
--- a/examples/declarative/layouts/Button.qml
+++ b/examples/declarative/layouts/Button.qml
@@ -17,6 +17,6 @@ Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.wid
 
     transitions:
         Transition{
-            NumberAnimation { properties:"x,left"; easing:"easeInOutQuad"; duration:200 }
+            NumberAnimation { properties:"x,left"; easing.type:"InOutQuad"; duration:200 }
         }
 }
diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml
index fefd964..7146702 100644
--- a/examples/declarative/layouts/positioners.qml
+++ b/examples/declarative/layouts/positioners.qml
@@ -11,12 +11,12 @@ Rectangle {
         y: 0
         move: Transition {
             NumberAnimation {
-                properties: "y"; easing: "easeOutBounce"
+                properties: "y"; easing.type: "OutBounce"
             }
         }
         add: Transition {
             NumberAnimation {
-                properties: "y"; easing: "easeOutQuad"
+                properties: "y"; easing.type: "OutQuad"
             }
         }
         Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
@@ -35,12 +35,12 @@ Rectangle {
         y: 300 
         move: Transition {
             NumberAnimation {
-                properties: "x"; easing: "easeOutBounce"
+                properties: "x"; easing.type: "OutBounce"
             }
         }
         add: Transition {
             NumberAnimation {
-                properties: "x"; easing: "easeOutQuad"
+                properties: "x"; easing.type: "OutQuad"
             }
         }
         Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
@@ -101,13 +101,13 @@ Rectangle {
 
         move: Transition {
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                properties: "x,y"; easing.type: "OutBounce"
             }
         }
 
         add: Transition {
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                properties: "x,y"; easing.type: "OutBounce"
             }
         }
 
@@ -136,13 +136,13 @@ Rectangle {
 
         move: Transition {
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                properties: "x,y"; easing.type: "OutBounce"
             }
         }
 
         add: Transition {
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                properties: "x,y"; easing.type: "OutBounce"
             }
         }
         Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml
index fc5b4fe..81eadda 100644
--- a/examples/declarative/parallax/qml/Smiley.qml
+++ b/examples/declarative/parallax/qml/Smiley.qml
@@ -27,16 +27,16 @@ Item {
         y: SequentialAnimation {
             repeat: true
 
-            // Move from minHeight to maxHeight in 300ms, using the easeOutExpo easing function
+            // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
                 from: smiley.minHeight; to: smiley.maxHeight
-                easing: "easeOutExpo"; duration: 300
+                easing.type: "OutExpo"; duration: 300
             }
             
-            // Then move back to minHeight in 1 second, using the easeOutBounce easing function
+            // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-                easing: "easeOutBounce"; duration: 1000
+                easing.type: "OutBounce"; duration: 1000
             }
 
             // Then pause for 500ms
diff --git a/examples/declarative/slideswitch/content/Switch.qml b/examples/declarative/slideswitch/content/Switch.qml
index 930f471..758aee6 100644
--- a/examples/declarative/slideswitch/content/Switch.qml
+++ b/examples/declarative/slideswitch/content/Switch.qml
@@ -66,7 +66,7 @@ Item {
 
 //![7]
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing: "easeInOutQuad"; duration: 200 }
+        NumberAnimation { properties: "x"; easing.type: "InOutQuad"; duration: 200 }
     }
 //![7]
 }
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index 48d5f60..8ad61ad 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -51,16 +51,16 @@ Rectangle {
     // transitions define how the properties change.
     transitions: [
         // When transitioning to 'Position1' move x,y over a duration of 1 second,
-        // with easeOutBounce easing function.
+        // with OutBounce easing function.
         Transition {
             from: "*"; to: "Position1"
-            NumberAnimation { properties: "x,y"; easing: "easeOutBounce"; duration: 1000 }
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce"; duration: 1000 }
         },
         // When transitioning to 'Position2' move x,y over a duration of 2 seconds,
-        // with easeInOutQuad easing function.
+        // with InOutQuad easing function.
         Transition {
             from: "*"; to: "Position2"
-            NumberAnimation { properties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
+            NumberAnimation { properties: "x,y"; easing.type: "InOutQuad"; duration: 2000 }
         },
         // For any other state changes move x,y linearly over duration of 200ms.
         Transition {
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index 9eaa009..b8a4f77 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -28,7 +28,7 @@ Rectangle {
         transitions: Transition {
             from: ""; to: "down"; reversible: true
             ParallelAnimation {
-                NumberAnimation { properties: "y,rotation"; duration: 500; easing: "easeInOutQuad" }
+                NumberAnimation { properties: "y,rotation"; duration: 500; easing.type: "InOutQuad" }
                 ColorAnimation { duration: 500 }
             }
         }
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index b80e29c..f7c269c 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -61,7 +61,7 @@ Rectangle {
                 transitions: Transition {
                     from: "*"; to: "Details"; reversible: true
                     SequentialAnimation {
-                        NumberAnimation { duration: 200; properties: "height"; easing: "easeOutQuad" }
+                        NumberAnimation { duration: 200; properties: "height"; easing.type: "OutQuad" }
                         NumberAnimation { duration: 200; properties: "opacity" }
                     }
                 }
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
index 99b3db6..1c1b3f8 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
+++ b/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
@@ -88,7 +88,7 @@ Rectangle {
                     ScriptAction { script: console.log("Fix PropertyAction with attached properties") }
 /*
                     PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
-                    NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing: "easeInOutQuad" }
+                    NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" }
                     PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
 */
                 }
diff --git a/tests/auto/declarative/visual/Package_Views/packageviews.qml b/tests/auto/declarative/visual/Package_Views/packageviews.qml
index b577e45..cf3f9f7 100644
--- a/tests/auto/declarative/visual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/visual/Package_Views/packageviews.qml
@@ -64,7 +64,7 @@ Rectangle {
                         from: "*"; to: "*"
                         SequentialAnimation {
                             ParentAction{}
-                            NumberAnimation { properties: "x,y,width"; easing: "easeInOutQuad" }
+                            NumberAnimation { properties: "x,y,width"; easing.type: "InOutQuad" }
                         }
                     }
                 ]
diff --git a/tests/auto/declarative/visual/animation/easing/easing.qml b/tests/auto/declarative/visual/animation/easing/easing.qml
index 9c814eb..4248d88 100644
--- a/tests/auto/declarative/visual/animation/easing/easing.qml
+++ b/tests/auto/declarative/visual/animation/easing/easing.qml
@@ -9,127 +9,127 @@ Rectangle {
         ListModel {
             id: easingtypes
             ListElement {
-                type: "easeLinear"
+                type: "Linear"
             }
             ListElement {
-                type: "easeInQuad"
+                type: "InQuad"
             }
             ListElement {
-                type: "easeOutQuad"
+                type: "OutQuad"
             }
             ListElement {
-                type: "easeInOutQuad"
+                type: "InOutQuad"
             }
             ListElement {
-                type: "easeOutInQuad"
+                type: "OutInQuad"
             }
             ListElement {
-                type: "easeInCubic"
+                type: "InCubic"
             }
             ListElement {
-                type: "easeOutCubic"
+                type: "OutCubic"
             }
             ListElement {
-                type: "easeInOutCubic"
+                type: "InOutCubic"
             }
             ListElement {
-                type: "easeOutInCubic"
+                type: "OutInCubic"
             }
             ListElement {
-                type: "easeInQuart"
+                type: "InQuart"
             }
             ListElement {
-                type: "easeOutQuart"
+                type: "OutQuart"
             }
             ListElement {
-                type: "easeInOutQuart"
+                type: "InOutQuart"
             }
             ListElement {
-                type: "easeOutInQuart"
+                type: "OutInQuart"
             }
             ListElement {
-                type: "easeInQuint"
+                type: "InQuint"
             }
             ListElement {
-                type: "easeOutQuint"
+                type: "OutQuint"
             }
             ListElement {
-                type: "easeInOutQuint"
+                type: "InOutQuint"
             }
             ListElement {
-                type: "easeOutInQuint"
+                type: "OutInQuint"
             }
             ListElement {
-                type: "easeInSine"
+                type: "InSine"
             }
             ListElement {
-                type: "easeOutSine"
+                type: "OutSine"
             }
             ListElement {
-                type: "easeInOutSine"
+                type: "InOutSine"
             }
             ListElement {
-                type: "easeOutInSine"
+                type: "OutInSine"
             }
             ListElement {
-                type: "easeInExpo"
+                type: "InExpo"
             }
             ListElement {
-                type: "easeOutExpo"
+                type: "OutExpo"
             }
             ListElement {
-                type: "easeInOutExpo"
+                type: "InOutExpo"
             }
             ListElement {
-                type: "easeOutInExpo"
+                type: "OutInExpo"
             }
             ListElement {
-                type: "easeInCirc"
+                type: "InCirc"
             }
             ListElement {
-                type: "easeOutCirc"
+                type: "OutCirc"
             }
             ListElement {
-                type: "easeInOutCirc"
+                type: "InOutCirc"
             }
             ListElement {
-                type: "easeOutInCirc"
+                type: "OutInCirc"
             }
             ListElement {
-                type: "easeInElastic"
+                type: "InElastic"
             }
             ListElement {
-                type: "easeOutElastic"
+                type: "OutElastic"
             }
             ListElement {
-                type: "easeInOutElastic"
+                type: "InOutElastic"
             }
             ListElement {
-                type: "easeOutInElastic"
+                type: "OutInElastic"
             }
             ListElement {
-                type: "easeInBack"
+                type: "InBack"
             }
             ListElement {
-                type: "easeOutBack"
+                type: "OutBack"
             }
             ListElement {
-                type: "easeInOutBack"
+                type: "InOutBack"
             }
             ListElement {
-                type: "easeOutInBack"
+                type: "OutInBack"
             }
             ListElement {
-                type: "easeOutBounce"
+                type: "OutBounce"
             }
             ListElement {
-                type: "easeInBounce"
+                type: "InBounce"
             }
             ListElement {
-                type: "easeInOutBounce"
+                type: "InOutBounce"
             }
             ListElement {
-                type: "easeOutInBounce"
+                type: "OutInBounce"
             }
         }
     ]
@@ -177,7 +177,7 @@ Rectangle {
                             reversible: true
                             NumberAnimation {
                                 properties: "x"
-                                easing: type
+                                easing.type: type
                                 duration: 1000
                             }
                         }
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
index f2e065d..24ca76b 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
+++ b/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
@@ -14,11 +14,11 @@ Rectangle {
             repeat: true
             NumberAnimation {
                 to: 0; duration: 500
-                easing: "easeInOutQuad"
+                easing.type: "InOutQuad"
             }
             NumberAnimation {
                 to: 200-img.height
-                easing: "easeOutBounce"
+                easing.type: "OutBounce"
                 duration: 2000
             }
             PauseAnimation {
diff --git a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
index 593f495..e18e770 100644
--- a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
+++ b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
@@ -28,7 +28,7 @@ Rectangle {
         SequentialAnimation {
             ColorAnimation {}
             PropertyAction { properties: "x" }
-            NumberAnimation { properties: "y"; easing: "InOutQuad" }
+            NumberAnimation { properties: "y"; easing.type: "InOutQuad" }
         }
     }
 }
diff --git a/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml b/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
index 30d587a..ef4ed76 100644
--- a/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
+++ b/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
@@ -27,9 +27,9 @@ Rectangle {
 
     transitions: Transition {
         SequentialAnimation {
-            NumberAnimation { properties: "x"; easing: "InOutQuad" }
+            NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
             ScriptAction { stateChangeScriptName: "setColor" }
-            NumberAnimation { properties: "y"; easing: "InOutQuad" }
+            NumberAnimation { properties: "y"; easing.type: "InOutQuad" }
         }
     }
 }
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
index eb1ec00..e268ce7 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
+++ b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
@@ -20,14 +20,14 @@ Item {
 
         width: SequentialAnimation {
             repeat: true
-            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing: "easeInOutQuad"}
-            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing: "easeInOutQuad" }
+            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
         }
 
         height: SequentialAnimation {
             repeat: true
-            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing: "easeInOutQuad"}
-            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing: "easeInOutQuad" }
+            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
         }
 
         border.top: container.margin
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml b/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
index c33a319..a27aa6e 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
+++ b/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
@@ -36,7 +36,7 @@ Rectangle {
         }
 
         transitions: Transition {
-            NumberAnimation { easing: "easeInOutQuad"; properties: "angle"; duration: 3000 }
+            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 3000 }
         }
     }
 
@@ -64,7 +64,7 @@ Rectangle {
         }
 
         transitions: Transition {
-            NumberAnimation { easing: "easeInOutQuad"; properties: "angle"; duration: 3000 }
+            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 3000 }
         }
     }
 
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
index e0c5db4..176a5b8 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
@@ -11,8 +11,8 @@ import Qt 4.6
                     Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
                     opacity: 1
                     opacity: SequentialAnimation { running: cPage.parent.focus == true; repeat: true;
-                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing: "easeInQuad"}
-                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing: "easeOutQuad"}
+                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
+                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
                              }
                 }
                 width: 1;
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
index 0038664..6a4e7fa 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
@@ -11,8 +11,8 @@ import Qt 4.6
                     Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
                     opacity: 1
                     opacity: SequentialAnimation { running: cPage.parent.focus == true; repeat: true;
-                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing: "easeInQuad"}
-                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing: "easeOutQuad"}
+                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
+                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
                              }
                 }
                 width: 1;
diff --git a/tests/auto/declarative/visual/qmlspringfollow/follow.qml b/tests/auto/declarative/visual/qmlspringfollow/follow.qml
index a85a778..62503e4 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/follow.qml
+++ b/tests/auto/declarative/visual/qmlspringfollow/follow.qml
@@ -11,11 +11,11 @@ Rectangle {
             repeat: true
             NumberAnimation {
                 to: 20; duration: 500
-                easing: "easeInOutQuad"
+                easing.type: "InOutQuad"
             }
             NumberAnimation {
                 to: 200; duration: 2000
-                easing: "easeOutBounce"
+                easing.type: "OutBounce"
             }
             PauseAnimation { duration: 1000 }
         }
-- 
cgit v0.12


From 48161233af2a6071bc0ba99e546da98f705b8281 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 23 Feb 2010 18:34:41 +1000
Subject: String to enum conversion in value types

Assigning a string to a value type enum property from a binding was
not working as QmlMetaProperty didn't realise the property was of enum
type.
---
 src/declarative/qml/qmlcompiler.cpp                |  8 +++++++-
 src/declarative/qml/qmlmetaproperty.cpp            | 10 ++++++++--
 src/declarative/qml/qmlmetaproperty_p.h            |  3 ++-
 src/declarative/qml/qmlpropertycache.cpp           | 22 ++++++++++++++++------
 src/declarative/qml/qmlpropertycache_p.h           |  7 +++++--
 .../declarative/qmlvaluetypes/data/enums.1.qml     |  6 ++++++
 .../declarative/qmlvaluetypes/data/enums.2.qml     |  6 ++++++
 .../qmlvaluetypes/tst_qmlvaluetypes.cpp            | 21 +++++++++++++++++++++
 8 files changed, 71 insertions(+), 12 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvaluetypes/data/enums.1.qml
 create mode 100644 tests/auto/declarative/qmlvaluetypes/data/enums.2.qml

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 10b6e4f..4508964 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -2609,7 +2609,13 @@ int QmlCompiler::genContextCache()
 int QmlCompiler::genValueTypeData(QmlParser::Property *valueTypeProp, 
                                   QmlParser::Property *prop)
 {
-    return output->indexForByteArray(QmlMetaPropertyPrivate::saveValueType(prop->parent->metaObject(), prop->index, valueTypeProp->index, valueTypeProp->type));
+    QByteArray data =
+        QmlMetaPropertyPrivate::saveValueType(prop->parent->metaObject(), prop->index, 
+                                              QmlEnginePrivate::get(engine)->valueTypes[prop->type]->metaObject(), 
+                                              valueTypeProp->index);
+//                valueTypeProp->index, valueTypeProp->type);
+
+    return output->indexForByteArray(data);
 }
 
 int QmlCompiler::genPropertyData(QmlParser::Property *prop)
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index ac619ec..d731393 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -777,6 +777,7 @@ bool QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value,
         writeBack->read(object, core.coreIndex);
 
         QmlPropertyCache::Data data = core;
+        data.flags = valueType.flags;
         data.coreIndex = valueType.valueTypeCoreIdx;
         data.propType = valueType.valueTypePropType;
         rv = write(writeBack, data, value, context, flags);
@@ -1082,15 +1083,20 @@ struct ValueTypeSerializedData : public SerializedData {
 };
 
 QByteArray QmlMetaPropertyPrivate::saveValueType(const QMetaObject *metaObject, int index, 
-                                                 int subIndex, int subType)
+                                                 const QMetaObject *subObject, int subIndex)
 {
+    QMetaProperty prop = metaObject->property(index);
+    QMetaProperty subProp = subObject->property(subIndex);
+
     ValueTypeSerializedData sd;
     sd.type = QmlMetaProperty::ValueTypeProperty;
     sd.core.load(metaObject->property(index));
+    sd.valueType.flags = QmlPropertyCache::Data::flagsForProperty(subProp);
     sd.valueType.valueTypeCoreIdx = subIndex;
-    sd.valueType.valueTypePropType = subType;
+    sd.valueType.valueTypePropType = subProp.userType();
 
     QByteArray rv((const char *)&sd, sizeof(sd));
+
     return rv;
 }
 
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index b99e5be..9236bd3 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -111,7 +111,8 @@ public:
     static QmlAbstractBinding *setBinding(QObject *, const QmlPropertyCache::Data &, QmlAbstractBinding *,
                                           QmlMetaProperty::WriteFlags flags = QmlMetaProperty::DontRemoveBinding);
 
-    static QByteArray saveValueType(const QMetaObject *, int, int, int);
+    static QByteArray saveValueType(const QMetaObject *, int, 
+                                    const QMetaObject *, int);
     static QByteArray saveProperty(const QMetaObject *, int);
     static QmlMetaProperty restore(const QByteArray &, QObject *, QmlContext * = 0);
 
diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
index 2d087b6..81f8e51 100644
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ b/src/declarative/qml/qmlpropertycache.cpp
@@ -49,13 +49,11 @@ Q_DECLARE_METATYPE(QScriptValue);
 
 QT_BEGIN_NAMESPACE
 
-void QmlPropertyCache::Data::load(const QMetaProperty &p, QmlEngine *engine)
+QmlPropertyCache::Data::Flags QmlPropertyCache::Data::flagsForProperty(const QMetaProperty &p, QmlEngine *engine) 
 {
-    propType = p.userType();
-    if (QVariant::Type(propType) == QVariant::LastType)
-        propType = qMetaTypeId<QVariant>();
-    coreIndex = p.propertyIndex();
-    notifyIndex = p.notifySignalIndex();
+    int propType = p.userType();
+
+    Flags flags;
 
     if (p.isConstant())
         flags |= Data::IsConstant;
@@ -78,6 +76,18 @@ void QmlPropertyCache::Data::load(const QMetaProperty &p, QmlEngine *engine)
         else if (cat == QmlMetaType::List)
             flags |= Data::IsQList;
     }
+
+    return flags;
+}
+
+void QmlPropertyCache::Data::load(const QMetaProperty &p, QmlEngine *engine)
+{
+    propType = p.userType();
+    if (QVariant::Type(propType) == QVariant::LastType)
+        propType = qMetaTypeId<QVariant>();
+    coreIndex = p.propertyIndex();
+    notifyIndex = p.notifySignalIndex();
+    flags = flagsForProperty(p, engine);
 }
 
 void QmlPropertyCache::Data::load(const QMetaMethod &m)
diff --git a/src/declarative/qml/qmlpropertycache_p.h b/src/declarative/qml/qmlpropertycache_p.h
index 18eea80..4a98b88 100644
--- a/src/declarative/qml/qmlpropertycache_p.h
+++ b/src/declarative/qml/qmlpropertycache_p.h
@@ -104,6 +104,7 @@ public:
         int coreIndex;
         int notifyIndex;
 
+        static Flags flagsForProperty(const QMetaProperty &, QmlEngine *engine = 0);
         void load(const QMetaProperty &, QmlEngine *engine = 0);
         void load(const QMetaMethod &);
         QString name(QObject *);
@@ -113,6 +114,7 @@ public:
     struct ValueTypeData {
         inline ValueTypeData();
         inline bool operator==(const ValueTypeData &);
+        Data::Flags flags;     // flags on the value type wrapper
         int valueTypeCoreIdx;  // The prop index of the access property on the value type wrapper
         int valueTypePropType; // The QVariant::Type of access property on the value type wrapper
     };
@@ -173,13 +175,14 @@ QmlPropertyCache::property(const QScriptDeclarativeClass::Identifier &id) const
 }
 
 QmlPropertyCache::ValueTypeData::ValueTypeData()
-: valueTypeCoreIdx(-1), valueTypePropType(0) 
+: flags(QmlPropertyCache::Data::NoFlags), valueTypeCoreIdx(-1), valueTypePropType(0) 
 {
 }
 
 bool QmlPropertyCache::ValueTypeData::operator==(const ValueTypeData &o) 
 { 
-    return valueTypeCoreIdx == o.valueTypeCoreIdx &&
+    return flags == o.flags &&
+           valueTypeCoreIdx == o.valueTypeCoreIdx &&
            valueTypePropType == o.valueTypePropType; 
 }
 
diff --git a/tests/auto/declarative/qmlvaluetypes/data/enums.1.qml b/tests/auto/declarative/qmlvaluetypes/data/enums.1.qml
new file mode 100644
index 0000000..0eadd50
--- /dev/null
+++ b/tests/auto/declarative/qmlvaluetypes/data/enums.1.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    font.capitalization: "MixedCase"
+}
+
diff --git a/tests/auto/declarative/qmlvaluetypes/data/enums.2.qml b/tests/auto/declarative/qmlvaluetypes/data/enums.2.qml
new file mode 100644
index 0000000..81f1c92
--- /dev/null
+++ b/tests/auto/declarative/qmlvaluetypes/data/enums.2.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    font.capitalization: if (1) "MixedCase"
+}
+
diff --git a/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp b/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
index f99d3ce..4faa0bc 100644
--- a/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
+++ b/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
@@ -74,6 +74,7 @@ private slots:
     void bindingVariantCopy();
     void scriptVariantCopy();
     void cppClasses();
+    void enums();
 
 private:
     QmlEngine engine;
@@ -583,6 +584,26 @@ void tst_qmlvaluetypes::cppClasses()
     CPP_TEST(QmlFontValueType, QFont("Helvetica"));
 
 }
+
+void tst_qmlvaluetypes::enums()
+{
+    {
+    QmlComponent component(&engine, TEST_FILE("enums.1.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QVERIFY(object->font().capitalization() == QFont::MixedCase);
+    delete object;
+    }
+
+    {
+    QmlComponent component(&engine, TEST_FILE("enums.2.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QVERIFY(object->font().capitalization() == QFont::MixedCase);
+    delete object;
+    }
+}
+
 QTEST_MAIN(tst_qmlvaluetypes)
 
 #include "tst_qmlvaluetypes.moc"
-- 
cgit v0.12


From b4d55d5288ddae325046f62f65cbf667283b3859 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Tue, 23 Feb 2010 19:00:12 +1000
Subject: Fix compile error in QEasingCurve

Reviewed-by: akennedy
---
 src/corelib/tools/qeasingcurve.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 6b26907..89edb2d 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -861,7 +861,7 @@ QDebug operator<<(QDebug debug, const QEasingCurve &item)
 QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing)
 {
     stream << easing.d_ptr->type;
-    stream << intptr_t(easing.d_ptr->func);
+    stream << quint64(intptr_t(easing.d_ptr->func));
 
     bool hasConfig = easing.d_ptr->config;
     stream << hasConfig;
@@ -891,9 +891,9 @@ QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing)
     type = static_cast<QEasingCurve::Type>(int_type);
     easing.setType(type);
 
-    intptr_t ptr_func;
+    quint64 ptr_func;
     stream >> ptr_func;
-    easing.d_ptr->func = QEasingCurve::EasingFunction(ptr_func);
+    easing.d_ptr->func = QEasingCurve::EasingFunction(intptr_t(ptr_func));
 
     bool hasConfig;
     stream >> hasConfig;
-- 
cgit v0.12


From db817f85def9dcfd335bca46029b7eed168edb32 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Tue, 23 Feb 2010 19:00:12 +1000
Subject: Fix compile error in QEasingCurve

Reviewed-by: akennedy
---
 src/corelib/tools/qeasingcurve.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 6b26907..89edb2d 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -861,7 +861,7 @@ QDebug operator<<(QDebug debug, const QEasingCurve &item)
 QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing)
 {
     stream << easing.d_ptr->type;
-    stream << intptr_t(easing.d_ptr->func);
+    stream << quint64(intptr_t(easing.d_ptr->func));
 
     bool hasConfig = easing.d_ptr->config;
     stream << hasConfig;
@@ -891,9 +891,9 @@ QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing)
     type = static_cast<QEasingCurve::Type>(int_type);
     easing.setType(type);
 
-    intptr_t ptr_func;
+    quint64 ptr_func;
     stream >> ptr_func;
-    easing.d_ptr->func = QEasingCurve::EasingFunction(ptr_func);
+    easing.d_ptr->func = QEasingCurve::EasingFunction(intptr_t(ptr_func));
 
     bool hasConfig;
     stream >> hasConfig;
-- 
cgit v0.12


From d9a390c6d5f18f335fa0a4766180ffa62f28c363 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 23 Feb 2010 12:09:52 +0100
Subject: Added QmlEnginePrivate::resolvePlugin.

resolvePlugin returns the merge of the plugin's base name with the
platform suffix (e.g. .dylib) and prefix (e.g. lib).
---
 src/declarative/qml/qmlengine.cpp | 89 +++++++++++++++++++++++++++++++++++++--
 src/declarative/qml/qmlengine_p.h |  6 +++
 2 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 67d8c7d..98e16aa 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1359,9 +1359,11 @@ public:
                         qmldirParser.parse();
 
                         foreach (const QmlDirParser::Plugin &plugin, qmldirParser.plugins()) {
-                            const QFileInfo pluginFileInfo(dir + QDir::separator() + plugin.path, plugin.name);
-                            const QString pluginFilePath = pluginFileInfo.absoluteFilePath();
-                            engine->importExtension(pluginFilePath, uri);
+                            QString resolvedFilePath = QmlEnginePrivate::get(engine)->resolvePlugin(dir + QDir::separator() + plugin.path,
+                                                                                                    plugin.name);
+
+                            if (!resolvedFilePath.isEmpty())
+                                engine->importExtension(resolvedFilePath, uri);
                         }
                     }
 
@@ -1609,6 +1611,87 @@ QString QmlEngine::offlineStoragePath() const
     return d->scriptEngine.offlineStoragePath;
 }
 
+/*!
+  \internal
+
+  Returns the result of the merge of \a baseName with \a dir, \a suffixes, and \a prefix.
+ */
+QString QmlEnginePrivate::resolvePlugin(const QDir &dir, const QString &baseName,
+                                        const QStringList &suffixes,
+                                        const QString &prefix)
+{
+    foreach (const QString &suffix, suffixes) {
+        QString pluginFileName = prefix;
+
+        pluginFileName += baseName;
+        pluginFileName += QLatin1Char('.');
+        pluginFileName += suffix;
+
+        QFileInfo fileInfo(dir, pluginFileName);
+
+        if (fileInfo.exists())
+            return fileInfo.absoluteFilePath();
+    }
+
+    return QString();
+}
+
+/*!
+  \internal
+
+  Returns the result of the merge of \a baseName with \a dir and the platform suffix.
+
+  \table
+  \header \i Platform \i Valid suffixes
+  \row \i Windows     \i \c .dll
+  \row \i Unix/Linux  \i \c .so
+  \row \i AIX  \i \c .a
+  \row \i HP-UX       \i \c .sl, \c .so (HP-UXi)
+  \row \i Mac OS X    \i \c .dylib, \c .bundle, \c .so
+  \row \i Symbian     \i \c .dll
+  \endtable
+
+  Version number on unix are ignored.
+*/
+QString QmlEnginePrivate::resolvePlugin(const QDir &dir, const QString &baseName)
+{
+#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+    return resolvePlugin(dir, baseName, QStringList(QLatin1String("dll")));
+#elif defined(Q_OS_SYMBIAN)
+    return resolvePlugin(dir, baseName, QStringList() << QLatin1String("dll") << QLatin1String("qtplugin"));
+#else
+
+# if defined(Q_OS_DARWIN)
+
+    return resolvePlugin(dir, baseName, QStringList() << QLatin1String("dylib") << QLatin1String("so") << QLatin1String("bundle"),
+                         QLatin1String("lib"));
+# else  // Generic Unix
+    QStringList validSuffixList;
+
+#  if defined(Q_OS_HPUX)
+/*
+    See "HP-UX Linker and Libraries User's Guide", section "Link-time Differences between PA-RISC and IPF":
+    "In PA-RISC (PA-32 and PA-64) shared libraries are suffixed with .sl. In IPF (32-bit and 64-bit),
+    the shared libraries are suffixed with .so. For compatibility, the IPF linker also supports the .sl suffix."
+ */
+    validSuffixList << QLatin1String("sl");
+#   if defined __ia64
+    validSuffixList << QLatin1String("so");
+#   endif
+#  elif defined(Q_OS_AIX)
+    validSuffixList << QLatin1String("a") << QLatin1String("so");
+#  elif defined(Q_OS_UNIX)
+    validSuffixList << QLatin1String("so");
+#  endif
+
+    // Examples of valid library names:
+    //  libfoo.so
+
+    return resolvePlugin(dir, baseName, validSuffixList, QLatin1String("lib"));
+# endif
+
+#endif
+}
 
 /*!
   \internal
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index d916286..53a88b1 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -104,6 +104,7 @@ class QmlCleanup;
 class QmlDelayedError;
 class QmlWorkerScriptEngine;
 class QmlGlobalScriptClass;
+class QDir;
 
 class QmlScriptEngine : public QScriptEngine
 {
@@ -263,6 +264,11 @@ public:
         QmlImportsPrivate *d;
     };
 
+    QString resolvePlugin(const QDir &dir, const QString &baseName,
+                          const QStringList &suffixes,
+                          const QString &prefix = QString());
+    QString resolvePlugin(const QDir &dir, const QString &baseName);
+
 
     bool addToImport(Imports*, const QString& qmlDirContent,const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType) const;
     bool resolveType(const Imports&, const QByteArray& type,
-- 
cgit v0.12


From d43ec1bdb12649c32f0f0067492857a70bef05b4 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Tue, 23 Feb 2010 12:45:38 +0100
Subject: More precise compiler errors

People were having trouble figureing what was wrong based off the
previous error message. This should now be rectified - at least for
users who read the docs.

Reviewed-by: mae
---
 src/declarative/qml/qmlcompiler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 4508964..4365b17 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -1132,10 +1132,10 @@ bool QmlCompiler::buildComponent(QmlParser::Object *obj,
     Property *idProp = 0;
     if (obj->properties.count() > 1 ||
        (obj->properties.count() == 1 && obj->properties.begin().key() != "id"))
-        COMPILE_EXCEPTION(*obj->properties.begin(), QCoreApplication::translate("QmlCompiler","Invalid component specification"));
+        COMPILE_EXCEPTION(*obj->properties.begin(), QCoreApplication::translate("QmlCompiler","Component elements may not contain properties other than id"));
        
     if (!obj->scriptBlockObjects.isEmpty())
-        COMPILE_EXCEPTION(obj->scriptBlockObjects.first(), QCoreApplication::translate("QmlCompiler","Invalid component specification"));
+        COMPILE_EXCEPTION(obj->scriptBlockObjects.first(), QCoreApplication::translate("QmlCompiler","Component elements may not contain script blocks"));
 
     if (obj->properties.count())
         idProp = *obj->properties.begin();
-- 
cgit v0.12


From 5eb3c2fc8f90509cb368ab56f14364d6e17844f1 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 23 Feb 2010 12:48:16 +0100
Subject: Look for QML plugins in the paths specified in QML_PLUGIN_PATH env
 var.

---
 src/declarative/qml/qmlengine.cpp           | 30 +++++++++++++++++++++++++----
 src/declarative/qml/qmlengine_p.h           |  3 +++
 src/declarative/qml/qmlextensioninterface.h |  2 +-
 src/declarative/qml/qmlextensionplugin.h    |  2 +-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 98e16aa..a7c3d08 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -158,6 +158,21 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
     }
     globalClass = new QmlGlobalScriptClass(&scriptEngine);
     fileImportPath.append(QLibraryInfo::location(QLibraryInfo::DataPath)+QDir::separator()+QLatin1String("qml"));
+
+    // env import paths
+    QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
+    if (!envImportPath.isEmpty()) {
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+        QLatin1Char pathSep(';');
+#else
+        QLatin1Char pathSep(':');
+#endif
+        foreach (const QString &path, QString::fromLatin1(envImportPath).split(pathSep, QString::SkipEmptyParts)) {
+            QString canonicalPath = QDir(path).canonicalPath();
+            if (!canonicalPath.isEmpty() && !environmentImportPath.contains(canonicalPath))
+                environmentImportPath.append(canonicalPath);
+        }
+    }
 }
 
 QUrl QmlScriptEngine::resolvedUrl(QScriptContext *context, const QUrl& url)
@@ -1334,9 +1349,16 @@ public:
             url.replace(QLatin1Char('.'), QLatin1Char('/'));
             bool found = false;
             QString content;
-            QString dir;
-            QStringList paths = importPath;
-            paths.prepend(QFileInfo(base.toLocalFile()).path());
+            QString dir;            
+
+            // user import paths
+            QStringList paths;
+
+            // base..
+            paths += QFileInfo(base.toLocalFile()).path();
+            paths += importPath;
+            paths += QmlEnginePrivate::get(engine)->environmentImportPath;
+
             foreach (const QString &p, paths) {
                 dir = p+QLatin1Char('/')+url;
                 QFileInfo fi(dir+QLatin1String("/qmldir"));
@@ -1575,7 +1597,7 @@ bool QmlEngine::importExtension(const QString &fileName, const QString &uri)
     QPluginLoader loader(fileName);
 
     if (QmlExtensionInterface *iface = qobject_cast<QmlExtensionInterface *>(loader.instance())) {
-        iface->initialize(this, uri);
+        iface->initialize(this, uri.toUtf8().constData());
         return true;
     }
 
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 53a88b1..85c5fbe 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -264,6 +264,9 @@ public:
         QmlImportsPrivate *d;
     };
 
+
+    QStringList environmentImportPath;
+
     QString resolvePlugin(const QDir &dir, const QString &baseName,
                           const QStringList &suffixes,
                           const QString &prefix = QString());
diff --git a/src/declarative/qml/qmlextensioninterface.h b/src/declarative/qml/qmlextensioninterface.h
index cbdd34c..b993e82 100644
--- a/src/declarative/qml/qmlextensioninterface.h
+++ b/src/declarative/qml/qmlextensioninterface.h
@@ -54,7 +54,7 @@ class QmlEngine;
 
 struct Q_DECLARATIVE_EXPORT QmlExtensionInterface
 {
-    virtual void initialize(QmlEngine *engine, const QString &uri) = 0;
+    virtual void initialize(QmlEngine *engine, const char *uri) = 0;
 };
 
 Q_DECLARE_INTERFACE(QmlExtensionInterface, "com.trolltech.Qt.QmlExtensionInterface/1.0")
diff --git a/src/declarative/qml/qmlextensionplugin.h b/src/declarative/qml/qmlextensionplugin.h
index 82553e7..8cc64ad 100644
--- a/src/declarative/qml/qmlextensionplugin.h
+++ b/src/declarative/qml/qmlextensionplugin.h
@@ -62,7 +62,7 @@ public:
     explicit QmlExtensionPlugin(QObject *parent = 0);
     ~QmlExtensionPlugin();
 
-    virtual void initialize(QmlEngine *engine, const QString &uri) = 0;
+    virtual void initialize(QmlEngine *engine, const char *uri) = 0;
 };
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From 743720c2d391f73bc376c337002c15cfa119139b Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Tue, 23 Feb 2010 13:16:52 +0100
Subject: Fixing deployment on Symbian

Reviewed-by: TrustMe
---
 tests/benchmarks/declarative/binding/binding.pro | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/declarative/binding/binding.pro
index e25f186..aa4cc41 100644
--- a/tests/benchmarks/declarative/binding/binding.pro
+++ b/tests/benchmarks/declarative/binding/binding.pro
@@ -7,3 +7,9 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_binding.cpp testtypes.cpp
 HEADERS += testtypes.h
 
+symbian* {
+    data.sources = data/*
+    data.path = data
+    DEPLOYMENT = data
+}
+
-- 
cgit v0.12


From fcd4c0dce69e22487d9141f3bf5de6d4c56a3432 Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Tue, 23 Feb 2010 13:32:48 +0100
Subject: Fixing deployment on Symbian platform

Reviewed-by: TrustMe
---
 tests/benchmarks/declarative/creation/creation.pro     | 9 +++++++--
 tests/benchmarks/declarative/creation/tst_creation.cpp | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro
index fcc2987..3e0caf6 100644
--- a/tests/benchmarks/declarative/creation/creation.pro
+++ b/tests/benchmarks/declarative/creation/creation.pro
@@ -6,5 +6,10 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_creation.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
+symbian* {
+    data.sources = data/*
+    data.path = data
+    DEPLOYMENT += addFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
\ No newline at end of file
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index 23c820c..b99031a 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -49,6 +49,12 @@
 #include <QmlGraphicsItem>
 #include <private/qobject_p.h>
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Application private dir is default serach path for files, so SRCDIR can be set to empty
+#define SRCDIR ""
+#endif
+
 class tst_creation : public QObject
 {
     Q_OBJECT
-- 
cgit v0.12


From 8ad76444ad4589e0b69056cca283253070dae350 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Tue, 23 Feb 2010 13:36:36 +0100
Subject: Doc fix

Remove stray '>'
---
 src/declarative/graphicsitems/qmlgraphicsgridview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
index bf370ae..ab87c03 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
@@ -977,7 +977,7 @@ void QmlGraphicsGridView::setHighlight(QmlComponent *highlight)
   Component {
       id: myHighlight
       Rectangle {
-          id: wrapper; color: "lightsteelblue"; radius: 4; width: 320; height: 60 >
+          id: wrapper; color: "lightsteelblue"; radius: 4; width: 320; height: 60
           y: SpringFollow { source: Wrapper.GridView.view.currentItem.y; spring: 3; damping: 0.2 }
           x: SpringFollow { source: Wrapper.GridView.view.currentItem.x; spring: 3; damping: 0.2 }
       }
-- 
cgit v0.12


From b7dde7fc5df285c919df91daba7f07aef00c11bd Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Tue, 23 Feb 2010 13:46:47 +0100
Subject: Fixing deployment on Symbian

Reviewed-by: TrustMe
---
 tests/benchmarks/declarative/qmlcomponent/qmlcomponent.pro | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/benchmarks/declarative/qmlcomponent/qmlcomponent.pro b/tests/benchmarks/declarative/qmlcomponent/qmlcomponent.pro
index 6a86f58..a77eebb 100644
--- a/tests/benchmarks/declarative/qmlcomponent/qmlcomponent.pro
+++ b/tests/benchmarks/declarative/qmlcomponent/qmlcomponent.pro
@@ -7,3 +7,13 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qmlcomponent.cpp testtypes.cpp
 HEADERS += testtypes.h
 
+symbian* {
+    data.sources = data/*
+    data.path = data
+    samegame.sources = data/samegame/*
+    samegame.path = data/samegame
+    samegame_pics.sources = data/samegame/pics/*
+    samegame_pics.path = data/samegame/pics
+    DEPLOYMENT += data samegame samegame_pics
+}
+
-- 
cgit v0.12


From 9cf177099bfff8a00297f868b912723ca7b9551f Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Tue, 23 Feb 2010 13:58:30 +0100
Subject: Fixing deployment on Symbian

Reviewed-by: TrustMe
---
 .../benchmarks/declarative/qmlgraphicsimage/qmlgraphicsimage.pro | 9 +++++++--
 .../declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp        | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/benchmarks/declarative/qmlgraphicsimage/qmlgraphicsimage.pro b/tests/benchmarks/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
index 449d874..f14931c 100644
--- a/tests/benchmarks/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
+++ b/tests/benchmarks/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
@@ -7,5 +7,10 @@ CONFIG += release
 
 SOURCES += tst_qmlgraphicsimage.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
+symbian* {
+    data.sources = image.png
+    data.path = .
+    DEPLOYMENT += data
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
diff --git a/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp b/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
index 7d7d24e..6d1aa0e 100644
--- a/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
+++ b/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
@@ -44,6 +44,12 @@
 #include <QmlComponent>
 #include <private/qmlgraphicsimage_p.h>
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Application private dir is default serach path for files, so SRCDIR can be set to empty
+#define SRCDIR ""
+#endif
+
 class tst_qmlgraphicsimage : public QObject
 {
     Q_OBJECT
-- 
cgit v0.12


From 7f3896f6c0cff6c6ddac1fba480dedbbf78c2df1 Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Tue, 23 Feb 2010 14:07:40 +0100
Subject: Fixing deplyment on Symbian platform

Reviewed-by: TrustMe
---
 tests/benchmarks/declarative/script/script.pro     | 11 ++++++++++-
 tests/benchmarks/declarative/script/tst_script.cpp |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/benchmarks/declarative/script/script.pro b/tests/benchmarks/declarative/script/script.pro
index 48fea81..6255acc 100644
--- a/tests/benchmarks/declarative/script/script.pro
+++ b/tests/benchmarks/declarative/script/script.pro
@@ -7,5 +7,14 @@ CONFIG += release
 
 SOURCES += tst_script.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian* {
+    data.sources = data/*
+    data.path = data
+    DEPLOYMENT += data
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+
+
+
 
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index dd21997..15902e4 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -48,6 +48,12 @@
 #include <QScriptEngine>
 #include <QScriptValue>
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Application private dir is default serach path for files, so SRCDIR can be set to empty
+#define SRCDIR "."
+#endif
+
 class tst_script : public QObject
 {
     Q_OBJECT
-- 
cgit v0.12


From 62fc581eb84504d05bca7b70ac3dc912982133d1 Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Tue, 23 Feb 2010 14:12:14 +0100
Subject: Fixing deployment and default values for Symbian

Reviewed-by: TrustMe
---
 tests/benchmarks/declarative/qmltime/qmltime.cpp | 11 +++++++++++
 tests/benchmarks/declarative/qmltime/qmltime.pro | 15 +++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/tests/benchmarks/declarative/qmltime/qmltime.cpp b/tests/benchmarks/declarative/qmltime/qmltime.cpp
index 2cc5d0d..8e312be 100644
--- a/tests/benchmarks/declarative/qmltime/qmltime.cpp
+++ b/tests/benchmarks/declarative/qmltime/qmltime.cpp
@@ -183,7 +183,11 @@ int main(int argc, char ** argv)
     }
 
     if (filename.isEmpty())
+#ifdef Q_OS_SYMBIAN
+        filename = QLatin1String("./tests/item_creation/data.qml");
+#else
         usage(argv[0]);
+#endif
 
     QmlEngine engine;
     QmlComponent component(&engine, filename);
@@ -204,6 +208,9 @@ int main(int argc, char ** argv)
         return -1;
     }
 
+#ifdef Q_OS_SYMBIAN
+    willParent = true;
+#endif
     timer->setWillParent(willParent);
 
     if (!timer->component()) {
@@ -211,6 +218,10 @@ int main(int argc, char ** argv)
         return -1;
     }
 
+#ifdef Q_OS_SYMBIAN
+    iterations = 1024;
+#endif
+
     timer->run(iterations);
 
     return 0;
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.pro b/tests/benchmarks/declarative/qmltime/qmltime.pro
index b077d1a..9352f3b 100644
--- a/tests/benchmarks/declarative/qmltime/qmltime.pro
+++ b/tests/benchmarks/declarative/qmltime/qmltime.pro
@@ -6,3 +6,18 @@ macx:CONFIG -= app_bundle
 
 SOURCES += qmltime.cpp 
 
+symbian* {
+    TARGET.CAPABILITY = "All -TCB"
+    example.sources = example.qml
+    esample.path = .
+    tests.sources = tests/*
+    tests.path = tests
+    anshors.sources = tests/anchors/*
+    anchors.path = tests/anchors
+    item_creation.sources = tests/item_creation/*
+    item_creation.path = tests/item_creation
+    positioner_creation.sources = tests/positioner_creation/*
+    positioner_creation.path = tests/positioner_creation
+    DEPLOYMENT += example tests anchors item_creation positioner_creation
+}
+
-- 
cgit v0.12


From 466a3fc2f883344fc383be771e2de9975c98b194 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Tue, 23 Feb 2010 14:15:54 +0100
Subject: Fix build on solaris

---
 src/declarative/qml/qmlworkerscript.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp
index a2e8c7a..9a48c4f 100644
--- a/src/declarative/qml/qmlworkerscript.cpp
+++ b/src/declarative/qml/qmlworkerscript.cpp
@@ -169,7 +169,7 @@ private:
 class QmlWorkerListModelAgent : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(int count READ count);
+    Q_PROPERTY(int count READ count)
 
 public:
     QmlWorkerListModelAgent(QmlWorkerListModel *);
-- 
cgit v0.12


From 742befdd5077b27de79ca5ee6f9182540d0d5863 Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Tue, 23 Feb 2010 14:24:44 +0100
Subject: Avoiding PlatSec warnings for Symbian devices

Reviewed-by: TrustMe
---
 tools/qmlviewer/qmlviewer.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro
index aba3cf5..2da244c 100644
--- a/tools/qmlviewer/qmlviewer.pro
+++ b/tools/qmlviewer/qmlviewer.pro
@@ -54,5 +54,5 @@ symbian {
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
     LIBS += -lesock  -lconnmon -linsock
-    TARGET.CAPABILITY = NetworkServices
+    TARGET.CAPABILITY = "All -TCB"
 }
-- 
cgit v0.12


From 3fb191bbeb0e8a2d49c5107df07c5457872357b3 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 23 Feb 2010 09:46:34 +0100
Subject: Get rid of QmlModulePlugin.

---
 .../plugins/com/nokia/TimeExample/Clock.qml        |  50 ++++++++++
 .../plugins/com/nokia/TimeExample/center.png       | Bin 0 -> 765 bytes
 .../plugins/com/nokia/TimeExample/clock.png        | Bin 0 -> 20653 bytes
 .../plugins/com/nokia/TimeExample/hour.png         | Bin 0 -> 625 bytes
 .../plugins/com/nokia/TimeExample/minute.png       | Bin 0 -> 625 bytes
 examples/declarative/plugins/files/Clock.qml       |  50 ----------
 examples/declarative/plugins/files/center.png      | Bin 765 -> 0 bytes
 examples/declarative/plugins/files/clock.png       | Bin 20653 -> 0 bytes
 examples/declarative/plugins/files/hour.png        | Bin 625 -> 0 bytes
 examples/declarative/plugins/files/minute.png      | Bin 625 -> 0 bytes
 examples/declarative/plugins/plugin.cpp            |  14 +--
 examples/declarative/plugins/plugins.pro           |  13 ++-
 src/declarative/qml/qml.pri                        |   2 -
 src/declarative/qml/qmlengine.cpp                  |   1 -
 src/declarative/qml/qmlmoduleplugin.cpp            | 111 ---------------------
 src/declarative/qml/qmlmoduleplugin.h              |  86 ----------------
 src/multimedia/qml/qml.cpp                         |  10 +-
 src/multimedia/qml/qml.h                           |   4 +-
 src/plugins/qmlmodules/multimedia/multimedia.cpp   |  16 +--
 19 files changed, 79 insertions(+), 278 deletions(-)
 create mode 100644 examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
 create mode 100644 examples/declarative/plugins/com/nokia/TimeExample/center.png
 create mode 100644 examples/declarative/plugins/com/nokia/TimeExample/clock.png
 create mode 100644 examples/declarative/plugins/com/nokia/TimeExample/hour.png
 create mode 100644 examples/declarative/plugins/com/nokia/TimeExample/minute.png
 delete mode 100644 examples/declarative/plugins/files/Clock.qml
 delete mode 100644 examples/declarative/plugins/files/center.png
 delete mode 100644 examples/declarative/plugins/files/clock.png
 delete mode 100644 examples/declarative/plugins/files/hour.png
 delete mode 100644 examples/declarative/plugins/files/minute.png
 delete mode 100644 src/declarative/qml/qmlmoduleplugin.cpp
 delete mode 100644 src/declarative/qml/qmlmoduleplugin.h

diff --git a/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml b/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
new file mode 100644
index 0000000..01ec686
--- /dev/null
+++ b/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
@@ -0,0 +1,50 @@
+import Qt 4.6
+
+Item {
+    id: clock
+    width: 200; height: 200
+
+    property alias city: cityLabel.text
+    property var hours
+    property var minutes
+    property var shift : 0
+
+    Image { id: background; source: "clock.png" }
+
+    Image {
+        x: 92.5; y: 27
+        source: "hour.png"
+        smooth: true
+        transform: Rotation {
+            id: hourRotation
+            origin.x: 7.5; origin.y: 73; angle: 0
+            angle: SpringFollow {
+                spring: 2; damping: 0.2; modulus: 360
+                source: (clock.hours * 30) + (clock.minutes * 0.5)
+            }
+        }
+    }
+
+    Image {
+        x: 93.5; y: 17
+        source: "minute.png"
+        smooth: true
+        transform: Rotation {
+            id: minuteRotation
+            origin.x: 6.5; origin.y: 83; angle: 0
+            angle: SpringFollow {
+                spring: 2; damping: 0.2; modulus: 360
+                source: clock.minutes * 6
+            }
+        }
+    }
+
+    Image {
+        anchors.centerIn: background; source: "center.png"
+    }
+
+    Text {
+        id: cityLabel; font.bold: true; font.pixelSize: 14; y:200; color: "white"
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+}
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/center.png b/examples/declarative/plugins/com/nokia/TimeExample/center.png
new file mode 100644
index 0000000..7fbd802
Binary files /dev/null and b/examples/declarative/plugins/com/nokia/TimeExample/center.png differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/clock.png b/examples/declarative/plugins/com/nokia/TimeExample/clock.png
new file mode 100644
index 0000000..462edac
Binary files /dev/null and b/examples/declarative/plugins/com/nokia/TimeExample/clock.png differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/hour.png b/examples/declarative/plugins/com/nokia/TimeExample/hour.png
new file mode 100644
index 0000000..f8061a1
Binary files /dev/null and b/examples/declarative/plugins/com/nokia/TimeExample/hour.png differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/minute.png b/examples/declarative/plugins/com/nokia/TimeExample/minute.png
new file mode 100644
index 0000000..1297ec7
Binary files /dev/null and b/examples/declarative/plugins/com/nokia/TimeExample/minute.png differ
diff --git a/examples/declarative/plugins/files/Clock.qml b/examples/declarative/plugins/files/Clock.qml
deleted file mode 100644
index 01ec686..0000000
--- a/examples/declarative/plugins/files/Clock.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: clock
-    width: 200; height: 200
-
-    property alias city: cityLabel.text
-    property var hours
-    property var minutes
-    property var shift : 0
-
-    Image { id: background; source: "clock.png" }
-
-    Image {
-        x: 92.5; y: 27
-        source: "hour.png"
-        smooth: true
-        transform: Rotation {
-            id: hourRotation
-            origin.x: 7.5; origin.y: 73; angle: 0
-            angle: SpringFollow {
-                spring: 2; damping: 0.2; modulus: 360
-                source: (clock.hours * 30) + (clock.minutes * 0.5)
-            }
-        }
-    }
-
-    Image {
-        x: 93.5; y: 17
-        source: "minute.png"
-        smooth: true
-        transform: Rotation {
-            id: minuteRotation
-            origin.x: 6.5; origin.y: 83; angle: 0
-            angle: SpringFollow {
-                spring: 2; damping: 0.2; modulus: 360
-                source: clock.minutes * 6
-            }
-        }
-    }
-
-    Image {
-        anchors.centerIn: background; source: "center.png"
-    }
-
-    Text {
-        id: cityLabel; font.bold: true; font.pixelSize: 14; y:200; color: "white"
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-}
diff --git a/examples/declarative/plugins/files/center.png b/examples/declarative/plugins/files/center.png
deleted file mode 100644
index 7fbd802..0000000
Binary files a/examples/declarative/plugins/files/center.png and /dev/null differ
diff --git a/examples/declarative/plugins/files/clock.png b/examples/declarative/plugins/files/clock.png
deleted file mode 100644
index 462edac..0000000
Binary files a/examples/declarative/plugins/files/clock.png and /dev/null differ
diff --git a/examples/declarative/plugins/files/hour.png b/examples/declarative/plugins/files/hour.png
deleted file mode 100644
index f8061a1..0000000
Binary files a/examples/declarative/plugins/files/hour.png and /dev/null differ
diff --git a/examples/declarative/plugins/files/minute.png b/examples/declarative/plugins/files/minute.png
deleted file mode 100644
index 1297ec7..0000000
Binary files a/examples/declarative/plugins/files/minute.png and /dev/null differ
diff --git a/examples/declarative/plugins/plugin.cpp b/examples/declarative/plugins/plugin.cpp
index 820d4eb..8e21263 100644
--- a/examples/declarative/plugins/plugin.cpp
+++ b/examples/declarative/plugins/plugin.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qmlmoduleplugin.h>
+#include <QtDeclarative/QmlExtensionPlugin>
 #include <QtDeclarative/qml.h>
 #include <qdebug.h>
 #include <qdatetime.h>
@@ -140,19 +140,15 @@ MinuteTimer *Time::timer=0;
 QML_DECLARE_TYPE(Time);
 
 
-class QExampleQmlPlugin : public QmlModulePlugin
+class QExampleQmlPlugin : public QmlExtensionPlugin
 {
     Q_OBJECT
 public:
-    QStringList keys() const
-    {
-        return QStringList() << QLatin1String("com.nokia.TimeExample");
-    }
-
-    void defineModule(const QString& uri)
+    void initialize(QmlEngine *engine, const char *uri)
     {
+        Q_UNUSED(engine);
         Q_ASSERT(uri == QLatin1String("com.nokia.TimeExample"));
-        qmlRegisterType<Time>("com.nokia.TimeExample", 1, 0, "Time", "Time");
+        qmlRegisterType<Time>(uri, 1, 0, "Time", "Time");
     }
 };
 
diff --git a/examples/declarative/plugins/plugins.pro b/examples/declarative/plugins/plugins.pro
index 84ab8da..d932b01 100644
--- a/examples/declarative/plugins/plugins.pro
+++ b/examples/declarative/plugins/plugins.pro
@@ -1,4 +1,5 @@
 TEMPLATE = lib
+DESTDIR = com/nokia/TimeExample
 TARGET  = qtimeexampleqmlplugin
 CONFIG += qt plugin
 QT += declarative
@@ -6,10 +7,18 @@ QT += declarative
 SOURCES += plugin.cpp
 
 target.path += $$[QT_INSTALL_PLUGINS]/qmlmodules
-sources.files += files/Clock.qml files/qmldir files/background.png files/center.png files/clock-night.png files/clock.png files/hour.png files/minute.png
+
+sources.files += \
+    $$PWD/com/nokia/TimeExample/qmldir \
+    $$PWD/com/nokia/TimeExample/center.png \
+    $$PWD/com/nokia/TimeExample/clock.png \
+    $$PWD/com/nokia/TimeExample/Clock.qml \
+    $$PWD/com/nokia/TimeExample/hour.png \
+    $$PWD/com/nokia/TimeExample/minute.png
+
 sources.path += $$[QT_INSTALL_DATA]/qml/com/nokia/TimeExample
-INSTALLS += target sources
 
+INSTALLS += target sources
 
 VERSION=1.0.0
 
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 4f75391..1e4e234 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -7,7 +7,6 @@ SOURCES += \
     $$PWD/qmlexpression.cpp \
     $$PWD/qmlbinding.cpp \
     $$PWD/qmlmetaproperty.cpp \
-    $$PWD/qmlmoduleplugin.cpp \
     $$PWD/qmlcomponent.cpp \
     $$PWD/qmlcontext.cpp \
     $$PWD/qmlcustomparser.cpp \
@@ -65,7 +64,6 @@ HEADERS += \
     $$PWD/qmlbinding_p.h \
     $$PWD/qmlbinding_p_p.h \
     $$PWD/qmlmetaproperty.h \
-    $$PWD/qmlmoduleplugin.h \
     $$PWD/qmlcomponent.h \
     $$PWD/qmlcomponent_p.h \
     $$PWD/qmlcustomparser_p.h \
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index a7c3d08..c7e1e16 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -50,7 +50,6 @@
 #include "qmlexpression.h"
 #include "qmlcomponent.h"
 #include "qmlmetaproperty_p.h"
-#include "qmlmoduleplugin.h"
 #include "qmlbinding_p_p.h"
 #include "qmlvme_p.h"
 #include "qmlenginedebug_p.h"
diff --git a/src/declarative/qml/qmlmoduleplugin.cpp b/src/declarative/qml/qmlmoduleplugin.cpp
deleted file mode 100644
index 8019805..0000000
--- a/src/declarative/qml/qmlmoduleplugin.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlmoduleplugin.h"
-#include "qstringlist.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlModulePlugin
-    \brief The QmlModulePlugin class provides an abstract base for custom QML module plugins.
-    \reentrant
-    \ingroup plugins
-
-    The QML module plugin is a simple plugin interface that makes it
-    easy to add custom QML modules that can be loaded dynamically
-    into applications.
-
-    Writing a QML module plugin is achieved by subclassing this base
-    class, reimplementing the pure virtual function keys(), and
-    exporting the class with the Q_EXPORT_PLUGIN2() macro. See \l{How
-    to Create Qt Plugins} for details.
-
-    The strings returned by keys() should be the list of URIs of modules
-    that the plugin registers.
-
-    The plugin should register QML types with qmlRegisterType() when the
-    defineModule() method is called.
-
-    See the example in \c{examples/declarative/plugins}.
-*/
-
-/*!
-    Constructs a QML module plugin with the given \a parent. This is
-    invoked automatically by the Q_EXPORT_PLUGIN2() macro.
-*/
-QmlModulePlugin::QmlModulePlugin(QObject *parent)
-    : QObject(parent)
-{
-}
-
-/*!
-    Destroys the QML module plugin.
-
-    You never have to call this explicitly. Qt destroys a plugin
-    automatically when it is no longer used.
-*/
-QmlModulePlugin::~QmlModulePlugin()
-{
-}
-
-/*!
-    \fn void QmlModulePlugin::defineModule(const QString& uri)
-
-    Subclasses must override this function to register types
-    of the module \a uri, which will be one of the strings returned by keys().
-
-    The plugin registers QML types with qmlRegisterType():
-
-    \code
-        qmlRegisterType<MyClass>("com.nokia.MyModule", 1, 0, "MyType", "MyClass");
-    \endcode
-*/
-
-void QmlModulePlugin::defineModuleOnce(const QString& uri)
-{ 
-    if (!defined.contains(uri)) {
-        defined += uri;
-        defineModule(uri);
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlmoduleplugin.h b/src/declarative/qml/qmlmoduleplugin.h
deleted file mode 100644
index b28f1ad..0000000
--- a/src/declarative/qml/qmlmoduleplugin.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLMODULEPLUGIN_H
-#define QMLMODULEPLUGIN_H
-
-#include <QtCore/qplugin.h>
-#include <QtCore/qfactoryinterface.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qset.h>
-#include <QtCore/qbytearray.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-struct Q_DECLARATIVE_EXPORT QmlModuleFactoryInterface : public QFactoryInterface
-{
-    virtual void defineModuleOnce(const QString& uri) = 0;
-};
-
-#define QmlModuleFactoryInterface_iid "com.nokia.Qt.QmlModuleFactoryInterface"
-
-Q_DECLARE_INTERFACE(QmlModuleFactoryInterface, QmlModuleFactoryInterface_iid)
-
-
-class Q_DECLARATIVE_EXPORT QmlModulePlugin : public QObject, public QmlModuleFactoryInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlModuleFactoryInterface:QFactoryInterface)
-public:
-    explicit QmlModulePlugin(QObject *parent = 0);
-    ~QmlModulePlugin();
-
-    virtual void defineModule(const QString& uri) = 0;
-
-private:
-    void defineModuleOnce(const QString& uri);
-    QSet<QString> defined;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLMODULEPLUGIN_H
diff --git a/src/multimedia/qml/qml.cpp b/src/multimedia/qml/qml.cpp
index b9ee212..43a32c5 100644
--- a/src/multimedia/qml/qml.cpp
+++ b/src/multimedia/qml/qml.cpp
@@ -55,11 +55,13 @@ namespace QtMultimedia
     \internal
 */
 
-void qRegisterQmlElements()
+void qRegisterQmlElements(QmlEngine *engine, const char *uri)
 {
-    qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect", "SoundEffect");
-    qmlRegisterType<QmlAudio>("Qt.multimedia", 4, 7, "Audio", "Audio");
-    qmlRegisterType<QmlGraphicsVideo>("Qt.multimedia", 4, 7, "Video", "Video");
+    Q_UNUSED(engine);
+
+    qmlRegisterType<QSoundEffect>(uri, 4, 7, "SoundEffect", "SoundEffect");
+    qmlRegisterType<QmlAudio>(uri, 4, 7, "Audio", "Audio");
+    qmlRegisterType<QmlGraphicsVideo>(uri, 4, 7, "Video", "Video");
 }
 
 }
diff --git a/src/multimedia/qml/qml.h b/src/multimedia/qml/qml.h
index 41274c8..c4159b3 100644
--- a/src/multimedia/qml/qml.h
+++ b/src/multimedia/qml/qml.h
@@ -47,11 +47,13 @@
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
+class QmlEngine;
+
 QT_MODULE(Multimedia)
 
 namespace QtMultimedia
 {
-extern void Q_MULTIMEDIA_EXPORT qRegisterQmlElements();
+extern void Q_MULTIMEDIA_EXPORT qRegisterQmlElements(QmlEngine *engine, const char *uri);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/qmlmodules/multimedia/multimedia.cpp b/src/plugins/qmlmodules/multimedia/multimedia.cpp
index d9414ee..0ebdfd9 100644
--- a/src/plugins/qmlmodules/multimedia/multimedia.cpp
+++ b/src/plugins/qmlmodules/multimedia/multimedia.cpp
@@ -39,27 +39,19 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qmlmoduleplugin.h>
+#include <QtDeclarative/qmlextensionplugin.h>
 #include <QtDeclarative/qml.h>
 #include <QtMultimedia/qml.h>
 
 QT_BEGIN_NAMESPACE
 
-class QMultimediaQmlModule : public QmlModulePlugin
+class QMultimediaQmlModule : public QmlExtensionPlugin
 {
     Q_OBJECT
 public:
-    QStringList keys() const
+    virtual void initialize(QmlEngine *engine, const char *uri)
     {
-        return QStringList() << QLatin1String("Qt.multimedia");
-    }
-
-    void defineModule(const QString& uri)
-    {
-        Q_UNUSED(uri)
-        Q_ASSERT(uri == QLatin1String("Qt.multimedia"));
-
-        QtMultimedia::qRegisterQmlElements();
+        QtMultimedia::qRegisterQmlElements(engine, uri);
     }
 };
 
-- 
cgit v0.12


From 44b52bf289a651be36e0977294ffa3db1df6eefe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Tue, 23 Feb 2010 15:05:48 +0100
Subject: Added the qmldir file for declarative plugins example

---
 examples/declarative/plugins/com/nokia/TimeExample/qmldir | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 examples/declarative/plugins/com/nokia/TimeExample/qmldir

diff --git a/examples/declarative/plugins/com/nokia/TimeExample/qmldir b/examples/declarative/plugins/com/nokia/TimeExample/qmldir
new file mode 100644
index 0000000..e9ef115
--- /dev/null
+++ b/examples/declarative/plugins/com/nokia/TimeExample/qmldir
@@ -0,0 +1,2 @@
+Clock 1.0 Clock.qml
+plugin qtimeexampleqmlplugin
-- 
cgit v0.12


From a0744bb3763c2bf565ca68305f0783b0de8063b2 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 23 Feb 2010 15:27:54 +0100
Subject: Fixed the install rules for the QML plugins example.

Install the QML components in
$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample

and the source files in
$[QT_INSTALL_EXAMPLES]/declarative/plugins/
---
 examples/declarative/plugins/plugins.pro | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/examples/declarative/plugins/plugins.pro b/examples/declarative/plugins/plugins.pro
index d932b01..c9c9f7e 100644
--- a/examples/declarative/plugins/plugins.pro
+++ b/examples/declarative/plugins/plugins.pro
@@ -3,22 +3,25 @@ DESTDIR = com/nokia/TimeExample
 TARGET  = qtimeexampleqmlplugin
 CONFIG += qt plugin
 QT += declarative
+VERSION = 1.0.0
 
 SOURCES += plugin.cpp
 
-target.path += $$[QT_INSTALL_PLUGINS]/qmlmodules
+qmlsources.files += \
+    com/nokia/TimeExample/qmldir \
+    com/nokia/TimeExample/center.png \
+    com/nokia/TimeExample/clock.png \
+    com/nokia/TimeExample/Clock.qml \
+    com/nokia/TimeExample/hour.png \
+    com/nokia/TimeExample/minute.png
 
-sources.files += \
-    $$PWD/com/nokia/TimeExample/qmldir \
-    $$PWD/com/nokia/TimeExample/center.png \
-    $$PWD/com/nokia/TimeExample/clock.png \
-    $$PWD/com/nokia/TimeExample/Clock.qml \
-    $$PWD/com/nokia/TimeExample/hour.png \
-    $$PWD/com/nokia/TimeExample/minute.png
+qmlsources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
 
-sources.path += $$[QT_INSTALL_DATA]/qml/com/nokia/TimeExample
+sources.files += plugins.pro plugin.cpp plugins.qml
+sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
 
-INSTALLS += target sources
+target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
 
-VERSION=1.0.0
+INSTALLS += qmlsources sources target
 
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-- 
cgit v0.12


From 5b99df32ea16775923f7060d8b0c7ee6f9c635d8 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 23 Feb 2010 15:34:58 +0100
Subject: Get rid of the useless import 'files'

Reviewed-by: mae
---
 examples/declarative/plugins/plugins.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/declarative/plugins/plugins.qml b/examples/declarative/plugins/plugins.qml
index dbeb001..44b552b 100644
--- a/examples/declarative/plugins/plugins.qml
+++ b/examples/declarative/plugins/plugins.qml
@@ -1,5 +1,4 @@
 import com.nokia.TimeExample 1.0 // import types from the plugin
-import 'files' // import types from the 'files' directory
 
 Clock { // this class is defined in QML (files/Clock.qml)
 
-- 
cgit v0.12


From d19f691a5646725c69b232e2adde8c2f961eb571 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 23 Feb 2010 16:42:32 +0100
Subject: Added missing destructor to QmlExtensionInterface.

---
 src/declarative/qml/qmlextensioninterface.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/declarative/qml/qmlextensioninterface.h b/src/declarative/qml/qmlextensioninterface.h
index b993e82..644ef1e 100644
--- a/src/declarative/qml/qmlextensioninterface.h
+++ b/src/declarative/qml/qmlextensioninterface.h
@@ -54,6 +54,7 @@ class QmlEngine;
 
 struct Q_DECLARATIVE_EXPORT QmlExtensionInterface
 {
+    virtual ~QmlExtensionInterface() {}
     virtual void initialize(QmlEngine *engine, const char *uri) = 0;
 };
 
-- 
cgit v0.12


From 520cca521ed320ab6751041d9a7bf9c18ee98fa1 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 24 Feb 2010 08:57:09 +1000
Subject: Fix illegal access in QmlStyledText and add auto tests

---
 src/declarative/util/qmlstyledtext.cpp             | 24 +++---
 tests/auto/declarative/declarative.pro             |  1 +
 .../declarative/qmlstyledtext/qmlstyledtext.pro    |  9 ++
 .../qmlstyledtext/tst_qmlstyledtext.cpp            | 96 ++++++++++++++++++++++
 4 files changed, 118 insertions(+), 12 deletions(-)
 create mode 100644 tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro
 create mode 100644 tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp

diff --git a/src/declarative/util/qmlstyledtext.cpp b/src/declarative/util/qmlstyledtext.cpp
index 1f31214..6d01e3c 100644
--- a/src/declarative/util/qmlstyledtext.cpp
+++ b/src/declarative/util/qmlstyledtext.cpp
@@ -111,6 +111,8 @@ QmlStyledText::~QmlStyledText()
 
 void QmlStyledText::parse(const QString &string, QTextLayout &layout)
 {
+    if (string.isEmpty())
+        return;
     QmlStyledText styledText(string, layout);
     styledText.d->parse();
 }
@@ -142,8 +144,10 @@ void QmlStyledTextPrivate::parse()
             ++ch;
             if (*ch == slash) {
                 ++ch;
-                if (parseCloseTag(ch, text))
-                    formatStack.pop();
+                if (parseCloseTag(ch, text)) {
+                    if (formatStack.count())
+                        formatStack.pop();
+                }
             } else {
                 QTextCharFormat format;
                 if (formatStack.count())
@@ -164,7 +168,8 @@ void QmlStyledTextPrivate::parse()
         } else {
             ++textLength;
         }
-        ++ch;
+        if (!ch->isNull())
+            ++ch;
     }
     if (textLength)
         drawText.append(QStringRef(&text, textStart, textLength));
@@ -191,20 +196,15 @@ bool QmlStyledTextPrivate::parseTag(const QChar *&ch, const QString &textIn, QSt
             QStringRef tag(&textIn, tagStart, tagLength);
             const QChar char0 = tag.at(0);
             if (char0 == QLatin1Char('b')) {
-                if (tagLength == 1) {
+                if (tagLength == 1)
                     format.setFontWeight(QFont::Bold);
-                    return true;
-                } else if (tagLength == 2 && tag.at(1) == QLatin1Char('r')) {
+                else if (tagLength == 2 && tag.at(1) == QLatin1Char('r'))
                     textOut.append(QChar(QChar::LineSeparator));
-                    return true;
-                }
             } else if (char0 == QLatin1Char('i')) {
-                if (tagLength == 1) {
+                if (tagLength == 1)
                     format.setFontItalic(true);
-                    return true;
-                }
             }
-            return false;
+            return true;
         } else if (ch->isSpace()) {
             // may have params.
             QStringRef tag(&textIn, tagStart, tagLength);
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 870c92b..c9b1052 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -58,6 +58,7 @@ SUBDIRS += \
            qmlvaluetypes \          # Cover
            qmlxmlhttprequest \      # Cover
            qmlimageprovider \       # Cover
+           qmlstyledtext \          # Cover
            sql                      # Cover
 
 contains(QT_CONFIG, webkit) {
diff --git a/tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro b/tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro
new file mode 100644
index 0000000..d535835
--- /dev/null
+++ b/tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+QT += network
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qmlstyledtext.cpp
+
+# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
+# LIBS += -lgcov
diff --git a/tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp b/tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp
new file mode 100644
index 0000000..5e675b1
--- /dev/null
+++ b/tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtTest/QtTest>
+#include <QtGui/QTextLayout>
+#include <private/qmlstyledtext_p.h>
+
+class tst_qmlstyledtext : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlstyledtext()
+    {
+    }
+
+private slots:
+    void textOutput();
+    void textOutput_data();
+};
+
+// For malformed input all we test is that we get the expected text out.
+// 
+void tst_qmlstyledtext::textOutput_data()
+{
+    QTest::addColumn<QString>("input");
+    QTest::addColumn<QString>("output");
+
+    QTest::newRow("bold") << "<b>bold</b>" << "bold";
+    QTest::newRow("italic") << "<b>italic</b>" << "italic";
+    QTest::newRow("missing >") << "<b>text</b" << "text";
+    QTest::newRow("missing b>") << "<b>text</" << "text";
+    QTest::newRow("missing /b>") << "<b>text<" << "text";
+    QTest::newRow("missing </b>") << "<b>text" << "text";
+    QTest::newRow("bad nest") << "<b>text <i>italic</b></i>" << "text italic";
+    QTest::newRow("font color") << "<font color=\"red\">red text</font>" << "red text";
+    QTest::newRow("font size") << "<font size=\"1\">text</font>" << "text";
+    QTest::newRow("font empty") << "<font>text</font>" << "text";
+    QTest::newRow("font bad 1") << "<font ezis=\"blah\">text</font>" << "text";
+    QTest::newRow("font bad 2") << "<font size=\"1>text</font>" << "";
+    QTest::newRow("extra close") << "<b>text</b></b>" << "text";
+    QTest::newRow("empty") << "" << "";
+}
+
+void tst_qmlstyledtext::textOutput()
+{
+    QFETCH(QString, input);
+    QFETCH(QString, output);
+
+    QTextLayout layout;
+    QmlStyledText::parse(input, layout);
+
+    QCOMPARE(layout.text(), output);
+}
+
+
+QTEST_MAIN(tst_qmlstyledtext)
+
+#include "tst_qmlstyledtext.moc"
-- 
cgit v0.12


From 8727985d81c793d52d5e24ed6815e7237ae879f1 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 09:07:29 +1000
Subject: Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.

Task-number: QT-2798
---
 demos/declarative/minehunt/main.cpp                |   3 +-
 doc/src/declarative/extending-examples.qdoc        |   8 +-
 doc/src/declarative/extending.qdoc                 |  31 +-
 examples/declarative/extending/adding/main.cpp     |   2 +
 examples/declarative/extending/adding/person.cpp   |   1 -
 .../extending/attached/birthdayparty.cpp           |   3 -
 examples/declarative/extending/attached/main.cpp   |   7 +
 examples/declarative/extending/attached/person.cpp |   4 -
 .../extending/binding/birthdayparty.cpp            |   2 -
 .../extending/binding/happybirthday.cpp            |   1 -
 examples/declarative/extending/binding/main.cpp    |   9 +
 examples/declarative/extending/binding/person.cpp  |   4 -
 .../extending/coercion/birthdayparty.cpp           |   1 -
 examples/declarative/extending/coercion/main.cpp   |   7 +
 examples/declarative/extending/coercion/person.cpp |   6 -
 .../extending/default/birthdayparty.cpp            |   1 -
 examples/declarative/extending/default/main.cpp    |   5 +
 examples/declarative/extending/default/person.cpp  |   3 -
 .../declarative/extending/extended/lineedit.cpp    |   1 -
 examples/declarative/extending/extended/main.cpp   |   3 +
 .../extending/grouped/birthdayparty.cpp            |   1 -
 examples/declarative/extending/grouped/main.cpp    |   6 +
 examples/declarative/extending/grouped/person.cpp  |   4 -
 .../extending/properties/birthdayparty.cpp         |   1 -
 examples/declarative/extending/properties/main.cpp |   3 +
 .../declarative/extending/properties/person.cpp    |   1 -
 .../declarative/extending/signal/birthdayparty.cpp |   2 -
 examples/declarative/extending/signal/main.cpp     |   7 +
 examples/declarative/extending/signal/person.cpp   |   4 -
 .../extending/valuesource/birthdayparty.cpp        |   2 -
 .../extending/valuesource/happybirthday.cpp        |   1 -
 .../declarative/extending/valuesource/main.cpp     |   9 +
 .../declarative/extending/valuesource/person.cpp   |   4 -
 src/declarative/declarative.pro                    |   1 -
 .../graphicsitems/qmlgraphicsitemsmodule.cpp       |   6 -
 src/declarative/qml/qml.h                          |  39 +--
 src/declarative/qml/qmlbinding.cpp                 |   2 -
 src/declarative/qml/qmlcomponent.cpp               |   1 -
 src/declarative/qml/qmlcustomparser.cpp            |   8 +-
 src/declarative/qml/qmlcustomparser_p.h            |  10 +-
 src/declarative/qml/qmlengine.cpp                  |  14 +-
 src/declarative/qml/qmlengine_p.h                  |   2 +
 src/declarative/qml/qmlworkerscript.cpp            |   4 -
 src/declarative/util/qmlanimation.cpp              |  24 +-
 src/declarative/util/qmlbehavior.cpp               |   2 +-
 src/declarative/util/qmlbind.cpp                   |   2 +-
 src/declarative/util/qmlconnection.cpp             |   2 +-
 src/declarative/util/qmldatetimeformatter.cpp      |   2 +-
 src/declarative/util/qmleasefollow.cpp             |   2 +-
 src/declarative/util/qmlfontloader.cpp             |   2 +-
 src/declarative/util/qmlgraphicsutilmodule.cpp     | 118 ++++++++
 src/declarative/util/qmlgraphicsutilmodule_p.h     |  63 ++++
 src/declarative/util/qmllistmodel.cpp              |  35 +--
 src/declarative/util/qmllistmodel_p.h              |  32 +++
 src/declarative/util/qmlnumberformatter.cpp        |   2 +-
 src/declarative/util/qmlpackage.cpp                |  20 +-
 src/declarative/util/qmlpackage_p.h                |  16 ++
 src/declarative/util/qmlpropertychanges.cpp        |  11 -
 src/declarative/util/qmlpropertychanges_p.h        |  11 +
 src/declarative/util/qmlspringfollow.cpp           |   2 +-
 src/declarative/util/qmlstate.cpp                  |   3 +-
 src/declarative/util/qmlstategroup.cpp             |   2 +-
 src/declarative/util/qmlstateoperations.cpp        |   6 +-
 src/declarative/util/qmlstyledtext_p.h             |   1 +
 src/declarative/util/qmlsystempalette.cpp          |   2 +-
 src/declarative/util/qmltimer.cpp                  |   2 +-
 src/declarative/util/qmltransition.cpp             |   2 +-
 src/declarative/util/qmlxmllistmodel.cpp           |  39 +--
 src/declarative/util/qmlxmllistmodel_p.h           |  33 +++
 src/declarative/util/qnumberformat.cpp             |   2 -
 src/declarative/util/util.pri                      |   2 +
 src/declarative/widgets/graphicslayouts.cpp        | 319 ---------------------
 src/declarative/widgets/graphicslayouts_p.h        | 168 -----------
 src/declarative/widgets/graphicswidgets.cpp        | 117 --------
 src/declarative/widgets/graphicswidgets_p.h        |  68 -----
 src/declarative/widgets/widgets.pri                |   9 -
 src/plugins/qmlmodules/qmlmodules.pro              |   2 +
 src/plugins/qmlmodules/widgets/graphicslayouts.cpp | 260 +++++++++++++++++
 src/plugins/qmlmodules/widgets/graphicslayouts_p.h | 226 +++++++++++++++
 src/plugins/qmlmodules/widgets/graphicswidgets.cpp |  40 +++
 src/plugins/qmlmodules/widgets/graphicswidgets_p.h |  68 +++++
 src/plugins/qmlmodules/widgets/widgets.cpp         | 144 ++++++++++
 src/plugins/qmlmodules/widgets/widgets.pro         |  15 +
 tests/auto/declarative/layouts/data/layouts.qml    |   1 +
 tests/auto/declarative/qmlecmascript/testtypes.cpp |  15 +-
 tests/auto/declarative/qmlecmascript/testtypes.h   |   2 +
 .../qmlecmascript/tst_qmlecmascript.cpp            |   3 +
 .../declarative/qmlgraphicswebview/testtypes.cpp   |   5 +-
 .../declarative/qmlgraphicswebview/testtypes.h     |   2 +
 .../qmlgraphicswebview/tst_qmlgraphicswebview.cpp  |   6 +
 tests/auto/declarative/qmllanguage/testtypes.cpp   |  21 +-
 tests/auto/declarative/qmllanguage/testtypes.h     |   2 +
 .../declarative/qmllanguage/tst_qmllanguage.cpp    |  16 +-
 .../qmllistreference/tst_qmllistreference.cpp      |   7 +-
 .../qmlmetaproperty/tst_qmlmetaproperty.cpp        |  11 +-
 .../declarative/qmlmetatype/tst_qmlmetatype.cpp    |  14 +-
 .../declarative/qmlmoduleplugin/plugin/plugin.cpp  |   2 +-
 tests/auto/declarative/qmlstates/tst_qmlstates.cpp |   8 +-
 tests/auto/declarative/qmlvaluetypes/testtypes.cpp |   9 +-
 tests/auto/declarative/qmlvaluetypes/testtypes.h   |   2 +
 .../qmlvaluetypes/tst_qmlvaluetypes.cpp            |   7 +
 tests/benchmarks/declarative/binding/testtypes.cpp |   5 +-
 tests/benchmarks/declarative/binding/testtypes.h   |   2 +
 .../benchmarks/declarative/binding/tst_binding.cpp |   9 +-
 .../declarative/qmlcomponent/testtypes.cpp         |   5 +-
 .../declarative/qmlcomponent/testtypes.h           |   2 +
 .../declarative/qmlcomponent/tst_qmlcomponent.cpp  |   9 +-
 tests/benchmarks/declarative/qmltime/qmltime.cpp   |   3 +-
 tests/benchmarks/declarative/script/tst_script.cpp |   8 +-
 tools/qmlviewer/main.cpp                           |   6 +
 tools/qmlviewer/qfxtester.cpp                      |  12 +-
 tools/qmlviewer/qfxtester.h                        |   2 +
 tools/qmlviewer/qmlfolderlistmodel.cpp             |   8 +-
 tools/qmlviewer/qmlfolderlistmodel.h               |   2 +
 tools/qmlviewer/qmlviewer.cpp                      |   7 +-
 tools/qmlviewer/qmlviewer.h                        |   2 +
 116 files changed, 1330 insertions(+), 995 deletions(-)
 create mode 100644 src/declarative/util/qmlgraphicsutilmodule.cpp
 create mode 100644 src/declarative/util/qmlgraphicsutilmodule_p.h
 delete mode 100644 src/declarative/widgets/graphicslayouts.cpp
 delete mode 100644 src/declarative/widgets/graphicslayouts_p.h
 delete mode 100644 src/declarative/widgets/graphicswidgets.cpp
 delete mode 100644 src/declarative/widgets/graphicswidgets_p.h
 delete mode 100644 src/declarative/widgets/widgets.pri
 create mode 100644 src/plugins/qmlmodules/widgets/graphicslayouts.cpp
 create mode 100644 src/plugins/qmlmodules/widgets/graphicslayouts_p.h
 create mode 100644 src/plugins/qmlmodules/widgets/graphicswidgets.cpp
 create mode 100644 src/plugins/qmlmodules/widgets/graphicswidgets_p.h
 create mode 100644 src/plugins/qmlmodules/widgets/widgets.cpp
 create mode 100644 src/plugins/qmlmodules/widgets/widgets.pro

diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
index 0b862e3..9c225af 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -92,7 +92,6 @@ private:
 };
 
 QML_DECLARE_TYPE(Tile);
-QML_DEFINE_TYPE(0,0,0,Tile,Tile);
 
 class MyWidget : public QWidget
 {
@@ -323,6 +322,8 @@ int main(int argc, char ** argv)
     int width = 370;
     int height = 480;
 
+    QML_REGISTER_TYPE(0,0,0,Tile,Tile);
+
     for (int i = 1; i < argc; ++i) {
         QString arg = argv[i];
         if (arg == "-frameless") {
diff --git a/doc/src/declarative/extending-examples.qdoc b/doc/src/declarative/extending-examples.qdoc
index b84ae0e..b912a1d 100644
--- a/doc/src/declarative/extending-examples.qdoc
+++ b/doc/src/declarative/extending-examples.qdoc
@@ -69,7 +69,7 @@ Q_DECLARE_METATYPE() functionality.
 The Person class implementation is quite basic.  The property accessors simply
 return members of the object instance.
 
-The implementation must also include the QML_DEFINE_TYPE() macro.  This macro
+The implementation must also be registered using the QML_REGISTER_TYPE() macro.  This macro
 registers the Person class with QML as a type in the People library version 1.0,
 and defines the mapping between the C++ and QML class names.
 
@@ -160,13 +160,13 @@ previous example.  However, as we have repurposed the People class as a common
 base for Boy and Girl, we want to prevent it from being instantiated from QML
 directly - an explicit Boy or Girl should be instantiated instead.
 
-\snippet examples/declarative/extending/coercion/person.cpp 0
+\snippet examples/declarative/extending/coercion/main.cpp 0
 
 While we want to disallow instantiating Person from within QML, it still needs
 to be registered with the QML engine, so that it can be used as a property type
 and other types can be coerced to it.  To register a type, without defining a
-named mapping into QML, we use the QML_DEFINE_NOCREATE_TYPE() macro instead of
-the QML_DEFINE_TYPE() macro used previously.
+named mapping into QML, we call the QML_REGISTER_NOCREATE_TYPE() macro instead of
+the QML_REGISTER_TYPE() macro used previously.
 
 \section2 Define Boy and Girl
 
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index d3e6c14..b40980d 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -72,7 +72,7 @@ Custom C++ types are made available to QML using these two macros:
 \quotation
 \code
 #define QML_DECLARE_TYPE(T)
-#define QML_DEFINE_TYPE(URI,VMAJ,VMIN,QmlName,T)
+#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,QmlName,T)
 \endcode
 
 Register the C++ type \a T with the QML system, and make it available in QML
@@ -80,9 +80,8 @@ under the name \a QmlName in library URI version VMAJ.VMIN.
 \a T and \a QmlName may be the same.
 
 Generally the QML_DECLARE_TYPE() macro should be included immediately following
-the type declaration (usually in its header file), and the QML_DEFINE_TYPE()
-macro in the implementation file.  QML_DEFINE_TYPE() must not be present in
-a header file.
+the type declaration (usually in its header file), and the QML_REGISTER_TYPE()
+macro called by the implementation.
 
 Type \a T must be a concrete type that inherits QObject and has a default
 constructor.
@@ -153,15 +152,14 @@ from registering a new QML type.  The following macros are used instead:
 \quotation
 \code
     #define QML_DECLARE_INTERFACE(T)
-    #define QML_DEFINE_INTERFACE(T)
+    #define QML_REGISTER_INTERFACE(T)
 \endcode
 
 Register the C++ interface \a T with the QML system.
 
 Generally the QML_DECLARE_INTERFACE() macro should be included immediately
 following the interface declaration (usually in its header file), and the
-QML_DEFINE_INTERFACE() macro in an implementation file.  QML_DEFINE_INTERFACE()
-must not be present in a header file.
+QML_REGISTER_INTERFACE() macro called by the implementation.
 
 Following registration, QML can coerce objects that implement this interface
 for assignment to appropriately typed properties.
@@ -194,7 +192,7 @@ type used in the previous section, but the assignment is valid as both the Boy
 and Girl objects inherit from Person.
 
 To assign to a property, the property's type must have been registered with QML.
-Both the QML_DEFINE_TYPE() and QML_DEFINE_INTERFACE() macros already shown can
+Both the QML_REGISTER_TYPE() and QML_REGISTER_INTERFACE() macros already shown can
 be used to register a type with QML.  Additionally, if a type that acts purely
 as a base class that cannot be instantiated from QML needs to be
 registered these macros can be used:
@@ -202,18 +200,17 @@ registered these macros can be used:
 \quotation
 \code
     #define QML_DECLARE_TYPE(T)
-    #define QML_DEFINE_NOCREATE_TYPE(T)
+    #define QML_REGISTER_NOCREATE_TYPE(T)
 \endcode
 
-Register the C++ type \a T with the QML system. QML_DEFINE_NOCREATE_TYPE()
-differs from QML_DEFINE_TYPE() in that it does not define a mapping between the
+Register the C++ type \a T with the QML system. QML_REGISTER_NOCREATE_TYPE()
+differs from QML_REGISTER_TYPE() in that it does not define a mapping between the
 C++ class and a QML element name, so the type is not instantiable from QML, but
 it is available for type coercion.
 
 Generally the QML_DECLARE_TYPE() macro should be included immediately following
 the type declaration (usually in its header file), and the
-QML_DEFINE_NOCREATE_TYPE() macro in the implementation file.
-QML_DEFINE_NOCREATE_TYPE() must not be present in a header file.
+QML_REGISTER_NOCREATE_TYPE() macro called from the implementation.
 
 Type \a T must inherit QObject, but there are no restrictions on whether it is
 concrete or the signature of its constructor.
@@ -597,11 +594,11 @@ the appropriate property on the extension object is used instead.
 
 When an extended type is installed, one of the
 \code
-    #define QML_DEFINE_EXTENDED_TYPE(URI, VMAJ, VFROM, VTO, QmlName,T, ExtendedT)
-    #define QML_DEFINE_EXTENDED_NOCREATE_TYPE(T, ExtendedT)
+    #define QML_REGISTER_EXTENDED_TYPE(URI, VMAJ, VFROM, VTO, QmlName,T, ExtendedT)
+    #define QML_REGISTER_EXTENDED_NOCREATE_TYPE(T, ExtendedT)
 \endcode
-macros should be used instead of the regular \c QML_DEFINE_TYPE or
-\c QML_DEFINE_NOCREATE_TYPE.  The arguments are identical to the corresponding
+macros should be used instead of the regular \c QML_REGISTER_TYPE or
+\c QML_REGISTER_NOCREATE_TYPE.  The arguments are identical to the corresponding
 non-extension object macro, except for the ExtendedT parameter which is the type
 of the extension object.
 
diff --git a/examples/declarative/extending/adding/main.cpp b/examples/declarative/extending/adding/main.cpp
index 74ea35c..0aeeecf 100644
--- a/examples/declarative/extending/adding/main.cpp
+++ b/examples/declarative/extending/adding/main.cpp
@@ -48,6 +48,8 @@ int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
+    QML_REGISTER_TYPE(People, 1,0, Person, Person);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     Person *person = qobject_cast<Person *>(component.create());
diff --git a/examples/declarative/extending/adding/person.cpp b/examples/declarative/extending/adding/person.cpp
index 9efa2b8..cdf08e0 100644
--- a/examples/declarative/extending/adding/person.cpp
+++ b/examples/declarative/extending/adding/person.cpp
@@ -66,5 +66,4 @@ void Person::setShoeSize(int s)
     m_shoeSize = s;
 }
 
-QML_DEFINE_TYPE(People, 1,0, Person, Person);
 // ![0]
diff --git a/examples/declarative/extending/attached/birthdayparty.cpp b/examples/declarative/extending/attached/birthdayparty.cpp
index ffdda57..293628e 100644
--- a/examples/declarative/extending/attached/birthdayparty.cpp
+++ b/examples/declarative/extending/attached/birthdayparty.cpp
@@ -55,8 +55,6 @@ void BirthdayPartyAttached::setRsvp(const QDate &d)
     m_rsvp = d;
 }
 
-QML_DEFINE_NOCREATE_TYPE(BirthdayPartyAttached);
-
 BirthdayParty::BirthdayParty(QObject *parent)
 : QObject(parent), m_celebrant(0)
 {
@@ -92,4 +90,3 @@ BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
     return new BirthdayPartyAttached(object);
 }
 
-QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/attached/main.cpp b/examples/declarative/extending/attached/main.cpp
index 27a9287..f4223a2 100644
--- a/examples/declarative/extending/attached/main.cpp
+++ b/examples/declarative/extending/attached/main.cpp
@@ -49,6 +49,13 @@ int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
+    QML_REGISTER_NOCREATE_TYPE(BirthdayPartyAttached);
+    QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
+    QML_REGISTER_NOCREATE_TYPE(ShoeDescription);
+    QML_REGISTER_NOCREATE_TYPE(Person);
+    QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
+    QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
diff --git a/examples/declarative/extending/attached/person.cpp b/examples/declarative/extending/attached/person.cpp
index 909505a..0a9e508 100644
--- a/examples/declarative/extending/attached/person.cpp
+++ b/examples/declarative/extending/attached/person.cpp
@@ -84,7 +84,6 @@ void ShoeDescription::setPrice(qreal p)
 {
     m_price = p;
 }
-QML_DEFINE_NOCREATE_TYPE(ShoeDescription);
 
 Person::Person(QObject *parent)
 : QObject(parent)
@@ -106,18 +105,15 @@ ShoeDescription *Person::shoe()
     return &m_shoe;
 }
 
-QML_DEFINE_NOCREATE_TYPE(Person);
 
 Boy::Boy(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/binding/birthdayparty.cpp b/examples/declarative/extending/binding/birthdayparty.cpp
index 62b9c7b..392c59a 100644
--- a/examples/declarative/extending/binding/birthdayparty.cpp
+++ b/examples/declarative/extending/binding/birthdayparty.cpp
@@ -58,7 +58,6 @@ void BirthdayPartyAttached::setRsvp(const QDate &d)
     }
 }
 
-QML_DEFINE_NOCREATE_TYPE(BirthdayPartyAttached);
 
 BirthdayParty::BirthdayParty(QObject *parent)
 : QObject(parent), m_celebrant(0)
@@ -113,4 +112,3 @@ BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
     return new BirthdayPartyAttached(object);
 }
 
-QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/binding/happybirthday.cpp b/examples/declarative/extending/binding/happybirthday.cpp
index 38f3c08..704d384 100644
--- a/examples/declarative/extending/binding/happybirthday.cpp
+++ b/examples/declarative/extending/binding/happybirthday.cpp
@@ -84,4 +84,3 @@ void HappyBirthday::advance()
     m_target.write(m_lyrics.at(m_line));
 }
 
-QML_DEFINE_TYPE(People, 1,0, HappyBirthday, HappyBirthday);
diff --git a/examples/declarative/extending/binding/main.cpp b/examples/declarative/extending/binding/main.cpp
index ba38e82..ea0e33a 100644
--- a/examples/declarative/extending/binding/main.cpp
+++ b/examples/declarative/extending/binding/main.cpp
@@ -43,12 +43,21 @@
 #include <QmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
+#include "happybirthday.h"
 #include "person.h"
 
 int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
+    QML_REGISTER_NOCREATE_TYPE(BirthdayPartyAttached);
+    QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
+    QML_REGISTER_TYPE(People, 1,0, HappyBirthday, HappyBirthday);
+    QML_REGISTER_NOCREATE_TYPE(ShoeDescription);
+    QML_REGISTER_NOCREATE_TYPE(Person);
+    QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
+    QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
diff --git a/examples/declarative/extending/binding/person.cpp b/examples/declarative/extending/binding/person.cpp
index 50fb754..9a2248f 100644
--- a/examples/declarative/extending/binding/person.cpp
+++ b/examples/declarative/extending/binding/person.cpp
@@ -100,7 +100,6 @@ void ShoeDescription::setPrice(qreal p)
     m_price = p;
     emit shoeChanged();
 }
-QML_DEFINE_NOCREATE_TYPE(ShoeDescription);
 
 Person::Person(QObject *parent)
 : QObject(parent)
@@ -126,18 +125,15 @@ ShoeDescription *Person::shoe()
     return &m_shoe;
 }
 
-QML_DEFINE_NOCREATE_TYPE(Person);
 
 Boy::Boy(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/coercion/birthdayparty.cpp b/examples/declarative/extending/coercion/birthdayparty.cpp
index 15a4ca9..f0eb599 100644
--- a/examples/declarative/extending/coercion/birthdayparty.cpp
+++ b/examples/declarative/extending/coercion/birthdayparty.cpp
@@ -70,4 +70,3 @@ Person *BirthdayParty::guest(int index) const
     return m_guests.at(index);
 }
 
-QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/coercion/main.cpp b/examples/declarative/extending/coercion/main.cpp
index ccbee83..b1a203f 100644
--- a/examples/declarative/extending/coercion/main.cpp
+++ b/examples/declarative/extending/coercion/main.cpp
@@ -49,6 +49,13 @@ int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
+    QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
+// ![0]
+    QML_REGISTER_NOCREATE_TYPE(Person);
+// ![0]
+    QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
+    QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
diff --git a/examples/declarative/extending/coercion/person.cpp b/examples/declarative/extending/coercion/person.cpp
index 9eef8f7..5b5203a 100644
--- a/examples/declarative/extending/coercion/person.cpp
+++ b/examples/declarative/extending/coercion/person.cpp
@@ -65,22 +65,16 @@ void Person::setShoeSize(int s)
     m_shoeSize = s;
 }
 
-// ![0]
-QML_DEFINE_NOCREATE_TYPE(Person);
-// ![0]
-
 // ![1]
 Boy::Boy(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
 // ![1]
diff --git a/examples/declarative/extending/default/birthdayparty.cpp b/examples/declarative/extending/default/birthdayparty.cpp
index 15a4ca9..f0eb599 100644
--- a/examples/declarative/extending/default/birthdayparty.cpp
+++ b/examples/declarative/extending/default/birthdayparty.cpp
@@ -70,4 +70,3 @@ Person *BirthdayParty::guest(int index) const
     return m_guests.at(index);
 }
 
-QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/default/main.cpp b/examples/declarative/extending/default/main.cpp
index ccbee83..ea51e00 100644
--- a/examples/declarative/extending/default/main.cpp
+++ b/examples/declarative/extending/default/main.cpp
@@ -49,6 +49,11 @@ int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
+    QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
+    QML_REGISTER_NOCREATE_TYPE(Person);
+    QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
+    QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
diff --git a/examples/declarative/extending/default/person.cpp b/examples/declarative/extending/default/person.cpp
index a0b4960..69216d3 100644
--- a/examples/declarative/extending/default/person.cpp
+++ b/examples/declarative/extending/default/person.cpp
@@ -65,18 +65,15 @@ void Person::setShoeSize(int s)
     m_shoeSize = s;
 }
 
-QML_DEFINE_NOCREATE_TYPE(Person);
 
 Boy::Boy(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/extended/lineedit.cpp b/examples/declarative/extending/extended/lineedit.cpp
index ec86aad..0d8eb7f 100644
--- a/examples/declarative/extending/extended/lineedit.cpp
+++ b/examples/declarative/extending/extended/lineedit.cpp
@@ -103,4 +103,3 @@ void LineEditExtension::setBottomMargin(int m)
 }
 
 QML_DECLARE_TYPE(QLineEdit);
-QML_DEFINE_EXTENDED_TYPE(People, 1,0, QLineEdit, QLineEdit, LineEditExtension);
diff --git a/examples/declarative/extending/extended/main.cpp b/examples/declarative/extending/extended/main.cpp
index 9376af7..ad4bf50 100644
--- a/examples/declarative/extending/extended/main.cpp
+++ b/examples/declarative/extending/extended/main.cpp
@@ -43,11 +43,14 @@
 #include <QmlComponent>
 #include <QDebug>
 #include <QLineEdit>
+#include "lineedit.h"
 
 int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
+    QML_REGISTER_EXTENDED_TYPE(People, 1,0, QLineEdit, QLineEdit, LineEditExtension);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     QLineEdit *edit = qobject_cast<QLineEdit *>(component.create());
diff --git a/examples/declarative/extending/grouped/birthdayparty.cpp b/examples/declarative/extending/grouped/birthdayparty.cpp
index 15a4ca9..f0eb599 100644
--- a/examples/declarative/extending/grouped/birthdayparty.cpp
+++ b/examples/declarative/extending/grouped/birthdayparty.cpp
@@ -70,4 +70,3 @@ Person *BirthdayParty::guest(int index) const
     return m_guests.at(index);
 }
 
-QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/grouped/main.cpp b/examples/declarative/extending/grouped/main.cpp
index 79aaab5..a8dafd9 100644
--- a/examples/declarative/extending/grouped/main.cpp
+++ b/examples/declarative/extending/grouped/main.cpp
@@ -49,6 +49,12 @@ int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
+    QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
+    QML_REGISTER_NOCREATE_TYPE(ShoeDescription);
+    QML_REGISTER_NOCREATE_TYPE(Person);
+    QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
+    QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
diff --git a/examples/declarative/extending/grouped/person.cpp b/examples/declarative/extending/grouped/person.cpp
index 909505a..0a9e508 100644
--- a/examples/declarative/extending/grouped/person.cpp
+++ b/examples/declarative/extending/grouped/person.cpp
@@ -84,7 +84,6 @@ void ShoeDescription::setPrice(qreal p)
 {
     m_price = p;
 }
-QML_DEFINE_NOCREATE_TYPE(ShoeDescription);
 
 Person::Person(QObject *parent)
 : QObject(parent)
@@ -106,18 +105,15 @@ ShoeDescription *Person::shoe()
     return &m_shoe;
 }
 
-QML_DEFINE_NOCREATE_TYPE(Person);
 
 Boy::Boy(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/properties/birthdayparty.cpp b/examples/declarative/extending/properties/birthdayparty.cpp
index 23e6e58..2fbdad9 100644
--- a/examples/declarative/extending/properties/birthdayparty.cpp
+++ b/examples/declarative/extending/properties/birthdayparty.cpp
@@ -72,4 +72,3 @@ Person *BirthdayParty::guest(int index) const
 }
 // ![0]
 
-QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/properties/main.cpp b/examples/declarative/extending/properties/main.cpp
index 97d7905..2211b89 100644
--- a/examples/declarative/extending/properties/main.cpp
+++ b/examples/declarative/extending/properties/main.cpp
@@ -49,6 +49,9 @@ int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
+    QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
+    QML_REGISTER_TYPE(People, 1,0, Person, Person);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
diff --git a/examples/declarative/extending/properties/person.cpp b/examples/declarative/extending/properties/person.cpp
index d1b8bf4..92c54f5 100644
--- a/examples/declarative/extending/properties/person.cpp
+++ b/examples/declarative/extending/properties/person.cpp
@@ -65,4 +65,3 @@ void Person::setShoeSize(int s)
     m_shoeSize = s;
 }
 
-QML_DEFINE_TYPE(People, 1,0, Person, Person);
diff --git a/examples/declarative/extending/signal/birthdayparty.cpp b/examples/declarative/extending/signal/birthdayparty.cpp
index d8686f0..d57e075 100644
--- a/examples/declarative/extending/signal/birthdayparty.cpp
+++ b/examples/declarative/extending/signal/birthdayparty.cpp
@@ -55,7 +55,6 @@ void BirthdayPartyAttached::setRsvp(const QDate &d)
     m_rsvp = d;
 }
 
-QML_DEFINE_NOCREATE_TYPE(BirthdayPartyAttached);
 
 BirthdayParty::BirthdayParty(QObject *parent)
 : QObject(parent), m_celebrant(0)
@@ -98,4 +97,3 @@ BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
     return new BirthdayPartyAttached(object);
 }
 
-QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/signal/main.cpp b/examples/declarative/extending/signal/main.cpp
index eb3bb4b..9d8e253 100644
--- a/examples/declarative/extending/signal/main.cpp
+++ b/examples/declarative/extending/signal/main.cpp
@@ -49,6 +49,13 @@ int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
+    QML_REGISTER_NOCREATE_TYPE(BirthdayPartyAttached);
+    QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
+    QML_REGISTER_NOCREATE_TYPE(ShoeDescription);
+    QML_REGISTER_NOCREATE_TYPE(Person);
+    QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
+    QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
diff --git a/examples/declarative/extending/signal/person.cpp b/examples/declarative/extending/signal/person.cpp
index 909505a..0a9e508 100644
--- a/examples/declarative/extending/signal/person.cpp
+++ b/examples/declarative/extending/signal/person.cpp
@@ -84,7 +84,6 @@ void ShoeDescription::setPrice(qreal p)
 {
     m_price = p;
 }
-QML_DEFINE_NOCREATE_TYPE(ShoeDescription);
 
 Person::Person(QObject *parent)
 : QObject(parent)
@@ -106,18 +105,15 @@ ShoeDescription *Person::shoe()
     return &m_shoe;
 }
 
-QML_DEFINE_NOCREATE_TYPE(Person);
 
 Boy::Boy(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/valuesource/birthdayparty.cpp b/examples/declarative/extending/valuesource/birthdayparty.cpp
index a5b3fab..5b3fec1 100644
--- a/examples/declarative/extending/valuesource/birthdayparty.cpp
+++ b/examples/declarative/extending/valuesource/birthdayparty.cpp
@@ -55,7 +55,6 @@ void BirthdayPartyAttached::setRsvp(const QDate &d)
     m_rsvp = d;
 }
 
-QML_DEFINE_NOCREATE_TYPE(BirthdayPartyAttached);
 
 BirthdayParty::BirthdayParty(QObject *parent)
 : QObject(parent), m_celebrant(0)
@@ -108,4 +107,3 @@ BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
     return new BirthdayPartyAttached(object);
 }
 
-QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/valuesource/happybirthday.cpp b/examples/declarative/extending/valuesource/happybirthday.cpp
index fbbc9e9..306ec98 100644
--- a/examples/declarative/extending/valuesource/happybirthday.cpp
+++ b/examples/declarative/extending/valuesource/happybirthday.cpp
@@ -79,4 +79,3 @@ void HappyBirthday::advance()
     m_target.write(m_lyrics.at(m_line));
 }
 
-QML_DEFINE_TYPE(People, 1,0, HappyBirthday, HappyBirthday);
diff --git a/examples/declarative/extending/valuesource/main.cpp b/examples/declarative/extending/valuesource/main.cpp
index ba38e82..ea0e33a 100644
--- a/examples/declarative/extending/valuesource/main.cpp
+++ b/examples/declarative/extending/valuesource/main.cpp
@@ -43,12 +43,21 @@
 #include <QmlComponent>
 #include <QDebug>
 #include "birthdayparty.h"
+#include "happybirthday.h"
 #include "person.h"
 
 int main(int argc, char ** argv)
 {
     QCoreApplication app(argc, argv);
 
+    QML_REGISTER_NOCREATE_TYPE(BirthdayPartyAttached);
+    QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
+    QML_REGISTER_TYPE(People, 1,0, HappyBirthday, HappyBirthday);
+    QML_REGISTER_NOCREATE_TYPE(ShoeDescription);
+    QML_REGISTER_NOCREATE_TYPE(Person);
+    QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
+    QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
+
     QmlEngine engine;
     QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
diff --git a/examples/declarative/extending/valuesource/person.cpp b/examples/declarative/extending/valuesource/person.cpp
index 909505a..0a9e508 100644
--- a/examples/declarative/extending/valuesource/person.cpp
+++ b/examples/declarative/extending/valuesource/person.cpp
@@ -84,7 +84,6 @@ void ShoeDescription::setPrice(qreal p)
 {
     m_price = p;
 }
-QML_DEFINE_NOCREATE_TYPE(ShoeDescription);
 
 Person::Person(QObject *parent)
 : QObject(parent)
@@ -106,18 +105,15 @@ ShoeDescription *Person::shoe()
     return &m_shoe;
 }
 
-QML_DEFINE_NOCREATE_TYPE(Person);
 
 Boy::Boy(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 86a0370..05eb566 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -24,7 +24,6 @@ include(3rdparty/3rdparty.pri)
 include(util/util.pri)
 include(graphicsitems/graphicsitems.pri)
 include(qml/qml.pri)
-include(widgets/widgets.pri)
 include(debugger/debugger.pri)
 
 symbian:TARGET.UID3=0x2001E623
diff --git a/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp b/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp
index 9263f49..121026e 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp
@@ -80,12 +80,6 @@
 #endif
 #include "qmlgraphicsanchors_p.h"
 
-#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,TYPE,CLASS) \
-            qmlRegisterType<CLASS>(#URI, VMAJ, VMIN, #TYPE, #CLASS)
-
-#define QML_REGISTER_NOCREATE_TYPE(CLASS) \
-            qmlRegisterType<CLASS>(#CLASS)
-
 void QmlGraphicsItemModule::defineModule()
 {
     QML_REGISTER_TYPE(Qt,4,6,AnimatedImage,QmlGraphicsAnimatedImage);
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index 7972305..34873a2 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -88,40 +88,17 @@ QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 
-#if defined(Q_OS_SYMBIAN)
-#define QML_DEFINE_INTERFACE(INTERFACE) \
-    static int defineInterface##INTERFACE = qmlRegisterInterface<INTERFACE>(#INTERFACE);
+#define QML_REGISTER_INTERFACE(INTERFACE) \
+    qmlRegisterInterface<INTERFACE>(#INTERFACE)
 
-#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \
-    static int registerExtended##TYPE = qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE);
+#define QML_REGISTER_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \
+    qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE)
 
-#define QML_DEFINE_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE) \
-    static int defineType##TYPE = qmlRegisterType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE);
+#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,TYPE,CLASS) \
+    qmlRegisterType<CLASS>(#URI, VMAJ, VMIN, #TYPE, #CLASS)
 
-#define QML_DEFINE_EXTENDED_NOCREATE_TYPE(TYPE, EXTENSION) \
-    static int registerExtendedNoCreate##TYPE = qmlRegisterExtendedType<TYPE,EXTENSION>(#TYPE);
-
-#define QML_DEFINE_NOCREATE_TYPE(TYPE) \
-    static int registerNoCreate##TYPE = qmlRegisterType<TYPE>(#TYPE);
-
-#else
-
-#define QML_DEFINE_INTERFACE(INTERFACE) \
-    template<> QmlPrivate::InstanceType QmlPrivate::Define<INTERFACE *,0,0>::instance(qmlRegisterInterface<INTERFACE>(#INTERFACE)); 
-
-#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \
-    template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *,(VERSION_MAJ), (VERSION_MIN)>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE));
-
-#define QML_DEFINE_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE) \
-    template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *,(VERSION_MAJ), (VERSION_MIN)>::instance(qmlRegisterType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE));
-
-#define QML_DEFINE_EXTENDED_NOCREATE_TYPE(TYPE, EXTENSION) \
-    template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *,0,0>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#TYPE));
-
-#define QML_DEFINE_NOCREATE_TYPE(TYPE) \
-    template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *,0,0>::instance(qmlRegisterType<TYPE>(#TYPE));
-
-#endif
+#define QML_REGISTER_NOCREATE_TYPE(CLASS) \
+    qmlRegisterType<CLASS>(#CLASS)
 
 class QmlContext;
 class QmlEngine;
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
index feadd0f..4fea0f0 100644
--- a/src/declarative/qml/qmlbinding.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -56,8 +56,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_NOCREATE_TYPE(QmlBinding);
-
 QmlBindingData::QmlBindingData()
 : updating(false), enabled(false)
 {
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 87ecb8a..470e96f 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -121,7 +121,6 @@ Item {
     }
     \endqml
 */
-QML_DEFINE_TYPE(Qt,4,6,Component,QmlComponent);
 
 /*!
     \enum QmlComponent::Status
diff --git a/src/declarative/qml/qmlcustomparser.cpp b/src/declarative/qml/qmlcustomparser.cpp
index d781110..8e52b72 100644
--- a/src/declarative/qml/qmlcustomparser.cpp
+++ b/src/declarative/qml/qmlcustomparser.cpp
@@ -58,11 +58,11 @@ using namespace QmlParser;
     By subclassing QmlCustomParser, you can add a parser for
     building a particular type.
 
-    The subclass must implement compile() and setCustomData(), and define
-    itself in the meta type system with the macro:
+    The subclass must implement compile() and setCustomData(), and register
+    itself in the meta type system by calling the macro:
 
     \code
-    QML_DEFINE_CUSTOM_TYPE(Module, MajorVersion, MinorVersion, Name, TypeClass, ParserClass)
+    QML_REGISTER_CUSTOM_TYPE(Module, MajorVersion, MinorVersion, Name, TypeClass, ParserClass)
     \endcode
 */
 
@@ -88,7 +88,7 @@ using namespace QmlParser;
     by \a data, which is a block of data previously returned by a call
     to compile().
 
-    The \a object will be an instance of the TypeClass specified by QML_DEFINE_CUSTOM_TYPE.
+    The \a object will be an instance of the TypeClass specified by QML_REGISTER_CUSTOM_TYPE.
 */
 
 QmlCustomParserNode 
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index 7aebb0d..e198712 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -128,13 +128,9 @@ private:
     QList<QmlError> exceptions;
 };
 
-#if defined(Q_OS_SYMBIAN)
-# define QML_DEFINE_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, CUSTOMTYPE) \
-    static int defineCustomType##NAME = qmlRegisterCustomType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE, new CUSTOMTYPE);
-#else
-# define QML_DEFINE_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, CUSTOMTYPE) \
-    template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *,(VERSION_MAJ), (VERSION_MIN)>::instance(qmlRegisterCustomType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE, new CUSTOMTYPE));
-#endif
+#define QML_REGISTER_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, CUSTOMTYPE) \
+            qmlRegisterCustomType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE, new CUSTOMTYPE)
+
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 97d8250..9127954 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -99,6 +99,7 @@
 #include <private/qscriptdeclarativeclass_p.h>
 
 #include <private/qmlgraphicsitemsmodule_p.h>
+#include <private/qmlgraphicsutilmodule_p.h>
 
 #ifdef Q_OS_WIN // for %APPDATA%
 #include <qt_windows.h>
@@ -113,7 +114,6 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE)
 
-QML_DEFINE_TYPE(Qt,4,6,QtObject,QObject)
 /*!
     \qmlclass QtObject QObject
     \brief The QtObject element is the most basic element in QML
@@ -142,6 +142,16 @@ struct StaticQtMetaObject : public QObject
 
 static bool qt_QmlQtModule_registered = false;
 
+void QmlEnginePrivate::defineModule()
+{
+    QML_REGISTER_TYPE(Qt,4,6,Component,QmlComponent);
+    QML_REGISTER_TYPE(Qt,4,6,QtObject,QObject);
+    QML_REGISTER_TYPE(Qt,4,6,WorkerScript,QmlWorkerScript);
+    QML_REGISTER_TYPE(Qt,4,6,WorkerListModel,QmlWorkerListModel);
+
+    QML_REGISTER_NOCREATE_TYPE(QmlBinding);
+}
+
 QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
 : captureProperties(false), rootContext(0), currentExpression(0), isDebugging(false), 
   contextClass(0), sharedContext(0), sharedScope(0), objectClass(0), valueTypeClass(0), 
@@ -153,6 +163,8 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
     if (!qt_QmlQtModule_registered) {
         qt_QmlQtModule_registered = true;
         QmlGraphicsItemModule::defineModule();
+        QmlGraphicsUtilModule::defineModule();
+        QmlEnginePrivate::defineModule();
     }
     globalClass = new QmlGlobalScriptClass(&scriptEngine);
     fileImportPath.append(QLibraryInfo::location(QLibraryInfo::DataPath)+QDir::separator()+QLatin1String("qml"));
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 3fe7991..2ea8ac7 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -321,6 +321,8 @@ public:
     static QmlEnginePrivate *get(QScriptEngine *e) { return static_cast<QmlScriptEngine*>(e)->p; }
     static QmlEngine *get(QmlEnginePrivate *p) { return p->q_func(); }
     QmlContext *getContext(QScriptContext *);
+
+    static void defineModule();
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp
index a2e8c7a..ce534d0 100644
--- a/src/declarative/qml/qmlworkerscript.cpp
+++ b/src/declarative/qml/qmlworkerscript.cpp
@@ -633,8 +633,6 @@ bool QmlWorkerScript::event(QEvent *event)
     }
 }
 
-QML_DEFINE_TYPE(Qt, 4, 6, WorkerScript, QmlWorkerScript);
-
 void QmlWorkerListModelAgent::Data::clearChange() 
 { 
     changes.clear(); 
@@ -1038,8 +1036,6 @@ QVariant QmlWorkerListModel::data(int index, int role) const
 
 QT_END_NAMESPACE
 
-QML_DEFINE_TYPE(Qt,4,6,WorkerListModel,QmlWorkerListModel)
-
 #include "qmlworkerscript.moc"
 
 
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index c044f97..918bd51 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -139,8 +139,6 @@ static QEasingCurve stringToCurve(const QString &curve, QObject *obj)
     return easingCurve;
 }
 
-QML_DEFINE_NOCREATE_TYPE(QmlAbstractAnimation)
-
 /*!
     \qmlclass Animation QmlAbstractAnimation
     \brief The Animation element is the base of all QML animations.
@@ -609,7 +607,7 @@ void QmlAbstractAnimation::timelineComplete()
     \class QmlPauseAnimation
 */
 
-QML_DEFINE_TYPE(Qt,4,6,PauseAnimation,QmlPauseAnimation)
+
 QmlPauseAnimation::QmlPauseAnimation(QObject *parent)
 : QmlAbstractAnimation(*(new QmlPauseAnimationPrivate), parent)
 {
@@ -721,7 +719,7 @@ void QmlColorAnimation::setTo(const QColor &t)
     QmlPropertyAnimation::setTo(t);
 }
 
-QML_DEFINE_TYPE(Qt,4,6,ColorAnimation,QmlColorAnimation)
+
 
 /*!
     \qmlclass ScriptAction QmlScriptAction
@@ -827,7 +825,7 @@ QAbstractAnimation *QmlScriptAction::qtAnimation()
     return d->rsa;
 }
 
-QML_DEFINE_TYPE(Qt,4,6,ScriptAction,QmlScriptAction)
+
 
 /*!
     \qmlclass PropertyAction QmlPropertyAction
@@ -1075,7 +1073,7 @@ void QmlPropertyAction::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(Qt,4,6,PropertyAction,QmlPropertyAction)
+
 
 /*!
     \qmlclass ParentAction QmlParentAction
@@ -1278,7 +1276,7 @@ void QmlParentAction::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(Qt,4,6,ParentAction,QmlParentAction)
+
 
 /*!
     \qmlclass NumberAnimation QmlNumberAnimation
@@ -1341,7 +1339,7 @@ void QmlNumberAnimation::setTo(qreal t)
     QmlPropertyAnimation::setTo(t);
 }
 
-QML_DEFINE_TYPE(Qt,4,6,NumberAnimation,QmlNumberAnimation)
+
 
 /*!
     \qmlclass Vector3dAnimation QmlVector3dAnimation
@@ -1399,7 +1397,7 @@ void QmlVector3dAnimation::setTo(QVector3D t)
     QmlPropertyAnimation::setTo(t);
 }
 
-QML_DEFINE_TYPE(Qt,4,6,Vector3dAnimation,QmlVector3dAnimation)
+
 
 /*!
     \qmlclass RotationAnimation QmlRotationAnimation
@@ -1570,7 +1568,7 @@ void QmlRotationAnimation::setDirection(QmlRotationAnimation::RotationDirection
     emit directionChanged();
 }
 
-QML_DEFINE_TYPE(Qt,4,6,RotationAnimation,QmlRotationAnimation)
+
 
 QmlAnimationGroup::QmlAnimationGroup(QObject *parent)
 : QmlAbstractAnimation(*(new QmlAnimationGroupPrivate), parent)
@@ -1667,7 +1665,7 @@ void QmlSequentialAnimation::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(Qt,4,6,SequentialAnimation,QmlSequentialAnimation)
+
 
 /*!
     \qmlclass ParallelAnimation QmlParallelAnimation
@@ -1723,7 +1721,7 @@ void QmlParallelAnimation::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(Qt,4,6,ParallelAnimation,QmlParallelAnimation)
+
 
 //convert a variant from string type to another animatable type
 void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
@@ -2429,6 +2427,6 @@ void QmlPropertyAnimation::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(Qt,4,6,PropertyAnimation,QmlPropertyAnimation)
+
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp
index d65d8cd..6c67e00 100644
--- a/src/declarative/util/qmlbehavior.cpp
+++ b/src/declarative/util/qmlbehavior.cpp
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(Qt,4,6,Behavior,QmlBehavior)
+
 
 class QmlBehaviorPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
index fc1562b..3924bff 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -68,7 +68,7 @@ public:
     QmlNullableValue<QVariant> value;
 };
 
-QML_DEFINE_TYPE(Qt,4,6,Binding,QmlBind)
+
 /*!
     \qmlclass Binding QmlBind
     \brief The Binding element allows arbitrary property bindings to be created.
diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index 3d04aaf..90290b9 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -282,6 +282,6 @@ void QmlConnection::setSignal(const QString& sig)
     connectIfValid();
 }
 
-QML_DEFINE_TYPE(Qt,4,6,Connection,QmlConnection)
+
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp
index c44ca5e..112da1e 100644
--- a/src/declarative/util/qmldatetimeformatter.cpp
+++ b/src/declarative/util/qmldatetimeformatter.cpp
@@ -367,6 +367,6 @@ void QmlDateTimeFormatter::componentComplete()
     d->updateText();
 }
 
-QML_DEFINE_TYPE(Qt,4,6,DateTimeFormatter,QmlDateTimeFormatter)
+
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp
index deb474a..6694678 100644
--- a/src/declarative/util/qmleasefollow.cpp
+++ b/src/declarative/util/qmleasefollow.cpp
@@ -51,7 +51,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(Qt,4,6,EaseFollow,QmlEaseFollow);
+
 
 class QmlEaseFollowPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index 4599b99..558c125 100644
--- a/src/declarative/util/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
@@ -70,7 +70,7 @@ public:
     QmlFontLoader::Status status;
 };
 
-QML_DEFINE_TYPE(Qt,4,6,FontLoader,QmlFontLoader)
+
 
 /*!
     \qmlclass FontLoader QmlFontLoader
diff --git a/src/declarative/util/qmlgraphicsutilmodule.cpp b/src/declarative/util/qmlgraphicsutilmodule.cpp
new file mode 100644
index 0000000..13323be
--- /dev/null
+++ b/src/declarative/util/qmlgraphicsutilmodule.cpp
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmlgraphicsutilmodule_p.h"
+#include "qfxperf_p_p.h"
+#include "qmlanimation_p.h"
+#include "qmlanimation_p_p.h"
+#include "qmlbehavior_p.h"
+#include "qmlbind_p.h"
+#include "qmlconnection_p.h"
+#include "qmldatetimeformatter_p.h"
+#include "qmleasefollow_p.h"
+#include "qmlfontloader_p.h"
+#include "qmllistaccessor_p.h"
+#include "qmllistmodel_p.h"
+#include "qmlnullablevalue_p_p.h"
+#include "qmlnumberformatter_p.h"
+#include "qmlopenmetaobject_p.h"
+#include "qmlpackage_p.h"
+#include "qmlpixmapcache_p.h"
+#include "qmlpropertychanges_p.h"
+#include "qmlpropertymap.h"
+#include "qmlspringfollow_p.h"
+#include "qmlstategroup_p.h"
+#include "qmlstateoperations_p.h"
+#include "qmlstate_p.h"
+#include "qmlstate_p_p.h"
+#include "qmlstyledtext_p.h"
+#include "qmlsystempalette_p.h"
+#include "qmltimeline_p_p.h"
+#include "qmltimer_p.h"
+#include "qmltransitionmanager_p_p.h"
+#include "qmltransition_p.h"
+#include "qmlview.h"
+#include "qmlxmllistmodel_p.h"
+#include "qnumberformat_p.h"
+#include "qperformancelog_p_p.h"
+
+void QmlGraphicsUtilModule::defineModule()
+{
+    QML_REGISTER_TYPE(Qt,4,6,AnchorChanges,QmlAnchorChanges);
+    QML_REGISTER_TYPE(Qt,4,6,Behavior,QmlBehavior);
+    QML_REGISTER_TYPE(Qt,4,6,Binding,QmlBind);
+    QML_REGISTER_TYPE(Qt,4,6,ColorAnimation,QmlColorAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,Connection,QmlConnection);
+    QML_REGISTER_TYPE(Qt,4,6,DateTimeFormatter,QmlDateTimeFormatter);
+    QML_REGISTER_TYPE(Qt,4,6,EaseFollow,QmlEaseFollow);;
+    QML_REGISTER_TYPE(Qt,4,6,FontLoader,QmlFontLoader);
+    QML_REGISTER_TYPE(Qt,4,6,ListElement,QmlListElement);
+    QML_REGISTER_TYPE(Qt,4,6,NumberAnimation,QmlNumberAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,NumberFormatter,QmlNumberFormatter);;
+    QML_REGISTER_TYPE(Qt,4,6,Package,QmlPackage);
+    QML_REGISTER_TYPE(Qt,4,6,ParallelAnimation,QmlParallelAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,ParentAction,QmlParentAction);
+    QML_REGISTER_TYPE(Qt,4,6,ParentChange,QmlParentChange);
+    QML_REGISTER_TYPE(Qt,4,6,PauseAnimation,QmlPauseAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,PropertyAction,QmlPropertyAction);
+    QML_REGISTER_TYPE(Qt,4,6,PropertyAnimation,QmlPropertyAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,RotationAnimation,QmlRotationAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,ScriptAction,QmlScriptAction);
+    QML_REGISTER_TYPE(Qt,4,6,SequentialAnimation,QmlSequentialAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,SpringFollow,QmlSpringFollow);
+    QML_REGISTER_TYPE(Qt,4,6,StateChangeScript,QmlStateChangeScript);
+    QML_REGISTER_TYPE(Qt,4,6,StateGroup,QmlStateGroup);
+    QML_REGISTER_TYPE(Qt,4,6,State,QmlState);
+    QML_REGISTER_TYPE(Qt,4,6,SystemPalette,QmlSystemPalette);
+    QML_REGISTER_TYPE(Qt,4,6,Timer,QmlTimer);
+    QML_REGISTER_TYPE(Qt,4,6,Transition,QmlTransition);
+    QML_REGISTER_TYPE(Qt,4,6,Vector3dAnimation,QmlVector3dAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,XmlListModel,QmlXmlListModel);
+    QML_REGISTER_TYPE(Qt,4,6,XmlRole,QmlXmlListModelRole);
+
+    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsAnchors);
+    QML_REGISTER_NOCREATE_TYPE(QmlAbstractAnimation);
+    QML_REGISTER_NOCREATE_TYPE(QmlStateOperation);
+    QML_REGISTER_NOCREATE_TYPE(QNumberFormat);
+
+    QML_REGISTER_CUSTOM_TYPE(Qt, 4,6, ListModel, QmlListModel, QmlListModelParser);
+    QML_REGISTER_CUSTOM_TYPE(Qt, 4,6, PropertyChanges, QmlPropertyChanges, QmlPropertyChangesParser);
+}
diff --git a/src/declarative/util/qmlgraphicsutilmodule_p.h b/src/declarative/util/qmlgraphicsutilmodule_p.h
new file mode 100644
index 0000000..68a16a9
--- /dev/null
+++ b/src/declarative/util/qmlgraphicsutilmodule_p.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLGRAPHICSUTILMODULE_H
+#define QMLGRAPHICSUTILMODULE_H
+
+#include <qml.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QmlGraphicsUtilModule
+{
+public:
+    static void defineModule();
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QMLGRAPHICSUTILMODULE_H
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 8fda3ae..c5e797e 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -61,18 +61,10 @@ QT_BEGIN_NAMESPACE
 #define DATA_ROLE_ID 1
 #define DATA_ROLE_NAME "data"
 
-struct ListInstruction
+QmlListModelParser::ListInstruction *QmlListModelParser::ListModelData::instructions() const
 {
-    enum { Push, Pop, Value, Set } type;
-    int dataIdx;
-};
-
-struct ListModelData
-{
-    int dataOffset;
-    int instrCount;
-    ListInstruction *instructions() const { return (ListInstruction *)((char *)this + sizeof(ListModelData)); }
-};
+    return (QmlListModelParser::ListInstruction *)((char *)this + sizeof(ListModelData));
+}
 
 static void dump(ModelNode *node, int ind);
 
@@ -737,17 +729,6 @@ void QmlListModel::setProperty(int index, const QString& property, const QVarian
     emit itemsChanged(index,1,roles);
 }
 
-class QmlListModelParser : public QmlCustomParser
-{
-public:
-    QByteArray compile(const QList<QmlCustomParserProperty> &);
-    bool compileProperty(const QmlCustomParserProperty &prop, QList<ListInstruction> &instr, QByteArray &data);
-    void setCustomData(QObject *, const QByteArray &);
-
-private:
-    bool definesEmptyList(const QString &);
-};
-
 bool QmlListModelParser::compileProperty(const QmlCustomParserProperty &prop, QList<ListInstruction> &instr, QByteArray &data)
 {
     QList<QVariant> values = prop.assignedValues();
@@ -953,20 +934,12 @@ bool QmlListModelParser::definesEmptyList(const QString &s)
     return false;
 }
 
-QML_DEFINE_CUSTOM_TYPE(Qt, 4,6, ListModel, QmlListModel, QmlListModelParser)
-
 /*!
     \qmlclass ListElement
     \brief The ListElement element defines a data item in a ListModel.
 
     \sa ListModel
 */
-// ### FIXME
-class QmlListElement : public QObject
-{
-Q_OBJECT
-};
-QML_DEFINE_TYPE(Qt,4,6,ListElement,QmlListElement)
 
 static void dump(ModelNode *node, int ind)
 {
@@ -1007,6 +980,4 @@ ModelNode::~ModelNode()
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QmlListElement)
-
 #include <qmllistmodel.moc>
diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h
index 4cf6746..e6ddb0e 100644
--- a/src/declarative/util/qmllistmodel_p.h
+++ b/src/declarative/util/qmllistmodel_p.h
@@ -43,6 +43,7 @@
 #define QMLLISTMODEL_H
 
 #include <qml.h>
+#include <private/qmlcustomparser_p.h>
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
@@ -98,9 +99,40 @@ private:
     ModelNode *_root;
 };
 
+// ### FIXME
+class QmlListElement : public QObject
+{
+Q_OBJECT
+};
+
+class QmlListModelParser : public QmlCustomParser
+{
+public:
+    QByteArray compile(const QList<QmlCustomParserProperty> &);
+    void setCustomData(QObject *, const QByteArray &);
+
+private:
+    struct ListInstruction
+    {
+        enum { Push, Pop, Value, Set } type;
+        int dataIdx;
+    };
+    struct ListModelData
+    {
+        int dataOffset;
+        int instrCount;
+        ListInstruction *instructions() const;
+    };
+    bool compileProperty(const QmlCustomParserProperty &prop, QList<ListInstruction> &instr, QByteArray &data);
+
+    bool definesEmptyList(const QString &);
+};
+
+
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QmlListModel)
+QML_DECLARE_TYPE(QmlListElement)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qmlnumberformatter.cpp b/src/declarative/util/qmlnumberformatter.cpp
index f78abdf..b301191 100644
--- a/src/declarative/util/qmlnumberformatter.cpp
+++ b/src/declarative/util/qmlnumberformatter.cpp
@@ -255,6 +255,6 @@ void QmlNumberFormatter::componentComplete()
     d->componentComplete = true;
     d->updateText();
 }
-QML_DEFINE_TYPE(Qt,4,6,NumberFormatter,QmlNumberFormatter);
+
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp
index 82f776f..c9b9cbb 100644
--- a/src/declarative/util/qmlpackage.cpp
+++ b/src/declarative/util/qmlpackage.cpp
@@ -80,22 +80,6 @@ public:
     }
 };
 
-class QmlPackageAttached : public QObject
-{
-Q_OBJECT
-Q_PROPERTY(QString name READ name WRITE setName)
-public:
-    QmlPackageAttached(QObject *parent);
-    virtual ~QmlPackageAttached();
-
-    QString name() const;
-    void setName(const QString &n);
-
-    static QHash<QObject *, QmlPackageAttached *> attached;
-private:
-    QString _name;
-};
-
 QHash<QObject *, QmlPackageAttached *> QmlPackageAttached::attached;
 
 QmlPackageAttached::QmlPackageAttached(QObject *parent)
@@ -178,8 +162,6 @@ QmlPackageAttached *QmlPackage::qmlAttachedProperties(QObject *o)
     return new QmlPackageAttached(o);
 }
 
-QML_DEFINE_TYPE(Qt,4,6,Package,QmlPackage)
 
-QT_END_NAMESPACE
 
-#include <qmlpackage.moc>
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlpackage_p.h b/src/declarative/util/qmlpackage_p.h
index 29b6bbe..63d878a 100644
--- a/src/declarative/util/qmlpackage_p.h
+++ b/src/declarative/util/qmlpackage_p.h
@@ -78,6 +78,22 @@ public:
     static QmlPackageAttached *qmlAttachedProperties(QObject *);
 };
 
+class QmlPackageAttached : public QObject
+{
+Q_OBJECT
+Q_PROPERTY(QString name READ name WRITE setName)
+public:
+    QmlPackageAttached(QObject *parent);
+    virtual ~QmlPackageAttached();
+
+    QString name() const;
+    void setName(const QString &n);
+
+    static QHash<QObject *, QmlPackageAttached *> attached;
+private:
+    QString _name;
+};
+
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QmlPackage)
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index 068cb4d..76c2441 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -184,15 +184,6 @@ public:
     QmlMetaProperty property(const QByteArray &);
 };
 
-class QmlPropertyChangesParser : public QmlCustomParser
-{
-public:
-    void compileList(QList<QPair<QByteArray, QVariant> > &list, const QByteArray &pre, const QmlCustomParserProperty &prop);
-
-    virtual QByteArray compile(const QList<QmlCustomParserProperty> &);
-    virtual void setCustomData(QObject *, const QByteArray &);
-};
-
 void
 QmlPropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> > &list,
                                      const QByteArray &pre,
@@ -463,6 +454,4 @@ void QmlPropertyChanges::setIsExplicit(bool e)
     d->isExplicit = e;
 }
 
-QML_DEFINE_CUSTOM_TYPE(Qt, 4,6, PropertyChanges, QmlPropertyChanges, QmlPropertyChangesParser)
-
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlpropertychanges_p.h b/src/declarative/util/qmlpropertychanges_p.h
index 19dcf9d..62e977a 100644
--- a/src/declarative/util/qmlpropertychanges_p.h
+++ b/src/declarative/util/qmlpropertychanges_p.h
@@ -43,6 +43,7 @@
 #define QMLPROPERTYCHANGES_H
 
 #include "qmlstateoperations_p.h"
+#include <private/qmlcustomparser_p.h>
 
 QT_BEGIN_HEADER
 
@@ -75,6 +76,16 @@ public:
     virtual ActionList actions();
 };
 
+class QmlPropertyChangesParser : public QmlCustomParser
+{
+public:
+    void compileList(QList<QPair<QByteArray, QVariant> > &list, const QByteArray &pre, const QmlCustomParserProperty &prop);
+
+    virtual QByteArray compile(const QList<QmlCustomParserProperty> &);
+    virtual void setCustomData(QObject *, const QByteArray &);
+};
+
+
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QmlPropertyChanges)
diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp
index 6d4ecf2..1eafd9e 100644
--- a/src/declarative/util/qmlspringfollow.cpp
+++ b/src/declarative/util/qmlspringfollow.cpp
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(Qt,4,6,SpringFollow,QmlSpringFollow)
+
 
 class QmlSpringFollowPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 4462b1f..52cd360 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -154,7 +154,7 @@ QmlStateOperation::QmlStateOperation(QObjectPrivate &dd, QObject *parent)
     \sa {states-transitions}{States and Transitions}
 */
 
-QML_DEFINE_TYPE(Qt,4,6,State,QmlState)
+
 QmlState::QmlState(QObject *parent)
 : QObject(*(new QmlStatePrivate), parent)
 {
@@ -473,7 +473,6 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever
     d->transitionManager.transition(applyList, trans);
 }
 
-QML_DEFINE_NOCREATE_TYPE(QmlStateOperation)
 QmlStateOperation::ActionList QmlStateOperation::actions()
 {
     return ActionList();
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index 4ad77c8..3694255 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -437,4 +437,4 @@ void QmlStateGroup::removeState(QmlState *state)
 
 QT_END_NAMESPACE
 
-QML_DEFINE_TYPE(Qt,4,6,StateGroup,QmlStateGroup)
+
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index bd1f5f0..9170d65 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -162,7 +162,7 @@ void QmlParentChangePrivate::doChange(QmlGraphicsItem *targetParent, QmlGraphics
     using a ParentAction.
 */
 
-QML_DEFINE_TYPE(Qt,4,6,ParentChange,QmlParentChange)
+
 QmlParentChange::QmlParentChange(QObject *parent)
     : QmlStateOperation(*(new QmlParentChangePrivate), parent)
 {
@@ -322,7 +322,7 @@ public:
     Alternatively you can use a ScriptAction to specify at which point in the transition
     you want the StateChangeScript to be run.
 */
-QML_DEFINE_TYPE(Qt,4,6,StateChangeScript,QmlStateChangeScript)
+
 QmlStateChangeScript::QmlStateChangeScript(QObject *parent)
 : QmlStateOperation(*(new QmlStateChangeScriptPrivate), parent)
 {
@@ -409,7 +409,7 @@ QString QmlStateChangeScript::typeName() const
     For more information on anchors see \l {anchor-layout}{Anchor Layouts}.
 */
 
-QML_DEFINE_TYPE(Qt,4,6,AnchorChanges,QmlAnchorChanges)
+
 
 class QmlAnchorChangesPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/util/qmlstyledtext_p.h b/src/declarative/util/qmlstyledtext_p.h
index 4698279..2c29832 100644
--- a/src/declarative/util/qmlstyledtext_p.h
+++ b/src/declarative/util/qmlstyledtext_p.h
@@ -50,6 +50,7 @@ class QPainter;
 class QPointF;
 class QString;
 class QmlStyledTextPrivate;
+class QTextLayout;
 
 class Q_DECLARATIVE_EXPORT QmlStyledText
 {
diff --git a/src/declarative/util/qmlsystempalette.cpp b/src/declarative/util/qmlsystempalette.cpp
index cc4fb3e..9bc62bd 100644
--- a/src/declarative/util/qmlsystempalette.cpp
+++ b/src/declarative/util/qmlsystempalette.cpp
@@ -54,7 +54,7 @@ public:
     QPalette::ColorGroup group;
 };
 
-QML_DEFINE_TYPE(Qt,4,6,SystemPalette,QmlSystemPalette)
+
 
 /*!
     \qmlclass SystemPalette QmlSystemPalette
diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp
index d3a1a7c..5f926fe 100644
--- a/src/declarative/util/qmltimer.cpp
+++ b/src/declarative/util/qmltimer.cpp
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(Qt,4,6,Timer,QmlTimer)
+
 
 class QmlTimerPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
index e90fc20..1a9ad05 100644
--- a/src/declarative/util/qmltransition.cpp
+++ b/src/declarative/util/qmltransition.cpp
@@ -124,7 +124,7 @@ void ParallelAnimationWrapper::updateState(QAbstractAnimation::State newState, Q
 }
 
 
-QML_DEFINE_TYPE(Qt,4,6,Transition,QmlTransition)
+
 QmlTransition::QmlTransition(QObject *parent)
     : QObject(*(new QmlTransitionPrivate), parent)
 {
diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp
index e631cd9..4c153e2 100644
--- a/src/declarative/util/qmlxmllistmodel.cpp
+++ b/src/declarative/util/qmlxmllistmodel.cpp
@@ -60,8 +60,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(Qt,4,6,XmlRole,QmlXmlListModelRole)
-QML_DEFINE_TYPE(Qt,4,6,XmlListModel,QmlXmlListModel)
+
+
 
 /*!
     \qmlclass XmlRole QmlXmlListModelRole
@@ -94,41 +94,6 @@ QML_DEFINE_TYPE(Qt,4,6,XmlListModel,QmlXmlListModel)
     \endqml
 */
 
-class Q_DECLARATIVE_EXPORT QmlXmlListModelRole : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QString query READ query WRITE setQuery)
-
-public:
-    QmlXmlListModelRole() {}
-    ~QmlXmlListModelRole() {}
-
-    QString name() const { return m_name; }
-    void setName(const QString &name) { m_name = name; }
-
-    QString query() const { return m_query; }
-    void setQuery(const QString &query)
-    {
-        if (query.startsWith(QLatin1Char('/'))) {
-            qmlInfo(this) << tr("An XmlRole query must not start with '/'");
-            return;
-        }
-        m_query = query;
-    }
-
-    bool isValid() {
-        return !m_name.isEmpty() && !m_query.isEmpty();
-    }
-
-private:
-    QString m_name;
-    QString m_query;
-};
-QT_END_NAMESPACE
-QML_DECLARE_TYPE(QmlXmlListModelRole)
-QT_BEGIN_NAMESPACE
-
 
 class QmlXmlQuery : public QThread
 {
diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
index a6627e2..969afd1 100644
--- a/src/declarative/util/qmlxmllistmodel_p.h
+++ b/src/declarative/util/qmlxmllistmodel_p.h
@@ -127,9 +127,42 @@ private:
     Q_DISABLE_COPY(QmlXmlListModel)
 };
 
+class Q_DECLARATIVE_EXPORT QmlXmlListModelRole : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(QString query READ query WRITE setQuery)
+
+public:
+    QmlXmlListModelRole() {}
+    ~QmlXmlListModelRole() {}
+
+    QString name() const { return m_name; }
+    void setName(const QString &name) { m_name = name; }
+
+    QString query() const { return m_query; }
+    void setQuery(const QString &query)
+    {
+        if (query.startsWith(QLatin1Char('/'))) {
+            qmlInfo(this) << tr("An XmlRole query must not start with '/'");
+            return;
+        }
+        m_query = query;
+    }
+
+    bool isValid() {
+        return !m_name.isEmpty() && !m_query.isEmpty();
+    }
+
+private:
+    QString m_name;
+    QString m_query;
+};
+
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QmlXmlListModel)
+QML_DECLARE_TYPE(QmlXmlListModelRole)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qnumberformat.cpp b/src/declarative/util/qnumberformat.cpp
index 42c12fe..2e83874 100644
--- a/src/declarative/util/qnumberformat.cpp
+++ b/src/declarative/util/qnumberformat.cpp
@@ -43,8 +43,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_NOCREATE_TYPE(QNumberFormat)
-
 QNumberFormat::QNumberFormat(QObject *parent) : QObject(parent), _number(0), _type(Decimal),
                                  _groupingSize(0)
 {
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index b6a5c90..90a8a27 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -1,6 +1,7 @@
 INCLUDEPATH += $$PWD
 
 SOURCES += \
+    $$PWD/qmlgraphicsutilmodule.cpp\
     $$PWD/qmlview.cpp \
     $$PWD/qfxperf.cpp \
     $$PWD/qperformancelog.cpp \
@@ -32,6 +33,7 @@ SOURCES += \
     $$PWD/qmlstyledtext.cpp
 
 HEADERS += \
+    $$PWD/qmlgraphicsutilmodule_p.h\
     $$PWD/qmlview.h \
     $$PWD/qfxperf_p_p.h \
     $$PWD/qperformancelog_p_p.h \
diff --git a/src/declarative/widgets/graphicslayouts.cpp b/src/declarative/widgets/graphicslayouts.cpp
deleted file mode 100644
index 62e941a..0000000
--- a/src/declarative/widgets/graphicslayouts.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "graphicslayouts_p.h"
-
-#include <QtGui/qgraphicswidget.h>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-QML_DEFINE_INTERFACE(QGraphicsLayoutItem)
-QML_DEFINE_INTERFACE(QGraphicsLayout)
-
-QML_DEFINE_TYPE(Qt,4,6,QGraphicsLinearLayoutStretchItem,QGraphicsLinearLayoutStretchItemObject)
-QML_DEFINE_TYPE(Qt,4,6,QGraphicsLinearLayout,QGraphicsLinearLayoutObject)
-QML_DEFINE_TYPE(Qt,4,6,QGraphicsGridLayout,QGraphicsGridLayoutObject)
-
-class LinearLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
-public:
-    LinearLayoutAttached(QObject *parent)
-    : QObject(parent), _stretch(1), _alignment(Qt::AlignCenter)
-    {
-    }
-
-    int stretchFactor() const { return _stretch; }
-    void setStretchFactor(int f)
-    {
-        if (_stretch == f)
-            return;
-
-        _stretch = f;
-        emit stretchChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _stretch);
-    }
-
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a)
-    {
-        if (_alignment == a)
-            return;
-
-        _alignment = a;
-        emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
-    }
-
-Q_SIGNALS:
-    void stretchChanged(QGraphicsLayoutItem*,int);
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    int _stretch;
-    Qt::Alignment _alignment;
-};
-
-
-QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
-        : QObject(parent)
-{
-}
-
-QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
-    Q_UNUSED(which);
-    Q_UNUSED(constraint);
-    return QSizeF();
-}
-
-
-QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
-{
-}
-
-void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
-{
-    insertItem(index, item);
-
-    //connect attached properties
-    if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
-        setStretchFactor(item, obj->stretchFactor());
-        setAlignment(item, obj->alignment());
-        QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
-                         this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
-        QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                         this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-        //### need to disconnect when widget is removed?
-    }
-}
-
-//### is there a better way to do this?
-void QGraphicsLinearLayoutObject::clearChildren()
-{
-    for (int i = 0; i < count(); ++i)
-        removeAt(i);
-}
-
-void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
-{
-    QGraphicsLinearLayout::setStretchFactor(item, stretch);
-}
-
-void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-    QGraphicsLinearLayout::setAlignment(item, alignment);
-}
-
-QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> QGraphicsLinearLayoutObject::attachedProperties;
-LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-    // ### This is not allowed - you must attach to any object
-    if (!qobject_cast<QGraphicsLayoutItem*>(obj))
-        return 0;
-    LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
-    attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
-    return rv;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-// QGraphicsGridLayout-related classes
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-class GridLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int row READ row WRITE setRow)
-    Q_PROPERTY(int column READ column WRITE setColumn)
-    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
-    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
-public:
-    GridLayoutAttached(QObject *parent)
-    : QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1)
-    {
-    }
-
-    int row() const { return _row; }
-    void setRow(int r)
-    {
-        if (_row == r)
-            return;
-
-        _row = r;
-        //emit rowChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _row);
-    }
-
-    int column() const { return _column; }
-    void setColumn(int c)
-    {
-        if (_column == c)
-            return;
-
-        _column = c;
-        //emit columnChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _column);
-    }
-
-    int rowSpan() const { return _rowspan; }
-    void setRowSpan(int rs)
-    {
-        if (_rowspan == rs)
-            return;
-
-        _rowspan = rs;
-        //emit rowSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _rowSpan);
-    }
-
-    int columnSpan() const { return _colspan; }
-    void setColumnSpan(int cs)
-    {
-        if (_colspan == cs)
-            return;
-
-        _colspan = cs;
-        //emit columnSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _columnSpan);
-    }
-
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a)
-    {
-        if (_alignment == a)
-            return;
-
-        _alignment = a;
-        //emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
-    }
-
-Q_SIGNALS:
-    //void rowChanged(QGraphicsLayoutItem*,int);
-    //void columnSpanChanged(QGraphicsLayoutItem*,int);
-    //void rowSpanChanged(QGraphicsLayoutItem*,int);
-    //void columnChanged(QGraphicsLayoutItem*,int);
-    //void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    int _row;
-    int _column;
-    int _rowspan;
-    int _colspan;
-    Qt::Alignment _alignment;
-};
-
-
-QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
-{
-}
-
-void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
-{
-    //use attached properties
-    if (QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(wid))) {
-        int row = static_cast<GridLayoutAttached *>(obj)->row();
-        int column = static_cast<GridLayoutAttached *>(obj)->column();
-        int rowSpan = static_cast<GridLayoutAttached *>(obj)->rowSpan();
-        int columnSpan = static_cast<GridLayoutAttached *>(obj)->columnSpan();
-        if (row == -1 || column == -1) {
-            qWarning() << "Must set row and column for an item in a grid layout";
-            return;
-        }
-        addItem(wid, row, column, rowSpan, columnSpan);
-    }
-}
-
-void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
-{
-    //use attached properties
-    if (GridLayoutAttached *obj = attachedProperties.value(item)) {
-        int row = obj->row();
-        int column = obj->column();
-        int rowSpan = obj->rowSpan();
-        int columnSpan = obj->columnSpan();
-        Qt::Alignment alignment = obj->alignment();
-        if (row == -1 || column == -1) {
-            qWarning() << "Must set row and column for an item in a grid layout";
-            return;
-        }
-        addItem(item, row, column, rowSpan, columnSpan);
-        if (alignment != -1)
-            setAlignment(item,alignment);
-    }
-}
-
-//### is there a better way to do this?
-void QGraphicsGridLayoutObject::clearChildren()
-{
-    for (int i = 0; i < count(); ++i)
-        removeAt(i);
-}
-
-qreal QGraphicsGridLayoutObject::spacing() const
-{
-    if (verticalSpacing() == horizontalSpacing())
-        return verticalSpacing();
-    return -1;  //###
-}
-
-QHash<QGraphicsLayoutItem*, GridLayoutAttached*> QGraphicsGridLayoutObject::attachedProperties;
-GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-    // ### This is not allowed - you must attach to any object
-    if (!qobject_cast<QGraphicsLayoutItem*>(obj))
-        return 0;
-    GridLayoutAttached *rv = new GridLayoutAttached(obj);
-    attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
-    return rv;
-}
-
-QT_END_NAMESPACE
-
-#include <graphicslayouts.moc>
diff --git a/src/declarative/widgets/graphicslayouts_p.h b/src/declarative/widgets/graphicslayouts_p.h
deleted file mode 100644
index 3076af1..0000000
--- a/src/declarative/widgets/graphicslayouts_p.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GRAPHICSLAYOUTS_H
-#define GRAPHICSLAYOUTS_H
-
-#include "graphicswidgets_p.h"
-
-#include <QtGui/QGraphicsLinearLayout>
-#include <QtGui/QGraphicsGridLayout>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayoutItem)
-public:
-    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
-
-    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
-};
-
-class LinearLayoutAttached;
-class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QmlListProperty<QGraphicsLayoutItem> children READ children)
-    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsLinearLayoutObject(QObject * = 0);
-    ~QGraphicsLinearLayoutObject();
-
-    QmlListProperty<QGraphicsLayoutItem> children() { return QmlListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
-
-    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
-
-private Q_SLOTS:
-    void updateStretch(QGraphicsLayoutItem*,int);
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class LinearLayoutAttached;
-    void clearChildren();
-    void insertLayoutItem(int, QGraphicsLayoutItem *);
-    static QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> attachedProperties;
-
-    static void children_append(QmlListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
-    }
-
-    static void children_clear(QmlListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->clearChildren();
-    }
-
-    static int children_count(QmlListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QmlListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
-    }
-};
-
-class GridLayoutAttached;
-class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QmlListProperty<QGraphicsLayoutItem> children READ children)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
-    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsGridLayoutObject(QObject * = 0);
-    ~QGraphicsGridLayoutObject();
-
-    QmlListProperty<QGraphicsLayoutItem> children() { return QmlListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
-
-    qreal spacing() const;
-
-    static GridLayoutAttached *qmlAttachedProperties(QObject *);
-
-private:
-    friend class GraphicsLayoutAttached;
-    void addWidget(QGraphicsWidget *);
-    void clearChildren();
-    void addLayoutItem(QGraphicsLayoutItem *);
-    static QHash<QGraphicsLayoutItem*, GridLayoutAttached*> attachedProperties;
-
-    static void children_append(QmlListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<QGraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
-    }
-
-    static void children_clear(QmlListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<QGraphicsGridLayoutObject*>(prop->object)->clearChildren();
-    }
-
-    static int children_count(QmlListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QmlListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->itemAt(index);
-    }
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
-QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif // GRAPHICSLAYOUTS_H
diff --git a/src/declarative/widgets/graphicswidgets.cpp b/src/declarative/widgets/graphicswidgets.cpp
deleted file mode 100644
index bb4dc74..0000000
--- a/src/declarative/widgets/graphicswidgets.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "graphicswidgets_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QGraphicsViewDeclarativeUI : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QGraphicsScene *scene READ scene WRITE setScene)
-    Q_CLASSINFO("DefaultProperty", "scene")
-public:
-    QGraphicsViewDeclarativeUI(QObject *other) : QObject(other) {}
-
-    QGraphicsScene *scene() const { return static_cast<QGraphicsView *>(parent())->scene(); }
-    void setScene(QGraphicsScene *scene)
-    {
-        static_cast<QGraphicsView *>(parent())->setScene(scene);
-    }
-};
-
-class QGraphicsSceneDeclarativeUI : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QmlListProperty<QObject> children READ children)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsSceneDeclarativeUI(QObject *other) : QObject(other) {}
-
-    QmlListProperty<QObject> children() { return QmlListProperty<QObject>(this->parent(), 0, children_append); }
-
-private:
-    static void children_append(QmlListProperty<QObject> *prop, QObject *o) {
-        if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o))
-            static_cast<QGraphicsScene *>(prop->object)->addItem(go);
-    }
-};
-
-class QGraphicsWidgetDeclarativeUI : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QmlListProperty<QGraphicsItem> children READ children)
-    Q_PROPERTY(QGraphicsLayout *layout READ layout WRITE setLayout)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsWidgetDeclarativeUI(QObject *other) : QObject(other) {}
-
-    QmlListProperty<QGraphicsItem> children() { return QmlListProperty<QGraphicsItem>(this, 0, children_append); }
-
-    QGraphicsLayout *layout() const { return static_cast<QGraphicsWidget *>(parent())->layout(); }
-    void setLayout(QGraphicsLayout *lo)
-    {
-        static_cast<QGraphicsWidget *>(parent())->setLayout(lo);
-    }
-
-private:
-    void setItemParent(QGraphicsItem *wid)
-    {
-        wid->setParentItem(static_cast<QGraphicsWidget *>(parent()));
-    }
-
-    static void children_append(QmlListProperty<QGraphicsItem> *prop, QGraphicsItem *i) {
-        static_cast<QGraphicsWidgetDeclarativeUI*>(prop->object)->setItemParent(i);
-    }
-};
-
-QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI)
-QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI)
-QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI)
-
-QML_DEFINE_INTERFACE(QGraphicsItem)
-
-QT_END_NAMESPACE
-
-#include <graphicswidgets.moc>
diff --git a/src/declarative/widgets/graphicswidgets_p.h b/src/declarative/widgets/graphicswidgets_p.h
deleted file mode 100644
index 6255d2b..0000000
--- a/src/declarative/widgets/graphicswidgets_p.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GRAPHICSWIDGETS_H
-#define GRAPHICSWIDGETS_H
-
-#include <qml.h>
-
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGraphicsWidget>
-#include <QtGui/QGraphicsItem>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QGraphicsView)
-QML_DECLARE_TYPE_HASMETATYPE(QGraphicsScene)
-QML_DECLARE_TYPE(QGraphicsWidget)
-QML_DECLARE_TYPE(QGraphicsObject)
-QML_DECLARE_INTERFACE_HASMETATYPE(QGraphicsItem)
-
-QT_END_HEADER
-
-#endif // GRAPHICSWIDGETS_H
diff --git a/src/declarative/widgets/widgets.pri b/src/declarative/widgets/widgets.pri
deleted file mode 100644
index 4cae3ff..0000000
--- a/src/declarative/widgets/widgets.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-INCLUDEPATH += $$PWD
-
-SOURCES += \
-    $$PWD/graphicswidgets.cpp \
-    $$PWD/graphicslayouts.cpp
-
-HEADERS += \
-    $$PWD/graphicswidgets_p.h \
-    $$PWD/graphicslayouts_p.h
diff --git a/src/plugins/qmlmodules/qmlmodules.pro b/src/plugins/qmlmodules/qmlmodules.pro
index b1dc0ef..0a6f444 100644
--- a/src/plugins/qmlmodules/qmlmodules.pro
+++ b/src/plugins/qmlmodules/qmlmodules.pro
@@ -1,4 +1,6 @@
 TEMPLATE = subdirs
 
+SUBDIRS += widgets
+
 contains(QT_CONFIG, multimedia): SUBDIRS += multimedia
 
diff --git a/src/plugins/qmlmodules/widgets/graphicslayouts.cpp b/src/plugins/qmlmodules/widgets/graphicslayouts.cpp
new file mode 100644
index 0000000..fc15ad2
--- /dev/null
+++ b/src/plugins/qmlmodules/widgets/graphicslayouts.cpp
@@ -0,0 +1,260 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "graphicslayouts_p.h"
+
+#include <QtGui/qgraphicswidget.h>
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
+: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter)
+{
+}
+
+void LinearLayoutAttached::setStretchFactor(int f)
+{
+    if (_stretch == f)
+        return;
+
+    _stretch = f;
+    emit stretchChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _stretch);
+}
+
+void LinearLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
+}
+
+QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+Q_UNUSED(which);
+Q_UNUSED(constraint);
+return QSizeF();
+}
+
+
+QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
+{
+}
+
+void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
+{
+insertItem(index, item);
+
+//connect attached properties
+if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
+    setStretchFactor(item, obj->stretchFactor());
+    setAlignment(item, obj->alignment());
+    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
+                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
+    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
+                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
+    //### need to disconnect when widget is removed?
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsLinearLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
+{
+QGraphicsLinearLayout::setStretchFactor(item, stretch);
+}
+
+void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+QGraphicsLinearLayout::setAlignment(item, alignment);
+}
+
+QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> QGraphicsLinearLayoutObject::attachedProperties;
+LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast<QGraphicsLayoutItem*>(obj))
+    return 0;
+LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
+attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
+return rv;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+// QGraphicsGridLayout-related classes
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+GridLayoutAttached::GridLayoutAttached(QObject *parent)
+: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1)
+{
+}
+
+void GridLayoutAttached::setRow(int r)
+{
+    if (_row == r)
+        return;
+
+    _row = r;
+    //emit rowChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _row);
+}
+
+void GridLayoutAttached::setColumn(int c)
+{
+    if (_column == c)
+        return;
+
+    _column = c;
+    //emit columnChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _column);
+}
+
+void GridLayoutAttached::setRowSpan(int rs)
+{
+    if (_rowspan == rs)
+        return;
+
+    _rowspan = rs;
+    //emit rowSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _rowSpan);
+}
+
+void GridLayoutAttached::setColumnSpan(int cs)
+{
+    if (_colspan == cs)
+        return;
+
+    _colspan = cs;
+    //emit columnSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _columnSpan);
+}
+
+void GridLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    //emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
+}
+
+QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
+{
+}
+
+void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
+{
+//use attached properties
+if (QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(wid))) {
+    int row = static_cast<GridLayoutAttached *>(obj)->row();
+    int column = static_cast<GridLayoutAttached *>(obj)->column();
+    int rowSpan = static_cast<GridLayoutAttached *>(obj)->rowSpan();
+    int columnSpan = static_cast<GridLayoutAttached *>(obj)->columnSpan();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    addItem(wid, row, column, rowSpan, columnSpan);
+}
+}
+
+void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
+{
+//use attached properties
+if (GridLayoutAttached *obj = attachedProperties.value(item)) {
+    int row = obj->row();
+    int column = obj->column();
+    int rowSpan = obj->rowSpan();
+    int columnSpan = obj->columnSpan();
+    Qt::Alignment alignment = obj->alignment();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    addItem(item, row, column, rowSpan, columnSpan);
+    if (alignment != -1)
+        setAlignment(item,alignment);
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsGridLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+qreal QGraphicsGridLayoutObject::spacing() const
+{
+if (verticalSpacing() == horizontalSpacing())
+    return verticalSpacing();
+return -1;  //###
+}
+
+QHash<QGraphicsLayoutItem*, GridLayoutAttached*> QGraphicsGridLayoutObject::attachedProperties;
+GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast<QGraphicsLayoutItem*>(obj))
+    return 0;
+GridLayoutAttached *rv = new GridLayoutAttached(obj);
+attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
+return rv;
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/qmlmodules/widgets/graphicslayouts_p.h b/src/plugins/qmlmodules/widgets/graphicslayouts_p.h
new file mode 100644
index 0000000..5394ffa
--- /dev/null
+++ b/src/plugins/qmlmodules/widgets/graphicslayouts_p.h
@@ -0,0 +1,226 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GRAPHICSLAYOUTS_H
+#define GRAPHICSLAYOUTS_H
+
+#include "graphicswidgets_p.h"
+
+#include <QtGui/QGraphicsLinearLayout>
+#include <QtGui/QGraphicsGridLayout>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayoutItem)
+public:
+    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
+
+    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
+};
+
+class LinearLayoutAttached;
+class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QmlListProperty<QGraphicsLayoutItem> children READ children)
+    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsLinearLayoutObject(QObject * = 0);
+    ~QGraphicsLinearLayoutObject();
+
+    QmlListProperty<QGraphicsLayoutItem> children() { return QmlListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
+
+    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
+
+private Q_SLOTS:
+    void updateStretch(QGraphicsLayoutItem*,int);
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class LinearLayoutAttached;
+    void clearChildren();
+    void insertLayoutItem(int, QGraphicsLayoutItem *);
+    static QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> attachedProperties;
+
+    static void children_append(QmlListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
+        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
+    }
+
+    static void children_clear(QmlListProperty<QGraphicsLayoutItem> *prop) {
+        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->clearChildren();
+    }
+
+    static int children_count(QmlListProperty<QGraphicsLayoutItem> *prop) {
+        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QmlListProperty<QGraphicsLayoutItem> *prop, int index) {
+        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
+    }
+};
+
+class GridLayoutAttached;
+class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QmlListProperty<QGraphicsLayoutItem> children READ children)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
+    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsGridLayoutObject(QObject * = 0);
+    ~QGraphicsGridLayoutObject();
+
+    QmlListProperty<QGraphicsLayoutItem> children() { return QmlListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
+
+    qreal spacing() const;
+
+    static GridLayoutAttached *qmlAttachedProperties(QObject *);
+
+private:
+    friend class GraphicsLayoutAttached;
+    void addWidget(QGraphicsWidget *);
+    void clearChildren();
+    void addLayoutItem(QGraphicsLayoutItem *);
+    static QHash<QGraphicsLayoutItem*, GridLayoutAttached*> attachedProperties;
+
+    static void children_append(QmlListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
+        static_cast<QGraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
+    }
+
+    static void children_clear(QmlListProperty<QGraphicsLayoutItem> *prop) {
+        static_cast<QGraphicsGridLayoutObject*>(prop->object)->clearChildren();
+    }
+
+    static int children_count(QmlListProperty<QGraphicsLayoutItem> *prop) {
+        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QmlListProperty<QGraphicsLayoutItem> *prop, int index) {
+        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->itemAt(index);
+    }
+};
+
+class LinearLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
+public:
+    LinearLayoutAttached(QObject *parent);
+
+    int stretchFactor() const { return _stretch; }
+    void setStretchFactor(int f);
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+
+Q_SIGNALS:
+    void stretchChanged(QGraphicsLayoutItem*,int);
+    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    int _stretch;
+    Qt::Alignment _alignment;
+};
+
+class GridLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int row READ row WRITE setRow)
+    Q_PROPERTY(int column READ column WRITE setColumn)
+    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
+    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
+public:
+    GridLayoutAttached(QObject *parent);
+
+    int row() const { return _row; }
+    void setRow(int r);
+
+    int column() const { return _column; }
+    void setColumn(int c);
+
+    int rowSpan() const { return _rowspan; }
+    void setRowSpan(int rs);
+
+    int columnSpan() const { return _colspan; }
+    void setColumnSpan(int cs);
+
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+
+private:
+    int _row;
+    int _column;
+    int _rowspan;
+    int _colspan;
+    Qt::Alignment _alignment;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
+QML_DECLARE_INTERFACE(QGraphicsLayout)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif // GRAPHICSLAYOUTS_H
diff --git a/src/plugins/qmlmodules/widgets/graphicswidgets.cpp b/src/plugins/qmlmodules/widgets/graphicswidgets.cpp
new file mode 100644
index 0000000..062e516
--- /dev/null
+++ b/src/plugins/qmlmodules/widgets/graphicswidgets.cpp
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
diff --git a/src/plugins/qmlmodules/widgets/graphicswidgets_p.h b/src/plugins/qmlmodules/widgets/graphicswidgets_p.h
new file mode 100644
index 0000000..6255d2b
--- /dev/null
+++ b/src/plugins/qmlmodules/widgets/graphicswidgets_p.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GRAPHICSWIDGETS_H
+#define GRAPHICSWIDGETS_H
+
+#include <qml.h>
+
+#include <QtGui/QGraphicsScene>
+#include <QtGui/QGraphicsView>
+#include <QtGui/QGraphicsWidget>
+#include <QtGui/QGraphicsItem>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QGraphicsView)
+QML_DECLARE_TYPE_HASMETATYPE(QGraphicsScene)
+QML_DECLARE_TYPE(QGraphicsWidget)
+QML_DECLARE_TYPE(QGraphicsObject)
+QML_DECLARE_INTERFACE_HASMETATYPE(QGraphicsItem)
+
+QT_END_HEADER
+
+#endif // GRAPHICSWIDGETS_H
diff --git a/src/plugins/qmlmodules/widgets/widgets.cpp b/src/plugins/qmlmodules/widgets/widgets.cpp
new file mode 100644
index 0000000..a5cf389
--- /dev/null
+++ b/src/plugins/qmlmodules/widgets/widgets.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDeclarative/qmlmoduleplugin.h>
+#include <QtDeclarative/qml.h>
+
+#include "graphicslayouts_p.h"
+#include "graphicswidgets_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QGraphicsViewDeclarativeUI : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QGraphicsScene *scene READ scene WRITE setScene)
+    Q_CLASSINFO("DefaultProperty", "scene")
+public:
+    QGraphicsViewDeclarativeUI(QObject *other) : QObject(other) {}
+
+    QGraphicsScene *scene() const { return static_cast<QGraphicsView *>(parent())->scene(); }
+    void setScene(QGraphicsScene *scene)
+    {
+        static_cast<QGraphicsView *>(parent())->setScene(scene);
+    }
+};
+
+class QGraphicsSceneDeclarativeUI : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QmlListProperty<QObject> children READ children)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsSceneDeclarativeUI(QObject *other) : QObject(other) {}
+
+    QmlListProperty<QObject> children() { return QmlListProperty<QObject>(this->parent(), 0, children_append); }
+
+private:
+    static void children_append(QmlListProperty<QObject> *prop, QObject *o) {
+        if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o))
+            static_cast<QGraphicsScene *>(prop->object)->addItem(go);
+    }
+};
+
+class QGraphicsWidgetDeclarativeUI : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QmlListProperty<QGraphicsItem> children READ children)
+    Q_PROPERTY(QGraphicsLayout *layout READ layout WRITE setLayout)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsWidgetDeclarativeUI(QObject *other) : QObject(other) {}
+
+    QmlListProperty<QGraphicsItem> children() { return QmlListProperty<QGraphicsItem>(this, 0, children_append); }
+
+    QGraphicsLayout *layout() const { return static_cast<QGraphicsWidget *>(parent())->layout(); }
+    void setLayout(QGraphicsLayout *lo)
+    {
+        static_cast<QGraphicsWidget *>(parent())->setLayout(lo);
+    }
+
+private:
+    void setItemParent(QGraphicsItem *wid)
+    {
+        wid->setParentItem(static_cast<QGraphicsWidget *>(parent()));
+    }
+
+    static void children_append(QmlListProperty<QGraphicsItem> *prop, QGraphicsItem *i) {
+        static_cast<QGraphicsWidgetDeclarativeUI*>(prop->object)->setItemParent(i);
+    }
+};
+
+class QWidgetsQmlModule : public QmlModulePlugin
+{
+    Q_OBJECT
+public:
+    QStringList keys() const
+    {
+        return QStringList() << QLatin1String("Qt.widgets");
+    }
+
+    void defineModule(const QString& uri)
+    {
+        Q_UNUSED(uri)
+        Q_ASSERT(uri == QLatin1String("Qt.widgets"));
+
+        QML_REGISTER_INTERFACE(QGraphicsLayoutItem);
+        QML_REGISTER_INTERFACE(QGraphicsLayout);
+        QML_REGISTER_TYPE(Qt,4,6,QGraphicsLinearLayoutStretchItem,QGraphicsLinearLayoutStretchItemObject);
+        QML_REGISTER_TYPE(Qt,4,6,QGraphicsLinearLayout,QGraphicsLinearLayoutObject);
+        QML_REGISTER_TYPE(Qt,4,6,QGraphicsGridLayout,QGraphicsGridLayoutObject);
+        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI);
+        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI);
+        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI);
+        QML_REGISTER_INTERFACE(QGraphicsItem);
+    }
+};
+
+QT_END_NAMESPACE
+
+#include "widgets.moc"
+
+Q_EXPORT_PLUGIN2(qtwidgetsqmlmodule, QT_PREPEND_NAMESPACE(QWidgetsQmlModule));
+
diff --git a/src/plugins/qmlmodules/widgets/widgets.pro b/src/plugins/qmlmodules/widgets/widgets.pro
new file mode 100644
index 0000000..5cc8dcc
--- /dev/null
+++ b/src/plugins/qmlmodules/widgets/widgets.pro
@@ -0,0 +1,15 @@
+TARGET  = widgets
+include(../../qpluginbase.pri)
+
+QT += declarative
+
+SOURCES += \
+    graphicslayouts.cpp \
+    widgets.cpp
+
+HEADERS += \
+    graphicswidgets_p.h \
+    graphicslayouts_p.h
+
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmlmodules
+target.path = $$[QT_INSTALL_PLUGINS]/plugins/qmlmodules
diff --git a/tests/auto/declarative/layouts/data/layouts.qml b/tests/auto/declarative/layouts/data/layouts.qml
index 00d785d..1792500 100644
--- a/tests/auto/declarative/layouts/data/layouts.qml
+++ b/tests/auto/declarative/layouts/data/layouts.qml
@@ -1,4 +1,5 @@
 import Qt 4.6
+import Qt.widgets 4.6
 
 Item {
     id: resizable
diff --git a/tests/auto/declarative/qmlecmascript/testtypes.cpp b/tests/auto/declarative/qmlecmascript/testtypes.cpp
index 3c6b256..6a04704 100644
--- a/tests/auto/declarative/qmlecmascript/testtypes.cpp
+++ b/tests/auto/declarative/qmlecmascript/testtypes.cpp
@@ -72,11 +72,14 @@ private:
     int m_value;
 };
 
-QML_DEFINE_TYPE(Qt.test, 1,0, MyQmlObject,MyQmlObject);
-QML_DEFINE_TYPE(Qt.test, 1,0, MyDeferredObject,MyDeferredObject);
-QML_DEFINE_TYPE(Qt.test, 1,0, MyQmlContainer,MyQmlContainer);
-QML_DEFINE_EXTENDED_TYPE(Qt.test, 1,0, MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject);
-QML_DEFINE_EXTENDED_TYPE(Qt.test, 1,0, MyExtendedObject,MyExtendedObject,ExtensionObject);
-QML_DEFINE_TYPE(Qt.test, 1,0, MyTypeObject, MyTypeObject);
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Qt.test, 1,0, MyQmlObject,MyQmlObject);
+    QML_REGISTER_TYPE(Qt.test, 1,0, MyDeferredObject,MyDeferredObject);
+    QML_REGISTER_TYPE(Qt.test, 1,0, MyQmlContainer,MyQmlContainer);
+    QML_REGISTER_EXTENDED_TYPE(Qt.test, 1,0, MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject);
+    QML_REGISTER_EXTENDED_TYPE(Qt.test, 1,0, MyExtendedObject,MyExtendedObject,ExtensionObject);
+    QML_REGISTER_TYPE(Qt.test, 1,0, MyTypeObject, MyTypeObject);
+}
 
 #include "testtypes.moc"
diff --git a/tests/auto/declarative/qmlecmascript/testtypes.h b/tests/auto/declarative/qmlecmascript/testtypes.h
index 0af72cb..e1fb1b7 100644
--- a/tests/auto/declarative/qmlecmascript/testtypes.h
+++ b/tests/auto/declarative/qmlecmascript/testtypes.h
@@ -588,5 +588,7 @@ private:
     QVariantList m_actuals;
 };
 
+void registerTypes();
+
 #endif // TESTTYPES_H
 
diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
index b30ad1c..88f06ad 100644
--- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
+++ b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
@@ -76,6 +76,7 @@ public:
     tst_qmlecmascript() {}
 
 private slots:
+    void initTestCase();
     void assignBasicTypes();
     void idShortcutInvalidates();
     void boolPropertiesEvaluateAsBool();
@@ -129,6 +130,8 @@ private:
     QmlEngine engine;
 };
 
+void tst_qmlecmascript::initTestCase() { registerTypes(); }
+
 void tst_qmlecmascript::assignBasicTypes()
 {
     {
diff --git a/tests/auto/declarative/qmlgraphicswebview/testtypes.cpp b/tests/auto/declarative/qmlgraphicswebview/testtypes.cpp
index 00c1b67..676d19a 100644
--- a/tests/auto/declarative/qmlgraphicswebview/testtypes.cpp
+++ b/tests/auto/declarative/qmlgraphicswebview/testtypes.cpp
@@ -46,4 +46,7 @@ void MyWebView::drawContents(QPainter *p, const QRect &r)
     QmlGraphicsWebView::drawContents(p,r);
 }
 
-QML_DEFINE_TYPE(Test,1,0,MyWebView,MyWebView);
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Test,1,0,MyWebView,MyWebView);
+}
diff --git a/tests/auto/declarative/qmlgraphicswebview/testtypes.h b/tests/auto/declarative/qmlgraphicswebview/testtypes.h
index 0b3176d..fa9a301 100644
--- a/tests/auto/declarative/qmlgraphicswebview/testtypes.h
+++ b/tests/auto/declarative/qmlgraphicswebview/testtypes.h
@@ -61,4 +61,6 @@ private:
 
 QML_DECLARE_TYPE(MyWebView);
 
+void registerTypes();
+
 #endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
index f3c39f8..6672f5b 100644
--- a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
+++ b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
@@ -59,6 +59,7 @@ public:
     tst_qmlgraphicswebview() {}
 
 private slots:
+    void initTestCase();
     void basicProperties();
     void settings();
     void historyNav();
@@ -81,6 +82,11 @@ private:
     }
 };
 
+void tst_qmlgraphicswebview::initTestCase()
+{
+    registerTypes();
+}
+
 static QString strippedHtml(QString html)
 {
     html.replace(QRegExp("\\s+"),"");
diff --git a/tests/auto/declarative/qmllanguage/testtypes.cpp b/tests/auto/declarative/qmllanguage/testtypes.cpp
index a295054..9ffe28a 100644
--- a/tests/auto/declarative/qmllanguage/testtypes.cpp
+++ b/tests/auto/declarative/qmllanguage/testtypes.cpp
@@ -40,15 +40,18 @@
 ****************************************************************************/
 #include "testtypes.h"
 
-QML_DEFINE_INTERFACE(MyInterface);
-QML_DEFINE_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
-QML_DEFINE_TYPE(Test,1,0,MyTypeObject,MyTypeObject);
-QML_DEFINE_TYPE(Test,1,0,MyContainer,MyContainer);
-QML_DEFINE_TYPE(Test,1,0,MyPropertyValueSource,MyPropertyValueSource);
-QML_DEFINE_TYPE(Test,1,0,MyDotPropertyObject,MyDotPropertyObject);
-QML_DEFINE_TYPE(Test,1,0,MyNamespacedType,MyNamespace::MyNamespacedType);
-QML_DEFINE_TYPE(Test,1,0,MySecondNamespacedType,MyNamespace::MySecondNamespacedType);
-QML_DEFINE_NOCREATE_TYPE(MyGroupedObject);
+void registerTypes()
+{
+    QML_REGISTER_INTERFACE(MyInterface);
+    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
+    QML_REGISTER_TYPE(Test,1,0,MyTypeObject,MyTypeObject);
+    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
+    QML_REGISTER_TYPE(Test,1,0,MyPropertyValueSource,MyPropertyValueSource);
+    QML_REGISTER_TYPE(Test,1,0,MyDotPropertyObject,MyDotPropertyObject);
+    QML_REGISTER_TYPE(Test,1,0,MyNamespacedType,MyNamespace::MyNamespacedType);
+    QML_REGISTER_TYPE(Test,1,0,MySecondNamespacedType,MyNamespace::MySecondNamespacedType);
+    QML_REGISTER_NOCREATE_TYPE(MyGroupedObject);
+}
 
 QVariant myCustomVariantTypeConverter(const QString &data)
 {
diff --git a/tests/auto/declarative/qmllanguage/testtypes.h b/tests/auto/declarative/qmllanguage/testtypes.h
index 27b45e4..9fd0973 100644
--- a/tests/auto/declarative/qmllanguage/testtypes.h
+++ b/tests/auto/declarative/qmllanguage/testtypes.h
@@ -542,4 +542,6 @@ namespace MyNamespace {
 QML_DECLARE_TYPE(MyNamespace::MyNamespacedType);
 QML_DECLARE_TYPE(MyNamespace::MySecondNamespacedType);
 
+void registerTypes();
+
 #endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
index 4090e1d..5f9cb1b 100644
--- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
+++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
@@ -182,6 +182,15 @@ inline QUrl TEST_FILE(const char *filename)
 
 void tst_qmllanguage::initTestCase()
 {
+    registerTypes();
+
+    QML_REGISTER_TYPE(com.nokia.Test, 0, 0, TestTP, TestType)
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 0, Test, TestType)
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 5, Test, TestType)
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 8, Test, TestType2)
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 9, OldTest, TestType)
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 12, Test, TestType2)
+
     // Create locale-specific file
     // For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit
     // For iso8859-1 locale, this will just be data/I18nType?????.qml where ????? is 5 8-bit characters
@@ -1058,13 +1067,6 @@ void tst_qmllanguage::testType(const QString& qml, const QString& type)
 QML_DECLARE_TYPE(TestType)
 QML_DECLARE_TYPE(TestType2)
 
-QML_DEFINE_TYPE(com.nokia.Test, 0, 0, TestTP, TestType)
-QML_DEFINE_TYPE(com.nokia.Test, 1, 0, Test, TestType)
-QML_DEFINE_TYPE(com.nokia.Test, 1, 5, Test, TestType)
-QML_DEFINE_TYPE(com.nokia.Test, 1, 8, Test, TestType2)
-QML_DEFINE_TYPE(com.nokia.Test, 1, 9, OldTest, TestType)
-QML_DEFINE_TYPE(com.nokia.Test, 1, 12, Test, TestType2)
-
 // Import tests (QT-558)
 
 void tst_qmllanguage::importsBuiltin_data()
diff --git a/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp b/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp
index 6122f1e..db9f218 100644
--- a/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp
+++ b/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp
@@ -67,6 +67,7 @@ public:
     tst_qmllistreference() {}
 
 private slots:
+    void initTestCase();
     void qmllistreference();
     void qmllistreference_invalid();
     void isValid();
@@ -101,7 +102,11 @@ public:
     QmlListProperty<TestType> property;
 };
 QML_DECLARE_TYPE(TestType);
-QML_DEFINE_NOCREATE_TYPE(TestType);
+
+void tst_qmllistreference::initTestCase()
+{
+    QML_REGISTER_NOCREATE_TYPE(TestType);
+}
 
 void tst_qmllistreference::qmllistreference()
 {
diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
index c289641..4be0800 100644
--- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
@@ -54,7 +54,6 @@ public:
 };
 
 QML_DECLARE_TYPE(MyQmlObject);
-QML_DEFINE_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
 
 class MyAttached : public QObject
 {
@@ -88,7 +87,6 @@ private:
 };
 
 QML_DECLARE_TYPE(MyContainer);
-QML_DEFINE_TYPE(Test,1,0,MyContainer,MyContainer);
 QML_DECLARE_TYPEINFO(MyContainer, QML_HAS_ATTACHED_PROPERTIES)
 
 class tst_qmlmetaproperty : public QObject
@@ -98,6 +96,7 @@ public:
     tst_qmlmetaproperty() {}
 
 private slots:
+    void initTestCase();
 
     // Constructors
     void qmlmetaproperty();
@@ -126,6 +125,13 @@ private:
     QmlEngine engine;
 };
 
+void tst_qmlmetaproperty::initTestCase()
+{
+    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
+    QML_REGISTER_TYPE(Test,1,0,PropertyObject,PropertyObject);
+    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
+}
+
 void tst_qmlmetaproperty::qmlmetaproperty()
 {
     QmlMetaProperty prop;
@@ -209,7 +215,6 @@ private:
 };
 
 QML_DECLARE_TYPE(PropertyObject);
-QML_DEFINE_TYPE(Test,1,0,PropertyObject,PropertyObject);
 
 void tst_qmlmetaproperty::qmlmetaproperty_object()
 {
diff --git a/tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp b/tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp
index 750ccf8..027b607 100644
--- a/tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp
+++ b/tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp
@@ -60,6 +60,8 @@ public:
     tst_qmlmetatype() {}
 
 private slots:
+    void initTestCase();
+
     void copy();
 
     void qmlParserStatusCast();
@@ -81,7 +83,6 @@ public:
     int foo() { return 0; }
 };
 QML_DECLARE_TYPE(TestType);
-QML_DEFINE_TYPE(Test, 1, 0, TestType, TestType);
 
 class ParserStatusTestType : public QObject, public QmlParserStatus
 {
@@ -89,7 +90,6 @@ class ParserStatusTestType : public QObject, public QmlParserStatus
     Q_CLASSINFO("DefaultProperty", "foo"); // Missing default property
 };
 QML_DECLARE_TYPE(ParserStatusTestType);
-QML_DEFINE_TYPE(Test, 1, 0, ParserStatusTestType, ParserStatusTestType);
 
 class ValueSourceTestType : public QObject, public QmlPropertyValueSource
 {
@@ -99,7 +99,6 @@ public:
     virtual void setTarget(const QmlMetaProperty &) {}
 };
 QML_DECLARE_TYPE(ValueSourceTestType);
-QML_DEFINE_TYPE(Test, 1, 0, ValueSourceTestType, ValueSourceTestType);
 
 class ValueInterceptorTestType : public QObject, public QmlPropertyValueInterceptor
 {
@@ -110,7 +109,6 @@ public:
     virtual void write(const QVariant &) {}
 };
 QML_DECLARE_TYPE(ValueInterceptorTestType);
-QML_DEFINE_TYPE(Test, 1, 0, ValueInterceptorTestType, ValueInterceptorTestType);
 
 
 #define COPY_TEST(cpptype, metatype, value, defaultvalue) \
@@ -131,6 +129,14 @@ QML_DEFINE_TYPE(Test, 1, 0, ValueInterceptorTestType, ValueInterceptorTestType);
     QVERIFY(v == (value)); \
 }
 
+void tst_qmlmetatype::initTestCase()
+{
+    QML_REGISTER_TYPE(Test, 1, 0, TestType, TestType);
+    QML_REGISTER_TYPE(Test, 1, 0, ParserStatusTestType, ParserStatusTestType);
+    QML_REGISTER_TYPE(Test, 1, 0, ValueSourceTestType, ValueSourceTestType);
+    QML_REGISTER_TYPE(Test, 1, 0, ValueInterceptorTestType, ValueInterceptorTestType);
+}
+
 void tst_qmlmetatype::copy()
 {
     QVERIFY(QmlMetaType::copy(QMetaType::Void, 0, 0));
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
index ddd1e5e..6354d31 100644
--- a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
+++ b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
@@ -61,7 +61,6 @@ private:
 };
 
 QML_DECLARE_TYPE(MyPluginType);
-QML_DEFINE_TYPE(com.nokia.AutoTestQmlPluginType,1,0,MyPluginType,MyPluginType);
 
 
 class MyPlugin : public QmlModulePlugin
@@ -81,6 +80,7 @@ public:
     void defineModule(const QString& uri)
     {
         Q_ASSERT(uri == "com.nokia.AutoTestQmlPluginType");
+        QML_REGISTER_TYPE(com.nokia.AutoTestQmlPluginType,1,0,MyPluginType,MyPluginType);
     }
 };
 
diff --git a/tests/auto/declarative/qmlstates/tst_qmlstates.cpp b/tests/auto/declarative/qmlstates/tst_qmlstates.cpp
index b910c85..c372a15 100644
--- a/tests/auto/declarative/qmlstates/tst_qmlstates.cpp
+++ b/tests/auto/declarative/qmlstates/tst_qmlstates.cpp
@@ -56,6 +56,8 @@ private:
     static QByteArray fullDataPath(const QString &path);
 
 private slots:
+    void initTestCase();
+
     void basicChanges();
     void basicExtension();
     void basicBinding();
@@ -344,7 +346,11 @@ Q_SIGNALS:
 };
 
 QML_DECLARE_TYPE(MyRect)
-QML_DEFINE_TYPE(Qt.test, 1, 0, MyRectangle,MyRect);
+
+void tst_qmlstates::initTestCase()
+{
+    QML_REGISTER_TYPE(Qt.test, 1, 0, MyRectangle,MyRect);
+}
 
 void tst_qmlstates::signalOverride()
 {
diff --git a/tests/auto/declarative/qmlvaluetypes/testtypes.cpp b/tests/auto/declarative/qmlvaluetypes/testtypes.cpp
index c51b777..aa8bd6e 100644
--- a/tests/auto/declarative/qmlvaluetypes/testtypes.cpp
+++ b/tests/auto/declarative/qmlvaluetypes/testtypes.cpp
@@ -40,6 +40,9 @@
 ****************************************************************************/
 #include "testtypes.h"
 
-QML_DEFINE_TYPE(Test, 1, 0, MyTypeObject, MyTypeObject);
-QML_DEFINE_TYPE(Test, 1, 0, MyConstantValueSource, MyConstantValueSource);
-QML_DEFINE_TYPE(Test, 1, 0, MyOffsetValueInterceptor, MyOffsetValueInterceptor);
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Test, 1, 0, MyTypeObject, MyTypeObject);
+    QML_REGISTER_TYPE(Test, 1, 0, MyConstantValueSource, MyConstantValueSource);
+    QML_REGISTER_TYPE(Test, 1, 0, MyOffsetValueInterceptor, MyOffsetValueInterceptor);
+}
diff --git a/tests/auto/declarative/qmlvaluetypes/testtypes.h b/tests/auto/declarative/qmlvaluetypes/testtypes.h
index b57fbff..5f9dde1 100644
--- a/tests/auto/declarative/qmlvaluetypes/testtypes.h
+++ b/tests/auto/declarative/qmlvaluetypes/testtypes.h
@@ -149,4 +149,6 @@ private:
 };
 QML_DECLARE_TYPE(MyOffsetValueInterceptor);
 
+void registerTypes();
+
 #endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp b/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
index f99d3ce..26cf9b0 100644
--- a/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
+++ b/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
@@ -53,6 +53,8 @@ public:
     tst_qmlvaluetypes() {}
 
 private slots:
+    void initTestCase();
+
     void point();
     void pointf();
     void size();
@@ -79,6 +81,11 @@ private:
     QmlEngine engine;
 };
 
+void tst_qmlvaluetypes::initTestCase()
+{
+    registerTypes();
+}
+
 inline QUrl TEST_FILE(const QString &filename)
 {
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
diff --git a/tests/benchmarks/declarative/binding/testtypes.cpp b/tests/benchmarks/declarative/binding/testtypes.cpp
index 3a9f59b..043c8ab 100644
--- a/tests/benchmarks/declarative/binding/testtypes.cpp
+++ b/tests/benchmarks/declarative/binding/testtypes.cpp
@@ -40,4 +40,7 @@
 ****************************************************************************/
 #include "testtypes.h"
 
-QML_DEFINE_TYPE(Test, 1, 0, MyQmlObject, MyQmlObject);
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Test, 1, 0, MyQmlObject, MyQmlObject);
+}
diff --git a/tests/benchmarks/declarative/binding/testtypes.h b/tests/benchmarks/declarative/binding/testtypes.h
index d4e0a1a..a4f16d0 100644
--- a/tests/benchmarks/declarative/binding/testtypes.h
+++ b/tests/benchmarks/declarative/binding/testtypes.h
@@ -78,4 +78,6 @@ private:
 };
 QML_DECLARE_TYPE(MyQmlObject);
 
+void registerTypes();
+
 #endif // TESTTYPES_H
diff --git a/tests/benchmarks/declarative/binding/tst_binding.cpp b/tests/benchmarks/declarative/binding/tst_binding.cpp
index 74a3407..8fae924 100644
--- a/tests/benchmarks/declarative/binding/tst_binding.cpp
+++ b/tests/benchmarks/declarative/binding/tst_binding.cpp
@@ -57,8 +57,8 @@ public:
     virtual ~tst_binding();
 
 public slots:
-    void init();
-    void cleanup();
+    void initTestCase();
+    void cleanupTestCase();
 
 private slots:
     void objectproperty_data();
@@ -78,11 +78,12 @@ tst_binding::~tst_binding()
 {
 }
 
-void tst_binding::init()
+void tst_binding::initTestCase()
 {
+    registerTypes();
 }
 
-void tst_binding::cleanup()
+void tst_binding::cleanupTestCase()
 {
 }
 
diff --git a/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp b/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
index f0bc1f9..acdc395 100644
--- a/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
+++ b/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
@@ -40,4 +40,7 @@
 ****************************************************************************/
 #include "testtypes.h"
 
-QML_DEFINE_TYPE(Qt.test, 4, 6, MyQmlObject, MyQmlObject);
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Qt.test, 4, 6, MyQmlObject, MyQmlObject);
+}
diff --git a/tests/benchmarks/declarative/qmlcomponent/testtypes.h b/tests/benchmarks/declarative/qmlcomponent/testtypes.h
index d4e0a1a..a4f16d0 100644
--- a/tests/benchmarks/declarative/qmlcomponent/testtypes.h
+++ b/tests/benchmarks/declarative/qmlcomponent/testtypes.h
@@ -78,4 +78,6 @@ private:
 };
 QML_DECLARE_TYPE(MyQmlObject);
 
+void registerTypes();
+
 #endif // TESTTYPES_H
diff --git a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp b/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
index 647edbf..afd1cdf 100644
--- a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
+++ b/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
@@ -58,8 +58,8 @@ public:
     virtual ~tst_qmlcomponent();
 
 public slots:
-    void init();
-    void cleanup();
+    void initTestCase();
+    void cleanupTestCase();
 
 private slots:
     void creation_data();
@@ -77,11 +77,12 @@ tst_qmlcomponent::~tst_qmlcomponent()
 {
 }
 
-void tst_qmlcomponent::init()
+void tst_qmlcomponent::initTestCase()
 {
+    registerTypes();
 }
 
-void tst_qmlcomponent::cleanup()
+void tst_qmlcomponent::cleanupTestCase()
 {
 }
 
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.cpp b/tests/benchmarks/declarative/qmltime/qmltime.cpp
index 2cc5d0d..cbac422 100644
--- a/tests/benchmarks/declarative/qmltime/qmltime.cpp
+++ b/tests/benchmarks/declarative/qmltime/qmltime.cpp
@@ -76,7 +76,6 @@ private:
     QGraphicsRectItem m_item;
 };
 QML_DECLARE_TYPE(Timer);
-QML_DEFINE_TYPE(QmlTime, 1, 0, Timer, Timer);
 
 Timer *Timer::m_timer = 0;
 
@@ -157,6 +156,8 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
+    QML_REGISTER_TYPE(QmlTime, 1, 0, Timer, Timer);
+
     uint iterations = 1024;
     QString filename;
     bool willParent = false;
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index dd21997..a90a98b 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -55,6 +55,8 @@ public:
     tst_script() {}
 
 private slots:
+    void initTestCase();
+
     void property_js();
     void property_getter();
     void property_getter_js();
@@ -88,6 +90,11 @@ private slots:
 private:
 };
 
+void tst_script::initTestCase()
+{
+    QML_REGISTER_TYPE(Qt.test, 1, 0, TestObject, TestObject);
+}
+
 inline QUrl TEST_FILE(const QString &filename)
 {
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
@@ -123,7 +130,6 @@ private:
     int m_x;
 };
 QML_DECLARE_TYPE(TestObject);
-QML_DEFINE_TYPE(Qt.test, 1, 0, TestObject, TestObject);
 
 TestObject::TestObject(QObject *parent)
 : QObject(parent), m_x(0)
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 57c445f..0f51da2 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -46,6 +46,8 @@
 #include <QApplication>
 #include <QTranslator>
 #include <QDebug>
+#include "qfxtester.h"
+#include "qmlfolderlistmodel.h"
 
 QT_USE_NAMESPACE
 
@@ -150,6 +152,10 @@ int main(int argc, char ** argv)
     app.setOrganizationName("Nokia");
     app.setOrganizationDomain("nokia.com");
 
+    QmlViewer::registerTypes();
+    QmlGraphicsTester::registerTypes();
+    QmlFolderListModel::registerTypes();
+
     bool frameless = false;
     bool resizeview = false;
     QString fileName;
diff --git a/tools/qmlviewer/qfxtester.cpp b/tools/qmlviewer/qfxtester.cpp
index c3c0124..b2e4054 100644
--- a/tools/qmlviewer/qfxtester.cpp
+++ b/tools/qmlviewer/qfxtester.cpp
@@ -52,10 +52,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(Qt.VisualTest, 4,6, VisualTest, QmlGraphicsVisualTest);
-QML_DEFINE_TYPE(Qt.VisualTest, 4,6, Frame, QmlGraphicsVisualTestFrame);
-QML_DEFINE_TYPE(Qt.VisualTest, 4,6, Mouse, QmlGraphicsVisualTestMouse);
-QML_DEFINE_TYPE(Qt.VisualTest, 4,6, Key, QmlGraphicsVisualTestKey);
 
 QmlGraphicsTester::QmlGraphicsTester(const QString &script, QmlViewer::ScriptOptions opts, 
                      QmlView *parent)
@@ -375,4 +371,12 @@ void QmlGraphicsTester::updateCurrentTime(int msec)
         complete();
 }
 
+void QmlGraphicsTester::registerTypes()
+{
+    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, VisualTest, QmlGraphicsVisualTest);
+    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, Frame, QmlGraphicsVisualTestFrame);
+    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, Mouse, QmlGraphicsVisualTestMouse);
+    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, Key, QmlGraphicsVisualTestKey);
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qmlviewer/qfxtester.h b/tools/qmlviewer/qfxtester.h
index 4b8ff9f..bae807b 100644
--- a/tools/qmlviewer/qfxtester.h
+++ b/tools/qmlviewer/qfxtester.h
@@ -206,6 +206,8 @@ public:
     QmlGraphicsTester(const QString &script, QmlViewer::ScriptOptions options, QmlView *parent);
     ~QmlGraphicsTester();
 
+    static void registerTypes();
+
     virtual int duration() const;
 
     void run();
diff --git a/tools/qmlviewer/qmlfolderlistmodel.cpp b/tools/qmlviewer/qmlfolderlistmodel.cpp
index 698df54..aec7756 100644
--- a/tools/qmlviewer/qmlfolderlistmodel.cpp
+++ b/tools/qmlviewer/qmlfolderlistmodel.cpp
@@ -401,7 +401,7 @@ bool QmlFolderListModel::showOnlyReadable() const
     return d->model.filter() & QDir::Readable;
 }
 
-void  QmlFolderListModel::setShowOnlyReadable(bool on)
+void QmlFolderListModel::setShowOnlyReadable(bool on)
 {
     if (!(d->model.filter() & QDir::Readable) == !on)
         return;
@@ -411,8 +411,10 @@ void  QmlFolderListModel::setShowOnlyReadable(bool on)
         d->model.setFilter(d->model.filter() & ~QDir::Readable);
 }
 
-
-QML_DEFINE_TYPE(Qt,4,6,FolderListModel,QmlFolderListModel)
+void QmlFolderListModel::registerTypes()
+{
+    QML_REGISTER_TYPE(Qt,4,6,FolderListModel,QmlFolderListModel);
+}
 
 QT_END_NAMESPACE
 
diff --git a/tools/qmlviewer/qmlfolderlistmodel.h b/tools/qmlviewer/qmlfolderlistmodel.h
index c180e97..1a1c299 100644
--- a/tools/qmlviewer/qmlfolderlistmodel.h
+++ b/tools/qmlviewer/qmlfolderlistmodel.h
@@ -69,6 +69,8 @@ public:
     QmlFolderListModel(QObject *parent = 0);
     ~QmlFolderListModel();
 
+    static void registerTypes();
+
     virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
     virtual QVariant data(int index, int role) const;
     virtual int count() const;
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 626e4c4..4fe7d7d 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -139,8 +139,6 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(Screen)
 
-QML_DEFINE_TYPE(QmlViewer, 1, 0, Screen, Screen)
-
 QT_BEGIN_NAMESPACE
 
 class SizedMenuBar : public QMenuBar
@@ -1460,6 +1458,11 @@ void QmlViewer::setUseNativeFileBrowser(bool use)
     useQmlFileBrowser = !use;
 }
 
+void QmlViewer::registerTypes()
+{
+    QML_REGISTER_TYPE(QmlViewer, 1, 0, Screen, Screen);
+}
+
 QT_END_NAMESPACE
 
 #include "qmlviewer.moc"
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index c7f87ed..ac7b9a0 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -72,6 +72,8 @@ public:
     QmlViewer(QWidget *parent=0, Qt::WindowFlags flags=0);
     ~QmlViewer();
 
+    static void registerTypes();
+
     enum ScriptOption {
         Play = 0x00000001,
         Record = 0x00000002,
-- 
cgit v0.12


From 216a246daaf3e0b095c4e21efb738b0c7a084a32 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 09:31:58 +1000
Subject: Merge fix.

---
 src/declarative/util/qmlxmllistmodel_p.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
index 969afd1..50967a5 100644
--- a/src/declarative/util/qmlxmllistmodel_p.h
+++ b/src/declarative/util/qmlxmllistmodel_p.h
@@ -132,9 +132,10 @@ class Q_DECLARATIVE_EXPORT QmlXmlListModelRole : public QObject
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(QString query READ query WRITE setQuery)
+    Q_PROPERTY(bool isKey READ isKey WRITE setIsKey)
 
 public:
-    QmlXmlListModelRole() {}
+    QmlXmlListModelRole() : m_isKey(false) {}
     ~QmlXmlListModelRole() {}
 
     QString name() const { return m_name; }
@@ -150,6 +151,9 @@ public:
         m_query = query;
     }
 
+    bool isKey() const { return m_isKey; }
+    void setIsKey(bool b) { m_isKey = b; }
+
     bool isValid() {
         return !m_name.isEmpty() && !m_query.isEmpty();
     }
@@ -157,6 +161,7 @@ public:
 private:
     QString m_name;
     QString m_query;
+    bool m_isKey;
 };
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From 2f1372b7a77d9e24d4a6f6925fe876b4e3a1b01a Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Wed, 24 Feb 2010 09:42:24 +1000
Subject: Missing test data file.

---
 tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml

diff --git a/tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml b/tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml
new file mode 100644
index 0000000..b90e57e
--- /dev/null
+++ b/tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+
+XmlListModel {
+    query: "/data/item"
+    XmlRole { id: nameRole; name: "name"; query: "name/string()"; isKey: true }
+    XmlRole { name: "age"; query: "age/number()"; isKey: true }
+    XmlRole { name: "sport"; query: "sport/string()" }
+
+    function disableNameKey() {
+        nameRole.isKey = false;
+    }
+}
+
-- 
cgit v0.12


From 023f7230ade34c874d0de9e8710d966c61644e87 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 09:46:39 +1000
Subject: doc

---
 src/declarative/QmlChanges.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 06fa720..cf1080b 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -28,6 +28,14 @@ ListModel
  - foo: true  is now a bool (not string "true")
  - foo: false  is now a bool (not string "false" == true!)
 
+C++ API
+-------
+QML_DEFINE_... definition macros, previously global macros, are replaced by
+QML_REGISTER_... registration macros, which must be called explicitly. C++ API users
+should also consider using the QmlExtensionPlugin (previously named QmlModulePlugin)
+as a cleaner mechanism for publishing libraries of QML types, or the upcoming 
+application plugin features of the qmlviewer / qmlruntime / qml.
+
 PropertyAnimation
 ------------------
 matchProperties and matchTargets have been renamed back to properties and targets.
-- 
cgit v0.12


From 5ca4a7da103002e5ca0d9924d5a65a45f7309d29 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 09:49:55 +1000
Subject: Compile after 20fc9f2e264f34dd8580949ddbe5511b78ab0ac4

---
 tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
index 6354d31..8af9c0d 100644
--- a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
+++ b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtDeclarative/qmlmoduleplugin.h>
+#include <QtDeclarative/qmlextensionplugin.h>
 #include <QtDeclarative/qml.h>
 #include <QDebug>
 
@@ -63,7 +63,7 @@ private:
 QML_DECLARE_TYPE(MyPluginType);
 
 
-class MyPlugin : public QmlModulePlugin
+class MyPlugin : public QmlExtensionPlugin
 {
     Q_OBJECT
 public:
@@ -77,9 +77,9 @@ public:
         return QStringList() << QLatin1String("com.nokia.AutoTestQmlPluginType");
     }
 
-    void defineModule(const QString& uri)
+    void initialize(QmlEngine*, const char *uri)
     {
-        Q_ASSERT(uri == "com.nokia.AutoTestQmlPluginType");
+        Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType");
         QML_REGISTER_TYPE(com.nokia.AutoTestQmlPluginType,1,0,MyPluginType,MyPluginType);
     }
 };
-- 
cgit v0.12


From ad80aa026a4626d4c099a8842689ae203f5571e8 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Wed, 24 Feb 2010 10:22:00 +1000
Subject: Disallow ids that start with upper case letters.

Task-number: QT-2786
---
 src/declarative/qml/qmlcompiler.cpp                    | 5 ++---
 tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 4365b17..3702d0b 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -123,10 +123,9 @@ bool QmlCompiler::isValidId(const QString &val)
     if (val.isEmpty())
         return false;
 
-    // TODO this will be enforced and return false
     if (val.at(0).isLetter() && !val.at(0).isLower()) {
-        //return false;
-        qWarning().nospace() << "id '" << val << "' is invalid: ids cannot start with uppercase letters. This will be enforced in an upcoming version of QML.";
+        qWarning().nospace() << "id " << val << " is invalid: ids cannot start with uppercase letters";
+        return false;
     }
 
     QChar u(QLatin1Char('_'));
diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
index 4090e1d..4d27e32 100644
--- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
+++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
@@ -326,7 +326,7 @@ void tst_qmllanguage::errors()
     QFETCH(bool, create);
 
     if (file == "invalidID.6.qml")
-        QSKIP("Test disabled until we strictly disallow ids from beginning with uppercase letters", SkipSingle);
+        QTest::ignoreMessage(QtWarningMsg, "id \"StartsWithUpperCase\" is invalid: ids cannot start with uppercase letters");
 
     QmlComponent component(&engine, TEST_FILE(file));
 
-- 
cgit v0.12


From 6bd74e08ea2d29086ad2a16fef8e9b02c5e5ae5d Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Wed, 24 Feb 2010 10:31:30 +1000
Subject: Fix expected errors following
 d43ec1bdb12649c32f0f0067492857a70bef05b4

---
 tests/auto/declarative/qmllanguage/data/component.5.errors.txt | 2 +-
 tests/auto/declarative/qmllanguage/data/script.10.errors.txt   | 2 +-
 tests/auto/declarative/qmllanguage/data/script.9.errors.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/auto/declarative/qmllanguage/data/component.5.errors.txt b/tests/auto/declarative/qmllanguage/data/component.5.errors.txt
index 5e88900..e3c2df7 100644
--- a/tests/auto/declarative/qmllanguage/data/component.5.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/component.5.errors.txt
@@ -1 +1 @@
-4:5:Invalid component specification
+4:5:Component elements may not contain properties other than id
diff --git a/tests/auto/declarative/qmllanguage/data/script.10.errors.txt b/tests/auto/declarative/qmllanguage/data/script.10.errors.txt
index 8299d23..13f47d1 100644
--- a/tests/auto/declarative/qmllanguage/data/script.10.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/script.10.errors.txt
@@ -1 +1 @@
-6:9:Invalid component specification
+6:9:Component elements may not contain script blocks
diff --git a/tests/auto/declarative/qmllanguage/data/script.9.errors.txt b/tests/auto/declarative/qmllanguage/data/script.9.errors.txt
index dc1eb53..41e8d46 100644
--- a/tests/auto/declarative/qmllanguage/data/script.9.errors.txt
+++ b/tests/auto/declarative/qmllanguage/data/script.9.errors.txt
@@ -1 +1 @@
-5:9:Invalid component specification
+5:9:Component elements may not contain script blocks
-- 
cgit v0.12


From c4db93560af2f949eafe66832940d51aaf1a1874 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 11:23:18 +1000
Subject: doc

---
 doc/src/declarative/extending.qdoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 5da4adb..e7ed310 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -88,7 +88,7 @@ constructor.
 \endquotation
 
 Types can be registered by libraries (such as Qt does), application code,
-or by plugins (see QmlModulePlugin).
+or by plugins (see QmlExtensionPlugin).
 
 Once registered, all of the \l {Qt's Property System}{properties} of a supported
 type are available for use within QML.  QML has intrinsic support for properties
-- 
cgit v0.12


From 5f8feb8be1a90bbfe69359c658edd745141423a8 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 11:36:21 +1000
Subject: doc

---
 doc/src/declarative/modules.qdoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index b2fd149..dfb9081 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -63,7 +63,7 @@ This makes available all types in Qt that were available in Qt 4.6, regardless o
 actual version of Qt executing the QML. So even if Qt 4.7 adds a type that would conflict
 with a type you defined while using 4.6, that type is not imported, so there is no conflict.
 
-Types defined by plugins are made using QmlModulePlugin.  Installed plugins and QML files
+Types defined by plugins are made using QmlExtensionPlugin.  Installed plugins and QML files
 can both contribute types to the same module.
 
 
-- 
cgit v0.12


From 4066e60e859853cfe3240245ba05271e79839506 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Wed, 24 Feb 2010 11:43:56 +1000
Subject: Fix positioner auto test with new easing curve syntax

---
 .../declarative/qmlgraphicspositioners/data/propertychanges.qml   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml b/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
index c3dc7bf..4370a18 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
@@ -2,14 +2,14 @@ import Qt 4.6
 
 Grid {
     id: myGrid
-    
+
     width: 270
     height: 270
     x: 3
     y: 3
     columns: 4
     spacing: 3
-    
+
     add: columnTransition
     move: columnTransition
 
@@ -24,7 +24,7 @@ Grid {
         objectName: "rowTransition"
         NumberAnimation {
             properties: "x,y";
-            easing: "easeOutInCubic"
+            easing.type: "OutInCubic"
         }
     },
     Transition {
@@ -32,7 +32,7 @@ Grid {
         objectName: "columnTransition"
         NumberAnimation {
             properties: "x,y";
-            easing: "easeOutInCubic"
+            easing.type: "OutInCubic"
         }
     }
     ]
-- 
cgit v0.12


From 7c76abb0dc4204043bec9b6fa315f9753a7986ae Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 12:42:00 +1000
Subject: Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX
 to QDeclarativeXXX.

---
 demos/declarative/minehunt/main.cpp                |   16 +-
 doc/doc.pri                                        |    2 +-
 doc/src/declarative/animation.qdoc                 |    2 +-
 doc/src/declarative/basictypes.qdoc                |    2 +-
 doc/src/declarative/declarativeui.qdoc             |    8 +-
 doc/src/declarative/dynamicobjects.qdoc            |    4 +-
 doc/src/declarative/elements.qdoc                  |    2 +-
 doc/src/declarative/example-slideswitch.qdoc       |    4 +-
 doc/src/declarative/examples.qdoc                  |    4 +-
 doc/src/declarative/extending-examples.qdoc        |    4 +-
 doc/src/declarative/extending.qdoc                 |   24 +-
 doc/src/declarative/focus.qdoc                     |    4 +-
 doc/src/declarative/globalobject.qdoc              |    6 +-
 doc/src/declarative/integrating.qdoc               |   12 +-
 doc/src/declarative/javascriptblocks.qdoc          |    4 +-
 doc/src/declarative/measuring-performance.qdoc     |    6 +-
 doc/src/declarative/modules.qdoc                   |    6 +-
 doc/src/declarative/network.qdoc                   |    8 +-
 doc/src/declarative/qdeclarativedebugging.qdoc     |  120 +
 doc/src/declarative/qdeclarativedocument.qdoc      |  190 +
 doc/src/declarative/qdeclarativei18n.qdoc          |   95 +
 doc/src/declarative/qdeclarativeintro.qdoc         |  351 +
 doc/src/declarative/qdeclarativemodels.qdoc        |  341 +
 doc/src/declarative/qdeclarativereference.qdoc     |   95 +
 doc/src/declarative/qdeclarativestates.qdoc        |  127 +
 doc/src/declarative/qmldebugging.qdoc              |  120 -
 doc/src/declarative/qmldocument.qdoc               |  190 -
 doc/src/declarative/qmli18n.qdoc                   |   95 -
 doc/src/declarative/qmlintro.qdoc                  |  351 -
 doc/src/declarative/qmlmodels.qdoc                 |  341 -
 doc/src/declarative/qmlreference.qdoc              |   95 -
 doc/src/declarative/qmlruntime.qdoc                |   99 +
 doc/src/declarative/qmlstates.qdoc                 |  127 -
 doc/src/declarative/qmlviewer.qdoc                 |   99 -
 doc/src/declarative/qtbinding.qdoc                 |   78 +-
 doc/src/declarative/qtprogrammers.qdoc             |   14 +-
 doc/src/declarative/scope.qdoc                     |   14 +-
 examples/declarative/extending/adding/main.cpp     |    8 +-
 examples/declarative/extending/adding/person.h     |    2 +-
 .../extending/attached/birthdayparty.cpp           |    4 +-
 .../declarative/extending/attached/birthdayparty.h |    6 +-
 examples/declarative/extending/attached/main.cpp   |    8 +-
 examples/declarative/extending/attached/person.h   |    2 +-
 .../extending/binding/birthdayparty.cpp            |    4 +-
 .../declarative/extending/binding/birthdayparty.h  |    6 +-
 .../extending/binding/happybirthday.cpp            |    2 +-
 .../declarative/extending/binding/happybirthday.h  |   12 +-
 examples/declarative/extending/binding/main.cpp    |    8 +-
 examples/declarative/extending/binding/person.h    |    2 +-
 .../extending/coercion/birthdayparty.cpp           |    4 +-
 .../declarative/extending/coercion/birthdayparty.h |    6 +-
 examples/declarative/extending/coercion/main.cpp   |    8 +-
 examples/declarative/extending/coercion/person.h   |    2 +-
 .../extending/default/birthdayparty.cpp            |    4 +-
 .../declarative/extending/default/birthdayparty.h  |    6 +-
 examples/declarative/extending/default/main.cpp    |    8 +-
 examples/declarative/extending/default/person.h    |    2 +-
 .../declarative/extending/extended/lineedit.cpp    |    2 +-
 examples/declarative/extending/extended/main.cpp   |    8 +-
 .../extending/grouped/birthdayparty.cpp            |    4 +-
 .../declarative/extending/grouped/birthdayparty.h  |    6 +-
 examples/declarative/extending/grouped/main.cpp    |    8 +-
 examples/declarative/extending/grouped/person.h    |    2 +-
 .../extending/properties/birthdayparty.cpp         |    4 +-
 .../extending/properties/birthdayparty.h           |    6 +-
 examples/declarative/extending/properties/main.cpp |    8 +-
 examples/declarative/extending/properties/person.h |    2 +-
 .../declarative/extending/signal/birthdayparty.cpp |    4 +-
 .../declarative/extending/signal/birthdayparty.h   |    6 +-
 examples/declarative/extending/signal/main.cpp     |    8 +-
 examples/declarative/extending/signal/person.h     |    2 +-
 .../extending/valuesource/birthdayparty.cpp        |    4 +-
 .../extending/valuesource/birthdayparty.h          |    6 +-
 .../extending/valuesource/happybirthday.cpp        |    2 +-
 .../extending/valuesource/happybirthday.h          |   10 +-
 .../declarative/extending/valuesource/main.cpp     |    8 +-
 .../declarative/extending/valuesource/person.h     |    2 +-
 examples/declarative/imageprovider/main.cpp        |   20 +-
 examples/declarative/objectlistmodel/main.cpp      |   14 +-
 examples/declarative/plugins/plugin.cpp            |    8 +-
 examples/declarative/plugins/plugins.pro           |    8 +-
 examples/declarative/sql/hello.qml                 |    2 +-
 .../declarative/webview/qdeclarative-in-html.qml   |   32 +
 examples/declarative/webview/qml-in-html.qml       |   32 -
 src/declarative/3rdparty/qlistmodelinterface.cpp   |    4 +-
 src/declarative/debugger/debugger.pri              |   16 +-
 src/declarative/debugger/qdeclarativedebug.cpp     |  937 +++
 src/declarative/debugger/qdeclarativedebug_p.h     |  371 ++
 .../debugger/qdeclarativedebugclient.cpp           |  207 +
 .../debugger/qdeclarativedebugclient_p.h           |   99 +
 .../debugger/qdeclarativedebuggerstatus.cpp        |   54 +
 .../debugger/qdeclarativedebuggerstatus_p.h        |   66 +
 .../debugger/qdeclarativedebugservice.cpp          |  426 ++
 .../debugger/qdeclarativedebugservice_p.h          |   92 +
 src/declarative/debugger/qmldebug.cpp              |  937 ---
 src/declarative/debugger/qmldebug_p.h              |  371 --
 src/declarative/debugger/qmldebugclient.cpp        |  207 -
 src/declarative/debugger/qmldebugclient_p.h        |   99 -
 src/declarative/debugger/qmldebuggerstatus.cpp     |   54 -
 src/declarative/debugger/qmldebuggerstatus_p.h     |   66 -
 src/declarative/debugger/qmldebugservice.cpp       |  426 --
 src/declarative/debugger/qmldebugservice_p.h       |   92 -
 src/declarative/declarative.pro                    |    2 +-
 src/declarative/graphicsitems/graphicsitems.pri    |  168 +-
 .../graphicsitems/qdeclarativeanchors.cpp          | 1059 +++
 .../graphicsitems/qdeclarativeanchors_p.h          |  196 +
 .../graphicsitems/qdeclarativeanchors_p_p.h        |  174 +
 .../graphicsitems/qdeclarativeanimatedimage.cpp    |  306 +
 .../graphicsitems/qdeclarativeanimatedimage_p.h    |  106 +
 .../graphicsitems/qdeclarativeanimatedimage_p_p.h  |   82 +
 .../graphicsitems/qdeclarativeborderimage.cpp      |  408 ++
 .../graphicsitems/qdeclarativeborderimage_p.h      |  103 +
 .../graphicsitems/qdeclarativeborderimage_p_p.h    |   97 +
 .../graphicsitems/qdeclarativeeffects.cpp          |  170 +
 .../graphicsitems/qdeclarativeeffects_p.h          |   65 +
 .../graphicsitems/qdeclarativeevents.cpp           |  193 +
 .../graphicsitems/qdeclarativeevents_p_p.h         |  137 +
 .../graphicsitems/qdeclarativeflickable.cpp        | 1324 ++++
 .../graphicsitems/qdeclarativeflickable_p.h        |  214 +
 .../graphicsitems/qdeclarativeflickable_p_p.h      |  189 +
 .../graphicsitems/qdeclarativeflipable.cpp         |  238 +
 .../graphicsitems/qdeclarativeflipable_p.h         |   95 +
 .../graphicsitems/qdeclarativefocuspanel.cpp       |   89 +
 .../graphicsitems/qdeclarativefocuspanel_p.h       |   77 +
 .../graphicsitems/qdeclarativefocusscope.cpp       |   71 +
 .../graphicsitems/qdeclarativefocusscope_p.h       |   68 +
 .../qdeclarativegraphicsobjectcontainer.cpp        |  269 +
 .../qdeclarativegraphicsobjectcontainer_p.h        |   90 +
 .../graphicsitems/qdeclarativegridview.cpp         | 1723 +++++
 .../graphicsitems/qdeclarativegridview_p.h         |  222 +
 .../graphicsitems/qdeclarativeimage.cpp            |  368 +
 .../graphicsitems/qdeclarativeimage_p.h            |  102 +
 .../graphicsitems/qdeclarativeimage_p_p.h          |   79 +
 .../graphicsitems/qdeclarativeimagebase.cpp        |  191 +
 .../graphicsitems/qdeclarativeimagebase_p.h        |   92 +
 .../graphicsitems/qdeclarativeimagebase_p_p.h      |   84 +
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 2838 ++++++++
 src/declarative/graphicsitems/qdeclarativeitem.h   |  243 +
 src/declarative/graphicsitems/qdeclarativeitem_p.h |  471 ++
 .../qdeclarativeitemchangelistener_p.h             |   76 +
 .../graphicsitems/qdeclarativeitemsmodule.cpp      |  161 +
 .../graphicsitems/qdeclarativeitemsmodule_p.h      |   63 +
 .../graphicsitems/qdeclarativelayoutitem.cpp       |  114 +
 .../graphicsitems/qdeclarativelayoutitem_p.h       |   94 +
 .../graphicsitems/qdeclarativelistview.cpp         | 2716 ++++++++
 .../graphicsitems/qdeclarativelistview_p.h         |  305 +
 .../graphicsitems/qdeclarativeloader.cpp           |  488 ++
 .../graphicsitems/qdeclarativeloader_p.h           |  111 +
 .../graphicsitems/qdeclarativeloader_p_p.h         |   88 +
 .../graphicsitems/qdeclarativemousearea.cpp        |  685 ++
 .../graphicsitems/qdeclarativemousearea_p.h        |  185 +
 .../graphicsitems/qdeclarativemousearea_p_p.h      |  117 +
 .../graphicsitems/qdeclarativepainteditem.cpp      |  466 ++
 .../graphicsitems/qdeclarativepainteditem_p.h      |  114 +
 .../graphicsitems/qdeclarativepainteditem_p_p.h    |   90 +
 .../graphicsitems/qdeclarativeparticles.cpp        | 1295 ++++
 .../graphicsitems/qdeclarativeparticles_p.h        |  258 +
 src/declarative/graphicsitems/qdeclarativepath.cpp |  849 +++
 src/declarative/graphicsitems/qdeclarativepath_p.h |  262 +
 .../graphicsitems/qdeclarativepath_p_p.h           |   81 +
 .../graphicsitems/qdeclarativepathview.cpp         |  979 +++
 .../graphicsitems/qdeclarativepathview_p.h         |  134 +
 .../graphicsitems/qdeclarativepathview_p_p.h       |  143 +
 .../graphicsitems/qdeclarativepositioners.cpp      |  891 +++
 .../graphicsitems/qdeclarativepositioners_p.h      |  199 +
 .../graphicsitems/qdeclarativepositioners_p_p.h    |  136 +
 .../graphicsitems/qdeclarativerectangle.cpp        |  466 ++
 .../graphicsitems/qdeclarativerectangle_p.h        |  186 +
 .../graphicsitems/qdeclarativerectangle_p_p.h      |  109 +
 .../graphicsitems/qdeclarativerepeater.cpp         |  328 +
 .../graphicsitems/qdeclarativerepeater_p.h         |  103 +
 .../graphicsitems/qdeclarativerepeater_p_p.h       |   82 +
 .../graphicsitems/qdeclarativescalegrid.cpp        |  212 +
 .../graphicsitems/qdeclarativescalegrid_p_p.h      |  133 +
 src/declarative/graphicsitems/qdeclarativetext.cpp |  936 +++
 src/declarative/graphicsitems/qdeclarativetext_p.h |  160 +
 .../graphicsitems/qdeclarativetext_p_p.h           |  127 +
 .../graphicsitems/qdeclarativetextedit.cpp         | 1035 +++
 .../graphicsitems/qdeclarativetextedit_p.h         |  240 +
 .../graphicsitems/qdeclarativetextedit_p_p.h       |  113 +
 .../graphicsitems/qdeclarativetextinput.cpp        |  913 +++
 .../graphicsitems/qdeclarativetextinput_p.h        |  232 +
 .../graphicsitems/qdeclarativetextinput_p_p.h      |  114 +
 .../graphicsitems/qdeclarativevisualitemmodel.cpp  | 1256 ++++
 .../graphicsitems/qdeclarativevisualitemmodel_p.h  |  253 +
 .../graphicsitems/qdeclarativewebview.cpp          | 1335 ++++
 .../graphicsitems/qdeclarativewebview_p.h          |  286 +
 .../graphicsitems/qdeclarativewebview_p_p.h        |  151 +
 .../graphicsitems/qmlgraphicsanchors.cpp           | 1059 ---
 .../graphicsitems/qmlgraphicsanchors_p.h           |  196 -
 .../graphicsitems/qmlgraphicsanchors_p_p.h         |  174 -
 .../graphicsitems/qmlgraphicsanimatedimage.cpp     |  306 -
 .../graphicsitems/qmlgraphicsanimatedimage_p.h     |  106 -
 .../graphicsitems/qmlgraphicsanimatedimage_p_p.h   |   82 -
 .../graphicsitems/qmlgraphicsborderimage.cpp       |  408 --
 .../graphicsitems/qmlgraphicsborderimage_p.h       |  103 -
 .../graphicsitems/qmlgraphicsborderimage_p_p.h     |   97 -
 .../graphicsitems/qmlgraphicseffects.cpp           |  170 -
 .../graphicsitems/qmlgraphicseffects_p.h           |   65 -
 .../graphicsitems/qmlgraphicsevents.cpp            |  193 -
 .../graphicsitems/qmlgraphicsevents_p_p.h          |  137 -
 .../graphicsitems/qmlgraphicsflickable.cpp         | 1324 ----
 .../graphicsitems/qmlgraphicsflickable_p.h         |  214 -
 .../graphicsitems/qmlgraphicsflickable_p_p.h       |  189 -
 .../graphicsitems/qmlgraphicsflipable.cpp          |  238 -
 .../graphicsitems/qmlgraphicsflipable_p.h          |   95 -
 .../graphicsitems/qmlgraphicsfocuspanel.cpp        |   89 -
 .../graphicsitems/qmlgraphicsfocuspanel_p.h        |   77 -
 .../graphicsitems/qmlgraphicsfocusscope.cpp        |   71 -
 .../graphicsitems/qmlgraphicsfocusscope_p.h        |   68 -
 .../qmlgraphicsgraphicsobjectcontainer.cpp         |  269 -
 .../qmlgraphicsgraphicsobjectcontainer_p.h         |   90 -
 .../graphicsitems/qmlgraphicsgridview.cpp          | 1723 -----
 .../graphicsitems/qmlgraphicsgridview_p.h          |  222 -
 src/declarative/graphicsitems/qmlgraphicsimage.cpp |  368 -
 src/declarative/graphicsitems/qmlgraphicsimage_p.h |  102 -
 .../graphicsitems/qmlgraphicsimage_p_p.h           |   79 -
 .../graphicsitems/qmlgraphicsimagebase.cpp         |  191 -
 .../graphicsitems/qmlgraphicsimagebase_p.h         |   92 -
 .../graphicsitems/qmlgraphicsimagebase_p_p.h       |   84 -
 src/declarative/graphicsitems/qmlgraphicsitem.cpp  | 2838 --------
 src/declarative/graphicsitems/qmlgraphicsitem.h    |  243 -
 src/declarative/graphicsitems/qmlgraphicsitem_p.h  |  471 --
 .../qmlgraphicsitemchangelistener_p.h              |   76 -
 .../graphicsitems/qmlgraphicsitemsmodule.cpp       |  161 -
 .../graphicsitems/qmlgraphicsitemsmodule_p.h       |   63 -
 .../graphicsitems/qmlgraphicslayoutitem.cpp        |  114 -
 .../graphicsitems/qmlgraphicslayoutitem_p.h        |   94 -
 .../graphicsitems/qmlgraphicslistview.cpp          | 2716 --------
 .../graphicsitems/qmlgraphicslistview_p.h          |  305 -
 .../graphicsitems/qmlgraphicsloader.cpp            |  488 --
 .../graphicsitems/qmlgraphicsloader_p.h            |  111 -
 .../graphicsitems/qmlgraphicsloader_p_p.h          |   88 -
 .../graphicsitems/qmlgraphicsmousearea.cpp         |  685 --
 .../graphicsitems/qmlgraphicsmousearea_p.h         |  185 -
 .../graphicsitems/qmlgraphicsmousearea_p_p.h       |  117 -
 .../graphicsitems/qmlgraphicspainteditem.cpp       |  466 --
 .../graphicsitems/qmlgraphicspainteditem_p.h       |  114 -
 .../graphicsitems/qmlgraphicspainteditem_p_p.h     |   90 -
 .../graphicsitems/qmlgraphicsparticles.cpp         | 1295 ----
 .../graphicsitems/qmlgraphicsparticles_p.h         |  258 -
 src/declarative/graphicsitems/qmlgraphicspath.cpp  |  849 ---
 src/declarative/graphicsitems/qmlgraphicspath_p.h  |  262 -
 .../graphicsitems/qmlgraphicspath_p_p.h            |   81 -
 .../graphicsitems/qmlgraphicspathview.cpp          |  979 ---
 .../graphicsitems/qmlgraphicspathview_p.h          |  134 -
 .../graphicsitems/qmlgraphicspathview_p_p.h        |  143 -
 .../graphicsitems/qmlgraphicspositioners.cpp       |  891 ---
 .../graphicsitems/qmlgraphicspositioners_p.h       |  199 -
 .../graphicsitems/qmlgraphicspositioners_p_p.h     |  136 -
 .../graphicsitems/qmlgraphicsrectangle.cpp         |  466 --
 .../graphicsitems/qmlgraphicsrectangle_p.h         |  186 -
 .../graphicsitems/qmlgraphicsrectangle_p_p.h       |  109 -
 .../graphicsitems/qmlgraphicsrepeater.cpp          |  328 -
 .../graphicsitems/qmlgraphicsrepeater_p.h          |  103 -
 .../graphicsitems/qmlgraphicsrepeater_p_p.h        |   82 -
 .../graphicsitems/qmlgraphicsscalegrid.cpp         |  212 -
 .../graphicsitems/qmlgraphicsscalegrid_p_p.h       |  133 -
 src/declarative/graphicsitems/qmlgraphicstext.cpp  |  936 ---
 src/declarative/graphicsitems/qmlgraphicstext_p.h  |  160 -
 .../graphicsitems/qmlgraphicstext_p_p.h            |  127 -
 .../graphicsitems/qmlgraphicstextedit.cpp          | 1035 ---
 .../graphicsitems/qmlgraphicstextedit_p.h          |  240 -
 .../graphicsitems/qmlgraphicstextedit_p_p.h        |  113 -
 .../graphicsitems/qmlgraphicstextinput.cpp         |  913 ---
 .../graphicsitems/qmlgraphicstextinput_p.h         |  232 -
 .../graphicsitems/qmlgraphicstextinput_p_p.h       |  114 -
 .../graphicsitems/qmlgraphicsvisualitemmodel.cpp   | 1256 ----
 .../graphicsitems/qmlgraphicsvisualitemmodel_p.h   |  253 -
 .../graphicsitems/qmlgraphicswebview.cpp           | 1335 ----
 .../graphicsitems/qmlgraphicswebview_p.h           |  286 -
 .../graphicsitems/qmlgraphicswebview_p_p.h         |  151 -
 src/declarative/qml/parser/parser.pri              |   32 +-
 src/declarative/qml/parser/qdeclarativejs.g        | 3075 +++++++++
 src/declarative/qml/parser/qdeclarativejsast.cpp   |  955 +++
 src/declarative/qml/parser/qdeclarativejsast_p.h   | 2678 ++++++++
 .../qml/parser/qdeclarativejsastfwd_p.h            |  189 +
 .../qml/parser/qdeclarativejsastvisitor.cpp        |   58 +
 .../qml/parser/qdeclarativejsastvisitor_p.h        |  335 +
 .../qml/parser/qdeclarativejsengine_p.cpp          |  212 +
 .../qml/parser/qdeclarativejsengine_p.h            |  173 +
 .../qml/parser/qdeclarativejsglobal_p.h            |   64 +
 .../qml/parser/qdeclarativejsgrammar.cpp           |  939 +++
 .../qml/parser/qdeclarativejsgrammar_p.h           |  209 +
 src/declarative/qml/parser/qdeclarativejslexer.cpp | 1161 ++++
 src/declarative/qml/parser/qdeclarativejslexer_p.h |  249 +
 .../qml/parser/qdeclarativejsmemorypool_p.h        |  133 +
 .../qml/parser/qdeclarativejsnodepool_p.h          |  139 +
 .../qml/parser/qdeclarativejsparser.cpp            | 1843 +++++
 .../qml/parser/qdeclarativejsparser_p.h            |  246 +
 src/declarative/qml/parser/qmljs.g                 | 3075 ---------
 src/declarative/qml/parser/qmljsast.cpp            |  955 ---
 src/declarative/qml/parser/qmljsast_p.h            | 2678 --------
 src/declarative/qml/parser/qmljsastfwd_p.h         |  189 -
 src/declarative/qml/parser/qmljsastvisitor.cpp     |   58 -
 src/declarative/qml/parser/qmljsastvisitor_p.h     |  335 -
 src/declarative/qml/parser/qmljsengine_p.cpp       |  212 -
 src/declarative/qml/parser/qmljsengine_p.h         |  173 -
 src/declarative/qml/parser/qmljsglobal_p.h         |   64 -
 src/declarative/qml/parser/qmljsgrammar.cpp        |  939 ---
 src/declarative/qml/parser/qmljsgrammar_p.h        |  209 -
 src/declarative/qml/parser/qmljslexer.cpp          | 1161 ----
 src/declarative/qml/parser/qmljslexer_p.h          |  249 -
 src/declarative/qml/parser/qmljsmemorypool_p.h     |  133 -
 src/declarative/qml/parser/qmljsnodepool_p.h       |  139 -
 src/declarative/qml/parser/qmljsparser.cpp         | 1843 -----
 src/declarative/qml/parser/qmljsparser_p.h         |  246 -
 src/declarative/qml/qdeclarative.h                 |  132 +
 src/declarative/qml/qdeclarativebinding.cpp        |  308 +
 src/declarative/qml/qdeclarativebinding_p.h        |  135 +
 src/declarative/qml/qdeclarativebinding_p_p.h      |   91 +
 src/declarative/qml/qdeclarativeboundsignal.cpp    |  263 +
 src/declarative/qml/qdeclarativeboundsignal_p.h    |  100 +
 src/declarative/qml/qdeclarativeclassfactory.cpp   |   50 +
 src/declarative/qml/qdeclarativeclassfactory_p.h   |   74 +
 src/declarative/qml/qdeclarativecleanup.cpp        |   87 +
 src/declarative/qml/qdeclarativecleanup_p.h        |   79 +
 .../qml/qdeclarativecompiledbindings.cpp           | 2738 ++++++++
 .../qml/qdeclarativecompiledbindings_p.h           |  116 +
 src/declarative/qml/qdeclarativecompileddata.cpp   |  239 +
 src/declarative/qml/qdeclarativecompiler.cpp       | 2779 ++++++++
 src/declarative/qml/qdeclarativecompiler_p.h       |  337 +
 src/declarative/qml/qdeclarativecomponent.cpp      |  798 +++
 src/declarative/qml/qdeclarativecomponent.h        |  134 +
 src/declarative/qml/qdeclarativecomponent_p.h      |  147 +
 .../qml/qdeclarativecompositetypedata_p.h          |  152 +
 .../qml/qdeclarativecompositetypemanager.cpp       |  670 ++
 .../qml/qdeclarativecompositetypemanager_p.h       |  117 +
 src/declarative/qml/qdeclarativecontext.cpp        |  574 ++
 src/declarative/qml/qdeclarativecontext.h          |  107 +
 src/declarative/qml/qdeclarativecontext_p.h        |  195 +
 .../qml/qdeclarativecontextscriptclass.cpp         |  275 +
 .../qml/qdeclarativecontextscriptclass_p.h         |  101 +
 src/declarative/qml/qdeclarativecustomparser.cpp   |  263 +
 src/declarative/qml/qdeclarativecustomparser_p.h   |  142 +
 src/declarative/qml/qdeclarativecustomparser_p_p.h |   89 +
 .../qml/qdeclarativedeclarativedata_p.h            |  138 +
 src/declarative/qml/qdeclarativedirparser.cpp      |  220 +
 src/declarative/qml/qdeclarativedirparser_p.h      |  125 +
 src/declarative/qml/qdeclarativedom.cpp            | 1836 +++++
 src/declarative/qml/qdeclarativedom_p.h            |  360 +
 src/declarative/qml/qdeclarativedom_p_p.h          |  157 +
 src/declarative/qml/qdeclarativeengine.cpp         | 1901 ++++++
 src/declarative/qml/qdeclarativeengine.h           |  112 +
 src/declarative/qml/qdeclarativeengine_p.h         |  340 +
 src/declarative/qml/qdeclarativeenginedebug.cpp    |  456 ++
 src/declarative/qml/qdeclarativeenginedebug_p.h    |  121 +
 src/declarative/qml/qdeclarativeerror.cpp          |  258 +
 src/declarative/qml/qdeclarativeerror.h            |   86 +
 src/declarative/qml/qdeclarativeexpression.cpp     |  810 +++
 src/declarative/qml/qdeclarativeexpression.h       |  113 +
 src/declarative/qml/qdeclarativeexpression_p.h     |  189 +
 .../qml/qdeclarativeextensioninterface.h           |   67 +
 .../qml/qdeclarativeextensionplugin.cpp            |   87 +
 src/declarative/qml/qdeclarativeextensionplugin.h  |   72 +
 src/declarative/qml/qdeclarativeglobal_p.h         |   91 +
 .../qml/qdeclarativeglobalscriptclass.cpp          |  121 +
 .../qml/qdeclarativeglobalscriptclass_p.h          |   83 +
 src/declarative/qml/qdeclarativeguard_p.h          |  156 +
 src/declarative/qml/qdeclarativeimageprovider.cpp  |   68 +
 src/declarative/qml/qdeclarativeimageprovider.h    |   64 +
 src/declarative/qml/qdeclarativeinfo.cpp           |  127 +
 src/declarative/qml/qdeclarativeinfo.h             |   92 +
 src/declarative/qml/qdeclarativeinstruction.cpp    |  210 +
 src/declarative/qml/qdeclarativeinstruction_p.h    |  319 +
 src/declarative/qml/qdeclarativeintegercache.cpp   |   86 +
 src/declarative/qml/qdeclarativeintegercache_p.h   |  111 +
 src/declarative/qml/qdeclarativelist.cpp           |  312 +
 src/declarative/qml/qdeclarativelist.h             |  143 +
 src/declarative/qml/qdeclarativelist_p.h           |   85 +
 .../qml/qdeclarativelistscriptclass.cpp            |  149 +
 .../qml/qdeclarativelistscriptclass_p.h            |   87 +
 src/declarative/qml/qdeclarativemetaproperty.cpp   | 1238 ++++
 src/declarative/qml/qdeclarativemetaproperty.h     |  147 +
 src/declarative/qml/qdeclarativemetaproperty_p.h   |  125 +
 src/declarative/qml/qdeclarativemetatype.cpp       | 1153 ++++
 src/declarative/qml/qdeclarativemetatype.h         |  281 +
 .../qdeclarativenetworkaccessmanagerfactory.cpp    |   84 +
 .../qml/qdeclarativenetworkaccessmanagerfactory.h  |   66 +
 .../qml/qdeclarativeobjectscriptclass.cpp          |  673 ++
 .../qml/qdeclarativeobjectscriptclass_p.h          |  144 +
 src/declarative/qml/qdeclarativeparser.cpp         |  387 ++
 src/declarative/qml/qdeclarativeparser_p.h         |  357 +
 src/declarative/qml/qdeclarativeparserstatus.cpp   |   81 +
 src/declarative/qml/qdeclarativeparserstatus.h     |   75 +
 src/declarative/qml/qdeclarativeprivate.cpp        |   48 +
 src/declarative/qml/qdeclarativeprivate.h          |  211 +
 src/declarative/qml/qdeclarativepropertycache.cpp  |  423 ++
 src/declarative/qml/qdeclarativepropertycache_p.h  |  196 +
 .../qml/qdeclarativepropertyvalueinterceptor.cpp   |   79 +
 .../qml/qdeclarativepropertyvalueinterceptor.h     |   68 +
 .../qml/qdeclarativepropertyvaluesource.cpp        |   71 +
 .../qml/qdeclarativepropertyvaluesource.h          |   67 +
 .../qml/qdeclarativeproxymetaobject.cpp            |  138 +
 .../qml/qdeclarativeproxymetaobject_p.h            |  100 +
 src/declarative/qml/qdeclarativerefcount.cpp       |   70 +
 src/declarative/qml/qdeclarativerefcount_p.h       |   80 +
 src/declarative/qml/qdeclarativerewrite.cpp        |  215 +
 src/declarative/qml/qdeclarativerewrite_p.h        |  121 +
 src/declarative/qml/qdeclarativescript.cpp         |   87 +
 src/declarative/qml/qdeclarativescriptclass_p.h    |   89 +
 src/declarative/qml/qdeclarativescriptparser.cpp   |  952 +++
 src/declarative/qml/qdeclarativescriptparser_p.h   |  137 +
 src/declarative/qml/qdeclarativescriptstring.cpp   |  155 +
 src/declarative/qml/qdeclarativescriptstring.h     |   87 +
 src/declarative/qml/qdeclarativesqldatabase.cpp    |  428 ++
 src/declarative/qml/qdeclarativesqldatabase_p.h    |   67 +
 .../qml/qdeclarativestringconverters.cpp           |  276 +
 .../qml/qdeclarativestringconverters_p.h           |   87 +
 src/declarative/qml/qdeclarativetypenamecache.cpp  |  103 +
 src/declarative/qml/qdeclarativetypenamecache_p.h  |  117 +
 .../qml/qdeclarativetypenamescriptclass.cpp        |  166 +
 .../qml/qdeclarativetypenamescriptclass_p.h        |   93 +
 src/declarative/qml/qdeclarativevaluetype.cpp      |  706 ++
 src/declarative/qml/qdeclarativevaluetype_p.h      |  397 ++
 .../qml/qdeclarativevaluetypescriptclass.cpp       |  148 +
 .../qml/qdeclarativevaluetypescriptclass_p.h       |   86 +
 src/declarative/qml/qdeclarativevme.cpp            |  851 +++
 src/declarative/qml/qdeclarativevme_p.h            |  119 +
 src/declarative/qml/qdeclarativevmemetaobject.cpp  |  366 +
 src/declarative/qml/qdeclarativevmemetaobject_p.h  |  157 +
 src/declarative/qml/qdeclarativewatcher.cpp        |  186 +
 src/declarative/qml/qdeclarativewatcher_p.h        |   94 +
 src/declarative/qml/qdeclarativeworkerscript.cpp   | 1041 +++
 src/declarative/qml/qdeclarativeworkerscript_p.h   |  160 +
 src/declarative/qml/qdeclarativexmlhttprequest.cpp | 1631 +++++
 src/declarative/qml/qdeclarativexmlhttprequest_p.h |   67 +
 src/declarative/qml/qml.h                          |  132 -
 src/declarative/qml/qml.pri                        |  240 +-
 src/declarative/qml/qmlbinding.cpp                 |  308 -
 src/declarative/qml/qmlbinding_p.h                 |  135 -
 src/declarative/qml/qmlbinding_p_p.h               |   91 -
 src/declarative/qml/qmlboundsignal.cpp             |  263 -
 src/declarative/qml/qmlboundsignal_p.h             |  100 -
 src/declarative/qml/qmlclassfactory.cpp            |   50 -
 src/declarative/qml/qmlclassfactory_p.h            |   74 -
 src/declarative/qml/qmlcleanup.cpp                 |   87 -
 src/declarative/qml/qmlcleanup_p.h                 |   79 -
 src/declarative/qml/qmlcompiledbindings.cpp        | 2738 --------
 src/declarative/qml/qmlcompiledbindings_p.h        |  116 -
 src/declarative/qml/qmlcompileddata.cpp            |  239 -
 src/declarative/qml/qmlcompiler.cpp                | 2779 --------
 src/declarative/qml/qmlcompiler_p.h                |  337 -
 src/declarative/qml/qmlcomponent.cpp               |  798 ---
 src/declarative/qml/qmlcomponent.h                 |  134 -
 src/declarative/qml/qmlcomponent_p.h               |  147 -
 src/declarative/qml/qmlcompositetypedata_p.h       |  152 -
 src/declarative/qml/qmlcompositetypemanager.cpp    |  670 --
 src/declarative/qml/qmlcompositetypemanager_p.h    |  117 -
 src/declarative/qml/qmlcontext.cpp                 |  574 --
 src/declarative/qml/qmlcontext.h                   |  107 -
 src/declarative/qml/qmlcontext_p.h                 |  195 -
 src/declarative/qml/qmlcontextscriptclass.cpp      |  275 -
 src/declarative/qml/qmlcontextscriptclass_p.h      |  101 -
 src/declarative/qml/qmlcustomparser.cpp            |  263 -
 src/declarative/qml/qmlcustomparser_p.h            |  142 -
 src/declarative/qml/qmlcustomparser_p_p.h          |   89 -
 src/declarative/qml/qmldeclarativedata_p.h         |  138 -
 src/declarative/qml/qmldirparser.cpp               |  220 -
 src/declarative/qml/qmldirparser_p.h               |  125 -
 src/declarative/qml/qmldom.cpp                     | 1836 -----
 src/declarative/qml/qmldom_p.h                     |  360 -
 src/declarative/qml/qmldom_p_p.h                   |  157 -
 src/declarative/qml/qmlengine.cpp                  | 1901 ------
 src/declarative/qml/qmlengine.h                    |  112 -
 src/declarative/qml/qmlengine_p.h                  |  340 -
 src/declarative/qml/qmlenginedebug.cpp             |  456 --
 src/declarative/qml/qmlenginedebug_p.h             |  121 -
 src/declarative/qml/qmlerror.cpp                   |  258 -
 src/declarative/qml/qmlerror.h                     |   86 -
 src/declarative/qml/qmlexpression.cpp              |  810 ---
 src/declarative/qml/qmlexpression.h                |  113 -
 src/declarative/qml/qmlexpression_p.h              |  189 -
 src/declarative/qml/qmlextensioninterface.h        |   67 -
 src/declarative/qml/qmlextensionplugin.cpp         |   87 -
 src/declarative/qml/qmlextensionplugin.h           |   72 -
 src/declarative/qml/qmlglobal_p.h                  |   91 -
 src/declarative/qml/qmlglobalscriptclass.cpp       |  121 -
 src/declarative/qml/qmlglobalscriptclass_p.h       |   83 -
 src/declarative/qml/qmlguard_p.h                   |  156 -
 src/declarative/qml/qmlimageprovider.cpp           |   68 -
 src/declarative/qml/qmlimageprovider.h             |   64 -
 src/declarative/qml/qmlinfo.cpp                    |  127 -
 src/declarative/qml/qmlinfo.h                      |   92 -
 src/declarative/qml/qmlinstruction.cpp             |  210 -
 src/declarative/qml/qmlinstruction_p.h             |  319 -
 src/declarative/qml/qmlintegercache.cpp            |   86 -
 src/declarative/qml/qmlintegercache_p.h            |  111 -
 src/declarative/qml/qmllist.cpp                    |  312 -
 src/declarative/qml/qmllist.h                      |  143 -
 src/declarative/qml/qmllist_p.h                    |   85 -
 src/declarative/qml/qmllistscriptclass.cpp         |  149 -
 src/declarative/qml/qmllistscriptclass_p.h         |   87 -
 src/declarative/qml/qmlmetaproperty.cpp            | 1238 ----
 src/declarative/qml/qmlmetaproperty.h              |  147 -
 src/declarative/qml/qmlmetaproperty_p.h            |  125 -
 src/declarative/qml/qmlmetatype.cpp                | 1153 ----
 src/declarative/qml/qmlmetatype.h                  |  281 -
 .../qml/qmlnetworkaccessmanagerfactory.cpp         |   84 -
 .../qml/qmlnetworkaccessmanagerfactory.h           |   66 -
 src/declarative/qml/qmlobjectscriptclass.cpp       |  673 --
 src/declarative/qml/qmlobjectscriptclass_p.h       |  144 -
 src/declarative/qml/qmlparser.cpp                  |  387 --
 src/declarative/qml/qmlparser_p.h                  |  357 -
 src/declarative/qml/qmlparserstatus.cpp            |   81 -
 src/declarative/qml/qmlparserstatus.h              |   75 -
 src/declarative/qml/qmlprivate.cpp                 |   48 -
 src/declarative/qml/qmlprivate.h                   |  211 -
 src/declarative/qml/qmlpropertycache.cpp           |  423 --
 src/declarative/qml/qmlpropertycache_p.h           |  196 -
 .../qml/qmlpropertyvalueinterceptor.cpp            |   79 -
 src/declarative/qml/qmlpropertyvalueinterceptor.h  |   68 -
 src/declarative/qml/qmlpropertyvaluesource.cpp     |   71 -
 src/declarative/qml/qmlpropertyvaluesource.h       |   67 -
 src/declarative/qml/qmlproxymetaobject.cpp         |  138 -
 src/declarative/qml/qmlproxymetaobject_p.h         |  100 -
 src/declarative/qml/qmlrefcount.cpp                |   70 -
 src/declarative/qml/qmlrefcount_p.h                |   80 -
 src/declarative/qml/qmlrewrite.cpp                 |  215 -
 src/declarative/qml/qmlrewrite_p.h                 |  121 -
 src/declarative/qml/qmlscript.cpp                  |   87 -
 src/declarative/qml/qmlscriptclass_p.h             |   89 -
 src/declarative/qml/qmlscriptparser.cpp            |  952 ---
 src/declarative/qml/qmlscriptparser_p.h            |  137 -
 src/declarative/qml/qmlscriptstring.cpp            |  155 -
 src/declarative/qml/qmlscriptstring.h              |   87 -
 src/declarative/qml/qmlsqldatabase.cpp             |  428 --
 src/declarative/qml/qmlsqldatabase_p.h             |   67 -
 src/declarative/qml/qmlstringconverters.cpp        |  276 -
 src/declarative/qml/qmlstringconverters_p.h        |   87 -
 src/declarative/qml/qmltypenamecache.cpp           |  103 -
 src/declarative/qml/qmltypenamecache_p.h           |  117 -
 src/declarative/qml/qmltypenamescriptclass.cpp     |  166 -
 src/declarative/qml/qmltypenamescriptclass_p.h     |   93 -
 src/declarative/qml/qmlvaluetype.cpp               |  706 --
 src/declarative/qml/qmlvaluetype_p.h               |  397 --
 src/declarative/qml/qmlvaluetypescriptclass.cpp    |  148 -
 src/declarative/qml/qmlvaluetypescriptclass_p.h    |   86 -
 src/declarative/qml/qmlvme.cpp                     |  851 ---
 src/declarative/qml/qmlvme_p.h                     |  119 -
 src/declarative/qml/qmlvmemetaobject.cpp           |  366 -
 src/declarative/qml/qmlvmemetaobject_p.h           |  157 -
 src/declarative/qml/qmlwatcher.cpp                 |  186 -
 src/declarative/qml/qmlwatcher_p.h                 |   94 -
 src/declarative/qml/qmlworkerscript.cpp            | 1041 ---
 src/declarative/qml/qmlworkerscript_p.h            |  160 -
 src/declarative/qml/qmlxmlhttprequest.cpp          | 1631 -----
 src/declarative/qml/qmlxmlhttprequest_p.h          |   67 -
 src/declarative/qml/rewriter/rewriter.cpp          |    8 +-
 src/declarative/qml/rewriter/rewriter_p.h          |    6 +-
 src/declarative/qml/rewriter/textwriter.cpp        |    2 +-
 src/declarative/qml/rewriter/textwriter_p.h        |    6 +-
 src/declarative/util/qdeclarativeanimation.cpp     | 2369 +++++++
 src/declarative/util/qdeclarativeanimation_p.h     |  467 ++
 src/declarative/util/qdeclarativeanimation_p_p.h   |  364 +
 src/declarative/util/qdeclarativebehavior.cpp      |  191 +
 src/declarative/util/qdeclarativebehavior_p.h      |   92 +
 src/declarative/util/qdeclarativebind.cpp          |  202 +
 src/declarative/util/qdeclarativebind_p.h          |   95 +
 src/declarative/util/qdeclarativeconnection.cpp    |  288 +
 src/declarative/util/qdeclarativeconnection_p.h    |   93 +
 .../util/qdeclarativedatetimeformatter.cpp         |  373 ++
 .../util/qdeclarativedatetimeformatter_p.h         |  117 +
 src/declarative/util/qdeclarativeeasefollow.cpp    |  536 ++
 src/declarative/util/qdeclarativeeasefollow_p.h    |  114 +
 src/declarative/util/qdeclarativefontloader.cpp    |  229 +
 src/declarative/util/qdeclarativefontloader_p.h    |   95 +
 src/declarative/util/qdeclarativelistaccessor.cpp  |  138 +
 src/declarative/util/qdeclarativelistaccessor_p.h  |   80 +
 src/declarative/util/qdeclarativelistmodel.cpp     |  983 +++
 src/declarative/util/qdeclarativelistmodel_p.h     |  139 +
 .../util/qdeclarativenullablevalue_p_p.h           |   81 +
 .../util/qdeclarativenumberformatter.cpp           |  261 +
 .../util/qdeclarativenumberformatter_p.h           |   93 +
 .../util/qdeclarativeopenmetaobject.cpp            |  355 +
 .../util/qdeclarativeopenmetaobject_p.h            |  125 +
 src/declarative/util/qdeclarativepackage.cpp       |  167 +
 src/declarative/util/qdeclarativepackage_p.h       |  104 +
 src/declarative/util/qdeclarativepixmapcache.cpp   |  611 ++
 src/declarative/util/qdeclarativepixmapcache_p.h   |  107 +
 .../util/qdeclarativepropertychanges.cpp           |  456 ++
 .../util/qdeclarativepropertychanges_p.h           |   95 +
 src/declarative/util/qdeclarativepropertymap.cpp   |  279 +
 src/declarative/util/qdeclarativepropertymap.h     |   90 +
 src/declarative/util/qdeclarativespringfollow.cpp  |  464 ++
 src/declarative/util/qdeclarativespringfollow_p.h  |  112 +
 src/declarative/util/qdeclarativestate.cpp         |  482 ++
 src/declarative/util/qdeclarativestate_p.h         |  181 +
 src/declarative/util/qdeclarativestate_p_p.h       |  152 +
 src/declarative/util/qdeclarativestategroup.cpp    |  440 ++
 src/declarative/util/qdeclarativestategroup_p.h    |   95 +
 .../util/qdeclarativestateoperations.cpp           |  833 +++
 .../util/qdeclarativestateoperations_p.h           |  184 +
 src/declarative/util/qdeclarativestyledtext.cpp    |  347 +
 src/declarative/util/qdeclarativestyledtext_p.h    |   69 +
 src/declarative/util/qdeclarativesystempalette.cpp |  303 +
 src/declarative/util/qdeclarativesystempalette_p.h |  122 +
 src/declarative/util/qdeclarativetimeline.cpp      |  942 +++
 src/declarative/util/qdeclarativetimeline_p_p.h    |  200 +
 src/declarative/util/qdeclarativetimer.cpp         |  313 +
 src/declarative/util/qdeclarativetimer_p.h         |  109 +
 src/declarative/util/qdeclarativetransition.cpp    |  249 +
 src/declarative/util/qdeclarativetransition_p.h    |  101 +
 .../util/qdeclarativetransitionmanager.cpp         |  282 +
 .../util/qdeclarativetransitionmanager_p_p.h       |   85 +
 src/declarative/util/qdeclarativeutilmodule.cpp    |  118 +
 src/declarative/util/qdeclarativeutilmodule_p.h    |   63 +
 src/declarative/util/qdeclarativeview.cpp          |  570 ++
 src/declarative/util/qdeclarativeview.h            |  114 +
 src/declarative/util/qdeclarativexmllistmodel.cpp  |  796 +++
 src/declarative/util/qdeclarativexmllistmodel_p.h  |  174 +
 src/declarative/util/qfxperf.cpp                   |   22 +-
 src/declarative/util/qfxperf_p_p.h                 |    8 +-
 src/declarative/util/qmlanimation.cpp              | 2369 -------
 src/declarative/util/qmlanimation_p.h              |  467 --
 src/declarative/util/qmlanimation_p_p.h            |  364 -
 src/declarative/util/qmlbehavior.cpp               |  191 -
 src/declarative/util/qmlbehavior_p.h               |   92 -
 src/declarative/util/qmlbind.cpp                   |  202 -
 src/declarative/util/qmlbind_p.h                   |   95 -
 src/declarative/util/qmlconnection.cpp             |  288 -
 src/declarative/util/qmlconnection_p.h             |   93 -
 src/declarative/util/qmldatetimeformatter.cpp      |  373 --
 src/declarative/util/qmldatetimeformatter_p.h      |  117 -
 src/declarative/util/qmleasefollow.cpp             |  536 --
 src/declarative/util/qmleasefollow_p.h             |  114 -
 src/declarative/util/qmlfontloader.cpp             |  229 -
 src/declarative/util/qmlfontloader_p.h             |   95 -
 src/declarative/util/qmlgraphicsutilmodule.cpp     |  118 -
 src/declarative/util/qmlgraphicsutilmodule_p.h     |   63 -
 src/declarative/util/qmllistaccessor.cpp           |  138 -
 src/declarative/util/qmllistaccessor_p.h           |   80 -
 src/declarative/util/qmllistmodel.cpp              |  983 ---
 src/declarative/util/qmllistmodel_p.h              |  139 -
 src/declarative/util/qmlnullablevalue_p_p.h        |   81 -
 src/declarative/util/qmlnumberformatter.cpp        |  261 -
 src/declarative/util/qmlnumberformatter_p.h        |   93 -
 src/declarative/util/qmlopenmetaobject.cpp         |  355 -
 src/declarative/util/qmlopenmetaobject_p.h         |  125 -
 src/declarative/util/qmlpackage.cpp                |  167 -
 src/declarative/util/qmlpackage_p.h                |  104 -
 src/declarative/util/qmlpixmapcache.cpp            |  611 --
 src/declarative/util/qmlpixmapcache_p.h            |  107 -
 src/declarative/util/qmlpropertychanges.cpp        |  456 --
 src/declarative/util/qmlpropertychanges_p.h        |   95 -
 src/declarative/util/qmlpropertymap.cpp            |  279 -
 src/declarative/util/qmlpropertymap.h              |   90 -
 src/declarative/util/qmlspringfollow.cpp           |  464 --
 src/declarative/util/qmlspringfollow_p.h           |  112 -
 src/declarative/util/qmlstate.cpp                  |  482 --
 src/declarative/util/qmlstate_p.h                  |  181 -
 src/declarative/util/qmlstate_p_p.h                |  152 -
 src/declarative/util/qmlstategroup.cpp             |  440 --
 src/declarative/util/qmlstategroup_p.h             |   95 -
 src/declarative/util/qmlstateoperations.cpp        |  833 ---
 src/declarative/util/qmlstateoperations_p.h        |  184 -
 src/declarative/util/qmlstyledtext.cpp             |  347 -
 src/declarative/util/qmlstyledtext_p.h             |   69 -
 src/declarative/util/qmlsystempalette.cpp          |  303 -
 src/declarative/util/qmlsystempalette_p.h          |  122 -
 src/declarative/util/qmltimeline.cpp               |  942 ---
 src/declarative/util/qmltimeline_p_p.h             |  200 -
 src/declarative/util/qmltimer.cpp                  |  313 -
 src/declarative/util/qmltimer_p.h                  |  109 -
 src/declarative/util/qmltransition.cpp             |  249 -
 src/declarative/util/qmltransition_p.h             |  101 -
 src/declarative/util/qmltransitionmanager.cpp      |  282 -
 src/declarative/util/qmltransitionmanager_p_p.h    |   85 -
 src/declarative/util/qmlview.cpp                   |  570 --
 src/declarative/util/qmlview.h                     |  114 -
 src/declarative/util/qmlxmllistmodel.cpp           |  796 ---
 src/declarative/util/qmlxmllistmodel_p.h           |  174 -
 src/declarative/util/qnumberformat_p.h             |    2 +-
 src/declarative/util/util.pri                      |  118 +-
 src/gui/graphicsview/qgraphicsitem_p.h             |    2 +-
 src/multimedia/qml/qdeclarative.cpp                |   70 +
 src/multimedia/qml/qdeclarative.h                  |   62 +
 src/multimedia/qml/qdeclarativeaudio.cpp           |  326 +
 src/multimedia/qml/qdeclarativeaudio_p.h           |  162 +
 src/multimedia/qml/qdeclarativemediabase.cpp       |  413 ++
 src/multimedia/qml/qdeclarativemediabase_p.h       |  158 +
 src/multimedia/qml/qdeclarativevideo.cpp           |  944 +++
 src/multimedia/qml/qdeclarativevideo_p.h           |  193 +
 src/multimedia/qml/qml.cpp                         |   70 -
 src/multimedia/qml/qml.h                           |   62 -
 src/multimedia/qml/qml.pri                         |   16 +-
 src/multimedia/qml/qmlaudio.cpp                    |  326 -
 src/multimedia/qml/qmlaudio_p.h                    |  162 -
 src/multimedia/qml/qmlgraphicsvideo.cpp            |  944 ---
 src/multimedia/qml/qmlgraphicsvideo_p.h            |  193 -
 src/multimedia/qml/qmlmediabase.cpp                |  413 --
 src/multimedia/qml/qmlmediabase_p.h                |  158 -
 src/multimedia/qml/qsoundeffect_p.h                |    2 +-
 src/plugins/plugins.pro                            |    2 +-
 .../qdeclarativemodules/multimedia/multimedia.cpp  |   63 +
 .../qdeclarativemodules/multimedia/multimedia.pro  |   11 +
 .../qdeclarativemodules/qdeclarativemodules.pro    |    6 +
 .../widgets/graphicslayouts.cpp                    |  260 +
 .../widgets/graphicslayouts_p.h                    |  226 +
 .../widgets/graphicswidgets.cpp                    |   40 +
 .../widgets/graphicswidgets_p.h                    |   68 +
 .../qdeclarativemodules/widgets/widgets.cpp        |  146 +
 .../qdeclarativemodules/widgets/widgets.pro        |   15 +
 src/plugins/qmlmodules/multimedia/multimedia.cpp   |   63 -
 src/plugins/qmlmodules/multimedia/multimedia.pro   |   11 -
 src/plugins/qmlmodules/qmlmodules.pro              |    6 -
 src/plugins/qmlmodules/widgets/graphicslayouts.cpp |  260 -
 src/plugins/qmlmodules/widgets/graphicslayouts_p.h |  226 -
 src/plugins/qmlmodules/widgets/graphicswidgets.cpp |   40 -
 src/plugins/qmlmodules/widgets/graphicswidgets_p.h |   68 -
 src/plugins/qmlmodules/widgets/widgets.cpp         |  146 -
 src/plugins/qmlmodules/widgets/widgets.pro         |   15 -
 tests/auto/auto.pro                                |    4 +-
 tests/auto/declarative/declarative.pro             |  110 +-
 tests/auto/declarative/examples/tst_examples.cpp   |   11 +-
 .../graphicswidgets/tst_graphicswidgets.cpp        |   10 +-
 tests/auto/declarative/layouts/tst_layouts.cpp     |   20 +-
 .../declarative/parserstress/tst_parserstress.cpp  |    8 +-
 .../qdeclarativeanchors/data/anchors.qml           |  162 +
 .../qdeclarativeanchors/data/centerin.qml          |   12 +
 .../qdeclarativeanchors/data/crash1.qml            |   11 +
 .../declarative/qdeclarativeanchors/data/fill.qml  |   14 +
 .../declarative/qdeclarativeanchors/data/loop1.qml |    8 +
 .../declarative/qdeclarativeanchors/data/loop2.qml |   20 +
 .../qdeclarativeanchors/data/margins.qml           |   13 +
 .../qdeclarativeanchors/qdeclarativeanchors.pro    |    6 +
 .../tst_qdeclarativeanchors.cpp                    |  448 ++
 .../qdeclarativeanimatedimage/data/colors.gif      |  Bin 0 -> 505 bytes
 .../qdeclarativeanimatedimage/data/colors.qml      |    5 +
 .../qdeclarativeanimatedimage/data/stickman.gif    |  Bin 0 -> 164923 bytes
 .../qdeclarativeanimatedimage/data/stickman.qml    |    5 +
 .../data/stickmanpause.qml                         |    7 +
 .../data/stickmanstopped.qml                       |    6 +
 .../qdeclarativeanimatedimage.pro                  |    7 +
 .../tst_qdeclarativeanimatedimage.cpp              |  191 +
 .../qdeclarativeanimations/data/attached.qml       |   34 +
 .../qdeclarativeanimations/data/badproperty1.qml   |   21 +
 .../qdeclarativeanimations/data/badproperty2.qml   |   21 +
 .../qdeclarativeanimations/data/badtype1.qml       |   12 +
 .../qdeclarativeanimations/data/badtype2.qml       |   12 +
 .../qdeclarativeanimations/data/badtype3.qml       |   12 +
 .../qdeclarativeanimations/data/badtype4.qml       |   27 +
 .../qdeclarativeanimations/data/dontAutoStart.qml  |   18 +
 .../qdeclarativeanimations/data/dontStart.qml      |   19 +
 .../qdeclarativeanimations/data/dontStart2.qml     |   19 +
 .../qdeclarativeanimations/data/dotproperty.qml    |   24 +
 .../qdeclarativeanimations/data/mixedtype1.qml     |   25 +
 .../qdeclarativeanimations/data/mixedtype2.qml     |   25 +
 .../qdeclarativeanimations/data/properties.qml     |   14 +
 .../qdeclarativeanimations/data/properties2.qml    |   14 +
 .../qdeclarativeanimations/data/properties3.qml    |   14 +
 .../qdeclarativeanimations/data/properties4.qml    |   14 +
 .../qdeclarativeanimations/data/properties5.qml    |   14 +
 .../data/propertiesTransition.qml                  |   29 +
 .../data/propertiesTransition2.qml                 |   29 +
 .../data/propertiesTransition3.qml                 |   29 +
 .../data/propertiesTransition4.qml                 |   29 +
 .../data/propertiesTransition5.qml                 |   29 +
 .../data/propertiesTransition6.qml                 |   29 +
 .../qdeclarativeanimations/data/valuesource.qml    |   14 +
 .../qdeclarativeanimations/data/valuesource2.qml   |   14 +
 .../qdeclarativeanimations.pro                     |    6 +
 .../tst_qdeclarativeanimations.cpp                 |  672 ++
 .../qdeclarativebehaviors/data/binding.qml         |   26 +
 .../qdeclarativebehaviors/data/color.qml           |   24 +
 .../qdeclarativebehaviors/data/cpptrigger.qml      |   11 +
 .../qdeclarativebehaviors/data/disabled.qml        |   27 +
 .../qdeclarativebehaviors/data/dontStart.qml       |   18 +
 .../qdeclarativebehaviors/data/empty.qml           |   23 +
 .../qdeclarativebehaviors/data/explicit.qml        |   26 +
 .../qdeclarativebehaviors/data/groupProperty.qml   |   23 +
 .../qdeclarativebehaviors/data/groupProperty2.qml  |   23 +
 .../qdeclarativebehaviors/data/loop.qml            |   19 +
 .../qdeclarativebehaviors/data/nonSelecting2.qml   |   26 +
 .../qdeclarativebehaviors/data/parent.qml          |   28 +
 .../data/reassignedAnimation.qml                   |   27 +
 .../qdeclarativebehaviors/data/scripttrigger.qml   |   16 +
 .../qdeclarativebehaviors/data/simple.qml          |   26 +
 .../qdeclarativebehaviors.pro                      |    6 +
 .../tst_qdeclarativebehaviors.cpp                  |  301 +
 .../qdeclarativebinding/data/test-binding.qml      |   16 +
 .../qdeclarativebinding/data/test-binding2.qml     |   16 +
 .../qdeclarativebinding/qdeclarativebinding.pro    |    8 +
 .../tst_qdeclarativebinding.cpp                    |  107 +
 .../qdeclarativeborderimage/data/colors-round.sci  |    7 +
 .../qdeclarativeborderimage/data/colors.png        |  Bin 0 -> 1655 bytes
 .../qdeclarativeborderimage/data/invalid.sci       |    7 +
 .../qdeclarativeborderimage.pro                    |    9 +
 .../tst_qdeclarativeborderimage.cpp                |  351 +
 .../data/test-connection.qml                       |   10 +
 .../data/test-connection2.qml                      |    3 +
 .../data/test-connection3.qml                      |    3 +
 .../qdeclarativeconnection/data/trimming.qml       |   10 +
 .../qdeclarativeconnection.pro                     |    8 +
 .../tst_qdeclarativeconnection.cpp                 |  139 +
 .../qdeclarativecontext/qdeclarativecontext.pro    |    6 +
 .../tst_qdeclarativecontext.cpp                    |  434 ++
 .../qdeclarativedatetimeformatter.pro              |    5 +
 .../tst_qdeclarativedatetimeformatter.cpp          |  150 +
 .../qdeclarativedebug/qdeclarativedebug.pro        |    7 +
 .../qdeclarativedebug/tst_qdeclarativedebug.cpp    |  841 +++
 .../qdeclarativedebugclient.pro                    |    7 +
 .../tst_qdeclarativedebugclient.cpp                |  157 +
 .../qdeclarativedebugservice.pro                   |    7 +
 .../tst_qdeclarativedebugservice.cpp               |  190 +
 .../qdeclarativedom/data/MyComponent.qml           |    4 +
 .../declarative/qdeclarativedom/data/MyItem.qml    |    4 +
 .../qdeclarativedom/data/importdir/Bar.qml         |    2 +
 .../data/importlib/sublib/qmldir/Foo.qml           |    2 +
 .../auto/declarative/qdeclarativedom/data/top.qml  |    6 +
 .../qdeclarativedom/qdeclarativedom.pro            |    7 +
 .../qdeclarativedom/tst_qdeclarativedom.cpp        | 1313 ++++
 .../qdeclarativeeasefollow/data/easefollow1.qml    |    3 +
 .../qdeclarativeeasefollow/data/easefollow2.qml    |    5 +
 .../qdeclarativeeasefollow/data/easefollow3.qml    |    6 +
 .../qdeclarativeeasefollow.pro                     |    8 +
 .../tst_qdeclarativeeasefollow.cpp                 |  122 +
 .../data/ConstantsOverrideBindings.qml             |    6 +
 .../qdeclarativeecmascript/data/CustomObject.qml   |    5 +
 .../qdeclarativeecmascript/data/MethodsObject.qml  |    6 +
 .../data/NestedTypeTransientErrors.qml             |   11 +
 .../qdeclarativeecmascript/data/ScopeObject.qml    |   14 +
 .../data/TypeForDynamicCreation.qml                |    2 +
 .../data/aliasPropertyAndBinding.qml               |   14 +
 .../data/assignBasicTypes.2.qml                    |   26 +
 .../data/assignBasicTypes.qml                      |   29 +
 .../data/attachedProperty.qml                      |   11 +
 .../qdeclarativeecmascript/data/bindingLoop.qml    |   14 +
 .../data/boolPropertiesEvaluateAsBool.1.qml        |    5 +
 .../data/boolPropertiesEvaluateAsBool.2.qml        |    5 +
 .../qdeclarativeecmascript/data/bug.1.qml          |   10 +
 .../data/compositePropertyType.qml                 |    8 +
 .../data/constantsOverrideBindings.1.qml           |    8 +
 .../data/constantsOverrideBindings.2.qml           |   11 +
 .../data/constantsOverrideBindings.3.qml           |    7 +
 .../data/deferredProperties.qml                    |   10 +
 .../qdeclarativeecmascript/data/deletedObject.qml  |   25 +
 .../data/dynamicCreation.helper.qml                |    6 +
 .../data/dynamicCreation.qml                       |   21 +
 .../data/dynamicDeletion.qml                       |   20 +
 .../qdeclarativeecmascript/data/enums.1.qml        |   20 +
 .../qdeclarativeecmascript/data/enums.2.qml        |    8 +
 .../data/exceptionClearsOnReeval.qml               |    6 +
 .../data/exceptionProducesWarning.qml              |    8 +
 .../data/exceptionProducesWarning2.qml             |    7 +
 .../data/extendedObjectPropertyLookup.qml          |    8 +
 .../data/extensionObjects.qml                      |   10 +
 .../data/externalScript.1.qml                      |   11 +
 .../data/externalScript.2.js                       |    8 +
 .../data/externalScript.2.qml                      |   11 +
 .../data/externalScript.3.qml                      |   13 +
 .../data/externalScript.4.qml                      |   15 +
 .../qdeclarativeecmascript/data/externalScript.js  |    6 +
 .../data/idShortcutInvalidates.1.qml               |   13 +
 .../data/idShortcutInvalidates.qml                 |   12 +
 .../qdeclarativeecmascript/data/jsObject.qml       |   12 +
 .../qdeclarativeecmascript/data/listProperties.qml |   27 +
 .../qdeclarativeecmascript/data/listToVariant.qml  |    5 +
 .../qdeclarativeecmascript/data/methods.1.qml      |    6 +
 .../qdeclarativeecmascript/data/methods.2.qml      |    6 +
 .../qdeclarativeecmascript/data/methods.3.qml      |    7 +
 .../qdeclarativeecmascript/data/methods.4.qml      |   11 +
 .../qdeclarativeecmascript/data/methods.5.qml      |    9 +
 .../data/multiEngineObject.qml                     |    5 +
 .../data/nonExistantAttachedObject.qml             |    5 +
 .../data/objectsCompareAsEqual.qml                 |   15 +
 .../data/outerBindingOverridesInnerBinding.qml     |   14 +
 .../data/qdeclarativeToString.qml                  |   11 +
 .../qdeclarativeecmascript/data/scope.2.qml        |   42 +
 .../qdeclarativeecmascript/data/scope.qml          |   48 +
 .../qdeclarativeecmascript/data/scriptAccess.js    |    7 +
 .../qdeclarativeecmascript/data/scriptAccess.qml   |   17 +
 .../qdeclarativeecmascript/data/scriptErrors.js    |    2 +
 .../qdeclarativeecmascript/data/scriptErrors.qml   |   17 +
 .../data/selfDeletingBinding.2.qml                 |   17 +
 .../data/selfDeletingBinding.qml                   |   18 +
 .../qdeclarativeecmascript/data/shutdownErrors.qml |   13 +
 .../data/signalAssignment.1.qml                    |    5 +
 .../data/signalAssignment.2.qml                    |    5 +
 .../data/signalParameterTypes.qml                  |   16 +
 .../data/signalTriggeredBindings.qml               |   20 +
 .../data/transientErrors.qml                       |   10 +
 .../data/undefinedResetsProperty.2.qml             |   10 +
 .../data/undefinedResetsProperty.qml               |    7 +
 .../data/valueTypeFunctions.qml                    |    6 +
 .../qdeclarativeecmascript.pro                     |   10 +
 .../qdeclarativeecmascript/testtypes.cpp           |   85 +
 .../declarative/qdeclarativeecmascript/testtypes.h |  598 ++
 .../tst_qdeclarativeecmascript.cpp                 | 1662 +++++
 .../qdeclarativeengine/qdeclarativeengine.pro      |    8 +
 .../qdeclarativeengine/tst_qdeclarativeengine.cpp  |  240 +
 .../qdeclarativeerror/qdeclarativeerror.pro        |    6 +
 tests/auto/declarative/qdeclarativeerror/test.txt  |    3 +
 .../qdeclarativeerror/tst_qdeclarativeerror.cpp    |  242 +
 .../qdeclarativeflickable/data/flickable01.qml     |    4 +
 .../qdeclarativeflickable/data/flickable02.qml     |   14 +
 .../qdeclarativeflickable/data/flickable03.qml     |   14 +
 .../qdeclarativeflickable/data/flickable04.qml     |   16 +
 .../qdeclarativeflickable.pro                      |    8 +
 .../tst_qdeclarativeflickable.cpp                  |  224 +
 .../qdeclarativeflipable/data/test-flipable.qml    |    9 +
 .../qdeclarativeflipable/qdeclarativeflipable.pro  |    8 +
 .../tst_qdeclarativeflipable.cpp                   |  113 +
 .../qdeclarativefontloader/data/dummy.ttf          |    0
 .../qdeclarativefontloader/data/tarzeau_ocr_a.ttf  |  Bin 0 -> 24544 bytes
 .../qdeclarativefontloader.pro                     |    8 +
 .../tst_qdeclarativefontloader.cpp                 |  156 +
 .../data/gridview-initCurrent.qml                  |   51 +
 .../qdeclarativegridview/data/gridview.qml         |   50 +
 .../qdeclarativegridview/data/gridview2.qml        |   26 +
 .../qdeclarativegridview/data/gridview3.qml        |    6 +
 .../qdeclarativegridview/qdeclarativegridview.pro  |    8 +
 .../tst_qdeclarativegridview.cpp                   |  964 +++
 .../declarative/qdeclarativeimage/data/colors.png  |  Bin 0 -> 1655 bytes
 .../qdeclarativeimage/qdeclarativeimage.pro        |    9 +
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp    |  247 +
 .../qdeclarativeimageprovider/data/exists.png      |  Bin 0 -> 2738 bytes
 .../qdeclarativeimageprovider/data/exists1.png     |  Bin 0 -> 2738 bytes
 .../qdeclarativeimageprovider/data/exists2.png     |  Bin 0 -> 2738 bytes
 .../qdeclarativeimageprovider.pro                  |   12 +
 .../tst_qdeclarativeimageprovider.cpp              |  166 +
 .../qdeclarativeinfo/data/NestedObject.qml         |    8 +
 .../qdeclarativeinfo/data/nestedQmlObject.qml      |    8 +
 .../qdeclarativeinfo/data/qdeclarativeObject.qml   |    8 +
 .../qdeclarativeinfo/qdeclarativeinfo.pro          |    7 +
 .../qdeclarativeinfo/tst_qdeclarativeinfo.cpp      |  139 +
 .../qdeclarativeinstruction.pro                    |    6 +
 .../tst_qdeclarativeinstruction.cpp                |  585 ++
 .../qdeclarativeitem/data/keynavigation.qml        |   39 +
 .../declarative/qdeclarativeitem/data/keys.qml     |   18 +
 .../qdeclarativeitem/qdeclarativeitem.pro          |    7 +
 .../qdeclarativeitem/tst_qdeclarativeitem.cpp      |  318 +
 .../qdeclarativelanguage/data/Alias.qml            |    8 +
 .../qdeclarativelanguage/data/Alias2.qml           |    9 +
 .../qdeclarativelanguage/data/Alias3.qml           |   12 +
 .../qdeclarativelanguage/data/Alias4.qml           |    5 +
 .../data/ComponentComposite.qml                    |    5 +
 .../qdeclarativelanguage/data/CompositeType.qml    |    4 +
 .../qdeclarativelanguage/data/CompositeType2.qml   |    5 +
 .../qdeclarativelanguage/data/CompositeType3.qml   |    5 +
 .../qdeclarativelanguage/data/CompositeType4.qml   |    6 +
 .../data/DynamicPropertiesNestedType.qml           |    6 +
 .../qdeclarativelanguage/data/HelperAlias.qml      |    9 +
 .../declarative/qdeclarativelanguage/data/I18n.qml |    6 +
 .../qdeclarativelanguage/data/I18nType30.qml       |    5 +
 .../qdeclarativelanguage/data/MyComponent.qml      |    6 +
 .../data/MyCompositeValueSource.qml                |    6 +
 .../data/MyContainerComponent.qml                  |    5 +
 .../qdeclarativelanguage/data/NestedAlias.qml      |   14 +
 .../qdeclarativelanguage/data/NestedErrorsType.qml |    5 +
 .../qdeclarativelanguage/data/OnCompletedType.qml  |    8 +
 .../qdeclarativelanguage/data/alias.1.qml          |    8 +
 .../qdeclarativelanguage/data/alias.2.qml          |    8 +
 .../qdeclarativelanguage/data/alias.3.qml          |   10 +
 .../qdeclarativelanguage/data/alias.4.qml          |    6 +
 .../qdeclarativelanguage/data/alias.5.qml          |   13 +
 .../qdeclarativelanguage/data/alias.6.qml          |    8 +
 .../qdeclarativelanguage/data/alias.7.qml          |   14 +
 .../qdeclarativelanguage/data/alias.8.qml          |    9 +
 .../qdeclarativelanguage/data/alias.9.qml          |    9 +
 .../qdeclarativelanguage/data/assignBasicTypes.qml |   29 +
 .../data/assignCompositeToType.qml                 |   18 +
 .../data/assignLiteralSignalProperty.qml           |    4 +
 .../data/assignObjectToSignal.qml                  |    4 +
 .../data/assignObjectToVariant.qml                 |    7 +
 .../data/assignQmlComponent.qml                    |    4 +
 .../qdeclarativelanguage/data/assignSignal.qml     |    5 +
 .../data/assignTypeExtremes.qml                    |    5 +
 .../data/attachedProperties.qml                    |    8 +
 .../data/autoComponentCreation.qml                 |    4 +
 .../data/component.1.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/component.1.qml      |    4 +
 .../data/component.2.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/component.2.qml      |    9 +
 .../data/component.3.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/component.3.qml      |    9 +
 .../data/component.4.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/component.4.qml      |    6 +
 .../data/component.5.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/component.5.qml      |    6 +
 .../data/component.6.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/component.6.qml      |    6 +
 .../data/componentCompositeType.qml                |    8 +
 .../qdeclarativelanguage/data/cppnamespace.2.qml   |    5 +
 .../qdeclarativelanguage/data/cppnamespace.qml     |    4 +
 .../qdeclarativelanguage/data/crash2.qml           |    5 +
 .../data/customParserIdNotAllowed.errors.txt       |    1 +
 .../data/customParserIdNotAllowed.qml              |    5 +
 .../data/customParserTypes.qml                     |    5 +
 .../data/customVariantTypes.qml                    |    4 +
 .../data/declaredPropertyValues.qml                |    8 +
 .../data/defaultGrouped.errors.txt                 |    1 +
 .../qdeclarativelanguage/data/defaultGrouped.qml   |   10 +
 .../data/defaultPropertyListOrder.qml              |   29 +
 .../data/doubleSignal.errors.txt                   |    1 +
 .../qdeclarativelanguage/data/doubleSignal.qml     |    7 +
 .../data/duplicateIDs.errors.txt                   |    1 +
 .../qdeclarativelanguage/data/duplicateIDs.qml     |    6 +
 .../qdeclarativelanguage/data/dynamicObject.1.qml  |    8 +
 .../data/dynamicObjectProperties.qml               |   13 +
 .../data/dynamicProperties.qml                     |   14 +
 .../data/dynamicPropertiesNested.qml               |    9 +
 .../data/dynamicSignalsAndSlots.qml                |   10 +
 .../qdeclarativelanguage/data/empty.errors.txt     |    2 +
 .../qdeclarativelanguage/data/empty.qml            |    0
 .../data/emptySignal.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/emptySignal.qml      |    6 +
 .../data/failingComponent.errors.txt               |    1 +
 .../data/failingComponentTest.qml                  |    4 +
 .../data/fakeDotProperty.errors.txt                |    1 +
 .../qdeclarativelanguage/data/fakeDotProperty.qml  |    4 +
 .../data/finalOverride.errors.txt                  |    1 +
 .../qdeclarativelanguage/data/finalOverride.qml    |    4 +
 .../data/i18nDeclaredPropertyNames.qml             |    6 +
 .../data/i18nDeclaredPropertyUse.qml               |    3 +
 .../qdeclarativelanguage/data/i18nNameSpace.qml    |    5 +
 .../qdeclarativelanguage/data/i18nScript.qml       |   12 +
 .../qdeclarativelanguage/data/i18nStrings.qml      |    5 +
 .../qdeclarativelanguage/data/i18nType.qml         |    1 +
 .../qdeclarativelanguage/data/idProperty.qml       |    8 +
 .../data/importNamespaceConflict.errors.txt        |    1 +
 .../data/importNamespaceConflict.qml               |    4 +
 .../data/importVersionMissingBuiltIn.errors.txt    |    1 +
 .../data/importVersionMissingBuiltIn.qml           |    7 +
 .../data/importVersionMissingInstalled.errors.txt  |    1 +
 .../data/importVersionMissingInstalled.qml         |    3 +
 .../data/inlineQmlComponents.qml                   |   10 +
 .../data/interfaceProperty.qml                     |    5 +
 .../qdeclarativelanguage/data/interfaceQList.qml   |    7 +
 .../data/invalidAttachedProperty.1.errors.txt      |    1 +
 .../data/invalidAttachedProperty.1.qml             |    7 +
 .../data/invalidAttachedProperty.10.errors.txt     |    1 +
 .../data/invalidAttachedProperty.10.qml            |    6 +
 .../data/invalidAttachedProperty.11.errors.txt     |    1 +
 .../data/invalidAttachedProperty.11.qml            |    7 +
 .../data/invalidAttachedProperty.2.errors.txt      |    1 +
 .../data/invalidAttachedProperty.2.qml             |    6 +
 .../data/invalidAttachedProperty.3.errors.txt      |    1 +
 .../data/invalidAttachedProperty.3.qml             |    8 +
 .../data/invalidAttachedProperty.4.errors.txt      |    1 +
 .../data/invalidAttachedProperty.4.qml             |    7 +
 .../data/invalidAttachedProperty.5.errors.txt      |    1 +
 .../data/invalidAttachedProperty.5.qml             |    7 +
 .../data/invalidAttachedProperty.6.errors.txt      |    1 +
 .../data/invalidAttachedProperty.6.qml             |    7 +
 .../data/invalidAttachedProperty.7.errors.txt      |    1 +
 .../data/invalidAttachedProperty.7.qml             |    6 +
 .../data/invalidAttachedProperty.8.errors.txt      |    1 +
 .../data/invalidAttachedProperty.8.qml             |    6 +
 .../data/invalidAttachedProperty.9.errors.txt      |    1 +
 .../data/invalidAttachedProperty.9.qml             |    7 +
 .../data/invalidGroupedProperty.1.errors.txt       |    1 +
 .../data/invalidGroupedProperty.1.qml              |    6 +
 .../data/invalidGroupedProperty.2.errors.txt       |    1 +
 .../data/invalidGroupedProperty.2.qml              |    7 +
 .../data/invalidGroupedProperty.3.errors.txt       |    1 +
 .../data/invalidGroupedProperty.3.qml              |    5 +
 .../data/invalidGroupedProperty.4.errors.txt       |    1 +
 .../data/invalidGroupedProperty.4.qml              |    5 +
 .../data/invalidGroupedProperty.5.errors.txt       |    1 +
 .../data/invalidGroupedProperty.5.qml              |    5 +
 .../data/invalidGroupedProperty.6.errors.txt       |    1 +
 .../data/invalidGroupedProperty.6.qml              |    6 +
 .../data/invalidGroupedProperty.7.errors.txt       |    1 +
 .../data/invalidGroupedProperty.7.qml              |    5 +
 .../data/invalidID.2.errors.txt                    |    2 +
 .../qdeclarativelanguage/data/invalidID.2.qml      |    5 +
 .../data/invalidID.3.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/invalidID.3.qml      |    5 +
 .../data/invalidID.4.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/invalidID.4.qml      |    6 +
 .../data/invalidID.5.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/invalidID.5.qml      |    6 +
 .../data/invalidID.6.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/invalidID.6.qml      |    5 +
 .../qdeclarativelanguage/data/invalidID.errors.txt |    1 +
 .../qdeclarativelanguage/data/invalidID.qml        |    4 +
 .../data/invalidImportID.errors.txt                |    1 +
 .../qdeclarativelanguage/data/invalidImportID.qml  |    4 +
 .../data/invalidRoot.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/invalidRoot.qml      |    2 +
 .../lib/com/nokia/installedtest/InstalledTest.qml  |    2 +
 .../lib/com/nokia/installedtest/InstalledTest2.qml |    2 +
 .../lib/com/nokia/installedtest/PrivateType.qml    |    2 +
 .../data/lib/com/nokia/installedtest/qmldir        |    4 +
 .../data/listAssignment.2.errors.txt               |    2 +
 .../qdeclarativelanguage/data/listAssignment.2.qml |    4 +
 .../data/listAssignment.3.errors.txt               |    1 +
 .../qdeclarativelanguage/data/listAssignment.3.qml |    6 +
 .../data/listItemDeleteSelf.qml                    |   38 +
 .../qdeclarativelanguage/data/listProperties.qml   |    9 +
 .../data/missingObject.errors.txt                  |    1 +
 .../qdeclarativelanguage/data/missingObject.qml    |    1 +
 .../data/missingSignal.errors.txt                  |    1 +
 .../qdeclarativelanguage/data/missingSignal.qml    |    5 +
 .../data/missingValueTypeProperty.errors.txt       |    1 +
 .../data/missingValueTypeProperty.qml              |    5 +
 .../data/nestedErrors.errors.txt                   |    2 +
 .../qdeclarativelanguage/data/nestedErrors.qml     |    6 +
 .../data/nonexistantProperty.1.errors.txt          |    1 +
 .../data/nonexistantProperty.1.qml                 |    2 +
 .../data/nonexistantProperty.2.errors.txt          |    1 +
 .../data/nonexistantProperty.2.qml                 |    4 +
 .../data/nonexistantProperty.3.errors.txt          |    1 +
 .../data/nonexistantProperty.3.qml                 |    4 +
 .../data/nonexistantProperty.4.errors.txt          |    1 +
 .../data/nonexistantProperty.4.qml                 |    4 +
 .../data/nonexistantProperty.5.errors.txt          |    1 +
 .../data/nonexistantProperty.5.qml                 |    4 +
 .../data/nonexistantProperty.6.errors.txt          |    1 +
 .../data/nonexistantProperty.6.qml                 |    4 +
 .../data/nullDotProperty.errors.txt                |    1 +
 .../qdeclarativelanguage/data/nullDotProperty.qml  |    4 +
 .../data/objectValueTypeProperty.errors.txt        |    1 +
 .../data/objectValueTypeProperty.qml               |    6 +
 .../qdeclarativelanguage/data/onCompleted.qml      |   17 +
 .../data/property.1.errors.txt                     |    1 +
 .../qdeclarativelanguage/data/property.1.qml       |    5 +
 .../data/property.2.errors.txt                     |    1 +
 .../qdeclarativelanguage/data/property.2.qml       |    6 +
 .../data/property.3.errors.txt                     |    1 +
 .../qdeclarativelanguage/data/property.3.qml       |    7 +
 .../data/property.4.errors.txt                     |    1 +
 .../qdeclarativelanguage/data/property.4.qml       |    5 +
 .../data/property.5.errors.txt                     |    1 +
 .../qdeclarativelanguage/data/property.5.qml       |    6 +
 .../data/propertyValueSource.2.qml                 |    5 +
 .../data/propertyValueSource.qml                   |    4 +
 ...declarativeAttachedPropertiesObjectMethod.1.qml |    5 +
 ...declarativeAttachedPropertiesObjectMethod.2.qml |    6 +
 .../data/readOnly.1.errors.txt                     |    1 +
 .../qdeclarativelanguage/data/readOnly.1.qml       |    4 +
 .../data/readOnly.2.errors.txt                     |    1 +
 .../qdeclarativelanguage/data/readOnly.2.qml       |    4 +
 .../data/readOnly.3.errors.txt                     |    1 +
 .../qdeclarativelanguage/data/readOnly.3.qml       |    8 +
 .../data/rootAsQmlComponent.qml                    |    6 +
 .../qdeclarativelanguage/data/script.1.errors.txt  |    1 +
 .../qdeclarativelanguage/data/script.1.qml         |    4 +
 .../qdeclarativelanguage/data/script.10.errors.txt |    1 +
 .../qdeclarativelanguage/data/script.10.qml        |    9 +
 .../qdeclarativelanguage/data/script.11.errors.txt |    1 +
 .../qdeclarativelanguage/data/script.11.qml        |    7 +
 .../qdeclarativelanguage/data/script.12.errors.txt |    1 +
 .../qdeclarativelanguage/data/script.12.qml        |    6 +
 .../qdeclarativelanguage/data/script.2.errors.txt  |    1 +
 .../qdeclarativelanguage/data/script.2.qml         |    7 +
 .../qdeclarativelanguage/data/script.3.errors.txt  |    1 +
 .../qdeclarativelanguage/data/script.3.qml         |    7 +
 .../qdeclarativelanguage/data/script.4.errors.txt  |    1 +
 .../qdeclarativelanguage/data/script.4.qml         |    8 +
 .../qdeclarativelanguage/data/script.5.errors.txt  |    1 +
 .../qdeclarativelanguage/data/script.5.qml         |    9 +
 .../qdeclarativelanguage/data/script.6.errors.txt  |    1 +
 .../qdeclarativelanguage/data/script.6.qml         |   11 +
 .../qdeclarativelanguage/data/script.7.errors.txt  |    1 +
 .../qdeclarativelanguage/data/script.7.qml         |   11 +
 .../qdeclarativelanguage/data/script.8.errors.txt  |    1 +
 .../qdeclarativelanguage/data/script.8.qml         |    9 +
 .../qdeclarativelanguage/data/script.9.errors.txt  |    1 +
 .../qdeclarativelanguage/data/script.9.qml         |    7 +
 .../qdeclarativelanguage/data/scriptString.qml     |    6 +
 .../qdeclarativelanguage/data/signal.1.errors.txt  |    1 +
 .../qdeclarativelanguage/data/signal.1.qml         |    5 +
 .../qdeclarativelanguage/data/signal.2.errors.txt  |    1 +
 .../qdeclarativelanguage/data/signal.2.qml         |    6 +
 .../qdeclarativelanguage/data/signal.3.errors.txt  |    1 +
 .../qdeclarativelanguage/data/signal.3.qml         |    6 +
 .../qdeclarativelanguage/data/simpleBindings.qml   |   18 +
 .../qdeclarativelanguage/data/simpleContainer.qml  |    5 +
 .../qdeclarativelanguage/data/simpleObject.qml     |    2 +
 .../qdeclarativelanguage/data/subdir/Test.qml      |    2 +
 .../data/subdir/subsubdir/SubTest.qml              |    2 +
 .../declarative/qdeclarativelanguage/data/test.js  |    0
 .../declarative/qdeclarativelanguage/data/test2.js |    0
 .../data/unregisteredObject.errors.txt             |    1 +
 .../data/unregisteredObject.qml                    |    2 +
 .../data/unsupportedProperty.errors.txt            |    1 +
 .../data/unsupportedProperty.qml                   |    4 +
 .../qdeclarativelanguage/data/valueTypes.qml       |   13 +
 .../data/wrongType.1.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/wrongType.1.qml      |    4 +
 .../data/wrongType.10.errors.txt                   |    1 +
 .../qdeclarativelanguage/data/wrongType.10.qml     |    5 +
 .../data/wrongType.11.errors.txt                   |    1 +
 .../qdeclarativelanguage/data/wrongType.11.qml     |    5 +
 .../data/wrongType.12.errors.txt                   |    1 +
 .../qdeclarativelanguage/data/wrongType.12.qml     |    5 +
 .../data/wrongType.13.errors.txt                   |    1 +
 .../qdeclarativelanguage/data/wrongType.13.qml     |    4 +
 .../data/wrongType.14.errors.txt                   |    1 +
 .../qdeclarativelanguage/data/wrongType.14.qml     |    5 +
 .../data/wrongType.15.errors.txt                   |    1 +
 .../qdeclarativelanguage/data/wrongType.15.qml     |    4 +
 .../data/wrongType.2.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/wrongType.2.qml      |    4 +
 .../data/wrongType.3.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/wrongType.3.qml      |    4 +
 .../data/wrongType.4.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/wrongType.4.qml      |    4 +
 .../data/wrongType.5.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/wrongType.5.qml      |    5 +
 .../data/wrongType.6.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/wrongType.6.qml      |    5 +
 .../data/wrongType.7.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/wrongType.7.qml      |    5 +
 .../data/wrongType.8.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/wrongType.8.qml      |    5 +
 .../data/wrongType.9.errors.txt                    |    1 +
 .../qdeclarativelanguage/data/wrongType.9.qml      |    5 +
 .../qdeclarativelanguage/qdeclarativelanguage.pro  |   14 +
 .../declarative/qmllanguage/LocalInternal.qml      |    3 +
 .../qtest/declarative/qmllanguage/Test.qml         |    2 +
 .../qtest/declarative/qmllanguage/TestLocal.qml    |    1 +
 .../qtest/declarative/qmllanguage/TestSubDir.qml   |    2 +
 .../qtest/declarative/qmllanguage/pics/blue.png    |  Bin 0 -> 84 bytes
 .../qtest/declarative/qmllanguage/qmldir           |    3 +
 .../declarative/qmllanguage/subdir/SubTest.qml     |    3 +
 .../qtest/declarative/qmllanguage/subdir/qmldir    |    1 +
 .../declarative/qdeclarativelanguage/testtypes.cpp |   62 +
 .../declarative/qdeclarativelanguage/testtypes.h   |  547 ++
 .../tst_qdeclarativelanguage.cpp                   | 1386 ++++
 .../qdeclarativelistmodel.pro                      |    6 +
 .../tst_qdeclarativelistmodel.cpp                  |  346 +
 .../qdeclarativelistreference/data/MyType.qml      |    5 +
 .../qdeclarativelistreference/data/engineTypes.qml |    9 +
 .../data/variantToList.qml                         |   10 +
 .../qdeclarativelistreference.pro                  |    5 +
 .../tst_qdeclarativelistreference.cpp              |  579 ++
 .../qdeclarativelistview/data/itemlist.qml         |   43 +
 .../data/listview-enforcerange.qml                 |   55 +
 .../data/listview-initCurrent.qml                  |   50 +
 .../data/listview-sections.qml                     |   59 +
 .../qdeclarativelistview/data/listview.qml         |  119 +
 .../qdeclarativelistview/qdeclarativelistview.pro  |    8 +
 .../tst_qdeclarativelistview.cpp                   | 1370 ++++
 .../data/GraphicsWidget250x250.qml                 |    5 +
 .../qdeclarativeloader/data/NoResize.qml           |    7 +
 .../data/NoResizeGraphicsWidget.qml                |    8 +
 .../qdeclarativeloader/data/Rect120x60.qml         |    6 +
 .../qdeclarativeloader/data/SetSourceComponent.qml |    6 +
 .../data/SizeGraphicsWidgetToLoader.qml            |    8 +
 .../data/SizeLoaderToGraphicsWidget.qml            |    6 +
 .../qdeclarativeloader/data/SizeToItem.qml         |    6 +
 .../qdeclarativeloader/data/SizeToLoader.qml       |    7 +
 .../qdeclarativeloader/qdeclarativeloader.pro      |   11 +
 .../qdeclarativeloader/tst_qdeclarativeloader.cpp  |  464 ++
 .../qdeclarativemetaproperty.pro                   |    5 +
 .../tst_qdeclarativemetaproperty.cpp               | 1185 ++++
 .../qdeclarativemetatype/qdeclarativemetatype.pro  |    6 +
 .../tst_qdeclarativemetatype.cpp                   |  377 ++
 .../qdeclarativemoduleplugin/plugin.qml            |    3 +
 .../qdeclarativemoduleplugin/plugin/plugin.cpp     |   89 +
 .../qdeclarativemoduleplugin/plugin/plugin.pro     |    5 +
 .../qdeclarativemoduleplugin.pro                   |    7 +
 .../tst_qdeclarativemoduleplugin.cpp               |  117 +
 .../tst_qdeclarativemoduleplugin.pro               |    4 +
 .../qdeclarativemousearea/data/dragproperties.qml  |   28 +
 .../qdeclarativemousearea.pro                      |    9 +
 .../tst_qdeclarativemousearea.cpp                  |  138 +
 .../qdeclarativenumberformatter.pro                |    5 +
 .../tst_qdeclarativenumberformatter.cpp            |  222 +
 .../qdeclarativeparticles/data/particle.png        |  Bin 0 -> 262 bytes
 .../qdeclarativeparticles/data/particlemotion.qml  |   33 +
 .../qdeclarativeparticles/data/particles.qml       |   15 +
 .../qdeclarativeparticles.pro                      |    8 +
 .../tst_qdeclarativeparticles.cpp                  |  209 +
 .../qdeclarativepathview/data/datamodel.qml        |   36 +
 .../declarative/qdeclarativepathview/data/path.qml |   14 +
 .../qdeclarativepathview/data/pathview.qml         |   66 +
 .../qdeclarativepathview/data/pathview1.qml        |    4 +
 .../qdeclarativepathview/data/pathview2.qml        |   57 +
 .../qdeclarativepathview/data/pathview3.qml        |   57 +
 .../qdeclarativepathview/qdeclarativepathview.pro  |    8 +
 .../tst_qdeclarativepathview.cpp                   |  488 ++
 .../qdeclarativepixmapcache/data/exists.png        |  Bin 0 -> 2738 bytes
 .../qdeclarativepixmapcache/data/exists1.png       |  Bin 0 -> 2738 bytes
 .../qdeclarativepixmapcache/data/exists2.png       |  Bin 0 -> 2738 bytes
 .../qdeclarativepixmapcache.pro                    |    9 +
 .../tst_qdeclarativepixmapcache.cpp                |  282 +
 .../qdeclarativepositioners/data/grid-animated.qml |   60 +
 .../qdeclarativepositioners/data/grid-spacing.qml  |   40 +
 .../qdeclarativepositioners/data/grid.qml          |   39 +
 .../data/horizontal-animated.qml                   |   40 +
 .../data/horizontal-spacing.qml                    |   27 +
 .../qdeclarativepositioners/data/horizontal.qml    |   26 +
 .../data/propertychanges.qml                       |   39 +
 .../qdeclarativepositioners/data/repeater.qml      |   20 +
 .../data/vertical-animated.qml                     |   40 +
 .../data/vertical-spacing.qml                      |   27 +
 .../qdeclarativepositioners/data/vertical.qml      |   26 +
 .../qdeclarativepositioners.pro                    |    7 +
 .../tst_qdeclarativepositioners.cpp                |  455 ++
 .../qdeclarativepropertymap.pro                    |    5 +
 .../tst_qdeclarativepropertymap.cpp                |  171 +
 .../qdeclarativeqt/data/closestangle.qml           |   12 +
 .../declarative/qdeclarativeqt/data/consoleLog.qml |    8 +
 .../qdeclarativeqt/data/createComponent.qml        |   23 +
 .../qdeclarativeqt/data/createComponentData.qml    |    5 +
 .../qdeclarativeqt/data/createQmlObject.qml        |   31 +
 .../declarative/qdeclarativeqt/data/darker.qml     |   11 +
 .../auto/declarative/qdeclarativeqt/data/enums.qml |    9 +
 .../auto/declarative/qdeclarativeqt/data/hsla.qml  |   11 +
 .../declarative/qdeclarativeqt/data/lighter.qml    |   10 +
 tests/auto/declarative/qdeclarativeqt/data/md5.qml |    6 +
 .../auto/declarative/qdeclarativeqt/data/point.qml |    9 +
 .../auto/declarative/qdeclarativeqt/data/rect.qml  |    9 +
 .../auto/declarative/qdeclarativeqt/data/rgba.qml  |   10 +
 .../auto/declarative/qdeclarativeqt/data/size.qml  |   11 +
 .../auto/declarative/qdeclarativeqt/data/tint.qml  |    9 +
 .../declarative/qdeclarativeqt/data/vector.qml     |    8 +
 .../declarative/qdeclarativeqt/qdeclarativeqt.pro  |    9 +
 .../qdeclarativeqt/tst_qdeclarativeqt.cpp          |  369 +
 .../qdeclarativerepeater/data/intmodel.qml         |   29 +
 .../qdeclarativerepeater/data/itemlist.qml         |   49 +
 .../qdeclarativerepeater/data/objlist.qml          |   21 +
 .../qdeclarativerepeater/data/properties.qml       |   11 +
 .../qdeclarativerepeater/data/repeater.qml         |   28 +
 .../qdeclarativerepeater/data/repeater2.qml        |   35 +
 .../qdeclarativerepeater/qdeclarativerepeater.pro  |    8 +
 .../tst_qdeclarativerepeater.cpp                   |  385 ++
 .../data/springfollow1.qml                         |    4 +
 .../data/springfollow2.qml                         |    8 +
 .../data/springfollow3.qml                         |    8 +
 .../qdeclarativespringfollow.pro                   |    8 +
 .../tst_qdeclarativespringfollow.cpp               |  137 +
 .../qdeclarativestates/data/ExtendedRectangle.qml  |   19 +
 .../qdeclarativestates/data/anchorChanges.qml      |   23 +
 .../qdeclarativestates/data/anchorChanges2.qml     |   21 +
 .../qdeclarativestates/data/anchorChanges3.qml     |   29 +
 .../qdeclarativestates/data/anchorChanges4.qml     |   22 +
 .../qdeclarativestates/data/anchorChanges5.qml     |   22 +
 .../data/autoStateAtStartupRestoreBug.qml          |   18 +
 .../qdeclarativestates/data/basicBinding.qml       |   12 +
 .../qdeclarativestates/data/basicBinding2.qml      |   12 +
 .../qdeclarativestates/data/basicBinding3.qml      |   13 +
 .../qdeclarativestates/data/basicBinding4.qml      |   17 +
 .../qdeclarativestates/data/basicChanges.qml       |   10 +
 .../qdeclarativestates/data/basicChanges2.qml      |   15 +
 .../qdeclarativestates/data/basicChanges3.qml      |   15 +
 .../qdeclarativestates/data/basicExtension.qml     |   16 +
 .../qdeclarativestates/data/deleting.qml           |   11 +
 .../qdeclarativestates/data/deletingState.qml      |   13 +
 .../qdeclarativestates/data/explicit.qml           |   15 +
 .../qdeclarativestates/data/fakeExtension.qml      |   16 +
 .../qdeclarativestates/data/illegalTempState.qml   |   21 +
 .../qdeclarativestates/data/legalTempState.qml     |   23 +
 .../qdeclarativestates/data/nonExistantProp.qml    |   11 +
 .../qdeclarativestates/data/parentChange.qml       |   37 +
 .../qdeclarativestates/data/parentChange2.qml      |   31 +
 .../qdeclarativestates/data/parentChange3.qml      |   42 +
 .../qdeclarativestates/data/parentChange4.qml      |   30 +
 .../qdeclarativestates/data/parentChange5.qml      |   30 +
 .../qdeclarativestates/data/propertyErrors.qml     |   10 +
 .../qdeclarativestates/data/restoreEntryValues.qml |   14 +
 .../declarative/qdeclarativestates/data/script.qml |   10 +
 .../qdeclarativestates/data/signalOverride.qml     |   18 +
 .../qdeclarativestates/data/signalOverride2.qml    |    9 +
 .../data/signalOverrideCrash.qml                   |   15 +
 .../qdeclarativestates/qdeclarativestates.pro      |    8 +
 .../qdeclarativestates/tst_qdeclarativestates.cpp  |  917 +++
 .../qdeclarativestyledtext.pro                     |    9 +
 .../tst_qdeclarativestyledtext.cpp                 |   96 +
 .../qdeclarativesystempalette.pro                  |    5 +
 .../tst_qdeclarativesystempalette.cpp              |  187 +
 .../qdeclarativetext/qdeclarativetext.pro          |    5 +
 .../qdeclarativetext/tst_qdeclarativetext.cpp      |  844 +++
 .../qdeclarativetextedit/data/cursorTest.qml       |    8 +
 .../qdeclarativetextedit/data/http/ErrItem.qml     |    7 +
 .../qdeclarativetextedit/data/http/NormItem.qml    |    6 +
 .../data/http/cursorHttpTest.qml                   |   22 +
 .../data/http/cursorHttpTestFail1.qml              |   18 +
 .../data/http/cursorHttpTestFail2.qml              |   18 +
 .../data/http/cursorHttpTestPass.qml               |   18 +
 .../data/httpfail/FailItem.qml                     |    5 +
 .../data/httpslow/WaitItem.qml                     |    5 +
 .../qdeclarativetextedit/data/inputmethodhints.qml |    6 +
 .../qdeclarativetextedit/data/navigation.qml       |   23 +
 .../qdeclarativetextedit/data/readOnly.qml         |   12 +
 .../qdeclarativetextedit/qdeclarativetextedit.pro  |    9 +
 .../tst_qdeclarativetextedit.cpp                   |  791 +++
 .../qdeclarativetextinput/data/cursorTest.qml      |    8 +
 .../data/inputmethodhints.qml                      |    6 +
 .../qdeclarativetextinput/data/masks.qml           |    7 +
 .../qdeclarativetextinput/data/maxLength.qml       |    7 +
 .../qdeclarativetextinput/data/navigation.qml      |   24 +
 .../qdeclarativetextinput/data/readOnly.qml        |   12 +
 .../qdeclarativetextinput/data/validators.qml      |   23 +
 .../qdeclarativetextinput.pro                      |    8 +
 .../tst_qdeclarativetextinput.cpp                  |  656 ++
 .../qdeclarativetimer/qdeclarativetimer.pro        |    7 +
 .../qdeclarativetimer/tst_qdeclarativetimer.cpp    |  285 +
 .../data/autoBindingRemoval.2.qml                  |    9 +
 .../data/autoBindingRemoval.3.qml                  |   10 +
 .../data/autoBindingRemoval.qml                    |    9 +
 .../data/bindingAssignment.qml                     |    7 +
 .../data/bindingConflict.qml                       |    8 +
 .../qdeclarativevaluetypes/data/bindingRead.qml    |    5 +
 .../data/bindingVariantCopy.qml                    |   13 +
 .../qdeclarativevaluetypes/data/deletedObject.js   |   13 +
 .../qdeclarativevaluetypes/data/deletedObject.qml  |   12 +
 .../qdeclarativevaluetypes/data/enums.1.qml        |    6 +
 .../qdeclarativevaluetypes/data/enums.2.qml        |    6 +
 .../qdeclarativevaluetypes/data/font_read.qml      |   18 +
 .../qdeclarativevaluetypes/data/font_write.2.qml   |    6 +
 .../qdeclarativevaluetypes/data/font_write.3.qml   |    7 +
 .../qdeclarativevaluetypes/data/font_write.qml     |   16 +
 .../qdeclarativevaluetypes/data/point_read.qml     |    7 +
 .../qdeclarativevaluetypes/data/point_write.qml    |    6 +
 .../qdeclarativevaluetypes/data/pointf_read.qml    |    8 +
 .../qdeclarativevaluetypes/data/pointf_write.qml   |    6 +
 .../qdeclarativevaluetypes/data/rect_read.qml      |   10 +
 .../qdeclarativevaluetypes/data/rect_write.qml     |    9 +
 .../qdeclarativevaluetypes/data/rectf_read.qml     |   10 +
 .../qdeclarativevaluetypes/data/rectf_write.qml    |    9 +
 .../qdeclarativevaluetypes/data/scriptAccess.qml   |    9 +
 .../data/scriptVariantCopy.qml                     |   14 +
 .../qdeclarativevaluetypes/data/size_read.qml      |    8 +
 .../qdeclarativevaluetypes/data/size_write.qml     |    7 +
 .../qdeclarativevaluetypes/data/sizef_read.qml     |    9 +
 .../qdeclarativevaluetypes/data/sizef_write.qml    |    6 +
 .../data/staticAssignment.qml                      |    5 +
 .../data/valueInterceptors.qml                     |    8 +
 .../qdeclarativevaluetypes/data/valueSources.qml   |    5 +
 .../qdeclarativevaluetypes/data/vector3d_read.qml  |    9 +
 .../qdeclarativevaluetypes/data/vector3d_write.qml |    8 +
 .../qdeclarativevaluetypes.pro                     |   10 +
 .../qdeclarativevaluetypes/testtypes.cpp           |   48 +
 .../declarative/qdeclarativevaluetypes/testtypes.h |  154 +
 .../tst_qdeclarativevaluetypes.cpp                 |  616 ++
 .../qdeclarativewebview/data/basic.html            |   17 +
 .../declarative/qdeclarativewebview/data/basic.ico |  Bin 0 -> 318 bytes
 .../declarative/qdeclarativewebview/data/basic.png |  Bin 0 -> 3961 bytes
 .../declarative/qdeclarativewebview/data/basic.qml |    5 +
 .../qdeclarativewebview/data/elements.html         |   14 +
 .../qdeclarativewebview/data/elements.qml          |    7 +
 .../qdeclarativewebview/data/forward.html          |   12 +
 .../qdeclarativewebview/data/javaScript.html       |   11 +
 .../qdeclarativewebview/data/javaScript.qml        |   11 +
 .../qdeclarativewebview/data/loadError.qml         |    5 +
 .../qdeclarativewebview/data/newwindows.html       |   16 +
 .../qdeclarativewebview/data/newwindows.qml        |   33 +
 .../qdeclarativewebview/data/pixelCache.html       |   10 +
 .../qdeclarativewebview/data/pixelCache.qml        |    6 +
 .../qdeclarativewebview/data/propertychanges.qml   |   33 +
 .../qdeclarativewebview/data/sethtml.qml           |    5 +
 .../qdeclarativewebview/qdeclarativewebview.pro    |   10 +
 .../declarative/qdeclarativewebview/testtypes.cpp  |   52 +
 .../declarative/qdeclarativewebview/testtypes.h    |   66 +
 .../tst_qdeclarativewebview.cpp                    |  511 ++
 .../qdeclarativexmlhttprequest/data/abort.expect   |   10 +
 .../qdeclarativexmlhttprequest/data/abort.qml      |   42 +
 .../qdeclarativexmlhttprequest/data/abort.reply    |    3 +
 .../data/abort_opened.qml                          |   58 +
 .../data/abort_unsent.qml                          |   54 +
 .../qdeclarativexmlhttprequest/data/attr.qml       |   80 +
 .../qdeclarativexmlhttprequest/data/attr.xml       |    1 +
 .../data/callbackException.qml                     |   25 +
 .../qdeclarativexmlhttprequest/data/cdata.qml      |  135 +
 .../qdeclarativexmlhttprequest/data/cdata.xml      |    2 +
 .../data/constructor.qml                           |   14 +
 .../data/defaultState.qml                          |   30 +
 .../qdeclarativexmlhttprequest/data/document.qml   |   58 +
 .../qdeclarativexmlhttprequest/data/document.xml   |    3 +
 .../data/domExceptionCodes.qml                     |   60 +
 .../qdeclarativexmlhttprequest/data/element.qml    |  147 +
 .../qdeclarativexmlhttprequest/data/element.xml    |    1 +
 .../data/getAllResponseHeaders.qml                 |   65 +
 .../data/getAllResponseHeaders_args.qml            |   23 +
 .../data/getAllResponseHeaders_sent.qml            |   20 +
 .../data/getAllResponseHeaders_unsent.qml          |   16 +
 .../data/getResponseHeader.expect                  |    7 +
 .../data/getResponseHeader.qml                     |   75 +
 .../data/getResponseHeader.reply                   |    8 +
 .../data/getResponseHeader_args.qml                |   23 +
 .../data/getResponseHeader_sent.qml                |   20 +
 .../data/getResponseHeader_unsent.qml              |   16 +
 .../data/instanceStateValues.qml                   |   33 +
 .../data/invalidMethodUsage.qml                    |  160 +
 .../qdeclarativexmlhttprequest/data/open.qml       |   53 +
 .../data/open_arg_count.1.qml                      |   18 +
 .../data/open_arg_count.2.qml                      |   18 +
 .../data/open_invalid_method.qml                   |   16 +
 .../data/open_network.expect                       |    7 +
 .../data/open_network.reply                        |    3 +
 .../data/open_network.wait                         |    0
 .../qdeclarativexmlhttprequest/data/open_sync.qml  |   17 +
 .../qdeclarativexmlhttprequest/data/open_user.qml  |   53 +
 .../data/open_username.qml                         |   54 +
 .../data/redirectError.qml                         |   23 +
 .../data/redirectRecur.qml                         |   23 +
 .../qdeclarativexmlhttprequest/data/redirects.qml  |   22 +
 .../data/redirecttarget.html                       |    1 +
 .../data/responseText.qml                          |   52 +
 .../data/responseXML_invalid.qml                   |   24 +
 .../data/seconddocument.html                       |    1 +
 .../data/send_alreadySent.qml                      |   27 +
 .../data/send_data.1.expect                        |   10 +
 .../data/send_data.1.qml                           |   21 +
 .../data/send_data.2.qml                           |   23 +
 .../data/send_data.3.qml                           |   23 +
 .../data/send_data.4.expect                        |   10 +
 .../data/send_data.4.qml                           |   23 +
 .../data/send_data.5.qml                           |   23 +
 .../data/send_data.6.expect                        |   10 +
 .../data/send_data.6.qml                           |   21 +
 .../data/send_data.7.qml                           |   23 +
 .../data/send_data.reply                           |    3 +
 .../data/send_ignoreData.qml                       |   26 +
 .../data/send_ignoreData.reply                     |    3 +
 .../data/send_ignoreData_GET.expect                |    7 +
 .../data/send_ignoreData_PUT.expect                |    7 +
 .../data/send_unsent.qml                           |   16 +
 .../data/setRequestHeader.expect                   |    9 +
 .../data/setRequestHeader.qml                      |   28 +
 .../data/setRequestHeader.reply                    |    3 +
 .../data/setRequestHeader_args.qml                 |   18 +
 .../data/setRequestHeader_illegalName.qml          |   57 +
 .../data/setRequestHeader_sent.qml                 |   31 +
 .../data/setRequestHeader_unsent.qml               |   17 +
 .../data/staticStateValues.qml                     |   24 +
 .../data/status.200.reply                          |    3 +
 .../data/status.404.reply                          |    3 +
 .../qdeclarativexmlhttprequest/data/status.expect  |    7 +
 .../qdeclarativexmlhttprequest/data/status.qml     |   77 +
 .../qdeclarativexmlhttprequest/data/statusText.qml |   77 +
 .../data/testdocument.html                         |    1 +
 .../qdeclarativexmlhttprequest/data/text.qml       |  131 +
 .../qdeclarativexmlhttprequest/data/text.xml       |    1 +
 .../qdeclarativexmlhttprequest.pro                 |   13 +
 .../tst_qdeclarativexmlhttprequest.cpp             | 1315 ++++
 .../qdeclarativexmllistmodel/data/model.qml        |   10 +
 .../qdeclarativexmllistmodel/data/model.xml        |   54 +
 .../qdeclarativexmllistmodel/data/model2.qml       |   11 +
 .../qdeclarativexmllistmodel/data/recipes.qml      |   10 +
 .../qdeclarativexmllistmodel/data/recipes.xml      |   90 +
 .../qdeclarativexmllistmodel/data/roleErrors.qml   |   10 +
 .../qdeclarativexmllistmodel/data/roleKeys.qml     |   13 +
 .../qdeclarativexmllistmodel/data/unique.qml       |    8 +
 .../qdeclarativexmllistmodel.pro                   |   11 +
 .../tst_qdeclarativexmllistmodel.cpp               |  457 ++
 .../declarative/qmlanimations/data/attached.qml    |   34 -
 .../qmlanimations/data/badproperty1.qml            |   21 -
 .../qmlanimations/data/badproperty2.qml            |   21 -
 .../declarative/qmlanimations/data/badtype1.qml    |   12 -
 .../declarative/qmlanimations/data/badtype2.qml    |   12 -
 .../declarative/qmlanimations/data/badtype3.qml    |   12 -
 .../declarative/qmlanimations/data/badtype4.qml    |   27 -
 .../qmlanimations/data/dontAutoStart.qml           |   18 -
 .../declarative/qmlanimations/data/dontStart.qml   |   19 -
 .../declarative/qmlanimations/data/dontStart2.qml  |   19 -
 .../declarative/qmlanimations/data/dotproperty.qml |   24 -
 .../declarative/qmlanimations/data/mixedtype1.qml  |   25 -
 .../declarative/qmlanimations/data/mixedtype2.qml  |   25 -
 .../declarative/qmlanimations/data/properties.qml  |   14 -
 .../declarative/qmlanimations/data/properties2.qml |   14 -
 .../declarative/qmlanimations/data/properties3.qml |   14 -
 .../declarative/qmlanimations/data/properties4.qml |   14 -
 .../declarative/qmlanimations/data/properties5.qml |   14 -
 .../qmlanimations/data/propertiesTransition.qml    |   29 -
 .../qmlanimations/data/propertiesTransition2.qml   |   29 -
 .../qmlanimations/data/propertiesTransition3.qml   |   29 -
 .../qmlanimations/data/propertiesTransition4.qml   |   29 -
 .../qmlanimations/data/propertiesTransition5.qml   |   29 -
 .../qmlanimations/data/propertiesTransition6.qml   |   29 -
 .../declarative/qmlanimations/data/valuesource.qml |   14 -
 .../qmlanimations/data/valuesource2.qml            |   14 -
 .../declarative/qmlanimations/qmlanimations.pro    |    6 -
 .../qmlanimations/tst_qmlanimations.cpp            |  672 --
 .../auto/declarative/qmlbehaviors/data/binding.qml |   26 -
 tests/auto/declarative/qmlbehaviors/data/color.qml |   24 -
 .../declarative/qmlbehaviors/data/cpptrigger.qml   |   11 -
 .../declarative/qmlbehaviors/data/disabled.qml     |   27 -
 .../declarative/qmlbehaviors/data/dontStart.qml    |   18 -
 tests/auto/declarative/qmlbehaviors/data/empty.qml |   23 -
 .../declarative/qmlbehaviors/data/explicit.qml     |   26 -
 .../qmlbehaviors/data/groupProperty.qml            |   23 -
 .../qmlbehaviors/data/groupProperty2.qml           |   23 -
 tests/auto/declarative/qmlbehaviors/data/loop.qml  |   19 -
 .../qmlbehaviors/data/nonSelecting2.qml            |   26 -
 .../auto/declarative/qmlbehaviors/data/parent.qml  |   28 -
 .../qmlbehaviors/data/reassignedAnimation.qml      |   27 -
 .../qmlbehaviors/data/scripttrigger.qml            |   16 -
 .../auto/declarative/qmlbehaviors/data/simple.qml  |   26 -
 .../auto/declarative/qmlbehaviors/qmlbehaviors.pro |    6 -
 .../declarative/qmlbehaviors/tst_qmlbehaviors.cpp  |  301 -
 .../declarative/qmlbinding/data/test-binding.qml   |   16 -
 .../declarative/qmlbinding/data/test-binding2.qml  |   16 -
 tests/auto/declarative/qmlbinding/qmlbinding.pro   |    8 -
 .../auto/declarative/qmlbinding/tst_qmlbinding.cpp |  107 -
 .../qmlconnection/data/test-connection.qml         |   10 -
 .../qmlconnection/data/test-connection2.qml        |    3 -
 .../qmlconnection/data/test-connection3.qml        |    3 -
 .../declarative/qmlconnection/data/trimming.qml    |   10 -
 .../declarative/qmlconnection/qmlconnection.pro    |    8 -
 .../qmlconnection/tst_qmlconnection.cpp            |  139 -
 tests/auto/declarative/qmlcontext/qmlcontext.pro   |    6 -
 .../auto/declarative/qmlcontext/tst_qmlcontext.cpp |  434 --
 .../qmldatetimeformatter/qmldatetimeformatter.pro  |    5 -
 .../tst_qmldatetimeformatter.cpp                   |  150 -
 tests/auto/declarative/qmldebug/qmldebug.pro       |    7 -
 tests/auto/declarative/qmldebug/tst_qmldebug.cpp   |  841 ---
 .../declarative/qmldebugclient/qmldebugclient.pro  |    7 -
 .../qmldebugclient/tst_qmldebugclient.cpp          |  157 -
 .../qmldebugservice/qmldebugservice.pro            |    7 -
 .../qmldebugservice/tst_qmldebugservice.cpp        |  190 -
 tests/auto/declarative/qmldom/data/MyComponent.qml |    4 -
 tests/auto/declarative/qmldom/data/MyItem.qml      |    4 -
 .../auto/declarative/qmldom/data/importdir/Bar.qml |    2 -
 .../qmldom/data/importlib/sublib/qmldir/Foo.qml    |    2 -
 tests/auto/declarative/qmldom/data/top.qml         |    6 -
 tests/auto/declarative/qmldom/qmldom.pro           |    7 -
 tests/auto/declarative/qmldom/tst_qmldom.cpp       | 1313 ----
 .../declarative/qmleasefollow/data/easefollow1.qml |    3 -
 .../declarative/qmleasefollow/data/easefollow2.qml |    5 -
 .../declarative/qmleasefollow/data/easefollow3.qml |    6 -
 .../declarative/qmleasefollow/qmleasefollow.pro    |    8 -
 .../qmleasefollow/tst_qmleasefollow.cpp            |  122 -
 .../data/ConstantsOverrideBindings.qml             |    6 -
 .../qmlecmascript/data/CustomObject.qml            |    5 -
 .../qmlecmascript/data/MethodsObject.qml           |    6 -
 .../data/NestedTypeTransientErrors.qml             |   11 -
 .../declarative/qmlecmascript/data/ScopeObject.qml |   14 -
 .../qmlecmascript/data/TypeForDynamicCreation.qml  |    2 -
 .../qmlecmascript/data/aliasPropertyAndBinding.qml |   14 -
 .../qmlecmascript/data/assignBasicTypes.2.qml      |   26 -
 .../qmlecmascript/data/assignBasicTypes.qml        |   29 -
 .../qmlecmascript/data/attachedProperty.qml        |   11 -
 .../declarative/qmlecmascript/data/bindingLoop.qml |   14 -
 .../data/boolPropertiesEvaluateAsBool.1.qml        |    5 -
 .../data/boolPropertiesEvaluateAsBool.2.qml        |    5 -
 .../auto/declarative/qmlecmascript/data/bug.1.qml  |   10 -
 .../qmlecmascript/data/compositePropertyType.qml   |    8 -
 .../data/constantsOverrideBindings.1.qml           |    8 -
 .../data/constantsOverrideBindings.2.qml           |   11 -
 .../data/constantsOverrideBindings.3.qml           |    7 -
 .../qmlecmascript/data/deferredProperties.qml      |   10 -
 .../qmlecmascript/data/deletedObject.qml           |   25 -
 .../qmlecmascript/data/dynamicCreation.helper.qml  |    6 -
 .../qmlecmascript/data/dynamicCreation.qml         |   21 -
 .../qmlecmascript/data/dynamicDeletion.qml         |   20 -
 .../declarative/qmlecmascript/data/enums.1.qml     |   20 -
 .../declarative/qmlecmascript/data/enums.2.qml     |    8 -
 .../qmlecmascript/data/exceptionClearsOnReeval.qml |    6 -
 .../data/exceptionProducesWarning.qml              |    8 -
 .../data/exceptionProducesWarning2.qml             |    7 -
 .../data/extendedObjectPropertyLookup.qml          |    8 -
 .../qmlecmascript/data/extensionObjects.qml        |   10 -
 .../qmlecmascript/data/externalScript.1.qml        |   11 -
 .../qmlecmascript/data/externalScript.2.js         |    8 -
 .../qmlecmascript/data/externalScript.2.qml        |   11 -
 .../qmlecmascript/data/externalScript.3.qml        |   13 -
 .../qmlecmascript/data/externalScript.4.qml        |   15 -
 .../qmlecmascript/data/externalScript.js           |    6 -
 .../qmlecmascript/data/idShortcutInvalidates.1.qml |   13 -
 .../qmlecmascript/data/idShortcutInvalidates.qml   |   12 -
 .../declarative/qmlecmascript/data/jsObject.qml    |   12 -
 .../qmlecmascript/data/listProperties.qml          |   27 -
 .../qmlecmascript/data/listToVariant.qml           |    5 -
 .../declarative/qmlecmascript/data/methods.1.qml   |    6 -
 .../declarative/qmlecmascript/data/methods.2.qml   |    6 -
 .../declarative/qmlecmascript/data/methods.3.qml   |    7 -
 .../declarative/qmlecmascript/data/methods.4.qml   |   11 -
 .../declarative/qmlecmascript/data/methods.5.qml   |    9 -
 .../qmlecmascript/data/multiEngineObject.qml       |    5 -
 .../data/nonExistantAttachedObject.qml             |    5 -
 .../qmlecmascript/data/objectsCompareAsEqual.qml   |   15 -
 .../data/outerBindingOverridesInnerBinding.qml     |   14 -
 .../declarative/qmlecmascript/data/qmlToString.qml |   11 -
 .../declarative/qmlecmascript/data/scope.2.qml     |   42 -
 .../auto/declarative/qmlecmascript/data/scope.qml  |   48 -
 .../declarative/qmlecmascript/data/scriptAccess.js |    7 -
 .../qmlecmascript/data/scriptAccess.qml            |   17 -
 .../declarative/qmlecmascript/data/scriptErrors.js |    2 -
 .../qmlecmascript/data/scriptErrors.qml            |   17 -
 .../qmlecmascript/data/selfDeletingBinding.2.qml   |   17 -
 .../qmlecmascript/data/selfDeletingBinding.qml     |   18 -
 .../qmlecmascript/data/shutdownErrors.qml          |   13 -
 .../qmlecmascript/data/signalAssignment.1.qml      |    5 -
 .../qmlecmascript/data/signalAssignment.2.qml      |    5 -
 .../qmlecmascript/data/signalParameterTypes.qml    |   16 -
 .../qmlecmascript/data/signalTriggeredBindings.qml |   20 -
 .../qmlecmascript/data/transientErrors.qml         |   10 -
 .../data/undefinedResetsProperty.2.qml             |   10 -
 .../qmlecmascript/data/undefinedResetsProperty.qml |    7 -
 .../qmlecmascript/data/valueTypeFunctions.qml      |    6 -
 .../declarative/qmlecmascript/qmlecmascript.pro    |   10 -
 tests/auto/declarative/qmlecmascript/testtypes.cpp |   85 -
 tests/auto/declarative/qmlecmascript/testtypes.h   |  598 --
 .../qmlecmascript/tst_qmlecmascript.cpp            | 1662 -----
 tests/auto/declarative/qmlengine/qmlengine.pro     |    8 -
 tests/auto/declarative/qmlengine/tst_qmlengine.cpp |  240 -
 tests/auto/declarative/qmlerror/qmlerror.pro       |    6 -
 tests/auto/declarative/qmlerror/test.txt           |    3 -
 tests/auto/declarative/qmlerror/tst_qmlerror.cpp   |  242 -
 .../auto/declarative/qmlfontloader/data/dummy.ttf  |    0
 .../qmlfontloader/data/tarzeau_ocr_a.ttf           |  Bin 24544 -> 0 bytes
 .../declarative/qmlfontloader/qmlfontloader.pro    |    8 -
 .../qmlfontloader/tst_qmlfontloader.cpp            |  156 -
 .../qmlgraphicsanchors/data/anchors.qml            |  162 -
 .../qmlgraphicsanchors/data/centerin.qml           |   12 -
 .../declarative/qmlgraphicsanchors/data/crash1.qml |   11 -
 .../declarative/qmlgraphicsanchors/data/fill.qml   |   14 -
 .../declarative/qmlgraphicsanchors/data/loop1.qml  |    8 -
 .../declarative/qmlgraphicsanchors/data/loop2.qml  |   20 -
 .../qmlgraphicsanchors/data/margins.qml            |   13 -
 .../qmlgraphicsanchors/qmlgraphicsanchors.pro      |    6 -
 .../qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp  |  448 --
 .../qmlgraphicsanimatedimage/data/colors.gif       |  Bin 505 -> 0 bytes
 .../qmlgraphicsanimatedimage/data/colors.qml       |    5 -
 .../qmlgraphicsanimatedimage/data/stickman.gif     |  Bin 164923 -> 0 bytes
 .../qmlgraphicsanimatedimage/data/stickman.qml     |    5 -
 .../data/stickmanpause.qml                         |    7 -
 .../data/stickmanstopped.qml                       |    6 -
 .../qmlgraphicsanimatedimage.pro                   |    7 -
 .../tst_qmlgraphicsanimatedimage.cpp               |  191 -
 .../qmlgraphicsborderimage/data/colors-round.sci   |    7 -
 .../qmlgraphicsborderimage/data/colors.png         |  Bin 1655 -> 0 bytes
 .../qmlgraphicsborderimage/data/invalid.sci        |    7 -
 .../qmlgraphicsborderimage.pro                     |    9 -
 .../tst_qmlgraphicsborderimage.cpp                 |  351 -
 .../qmlgraphicsflickable/data/flickable01.qml      |    4 -
 .../qmlgraphicsflickable/data/flickable02.qml      |   14 -
 .../qmlgraphicsflickable/data/flickable03.qml      |   14 -
 .../qmlgraphicsflickable/data/flickable04.qml      |   16 -
 .../qmlgraphicsflickable/qmlgraphicsflickable.pro  |    8 -
 .../tst_qmlgraphicsflickable.cpp                   |  224 -
 .../qmlgraphicsflipable/data/test-flipable.qml     |    9 -
 .../qmlgraphicsflipable/qmlgraphicsflipable.pro    |    8 -
 .../tst_qmlgraphicsflipable.cpp                    |  113 -
 .../data/gridview-initCurrent.qml                  |   51 -
 .../qmlgraphicsgridview/data/gridview.qml          |   50 -
 .../qmlgraphicsgridview/data/gridview2.qml         |   26 -
 .../qmlgraphicsgridview/data/gridview3.qml         |    6 -
 .../qmlgraphicsgridview/qmlgraphicsgridview.pro    |    8 -
 .../tst_qmlgraphicsgridview.cpp                    |  964 ---
 .../declarative/qmlgraphicsimage/data/colors.png   |  Bin 1655 -> 0 bytes
 .../qmlgraphicsimage/qmlgraphicsimage.pro          |    9 -
 .../qmlgraphicsimage/tst_qmlgraphicsimage.cpp      |  247 -
 .../qmlgraphicsitem/data/keynavigation.qml         |   39 -
 .../auto/declarative/qmlgraphicsitem/data/keys.qml |   18 -
 .../qmlgraphicsitem/qmlgraphicsitem.pro            |    7 -
 .../qmlgraphicsitem/tst_qmlgraphicsitem.cpp        |  318 -
 .../qmlgraphicslistview/data/itemlist.qml          |   43 -
 .../data/listview-enforcerange.qml                 |   55 -
 .../data/listview-initCurrent.qml                  |   50 -
 .../qmlgraphicslistview/data/listview-sections.qml |   59 -
 .../qmlgraphicslistview/data/listview.qml          |  119 -
 .../qmlgraphicslistview/qmlgraphicslistview.pro    |    8 -
 .../tst_qmlgraphicslistview.cpp                    | 1370 ----
 .../data/GraphicsWidget250x250.qml                 |    5 -
 .../qmlgraphicsloader/data/NoResize.qml            |    7 -
 .../data/NoResizeGraphicsWidget.qml                |    8 -
 .../qmlgraphicsloader/data/Rect120x60.qml          |    6 -
 .../qmlgraphicsloader/data/SetSourceComponent.qml  |    6 -
 .../data/SizeGraphicsWidgetToLoader.qml            |    8 -
 .../data/SizeLoaderToGraphicsWidget.qml            |    6 -
 .../qmlgraphicsloader/data/SizeToItem.qml          |    6 -
 .../qmlgraphicsloader/data/SizeToLoader.qml        |    7 -
 .../qmlgraphicsloader/qmlgraphicsloader.pro        |   11 -
 .../qmlgraphicsloader/tst_qmlgraphicsloader.cpp    |  464 --
 .../qmlgraphicsmousearea/data/dragproperties.qml   |   28 -
 .../qmlgraphicsmousearea/qmlgraphicsmousearea.pro  |    9 -
 .../tst_qmlgraphicsmousearea.cpp                   |  138 -
 .../qmlgraphicsparticles/data/particle.png         |  Bin 262 -> 0 bytes
 .../qmlgraphicsparticles/data/particlemotion.qml   |   33 -
 .../qmlgraphicsparticles/data/particles.qml        |   15 -
 .../qmlgraphicsparticles/qmlgraphicsparticles.pro  |    8 -
 .../tst_qmlgraphicsparticles.cpp                   |  209 -
 .../qmlgraphicspathview/data/datamodel.qml         |   36 -
 .../declarative/qmlgraphicspathview/data/path.qml  |   14 -
 .../qmlgraphicspathview/data/pathview.qml          |   66 -
 .../qmlgraphicspathview/data/pathview1.qml         |    4 -
 .../qmlgraphicspathview/data/pathview2.qml         |   57 -
 .../qmlgraphicspathview/data/pathview3.qml         |   57 -
 .../qmlgraphicspathview/qmlgraphicspathview.pro    |    8 -
 .../tst_qmlgraphicspathview.cpp                    |  488 --
 .../qmlgraphicspositioners/data/grid-animated.qml  |   60 -
 .../qmlgraphicspositioners/data/grid-spacing.qml   |   40 -
 .../qmlgraphicspositioners/data/grid.qml           |   39 -
 .../data/horizontal-animated.qml                   |   40 -
 .../data/horizontal-spacing.qml                    |   27 -
 .../qmlgraphicspositioners/data/horizontal.qml     |   26 -
 .../data/propertychanges.qml                       |   39 -
 .../qmlgraphicspositioners/data/repeater.qml       |   20 -
 .../data/vertical-animated.qml                     |   40 -
 .../data/vertical-spacing.qml                      |   27 -
 .../qmlgraphicspositioners/data/vertical.qml       |   26 -
 .../qmlgraphicspositioners.pro                     |    7 -
 .../tst_qmlgraphicspositioners.cpp                 |  455 --
 .../qmlgraphicsrepeater/data/intmodel.qml          |   29 -
 .../qmlgraphicsrepeater/data/itemlist.qml          |   49 -
 .../qmlgraphicsrepeater/data/objlist.qml           |   21 -
 .../qmlgraphicsrepeater/data/properties.qml        |   11 -
 .../qmlgraphicsrepeater/data/repeater.qml          |   28 -
 .../qmlgraphicsrepeater/data/repeater2.qml         |   35 -
 .../qmlgraphicsrepeater/qmlgraphicsrepeater.pro    |    8 -
 .../tst_qmlgraphicsrepeater.cpp                    |  385 --
 .../qmlgraphicstext/qmlgraphicstext.pro            |    5 -
 .../qmlgraphicstext/tst_qmlgraphicstext.cpp        |  844 ---
 .../qmlgraphicstextedit/data/cursorTest.qml        |    8 -
 .../qmlgraphicstextedit/data/http/ErrItem.qml      |    7 -
 .../qmlgraphicstextedit/data/http/NormItem.qml     |    6 -
 .../data/http/cursorHttpTest.qml                   |   22 -
 .../data/http/cursorHttpTestFail1.qml              |   18 -
 .../data/http/cursorHttpTestFail2.qml              |   18 -
 .../data/http/cursorHttpTestPass.qml               |   18 -
 .../qmlgraphicstextedit/data/httpfail/FailItem.qml |    5 -
 .../qmlgraphicstextedit/data/httpslow/WaitItem.qml |    5 -
 .../qmlgraphicstextedit/data/inputmethodhints.qml  |    6 -
 .../qmlgraphicstextedit/data/navigation.qml        |   23 -
 .../qmlgraphicstextedit/data/readOnly.qml          |   12 -
 .../qmlgraphicstextedit/qmlgraphicstextedit.pro    |    9 -
 .../tst_qmlgraphicstextedit.cpp                    |  791 ---
 .../qmlgraphicstextinput/data/cursorTest.qml       |    8 -
 .../qmlgraphicstextinput/data/inputmethodhints.qml |    6 -
 .../qmlgraphicstextinput/data/masks.qml            |    7 -
 .../qmlgraphicstextinput/data/maxLength.qml        |    7 -
 .../qmlgraphicstextinput/data/navigation.qml       |   24 -
 .../qmlgraphicstextinput/data/readOnly.qml         |   12 -
 .../qmlgraphicstextinput/data/validators.qml       |   23 -
 .../qmlgraphicstextinput/qmlgraphicstextinput.pro  |    8 -
 .../tst_qmlgraphicstextinput.cpp                   |  656 --
 .../declarative/qmlgraphicswebview/data/basic.html |   17 -
 .../declarative/qmlgraphicswebview/data/basic.ico  |  Bin 318 -> 0 bytes
 .../declarative/qmlgraphicswebview/data/basic.png  |  Bin 3961 -> 0 bytes
 .../declarative/qmlgraphicswebview/data/basic.qml  |    5 -
 .../qmlgraphicswebview/data/elements.html          |   14 -
 .../qmlgraphicswebview/data/elements.qml           |    7 -
 .../qmlgraphicswebview/data/forward.html           |   12 -
 .../qmlgraphicswebview/data/javaScript.html        |   11 -
 .../qmlgraphicswebview/data/javaScript.qml         |   11 -
 .../qmlgraphicswebview/data/loadError.qml          |    5 -
 .../qmlgraphicswebview/data/newwindows.html        |   16 -
 .../qmlgraphicswebview/data/newwindows.qml         |   33 -
 .../qmlgraphicswebview/data/pixelCache.html        |   10 -
 .../qmlgraphicswebview/data/pixelCache.qml         |    6 -
 .../qmlgraphicswebview/data/propertychanges.qml    |   33 -
 .../qmlgraphicswebview/data/sethtml.qml            |    5 -
 .../qmlgraphicswebview/qmlgraphicswebview.pro      |   10 -
 .../declarative/qmlgraphicswebview/testtypes.cpp   |   52 -
 .../declarative/qmlgraphicswebview/testtypes.h     |   66 -
 .../qmlgraphicswebview/tst_qmlgraphicswebview.cpp  |  511 --
 .../declarative/qmlimageprovider/data/exists.png   |  Bin 2738 -> 0 bytes
 .../declarative/qmlimageprovider/data/exists1.png  |  Bin 2738 -> 0 bytes
 .../declarative/qmlimageprovider/data/exists2.png  |  Bin 2738 -> 0 bytes
 .../qmlimageprovider/qmlimageprovider.pro          |   12 -
 .../qmlimageprovider/tst_qmlimageprovider.cpp      |  166 -
 .../auto/declarative/qmlinfo/data/NestedObject.qml |    8 -
 .../declarative/qmlinfo/data/nestedQmlObject.qml   |    8 -
 tests/auto/declarative/qmlinfo/data/qmlObject.qml  |    8 -
 tests/auto/declarative/qmlinfo/qmlinfo.pro         |    7 -
 tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp     |  139 -
 .../declarative/qmlinstruction/qmlinstruction.pro  |    6 -
 .../qmlinstruction/tst_qmlinstruction.cpp          |  585 --
 tests/auto/declarative/qmllanguage/data/Alias.qml  |    8 -
 tests/auto/declarative/qmllanguage/data/Alias2.qml |    9 -
 tests/auto/declarative/qmllanguage/data/Alias3.qml |   12 -
 tests/auto/declarative/qmllanguage/data/Alias4.qml |    5 -
 .../qmllanguage/data/ComponentComposite.qml        |    5 -
 .../declarative/qmllanguage/data/CompositeType.qml |    4 -
 .../qmllanguage/data/CompositeType2.qml            |    5 -
 .../qmllanguage/data/CompositeType3.qml            |    5 -
 .../qmllanguage/data/CompositeType4.qml            |    6 -
 .../data/DynamicPropertiesNestedType.qml           |    6 -
 .../declarative/qmllanguage/data/HelperAlias.qml   |    9 -
 tests/auto/declarative/qmllanguage/data/I18n.qml   |    6 -
 .../declarative/qmllanguage/data/I18nType30.qml    |    5 -
 .../declarative/qmllanguage/data/MyComponent.qml   |    6 -
 .../qmllanguage/data/MyCompositeValueSource.qml    |    6 -
 .../qmllanguage/data/MyContainerComponent.qml      |    5 -
 .../declarative/qmllanguage/data/NestedAlias.qml   |   14 -
 .../qmllanguage/data/NestedErrorsType.qml          |    5 -
 .../qmllanguage/data/OnCompletedType.qml           |    8 -
 .../auto/declarative/qmllanguage/data/alias.1.qml  |    8 -
 .../auto/declarative/qmllanguage/data/alias.2.qml  |    8 -
 .../auto/declarative/qmllanguage/data/alias.3.qml  |   10 -
 .../auto/declarative/qmllanguage/data/alias.4.qml  |    6 -
 .../auto/declarative/qmllanguage/data/alias.5.qml  |   13 -
 .../auto/declarative/qmllanguage/data/alias.6.qml  |    8 -
 .../auto/declarative/qmllanguage/data/alias.7.qml  |   14 -
 .../auto/declarative/qmllanguage/data/alias.8.qml  |    9 -
 .../auto/declarative/qmllanguage/data/alias.9.qml  |    9 -
 .../qmllanguage/data/assignBasicTypes.qml          |   29 -
 .../qmllanguage/data/assignCompositeToType.qml     |   18 -
 .../data/assignLiteralSignalProperty.qml           |    4 -
 .../qmllanguage/data/assignObjectToSignal.qml      |    4 -
 .../qmllanguage/data/assignObjectToVariant.qml     |    7 -
 .../qmllanguage/data/assignQmlComponent.qml        |    4 -
 .../declarative/qmllanguage/data/assignSignal.qml  |    5 -
 .../qmllanguage/data/assignTypeExtremes.qml        |    5 -
 .../qmllanguage/data/attachedProperties.qml        |    8 -
 .../qmllanguage/data/autoComponentCreation.qml     |    4 -
 .../qmllanguage/data/component.1.errors.txt        |    1 -
 .../declarative/qmllanguage/data/component.1.qml   |    4 -
 .../qmllanguage/data/component.2.errors.txt        |    1 -
 .../declarative/qmllanguage/data/component.2.qml   |    9 -
 .../qmllanguage/data/component.3.errors.txt        |    1 -
 .../declarative/qmllanguage/data/component.3.qml   |    9 -
 .../qmllanguage/data/component.4.errors.txt        |    1 -
 .../declarative/qmllanguage/data/component.4.qml   |    6 -
 .../qmllanguage/data/component.5.errors.txt        |    1 -
 .../declarative/qmllanguage/data/component.5.qml   |    6 -
 .../qmllanguage/data/component.6.errors.txt        |    1 -
 .../declarative/qmllanguage/data/component.6.qml   |    6 -
 .../qmllanguage/data/componentCompositeType.qml    |    8 -
 .../qmllanguage/data/cppnamespace.2.qml            |    5 -
 .../declarative/qmllanguage/data/cppnamespace.qml  |    4 -
 tests/auto/declarative/qmllanguage/data/crash2.qml |    5 -
 .../data/customParserIdNotAllowed.errors.txt       |    1 -
 .../qmllanguage/data/customParserIdNotAllowed.qml  |    5 -
 .../qmllanguage/data/customParserTypes.qml         |    5 -
 .../qmllanguage/data/customVariantTypes.qml        |    4 -
 .../qmllanguage/data/declaredPropertyValues.qml    |    8 -
 .../qmllanguage/data/defaultGrouped.errors.txt     |    1 -
 .../qmllanguage/data/defaultGrouped.qml            |   10 -
 .../qmllanguage/data/defaultPropertyListOrder.qml  |   29 -
 .../qmllanguage/data/doubleSignal.errors.txt       |    1 -
 .../declarative/qmllanguage/data/doubleSignal.qml  |    7 -
 .../qmllanguage/data/duplicateIDs.errors.txt       |    1 -
 .../declarative/qmllanguage/data/duplicateIDs.qml  |    6 -
 .../qmllanguage/data/dynamicObject.1.qml           |    8 -
 .../qmllanguage/data/dynamicObjectProperties.qml   |   13 -
 .../qmllanguage/data/dynamicProperties.qml         |   14 -
 .../qmllanguage/data/dynamicPropertiesNested.qml   |    9 -
 .../qmllanguage/data/dynamicSignalsAndSlots.qml    |   10 -
 .../declarative/qmllanguage/data/empty.errors.txt  |    2 -
 tests/auto/declarative/qmllanguage/data/empty.qml  |    0
 .../qmllanguage/data/emptySignal.errors.txt        |    1 -
 .../declarative/qmllanguage/data/emptySignal.qml   |    6 -
 .../qmllanguage/data/failingComponent.errors.txt   |    1 -
 .../qmllanguage/data/failingComponentTest.qml      |    4 -
 .../qmllanguage/data/fakeDotProperty.errors.txt    |    1 -
 .../qmllanguage/data/fakeDotProperty.qml           |    4 -
 .../qmllanguage/data/finalOverride.errors.txt      |    1 -
 .../declarative/qmllanguage/data/finalOverride.qml |    4 -
 .../qmllanguage/data/i18nDeclaredPropertyNames.qml |    6 -
 .../qmllanguage/data/i18nDeclaredPropertyUse.qml   |    3 -
 .../declarative/qmllanguage/data/i18nNameSpace.qml |    5 -
 .../declarative/qmllanguage/data/i18nScript.qml    |   12 -
 .../declarative/qmllanguage/data/i18nStrings.qml   |    5 -
 .../auto/declarative/qmllanguage/data/i18nType.qml |    1 -
 .../declarative/qmllanguage/data/idProperty.qml    |    8 -
 .../data/importNamespaceConflict.errors.txt        |    1 -
 .../qmllanguage/data/importNamespaceConflict.qml   |    4 -
 .../data/importVersionMissingBuiltIn.errors.txt    |    1 -
 .../data/importVersionMissingBuiltIn.qml           |    7 -
 .../data/importVersionMissingInstalled.errors.txt  |    1 -
 .../data/importVersionMissingInstalled.qml         |    3 -
 .../qmllanguage/data/inlineQmlComponents.qml       |   10 -
 .../qmllanguage/data/interfaceProperty.qml         |    5 -
 .../qmllanguage/data/interfaceQList.qml            |    7 -
 .../data/invalidAttachedProperty.1.errors.txt      |    1 -
 .../qmllanguage/data/invalidAttachedProperty.1.qml |    7 -
 .../data/invalidAttachedProperty.10.errors.txt     |    1 -
 .../data/invalidAttachedProperty.10.qml            |    6 -
 .../data/invalidAttachedProperty.11.errors.txt     |    1 -
 .../data/invalidAttachedProperty.11.qml            |    7 -
 .../data/invalidAttachedProperty.2.errors.txt      |    1 -
 .../qmllanguage/data/invalidAttachedProperty.2.qml |    6 -
 .../data/invalidAttachedProperty.3.errors.txt      |    1 -
 .../qmllanguage/data/invalidAttachedProperty.3.qml |    8 -
 .../data/invalidAttachedProperty.4.errors.txt      |    1 -
 .../qmllanguage/data/invalidAttachedProperty.4.qml |    7 -
 .../data/invalidAttachedProperty.5.errors.txt      |    1 -
 .../qmllanguage/data/invalidAttachedProperty.5.qml |    7 -
 .../data/invalidAttachedProperty.6.errors.txt      |    1 -
 .../qmllanguage/data/invalidAttachedProperty.6.qml |    7 -
 .../data/invalidAttachedProperty.7.errors.txt      |    1 -
 .../qmllanguage/data/invalidAttachedProperty.7.qml |    6 -
 .../data/invalidAttachedProperty.8.errors.txt      |    1 -
 .../qmllanguage/data/invalidAttachedProperty.8.qml |    6 -
 .../data/invalidAttachedProperty.9.errors.txt      |    1 -
 .../qmllanguage/data/invalidAttachedProperty.9.qml |    7 -
 .../data/invalidGroupedProperty.1.errors.txt       |    1 -
 .../qmllanguage/data/invalidGroupedProperty.1.qml  |    6 -
 .../data/invalidGroupedProperty.2.errors.txt       |    1 -
 .../qmllanguage/data/invalidGroupedProperty.2.qml  |    7 -
 .../data/invalidGroupedProperty.3.errors.txt       |    1 -
 .../qmllanguage/data/invalidGroupedProperty.3.qml  |    5 -
 .../data/invalidGroupedProperty.4.errors.txt       |    1 -
 .../qmllanguage/data/invalidGroupedProperty.4.qml  |    5 -
 .../data/invalidGroupedProperty.5.errors.txt       |    1 -
 .../qmllanguage/data/invalidGroupedProperty.5.qml  |    5 -
 .../data/invalidGroupedProperty.6.errors.txt       |    1 -
 .../qmllanguage/data/invalidGroupedProperty.6.qml  |    6 -
 .../data/invalidGroupedProperty.7.errors.txt       |    1 -
 .../qmllanguage/data/invalidGroupedProperty.7.qml  |    5 -
 .../qmllanguage/data/invalidID.2.errors.txt        |    2 -
 .../declarative/qmllanguage/data/invalidID.2.qml   |    5 -
 .../qmllanguage/data/invalidID.3.errors.txt        |    1 -
 .../declarative/qmllanguage/data/invalidID.3.qml   |    5 -
 .../qmllanguage/data/invalidID.4.errors.txt        |    1 -
 .../declarative/qmllanguage/data/invalidID.4.qml   |    6 -
 .../qmllanguage/data/invalidID.5.errors.txt        |    1 -
 .../declarative/qmllanguage/data/invalidID.5.qml   |    6 -
 .../qmllanguage/data/invalidID.6.errors.txt        |    1 -
 .../declarative/qmllanguage/data/invalidID.6.qml   |    5 -
 .../qmllanguage/data/invalidID.errors.txt          |    1 -
 .../declarative/qmllanguage/data/invalidID.qml     |    4 -
 .../qmllanguage/data/invalidImportID.errors.txt    |    1 -
 .../qmllanguage/data/invalidImportID.qml           |    4 -
 .../qmllanguage/data/invalidRoot.errors.txt        |    1 -
 .../declarative/qmllanguage/data/invalidRoot.qml   |    2 -
 .../lib/com/nokia/installedtest/InstalledTest.qml  |    2 -
 .../lib/com/nokia/installedtest/InstalledTest2.qml |    2 -
 .../lib/com/nokia/installedtest/PrivateType.qml    |    2 -
 .../data/lib/com/nokia/installedtest/qmldir        |    4 -
 .../qmllanguage/data/listAssignment.2.errors.txt   |    2 -
 .../qmllanguage/data/listAssignment.2.qml          |    4 -
 .../qmllanguage/data/listAssignment.3.errors.txt   |    1 -
 .../qmllanguage/data/listAssignment.3.qml          |    6 -
 .../qmllanguage/data/listItemDeleteSelf.qml        |   38 -
 .../qmllanguage/data/listProperties.qml            |    9 -
 .../qmllanguage/data/missingObject.errors.txt      |    1 -
 .../declarative/qmllanguage/data/missingObject.qml |    1 -
 .../qmllanguage/data/missingSignal.errors.txt      |    1 -
 .../declarative/qmllanguage/data/missingSignal.qml |    5 -
 .../data/missingValueTypeProperty.errors.txt       |    1 -
 .../qmllanguage/data/missingValueTypeProperty.qml  |    5 -
 .../qmllanguage/data/nestedErrors.errors.txt       |    2 -
 .../declarative/qmllanguage/data/nestedErrors.qml  |    6 -
 .../data/nonexistantProperty.1.errors.txt          |    1 -
 .../qmllanguage/data/nonexistantProperty.1.qml     |    2 -
 .../data/nonexistantProperty.2.errors.txt          |    1 -
 .../qmllanguage/data/nonexistantProperty.2.qml     |    4 -
 .../data/nonexistantProperty.3.errors.txt          |    1 -
 .../qmllanguage/data/nonexistantProperty.3.qml     |    4 -
 .../data/nonexistantProperty.4.errors.txt          |    1 -
 .../qmllanguage/data/nonexistantProperty.4.qml     |    4 -
 .../data/nonexistantProperty.5.errors.txt          |    1 -
 .../qmllanguage/data/nonexistantProperty.5.qml     |    4 -
 .../data/nonexistantProperty.6.errors.txt          |    1 -
 .../qmllanguage/data/nonexistantProperty.6.qml     |    4 -
 .../qmllanguage/data/nullDotProperty.errors.txt    |    1 -
 .../qmllanguage/data/nullDotProperty.qml           |    4 -
 .../data/objectValueTypeProperty.errors.txt        |    1 -
 .../qmllanguage/data/objectValueTypeProperty.qml   |    6 -
 .../declarative/qmllanguage/data/onCompleted.qml   |   17 -
 .../qmllanguage/data/property.1.errors.txt         |    1 -
 .../declarative/qmllanguage/data/property.1.qml    |    5 -
 .../qmllanguage/data/property.2.errors.txt         |    1 -
 .../declarative/qmllanguage/data/property.2.qml    |    6 -
 .../qmllanguage/data/property.3.errors.txt         |    1 -
 .../declarative/qmllanguage/data/property.3.qml    |    7 -
 .../qmllanguage/data/property.4.errors.txt         |    1 -
 .../declarative/qmllanguage/data/property.4.qml    |    5 -
 .../qmllanguage/data/property.5.errors.txt         |    1 -
 .../declarative/qmllanguage/data/property.5.qml    |    6 -
 .../qmllanguage/data/propertyValueSource.2.qml     |    5 -
 .../qmllanguage/data/propertyValueSource.qml       |    4 -
 .../data/qmlAttachedPropertiesObjectMethod.1.qml   |    5 -
 .../data/qmlAttachedPropertiesObjectMethod.2.qml   |    6 -
 .../qmllanguage/data/readOnly.1.errors.txt         |    1 -
 .../declarative/qmllanguage/data/readOnly.1.qml    |    4 -
 .../qmllanguage/data/readOnly.2.errors.txt         |    1 -
 .../declarative/qmllanguage/data/readOnly.2.qml    |    4 -
 .../qmllanguage/data/readOnly.3.errors.txt         |    1 -
 .../declarative/qmllanguage/data/readOnly.3.qml    |    8 -
 .../qmllanguage/data/rootAsQmlComponent.qml        |    6 -
 .../qmllanguage/data/script.1.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/script.1.qml |    4 -
 .../qmllanguage/data/script.10.errors.txt          |    1 -
 .../declarative/qmllanguage/data/script.10.qml     |    9 -
 .../qmllanguage/data/script.11.errors.txt          |    1 -
 .../declarative/qmllanguage/data/script.11.qml     |    7 -
 .../qmllanguage/data/script.12.errors.txt          |    1 -
 .../declarative/qmllanguage/data/script.12.qml     |    6 -
 .../qmllanguage/data/script.2.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/script.2.qml |    7 -
 .../qmllanguage/data/script.3.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/script.3.qml |    7 -
 .../qmllanguage/data/script.4.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/script.4.qml |    8 -
 .../qmllanguage/data/script.5.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/script.5.qml |    9 -
 .../qmllanguage/data/script.6.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/script.6.qml |   11 -
 .../qmllanguage/data/script.7.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/script.7.qml |   11 -
 .../qmllanguage/data/script.8.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/script.8.qml |    9 -
 .../qmllanguage/data/script.9.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/script.9.qml |    7 -
 .../declarative/qmllanguage/data/scriptString.qml  |    6 -
 .../qmllanguage/data/signal.1.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/signal.1.qml |    5 -
 .../qmllanguage/data/signal.2.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/signal.2.qml |    6 -
 .../qmllanguage/data/signal.3.errors.txt           |    1 -
 .../auto/declarative/qmllanguage/data/signal.3.qml |    6 -
 .../qmllanguage/data/simpleBindings.qml            |   18 -
 .../qmllanguage/data/simpleContainer.qml           |    5 -
 .../declarative/qmllanguage/data/simpleObject.qml  |    2 -
 .../declarative/qmllanguage/data/subdir/Test.qml   |    2 -
 .../qmllanguage/data/subdir/subsubdir/SubTest.qml  |    2 -
 tests/auto/declarative/qmllanguage/data/test.js    |    0
 tests/auto/declarative/qmllanguage/data/test2.js   |    0
 .../qmllanguage/data/unregisteredObject.errors.txt |    1 -
 .../qmllanguage/data/unregisteredObject.qml        |    2 -
 .../data/unsupportedProperty.errors.txt            |    1 -
 .../qmllanguage/data/unsupportedProperty.qml       |    4 -
 .../declarative/qmllanguage/data/valueTypes.qml    |   13 -
 .../qmllanguage/data/wrongType.1.errors.txt        |    1 -
 .../declarative/qmllanguage/data/wrongType.1.qml   |    4 -
 .../qmllanguage/data/wrongType.10.errors.txt       |    1 -
 .../declarative/qmllanguage/data/wrongType.10.qml  |    5 -
 .../qmllanguage/data/wrongType.11.errors.txt       |    1 -
 .../declarative/qmllanguage/data/wrongType.11.qml  |    5 -
 .../qmllanguage/data/wrongType.12.errors.txt       |    1 -
 .../declarative/qmllanguage/data/wrongType.12.qml  |    5 -
 .../qmllanguage/data/wrongType.13.errors.txt       |    1 -
 .../declarative/qmllanguage/data/wrongType.13.qml  |    4 -
 .../qmllanguage/data/wrongType.14.errors.txt       |    1 -
 .../declarative/qmllanguage/data/wrongType.14.qml  |    5 -
 .../qmllanguage/data/wrongType.15.errors.txt       |    1 -
 .../declarative/qmllanguage/data/wrongType.15.qml  |    4 -
 .../qmllanguage/data/wrongType.2.errors.txt        |    1 -
 .../declarative/qmllanguage/data/wrongType.2.qml   |    4 -
 .../qmllanguage/data/wrongType.3.errors.txt        |    1 -
 .../declarative/qmllanguage/data/wrongType.3.qml   |    4 -
 .../qmllanguage/data/wrongType.4.errors.txt        |    1 -
 .../declarative/qmllanguage/data/wrongType.4.qml   |    4 -
 .../qmllanguage/data/wrongType.5.errors.txt        |    1 -
 .../declarative/qmllanguage/data/wrongType.5.qml   |    5 -
 .../qmllanguage/data/wrongType.6.errors.txt        |    1 -
 .../declarative/qmllanguage/data/wrongType.6.qml   |    5 -
 .../qmllanguage/data/wrongType.7.errors.txt        |    1 -
 .../declarative/qmllanguage/data/wrongType.7.qml   |    5 -
 .../qmllanguage/data/wrongType.8.errors.txt        |    1 -
 .../declarative/qmllanguage/data/wrongType.8.qml   |    5 -
 .../qmllanguage/data/wrongType.9.errors.txt        |    1 -
 .../declarative/qmllanguage/data/wrongType.9.qml   |    5 -
 tests/auto/declarative/qmllanguage/qmllanguage.pro |   14 -
 .../declarative/qmllanguage/LocalInternal.qml      |    3 -
 .../qtest/declarative/qmllanguage/Test.qml         |    2 -
 .../qtest/declarative/qmllanguage/TestLocal.qml    |    1 -
 .../qtest/declarative/qmllanguage/TestSubDir.qml   |    2 -
 .../qtest/declarative/qmllanguage/pics/blue.png    |  Bin 84 -> 0 bytes
 .../qtest/declarative/qmllanguage/qmldir           |    3 -
 .../declarative/qmllanguage/subdir/SubTest.qml     |    3 -
 .../qtest/declarative/qmllanguage/subdir/qmldir    |    1 -
 tests/auto/declarative/qmllanguage/testtypes.cpp   |   62 -
 tests/auto/declarative/qmllanguage/testtypes.h     |  547 --
 .../declarative/qmllanguage/tst_qmllanguage.cpp    | 1385 ----
 .../auto/declarative/qmllistmodel/qmllistmodel.pro |    6 -
 .../declarative/qmllistmodel/tst_qmllistmodel.cpp  |  346 -
 .../declarative/qmllistreference/data/MyType.qml   |    5 -
 .../qmllistreference/data/engineTypes.qml          |    9 -
 .../qmllistreference/data/variantToList.qml        |   10 -
 .../qmllistreference/qmllistreference.pro          |    5 -
 .../qmllistreference/tst_qmllistreference.cpp      |  579 --
 .../qmlmetaproperty/qmlmetaproperty.pro            |    5 -
 .../qmlmetaproperty/tst_qmlmetaproperty.cpp        | 1184 ----
 tests/auto/declarative/qmlmetatype/qmlmetatype.pro |    6 -
 .../declarative/qmlmetatype/tst_qmlmetatype.cpp    |  377 --
 tests/auto/declarative/qmlmoduleplugin/plugin.qml  |    3 -
 .../declarative/qmlmoduleplugin/plugin/plugin.cpp  |   89 -
 .../declarative/qmlmoduleplugin/plugin/plugin.pro  |    5 -
 .../qmlmoduleplugin/qmlmoduleplugin.pro            |    7 -
 .../qmlmoduleplugin/tst_qmlmoduleplugin.cpp        |  117 -
 .../qmlmoduleplugin/tst_qmlmoduleplugin.pro        |    4 -
 .../qmlnumberformatter/qmlnumberformatter.pro      |    5 -
 .../qmlnumberformatter/tst_qmlnumberformatter.cpp  |  222 -
 .../declarative/qmlpixmapcache/data/exists.png     |  Bin 2738 -> 0 bytes
 .../declarative/qmlpixmapcache/data/exists1.png    |  Bin 2738 -> 0 bytes
 .../declarative/qmlpixmapcache/data/exists2.png    |  Bin 2738 -> 0 bytes
 .../declarative/qmlpixmapcache/qmlpixmapcache.pro  |    9 -
 .../qmlpixmapcache/tst_qmlpixmapcache.cpp          |  282 -
 .../declarative/qmlpropertymap/qmlpropertymap.pro  |    5 -
 .../qmlpropertymap/tst_qmlpropertymap.cpp          |  171 -
 tests/auto/declarative/qmlqt/data/closestangle.qml |   12 -
 tests/auto/declarative/qmlqt/data/consoleLog.qml   |    8 -
 .../declarative/qmlqt/data/createComponent.qml     |   23 -
 .../declarative/qmlqt/data/createComponentData.qml |    5 -
 .../declarative/qmlqt/data/createQmlObject.qml     |   31 -
 tests/auto/declarative/qmlqt/data/darker.qml       |   11 -
 tests/auto/declarative/qmlqt/data/enums.qml        |    9 -
 tests/auto/declarative/qmlqt/data/hsla.qml         |   11 -
 tests/auto/declarative/qmlqt/data/lighter.qml      |   10 -
 tests/auto/declarative/qmlqt/data/md5.qml          |    6 -
 tests/auto/declarative/qmlqt/data/point.qml        |    9 -
 tests/auto/declarative/qmlqt/data/rect.qml         |    9 -
 tests/auto/declarative/qmlqt/data/rgba.qml         |   10 -
 tests/auto/declarative/qmlqt/data/size.qml         |   11 -
 tests/auto/declarative/qmlqt/data/tint.qml         |    9 -
 tests/auto/declarative/qmlqt/data/vector.qml       |    8 -
 tests/auto/declarative/qmlqt/qmlqt.pro             |    9 -
 tests/auto/declarative/qmlqt/tst_qmlqt.cpp         |  369 -
 .../qmlspringfollow/data/springfollow1.qml         |    4 -
 .../qmlspringfollow/data/springfollow2.qml         |    8 -
 .../qmlspringfollow/data/springfollow3.qml         |    8 -
 .../qmlspringfollow/qmlspringfollow.pro            |    8 -
 .../qmlspringfollow/tst_qmlspringfollow.cpp        |  137 -
 .../qmlstates/data/ExtendedRectangle.qml           |   19 -
 .../declarative/qmlstates/data/anchorChanges.qml   |   23 -
 .../declarative/qmlstates/data/anchorChanges2.qml  |   21 -
 .../declarative/qmlstates/data/anchorChanges3.qml  |   29 -
 .../declarative/qmlstates/data/anchorChanges4.qml  |   22 -
 .../declarative/qmlstates/data/anchorChanges5.qml  |   22 -
 .../data/autoStateAtStartupRestoreBug.qml          |   18 -
 .../declarative/qmlstates/data/basicBinding.qml    |   12 -
 .../declarative/qmlstates/data/basicBinding2.qml   |   12 -
 .../declarative/qmlstates/data/basicBinding3.qml   |   13 -
 .../declarative/qmlstates/data/basicBinding4.qml   |   17 -
 .../declarative/qmlstates/data/basicChanges.qml    |   10 -
 .../declarative/qmlstates/data/basicChanges2.qml   |   15 -
 .../declarative/qmlstates/data/basicChanges3.qml   |   15 -
 .../declarative/qmlstates/data/basicExtension.qml  |   16 -
 tests/auto/declarative/qmlstates/data/deleting.qml |   11 -
 .../declarative/qmlstates/data/deletingState.qml   |   13 -
 tests/auto/declarative/qmlstates/data/explicit.qml |   15 -
 .../declarative/qmlstates/data/fakeExtension.qml   |   16 -
 .../qmlstates/data/illegalTempState.qml            |   21 -
 .../declarative/qmlstates/data/legalTempState.qml  |   23 -
 .../declarative/qmlstates/data/nonExistantProp.qml |   11 -
 .../declarative/qmlstates/data/parentChange.qml    |   37 -
 .../declarative/qmlstates/data/parentChange2.qml   |   31 -
 .../declarative/qmlstates/data/parentChange3.qml   |   42 -
 .../declarative/qmlstates/data/parentChange4.qml   |   30 -
 .../declarative/qmlstates/data/parentChange5.qml   |   30 -
 .../declarative/qmlstates/data/propertyErrors.qml  |   10 -
 .../qmlstates/data/restoreEntryValues.qml          |   14 -
 tests/auto/declarative/qmlstates/data/script.qml   |   10 -
 .../declarative/qmlstates/data/signalOverride.qml  |   18 -
 .../declarative/qmlstates/data/signalOverride2.qml |    9 -
 .../qmlstates/data/signalOverrideCrash.qml         |   15 -
 tests/auto/declarative/qmlstates/qmlstates.pro     |    8 -
 tests/auto/declarative/qmlstates/tst_qmlstates.cpp |  917 ---
 .../declarative/qmlstyledtext/qmlstyledtext.pro    |    9 -
 .../qmlstyledtext/tst_qmlstyledtext.cpp            |   96 -
 .../qmlsystempalette/qmlsystempalette.pro          |    5 -
 .../qmlsystempalette/tst_qmlsystempalette.cpp      |  187 -
 tests/auto/declarative/qmltimer/qmltimer.pro       |    7 -
 tests/auto/declarative/qmltimer/tst_qmltimer.cpp   |  285 -
 .../qmlvaluetypes/data/autoBindingRemoval.2.qml    |    9 -
 .../qmlvaluetypes/data/autoBindingRemoval.3.qml    |   10 -
 .../qmlvaluetypes/data/autoBindingRemoval.qml      |    9 -
 .../qmlvaluetypes/data/bindingAssignment.qml       |    7 -
 .../qmlvaluetypes/data/bindingConflict.qml         |    8 -
 .../declarative/qmlvaluetypes/data/bindingRead.qml |    5 -
 .../qmlvaluetypes/data/bindingVariantCopy.qml      |   13 -
 .../qmlvaluetypes/data/deletedObject.js            |   13 -
 .../qmlvaluetypes/data/deletedObject.qml           |   12 -
 .../declarative/qmlvaluetypes/data/enums.1.qml     |    6 -
 .../declarative/qmlvaluetypes/data/enums.2.qml     |    6 -
 .../declarative/qmlvaluetypes/data/font_read.qml   |   18 -
 .../qmlvaluetypes/data/font_write.2.qml            |    6 -
 .../qmlvaluetypes/data/font_write.3.qml            |    7 -
 .../declarative/qmlvaluetypes/data/font_write.qml  |   16 -
 .../declarative/qmlvaluetypes/data/point_read.qml  |    7 -
 .../declarative/qmlvaluetypes/data/point_write.qml |    6 -
 .../declarative/qmlvaluetypes/data/pointf_read.qml |    8 -
 .../qmlvaluetypes/data/pointf_write.qml            |    6 -
 .../declarative/qmlvaluetypes/data/rect_read.qml   |   10 -
 .../declarative/qmlvaluetypes/data/rect_write.qml  |    9 -
 .../declarative/qmlvaluetypes/data/rectf_read.qml  |   10 -
 .../declarative/qmlvaluetypes/data/rectf_write.qml |    9 -
 .../qmlvaluetypes/data/scriptAccess.qml            |    9 -
 .../qmlvaluetypes/data/scriptVariantCopy.qml       |   14 -
 .../declarative/qmlvaluetypes/data/size_read.qml   |    8 -
 .../declarative/qmlvaluetypes/data/size_write.qml  |    7 -
 .../declarative/qmlvaluetypes/data/sizef_read.qml  |    9 -
 .../declarative/qmlvaluetypes/data/sizef_write.qml |    6 -
 .../qmlvaluetypes/data/staticAssignment.qml        |    5 -
 .../qmlvaluetypes/data/valueInterceptors.qml       |    8 -
 .../qmlvaluetypes/data/valueSources.qml            |    5 -
 .../qmlvaluetypes/data/vector3d_read.qml           |    9 -
 .../qmlvaluetypes/data/vector3d_write.qml          |    8 -
 .../declarative/qmlvaluetypes/qmlvaluetypes.pro    |   10 -
 tests/auto/declarative/qmlvaluetypes/testtypes.cpp |   48 -
 tests/auto/declarative/qmlvaluetypes/testtypes.h   |  154 -
 .../qmlvaluetypes/tst_qmlvaluetypes.cpp            |  616 --
 .../qmlxmlhttprequest/data/abort.expect            |   10 -
 .../declarative/qmlxmlhttprequest/data/abort.qml   |   42 -
 .../declarative/qmlxmlhttprequest/data/abort.reply |    3 -
 .../qmlxmlhttprequest/data/abort_opened.qml        |   58 -
 .../qmlxmlhttprequest/data/abort_unsent.qml        |   54 -
 .../declarative/qmlxmlhttprequest/data/attr.qml    |   80 -
 .../declarative/qmlxmlhttprequest/data/attr.xml    |    1 -
 .../qmlxmlhttprequest/data/callbackException.qml   |   25 -
 .../declarative/qmlxmlhttprequest/data/cdata.qml   |  135 -
 .../declarative/qmlxmlhttprequest/data/cdata.xml   |    2 -
 .../qmlxmlhttprequest/data/constructor.qml         |   14 -
 .../qmlxmlhttprequest/data/defaultState.qml        |   30 -
 .../qmlxmlhttprequest/data/document.qml            |   58 -
 .../qmlxmlhttprequest/data/document.xml            |    3 -
 .../qmlxmlhttprequest/data/domExceptionCodes.qml   |   60 -
 .../declarative/qmlxmlhttprequest/data/element.qml |  147 -
 .../declarative/qmlxmlhttprequest/data/element.xml |    1 -
 .../data/getAllResponseHeaders.qml                 |   65 -
 .../data/getAllResponseHeaders_args.qml            |   23 -
 .../data/getAllResponseHeaders_sent.qml            |   20 -
 .../data/getAllResponseHeaders_unsent.qml          |   16 -
 .../data/getResponseHeader.expect                  |    7 -
 .../qmlxmlhttprequest/data/getResponseHeader.qml   |   75 -
 .../qmlxmlhttprequest/data/getResponseHeader.reply |    8 -
 .../data/getResponseHeader_args.qml                |   23 -
 .../data/getResponseHeader_sent.qml                |   20 -
 .../data/getResponseHeader_unsent.qml              |   16 -
 .../qmlxmlhttprequest/data/instanceStateValues.qml |   33 -
 .../qmlxmlhttprequest/data/invalidMethodUsage.qml  |  160 -
 .../declarative/qmlxmlhttprequest/data/open.qml    |   53 -
 .../qmlxmlhttprequest/data/open_arg_count.1.qml    |   18 -
 .../qmlxmlhttprequest/data/open_arg_count.2.qml    |   18 -
 .../qmlxmlhttprequest/data/open_invalid_method.qml |   16 -
 .../qmlxmlhttprequest/data/open_network.expect     |    7 -
 .../qmlxmlhttprequest/data/open_network.reply      |    3 -
 .../qmlxmlhttprequest/data/open_network.wait       |    0
 .../qmlxmlhttprequest/data/open_sync.qml           |   17 -
 .../qmlxmlhttprequest/data/open_user.qml           |   53 -
 .../qmlxmlhttprequest/data/open_username.qml       |   54 -
 .../qmlxmlhttprequest/data/redirectError.qml       |   23 -
 .../qmlxmlhttprequest/data/redirectRecur.qml       |   23 -
 .../qmlxmlhttprequest/data/redirects.qml           |   22 -
 .../qmlxmlhttprequest/data/redirecttarget.html     |    1 -
 .../qmlxmlhttprequest/data/responseText.qml        |   52 -
 .../qmlxmlhttprequest/data/responseXML_invalid.qml |   24 -
 .../qmlxmlhttprequest/data/seconddocument.html     |    1 -
 .../qmlxmlhttprequest/data/send_alreadySent.qml    |   27 -
 .../qmlxmlhttprequest/data/send_data.1.expect      |   10 -
 .../qmlxmlhttprequest/data/send_data.1.qml         |   21 -
 .../qmlxmlhttprequest/data/send_data.2.qml         |   23 -
 .../qmlxmlhttprequest/data/send_data.3.qml         |   23 -
 .../qmlxmlhttprequest/data/send_data.4.expect      |   10 -
 .../qmlxmlhttprequest/data/send_data.4.qml         |   23 -
 .../qmlxmlhttprequest/data/send_data.5.qml         |   23 -
 .../qmlxmlhttprequest/data/send_data.6.expect      |   10 -
 .../qmlxmlhttprequest/data/send_data.6.qml         |   21 -
 .../qmlxmlhttprequest/data/send_data.7.qml         |   23 -
 .../qmlxmlhttprequest/data/send_data.reply         |    3 -
 .../qmlxmlhttprequest/data/send_ignoreData.qml     |   26 -
 .../qmlxmlhttprequest/data/send_ignoreData.reply   |    3 -
 .../data/send_ignoreData_GET.expect                |    7 -
 .../data/send_ignoreData_PUT.expect                |    7 -
 .../qmlxmlhttprequest/data/send_unsent.qml         |   16 -
 .../qmlxmlhttprequest/data/setRequestHeader.expect |    9 -
 .../qmlxmlhttprequest/data/setRequestHeader.qml    |   28 -
 .../qmlxmlhttprequest/data/setRequestHeader.reply  |    3 -
 .../data/setRequestHeader_args.qml                 |   18 -
 .../data/setRequestHeader_illegalName.qml          |   57 -
 .../data/setRequestHeader_sent.qml                 |   31 -
 .../data/setRequestHeader_unsent.qml               |   17 -
 .../qmlxmlhttprequest/data/staticStateValues.qml   |   24 -
 .../qmlxmlhttprequest/data/status.200.reply        |    3 -
 .../qmlxmlhttprequest/data/status.404.reply        |    3 -
 .../qmlxmlhttprequest/data/status.expect           |    7 -
 .../declarative/qmlxmlhttprequest/data/status.qml  |   77 -
 .../qmlxmlhttprequest/data/statusText.qml          |   77 -
 .../qmlxmlhttprequest/data/testdocument.html       |    1 -
 .../declarative/qmlxmlhttprequest/data/text.qml    |  131 -
 .../declarative/qmlxmlhttprequest/data/text.xml    |    1 -
 .../qmlxmlhttprequest/qmlxmlhttprequest.pro        |   13 -
 .../qmlxmlhttprequest/tst_qmlxmlhttprequest.cpp    | 1315 ----
 .../declarative/qmlxmllistmodel/data/model.qml     |   10 -
 .../declarative/qmlxmllistmodel/data/model.xml     |   54 -
 .../declarative/qmlxmllistmodel/data/model2.qml    |   11 -
 .../declarative/qmlxmllistmodel/data/recipes.qml   |   10 -
 .../declarative/qmlxmllistmodel/data/recipes.xml   |   90 -
 .../qmlxmllistmodel/data/roleErrors.qml            |   10 -
 .../declarative/qmlxmllistmodel/data/roleKeys.qml  |   13 -
 .../declarative/qmlxmllistmodel/data/unique.qml    |    8 -
 .../qmlxmllistmodel/qmlxmllistmodel.pro            |   11 -
 .../qmlxmllistmodel/tst_qmlxmllistmodel.cpp        |  457 --
 .../qpacketprotocol/tst_qpacketprotocol.cpp        |   12 +-
 tests/auto/declarative/shared/debugutil.cpp        |   46 +-
 tests/auto/declarative/shared/debugutil_p.h        |   50 +-
 tests/auto/declarative/sql/tst_sql.cpp             |   18 +-
 .../qdeclarativeborderimage/animated-smooth.qml    |   55 +
 .../visual/qdeclarativeborderimage/animated.qml    |   55 +
 .../visual/qdeclarativeborderimage/borders.qml     |   18 +
 .../content/MyBorderImage.qml                      |   38 +
 .../visual/qdeclarativeborderimage/content/bw.png  |  Bin 0 -> 1357 bytes
 .../content/colors-round.sci                       |    7 +
 .../content/colors-stretch.sci                     |    5 +
 .../qdeclarativeborderimage/content/colors.png     |  Bin 0 -> 1655 bytes
 .../data/animated-smooth.0.png                     |  Bin 0 -> 61731 bytes
 .../data/animated-smooth.1.png                     |  Bin 0 -> 98912 bytes
 .../data/animated-smooth.2.png                     |  Bin 0 -> 48780 bytes
 .../data/animated-smooth.3.png                     |  Bin 0 -> 32431 bytes
 .../data/animated-smooth.4.png                     |  Bin 0 -> 35835 bytes
 .../data/animated-smooth.5.png                     |  Bin 0 -> 79428 bytes
 .../data/animated-smooth.6.png                     |  Bin 0 -> 45928 bytes
 .../data/animated-smooth.qml                       | 1823 +++++
 .../qdeclarativeborderimage/data/animated.0.png    |  Bin 0 -> 23684 bytes
 .../qdeclarativeborderimage/data/animated.1.png    |  Bin 0 -> 29115 bytes
 .../qdeclarativeborderimage/data/animated.2.png    |  Bin 0 -> 27580 bytes
 .../qdeclarativeborderimage/data/animated.3.png    |  Bin 0 -> 14822 bytes
 .../qdeclarativeborderimage/data/animated.4.png    |  Bin 0 -> 21356 bytes
 .../qdeclarativeborderimage/data/animated.5.png    |  Bin 0 -> 31143 bytes
 .../qdeclarativeborderimage/data/animated.6.png    |  Bin 0 -> 26468 bytes
 .../qdeclarativeborderimage/data/animated.7.png    |  Bin 0 -> 16225 bytes
 .../qdeclarativeborderimage/data/animated.qml      | 2091 ++++++
 .../qdeclarativeborderimage/data/borders.0.png     |  Bin 0 -> 23029 bytes
 .../qdeclarativeborderimage/data/borders.1.png     |  Bin 0 -> 23029 bytes
 .../qdeclarativeborderimage/data/borders.2.png     |  Bin 0 -> 23029 bytes
 .../qdeclarativeborderimage/data/borders.3.png     |  Bin 0 -> 23029 bytes
 .../qdeclarativeborderimage/data/borders.4.png     |  Bin 0 -> 23029 bytes
 .../qdeclarativeborderimage/data/borders.qml       | 1359 ++++
 .../qdeclarativeeasefollow/data/easefollow.0.png   |  Bin 0 -> 1305 bytes
 .../qdeclarativeeasefollow/data/easefollow.1.png   |  Bin 0 -> 1306 bytes
 .../qdeclarativeeasefollow/data/easefollow.2.png   |  Bin 0 -> 1305 bytes
 .../qdeclarativeeasefollow/data/easefollow.3.png   |  Bin 0 -> 1303 bytes
 .../qdeclarativeeasefollow/data/easefollow.4.png   |  Bin 0 -> 1303 bytes
 .../qdeclarativeeasefollow/data/easefollow.5.png   |  Bin 0 -> 1305 bytes
 .../qdeclarativeeasefollow/data/easefollow.6.png   |  Bin 0 -> 1306 bytes
 .../qdeclarativeeasefollow/data/easefollow.qml     | 1807 +++++
 .../visual/qdeclarativeeasefollow/easefollow.qml   |   40 +
 .../data/flickable-horizontal.0.png                |  Bin 0 -> 1427 bytes
 .../data/flickable-horizontal.1.png                |  Bin 0 -> 1357 bytes
 .../data/flickable-horizontal.2.png                |  Bin 0 -> 1405 bytes
 .../data/flickable-horizontal.3.png                |  Bin 0 -> 1427 bytes
 .../data/flickable-horizontal.qml                  | 1199 ++++
 .../data/flickable-vertical.0.png                  |  Bin 0 -> 1951 bytes
 .../data/flickable-vertical.1.png                  |  Bin 0 -> 1951 bytes
 .../data/flickable-vertical.10.png                 |  Bin 0 -> 1952 bytes
 .../data/flickable-vertical.11.png                 |  Bin 0 -> 1930 bytes
 .../data/flickable-vertical.12.png                 |  Bin 0 -> 1974 bytes
 .../data/flickable-vertical.13.png                 |  Bin 0 -> 1961 bytes
 .../data/flickable-vertical.14.png                 |  Bin 0 -> 1959 bytes
 .../data/flickable-vertical.15.png                 |  Bin 0 -> 1937 bytes
 .../data/flickable-vertical.16.png                 |  Bin 0 -> 1618 bytes
 .../data/flickable-vertical.17.png                 |  Bin 0 -> 1952 bytes
 .../data/flickable-vertical.18.png                 |  Bin 0 -> 1952 bytes
 .../data/flickable-vertical.19.png                 |  Bin 0 -> 1930 bytes
 .../data/flickable-vertical.2.png                  |  Bin 0 -> 1976 bytes
 .../data/flickable-vertical.20.png                 |  Bin 0 -> 1930 bytes
 .../data/flickable-vertical.21.png                 |  Bin 0 -> 1947 bytes
 .../data/flickable-vertical.22.png                 |  Bin 0 -> 1941 bytes
 .../data/flickable-vertical.23.png                 |  Bin 0 -> 1951 bytes
 .../data/flickable-vertical.24.png                 |    0
 .../data/flickable-vertical.3.png                  |  Bin 0 -> 1987 bytes
 .../data/flickable-vertical.4.png                  |  Bin 0 -> 1947 bytes
 .../data/flickable-vertical.5.png                  |  Bin 0 -> 1975 bytes
 .../data/flickable-vertical.6.png                  |  Bin 0 -> 1928 bytes
 .../data/flickable-vertical.7.png                  |  Bin 0 -> 1928 bytes
 .../data/flickable-vertical.8.png                  |  Bin 0 -> 1928 bytes
 .../data/flickable-vertical.9.png                  |  Bin 0 -> 1928 bytes
 .../data/flickable-vertical.qml                    | 7037 ++++++++++++++++++++
 .../qdeclarativeflickable/flickable-horizontal.qml |   37 +
 .../qdeclarativeflickable/flickable-vertical.qml   |   91 +
 .../qdeclarativeflipable/data/test-flipable.0.png  |  Bin 0 -> 1090 bytes
 .../qdeclarativeflipable/data/test-flipable.1.png  |  Bin 0 -> 1134 bytes
 .../qdeclarativeflipable/data/test-flipable.2.png  |  Bin 0 -> 961 bytes
 .../qdeclarativeflipable/data/test-flipable.3.png  |  Bin 0 -> 1076 bytes
 .../qdeclarativeflipable/data/test-flipable.4.png  |  Bin 0 -> 1134 bytes
 .../qdeclarativeflipable/data/test-flipable.5.png  |  Bin 0 -> 969 bytes
 .../qdeclarativeflipable/data/test-flipable.qml    | 1623 +++++
 .../visual/qdeclarativeflipable/test-flipable.qml  |   79 +
 .../qdeclarativegridview/data/gridview.0.png       |  Bin 0 -> 1303 bytes
 .../qdeclarativegridview/data/gridview.1.png       |  Bin 0 -> 1317 bytes
 .../qdeclarativegridview/data/gridview.2.png       |  Bin 0 -> 1318 bytes
 .../qdeclarativegridview/data/gridview.3.png       |  Bin 0 -> 1306 bytes
 .../qdeclarativegridview/data/gridview.4.png       |  Bin 0 -> 1308 bytes
 .../qdeclarativegridview/data/gridview.5.png       |  Bin 0 -> 1303 bytes
 .../qdeclarativegridview/data/gridview.6.png       |  Bin 0 -> 1323 bytes
 .../qdeclarativegridview/data/gridview.7.png       |  Bin 0 -> 1325 bytes
 .../qdeclarativegridview/data/gridview.8.png       |  Bin 0 -> 1346 bytes
 .../qdeclarativegridview/data/gridview.9.png       |  Bin 0 -> 1303 bytes
 .../visual/qdeclarativegridview/data/gridview.qml  | 2859 ++++++++
 .../qdeclarativegridview/data/gridview2.0.png      |  Bin 0 -> 1310 bytes
 .../qdeclarativegridview/data/gridview2.1.png      |  Bin 0 -> 1322 bytes
 .../qdeclarativegridview/data/gridview2.10.png     |  Bin 0 -> 1313 bytes
 .../qdeclarativegridview/data/gridview2.2.png      |  Bin 0 -> 1341 bytes
 .../qdeclarativegridview/data/gridview2.3.png      |  Bin 0 -> 1368 bytes
 .../qdeclarativegridview/data/gridview2.4.png      |  Bin 0 -> 1319 bytes
 .../qdeclarativegridview/data/gridview2.5.png      |  Bin 0 -> 1352 bytes
 .../qdeclarativegridview/data/gridview2.6.png      |  Bin 0 -> 1309 bytes
 .../qdeclarativegridview/data/gridview2.7.png      |  Bin 0 -> 1347 bytes
 .../qdeclarativegridview/data/gridview2.8.png      |  Bin 0 -> 1310 bytes
 .../qdeclarativegridview/data/gridview2.9.png      |  Bin 0 -> 1354 bytes
 .../visual/qdeclarativegridview/data/gridview2.qml | 2479 +++++++
 .../visual/qdeclarativegridview/gridview.qml       |   51 +
 .../visual/qdeclarativegridview/gridview2.qml      |   58 +
 .../visual/qdeclarativemouseregion/data/drag.0.png |  Bin 0 -> 1563 bytes
 .../visual/qdeclarativemouseregion/data/drag.1.png |  Bin 0 -> 1570 bytes
 .../visual/qdeclarativemouseregion/data/drag.2.png |  Bin 0 -> 1553 bytes
 .../visual/qdeclarativemouseregion/data/drag.3.png |  Bin 0 -> 1563 bytes
 .../visual/qdeclarativemouseregion/data/drag.4.png |  Bin 0 -> 1569 bytes
 .../visual/qdeclarativemouseregion/data/drag.5.png |  Bin 0 -> 1569 bytes
 .../visual/qdeclarativemouseregion/data/drag.6.png |  Bin 0 -> 1566 bytes
 .../visual/qdeclarativemouseregion/data/drag.7.png |  Bin 0 -> 1566 bytes
 .../visual/qdeclarativemouseregion/data/drag.8.png |  Bin 0 -> 1567 bytes
 .../visual/qdeclarativemouseregion/data/drag.qml   | 5207 +++++++++++++++
 .../qdeclarativemouseregion/data/mouseregion.0.png |  Bin 0 -> 471 bytes
 .../qdeclarativemouseregion/data/mouseregion.1.png |  Bin 0 -> 474 bytes
 .../data/mouseregion.10.png                        |  Bin 0 -> 479 bytes
 .../data/mouseregion.11.png                        |  Bin 0 -> 479 bytes
 .../data/mouseregion.12.png                        |  Bin 0 -> 479 bytes
 .../data/mouseregion.13.png                        |  Bin 0 -> 479 bytes
 .../data/mouseregion.14.png                        |  Bin 0 -> 479 bytes
 .../data/mouseregion.15.png                        |  Bin 0 -> 479 bytes
 .../data/mouseregion.16.png                        |  Bin 0 -> 1454 bytes
 .../data/mouseregion.17.png                        |  Bin 0 -> 1454 bytes
 .../data/mouseregion.18.png                        |  Bin 0 -> 1454 bytes
 .../data/mouseregion.19.png                        |  Bin 0 -> 1454 bytes
 .../qdeclarativemouseregion/data/mouseregion.2.png |  Bin 0 -> 474 bytes
 .../data/mouseregion.20.png                        |  Bin 0 -> 1454 bytes
 .../data/mouseregion.21.png                        |  Bin 0 -> 1454 bytes
 .../data/mouseregion.22.png                        |  Bin 0 -> 1454 bytes
 .../qdeclarativemouseregion/data/mouseregion.3.png |  Bin 0 -> 474 bytes
 .../qdeclarativemouseregion/data/mouseregion.4.png |  Bin 0 -> 481 bytes
 .../qdeclarativemouseregion/data/mouseregion.5.png |  Bin 0 -> 481 bytes
 .../qdeclarativemouseregion/data/mouseregion.6.png |  Bin 0 -> 481 bytes
 .../qdeclarativemouseregion/data/mouseregion.7.png |  Bin 0 -> 481 bytes
 .../qdeclarativemouseregion/data/mouseregion.8.png |  Bin 0 -> 479 bytes
 .../qdeclarativemouseregion/data/mouseregion.9.png |  Bin 0 -> 479 bytes
 .../qdeclarativemouseregion/data/mouseregion.qml   | 5867 ++++++++++++++++
 .../visual/qdeclarativemouseregion/drag.qml        |   21 +
 .../visual/qdeclarativemouseregion/mouseregion.qml |  124 +
 .../qdeclarativeparticles/data/particles.0.png     |  Bin 0 -> 10219 bytes
 .../qdeclarativeparticles/data/particles.1.png     |  Bin 0 -> 13469 bytes
 .../qdeclarativeparticles/data/particles.2.png     |  Bin 0 -> 14051 bytes
 .../qdeclarativeparticles/data/particles.qml       |  775 +++
 .../visual/qdeclarativeparticles/particles.qml     |   54 +
 .../visual/qdeclarativeparticles/star.png          |  Bin 0 -> 262 bytes
 .../data/test-pathview-2.0.png                     |  Bin 0 -> 2263 bytes
 .../data/test-pathview-2.1.png                     |  Bin 0 -> 2329 bytes
 .../data/test-pathview-2.2.png                     |  Bin 0 -> 2279 bytes
 .../data/test-pathview-2.3.png                     |  Bin 0 -> 2263 bytes
 .../data/test-pathview-2.4.png                     |  Bin 0 -> 2263 bytes
 .../data/test-pathview-2.5.png                     |  Bin 0 -> 2308 bytes
 .../data/test-pathview-2.6.png                     |  Bin 0 -> 2280 bytes
 .../qdeclarativepathview/data/test-pathview-2.qml  | 2303 +++++++
 .../qdeclarativepathview/data/test-pathview.0.png  |  Bin 0 -> 2321 bytes
 .../qdeclarativepathview/data/test-pathview.1.png  |  Bin 0 -> 2380 bytes
 .../qdeclarativepathview/data/test-pathview.2.png  |  Bin 0 -> 2315 bytes
 .../qdeclarativepathview/data/test-pathview.3.png  |  Bin 0 -> 2372 bytes
 .../qdeclarativepathview/data/test-pathview.4.png  |  Bin 0 -> 2327 bytes
 .../qdeclarativepathview/data/test-pathview.qml    | 1495 +++++
 .../qdeclarativepathview/test-pathview-2.qml       |   62 +
 .../visual/qdeclarativepathview/test-pathview.qml  |   62 +
 .../qdeclarativepositioners/data/dynamic.0.png     |  Bin 0 -> 1429 bytes
 .../qdeclarativepositioners/data/dynamic.1.png     |  Bin 0 -> 1433 bytes
 .../qdeclarativepositioners/data/dynamic.2.png     |  Bin 0 -> 1431 bytes
 .../qdeclarativepositioners/data/dynamic.3.png     |  Bin 0 -> 1428 bytes
 .../qdeclarativepositioners/data/dynamic.4.png     |  Bin 0 -> 1432 bytes
 .../qdeclarativepositioners/data/dynamic.5.png     |  Bin 0 -> 1434 bytes
 .../qdeclarativepositioners/data/dynamic.qml       | 1603 +++++
 .../qdeclarativepositioners/data/repeater.0.png    |  Bin 0 -> 2790 bytes
 .../qdeclarativepositioners/data/repeater.qml      |  339 +
 .../visual/qdeclarativepositioners/dynamic.qml     |   65 +
 .../visual/qdeclarativepositioners/repeater.qml    |   15 +
 .../visual/qdeclarativespringfollow/clock.qml      |   64 +
 .../content/background.png                         |  Bin 0 -> 46895 bytes
 .../qdeclarativespringfollow/content/center.png    |  Bin 0 -> 765 bytes
 .../qdeclarativespringfollow/content/clock.png     |  Bin 0 -> 20653 bytes
 .../qdeclarativespringfollow/content/hour.png      |  Bin 0 -> 625 bytes
 .../qdeclarativespringfollow/content/minute.png    |  Bin 0 -> 625 bytes
 .../qdeclarativespringfollow/content/second.png    |  Bin 0 -> 303 bytes
 .../qdeclarativespringfollow/data/clock.0.png      |  Bin 0 -> 17294 bytes
 .../qdeclarativespringfollow/data/clock.1.png      |  Bin 0 -> 17394 bytes
 .../qdeclarativespringfollow/data/clock.2.png      |  Bin 0 -> 17524 bytes
 .../qdeclarativespringfollow/data/clock.3.png      |  Bin 0 -> 17572 bytes
 .../visual/qdeclarativespringfollow/data/clock.qml | 1135 ++++
 .../qdeclarativespringfollow/data/follow.0.png     |  Bin 0 -> 959 bytes
 .../qdeclarativespringfollow/data/follow.1.png     |  Bin 0 -> 1244 bytes
 .../qdeclarativespringfollow/data/follow.10.png    |  Bin 0 -> 1299 bytes
 .../qdeclarativespringfollow/data/follow.2.png     |  Bin 0 -> 1224 bytes
 .../qdeclarativespringfollow/data/follow.3.png     |  Bin 0 -> 1243 bytes
 .../qdeclarativespringfollow/data/follow.4.png     |  Bin 0 -> 1230 bytes
 .../qdeclarativespringfollow/data/follow.5.png     |  Bin 0 -> 1231 bytes
 .../qdeclarativespringfollow/data/follow.6.png     |  Bin 0 -> 1239 bytes
 .../qdeclarativespringfollow/data/follow.7.png     |  Bin 0 -> 1241 bytes
 .../qdeclarativespringfollow/data/follow.8.png     |  Bin 0 -> 1237 bytes
 .../qdeclarativespringfollow/data/follow.9.png     |  Bin 0 -> 1229 bytes
 .../qdeclarativespringfollow/data/follow.qml       | 1763 +++++
 .../visual/qdeclarativespringfollow/follow.qml     |   71 +
 .../baseline/data-X11/parentanchor.qml             |  131 +
 .../baseline/data/parentanchor.qml                 |  131 +
 .../qdeclarativetext/baseline/parentanchor.qml     |   14 +
 .../qdeclarativetext/elide/data-MAC/elide.0.png    |  Bin 0 -> 2276 bytes
 .../qdeclarativetext/elide/data-MAC/elide.qml      |  279 +
 .../qdeclarativetext/elide/data-MAC/elide2.0.png   |  Bin 0 -> 4818 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.1.png   |  Bin 0 -> 4089 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.2.png   |  Bin 0 -> 3128 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.3.png   |  Bin 0 -> 1963 bytes
 .../qdeclarativetext/elide/data-MAC/elide2.qml     |  991 +++
 .../elide/data-MAC/multilength.0.png               |  Bin 0 -> 736 bytes
 .../elide/data-MAC/multilength.qml                 |  303 +
 .../qdeclarativetext/elide/data-X11/elide.0.png    |  Bin 0 -> 1002 bytes
 .../qdeclarativetext/elide/data-X11/elide.qml      |  279 +
 .../elide/data-X11/multilength.0.png               |  Bin 0 -> 596 bytes
 .../elide/data-X11/multilength.qml                 |  303 +
 .../visual/qdeclarativetext/elide/data/elide.0.png |  Bin 0 -> 1604 bytes
 .../visual/qdeclarativetext/elide/data/elide.qml   |  279 +
 .../qdeclarativetext/elide/data/elide2.0.png       |  Bin 0 -> 4818 bytes
 .../qdeclarativetext/elide/data/elide2.1.png       |  Bin 0 -> 4089 bytes
 .../qdeclarativetext/elide/data/elide2.2.png       |  Bin 0 -> 3128 bytes
 .../qdeclarativetext/elide/data/elide2.3.png       |  Bin 0 -> 1963 bytes
 .../visual/qdeclarativetext/elide/data/elide2.qml  |  991 +++
 .../visual/qdeclarativetext/elide/elide.qml        |   31 +
 .../visual/qdeclarativetext/elide/elide2.qml       |   12 +
 .../visual/qdeclarativetext/elide/multilength.qml  |   19 +
 .../qdeclarativetext/font/data-MAC/plaintext.0.png |  Bin 0 -> 103018 bytes
 .../qdeclarativetext/font/data-MAC/plaintext.qml   |  351 +
 .../qdeclarativetext/font/data-MAC/richtext.0.png  |  Bin 0 -> 136492 bytes
 .../qdeclarativetext/font/data-MAC/richtext.qml    |  359 +
 .../qdeclarativetext/font/data/plaintext.0.png     |  Bin 0 -> 94120 bytes
 .../qdeclarativetext/font/data/plaintext.qml       |  351 +
 .../qdeclarativetext/font/data/richtext.0.png      |  Bin 0 -> 121122 bytes
 .../visual/qdeclarativetext/font/data/richtext.qml |  359 +
 .../visual/qdeclarativetext/font/plaintext.qml     |   85 +
 .../visual/qdeclarativetext/font/richtext.qml      |   85 +
 .../visual/qdeclarativetextedit/cursorDelegate.qml |   35 +
 .../data-MAC/cursorDelegate.0.png                  |  Bin 0 -> 793 bytes
 .../data-MAC/cursorDelegate.1.png                  |  Bin 0 -> 795 bytes
 .../data-MAC/cursorDelegate.2.png                  |  Bin 0 -> 803 bytes
 .../data-MAC/cursorDelegate.3.png                  |  Bin 0 -> 805 bytes
 .../data-MAC/cursorDelegate.4.png                  |  Bin 0 -> 805 bytes
 .../data-MAC/cursorDelegate.5.png                  |  Bin 0 -> 805 bytes
 .../data-MAC/cursorDelegate.6.png                  |  Bin 0 -> 799 bytes
 .../data-MAC/cursorDelegate.7.png                  |  Bin 0 -> 799 bytes
 .../data-MAC/cursorDelegate.8.png                  |  Bin 0 -> 803 bytes
 .../data-MAC/cursorDelegate.qml                    | 3555 ++++++++++
 .../qdeclarativetextedit/data-MAC/qt-669.0.png     |  Bin 0 -> 365 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.1.png     |  Bin 0 -> 365 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.2.png     |  Bin 0 -> 366 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.3.png     |  Bin 0 -> 362 bytes
 .../qdeclarativetextedit/data-MAC/qt-669.qml       | 1371 ++++
 .../qdeclarativetextedit/data-X11/wrap.0.png       |  Bin 0 -> 1110 bytes
 .../qdeclarativetextedit/data-X11/wrap.1.png       |  Bin 0 -> 1110 bytes
 .../qdeclarativetextedit/data-X11/wrap.2.png       |  Bin 0 -> 1110 bytes
 .../qdeclarativetextedit/data-X11/wrap.3.png       |  Bin 0 -> 1110 bytes
 .../qdeclarativetextedit/data-X11/wrap.4.png       |  Bin 0 -> 1110 bytes
 .../qdeclarativetextedit/data-X11/wrap.5.png       |  Bin 0 -> 1110 bytes
 .../qdeclarativetextedit/data-X11/wrap.6.png       |  Bin 0 -> 1110 bytes
 .../visual/qdeclarativetextedit/data-X11/wrap.qml  | 2467 +++++++
 .../qdeclarativetextedit/data/cursorDelegate.0.png |  Bin 0 -> 3322 bytes
 .../qdeclarativetextedit/data/cursorDelegate.1.png |  Bin 0 -> 3323 bytes
 .../qdeclarativetextedit/data/cursorDelegate.2.png |  Bin 0 -> 3325 bytes
 .../qdeclarativetextedit/data/cursorDelegate.3.png |  Bin 0 -> 3332 bytes
 .../qdeclarativetextedit/data/cursorDelegate.4.png |  Bin 0 -> 3329 bytes
 .../qdeclarativetextedit/data/cursorDelegate.5.png |  Bin 0 -> 3818 bytes
 .../qdeclarativetextedit/data/cursorDelegate.6.png |  Bin 0 -> 3333 bytes
 .../qdeclarativetextedit/data/cursorDelegate.7.png |  Bin 0 -> 3332 bytes
 .../qdeclarativetextedit/data/cursorDelegate.8.png |  Bin 0 -> 3347 bytes
 .../qdeclarativetextedit/data/cursorDelegate.qml   | 3555 ++++++++++
 .../visual/qdeclarativetextedit/data/qt-669.0.png  |  Bin 0 -> 4802 bytes
 .../visual/qdeclarativetextedit/data/qt-669.1.png  |  Bin 0 -> 4804 bytes
 .../visual/qdeclarativetextedit/data/qt-669.2.png  |  Bin 0 -> 4801 bytes
 .../visual/qdeclarativetextedit/data/qt-669.3.png  |  Bin 0 -> 4791 bytes
 .../visual/qdeclarativetextedit/data/qt-669.qml    | 1371 ++++
 .../visual/qdeclarativetextedit/data/wrap.0.png    |  Bin 0 -> 1110 bytes
 .../visual/qdeclarativetextedit/data/wrap.1.png    |  Bin 0 -> 1110 bytes
 .../visual/qdeclarativetextedit/data/wrap.2.png    |  Bin 0 -> 1110 bytes
 .../visual/qdeclarativetextedit/data/wrap.3.png    |  Bin 0 -> 1110 bytes
 .../visual/qdeclarativetextedit/data/wrap.4.png    |  Bin 0 -> 1110 bytes
 .../visual/qdeclarativetextedit/data/wrap.5.png    |  Bin 0 -> 1110 bytes
 .../visual/qdeclarativetextedit/data/wrap.6.png    |  Bin 0 -> 1110 bytes
 .../visual/qdeclarativetextedit/data/wrap.qml      | 2467 +++++++
 .../visual/qdeclarativetextedit/qt-669.qml         |   19 +
 .../visual/qdeclarativetextedit/wrap.qml           |   21 +
 .../qdeclarativetextinput/cursorDelegate.qml       |   35 +
 .../data-MAC/cursorDelegate.0.png                  |  Bin 0 -> 793 bytes
 .../data-MAC/cursorDelegate.1.png                  |  Bin 0 -> 796 bytes
 .../data-MAC/cursorDelegate.2.png                  |  Bin 0 -> 804 bytes
 .../data-MAC/cursorDelegate.3.png                  |  Bin 0 -> 805 bytes
 .../data-MAC/cursorDelegate.4.png                  |  Bin 0 -> 805 bytes
 .../data-MAC/cursorDelegate.5.png                  |  Bin 0 -> 805 bytes
 .../data-MAC/cursorDelegate.6.png                  |  Bin 0 -> 801 bytes
 .../data-MAC/cursorDelegate.7.png                  |  Bin 0 -> 802 bytes
 .../data-MAC/cursorDelegate.8.png                  |  Bin 0 -> 802 bytes
 .../data-MAC/cursorDelegate.qml                    | 3379 ++++++++++
 .../qdeclarativetextinput/data-X11/echoMode.0.png  |  Bin 0 -> 999 bytes
 .../qdeclarativetextinput/data-X11/echoMode.1.png  |  Bin 0 -> 1880 bytes
 .../qdeclarativetextinput/data-X11/echoMode.2.png  |  Bin 0 -> 2962 bytes
 .../qdeclarativetextinput/data-X11/echoMode.3.png  |  Bin 0 -> 2827 bytes
 .../qdeclarativetextinput/data-X11/echoMode.4.png  |  Bin 0 -> 2827 bytes
 .../qdeclarativetextinput/data-X11/echoMode.qml    | 1043 +++
 .../qdeclarativetextinput/data-X11/hAlign.0.png    |  Bin 0 -> 1245 bytes
 .../qdeclarativetextinput/data-X11/hAlign.qml      |  107 +
 .../data/cursorDelegate.0.png                      |  Bin 0 -> 3314 bytes
 .../data/cursorDelegate.1.png                      |  Bin 0 -> 3377 bytes
 .../data/cursorDelegate.2.png                      |  Bin 0 -> 3323 bytes
 .../data/cursorDelegate.3.png                      |  Bin 0 -> 3325 bytes
 .../data/cursorDelegate.4.png                      |  Bin 0 -> 3322 bytes
 .../data/cursorDelegate.5.png                      |  Bin 0 -> 3322 bytes
 .../data/cursorDelegate.6.png                      |  Bin 0 -> 3326 bytes
 .../data/cursorDelegate.7.png                      |  Bin 0 -> 3814 bytes
 .../data/cursorDelegate.8.png                      |  Bin 0 -> 3324 bytes
 .../qdeclarativetextinput/data/cursorDelegate.qml  | 3379 ++++++++++
 .../qdeclarativetextinput/data/echoMode.0.png      |  Bin 0 -> 999 bytes
 .../qdeclarativetextinput/data/echoMode.1.png      |  Bin 0 -> 1880 bytes
 .../qdeclarativetextinput/data/echoMode.2.png      |  Bin 0 -> 2962 bytes
 .../qdeclarativetextinput/data/echoMode.3.png      |  Bin 0 -> 2827 bytes
 .../qdeclarativetextinput/data/echoMode.4.png      |  Bin 0 -> 2827 bytes
 .../visual/qdeclarativetextinput/data/echoMode.qml | 1043 +++
 .../visual/qdeclarativetextinput/data/hAlign.0.png |  Bin 0 -> 1245 bytes
 .../visual/qdeclarativetextinput/data/hAlign.qml   |  107 +
 .../visual/qdeclarativetextinput/echoMode.qml      |   10 +
 .../visual/qdeclarativetextinput/hAlign.qml        |   39 +
 .../visual/qmleasefollow/data/easefollow.0.png     |  Bin 1305 -> 0 bytes
 .../visual/qmleasefollow/data/easefollow.1.png     |  Bin 1306 -> 0 bytes
 .../visual/qmleasefollow/data/easefollow.2.png     |  Bin 1305 -> 0 bytes
 .../visual/qmleasefollow/data/easefollow.3.png     |  Bin 1303 -> 0 bytes
 .../visual/qmleasefollow/data/easefollow.4.png     |  Bin 1303 -> 0 bytes
 .../visual/qmleasefollow/data/easefollow.5.png     |  Bin 1305 -> 0 bytes
 .../visual/qmleasefollow/data/easefollow.6.png     |  Bin 1306 -> 0 bytes
 .../visual/qmleasefollow/data/easefollow.qml       | 1807 -----
 .../visual/qmleasefollow/easefollow.qml            |   40 -
 .../qmlgraphicsborderimage/animated-smooth.qml     |   55 -
 .../visual/qmlgraphicsborderimage/animated.qml     |   55 -
 .../visual/qmlgraphicsborderimage/borders.qml      |   18 -
 .../content/MyBorderImage.qml                      |   38 -
 .../visual/qmlgraphicsborderimage/content/bw.png   |  Bin 1357 -> 0 bytes
 .../content/colors-round.sci                       |    7 -
 .../content/colors-stretch.sci                     |    5 -
 .../qmlgraphicsborderimage/content/colors.png      |  Bin 1655 -> 0 bytes
 .../data/animated-smooth.0.png                     |  Bin 61731 -> 0 bytes
 .../data/animated-smooth.1.png                     |  Bin 98912 -> 0 bytes
 .../data/animated-smooth.2.png                     |  Bin 48780 -> 0 bytes
 .../data/animated-smooth.3.png                     |  Bin 32431 -> 0 bytes
 .../data/animated-smooth.4.png                     |  Bin 35835 -> 0 bytes
 .../data/animated-smooth.5.png                     |  Bin 79428 -> 0 bytes
 .../data/animated-smooth.6.png                     |  Bin 45928 -> 0 bytes
 .../data/animated-smooth.qml                       | 1823 -----
 .../qmlgraphicsborderimage/data/animated.0.png     |  Bin 23684 -> 0 bytes
 .../qmlgraphicsborderimage/data/animated.1.png     |  Bin 29115 -> 0 bytes
 .../qmlgraphicsborderimage/data/animated.2.png     |  Bin 27580 -> 0 bytes
 .../qmlgraphicsborderimage/data/animated.3.png     |  Bin 14822 -> 0 bytes
 .../qmlgraphicsborderimage/data/animated.4.png     |  Bin 21356 -> 0 bytes
 .../qmlgraphicsborderimage/data/animated.5.png     |  Bin 31143 -> 0 bytes
 .../qmlgraphicsborderimage/data/animated.6.png     |  Bin 26468 -> 0 bytes
 .../qmlgraphicsborderimage/data/animated.7.png     |  Bin 16225 -> 0 bytes
 .../qmlgraphicsborderimage/data/animated.qml       | 2091 ------
 .../qmlgraphicsborderimage/data/borders.0.png      |  Bin 23029 -> 0 bytes
 .../qmlgraphicsborderimage/data/borders.1.png      |  Bin 23029 -> 0 bytes
 .../qmlgraphicsborderimage/data/borders.2.png      |  Bin 23029 -> 0 bytes
 .../qmlgraphicsborderimage/data/borders.3.png      |  Bin 23029 -> 0 bytes
 .../qmlgraphicsborderimage/data/borders.4.png      |  Bin 23029 -> 0 bytes
 .../visual/qmlgraphicsborderimage/data/borders.qml | 1359 ----
 .../data/flickable-horizontal.0.png                |  Bin 1427 -> 0 bytes
 .../data/flickable-horizontal.1.png                |  Bin 1357 -> 0 bytes
 .../data/flickable-horizontal.2.png                |  Bin 1405 -> 0 bytes
 .../data/flickable-horizontal.3.png                |  Bin 1427 -> 0 bytes
 .../data/flickable-horizontal.qml                  | 1199 ----
 .../data/flickable-vertical.0.png                  |  Bin 1951 -> 0 bytes
 .../data/flickable-vertical.1.png                  |  Bin 1951 -> 0 bytes
 .../data/flickable-vertical.10.png                 |  Bin 1952 -> 0 bytes
 .../data/flickable-vertical.11.png                 |  Bin 1930 -> 0 bytes
 .../data/flickable-vertical.12.png                 |  Bin 1974 -> 0 bytes
 .../data/flickable-vertical.13.png                 |  Bin 1961 -> 0 bytes
 .../data/flickable-vertical.14.png                 |  Bin 1959 -> 0 bytes
 .../data/flickable-vertical.15.png                 |  Bin 1937 -> 0 bytes
 .../data/flickable-vertical.16.png                 |  Bin 1618 -> 0 bytes
 .../data/flickable-vertical.17.png                 |  Bin 1952 -> 0 bytes
 .../data/flickable-vertical.18.png                 |  Bin 1952 -> 0 bytes
 .../data/flickable-vertical.19.png                 |  Bin 1930 -> 0 bytes
 .../data/flickable-vertical.2.png                  |  Bin 1976 -> 0 bytes
 .../data/flickable-vertical.20.png                 |  Bin 1930 -> 0 bytes
 .../data/flickable-vertical.21.png                 |  Bin 1947 -> 0 bytes
 .../data/flickable-vertical.22.png                 |  Bin 1941 -> 0 bytes
 .../data/flickable-vertical.23.png                 |  Bin 1951 -> 0 bytes
 .../data/flickable-vertical.24.png                 |    0
 .../data/flickable-vertical.3.png                  |  Bin 1987 -> 0 bytes
 .../data/flickable-vertical.4.png                  |  Bin 1947 -> 0 bytes
 .../data/flickable-vertical.5.png                  |  Bin 1975 -> 0 bytes
 .../data/flickable-vertical.6.png                  |  Bin 1928 -> 0 bytes
 .../data/flickable-vertical.7.png                  |  Bin 1928 -> 0 bytes
 .../data/flickable-vertical.8.png                  |  Bin 1928 -> 0 bytes
 .../data/flickable-vertical.9.png                  |  Bin 1928 -> 0 bytes
 .../data/flickable-vertical.qml                    | 7037 --------------------
 .../qmlgraphicsflickable/flickable-horizontal.qml  |   37 -
 .../qmlgraphicsflickable/flickable-vertical.qml    |   91 -
 .../qmlgraphicsflipable/data/test-flipable.0.png   |  Bin 1090 -> 0 bytes
 .../qmlgraphicsflipable/data/test-flipable.1.png   |  Bin 1134 -> 0 bytes
 .../qmlgraphicsflipable/data/test-flipable.2.png   |  Bin 961 -> 0 bytes
 .../qmlgraphicsflipable/data/test-flipable.3.png   |  Bin 1076 -> 0 bytes
 .../qmlgraphicsflipable/data/test-flipable.4.png   |  Bin 1134 -> 0 bytes
 .../qmlgraphicsflipable/data/test-flipable.5.png   |  Bin 969 -> 0 bytes
 .../qmlgraphicsflipable/data/test-flipable.qml     | 1623 -----
 .../visual/qmlgraphicsflipable/test-flipable.qml   |   79 -
 .../visual/qmlgraphicsgridview/data/gridview.0.png |  Bin 1303 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.1.png |  Bin 1317 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.2.png |  Bin 1318 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.3.png |  Bin 1306 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.4.png |  Bin 1308 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.5.png |  Bin 1303 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.6.png |  Bin 1323 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.7.png |  Bin 1325 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.8.png |  Bin 1346 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.9.png |  Bin 1303 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview.qml   | 2859 --------
 .../qmlgraphicsgridview/data/gridview2.0.png       |  Bin 1310 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.1.png       |  Bin 1322 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.10.png      |  Bin 1313 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.2.png       |  Bin 1341 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.3.png       |  Bin 1368 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.4.png       |  Bin 1319 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.5.png       |  Bin 1352 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.6.png       |  Bin 1309 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.7.png       |  Bin 1347 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.8.png       |  Bin 1310 -> 0 bytes
 .../qmlgraphicsgridview/data/gridview2.9.png       |  Bin 1354 -> 0 bytes
 .../visual/qmlgraphicsgridview/data/gridview2.qml  | 2479 -------
 .../visual/qmlgraphicsgridview/gridview.qml        |   51 -
 .../visual/qmlgraphicsgridview/gridview2.qml       |   58 -
 .../qmlgraphicsparticles/data/particles.0.png      |  Bin 10219 -> 0 bytes
 .../qmlgraphicsparticles/data/particles.1.png      |  Bin 13469 -> 0 bytes
 .../qmlgraphicsparticles/data/particles.2.png      |  Bin 14051 -> 0 bytes
 .../visual/qmlgraphicsparticles/data/particles.qml |  775 ---
 .../visual/qmlgraphicsparticles/particles.qml      |   54 -
 .../visual/qmlgraphicsparticles/star.png           |  Bin 262 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview-2.0.png |  Bin 2263 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview-2.1.png |  Bin 2329 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview-2.2.png |  Bin 2279 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview-2.3.png |  Bin 2263 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview-2.4.png |  Bin 2263 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview-2.5.png |  Bin 2308 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview-2.6.png |  Bin 2280 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview-2.qml   | 2303 -------
 .../qmlgraphicspathview/data/test-pathview.0.png   |  Bin 2321 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview.1.png   |  Bin 2380 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview.2.png   |  Bin 2315 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview.3.png   |  Bin 2372 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview.4.png   |  Bin 2327 -> 0 bytes
 .../qmlgraphicspathview/data/test-pathview.qml     | 1495 -----
 .../visual/qmlgraphicspathview/test-pathview-2.qml |   62 -
 .../visual/qmlgraphicspathview/test-pathview.qml   |   62 -
 .../qmlgraphicspositioners/data/dynamic.0.png      |  Bin 1429 -> 0 bytes
 .../qmlgraphicspositioners/data/dynamic.1.png      |  Bin 1433 -> 0 bytes
 .../qmlgraphicspositioners/data/dynamic.2.png      |  Bin 1431 -> 0 bytes
 .../qmlgraphicspositioners/data/dynamic.3.png      |  Bin 1428 -> 0 bytes
 .../qmlgraphicspositioners/data/dynamic.4.png      |  Bin 1432 -> 0 bytes
 .../qmlgraphicspositioners/data/dynamic.5.png      |  Bin 1434 -> 0 bytes
 .../visual/qmlgraphicspositioners/data/dynamic.qml | 1603 -----
 .../qmlgraphicspositioners/data/repeater.0.png     |  Bin 2790 -> 0 bytes
 .../qmlgraphicspositioners/data/repeater.qml       |  339 -
 .../visual/qmlgraphicspositioners/dynamic.qml      |   65 -
 .../visual/qmlgraphicspositioners/repeater.qml     |   15 -
 .../baseline/data-X11/parentanchor.qml             |  131 -
 .../qmlgraphicstext/baseline/data/parentanchor.qml |  131 -
 .../qmlgraphicstext/baseline/parentanchor.qml      |   14 -
 .../qmlgraphicstext/elide/data-MAC/elide.0.png     |  Bin 2276 -> 0 bytes
 .../qmlgraphicstext/elide/data-MAC/elide.qml       |  279 -
 .../qmlgraphicstext/elide/data-MAC/elide2.0.png    |  Bin 4818 -> 0 bytes
 .../qmlgraphicstext/elide/data-MAC/elide2.1.png    |  Bin 4089 -> 0 bytes
 .../qmlgraphicstext/elide/data-MAC/elide2.2.png    |  Bin 3128 -> 0 bytes
 .../qmlgraphicstext/elide/data-MAC/elide2.3.png    |  Bin 1963 -> 0 bytes
 .../qmlgraphicstext/elide/data-MAC/elide2.qml      |  991 ---
 .../elide/data-MAC/multilength.0.png               |  Bin 736 -> 0 bytes
 .../qmlgraphicstext/elide/data-MAC/multilength.qml |  303 -
 .../qmlgraphicstext/elide/data-X11/elide.0.png     |  Bin 1002 -> 0 bytes
 .../qmlgraphicstext/elide/data-X11/elide.qml       |  279 -
 .../elide/data-X11/multilength.0.png               |  Bin 596 -> 0 bytes
 .../qmlgraphicstext/elide/data-X11/multilength.qml |  303 -
 .../visual/qmlgraphicstext/elide/data/elide.0.png  |  Bin 1604 -> 0 bytes
 .../visual/qmlgraphicstext/elide/data/elide.qml    |  279 -
 .../visual/qmlgraphicstext/elide/data/elide2.0.png |  Bin 4818 -> 0 bytes
 .../visual/qmlgraphicstext/elide/data/elide2.1.png |  Bin 4089 -> 0 bytes
 .../visual/qmlgraphicstext/elide/data/elide2.2.png |  Bin 3128 -> 0 bytes
 .../visual/qmlgraphicstext/elide/data/elide2.3.png |  Bin 1963 -> 0 bytes
 .../visual/qmlgraphicstext/elide/data/elide2.qml   |  991 ---
 .../visual/qmlgraphicstext/elide/elide.qml         |   31 -
 .../visual/qmlgraphicstext/elide/elide2.qml        |   12 -
 .../visual/qmlgraphicstext/elide/multilength.qml   |   19 -
 .../qmlgraphicstext/font/data-MAC/plaintext.0.png  |  Bin 103018 -> 0 bytes
 .../qmlgraphicstext/font/data-MAC/plaintext.qml    |  351 -
 .../qmlgraphicstext/font/data-MAC/richtext.0.png   |  Bin 136492 -> 0 bytes
 .../qmlgraphicstext/font/data-MAC/richtext.qml     |  359 -
 .../qmlgraphicstext/font/data/plaintext.0.png      |  Bin 94120 -> 0 bytes
 .../visual/qmlgraphicstext/font/data/plaintext.qml |  351 -
 .../qmlgraphicstext/font/data/richtext.0.png       |  Bin 121122 -> 0 bytes
 .../visual/qmlgraphicstext/font/data/richtext.qml  |  359 -
 .../visual/qmlgraphicstext/font/plaintext.qml      |   85 -
 .../visual/qmlgraphicstext/font/richtext.qml       |   85 -
 .../visual/qmlgraphicstextedit/cursorDelegate.qml  |   35 -
 .../data-MAC/cursorDelegate.0.png                  |  Bin 793 -> 0 bytes
 .../data-MAC/cursorDelegate.1.png                  |  Bin 795 -> 0 bytes
 .../data-MAC/cursorDelegate.2.png                  |  Bin 803 -> 0 bytes
 .../data-MAC/cursorDelegate.3.png                  |  Bin 805 -> 0 bytes
 .../data-MAC/cursorDelegate.4.png                  |  Bin 805 -> 0 bytes
 .../data-MAC/cursorDelegate.5.png                  |  Bin 805 -> 0 bytes
 .../data-MAC/cursorDelegate.6.png                  |  Bin 799 -> 0 bytes
 .../data-MAC/cursorDelegate.7.png                  |  Bin 799 -> 0 bytes
 .../data-MAC/cursorDelegate.8.png                  |  Bin 803 -> 0 bytes
 .../data-MAC/cursorDelegate.qml                    | 3555 ----------
 .../qmlgraphicstextedit/data-MAC/qt-669.0.png      |  Bin 365 -> 0 bytes
 .../qmlgraphicstextedit/data-MAC/qt-669.1.png      |  Bin 365 -> 0 bytes
 .../qmlgraphicstextedit/data-MAC/qt-669.2.png      |  Bin 366 -> 0 bytes
 .../qmlgraphicstextedit/data-MAC/qt-669.3.png      |  Bin 362 -> 0 bytes
 .../visual/qmlgraphicstextedit/data-MAC/qt-669.qml | 1371 ----
 .../visual/qmlgraphicstextedit/data-X11/wrap.0.png |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data-X11/wrap.1.png |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data-X11/wrap.2.png |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data-X11/wrap.3.png |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data-X11/wrap.4.png |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data-X11/wrap.5.png |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data-X11/wrap.6.png |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data-X11/wrap.qml   | 2467 -------
 .../qmlgraphicstextedit/data/cursorDelegate.0.png  |  Bin 3322 -> 0 bytes
 .../qmlgraphicstextedit/data/cursorDelegate.1.png  |  Bin 3323 -> 0 bytes
 .../qmlgraphicstextedit/data/cursorDelegate.2.png  |  Bin 3325 -> 0 bytes
 .../qmlgraphicstextedit/data/cursorDelegate.3.png  |  Bin 3332 -> 0 bytes
 .../qmlgraphicstextedit/data/cursorDelegate.4.png  |  Bin 3329 -> 0 bytes
 .../qmlgraphicstextedit/data/cursorDelegate.5.png  |  Bin 3818 -> 0 bytes
 .../qmlgraphicstextedit/data/cursorDelegate.6.png  |  Bin 3333 -> 0 bytes
 .../qmlgraphicstextedit/data/cursorDelegate.7.png  |  Bin 3332 -> 0 bytes
 .../qmlgraphicstextedit/data/cursorDelegate.8.png  |  Bin 3347 -> 0 bytes
 .../qmlgraphicstextedit/data/cursorDelegate.qml    | 3555 ----------
 .../visual/qmlgraphicstextedit/data/qt-669.0.png   |  Bin 4802 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/qt-669.1.png   |  Bin 4804 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/qt-669.2.png   |  Bin 4801 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/qt-669.3.png   |  Bin 4791 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/qt-669.qml     | 1371 ----
 .../visual/qmlgraphicstextedit/data/wrap.0.png     |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/wrap.1.png     |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/wrap.2.png     |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/wrap.3.png     |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/wrap.4.png     |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/wrap.5.png     |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/wrap.6.png     |  Bin 1110 -> 0 bytes
 .../visual/qmlgraphicstextedit/data/wrap.qml       | 2467 -------
 .../visual/qmlgraphicstextedit/qt-669.qml          |   19 -
 .../visual/qmlgraphicstextedit/wrap.qml            |   21 -
 .../visual/qmlgraphicstextinput/cursorDelegate.qml |   35 -
 .../data-MAC/cursorDelegate.0.png                  |  Bin 793 -> 0 bytes
 .../data-MAC/cursorDelegate.1.png                  |  Bin 796 -> 0 bytes
 .../data-MAC/cursorDelegate.2.png                  |  Bin 804 -> 0 bytes
 .../data-MAC/cursorDelegate.3.png                  |  Bin 805 -> 0 bytes
 .../data-MAC/cursorDelegate.4.png                  |  Bin 805 -> 0 bytes
 .../data-MAC/cursorDelegate.5.png                  |  Bin 805 -> 0 bytes
 .../data-MAC/cursorDelegate.6.png                  |  Bin 801 -> 0 bytes
 .../data-MAC/cursorDelegate.7.png                  |  Bin 802 -> 0 bytes
 .../data-MAC/cursorDelegate.8.png                  |  Bin 802 -> 0 bytes
 .../data-MAC/cursorDelegate.qml                    | 3379 ----------
 .../qmlgraphicstextinput/data-X11/echoMode.0.png   |  Bin 999 -> 0 bytes
 .../qmlgraphicstextinput/data-X11/echoMode.1.png   |  Bin 1880 -> 0 bytes
 .../qmlgraphicstextinput/data-X11/echoMode.2.png   |  Bin 2962 -> 0 bytes
 .../qmlgraphicstextinput/data-X11/echoMode.3.png   |  Bin 2827 -> 0 bytes
 .../qmlgraphicstextinput/data-X11/echoMode.4.png   |  Bin 2827 -> 0 bytes
 .../qmlgraphicstextinput/data-X11/echoMode.qml     | 1043 ---
 .../qmlgraphicstextinput/data-X11/hAlign.0.png     |  Bin 1245 -> 0 bytes
 .../qmlgraphicstextinput/data-X11/hAlign.qml       |  107 -
 .../qmlgraphicstextinput/data/cursorDelegate.0.png |  Bin 3314 -> 0 bytes
 .../qmlgraphicstextinput/data/cursorDelegate.1.png |  Bin 3377 -> 0 bytes
 .../qmlgraphicstextinput/data/cursorDelegate.2.png |  Bin 3323 -> 0 bytes
 .../qmlgraphicstextinput/data/cursorDelegate.3.png |  Bin 3325 -> 0 bytes
 .../qmlgraphicstextinput/data/cursorDelegate.4.png |  Bin 3322 -> 0 bytes
 .../qmlgraphicstextinput/data/cursorDelegate.5.png |  Bin 3322 -> 0 bytes
 .../qmlgraphicstextinput/data/cursorDelegate.6.png |  Bin 3326 -> 0 bytes
 .../qmlgraphicstextinput/data/cursorDelegate.7.png |  Bin 3814 -> 0 bytes
 .../qmlgraphicstextinput/data/cursorDelegate.8.png |  Bin 3324 -> 0 bytes
 .../qmlgraphicstextinput/data/cursorDelegate.qml   | 3379 ----------
 .../qmlgraphicstextinput/data/echoMode.0.png       |  Bin 999 -> 0 bytes
 .../qmlgraphicstextinput/data/echoMode.1.png       |  Bin 1880 -> 0 bytes
 .../qmlgraphicstextinput/data/echoMode.2.png       |  Bin 2962 -> 0 bytes
 .../qmlgraphicstextinput/data/echoMode.3.png       |  Bin 2827 -> 0 bytes
 .../qmlgraphicstextinput/data/echoMode.4.png       |  Bin 2827 -> 0 bytes
 .../visual/qmlgraphicstextinput/data/echoMode.qml  | 1043 ---
 .../visual/qmlgraphicstextinput/data/hAlign.0.png  |  Bin 1245 -> 0 bytes
 .../visual/qmlgraphicstextinput/data/hAlign.qml    |  107 -
 .../visual/qmlgraphicstextinput/echoMode.qml       |   10 -
 .../visual/qmlgraphicstextinput/hAlign.qml         |   39 -
 .../visual/qmlmouseregion/data/drag.0.png          |  Bin 1563 -> 0 bytes
 .../visual/qmlmouseregion/data/drag.1.png          |  Bin 1570 -> 0 bytes
 .../visual/qmlmouseregion/data/drag.2.png          |  Bin 1553 -> 0 bytes
 .../visual/qmlmouseregion/data/drag.3.png          |  Bin 1563 -> 0 bytes
 .../visual/qmlmouseregion/data/drag.4.png          |  Bin 1569 -> 0 bytes
 .../visual/qmlmouseregion/data/drag.5.png          |  Bin 1569 -> 0 bytes
 .../visual/qmlmouseregion/data/drag.6.png          |  Bin 1566 -> 0 bytes
 .../visual/qmlmouseregion/data/drag.7.png          |  Bin 1566 -> 0 bytes
 .../visual/qmlmouseregion/data/drag.8.png          |  Bin 1567 -> 0 bytes
 .../visual/qmlmouseregion/data/drag.qml            | 5207 ---------------
 .../visual/qmlmouseregion/data/mouseregion.0.png   |  Bin 471 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.1.png   |  Bin 474 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.10.png  |  Bin 479 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.11.png  |  Bin 479 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.12.png  |  Bin 479 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.13.png  |  Bin 479 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.14.png  |  Bin 479 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.15.png  |  Bin 479 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.16.png  |  Bin 1454 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.17.png  |  Bin 1454 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.18.png  |  Bin 1454 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.19.png  |  Bin 1454 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.2.png   |  Bin 474 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.20.png  |  Bin 1454 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.21.png  |  Bin 1454 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.22.png  |  Bin 1454 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.3.png   |  Bin 474 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.4.png   |  Bin 481 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.5.png   |  Bin 481 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.6.png   |  Bin 481 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.7.png   |  Bin 481 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.8.png   |  Bin 479 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.9.png   |  Bin 479 -> 0 bytes
 .../visual/qmlmouseregion/data/mouseregion.qml     | 5867 ----------------
 .../declarative/visual/qmlmouseregion/drag.qml     |   21 -
 .../visual/qmlmouseregion/mouseregion.qml          |  124 -
 .../declarative/visual/qmlspringfollow/clock.qml   |   64 -
 .../visual/qmlspringfollow/content/background.png  |  Bin 46895 -> 0 bytes
 .../visual/qmlspringfollow/content/center.png      |  Bin 765 -> 0 bytes
 .../visual/qmlspringfollow/content/clock.png       |  Bin 20653 -> 0 bytes
 .../visual/qmlspringfollow/content/hour.png        |  Bin 625 -> 0 bytes
 .../visual/qmlspringfollow/content/minute.png      |  Bin 625 -> 0 bytes
 .../visual/qmlspringfollow/content/second.png      |  Bin 303 -> 0 bytes
 .../visual/qmlspringfollow/data/clock.0.png        |  Bin 17294 -> 0 bytes
 .../visual/qmlspringfollow/data/clock.1.png        |  Bin 17394 -> 0 bytes
 .../visual/qmlspringfollow/data/clock.2.png        |  Bin 17524 -> 0 bytes
 .../visual/qmlspringfollow/data/clock.3.png        |  Bin 17572 -> 0 bytes
 .../visual/qmlspringfollow/data/clock.qml          | 1135 ----
 .../visual/qmlspringfollow/data/follow.0.png       |  Bin 959 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.1.png       |  Bin 1244 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.10.png      |  Bin 1299 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.2.png       |  Bin 1224 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.3.png       |  Bin 1243 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.4.png       |  Bin 1230 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.5.png       |  Bin 1231 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.6.png       |  Bin 1239 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.7.png       |  Bin 1241 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.8.png       |  Bin 1237 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.9.png       |  Bin 1229 -> 0 bytes
 .../visual/qmlspringfollow/data/follow.qml         | 1763 -----
 .../declarative/visual/qmlspringfollow/follow.qml  |   71 -
 tests/auto/declarative/visual/tst_visual.cpp       |   20 +-
 tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro |    6 +
 .../qdeclarativeaudio/tst_qdeclarativeaudio.cpp    | 1200 ++++
 tests/auto/qdeclarativevideo/qdeclarativevideo.pro |    6 +
 .../qdeclarativevideo/tst_qdeclarativevideo.cpp    |  911 +++
 tests/auto/qmlaudio/qmlaudio.pro                   |    6 -
 tests/auto/qmlaudio/tst_qmlaudio.cpp               | 1200 ----
 tests/auto/qmlgraphicsvideo/qmlgraphicsvideo.pro   |    6 -
 .../auto/qmlgraphicsvideo/tst_qmlgraphicsvideo.cpp |  911 ---
 tests/benchmarks/declarative/binding/testtypes.h   |    8 +-
 .../benchmarks/declarative/binding/tst_binding.cpp |    8 +-
 .../declarative/creation/tst_creation.cpp          |   56 +-
 tests/benchmarks/declarative/declarative.pro       |    8 +-
 .../declarative/pointers/tst_pointers.cpp          |    4 +-
 .../qdeclarativecomponent/data/myqmlobject.qml     |    3 +
 .../data/myqmlobject_binding.qml                   |    6 +
 .../qdeclarativecomponent/data/object.qml          |    3 +
 .../qdeclarativecomponent/data/object_id.qml       |    6 +
 .../data/samegame/BoomBlock.qml                    |   55 +
 .../data/samegame/pics/blueStar.png                |  Bin 0 -> 278 bytes
 .../data/samegame/pics/blueStone.png               |  Bin 0 -> 2691 bytes
 .../data/samegame/pics/greenStar.png               |  Bin 0 -> 273 bytes
 .../data/samegame/pics/greenStone.png              |  Bin 0 -> 2662 bytes
 .../data/samegame/pics/redStar.png                 |  Bin 0 -> 274 bytes
 .../data/samegame/pics/redStone.png                |  Bin 0 -> 2604 bytes
 .../data/samegame/pics/yellowStone.png             |  Bin 0 -> 2667 bytes
 .../data/synthesized_properties.2.qml              |   15 +
 .../data/synthesized_properties.qml                |    5 +
 .../qdeclarativecomponent.pro                      |   19 +
 .../qdeclarativecomponent/testtypes.cpp            |   46 +
 .../declarative/qdeclarativecomponent/testtypes.h  |   83 +
 .../tst_qdeclarativecomponent.cpp                  |  119 +
 .../declarative/qdeclarativeimage/image.png        |  Bin 0 -> 611 bytes
 .../qdeclarativeimage/qdeclarativeimage.pro        |   16 +
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp    |  108 +
 .../qdeclarativemetaproperty/data/object.qml       |    3 +
 .../data/synthesized_object.qml                    |    6 +
 .../qdeclarativemetaproperty.pro                   |    8 +
 .../tst_qdeclarativemetaproperty.cpp               |  113 +
 .../declarative/qdeclarativetime/example.qml       |   14 +
 .../qdeclarativetime/qdeclarativetime.cpp          |  231 +
 .../qdeclarativetime/qdeclarativetime.pro          |   23 +
 .../qdeclarativetime/tests/anchors/empty.qml       |   34 +
 .../qdeclarativetime/tests/anchors/fill.qml        |   41 +
 .../qdeclarativetime/tests/anchors/null.qml        |   27 +
 .../tests/item_creation/children.qml               |   34 +
 .../qdeclarativetime/tests/item_creation/data.qml  |   34 +
 .../tests/item_creation/no_creation.qml            |   12 +
 .../tests/item_creation/resources.qml              |   34 +
 .../tests/positioner_creation/no_positioner.qml    |   37 +
 .../tests/positioner_creation/null_positioner.qml  |   34 +
 .../tests/positioner_creation/positioner.qml       |   37 +
 .../declarative/qmlcomponent/data/myqmlobject.qml  |    3 -
 .../qmlcomponent/data/myqmlobject_binding.qml      |    6 -
 .../declarative/qmlcomponent/data/object.qml       |    3 -
 .../declarative/qmlcomponent/data/object_id.qml    |    6 -
 .../qmlcomponent/data/samegame/BoomBlock.qml       |   55 -
 .../qmlcomponent/data/samegame/pics/blueStar.png   |  Bin 278 -> 0 bytes
 .../qmlcomponent/data/samegame/pics/blueStone.png  |  Bin 2691 -> 0 bytes
 .../qmlcomponent/data/samegame/pics/greenStar.png  |  Bin 273 -> 0 bytes
 .../qmlcomponent/data/samegame/pics/greenStone.png |  Bin 2662 -> 0 bytes
 .../qmlcomponent/data/samegame/pics/redStar.png    |  Bin 274 -> 0 bytes
 .../qmlcomponent/data/samegame/pics/redStone.png   |  Bin 2604 -> 0 bytes
 .../data/samegame/pics/yellowStone.png             |  Bin 2667 -> 0 bytes
 .../qmlcomponent/data/synthesized_properties.2.qml |   15 -
 .../qmlcomponent/data/synthesized_properties.qml   |    5 -
 .../declarative/qmlcomponent/qmlcomponent.pro      |   19 -
 .../declarative/qmlcomponent/testtypes.cpp         |   46 -
 .../declarative/qmlcomponent/testtypes.h           |   83 -
 .../declarative/qmlcomponent/tst_qmlcomponent.cpp  |  119 -
 .../declarative/qmlgraphicsimage/image.png         |  Bin 611 -> 0 bytes
 .../qmlgraphicsimage/qmlgraphicsimage.pro          |   16 -
 .../qmlgraphicsimage/tst_qmlgraphicsimage.cpp      |  108 -
 .../declarative/qmlmetaproperty/data/object.qml    |    3 -
 .../qmlmetaproperty/data/synthesized_object.qml    |    6 -
 .../qmlmetaproperty/qmlmetaproperty.pro            |    8 -
 .../qmlmetaproperty/tst_qmlmetaproperty.cpp        |  113 -
 tests/benchmarks/declarative/qmltime/example.qml   |   14 -
 tests/benchmarks/declarative/qmltime/qmltime.cpp   |  231 -
 tests/benchmarks/declarative/qmltime/qmltime.pro   |   23 -
 .../declarative/qmltime/tests/anchors/empty.qml    |   34 -
 .../declarative/qmltime/tests/anchors/fill.qml     |   41 -
 .../declarative/qmltime/tests/anchors/null.qml     |   27 -
 .../qmltime/tests/item_creation/children.qml       |   34 -
 .../qmltime/tests/item_creation/data.qml           |   34 -
 .../qmltime/tests/item_creation/no_creation.qml    |   12 -
 .../qmltime/tests/item_creation/resources.qml      |   34 -
 .../tests/positioner_creation/no_positioner.qml    |   37 -
 .../tests/positioner_creation/null_positioner.qml  |   34 -
 .../tests/positioner_creation/positioner.qml       |   37 -
 tests/benchmarks/declarative/script/tst_script.cpp |   66 +-
 .../gui/painting/qpainter/tst_qpainter.cpp         |    6 +-
 tools/configure/configureapp.cpp                   |    2 +-
 tools/linguist/lupdate/lupdate.pro                 |    2 +-
 tools/linguist/lupdate/qdeclarative.cpp            |  240 +
 tools/linguist/lupdate/qml.cpp                     |  240 -
 tools/qdoc3/atom.cpp                               |    4 +-
 tools/qdoc3/atom.h                                 |    2 +-
 tools/qdoc3/codemarker.cpp                         |   12 +-
 tools/qdoc3/codemarker.h                           |    2 +-
 tools/qdoc3/cppcodemarker.cpp                      |   34 +-
 tools/qdoc3/cppcodemarker.h                        |    2 +-
 tools/qdoc3/cppcodeparser.cpp                      |   40 +-
 tools/qdoc3/doc.cpp                                |    4 +-
 tools/qdoc3/generator.cpp                          |    4 +-
 tools/qdoc3/generator.h                            |    2 +-
 tools/qdoc3/helpprojectwriter.cpp                  |    6 +-
 tools/qdoc3/htmlgenerator.cpp                      |   80 +-
 tools/qdoc3/htmlgenerator.h                        |   14 +-
 tools/qdoc3/node.cpp                               |   42 +-
 tools/qdoc3/node.h                                 |   38 +-
 tools/qdoc3/pagegenerator.cpp                      |    8 +-
 tools/qdoc3/tree.cpp                               |    4 +-
 tools/qml/content/Browser.qml                      |  243 +
 tools/qml/content/images/folder.png                |  Bin 0 -> 1841 bytes
 tools/qml/content/images/titlebar.png              |  Bin 0 -> 1436 bytes
 tools/qml/content/images/titlebar.sci              |    5 +
 tools/qml/content/images/up.png                    |  Bin 0 -> 662 bytes
 tools/qml/deviceorientation.cpp                    |   75 +
 tools/qml/deviceorientation.h                      |   73 +
 tools/qml/deviceorientation_maemo.cpp              |  139 +
 tools/qml/main.cpp                                 |  356 +
 tools/qml/proxysettings.cpp                        |  110 +
 tools/qml/proxysettings.h                          |   71 +
 tools/qml/proxysettings.ui                         |  115 +
 tools/qml/qdeclarativefolderlistmodel.cpp          |  420 ++
 tools/qml/qdeclarativefolderlistmodel.h            |  125 +
 tools/qml/qfxtester.cpp                            |  382 ++
 tools/qml/qfxtester.h                              |  284 +
 tools/qml/qml.pro                                  |   58 +
 tools/qml/qmlruntime.cpp                           | 1468 ++++
 tools/qml/qmlruntime.h                             |  195 +
 tools/qml/qmlruntime.qrc                           |    9 +
 tools/qml/recopts.ui                               |  513 ++
 tools/qmlviewer/content/Browser.qml                |  243 -
 tools/qmlviewer/content/images/folder.png          |  Bin 1841 -> 0 bytes
 tools/qmlviewer/content/images/titlebar.png        |  Bin 1436 -> 0 bytes
 tools/qmlviewer/content/images/titlebar.sci        |    5 -
 tools/qmlviewer/content/images/up.png              |  Bin 662 -> 0 bytes
 tools/qmlviewer/deviceorientation.cpp              |   75 -
 tools/qmlviewer/deviceorientation.h                |   73 -
 tools/qmlviewer/deviceorientation_maemo.cpp        |  139 -
 tools/qmlviewer/main.cpp                           |  356 -
 tools/qmlviewer/proxysettings.cpp                  |  110 -
 tools/qmlviewer/proxysettings.h                    |   71 -
 tools/qmlviewer/proxysettings.ui                   |  115 -
 tools/qmlviewer/qfxtester.cpp                      |  382 --
 tools/qmlviewer/qfxtester.h                        |  284 -
 tools/qmlviewer/qmlfolderlistmodel.cpp             |  420 --
 tools/qmlviewer/qmlfolderlistmodel.h               |  125 -
 tools/qmlviewer/qmlviewer.cpp                      | 1468 ----
 tools/qmlviewer/qmlviewer.h                        |  195 -
 tools/qmlviewer/qmlviewer.pro                      |   58 -
 tools/qmlviewer/qmlviewer.qrc                      |    9 -
 tools/qmlviewer/recopts.ui                         |  513 --
 tools/tools.pro                                    |    2 +-
 3172 files changed, 225232 insertions(+), 225229 deletions(-)
 create mode 100644 doc/src/declarative/qdeclarativedebugging.qdoc
 create mode 100644 doc/src/declarative/qdeclarativedocument.qdoc
 create mode 100644 doc/src/declarative/qdeclarativei18n.qdoc
 create mode 100644 doc/src/declarative/qdeclarativeintro.qdoc
 create mode 100644 doc/src/declarative/qdeclarativemodels.qdoc
 create mode 100644 doc/src/declarative/qdeclarativereference.qdoc
 create mode 100644 doc/src/declarative/qdeclarativestates.qdoc
 delete mode 100644 doc/src/declarative/qmldebugging.qdoc
 delete mode 100644 doc/src/declarative/qmldocument.qdoc
 delete mode 100644 doc/src/declarative/qmli18n.qdoc
 delete mode 100644 doc/src/declarative/qmlintro.qdoc
 delete mode 100644 doc/src/declarative/qmlmodels.qdoc
 delete mode 100644 doc/src/declarative/qmlreference.qdoc
 create mode 100644 doc/src/declarative/qmlruntime.qdoc
 delete mode 100644 doc/src/declarative/qmlstates.qdoc
 delete mode 100644 doc/src/declarative/qmlviewer.qdoc
 create mode 100644 examples/declarative/webview/qdeclarative-in-html.qml
 delete mode 100644 examples/declarative/webview/qml-in-html.qml
 create mode 100644 src/declarative/debugger/qdeclarativedebug.cpp
 create mode 100644 src/declarative/debugger/qdeclarativedebug_p.h
 create mode 100644 src/declarative/debugger/qdeclarativedebugclient.cpp
 create mode 100644 src/declarative/debugger/qdeclarativedebugclient_p.h
 create mode 100644 src/declarative/debugger/qdeclarativedebuggerstatus.cpp
 create mode 100644 src/declarative/debugger/qdeclarativedebuggerstatus_p.h
 create mode 100644 src/declarative/debugger/qdeclarativedebugservice.cpp
 create mode 100644 src/declarative/debugger/qdeclarativedebugservice_p.h
 delete mode 100644 src/declarative/debugger/qmldebug.cpp
 delete mode 100644 src/declarative/debugger/qmldebug_p.h
 delete mode 100644 src/declarative/debugger/qmldebugclient.cpp
 delete mode 100644 src/declarative/debugger/qmldebugclient_p.h
 delete mode 100644 src/declarative/debugger/qmldebuggerstatus.cpp
 delete mode 100644 src/declarative/debugger/qmldebuggerstatus_p.h
 delete mode 100644 src/declarative/debugger/qmldebugservice.cpp
 delete mode 100644 src/declarative/debugger/qmldebugservice_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeanchors.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeanchors_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeborderimage.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeborderimage_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeeffects.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeeffects_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeevents.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeevents_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeflickable.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeflickable_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeflipable.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeflipable_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativefocuspanel_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativefocusscope.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativefocusscope_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativegridview.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativegridview_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeimage.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeimage_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeimage_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeimagebase.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeimagebase_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeitem.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeitem.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeitem_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativelayoutitem_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativelistview.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativelistview_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeloader.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeloader_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeloader_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativemousearea.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativemousearea_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativepainteditem.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativepainteditem_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativeparticles.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativeparticles_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativepath.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativepath_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativepath_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativepathview.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativepathview_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativepathview_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativepositioners.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativepositioners_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativerectangle.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativerectangle_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativerectangle_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativerepeater.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativerepeater_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativerepeater_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativescalegrid.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativetext.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativetext_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativetext_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativetextedit.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativetextedit_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativetextinput.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativetextinput_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativewebview.cpp
 create mode 100644 src/declarative/graphicsitems/qdeclarativewebview_p.h
 create mode 100644 src/declarative/graphicsitems/qdeclarativewebview_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsanchors.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsanchors_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicseffects.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicseffects_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsevents.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsflickable.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsflickable_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsflipable.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsflipable_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsgridview.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsgridview_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsimage.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsimage_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsitem.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsitem.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsitem_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsitemchangelistener_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsitemsmodule_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicslistview.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicslistview_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsloader.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsloader_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsloader_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsmousearea_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsmousearea_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsparticles.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsparticles_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspath.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspath_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspath_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspathview.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspathview_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspositioners.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspositioners_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicstext.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicstext_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicstext_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicstextedit.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicstextedit_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicstextinput.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicstextinput_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicswebview.cpp
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicswebview_p.h
 delete mode 100644 src/declarative/graphicsitems/qmlgraphicswebview_p_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejs.g
 create mode 100644 src/declarative/qml/parser/qdeclarativejsast.cpp
 create mode 100644 src/declarative/qml/parser/qdeclarativejsast_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejsastfwd_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejsastvisitor.cpp
 create mode 100644 src/declarative/qml/parser/qdeclarativejsastvisitor_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejsengine_p.cpp
 create mode 100644 src/declarative/qml/parser/qdeclarativejsengine_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejsglobal_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejsgrammar.cpp
 create mode 100644 src/declarative/qml/parser/qdeclarativejsgrammar_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejslexer.cpp
 create mode 100644 src/declarative/qml/parser/qdeclarativejslexer_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejsmemorypool_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejsnodepool_p.h
 create mode 100644 src/declarative/qml/parser/qdeclarativejsparser.cpp
 create mode 100644 src/declarative/qml/parser/qdeclarativejsparser_p.h
 delete mode 100644 src/declarative/qml/parser/qmljs.g
 delete mode 100644 src/declarative/qml/parser/qmljsast.cpp
 delete mode 100644 src/declarative/qml/parser/qmljsast_p.h
 delete mode 100644 src/declarative/qml/parser/qmljsastfwd_p.h
 delete mode 100644 src/declarative/qml/parser/qmljsastvisitor.cpp
 delete mode 100644 src/declarative/qml/parser/qmljsastvisitor_p.h
 delete mode 100644 src/declarative/qml/parser/qmljsengine_p.cpp
 delete mode 100644 src/declarative/qml/parser/qmljsengine_p.h
 delete mode 100644 src/declarative/qml/parser/qmljsglobal_p.h
 delete mode 100644 src/declarative/qml/parser/qmljsgrammar.cpp
 delete mode 100644 src/declarative/qml/parser/qmljsgrammar_p.h
 delete mode 100644 src/declarative/qml/parser/qmljslexer.cpp
 delete mode 100644 src/declarative/qml/parser/qmljslexer_p.h
 delete mode 100644 src/declarative/qml/parser/qmljsmemorypool_p.h
 delete mode 100644 src/declarative/qml/parser/qmljsnodepool_p.h
 delete mode 100644 src/declarative/qml/parser/qmljsparser.cpp
 delete mode 100644 src/declarative/qml/parser/qmljsparser_p.h
 create mode 100644 src/declarative/qml/qdeclarative.h
 create mode 100644 src/declarative/qml/qdeclarativebinding.cpp
 create mode 100644 src/declarative/qml/qdeclarativebinding_p.h
 create mode 100644 src/declarative/qml/qdeclarativebinding_p_p.h
 create mode 100644 src/declarative/qml/qdeclarativeboundsignal.cpp
 create mode 100644 src/declarative/qml/qdeclarativeboundsignal_p.h
 create mode 100644 src/declarative/qml/qdeclarativeclassfactory.cpp
 create mode 100644 src/declarative/qml/qdeclarativeclassfactory_p.h
 create mode 100644 src/declarative/qml/qdeclarativecleanup.cpp
 create mode 100644 src/declarative/qml/qdeclarativecleanup_p.h
 create mode 100644 src/declarative/qml/qdeclarativecompiledbindings.cpp
 create mode 100644 src/declarative/qml/qdeclarativecompiledbindings_p.h
 create mode 100644 src/declarative/qml/qdeclarativecompileddata.cpp
 create mode 100644 src/declarative/qml/qdeclarativecompiler.cpp
 create mode 100644 src/declarative/qml/qdeclarativecompiler_p.h
 create mode 100644 src/declarative/qml/qdeclarativecomponent.cpp
 create mode 100644 src/declarative/qml/qdeclarativecomponent.h
 create mode 100644 src/declarative/qml/qdeclarativecomponent_p.h
 create mode 100644 src/declarative/qml/qdeclarativecompositetypedata_p.h
 create mode 100644 src/declarative/qml/qdeclarativecompositetypemanager.cpp
 create mode 100644 src/declarative/qml/qdeclarativecompositetypemanager_p.h
 create mode 100644 src/declarative/qml/qdeclarativecontext.cpp
 create mode 100644 src/declarative/qml/qdeclarativecontext.h
 create mode 100644 src/declarative/qml/qdeclarativecontext_p.h
 create mode 100644 src/declarative/qml/qdeclarativecontextscriptclass.cpp
 create mode 100644 src/declarative/qml/qdeclarativecontextscriptclass_p.h
 create mode 100644 src/declarative/qml/qdeclarativecustomparser.cpp
 create mode 100644 src/declarative/qml/qdeclarativecustomparser_p.h
 create mode 100644 src/declarative/qml/qdeclarativecustomparser_p_p.h
 create mode 100644 src/declarative/qml/qdeclarativedeclarativedata_p.h
 create mode 100644 src/declarative/qml/qdeclarativedirparser.cpp
 create mode 100644 src/declarative/qml/qdeclarativedirparser_p.h
 create mode 100644 src/declarative/qml/qdeclarativedom.cpp
 create mode 100644 src/declarative/qml/qdeclarativedom_p.h
 create mode 100644 src/declarative/qml/qdeclarativedom_p_p.h
 create mode 100644 src/declarative/qml/qdeclarativeengine.cpp
 create mode 100644 src/declarative/qml/qdeclarativeengine.h
 create mode 100644 src/declarative/qml/qdeclarativeengine_p.h
 create mode 100644 src/declarative/qml/qdeclarativeenginedebug.cpp
 create mode 100644 src/declarative/qml/qdeclarativeenginedebug_p.h
 create mode 100644 src/declarative/qml/qdeclarativeerror.cpp
 create mode 100644 src/declarative/qml/qdeclarativeerror.h
 create mode 100644 src/declarative/qml/qdeclarativeexpression.cpp
 create mode 100644 src/declarative/qml/qdeclarativeexpression.h
 create mode 100644 src/declarative/qml/qdeclarativeexpression_p.h
 create mode 100644 src/declarative/qml/qdeclarativeextensioninterface.h
 create mode 100644 src/declarative/qml/qdeclarativeextensionplugin.cpp
 create mode 100644 src/declarative/qml/qdeclarativeextensionplugin.h
 create mode 100644 src/declarative/qml/qdeclarativeglobal_p.h
 create mode 100644 src/declarative/qml/qdeclarativeglobalscriptclass.cpp
 create mode 100644 src/declarative/qml/qdeclarativeglobalscriptclass_p.h
 create mode 100644 src/declarative/qml/qdeclarativeguard_p.h
 create mode 100644 src/declarative/qml/qdeclarativeimageprovider.cpp
 create mode 100644 src/declarative/qml/qdeclarativeimageprovider.h
 create mode 100644 src/declarative/qml/qdeclarativeinfo.cpp
 create mode 100644 src/declarative/qml/qdeclarativeinfo.h
 create mode 100644 src/declarative/qml/qdeclarativeinstruction.cpp
 create mode 100644 src/declarative/qml/qdeclarativeinstruction_p.h
 create mode 100644 src/declarative/qml/qdeclarativeintegercache.cpp
 create mode 100644 src/declarative/qml/qdeclarativeintegercache_p.h
 create mode 100644 src/declarative/qml/qdeclarativelist.cpp
 create mode 100644 src/declarative/qml/qdeclarativelist.h
 create mode 100644 src/declarative/qml/qdeclarativelist_p.h
 create mode 100644 src/declarative/qml/qdeclarativelistscriptclass.cpp
 create mode 100644 src/declarative/qml/qdeclarativelistscriptclass_p.h
 create mode 100644 src/declarative/qml/qdeclarativemetaproperty.cpp
 create mode 100644 src/declarative/qml/qdeclarativemetaproperty.h
 create mode 100644 src/declarative/qml/qdeclarativemetaproperty_p.h
 create mode 100644 src/declarative/qml/qdeclarativemetatype.cpp
 create mode 100644 src/declarative/qml/qdeclarativemetatype.h
 create mode 100644 src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp
 create mode 100644 src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
 create mode 100644 src/declarative/qml/qdeclarativeobjectscriptclass.cpp
 create mode 100644 src/declarative/qml/qdeclarativeobjectscriptclass_p.h
 create mode 100644 src/declarative/qml/qdeclarativeparser.cpp
 create mode 100644 src/declarative/qml/qdeclarativeparser_p.h
 create mode 100644 src/declarative/qml/qdeclarativeparserstatus.cpp
 create mode 100644 src/declarative/qml/qdeclarativeparserstatus.h
 create mode 100644 src/declarative/qml/qdeclarativeprivate.cpp
 create mode 100644 src/declarative/qml/qdeclarativeprivate.h
 create mode 100644 src/declarative/qml/qdeclarativepropertycache.cpp
 create mode 100644 src/declarative/qml/qdeclarativepropertycache_p.h
 create mode 100644 src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
 create mode 100644 src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
 create mode 100644 src/declarative/qml/qdeclarativepropertyvaluesource.cpp
 create mode 100644 src/declarative/qml/qdeclarativepropertyvaluesource.h
 create mode 100644 src/declarative/qml/qdeclarativeproxymetaobject.cpp
 create mode 100644 src/declarative/qml/qdeclarativeproxymetaobject_p.h
 create mode 100644 src/declarative/qml/qdeclarativerefcount.cpp
 create mode 100644 src/declarative/qml/qdeclarativerefcount_p.h
 create mode 100644 src/declarative/qml/qdeclarativerewrite.cpp
 create mode 100644 src/declarative/qml/qdeclarativerewrite_p.h
 create mode 100644 src/declarative/qml/qdeclarativescript.cpp
 create mode 100644 src/declarative/qml/qdeclarativescriptclass_p.h
 create mode 100644 src/declarative/qml/qdeclarativescriptparser.cpp
 create mode 100644 src/declarative/qml/qdeclarativescriptparser_p.h
 create mode 100644 src/declarative/qml/qdeclarativescriptstring.cpp
 create mode 100644 src/declarative/qml/qdeclarativescriptstring.h
 create mode 100644 src/declarative/qml/qdeclarativesqldatabase.cpp
 create mode 100644 src/declarative/qml/qdeclarativesqldatabase_p.h
 create mode 100644 src/declarative/qml/qdeclarativestringconverters.cpp
 create mode 100644 src/declarative/qml/qdeclarativestringconverters_p.h
 create mode 100644 src/declarative/qml/qdeclarativetypenamecache.cpp
 create mode 100644 src/declarative/qml/qdeclarativetypenamecache_p.h
 create mode 100644 src/declarative/qml/qdeclarativetypenamescriptclass.cpp
 create mode 100644 src/declarative/qml/qdeclarativetypenamescriptclass_p.h
 create mode 100644 src/declarative/qml/qdeclarativevaluetype.cpp
 create mode 100644 src/declarative/qml/qdeclarativevaluetype_p.h
 create mode 100644 src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
 create mode 100644 src/declarative/qml/qdeclarativevaluetypescriptclass_p.h
 create mode 100644 src/declarative/qml/qdeclarativevme.cpp
 create mode 100644 src/declarative/qml/qdeclarativevme_p.h
 create mode 100644 src/declarative/qml/qdeclarativevmemetaobject.cpp
 create mode 100644 src/declarative/qml/qdeclarativevmemetaobject_p.h
 create mode 100644 src/declarative/qml/qdeclarativewatcher.cpp
 create mode 100644 src/declarative/qml/qdeclarativewatcher_p.h
 create mode 100644 src/declarative/qml/qdeclarativeworkerscript.cpp
 create mode 100644 src/declarative/qml/qdeclarativeworkerscript_p.h
 create mode 100644 src/declarative/qml/qdeclarativexmlhttprequest.cpp
 create mode 100644 src/declarative/qml/qdeclarativexmlhttprequest_p.h
 delete mode 100644 src/declarative/qml/qml.h
 delete mode 100644 src/declarative/qml/qmlbinding.cpp
 delete mode 100644 src/declarative/qml/qmlbinding_p.h
 delete mode 100644 src/declarative/qml/qmlbinding_p_p.h
 delete mode 100644 src/declarative/qml/qmlboundsignal.cpp
 delete mode 100644 src/declarative/qml/qmlboundsignal_p.h
 delete mode 100644 src/declarative/qml/qmlclassfactory.cpp
 delete mode 100644 src/declarative/qml/qmlclassfactory_p.h
 delete mode 100644 src/declarative/qml/qmlcleanup.cpp
 delete mode 100644 src/declarative/qml/qmlcleanup_p.h
 delete mode 100644 src/declarative/qml/qmlcompiledbindings.cpp
 delete mode 100644 src/declarative/qml/qmlcompiledbindings_p.h
 delete mode 100644 src/declarative/qml/qmlcompileddata.cpp
 delete mode 100644 src/declarative/qml/qmlcompiler.cpp
 delete mode 100644 src/declarative/qml/qmlcompiler_p.h
 delete mode 100644 src/declarative/qml/qmlcomponent.cpp
 delete mode 100644 src/declarative/qml/qmlcomponent.h
 delete mode 100644 src/declarative/qml/qmlcomponent_p.h
 delete mode 100644 src/declarative/qml/qmlcompositetypedata_p.h
 delete mode 100644 src/declarative/qml/qmlcompositetypemanager.cpp
 delete mode 100644 src/declarative/qml/qmlcompositetypemanager_p.h
 delete mode 100644 src/declarative/qml/qmlcontext.cpp
 delete mode 100644 src/declarative/qml/qmlcontext.h
 delete mode 100644 src/declarative/qml/qmlcontext_p.h
 delete mode 100644 src/declarative/qml/qmlcontextscriptclass.cpp
 delete mode 100644 src/declarative/qml/qmlcontextscriptclass_p.h
 delete mode 100644 src/declarative/qml/qmlcustomparser.cpp
 delete mode 100644 src/declarative/qml/qmlcustomparser_p.h
 delete mode 100644 src/declarative/qml/qmlcustomparser_p_p.h
 delete mode 100644 src/declarative/qml/qmldeclarativedata_p.h
 delete mode 100644 src/declarative/qml/qmldirparser.cpp
 delete mode 100644 src/declarative/qml/qmldirparser_p.h
 delete mode 100644 src/declarative/qml/qmldom.cpp
 delete mode 100644 src/declarative/qml/qmldom_p.h
 delete mode 100644 src/declarative/qml/qmldom_p_p.h
 delete mode 100644 src/declarative/qml/qmlengine.cpp
 delete mode 100644 src/declarative/qml/qmlengine.h
 delete mode 100644 src/declarative/qml/qmlengine_p.h
 delete mode 100644 src/declarative/qml/qmlenginedebug.cpp
 delete mode 100644 src/declarative/qml/qmlenginedebug_p.h
 delete mode 100644 src/declarative/qml/qmlerror.cpp
 delete mode 100644 src/declarative/qml/qmlerror.h
 delete mode 100644 src/declarative/qml/qmlexpression.cpp
 delete mode 100644 src/declarative/qml/qmlexpression.h
 delete mode 100644 src/declarative/qml/qmlexpression_p.h
 delete mode 100644 src/declarative/qml/qmlextensioninterface.h
 delete mode 100644 src/declarative/qml/qmlextensionplugin.cpp
 delete mode 100644 src/declarative/qml/qmlextensionplugin.h
 delete mode 100644 src/declarative/qml/qmlglobal_p.h
 delete mode 100644 src/declarative/qml/qmlglobalscriptclass.cpp
 delete mode 100644 src/declarative/qml/qmlglobalscriptclass_p.h
 delete mode 100644 src/declarative/qml/qmlguard_p.h
 delete mode 100644 src/declarative/qml/qmlimageprovider.cpp
 delete mode 100644 src/declarative/qml/qmlimageprovider.h
 delete mode 100644 src/declarative/qml/qmlinfo.cpp
 delete mode 100644 src/declarative/qml/qmlinfo.h
 delete mode 100644 src/declarative/qml/qmlinstruction.cpp
 delete mode 100644 src/declarative/qml/qmlinstruction_p.h
 delete mode 100644 src/declarative/qml/qmlintegercache.cpp
 delete mode 100644 src/declarative/qml/qmlintegercache_p.h
 delete mode 100644 src/declarative/qml/qmllist.cpp
 delete mode 100644 src/declarative/qml/qmllist.h
 delete mode 100644 src/declarative/qml/qmllist_p.h
 delete mode 100644 src/declarative/qml/qmllistscriptclass.cpp
 delete mode 100644 src/declarative/qml/qmllistscriptclass_p.h
 delete mode 100644 src/declarative/qml/qmlmetaproperty.cpp
 delete mode 100644 src/declarative/qml/qmlmetaproperty.h
 delete mode 100644 src/declarative/qml/qmlmetaproperty_p.h
 delete mode 100644 src/declarative/qml/qmlmetatype.cpp
 delete mode 100644 src/declarative/qml/qmlmetatype.h
 delete mode 100644 src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp
 delete mode 100644 src/declarative/qml/qmlnetworkaccessmanagerfactory.h
 delete mode 100644 src/declarative/qml/qmlobjectscriptclass.cpp
 delete mode 100644 src/declarative/qml/qmlobjectscriptclass_p.h
 delete mode 100644 src/declarative/qml/qmlparser.cpp
 delete mode 100644 src/declarative/qml/qmlparser_p.h
 delete mode 100644 src/declarative/qml/qmlparserstatus.cpp
 delete mode 100644 src/declarative/qml/qmlparserstatus.h
 delete mode 100644 src/declarative/qml/qmlprivate.cpp
 delete mode 100644 src/declarative/qml/qmlprivate.h
 delete mode 100644 src/declarative/qml/qmlpropertycache.cpp
 delete mode 100644 src/declarative/qml/qmlpropertycache_p.h
 delete mode 100644 src/declarative/qml/qmlpropertyvalueinterceptor.cpp
 delete mode 100644 src/declarative/qml/qmlpropertyvalueinterceptor.h
 delete mode 100644 src/declarative/qml/qmlpropertyvaluesource.cpp
 delete mode 100644 src/declarative/qml/qmlpropertyvaluesource.h
 delete mode 100644 src/declarative/qml/qmlproxymetaobject.cpp
 delete mode 100644 src/declarative/qml/qmlproxymetaobject_p.h
 delete mode 100644 src/declarative/qml/qmlrefcount.cpp
 delete mode 100644 src/declarative/qml/qmlrefcount_p.h
 delete mode 100644 src/declarative/qml/qmlrewrite.cpp
 delete mode 100644 src/declarative/qml/qmlrewrite_p.h
 delete mode 100644 src/declarative/qml/qmlscript.cpp
 delete mode 100644 src/declarative/qml/qmlscriptclass_p.h
 delete mode 100644 src/declarative/qml/qmlscriptparser.cpp
 delete mode 100644 src/declarative/qml/qmlscriptparser_p.h
 delete mode 100644 src/declarative/qml/qmlscriptstring.cpp
 delete mode 100644 src/declarative/qml/qmlscriptstring.h
 delete mode 100644 src/declarative/qml/qmlsqldatabase.cpp
 delete mode 100644 src/declarative/qml/qmlsqldatabase_p.h
 delete mode 100644 src/declarative/qml/qmlstringconverters.cpp
 delete mode 100644 src/declarative/qml/qmlstringconverters_p.h
 delete mode 100644 src/declarative/qml/qmltypenamecache.cpp
 delete mode 100644 src/declarative/qml/qmltypenamecache_p.h
 delete mode 100644 src/declarative/qml/qmltypenamescriptclass.cpp
 delete mode 100644 src/declarative/qml/qmltypenamescriptclass_p.h
 delete mode 100644 src/declarative/qml/qmlvaluetype.cpp
 delete mode 100644 src/declarative/qml/qmlvaluetype_p.h
 delete mode 100644 src/declarative/qml/qmlvaluetypescriptclass.cpp
 delete mode 100644 src/declarative/qml/qmlvaluetypescriptclass_p.h
 delete mode 100644 src/declarative/qml/qmlvme.cpp
 delete mode 100644 src/declarative/qml/qmlvme_p.h
 delete mode 100644 src/declarative/qml/qmlvmemetaobject.cpp
 delete mode 100644 src/declarative/qml/qmlvmemetaobject_p.h
 delete mode 100644 src/declarative/qml/qmlwatcher.cpp
 delete mode 100644 src/declarative/qml/qmlwatcher_p.h
 delete mode 100644 src/declarative/qml/qmlworkerscript.cpp
 delete mode 100644 src/declarative/qml/qmlworkerscript_p.h
 delete mode 100644 src/declarative/qml/qmlxmlhttprequest.cpp
 delete mode 100644 src/declarative/qml/qmlxmlhttprequest_p.h
 create mode 100644 src/declarative/util/qdeclarativeanimation.cpp
 create mode 100644 src/declarative/util/qdeclarativeanimation_p.h
 create mode 100644 src/declarative/util/qdeclarativeanimation_p_p.h
 create mode 100644 src/declarative/util/qdeclarativebehavior.cpp
 create mode 100644 src/declarative/util/qdeclarativebehavior_p.h
 create mode 100644 src/declarative/util/qdeclarativebind.cpp
 create mode 100644 src/declarative/util/qdeclarativebind_p.h
 create mode 100644 src/declarative/util/qdeclarativeconnection.cpp
 create mode 100644 src/declarative/util/qdeclarativeconnection_p.h
 create mode 100644 src/declarative/util/qdeclarativedatetimeformatter.cpp
 create mode 100644 src/declarative/util/qdeclarativedatetimeformatter_p.h
 create mode 100644 src/declarative/util/qdeclarativeeasefollow.cpp
 create mode 100644 src/declarative/util/qdeclarativeeasefollow_p.h
 create mode 100644 src/declarative/util/qdeclarativefontloader.cpp
 create mode 100644 src/declarative/util/qdeclarativefontloader_p.h
 create mode 100644 src/declarative/util/qdeclarativelistaccessor.cpp
 create mode 100644 src/declarative/util/qdeclarativelistaccessor_p.h
 create mode 100644 src/declarative/util/qdeclarativelistmodel.cpp
 create mode 100644 src/declarative/util/qdeclarativelistmodel_p.h
 create mode 100644 src/declarative/util/qdeclarativenullablevalue_p_p.h
 create mode 100644 src/declarative/util/qdeclarativenumberformatter.cpp
 create mode 100644 src/declarative/util/qdeclarativenumberformatter_p.h
 create mode 100644 src/declarative/util/qdeclarativeopenmetaobject.cpp
 create mode 100644 src/declarative/util/qdeclarativeopenmetaobject_p.h
 create mode 100644 src/declarative/util/qdeclarativepackage.cpp
 create mode 100644 src/declarative/util/qdeclarativepackage_p.h
 create mode 100644 src/declarative/util/qdeclarativepixmapcache.cpp
 create mode 100644 src/declarative/util/qdeclarativepixmapcache_p.h
 create mode 100644 src/declarative/util/qdeclarativepropertychanges.cpp
 create mode 100644 src/declarative/util/qdeclarativepropertychanges_p.h
 create mode 100644 src/declarative/util/qdeclarativepropertymap.cpp
 create mode 100644 src/declarative/util/qdeclarativepropertymap.h
 create mode 100644 src/declarative/util/qdeclarativespringfollow.cpp
 create mode 100644 src/declarative/util/qdeclarativespringfollow_p.h
 create mode 100644 src/declarative/util/qdeclarativestate.cpp
 create mode 100644 src/declarative/util/qdeclarativestate_p.h
 create mode 100644 src/declarative/util/qdeclarativestate_p_p.h
 create mode 100644 src/declarative/util/qdeclarativestategroup.cpp
 create mode 100644 src/declarative/util/qdeclarativestategroup_p.h
 create mode 100644 src/declarative/util/qdeclarativestateoperations.cpp
 create mode 100644 src/declarative/util/qdeclarativestateoperations_p.h
 create mode 100644 src/declarative/util/qdeclarativestyledtext.cpp
 create mode 100644 src/declarative/util/qdeclarativestyledtext_p.h
 create mode 100644 src/declarative/util/qdeclarativesystempalette.cpp
 create mode 100644 src/declarative/util/qdeclarativesystempalette_p.h
 create mode 100644 src/declarative/util/qdeclarativetimeline.cpp
 create mode 100644 src/declarative/util/qdeclarativetimeline_p_p.h
 create mode 100644 src/declarative/util/qdeclarativetimer.cpp
 create mode 100644 src/declarative/util/qdeclarativetimer_p.h
 create mode 100644 src/declarative/util/qdeclarativetransition.cpp
 create mode 100644 src/declarative/util/qdeclarativetransition_p.h
 create mode 100644 src/declarative/util/qdeclarativetransitionmanager.cpp
 create mode 100644 src/declarative/util/qdeclarativetransitionmanager_p_p.h
 create mode 100644 src/declarative/util/qdeclarativeutilmodule.cpp
 create mode 100644 src/declarative/util/qdeclarativeutilmodule_p.h
 create mode 100644 src/declarative/util/qdeclarativeview.cpp
 create mode 100644 src/declarative/util/qdeclarativeview.h
 create mode 100644 src/declarative/util/qdeclarativexmllistmodel.cpp
 create mode 100644 src/declarative/util/qdeclarativexmllistmodel_p.h
 delete mode 100644 src/declarative/util/qmlanimation.cpp
 delete mode 100644 src/declarative/util/qmlanimation_p.h
 delete mode 100644 src/declarative/util/qmlanimation_p_p.h
 delete mode 100644 src/declarative/util/qmlbehavior.cpp
 delete mode 100644 src/declarative/util/qmlbehavior_p.h
 delete mode 100644 src/declarative/util/qmlbind.cpp
 delete mode 100644 src/declarative/util/qmlbind_p.h
 delete mode 100644 src/declarative/util/qmlconnection.cpp
 delete mode 100644 src/declarative/util/qmlconnection_p.h
 delete mode 100644 src/declarative/util/qmldatetimeformatter.cpp
 delete mode 100644 src/declarative/util/qmldatetimeformatter_p.h
 delete mode 100644 src/declarative/util/qmleasefollow.cpp
 delete mode 100644 src/declarative/util/qmleasefollow_p.h
 delete mode 100644 src/declarative/util/qmlfontloader.cpp
 delete mode 100644 src/declarative/util/qmlfontloader_p.h
 delete mode 100644 src/declarative/util/qmlgraphicsutilmodule.cpp
 delete mode 100644 src/declarative/util/qmlgraphicsutilmodule_p.h
 delete mode 100644 src/declarative/util/qmllistaccessor.cpp
 delete mode 100644 src/declarative/util/qmllistaccessor_p.h
 delete mode 100644 src/declarative/util/qmllistmodel.cpp
 delete mode 100644 src/declarative/util/qmllistmodel_p.h
 delete mode 100644 src/declarative/util/qmlnullablevalue_p_p.h
 delete mode 100644 src/declarative/util/qmlnumberformatter.cpp
 delete mode 100644 src/declarative/util/qmlnumberformatter_p.h
 delete mode 100644 src/declarative/util/qmlopenmetaobject.cpp
 delete mode 100644 src/declarative/util/qmlopenmetaobject_p.h
 delete mode 100644 src/declarative/util/qmlpackage.cpp
 delete mode 100644 src/declarative/util/qmlpackage_p.h
 delete mode 100644 src/declarative/util/qmlpixmapcache.cpp
 delete mode 100644 src/declarative/util/qmlpixmapcache_p.h
 delete mode 100644 src/declarative/util/qmlpropertychanges.cpp
 delete mode 100644 src/declarative/util/qmlpropertychanges_p.h
 delete mode 100644 src/declarative/util/qmlpropertymap.cpp
 delete mode 100644 src/declarative/util/qmlpropertymap.h
 delete mode 100644 src/declarative/util/qmlspringfollow.cpp
 delete mode 100644 src/declarative/util/qmlspringfollow_p.h
 delete mode 100644 src/declarative/util/qmlstate.cpp
 delete mode 100644 src/declarative/util/qmlstate_p.h
 delete mode 100644 src/declarative/util/qmlstate_p_p.h
 delete mode 100644 src/declarative/util/qmlstategroup.cpp
 delete mode 100644 src/declarative/util/qmlstategroup_p.h
 delete mode 100644 src/declarative/util/qmlstateoperations.cpp
 delete mode 100644 src/declarative/util/qmlstateoperations_p.h
 delete mode 100644 src/declarative/util/qmlstyledtext.cpp
 delete mode 100644 src/declarative/util/qmlstyledtext_p.h
 delete mode 100644 src/declarative/util/qmlsystempalette.cpp
 delete mode 100644 src/declarative/util/qmlsystempalette_p.h
 delete mode 100644 src/declarative/util/qmltimeline.cpp
 delete mode 100644 src/declarative/util/qmltimeline_p_p.h
 delete mode 100644 src/declarative/util/qmltimer.cpp
 delete mode 100644 src/declarative/util/qmltimer_p.h
 delete mode 100644 src/declarative/util/qmltransition.cpp
 delete mode 100644 src/declarative/util/qmltransition_p.h
 delete mode 100644 src/declarative/util/qmltransitionmanager.cpp
 delete mode 100644 src/declarative/util/qmltransitionmanager_p_p.h
 delete mode 100644 src/declarative/util/qmlview.cpp
 delete mode 100644 src/declarative/util/qmlview.h
 delete mode 100644 src/declarative/util/qmlxmllistmodel.cpp
 delete mode 100644 src/declarative/util/qmlxmllistmodel_p.h
 create mode 100644 src/multimedia/qml/qdeclarative.cpp
 create mode 100644 src/multimedia/qml/qdeclarative.h
 create mode 100644 src/multimedia/qml/qdeclarativeaudio.cpp
 create mode 100644 src/multimedia/qml/qdeclarativeaudio_p.h
 create mode 100644 src/multimedia/qml/qdeclarativemediabase.cpp
 create mode 100644 src/multimedia/qml/qdeclarativemediabase_p.h
 create mode 100644 src/multimedia/qml/qdeclarativevideo.cpp
 create mode 100644 src/multimedia/qml/qdeclarativevideo_p.h
 delete mode 100644 src/multimedia/qml/qml.cpp
 delete mode 100644 src/multimedia/qml/qml.h
 delete mode 100644 src/multimedia/qml/qmlaudio.cpp
 delete mode 100644 src/multimedia/qml/qmlaudio_p.h
 delete mode 100644 src/multimedia/qml/qmlgraphicsvideo.cpp
 delete mode 100644 src/multimedia/qml/qmlgraphicsvideo_p.h
 delete mode 100644 src/multimedia/qml/qmlmediabase.cpp
 delete mode 100644 src/multimedia/qml/qmlmediabase_p.h
 create mode 100644 src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
 create mode 100644 src/plugins/qdeclarativemodules/multimedia/multimedia.pro
 create mode 100644 src/plugins/qdeclarativemodules/qdeclarativemodules.pro
 create mode 100644 src/plugins/qdeclarativemodules/widgets/graphicslayouts.cpp
 create mode 100644 src/plugins/qdeclarativemodules/widgets/graphicslayouts_p.h
 create mode 100644 src/plugins/qdeclarativemodules/widgets/graphicswidgets.cpp
 create mode 100644 src/plugins/qdeclarativemodules/widgets/graphicswidgets_p.h
 create mode 100644 src/plugins/qdeclarativemodules/widgets/widgets.cpp
 create mode 100644 src/plugins/qdeclarativemodules/widgets/widgets.pro
 delete mode 100644 src/plugins/qmlmodules/multimedia/multimedia.cpp
 delete mode 100644 src/plugins/qmlmodules/multimedia/multimedia.pro
 delete mode 100644 src/plugins/qmlmodules/qmlmodules.pro
 delete mode 100644 src/plugins/qmlmodules/widgets/graphicslayouts.cpp
 delete mode 100644 src/plugins/qmlmodules/widgets/graphicslayouts_p.h
 delete mode 100644 src/plugins/qmlmodules/widgets/graphicswidgets.cpp
 delete mode 100644 src/plugins/qmlmodules/widgets/graphicswidgets_p.h
 delete mode 100644 src/plugins/qmlmodules/widgets/widgets.cpp
 delete mode 100644 src/plugins/qmlmodules/widgets/widgets.pro
 create mode 100644 tests/auto/declarative/qdeclarativeanchors/data/anchors.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanchors/data/centerin.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanchors/data/crash1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanchors/data/fill.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanchors/data/loop1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanchors/data/loop2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanchors/data/margins.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro
 create mode 100644 tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeanimatedimage/data/colors.gif
 create mode 100644 tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.gif
 create mode 100644 tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro
 create mode 100644 tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/attached.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/properties.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/properties2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/properties3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/properties4.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/properties5.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
 create mode 100644 tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/color.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/empty.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/loop.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/data/simple.qml
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
 create mode 100644 tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
 create mode 100644 tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
 create mode 100644 tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml
 create mode 100644 tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
 create mode 100644 tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeborderimage/data/colors-round.sci
 create mode 100644 tests/auto/declarative/qdeclarativeborderimage/data/colors.png
 create mode 100644 tests/auto/declarative/qdeclarativeborderimage/data/invalid.sci
 create mode 100644 tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro
 create mode 100644 tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
 create mode 100644 tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
 create mode 100644 tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
 create mode 100644 tests/auto/declarative/qdeclarativedatetimeformatter/qdeclarativedatetimeformatter.pro
 create mode 100644 tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp
 create mode 100644 tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro
 create mode 100644 tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
 create mode 100644 tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro
 create mode 100644 tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
 create mode 100644 tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
 create mode 100644 tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
 create mode 100644 tests/auto/declarative/qdeclarativedom/data/MyComponent.qml
 create mode 100644 tests/auto/declarative/qdeclarativedom/data/MyItem.qml
 create mode 100644 tests/auto/declarative/qdeclarativedom/data/importdir/Bar.qml
 create mode 100644 tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml
 create mode 100644 tests/auto/declarative/qdeclarativedom/data/top.qml
 create mode 100644 tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro
 create mode 100644 tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeeasefollow/data/easefollow1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeeasefollow/data/easefollow2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeeasefollow/data/easefollow3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro
 create mode 100644 tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/TypeForDynamicCreation.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/deferredProperties.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.helper.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/enums.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/enums.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/exceptionClearsOnReeval.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/externalScript.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/externalScript.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/externalScript.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/nonExistantAttachedObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/scope.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/valueTypeFunctions.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/testtypes.h
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
 create mode 100644 tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
 create mode 100644 tests/auto/declarative/qdeclarativeerror/test.txt
 create mode 100644 tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml
 create mode 100644 tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
 create mode 100644 tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
 create mode 100644 tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
 create mode 100644 tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro
 create mode 100644 tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml
 create mode 100644 tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro
 create mode 100644 tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
 create mode 100644 tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf
 create mode 100644 tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf
 create mode 100644 tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
 create mode 100644 tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
 create mode 100644 tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
 create mode 100644 tests/auto/declarative/qdeclarativegridview/data/gridview.qml
 create mode 100644 tests/auto/declarative/qdeclarativegridview/data/gridview2.qml
 create mode 100644 tests/auto/declarative/qdeclarativegridview/data/gridview3.qml
 create mode 100644 tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro
 create mode 100644 tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeimage/data/colors.png
 create mode 100644 tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro
 create mode 100644 tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeimageprovider/data/exists.png
 create mode 100644 tests/auto/declarative/qdeclarativeimageprovider/data/exists1.png
 create mode 100644 tests/auto/declarative/qdeclarativeimageprovider/data/exists2.png
 create mode 100644 tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
 create mode 100644 tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
 create mode 100644 tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
 create mode 100644 tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeitem/data/keynavigation.qml
 create mode 100644 tests/auto/declarative/qdeclarativeitem/data/keys.qml
 create mode 100644 tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro
 create mode 100644 tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/CompositeType2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/CompositeType4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/I18n.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/I18nType30.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/MyComponent.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/MyCompositeValueSource.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/MyContainerComponent.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/alias.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/assignLiteralSignalProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/assignObjectToSignal.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/assignQmlComponent.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/assignSignal.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/assignTypeExtremes.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/autoComponentCreation.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.1.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.4.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.5.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.6.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/customVariantTypes.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/empty.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/empty.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/failingComponent.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/failingComponentTest.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/finalOverride.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/finalOverride.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyNames.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyUse.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/i18nNameSpace.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/i18nStrings.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/i18nType.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidID.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/missingObject.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/missingObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/missingSignal.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.1.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.4.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.5.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/property.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/rootAsQmlComponent.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.10.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.10.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.11.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.11.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.12.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.4.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.5.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.6.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.6.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.7.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.7.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.8.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.9.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/script.9.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/scriptString.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/signal.1.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/signal.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/signal.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/simpleBindings.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/simpleContainer.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/simpleObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/test.js
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/test2.js
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/valueTypes.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.errors.txt
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestLocal.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestSubDir.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/pics/blue.png
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/testtypes.h
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
 create mode 100644 tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro
 create mode 100644 tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
 create mode 100644 tests/auto/declarative/qdeclarativelistreference/data/MyType.qml
 create mode 100644 tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml
 create mode 100644 tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
 create mode 100644 tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro
 create mode 100644 tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
 create mode 100644 tests/auto/declarative/qdeclarativelistview/data/itemlist.qml
 create mode 100644 tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml
 create mode 100644 tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
 create mode 100644 tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml
 create mode 100644 tests/auto/declarative/qdeclarativelistview/data/listview.qml
 create mode 100644 tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro
 create mode 100644 tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
 create mode 100644 tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
 create mode 100644 tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
 create mode 100644 tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
 create mode 100644 tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
 create mode 100644 tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
 create mode 100644 tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
 create mode 100644 tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
 create mode 100644 tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
 create mode 100644 tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro
 create mode 100644 tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
 create mode 100644 tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
 create mode 100644 tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
 create mode 100644 tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro
 create mode 100644 tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
 create mode 100644 tests/auto/declarative/qdeclarativemoduleplugin/plugin.qml
 create mode 100644 tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
 create mode 100644 tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
 create mode 100644 tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
 create mode 100644 tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
 create mode 100644 tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
 create mode 100644 tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml
 create mode 100644 tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
 create mode 100644 tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
 create mode 100644 tests/auto/declarative/qdeclarativenumberformatter/qdeclarativenumberformatter.pro
 create mode 100644 tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeparticles/data/particle.png
 create mode 100644 tests/auto/declarative/qdeclarativeparticles/data/particlemotion.qml
 create mode 100644 tests/auto/declarative/qdeclarativeparticles/data/particles.qml
 create mode 100644 tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro
 create mode 100644 tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
 create mode 100644 tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
 create mode 100644 tests/auto/declarative/qdeclarativepathview/data/path.qml
 create mode 100644 tests/auto/declarative/qdeclarativepathview/data/pathview.qml
 create mode 100644 tests/auto/declarative/qdeclarativepathview/data/pathview1.qml
 create mode 100644 tests/auto/declarative/qdeclarativepathview/data/pathview2.qml
 create mode 100644 tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
 create mode 100644 tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro
 create mode 100644 tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
 create mode 100644 tests/auto/declarative/qdeclarativepixmapcache/data/exists.png
 create mode 100644 tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png
 create mode 100644 tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png
 create mode 100644 tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro
 create mode 100644 tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/grid.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/propertychanges.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/repeater.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/vertical.qml
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro
 create mode 100644 tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
 create mode 100644 tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro
 create mode 100644 tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/closestangle.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/createComponent.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/darker.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/enums.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/hsla.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/lighter.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/md5.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/point.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/rect.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/rgba.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/size.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/tint.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/data/vector.qml
 create mode 100644 tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
 create mode 100644 tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
 create mode 100644 tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml
 create mode 100644 tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml
 create mode 100644 tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
 create mode 100644 tests/auto/declarative/qdeclarativerepeater/data/properties.qml
 create mode 100644 tests/auto/declarative/qdeclarativerepeater/data/repeater.qml
 create mode 100644 tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml
 create mode 100644 tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro
 create mode 100644 tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
 create mode 100644 tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml
 create mode 100644 tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml
 create mode 100644 tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml
 create mode 100644 tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
 create mode 100644 tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/anchorChanges.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/deleting.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/deletingState.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/explicit.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/parentChange.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/script.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
 create mode 100644 tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro
 create mode 100644 tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
 create mode 100644 tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro
 create mode 100644 tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
 create mode 100644 tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro
 create mode 100644 tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
 create mode 100644 tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
 create mode 100644 tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/data/inputmethodhints.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/data/masks.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/data/validators.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
 create mode 100644 tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
 create mode 100644 tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/bindingAssignment.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/bindingConflict.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/bindingRead.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.js
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/enums.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/enums.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/font_write.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/font_write.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/font_write.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/point_write.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/pointf_write.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/rect_write.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/rectf_write.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/size_write.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/sizef_write.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/staticAssignment.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/valueInterceptors.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/valueSources.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_write.qml
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
 create mode 100644 tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/basic.html
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/basic.ico
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/basic.png
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/basic.qml
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/elements.html
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/elements.qml
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/forward.html
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/javaScript.html
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/loadError.qml
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/newwindows.html
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/newwindows.qml
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/pixelCache.html
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/pixelCache.qml
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
 create mode 100644 tests/auto/declarative/qdeclarativewebview/data/sethtml.qml
 create mode 100644 tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
 create mode 100644 tests/auto/declarative/qdeclarativewebview/testtypes.cpp
 create mode 100644 tests/auto/declarative/qdeclarativewebview/testtypes.h
 create mode 100644 tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.reply
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.xml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.xml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/document.xml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/element.xml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.reply
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.reply
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.wait
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/redirecttarget.html
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/seconddocument.html
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.reply
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.reply
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_GET.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_PUT.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.reply
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/status.200.reply
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/status.404.reply
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/status.expect
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/testdocument.html
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/data/text.xml
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro
 create mode 100644 tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
 create mode 100644 tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
 delete mode 100644 tests/auto/declarative/qmlanimations/data/attached.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/badproperty1.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/badproperty2.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/badtype1.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/badtype2.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/badtype3.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/badtype4.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/dontAutoStart.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/dontStart.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/dontStart2.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/dotproperty.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/mixedtype1.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/mixedtype2.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/properties.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/properties2.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/properties3.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/properties4.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/properties5.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/propertiesTransition.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/propertiesTransition2.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/propertiesTransition3.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/propertiesTransition4.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/propertiesTransition5.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/propertiesTransition6.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/valuesource.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/data/valuesource2.qml
 delete mode 100644 tests/auto/declarative/qmlanimations/qmlanimations.pro
 delete mode 100644 tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/binding.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/color.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/disabled.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/dontStart.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/empty.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/explicit.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/groupProperty.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/loop.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/parent.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/data/simple.qml
 delete mode 100644 tests/auto/declarative/qmlbehaviors/qmlbehaviors.pro
 delete mode 100644 tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
 delete mode 100644 tests/auto/declarative/qmlbinding/data/test-binding.qml
 delete mode 100644 tests/auto/declarative/qmlbinding/data/test-binding2.qml
 delete mode 100644 tests/auto/declarative/qmlbinding/qmlbinding.pro
 delete mode 100644 tests/auto/declarative/qmlbinding/tst_qmlbinding.cpp
 delete mode 100644 tests/auto/declarative/qmlconnection/data/test-connection.qml
 delete mode 100644 tests/auto/declarative/qmlconnection/data/test-connection2.qml
 delete mode 100644 tests/auto/declarative/qmlconnection/data/test-connection3.qml
 delete mode 100644 tests/auto/declarative/qmlconnection/data/trimming.qml
 delete mode 100644 tests/auto/declarative/qmlconnection/qmlconnection.pro
 delete mode 100644 tests/auto/declarative/qmlconnection/tst_qmlconnection.cpp
 delete mode 100644 tests/auto/declarative/qmlcontext/qmlcontext.pro
 delete mode 100644 tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp
 delete mode 100644 tests/auto/declarative/qmldatetimeformatter/qmldatetimeformatter.pro
 delete mode 100644 tests/auto/declarative/qmldatetimeformatter/tst_qmldatetimeformatter.cpp
 delete mode 100644 tests/auto/declarative/qmldebug/qmldebug.pro
 delete mode 100644 tests/auto/declarative/qmldebug/tst_qmldebug.cpp
 delete mode 100644 tests/auto/declarative/qmldebugclient/qmldebugclient.pro
 delete mode 100644 tests/auto/declarative/qmldebugclient/tst_qmldebugclient.cpp
 delete mode 100644 tests/auto/declarative/qmldebugservice/qmldebugservice.pro
 delete mode 100644 tests/auto/declarative/qmldebugservice/tst_qmldebugservice.cpp
 delete mode 100644 tests/auto/declarative/qmldom/data/MyComponent.qml
 delete mode 100644 tests/auto/declarative/qmldom/data/MyItem.qml
 delete mode 100644 tests/auto/declarative/qmldom/data/importdir/Bar.qml
 delete mode 100644 tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml
 delete mode 100644 tests/auto/declarative/qmldom/data/top.qml
 delete mode 100644 tests/auto/declarative/qmldom/qmldom.pro
 delete mode 100644 tests/auto/declarative/qmldom/tst_qmldom.cpp
 delete mode 100644 tests/auto/declarative/qmleasefollow/data/easefollow1.qml
 delete mode 100644 tests/auto/declarative/qmleasefollow/data/easefollow2.qml
 delete mode 100644 tests/auto/declarative/qmleasefollow/data/easefollow3.qml
 delete mode 100644 tests/auto/declarative/qmleasefollow/qmleasefollow.pro
 delete mode 100644 tests/auto/declarative/qmleasefollow/tst_qmleasefollow.cpp
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/CustomObject.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/MethodsObject.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/ScopeObject.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/TypeForDynamicCreation.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/assignBasicTypes.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/assignBasicTypes.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/attachedProperty.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/bindingLoop.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/bug.1.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/compositePropertyType.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/deferredProperties.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/deletedObject.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/dynamicCreation.helper.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/dynamicCreation.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/dynamicDeletion.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/enums.1.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/enums.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/exceptionClearsOnReeval.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/extensionObjects.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/externalScript.1.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/externalScript.2.js
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/externalScript.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/externalScript.3.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/externalScript.4.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/externalScript.js
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/jsObject.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/listProperties.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/listToVariant.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/methods.1.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/methods.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/methods.3.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/methods.4.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/methods.5.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/multiEngineObject.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/nonExistantAttachedObject.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/objectsCompareAsEqual.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/qmlToString.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/scope.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/scope.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/scriptAccess.js
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/scriptAccess.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/scriptErrors.js
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/scriptErrors.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/signalAssignment.1.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/signalAssignment.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/signalParameterTypes.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/transientErrors.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.2.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/data/valueTypeFunctions.qml
 delete mode 100644 tests/auto/declarative/qmlecmascript/qmlecmascript.pro
 delete mode 100644 tests/auto/declarative/qmlecmascript/testtypes.cpp
 delete mode 100644 tests/auto/declarative/qmlecmascript/testtypes.h
 delete mode 100644 tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
 delete mode 100644 tests/auto/declarative/qmlengine/qmlengine.pro
 delete mode 100644 tests/auto/declarative/qmlengine/tst_qmlengine.cpp
 delete mode 100644 tests/auto/declarative/qmlerror/qmlerror.pro
 delete mode 100644 tests/auto/declarative/qmlerror/test.txt
 delete mode 100644 tests/auto/declarative/qmlerror/tst_qmlerror.cpp
 delete mode 100644 tests/auto/declarative/qmlfontloader/data/dummy.ttf
 delete mode 100644 tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf
 delete mode 100644 tests/auto/declarative/qmlfontloader/qmlfontloader.pro
 delete mode 100644 tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsanchors/data/anchors.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanchors/data/centerin.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanchors/data/crash1.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanchors/data/fill.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanchors/data/loop1.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanchors/data/loop2.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanchors/data/margins.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanchors/qmlgraphicsanchors.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.gif
 delete mode 100644 tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.gif
 delete mode 100644 tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanpause.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanstopped.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsanimatedimage/qmlgraphicsanimatedimage.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsanimatedimage/tst_qmlgraphicsanimatedimage.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsborderimage/data/colors-round.sci
 delete mode 100644 tests/auto/declarative/qmlgraphicsborderimage/data/colors.png
 delete mode 100644 tests/auto/declarative/qmlgraphicsborderimage/data/invalid.sci
 delete mode 100644 tests/auto/declarative/qmlgraphicsborderimage/qmlgraphicsborderimage.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsflickable/data/flickable01.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsflickable/qmlgraphicsflickable.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsflickable/tst_qmlgraphicsflickable.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsflipable/data/test-flipable.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsflipable/qmlgraphicsflipable.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsflipable/tst_qmlgraphicsflipable.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsgridview/data/gridview.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsgridview/data/gridview2.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsgridview/data/gridview3.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsgridview/qmlgraphicsgridview.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsimage/data/colors.png
 delete mode 100644 tests/auto/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsitem/data/keynavigation.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsitem/data/keys.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsitem/qmlgraphicsitem.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicslistview/data/itemlist.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicslistview/data/listview-enforcerange.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicslistview/data/listview.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicslistview/qmlgraphicslistview.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/data/GraphicsWidget250x250.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/data/NoResizeGraphicsWidget.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/data/SizeGraphicsWidgetToLoader.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/data/SizeLoaderToGraphicsWidget.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsmousearea/data/dragproperties.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsmousearea/qmlgraphicsmousearea.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsparticles/data/particle.png
 delete mode 100644 tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsparticles/data/particles.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsparticles/qmlgraphicsparticles.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicspathview/data/datamodel.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspathview/data/path.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspathview/data/pathview.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspathview/data/pathview1.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspathview/data/pathview2.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspathview/qmlgraphicspathview.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/grid.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicsrepeater/data/intmodel.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsrepeater/data/itemlist.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsrepeater/data/objlist.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsrepeater/data/properties.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsrepeater/data/repeater.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsrepeater/data/repeater2.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicsrepeater/qmlgraphicsrepeater.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicstext/qmlgraphicstext.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/cursorTest.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/http/ErrItem.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/http/NormItem.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTest.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail1.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail2.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestPass.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/httpfail/FailItem.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/httpslow/WaitItem.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/inputmethodhints.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/qmlgraphicstextedit.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicstextinput/data/cursorTest.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextinput/data/inputmethodhints.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextinput/data/masks.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextinput/data/maxLength.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextinput/data/validators.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicstextinput/qmlgraphicstextinput.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/basic.html
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/basic.ico
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/basic.png
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/basic.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/elements.html
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/elements.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/forward.html
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/javaScript.html
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/loadError.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/newwindows.html
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/newwindows.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/pixelCache.html
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/pixelCache.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/data/sethtml.qml
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/testtypes.cpp
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/testtypes.h
 delete mode 100644 tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
 delete mode 100644 tests/auto/declarative/qmlimageprovider/data/exists.png
 delete mode 100644 tests/auto/declarative/qmlimageprovider/data/exists1.png
 delete mode 100644 tests/auto/declarative/qmlimageprovider/data/exists2.png
 delete mode 100644 tests/auto/declarative/qmlimageprovider/qmlimageprovider.pro
 delete mode 100644 tests/auto/declarative/qmlimageprovider/tst_qmlimageprovider.cpp
 delete mode 100644 tests/auto/declarative/qmlinfo/data/NestedObject.qml
 delete mode 100644 tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
 delete mode 100644 tests/auto/declarative/qmlinfo/data/qmlObject.qml
 delete mode 100644 tests/auto/declarative/qmlinfo/qmlinfo.pro
 delete mode 100644 tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
 delete mode 100644 tests/auto/declarative/qmlinstruction/qmlinstruction.pro
 delete mode 100644 tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp
 delete mode 100644 tests/auto/declarative/qmllanguage/data/Alias.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/Alias2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/Alias3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/Alias4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/ComponentComposite.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/CompositeType.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/CompositeType2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/CompositeType3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/CompositeType4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/HelperAlias.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/I18n.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/I18nType30.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/MyComponent.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/MyCompositeValueSource.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/MyContainerComponent.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/NestedAlias.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/OnCompletedType.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/alias.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/alias.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/alias.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/alias.4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/alias.5.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/alias.6.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/alias.7.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/alias.8.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/alias.9.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/assignLiteralSignalProperty.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/assignObjectToSignal.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/assignQmlComponent.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/assignSignal.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/assignTypeExtremes.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/attachedProperties.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/autoComponentCreation.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.1.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.4.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.5.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.5.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.6.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/component.6.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/componentCompositeType.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/cppnamespace.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/cppnamespace.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/crash2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/customParserTypes.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/customVariantTypes.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/declaredPropertyValues.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/defaultGrouped.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/defaultPropertyListOrder.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/doubleSignal.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/duplicateIDs.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/duplicateIDs.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/dynamicObject.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/dynamicProperties.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/dynamicPropertiesNested.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/empty.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/empty.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/emptySignal.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/failingComponent.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/failingComponentTest.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/fakeDotProperty.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/finalOverride.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/finalOverride.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyNames.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyUse.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/i18nNameSpace.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/i18nScript.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/i18nStrings.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/i18nType.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/idProperty.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/importNamespaceConflict.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/importNamespaceConflict.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/interfaceProperty.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/interfaceQList.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.4.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.5.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.6.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidID.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidImportID.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidImportID.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidRoot.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/invalidRoot.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/qmldir
 delete mode 100644 tests/auto/declarative/qmllanguage/data/listAssignment.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/listAssignment.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/listAssignment.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/listAssignment.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/listProperties.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/missingObject.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/missingObject.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/missingSignal.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/missingSignal.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nestedErrors.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nullDotProperty.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/nullDotProperty.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/onCompleted.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.1.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.4.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.5.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/property.5.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/propertyValueSource.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/propertyValueSource.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/readOnly.1.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/readOnly.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/readOnly.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/readOnly.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/readOnly.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/readOnly.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/rootAsQmlComponent.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.1.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.10.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.10.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.11.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.11.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.12.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.12.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.4.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.5.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.5.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.6.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.6.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.7.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.7.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.8.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.8.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.9.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/script.9.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/scriptString.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/signal.1.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/signal.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/signal.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/signal.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/signal.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/signal.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/simpleBindings.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/simpleContainer.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/simpleObject.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/subdir/Test.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/test.js
 delete mode 100644 tests/auto/declarative/qmllanguage/data/test2.js
 delete mode 100644 tests/auto/declarative/qmllanguage/data/unregisteredObject.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/unregisteredObject.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/unsupportedProperty.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/unsupportedProperty.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/valueTypes.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.1.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.1.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.10.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.10.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.11.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.11.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.12.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.12.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.13.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.13.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.14.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.14.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.15.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.15.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.2.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.2.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.3.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.3.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.4.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.4.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.5.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.5.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.6.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.6.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.7.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.7.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.8.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.8.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.9.errors.txt
 delete mode 100644 tests/auto/declarative/qmllanguage/data/wrongType.9.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/qmllanguage.pro
 delete mode 100644 tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/LocalInternal.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/Test.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestLocal.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestSubDir.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/pics/blue.png
 delete mode 100644 tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/qmldir
 delete mode 100644 tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
 delete mode 100644 tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/qmldir
 delete mode 100644 tests/auto/declarative/qmllanguage/testtypes.cpp
 delete mode 100644 tests/auto/declarative/qmllanguage/testtypes.h
 delete mode 100644 tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
 delete mode 100644 tests/auto/declarative/qmllistmodel/qmllistmodel.pro
 delete mode 100644 tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
 delete mode 100644 tests/auto/declarative/qmllistreference/data/MyType.qml
 delete mode 100644 tests/auto/declarative/qmllistreference/data/engineTypes.qml
 delete mode 100644 tests/auto/declarative/qmllistreference/data/variantToList.qml
 delete mode 100644 tests/auto/declarative/qmllistreference/qmllistreference.pro
 delete mode 100644 tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp
 delete mode 100644 tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro
 delete mode 100644 tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
 delete mode 100644 tests/auto/declarative/qmlmetatype/qmlmetatype.pro
 delete mode 100644 tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp
 delete mode 100644 tests/auto/declarative/qmlmoduleplugin/plugin.qml
 delete mode 100644 tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
 delete mode 100644 tests/auto/declarative/qmlmoduleplugin/plugin/plugin.pro
 delete mode 100644 tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro
 delete mode 100644 tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.cpp
 delete mode 100644 tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.pro
 delete mode 100644 tests/auto/declarative/qmlnumberformatter/qmlnumberformatter.pro
 delete mode 100644 tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp
 delete mode 100644 tests/auto/declarative/qmlpixmapcache/data/exists.png
 delete mode 100644 tests/auto/declarative/qmlpixmapcache/data/exists1.png
 delete mode 100644 tests/auto/declarative/qmlpixmapcache/data/exists2.png
 delete mode 100644 tests/auto/declarative/qmlpixmapcache/qmlpixmapcache.pro
 delete mode 100644 tests/auto/declarative/qmlpixmapcache/tst_qmlpixmapcache.cpp
 delete mode 100644 tests/auto/declarative/qmlpropertymap/qmlpropertymap.pro
 delete mode 100644 tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp
 delete mode 100644 tests/auto/declarative/qmlqt/data/closestangle.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/consoleLog.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/createComponent.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/createComponentData.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/createQmlObject.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/darker.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/enums.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/hsla.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/lighter.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/md5.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/point.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/rect.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/rgba.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/size.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/tint.qml
 delete mode 100644 tests/auto/declarative/qmlqt/data/vector.qml
 delete mode 100644 tests/auto/declarative/qmlqt/qmlqt.pro
 delete mode 100644 tests/auto/declarative/qmlqt/tst_qmlqt.cpp
 delete mode 100644 tests/auto/declarative/qmlspringfollow/data/springfollow1.qml
 delete mode 100644 tests/auto/declarative/qmlspringfollow/data/springfollow2.qml
 delete mode 100644 tests/auto/declarative/qmlspringfollow/data/springfollow3.qml
 delete mode 100644 tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro
 delete mode 100644 tests/auto/declarative/qmlspringfollow/tst_qmlspringfollow.cpp
 delete mode 100644 tests/auto/declarative/qmlstates/data/ExtendedRectangle.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/anchorChanges.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/anchorChanges2.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/anchorChanges3.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/anchorChanges4.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/anchorChanges5.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/autoStateAtStartupRestoreBug.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/basicBinding.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/basicBinding2.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/basicBinding3.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/basicBinding4.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/basicChanges.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/basicChanges2.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/basicChanges3.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/basicExtension.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/deleting.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/deletingState.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/explicit.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/fakeExtension.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/illegalTempState.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/legalTempState.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/nonExistantProp.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/parentChange.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/parentChange2.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/parentChange3.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/parentChange4.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/parentChange5.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/propertyErrors.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/restoreEntryValues.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/script.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/signalOverride.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/signalOverride2.qml
 delete mode 100644 tests/auto/declarative/qmlstates/data/signalOverrideCrash.qml
 delete mode 100644 tests/auto/declarative/qmlstates/qmlstates.pro
 delete mode 100644 tests/auto/declarative/qmlstates/tst_qmlstates.cpp
 delete mode 100644 tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro
 delete mode 100644 tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp
 delete mode 100644 tests/auto/declarative/qmlsystempalette/qmlsystempalette.pro
 delete mode 100644 tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp
 delete mode 100644 tests/auto/declarative/qmltimer/qmltimer.pro
 delete mode 100644 tests/auto/declarative/qmltimer/tst_qmltimer.cpp
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.2.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.3.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/bindingAssignment.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/bindingConflict.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/bindingRead.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/bindingVariantCopy.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/deletedObject.js
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/deletedObject.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/enums.1.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/enums.2.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/font_read.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/font_write.2.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/font_write.3.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/font_write.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/point_read.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/point_write.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/pointf_read.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/pointf_write.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/rect_read.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/rect_write.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/rectf_read.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/rectf_write.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/scriptAccess.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/scriptVariantCopy.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/size_read.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/size_write.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/sizef_read.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/sizef_write.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/staticAssignment.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/valueInterceptors.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/valueSources.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/vector3d_read.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/data/vector3d_write.qml
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/qmlvaluetypes.pro
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/testtypes.cpp
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/testtypes.h
 delete mode 100644 tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/abort.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/abort.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/abort.reply
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/abort_opened.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/abort_unsent.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/attr.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/attr.xml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/callbackException.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/cdata.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/cdata.xml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/constructor.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/defaultState.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/document.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/document.xml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/domExceptionCodes.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/element.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/element.xml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_args.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_sent.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_unsent.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.reply
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_args.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_sent.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_unsent.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/instanceStateValues.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/invalidMethodUsage.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.1.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.2.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open_invalid_method.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open_network.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open_network.reply
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open_network.wait
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open_sync.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open_user.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/open_username.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/redirectError.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/redirectRecur.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/redirects.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/redirecttarget.html
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/responseText.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/responseXML_invalid.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/seconddocument.html
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_alreadySent.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.2.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.3.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.5.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.7.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_data.reply
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.reply
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_GET.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_PUT.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/send_unsent.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.reply
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_args.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_illegalName.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_sent.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_unsent.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/staticStateValues.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/status.200.reply
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/status.404.reply
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/status.expect
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/status.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/statusText.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/testdocument.html
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/text.qml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/data/text.xml
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/qmlxmlhttprequest.pro
 delete mode 100644 tests/auto/declarative/qmlxmlhttprequest/tst_qmlxmlhttprequest.cpp
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/data/model.qml
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/data/model.xml
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/data/model2.qml
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/data/recipes.qml
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/data/recipes.xml
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/data/roleErrors.qml
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/data/unique.qml
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro
 delete mode 100644 tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/animated-smooth.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/animated.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/borders.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/content/bw.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-round.sci
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-stretch.sci
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/content/colors.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.10.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.11.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.12.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.13.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.14.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.15.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.16.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.17.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.18.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.19.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.20.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.21.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.22.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.23.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.24.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.9.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeflipable/test-flipable.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.9.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.10.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.9.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/gridview.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.10.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.11.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.12.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.13.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.14.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.15.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.16.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.17.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.18.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.19.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.20.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.21.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.22.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.9.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativemouseregion/mouseregion.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeparticles/data/particles.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeparticles/data/particles.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeparticles/data/particles.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativeparticles/data/particles.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeparticles/particles.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativeparticles/star.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/test-pathview-2.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativepathview/test-pathview.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/dynamic.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativepositioners/repeater.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/content/background.png
 create mode 100755 tests/auto/declarative/visual/qdeclarativespringfollow/content/center.png
 create mode 100755 tests/auto/declarative/visual/qdeclarativespringfollow/content/clock.png
 create mode 100755 tests/auto/declarative/visual/qdeclarativespringfollow/content/hour.png
 create mode 100755 tests/auto/declarative/visual/qdeclarativespringfollow/content/minute.png
 create mode 100755 tests/auto/declarative/visual/qdeclarativespringfollow/content/second.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.10.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.9.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/baseline/data-X11/parentanchor.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/baseline/data/parentanchor.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/baseline/parentanchor.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/elide.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/plaintext.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetext/font/richtext.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/cursorDelegate.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/qt-669.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextedit/wrap.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.5.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.6.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.7.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.8.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.1.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.2.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.3.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.4.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.0.png
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/echoMode.qml
 create mode 100644 tests/auto/declarative/visual/qdeclarativetextinput/hAlign.qml
 delete mode 100644 tests/auto/declarative/visual/qmleasefollow/data/easefollow.0.png
 delete mode 100644 tests/auto/declarative/visual/qmleasefollow/data/easefollow.1.png
 delete mode 100644 tests/auto/declarative/visual/qmleasefollow/data/easefollow.2.png
 delete mode 100644 tests/auto/declarative/visual/qmleasefollow/data/easefollow.3.png
 delete mode 100644 tests/auto/declarative/visual/qmleasefollow/data/easefollow.4.png
 delete mode 100644 tests/auto/declarative/visual/qmleasefollow/data/easefollow.5.png
 delete mode 100644 tests/auto/declarative/visual/qmleasefollow/data/easefollow.6.png
 delete mode 100644 tests/auto/declarative/visual/qmleasefollow/data/easefollow.qml
 delete mode 100644 tests/auto/declarative/visual/qmleasefollow/easefollow.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/animated-smooth.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/animated.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/borders.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/content/bw.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-round.sci
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-stretch.sci
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.10.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.11.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.12.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.13.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.14.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.15.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.16.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.17.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.18.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.19.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.20.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.21.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.22.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.23.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.24.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.9.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.9.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.10.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.9.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/gridview.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsgridview/gridview2.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsparticles/particles.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicsparticles/star.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/test-pathview-2.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/dynamic.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicspositioners/repeater.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/baseline/data-X11/parentanchor.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/baseline/data/parentanchor.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/baseline/parentanchor.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextedit/wrap.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/echoMode.qml
 delete mode 100644 tests/auto/declarative/visual/qmlgraphicstextinput/hAlign.qml
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/drag.qml
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.10.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.11.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.12.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.13.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.14.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.15.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.16.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.17.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.18.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.19.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.20.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.21.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.22.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.9.png
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.qml
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/drag.qml
 delete mode 100644 tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/clock.qml
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/content/background.png
 delete mode 100755 tests/auto/declarative/visual/qmlspringfollow/content/center.png
 delete mode 100755 tests/auto/declarative/visual/qmlspringfollow/content/clock.png
 delete mode 100755 tests/auto/declarative/visual/qmlspringfollow/content/hour.png
 delete mode 100755 tests/auto/declarative/visual/qmlspringfollow/content/minute.png
 delete mode 100755 tests/auto/declarative/visual/qmlspringfollow/content/second.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/clock.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/clock.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/clock.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/clock.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/clock.qml
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.0.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.1.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.10.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.2.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.3.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.4.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.5.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.6.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.7.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.8.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.9.png
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/data/follow.qml
 delete mode 100644 tests/auto/declarative/visual/qmlspringfollow/follow.qml
 create mode 100644 tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
 create mode 100644 tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
 create mode 100644 tests/auto/qdeclarativevideo/qdeclarativevideo.pro
 create mode 100644 tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
 delete mode 100644 tests/auto/qmlaudio/qmlaudio.pro
 delete mode 100644 tests/auto/qmlaudio/tst_qmlaudio.cpp
 delete mode 100644 tests/auto/qmlgraphicsvideo/qmlgraphicsvideo.pro
 delete mode 100644 tests/auto/qmlgraphicsvideo/tst_qmlgraphicsvideo.cpp
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStar.png
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStar.png
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStar.png
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h
 create mode 100644 tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
 create mode 100644 tests/benchmarks/declarative/qdeclarativeimage/image.png
 create mode 100644 tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
 create mode 100644 tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
 create mode 100644 tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
 create mode 100644 tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/example.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.pro
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/anchors/empty.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/anchors/fill.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/anchors/null.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/children.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/data.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/no_creation.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/resources.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/no_positioner.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/null_positioner.qml
 create mode 100644 tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/positioner.qml
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/myqmlobject.qml
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/myqmlobject_binding.qml
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/object.qml
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/object_id.qml
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/samegame/BoomBlock.qml
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStar.png
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStone.png
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStar.png
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStone.png
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStar.png
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStone.png
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/yellowStone.png
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.2.qml
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.qml
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/qmlcomponent.pro
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/testtypes.h
 delete mode 100644 tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
 delete mode 100644 tests/benchmarks/declarative/qmlgraphicsimage/image.png
 delete mode 100644 tests/benchmarks/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
 delete mode 100644 tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
 delete mode 100644 tests/benchmarks/declarative/qmlmetaproperty/data/object.qml
 delete mode 100644 tests/benchmarks/declarative/qmlmetaproperty/data/synthesized_object.qml
 delete mode 100644 tests/benchmarks/declarative/qmlmetaproperty/qmlmetaproperty.pro
 delete mode 100644 tests/benchmarks/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
 delete mode 100644 tests/benchmarks/declarative/qmltime/example.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/qmltime.cpp
 delete mode 100644 tests/benchmarks/declarative/qmltime/qmltime.pro
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
 delete mode 100644 tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
 create mode 100644 tools/linguist/lupdate/qdeclarative.cpp
 delete mode 100644 tools/linguist/lupdate/qml.cpp
 create mode 100644 tools/qml/content/Browser.qml
 create mode 100644 tools/qml/content/images/folder.png
 create mode 100644 tools/qml/content/images/titlebar.png
 create mode 100644 tools/qml/content/images/titlebar.sci
 create mode 100644 tools/qml/content/images/up.png
 create mode 100644 tools/qml/deviceorientation.cpp
 create mode 100644 tools/qml/deviceorientation.h
 create mode 100644 tools/qml/deviceorientation_maemo.cpp
 create mode 100644 tools/qml/main.cpp
 create mode 100644 tools/qml/proxysettings.cpp
 create mode 100644 tools/qml/proxysettings.h
 create mode 100644 tools/qml/proxysettings.ui
 create mode 100644 tools/qml/qdeclarativefolderlistmodel.cpp
 create mode 100644 tools/qml/qdeclarativefolderlistmodel.h
 create mode 100644 tools/qml/qfxtester.cpp
 create mode 100644 tools/qml/qfxtester.h
 create mode 100644 tools/qml/qml.pro
 create mode 100644 tools/qml/qmlruntime.cpp
 create mode 100644 tools/qml/qmlruntime.h
 create mode 100644 tools/qml/qmlruntime.qrc
 create mode 100644 tools/qml/recopts.ui
 delete mode 100644 tools/qmlviewer/content/Browser.qml
 delete mode 100644 tools/qmlviewer/content/images/folder.png
 delete mode 100644 tools/qmlviewer/content/images/titlebar.png
 delete mode 100644 tools/qmlviewer/content/images/titlebar.sci
 delete mode 100644 tools/qmlviewer/content/images/up.png
 delete mode 100644 tools/qmlviewer/deviceorientation.cpp
 delete mode 100644 tools/qmlviewer/deviceorientation.h
 delete mode 100644 tools/qmlviewer/deviceorientation_maemo.cpp
 delete mode 100644 tools/qmlviewer/main.cpp
 delete mode 100644 tools/qmlviewer/proxysettings.cpp
 delete mode 100644 tools/qmlviewer/proxysettings.h
 delete mode 100644 tools/qmlviewer/proxysettings.ui
 delete mode 100644 tools/qmlviewer/qfxtester.cpp
 delete mode 100644 tools/qmlviewer/qfxtester.h
 delete mode 100644 tools/qmlviewer/qmlfolderlistmodel.cpp
 delete mode 100644 tools/qmlviewer/qmlfolderlistmodel.h
 delete mode 100644 tools/qmlviewer/qmlviewer.cpp
 delete mode 100644 tools/qmlviewer/qmlviewer.h
 delete mode 100644 tools/qmlviewer/qmlviewer.pro
 delete mode 100644 tools/qmlviewer/qmlviewer.qrc
 delete mode 100644 tools/qmlviewer/recopts.ui

diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
index 0b2d818..0e99731 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -38,11 +38,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qmlengine.h"
-#include "qmlcontext.h"
-#include "qml.h"
-#include <qmlgraphicsitem.h>
-#include <qmlview.h>
+#include "qdeclarativeengine.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarative.h"
+#include <qdeclarativeitem.h>
+#include <qdeclarativeview.h>
 
 #include <QWidget>
 #include <QApplication>
@@ -133,7 +133,7 @@ private:
     int getHint(int row, int col);
     void setPlaying(bool b){if(b==playing) return; playing=b; emit isPlayingChanged();}
 
-    QmlView *canvas;
+    QDeclarativeView *canvas;
 
     QList<Tile *> _tiles;
     int numCols;
@@ -162,11 +162,11 @@ MyWidget::MyWidget(int width, int height, QWidget *parent, Qt::WindowFlags flags
     vbox->setMargin(0);
     setLayout(vbox);
 
-    canvas = new QmlView(this);
+    canvas = new QDeclarativeView(this);
     canvas->setFixedSize(width, height);
     vbox->addWidget(canvas);
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->addDefaultObject(this);
     ctxt->setContextProperty("tiles", QVariant::fromValue<QList<Tile*>*>(&_tiles));//QTBUG-5675
 
diff --git a/doc/doc.pri b/doc/doc.pri
index 0fc4d72..aea5b08 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -21,7 +21,7 @@ $$unixstyle {
 }
 ADP_DOCS_QDOCCONF_FILE = qt-build-docs.qdocconf
 QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
-                    linguist.qdocconf qmake.qdocconf qml.qdocconf) && \
+                    linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
                (cd $$QT_BUILD_TREE && \
                     $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
                     $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index 892535e..2b75211 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmlanimation.html
+\page qdeclarativeanimation.html
 \title QML Animation
 
 Animation in QML is done by animating properties of objects. Properties of type
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index a260812..c60847e 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-  \page qmlbasictypes.html
+  \page qdeclarativebasictypes.html
   \title QML Basic Types
 
   QML uses a set of property types, which are primitive within QML.
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 1129f00..4b61bd9 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -88,10 +88,10 @@ completely new applications.  QML is fully \l {Extending QML}{extensible from C+
 \o \l {Network Transparency}
 \o \l {Data Models}
 \o \l {anchor-layout.html}{Anchor-based Layout}
-\o \l {qmlstates.html}{States}
-\o \l {qmlanimation.html}{Animation}
-\o \l {qmlmodules.html}{Modules}
-\o \l {qmlfocus.html}{Keyboard Focus}
+\o \l {qdeclarativestates.html}{States}
+\o \l {qdeclarativeanimation.html}{Animation}
+\o \l {qdeclarativemodules.html}{Modules}
+\o \l {qdeclarativefocus.html}{Keyboard Focus}
 \o \l {Extending types from QML}
 \o \l {Dynamic Object Creation}
 \endlist
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index 7a489c0..033c0d1 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmldynamicobjects.html
+\page qdeclarativedynamicobjects.html
 \title Dynamic Object Management
 
 QML has some support for dynamically loading and managing QML objects from
@@ -139,7 +139,7 @@ will not have an id in QML.
 
 A restriction which you need to manage with dynamically created items,
 is that the creation context must outlive the
-created item. The creation context is the QmlContext in which createComponent
+created item. The creation context is the QDeclarativeContext in which createComponent
 was called, or the context in which the Component element, or the item used as the
 second argument to createQmlObject, was specified. If the creation
 context is destroyed before the dynamic item is, then bindings in the dynamic item will
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index b218b64..470a78c 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmlelements.html
+\page qdeclarativeelements.html
 \target elements
 \title QML Elements
 
diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc
index d1b1066..42351c5 100644
--- a/doc/src/declarative/example-slideswitch.qdoc
+++ b/doc/src/declarative/example-slideswitch.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmlexampletoggleswitch.html
+\page qdeclarativeexampletoggleswitch.html
 \title QML Example - Toggle Switch
 
 This example shows how to create a reusable switch component in QML.
@@ -121,7 +121,7 @@ states (\e on and \e off).
 This second function is called when the knob is released and we want to make sure that the knob does not end up between states
 (neither \e on nor \e off). If it is the case call the \c toggle() function otherwise we do nothing.
 
-For more information on scripts see \l{qmljavascript.html}{JavaScript Blocks}.
+For more information on scripts see \l{qdeclarativejavascript.html}{JavaScript Blocks}.
 
 \section2 Transition
 \snippet examples/declarative/slideswitch/content/Switch.qml 7
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 0478731..b7da508 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmlexamples.html
+\page qdeclarativeexamples.html
 \title QML Examples and Walkthroughs
 
 \section1 Running Examples and Demos
@@ -77,7 +77,7 @@ These will be documented, and demonstrate how to achieve various things in QML.
     \o Elastic Dial
     \o \image dial-example.gif
 \row
-    \o \l{qmlexampletoggleswitch.html}{Toggle Switch}
+    \o \l{qdeclarativeexampletoggleswitch.html}{Toggle Switch}
     \o \image switch-example.gif
 \row
     \o \l{QML Advanced Tutorial}{SameGame}
diff --git a/doc/src/declarative/extending-examples.qdoc b/doc/src/declarative/extending-examples.qdoc
index b912a1d..cc66838 100644
--- a/doc/src/declarative/extending-examples.qdoc
+++ b/doc/src/declarative/extending-examples.qdoc
@@ -108,11 +108,11 @@ The class contains a member to store the celebrant object, and also a
 QList<Person *> member.  
 
 In QML, the type of a list properties - and the guests property is a list of 
-people - are all of type QmlListProperty<T>.  QmlListProperty is simple value
+people - are all of type QDeclarativeListProperty<T>.  QDeclarativeListProperty is simple value
 type that contains a set of function pointers.  QML calls these function 
 pointers whenever it needs to read from, write to or otherwise interact with
 the list.  In addition to concrete lists like the people list used in this
-example, the use of QmlListProperty allows for "virtual lists" and other advanced
+example, the use of QDeclarativeListProperty allows for "virtual lists" and other advanced
 scenarios.
 
 \section2 Define the BirthdayParty
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index e7ed310..d823bf6 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -72,12 +72,12 @@ Custom C++ types are made available to QML using these two macros:
 \quotation
 \code
 #define QML_DECLARE_TYPE(T)
-#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,QmlName,T)
+#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,QDeclarativeName,T)
 \endcode
 
 Register the C++ type \a T with the QML system, and make it available in QML
-under the name \a QmlName in library URI version VMAJ.VMIN.
-\a T and \a QmlName may be the same.
+under the name \a QDeclarativeName in library URI version VMAJ.VMIN.
+\a T and \a QDeclarativeName may be the same.
 
 Generally the QML_DECLARE_TYPE() macro should be included immediately following
 the type declaration (usually in its header file), and the QML_REGISTER_TYPE()
@@ -88,7 +88,7 @@ constructor.
 \endquotation
 
 Types can be registered by libraries (such as Qt does), application code,
-or by plugins (see QmlExtensionPlugin).
+or by plugins (see QDeclarativeExtensionPlugin).
 
 Once registered, all of the \l {Qt's Property System}{properties} of a supported
 type are available for use within QML.  QML has intrinsic support for properties
@@ -167,7 +167,7 @@ for assignment to appropriately typed properties.
 
 The guests property is a list of \c Person objects.  Properties that are lists
 of objects or Qt interfaces are also declared with the Q_PROPERTY() macro, just
-like other properties.  List properties must have the type \c {QmlListProperty<T>}.
+like other properties.  List properties must have the type \c {QDeclarativeListProperty<T>}.
 As with object properties, the type \a T must be registered with QML.
 
 The guest property declaration looks like this:
@@ -461,8 +461,8 @@ itself, the QML engine sets up an association between the value source and
 the property.
 
 Property value sources are special types that derive from the
-QmlPropertyValueSource base class.  This base class contains a single method,
-QmlPropertyValueSource::setTarget(), that the QML engine invokes when
+QDeclarativePropertyValueSource base class.  This base class contains a single method,
+QDeclarativePropertyValueSource::setTarget(), that the QML engine invokes when
 associating the property value source with a property.  The relevant part of
 the HappyBirthday type declaration looks like this:
 
@@ -582,7 +582,7 @@ the appropriate property on the extension object is used instead.
 
 When an extended type is installed, one of the
 \code
-    #define QML_REGISTER_EXTENDED_TYPE(URI, VMAJ, VFROM, VTO, QmlName,T, ExtendedT)
+    #define QML_REGISTER_EXTENDED_TYPE(URI, VMAJ, VFROM, VTO, QDeclarativeName,T, ExtendedT)
     #define QML_REGISTER_EXTENDED_NOCREATE_TYPE(T, ExtendedT)
 \endcode
 macros should be used instead of the regular \c QML_REGISTER_TYPE or
@@ -597,18 +597,18 @@ status of the QML engine. For example, it might be beneficial to delay
 initializing some costly data structures until after all the properties have been
 set.
 
-The QML engine defines an interface class called QmlParserStatus, which contains a
+The QML engine defines an interface class called QDeclarativeParserStatus, which contains a
 number of virtual methods that are invoked at various stages during component
 instantiation.  To receive these notifications, an element implementation inherits
-QmlParserStatus and notifies the Qt meta system using the Q_INTERFACES() macro.
+QDeclarativeParserStatus and notifies the Qt meta system using the Q_INTERFACES() macro.
 
 For example,
 
 \code
-class Example : public QObject, public QmlParserStatus
+class Example : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QmlParserStatus)
+    Q_INTERFACES(QDeclarativeParserStatus)
 public:
     virtual void componentComplete()
     {
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index 6459a2e..d7e890c 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -41,7 +41,7 @@
 
 /*!
 \target qmlfocus
-\page qmlfocus.html
+\page qdeclarativefocus.html
 \title Keyboard Focus in QML
 
 When a key is pressed or released, a key event is generated and delivered to the
@@ -56,7 +56,7 @@ and to address some of the cases unique to fluid user interfaces, the QML items
 When the user presses or releases a key, the following occurs:
 \list 1
 \o Qt receives the key action and generates a key event.
-\o If the Qt widget containing the \l QmlView has focus, the key event is delivered to it. Otherwise, regular Qt key handling continues.
+\o If the Qt widget containing the \l QDeclarativeView has focus, the key event is delivered to it. Otherwise, regular Qt key handling continues.
 \o The key event is delivered by the scene to the QML \l Item with \e {active focus}.  If no \l Item has \e {active focus}, the key event is \l {QEvent::ignore()}{ignored} and regular Qt key handling continues.
 \o If the QML \l Item with \e {active focus} accepts the key event, propagation stops.  Otherwise the event is "bubbled up", by recursively passing it to each \l Item's parent until either the event is accepted, or the root \l Item is reached.
 
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index fb33664..c718a6d 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmlglobalobject.html
+\page qdeclarativeglobalobject.html
 \title QML Global Object
 
 Contains all the properties of the JavaScript global object, plus:
@@ -71,7 +71,7 @@ when the property has one of the following types:
 \o Vector3D
 \endlist
 
-There are also string based constructors for these types, see \l{qmlbasictypes.html}{Qml Types}.
+There are also string based constructors for these types, see \l{qdeclarativebasictypes.html}{Qml Types}.
 
 \section3 Qt.rgba(qreal red, qreal green, qreal blue, qreal alpha)
 This function returns a Color with the specified \c red, \c green, \c blue and \c alpha components. All components should be in the range 0-1 inclusive.
@@ -218,7 +218,7 @@ The \c openDatabase() and related functions
 provide the ability to access local offline storage in an SQL database.
 
 These databases are user-specific and QML-specific. They are stored in the \c Databases subdirectory
-of QmlEngine::offlineStoragePath(), currently as SQLite databases.
+of QDeclarativeEngine::offlineStoragePath(), currently as SQLite databases.
 
 The API conforms to the Synchronous API of the HTML5 Web Database API,
 \link http://www.w3.org/TR/2009/WD-webdatabase-20091029/ W3C Working Draft 29 October 2009\endlink.
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index b3d6306..c685d3d 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -49,16 +49,16 @@ add QML to your UI, without having to rewrite it.
 \section1 Adding QML to a \l{QWidget} based UI
 If you have an existing QWidget based UI you can simply write new custom
 widgets in QML. To integrate them into your application you can create a
-QmlView widget, and load the QML file into that. You'll then have a new widget
+QDeclarativeView widget, and load the QML file into that. You'll then have a new widget
 containing your declarative UI, and you can interact with it through the
-QmlView interface. The one drawback of this approach is that QmlView is a lot
+QDeclarativeView interface. The one drawback of this approach is that QDeclarativeView is a lot
 heavier than a QWidget in terms of memory consumption and initialization speed,
 and so having large numbers of them may lead to performance degredation.
 
 For a smooth transition from a QWidget based UI to a QML based UI, simply
 rewrite your widgets in QML one at a time, using the above method. When
 all of your widgets are written in QML you can rewrite your main widget in
-QML, so as to load the other widgets in QML instead of using QmlViews. Then
+QML, so as to load the other widgets in QML instead of using QDeclarativeViews. Then
 you just load the main QML file on startup.
 
 Keep in mind that QWidgets were designed for different sorts of UIs than QML
@@ -70,7 +70,7 @@ of simple and dynamic elements.
 \section1 Adding QML to a QGraphicsView based UI
 
 If you have an existing Graphics View based UI you can create new
-items in QML, and use \l{QmlComponent} to create \l{QGraphicsObject}s
+items in QML, and use \l{QDeclarativeComponent} to create \l{QGraphicsObject}s
 from the QML files. These \l{QGraphicsObject}s can then be placed into
 your \l{QGraphicsScene} using \l{QGraphicsScene::addItem()} or by
 reparenting them to an item already in the \l{QGraphicsScene}.
@@ -79,8 +79,8 @@ Example, for local QML files:
 
 \code
 QGraphicsScene* scene = new QGraphicsScene;
-QmlEngine *engine = new QmlEngine;
-QmlComponent component(engine, QUrl::fromLocalFile(filename));
+QDeclarativeEngine *engine = new QDeclarativeEngine;
+QDeclarativeComponent component(engine, QUrl::fromLocalFile(filename));
 QGraphicsObject *object =
     qobject_cast<QGraphicsObject *>(component.create());
 scene->addItem(object);
diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc
index cde8eb8..98183bb 100644
--- a/doc/src/declarative/javascriptblocks.qdoc
+++ b/doc/src/declarative/javascriptblocks.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmljavascript.html
+\page qdeclarativejavascript.html
 \title JavaScript Blocks
 
 QML encourages building UIs declaratively, using \l {Property Binding} and the 
@@ -124,7 +124,7 @@ The \c source property may reference a relative file, or an absolute path.  In t
 case of a relative file, the location is resolved relative to the location of the
 \l {QML Document} that contains the \l Script element.  If the script file is not 
 accessible, an error will occur.  If the source is on a network resource, the
-enclosing QML document will remain in the \l {QmlComponent::status()}{waiting state}
+enclosing QML document will remain in the \l {QDeclarativeComponent::status()}{waiting state}
 until the script has been retrieved.
 
 \section1 Running Script at Startup
diff --git a/doc/src/declarative/measuring-performance.qdoc b/doc/src/declarative/measuring-performance.qdoc
index 8f6fe7d..cb608bf 100644
--- a/doc/src/declarative/measuring-performance.qdoc
+++ b/doc/src/declarative/measuring-performance.qdoc
@@ -71,14 +71,14 @@ Q_DEFINE_PERFORMANCE_METRIC(TextSize, "Text Size Calculation");
 You could then use this category in the code:
 
 \code
-void QmlGraphicsText::updateSize()
+void QDeclarativeText::updateSize()
 {
-    QmlPerfTimer<QmlPerf::TextSize> perf;
+    QDeclarativePerfTimer<QDeclarativePerf::TextSize> perf;
     ...
 }
 \endcode
 
-Because there is no cost for a QmlPerfTimer when Q_ENABLE_PERFORMANCE_LOG is not defined, this line can persist in the code and be used to help detect performance bottlenecks and regressions. See the QPerformanceLog documentation for more information on this performance framework.
+Because there is no cost for a QDeclarativePerfTimer when Q_ENABLE_PERFORMANCE_LOG is not defined, this line can persist in the code and be used to help detect performance bottlenecks and regressions. See the QPerformanceLog documentation for more information on this performance framework.
 
 \section1 FPS Measurements
 
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index dfb9081..ab75f8d 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmlmodules.html
+\page qdeclarativemodules.html
 \title Modules
 
 A \bold module is a collection of QML types.
@@ -63,7 +63,7 @@ This makes available all types in Qt that were available in Qt 4.6, regardless o
 actual version of Qt executing the QML. So even if Qt 4.7 adds a type that would conflict
 with a type you defined while using 4.6, that type is not imported, so there is no conflict.
 
-Types defined by plugins are made using QmlExtensionPlugin.  Installed plugins and QML files
+Types defined by plugins are made using QDeclarativeExtensionPlugin.  Installed plugins and QML files
 can both contribute types to the same module.
 
 
@@ -82,7 +82,7 @@ QML, a URI import is used:
 import com.nokia.Example 1.0
 \endcode
 
-Files imported in this way are found on the paths added by QmlEngine::addImportPath(),
+Files imported in this way are found on the paths added by QDeclarativeEngine::addImportPath(),
 which by default only inludes \c $QTDIR/qml, so the above would make available those types
 defined in \c $QTDIR/qml/com/nokia/Example which are specified as being in version 1.0.
 Installed plugins and QML files can both contribute types to the same module.
diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc
index fc4761e..e642257 100644
--- a/doc/src/declarative/network.qdoc
+++ b/doc/src/declarative/network.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmlnetwork.html
+\page qdeclarativenetwork.html
 \title Network Transparency
 
 QML supports network transparency by using URLs (rather than file names) for all
@@ -128,9 +128,9 @@ See the \tt demos/declarative/flickr for a real demonstration of this.
 
 \section1 Configuring the Network Access Manager
 
-All network access from QML is managed by a QNetworkAccessManager set on the QmlEngine which executes the QML.
+All network access from QML is managed by a QNetworkAccessManager set on the QDeclarativeEngine which executes the QML.
 By default, this is an unmodified Qt QNetworkAccessManager. You may set a different manager using
-QmlEngine::setNetworkAccessManager() as appropriate for the policies of your application.
+QDeclarativeEngine::setNetworkAccessManager() as appropriate for the policies of your application.
 For example, the \l qmlviewer tool sets a new QNetworkAccessManager which
 trusts HTTP Expiry headers to avoid network cache checks, allows HTTP Pipelining, adds a persistent HTTP CookieJar,
 a simple disk cache, and supports proxy settings.
@@ -143,7 +143,7 @@ the executable using \l{The Qt Resource System}. Using this, an executable can r
 that is compiled into the executable:
 
 \code
-    QmlView *canvas = new QmlView;
+    QDeclarativeView *canvas = new QDeclarativeView;
     canvas->setUrl(QUrl("qrc:/dial.qml"));
 \endcode
 
diff --git a/doc/src/declarative/qdeclarativedebugging.qdoc b/doc/src/declarative/qdeclarativedebugging.qdoc
new file mode 100644
index 0000000..3ef9ce7
--- /dev/null
+++ b/doc/src/declarative/qdeclarativedebugging.qdoc
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qdeclarativedebugging.html
+\title Debugging QML
+
+\section1 Logging
+
+\c console.log can be used to print debugging information to the console. For example:
+
+\qml
+Rectangle {
+    width: 200; height: 200
+    MouseArea {
+        anchors.fill: parent
+        onClicked: console.log("clicked")
+    }
+}
+\endqml
+
+\section1 Debugging Transitions
+
+When a transition doesn't look quite right, it can be helpful to view it in slow
+motion to see what is happening more clearly. \l {qmlviewer} provides a 
+"Slow Down Animations" menu option to facilitate this.
+
+
+\section1 The QML Inspector
+
+The \c qmldebugger tool provides an experimental inspector to aid with debugging.
+It can be run as a Qt Creator plugin or as a standalone application.
+
+\section2 Qt Creator plugin
+
+The Qt Creator plugin currently builds against Qt Creator 1.3.
+
+To build the Qt Creator plugin:
+
+\list
+\o Set an environment variable \c CREATOR_SRC_DIR that points to the Qt Creator
+   source directory
+\o Set an environment variable \c CREATOR_BUILD_DIR that points to the Qt Creator
+   build directory
+\o Run \c qmake on \c $QTDIR/tools/qmldebugger/qmldebugger.pro
+\endlist
+
+This builds the plugin into your Qt Creator installation.
+
+The plugin adds a "QML Inspect" mode into Qt Creator that provides:
+
+\list
+\o An object tree showing all objects and their children
+\o The current property values for the object selected in the object tree
+   (this table is dynamically updated for all properties that have property changed
+   notifications)
+\o An expression evaluator for querying and setting values dynamically
+\o A table of watched properties (double-click on a property in the property
+   table to add it to the watch table)
+\o A graph that shows the frame rate of your application
+\endlist
+
+
+To start the debugger, open a QML project and click the "QML Inspect" mode, then click the green
+"play" button in the toolbar of the bottom-right debugger window.
+
+\image qmldebugger-creator.png
+
+
+\section2 Standalone qmldebugger tool
+
+To run the standalone \c qmldebugger tool, set an environment variable \c QML_DEBUG_SERVER_PORT
+to an available port number and run the \c qmlviewer. For example:
+
+\code
+    QML_DEBUG_SERVER_PORT=3768 qmlviewer myqmlfile.qml
+\endcode
+
+Then in another process, start the \c qmldebugger tool, enter the port number into the corresponding spinbox
+in the top right hand corner, and press the "Connect" button.
+
+*/
diff --git a/doc/src/declarative/qdeclarativedocument.qdoc b/doc/src/declarative/qdeclarativedocument.qdoc
new file mode 100644
index 0000000..a210c98
--- /dev/null
+++ b/doc/src/declarative/qdeclarativedocument.qdoc
@@ -0,0 +1,190 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qdeclarativedocuments.html
+\title QML Documents
+
+A QML document is a block of QML source code.  QML documents generally correspond to files 
+stored on a disk or network resource, but can also be constructed directly from text data.
+
+Here is a simple QML document:
+
+\code
+import Qt 4.6
+
+Rectangle {
+    width: 240; height: 320; 
+
+    resources: [
+        Component {
+            id: contactDelegate
+            Text {
+                text: modelData.firstName + " " + modelData.lastName
+            }
+        }
+    ]
+
+    ListView {
+        anchors.fill: parent
+        model: contactModel
+        delegate: contactDelegate
+    } 
+}
+\endcode
+
+QML documents are always encoded in UTF-8 format.
+
+A QML document always begins with one or more import statements.  To prevent elements 
+introduced in later versions from affecting existing QML programs, the element types 
+available within a document are controlled by the imported QML \l {Modules}.  That is, 
+QML is a \e versioned language.
+
+Syntactically a QML document is self contained; QML does \e not have a preprocessor that 
+modifies the document prior to presentation to the QML runtime. \c import statements 
+do not "include" code in the document, but instead instruct the QML runtime on how to 
+resolve type references found in the document.  Any type reference present in a QML 
+document - such as \c Rectangle and \c ListView - including those made within an 
+\l {JavaScript Block} or \l {Property Binding}s, are \e resolved based exclusively on the 
+import statements.  QML does not import any modules by default, so at least one \c import
+statement must be present or no elements will be available!
+
+A QML document defines a single, top-level \l {QDeclarativeComponent}{QML component}.  A QML component 
+is a template that is interpreted by the QML runtime to create an object with some predefined 
+behaviour.  As it is a template, a single QML component can be "run" multiple times to 
+produce several objects, each of which are said to be \e instances of the component.  
+
+Once created, instances are not dependent on the component that created them, so they can 
+operate on independent data.  Here is an example of a simple "button" component that is 
+instantiated four times, each with a different value for its \c text property.
+
+\table
+\row
+\o
+\raw HTML
+<table><tr><td>
+\endraw
+\code
+import Qt 4.6
+
+BorderImage {
+    property alias text: textElement.text
+    width: 100; height: 30; source: "images/toolbutton.sci"
+
+    Text {
+        id: textElement
+        anchors.centerIn: parent
+        font.pointSize: 20
+        style: Text.Raised
+        color: "white"
+    }
+}
+\endcode
+\raw HTML
+</td> <td>
+\endraw
+\image anatomy-component.png
+\raw HTML
+</td> </tr> </table>
+\endraw
+\endtable
+
+In addition to the top-level component that all QML documents define, documents may also 
+include additional \e inline components.  Inline components are declared  using the 
+\l Component element, as can be seen in the first example above.  Inline components share 
+all the characteristics of regular top-level components and use the same \c import list as their
+containing QML document.  Components are one of the most basic building blocks in QML, and are 
+frequently used as "factories" by other elements.  For example, the \l ListView element uses the
+\c delegate component as the template for instantiating list items - each list item is just a
+new instance of the component with the item specific data set appropriately.
+
+Like other \l {QML Elements}, the \l Component element is an object and must be assigned to a 
+property.   \l Component objects may also have an object id.  In the first example on this page,
+the inline component is added to the \l Rectangle's \c resources list, and then 
+\l {Property Binding} is used to assign the \l Component to the \l ListView's \c delegate 
+property.  While using property binding allows the \l Component object to be shared (for example,
+if the QML document contained multiple \l ListView's with the same delegate), in this case the 
+\l Component could have been assigned directly to the \l ListView's \c delegate.  The QML 
+language even contains a syntactic optimization when assigning directly to a component property 
+for this case where it will automatically insert the \l Component tag.
+
+These final two examples are behaviorally identical to the original document.
+
+\table
+\row
+\o
+\code
+import Qt 4.6
+
+Rectangle {
+    width: 240; height: 320; 
+
+    ListView {
+        anchors.fill: parent
+        model: contactModel
+        delegate: Component {
+            Text {
+                text: modelData.firstName + " " + modelData.lastName
+            }
+        }
+    } 
+}
+\endcode
+\o
+\code
+import Qt 4.6
+
+Rectangle {
+    width: 240; height: 320; 
+
+    ListView {
+        anchors.fill: parent
+        model: contactModel
+        delegate: Text {
+            text: modelData.firstName + " " + modelData.lastName
+        }
+    } 
+}
+\endcode
+\endtable
+
+\sa QDeclarativeComponent
+*/
diff --git a/doc/src/declarative/qdeclarativei18n.qdoc b/doc/src/declarative/qdeclarativei18n.qdoc
new file mode 100644
index 0000000..9c10a46
--- /dev/null
+++ b/doc/src/declarative/qdeclarativei18n.qdoc
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qdeclarativei18n.html
+\title QML Internationalization
+
+\section1 Overview
+
+Strings in QML can be marked for translation using the qsTr(), qsTranslate(),
+QT_TR_NOOP(), and QT_TRANSLATE_NOOP() functions.
+
+For example:
+\qml
+Text { text: qsTr("Pictures") }
+\endqml
+
+These functions are standard QtScript functions; for more details see
+QScriptEngine::installTranslatorFunctions().
+
+QML relies on the core internationalization capabilities provided by Qt. These
+capabilities are described more fully in:
+\list
+\o \l {Internationalization with Qt}
+\o \l {Qt Linguist Manual}
+\endlist
+
+You can test a translation in \l {qmlviewer} using the -translation option.
+
+\section1 Example
+
+First we create a simple QML file with text to be translated. The string
+that needs to be translated is enclosed in a call to \c qsTr().
+
+hello.qml:
+\qml
+import Qt 4.6
+
+Rectangle {
+ width: 200; height: 200
+ Text { text: qsTr("Hello"); anchors.centerIn: parent }
+}
+\endqml
+
+Next we create a translation source file using lupdate:
+\code
+lupdate hello.qml -ts hello.ts
+\endcode
+
+Then we open \c hello.ts in \l{Qt Linguist Manual} {Linguist}, provide
+a translation and create the release file \c hello.qm.
+
+Finally, we can test the translation in qmlviewer:
+\code
+qmlviewer -translation hello.qm hello.qml
+\endcode
+*/
diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
new file mode 100644
index 0000000..4d05a8c
--- /dev/null
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -0,0 +1,351 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qdeclarativeintroduction.html
+\title Introduction to the QML language
+
+\tableofcontents
+
+QML is a declarative language designed to describe the user interface of a
+program: both what it looks like, and how it behaves. In QML, a user
+interface is specified as a tree of objects with properties.
+
+This introduction is meant for those with little or no programming
+experience. JavaScript is used as a scripting language in QML, so you may want
+to learn a bit more about it (\l{JavaScript: The Definitive Guide}) before diving
+deeper into QML. It's also helpful to have a basic understanding of other web
+technologies like HTML and CSS, but it's not required.
+
+\section1 Basic QML Syntax
+
+QML looks like this:
+
+\code
+Rectangle {
+    width: 200
+    height: 200
+    color: "white"
+    Image {
+        source: "pics/logo.png"
+        anchors.centerIn: parent
+    }
+}
+\endcode
+
+Objects are specified by their type, followed by a pair of braces. Object
+types always begin with a capital letter. In the above example, there are
+two objects, a \l Rectangle, and an \l Image. Between the braces, we can specify
+information about the object, such as its properties.
+
+Properties are specified as \c {property: value}. In the above example, we 
+can see the Image has a property named \c source, which has been assigned the 
+value \c "pics/logo.png". The property and its value are separated by a colon.
+
+Properties can be specified one-per-line:
+
+\code
+Rectangle {
+    width: 100
+    height: 100
+}
+\endcode
+
+or you can put multiple properties on a single line:
+
+\code
+Rectangle { width: 100; height: 100 }
+\endcode
+
+When multiple property/value pairs are specified on a single line, they
+must be separated by a semicolon.
+
+\section1 Expressions
+
+In addition to assigning values to properties, you can also assign
+expressions written in JavaScript.
+
+\code
+Rotation {
+    angle: 360 * 3
+}
+\endcode
+
+These expressions can include references to other objects and properties, in which case
+a \e binding is established: when the value of the expression changes, the property the
+expression has been assigned to is automatically updated to that value.
+
+\code
+Item {
+    Text {
+        id: text1
+        text: "Hello World"
+    }
+    Text {
+        id: text2
+        text: text1.text
+    }
+}
+\endcode
+
+In the example above, the \c text2 object will display the same text as \c text1. If \c text1 is changed,
+\c text2 is automatically changed to the same value.
+
+Note that to refer to other objects, we use their \e id values. (See below for more
+information on the \e id property.)
+
+\section1 QML Comments
+
+Commenting in QML is similar to JavaScript.
+\list
+\o Single line comments start with // and finish at the end of the line.
+\o Multiline comments start with /* and finish with *\/
+\endlist
+
+\quotefile doc/src/snippets/declarative/comments.qml
+
+Comments are ignored by the engine. The are useful for explaining what you
+are doing: for referring back to at a later date, or for others reading
+your QML files.
+
+Comments can also be used to prevent the execution of code, which is
+sometimes useful for tracking down problems.
+
+\code
+Text {
+    text: "Hello world!"
+    //opacity: 0.5
+}
+\endcode
+
+In the above example, the Text object will have normal opacity, since the
+line opacity: 0.5 has been turned into a comment.
+
+\section1 Properties
+\target intro-properties
+
+\section2 Property naming
+
+Properties begin with a lowercase letter (with the exception of \l{Attached Properties}).
+
+\section2 Property types
+
+QML supports properties of many types (see \l{QML Basic Types}). The basic types include int,
+real, bool, string, color, and lists.
+
+\code
+Item {
+    x: 10.5             // a 'real' property
+    ...
+    state: "details"    // a 'string' property
+    focus: true         // a 'bool' property
+}
+\endcode
+
+QML properties are what is known as \e typesafe. That is, they only allow you to assign a value that
+matches the property type. For example, the \c x property of item is a real, and if you try to assign
+a string to it you will get an error.
+
+\badcode
+Item {
+    x: "hello"  // illegal!
+}
+\endcode
+
+\section3 The \c id property
+
+Each object can be given a special unique property called an \e id. Assigning an id enables the object
+to be referred to by other objects and scripts.
+
+The first Rectangle element below has an \e id, "myRect". The second Rectange element defines its
+own width by referring to \tt myRect.width, which means it will have the same \tt width
+value as the first Rectangle element.
+
+\code
+Item {
+    Rectangle {
+        id: myRect
+        width: 100
+        height: 100
+    }
+    Rectangle {
+        width: myRect.width
+        height: 200
+    }
+}
+\endcode
+
+Note that an \e id must begin with a lower-case letter or an underscore, and cannot contain characters other than letters, numbers and underscores.
+
+
+\section2 List properties
+
+List properties look like this:
+
+\code
+Item {
+    children: [
+        Image {},
+        Text {}
+    ]
+}
+\endcode
+
+The list is enclosed in square brackets, with a comma separating the
+list elements. In cases where you are only assigning a single item to a
+list, you can omit the square brackets:
+
+\code
+Image {
+    children: Rectangle {}
+}
+\endcode
+
+\section2 Default properties
+
+Each object type can specify one of its list or object properties as its default property.
+If a property has been declared as the default property, the property tag can be omitted.
+
+For example this code:
+\code
+State {
+    changes: [
+        PropertyChanges {},
+        PropertyChanges {}
+    ]
+}
+\endcode
+
+can be simplified to:
+
+\code
+State {
+    PropertyChanges {}
+    PropertyChanges {}
+}
+\endcode
+
+because \c changes is the default property of the \c State type.
+
+\section2 Grouped Properties
+\target dot properties
+
+In some cases properties form a logical group and use a 'dot' or grouped notation
+to show this.
+
+Grouped properties can be written like this:
+\qml
+Text {
+    font.pixelSize: 12
+    font.bold: true
+}
+\endqml
+
+or like this:
+\qml
+Text {
+    font { pixelSize: 12; bold: true }
+}
+\endqml
+
+In the element documentation grouped properties are shown using the 'dot' notation.
+
+\section2 Attached Properties
+\target attached-properties
+
+Some objects attach properties to another object.  Attached Properties
+are of the form \e {Type.property} where \e Type is the type of the
+element that attaches \e property.
+
+For example:
+\code
+Component {
+    id: myDelegate
+    Text {
+        text: "Hello"
+        color: ListView.isCurrentItem ? "red" : "blue"
+    }
+}
+ListView {
+    delegate: myDelegate
+}
+\endcode
+
+The \l ListView element attaches the \e ListView.isCurrentItem property
+to each delegate it creates.
+
+Another example of attached properties is the \l Keys element which
+attaches properties for handling key presses to
+any visual Item, for example:
+
+\code
+Item {
+    focus: true
+    Keys.onSelectPressed: console.log("Selected")
+}
+\endcode
+
+\section2 Signal Handlers
+
+Signal handlers allow actions to be taken in reponse to an event.  For instance,
+the \l MouseArea element has signal handlers to handle mouse press, release
+and click:
+
+\code
+MouseArea {
+    onPressed: console.log("mouse button pressed")
+}
+\endcode
+
+All signal handlers begin with \e "on".
+
+Some signal handlers include an optional parameter, for example
+the MouseArea onPressed signal handler has a \e mouse parameter:
+
+\code
+MouseArea {
+    acceptedButtons: Qt.LeftButton | Qt.RightButton
+    onPressed: if (mouse.button == Qt.RightButton) console.log("Right mouse button pressed")
+}
+\endcode
+
+
+*/
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
new file mode 100644
index 0000000..c0e028e
--- /dev/null
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -0,0 +1,341 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qdeclarativemodels.html
+\target qmlmodels
+\title Data Models
+
+Some QML Items use Data Models to provide the data to be displayed.
+These items typically require a \e delegate component that
+creates an instance for each item in the model.  Models may be static, or
+have items modified, inserted, removed or moved dynamically.
+
+Data is provided to the delegate via named data roles which the
+delegate may bind to.  The roles are exposed as properties of the
+\e model context property, though this property is set as a default property
+of the delegate so, unless there is a naming clash with a
+property in the delegate, the roles are usually accessed unqualified.  The
+example below would  have a clash between he \e color role of the model and
+the \e color property of the Rectangle.  The clash is avoided by referencing
+the \e color property of the model by its full name: \e model.color.
+
+\code
+ListModel {
+    id: myModel
+    ListElement { color: "red" }
+    ListElement { color: "green" }
+}
+
+Component {
+    id: myDelegate
+    Rectangle {
+        width: 20; height: 20
+        color: model.color
+    }
+}
+\endcode
+
+A special \e index role containing the index of the item in the model
+is also available.
+
+\e Note: the index role will be set to -1 if the item is removed from
+the model.  If you bind to the index role, be sure that the logic
+accounts for the possibility of index being -1, i.e. that the item
+is no longer valid.  Usually the item will shortly be destroyed, but
+it is possible to delay delegate destruction in some views via a delayRemove
+attached property.
+
+Models that do not have named roles will have the data provided via
+the \e modelData role.  The \e modelData role is also provided for
+Models that have only one role.  In this case the \e modelData role
+contains the same data as the named role.
+
+There are a number of QML elements that operate using data models:
+
+\list
+\o ListView
+\o GridView
+\o PathView
+\o \l Repeater
+\endlist
+
+QML supports several types of data model, which may be provided by QML
+or C++ (via QDeclarativeContext::setContextProperty(), for example).
+
+\section1 QML Data Models
+
+\section2 ListModel
+
+ListModel is a simple hierarchy of elements specified in QML.  The
+available roles are specified by the \l ListElement properties.
+
+\code
+ListModel {
+    id: fruitModel
+    ListElement {
+        name: "Apple"
+        cost: 2.45
+    }
+    ListElement {
+        name: "Orange"
+        cost: 3.25
+    }
+    ListElement {
+        name: "Banana"
+        cost: 1.95
+    }
+}
+\endcode
+
+The above model has two roles, \e name and \e cost.  These can be bound
+to by a ListView delegate, for example:
+
+\code
+Component {
+    id: fruitDelegate
+    Row {
+        Text { text: "Fruit: " + name }
+        Text { text: "Cost: $" + cost }
+    }
+}
+ListView {
+    model: fruitModel
+    delegate: fruitDelegate
+}
+\endcode
+
+
+\section2 XmlListModel
+
+XmlListModel allows construction of a model from an XML data source. The roles
+are specified via the \l XmlRole element.
+
+The following model has three roles, \e title, \e link and \e description:
+\code
+XmlListModel {
+     id: feedModel
+     source: "http://rss.news.yahoo.com/rss/oceania"
+     query: "/rss/channel/item"
+     XmlRole { name: "title"; query: "title/string()" }
+     XmlRole { name: "link"; query: "link/string()" }
+     XmlRole { name: "description"; query: "description/string()" }
+}
+\endcode
+
+
+\section2 VisualItemModel
+
+VisualItemModel allows QML items to be provided as a model.  This model contains
+both the data and delegate (its child items).  This model does not provide any roles.
+
+\code
+ VisualItemModel {
+     id: itemModel
+     Rectangle { height: 30; width: 80; color: "red" }
+     Rectangle { height: 30; width: 80; color: "green" }
+     Rectangle { height: 30; width: 80; color: "blue" }
+ }
+
+ ListView {
+     anchors.fill: parent
+     model: itemModel
+ }
+\endcode
+
+Note that in the above example there is no delegate required.
+The items of the model itself provide the visual elements that
+will be positioned by the view.
+
+
+\section1 C++ Data Models
+
+\section2 QAbstractItemModel
+
+QAbstractItemModel provides the roles set via the QAbstractItemModel::setRoleNames() method.
+
+
+\section2 QStringList
+
+QStringList provides the contents of the list via the \e modelData role:
+
+\table
+\header
+\o 
+\o 
+\row
+\o
+\code
+// main.cpp
+QStringList dataList;
+dataList.append("Fred");
+dataList.append("Ginger");
+dataList.appenf("Skipper");
+
+QDeclarativeContext *ctxt = view.rootContext();
+ctxt->setContextProperty("myModel", QVariant::fromValue(&dataList));
+\endcode
+
+\o
+\code
+// main.qml
+ListView {
+   width: 100
+   height: 100
+   anchors.fill: parent
+   model: myModel
+   delegate: Component {
+       Rectangle {
+            height: 25
+            Text { text: modelData }
+       }
+   }
+}
+\endcode
+\endtable
+
+\note There is no way for the view to know that the contents of a QStringList
+have changed.  If the QStringList is changed, it will be necessary to reset
+the model by calling QDeclarativeContext::setContextProperty() again.
+
+
+\section2 QList<QObject*>
+
+QList<QObject*> provides the properties of the objects in the list as roles.
+
+\code
+class DataObject : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(QString color READ color WRITE setColor)
+...
+};
+
+QList<QObject*> dataList;
+dataList.append(new DataObject("Item 1", "red"));
+dataList.append(new DataObject("Item 2", "green"));
+dataList.append(new DataObject("Item 3", "blue"));
+dataList.append(new DataObject("Item 4", "yellow"));
+
+QDeclarativeContext *ctxt = view.rootContext();
+ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
+\endcode
+
+The properties of the object may then be accessed in the delegate:
+
+\code
+ListView {
+   width: 100
+   height: 100
+   anchors.fill: parent
+   model: myModel
+   delegate: Component {
+       Rectangle {
+            height: 25
+            width: 100
+            color: model.color
+            Text { text: name }
+       }
+   }
+}
+\endcode
+
+Note: There is no way for the view to know that the contents of a QList
+have changed.  If the QList is changed, it will be necessary to reset
+the model by calling QDeclarativeContext::setContextProperty() again.
+
+
+\section1 Other Data Models
+
+
+\section2 An Integer
+
+An Integer specifies a model containing the integer number of elements.
+There are no data roles.
+
+The following example creates a ListView with five elements:
+\code
+Component {
+    id: itemDelegate
+    Text { text: "I am item number: " + index }
+}
+ListView {
+    model: 5
+    delegate: itemDelegate
+}
+\endcode
+
+
+\section2 An Object Instance
+
+An Object Instance specifies a model with a single Object element.  The
+properties of the object are provided as roles.
+
+The example below creates a list with one item, showing the color of the
+\e myText text.  Note the use of the fully qualified \e model.color property
+to avoid clashing with \e color property of the Text element in the delegate.
+
+\code
+Rectangle {
+    Text {
+        id: myText
+        text: "Hello"
+        color: "#dd44ee"
+    }
+
+    Component {
+        id: myDelegate
+        Text {
+            text: model.color
+        }
+    }
+    ListView {
+        anchors.fill: parent
+        anchors.topMargin: 30
+        model: myText
+        delegate: myDelegate
+    }
+}
+\endcode
+
+*/
diff --git a/doc/src/declarative/qdeclarativereference.qdoc b/doc/src/declarative/qdeclarativereference.qdoc
new file mode 100644
index 0000000..01af7f5
--- /dev/null
+++ b/doc/src/declarative/qdeclarativereference.qdoc
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qdeclarativereference.html
+    \title QML Reference
+
+    \target qtdeclarativemainpage
+
+    QML is a language for building the animation rich,
+    highly fluid user interfaces that are becoming common in portable consumer
+    electronics devices such as mobile phones, media players, set-top boxes and
+    netbooks. It is also appropriate for highly custom desktop
+    user interfaces, or special elements in more traditional desktop user interfaces.
+
+    Building fluid applications is done declaratively, rather than procedurally.
+    That is, you specify \e what the UI should look like and how it should behave
+    rather than specifying step-by-step \e how to build it. Specifying a UI declaratively
+    does not just include the layout of the interface items, but also the way each
+    individual item looks and behaves and the overall flow of the application.    
+
+    The QML elements provide a sophisticated set of graphical and behavioral building
+    blocks.  These different elements are combined together in \l {QML Documents}{QML documents} to build components
+    ranging in complexity from simple buttons and sliders, to complete
+    internet-enabled applications like a \l {http://www.flickr.com}{Flickr} photo browser.
+
+    Getting Started:
+    \list
+    \o \l {Introduction to the QML language}
+    \o \l {QML Tutorial}{Tutorial: 'Hello World'}
+    \o \l {QML Advanced Tutorial}{Advanced Tutorial: 'Same Game'}
+    \o \l {QML Examples and Walkthroughs}
+    \endlist
+
+    \section1 Core QML Features:
+    \list
+    \o \l {QML Documents}
+    \o \l {Property Binding}
+    \o \l {JavaScript Blocks}
+    \o \l {QML Scope}
+    \o \l {Network Transparency}
+    \o \l {qmlmodels}{Data Models}
+    \o \l {anchor-layout}{Anchor-based Layout}
+    \o \l {qmlstates}{States}
+    \o \l {qdeclarativeanimation.html}{Animation}
+    \o \l {qdeclarativemodules.html}{Modules}
+    \o \l {qmlfocus}{Keyboard Focus}
+    \o \l {Extending types from QML}
+    \endlist
+
+    QML Reference:
+    \list
+    \o \l {elements}{QML Elements}
+    \o \l {QML Global Object}
+    \o \l {QML Internationalization}
+    \endlist
+*/
diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/doc/src/declarative/qdeclarativestates.qdoc
new file mode 100644
index 0000000..0fea6f8
--- /dev/null
+++ b/doc/src/declarative/qdeclarativestates.qdoc
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qdeclarativestates.html
+\target qmlstates
+\title QML States
+
+\section1 Overview
+
+QML states typically describe user interface configurations, including:
+\list
+\o What UI elements are present
+\o The properties of those elements (including how they behave)
+\o What actions are available
+\endlist
+
+A state can also be thought of as a set of batched changes from a default configuration.
+
+Examples of states in modern UI:
+\list
+\o An Address Book application with a 'View Contact' state and an 'Edit Contact' State. In the first state the contact information presented is read-only (using labels), and in the second it is editable (using editors).
+\o A button with a pressed and unpressed state. When pressed the text moves slightly down and to the right, and the button has a slightly darker appearance.
+\endlist
+
+\section1 States in QML
+
+In QML:
+\list
+\o Any object can use states.
+\o There is a default state. The default state can be explicitly set.
+\o A state can affect the properties of other objects, not just the object owning the state (and not just that object's children).
+\endlist
+
+Here is an example of using states. In the default state \c myRect is positioned at 0,0. In the 'moved' state it is positioned at 50,50. Clicking within the mouse region changes the state from the default state to the 'moved' state, thus moving the rectangle.
+
+\qml
+Item {
+    id: myItem
+
+    Rectangle {
+        id: myRect
+        width: 100
+        height: 100
+        color: "red"
+    }
+
+    states: [
+        State {
+            name: "moved"
+            PropertyChanges {
+                target: myRect
+                x: 50
+                y: 50
+            }
+        }
+    ]
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: myItem.state = 'moved'
+    }
+}
+\endqml
+
+State changes can be animated using \l{state-transitions}{Transitions}.
+
+For example, adding this code to the above \c {Item {}} element animates the transition to the "moved" state:
+
+\qml
+    transitions: [
+        Transition {
+            NumberAnimation { properties: "x,y"; duration: 500 }
+        }
+    ]
+\endqml
+
+See \l{state-transitions}{Transitions} for more information.
+
+
+Other things you can do in a state change:
+\list
+\o override signal handlers with PropertyChanges
+\o change an item's visual parent with ParentChange
+\o change an item's anchors with AnchorChanges
+\o run some script with StateChangeScript
+\endlist
+
+*/
diff --git a/doc/src/declarative/qmldebugging.qdoc b/doc/src/declarative/qmldebugging.qdoc
deleted file mode 100644
index 56bd7d2..0000000
--- a/doc/src/declarative/qmldebugging.qdoc
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\page qmldebugging.html
-\title Debugging QML
-
-\section1 Logging
-
-\c console.log can be used to print debugging information to the console. For example:
-
-\qml
-Rectangle {
-    width: 200; height: 200
-    MouseArea {
-        anchors.fill: parent
-        onClicked: console.log("clicked")
-    }
-}
-\endqml
-
-\section1 Debugging Transitions
-
-When a transition doesn't look quite right, it can be helpful to view it in slow
-motion to see what is happening more clearly. \l {qmlviewer} provides a 
-"Slow Down Animations" menu option to facilitate this.
-
-
-\section1 The QML Inspector
-
-The \c qmldebugger tool provides an experimental inspector to aid with debugging.
-It can be run as a Qt Creator plugin or as a standalone application.
-
-\section2 Qt Creator plugin
-
-The Qt Creator plugin currently builds against Qt Creator 1.3.
-
-To build the Qt Creator plugin:
-
-\list
-\o Set an environment variable \c CREATOR_SRC_DIR that points to the Qt Creator
-   source directory
-\o Set an environment variable \c CREATOR_BUILD_DIR that points to the Qt Creator
-   build directory
-\o Run \c qmake on \c $QTDIR/tools/qmldebugger/qmldebugger.pro
-\endlist
-
-This builds the plugin into your Qt Creator installation.
-
-The plugin adds a "QML Inspect" mode into Qt Creator that provides:
-
-\list
-\o An object tree showing all objects and their children
-\o The current property values for the object selected in the object tree
-   (this table is dynamically updated for all properties that have property changed
-   notifications)
-\o An expression evaluator for querying and setting values dynamically
-\o A table of watched properties (double-click on a property in the property
-   table to add it to the watch table)
-\o A graph that shows the frame rate of your application
-\endlist
-
-
-To start the debugger, open a QML project and click the "QML Inspect" mode, then click the green
-"play" button in the toolbar of the bottom-right debugger window.
-
-\image qmldebugger-creator.png
-
-
-\section2 Standalone qmldebugger tool
-
-To run the standalone \c qmldebugger tool, set an environment variable \c QML_DEBUG_SERVER_PORT
-to an available port number and run the \c qmlviewer. For example:
-
-\code
-    QML_DEBUG_SERVER_PORT=3768 qmlviewer myqmlfile.qml
-\endcode
-
-Then in another process, start the \c qmldebugger tool, enter the port number into the corresponding spinbox
-in the top right hand corner, and press the "Connect" button.
-
-*/
diff --git a/doc/src/declarative/qmldocument.qdoc b/doc/src/declarative/qmldocument.qdoc
deleted file mode 100644
index 977b4ac..0000000
--- a/doc/src/declarative/qmldocument.qdoc
+++ /dev/null
@@ -1,190 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\page qmldocuments.html
-\title QML Documents
-
-A QML document is a block of QML source code.  QML documents generally correspond to files 
-stored on a disk or network resource, but can also be constructed directly from text data.
-
-Here is a simple QML document:
-
-\code
-import Qt 4.6
-
-Rectangle {
-    width: 240; height: 320; 
-
-    resources: [
-        Component {
-            id: contactDelegate
-            Text {
-                text: modelData.firstName + " " + modelData.lastName
-            }
-        }
-    ]
-
-    ListView {
-        anchors.fill: parent
-        model: contactModel
-        delegate: contactDelegate
-    } 
-}
-\endcode
-
-QML documents are always encoded in UTF-8 format.
-
-A QML document always begins with one or more import statements.  To prevent elements 
-introduced in later versions from affecting existing QML programs, the element types 
-available within a document are controlled by the imported QML \l {Modules}.  That is, 
-QML is a \e versioned language.
-
-Syntactically a QML document is self contained; QML does \e not have a preprocessor that 
-modifies the document prior to presentation to the QML runtime. \c import statements 
-do not "include" code in the document, but instead instruct the QML runtime on how to 
-resolve type references found in the document.  Any type reference present in a QML 
-document - such as \c Rectangle and \c ListView - including those made within an 
-\l {JavaScript Block} or \l {Property Binding}s, are \e resolved based exclusively on the 
-import statements.  QML does not import any modules by default, so at least one \c import
-statement must be present or no elements will be available!
-
-A QML document defines a single, top-level \l {QmlComponent}{QML component}.  A QML component 
-is a template that is interpreted by the QML runtime to create an object with some predefined 
-behaviour.  As it is a template, a single QML component can be "run" multiple times to 
-produce several objects, each of which are said to be \e instances of the component.  
-
-Once created, instances are not dependent on the component that created them, so they can 
-operate on independent data.  Here is an example of a simple "button" component that is 
-instantiated four times, each with a different value for its \c text property.
-
-\table
-\row
-\o
-\raw HTML
-<table><tr><td>
-\endraw
-\code
-import Qt 4.6
-
-BorderImage {
-    property alias text: textElement.text
-    width: 100; height: 30; source: "images/toolbutton.sci"
-
-    Text {
-        id: textElement
-        anchors.centerIn: parent
-        font.pointSize: 20
-        style: Text.Raised
-        color: "white"
-    }
-}
-\endcode
-\raw HTML
-</td> <td>
-\endraw
-\image anatomy-component.png
-\raw HTML
-</td> </tr> </table>
-\endraw
-\endtable
-
-In addition to the top-level component that all QML documents define, documents may also 
-include additional \e inline components.  Inline components are declared  using the 
-\l Component element, as can be seen in the first example above.  Inline components share 
-all the characteristics of regular top-level components and use the same \c import list as their
-containing QML document.  Components are one of the most basic building blocks in QML, and are 
-frequently used as "factories" by other elements.  For example, the \l ListView element uses the
-\c delegate component as the template for instantiating list items - each list item is just a
-new instance of the component with the item specific data set appropriately.
-
-Like other \l {QML Elements}, the \l Component element is an object and must be assigned to a 
-property.   \l Component objects may also have an object id.  In the first example on this page,
-the inline component is added to the \l Rectangle's \c resources list, and then 
-\l {Property Binding} is used to assign the \l Component to the \l ListView's \c delegate 
-property.  While using property binding allows the \l Component object to be shared (for example,
-if the QML document contained multiple \l ListView's with the same delegate), in this case the 
-\l Component could have been assigned directly to the \l ListView's \c delegate.  The QML 
-language even contains a syntactic optimization when assigning directly to a component property 
-for this case where it will automatically insert the \l Component tag.
-
-These final two examples are behaviorally identical to the original document.
-
-\table
-\row
-\o
-\code
-import Qt 4.6
-
-Rectangle {
-    width: 240; height: 320; 
-
-    ListView {
-        anchors.fill: parent
-        model: contactModel
-        delegate: Component {
-            Text {
-                text: modelData.firstName + " " + modelData.lastName
-            }
-        }
-    } 
-}
-\endcode
-\o
-\code
-import Qt 4.6
-
-Rectangle {
-    width: 240; height: 320; 
-
-    ListView {
-        anchors.fill: parent
-        model: contactModel
-        delegate: Text {
-            text: modelData.firstName + " " + modelData.lastName
-        }
-    } 
-}
-\endcode
-\endtable
-
-\sa QmlComponent
-*/
diff --git a/doc/src/declarative/qmli18n.qdoc b/doc/src/declarative/qmli18n.qdoc
deleted file mode 100644
index 0803d6c..0000000
--- a/doc/src/declarative/qmli18n.qdoc
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\page qmli18n.html
-\title QML Internationalization
-
-\section1 Overview
-
-Strings in QML can be marked for translation using the qsTr(), qsTranslate(),
-QT_TR_NOOP(), and QT_TRANSLATE_NOOP() functions.
-
-For example:
-\qml
-Text { text: qsTr("Pictures") }
-\endqml
-
-These functions are standard QtScript functions; for more details see
-QScriptEngine::installTranslatorFunctions().
-
-QML relies on the core internationalization capabilities provided by Qt. These
-capabilities are described more fully in:
-\list
-\o \l {Internationalization with Qt}
-\o \l {Qt Linguist Manual}
-\endlist
-
-You can test a translation in \l {qmlviewer} using the -translation option.
-
-\section1 Example
-
-First we create a simple QML file with text to be translated. The string
-that needs to be translated is enclosed in a call to \c qsTr().
-
-hello.qml:
-\qml
-import Qt 4.6
-
-Rectangle {
- width: 200; height: 200
- Text { text: qsTr("Hello"); anchors.centerIn: parent }
-}
-\endqml
-
-Next we create a translation source file using lupdate:
-\code
-lupdate hello.qml -ts hello.ts
-\endcode
-
-Then we open \c hello.ts in \l{Qt Linguist Manual} {Linguist}, provide
-a translation and create the release file \c hello.qm.
-
-Finally, we can test the translation in qmlviewer:
-\code
-qmlviewer -translation hello.qm hello.qml
-\endcode
-*/
diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc
deleted file mode 100644
index b353e44..0000000
--- a/doc/src/declarative/qmlintro.qdoc
+++ /dev/null
@@ -1,351 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\page qmlintroduction.html
-\title Introduction to the QML language
-
-\tableofcontents
-
-QML is a declarative language designed to describe the user interface of a
-program: both what it looks like, and how it behaves. In QML, a user
-interface is specified as a tree of objects with properties.
-
-This introduction is meant for those with little or no programming
-experience. JavaScript is used as a scripting language in QML, so you may want
-to learn a bit more about it (\l{JavaScript: The Definitive Guide}) before diving
-deeper into QML. It's also helpful to have a basic understanding of other web
-technologies like HTML and CSS, but it's not required.
-
-\section1 Basic QML Syntax
-
-QML looks like this:
-
-\code
-Rectangle {
-    width: 200
-    height: 200
-    color: "white"
-    Image {
-        source: "pics/logo.png"
-        anchors.centerIn: parent
-    }
-}
-\endcode
-
-Objects are specified by their type, followed by a pair of braces. Object
-types always begin with a capital letter. In the above example, there are
-two objects, a \l Rectangle, and an \l Image. Between the braces, we can specify
-information about the object, such as its properties.
-
-Properties are specified as \c {property: value}. In the above example, we 
-can see the Image has a property named \c source, which has been assigned the 
-value \c "pics/logo.png". The property and its value are separated by a colon.
-
-Properties can be specified one-per-line:
-
-\code
-Rectangle {
-    width: 100
-    height: 100
-}
-\endcode
-
-or you can put multiple properties on a single line:
-
-\code
-Rectangle { width: 100; height: 100 }
-\endcode
-
-When multiple property/value pairs are specified on a single line, they
-must be separated by a semicolon.
-
-\section1 Expressions
-
-In addition to assigning values to properties, you can also assign
-expressions written in JavaScript.
-
-\code
-Rotation {
-    angle: 360 * 3
-}
-\endcode
-
-These expressions can include references to other objects and properties, in which case
-a \e binding is established: when the value of the expression changes, the property the
-expression has been assigned to is automatically updated to that value.
-
-\code
-Item {
-    Text {
-        id: text1
-        text: "Hello World"
-    }
-    Text {
-        id: text2
-        text: text1.text
-    }
-}
-\endcode
-
-In the example above, the \c text2 object will display the same text as \c text1. If \c text1 is changed,
-\c text2 is automatically changed to the same value.
-
-Note that to refer to other objects, we use their \e id values. (See below for more
-information on the \e id property.)
-
-\section1 QML Comments
-
-Commenting in QML is similar to JavaScript.
-\list
-\o Single line comments start with // and finish at the end of the line.
-\o Multiline comments start with /* and finish with *\/
-\endlist
-
-\quotefile doc/src/snippets/declarative/comments.qml
-
-Comments are ignored by the engine. The are useful for explaining what you
-are doing: for referring back to at a later date, or for others reading
-your QML files.
-
-Comments can also be used to prevent the execution of code, which is
-sometimes useful for tracking down problems.
-
-\code
-Text {
-    text: "Hello world!"
-    //opacity: 0.5
-}
-\endcode
-
-In the above example, the Text object will have normal opacity, since the
-line opacity: 0.5 has been turned into a comment.
-
-\section1 Properties
-\target intro-properties
-
-\section2 Property naming
-
-Properties begin with a lowercase letter (with the exception of \l{Attached Properties}).
-
-\section2 Property types
-
-QML supports properties of many types (see \l{QML Basic Types}). The basic types include int,
-real, bool, string, color, and lists.
-
-\code
-Item {
-    x: 10.5             // a 'real' property
-    ...
-    state: "details"    // a 'string' property
-    focus: true         // a 'bool' property
-}
-\endcode
-
-QML properties are what is known as \e typesafe. That is, they only allow you to assign a value that
-matches the property type. For example, the \c x property of item is a real, and if you try to assign
-a string to it you will get an error.
-
-\badcode
-Item {
-    x: "hello"  // illegal!
-}
-\endcode
-
-\section3 The \c id property
-
-Each object can be given a special unique property called an \e id. Assigning an id enables the object
-to be referred to by other objects and scripts.
-
-The first Rectangle element below has an \e id, "myRect". The second Rectange element defines its
-own width by referring to \tt myRect.width, which means it will have the same \tt width
-value as the first Rectangle element.
-
-\code
-Item {
-    Rectangle {
-        id: myRect
-        width: 100
-        height: 100
-    }
-    Rectangle {
-        width: myRect.width
-        height: 200
-    }
-}
-\endcode
-
-Note that an \e id must begin with a lower-case letter or an underscore, and cannot contain characters other than letters, numbers and underscores.
-
-
-\section2 List properties
-
-List properties look like this:
-
-\code
-Item {
-    children: [
-        Image {},
-        Text {}
-    ]
-}
-\endcode
-
-The list is enclosed in square brackets, with a comma separating the
-list elements. In cases where you are only assigning a single item to a
-list, you can omit the square brackets:
-
-\code
-Image {
-    children: Rectangle {}
-}
-\endcode
-
-\section2 Default properties
-
-Each object type can specify one of its list or object properties as its default property.
-If a property has been declared as the default property, the property tag can be omitted.
-
-For example this code:
-\code
-State {
-    changes: [
-        PropertyChanges {},
-        PropertyChanges {}
-    ]
-}
-\endcode
-
-can be simplified to:
-
-\code
-State {
-    PropertyChanges {}
-    PropertyChanges {}
-}
-\endcode
-
-because \c changes is the default property of the \c State type.
-
-\section2 Grouped Properties
-\target dot properties
-
-In some cases properties form a logical group and use a 'dot' or grouped notation
-to show this.
-
-Grouped properties can be written like this:
-\qml
-Text {
-    font.pixelSize: 12
-    font.bold: true
-}
-\endqml
-
-or like this:
-\qml
-Text {
-    font { pixelSize: 12; bold: true }
-}
-\endqml
-
-In the element documentation grouped properties are shown using the 'dot' notation.
-
-\section2 Attached Properties
-\target attached-properties
-
-Some objects attach properties to another object.  Attached Properties
-are of the form \e {Type.property} where \e Type is the type of the
-element that attaches \e property.
-
-For example:
-\code
-Component {
-    id: myDelegate
-    Text {
-        text: "Hello"
-        color: ListView.isCurrentItem ? "red" : "blue"
-    }
-}
-ListView {
-    delegate: myDelegate
-}
-\endcode
-
-The \l ListView element attaches the \e ListView.isCurrentItem property
-to each delegate it creates.
-
-Another example of attached properties is the \l Keys element which
-attaches properties for handling key presses to
-any visual Item, for example:
-
-\code
-Item {
-    focus: true
-    Keys.onSelectPressed: console.log("Selected")
-}
-\endcode
-
-\section2 Signal Handlers
-
-Signal handlers allow actions to be taken in reponse to an event.  For instance,
-the \l MouseArea element has signal handlers to handle mouse press, release
-and click:
-
-\code
-MouseArea {
-    onPressed: console.log("mouse button pressed")
-}
-\endcode
-
-All signal handlers begin with \e "on".
-
-Some signal handlers include an optional parameter, for example
-the MouseArea onPressed signal handler has a \e mouse parameter:
-
-\code
-MouseArea {
-    acceptedButtons: Qt.LeftButton | Qt.RightButton
-    onPressed: if (mouse.button == Qt.RightButton) console.log("Right mouse button pressed")
-}
-\endcode
-
-
-*/
diff --git a/doc/src/declarative/qmlmodels.qdoc b/doc/src/declarative/qmlmodels.qdoc
deleted file mode 100644
index 4843a7b..0000000
--- a/doc/src/declarative/qmlmodels.qdoc
+++ /dev/null
@@ -1,341 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\page qmlmodels.html
-\target qmlmodels
-\title Data Models
-
-Some QML Items use Data Models to provide the data to be displayed.
-These items typically require a \e delegate component that
-creates an instance for each item in the model.  Models may be static, or
-have items modified, inserted, removed or moved dynamically.
-
-Data is provided to the delegate via named data roles which the
-delegate may bind to.  The roles are exposed as properties of the
-\e model context property, though this property is set as a default property
-of the delegate so, unless there is a naming clash with a
-property in the delegate, the roles are usually accessed unqualified.  The
-example below would  have a clash between he \e color role of the model and
-the \e color property of the Rectangle.  The clash is avoided by referencing
-the \e color property of the model by its full name: \e model.color.
-
-\code
-ListModel {
-    id: myModel
-    ListElement { color: "red" }
-    ListElement { color: "green" }
-}
-
-Component {
-    id: myDelegate
-    Rectangle {
-        width: 20; height: 20
-        color: model.color
-    }
-}
-\endcode
-
-A special \e index role containing the index of the item in the model
-is also available.
-
-\e Note: the index role will be set to -1 if the item is removed from
-the model.  If you bind to the index role, be sure that the logic
-accounts for the possibility of index being -1, i.e. that the item
-is no longer valid.  Usually the item will shortly be destroyed, but
-it is possible to delay delegate destruction in some views via a delayRemove
-attached property.
-
-Models that do not have named roles will have the data provided via
-the \e modelData role.  The \e modelData role is also provided for
-Models that have only one role.  In this case the \e modelData role
-contains the same data as the named role.
-
-There are a number of QML elements that operate using data models:
-
-\list
-\o ListView
-\o GridView
-\o PathView
-\o \l Repeater
-\endlist
-
-QML supports several types of data model, which may be provided by QML
-or C++ (via QmlContext::setContextProperty(), for example).
-
-\section1 QML Data Models
-
-\section2 ListModel
-
-ListModel is a simple hierarchy of elements specified in QML.  The
-available roles are specified by the \l ListElement properties.
-
-\code
-ListModel {
-    id: fruitModel
-    ListElement {
-        name: "Apple"
-        cost: 2.45
-    }
-    ListElement {
-        name: "Orange"
-        cost: 3.25
-    }
-    ListElement {
-        name: "Banana"
-        cost: 1.95
-    }
-}
-\endcode
-
-The above model has two roles, \e name and \e cost.  These can be bound
-to by a ListView delegate, for example:
-
-\code
-Component {
-    id: fruitDelegate
-    Row {
-        Text { text: "Fruit: " + name }
-        Text { text: "Cost: $" + cost }
-    }
-}
-ListView {
-    model: fruitModel
-    delegate: fruitDelegate
-}
-\endcode
-
-
-\section2 XmlListModel
-
-XmlListModel allows construction of a model from an XML data source. The roles
-are specified via the \l XmlRole element.
-
-The following model has three roles, \e title, \e link and \e description:
-\code
-XmlListModel {
-     id: feedModel
-     source: "http://rss.news.yahoo.com/rss/oceania"
-     query: "/rss/channel/item"
-     XmlRole { name: "title"; query: "title/string()" }
-     XmlRole { name: "link"; query: "link/string()" }
-     XmlRole { name: "description"; query: "description/string()" }
-}
-\endcode
-
-
-\section2 VisualItemModel
-
-VisualItemModel allows QML items to be provided as a model.  This model contains
-both the data and delegate (its child items).  This model does not provide any roles.
-
-\code
- VisualItemModel {
-     id: itemModel
-     Rectangle { height: 30; width: 80; color: "red" }
-     Rectangle { height: 30; width: 80; color: "green" }
-     Rectangle { height: 30; width: 80; color: "blue" }
- }
-
- ListView {
-     anchors.fill: parent
-     model: itemModel
- }
-\endcode
-
-Note that in the above example there is no delegate required.
-The items of the model itself provide the visual elements that
-will be positioned by the view.
-
-
-\section1 C++ Data Models
-
-\section2 QAbstractItemModel
-
-QAbstractItemModel provides the roles set via the QAbstractItemModel::setRoleNames() method.
-
-
-\section2 QStringList
-
-QStringList provides the contents of the list via the \e modelData role:
-
-\table
-\header
-\o 
-\o 
-\row
-\o
-\code
-// main.cpp
-QStringList dataList;
-dataList.append("Fred");
-dataList.append("Ginger");
-dataList.appenf("Skipper");
-
-QmlContext *ctxt = view.rootContext();
-ctxt->setContextProperty("myModel", QVariant::fromValue(&dataList));
-\endcode
-
-\o
-\code
-// main.qml
-ListView {
-   width: 100
-   height: 100
-   anchors.fill: parent
-   model: myModel
-   delegate: Component {
-       Rectangle {
-            height: 25
-            Text { text: modelData }
-       }
-   }
-}
-\endcode
-\endtable
-
-\note There is no way for the view to know that the contents of a QStringList
-have changed.  If the QStringList is changed, it will be necessary to reset
-the model by calling QmlContext::setContextProperty() again.
-
-
-\section2 QList<QObject*>
-
-QList<QObject*> provides the properties of the objects in the list as roles.
-
-\code
-class DataObject : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QString color READ color WRITE setColor)
-...
-};
-
-QList<QObject*> dataList;
-dataList.append(new DataObject("Item 1", "red"));
-dataList.append(new DataObject("Item 2", "green"));
-dataList.append(new DataObject("Item 3", "blue"));
-dataList.append(new DataObject("Item 4", "yellow"));
-
-QmlContext *ctxt = view.rootContext();
-ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
-\endcode
-
-The properties of the object may then be accessed in the delegate:
-
-\code
-ListView {
-   width: 100
-   height: 100
-   anchors.fill: parent
-   model: myModel
-   delegate: Component {
-       Rectangle {
-            height: 25
-            width: 100
-            color: model.color
-            Text { text: name }
-       }
-   }
-}
-\endcode
-
-Note: There is no way for the view to know that the contents of a QList
-have changed.  If the QList is changed, it will be necessary to reset
-the model by calling QmlContext::setContextProperty() again.
-
-
-\section1 Other Data Models
-
-
-\section2 An Integer
-
-An Integer specifies a model containing the integer number of elements.
-There are no data roles.
-
-The following example creates a ListView with five elements:
-\code
-Component {
-    id: itemDelegate
-    Text { text: "I am item number: " + index }
-}
-ListView {
-    model: 5
-    delegate: itemDelegate
-}
-\endcode
-
-
-\section2 An Object Instance
-
-An Object Instance specifies a model with a single Object element.  The
-properties of the object are provided as roles.
-
-The example below creates a list with one item, showing the color of the
-\e myText text.  Note the use of the fully qualified \e model.color property
-to avoid clashing with \e color property of the Text element in the delegate.
-
-\code
-Rectangle {
-    Text {
-        id: myText
-        text: "Hello"
-        color: "#dd44ee"
-    }
-
-    Component {
-        id: myDelegate
-        Text {
-            text: model.color
-        }
-    }
-    ListView {
-        anchors.fill: parent
-        anchors.topMargin: 30
-        model: myText
-        delegate: myDelegate
-    }
-}
-\endcode
-
-*/
diff --git a/doc/src/declarative/qmlreference.qdoc b/doc/src/declarative/qmlreference.qdoc
deleted file mode 100644
index 107d579..0000000
--- a/doc/src/declarative/qmlreference.qdoc
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page qmlreference.html
-    \title QML Reference
-
-    \target qtdeclarativemainpage
-
-    QML is a language for building the animation rich,
-    highly fluid user interfaces that are becoming common in portable consumer
-    electronics devices such as mobile phones, media players, set-top boxes and
-    netbooks. It is also appropriate for highly custom desktop
-    user interfaces, or special elements in more traditional desktop user interfaces.
-
-    Building fluid applications is done declaratively, rather than procedurally.
-    That is, you specify \e what the UI should look like and how it should behave
-    rather than specifying step-by-step \e how to build it. Specifying a UI declaratively
-    does not just include the layout of the interface items, but also the way each
-    individual item looks and behaves and the overall flow of the application.    
-
-    The QML elements provide a sophisticated set of graphical and behavioral building
-    blocks.  These different elements are combined together in \l {QML Documents}{QML documents} to build components
-    ranging in complexity from simple buttons and sliders, to complete
-    internet-enabled applications like a \l {http://www.flickr.com}{Flickr} photo browser.
-
-    Getting Started:
-    \list
-    \o \l {Introduction to the QML language}
-    \o \l {QML Tutorial}{Tutorial: 'Hello World'}
-    \o \l {QML Advanced Tutorial}{Advanced Tutorial: 'Same Game'}
-    \o \l {QML Examples and Walkthroughs}
-    \endlist
-
-    \section1 Core QML Features:
-    \list
-    \o \l {QML Documents}
-    \o \l {Property Binding}
-    \o \l {JavaScript Blocks}
-    \o \l {QML Scope}
-    \o \l {Network Transparency}
-    \o \l {qmlmodels}{Data Models}
-    \o \l {anchor-layout}{Anchor-based Layout}
-    \o \l {qmlstates}{States}
-    \o \l {qmlanimation.html}{Animation}
-    \o \l {qmlmodules.html}{Modules}
-    \o \l {qmlfocus}{Keyboard Focus}
-    \o \l {Extending types from QML}
-    \endlist
-
-    QML Reference:
-    \list
-    \o \l {elements}{QML Elements}
-    \o \l {QML Global Object}
-    \o \l {QML Internationalization}
-    \endlist
-*/
diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
new file mode 100644
index 0000000..6d3e109
--- /dev/null
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qmlruntime.html
+    \title Qt Declarative UI Viewer (qmlviewer)
+    \ingroup qttools
+    \keyword qmlviewer
+
+    This page documents the \e{Declarative UI Viewer} for the Qt GUI
+    toolkit. The \c qmlviewer reads a declarative user interface definition
+    (\c .qml) file and displays the user interface it describes.
+
+    qmlviewer is a development tool.  It is not intended to be
+    installed in a production environment.
+
+    \section1 Options
+
+    When run with the \c -help option, qmlviewer shows available options.
+
+    \section1 Dummy Data
+
+    One use of qmlviewer is to allow QML files to be viewed stand-alone,
+    rather than being loaded from within a Qt program. Qt applications will
+    usually bind objects and properties into the execution context before
+    running the QML. To stand-in for such bindings, you can provide dummy
+    data: create a directory called "dummydata" in the same directory as
+    the target QML file and create files there with the "qml" extension.
+    All such files will be loaded as QML objects and bound to the root
+    context as a property with the name of the file (without ".qml").
+
+    For example, if the Qt application has a "clock.time" property
+    that is a qreal from 0 to 86400 representing the number of seconds since
+    midnight, dummy data for this could be provided by \c dummydata/clock.qml:
+    \code
+    QtObject { property real time: 12345 }
+    \endcode
+    Any QML can be used in the dummy data files. You could even animate the
+    fictional data!
+
+    \section1 Screen Orientation
+
+    A special piece of dummy data which is integrated into the viewer is
+    a simple orientation property. The orientation can be set via the
+    settings menu in the application, or by pressing Ctrl+T to toggle it.
+
+    To use this from within your QML file, import QDeclarativeViewer 1.0 and create a
+    Screen object. This object has a property, orientation, which can be either
+    Screen.Landscape or Screen.Portrait and which can be bound to in your
+    application. An example is below:
+
+\code
+    import QDeclarativeViewer 1.0 as QDeclarativeViewer
+    
+    Item {
+        QDeclarativeViewer.Screen { id: qmlviewerScreen }
+        state: (qmlviewerScreen.orientation == QDeclarativeViewer.Screen.Landscape) ? 'landscape' : ''
+    }
+\endcode
+
+*/
diff --git a/doc/src/declarative/qmlstates.qdoc b/doc/src/declarative/qmlstates.qdoc
deleted file mode 100644
index 2118c2b..0000000
--- a/doc/src/declarative/qmlstates.qdoc
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\page qmlstates.html
-\target qmlstates
-\title QML States
-
-\section1 Overview
-
-QML states typically describe user interface configurations, including:
-\list
-\o What UI elements are present
-\o The properties of those elements (including how they behave)
-\o What actions are available
-\endlist
-
-A state can also be thought of as a set of batched changes from a default configuration.
-
-Examples of states in modern UI:
-\list
-\o An Address Book application with a 'View Contact' state and an 'Edit Contact' State. In the first state the contact information presented is read-only (using labels), and in the second it is editable (using editors).
-\o A button with a pressed and unpressed state. When pressed the text moves slightly down and to the right, and the button has a slightly darker appearance.
-\endlist
-
-\section1 States in QML
-
-In QML:
-\list
-\o Any object can use states.
-\o There is a default state. The default state can be explicitly set.
-\o A state can affect the properties of other objects, not just the object owning the state (and not just that object's children).
-\endlist
-
-Here is an example of using states. In the default state \c myRect is positioned at 0,0. In the 'moved' state it is positioned at 50,50. Clicking within the mouse region changes the state from the default state to the 'moved' state, thus moving the rectangle.
-
-\qml
-Item {
-    id: myItem
-
-    Rectangle {
-        id: myRect
-        width: 100
-        height: 100
-        color: "red"
-    }
-
-    states: [
-        State {
-            name: "moved"
-            PropertyChanges {
-                target: myRect
-                x: 50
-                y: 50
-            }
-        }
-    ]
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: myItem.state = 'moved'
-    }
-}
-\endqml
-
-State changes can be animated using \l{state-transitions}{Transitions}.
-
-For example, adding this code to the above \c {Item {}} element animates the transition to the "moved" state:
-
-\qml
-    transitions: [
-        Transition {
-            NumberAnimation { properties: "x,y"; duration: 500 }
-        }
-    ]
-\endqml
-
-See \l{state-transitions}{Transitions} for more information.
-
-
-Other things you can do in a state change:
-\list
-\o override signal handlers with PropertyChanges
-\o change an item's visual parent with ParentChange
-\o change an item's anchors with AnchorChanges
-\o run some script with StateChangeScript
-\endlist
-
-*/
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
deleted file mode 100644
index c2b29d3..0000000
--- a/doc/src/declarative/qmlviewer.qdoc
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page qmlviewer.html
-    \title Qt Declarative UI Viewer (qmlviewer)
-    \ingroup qttools
-    \keyword qmlviewer
-
-    This page documents the \e{Declarative UI Viewer} for the Qt GUI
-    toolkit. The \c qmlviewer reads a declarative user interface definition
-    (\c .qml) file and displays the user interface it describes.
-
-    qmlviewer is a development tool.  It is not intended to be
-    installed in a production environment.
-
-    \section1 Options
-
-    When run with the \c -help option, qmlviewer shows available options.
-
-    \section1 Dummy Data
-
-    One use of qmlviewer is to allow QML files to be viewed stand-alone,
-    rather than being loaded from within a Qt program. Qt applications will
-    usually bind objects and properties into the execution context before
-    running the QML. To stand-in for such bindings, you can provide dummy
-    data: create a directory called "dummydata" in the same directory as
-    the target QML file and create files there with the "qml" extension.
-    All such files will be loaded as QML objects and bound to the root
-    context as a property with the name of the file (without ".qml").
-
-    For example, if the Qt application has a "clock.time" property
-    that is a qreal from 0 to 86400 representing the number of seconds since
-    midnight, dummy data for this could be provided by \c dummydata/clock.qml:
-    \code
-    QtObject { property real time: 12345 }
-    \endcode
-    Any QML can be used in the dummy data files. You could even animate the
-    fictional data!
-
-    \section1 Screen Orientation
-
-    A special piece of dummy data which is integrated into the viewer is
-    a simple orientation property. The orientation can be set via the
-    settings menu in the application, or by pressing Ctrl+T to toggle it.
-
-    To use this from within your QML file, import QmlViewer 1.0 and create a
-    Screen object. This object has a property, orientation, which can be either
-    Screen.Landscape or Screen.Portrait and which can be bound to in your
-    application. An example is below:
-
-\code
-    import QmlViewer 1.0 as QmlViewer
-    
-    Item {
-        QmlViewer.Screen { id: qmlviewerScreen }
-        state: (qmlviewerScreen.orientation == QmlViewer.Screen.Landscape) ? 'landscape' : ''
-    }
-\endcode
-
-*/
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index 732ff86..66d537d 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -46,50 +46,50 @@
 
 \tableofcontents
 
-The QML API is split into three main classes - QmlEngine, QmlComponent and QmlContext.  
-QmlEngine provides the environment in which QML is run, QmlComponent encapsulates 
-\l {QML Documents}, and QmlContext allows applications to expose data to QML component instances.
+The QML API is split into three main classes - QDeclarativeEngine, QDeclarativeComponent and QDeclarativeContext.  
+QDeclarativeEngine provides the environment in which QML is run, QDeclarativeComponent encapsulates 
+\l {QML Documents}, and QDeclarativeContext allows applications to expose data to QML component instances.
 
-QML also includes a convenience API, QmlView, for applications that simply want to embed QML
-components into a new QGraphicsView.  QmlView covers up many of the details discussed below.  
-While QmlView is mainly intended for rapid prototyping it can have uses in production applications.
+QML also includes a convenience API, QDeclarativeView, for applications that simply want to embed QML
+components into a new QGraphicsView.  QDeclarativeView covers up many of the details discussed below.  
+While QDeclarativeView is mainly intended for rapid prototyping it can have uses in production applications.
 
 If you are looking at retrofitting an existing Qt application with QML,
 read \l{Integrating QML with existing Qt UI code}.
 \section1 Basic Usage
 
-Every application requires at least one QmlEngine.  A QmlEngine allows the configuration of
+Every application requires at least one QDeclarativeEngine.  A QDeclarativeEngine allows the configuration of
 global settings that apply to all the QML component instances - such as the QNetworkAccessManager
 that is used for network communications, and the path used for persistent storage.  
-Multiple QmlEngine's are only needed if the application requires these settings to differ 
+Multiple QDeclarativeEngine's are only needed if the application requires these settings to differ 
 between QML component instances.
 
-\l {QML Documents} are loaded using the QmlComponent class.  Each QmlComponent instance 
-represents a single QML document.  A QmlComponent can be passed a document URL, or raw text
+\l {QML Documents} are loaded using the QDeclarativeComponent class.  Each QDeclarativeComponent instance 
+represents a single QML document.  A QDeclarativeComponent can be passed a document URL, or raw text
 representing the content of the document.  The document URL can be a local filesystem URL, or
 any network URL supported by QNetworkAccessManager.
 
-QML component instances can then be created by calling the QmlComponent::create() method.  Here's
+QML component instances can then be created by calling the QDeclarativeComponent::create() method.  Here's
 an example of loading a QML document, and creating an object from it.
 
 \code
-QmlEngine *engine = new QmlEngine(parent);
-QmlComponent component(engine, QUrl("main.qml"));
+QDeclarativeEngine *engine = new QDeclarativeEngine(parent);
+QDeclarativeComponent component(engine, QUrl("main.qml"));
 QObject *myObject = component.create();
 \endcode
 
 \section1 Exposing Data
 
-QML components are instantiated in a QmlContext.  A context allows the application to expose data
-to the QML component instance.  A single QmlContext can be used to instantiate all the objects
-used by an application, or several QmlContext can be created for more fine grained control over
-the data exposed to each instance.  If a context is not passed to the QmlComponent::create()
-method, the QmlEngine's \l {QmlEngine::rootContext()}{root context} is used.  Data exposed through
+QML components are instantiated in a QDeclarativeContext.  A context allows the application to expose data
+to the QML component instance.  A single QDeclarativeContext can be used to instantiate all the objects
+used by an application, or several QDeclarativeContext can be created for more fine grained control over
+the data exposed to each instance.  If a context is not passed to the QDeclarativeComponent::create()
+method, the QDeclarativeEngine's \l {QDeclarativeEngine::rootContext()}{root context} is used.  Data exposed through
 the root context is available to all object instances.
 
 \section1 Simple Data
 
-To expose data to a QML component instance, applications set \l {QmlContext::setContextProperty()}
+To expose data to a QML component instance, applications set \l {QDeclarativeContext::setContextProperty()}
 {context properties} which are then accessible by name from QML  \l {Property Binding}s and 
 \l {JavaScript Blocks}.  The following example shows how to expose a background color to a QML
 file.
@@ -99,11 +99,11 @@ file.
 \o
 \code
 // main.cpp
-QmlContext *windowContext = new QmlContext(engine->rootContext());
+QDeclarativeContext *windowContext = new QDeclarativeContext(engine->rootContext());
 windowContext->setContextProperty("backgroundColor", 
                                   QColor(Qt::lightsteelblue));
 
-QmlComponent component(&engine, "main.qml");
+QDeclarativeComponent component(&engine, "main.qml");
 QObject *window = component.create(windowContext);
 \endcode
 \o
@@ -125,14 +125,14 @@ Rectangle {
 Context properties work just like normal properties in QML bindings - if the \c backgroundColor
 context property in the previous example was changed to red, the component object instances would
 all be automatically updated.  Note that it is the responsibility of the creator to delete any
-QmlContext it constructs.  If the \c windowContext in the example above is no longer needed when
+QDeclarativeContext it constructs.  If the \c windowContext in the example above is no longer needed when
 the \c window component instantiation is destroyed, the \c windowContext must be destroyed
 explicitly.  The simplest way to ensure this is to set \c window as \c windowContext's parent.
 
-QmlContexts form a tree - each QmlContext except for the root context has a parent.  Child 
-QmlContexts effectively inherit the context properties present in their parents.  This gives
+QDeclarativeContexts form a tree - each QDeclarativeContext except for the root context has a parent.  Child 
+QDeclarativeContexts effectively inherit the context properties present in their parents.  This gives
 applications more freedom in partitioning the data exposed to different QML object instances.  
-If a QmlContext sets a context property that is also set in one of its parents, the new context
+If a QDeclarativeContext sets a context property that is also set in one of its parents, the new context
 property shadows that in the parent.  In The following example, the \c background context property
 in \c {Context 1} shadows the \c background context property in the root context.
 
@@ -185,10 +185,10 @@ int main(int argc, char **argv)
 {
     // ...
 
-    QmlContext *windowContext = new QmlContext(engine->rootContext());
+    QDeclarativeContext *windowContext = new QDeclarativeContext(engine->rootContext());
     windowContext->setContextProperty("palette", new CustomPalette);
 
-    QmlComponent component(&engine, "main.qml");
+    QDeclarativeComponent component(&engine, "main.qml");
     QObject *window = component.create(windowContext);
 }
 \endcode
@@ -230,7 +230,7 @@ binding that does not have a NOTIFY signal will cause QML to issue a warning at
 \section2 Dynamic Structured Data
 
 If an application is too dynamic to structure data as compile-time QObject types, dynamically
-structured data can be constructed at runtime using the QmlPropertyMap class.
+structured data can be constructed at runtime using the QDeclarativePropertyMap class.
 
 
 \section1 Calling C++ methods from QML
@@ -279,7 +279,7 @@ int main(int argc, char **argv)
 {
     // ...
 
-    QmlContext *context = engine->rootContext();
+    QDeclarativeContext *context = engine->rootContext();
     context->setContextProperty("ledBlinker", new LEDBlinker);
 
     // ...
@@ -329,15 +329,15 @@ Of course, it is also possible to call \l {Adding new methods}{functions declare
 
 \section1 Network Components
 
-If the URL passed to QmlComponent is a network resource, or if the QML document references a
-network resource, the QmlComponent has to fetch the network data before it is able to create
-objects.  In this case, the QmlComponent will have a \l {QmlComponent::Loading}{Loading}
-\l {QmlComponent::status()}{status}.  An application will have to wait until the component
-is \l {QmlComponent::Ready}{Ready} before calling \l {QmlComponent::create()}.
+If the URL passed to QDeclarativeComponent is a network resource, or if the QML document references a
+network resource, the QDeclarativeComponent has to fetch the network data before it is able to create
+objects.  In this case, the QDeclarativeComponent will have a \l {QDeclarativeComponent::Loading}{Loading}
+\l {QDeclarativeComponent::status()}{status}.  An application will have to wait until the component
+is \l {QDeclarativeComponent::Ready}{Ready} before calling \l {QDeclarativeComponent::create()}.
 
 The following example shows how to load a QML file from a network resource.  After creating
-the QmlComponent, it tests whether the component is loading.  If it is, it connects to the
-QmlComponent::statusChanged() signal and otherwise calls the \c {continueLoading()} method
+the QDeclarativeComponent, it tests whether the component is loading.  If it is, it connects to the
+QDeclarativeComponent::statusChanged() signal and otherwise calls the \c {continueLoading()} method
 directly.  This test is necessary, even for URLs that are known to be remote, just in case
 the component has been cached and is ready immediately.
 
@@ -345,9 +345,9 @@ the component has been cached and is ready immediately.
 MyApplication::MyApplication()
 {
     // ...
-    component = new QmlComponent(engine, QUrl("http://www.example.com/main.qml"));
+    component = new QDeclarativeComponent(engine, QUrl("http://www.example.com/main.qml"));
     if (component->isLoading())
-        QObject::connect(component, SIGNAL(statusChanged(QmlComponent::Status)),
+        QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
                          this, SLOT(continueLoading()));
     else
         continueLoading();
@@ -381,7 +381,7 @@ For example:
 MyApplication::MyApplication()
 {
     // ...
-    component = new QmlComponent(engine, QUrl("qrc:/main.qml"));
+    component = new QDeclarativeComponent(engine, QUrl("qrc:/main.qml"));
     if (component->isError()) {
         qWarning() << component->errors();
     } else {
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index 343359c..ca1d596 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -61,7 +61,7 @@ QML provides direct access to the following concepts from Qt:
  \o QAction - the \l {QML Basic Types}{action} type
  \o QObject signals and slots - available as functions to call in JavaScript
  \o QObject properties - available as variables in JavaScript
- \o QWidget - QmlView is a QML-displaying widget
+ \o QWidget - QDeclarativeView is a QML-displaying widget
  \o Qt models - used directly in data binding (QAbstractItemModel and next generation QListModelInterface)
 \endlist
 
@@ -84,14 +84,14 @@ QML Items also serve these purposes. Each is considered separately below.
 
 \section2 Simple Widgets
 
-The most important rule to remember while implementing a new QmlGraphicsItem in C++
+The most important rule to remember while implementing a new QDeclarativeItem in C++
 is that it should not contain any look and feel policies - leave that to the
 QML usage of the item.
 
 As an example, imagine you wanted a reusable Button item. If you therefore
-decided to write a QmlGraphicsItem subclass to implement a button,
+decided to write a QDeclarativeItem subclass to implement a button,
 just as QToolButton subclasses QWidget for this purpose, following the rule above, your
-\c QmlGraphicsButton would not have any appearance - just the notions of enabled, triggering, etc.
+\c QDeclarativeButton would not have any appearance - just the notions of enabled, triggering, etc.
 
 But there is already an object in Qt that does this: QAction.
 
@@ -103,13 +103,13 @@ The look and feel of an action - the appearance of the button, the transition be
 and exactly how it respond to mouse, key, or touch input, should all be left for definition
 in QML.
 
-It is illustrative to note that QmlGraphicsTextEdit is built upon QTextControl,
-QmlGraphicsWebView is built upon QWebPage, and ListView uses QListModelInterface,
+It is illustrative to note that QDeclarativeTextEdit is built upon QTextControl,
+QDeclarativeWebView is built upon QWebPage, and ListView uses QListModelInterface,
 just as QTextEdit, QWebView, and QListView are built upon
 those same UI-agnostic components.
 
 The encapsulation of the look and feel that QWidgets gives is important, and for this
-the QML concept of \l {qmldocuments.html}{components} serves the same purpose. If you are building a complete
+the QML concept of \l {qdeclarativedocuments.html}{components} serves the same purpose. If you are building a complete
 suite of applications which should have a consistent look and feel, you should build
 a set of reusable components with the look and feel you desire.
 
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc
index f709335..218af89 100644
--- a/doc/src/declarative/scope.qdoc
+++ b/doc/src/declarative/scope.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-\page qmlscope.html
+\page qdeclarativescope.html
 \title QML Scope
 
 \tableofcontents
@@ -348,14 +348,14 @@ Item {
 }
 \endcode
 
-\section1 QmlContext chain
+\section1 QDeclarativeContext chain
 
-The \l QmlContext chain allows C++ applications to pass data into QML applications.  
-\l QmlComponent object instances created from C++ are passed a \l QmlContext in which they
-are created.  Variables defined in this context appear in the scope chain.  Each QmlContext 
-also defines a parent context.  Variables in child QmlContext's shadow those in its parent.
+The \l QDeclarativeContext chain allows C++ applications to pass data into QML applications.  
+\l QDeclarativeComponent object instances created from C++ are passed a \l QDeclarativeContext in which they
+are created.  Variables defined in this context appear in the scope chain.  Each QDeclarativeContext 
+also defines a parent context.  Variables in child QDeclarativeContext's shadow those in its parent.
 
-Consider the following QmlContext tree.
+Consider the following QDeclarativeContext tree.
 
 \image qml-context-tree.png
 
diff --git a/examples/declarative/extending/adding/main.cpp b/examples/declarative/extending/adding/main.cpp
index 0aeeecf..76e0736 100644
--- a/examples/declarative/extending/adding/main.cpp
+++ b/examples/declarative/extending/adding/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "person.h"
 
@@ -50,8 +50,8 @@ int main(int argc, char ** argv)
 
     QML_REGISTER_TYPE(People, 1,0, Person, Person);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     Person *person = qobject_cast<Person *>(component.create());
     if (person) {
         qWarning() << "The person's name is" << person->name();
diff --git a/examples/declarative/extending/adding/person.h b/examples/declarative/extending/adding/person.h
index 691766b..fbaf2df 100644
--- a/examples/declarative/extending/adding/person.h
+++ b/examples/declarative/extending/adding/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 // ![0]
-#include <qml.h>
+#include <qdeclarative.h>
 
 class Person : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/attached/birthdayparty.cpp b/examples/declarative/extending/attached/birthdayparty.cpp
index 293628e..d4f2675 100644
--- a/examples/declarative/extending/attached/birthdayparty.cpp
+++ b/examples/declarative/extending/attached/birthdayparty.cpp
@@ -70,9 +70,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/attached/birthdayparty.h b/examples/declarative/extending/attached/birthdayparty.h
index 9ba0f8b..d8ca2e1 100644
--- a/examples/declarative/extending/attached/birthdayparty.h
+++ b/examples/declarative/extending/attached/birthdayparty.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QDate>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -65,7 +65,7 @@ class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -73,7 +73,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/attached/main.cpp b/examples/declarative/extending/attached/main.cpp
index f4223a2..684d8d3 100644
--- a/examples/declarative/extending/attached/main.cpp
+++ b/examples/declarative/extending/attached/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -56,8 +56,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/attached/person.h b/examples/declarative/extending/attached/person.h
index dd03091..0f86d8b 100644
--- a/examples/declarative/extending/attached/person.h
+++ b/examples/declarative/extending/attached/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/binding/birthdayparty.cpp b/examples/declarative/extending/binding/birthdayparty.cpp
index 392c59a..e5be2b9 100644
--- a/examples/declarative/extending/binding/birthdayparty.cpp
+++ b/examples/declarative/extending/binding/birthdayparty.cpp
@@ -76,9 +76,9 @@ void BirthdayParty::setCelebrant(Person *c)
     emit celebrantChanged();
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/binding/birthdayparty.h b/examples/declarative/extending/binding/birthdayparty.h
index 8bdb76a..8486442 100644
--- a/examples/declarative/extending/binding/birthdayparty.h
+++ b/examples/declarative/extending/binding/birthdayparty.h
@@ -44,7 +44,7 @@
 #include <QObject>
 #include <QDate>
 #include <QDebug>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -71,7 +71,7 @@ Q_OBJECT
 // ![0]
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant NOTIFY celebrantChanged)
 // ![0]
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_PROPERTY(QString speaker READ speaker WRITE setSpeaker)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
@@ -80,7 +80,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/binding/happybirthday.cpp b/examples/declarative/extending/binding/happybirthday.cpp
index 704d384..7d4d021 100644
--- a/examples/declarative/extending/binding/happybirthday.cpp
+++ b/examples/declarative/extending/binding/happybirthday.cpp
@@ -50,7 +50,7 @@ HappyBirthday::HappyBirthday(QObject *parent)
     timer->start(1000);
 }
 
-void HappyBirthday::setTarget(const QmlMetaProperty &p)
+void HappyBirthday::setTarget(const QDeclarativeMetaProperty &p)
 {
     m_target = p;
 }
diff --git a/examples/declarative/extending/binding/happybirthday.h b/examples/declarative/extending/binding/happybirthday.h
index 852bec7..ee4d1ec 100644
--- a/examples/declarative/extending/binding/happybirthday.h
+++ b/examples/declarative/extending/binding/happybirthday.h
@@ -41,20 +41,20 @@
 #ifndef HAPPYBIRTHDAY_H
 #define HAPPYBIRTHDAY_H
 
-#include <QmlPropertyValueSource>
-#include <QmlMetaProperty>
-#include <qml.h>
+#include <QDeclarativePropertyValueSource>
+#include <QDeclarativeMetaProperty>
+#include <qdeclarative.h>
 
 #include <QStringList>
 
-class HappyBirthday : public QObject, public QmlPropertyValueSource
+class HappyBirthday : public QObject, public QDeclarativePropertyValueSource
 {
 Q_OBJECT
 Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 public:
     HappyBirthday(QObject *parent = 0);
 
-    virtual void setTarget(const QmlMetaProperty &);
+    virtual void setTarget(const QDeclarativeMetaProperty &);
 
     QString name() const;
     void setName(const QString &);
@@ -67,7 +67,7 @@ signals:
 private:
     int m_line;
     QStringList m_lyrics;
-    QmlMetaProperty m_target;
+    QDeclarativeMetaProperty m_target;
     QString m_name;
 };
 QML_DECLARE_TYPE(HappyBirthday);
diff --git a/examples/declarative/extending/binding/main.cpp b/examples/declarative/extending/binding/main.cpp
index ea0e33a..873f8c9 100644
--- a/examples/declarative/extending/binding/main.cpp
+++ b/examples/declarative/extending/binding/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "happybirthday.h"
@@ -58,8 +58,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/binding/person.h b/examples/declarative/extending/binding/person.h
index e8aa6a8..1bec71c 100644
--- a/examples/declarative/extending/binding/person.h
+++ b/examples/declarative/extending/binding/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/coercion/birthdayparty.cpp b/examples/declarative/extending/coercion/birthdayparty.cpp
index f0eb599..523a42d 100644
--- a/examples/declarative/extending/coercion/birthdayparty.cpp
+++ b/examples/declarative/extending/coercion/birthdayparty.cpp
@@ -55,9 +55,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/coercion/birthdayparty.h b/examples/declarative/extending/coercion/birthdayparty.h
index 5a9eb08..fffd407 100644
--- a/examples/declarative/extending/coercion/birthdayparty.h
+++ b/examples/declarative/extending/coercion/birthdayparty.h
@@ -42,7 +42,7 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayParty : public QObject
@@ -50,7 +50,7 @@ class BirthdayParty : public QObject
 Q_OBJECT
 // ![0]
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 // ![0]
 public:
     BirthdayParty(QObject *parent = 0);
@@ -58,7 +58,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/coercion/main.cpp b/examples/declarative/extending/coercion/main.cpp
index b1a203f..1e2209f 100644
--- a/examples/declarative/extending/coercion/main.cpp
+++ b/examples/declarative/extending/coercion/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -56,8 +56,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/coercion/person.h b/examples/declarative/extending/coercion/person.h
index 9bb9a3d..298ffb1 100644
--- a/examples/declarative/extending/coercion/person.h
+++ b/examples/declarative/extending/coercion/person.h
@@ -42,7 +42,7 @@
 #define PERSON_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class Person : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/default/birthdayparty.cpp b/examples/declarative/extending/default/birthdayparty.cpp
index f0eb599..523a42d 100644
--- a/examples/declarative/extending/default/birthdayparty.cpp
+++ b/examples/declarative/extending/default/birthdayparty.cpp
@@ -55,9 +55,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/default/birthdayparty.h b/examples/declarative/extending/default/birthdayparty.h
index f25f8c2..49c20bd 100644
--- a/examples/declarative/extending/default/birthdayparty.h
+++ b/examples/declarative/extending/default/birthdayparty.h
@@ -42,7 +42,7 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 // ![0]
@@ -50,7 +50,7 @@ class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -58,7 +58,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/default/main.cpp b/examples/declarative/extending/default/main.cpp
index ea51e00..7d7f8a1 100644
--- a/examples/declarative/extending/default/main.cpp
+++ b/examples/declarative/extending/default/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -54,8 +54,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/default/person.h b/examples/declarative/extending/default/person.h
index 884dda3..b3eceaa 100644
--- a/examples/declarative/extending/default/person.h
+++ b/examples/declarative/extending/default/person.h
@@ -42,7 +42,7 @@
 #define PERSON_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class Person : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/extended/lineedit.cpp b/examples/declarative/extending/extended/lineedit.cpp
index 0d8eb7f..417fbd9 100644
--- a/examples/declarative/extending/extended/lineedit.cpp
+++ b/examples/declarative/extending/extended/lineedit.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include "lineedit.h"
-#include <qml.h>
+#include <qdeclarative.h>
 
 LineEditExtension::LineEditExtension(QObject *object)
 : QObject(object), m_lineedit(static_cast<QLineEdit *>(object))
diff --git a/examples/declarative/extending/extended/main.cpp b/examples/declarative/extending/extended/main.cpp
index ad4bf50..5cbeea3 100644
--- a/examples/declarative/extending/extended/main.cpp
+++ b/examples/declarative/extending/extended/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include <QLineEdit>
 #include "lineedit.h"
@@ -51,8 +51,8 @@ int main(int argc, char ** argv)
 
     QML_REGISTER_EXTENDED_TYPE(People, 1,0, QLineEdit, QLineEdit, LineEditExtension);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     QLineEdit *edit = qobject_cast<QLineEdit *>(component.create());
 
     if (edit) {
diff --git a/examples/declarative/extending/grouped/birthdayparty.cpp b/examples/declarative/extending/grouped/birthdayparty.cpp
index f0eb599..523a42d 100644
--- a/examples/declarative/extending/grouped/birthdayparty.cpp
+++ b/examples/declarative/extending/grouped/birthdayparty.cpp
@@ -55,9 +55,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/grouped/birthdayparty.h b/examples/declarative/extending/grouped/birthdayparty.h
index fd0d955..42439c4 100644
--- a/examples/declarative/extending/grouped/birthdayparty.h
+++ b/examples/declarative/extending/grouped/birthdayparty.h
@@ -42,14 +42,14 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -57,7 +57,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/grouped/main.cpp b/examples/declarative/extending/grouped/main.cpp
index a8dafd9..15a0bb5 100644
--- a/examples/declarative/extending/grouped/main.cpp
+++ b/examples/declarative/extending/grouped/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -55,8 +55,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/grouped/person.h b/examples/declarative/extending/grouped/person.h
index 89ccedc..5dab378 100644
--- a/examples/declarative/extending/grouped/person.h
+++ b/examples/declarative/extending/grouped/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/properties/birthdayparty.cpp b/examples/declarative/extending/properties/birthdayparty.cpp
index 2fbdad9..14fd6a3 100644
--- a/examples/declarative/extending/properties/birthdayparty.cpp
+++ b/examples/declarative/extending/properties/birthdayparty.cpp
@@ -56,9 +56,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/properties/birthdayparty.h b/examples/declarative/extending/properties/birthdayparty.h
index e5d316c..c4cb536 100644
--- a/examples/declarative/extending/properties/birthdayparty.h
+++ b/examples/declarative/extending/properties/birthdayparty.h
@@ -42,7 +42,7 @@
 #define BIRTHDAYPARTY_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 // ![0]
@@ -54,7 +54,7 @@ Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
 // ![1]
 // ![2]
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 // ![2]
 // ![3]
 public:
@@ -63,7 +63,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/properties/main.cpp b/examples/declarative/extending/properties/main.cpp
index 2211b89..ce69ad2 100644
--- a/examples/declarative/extending/properties/main.cpp
+++ b/examples/declarative/extending/properties/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -52,8 +52,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
     QML_REGISTER_TYPE(People, 1,0, Person, Person);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/properties/person.h b/examples/declarative/extending/properties/person.h
index 8d665f0..860a607 100644
--- a/examples/declarative/extending/properties/person.h
+++ b/examples/declarative/extending/properties/person.h
@@ -42,7 +42,7 @@
 #define PERSON_H
 
 #include <QObject>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class Person : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/signal/birthdayparty.cpp b/examples/declarative/extending/signal/birthdayparty.cpp
index d57e075..65ff530 100644
--- a/examples/declarative/extending/signal/birthdayparty.cpp
+++ b/examples/declarative/extending/signal/birthdayparty.cpp
@@ -71,9 +71,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/signal/birthdayparty.h b/examples/declarative/extending/signal/birthdayparty.h
index 30ed43b..bcdc513 100644
--- a/examples/declarative/extending/signal/birthdayparty.h
+++ b/examples/declarative/extending/signal/birthdayparty.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QDate>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -65,7 +65,7 @@ class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -73,7 +73,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/signal/main.cpp b/examples/declarative/extending/signal/main.cpp
index 9d8e253..afc1a66 100644
--- a/examples/declarative/extending/signal/main.cpp
+++ b/examples/declarative/extending/signal/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "person.h"
@@ -56,8 +56,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/signal/person.h b/examples/declarative/extending/signal/person.h
index dd03091..0f86d8b 100644
--- a/examples/declarative/extending/signal/person.h
+++ b/examples/declarative/extending/signal/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/extending/valuesource/birthdayparty.cpp b/examples/declarative/extending/valuesource/birthdayparty.cpp
index 5b3fec1..99d98be 100644
--- a/examples/declarative/extending/valuesource/birthdayparty.cpp
+++ b/examples/declarative/extending/valuesource/birthdayparty.cpp
@@ -71,9 +71,9 @@ void BirthdayParty::setCelebrant(Person *c)
     m_celebrant = c;
 }
 
-QmlListProperty<Person> BirthdayParty::guests() 
+QDeclarativeListProperty<Person> BirthdayParty::guests() 
 {
-    return QmlListProperty<Person>(this, m_guests);
+    return QDeclarativeListProperty<Person>(this, m_guests);
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/declarative/extending/valuesource/birthdayparty.h b/examples/declarative/extending/valuesource/birthdayparty.h
index b5a0522..819a200 100644
--- a/examples/declarative/extending/valuesource/birthdayparty.h
+++ b/examples/declarative/extending/valuesource/birthdayparty.h
@@ -44,7 +44,7 @@
 #include <QObject>
 #include <QDate>
 #include <QDebug>
-#include <qml.h>
+#include <qdeclarative.h>
 #include "person.h"
 
 class BirthdayPartyAttached : public QObject
@@ -66,7 +66,7 @@ class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlListProperty<Person> guests READ guests)
+Q_PROPERTY(QDeclarativeListProperty<Person> guests READ guests)
 // ![0]
 Q_PROPERTY(QString speaker READ speaker WRITE setSpeaker)
 // ![0]
@@ -77,7 +77,7 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlListProperty<Person> guests();
+    QDeclarativeListProperty<Person> guests();
     int guestCount() const;
     Person *guest(int) const;
 
diff --git a/examples/declarative/extending/valuesource/happybirthday.cpp b/examples/declarative/extending/valuesource/happybirthday.cpp
index 306ec98..7b9d05a 100644
--- a/examples/declarative/extending/valuesource/happybirthday.cpp
+++ b/examples/declarative/extending/valuesource/happybirthday.cpp
@@ -50,7 +50,7 @@ HappyBirthday::HappyBirthday(QObject *parent)
     timer->start(1000);
 }
 
-void HappyBirthday::setTarget(const QmlMetaProperty &p)
+void HappyBirthday::setTarget(const QDeclarativeMetaProperty &p)
 {
     m_target = p;
 }
diff --git a/examples/declarative/extending/valuesource/happybirthday.h b/examples/declarative/extending/valuesource/happybirthday.h
index c02a7d7..44f55e4 100644
--- a/examples/declarative/extending/valuesource/happybirthday.h
+++ b/examples/declarative/extending/valuesource/happybirthday.h
@@ -41,13 +41,13 @@
 #ifndef HAPPYBIRTHDAY_H
 #define HAPPYBIRTHDAY_H
 
-#include <QmlPropertyValueSource>
-#include <qml.h>
+#include <QDeclarativePropertyValueSource>
+#include <qdeclarative.h>
 
 #include <QStringList>
 
 // ![0]
-class HappyBirthday : public QObject, public QmlPropertyValueSource
+class HappyBirthday : public QObject, public QDeclarativePropertyValueSource
 {
 Q_OBJECT
 // ![0]
@@ -56,7 +56,7 @@ Q_PROPERTY(QString name READ name WRITE setName)
 public:
     HappyBirthday(QObject *parent = 0);
 
-    virtual void setTarget(const QmlMetaProperty &);
+    virtual void setTarget(const QDeclarativeMetaProperty &);
 // ![1]
 
     QString name() const;
@@ -68,7 +68,7 @@ private slots:
 private:
     int m_line;
     QStringList m_lyrics;
-    QmlMetaProperty m_target;
+    QDeclarativeMetaProperty m_target;
     QString m_name;
 // ![2]
 };
diff --git a/examples/declarative/extending/valuesource/main.cpp b/examples/declarative/extending/valuesource/main.cpp
index ea0e33a..873f8c9 100644
--- a/examples/declarative/extending/valuesource/main.cpp
+++ b/examples/declarative/extending/valuesource/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QCoreApplication>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include "birthdayparty.h"
 #include "happybirthday.h"
@@ -58,8 +58,8 @@ int main(int argc, char ** argv)
     QML_REGISTER_TYPE(People, 1,0, Boy, Boy);
     QML_REGISTER_TYPE(People, 1,0, Girl, Girl);
 
-    QmlEngine engine;
-    QmlComponent component(&engine, ":example.qml");
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/valuesource/person.h b/examples/declarative/extending/valuesource/person.h
index dd03091..0f86d8b 100644
--- a/examples/declarative/extending/valuesource/person.h
+++ b/examples/declarative/extending/valuesource/person.h
@@ -43,7 +43,7 @@
 
 #include <QObject>
 #include <QColor>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class ShoeDescription : public QObject {
 Q_OBJECT
diff --git a/examples/declarative/imageprovider/main.cpp b/examples/declarative/imageprovider/main.cpp
index eaaded2..d9d4c1a 100644
--- a/examples/declarative/imageprovider/main.cpp
+++ b/examples/declarative/imageprovider/main.cpp
@@ -41,22 +41,22 @@
 
 #include <QApplication>
 
-#include <qmlengine.h>
-#include <qmlcontext.h>
-#include <qml.h>
-#include <qmlgraphicsitem.h>
-#include <qmlimageprovider.h>
-#include <qmlview.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarative.h>
+#include <qdeclarativeitem.h>
+#include <qdeclarativeimageprovider.h>
+#include <qdeclarativeview.h>
 #include <QImage>
 #include <QPainter>
 
 /*
-   This example illustrates using a QmlImageProvider to serve
+   This example illustrates using a QDeclarativeImageProvider to serve
    images asynchronously.
 */
 
 //![0]
-class ColorImageProvider : public QmlImageProvider
+class ColorImageProvider : public QDeclarativeImageProvider
 {
 public:
     // This is run in a low priority thread.
@@ -74,7 +74,7 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
-    QmlView view;
+    QDeclarativeView view;
 
     view.engine()->addImageProvider("colors", new ColorImageProvider);
 
@@ -87,7 +87,7 @@ int main(int argc, char ** argv)
     dataList.append("image://colors/purple");
     dataList.append("image://colors/yellow");
 
-    QmlContext *ctxt = view.rootContext();
+    QDeclarativeContext *ctxt = view.rootContext();
     ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 
     view.setSource(QUrl("qrc:view.qml"));
diff --git a/examples/declarative/objectlistmodel/main.cpp b/examples/declarative/objectlistmodel/main.cpp
index 7ea742b..b210570 100644
--- a/examples/declarative/objectlistmodel/main.cpp
+++ b/examples/declarative/objectlistmodel/main.cpp
@@ -41,11 +41,11 @@
 
 #include <QApplication>
 
-#include <qmlengine.h>
-#include <qmlcontext.h>
-#include <qml.h>
-#include <qmlgraphicsitem.h>
-#include <qmlview.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarative.h>
+#include <qdeclarativeitem.h>
+#include <qdeclarativeview.h>
 
 #include "dataobject.h"
 
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
-    QmlView view;
+    QDeclarativeView view;
 
     QList<QObject*> dataList;
     dataList.append(new DataObject("Item 1", "red"));
@@ -66,7 +66,7 @@ int main(int argc, char ** argv)
     dataList.append(new DataObject("Item 3", "blue"));
     dataList.append(new DataObject("Item 4", "yellow"));
 
-    QmlContext *ctxt = view.rootContext();
+    QDeclarativeContext *ctxt = view.rootContext();
     ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 
     view.setSource(QUrl("qrc:view.qml"));
diff --git a/examples/declarative/plugins/plugin.cpp b/examples/declarative/plugins/plugin.cpp
index 8e21263..f6385d0 100644
--- a/examples/declarative/plugins/plugin.cpp
+++ b/examples/declarative/plugins/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/QmlExtensionPlugin>
-#include <QtDeclarative/qml.h>
+#include <QtDeclarative/QDeclarativeExtensionPlugin>
+#include <QtDeclarative/qdeclarative.h>
 #include <qdebug.h>
 #include <qdatetime.h>
 #include <qbasictimer.h>
@@ -140,11 +140,11 @@ MinuteTimer *Time::timer=0;
 QML_DECLARE_TYPE(Time);
 
 
-class QExampleQmlPlugin : public QmlExtensionPlugin
+class QExampleQmlPlugin : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
-    void initialize(QmlEngine *engine, const char *uri)
+    void initialize(QDeclarativeEngine *engine, const char *uri)
     {
         Q_UNUSED(engine);
         Q_ASSERT(uri == QLatin1String("com.nokia.TimeExample"));
diff --git a/examples/declarative/plugins/plugins.pro b/examples/declarative/plugins/plugins.pro
index c9c9f7e..c925cea 100644
--- a/examples/declarative/plugins/plugins.pro
+++ b/examples/declarative/plugins/plugins.pro
@@ -7,21 +7,21 @@ VERSION = 1.0.0
 
 SOURCES += plugin.cpp
 
-qmlsources.files += \
-    com/nokia/TimeExample/qmldir \
+qdeclarativesources.files += \
+    com/nokia/TimeExample/qdeclarativedir \
     com/nokia/TimeExample/center.png \
     com/nokia/TimeExample/clock.png \
     com/nokia/TimeExample/Clock.qml \
     com/nokia/TimeExample/hour.png \
     com/nokia/TimeExample/minute.png
 
-qmlsources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
+qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
 
 sources.files += plugins.pro plugin.cpp plugins.qml
 sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
 
 target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
 
-INSTALLS += qmlsources sources target
+INSTALLS += qdeclarativesources sources target
 
 symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
diff --git a/examples/declarative/sql/hello.qml b/examples/declarative/sql/hello.qml
index 96e0675..277dfeb 100644
--- a/examples/declarative/sql/hello.qml
+++ b/examples/declarative/sql/hello.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 Text {
     Script {
         function findGreetings() {
-            var db = openDatabaseSync("QmlExampleDB", "1.0", "The Example QML SQL!", 1000000);
+            var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000);
 
             db.transaction(
                 function(tx) {
diff --git a/examples/declarative/webview/qdeclarative-in-html.qml b/examples/declarative/webview/qdeclarative-in-html.qml
new file mode 100644
index 0000000..a2f2f2a
--- /dev/null
+++ b/examples/declarative/webview/qdeclarative-in-html.qml
@@ -0,0 +1,32 @@
+import Qt 4.6
+
+// The WebView supports QML data through the HTML OBJECT tag
+Rectangle {
+    color:"blue"
+    Flickable {
+        width: parent.width
+        height: parent.height/2
+        viewportWidth: web.width*web.scale
+        viewportHeight: web.height*web.scale
+        WebView {
+            id: web
+            width: 250
+            height: 420
+            zoomFactor: 0.75
+            smoothCache: true
+            settings.pluginsEnabled: true
+            html: "<html>\
+                <body bgcolor=white>\
+                    These are QML plugins, shown in a QML WebView via HTML OBJECT tags, all scaled to 75%\
+                    and placed in a Flickable area...\
+                    <table border=1>\
+                        <tr><th>Duration <th>Color <th>Plugin\
+                        <tr><td>500      <td>red   <td><OBJECT data=content/SpinSquare.qml TYPE=application/x-qt-plugin width=100 height=100 period=500 color=red />\
+                        <tr><td>2000     <td>blue  <td><OBJECT data=content/SpinSquare.qml TYPE=application/x-qt-plugin width=100 height=100 period=2000 color=blue />\
+                        <tr><td>1000     <td>green <td><OBJECT data=content/SpinSquare.qml TYPE=application/x-qt-plugin width=100 height=100 period=1000 color=green />\
+                    </table>\
+                </body>\
+                </html>"
+        }
+    }
+}
diff --git a/examples/declarative/webview/qml-in-html.qml b/examples/declarative/webview/qml-in-html.qml
deleted file mode 100644
index a2f2f2a..0000000
--- a/examples/declarative/webview/qml-in-html.qml
+++ /dev/null
@@ -1,32 +0,0 @@
-import Qt 4.6
-
-// The WebView supports QML data through the HTML OBJECT tag
-Rectangle {
-    color:"blue"
-    Flickable {
-        width: parent.width
-        height: parent.height/2
-        viewportWidth: web.width*web.scale
-        viewportHeight: web.height*web.scale
-        WebView {
-            id: web
-            width: 250
-            height: 420
-            zoomFactor: 0.75
-            smoothCache: true
-            settings.pluginsEnabled: true
-            html: "<html>\
-                <body bgcolor=white>\
-                    These are QML plugins, shown in a QML WebView via HTML OBJECT tags, all scaled to 75%\
-                    and placed in a Flickable area...\
-                    <table border=1>\
-                        <tr><th>Duration <th>Color <th>Plugin\
-                        <tr><td>500      <td>red   <td><OBJECT data=content/SpinSquare.qml TYPE=application/x-qt-plugin width=100 height=100 period=500 color=red />\
-                        <tr><td>2000     <td>blue  <td><OBJECT data=content/SpinSquare.qml TYPE=application/x-qt-plugin width=100 height=100 period=2000 color=blue />\
-                        <tr><td>1000     <td>green <td><OBJECT data=content/SpinSquare.qml TYPE=application/x-qt-plugin width=100 height=100 period=1000 color=green />\
-                    </table>\
-                </body>\
-                </html>"
-        }
-    }
-}
diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp
index 939e985..50714ce 100644
--- a/src/declarative/3rdparty/qlistmodelinterface.cpp
+++ b/src/declarative/3rdparty/qlistmodelinterface.cpp
@@ -46,11 +46,11 @@ QT_BEGIN_NAMESPACE
 /*!
   \internal
   \class QListModelInterface
-  \brief The QListModelInterface class can be subclassed to provide C++ models to QmlGraphics Views
+  \brief The QListModelInterface class can be subclassed to provide C++ models to QDeclarativeGraphics Views
 
   This class is comprised primarily of pure virtual functions which
   you must implement in a subclass. You can then use the subclass
-  as a model for a QmlGraphics view, such as a QmlGraphicsListView.
+  as a model for a QDeclarativeGraphics view, such as a QDeclarativeListView.
 */
 
 /*! \fn QListModelInterface::QListModelInterface(QObject *parent)
diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri
index 261b2ff..dedea55 100644
--- a/src/declarative/debugger/debugger.pri
+++ b/src/declarative/debugger/debugger.pri
@@ -1,15 +1,15 @@
 INCLUDEPATH += $$PWD
 
 SOURCES += \
-    $$PWD/qmldebuggerstatus.cpp \
+    $$PWD/qdeclarativedebuggerstatus.cpp \
     $$PWD/qpacketprotocol.cpp \
-    $$PWD/qmldebugservice.cpp \
-    $$PWD/qmldebugclient.cpp \
-    $$PWD/qmldebug.cpp
+    $$PWD/qdeclarativedebugservice.cpp \
+    $$PWD/qdeclarativedebugclient.cpp \
+    $$PWD/qdeclarativedebug.cpp
 
 HEADERS += \
-    $$PWD/qmldebuggerstatus_p.h \
+    $$PWD/qdeclarativedebuggerstatus_p.h \
     $$PWD/qpacketprotocol_p.h \
-    $$PWD/qmldebugservice_p.h \
-    $$PWD/qmldebugclient_p.h \
-    $$PWD/qmldebug_p.h
+    $$PWD/qdeclarativedebugservice_p.h \
+    $$PWD/qdeclarativedebugclient_p.h \
+    $$PWD/qdeclarativedebug_p.h
diff --git a/src/declarative/debugger/qdeclarativedebug.cpp b/src/declarative/debugger/qdeclarativedebug.cpp
new file mode 100644
index 0000000..e4b7d4d
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebug.cpp
@@ -0,0 +1,937 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativedebug_p.h"
+
+#include "qdeclarativedebugclient_p.h"
+
+#include <qdeclarativeenginedebug_p.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngineDebugClient : public QDeclarativeDebugClient
+{
+public:
+    QDeclarativeEngineDebugClient(QDeclarativeDebugConnection *client, QDeclarativeEngineDebugPrivate *p);
+
+protected:
+    virtual void messageReceived(const QByteArray &);
+
+private:
+    QDeclarativeEngineDebugPrivate *priv;
+};
+
+class QDeclarativeEngineDebugPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeEngineDebug)
+public:
+    QDeclarativeEngineDebugPrivate(QDeclarativeDebugConnection *);
+
+    void message(const QByteArray &);
+
+    QDeclarativeEngineDebugClient *client;
+    int nextId;
+    int getId();
+
+    void decode(QDataStream &, QDeclarativeDebugContextReference &);
+    void decode(QDataStream &, QDeclarativeDebugObjectReference &, bool simple);
+
+    static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugEnginesQuery *);
+    static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugRootContextQuery *);
+    static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugObjectQuery *);
+    static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugExpressionQuery *);
+
+    QHash<int, QDeclarativeDebugEnginesQuery *> enginesQuery;
+    QHash<int, QDeclarativeDebugRootContextQuery *> rootContextQuery;
+    QHash<int, QDeclarativeDebugObjectQuery *> objectQuery;
+    QHash<int, QDeclarativeDebugExpressionQuery *> expressionQuery;
+
+    QHash<int, QDeclarativeDebugWatch *> watched;
+};
+
+QDeclarativeEngineDebugClient::QDeclarativeEngineDebugClient(QDeclarativeDebugConnection *client,
+                                           QDeclarativeEngineDebugPrivate *p)
+: QDeclarativeDebugClient(QLatin1String("QDeclarativeEngine"), client), priv(p)
+{
+    setEnabled(true);
+}
+
+void QDeclarativeEngineDebugClient::messageReceived(const QByteArray &data)
+{
+    priv->message(data);
+}
+
+QDeclarativeEngineDebugPrivate::QDeclarativeEngineDebugPrivate(QDeclarativeDebugConnection *c)
+: client(new QDeclarativeEngineDebugClient(c, this)), nextId(0)
+{
+}
+
+int QDeclarativeEngineDebugPrivate::getId()
+{
+    return nextId++;
+}
+
+void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclarativeDebugEnginesQuery *q)
+{
+    if (c && q) {
+        QDeclarativeEngineDebugPrivate *p = (QDeclarativeEngineDebugPrivate *)QObjectPrivate::get(c);
+        p->enginesQuery.remove(q->m_queryId);
+    }
+}
+
+void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, 
+                                   QDeclarativeDebugRootContextQuery *q)
+{
+    if (c && q) {
+        QDeclarativeEngineDebugPrivate *p = (QDeclarativeEngineDebugPrivate *)QObjectPrivate::get(c);
+        p->rootContextQuery.remove(q->m_queryId);
+    }
+}
+
+void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclarativeDebugObjectQuery *q)
+{
+    if (c && q) {
+        QDeclarativeEngineDebugPrivate *p = (QDeclarativeEngineDebugPrivate *)QObjectPrivate::get(c);
+        p->objectQuery.remove(q->m_queryId);
+    }
+}
+
+void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclarativeDebugExpressionQuery *q)
+{
+    if (c && q) {
+        QDeclarativeEngineDebugPrivate *p = (QDeclarativeEngineDebugPrivate *)QObjectPrivate::get(c);
+        p->expressionQuery.remove(q->m_queryId);
+    }
+}
+
+void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugObjectReference &o,
+                                   bool simple)
+{
+    QDeclarativeEngineDebugServer::QDeclarativeObjectData data;
+    ds >> data;
+    o.m_debugId = data.objectId;
+    o.m_class = data.objectType;
+    o.m_name = data.objectName;
+    o.m_source.m_url = data.url;
+    o.m_source.m_lineNumber = data.lineNumber;
+    o.m_source.m_columnNumber = data.columnNumber;
+    o.m_contextDebugId = data.contextId;
+
+    if (simple)
+        return;
+
+    int childCount;
+    bool recur;
+    ds >> childCount >> recur;
+
+    for (int ii = 0; ii < childCount; ++ii) {
+        o.m_children.append(QDeclarativeDebugObjectReference());
+        decode(ds, o.m_children.last(), !recur);
+    }
+
+    int propCount;
+    ds >> propCount;
+
+    for (int ii = 0; ii < propCount; ++ii) {
+        QDeclarativeEngineDebugServer::QDeclarativeObjectProperty data;
+        ds >> data;
+        QDeclarativeDebugPropertyReference prop;
+        prop.m_objectDebugId = o.m_debugId;
+        prop.m_name = data.name;
+        prop.m_binding = data.binding;
+        prop.m_hasNotifySignal = data.hasNotifySignal;
+        prop.m_valueTypeName = data.valueTypeName;
+        switch (data.type) {
+            case QDeclarativeEngineDebugServer::QDeclarativeObjectProperty::Basic:
+            case QDeclarativeEngineDebugServer::QDeclarativeObjectProperty::List:
+            case QDeclarativeEngineDebugServer::QDeclarativeObjectProperty::SignalProperty:
+            {
+                prop.m_value = data.value;
+                break;
+            }
+            case QDeclarativeEngineDebugServer::QDeclarativeObjectProperty::Object:
+            {
+                QDeclarativeDebugObjectReference obj;
+                obj.m_debugId = prop.m_value.toInt();
+                prop.m_value = qVariantFromValue(obj);
+                break;
+            }
+            case QDeclarativeEngineDebugServer::QDeclarativeObjectProperty::Unknown:
+                break;
+        }
+        o.m_properties << prop;
+    }
+}
+
+void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugContextReference &c)
+{
+    ds >> c.m_name >> c.m_debugId;
+
+    int contextCount;
+    ds >> contextCount;
+
+    for (int ii = 0; ii < contextCount; ++ii) {
+        c.m_contexts.append(QDeclarativeDebugContextReference());
+        decode(ds, c.m_contexts.last());
+    }
+
+    int objectCount;
+    ds >> objectCount;
+
+    for (int ii = 0; ii < objectCount; ++ii) {
+        QDeclarativeDebugObjectReference obj;
+        decode(ds, obj, true);
+
+        obj.m_contextDebugId = c.m_debugId;
+        c.m_objects << obj;
+    }
+}
+
+void QDeclarativeEngineDebugPrivate::message(const QByteArray &data)
+{
+    QDataStream ds(data);
+
+    QByteArray type;
+    ds >> type;
+
+    //qDebug() << "QDeclarativeEngineDebugPrivate::message()" << type;
+
+    if (type == "LIST_ENGINES_R") {
+        int queryId;
+        ds >> queryId;
+
+        QDeclarativeDebugEnginesQuery *query = enginesQuery.value(queryId);
+        if (!query)
+            return;
+        enginesQuery.remove(queryId);
+
+        int count;
+        ds >> count;
+
+        for (int ii = 0; ii < count; ++ii) {
+            QDeclarativeDebugEngineReference ref;
+            ds >> ref.m_name;
+            ds >> ref.m_debugId;
+            query->m_engines << ref;
+        }
+
+        query->m_client = 0;
+        query->setState(QDeclarativeDebugQuery::Completed);
+    } else if (type == "LIST_OBJECTS_R") {
+        int queryId;
+        ds >> queryId;
+
+        QDeclarativeDebugRootContextQuery *query = rootContextQuery.value(queryId);
+        if (!query)
+            return;
+        rootContextQuery.remove(queryId);
+
+        if (!ds.atEnd()) 
+            decode(ds, query->m_context);
+
+        query->m_client = 0;
+        query->setState(QDeclarativeDebugQuery::Completed);
+    } else if (type == "FETCH_OBJECT_R") {
+        int queryId;
+        ds >> queryId;
+
+        QDeclarativeDebugObjectQuery *query = objectQuery.value(queryId);
+        if (!query)
+            return;
+        objectQuery.remove(queryId);
+
+        if (!ds.atEnd())
+            decode(ds, query->m_object, false);
+
+        query->m_client = 0;
+        query->setState(QDeclarativeDebugQuery::Completed);
+    } else if (type == "EVAL_EXPRESSION_R") {
+        int queryId;
+        QVariant result;
+        ds >> queryId >> result;
+
+        QDeclarativeDebugExpressionQuery *query = expressionQuery.value(queryId);
+        if (!query)
+            return;
+        expressionQuery.remove(queryId);
+
+        query->m_result = result;
+        query->m_client = 0;
+        query->setState(QDeclarativeDebugQuery::Completed);
+    } else if (type == "WATCH_PROPERTY_R") {
+        int queryId;
+        bool ok;
+        ds >> queryId >> ok;
+
+        QDeclarativeDebugWatch *watch = watched.value(queryId);
+        if (!watch)
+            return;
+
+        watch->setState(ok ? QDeclarativeDebugWatch::Active : QDeclarativeDebugWatch::Inactive);
+    } else if (type == "WATCH_OBJECT_R") {
+        int queryId;
+        bool ok;
+        ds >> queryId >> ok;
+
+        QDeclarativeDebugWatch *watch = watched.value(queryId);
+        if (!watch)
+            return;
+
+        watch->setState(ok ? QDeclarativeDebugWatch::Active : QDeclarativeDebugWatch::Inactive);
+    } else if (type == "WATCH_EXPR_OBJECT_R") {
+        int queryId;
+        bool ok;
+        ds >> queryId >> ok;
+
+        QDeclarativeDebugWatch *watch = watched.value(queryId);
+        if (!watch)
+            return;
+
+        watch->setState(ok ? QDeclarativeDebugWatch::Active : QDeclarativeDebugWatch::Inactive);
+    } else if (type == "UPDATE_WATCH") {
+        int queryId;
+        int debugId;
+        QByteArray name;
+        QVariant value;
+        ds >> queryId >> debugId >> name >> value;
+
+        QDeclarativeDebugWatch *watch = watched.value(queryId, 0);
+        if (!watch)
+            return;
+        emit watch->valueChanged(name, value);
+    }
+}
+
+QDeclarativeEngineDebug::QDeclarativeEngineDebug(QDeclarativeDebugConnection *client, QObject *parent)
+: QObject(*(new QDeclarativeEngineDebugPrivate(client)), parent)
+{
+}
+
+QDeclarativeDebugPropertyWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugPropertyReference &property, QObject *parent)
+{
+    Q_D(QDeclarativeEngineDebug);
+
+    QDeclarativeDebugPropertyWatch *watch = new QDeclarativeDebugPropertyWatch(parent);
+    if (d->client->isConnected()) {
+        int queryId = d->getId();
+        watch->m_queryId = queryId;
+        watch->m_client = this;
+        watch->m_objectDebugId = property.objectDebugId();
+        watch->m_name = property.name();
+        d->watched.insert(queryId, watch);
+
+        QByteArray message;
+        QDataStream ds(&message, QIODevice::WriteOnly);
+        ds << QByteArray("WATCH_PROPERTY") << queryId << property.objectDebugId() << property.name().toUtf8();
+        d->client->sendMessage(message);
+    } else {
+        watch->m_state = QDeclarativeDebugWatch::Dead;
+    }
+
+    return watch;
+}
+
+QDeclarativeDebugWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugContextReference &, const QString &, QObject *)
+{
+    qWarning("QDeclarativeEngineDebug::addWatch(): Not implemented");
+    return 0;
+}
+
+QDeclarativeDebugObjectExpressionWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugObjectReference &object, const QString &expr, QObject *parent)
+{
+    Q_D(QDeclarativeEngineDebug);
+    QDeclarativeDebugObjectExpressionWatch *watch = new QDeclarativeDebugObjectExpressionWatch(parent);
+    if (d->client->isConnected()) {
+        int queryId = d->getId();
+        watch->m_queryId = queryId;
+        watch->m_client = this;
+        watch->m_objectDebugId = object.debugId();
+        watch->m_expr = expr;
+        d->watched.insert(queryId, watch);
+
+        QByteArray message;
+        QDataStream ds(&message, QIODevice::WriteOnly);
+        ds << QByteArray("WATCH_EXPR_OBJECT") << queryId << object.debugId() << expr;
+        d->client->sendMessage(message);
+    } else {
+        watch->m_state = QDeclarativeDebugWatch::Dead;
+    }
+    return watch;
+}
+
+QDeclarativeDebugWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugObjectReference &object, QObject *parent)
+{
+    Q_D(QDeclarativeEngineDebug);
+
+    QDeclarativeDebugWatch *watch = new QDeclarativeDebugWatch(parent);
+    if (d->client->isConnected()) {
+        int queryId = d->getId();
+        watch->m_queryId = queryId;
+        watch->m_client = this;
+        watch->m_objectDebugId = object.debugId();
+        d->watched.insert(queryId, watch);
+
+        QByteArray message;
+        QDataStream ds(&message, QIODevice::WriteOnly);
+        ds << QByteArray("WATCH_OBJECT") << queryId << object.debugId();
+        d->client->sendMessage(message);
+    } else {
+        watch->m_state = QDeclarativeDebugWatch::Dead;
+    }
+
+    return watch;
+}
+
+QDeclarativeDebugWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugFileReference &, QObject *)
+{
+    qWarning("QDeclarativeEngineDebug::addWatch(): Not implemented");
+    return 0;
+}
+
+void QDeclarativeEngineDebug::removeWatch(QDeclarativeDebugWatch *watch)
+{
+    Q_D(QDeclarativeEngineDebug);
+
+    if (!watch || !watch->m_client)
+        return;
+
+    watch->m_client = 0;
+    watch->setState(QDeclarativeDebugWatch::Inactive);
+    
+    d->watched.remove(watch->queryId());
+
+    if (d->client && d->client->isConnected()) {
+        QByteArray message;
+        QDataStream ds(&message, QIODevice::WriteOnly);
+        ds << QByteArray("NO_WATCH") << watch->queryId();
+        d->client->sendMessage(message);
+    }
+}
+
+QDeclarativeDebugEnginesQuery *QDeclarativeEngineDebug::queryAvailableEngines(QObject *parent)
+{
+    Q_D(QDeclarativeEngineDebug);
+
+    QDeclarativeDebugEnginesQuery *query = new QDeclarativeDebugEnginesQuery(parent);
+    if (d->client->isConnected()) {
+        query->m_client = this;
+        int queryId = d->getId();
+        query->m_queryId = queryId;
+        d->enginesQuery.insert(queryId, query);
+
+        QByteArray message;
+        QDataStream ds(&message, QIODevice::WriteOnly);
+        ds << QByteArray("LIST_ENGINES") << queryId;
+        d->client->sendMessage(message);
+    } else {
+        query->m_state = QDeclarativeDebugQuery::Error;
+    }
+
+    return query;
+}
+
+QDeclarativeDebugRootContextQuery *QDeclarativeEngineDebug::queryRootContexts(const QDeclarativeDebugEngineReference &engine, QObject *parent)
+{
+    Q_D(QDeclarativeEngineDebug);
+
+    QDeclarativeDebugRootContextQuery *query = new QDeclarativeDebugRootContextQuery(parent);
+    if (d->client->isConnected() && engine.debugId() != -1) {
+        query->m_client = this;
+        int queryId = d->getId();
+        query->m_queryId = queryId;
+        d->rootContextQuery.insert(queryId, query);
+
+        QByteArray message;
+        QDataStream ds(&message, QIODevice::WriteOnly);
+        ds << QByteArray("LIST_OBJECTS") << queryId << engine.debugId();
+        d->client->sendMessage(message);
+    } else {
+        query->m_state = QDeclarativeDebugQuery::Error;
+    }
+
+    return query;
+}
+
+QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObject(const QDeclarativeDebugObjectReference &object, QObject *parent)
+{
+    Q_D(QDeclarativeEngineDebug);
+
+    QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
+    if (d->client->isConnected() && object.debugId() != -1) {
+        query->m_client = this;
+        int queryId = d->getId();
+        query->m_queryId = queryId;
+        d->objectQuery.insert(queryId, query);
+
+        QByteArray message;
+        QDataStream ds(&message, QIODevice::WriteOnly);
+        ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() 
+           << false;
+        d->client->sendMessage(message);
+    } else {
+        query->m_state = QDeclarativeDebugQuery::Error;
+    }
+
+    return query;
+}
+
+QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObjectRecursive(const QDeclarativeDebugObjectReference &object, QObject *parent)
+{
+    Q_D(QDeclarativeEngineDebug);
+
+    QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
+    if (d->client->isConnected() && object.debugId() != -1) {
+        query->m_client = this;
+        int queryId = d->getId();
+        query->m_queryId = queryId;
+        d->objectQuery.insert(queryId, query);
+
+        QByteArray message;
+        QDataStream ds(&message, QIODevice::WriteOnly);
+        ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() 
+           << true;
+        d->client->sendMessage(message);
+    } else {
+        query->m_state = QDeclarativeDebugQuery::Error;
+    }
+
+    return query;
+}
+
+QDeclarativeDebugExpressionQuery *QDeclarativeEngineDebug::queryExpressionResult(int objectDebugId, const QString &expr, QObject *parent)
+{
+    Q_D(QDeclarativeEngineDebug);
+
+    QDeclarativeDebugExpressionQuery *query = new QDeclarativeDebugExpressionQuery(parent);
+    if (d->client->isConnected() && objectDebugId != -1) {
+        query->m_client = this;
+        query->m_expr = expr;
+        int queryId = d->getId();
+        query->m_queryId = queryId;
+        d->expressionQuery.insert(queryId, query);
+
+        QByteArray message;
+        QDataStream ds(&message, QIODevice::WriteOnly);
+        ds << QByteArray("EVAL_EXPRESSION") << queryId << objectDebugId << expr;
+        d->client->sendMessage(message);
+    } else {
+        query->m_state = QDeclarativeDebugQuery::Error;
+    }
+
+    return query;
+}
+
+QDeclarativeDebugWatch::QDeclarativeDebugWatch(QObject *parent)
+: QObject(parent), m_state(Waiting), m_queryId(-1), m_client(0), m_objectDebugId(-1)
+{
+}
+
+QDeclarativeDebugWatch::~QDeclarativeDebugWatch()
+{
+}
+
+int QDeclarativeDebugWatch::queryId() const
+{
+    return m_queryId;
+}
+
+int QDeclarativeDebugWatch::objectDebugId() const
+{
+    return m_objectDebugId;
+}
+
+QDeclarativeDebugWatch::State QDeclarativeDebugWatch::state() const
+{
+    return m_state;
+}
+
+void QDeclarativeDebugWatch::setState(State s)
+{
+    if (m_state == s)
+        return;
+    m_state = s;
+    emit stateChanged(m_state);
+}
+
+QDeclarativeDebugPropertyWatch::QDeclarativeDebugPropertyWatch(QObject *parent)
+    : QDeclarativeDebugWatch(parent)
+{
+}
+
+QString QDeclarativeDebugPropertyWatch::name() const
+{
+    return m_name;
+}
+
+
+QDeclarativeDebugObjectExpressionWatch::QDeclarativeDebugObjectExpressionWatch(QObject *parent)
+    : QDeclarativeDebugWatch(parent)
+{
+}
+
+QString QDeclarativeDebugObjectExpressionWatch::expression() const
+{
+    return m_expr;
+}
+
+
+QDeclarativeDebugQuery::QDeclarativeDebugQuery(QObject *parent)
+: QObject(parent), m_state(Waiting)
+{
+}
+
+QDeclarativeDebugQuery::State QDeclarativeDebugQuery::state() const
+{
+    return m_state;
+}
+
+bool QDeclarativeDebugQuery::isWaiting() const
+{
+    return m_state == Waiting;
+}
+
+void QDeclarativeDebugQuery::setState(State s)
+{
+    if (m_state == s)
+        return;
+    m_state = s;
+    emit stateChanged(m_state);
+}
+
+QDeclarativeDebugEnginesQuery::QDeclarativeDebugEnginesQuery(QObject *parent)
+: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
+{
+}
+
+QDeclarativeDebugEnginesQuery::~QDeclarativeDebugEnginesQuery()
+{
+    if (m_client && m_queryId != -1) 
+        QDeclarativeEngineDebugPrivate::remove(m_client, this);
+}
+
+QList<QDeclarativeDebugEngineReference> QDeclarativeDebugEnginesQuery::engines() const
+{
+    return m_engines;
+}
+
+QDeclarativeDebugRootContextQuery::QDeclarativeDebugRootContextQuery(QObject *parent)
+: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
+{
+}
+
+QDeclarativeDebugRootContextQuery::~QDeclarativeDebugRootContextQuery()
+{
+    if (m_client && m_queryId != -1) 
+        QDeclarativeEngineDebugPrivate::remove(m_client, this);
+}
+
+QDeclarativeDebugContextReference QDeclarativeDebugRootContextQuery::rootContext() const
+{
+    return m_context;
+}
+
+QDeclarativeDebugObjectQuery::QDeclarativeDebugObjectQuery(QObject *parent)
+: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
+{
+}
+
+QDeclarativeDebugObjectQuery::~QDeclarativeDebugObjectQuery()
+{
+    if (m_client && m_queryId != -1) 
+        QDeclarativeEngineDebugPrivate::remove(m_client, this);
+}
+
+QDeclarativeDebugObjectReference QDeclarativeDebugObjectQuery::object() const
+{
+    return m_object;
+}
+
+QDeclarativeDebugExpressionQuery::QDeclarativeDebugExpressionQuery(QObject *parent)
+: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
+{
+}
+
+QDeclarativeDebugExpressionQuery::~QDeclarativeDebugExpressionQuery()
+{
+    if (m_client && m_queryId != -1) 
+        QDeclarativeEngineDebugPrivate::remove(m_client, this);
+}
+
+QString QDeclarativeDebugExpressionQuery::expression() const
+{
+    return m_expr;
+}
+
+QVariant QDeclarativeDebugExpressionQuery::result() const
+{
+    return m_result;
+}
+
+QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference()
+: m_debugId(-1)
+{
+}
+
+QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference(int debugId)
+: m_debugId(debugId)
+{
+}
+
+QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference(const QDeclarativeDebugEngineReference &o)
+: m_debugId(o.m_debugId), m_name(o.m_name)
+{
+}
+
+QDeclarativeDebugEngineReference &
+QDeclarativeDebugEngineReference::operator=(const QDeclarativeDebugEngineReference &o)
+{
+    m_debugId = o.m_debugId; m_name = o.m_name;
+    return *this;
+}
+
+int QDeclarativeDebugEngineReference::debugId() const
+{
+    return m_debugId;
+}
+
+QString QDeclarativeDebugEngineReference::name() const
+{
+    return m_name;
+}
+
+QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference()
+: m_debugId(-1), m_contextDebugId(-1)
+{
+}
+
+QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(int debugId)
+: m_debugId(debugId), m_contextDebugId(-1)
+{
+}
+
+QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(const QDeclarativeDebugObjectReference &o)
+: m_debugId(o.m_debugId), m_class(o.m_class), m_name(o.m_name),
+  m_source(o.m_source), m_contextDebugId(o.m_contextDebugId),
+  m_properties(o.m_properties), m_children(o.m_children)
+{
+}
+
+QDeclarativeDebugObjectReference &
+QDeclarativeDebugObjectReference::operator=(const QDeclarativeDebugObjectReference &o)
+{
+    m_debugId = o.m_debugId; m_class = o.m_class; m_name = o.m_name; 
+    m_source = o.m_source; m_contextDebugId = o.m_contextDebugId;
+    m_properties = o.m_properties; m_children = o.m_children;
+    return *this;
+}
+
+int QDeclarativeDebugObjectReference::debugId() const
+{
+    return m_debugId;
+}
+
+QString QDeclarativeDebugObjectReference::className() const
+{
+    return m_class;
+}
+
+QString QDeclarativeDebugObjectReference::name() const
+{
+    return m_name;
+}
+
+QDeclarativeDebugFileReference QDeclarativeDebugObjectReference::source() const
+{
+    return m_source;
+}
+
+int QDeclarativeDebugObjectReference::contextDebugId() const
+{
+    return m_contextDebugId;
+}
+
+QList<QDeclarativeDebugPropertyReference> QDeclarativeDebugObjectReference::properties() const
+{
+    return m_properties;
+}
+
+QList<QDeclarativeDebugObjectReference> QDeclarativeDebugObjectReference::children() const
+{
+    return m_children;
+}
+
+QDeclarativeDebugContextReference::QDeclarativeDebugContextReference()
+: m_debugId(-1)
+{
+}
+
+QDeclarativeDebugContextReference::QDeclarativeDebugContextReference(const QDeclarativeDebugContextReference &o)
+: m_debugId(o.m_debugId), m_name(o.m_name), m_objects(o.m_objects), m_contexts(o.m_contexts)
+{
+}
+
+QDeclarativeDebugContextReference &QDeclarativeDebugContextReference::operator=(const QDeclarativeDebugContextReference &o)
+{
+    m_debugId = o.m_debugId; m_name = o.m_name; m_objects = o.m_objects; 
+    m_contexts = o.m_contexts;
+    return *this;
+}
+
+int QDeclarativeDebugContextReference::debugId() const
+{
+    return m_debugId;
+}
+
+QString QDeclarativeDebugContextReference::name() const
+{
+    return m_name;
+}
+
+QList<QDeclarativeDebugObjectReference> QDeclarativeDebugContextReference::objects() const
+{
+    return m_objects;
+}
+
+QList<QDeclarativeDebugContextReference> QDeclarativeDebugContextReference::contexts() const
+{
+    return m_contexts;
+}
+
+QDeclarativeDebugFileReference::QDeclarativeDebugFileReference()
+: m_lineNumber(-1), m_columnNumber(-1)
+{
+}
+
+QDeclarativeDebugFileReference::QDeclarativeDebugFileReference(const QDeclarativeDebugFileReference &o)
+: m_url(o.m_url), m_lineNumber(o.m_lineNumber), m_columnNumber(o.m_columnNumber)
+{
+}
+
+QDeclarativeDebugFileReference &QDeclarativeDebugFileReference::operator=(const QDeclarativeDebugFileReference &o)
+{
+    m_url = o.m_url; m_lineNumber = o.m_lineNumber; m_columnNumber = o.m_columnNumber;
+    return *this;
+}
+
+QUrl QDeclarativeDebugFileReference::url() const
+{
+    return m_url;
+}
+
+void QDeclarativeDebugFileReference::setUrl(const QUrl &u)
+{
+    m_url = u;
+}
+
+int QDeclarativeDebugFileReference::lineNumber() const
+{
+    return m_lineNumber;
+}
+
+void QDeclarativeDebugFileReference::setLineNumber(int l)
+{
+    m_lineNumber = l;
+}
+
+int QDeclarativeDebugFileReference::columnNumber() const
+{
+    return m_columnNumber;
+}
+
+void QDeclarativeDebugFileReference::setColumnNumber(int c)
+{
+    m_columnNumber = c;
+}
+
+QDeclarativeDebugPropertyReference::QDeclarativeDebugPropertyReference()
+: m_objectDebugId(-1), m_hasNotifySignal(false)
+{
+}
+
+QDeclarativeDebugPropertyReference::QDeclarativeDebugPropertyReference(const QDeclarativeDebugPropertyReference &o)
+: m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value),
+  m_valueTypeName(o.m_valueTypeName), m_binding(o.m_binding),
+  m_hasNotifySignal(o.m_hasNotifySignal)
+{
+}
+
+QDeclarativeDebugPropertyReference &QDeclarativeDebugPropertyReference::operator=(const QDeclarativeDebugPropertyReference &o)
+{
+    m_objectDebugId = o.m_objectDebugId; m_name = o.m_name; m_value = o.m_value;
+    m_valueTypeName = o.m_valueTypeName; m_binding = o.m_binding;
+    m_hasNotifySignal = o.m_hasNotifySignal;
+    return *this;
+}
+
+int QDeclarativeDebugPropertyReference::objectDebugId() const
+{
+    return m_objectDebugId;
+}
+
+QString QDeclarativeDebugPropertyReference::name() const
+{
+    return m_name;
+}
+
+QString QDeclarativeDebugPropertyReference::valueTypeName() const
+{
+    return m_valueTypeName;
+}
+
+QVariant QDeclarativeDebugPropertyReference::value() const
+{
+    return m_value;
+}
+
+QString QDeclarativeDebugPropertyReference::binding() const
+{
+    return m_binding;
+}
+
+bool QDeclarativeDebugPropertyReference::hasNotifySignal() const
+{
+    return m_hasNotifySignal;
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h
new file mode 100644
index 0000000..f0c7a77
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebug_p.h
@@ -0,0 +1,371 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QDECLARATIVEDEBUG_H
+#define QDECLARATIVEDEBUG_H
+
+#include <QtCore/qobject.h>
+#include <QtCore/qurl.h>
+#include <QtCore/qvariant.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeDebugConnection;
+class QDeclarativeDebugWatch;
+class QDeclarativeDebugPropertyWatch;
+class QDeclarativeDebugObjectExpressionWatch;
+class QDeclarativeDebugEnginesQuery;
+class QDeclarativeDebugRootContextQuery;
+class QDeclarativeDebugObjectQuery;
+class QDeclarativeDebugExpressionQuery;
+class QDeclarativeDebugPropertyReference;
+class QDeclarativeDebugContextReference;
+class QDeclarativeDebugObjectReference;
+class QDeclarativeDebugFileReference;
+class QDeclarativeDebugEngineReference;
+class QDeclarativeEngineDebugPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeEngineDebug : public QObject
+{
+Q_OBJECT
+public:
+    QDeclarativeEngineDebug(QDeclarativeDebugConnection *, QObject * = 0);
+
+    QDeclarativeDebugPropertyWatch *addWatch(const QDeclarativeDebugPropertyReference &,
+                            QObject *parent = 0);
+    QDeclarativeDebugWatch *addWatch(const QDeclarativeDebugContextReference &, const QString &,
+                            QObject *parent = 0);
+    QDeclarativeDebugObjectExpressionWatch *addWatch(const QDeclarativeDebugObjectReference &, const QString &,
+                            QObject *parent = 0);
+    QDeclarativeDebugWatch *addWatch(const QDeclarativeDebugObjectReference &,
+                            QObject *parent = 0);
+    QDeclarativeDebugWatch *addWatch(const QDeclarativeDebugFileReference &,
+                            QObject *parent = 0);
+
+    void removeWatch(QDeclarativeDebugWatch *watch);
+
+    QDeclarativeDebugEnginesQuery *queryAvailableEngines(QObject *parent = 0);
+    QDeclarativeDebugRootContextQuery *queryRootContexts(const QDeclarativeDebugEngineReference &,
+                                                QObject *parent = 0);
+    QDeclarativeDebugObjectQuery *queryObject(const QDeclarativeDebugObjectReference &, 
+                                     QObject *parent = 0);
+    QDeclarativeDebugObjectQuery *queryObjectRecursive(const QDeclarativeDebugObjectReference &, 
+                                              QObject *parent = 0);
+    QDeclarativeDebugExpressionQuery *queryExpressionResult(int objectDebugId, 
+                                                   const QString &expr,
+                                                   QObject *parent = 0);
+
+private:
+    Q_DECLARE_PRIVATE(QDeclarativeEngineDebug)
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugWatch : public QObject
+{
+Q_OBJECT
+public:
+    enum State { Waiting, Active, Inactive, Dead };
+
+    QDeclarativeDebugWatch(QObject *);
+    ~QDeclarativeDebugWatch();
+
+    int queryId() const;
+    int objectDebugId() const;
+    State state() const;
+
+Q_SIGNALS:
+    void stateChanged(QDeclarativeDebugWatch::State);
+    //void objectChanged(int, const QDeclarativeDebugObjectReference &);
+    //void valueChanged(int, const QVariant &);
+
+    // Server sends value as string if it is a user-type variant
+    void valueChanged(const QByteArray &name, const QVariant &value);
+
+private:
+    friend class QDeclarativeEngineDebug;
+    friend class QDeclarativeEngineDebugPrivate;
+    void setState(State);
+    State m_state;
+    int m_queryId;
+    QDeclarativeEngineDebug *m_client;
+    int m_objectDebugId;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch
+{
+    Q_OBJECT
+public:
+    QDeclarativeDebugPropertyWatch(QObject *parent);
+
+    QString name() const;
+
+private:
+    friend class QDeclarativeEngineDebug;
+    QString m_name;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch
+{
+    Q_OBJECT
+public:
+    QDeclarativeDebugObjectExpressionWatch(QObject *parent);
+
+    QString expression() const;
+
+private:
+    friend class QDeclarativeEngineDebug;
+    QString m_expr;
+    int m_debugId;
+};
+
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugQuery : public QObject
+{
+Q_OBJECT
+public:
+    enum State { Waiting, Error, Completed };
+
+    State state() const;
+    bool isWaiting() const;
+
+//    bool waitUntilCompleted();
+
+Q_SIGNALS:
+    void stateChanged(QDeclarativeDebugQuery::State);
+
+protected:
+    QDeclarativeDebugQuery(QObject *);
+
+private:
+    friend class QDeclarativeEngineDebug;
+    friend class QDeclarativeEngineDebugPrivate;
+    void setState(State);
+    State m_state;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugFileReference 
+{
+public:
+    QDeclarativeDebugFileReference();
+    QDeclarativeDebugFileReference(const QDeclarativeDebugFileReference &);
+    QDeclarativeDebugFileReference &operator=(const QDeclarativeDebugFileReference &);
+
+    QUrl url() const;
+    void setUrl(const QUrl &);
+    int lineNumber() const;
+    void setLineNumber(int);
+    int columnNumber() const;
+    void setColumnNumber(int);
+
+private:
+    friend class QDeclarativeEngineDebugPrivate;
+    QUrl m_url;
+    int m_lineNumber;
+    int m_columnNumber;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugEngineReference
+{
+public:
+    QDeclarativeDebugEngineReference();
+    QDeclarativeDebugEngineReference(int);
+    QDeclarativeDebugEngineReference(const QDeclarativeDebugEngineReference &);
+    QDeclarativeDebugEngineReference &operator=(const QDeclarativeDebugEngineReference &);
+
+    int debugId() const;
+    QString name() const;
+
+private:
+    friend class QDeclarativeEngineDebugPrivate;
+    int m_debugId;
+    QString m_name;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugObjectReference
+{
+public:
+    QDeclarativeDebugObjectReference();
+    QDeclarativeDebugObjectReference(int);
+    QDeclarativeDebugObjectReference(const QDeclarativeDebugObjectReference &);
+    QDeclarativeDebugObjectReference &operator=(const QDeclarativeDebugObjectReference &);
+
+    int debugId() const;
+    QString className() const;
+    QString name() const;
+
+    QDeclarativeDebugFileReference source() const;
+    int contextDebugId() const;
+
+    QList<QDeclarativeDebugPropertyReference> properties() const;
+    QList<QDeclarativeDebugObjectReference> children() const;
+
+private:
+    friend class QDeclarativeEngineDebugPrivate;
+    int m_debugId;
+    QString m_class;
+    QString m_name;
+    QDeclarativeDebugFileReference m_source;
+    int m_contextDebugId;
+    QList<QDeclarativeDebugPropertyReference> m_properties;
+    QList<QDeclarativeDebugObjectReference> m_children;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugContextReference
+{
+public:
+    QDeclarativeDebugContextReference();
+    QDeclarativeDebugContextReference(const QDeclarativeDebugContextReference &);
+    QDeclarativeDebugContextReference &operator=(const QDeclarativeDebugContextReference &);
+
+    int debugId() const;
+    QString name() const;
+
+    QList<QDeclarativeDebugObjectReference> objects() const;
+    QList<QDeclarativeDebugContextReference> contexts() const;
+
+private:
+    friend class QDeclarativeEngineDebugPrivate;
+    int m_debugId;
+    QString m_name;
+    QList<QDeclarativeDebugObjectReference> m_objects;
+    QList<QDeclarativeDebugContextReference> m_contexts;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugPropertyReference
+{
+public:
+    QDeclarativeDebugPropertyReference();
+    QDeclarativeDebugPropertyReference(const QDeclarativeDebugPropertyReference &);
+    QDeclarativeDebugPropertyReference &operator=(const QDeclarativeDebugPropertyReference &);
+
+    int objectDebugId() const;
+    QString name() const;
+    QVariant value() const;
+    QString valueTypeName() const;
+    QString binding() const;
+    bool hasNotifySignal() const;
+
+private:
+    friend class QDeclarativeEngineDebugPrivate;
+    int m_objectDebugId;
+    QString m_name;
+    QVariant m_value;
+    QString m_valueTypeName;
+    QString m_binding;
+    bool m_hasNotifySignal;
+};
+
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery
+{
+Q_OBJECT
+public:
+    virtual ~QDeclarativeDebugEnginesQuery();
+    QList<QDeclarativeDebugEngineReference> engines() const;
+private:
+    friend class QDeclarativeEngineDebug;
+    friend class QDeclarativeEngineDebugPrivate;
+    QDeclarativeDebugEnginesQuery(QObject *);
+    QDeclarativeEngineDebug *m_client;
+    int m_queryId;
+    QList<QDeclarativeDebugEngineReference> m_engines;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery
+{
+Q_OBJECT
+public:
+    virtual ~QDeclarativeDebugRootContextQuery();
+    QDeclarativeDebugContextReference rootContext() const;
+private:
+    friend class QDeclarativeEngineDebug;
+    friend class QDeclarativeEngineDebugPrivate;
+    QDeclarativeDebugRootContextQuery(QObject *);
+    QDeclarativeEngineDebug *m_client;
+    int m_queryId;
+    QDeclarativeDebugContextReference m_context;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery
+{
+Q_OBJECT
+public:
+    virtual ~QDeclarativeDebugObjectQuery();
+    QDeclarativeDebugObjectReference object() const;
+private:
+    friend class QDeclarativeEngineDebug;
+    friend class QDeclarativeEngineDebugPrivate;
+    QDeclarativeDebugObjectQuery(QObject *);
+    QDeclarativeEngineDebug *m_client;
+    int m_queryId;
+    QDeclarativeDebugObjectReference m_object;
+
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery
+{
+Q_OBJECT
+public:
+    virtual ~QDeclarativeDebugExpressionQuery();
+    QString expression() const;
+    QVariant result() const;
+private:
+    friend class QDeclarativeEngineDebug;
+    friend class QDeclarativeEngineDebugPrivate;
+    QDeclarativeDebugExpressionQuery(QObject *);
+    QDeclarativeEngineDebug *m_client;
+    int m_queryId;
+    QString m_expr;
+    QVariant m_result;
+
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDeclarativeDebugEngineReference)
+Q_DECLARE_METATYPE(QDeclarativeDebugObjectReference)
+Q_DECLARE_METATYPE(QDeclarativeDebugContextReference)
+Q_DECLARE_METATYPE(QDeclarativeDebugPropertyReference)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEDEBUG_H
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
new file mode 100644
index 0000000..c23e32f
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -0,0 +1,207 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativedebugclient_p.h"
+
+#include "qpacketprotocol_p.h"
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qstringlist.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeDebugConnectionPrivate : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeDebugConnectionPrivate(QDeclarativeDebugConnection *c);
+    QDeclarativeDebugConnection *q;
+    QPacketProtocol *protocol;
+
+    QStringList enabled;
+    QHash<QString, QDeclarativeDebugClient *> plugins;
+public Q_SLOTS:
+    void connected();
+    void readyRead();
+};
+
+QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarativeDebugConnection *c)
+: QObject(c), q(c), protocol(0)
+{
+    protocol = new QPacketProtocol(q, this);
+    QObject::connect(c, SIGNAL(connected()), this, SLOT(connected()));
+    QObject::connect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
+}
+
+void QDeclarativeDebugConnectionPrivate::connected()
+{
+    QPacket pack;
+    pack << QString(QLatin1String("QDeclarativeDebugServer")) << enabled;
+    protocol->send(pack);
+}
+
+void QDeclarativeDebugConnectionPrivate::readyRead()
+{
+    QPacket pack = protocol->read();
+    QString name; QByteArray message;
+    pack >> name >> message;
+
+    QHash<QString, QDeclarativeDebugClient *>::Iterator iter = 
+        plugins.find(name);
+    if (iter == plugins.end()) {
+        qWarning() << "QDeclarativeDebugConnection: Message received for missing plugin" << name;
+    } else {
+        (*iter)->messageReceived(message);
+    }
+}
+
+QDeclarativeDebugConnection::QDeclarativeDebugConnection(QObject *parent)
+: QTcpSocket(parent), d(new QDeclarativeDebugConnectionPrivate(this))
+{
+}
+
+bool QDeclarativeDebugConnection::isConnected() const
+{
+    return state() == ConnectedState;
+}
+
+class QDeclarativeDebugClientPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeDebugClient)
+public:
+    QDeclarativeDebugClientPrivate();
+
+    QString name;
+    QDeclarativeDebugConnection *client;
+    bool enabled;
+};
+
+QDeclarativeDebugClientPrivate::QDeclarativeDebugClientPrivate()
+: client(0), enabled(false)
+{
+}
+
+QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name, 
+                                           QDeclarativeDebugConnection *parent)
+: QObject(*(new QDeclarativeDebugClientPrivate), parent)
+{
+    Q_D(QDeclarativeDebugClient);
+    d->name = name;
+    d->client = parent;
+
+    if (!d->client)
+        return;
+
+    if (d->client->d->plugins.contains(name)) {
+        qWarning() << "QDeclarativeDebugClient: Conflicting plugin name" << name;
+        d->client = 0;
+    } else {
+        d->client->d->plugins.insert(name, this);
+    }
+}
+
+QString QDeclarativeDebugClient::name() const
+{
+    Q_D(const QDeclarativeDebugClient);
+    return d->name;
+}
+
+bool QDeclarativeDebugClient::isEnabled() const
+{
+    Q_D(const QDeclarativeDebugClient);
+    return d->enabled;
+}
+
+void QDeclarativeDebugClient::setEnabled(bool e)
+{
+    Q_D(QDeclarativeDebugClient);
+    if (e == d->enabled)
+        return;
+
+    d->enabled = e;
+
+    if (d->client) {
+        if (e) 
+            d->client->d->enabled.append(d->name);
+        else
+            d->client->d->enabled.removeAll(d->name);
+
+        if (d->client->state() == QTcpSocket::ConnectedState) {
+            QPacket pack;
+            pack << QString(QLatin1String("QDeclarativeDebugServer"));
+            if (e) pack << (int)1;
+            else pack << (int)2;
+            pack << d->name;
+            d->client->d->protocol->send(pack);
+        }
+    }
+}
+
+bool QDeclarativeDebugClient::isConnected() const
+{
+    Q_D(const QDeclarativeDebugClient);
+
+    if (!d->client)
+        return false;
+    return d->client->isConnected();
+}
+
+void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
+{
+    Q_D(QDeclarativeDebugClient);
+
+    if (!d->client || !d->client->isConnected())
+        return;
+
+    QPacket pack;
+    pack << d->name << message;
+    d->client->d->protocol->send(pack);
+}
+
+void QDeclarativeDebugClient::messageReceived(const QByteArray &)
+{
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativedebugclient.moc>
diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h
new file mode 100644
index 0000000..4144a66
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebugclient_p.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEDEBUGCLIENT_H
+#define QDECLARATIVEDEBUGCLIENT_H
+
+#include <QtNetwork/qtcpsocket.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeDebugConnectionPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugConnection : public QTcpSocket
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(QDeclarativeDebugConnection)
+public:
+    QDeclarativeDebugConnection(QObject * = 0);
+
+    bool isConnected() const;
+private:
+    QDeclarativeDebugConnectionPrivate *d;
+    friend class QDeclarativeDebugClient;
+    friend class QDeclarativeDebugClientPrivate;
+};
+
+class QDeclarativeDebugClientPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugClient : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeDebugClient)
+    Q_DISABLE_COPY(QDeclarativeDebugClient)
+
+public:
+    QDeclarativeDebugClient(const QString &, QDeclarativeDebugConnection *parent);
+
+    QString name() const;
+
+    bool isEnabled() const;
+    void setEnabled(bool);
+
+    bool isConnected() const;
+
+    void sendMessage(const QByteArray &);
+
+protected:
+    virtual void messageReceived(const QByteArray &);
+
+private:
+    friend class QDeclarativeDebugConnection;
+    friend class QDeclarativeDebugConnectionPrivate;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEDEBUGCLIENT_H
diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus.cpp b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp
new file mode 100644
index 0000000..5908628
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativedebuggerstatus_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeDebuggerStatus::~QDeclarativeDebuggerStatus()
+{
+}
+
+void QDeclarativeDebuggerStatus::setSelectedState(bool)
+{
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h
new file mode 100644
index 0000000..a3ba40a
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEDEBUGGERSTATUS_P_H
+#define QDECLARATIVEDEBUGGERSTATUS_P_H
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDebuggerStatus
+{
+public:
+    virtual ~QDeclarativeDebuggerStatus();
+
+    virtual void setSelectedState(bool);
+};
+Q_DECLARE_INTERFACE(QDeclarativeDebuggerStatus, "com.trolltech.qml.QDeclarativeDebuggerStatus")
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QLMDEBUGGERSTATUS_P_H
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
new file mode 100644
index 0000000..d9bbdb5
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -0,0 +1,426 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativedebugservice_p.h"
+
+#include "qpacketprotocol_p.h"
+
+#include <QtCore/qdebug.h>
+#include <QtNetwork/qtcpserver.h>
+#include <QtNetwork/qtcpsocket.h>
+#include <QtCore/qstringlist.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeDebugServerPrivate;
+class QDeclarativeDebugServer : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeDebugServer)
+    Q_DISABLE_COPY(QDeclarativeDebugServer)
+public:
+    static QDeclarativeDebugServer *instance();
+    void wait();
+    void registerForStartNotification(QObject *object, const char *receiver);
+
+private Q_SLOTS:
+    void readyRead();
+    void registeredObjectDestroyed(QObject *object);
+
+private:
+    friend class QDeclarativeDebugService;
+    friend class QDeclarativeDebugServicePrivate;
+    QDeclarativeDebugServer(int); 
+};
+
+class QDeclarativeDebugServerPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeDebugServer)
+public:
+    QDeclarativeDebugServerPrivate();
+    void wait();
+
+    int port;
+    QTcpSocket *connection;
+    QPacketProtocol *protocol;
+    QHash<QString, QDeclarativeDebugService *> plugins;
+    QStringList enabledPlugins;
+    QList<QPair<QObject*, QByteArray> > notifyClients;
+};
+
+class QDeclarativeDebugServicePrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeDebugService)
+public:
+    QDeclarativeDebugServicePrivate();
+
+    QString name;
+    QDeclarativeDebugServer *server;
+};
+
+QDeclarativeDebugServerPrivate::QDeclarativeDebugServerPrivate()
+: connection(0), protocol(0)
+{
+}
+
+void QDeclarativeDebugServerPrivate::wait()
+{
+    Q_Q(QDeclarativeDebugServer);
+    QTcpServer server;
+
+    if (!server.listen(QHostAddress::Any, port)) {
+        qWarning("QDeclarativeDebugServer: Unable to listen on port %d", port);
+        return;
+    }
+
+    qWarning("QDeclarativeDebugServer: Waiting for connection on port %d...", port);
+
+    for (int i=0; i<notifyClients.count(); i++) {
+        if (!QMetaObject::invokeMethod(notifyClients[i].first, notifyClients[i].second)) {
+            qWarning() << "QDeclarativeDebugServer: unable to call method" << notifyClients[i].second
+                    << "on object" << notifyClients[i].first << "to notify of debug server start";
+        }
+    }
+    notifyClients.clear();
+
+    if (!server.waitForNewConnection(-1)) {
+        qWarning("QDeclarativeDebugServer: Connection error");
+        return;
+    }
+
+    connection = server.nextPendingConnection();
+    connection->setParent(q);
+    protocol = new QPacketProtocol(connection, q);
+
+    // ### Wait for hello
+    while (!protocol->packetsAvailable()) {
+        connection->waitForReadyRead();
+    }
+    QPacket hello = protocol->read();
+    QString name; 
+    hello >> name >> enabledPlugins;
+    if (name != QLatin1String("QDeclarativeDebugServer")) {
+        qWarning("QDeclarativeDebugServer: Invalid hello message");
+        delete protocol; delete connection; connection = 0; protocol = 0;
+        return;
+    }
+
+    QObject::connect(protocol, SIGNAL(readyRead()), q, SLOT(readyRead()));
+    q->readyRead();
+
+    qWarning("QDeclarativeDebugServer: Connection established");
+}
+
+QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
+{
+    static bool envTested = false;
+    static QDeclarativeDebugServer *server = 0;
+
+    if (!envTested) {
+        envTested = true;
+        QByteArray env = qgetenv("QML_DEBUG_SERVER_PORT");
+
+        bool ok = false;
+        int port = env.toInt(&ok);
+
+        if (ok && port > 1024) 
+            server = new QDeclarativeDebugServer(port);
+    }
+
+    return server;
+}
+
+void QDeclarativeDebugServer::wait()
+{
+    Q_D(QDeclarativeDebugServer);
+    d->wait();
+}
+
+void QDeclarativeDebugServer::registerForStartNotification(QObject *object, const char *methodName)
+{
+    Q_D(QDeclarativeDebugServer);
+    connect(object, SIGNAL(destroyed(QObject*)), SLOT(registeredObjectDestroyed(QObject*)));
+    d->notifyClients.append(qMakePair(object, QByteArray(methodName)));
+}
+
+void QDeclarativeDebugServer::registeredObjectDestroyed(QObject *object)
+{
+    Q_D(QDeclarativeDebugServer);
+    QMutableListIterator<QPair<QObject*, QByteArray> > i(d->notifyClients);
+    while (i.hasNext()) {
+        if (i.next().first == object)
+            i.remove();
+    }
+}
+
+QDeclarativeDebugServer::QDeclarativeDebugServer(int port)
+: QObject(*(new QDeclarativeDebugServerPrivate))
+{
+    Q_D(QDeclarativeDebugServer);
+    d->port = port;
+}
+
+void QDeclarativeDebugServer::readyRead()
+{
+    Q_D(QDeclarativeDebugServer);
+
+    QString debugServer(QLatin1String("QDeclarativeDebugServer"));
+
+    while (d->protocol->packetsAvailable()) {
+        QPacket pack = d->protocol->read();
+
+        QString name;
+        pack >> name;
+
+        if (name == debugServer) {
+            int op = -1; QString plugin;
+            pack >> op >> plugin;
+
+            if (op == 1) {
+                // Enable
+                if (!d->enabledPlugins.contains(plugin)) {
+                    d->enabledPlugins.append(plugin);
+                    QHash<QString, QDeclarativeDebugService *>::Iterator iter = 
+                        d->plugins.find(plugin);
+                    if (iter != d->plugins.end())
+                        (*iter)->enabledChanged(true);
+                }
+
+            } else if (op == 2) {
+                // Disable
+                if (d->enabledPlugins.contains(plugin)) {
+                    d->enabledPlugins.removeAll(plugin);
+                    QHash<QString, QDeclarativeDebugService *>::Iterator iter = 
+                        d->plugins.find(plugin);
+                    if (iter != d->plugins.end())
+                        (*iter)->enabledChanged(false);
+                }
+            } else {
+                qWarning("QDeclarativeDebugServer: Invalid control message %d", op);
+            }
+
+        } else {
+            QByteArray message;
+            pack >> message;
+
+            QHash<QString, QDeclarativeDebugService *>::Iterator iter = 
+                d->plugins.find(name);
+            if (iter == d->plugins.end()) {
+                qWarning() << "QDeclarativeDebugServer: Message received for missing plugin" << name;
+            } else {
+                (*iter)->messageReceived(message);
+            }
+        }
+    }
+}
+
+QDeclarativeDebugServicePrivate::QDeclarativeDebugServicePrivate()
+: server(0)
+{
+}
+
+QDeclarativeDebugService::QDeclarativeDebugService(const QString &name, QObject *parent)
+: QObject(*(new QDeclarativeDebugServicePrivate), parent)
+{
+    Q_D(QDeclarativeDebugService);
+    d->name = name;
+    d->server = QDeclarativeDebugServer::instance();
+
+    if (!d->server)
+        return;
+
+    if (d->server->d_func()->plugins.contains(name)) {
+        qWarning() << "QDeclarativeDebugService: Conflicting plugin name" << name;
+        d->server = 0;
+    } else {
+        d->server->d_func()->plugins.insert(name, this);
+    }
+}
+
+QString QDeclarativeDebugService::name() const
+{
+    Q_D(const QDeclarativeDebugService);
+    return d->name;
+}
+
+bool QDeclarativeDebugService::isEnabled() const
+{
+    Q_D(const QDeclarativeDebugService);
+    return (d->server && d->server->d_func()->enabledPlugins.contains(d->name));
+}
+
+namespace {
+
+    struct ObjectReference 
+    {
+        QPointer<QObject> object;
+        int id;
+    };
+
+    struct ObjectReferenceHash 
+    {
+        ObjectReferenceHash() : nextId(0) {}
+
+        QHash<QObject *, ObjectReference> objects;
+        QHash<int, QObject *> ids;
+
+        int nextId;
+    };
+
+}
+Q_GLOBAL_STATIC(ObjectReferenceHash, objectReferenceHash);
+
+
+/*!
+    Returns a unique id for \a object.  Calling this method multiple times
+    for the same object will return the same id.
+*/
+int QDeclarativeDebugService::idForObject(QObject *object)
+{
+    if (!object)
+        return -1;
+
+    ObjectReferenceHash *hash = objectReferenceHash();
+    QHash<QObject *, ObjectReference>::Iterator iter = 
+        hash->objects.find(object);
+
+    if (iter == hash->objects.end()) {
+        int id = hash->nextId++;
+
+        hash->ids.insert(id, object);
+        iter = hash->objects.insert(object, ObjectReference());
+        iter->object = object;
+        iter->id = id;
+    } else if (iter->object != object) {
+        int id = hash->nextId++;
+
+        hash->ids.remove(iter->id);
+
+        hash->ids.insert(id, object);
+        iter->object = object;
+        iter->id = id;
+    } 
+    return iter->id;
+}
+
+/*!
+    Returns the object for unique \a id.  If the object has not previously been
+    assigned an id, through idForObject(), then 0 is returned.  If the object
+    has been destroyed, 0 is returned.
+*/
+QObject *QDeclarativeDebugService::objectForId(int id)
+{
+    ObjectReferenceHash *hash = objectReferenceHash();
+
+    QHash<int, QObject *>::Iterator iter = hash->ids.find(id);
+    if (iter == hash->ids.end())
+        return 0;
+
+
+    QHash<QObject *, ObjectReference>::Iterator objIter = 
+        hash->objects.find(*iter);
+    Q_ASSERT(objIter != hash->objects.end());
+
+    if (objIter->object == 0) {
+        hash->ids.erase(iter);
+        hash->objects.erase(objIter);
+        return 0;
+    } else {
+        return *iter;
+    }
+}
+
+bool QDeclarativeDebugService::isDebuggingEnabled()
+{
+    return QDeclarativeDebugServer::instance() != 0;
+}
+
+QString QDeclarativeDebugService::objectToString(QObject *obj)
+{
+    if(!obj)
+        return QLatin1String("NULL");
+
+    QString objectName = obj->objectName();
+    if(objectName.isEmpty())
+        objectName = QLatin1String("<unnamed>");
+
+    QString rv = QString::fromUtf8(obj->metaObject()->className()) + 
+                 QLatin1String(": ") + objectName;
+
+    return rv;
+}
+
+void QDeclarativeDebugService::waitForClients()
+{
+    QDeclarativeDebugServer::instance()->wait();
+}
+
+void QDeclarativeDebugService::notifyOnServerStart(QObject *object, const char *receiver)
+{
+    QDeclarativeDebugServer::instance()->registerForStartNotification(object, receiver);
+}
+
+void QDeclarativeDebugService::sendMessage(const QByteArray &message)
+{
+    Q_D(QDeclarativeDebugService);
+
+    if (!d->server || !d->server->d_func()->connection)
+        return;
+
+    QPacket pack;
+    pack << d->name << message;
+    d->server->d_func()->protocol->send(pack);
+    d->server->d_func()->connection->flush();
+}
+
+void QDeclarativeDebugService::enabledChanged(bool)
+{
+}
+
+void QDeclarativeDebugService::messageReceived(const QByteArray &)
+{
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativedebugservice.moc>
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h
new file mode 100644
index 0000000..498edf3
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebugservice_p.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEDEBUGSERVICE_H
+#define QDECLARATIVEDEBUGSERVICE_H
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeDebugServicePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeDebugService)
+    Q_DISABLE_COPY(QDeclarativeDebugService)
+public:
+    QDeclarativeDebugService(const QString &, QObject *parent = 0);
+
+    QString name() const;
+
+    bool isEnabled() const;
+
+    void sendMessage(const QByteArray &);
+
+    static int idForObject(QObject *);
+    static QObject *objectForId(int);
+
+    static bool isDebuggingEnabled();
+    static QString objectToString(QObject *obj);
+
+    static void waitForClients();
+
+    static void notifyOnServerStart(QObject *object, const char *receiver);
+
+protected:
+    virtual void enabledChanged(bool);
+    virtual void messageReceived(const QByteArray &);
+
+private:
+    void registerForStartNotification(QObject *object, const char *methodName);
+    friend class QDeclarativeDebugServer;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEDEBUGSERVICE_H
+
diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp
deleted file mode 100644
index 32d8bbb..0000000
--- a/src/declarative/debugger/qmldebug.cpp
+++ /dev/null
@@ -1,937 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmldebug_p.h"
-
-#include "qmldebugclient_p.h"
-
-#include <qmlenginedebug_p.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngineDebugClient : public QmlDebugClient
-{
-public:
-    QmlEngineDebugClient(QmlDebugConnection *client, QmlEngineDebugPrivate *p);
-
-protected:
-    virtual void messageReceived(const QByteArray &);
-
-private:
-    QmlEngineDebugPrivate *priv;
-};
-
-class QmlEngineDebugPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlEngineDebug)
-public:
-    QmlEngineDebugPrivate(QmlDebugConnection *);
-
-    void message(const QByteArray &);
-
-    QmlEngineDebugClient *client;
-    int nextId;
-    int getId();
-
-    void decode(QDataStream &, QmlDebugContextReference &);
-    void decode(QDataStream &, QmlDebugObjectReference &, bool simple);
-
-    static void remove(QmlEngineDebug *, QmlDebugEnginesQuery *);
-    static void remove(QmlEngineDebug *, QmlDebugRootContextQuery *);
-    static void remove(QmlEngineDebug *, QmlDebugObjectQuery *);
-    static void remove(QmlEngineDebug *, QmlDebugExpressionQuery *);
-
-    QHash<int, QmlDebugEnginesQuery *> enginesQuery;
-    QHash<int, QmlDebugRootContextQuery *> rootContextQuery;
-    QHash<int, QmlDebugObjectQuery *> objectQuery;
-    QHash<int, QmlDebugExpressionQuery *> expressionQuery;
-
-    QHash<int, QmlDebugWatch *> watched;
-};
-
-QmlEngineDebugClient::QmlEngineDebugClient(QmlDebugConnection *client,
-                                           QmlEngineDebugPrivate *p)
-: QmlDebugClient(QLatin1String("QmlEngine"), client), priv(p)
-{
-    setEnabled(true);
-}
-
-void QmlEngineDebugClient::messageReceived(const QByteArray &data)
-{
-    priv->message(data);
-}
-
-QmlEngineDebugPrivate::QmlEngineDebugPrivate(QmlDebugConnection *c)
-: client(new QmlEngineDebugClient(c, this)), nextId(0)
-{
-}
-
-int QmlEngineDebugPrivate::getId()
-{
-    return nextId++;
-}
-
-void QmlEngineDebugPrivate::remove(QmlEngineDebug *c, QmlDebugEnginesQuery *q)
-{
-    if (c && q) {
-        QmlEngineDebugPrivate *p = (QmlEngineDebugPrivate *)QObjectPrivate::get(c);
-        p->enginesQuery.remove(q->m_queryId);
-    }
-}
-
-void QmlEngineDebugPrivate::remove(QmlEngineDebug *c, 
-                                   QmlDebugRootContextQuery *q)
-{
-    if (c && q) {
-        QmlEngineDebugPrivate *p = (QmlEngineDebugPrivate *)QObjectPrivate::get(c);
-        p->rootContextQuery.remove(q->m_queryId);
-    }
-}
-
-void QmlEngineDebugPrivate::remove(QmlEngineDebug *c, QmlDebugObjectQuery *q)
-{
-    if (c && q) {
-        QmlEngineDebugPrivate *p = (QmlEngineDebugPrivate *)QObjectPrivate::get(c);
-        p->objectQuery.remove(q->m_queryId);
-    }
-}
-
-void QmlEngineDebugPrivate::remove(QmlEngineDebug *c, QmlDebugExpressionQuery *q)
-{
-    if (c && q) {
-        QmlEngineDebugPrivate *p = (QmlEngineDebugPrivate *)QObjectPrivate::get(c);
-        p->expressionQuery.remove(q->m_queryId);
-    }
-}
-
-void QmlEngineDebugPrivate::decode(QDataStream &ds, QmlDebugObjectReference &o,
-                                   bool simple)
-{
-    QmlEngineDebugServer::QmlObjectData data;
-    ds >> data;
-    o.m_debugId = data.objectId;
-    o.m_class = data.objectType;
-    o.m_name = data.objectName;
-    o.m_source.m_url = data.url;
-    o.m_source.m_lineNumber = data.lineNumber;
-    o.m_source.m_columnNumber = data.columnNumber;
-    o.m_contextDebugId = data.contextId;
-
-    if (simple)
-        return;
-
-    int childCount;
-    bool recur;
-    ds >> childCount >> recur;
-
-    for (int ii = 0; ii < childCount; ++ii) {
-        o.m_children.append(QmlDebugObjectReference());
-        decode(ds, o.m_children.last(), !recur);
-    }
-
-    int propCount;
-    ds >> propCount;
-
-    for (int ii = 0; ii < propCount; ++ii) {
-        QmlEngineDebugServer::QmlObjectProperty data;
-        ds >> data;
-        QmlDebugPropertyReference prop;
-        prop.m_objectDebugId = o.m_debugId;
-        prop.m_name = data.name;
-        prop.m_binding = data.binding;
-        prop.m_hasNotifySignal = data.hasNotifySignal;
-        prop.m_valueTypeName = data.valueTypeName;
-        switch (data.type) {
-            case QmlEngineDebugServer::QmlObjectProperty::Basic:
-            case QmlEngineDebugServer::QmlObjectProperty::List:
-            case QmlEngineDebugServer::QmlObjectProperty::SignalProperty:
-            {
-                prop.m_value = data.value;
-                break;
-            }
-            case QmlEngineDebugServer::QmlObjectProperty::Object:
-            {
-                QmlDebugObjectReference obj;
-                obj.m_debugId = prop.m_value.toInt();
-                prop.m_value = qVariantFromValue(obj);
-                break;
-            }
-            case QmlEngineDebugServer::QmlObjectProperty::Unknown:
-                break;
-        }
-        o.m_properties << prop;
-    }
-}
-
-void QmlEngineDebugPrivate::decode(QDataStream &ds, QmlDebugContextReference &c)
-{
-    ds >> c.m_name >> c.m_debugId;
-
-    int contextCount;
-    ds >> contextCount;
-
-    for (int ii = 0; ii < contextCount; ++ii) {
-        c.m_contexts.append(QmlDebugContextReference());
-        decode(ds, c.m_contexts.last());
-    }
-
-    int objectCount;
-    ds >> objectCount;
-
-    for (int ii = 0; ii < objectCount; ++ii) {
-        QmlDebugObjectReference obj;
-        decode(ds, obj, true);
-
-        obj.m_contextDebugId = c.m_debugId;
-        c.m_objects << obj;
-    }
-}
-
-void QmlEngineDebugPrivate::message(const QByteArray &data)
-{
-    QDataStream ds(data);
-
-    QByteArray type;
-    ds >> type;
-
-    //qDebug() << "QmlEngineDebugPrivate::message()" << type;
-
-    if (type == "LIST_ENGINES_R") {
-        int queryId;
-        ds >> queryId;
-
-        QmlDebugEnginesQuery *query = enginesQuery.value(queryId);
-        if (!query)
-            return;
-        enginesQuery.remove(queryId);
-
-        int count;
-        ds >> count;
-
-        for (int ii = 0; ii < count; ++ii) {
-            QmlDebugEngineReference ref;
-            ds >> ref.m_name;
-            ds >> ref.m_debugId;
-            query->m_engines << ref;
-        }
-
-        query->m_client = 0;
-        query->setState(QmlDebugQuery::Completed);
-    } else if (type == "LIST_OBJECTS_R") {
-        int queryId;
-        ds >> queryId;
-
-        QmlDebugRootContextQuery *query = rootContextQuery.value(queryId);
-        if (!query)
-            return;
-        rootContextQuery.remove(queryId);
-
-        if (!ds.atEnd()) 
-            decode(ds, query->m_context);
-
-        query->m_client = 0;
-        query->setState(QmlDebugQuery::Completed);
-    } else if (type == "FETCH_OBJECT_R") {
-        int queryId;
-        ds >> queryId;
-
-        QmlDebugObjectQuery *query = objectQuery.value(queryId);
-        if (!query)
-            return;
-        objectQuery.remove(queryId);
-
-        if (!ds.atEnd())
-            decode(ds, query->m_object, false);
-
-        query->m_client = 0;
-        query->setState(QmlDebugQuery::Completed);
-    } else if (type == "EVAL_EXPRESSION_R") {
-        int queryId;
-        QVariant result;
-        ds >> queryId >> result;
-
-        QmlDebugExpressionQuery *query = expressionQuery.value(queryId);
-        if (!query)
-            return;
-        expressionQuery.remove(queryId);
-
-        query->m_result = result;
-        query->m_client = 0;
-        query->setState(QmlDebugQuery::Completed);
-    } else if (type == "WATCH_PROPERTY_R") {
-        int queryId;
-        bool ok;
-        ds >> queryId >> ok;
-
-        QmlDebugWatch *watch = watched.value(queryId);
-        if (!watch)
-            return;
-
-        watch->setState(ok ? QmlDebugWatch::Active : QmlDebugWatch::Inactive);
-    } else if (type == "WATCH_OBJECT_R") {
-        int queryId;
-        bool ok;
-        ds >> queryId >> ok;
-
-        QmlDebugWatch *watch = watched.value(queryId);
-        if (!watch)
-            return;
-
-        watch->setState(ok ? QmlDebugWatch::Active : QmlDebugWatch::Inactive);
-    } else if (type == "WATCH_EXPR_OBJECT_R") {
-        int queryId;
-        bool ok;
-        ds >> queryId >> ok;
-
-        QmlDebugWatch *watch = watched.value(queryId);
-        if (!watch)
-            return;
-
-        watch->setState(ok ? QmlDebugWatch::Active : QmlDebugWatch::Inactive);
-    } else if (type == "UPDATE_WATCH") {
-        int queryId;
-        int debugId;
-        QByteArray name;
-        QVariant value;
-        ds >> queryId >> debugId >> name >> value;
-
-        QmlDebugWatch *watch = watched.value(queryId, 0);
-        if (!watch)
-            return;
-        emit watch->valueChanged(name, value);
-    }
-}
-
-QmlEngineDebug::QmlEngineDebug(QmlDebugConnection *client, QObject *parent)
-: QObject(*(new QmlEngineDebugPrivate(client)), parent)
-{
-}
-
-QmlDebugPropertyWatch *QmlEngineDebug::addWatch(const QmlDebugPropertyReference &property, QObject *parent)
-{
-    Q_D(QmlEngineDebug);
-
-    QmlDebugPropertyWatch *watch = new QmlDebugPropertyWatch(parent);
-    if (d->client->isConnected()) {
-        int queryId = d->getId();
-        watch->m_queryId = queryId;
-        watch->m_client = this;
-        watch->m_objectDebugId = property.objectDebugId();
-        watch->m_name = property.name();
-        d->watched.insert(queryId, watch);
-
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("WATCH_PROPERTY") << queryId << property.objectDebugId() << property.name().toUtf8();
-        d->client->sendMessage(message);
-    } else {
-        watch->m_state = QmlDebugWatch::Dead;
-    }
-
-    return watch;
-}
-
-QmlDebugWatch *QmlEngineDebug::addWatch(const QmlDebugContextReference &, const QString &, QObject *)
-{
-    qWarning("QmlEngineDebug::addWatch(): Not implemented");
-    return 0;
-}
-
-QmlDebugObjectExpressionWatch *QmlEngineDebug::addWatch(const QmlDebugObjectReference &object, const QString &expr, QObject *parent)
-{
-    Q_D(QmlEngineDebug);
-    QmlDebugObjectExpressionWatch *watch = new QmlDebugObjectExpressionWatch(parent);
-    if (d->client->isConnected()) {
-        int queryId = d->getId();
-        watch->m_queryId = queryId;
-        watch->m_client = this;
-        watch->m_objectDebugId = object.debugId();
-        watch->m_expr = expr;
-        d->watched.insert(queryId, watch);
-
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("WATCH_EXPR_OBJECT") << queryId << object.debugId() << expr;
-        d->client->sendMessage(message);
-    } else {
-        watch->m_state = QmlDebugWatch::Dead;
-    }
-    return watch;
-}
-
-QmlDebugWatch *QmlEngineDebug::addWatch(const QmlDebugObjectReference &object, QObject *parent)
-{
-    Q_D(QmlEngineDebug);
-
-    QmlDebugWatch *watch = new QmlDebugWatch(parent);
-    if (d->client->isConnected()) {
-        int queryId = d->getId();
-        watch->m_queryId = queryId;
-        watch->m_client = this;
-        watch->m_objectDebugId = object.debugId();
-        d->watched.insert(queryId, watch);
-
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("WATCH_OBJECT") << queryId << object.debugId();
-        d->client->sendMessage(message);
-    } else {
-        watch->m_state = QmlDebugWatch::Dead;
-    }
-
-    return watch;
-}
-
-QmlDebugWatch *QmlEngineDebug::addWatch(const QmlDebugFileReference &, QObject *)
-{
-    qWarning("QmlEngineDebug::addWatch(): Not implemented");
-    return 0;
-}
-
-void QmlEngineDebug::removeWatch(QmlDebugWatch *watch)
-{
-    Q_D(QmlEngineDebug);
-
-    if (!watch || !watch->m_client)
-        return;
-
-    watch->m_client = 0;
-    watch->setState(QmlDebugWatch::Inactive);
-    
-    d->watched.remove(watch->queryId());
-
-    if (d->client && d->client->isConnected()) {
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("NO_WATCH") << watch->queryId();
-        d->client->sendMessage(message);
-    }
-}
-
-QmlDebugEnginesQuery *QmlEngineDebug::queryAvailableEngines(QObject *parent)
-{
-    Q_D(QmlEngineDebug);
-
-    QmlDebugEnginesQuery *query = new QmlDebugEnginesQuery(parent);
-    if (d->client->isConnected()) {
-        query->m_client = this;
-        int queryId = d->getId();
-        query->m_queryId = queryId;
-        d->enginesQuery.insert(queryId, query);
-
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("LIST_ENGINES") << queryId;
-        d->client->sendMessage(message);
-    } else {
-        query->m_state = QmlDebugQuery::Error;
-    }
-
-    return query;
-}
-
-QmlDebugRootContextQuery *QmlEngineDebug::queryRootContexts(const QmlDebugEngineReference &engine, QObject *parent)
-{
-    Q_D(QmlEngineDebug);
-
-    QmlDebugRootContextQuery *query = new QmlDebugRootContextQuery(parent);
-    if (d->client->isConnected() && engine.debugId() != -1) {
-        query->m_client = this;
-        int queryId = d->getId();
-        query->m_queryId = queryId;
-        d->rootContextQuery.insert(queryId, query);
-
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("LIST_OBJECTS") << queryId << engine.debugId();
-        d->client->sendMessage(message);
-    } else {
-        query->m_state = QmlDebugQuery::Error;
-    }
-
-    return query;
-}
-
-QmlDebugObjectQuery *QmlEngineDebug::queryObject(const QmlDebugObjectReference &object, QObject *parent)
-{
-    Q_D(QmlEngineDebug);
-
-    QmlDebugObjectQuery *query = new QmlDebugObjectQuery(parent);
-    if (d->client->isConnected() && object.debugId() != -1) {
-        query->m_client = this;
-        int queryId = d->getId();
-        query->m_queryId = queryId;
-        d->objectQuery.insert(queryId, query);
-
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() 
-           << false;
-        d->client->sendMessage(message);
-    } else {
-        query->m_state = QmlDebugQuery::Error;
-    }
-
-    return query;
-}
-
-QmlDebugObjectQuery *QmlEngineDebug::queryObjectRecursive(const QmlDebugObjectReference &object, QObject *parent)
-{
-    Q_D(QmlEngineDebug);
-
-    QmlDebugObjectQuery *query = new QmlDebugObjectQuery(parent);
-    if (d->client->isConnected() && object.debugId() != -1) {
-        query->m_client = this;
-        int queryId = d->getId();
-        query->m_queryId = queryId;
-        d->objectQuery.insert(queryId, query);
-
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() 
-           << true;
-        d->client->sendMessage(message);
-    } else {
-        query->m_state = QmlDebugQuery::Error;
-    }
-
-    return query;
-}
-
-QmlDebugExpressionQuery *QmlEngineDebug::queryExpressionResult(int objectDebugId, const QString &expr, QObject *parent)
-{
-    Q_D(QmlEngineDebug);
-
-    QmlDebugExpressionQuery *query = new QmlDebugExpressionQuery(parent);
-    if (d->client->isConnected() && objectDebugId != -1) {
-        query->m_client = this;
-        query->m_expr = expr;
-        int queryId = d->getId();
-        query->m_queryId = queryId;
-        d->expressionQuery.insert(queryId, query);
-
-        QByteArray message;
-        QDataStream ds(&message, QIODevice::WriteOnly);
-        ds << QByteArray("EVAL_EXPRESSION") << queryId << objectDebugId << expr;
-        d->client->sendMessage(message);
-    } else {
-        query->m_state = QmlDebugQuery::Error;
-    }
-
-    return query;
-}
-
-QmlDebugWatch::QmlDebugWatch(QObject *parent)
-: QObject(parent), m_state(Waiting), m_queryId(-1), m_client(0), m_objectDebugId(-1)
-{
-}
-
-QmlDebugWatch::~QmlDebugWatch()
-{
-}
-
-int QmlDebugWatch::queryId() const
-{
-    return m_queryId;
-}
-
-int QmlDebugWatch::objectDebugId() const
-{
-    return m_objectDebugId;
-}
-
-QmlDebugWatch::State QmlDebugWatch::state() const
-{
-    return m_state;
-}
-
-void QmlDebugWatch::setState(State s)
-{
-    if (m_state == s)
-        return;
-    m_state = s;
-    emit stateChanged(m_state);
-}
-
-QmlDebugPropertyWatch::QmlDebugPropertyWatch(QObject *parent)
-    : QmlDebugWatch(parent)
-{
-}
-
-QString QmlDebugPropertyWatch::name() const
-{
-    return m_name;
-}
-
-
-QmlDebugObjectExpressionWatch::QmlDebugObjectExpressionWatch(QObject *parent)
-    : QmlDebugWatch(parent)
-{
-}
-
-QString QmlDebugObjectExpressionWatch::expression() const
-{
-    return m_expr;
-}
-
-
-QmlDebugQuery::QmlDebugQuery(QObject *parent)
-: QObject(parent), m_state(Waiting)
-{
-}
-
-QmlDebugQuery::State QmlDebugQuery::state() const
-{
-    return m_state;
-}
-
-bool QmlDebugQuery::isWaiting() const
-{
-    return m_state == Waiting;
-}
-
-void QmlDebugQuery::setState(State s)
-{
-    if (m_state == s)
-        return;
-    m_state = s;
-    emit stateChanged(m_state);
-}
-
-QmlDebugEnginesQuery::QmlDebugEnginesQuery(QObject *parent)
-: QmlDebugQuery(parent), m_client(0), m_queryId(-1)
-{
-}
-
-QmlDebugEnginesQuery::~QmlDebugEnginesQuery()
-{
-    if (m_client && m_queryId != -1) 
-        QmlEngineDebugPrivate::remove(m_client, this);
-}
-
-QList<QmlDebugEngineReference> QmlDebugEnginesQuery::engines() const
-{
-    return m_engines;
-}
-
-QmlDebugRootContextQuery::QmlDebugRootContextQuery(QObject *parent)
-: QmlDebugQuery(parent), m_client(0), m_queryId(-1)
-{
-}
-
-QmlDebugRootContextQuery::~QmlDebugRootContextQuery()
-{
-    if (m_client && m_queryId != -1) 
-        QmlEngineDebugPrivate::remove(m_client, this);
-}
-
-QmlDebugContextReference QmlDebugRootContextQuery::rootContext() const
-{
-    return m_context;
-}
-
-QmlDebugObjectQuery::QmlDebugObjectQuery(QObject *parent)
-: QmlDebugQuery(parent), m_client(0), m_queryId(-1)
-{
-}
-
-QmlDebugObjectQuery::~QmlDebugObjectQuery()
-{
-    if (m_client && m_queryId != -1) 
-        QmlEngineDebugPrivate::remove(m_client, this);
-}
-
-QmlDebugObjectReference QmlDebugObjectQuery::object() const
-{
-    return m_object;
-}
-
-QmlDebugExpressionQuery::QmlDebugExpressionQuery(QObject *parent)
-: QmlDebugQuery(parent), m_client(0), m_queryId(-1)
-{
-}
-
-QmlDebugExpressionQuery::~QmlDebugExpressionQuery()
-{
-    if (m_client && m_queryId != -1) 
-        QmlEngineDebugPrivate::remove(m_client, this);
-}
-
-QString QmlDebugExpressionQuery::expression() const
-{
-    return m_expr;
-}
-
-QVariant QmlDebugExpressionQuery::result() const
-{
-    return m_result;
-}
-
-QmlDebugEngineReference::QmlDebugEngineReference()
-: m_debugId(-1)
-{
-}
-
-QmlDebugEngineReference::QmlDebugEngineReference(int debugId)
-: m_debugId(debugId)
-{
-}
-
-QmlDebugEngineReference::QmlDebugEngineReference(const QmlDebugEngineReference &o)
-: m_debugId(o.m_debugId), m_name(o.m_name)
-{
-}
-
-QmlDebugEngineReference &
-QmlDebugEngineReference::operator=(const QmlDebugEngineReference &o)
-{
-    m_debugId = o.m_debugId; m_name = o.m_name;
-    return *this;
-}
-
-int QmlDebugEngineReference::debugId() const
-{
-    return m_debugId;
-}
-
-QString QmlDebugEngineReference::name() const
-{
-    return m_name;
-}
-
-QmlDebugObjectReference::QmlDebugObjectReference()
-: m_debugId(-1), m_contextDebugId(-1)
-{
-}
-
-QmlDebugObjectReference::QmlDebugObjectReference(int debugId)
-: m_debugId(debugId), m_contextDebugId(-1)
-{
-}
-
-QmlDebugObjectReference::QmlDebugObjectReference(const QmlDebugObjectReference &o)
-: m_debugId(o.m_debugId), m_class(o.m_class), m_name(o.m_name),
-  m_source(o.m_source), m_contextDebugId(o.m_contextDebugId),
-  m_properties(o.m_properties), m_children(o.m_children)
-{
-}
-
-QmlDebugObjectReference &
-QmlDebugObjectReference::operator=(const QmlDebugObjectReference &o)
-{
-    m_debugId = o.m_debugId; m_class = o.m_class; m_name = o.m_name; 
-    m_source = o.m_source; m_contextDebugId = o.m_contextDebugId;
-    m_properties = o.m_properties; m_children = o.m_children;
-    return *this;
-}
-
-int QmlDebugObjectReference::debugId() const
-{
-    return m_debugId;
-}
-
-QString QmlDebugObjectReference::className() const
-{
-    return m_class;
-}
-
-QString QmlDebugObjectReference::name() const
-{
-    return m_name;
-}
-
-QmlDebugFileReference QmlDebugObjectReference::source() const
-{
-    return m_source;
-}
-
-int QmlDebugObjectReference::contextDebugId() const
-{
-    return m_contextDebugId;
-}
-
-QList<QmlDebugPropertyReference> QmlDebugObjectReference::properties() const
-{
-    return m_properties;
-}
-
-QList<QmlDebugObjectReference> QmlDebugObjectReference::children() const
-{
-    return m_children;
-}
-
-QmlDebugContextReference::QmlDebugContextReference()
-: m_debugId(-1)
-{
-}
-
-QmlDebugContextReference::QmlDebugContextReference(const QmlDebugContextReference &o)
-: m_debugId(o.m_debugId), m_name(o.m_name), m_objects(o.m_objects), m_contexts(o.m_contexts)
-{
-}
-
-QmlDebugContextReference &QmlDebugContextReference::operator=(const QmlDebugContextReference &o)
-{
-    m_debugId = o.m_debugId; m_name = o.m_name; m_objects = o.m_objects; 
-    m_contexts = o.m_contexts;
-    return *this;
-}
-
-int QmlDebugContextReference::debugId() const
-{
-    return m_debugId;
-}
-
-QString QmlDebugContextReference::name() const
-{
-    return m_name;
-}
-
-QList<QmlDebugObjectReference> QmlDebugContextReference::objects() const
-{
-    return m_objects;
-}
-
-QList<QmlDebugContextReference> QmlDebugContextReference::contexts() const
-{
-    return m_contexts;
-}
-
-QmlDebugFileReference::QmlDebugFileReference()
-: m_lineNumber(-1), m_columnNumber(-1)
-{
-}
-
-QmlDebugFileReference::QmlDebugFileReference(const QmlDebugFileReference &o)
-: m_url(o.m_url), m_lineNumber(o.m_lineNumber), m_columnNumber(o.m_columnNumber)
-{
-}
-
-QmlDebugFileReference &QmlDebugFileReference::operator=(const QmlDebugFileReference &o)
-{
-    m_url = o.m_url; m_lineNumber = o.m_lineNumber; m_columnNumber = o.m_columnNumber;
-    return *this;
-}
-
-QUrl QmlDebugFileReference::url() const
-{
-    return m_url;
-}
-
-void QmlDebugFileReference::setUrl(const QUrl &u)
-{
-    m_url = u;
-}
-
-int QmlDebugFileReference::lineNumber() const
-{
-    return m_lineNumber;
-}
-
-void QmlDebugFileReference::setLineNumber(int l)
-{
-    m_lineNumber = l;
-}
-
-int QmlDebugFileReference::columnNumber() const
-{
-    return m_columnNumber;
-}
-
-void QmlDebugFileReference::setColumnNumber(int c)
-{
-    m_columnNumber = c;
-}
-
-QmlDebugPropertyReference::QmlDebugPropertyReference()
-: m_objectDebugId(-1), m_hasNotifySignal(false)
-{
-}
-
-QmlDebugPropertyReference::QmlDebugPropertyReference(const QmlDebugPropertyReference &o)
-: m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value),
-  m_valueTypeName(o.m_valueTypeName), m_binding(o.m_binding),
-  m_hasNotifySignal(o.m_hasNotifySignal)
-{
-}
-
-QmlDebugPropertyReference &QmlDebugPropertyReference::operator=(const QmlDebugPropertyReference &o)
-{
-    m_objectDebugId = o.m_objectDebugId; m_name = o.m_name; m_value = o.m_value;
-    m_valueTypeName = o.m_valueTypeName; m_binding = o.m_binding;
-    m_hasNotifySignal = o.m_hasNotifySignal;
-    return *this;
-}
-
-int QmlDebugPropertyReference::objectDebugId() const
-{
-    return m_objectDebugId;
-}
-
-QString QmlDebugPropertyReference::name() const
-{
-    return m_name;
-}
-
-QString QmlDebugPropertyReference::valueTypeName() const
-{
-    return m_valueTypeName;
-}
-
-QVariant QmlDebugPropertyReference::value() const
-{
-    return m_value;
-}
-
-QString QmlDebugPropertyReference::binding() const
-{
-    return m_binding;
-}
-
-bool QmlDebugPropertyReference::hasNotifySignal() const
-{
-    return m_hasNotifySignal;
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/debugger/qmldebug_p.h b/src/declarative/debugger/qmldebug_p.h
deleted file mode 100644
index a1371d5..0000000
--- a/src/declarative/debugger/qmldebug_p.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef QMLDEBUG_H
-#define QMLDEBUG_H
-
-#include <QtCore/qobject.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qvariant.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlDebugConnection;
-class QmlDebugWatch;
-class QmlDebugPropertyWatch;
-class QmlDebugObjectExpressionWatch;
-class QmlDebugEnginesQuery;
-class QmlDebugRootContextQuery;
-class QmlDebugObjectQuery;
-class QmlDebugExpressionQuery;
-class QmlDebugPropertyReference;
-class QmlDebugContextReference;
-class QmlDebugObjectReference;
-class QmlDebugFileReference;
-class QmlDebugEngineReference;
-class QmlEngineDebugPrivate;
-class Q_DECLARATIVE_EXPORT QmlEngineDebug : public QObject
-{
-Q_OBJECT
-public:
-    QmlEngineDebug(QmlDebugConnection *, QObject * = 0);
-
-    QmlDebugPropertyWatch *addWatch(const QmlDebugPropertyReference &,
-                            QObject *parent = 0);
-    QmlDebugWatch *addWatch(const QmlDebugContextReference &, const QString &,
-                            QObject *parent = 0);
-    QmlDebugObjectExpressionWatch *addWatch(const QmlDebugObjectReference &, const QString &,
-                            QObject *parent = 0);
-    QmlDebugWatch *addWatch(const QmlDebugObjectReference &,
-                            QObject *parent = 0);
-    QmlDebugWatch *addWatch(const QmlDebugFileReference &,
-                            QObject *parent = 0);
-
-    void removeWatch(QmlDebugWatch *watch);
-
-    QmlDebugEnginesQuery *queryAvailableEngines(QObject *parent = 0);
-    QmlDebugRootContextQuery *queryRootContexts(const QmlDebugEngineReference &,
-                                                QObject *parent = 0);
-    QmlDebugObjectQuery *queryObject(const QmlDebugObjectReference &, 
-                                     QObject *parent = 0);
-    QmlDebugObjectQuery *queryObjectRecursive(const QmlDebugObjectReference &, 
-                                              QObject *parent = 0);
-    QmlDebugExpressionQuery *queryExpressionResult(int objectDebugId, 
-                                                   const QString &expr,
-                                                   QObject *parent = 0);
-
-private:
-    Q_DECLARE_PRIVATE(QmlEngineDebug)
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugWatch : public QObject
-{
-Q_OBJECT
-public:
-    enum State { Waiting, Active, Inactive, Dead };
-
-    QmlDebugWatch(QObject *);
-    ~QmlDebugWatch();
-
-    int queryId() const;
-    int objectDebugId() const;
-    State state() const;
-
-Q_SIGNALS:
-    void stateChanged(QmlDebugWatch::State);
-    //void objectChanged(int, const QmlDebugObjectReference &);
-    //void valueChanged(int, const QVariant &);
-
-    // Server sends value as string if it is a user-type variant
-    void valueChanged(const QByteArray &name, const QVariant &value);
-
-private:
-    friend class QmlEngineDebug;
-    friend class QmlEngineDebugPrivate;
-    void setState(State);
-    State m_state;
-    int m_queryId;
-    QmlEngineDebug *m_client;
-    int m_objectDebugId;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugPropertyWatch : public QmlDebugWatch
-{
-    Q_OBJECT
-public:
-    QmlDebugPropertyWatch(QObject *parent);
-
-    QString name() const;
-
-private:
-    friend class QmlEngineDebug;
-    QString m_name;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugObjectExpressionWatch : public QmlDebugWatch
-{
-    Q_OBJECT
-public:
-    QmlDebugObjectExpressionWatch(QObject *parent);
-
-    QString expression() const;
-
-private:
-    friend class QmlEngineDebug;
-    QString m_expr;
-    int m_debugId;
-};
-
-
-class Q_DECLARATIVE_EXPORT QmlDebugQuery : public QObject
-{
-Q_OBJECT
-public:
-    enum State { Waiting, Error, Completed };
-
-    State state() const;
-    bool isWaiting() const;
-
-//    bool waitUntilCompleted();
-
-Q_SIGNALS:
-    void stateChanged(QmlDebugQuery::State);
-
-protected:
-    QmlDebugQuery(QObject *);
-
-private:
-    friend class QmlEngineDebug;
-    friend class QmlEngineDebugPrivate;
-    void setState(State);
-    State m_state;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugFileReference 
-{
-public:
-    QmlDebugFileReference();
-    QmlDebugFileReference(const QmlDebugFileReference &);
-    QmlDebugFileReference &operator=(const QmlDebugFileReference &);
-
-    QUrl url() const;
-    void setUrl(const QUrl &);
-    int lineNumber() const;
-    void setLineNumber(int);
-    int columnNumber() const;
-    void setColumnNumber(int);
-
-private:
-    friend class QmlEngineDebugPrivate;
-    QUrl m_url;
-    int m_lineNumber;
-    int m_columnNumber;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugEngineReference
-{
-public:
-    QmlDebugEngineReference();
-    QmlDebugEngineReference(int);
-    QmlDebugEngineReference(const QmlDebugEngineReference &);
-    QmlDebugEngineReference &operator=(const QmlDebugEngineReference &);
-
-    int debugId() const;
-    QString name() const;
-
-private:
-    friend class QmlEngineDebugPrivate;
-    int m_debugId;
-    QString m_name;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugObjectReference
-{
-public:
-    QmlDebugObjectReference();
-    QmlDebugObjectReference(int);
-    QmlDebugObjectReference(const QmlDebugObjectReference &);
-    QmlDebugObjectReference &operator=(const QmlDebugObjectReference &);
-
-    int debugId() const;
-    QString className() const;
-    QString name() const;
-
-    QmlDebugFileReference source() const;
-    int contextDebugId() const;
-
-    QList<QmlDebugPropertyReference> properties() const;
-    QList<QmlDebugObjectReference> children() const;
-
-private:
-    friend class QmlEngineDebugPrivate;
-    int m_debugId;
-    QString m_class;
-    QString m_name;
-    QmlDebugFileReference m_source;
-    int m_contextDebugId;
-    QList<QmlDebugPropertyReference> m_properties;
-    QList<QmlDebugObjectReference> m_children;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugContextReference
-{
-public:
-    QmlDebugContextReference();
-    QmlDebugContextReference(const QmlDebugContextReference &);
-    QmlDebugContextReference &operator=(const QmlDebugContextReference &);
-
-    int debugId() const;
-    QString name() const;
-
-    QList<QmlDebugObjectReference> objects() const;
-    QList<QmlDebugContextReference> contexts() const;
-
-private:
-    friend class QmlEngineDebugPrivate;
-    int m_debugId;
-    QString m_name;
-    QList<QmlDebugObjectReference> m_objects;
-    QList<QmlDebugContextReference> m_contexts;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugPropertyReference
-{
-public:
-    QmlDebugPropertyReference();
-    QmlDebugPropertyReference(const QmlDebugPropertyReference &);
-    QmlDebugPropertyReference &operator=(const QmlDebugPropertyReference &);
-
-    int objectDebugId() const;
-    QString name() const;
-    QVariant value() const;
-    QString valueTypeName() const;
-    QString binding() const;
-    bool hasNotifySignal() const;
-
-private:
-    friend class QmlEngineDebugPrivate;
-    int m_objectDebugId;
-    QString m_name;
-    QVariant m_value;
-    QString m_valueTypeName;
-    QString m_binding;
-    bool m_hasNotifySignal;
-};
-
-
-class Q_DECLARATIVE_EXPORT QmlDebugEnginesQuery : public QmlDebugQuery
-{
-Q_OBJECT
-public:
-    virtual ~QmlDebugEnginesQuery();
-    QList<QmlDebugEngineReference> engines() const;
-private:
-    friend class QmlEngineDebug;
-    friend class QmlEngineDebugPrivate;
-    QmlDebugEnginesQuery(QObject *);
-    QmlEngineDebug *m_client;
-    int m_queryId;
-    QList<QmlDebugEngineReference> m_engines;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugRootContextQuery : public QmlDebugQuery
-{
-Q_OBJECT
-public:
-    virtual ~QmlDebugRootContextQuery();
-    QmlDebugContextReference rootContext() const;
-private:
-    friend class QmlEngineDebug;
-    friend class QmlEngineDebugPrivate;
-    QmlDebugRootContextQuery(QObject *);
-    QmlEngineDebug *m_client;
-    int m_queryId;
-    QmlDebugContextReference m_context;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugObjectQuery : public QmlDebugQuery
-{
-Q_OBJECT
-public:
-    virtual ~QmlDebugObjectQuery();
-    QmlDebugObjectReference object() const;
-private:
-    friend class QmlEngineDebug;
-    friend class QmlEngineDebugPrivate;
-    QmlDebugObjectQuery(QObject *);
-    QmlEngineDebug *m_client;
-    int m_queryId;
-    QmlDebugObjectReference m_object;
-
-};
-
-class Q_DECLARATIVE_EXPORT QmlDebugExpressionQuery : public QmlDebugQuery
-{
-Q_OBJECT
-public:
-    virtual ~QmlDebugExpressionQuery();
-    QString expression() const;
-    QVariant result() const;
-private:
-    friend class QmlEngineDebug;
-    friend class QmlEngineDebugPrivate;
-    QmlDebugExpressionQuery(QObject *);
-    QmlEngineDebug *m_client;
-    int m_queryId;
-    QString m_expr;
-    QVariant m_result;
-
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QmlDebugEngineReference)
-Q_DECLARE_METATYPE(QmlDebugObjectReference)
-Q_DECLARE_METATYPE(QmlDebugContextReference)
-Q_DECLARE_METATYPE(QmlDebugPropertyReference)
-
-QT_END_HEADER
-
-#endif // QMLDEBUG_H
diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp
deleted file mode 100644
index ae42b5b..0000000
--- a/src/declarative/debugger/qmldebugclient.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmldebugclient_p.h"
-
-#include "qpacketprotocol_p.h"
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qstringlist.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlDebugConnectionPrivate : public QObject
-{
-    Q_OBJECT
-public:
-    QmlDebugConnectionPrivate(QmlDebugConnection *c);
-    QmlDebugConnection *q;
-    QPacketProtocol *protocol;
-
-    QStringList enabled;
-    QHash<QString, QmlDebugClient *> plugins;
-public Q_SLOTS:
-    void connected();
-    void readyRead();
-};
-
-QmlDebugConnectionPrivate::QmlDebugConnectionPrivate(QmlDebugConnection *c)
-: QObject(c), q(c), protocol(0)
-{
-    protocol = new QPacketProtocol(q, this);
-    QObject::connect(c, SIGNAL(connected()), this, SLOT(connected()));
-    QObject::connect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
-}
-
-void QmlDebugConnectionPrivate::connected()
-{
-    QPacket pack;
-    pack << QString(QLatin1String("QmlDebugServer")) << enabled;
-    protocol->send(pack);
-}
-
-void QmlDebugConnectionPrivate::readyRead()
-{
-    QPacket pack = protocol->read();
-    QString name; QByteArray message;
-    pack >> name >> message;
-
-    QHash<QString, QmlDebugClient *>::Iterator iter = 
-        plugins.find(name);
-    if (iter == plugins.end()) {
-        qWarning() << "QmlDebugConnection: Message received for missing plugin" << name;
-    } else {
-        (*iter)->messageReceived(message);
-    }
-}
-
-QmlDebugConnection::QmlDebugConnection(QObject *parent)
-: QTcpSocket(parent), d(new QmlDebugConnectionPrivate(this))
-{
-}
-
-bool QmlDebugConnection::isConnected() const
-{
-    return state() == ConnectedState;
-}
-
-class QmlDebugClientPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlDebugClient)
-public:
-    QmlDebugClientPrivate();
-
-    QString name;
-    QmlDebugConnection *client;
-    bool enabled;
-};
-
-QmlDebugClientPrivate::QmlDebugClientPrivate()
-: client(0), enabled(false)
-{
-}
-
-QmlDebugClient::QmlDebugClient(const QString &name, 
-                                           QmlDebugConnection *parent)
-: QObject(*(new QmlDebugClientPrivate), parent)
-{
-    Q_D(QmlDebugClient);
-    d->name = name;
-    d->client = parent;
-
-    if (!d->client)
-        return;
-
-    if (d->client->d->plugins.contains(name)) {
-        qWarning() << "QmlDebugClient: Conflicting plugin name" << name;
-        d->client = 0;
-    } else {
-        d->client->d->plugins.insert(name, this);
-    }
-}
-
-QString QmlDebugClient::name() const
-{
-    Q_D(const QmlDebugClient);
-    return d->name;
-}
-
-bool QmlDebugClient::isEnabled() const
-{
-    Q_D(const QmlDebugClient);
-    return d->enabled;
-}
-
-void QmlDebugClient::setEnabled(bool e)
-{
-    Q_D(QmlDebugClient);
-    if (e == d->enabled)
-        return;
-
-    d->enabled = e;
-
-    if (d->client) {
-        if (e) 
-            d->client->d->enabled.append(d->name);
-        else
-            d->client->d->enabled.removeAll(d->name);
-
-        if (d->client->state() == QTcpSocket::ConnectedState) {
-            QPacket pack;
-            pack << QString(QLatin1String("QmlDebugServer"));
-            if (e) pack << (int)1;
-            else pack << (int)2;
-            pack << d->name;
-            d->client->d->protocol->send(pack);
-        }
-    }
-}
-
-bool QmlDebugClient::isConnected() const
-{
-    Q_D(const QmlDebugClient);
-
-    if (!d->client)
-        return false;
-    return d->client->isConnected();
-}
-
-void QmlDebugClient::sendMessage(const QByteArray &message)
-{
-    Q_D(QmlDebugClient);
-
-    if (!d->client || !d->client->isConnected())
-        return;
-
-    QPacket pack;
-    pack << d->name << message;
-    d->client->d->protocol->send(pack);
-}
-
-void QmlDebugClient::messageReceived(const QByteArray &)
-{
-}
-
-QT_END_NAMESPACE
-
-#include <qmldebugclient.moc>
diff --git a/src/declarative/debugger/qmldebugclient_p.h b/src/declarative/debugger/qmldebugclient_p.h
deleted file mode 100644
index c3e6eff..0000000
--- a/src/declarative/debugger/qmldebugclient_p.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLDEBUGCLIENT_H
-#define QMLDEBUGCLIENT_H
-
-#include <QtNetwork/qtcpsocket.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlDebugConnectionPrivate;
-class Q_DECLARATIVE_EXPORT QmlDebugConnection : public QTcpSocket
-{
-    Q_OBJECT
-    Q_DISABLE_COPY(QmlDebugConnection)
-public:
-    QmlDebugConnection(QObject * = 0);
-
-    bool isConnected() const;
-private:
-    QmlDebugConnectionPrivate *d;
-    friend class QmlDebugClient;
-    friend class QmlDebugClientPrivate;
-};
-
-class QmlDebugClientPrivate;
-class Q_DECLARATIVE_EXPORT QmlDebugClient : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlDebugClient)
-    Q_DISABLE_COPY(QmlDebugClient)
-
-public:
-    QmlDebugClient(const QString &, QmlDebugConnection *parent);
-
-    QString name() const;
-
-    bool isEnabled() const;
-    void setEnabled(bool);
-
-    bool isConnected() const;
-
-    void sendMessage(const QByteArray &);
-
-protected:
-    virtual void messageReceived(const QByteArray &);
-
-private:
-    friend class QmlDebugConnection;
-    friend class QmlDebugConnectionPrivate;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLDEBUGCLIENT_H
diff --git a/src/declarative/debugger/qmldebuggerstatus.cpp b/src/declarative/debugger/qmldebuggerstatus.cpp
deleted file mode 100644
index 0f2a973..0000000
--- a/src/declarative/debugger/qmldebuggerstatus.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmldebuggerstatus_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QmlDebuggerStatus::~QmlDebuggerStatus()
-{
-}
-
-void QmlDebuggerStatus::setSelectedState(bool)
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qmldebuggerstatus_p.h b/src/declarative/debugger/qmldebuggerstatus_p.h
deleted file mode 100644
index 42538f3..0000000
--- a/src/declarative/debugger/qmldebuggerstatus_p.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLDEBUGGERSTATUS_P_H
-#define QMLDEBUGGERSTATUS_P_H
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QmlDebuggerStatus
-{
-public:
-    virtual ~QmlDebuggerStatus();
-
-    virtual void setSelectedState(bool);
-};
-Q_DECLARE_INTERFACE(QmlDebuggerStatus, "com.trolltech.qml.QmlDebuggerStatus")
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QLMDEBUGGERSTATUS_P_H
diff --git a/src/declarative/debugger/qmldebugservice.cpp b/src/declarative/debugger/qmldebugservice.cpp
deleted file mode 100644
index 7b21869..0000000
--- a/src/declarative/debugger/qmldebugservice.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmldebugservice_p.h"
-
-#include "qpacketprotocol_p.h"
-
-#include <QtCore/qdebug.h>
-#include <QtNetwork/qtcpserver.h>
-#include <QtNetwork/qtcpsocket.h>
-#include <QtCore/qstringlist.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlDebugServerPrivate;
-class QmlDebugServer : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlDebugServer)
-    Q_DISABLE_COPY(QmlDebugServer)
-public:
-    static QmlDebugServer *instance();
-    void wait();
-    void registerForStartNotification(QObject *object, const char *receiver);
-
-private Q_SLOTS:
-    void readyRead();
-    void registeredObjectDestroyed(QObject *object);
-
-private:
-    friend class QmlDebugService;
-    friend class QmlDebugServicePrivate;
-    QmlDebugServer(int); 
-};
-
-class QmlDebugServerPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlDebugServer)
-public:
-    QmlDebugServerPrivate();
-    void wait();
-
-    int port;
-    QTcpSocket *connection;
-    QPacketProtocol *protocol;
-    QHash<QString, QmlDebugService *> plugins;
-    QStringList enabledPlugins;
-    QList<QPair<QObject*, QByteArray> > notifyClients;
-};
-
-class QmlDebugServicePrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlDebugService)
-public:
-    QmlDebugServicePrivate();
-
-    QString name;
-    QmlDebugServer *server;
-};
-
-QmlDebugServerPrivate::QmlDebugServerPrivate()
-: connection(0), protocol(0)
-{
-}
-
-void QmlDebugServerPrivate::wait()
-{
-    Q_Q(QmlDebugServer);
-    QTcpServer server;
-
-    if (!server.listen(QHostAddress::Any, port)) {
-        qWarning("QmlDebugServer: Unable to listen on port %d", port);
-        return;
-    }
-
-    qWarning("QmlDebugServer: Waiting for connection on port %d...", port);
-
-    for (int i=0; i<notifyClients.count(); i++) {
-        if (!QMetaObject::invokeMethod(notifyClients[i].first, notifyClients[i].second)) {
-            qWarning() << "QmlDebugServer: unable to call method" << notifyClients[i].second
-                    << "on object" << notifyClients[i].first << "to notify of debug server start";
-        }
-    }
-    notifyClients.clear();
-
-    if (!server.waitForNewConnection(-1)) {
-        qWarning("QmlDebugServer: Connection error");
-        return;
-    }
-
-    connection = server.nextPendingConnection();
-    connection->setParent(q);
-    protocol = new QPacketProtocol(connection, q);
-
-    // ### Wait for hello
-    while (!protocol->packetsAvailable()) {
-        connection->waitForReadyRead();
-    }
-    QPacket hello = protocol->read();
-    QString name; 
-    hello >> name >> enabledPlugins;
-    if (name != QLatin1String("QmlDebugServer")) {
-        qWarning("QmlDebugServer: Invalid hello message");
-        delete protocol; delete connection; connection = 0; protocol = 0;
-        return;
-    }
-
-    QObject::connect(protocol, SIGNAL(readyRead()), q, SLOT(readyRead()));
-    q->readyRead();
-
-    qWarning("QmlDebugServer: Connection established");
-}
-
-QmlDebugServer *QmlDebugServer::instance()
-{
-    static bool envTested = false;
-    static QmlDebugServer *server = 0;
-
-    if (!envTested) {
-        envTested = true;
-        QByteArray env = qgetenv("QML_DEBUG_SERVER_PORT");
-
-        bool ok = false;
-        int port = env.toInt(&ok);
-
-        if (ok && port > 1024) 
-            server = new QmlDebugServer(port);
-    }
-
-    return server;
-}
-
-void QmlDebugServer::wait()
-{
-    Q_D(QmlDebugServer);
-    d->wait();
-}
-
-void QmlDebugServer::registerForStartNotification(QObject *object, const char *methodName)
-{
-    Q_D(QmlDebugServer);
-    connect(object, SIGNAL(destroyed(QObject*)), SLOT(registeredObjectDestroyed(QObject*)));
-    d->notifyClients.append(qMakePair(object, QByteArray(methodName)));
-}
-
-void QmlDebugServer::registeredObjectDestroyed(QObject *object)
-{
-    Q_D(QmlDebugServer);
-    QMutableListIterator<QPair<QObject*, QByteArray> > i(d->notifyClients);
-    while (i.hasNext()) {
-        if (i.next().first == object)
-            i.remove();
-    }
-}
-
-QmlDebugServer::QmlDebugServer(int port)
-: QObject(*(new QmlDebugServerPrivate))
-{
-    Q_D(QmlDebugServer);
-    d->port = port;
-}
-
-void QmlDebugServer::readyRead()
-{
-    Q_D(QmlDebugServer);
-
-    QString debugServer(QLatin1String("QmlDebugServer"));
-
-    while (d->protocol->packetsAvailable()) {
-        QPacket pack = d->protocol->read();
-
-        QString name;
-        pack >> name;
-
-        if (name == debugServer) {
-            int op = -1; QString plugin;
-            pack >> op >> plugin;
-
-            if (op == 1) {
-                // Enable
-                if (!d->enabledPlugins.contains(plugin)) {
-                    d->enabledPlugins.append(plugin);
-                    QHash<QString, QmlDebugService *>::Iterator iter = 
-                        d->plugins.find(plugin);
-                    if (iter != d->plugins.end())
-                        (*iter)->enabledChanged(true);
-                }
-
-            } else if (op == 2) {
-                // Disable
-                if (d->enabledPlugins.contains(plugin)) {
-                    d->enabledPlugins.removeAll(plugin);
-                    QHash<QString, QmlDebugService *>::Iterator iter = 
-                        d->plugins.find(plugin);
-                    if (iter != d->plugins.end())
-                        (*iter)->enabledChanged(false);
-                }
-            } else {
-                qWarning("QmlDebugServer: Invalid control message %d", op);
-            }
-
-        } else {
-            QByteArray message;
-            pack >> message;
-
-            QHash<QString, QmlDebugService *>::Iterator iter = 
-                d->plugins.find(name);
-            if (iter == d->plugins.end()) {
-                qWarning() << "QmlDebugServer: Message received for missing plugin" << name;
-            } else {
-                (*iter)->messageReceived(message);
-            }
-        }
-    }
-}
-
-QmlDebugServicePrivate::QmlDebugServicePrivate()
-: server(0)
-{
-}
-
-QmlDebugService::QmlDebugService(const QString &name, QObject *parent)
-: QObject(*(new QmlDebugServicePrivate), parent)
-{
-    Q_D(QmlDebugService);
-    d->name = name;
-    d->server = QmlDebugServer::instance();
-
-    if (!d->server)
-        return;
-
-    if (d->server->d_func()->plugins.contains(name)) {
-        qWarning() << "QmlDebugService: Conflicting plugin name" << name;
-        d->server = 0;
-    } else {
-        d->server->d_func()->plugins.insert(name, this);
-    }
-}
-
-QString QmlDebugService::name() const
-{
-    Q_D(const QmlDebugService);
-    return d->name;
-}
-
-bool QmlDebugService::isEnabled() const
-{
-    Q_D(const QmlDebugService);
-    return (d->server && d->server->d_func()->enabledPlugins.contains(d->name));
-}
-
-namespace {
-
-    struct ObjectReference 
-    {
-        QPointer<QObject> object;
-        int id;
-    };
-
-    struct ObjectReferenceHash 
-    {
-        ObjectReferenceHash() : nextId(0) {}
-
-        QHash<QObject *, ObjectReference> objects;
-        QHash<int, QObject *> ids;
-
-        int nextId;
-    };
-
-}
-Q_GLOBAL_STATIC(ObjectReferenceHash, objectReferenceHash);
-
-
-/*!
-    Returns a unique id for \a object.  Calling this method multiple times
-    for the same object will return the same id.
-*/
-int QmlDebugService::idForObject(QObject *object)
-{
-    if (!object)
-        return -1;
-
-    ObjectReferenceHash *hash = objectReferenceHash();
-    QHash<QObject *, ObjectReference>::Iterator iter = 
-        hash->objects.find(object);
-
-    if (iter == hash->objects.end()) {
-        int id = hash->nextId++;
-
-        hash->ids.insert(id, object);
-        iter = hash->objects.insert(object, ObjectReference());
-        iter->object = object;
-        iter->id = id;
-    } else if (iter->object != object) {
-        int id = hash->nextId++;
-
-        hash->ids.remove(iter->id);
-
-        hash->ids.insert(id, object);
-        iter->object = object;
-        iter->id = id;
-    } 
-    return iter->id;
-}
-
-/*!
-    Returns the object for unique \a id.  If the object has not previously been
-    assigned an id, through idForObject(), then 0 is returned.  If the object
-    has been destroyed, 0 is returned.
-*/
-QObject *QmlDebugService::objectForId(int id)
-{
-    ObjectReferenceHash *hash = objectReferenceHash();
-
-    QHash<int, QObject *>::Iterator iter = hash->ids.find(id);
-    if (iter == hash->ids.end())
-        return 0;
-
-
-    QHash<QObject *, ObjectReference>::Iterator objIter = 
-        hash->objects.find(*iter);
-    Q_ASSERT(objIter != hash->objects.end());
-
-    if (objIter->object == 0) {
-        hash->ids.erase(iter);
-        hash->objects.erase(objIter);
-        return 0;
-    } else {
-        return *iter;
-    }
-}
-
-bool QmlDebugService::isDebuggingEnabled()
-{
-    return QmlDebugServer::instance() != 0;
-}
-
-QString QmlDebugService::objectToString(QObject *obj)
-{
-    if(!obj)
-        return QLatin1String("NULL");
-
-    QString objectName = obj->objectName();
-    if(objectName.isEmpty())
-        objectName = QLatin1String("<unnamed>");
-
-    QString rv = QString::fromUtf8(obj->metaObject()->className()) + 
-                 QLatin1String(": ") + objectName;
-
-    return rv;
-}
-
-void QmlDebugService::waitForClients()
-{
-    QmlDebugServer::instance()->wait();
-}
-
-void QmlDebugService::notifyOnServerStart(QObject *object, const char *receiver)
-{
-    QmlDebugServer::instance()->registerForStartNotification(object, receiver);
-}
-
-void QmlDebugService::sendMessage(const QByteArray &message)
-{
-    Q_D(QmlDebugService);
-
-    if (!d->server || !d->server->d_func()->connection)
-        return;
-
-    QPacket pack;
-    pack << d->name << message;
-    d->server->d_func()->protocol->send(pack);
-    d->server->d_func()->connection->flush();
-}
-
-void QmlDebugService::enabledChanged(bool)
-{
-}
-
-void QmlDebugService::messageReceived(const QByteArray &)
-{
-}
-
-QT_END_NAMESPACE
-
-#include <qmldebugservice.moc>
diff --git a/src/declarative/debugger/qmldebugservice_p.h b/src/declarative/debugger/qmldebugservice_p.h
deleted file mode 100644
index 33ddda0..0000000
--- a/src/declarative/debugger/qmldebugservice_p.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLDEBUGSERVICE_H
-#define QMLDEBUGSERVICE_H
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlDebugServicePrivate;
-class Q_DECLARATIVE_EXPORT QmlDebugService : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlDebugService)
-    Q_DISABLE_COPY(QmlDebugService)
-public:
-    QmlDebugService(const QString &, QObject *parent = 0);
-
-    QString name() const;
-
-    bool isEnabled() const;
-
-    void sendMessage(const QByteArray &);
-
-    static int idForObject(QObject *);
-    static QObject *objectForId(int);
-
-    static bool isDebuggingEnabled();
-    static QString objectToString(QObject *obj);
-
-    static void waitForClients();
-
-    static void notifyOnServerStart(QObject *object, const char *receiver);
-
-protected:
-    virtual void enabledChanged(bool);
-    virtual void messageReceived(const QByteArray &);
-
-private:
-    void registerForStartNotification(QObject *object, const char *methodName);
-    friend class QmlDebugServer;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLDEBUGSERVICE_H
-
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 05eb566..4287e25 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -9,7 +9,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
 
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtXml
 
-exists("qml_enable_gcov") {
+exists("qdeclarative_enable_gcov") {
     QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
     LIBS += -lgcov
 }
diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri
index e5343c6..7a85f00 100644
--- a/src/declarative/graphicsitems/graphicsitems.pri
+++ b/src/declarative/graphicsitems/graphicsitems.pri
@@ -1,93 +1,93 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qmlgraphicsitemsmodule_p.h \
-    $$PWD/qmlgraphicsanchors_p.h \
-    $$PWD/qmlgraphicsanchors_p_p.h \
-    $$PWD/qmlgraphicsevents_p_p.h \
-    $$PWD/qmlgraphicseffects_p.h \
-    $$PWD/qmlgraphicsflickable_p.h \
-    $$PWD/qmlgraphicsflickable_p_p.h \
-    $$PWD/qmlgraphicsflipable_p.h \
-    $$PWD/qmlgraphicsgridview_p.h \
-    $$PWD/qmlgraphicsimage_p.h \
-    $$PWD/qmlgraphicsimagebase_p.h \
-    $$PWD/qmlgraphicsborderimage_p.h \
-    $$PWD/qmlgraphicspainteditem_p.h \
-    $$PWD/qmlgraphicspainteditem_p_p.h \
-    $$PWD/qmlgraphicsimage_p_p.h \
-    $$PWD/qmlgraphicsborderimage_p_p.h \
-    $$PWD/qmlgraphicsimagebase_p_p.h \
-    $$PWD/qmlgraphicsanimatedimage_p.h \
-    $$PWD/qmlgraphicsanimatedimage_p_p.h \
-    $$PWD/qmlgraphicsitem.h \
-    $$PWD/qmlgraphicsitem_p.h \
-    $$PWD/qmlgraphicsfocuspanel_p.h \
-    $$PWD/qmlgraphicsfocusscope_p.h \
-    $$PWD/qmlgraphicspositioners_p.h \
-    $$PWD/qmlgraphicspositioners_p_p.h \
-    $$PWD/qmlgraphicsloader_p.h \
-    $$PWD/qmlgraphicsloader_p_p.h \
-    $$PWD/qmlgraphicsmousearea_p.h \
-    $$PWD/qmlgraphicsmousearea_p_p.h \
-    $$PWD/qmlgraphicspath_p.h \
-    $$PWD/qmlgraphicspath_p_p.h \
-    $$PWD/qmlgraphicspathview_p.h \
-    $$PWD/qmlgraphicspathview_p_p.h \
-    $$PWD/qmlgraphicsrectangle_p.h \
-    $$PWD/qmlgraphicsrectangle_p_p.h \
-    $$PWD/qmlgraphicsrepeater_p.h \
-    $$PWD/qmlgraphicsrepeater_p_p.h \
-    $$PWD/qmlgraphicsscalegrid_p_p.h \
-    $$PWD/qmlgraphicstextinput_p.h \
-    $$PWD/qmlgraphicstextinput_p_p.h \
-    $$PWD/qmlgraphicstextedit_p.h \
-    $$PWD/qmlgraphicstextedit_p_p.h \
-    $$PWD/qmlgraphicstext_p.h \
-    $$PWD/qmlgraphicstext_p_p.h \
-    $$PWD/qmlgraphicsvisualitemmodel_p.h \
-    $$PWD/qmlgraphicslistview_p.h \
-    $$PWD/qmlgraphicsgraphicsobjectcontainer_p.h \
-    $$PWD/qmlgraphicsparticles_p.h \
-    $$PWD/qmlgraphicslayoutitem_p.h \
-    $$PWD/qmlgraphicsitemchangelistener_p.h \
-    $$PWD/qmlgraphicseffects.cpp
+    $$PWD/qdeclarativeitemsmodule_p.h \
+    $$PWD/qdeclarativeanchors_p.h \
+    $$PWD/qdeclarativeanchors_p_p.h \
+    $$PWD/qdeclarativeevents_p_p.h \
+    $$PWD/qdeclarativeeffects_p.h \
+    $$PWD/qdeclarativeflickable_p.h \
+    $$PWD/qdeclarativeflickable_p_p.h \
+    $$PWD/qdeclarativeflipable_p.h \
+    $$PWD/qdeclarativegridview_p.h \
+    $$PWD/qdeclarativeimage_p.h \
+    $$PWD/qdeclarativeimagebase_p.h \
+    $$PWD/qdeclarativeborderimage_p.h \
+    $$PWD/qdeclarativepainteditem_p.h \
+    $$PWD/qdeclarativepainteditem_p_p.h \
+    $$PWD/qdeclarativeimage_p_p.h \
+    $$PWD/qdeclarativeborderimage_p_p.h \
+    $$PWD/qdeclarativeimagebase_p_p.h \
+    $$PWD/qdeclarativeanimatedimage_p.h \
+    $$PWD/qdeclarativeanimatedimage_p_p.h \
+    $$PWD/qdeclarativeitem.h \
+    $$PWD/qdeclarativeitem_p.h \
+    $$PWD/qdeclarativefocuspanel_p.h \
+    $$PWD/qdeclarativefocusscope_p.h \
+    $$PWD/qdeclarativepositioners_p.h \
+    $$PWD/qdeclarativepositioners_p_p.h \
+    $$PWD/qdeclarativeloader_p.h \
+    $$PWD/qdeclarativeloader_p_p.h \
+    $$PWD/qdeclarativemousearea_p.h \
+    $$PWD/qdeclarativemousearea_p_p.h \
+    $$PWD/qdeclarativepath_p.h \
+    $$PWD/qdeclarativepath_p_p.h \
+    $$PWD/qdeclarativepathview_p.h \
+    $$PWD/qdeclarativepathview_p_p.h \
+    $$PWD/qdeclarativerectangle_p.h \
+    $$PWD/qdeclarativerectangle_p_p.h \
+    $$PWD/qdeclarativerepeater_p.h \
+    $$PWD/qdeclarativerepeater_p_p.h \
+    $$PWD/qdeclarativescalegrid_p_p.h \
+    $$PWD/qdeclarativetextinput_p.h \
+    $$PWD/qdeclarativetextinput_p_p.h \
+    $$PWD/qdeclarativetextedit_p.h \
+    $$PWD/qdeclarativetextedit_p_p.h \
+    $$PWD/qdeclarativetext_p.h \
+    $$PWD/qdeclarativetext_p_p.h \
+    $$PWD/qdeclarativevisualitemmodel_p.h \
+    $$PWD/qdeclarativelistview_p.h \
+    $$PWD/qdeclarativegraphicsobjectcontainer_p.h \
+    $$PWD/qdeclarativeparticles_p.h \
+    $$PWD/qdeclarativelayoutitem_p.h \
+    $$PWD/qdeclarativeitemchangelistener_p.h \
+    $$PWD/qdeclarativeeffects.cpp
 
 SOURCES += \
-    $$PWD/qmlgraphicsitemsmodule.cpp \
-    $$PWD/qmlgraphicsanchors.cpp \
-    $$PWD/qmlgraphicsevents.cpp \
-    $$PWD/qmlgraphicsflickable.cpp \
-    $$PWD/qmlgraphicsflipable.cpp \
-    $$PWD/qmlgraphicsgridview.cpp \
-    $$PWD/qmlgraphicsimage.cpp \
-    $$PWD/qmlgraphicsborderimage.cpp \
-    $$PWD/qmlgraphicsimagebase.cpp \
-    $$PWD/qmlgraphicsanimatedimage.cpp \
-    $$PWD/qmlgraphicspainteditem.cpp \
-    $$PWD/qmlgraphicsitem.cpp \
-    $$PWD/qmlgraphicsfocuspanel.cpp \
-    $$PWD/qmlgraphicsfocusscope.cpp \
-    $$PWD/qmlgraphicspositioners.cpp \
-    $$PWD/qmlgraphicsloader.cpp \
-    $$PWD/qmlgraphicsmousearea.cpp \
-    $$PWD/qmlgraphicspath.cpp \
-    $$PWD/qmlgraphicspathview.cpp \
-    $$PWD/qmlgraphicsrectangle.cpp \
-    $$PWD/qmlgraphicsrepeater.cpp \
-    $$PWD/qmlgraphicsscalegrid.cpp \
-    $$PWD/qmlgraphicstextinput.cpp \
-    $$PWD/qmlgraphicstext.cpp \
-    $$PWD/qmlgraphicstextedit.cpp \
-    $$PWD/qmlgraphicsvisualitemmodel.cpp \
-    $$PWD/qmlgraphicslistview.cpp \
-    $$PWD/qmlgraphicsgraphicsobjectcontainer.cpp \
-    $$PWD/qmlgraphicsparticles.cpp \
-    $$PWD/qmlgraphicslayoutitem.cpp \
+    $$PWD/qdeclarativeitemsmodule.cpp \
+    $$PWD/qdeclarativeanchors.cpp \
+    $$PWD/qdeclarativeevents.cpp \
+    $$PWD/qdeclarativeflickable.cpp \
+    $$PWD/qdeclarativeflipable.cpp \
+    $$PWD/qdeclarativegridview.cpp \
+    $$PWD/qdeclarativeimage.cpp \
+    $$PWD/qdeclarativeborderimage.cpp \
+    $$PWD/qdeclarativeimagebase.cpp \
+    $$PWD/qdeclarativeanimatedimage.cpp \
+    $$PWD/qdeclarativepainteditem.cpp \
+    $$PWD/qdeclarativeitem.cpp \
+    $$PWD/qdeclarativefocuspanel.cpp \
+    $$PWD/qdeclarativefocusscope.cpp \
+    $$PWD/qdeclarativepositioners.cpp \
+    $$PWD/qdeclarativeloader.cpp \
+    $$PWD/qdeclarativemousearea.cpp \
+    $$PWD/qdeclarativepath.cpp \
+    $$PWD/qdeclarativepathview.cpp \
+    $$PWD/qdeclarativerectangle.cpp \
+    $$PWD/qdeclarativerepeater.cpp \
+    $$PWD/qdeclarativescalegrid.cpp \
+    $$PWD/qdeclarativetextinput.cpp \
+    $$PWD/qdeclarativetext.cpp \
+    $$PWD/qdeclarativetextedit.cpp \
+    $$PWD/qdeclarativevisualitemmodel.cpp \
+    $$PWD/qdeclarativelistview.cpp \
+    $$PWD/qdeclarativegraphicsobjectcontainer.cpp \
+    $$PWD/qdeclarativeparticles.cpp \
+    $$PWD/qdeclarativelayoutitem.cpp \
 
 contains(QT_CONFIG, webkit) {
     QT+=webkit
-    SOURCES += $$PWD/qmlgraphicswebview.cpp
-    HEADERS += $$PWD/qmlgraphicswebview_p.h
-    HEADERS += $$PWD/qmlgraphicswebview_p_p.h
+    SOURCES += $$PWD/qdeclarativewebview.cpp
+    HEADERS += $$PWD/qdeclarativewebview_p.h
+    HEADERS += $$PWD/qdeclarativewebview_p_p.h
 }
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
new file mode 100644
index 0000000..274d778
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
@@ -0,0 +1,1059 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeanchors_p_p.h"
+
+#include "qdeclarativeitem.h"
+#include "qdeclarativeitem_p.h"
+
+#include <qdeclarativeinfo.h>
+
+#include <QDebug>
+
+QT_BEGIN_NAMESPACE
+
+//TODO: should we cache relationships, so we don't have to check each time (parent-child or sibling)?
+//TODO: support non-parent, non-sibling (need to find lowest common ancestor)
+
+//### const item?
+//local position
+static qreal position(QDeclarativeItem *item, QDeclarativeAnchorLine::AnchorLine anchorLine)
+{
+    qreal ret = 0.0;
+    switch(anchorLine) {
+    case QDeclarativeAnchorLine::Left:
+        ret = item->x();
+        break;
+    case QDeclarativeAnchorLine::Right:
+        ret = item->x() + item->width();
+        break;
+    case QDeclarativeAnchorLine::Top:
+        ret = item->y();
+        break;
+    case QDeclarativeAnchorLine::Bottom:
+        ret = item->y() + item->height();
+        break;
+    case QDeclarativeAnchorLine::HCenter:
+        ret = item->x() + item->width()/2;
+        break;
+    case QDeclarativeAnchorLine::VCenter:
+        ret = item->y() + item->height()/2;
+        break;
+    case QDeclarativeAnchorLine::Baseline:
+        ret = item->y() + item->baselineOffset();
+        break;
+    default:
+        break;
+    }
+
+    return ret;
+}
+
+//position when origin is 0,0
+static qreal adjustedPosition(QDeclarativeItem *item, QDeclarativeAnchorLine::AnchorLine anchorLine)
+{
+    int ret = 0;
+    switch(anchorLine) {
+    case QDeclarativeAnchorLine::Left:
+        ret = 0;
+        break;
+    case QDeclarativeAnchorLine::Right:
+        ret = item->width();
+        break;
+    case QDeclarativeAnchorLine::Top:
+        ret = 0;
+        break;
+    case QDeclarativeAnchorLine::Bottom:
+        ret = item->height();
+        break;
+    case QDeclarativeAnchorLine::HCenter:
+        ret = item->width()/2;
+        break;
+    case QDeclarativeAnchorLine::VCenter:
+        ret = item->height()/2;
+        break;
+    case QDeclarativeAnchorLine::Baseline:
+        ret = item->baselineOffset();
+        break;
+    default:
+        break;
+    }
+
+    return ret;
+}
+
+/*!
+    \internal
+    \class QDeclarativeAnchors
+    \since 4.7
+    \ingroup group_layouts
+    \brief The QDeclarativeAnchors class provides a way to lay out items relative to other items.
+
+    \warning Currently, only anchoring to siblings or parent is supported.
+*/
+
+QDeclarativeAnchors::QDeclarativeAnchors(QObject *parent)
+  : QObject(*new QDeclarativeAnchorsPrivate(0), parent)
+{
+    qFatal("QDeclarativeAnchors::QDeclarativeAnchors(QObject*) called");
+}
+
+QDeclarativeAnchors::QDeclarativeAnchors(QDeclarativeItem *item, QObject *parent)
+  : QObject(*new QDeclarativeAnchorsPrivate(item), parent)
+{
+}
+
+QDeclarativeAnchors::~QDeclarativeAnchors()
+{
+    Q_D(QDeclarativeAnchors);
+    d->remDepend(d->fill);
+    d->remDepend(d->centerIn);
+    d->remDepend(d->left.item);
+    d->remDepend(d->right.item);
+    d->remDepend(d->top.item);
+    d->remDepend(d->bottom.item);
+    d->remDepend(d->vCenter.item);
+    d->remDepend(d->hCenter.item);
+    d->remDepend(d->baseline.item);
+}
+
+void QDeclarativeAnchorsPrivate::fillChanged()
+{
+    if (!fill || !isItemComplete())
+        return;
+
+    if (updatingFill < 2) {
+        ++updatingFill;
+
+        if (fill == item->parentItem()) {                         //child-parent
+            setItemPos(QPointF(leftMargin, topMargin));
+        } else if (fill->parentItem() == item->parentItem()) {   //siblings
+            setItemPos(QPointF(fill->x()+leftMargin, fill->y()+topMargin));
+        }
+        setItemWidth(fill->width()-leftMargin-rightMargin);
+        setItemHeight(fill->height()-topMargin-bottomMargin);
+
+        --updatingFill;
+    } else {
+        // ### Make this certain :)
+        qmlInfo(item) << QDeclarativeAnchors::tr("Possible anchor loop detected on fill.");
+    }
+
+}
+
+void QDeclarativeAnchorsPrivate::centerInChanged()
+{
+    if (!centerIn || fill || !isItemComplete())
+        return;
+
+    if (updatingCenterIn < 2) {
+        ++updatingCenterIn;
+
+        if (centerIn == item->parentItem()) {
+            QPointF p((item->parentItem()->width() - item->width()) / 2. + hCenterOffset,
+                      (item->parentItem()->height() - item->height()) / 2. + vCenterOffset);
+            setItemPos(p);
+
+        } else if (centerIn->parentItem() == item->parentItem()) {
+
+            QPointF p(centerIn->x() + (centerIn->width() - item->width()) / 2. + hCenterOffset,
+                      centerIn->y() + (centerIn->height() - item->height()) / 2. + vCenterOffset);
+            setItemPos(p);
+        }
+
+        --updatingCenterIn;
+    } else {
+        // ### Make this certain :)
+        qmlInfo(item) << QDeclarativeAnchors::tr("Possible anchor loop detected on centerIn.");
+    }
+}
+
+void QDeclarativeAnchorsPrivate::clearItem(QDeclarativeItem *item)
+{
+    if (!item)
+        return;
+    if (fill == item)
+        fill = 0;
+    if (centerIn == item)
+        centerIn = 0;
+    if (left.item == item) {
+        left.item = 0;
+        usedAnchors &= ~QDeclarativeAnchors::HasLeftAnchor;
+    }
+    if (right.item == item) {
+        right.item = 0;
+        usedAnchors &= ~QDeclarativeAnchors::HasRightAnchor;
+    }
+    if (top.item == item) {
+        top.item = 0;
+        usedAnchors &= ~QDeclarativeAnchors::HasTopAnchor;
+    }
+    if (bottom.item == item) {
+        bottom.item = 0;
+        usedAnchors &= ~QDeclarativeAnchors::HasBottomAnchor;
+    }
+    if (vCenter.item == item) {
+        vCenter.item = 0;
+        usedAnchors &= ~QDeclarativeAnchors::HasVCenterAnchor;
+    }
+    if (hCenter.item == item) {
+        hCenter.item = 0;
+        usedAnchors &= ~QDeclarativeAnchors::HasHCenterAnchor;
+    }
+    if (baseline.item == item) {
+        baseline.item = 0;
+        usedAnchors &= ~QDeclarativeAnchors::HasBaselineAnchor;
+    }
+}
+
+void QDeclarativeAnchorsPrivate::addDepend(QDeclarativeItem *item)
+{
+    if (!item)
+        return;
+    QDeclarativeItemPrivate *p =
+        static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(item));
+    p->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
+}
+
+void QDeclarativeAnchorsPrivate::remDepend(QDeclarativeItem *item)
+{
+    if (!item)
+        return;
+    QDeclarativeItemPrivate *p =
+        static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(item));
+    p->removeItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
+}
+
+bool QDeclarativeAnchorsPrivate::isItemComplete() const
+{
+    return componentComplete;
+}
+
+void QDeclarativeAnchors::classBegin()
+{
+    Q_D(QDeclarativeAnchors);
+    d->componentComplete = false;
+}
+
+void QDeclarativeAnchors::componentComplete()
+{
+    Q_D(QDeclarativeAnchors);
+    d->componentComplete = true;
+}
+
+void QDeclarativeAnchorsPrivate::setItemHeight(qreal v)
+{
+    updatingMe = true;
+    item->setHeight(v);
+    updatingMe = false;
+}
+
+void QDeclarativeAnchorsPrivate::setItemWidth(qreal v)
+{
+    updatingMe = true;
+    item->setWidth(v);
+    updatingMe = false;
+}
+
+void QDeclarativeAnchorsPrivate::setItemX(qreal v)
+{
+    updatingMe = true;
+    item->setX(v);
+    updatingMe = false;
+}
+
+void QDeclarativeAnchorsPrivate::setItemY(qreal v)
+{
+    updatingMe = true;
+    item->setY(v);
+    updatingMe = false;
+}
+
+void QDeclarativeAnchorsPrivate::setItemPos(const QPointF &v)
+{
+    updatingMe = true;
+    item->setPos(v);
+    updatingMe = false;
+}
+
+void QDeclarativeAnchorsPrivate::updateMe()
+{
+    if (updatingMe) {
+        updatingMe = false;
+        return;
+    }
+
+    fillChanged();
+    centerInChanged();
+    updateHorizontalAnchors();
+    updateVerticalAnchors();
+}
+
+void QDeclarativeAnchorsPrivate::updateOnComplete()
+{
+    fillChanged();
+    centerInChanged();
+    updateHorizontalAnchors();
+    updateVerticalAnchors();
+}
+
+void QDeclarativeAnchorsPrivate::itemGeometryChanged(QDeclarativeItem *, const QRectF &newG, const QRectF &oldG)
+{
+    fillChanged();
+    centerInChanged();
+
+    if (newG.x() != oldG.x() || newG.width() != oldG.width())
+        updateHorizontalAnchors();
+    if (newG.y() != oldG.y() || newG.height() != oldG.height())
+        updateVerticalAnchors();
+}
+
+QDeclarativeItem *QDeclarativeAnchors::fill() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->fill;
+}
+
+void QDeclarativeAnchors::setFill(QDeclarativeItem *f)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->fill == f)
+        return;
+
+    if (!f) {
+        d->remDepend(d->fill);
+        d->fill = f;
+        emit fillChanged();
+        return;
+    }
+    if (f != d->item->parentItem() && f->parentItem() != d->item->parentItem()){
+        qmlInfo(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
+        return;
+    }
+    d->remDepend(d->fill);
+    d->fill = f;
+    d->addDepend(d->fill);
+    emit fillChanged();
+    d->fillChanged();
+}
+
+void QDeclarativeAnchors::resetFill()
+{
+    setFill(0);
+}
+
+QDeclarativeItem *QDeclarativeAnchors::centerIn() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->centerIn;
+}
+
+void QDeclarativeAnchors::setCenterIn(QDeclarativeItem* c)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->centerIn == c)
+        return;
+
+    if (!c) {
+        d->remDepend(d->centerIn);
+        d->centerIn = c;
+        emit centerInChanged();
+        return;
+    }
+    if (c != d->item->parentItem() && c->parentItem() != d->item->parentItem()){
+        qmlInfo(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
+        return;
+    }
+
+    d->remDepend(d->centerIn);
+    d->centerIn = c;
+    d->addDepend(d->centerIn);
+    emit centerInChanged();
+    d->centerInChanged();
+}
+
+void QDeclarativeAnchors::resetCenterIn()
+{
+    setCenterIn(0);
+}
+
+bool QDeclarativeAnchorsPrivate::calcStretch(const QDeclarativeAnchorLine &edge1,
+                                    const QDeclarativeAnchorLine &edge2,
+                                    int offset1,
+                                    int offset2,
+                                    QDeclarativeAnchorLine::AnchorLine line,
+                                    int &stretch)
+{
+    bool edge1IsParent = (edge1.item == item->parentItem());
+    bool edge2IsParent = (edge2.item == item->parentItem());
+    bool edge1IsSibling = (edge1.item->parentItem() == item->parentItem());
+    bool edge2IsSibling = (edge2.item->parentItem() == item->parentItem());
+
+    bool invalid = false;
+    if ((edge2IsParent && edge1IsParent) || (edge2IsSibling && edge1IsSibling)) {
+        stretch = ((int)position(edge2.item, edge2.anchorLine) + offset2)
+                    - ((int)position(edge1.item, edge1.anchorLine) + offset1);
+    } else if (edge2IsParent && edge1IsSibling) {
+        stretch = ((int)position(edge2.item, edge2.anchorLine) + offset2)
+                    - ((int)position(item->parentItem(), line)
+                    + (int)position(edge1.item, edge1.anchorLine) + offset1);
+    } else if (edge2IsSibling && edge1IsParent) {
+        stretch = ((int)position(item->parentItem(), line) + (int)position(edge2.item, edge2.anchorLine) + offset2)
+                    - ((int)position(edge1.item, edge1.anchorLine) + offset1);
+    } else
+        invalid = true;
+
+    return invalid;
+}
+
+void QDeclarativeAnchorsPrivate::updateVerticalAnchors()
+{
+    if (fill || centerIn || !isItemComplete())
+        return;
+
+    if (updatingVerticalAnchor < 2) {
+        ++updatingVerticalAnchor;
+        if (usedAnchors & QDeclarativeAnchors::HasTopAnchor) {
+            //Handle stretching
+            bool invalid = true;
+            int height = 0;
+            if (usedAnchors & QDeclarativeAnchors::HasBottomAnchor) {
+                invalid = calcStretch(top, bottom, topMargin, -bottomMargin, QDeclarativeAnchorLine::Top, height);
+            } else if (usedAnchors & QDeclarativeAnchors::HasVCenterAnchor) {
+                invalid = calcStretch(top, vCenter, topMargin, vCenterOffset, QDeclarativeAnchorLine::Top, height);
+                height *= 2;
+            }
+            if (!invalid)
+                setItemHeight(height);
+
+            //Handle top
+            if (top.item == item->parentItem()) {
+                setItemY(adjustedPosition(top.item, top.anchorLine) + topMargin);
+            } else if (top.item->parentItem() == item->parentItem()) {
+                setItemY(position(top.item, top.anchorLine) + topMargin);
+            }
+        } else if (usedAnchors & QDeclarativeAnchors::HasBottomAnchor) {
+            //Handle stretching (top + bottom case is handled above)
+            if (usedAnchors & QDeclarativeAnchors::HasVCenterAnchor) {
+                int height = 0;
+                bool invalid = calcStretch(vCenter, bottom, vCenterOffset, -bottomMargin,
+                                              QDeclarativeAnchorLine::Top, height);
+                if (!invalid)
+                    setItemHeight(height*2);
+            }
+
+            //Handle bottom
+            if (bottom.item == item->parentItem()) {
+                setItemY(adjustedPosition(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
+            } else if (bottom.item->parentItem() == item->parentItem()) {
+                setItemY(position(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
+            }
+        } else if (usedAnchors & QDeclarativeAnchors::HasVCenterAnchor) {
+            //(stetching handled above)
+
+            //Handle vCenter
+            if (vCenter.item == item->parentItem()) {
+                setItemY(adjustedPosition(vCenter.item, vCenter.anchorLine)
+                              - item->height()/2 + vCenterOffset);
+            } else if (vCenter.item->parentItem() == item->parentItem()) {
+                setItemY(position(vCenter.item, vCenter.anchorLine) - item->height()/2 + vCenterOffset);
+            }
+        } else if (usedAnchors & QDeclarativeAnchors::HasBaselineAnchor) {
+            //Handle baseline
+            if (baseline.item == item->parentItem()) {
+                setItemY(adjustedPosition(baseline.item, baseline.anchorLine)
+                        - item->baselineOffset() + baselineOffset);
+            } else if (baseline.item->parentItem() == item->parentItem()) {
+                setItemY(position(baseline.item, baseline.anchorLine)
+                        - item->baselineOffset() + baselineOffset);
+            }
+        }
+        --updatingVerticalAnchor;
+    } else {
+        // ### Make this certain :)
+        qmlInfo(item) << QDeclarativeAnchors::tr("Possible anchor loop detected on vertical anchor.");
+    }
+}
+
+void QDeclarativeAnchorsPrivate::updateHorizontalAnchors()
+{
+    if (fill || centerIn || !isItemComplete())
+        return;
+
+    if (updatingHorizontalAnchor < 2) {
+        ++updatingHorizontalAnchor;
+
+        if (usedAnchors & QDeclarativeAnchors::HasLeftAnchor) {
+            //Handle stretching
+            bool invalid = true;
+            int width = 0;
+            if (usedAnchors & QDeclarativeAnchors::HasRightAnchor) {
+                invalid = calcStretch(left, right, leftMargin, -rightMargin, QDeclarativeAnchorLine::Left, width);
+            } else if (usedAnchors & QDeclarativeAnchors::HasHCenterAnchor) {
+                invalid = calcStretch(left, hCenter, leftMargin, hCenterOffset, QDeclarativeAnchorLine::Left, width);
+                width *= 2;
+            }
+            if (!invalid)
+                setItemWidth(width);
+
+            //Handle left
+            if (left.item == item->parentItem()) {
+                setItemX(adjustedPosition(left.item, left.anchorLine) + leftMargin);
+            } else if (left.item->parentItem() == item->parentItem()) {
+                setItemX(position(left.item, left.anchorLine) + leftMargin);
+            }
+        } else if (usedAnchors & QDeclarativeAnchors::HasRightAnchor) {
+            //Handle stretching (left + right case is handled in updateLeftAnchor)
+            if (usedAnchors & QDeclarativeAnchors::HasHCenterAnchor) {
+                int width = 0;
+                bool invalid = calcStretch(hCenter, right, hCenterOffset, -rightMargin,
+                                              QDeclarativeAnchorLine::Left, width);
+                if (!invalid)
+                    setItemWidth(width*2);
+            }
+
+            //Handle right
+            if (right.item == item->parentItem()) {
+                setItemX(adjustedPosition(right.item, right.anchorLine) - item->width() - rightMargin);
+            } else if (right.item->parentItem() == item->parentItem()) {
+                setItemX(position(right.item, right.anchorLine) - item->width() - rightMargin);
+            }
+        } else if (usedAnchors & QDeclarativeAnchors::HasHCenterAnchor) {
+            //Handle hCenter
+            if (hCenter.item == item->parentItem()) {
+                setItemX(adjustedPosition(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
+            } else if (hCenter.item->parentItem() == item->parentItem()) {
+                setItemX(position(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
+            }
+        }
+
+        --updatingHorizontalAnchor;
+    } else {
+        // ### Make this certain :)
+        qmlInfo(item) << QDeclarativeAnchors::tr("Possible anchor loop detected on horizontal anchor.");
+    }
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchors::top() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->top;
+}
+
+void QDeclarativeAnchors::setTop(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchors);
+    if (!d->checkVAnchorValid(edge) || d->top == edge)
+        return;
+
+    d->usedAnchors |= HasTopAnchor;
+
+    if (!d->checkVValid()) {
+        d->usedAnchors &= ~HasTopAnchor;
+        return;
+    }
+
+    d->remDepend(d->top.item);
+    d->top = edge;
+    d->addDepend(d->top.item);
+    emit topChanged();
+    d->updateVerticalAnchors();
+}
+
+void QDeclarativeAnchors::resetTop()
+{
+    Q_D(QDeclarativeAnchors);
+    d->usedAnchors &= ~HasTopAnchor;
+    d->remDepend(d->top.item);
+    d->top = QDeclarativeAnchorLine();
+    emit topChanged();
+    d->updateVerticalAnchors();
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchors::bottom() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->bottom;
+}
+
+void QDeclarativeAnchors::setBottom(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchors);
+    if (!d->checkVAnchorValid(edge) || d->bottom == edge)
+        return;
+
+    d->usedAnchors |= HasBottomAnchor;
+
+    if (!d->checkVValid()) {
+        d->usedAnchors &= ~HasBottomAnchor;
+        return;
+    }
+
+    d->remDepend(d->bottom.item);
+    d->bottom = edge;
+    d->addDepend(d->bottom.item);
+    emit bottomChanged();
+    d->updateVerticalAnchors();
+}
+
+void QDeclarativeAnchors::resetBottom()
+{
+    Q_D(QDeclarativeAnchors);
+    d->usedAnchors &= ~HasBottomAnchor;
+    d->remDepend(d->bottom.item);
+    d->bottom = QDeclarativeAnchorLine();
+    emit bottomChanged();
+    d->updateVerticalAnchors();
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchors::verticalCenter() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->vCenter;
+}
+
+void QDeclarativeAnchors::setVerticalCenter(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchors);
+    if (!d->checkVAnchorValid(edge) || d->vCenter == edge)
+        return;
+
+    d->usedAnchors |= HasVCenterAnchor;
+
+    if (!d->checkVValid()) {
+        d->usedAnchors &= ~HasVCenterAnchor;
+        return;
+    }
+
+    d->remDepend(d->vCenter.item);
+    d->vCenter = edge;
+    d->addDepend(d->vCenter.item);
+    emit verticalCenterChanged();
+    d->updateVerticalAnchors();
+}
+
+void QDeclarativeAnchors::resetVerticalCenter()
+{
+    Q_D(QDeclarativeAnchors);
+    d->usedAnchors &= ~HasVCenterAnchor;
+    d->remDepend(d->vCenter.item);
+    d->vCenter = QDeclarativeAnchorLine();
+    emit verticalCenterChanged();
+    d->updateVerticalAnchors();
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchors::baseline() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->baseline;
+}
+
+void QDeclarativeAnchors::setBaseline(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchors);
+    if (!d->checkVAnchorValid(edge) || d->baseline == edge)
+        return;
+
+    d->usedAnchors |= HasBaselineAnchor;
+
+    if (!d->checkVValid()) {
+        d->usedAnchors &= ~HasBaselineAnchor;
+        return;
+    }
+
+    d->remDepend(d->baseline.item);
+    d->baseline = edge;
+    d->addDepend(d->baseline.item);
+    emit baselineChanged();
+    d->updateVerticalAnchors();
+}
+
+void QDeclarativeAnchors::resetBaseline()
+{
+    Q_D(QDeclarativeAnchors);
+    d->usedAnchors &= ~HasBaselineAnchor;
+    d->remDepend(d->baseline.item);
+    d->baseline = QDeclarativeAnchorLine();
+    emit baselineChanged();
+    d->updateVerticalAnchors();
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchors::left() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->left;
+}
+
+void QDeclarativeAnchors::setLeft(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchors);
+    if (!d->checkHAnchorValid(edge) || d->left == edge)
+        return;
+
+    d->usedAnchors |= HasLeftAnchor;
+
+    if (!d->checkHValid()) {
+        d->usedAnchors &= ~HasLeftAnchor;
+        return;
+    }
+
+    d->remDepend(d->left.item);
+    d->left = edge;
+    d->addDepend(d->left.item);
+    emit leftChanged();
+    d->updateHorizontalAnchors();
+}
+
+void QDeclarativeAnchors::resetLeft()
+{
+    Q_D(QDeclarativeAnchors);
+    d->usedAnchors &= ~HasLeftAnchor;
+    d->remDepend(d->left.item);
+    d->left = QDeclarativeAnchorLine();
+    emit leftChanged();
+    d->updateHorizontalAnchors();
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchors::right() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->right;
+}
+
+void QDeclarativeAnchors::setRight(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchors);
+    if (!d->checkHAnchorValid(edge) || d->right == edge)
+        return;
+
+    d->usedAnchors |= HasRightAnchor;
+
+    if (!d->checkHValid()) {
+        d->usedAnchors &= ~HasRightAnchor;
+        return;
+    }
+
+    d->remDepend(d->right.item);
+    d->right = edge;
+    d->addDepend(d->right.item);
+    emit rightChanged();
+    d->updateHorizontalAnchors();
+}
+
+void QDeclarativeAnchors::resetRight()
+{
+    Q_D(QDeclarativeAnchors);
+    d->usedAnchors &= ~HasRightAnchor;
+    d->remDepend(d->right.item);
+    d->right = QDeclarativeAnchorLine();
+    emit rightChanged();
+    d->updateHorizontalAnchors();
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchors::horizontalCenter() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->hCenter;
+}
+
+void QDeclarativeAnchors::setHorizontalCenter(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchors);
+    if (!d->checkHAnchorValid(edge) || d->hCenter == edge)
+        return;
+
+    d->usedAnchors |= HasHCenterAnchor;
+
+    if (!d->checkHValid()) {
+        d->usedAnchors &= ~HasHCenterAnchor;
+        return;
+    }
+
+    d->remDepend(d->hCenter.item);
+    d->hCenter = edge;
+    d->addDepend(d->hCenter.item);
+    emit horizontalCenterChanged();
+    d->updateHorizontalAnchors();
+}
+
+void QDeclarativeAnchors::resetHorizontalCenter()
+{
+    Q_D(QDeclarativeAnchors);
+    d->usedAnchors &= ~HasHCenterAnchor;
+    d->remDepend(d->hCenter.item);
+    d->hCenter = QDeclarativeAnchorLine();
+    emit horizontalCenterChanged();
+    d->updateHorizontalAnchors();
+}
+
+qreal QDeclarativeAnchors::leftMargin() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->leftMargin;
+}
+
+void QDeclarativeAnchors::setLeftMargin(qreal offset)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->leftMargin == offset)
+        return;
+    d->leftMargin = offset;
+    if(d->fill)
+        d->fillChanged();
+    else
+        d->updateHorizontalAnchors();
+    emit leftMarginChanged();
+}
+
+qreal QDeclarativeAnchors::rightMargin() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->rightMargin;
+}
+
+void QDeclarativeAnchors::setRightMargin(qreal offset)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->rightMargin == offset)
+        return;
+    d->rightMargin = offset;
+    if(d->fill)
+        d->fillChanged();
+    else
+        d->updateHorizontalAnchors();
+    emit rightMarginChanged();
+}
+
+qreal QDeclarativeAnchors::margins() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->margins;
+}
+
+void QDeclarativeAnchors::setMargins(qreal offset)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->margins == offset)
+        return;
+    //###Is it significantly faster to set them directly so we can call fillChanged only once?
+    if(!d->rightMargin || d->rightMargin == d->margins)
+        setRightMargin(offset);
+    if(!d->leftMargin || d->leftMargin == d->margins)
+        setLeftMargin(offset);
+    if(!d->topMargin || d->topMargin == d->margins)
+        setTopMargin(offset);
+    if(!d->bottomMargin || d->bottomMargin == d->margins)
+        setBottomMargin(offset);
+    d->margins = offset;
+    emit marginsChanged();
+
+}
+
+qreal QDeclarativeAnchors::horizontalCenterOffset() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->hCenterOffset;
+}
+
+void QDeclarativeAnchors::setHorizontalCenterOffset(qreal offset)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->hCenterOffset == offset)
+        return;
+    d->hCenterOffset = offset;
+    if(d->centerIn)
+        d->centerInChanged();
+    else
+        d->updateHorizontalAnchors();
+    emit horizontalCenterOffsetChanged();
+}
+
+qreal QDeclarativeAnchors::topMargin() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->topMargin;
+}
+
+void QDeclarativeAnchors::setTopMargin(qreal offset)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->topMargin == offset)
+        return;
+    d->topMargin = offset;
+    if(d->fill)
+        d->fillChanged();
+    else
+        d->updateVerticalAnchors();
+    emit topMarginChanged();
+}
+
+qreal QDeclarativeAnchors::bottomMargin() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->bottomMargin;
+}
+
+void QDeclarativeAnchors::setBottomMargin(qreal offset)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->bottomMargin == offset)
+        return;
+    d->bottomMargin = offset;
+    if(d->fill)
+        d->fillChanged();
+    else
+        d->updateVerticalAnchors();
+    emit bottomMarginChanged();
+}
+
+qreal QDeclarativeAnchors::verticalCenterOffset() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->vCenterOffset;
+}
+
+void QDeclarativeAnchors::setVerticalCenterOffset(qreal offset)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->vCenterOffset == offset)
+        return;
+    d->vCenterOffset = offset;
+    if(d->centerIn)
+        d->centerInChanged();
+    else
+        d->updateVerticalAnchors();
+    emit verticalCenterOffsetChanged();
+}
+
+qreal QDeclarativeAnchors::baselineOffset() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->baselineOffset;
+}
+
+void QDeclarativeAnchors::setBaselineOffset(qreal offset)
+{
+    Q_D(QDeclarativeAnchors);
+    if (d->baselineOffset == offset)
+        return;
+    d->baselineOffset = offset;
+    d->updateVerticalAnchors();
+    emit baselineOffsetChanged();
+}
+
+QDeclarativeAnchors::UsedAnchors QDeclarativeAnchors::usedAnchors() const
+{
+    Q_D(const QDeclarativeAnchors);
+    return d->usedAnchors;
+}
+
+bool QDeclarativeAnchorsPrivate::checkHValid() const
+{
+    if (usedAnchors & QDeclarativeAnchors::HasLeftAnchor &&
+        usedAnchors & QDeclarativeAnchors::HasRightAnchor &&
+        usedAnchors & QDeclarativeAnchors::HasHCenterAnchor) {
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot specify left, right, and hcenter anchors.");
+        return false;
+    }
+
+    return true;
+}
+
+bool QDeclarativeAnchorsPrivate::checkHAnchorValid(QDeclarativeAnchorLine anchor) const
+{
+    if (!anchor.item) {
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor to a null item.");
+        return false;
+    } else if (anchor.anchorLine & QDeclarativeAnchorLine::Vertical_Mask) {
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor a horizontal edge to a vertical edge.");
+        return false;
+    } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
+        return false;
+    } else if (anchor.item == item) {
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor item to self.");
+        return false;
+    }
+
+    return true;
+}
+
+bool QDeclarativeAnchorsPrivate::checkVValid() const
+{
+    if (usedAnchors & QDeclarativeAnchors::HasTopAnchor &&
+        usedAnchors & QDeclarativeAnchors::HasBottomAnchor &&
+        usedAnchors & QDeclarativeAnchors::HasVCenterAnchor) {
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot specify top, bottom, and vcenter anchors.");
+        return false;
+    } else if (usedAnchors & QDeclarativeAnchors::HasBaselineAnchor &&
+               (usedAnchors & QDeclarativeAnchors::HasTopAnchor ||
+                usedAnchors & QDeclarativeAnchors::HasBottomAnchor ||
+                usedAnchors & QDeclarativeAnchors::HasVCenterAnchor)) {
+        qmlInfo(item) << QDeclarativeAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.");
+        return false;
+    }
+
+    return true;
+}
+
+bool QDeclarativeAnchorsPrivate::checkVAnchorValid(QDeclarativeAnchorLine anchor) const
+{
+    if (!anchor.item) {
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor to a null item.");
+        return false;
+    } else if (anchor.anchorLine & QDeclarativeAnchorLine::Horizontal_Mask) {
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor a vertical edge to a horizontal edge.");
+        return false;
+    } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
+        return false;
+    } else if (anchor.item == item){
+        qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor item to self.");
+        return false;
+    }
+
+    return true;
+}
+
+#include <moc_qdeclarativeanchors_p.cpp>
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h
new file mode 100644
index 0000000..0b97e8c
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h
@@ -0,0 +1,196 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEANCHORS_H
+#define QDECLARATIVEANCHORS_H
+
+#include "qdeclarativeitem.h"
+
+#include <qdeclarative.h>
+
+#include <QtCore/QObject>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeAnchorsPrivate;
+class QDeclarativeAnchorLine;
+class Q_DECLARATIVE_EXPORT QDeclarativeAnchors : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QDeclarativeAnchorLine left READ left WRITE setLeft RESET resetLeft NOTIFY leftChanged)
+    Q_PROPERTY(QDeclarativeAnchorLine right READ right WRITE setRight RESET resetRight NOTIFY rightChanged)
+    Q_PROPERTY(QDeclarativeAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter NOTIFY horizontalCenterChanged)
+    Q_PROPERTY(QDeclarativeAnchorLine top READ top WRITE setTop RESET resetTop NOTIFY topChanged)
+    Q_PROPERTY(QDeclarativeAnchorLine bottom READ bottom WRITE setBottom RESET resetBottom NOTIFY bottomChanged)
+    Q_PROPERTY(QDeclarativeAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter NOTIFY verticalCenterChanged)
+    Q_PROPERTY(QDeclarativeAnchorLine baseline READ baseline WRITE setBaseline RESET resetBaseline NOTIFY baselineChanged)
+    Q_PROPERTY(qreal margins READ margins WRITE setMargins NOTIFY marginsChanged)
+    Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged)
+    Q_PROPERTY(qreal rightMargin READ rightMargin WRITE setRightMargin NOTIFY rightMarginChanged)
+    Q_PROPERTY(qreal horizontalCenterOffset READ horizontalCenterOffset WRITE setHorizontalCenterOffset NOTIFY horizontalCenterOffsetChanged())
+    Q_PROPERTY(qreal topMargin READ topMargin WRITE setTopMargin NOTIFY topMarginChanged)
+    Q_PROPERTY(qreal bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged)
+    Q_PROPERTY(qreal verticalCenterOffset READ verticalCenterOffset WRITE setVerticalCenterOffset NOTIFY verticalCenterOffsetChanged())
+    Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged())
+    Q_PROPERTY(QDeclarativeItem *fill READ fill WRITE setFill RESET resetFill NOTIFY fillChanged)
+    Q_PROPERTY(QDeclarativeItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn NOTIFY centerInChanged)
+
+public:
+    QDeclarativeAnchors(QObject *parent=0);
+    QDeclarativeAnchors(QDeclarativeItem *item, QObject *parent=0);
+    virtual ~QDeclarativeAnchors();
+
+    enum UsedAnchor { 
+        HasLeftAnchor = 0x01,
+        HasRightAnchor = 0x02,
+        HasTopAnchor = 0x04,
+        HasBottomAnchor = 0x08,
+        HasHCenterAnchor = 0x10,
+        HasVCenterAnchor = 0x20,
+        HasBaselineAnchor = 0x40,
+        Horizontal_Mask = HasLeftAnchor | HasRightAnchor | HasHCenterAnchor,
+        Vertical_Mask = HasTopAnchor | HasBottomAnchor | HasVCenterAnchor | HasBaselineAnchor
+    };
+    Q_DECLARE_FLAGS(UsedAnchors, UsedAnchor)
+
+    QDeclarativeAnchorLine left() const;
+    void setLeft(const QDeclarativeAnchorLine &edge);
+    void resetLeft();
+
+    QDeclarativeAnchorLine right() const;
+    void setRight(const QDeclarativeAnchorLine &edge);
+    void resetRight();
+
+    QDeclarativeAnchorLine horizontalCenter() const;
+    void setHorizontalCenter(const QDeclarativeAnchorLine &edge);
+    void resetHorizontalCenter();
+
+    QDeclarativeAnchorLine top() const;
+    void setTop(const QDeclarativeAnchorLine &edge);
+    void resetTop();
+
+    QDeclarativeAnchorLine bottom() const;
+    void setBottom(const QDeclarativeAnchorLine &edge);
+    void resetBottom();
+
+    QDeclarativeAnchorLine verticalCenter() const;
+    void setVerticalCenter(const QDeclarativeAnchorLine &edge);
+    void resetVerticalCenter();
+
+    QDeclarativeAnchorLine baseline() const;
+    void setBaseline(const QDeclarativeAnchorLine &edge);
+    void resetBaseline();
+
+    qreal leftMargin() const;
+    void setLeftMargin(qreal);
+
+    qreal rightMargin() const;
+    void setRightMargin(qreal);
+
+    qreal horizontalCenterOffset() const;
+    void setHorizontalCenterOffset(qreal);
+
+    qreal topMargin() const;
+    void setTopMargin(qreal);
+
+    qreal bottomMargin() const;
+    void setBottomMargin(qreal);
+
+    qreal margins() const;
+    void setMargins(qreal);
+
+    qreal verticalCenterOffset() const;
+    void setVerticalCenterOffset(qreal);
+
+    qreal baselineOffset() const;
+    void setBaselineOffset(qreal);
+
+    QDeclarativeItem *fill() const;
+    void setFill(QDeclarativeItem *);
+    void resetFill();
+
+    QDeclarativeItem *centerIn() const;
+    void setCenterIn(QDeclarativeItem *);
+    void resetCenterIn();
+
+    UsedAnchors usedAnchors() const;
+
+    void classBegin();
+    void componentComplete();
+
+Q_SIGNALS:
+    void leftChanged();
+    void rightChanged();
+    void topChanged();
+    void bottomChanged();
+    void verticalCenterChanged();
+    void horizontalCenterChanged();
+    void baselineChanged();
+    void fillChanged();
+    void centerInChanged();
+    void leftMarginChanged();
+    void rightMarginChanged();
+    void topMarginChanged();
+    void bottomMarginChanged();
+    void marginsChanged();
+    void verticalCenterOffsetChanged();
+    void horizontalCenterOffsetChanged();
+    void baselineOffsetChanged();
+
+private:
+    friend class QDeclarativeItem;
+    Q_DISABLE_COPY(QDeclarativeAnchors)
+    Q_DECLARE_PRIVATE(QDeclarativeAnchors)
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeAnchors::UsedAnchors)
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeAnchors)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
new file mode 100644
index 0000000..d9d7ffa
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
@@ -0,0 +1,174 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEANCHORS_P_H
+#define QDECLARATIVEANCHORS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeanchors_p.h"
+#include "qdeclarativeitemchangelistener_p.h"
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeAnchorLine
+{
+public:
+    QDeclarativeAnchorLine() : item(0), anchorLine(Invalid)
+    {
+    }
+
+    enum AnchorLine {
+        Invalid = 0x0,
+        Left = 0x01,
+        Right = 0x02,
+        Top = 0x04,
+        Bottom = 0x08,
+        HCenter = 0x10,
+        VCenter = 0x20,
+        Baseline = 0x40,
+        Horizontal_Mask = Left | Right | HCenter,
+        Vertical_Mask = Top | Bottom | VCenter | Baseline
+    };
+
+    QDeclarativeItem *item;
+    AnchorLine anchorLine;
+
+    bool operator==(const QDeclarativeAnchorLine& other) const
+    {
+        return item == other.item && anchorLine == other.anchorLine;
+    }
+};
+
+class QDeclarativeAnchorsPrivate : public QObjectPrivate, public QDeclarativeItemChangeListener
+{
+    Q_DECLARE_PUBLIC(QDeclarativeAnchors)
+public:
+    QDeclarativeAnchorsPrivate(QDeclarativeItem *i)
+      : updatingMe(false), updatingHorizontalAnchor(0),
+        updatingVerticalAnchor(0), updatingFill(0), updatingCenterIn(0), item(i), usedAnchors(0), fill(0),
+        centerIn(0), leftMargin(0), rightMargin(0), topMargin(0), bottomMargin(0),
+        margins(0), vCenterOffset(0), hCenterOffset(0), baselineOffset(0),
+        componentComplete(true)
+    {
+    }
+
+    void init()
+    {
+    }
+
+    void clearItem(QDeclarativeItem *);
+
+    void addDepend(QDeclarativeItem *);
+    void remDepend(QDeclarativeItem *);
+    bool isItemComplete() const;
+
+    bool updatingMe;
+    int updatingHorizontalAnchor;
+    int updatingVerticalAnchor;
+    int updatingFill;
+    int updatingCenterIn;
+
+    void setItemHeight(qreal);
+    void setItemWidth(qreal);
+    void setItemX(qreal);
+    void setItemY(qreal);
+    void setItemPos(const QPointF &);
+
+    void updateOnComplete();
+    void updateMe();
+
+    // QDeclarativeItemGeometryListener interface
+    void itemGeometryChanged(QDeclarativeItem *, const QRectF &, const QRectF &);
+    QDeclarativeAnchorsPrivate *anchorPrivate() { return this; }
+
+    bool checkHValid() const;
+    bool checkVValid() const;
+    bool checkHAnchorValid(QDeclarativeAnchorLine anchor) const;
+    bool checkVAnchorValid(QDeclarativeAnchorLine anchor) const;
+    bool calcStretch(const QDeclarativeAnchorLine &edge1, const QDeclarativeAnchorLine &edge2, int offset1, int offset2, QDeclarativeAnchorLine::AnchorLine line, int &stretch);
+
+    void updateHorizontalAnchors();
+    void updateVerticalAnchors();
+    void fillChanged();
+    void centerInChanged();
+
+    QDeclarativeItem *item;
+    QDeclarativeAnchors::UsedAnchors usedAnchors;
+
+    QDeclarativeItem *fill;
+    QDeclarativeItem *centerIn;
+
+    QDeclarativeAnchorLine left;
+    QDeclarativeAnchorLine right;
+    QDeclarativeAnchorLine top;
+    QDeclarativeAnchorLine bottom;
+    QDeclarativeAnchorLine vCenter;
+    QDeclarativeAnchorLine hCenter;
+    QDeclarativeAnchorLine baseline;
+
+    qreal leftMargin;
+    qreal rightMargin;
+    qreal topMargin;
+    qreal bottomMargin;
+    qreal margins;
+    qreal vCenterOffset;
+    qreal hCenterOffset;
+    qreal baselineOffset;
+
+    bool componentComplete;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDeclarativeAnchorLine)
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
new file mode 100644
index 0000000..20b1de3
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -0,0 +1,306 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeanimatedimage_p.h"
+#include "qdeclarativeanimatedimage_p_p.h"
+
+#include <qdeclarativeengine.h>
+
+#include <QMovie>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativeAnimatedImage
+    \internal
+*/
+
+/*!
+    \qmlclass AnimatedImage QDeclarativeAnimatedImage
+    \inherits Image
+    \since 4.7
+
+    This item provides for playing animations stored as images containing a series of frames,
+    such as GIF files. The full list of supported formats can be determined with
+    QMovie::supportedFormats().
+
+    \table
+    \row
+    \o \image animatedimageitem.gif
+    \o
+    \qml
+Item {
+    width: anim.width; height: anim.height+8
+    AnimatedImage { id: anim; source: "pics/games-anim.gif" }
+    Rectangle { color: "red"; width: 4; height: 8; y: anim.height
+        x: (anim.width-width)*anim.currentFrame/(anim.frameCount-1)
+    }
+}
+    \endqml
+    \endtable
+*/
+
+QDeclarativeAnimatedImage::QDeclarativeAnimatedImage(QDeclarativeItem *parent)
+    : QDeclarativeImage(*(new QDeclarativeAnimatedImagePrivate), parent)
+{
+}
+
+QDeclarativeAnimatedImage::~QDeclarativeAnimatedImage()
+{
+    Q_D(QDeclarativeAnimatedImage);
+    delete d->_movie;
+}
+
+/*!
+  \qmlproperty bool AnimatedImage::paused
+  This property holds whether the animated image is paused or not
+
+  Defaults to false, and can be set to true when you want to pause.
+*/
+bool QDeclarativeAnimatedImage::isPaused() const
+{
+    Q_D(const QDeclarativeAnimatedImage);
+    if(!d->_movie)
+        return false;
+    return d->_movie->state()==QMovie::Paused;
+}
+
+void QDeclarativeAnimatedImage::setPaused(bool pause)
+{
+    Q_D(QDeclarativeAnimatedImage);
+    if(pause == d->paused)
+        return;
+    d->paused = pause;
+    if(!d->_movie)
+        return;
+    d->_movie->setPaused(pause);
+}
+/*!
+  \qmlproperty bool AnimatedImage::playing
+  This property holds whether the animated image is playing or not
+
+  Defaults to true, so as to start playing immediately.
+*/
+bool QDeclarativeAnimatedImage::isPlaying() const
+{
+    Q_D(const QDeclarativeAnimatedImage);
+    if (!d->_movie)
+        return false;
+    return d->_movie->state()!=QMovie::NotRunning;
+}
+
+void QDeclarativeAnimatedImage::setPlaying(bool play)
+{
+    Q_D(QDeclarativeAnimatedImage);
+    if(play == d->playing)
+        return;
+    d->playing = play;
+    if (!d->_movie)
+        return;
+    if (play)
+        d->_movie->start();
+    else
+        d->_movie->stop();
+}
+
+/*!
+  \qmlproperty int AnimatedImage::currentFrame
+  \qmlproperty int AnimatedImage::frameCount
+
+  currentFrame is the frame that is currently visible. Watching when this changes can
+  allow other things to animate at the same time as the image. frameCount is the number
+  of frames in the animation. For some animation formats, frameCount is unknown and set to zero.
+*/
+int QDeclarativeAnimatedImage::currentFrame() const
+{
+    Q_D(const QDeclarativeAnimatedImage);
+    if (!d->_movie)
+        return d->preset_currentframe;
+    return d->_movie->currentFrameNumber();
+}
+
+void QDeclarativeAnimatedImage::setCurrentFrame(int frame)
+{
+    Q_D(QDeclarativeAnimatedImage);
+    if (!d->_movie) {
+        d->preset_currentframe = frame;
+        return;
+    }
+    d->_movie->jumpToFrame(frame);
+}
+
+int QDeclarativeAnimatedImage::frameCount() const
+{
+    Q_D(const QDeclarativeAnimatedImage);
+    if (!d->_movie)
+        return 0;
+    return d->_movie->frameCount();
+}
+
+static QString toLocalFileOrQrc(const QUrl& url)
+{
+    QString r = url.toLocalFile();
+    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
+        r = QLatin1Char(':') + url.path();
+    return r;
+}
+
+void QDeclarativeAnimatedImage::setSource(const QUrl &url)
+{
+    Q_D(QDeclarativeAnimatedImage);
+    if (url == d->url)
+        return;
+
+    delete d->_movie;
+    d->_movie = 0;
+
+    if (d->reply) {
+        d->reply->deleteLater();
+        d->reply = 0;
+    }
+
+    d->url = url;
+
+    if (url.isEmpty()) {
+        delete d->_movie;
+        d->status = Null;
+    } else {
+#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
+        QString lf = toLocalFileOrQrc(url);
+        if (!lf.isEmpty()) {
+            //### should be unified with movieRequestFinished
+            d->_movie = new QMovie(lf);
+            if (!d->_movie->isValid()){
+                qWarning() << "Error Reading Animated Image File" << d->url;
+                delete d->_movie;
+                d->_movie = 0;
+                return;
+            }
+            connect(d->_movie, SIGNAL(stateChanged(QMovie::MovieState)),
+                    this, SLOT(playingStatusChanged()));
+            connect(d->_movie, SIGNAL(frameChanged(int)),
+                    this, SLOT(movieUpdate()));
+            d->_movie->setCacheMode(QMovie::CacheAll);
+            if(d->playing)
+                d->_movie->start();
+            else
+                d->_movie->jumpToFrame(0);
+            if(d->paused)
+                d->_movie->setPaused(true);
+            d->setPixmap(d->_movie->currentPixmap());
+            d->status = Ready;
+            d->progress = 1.0;
+            emit statusChanged(d->status);
+            emit sourceChanged(d->url);
+            emit progressChanged(d->progress);
+            return;
+        }
+#endif
+        d->status = Loading;
+        QNetworkRequest req(d->url);
+        req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
+        d->reply = qmlEngine(this)->networkAccessManager()->get(req);
+        QObject::connect(d->reply, SIGNAL(finished()),
+                         this, SLOT(movieRequestFinished()));
+    }
+
+    emit statusChanged(d->status);
+}
+
+void QDeclarativeAnimatedImage::movieRequestFinished()
+{
+    Q_D(QDeclarativeAnimatedImage);
+    d->_movie = new QMovie(d->reply);
+    if (!d->_movie->isValid()){
+        qWarning() << "Error Reading Animated Image File " << d->url;
+        delete d->_movie;
+        d->_movie = 0;
+        return;
+    }
+    connect(d->_movie, SIGNAL(stateChanged(QMovie::MovieState)),
+            this, SLOT(playingStatusChanged()));
+    connect(d->_movie, SIGNAL(frameChanged(int)),
+            this, SLOT(movieUpdate()));
+    d->_movie->setCacheMode(QMovie::CacheAll);
+    if(d->playing)
+        d->_movie->start();
+    if (d->paused || !d->playing) {
+        d->_movie->jumpToFrame(d->preset_currentframe);
+        d->preset_currentframe = 0;
+    }
+    if(d->paused)
+        d->_movie->setPaused(true);
+    d->setPixmap(d->_movie->currentPixmap());
+}
+
+void QDeclarativeAnimatedImage::movieUpdate()
+{
+    Q_D(QDeclarativeAnimatedImage);
+    d->setPixmap(d->_movie->currentPixmap());
+    emit frameChanged();
+}
+
+void QDeclarativeAnimatedImage::playingStatusChanged()
+{
+    Q_D(QDeclarativeAnimatedImage);
+    if((d->_movie->state() != QMovie::NotRunning) != d->playing){
+        d->playing = (d->_movie->state() != QMovie::NotRunning);
+        emit playingChanged();
+    }
+    if((d->_movie->state() == QMovie::Paused) != d->paused){
+        d->playing = (d->_movie->state() == QMovie::Paused);
+        emit pausedChanged();
+    }
+}
+
+void QDeclarativeAnimatedImage::componentComplete()
+{
+    Q_D(QDeclarativeAnimatedImage);
+    QDeclarativeImage::componentComplete();
+    if (!d->reply) {
+        setCurrentFrame(d->preset_currentframe);
+        d->preset_currentframe = 0;
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
new file mode 100644
index 0000000..b2979fe
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEANIMATEDIMAGE_H
+#define QDECLARATIVEANIMATEDIMAGE_H
+
+#include "qdeclarativeimage_p.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QMovie;
+class QDeclarativeAnimatedImagePrivate;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeAnimatedImage : public QDeclarativeImage
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool playing READ isPlaying WRITE setPlaying NOTIFY playingChanged)
+    Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
+    Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame NOTIFY frameChanged)
+    Q_PROPERTY(int frameCount READ frameCount)
+public:
+    QDeclarativeAnimatedImage(QDeclarativeItem *parent=0);
+    ~QDeclarativeAnimatedImage();
+
+    bool isPlaying() const;
+    void setPlaying(bool play);
+
+    bool isPaused() const;
+    void setPaused(bool pause);
+
+    int currentFrame() const;
+    void setCurrentFrame(int frame);
+
+    int frameCount() const;
+
+    // Extends QDeclarativeImage's src property*/
+    virtual void setSource(const QUrl&);
+
+Q_SIGNALS:
+    void playingChanged();
+    void pausedChanged();
+    void frameChanged();
+
+private Q_SLOTS:
+    void movieUpdate();
+    void movieRequestFinished();
+    void playingStatusChanged();
+
+protected:
+    void componentComplete();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeAnimatedImage)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeAnimatedImage)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeAnimatedImage)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
new file mode 100644
index 0000000..39bb3e5
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEANIMATEDIMAGE_P_H
+#define QDECLARATIVEANIMATEDIMAGE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeimage_p_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QMovie;
+class QNetworkReply;
+
+class QDeclarativeAnimatedImagePrivate : public QDeclarativeImagePrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeAnimatedImage)
+
+public:
+    QDeclarativeAnimatedImagePrivate()
+      : playing(true), paused(false), preset_currentframe(0), _movie(0), reply(0)
+    {
+    }
+
+    bool playing;
+    bool paused;
+    int preset_currentframe;
+    QMovie *_movie;
+    QNetworkReply *reply;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEANIMATEDIMAGE_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
new file mode 100644
index 0000000..1f26338
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -0,0 +1,408 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeborderimage_p.h"
+#include "qdeclarativeborderimage_p_p.h"
+
+#include <qdeclarativeengine.h>
+
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QFile>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass BorderImage QDeclarativeBorderImage
+    \brief The BorderImage element provides an image that can be used as a border.
+    \inherits Item
+    \since 4.7
+
+    \snippet snippets/declarative/border-image.qml 0
+
+    \image BorderImage.png
+ */
+
+/*!
+    \class QDeclarativeBorderImage BorderImage
+    \internal
+    \brief The QDeclarativeBorderImage class provides an image item that you can add to a QDeclarativeView.
+*/
+
+QDeclarativeBorderImage::QDeclarativeBorderImage(QDeclarativeItem *parent)
+  : QDeclarativeImageBase(*(new QDeclarativeBorderImagePrivate), parent)
+{
+}
+
+QDeclarativeBorderImage::~QDeclarativeBorderImage()
+{
+    Q_D(QDeclarativeBorderImage);
+    if (d->sciReply)
+        d->sciReply->deleteLater();
+    if (d->sciPendingPixmapCache)
+        QDeclarativePixmapCache::cancel(d->sciurl, this);
+}
+/*!
+    \qmlproperty enum BorderImage::status
+
+    This property holds the status of image loading.  It can be one of:
+    \list
+    \o Null - no image has been set
+    \o Ready - the image has been loaded
+    \o Loading - the image is currently being loaded
+    \o Error - an error occurred while loading the image
+    \endlist
+
+    \sa progress
+*/
+
+/*!
+    \qmlproperty real BorderImage::progress
+
+    This property holds the progress of image loading, from 0.0 (nothing loaded)
+    to 1.0 (finished).
+
+    \sa status
+*/
+
+/*!
+    \qmlproperty bool BorderImage::smooth
+
+    Set this property if you want the image to be smoothly filtered when scaled or
+    transformed.  Smooth filtering gives better visual quality, but is slower.  If
+    the image is displayed at its natural size, this property has no visual or
+    performance effect.
+
+    \note Generally scaling artifacts are only visible if the image is stationary on
+    the screen.  A common pattern when animating an image is to disable smooth
+    filtering at the beginning of the animation and reenable it at the conclusion.
+*/
+
+/*!
+    \qmlproperty url BorderImage::source
+
+    BorderImage can handle any image format supported by Qt, loaded from any URL scheme supported by Qt.
+
+    It can also handle .sci files, which are a Qml-specific format. A .sci file uses a simple text-based format that specifies
+    the borders, the image file and the tile rules.
+
+    The following .sci file sets the borders to 10 on each side for the image \c picture.png:
+    \qml
+    border.left: 10
+    border.top: 10
+    border.bottom: 10
+    border.right: 10
+    source: picture.png
+    \endqml
+
+    The URL may be absolute, or relative to the URL of the component.
+*/
+
+static QString toLocalFileOrQrc(const QUrl& url)
+{
+    QString r = url.toLocalFile();
+    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
+        r = QLatin1Char(':') + url.path();
+    return r;
+}
+
+
+void QDeclarativeBorderImage::setSource(const QUrl &url)
+{
+    Q_D(QDeclarativeBorderImage);
+    //equality is fairly expensive, so we bypass for simple, common case
+    if ((d->url.isEmpty() == url.isEmpty()) && url == d->url)
+        return;
+
+    if (d->sciReply) {
+        d->sciReply->deleteLater();
+        d->sciReply = 0;
+    }
+
+    if (d->pendingPixmapCache) {
+        QDeclarativePixmapCache::cancel(d->url, this);
+        d->pendingPixmapCache = false;
+    }
+    if (d->sciPendingPixmapCache) {
+        QDeclarativePixmapCache::cancel(d->sciurl, this);
+        d->sciPendingPixmapCache = false;
+    }
+
+    d->url = url;
+    d->sciurl = QUrl();
+    if (d->progress != 0.0) {
+        d->progress = 0.0;
+        emit progressChanged(d->progress);
+    }
+
+    if (url.isEmpty()) {
+        d->pix = QPixmap();
+        d->status = Null;
+        setImplicitWidth(0);
+        setImplicitHeight(0);
+        emit statusChanged(d->status);
+        emit sourceChanged(d->url);
+        update();
+    } else {
+        d->status = Loading;
+        if (d->url.path().endsWith(QLatin1String(".sci"))) {
+#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
+            QString lf = toLocalFileOrQrc(d->url);
+            if (!lf.isEmpty()) {
+                QFile file(lf);
+                file.open(QIODevice::ReadOnly);
+                setGridScaledImage(QDeclarativeGridScaledImage(&file));
+            } else
+#endif
+            {
+                QNetworkRequest req(d->url);
+                d->sciReply = qmlEngine(this)->networkAccessManager()->get(req);
+                QObject::connect(d->sciReply, SIGNAL(finished()),
+                                 this, SLOT(sciRequestFinished()));
+            }
+        } else {
+            QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->url, &d->pix);
+            if (status != QDeclarativePixmapReply::Ready && status != QDeclarativePixmapReply::Error) {
+                QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(qmlEngine(this), d->url);
+                d->pendingPixmapCache = true;
+                connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
+                connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
+                        this, SLOT(requestProgress(qint64,qint64)));
+            } else {
+                //### should be unified with requestFinished
+                setImplicitWidth(d->pix.width());
+                setImplicitHeight(d->pix.height());
+
+                if (d->pix.isNull())
+                    d->status = Error;
+                if (d->status == Loading)
+                    d->status = Ready;
+                d->progress = 1.0;
+                emit statusChanged(d->status);
+                emit sourceChanged(d->url);
+                emit progressChanged(d->progress);
+                update();
+            }
+        }
+    }
+
+    emit statusChanged(d->status);
+}
+
+/*!
+    \qmlproperty int BorderImage::border.left
+    \qmlproperty int BorderImage::border.right
+    \qmlproperty int BorderImage::border.top
+    \qmlproperty int BorderImage::border.bottom
+
+    \target ImagexmlpropertiesscaleGrid
+
+    The 4 border lines (2 horizontal and 2 vertical) break an image into 9 sections, as shown below:
+
+    \image declarative-scalegrid.png
+
+    When the image is scaled:
+    \list
+    \i the corners (sections 1, 3, 7, and 9) are not scaled at all
+    \i the middle (section 5) is scaled according to BorderImage::horizontalTileMode and BorderImage::verticalTileMode
+    \i sections 2 and 8 are scaled according to BorderImage::horizontalTileMode
+    \i sections 4 and 6 are scaled according to BorderImage::verticalTileMode
+    \endlist
+
+    Each border line (left, right, top, and bottom) specifies an offset from the respective side. For example, \c{border.bottom: 10} sets the bottom line 10 pixels up from the bottom of the image.
+
+    The border lines can also be specified using a
+    \l {BorderImage::source}{.sci file}.
+*/
+
+QDeclarativeScaleGrid *QDeclarativeBorderImage::border()
+{
+    Q_D(QDeclarativeBorderImage);
+    return d->getScaleGrid();
+}
+
+/*!
+    \qmlproperty TileMode BorderImage::horizontalTileMode
+    \qmlproperty TileMode BorderImage::verticalTileMode
+
+    This property describes how to repeat or stretch the middle parts of the border image.
+
+    \list
+    \o Stretch - Scale the image to fit to the available area.
+    \o Repeat - Tile the image until there is no more space. May crop the last image.
+    \o Round - Like Repeat, but scales the images down to ensure that the last image is not cropped.
+    \endlist
+*/
+QDeclarativeBorderImage::TileMode QDeclarativeBorderImage::horizontalTileMode() const
+{
+    Q_D(const QDeclarativeBorderImage);
+    return d->horizontalTileMode;
+}
+
+void QDeclarativeBorderImage::setHorizontalTileMode(TileMode t)
+{
+    Q_D(QDeclarativeBorderImage);
+    if (t != d->horizontalTileMode) {
+        d->horizontalTileMode = t;
+        emit horizontalTileModeChanged();
+        update();
+    }
+}
+
+QDeclarativeBorderImage::TileMode QDeclarativeBorderImage::verticalTileMode() const
+{
+    Q_D(const QDeclarativeBorderImage);
+    return d->verticalTileMode;
+}
+
+void QDeclarativeBorderImage::setVerticalTileMode(TileMode t)
+{
+    Q_D(QDeclarativeBorderImage);
+    if (t != d->verticalTileMode) {
+        d->verticalTileMode = t;
+        emit verticalTileModeChanged();
+        update();
+    }
+}
+
+void QDeclarativeBorderImage::setGridScaledImage(const QDeclarativeGridScaledImage& sci)
+{
+    Q_D(QDeclarativeBorderImage);
+    if (!sci.isValid()) {
+        d->status = Error;
+        emit statusChanged(d->status);
+    } else {
+        QDeclarativeScaleGrid *sg = border();
+        sg->setTop(sci.gridTop());
+        sg->setBottom(sci.gridBottom());
+        sg->setLeft(sci.gridLeft());
+        sg->setRight(sci.gridRight());
+        d->horizontalTileMode = sci.horizontalTileRule();
+        d->verticalTileMode = sci.verticalTileRule();
+
+        d->sciurl = d->url.resolved(QUrl(sci.pixmapUrl()));
+        QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->sciurl, &d->pix);
+        if (status != QDeclarativePixmapReply::Ready && status != QDeclarativePixmapReply::Error) {
+            QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(qmlEngine(this), d->sciurl);
+            d->sciPendingPixmapCache = true;
+            connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
+            connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
+                    this, SLOT(requestProgress(qint64,qint64)));
+        } else {
+            //### should be unified with requestFinished
+            setImplicitWidth(d->pix.width());
+            setImplicitHeight(d->pix.height());
+
+            if (d->pix.isNull())
+                d->status = Error;
+            if (d->status == Loading)
+                d->status = Ready;
+            d->progress = 1.0;
+            emit statusChanged(d->status);
+            emit sourceChanged(d->url);
+            emit progressChanged(1.0);
+            update();
+        }
+    }
+}
+
+void QDeclarativeBorderImage::requestFinished()
+{
+    Q_D(QDeclarativeBorderImage);
+
+    if (d->url.path().endsWith(QLatin1String(".sci"))) {
+        d->sciPendingPixmapCache = false;
+        QDeclarativePixmapCache::get(d->sciurl, &d->pix);
+    } else {
+        d->pendingPixmapCache = false;
+        if (QDeclarativePixmapCache::get(d->url, &d->pix) != QDeclarativePixmapReply::Ready)
+            d->status = Error;
+    }
+    setImplicitWidth(d->pix.width());
+    setImplicitHeight(d->pix.height());
+
+    if (d->status == Loading)
+        d->status = Ready;
+    d->progress = 1.0;
+    emit statusChanged(d->status);
+    emit sourceChanged(d->url);
+    emit progressChanged(1.0);
+    update();
+}
+
+void QDeclarativeBorderImage::sciRequestFinished()
+{
+    Q_D(QDeclarativeBorderImage);
+    if (d->sciReply->error() != QNetworkReply::NoError) {
+        d->status = Error;
+        d->sciReply->deleteLater();
+        d->sciReply = 0;
+        emit statusChanged(d->status);
+    } else {
+        QDeclarativeGridScaledImage sci(d->sciReply);
+        d->sciReply->deleteLater();
+        d->sciReply = 0;
+        setGridScaledImage(sci);
+    }
+}
+
+void QDeclarativeBorderImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    Q_D(QDeclarativeBorderImage);
+    if (d->pix.isNull())
+        return;
+
+    bool oldAA = p->testRenderHint(QPainter::Antialiasing);
+    bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
+    if (d->smooth)
+        p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+
+    const QDeclarativeScaleGrid *border = d->getScaleGrid();
+    QMargins margins(border->left(), border->top(), border->right(), border->bottom());
+    QTileRules rules((Qt::TileRule)d->horizontalTileMode, (Qt::TileRule)d->verticalTileMode);
+    qDrawBorderPixmap(p, QRect(0, 0, (int)d->width, (int)d->height), margins, d->pix, d->pix.rect(), margins, rules);
+    if (d->smooth) {
+        p->setRenderHint(QPainter::Antialiasing, oldAA);
+        p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
new file mode 100644
index 0000000..db81fd8
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEBORDERIMAGE_H
+#define QDECLARATIVEBORDERIMAGE_H
+
+#include "qdeclarativeimagebase_p.h"
+
+#include <QtNetwork/qnetworkreply.h>
+
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeScaleGrid;
+class QDeclarativeGridScaledImage;
+class QDeclarativeBorderImagePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeBorderImage : public QDeclarativeImageBase
+{
+    Q_OBJECT
+    Q_ENUMS(TileMode)
+
+    Q_PROPERTY(QDeclarativeScaleGrid *border READ border CONSTANT)
+    Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode NOTIFY horizontalTileModeChanged)
+    Q_PROPERTY(TileMode verticalTileMode READ verticalTileMode WRITE setVerticalTileMode NOTIFY verticalTileModeChanged)
+
+public:
+    QDeclarativeBorderImage(QDeclarativeItem *parent=0);
+    ~QDeclarativeBorderImage();
+
+    QDeclarativeScaleGrid *border();
+
+    enum TileMode { Stretch = Qt::StretchTile, Repeat = Qt::RepeatTile, Round = Qt::RoundTile };
+
+    TileMode horizontalTileMode() const;
+    void setHorizontalTileMode(TileMode);
+
+    TileMode verticalTileMode() const;
+    void setVerticalTileMode(TileMode);
+
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+    void setSource(const QUrl &url);
+
+Q_SIGNALS:
+    void horizontalTileModeChanged();
+    void verticalTileModeChanged();
+
+private:
+    void setGridScaledImage(const QDeclarativeGridScaledImage& sci);
+
+private Q_SLOTS:
+    void requestFinished();
+    void sciRequestFinished();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeBorderImage)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeBorderImage)
+};
+
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QDeclarativeBorderImage)
+QT_END_HEADER
+
+#endif // QDECLARATIVEBORDERIMAGE_H
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
new file mode 100644
index 0000000..b9cf73a
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEBORDERIMAGE_P_H
+#define QDECLARATIVEBORDERIMAGE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeimagebase_p_p.h"
+#include "qdeclarativescalegrid_p_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QNetworkReply;
+class QDeclarativeBorderImagePrivate : public QDeclarativeImageBasePrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeBorderImage)
+
+public:
+    QDeclarativeBorderImagePrivate()
+      : border(0), sciReply(0),
+        sciPendingPixmapCache(false),
+        horizontalTileMode(QDeclarativeBorderImage::Stretch),
+        verticalTileMode(QDeclarativeBorderImage::Stretch)
+    {
+    }
+
+    ~QDeclarativeBorderImagePrivate()
+    {
+    }
+
+    QDeclarativeScaleGrid *getScaleGrid()
+    {
+        Q_Q(QDeclarativeBorderImage);
+        if (!border)
+            border = new QDeclarativeScaleGrid(q);
+        return border;
+    }
+
+    QDeclarativeScaleGrid *border;
+    QUrl sciurl;
+    QNetworkReply *sciReply;
+    bool sciPendingPixmapCache;
+    QDeclarativeBorderImage::TileMode horizontalTileMode;
+    QDeclarativeBorderImage::TileMode verticalTileMode;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEBORDERIMAGE_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeeffects.cpp b/src/declarative/graphicsitems/qdeclarativeeffects.cpp
new file mode 100644
index 0000000..efab24e
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeeffects.cpp
@@ -0,0 +1,170 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qdeclarative.h>
+
+#include <QtGui/qgraphicseffect.h>
+
+/*!
+    \qmlclass Blur QGraphicsBlurEffect
+    \brief The Blur object provides a blur effect.
+
+    A blur effect blurs the source item. This effect is useful for reducing details;
+    for example, when the a source loses focus and attention should be drawn to other
+    elements. Use blurRadius to control the level of detail and blurHint to control
+    the quality of the blur.
+
+    By default, the blur radius is 5 pixels.
+
+    \img graphicseffect-blur.png
+*/
+
+/*!
+    \qmlproperty real Blur::blurRadius
+
+    This controls how blurry an item will appear.
+
+    A smaller radius produces a sharper appearance, and a larger radius produces
+    a more blurred appearance.
+
+    The default radius is 5 pixels.
+*/
+/*!
+    \qmlproperty enumeration Blur::blurHint
+
+    Use Qt.PerformanceHint to specify a faster blur or Qt.QualityHint hint
+    to specify a higher quality blur.
+   
+    If the blur radius is animated, it is recommended you use Qt.PerformanceHint.
+
+    The default hint is Qt.PerformanceHint.
+*/
+
+/*!
+    \qmlclass Colorize QGraphicsColorizeEffect
+    \brief The Colorize object provides a colorize effect.
+
+    A colorize effect renders the source item with a tint of its color.
+
+    By default, the color is light blue.
+
+    \img graphicseffect-colorize.png
+*/
+
+/*!
+    \qmlproperty color Colorize::color
+    The color of the effect.
+
+    By default, the color is light blue.
+*/
+
+/*!
+    \qmlproperty real Colorize::strength
+
+    To what extent the source item is "colored". A strength of 0.0 is equal to no effect,
+    while 1.0 means full colorization. By default, the strength is 1.0.
+*/
+
+
+/*!
+    \qmlclass DropShadow QGraphicsDropShadowEffect
+    \brief The DropShadow object provides a drop shadow effect.
+
+    A drop shadow effect renders the source item with a drop shadow. The color of
+    the drop shadow can be modified using the color property. The drop
+    shadow offset can be modified using the xOffset and yOffset properties and the blur
+    radius of the drop shadow can be changed with the blurRadius property.
+
+    By default, the drop shadow is a semi-transparent dark gray shadow,
+    blurred with a radius of 1 at an offset of 8 pixels towards the lower right.
+
+    \img graphicseffect-drop-shadow.png
+*/
+
+/*!
+    \qmlproperty real DropShadow::xOffset
+    \qmlproperty real DropShadow::yOffset
+    The shadow offset in pixels.
+
+    By default, xOffset and yOffset are 8 pixels.
+*/
+
+/*!
+    \qmlproperty real DropShadow::blurRadius
+    The blur radius in pixels of the drop shadow.
+
+    Using a smaller radius results in a sharper shadow, whereas using a bigger
+    radius results in a more blurred shadow.
+
+    By default, the blur radius is 1 pixel.
+*/
+
+/*!
+    \qmlproperty color DropShadow::color
+    The color of the drop shadow.
+
+    By default, the drop color is a semi-transparent dark gray.
+*/
+
+
+/*!
+    \qmlclass Opacity QGraphicsOpacityEffect
+    \brief The Opacity object provides an opacity effect.
+
+    An opacity effect renders the source with an opacity. This effect is useful
+    for making the source semi-transparent, similar to a fade-in/fade-out
+    sequence. The opacity can be modified using the opacity property.
+
+    By default, the opacity is 0.7.
+
+    \img graphicseffect-opacity.png
+*/
+
+/*!
+    \qmlproperty real Opacity::opacity
+    This property specifies how opaque an item should appear.
+
+    The value should be in the range of 0.0 to 1.0, where 0.0 is
+    fully transparent and 1.0 is fully opaque.
+
+    By default, the opacity is 0.7.
+*/
+
diff --git a/src/declarative/graphicsitems/qdeclarativeeffects_p.h b/src/declarative/graphicsitems/qdeclarativeeffects_p.h
new file mode 100644
index 0000000..73eec6a
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeeffects_p.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEEFFECTS_P_H
+#define QDECLARATIVEEFFECTS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qdeclarative.h>
+#include <QtGui/qgraphicseffect.h>
+
+QML_DECLARE_TYPE(QGraphicsEffect)
+QML_DECLARE_TYPE(QGraphicsBlurEffect)
+QML_DECLARE_TYPE(QGraphicsColorizeEffect)
+QML_DECLARE_TYPE(QGraphicsDropShadowEffect)
+QML_DECLARE_TYPE(QGraphicsOpacityEffect)
+
+#endif // QDECLARATIVEEFFECTS_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp
new file mode 100644
index 0000000..d2cbb54
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeevents_p_p.h"
+
+QT_BEGIN_NAMESPACE
+/*!
+    \qmlclass KeyEvent QDeclarativeKeyEvent
+    \since 4.7
+    \brief The KeyEvent object provides information about a key event.
+
+    For example, the following changes the Item's state property when the Enter
+    key is pressed:
+    \qml
+Item {
+    focus: true
+    Keys.onPressed: { if (event.key == Qt.Key_Enter) state = 'ShowDetails'; }
+}
+    \endqml
+*/
+
+/*!
+    \internal
+    \class QDeclarativeKeyEvent
+*/
+
+/*!
+    \qmlproperty int KeyEvent::key
+
+    This property holds the code of the key that was pressed or released.
+
+    See \l {Qt::Key}{Qt.Key} for the list of keyboard codes. These codes are
+    independent of the underlying window system. Note that this
+    function does not distinguish between capital and non-capital
+    letters, use the text() function (returning the Unicode text the
+    key generated) for this purpose.
+
+    A value of either 0 or \l {Qt::Key_unknown}{Qt.Key_Unknown} means that the event is not
+    the result of a known key; for example, it may be the result of
+    a compose sequence, a keyboard macro, or due to key event
+    compression.
+*/
+
+/*!
+    \qmlproperty string KeyEvent::text
+
+    This property holds the Unicode text that the key generated.
+    The text returned can be an empty string in cases where modifier keys,
+    such as Shift, Control, Alt, and Meta, are being pressed or released.
+    In such cases \c key will contain a valid value
+*/
+
+/*!
+    \qmlproperty bool KeyEvent::isAutoRepeat
+
+    This property holds whether this event comes from an auto-repeating key.
+*/
+
+/*!
+    \qmlproperty int KeyEvent::count
+
+    This property holds the number of keys involved in this event. If \l KeyEvent::text
+    is not empty, this is simply the length of the string.
+*/
+
+/*!
+    \qmlproperty bool KeyEvent::accepted
+
+    Setting \a accepted to true prevents the key event from being
+    propagated to the item's parent.
+
+    Generally, if the item acts on the key event then it should be accepted
+    so that ancestor items do not also respond to the same event.
+*/
+
+
+/*!
+    \qmlclass MouseEvent QDeclarativeMouseEvent
+    \brief The MouseEvent object provides information about a mouse event.
+
+    The position of the mouse can be found via the x and y properties.
+    The button that caused the event is available via the button property.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeMouseEvent
+*/
+
+/*!
+    \qmlproperty int MouseEvent::x
+    \qmlproperty int MouseEvent::y
+
+    These properties hold the position of the mouse event.
+*/
+
+/*!
+    \qmlproperty enum MouseEvent::button
+
+    This property holds the button that caused the event.  It can be one of:
+    \list
+    \o Qt.LeftButton
+    \o Qt.RightButton
+    \o Qt.MidButton
+    \endlist
+*/
+
+/*!
+    \qmlproperty bool MouseEvent::wasHeld
+
+    This property is true if the mouse button has been held pressed longer the
+    threshold (800ms).
+*/
+
+/*!
+    \qmlproperty int MouseEvent::buttons
+
+    This property holds the mouse buttons pressed when the event was generated.
+    For mouse move events, this is all buttons that are pressed down. For mouse
+    press and double click events this includes the button that caused the event.
+    For mouse release events this excludes the button that caused the event.
+
+    It contains a bitwise combination of:
+    \list
+    \o Qt.LeftButton
+    \o Qt.RightButton
+    \o Qt.MidButton
+    \endlist
+*/
+
+/*!
+    \qmlproperty int MouseEvent::modifiers
+
+    This property holds the keyboard modifier flags that existed immediately
+    before the event occurred.
+
+    It contains a bitwise combination of:
+    \list
+    \o Qt.NoModifier - No modifier key is pressed.
+    \o Qt.ShiftModifier	- A Shift key on the keyboard is pressed.
+    \o Qt.ControlModifier - A Ctrl key on the keyboard is pressed.
+    \o Qt.AltModifier - An Alt key on the keyboard is pressed.
+    \o Qt.MetaModifier - A Meta key on the keyboard is pressed.
+    \o Qt.KeypadModifier - A keypad button is pressed.
+    \endlist
+
+    For example, to react to a Shift key + Left mouse button click:
+    \qml
+MouseArea {
+    onClicked: { if (mouse.button == Qt.LeftButton && mouse.modifiers & Qt.ShiftModifier) doSomething(); }
+}
+    \endqml
+*/
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
new file mode 100644
index 0000000..65ac8de
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEEVENTS_P_H
+#define QDECLARATIVEEVENTS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qdeclarative.h>
+
+#include <QtCore/qobject.h>
+#include <QtGui/qevent.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeKeyEvent : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int key READ key)
+    Q_PROPERTY(QString text READ text)
+    Q_PROPERTY(int modifiers READ modifiers)
+    Q_PROPERTY(bool isAutoRepeat READ isAutoRepeat)
+    Q_PROPERTY(int count READ count)
+    Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
+
+public:
+    QDeclarativeKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString &text=QString(), bool autorep=false, ushort count=1)
+        : event(type, key, modifiers, text, autorep, count) { event.setAccepted(false); }
+    QDeclarativeKeyEvent(const QKeyEvent &ke)
+        : event(ke) { event.setAccepted(false); }
+
+    int key() const { return event.key(); }
+    QString text() const { return event.text(); }
+    int modifiers() const { return event.modifiers(); }
+    bool isAutoRepeat() const { return event.isAutoRepeat(); }
+    int count() const { return event.count(); }
+
+    bool isAccepted() { return event.isAccepted(); }
+    void setAccepted(bool accepted) { event.setAccepted(accepted); }
+
+private:
+    QKeyEvent event;
+};
+
+class QDeclarativeMouseEvent : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int x READ x)
+    Q_PROPERTY(int y READ y)
+    Q_PROPERTY(int button READ button)
+    Q_PROPERTY(int buttons READ buttons)
+    Q_PROPERTY(int modifiers READ modifiers)
+    Q_PROPERTY(bool wasHeld READ wasHeld)
+    Q_PROPERTY(bool isClick READ isClick)
+    Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
+
+public:
+    QDeclarativeMouseEvent(int x, int y, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers
+                  , bool isClick=false, bool wasHeld=false)
+        : _x(x), _y(y), _button(button), _buttons(buttons), _modifiers(modifiers)
+          , _wasHeld(wasHeld), _isClick(isClick), _accepted(true) {}
+
+    int x() const { return _x; }
+    int y() const { return _y; }
+    int button() const { return _button; }
+    int buttons() const { return _buttons; }
+    int modifiers() const { return _modifiers; }
+    bool wasHeld() const { return _wasHeld; }
+    bool isClick() const { return _isClick; }
+
+    bool isAccepted() { return _accepted; }
+    void setAccepted(bool accepted) { _accepted = accepted; }
+
+private:
+    int _x;
+    int _y;
+    Qt::MouseButton _button;
+    Qt::MouseButtons _buttons;
+    Qt::KeyboardModifiers _modifiers;
+    bool _wasHeld;
+    bool _isClick;
+    bool _accepted;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeKeyEvent)
+QML_DECLARE_TYPE(QDeclarativeMouseEvent)
+
+#endif // QDECLARATIVEEVENTS_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
new file mode 100644
index 0000000..9f19f53
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -0,0 +1,1324 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeflickable_p.h"
+#include "qdeclarativeflickable_p_p.h"
+
+#include <QGraphicsSceneMouseEvent>
+#include <QPointer>
+#include <QTimer>
+
+QT_BEGIN_NAMESPACE
+
+
+// FlickThreshold determines how far the "mouse" must have moved
+// before we perform a flick.
+static const int FlickThreshold = 20;
+
+// Really slow flicks can be annoying.
+static const int minimumFlickVelocity = 200;
+
+QDeclarativeFlickableVisibleArea::QDeclarativeFlickableVisibleArea(QDeclarativeFlickable *parent)
+    : QObject(parent), flickable(parent), m_xPosition(0.), m_widthRatio(0.)
+    , m_yPosition(0.), m_heightRatio(0.)
+{
+}
+
+qreal QDeclarativeFlickableVisibleArea::widthRatio() const
+{
+    return m_widthRatio;
+}
+
+qreal QDeclarativeFlickableVisibleArea::xPosition() const
+{
+    return m_xPosition;
+}
+
+qreal QDeclarativeFlickableVisibleArea::heightRatio() const
+{
+    return m_heightRatio;
+}
+
+qreal QDeclarativeFlickableVisibleArea::yPosition() const
+{
+    return m_yPosition;
+}
+
+void QDeclarativeFlickableVisibleArea::updateVisible()
+{
+    QDeclarativeFlickablePrivate *p = static_cast<QDeclarativeFlickablePrivate *>(QGraphicsItemPrivate::get(flickable));
+    bool pageChange = false;
+
+    // Vertical
+    const qreal viewheight = flickable->height();
+    const qreal maxyextent = -flickable->maxYExtent() + flickable->minYExtent();
+    qreal pagePos = (-p->_moveY.value() + flickable->minYExtent()) / (maxyextent + viewheight);
+    qreal pageSize = viewheight / (maxyextent + viewheight);
+
+    if (pageSize != m_heightRatio) {
+        m_heightRatio = pageSize;
+        pageChange = true;
+    }
+    if (pagePos != m_yPosition) {
+        m_yPosition = pagePos;
+        pageChange = true;
+    }
+
+    // Horizontal
+    const qreal viewwidth = flickable->width();
+    const qreal maxxextent = -flickable->maxXExtent() + flickable->minXExtent();
+    pagePos = (-p->_moveX.value() + flickable->minXExtent()) / (maxxextent + viewwidth);
+    pageSize = viewwidth / (maxxextent + viewwidth);
+
+    if (pageSize != m_widthRatio) {
+        m_widthRatio = pageSize;
+        pageChange = true;
+    }
+    if (pagePos != m_xPosition) {
+        m_xPosition = pagePos;
+        pageChange = true;
+    }
+    if (pageChange)
+        emit pageChanged();
+}
+
+
+QDeclarativeFlickablePrivate::QDeclarativeFlickablePrivate()
+  : viewport(new QDeclarativeItem)
+    , _moveX(this, &QDeclarativeFlickablePrivate::setRoundedViewportX)
+    , _moveY(this, &QDeclarativeFlickablePrivate::setRoundedViewportY)
+    , vWidth(-1), vHeight(-1), overShoot(true), flicked(false), moving(false), stealMouse(false)
+    , pressed(false), atXEnd(false), atXBeginning(true), atYEnd(false), atYBeginning(true)
+    , interactive(true), deceleration(500), maxVelocity(2000), reportedVelocitySmoothing(100)
+    , delayedPressEvent(0), delayedPressTarget(0), pressDelay(0), fixupDuration(200)
+    , horizontalVelocity(this), verticalVelocity(this), vTime(0), visibleArea(0)
+    , flickDirection(QDeclarativeFlickable::AutoFlickDirection)
+{
+}
+
+void QDeclarativeFlickablePrivate::init()
+{
+    Q_Q(QDeclarativeFlickable);
+    viewport->setParent(q);
+    QObject::connect(&timeline, SIGNAL(updated()), q, SLOT(ticked()));
+    QObject::connect(&timeline, SIGNAL(completed()), q, SLOT(movementEnding()));
+    q->setAcceptedMouseButtons(Qt::LeftButton);
+    q->setFiltersChildEvents(true);
+    QObject::connect(viewport, SIGNAL(xChanged()), q, SIGNAL(positionXChanged()));
+    QObject::connect(viewport, SIGNAL(yChanged()), q, SIGNAL(positionYChanged()));
+    QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(heightChange()));
+    QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(widthChange()));
+}
+
+void QDeclarativeFlickablePrivate::flickX(qreal velocity)
+{
+    Q_Q(QDeclarativeFlickable);
+    qreal maxDistance = -1;
+    // -ve velocity means list is moving up
+    if (velocity > 0) {
+        const qreal minX = q->minXExtent();
+        if (_moveX.value() < minX)
+            maxDistance = qAbs(minX -_moveX.value() + (overShoot?30:0));
+        flickTargetX = minX;
+    } else {
+        const qreal maxX = q->maxXExtent();
+        if (_moveX.value() > maxX)
+            maxDistance = qAbs(maxX - _moveX.value()) + (overShoot?30:0);
+        flickTargetX = maxX;
+    }
+    if (maxDistance > 0) {
+        qreal v = velocity;
+        if (maxVelocity != -1 && maxVelocity < qAbs(v)) {
+            if (v < 0)
+                v = -maxVelocity;
+            else
+                v = maxVelocity;
+        }
+        timeline.reset(_moveX);
+        timeline.accel(_moveX, v, deceleration, maxDistance);
+        timeline.callback(QDeclarativeTimeLineCallback(&_moveX, fixupX_callback, this));
+        if (!flicked) {
+            flicked = true;
+            emit q->flickingChanged();
+            emit q->flickStarted();
+        }
+    } else {
+        timeline.reset(_moveX);
+        fixupX();
+    }
+}
+
+void QDeclarativeFlickablePrivate::flickY(qreal velocity)
+{
+    Q_Q(QDeclarativeFlickable);
+    qreal maxDistance = -1;
+    // -ve velocity means list is moving up
+    if (velocity > 0) {
+        const qreal minY = q->minYExtent();
+        if (_moveY.value() < minY)
+            maxDistance = qAbs(minY -_moveY.value() + (overShoot?30:0));
+        flickTargetY = minY;
+    } else {
+        const qreal maxY = q->maxYExtent();
+        if (_moveY.value() > maxY)
+            maxDistance = qAbs(maxY - _moveY.value()) + (overShoot?30:0);
+        flickTargetY = maxY;
+    }
+    if (maxDistance > 0) {
+        qreal v = velocity;
+        if (maxVelocity != -1 && maxVelocity < qAbs(v)) {
+            if (v < 0)
+                v = -maxVelocity;
+            else
+                v = maxVelocity;
+        }
+        timeline.reset(_moveY);
+        timeline.accel(_moveY, v, deceleration, maxDistance);
+        timeline.callback(QDeclarativeTimeLineCallback(&_moveY, fixupY_callback, this));
+        if (!flicked) {
+            flicked = true;
+            emit q->flickingChanged();
+            emit q->flickStarted();
+        }
+    } else {
+        timeline.reset(_moveY);
+        fixupY();
+    }
+}
+
+void QDeclarativeFlickablePrivate::fixupX()
+{
+    Q_Q(QDeclarativeFlickable);
+    if (!q->xflick() || _moveX.timeLine())
+        return;
+
+    if (_moveX.value() > q->minXExtent() || (q->maxXExtent() > q->minXExtent())) {
+        timeline.reset(_moveX);
+        if (_moveX.value() != q->minXExtent()) {
+            if (fixupDuration)
+                timeline.move(_moveX, q->minXExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+            else
+                _moveY.setValue(q->minYExtent());
+        }
+        //emit flickingChanged();
+    } else if (_moveX.value() < q->maxXExtent()) {
+        timeline.reset(_moveX);
+        if (fixupDuration)
+            timeline.move(_moveX,  q->maxXExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+        else
+            _moveY.setValue(q->maxYExtent());
+        //emit flickingChanged();
+    } else {
+        flicked = false;
+    }
+
+    vTime = timeline.time();
+}
+
+void QDeclarativeFlickablePrivate::fixupY_callback(void *data)
+{
+    ((QDeclarativeFlickablePrivate *)data)->fixupY();
+}
+
+void QDeclarativeFlickablePrivate::fixupX_callback(void *data)
+{
+    ((QDeclarativeFlickablePrivate *)data)->fixupX();
+}
+
+void QDeclarativeFlickablePrivate::fixupY()
+{
+    Q_Q(QDeclarativeFlickable);
+    if (!q->yflick() || _moveY.timeLine())
+        return;
+
+    if (_moveY.value() > q->minYExtent() || (q->maxYExtent() > q->minYExtent())) {
+        timeline.reset(_moveY);
+        if (_moveY.value() != q->minYExtent()) {
+            if (fixupDuration)
+                timeline.move(_moveY, q->minYExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+            else
+                _moveY.setValue(q->minYExtent());
+        }
+        //emit flickingChanged();
+    } else if (_moveY.value() < q->maxYExtent()) {
+        timeline.reset(_moveY);
+        if (fixupDuration)
+            timeline.move(_moveY,  q->maxYExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+        else
+            _moveY.setValue(q->maxYExtent());
+        //emit flickingChanged();
+    } else {
+        flicked = false;
+    }
+
+    vTime = timeline.time();
+}
+
+void QDeclarativeFlickablePrivate::updateBeginningEnd()
+{
+    Q_Q(QDeclarativeFlickable);
+    bool atBoundaryChange = false;
+
+    // Vertical
+    const int maxyextent = int(-q->maxYExtent());
+    const qreal ypos = -_moveY.value();
+    bool atBeginning = (ypos <= -q->minYExtent());
+    bool atEnd = (maxyextent <= ypos);
+
+    if (atBeginning != atYBeginning) {
+        atYBeginning = atBeginning;
+        atBoundaryChange = true;
+    }
+    if (atEnd != atYEnd) {
+        atYEnd = atEnd;
+        atBoundaryChange = true;
+    }
+
+    // Horizontal
+    const int maxxextent = int(-q->maxXExtent());
+    const qreal xpos = -_moveX.value();
+    atBeginning = (xpos <= -q->minXExtent());
+    atEnd = (maxxextent <= xpos);
+
+    if (atBeginning != atXBeginning) {
+        atXBeginning = atBeginning;
+        atBoundaryChange = true;
+    }
+    if (atEnd != atXEnd) {
+        atXEnd = atEnd;
+        atBoundaryChange = true;
+    }
+
+    if (atBoundaryChange)
+        emit q->isAtBoundaryChanged();
+
+    if (visibleArea)
+        visibleArea->updateVisible();
+}
+
+/*!
+    \qmlclass Flickable QDeclarativeFlickable
+    \brief The Flickable item provides a surface that can be "flicked".
+    \inherits Item
+
+    Flickable places its children on a surface that can be dragged and flicked.
+
+    \code
+    Flickable {
+        width: 200; height: 200; viewportWidth: image.width; viewportHeight: image.height
+        Image { id: image; source: "bigimage.png" }
+    }
+    \endcode
+
+    \image flickable.gif
+
+    \note Flickable does not automatically clip its contents. If
+    it is not full-screen it is likely that \c clip should be set
+    to true.
+
+    \note Due to an implementation detail items placed inside a flickable cannot anchor to it by
+    id, use 'parent' instead.
+*/
+
+/*!
+    \qmlsignal Flickable::onMovementStarted()
+
+    This handler is called when the view begins moving due to user
+    interaction.
+*/
+
+/*!
+    \qmlsignal Flickable::onMovementEnded()
+
+    This handler is called when the view stops moving due to user
+    interaction.  If a flick was generated, this handler will
+    be triggered once the flick stops.  If a flick was not
+    generated, the handler will be triggered when the
+    user stops dragging - i.e. a mouse or touch release.
+*/
+
+/*!
+    \qmlsignal Flickable::onFlickStarted()
+
+    This handler is called when the view is flicked.  A flick
+    starts from the point that the mouse or touch is released,
+    while still in motion.
+*/
+
+/*!
+    \qmlsignal Flickable::onFlickEnded()
+
+    This handler is called when the view stops moving due to a flick.
+*/
+
+/*!
+    \qmlproperty real Flickable::visibleArea.xPosition
+    \qmlproperty real Flickable::visibleArea.widthRatio
+    \qmlproperty real Flickable::visibleArea.yPosition
+    \qmlproperty real Flickable::visibleArea.heightRatio
+
+    These properties describe the position and size of the currently viewed area.
+    The size is defined as the percentage of the full view currently visible,
+    scaled to 0.0 - 1.0.  The page position is in the range 0.0 (beginning) to
+    size ratio (end), i.e. yPosition is in the range 0.0 - heightRatio.
+
+    These properties are typically used to draw a scrollbar, for example:
+    \code
+    Rectangle {
+        opacity: 0.5; anchors.right: MyListView.right-2; width: 6
+        y: MyListView.visibleArea.yPosition * MyListView.height
+        height: MyListView.visibleArea.heightRatio * MyListView.height
+    }
+    \endcode
+*/
+
+QDeclarativeFlickable::QDeclarativeFlickable(QDeclarativeItem *parent)
+  : QDeclarativeItem(*(new QDeclarativeFlickablePrivate), parent)
+{
+    Q_D(QDeclarativeFlickable);
+    d->init();
+}
+
+QDeclarativeFlickable::QDeclarativeFlickable(QDeclarativeFlickablePrivate &dd, QDeclarativeItem *parent)
+  : QDeclarativeItem(dd, parent)
+{
+    Q_D(QDeclarativeFlickable);
+    d->init();
+}
+
+QDeclarativeFlickable::~QDeclarativeFlickable()
+{
+}
+
+/*!
+    \qmlproperty int Flickable::viewportX
+    \qmlproperty int Flickable::viewportY
+
+    These properties hold the surface coordinate currently at the top-left
+    corner of the Flickable. For example, if you flick an image up 100 pixels,
+    \c yPosition will be 100.
+*/
+qreal QDeclarativeFlickable::viewportX() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return -d->_moveX.value();
+}
+
+void QDeclarativeFlickable::setViewportX(qreal pos)
+{
+    Q_D(QDeclarativeFlickable);
+    pos = qRound(pos);
+    d->timeline.reset(d->_moveX);
+    d->vTime = d->timeline.time();
+    if (-pos != d->_moveX.value()) {
+        d->_moveX.setValue(-pos);
+        viewportMoved();
+    }
+}
+
+qreal QDeclarativeFlickable::viewportY() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return -d->_moveY.value();
+}
+
+void QDeclarativeFlickable::setViewportY(qreal pos)
+{
+    Q_D(QDeclarativeFlickable);
+    pos = qRound(pos);
+    d->timeline.reset(d->_moveY);
+    d->vTime = d->timeline.time();
+    if (-pos != d->_moveY.value()) {
+        d->_moveY.setValue(-pos);
+        viewportMoved();
+    }
+}
+
+/*!
+    \qmlproperty bool Flickable::interactive
+
+    A user cannot drag or flick a Flickable that is not interactive.
+
+    This property is useful for temporarily disabling flicking. This allows
+    special interaction with Flickable's children: for example, you might want to
+    freeze a flickable map while viewing detailed information on a location popup that is a child of the Flickable.
+*/
+bool QDeclarativeFlickable::isInteractive() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->interactive;
+}
+
+void QDeclarativeFlickable::setInteractive(bool interactive)
+{
+    Q_D(QDeclarativeFlickable);
+    if (interactive != d->interactive) {
+        d->interactive = interactive;
+        if (!interactive && d->flicked) {
+            d->timeline.clear();
+            d->vTime = d->timeline.time();
+            d->flicked = false;
+            emit flickingChanged();
+            emit flickEnded();
+        }
+        emit interactiveChanged();
+    }
+}
+
+/*!
+    \qmlproperty real Flickable::horizontalVelocity
+    \qmlproperty real Flickable::verticalVelocity
+    \qmlproperty real Flickable::reportedVelocitySmoothing
+
+    The instantaneous velocity of movement along the x and y axes, in pixels/sec.
+
+    The reported velocity is smoothed to avoid erratic output.
+    reportedVelocitySmoothing determines how much smoothing is applied.
+*/
+qreal QDeclarativeFlickable::horizontalVelocity() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->horizontalVelocity.value();
+}
+
+qreal QDeclarativeFlickable::verticalVelocity() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->verticalVelocity.value();
+}
+
+/*!
+    \qmlproperty bool Flickable::atXBeginning
+    \qmlproperty bool Flickable::atXEnd
+    \qmlproperty bool Flickable::atYBeginning
+    \qmlproperty bool Flickable::atYEnd
+
+    These properties are true if the flickable view is positioned at the beginning,
+    or end respecively.
+*/
+bool QDeclarativeFlickable::isAtXEnd() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->atXEnd;
+}
+
+bool QDeclarativeFlickable::isAtXBeginning() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->atXBeginning;
+}
+
+bool QDeclarativeFlickable::isAtYEnd() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->atYEnd;
+}
+
+bool QDeclarativeFlickable::isAtYBeginning() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->atYBeginning;
+}
+
+void QDeclarativeFlickable::ticked()
+{
+    viewportMoved();
+}
+
+QDeclarativeItem *QDeclarativeFlickable::viewport()
+{
+    Q_D(QDeclarativeFlickable);
+    return d->viewport;
+}
+
+QDeclarativeFlickableVisibleArea *QDeclarativeFlickable::visibleArea()
+{
+    Q_D(QDeclarativeFlickable);
+    if (!d->visibleArea)
+        d->visibleArea = new QDeclarativeFlickableVisibleArea(this);
+    return d->visibleArea;
+}
+
+/*!
+    \qmlproperty enumeration Flickable::flickDirection
+
+    This property determines which directions the view can be flicked.
+
+    \list
+    \o AutoFlickDirection (default) - allows flicking vertically if the
+    \e viewportHeight is not equal to the \e height of the Flickable.
+    Allows flicking horizontally if the \e viewportWidth is not equal
+    to the \e width of the Flickable.
+    \o HorizontalFlick - allows flicking horizontally.
+    \o VerticalFlick - allows flicking vertically.
+    \o HorizontalAndVerticalFlick - allows flicking in both directions.
+    \endlist
+*/
+QDeclarativeFlickable::FlickDirection QDeclarativeFlickable::flickDirection() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->flickDirection;
+}
+
+void QDeclarativeFlickable::setFlickDirection(FlickDirection direction)
+{
+    Q_D(QDeclarativeFlickable);
+    if (direction != d->flickDirection) {
+        d->flickDirection = direction;
+        emit flickDirectionChanged();
+    }
+}
+
+void QDeclarativeFlickablePrivate::handleMousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (interactive && timeline.isActive() && (qAbs(velocityX) > 10 || qAbs(velocityY) > 10))
+        stealMouse = true; // If we've been flicked then steal the click.
+    else
+        stealMouse = false;
+    pressed = true;
+    timeline.clear();
+    velocityX = 0;
+    velocityY = 0;
+    lastPos = QPoint();
+    QDeclarativeItemPrivate::start(lastPosTime);
+    pressPos = event->pos();
+    pressX = _moveX.value();
+    pressY = _moveY.value();
+    flicked = false;
+    QDeclarativeItemPrivate::start(pressTime);
+    QDeclarativeItemPrivate::start(velocityTime);
+}
+
+void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_Q(QDeclarativeFlickable);
+    if (!interactive || lastPosTime.isNull())
+        return;
+    bool rejectY = false;
+    bool rejectX = false;
+    bool moved = false;
+
+    if (q->yflick()) {
+        int dy = int(event->pos().y() - pressPos.y());
+        if (qAbs(dy) > QApplication::startDragDistance() || QDeclarativeItemPrivate::elapsed(pressTime) > 200) {
+            qreal newY = dy + pressY;
+            const qreal minY = q->minYExtent();
+            const qreal maxY = q->maxYExtent();
+            if (newY > minY)
+                newY = minY + (newY - minY) / 2;
+            if (newY < maxY && maxY - minY <= 0)
+                newY = maxY + (newY - maxY) / 2;
+            if (!q->overShoot() && (newY > minY || newY < maxY)) {
+                if (newY > minY)
+                    newY = minY;
+                else if (newY < maxY)
+                    newY = maxY;
+                else
+                    rejectY = true;
+            }
+            if (!rejectY) {
+                _moveY.setValue(newY);
+                moved = true;
+            }
+            if (qAbs(dy) > QApplication::startDragDistance())
+                stealMouse = true;
+        }
+    }
+
+    if (q->xflick()) {
+        int dx = int(event->pos().x() - pressPos.x());
+        if (qAbs(dx) > QApplication::startDragDistance() || QDeclarativeItemPrivate::elapsed(pressTime) > 200) {
+            qreal newX = dx + pressX;
+            const qreal minX = q->minXExtent();
+            const qreal maxX = q->maxXExtent();
+            if (newX > minX)
+                newX = minX + (newX - minX) / 2;
+            if (newX < maxX && maxX - minX <= 0)
+                newX = maxX + (newX - maxX) / 2;
+            if (!q->overShoot() && (newX > minX || newX < maxX)) {
+                if (newX > minX)
+                    newX = minX;
+                else if (newX < maxX)
+                    newX = maxX;
+                else
+                    rejectX = true;
+            }
+            if (!rejectX) {
+                _moveX.setValue(newX);
+                moved = true;
+            }
+
+            if (qAbs(dx) > QApplication::startDragDistance())
+                stealMouse = true;
+        }
+    }
+
+    if (!lastPos.isNull()) {
+        qreal elapsed = qreal(QDeclarativeItemPrivate::restart(lastPosTime)) / 1000.;
+        if (elapsed <= 0)
+            elapsed = 1;
+        if (q->yflick()) {
+            qreal diff = event->pos().y() - lastPos.y();
+            // average to reduce the effect of spurious moves
+            velocityY += diff / elapsed;
+            velocityY /= 2;
+        }
+
+        if (q->xflick()) {
+            qreal diff = event->pos().x() - lastPos.x();
+            // average to reduce the effect of spurious moves
+            velocityX += diff / elapsed;
+            velocityX /= 2;
+        }
+    }
+
+    if (rejectY) velocityY = 0;
+    if (rejectX) velocityX = 0;
+
+    if (moved) {
+        q->movementStarting();
+        q->viewportMoved();
+    }
+
+    lastPos = event->pos();
+}
+
+void QDeclarativeFlickablePrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_Q(QDeclarativeFlickable);
+    pressed = false;
+    if (lastPosTime.isNull())
+        return;
+
+    if (QDeclarativeItemPrivate::elapsed(lastPosTime) > 100) {
+        // if we drag then pause before release we should not cause a flick.
+        velocityX = 0.0;
+        velocityY = 0.0;
+    }
+
+    vTime = timeline.time();
+    if (qAbs(velocityY) > 10 && qAbs(event->pos().y() - pressPos.y()) > FlickThreshold) {
+        qreal velocity = velocityY;
+        if (qAbs(velocity) < minimumFlickVelocity) // Minimum velocity to avoid annoyingly slow flicks.
+            velocity = velocity < 0 ? -minimumFlickVelocity : minimumFlickVelocity;
+        flickY(velocity);
+    } else {
+        fixupY();
+    }
+
+    if (qAbs(velocityX) > 10 && qAbs(event->pos().x() - pressPos.x()) > FlickThreshold) {
+        qreal velocity = velocityX;
+        if (qAbs(velocity) < minimumFlickVelocity) // Minimum velocity to avoid annoyingly slow flicks.
+            velocity = velocity < 0 ? -minimumFlickVelocity : minimumFlickVelocity;
+        flickX(velocity);
+    } else {
+        fixupX();
+    }
+
+    stealMouse = false;
+    lastPosTime = QTime();
+
+    if (!timeline.isActive())
+        q->movementEnding();
+}
+
+void QDeclarativeFlickable::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->interactive) {
+        d->handleMousePressEvent(event);
+        event->accept();
+    } else {
+        QDeclarativeItem::mousePressEvent(event);
+    }
+}
+
+void QDeclarativeFlickable::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->interactive) {
+        d->handleMouseMoveEvent(event);
+        event->accept();
+    } else {
+        QDeclarativeItem::mouseMoveEvent(event);
+    }
+}
+
+void QDeclarativeFlickable::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->interactive) {
+        d->clearDelayedPress();
+        d->handleMouseReleaseEvent(event);
+        event->accept();
+        ungrabMouse();
+    } else {
+        QDeclarativeItem::mouseReleaseEvent(event);
+    }
+}
+
+void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
+{
+    Q_D(QDeclarativeFlickable);
+    if (!d->interactive) {
+        QDeclarativeItem::wheelEvent(event);
+    } else if (yflick()) {
+        if (event->delta() > 0)
+            d->velocityY = qMax(event->delta() - d->verticalVelocity.value(), qreal(250.0));
+        else
+            d->velocityY = qMin(event->delta() - d->verticalVelocity.value(), qreal(-250.0));
+        d->flicked = false;
+        d->flickY(d->velocityY);
+        event->accept();
+    } else if (xflick()) {
+        if (event->delta() > 0)
+            d->velocityX = qMax(event->delta() - d->horizontalVelocity.value(), qreal(250.0));
+        else
+            d->velocityX = qMin(event->delta() - d->horizontalVelocity.value(), qreal(-250.0));
+        d->flicked = false;
+        d->flickX(d->velocityX);
+        event->accept();
+    } else {
+        QDeclarativeItem::wheelEvent(event);
+    }
+}
+
+void QDeclarativeFlickablePrivate::captureDelayedPress(QGraphicsSceneMouseEvent *event)
+{
+    Q_Q(QDeclarativeFlickable);
+    if (!q->scene() || pressDelay <= 0)
+        return;
+    delayedPressTarget = q->scene()->mouseGrabberItem();
+    delayedPressEvent = new QGraphicsSceneMouseEvent(event->type());
+    delayedPressEvent->setAccepted(false);
+    for (int i = 0x1; i <= 0x10; i <<= 1) {
+        if (event->buttons() & i) {
+            Qt::MouseButton button = Qt::MouseButton(i);
+            delayedPressEvent->setButtonDownPos(button, event->buttonDownPos(button));
+            delayedPressEvent->setButtonDownScenePos(button, event->buttonDownScenePos(button));
+            delayedPressEvent->setButtonDownScreenPos(button, event->buttonDownScreenPos(button));
+        }
+    }
+    delayedPressEvent->setButtons(event->buttons());
+    delayedPressEvent->setButton(event->button());
+    delayedPressEvent->setPos(event->pos());
+    delayedPressEvent->setScenePos(event->scenePos());
+    delayedPressEvent->setScreenPos(event->screenPos());
+    delayedPressEvent->setLastPos(event->lastPos());
+    delayedPressEvent->setLastScenePos(event->lastScenePos());
+    delayedPressEvent->setLastScreenPos(event->lastScreenPos());
+    delayedPressEvent->setModifiers(event->modifiers());
+    delayedPressTimer.start(pressDelay, q);
+}
+
+void QDeclarativeFlickablePrivate::clearDelayedPress()
+{
+    if (delayedPressEvent) {
+        delayedPressTimer.stop();
+        delete delayedPressEvent;
+        delayedPressEvent = 0;
+    }
+}
+
+void QDeclarativeFlickablePrivate::setRoundedViewportX(qreal x)
+{
+    viewport->setX(qRound(x));
+}
+
+void QDeclarativeFlickablePrivate::setRoundedViewportY(qreal y)
+{
+    viewport->setY(qRound(y));
+}
+
+void QDeclarativeFlickable::timerEvent(QTimerEvent *event)
+{
+    Q_D(QDeclarativeFlickable);
+    if (event->timerId() == d->delayedPressTimer.timerId()) {
+        d->delayedPressTimer.stop();
+        if (d->delayedPressEvent) {
+            QDeclarativeItem *grabber = scene() ? qobject_cast<QDeclarativeItem*>(scene()->mouseGrabberItem()) : 0;
+            if (!grabber || grabber != this)
+                scene()->sendEvent(d->delayedPressTarget, d->delayedPressEvent);
+            delete d->delayedPressEvent;
+            d->delayedPressEvent = 0;
+        }
+    }
+}
+
+qreal QDeclarativeFlickable::minYExtent() const
+{
+    return 0.0;
+}
+
+qreal QDeclarativeFlickable::minXExtent() const
+{
+    return 0.0;
+}
+
+/* returns -ve */
+qreal QDeclarativeFlickable::maxXExtent() const
+{
+    return width() - vWidth();
+}
+/* returns -ve */
+qreal QDeclarativeFlickable::maxYExtent() const
+{
+    return height() - vHeight();
+}
+
+void QDeclarativeFlickable::viewportMoved()
+{
+    Q_D(QDeclarativeFlickable);
+
+    int elapsed = QDeclarativeItemPrivate::restart(d->velocityTime);
+    if (!elapsed)
+        return;
+
+    qreal prevY = d->lastFlickablePosition.x();
+    qreal prevX = d->lastFlickablePosition.y();
+    d->velocityTimeline.clear();
+    if (d->pressed) {
+        qreal horizontalVelocity = (prevX - d->_moveX.value()) * 1000 / elapsed;
+        qreal verticalVelocity = (prevY - d->_moveY.value()) * 1000 / elapsed;
+        d->velocityTimeline.move(d->horizontalVelocity, horizontalVelocity, d->reportedVelocitySmoothing);
+        d->velocityTimeline.move(d->horizontalVelocity, 0, d->reportedVelocitySmoothing);
+        d->velocityTimeline.move(d->verticalVelocity, verticalVelocity, d->reportedVelocitySmoothing);
+        d->velocityTimeline.move(d->verticalVelocity, 0, d->reportedVelocitySmoothing);
+    } else {
+        if (d->timeline.time() > d->vTime) {
+            qreal horizontalVelocity = (prevX - d->_moveX.value()) * 1000 / (d->timeline.time() - d->vTime);
+            qreal verticalVelocity = (prevY - d->_moveY.value()) * 1000 / (d->timeline.time() - d->vTime);
+            d->horizontalVelocity.setValue(horizontalVelocity);
+            d->verticalVelocity.setValue(verticalVelocity);
+        }
+    }
+
+    d->lastFlickablePosition = QPointF(d->_moveY.value(), d->_moveX.value());
+
+    d->vTime = d->timeline.time();
+    d->updateBeginningEnd();
+}
+
+void QDeclarativeFlickable::cancelFlick()
+{
+    Q_D(QDeclarativeFlickable);
+    d->timeline.reset(d->_moveX);
+    d->timeline.reset(d->_moveY);
+    movementEnding();
+}
+
+void QDeclarativeFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+{
+    QDeclarativeItem *i = qobject_cast<QDeclarativeItem *>(o);
+    if (i)
+        i->setParentItem(static_cast<QDeclarativeFlickablePrivate*>(prop->data)->viewport);
+    else
+        o->setParent(prop->object);
+}
+
+QDeclarativeListProperty<QObject> QDeclarativeFlickable::flickableData()
+{
+    Q_D(QDeclarativeFlickable);
+    return QDeclarativeListProperty<QObject>(this, (void *)d, QDeclarativeFlickablePrivate::data_append);
+}
+
+QDeclarativeListProperty<QDeclarativeItem> QDeclarativeFlickable::flickableChildren()
+{
+    Q_D(QDeclarativeFlickable);
+    return d->viewport->fxChildren();
+}
+
+/*!
+    \qmlproperty bool Flickable::overShoot
+    This property holds the number of pixels the surface may overshoot the
+    Flickable's boundaries when flicked.
+
+    If overShoot is non-zero the contents can be flicked beyond the boundary
+    of the Flickable before being moved back to the boundary.  This provides
+    the feeling that the edges of the view are soft, rather than a hard
+    physical boundary.
+*/
+bool QDeclarativeFlickable::overShoot() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->overShoot;
+}
+
+void QDeclarativeFlickable::setOverShoot(bool o)
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->overShoot == o)
+        return;
+    d->overShoot = o;
+    emit overShootChanged();
+}
+
+/*!
+    \qmlproperty int Flickable::viewportWidth
+    \qmlproperty int Flickable::viewportHeight
+
+    The dimensions of the viewport (the surface controlled by Flickable). Typically this
+    should be set to the combined size of the items placed in the Flickable.
+
+    \code
+    Flickable {
+        width: 320; height: 480; viewportWidth: image.width; viewportHeight: image.height
+        Image { id: image; source: "bigimage.png" }
+    }
+    \endcode
+*/
+qreal QDeclarativeFlickable::viewportWidth() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->vWidth;
+}
+
+void QDeclarativeFlickable::setViewportWidth(qreal w)
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->vWidth == w)
+        return;
+    d->vWidth = w;
+    if (w < 0)
+        d->viewport->setWidth(width());
+    else
+        d->viewport->setWidth(w);
+    // Make sure that we're entirely in view.
+    if (!d->pressed)
+        d->fixupX();
+    emit viewportWidthChanged();
+    d->updateBeginningEnd();
+}
+
+void QDeclarativeFlickable::widthChange()
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->vWidth < 0) {
+        d->viewport->setWidth(width());
+        emit viewportWidthChanged();
+    }
+    d->updateBeginningEnd();
+}
+
+void QDeclarativeFlickable::heightChange()
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->vHeight < 0) {
+        d->viewport->setHeight(height());
+        emit viewportHeightChanged();
+    }
+    d->updateBeginningEnd();
+}
+
+qreal QDeclarativeFlickable::viewportHeight() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->vHeight;
+}
+
+void QDeclarativeFlickable::setViewportHeight(qreal h)
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->vHeight == h)
+        return;
+    d->vHeight = h;
+    if (h < 0)
+        d->viewport->setHeight(height());
+    else
+        d->viewport->setHeight(h);
+    // Make sure that we're entirely in view.
+    if (!d->pressed)
+        d->fixupY();
+    emit viewportHeightChanged();
+    d->updateBeginningEnd();
+}
+
+qreal QDeclarativeFlickable::vWidth() const
+{
+    Q_D(const QDeclarativeFlickable);
+    if (d->vWidth < 0)
+        return width();
+    else
+        return d->vWidth;
+}
+
+qreal QDeclarativeFlickable::vHeight() const
+{
+    Q_D(const QDeclarativeFlickable);
+    if (d->vHeight < 0)
+        return height();
+    else
+        return d->vHeight;
+}
+
+bool QDeclarativeFlickable::xflick() const
+{
+    Q_D(const QDeclarativeFlickable);
+    if (d->flickDirection == QDeclarativeFlickable::AutoFlickDirection)
+        return vWidth() != width();
+    return d->flickDirection & QDeclarativeFlickable::HorizontalFlick;
+}
+
+bool QDeclarativeFlickable::yflick() const
+{
+    Q_D(const QDeclarativeFlickable);
+    if (d->flickDirection == QDeclarativeFlickable::AutoFlickDirection)
+        return vHeight() !=  height();
+    return d->flickDirection & QDeclarativeFlickable::VerticalFlick;
+}
+
+bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeFlickable);
+    QGraphicsSceneMouseEvent mouseEvent(event->type());
+    QRectF myRect = mapToScene(QRectF(0, 0, width(), height())).boundingRect();
+
+    QGraphicsScene *s = scene();
+    QDeclarativeItem *grabber = s ? qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem()) : 0;
+    if ((d->stealMouse || myRect.contains(event->scenePos().toPoint())) && (!grabber || !grabber->keepMouseGrab())) {
+        mouseEvent.setAccepted(false);
+        for (int i = 0x1; i <= 0x10; i <<= 1) {
+            if (event->buttons() & i) {
+                Qt::MouseButton button = Qt::MouseButton(i);
+                mouseEvent.setButtonDownPos(button, mapFromScene(event->buttonDownPos(button)));
+            }
+        }
+        mouseEvent.setScenePos(event->scenePos());
+        mouseEvent.setLastScenePos(event->lastScenePos());
+        mouseEvent.setPos(mapFromScene(event->scenePos()));
+        mouseEvent.setLastPos(mapFromScene(event->lastScenePos()));
+
+        switch(mouseEvent.type()) {
+        case QEvent::GraphicsSceneMouseMove:
+            d->handleMouseMoveEvent(&mouseEvent);
+            break;
+        case QEvent::GraphicsSceneMousePress:
+            if (d->delayedPressEvent)
+                return false;
+
+            d->handleMousePressEvent(&mouseEvent);
+            d->captureDelayedPress(event);
+            break;
+        case QEvent::GraphicsSceneMouseRelease:
+            if (d->delayedPressEvent) {
+                scene()->sendEvent(d->delayedPressTarget, d->delayedPressEvent);
+                d->clearDelayedPress();
+            }
+            d->handleMouseReleaseEvent(&mouseEvent);
+            break;
+        default:
+            break;
+        }
+        grabber = qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem());
+        if (grabber && d->stealMouse && !grabber->keepMouseGrab() && grabber != this) {
+            d->clearDelayedPress();
+            grabMouse();
+        }
+
+        return d->stealMouse || d->delayedPressEvent;
+    } else if (!d->lastPosTime.isNull()) {
+        d->lastPosTime = QTime();
+    }
+    if (mouseEvent.type() == QEvent::GraphicsSceneMouseRelease)
+        d->clearDelayedPress();
+    return false;
+}
+
+bool QDeclarativeFlickable::sceneEventFilter(QGraphicsItem *i, QEvent *e)
+{
+    Q_D(QDeclarativeFlickable);
+    if (!isVisible() || !d->interactive)
+        return QDeclarativeItem::sceneEventFilter(i, e);
+    switch (e->type()) {
+    case QEvent::GraphicsSceneMousePress:
+    case QEvent::GraphicsSceneMouseMove:
+    case QEvent::GraphicsSceneMouseRelease:
+        return sendMouseEvent(static_cast<QGraphicsSceneMouseEvent *>(e));
+    default:
+        break;
+    }
+
+    return QDeclarativeItem::sceneEventFilter(i, e);
+}
+
+/*!
+    \qmlproperty real Flickable::maximumFlickVelocity
+    This property holds the maximum velocity that the user can flick the view in pixels/second.
+
+    The default is 2000 pixels/s
+*/
+qreal QDeclarativeFlickable::maximumFlickVelocity() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->maxVelocity;
+}
+
+void QDeclarativeFlickable::setMaximumFlickVelocity(qreal v)
+{
+    Q_D(QDeclarativeFlickable);
+    if (v == d->maxVelocity)
+        return;
+    d->maxVelocity = v;
+    emit maximumFlickVelocityChanged();
+}
+
+/*!
+    \qmlproperty real Flickable::flickDeceleration
+    This property holds the rate at which a flick will decelerate.
+
+    The default is 500.
+*/
+qreal QDeclarativeFlickable::flickDeceleration() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->deceleration;
+}
+
+void QDeclarativeFlickable::setFlickDeceleration(qreal deceleration)
+{
+    Q_D(QDeclarativeFlickable);
+    if (deceleration == d->deceleration)
+        return;
+    d->deceleration = deceleration;
+    emit flickDecelerationChanged();
+}
+
+/*!
+    \qmlproperty bool Flickable::flicking
+
+    This property holds whether the view is currently moving due to
+    the user flicking the view.
+*/
+bool QDeclarativeFlickable::isFlicking() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->flicked;
+}
+
+/*!
+    \qmlproperty int Flickable::pressDelay
+
+    This property holds the time to delay (ms) delivering a press to
+    children of the Flickable.  This can be useful where reacting
+    to a press before a flicking action has undesireable effects.
+
+    If the flickable is dragged/flicked before the delay times out
+    the press event will not be delivered.  If the button is released
+    within the timeout, both the press and release will be delivered.
+*/
+int QDeclarativeFlickable::pressDelay() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->pressDelay;
+}
+
+void QDeclarativeFlickable::setPressDelay(int delay)
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->pressDelay == delay)
+        return;
+    d->pressDelay = delay;
+    emit pressDelayChanged();
+}
+
+qreal QDeclarativeFlickable::reportedVelocitySmoothing() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->reportedVelocitySmoothing;
+}
+
+void QDeclarativeFlickable::setReportedVelocitySmoothing(qreal reportedVelocitySmoothing)
+{
+    Q_D(QDeclarativeFlickable);
+    Q_ASSERT(reportedVelocitySmoothing >= 0);
+    if (reportedVelocitySmoothing == d->reportedVelocitySmoothing)
+        return;
+    d->reportedVelocitySmoothing = reportedVelocitySmoothing;
+    emit reportedVelocitySmoothingChanged(reportedVelocitySmoothing);
+}
+
+/*!
+    \qmlproperty bool Flickable::moving
+
+    This property holds whether the view is currently moving due to
+    the user either dragging or flicking the view.
+*/
+bool QDeclarativeFlickable::isMoving() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->moving;
+}
+
+void QDeclarativeFlickable::movementStarting()
+{
+    Q_D(QDeclarativeFlickable);
+    if (!d->moving) {
+        d->moving = true;
+        emit movingChanged();
+        emit movementStarted();
+    }
+}
+
+void QDeclarativeFlickable::movementEnding()
+{
+    Q_D(QDeclarativeFlickable);
+    if (d->moving) {
+        d->moving = false;
+        emit movingChanged();
+        emit movementEnded();
+    }
+    if (d->flicked) {
+        d->flicked = false;
+        emit flickingChanged();
+        emit flickEnded();
+    }
+    d->horizontalVelocity.setValue(0);
+    d->verticalVelocity.setValue(0);
+}
+
+void QDeclarativeFlickablePrivate::updateVelocity()
+{
+    Q_Q(QDeclarativeFlickable);
+    emit q->horizontalVelocityChanged();
+    emit q->verticalVelocityChanged();
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
new file mode 100644
index 0000000..19fb2a9
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
@@ -0,0 +1,214 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEFLICKABLE_H
+#define QDECLARATIVEFLICKABLE_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeFlickablePrivate;
+class QDeclarativeFlickableVisibleArea;
+class Q_DECLARATIVE_EXPORT QDeclarativeFlickable : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(qreal viewportWidth READ viewportWidth WRITE setViewportWidth NOTIFY viewportWidthChanged)
+    Q_PROPERTY(qreal viewportHeight READ viewportHeight WRITE setViewportHeight NOTIFY viewportHeightChanged)
+    Q_PROPERTY(qreal viewportX READ viewportX WRITE setViewportX NOTIFY positionXChanged)
+    Q_PROPERTY(qreal viewportY READ viewportY WRITE setViewportY NOTIFY positionYChanged)
+
+    Q_PROPERTY(qreal horizontalVelocity READ horizontalVelocity NOTIFY horizontalVelocityChanged)
+    Q_PROPERTY(qreal verticalVelocity READ verticalVelocity NOTIFY verticalVelocityChanged)
+    Q_PROPERTY(qreal reportedVelocitySmoothing READ reportedVelocitySmoothing WRITE setReportedVelocitySmoothing NOTIFY reportedVelocitySmoothingChanged)
+
+    Q_PROPERTY(bool overShoot READ overShoot WRITE setOverShoot NOTIFY overShootChanged)
+    Q_PROPERTY(qreal maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity NOTIFY maximumFlickVelocityChanged)
+    Q_PROPERTY(qreal flickDeceleration READ flickDeceleration WRITE setFlickDeceleration NOTIFY flickDecelerationChanged)
+    Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged)
+    Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged)
+    Q_PROPERTY(FlickDirection flickDirection READ flickDirection WRITE setFlickDirection NOTIFY flickDirectionChanged)
+
+    Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged)
+    Q_PROPERTY(int pressDelay READ pressDelay WRITE setPressDelay NOTIFY pressDelayChanged)
+
+    Q_PROPERTY(bool atXEnd READ isAtXEnd NOTIFY isAtBoundaryChanged)
+    Q_PROPERTY(bool atYEnd READ isAtYEnd NOTIFY isAtBoundaryChanged)
+    Q_PROPERTY(bool atXBeginning READ isAtXBeginning NOTIFY isAtBoundaryChanged)
+    Q_PROPERTY(bool atYBeginning READ isAtYBeginning NOTIFY isAtBoundaryChanged)
+
+    Q_PROPERTY(QDeclarativeFlickableVisibleArea *visibleArea READ visibleArea CONSTANT)
+
+    Q_PROPERTY(QDeclarativeListProperty<QObject> flickableData READ flickableData)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeItem> flickableChildren READ flickableChildren)
+    Q_CLASSINFO("DefaultProperty", "flickableData")
+
+    Q_ENUMS(FlickDirection)
+
+public:
+    QDeclarativeFlickable(QDeclarativeItem *parent=0);
+    ~QDeclarativeFlickable();
+
+    QDeclarativeListProperty<QObject> flickableData();
+    QDeclarativeListProperty<QDeclarativeItem> flickableChildren();
+
+    bool overShoot() const;
+    void setOverShoot(bool);
+
+    qreal viewportWidth() const;
+    void setViewportWidth(qreal);
+
+    qreal viewportHeight() const;
+    void setViewportHeight(qreal);
+
+    qreal viewportX() const;
+    void setViewportX(qreal pos);
+
+    qreal viewportY() const;
+    void setViewportY(qreal pos);
+
+    bool isMoving() const;
+    bool isFlicking() const;
+
+    int pressDelay() const;
+    void setPressDelay(int delay);
+
+    qreal reportedVelocitySmoothing() const;
+    void setReportedVelocitySmoothing(qreal);
+
+    qreal maximumFlickVelocity() const;
+    void setMaximumFlickVelocity(qreal);
+
+    qreal flickDeceleration() const;
+    void setFlickDeceleration(qreal);
+
+    bool isInteractive() const;
+    void setInteractive(bool);
+
+    qreal horizontalVelocity() const;
+    qreal verticalVelocity() const;
+
+    bool isAtXEnd() const;
+    bool isAtXBeginning() const;
+    bool isAtYEnd() const;
+    bool isAtYBeginning() const;
+
+    QDeclarativeItem *viewport();
+
+    enum FlickDirection { AutoFlickDirection=0x00, HorizontalFlick=0x01, VerticalFlick=0x02, HorizontalAndVerticalFlick=0x03 };
+    FlickDirection flickDirection() const;
+    void setFlickDirection(FlickDirection);
+
+Q_SIGNALS:
+    void viewportWidthChanged();
+    void viewportHeightChanged();
+    void positionXChanged();
+    void positionYChanged();
+    void movingChanged();
+    void flickingChanged();
+    void movementStarted();
+    void movementEnded();
+    void flickStarted();
+    void flickEnded();
+    void reportedVelocitySmoothingChanged(int);
+    void horizontalVelocityChanged();
+    void verticalVelocityChanged();
+    void isAtBoundaryChanged();
+    void pageChanged();
+    void flickDirectionChanged();
+    void interactiveChanged();
+    void overShootChanged();
+    void maximumFlickVelocityChanged();
+    void flickDecelerationChanged();
+    void pressDelayChanged();
+
+protected:
+    virtual bool sceneEventFilter(QGraphicsItem *, QEvent *);
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void wheelEvent(QGraphicsSceneWheelEvent *event);
+    void timerEvent(QTimerEvent *event);
+
+    QDeclarativeFlickableVisibleArea *visibleArea();
+
+protected Q_SLOTS:
+    virtual void ticked();
+    void movementStarting();
+    void movementEnding();
+    void heightChange();
+    void widthChange();
+
+protected:
+    virtual qreal minXExtent() const;
+    virtual qreal minYExtent() const;
+    virtual qreal maxXExtent() const;
+    virtual qreal maxYExtent() const;
+    qreal vWidth() const;
+    qreal vHeight() const;
+    virtual void viewportMoved();
+    bool sendMouseEvent(QGraphicsSceneMouseEvent *event);
+
+    bool xflick() const;
+    bool yflick() const;
+    void cancelFlick();
+
+protected:
+    QDeclarativeFlickable(QDeclarativeFlickablePrivate &dd, QDeclarativeItem *parent);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeFlickable)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeFlickable)
+    friend class QDeclarativeFlickableVisibleArea;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeFlickable)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
new file mode 100644
index 0000000..dc3a8a2
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
@@ -0,0 +1,189 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEFLICKABLE_P_H
+#define QDECLARATIVEFLICKABLE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeflickable_p.h"
+
+#include "qdeclarativeitem_p.h"
+
+#include <qdeclarative.h>
+#include <qdeclarativetimeline_p_p.h>
+#include <qdeclarativeanimation_p_p.h>
+
+#include <qdatetime.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeFlickableVisibleArea;
+class QDeclarativeFlickablePrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeFlickable)
+
+public:
+    QDeclarativeFlickablePrivate();
+    void init();
+    virtual void flickX(qreal velocity);
+    virtual void flickY(qreal velocity);
+    virtual void fixupX();
+    virtual void fixupY();
+    void updateBeginningEnd();
+
+    void captureDelayedPress(QGraphicsSceneMouseEvent *event);
+    void clearDelayedPress();
+
+    void setRoundedViewportX(qreal x);
+    void setRoundedViewportY(qreal y);
+
+public:
+    QDeclarativeItem *viewport;
+    QDeclarativeTimeLineValueProxy<QDeclarativeFlickablePrivate> _moveX;
+    QDeclarativeTimeLineValueProxy<QDeclarativeFlickablePrivate> _moveY;
+    QDeclarativeTimeLine timeline;
+    qreal vWidth;
+    qreal vHeight;
+    bool overShoot : 1;
+    bool flicked : 1;
+    bool moving : 1;
+    bool stealMouse : 1;
+    bool pressed : 1;
+    bool atXEnd : 1;
+    bool atXBeginning : 1;
+    bool atYEnd : 1;
+    bool atYBeginning : 1;
+    bool interactive : 1;
+    QTime lastPosTime;
+    QPointF lastPos;
+    QPointF pressPos;
+    qreal pressX;
+    qreal pressY;
+    qreal velocityX;
+    qreal velocityY;
+    QTime pressTime;
+    qreal deceleration;
+    qreal maxVelocity;
+    QTime velocityTime;
+    QPointF lastFlickablePosition;
+    qreal reportedVelocitySmoothing;
+    qreal flickTargetX;
+    qreal flickTargetY;
+    QGraphicsSceneMouseEvent *delayedPressEvent;
+    QGraphicsItem *delayedPressTarget;
+    QBasicTimer delayedPressTimer;
+    int pressDelay;
+    int fixupDuration;
+
+    static void fixupY_callback(void *);
+    static void fixupX_callback(void *);
+
+    void updateVelocity();
+    struct Velocity : public QDeclarativeTimeLineValue
+    {
+        Velocity(QDeclarativeFlickablePrivate *p)
+            : parent(p) {}
+        virtual void setValue(qreal v) {
+            QDeclarativeTimeLineValue::setValue(v);
+            parent->updateVelocity();
+        }
+        QDeclarativeFlickablePrivate *parent;
+    };
+    Velocity horizontalVelocity;
+    Velocity verticalVelocity;
+    int vTime;
+    QDeclarativeTimeLine velocityTimeline;
+    QDeclarativeFlickableVisibleArea *visibleArea;
+    QDeclarativeFlickable::FlickDirection flickDirection;
+
+    void handleMousePressEvent(QGraphicsSceneMouseEvent *);
+    void handleMouseMoveEvent(QGraphicsSceneMouseEvent *);
+    void handleMouseReleaseEvent(QGraphicsSceneMouseEvent *);
+
+    // flickableData property
+    static void data_append(QDeclarativeListProperty<QObject> *, QObject *);
+};
+
+class QDeclarativeFlickableVisibleArea : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(qreal xPosition READ xPosition NOTIFY pageChanged)
+    Q_PROPERTY(qreal yPosition READ yPosition NOTIFY pageChanged)
+    Q_PROPERTY(qreal widthRatio READ widthRatio NOTIFY pageChanged)
+    Q_PROPERTY(qreal heightRatio READ heightRatio NOTIFY pageChanged)
+
+public:
+    QDeclarativeFlickableVisibleArea(QDeclarativeFlickable *parent=0);
+
+    qreal xPosition() const;
+    qreal widthRatio() const;
+    qreal yPosition() const;
+    qreal heightRatio() const;
+
+    void updateVisible();
+
+signals:
+    void pageChanged();
+
+private:
+    QDeclarativeFlickable *flickable;
+    qreal m_xPosition;
+    qreal m_widthRatio;
+    qreal m_yPosition;
+    qreal m_heightRatio;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeFlickableVisibleArea)
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
new file mode 100644
index 0000000..b36127f
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -0,0 +1,238 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeflipable_p.h"
+
+#include "qdeclarativeitem_p.h"
+
+#include <qdeclarativeinfo.h>
+
+#include <QtGui/qgraphicstransform.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeFlipablePrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeFlipable)
+public:
+    QDeclarativeFlipablePrivate() : current(QDeclarativeFlipable::Front), front(0), back(0) {}
+
+    void updateSceneTransformFromParent();
+
+    QDeclarativeFlipable::Side current;
+    QDeclarativeItem *front;
+    QDeclarativeItem *back;
+};
+
+/*!
+    \qmlclass Flipable QDeclarativeFlipable
+    \since 4.7
+    \brief The Flipable item provides a surface that can be flipped.
+    \inherits Item
+
+    Flipable allows you to specify a front and a back and then flip between those sides.
+
+    Here's an example that flips between the front and back sides when clicked:
+
+    \qml
+
+    Flipable {
+        id: flipable
+        width: 250; height: 250
+        property int angle: 0
+
+        transform: Rotation {
+            id: rotation
+            origin.x: flipable.width/2; origin.y: flipable.height/2
+            axis.x: 0; axis.y: 1; axis.z: 0     // rotate around y-axis
+            angle: flipable.angle
+        }
+
+        front: Image { source: "front.png" }
+        back: Image { source: "back.png" }
+
+        states: State {
+            name: "back"
+            PropertyChanges { target: flipable; angle: 180 }
+        }
+
+        transitions: Transition {
+            NumberAnimation { properties: "angle"; duration: 2000 }
+        }
+
+        MouseArea {
+            // change between default and 'back' states
+            onClicked: flipable.state = (flipable.state == 'back' ? '' : 'back')
+            anchors.fill: parent
+        }
+    }
+    \endqml
+
+    \image flipable.gif
+*/
+
+/*!
+    \internal
+    \class QDeclarativeFlipable
+    \brief The QDeclarativeFlipable class provides a flipable surface.
+
+    \ingroup group_widgets
+
+    QDeclarativeFlipable allows you to specify a front and a back, as well as an
+    axis for the flip.
+*/
+
+QDeclarativeFlipable::QDeclarativeFlipable(QDeclarativeItem *parent)
+: QDeclarativeItem(*(new QDeclarativeFlipablePrivate), parent)
+{
+}
+
+QDeclarativeFlipable::~QDeclarativeFlipable()
+{
+}
+
+/*!
+  \qmlproperty Item Flipable::front
+  \qmlproperty Item Flipable::back
+
+  The front and back sides of the flipable.
+*/
+
+QDeclarativeItem *QDeclarativeFlipable::front()
+{
+    Q_D(const QDeclarativeFlipable);
+    return d->front;
+}
+
+void QDeclarativeFlipable::setFront(QDeclarativeItem *front)
+{
+    Q_D(QDeclarativeFlipable);
+    if (d->front) {
+        qmlInfo(this) << tr("front is a write-once property");
+        return;
+    }
+    d->front = front;
+    d->front->setParentItem(this);
+    if (Back == d->current)
+        d->front->setOpacity(0.);
+}
+
+QDeclarativeItem *QDeclarativeFlipable::back()
+{
+    Q_D(const QDeclarativeFlipable);
+    return d->back;
+}
+
+void QDeclarativeFlipable::setBack(QDeclarativeItem *back)
+{
+    Q_D(QDeclarativeFlipable);
+    if (d->back) {
+        qmlInfo(this) << tr("back is a write-once property");
+        return;
+    }
+    d->back = back;
+    d->back->setParentItem(this);
+    if (Front == d->current)
+        d->back->setOpacity(0.);
+}
+
+/*!
+  \qmlproperty enumeration Flipable::side
+
+  The side of the Flippable currently visible. Possible values are \c
+  Front and \c Back.
+*/
+QDeclarativeFlipable::Side QDeclarativeFlipable::side() const
+{
+    Q_D(const QDeclarativeFlipable);
+    if (d->dirtySceneTransform)
+        const_cast<QDeclarativeFlipablePrivate *>(d)->updateSceneTransformFromParent();
+
+    return d->current;
+}
+
+// determination on the currently visible side of the flipable
+// has to be done on the complete scene transform to give
+// correct results.
+void QDeclarativeFlipablePrivate::updateSceneTransformFromParent()
+{
+    Q_Q(QDeclarativeFlipable);
+
+    QDeclarativeItemPrivate::updateSceneTransformFromParent();
+    QPointF p1(0, 0);
+    QPointF p2(1, 0);
+    QPointF p3(1, 1);
+
+    p1 = sceneTransform.map(p1);
+    p2 = sceneTransform.map(p2);
+    p3 = sceneTransform.map(p3);
+
+    qreal cross = (p1.x() - p2.x()) * (p3.y() - p2.y()) -
+                  (p1.y() - p2.y()) * (p3.x() - p2.x());
+
+    QDeclarativeFlipable::Side newSide;
+    if (cross > 0) {
+       newSide = QDeclarativeFlipable::Back;
+    } else {
+        newSide = QDeclarativeFlipable::Front;
+    }
+
+    if (newSide != current) {
+        current = newSide;
+        if (current == QDeclarativeFlipable::Back) {
+            QTransform mat;
+            mat.translate(back->width()/2,back->height()/2);
+            if (back->width() && p1.x() >= p2.x())
+                mat.rotate(180, Qt::YAxis);
+            if (back->height() && p2.y() >= p3.y())
+                mat.rotate(180, Qt::XAxis);
+            mat.translate(-back->width()/2,-back->height()/2);
+            back->setTransform(mat);
+        }
+        if (front)
+            front->setOpacity((current==QDeclarativeFlipable::Front)?1.:0.);
+        if (back)
+            back->setOpacity((current==QDeclarativeFlipable::Back)?1.:0.);
+        emit q->sideChanged();
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable_p.h b/src/declarative/graphicsitems/qdeclarativeflipable_p.h
new file mode 100644
index 0000000..8b9c24c
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeflipable_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEFLIPABLE_H
+#define QDECLARATIVEFLIPABLE_H
+
+#include "qdeclarativeitem.h"
+
+#include <QtCore/QObject>
+#include <QtGui/QTransform>
+#include <QtGui/qvector3d.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeFlipablePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeFlipable : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_ENUMS(Side)
+    Q_PROPERTY(QDeclarativeItem *front READ front WRITE setFront)
+    Q_PROPERTY(QDeclarativeItem *back READ back WRITE setBack)
+    Q_PROPERTY(Side side READ side NOTIFY sideChanged)
+    //### flipAxis
+    //### flipRotation
+public:
+    QDeclarativeFlipable(QDeclarativeItem *parent=0);
+    ~QDeclarativeFlipable();
+
+    QDeclarativeItem *front();
+    void setFront(QDeclarativeItem *);
+
+    QDeclarativeItem *back();
+    void setBack(QDeclarativeItem *);
+
+    enum Side { Front, Back };
+    Side side() const;
+
+Q_SIGNALS:
+    void sideChanged();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeFlipable)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeFlipable)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeFlipable)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEFLIPABLE_H
diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
new file mode 100644
index 0000000..0323a59
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativefocuspanel_p.h"
+
+#include <QtGui/qgraphicsscene.h>
+#include <QEvent>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+   \qmlclass FocusPanel QDeclarativeFocusPanel
+    \since 4.7
+   \brief The FocusPanel item explicitly creates a focus panel.
+   \inherits Item
+
+    Focus panels assist in keyboard focus handling when building QML
+    applications.  All the details are covered in the 
+    \l {qmlfocus}{keyboard focus documentation}.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeFocusPanel
+*/
+
+QDeclarativeFocusPanel::QDeclarativeFocusPanel(QDeclarativeItem *parent) :
+    QDeclarativeItem(parent)
+{
+    setFlag(ItemIsPanel);
+}
+
+QDeclarativeFocusPanel::~QDeclarativeFocusPanel()
+{
+}
+
+/*!
+    \qmlproperty bool FocusPanel::active
+
+    Sets whether the item is the active focus panel.
+*/
+
+bool QDeclarativeFocusPanel::sceneEvent(QEvent *event)
+{
+    if (event->type() == QEvent::WindowActivate ||
+        event->type() == QEvent::WindowDeactivate)
+        emit activeChanged();
+    return QDeclarativeItem::sceneEvent(event);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h b/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h
new file mode 100644
index 0000000..1ad8b6e
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEFOCUSPANEL_H
+#define QDECLARATIVEFOCUSPANEL_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_DECLARATIVE_EXPORT QDeclarativeFocusPanel : public QDeclarativeItem
+{
+    Q_OBJECT
+    Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)
+public:
+    QDeclarativeFocusPanel(QDeclarativeItem *parent=0);
+    virtual ~QDeclarativeFocusPanel();
+
+Q_SIGNALS:
+    void activeChanged();
+
+protected:
+    bool sceneEvent(QEvent *event);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeFocusPanel)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeFocusPanel)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEFOCUSPANEL_H
diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
new file mode 100644
index 0000000..384a47b
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativefocusscope_p.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass FocusScope QDeclarativeFocusScope
+    \since 4.7
+    \brief The FocusScope object explicitly creates a focus scope.
+    \inherits Item
+
+    Focus scopes assist in keyboard focus handling when building reusable QML
+    components.  All the details are covered in the
+    \l {qmlfocus}{keyboard focus documentation}.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeFocusScope
+*/
+
+QDeclarativeFocusScope::QDeclarativeFocusScope(QDeclarativeItem *parent) :
+    QDeclarativeItem(parent)
+{
+    setFlag(QGraphicsItem::ItemIsFocusScope);
+}
+
+QDeclarativeFocusScope::~QDeclarativeFocusScope()
+{
+}
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope_p.h b/src/declarative/graphicsitems/qdeclarativefocusscope_p.h
new file mode 100644
index 0000000..cd480b4
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativefocusscope_p.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEFOCUSSCOPE_H
+#define QDECLARATIVEFOCUSSCOPE_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+//### set component root as focusscope
+class Q_DECLARATIVE_EXPORT QDeclarativeFocusScope : public QDeclarativeItem
+{
+    Q_OBJECT
+public:
+    QDeclarativeFocusScope(QDeclarativeItem *parent=0);
+    virtual ~QDeclarativeFocusScope();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeFocusScope)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEFOCUSSCOPE_H
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
new file mode 100644
index 0000000..1977817
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
@@ -0,0 +1,269 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativegraphicsobjectcontainer_p.h"
+
+#include "qdeclarativeitem_p.h"
+
+#include <QGraphicsObject>
+#include <QGraphicsWidget>
+#include <QGraphicsSceneResizeEvent>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeGraphicsObjectContainerPrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeGraphicsObjectContainer)
+
+public:
+    QDeclarativeGraphicsObjectContainerPrivate() : QDeclarativeItemPrivate(), graphicsObject(0), syncedResize(false)
+    { }
+
+    void _q_updateSize();
+
+    void setFiltering(bool on)
+    {
+        Q_Q(QDeclarativeGraphicsObjectContainer);
+        if (graphicsObject && graphicsObject->isWidget()) {
+            if (!on) {
+                graphicsObject->removeEventFilter(q);
+                QObject::disconnect(q, SIGNAL(widthChanged()), q, SLOT(_q_updateSize()));
+                QObject::disconnect(q, SIGNAL(heightChanged()), q, SLOT(_q_updateSize()));
+            } else {
+                graphicsObject->installEventFilter(q);
+                QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(_q_updateSize()));
+                QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(_q_updateSize()));
+            }
+        }
+    }
+
+
+    QGraphicsObject *graphicsObject;
+    bool syncedResize;
+};
+
+
+/*!
+    \qmlclass GraphicsObjectContainer QDeclarativeGraphicsObjectContainer
+    \since 4.7
+    \brief The GraphicsObjectContainer element allows you to add QGraphicsObjects into Fluid UI elements.
+
+    While any QObject based class can be exposed to QML, QDeclarativeItem
+    provides a lot of important functionality, including anchors and proper
+    management of child items. GraphicsObjectContainer helps provide these
+    functions to other QGraphicsObjects, so that they can be used unaltered in
+    a QML scene. QGraphicsObjects, which are not QDeclarativeItems, and which are
+    placed in a QML scene outside of a GraphicsObjectContainer, will not appear
+    on screen at all.
+
+    A GraphicsObjectContainer can have one element inside it, and it must be a
+    QGraphicsObject or subclass which has been exposed to the QML engine.
+    The graphics object inside the GraphicsObjectContainer can then be used
+    like any other item in QML with the exception of not being reparentable
+    and not having the standard properties of QML items (such as anchors).
+
+    As the contained object is positioned relative to the container, anchors
+    affecting the container item will affect the onscreen position of the
+    contained item. If synchronizedResizing is set to true, then anchors
+    affecting the container item's size will also affect the contained item's
+    size.
+
+    Example:
+    \code
+    import Qt 4.6
+    import MyApp 2.1 as Widgets
+    Rectangle{
+        id: rect
+        property alias widgetPropertyThree: widget.myThirdProperty;
+        GraphicsObjectContainer{
+            synchronizedResizing: true
+            anchors.margins: 10
+            anchors.fill: parent
+            Widgets.MyWidget{
+                myProperty: "A Value"
+                myOtherProperty: rect.color
+            }
+        }
+    }
+    \endcode
+*/
+
+/*!
+    \internal
+    \class QDeclarativeGraphicsObjectContainer
+    \brief The QDeclarativeGraphicsObjectContainer class allows you to add QGraphicsObjects into Fluid UI applications.
+*/
+
+QDeclarativeGraphicsObjectContainer::QDeclarativeGraphicsObjectContainer(QDeclarativeItem *parent)
+: QDeclarativeItem(*new QDeclarativeGraphicsObjectContainerPrivate, parent)
+{
+}
+
+QDeclarativeGraphicsObjectContainer::~QDeclarativeGraphicsObjectContainer()
+{
+}
+
+QGraphicsObject *QDeclarativeGraphicsObjectContainer::graphicsObject() const
+{
+    Q_D(const QDeclarativeGraphicsObjectContainer);
+    return d->graphicsObject;
+}
+
+/*!
+    \qmlproperty QGraphicsObject GraphicsObjectContainer::graphicsObject
+    The QGraphicsObject associated with this element.
+*/
+void QDeclarativeGraphicsObjectContainer::setGraphicsObject(QGraphicsObject *object)
+{
+    Q_D(QDeclarativeGraphicsObjectContainer);
+    if (object == d->graphicsObject)
+        return;
+
+    //### remove previously set item?
+
+    d->setFiltering(false);
+
+    d->graphicsObject = object;
+
+    if (d->graphicsObject) {
+        d->graphicsObject->setParentItem(this);
+
+        if (d->syncedResize && d->graphicsObject->isWidget()) {
+            QGraphicsWidget *gw = static_cast<QGraphicsWidget*>(d->graphicsObject);
+            QSizeF gwSize = gw->size(); //### should we use sizeHint?
+            QSizeF newSize = gwSize;
+            if (heightValid())
+                newSize.setHeight(height());
+            if (widthValid())
+                newSize.setWidth(width());
+            if (gwSize != newSize)
+                gw->resize(newSize);
+
+            gwSize = gw->size();
+            setImplicitWidth(gwSize.width());
+            setImplicitHeight(gwSize.height());
+
+            d->setFiltering(true);
+        }
+    }
+}
+
+QVariant QDeclarativeGraphicsObjectContainer::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    Q_D(QDeclarativeGraphicsObjectContainer);
+    if (change == ItemSceneHasChanged) {
+        QGraphicsObject *o = d->graphicsObject;
+        d->graphicsObject = 0;
+        setGraphicsObject(o);
+    }
+    return QDeclarativeItem::itemChange(change, value);
+}
+
+bool QDeclarativeGraphicsObjectContainer::eventFilter(QObject *watched, QEvent *e)
+{
+    Q_D(QDeclarativeGraphicsObjectContainer);
+    if (watched == d->graphicsObject && e->type() == QEvent::GraphicsSceneResize) {
+        if (d->graphicsObject && d->graphicsObject->isWidget() && d->syncedResize) {
+           QSizeF newSize = static_cast<QGraphicsWidget*>(d->graphicsObject)->size();
+           setImplicitWidth(newSize.width());
+           setImplicitHeight(newSize.height());
+       }
+    }
+    return QDeclarativeItem::eventFilter(watched, e);
+}
+
+/*!
+    \qmlproperty bool GraphicsObjectContainer::synchronizedResizing
+
+    This property determines whether or not the container and graphics object will synchronize their
+    sizes.
+
+    \note This property only applies when wrapping a QGraphicsWidget.
+
+    If synchronizedResizing is enabled, the container and widget will
+    synchronize their sizes as follows.
+    \list
+    \o If a size has been set on the container, the widget will be resized to the container.
+    Any changes in the container's size will be reflected in the widget.
+
+    \o \e Otherwise, the container will initially be sized to the preferred size of the widget.
+    Any changes to the container's size will be reflected in the widget, and any changes to the
+    widget's size will be reflected in the container.
+    \endlist
+*/
+bool QDeclarativeGraphicsObjectContainer::synchronizedResizing() const
+{
+    Q_D(const QDeclarativeGraphicsObjectContainer);
+    return d->syncedResize;
+}
+
+void QDeclarativeGraphicsObjectContainer::setSynchronizedResizing(bool on)
+{
+    Q_D(QDeclarativeGraphicsObjectContainer);
+    if (on == d->syncedResize)
+        return;
+
+    d->syncedResize = on;
+    d->setFiltering(on);
+}
+
+void QDeclarativeGraphicsObjectContainerPrivate::_q_updateSize()
+{
+    if (!graphicsObject || !graphicsObject->isWidget() || !syncedResize)
+        return;
+
+    QGraphicsWidget *gw = static_cast<QGraphicsWidget*>(graphicsObject);
+    const QSizeF newSize(width, height);
+    gw->resize(newSize);
+
+    //### will respecting the widgets min/max ever get us in trouble? (all other items always
+    //    size to exactly what you tell them)
+    /*QSizeF constrainedSize = newSize.expandedTo(gw->minimumSize()).boundedTo(gw->maximumSize());
+    gw->resize(constrainedSize);
+    if (constrainedSize != newSize) {
+        setImplicitWidth(constrainedSize.width());
+        setImplicitHeight(constrainedSize.height());
+    }*/
+}
+
+#include <moc_qdeclarativegraphicsobjectcontainer_p.cpp>
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer_p.h b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer_p.h
new file mode 100644
index 0000000..95d7a4b
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer_p.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEGRAPHICSOBJECTCONTAINER_H
+#define QDECLARATIVEGRAPHICSOBJECTCONTAINER_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QGraphicsObject;
+class QDeclarativeGraphicsObjectContainerPrivate;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeGraphicsObjectContainer : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_CLASSINFO("DefaultProperty", "graphicsObject")
+    Q_PROPERTY(QGraphicsObject *graphicsObject READ graphicsObject WRITE setGraphicsObject)
+    Q_PROPERTY(bool synchronizedResizing READ synchronizedResizing WRITE setSynchronizedResizing)
+
+public:
+    QDeclarativeGraphicsObjectContainer(QDeclarativeItem *parent = 0);
+    ~QDeclarativeGraphicsObjectContainer();
+
+    QGraphicsObject *graphicsObject() const;
+    void setGraphicsObject(QGraphicsObject *);
+
+    bool synchronizedResizing() const;
+    void setSynchronizedResizing(bool on);
+
+protected:
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    bool eventFilter(QObject *watched, QEvent *e);
+
+private:
+    Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeGraphicsObjectContainer)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QGraphicsObject)
+QML_DECLARE_TYPE(QDeclarativeGraphicsObjectContainer)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEGRAPHICSOBJECTCONTAINER_H
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
new file mode 100644
index 0000000..aae5571
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -0,0 +1,1723 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativegridview_p.h"
+
+#include "qdeclarativevisualitemmodel_p.h"
+#include "qdeclarativeflickable_p_p.h"
+
+#include <qdeclarativeeasefollow_p.h>
+
+#include <qlistmodelinterface_p.h>
+#include <QKeyEvent>
+
+QT_BEGIN_NAMESPACE
+
+QHash<QObject*, QDeclarativeGridViewAttached*> QDeclarativeGridViewAttached::attachedProperties;
+
+
+//----------------------------------------------------------------------------
+
+class FxGridItem
+{
+public:
+    FxGridItem(QDeclarativeItem *i, QDeclarativeGridView *v) : item(i), view(v) {
+        attached = QDeclarativeGridViewAttached::properties(item);
+        attached->m_view = view;
+    }
+    ~FxGridItem() {}
+
+    qreal rowPos() const { return (view->flow() == QDeclarativeGridView::LeftToRight ? item->y() : item->x()); }
+    qreal colPos() const { return (view->flow() == QDeclarativeGridView::LeftToRight ? item->x() : item->y()); }
+    qreal endRowPos() const {
+        return view->flow() == QDeclarativeGridView::LeftToRight
+                                ? item->y() + view->cellHeight() - 1
+                                : item->x() + view->cellWidth() - 1;
+    }
+    void setPosition(qreal col, qreal row) {
+        if (view->flow() == QDeclarativeGridView::LeftToRight) {
+            item->setPos(QPointF(col, row));
+        } else {
+            item->setPos(QPointF(row, col));
+        }
+    }
+
+    QDeclarativeItem *item;
+    QDeclarativeGridView *view;
+    QDeclarativeGridViewAttached *attached;
+    int index;
+};
+
+//----------------------------------------------------------------------------
+
+class QDeclarativeGridViewPrivate : public QDeclarativeFlickablePrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeGridView)
+
+public:
+    QDeclarativeGridViewPrivate()
+    : currentItem(0), flow(QDeclarativeGridView::LeftToRight)
+    , visiblePos(0), visibleIndex(0) , currentIndex(-1)
+    , cellWidth(100), cellHeight(100), columns(1), requestedIndex(-1)
+    , highlightComponent(0), highlight(0), trackedItem(0)
+    , moveReason(Other), buffer(0), highlightXAnimator(0), highlightYAnimator(0)
+    , bufferMode(NoBuffer)
+    , ownModel(false), wrap(false), autoHighlight(true)
+    , fixCurrentVisibility(false), lazyRelease(false), layoutScheduled(false)
+    , deferredRelease(false) {}
+
+    void init();
+    void clear();
+    FxGridItem *createItem(int modelIndex);
+    void releaseItem(FxGridItem *item);
+    void refill(qreal from, qreal to, bool doBuffer=false);
+
+    void updateGrid();
+    void scheduleLayout();
+    void layout(bool removed=false);
+    void updateUnrequestedIndexes();
+    void updateUnrequestedPositions();
+    void updateTrackedItem();
+    void createHighlight();
+    void updateHighlight();
+    void updateCurrent(int modelIndex);
+
+    FxGridItem *visibleItem(int modelIndex) const {
+        if (modelIndex >= visibleIndex && modelIndex < visibleIndex + visibleItems.count()) {
+            for (int i = modelIndex - visibleIndex; i < visibleItems.count(); ++i) {
+                FxGridItem *item = visibleItems.at(i);
+                if (item->index == modelIndex)
+                    return item;
+            }
+        }
+        return 0;
+    }
+
+    qreal position() const {
+        Q_Q(const QDeclarativeGridView);
+        return flow == QDeclarativeGridView::LeftToRight ? q->viewportY() : q->viewportX();
+    }
+    void setPosition(qreal pos) {
+        Q_Q(QDeclarativeGridView);
+        if (flow == QDeclarativeGridView::LeftToRight)
+            q->setViewportY(pos);
+        else
+            q->setViewportX(pos);
+    }
+    int size() const {
+        Q_Q(const QDeclarativeGridView);
+        return flow == QDeclarativeGridView::LeftToRight ? q->height() : q->width();
+    }
+    qreal startPosition() const {
+        qreal pos = 0;
+        if (!visibleItems.isEmpty())
+            pos = visibleItems.first()->rowPos() - visibleIndex / columns * rowSize();
+        return pos;
+    }
+
+    qreal endPosition() const {
+        qreal pos = 0;
+        if (model && model->count())
+            pos = rowPosAt(model->count() - 1) + rowSize();
+        return pos;
+    }
+
+    bool isValid() const {
+        return model && model->count() && model->isValid();
+    }
+
+    int rowSize() const {
+        return flow == QDeclarativeGridView::LeftToRight ? cellHeight : cellWidth;
+    }
+    int colSize() const {
+        return flow == QDeclarativeGridView::LeftToRight ? cellWidth : cellHeight;
+    }
+
+    qreal colPosAt(int modelIndex) const {
+        if (FxGridItem *item = visibleItem(modelIndex))
+            return item->colPos();
+        if (!visibleItems.isEmpty()) {
+            if (modelIndex < visibleIndex) {
+                int count = (visibleIndex - modelIndex) % columns;
+                int col = visibleItems.first()->colPos() / colSize();
+                col = (columns - count + col) % columns;
+                return col * colSize();
+            } else {
+                int count = columns - 1 - (modelIndex - visibleItems.last()->index - 1) % columns;
+                return visibleItems.last()->colPos() - count * colSize();
+            }
+        } else {
+            return (modelIndex % columns) * colSize();
+        }
+        return 0;
+    }
+    qreal rowPosAt(int modelIndex) const {
+        if (FxGridItem *item = visibleItem(modelIndex))
+            return item->rowPos();
+        if (!visibleItems.isEmpty()) {
+            if (modelIndex < visibleIndex) {
+                int firstCol = visibleItems.first()->colPos() / colSize();
+                int col = visibleIndex - modelIndex + (columns - firstCol - 1);
+                int rows = col / columns;
+                return visibleItems.first()->rowPos() - rows * rowSize();
+            } else {
+                int count = modelIndex - visibleItems.last()->index;
+                int col = visibleItems.last()->colPos() + count * colSize();
+                int rows = col / (columns * colSize());
+                return visibleItems.last()->rowPos() + rows * rowSize();
+            }
+        } else {
+             return (modelIndex / columns) * rowSize();
+        }
+        return 0;
+    }
+
+    FxGridItem *firstVisibleItem() const {
+        const qreal pos = position();
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxGridItem *item = visibleItems.at(i);
+            if (item->index != -1 && item->endRowPos() > pos)
+                return item;
+        }
+        return visibleItems.count() ? visibleItems.first() : 0;
+    }
+
+    // Map a model index to visibleItems list index.
+    // These may differ if removed items are still present in the visible list,
+    // e.g. doing a removal animation
+    int mapFromModel(int modelIndex) const {
+        if (modelIndex < visibleIndex || modelIndex >= visibleIndex + visibleItems.count())
+            return -1;
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxGridItem *listItem = visibleItems.at(i);
+            if (listItem->index == modelIndex)
+                return i + visibleIndex;
+            if (listItem->index > modelIndex)
+                return -1;
+        }
+        return -1; // Not in visibleList
+    }
+
+    // for debugging only
+    void checkVisible() const {
+        int skip = 0;
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxGridItem *listItem = visibleItems.at(i);
+            if (listItem->index == -1) {
+                ++skip;
+            } else if (listItem->index != visibleIndex + i - skip) {
+                for (int j = 0; j < visibleItems.count(); j++)
+                    qDebug() << " index" << j << "item index" << visibleItems.at(j)->index;
+                qFatal("index %d %d %d", visibleIndex, i, listItem->index);
+            }
+        }
+    }
+
+    QGuard<QDeclarativeVisualModel> model;
+    QVariant modelVariant;
+    QList<FxGridItem*> visibleItems;
+    QHash<QDeclarativeItem*,int> unrequestedItems;
+    FxGridItem *currentItem;
+    QDeclarativeGridView::Flow flow;
+    int visiblePos;
+    int visibleIndex;
+    int currentIndex;
+    int cellWidth;
+    int cellHeight;
+    int columns;
+    int requestedIndex;
+    QDeclarativeComponent *highlightComponent;
+    FxGridItem *highlight;
+    FxGridItem *trackedItem;
+    enum MovementReason { Other, SetIndex, Mouse };
+    MovementReason moveReason;
+    int buffer;
+    QDeclarativeEaseFollow *highlightXAnimator;
+    QDeclarativeEaseFollow *highlightYAnimator;
+    enum BufferMode { NoBuffer = 0x00, BufferBefore = 0x01, BufferAfter = 0x02 };
+    BufferMode bufferMode;
+
+    bool ownModel : 1;
+    bool wrap : 1;
+    bool autoHighlight : 1;
+    bool fixCurrentVisibility : 1;
+    bool lazyRelease : 1;
+    bool layoutScheduled : 1;
+    bool deferredRelease : 1;
+};
+
+void QDeclarativeGridViewPrivate::init()
+{
+    Q_Q(QDeclarativeGridView);
+    q->setFlag(QGraphicsItem::ItemIsFocusScope);
+    QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(sizeChange()));
+    QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(sizeChange()));
+    q->setFlickDirection(QDeclarativeFlickable::VerticalFlick);
+}
+
+void QDeclarativeGridViewPrivate::clear()
+{
+    for (int i = 0; i < visibleItems.count(); ++i)
+        releaseItem(visibleItems.at(i));
+    visibleItems.clear();
+    visiblePos = 0;
+    visibleIndex = 0;
+    releaseItem(currentItem);
+    currentItem = 0;
+    createHighlight();
+    trackedItem = 0;
+}
+
+FxGridItem *QDeclarativeGridViewPrivate::createItem(int modelIndex)
+{
+    Q_Q(QDeclarativeGridView);
+    // create object
+    requestedIndex = modelIndex;
+    FxGridItem *listItem = 0;
+    if (QDeclarativeItem *item = model->item(modelIndex, false)) {
+        listItem = new FxGridItem(item, q);
+        listItem->index = modelIndex;
+        // complete
+        model->completeItem();
+        listItem->item->setZValue(1);
+        listItem->item->setParent(q->viewport());
+        unrequestedItems.remove(listItem->item);
+    }
+    requestedIndex = 0;
+    return listItem;
+}
+
+
+void QDeclarativeGridViewPrivate::releaseItem(FxGridItem *item)
+{
+    Q_Q(QDeclarativeGridView);
+    if (!item || !model)
+        return;
+    if (trackedItem == item) {
+        QObject::disconnect(trackedItem->item, SIGNAL(yChanged()), q, SLOT(trackedPositionChanged()));
+        QObject::disconnect(trackedItem->item, SIGNAL(xChanged()), q, SLOT(trackedPositionChanged()));
+        trackedItem = 0;
+    }
+    if (model->release(item->item) == 0) {
+        // item was not destroyed, and we no longer reference it.
+        unrequestedItems.insert(item->item, model->indexOf(item->item, q));
+    }
+    delete item;
+}
+
+void QDeclarativeGridViewPrivate::refill(qreal from, qreal to, bool doBuffer)
+{
+    Q_Q(QDeclarativeGridView);
+    if (!isValid() || !q->isComponentComplete())
+        return;
+
+    qreal bufferFrom = from - buffer;
+    qreal bufferTo = to + buffer;
+    qreal fillFrom = from;
+    qreal fillTo = to;
+    if (doBuffer && (bufferMode & BufferAfter))
+        fillTo = bufferTo;
+    if (doBuffer && (bufferMode & BufferBefore))
+        fillFrom = bufferFrom;
+
+    bool changed = false;
+
+    int colPos = colPosAt(visibleIndex);
+    int rowPos = rowPosAt(visibleIndex);
+    int modelIndex = visibleIndex;
+    if (visibleItems.count()) {
+        rowPos = visibleItems.last()->rowPos();
+        colPos = visibleItems.last()->colPos() + colSize();
+        if (colPos > colSize() * (columns-1)) {
+            colPos = 0;
+            rowPos += rowSize();
+        }
+        int i = visibleItems.count() - 1;
+        while (i > 0 && visibleItems.at(i)->index == -1)
+            --i;
+        modelIndex = visibleItems.at(i)->index + 1;
+    }
+    int colNum = colPos / colSize();
+
+    FxGridItem *item = 0;
+
+    // Item creation and release is staggered in order to avoid
+    // creating/releasing multiple items in one frame
+    // while flicking (as much as possible).
+    while (modelIndex < model->count() && rowPos <= fillTo + rowSize()*(columns - colNum)/(columns+1)) {
+//        qDebug() << "refill: append item" << modelIndex;
+        if (!(item = createItem(modelIndex)))
+            break;
+        item->setPosition(colPos, rowPos);
+        visibleItems.append(item);
+        colPos += colSize();
+        colNum++;
+        if (colPos > colSize() * (columns-1)) {
+            colPos = 0;
+            colNum = 0;
+            rowPos += rowSize();
+        }
+        ++modelIndex;
+        changed = true;
+        if (doBuffer) // never buffer more than one item per frame
+            break;
+    }
+
+    if (visibleItems.count()) {
+        rowPos = visibleItems.first()->rowPos();
+        colPos = visibleItems.first()->colPos() - colSize();
+        if (colPos < 0) {
+            colPos = colSize() * (columns - 1);
+            rowPos -= rowSize();
+        }
+    }
+    colNum = colPos / colSize();
+    while (visibleIndex > 0 && rowPos + rowSize() - 1 >= fillFrom - rowSize()*(colNum+1)/(columns+1)){
+//        qDebug() << "refill: prepend item" << visibleIndex-1 << "top pos" << rowPos << colPos;
+        if (!(item = createItem(visibleIndex-1)))
+            break;
+        --visibleIndex;
+        item->setPosition(colPos, rowPos);
+        visibleItems.prepend(item);
+        colPos -= colSize();
+        colNum--;
+        if (colPos < 0) {
+            colPos = colSize() * (columns - 1);
+            colNum = columns-1;
+            rowPos -= rowSize();
+        }
+        changed = true;
+        if (doBuffer) // never buffer more than one item per frame
+            break;
+    }
+
+    if (!lazyRelease || !changed || deferredRelease) { // avoid destroying items in the same frame that we create
+        while (visibleItems.count() > 1
+               && (item = visibleItems.first())
+                    && item->endRowPos() < bufferFrom - rowSize()*(item->colPos()/colSize()+1)/(columns+1)) {
+            if (item->attached->delayRemove())
+                break;
+//            qDebug() << "refill: remove first" << visibleIndex << "top end pos" << item->endRowPos();
+            if (item->index != -1)
+                visibleIndex++;
+            visibleItems.removeFirst();
+            releaseItem(item);
+            changed = true;
+        }
+        while (visibleItems.count() > 1
+               && (item = visibleItems.last())
+                    && item->rowPos() > bufferTo + rowSize()*(columns - item->colPos()/colSize())/(columns+1)) {
+            if (item->attached->delayRemove())
+                break;
+//            qDebug() << "refill: remove last" << visibleIndex+visibleItems.count()-1;
+            visibleItems.removeLast();
+            releaseItem(item);
+            changed = true;
+        }
+        deferredRelease = false;
+    } else {
+        deferredRelease = true;
+    }
+    if (changed) {
+        if (flow == QDeclarativeGridView::LeftToRight)
+            q->setViewportHeight(endPosition() - startPosition());
+        else
+            q->setViewportWidth(endPosition() - startPosition());
+    } else if (!doBuffer && buffer && bufferMode != NoBuffer) {
+        refill(from, to, true);
+    }
+    lazyRelease = false;
+}
+
+void QDeclarativeGridViewPrivate::updateGrid()
+{
+    Q_Q(QDeclarativeGridView);
+    columns = (int)qMax((flow == QDeclarativeGridView::LeftToRight ? q->width() : q->height()) / colSize(), qreal(1.));
+    if (isValid()) {
+        if (flow == QDeclarativeGridView::LeftToRight)
+            q->setViewportHeight(endPosition() - startPosition());
+        else
+            q->setViewportWidth(endPosition() - startPosition());
+    }
+}
+
+void QDeclarativeGridViewPrivate::scheduleLayout()
+{
+    Q_Q(QDeclarativeGridView);
+    if (!layoutScheduled) {
+        layoutScheduled = true;
+        QMetaObject::invokeMethod(q, "layout", Qt::QueuedConnection);
+    }
+}
+
+void QDeclarativeGridViewPrivate::layout(bool removed)
+{
+    Q_Q(QDeclarativeGridView);
+    layoutScheduled = false;
+    if (visibleItems.count()) {
+        qreal rowPos = visibleItems.first()->rowPos();
+        qreal colPos = visibleItems.first()->colPos();
+        int col = visibleIndex % columns;
+        if (colPos != col * colSize()) {
+            if (removed)
+                rowPos -= rowSize();
+            colPos = col * colSize();
+            visibleItems.first()->setPosition(colPos, rowPos);
+        }
+        for (int i = 1; i < visibleItems.count(); ++i) {
+            FxGridItem *item = visibleItems.at(i);
+            colPos += colSize();
+            if (colPos > colSize() * (columns-1)) {
+                colPos = 0;
+                rowPos += rowSize();
+            }
+            item->setPosition(colPos, rowPos);
+        }
+    }
+    q->refill();
+    updateHighlight();
+    moveReason = Other;
+    if (flow == QDeclarativeGridView::LeftToRight) {
+        q->setViewportHeight(endPosition() - startPosition());
+        fixupY();
+    } else {
+        q->setViewportWidth(endPosition() - startPosition());
+        fixupX();
+    }
+    updateUnrequestedPositions();
+}
+
+void QDeclarativeGridViewPrivate::updateUnrequestedIndexes()
+{
+    Q_Q(QDeclarativeGridView);
+    QHash<QDeclarativeItem*,int>::iterator it;
+    for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
+        *it = model->indexOf(it.key(), q);
+}
+
+void QDeclarativeGridViewPrivate::updateUnrequestedPositions()
+{
+    QHash<QDeclarativeItem*,int>::const_iterator it;
+    for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it) {
+        if (flow == QDeclarativeGridView::LeftToRight) {
+            it.key()->setPos(QPointF(colPosAt(*it), rowPosAt(*it)));
+        } else {
+            it.key()->setPos(QPointF(rowPosAt(*it), colPosAt(*it)));
+        }
+    }
+}
+
+void QDeclarativeGridViewPrivate::updateTrackedItem()
+{
+    Q_Q(QDeclarativeGridView);
+    FxGridItem *item = currentItem;
+    if (highlight)
+        item = highlight;
+
+    FxGridItem *oldTracked = trackedItem;
+
+    if (trackedItem && item != trackedItem) {
+        QObject::disconnect(trackedItem->item, SIGNAL(yChanged()), q, SLOT(trackedPositionChanged()));
+        QObject::disconnect(trackedItem->item, SIGNAL(xChanged()), q, SLOT(trackedPositionChanged()));
+        trackedItem = 0;
+    }
+
+    if (!trackedItem && item) {
+        trackedItem = item;
+        QObject::connect(trackedItem->item, SIGNAL(yChanged()), q, SLOT(trackedPositionChanged()));
+        QObject::connect(trackedItem->item, SIGNAL(xChanged()), q, SLOT(trackedPositionChanged()));
+    }
+    if (trackedItem && trackedItem != oldTracked)
+        q->trackedPositionChanged();
+}
+
+void QDeclarativeGridViewPrivate::createHighlight()
+{
+    Q_Q(QDeclarativeGridView);
+    bool changed = false;
+    if (highlight) {
+        if (trackedItem == highlight)
+            trackedItem = 0;
+        delete highlight->item;
+        delete highlight;
+        highlight = 0;
+        delete highlightXAnimator;
+        delete highlightYAnimator;
+        highlightXAnimator = 0;
+        highlightYAnimator = 0;
+        changed = true;
+    }
+
+    if (currentItem) {
+        QDeclarativeItem *item = 0;
+        if (highlightComponent) {
+            QDeclarativeContext *highlightContext = new QDeclarativeContext(qmlContext(q));
+            QObject *nobj = highlightComponent->create(highlightContext);
+            if (nobj) {
+                highlightContext->setParent(nobj);
+                item = qobject_cast<QDeclarativeItem *>(nobj);
+                if (!item)
+                    delete nobj;
+            } else {
+                delete highlightContext;
+            }
+        } else {
+            item = new QDeclarativeItem;
+            item->setParent(q->viewport());
+        }
+        if (item) {
+            item->setParent(q->viewport());
+            highlight = new FxGridItem(item, q);
+            highlightXAnimator = new QDeclarativeEaseFollow(q);
+            highlightXAnimator->setTarget(QDeclarativeMetaProperty(highlight->item, QLatin1String("x")));
+            highlightXAnimator->setDuration(150);
+            highlightXAnimator->setEnabled(autoHighlight);
+            highlightYAnimator = new QDeclarativeEaseFollow(q);
+            highlightYAnimator->setTarget(QDeclarativeMetaProperty(highlight->item, QLatin1String("y")));
+            highlightYAnimator->setDuration(150);
+            highlightYAnimator->setEnabled(autoHighlight);
+            changed = true;
+        }
+    }
+    if (changed)
+        emit q->highlightChanged();
+}
+
+void QDeclarativeGridViewPrivate::updateHighlight()
+{
+    if ((!currentItem && highlight) || (currentItem && !highlight))
+        createHighlight();
+    if (currentItem && autoHighlight && highlight && !moving) {
+        // auto-update highlight
+        highlightXAnimator->setSourceValue(currentItem->item->x());
+        highlightYAnimator->setSourceValue(currentItem->item->y());
+        highlight->item->setWidth(currentItem->item->width());
+        highlight->item->setHeight(currentItem->item->height());
+    }
+    updateTrackedItem();
+}
+
+void QDeclarativeGridViewPrivate::updateCurrent(int modelIndex)
+{
+    Q_Q(QDeclarativeGridView);
+    if (!q->isComponentComplete() || !isValid() || modelIndex < 0 || modelIndex >= model->count()) {
+        if (currentItem) {
+            currentItem->attached->setIsCurrentItem(false);
+            releaseItem(currentItem);
+            currentItem = 0;
+            currentIndex = -1;
+            updateHighlight();
+            emit q->currentIndexChanged();
+        }
+        return;
+    }
+
+    if (currentItem && currentIndex == modelIndex) {
+        updateHighlight();
+        return;
+    }
+
+    FxGridItem *oldCurrentItem = currentItem;
+    currentIndex = modelIndex;
+    currentItem = createItem(modelIndex);
+    fixCurrentVisibility = true;
+    if (oldCurrentItem && (!currentItem || oldCurrentItem->item != currentItem->item))
+        oldCurrentItem->attached->setIsCurrentItem(false);
+    if (currentItem) {
+        currentItem->setPosition(colPosAt(modelIndex), rowPosAt(modelIndex));
+        currentItem->item->setFocus(true);
+        currentItem->attached->setIsCurrentItem(true);
+    }
+    updateHighlight();
+    emit q->currentIndexChanged();
+    releaseItem(oldCurrentItem);
+}
+
+//----------------------------------------------------------------------------
+
+/*!
+    \qmlclass GridView QDeclarativeGridView
+    \inherits Flickable
+    \brief The GridView item provides a grid view of items provided by a model.
+
+    The model is typically provided by a QAbstractListModel "C++ model object",
+    but can also be created directly in QML.
+
+    The items are laid out top to bottom (vertically) or left to right (horizontally)
+    and may be flicked to scroll.
+
+    The below example creates a very simple grid, using a QML model.
+
+    \image gridview.png
+
+    \snippet doc/src/snippets/declarative/gridview/gridview.qml 3
+
+    The model is defined as a ListModel using QML:
+    \quotefile doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml
+
+    In this case ListModel is a handy way for us to test our UI.  In practice
+    the model would be implemented in C++, or perhaps via a SQL data source.
+*/
+QDeclarativeGridView::QDeclarativeGridView(QDeclarativeItem *parent)
+    : QDeclarativeFlickable(*(new QDeclarativeGridViewPrivate), parent)
+{
+    Q_D(QDeclarativeGridView);
+    d->init();
+}
+
+QDeclarativeGridView::~QDeclarativeGridView()
+{
+    Q_D(QDeclarativeGridView);
+    d->clear();
+    if (d->ownModel)
+        delete d->model;
+}
+
+/*!
+    \qmlattachedproperty bool GridView::isCurrentItem
+    This attched property is true if this delegate is the current item; otherwise false.
+
+    It is attached to each instance of the delegate.
+*/
+
+/*!
+    \qmlattachedproperty GridView GridView::view
+    This attached property holds the view that manages this delegate instance.
+
+    It is attached to each instance of the delegate.
+*/
+
+/*!
+    \qmlattachedproperty bool GridView::delayRemove
+    This attached property holds whether the delegate may be destroyed.
+
+    It is attached to each instance of the delegate.
+
+    It is sometimes necessary to delay the destruction of an item
+    until an animation completes.
+
+    The example below ensures that the animation completes before
+    the item is removed from the grid.
+
+    \code
+    Component {
+        id: myDelegate
+        Item {
+            id: wrapper
+            GridView.onRemove: SequentialAnimation {
+                PropertyAction { target: wrapper.GridView; property: "delayRemove"; value: true }
+                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing: "easeInOutQuad" }
+                PropertyAction { target: wrapper.GridView; property: "delayRemove"; value: false }
+            }
+        }
+    }
+    \endcode
+*/
+
+/*!
+    \qmlattachedsignal GridView::onAdd()
+    This attached handler is called immediately after an item is added to the view.
+*/
+
+/*!
+    \qmlattachedsignal GridView::onRemove()
+    This attached handler is called immediately before an item is removed from the view.
+*/
+
+
+/*!
+  \qmlproperty model GridView::model
+  This property holds the model providing data for the grid.
+
+  The model provides a set of data that is used to create the items
+  for the view.  For large or dynamic datasets the model is usually
+  provided by a C++ model object.  The C++ model object must be a \l
+  {QAbstractItemModel} subclass, a VisualModel, or a simple list.
+
+  \sa {qmlmodels}{Data Models}
+*/
+QVariant QDeclarativeGridView::model() const
+{
+    Q_D(const QDeclarativeGridView);
+    return d->modelVariant;
+}
+
+void QDeclarativeGridView::setModel(const QVariant &model)
+{
+    Q_D(QDeclarativeGridView);
+    if (d->model) {
+        disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
+        disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        disconnect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
+        disconnect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
+    }
+    d->clear();
+    d->modelVariant = model;
+    QObject *object = qvariant_cast<QObject*>(model);
+    QDeclarativeVisualModel *vim = 0;
+    if (object && (vim = qobject_cast<QDeclarativeVisualModel *>(object))) {
+        if (d->ownModel) {
+            delete d->model;
+            d->ownModel = false;
+        }
+        d->model = vim;
+    } else {
+        if (!d->ownModel) {
+            d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+            d->ownModel = true;
+        }
+        if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
+            dataModel->setModel(model);
+    }
+    if (d->model) {
+        if (isComponentComplete()) {
+            refill();
+            if (d->currentIndex >= d->model->count() || d->currentIndex < 0) {
+                setCurrentIndex(0);
+            } else {
+                d->moveReason = QDeclarativeGridViewPrivate::SetIndex;
+                d->updateCurrent(d->currentIndex);
+            }
+        }
+        connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
+        connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        connect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
+        connect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
+        emit countChanged();
+    }
+}
+
+/*!
+    \qmlproperty component GridView::delegate
+
+    The delegate provides a template defining each item instantiated by the view.
+    The index is exposed as an accessible \c index property.  Properties of the
+    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
+
+    Note that the GridView will layout the items based on the size of the root item
+    in the delegate.
+
+    Here is an example delegate:
+    \snippet doc/src/snippets/declarative/gridview/gridview.qml 0
+*/
+QDeclarativeComponent *QDeclarativeGridView::delegate() const
+{
+    Q_D(const QDeclarativeGridView);
+    if (d->model) {
+        if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
+            return dataModel->delegate();
+    }
+
+    return 0;
+}
+
+void QDeclarativeGridView::setDelegate(QDeclarativeComponent *delegate)
+{
+    Q_D(QDeclarativeGridView);
+    if (delegate == this->delegate())
+        return;
+
+    if (!d->ownModel) {
+        d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+        d->ownModel = true;
+    }
+    if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model)) {
+        dataModel->setDelegate(delegate);
+        if (isComponentComplete()) {
+            refill();
+            d->moveReason = QDeclarativeGridViewPrivate::SetIndex;
+            d->updateCurrent(d->currentIndex);
+        }
+    }
+}
+
+/*!
+  \qmlproperty int GridView::currentIndex
+  \qmlproperty Item GridView::currentItem
+
+  \c currentIndex holds the index of the current item.
+  \c currentItem is the current item.  Note that the position of the current item
+  may only be approximate until it becomes visible in the view.
+*/
+int QDeclarativeGridView::currentIndex() const
+{
+    Q_D(const QDeclarativeGridView);
+    return d->currentIndex;
+}
+
+void QDeclarativeGridView::setCurrentIndex(int index)
+{
+    Q_D(QDeclarativeGridView);
+    if (isComponentComplete() && d->isValid() && index != d->currentIndex && index < d->model->count() && index >= 0) {
+        d->moveReason = QDeclarativeGridViewPrivate::SetIndex;
+        cancelFlick();
+        d->updateCurrent(index);
+    } else {
+        d->currentIndex = index;
+    }
+}
+
+QDeclarativeItem *QDeclarativeGridView::currentItem()
+{
+    Q_D(QDeclarativeGridView);
+    if (!d->currentItem)
+        return 0;
+    return d->currentItem->item;
+}
+
+/*!
+  \qmlproperty Item GridView::highlightItem
+
+  \c highlightItem holds the highlight item, which was created
+  from the \l highlight component.
+
+  The highlightItem is managed by the view unless
+  \l highlightFollowsCurrentItem is set to false.
+
+  \sa highlight, highlightFollowsCurrentItem
+*/
+QDeclarativeItem *QDeclarativeGridView::highlightItem()
+{
+    Q_D(QDeclarativeGridView);
+    if (!d->highlight)
+        return 0;
+    return d->highlight->item;
+}
+
+/*!
+  \qmlproperty int GridView::count
+  This property holds the number of items in the view.
+*/
+int QDeclarativeGridView::count() const
+{
+    Q_D(const QDeclarativeGridView);
+    if (d->model)
+        return d->model->count();
+    return 0;
+}
+
+/*!
+  \qmlproperty component GridView::highlight
+  This property holds the component to use as the highlight.
+
+  An instance of the highlight component will be created for each view.
+  The geometry of the resultant component instance will be managed by the view
+  so as to stay with the current item, unless the highlightFollowsCurrentItem property is false.
+
+  The below example demonstrates how to make a simple highlight:
+  \snippet doc/src/snippets/declarative/gridview/gridview.qml 1
+
+  \sa highlightItem, highlightFollowsCurrentItem
+*/
+QDeclarativeComponent *QDeclarativeGridView::highlight() const
+{
+    Q_D(const QDeclarativeGridView);
+    return d->highlightComponent;
+}
+
+void QDeclarativeGridView::setHighlight(QDeclarativeComponent *highlight)
+{
+    Q_D(QDeclarativeGridView);
+    if (highlight != d->highlightComponent) {
+        d->highlightComponent = highlight;
+        d->updateCurrent(d->currentIndex);
+    }
+}
+
+/*!
+  \qmlproperty bool GridView::highlightFollowsCurrentItem
+  This property sets whether the highlight is managed by the view.
+
+  If highlightFollowsCurrentItem is true, the highlight will be moved smoothly
+  to follow the current item.  If highlightFollowsCurrentItem is false, the
+  highlight will not be moved by the view, and must be implemented
+  by the highlight component, for example:
+
+  \code
+  Component {
+      id: myHighlight
+      Rectangle {
+          id: wrapper; color: "lightsteelblue"; radius: 4; width: 320; height: 60
+          y: SpringFollow { source: Wrapper.GridView.view.currentItem.y; spring: 3; damping: 0.2 }
+          x: SpringFollow { source: Wrapper.GridView.view.currentItem.x; spring: 3; damping: 0.2 }
+      }
+  }
+  \endcode
+*/
+bool QDeclarativeGridView::highlightFollowsCurrentItem() const
+{
+    Q_D(const QDeclarativeGridView);
+    return d->autoHighlight;
+}
+
+void QDeclarativeGridView::setHighlightFollowsCurrentItem(bool autoHighlight)
+{
+    Q_D(QDeclarativeGridView);
+    if (d->autoHighlight != autoHighlight) {
+        d->autoHighlight = autoHighlight;
+        if (d->highlightXAnimator) {
+            d->highlightXAnimator->setEnabled(d->autoHighlight);
+            d->highlightYAnimator->setEnabled(d->autoHighlight);
+        }
+        d->updateHighlight();
+    }
+}
+
+/*!
+  \qmlproperty enumeration GridView::flow
+  This property holds the flow of the grid.
+
+  Possible values are \c LeftToRight (default) and \c TopToBottom.
+
+  If \a flow is \c LeftToRight, the view will scroll vertically.
+  If \a flow is \c TopToBottom, the view will scroll horizontally.
+*/
+QDeclarativeGridView::Flow QDeclarativeGridView::flow() const
+{
+    Q_D(const QDeclarativeGridView);
+    return d->flow;
+}
+
+void QDeclarativeGridView::setFlow(Flow flow)
+{
+    Q_D(QDeclarativeGridView);
+    if (d->flow != flow) {
+        d->flow = flow;
+        if (d->flow == LeftToRight) {
+            setViewportWidth(-1);
+            setFlickDirection(QDeclarativeFlickable::VerticalFlick);
+        } else {
+            setViewportHeight(-1);
+            setFlickDirection(QDeclarativeFlickable::HorizontalFlick);
+        }
+        d->clear();
+        d->updateGrid();
+        refill();
+        d->updateCurrent(d->currentIndex);
+    }
+}
+
+/*!
+  \qmlproperty bool GridView::keyNavigationWraps
+  This property holds whether the grid wraps key navigation
+
+  If this property is true then key presses to move off of one end of the grid will cause the
+  selection to jump to the other side.
+*/
+bool QDeclarativeGridView::isWrapEnabled() const
+{
+    Q_D(const QDeclarativeGridView);
+    return d->wrap;
+}
+
+void QDeclarativeGridView::setWrapEnabled(bool wrap)
+{
+    Q_D(QDeclarativeGridView);
+    d->wrap = wrap;
+}
+
+/*!
+  \qmlproperty int GridView::cacheBuffer
+  This property holds the number of off-screen pixels to cache.
+
+  This property determines the number of pixels above the top of the view
+  and below the bottom of the view to cache.  Setting this value can make
+  scrolling the view smoother at the expense of additional memory usage.
+*/
+int QDeclarativeGridView::cacheBuffer() const
+{
+    Q_D(const QDeclarativeGridView);
+    return d->buffer;
+}
+
+void QDeclarativeGridView::setCacheBuffer(int buffer)
+{
+    Q_D(QDeclarativeGridView);
+    if (d->buffer != buffer) {
+        d->buffer = buffer;
+        if (isComponentComplete())
+            refill();
+    }
+}
+
+/*!
+  \qmlproperty int GridView::cellWidth
+  \qmlproperty int GridView::cellHeight
+
+  These properties holds the width and height of each cell in the grid
+
+  The default cell size is 100x100.
+*/
+int QDeclarativeGridView::cellWidth() const
+{
+    Q_D(const QDeclarativeGridView);
+    return d->cellWidth;
+}
+
+void QDeclarativeGridView::setCellWidth(int cellWidth)
+{
+    Q_D(QDeclarativeGridView);
+    if (cellWidth != d->cellWidth && cellWidth > 0) {
+        d->cellWidth = qMax(1, cellWidth);
+        d->updateGrid();
+        emit cellWidthChanged();
+        d->layout();
+    }
+}
+
+int QDeclarativeGridView::cellHeight() const
+{
+    Q_D(const QDeclarativeGridView);
+    return d->cellHeight;
+}
+
+void QDeclarativeGridView::setCellHeight(int cellHeight)
+{
+    Q_D(QDeclarativeGridView);
+    if (cellHeight != d->cellHeight && cellHeight > 0) {
+        d->cellHeight = qMax(1, cellHeight);
+        d->updateGrid();
+        emit cellHeightChanged();
+        d->layout();
+    }
+}
+
+void QDeclarativeGridView::sizeChange()
+{
+    Q_D(QDeclarativeGridView);
+    if (isComponentComplete()) {
+        d->updateGrid();
+        d->layout();
+    }
+}
+
+void QDeclarativeGridView::viewportMoved()
+{
+    Q_D(QDeclarativeGridView);
+    QDeclarativeFlickable::viewportMoved();
+    d->lazyRelease = true;
+    if (d->flicked) {
+        if (yflick()) {
+            if (d->velocityY > 0)
+                d->bufferMode = QDeclarativeGridViewPrivate::BufferBefore;
+            else if (d->velocityY < 0)
+                d->bufferMode = QDeclarativeGridViewPrivate::BufferAfter;
+        }
+
+        if (xflick()) {
+            if (d->velocityX > 0)
+                d->bufferMode = QDeclarativeGridViewPrivate::BufferBefore;
+            else if (d->velocityX < 0)
+                d->bufferMode = QDeclarativeGridViewPrivate::BufferAfter;
+        }
+    }
+    refill();
+}
+
+qreal QDeclarativeGridView::minYExtent() const
+{
+    Q_D(const QDeclarativeGridView);
+    if (d->flow == QDeclarativeGridView::TopToBottom)
+        return QDeclarativeFlickable::minYExtent();
+    return -d->startPosition();
+}
+
+qreal QDeclarativeGridView::maxYExtent() const
+{
+    Q_D(const QDeclarativeGridView);
+    if (d->flow == QDeclarativeGridView::TopToBottom)
+        return QDeclarativeFlickable::maxYExtent();
+    qreal extent = -(d->endPosition() - height());
+    const qreal minY = minYExtent();
+    if (extent > minY)
+        extent = minY;
+    return extent;
+}
+
+qreal QDeclarativeGridView::minXExtent() const
+{
+    Q_D(const QDeclarativeGridView);
+    if (d->flow == QDeclarativeGridView::LeftToRight)
+        return QDeclarativeFlickable::minXExtent();
+    return -d->startPosition();
+}
+
+qreal QDeclarativeGridView::maxXExtent() const
+{
+    Q_D(const QDeclarativeGridView);
+    if (d->flow == QDeclarativeGridView::LeftToRight)
+        return QDeclarativeFlickable::maxXExtent();
+    qreal extent = -(d->endPosition() - width());
+    const qreal minX = minXExtent();
+    if (extent > minX)
+        extent = minX;
+    return extent;
+}
+
+void QDeclarativeGridView::keyPressEvent(QKeyEvent *event)
+{
+    Q_D(QDeclarativeGridView);
+    QDeclarativeFlickable::keyPressEvent(event);
+    if (event->isAccepted())
+        return;
+    if (d->model && d->model->count() && d->interactive) {
+        d->moveReason = QDeclarativeGridViewPrivate::SetIndex;
+        int oldCurrent = currentIndex();
+        switch (event->key()) {
+        case Qt::Key_Up:
+            moveCurrentIndexUp();
+            break;
+        case Qt::Key_Down:
+            moveCurrentIndexDown();
+            break;
+        case Qt::Key_Left:
+            moveCurrentIndexLeft();
+            break;
+        case Qt::Key_Right:
+            moveCurrentIndexRight();
+            break;
+        default:
+            break;
+        }
+        if (oldCurrent != currentIndex()) {
+            event->accept();
+            return;
+        }
+    }
+    d->moveReason = QDeclarativeGridViewPrivate::Other;
+    event->ignore();
+}
+
+/*!
+    \qmlmethod GridView::moveCurrentIndexUp()
+
+    Move the currentIndex up one item in the view.
+    The current index will wrap if keyNavigationWraps is true and it
+    is currently at the end.
+*/
+void QDeclarativeGridView::moveCurrentIndexUp()
+{
+    Q_D(QDeclarativeGridView);
+    if (d->flow == QDeclarativeGridView::LeftToRight) {
+        if (currentIndex() >= d->columns || d->wrap) {
+            int index = currentIndex() - d->columns;
+            setCurrentIndex(index >= 0 ? index : d->model->count()-1);
+        }
+    } else {
+        if (currentIndex() > 0 || d->wrap) {
+            int index = currentIndex() - 1;
+            setCurrentIndex(index >= 0 ? index : d->model->count()-1);
+        }
+    }
+}
+
+/*!
+    \qmlmethod GridView::moveCurrentIndexDown()
+
+    Move the currentIndex down one item in the view.
+    The current index will wrap if keyNavigationWraps is true and it
+    is currently at the end.
+*/
+void QDeclarativeGridView::moveCurrentIndexDown()
+{
+    Q_D(QDeclarativeGridView);
+    if (d->flow == QDeclarativeGridView::LeftToRight) {
+        if (currentIndex() < d->model->count() - d->columns || d->wrap) {
+            int index = currentIndex()+d->columns;
+            setCurrentIndex(index < d->model->count() ? index : 0);
+        }
+    } else {
+        if (currentIndex() < d->model->count() - 1 || d->wrap) {
+            int index = currentIndex() + 1;
+            setCurrentIndex(index < d->model->count() ? index : 0);
+        }
+    }
+}
+
+/*!
+    \qmlmethod GridView::moveCurrentIndexLeft()
+
+    Move the currentIndex left one item in the view.
+    The current index will wrap if keyNavigationWraps is true and it
+    is currently at the end.
+*/
+void QDeclarativeGridView::moveCurrentIndexLeft()
+{
+    Q_D(QDeclarativeGridView);
+    if (d->flow == QDeclarativeGridView::LeftToRight) {
+        if (currentIndex() > 0 || d->wrap) {
+            int index = currentIndex() - 1;
+            setCurrentIndex(index >= 0 ? index : d->model->count()-1);
+        }
+    } else {
+        if (currentIndex() >= d->columns || d->wrap) {
+            int index = currentIndex() - d->columns;
+            setCurrentIndex(index >= 0 ? index : d->model->count()-1);
+        }
+    }
+}
+
+/*!
+    \qmlmethod GridView::moveCurrentIndexRight()
+
+    Move the currentIndex right one item in the view.
+    The current index will wrap if keyNavigationWraps is true and it
+    is currently at the end.
+*/
+void QDeclarativeGridView::moveCurrentIndexRight()
+{
+    Q_D(QDeclarativeGridView);
+    if (d->flow == QDeclarativeGridView::LeftToRight) {
+        if (currentIndex() < d->model->count() - 1 || d->wrap) {
+            int index = currentIndex() + 1;
+            setCurrentIndex(index < d->model->count() ? index : 0);
+        }
+    } else {
+        if (currentIndex() < d->model->count() - d->columns || d->wrap) {
+            int index = currentIndex()+d->columns;
+            setCurrentIndex(index < d->model->count() ? index : 0);
+        }
+    }
+}
+
+void QDeclarativeGridView::positionViewAtIndex(int index)
+{
+    Q_D(QDeclarativeGridView);
+    if (!d->isValid() || index < 0 || index >= d->model->count())
+        return;
+
+    qreal maxExtent = d->flow == QDeclarativeGridView::LeftToRight ? -maxYExtent() : -maxXExtent();
+    FxGridItem *item = d->visibleItem(index);
+    if (item) {
+        // Already created - just move to top of view
+        int pos = qMin(item->rowPos(), maxExtent);
+        d->setPosition(pos);
+    } else {
+        int pos = d->rowPosAt(index);
+        // save the currently visible items in case any of them end up visible again
+        QList<FxGridItem*> oldVisible = d->visibleItems;
+        d->visibleItems.clear();
+        d->visibleIndex = index - index % d->columns;
+        d->setPosition(pos);
+        // setPosition() will cause refill.  Adjust if we have moved beyond range
+        if (d->position() > maxExtent)
+            d->setPosition(maxExtent);
+        // now release the reference to all the old visible items.
+        for (int i = 0; i < oldVisible.count(); ++i)
+            d->releaseItem(oldVisible.at(i));
+    }
+}
+
+
+void QDeclarativeGridView::componentComplete()
+{
+    Q_D(QDeclarativeGridView);
+    QDeclarativeFlickable::componentComplete();
+    d->updateGrid();
+    refill();
+    if (d->currentIndex < 0)
+        d->updateCurrent(0);
+    else
+        d->updateCurrent(d->currentIndex);
+}
+
+void QDeclarativeGridView::trackedPositionChanged()
+{
+    Q_D(QDeclarativeGridView);
+    if (!d->trackedItem || !d->currentItem)
+        return;
+    if (!isFlicking() && !d->moving && d->moveReason == QDeclarativeGridViewPrivate::SetIndex) {
+        const qreal viewPos = d->position();
+        if (d->trackedItem->rowPos() < viewPos && d->currentItem->rowPos() < viewPos) {
+            d->setPosition(d->currentItem->rowPos() < d->trackedItem->rowPos() ? d->trackedItem->rowPos() : d->currentItem->rowPos());
+        } else if (d->trackedItem->endRowPos() > viewPos + d->size()
+                && d->currentItem->endRowPos() > viewPos + d->size()) {
+            qreal pos;
+            if (d->trackedItem->endRowPos() < d->currentItem->endRowPos()) {
+                pos = d->trackedItem->endRowPos() - d->size();
+                if (d->rowSize() > d->size())
+                    pos = d->trackedItem->rowPos();
+            } else {
+                pos = d->currentItem->endRowPos() - d->size();
+                if (d->rowSize() > d->size())
+                    pos = d->currentItem->rowPos();
+            }
+            d->setPosition(pos);
+        }
+    }
+}
+
+void QDeclarativeGridView::itemsInserted(int modelIndex, int count)
+{
+    Q_D(QDeclarativeGridView);
+    if (!d->visibleItems.count() || d->model->count() <= 1) {
+        refill();
+        d->updateCurrent(qMax(0, qMin(d->currentIndex, d->model->count()-1)));
+        emit countChanged();
+        return;
+    }
+
+    int index = d->mapFromModel(modelIndex);
+    if (index == -1) {
+        int i = d->visibleItems.count() - 1;
+        while (i > 0 && d->visibleItems.at(i)->index == -1)
+            --i;
+        if (d->visibleItems.at(i)->index + 1 == modelIndex) {
+            // Special case of appending an item to the model.
+            index = d->visibleIndex + d->visibleItems.count();
+        } else {
+            if (modelIndex <= d->visibleIndex) {
+                // Insert before visible items
+                d->visibleIndex += count;
+                for (int i = 0; i < d->visibleItems.count(); ++i) {
+                    FxGridItem *listItem = d->visibleItems.at(i);
+                    if (listItem->index != -1 && listItem->index >= modelIndex)
+                        listItem->index += count;
+                }
+            }
+            if (d->currentIndex >= modelIndex) {
+                // adjust current item index
+                d->currentIndex += count;
+                if (d->currentItem)
+                    d->currentItem->index = d->currentIndex;
+            }
+            d->layout();
+            emit countChanged();
+            return;
+        }
+    }
+
+    // At least some of the added items will be visible
+    int insertCount = count;
+    if (index < d->visibleIndex) {
+        insertCount -= d->visibleIndex - index;
+        index = d->visibleIndex;
+        modelIndex = d->visibleIndex;
+    }
+
+    index -= d->visibleIndex;
+    int to = d->buffer+d->position()+d->size()-1;
+    int colPos, rowPos;
+    if (index < d->visibleItems.count()) {
+        colPos = d->visibleItems.at(index)->colPos();
+        rowPos = d->visibleItems.at(index)->rowPos();
+    } else {
+        // appending items to visible list
+        colPos = d->visibleItems.at(index-1)->colPos() + d->colSize();
+        rowPos = d->visibleItems.at(index-1)->rowPos();
+        if (colPos > d->colSize() * (d->columns-1)) {
+            colPos = 0;
+            rowPos += d->rowSize();
+        }
+    }
+
+    QList<FxGridItem*> added;
+    int i = 0;
+    while (i < insertCount && rowPos <= to + d->rowSize()*(d->columns - (colPos/d->colSize()))/qreal(d->columns)) {
+        FxGridItem *item = d->createItem(modelIndex + i);
+        d->visibleItems.insert(index, item);
+        item->setPosition(colPos, rowPos);
+        added.append(item);
+        colPos += d->colSize();
+        if (colPos > d->colSize() * (d->columns-1)) {
+            colPos = 0;
+            rowPos += d->rowSize();
+        }
+        ++index;
+        ++i;
+    }
+    if (i < insertCount) {
+        // We didn't insert all our new items, which means anything
+        // beyond the current index is not visible - remove it.
+        while (d->visibleItems.count() > index) {
+            d->releaseItem(d->visibleItems.takeLast());
+        }
+    }
+
+    if (d->currentIndex >= modelIndex) {
+        // adjust current item index
+        d->currentIndex += count;
+        if (d->currentItem) {
+            d->currentItem->index = d->currentIndex;
+            d->currentItem->setPosition(d->colPosAt(d->currentIndex), d->rowPosAt(d->currentIndex));
+        }
+    }
+    // Update the indexes of the following visible items.
+    for (; index < d->visibleItems.count(); ++index) {
+        FxGridItem *listItem = d->visibleItems.at(index);
+        if (listItem->index != -1)
+            listItem->index += count;
+    }
+
+    // everything is in order now - emit add() signal
+    for (int j = 0; j < added.count(); ++j)
+        added.at(j)->attached->emitAdd();
+    d->layout();
+    emit countChanged();
+}
+
+void QDeclarativeGridView::itemsRemoved(int modelIndex, int count)
+{
+    Q_D(QDeclarativeGridView);
+    bool currentRemoved = d->currentIndex >= modelIndex && d->currentIndex < modelIndex + count;
+    bool removedVisible = false;
+
+    // Remove the items from the visible list, skipping anything already marked for removal
+    QList<FxGridItem*>::Iterator it = d->visibleItems.begin();
+    while (it != d->visibleItems.end()) {
+        FxGridItem *item = *it;
+        if (item->index == -1 || item->index < modelIndex) {
+            // already removed, or before removed items
+            if (item->index < modelIndex)
+                removedVisible = true;
+            ++it;
+        } else if (item->index >= modelIndex + count) {
+            // after removed items
+            item->index -= count;
+            ++it;
+        } else {
+            // removed item
+            removedVisible = true;
+            item->attached->emitRemove();
+            if (item->attached->delayRemove()) {
+                item->index = -1;
+                connect(item->attached, SIGNAL(delayRemoveChanged()), this, SLOT(destroyRemoved()), Qt::QueuedConnection);
+                ++it;
+            } else {
+                it = d->visibleItems.erase(it);
+                d->releaseItem(item);
+            }
+        }
+    }
+
+    // fix current
+    if (d->currentIndex >= modelIndex + count) {
+        d->currentIndex -= count;
+        if (d->currentItem)
+            d->currentItem->index -= count;
+    } else if (currentRemoved) {
+        // current item has been removed.
+        d->releaseItem(d->currentItem);
+        d->currentItem = 0;
+        d->currentIndex = -1;
+        d->updateCurrent(qMin(modelIndex, d->model->count()-1));
+    }
+
+    // update visibleIndex
+    for (it = d->visibleItems.begin(); it != d->visibleItems.end(); ++it) {
+        if ((*it)->index != -1) {
+            d->visibleIndex = (*it)->index;
+            break;
+        }
+    }
+
+    if (removedVisible) {
+        if (d->visibleItems.isEmpty()) {
+            d->visibleIndex = 0;
+            d->setPosition(0);
+            refill();
+        } else {
+            // Correct the positioning of the items
+            d->scheduleLayout();
+        }
+    }
+
+    emit countChanged();
+}
+
+void QDeclarativeGridView::layout()
+{
+    Q_D(QDeclarativeGridView);
+    if (d->layoutScheduled)
+        d->layout();
+}
+
+void QDeclarativeGridView::destroyRemoved()
+{
+    Q_D(QDeclarativeGridView);
+    for (QList<FxGridItem*>::Iterator it = d->visibleItems.begin();
+            it != d->visibleItems.end();) {
+        FxGridItem *listItem = *it;
+        if (listItem->index == -1 && listItem->attached->delayRemove() == false) {
+            d->releaseItem(listItem);
+            it = d->visibleItems.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
+    // Correct the positioning of the items
+    d->layout();
+}
+
+void QDeclarativeGridView::itemsMoved(int from, int to, int count)
+{
+    Q_D(QDeclarativeGridView);
+    QHash<int,FxGridItem*> moved;
+
+    bool removedBeforeVisible = false;
+    FxGridItem *firstItem = d->firstVisibleItem();
+
+    if (from < to && from < d->visibleIndex && to > d->visibleIndex)
+        removedBeforeVisible = true;
+
+    QList<FxGridItem*>::Iterator it = d->visibleItems.begin();
+    while (it != d->visibleItems.end()) {
+        FxGridItem *item = *it;
+        if (item->index >= from && item->index < from + count) {
+            // take the items that are moving
+            item->index += (to-from);
+            moved.insert(item->index, item);
+            it = d->visibleItems.erase(it);
+            if (item->rowPos() < firstItem->rowPos())
+                removedBeforeVisible = true;
+        } else {
+            if (item->index > from && item->index != -1) {
+                // move everything after the moved items.
+                item->index -= count;
+                if (item->index < d->visibleIndex)
+                    d->visibleIndex = item->index;
+            } else if (item->index != -1) {
+                removedBeforeVisible = true;
+            }
+            ++it;
+        }
+    }
+
+    int remaining = count;
+    int endIndex = d->visibleIndex;
+    it = d->visibleItems.begin();
+    while (it != d->visibleItems.end()) {
+        FxGridItem *item = *it;
+        if (remaining && item->index >= to && item->index < to + count) {
+            // place items in the target position, reusing any existing items
+            FxGridItem *movedItem = moved.take(item->index);
+            if (!movedItem)
+                movedItem = d->createItem(item->index);
+            it = d->visibleItems.insert(it, movedItem);
+            ++it;
+            --remaining;
+        } else {
+            if (item->index != -1) {
+                if (item->index >= to) {
+                    // update everything after the moved items.
+                    item->index += count;
+                }
+                endIndex = item->index;
+            }
+            ++it;
+        }
+    }
+
+    // If we have moved items to the end of the visible items
+    // then add any existing moved items that we have
+    while (FxGridItem *item = moved.take(endIndex+1)) {
+        d->visibleItems.append(item);
+        ++endIndex;
+    }
+
+    // update visibleIndex
+    for (it = d->visibleItems.begin(); it != d->visibleItems.end(); ++it) {
+        if ((*it)->index != -1) {
+            d->visibleIndex = (*it)->index;
+            break;
+        }
+    }
+
+    // Fix current index
+    if (d->currentIndex >= 0 && d->currentItem) {
+        int oldCurrent = d->currentIndex;
+        d->currentIndex = d->model->indexOf(d->currentItem->item, this);
+        if (oldCurrent != d->currentIndex) {
+            d->currentItem->index = d->currentIndex;
+            emit currentIndexChanged();
+        }
+    }
+
+    // Whatever moved items remain are no longer visible items.
+    while (moved.count()) {
+        int idx = moved.begin().key();
+        FxGridItem *item = moved.take(idx);
+        if (item->item == d->currentItem->item)
+            item->setPosition(d->colPosAt(idx), d->rowPosAt(idx));
+        d->releaseItem(item);
+    }
+
+    d->layout(removedBeforeVisible);
+}
+
+void QDeclarativeGridView::createdItem(int index, QDeclarativeItem *item)
+{
+    Q_D(QDeclarativeGridView);
+    item->setParentItem(this);
+    if (d->requestedIndex != index) {
+        item->setParentItem(this);
+        d->unrequestedItems.insert(item, index);
+        if (d->flow == QDeclarativeGridView::LeftToRight) {
+            item->setPos(QPointF(d->colPosAt(index), d->rowPosAt(index)));
+        } else {
+            item->setPos(QPointF(d->rowPosAt(index), d->colPosAt(index)));
+        }
+    }
+}
+
+void QDeclarativeGridView::destroyingItem(QDeclarativeItem *item)
+{
+    Q_D(QDeclarativeGridView);
+    d->unrequestedItems.remove(item);
+}
+
+
+void QDeclarativeGridView::refill()
+{
+    Q_D(QDeclarativeGridView);
+    d->refill(d->position(), d->position()+d->size()-1);
+}
+
+
+QDeclarativeGridViewAttached *QDeclarativeGridView::qmlAttachedProperties(QObject *obj)
+{
+    return QDeclarativeGridViewAttached::properties(obj);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
new file mode 100644
index 0000000..b36c4aa
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -0,0 +1,222 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEGRIDVIEW_H
+#define QDECLARATIVEGRIDVIEW_H
+
+#include "qdeclarativeflickable_p.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+class QDeclarativeVisualModel;
+class QDeclarativeGridViewAttached;
+class QDeclarativeGridViewPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeGridView : public QDeclarativeFlickable
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeGridView)
+
+    Q_PROPERTY(QVariant model READ model WRITE setModel)
+    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate)
+    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
+    Q_PROPERTY(QDeclarativeItem *currentItem READ currentItem NOTIFY currentIndexChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+
+    Q_PROPERTY(QDeclarativeComponent *highlight READ highlight WRITE setHighlight)
+    Q_PROPERTY(QDeclarativeItem *highlightItem READ highlightItem NOTIFY highlightChanged)
+    Q_PROPERTY(bool highlightFollowsCurrentItem READ highlightFollowsCurrentItem WRITE setHighlightFollowsCurrentItem)
+
+    Q_PROPERTY(Flow flow READ flow WRITE setFlow)
+    Q_PROPERTY(bool keyNavigationWraps READ isWrapEnabled WRITE setWrapEnabled)
+    Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer)
+    Q_PROPERTY(int cellWidth READ cellWidth WRITE setCellWidth NOTIFY cellWidthChanged)
+    Q_PROPERTY(int cellHeight READ cellHeight WRITE setCellHeight NOTIFY cellHeightChanged)
+    Q_CLASSINFO("DefaultProperty", "data")
+
+public:
+    QDeclarativeGridView(QDeclarativeItem *parent=0);
+    ~QDeclarativeGridView();
+
+    QVariant model() const;
+    void setModel(const QVariant &);
+
+    QDeclarativeComponent *delegate() const;
+    void setDelegate(QDeclarativeComponent *);
+
+    int currentIndex() const;
+    void setCurrentIndex(int idx);
+
+    QDeclarativeItem *currentItem();
+    QDeclarativeItem *highlightItem();
+    int count() const;
+
+    QDeclarativeComponent *highlight() const;
+    void setHighlight(QDeclarativeComponent *highlight);
+
+    bool highlightFollowsCurrentItem() const;
+    void setHighlightFollowsCurrentItem(bool);
+
+    Q_ENUMS(Flow)
+    enum Flow { LeftToRight, TopToBottom };
+    Flow flow() const;
+    void setFlow(Flow);
+
+    bool isWrapEnabled() const;
+    void setWrapEnabled(bool);
+
+    int cacheBuffer() const;
+    void setCacheBuffer(int);
+
+    int cellWidth() const;
+    void setCellWidth(int);
+
+    int cellHeight() const;
+    void setCellHeight(int);
+
+    static QDeclarativeGridViewAttached *qmlAttachedProperties(QObject *);
+
+public Q_SLOTS:
+    void moveCurrentIndexUp();
+    void moveCurrentIndexDown();
+    void moveCurrentIndexLeft();
+    void moveCurrentIndexRight();
+    void positionViewAtIndex(int index);
+
+Q_SIGNALS:
+    void countChanged();
+    void currentIndexChanged();
+    void cellWidthChanged();
+    void cellHeightChanged();
+    void highlightChanged();
+
+protected:
+    virtual void viewportMoved();
+    virtual qreal minYExtent() const;
+    virtual qreal maxYExtent() const;
+    virtual qreal minXExtent() const;
+    virtual qreal maxXExtent() const;
+    virtual void keyPressEvent(QKeyEvent *);
+    virtual void componentComplete();
+
+private Q_SLOTS:
+    void trackedPositionChanged();
+    void itemsInserted(int index, int count);
+    void itemsRemoved(int index, int count);
+    void itemsMoved(int from, int to, int count);
+    void destroyRemoved();
+    void createdItem(int index, QDeclarativeItem *item);
+    void destroyingItem(QDeclarativeItem *item);
+    void sizeChange();
+    void layout();
+
+private:
+    void refill();
+};
+
+class QDeclarativeGridViewAttached : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeGridViewAttached(QObject *parent)
+        : QObject(parent), m_isCurrent(false), m_delayRemove(false) {}
+    ~QDeclarativeGridViewAttached() {
+        attachedProperties.remove(parent());
+    }
+
+    Q_PROPERTY(QDeclarativeGridView *view READ view CONSTANT)
+    QDeclarativeGridView *view() { return m_view; }
+
+    Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged)
+    bool isCurrentItem() const { return m_isCurrent; }
+    void setIsCurrentItem(bool c) {
+        if (m_isCurrent != c) {
+            m_isCurrent = c;
+            emit currentItemChanged();
+        }
+    }
+
+    Q_PROPERTY(bool delayRemove READ delayRemove WRITE setDelayRemove NOTIFY delayRemoveChanged)
+    bool delayRemove() const { return m_delayRemove; }
+    void setDelayRemove(bool delay) {
+        if (m_delayRemove != delay) {
+            m_delayRemove = delay;
+            emit delayRemoveChanged();
+        }
+    }
+
+    static QDeclarativeGridViewAttached *properties(QObject *obj) {
+        QDeclarativeGridViewAttached *rv = attachedProperties.value(obj);
+        if (!rv) {
+            rv = new QDeclarativeGridViewAttached(obj);
+            attachedProperties.insert(obj, rv);
+        }
+        return rv;
+    }
+
+    void emitAdd() { emit add(); }
+    void emitRemove() { emit remove(); }
+
+Q_SIGNALS:
+    void currentItemChanged();
+    void delayRemoveChanged();
+    void add();
+    void remove();
+
+public:
+    QDeclarativeGridView *m_view;
+    bool m_isCurrent;
+    bool m_delayRemove;
+
+    static QHash<QObject*, QDeclarativeGridViewAttached*> attachedProperties;
+};
+
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeGridView)
+QML_DECLARE_TYPEINFO(QDeclarativeGridView, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
new file mode 100644
index 0000000..33b38e0
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -0,0 +1,368 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeimage_p.h"
+#include "qdeclarativeimage_p_p.h"
+
+#include <QKeyEvent>
+#include <QPainter>
+
+QT_BEGIN_NAMESPACE
+
+
+/*!
+    \qmlclass Image QDeclarativeImage
+    \since 4.7
+    \brief The Image element allows you to add bitmaps to a scene.
+    \inherits Item
+
+    The Image element supports untransformed, stretched and tiled.
+
+    For an explanation of stretching and tiling, see the fillMode property description.
+
+    Examples:
+    \table
+    \row
+    \o \image declarative-qtlogo1.png
+    \o Untransformed
+    \qml
+    Image { source: "pics/qtlogo.png" }
+    \endqml
+    \row
+    \o \image declarative-qtlogo2.png
+    \o fillMode: Stretch (default)
+    \qml
+    Image {
+        width: 160
+        height: 160
+        source: "pics/qtlogo.png"
+    }
+    \endqml
+    \row
+    \o \image declarative-qtlogo3.png
+    \o fillMode: Tile
+    \qml
+    Image {
+        fillMode: Image.Tile
+        width: 160; height: 160
+        source: "pics/qtlogo.png"
+    }
+    \endqml
+    \row
+    \o \image declarative-qtlogo6.png
+    \o fillMode: TileVertically
+    \qml
+    Image {
+        fillMode: Image.TileVertically
+        width: 160; height: 160
+        source: "pics/qtlogo.png"
+    }
+    \endqml
+    \row
+    \o \image declarative-qtlogo5.png
+    \o fillMode: TileHorizontally
+    \qml
+    Image {
+        fillMode: Image.TileHorizontally
+        width: 160; height: 160
+        source: "pics/qtlogo.png"
+    }
+    \endqml
+    \endtable
+ */
+
+/*!
+    \internal
+    \class QDeclarativeImage Image
+    \brief The QDeclarativeImage class provides an image item that you can add to a QDeclarativeView.
+
+    \ingroup group_coreitems
+
+    Example:
+    \qml
+    Image { source: "pics/star.png" }
+    \endqml
+
+    A QDeclarativeImage object can be instantiated in Qml using the tag \l Image.
+*/
+
+QDeclarativeImage::QDeclarativeImage(QDeclarativeItem *parent)
+    : QDeclarativeImageBase(*(new QDeclarativeImagePrivate), parent)
+{
+    connect(this, SIGNAL(sourceChanged(QUrl)), this, SLOT(updatePaintedGeometry()));
+}
+
+QDeclarativeImage::QDeclarativeImage(QDeclarativeImagePrivate &dd, QDeclarativeItem *parent)
+    : QDeclarativeImageBase(dd, parent)
+{
+}
+
+QDeclarativeImage::~QDeclarativeImage()
+{
+}
+
+void QDeclarativeImage::setSource(const QUrl &url)
+{
+    QDeclarativeImageBase::setSource(url);
+    updatePaintedGeometry();
+}
+
+/*!
+    \qmlproperty QPixmap Image::pixmap
+
+    This property holds the QPixmap image to display.
+
+    This is useful for displaying images provided by a C++ implementation,
+    for example, a model may provide a data role of type QPixmap.
+*/
+
+QPixmap QDeclarativeImage::pixmap() const
+{
+    Q_D(const QDeclarativeImage);
+    return d->pix;
+}
+
+void QDeclarativeImage::setPixmap(const QPixmap &pix)
+{
+    Q_D(QDeclarativeImage);
+    if (!d->url.isEmpty())
+        return;
+    d->setPixmap(pix);
+}
+
+void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap)
+{
+    Q_Q(QDeclarativeImage);
+    pix = pixmap;
+
+    q->setImplicitWidth(pix.width());
+    q->setImplicitHeight(pix.height());
+    status = pix.isNull() ? QDeclarativeImageBase::Null : QDeclarativeImageBase::Ready;
+
+    q->update();
+    emit q->pixmapChanged();
+}
+
+/*!
+    \qmlproperty enumeration Image::fillMode
+
+    Set this property to define what happens when the image set for the item is smaller
+    than the size of the item.
+
+    \list
+    \o Stretch - the image is scaled to fit
+    \o PreserveAspectFit - the image is scaled uniformly to fit without cropping
+    \o PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary
+    \o Tile - the image is duplicated horizontally and vertically
+    \o TileVertically - the image is stretched horizontally and tiled vertically
+    \o TileHorizontally - the image is stretched vertically and tiled horizontally
+    \endlist
+
+    \image declarative-image_fillMode.gif
+*/
+QDeclarativeImage::FillMode QDeclarativeImage::fillMode() const
+{
+    Q_D(const QDeclarativeImage);
+    return d->fillMode;
+}
+
+void QDeclarativeImage::setFillMode(FillMode mode)
+{
+    Q_D(QDeclarativeImage);
+    if (d->fillMode == mode)
+        return;
+    d->fillMode = mode;
+    update();
+    updatePaintedGeometry();
+    emit fillModeChanged();
+}
+
+qreal QDeclarativeImage::paintedWidth() const
+{
+    Q_D(const QDeclarativeImage);
+    return d->paintedWidth;
+}
+
+qreal QDeclarativeImage::paintedHeight() const
+{
+    Q_D(const QDeclarativeImage);
+    return d->paintedHeight;
+}
+
+/*!
+    \qmlproperty enum Image::status
+
+    This property holds the status of image loading.  It can be one of:
+    \list
+    \o Null - no image has been set
+    \o Ready - the image has been loaded
+    \o Loading - the image is currently being loaded
+    \o Error - an error occurred while loading the image
+    \endlist
+
+    \sa progress
+*/
+
+/*!
+    \qmlproperty real Image::progress
+
+    This property holds the progress of image loading, from 0.0 (nothing loaded)
+    to 1.0 (finished).
+
+    \sa status
+*/
+
+/*!
+    \qmlproperty bool Image::smooth
+
+    Set this property if you want the image to be smoothly filtered when scaled or
+    transformed.  Smooth filtering gives better visual quality, but is slower.  If
+    the image is displayed at its natural size, this property has no visual or
+    performance effect.
+
+    \note Generally scaling artifacts are only visible if the image is stationary on
+    the screen.  A common pattern when animating an image is to disable smooth
+    filtering at the beginning of the animation and reenable it at the conclusion.
+*/
+
+void QDeclarativeImage::updatePaintedGeometry()
+{
+    Q_D(QDeclarativeImage);
+
+    if (d->fillMode == PreserveAspectFit) {
+        qreal widthScale = width() / qreal(d->pix.width());
+        qreal heightScale = height() / qreal(d->pix.height());
+        if (!d->pix.width() || !d->pix.height())
+            return;
+        if (widthScale <= heightScale) {
+            d->paintedWidth = width();
+            d->paintedHeight = widthScale * qreal(d->pix.height());
+        } else if(heightScale < widthScale) {
+            d->paintedWidth = heightScale * qreal(d->pix.width());
+            d->paintedHeight = height();
+        }
+    } else {
+        d->paintedWidth = width();
+        d->paintedHeight = height();
+    }
+    emit paintedGeometryChanged();
+}
+
+void QDeclarativeImage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    QDeclarativeImageBase::geometryChanged(newGeometry, oldGeometry);
+    updatePaintedGeometry();
+}
+
+/*!
+    \qmlproperty url Image::source
+
+    Image can handle any image format supported by Qt, loaded from any URL scheme supported by Qt.
+
+    The URL may be absolute, or relative to the URL of the component.
+*/
+
+void QDeclarativeImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    Q_D(QDeclarativeImage);
+    if (d->pix.isNull())
+        return;
+
+    bool oldAA = p->testRenderHint(QPainter::Antialiasing);
+    bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
+    if (d->smooth)
+        p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+
+    if (width() != d->pix.width() || height() != d->pix.height()) {
+        if (d->fillMode >= Tile) {
+            if (d->fillMode == Tile)
+                p->drawTiledPixmap(QRectF(0,0,width(),height()), d->pix);
+            else if (d->fillMode == TileVertically)
+                p->drawTiledPixmap(QRectF(0,0,d->pix.width(),height()), d->pix);
+            else
+                p->drawTiledPixmap(QRectF(0,0,width(),d->pix.height()), d->pix);
+        } else {
+            qreal widthScale = width() / qreal(d->pix.width());
+            qreal heightScale = height() / qreal(d->pix.height());
+
+            QTransform scale;
+
+            if (d->fillMode == PreserveAspectFit) {
+                if (widthScale <= heightScale) {
+                    heightScale = widthScale;
+                    scale.translate(0, (height() - heightScale * d->pix.height()) / 2);
+                } else if(heightScale < widthScale) {
+                    widthScale = heightScale;
+                    scale.translate((width() - widthScale * d->pix.width()) / 2, 0);
+                }
+            } else if (d->fillMode == PreserveAspectCrop) {
+                if (widthScale < heightScale) {
+                    widthScale = heightScale;
+                    scale.translate((width() - widthScale * d->pix.width()) / 2, 0);
+                } else if(heightScale < widthScale) {
+                    heightScale = widthScale;
+                    scale.translate(0, (height() - heightScale * d->pix.height()) / 2);
+                }
+            }
+            if (clip()) {
+                p->save();
+                p->setClipRect(boundingRect(), Qt::IntersectClip);
+            }
+            scale.scale(widthScale, heightScale);
+            QTransform old = p->transform();
+            p->setWorldTransform(scale * old);
+            p->drawPixmap(0, 0, d->pix);
+            p->setWorldTransform(old);
+            if (clip()) {
+                p->restore();
+            }
+        }
+    } else {
+        p->drawPixmap(0, 0, d->pix);
+    }
+
+    if (d->smooth) {
+        p->setRenderHint(QPainter::Antialiasing, oldAA);
+        p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p.h
new file mode 100644
index 0000000..5b365e7
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeimage_p.h
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEIMAGE_H
+#define QDECLARATIVEIMAGE_H
+
+#include "qdeclarativeimagebase_p.h"
+
+#include <QtNetwork/qnetworkreply.h>
+
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeImagePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeImage : public QDeclarativeImageBase
+{
+    Q_OBJECT
+    Q_ENUMS(FillMode)
+
+    Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap NOTIFY pixmapChanged DESIGNABLE false)
+    Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
+    Q_PROPERTY(qreal paintedWidth READ paintedWidth NOTIFY paintedGeometryChanged)
+    Q_PROPERTY(qreal paintedHeight READ paintedHeight NOTIFY paintedGeometryChanged)
+
+public:
+    QDeclarativeImage(QDeclarativeItem *parent=0);
+    ~QDeclarativeImage();
+
+    enum FillMode { Stretch, PreserveAspectFit, PreserveAspectCrop, Tile, TileVertically, TileHorizontally };
+    FillMode fillMode() const;
+    void setFillMode(FillMode);
+
+    QPixmap pixmap() const;
+    void setPixmap(const QPixmap &);
+
+    qreal paintedWidth() const;
+    qreal paintedHeight() const;
+
+    void setSource(const QUrl &url);
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+
+Q_SIGNALS:
+    void fillModeChanged();
+    void paintedGeometryChanged();
+
+protected:
+    QDeclarativeImage(QDeclarativeImagePrivate &dd, QDeclarativeItem *parent);
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+
+protected Q_SLOTS:
+    void updatePaintedGeometry();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeImage)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeImage)
+};
+
+QT_END_NAMESPACE
+QML_DECLARE_TYPE(QDeclarativeImage)
+QT_END_HEADER
+
+#endif // QDECLARATIVEIMAGE_H
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h
new file mode 100644
index 0000000..8102237
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEIMAGE_P_H
+#define QDECLARATIVEIMAGE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeitem_p.h"
+#include "qdeclarativeimagebase_p_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeImagePrivate : public QDeclarativeImageBasePrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeImage)
+
+public:
+    QDeclarativeImagePrivate()
+      : fillMode(QDeclarativeImage::Stretch), paintedWidth(0), paintedHeight(0)
+    {
+    }
+
+    QDeclarativeImage::FillMode fillMode;
+    qreal paintedWidth;
+    qreal paintedHeight;
+    void setPixmap(const QPixmap &pix);
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEIMAGE_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
new file mode 100644
index 0000000..18053d3
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
@@ -0,0 +1,191 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeimagebase_p.h"
+#include "qdeclarativeimagebase_p_p.h"
+
+#include <qdeclarativeengine.h>
+#include <qdeclarativepixmapcache_p.h>
+
+#include <QFile>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeImageBase::QDeclarativeImageBase(QDeclarativeImageBasePrivate &dd, QDeclarativeItem *parent)
+  : QDeclarativeItem(dd, parent)
+{
+    setFlag(QGraphicsItem::ItemHasNoContents, false);
+}
+
+QDeclarativeImageBase::~QDeclarativeImageBase()
+{
+    Q_D(QDeclarativeImageBase);
+    if (d->pendingPixmapCache)
+        QDeclarativePixmapCache::cancel(d->url, this);
+}
+
+QDeclarativeImageBase::Status QDeclarativeImageBase::status() const
+{
+    Q_D(const QDeclarativeImageBase);
+    return d->status;
+}
+
+
+qreal QDeclarativeImageBase::progress() const
+{
+    Q_D(const QDeclarativeImageBase);
+    return d->progress;
+}
+
+QUrl QDeclarativeImageBase::source() const
+{
+    Q_D(const QDeclarativeImageBase);
+    return d->url;
+}
+
+void QDeclarativeImageBase::setSource(const QUrl &url)
+{
+    Q_D(QDeclarativeImageBase);
+    //equality is fairly expensive, so we bypass for simple, common case
+    if ((d->url.isEmpty() == url.isEmpty()) && url == d->url)
+        return;
+
+    if (d->pendingPixmapCache) {
+        QDeclarativePixmapCache::cancel(d->url, this);
+        d->pendingPixmapCache = false;
+    }
+
+    d->url = url;
+    if (d->progress != 0.0) {
+        d->progress = 0.0;
+        emit progressChanged(d->progress);
+    }
+
+    if (url.isEmpty()) {
+        d->pix = QPixmap();
+        d->status = Null;
+        setImplicitWidth(0);
+        setImplicitHeight(0);
+        emit statusChanged(d->status);
+        emit sourceChanged(d->url);
+        emit pixmapChanged();
+        update();
+    } else {
+        d->status = Loading;
+        QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->url, &d->pix);
+        if (status != QDeclarativePixmapReply::Ready && status != QDeclarativePixmapReply::Error) {
+            QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(qmlEngine(this), d->url);
+            d->pendingPixmapCache = true;
+
+            static int replyDownloadProgress = -1;
+            static int replyFinished = -1;
+            static int thisRequestProgress = -1;
+            static int thisRequestFinished = -1;
+            if (replyDownloadProgress == -1) {
+                replyDownloadProgress = 
+                    QDeclarativePixmapReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)");
+                replyFinished = 
+                    QDeclarativePixmapReply::staticMetaObject.indexOfSignal("finished()");
+                thisRequestProgress = 
+                    QDeclarativeImageBase::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)");
+                thisRequestFinished =
+                    QDeclarativeImageBase::staticMetaObject.indexOfSlot("requestFinished()");
+            }
+
+            QMetaObject::connect(reply, replyFinished, this, 
+                                 thisRequestFinished, Qt::DirectConnection);
+            QMetaObject::connect(reply, replyDownloadProgress, this, 
+                                 thisRequestProgress, Qt::DirectConnection);
+        } else {
+            //### should be unified with requestFinished
+            if (status == QDeclarativePixmapReply::Ready) {
+                setImplicitWidth(d->pix.width());
+                setImplicitHeight(d->pix.height());
+
+                if (d->status == Loading)
+                    d->status = Ready;
+            } else {
+                d->status = Error;
+            }
+            d->progress = 1.0;
+            emit statusChanged(d->status);
+            emit sourceChanged(d->url);
+            emit progressChanged(d->progress);
+            emit pixmapChanged();
+            update();
+        }
+    }
+
+    emit statusChanged(d->status);
+}
+
+void QDeclarativeImageBase::requestFinished()
+{
+    Q_D(QDeclarativeImageBase);
+
+    d->pendingPixmapCache = false;
+
+    if (QDeclarativePixmapCache::get(d->url, &d->pix) != QDeclarativePixmapReply::Ready)
+        d->status = Error;
+    setImplicitWidth(d->pix.width());
+    setImplicitHeight(d->pix.height());
+
+    if (d->status == Loading)
+        d->status = Ready;
+    d->progress = 1.0;
+    emit statusChanged(d->status);
+    emit sourceChanged(d->url);
+    emit progressChanged(1.0);
+    emit pixmapChanged();
+    update();
+}
+
+void QDeclarativeImageBase::requestProgress(qint64 received, qint64 total)
+{
+    Q_D(QDeclarativeImageBase);
+    if (d->status == Loading && total > 0) {
+        d->progress = qreal(received)/total;
+        emit progressChanged(d->progress);
+    }
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
new file mode 100644
index 0000000..47be139
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEIMAGEBASE_H
+#define QDECLARATIVEIMAGEBASE_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeImageBasePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeImageBase : public QDeclarativeItem
+{
+    Q_OBJECT
+    Q_ENUMS(Status)
+
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+
+public:
+    ~QDeclarativeImageBase();
+    enum Status { Null, Ready, Loading, Error };
+    Status status() const;
+    qreal progress() const;
+
+    QUrl source() const;
+    virtual void setSource(const QUrl &url);
+
+Q_SIGNALS:
+    void sourceChanged(const QUrl &);
+    void statusChanged(Status);
+    void progressChanged(qreal progress);
+    void pixmapChanged();
+
+protected:
+    QDeclarativeImageBase(QDeclarativeImageBasePrivate &dd, QDeclarativeItem *parent);
+
+private Q_SLOTS:
+    virtual void requestFinished();
+    void requestProgress(qint64,qint64);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeImageBase)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeImageBase)
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEIMAGEBASE_H
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
new file mode 100644
index 0000000..d540e40
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEIMAGEBASE_P_H
+#define QDECLARATIVEIMAGEBASE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeitem_p.h"
+
+#include <QtCore/QPointer>
+
+QT_BEGIN_NAMESPACE
+
+class QNetworkReply;
+class QDeclarativeImageBasePrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeImageBase)
+
+public:
+    QDeclarativeImageBasePrivate()
+      : status(QDeclarativeImageBase::Null),
+        progress(0.0),
+        pendingPixmapCache(false)
+    {
+    }
+
+    QPixmap pix;
+    QDeclarativeImageBase::Status status;
+    QUrl url;
+    qreal progress;
+    bool pendingPixmapCache;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
new file mode 100644
index 0000000..5dd44fa
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -0,0 +1,2838 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeitem_p.h"
+#include "qdeclarativeitem.h"
+
+#include "qdeclarativeevents_p_p.h"
+
+#include <qfxperf_p_p.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativeopenmetaobject_p.h>
+#include <qdeclarativestate_p.h>
+#include <qdeclarativeview.h>
+#include <qdeclarativestategroup_p.h>
+#include <qdeclarativecomponent.h>
+
+#include <QDebug>
+#include <QPen>
+#include <QFile>
+#include <QEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QtCore/qnumeric.h>
+#include <QtScript/qscriptengine.h>
+#include <QtGui/qgraphicstransform.h>
+#include <QtGui/qgraphicseffect.h>
+#include <qlistmodelinterface_p.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef FLT_MAX
+#define FLT_MAX 1E+37
+#endif
+
+#include "qdeclarativeeffects.cpp"
+
+/*!
+    \qmlclass Transform QGraphicsTransform
+    \since 4.7
+    \brief The Transform elements provide a way of building advanced transformations on Items.
+
+    The Transform elements let you create and control advanced transformations that can be configured
+    independently using specialized properties.
+
+    You can assign any number of Transform elements to an Item. Each Transform is applied in order,
+    one at a time, to the Item it's assigned to.
+
+    \sa Rotation, Scale
+*/
+
+/*!
+    \qmlclass Scale QGraphicsScale
+    \since 4.7
+    \brief The Scale object provides a way to scale an Item.
+
+    The Scale object gives more control over scaling than using Item's scale property. Specifically,
+    it allows a different scale for the x and y axes, and allows the scale to be relative to an
+    arbitrary point.
+
+    The following example scales the X axis of the Rectangle, relative to its interior point 25, 25:
+    \qml
+    Rectangle {
+        width: 100; height: 100
+        color: "blue"
+        transform: Scale { origin.x: 25; origin.y: 25; xScale: 3}
+    }
+    \endqml
+*/
+
+/*!
+    \qmlproperty real Scale::origin.x
+    \qmlproperty real Scale::origin.y
+
+    The point that the item is scaled from (i.e., the point that stays fixed relative to the parent as
+    the rest of the item grows). By default the origin is 0, 0.
+*/
+
+/*!
+    \qmlproperty real Scale::xScale
+
+    The scaling factor for the X axis.
+*/
+
+/*!
+    \qmlproperty real Scale::yScale
+
+    The scaling factor for the Y axis.
+*/
+
+/*!
+    \qmlclass Rotation QGraphicsRotation
+    \since 4.7
+    \brief The Rotation object provides a way to rotate an Item.
+
+    The Rotation object gives more control over rotation than using Item's rotation property.
+    Specifically, it allows (z axis) rotation to be relative to an arbitrary point.
+
+    The following example rotates a Rectangle around its interior point 25, 25:
+    \qml
+    Rectangle {
+        width: 100; height: 100
+        color: "blue"
+        transform: Rotation { origin.x: 25; origin.y: 25; angle: 45}
+    }
+    \endqml
+
+    Rotation also provides a way to specify 3D-like rotations for Items. For these types of
+    rotations you must specify the axis to rotate around in addition to the origin point.
+
+    The following example shows various 3D-like rotations applied to an \l Image.
+    \snippet doc/src/snippets/declarative/rotation.qml 0
+
+    \image axisrotation.png
+*/
+
+/*!
+    \qmlproperty real Rotation::origin.x
+    \qmlproperty real Rotation::origin.y
+
+    The origin point of the rotation (i.e., the point that stays fixed relative to the parent as
+    the rest of the item rotates). By default the origin is 0, 0.
+*/
+
+/*!
+    \qmlproperty real Rotation::axis.x
+    \qmlproperty real Rotation::axis.y
+    \qmlproperty real Rotation::axis.z
+
+    The axis to rotate around. For simple (2D) rotation around a point, you do not need to specify an axis,
+    as the default axis is the z axis (\c{ axis { x: 0; y: 0; z: 1 } }).
+
+    For a typical 3D-like rotation you will usually specify both the origin and the axis.
+
+    \image 3d-rotation-axis.png
+*/
+
+/*!
+    \qmlproperty real Rotation::angle
+
+    The angle to rotate, in degrees clockwise.
+*/
+
+
+/*!
+    \group group_animation
+    \title Animation
+*/
+
+/*!
+    \group group_coreitems
+    \title Basic Items
+*/
+
+/*!
+    \group group_effects
+    \title Effects
+*/
+
+/*!
+    \group group_layouts
+    \title Layouts
+*/
+
+/*!
+    \group group_states
+    \title States and Transitions
+*/
+
+/*!
+    \group group_utility
+    \title Utility
+*/
+
+/*!
+    \group group_views
+    \title Views
+*/
+
+/*!
+    \group group_widgets
+    \title Widgets
+*/
+
+/*!
+    \internal
+    \class QDeclarativeContents
+    \ingroup group_utility
+    \brief The QDeclarativeContents class gives access to the height and width of an item's contents.
+
+*/
+
+QDeclarativeContents::QDeclarativeContents() : m_x(0), m_y(0), m_width(0), m_height(0)
+{
+}
+
+/*!
+    \qmlproperty real Item::childrenRect.x
+    \qmlproperty real Item::childrenRect.y
+    \qmlproperty real Item::childrenRect.width
+    \qmlproperty real Item::childrenRect.height
+
+    The childrenRect properties allow an item access to the geometry of its
+    children. This property is useful if you have an item that needs to be
+    sized to fit its children.
+*/
+
+QRectF QDeclarativeContents::rectF() const
+{
+    return QRectF(m_x, m_y, m_width, m_height);
+}
+
+//TODO: optimization: only check sender(), if there is one
+void QDeclarativeContents::calcHeight()
+{
+    qreal oldy = m_y;
+    qreal oldheight = m_height;
+
+    qreal top = FLT_MAX;
+    qreal bottom = 0;
+
+    QList<QGraphicsItem *> children = m_item->childItems();
+    for (int i = 0; i < children.count(); ++i) {
+        QDeclarativeItem *child = qobject_cast<QDeclarativeItem *>(children.at(i));
+        if(!child)//### Should this be ignoring non-QDeclarativeItem graphicsobjects?
+            continue;
+        qreal y = child->y();
+        if (y + child->height() > bottom)
+            bottom = y + child->height();
+        if (y < top)
+            top = y;
+    }
+    if (!children.isEmpty())
+        m_y = top;
+    m_height = qMax(bottom - top, qreal(0.0));
+
+    if (m_height != oldheight || m_y != oldy)
+        emit rectChanged();
+}
+
+//TODO: optimization: only check sender(), if there is one
+void QDeclarativeContents::calcWidth()
+{
+    qreal oldx = m_x;
+    qreal oldwidth = m_width;
+
+    qreal left = FLT_MAX;
+    qreal right = 0;
+
+    QList<QGraphicsItem *> children = m_item->childItems();
+    for (int i = 0; i < children.count(); ++i) {
+        QDeclarativeItem *child = qobject_cast<QDeclarativeItem *>(children.at(i));
+        if(!child)//### Should this be ignoring non-QDeclarativeItem graphicsobjects?
+            continue;
+        qreal x = child->x();
+        if (x + child->width() > right)
+            right = x + child->width();
+        if (x < left)
+            left = x;
+    }
+    if (!children.isEmpty())
+        m_x = left;
+    m_width = qMax(right - left, qreal(0.0));
+
+    if (m_width != oldwidth || m_x != oldx)
+        emit rectChanged();
+}
+
+void QDeclarativeContents::setItem(QDeclarativeItem *item)
+{
+    m_item = item;
+
+    QList<QGraphicsItem *> children = m_item->childItems();
+    for (int i = 0; i < children.count(); ++i) {
+        QDeclarativeItem *child = qobject_cast<QDeclarativeItem *>(children.at(i));
+        if(!child)//### Should this be ignoring non-QDeclarativeItem graphicsobjects?
+            continue;
+        connect(child, SIGNAL(heightChanged()), this, SLOT(calcHeight()));
+        connect(child, SIGNAL(yChanged()), this, SLOT(calcHeight()));
+        connect(child, SIGNAL(widthChanged()), this, SLOT(calcWidth()));
+        connect(child, SIGNAL(xChanged()), this, SLOT(calcWidth()));
+        connect(this, SIGNAL(rectChanged()), m_item, SIGNAL(childrenRectChanged()));
+    }
+
+    calcHeight();
+    calcWidth();
+}
+
+QDeclarativeItemKeyFilter::QDeclarativeItemKeyFilter(QDeclarativeItem *item)
+: m_next(0)
+{
+    QDeclarativeItemPrivate *p =
+        item?static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(item)):0;
+    if (p) {
+        m_next = p->keyHandler;
+        p->keyHandler = this;
+    }
+}
+
+QDeclarativeItemKeyFilter::~QDeclarativeItemKeyFilter()
+{
+}
+
+void QDeclarativeItemKeyFilter::keyPressed(QKeyEvent *event)
+{
+    if (m_next) m_next->keyPressed(event);
+}
+
+void QDeclarativeItemKeyFilter::keyReleased(QKeyEvent *event)
+{
+    if (m_next) m_next->keyReleased(event);
+}
+
+void QDeclarativeItemKeyFilter::inputMethodEvent(QInputMethodEvent *event)
+{
+    if (m_next) m_next->inputMethodEvent(event);
+}
+
+QVariant QDeclarativeItemKeyFilter::inputMethodQuery(Qt::InputMethodQuery query) const
+{
+    if (m_next) return m_next->inputMethodQuery(query);
+    return QVariant();
+}
+
+void QDeclarativeItemKeyFilter::componentComplete()
+{
+    if (m_next) m_next->componentComplete();
+}
+
+
+/*!
+    \qmlclass KeyNavigation
+    \since 4.7
+    \brief The KeyNavigation attached property supports key navigation by arrow keys.
+
+    It is common in key-based UIs to use arrow keys to navigate
+    between focussed items.  The KeyNavigation property provides a
+    convenient way of specifying which item will gain focus
+    when an arrow key is pressed.  The following example provides
+    key navigation for a 2x2 grid of items.
+
+    \code
+    Grid {
+        columns: 2
+        width: 100; height: 100
+        Rectangle {
+            id: item1
+            focus: true
+            width: 50; height: 50
+            color: focus ? "red" : "lightgray"
+            KeyNavigation.right: item2
+            KeyNavigation.down: item3
+        }
+        Rectangle {
+            id: item2
+            width: 50; height: 50
+            color: focus ? "red" : "lightgray"
+            KeyNavigation.left: item1
+            KeyNavigation.down: item4
+        }
+        Rectangle {
+            id: item3
+            width: 50; height: 50
+            color: focus ? "red" : "lightgray"
+            KeyNavigation.right: item4
+            KeyNavigation.up: item1
+        }
+        Rectangle {
+            id: item4
+            width: 50; height: 50
+            color: focus ? "red" : "lightgray"
+            KeyNavigation.left: item3
+            KeyNavigation.up: item2
+        }
+    }
+    \endcode
+
+    KeyNavigation receives key events after the item it is attached to.
+    If the item accepts an arrow key event, the KeyNavigation
+    attached property will not receive an event for that key.
+
+    If an item has been set for a direction and the KeyNavigation
+    attached property receives the corresponding
+    key press and release events, the events will be accepted by
+    KeyNaviagtion and will not propagate any further.
+
+    \sa {Keys}{Keys attached property}
+*/
+
+/*!
+    \qmlproperty Item KeyNavigation::left
+    \qmlproperty Item KeyNavigation::right
+    \qmlproperty Item KeyNavigation::up
+    \qmlproperty Item KeyNavigation::down
+
+    These properties hold the item to assign focus to
+    when Key_Left, Key_Right, Key_Up or Key_Down are
+    pressed.
+*/
+
+QDeclarativeKeyNavigationAttached::QDeclarativeKeyNavigationAttached(QObject *parent)
+: QObject(*(new QDeclarativeKeyNavigationAttachedPrivate), parent),
+  QDeclarativeItemKeyFilter(qobject_cast<QDeclarativeItem*>(parent))
+{
+}
+
+QDeclarativeKeyNavigationAttached *
+QDeclarativeKeyNavigationAttached::qmlAttachedProperties(QObject *obj)
+{
+    return new QDeclarativeKeyNavigationAttached(obj);
+}
+
+QDeclarativeItem *QDeclarativeKeyNavigationAttached::left() const
+{
+    Q_D(const QDeclarativeKeyNavigationAttached);
+    return d->left;
+}
+
+void QDeclarativeKeyNavigationAttached::setLeft(QDeclarativeItem *i)
+{
+    Q_D(QDeclarativeKeyNavigationAttached);
+    d->left = i;
+    emit changed();
+}
+
+QDeclarativeItem *QDeclarativeKeyNavigationAttached::right() const
+{
+    Q_D(const QDeclarativeKeyNavigationAttached);
+    return d->right;
+}
+
+void QDeclarativeKeyNavigationAttached::setRight(QDeclarativeItem *i)
+{
+    Q_D(QDeclarativeKeyNavigationAttached);
+    d->right = i;
+    emit changed();
+}
+
+QDeclarativeItem *QDeclarativeKeyNavigationAttached::up() const
+{
+    Q_D(const QDeclarativeKeyNavigationAttached);
+    return d->up;
+}
+
+void QDeclarativeKeyNavigationAttached::setUp(QDeclarativeItem *i)
+{
+    Q_D(QDeclarativeKeyNavigationAttached);
+    d->up = i;
+    emit changed();
+}
+
+QDeclarativeItem *QDeclarativeKeyNavigationAttached::down() const
+{
+    Q_D(const QDeclarativeKeyNavigationAttached);
+    return d->down;
+}
+
+void QDeclarativeKeyNavigationAttached::setDown(QDeclarativeItem *i)
+{
+    Q_D(QDeclarativeKeyNavigationAttached);
+    d->down = i;
+    emit changed();
+}
+
+void QDeclarativeKeyNavigationAttached::keyPressed(QKeyEvent *event)
+{
+    Q_D(QDeclarativeKeyNavigationAttached);
+
+    event->ignore();
+
+    switch(event->key()) {
+    case Qt::Key_Left:
+        if (d->left) {
+            d->left->setFocus(true);
+            event->accept();
+        }
+        break;
+    case Qt::Key_Right:
+        if (d->right) {
+            d->right->setFocus(true);
+            event->accept();
+        }
+        break;
+    case Qt::Key_Up:
+        if (d->up) {
+            d->up->setFocus(true);
+            event->accept();
+        }
+        break;
+    case Qt::Key_Down:
+        if (d->down) {
+            d->down->setFocus(true);
+            event->accept();
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyPressed(event);
+}
+
+void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event)
+{
+    Q_D(QDeclarativeKeyNavigationAttached);
+
+    event->ignore();
+
+    switch(event->key()) {
+    case Qt::Key_Left:
+        if (d->left) {
+            event->accept();
+        }
+        break;
+    case Qt::Key_Right:
+        if (d->right) {
+            event->accept();
+        }
+        break;
+    case Qt::Key_Up:
+        if (d->up) {
+            event->accept();
+        }
+        break;
+    case Qt::Key_Down:
+        if (d->down) {
+            event->accept();
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyReleased(event);
+}
+
+/*!
+    \qmlclass Keys
+    \since 4.7
+    \brief The Keys attached property provides key handling to Items.
+
+    All visual primitives support key handling via the \e Keys
+    attached property.  Keys can be handled via the \e onPressed
+    and \e onReleased signal properties.
+
+    The signal properties have a \l KeyEvent parameter, named
+    \e event which contains details of the event.  If a key is
+    handled \e event.accepted should be set to true to prevent the
+    event from propagating up the item heirarchy.
+
+    \code
+    Item {
+        focus: true
+        Keys.onPressed: {
+            if (event.key == Qt.Key_Left) {
+                console.log("move left");
+                event.accepted = true;
+            }
+        }
+    }
+    \endcode
+
+    Some keys may alternatively be handled via specific signal properties,
+    for example \e onSelectPressed.  These handlers automatically set
+    \e event.accepted to true.
+
+    \code
+    Item {
+        focus: true
+        Keys.onLeftPressed: console.log("move left")
+    }
+    \endcode
+
+    See \l {Qt::Key}{Qt.Key} for the list of keyboard codes.
+
+    \sa KeyEvent, {KeyNavigation}{KeyNavigation attached property}
+*/
+
+/*!
+    \qmlproperty bool Keys::enabled
+
+    This flags enables key handling if true (default); otherwise
+    no key handlers will be called.
+*/
+
+/*!
+    \qmlproperty List<Object> Keys::forwardTo
+
+    This property provides a way to forward key presses, key releases, and keyboard input
+    coming from input methods to other items. This can be useful when you want
+    one item to handle some keys (e.g. the up and down arrow keys), and another item to
+    handle other keys (e.g. the left and right arrow keys).  Once an item that has been
+    forwarded keys accepts the event it is no longer forwarded to items later in the
+    list.
+
+    This example forwards key events to two lists:
+    \qml
+    ListView { id: list1 ... }
+    ListView { id: list2 ... }
+    Keys.forwardTo: [list1, list2]
+    focus: true
+    \endqml
+*/
+
+/*!
+    \qmlsignal Keys::onPressed(event)
+
+    This handler is called when a key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onReleased(event)
+
+    This handler is called when a key has been released. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit0Pressed(event)
+
+    This handler is called when the digit '0' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit1Pressed(event)
+
+    This handler is called when the digit '1' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit2Pressed(event)
+
+    This handler is called when the digit '2' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit3Pressed(event)
+
+    This handler is called when the digit '3' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit4Pressed(event)
+
+    This handler is called when the digit '4' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit5Pressed(event)
+
+    This handler is called when the digit '5' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit6Pressed(event)
+
+    This handler is called when the digit '6' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit7Pressed(event)
+
+    This handler is called when the digit '7' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit8Pressed(event)
+
+    This handler is called when the digit '8' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDigit9Pressed(event)
+
+    This handler is called when the digit '9' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onLeftPressed(event)
+
+    This handler is called when the Left arrow has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onRightPressed(event)
+
+    This handler is called when the Right arrow has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onUpPressed(event)
+
+    This handler is called when the Up arrow has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDownPressed(event)
+
+    This handler is called when the Down arrow has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onAsteriskPressed(event)
+
+    This handler is called when the Asterisk '*' has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onEscapePressed(event)
+
+    This handler is called when the Escape key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onReturnPressed(event)
+
+    This handler is called when the Return key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onEnterPressed(event)
+
+    This handler is called when the Enter key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onDeletePressed(event)
+
+    This handler is called when the Delete key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onSpacePressed(event)
+
+    This handler is called when the Space key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onBackPressed(event)
+
+    This handler is called when the Back key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onCancelPressed(event)
+
+    This handler is called when the Cancel key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onSelectPressed(event)
+
+    This handler is called when the Select key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onYesPressed(event)
+
+    This handler is called when the Yes key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onNoPressed(event)
+
+    This handler is called when the No key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onContext1Pressed(event)
+
+    This handler is called when the Context1 key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onContext2Pressed(event)
+
+    This handler is called when the Context2 key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onContext3Pressed(event)
+
+    This handler is called when the Context3 key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onContext4Pressed(event)
+
+    This handler is called when the Context4 key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onCallPressed(event)
+
+    This handler is called when the Call key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onHangupPressed(event)
+
+    This handler is called when the Hangup key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onFlipPressed(event)
+
+    This handler is called when the Flip key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onMenuPressed(event)
+
+    This handler is called when the Menu key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onVolumeUpPressed(event)
+
+    This handler is called when the VolumeUp key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onVolumeDownPressed(event)
+
+    This handler is called when the VolumeDown key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+const QDeclarativeKeysAttached::SigMap QDeclarativeKeysAttached::sigMap[] = {
+    { Qt::Key_Left, "leftPressed" },
+    { Qt::Key_Right, "rightPressed" },
+    { Qt::Key_Up, "upPressed" },
+    { Qt::Key_Down, "downPressed" },
+    { Qt::Key_Asterisk, "asteriskPressed" },
+    { Qt::Key_NumberSign, "numberSignPressed" },
+    { Qt::Key_Escape, "escapePressed" },
+    { Qt::Key_Return, "returnPressed" },
+    { Qt::Key_Enter, "enterPressed" },
+    { Qt::Key_Delete, "deletePressed" },
+    { Qt::Key_Space, "spacePressed" },
+    { Qt::Key_Back, "backPressed" },
+    { Qt::Key_Cancel, "cancelPressed" },
+    { Qt::Key_Select, "selectPressed" },
+    { Qt::Key_Yes, "yesPressed" },
+    { Qt::Key_No, "noPressed" },
+    { Qt::Key_Context1, "context1Pressed" },
+    { Qt::Key_Context2, "context2Pressed" },
+    { Qt::Key_Context3, "context3Pressed" },
+    { Qt::Key_Context4, "context4Pressed" },
+    { Qt::Key_Call, "callPressed" },
+    { Qt::Key_Hangup, "hangupPressed" },
+    { Qt::Key_Flip, "flipPressed" },
+    { Qt::Key_Menu, "menuPressed" },
+    { Qt::Key_VolumeUp, "volumeUpPressed" },
+    { Qt::Key_VolumeDown, "volumeDownPressed" },
+    { 0, 0 }
+};
+
+bool QDeclarativeKeysAttachedPrivate::isConnected(const char *signalName)
+{
+    return isSignalConnected(signalIndex(signalName));
+}
+
+QDeclarativeKeysAttached::QDeclarativeKeysAttached(QObject *parent)
+: QObject(*(new QDeclarativeKeysAttachedPrivate), parent),
+  QDeclarativeItemKeyFilter(qobject_cast<QDeclarativeItem*>(parent))
+{
+    Q_D(QDeclarativeKeysAttached);
+    d->item = qobject_cast<QDeclarativeItem*>(parent);
+}
+
+QDeclarativeKeysAttached::~QDeclarativeKeysAttached()
+{
+}
+
+void QDeclarativeKeysAttached::componentComplete()
+{
+    Q_D(QDeclarativeKeysAttached);
+    if (d->item) {
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+            QGraphicsItem *targetItem = d->finalFocusProxy(d->targets.at(ii));
+            if (targetItem && (targetItem->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
+                d->item->setFlag(QGraphicsItem::ItemAcceptsInputMethod);
+                break;
+            }
+        }
+    }
+}
+
+void QDeclarativeKeysAttached::keyPressed(QKeyEvent *event)
+{
+    Q_D(QDeclarativeKeysAttached);
+    if (!d->enabled || d->inPress) {
+        event->ignore();
+        return;
+    }
+
+    // first process forwards
+    if (d->item && d->item->scene()) {
+        d->inPress = true;
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+            QGraphicsItem *i = d->finalFocusProxy(d->targets.at(ii));
+            if (i) {
+                d->item->scene()->sendEvent(i, event);
+                if (event->isAccepted()) {
+                    d->inPress = false;
+                    return;
+                }
+            }
+        }
+        d->inPress = false;
+    }
+
+    QDeclarativeKeyEvent ke(*event);
+    QByteArray keySignal = keyToSignal(event->key());
+    if (!keySignal.isEmpty()) {
+        keySignal += "(QDeclarativeKeyEvent*)";
+        if (d->isConnected(keySignal)) {
+            // If we specifically handle a key then default to accepted
+            ke.setAccepted(true);
+            int idx = QDeclarativeKeysAttached::staticMetaObject.indexOfSignal(keySignal);
+            metaObject()->method(idx).invoke(this, Qt::DirectConnection, Q_ARG(QDeclarativeKeyEvent*, &ke));
+        }
+    }
+    if (!ke.isAccepted())
+        emit pressed(&ke);
+    event->setAccepted(ke.isAccepted());
+
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyPressed(event);
+}
+
+void QDeclarativeKeysAttached::keyReleased(QKeyEvent *event)
+{
+    Q_D(QDeclarativeKeysAttached);
+    if (!d->enabled || d->inRelease) {
+        event->ignore();
+        return;
+    }
+
+    if (d->item && d->item->scene()) {
+        d->inRelease = true;
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+            QGraphicsItem *i = d->finalFocusProxy(d->targets.at(ii));
+            if (i) {
+                d->item->scene()->sendEvent(i, event);
+                if (event->isAccepted()) {
+                    d->inRelease = false;
+                    return;
+                }
+            }
+        }
+        d->inRelease = false;
+    }
+
+    QDeclarativeKeyEvent ke(*event);
+    emit released(&ke);
+    event->setAccepted(ke.isAccepted());
+
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyReleased(event);
+}
+
+void QDeclarativeKeysAttached::inputMethodEvent(QInputMethodEvent *event)
+{
+    Q_D(QDeclarativeKeysAttached);
+    if (d->item && !d->inIM && d->item->scene()) {
+        d->inIM = true;
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+            QGraphicsItem *i = d->finalFocusProxy(d->targets.at(ii));
+            if (i && (i->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
+                d->item->scene()->sendEvent(i, event);
+                if (event->isAccepted()) {
+                    d->imeItem = i;
+                    d->inIM = false;
+                    return;
+                }
+            }
+        }
+        d->inIM = false;
+    }
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::inputMethodEvent(event);
+}
+
+class QDeclarativeItemAccessor : public QGraphicsItem
+{
+public:
+    QVariant doInputMethodQuery(Qt::InputMethodQuery query) const {
+        return QGraphicsItem::inputMethodQuery(query);
+    }
+};
+
+QVariant QDeclarativeKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const
+{
+    Q_D(const QDeclarativeKeysAttached);
+    if (d->item) {
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+                QGraphicsItem *i = d->finalFocusProxy(d->targets.at(ii));
+            if (i && (i->flags() & QGraphicsItem::ItemAcceptsInputMethod) && i == d->imeItem) { //### how robust is i == d->imeItem check?
+                QVariant v = static_cast<QDeclarativeItemAccessor *>(i)->doInputMethodQuery(query);
+                if (v.userType() == QVariant::RectF)
+                    v = d->item->mapRectFromItem(i, v.toRectF());  //### cost?
+                return v;
+            }
+        }
+    }
+    return QDeclarativeItemKeyFilter::inputMethodQuery(query);
+}
+
+QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObject *obj)
+{
+    return new QDeclarativeKeysAttached(obj);
+}
+
+/*!
+    \class QDeclarativeItem
+    \since 4.7
+    \brief The QDeclarativeItem class provides the most basic of all visual items in QML.
+
+    All visual items in Qt Declarative inherit from QDeclarativeItem.  Although QDeclarativeItem
+    has no visual appearance, it defines all the properties that are
+    common across visual items - such as the x and y position, the
+    width and height, \l {anchor-layout}{anchoring} and key handling.
+
+    You can subclass QDeclarativeItem to provide your own custom visual item that inherits
+    these features.
+*/
+
+/*!
+    \qmlclass Item QDeclarativeItem
+    \since 4.7
+    \brief The Item is the most basic of all visual items in QML.
+
+    All visual items in Qt Declarative inherit from Item.  Although Item
+    has no visual appearance, it defines all the properties that are
+    common across visual items - such as the x and y position, the
+    width and height, \l {anchor-layout}{anchoring} and key handling.
+
+    Item is also useful for grouping items together.
+
+    \qml
+    Item {
+        Image {
+            source: "tile.png"
+        }
+        Image {
+            x: 80
+            width: 100
+            height: 100
+            source: "tile.png"
+        }
+        Image {
+            x: 190
+            width: 100
+            height: 100
+            fillMode: Image.Tile
+            source: "tile.png"
+        }
+    }
+    \endqml
+
+    \section1 Identity
+
+    Each item has an "id" - the identifier of the Item.
+
+    The identifier can be used in bindings and other expressions to
+    refer to the item. For example:
+
+    \qml
+    Text { id: myText; ... }
+    Text { text: myText.text }
+    \endqml
+
+    The identifier is available throughout to the \l {components}{component}
+    where it is declared.  The identifier must be unique in the component.
+
+    The id should not be thought of as a "property" - it makes no sense
+    to write \c myText.id, for example.
+
+    \section1 Key Handling
+
+    Key handling is available to all Item-based visual elements via the \l {Keys}{Keys}
+    attached property.  The \e Keys attached property provides basic handlers such
+    as \l {Keys::onPressed}{onPressed} and \l {Keys::onReleased}{onReleased},
+    as well as handlers for specific keys, such as
+    \l {Keys::onCancelPressed}{onCancelPressed}.  The example below
+    assigns \l {qmlfocus}{focus} to the item and handles
+    the Left key via the general \e onPressed handler and the Select key via the
+    onSelectPressed handler:
+
+    \qml
+    Item {
+        focus: true
+        Keys.onPressed: {
+            if (event.key == Qt.Key_Left) {
+                console.log("move left");
+                event.accepted = true;
+            }
+        }
+        Keys.onSelectPressed: console.log("Selected");
+    }
+    \endqml
+
+    See the \l {Keys}{Keys} attached property for detailed documentation.
+
+    \ingroup group_coreitems
+*/
+
+/*!
+    \property QDeclarativeItem::baseline
+    \internal
+*/
+
+/*!
+    \property QDeclarativeItem::effect
+    \internal
+*/
+
+/*!
+    \property QDeclarativeItem::focus
+    \internal
+*/
+
+/*!
+    \property QDeclarativeItem::wantsFocus
+    \internal
+*/
+
+/*!
+    \property QDeclarativeItem::transformOrigin
+    \internal
+*/
+
+/*!
+    \fn void QDeclarativeItem::childrenRectChanged()
+    \internal
+*/
+
+/*!
+    \fn void QDeclarativeItem::baselineOffsetChanged()
+    \internal
+*/
+
+/*!
+    \fn void QDeclarativeItem::widthChanged()
+    \internal
+*/
+
+/*!
+    \fn void QDeclarativeItem::heightChanged()
+    \internal
+*/
+
+/*!
+    \fn void QDeclarativeItem::stateChanged(const QString &state)
+    \internal
+*/
+
+/*!
+    \fn void QDeclarativeItem::parentChanged()
+    \internal
+*/
+
+/*! \fn void QDeclarativeItem::transformOriginChanged(TransformOrigin)
+  \internal
+*/
+
+/*!
+    \fn void QDeclarativeItem::childrenChanged()
+    \internal
+*/
+
+/*!
+    \fn void QDeclarativeItem::focusChanged()
+    \internal
+*/
+
+/*!
+    \fn void QDeclarativeItem::wantsFocusChanged()
+    \internal
+*/
+
+// ### Must fix
+struct RegisterAnchorLineAtStartup {
+    RegisterAnchorLineAtStartup() {
+        qRegisterMetaType<QDeclarativeAnchorLine>("QDeclarativeAnchorLine");
+    }
+};
+static RegisterAnchorLineAtStartup registerAnchorLineAtStartup;
+
+
+/*!
+    \fn QDeclarativeItem::QDeclarativeItem(QDeclarativeItem *parent)
+
+    Constructs a QDeclarativeItem with the given \a parent.
+*/
+QDeclarativeItem::QDeclarativeItem(QDeclarativeItem* parent)
+  : QGraphicsObject(*(new QDeclarativeItemPrivate), parent, 0)
+{
+    Q_D(QDeclarativeItem);
+    d->init(parent);
+}
+
+/*! \internal
+*/
+QDeclarativeItem::QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent)
+  : QGraphicsObject(dd, parent, 0)
+{
+    Q_D(QDeclarativeItem);
+    d->init(parent);
+}
+
+/*!
+    Destroys the QDeclarativeItem.
+*/
+QDeclarativeItem::~QDeclarativeItem()
+{
+    Q_D(QDeclarativeItem);
+    for (int ii = 0; ii < d->changeListeners.count(); ++ii) {
+        QDeclarativeAnchorsPrivate *anchor = d->changeListeners.at(ii).listener->anchorPrivate();
+        if (anchor)
+            anchor->clearItem(this);
+    }
+    if (!d->parent || (parentItem() && !parentItem()->QGraphicsItem::d_ptr->inDestructor)) {
+        for (int ii = 0; ii < d->changeListeners.count(); ++ii) {
+            QDeclarativeAnchorsPrivate *anchor = d->changeListeners.at(ii).listener->anchorPrivate();
+            if (anchor && anchor->item && anchor->item->parentItem() != this) //child will be deleted anyway
+                anchor->updateOnComplete();
+        }
+    }
+    for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
+        const QDeclarativeItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
+        if (change.types & QDeclarativeItemPrivate::Destroyed)
+            change.listener->itemDestroyed(this);
+    }
+    d->changeListeners.clear();
+    delete d->_anchorLines; d->_anchorLines = 0;
+    delete d->_anchors; d->_anchors = 0;
+    delete d->_stateGroup; d->_stateGroup = 0;
+}
+
+/*!
+    \qmlproperty enum Item::transformOrigin
+    This property holds the origin point around which scale and rotation transform.
+
+    Nine transform origins are available, as shown in the image below.
+
+    \image declarative-transformorigin.png
+
+    This example rotates an image around its bottom-right corner.
+    \qml
+    Image {
+        source: "myimage.png"
+        transformOrigin: Item.BottomRight
+        rotate: 45
+    }
+    \endqml
+
+    The default transform origin is \c Center.
+*/
+
+/*!
+    \qmlproperty Item Item::parent
+    This property holds the parent of the item.
+*/
+
+/*!
+    \property QDeclarativeItem::parent
+    This property holds the parent of the item.
+*/
+void QDeclarativeItem::setParentItem(QDeclarativeItem *parent)
+{
+    QDeclarativeItem *oldParent = parentItem();
+    if (parent == oldParent || !parent) return;
+
+    QObject::setParent(parent);
+    QGraphicsObject::setParentItem(parent);
+}
+
+/*!
+    \fn void QDeclarativeItem::setParent(QDeclarativeItem *parent)
+    \overload
+    Sets both the parent object and parent item to \a parent. This
+    function avoids the programming error of calling setParent()
+    when you mean setParentItem().
+*/
+
+/*!
+    Returns the QDeclarativeItem parent of this item.
+*/
+QDeclarativeItem *QDeclarativeItem::parentItem() const
+{
+    return qobject_cast<QDeclarativeItem *>(QGraphicsObject::parentItem());
+}
+
+/*!
+    \qmlproperty list<Item> Item::children
+    \qmlproperty list<Object> Item::resources
+
+    The children property contains the list of visual children of this item.
+    The resources property contains non-visual resources that you want to
+    reference by name.
+
+    Generally you can rely on Item's default property to handle all this for
+    you, but it can come in handy in some cases.
+
+    \qml
+    Item {
+        children: [
+            Text {},
+            Rectangle {}
+        ]
+        resources: [
+            Component {
+                id: myComponent
+                Text {}
+            }
+        ]
+    }
+    \endqml
+*/
+
+/*!
+    \property QDeclarativeItem::children
+    \internal
+*/
+
+/*!
+    \property QDeclarativeItem::resources
+    \internal
+*/
+
+/*!
+    Returns true if construction of the QML component is complete; otherwise
+    returns false.
+
+    It is often desireable to delay some processing until the component is
+    completed.
+
+    \sa componentComplete()
+*/
+bool QDeclarativeItem::isComponentComplete() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->_componentComplete;
+}
+
+/*!
+    \property QDeclarativeItem::anchors
+    \internal
+*/
+
+/*! \internal */
+QDeclarativeAnchors *QDeclarativeItem::anchors()
+{
+    Q_D(QDeclarativeItem);
+    return d->anchors();
+}
+
+void QDeclarativeItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+{
+    QDeclarativeItem *i = qobject_cast<QDeclarativeItem *>(o);
+    if (i) 
+        i->setParentItem(static_cast<QDeclarativeItem *>(prop->object));
+    else
+        o->setParent(static_cast<QDeclarativeItem *>(prop->object));
+}
+
+QObject *QDeclarativeItemPrivate::resources_at(QDeclarativeListProperty<QObject> *prop, int index)
+{
+    QObjectList children = prop->object->children();
+    if (index < children.count())
+        return children.at(index);
+    else
+        return 0;
+}
+
+void QDeclarativeItemPrivate::resources_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+{
+    o->setParent(prop->object);
+}
+
+int QDeclarativeItemPrivate::resources_count(QDeclarativeListProperty<QObject> *prop)
+{
+    return prop->object->children().count();
+}
+
+QDeclarativeItem *QDeclarativeItemPrivate::children_at(QDeclarativeListProperty<QDeclarativeItem> *prop, int index)
+{
+    QList<QGraphicsItem *> children = static_cast<QDeclarativeItem*>(prop->object)->childItems();
+
+    if (index < children.count())
+        return qobject_cast<QDeclarativeItem *>(children.at(index));
+    else
+        return 0;
+}
+
+void QDeclarativeItemPrivate::children_append(QDeclarativeListProperty<QDeclarativeItem> *prop, QDeclarativeItem *i)
+{
+    if (i)
+        i->setParentItem(static_cast<QDeclarativeItem*>(prop->object));
+}
+
+int QDeclarativeItemPrivate::children_count(QDeclarativeListProperty<QDeclarativeItem> *prop)
+{
+    return static_cast<QDeclarativeItem*>(prop->object)->childItems().count();
+}
+
+int QDeclarativeItemPrivate::transform_count(QDeclarativeListProperty<QGraphicsTransform> *list)
+{
+    QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
+    if (object) {
+        QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(object);
+        return d->transformData ? d->transformData->graphicsTransforms.size() : 0;
+    } else {
+        return 0;
+    }
+}
+
+void QDeclarativeItemPrivate::transform_append(QDeclarativeListProperty<QGraphicsTransform> *list, QGraphicsTransform *item)
+{
+    QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
+    if (object)
+        QGraphicsItemPrivate::get(object)->appendGraphicsTransform(item);
+}
+
+QGraphicsTransform *QDeclarativeItemPrivate::transform_at(QDeclarativeListProperty<QGraphicsTransform> *list, int idx)
+{
+    QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
+    if (object) {
+        QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(object);
+        if (!d->transformData)
+            return 0;
+        return d->transformData->graphicsTransforms.at(idx);
+    } else {
+        return 0;
+    }
+}
+
+void QDeclarativeItemPrivate::transform_clear(QDeclarativeListProperty<QGraphicsTransform> *list)
+{
+    QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
+    if (object) {
+        QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(object);
+        if (!d->transformData)
+            return;
+        object->setTransformations(QList<QGraphicsTransform *>());
+    }
+}
+
+/*!
+    \qmlproperty list<Object> Item::data
+    \default
+
+    The data property is allows you to freely mix visual children and resources
+    of an item.  If you assign a visual item to the data list it becomes
+    a child and if you assign any other object type, it is added as a resource.
+
+    So you can write:
+    \qml
+    Item {
+        Text {}
+        Rectangle {}
+        Script {}
+    }
+    \endqml
+
+    instead of:
+    \qml
+    Item {
+        children: [
+            Text {},
+            Rectangle {}
+        ]
+        resources: [
+            Script {}
+        ]
+    }
+    \endqml
+
+    data is a behind-the-scenes property: you should never need to explicitly
+    specify it.
+ */
+
+/*!
+    \property QDeclarativeItem::data
+    \internal
+*/
+
+/*! \internal */
+QDeclarativeListProperty<QObject> QDeclarativeItem::data() 
+{
+    return QDeclarativeListProperty<QObject>(this, 0, QDeclarativeItemPrivate::data_append);
+}
+
+/*!
+    \property QDeclarativeItem::childrenRect
+    \brief The geometry of an item's children.
+
+    childrenRect provides an easy way to access the (collective) position and size of the item's children.
+*/
+QRectF QDeclarativeItem::childrenRect()
+{
+    Q_D(QDeclarativeItem);
+    if (!d->_contents) {
+        d->_contents = new QDeclarativeContents;
+        d->_contents->setParent(this);
+        d->_contents->setItem(this);
+    }
+    return d->_contents->rectF();
+}
+
+bool QDeclarativeItem::clip() const
+{
+    return flags() & ItemClipsChildrenToShape;
+}
+
+void QDeclarativeItem::setClip(bool c)
+{
+    if (clip() == c)
+        return;
+    setFlag(ItemClipsChildrenToShape, c);
+    emit clipChanged();
+}
+
+/*!
+  \qmlproperty real Item::x
+  \qmlproperty real Item::y
+  \qmlproperty real Item::width
+  \qmlproperty real Item::height
+
+  Defines the item's position and size relative to its parent.
+
+  \qml
+  Item { x: 100; y: 100; width: 100; height: 100 }
+  \endqml
+ */
+
+/*!
+  \property QDeclarativeItem::width
+
+  Defines the item's width relative to its parent.
+ */
+
+/*!
+  \property QDeclarativeItem::height
+
+  Defines the item's height relative to its parent.
+ */
+
+/*!
+  \qmlproperty real Item::z
+
+  Sets the stacking order of the item.  By default the stacking order is 0.
+
+  Items with a higher stacking value are drawn on top of items with a
+  lower stacking order.  Items with the same stacking value are drawn
+  bottom up in the order they appear.  Items with a negative stacking
+  value are drawn under their parent's content.
+
+  The following example shows the various effects of stacking order.
+
+  \table
+  \row
+  \o \image declarative-item_stacking1.png
+  \o Same \c z - later children above earlier children:
+  \qml
+  Item {
+      Rectangle {
+          color: "red"
+          width: 100; height: 100
+      }
+      Rectangle {
+          color: "blue"
+          x: 50; y: 50; width: 100; height: 100
+      }
+  }
+  \endqml
+  \row
+  \o \image declarative-item_stacking2.png
+  \o Higher \c z on top:
+  \qml
+  Item {
+      Rectangle {
+          z: 1
+          color: "red"
+          width: 100; height: 100
+      }
+      Rectangle {
+          color: "blue"
+          x: 50; y: 50; width: 100; height: 100
+      }
+  }
+  \endqml
+  \row
+  \o \image declarative-item_stacking3.png
+  \o Same \c z - children above parents:
+  \qml
+  Item {
+      Rectangle {
+          color: "red"
+          width: 100; height: 100
+          Rectangle {
+              color: "blue"
+              x: 50; y: 50; width: 100; height: 100
+          }
+      }
+  }
+  \endqml
+  \row
+  \o \image declarative-item_stacking4.png
+  \o Lower \c z below:
+  \qml
+  Item {
+      Rectangle {
+          color: "red"
+          width: 100; height: 100
+          Rectangle {
+              z: -1
+              color: "blue"
+              x: 50; y: 50; width: 100; height: 100
+          }
+      }
+  }
+  \endqml
+  \endtable
+ */
+
+/*!
+    \qmlproperty bool Item::visible
+
+    Whether the item is visible. By default this is true.
+
+    \note visible is not linked to actual visibility; if an item
+    moves off screen, or the opacity changes to 0, this will
+    not affect the visible property.
+*/
+
+
+/*!
+  This function is called to handle this item's changes in
+  geometry from \a oldGeometry to \a newGeometry. If the two
+  geometries are the same, it doesn't do anything.
+ */
+void QDeclarativeItem::geometryChanged(const QRectF &newGeometry,
+                              const QRectF &oldGeometry)
+{
+    Q_D(QDeclarativeItem);
+
+    if (d->_anchors)
+        d->_anchors->d_func()->updateMe();
+
+    if (transformOrigin() != QDeclarativeItem::TopLeft)
+        setTransformOriginPoint(d->computeTransformOrigin());
+
+    if (newGeometry.x() != oldGeometry.x())
+        emit xChanged();
+    if (newGeometry.width() != oldGeometry.width())
+        emit widthChanged();
+    if (newGeometry.y() != oldGeometry.y())
+        emit yChanged();
+    if (newGeometry.height() != oldGeometry.height())
+        emit heightChanged();
+
+    for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
+        const QDeclarativeItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
+        if (change.types & QDeclarativeItemPrivate::Geometry)
+            change.listener->itemGeometryChanged(this, newGeometry, oldGeometry);
+    }
+}
+
+void QDeclarativeItemPrivate::removeItemChangeListener(QDeclarativeItemChangeListener *listener, ChangeTypes types)
+{
+    ChangeListener change(listener, types);
+    changeListeners.removeOne(change);
+}
+
+/*! \internal */
+void QDeclarativeItem::keyPressEvent(QKeyEvent *event)
+{
+    Q_D(QDeclarativeItem);
+    if (d->keyHandler)
+        d->keyHandler->keyPressed(event);
+    else
+        event->ignore();
+}
+
+/*! \internal */
+void QDeclarativeItem::keyReleaseEvent(QKeyEvent *event)
+{
+    Q_D(QDeclarativeItem);
+    if (d->keyHandler)
+        d->keyHandler->keyReleased(event);
+    else
+        event->ignore();
+}
+
+/*! \internal */
+void QDeclarativeItem::inputMethodEvent(QInputMethodEvent *event)
+{
+    Q_D(QDeclarativeItem);
+    if (d->keyHandler)
+        d->keyHandler->inputMethodEvent(event);
+    else
+        event->ignore();
+}
+
+/*! \internal */
+QVariant QDeclarativeItem::inputMethodQuery(Qt::InputMethodQuery query) const
+{
+    Q_D(const QDeclarativeItem);
+    QVariant v;
+    if (d->keyHandler)
+        v = d->keyHandler->inputMethodQuery(query);
+
+    if (!v.isValid())
+        v = QGraphicsObject::inputMethodQuery(query);
+
+    return v;
+}
+
+/*!
+    \internal
+*/
+QDeclarativeAnchorLine QDeclarativeItem::left() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->anchorLines()->left;
+}
+
+/*!
+    \internal
+*/
+QDeclarativeAnchorLine QDeclarativeItem::right() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->anchorLines()->right;
+}
+
+/*!
+    \internal
+*/
+QDeclarativeAnchorLine QDeclarativeItem::horizontalCenter() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->anchorLines()->hCenter;
+}
+
+/*!
+    \internal
+*/
+QDeclarativeAnchorLine QDeclarativeItem::top() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->anchorLines()->top;
+}
+
+/*!
+    \internal
+*/
+QDeclarativeAnchorLine QDeclarativeItem::bottom() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->anchorLines()->bottom;
+}
+
+/*!
+    \internal
+*/
+QDeclarativeAnchorLine QDeclarativeItem::verticalCenter() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->anchorLines()->vCenter;
+}
+
+
+/*!
+    \internal
+*/
+QDeclarativeAnchorLine QDeclarativeItem::baseline() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->anchorLines()->baseline;
+}
+
+/*!
+  \property QDeclarativeItem::top
+  \internal
+*/
+
+/*!
+  \property QDeclarativeItem::bottom
+  \internal
+*/
+
+/*!
+  \property QDeclarativeItem::left
+  \internal
+*/
+
+/*!
+  \property QDeclarativeItem::right
+  \internal
+*/
+
+/*!
+  \property QDeclarativeItem::horizontalCenter
+  \internal
+*/
+
+/*!
+  \property QDeclarativeItem::verticalCenter
+  \internal
+*/
+
+/*!
+  \qmlproperty AnchorLine Item::top
+  \qmlproperty AnchorLine Item::bottom
+  \qmlproperty AnchorLine Item::left
+  \qmlproperty AnchorLine Item::right
+  \qmlproperty AnchorLine Item::horizontalCenter
+  \qmlproperty AnchorLine Item::verticalCenter
+  \qmlproperty AnchorLine Item::baseline
+
+  The anchor lines of the item.
+
+  For more information see \l {anchor-layout}{Anchor Layouts}.
+*/
+
+/*!
+  \qmlproperty AnchorLine Item::anchors.top
+  \qmlproperty AnchorLine Item::anchors.bottom
+  \qmlproperty AnchorLine Item::anchors.left
+  \qmlproperty AnchorLine Item::anchors.right
+  \qmlproperty AnchorLine Item::anchors.horizontalCenter
+  \qmlproperty AnchorLine Item::anchors.verticalCenter
+  \qmlproperty AnchorLine Item::anchors.baseline
+
+  \qmlproperty Item Item::anchors.fill
+  \qmlproperty Item Item::anchors.centerIn
+
+  \qmlproperty real Item::anchors.margins
+  \qmlproperty real Item::anchors.topMargin
+  \qmlproperty real Item::anchors.bottomMargin
+  \qmlproperty real Item::anchors.leftMargin
+  \qmlproperty real Item::anchors.rightMargin
+  \qmlproperty real Item::anchors.horizontalCenterOffset
+  \qmlproperty real Item::anchors.verticalCenterOffset
+  \qmlproperty real Item::anchors.baselineOffset
+
+  Anchors provide a way to position an item by specifying its
+  relationship with other items.
+
+  Margins apply to top, bottom, left, right, and fill anchors.
+  The margins property can be used to set all of the various margins at once, to the same value.
+
+  Offsets apply for horizontal center, vertical center, and baseline anchors.
+
+  \table
+  \row
+  \o \image declarative-anchors_example.png
+  \o Text anchored to Image, horizontally centered and vertically below, with a margin.
+  \qml
+  Image { id: pic; ... }
+  Text {
+      id: label
+      anchors.horizontalCenter: pic.horizontalCenter
+      anchors.top: pic.bottom
+      anchors.topMargin: 5
+      ...
+  }
+  \endqml
+  \row
+  \o \image declarative-anchors_example2.png
+  \o
+  Left of Text anchored to right of Image, with a margin. The y
+  property of both defaults to 0.
+
+  \qml
+    Image { id: pic; ... }
+    Text {
+        id: label
+        anchors.left: pic.right
+        anchors.leftMargin: 5
+        ...
+    }
+  \endqml
+  \endtable
+
+  anchors.fill provides a convenient way for one item to have the
+  same geometry as another item, and is equivalent to connecting all
+  four directional anchors.
+
+  \note You can only anchor an item to siblings or a parent.
+
+  For more information see \l {anchor-layout}{Anchor Layouts}.
+*/
+
+/*!
+  \property QDeclarativeItem::baselineOffset
+  \brief The position of the item's baseline in local coordinates.
+
+  The baseline of a Text item is the imaginary line on which the text
+  sits. Controls containing text usually set their baseline to the
+  baseline of their text.
+
+  For non-text items, a default baseline offset of 0 is used.
+*/
+qreal QDeclarativeItem::baselineOffset() const
+{
+    Q_D(const QDeclarativeItem);
+    if (!d->_baselineOffset.isValid()) {
+        return 0.0;
+    } else
+        return d->_baselineOffset;
+}
+
+void QDeclarativeItem::setBaselineOffset(qreal offset)
+{
+    Q_D(QDeclarativeItem);
+    if (offset == d->_baselineOffset)
+        return;
+
+    d->_baselineOffset = offset;
+    emit baselineOffsetChanged();
+
+    for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
+        const QDeclarativeItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
+        if (change.types & QDeclarativeItemPrivate::Geometry) {
+            QDeclarativeAnchorsPrivate *anchor = change.listener->anchorPrivate();
+            if (anchor)
+                anchor->updateVerticalAnchors();
+        }
+    }
+}
+
+/*!
+  \qmlproperty real Item::rotation
+  This property holds the rotation of the item in degrees clockwise.
+
+  This specifies how many degrees to rotate the item around its transformOrigin.
+  The default rotation is 0 degrees (i.e. not rotated at all).
+
+  \table
+  \row
+  \o \image declarative-rotation.png
+  \o
+  \qml
+  Rectangle {
+      color: "blue"
+      width: 100; height: 100
+      Rectangle {
+          color: "red"
+          x: 25; y: 25; width: 50; height: 50
+          rotation: 30
+      }
+  }
+  \endqml
+  \endtable
+*/
+
+/*!
+  \qmlproperty real Item::scale
+  This property holds the scale of the item.
+
+  A scale of less than 1 means the item will be displayed smaller than
+  normal, and a scale of greater than 1 means the item will be
+  displayed larger than normal.  A negative scale means the item will
+  be mirrored.
+
+  By default, items are displayed at a scale of 1 (i.e. at their
+  normal size).
+
+  Scaling is from the item's transformOrigin.
+
+  \table
+  \row
+  \o \image declarative-scale.png
+  \o
+  \qml
+  Rectangle {
+      color: "blue"
+      width: 100; height: 100
+      Rectangle {
+          color: "green"
+          width: 25; height: 25
+      }
+      Rectangle {
+          color: "red"
+          x: 25; y: 25; width: 50; height: 50
+          scale: 1.4
+      }
+  }
+  \endqml
+  \endtable
+*/
+
+/*!
+  \qmlproperty real Item::opacity
+
+  The opacity of the item.  Opacity is specified as a number between 0
+  (fully transparent) and 1 (fully opaque).  The default is 1.
+
+  Opacity is an \e inherited attribute.  That is, the opacity is
+  also applied individually to child items.  In almost all cases this
+  is what you want.  If you can spot the issue in the following
+  example, you might need to use an \l Opacity effect instead.
+
+  \table
+  \row
+  \o \image declarative-item_opacity1.png
+  \o
+  \qml
+    Item {
+        Rectangle {
+            color: "red"
+            width: 100; height: 100
+            Rectangle {
+                color: "blue"
+                x: 50; y: 50; width: 100; height: 100
+            }
+        }
+    }
+  \endqml
+  \row
+  \o \image declarative-item_opacity2.png
+  \o
+  \qml
+    Item {
+        Rectangle {
+            opacity: 0.5
+            color: "red"
+            width: 100; height: 100
+            Rectangle {
+                color: "blue"
+                x: 50; y: 50; width: 100; height: 100
+            }
+        }
+    }
+  \endqml
+  \endtable
+*/
+
+/*!
+  Returns a value indicating whether mouse input should
+  remain with this item exclusively.
+
+  \sa setKeepMouseGrab()
+ */
+bool QDeclarativeItem::keepMouseGrab() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->_keepMouse;
+}
+
+/*!
+  The flag indicating whether the mouse should remain
+  with this item is set to \a keep.
+
+  This is useful for items that wish to grab and keep mouse
+  interaction following a predefined gesture.  For example,
+  an item that is interested in horizontal mouse movement
+  may set keepMouseGrab to true once a threshold has been
+  exceeded.  Once keepMouseGrab has been set to true, filtering
+  items will not react to mouse events.
+
+  If the item does not indicate that it wishes to retain mouse grab,
+  a filtering item may steal the grab. For example, Flickable may attempt
+  to steal a mouse grab if it detects that the user has begun to
+  move the viewport.
+
+  \sa keepMouseGrab()
+ */
+void QDeclarativeItem::setKeepMouseGrab(bool keep)
+{
+    Q_D(QDeclarativeItem);
+    d->_keepMouse = keep;
+}
+
+/*!
+  \internal
+
+  This function emits the \e focusChanged signal.
+
+  Subclasses overriding this function should call up
+  to their base class.
+*/
+void QDeclarativeItem::focusChanged(bool flag)
+{
+    Q_UNUSED(flag);
+    emit focusChanged();
+}
+
+/*! \internal */
+QDeclarativeListProperty<QDeclarativeItem> QDeclarativeItem::fxChildren()
+{
+    return QDeclarativeListProperty<QDeclarativeItem>(this, 0, QDeclarativeItemPrivate::children_append,
+                                                     QDeclarativeItemPrivate::children_count, 
+                                                     QDeclarativeItemPrivate::children_at); 
+}
+
+/*! \internal */
+QDeclarativeListProperty<QObject> QDeclarativeItem::resources()
+{
+    return QDeclarativeListProperty<QObject>(this, 0, QDeclarativeItemPrivate::resources_append, 
+                                             QDeclarativeItemPrivate::resources_count, 
+                                             QDeclarativeItemPrivate::resources_at); 
+}
+
+/*!
+  \qmlproperty list<State> Item::states
+  This property holds a list of states defined by the item.
+
+  \qml
+  Item {
+    states: [
+      State { ... },
+      State { ... }
+      ...
+    ]
+  }
+  \endqml
+
+  \sa {qmlstate}{States}
+*/
+
+/*!
+  \property QDeclarativeItem::states
+  \internal
+*/
+/*! \internal */
+QDeclarativeListProperty<QDeclarativeState> QDeclarativeItem::states()
+{
+    Q_D(QDeclarativeItem);
+    return d->states()->statesProperty();
+}
+
+/*!
+  \qmlproperty list<Transition> Item::transitions
+  This property holds a list of transitions defined by the item.
+
+  \qml
+  Item {
+    transitions: [
+      Transition { ... },
+      Transition { ... }
+      ...
+    ]
+  }
+  \endqml
+
+  \sa {state-transitions}{Transitions}
+*/
+
+/*!
+  \property QDeclarativeItem::transitions
+  \internal
+*/
+
+/*! \internal */
+QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeItem::transitions()
+{
+    Q_D(QDeclarativeItem);
+    return d->states()->transitionsProperty();
+}
+
+/*
+  \qmlproperty list<Filter> Item::filter
+  This property holds a list of graphical filters to be applied to the item.
+
+  \l {Filter}{Filters} include things like \l {Blur}{blurring}
+  the item, or giving it a \l Reflection.  Some
+  filters may not be available on all canvases; if a filter is not
+  available on a certain canvas, it will simply not be applied for
+  that canvas (but the QML will still be considered valid).
+
+  \qml
+  Item {
+    filter: [
+      Blur { ... },
+      Relection { ... }
+      ...
+    ]
+  }
+  \endqml
+*/
+
+/*!
+  \qmlproperty bool Item::clip
+  This property holds whether clipping is enabled.
+
+  if clipping is enabled, an item will clip its own painting, as well
+  as the painting of its children, to its bounding rectangle.
+
+  Non-rectangular clipping regions are not supported for performance reasons.
+*/
+
+/*!
+  \property QDeclarativeItem::clip
+  This property holds whether clipping is enabled.
+
+  if clipping is enabled, an item will clip its own painting, as well
+  as the painting of its children, to its bounding rectangle.
+
+  Non-rectangular clipping regions are not supported for performance reasons.
+*/
+
+/*!
+  \qmlproperty string Item::state
+
+  This property holds the name of the current state of the item.
+
+  This property is often used in scripts to change between states. For
+  example:
+
+  \qml
+    Script {
+        function toggle() {
+            if (button.state == 'On')
+                button.state = 'Off';
+            else
+                button.state = 'On';
+        }
+    }
+  \endqml
+
+  If the item is in its base state (i.e. no explicit state has been
+  set), \c state will be a blank string. Likewise, you can return an
+  item to its base state by setting its current state to \c ''.
+
+  \sa {qmlstates}{States}
+*/
+
+/*!
+  \property QDeclarativeItem::state
+  \internal
+*/
+
+/*! \internal */
+QString QDeclarativeItem::state() const
+{
+    Q_D(const QDeclarativeItem);
+    if (!d->_stateGroup)
+        return QString();
+    else
+        return d->_stateGroup->state();
+}
+
+/*! \internal */
+void QDeclarativeItem::setState(const QString &state)
+{
+    Q_D(QDeclarativeItem);
+    d->states()->setState(state);
+}
+
+/*!
+  \qmlproperty list<Transform> Item::transform
+  This property holds the list of transformations to apply.
+
+  For more information see \l Transform.
+*/
+
+/*!
+  \property QDeclarativeItem::transform
+  \internal
+*/
+
+/*! \internal */
+QDeclarativeListProperty<QGraphicsTransform> QDeclarativeItem::transform()
+{
+    Q_D(QDeclarativeItem);
+    return QDeclarativeListProperty<QGraphicsTransform>(this, 0, d->transform_append, d->transform_count,
+                                               d->transform_at, d->transform_clear);
+}
+
+/*!
+  \internal
+
+  classBegin() is called when the item is constructed, but its
+  properties have not yet been set.
+
+  \sa componentComplete(), isComponentComplete()
+*/
+void QDeclarativeItem::classBegin()
+{
+    Q_D(QDeclarativeItem);
+    d->_componentComplete = false;
+    if (d->_stateGroup)
+        d->_stateGroup->classBegin();
+    if (d->_anchors)
+        d->_anchors->classBegin();
+}
+
+/*!
+  \internal
+
+  componentComplete() is called when all items in the component
+  have been constructed.  It is often desireable to delay some
+  processing until the component is complete an all bindings in the
+  component have been resolved.
+*/
+void QDeclarativeItem::componentComplete()
+{
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::ItemComponentComplete> cc;
+#endif
+
+    Q_D(QDeclarativeItem);
+    d->_componentComplete = true;
+    if (d->_stateGroup)
+        d->_stateGroup->componentComplete();
+    if (d->_anchors) {
+        d->_anchors->componentComplete();
+        d->_anchors->d_func()->updateOnComplete();
+    }
+    if (d->keyHandler)
+        d->keyHandler->componentComplete();
+}
+
+QDeclarativeStateGroup *QDeclarativeItemPrivate::states()
+{
+    Q_Q(QDeclarativeItem);
+    if (!_stateGroup) {
+        _stateGroup = new QDeclarativeStateGroup;
+        if (!_componentComplete)
+            _stateGroup->classBegin();
+        QObject::connect(_stateGroup, SIGNAL(stateChanged(QString)),
+                         q, SIGNAL(stateChanged(QString)));
+    }
+
+    return _stateGroup;
+}
+
+QDeclarativeItemPrivate::AnchorLines::AnchorLines(QDeclarativeItem *q)
+{
+    left.item = q;
+    left.anchorLine = QDeclarativeAnchorLine::Left;
+    right.item = q;
+    right.anchorLine = QDeclarativeAnchorLine::Right;
+    hCenter.item = q;
+    hCenter.anchorLine = QDeclarativeAnchorLine::HCenter;
+    top.item = q;
+    top.anchorLine = QDeclarativeAnchorLine::Top;
+    bottom.item = q;
+    bottom.anchorLine = QDeclarativeAnchorLine::Bottom;
+    vCenter.item = q;
+    vCenter.anchorLine = QDeclarativeAnchorLine::VCenter;
+    baseline.item = q;
+    baseline.anchorLine = QDeclarativeAnchorLine::Baseline;
+}
+
+QPointF QDeclarativeItemPrivate::computeTransformOrigin() const
+{
+    Q_Q(const QDeclarativeItem);
+
+    QRectF br = q->boundingRect();
+
+    switch(origin) {
+    default:
+    case QDeclarativeItem::TopLeft:
+        return QPointF(0, 0);
+    case QDeclarativeItem::Top:
+        return QPointF(br.width() / 2., 0);
+    case QDeclarativeItem::TopRight:
+        return QPointF(br.width(), 0);
+    case QDeclarativeItem::Left:
+        return QPointF(0, br.height() / 2.);
+    case QDeclarativeItem::Center:
+        return QPointF(br.width() / 2., br.height() / 2.);
+    case QDeclarativeItem::Right:
+        return QPointF(br.width(), br.height() / 2.);
+    case QDeclarativeItem::BottomLeft:
+        return QPointF(0, br.height());
+    case QDeclarativeItem::Bottom:
+        return QPointF(br.width() / 2., br.height());
+    case QDeclarativeItem::BottomRight:
+        return QPointF(br.width(), br.height());
+    }
+}
+
+/*! \internal */
+bool QDeclarativeItem::sceneEvent(QEvent *event)
+{
+    bool rv = QGraphicsItem::sceneEvent(event);
+
+    if (event->type() == QEvent::FocusIn ||
+        event->type() == QEvent::FocusOut) {
+        focusChanged(hasFocus());
+    }
+
+    return rv;
+}
+
+/*! \internal */
+QVariant QDeclarativeItem::itemChange(GraphicsItemChange change,
+                                       const QVariant &value)
+{
+    Q_D(const QDeclarativeItem);
+    switch (change) {
+    case ItemParentHasChanged:
+        emit parentChanged();
+        break;
+    case ItemChildAddedChange:
+    case ItemChildRemovedChange:
+        emit childrenChanged();
+        break;
+    case ItemVisibleHasChanged: {
+            for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
+                const QDeclarativeItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
+                if (change.types & QDeclarativeItemPrivate::Visibility) {
+                    change.listener->itemVisibilityChanged(this);
+                }
+            }
+        }
+        break;
+    case ItemOpacityHasChanged: {
+            for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
+                const QDeclarativeItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
+                if (change.types & QDeclarativeItemPrivate::Opacity) {
+                    change.listener->itemOpacityChanged(this);
+                }
+            }
+        }
+        break;
+    default:
+        break;
+    }
+
+    return QGraphicsItem::itemChange(change, value);
+}
+
+/*! \internal */
+QRectF QDeclarativeItem::boundingRect() const
+{
+    Q_D(const QDeclarativeItem);
+    return QRectF(0, 0, d->width, d->height);
+}
+
+/*!
+    \enum QDeclarativeItem::TransformOrigin
+
+    Controls the point about which simple transforms like scale apply.
+
+    \value TopLeft The top-left corner of the item.
+    \value Top The center point of the top of the item.
+    \value TopRight The top-right corner of the item.
+    \value Left The left most point of the vertical middle.
+    \value Center The center of the item.
+    \value Right The right most point of the vertical middle.
+    \value BottomLeft The bottom-left corner of the item.
+    \value Bottom The center point of the bottom of the item.
+    \value BottomRight The bottom-right corner of the item.
+*/
+
+/*!
+    Returns the current transform origin.
+*/
+QDeclarativeItem::TransformOrigin QDeclarativeItem::transformOrigin() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->origin;
+}
+
+/*!
+    Set the transform \a origin.
+*/
+void QDeclarativeItem::setTransformOrigin(TransformOrigin origin)
+{
+    Q_D(QDeclarativeItem);
+    if (origin != d->origin) {
+        d->origin = origin;
+        QGraphicsItem::setTransformOriginPoint(d->computeTransformOrigin());
+        emit transformOriginChanged(d->origin);
+    }
+}
+
+/*!
+    \property QDeclarativeItem::smooth
+    \brief whether the item is smoothly transformed.
+
+    This property is provided purely for the purpose of optimization. Turning
+    smooth transforms off is faster, but looks worse; turning smooth
+    transformations on is slower, but looks better.
+
+    By default smooth transformations are off.
+*/
+
+/*!
+    Returns true if the item should be drawn with antialiasing and
+    smooth pixmap filtering, false otherwise.
+
+    The default is false.
+
+    \sa setSmooth()
+*/
+bool QDeclarativeItem::smooth() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->smooth;
+}
+
+/*!
+    Sets whether the item should be drawn with antialiasing and
+    smooth pixmap filtering to \a smooth.
+
+    \sa smooth()
+*/
+void QDeclarativeItem::setSmooth(bool smooth)
+{
+    Q_D(QDeclarativeItem);
+    if (d->smooth == smooth)
+        return;
+    d->smooth = smooth;
+    emit smoothChanged();
+    update();
+}
+
+qreal QDeclarativeItem::width() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->width;
+}
+
+void QDeclarativeItem::setWidth(qreal w)
+{
+    Q_D(QDeclarativeItem);
+    if (qIsNaN(w))
+        return;
+
+    d->widthValid = true;
+    if (d->width == w)
+        return;
+
+    qreal oldWidth = d->width;
+
+    prepareGeometryChange();
+    d->width = w;
+    update();
+
+    geometryChanged(QRectF(x(), y(), width(), height()),
+                    QRectF(x(), y(), oldWidth, height()));
+}
+
+void QDeclarativeItem::resetWidth()
+{
+    Q_D(QDeclarativeItem);
+    d->widthValid = false;
+    setImplicitWidth(implicitWidth());
+}
+
+/*!
+    Returns the width of the item that is implied by other properties that determine the content.
+*/
+qreal QDeclarativeItem::implicitWidth() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->implicitWidth;
+}
+
+/*!
+    Sets the implied width of the item to \a w.
+    This is the width implied by other properties that determine the content.
+*/
+void QDeclarativeItem::setImplicitWidth(qreal w)
+{
+    Q_D(QDeclarativeItem);
+    d->implicitWidth = w;
+    if (d->width == w || widthValid())
+        return;
+
+    qreal oldWidth = d->width;
+
+    prepareGeometryChange();
+    d->width = w;
+    update();
+
+    geometryChanged(QRectF(x(), y(), width(), height()),
+                    QRectF(x(), y(), oldWidth, height()));
+}
+
+/*!
+    Returns whether the width property has been set explicitly.
+*/
+bool QDeclarativeItem::widthValid() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->widthValid;
+}
+
+qreal QDeclarativeItem::height() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->height;
+}
+
+void QDeclarativeItem::setHeight(qreal h)
+{
+    Q_D(QDeclarativeItem);
+    if (qIsNaN(h))
+        return;
+
+    d->heightValid = true;
+    if (d->height == h)
+        return;
+
+    qreal oldHeight = d->height;
+
+    prepareGeometryChange();
+    d->height = h;
+    update();
+
+    geometryChanged(QRectF(x(), y(), width(), height()),
+                    QRectF(x(), y(), width(), oldHeight));
+}
+
+void QDeclarativeItem::resetHeight()
+{
+    Q_D(QDeclarativeItem);
+    d->heightValid = false;
+    setImplicitHeight(implicitHeight());
+}
+
+/*!
+    Returns the height of the item that is implied by other properties that determine the content.
+*/
+qreal QDeclarativeItem::implicitHeight() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->implicitHeight;
+}
+
+/*!
+    Sets the implied height of the item to \a h.
+    This is the height implied by other properties that determine the content.
+*/
+void QDeclarativeItem::setImplicitHeight(qreal h)
+{
+    Q_D(QDeclarativeItem);
+    d->implicitHeight = h;
+    if (d->height == h || heightValid())
+        return;
+
+    qreal oldHeight = d->height;
+
+    prepareGeometryChange();
+    d->height = h;
+    update();
+
+    geometryChanged(QRectF(x(), y(), width(), height()),
+                    QRectF(x(), y(), width(), oldHeight));
+}
+
+/*!
+    Returns whether the height property has been set explicitly.
+*/
+bool QDeclarativeItem::heightValid() const
+{
+    Q_D(const QDeclarativeItem);
+    return d->heightValid;
+}
+
+/*!
+  \qmlproperty bool Item::wantsFocus
+
+  This property indicates whether the item has has an active focus request.
+
+  \sa {qmlfocus}{Keyboard Focus}
+*/
+
+/*! \internal */
+bool QDeclarativeItem::wantsFocus() const
+{
+    return focusItem() != 0;
+}
+
+/*!
+  \qmlproperty bool Item::focus
+  This property indicates whether the item has keyboard input focus. Set this
+  property to true to request focus.
+
+  \sa {qmlfocus}{Keyboard Focus}
+*/
+
+/*! \internal */
+bool QDeclarativeItem::hasFocus() const
+{
+    return QGraphicsItem::hasFocus();
+}
+
+/*! \internal */
+void QDeclarativeItem::setFocus(bool focus)
+{
+    if (focus)
+        QGraphicsItem::setFocus(Qt::OtherFocusReason);
+    else
+        QGraphicsItem::clearFocus();
+}
+
+/*!
+    \reimp
+    \internal
+*/
+void QDeclarativeItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
+{
+}
+
+/*!
+    \reimp
+    \internal
+*/
+bool QDeclarativeItem::event(QEvent *ev)
+{
+    return QGraphicsObject::event(ev);
+}
+
+QDebug operator<<(QDebug debug, QDeclarativeItem *item)
+{
+    if (!item) {
+        debug << "QDeclarativeItem(0)";
+        return debug;
+    }
+
+    debug << item->metaObject()->className() << "(this =" << ((void*)item)
+          << ", parent =" << ((void*)item->parentItem())
+          << ", geometry =" << QRectF(item->pos(), QSizeF(item->width(), item->height()))
+          << ", z =" << item->zValue() << ')';
+    return debug;
+}
+
+int QDeclarativeItemPrivate::consistentTime = -1;
+void QDeclarativeItemPrivate::setConsistentTime(int t)
+{
+    consistentTime = t;
+}
+
+QTime QDeclarativeItemPrivate::currentTime()
+{
+    if (consistentTime == -1)
+        return QTime::currentTime();
+    else
+        return QTime(0, 0).addMSecs(consistentTime);
+}
+
+void QDeclarativeItemPrivate::start(QTime &t)
+{
+    t = currentTime();
+}
+
+int QDeclarativeItemPrivate::elapsed(QTime &t)
+{
+    int n = t.msecsTo(currentTime());
+    if (n < 0)                                // passed midnight
+        n += 86400 * 1000;
+    return n;
+}
+
+int QDeclarativeItemPrivate::restart(QTime &t)
+{
+    QTime time = currentTime();
+    int n = t.msecsTo(time);
+    if (n < 0)                                // passed midnight
+        n += 86400*1000;
+    t = time;
+    return n;
+}
+
+QT_END_NAMESPACE
+
+#include <moc_qdeclarativeitem.cpp>
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h
new file mode 100644
index 0000000..3ae404d
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeitem.h
@@ -0,0 +1,243 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEITEM_H
+#define QDECLARATIVEITEM_H
+
+#include <qdeclarative.h>
+#include <qdeclarativecomponent.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QList>
+#include <QtGui/qgraphicsitem.h>
+#include <QtGui/qgraphicstransform.h>
+#include <QtGui/qfont.h>
+#include <QtGui/qaction.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeState;
+class QDeclarativeAnchorLine;
+class QDeclarativeTransition;
+class QDeclarativeKeyEvent;
+class QDeclarativeAnchors;
+class QDeclarativeItemPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativeParserStatus)
+
+    Q_PROPERTY(QDeclarativeItem * parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> data READ data DESIGNABLE false)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeItem> children READ fxChildren DESIGNABLE false NOTIFY childrenChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> resources READ resources DESIGNABLE false)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeState> states READ states DESIGNABLE false)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeTransition> transitions READ transitions DESIGNABLE false)
+    Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
+    Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged RESET resetWidth FINAL)
+    Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY heightChanged RESET resetHeight FINAL)
+    Q_PROPERTY(QRectF childrenRect READ childrenRect NOTIFY childrenRectChanged DESIGNABLE false FINAL)
+    Q_PROPERTY(QDeclarativeAnchors * anchors READ anchors DESIGNABLE false CONSTANT FINAL)
+    Q_PROPERTY(QDeclarativeAnchorLine left READ left CONSTANT FINAL)
+    Q_PROPERTY(QDeclarativeAnchorLine right READ right CONSTANT FINAL)
+    Q_PROPERTY(QDeclarativeAnchorLine horizontalCenter READ horizontalCenter CONSTANT FINAL)
+    Q_PROPERTY(QDeclarativeAnchorLine top READ top CONSTANT FINAL)
+    Q_PROPERTY(QDeclarativeAnchorLine bottom READ bottom CONSTANT FINAL)
+    Q_PROPERTY(QDeclarativeAnchorLine verticalCenter READ verticalCenter CONSTANT FINAL)
+    Q_PROPERTY(QDeclarativeAnchorLine baseline READ baseline CONSTANT FINAL)
+    Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged)
+    Q_PROPERTY(bool clip READ clip WRITE setClip NOTIFY clipChanged) // ### move to QGI/QGO, NOTIFY
+    Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged FINAL)
+    Q_PROPERTY(bool wantsFocus READ wantsFocus NOTIFY wantsFocusChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QGraphicsTransform> transform READ transform DESIGNABLE false FINAL)
+    Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin NOTIFY transformOriginChanged)
+    Q_PROPERTY(bool smooth READ smooth WRITE setSmooth NOTIFY smoothChanged)
+    Q_PROPERTY(QGraphicsEffect *effect READ graphicsEffect WRITE setGraphicsEffect)
+    Q_ENUMS(TransformOrigin)
+    Q_CLASSINFO("DefaultProperty", "data")
+
+public:
+    enum TransformOrigin {
+        TopLeft, Top, TopRight,
+        Left, Center, Right,
+        BottomLeft, Bottom, BottomRight
+    };
+
+    QDeclarativeItem(QDeclarativeItem *parent = 0);
+    virtual ~QDeclarativeItem();
+
+    QDeclarativeItem *parentItem() const;
+    void setParentItem(QDeclarativeItem *parent);
+    void setParent(QDeclarativeItem *parent) { setParentItem(parent); }
+
+    QDeclarativeListProperty<QObject> data();
+    QDeclarativeListProperty<QDeclarativeItem> fxChildren();
+    QDeclarativeListProperty<QObject> resources();
+
+    QDeclarativeAnchors *anchors();
+    QRectF childrenRect();
+
+    bool clip() const;
+    void setClip(bool);
+
+    QDeclarativeListProperty<QDeclarativeState> states();
+    QDeclarativeListProperty<QDeclarativeTransition> transitions();
+
+    QString state() const;
+    void setState(const QString &);
+
+    qreal baselineOffset() const;
+    void setBaselineOffset(qreal);
+
+    QDeclarativeListProperty<QGraphicsTransform> transform();
+
+    qreal width() const;
+    void setWidth(qreal);
+    void resetWidth();
+    qreal implicitWidth() const;
+
+    qreal height() const;
+    void setHeight(qreal);
+    void resetHeight();
+    qreal implicitHeight() const;
+
+    TransformOrigin transformOrigin() const;
+    void setTransformOrigin(TransformOrigin);
+
+    bool smooth() const;
+    void setSmooth(bool);
+
+    QRectF boundingRect() const;
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+
+    bool wantsFocus() const;
+    bool hasFocus() const;
+    void setFocus(bool);
+
+    bool keepMouseGrab() const;
+    void setKeepMouseGrab(bool);
+
+    QDeclarativeAnchorLine left() const;
+    QDeclarativeAnchorLine right() const;
+    QDeclarativeAnchorLine horizontalCenter() const;
+    QDeclarativeAnchorLine top() const;
+    QDeclarativeAnchorLine bottom() const;
+    QDeclarativeAnchorLine verticalCenter() const;
+    QDeclarativeAnchorLine baseline() const;
+
+Q_SIGNALS:
+    void widthChanged();
+    void heightChanged();
+    void childrenChanged();
+    void childrenRectChanged();
+    void baselineOffsetChanged();
+    void stateChanged(const QString &);
+    void focusChanged();
+    void wantsFocusChanged();
+    void parentChanged();
+    void transformOriginChanged(TransformOrigin);
+    void smoothChanged();
+    void clipChanged();
+
+protected:
+    bool isComponentComplete() const;
+    virtual bool sceneEvent(QEvent *);
+    virtual bool event(QEvent *);
+    virtual QVariant itemChange(GraphicsItemChange, const QVariant &);
+
+    void setImplicitWidth(qreal);
+    bool widthValid() const; // ### better name?
+    void setImplicitHeight(qreal);
+    bool heightValid() const; // ### better name?
+
+    virtual void classBegin();
+    virtual void componentComplete();
+    virtual void focusChanged(bool);
+    virtual void keyPressEvent(QKeyEvent *event);
+    virtual void keyReleaseEvent(QKeyEvent *event);
+    virtual void inputMethodEvent(QInputMethodEvent *);
+    virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
+    virtual void geometryChanged(const QRectF &newGeometry,
+                                 const QRectF &oldGeometry);
+
+protected:
+    QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = 0);
+
+private:
+    friend class QDeclarativeStatePrivate;
+    friend class QDeclarativeAnchors;
+    Q_DISABLE_COPY(QDeclarativeItem)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeItem)
+};
+
+template<typename T>
+        T qobject_cast(QGraphicsObject *o)
+{
+    QObject *obj = o;
+    return qobject_cast<T>(obj);
+}
+
+// ### move to QGO
+template<typename T>
+T qobject_cast(QGraphicsItem *item)
+{
+    if (!item) return 0;
+    QObject *o = item->toGraphicsObject();
+    return qobject_cast<T>(o);
+}
+
+QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QDeclarativeItem *item);
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeItem)
+QML_DECLARE_TYPE(QGraphicsTransform)
+QML_DECLARE_TYPE(QGraphicsScale)
+QML_DECLARE_TYPE(QGraphicsRotation)
+QML_DECLARE_TYPE(QAction)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEITEM_H
diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h
new file mode 100644
index 0000000..81c5688
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h
@@ -0,0 +1,471 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEITEM_P_H
+#define QDECLARATIVEITEM_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeitem.h"
+
+#include "qdeclarativeanchors_p.h"
+#include "qdeclarativeanchors_p_p.h"
+#include "qdeclarativeitemchangelistener_p.h"
+#include <private/qpodvector_p.h>
+
+#include "../util/qdeclarativestate_p.h"
+#include "../util/qdeclarativenullablevalue_p_p.h"
+#include <qdeclarative.h>
+#include <qdeclarativecontext.h>
+
+#include <QtCore/qlist.h>
+#include <QtCore/qdebug.h>
+
+#include <private/qgraphicsitem_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QNetworkReply;
+class QDeclarativeItemKeyFilter;
+
+//### merge into private?
+class QDeclarativeContents : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeContents();
+
+    QRectF rectF() const;
+
+    void setItem(QDeclarativeItem *item);
+
+public Q_SLOTS:
+    void calcHeight();
+    void calcWidth();
+
+Q_SIGNALS:
+    void rectChanged();
+
+private:
+    QDeclarativeItem *m_item;
+    qreal m_x;
+    qreal m_y;
+    qreal m_width;
+    qreal m_height;
+};
+
+class QDeclarativeItemPrivate : public QGraphicsItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeItem)
+
+public:
+    QDeclarativeItemPrivate()
+    : _anchors(0), _contents(0),
+      _baselineOffset(0),
+      _anchorLines(0),
+      _stateGroup(0), origin(QDeclarativeItem::Center),
+      widthValid(false), heightValid(false),
+      _componentComplete(true), _keepMouse(false),
+      smooth(false), keyHandler(0),
+      width(0), height(0), implicitWidth(0), implicitHeight(0)
+    {
+        QGraphicsItemPrivate::acceptedMouseButtons = 0;
+        QGraphicsItemPrivate::flags = QGraphicsItem::GraphicsItemFlags(
+                                      QGraphicsItem::ItemHasNoContents
+                                      | QGraphicsItem::ItemIsFocusable
+                                      | QGraphicsItem::ItemNegativeZStacksBehindParent);
+
+    }
+
+    void init(QDeclarativeItem *parent)
+    {
+        Q_Q(QDeclarativeItem);
+
+        if (parent)
+            q->setParentItem(parent);
+        _baselineOffset.invalidate();
+        mouseSetsFocus = false;
+    }
+
+    QString _id;
+
+    // data property
+    static void data_append(QDeclarativeListProperty<QObject> *, QObject *);
+
+    // resources property
+    static QObject *resources_at(QDeclarativeListProperty<QObject> *, int);
+    static void resources_append(QDeclarativeListProperty<QObject> *, QObject *);
+    static int resources_count(QDeclarativeListProperty<QObject> *);
+
+    // children property
+    static QDeclarativeItem *children_at(QDeclarativeListProperty<QDeclarativeItem> *, int);
+    static void children_append(QDeclarativeListProperty<QDeclarativeItem> *, QDeclarativeItem *);
+    static int children_count(QDeclarativeListProperty<QDeclarativeItem> *);
+
+    // transform property
+    static int transform_count(QDeclarativeListProperty<QGraphicsTransform> *list);
+    static void transform_append(QDeclarativeListProperty<QGraphicsTransform> *list, QGraphicsTransform *);
+    static QGraphicsTransform *transform_at(QDeclarativeListProperty<QGraphicsTransform> *list, int);
+    static void transform_clear(QDeclarativeListProperty<QGraphicsTransform> *list);
+
+    QDeclarativeAnchors *anchors() {
+        if (!_anchors) {
+            Q_Q(QDeclarativeItem);
+            _anchors = new QDeclarativeAnchors(q);
+            if (!_componentComplete)
+                _anchors->classBegin();
+        }
+        return _anchors;
+    }
+    QDeclarativeAnchors *_anchors;
+    QDeclarativeContents *_contents;
+
+    QDeclarativeNullableValue<qreal> _baselineOffset;
+
+    struct AnchorLines {
+        AnchorLines(QDeclarativeItem *);
+        QDeclarativeAnchorLine left;
+        QDeclarativeAnchorLine right;
+        QDeclarativeAnchorLine hCenter;
+        QDeclarativeAnchorLine top;
+        QDeclarativeAnchorLine bottom;
+        QDeclarativeAnchorLine vCenter;
+        QDeclarativeAnchorLine baseline;
+    };
+    mutable AnchorLines *_anchorLines;
+    AnchorLines *anchorLines() const {
+        Q_Q(const QDeclarativeItem);
+        if (!_anchorLines) _anchorLines =
+            new AnchorLines(const_cast<QDeclarativeItem *>(q));
+        return _anchorLines;
+    }
+
+    enum ChangeType {
+        Geometry = 0x01,
+        SiblingOrder = 0x02,
+        Visibility = 0x04,
+        Opacity = 0x08,
+        Destroyed = 0x10
+    };
+
+    Q_DECLARE_FLAGS(ChangeTypes, ChangeType)
+
+    struct ChangeListener {
+        ChangeListener(QDeclarativeItemChangeListener *l, QDeclarativeItemPrivate::ChangeTypes t) : listener(l), types(t) {}
+        QDeclarativeItemChangeListener *listener;
+        QDeclarativeItemPrivate::ChangeTypes types;
+        bool operator==(const ChangeListener &other) const { return listener == other.listener && types == other.types; }
+    };
+
+    void addItemChangeListener(QDeclarativeItemChangeListener *listener, ChangeTypes types) {
+        changeListeners.append(ChangeListener(listener, types));
+    }
+    void removeItemChangeListener(QDeclarativeItemChangeListener *, ChangeTypes types);
+    QPODVector<ChangeListener,4> changeListeners;
+
+    QDeclarativeStateGroup *states();
+    QDeclarativeStateGroup *_stateGroup;
+
+    QDeclarativeItem::TransformOrigin origin:4;
+    bool widthValid:1;
+    bool heightValid:1;
+    bool _componentComplete:1;
+    bool _keepMouse:1;
+    bool smooth:1;
+
+    QDeclarativeItemKeyFilter *keyHandler;
+
+    qreal width;
+    qreal height;
+    qreal implicitWidth;
+    qreal implicitHeight;
+
+    QPointF computeTransformOrigin() const;
+
+    virtual void setPosHelper(const QPointF &pos)
+    {
+        Q_Q(QDeclarativeItem);
+        QRectF oldGeometry(this->pos.x(), this->pos.y(), width, height);
+        QGraphicsItemPrivate::setPosHelper(pos);
+        q->geometryChanged(QRectF(this->pos.x(), this->pos.y(), width, height), oldGeometry);
+    }
+
+    // Reimplemented from QGraphicsItemPrivate
+    virtual void subFocusItemChange()
+    {
+        emit q_func()->wantsFocusChanged();
+    }
+
+    // Reimplemented from QGraphicsItemPrivate
+    virtual void siblingOrderChange()
+    {
+        Q_Q(QDeclarativeItem);
+        for(int ii = 0; ii < changeListeners.count(); ++ii) {
+            const QDeclarativeItemPrivate::ChangeListener &change = changeListeners.at(ii);
+            if (change.types & QDeclarativeItemPrivate::SiblingOrder) {
+                change.listener->itemSiblingOrderChanged(q);
+            }
+        }
+    }
+
+    static int consistentTime;
+    static QTime currentTime();
+    static void Q_DECLARATIVE_EXPORT setConsistentTime(int t);
+    static void start(QTime &);
+    static int elapsed(QTime &);
+    static int restart(QTime &);
+};
+
+/*
+    Key filters can be installed on a QDeclarativeItem, but not removed.  Currently they
+    are only used by attached objects (which are only destroyed on Item
+    destruction), so this isn't a problem.  If in future this becomes any form
+    of public API, they will have to support removal too.
+*/
+class QDeclarativeItemKeyFilter
+{
+public:
+    QDeclarativeItemKeyFilter(QDeclarativeItem * = 0);
+    virtual ~QDeclarativeItemKeyFilter();
+
+    virtual void keyPressed(QKeyEvent *event);
+    virtual void keyReleased(QKeyEvent *event);
+    virtual void inputMethodEvent(QInputMethodEvent *event);
+    virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
+    virtual void componentComplete();
+
+private:
+    QDeclarativeItemKeyFilter *m_next;
+};
+
+class QDeclarativeKeyNavigationAttachedPrivate : public QObjectPrivate
+{
+public:
+    QDeclarativeKeyNavigationAttachedPrivate()
+        : QObjectPrivate(), left(0), right(0), up(0), down(0) {}
+
+    QDeclarativeItem *left;
+    QDeclarativeItem *right;
+    QDeclarativeItem *up;
+    QDeclarativeItem *down;
+};
+
+class QDeclarativeKeyNavigationAttached : public QObject, public QDeclarativeItemKeyFilter
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeKeyNavigationAttached)
+
+    Q_PROPERTY(QDeclarativeItem *left READ left WRITE setLeft NOTIFY changed)
+    Q_PROPERTY(QDeclarativeItem *right READ right WRITE setRight NOTIFY changed)
+    Q_PROPERTY(QDeclarativeItem *up READ up WRITE setUp NOTIFY changed)
+    Q_PROPERTY(QDeclarativeItem *down READ down WRITE setDown NOTIFY changed)
+public:
+    QDeclarativeKeyNavigationAttached(QObject * = 0);
+
+    QDeclarativeItem *left() const;
+    void setLeft(QDeclarativeItem *);
+    QDeclarativeItem *right() const;
+    void setRight(QDeclarativeItem *);
+    QDeclarativeItem *up() const;
+    void setUp(QDeclarativeItem *);
+    QDeclarativeItem *down() const;
+    void setDown(QDeclarativeItem *);
+
+    static QDeclarativeKeyNavigationAttached *qmlAttachedProperties(QObject *);
+
+Q_SIGNALS:
+    void changed();
+
+private:
+    virtual void keyPressed(QKeyEvent *event);
+    virtual void keyReleased(QKeyEvent *event);
+};
+
+class QDeclarativeKeysAttachedPrivate : public QObjectPrivate
+{
+public:
+    QDeclarativeKeysAttachedPrivate()
+        : QObjectPrivate(), inPress(false), inRelease(false)
+        , inIM(false), enabled(true), imeItem(0), item(0)
+    {}
+
+    bool isConnected(const char *signalName);
+
+    QGraphicsItem *finalFocusProxy(QGraphicsItem *item) const
+    {
+        QGraphicsItem *fp;
+        while ((fp = item->focusProxy()))
+            item = fp;
+        return item;
+    }
+
+    //loop detection
+    bool inPress:1;
+    bool inRelease:1;
+    bool inIM:1;
+
+    bool enabled : 1;
+
+    QGraphicsItem *imeItem;
+    QList<QDeclarativeItem *> targets;
+    QDeclarativeItem *item;
+};
+
+class QDeclarativeKeysAttached : public QObject, public QDeclarativeItemKeyFilter
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeKeysAttached)
+
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeItem> forwardTo READ forwardTo)
+
+public:
+    QDeclarativeKeysAttached(QObject *parent=0);
+    ~QDeclarativeKeysAttached();
+
+    bool enabled() const { Q_D(const QDeclarativeKeysAttached); return d->enabled; }
+    void setEnabled(bool enabled) {
+        Q_D(QDeclarativeKeysAttached);
+        if (enabled != d->enabled) {
+            d->enabled = enabled;
+            emit enabledChanged();
+        }
+    }
+
+    QDeclarativeListProperty<QDeclarativeItem> forwardTo() {
+        Q_D(QDeclarativeKeysAttached);
+        return QDeclarativeListProperty<QDeclarativeItem>(this, d->targets);
+    }
+
+    virtual void componentComplete();
+
+    static QDeclarativeKeysAttached *qmlAttachedProperties(QObject *);
+
+Q_SIGNALS:
+    void enabledChanged();
+    void pressed(QDeclarativeKeyEvent *event);
+    void released(QDeclarativeKeyEvent *event);
+    void digit0Pressed(QDeclarativeKeyEvent *event);
+    void digit1Pressed(QDeclarativeKeyEvent *event);
+    void digit2Pressed(QDeclarativeKeyEvent *event);
+    void digit3Pressed(QDeclarativeKeyEvent *event);
+    void digit4Pressed(QDeclarativeKeyEvent *event);
+    void digit5Pressed(QDeclarativeKeyEvent *event);
+    void digit6Pressed(QDeclarativeKeyEvent *event);
+    void digit7Pressed(QDeclarativeKeyEvent *event);
+    void digit8Pressed(QDeclarativeKeyEvent *event);
+    void digit9Pressed(QDeclarativeKeyEvent *event);
+
+    void leftPressed(QDeclarativeKeyEvent *event);
+    void rightPressed(QDeclarativeKeyEvent *event);
+    void upPressed(QDeclarativeKeyEvent *event);
+    void downPressed(QDeclarativeKeyEvent *event);
+
+    void asteriskPressed(QDeclarativeKeyEvent *event);
+    void numberSignPressed(QDeclarativeKeyEvent *event);
+    void escapePressed(QDeclarativeKeyEvent *event);
+    void returnPressed(QDeclarativeKeyEvent *event);
+    void enterPressed(QDeclarativeKeyEvent *event);
+    void deletePressed(QDeclarativeKeyEvent *event);
+    void spacePressed(QDeclarativeKeyEvent *event);
+    void backPressed(QDeclarativeKeyEvent *event);
+    void cancelPressed(QDeclarativeKeyEvent *event);
+    void selectPressed(QDeclarativeKeyEvent *event);
+    void yesPressed(QDeclarativeKeyEvent *event);
+    void noPressed(QDeclarativeKeyEvent *event);
+    void context1Pressed(QDeclarativeKeyEvent *event);
+    void context2Pressed(QDeclarativeKeyEvent *event);
+    void context3Pressed(QDeclarativeKeyEvent *event);
+    void context4Pressed(QDeclarativeKeyEvent *event);
+    void callPressed(QDeclarativeKeyEvent *event);
+    void hangupPressed(QDeclarativeKeyEvent *event);
+    void flipPressed(QDeclarativeKeyEvent *event);
+    void menuPressed(QDeclarativeKeyEvent *event);
+    void volumeUpPressed(QDeclarativeKeyEvent *event);
+    void volumeDownPressed(QDeclarativeKeyEvent *event);
+
+private:
+    virtual void keyPressed(QKeyEvent *event);
+    virtual void keyReleased(QKeyEvent *event);
+    virtual void inputMethodEvent(QInputMethodEvent *);
+    virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
+
+    const QByteArray keyToSignal(int key) {
+        QByteArray keySignal;
+        if (key >= Qt::Key_0 && key <= Qt::Key_9) {
+            keySignal = "digit0Pressed";
+            keySignal[5] = '0' + (key - Qt::Key_0);
+        } else {
+            int i = 0;
+            while (sigMap[i].key && sigMap[i].key != key)
+                ++i;
+            keySignal = sigMap[i].sig;
+        }
+        return keySignal;
+    }
+
+    struct SigMap {
+        int key;
+        const char *sig;
+    };
+
+    static const SigMap sigMap[];
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeItemPrivate::ChangeTypes);
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeKeysAttached)
+QML_DECLARE_TYPEINFO(QDeclarativeKeysAttached, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QDeclarativeKeyNavigationAttached)
+QML_DECLARE_TYPEINFO(QDeclarativeKeyNavigationAttached, QML_HAS_ATTACHED_PROPERTIES)
+
+#endif // QDECLARATIVEITEM_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h b/src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h
new file mode 100644
index 0000000..4da3bf7
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEITEMCHANGELISTENER
+#define QDECLARATIVEITEMCHANGELISTENER
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QRectF;
+class QDeclarativeItem;
+class QDeclarativeAnchorsPrivate;
+class QDeclarativeItemChangeListener
+{
+public:
+    virtual void itemGeometryChanged(QDeclarativeItem *, const QRectF &, const QRectF &) {}
+    virtual void itemSiblingOrderChanged(QDeclarativeItem *) {}
+    virtual void itemVisibilityChanged(QDeclarativeItem *) {}
+    virtual void itemOpacityChanged(QDeclarativeItem *) {}
+    virtual void itemDestroyed(QDeclarativeItem *) {}
+    virtual QDeclarativeAnchorsPrivate *anchorPrivate() { return 0; }
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEITEMCHANGELISTENER
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
new file mode 100644
index 0000000..f3b9385
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeitemsmodule_p.h"
+
+#include <QtGui/qaction.h>
+#include <QtGui/qvalidator.h>
+#include <QtGui/qgraphicseffect.h>
+
+#include "qdeclarativeevents_p_p.h"
+#include "qdeclarativeeffects_p.h"
+#include "qdeclarativescalegrid_p_p.h"
+#include "qdeclarativeanimatedimage_p.h"
+#include "qdeclarativeborderimage_p.h"
+#include "qdeclarativepositioners_p.h"
+#include "qdeclarativemousearea_p.h"
+#include "qdeclarativeflickable_p.h"
+#include "qdeclarativeflickable_p_p.h"
+#include "qdeclarativeflipable_p.h"
+#include "qdeclarativefocuspanel_p.h"
+#include "qdeclarativefocusscope_p.h"
+#include "qdeclarativegraphicsobjectcontainer_p.h"
+#include "qdeclarativegridview_p.h"
+#include "qdeclarativeimage_p.h"
+#include "qdeclarativeitem_p.h"
+#include "qdeclarativelayoutitem_p.h"
+#include "qdeclarativelistview_p.h"
+#include "qdeclarativeloader_p.h"
+#include "qdeclarativemousearea_p.h"
+#include "qdeclarativeparticles_p.h"
+#include "qdeclarativepath_p.h"
+#include "qdeclarativepathview_p.h"
+#include "qdeclarativerectangle_p.h"
+#include "qdeclarativerepeater_p.h"
+#include "qdeclarativetext_p.h"
+#include "qdeclarativetextedit_p.h"
+#include "qdeclarativetextinput_p.h"
+#include "qdeclarativevisualitemmodel_p.h"
+#ifdef QT_WEBKIT_LIB
+#include "qdeclarativewebview_p.h"
+#include "qdeclarativewebview_p_p.h"
+#endif
+#include "qdeclarativeanchors_p.h"
+
+void QDeclarativeItemModule::defineModule()
+{
+    QML_REGISTER_TYPE(Qt,4,6,AnimatedImage,QDeclarativeAnimatedImage);
+    QML_REGISTER_TYPE(Qt,4,6,Blur,QGraphicsBlurEffect);
+    QML_REGISTER_TYPE(Qt,4,6,BorderImage,QDeclarativeBorderImage);
+    QML_REGISTER_TYPE(Qt,4,6,Colorize,QGraphicsColorizeEffect);
+    QML_REGISTER_TYPE(Qt,4,6,Column,QDeclarativeColumn);
+    QML_REGISTER_TYPE(Qt,4,6,Drag,QDeclarativeDrag);
+    QML_REGISTER_TYPE(Qt,4,6,DropShadow,QGraphicsDropShadowEffect);
+    QML_REGISTER_TYPE(Qt,4,6,Flickable,QDeclarativeFlickable);
+    QML_REGISTER_TYPE(Qt,4,6,Flipable,QDeclarativeFlipable);
+    QML_REGISTER_TYPE(Qt,4,6,Flow,QDeclarativeFlow);
+    QML_REGISTER_TYPE(Qt,4,6,FocusPanel,QDeclarativeFocusPanel);
+    QML_REGISTER_TYPE(Qt,4,6,FocusScope,QDeclarativeFocusScope);
+    QML_REGISTER_TYPE(Qt,4,6,Gradient,QDeclarativeGradient);
+    QML_REGISTER_TYPE(Qt,4,6,GradientStop,QDeclarativeGradientStop);
+    QML_REGISTER_TYPE(Qt,4,6,GraphicsObjectContainer,QDeclarativeGraphicsObjectContainer);
+    QML_REGISTER_TYPE(Qt,4,6,Grid,QDeclarativeGrid);
+    QML_REGISTER_TYPE(Qt,4,6,GridView,QDeclarativeGridView);
+    QML_REGISTER_TYPE(Qt,4,6,Image,QDeclarativeImage);
+    QML_REGISTER_TYPE(Qt,4,6,Item,QDeclarativeItem);
+    QML_REGISTER_TYPE(Qt,4,6,KeyNavigation,QDeclarativeKeyNavigationAttached);
+    QML_REGISTER_TYPE(Qt,4,6,Keys,QDeclarativeKeysAttached);
+    QML_REGISTER_TYPE(Qt,4,6,LayoutItem,QDeclarativeLayoutItem);
+    QML_REGISTER_TYPE(Qt,4,6,ListView,QDeclarativeListView);
+    QML_REGISTER_TYPE(Qt,4,6,Loader,QDeclarativeLoader);
+    QML_REGISTER_TYPE(Qt,4,6,MouseRegion,QDeclarativeMouseArea);
+    QML_REGISTER_TYPE(Qt,4,6,MouseArea,QDeclarativeMouseArea);
+    QML_REGISTER_TYPE(Qt,4,6,Opacity,QGraphicsOpacityEffect);
+    QML_REGISTER_TYPE(Qt,4,6,ParticleMotion,QDeclarativeParticleMotion);
+    QML_REGISTER_TYPE(Qt,4,6,ParticleMotionGravity,QDeclarativeParticleMotionGravity);
+    QML_REGISTER_TYPE(Qt,4,6,ParticleMotionLinear,QDeclarativeParticleMotionLinear);
+    QML_REGISTER_TYPE(Qt,4,6,ParticleMotionWander,QDeclarativeParticleMotionWander);
+    QML_REGISTER_TYPE(Qt,4,6,Particles,QDeclarativeParticles);
+    QML_REGISTER_TYPE(Qt,4,6,Path,QDeclarativePath);
+    QML_REGISTER_TYPE(Qt,4,6,PathAttribute,QDeclarativePathAttribute);
+    QML_REGISTER_TYPE(Qt,4,6,PathCubic,QDeclarativePathCubic);
+    QML_REGISTER_TYPE(Qt,4,6,PathLine,QDeclarativePathLine);
+    QML_REGISTER_TYPE(Qt,4,6,PathPercent,QDeclarativePathPercent);
+    QML_REGISTER_TYPE(Qt,4,6,PathQuad,QDeclarativePathQuad);
+    QML_REGISTER_TYPE(Qt,4,6,PathView,QDeclarativePathView);
+    QML_REGISTER_TYPE(Qt,4,6,Pen,QDeclarativePen);
+    QML_REGISTER_TYPE(Qt,4,6,QIntValidator,QIntValidator);
+#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
+    QML_REGISTER_TYPE(Qt,4,7,QDoubleValidator,QDoubleValidator);
+    QML_REGISTER_TYPE(Qt,4,7,QRegExpValidator,QRegExpValidator);
+#endif
+    QML_REGISTER_TYPE(Qt,4,6,Rectangle,QDeclarativeRectangle);
+    QML_REGISTER_TYPE(Qt,4,6,Repeater,QDeclarativeRepeater);
+    QML_REGISTER_TYPE(Qt,4,6,Rotation,QGraphicsRotation);
+    QML_REGISTER_TYPE(Qt,4,6,Row,QDeclarativeRow);
+    QML_REGISTER_TYPE(Qt,4,6,Scale,QGraphicsScale);
+    QML_REGISTER_TYPE(Qt,4,6,Text,QDeclarativeText);
+    QML_REGISTER_TYPE(Qt,4,6,TextEdit,QDeclarativeTextEdit);
+    QML_REGISTER_TYPE(Qt,4,6,TextInput,QDeclarativeTextInput);
+    QML_REGISTER_TYPE(Qt,4,6,ViewSection,QDeclarativeViewSection);
+    QML_REGISTER_TYPE(Qt,4,6,VisibleArea,QDeclarativeFlickableVisibleArea);
+    QML_REGISTER_TYPE(Qt,4,6,VisualDataModel,QDeclarativeVisualDataModel);
+    QML_REGISTER_TYPE(Qt,4,6,VisualItemModel,QDeclarativeVisualItemModel);
+#ifdef QT_WEBKIT_LIB
+    QML_REGISTER_TYPE(Qt,4,6,WebView,QDeclarativeWebView);
+#endif
+
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeAnchors);
+    QML_REGISTER_NOCREATE_TYPE(QGraphicsEffect);
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeKeyEvent);
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeMouseEvent);
+    QML_REGISTER_NOCREATE_TYPE(QGraphicsObject);
+    QML_REGISTER_NOCREATE_TYPE(QGraphicsTransform);
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativePathElement);
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeCurve);
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeScaleGrid);
+    QML_REGISTER_NOCREATE_TYPE(QValidator);
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeVisualModel);
+    QML_REGISTER_NOCREATE_TYPE(QAction);
+#ifdef QT_WEBKIT_LIB
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeWebSettings);
+#endif
+}
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h b/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h
new file mode 100644
index 0000000..5c49040
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEITEMMODULE_H
+#define QDECLARATIVEITEMMODULE_H
+
+#include <qdeclarative.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeItemModule
+{
+public:
+    static void defineModule();
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEITEMMODULE_H
diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
new file mode 100644
index 0000000..a23ea65
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativelayoutitem_p.h"
+
+#include <QDebug>
+
+#include <limits.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass LayoutItem QDeclarativeLayoutItem
+    \since 4.7
+    \brief The LayoutItem element allows you to place your Fluid UI elements inside a classical Qt layout.
+
+    LayoutItem is a variant of Item with a couple of additional properties. These properties provide the size hints
+    needed for items to work in conjunction with Qt Layouts. The Qt Layout will resize the LayoutItem as appropriate,
+    taking its size hints into account, and you can propagate this to the other elements in your UI via anchors and bindings.
+
+    This is a QGraphicsLayoutItem subclass, and the properties merely expose the QGraphicsLayoutItem functionality to QML.
+    See the QGraphicsLayoutItem documentation for further details.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeLayoutItem
+    \brief The QDeclarativeLayoutItem class allows you to place your Fluid UI elements inside a classical Qt layout.
+*/
+
+
+/*!
+    \qmlproperty QSizeF LayoutItem::maximumSize
+
+    The maximumSize property can be set to specify the maximum desired size of this LayoutItem
+*/
+
+/*!
+    \qmlproperty QSizeF LayoutItem::minimumSize
+
+    The minimumSize property can be set to specify the minimum desired size of this LayoutItem
+*/
+
+/*!
+    \qmlproperty QSizeF LayoutItem::preferredSize
+
+    The preferredSize property can be set to specify the preferred size of this LayoutItem
+*/
+
+QDeclarativeLayoutItem::QDeclarativeLayoutItem(QDeclarativeItem* parent)
+    : QDeclarativeItem(parent), m_maximumSize(INT_MAX,INT_MAX), m_minimumSize(0,0), m_preferredSize(0,0)
+{
+    setGraphicsItem(this);
+}
+
+void QDeclarativeLayoutItem::setGeometry(const QRectF & rect)
+{
+    setX(rect.x());
+    setY(rect.y());
+    setWidth(rect.width());
+    setHeight(rect.height());
+}
+
+QSizeF QDeclarativeLayoutItem::sizeHint(Qt::SizeHint w, const QSizeF &constraint) const
+{
+    Q_UNUSED(constraint);
+    if(w == Qt::MinimumSize){
+        return m_minimumSize;
+    }else if(w == Qt::MaximumSize){
+        return m_maximumSize;
+    }else{
+        return m_preferredSize;
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h b/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h
new file mode 100644
index 0000000..b35f2f5
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEGRAPHICSLAYOUTITEM_H
+#define QDECLARATIVEGRAPHICSLAYOUTITEM_H
+#include "qdeclarativeitem.h"
+
+#include <QGraphicsLayoutItem>
+#include <QSizeF>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeLayoutItem : public QDeclarativeItem, public QGraphicsLayoutItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayoutItem)
+    Q_PROPERTY(QSizeF maximumSize READ maximumSize WRITE setMaximumSize NOTIFY maximumSizeChanged)
+    Q_PROPERTY(QSizeF minimumSize READ minimumSize WRITE setMinimumSize NOTIFY minimumSizeChanged)
+    Q_PROPERTY(QSizeF preferredSize READ preferredSize WRITE setPreferredSize NOTIFY preferredSizeChanged)
+public:
+    QDeclarativeLayoutItem(QDeclarativeItem* parent=0);
+
+    QSizeF maximumSize() const { return m_maximumSize; }
+    void setMaximumSize(const QSizeF &s) { if(s==m_maximumSize) return; m_maximumSize = s; emit maximumSizeChanged(); }
+
+    QSizeF minimumSize() const { return m_minimumSize; }
+    void setMinimumSize(const QSizeF &s) { if(s==m_minimumSize) return; m_minimumSize = s; emit minimumSizeChanged(); }
+
+    QSizeF preferredSize() const { return m_preferredSize; }
+    void setPreferredSize(const QSizeF &s) { if(s==m_preferredSize) return; m_preferredSize = s; emit preferredSizeChanged(); }
+
+    virtual void setGeometry(const QRectF & rect);
+protected:
+    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+
+Q_SIGNALS:
+    void maximumSizeChanged();
+    void minimumSizeChanged();
+    void preferredSizeChanged();
+
+private:
+    QSizeF m_maximumSize;
+    QSizeF m_minimumSize;
+    QSizeF m_preferredSize;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeLayoutItem)
+
+QT_END_HEADER
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
new file mode 100644
index 0000000..d471749
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -0,0 +1,2716 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativelistview_p.h"
+
+#include "qdeclarativeflickable_p_p.h"
+#include "qdeclarativevisualitemmodel_p.h"
+
+#include <qdeclarativeeasefollow_p.h>
+#include <qdeclarativeexpression.h>
+#include <qdeclarativeengine.h>
+
+#include <qlistmodelinterface_p.h>
+#include <QKeyEvent>
+
+QT_BEGIN_NAMESPACE
+
+void QDeclarativeViewSection::setProperty(const QString &property)
+{
+    if (property != m_property) {
+        m_property = property;
+        emit changed();
+    }
+}
+
+void QDeclarativeViewSection::setCriteria(QDeclarativeViewSection::SectionCriteria criteria)
+{
+    if (criteria != m_criteria) {
+        m_criteria = criteria;
+        emit changed();
+    }
+}
+
+void QDeclarativeViewSection::setDelegate(QDeclarativeComponent *delegate)
+{
+    if (delegate != m_delegate) {
+        m_delegate = delegate;
+        emit delegateChanged();
+    }
+}
+
+QString QDeclarativeViewSection::sectionString(const QString &value)
+{
+    if (m_criteria == FirstCharacter)
+        return value.isEmpty() ? QString() : value.at(0);
+    else
+        return value;
+}
+
+//----------------------------------------------------------------------------
+
+class FxListItem
+{
+public:
+    FxListItem(QDeclarativeItem *i, QDeclarativeListView *v) : item(i), section(0), view(v) {
+        attached = static_cast<QDeclarativeListViewAttached*>(qmlAttachedPropertiesObject<QDeclarativeListView>(item));
+        if (attached)
+            attached->m_view = view;
+    }
+    ~FxListItem() {}
+    qreal position() const {
+        if (section)
+            return (view->orientation() == QDeclarativeListView::Vertical ? section->y() : section->x());
+        else
+            return (view->orientation() == QDeclarativeListView::Vertical ? item->y() : item->x());
+    }
+    int size() const {
+        if (section)
+            return (view->orientation() == QDeclarativeListView::Vertical ? item->height()+section->height() : item->width()+section->height());
+        else
+            return (view->orientation() == QDeclarativeListView::Vertical ? item->height() : item->width());
+    }
+    qreal endPosition() const {
+        return (view->orientation() == QDeclarativeListView::Vertical
+                                        ? item->y() + (item->height() > 0 ? item->height() : 1)
+                                        : item->x() + (item->width() > 0 ? item->width() : 1)) - 1;
+    }
+    void setPosition(qreal pos) {
+        if (view->orientation() == QDeclarativeListView::Vertical) {
+            if (section) {
+                section->setY(pos);
+                pos += section->height();
+            }
+            item->setY(pos);
+        } else {
+            if (section) {
+                section->setX(pos);
+                pos += section->width();
+            }
+            item->setX(pos);
+        }
+    }
+
+    QDeclarativeItem *item;
+    QDeclarativeItem *section;
+    QDeclarativeListView *view;
+    QDeclarativeListViewAttached *attached;
+    int index;
+};
+
+//----------------------------------------------------------------------------
+
+class QDeclarativeListViewPrivate : public QDeclarativeFlickablePrivate, private QDeclarativeItemChangeListener
+{
+    Q_DECLARE_PUBLIC(QDeclarativeListView)
+
+public:
+    QDeclarativeListViewPrivate()
+        : currentItem(0), orient(QDeclarativeListView::Vertical)
+        , visiblePos(0), visibleIndex(0)
+        , averageSize(100.0), currentIndex(-1), requestedIndex(-1)
+        , highlightRangeStart(0), highlightRangeEnd(0)
+        , highlightComponent(0), highlight(0), trackedItem(0)
+        , moveReason(Other), buffer(0), highlightPosAnimator(0), highlightSizeAnimator(0)
+        , sectionCriteria(0), spacing(0.0)
+        , highlightMoveSpeed(400), highlightResizeSpeed(400), highlightRange(QDeclarativeListView::NoHighlightRange)
+        , snapMode(QDeclarativeListView::NoSnap), overshootDist(0.0)
+        , footerComponent(0), footer(0), headerComponent(0), header(0)
+        , bufferMode(NoBuffer)
+        , ownModel(false), wrap(false), autoHighlight(true), haveHighlightRange(false)
+        , correctFlick(true), inFlickCorrection(false), lazyRelease(false)
+        , deferredRelease(false), minExtentDirty(true), maxExtentDirty(true)
+    {}
+
+    void init();
+    void clear();
+    FxListItem *createItem(int modelIndex);
+    void releaseItem(FxListItem *item);
+
+    FxListItem *visibleItem(int modelIndex) const {
+        if (modelIndex >= visibleIndex && modelIndex < visibleIndex + visibleItems.count()) {
+            for (int i = modelIndex - visibleIndex; i < visibleItems.count(); ++i) {
+                FxListItem *item = visibleItems.at(i);
+                if (item->index == modelIndex)
+                    return item;
+            }
+        }
+        return 0;
+    }
+
+    FxListItem *firstVisibleItem() const {
+        const qreal pos = position();
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxListItem *item = visibleItems.at(i);
+            if (item->index != -1 && item->endPosition() > pos)
+                return item;
+        }
+        return visibleItems.count() ? visibleItems.first() : 0;
+    }
+
+    FxListItem *nextVisibleItem() const {
+        const qreal pos = position();
+        bool foundFirst = false;
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxListItem *item = visibleItems.at(i);
+            if (item->index != -1) {
+                if (foundFirst)
+                    return item;
+                else if (item->position() < pos && item->endPosition() > pos)
+                    foundFirst = true;
+            }
+        }
+        return 0;
+    }
+
+    qreal position() const {
+        Q_Q(const QDeclarativeListView);
+        return orient == QDeclarativeListView::Vertical ? q->viewportY() : q->viewportX();
+    }
+    void setPosition(qreal pos) {
+        Q_Q(QDeclarativeListView);
+        if (orient == QDeclarativeListView::Vertical)
+            q->setViewportY(pos);
+        else
+            q->setViewportX(pos);
+    }
+    qreal size() const {
+        Q_Q(const QDeclarativeListView);
+        return orient == QDeclarativeListView::Vertical ? q->height() : q->width();
+    }
+
+    qreal startPosition() const {
+        qreal pos = 0;
+        if (!visibleItems.isEmpty()) {
+            pos = (*visibleItems.constBegin())->position();
+            if (visibleIndex > 0)
+                pos -= visibleIndex * (averageSize + spacing) - spacing;
+        }
+        return pos;
+    }
+
+    qreal endPosition() const {
+        qreal pos = 0;
+        if (!visibleItems.isEmpty()) {
+            int invisibleCount = visibleItems.count() - visibleIndex;
+            for (int i = visibleItems.count()-1; i >= 0; --i) {
+                if (visibleItems.at(i)->index != -1) {
+                    invisibleCount = model->count() - visibleItems.at(i)->index - 1;
+                    break;
+                }
+            }
+            pos = (*(--visibleItems.constEnd()))->endPosition() + invisibleCount * (averageSize + spacing);
+        }
+        return pos;
+    }
+
+    qreal positionAt(int modelIndex) const {
+        if (FxListItem *item = visibleItem(modelIndex))
+            return item->position();
+        if (!visibleItems.isEmpty()) {
+            if (modelIndex < visibleIndex) {
+                int count = visibleIndex - modelIndex;
+                return (*visibleItems.constBegin())->position() - count * (averageSize + spacing);
+            } else {
+                int idx = visibleItems.count() - 1;
+                while (idx >= 0 && visibleItems.at(idx)->index == -1)
+                    --idx;
+                if (idx < 0)
+                    idx = visibleIndex;
+                else
+                    idx = visibleItems.at(idx)->index;
+                int count = modelIndex - idx - 1;
+                return (*(--visibleItems.constEnd()))->endPosition() + spacing + count * (averageSize + spacing) + 1;
+            }
+        }
+        return 0;
+    }
+
+    QString sectionAt(int modelIndex) {
+        if (FxListItem *item = visibleItem(modelIndex))
+            return item->attached->section();
+
+        QString section;
+        if (sectionCriteria) {
+            QString propValue = model->stringValue(modelIndex, sectionCriteria->property());
+            section = sectionCriteria->sectionString(propValue);
+        }
+
+        return section;
+    }
+
+    bool isValid() const {
+        return model && model->count() && model->isValid();
+    }
+
+    int snapIndex() {
+        int index = currentIndex;
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxListItem *item = visibleItems[i];
+            if (item->index == -1)
+                continue;
+            qreal itemTop = item->position();
+            if (itemTop >= highlight->position()-item->size()/2 && itemTop < highlight->position()+item->size()/2)
+                return item->index;
+        }
+        return index;
+    }
+
+    qreal snapPosAt(qreal pos) {
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxListItem *item = visibleItems[i];
+            if (item->index == -1)
+                continue;
+            qreal itemTop = item->position();
+            if (item->index == model->count()-1 || (itemTop+item->size()/2 >= pos))
+                return item->position();
+        }
+        if (visibleItems.count()) {
+            qreal firstPos = visibleItems.first()->position();
+            qreal endPos = visibleItems.last()->position();
+            if (pos < firstPos) {
+                return firstPos - qRound((firstPos - pos) / averageSize) * averageSize;
+            } else if (pos > endPos)
+                return endPos + qRound((pos - endPos) / averageSize) * averageSize;
+        }
+        return qRound((pos - startPosition()) / averageSize) * averageSize + startPosition();
+    }
+
+    FxListItem *snapItemAt(qreal pos) {
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxListItem *item = visibleItems[i];
+            if (item->index == -1)
+                continue;
+            qreal itemTop = item->position();
+            if (item->index == model->count()-1 || (itemTop+item->size()/2 >= pos))
+                return item;
+        }
+        if (visibleItems.count() && visibleItems.first()->position() <= pos)
+            return visibleItems.first();
+        return 0;
+    }
+
+    int lastVisibleIndex() const {
+        int lastIndex = -1;
+        for (int i = visibleItems.count()-1; i >= 0; --i) {
+            FxListItem *listItem = visibleItems.at(i);
+            if (listItem->index != -1) {
+                lastIndex = listItem->index;
+                break;
+            }
+        }
+        return lastIndex;
+    }
+
+    // map a model index to visibleItems index.
+    // These may differ if removed items are still present in the visible list,
+    // e.g. doing a removal animation
+    int mapFromModel(int modelIndex) const {
+        if (modelIndex < visibleIndex || modelIndex >= visibleIndex + visibleItems.count())
+            return -1;
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxListItem *listItem = visibleItems.at(i);
+            if (listItem->index == modelIndex)
+                return i + visibleIndex;
+            if (listItem->index > modelIndex)
+                return -1;
+        }
+        return -1; // Not in visibleList
+    }
+
+    bool mapRangeFromModel(int &index, int &count) const {
+        if (index + count < visibleIndex)
+            return false;
+
+        int lastIndex = -1;
+        for (int i = visibleItems.count()-1; i >= 0; --i) {
+            FxListItem *listItem = visibleItems.at(i);
+            if (listItem->index != -1) {
+                lastIndex = listItem->index;
+                break;
+            }
+        }
+
+        if (index > lastIndex)
+            return false;
+
+        int last = qMin(index + count - 1, lastIndex);
+        index = qMax(index, visibleIndex);
+        count = last - index + 1;
+
+        return true;
+    }
+
+    void updateViewport() {
+        Q_Q(QDeclarativeListView);
+        if (orient == QDeclarativeListView::Vertical) {
+            q->setViewportHeight(endPosition() - startPosition() + 1);
+        } else {
+            q->setViewportWidth(endPosition() - startPosition() + 1);
+        }
+    }
+
+    void itemGeometryChanged(QDeclarativeItem *, const QRectF &newGeometry, const QRectF &oldGeometry) {
+        if ((orient == QDeclarativeListView::Vertical && newGeometry.height() != oldGeometry.height())
+            || newGeometry.width() != oldGeometry.width()) {
+            layout();
+            fixupPosition();
+        }
+    }
+
+    // for debugging only
+    void checkVisible() const {
+        int skip = 0;
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            FxListItem *listItem = visibleItems.at(i);
+            if (listItem->index == -1) {
+                ++skip;
+            } else if (listItem->index != visibleIndex + i - skip) {
+                qFatal("index %d %d %d", visibleIndex, i, listItem->index);
+            }
+        }
+    }
+
+    void refill(qreal from, qreal to, bool doBuffer = false);
+    void layout();
+    void updateUnrequestedIndexes();
+    void updateUnrequestedPositions();
+    void updateTrackedItem();
+    void createHighlight();
+    void updateHighlight();
+    void createSection(FxListItem *);
+    void updateSections();
+    void updateCurrentSection();
+    void updateCurrent(int);
+    void updateAverage();
+    void updateHeader();
+    void updateFooter();
+    void fixupPosition();
+    virtual void fixupY();
+    virtual void fixupX();
+    virtual void flickX(qreal velocity);
+    virtual void flickY(qreal velocity);
+
+    QGuard<QDeclarativeVisualModel> model;
+    QVariant modelVariant;
+    QList<FxListItem*> visibleItems;
+    QHash<QDeclarativeItem*,int> unrequestedItems;
+    FxListItem *currentItem;
+    QDeclarativeListView::Orientation orient;
+    int visiblePos;
+    int visibleIndex;
+    qreal averageSize;
+    int currentIndex;
+    int requestedIndex;
+    qreal highlightRangeStart;
+    qreal highlightRangeEnd;
+    QDeclarativeComponent *highlightComponent;
+    FxListItem *highlight;
+    FxListItem *trackedItem;
+    enum MovementReason { Other, SetIndex, Mouse };
+    MovementReason moveReason;
+    int buffer;
+    QDeclarativeEaseFollow *highlightPosAnimator;
+    QDeclarativeEaseFollow *highlightSizeAnimator;
+    QDeclarativeViewSection *sectionCriteria;
+    QString currentSection;
+    static const int sectionCacheSize = 3;
+    QDeclarativeItem *sectionCache[sectionCacheSize];
+    qreal spacing;
+    qreal highlightMoveSpeed;
+    qreal highlightResizeSpeed;
+    QDeclarativeListView::HighlightRangeMode highlightRange;
+    QDeclarativeListView::SnapMode snapMode;
+    qreal overshootDist;
+    QDeclarativeComponent *footerComponent;
+    FxListItem *footer;
+    QDeclarativeComponent *headerComponent;
+    FxListItem *header;
+    enum BufferMode { NoBuffer = 0x00, BufferBefore = 0x01, BufferAfter = 0x02 };
+    int bufferMode;
+    mutable qreal minExtent;
+    mutable qreal maxExtent;
+
+    bool ownModel : 1;
+    bool wrap : 1;
+    bool autoHighlight : 1;
+    bool haveHighlightRange : 1;
+    bool correctFlick : 1;
+    bool inFlickCorrection : 1;
+    bool lazyRelease : 1;
+    bool deferredRelease : 1;
+    mutable bool minExtentDirty : 1;
+    mutable bool maxExtentDirty : 1;
+};
+
+void QDeclarativeListViewPrivate::init()
+{
+    Q_Q(QDeclarativeListView);
+    q->setFlag(QGraphicsItem::ItemIsFocusScope);
+    addItemChangeListener(this, Geometry);
+    QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
+    q->setFlickDirection(QDeclarativeFlickable::VerticalFlick);
+    ::memset(sectionCache, 0, sizeof(QDeclarativeItem*) * sectionCacheSize);
+}
+
+void QDeclarativeListViewPrivate::clear()
+{
+    for (int i = 0; i < visibleItems.count(); ++i)
+        releaseItem(visibleItems.at(i));
+    visibleItems.clear();
+    for (int i = 0; i < sectionCacheSize; ++i) {
+        delete sectionCache[i];
+        sectionCache[i] = 0;
+    }
+    visiblePos = header ? header->size() : 0;
+    visibleIndex = 0;
+    releaseItem(currentItem);
+    currentItem = 0;
+    createHighlight();
+    trackedItem = 0;
+    minExtentDirty = true;
+    maxExtentDirty = true;
+}
+
+FxListItem *QDeclarativeListViewPrivate::createItem(int modelIndex)
+{
+    Q_Q(QDeclarativeListView);
+    // create object
+    requestedIndex = modelIndex;
+    FxListItem *listItem = 0;
+    if (QDeclarativeItem *item = model->item(modelIndex, false)) {
+        listItem = new FxListItem(item, q);
+        listItem->index = modelIndex;
+        // initialise attached properties
+        if (sectionCriteria) {
+            QString propValue = model->stringValue(modelIndex, sectionCriteria->property());
+            listItem->attached->m_section = sectionCriteria->sectionString(propValue);
+            if (modelIndex > 0) {
+                if (FxListItem *item = visibleItem(modelIndex-1))
+                    listItem->attached->m_prevSection = item->attached->section();
+                else
+                    listItem->attached->m_prevSection = sectionAt(modelIndex-1);
+            }
+        }
+        // complete
+        model->completeItem();
+        listItem->item->setZValue(1);
+        listItem->item->setParent(q->viewport());
+        QDeclarativeItemPrivate *itemPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(item));
+        itemPrivate->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
+        if (sectionCriteria && sectionCriteria->delegate()) {
+            if (listItem->attached->m_prevSection != listItem->attached->m_section)
+                createSection(listItem);
+        }
+        unrequestedItems.remove(listItem->item);
+    }
+    requestedIndex = -1;
+
+    return listItem;
+}
+
+void QDeclarativeListViewPrivate::releaseItem(FxListItem *item)
+{
+    Q_Q(QDeclarativeListView);
+    if (!item || !model)
+        return;
+    if (trackedItem == item) {
+        const char *notifier1 = orient == QDeclarativeListView::Vertical ? SIGNAL(yChanged()) : SIGNAL(xChanged());
+        const char *notifier2 = orient == QDeclarativeListView::Vertical ? SIGNAL(heightChanged()) : SIGNAL(widthChanged());
+        QObject::disconnect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged()));
+        QObject::disconnect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged()));
+        trackedItem = 0;
+    }
+    QDeclarativeItemPrivate *itemPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(item->item));
+    itemPrivate->removeItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
+    if (model->release(item->item) == 0) {
+        // item was not destroyed, and we no longer reference it.
+        unrequestedItems.insert(item->item, model->indexOf(item->item, q));
+    }
+    if (item->section) {
+        int i = 0;
+        do {
+            if (!sectionCache[i]) {
+                sectionCache[i] = item->section;
+                sectionCache[i]->setVisible(false);
+                item->section = 0;
+                break;
+            }
+            ++i;
+        } while (i < sectionCacheSize);
+        delete item->section;
+    }
+    delete item;
+}
+
+void QDeclarativeListViewPrivate::refill(qreal from, qreal to, bool doBuffer)
+{
+    Q_Q(QDeclarativeListView);
+    if (!isValid() || !q->isComponentComplete())
+        return;
+    qreal bufferFrom = from - buffer;
+    qreal bufferTo = to + buffer;
+    qreal fillFrom = from;
+    qreal fillTo = to;
+    if (doBuffer && (bufferMode & BufferAfter))
+        fillTo = bufferTo;
+    if (doBuffer && (bufferMode & BufferBefore))
+        fillFrom = bufferFrom;
+
+    int modelIndex = visibleIndex;
+    qreal itemEnd = visiblePos-1;
+    if (!visibleItems.isEmpty()) {
+        visiblePos = (*visibleItems.constBegin())->position();
+        itemEnd = (*(--visibleItems.constEnd()))->endPosition() + spacing;
+        int i = visibleItems.count() - 1;
+        while (i > 0 && visibleItems.at(i)->index == -1)
+            --i;
+        modelIndex = visibleItems.at(i)->index + 1;
+    }
+
+    bool changed = false;
+    FxListItem *item = 0;
+    int pos = itemEnd + 1;
+    while (modelIndex < model->count() && pos <= fillTo) {
+        //qDebug() << "refill: append item" << modelIndex << "pos" << pos;
+        if (!(item = createItem(modelIndex)))
+            break;
+        item->setPosition(pos);
+        pos += item->size() + spacing;
+        visibleItems.append(item);
+        ++modelIndex;
+        changed = true;
+        if (doBuffer) // never buffer more than one item per frame
+            break;
+    }
+    while (visibleIndex > 0 && visibleIndex <= model->count() && visiblePos > fillFrom) {
+        //qDebug() << "refill: prepend item" << visibleIndex-1 << "current top pos" << visiblePos;
+        if (!(item = createItem(visibleIndex-1)))
+            break;
+        --visibleIndex;
+        visiblePos -= item->size() + spacing;
+        item->setPosition(visiblePos);
+        visibleItems.prepend(item);
+        changed = true;
+        if (doBuffer) // never buffer more than one item per frame
+            break;
+    }
+
+    if (!lazyRelease || !changed || deferredRelease) { // avoid destroying items in the same frame that we create
+        while (visibleItems.count() > 1 && (item = visibleItems.first()) && item->endPosition() < bufferFrom) {
+            if (item->attached->delayRemove())
+                break;
+            //qDebug() << "refill: remove first" << visibleIndex << "top end pos" << item->endPosition();
+            if (item->index != -1)
+                visibleIndex++;
+            visibleItems.removeFirst();
+            releaseItem(item);
+            changed = true;
+        }
+        while (visibleItems.count() > 1 && (item = visibleItems.last()) && item->position() > bufferTo) {
+            if (item->attached->delayRemove())
+                break;
+            //qDebug() << "refill: remove last" << visibleIndex+visibleItems.count()-1;
+            visibleItems.removeLast();
+            releaseItem(item);
+            changed = true;
+        }
+        deferredRelease = false;
+    } else {
+        deferredRelease = true;
+    }
+    if (changed) {
+        minExtentDirty = true;
+        maxExtentDirty = true;
+        if (visibleItems.count())
+            visiblePos = (*visibleItems.constBegin())->position();
+        updateAverage();
+        if (sectionCriteria)
+            updateCurrentSection();
+        if (header)
+            updateHeader();
+        if (footer)
+            updateFooter();
+        updateViewport();
+        updateUnrequestedPositions();
+    } else if (!doBuffer && buffer && bufferMode != NoBuffer) {
+        refill(from, to, true);
+    }
+    lazyRelease = false;
+}
+
+void QDeclarativeListViewPrivate::layout()
+{
+    Q_Q(QDeclarativeListView);
+    updateSections();
+    if (!visibleItems.isEmpty()) {
+        int oldEnd = visibleItems.last()->endPosition();
+        int pos = visibleItems.first()->endPosition() + spacing + 1;
+        for (int i=1; i < visibleItems.count(); ++i) {
+            FxListItem *item = visibleItems.at(i);
+            item->setPosition(pos);
+            pos += item->size() + spacing;
+        }
+        // move current item if it is after the visible items.
+        if (currentItem && currentIndex > lastVisibleIndex())
+            currentItem->setPosition(currentItem->position() + (visibleItems.last()->endPosition() - oldEnd));
+    }
+    if (!isValid())
+        return;
+    q->refill();
+    minExtentDirty = true;
+    maxExtentDirty = true;
+    updateHighlight();
+    fixupPosition();
+    q->refill();
+    if (header)
+        updateHeader();
+    if (footer)
+        updateFooter();
+    updateViewport();
+}
+
+void QDeclarativeListViewPrivate::updateUnrequestedIndexes()
+{
+    Q_Q(QDeclarativeListView);
+    QHash<QDeclarativeItem*,int>::iterator it;
+    for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
+        *it = model->indexOf(it.key(), q);
+}
+
+void QDeclarativeListViewPrivate::updateUnrequestedPositions()
+{
+    Q_Q(QDeclarativeListView);
+    if (unrequestedItems.count()) {
+        qreal pos = position();
+        QHash<QDeclarativeItem*,int>::const_iterator it;
+        for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it) {
+            QDeclarativeItem *item = it.key();
+            if (orient == QDeclarativeListView::Vertical) {
+                if (item->y() + item->height() > pos && item->y() < pos + q->height())
+                    item->setY(positionAt(*it));
+            } else {
+                if (item->x() + item->width() > pos && item->x() < pos + q->width())
+                    item->setX(positionAt(*it));
+            }
+        }
+    }
+}
+
+void QDeclarativeListViewPrivate::updateTrackedItem()
+{
+    Q_Q(QDeclarativeListView);
+    FxListItem *item = currentItem;
+    if (highlight)
+        item = highlight;
+
+    FxListItem *oldTracked = trackedItem;
+
+    const char *notifier1 = orient == QDeclarativeListView::Vertical ? SIGNAL(yChanged()) : SIGNAL(xChanged());
+    const char *notifier2 = orient == QDeclarativeListView::Vertical ? SIGNAL(heightChanged()) : SIGNAL(widthChanged());
+
+    if (trackedItem && item != trackedItem) {
+        QObject::disconnect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged()));
+        QObject::disconnect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged()));
+        trackedItem = 0;
+    }
+
+    if (!trackedItem && item) {
+        trackedItem = item;
+        QObject::connect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged()));
+        QObject::connect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged()));
+    }
+    if (trackedItem && trackedItem != oldTracked)
+        q->trackedPositionChanged();
+}
+
+void QDeclarativeListViewPrivate::createHighlight()
+{
+    Q_Q(QDeclarativeListView);
+    bool changed = false;
+    if (highlight) {
+        if (trackedItem == highlight)
+            trackedItem = 0;
+        delete highlight->item;
+        delete highlight;
+        highlight = 0;
+        delete highlightPosAnimator;
+        delete highlightSizeAnimator;
+        highlightPosAnimator = 0;
+        highlightSizeAnimator = 0;
+        changed = true;
+    }
+
+    if (currentItem) {
+        QDeclarativeItem *item = 0;
+        if (highlightComponent) {
+            QDeclarativeContext *highlightContext = new QDeclarativeContext(qmlContext(q));
+            QObject *nobj = highlightComponent->create(highlightContext);
+            if (nobj) {
+                highlightContext->setParent(nobj);
+                item = qobject_cast<QDeclarativeItem *>(nobj);
+                if (!item)
+                    delete nobj;
+            } else {
+                delete highlightContext;
+            }
+        } else {
+            item = new QDeclarativeItem;
+        }
+        if (item) {
+            item->setParent(q->viewport());
+            highlight = new FxListItem(item, q);
+            if (orient == QDeclarativeListView::Vertical)
+                highlight->item->setHeight(currentItem->item->height());
+            else
+                highlight->item->setWidth(currentItem->item->width());
+            const QLatin1String posProp(orient == QDeclarativeListView::Vertical ? "y" : "x");
+            highlightPosAnimator = new QDeclarativeEaseFollow(q);
+            highlightPosAnimator->setTarget(QDeclarativeMetaProperty(highlight->item, posProp));
+            highlightPosAnimator->setVelocity(highlightMoveSpeed);
+            highlightPosAnimator->setEnabled(autoHighlight);
+            const QLatin1String sizeProp(orient == QDeclarativeListView::Vertical ? "height" : "width");
+            highlightSizeAnimator = new QDeclarativeEaseFollow(q);
+            highlightSizeAnimator->setVelocity(highlightResizeSpeed);
+            highlightSizeAnimator->setTarget(QDeclarativeMetaProperty(highlight->item, sizeProp));
+            highlightSizeAnimator->setEnabled(autoHighlight);
+            changed = true;
+        }
+    }
+    if (changed)
+        emit q->highlightChanged();
+}
+
+void QDeclarativeListViewPrivate::updateHighlight()
+{
+    if ((!currentItem && highlight) || (currentItem && !highlight))
+        createHighlight();
+    if (currentItem && autoHighlight && highlight && !moving) {
+        // auto-update highlight
+        highlightPosAnimator->setSourceValue(currentItem->position());
+        highlightSizeAnimator->setSourceValue(currentItem->size());
+        if (orient == QDeclarativeListView::Vertical) {
+            if (highlight->item->width() == 0)
+                highlight->item->setWidth(currentItem->item->width());
+        } else {
+            if (highlight->item->height() == 0)
+                highlight->item->setHeight(currentItem->item->height());
+        }
+    }
+    updateTrackedItem();
+}
+
+void QDeclarativeListViewPrivate::createSection(FxListItem *listItem)
+{
+    Q_Q(QDeclarativeListView);
+    if (!sectionCriteria || !sectionCriteria->delegate())
+        return;
+    if (listItem->attached->m_prevSection != listItem->attached->m_section) {
+        if (!listItem->section) {
+            int i = sectionCacheSize-1;
+            while (i >= 0 && !sectionCache[i])
+                --i;
+            if (i >= 0) {
+                listItem->section = sectionCache[i];
+                sectionCache[i] = 0;
+                listItem->section->setVisible(true);
+                QDeclarativeContext *context = QDeclarativeEngine::contextForObject(listItem->section)->parentContext();
+                context->setContextProperty(QLatin1String("section"), listItem->attached->m_section);
+            } else {
+                QDeclarativeContext *context = new QDeclarativeContext(qmlContext(q));
+                context->setContextProperty(QLatin1String("section"), listItem->attached->m_section);
+                QObject *nobj = sectionCriteria->delegate()->create(context);
+                if (nobj) {
+                    context->setParent(nobj);
+                    listItem->section = qobject_cast<QDeclarativeItem *>(nobj);
+                    if (!listItem->section) {
+                        delete nobj;
+                    } else {
+                        listItem->section->setZValue(1);
+                        listItem->section->setParent(q->viewport());
+                    }
+                } else {
+                    delete context;
+                }
+            }
+        }
+    } else if (listItem->section) {
+        int i = 0;
+        do {
+            if (!sectionCache[i]) {
+                sectionCache[i] = listItem->section;
+                sectionCache[i]->setVisible(false);
+                listItem->section = 0;
+                return;
+            }
+            ++i;
+        } while (i < sectionCacheSize);
+        delete listItem->section;
+        listItem->section = 0;
+    }
+}
+
+void QDeclarativeListViewPrivate::updateSections()
+{
+    if (sectionCriteria) {
+        QString prevSection;
+        if (visibleIndex > 0)
+            prevSection = sectionAt(visibleIndex-1);
+        for (int i = 0; i < visibleItems.count(); ++i) {
+            if (visibleItems.at(i)->index != -1) {
+                QDeclarativeListViewAttached *attached = visibleItems.at(i)->attached;
+                attached->setPrevSection(prevSection);
+                createSection(visibleItems.at(i));
+                prevSection = attached->section();
+            }
+        }
+    }
+}
+
+void QDeclarativeListViewPrivate::updateCurrentSection()
+{
+    if (!sectionCriteria || visibleItems.isEmpty()) {
+        currentSection = QString();
+        return;
+    }
+    int index = 0;
+    while (visibleItems.at(index)->endPosition() < position() && index < visibleItems.count())
+        ++index;
+
+    if (index < visibleItems.count())
+        currentSection = visibleItems.at(index)->attached->section();
+    else
+        currentSection = visibleItems.first()->attached->section();
+}
+
+void QDeclarativeListViewPrivate::updateCurrent(int modelIndex)
+{
+    Q_Q(QDeclarativeListView);
+    if (!q->isComponentComplete() || !isValid() || modelIndex < 0 || modelIndex >= model->count()) {
+        if (currentItem) {
+            currentItem->attached->setIsCurrentItem(false);
+            releaseItem(currentItem);
+            currentItem = 0;
+            currentIndex = -1;
+            updateHighlight();
+            emit q->currentIndexChanged();
+        }
+        return;
+    }
+
+    if (currentItem && currentIndex == modelIndex) {
+        updateHighlight();
+        return;
+    }
+    FxListItem *oldCurrentItem = currentItem;
+    currentIndex = modelIndex;
+    currentItem = createItem(modelIndex);
+    if (oldCurrentItem && (!currentItem || oldCurrentItem->item != currentItem->item))
+        oldCurrentItem->attached->setIsCurrentItem(false);
+    if (currentItem) {
+        if (modelIndex == visibleIndex - 1) {
+            // We can calculate exact postion in this case
+            currentItem->setPosition(visibleItems.first()->position() - currentItem->size() - spacing);
+        } else {
+            // Create current item now and position as best we can.
+            // Its position will be corrected when it becomes visible.
+            currentItem->setPosition(positionAt(modelIndex));
+        }
+        currentItem->item->setFocus(true);
+        currentItem->attached->setIsCurrentItem(true);
+    }
+    updateHighlight();
+    emit q->currentIndexChanged();
+    // Release the old current item
+    releaseItem(oldCurrentItem);
+}
+
+void QDeclarativeListViewPrivate::updateAverage()
+{
+    if (!visibleItems.count())
+        return;
+    qreal sum = 0.0;
+    for (int i = 0; i < visibleItems.count(); ++i)
+        sum += visibleItems.at(i)->size();
+    averageSize = sum / visibleItems.count();
+}
+
+void QDeclarativeListViewPrivate::updateFooter()
+{
+    Q_Q(QDeclarativeListView);
+    if (!footer && footerComponent) {
+        QDeclarativeItem *item = 0;
+        QDeclarativeContext *context = new QDeclarativeContext(qmlContext(q));
+        QObject *nobj = footerComponent->create(context);
+        if (nobj) {
+            context->setParent(nobj);
+            item = qobject_cast<QDeclarativeItem *>(nobj);
+            if (!item)
+                delete nobj;
+        } else {
+            delete context;
+        }
+        if (item) {
+            item->setParent(q->viewport());
+            item->setZValue(1);
+            footer = new FxListItem(item, q);
+        }
+    }
+    if (footer) {
+        if (visibleItems.count()) {
+            qreal endPos = endPosition();
+            if (lastVisibleIndex() == model->count()-1) {
+                footer->setPosition(endPos);
+            } else {
+                qreal visiblePos = position() + q->height();
+                if (endPos <= visiblePos || footer->position() < endPos)
+                    footer->setPosition(endPos);
+            }
+        } else {
+            footer->setPosition(visiblePos);
+        }
+    }
+}
+
+void QDeclarativeListViewPrivate::updateHeader()
+{
+    Q_Q(QDeclarativeListView);
+    if (!header && headerComponent) {
+        QDeclarativeItem *item = 0;
+        QDeclarativeContext *context = new QDeclarativeContext(qmlContext(q));
+        QObject *nobj = headerComponent->create(context);
+        if (nobj) {
+            context->setParent(nobj);
+            item = qobject_cast<QDeclarativeItem *>(nobj);
+            if (!item)
+                delete nobj;
+        } else {
+            delete context;
+        }
+        if (item) {
+            item->setParent(q->viewport());
+            item->setZValue(1);
+            header = new FxListItem(item, q);
+            if (visibleItems.isEmpty())
+                visiblePos = header->size();
+        }
+    }
+    if (header) {
+        if (visibleItems.count()) {
+            qreal startPos = startPosition();
+            if (visibleIndex == 0) {
+                header->setPosition(startPos - header->size());
+            } else {
+                if (position() <= startPos || header->position() > startPos - header->size())
+                    header->setPosition(startPos - header->size());
+            }
+        } else {
+            header->setPosition(0);
+        }
+    }
+}
+
+void QDeclarativeListViewPrivate::fixupPosition()
+{
+    moveReason = Other;
+    if (orient == QDeclarativeListView::Vertical)
+        fixupY();
+    else
+        fixupX();
+}
+
+void QDeclarativeListViewPrivate::fixupY()
+{
+    Q_Q(QDeclarativeListView);
+    if (orient == QDeclarativeListView::Horizontal)
+        return;
+    if (!q->yflick() || _moveY.timeLine())
+        return;
+
+    int oldDuration = fixupDuration;
+    fixupDuration = moveReason == Mouse ? fixupDuration : 0;
+
+    if (haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange) {
+        if (currentItem && currentItem->position() - position() != highlightRangeStart) {
+            qreal pos = currentItem->position() - highlightRangeStart;
+            timeline.reset(_moveY);
+            if (fixupDuration)
+                timeline.move(_moveY, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+            else
+                _moveY.setValue(-pos);
+            vTime = timeline.time();
+        }
+    } else if (snapMode != QDeclarativeListView::NoSnap) {
+        if (FxListItem *item = snapItemAt(position())) {
+            qreal pos = qMin(item->position() - highlightRangeStart, -q->maxYExtent());
+            qreal dist = qAbs(_moveY + pos);
+            if (dist > 0) {
+                timeline.reset(_moveY);
+                if (fixupDuration)
+                    timeline.move(_moveY, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+                else
+                    _moveY.setValue(-pos);
+                vTime = timeline.time();
+            }
+        }
+    } else {
+        QDeclarativeFlickablePrivate::fixupY();
+    }
+    fixupDuration = oldDuration;
+}
+
+void QDeclarativeListViewPrivate::fixupX()
+{
+    Q_Q(QDeclarativeListView);
+    if (orient == QDeclarativeListView::Vertical)
+        return;
+    if (!q->xflick() || _moveX.timeLine())
+        return;
+
+    int oldDuration = fixupDuration;
+    fixupDuration = moveReason == Mouse ? fixupDuration : 0;
+
+    if (haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange) {
+        if (currentItem && currentItem->position() - position() != highlightRangeStart) {
+            qreal pos = currentItem->position() - highlightRangeStart;
+            timeline.reset(_moveX);
+            if (fixupDuration)
+                timeline.move(_moveX, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+            else
+                _moveX.setValue(-pos);
+            vTime = timeline.time();
+        }
+    } else if (snapMode != QDeclarativeListView::NoSnap) {
+        if (FxListItem *item = snapItemAt(position())) {
+            qreal pos = qMin(item->position() - highlightRangeStart, -q->maxXExtent());
+            qreal dist = qAbs(_moveX + pos);
+            if (dist > 0) {
+                timeline.reset(_moveX);
+                if (fixupDuration)
+                    timeline.move(_moveX, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+                else
+                    _moveX.setValue(-pos);
+                vTime = timeline.time();
+            }
+        }
+    } else {
+        QDeclarativeFlickablePrivate::fixupX();
+    }
+    fixupDuration = oldDuration;
+}
+
+void QDeclarativeListViewPrivate::flickX(qreal velocity)
+{
+    Q_Q(QDeclarativeListView);
+
+    moveReason = Mouse;
+    if ((!haveHighlightRange || highlightRange != QDeclarativeListView::StrictlyEnforceRange) && snapMode == QDeclarativeListView::NoSnap) {
+        QDeclarativeFlickablePrivate::flickX(velocity);
+        return;
+    }
+    qreal maxDistance = -1;
+    const qreal maxX = q->maxXExtent();
+    const qreal minX = q->minXExtent();
+    // -ve velocity means list is moving up
+    if (velocity > 0) {
+        if (snapMode == QDeclarativeListView::SnapOneItem) {
+            if (FxListItem *item = firstVisibleItem())
+                maxDistance = qAbs(item->position() + _moveX.value());
+        } else if (_moveX.value() < minX) {
+            maxDistance = qAbs(minX -_moveX.value() + (overShoot?30:0));
+        }
+        if (snapMode != QDeclarativeListView::SnapToItem && highlightRange != QDeclarativeListView::StrictlyEnforceRange)
+            flickTargetX = minX;
+    } else {
+        if (snapMode == QDeclarativeListView::SnapOneItem) {
+            if (FxListItem *item = nextVisibleItem())
+                maxDistance = qAbs(item->position() + _moveX.value());
+        } else if (_moveX.value() > maxX) {
+            maxDistance = qAbs(maxX - _moveX.value()) + (overShoot?30:0);
+        }
+        if (snapMode != QDeclarativeListView::SnapToItem && highlightRange != QDeclarativeListView::StrictlyEnforceRange)
+            flickTargetX = maxX;
+    }
+    if (maxDistance > 0 && (snapMode != QDeclarativeListView::NoSnap || highlightRange == QDeclarativeListView::StrictlyEnforceRange)) {
+        // These modes require the list to stop exactly on an item boundary.
+        // The initial flick will estimate the boundary to stop on.
+        // Since list items can have variable sizes, the boundary will be
+        // reevaluated and adjusted as we approach the boundary.
+        qreal v = velocity;
+        if (maxVelocity != -1 && maxVelocity < qAbs(v)) {
+            if (v < 0)
+                v = -maxVelocity;
+            else
+                v = maxVelocity;
+        }
+        if (!flicked) {
+            // the initial flick - estimate boundary
+            qreal accel = deceleration;
+            qreal v2 = v * v;
+            qreal maxAccel = v2 / (2.0f * maxDistance);
+            if (maxAccel < accel) {
+                qreal dist = v2 / (accel * 2.0);
+                if (v > 0)
+                    dist = -dist;
+                flickTargetX = -snapPosAt(-(_moveX.value() - highlightRangeStart) + dist) + highlightRangeStart;
+                dist = -flickTargetX + _moveX.value();
+                accel = v2 / (2.0f * qAbs(dist));
+                overshootDist = 0.0;
+            } else {
+                flickTargetX = velocity > 0 ? minX : maxX;
+                overshootDist = overShoot ? 30 : 0;
+            }
+            timeline.reset(_moveX);
+            timeline.accel(_moveX, v, accel, maxDistance + overshootDist);
+            timeline.callback(QDeclarativeTimeLineCallback(&_moveX, fixupX_callback, this));
+            flicked = true;
+            emit q->flickingChanged();
+            emit q->flickStarted();
+            correctFlick = true;
+        } else {
+            // reevaluate the target boundary.
+            qreal newtarget = flickTargetX;
+            if (snapMode != QDeclarativeListView::NoSnap || highlightRange == QDeclarativeListView::StrictlyEnforceRange)
+                newtarget = -snapPosAt(-(flickTargetX - highlightRangeStart)) + highlightRangeStart;
+            if (velocity < 0 && newtarget < maxX)
+                newtarget = maxX;
+            else if (velocity > 0 && newtarget > minX)
+                newtarget = minX;
+            if (newtarget == flickTargetX) // boundary unchanged - nothing to do
+                return;
+            flickTargetX = newtarget;
+            qreal dist = -newtarget + _moveX.value();
+            if ((v < 0 && dist < 0) || (v > 0 && dist > 0)) {
+                correctFlick = false;
+                timeline.reset(_moveX);
+                fixupX();
+                return;
+            }
+            timeline.reset(_moveX);
+            timeline.accelDistance(_moveX, v, -dist + (v < 0 ? -overshootDist : overshootDist));
+            timeline.callback(QDeclarativeTimeLineCallback(&_moveX, fixupX_callback, this));
+        }
+    } else {
+        correctFlick = false;
+        timeline.reset(_moveX);
+        fixupX();
+    }
+}
+
+void QDeclarativeListViewPrivate::flickY(qreal velocity)
+{
+    Q_Q(QDeclarativeListView);
+
+    moveReason = Mouse;
+    if ((!haveHighlightRange || highlightRange != QDeclarativeListView::StrictlyEnforceRange) && snapMode == QDeclarativeListView::NoSnap) {
+        QDeclarativeFlickablePrivate::flickY(velocity);
+        return;
+    }
+    qreal maxDistance = -1;
+    const qreal maxY = q->maxYExtent();
+    const qreal minY = q->minYExtent();
+    // -ve velocity means list is moving up
+    if (velocity > 0) {
+        if (snapMode == QDeclarativeListView::SnapOneItem) {
+            if (FxListItem *item = firstVisibleItem())
+                maxDistance = qAbs(item->position() + _moveY.value());
+        } else if (_moveY.value() < minY) {
+            maxDistance = qAbs(minY -_moveY.value() + (overShoot?30:0));
+        }
+        if (snapMode != QDeclarativeListView::SnapToItem && highlightRange != QDeclarativeListView::StrictlyEnforceRange)
+            flickTargetY = minY;
+    } else {
+        if (snapMode == QDeclarativeListView::SnapOneItem) {
+            if (FxListItem *item = nextVisibleItem())
+                maxDistance = qAbs(item->position() + _moveY.value());
+        } else if (_moveY.value() > maxY) {
+            maxDistance = qAbs(maxY - _moveY.value()) + (overShoot?30:0);
+        }
+        if (snapMode != QDeclarativeListView::SnapToItem && highlightRange != QDeclarativeListView::StrictlyEnforceRange)
+            flickTargetY = maxY;
+    }
+    if (maxDistance > 0 && (snapMode != QDeclarativeListView::NoSnap || highlightRange == QDeclarativeListView::StrictlyEnforceRange)) {
+        // These modes require the list to stop exactly on an item boundary.
+        // The initial flick will estimate the boundary to stop on.
+        // Since list items can have variable sizes, the boundary will be
+        // reevaluated and adjusted as we approach the boundary.
+        qreal v = velocity;
+        if (maxVelocity != -1 && maxVelocity < qAbs(v)) {
+            if (v < 0)
+                v = -maxVelocity;
+            else
+                v = maxVelocity;
+        }
+        if (!flicked) {
+            // the initial flick - estimate boundary
+            qreal accel = deceleration;
+            qreal v2 = v * v;
+            qreal maxAccel = v2 / (2.0f * maxDistance);
+            if (maxAccel < accel) {
+                qreal dist = v2 / (accel * 2.0);
+                if (v > 0)
+                    dist = -dist;
+                flickTargetY = -snapPosAt(-(_moveY.value() - highlightRangeStart) + dist) + highlightRangeStart;
+                dist = -flickTargetY + _moveY.value();
+                accel = v2 / (2.0f * qAbs(dist));
+                overshootDist = 0.0;
+            } else {
+                flickTargetY = velocity > 0 ? minY : maxY;
+                overshootDist = overShoot ? 30 : 0;
+            }
+            timeline.reset(_moveY);
+            timeline.accel(_moveY, v, accel, maxDistance + overshootDist);
+            timeline.callback(QDeclarativeTimeLineCallback(&_moveY, fixupY_callback, this));
+            flicked = true;
+            emit q->flickingChanged();
+            emit q->flickStarted();
+            correctFlick = true;
+        } else {
+            // reevaluate the target boundary.
+            qreal newtarget = flickTargetY;
+            if (snapMode != QDeclarativeListView::NoSnap || highlightRange == QDeclarativeListView::StrictlyEnforceRange)
+                newtarget = -snapPosAt(-(flickTargetY - highlightRangeStart)) + highlightRangeStart;
+            if (velocity < 0 && newtarget < maxY)
+                newtarget = maxY;
+            else if (velocity > 0 && newtarget > minY)
+                newtarget = minY;
+            if (newtarget == flickTargetY) // boundary unchanged - nothing to do
+                return;
+            flickTargetY = newtarget;
+            qreal dist = -newtarget + _moveY.value();
+            if ((v < 0 && dist < 0) || (v > 0 && dist > 0)) {
+                correctFlick = false;
+                timeline.reset(_moveY);
+                fixupY();
+                return;
+            }
+            timeline.reset(_moveY);
+            timeline.accelDistance(_moveY, v, -dist + (v < 0 ? -overshootDist : overshootDist));
+            timeline.callback(QDeclarativeTimeLineCallback(&_moveY, fixupY_callback, this));
+        }
+    } else {
+        correctFlick = false;
+        timeline.reset(_moveY);
+        fixupY();
+    }
+}
+
+//----------------------------------------------------------------------------
+
+/*!
+    \qmlclass ListView QDeclarativeListView
+    \since 4.7
+    \inherits Flickable
+    \brief The ListView item provides a list view of items provided by a model.
+
+    The model is typically provided by a QAbstractListModel "C++ model object",
+    but can also be created directly in QML. The items are laid out vertically
+    or horizontally and may be flicked to scroll.
+
+    The below example creates a very simple vertical list, using a QML model.
+    \image trivialListView.png
+
+    The user interface defines a delegate to display an item, a highlight,
+    and the ListView which uses the above.
+
+    \snippet doc/src/snippets/declarative/listview/listview.qml 3
+
+    The model is defined as a ListModel using QML:
+    \quotefile doc/src/snippets/declarative/listview/dummydata/ContactModel.qml
+
+    In this case ListModel is a handy way for us to test our UI.  In practice
+    the model would be implemented in C++, or perhaps via a SQL data source.
+*/
+
+QDeclarativeListView::QDeclarativeListView(QDeclarativeItem *parent)
+    : QDeclarativeFlickable(*(new QDeclarativeListViewPrivate), parent)
+{
+    Q_D(QDeclarativeListView);
+    d->init();
+}
+
+QDeclarativeListView::~QDeclarativeListView()
+{
+    Q_D(QDeclarativeListView);
+    d->clear();
+    if (d->ownModel)
+        delete d->model;
+    delete d->header;
+    delete d->footer;
+}
+
+/*!
+    \qmlattachedproperty bool ListView::isCurrentItem
+    This attached property is true if this delegate is the current item; otherwise false.
+
+    It is attached to each instance of the delegate.
+
+    This property may be used to adjust the appearance of the current item, for example:
+
+    \snippet doc/src/snippets/declarative/listview/highlight.qml 0
+*/
+
+/*!
+    \qmlattachedproperty ListView ListView::view
+    This attached property holds the view that manages this delegate instance.
+
+    It is attached to each instance of the delegate.
+*/
+
+/*!
+    \qmlattachedproperty string ListView::prevSection
+    This attached property holds the section of the previous element.
+
+    It is attached to each instance of the delegate.
+
+    The section is evaluated using the \l {ListView::section.property}{section} properties.
+*/
+
+/*!
+    \qmlattachedproperty string ListView::section
+    This attached property holds the section of this element.
+
+    It is attached to each instance of the delegate.
+
+    The section is evaluated using the \l {ListView::section.property}{section} properties.
+*/
+
+/*!
+    \qmlattachedproperty bool ListView::delayRemove
+    This attached property holds whether the delegate may be destroyed.
+
+    It is attached to each instance of the delegate.
+
+    It is sometimes necessary to delay the destruction of an item
+    until an animation completes.
+
+    The example below ensures that the animation completes before
+    the item is removed from the list.
+
+    \code
+    Component {
+        id: myDelegate
+        Item {
+            id: wrapper
+            ListView.onRemove: SequentialAnimation {
+                PropertyAction { target: wrapper.ListView; property: "delayRemove"; value: true }
+                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing: "easeInOutQuad" }
+                PropertyAction { target: wrapper.ListView; property: "delayRemove"; value: false }
+            }
+        }
+    }
+    \endcode
+*/
+
+/*!
+    \qmlattachedsignal ListView::onAdd()
+    This attached handler is called immediately after an item is added to the view.
+*/
+
+/*!
+    \qmlattachedsignal ListView::onRemove()
+    This attached handler is called immediately before an item is removed from the view.
+*/
+
+/*!
+    \qmlproperty model ListView::model
+    This property holds the model providing data for the list.
+
+    The model provides a set of data that is used to create the items
+    for the view.  For large or dynamic datasets the model is usually
+    provided by a C++ model object.  The C++ model object must be a \l
+    {QAbstractItemModel} subclass or a simple list.
+
+    Models can also be created directly in QML, using a \l{ListModel},
+    \l{XmlListModel} or \l{VisualItemModel}.
+
+    \sa {qmlmodels}{Data Models}
+*/
+QVariant QDeclarativeListView::model() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->modelVariant;
+}
+
+void QDeclarativeListView::setModel(const QVariant &model)
+{
+    Q_D(QDeclarativeListView);
+    if (d->model) {
+        disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
+        disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        disconnect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
+        disconnect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
+    }
+    d->clear();
+    d->modelVariant = model;
+    QObject *object = qvariant_cast<QObject*>(model);
+    QDeclarativeVisualModel *vim = 0;
+    if (object && (vim = qobject_cast<QDeclarativeVisualModel *>(object))) {
+        if (d->ownModel) {
+            delete d->model;
+            d->ownModel = false;
+        }
+        d->model = vim;
+    } else {
+        if (!d->ownModel) {
+            d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+            d->ownModel = true;
+        }
+        if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
+            dataModel->setModel(model);
+    }
+    if (d->model) {
+        if (isComponentComplete()) {
+            refill();
+            if (d->currentIndex >= d->model->count() || d->currentIndex < 0) {
+                setCurrentIndex(0);
+            } else {
+                d->moveReason = QDeclarativeListViewPrivate::SetIndex;
+                d->updateCurrent(d->currentIndex);
+            }
+        }
+        connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
+        connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        connect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
+        connect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
+        emit countChanged();
+    }
+}
+
+/*!
+    \qmlproperty component ListView::delegate
+
+    The delegate provides a template defining each item instantiated by the view.
+    The index is exposed as an accessible \c index property.  Properties of the
+    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
+
+    Note that the ListView will layout the items based on the size of the root item
+    in the delegate.
+
+    Here is an example delegate:
+    \snippet doc/src/snippets/declarative/listview/listview.qml 0
+*/
+QDeclarativeComponent *QDeclarativeListView::delegate() const
+{
+    Q_D(const QDeclarativeListView);
+    if (d->model) {
+        if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
+            return dataModel->delegate();
+    }
+
+    return 0;
+}
+
+void QDeclarativeListView::setDelegate(QDeclarativeComponent *delegate)
+{
+    Q_D(QDeclarativeListView);
+    if (delegate == this->delegate())
+        return;
+    if (!d->ownModel) {
+        d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+        d->ownModel = true;
+    }
+    if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model)) {
+        dataModel->setDelegate(delegate);
+        if (isComponentComplete()) {
+            for (int i = 0; i < d->visibleItems.count(); ++i)
+                d->releaseItem(d->visibleItems.at(i));
+            d->visibleItems.clear();
+            refill();
+            d->moveReason = QDeclarativeListViewPrivate::SetIndex;
+            d->updateCurrent(d->currentIndex);
+        }
+    }
+}
+
+/*!
+    \qmlproperty int ListView::currentIndex
+    \qmlproperty Item ListView::currentItem
+
+    \c currentIndex holds the index of the current item.
+    \c currentItem is the current item.  Note that the position of the current item
+    may only be approximate until it becomes visible in the view.
+*/
+int QDeclarativeListView::currentIndex() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->currentIndex;
+}
+
+void QDeclarativeListView::setCurrentIndex(int index)
+{
+    Q_D(QDeclarativeListView);
+    if (isComponentComplete() && d->isValid() && index != d->currentIndex && index < d->model->count() && index >= 0) {
+        d->moveReason = QDeclarativeListViewPrivate::SetIndex;
+        cancelFlick();
+        d->updateCurrent(index);
+    } else {
+        d->currentIndex = index;
+    }
+}
+
+QDeclarativeItem *QDeclarativeListView::currentItem()
+{
+    Q_D(QDeclarativeListView);
+    if (!d->currentItem)
+        return 0;
+    return d->currentItem->item;
+}
+
+/*!
+  \qmlproperty Item ListView::highlightItem
+
+  \c highlightItem holds the highlight item, which was created
+  from the \l highlight component.
+
+  The highlightItem is managed by the view unless
+  \l highlightFollowsCurrentItem is set to false.
+
+  \sa highlight, highlightFollowsCurrentItem
+*/
+QDeclarativeItem *QDeclarativeListView::highlightItem()
+{
+    Q_D(QDeclarativeListView);
+    if (!d->highlight)
+        return 0;
+    return d->highlight->item;
+}
+
+/*!
+  \qmlproperty int ListView::count
+  This property holds the number of items in the view.
+*/
+int QDeclarativeListView::count() const
+{
+    Q_D(const QDeclarativeListView);
+    if (d->model)
+        return d->model->count();
+    return 0;
+}
+
+/*!
+    \qmlproperty component ListView::highlight
+    This property holds the component to use as the highlight.
+
+    An instance of the highlight component will be created for each list.
+    The geometry of the resultant component instance will be managed by the list
+    so as to stay with the current item, unless the highlightFollowsCurrentItem
+    property is false.
+
+    The below example demonstrates how to make a simple highlight
+    for a vertical list.
+
+    \snippet doc/src/snippets/declarative/listview/listview.qml 1
+    \image trivialListView.png
+
+    \sa highlightItem, highlightFollowsCurrentItem
+*/
+QDeclarativeComponent *QDeclarativeListView::highlight() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->highlightComponent;
+}
+
+void QDeclarativeListView::setHighlight(QDeclarativeComponent *highlight)
+{
+    Q_D(QDeclarativeListView);
+    if (highlight != d->highlightComponent) {
+        d->highlightComponent = highlight;
+        d->createHighlight();
+        if (d->currentItem)
+            d->updateHighlight();
+    }
+}
+
+/*!
+    \qmlproperty bool ListView::highlightFollowsCurrentItem
+    This property holds whether the highlight is managed by the view.
+
+    If highlightFollowsCurrentItem is true, the highlight will be moved smoothly
+    to follow the current item.  If highlightFollowsCurrentItem is false, the
+    highlight will not be moved by the view, and must be implemented
+    by the highlight.  The following example creates a highlight with
+    its motion defined by the spring \l {SpringFollow}:
+
+    \snippet doc/src/snippets/declarative/listview/highlight.qml 1
+
+    Note that the highlight animation also affects the way that the view
+    is scrolled.  This is because the view moves to maintain the
+    highlight within the preferred highlight range (or visible viewport).
+
+    \sa highlight, highlightMoveSpeed
+*/
+bool QDeclarativeListView::highlightFollowsCurrentItem() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->autoHighlight;
+}
+
+void QDeclarativeListView::setHighlightFollowsCurrentItem(bool autoHighlight)
+{
+    Q_D(QDeclarativeListView);
+    if (d->autoHighlight != autoHighlight) {
+        d->autoHighlight = autoHighlight;
+        if (d->highlightPosAnimator) {
+            d->highlightPosAnimator->setEnabled(d->autoHighlight);
+            d->highlightSizeAnimator->setEnabled(d->autoHighlight);
+        }
+        d->updateHighlight();
+    }
+}
+
+//###Possibly rename these properties, since they are very useful even without a highlight?
+/*!
+    \qmlproperty real ListView::preferredHighlightBegin
+    \qmlproperty real ListView::preferredHighlightEnd
+    \qmlproperty enumeration ListView::highlightRangeMode
+
+    These properties set the preferred range of the highlight (current item)
+    within the view.
+
+    Note that this is the correct way to influence where the
+    current item ends up when the list scrolls. For example, if you want the
+    currently selected item to be in the middle of the list, then set the
+    highlight range to be where the middle item would go. Then, when the list scrolls,
+    the currently selected item will be the item at that spot. This also applies to
+    when the currently selected item changes - it will scroll to within the preferred
+    highlight range. Furthermore, the behaviour of the current item index will occur
+    whether or not a highlight exists.
+
+    If highlightRangeMode is set to \e ApplyRange the view will
+    attempt to maintain the highlight within the range, however
+    the highlight can move outside of the range at the ends of the list
+    or due to a mouse interaction.
+
+    If highlightRangeMode is set to \e StrictlyEnforceRange the highlight will never
+    move outside of the range.  This means that the current item will change
+    if a keyboard or mouse action would cause the highlight to move
+    outside of the range.
+
+    The default value is \e NoHighlightRange.
+
+    Note that a valid range requires preferredHighlightEnd to be greater
+    than or equal to preferredHighlightBegin.
+*/
+qreal QDeclarativeListView::preferredHighlightBegin() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->highlightRangeStart;
+}
+
+void QDeclarativeListView::setPreferredHighlightBegin(qreal start)
+{
+    Q_D(QDeclarativeListView);
+    d->highlightRangeStart = start;
+    d->haveHighlightRange = d->highlightRange != NoHighlightRange && d->highlightRangeStart <= d->highlightRangeEnd;
+}
+
+qreal QDeclarativeListView::preferredHighlightEnd() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->highlightRangeEnd;
+}
+
+void QDeclarativeListView::setPreferredHighlightEnd(qreal end)
+{
+    Q_D(QDeclarativeListView);
+    d->highlightRangeEnd = end;
+    d->haveHighlightRange = d->highlightRange != NoHighlightRange && d->highlightRangeStart <= d->highlightRangeEnd;
+}
+
+QDeclarativeListView::HighlightRangeMode QDeclarativeListView::highlightRangeMode() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->highlightRange;
+}
+
+void QDeclarativeListView::setHighlightRangeMode(HighlightRangeMode mode)
+{
+    Q_D(QDeclarativeListView);
+    d->highlightRange = mode;
+    d->haveHighlightRange = d->highlightRange != NoHighlightRange && d->highlightRangeStart <= d->highlightRangeEnd;
+}
+
+/*!
+    \qmlproperty real ListView::spacing
+
+    This property holds the spacing to leave between items.
+*/
+qreal QDeclarativeListView::spacing() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->spacing;
+}
+
+void QDeclarativeListView::setSpacing(qreal spacing)
+{
+    Q_D(QDeclarativeListView);
+    if (spacing != d->spacing) {
+        d->spacing = spacing;
+        d->layout();
+        emit spacingChanged();
+    }
+}
+
+/*!
+    \qmlproperty enumeration ListView::orientation
+    This property holds the orientation of the list.
+
+    Possible values are \c Vertical (default) and \c Horizontal.
+
+    Vertical Example:
+    \image trivialListView.png
+    Horizontal Example:
+    \image ListViewHorizontal.png
+*/
+QDeclarativeListView::Orientation QDeclarativeListView::orientation() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->orient;
+}
+
+void QDeclarativeListView::setOrientation(QDeclarativeListView::Orientation orientation)
+{
+    Q_D(QDeclarativeListView);
+    if (d->orient != orientation) {
+        d->orient = orientation;
+        if (d->orient == QDeclarativeListView::Vertical) {
+            setViewportWidth(-1);
+            setFlickDirection(VerticalFlick);
+        } else {
+            setViewportHeight(-1);
+            setFlickDirection(HorizontalFlick);
+        }
+        d->clear();
+        refill();
+        emit orientationChanged();
+        d->updateCurrent(d->currentIndex);
+    }
+}
+
+/*!
+    \qmlproperty bool ListView::keyNavigationWraps
+    This property holds whether the list wraps key navigation
+
+    If this property is true then key presses to move off of one end of the list will cause the
+    current item to jump to the other end.
+*/
+bool QDeclarativeListView::isWrapEnabled() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->wrap;
+}
+
+void QDeclarativeListView::setWrapEnabled(bool wrap)
+{
+    Q_D(QDeclarativeListView);
+    d->wrap = wrap;
+}
+
+/*!
+    \qmlproperty int ListView::cacheBuffer
+    This property holds the number of off-screen pixels to cache.
+
+    This property determines the number of pixels above the top of the list
+    and below the bottom of the list to cache.  Setting this value can make
+    scrolling the list smoother at the expense of additional memory usage.
+*/
+int QDeclarativeListView::cacheBuffer() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->buffer;
+}
+
+void QDeclarativeListView::setCacheBuffer(int b)
+{
+    Q_D(QDeclarativeListView);
+    if (d->buffer != b) {
+        d->buffer = b;
+        if (isComponentComplete()) {
+            d->bufferMode = QDeclarativeListViewPrivate::BufferBefore | QDeclarativeListViewPrivate::BufferAfter;
+            refill();
+        }
+    }
+}
+
+/*!
+    \qmlproperty string ListView::section.property
+    \qmlproperty enumeration ListView::section.criteria
+    These properties hold the expression to be evaluated for the section attached property.
+
+    section.property hold the name of the property to use to determine
+    the section the item is in.
+
+    section.criteria holds the criteria to use to get the section. It
+    can be either:
+    \list
+    \o ViewSection.FullString (default) - section is the value of the property.
+    \o ViewSection.FirstCharacter - section is the first character of the property value.
+    \endlist
+
+    Each item in the list has attached properties named \c ListView.section and
+    \c ListView.prevSection.  These may be used to place a section header for
+    related items.  The example below assumes that the model is sorted by size of
+    pet.  The section expression is the size property.  If \c ListView.section and
+    \c ListView.prevSection differ, the item will display a section header.
+
+    \snippet examples/declarative/listview/sections.qml 0
+
+    \image ListViewSections.png
+*/
+QDeclarativeViewSection *QDeclarativeListView::sectionCriteria()
+{
+    Q_D(QDeclarativeListView);
+    if (!d->sectionCriteria)
+        d->sectionCriteria = new QDeclarativeViewSection(this);
+    return d->sectionCriteria;
+}
+
+/*!
+    \qmlproperty string ListView::currentSection
+    This property holds the section that is currently at the beginning of the view.
+*/
+QString QDeclarativeListView::currentSection() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->currentSection;
+}
+
+/*!
+    \qmlproperty real ListView::highlightMoveSpeed
+    \qmlproperty real ListView::highlightResizeSpeed
+    These properties hold the move and resize animation speed of the highlight delegate.
+
+    highlightFollowsCurrentItem must be true for these properties
+    to have effect.
+
+    The default value for these properties is 400 pixels/second.
+
+    \sa highlightFollowsCurrentItem
+*/
+qreal QDeclarativeListView::highlightMoveSpeed() const
+{
+    Q_D(const QDeclarativeListView);\
+    return d->highlightMoveSpeed;
+}
+
+void QDeclarativeListView::setHighlightMoveSpeed(qreal speed)
+{
+    Q_D(QDeclarativeListView);\
+    if (d->highlightMoveSpeed != speed) {
+        d->highlightMoveSpeed = speed;
+        if (d->highlightPosAnimator)
+            d->highlightPosAnimator->setVelocity(d->highlightMoveSpeed);
+        emit highlightMoveSpeedChanged();
+    }
+}
+
+qreal QDeclarativeListView::highlightResizeSpeed() const
+{
+    Q_D(const QDeclarativeListView);\
+    return d->highlightResizeSpeed;
+}
+
+void QDeclarativeListView::setHighlightResizeSpeed(qreal speed)
+{
+    Q_D(QDeclarativeListView);\
+    if (d->highlightResizeSpeed != speed) {
+        d->highlightResizeSpeed = speed;
+        if (d->highlightSizeAnimator)
+            d->highlightSizeAnimator->setVelocity(d->highlightResizeSpeed);
+        emit highlightResizeSpeedChanged();
+    }
+}
+
+/*!
+    \qmlproperty enumeration ListView::snapMode
+
+    This property determines where the view will settle following a drag or flick.
+    The allowed values are:
+
+    \list
+    \o NoSnap (default) - the view will stop anywhere within the visible area.
+    \o SnapToItem - the view will settle with an item aligned with the start of
+    the view.
+    \o SnapOneItem - the view will settle no more than one item away from the first
+    visible item at the time the mouse button is released.  This mode is particularly
+    useful for moving one page at a time.
+    \endlist
+*/
+QDeclarativeListView::SnapMode QDeclarativeListView::snapMode() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->snapMode;
+}
+
+void QDeclarativeListView::setSnapMode(SnapMode mode)
+{
+    Q_D(QDeclarativeListView);
+    if (d->snapMode != mode) {
+        d->snapMode = mode;
+    }
+}
+
+QDeclarativeComponent *QDeclarativeListView::footer() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->footerComponent;
+}
+
+void QDeclarativeListView::setFooter(QDeclarativeComponent *footer)
+{
+    Q_D(QDeclarativeListView);
+    if (d->footerComponent != footer) {
+        if (d->footer) {
+            delete d->footer;
+            d->footer = 0;
+        }
+        d->footerComponent = footer;
+        d->minExtentDirty = true;
+        d->maxExtentDirty = true;
+        d->updateFooter();
+        d->updateViewport();
+    }
+}
+
+QDeclarativeComponent *QDeclarativeListView::header() const
+{
+    Q_D(const QDeclarativeListView);
+    return d->headerComponent;
+}
+
+void QDeclarativeListView::setHeader(QDeclarativeComponent *header)
+{
+    Q_D(QDeclarativeListView);
+    if (d->headerComponent != header) {
+        if (d->header) {
+            delete d->header;
+            d->header = 0;
+        }
+        d->headerComponent = header;
+        d->minExtentDirty = true;
+        d->maxExtentDirty = true;
+        d->updateHeader();
+        d->updateFooter();
+        d->updateViewport();
+    }
+}
+
+void QDeclarativeListView::viewportMoved()
+{
+    Q_D(QDeclarativeListView);
+    QDeclarativeFlickable::viewportMoved();
+    d->lazyRelease = true;
+    refill();
+    if (isFlicking() || d->moving)
+        d->moveReason = QDeclarativeListViewPrivate::Mouse;
+    if (d->moveReason != QDeclarativeListViewPrivate::SetIndex) {
+        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
+            // reposition highlight
+            qreal pos = d->highlight->position();
+            if (pos > d->position() + d->highlightRangeEnd - 1 - d->highlight->size())
+                pos = d->position() + d->highlightRangeEnd - 1 - d->highlight->size();
+            if (pos < d->position() + d->highlightRangeStart)
+                pos = d->position() + d->highlightRangeStart;
+            d->highlight->setPosition(pos);
+
+            // update current index
+            int idx = d->snapIndex();
+            if (idx >= 0 && idx != d->currentIndex)
+                d->updateCurrent(idx);
+        }
+    }
+
+    if (d->flicked && d->correctFlick && !d->inFlickCorrection) {
+        d->inFlickCorrection = true;
+        // Near an end and it seems that the extent has changed?
+        // Recalculate the flick so that we don't end up in an odd position.
+        if (yflick()) {
+            if (d->velocityY > 0) {
+                const qreal minY = minYExtent();
+                if ((minY - d->_moveY.value() < height()/2 || d->flickTargetY - d->_moveY.value() < height()/2)
+                    && minY != d->flickTargetY)
+                    d->flickY(-d->verticalVelocity.value());
+                d->bufferMode = QDeclarativeListViewPrivate::BufferBefore;
+            } else if (d->velocityY < 0) {
+                const qreal maxY = maxYExtent();
+                if ((d->_moveY.value() - maxY < height()/2 || d->_moveY.value() - d->flickTargetY < height()/2)
+                    && maxY != d->flickTargetY)
+                    d->flickY(-d->verticalVelocity.value());
+                d->bufferMode = QDeclarativeListViewPrivate::BufferAfter;
+            }
+        }
+
+        if (xflick()) {
+            if (d->velocityX > 0) {
+                const qreal minX = minXExtent();
+                if ((minX - d->_moveX.value() < height()/2 || d->flickTargetX - d->_moveX.value() < height()/2)
+                    && minX != d->flickTargetX)
+                    d->flickX(-d->horizontalVelocity.value());
+                d->bufferMode = QDeclarativeListViewPrivate::BufferBefore;
+            } else if (d->velocityX < 0) {
+                const qreal maxX = maxXExtent();
+                if ((d->_moveX.value() - maxX < height()/2 || d->_moveX.value() - d->flickTargetX < height()/2)
+                    && maxX != d->flickTargetX)
+                    d->flickX(-d->horizontalVelocity.value());
+                d->bufferMode = QDeclarativeListViewPrivate::BufferAfter;
+            }
+        }
+        d->inFlickCorrection = false;
+    }
+}
+
+qreal QDeclarativeListView::minYExtent() const
+{
+    Q_D(const QDeclarativeListView);
+    if (d->orient == QDeclarativeListView::Horizontal)
+        return QDeclarativeFlickable::minYExtent();
+    if (d->minExtentDirty) {
+        d->minExtent = -d->startPosition();
+        if (d->header && d->visibleItems.count())
+            d->minExtent += d->header->size();
+        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
+            d->minExtent += d->highlightRangeStart;
+        d->minExtentDirty = false;
+    }
+
+    return d->minExtent;
+}
+
+qreal QDeclarativeListView::maxYExtent() const
+{
+    Q_D(const QDeclarativeListView);
+    if (d->orient == QDeclarativeListView::Horizontal)
+        return height();
+    if (d->maxExtentDirty) {
+        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
+            d->maxExtent = -(d->positionAt(count()-1) - d->highlightRangeEnd);
+        else
+            d->maxExtent = -(d->endPosition() - height() + 1);
+        if (d->footer)
+            d->maxExtent -= d->footer->size();
+        qreal minY = minYExtent();
+        if (d->maxExtent > minY)
+            d->maxExtent = minY;
+        d->maxExtentDirty = false;
+    }
+    return d->maxExtent;
+}
+
+qreal QDeclarativeListView::minXExtent() const
+{
+    Q_D(const QDeclarativeListView);
+    if (d->orient == QDeclarativeListView::Vertical)
+        return QDeclarativeFlickable::minXExtent();
+    if (d->minExtentDirty) {
+        d->minExtent = -d->startPosition();
+        if (d->header)
+            d->minExtent += d->header->size();
+        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
+            d->minExtent += d->highlightRangeStart;
+        d->minExtentDirty = false;
+    }
+
+    return d->minExtent;
+}
+
+qreal QDeclarativeListView::maxXExtent() const
+{
+    Q_D(const QDeclarativeListView);
+    if (d->orient == QDeclarativeListView::Vertical)
+        return width();
+    if (d->maxExtentDirty) {
+        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
+            d->maxExtent = -(d->positionAt(count()-1) - d->highlightRangeEnd);
+        else
+            d->maxExtent = -(d->endPosition() - width() + 1);
+        if (d->footer)
+            d->maxExtent -= d->footer->size();
+        qreal minX = minXExtent();
+        if (d->maxExtent > minX)
+            d->maxExtent = minX;
+        d->maxExtentDirty = false;
+    }
+
+    return d->maxExtent;
+}
+
+void QDeclarativeListView::keyPressEvent(QKeyEvent *event)
+{
+    Q_D(QDeclarativeListView);
+    QDeclarativeFlickable::keyPressEvent(event);
+    if (event->isAccepted())
+        return;
+
+    if (d->model && d->model->count() && d->interactive) {
+        if ((d->orient == QDeclarativeListView::Horizontal && event->key() == Qt::Key_Left)
+                    || (d->orient == QDeclarativeListView::Vertical && event->key() == Qt::Key_Up)) {
+            if (currentIndex() > 0 || (d->wrap && !event->isAutoRepeat())) {
+                decrementCurrentIndex();
+                event->accept();
+                return;
+            } else if (d->wrap) {
+                event->accept();
+                return;
+            }
+        } else if ((d->orient == QDeclarativeListView::Horizontal && event->key() == Qt::Key_Right)
+                    || (d->orient == QDeclarativeListView::Vertical && event->key() == Qt::Key_Down)) {
+            if (currentIndex() < d->model->count() - 1 || (d->wrap && !event->isAutoRepeat())) {
+                incrementCurrentIndex();
+                event->accept();
+                return;
+            } else if (d->wrap) {
+                event->accept();
+                return;
+            }
+        }
+    }
+    event->ignore();
+}
+
+/*!
+    \qmlmethod ListView::incrementCurrentIndex()
+
+    Increments the current index.  The current index will wrap
+    if keyNavigationWraps is true and it is currently at the end.
+*/
+void QDeclarativeListView::incrementCurrentIndex()
+{
+    Q_D(QDeclarativeListView);
+    if (currentIndex() < d->model->count() - 1 || d->wrap) {
+        d->moveReason = QDeclarativeListViewPrivate::SetIndex;
+        int index = currentIndex()+1;
+        cancelFlick();
+        d->updateCurrent(index < d->model->count() ? index : 0);
+    }
+}
+
+/*!
+    \qmlmethod ListView::decrementCurrentIndex()
+
+    Decrements the current index.  The current index will wrap
+    if keyNavigationWraps is true and it is currently at the beginning.
+*/
+void QDeclarativeListView::decrementCurrentIndex()
+{
+    Q_D(QDeclarativeListView);
+    if (currentIndex() > 0 || d->wrap) {
+        d->moveReason = QDeclarativeListViewPrivate::SetIndex;
+        int index = currentIndex()-1;
+        cancelFlick();
+        d->updateCurrent(index >= 0 ? index : d->model->count()-1);
+    }
+}
+
+/*!
+    \qmlmethod ListView::positionViewAtIndex(int index)
+
+    Positions the view such that the \a index is at the top (or left for horizontal orientation) of the view.
+    If positioning the view at the index would cause empty space to be displayed at
+    the end of the view, the view will be positioned at the end.
+*/
+void QDeclarativeListView::positionViewAtIndex(int index)
+{
+    Q_D(QDeclarativeListView);
+    if (!d->isValid() || index < 0 || index >= d->model->count())
+        return;
+
+    qreal maxExtent = d->orient == QDeclarativeListView::Vertical ? -maxYExtent() : -maxXExtent();
+    FxListItem *item = d->visibleItem(index);
+    if (item) {
+        // Already created - just move to top of view
+        int pos = qMin(item->position(), maxExtent);
+        d->setPosition(pos);
+    } else {
+        int pos = d->positionAt(index);
+        // save the currently visible items in case any of them end up visible again
+        QList<FxListItem*> oldVisible = d->visibleItems;
+        d->visibleItems.clear();
+        d->visiblePos = pos;
+        d->visibleIndex = index;
+        d->setPosition(pos);
+        // setPosition() will cause refill.  Adjust if we have moved beyond range.
+        if (d->position() > maxExtent)
+            d->setPosition(maxExtent);
+        // now release the reference to all the old visible items.
+        for (int i = 0; i < oldVisible.count(); ++i)
+            d->releaseItem(oldVisible.at(i));
+    }
+    d->fixupPosition();
+}
+
+
+void QDeclarativeListView::componentComplete()
+{
+    Q_D(QDeclarativeListView);
+    QDeclarativeFlickable::componentComplete();
+    refill();
+    d->moveReason = QDeclarativeListViewPrivate::SetIndex;
+    if (d->currentIndex < 0)
+        d->updateCurrent(0);
+    else
+        d->updateCurrent(d->currentIndex);
+    d->fixupPosition();
+}
+
+void QDeclarativeListView::refill()
+{
+    Q_D(QDeclarativeListView);
+    d->refill(d->position(), d->position()+d->size()-1);
+}
+
+void QDeclarativeListView::trackedPositionChanged()
+{
+    Q_D(QDeclarativeListView);
+    if (!d->trackedItem || !d->currentItem)
+        return;
+    if (!isFlicking() && !d->moving && d->moveReason == QDeclarativeListViewPrivate::SetIndex) {
+        const qreal trackedPos = d->trackedItem->position();
+        const qreal viewPos = d->position();
+        if (d->haveHighlightRange) {
+            if (d->highlightRange == StrictlyEnforceRange) {
+                qreal pos = viewPos;
+                if (trackedPos > pos + d->highlightRangeEnd - d->trackedItem->size())
+                    pos = trackedPos - d->highlightRangeEnd + d->trackedItem->size();
+                if (trackedPos < pos + d->highlightRangeStart)
+                    pos = trackedPos - d->highlightRangeStart;
+                d->setPosition(pos);
+            } else {
+                qreal pos = viewPos;
+                if (trackedPos < d->startPosition() + d->highlightRangeStart) {
+                    pos = d->startPosition();
+                } else if (d->trackedItem->endPosition() > d->endPosition() - d->size() + d->highlightRangeEnd) {
+                    pos = d->endPosition() - d->size();
+                    if (pos < d->startPosition())
+                        pos = d->startPosition();
+                } else {
+                    if (trackedPos < viewPos + d->highlightRangeStart) {
+                        pos = trackedPos - d->highlightRangeStart;
+                    } else if (trackedPos > viewPos + d->highlightRangeEnd - d->trackedItem->size()) {
+                        pos = trackedPos - d->highlightRangeEnd + d->trackedItem->size();
+                    }
+                }
+                d->setPosition(pos);
+            }
+        } else {
+            if (trackedPos < viewPos && d->currentItem->position() < viewPos) {
+                d->setPosition(d->currentItem->position() < trackedPos ? trackedPos : d->currentItem->position());
+            } else if (d->trackedItem->endPosition() > viewPos + d->size()
+                        && d->currentItem->endPosition() > viewPos + d->size()) {
+                qreal pos;
+                if (d->trackedItem->endPosition() < d->currentItem->endPosition()) {
+                    pos = d->trackedItem->endPosition() - d->size();
+                    if (d->trackedItem->size() > d->size())
+                        pos = trackedPos;
+                } else {
+                    pos = d->currentItem->endPosition() - d->size();
+                    if (d->currentItem->size() > d->size())
+                        pos = d->currentItem->position();
+                }
+                d->setPosition(pos);
+            }
+        }
+    }
+}
+
+void QDeclarativeListView::itemsInserted(int modelIndex, int count)
+{
+    Q_D(QDeclarativeListView);
+    d->updateUnrequestedIndexes();
+    d->moveReason = QDeclarativeListViewPrivate::Other;
+    if (!d->visibleItems.count() || d->model->count() <= 1) {
+        d->layout();
+        d->updateCurrent(qMax(0, qMin(d->currentIndex, d->model->count()-1)));
+        emit countChanged();
+        return;
+    }
+
+    int overlapCount = count;
+    if (!d->mapRangeFromModel(modelIndex, overlapCount)) {
+        int i = d->visibleItems.count() - 1;
+        while (i > 0 && d->visibleItems.at(i)->index == -1)
+            --i;
+        if (d->visibleItems.at(i)->index + 1 == modelIndex) {
+            // Special case of appending an item to the model.
+            modelIndex = d->visibleIndex + d->visibleItems.count();
+        } else {
+            if (modelIndex < d->visibleIndex) {
+                // Insert before visible items
+                d->visibleIndex += count;
+                for (int i = 0; i < d->visibleItems.count(); ++i) {
+                    FxListItem *listItem = d->visibleItems.at(i);
+                    if (listItem->index != -1 && listItem->index >= modelIndex)
+                        listItem->index += count;
+                }
+            }
+            if (d->currentIndex >= modelIndex) {
+                // adjust current item index
+                d->currentIndex += count;
+                if (d->currentItem)
+                    d->currentItem->index = d->currentIndex;
+            }
+            d->layout();
+            emit countChanged();
+            return;
+        }
+    }
+
+    // At least some of the added items will be visible
+
+    int index = modelIndex - d->visibleIndex;
+    // index can be the next item past the end of the visible items list (i.e. appended)
+    int pos = index < d->visibleItems.count() ? d->visibleItems.at(index)->position()
+                                                : d->visibleItems.at(index-1)->endPosition()+d->spacing+1;
+    int initialPos = pos;
+    int diff = 0;
+    QList<FxListItem*> added;
+    bool addedVisible = false;
+    FxListItem *firstVisible = d->firstVisibleItem();
+    if (firstVisible && pos < firstVisible->position()) {
+        // Insert items before the visible item.
+        int insertionIdx = index;
+        int i = 0;
+        int from = d->position() - d->buffer;
+        for (i = count-1; i >= 0 && pos > from; --i) {
+            addedVisible = true;
+            FxListItem *item = d->createItem(modelIndex + i);
+            d->visibleItems.insert(insertionIdx, item);
+            pos -= item->size() + d->spacing;
+            item->setPosition(pos);
+            index++;
+        }
+        if (i >= 0) {
+            // If we didn't insert all our new items - anything
+            // before the current index is not visible - remove it.
+            while (insertionIdx--) {
+                FxListItem *item = d->visibleItems.takeFirst();
+                if (item->index != -1)
+                    d->visibleIndex++;
+                d->releaseItem(item);
+            }
+        } else {
+            // adjust pos of items before inserted items.
+            for (int i = insertionIdx-1; i >= 0; i--) {
+                FxListItem *listItem = d->visibleItems.at(i);
+                listItem->setPosition(listItem->position() - (initialPos - pos));
+            }
+        }
+    } else {
+        int i = 0;
+        int to = d->buffer+d->position()+d->size()-1;
+        for (i = 0; i < count && pos <= to; ++i) {
+            addedVisible = true;
+            FxListItem *item = d->createItem(modelIndex + i);
+            d->visibleItems.insert(index, item);
+            item->setPosition(pos);
+            added.append(item);
+            pos += item->size() + d->spacing;
+            ++index;
+        }
+        if (i != count) {
+            // We didn't insert all our new items, which means anything
+            // beyond the current index is not visible - remove it.
+            while (d->visibleItems.count() > index)
+                d->releaseItem(d->visibleItems.takeLast());
+        }
+        diff = pos - initialPos;
+    }
+    if (d->currentIndex >= modelIndex) {
+        // adjust current item index
+        d->currentIndex += count;
+        if (d->currentItem) {
+            d->currentItem->index = d->currentIndex;
+            d->currentItem->setPosition(d->currentItem->position() + diff);
+        }
+    }
+    // Update the indexes of the following visible items.
+    for (; index < d->visibleItems.count(); ++index) {
+        FxListItem *listItem = d->visibleItems.at(index);
+        if (d->currentItem && listItem->item != d->currentItem->item)
+            listItem->setPosition(listItem->position() + diff);
+        if (listItem->index != -1)
+            listItem->index += count;
+    }
+    // everything is in order now - emit add() signal
+    for (int j = 0; j < added.count(); ++j)
+        added.at(j)->attached->emitAdd();
+
+    if (addedVisible)
+        d->layout();
+    emit countChanged();
+}
+
+void QDeclarativeListView::itemsRemoved(int modelIndex, int count)
+{
+    Q_D(QDeclarativeListView);
+    d->moveReason = QDeclarativeListViewPrivate::Other;
+    d->updateUnrequestedIndexes();
+
+    FxListItem *firstVisible = d->firstVisibleItem();
+    int preRemovedSize = 0;
+    bool removedVisible = false;
+    // Remove the items from the visible list, skipping anything already marked for removal
+    QList<FxListItem*>::Iterator it = d->visibleItems.begin();
+    while (it != d->visibleItems.end()) {
+        FxListItem *item = *it;
+        if (item->index == -1 || item->index < modelIndex) {
+            // already removed, or before removed items
+            ++it;
+        } else if (item->index >= modelIndex + count) {
+            // after removed items
+            item->index -= count;
+            ++it;
+        } else {
+            // removed item
+            removedVisible = true;
+            item->attached->emitRemove();
+            if (item->attached->delayRemove()) {
+                item->index = -1;
+                connect(item->attached, SIGNAL(delayRemoveChanged()), this, SLOT(destroyRemoved()), Qt::QueuedConnection);
+                ++it;
+            } else {
+                if (item == firstVisible)
+                    firstVisible = 0;
+                if (firstVisible && item->position() < firstVisible->position())
+                    preRemovedSize += item->size();
+                it = d->visibleItems.erase(it);
+                d->releaseItem(item);
+            }
+        }
+    }
+
+    if (firstVisible && d->visibleItems.first() != firstVisible)
+        d->visibleItems.first()->setPosition(d->visibleItems.first()->position() + preRemovedSize);
+
+    // fix current
+    if (d->currentIndex >= modelIndex + count) {
+        d->currentIndex -= count;
+        if (d->currentItem)
+            d->currentItem->index -= count;
+    } else if (d->currentIndex >= modelIndex && d->currentIndex < modelIndex + count) {
+        // current item has been removed.
+        d->currentItem->attached->setIsCurrentItem(false);
+        d->releaseItem(d->currentItem);
+        d->currentItem = 0;
+        d->currentIndex = -1;
+        d->updateCurrent(qMin(modelIndex, d->model->count()-1));
+    }
+
+    // update visibleIndex
+    for (it = d->visibleItems.begin(); it != d->visibleItems.end(); ++it) {
+        if ((*it)->index != -1) {
+            d->visibleIndex = (*it)->index;
+            break;
+        }
+    }
+
+    if (removedVisible) {
+        if (d->visibleItems.isEmpty()) {
+            d->visibleIndex = 0;
+            d->visiblePos = d->header ? d->header->size() : 0;
+            d->timeline.clear();
+            d->setPosition(0);
+            if (d->model->count() == 0)
+                update();
+            else
+                refill();
+        } else {
+            // Correct the positioning of the items
+            d->layout();
+        }
+    }
+
+    emit countChanged();
+}
+
+void QDeclarativeListView::destroyRemoved()
+{
+    Q_D(QDeclarativeListView);
+    for (QList<FxListItem*>::Iterator it = d->visibleItems.begin();
+            it != d->visibleItems.end();) {
+        FxListItem *listItem = *it;
+        if (listItem->index == -1 && listItem->attached->delayRemove() == false) {
+            d->releaseItem(listItem);
+            it = d->visibleItems.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
+    // Correct the positioning of the items
+    d->layout();
+}
+
+void QDeclarativeListView::itemsMoved(int from, int to, int count)
+{
+    Q_D(QDeclarativeListView);
+    d->updateUnrequestedIndexes();
+
+    if (d->visibleItems.isEmpty()) {
+        refill();
+        return;
+    }
+
+    d->moveReason = QDeclarativeListViewPrivate::Other;
+    FxListItem *firstVisible = d->firstVisibleItem();
+    qreal firstItemPos = firstVisible->position();
+    QHash<int,FxListItem*> moved;
+    int moveBy = 0;
+
+    QList<FxListItem*>::Iterator it = d->visibleItems.begin();
+    while (it != d->visibleItems.end()) {
+        FxListItem *item = *it;
+        if (item->index >= from && item->index < from + count) {
+            // take the items that are moving
+            item->index += (to-from);
+            moved.insert(item->index, item);
+            if (item->position() < firstItemPos)
+                moveBy += item->size();
+            it = d->visibleItems.erase(it);
+        } else {
+            // move everything after the moved items.
+            if (item->index > from && item->index != -1)
+                item->index -= count;
+            ++it;
+        }
+    }
+
+    int remaining = count;
+    int endIndex = d->visibleIndex;
+    it = d->visibleItems.begin();
+    while (it != d->visibleItems.end()) {
+        FxListItem *item = *it;
+        if (remaining && item->index >= to && item->index < to + count) {
+            // place items in the target position, reusing any existing items
+            FxListItem *movedItem = moved.take(item->index);
+            if (!movedItem)
+                movedItem = d->createItem(item->index);
+            if (item->index <= firstVisible->index)
+                moveBy -= movedItem->size();
+            it = d->visibleItems.insert(it, movedItem);
+            ++it;
+            --remaining;
+        } else {
+            if (item->index != -1) {
+                if (item->index >= to) {
+                    // update everything after the moved items.
+                    item->index += count;
+                }
+                endIndex = item->index;
+            }
+            ++it;
+        }
+    }
+
+    // If we have moved items to the end of the visible items
+    // then add any existing moved items that we have
+    while (FxListItem *item = moved.take(endIndex+1)) {
+        d->visibleItems.append(item);
+        ++endIndex;
+    }
+
+    // update visibleIndex
+    for (it = d->visibleItems.begin(); it != d->visibleItems.end(); ++it) {
+        if ((*it)->index != -1) {
+            d->visibleIndex = (*it)->index;
+            break;
+        }
+    }
+
+    // Fix current index
+    if (d->currentIndex >= 0 && d->currentItem) {
+        int oldCurrent = d->currentIndex;
+        d->currentIndex = d->model->indexOf(d->currentItem->item, this);
+        if (oldCurrent != d->currentIndex) {
+            d->currentItem->index = d->currentIndex;
+            emit currentIndexChanged();
+        }
+    }
+
+    // Whatever moved items remain are no longer visible items.
+    while (moved.count()) {
+        int idx = moved.begin().key();
+        FxListItem *item = moved.take(idx);
+        if (item->item == d->currentItem->item)
+            item->setPosition(d->positionAt(idx));
+        d->releaseItem(item);
+    }
+
+    // Ensure we don't cause an ugly list scroll.
+    d->visibleItems.first()->setPosition(d->visibleItems.first()->position() + moveBy);
+
+    d->layout();
+}
+
+void QDeclarativeListView::createdItem(int index, QDeclarativeItem *item)
+{
+    Q_D(QDeclarativeListView);
+    if (d->requestedIndex != index) {
+        item->setParentItem(viewport());
+        d->unrequestedItems.insert(item, index);
+        if (d->orient == QDeclarativeListView::Vertical)
+            item->setY(d->positionAt(index));
+        else
+            item->setX(d->positionAt(index));
+    }
+}
+
+void QDeclarativeListView::destroyingItem(QDeclarativeItem *item)
+{
+    Q_D(QDeclarativeListView);
+    d->unrequestedItems.remove(item);
+}
+
+void QDeclarativeListView::animStopped()
+{
+    Q_D(QDeclarativeListView);
+    d->moveReason = QDeclarativeListViewPrivate::Other;
+    d->bufferMode = QDeclarativeListViewPrivate::NoBuffer;
+}
+
+QDeclarativeListViewAttached *QDeclarativeListView::qmlAttachedProperties(QObject *obj)
+{
+    return new QDeclarativeListViewAttached(obj);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h
new file mode 100644
index 0000000..1b6276e
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h
@@ -0,0 +1,305 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELISTVIEW_H
+#define QDECLARATIVELISTVIEW_H
+
+#include "qdeclarativeflickable_p.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_DECLARATIVE_EXPORT QDeclarativeViewSection : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY changed)
+    Q_PROPERTY(SectionCriteria criteria READ criteria WRITE setCriteria NOTIFY changed)
+    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
+    Q_ENUMS(SectionCriteria)
+public:
+    QDeclarativeViewSection(QObject *parent=0) : QObject(parent), m_criteria(FullString), m_delegate(0) {}
+
+    QString property() const { return m_property; }
+    void setProperty(const QString &);
+
+    enum SectionCriteria { FullString, FirstCharacter };
+    SectionCriteria criteria() const { return m_criteria; }
+    void setCriteria(SectionCriteria);
+
+    QDeclarativeComponent *delegate() const { return m_delegate; }
+    void setDelegate(QDeclarativeComponent *delegate);
+
+    QString sectionString(const QString &value);
+
+Q_SIGNALS:
+    void changed();
+    void delegateChanged();
+
+private:
+    QString m_property;
+    SectionCriteria m_criteria;
+    QDeclarativeComponent *m_delegate;
+};
+
+
+class QDeclarativeVisualModel;
+class QDeclarativeListViewAttached;
+class QDeclarativeListViewPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeListView : public QDeclarativeFlickable
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeListView)
+
+    Q_PROPERTY(QVariant model READ model WRITE setModel)
+    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate)
+    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
+    Q_PROPERTY(QDeclarativeItem *currentItem READ currentItem NOTIFY currentIndexChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+
+    Q_PROPERTY(QDeclarativeComponent *highlight READ highlight WRITE setHighlight)
+    Q_PROPERTY(QDeclarativeItem *highlightItem READ highlightItem NOTIFY highlightChanged)
+    Q_PROPERTY(bool highlightFollowsCurrentItem READ highlightFollowsCurrentItem WRITE setHighlightFollowsCurrentItem)
+    Q_PROPERTY(qreal highlightMoveSpeed READ highlightMoveSpeed WRITE setHighlightMoveSpeed NOTIFY highlightMoveSpeedChanged)
+    Q_PROPERTY(qreal highlightResizeSpeed READ highlightResizeSpeed WRITE setHighlightResizeSpeed NOTIFY highlightResizeSpeedChanged)
+
+    Q_PROPERTY(qreal preferredHighlightBegin READ preferredHighlightBegin WRITE setPreferredHighlightBegin)
+    Q_PROPERTY(qreal preferredHighlightEnd READ preferredHighlightEnd WRITE setPreferredHighlightEnd)
+    Q_PROPERTY(HighlightRangeMode highlightRangeMode READ highlightRangeMode WRITE setHighlightRangeMode)
+
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
+    Q_PROPERTY(Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged)
+    Q_PROPERTY(bool keyNavigationWraps READ isWrapEnabled WRITE setWrapEnabled)
+    Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer)
+    Q_PROPERTY(QDeclarativeViewSection *section READ sectionCriteria CONSTANT)
+    Q_PROPERTY(QString currentSection READ currentSection NOTIFY currentSectionChanged)
+
+    Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode)
+
+    Q_PROPERTY(QDeclarativeComponent *header READ header WRITE setHeader)
+    Q_PROPERTY(QDeclarativeComponent *footer READ footer WRITE setFooter)
+
+    Q_ENUMS(HighlightRangeMode)
+    Q_ENUMS(Orientation)
+    Q_ENUMS(SnapMode)
+    Q_CLASSINFO("DefaultProperty", "data")
+
+public:
+    QDeclarativeListView(QDeclarativeItem *parent=0);
+    ~QDeclarativeListView();
+
+    QVariant model() const;
+    void setModel(const QVariant &);
+
+    QDeclarativeComponent *delegate() const;
+    void setDelegate(QDeclarativeComponent *);
+
+    int currentIndex() const;
+    void setCurrentIndex(int idx);
+
+    QDeclarativeItem *currentItem();
+    QDeclarativeItem *highlightItem();
+    int count() const;
+
+    QDeclarativeComponent *highlight() const;
+    void setHighlight(QDeclarativeComponent *highlight);
+
+    bool highlightFollowsCurrentItem() const;
+    void setHighlightFollowsCurrentItem(bool);
+
+    enum HighlightRangeMode { NoHighlightRange, ApplyRange, StrictlyEnforceRange };
+    HighlightRangeMode highlightRangeMode() const;
+    void setHighlightRangeMode(HighlightRangeMode mode);
+
+    qreal preferredHighlightBegin() const;
+    void setPreferredHighlightBegin(qreal);
+
+    qreal preferredHighlightEnd() const;
+    void setPreferredHighlightEnd(qreal);
+
+    qreal spacing() const;
+    void setSpacing(qreal spacing);
+
+    enum Orientation { Horizontal = Qt::Horizontal, Vertical = Qt::Vertical };
+    Orientation orientation() const;
+    void setOrientation(Orientation);
+
+    bool isWrapEnabled() const;
+    void setWrapEnabled(bool);
+
+    int cacheBuffer() const;
+    void setCacheBuffer(int);
+
+    QDeclarativeViewSection *sectionCriteria();
+    QString currentSection() const;
+
+    qreal highlightMoveSpeed() const;
+    void setHighlightMoveSpeed(qreal);
+
+    qreal highlightResizeSpeed() const;
+    void setHighlightResizeSpeed(qreal);
+
+    enum SnapMode { NoSnap, SnapToItem, SnapOneItem };
+    SnapMode snapMode() const;
+    void setSnapMode(SnapMode mode);
+
+    QDeclarativeComponent *footer() const;
+    void setFooter(QDeclarativeComponent *);
+
+    QDeclarativeComponent *header() const;
+    void setHeader(QDeclarativeComponent *);
+
+    static QDeclarativeListViewAttached *qmlAttachedProperties(QObject *);
+
+public Q_SLOTS:
+    void incrementCurrentIndex();
+    void decrementCurrentIndex();
+    void positionViewAtIndex(int index);
+
+Q_SIGNALS:
+    void countChanged();
+    void spacingChanged();
+    void orientationChanged();
+    void currentIndexChanged();
+    void currentSectionChanged();
+    void highlightMoveSpeedChanged();
+    void highlightResizeSpeedChanged();
+    void highlightChanged();
+
+protected:
+    virtual void viewportMoved();
+    virtual qreal minYExtent() const;
+    virtual qreal maxYExtent() const;
+    virtual qreal minXExtent() const;
+    virtual qreal maxXExtent() const;
+    virtual void keyPressEvent(QKeyEvent *);
+    virtual void componentComplete();
+
+private Q_SLOTS:
+    void refill();
+    void trackedPositionChanged();
+    void itemsInserted(int index, int count);
+    void itemsRemoved(int index, int count);
+    void itemsMoved(int from, int to, int count);
+    void destroyRemoved();
+    void createdItem(int index, QDeclarativeItem *item);
+    void destroyingItem(QDeclarativeItem *item);
+    void animStopped();
+};
+
+class QDeclarativeListViewAttached : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeListViewAttached(QObject *parent)
+        : QObject(parent), m_view(0), m_isCurrent(false), m_delayRemove(false) {}
+    ~QDeclarativeListViewAttached() {}
+
+    Q_PROPERTY(QDeclarativeListView *view READ view CONSTANT)
+    QDeclarativeListView *view() { return m_view; }
+
+    Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged)
+    bool isCurrentItem() const { return m_isCurrent; }
+    void setIsCurrentItem(bool c) {
+        if (m_isCurrent != c) {
+            m_isCurrent = c;
+            emit currentItemChanged();
+        }
+    }
+
+    Q_PROPERTY(QString prevSection READ prevSection NOTIFY prevSectionChanged)
+    QString prevSection() const { return m_prevSection; }
+    void setPrevSection(const QString &sect) {
+        if (m_prevSection != sect) {
+            m_prevSection = sect;
+            emit prevSectionChanged();
+        }
+    }
+
+    Q_PROPERTY(QString section READ section NOTIFY sectionChanged)
+    QString section() const { return m_section; }
+    void setSection(const QString &sect) {
+        if (m_section != sect) {
+            m_section = sect;
+            emit sectionChanged();
+        }
+    }
+
+    Q_PROPERTY(bool delayRemove READ delayRemove WRITE setDelayRemove NOTIFY delayRemoveChanged)
+    bool delayRemove() const { return m_delayRemove; }
+    void setDelayRemove(bool delay) {
+        if (m_delayRemove != delay) {
+            m_delayRemove = delay;
+            emit delayRemoveChanged();
+        }
+    }
+
+    void emitAdd() { emit add(); }
+    void emitRemove() { emit remove(); }
+
+Q_SIGNALS:
+    void currentItemChanged();
+    void sectionChanged();
+    void prevSectionChanged();
+    void delayRemoveChanged();
+    void add();
+    void remove();
+
+public:
+    QDeclarativeListView *m_view;
+    bool m_isCurrent;
+    mutable QString m_section;
+    QString m_prevSection;
+    bool m_delayRemove;
+};
+
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPEINFO(QDeclarativeListView, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QDeclarativeListView)
+QML_DECLARE_TYPE(QDeclarativeViewSection)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
new file mode 100644
index 0000000..bd89321
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -0,0 +1,488 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeloader_p_p.h"
+
+#include <qdeclarativeengine_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeLoaderPrivate::QDeclarativeLoaderPrivate()
+    : item(0), component(0), ownComponent(false)
+    , resizeMode(QDeclarativeLoader::SizeLoaderToItem)
+{
+}
+
+QDeclarativeLoaderPrivate::~QDeclarativeLoaderPrivate()
+{
+}
+
+void QDeclarativeLoaderPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem, const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    if (resizeItem == item && resizeMode == QDeclarativeLoader::SizeLoaderToItem) {
+        _q_updateSize();
+    }
+    QDeclarativeItemChangeListener::itemGeometryChanged(resizeItem, newGeometry, oldGeometry);
+}
+
+void QDeclarativeLoaderPrivate::clear()
+{
+    if (ownComponent) {
+        delete component;
+        component = 0;
+        ownComponent = false;
+    }
+    source = QUrl();
+
+    if (item) {
+        if (QDeclarativeItem *qmlItem = qobject_cast<QDeclarativeItem*>(item)) {
+            if (resizeMode == QDeclarativeLoader::SizeLoaderToItem) {
+                QDeclarativeItemPrivate *p =
+                    static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(qmlItem));
+                p->removeItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
+            }
+        }
+
+        // We can't delete immediately because our item may have triggered
+        // the Loader to load a different item.
+        item->setVisible(false);
+        item->setParentItem(0);
+        item->deleteLater();
+        item = 0;
+    }
+}
+
+void QDeclarativeLoaderPrivate::initResize()
+{
+    Q_Q(QDeclarativeLoader);
+    if (QDeclarativeItem *qmlItem = qobject_cast<QDeclarativeItem*>(item)) {
+        if (resizeMode == QDeclarativeLoader::SizeLoaderToItem) {
+            QDeclarativeItemPrivate *p =
+                static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(qmlItem));
+            p->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
+        }
+    } else if (item && item->isWidget()) {
+        QGraphicsWidget *widget = static_cast<QGraphicsWidget*>(item);
+        if (resizeMode == QDeclarativeLoader::SizeLoaderToItem) {
+            widget->installEventFilter(q);
+        }
+    }
+    _q_updateSize();
+}
+
+/*!
+    \qmlclass Loader QDeclarativeLoader
+    \since 4.7
+    \inherits Item
+
+    \brief The Loader item allows dynamically loading an Item-based
+    subtree from a QML URL or Component.
+
+    Loader instantiates an item from a component. The component to
+    instantiate may be specified directly by the \c sourceComponent
+    property, or loaded from a URL via the \c source property.
+
+    It is also an effective means of delaying the creation of a component
+    until it is required:
+    \code
+    Loader { id: pageLoader }
+    Rectangle {
+        MouseArea { anchors.fill: parent; onClicked: pageLoader.source = "Page1.qml" }
+    }
+    \endcode
+
+    If the Loader source is changed, any previous items instantiated
+    will be destroyed.  Setting \c source to an empty string
+    will destroy the currently instantiated items, freeing resources
+    and leaving the Loader empty.  For example:
+
+    \code
+    pageLoader.source = ""
+    \endcode
+
+    unloads "Page1.qml" and frees resources consumed by it.
+
+    \sa {dynamic-object-creation}{Dynamic Object Creation}
+*/
+
+/*!
+    \internal
+    \class QDeclarativeLoader
+    \qmlclass Loader
+ */
+
+/*!
+    Create a new QDeclarativeLoader instance.
+ */
+QDeclarativeLoader::QDeclarativeLoader(QDeclarativeItem *parent)
+  : QDeclarativeItem(*(new QDeclarativeLoaderPrivate), parent)
+{
+}
+
+/*!
+    Destroy the loader instance.
+ */
+QDeclarativeLoader::~QDeclarativeLoader()
+{
+}
+
+/*!
+    \qmlproperty url Loader::source
+    This property holds the URL of the QML component to
+    instantiate.
+
+    \sa sourceComponent, status, progress
+*/
+QUrl QDeclarativeLoader::source() const
+{
+    Q_D(const QDeclarativeLoader);
+    return d->source;
+}
+
+void QDeclarativeLoader::setSource(const QUrl &url)
+{
+    Q_D(QDeclarativeLoader);
+    if (d->source == url)
+        return;
+
+    d->clear();
+
+    d->source = url;
+    if (d->source.isEmpty()) {
+        emit sourceChanged();
+        emit statusChanged();
+        emit progressChanged();
+        emit itemChanged();
+        return;
+    }
+
+    d->component = new QDeclarativeComponent(qmlEngine(this), d->source, this);
+    d->ownComponent = true;
+    if (!d->component->isLoading()) {
+        d->_q_sourceLoaded();
+    } else {
+        connect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
+                this, SLOT(_q_sourceLoaded()));
+        connect(d->component, SIGNAL(progressChanged(qreal)),
+                this, SIGNAL(progressChanged()));
+        emit statusChanged();
+        emit progressChanged();
+        emit sourceChanged();
+        emit itemChanged();
+    }
+}
+
+/*!
+    \qmlproperty Component Loader::sourceComponent
+    The sourceComponent property holds the \l{Component} to instantiate.
+
+    \qml
+    Item {
+        Component {
+            id: redSquare
+            Rectangle { color: "red"; width: 10; height: 10 }
+        }
+
+        Loader { sourceComponent: redSquare }
+        Loader { sourceComponent: redSquare; x: 10 }
+    }
+    \endqml
+
+    \sa source, progress
+*/
+
+QDeclarativeComponent *QDeclarativeLoader::sourceComponent() const
+{
+    Q_D(const QDeclarativeLoader);
+    return d->component;
+}
+
+void QDeclarativeLoader::setSourceComponent(QDeclarativeComponent *comp)
+{
+    Q_D(QDeclarativeLoader);
+    if (comp == d->component)
+        return;
+
+    d->clear();
+
+    d->component = comp;
+    d->ownComponent = false;
+    if (!d->component) {
+        emit sourceChanged();
+        emit statusChanged();
+        emit progressChanged();
+        emit itemChanged();
+        return;
+    }
+
+    if (!d->component->isLoading()) {
+        d->_q_sourceLoaded();
+    } else {
+        connect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
+                this, SLOT(_q_sourceLoaded()));
+        connect(d->component, SIGNAL(progressChanged(qreal)),
+                this, SIGNAL(progressChanged()));
+        emit progressChanged();
+        emit sourceChanged();
+        emit statusChanged();
+        emit itemChanged();
+    }
+}
+
+void QDeclarativeLoaderPrivate::_q_sourceLoaded()
+{
+    Q_Q(QDeclarativeLoader);
+
+    if (component) {
+        QDeclarativeContext *ctxt = new QDeclarativeContext(qmlContext(q));
+        ctxt->addDefaultObject(q);
+
+        if (!component->errors().isEmpty()) {
+            qWarning() << component->errors();
+            emit q->sourceChanged();
+            emit q->statusChanged();
+            emit q->progressChanged();
+            return;
+        }
+
+        QObject *obj = component->create(ctxt);
+        if (obj) {
+            ctxt->setParent(obj);
+            item = qobject_cast<QGraphicsObject *>(obj);
+            if (item) {
+                if (QDeclarativeItem* qmlItem = qobject_cast<QDeclarativeItem *>(item)) {
+                    qmlItem->setParentItem(q);
+                } else {
+                    item->setParentItem(q);
+                    item->setParent(q);
+                }
+//                item->setFocus(true);
+                initResize();
+            }
+        } else {
+            delete obj;
+            delete ctxt;
+            source = QUrl();
+        }
+        emit q->sourceChanged();
+        emit q->statusChanged();
+        emit q->progressChanged();
+        emit q->itemChanged();
+    }
+}
+
+/*!
+    \qmlproperty enum Loader::status
+
+    This property holds the status of QML loading.  It can be one of:
+    \list
+    \o Null - no QML source has been set
+    \o Ready - the QML source has been loaded
+    \o Loading - the QML source is currently being loaded
+    \o Error - an error occurred while loading the QML source
+    \endlist
+
+    \sa progress
+*/
+
+QDeclarativeLoader::Status QDeclarativeLoader::status() const
+{
+    Q_D(const QDeclarativeLoader);
+
+    if (d->component)
+        return static_cast<QDeclarativeLoader::Status>(d->component->status());
+
+    if (d->item)
+        return Ready;
+
+    return d->source.isEmpty() ? Null : Error;
+}
+
+/*!
+    \qmlproperty real Loader::progress
+
+    This property holds the progress of QML data loading, from 0.0 (nothing loaded)
+    to 1.0 (finished).
+
+    \sa status
+*/
+qreal QDeclarativeLoader::progress() const
+{
+    Q_D(const QDeclarativeLoader);
+
+    if (d->item)
+        return 1.0;
+
+    if (d->component)
+        return d->component->progress();
+
+    return 0.0;
+}
+
+/*!
+    \qmlproperty enum Loader::resizeMode
+
+    This property determines how the Loader or item are resized:
+    \list
+    \o NoResize - no item will be resized
+    \o SizeLoaderToItem - the Loader will be sized to the size of the item, unless the size of the Loader has been otherwise specified.
+    \o SizeItemToLoader - the item will be sized to the size of the Loader.
+    \endlist
+
+    Note that changing from SizeItemToLoader to SizeLoaderToItem
+    after the component is loaded will not return the item or Loader
+    to it's original size.  This is due to the item size being adjusted
+    to the Loader size, thereby losing the original size of the item.
+    Future changes to the item's size will affect the loader, however.
+
+    The default resizeMode is SizeLoaderToItem.
+*/
+QDeclarativeLoader::ResizeMode QDeclarativeLoader::resizeMode() const
+{
+    Q_D(const QDeclarativeLoader);
+    return d->resizeMode;
+}
+
+void QDeclarativeLoader::setResizeMode(ResizeMode mode)
+{
+    Q_D(QDeclarativeLoader);
+    if (mode == d->resizeMode)
+        return;
+
+    if (QDeclarativeItem *qmlItem = qobject_cast<QDeclarativeItem*>(d->item)) {
+        if (d->resizeMode == SizeLoaderToItem) {
+            QDeclarativeItemPrivate *p =
+                static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(qmlItem));
+            p->removeItemChangeListener(d, QDeclarativeItemPrivate::Geometry);
+        }
+    } else if (d->item && d->item->isWidget()) {
+        if (d->resizeMode == SizeLoaderToItem)
+            d->item->removeEventFilter(this);
+    }
+
+    d->resizeMode = mode;
+    emit resizeModeChanged();
+    d->initResize();
+}
+
+void QDeclarativeLoaderPrivate::_q_updateSize()
+{
+    Q_Q(QDeclarativeLoader);
+    if (!item)
+        return;
+    if (QDeclarativeItem *qmlItem = qobject_cast<QDeclarativeItem*>(item)) {
+        if (resizeMode == QDeclarativeLoader::SizeLoaderToItem) {
+            q->setWidth(qmlItem->width());
+            q->setHeight(qmlItem->height());
+        } else if (resizeMode == QDeclarativeLoader::SizeItemToLoader) {
+            qmlItem->setWidth(q->width());
+            qmlItem->setHeight(q->height());
+        }
+    } else if (item && item->isWidget()) {
+        QGraphicsWidget *widget = static_cast<QGraphicsWidget*>(item);
+        if (resizeMode == QDeclarativeLoader::SizeLoaderToItem) {
+            QSizeF newSize = widget->size();
+            if (newSize.isValid()) {
+                q->setWidth(newSize.width());
+                q->setHeight(newSize.height());
+            }
+        } else if (resizeMode == QDeclarativeLoader::SizeItemToLoader) {
+            QSizeF oldSize = widget->size();
+            QSizeF newSize = oldSize;
+            if (q->heightValid())
+                newSize.setHeight(q->height());
+            if (q->widthValid())
+                newSize.setWidth(q->width());
+            if (oldSize != newSize)
+                widget->resize(newSize);
+        }
+    }
+}
+
+/*!
+    \qmlproperty Item Loader::item
+    This property holds the top-level item created from source.
+*/
+QGraphicsObject *QDeclarativeLoader::item() const
+{
+    Q_D(const QDeclarativeLoader);
+    return d->item;
+}
+
+void QDeclarativeLoader::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    Q_D(QDeclarativeLoader);
+    if (newGeometry != oldGeometry) {
+        if (d->resizeMode == SizeItemToLoader) {
+            d->_q_updateSize();
+        }
+    }
+    QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
+}
+
+QVariant QDeclarativeLoader::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    Q_D(QDeclarativeLoader);
+    if (change == ItemSceneHasChanged) {
+        if (d->item && d->item->isWidget()) {
+            if (d->resizeMode == SizeLoaderToItem) {
+                d->item->removeEventFilter(this);
+                d->item->installEventFilter(this);
+            }
+        }
+    }
+    return QDeclarativeItem::itemChange(change, value);
+}
+
+bool QDeclarativeLoader::eventFilter(QObject *watched, QEvent *e)
+{
+    Q_D(QDeclarativeLoader);
+    if (watched == d->item && e->type() == QEvent::GraphicsSceneResize) {
+        if (d->item && d->item->isWidget() && d->resizeMode == SizeLoaderToItem) {
+            d->_q_updateSize();
+       }
+    }
+    return QDeclarativeItem::eventFilter(watched, e);
+}
+
+#include <moc_qdeclarativeloader_p.cpp>
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p.h
new file mode 100644
index 0000000..65538a8
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p.h
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELOADER_H
+#define QDECLARATIVELOADER_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeLoaderPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeLoader : public QDeclarativeItem
+{
+    Q_OBJECT
+    Q_ENUMS(Status)
+    Q_ENUMS(ResizeMode)
+
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent NOTIFY sourceChanged)
+    Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode NOTIFY resizeModeChanged)
+    Q_PROPERTY(QGraphicsObject *item READ item NOTIFY itemChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+
+public:
+    QDeclarativeLoader(QDeclarativeItem *parent=0);
+    virtual ~QDeclarativeLoader();
+
+    QUrl source() const;
+    void setSource(const QUrl &);
+
+    QDeclarativeComponent *sourceComponent() const;
+    void setSourceComponent(QDeclarativeComponent *);
+
+    enum Status { Null, Ready, Loading, Error };
+    Status status() const;
+    qreal progress() const;
+
+    enum ResizeMode { NoResize, SizeLoaderToItem, SizeItemToLoader };
+    ResizeMode resizeMode() const;
+    void setResizeMode(ResizeMode mode);
+
+    QGraphicsObject *item() const;
+
+Q_SIGNALS:
+    void itemChanged();
+    void sourceChanged();
+    void statusChanged();
+    void progressChanged();
+    void resizeModeChanged();
+
+protected:
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    bool eventFilter(QObject *watched, QEvent *e);
+private:
+    Q_DISABLE_COPY(QDeclarativeLoader)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeLoader)
+    Q_PRIVATE_SLOT(d_func(), void _q_sourceLoaded())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeLoader)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVELOADER_H
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
new file mode 100644
index 0000000..fc5e665
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELOADER_P_H
+#define QDECLARATIVELOADER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeloader_p.h"
+
+#include "qdeclarativeitem_p.h"
+#include "qdeclarativeitemchangelistener_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeContext;
+class QDeclarativeLoaderPrivate : public QDeclarativeItemPrivate, public QDeclarativeItemChangeListener
+{
+    Q_DECLARE_PUBLIC(QDeclarativeLoader)
+
+public:
+    QDeclarativeLoaderPrivate();
+    ~QDeclarativeLoaderPrivate();
+
+    void itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
+    void clear();
+    void initResize();
+
+    QUrl source;
+    QGraphicsObject *item;
+    QDeclarativeComponent *component;
+    bool ownComponent : 1;
+    QDeclarativeLoader::ResizeMode resizeMode;
+
+    void _q_sourceLoaded();
+    void _q_updateSize();
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVELOADER_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
new file mode 100644
index 0000000..ab6be1c
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -0,0 +1,685 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativemousearea_p.h"
+#include "qdeclarativemousearea_p_p.h"
+
+#include "qdeclarativeevents_p_p.h"
+
+#include <QGraphicsSceneMouseEvent>
+
+QT_BEGIN_NAMESPACE
+static const int PressAndHoldDelay = 800;
+
+QDeclarativeDrag::QDeclarativeDrag(QObject *parent)
+: QObject(parent), _target(0), _axis(XandYAxis), _xmin(0), _xmax(0), _ymin(0), _ymax(0)
+{
+}
+
+QDeclarativeDrag::~QDeclarativeDrag()
+{
+}
+
+QDeclarativeItem *QDeclarativeDrag::target() const
+{
+    return _target;
+}
+
+void QDeclarativeDrag::setTarget(QDeclarativeItem *t)
+{
+    if (_target == t)
+        return;
+    _target = t;
+    emit targetChanged();
+}
+
+QDeclarativeDrag::Axis QDeclarativeDrag::axis() const
+{
+    return _axis;
+}
+
+void QDeclarativeDrag::setAxis(QDeclarativeDrag::Axis a)
+{
+    if (_axis == a)
+        return;
+    _axis = a;
+    emit axisChanged();
+}
+
+qreal QDeclarativeDrag::xmin() const
+{
+    return _xmin;
+}
+
+void QDeclarativeDrag::setXmin(qreal m)
+{
+    if (_xmin == m)
+        return;
+    _xmin = m;
+    emit minimumXChanged();
+}
+
+qreal QDeclarativeDrag::xmax() const
+{
+    return _xmax;
+}
+
+void QDeclarativeDrag::setXmax(qreal m)
+{
+    if (_xmax == m)
+        return;
+    _xmax = m;
+    emit maximumXChanged();
+}
+
+qreal QDeclarativeDrag::ymin() const
+{
+    return _ymin;
+}
+
+void QDeclarativeDrag::setYmin(qreal m)
+{
+    if (_ymin == m)
+        return;
+    _ymin = m;
+    emit minimumYChanged();
+}
+
+qreal QDeclarativeDrag::ymax() const
+{
+    return _ymax;
+}
+
+void QDeclarativeDrag::setYmax(qreal m)
+{
+    if (_ymax == m)
+        return;
+    _ymax = m;
+    emit maximumYChanged();
+}
+
+QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
+{
+    delete drag;
+}
+
+
+/*!
+    \qmlclass MouseRegion QDeclarativeMouseRegion
+    \since 4.7
+    \brief The MouseArea item enables simple mouse handling.
+    \inherits Item
+
+    A MouseArea is typically used in conjunction with a visible item,
+    where the MouseArea effectively 'proxies' mouse handling for that
+    item. For example, we can put a MouseArea in a Rectangle that changes
+    the Rectangle color to red when clicked:
+    \snippet doc/src/snippets/declarative/mouseregion.qml 0
+
+    Many MouseArea signals pass a \l {MouseEvent}{mouse} parameter that contains
+    additional information about the mouse event, such as the position, button,
+    and any key modifiers.
+
+    Below we have the previous
+    example extended so as to give a different color when you right click.
+    \snippet doc/src/snippets/declarative/mouseregion.qml 1
+
+    For basic key handling, see the \l {Keys}{Keys attached property}.
+
+    MouseArea is an invisible item: it is never painted.
+
+    \sa MouseEvent
+*/
+
+/*!
+    \qmlsignal MouseArea::onEntered()
+
+    This handler is called when the mouse enters the mouse region.
+
+    By default the onEntered handler is only called while a button is
+    pressed.  Setting hoverEnabled to true enables handling of
+    onExited when no mouse button is pressed.
+
+    \sa hoverEnabled
+*/
+
+/*!
+    \qmlsignal MouseArea::onExited()
+
+    This handler is called when the mouse exists the mouse region.
+
+    By default the onExited handler is only called while a button is
+    pressed.  Setting hoverEnabled to true enables handling of
+    onExited when no mouse button is pressed.
+
+    \sa hoverEnabled
+*/
+
+/*!
+    \qmlsignal MouseArea::onPositionChanged(MouseEvent mouse)
+
+    This handler is called when the mouse position changes.
+
+    The \l {MouseEvent}{mouse} parameter provides information about the mouse, including the x and y
+    position, and any buttons currently pressed.
+
+    The \e accepted property of the MouseEvent parameter is ignored in this handler.
+
+    By default the onPositionChanged handler is only called while a button is
+    pressed.  Setting hoverEnabled to true enables handling of
+    onPositionChanged when no mouse button is pressed.
+*/
+
+/*!
+    \qmlsignal MouseArea::onClicked(mouse)
+
+    This handler is called when there is a click. A click is defined as a press followed by a release,
+    both inside the MouseArea (pressing, moving outside the MouseArea, and then moving back inside and
+    releasing is also considered a click).
+
+    The \l {MouseEvent}{mouse} parameter provides information about the click, including the x and y
+    position of the release of the click, and whether the click wasHeld.
+
+    The \e accepted property of the MouseEvent parameter is ignored in this handler.
+*/
+
+/*!
+    \qmlsignal MouseArea::onPressed(mouse)
+
+    This handler is called when there is a press.
+    The \l {MouseEvent}{mouse} parameter provides information about the press, including the x and y
+    position and which button was pressed.
+
+    The \e accepted property of the MouseEvent parameter determines whether this MouseArea
+    will handle the press and all future mouse events until release.  The default is to accept
+    the event and not allow other MouseArea beneath this one to handle the event.  If \e accepted
+    is set to false, no further events will be sent to this MouseArea until the button is next
+    pressed.
+*/
+
+/*!
+    \qmlsignal MouseArea::onReleased(mouse)
+
+    This handler is called when there is a release.
+    The \l {MouseEvent}{mouse} parameter provides information about the click, including the x and y
+    position of the release of the click, and whether the click wasHeld.
+
+    The \e accepted property of the MouseEvent parameter is ignored in this handler.
+*/
+
+/*!
+    \qmlsignal MouseArea::onPressAndHold(mouse)
+
+    This handler is called when there is a long press (currently 800ms).
+    The \l {MouseEvent}{mouse} parameter provides information about the press, including the x and y
+    position of the press, and which button is pressed.
+
+    The \e accepted property of the MouseEvent parameter is ignored in this handler.
+*/
+
+/*!
+    \qmlsignal MouseArea::onDoubleClicked(mouse)
+
+    This handler is called when there is a double-click (a press followed by a release followed by a press).
+    The \l {MouseEvent}{mouse} parameter provides information about the click, including the x and y
+    position of the release of the click, and whether the click wasHeld.
+
+    The \e accepted property of the MouseEvent parameter is ignored in this handler.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeMouseArea
+    \brief The QDeclarativeMouseArea class provides a simple mouse handling abstraction for use within Qml.
+
+    \ingroup group_coreitems
+
+    All QDeclarativeItem derived classes can do mouse handling but the QDeclarativeMouseArea class exposes mouse
+    handling data as properties and tracks flicking and dragging of the mouse.
+
+    A QDeclarativeMouseArea object can be instantiated in Qml using the tag \l MouseArea.
+ */
+QDeclarativeMouseArea::QDeclarativeMouseArea(QDeclarativeItem *parent)
+  : QDeclarativeItem(*(new QDeclarativeMouseAreaPrivate), parent)
+{
+    Q_D(QDeclarativeMouseArea);
+    d->init();
+}
+
+QDeclarativeMouseArea::~QDeclarativeMouseArea()
+{
+}
+
+/*!
+    \qmlproperty real MouseArea::mouseX
+    \qmlproperty real MouseArea::mouseY
+    These properties hold the coordinates of the mouse.
+
+    If the hoverEnabled property is false then these properties will only be valid
+    while a button is pressed, and will remain valid as long as the button is held
+    even if the mouse is moved outside the region.
+
+    If hoverEnabled is true then these properties will be valid:
+    \list
+        \i when no button is pressed, but the mouse is within the MouseArea (containsMouse is true).
+        \i if a button is pressed and held, even if it has since moved out of the region.
+    \endlist
+
+    The coordinates are relative to the MouseArea.
+*/
+qreal QDeclarativeMouseArea::mouseX() const
+{
+    Q_D(const QDeclarativeMouseArea);
+    return d->lastPos.x();
+}
+
+qreal QDeclarativeMouseArea::mouseY() const
+{
+    Q_D(const QDeclarativeMouseArea);
+    return d->lastPos.y();
+}
+
+/*!
+    \qmlproperty bool MouseArea::enabled
+    This property holds whether the item accepts mouse events.
+*/
+bool QDeclarativeMouseArea::isEnabled() const
+{
+    Q_D(const QDeclarativeMouseArea);
+    return d->absorb;
+}
+
+void QDeclarativeMouseArea::setEnabled(bool a)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (a != d->absorb) {
+        d->absorb = a;
+        emit enabledChanged();
+    }
+}
+/*!
+    \qmlproperty MouseButtons MouseArea::pressedButtons
+    This property holds the mouse buttons currently pressed.
+
+    It contains a bitwise combination of:
+    \list
+    \o Qt.LeftButton
+    \o Qt.RightButton
+    \o Qt.MidButton
+    \endlist
+
+    The code below displays "right" when the right mouse buttons is pressed:
+    \code
+    Text {
+        text: mr.pressedButtons & Qt.RightButton ? "right" : ""
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        MouseArea {
+            id: mr
+            acceptedButtons: Qt.LeftButton | Qt.RightButton
+            anchors.fill: parent
+        }
+    }
+    \endcode
+
+    \sa acceptedButtons
+*/
+Qt::MouseButtons QDeclarativeMouseArea::pressedButtons() const
+{
+    Q_D(const QDeclarativeMouseArea);
+    return d->lastButtons;
+}
+
+void QDeclarativeMouseArea::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeMouseArea);
+    d->moved = false;
+    if (!d->absorb)
+        QDeclarativeItem::mousePressEvent(event);
+    else {
+        d->longPress = false;
+        d->saveEvent(event);
+        if (d->drag) {
+            d->dragX = drag()->axis() & QDeclarativeDrag::XAxis;
+            d->dragY = drag()->axis() & QDeclarativeDrag::YAxis;
+        }
+        d->dragged = false;
+        setHovered(true);
+        d->start = event->pos();
+        d->startScene = event->scenePos();
+        // we should only start timer if pressAndHold is connected to.
+        if (d->isConnected("pressAndHold(QDeclarativeMouseEvent*)"))
+            d->pressAndHoldTimer.start(PressAndHoldDelay, this);
+        setKeepMouseGrab(false);
+        event->setAccepted(setPressed(true));
+    }
+}
+
+void QDeclarativeMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (!d->absorb) {
+        QDeclarativeItem::mouseMoveEvent(event);
+        return;
+    }
+
+    d->saveEvent(event);
+
+    // ### we should skip this if these signals aren't used
+    // ### can GV handle this for us?
+    bool contains = boundingRect().contains(d->lastPos);
+    if (d->hovered && !contains)
+        setHovered(false);
+    else if (!d->hovered && contains)
+        setHovered(true);
+
+    if (d->drag && d->drag->target()) {
+        if (!d->moved) {
+            if (d->dragX) d->startX = drag()->target()->x();
+            if (d->dragY) d->startY = drag()->target()->y();
+        }
+
+        QPointF startLocalPos;
+        QPointF curLocalPos;
+        if (drag()->target()->parent()) {
+            startLocalPos = drag()->target()->parentItem()->mapFromScene(d->startScene);
+            curLocalPos = drag()->target()->parentItem()->mapFromScene(event->scenePos());
+        } else {
+            startLocalPos = d->startScene;
+            curLocalPos = event->scenePos();
+        }
+
+        const int dragThreshold = QApplication::startDragDistance();
+        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()) {
+            if ((!d->dragY && dy < dragThreshold && d->dragX && dx > dragThreshold)
+                || (!d->dragX && dx < dragThreshold && d->dragY && dy > dragThreshold)
+                || (d->dragX && d->dragY)) {
+                setKeepMouseGrab(true);
+            }
+        }
+
+        if (d->dragX) {
+            qreal x = (curLocalPos.x() - startLocalPos.x()) + d->startX;
+            if (x < drag()->xmin())
+                x = drag()->xmin();
+            else if (x > drag()->xmax())
+                x = drag()->xmax();
+            drag()->target()->setX(x);
+        }
+        if (d->dragY) {
+            qreal y = (curLocalPos.y() - startLocalPos.y()) + d->startY;
+            if (y < drag()->ymin())
+                y = drag()->ymin();
+            else if (y > drag()->ymax())
+                y = drag()->ymax();
+            drag()->target()->setY(y);
+        }
+    }
+    d->moved = true;
+    QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
+    emit positionChanged(&me);
+}
+
+
+void QDeclarativeMouseArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (!d->absorb) {
+        QDeclarativeItem::mouseReleaseEvent(event);
+    } else {
+        d->saveEvent(event);
+        setPressed(false);
+        // If we don't accept hover, we need to reset containsMouse.
+        if (!acceptHoverEvents())
+            setHovered(false);
+        setKeepMouseGrab(false);
+    }
+}
+
+void QDeclarativeMouseArea::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (!d->absorb) {
+        QDeclarativeItem::mouseDoubleClickEvent(event);
+    } else {
+        QDeclarativeItem::mouseDoubleClickEvent(event);
+        if (event->isAccepted()) {
+            // Only deliver the event if we have accepted the press.
+            d->saveEvent(event);
+            QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, true, false);
+            emit this->doubleClicked(&me);
+        }
+    }
+}
+
+void QDeclarativeMouseArea::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (!d->absorb)
+        QDeclarativeItem::hoverEnterEvent(event);
+    else
+        setHovered(true);
+}
+
+void QDeclarativeMouseArea::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (!d->absorb) {
+        QDeclarativeItem::hoverEnterEvent(event);
+    } else {
+        d->lastPos = event->pos();
+        QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, d->lastButtons, d->lastModifiers, false, d->longPress);
+        emit positionChanged(&me);
+    }
+}
+
+void QDeclarativeMouseArea::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (!d->absorb)
+        QDeclarativeItem::hoverLeaveEvent(event);
+    else
+        setHovered(false);
+}
+
+bool QDeclarativeMouseArea::sceneEvent(QEvent *event)
+{
+    bool rv = QDeclarativeItem::sceneEvent(event);
+    if (event->type() == QEvent::UngrabMouse) {
+        Q_D(QDeclarativeMouseArea);
+        if (d->pressed) {
+            // if our mouse grab has been removed (probably by Flickable), fix our
+            // state
+            d->pressed = false;
+            setKeepMouseGrab(false);
+            emit pressedChanged();
+            //emit hoveredChanged();
+        }
+    }
+    return rv;
+}
+
+void QDeclarativeMouseArea::timerEvent(QTimerEvent *event)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (event->timerId() == d->pressAndHoldTimer.timerId()) {
+        d->pressAndHoldTimer.stop();
+        if (d->pressed && d->dragged == false && d->hovered == true) {
+            d->longPress = true;
+            QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
+            emit pressAndHold(&me);
+        }
+    }
+}
+
+/*!
+    \qmlproperty bool MouseArea::hoverEnabled
+    This property holds whether hover events are handled.
+
+    By default, mouse events are only handled in response to a button event, or when a button is
+    pressed.  Hover enables handling of all mouse events even when no mouse button is
+    pressed.
+
+    This property affects the containsMouse property and the onEntered, onExited and onPositionChanged signals.
+*/
+
+/*!
+    \qmlproperty bool MouseArea::containsMouse
+    This property holds whether the mouse is currently inside the mouse region.
+
+    \warning This property is not updated if the region moves under the mouse: \e containsMouse will not change.
+    In addition, if hoverEnabled is false, containsMouse will only be valid when the mouse is pressed.
+*/
+bool QDeclarativeMouseArea::hovered() const
+{
+    Q_D(const QDeclarativeMouseArea);
+    return d->hovered;
+}
+
+/*!
+    \qmlproperty bool MouseArea::pressed
+    This property holds whether the mouse region is currently pressed.
+*/
+bool QDeclarativeMouseArea::pressed() const
+{
+    Q_D(const QDeclarativeMouseArea);
+    return d->pressed;
+}
+
+void QDeclarativeMouseArea::setHovered(bool h)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (d->hovered != h) {
+        d->hovered = h;
+        emit hoveredChanged();
+        d->hovered ? emit entered() : emit exited();
+    }
+}
+
+/*!
+    \qmlproperty Qt::MouseButtons MouseArea::acceptedButtons
+    This property holds the mouse buttons that the mouse region reacts to.
+
+    The available buttons are:
+    \list
+    \o Qt.LeftButton
+    \o Qt.RightButton
+    \o Qt.MidButton
+    \endlist
+
+    To accept more than one button the flags can be combined with the
+    "|" (or) operator:
+
+    \code
+    MouseArea { acceptedButtons: Qt.LeftButton | Qt.RightButton }
+    \endcode
+
+    The default is to accept the Left button.
+*/
+Qt::MouseButtons QDeclarativeMouseArea::acceptedButtons() const
+{
+    return acceptedMouseButtons();
+}
+
+void QDeclarativeMouseArea::setAcceptedButtons(Qt::MouseButtons buttons)
+{
+    if (buttons != acceptedMouseButtons()) {
+        setAcceptedMouseButtons(buttons);
+        emit acceptedButtonsChanged();
+    }
+}
+
+bool QDeclarativeMouseArea::setPressed(bool p)
+{
+    Q_D(QDeclarativeMouseArea);
+    bool isclick = d->pressed == true && p == false && d->dragged == false && d->hovered == true;
+
+    if (d->pressed != p) {
+        d->pressed = p;
+        QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, isclick, d->longPress);
+        if (d->pressed) {
+            emit positionChanged(&me);
+            emit pressed(&me);
+        } else {
+            emit released(&me);
+            if (isclick)
+                emit clicked(&me);
+        }
+
+        emit pressedChanged();
+        return me.isAccepted();
+    }
+    return false;
+}
+
+QDeclarativeDrag *QDeclarativeMouseArea::drag()
+{
+    Q_D(QDeclarativeMouseArea);
+    if (!d->drag)
+        d->drag = new QDeclarativeDrag;
+    return d->drag;
+}
+
+/*!
+    \qmlproperty Item MouseArea::drag.target
+    \qmlproperty Axis MouseArea::drag.axis
+    \qmlproperty real MouseArea::drag.minimumX
+    \qmlproperty real MouseArea::drag.maximumX
+    \qmlproperty real MouseArea::drag.minimumY
+    \qmlproperty real MouseArea::drag.maximumY
+
+    drag provides a convenient way to make an item draggable.
+
+    \list
+    \i \c target specifies the item to drag.
+    \i \c axis specifies whether dragging can be done horizontally (XAxis), vertically (YAxis), or both (XandYAxis)
+    \i the minimum and maximum properties limit how far the target can be dragged along the corresponding axes.
+    \endlist
+
+    The following example uses drag to reduce the opacity of an image as it moves to the right:
+    \snippet doc/src/snippets/declarative/drag.qml 0
+*/
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
new file mode 100644
index 0000000..33422e2
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
@@ -0,0 +1,185 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEMOUSEAREA_H
+#define QDECLARATIVEMOUSEAREA_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDrag : public QObject
+{
+    Q_OBJECT
+
+    Q_ENUMS(Axis)
+    Q_PROPERTY(QDeclarativeItem *target READ target WRITE setTarget NOTIFY targetChanged)
+    Q_PROPERTY(Axis axis READ axis WRITE setAxis NOTIFY axisChanged)
+    Q_PROPERTY(qreal minimumX READ xmin WRITE setXmin NOTIFY minimumXChanged)
+    Q_PROPERTY(qreal maximumX READ xmax WRITE setXmax NOTIFY maximumXChanged)
+    Q_PROPERTY(qreal minimumY READ ymin WRITE setYmin NOTIFY minimumYChanged)
+    Q_PROPERTY(qreal maximumY READ ymax WRITE setYmax NOTIFY maximumYChanged)
+    //### consider drag and drop
+
+public:
+    QDeclarativeDrag(QObject *parent=0);
+    ~QDeclarativeDrag();
+
+    QDeclarativeItem *target() const;
+    void setTarget(QDeclarativeItem *);
+
+    enum Axis { XAxis=0x01, YAxis=0x02, XandYAxis=0x03 };
+    Axis axis() const;
+    void setAxis(Axis);
+
+    qreal xmin() const;
+    void setXmin(qreal);
+    qreal xmax() const;
+    void setXmax(qreal);
+    qreal ymin() const;
+    void setYmin(qreal);
+    qreal ymax() const;
+    void setYmax(qreal);
+
+Q_SIGNALS:
+    void targetChanged();
+    void axisChanged();
+    void minimumXChanged();
+    void maximumXChanged();
+    void minimumYChanged();
+    void maximumYChanged();
+
+private:
+    QDeclarativeItem *_target;
+    Axis _axis;
+    qreal _xmin;
+    qreal _xmax;
+    qreal _ymin;
+    qreal _ymax;
+    Q_DISABLE_COPY(QDeclarativeDrag)
+};
+
+class QDeclarativeMouseEvent;
+class QDeclarativeMouseAreaPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeMouseArea : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    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 NOTIFY enabledChanged)
+    Q_PROPERTY(Qt::MouseButtons pressedButtons READ pressedButtons NOTIFY pressedChanged)
+    Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged)
+    Q_PROPERTY(bool hoverEnabled READ acceptHoverEvents WRITE setAcceptHoverEvents)
+    Q_PROPERTY(QDeclarativeDrag *drag READ drag CONSTANT) //### add flicking to QDeclarativeDrag or add a QDeclarativeFlick ???
+
+public:
+    QDeclarativeMouseArea(QDeclarativeItem *parent=0);
+    ~QDeclarativeMouseArea();
+
+    qreal mouseX() const;
+    qreal mouseY() const;
+
+    bool isEnabled() const;
+    void setEnabled(bool);
+
+    bool hovered() const;
+    bool pressed() const;
+
+    Qt::MouseButtons pressedButtons() const;
+
+    Qt::MouseButtons acceptedButtons() const;
+    void setAcceptedButtons(Qt::MouseButtons buttons);
+
+    QDeclarativeDrag *drag();
+
+Q_SIGNALS:
+    void hoveredChanged();
+    void pressedChanged();
+    void enabledChanged();
+    void acceptedButtonsChanged();
+    void positionChanged(QDeclarativeMouseEvent *mouse);
+
+    void pressed(QDeclarativeMouseEvent *mouse);
+    void pressAndHold(QDeclarativeMouseEvent *mouse);
+    void released(QDeclarativeMouseEvent *mouse);
+    void clicked(QDeclarativeMouseEvent *mouse);
+    void doubleClicked(QDeclarativeMouseEvent *mouse);
+    void entered();
+    void exited();
+
+protected:
+    void setHovered(bool);
+    bool setPressed(bool);
+
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+    void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+    bool sceneEvent(QEvent *);
+    void timerEvent(QTimerEvent *event);
+
+private:
+    void handlePress();
+    void handleRelease();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeMouseArea)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeMouseArea)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeDrag)
+QML_DECLARE_TYPE(QDeclarativeMouseArea)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEMOUSEAREA_H
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
new file mode 100644
index 0000000..d4871f2
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEMOUSEREGION_P_H
+#define QDECLARATIVEMOUSEREGION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeitem_p.h"
+
+#include <qdatetime.h>
+#include <qbasictimer.h>
+#include <qgraphicssceneevent.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeMouseAreaPrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeMouseArea)
+
+public:
+    QDeclarativeMouseAreaPrivate()
+      : absorb(true), hovered(false), pressed(false), longPress(false), drag(0)
+    {
+    }
+
+    ~QDeclarativeMouseAreaPrivate();
+
+    void init()
+    {
+        Q_Q(QDeclarativeMouseArea);
+        q->setAcceptedMouseButtons(Qt::LeftButton);
+    }
+
+    void saveEvent(QGraphicsSceneMouseEvent *event) {
+        lastPos = event->pos();
+        lastButton = event->button();
+        lastButtons = event->buttons();
+        lastModifiers = event->modifiers();
+    }
+
+    bool isConnected(const char *signal) {
+        Q_Q(QDeclarativeMouseArea);
+        int idx = QObjectPrivate::get(q)->signalIndex(signal);
+        return QObjectPrivate::get(q)->isSignalConnected(idx);
+    }
+
+    bool absorb : 1;
+    bool hovered : 1;
+    bool pressed : 1;
+    bool longPress : 1;
+    bool moved : 1;
+    bool dragX : 1;
+    bool dragY : 1;
+    bool dragged : 1;
+    QDeclarativeDrag *drag;
+    QPointF start;
+    QPointF startScene;
+    qreal startX;
+    qreal startY;
+    QPointF lastPos;
+    Qt::MouseButton lastButton;
+    Qt::MouseButtons lastButtons;
+    Qt::KeyboardModifiers lastModifiers;
+    QBasicTimer pressAndHoldTimer;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEMOUSEREGION_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
new file mode 100644
index 0000000..ab6007a
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -0,0 +1,466 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepainteditem_p.h"
+#include "qdeclarativepainteditem_p_p.h"
+
+#include <QDebug>
+#include <QPen>
+#include <QFile>
+#include <QEvent>
+#include <QApplication>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QPaintEngine>
+#include <qmath.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativePaintedItem
+    \brief The QDeclarativePaintedItem class is an abstract base class for QDeclarativeView items that want cached painting.
+    \internal
+
+    This is a convenience class for implementing items that paint their contents
+    using a QPainter.  The contents of the item are cached behind the scenes.
+    The dirtyCache() function should be called if the contents change to
+    ensure the cache is refreshed the next time painting occurs.
+
+    To subclass QDeclarativePaintedItem, you must reimplement drawContents() to draw
+    the contents of the item.
+*/
+
+/*!
+    \fn void QDeclarativePaintedItem::drawContents(QPainter *painter, const QRect &rect)
+
+    This function is called when the cache needs to be refreshed. When
+    sub-classing QDeclarativePaintedItem this function should be implemented so as to
+    paint the contents of the item using the given \a painter for the
+    area of the contents specified by \a rect.
+*/
+
+/*!
+    \property QDeclarativePaintedItem::contentsSize
+    \brief The size of the contents
+
+    The contents size is the size of the item in regards to how it is painted
+    using the drawContents() function.  This is distinct from the size of the
+    item in regards to height() and width().
+*/
+
+// XXX bug in WebKit - can call repaintRequested and other cache-changing functions from within render!
+static int inpaint=0;
+static int inpaint_clearcache=0;
+
+/*!
+    Marks areas of the cache that intersect with the given \a rect as dirty and
+    in need of being refreshed.
+
+    \sa clearCache()
+*/
+void QDeclarativePaintedItem::dirtyCache(const QRect& rect)
+{
+    Q_D(QDeclarativePaintedItem);
+    QRect srect(qCeil(rect.x()*d->contentsScale),
+            qCeil(rect.y()*d->contentsScale),
+            qCeil(rect.width()*d->contentsScale),
+            qCeil(rect.height()*d->contentsScale));
+    for (int i=0; i < d->imagecache.count(); ) {
+        QDeclarativePaintedItemPrivate::ImageCacheItem *c = d->imagecache[i];
+        QRect isect = (c->area & srect) | c->dirty;
+        if (isect == c->area && !inpaint) {
+            delete d->imagecache.takeAt(i);
+        } else {
+            c->dirty = isect;
+            ++i;
+        }
+    }
+}
+
+/*!
+    Marks the entirety of the contents cache as dirty.
+
+    \sa dirtyCache()
+*/
+void QDeclarativePaintedItem::clearCache()
+{
+    if (inpaint) {
+        inpaint_clearcache=1;
+        return;
+    }
+    Q_D(QDeclarativePaintedItem);
+    qDeleteAll(d->imagecache);
+    d->imagecache.clear();
+}
+
+/*!
+    Returns the size of the contents.
+
+    \sa setContentsSize()
+*/
+QSize QDeclarativePaintedItem::contentsSize() const
+{
+    Q_D(const QDeclarativePaintedItem);
+    return d->contentsSize;
+}
+
+/*!
+    Sets the size of the contents to the given \a size.
+
+    \sa contentsSize()
+*/
+void QDeclarativePaintedItem::setContentsSize(const QSize &size)
+{
+    Q_D(QDeclarativePaintedItem);
+    if (d->contentsSize == size) return;
+    d->contentsSize = size;
+    setImplicitWidth(size.width()*d->contentsScale);
+    setImplicitHeight(size.height()*d->contentsScale);
+    clearCache();
+    update();
+    emit contentsSizeChanged();
+}
+
+qreal QDeclarativePaintedItem::contentsScale() const
+{
+    Q_D(const QDeclarativePaintedItem);
+    return d->contentsScale;
+}
+
+void QDeclarativePaintedItem::setContentsScale(qreal scale)
+{
+    Q_D(QDeclarativePaintedItem);
+    if (d->contentsScale == scale) return;
+    d->contentsScale = scale;
+    setImplicitWidth(d->contentsSize.width()*scale);
+    setImplicitHeight(d->contentsSize.height()*scale);
+    clearCache();
+    update();
+    emit contentsScaleChanged();
+}
+
+
+/*!
+    Constructs a new QDeclarativePaintedItem with the given \a parent.
+*/
+QDeclarativePaintedItem::QDeclarativePaintedItem(QDeclarativeItem *parent)
+  : QDeclarativeItem(*(new QDeclarativePaintedItemPrivate), parent)
+{
+    init();
+}
+
+/*!
+    \internal
+    Constructs a new QDeclarativePaintedItem with the given \a parent and
+    initialized private data member \a dd.
+*/
+QDeclarativePaintedItem::QDeclarativePaintedItem(QDeclarativePaintedItemPrivate &dd, QDeclarativeItem *parent)
+  : QDeclarativeItem(dd, parent)
+{
+    init();
+}
+
+/*!
+    Destroys the image item.
+*/
+QDeclarativePaintedItem::~QDeclarativePaintedItem()
+{
+    clearCache();
+}
+
+/*!
+    \internal
+*/
+void QDeclarativePaintedItem::init()
+{
+    connect(this,SIGNAL(widthChanged()),this,SLOT(clearCache()));
+    connect(this,SIGNAL(heightChanged()),this,SLOT(clearCache()));
+    connect(this,SIGNAL(visibleChanged()),this,SLOT(clearCache()));
+}
+
+void QDeclarativePaintedItem::setCacheFrozen(bool frozen)
+{
+    Q_D(QDeclarativePaintedItem);
+    if (d->cachefrozen == frozen)
+        return;
+    d->cachefrozen = frozen;
+    // XXX clear cache?
+}
+
+/*!
+    \reimp
+*/
+void QDeclarativePaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    Q_D(QDeclarativePaintedItem);
+    const QRect content(0,0,qCeil(d->contentsSize.width()*d->contentsScale),
+                            qCeil(d->contentsSize.height()*d->contentsScale));
+    if (content.width() <= 0 || content.height() <= 0)
+        return;
+
+    ++inpaint;
+
+    const QTransform &x = p->deviceTransform();
+    QTransform xinv = x.inverted();
+    QRegion effectiveClip;
+    QRegion sysClip = p->paintEngine()->systemClip();
+    if (xinv.type() <= QTransform::TxScale && sysClip.numRects() < 5) {
+        // simple transform, region gets no more complicated...
+        effectiveClip = xinv.map(sysClip);
+    } else {
+        // do not make complicated regions...
+        effectiveClip = xinv.mapRect(sysClip.boundingRect());
+    }
+
+    QRegion topaint = p->clipRegion();
+    if (topaint.isEmpty()) {
+        if (effectiveClip.isEmpty())
+            topaint = QRect(0,0,p->device()->width(),p->device()->height());
+        else
+            topaint = effectiveClip;
+    } else if (!effectiveClip.isEmpty()) {
+        topaint &= effectiveClip;
+    }
+
+    topaint &= content;
+    QRegion uncached(content);
+    p->setRenderHints(QPainter::SmoothPixmapTransform, d->smooth);
+
+    int cachesize=0;
+    for (int i=0; i<d->imagecache.count(); ++i) {
+        QRect area = d->imagecache[i]->area;
+        if (topaint.contains(area)) {
+            QRectF target(area.x(), area.y(), area.width(), area.height());
+            if (!d->cachefrozen) {
+                if (!d->imagecache[i]->dirty.isNull() && topaint.contains(d->imagecache[i]->dirty)) {
+                    QPainter qp(&d->imagecache[i]->image);
+                    qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache);
+                    qp.translate(-area.x(), -area.y());
+                    qp.scale(d->contentsScale,d->contentsScale);
+                    QRect clip = d->imagecache[i]->dirty;
+                    QRect sclip(qFloor(clip.x()/d->contentsScale),
+                            qFloor(clip.y()/d->contentsScale),
+                            qCeil(clip.width()/d->contentsScale+clip.x()/d->contentsScale-qFloor(clip.x()/d->contentsScale)),
+                            qCeil(clip.height()/d->contentsScale+clip.y()/d->contentsScale-qFloor(clip.y()/d->contentsScale)));
+                    qp.setClipRect(sclip);
+                    if (d->fillColor.isValid()){
+                        if(d->fillColor.alpha() < 255){
+                            // ### Might not work outside of raster paintengine
+                            QPainter::CompositionMode prev = qp.compositionMode();
+                            qp.setCompositionMode(QPainter::CompositionMode_Source);
+                            qp.fillRect(sclip,d->fillColor);
+                            qp.setCompositionMode(prev);
+                        }else{
+                            qp.fillRect(sclip,d->fillColor);
+                        }
+                    }
+                    drawContents(&qp, sclip);
+                    d->imagecache[i]->dirty = QRect();
+                }
+            }
+            p->drawPixmap(target.toRect(), d->imagecache[i]->image);
+            topaint -= area;
+            d->imagecache[i]->age=0;
+        } else {
+            d->imagecache[i]->age++;
+        }
+        cachesize += area.width()*area.height();
+        uncached -= area;
+    }
+
+    if (!topaint.isEmpty()) {
+        if (!d->cachefrozen) {
+            // Find a sensible larger area, otherwise will paint lots of tiny images.
+            QRect biggerrect = topaint.boundingRect().adjusted(-64,-64,128,128);
+            cachesize += biggerrect.width() * biggerrect.height();
+            while (d->imagecache.count() && cachesize > d->max_imagecache_size) {
+                int oldest=-1;
+                int age=-1;
+                for (int i=0; i<d->imagecache.count(); ++i) {
+                    int a = d->imagecache[i]->age;
+                    if (a > age) {
+                        oldest = i;
+                        age = a;
+                    }
+                }
+                cachesize -= d->imagecache[oldest]->area.width()*d->imagecache[oldest]->area.height();
+                uncached += d->imagecache[oldest]->area;
+                delete d->imagecache.takeAt(oldest);
+            }
+            const QRegion bigger = QRegion(biggerrect) & uncached;
+            const QVector<QRect> rects = bigger.rects();
+            for (int i = 0; i < rects.count(); ++i) {
+                const QRect &r = rects.at(i);
+                QPixmap img(r.size());
+                if (d->fillColor.isValid())
+                    img.fill(d->fillColor);
+                {
+                    QPainter qp(&img);
+                    qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache);
+
+                    qp.translate(-r.x(),-r.y());
+                    qp.scale(d->contentsScale,d->contentsScale);
+                    QRect sclip(qFloor(r.x()/d->contentsScale),
+                            qFloor(r.y()/d->contentsScale),
+                            qCeil(r.width()/d->contentsScale+r.x()/d->contentsScale-qFloor(r.x()/d->contentsScale)),
+                            qCeil(r.height()/d->contentsScale+r.y()/d->contentsScale-qFloor(r.y()/d->contentsScale)));
+                    drawContents(&qp, sclip);
+                }
+                QDeclarativePaintedItemPrivate::ImageCacheItem *newitem = new QDeclarativePaintedItemPrivate::ImageCacheItem;
+                newitem->area = r;
+                newitem->image = img;
+                d->imagecache.append(newitem);
+                p->drawPixmap(r, newitem->image);
+            }
+        } else {
+            const QVector<QRect> rects = uncached.rects();
+            for (int i = 0; i < rects.count(); ++i)
+                p->fillRect(rects.at(i), Qt::lightGray);
+        }
+    }
+
+    if (inpaint_clearcache) {
+        clearCache();
+        inpaint_clearcache = 0;
+    }
+
+    --inpaint;
+}
+
+/*!
+  \qmlproperty int PaintedItem::pixelCacheSize
+
+  This property holds the maximum number of pixels of image cache to
+  allow. The default is 0.1 megapixels. The cache will not be larger
+  than the (unscaled) size of the WebView.
+*/
+/*!
+  \property QDeclarativePaintedItem::pixelCacheSize
+
+  The maximum number of pixels of image cache to allow. The default
+  is 0.1 megapixels. The cache will not be larger than the (unscaled)
+  size of the QDeclarativePaintedItem.
+*/
+int QDeclarativePaintedItem::pixelCacheSize() const
+{
+    Q_D(const QDeclarativePaintedItem);
+    return d->max_imagecache_size;
+}
+
+void QDeclarativePaintedItem::setPixelCacheSize(int pixels)
+{
+    Q_D(QDeclarativePaintedItem);
+    if (pixels < d->max_imagecache_size) {
+        int cachesize=0;
+        for (int i=0; i<d->imagecache.count(); ++i) {
+            QRect area = d->imagecache[i]->area;
+            cachesize += area.width()*area.height();
+        }
+        while (d->imagecache.count() && cachesize > pixels) {
+            int oldest=-1;
+            int age=-1;
+            for (int i=0; i<d->imagecache.count(); ++i) {
+                int a = d->imagecache[i]->age;
+                if (a > age) {
+                    oldest = i;
+                    age = a;
+                }
+            }
+            cachesize -= d->imagecache[oldest]->area.width()*d->imagecache[oldest]->area.height();
+            delete d->imagecache.takeAt(oldest);
+        }
+    }
+    d->max_imagecache_size = pixels;
+}
+
+
+
+/*!
+    \property QDeclarativePaintedItem::fillColor
+
+    The color to be used to fill the item prior to calling drawContents().
+    By default, this is Qt::transparent.
+
+    Performance improvements can be achieved if subclasses call this with either an
+    invalid color (QColor()), or an appropriate solid color.
+*/
+void QDeclarativePaintedItem::setFillColor(const QColor& c)
+{
+    Q_D(QDeclarativePaintedItem);
+    if (d->fillColor == c)
+        return;
+    d->fillColor = c;
+    emit fillColorChanged();
+    update();
+}
+
+QColor QDeclarativePaintedItem::fillColor() const
+{
+    Q_D(const QDeclarativePaintedItem);
+    return d->fillColor;
+}
+
+/*!
+    \qmlproperty bool PaintedItem::smoothCache
+
+    Controls whether the cached tiles of which the item is composed are
+    rendered smoothly when they are generated.
+
+    This is in addition toe Item::smooth, which controls the smooth painting of
+    the already-painted cached tiles under transformation.
+*/
+bool QDeclarativePaintedItem::smoothCache() const
+{
+    Q_D(const QDeclarativePaintedItem);
+    return d->smoothCache;
+}
+
+void QDeclarativePaintedItem::setSmoothCache(bool on)
+{
+    Q_D(QDeclarativePaintedItem);
+    if (d->smoothCache != on) {
+        d->smoothCache = on;
+        clearCache();
+    }
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem_p.h b/src/declarative/graphicsitems/qdeclarativepainteditem_p.h
new file mode 100644
index 0000000..cc616af
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem_p.h
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEIMAGEITEM_H
+#define QDECLARATIVEIMAGEITEM_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativePaintedItemPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativePaintedItem : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize NOTIFY contentsSizeChanged)
+    Q_PROPERTY(QColor fillColor READ fillColor WRITE setFillColor NOTIFY fillColorChanged)
+    Q_PROPERTY(int pixelCacheSize READ pixelCacheSize WRITE setPixelCacheSize)
+    Q_PROPERTY(bool smoothCache READ smoothCache WRITE setSmoothCache)
+    Q_PROPERTY(qreal contentsScale READ contentsScale WRITE setContentsScale NOTIFY contentsScaleChanged)
+
+
+public:
+    QDeclarativePaintedItem(QDeclarativeItem *parent=0);
+    ~QDeclarativePaintedItem();
+
+    QSize contentsSize() const;
+    void setContentsSize(const QSize &);
+
+    qreal contentsScale() const;
+    void setContentsScale(qreal);
+
+    int pixelCacheSize() const;
+    void setPixelCacheSize(int pixels);
+
+    bool smoothCache() const;
+    void setSmoothCache(bool on);
+
+    QColor fillColor() const;
+    void setFillColor(const QColor&);
+
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+
+protected:
+    QDeclarativePaintedItem(QDeclarativePaintedItemPrivate &dd, QDeclarativeItem *parent);
+
+    virtual void drawContents(QPainter *p, const QRect &) = 0;
+
+    void setCacheFrozen(bool);
+
+Q_SIGNALS:
+    void fillColorChanged();
+    void contentsSizeChanged();
+    void contentsScaleChanged();
+
+protected Q_SLOTS:
+    void dirtyCache(const QRect &);
+    void clearCache();
+
+private:
+    void init();
+    Q_DISABLE_COPY(QDeclarativePaintedItem)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativePaintedItem)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativePaintedItem)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h b/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h
new file mode 100644
index 0000000..a15febb
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEIMAGEITEM_P_H
+#define QDECLARATIVEIMAGEITEM_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeitem_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativePaintedItemPrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePaintedItem)
+
+public:
+    QDeclarativePaintedItemPrivate()
+      : max_imagecache_size(100000), contentsScale(1.0), fillColor(Qt::transparent), cachefrozen(false), smoothCache(true)
+    {
+    }
+
+    struct ImageCacheItem {
+        ImageCacheItem() : age(0) {}
+        ~ImageCacheItem() { }
+        int age;
+        QRect area;
+        QRect dirty; // one dirty area (allows optimization of common cases)
+        QPixmap image;
+    };
+
+    QList<ImageCacheItem*> imagecache;
+
+    int max_imagecache_size;
+    QSize contentsSize;
+    qreal contentsScale;
+    QColor fillColor;
+    bool cachefrozen;
+    bool smoothCache;
+};
+
+QT_END_NAMESPACE
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeparticles.cpp b/src/declarative/graphicsitems/qdeclarativeparticles.cpp
new file mode 100644
index 0000000..3c07798
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeparticles.cpp
@@ -0,0 +1,1295 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeparticles_p.h"
+
+#include "qdeclarativeitem_p.h"
+
+#include <qdeclarativepixmapcache_p.h>
+#include <qfxperf_p_p.h>
+#include <qdeclarativeanimation_p_p.h>
+
+#include <QNetworkReply>
+#include <QPainter>
+#include <QtGui/qdrawutil.h>
+#include <QVarLengthArray>
+
+#include <stdlib.h>
+#include <math.h>
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#define M_PI_2 (M_PI / 2.)
+#endif
+#ifndef INT_MAX
+#define INT_MAX 2147483647
+#endif
+
+QT_BEGIN_NAMESPACE
+#define PI_SQR 9.8696044
+// parabolic approximation
+inline qreal fastSin(qreal theta)
+{
+    const qreal b = 4 / M_PI;
+    const qreal c = -4 / PI_SQR;
+
+    qreal y = b * theta + c * theta * qAbs(theta);
+    return y;
+}
+
+inline qreal fastCos(qreal theta)
+{
+    theta += M_PI_2;
+    if (theta > M_PI)
+        theta -= 2 * M_PI;
+
+    return fastSin(theta);
+}
+
+class QDeclarativeParticle
+{
+public:
+    QDeclarativeParticle(int time) : lifeSpan(1000), fadeOutAge(800)
+        , opacity(0), birthTime(time), x_velocity(0), y_velocity(0)
+        , state(FadeIn), data(0)
+    {
+    }
+
+    int lifeSpan;
+    int fadeOutAge;
+    qreal x;
+    qreal y;
+    qreal opacity;
+    int birthTime;
+    qreal x_velocity;
+    qreal y_velocity;
+    enum State { FadeIn, Solid, FadeOut };
+    State state;
+    void *data;
+};
+
+//---------------------------------------------------------------------------
+
+/*!
+    \class QDeclarativeParticleMotion
+    \ingroup group_effects
+    \brief The QDeclarativeParticleMotion class is the base class for particle motion.
+    \internal
+
+    This class causes the particles to remain static.
+*/
+
+/*!
+    Constructs a QDeclarativeParticleMotion with parent object \a parent.
+*/
+QDeclarativeParticleMotion::QDeclarativeParticleMotion(QObject *parent) :
+    QObject(parent)
+{
+}
+
+/*!
+    Move the \a particle to its new position.  \a interval is the number of
+    milliseconds elapsed since it was last moved.
+*/
+void QDeclarativeParticleMotion::advance(QDeclarativeParticle &particle, int interval)
+{
+    Q_UNUSED(particle);
+    Q_UNUSED(interval);
+}
+
+/*!
+    The \a particle has just been created.  Some motion strategies require
+    additional state information.  This can be allocated by this function.
+*/
+void QDeclarativeParticleMotion::created(QDeclarativeParticle &particle)
+{
+    Q_UNUSED(particle);
+}
+
+/*!
+    The \a particle is about to be destroyed.  Any additional memory
+    that has been allocated for the particle should be freed.
+*/
+void QDeclarativeParticleMotion::destroy(QDeclarativeParticle &particle)
+{
+    Q_UNUSED(particle);
+}
+
+/*!
+    \qmlclass ParticleMotionLinear
+    \since 4.7
+    \brief The ParticleMotionLinear object moves particles linearly.
+
+    \sa Particles
+*/
+
+/*!
+    \internal
+    \class QDeclarativeParticleMotionLinear
+    \ingroup group_effects
+    \brief The QDeclarativeParticleMotionLinear class moves the particles linearly.
+*/
+
+void QDeclarativeParticleMotionLinear::advance(QDeclarativeParticle &p, int interval)
+{
+    p.x += interval * p.x_velocity;
+    p.y += interval * p.y_velocity;
+}
+
+/*!
+    \qmlclass ParticleMotionGravity
+    \since 4.7
+    \brief The ParticleMotionGravity object moves particles towards a point.
+
+    \sa Particles
+*/
+
+/*!
+    \internal
+    \class QDeclarativeParticleMotionGravity
+    \ingroup group_effects
+    \brief The QDeclarativeParticleMotionGravity class moves the particles towards a point.
+*/
+
+/*!
+    \qmlproperty qreal ParticleMotionGravity::xattractor
+    \qmlproperty qreal ParticleMotionGravity::yattractor
+    These properties hold the x and y coordinates of the point attracting the particles.
+*/
+
+/*!
+    \qmlproperty qreal ParticleMotionGravity::acceleration
+    This property holds the acceleration to apply to the particles.
+*/
+
+/*!
+    \property QDeclarativeParticleMotionGravity::xattractor
+    \brief the x coordinate of the point attracting the particles.
+*/
+
+/*!
+    \property QDeclarativeParticleMotionGravity::yattractor
+    \brief the y coordinate of the point attracting the particles.
+*/
+
+/*!
+    \property QDeclarativeParticleMotionGravity::acceleration
+    \brief the acceleration to apply to the particles.
+*/
+
+void QDeclarativeParticleMotionGravity::setXAttractor(qreal x)
+{
+    if (qFuzzyCompare(x, _xAttr))
+        return;
+    _xAttr = x;
+    emit xattractorChanged();
+}
+
+void QDeclarativeParticleMotionGravity::setYAttractor(qreal y)
+{
+    if (qFuzzyCompare(y, _yAttr))
+        return;
+    _yAttr = y;
+    emit yattractorChanged();
+}
+
+void QDeclarativeParticleMotionGravity::setAcceleration(qreal accel)
+{
+    qreal scaledAccel = accel/1000000.0;
+    if (qFuzzyCompare(scaledAccel, _accel))
+        return;
+    _accel = scaledAccel;
+    emit accelerationChanged();
+}
+
+void QDeclarativeParticleMotionGravity::advance(QDeclarativeParticle &p, int interval)
+{
+    qreal xdiff = p.x - _xAttr;
+    qreal ydiff = p.y - _yAttr;
+
+    qreal xcomp = xdiff / (xdiff + ydiff);
+    qreal ycomp = ydiff / (xdiff + ydiff);
+
+    p.x_velocity += xcomp * _accel * interval;
+    p.y_velocity += ycomp * _accel * interval;
+
+    p.x += interval * p.x_velocity;
+    p.y += interval * p.y_velocity;
+}
+
+/*!
+    \qmlclass ParticleMotionWander
+    \since 4.7
+    \brief The ParticleMotionWander object moves particles in a somewhat random fashion.
+
+    The particles will continue roughly in the original direction, however will randomly
+    drift to each side.
+
+    The code below produces an effect similar to falling snow.
+
+    \qml
+Rectangle {
+    width: 240
+    height: 320
+    color: "black"
+
+    Particles {
+        y: 0
+        width: parent.width
+        height: 30
+        source: "star.png"
+        lifeSpan: 5000
+        count: 50
+        angle: 70
+        angleDeviation: 36
+        velocity: 30
+        velocityDeviation: 10
+        ParticleMotionWander {
+            xvariance: 30
+            pace: 100
+        }
+    }
+}
+    \endqml
+
+    \sa Particles
+*/
+
+/*!
+    \internal
+    \class QDeclarativeParticleMotionWander
+    \ingroup group_effects
+    \brief The QDeclarativeParticleMotionWander class moves particles in a somewhat random fashion.
+
+    The particles will continue roughly in the original direction, however will randomly
+    drift to each side.
+*/
+
+/*!
+    \qmlproperty qreal QDeclarativeParticleMotionWander::xvariance
+    \qmlproperty qreal QDeclarativeParticleMotionWander::yvariance
+
+    These properties set the amount to wander in the x and y directions.
+*/
+
+/*!
+    \qmlproperty qreal QDeclarativeParticleMotionWander::pace
+    This property holds how quickly the paricles will move from side to side.
+*/
+
+void QDeclarativeParticleMotionWander::advance(QDeclarativeParticle &p, int interval)
+{
+    if (!particles)
+        particles = qobject_cast<QDeclarativeParticles*>(parent());
+    if (particles) {
+        Data *d = (Data*)p.data;
+        if (_xvariance != 0.) {
+            qreal xdiff = p.x_velocity - d->x_targetV;
+            if ((xdiff > d->x_peak && d->x_var > 0.0) || (xdiff < -d->x_peak && d->x_var < 0.0)) {
+                d->x_var = -d->x_var;
+                d->x_peak = _xvariance + _xvariance * qreal(qrand()) / RAND_MAX;
+            }
+            p.x_velocity += d->x_var * interval;
+        }
+        p.x += interval * p.x_velocity;
+
+        if (_yvariance != 0.) {
+            qreal ydiff = p.y_velocity - d->y_targetV;
+            if ((ydiff > d->y_peak && d->y_var > 0.0) || (ydiff < -d->y_peak && d->y_var < 0.0)) {
+                d->y_var = -d->y_var;
+                d->y_peak = _yvariance + _yvariance * qreal(qrand()) / RAND_MAX;
+            }
+            p.y_velocity += d->y_var * interval;
+        }
+        p.y += interval * p.y_velocity;
+    }
+}
+
+void QDeclarativeParticleMotionWander::created(QDeclarativeParticle &p)
+{
+    if (!p.data) {
+        Data *d = new Data;
+        p.data = (void*)d;
+        d->x_targetV = p.x_velocity;
+        d->y_targetV = p.y_velocity;
+        d->x_peak = _xvariance;
+        d->y_peak = _yvariance;
+        d->x_var = _pace * qreal(qrand()) / RAND_MAX / 1000.0;
+        d->y_var = _pace * qreal(qrand()) / RAND_MAX / 1000.0;
+    }
+}
+
+void QDeclarativeParticleMotionWander::destroy(QDeclarativeParticle &p)
+{
+    if (p.data)
+        delete (Data*)p.data;
+}
+
+void QDeclarativeParticleMotionWander::setXVariance(qreal var)
+{
+    qreal scaledVar = var / 1000.0;
+    if (qFuzzyCompare(scaledVar, _xvariance))
+        return;
+    _xvariance = scaledVar;
+    emit xvarianceChanged();
+}
+
+void QDeclarativeParticleMotionWander::setYVariance(qreal var)
+{
+    qreal scaledVar = var / 1000.0;
+    if (qFuzzyCompare(scaledVar, _yvariance))
+        return;
+    _yvariance = scaledVar;
+    emit yvarianceChanged();
+}
+
+void QDeclarativeParticleMotionWander::setPace(qreal pace)
+{
+    qreal scaledPace = pace / 1000.0;
+    if (qFuzzyCompare(scaledPace, _pace))
+        return;
+    _pace = scaledPace;
+    emit paceChanged();
+}
+
+//---------------------------------------------------------------------------
+class QDeclarativeParticlesPainter : public QDeclarativeItem
+{
+public:
+    QDeclarativeParticlesPainter(QDeclarativeParticlesPrivate *p, QDeclarativeItem* parent)
+        : QDeclarativeItem(parent), d(p)
+    {
+        setFlag(QGraphicsItem::ItemHasNoContents, false);
+        maxX = minX = maxY = minY = 0;
+    }
+
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+
+    void updateSize();
+
+    qreal maxX;
+    qreal minX;
+    qreal maxY;
+    qreal minY;
+    QDeclarativeParticlesPrivate* d;
+};
+
+//---------------------------------------------------------------------------
+class QDeclarativeParticlesPrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeParticles)
+public:
+    QDeclarativeParticlesPrivate()
+        : count(1), emissionRate(-1), emissionVariance(0.5), lifeSpan(1000)
+        , lifeSpanDev(1000), fadeInDur(200), fadeOutDur(300)
+        , angle(0), angleDev(0), velocity(0), velocityDev(0), emissionCarry(0.)
+        , addParticleTime(0), addParticleCount(0), lastAdvTime(0)
+        , motion(0), pendingPixmapCache(false), clock(this)
+    {
+    }
+
+    ~QDeclarativeParticlesPrivate()
+    {
+    }
+
+    void init()
+    {
+        Q_Q(QDeclarativeParticles);
+        paintItem = new QDeclarativeParticlesPainter(this, q);
+    }
+
+    void tick(int time);
+    void createParticle(int time);
+    void updateOpacity(QDeclarativeParticle &p, int age);
+
+    QUrl url;
+    QPixmap image;
+    int count;
+    int emissionRate;
+    qreal emissionVariance;
+    int lifeSpan;
+    int lifeSpanDev;
+    int fadeInDur;
+    int fadeOutDur;
+    qreal angle;
+    qreal angleDev;
+    qreal velocity;
+    qreal velocityDev;
+    qreal emissionCarry;
+    int addParticleTime;
+    int addParticleCount;
+    int lastAdvTime;
+    QDeclarativeParticleMotion *motion;
+    QDeclarativeParticlesPainter *paintItem;
+
+    bool pendingPixmapCache;
+
+    QList<QPair<int, int> > bursts;//countLeft, emissionRate pairs
+    QList<QDeclarativeParticle> particles;
+    QTickAnimationProxy<QDeclarativeParticlesPrivate, &QDeclarativeParticlesPrivate::tick> clock;
+
+};
+
+void QDeclarativeParticlesPrivate::tick(int time)
+{
+    Q_Q(QDeclarativeParticles);
+    if (!motion)
+        motion = new QDeclarativeParticleMotionLinear(q);
+
+    int oldCount = particles.count();
+    int removed = 0;
+    int interval = time - lastAdvTime;
+    for (int i = 0; i < particles.count(); ) {
+        QDeclarativeParticle &particle = particles[i];
+        int age = time - particle.birthTime;
+        if (age >= particle.lifeSpan)  {
+            QDeclarativeParticle part = particles.takeAt(i);
+            motion->destroy(part);
+            ++removed;
+        } else {
+            updateOpacity(particle, age);
+            motion->advance(particle, interval);
+            ++i;
+        }
+    }
+
+    if(emissionRate == -1)//Otherwise leave emission to the emission rate
+        while(removed-- && ((count == -1) || particles.count() < count))
+            createParticle(time);
+
+    if (!addParticleTime)
+        addParticleTime = time;
+
+    //Possibly emit new particles
+    if (((count == -1) || particles.count() < count) && emissionRate
+            && !(count==-1 && emissionRate==-1)) {
+        int emissionCount = -1;
+        if (emissionRate != -1){
+            qreal variance = 1.;
+            if (emissionVariance > 0.){
+                variance += (qreal(qrand())/RAND_MAX) * emissionVariance * (qrand()%2?-1.:1.);
+            }
+            qreal emission = emissionRate * (qreal(interval)/1000.);
+            emission = emission * variance + emissionCarry;
+            double tmpDbl;
+            emissionCarry = modf(emission, &tmpDbl);
+            emissionCount = (int)tmpDbl;
+            emissionCount = qMax(0,emissionCount);
+        }
+        while(((count == -1) || particles.count() < count) &&
+                (emissionRate==-1 || emissionCount--))
+            createParticle(time);
+    }
+
+    //Deal with emissions from requested bursts
+    for(int i=0; i<bursts.size(); i++){
+        int emission = 0;
+        if(bursts[i].second == -1){
+            emission = bursts[i].first;
+        }else{
+            qreal variance = 1.;
+            if (emissionVariance > 0.){
+                variance += (qreal(qrand())/RAND_MAX) * emissionVariance * (qrand()%2?-1.:1.);
+            }
+            qreal workingEmission = bursts[i].second * (qreal(interval)/1000.);
+            workingEmission *= variance;
+            emission = (int)workingEmission;
+            emission = qMax(emission, 0);
+        }
+        emission = qMin(emission, bursts[i].first);
+        bursts[i].first -= emission;
+        while(emission--)
+            createParticle(time);
+    }
+    for(int i=bursts.size()-1; i>=0; i--)
+        if(bursts[i].first <= 0)
+            bursts.removeAt(i);
+
+    lastAdvTime = time;
+    paintItem->updateSize();
+    paintItem->update();
+    if (!(oldCount || particles.count()) && (!count || !emissionRate) && bursts.isEmpty()) {
+        lastAdvTime = 0;
+        clock.stop();
+    }
+}
+
+void QDeclarativeParticlesPrivate::createParticle(int time)
+{
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::CreateParticle> x;
+#endif
+    Q_Q(QDeclarativeParticles);
+    QDeclarativeParticle p(time);
+    p.x = q->x() + q->width() * qreal(qrand()) / RAND_MAX - image.width()/2.0;
+    p.y = q->y() + q->height() * qreal(qrand()) / RAND_MAX - image.height()/2.0;
+    p.lifeSpan = lifeSpan;
+    if (lifeSpanDev)
+        p.lifeSpan += int(lifeSpanDev/2 - lifeSpanDev * qreal(qrand()) / RAND_MAX);
+    p.fadeOutAge = p.lifeSpan - fadeOutDur;
+    if (fadeInDur == 0.) {
+        p.state= QDeclarativeParticle::Solid;
+        p.opacity = 1.0;
+    }
+    qreal a = angle;
+    if (angleDev)
+        a += angleDev/2 - angleDev * qreal(qrand()) / RAND_MAX;
+    if (a > M_PI)
+        a = a - 2 * M_PI;
+    qreal v = velocity;
+    if (velocityDev)
+        v += velocityDev/2 - velocityDev * qreal(qrand()) / RAND_MAX;
+    p.x_velocity = v * fastCos(a);
+    p.y_velocity = v * fastSin(a);
+    particles.append(p);
+    motion->created(particles.last());
+}
+
+void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int age)
+{
+    switch (p.state) {
+    case QDeclarativeParticle::FadeIn:
+        if (age <= fadeInDur) {
+            p.opacity = qreal(age) / fadeInDur;
+            break;
+        } else {
+            p.opacity = 1.0;
+            p.state = QDeclarativeParticle::Solid;
+            // Fall through
+        }
+    case QDeclarativeParticle::Solid:
+        if (age <= p.fadeOutAge) {
+            break;
+        } else {
+            p.state = QDeclarativeParticle::FadeOut;
+            // Fall through
+        }
+    case QDeclarativeParticle::FadeOut:
+        p.opacity = qreal(p.lifeSpan - age) / fadeOutDur;
+        break;
+    }
+}
+
+/*!
+    \qmlclass Particles
+    \since 4.7
+    \brief The Particles object generates and moves particles.
+    \inherits Item
+
+    This element provides preliminary support for particles in QML,
+    and may be heavily changed or removed in later versions.
+
+    The particles created by this object cannot be dealt with
+    directly, they can only be controlled through the parameters of
+    the Particles object. The particles are all the same pixmap,
+    specified by the user.
+
+    The particles are painted relative to the parent of the Particles
+    object.  Moving the Particles object will not move the particles
+    already emitted.
+
+    The below example creates two differently behaving particle
+    sources.  The top one has particles falling from the top like
+    snow, the lower one has particles expelled up like a fountain.
+
+    \qml
+Rectangle {
+    width: 240
+    height: 320
+    color: "black"
+    Particles {
+        y: 0
+        width: parent.width
+        height: 30
+        source: "star.png"
+        lifeSpan: 5000
+        count: 50
+        angle: 70
+        angleDeviation: 36
+        velocity: 30
+        velocityDeviation: 10
+        ParticleMotionWander {
+            xvariance: 30
+            pace: 100
+        }
+    }
+    Particles {
+        y: 300
+        x: 120
+        width: 1
+        height: 1
+        source: "star.png"
+        lifeSpan: 5000
+        count: 200
+        angle: 270
+        angleDeviation: 45
+        velocity: 50
+        velocityDeviation: 30
+        ParticleMotionGravity {
+            yattractor: 1000
+            xattractor: 0
+            acceleration: 25
+        }
+    }
+}
+    \endqml
+    \image particles.gif
+*/
+
+/*!
+    \internal
+    \class QDeclarativeParticles
+    \ingroup group_effects
+    \brief The QDeclarativeParticles class generates and moves particles.
+*/
+
+QDeclarativeParticles::QDeclarativeParticles(QDeclarativeItem *parent)
+    : QDeclarativeItem(*(new QDeclarativeParticlesPrivate), parent)
+{
+    Q_D(QDeclarativeParticles);
+    d->init();
+}
+
+QDeclarativeParticles::~QDeclarativeParticles()
+{
+    Q_D(QDeclarativeParticles);
+    if (d->pendingPixmapCache)
+        QDeclarativePixmapCache::cancel(d->url, this);
+}
+
+/*!
+    \qmlproperty string Particles::source
+    This property holds the URL of the particle image.
+*/
+
+/*!
+    \property QDeclarativeParticles::source
+    \brief the URL of the particle image.
+*/
+QUrl QDeclarativeParticles::source() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->url;
+}
+
+void QDeclarativeParticles::imageLoaded()
+{
+    Q_D(QDeclarativeParticles);
+    d->pendingPixmapCache = false;
+    QDeclarativePixmapCache::get(d->url, &d->image);
+    d->paintItem->updateSize();
+    d->paintItem->update();
+}
+
+void QDeclarativeParticles::setSource(const QUrl &name)
+{
+    Q_D(QDeclarativeParticles);
+
+    if ((d->url.isEmpty() == name.isEmpty()) && name == d->url)
+        return;
+
+    if (d->pendingPixmapCache) {
+        QDeclarativePixmapCache::cancel(d->url, this);
+        d->pendingPixmapCache = false;
+    }
+    if (name.isEmpty()) {
+        d->url = name;
+        d->image = QPixmap();
+        d->paintItem->updateSize();
+        d->paintItem->update();
+    } else {
+        d->url = name;
+        Q_ASSERT(!name.isRelative());
+        QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->url, &d->image);
+        if (status != QDeclarativePixmapReply::Ready && status != QDeclarativePixmapReply::Error) {
+            QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(qmlEngine(this), d->url);
+            connect(reply, SIGNAL(finished()), this, SLOT(imageLoaded()));
+            d->pendingPixmapCache = true;
+        } else {
+            //### unify with imageLoaded
+            d->paintItem->updateSize();
+            d->paintItem->update();
+        }
+    }
+    emit sourceChanged();
+}
+
+/*!
+    \qmlproperty int Particles::count
+    This property holds the maximum number of particles
+
+    The particles element emits particles until it has count active
+    particles. When this number is reached, new particles are not emitted until
+    some of the current particles reach theend of their lifespan.
+
+    If count is -1 then there is no maximum number of active particles, and
+    particles will be constantly emitted at the rate specified by emissionRate.
+
+    If both count and emissionRate are set to -1, nothing will be emitted.
+
+*/
+
+/*!
+    \property QDeclarativeParticles::count
+    \brief the maximum number of particles
+*/
+int QDeclarativeParticles::count() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->count;
+}
+
+void QDeclarativeParticles::setCount(int cnt)
+{
+    Q_D(QDeclarativeParticles);
+    if (cnt == d->count)
+        return;
+
+    int oldCount = d->count;
+    d->count = cnt;
+    d->addParticleTime = 0;
+    d->addParticleCount = d->particles.count();
+    if (!oldCount && d->clock.state() != QAbstractAnimation::Running && d->count && d->emissionRate) {
+        d->clock.start();
+    }
+    d->paintItem->updateSize();
+    d->paintItem->update();
+    emit countChanged();
+}
+
+
+/*!
+    \qmlproperty int Particles::emissionRate
+    This property holds the target number of particles to emit every second.
+
+    The particles element will emit up to emissionRate particles every
+    second. Fewer particles may be emitted per second if the maximum number of
+    particles has been reached.
+
+    If emissionRate is set to -1 there is no limit to the number of
+    particles emitted per second, and particles will be instantly emitted to
+    reach the maximum number of particles specified by count.
+
+    The default value for emissionRate is -1.
+
+    If both count and emissionRate are set to -1, nothing will be emitted.
+*/
+
+/*!
+    \property QDeclarativeParticles::emissionRate
+    \brief the emission rate of particles
+*/
+int QDeclarativeParticles::emissionRate() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->emissionRate;
+}
+void QDeclarativeParticles::setEmissionRate(int er)
+{
+    Q_D(QDeclarativeParticles);
+    if(er == d->emissionRate)
+        return;
+    d->emissionRate = er;
+    if (d->clock.state() != QAbstractAnimation::Running && d->count && d->emissionRate) {
+            d->clock.start();
+    }
+    emit emissionRateChanged();
+}
+
+/*!
+    \qmlproperty qreal Particles::emissionVariance
+    This property holds how inconsistent the rate of particle emissions are.
+    It is a number between 0 (no variance) and 1 (some variance).
+
+    The expected number of particles emitted per second is emissionRate. If
+    emissionVariance is 0 then particles will be emitted consistently throughout
+    each second to reach that number. If emissionVariance is greater than 0 the
+    rate of particle emission will vary randomly throughout the second, with the
+    consequence that the actual number of particles emitted in one second will
+    vary randomly as well.
+
+    emissionVariance is the maximum deviation from emitting
+    emissionRate particles per second. An emissionVariance of 0 means you should
+    get exactly emissionRate particles emitted per second,
+    and an emissionVariance of 1 means you will get between zero and two times
+    emissionRate particles per second, but you should get emissionRate particles
+    per second on average.
+
+    Note that even with an emissionVariance of 0 there may be some variance due
+    to performance and hardware constraints.
+
+    The default value of emissionVariance is 0.5
+*/
+
+/*!
+    \property QDeclarativeParticles::emissionVariance
+    \brief how much the particle emission amounts vary per tick
+*/
+
+qreal QDeclarativeParticles::emissionVariance() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->emissionVariance;
+}
+
+void QDeclarativeParticles::setEmissionVariance(qreal ev)
+{
+    Q_D(QDeclarativeParticles);
+    if(d->emissionVariance == ev)
+        return;
+    d->emissionVariance = ev;
+    emit emissionVarianceChanged();
+}
+
+/*!
+    \qmlproperty int Particles::lifeSpan
+    \qmlproperty int Particles::lifeSpanDeviation
+
+    These properties describe the life span of each particle.
+
+    The default lifespan for a particle is 1000ms.
+
+    lifeSpanDeviation randomly varies the lifeSpan up to the specified variation.  For
+    example, the following creates particles whose lifeSpan will vary
+    from 150ms to 250ms:
+
+    \qml
+Particles {
+    source: "star.png"
+    lifeSpan: 200
+    lifeSpanDeviation: 100
+}
+    \endqml
+*/
+
+/*!
+    \property QDeclarativeParticles::lifeSpan
+    \brief the life span of each particle.
+
+    Default value is 1000ms.
+
+    \sa QDeclarativeParticles::lifeSpanDeviation
+*/
+int QDeclarativeParticles::lifeSpan() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->lifeSpan;
+}
+
+void QDeclarativeParticles::setLifeSpan(int ls)
+{
+    Q_D(QDeclarativeParticles);
+    if(d->lifeSpan == ls)
+        return;
+    d->lifeSpan = ls;
+    emit lifeSpanChanged();
+}
+
+/*!
+    \property QDeclarativeParticles::lifeSpanDeviation
+    \brief the maximum possible deviation from the set lifeSpan.
+
+    Randomly varies the lifeSpan up to the specified variation.  For
+    example, the following creates particles whose lifeSpan will vary
+    from 150ms to 250ms:
+
+\qml
+Particles {
+    source: "star.png"
+    lifeSpan: 200
+    lifeSpanDeviation: 100
+}
+\endqml
+
+    \sa QDeclarativeParticles::lifeSpan
+*/
+int QDeclarativeParticles::lifeSpanDeviation() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->lifeSpanDev;
+}
+
+void QDeclarativeParticles::setLifeSpanDeviation(int dev)
+{
+    Q_D(QDeclarativeParticles);
+    if(d->lifeSpanDev == dev)
+        return;
+    d->lifeSpanDev = dev;
+    emit lifeSpanDeviationChanged();
+}
+
+/*!
+    \qmlproperty int Particles::fadeInDuration
+    \qmlproperty int Particles::fadeOutDuration
+    These properties hold the time taken to fade the particles in and out.
+
+    By default fade in is 200ms and fade out is 300ms.
+*/
+
+/*!
+    \property QDeclarativeParticles::fadeInDuration
+    \brief the time taken to fade in the particles.
+
+    Default value is 200ms.
+*/
+int QDeclarativeParticles::fadeInDuration() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->fadeInDur;
+}
+
+void QDeclarativeParticles::setFadeInDuration(int dur)
+{
+    Q_D(QDeclarativeParticles);
+    if (dur < 0.0 || dur == d->fadeInDur)
+        return;
+    d->fadeInDur = dur;
+    emit fadeInDurationChanged();
+}
+
+/*!
+    \property QDeclarativeParticles::fadeOutDuration
+    \brief the time taken to fade out the particles.
+
+    Default value is 300ms.
+*/
+int QDeclarativeParticles::fadeOutDuration() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->fadeOutDur;
+}
+
+void QDeclarativeParticles::setFadeOutDuration(int dur)
+{
+    Q_D(QDeclarativeParticles);
+    if (dur < 0.0 || d->fadeOutDur == dur)
+        return;
+    d->fadeOutDur = dur;
+    emit fadeOutDurationChanged();
+}
+
+/*!
+    \qmlproperty real Particles::angle
+    \qmlproperty real Particles::angleDeviation
+
+    These properties control particle direction.
+
+    angleDeviation randomly varies the direction up to the specified variation.  For
+    example, the following creates particles whose initial direction will
+    vary from 15 degrees to 105 degrees:
+
+    \qml
+Particles {
+    source: "star.png"
+    angle: 60
+    angleDeviation: 90
+}
+    \endqml
+*/
+
+/*!
+    \property QDeclarativeParticles::angle
+    \brief the initial angle of direction.
+
+    \sa QDeclarativeParticles::angleDeviation
+*/
+qreal QDeclarativeParticles::angle() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->angle * 180.0 / M_PI;
+}
+
+void QDeclarativeParticles::setAngle(qreal angle)
+{
+    Q_D(QDeclarativeParticles);
+    qreal radAngle = angle * M_PI / 180.0;
+    if(radAngle == d->angle)
+        return;
+    d->angle = radAngle;
+    emit angleChanged();
+}
+
+/*!
+    \property QDeclarativeParticles::angleDeviation
+    \brief the maximum possible deviation from the set angle.
+
+    Randomly varies the direction up to the specified variation.  For
+    example, the following creates particles whose initial direction will
+    vary from 15 degrees to 105 degrees:
+
+\qml
+Particles {
+    source: "star.png"
+    angle: 60
+    angleDeviation: 90
+}
+\endqml
+
+    \sa QDeclarativeParticles::angle
+*/
+qreal QDeclarativeParticles::angleDeviation() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->angleDev * 180.0 / M_PI;
+}
+
+void QDeclarativeParticles::setAngleDeviation(qreal dev)
+{
+    Q_D(QDeclarativeParticles);
+    qreal radDev = dev * M_PI / 180.0;
+    if(radDev == d->angleDev)
+        return;
+    d->angleDev = radDev;
+    emit angleDeviationChanged();
+}
+
+/*!
+    \qmlproperty real Particles::velocity
+    \qmlproperty real Particles::velocityDeviation
+
+    These properties control the velocity of the particles.
+
+    velocityDeviation randomly varies the velocity up to the specified variation.  For
+    example, the following creates particles whose initial velocity will
+    vary from 40 to 60.
+
+    \qml
+Particles {
+    source: "star.png"
+    velocity: 50
+    velocityDeviation: 20
+}
+    \endqml
+*/
+
+/*!
+    \property QDeclarativeParticles::velocity
+    \brief the initial velocity of the particles.
+
+    \sa QDeclarativeParticles::velocityDeviation
+*/
+qreal QDeclarativeParticles::velocity() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->velocity * 1000.0;
+}
+
+void QDeclarativeParticles::setVelocity(qreal velocity)
+{
+    Q_D(QDeclarativeParticles);
+    qreal realVel = velocity / 1000.0;
+    if(realVel == d->velocity)
+        return;
+    d->velocity = realVel;
+    emit velocityChanged();
+}
+
+/*!
+    \property QDeclarativeParticles::velocityDeviation
+    \brief the maximum possible deviation from the set velocity.
+
+    Randomly varies the velocity up to the specified variation.  For
+    example, the following creates particles whose initial velocity will
+    vary from 40 to 60.
+
+\qml
+Particles {
+    source: "star.png"
+    velocity: 50
+    velocityDeviation: 20
+}
+\endqml
+
+    \sa QDeclarativeParticles::velocity
+*/
+qreal QDeclarativeParticles::velocityDeviation() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->velocityDev * 1000.0;
+}
+
+void QDeclarativeParticles::setVelocityDeviation(qreal velocity)
+{
+    Q_D(QDeclarativeParticles);
+    qreal realDev = velocity / 1000.0;
+    if(realDev == d->velocityDev)
+        return;
+    d->velocityDev = realDev;
+    emit velocityDeviationChanged();
+}
+
+/*!
+    \qmlproperty ParticleMotion Particles::motion
+    This property sets the type of motion to apply to the particles.
+
+    When a particle is created it will have an initial direction and velocity.
+    The motion of the particle during its lifeSpan is then influenced by the
+    motion property.
+
+    Default motion is ParticleMotionLinear.
+*/
+
+/*!
+    \property QDeclarativeParticles::motion
+    \brief sets the type of motion to apply to the particles.
+
+    When a particle is created it will have an initial direction and velocity.
+    The motion of the particle during its lifeSpan is then influenced by the
+    motion property.
+
+    Default motion is QDeclarativeParticleMotionLinear.
+*/
+QDeclarativeParticleMotion *QDeclarativeParticles::motion() const
+{
+    Q_D(const QDeclarativeParticles);
+    return d->motion;
+}
+
+void QDeclarativeParticles::setMotion(QDeclarativeParticleMotion *motion)
+{
+    Q_D(QDeclarativeParticles);
+    if (motion == d->motion)
+        return;
+    d->motion = motion;
+    emit motionChanged();
+}
+
+/*!
+    \qmlmethod Particles::burst(int count, int emissionRate)
+
+    Initiates a burst of particles.
+
+    This method takes two arguments. The first argument is the number
+    of particles to emit and the second argument is the emissionRate for the
+    burst. If the second argument is omitted, it is treated as -1. The burst
+    of particles has a separate emissionRate and count to the normal emission of
+    particles. The burst uses the same values as normal emission for all other
+    properties, including emissionVariance.
+
+    The normal emission of particles will continue during the burst, however
+    the particles created by the burst count towards the maximum number used by
+    normal emission. To avoid this behavior, use two Particles elements.
+
+*/
+void QDeclarativeParticles::burst(int count, int emissionRate)
+{
+    Q_D(QDeclarativeParticles);
+    d->bursts << qMakePair(count, emissionRate);
+    if (d->clock.state() != QAbstractAnimation::Running)
+        d->clock.start();
+}
+
+void QDeclarativeParticlesPainter::updateSize()
+{
+    if (!isComponentComplete())
+        return;
+
+    const int parentX = parentItem()->x();
+    const int parentY = parentItem()->y();
+    for (int i = 0; i < d->particles.count(); ++i) {
+        const QDeclarativeParticle &particle = d->particles.at(i);
+        if(particle.x > maxX)
+            maxX = particle.x;
+        if(particle.x < minX)
+            minX = particle.x;
+        if(particle.y > maxY)
+            maxY = particle.y;
+        if(particle.y < minY)
+            minY = particle.y;
+    }
+
+    int myWidth = (int)(maxX-minX+0.5)+d->image.width();
+    int myX = (int)(minX - parentX);
+    int myHeight = (int)(maxY-minY+0.5)+d->image.height();
+    int myY = (int)(minY - parentY);
+    setWidth(myWidth);
+    setHeight(myHeight);
+    setX(myX);
+    setY(myY);
+}
+
+void QDeclarativeParticles::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    Q_UNUSED(p);
+    //painting is done by the ParticlesPainter, so it can have the right size
+}
+
+void QDeclarativeParticlesPainter::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    if (d->image.isNull() || d->particles.isEmpty())
+        return;
+
+    const int myX = x() + parentItem()->x();
+    const int myY = y() + parentItem()->y();
+
+    QVarLengthArray<QDrawPixmaps::Data, 256> pixmapData;
+    pixmapData.resize(d->particles.count());
+
+    const QRectF sourceRect = d->image.rect();
+    qreal halfPWidth = sourceRect.width()/2.;
+    qreal halfPHeight = sourceRect.height()/2.;
+    for (int i = 0; i < d->particles.count(); ++i) {
+        const QDeclarativeParticle &particle = d->particles.at(i);
+        pixmapData[i].point = QPointF(particle.x - myX + halfPWidth, particle.y - myY + halfPHeight);
+        pixmapData[i].opacity = particle.opacity;
+
+        //these never change
+        pixmapData[i].rotation = 0;
+        pixmapData[i].scaleX = 1;
+        pixmapData[i].scaleY = 1;
+        pixmapData[i].source = sourceRect;
+    }
+    qDrawPixmaps(p, pixmapData.data(), d->particles.count(), d->image);
+}
+
+void QDeclarativeParticles::componentComplete()
+{
+    Q_D(QDeclarativeParticles);
+    QDeclarativeItem::componentComplete();
+    if (d->count) {
+        d->paintItem->updateSize();
+        d->clock.start();
+    }
+    if (d->lifeSpanDev > d->lifeSpan)
+        d->lifeSpanDev = d->lifeSpan;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeparticles_p.h b/src/declarative/graphicsitems/qdeclarativeparticles_p.h
new file mode 100644
index 0000000..06acbb9
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeparticles_p.h
@@ -0,0 +1,258 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPARTICLES_H
+#define QDECLARATIVEPARTICLES_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeParticle;
+class QDeclarativeParticles;
+class Q_DECLARATIVE_EXPORT QDeclarativeParticleMotion : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeParticleMotion(QObject *parent=0);
+
+    virtual void advance(QDeclarativeParticle &, int interval);
+    virtual void created(QDeclarativeParticle &);
+    virtual void destroy(QDeclarativeParticle &);
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeParticleMotionLinear : public QDeclarativeParticleMotion
+{
+    Q_OBJECT
+public:
+    QDeclarativeParticleMotionLinear(QObject *parent=0)
+        : QDeclarativeParticleMotion(parent) {}
+
+    virtual void advance(QDeclarativeParticle &, int interval);
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeParticleMotionGravity : public QDeclarativeParticleMotion
+{
+    Q_OBJECT
+
+    Q_PROPERTY(qreal xattractor READ xAttractor WRITE setXAttractor NOTIFY xattractorChanged)
+    Q_PROPERTY(qreal yattractor READ yAttractor WRITE setYAttractor NOTIFY yattractorChanged)
+    Q_PROPERTY(qreal acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged)
+public:
+    QDeclarativeParticleMotionGravity(QObject *parent=0)
+        : QDeclarativeParticleMotion(parent), _xAttr(0.0), _yAttr(0.0), _accel(0.00005) {}
+
+    qreal xAttractor() const { return _xAttr; }
+    void setXAttractor(qreal x);
+
+    qreal yAttractor() const { return _yAttr; }
+    void setYAttractor(qreal y);
+
+    qreal acceleration() const { return _accel * 1000000; }
+    void setAcceleration(qreal accel);
+
+    virtual void advance(QDeclarativeParticle &, int interval);
+
+Q_SIGNALS:
+    void xattractorChanged();
+    void yattractorChanged();
+    void accelerationChanged();
+
+private:
+    qreal _xAttr;
+    qreal _yAttr;
+    qreal _accel;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeParticleMotionWander : public QDeclarativeParticleMotion
+{
+    Q_OBJECT
+public:
+    QDeclarativeParticleMotionWander()
+        : QDeclarativeParticleMotion(), particles(0), _xvariance(0), _yvariance(0) {}
+
+    virtual void advance(QDeclarativeParticle &, int interval);
+    virtual void created(QDeclarativeParticle &);
+    virtual void destroy(QDeclarativeParticle &);
+
+    struct Data {
+        qreal x_targetV;
+        qreal y_targetV;
+        qreal x_peak;
+        qreal y_peak;
+        qreal x_var;
+        qreal y_var;
+    };
+
+    Q_PROPERTY(qreal xvariance READ xVariance WRITE setXVariance NOTIFY xvarianceChanged)
+    qreal xVariance() const { return _xvariance * 1000.0; }
+    void setXVariance(qreal var);
+
+    Q_PROPERTY(qreal yvariance READ yVariance WRITE setYVariance NOTIFY yvarianceChanged)
+    qreal yVariance() const { return _yvariance * 1000.0; }
+    void setYVariance(qreal var);
+
+    Q_PROPERTY(qreal pace READ pace WRITE setPace NOTIFY paceChanged)
+    qreal pace() const { return _pace * 1000.0; }
+    void setPace(qreal pace);
+
+Q_SIGNALS:
+    void xvarianceChanged();
+    void yvarianceChanged();
+    void paceChanged();
+    
+private:
+    QDeclarativeParticles *particles;
+    qreal _xvariance;
+    qreal _yvariance;
+    qreal _pace;
+};
+
+class QDeclarativeParticlesPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeParticles : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged)
+    Q_PROPERTY(int emissionRate READ emissionRate WRITE setEmissionRate NOTIFY emissionRateChanged)
+    Q_PROPERTY(qreal emissionVariance READ emissionVariance WRITE setEmissionVariance NOTIFY emissionVarianceChanged)
+    Q_PROPERTY(int lifeSpan READ lifeSpan WRITE setLifeSpan NOTIFY lifeSpanChanged)
+    Q_PROPERTY(int lifeSpanDeviation READ lifeSpanDeviation WRITE setLifeSpanDeviation NOTIFY lifeSpanDeviationChanged)
+    Q_PROPERTY(int fadeInDuration READ fadeInDuration WRITE setFadeInDuration NOTIFY fadeInDurationChanged)
+    Q_PROPERTY(int fadeOutDuration READ fadeOutDuration WRITE setFadeOutDuration NOTIFY fadeOutDurationChanged)
+    Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
+    Q_PROPERTY(qreal angleDeviation READ angleDeviation WRITE setAngleDeviation NOTIFY angleDeviationChanged)
+    Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity NOTIFY velocityChanged)
+    Q_PROPERTY(qreal velocityDeviation READ velocityDeviation WRITE setVelocityDeviation NOTIFY velocityDeviationChanged)
+    Q_PROPERTY(QDeclarativeParticleMotion *motion READ motion WRITE setMotion NOTIFY motionChanged)
+    Q_CLASSINFO("DefaultProperty", "motion")
+
+public:
+    QDeclarativeParticles(QDeclarativeItem *parent=0);
+    ~QDeclarativeParticles();
+
+    QUrl source() const;
+    void setSource(const QUrl &);
+
+    int count() const;
+    void setCount(int cnt);
+
+    int emissionRate() const;
+    void setEmissionRate(int);
+
+    qreal emissionVariance() const;
+    void setEmissionVariance(qreal);
+
+    int lifeSpan() const;
+    void setLifeSpan(int);
+
+    int lifeSpanDeviation() const;
+    void setLifeSpanDeviation(int);
+
+    int fadeInDuration() const;
+    void setFadeInDuration(int);
+
+    int fadeOutDuration() const;
+    void setFadeOutDuration(int);
+
+    qreal angle() const;
+    void setAngle(qreal);
+
+    qreal angleDeviation() const;
+    void setAngleDeviation(qreal);
+
+    qreal velocity() const;
+    void setVelocity(qreal);
+
+    qreal velocityDeviation() const;
+    void setVelocityDeviation(qreal);
+
+    QDeclarativeParticleMotion *motion() const;
+    void setMotion(QDeclarativeParticleMotion *);
+
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+
+public Q_SLOTS:
+    void burst(int count, int emissionRate=-1);
+
+protected:
+    virtual void componentComplete();
+
+Q_SIGNALS:
+    void sourceChanged();
+    void countChanged();
+    void emissionRateChanged();
+    void emissionVarianceChanged();
+    void lifeSpanChanged();
+    void lifeSpanDeviationChanged();
+    void fadeInDurationChanged();
+    void fadeOutDurationChanged();
+    void angleChanged();
+    void angleDeviationChanged();
+    void velocityChanged();
+    void velocityDeviationChanged();
+    void emittingChanged();
+    void motionChanged();
+
+private Q_SLOTS:
+    void imageLoaded();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeParticles)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeParticles)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeParticleMotion)
+QML_DECLARE_TYPE(QDeclarativeParticleMotionLinear)
+QML_DECLARE_TYPE(QDeclarativeParticleMotionGravity)
+QML_DECLARE_TYPE(QDeclarativeParticleMotionWander)
+QML_DECLARE_TYPE(QDeclarativeParticles)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
new file mode 100644
index 0000000..48f112a
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -0,0 +1,849 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepath_p.h"
+#include "qdeclarativepath_p_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QSet>
+
+#include <private/qbezier_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass PathElement QDeclarativePathElement
+    \since 4.7
+    \brief PathElement is the base path type.
+
+    This type is the base for all path types.  It cannot
+    be instantiated.
+
+    \sa Path, PathAttribute, PathPercent, PathLine, PathQuad, PathCubic
+*/
+
+/*!
+    \internal
+    \class QDeclarativePathElement
+    \ingroup group_utility
+*/
+
+/*!
+    \qmlclass Path QDeclarativePath
+    \since 4.7
+    \brief A Path object defines a path for use by \l PathView.
+
+    A Path is composed of one or more path segments - PathLine, PathQuad,
+    PathCubic.
+
+    The spacing of the items along the Path can be adjusted via a
+    PathPercent object.
+
+    PathAttribute allows named attributes with values to be defined
+    along the path.
+
+    \sa PathView, PathAttribute, PathPercent, PathLine, PathQuad, PathCubic
+*/
+
+/*!
+    \internal
+    \class QDeclarativePath
+    \ingroup group_utility
+    \brief The QDeclarativePath class defines a path.
+    \sa QDeclarativePathView
+*/
+QDeclarativePath::QDeclarativePath(QObject *parent)
+ : QObject(*(new QDeclarativePathPrivate), parent)
+{
+}
+
+QDeclarativePath::~QDeclarativePath()
+{
+}
+
+/*!
+    \qmlproperty real Path::startX
+    \qmlproperty real Path::startY
+    These properties hold the starting position of the path.
+*/
+qreal QDeclarativePath::startX() const
+{
+    Q_D(const QDeclarativePath);
+    return d->startX;
+}
+
+void QDeclarativePath::setStartX(qreal x)
+{
+    Q_D(QDeclarativePath);
+    d->startX = x;
+}
+
+qreal QDeclarativePath::startY() const
+{
+    Q_D(const QDeclarativePath);
+    return d->startY;
+}
+
+void QDeclarativePath::setStartY(qreal y)
+{
+    Q_D(QDeclarativePath);
+    d->startY = y;
+}
+
+/*!
+    \qmlproperty bool Path::closed
+    This property holds whether the start and end of the path are identical.
+*/
+bool QDeclarativePath::isClosed() const
+{
+    Q_D(const QDeclarativePath);
+    return d->closed;
+}
+
+/*!
+    \qmlproperty list<PathElement> Path::pathElements
+    This property holds the objects composing the path.
+
+    \default
+
+    A path can contain the following path objects:
+    \list
+        \i \l PathLine - a straight line to a given position.
+        \i \l PathQuad - a quadratic Bezier curve to a given position with a control point.
+        \i \l PathCubic - a cubic Bezier curve to a given position with two control points.
+        \i \l PathAttribute - an attribute at a given position in the path.
+        \i \l PathPercent - a way to spread out items along various segments of the path.
+    \endlist
+
+    \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 2
+*/
+
+QDeclarativeListProperty<QDeclarativePathElement> QDeclarativePath::pathElements()
+{
+    Q_D(QDeclarativePath);
+    return QDeclarativeListProperty<QDeclarativePathElement>(this, d->_pathElements);
+}
+
+void QDeclarativePath::interpolate(int idx, const QString &name, qreal value)
+{
+    Q_D(QDeclarativePath);
+    if (!idx)
+        return;
+
+    qreal lastValue = 0;
+    qreal lastPercent = 0;
+    int search = idx - 1;
+    while(search >= 0) {
+        const AttributePoint &point = d->_attributePoints.at(search);
+        if (point.values.contains(name)) {
+            lastValue = point.values.value(name);
+            lastPercent = point.origpercent;
+            break;
+        }
+        --search;
+    }
+
+    ++search;
+
+    const AttributePoint &curPoint = d->_attributePoints.at(idx);
+
+    for (int ii = search; ii < idx; ++ii) {
+        AttributePoint &point = d->_attributePoints[ii];
+
+        qreal val = lastValue + (value - lastValue) * (point.origpercent - lastPercent) / (curPoint.origpercent - lastPercent);
+        point.values.insert(name, val);
+    }
+}
+
+void QDeclarativePath::endpoint(const QString &name)
+{
+    Q_D(QDeclarativePath);
+    const AttributePoint &first = d->_attributePoints.first();
+    qreal val = first.values.value(name);
+    for (int ii = d->_attributePoints.count() - 1; ii >= 0; ii--) {
+        const AttributePoint &point = d->_attributePoints.at(ii);
+        if (point.values.contains(name)) {
+            for (int jj = ii + 1; jj < d->_attributePoints.count(); ++jj) {
+                AttributePoint &setPoint = d->_attributePoints[jj];
+                setPoint.values.insert(name, val);
+            }
+            return;
+        }
+    }
+}
+
+void QDeclarativePath::processPath()
+{
+    Q_D(QDeclarativePath);
+
+    d->_pointCache.clear();
+    d->_attributePoints.clear();
+    d->_path = QPainterPath();
+
+    AttributePoint first;
+    for (int ii = 0; ii < d->_attributes.count(); ++ii)
+        first.values[d->_attributes.at(ii)] = 0;
+    d->_attributePoints << first;
+
+    d->_path.moveTo(d->startX, d->startY);
+
+    QDeclarativeCurve *lastCurve = 0;
+    foreach (QDeclarativePathElement *pathElement, d->_pathElements) {
+        if (QDeclarativeCurve *curve = qobject_cast<QDeclarativeCurve *>(pathElement)) {
+            curve->addToPath(d->_path);
+            AttributePoint p;
+            p.origpercent = d->_path.length();
+            d->_attributePoints << p;
+            lastCurve = curve;
+        } else if (QDeclarativePathAttribute *attribute = qobject_cast<QDeclarativePathAttribute *>(pathElement)) {
+            AttributePoint &point = d->_attributePoints.last();
+            point.values[attribute->name()] = attribute->value();
+            interpolate(d->_attributePoints.count() - 1, attribute->name(), attribute->value());
+        } else if (QDeclarativePathPercent *percent = qobject_cast<QDeclarativePathPercent *>(pathElement)) {
+            AttributePoint &point = d->_attributePoints.last();
+            point.values[QLatin1String("_qfx_percent")] = percent->value();
+            interpolate(d->_attributePoints.count() - 1, QLatin1String("_qfx_percent"), percent->value());
+        }
+    }
+
+    // Fixup end points
+    const AttributePoint &last = d->_attributePoints.last();
+    for (int ii = 0; ii < d->_attributes.count(); ++ii) {
+        if (!last.values.contains(d->_attributes.at(ii)))
+            endpoint(d->_attributes.at(ii));
+    }
+
+    // Adjust percent
+    qreal length = d->_path.length();
+    qreal prevpercent = 0;
+    qreal prevorigpercent = 0;
+    for (int ii = 0; ii < d->_attributePoints.count(); ++ii) {
+        const AttributePoint &point = d->_attributePoints.at(ii);
+        if (point.values.contains(QLatin1String("_qfx_percent"))) { //special string for QDeclarativePathPercent
+            if ( ii > 0) {
+                qreal scale = (d->_attributePoints[ii].origpercent/length - prevorigpercent) /
+                            (point.values.value(QLatin1String("_qfx_percent"))-prevpercent);
+                d->_attributePoints[ii].scale = scale;
+            }
+            d->_attributePoints[ii].origpercent /= length;
+            d->_attributePoints[ii].percent = point.values.value(QLatin1String("_qfx_percent"));
+            prevorigpercent = d->_attributePoints[ii].origpercent;
+            prevpercent = d->_attributePoints[ii].percent;
+        } else {
+            d->_attributePoints[ii].origpercent /= length;
+            d->_attributePoints[ii].percent = d->_attributePoints[ii].origpercent;
+        }
+    }
+
+    d->closed = lastCurve && d->startX == lastCurve->x() && d->startY == lastCurve->y();
+
+    emit changed();
+}
+
+void QDeclarativePath::componentComplete()
+{
+    Q_D(QDeclarativePath);
+    QSet<QString> attrs;
+    // First gather up all the attributes
+    foreach (QDeclarativePathElement *pathElement, d->_pathElements) {
+        if (QDeclarativePathAttribute *attribute =
+            qobject_cast<QDeclarativePathAttribute *>(pathElement))
+            attrs.insert(attribute->name());
+    }
+    d->_attributes = attrs.toList();
+
+    processPath();
+
+    foreach (QDeclarativePathElement *pathElement, d->_pathElements)
+        connect(pathElement, SIGNAL(changed()), this, SLOT(processPath()));
+}
+
+QPainterPath QDeclarativePath::path() const
+{
+    Q_D(const QDeclarativePath);
+    return d->_path;
+}
+
+QStringList QDeclarativePath::attributes() const
+{
+    Q_D(const QDeclarativePath);
+    return d->_attributes;
+}
+#include <QTime>
+
+static inline QBezier nextBezier(const QPainterPath &path, int *from, qreal *bezLength)
+{
+    const int lastElement = path.elementCount() - 1;
+    for (int i=*from; i <= lastElement; ++i) {
+        const QPainterPath::Element &e = path.elementAt(i);
+
+        switch (e.type) {
+        case QPainterPath::MoveToElement:
+            break;
+        case QPainterPath::LineToElement:
+        {
+            QLineF line(path.elementAt(i-1), e);
+            *bezLength = line.length();
+            QPointF a = path.elementAt(i-1);
+            QPointF delta = e - a;
+            *from = i+1;
+            return QBezier::fromPoints(a, a + delta / 3, a + 2 * delta / 3, e);
+        }
+        case QPainterPath::CurveToElement:
+        {
+            QBezier b = QBezier::fromPoints(path.elementAt(i-1),
+                                            e,
+                                            path.elementAt(i+1),
+                                            path.elementAt(i+2));
+            *bezLength = b.length();
+            *from = i+3;
+            return b;
+        }
+        default:
+            break;
+        }
+    }
+    *from = lastElement;
+    *bezLength = 0;
+    return QBezier();
+}
+
+void QDeclarativePath::createPointCache() const
+{
+    Q_D(const QDeclarativePath);
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::QDeclarativePathViewPathCache> pc;
+#endif
+    qreal pathLength = d->_path.length();
+    const int points = int(pathLength*2);
+    const int lastElement = d->_path.elementCount() - 1;
+    d->_pointCache.resize(points+1);
+
+    int currElement = 0;
+    qreal bezLength = 0;
+    QBezier currBez = nextBezier(d->_path, &currElement, &bezLength);
+    qreal currLength = bezLength;
+    qreal epc = currLength / pathLength;
+
+    for (int i = 0; i < d->_pointCache.size(); i++) {
+        //find which set we are in
+        qreal prevPercent = 0;
+        qreal prevOrigPercent = 0;
+        for (int ii = 0; ii < d->_attributePoints.count(); ++ii) {
+            qreal percent = qreal(i)/points;
+            const AttributePoint &point = d->_attributePoints.at(ii);
+            if (percent < point.percent || ii == d->_attributePoints.count() - 1) { //### || is special case for very last item
+                qreal elementPercent = (percent - prevPercent);
+
+                qreal spc = prevOrigPercent + elementPercent * point.scale;
+
+                while (spc > epc) {
+                    if (currElement > lastElement)
+                        break;
+                    currBez = nextBezier(d->_path, &currElement, &bezLength);
+                    if (bezLength == 0.0) {
+                        currLength = pathLength;
+                        epc = 1.0;
+                        break;
+                    }
+                    currLength += bezLength;
+                    epc = currLength / pathLength;
+                }
+                qreal realT = (pathLength * spc - (currLength - bezLength)) / bezLength;
+                d->_pointCache[i] = currBez.pointAt(qBound(qreal(0), realT, qreal(1)));
+                break;
+            }
+            prevOrigPercent = point.origpercent;
+            prevPercent = point.percent;
+        }
+    }
+}
+
+QPointF QDeclarativePath::pointAt(qreal p) const
+{
+    Q_D(const QDeclarativePath);
+    if (d->_pointCache.isEmpty()) {
+        createPointCache();
+    }
+    int idx = qRound(p*d->_pointCache.size());
+    if (idx >= d->_pointCache.size())
+        idx = d->_pointCache.size() - 1;
+    else if (idx < 0)
+        idx = 0;
+    return d->_pointCache.at(idx);
+}
+
+qreal QDeclarativePath::attributeAt(const QString &name, qreal percent) const
+{
+    Q_D(const QDeclarativePath);
+    if (percent < 0 || percent > 1)
+        return 0;
+
+    for (int ii = 0; ii < d->_attributePoints.count(); ++ii) {
+        const AttributePoint &point = d->_attributePoints.at(ii);
+
+        if (point.percent == percent) {
+            return point.values.value(name);
+        } else if (point.percent > percent) {
+            qreal lastValue =
+                ii?(d->_attributePoints.at(ii - 1).values.value(name)):0;
+            qreal lastPercent =
+                ii?(d->_attributePoints.at(ii - 1).percent):0;
+            qreal curValue = point.values.value(name);
+            qreal curPercent = point.percent;
+
+            return lastValue + (curValue - lastValue) * (percent - lastPercent) / (curPercent - lastPercent);
+        }
+    }
+
+    return 0;
+}
+
+/****************************************************************************/
+
+qreal QDeclarativeCurve::x() const
+{
+    return _x;
+}
+
+void QDeclarativeCurve::setX(qreal x)
+{
+    if (_x != x) {
+        _x = x;
+        emit changed();
+    }
+}
+
+qreal QDeclarativeCurve::y() const
+{
+    return _y;
+}
+
+void QDeclarativeCurve::setY(qreal y)
+{
+    if (_y != y) {
+        _y = y;
+        emit changed();
+    }
+}
+
+/****************************************************************************/
+
+/*!
+    \qmlclass PathAttribute QDeclarativePathAttribute
+    \since 4.7
+    \brief The PathAttribute allows setting an attribute at a given position in a Path.
+
+    The PathAttribute object allows attibutes consisting of a name and
+    a value to be specified for the endpoints of path segments.  The
+    attributes are exposed to the delegate as
+    \l{qdeclarativeintroduction.html#attached-properties} {Attached Properties}.
+    The value of an attribute at any particular point is interpolated
+    from the PathAttributes bounding the point.
+
+    The example below shows a path with the items scaled to 30% with
+    opacity 50% at the top of the path and scaled 100% with opacity
+    100% at the bottom.  Note the use of the PathView.scale and
+    PathView.opacity attached properties to set the scale and opacity
+    of the delegate.
+
+    \table
+    \row
+    \o \image declarative-pathattribute.png
+    \o
+    \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 0
+    \endtable
+
+   \sa Path
+*/
+
+/*!
+    \internal
+    \class QDeclarativePathAttribute
+    \ingroup group_utility
+    \brief The QDeclarativePathAttribute class allows to set the value of an attribute at a given position in the path.
+
+    \sa QDeclarativePath
+*/
+
+
+/*!
+    \qmlproperty string PathAttribute::name
+    the name of the attribute to change.
+*/
+
+/*!
+    the name of the attribute to change.
+*/
+
+QString QDeclarativePathAttribute::name() const
+{
+    return _name;
+}
+
+void QDeclarativePathAttribute::setName(const QString &name)
+{
+    _name = name;
+}
+
+/*!
+   \qmlproperty string PathAttribute::value
+   the new value of the attribute.
+*/
+
+/*!
+    the new value of the attribute.
+*/
+qreal QDeclarativePathAttribute::value() const
+{
+    return _value;
+}
+
+void QDeclarativePathAttribute::setValue(qreal value)
+{
+    if (_value != value) {
+        _value = value;
+        emit changed();
+    }
+}
+
+/****************************************************************************/
+
+/*!
+    \qmlclass PathLine QDeclarativePathLine
+    \since 4.7
+    \brief The PathLine defines a straight line.
+
+    The example below creates a path consisting of a straight line from
+    0,100 to 200,100:
+
+    \qml
+    Path {
+        startX: 0; startY: 100
+        PathLine { x: 200; y: 100 }
+    }
+    \endqml
+
+    \sa Path, PathQuad, PathCubic
+*/
+
+/*!
+    \internal
+    \class QDeclarativePathLine
+    \ingroup group_utility
+    \brief The QDeclarativePathLine class defines a straight line.
+
+    \sa QDeclarativePath
+*/
+
+/*!
+    \qmlproperty real PathLine::x
+    \qmlproperty real PathLine::y
+
+    Defines the end point of the line.
+*/
+
+void QDeclarativePathLine::addToPath(QPainterPath &path)
+{
+    path.lineTo(x(), y());
+}
+
+/****************************************************************************/
+
+/*!
+    \qmlclass PathQuad QDeclarativePathQuad
+    \since 4.7
+    \brief The PathQuad defines a quadratic Bezier curve with a control point.
+
+    The following QML produces the path shown below:
+    \table
+    \row
+    \o \image declarative-pathquad.png
+    \o
+    \qml
+    Path {
+        startX: 0; startY: 0
+        PathQuad x: 200; y: 0; controlX: 100; controlY: 150 }
+    }
+    \endqml
+    \endtable
+
+    \sa Path, PathCubic, PathLine
+*/
+
+/*!
+    \internal
+    \class QDeclarativePathQuad
+    \ingroup group_utility
+    \brief The QDeclarativePathQuad class defines a quadratic Bezier curve with a control point.
+
+    \sa QDeclarativePath
+*/
+
+
+/*!
+    \qmlproperty real PathQuad::x
+    \qmlproperty real PathQuad::y
+
+    Defines the end point of the curve.
+*/
+
+/*!
+   \qmlproperty real PathQuad::controlX
+   \qmlproperty real PathQuad::controlY
+
+   Defines the position of the control point.
+*/
+
+/*!
+    the x position of the control point.
+*/
+qreal QDeclarativePathQuad::controlX() const
+{
+    return _controlX;
+}
+
+void QDeclarativePathQuad::setControlX(qreal x)
+{
+    if (_controlX != x) {
+        _controlX = x;
+        emit changed();
+    }
+}
+
+
+/*!
+    the y position of the control point.
+*/
+qreal QDeclarativePathQuad::controlY() const
+{
+    return _controlY;
+}
+
+void QDeclarativePathQuad::setControlY(qreal y)
+{
+    if (_controlY != y) {
+        _controlY = y;
+        emit changed();
+    }
+}
+
+void QDeclarativePathQuad::addToPath(QPainterPath &path)
+{
+    path.quadTo(controlX(), controlY(), x(), y());
+}
+
+/****************************************************************************/
+
+/*!
+   \qmlclass PathCubic QDeclarativePathCubic
+    \since 4.7
+   \brief The PathCubic defines a cubic Bezier curve with two control points.
+
+    The following QML produces the path shown below:
+    \table
+    \row
+    \o \image declarative-pathcubic.png
+    \o
+    \qml
+    Path {
+        startX: 20; startY: 0
+        PathCubic {
+            x: 180; y: 0; control1X: -10; control1Y: 90
+                          control2X: 210; control2Y: 90
+        }
+    }
+    \endqml
+    \endtable
+
+    \sa Path, PathQuad, PathLine
+*/
+
+/*!
+    \internal
+    \class QDeclarativePathCubic
+    \ingroup group_utility
+    \brief The QDeclarativePathCubic class defines a cubic Bezier curve with two control points.
+
+    \sa QDeclarativePath
+*/
+
+/*!
+    \qmlproperty real PathCubic::x
+    \qmlproperty real PathCubic::y
+
+    Defines the end point of the curve.
+*/
+
+/*!
+   \qmlproperty real PathCubic::control1X
+   \qmlproperty real PathCubic::control1Y
+
+    Defines the position of the first control point.
+*/
+qreal QDeclarativePathCubic::control1X() const
+{
+    return _control1X;
+}
+
+void QDeclarativePathCubic::setControl1X(qreal x)
+{
+    if (_control1X != x) {
+        _control1X = x;
+        emit changed();
+    }
+}
+
+qreal QDeclarativePathCubic::control1Y() const
+{
+    return _control1Y;
+}
+
+void QDeclarativePathCubic::setControl1Y(qreal y)
+{
+    if (_control1Y != y) {
+        _control1Y = y;
+        emit changed();
+    }
+}
+
+/*!
+   \qmlproperty real PathCubic::control2X
+   \qmlproperty real PathCubic::control2Y
+
+    Defines the position of the second control point.
+*/
+qreal QDeclarativePathCubic::control2X() const
+{
+    return _control2X;
+}
+
+void QDeclarativePathCubic::setControl2X(qreal x)
+{
+    if (_control2X != x) {
+        _control2X = x;
+        emit changed();
+    }
+}
+
+qreal QDeclarativePathCubic::control2Y() const
+{
+    return _control2Y;
+}
+
+void QDeclarativePathCubic::setControl2Y(qreal y)
+{
+    if (_control2Y != y) {
+        _control2Y = y;
+        emit changed();
+    }
+}
+
+void QDeclarativePathCubic::addToPath(QPainterPath &path)
+{
+    path.cubicTo(control1X(), control1Y(), control2X(), control2Y(), x(), y());
+}
+
+/****************************************************************************/
+
+/*!
+    \qmlclass PathPercent QDeclarativePathPercent
+    \since 4.7
+    \brief The PathPercent manipulates the way a path is interpreted.
+
+    The examples below show the normal distrubution of items along a path
+    compared to a distribution which places 50% of the items along the
+    PathLine section of the path.
+    \table
+    \row
+    \o \image declarative-nopercent.png
+    \o
+    \qml
+    Path {
+        startX: 20; startY: 0
+        PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
+        PathLine { x: 150; y: 80 }
+        PathQuad { x: 180; y: 0; controlX: 200; controlY: 80 }
+    }
+    \endqml
+    \row
+    \o \image declarative-percent.png
+    \o
+    \qml
+    Path {
+        startX: 20; startY: 0
+        PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
+        PathPercent { value: 0.25 }
+        PathLine { x: 150; y: 80 }
+        PathPercent { value: 0.75 }
+        PathQuad { x: 180; y: 0; controlX: 200; controlY: 80 }
+        PathPercent { value: 1 }
+    }
+    \endqml
+    \endtable
+
+    \sa Path
+*/
+
+/*!
+    \internal
+    \class QDeclarativePathPercent
+    \ingroup group_utility
+    \brief The QDeclarativePathPercent class manipulates the way a path is interpreted.
+
+    QDeclarativePathPercent allows you to bunch up items (or spread out items) along various
+    segments of a QDeclarativePathView's path.
+
+    \sa QDeclarativePath
+
+*/
+
+qreal QDeclarativePathPercent::value() const
+{
+    return _value;
+}
+
+void QDeclarativePathPercent::setValue(qreal value)
+{
+    _value = value;
+}
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativepath_p.h b/src/declarative/graphicsitems/qdeclarativepath_p.h
new file mode 100644
index 0000000..b3139f8
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepath_p.h
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPATH_H
+#define QDECLARATIVEPATH_H
+
+#include "qdeclarativeitem.h"
+
+#include <qdeclarative.h>
+
+#include <QtCore/QObject>
+#include <QtGui/QPainterPath>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+class Q_DECLARATIVE_EXPORT QDeclarativePathElement : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativePathElement(QObject *parent=0) : QObject(parent) {}
+Q_SIGNALS:
+    void changed();
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativePathAttribute : public QDeclarativePathElement
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY changed)
+public:
+    QDeclarativePathAttribute(QObject *parent=0) : QDeclarativePathElement(parent), _value(0) {}
+
+
+    QString name() const;
+    void setName(const QString &name);
+
+    qreal value() const;
+    void setValue(qreal value);
+
+private:
+    QString _name;
+    qreal _value;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeCurve : public QDeclarativePathElement
+{
+    Q_OBJECT
+
+    Q_PROPERTY(qreal x READ x WRITE setX NOTIFY changed)
+    Q_PROPERTY(qreal y READ y WRITE setY NOTIFY changed)
+public:
+    QDeclarativeCurve(QObject *parent=0) : QDeclarativePathElement(parent), _x(0), _y(0) {}
+
+    qreal x() const;
+    void setX(qreal x);
+
+    qreal y() const;
+    void setY(qreal y);
+
+    virtual void addToPath(QPainterPath &) {}
+
+private:
+    qreal _x;
+    qreal _y;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativePathLine : public QDeclarativeCurve
+{
+    Q_OBJECT
+public:
+    QDeclarativePathLine(QObject *parent=0) : QDeclarativeCurve(parent) {}
+
+    void addToPath(QPainterPath &path);
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativePathQuad : public QDeclarativeCurve
+{
+    Q_OBJECT
+
+    Q_PROPERTY(qreal controlX READ controlX WRITE setControlX NOTIFY changed)
+    Q_PROPERTY(qreal controlY READ controlY WRITE setControlY NOTIFY changed)
+public:
+    QDeclarativePathQuad(QObject *parent=0) : QDeclarativeCurve(parent), _controlX(0), _controlY(0) {}
+
+    qreal controlX() const;
+    void setControlX(qreal x);
+
+    qreal controlY() const;
+    void setControlY(qreal y);
+
+    void addToPath(QPainterPath &path);
+
+private:
+    qreal _controlX;
+    qreal _controlY;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativePathCubic : public QDeclarativeCurve
+{
+    Q_OBJECT
+
+    Q_PROPERTY(qreal control1X READ control1X WRITE setControl1X NOTIFY changed)
+    Q_PROPERTY(qreal control1Y READ control1Y WRITE setControl1Y NOTIFY changed)
+    Q_PROPERTY(qreal control2X READ control2X WRITE setControl2X NOTIFY changed)
+    Q_PROPERTY(qreal control2Y READ control2Y WRITE setControl2Y NOTIFY changed)
+public:
+    QDeclarativePathCubic(QObject *parent=0) : QDeclarativeCurve(parent), _control1X(0), _control1Y(0), _control2X(0), _control2Y(0) {}
+
+    qreal control1X() const;
+    void setControl1X(qreal x);
+
+    qreal control1Y() const;
+    void setControl1Y(qreal y);
+
+    qreal control2X() const;
+    void setControl2X(qreal x);
+
+    qreal control2Y() const;
+    void setControl2Y(qreal y);
+
+    void addToPath(QPainterPath &path);
+
+private:
+    int _control1X;
+    int _control1Y;
+    int _control2X;
+    int _control2Y;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativePathPercent : public QDeclarativePathElement
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal value READ value WRITE setValue)
+public:
+    QDeclarativePathPercent(QObject *parent=0) : QDeclarativePathElement(parent) {}
+
+    qreal value() const;
+    void setValue(qreal value);
+
+private:
+    qreal _value;
+};
+
+class QDeclarativePathPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativePath : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+
+    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativePathElement> pathElements READ pathElements)
+    Q_PROPERTY(qreal startX READ startX WRITE setStartX)
+    Q_PROPERTY(qreal startY READ startY WRITE setStartY)
+    Q_PROPERTY(bool closed READ isClosed NOTIFY changed)
+    Q_CLASSINFO("DefaultProperty", "pathElements")
+    Q_INTERFACES(QDeclarativeParserStatus)
+public:
+    QDeclarativePath(QObject *parent=0);
+    ~QDeclarativePath();
+
+    QDeclarativeListProperty<QDeclarativePathElement> pathElements();
+
+    qreal startX() const;
+    void setStartX(qreal x);
+
+    qreal startY() const;
+    void setStartY(qreal y);
+
+    bool isClosed() const;
+
+    QPainterPath path() const;
+    QStringList attributes() const;
+    qreal attributeAt(const QString &, qreal) const;
+    QPointF pointAt(qreal) const;
+
+Q_SIGNALS:
+    void changed();
+
+protected:
+    virtual void componentComplete();
+
+private Q_SLOTS:
+    void processPath();
+
+private:
+    struct AttributePoint {
+        AttributePoint() : percent(0), scale(1), origpercent(0) {}
+        AttributePoint(const AttributePoint &other)
+            : percent(other.percent), scale(other.scale), origpercent(other.origpercent), values(other.values) {}
+        AttributePoint &operator=(const AttributePoint &other) {
+            percent = other.percent; scale = other.scale; origpercent = other.origpercent; values = other.values; return *this;
+        }
+        qreal percent;      //massaged percent along the painter path
+        qreal scale;
+        qreal origpercent;  //'real' percent along the painter path
+        QHash<QString, qreal> values;
+    };
+
+    void interpolate(int idx, const QString &name, qreal value);
+    void endpoint(const QString &name);
+    void createPointCache() const;
+
+private:
+    Q_DISABLE_COPY(QDeclarativePath)
+    Q_DECLARE_PRIVATE(QDeclarativePath)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativePathElement)
+QML_DECLARE_TYPE(QDeclarativePathAttribute)
+QML_DECLARE_TYPE(QDeclarativeCurve)
+QML_DECLARE_TYPE(QDeclarativePathLine)
+QML_DECLARE_TYPE(QDeclarativePathQuad)
+QML_DECLARE_TYPE(QDeclarativePathCubic)
+QML_DECLARE_TYPE(QDeclarativePathPercent)
+QML_DECLARE_TYPE(QDeclarativePath)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPATH_H
diff --git a/src/declarative/graphicsitems/qdeclarativepath_p_p.h b/src/declarative/graphicsitems/qdeclarativepath_p_p.h
new file mode 100644
index 0000000..fb63867
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepath_p_p.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPATH_P_H
+#define QDECLARATIVEPATH_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativepath_p.h"
+
+#include <qdeclarative.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+class QDeclarativePathPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePath)
+
+public:
+    QDeclarativePathPrivate() : startX(0), startY(0), closed(false) { }
+
+    QPainterPath _path;
+    QList<QDeclarativePathElement*> _pathElements;
+    mutable QVector<QPointF> _pointCache;
+    QList<QDeclarativePath::AttributePoint> _attributePoints;
+    QStringList _attributes;
+    int startX;
+    int startY;
+    bool closed;
+};
+
+QT_END_NAMESPACE
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
new file mode 100644
index 0000000..b9e38ef
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -0,0 +1,979 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepathview_p.h"
+#include "qdeclarativepathview_p_p.h"
+
+#include <qdeclarativestate_p.h>
+#include <qdeclarativeopenmetaobject_p.h>
+
+#include <QDebug>
+#include <QEvent>
+#include <qlistmodelinterface_p.h>
+#include <QGraphicsSceneEvent>
+
+#include <math.h>
+
+QT_BEGIN_NAMESPACE
+
+inline qreal qmlMod(qreal x, qreal y)
+{
+#ifdef QT_USE_MATH_H_FLOATS
+    if(sizeof(qreal) == sizeof(float))
+        return fmodf(float(x), float(y));
+    else
+#endif
+        return fmod(x, y);
+}
+
+
+class QDeclarativePathViewAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool onPath READ isOnPath NOTIFY onPathChanged)
+public:
+    QDeclarativePathViewAttached(QObject *parent)
+    : QObject(parent), mo(new QDeclarativeOpenMetaObject(this)), onPath(false)
+    {
+    }
+
+    ~QDeclarativePathViewAttached()
+    {
+        QDeclarativePathView::attachedProperties.remove(parent());
+    }
+
+    QVariant value(const QByteArray &name) const
+    {
+        return mo->value(name);
+    }
+    void setValue(const QByteArray &name, const QVariant &val)
+    {
+        mo->setValue(name, val);
+    }
+
+    bool isOnPath() const { return onPath; }
+    void setOnPath(bool on) {
+        if (on != onPath) {
+            onPath = on;
+            emit onPathChanged();
+        }
+    }
+
+Q_SIGNALS:
+    void onPathChanged();
+
+private:
+    QDeclarativeOpenMetaObject *mo;
+    bool onPath;
+};
+
+
+QDeclarativeItem *QDeclarativePathViewPrivate::getItem(int modelIndex)
+{
+    Q_Q(QDeclarativePathView);
+    requestedIndex = modelIndex;
+    QDeclarativeItem *item = model->item(modelIndex);
+    if (item) {
+        if (QObject *obj = QDeclarativePathView::qmlAttachedProperties(item))
+            static_cast<QDeclarativePathViewAttached *>(obj)->setOnPath(true);
+        item->setParentItem(q);
+    }
+    requestedIndex = -1;
+    return item;
+}
+
+void QDeclarativePathViewPrivate::releaseItem(QDeclarativeItem *item)
+{
+    if (!item || !model)
+        return;
+    if (QObject *obj = QDeclarativePathView::qmlAttachedProperties(item))
+        static_cast<QDeclarativePathViewAttached *>(obj)->setOnPath(false);
+    if (model->release(item) == 0) {
+        if (QObject *obj = QDeclarativePathView::qmlAttachedProperties(item))
+            static_cast<QDeclarativePathViewAttached *>(obj)->setOnPath(false);
+    }
+}
+
+/*!
+    \qmlclass PathView QDeclarativePathView
+    \since 4.7
+    \brief The PathView element lays out model-provided items on a path.
+    \inherits Item
+
+    The model is typically provided by a QAbstractListModel "C++ model object", but can also be created directly in QML.
+
+    The items are laid out along a path defined by a \l Path and may be flicked to scroll.
+
+    \snippet doc/src/snippets/declarative/pathview/pathview.qml 0
+
+    \image pathview.gif
+
+    \sa Path
+*/
+
+QDeclarativePathView::QDeclarativePathView(QDeclarativeItem *parent)
+  : QDeclarativeItem(*(new QDeclarativePathViewPrivate), parent)
+{
+    Q_D(QDeclarativePathView);
+    d->init();
+}
+
+QDeclarativePathView::~QDeclarativePathView()
+{
+    Q_D(QDeclarativePathView);
+    if (d->ownModel)
+        delete d->model;
+}
+
+/*!
+    \qmlattachedproperty bool PathView::onPath
+    This attached property holds whether the item is currently on the path.
+
+    If a pathItemCount has been set, it is possible that some items may
+    be instantiated, but not considered to be currently on the path.
+    Usually, these items would be set invisible, for example:
+
+    \code
+    Component {
+        Rectangle {
+            visible: PathView.onPath
+            ...
+        }
+    }
+    \endcode
+
+    It is attached to each instance of the delegate.
+*/
+
+/*!
+    \qmlproperty model PathView::model
+    This property holds the model providing data for the view.
+
+    The model provides a set of data that is used to create the items for the view.
+    For large or dynamic datasets the model is usually provided by a C++ model object.
+    Models can also be created directly in XML, using the ListModel element.
+
+    \sa {qmlmodels}{Data Models}
+*/
+QVariant QDeclarativePathView::model() const
+{
+    Q_D(const QDeclarativePathView);
+    return d->modelVariant;
+}
+
+void QDeclarativePathView::setModel(const QVariant &model)
+{
+    Q_D(QDeclarativePathView);
+    if (d->model) {
+        disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
+        disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        disconnect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
+        for (int i=0; i<d->items.count(); i++){
+            QDeclarativeItem *p = d->items[i];
+            d->model->release(p);
+        }
+        d->items.clear();
+    }
+
+    d->modelVariant = model;
+    QObject *object = qvariant_cast<QObject*>(model);
+    QDeclarativeVisualModel *vim = 0;
+    if (object && (vim = qobject_cast<QDeclarativeVisualModel *>(object))) {
+        if (d->ownModel) {
+            delete d->model;
+            d->ownModel = false;
+        }
+        d->model = vim;
+    } else {
+        if (!d->ownModel) {
+            d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+            d->ownModel = true;
+        }
+        if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
+            dataModel->setModel(model);
+    }
+    if (d->model) {
+        connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
+        connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        connect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
+    }
+    d->firstIndex = 0;
+    d->pathOffset = 0;
+    d->regenerate();
+    d->fixOffset();
+}
+
+/*!
+    \qmlproperty int PathView::count
+    This property holds the number of items in the model.
+*/
+int QDeclarativePathView::count() const
+{
+    Q_D(const QDeclarativePathView);
+    return d->model ? d->model->count() : 0;
+}
+
+/*!
+    \qmlproperty Path PathView::path
+    \default
+    This property holds the path used to lay out the items.
+    For more information see the \l Path documentation.
+*/
+QDeclarativePath *QDeclarativePathView::path() const
+{
+    Q_D(const QDeclarativePathView);
+    return d->path;
+}
+
+void QDeclarativePathView::setPath(QDeclarativePath *path)
+{
+    Q_D(QDeclarativePathView);
+    d->path = path;
+    connect(d->path, SIGNAL(changed()), this, SLOT(refill()));
+    d->regenerate();
+}
+
+/*!
+    \qmlproperty int PathView::currentIndex
+    This property holds the index of the current item.
+*/
+int QDeclarativePathView::currentIndex() const
+{
+    Q_D(const QDeclarativePathView);
+    return d->currentIndex;
+}
+
+void QDeclarativePathView::setCurrentIndex(int idx)
+{
+    Q_D(QDeclarativePathView);
+    if (d->model && d->model->count())
+        idx = qAbs(idx % d->model->count());
+    if (d->model && idx != d->currentIndex) {
+        d->currentIndex = idx;
+        if (d->model->count()) {
+            d->snapToCurrent();
+            int itemIndex = (idx - d->firstIndex + d->model->count()) % d->model->count();
+            if (itemIndex < d->items.count())
+                d->items.at(itemIndex)->setFocus(true);
+        }
+        emit currentIndexChanged();
+    }
+}
+
+/*!
+    \qmlproperty real PathView::offset
+
+    The offset specifies how far along the path the items are from their initial positions.
+*/
+qreal QDeclarativePathView::offset() const
+{
+    Q_D(const QDeclarativePathView);
+    return d->_offset;
+}
+
+void QDeclarativePathView::setOffset(qreal offset)
+{
+    Q_D(QDeclarativePathView);
+    d->setOffset(offset);
+    d->updateCurrent();
+}
+
+void QDeclarativePathViewPrivate::setOffset(qreal o)
+{
+    Q_Q(QDeclarativePathView);
+    if (_offset != o) {
+        _offset = qmlMod(o, qreal(100.0));
+        if (_offset < 0)
+            _offset = 100.0 + _offset;
+        q->refill();
+    }
+}
+
+/*!
+    \qmlproperty real PathView::snapPosition
+
+    This property determines the position (0-100) the nearest item will snap to.
+*/
+qreal QDeclarativePathView::snapPosition() const
+{
+    Q_D(const QDeclarativePathView);
+    return d->snapPos;
+}
+
+void QDeclarativePathView::setSnapPosition(qreal pos)
+{
+    Q_D(QDeclarativePathView);
+    d->snapPos = pos/100;
+    d->fixOffset();
+}
+
+/*!
+    \qmlproperty real PathView::dragMargin
+    This property holds the maximum distance from the path that initiate mouse dragging.
+
+    By default the path can only be dragged by clicking on an item.  If
+    dragMargin is greater than zero, a drag can be initiated by clicking
+    within dragMargin pixels of the path.
+*/
+qreal QDeclarativePathView::dragMargin() const
+{
+    Q_D(const QDeclarativePathView);
+    return d->dragMargin;
+}
+
+void QDeclarativePathView::setDragMargin(qreal dragMargin)
+{
+    Q_D(QDeclarativePathView);
+    d->dragMargin = dragMargin;
+}
+
+/*!
+    \qmlproperty component PathView::delegate
+
+    The delegate provides a template defining each item instantiated by the view.
+    The index is exposed as an accessible \c index property.  Properties of the
+    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
+
+    Note that the PathView will layout the items based on the size of the root
+    item in the delegate.
+
+    Here is an example delegate:
+    \snippet doc/src/snippets/declarative/pathview/pathview.qml 1
+*/
+QDeclarativeComponent *QDeclarativePathView::delegate() const
+{
+    Q_D(const QDeclarativePathView);
+     if (d->model) {
+        if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
+            return dataModel->delegate();
+    }
+
+    return 0;
+}
+
+void QDeclarativePathView::setDelegate(QDeclarativeComponent *c)
+{
+    Q_D(QDeclarativePathView);
+    if (!d->ownModel) {
+        d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+        d->ownModel = true;
+    }
+    if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model)) {
+        dataModel->setDelegate(c);
+        d->regenerate();
+    }
+}
+
+/*!
+  \qmlproperty int PathView::pathItemCount
+  This property holds the number of items visible on the path at any one time
+*/
+int QDeclarativePathView::pathItemCount() const
+{
+    Q_D(const QDeclarativePathView);
+    return d->pathItems;
+}
+
+void QDeclarativePathView::setPathItemCount(int i)
+{
+    Q_D(QDeclarativePathView);
+    if (i == d->pathItems)
+        return;
+    d->pathItems = i;
+    d->regenerate();
+}
+
+QPointF QDeclarativePathViewPrivate::pointNear(const QPointF &point, qreal *nearPercent) const
+{
+    //XXX maybe do recursively at increasing resolution.
+    qreal mindist = 1e10; // big number
+    QPointF nearPoint = path->pointAt(0);
+    qreal nearPc = 0;
+    for (qreal i=1; i < 1000; i++) {
+        QPointF pt = path->pointAt(i/1000.0);
+        QPointF diff = pt - point;
+        qreal dist = diff.x()*diff.x() + diff.y()*diff.y();
+        if (dist < mindist) {
+            nearPoint = pt;
+            nearPc = i;
+            mindist = dist;
+        }
+    }
+
+    if (nearPercent)
+        *nearPercent = nearPc / 10.0;
+
+    return nearPoint;
+}
+
+
+void QDeclarativePathView::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativePathView);
+    if (!d->items.count())
+        return;
+    QPointF scenePoint = mapToScene(event->pos());
+    int idx = 0;
+    for (; idx < d->items.count(); ++idx) {
+        QRectF rect = d->items.at(idx)->boundingRect();
+        rect = d->items.at(idx)->mapToScene(rect).boundingRect();
+        if (rect.contains(scenePoint))
+            break;
+    }
+    if (idx == d->items.count() && d->dragMargin == 0.)  // didn't click on an item
+        return;
+
+    d->startPoint = d->pointNear(event->pos(), &d->startPc);
+    if (idx == d->items.count()) {
+        qreal distance = qAbs(event->pos().x() - d->startPoint.x()) + qAbs(event->pos().y() - d->startPoint.y());
+        if (distance > d->dragMargin)
+            return;
+    }
+
+    d->stealMouse = false;
+    d->lastElapsed = 0;
+    d->lastDist = 0;
+    QDeclarativeItemPrivate::start(d->lastPosTime);
+    d->tl.clear();
+}
+
+void QDeclarativePathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativePathView);
+    if (d->lastPosTime.isNull())
+        return;
+
+    if (!d->stealMouse) {
+        QPointF delta = event->pos() - d->startPoint;
+        if (qAbs(delta.x()) > QApplication::startDragDistance() && qAbs(delta.y()) > QApplication::startDragDistance())
+            d->stealMouse = true;
+    }
+
+    if (d->stealMouse) {
+        d->moveReason = QDeclarativePathViewPrivate::Mouse;
+        qreal newPc;
+        d->pointNear(event->pos(), &newPc);
+        qreal diff = newPc - d->startPc;
+        if (diff) {
+            setOffset(d->_offset + diff);
+
+            if (diff > 50)
+                diff -= 100;
+            else if (diff < -50)
+                diff += 100;
+
+            d->lastElapsed = QDeclarativeItemPrivate::restart(d->lastPosTime);
+            d->lastDist = diff;
+            d->startPc = newPc;
+        }
+    }
+}
+
+void QDeclarativePathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
+{
+    Q_D(QDeclarativePathView);
+    if (d->lastPosTime.isNull())
+        return;
+
+    qreal elapsed = qreal(d->lastElapsed + QDeclarativeItemPrivate::elapsed(d->lastPosTime)) / 1000.;
+    qreal velocity = elapsed > 0. ? d->lastDist / elapsed : 0;
+    if (d->model && d->model->count() && qAbs(velocity) > 5) {
+        if (velocity > 100)
+            velocity = 100;
+        else if (velocity < -100)
+            velocity = -100;
+        qreal inc = qmlMod(d->_offset - d->snapPos, qreal(100.0 / d->model->count()));
+        qreal dist = qAbs(velocity/2 - qmlMod(velocity/2, qreal(100.0 / d->model->count()) - inc));
+        d->moveOffset.setValue(d->_offset);
+        d->tl.accel(d->moveOffset, velocity, 10, dist);
+        d->tl.callback(QDeclarativeTimeLineCallback(&d->moveOffset, d->fixOffsetCallback, d));
+    } else {
+        d->fixOffset();
+    }
+
+    d->lastPosTime = QTime();
+    d->stealMouse = false;
+    ungrabMouse();
+}
+
+bool QDeclarativePathView::sendMouseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativePathView);
+    QGraphicsSceneMouseEvent mouseEvent(event->type());
+    QRectF myRect = mapToScene(QRectF(0, 0, width(), height())).boundingRect();
+    QGraphicsScene *s = scene();
+    QDeclarativeItem *grabber = s ? qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem()) : 0;
+    if ((d->stealMouse || myRect.contains(event->scenePos().toPoint())) && (!grabber || !grabber->keepMouseGrab())) {
+        mouseEvent.setAccepted(false);
+        for (int i = 0x1; i <= 0x10; i <<= 1) {
+            if (event->buttons() & i) {
+                Qt::MouseButton button = Qt::MouseButton(i);
+                mouseEvent.setButtonDownPos(button, mapFromScene(event->buttonDownPos(button)));
+            }
+        }
+        mouseEvent.setScenePos(event->scenePos());
+        mouseEvent.setLastScenePos(event->lastScenePos());
+        mouseEvent.setPos(mapFromScene(event->scenePos()));
+        mouseEvent.setLastPos(mapFromScene(event->lastScenePos()));
+
+        switch(mouseEvent.type()) {
+        case QEvent::GraphicsSceneMouseMove:
+            mouseMoveEvent(&mouseEvent);
+            break;
+        case QEvent::GraphicsSceneMousePress:
+            mousePressEvent(&mouseEvent);
+            break;
+        case QEvent::GraphicsSceneMouseRelease:
+            mouseReleaseEvent(&mouseEvent);
+            break;
+        default:
+            break;
+        }
+        grabber = qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem());
+        if (grabber && d->stealMouse && !grabber->keepMouseGrab() && grabber != this)
+            grabMouse();
+
+        return d->stealMouse;
+    } else if (!d->lastPosTime.isNull()) {
+        d->lastPosTime = QTime();
+    }
+    return false;
+}
+
+bool QDeclarativePathView::sceneEventFilter(QGraphicsItem *i, QEvent *e)
+{
+    if (!isVisible())
+        return QDeclarativeItem::sceneEventFilter(i, e);
+
+    switch (e->type()) {
+    case QEvent::GraphicsSceneMousePress:
+    case QEvent::GraphicsSceneMouseMove:
+    case QEvent::GraphicsSceneMouseRelease:
+        {
+            bool ret = sendMouseEvent(static_cast<QGraphicsSceneMouseEvent *>(e));
+            if (e->type() == QEvent::GraphicsSceneMouseRelease)
+                return ret;
+            break;
+        }
+    default:
+        break;
+    }
+
+    return QDeclarativeItem::sceneEventFilter(i, e);
+}
+
+void QDeclarativePathView::componentComplete()
+{
+    Q_D(QDeclarativePathView);
+    QDeclarativeItem::componentComplete();
+    d->regenerate();
+
+    // move to correct offset
+    if (d->items.count()) {
+        int itemIndex = (d->currentIndex - d->firstIndex + d->model->count()) % d->model->count();
+
+        itemIndex += d->pathOffset;
+        itemIndex %= d->items.count();
+        qreal targetOffset = qmlMod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
+
+        if (targetOffset < 0)
+            targetOffset = 100.0 + targetOffset;
+        if (targetOffset != d->_offset) {
+            d->moveOffset.setValue(targetOffset);
+        }
+    }
+}
+
+void QDeclarativePathViewPrivate::regenerate()
+{
+    Q_Q(QDeclarativePathView);
+    if (!q->isComponentComplete())
+        return;
+
+    for (int i=0; i<items.count(); i++){
+        QDeclarativeItem *p = items[i];
+        releaseItem(p);
+    }
+    items.clear();
+
+    if (!isValid())
+        return;
+
+    if (firstIndex >= model->count())
+        firstIndex = model->count()-1;
+    if (pathOffset >= model->count())
+        pathOffset = model->count()-1;
+
+    int numItems = pathItems >= 0 ? pathItems : model->count();
+    for (int i=0; i < numItems && i < model->count(); ++i){
+        int index = (i + firstIndex) % model->count();
+        QDeclarativeItem *item = getItem(index);
+        if (!item) {
+            qWarning() << "PathView: Cannot create item, index" << (i + firstIndex) % model->count();
+            return;
+        }
+        items.append(item);
+        item->setZValue(i);
+        if (currentIndex == index)
+            item->setFocus(true);
+    }
+    q->refill();
+}
+
+void QDeclarativePathViewPrivate::updateItem(QDeclarativeItem *item, qreal percent)
+{
+    if (QObject *obj = QDeclarativePathView::qmlAttachedProperties(item)) {
+        foreach(const QString &attr, path->attributes())
+            static_cast<QDeclarativePathViewAttached *>(obj)->setValue(attr.toUtf8(), path->attributeAt(attr, percent));
+    }
+    QPointF pf = path->pointAt(percent);
+    item->setX(pf.x() - item->width()*item->scale()/2);
+    item->setY(pf.y() - item->height()*item->scale()/2);
+}
+
+void QDeclarativePathView::refill()
+{
+    Q_D(QDeclarativePathView);
+    if (!d->isValid() || !isComponentComplete())
+        return;
+
+    QList<qreal> positions;
+    for (int i=0; i<d->items.count(); i++){
+        qreal percent = i * (100. / d->items.count());
+        percent = percent + d->_offset;
+        percent = qmlMod(percent, qreal(100.0));
+        positions << qAbs(percent/100.0);
+    }
+
+    if (d->pathItems==-1) {
+        for (int i=0; i<positions.count(); i++)
+            d->updateItem(d->items.at(i), positions[i]);
+        return;
+    }
+
+    QList<qreal> rotatedPositions;
+    for (int i=0; i<d->items.count(); i++)
+        rotatedPositions << positions[(i + d->pathOffset + d->items.count()) % d->items.count()];
+
+    int wrapIndex= -1;
+    for (int i=0; i<d->items.count()-1; i++) {
+        if (rotatedPositions[i] > rotatedPositions[i+1]){
+            wrapIndex = i;
+            break;
+        }
+    }
+    if (wrapIndex != -1 ){
+        //A wraparound has occured
+        if (wrapIndex < d->items.count()/2){
+            while(wrapIndex-- >= 0){
+                QDeclarativeItem* p = d->items.takeFirst();
+                d->updateItem(p, 0.0);
+                d->releaseItem(p);
+                d->firstIndex++;
+                d->firstIndex %= d->model->count();
+                int index = (d->firstIndex + d->items.count())%d->model->count();
+                QDeclarativeItem *item = d->getItem(index);
+                item->setZValue(wrapIndex);
+                if (d->currentIndex == index)
+                    item->setFocus(true);
+                d->items << item;
+                d->pathOffset++;
+                d->pathOffset=d->pathOffset % d->items.count();
+            }
+        } else {
+            while(wrapIndex++ < d->items.count()-1){
+                QDeclarativeItem* p = d->items.takeLast();
+                d->updateItem(p, 1.0);
+                d->releaseItem(p);
+                d->firstIndex--;
+                if (d->firstIndex < 0)
+                    d->firstIndex = d->model->count() - 1;
+                QDeclarativeItem *item = d->getItem(d->firstIndex);
+                item->setZValue(d->firstIndex);
+                if (d->currentIndex == d->firstIndex)
+                    item->setFocus(true);
+                d->items.prepend(item);
+                d->pathOffset--;
+                if (d->pathOffset < 0)
+                    d->pathOffset = d->items.count() - 1;
+            }
+        }
+        for (int i=0; i<d->items.count(); i++)
+            rotatedPositions[i] = positions[(i + d->pathOffset + d->items.count())
+                                    % d->items.count()];
+    }
+    for (int i=0; i<d->items.count(); i++)
+        d->updateItem(d->items.at(i), rotatedPositions[i]);
+}
+
+void QDeclarativePathView::itemsInserted(int modelIndex, int count)
+{
+    //XXX support animated insertion
+    Q_D(QDeclarativePathView);
+    if (!d->isValid() || !isComponentComplete())
+        return;
+    if (d->pathItems == -1) {
+        for (int i = 0; i < count; ++i) {
+            QDeclarativeItem *item = d->getItem(modelIndex + i);
+            item->setZValue(modelIndex + i);
+            d->items.insert(modelIndex + i, item);
+        }
+        refill();
+    } else {
+        //XXX This is pretty heavy handed until we reference count items.
+        d->regenerate();
+    }
+
+    // make sure the current item is still at the snap position
+    int itemIndex = (d->currentIndex - d->firstIndex + d->model->count())%d->model->count();
+    itemIndex += d->pathOffset;
+    itemIndex %= d->items.count();
+    qreal targetOffset = qmlMod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
+
+    if (targetOffset < 0)
+        targetOffset = 100.0 + targetOffset;
+    if (targetOffset != d->_offset)
+        d->moveOffset.setValue(targetOffset);
+}
+
+void QDeclarativePathView::itemsRemoved(int modelIndex, int count)
+{
+    //XXX support animated removal
+    Q_D(QDeclarativePathView);
+    if (!d->isValid() || !isComponentComplete())
+        return;
+    if (d->pathItems == -1) {
+        for (int i = 0; i < count; ++i) {
+            QDeclarativeItem* p = d->items.takeAt(modelIndex);
+            d->model->release(p);
+        }
+        d->snapToCurrent();
+        refill();
+    } else {
+        d->regenerate();
+    }
+
+    if (d->model->count() == 0) {
+        d->currentIndex = -1;
+        d->moveOffset.setValue(0);
+        return;
+    }
+
+    // make sure the current item is still at the snap position
+    if (d->currentIndex >= d->model->count())
+        d->currentIndex = d->model->count() - 1;
+    int itemIndex = (d->currentIndex - d->firstIndex + d->model->count())%d->model->count();
+    itemIndex += d->pathOffset;
+    itemIndex %= d->items.count();
+    qreal targetOffset = qmlMod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
+
+    if (targetOffset < 0)
+        targetOffset = 100.0 + targetOffset;
+    if (targetOffset != d->_offset)
+        d->moveOffset.setValue(targetOffset);
+}
+
+void QDeclarativePathView::createdItem(int index, QDeclarativeItem *item)
+{
+    Q_D(QDeclarativePathView);
+    if (d->requestedIndex != index) {
+        item->setParentItem(this);
+        d->updateItem(item, index < d->firstIndex ? 0.0 : 1.0);
+    }
+}
+
+void QDeclarativePathView::destroyingItem(QDeclarativeItem *item)
+{
+    Q_UNUSED(item);
+}
+
+void QDeclarativePathView::ticked()
+{
+    Q_D(QDeclarativePathView);
+    d->updateCurrent();
+}
+
+// find the item closest to the snap position
+int QDeclarativePathViewPrivate::calcCurrentIndex()
+{
+    int current = -1;
+    if (model && items.count()) {
+        _offset = qmlMod(_offset, qreal(100.0));
+        if (_offset < 0)
+            _offset += 100.0;
+
+        if (pathItems == -1) {
+            qreal delta = qmlMod(_offset - snapPos, qreal(100.0));
+            if (delta < 0)
+                delta = 100.0 + delta;
+            int ii = model->count() - qRound(delta * model->count() / 100);
+            if (ii < 0)
+                ii = 0;
+            current = ii;
+        } else {
+            qreal bestDiff=1e9;
+            int bestI=-1;
+            for (int i=0; i<items.count(); i++){
+                qreal percent = i * (100. / items.count());
+                percent = percent + _offset;
+                percent = qmlMod(percent, qreal(100.0));
+                qreal diff = qAbs(snapPos - (percent/100.0));
+                if (diff < bestDiff){
+                    bestDiff = diff;
+                    bestI = i;
+                }
+            }
+            int modelIndex = (bestI - pathOffset + items.count())%items.count();
+            modelIndex += firstIndex;
+            current = modelIndex;
+        }
+        current = qAbs(current % model->count());
+    }
+
+    return current;
+}
+
+void QDeclarativePathViewPrivate::updateCurrent()
+{
+    Q_Q(QDeclarativePathView);
+    if (moveReason != Mouse)
+        return;
+    int idx = calcCurrentIndex();
+    if (model && idx != currentIndex) {
+        currentIndex = idx;
+        int itemIndex = (idx - firstIndex + model->count()) % model->count();
+        if (itemIndex < items.count())
+            items.at(itemIndex)->setFocus(true);
+        emit q->currentIndexChanged();
+    }
+}
+
+void QDeclarativePathViewPrivate::fixOffsetCallback(void *d)
+{
+    ((QDeclarativePathViewPrivate *)d)->fixOffset();
+}
+
+void QDeclarativePathViewPrivate::fixOffset()
+{
+    Q_Q(QDeclarativePathView);
+    if (model && items.count()) {
+        int curr = calcCurrentIndex();
+        if (curr != currentIndex)
+            q->setCurrentIndex(curr);
+        else
+            snapToCurrent();
+    }
+}
+
+void QDeclarativePathViewPrivate::snapToCurrent()
+{
+    if (!model || model->count() <= 0)
+        return;
+
+    int itemIndex = (currentIndex - firstIndex + model->count()) % model->count();
+
+    //Rounds is the number of times round to make the current item visible
+    int rounds = itemIndex / items.count();
+    int otherWayRounds = (model->count() - (itemIndex)) / items.count();
+    if (otherWayRounds < rounds)
+        rounds = -otherWayRounds;
+
+    itemIndex += pathOffset;
+    if(model->count() % items.count() && itemIndex - model->count() + items.count() > 0){
+        //When model.count() is not a multiple of pathItemCount we need to manually
+        //fix the index so that going backwards one step works correctly.
+        itemIndex = itemIndex - model->count() + items.count();
+    }
+    itemIndex %= items.count();
+    qreal targetOffset = qmlMod(100 + (snapPos*100) - 100.0 * itemIndex / items.count(), qreal(100.0));
+
+    if (targetOffset < 0)
+        targetOffset = 100.0 + targetOffset;
+    if (targetOffset == _offset && rounds == 0)
+        return;
+
+    moveReason = Other;
+    tl.clear();
+    moveOffset.setValue(_offset);
+
+    if (rounds!=0){
+        //Compensate if the targetOffset would bring the target in from off the screen
+        qreal distance = targetOffset - _offset;
+        if (distance <= -50)
+            rounds--;
+        if (distance > 50)
+            rounds++;
+        tl.move(moveOffset, targetOffset + 100.0*(-rounds), QEasingCurve(QEasingCurve::InOutQuad),
+                int(100*items.count()*qMax((qreal)(2.0/items.count()),(qreal)qAbs(rounds))));
+        tl.callback(QDeclarativeTimeLineCallback(&moveOffset, fixOffsetCallback, this));
+        return;
+    }
+
+    if (targetOffset - _offset > 50.0) {
+        qreal distance = 100 - targetOffset + _offset;
+        tl.move(moveOffset, 0.0, QEasingCurve(QEasingCurve::OutQuad), int(200 * _offset / distance));
+        tl.set(moveOffset, 100.0);
+        tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::InQuad), int(200 * (100-targetOffset) / distance));
+    } else if (targetOffset - _offset <= -50.0) {
+        qreal distance = 100 - _offset + targetOffset;
+        tl.move(moveOffset, 100.0, QEasingCurve(QEasingCurve::OutQuad), int(200 * (100-_offset) / distance));
+        tl.set(moveOffset, 0.0);
+        tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::InQuad), int(200 * targetOffset / distance));
+    } else {
+        tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::InOutQuad), 200);
+    }
+}
+
+QHash<QObject*, QObject*> QDeclarativePathView::attachedProperties;
+QObject *QDeclarativePathView::qmlAttachedProperties(QObject *obj)
+{
+    QObject *rv = attachedProperties.value(obj);
+    if (!rv) {
+        rv = new QDeclarativePathViewAttached(obj);
+        attachedProperties.insert(obj, rv);
+    }
+    return rv;
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativepathview.moc>
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h
new file mode 100644
index 0000000..d351a4e
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPATHVIEW_H
+#define QDECLARATIVEPATHVIEW_H
+
+#include "qdeclarativeitem.h"
+#include "qdeclarativepath_p.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativePathViewPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativePathView : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QVariant model READ model WRITE setModel)
+    Q_PROPERTY(QDeclarativePath *path READ path WRITE setPath)
+    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
+    Q_PROPERTY(qreal offset READ offset WRITE setOffset NOTIFY offsetChanged)
+    Q_PROPERTY(qreal snapPosition READ snapPosition WRITE setSnapPosition)
+    Q_PROPERTY(qreal dragMargin READ dragMargin WRITE setDragMargin)
+    Q_PROPERTY(int count READ count)
+    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate)
+    Q_PROPERTY(int pathItemCount READ pathItemCount WRITE setPathItemCount)
+
+public:
+    QDeclarativePathView(QDeclarativeItem *parent=0);
+    virtual ~QDeclarativePathView();
+
+    QVariant model() const;
+    void setModel(const QVariant &);
+
+    QDeclarativePath *path() const;
+    void setPath(QDeclarativePath *);
+
+    int currentIndex() const;
+    void setCurrentIndex(int idx);
+
+    qreal offset() const;
+    void setOffset(qreal offset);
+
+    qreal snapPosition() const;
+    void setSnapPosition(qreal pos);
+
+    qreal dragMargin() const;
+    void setDragMargin(qreal margin);
+
+    int count() const;
+
+    QDeclarativeComponent *delegate() const;
+    void setDelegate(QDeclarativeComponent *);
+
+    int pathItemCount() const;
+    void setPathItemCount(int);
+
+    static QObject *qmlAttachedProperties(QObject *);
+
+Q_SIGNALS:
+    void currentIndexChanged();
+    void offsetChanged();
+
+protected:
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
+    bool sendMouseEvent(QGraphicsSceneMouseEvent *event);
+    bool sceneEventFilter(QGraphicsItem *, QEvent *);
+    void componentComplete();
+
+private Q_SLOTS:
+    void refill();
+    void ticked();
+    void itemsInserted(int index, int count);
+    void itemsRemoved(int index, int count);
+    void createdItem(int index, QDeclarativeItem *item);
+    void destroyingItem(QDeclarativeItem *item);
+
+private:
+    friend class QDeclarativePathViewAttached;
+    static QHash<QObject*, QObject*> attachedProperties;
+    Q_DISABLE_COPY(QDeclarativePathView)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativePathView)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativePathView)
+QML_DECLARE_TYPEINFO(QDeclarativePathView, QML_HAS_ATTACHED_PROPERTIES)
+QT_END_HEADER
+
+#endif // QDECLARATIVEPATHVIEW_H
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
new file mode 100644
index 0000000..ca50910
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPATHVIEW_P_H
+#define QDECLARATIVEPATHVIEW_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativepathview_p.h"
+
+#include "qdeclarativeitem_p.h"
+#include "qdeclarativevisualitemmodel_p.h"
+
+#include <qdeclarative.h>
+#include <qdeclarativeanimation_p_p.h>
+
+#include <qdatetime.h>
+
+QT_BEGIN_NAMESPACE
+
+typedef struct PathViewItem{
+    int index;
+    QDeclarativeItem* item;
+}PathViewItem;
+
+class QDeclarativePathViewPrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePathView)
+
+public:
+    QDeclarativePathViewPrivate()
+      : path(0), currentIndex(0), startPc(0), lastDist(0)
+        , lastElapsed(0), stealMouse(false), ownModel(false), activeItem(0)
+        , snapPos(0), dragMargin(0), moveOffset(this, &QDeclarativePathViewPrivate::setOffset)
+        , firstIndex(0), pathItems(-1), pathOffset(0), requestedIndex(-1)
+        , moveReason(Other)
+    {
+    }
+
+    void init()
+    {
+        Q_Q(QDeclarativePathView);
+        _offset = 0;
+        q->setAcceptedMouseButtons(Qt::LeftButton);
+        q->setFlag(QGraphicsItem::ItemIsFocusScope);
+        q->setFiltersChildEvents(true);
+        q->connect(&tl, SIGNAL(updated()), q, SLOT(ticked()));
+    }
+
+    QDeclarativeItem *getItem(int modelIndex);
+    void releaseItem(QDeclarativeItem *item);
+
+    bool isValid() const {
+        return model && model->count() > 0 && model->isValid() && path;
+    }
+
+    int calcCurrentIndex();
+    void updateCurrent();
+    static void fixOffsetCallback(void*);
+    void fixOffset();
+    void setOffset(qreal offset);
+    void regenerate();
+    void updateItem(QDeclarativeItem *, qreal);
+    void snapToCurrent();
+    QPointF pointNear(const QPointF &point, qreal *nearPercent=0) const;
+
+    QDeclarativePath *path;
+    int currentIndex;
+    qreal startPc;
+    QPointF startPoint;
+    qreal lastDist;
+    int lastElapsed;
+    qreal _offset;
+    bool stealMouse : 1;
+    bool ownModel : 1;
+    QTime lastPosTime;
+    QPointF lastPos;
+    QDeclarativeItem *activeItem;
+    qreal snapPos;
+    qreal dragMargin;
+    QDeclarativeTimeLine tl;
+    QDeclarativeTimeLineValueProxy<QDeclarativePathViewPrivate> moveOffset;
+    int firstIndex;
+    int pathItems;
+    int pathOffset;
+    int requestedIndex;
+    QList<QDeclarativeItem *> items;
+    QGuard<QDeclarativeVisualModel> model;
+    QVariant modelVariant;
+    enum MovementReason { Other, Key, Mouse };
+    MovementReason moveReason;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
new file mode 100644
index 0000000..1212e89
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -0,0 +1,891 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepositioners_p.h"
+#include "qdeclarativepositioners_p_p.h"
+
+#include <qdeclarative.h>
+#include <qdeclarativestate_p.h>
+#include <qdeclarativestategroup_p.h>
+#include <qdeclarativestateoperations_p.h>
+#include <qfxperf_p_p.h>
+#include <QtCore/qmath.h>
+
+#include <QDebug>
+#include <QCoreApplication>
+
+QT_BEGIN_NAMESPACE
+
+static const QDeclarativeItemPrivate::ChangeTypes watchedChanges
+    = QDeclarativeItemPrivate::Geometry
+    | QDeclarativeItemPrivate::SiblingOrder
+    | QDeclarativeItemPrivate::Visibility
+    | QDeclarativeItemPrivate::Opacity
+    | QDeclarativeItemPrivate::Destroyed;
+
+void QDeclarativeBasePositionerPrivate::watchChanges(QDeclarativeItem *other)
+{
+    QDeclarativeItemPrivate *otherPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(other));
+    otherPrivate->addItemChangeListener(this, watchedChanges);
+}
+
+void QDeclarativeBasePositionerPrivate::unwatchChanges(QDeclarativeItem* other)
+{
+    QDeclarativeItemPrivate *otherPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(other));
+    otherPrivate->removeItemChangeListener(this, watchedChanges);
+}
+
+/*!
+    \internal
+    \class QDeclarativeBasePositioner
+    \ingroup group_layouts
+    \brief The QDeclarativeBasePositioner class provides a base for QDeclarativeGraphics layouts.
+
+    To create a QDeclarativeGraphics Positioner, simply subclass QDeclarativeBasePositioner and implement
+    doLayout(), which is automatically called when the layout might need
+    updating. In doLayout() use the setX and setY functions from QDeclarativeBasePositioner, and the
+    base class will apply the positions along with the appropriate transitions. The items to
+    position are provided in order as the protected member positionedItems.
+
+    You also need to set a PositionerType, to declare whether you are positioning the x, y or both
+    for the child items. Depending on the chosen type, only x or y changes will be applied.
+
+    Note that the subclass is responsible for adding the
+    spacing in between items.
+*/
+QDeclarativeBasePositioner::QDeclarativeBasePositioner(PositionerType at, QDeclarativeItem *parent)
+    : QDeclarativeItem(*(new QDeclarativeBasePositionerPrivate), parent)
+{
+    Q_D(QDeclarativeBasePositioner);
+    d->init(at);
+}
+
+QDeclarativeBasePositioner::QDeclarativeBasePositioner(QDeclarativeBasePositionerPrivate &dd, PositionerType at, QDeclarativeItem *parent)
+    : QDeclarativeItem(dd, parent)
+{
+    Q_D(QDeclarativeBasePositioner);
+    d->init(at);
+}
+
+QDeclarativeBasePositioner::~QDeclarativeBasePositioner()
+{
+    Q_D(QDeclarativeBasePositioner);
+    for (int i = 0; i < positionedItems.count(); ++i)
+        d->unwatchChanges(positionedItems.at(i).item);
+    positionedItems.clear();
+}
+
+int QDeclarativeBasePositioner::spacing() const
+{
+    Q_D(const QDeclarativeBasePositioner);
+    return d->spacing;
+}
+
+void QDeclarativeBasePositioner::setSpacing(int s)
+{
+    Q_D(QDeclarativeBasePositioner);
+    if (s==d->spacing)
+        return;
+    d->spacing = s;
+    prePositioning();
+    emit spacingChanged();
+}
+
+QDeclarativeTransition *QDeclarativeBasePositioner::move() const
+{
+    Q_D(const QDeclarativeBasePositioner);
+    return d->moveTransition;
+}
+
+void QDeclarativeBasePositioner::setMove(QDeclarativeTransition *mt)
+{
+    Q_D(QDeclarativeBasePositioner);
+    if (mt == d->moveTransition)
+        return;
+    d->moveTransition = mt;
+    emit moveChanged();
+}
+
+QDeclarativeTransition *QDeclarativeBasePositioner::add() const
+{
+    Q_D(const QDeclarativeBasePositioner);
+    return d->addTransition;
+}
+
+void QDeclarativeBasePositioner::setAdd(QDeclarativeTransition *add)
+{
+    Q_D(QDeclarativeBasePositioner);
+    if (add == d->addTransition)
+        return;
+
+    d->addTransition = add;
+    emit addChanged();
+}
+
+void QDeclarativeBasePositioner::componentComplete()
+{
+    Q_D(QDeclarativeBasePositioner);
+    QDeclarativeItem::componentComplete();
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::BasepositionerComponentComplete> cc;
+#endif
+    positionedItems.reserve(d->QGraphicsItemPrivate::children.count());
+    prePositioning();
+}
+
+QVariant QDeclarativeBasePositioner::itemChange(GraphicsItemChange change,
+                                       const QVariant &value)
+{
+    Q_D(QDeclarativeBasePositioner);
+    if (change == ItemChildAddedChange){
+        QGraphicsItem* item = value.value<QGraphicsItem*>();
+        QDeclarativeItem* child = 0;
+        if(item)
+            child = qobject_cast<QDeclarativeItem*>(item->toGraphicsObject());
+        if (child)
+            prePositioning();
+    } else if (change == ItemChildRemovedChange) {
+        QGraphicsItem* item = value.value<QGraphicsItem*>();
+        QDeclarativeItem* child = 0;
+        if(item)
+            child = qobject_cast<QDeclarativeItem*>(item->toGraphicsObject());
+        if (child) {
+            QDeclarativeBasePositioner::PositionedItem posItem(child);
+            int idx = positionedItems.find(posItem);
+            if (idx >= 0) {
+                d->unwatchChanges(child);
+                positionedItems.remove(idx);
+            }
+            prePositioning();
+        }
+    }
+
+    return QDeclarativeItem::itemChange(change, value);
+}
+
+void QDeclarativeBasePositioner::prePositioning()
+{
+    Q_D(QDeclarativeBasePositioner);
+    if (!isComponentComplete())
+        return;
+
+    d->queuedPositioning = false;
+    //Need to order children by creation order modified by stacking order
+    QList<QGraphicsItem *> children = d->QGraphicsItemPrivate::children;
+    qSort(children.begin(), children.end(), d->insertionOrder);
+
+    for (int ii = 0; ii < children.count(); ++ii) {
+        QDeclarativeItem *child = qobject_cast<QDeclarativeItem *>(children.at(ii));
+        if (!child)
+            continue;
+        PositionedItem *item = 0;
+        PositionedItem posItem(child);
+        int wIdx = positionedItems.find(posItem);
+        if (wIdx < 0) {
+            d->watchChanges(child);
+            positionedItems.append(posItem);
+            item = &positionedItems[positionedItems.count()-1];
+        } else {
+            item = &positionedItems[wIdx];
+        }
+        if (child->opacity() <= 0.0 || !child->isVisible()) {
+            item->isVisible = false;
+            continue;
+        }
+        if (!item->isVisible) {
+            item->isVisible = true;
+            item->isNew = true;
+        } else {
+            item->isNew = false;
+        }
+    }
+    doPositioning();
+    if(d->addTransition || d->moveTransition)
+        finishApplyTransitions();
+    //Set implicit size to the size of its children
+    qreal h = 0.0f;
+    qreal w = 0.0f;
+    for (int i = 0; i < positionedItems.count(); ++i) {
+        const PositionedItem &posItem = positionedItems.at(i);
+        if (posItem.isVisible) {
+            h = qMax(h, posItem.item->y() + posItem.item->height());
+            w = qMax(w, posItem.item->x() + posItem.item->width());
+        }
+    }
+    setImplicitHeight(h);
+    setImplicitWidth(w);
+}
+
+void QDeclarativeBasePositioner::positionX(int x, const PositionedItem &target)
+{
+    Q_D(QDeclarativeBasePositioner);
+    if(d->type == Horizontal || d->type == Both){
+        if(!d->addTransition && !d->moveTransition){
+            target.item->setX(x);
+        }else{
+            if(target.isNew)
+                d->addActions << QDeclarativeAction(target.item, QLatin1String("x"), QVariant(x));
+            else
+                d->moveActions << QDeclarativeAction(target.item, QLatin1String("x"), QVariant(x));
+        }
+    }
+}
+
+void QDeclarativeBasePositioner::positionY(int y, const PositionedItem &target)
+{
+    Q_D(QDeclarativeBasePositioner);
+    if(d->type == Vertical || d->type == Both){
+        if(!d->addTransition && !d->moveTransition){
+            target.item->setY(y);
+        }else{
+            if(target.isNew)
+                d->addActions << QDeclarativeAction(target.item, QLatin1String("y"), QVariant(y));
+            else
+                d->moveActions << QDeclarativeAction(target.item, QLatin1String("y"), QVariant(y));
+        }
+    }
+}
+
+void QDeclarativeBasePositioner::finishApplyTransitions()
+{
+    Q_D(QDeclarativeBasePositioner);
+    // Note that if a transition is not set the transition manager will
+    // apply the changes directly, in the case add/move aren't set
+    d->addTransitionManager.transition(d->addActions, d->addTransition);
+    d->moveTransitionManager.transition(d->moveActions, d->moveTransition);
+    d->addActions.clear();
+    d->moveActions.clear();
+}
+
+/*!
+  \qmlclass Column QDeclarativeColumn
+    \since 4.7
+  \brief The Column item lines up its children vertically.
+  \inherits Item
+
+  The Column item positions its child items so that they are vertically
+    aligned and not overlapping. Spacing between items can be added.
+
+  The below example positions differently shaped rectangles using a Column.
+  \table
+  \row
+  \o \image verticalpositioner_example.png
+  \o
+  \qml
+Column {
+    spacing: 2
+    Rectangle { color: "red"; width: 50; height: 50 }
+    Rectangle { color: "green"; width: 20; height: 50 }
+    Rectangle { color: "blue"; width: 50; height: 20 }
+}
+  \endqml
+  \endtable
+
+  Column also provides for transitions to be set when items are added, moved,
+  or removed in the positioner. Adding and removing apply both to items which are deleted
+  or have their position in the document changed so as to no longer be children of the positioner,
+  as well as to items which have their opacity set to or from zero so as to appear or disappear.
+
+  \table
+  \row
+  \o \image verticalpositioner_transition.gif
+  \o
+  \qml
+Column {
+    spacing: 2
+    remove: ...
+    add: ...
+    move: ...
+    ...
+}
+  \endqml
+  \endtable
+
+  Note that the positioner assumes that the x and y positions of its children
+  will not change. If you manually change the x or y properties in script, bind
+  the x or y properties, or use anchors on a child of a positioner, then the
+  positioner may exhibit strange behaviour.
+
+*/
+/*!
+    \qmlproperty Transition Column::add
+
+    This property holds the transition to be applied when adding an
+    item to the positioner. The transition will only be applied to the
+    added item(s).  Positioner transitions will only affect the
+    position (x,y) of items.
+
+    Added can mean that either the object has been created or
+    reparented, and thus is now a child or the positioner, or that the
+    object has had its opacity increased from zero, and thus is now
+    visible.
+
+
+*/
+/*!
+    \qmlproperty Transition Column::move
+
+    This property holds the transition to apply when moving an item
+    within the positioner.  Positioner transitions will only affect
+    the position (x,y) of items.
+
+    This can happen when other items are added or removed from the
+    positioner, or when items resize themselves.
+
+    \table
+    \row
+    \o \image positioner-move.gif
+    \o
+    \qml
+Column {
+    move: Transition {
+        NumberAnimation {
+            properties: "y"
+            easing: "easeOutBounce"
+        }
+    }
+}
+    \endqml
+    \endtable
+*/
+/*!
+  \qmlproperty int Column::spacing
+
+  spacing is the amount in pixels left empty between each adjacent
+  item, and defaults to 0.
+
+  The below example places a Grid containing a red, a blue and a
+  green rectangle on a gray background. The area the grid positioner
+  occupies is colored white. The top positioner has the default of no spacing,
+  and the bottom positioner has its spacing set to 2.
+
+  \image spacing_a.png
+  \image spacing_b.png
+
+*/
+/*!
+    \internal
+    \class QDeclarativeColumn
+    \brief The QDeclarativeColumn class lines up items vertically.
+    \ingroup group_positioners
+*/
+QDeclarativeColumn::QDeclarativeColumn(QDeclarativeItem *parent)
+: QDeclarativeBasePositioner(Vertical, parent)
+{
+}
+
+static inline bool isInvisible(QDeclarativeItem *child)
+{
+    return child->opacity() == 0.0 || !child->isVisible() || !child->width() || !child->height();
+}
+
+void QDeclarativeColumn::doPositioning()
+{
+    int voffset = 0;
+
+    for (int ii = 0; ii < positionedItems.count(); ++ii) {
+        const PositionedItem &child = positionedItems.at(ii);
+        if (!child.item || isInvisible(child.item))
+            continue;
+
+        if(child.item->y() != voffset)
+            positionY(voffset, child);
+
+        voffset += child.item->height();
+        voffset += spacing();
+    }
+}
+
+/*!
+  \qmlclass Row QDeclarativeRow
+  \since 4.7
+  \brief The Row item lines up its children horizontally.
+  \inherits Item
+
+  The Row item positions its child items so that they are
+  horizontally aligned and not overlapping. Spacing can be added between the
+  items, and a margin around all items can also be added. It also provides for
+  transitions to be set when items are added, moved, or removed in the
+  positioner. Adding and removing apply both to items which are deleted or have
+  their position in the document changed so as to no longer be children of the
+  positioner, as well as to items which have their opacity set to or from zero
+  so as to appear or disappear.
+
+  The below example lays out differently shaped rectangles using a Row.
+  \qml
+Row {
+    spacing: 2
+    Rectangle { color: "red"; width: 50; height: 50 }
+    Rectangle { color: "green"; width: 20; height: 50 }
+    Rectangle { color: "blue"; width: 50; height: 20 }
+}
+  \endqml
+  \image horizontalpositioner_example.png
+
+  Note that the positioner assumes that the x and y positions of its children
+  will not change. If you manually change the x or y properties in script, bind
+  the x or y properties, or use anchors on a child of a positioner, then the
+  positioner may exhibit strange behaviour.
+
+*/
+/*!
+    \qmlproperty Transition Row::add
+    This property holds the transition to apply when adding an item to the positioner.
+    The transition will only be applied to the added item(s).
+    Positioner transitions will only affect the position (x,y) of items.
+
+    Added can mean that either the object has been created or
+    reparented, and thus is now a child or the positioner, or that the
+    object has had its opacity increased from zero, and thus is now
+    visible.
+
+
+*/
+/*!
+    \qmlproperty Transition Row::move
+
+    This property holds the transition to apply when moving an item
+    within the positioner.  Positioner transitions will only affect
+    the position (x,y) of items.
+
+    This can happen when other items are added or removed from the
+    positioner, or when items resize themselves.
+
+    \qml
+Row {
+    id: positioner
+    move: Transition {
+        NumberAnimation {
+            properties: "x"
+            ease: "easeOutBounce"
+        }
+    }
+}
+    \endqml
+
+*/
+/*!
+  \qmlproperty int Row::spacing
+
+  spacing is the amount in pixels left empty between each adjacent
+  item, and defaults to 0.
+
+  The below example places a Grid containing a red, a blue and a
+  green rectangle on a gray background. The area the grid positioner
+  occupies is colored white. The top positioner has the default of no spacing,
+  and the bottom positioner has its spacing set to 2.
+
+  \image spacing_a.png
+  \image spacing_b.png
+
+*/
+/*!
+    \internal
+    \class QDeclarativeRow
+    \brief The QDeclarativeRow class lines up items horizontally.
+    \ingroup group_positioners
+*/
+QDeclarativeRow::QDeclarativeRow(QDeclarativeItem *parent)
+: QDeclarativeBasePositioner(Horizontal, parent)
+{
+}
+
+void QDeclarativeRow::doPositioning()
+{
+    int hoffset = 0;
+
+    for (int ii = 0; ii < positionedItems.count(); ++ii) {
+        const PositionedItem &child = positionedItems.at(ii);
+        if (!child.item || isInvisible(child.item))
+            continue;
+
+        if(child.item->x() != hoffset)
+            positionX(hoffset, child);
+
+        hoffset += child.item->width();
+        hoffset += spacing();
+    }
+}
+
+
+/*!
+  \qmlclass Grid QDeclarativeGrid
+  \since 4.7
+  \brief The Grid item positions its children in a grid.
+  \inherits Item
+
+  The Grid item positions its child items so that they are
+  aligned in a grid and are not overlapping. Spacing can be added
+  between the items. It also provides for transitions to be set when items are
+  added, moved, or removed in the positioner. Adding and removing apply
+  both to items which are deleted or have their position in the
+  document changed so as to no longer be children of the positioner, as
+  well as to items which have their opacity set to or from zero so
+  as to appear or disappear.
+
+  The Grid defaults to using four columns, and as many rows as
+  are necessary to fit all the child items. The number of rows
+  and/or the number of columns can be constrained by setting the rows
+  or columns properties. The grid positioner calculates a grid with
+  rectangular cells of sufficient size to hold all items, and then
+  places the items in the cells, going across then down, and
+  positioning each item at the (0,0) corner of the cell. The below
+  example demonstrates this.
+
+  \table
+  \row
+  \o \image gridLayout_example.png
+  \o
+  \qml
+Grid {
+    columns: 3
+    spacing: 2
+    Rectangle { color: "red"; width: 50; height: 50 }
+    Rectangle { color: "green"; width: 20; height: 50 }
+    Rectangle { color: "blue"; width: 50; height: 20 }
+    Rectangle { color: "cyan"; width: 50; height: 50 }
+    Rectangle { color: "magenta"; width: 10; height: 10 }
+}
+  \endqml
+  \endtable
+
+  Note that the positioner assumes that the x and y positions of its children
+  will not change. If you manually change the x or y properties in script, bind
+  the x or y properties, or use anchors on a child of a positioner, then the
+  positioner may exhibit strange behaviour.
+*/
+/*!
+    \qmlproperty Transition Grid::add
+    This property holds the transition to apply when adding an item to the positioner.
+    The transition is only applied to the added item(s).
+    Positioner transitions will only affect the position (x,y) of items.
+
+    Added can mean that either the object has been created or
+    reparented, and thus is now a child or the positioner, or that the
+    object has had its opacity increased from zero, and thus is now
+    visible.
+
+
+*/
+/*!
+    \qmlproperty Transition Grid::move
+    This property holds the transition to apply when moving an item within the positioner.
+    Positioner transitions will only affect the position (x,y) of items.
+
+    This can happen when other items are added or removed from the positioner, or
+    when items resize themselves.
+
+    \qml
+Grid {
+    move: Transition {
+        NumberAnimation {
+            properties: "x,y"
+            ease: "easeOutBounce"
+        }
+    }
+}
+    \endqml
+
+*/
+/*!
+  \qmlproperty int Grid::spacing
+
+  spacing is the amount in pixels left empty between each adjacent
+  item, and defaults to 0.
+
+  The below example places a Grid containing a red, a blue and a
+  green rectangle on a gray background. The area the grid positioner
+  occupies is colored white. The top positioner has the default of no spacing,
+  and the bottom positioner has its spacing set to 2.
+
+  \image spacing_a.png
+  \image spacing_b.png
+
+*/
+/*!
+    \internal
+    \class QDeclarativeGrid
+    \brief The QDeclarativeGrid class lays out items in a grid.
+    \ingroup group_layouts
+
+*/
+QDeclarativeGrid::QDeclarativeGrid(QDeclarativeItem *parent) :
+    QDeclarativeBasePositioner(Both, parent)
+{
+    _columns=-1;
+    _rows=-1;
+}
+
+/*!
+    \qmlproperty int Grid::columns
+    This property holds the number of columns in the grid.
+
+    When the columns property is set the Grid will always have
+    that many columns. Note that if you do not have enough items to
+    fill this many columns some columns will be of zero width.
+*/
+
+/*!
+    \qmlproperty int Grid::rows
+    This property holds the number of rows in the grid.
+
+    When the rows property is set the Grid will always have that
+    many rows. Note that if you do not have enough items to fill this
+    many rows some rows will be of zero width.
+*/
+
+void QDeclarativeGrid::setColumns(const int columns)
+{
+    if (columns == _columns)
+        return;
+    _columns = columns;
+    prePositioning();
+    emit columnsChanged();
+}
+
+void QDeclarativeGrid::setRows(const int rows)
+{
+    if (rows == _rows)
+        return;
+    _rows = rows;
+    prePositioning();
+    emit rowsChanged();
+}
+
+void QDeclarativeGrid::doPositioning()
+{
+    int c=_columns,r=_rows;//Actual number of rows/columns
+    int numVisible = positionedItems.count();
+    if (_columns==-1 && _rows==-1){
+        c = 4;
+        r = (numVisible+3)/4;
+    }else if (_rows==-1){
+        r = (numVisible+(_columns-1))/_columns;
+    }else if (_columns==-1){
+        c = (numVisible+(_rows-1))/_rows;
+    }
+
+    QList<int> maxColWidth;
+    QList<int> maxRowHeight;
+    int childIndex =0;
+    for (int i=0; i<r; i++){
+        for (int j=0; j<c; j++){
+            if (j==0)
+                maxRowHeight << 0;
+            if (i==0)
+                maxColWidth << 0;
+
+            if (childIndex == positionedItems.count())
+                continue;
+            const PositionedItem &child = positionedItems.at(childIndex++);
+            if (!child.item || isInvisible(child.item))
+                continue;
+            if (child.item->width() > maxColWidth[j])
+                maxColWidth[j] = child.item->width();
+            if (child.item->height() > maxRowHeight[i])
+                maxRowHeight[i] = child.item->height();
+        }
+    }
+
+    int xoffset=0;
+    int yoffset=0;
+    int curRow =0;
+    int curCol =0;
+    for (int i = 0; i < positionedItems.count(); ++i) {
+        const PositionedItem &child = positionedItems.at(i);
+        if (!child.item || isInvisible(child.item))
+            continue;
+        if((child.item->x()!=xoffset)||(child.item->y()!=yoffset)){
+            positionX(xoffset, child);
+            positionY(yoffset, child);
+        }
+        xoffset+=maxColWidth[curCol]+spacing();
+        curCol++;
+        curCol%=c;
+        if (!curCol){
+            yoffset+=maxRowHeight[curRow]+spacing();
+            xoffset=0;
+            curRow++;
+            if (curRow>=r)
+                break;
+        }
+    }
+}
+
+
+/*!
+  \qmlclass Flow QDeclarativeFlow
+  \since 4.7
+  \brief The Flow item lines up its children side by side, wrapping as necessary.
+  \inherits Item
+
+
+*/
+/*!
+    \qmlproperty Transition Flow::add
+    This property holds the transition to apply when adding an item to the positioner.
+    The transition will only be applied to the added item(s).
+    Positioner transitions will only affect the position (x,y) of items.
+
+    Added can mean that either the object has been created or reparented, and thus is now a child or the positioner, or that the object has had its opacity increased from zero, and thus is now visible.
+
+
+*/
+/*!
+    \qmlproperty Transition Flow::move
+    This property holds the transition to apply when moving an item within the positioner.
+    Positioner transitions will only affect the position (x,y) of items.
+
+    This can happen when other items are added or removed from the positioner, or when items resize themselves.
+
+    \qml
+Flow {
+    id: positioner
+    move: Transition {
+        NumberAnimation {
+            properties: "x,y"
+            ease: "easeOutBounce"
+        }
+    }
+}
+    \endqml
+
+*/
+/*!
+  \qmlproperty int Flow::spacing
+
+  spacing is the amount in pixels left empty between each adjacent
+  item, and defaults to 0.
+
+*/
+
+class QDeclarativeFlowPrivate : public QDeclarativeBasePositionerPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeFlow)
+
+public:
+    QDeclarativeFlowPrivate()
+        : QDeclarativeBasePositionerPrivate(), flow(QDeclarativeFlow::LeftToRight)
+    {}
+
+    QDeclarativeFlow::Flow flow;
+};
+
+QDeclarativeFlow::QDeclarativeFlow(QDeclarativeItem *parent)
+: QDeclarativeBasePositioner(*(new QDeclarativeFlowPrivate), Both, parent)
+{
+}
+
+/*!
+    \qmlproperty enumeration Flow::flow
+    This property holds the flow of the layout.
+
+    Possible values are \c LeftToRight (default) and \c TopToBottom.
+
+    If \a flow is \c LeftToRight, the items are positioned next to
+    to each other from left to right until the width of the Flow
+    is exceeded, then wrapped to the next line.
+    If \a flow is \c TopToBottom, the items are positioned next to each
+    other from top to bottom until the height of the Flow is exceeded,
+    then wrapped to the next column.
+*/
+QDeclarativeFlow::Flow QDeclarativeFlow::flow() const
+{
+    Q_D(const QDeclarativeFlow);
+    return d->flow;
+}
+
+void QDeclarativeFlow::setFlow(Flow flow)
+{
+    Q_D(QDeclarativeFlow);
+    if (d->flow != flow) {
+        d->flow = flow;
+        prePositioning();
+        emit flowChanged();
+    }
+}
+
+void QDeclarativeFlow::doPositioning()
+{
+    Q_D(QDeclarativeFlow);
+
+    int hoffset = 0;
+    int voffset = 0;
+    int linemax = 0;
+
+    for (int i = 0; i < positionedItems.count(); ++i) {
+        const PositionedItem &child = positionedItems.at(i);
+        if (!child.item || isInvisible(child.item))
+            continue;
+
+        if (d->flow == LeftToRight)  {
+            if (hoffset && hoffset + child.item->width() > width()) {
+                hoffset = 0;
+                voffset += linemax + spacing();
+                linemax = 0;
+            }
+        } else {
+            if (voffset && voffset + child.item->height() > height()) {
+                voffset = 0;
+                hoffset += linemax + spacing();
+                linemax = 0;
+            }
+        }
+
+        if(child.item->x() != hoffset || child.item->y() != voffset){
+            positionX(hoffset, child);
+            positionY(voffset, child);
+        }
+
+        if (d->flow == LeftToRight)  {
+            hoffset += child.item->width();
+            hoffset += spacing();
+            linemax = qMax(linemax, qCeil(child.item->height()));
+        } else {
+            voffset += child.item->height();
+            voffset += spacing();
+            linemax = qMax(linemax, qCeil(child.item->width()));
+        }
+    }
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h
new file mode 100644
index 0000000..ff6fc4b
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h
@@ -0,0 +1,199 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELAYOUTS_H
+#define QDECLARATIVELAYOUTS_H
+
+#include "qdeclarativeitem.h"
+
+#include "../util/qdeclarativestate_p.h"
+#include <private/qpodvector_p.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+class QDeclarativeBasePositionerPrivate;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeBasePositioner : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
+    Q_PROPERTY(QDeclarativeTransition *move READ move WRITE setMove NOTIFY moveChanged)
+    Q_PROPERTY(QDeclarativeTransition *add READ add WRITE setAdd NOTIFY addChanged)
+public:
+    enum PositionerType { None = 0x0, Horizontal = 0x1, Vertical = 0x2, Both = 0x3 };
+    QDeclarativeBasePositioner(PositionerType, QDeclarativeItem *parent);
+    ~QDeclarativeBasePositioner();
+
+    int spacing() const;
+    void setSpacing(int);
+
+    QDeclarativeTransition *move() const;
+    void setMove(QDeclarativeTransition *);
+
+    QDeclarativeTransition *add() const;
+    void setAdd(QDeclarativeTransition *);
+
+protected:
+    QDeclarativeBasePositioner(QDeclarativeBasePositionerPrivate &dd, PositionerType at, QDeclarativeItem *parent);
+    virtual void componentComplete();
+    virtual QVariant itemChange(GraphicsItemChange, const QVariant &);
+    void finishApplyTransitions();
+
+Q_SIGNALS:
+    void spacingChanged();
+    void moveChanged();
+    void addChanged();
+
+protected Q_SLOTS:
+    virtual void doPositioning()=0;
+    void prePositioning();
+
+protected:
+    struct PositionedItem {
+        PositionedItem(QDeclarativeItem *i) : item(i), isNew(false), isVisible(true) {}
+        bool operator==(const PositionedItem &other) const { return other.item == item; }
+        QDeclarativeItem *item;
+        bool isNew;
+        bool isVisible;
+    };
+
+    QPODVector<PositionedItem,8> positionedItems;
+    void positionX(int,const PositionedItem &target);
+    void positionY(int,const PositionedItem &target);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeBasePositioner)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeBasePositioner)
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeColumn : public QDeclarativeBasePositioner
+{
+    Q_OBJECT
+public:
+    QDeclarativeColumn(QDeclarativeItem *parent=0);
+protected Q_SLOTS:
+    virtual void doPositioning();
+private:
+    Q_DISABLE_COPY(QDeclarativeColumn)
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeRow: public QDeclarativeBasePositioner
+{
+    Q_OBJECT
+public:
+    QDeclarativeRow(QDeclarativeItem *parent=0);
+protected Q_SLOTS:
+    virtual void doPositioning();
+private:
+    Q_DISABLE_COPY(QDeclarativeRow)
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeGrid : public QDeclarativeBasePositioner
+{
+    Q_OBJECT
+    Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowChanged)
+    Q_PROPERTY(int columns READ columns WRITE setColumns NOTIFY columnsChanged)
+public:
+    QDeclarativeGrid(QDeclarativeItem *parent=0);
+
+    int rows() const {return _rows;}
+    void setRows(const int rows);
+
+    int columns() const {return _columns;}
+    void setColumns(const int columns);
+
+Q_SIGNALS:
+    void rowsChanged();
+    void columnsChanged();
+
+protected Q_SLOTS:
+    virtual void doPositioning();
+
+private:
+    int _rows;
+    int _columns;
+    Q_DISABLE_COPY(QDeclarativeGrid)
+};
+
+class QDeclarativeFlowPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeFlow: public QDeclarativeBasePositioner
+{
+    Q_OBJECT
+    Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
+public:
+    QDeclarativeFlow(QDeclarativeItem *parent=0);
+
+    Q_ENUMS(Flow)
+    enum Flow { LeftToRight, TopToBottom };
+    Flow flow() const;
+    void setFlow(Flow);
+
+Q_SIGNALS:
+    void flowChanged();
+
+protected Q_SLOTS:
+    virtual void doPositioning();
+
+protected:
+    QDeclarativeFlow(QDeclarativeFlowPrivate &dd, QDeclarativeItem *parent);
+private:
+    Q_DISABLE_COPY(QDeclarativeFlow)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeFlow)
+};
+
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeColumn)
+QML_DECLARE_TYPE(QDeclarativeRow)
+QML_DECLARE_TYPE(QDeclarativeGrid)
+QML_DECLARE_TYPE(QDeclarativeFlow)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
new file mode 100644
index 0000000..3a1edee
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELAYOUTS_P_H
+#define QDECLARATIVELAYOUTS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativepositioners_p.h"
+
+#include "qdeclarativeitem_p.h"
+
+#include <qdeclarativestate_p.h>
+#include <qdeclarativetransitionmanager_p_p.h>
+#include <qdeclarativestateoperations_p.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
+#include <QDebug>
+
+QT_BEGIN_NAMESPACE
+class QDeclarativeBasePositionerPrivate : public QDeclarativeItemPrivate, public QDeclarativeItemChangeListener
+{
+    Q_DECLARE_PUBLIC(QDeclarativeBasePositioner)
+
+public:
+    QDeclarativeBasePositionerPrivate()
+        : spacing(0), type(QDeclarativeBasePositioner::None), moveTransition(0), addTransition(0),
+          queuedPositioning(false)
+    {
+    }
+
+    void init(QDeclarativeBasePositioner::PositionerType at)
+    {
+        type = at;
+    }
+
+    int spacing;
+    QDeclarativeBasePositioner::PositionerType type;
+    QDeclarativeTransition *moveTransition;
+    QDeclarativeTransition *addTransition;
+    QDeclarativeStateOperation::ActionList addActions;
+    QDeclarativeStateOperation::ActionList moveActions;
+    QDeclarativeTransitionManager addTransitionManager;
+    QDeclarativeTransitionManager moveTransitionManager;
+
+    void watchChanges(QDeclarativeItem *other);
+    void unwatchChanges(QDeclarativeItem* other);
+    bool queuedPositioning;
+
+    virtual void itemSiblingOrderChanged(QDeclarativeItem* other)
+    {
+        Q_Q(QDeclarativeBasePositioner);
+        Q_UNUSED(other);
+        if(!queuedPositioning){
+            //Delay is due to many children often being reordered at once
+            //And we only want to reposition them all once
+            QTimer::singleShot(0,q,SLOT(prePositioning()));
+            queuedPositioning = true;
+        }
+    }
+
+    void itemGeometryChanged(QDeclarativeItem *, const QRectF &newGeometry, const QRectF &oldGeometry)
+    {
+        Q_Q(QDeclarativeBasePositioner);
+        if (newGeometry.size() != oldGeometry.size())
+            q->prePositioning();
+    }
+    virtual void itemVisibilityChanged(QDeclarativeItem *)
+    {
+        Q_Q(QDeclarativeBasePositioner);
+        q->prePositioning();
+    }
+    virtual void itemOpacityChanged(QDeclarativeItem *)
+    {
+        Q_Q(QDeclarativeBasePositioner);
+        q->prePositioning();
+    }
+
+    void itemDestroyed(QDeclarativeItem *item)
+    {
+        Q_Q(QDeclarativeBasePositioner);
+        q->positionedItems.removeOne(QDeclarativeBasePositioner::PositionedItem(item));
+    }
+};
+
+QT_END_NAMESPACE
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
new file mode 100644
index 0000000..d534f21
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -0,0 +1,466 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativerectangle_p.h"
+#include "qdeclarativerectangle_p_p.h"
+
+#include <QPainter>
+#include <QtCore/qmath.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \internal
+    \class QDeclarativePen
+    \brief The QDeclarativePen class provides a pen used for drawing rectangle borders on a QDeclarativeView.
+
+    By default, the pen is invalid and nothing is drawn. You must either set a color (then the default
+    width is 1) or a width (then the default color is black).
+
+    A width of 1 indicates is a single-pixel line on the border of the item being painted.
+
+    Example:
+    \qml
+    Rectangle { border.width: 2; border.color: "red" ... }
+    \endqml
+*/
+
+void QDeclarativePen::setColor(const QColor &c)
+{
+    _color = c;
+    _valid = _color.alpha() ? true : false;
+    emit penChanged();
+}
+
+void QDeclarativePen::setWidth(int w)
+{
+    if (_width == w && _valid)
+        return;
+
+    _width = w;
+    _valid = (_width < 1) ? false : true;
+    emit penChanged();
+}
+
+
+/*!
+    \qmlclass GradientStop QDeclarativeGradientStop
+  \since 4.7
+    \brief The GradientStop item defines the color at a position in a Gradient
+
+    \sa Gradient
+*/
+
+/*!
+    \qmlproperty real GradientStop::position
+    \qmlproperty color GradientStop::color
+
+    Sets a \e color at a \e position in a gradient.
+*/
+
+void QDeclarativeGradientStop::updateGradient()
+{
+    if (QDeclarativeGradient *grad = qobject_cast<QDeclarativeGradient*>(parent()))
+        grad->doUpdate();
+}
+
+/*!
+    \qmlclass Gradient QDeclarativeGradient
+  \since 4.7
+    \brief The Gradient item defines a gradient fill.
+
+    A gradient is defined by two or more colors, which will be blended seemlessly.  The
+    colors are specified at their position in the range 0.0 - 1.0 via
+    the GradientStop item.  For example, the following code paints a
+    rectangle with a gradient starting with red, blending to yellow at 1/3 of the
+    size of the rectangle, and ending with Green:
+
+    \table
+    \row
+    \o \image gradient.png
+    \o \quotefile doc/src/snippets/declarative/gradient.qml
+    \endtable
+
+    \sa GradientStop
+*/
+
+/*!
+    \qmlproperty list<GradientStop> Gradient::stops
+    This property holds the gradient stops describing the gradient.
+*/
+
+const QGradient *QDeclarativeGradient::gradient() const
+{
+    if (!m_gradient && !m_stops.isEmpty()) {
+        m_gradient = new QLinearGradient(0,0,0,1.0);
+        for (int i = 0; i < m_stops.count(); ++i) {
+            const QDeclarativeGradientStop *stop = m_stops.at(i);
+            m_gradient->setCoordinateMode(QGradient::ObjectBoundingMode);
+            m_gradient->setColorAt(stop->position(), stop->color());
+        }
+    }
+
+    return m_gradient;
+}
+
+void QDeclarativeGradient::doUpdate()
+{
+    delete m_gradient;
+    m_gradient = 0;
+    emit updated();
+}
+
+
+/*!
+    \qmlclass Rectangle QDeclarativeRectangle
+  \since 4.7
+    \brief The Rectangle item allows you to add rectangles to a scene.
+    \inherits Item
+
+    A Rectangle is painted having a solid fill (color) and an optional border.
+    You can also create rounded rectangles using the radius property.
+
+    \qml
+    Rectangle {
+        width: 100
+        height: 100
+        color: "red"
+        border.color: "black"
+        border.width: 5
+        radius: 10
+    }
+    \endqml
+
+    \image declarative-rect.png
+*/
+
+/*!
+    \internal
+    \class QDeclarativeRectangle
+    \brief The QDeclarativeRectangle class provides a rectangle item that you can add to a QDeclarativeView.
+*/
+QDeclarativeRectangle::QDeclarativeRectangle(QDeclarativeItem *parent)
+  : QDeclarativeItem(*(new QDeclarativeRectanglePrivate), parent)
+{
+    Q_D(QDeclarativeRectangle);
+    d->init();
+    setFlag(QGraphicsItem::ItemHasNoContents, false);
+}
+
+void QDeclarativeRectangle::doUpdate()
+{
+    Q_D(QDeclarativeRectangle);
+    d->rectImage = QPixmap();
+    const int pw = d->pen && d->pen->isValid() ? d->pen->width() : 0;
+    d->setPaintMargin((pw+1)/2);
+    update();
+}
+
+/*!
+    \qmlproperty int Rectangle::border.width
+    \qmlproperty color Rectangle::border.color
+
+    The width and color used to draw the border of the rectangle.
+
+    A width of 1 creates a thin line. For no line, use a width of 0 or a transparent color.
+
+    To keep the border smooth (rather than blurry), odd widths cause the rectangle to be painted at
+    a half-pixel offset;
+*/
+QDeclarativePen *QDeclarativeRectangle::border()
+{
+    Q_D(QDeclarativeRectangle);
+    return d->getPen();
+}
+
+/*!
+    \qmlproperty Gradient Rectangle::gradient
+
+    The gradient to use to fill the rectangle.
+
+    This property allows for the construction of simple vertical gradients.
+    Other gradients may by formed by adding rotation to the rectangle.
+
+    \table
+    \row
+    \o \image declarative-rect_gradient.png
+    \o
+    \qml
+    Rectangle { y: 0; width: 80; height: 80; color: "lightsteelblue" }
+    Rectangle { y: 100; width: 80; height: 80
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "lightsteelblue" }
+            GradientStop { position: 1.0; color: "blue" }
+        }
+    }
+    Rectangle { rotation: 90; x: 80; y: 200; width: 80; height: 80
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "lightsteelblue" }
+            GradientStop { position: 1.0; color: "blue" }
+        }
+    }
+    // The x offset is needed because the rotation is from the top left corner
+    \endqml
+    \endtable
+
+    If both a gradient and a color are specified, the gradient will be used.
+
+    \sa Gradient, color
+*/
+QDeclarativeGradient *QDeclarativeRectangle::gradient() const
+{
+    Q_D(const QDeclarativeRectangle);
+    return d->gradient;
+}
+
+void QDeclarativeRectangle::setGradient(QDeclarativeGradient *gradient)
+{
+    Q_D(QDeclarativeRectangle);
+    if (d->gradient == gradient)
+        return;
+    if (d->gradient)
+        disconnect(d->gradient, SIGNAL(updated()), this, SLOT(doUpdate()));
+    d->gradient = gradient;
+    if (d->gradient)
+        connect(d->gradient, SIGNAL(updated()), this, SLOT(doUpdate()));
+    update();
+}
+
+
+/*!
+    \qmlproperty real Rectangle::radius
+    This property holds the corner radius used to draw a rounded rectangle.
+
+    If radius is non-zero, the rectangle will be painted as a rounded rectangle, otherwise it will be
+    painted as a normal rectangle. The same radius is used by all 4 corners; there is currently
+    no way to specify different radii for different corners.
+*/
+qreal QDeclarativeRectangle::radius() const
+{
+    Q_D(const QDeclarativeRectangle);
+    return d->radius;
+}
+
+void QDeclarativeRectangle::setRadius(qreal radius)
+{
+    Q_D(QDeclarativeRectangle);
+    if (d->radius == radius)
+        return;
+
+    d->radius = radius;
+    d->rectImage = QPixmap();
+    update();
+    emit radiusChanged();
+}
+
+/*!
+    \qmlproperty color Rectangle::color
+    This property holds the color used to fill the rectangle.
+
+    \qml
+    // green rectangle using hexidecimal notation
+    Rectangle { color: "#00FF00" }
+
+    // steelblue rectangle using SVG color name
+    Rectangle { color: "steelblue" }
+    \endqml
+
+    The default color is white.
+
+    If both a gradient and a color are specified, the gradient will be used.
+*/
+QColor QDeclarativeRectangle::color() const
+{
+    Q_D(const QDeclarativeRectangle);
+    return d->color;
+}
+
+void QDeclarativeRectangle::setColor(const QColor &c)
+{
+    Q_D(QDeclarativeRectangle);
+    if (d->color == c)
+        return;
+
+    d->color = c;
+    d->rectImage = QPixmap();
+    update();
+    emit colorChanged();
+}
+
+void QDeclarativeRectangle::generateRoundedRect()
+{
+    Q_D(QDeclarativeRectangle);
+    if (d->rectImage.isNull()) {
+        const int pw = d->pen && d->pen->isValid() ? d->pen->width() : 0;
+        const int radius = qCeil(d->radius);    //ensure odd numbered width/height so we get 1-pixel center
+        d->rectImage = QPixmap(radius*2 + 3 + pw*2, radius*2 + 3 + pw*2);
+        d->rectImage.fill(Qt::transparent);
+        QPainter p(&(d->rectImage));
+        p.setRenderHint(QPainter::Antialiasing);
+        if (d->pen && d->pen->isValid()) {
+            QPen pn(QColor(d->pen->color()), d->pen->width());
+            p.setPen(pn);
+        } else {
+            p.setPen(Qt::NoPen);
+        }
+        p.setBrush(d->color);
+        if (pw%2)
+            p.drawRoundedRect(QRectF(qreal(pw)/2+1, qreal(pw)/2+1, d->rectImage.width()-(pw+1), d->rectImage.height()-(pw+1)), d->radius, d->radius);
+        else
+            p.drawRoundedRect(QRectF(qreal(pw)/2, qreal(pw)/2, d->rectImage.width()-pw, d->rectImage.height()-pw), d->radius, d->radius);
+    }
+}
+
+void QDeclarativeRectangle::generateBorderedRect()
+{
+    Q_D(QDeclarativeRectangle);
+    if (d->rectImage.isNull()) {
+        const int pw = d->pen && d->pen->isValid() ? d->pen->width() : 0;
+        d->rectImage = QPixmap(pw*2 + 3, pw*2 + 3);
+        d->rectImage.fill(Qt::transparent);
+        QPainter p(&(d->rectImage));
+        p.setRenderHint(QPainter::Antialiasing);
+        if (d->pen && d->pen->isValid()) {
+            QPen pn(QColor(d->pen->color()), d->pen->width());
+            pn.setJoinStyle(Qt::MiterJoin);
+            p.setPen(pn);
+        } else {
+            p.setPen(Qt::NoPen);
+        }
+        p.setBrush(d->color);
+        if (pw%2)
+            p.drawRect(QRectF(qreal(pw)/2+1, qreal(pw)/2+1, d->rectImage.width()-(pw+1), d->rectImage.height()-(pw+1)));
+        else
+            p.drawRect(QRectF(qreal(pw)/2, qreal(pw)/2, d->rectImage.width()-pw, d->rectImage.height()-pw));
+    }
+}
+
+void QDeclarativeRectangle::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    Q_D(QDeclarativeRectangle);
+    if (d->radius > 0 || (d->pen && d->pen->isValid())
+        || (d->gradient && d->gradient->gradient()) ) {
+        drawRect(*p);
+    }
+    else {
+        bool oldAA = p->testRenderHint(QPainter::Antialiasing);
+        if (d->smooth)
+            p->setRenderHints(QPainter::Antialiasing, true);
+        p->fillRect(QRectF(0, 0, width(), height()), d->color);
+        if (d->smooth)
+            p->setRenderHint(QPainter::Antialiasing, oldAA);
+    }
+}
+
+void QDeclarativeRectangle::drawRect(QPainter &p)
+{
+    Q_D(QDeclarativeRectangle);
+    if (d->gradient && d->gradient->gradient()) {
+        // XXX This path is still slower than the image path
+        // Image path won't work for gradients though
+        bool oldAA = p.testRenderHint(QPainter::Antialiasing);
+        if (d->smooth)
+            p.setRenderHint(QPainter::Antialiasing);
+        if (d->pen && d->pen->isValid()) {
+            QPen pn(QColor(d->pen->color()), d->pen->width());
+            p.setPen(pn);
+        } else {
+            p.setPen(Qt::NoPen);
+        }
+        p.setBrush(*d->gradient->gradient());
+        if (d->radius > 0.)
+            p.drawRoundedRect(0, 0, width(), height(), d->radius, d->radius);
+        else
+            p.drawRect(0, 0, width(), height());
+        if (d->smooth)
+            p.setRenderHint(QPainter::Antialiasing, oldAA);
+    } else {
+        bool oldAA = p.testRenderHint(QPainter::Antialiasing);
+        bool oldSmooth = p.testRenderHint(QPainter::SmoothPixmapTransform);
+        if (d->smooth)
+            p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+
+        const int pw = d->pen && d->pen->isValid() ? (d->pen->width()+1)/2*2 : 0;
+
+        if (d->radius > 0)
+            generateRoundedRect();
+        else
+            generateBorderedRect();
+
+        int xOffset = (d->rectImage.width()-1)/2;
+        int yOffset = (d->rectImage.height()-1)/2;
+        Q_ASSERT(d->rectImage.width() == 2*xOffset + 1);
+        Q_ASSERT(d->rectImage.height() == 2*yOffset + 1);
+
+        QMargins margins(xOffset, yOffset, xOffset, yOffset);
+        QTileRules rules(Qt::StretchTile, Qt::StretchTile);
+        //NOTE: even though our item may have qreal-based width and height, qDrawBorderPixmap only supports QRects
+        qDrawBorderPixmap(&p, QRect(-pw/2, -pw/2, width()+pw, height()+pw), margins, d->rectImage, d->rectImage.rect(), margins, rules);
+
+        if (d->smooth) {
+            p.setRenderHint(QPainter::Antialiasing, oldAA);
+            p.setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
+        }
+    }
+}
+
+/*!
+    \qmlproperty bool Rectangle::smooth
+
+    Set this property if you want the item to be smoothly scaled or
+    transformed.  Smooth filtering gives better visual quality, but is slower.  If
+    the item is displayed at its natural size, this property has no visual or
+    performance effect.
+
+    \note Generally scaling artifacts are only visible if the item is stationary on
+    the screen.  A common pattern when animating an item is to disable smooth
+    filtering at the beginning of the animation and reenable it at the conclusion.
+
+    \image rect-smooth.png
+*/
+
+QRectF QDeclarativeRectangle::boundingRect() const
+{
+    Q_D(const QDeclarativeRectangle);
+    return QRectF(-d->paintmargin, -d->paintmargin, d->width+d->paintmargin*2, d->height+d->paintmargin*2);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p.h
new file mode 100644
index 0000000..7272962
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativerectangle_p.h
@@ -0,0 +1,186 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVERECT_H
+#define QDECLARATIVERECT_H
+
+#include "qdeclarativeitem.h"
+
+#include <QtGui/qbrush.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+class Q_DECLARATIVE_EXPORT QDeclarativePen : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int width READ width WRITE setWidth NOTIFY penChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY penChanged)
+public:
+    QDeclarativePen(QObject *parent=0)
+        : QObject(parent), _width(1), _color("#000000"), _valid(false)
+    {}
+
+    int width() const { return _width; }
+    void setWidth(int w);
+
+    QColor color() const { return _color; }
+    void setColor(const QColor &c);
+
+    bool isValid() { return _valid; };
+
+Q_SIGNALS:
+    void penChanged();
+
+private:
+    int _width;
+    QColor _color;
+    bool _valid;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeGradientStop : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(qreal position READ position WRITE setPosition)
+    Q_PROPERTY(QColor color READ color WRITE setColor)
+
+public:
+    QDeclarativeGradientStop(QObject *parent=0) : QObject(parent) {}
+
+    qreal position() const { return m_position; }
+    void setPosition(qreal position) { m_position = position; updateGradient(); }
+
+    QColor color() const { return m_color; }
+    void setColor(const QColor &color) { m_color = color; updateGradient(); }
+
+private:
+    void updateGradient();
+
+private:
+    qreal m_position;
+    QColor m_color;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeGradient : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeGradientStop> stops READ stops)
+    Q_CLASSINFO("DefaultProperty", "stops")
+
+public:
+    QDeclarativeGradient(QObject *parent=0) : QObject(parent), m_gradient(0) {}
+    ~QDeclarativeGradient() { delete m_gradient; }
+
+    QDeclarativeListProperty<QDeclarativeGradientStop> stops() { return QDeclarativeListProperty<QDeclarativeGradientStop>(this, m_stops); }
+
+    const QGradient *gradient() const;
+
+Q_SIGNALS:
+    void updated();
+
+private:
+    void doUpdate();
+
+private:
+    QList<QDeclarativeGradientStop *> m_stops;
+    mutable QGradient *m_gradient;
+    friend class QDeclarativeGradientStop;
+};
+
+class QDeclarativeRectanglePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeRectangle : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+    Q_PROPERTY(QDeclarativeGradient *gradient READ gradient WRITE setGradient)
+    Q_PROPERTY(QDeclarativePen * border READ border CONSTANT)
+    Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged)
+public:
+    QDeclarativeRectangle(QDeclarativeItem *parent=0);
+
+    QColor color() const;
+    void setColor(const QColor &);
+
+    QDeclarativePen *border();
+
+    QDeclarativeGradient *gradient() const;
+    void setGradient(QDeclarativeGradient *gradient);
+
+    qreal radius() const;
+    void setRadius(qreal radius);
+
+    QRectF boundingRect() const;
+
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+
+Q_SIGNALS:
+    void colorChanged();
+    void radiusChanged();
+
+private Q_SLOTS:
+    void doUpdate();
+
+private:
+    void generateRoundedRect();
+    void generateBorderedRect();
+    void drawRect(QPainter &painter);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeRectangle)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeRectangle)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativePen)
+QML_DECLARE_TYPE(QDeclarativeGradientStop)
+QML_DECLARE_TYPE(QDeclarativeGradient)
+QML_DECLARE_TYPE(QDeclarativeRectangle)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVERECT_H
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h
new file mode 100644
index 0000000..b87c57f
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVERECT_P_H
+#define QDECLARATIVERECT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeitem_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeGradient;
+class QDeclarativeRectangle;
+class QDeclarativeRectanglePrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeRectangle)
+
+public:
+    QDeclarativeRectanglePrivate() :
+    color(Qt::white), gradient(0), pen(0), radius(0), paintmargin(0)
+    {
+    }
+
+    ~QDeclarativeRectanglePrivate()
+    {
+        delete pen;
+    }
+
+    void init()
+    {
+    }
+
+    QColor getColor();
+    QColor color;
+    QDeclarativeGradient *gradient;
+    QDeclarativePen *getPen() {
+        if (!pen) {
+            Q_Q(QDeclarativeRectangle);
+            pen = new QDeclarativePen;
+            QObject::connect(pen, SIGNAL(penChanged()), q, SLOT(doUpdate()));
+        }
+        return pen;
+    }
+    QDeclarativePen *pen;
+    qreal radius;
+    qreal paintmargin;
+    QPixmap rectImage;
+
+    void setPaintMargin(qreal margin)
+    {
+        Q_Q(QDeclarativeRectangle);
+        if (margin == paintmargin)
+            return;
+        q->prepareGeometryChange();
+        paintmargin = margin;
+    }
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVERECT_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
new file mode 100644
index 0000000..ca57d3c
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -0,0 +1,328 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativerepeater_p.h"
+#include "qdeclarativerepeater_p_p.h"
+
+#include "qdeclarativevisualitemmodel_p.h"
+
+#include <qdeclarativelistaccessor_p.h>
+
+#include <qlistmodelinterface_p.h>
+
+QT_BEGIN_NAMESPACE
+QDeclarativeRepeaterPrivate::QDeclarativeRepeaterPrivate()
+: model(0), ownModel(false)
+{
+}
+
+QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate()
+{
+    if (ownModel)
+        delete model;
+}
+
+/*!
+    \qmlclass Repeater QDeclarativeRepeater
+  \since 4.7
+    \inherits Item
+
+    \brief The Repeater item allows you to repeat a component based on a model.
+
+    The Repeater item is used when you want to create a large number of
+    similar items.  For each entry in the model, an item is instantiated
+    in a context seeded with data from the model.  If the repeater will
+    be instantiating a large number of instances, it may be more efficient to
+    use one of Qt Declarative's \l {xmlViews}{view items}.
+
+    The model may be either an object list, a string list, a number or a Qt model.
+    In each case, the data element and the index is exposed to each instantiated
+    component.  
+    
+    The index is always exposed as an accessible \c index property.
+    In the case of an object or string list, the data element (of type string
+    or object) is available as the \c modelData property.  In the case of a Qt model,
+    all roles are available as named properties just like in the view classes. The
+    following example shows how to use the index property inside the instantiated
+    items.
+
+    \snippet doc/src/snippets/declarative/repeater-index.qml 0
+
+    \image repeater-index.png
+
+    Items instantiated by the Repeater are inserted, in order, as
+    children of the Repeater's parent.  The insertion starts immediately after
+    the repeater's position in its parent stacking list.  This is to allow
+    you to use a Repeater inside a layout.  The following QML example shows how
+    the instantiated items would visually appear stacked between the red and
+    blue rectangles.
+
+    \snippet doc/src/snippets/declarative/repeater.qml 0
+
+    \image repeater.png
+
+    The repeater instance continues to own all items it instantiates, even
+    if they are otherwise manipulated.  It is illegal to manually remove an item
+    created by the Repeater.
+ */
+
+/*!
+    \internal
+    \class QDeclarativeRepeater
+    \qmlclass Repeater
+
+    XXX Repeater is very conservative in how it instatiates/deletes items.  Also
+    new model entries will not be created and old ones will not be removed.
+ */
+
+/*!
+    Create a new QDeclarativeRepeater instance.
+ */
+QDeclarativeRepeater::QDeclarativeRepeater(QDeclarativeItem *parent)
+  : QDeclarativeItem(*(new QDeclarativeRepeaterPrivate), parent)
+{
+}
+
+/*!
+    Destroy the repeater instance.  All items it instantiated are also
+    destroyed.
+ */
+QDeclarativeRepeater::~QDeclarativeRepeater()
+{
+}
+
+/*!
+    \qmlproperty any Repeater::model
+
+    The model providing data for the repeater.
+
+    The model may be either an object list, a string list, a number or a Qt model.
+    In each case, the data element and the index is exposed to each instantiated
+    component.  The index is always exposed as an accessible \c index property.
+    In the case of an object or string list, the data element (of type string
+    or object) is available as the \c modelData property.  In the case of a Qt model,
+    all roles are available as named properties just like in the view classes.
+
+    As a special case the model can also be merely a number. In this case it will
+    create that many instances of the component. They will also be assigned an index
+    based on the order they are created.
+
+    Models can also be created directly in QML, using a \l{ListModel} or \l{XmlListModel}.
+
+    \sa {qmlmodels}{Data Models}
+*/
+QVariant QDeclarativeRepeater::model() const
+{
+    Q_D(const QDeclarativeRepeater);
+    return d->dataSource;
+}
+
+void QDeclarativeRepeater::setModel(const QVariant &model)
+{
+    Q_D(QDeclarativeRepeater);
+    if (d->dataSource == model)
+        return;
+
+    clear();
+    if (d->model) {
+        disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
+        disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        /*
+        disconnect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
+        disconnect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
+    */
+    }
+    d->dataSource = model;
+    emit modelChanged();
+    QObject *object = qvariant_cast<QObject*>(model);
+    QDeclarativeVisualModel *vim = 0;
+    if (object && (vim = qobject_cast<QDeclarativeVisualModel *>(object))) {
+        if (d->ownModel) {
+            delete d->model;
+            d->ownModel = false;
+        }
+        d->model = vim;
+    } else {
+        if (!d->ownModel) {
+            d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+            d->ownModel = true;
+        }
+        if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
+            dataModel->setModel(model);
+    }
+    if (d->model) {
+        connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
+        connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        /*
+        connect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
+        connect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
+        */
+        regenerate();
+        emit countChanged();
+    }
+}
+
+/*!
+    \qmlproperty Component Repeater::delegate
+    \default
+
+    The delegate provides a template defining each item instantiated by the repeater.
+    The index is exposed as an accessible \c index property.  Properties of the
+    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
+ */
+QDeclarativeComponent *QDeclarativeRepeater::delegate() const
+{
+    Q_D(const QDeclarativeRepeater);
+    if (d->model) {
+        if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
+            return dataModel->delegate();
+    }
+
+    return 0;
+}
+
+void QDeclarativeRepeater::setDelegate(QDeclarativeComponent *delegate)
+{
+    Q_D(QDeclarativeRepeater);
+    if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
+       if (delegate == dataModel->delegate())
+           return;
+
+    if (!d->ownModel) {
+        d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+        d->ownModel = true;
+    }
+    if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model)) {
+        dataModel->setDelegate(delegate);
+        regenerate();
+        emit delegateChanged();
+    }
+}
+
+/*!
+    \qmlproperty int Repeater::count
+
+    This property holds the number of items in the repeater.
+*/
+int QDeclarativeRepeater::count() const
+{
+    Q_D(const QDeclarativeRepeater);
+    if (d->model)
+        return d->model->count();
+    return 0;
+}
+
+
+/*!
+    \internal
+ */
+void QDeclarativeRepeater::componentComplete()
+{
+    QDeclarativeItem::componentComplete();
+    regenerate();
+}
+
+/*!
+    \internal
+ */
+QVariant QDeclarativeRepeater::itemChange(GraphicsItemChange change,
+                                       const QVariant &value)
+{
+    QVariant rv = QDeclarativeItem::itemChange(change, value);
+    if (change == ItemParentHasChanged) {
+        regenerate();
+    }
+
+    return rv;
+}
+
+void QDeclarativeRepeater::clear()
+{
+    Q_D(QDeclarativeRepeater);
+    if (d->model) {
+        foreach (QDeclarativeItem *item, d->deletables) {
+            item->setParentItem(this);
+            d->model->release(item);
+        }
+    }
+    d->deletables.clear();
+}
+
+/*!
+    \internal
+ */
+void QDeclarativeRepeater::regenerate()
+{
+    Q_D(QDeclarativeRepeater);
+
+    clear();
+
+    if (!d->model || !d->model->count() || !d->model->isValid() || !parentItem() || !isComponentComplete())
+        return;
+
+    for (int ii = 0; ii < count(); ++ii) {
+        QDeclarativeItem *item = d->model->item(ii);
+        if (item) {
+            item->setParent(parentItem());
+            item->stackBefore(this);
+            d->deletables << item;
+        }
+    }
+}
+
+void QDeclarativeRepeater::itemsInserted(int, int)
+{
+    regenerate();
+}
+
+void QDeclarativeRepeater::itemsRemoved(int, int)
+{
+    regenerate();
+}
+
+void QDeclarativeRepeater::itemsMoved(int,int,int)
+{
+    regenerate();
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater_p.h b/src/declarative/graphicsitems/qdeclarativerepeater_p.h
new file mode 100644
index 0000000..f58d1b6
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativerepeater_p.h
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEREPEATER_H
+#define QDECLARATIVEREPEATER_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeRepeaterPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeRepeater : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged)
+    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_CLASSINFO("DefaultProperty", "delegate")
+
+public:
+    QDeclarativeRepeater(QDeclarativeItem *parent=0);
+    virtual ~QDeclarativeRepeater();
+
+    QVariant model() const;
+    void setModel(const QVariant &);
+
+    QDeclarativeComponent *delegate() const;
+    void setDelegate(QDeclarativeComponent *);
+
+    int count() const;
+
+Q_SIGNALS:
+    void modelChanged();
+    void delegateChanged();
+    void countChanged();
+private:
+    void clear();
+    void regenerate();
+
+protected:
+    virtual void componentComplete();
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+
+private Q_SLOTS:
+    void itemsInserted(int,int);
+    void itemsRemoved(int,int);
+    void itemsMoved(int,int,int);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeRepeater)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeRepeater)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeRepeater)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEREPEATER_H
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h b/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h
new file mode 100644
index 0000000..11773ff
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEREPEATER_P_H
+#define QDECLARATIVEREPEATER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativerepeater_p.h"
+
+#include "qdeclarativeitem_p.h"
+
+#include <QPointer>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeContext;
+class QDeclarativeVisualModel;
+class QDeclarativeRepeaterPrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeRepeater)
+
+public:
+    QDeclarativeRepeaterPrivate();
+    ~QDeclarativeRepeaterPrivate();
+
+    QDeclarativeVisualModel *model;
+    QVariant dataSource;
+    bool ownModel;
+
+    QList<QPointer<QDeclarativeItem> > deletables;
+};
+
+QT_END_NAMESPACE
+#endif // QDECLARATIVEREPEATER_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
new file mode 100644
index 0000000..dbc7568
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
@@ -0,0 +1,212 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativescalegrid_p_p.h"
+
+#include <qdeclarative.h>
+
+#include <QBuffer>
+#include <QDebug>
+
+QT_BEGIN_NAMESPACE
+/*!
+    \internal
+    \class QDeclarativeScaleGrid
+    \brief The QDeclarativeScaleGrid class allows you to specify a 3x3 grid to use in scaling an image.
+*/
+
+QDeclarativeScaleGrid::QDeclarativeScaleGrid(QObject *parent) : QObject(parent), _left(0), _top(0), _right(0), _bottom(0)
+{
+}
+
+QDeclarativeScaleGrid::~QDeclarativeScaleGrid()
+{
+}
+
+bool QDeclarativeScaleGrid::isNull() const
+{
+    return !_left && !_top && !_right && !_bottom;
+}
+
+void QDeclarativeScaleGrid::setLeft(int pos)
+{
+    if (_left != pos) {
+        _left = pos;
+        emit borderChanged();
+    }
+}
+
+void QDeclarativeScaleGrid::setTop(int pos)
+{
+    if (_top != pos) {
+        _top = pos;
+        emit borderChanged();
+    }
+}
+
+void QDeclarativeScaleGrid::setRight(int pos)
+{
+    if (_right != pos) {
+        _right = pos;
+        emit borderChanged();
+    }
+}
+
+void QDeclarativeScaleGrid::setBottom(int pos)
+{
+    if (_bottom != pos) {
+        _bottom = pos;
+        emit borderChanged();
+    }
+}
+
+QDeclarativeGridScaledImage::QDeclarativeGridScaledImage()
+: _l(-1), _r(-1), _t(-1), _b(-1),
+  _h(QDeclarativeBorderImage::Stretch), _v(QDeclarativeBorderImage::Stretch)
+{
+}
+
+QDeclarativeGridScaledImage::QDeclarativeGridScaledImage(const QDeclarativeGridScaledImage &o)
+: _l(o._l), _r(o._r), _t(o._t), _b(o._b), _h(o._h), _v(o._v), _pix(o._pix)
+{
+}
+
+QDeclarativeGridScaledImage &QDeclarativeGridScaledImage::operator=(const QDeclarativeGridScaledImage &o)
+{
+    _l = o._l;
+    _r = o._r;
+    _t = o._t;
+    _b = o._b;
+    _h = o._h;
+    _v = o._v;
+    _pix = o._pix;
+    return *this;
+}
+
+QDeclarativeGridScaledImage::QDeclarativeGridScaledImage(QIODevice *data)
+: _l(-1), _r(-1), _t(-1), _b(-1), _h(QDeclarativeBorderImage::Stretch), _v(QDeclarativeBorderImage::Stretch)
+{
+    int l = -1;
+    int r = -1;
+    int t = -1;
+    int b = -1;
+    QString imgFile;
+
+    while(!data->atEnd()) {
+        QString line = QString::fromUtf8(data->readLine().trimmed());
+        if (line.isEmpty() || line.startsWith(QLatin1Char('#')))
+            continue;
+
+        QStringList list = line.split(QLatin1Char(':'));
+        if (list.count() != 2)
+            return;
+
+        list[0] = list[0].trimmed();
+        list[1] = list[1].trimmed();
+
+        if (list[0] == QLatin1String("border.left"))
+            l = list[1].toInt();
+        else if (list[0] == QLatin1String("border.right"))
+            r = list[1].toInt();
+        else if (list[0] == QLatin1String("border.top"))
+            t = list[1].toInt();
+        else if (list[0] == QLatin1String("border.bottom"))
+            b = list[1].toInt();
+        else if (list[0] == QLatin1String("source"))
+            imgFile = list[1];
+        else if (list[0] == QLatin1String("horizontalTileRule"))
+            _h = stringToRule(list[1]);
+        else if (list[0] == QLatin1String("verticalTileRule"))
+            _v = stringToRule(list[1]);
+    }
+
+    if (l < 0 || r < 0 || t < 0 || b < 0 || imgFile.isEmpty())
+        return;
+
+    _l = l; _r = r; _t = t; _b = b;
+
+    _pix = imgFile;
+}
+
+QDeclarativeBorderImage::TileMode QDeclarativeGridScaledImage::stringToRule(const QString &s)
+{
+    if (s == QLatin1String("Stretch"))
+        return QDeclarativeBorderImage::Stretch;
+    if (s == QLatin1String("Repeat"))
+        return QDeclarativeBorderImage::Repeat;
+    if (s == QLatin1String("Round"))
+        return QDeclarativeBorderImage::Round;
+
+    qWarning() << "Unknown tile rule specified. Using Stretch";
+    return QDeclarativeBorderImage::Stretch;
+}
+
+bool QDeclarativeGridScaledImage::isValid() const
+{
+    return _l >= 0;
+}
+
+int QDeclarativeGridScaledImage::gridLeft() const
+{
+    return _l;
+}
+
+int QDeclarativeGridScaledImage::gridRight() const
+{
+    return _r;
+}
+
+int QDeclarativeGridScaledImage::gridTop() const
+{
+    return _t;
+}
+
+int QDeclarativeGridScaledImage::gridBottom() const
+{
+    return _b;
+}
+
+QString QDeclarativeGridScaledImage::pixmapUrl() const
+{
+    return _pix;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
new file mode 100644
index 0000000..92b3f91
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESCALEGRID_H
+#define QDECLARATIVESCALEGRID_H
+
+#include "qdeclarativeborderimage_p.h"
+
+#include "../util/qdeclarativepixmapcache_p.h"
+#include <qdeclarative.h>
+
+#include <QtCore/QString>
+#include <QtCore/QObject>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_DECLARATIVE_EXPORT QDeclarativeScaleGrid : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(TileRule)
+
+    Q_PROPERTY(int left READ left WRITE setLeft NOTIFY borderChanged)
+    Q_PROPERTY(int top READ top WRITE setTop NOTIFY borderChanged)
+    Q_PROPERTY(int right READ right WRITE setRight NOTIFY borderChanged)
+    Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY borderChanged)
+
+public:
+    QDeclarativeScaleGrid(QObject *parent=0);
+    ~QDeclarativeScaleGrid();
+
+    bool isNull() const;
+
+    int left() const { return _left; }
+    void setLeft(int);
+
+    int top() const { return _top; }
+    void setTop(int);
+
+    int right() const { return _right; }
+    void setRight(int);
+
+    int  bottom() const { return _bottom; }
+    void setBottom(int);
+
+Q_SIGNALS:
+    void borderChanged();
+
+private:
+    int _left;
+    int _top;
+    int _right;
+    int _bottom;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeGridScaledImage
+{
+public:
+    QDeclarativeGridScaledImage();
+    QDeclarativeGridScaledImage(const QDeclarativeGridScaledImage &);
+    QDeclarativeGridScaledImage(QIODevice*);
+    QDeclarativeGridScaledImage &operator=(const QDeclarativeGridScaledImage &);
+    bool isValid() const;
+    int gridLeft() const;
+    int gridRight() const;
+    int gridTop() const;
+    int gridBottom() const;
+    QDeclarativeBorderImage::TileMode horizontalTileRule() const { return _h; }
+    QDeclarativeBorderImage::TileMode verticalTileRule() const { return _v; }
+
+    QString pixmapUrl() const;
+
+private:
+    static QDeclarativeBorderImage::TileMode stringToRule(const QString &);
+
+private:
+    int _l;
+    int _r;
+    int _t;
+    int _b;
+    QDeclarativeBorderImage::TileMode _h;
+    QDeclarativeBorderImage::TileMode _v;
+    QString _pix;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeScaleGrid)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVESCALEGRID_H
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
new file mode 100644
index 0000000..307b674
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -0,0 +1,936 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetext_p.h"
+#include "qdeclarativetext_p_p.h"
+#include <qdeclarativestyledtext_p.h>
+
+#include <qfxperf_p_p.h>
+
+#include <QTextLayout>
+#include <QTextLine>
+#include <QTextDocument>
+#include <QTextCursor>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QAbstractTextDocumentLayout>
+#include <qmath.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass Text QDeclarativeText
+  \since 4.7
+    \brief The Text item allows you to add formatted text to a scene.
+    \inherits Item
+
+    It can display both plain and rich text. For example:
+
+    \qml
+    Text { text: "Hello World!"; font.family: "Helvetica"; font.pointSize: 24; color: "red" }
+    Text { text: "<b>Hello</b> <i>World!</i>" }
+    \endqml
+
+    \image declarative-text.png
+
+    If height and width are not explicitly set, Text will attempt to determine how
+    much room is needed and set it accordingly. Unless \c wrap is set, it will always
+    prefer width to height (all text will be placed on a single line).
+
+    The \c elide property can alternatively be used to fit a single line of
+    plain text to a set width.
+
+    Text provides read-only text. For editable text, see \l TextEdit.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeText
+    \qmlclass Text
+    \ingroup group_coreitems
+
+    \brief The QDeclarativeText class provides a formatted text item that you can add to a QDeclarativeView.
+
+    Text was designed for read-only text; it does not allow for any text editing.
+    It can display both plain and rich text. For example:
+
+    \qml
+    Text { text: "Hello World!"; font.family: "Helvetica"; font.pointSize: 24; color: "red" }
+    Text { text: "<b>Hello</b> <i>World!</i>" }
+    \endqml
+
+    \image text.png
+
+    If height and width are not explicitly set, Text will attempt to determine how
+    much room is needed and set it accordingly. Unless \c wrap is set, it will always
+    prefer width to height (all text will be placed on a single line).
+
+    The \c elide property can alternatively be used to fit a line of plain text to a set width.
+
+    A QDeclarativeText object can be instantiated in Qml using the tag \c Text.
+*/
+QDeclarativeText::QDeclarativeText(QDeclarativeItem *parent)
+  : QDeclarativeItem(*(new QDeclarativeTextPrivate), parent)
+{
+    setAcceptedMouseButtons(Qt::LeftButton);
+    setFlag(QGraphicsItem::ItemHasNoContents, false);
+}
+
+QDeclarativeText::~QDeclarativeText()
+{
+}
+
+
+QDeclarativeTextPrivate::~QDeclarativeTextPrivate()
+{
+}
+
+/*!
+    \qmlproperty string Text::font.family
+    \qmlproperty bool Text::font.bold
+    \qmlproperty bool Text::font.italic
+    \qmlproperty bool Text::font.underline
+    \qmlproperty real Text::font.pointSize
+    \qmlproperty int Text::font.pixelSize
+
+    Set the Text's font attributes.
+*/
+QFont QDeclarativeText::font() const
+{
+    Q_D(const QDeclarativeText);
+    return d->font;
+}
+
+void QDeclarativeText::setFont(const QFont &font)
+{
+    Q_D(QDeclarativeText);
+    if (d->font == font)
+        return;
+
+    d->font = font;
+
+    d->updateLayout();
+    d->markImgDirty();
+    emit fontChanged(d->font);
+}
+
+void QDeclarativeText::setText(const QString &n)
+{
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::QDeclarativeText_setText> st;
+#endif
+    Q_D(QDeclarativeText);
+    if (d->text == n)
+        return;
+
+    d->richText = d->format == RichText || (d->format == AutoText && Qt::mightBeRichText(n));
+    if (d->richText) {
+        if (!d->doc) {
+            d->doc = new QTextDocument(this);
+            d->doc->setDocumentMargin(0);
+        }
+        d->doc->setHtml(n);
+    }
+
+    d->text = n;
+    d->updateLayout();
+    d->markImgDirty();
+    emit textChanged(d->text);
+}
+
+/*!
+    \qmlproperty string Text::text
+
+    The text to display.  Text supports both plain and rich text strings.
+
+    The item will try to automatically determine whether the text should
+    be treated as rich text. This determination is made using Qt::mightBeRichText().
+*/
+QString QDeclarativeText::text() const
+{
+    Q_D(const QDeclarativeText);
+    return d->text;
+}
+
+void QDeclarativeText::setColor(const QColor &color)
+{
+    Q_D(QDeclarativeText);
+    if (d->color == color)
+        return;
+
+    d->color = color;
+    d->markImgDirty();
+    emit colorChanged(d->color);
+}
+
+/*!
+    \qmlproperty color Text::color
+
+    The text color.
+
+    \qml
+    //green text using hexadecimal notation
+    Text { color: "#00FF00"; ... }
+
+    //steelblue text using SVG color name
+    Text { color: "steelblue"; ... }
+    \endqml
+*/
+
+QColor QDeclarativeText::color() const
+{
+    Q_D(const QDeclarativeText);
+    return d->color;
+}
+
+/*!
+    \qmlproperty enumeration Text::style
+
+    Set an additional text style.
+
+    Supported text styles are \c Normal, \c Outline, \c Raised and \c Sunken.
+
+    \qml
+    Row {
+        Text { font.pointSize: 24; text: "Normal" }
+        Text { font.pointSize: 24; text: "Raised";  style: Text.Raised;  styleColor: "#AAAAAA" }
+        Text { font.pointSize: 24; text: "Outline"; style: Text.Outline; styleColor: "red" }
+        Text { font.pointSize: 24; text: "Sunken";  style: Text.Sunken;  styleColor: "#AAAAAA" }
+    }
+    \endqml
+
+    \image declarative-textstyle.png
+*/
+QDeclarativeText::TextStyle QDeclarativeText::style() const
+{
+    Q_D(const QDeclarativeText);
+    return d->style;
+}
+
+void QDeclarativeText::setStyle(QDeclarativeText::TextStyle style)
+{
+    Q_D(QDeclarativeText);
+    if (d->style == style)
+        return;
+
+    d->style = style;
+    d->markImgDirty();
+    emit styleChanged(d->style);
+}
+
+void QDeclarativeText::setStyleColor(const QColor &color)
+{
+    Q_D(QDeclarativeText);
+    if (d->styleColor == color)
+        return;
+
+    d->styleColor = color;
+    d->markImgDirty();
+    emit styleColorChanged(d->styleColor);
+}
+
+/*!
+    \qmlproperty color Text::styleColor
+
+    Defines the secondary color used by text styles.
+
+    \c styleColor is used as the outline color for outlined text, and as the
+    shadow color for raised or sunken text. If no style has been set, it is not
+    used at all.
+ */
+QColor QDeclarativeText::styleColor() const
+{
+    Q_D(const QDeclarativeText);
+    return d->styleColor;
+}
+
+/*!
+    \qmlproperty enumeration Text::horizontalAlignment
+    \qmlproperty enumeration Text::verticalAlignment
+
+    Sets the horizontal and vertical alignment of the text within the Text items
+    width and height.  By default, the text is top-left aligned.
+
+    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
+    \c AlignHCenter.  The valid values for \c verticalAlignment are \c AlignTop, \c AlignBottom
+    and \c AlignVCenter.
+*/
+QDeclarativeText::HAlignment QDeclarativeText::hAlign() const
+{
+    Q_D(const QDeclarativeText);
+    return d->hAlign;
+}
+
+void QDeclarativeText::setHAlign(HAlignment align)
+{
+    Q_D(QDeclarativeText);
+    if (d->hAlign == align)
+        return;
+
+    d->hAlign = align;
+    emit horizontalAlignmentChanged(align);
+}
+
+QDeclarativeText::VAlignment QDeclarativeText::vAlign() const
+{
+    Q_D(const QDeclarativeText);
+    return d->vAlign;
+}
+
+void QDeclarativeText::setVAlign(VAlignment align)
+{
+    Q_D(QDeclarativeText);
+    if (d->vAlign == align)
+        return;
+
+    d->vAlign = align;
+    emit verticalAlignmentChanged(align);
+}
+
+/*!
+    \qmlproperty bool Text::wrap
+
+    Set this property to wrap the text to the Text item's width.  The text will only
+    wrap if an explicit width has been set.
+
+    Wrapping is done on word boundaries (i.e. it is a "word-wrap"). If the text cannot be
+    word-wrapped to the specified width it will be partially drawn outside of the item's bounds.
+    If this is undesirable then enable clipping on the item (Item::clip).
+
+    Wrapping is off by default.
+*/
+//### Future may provide choice of wrap modes, such as QTextOption::WrapAtWordBoundaryOrAnywhere
+bool QDeclarativeText::wrap() const
+{
+    Q_D(const QDeclarativeText);
+    return d->wrap;
+}
+
+void QDeclarativeText::setWrap(bool w)
+{
+    Q_D(QDeclarativeText);
+    if (w == d->wrap)
+        return;
+
+    d->wrap = w;
+
+    d->updateLayout();
+    d->markImgDirty();
+    emit wrapChanged(d->wrap);
+}
+
+/*!
+    \qmlproperty enumeration Text::textFormat
+
+    The way the text property should be displayed.
+
+    Supported text formats are \c AutoText, \c PlainText, \c RichText and \c StyledText
+
+    The default is AutoText.  If the text format is AutoText the text element
+    will automatically determine whether the text should be treated as
+    rich text.  This determination is made using Qt::mightBeRichText().
+
+    StyledText is an optimized format supporting some basic text
+    styling markup, in the style of html 3.2:
+
+    \code
+    <font size="4" color="#ff0000">font size and color</font>
+    <b>bold</b>
+    <i>italic</i>
+    <br>
+    &gt; &lt; &amp;
+    \endcode
+
+    \c StyledText parser is strict, requiring tags to be correctly nested.
+
+    \table
+    \row
+    \o
+    \qml
+Column {
+    TextEdit {
+        font.pointSize: 24
+        text: "<b>Hello</b> <i>World!</i>"
+    }
+    TextEdit {
+        font.pointSize: 24
+        textFormat: "RichText"
+        text: "<b>Hello</b> <i>World!</i>"
+    }
+    TextEdit {
+        font.pointSize: 24
+        textFormat: "PlainText"
+        text: "<b>Hello</b> <i>World!</i>"
+    }
+}
+    \endqml
+    \o \image declarative-textformat.png
+    \endtable
+*/
+
+QDeclarativeText::TextFormat QDeclarativeText::textFormat() const
+{
+    Q_D(const QDeclarativeText);
+    return d->format;
+}
+
+void QDeclarativeText::setTextFormat(TextFormat format)
+{
+    Q_D(QDeclarativeText);
+    if (format == d->format)
+        return;
+    d->format = format;
+    bool wasRich = d->richText;
+    d->richText = format == RichText || (format == AutoText && Qt::mightBeRichText(d->text));
+
+    if (wasRich && !d->richText) {
+        //### delete control? (and vice-versa below)
+        d->updateLayout();
+        d->markImgDirty();
+    } else if (!wasRich && d->richText) {
+        if (!d->doc) {
+            d->doc = new QTextDocument(this);
+            d->doc->setDocumentMargin(0);
+        }
+        d->doc->setHtml(d->text);
+        d->updateLayout();
+        d->markImgDirty();
+    }
+
+    emit textFormatChanged(d->format);
+}
+
+/*!
+    \qmlproperty enumeration Text::elide
+
+    Set this property to elide parts of the text fit to the Text item's width.
+    The text will only elide if an explicit width has been set.
+
+    This property cannot be used with wrap enabled or with rich text.
+
+    Eliding can be \c ElideNone (the default), \c ElideLeft, \c ElideMiddle, or \c ElideRight.
+
+    If the text is a multi-length string, and the mode is not \c ElideNone,
+    the first string that fits will be used, otherwise the last will be elided.
+
+    Multi-length strings are ordered from longest to shortest, separated by the
+    Unicode "String Terminator" character \c U009C (write this in QML with \c{"\u009C"} or \c{"\x9C"}).
+*/
+QDeclarativeText::TextElideMode QDeclarativeText::elideMode() const
+{
+    Q_D(const QDeclarativeText);
+    return d->elideMode;
+}
+
+void QDeclarativeText::setElideMode(QDeclarativeText::TextElideMode mode)
+{
+    Q_D(QDeclarativeText);
+    if (mode == d->elideMode)
+        return;
+
+    d->elideMode = mode;
+
+    d->updateLayout();
+    d->markImgDirty();
+    emit elideModeChanged(d->elideMode);
+}
+
+void QDeclarativeText::geometryChanged(const QRectF &newGeometry,
+                              const QRectF &oldGeometry)
+{
+    Q_D(QDeclarativeText);
+    if (newGeometry.width() != oldGeometry.width()) {
+        if (d->wrap || d->elideMode != QDeclarativeText::ElideNone) {
+            //re-elide if needed
+            if (d->singleline && d->elideMode != QDeclarativeText::ElideNone &&
+                isComponentComplete() && widthValid()) {
+
+                QFontMetrics fm(d->font);
+                QString tmp = fm.elidedText(d->text,(Qt::TextElideMode)d->elideMode,width()); // XXX still worth layout...?
+                d->layout.setText(tmp);
+            }
+
+            d->imgDirty = true;
+            d->updateSize();
+        }
+    }
+    QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
+}
+
+void QDeclarativeTextPrivate::updateLayout()
+{
+    Q_Q(QDeclarativeText);
+    if (q->isComponentComplete()) {
+        //setup instance of QTextLayout for all cases other than richtext
+        if (!richText) {
+            layout.clearLayout();
+            layout.setFont(font);
+            if (format != QDeclarativeText::StyledText) {
+                QString tmp = text;
+                tmp.replace(QLatin1Char('\n'), QChar::LineSeparator);
+                singleline = !tmp.contains(QChar::LineSeparator);
+                if (singleline && elideMode != QDeclarativeText::ElideNone && q->widthValid()) {
+                    QFontMetrics fm(font);
+                    tmp = fm.elidedText(tmp,(Qt::TextElideMode)elideMode,q->width()); // XXX still worth layout...?
+                }
+                layout.setText(tmp);
+            } else {
+                singleline = false;
+                QDeclarativeStyledText::parse(text, layout);
+            }
+        }
+        updateSize();
+    } else {
+        dirty = true;
+    }
+}
+
+void QDeclarativeTextPrivate::updateSize()
+{
+    Q_Q(QDeclarativeText);
+    if (q->isComponentComplete()) {
+        QFontMetrics fm(font);
+        if (text.isEmpty()) {
+            q->setImplicitHeight(fm.height());
+            return;
+        }
+
+        int dy = q->height();
+        QSize size(0, 0);
+
+        //setup instance of QTextLayout for all cases other than richtext
+        if (!richText) {
+            size = setupTextLayout(&layout);
+            cachedLayoutSize = size;
+            dy -= size.height();
+        } else {
+            singleline = false; // richtext can't elide or be optimized for single-line case
+            doc->setDefaultFont(font);
+            QTextOption option((Qt::Alignment)int(hAlign | vAlign));
+            if (wrap)
+                option.setWrapMode(QTextOption::WordWrap);
+            else
+                option.setWrapMode(QTextOption::NoWrap);
+            doc->setDefaultTextOption(option);
+            if (wrap && !q->heightValid() && q->widthValid())
+                doc->setTextWidth(q->width());
+            else
+                doc->setTextWidth(doc->idealWidth()); // ### Text does not align if width is not set (QTextDoc bug)
+            dy -= (int)doc->size().height();
+            cachedLayoutSize = doc->size().toSize();
+        }
+        int yoff = 0;
+
+        if (q->heightValid()) {
+            if (vAlign == QDeclarativeText::AlignBottom)
+                yoff = dy;
+            else if (vAlign == QDeclarativeText::AlignVCenter)
+                yoff = dy/2;
+        }
+        q->setBaselineOffset(fm.ascent() + yoff);
+
+        //### need to comfirm cost of always setting these for richText
+        q->setImplicitWidth(richText ? (int)doc->idealWidth() : size.width());
+        q->setImplicitHeight(richText ? (int)doc->size().height() : size.height());
+    } else {
+        dirty = true;
+    }
+}
+
+// ### text layout handling should be profiled and optimized as needed
+// what about QStackTextEngine engine(tmp, d->font.font()); QTextLayout textLayout(&engine);
+
+void QDeclarativeTextPrivate::drawOutline()
+{
+    QPixmap img = QPixmap(imgStyleCache.width()+2,imgStyleCache.height()+2);
+    img.fill(Qt::transparent);
+
+    QPainter ppm(&img);
+
+    QPoint pos(imgCache.rect().topLeft());
+    pos += QPoint(-1, 0);
+    ppm.drawPixmap(pos, imgStyleCache);
+    pos += QPoint(2, 0);
+    ppm.drawPixmap(pos, imgStyleCache);
+    pos += QPoint(-1, -1);
+    ppm.drawPixmap(pos, imgStyleCache);
+    pos += QPoint(0, 2);
+    ppm.drawPixmap(pos, imgStyleCache);
+
+    pos += QPoint(0, -1);
+    ppm.drawPixmap(pos, imgCache);
+    ppm.end();
+
+    imgCache = img;
+}
+
+void QDeclarativeTextPrivate::drawOutline(int yOffset)
+{
+    QPixmap img = QPixmap(imgStyleCache.width()+2,imgStyleCache.height()+2);
+    img.fill(Qt::transparent);
+
+    QPainter ppm(&img);
+
+    QPoint pos(imgCache.rect().topLeft());
+    pos += QPoint(0, yOffset);
+    ppm.drawPixmap(pos, imgStyleCache);
+
+    pos += QPoint(0, -yOffset);
+    ppm.drawPixmap(pos, imgCache);
+    ppm.end();
+
+    imgCache = img;
+}
+
+QSize QDeclarativeTextPrivate::setupTextLayout(QTextLayout *layout)
+{
+    Q_Q(QDeclarativeText);
+    layout->setCacheEnabled(true);
+
+    int height = 0;
+    qreal widthUsed = 0;
+    qreal lineWidth = 0;
+
+    //set manual width
+    if ((wrap || elideMode != QDeclarativeText::ElideNone) && q->widthValid())
+        lineWidth = q->width();
+
+    layout->beginLayout();
+
+    while (1) {
+        QTextLine line = layout->createLine();
+        if (!line.isValid())
+            break;
+
+        if ((wrap || elideMode != QDeclarativeText::ElideNone) && q->widthValid())
+            line.setLineWidth(lineWidth);
+    }
+    layout->endLayout();
+
+    int x = 0;
+    for (int i = 0; i < layout->lineCount(); ++i) {
+        QTextLine line = layout->lineAt(i);
+        widthUsed = qMax(widthUsed, line.naturalTextWidth());
+        line.setPosition(QPointF(0, height));
+        height += int(line.height());
+
+        if (!cache) {
+            if (hAlign == QDeclarativeText::AlignLeft) {
+                x = 0;
+            } else if (hAlign == QDeclarativeText::AlignRight) {
+                x = q->width() - (int)line.naturalTextWidth();
+            } else if (hAlign == QDeclarativeText::AlignHCenter) {
+                x = (q->width() - (int)line.naturalTextWidth()) / 2;
+            }
+            line.setPosition(QPoint(x, (int)line.y()));
+        }
+    }
+
+    return QSize(qCeil(widthUsed), height);
+}
+
+QPixmap QDeclarativeTextPrivate::wrappedTextImage(bool drawStyle)
+{
+    //do layout
+    QSize size = cachedLayoutSize;
+
+    int x = 0;
+    for (int i = 0; i < layout.lineCount(); ++i) {
+        QTextLine line = layout.lineAt(i);
+        if (hAlign == QDeclarativeText::AlignLeft) {
+            x = 0;
+        } else if (hAlign == QDeclarativeText::AlignRight) {
+            x = size.width() - (int)line.naturalTextWidth();
+        } else if (hAlign == QDeclarativeText::AlignHCenter) {
+            x = (size.width() - (int)line.naturalTextWidth()) / 2;
+        }
+        line.setPosition(QPoint(x, (int)line.y()));
+    }
+
+    //paint text
+    QPixmap img(size);
+    if (!size.isEmpty()) {
+        img.fill(Qt::transparent);
+        QPainter p(&img);
+        drawWrappedText(&p, QPointF(0,0), drawStyle);
+    }
+    return img;
+}
+
+void QDeclarativeTextPrivate::drawWrappedText(QPainter *p, const QPointF &pos, bool drawStyle)
+{
+    if (drawStyle)
+        p->setPen(styleColor);
+    else
+        p->setPen(color);
+    p->setFont(font);
+    layout.draw(p, pos);
+}
+
+QPixmap QDeclarativeTextPrivate::richTextImage(bool drawStyle)
+{
+    QSize size = doc->size().toSize();
+
+    //paint text
+    QPixmap img(size);
+    img.fill(Qt::transparent);
+    QPainter p(&img);
+
+    QAbstractTextDocumentLayout::PaintContext context;
+
+    if (drawStyle) {
+        context.palette.setColor(QPalette::Text, styleColor);
+        // ### Do we really want this?
+        QTextOption colorOption;
+        colorOption.setFlags(QTextOption::SuppressColors);
+        doc->setDefaultTextOption(colorOption);
+    } else {
+        context.palette.setColor(QPalette::Text, color);
+    }
+    doc->documentLayout()->draw(&p, context);
+    if (drawStyle)
+        doc->setDefaultTextOption(QTextOption());
+    return img;
+}
+
+void QDeclarativeTextPrivate::checkImgCache()
+{
+    if (!imgDirty)
+        return;
+
+    bool empty = text.isEmpty();
+    if (empty) {
+        imgCache = QPixmap();
+        imgStyleCache = QPixmap();
+    } else if (richText) {
+        imgCache = richTextImage(false);
+        if (style != QDeclarativeText::Normal)
+            imgStyleCache = richTextImage(true); //### should use styleColor
+    } else {
+        imgCache = wrappedTextImage(false);
+        if (style != QDeclarativeText::Normal)
+            imgStyleCache = wrappedTextImage(true); //### should use styleColor
+    }
+    if (!empty)
+        switch (style) {
+        case QDeclarativeText::Outline:
+            drawOutline();
+            break;
+        case QDeclarativeText::Sunken:
+            drawOutline(-1);
+            break;
+        case QDeclarativeText::Raised:
+            drawOutline(1);
+            break;
+        default:
+            break;
+        }
+
+    imgDirty = false;
+}
+
+void QDeclarativeText::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    Q_D(QDeclarativeText);
+
+    if (d->cache || d->style != Normal) {
+        d->checkImgCache();
+        if (d->imgCache.isNull())
+            return;
+
+        bool oldAA = p->testRenderHint(QPainter::Antialiasing);
+        bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
+        if (d->smooth)
+            p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+
+        int w = width();
+        int h = height();
+
+        int x = 0;
+        int y = 0;
+
+        switch (d->hAlign) {
+        case AlignLeft:
+            x = 0;
+            break;
+        case AlignRight:
+            x = w - d->imgCache.width();
+            break;
+        case AlignHCenter:
+            x = (w - d->imgCache.width()) / 2;
+            break;
+        }
+
+        switch (d->vAlign) {
+        case AlignTop:
+            y = 0;
+            break;
+        case AlignBottom:
+            y = h - d->imgCache.height();
+            break;
+        case AlignVCenter:
+            y = (h - d->imgCache.height()) / 2;
+            break;
+        }
+
+        bool needClip = !clip() && (d->imgCache.width() > width() ||
+                                    d->imgCache.height() > height());
+
+        if (needClip) {
+            p->save();
+            p->setClipRect(boundingRect(), Qt::IntersectClip);
+        }
+        p->drawPixmap(x, y, d->imgCache);
+        if (needClip)
+            p->restore();
+
+        if (d->smooth) {
+            p->setRenderHint(QPainter::Antialiasing, oldAA);
+            p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
+        }
+    } else {
+        int h = height();
+        int y = 0;
+
+        switch (d->vAlign) {
+        case AlignTop:
+            y = 0;
+            break;
+        case AlignBottom:
+            y = h - d->cachedLayoutSize.height();
+            break;
+        case AlignVCenter:
+            y = (h - d->cachedLayoutSize.height()) / 2;
+            break;
+        }
+        bool needClip = !clip() && (d->cachedLayoutSize.width() > width() ||
+                                    d->cachedLayoutSize.height() > height());
+
+        if (needClip) {
+            p->save();
+            p->setClipRect(boundingRect(), Qt::IntersectClip);
+        }
+        if (d->richText) {
+            QAbstractTextDocumentLayout::PaintContext context;
+            context.palette.setColor(QPalette::Text, d->color);
+            p->translate(0, y);
+            d->doc->documentLayout()->draw(p, context);
+            p->translate(0, -y);
+        } else {
+            d->drawWrappedText(p, QPointF(0,y), false);
+        }
+        if (needClip)
+            p->restore();
+    }
+}
+
+/*!
+    \qmlproperty bool Text::smooth
+
+    Set this property if you want the text to be smoothly scaled or
+    transformed.  Smooth filtering gives better visual quality, but is slower.  If
+    the item is displayed at its natural size, this property has no visual or
+    performance effect.
+
+    \note Generally scaling artifacts are only visible if the item is stationary on
+    the screen.  A common pattern when animating an item is to disable smooth
+    filtering at the beginning of the animation and reenable it at the conclusion.
+*/
+
+void QDeclarativeText::componentComplete()
+{
+    Q_D(QDeclarativeText);
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::TextComponentComplete> cc;
+#endif
+    QDeclarativeItem::componentComplete();
+    if (d->dirty) {
+        d->updateLayout();
+        d->dirty = false;
+    }
+}
+
+/*!
+  \overload
+  Handles the given mouse \a event.
+ */
+void QDeclarativeText::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeText);
+
+    if (!d->richText || !d->doc || d->doc->documentLayout()->anchorAt(event->pos()).isEmpty()) {
+        event->setAccepted(false);
+        d->activeLink = QString();
+    } else {
+        d->activeLink = d->doc->documentLayout()->anchorAt(event->pos());
+    }
+
+    // ### may malfunction if two of the same links are clicked & dragged onto each other)
+
+    if (!event->isAccepted())
+        QDeclarativeItem::mousePressEvent(event);
+
+}
+
+/*!
+    \qmlsignal Text::linkActivated(link)
+
+    This handler is called when the user clicks on a link embedded in the text.
+*/
+
+/*!
+  \overload
+  Handles the given mouse \a event.
+ */
+void QDeclarativeText::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeText);
+
+        // ### confirm the link, and send a signal out
+    if (d->richText && d->doc && d->activeLink == d->doc->documentLayout()->anchorAt(event->pos()))
+        emit linkActivated(d->activeLink);
+    else
+        event->setAccepted(false);
+
+    if (!event->isAccepted())
+        QDeclarativeItem::mouseReleaseEvent(event);
+}
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h
new file mode 100644
index 0000000..cbea8f3
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativetext_p.h
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETEXT_H
+#define QDECLARATIVETEXT_H
+
+#include "qdeclarativeitem.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+class QDeclarativeTextPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeText : public QDeclarativeItem
+{
+    Q_OBJECT
+    Q_ENUMS(HAlignment)
+    Q_ENUMS(VAlignment)
+    Q_ENUMS(TextStyle)
+    Q_ENUMS(TextFormat)
+    Q_ENUMS(TextElideMode)
+
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
+    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+    Q_PROPERTY(TextStyle style READ style WRITE setStyle NOTIFY styleChanged)
+    Q_PROPERTY(QColor styleColor READ styleColor WRITE setStyleColor NOTIFY styleColorChanged)
+    Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign NOTIFY horizontalAlignmentChanged)
+    Q_PROPERTY(VAlignment verticalAlignment READ vAlign WRITE setVAlign NOTIFY verticalAlignmentChanged)
+    Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapChanged) //### there are several wrap modes in Qt
+    Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat NOTIFY textFormatChanged)
+    Q_PROPERTY(TextElideMode elide READ elideMode WRITE setElideMode NOTIFY elideModeChanged) //### elideMode?
+
+public:
+    QDeclarativeText(QDeclarativeItem *parent=0);
+    ~QDeclarativeText();
+
+    enum HAlignment { AlignLeft = Qt::AlignLeft,
+                       AlignRight = Qt::AlignRight,
+                       AlignHCenter = Qt::AlignHCenter };
+    enum VAlignment { AlignTop = Qt::AlignTop,
+                       AlignBottom = Qt::AlignBottom,
+                       AlignVCenter = Qt::AlignVCenter };
+    enum TextStyle { Normal,
+                      Outline,
+                      Raised,
+                      Sunken };
+    enum TextFormat { PlainText = Qt::PlainText,
+                       RichText = Qt::RichText,
+                       AutoText = Qt::AutoText,
+                       StyledText = 4 };
+    enum TextElideMode { ElideLeft = Qt::ElideLeft,
+                          ElideRight = Qt::ElideRight,
+                          ElideMiddle = Qt::ElideMiddle,
+                          ElideNone = Qt::ElideNone };
+
+    QString text() const;
+    void setText(const QString &);
+
+    QFont font() const;
+    void setFont(const QFont &font);
+
+    QColor color() const;
+    void setColor(const QColor &c);
+
+    TextStyle style() const;
+    void setStyle(TextStyle style);
+
+    QColor styleColor() const;
+    void setStyleColor(const QColor &c);
+
+    HAlignment hAlign() const;
+    void setHAlign(HAlignment align);
+
+    VAlignment vAlign() const;
+    void setVAlign(VAlignment align);
+
+    bool wrap() const;
+    void setWrap(bool w);
+
+    TextFormat textFormat() const;
+    void setTextFormat(TextFormat format);
+
+    TextElideMode elideMode() const;
+    void setElideMode(TextElideMode);
+
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+
+    virtual void componentComplete();
+
+Q_SIGNALS:
+    void textChanged(const QString &text);
+    void linkActivated(const QString &link);
+    void fontChanged(const QFont &font);
+    void colorChanged(const QColor &color);
+    void styleChanged(TextStyle style);
+    void styleColorChanged(const QColor &color);
+    void horizontalAlignmentChanged(HAlignment alignment);
+    void verticalAlignmentChanged(VAlignment alignment);
+    void wrapChanged(bool wrap);
+    void textFormatChanged(TextFormat textFormat);
+    void elideModeChanged(TextElideMode mode);
+
+protected:
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    virtual void geometryChanged(const QRectF &newGeometry,
+                                 const QRectF &oldGeometry);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeText)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeText)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeText)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
new file mode 100644
index 0000000..a0c8abe
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETEXT_P_H
+#define QDECLARATIVETEXT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeitem.h"
+#include "qdeclarativeitem_p.h"
+
+#include <qdeclarative.h>
+
+#include <QtGui/qtextlayout.h>
+
+QT_BEGIN_NAMESPACE
+
+class QTextLayout;
+class QTextDocument;
+
+class QDeclarativeTextPrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeText)
+public:
+    QDeclarativeTextPrivate()
+      : color((QRgb)0), style(QDeclarativeText::Normal), imgDirty(true),
+        hAlign(QDeclarativeText::AlignLeft), vAlign(QDeclarativeText::AlignTop), elideMode(QDeclarativeText::ElideNone),
+        dirty(true), wrap(false), richText(false), singleline(false), cache(true), doc(0),
+        format(QDeclarativeText::AutoText)
+    {
+#if defined(QML_NO_TEXT_CACHE)
+        cache = false;
+#endif
+    }
+
+    ~QDeclarativeTextPrivate();
+
+    void updateSize();
+    void updateLayout();
+    void markImgDirty() {
+        Q_Q(QDeclarativeText);
+        imgDirty = true;
+        if (q->isComponentComplete())
+            q->update();
+    }
+    void checkImgCache();
+
+    void drawOutline();
+    void drawOutline(int yOffset);
+
+    QPixmap wrappedTextImage(bool drawStyle);
+    void drawWrappedText(QPainter *p, const QPointF &pos, bool drawStyle);
+    QPixmap richTextImage(bool drawStyle);
+    QSize setupTextLayout(QTextLayout *layout);
+
+    QString text;
+    QFont font;
+    QColor  color;
+    QDeclarativeText::TextStyle style;
+    QColor  styleColor;
+    QString activeLink;
+    bool imgDirty;
+    QPixmap imgCache;
+    QPixmap imgStyleCache;
+    QDeclarativeText::HAlignment hAlign;
+    QDeclarativeText::VAlignment vAlign;
+    QDeclarativeText::TextElideMode elideMode;    
+    bool dirty:1;
+    bool wrap:1;
+    bool richText:1;
+    bool singleline:1;
+    bool cache:1;
+    QTextDocument *doc;
+    QTextLayout layout;
+    QSize cachedLayoutSize;
+    QDeclarativeText::TextFormat format;
+};
+
+QT_END_NAMESPACE
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
new file mode 100644
index 0000000..8e44b26
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -0,0 +1,1035 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetextedit_p.h"
+#include "qdeclarativetextedit_p_p.h"
+
+#include "qdeclarativeevents_p_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QTextLayout>
+#include <QTextLine>
+#include <QTextDocument>
+#include <QGraphicsSceneMouseEvent>
+#include <QDebug>
+#include <QPainter>
+
+#include <private/qtextcontrol_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass TextEdit QDeclarativeTextEdit
+  \since 4.7
+    \brief The TextEdit item allows you to add editable formatted text to a scene.
+
+    It can display both plain and rich text. For example:
+
+    \qml
+TextEdit {
+    id: edit
+    text: "<b>Hello</b> <i>World!</i>"
+    focus: true
+    font.family: "Helvetica"
+    font.pointSize: 20
+    color: "blue"
+    width: 240
+}
+    \endqml
+
+    \image declarative-textedit.gif
+
+    \sa Text
+*/
+
+/*!
+    \internal
+    \class QDeclarativeTextEdit
+    \qmlclass TextEdit
+    \ingroup group_coreitems
+
+    \brief The QDeclarativeTextEdit class provides an editable formatted text item that you can add to a QDeclarativeView.
+
+    It can display both plain and rich text.
+
+    \image declarative-textedit.png
+
+    A QDeclarativeTextEdit object can be instantiated in Qml using the tag \c &lt;TextEdit&gt;.
+*/
+
+/*!
+    Constructs a new QDeclarativeTextEdit.
+*/
+QDeclarativeTextEdit::QDeclarativeTextEdit(QDeclarativeItem *parent)
+: QDeclarativePaintedItem(*(new QDeclarativeTextEditPrivate), parent)
+{
+    Q_D(QDeclarativeTextEdit);
+    d->init();
+}
+
+QString QDeclarativeTextEdit::text() const
+{
+    Q_D(const QDeclarativeTextEdit);
+
+    if (d->richText)
+        return d->document->toHtml();
+    else
+        return d->document->toPlainText();
+}
+
+/*!
+    \qmlproperty string TextEdit::font.family
+    \qmlproperty bool TextEdit::font.bold
+    \qmlproperty bool TextEdit::font.italic
+    \qmlproperty bool TextEdit::font.underline
+    \qmlproperty real TextEdit::font.pointSize
+    \qmlproperty int TextEdit::font.pixelSize
+
+    Set the TextEdit's font attributes.
+*/
+
+/*!
+    \qmlproperty string TextEdit::text
+
+    The text to display.  If the text format is AutoText the text edit will
+    automatically determine whether the text should be treated as
+    rich text.  This determination is made using Qt::mightBeRichText().
+*/
+void QDeclarativeTextEdit::setText(const QString &text)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (QDeclarativeTextEdit::text() == text)
+        return;
+    d->text = text;
+    d->richText = d->format == RichText || (d->format == AutoText && Qt::mightBeRichText(text));
+    if (d->richText) {
+        d->control->setHtml(text);
+    } else {
+        d->control->setPlainText(text);
+    }
+    q_textChanged();
+}
+
+/*!
+    \qmlproperty enumeration TextEdit::textFormat
+
+    The way the text property should be displayed.
+
+    Supported text formats are \c AutoText, \c PlainText and \c RichText.
+
+    The default is AutoText.  If the text format is AutoText the text edit
+    will automatically determine whether the text should be treated as
+    rich text.  This determination is made using Qt::mightBeRichText().
+
+    \table
+    \row
+    \o
+    \qml
+Column {
+    TextEdit {
+        font.pointSize: 24
+        text: "<b>Hello</b> <i>World!</i>"
+    }
+    TextEdit {
+        font.pointSize: 24
+        textFormat: "RichText"
+        text: "<b>Hello</b> <i>World!</i>"
+    }
+    TextEdit {
+        font.pointSize: 24
+        textFormat: "PlainText"
+        text: "<b>Hello</b> <i>World!</i>"
+    }
+}
+    \endqml
+    \o \image declarative-textformat.png
+    \endtable
+*/
+QDeclarativeTextEdit::TextFormat QDeclarativeTextEdit::textFormat() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->format;
+}
+
+void QDeclarativeTextEdit::setTextFormat(TextFormat format)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (format == d->format)
+        return;
+    bool wasRich = d->richText;
+    d->richText = format == RichText || (format == AutoText && Qt::mightBeRichText(d->text));
+
+    if (wasRich && !d->richText) {
+        d->control->setPlainText(d->text);
+        updateSize();
+    } else if (!wasRich && d->richText) {
+        d->control->setHtml(d->text);
+        updateSize();
+    }
+    d->format = format;
+    emit textFormatChanged(d->format);
+}
+
+QFont QDeclarativeTextEdit::font() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->font;
+}
+
+void QDeclarativeTextEdit::setFont(const QFont &font)
+{
+    Q_D(QDeclarativeTextEdit);
+    d->font = font;
+
+    clearCache();
+    d->document->setDefaultFont(d->font);
+    if(d->cursor){
+        d->cursor->setHeight(QFontMetrics(d->font).height());
+        moveCursorDelegate();
+    }
+    updateSize();
+    update();
+}
+
+/*!
+    \qmlproperty color TextEdit::color
+
+    The text color.
+
+    \qml
+// green text using hexadecimal notation
+TextEdit { color: "#00FF00"; ...  }
+
+// steelblue text using SVG color name
+TextEdit { color: "steelblue"; ...  }
+    \endqml
+*/
+QColor QDeclarativeTextEdit::color() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->color;
+}
+
+void QDeclarativeTextEdit::setColor(const QColor &color)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (d->color == color)
+        return;
+
+    clearCache();
+    d->color = color;
+    QPalette pal = d->control->palette();
+    pal.setColor(QPalette::Text, color);
+    d->control->setPalette(pal);
+    update();
+    emit colorChanged(d->color);
+}
+
+/*!
+    \qmlproperty color TextEdit::selectionColor
+
+    The text highlight color, used behind selections.
+*/
+QColor QDeclarativeTextEdit::selectionColor() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->selectionColor;
+}
+
+void QDeclarativeTextEdit::setSelectionColor(const QColor &color)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (d->selectionColor == color)
+        return;
+
+    clearCache();
+    d->selectionColor = color;
+    QPalette pal = d->control->palette();
+    pal.setColor(QPalette::Highlight, color);
+    d->control->setPalette(pal);
+    update();
+    emit selectionColorChanged(d->selectionColor);
+}
+
+/*!
+    \qmlproperty color TextEdit::selectedTextColor
+
+    The selected text color, used in selections.
+*/
+QColor QDeclarativeTextEdit::selectedTextColor() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->selectedTextColor;
+}
+
+void QDeclarativeTextEdit::setSelectedTextColor(const QColor &color)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (d->selectedTextColor == color)
+        return;
+
+    clearCache();
+    d->selectedTextColor = color;
+    QPalette pal = d->control->palette();
+    pal.setColor(QPalette::HighlightedText, color);
+    d->control->setPalette(pal);
+    update();
+    emit selectedTextColorChanged(d->selectedTextColor);
+}
+
+/*!
+    \qmlproperty enumeration TextEdit::horizontalAlignment
+    \qmlproperty enumeration TextEdit::verticalAlignment
+
+    Sets the horizontal and vertical alignment of the text within the TextEdit items
+    width and height.  By default, the text is top-left aligned.
+
+    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
+    \c AlignHCenter.  The valid values for \c verticalAlignment are \c AlignTop, \c AlignBottom
+    and \c AlignVCenter.
+*/
+QDeclarativeTextEdit::HAlignment QDeclarativeTextEdit::hAlign() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->hAlign;
+}
+
+void QDeclarativeTextEdit::setHAlign(QDeclarativeTextEdit::HAlignment alignment)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (alignment == d->hAlign)
+        return;
+    d->hAlign = alignment;
+    d->updateDefaultTextOption();
+    updateSize();
+    emit horizontalAlignmentChanged(d->hAlign);
+}
+
+QDeclarativeTextEdit::VAlignment QDeclarativeTextEdit::vAlign() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->vAlign;
+}
+
+void QDeclarativeTextEdit::setVAlign(QDeclarativeTextEdit::VAlignment alignment)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (alignment == d->vAlign)
+        return;
+    d->vAlign = alignment;
+    d->updateDefaultTextOption();
+    updateSize();
+    emit verticalAlignmentChanged(d->vAlign);
+}
+
+bool QDeclarativeTextEdit::wrap() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->wrap;
+}
+
+/*!
+    \qmlproperty bool TextEdit::wrap
+
+    Set this property to wrap the text to the TextEdit item's width.
+    The text will only wrap if an explicit width has been set.
+
+    Wrapping is done on word boundaries (i.e. it is a "word-wrap"). Wrapping is off by default.
+*/
+void QDeclarativeTextEdit::setWrap(bool w)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (w == d->wrap)
+        return;
+    d->wrap = w;
+    d->updateDefaultTextOption();
+    updateSize();
+    emit wrapChanged(d->wrap);
+}
+
+/*!
+    \qmlproperty bool TextEdit::cursorVisible
+    If true the text edit shows a cursor.
+
+    This property is set and unset when the text edit gets focus, but it can also
+    be set directly (useful, for example, if a KeyProxy might forward keys to it).
+*/
+bool QDeclarativeTextEdit::isCursorVisible() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->cursorVisible;
+}
+
+void QDeclarativeTextEdit::setCursorVisible(bool on)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (d->cursorVisible == on)
+        return;
+    d->cursorVisible = on;
+    QFocusEvent focusEvent(on ? QEvent::FocusIn : QEvent::FocusOut);
+    if (!on && !d->persistentSelection)
+        d->control->setCursorIsFocusIndicator(true);
+    d->control->processEvent(&focusEvent, QPointF(0, 0));
+    emit cursorVisibleChanged(d->cursorVisible);
+}
+
+/*!
+    \qmlproperty int TextEdit::cursorPosition
+    The position of the cursor in the TextEdit.
+*/
+int QDeclarativeTextEdit::cursorPosition() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->control->textCursor().position();
+}
+
+void QDeclarativeTextEdit::setCursorPosition(int pos)
+{
+    Q_D(QDeclarativeTextEdit);
+    QTextCursor cursor = d->control->textCursor();
+    if (cursor.position() == pos)
+        return;
+    cursor.setPosition(pos);
+    d->control->setTextCursor(cursor);
+}
+
+/*!
+    \qmlproperty Component TextEdit::cursorDelegate
+    The delegate for the cursor in the TextEdit.
+
+    If you set a cursorDelegate for a TextEdit, this delegate will be used for
+    drawing the cursor instead of the standard cursor. An instance of the
+    delegate will be created and managed by the text edit when a cursor is
+    needed, and the x and y properties of delegate instance will be set so as
+    to be one pixel before the top left of the current character.
+
+    Note that the root item of the delegate component must be a QDeclarativeItem or
+    QDeclarativeItem derived item.
+*/
+QDeclarativeComponent* QDeclarativeTextEdit::cursorDelegate() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->cursorComponent;
+}
+
+void QDeclarativeTextEdit::setCursorDelegate(QDeclarativeComponent* c)
+{
+    Q_D(QDeclarativeTextEdit);
+    if(d->cursorComponent){
+        if(d->cursor){
+            disconnect(d->control, SIGNAL(cursorPositionChanged()),
+                    this, SLOT(moveCursorDelegate()));
+            d->control->setCursorWidth(-1);
+            dirtyCache(cursorRect());
+            delete d->cursor;
+            d->cursor = 0;
+        }
+    }
+    d->cursorComponent = c;
+    if(c && c->isReady()){
+        loadCursorDelegate();
+    }else{
+        if(c)
+            connect(c, SIGNAL(statusChanged()),
+                    this, SLOT(loadCursorDelegate()));
+    }
+
+    emit cursorDelegateChanged();
+}
+
+void QDeclarativeTextEdit::loadCursorDelegate()
+{
+    Q_D(QDeclarativeTextEdit);
+    if(d->cursorComponent->isLoading())
+        return;
+    d->cursor = qobject_cast<QDeclarativeItem*>(d->cursorComponent->create(qmlContext(this)));
+    if(d->cursor){
+        connect(d->control, SIGNAL(cursorPositionChanged()),
+                this, SLOT(moveCursorDelegate()));
+        d->control->setCursorWidth(0);
+        dirtyCache(cursorRect());
+        d->cursor->setParentItem(this);
+        d->cursor->setHeight(QFontMetrics(d->font).height());
+        moveCursorDelegate();
+    }else{
+        qWarning() << QLatin1String("Error loading cursor delegate for TextEdit:") + objectName();
+    }
+}
+
+/*!
+    \qmlproperty int TextEdit::selectionStart
+
+    The cursor position before the first character in the current selection.
+    Setting this and selectionEnd allows you to specify a selection in the
+    text edit.
+
+    Note that if selectionStart == selectionEnd then there is no current
+    selection. If you attempt to set selectionStart to a value outside of
+    the current text, selectionStart will not be changed.
+
+    \sa selectionEnd, cursorPosition, selectedText
+*/
+int QDeclarativeTextEdit::selectionStart() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->control->textCursor().selectionStart();
+}
+
+void QDeclarativeTextEdit::setSelectionStart(int s)
+{
+    Q_D(QDeclarativeTextEdit);
+    if(d->lastSelectionStart == s || s < 0 || s > text().length())
+        return;
+    d->lastSelectionStart = s;
+    d->updateSelection();// Will emit the relevant signals
+}
+
+/*!
+    \qmlproperty int TextEdit::selectionEnd
+
+    The cursor position after the last character in the current selection.
+    Setting this and selectionStart allows you to specify a selection in the
+    text edit.
+
+    Note that if selectionStart == selectionEnd then there is no current
+    selection. If you attempt to set selectionEnd to a value outside of
+    the current text, selectionEnd will not be changed.
+
+    \sa selectionStart, cursorPosition, selectedText
+*/
+int QDeclarativeTextEdit::selectionEnd() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->control->textCursor().selectionEnd();
+}
+
+void QDeclarativeTextEdit::setSelectionEnd(int s)
+{
+    Q_D(QDeclarativeTextEdit);
+    if(d->lastSelectionEnd == s || s < 0 || s > text().length())
+        return;
+    d->lastSelectionEnd = s;
+    d->updateSelection();// Will emit the relevant signals
+}
+
+/*!
+    \qmlproperty string TextEdit::selectedText
+
+    This read-only property provides the text currently selected in the
+    text edit.
+
+    It is equivalent to the following snippet, but is faster and easier
+    to use.
+    \code
+    //myTextEdit is the id of the TextEdit
+    myTextEdit.text.toString().substring(myTextEdit.selectionStart,
+            myTextEdit.selectionEnd);
+    \endcode
+*/
+QString QDeclarativeTextEdit::selectedText() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->control->textCursor().selectedText();
+}
+
+/*!
+    \qmlproperty bool TextEdit::focusOnPress
+
+    Whether the TextEdit should gain focus on a mouse press. By default this is
+    set to true.
+*/
+bool QDeclarativeTextEdit::focusOnPress() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->focusOnPress;
+}
+
+void QDeclarativeTextEdit::setFocusOnPress(bool on)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (d->focusOnPress == on)
+        return;
+    d->focusOnPress = on;
+    emit focusOnPressChanged(d->focusOnPress);
+}
+
+/*!
+    \qmlproperty bool TextEdit::persistentSelection
+
+    Whether the TextEdit should keep the selection visible when it loses focus to another
+    item in the scene. By default this is set to true;
+*/
+bool QDeclarativeTextEdit::persistentSelection() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->persistentSelection;
+}
+
+void QDeclarativeTextEdit::setPersistentSelection(bool on)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (d->persistentSelection == on)
+        return;
+    d->persistentSelection = on;
+    emit persistentSelectionChanged(d->persistentSelection);
+}
+
+qreal QDeclarativeTextEdit::textMargin() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->textMargin;
+}
+
+void QDeclarativeTextEdit::setTextMargin(qreal margin)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (d->textMargin == margin)
+        return;
+    d->textMargin = margin;
+    d->document->setDocumentMargin(d->textMargin);
+    emit textMarginChanged(d->textMargin);
+}
+
+void QDeclarativeTextEdit::geometryChanged(const QRectF &newGeometry,
+                                  const QRectF &oldGeometry)
+{
+    if (newGeometry.width() != oldGeometry.width())
+        updateSize();
+    QDeclarativePaintedItem::geometryChanged(newGeometry, oldGeometry);
+}
+
+/*!
+    Ensures any delayed caching or data loading the class
+    needs to performed is complete.
+*/
+void QDeclarativeTextEdit::componentComplete()
+{
+    Q_D(QDeclarativeTextEdit);
+    QDeclarativePaintedItem::componentComplete();
+    if (d->dirty) {
+        updateSize();
+        d->dirty = false;
+    }
+}
+
+/*!
+    \qmlproperty bool TextEdit::readOnly
+
+    Whether the user an interact with the TextEdit item. If this
+    property is set to true the text cannot be edited by user interaction.
+
+    By default this property is false.
+*/
+void QDeclarativeTextEdit::setReadOnly(bool r)
+{
+    Q_D(QDeclarativeTextEdit);    
+    if (r == isReadOnly())
+        return;
+
+
+    Qt::TextInteractionFlags flags = Qt::NoTextInteraction;
+    if (r) {
+        flags = Qt::TextSelectableByMouse;
+    } else {
+        flags = Qt::TextEditorInteraction;
+    }
+    d->control->setTextInteractionFlags(flags);
+    if (!r)
+        d->control->moveCursor(QTextCursor::End);
+
+    emit readOnlyChanged(r);
+}
+
+bool QDeclarativeTextEdit::isReadOnly() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return !(d->control->textInteractionFlags() & Qt::TextEditable);
+}
+
+/*!
+    Sets how the text edit should interact with user input to the given
+    \a flags.
+*/
+void QDeclarativeTextEdit::setTextInteractionFlags(Qt::TextInteractionFlags flags)
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->setTextInteractionFlags(flags);
+}
+
+/*!
+    Returns the flags specifying how the text edit should interact
+    with user input.
+*/
+Qt::TextInteractionFlags QDeclarativeTextEdit::textInteractionFlags() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->control->textInteractionFlags();
+}
+
+/*!
+    Returns the rectangle where the text cursor is rendered
+    within the text edit.
+*/
+QRect QDeclarativeTextEdit::cursorRect() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->control->cursorRect().toRect();
+}
+
+
+/*!
+\overload
+Handles the given \a event.
+*/
+bool QDeclarativeTextEdit::event(QEvent *event)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (event->type() == QEvent::ShortcutOverride) {
+        d->control->processEvent(event, QPointF(0, 0));
+        return event->isAccepted();
+    }
+    return QDeclarativePaintedItem::event(event);
+}
+
+/*!
+\overload
+Handles the given key \a event.
+*/
+void QDeclarativeTextEdit::keyPressEvent(QKeyEvent *event)
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->processEvent(event, QPointF(0, 0));
+
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::keyPressEvent(event);
+}
+
+/*!
+\overload
+Handles the given key \a event.
+*/
+void QDeclarativeTextEdit::keyReleaseEvent(QKeyEvent *event)
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->processEvent(event, QPointF(0, 0));
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::keyReleaseEvent(event);
+}
+
+/*!
+    \overload
+    Handles changing of the focus property.  Focus is applied to the control
+    even if the edit does not have active focus.  This is because things
+    like KeyProxy can give the behavior of focus even when hasFocus() isn't
+    true.
+*/
+void QDeclarativeTextEdit::focusChanged(bool hasFocus)
+{
+    setCursorVisible(hasFocus);
+    QDeclarativeItem::focusChanged(hasFocus);
+}
+
+/*!
+    Causes all text to be selected.
+*/
+void QDeclarativeTextEdit::selectAll()
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->selectAll();
+}
+
+/*!
+\overload
+Handles the given mouse \a event.
+*/
+void QDeclarativeTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (d->focusOnPress){
+        QGraphicsItem *p = parentItem();//###Is there a better way to find my focus scope?
+        while(p) {
+            if(p->flags() & QGraphicsItem::ItemIsFocusScope){
+                p->setFocus();
+                break;
+            }
+            p = p->parentItem();
+        }
+        setFocus(true);
+    }
+    d->control->processEvent(event, QPointF(0, 0));
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::mousePressEvent(event);
+}
+
+/*!
+\overload
+Handles the given mouse \a event.
+*/
+void QDeclarativeTextEdit::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeTextEdit);
+    QWidget *widget = event->widget();
+    if (widget && (d->control->textInteractionFlags() & Qt::TextEditable) && boundingRect().contains(event->pos()))
+        qt_widget_private(widget)->handleSoftwareInputPanel(event->button(), d->focusOnPress);
+
+    d->control->processEvent(event, QPointF(0, 0));
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::mousePressEvent(event);
+}
+
+/*!
+\overload
+Handles the given mouse \a event.
+*/
+void QDeclarativeTextEdit::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->processEvent(event, QPointF(0, 0));
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::mouseDoubleClickEvent(event);
+}
+
+/*!
+\overload
+Handles the given mouse \a event.
+*/
+void QDeclarativeTextEdit::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->processEvent(event, QPointF(0, 0));
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::mousePressEvent(event);
+}
+
+/*!
+\overload
+Handles the given input method \a event.
+*/
+void QDeclarativeTextEdit::inputMethodEvent(QInputMethodEvent *event)
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->processEvent(event, QPointF(0, 0));
+}
+
+/*!
+\overload
+Returns the value of the given \a property.
+*/
+QVariant QDeclarativeTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->control->inputMethodQuery(property);
+}
+
+/*!
+Draws the contents of the text edit using the given \a painter within
+the given \a bounds.
+*/
+void QDeclarativeTextEdit::drawContents(QPainter *painter, const QRect &bounds)
+{
+    Q_D(QDeclarativeTextEdit);
+
+    painter->setRenderHint(QPainter::TextAntialiasing, true);
+
+    d->control->drawContents(painter, bounds);
+}
+
+void QDeclarativeTextEdit::updateImgCache(const QRectF &r)
+{
+    dirtyCache(r.toRect());
+    emit update();
+}
+
+/*!
+    \qmlproperty bool TextEdit::smooth
+
+    Set this property if you want the text to be smoothly scaled or
+    transformed.  Smooth filtering gives better visual quality, but is slower.  If
+    the item is displayed at its natural size, this property has no visual or
+    performance effect.
+
+    \note Generally scaling artifacts are only visible if the item is stationary on
+    the screen.  A common pattern when animating an item is to disable smooth
+    filtering at the beginning of the animation and reenable it at the conclusion.
+*/
+
+void QDeclarativeTextEditPrivate::init()
+{
+    Q_Q(QDeclarativeTextEdit);
+
+    q->setSmooth(smooth);
+    q->setAcceptedMouseButtons(Qt::LeftButton);
+    q->setFlag(QGraphicsItem::ItemHasNoContents, false);
+    q->setFlag(QGraphicsItem::ItemAcceptsInputMethod);
+
+    control = new QTextControl(q);
+    control->setIgnoreUnusedNavigationEvents(true);
+
+    QObject::connect(control, SIGNAL(updateRequest(QRectF)), q, SLOT(updateImgCache(QRectF)));
+
+    QObject::connect(control, SIGNAL(textChanged()), q, SLOT(q_textChanged()));
+    QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged()));
+    QObject::connect(control, SIGNAL(selectionChanged()), q, SLOT(updateSelectionMarkers()));
+    QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(updateSelectionMarkers()));
+    QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));
+
+    document = control->document();
+    document->setDefaultFont(font);
+    document->setDocumentMargin(textMargin);
+    document->setUndoRedoEnabled(false); // flush undo buffer.
+    document->setUndoRedoEnabled(true);
+    updateDefaultTextOption();
+}
+
+void QDeclarativeTextEdit::q_textChanged()
+{
+    updateSize();
+    emit textChanged(text());
+}
+
+void QDeclarativeTextEdit::moveCursorDelegate()
+{
+    Q_D(QDeclarativeTextEdit);
+    if(!d->cursor)
+        return;
+    QRectF cursorRect = d->control->cursorRect();
+    d->cursor->setX(cursorRect.x());
+    d->cursor->setY(cursorRect.y());
+}
+
+void QDeclarativeTextEditPrivate::updateSelection()
+{
+    Q_Q(QDeclarativeTextEdit);
+    QTextCursor cursor = control->textCursor();
+    bool startChange = (lastSelectionStart != cursor.selectionStart());
+    bool endChange = (lastSelectionEnd != cursor.selectionEnd());
+    //### Is it worth calculating a more minimal set of movements?
+    cursor.beginEditBlock();
+    cursor.setPosition(lastSelectionStart, QTextCursor::MoveAnchor);
+    cursor.setPosition(lastSelectionEnd, QTextCursor::KeepAnchor);
+    cursor.endEditBlock();
+    control->setTextCursor(cursor);
+    if(startChange)
+        q->selectionStartChanged();
+    if(endChange)
+        q->selectionEndChanged();
+    startChange = (lastSelectionStart != control->textCursor().selectionStart());
+    endChange = (lastSelectionEnd != control->textCursor().selectionEnd());
+    if(startChange || endChange)
+        qWarning() << "QDeclarativeTextEditPrivate::updateSelection() has failed you.";
+}
+
+void QDeclarativeTextEdit::updateSelectionMarkers()
+{
+    Q_D(QDeclarativeTextEdit);
+    if(d->lastSelectionStart != d->control->textCursor().selectionStart()){
+        d->lastSelectionStart = d->control->textCursor().selectionStart();
+        emit selectionStartChanged();
+    }
+    if(d->lastSelectionEnd != d->control->textCursor().selectionEnd()){
+        d->lastSelectionEnd = d->control->textCursor().selectionEnd();
+        emit selectionEndChanged();
+    }
+}
+
+//### we should perhaps be a bit smarter here -- depending on what has changed, we shouldn't
+//    need to do all the calculations each time
+void QDeclarativeTextEdit::updateSize()
+{
+    Q_D(QDeclarativeTextEdit);
+    if (isComponentComplete()) {
+        QFontMetrics fm = QFontMetrics(d->font);
+        int dy = height();
+        // ### assumes that if the width is set, the text will fill to edges
+        // ### (unless wrap is false, then clipping will occur)
+        if (widthValid())
+            d->document->setTextWidth(width());
+        dy -= (int)d->document->size().height();
+
+        int yoff = 0;
+        if (heightValid()) {
+            if (d->vAlign == AlignBottom)
+                yoff = dy;
+            else if (d->vAlign == AlignVCenter)
+                yoff = dy/2;
+        }
+        setBaselineOffset(fm.ascent() + yoff + d->textMargin);
+
+        //### need to comfirm cost of always setting these
+        int newWidth = (int)d->document->idealWidth();
+        d->document->setTextWidth(newWidth); // ### QTextDoc> Alignment will not work unless textWidth is set. Does Text need this line as well?
+        int cursorWidth = 1;
+        if(d->cursor)
+            cursorWidth = d->cursor->width();
+        newWidth += cursorWidth;
+        if(!d->document->isEmpty())
+            newWidth += 3;// ### Need a better way of accounting for space between char and cursor
+        // ### Setting the implicitWidth triggers another updateSize(), and unless there are bindings nothing has changed.
+        setImplicitWidth(newWidth);
+        setImplicitHeight(d->text.isEmpty() ? fm.height() : (int)d->document->size().height());
+
+        setContentsSize(QSize(width(), height()));
+    } else {
+        d->dirty = true;
+    }
+    emit update();
+}
+
+void QDeclarativeTextEditPrivate::updateDefaultTextOption()
+{
+    QTextOption opt = document->defaultTextOption();
+    int oldAlignment = opt.alignment();
+    opt.setAlignment((Qt::Alignment)(int)(hAlign | vAlign));
+
+    QTextOption::WrapMode oldWrapMode = opt.wrapMode();
+
+    if (wrap)
+        opt.setWrapMode(QTextOption::WordWrap);
+    else
+        opt.setWrapMode(QTextOption::NoWrap);
+
+    if (oldWrapMode == opt.wrapMode() && oldAlignment == opt.alignment())
+        return;
+    document->setDefaultTextOption(opt);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
new file mode 100644
index 0000000..6183b1d
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
@@ -0,0 +1,240 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETEXTEDIT_H
+#define QDECLARATIVETEXTEDIT_H
+
+#include "qdeclarativetext_p.h"
+#include "qdeclarativepainteditem_p.h"
+
+#include <QtGui/qtextdocument.h>
+#include <QtGui/qtextoption.h>
+#include <QtGui/qtextcursor.h>
+#include <QtGui/qtextformat.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+
+class QDeclarativeTextEditPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeTextEdit : public QDeclarativePaintedItem
+{
+    Q_OBJECT
+    Q_ENUMS(VAlignment)
+    Q_ENUMS(HAlignment)
+    Q_ENUMS(TextFormat)
+
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+    Q_PROPERTY(QColor selectionColor READ selectionColor WRITE setSelectionColor NOTIFY selectionColorChanged)
+    Q_PROPERTY(QColor selectedTextColor READ selectedTextColor WRITE setSelectedTextColor NOTIFY selectedTextColorChanged)
+    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
+    Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign NOTIFY horizontalAlignmentChanged)
+    Q_PROPERTY(VAlignment verticalAlignment READ vAlign WRITE setVAlign NOTIFY verticalAlignmentChanged)
+    Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapChanged) //### other wrap modes
+    Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat NOTIFY textFormatChanged)
+    Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly NOTIFY readOnlyChanged)
+    Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged)
+    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
+    Q_PROPERTY(QDeclarativeComponent* cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
+    Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged)
+    Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged)
+    Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectionChanged)
+    Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY focusOnPressChanged)
+    Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection NOTIFY persistentSelectionChanged)
+    Q_PROPERTY(qreal textMargin READ textMargin WRITE setTextMargin NOTIFY textMarginChanged)
+    Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints)
+
+public:
+    QDeclarativeTextEdit(QDeclarativeItem *parent=0);
+
+    enum HAlignment {
+        AlignLeft = Qt::AlignLeft,
+        AlignRight = Qt::AlignRight,
+        AlignHCenter = Qt::AlignHCenter
+    };
+
+    enum VAlignment {
+        AlignTop = Qt::AlignTop,
+        AlignBottom = Qt::AlignBottom,
+        AlignVCenter = Qt::AlignVCenter
+    };
+
+    enum TextFormat {
+        PlainText = Qt::PlainText,
+        RichText = Qt::RichText,
+        AutoText = Qt::AutoText
+    };
+
+    QString text() const;
+    void setText(const QString &);
+
+    TextFormat textFormat() const;
+    void setTextFormat(TextFormat format);
+
+    QFont font() const;
+    void setFont(const QFont &font);
+
+    QColor color() const;
+    void setColor(const QColor &c);
+
+    QColor selectionColor() const;
+    void setSelectionColor(const QColor &c);
+
+    QColor selectedTextColor() const;
+    void setSelectedTextColor(const QColor &c);
+
+    HAlignment hAlign() const;
+    void setHAlign(HAlignment align);
+
+    VAlignment vAlign() const;
+    void setVAlign(VAlignment align);
+
+    bool wrap() const;
+    void setWrap(bool w);
+
+    bool isCursorVisible() const;
+    void setCursorVisible(bool on);
+
+    int cursorPosition() const;
+    void setCursorPosition(int pos);
+
+    QDeclarativeComponent* cursorDelegate() const;
+    void setCursorDelegate(QDeclarativeComponent*);
+
+    int selectionStart() const;
+    void setSelectionStart(int);
+
+    int selectionEnd() const;
+    void setSelectionEnd(int);
+
+    QString selectedText() const;
+
+    bool focusOnPress() const;
+    void setFocusOnPress(bool on);
+
+    bool persistentSelection() const;
+    void setPersistentSelection(bool on);
+
+    qreal textMargin() const;
+    void setTextMargin(qreal margin);
+
+    virtual void componentComplete();
+
+    /* FROM EDIT */
+    void setReadOnly(bool);
+    bool isReadOnly() const;
+
+    void setTextInteractionFlags(Qt::TextInteractionFlags flags);
+    Qt::TextInteractionFlags textInteractionFlags() const;
+
+    QRect cursorRect() const;
+
+    QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
+
+Q_SIGNALS:
+    void textChanged(const QString &);
+    void cursorPositionChanged();
+    void selectionStartChanged();
+    void selectionEndChanged();
+    void selectionChanged();
+    void colorChanged(const QColor &color);
+    void selectionColorChanged(const QColor &color);
+    void selectedTextColorChanged(const QColor &color);
+    void fontChanged(const QFont &font);
+    void horizontalAlignmentChanged(HAlignment alignment);
+    void verticalAlignmentChanged(VAlignment alignment);
+    void wrapChanged(bool isWrapped);
+    void textFormatChanged(TextFormat textFormat);
+    void readOnlyChanged(bool isReadOnly);
+    void cursorVisibleChanged(bool isCursorVisible);
+    void cursorDelegateChanged();
+    void focusOnPressChanged(bool focusIsPressed);
+    void persistentSelectionChanged(bool isPersistentSelection);
+    void textMarginChanged(qreal textMargin);
+
+public Q_SLOTS:
+    void selectAll();
+
+private Q_SLOTS:
+    void updateImgCache(const QRectF &rect);
+    void q_textChanged();
+    void updateSelectionMarkers();
+    void moveCursorDelegate();
+    void loadCursorDelegate();
+
+private:
+    void updateSize();
+
+protected:
+    virtual void geometryChanged(const QRectF &newGeometry, 
+                                 const QRectF &oldGeometry);
+
+    bool event(QEvent *);
+    void keyPressEvent(QKeyEvent *);
+    void keyReleaseEvent(QKeyEvent *);
+
+    void focusChanged(bool);
+
+    // mouse filter?
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+
+    void inputMethodEvent(QInputMethodEvent *e);
+
+    void drawContents(QPainter *, const QRect &);
+private:
+    Q_DISABLE_COPY(QDeclarativeTextEdit)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeTextEdit)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeTextEdit)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
new file mode 100644
index 0000000..002fac4
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETEXTEDIT_P_H
+#define QDECLARATIVETEXTEDIT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeitem.h"
+#include "qdeclarativepainteditem_p_p.h"
+
+#include <qdeclarative.h>
+
+QT_BEGIN_NAMESPACE
+class QTextLayout;
+class QTextDocument;
+class QTextControl;
+class QDeclarativeTextEditPrivate : public QDeclarativePaintedItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeTextEdit)
+
+public:
+    QDeclarativeTextEditPrivate()
+      : color("black"), imgDirty(true), hAlign(QDeclarativeTextEdit::AlignLeft), vAlign(QDeclarativeTextEdit::AlignTop),
+      dirty(false), wrap(false), richText(false), cursorVisible(false), focusOnPress(true),
+      persistentSelection(true), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0),
+      cursorComponent(0), cursor(0), format(QDeclarativeTextEdit::AutoText), document(0)
+    {
+    }
+
+    void init();
+
+    void updateDefaultTextOption();
+    void relayoutDocument();
+    void updateSelection();
+
+    QString text;
+    QFont font;
+    QColor  color;
+    QColor  selectionColor;
+    QColor  selectedTextColor;
+    QString style;
+    QColor  styleColor;
+    bool imgDirty;
+    QPixmap imgCache;
+    QPixmap imgStyleCache;
+    QDeclarativeTextEdit::HAlignment hAlign;
+    QDeclarativeTextEdit::VAlignment vAlign;
+    bool dirty;
+    bool wrap;
+    bool richText;
+    bool cursorVisible;
+    bool focusOnPress;
+    bool persistentSelection;
+    qreal textMargin;
+    int lastSelectionStart;
+    int lastSelectionEnd;
+    QDeclarativeComponent* cursorComponent;
+    QDeclarativeItem* cursor;
+    QDeclarativeTextEdit::TextFormat format;
+    QTextDocument *document;
+    QTextControl *control;
+};
+
+QT_END_NAMESPACE
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
new file mode 100644
index 0000000..9919904
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -0,0 +1,913 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetextinput_p.h"
+#include "qdeclarativetextinput_p_p.h"
+
+#include <qdeclarativeinfo.h>
+
+#include <QValidator>
+#include <QApplication>
+#include <QFontMetrics>
+#include <QPainter>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass TextInput QDeclarativeTextInput
+  \since 4.7
+    The TextInput item allows you to add an editable line of text to a scene.
+
+    TextInput can only display a single line of text, and can only display
+    plain text. However it can provide addition input constraints on the text.
+
+    Input constraints include setting a QValidator, an input mask, or a
+    maximum input length.
+*/
+QDeclarativeTextInput::QDeclarativeTextInput(QDeclarativeItem* parent)
+    : QDeclarativePaintedItem(*(new QDeclarativeTextInputPrivate), parent)
+{
+    Q_D(QDeclarativeTextInput);
+    d->init();
+}
+
+QDeclarativeTextInput::~QDeclarativeTextInput()
+{
+}
+
+/*!
+    \qmlproperty string TextInput::text
+
+    The text in the TextInput.
+*/
+
+QString QDeclarativeTextInput::text() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->control->text();
+}
+
+void QDeclarativeTextInput::setText(const QString &s)
+{
+    Q_D(QDeclarativeTextInput);
+    if(s == text())
+        return;
+    d->control->setText(s);
+    //emit textChanged();
+}
+
+/*!
+    \qmlproperty string TextInput::font.family
+    \qmlproperty bool TextInput::font.bold
+    \qmlproperty bool TextInput::font.italic
+    \qmlproperty bool TextInput::font.underline
+    \qmlproperty real TextInput::font.pointSize
+    \qmlproperty int TextInput::font.pixelSize
+
+    Set the TextInput's font attributes.
+*/
+QFont QDeclarativeTextInput::font() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->font;
+}
+
+void QDeclarativeTextInput::setFont(const QFont &font)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->font == font)
+        return;
+
+    d->font = font;
+
+    d->control->setFont(d->font);
+    if(d->cursorItem){
+        d->cursorItem->setHeight(QFontMetrics(d->font).height());
+        moveCursor();
+    }
+    updateSize();
+    emit fontChanged(d->font);
+}
+
+/*!
+    \qmlproperty color TextInput::color
+
+    The text color.
+*/
+QColor QDeclarativeTextInput::color() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->color;
+}
+
+void QDeclarativeTextInput::setColor(const QColor &c)
+{
+    Q_D(QDeclarativeTextInput);
+    d->color = c;
+}
+
+
+/*!
+    \qmlproperty color TextInput::selectionColor
+
+    The text highlight color, used behind selections.
+*/
+QColor QDeclarativeTextInput::selectionColor() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->selectionColor;
+}
+
+void QDeclarativeTextInput::setSelectionColor(const QColor &color)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->selectionColor == color)
+        return;
+
+    d->selectionColor = color;
+    QPalette p = d->control->palette();
+    p.setColor(QPalette::Highlight, d->selectionColor);
+    d->control->setPalette(p);
+    emit selectionColorChanged(color);
+}
+
+/*!
+    \qmlproperty color TextInput::selectedTextColor
+
+    The highlighted text color, used in selections.
+*/
+QColor QDeclarativeTextInput::selectedTextColor() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->selectedTextColor;
+}
+
+void QDeclarativeTextInput::setSelectedTextColor(const QColor &color)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->selectedTextColor == color)
+        return;
+
+    d->selectedTextColor = color;
+    QPalette p = d->control->palette();
+    p.setColor(QPalette::HighlightedText, d->selectedTextColor);
+    d->control->setPalette(p);
+    emit selectedTextColorChanged(color);
+}
+
+/*!
+    \qmlproperty enumeration TextInput::horizontalAlignment
+
+    Sets the horizontal alignment of the text within the TextInput item's
+    width and height.  By default, the text is left aligned.
+
+    TextInput does not have vertical alignment, as the natural height is
+    exactly the height of the single line of text. If you set the height
+    manually to something larger, TextInput will always be top aligned
+    vertically. You can use anchors to align it however you want within
+    another item.
+
+    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
+    \c AlignHCenter.
+*/
+QDeclarativeTextInput::HAlignment QDeclarativeTextInput::hAlign() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->hAlign;
+}
+
+void QDeclarativeTextInput::setHAlign(HAlignment align)
+{
+    Q_D(QDeclarativeTextInput);
+    if(align == d->hAlign)
+        return;
+    d->hAlign = align;
+    emit horizontalAlignmentChanged(d->hAlign);
+}
+
+bool QDeclarativeTextInput::isReadOnly() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->control->isReadOnly();
+}
+
+void QDeclarativeTextInput::setReadOnly(bool ro)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->control->isReadOnly() == ro)
+        return;
+
+    d->control->setReadOnly(ro);
+
+    emit readOnlyChanged(ro);
+}
+
+int QDeclarativeTextInput::maxLength() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->control->maxLength();
+}
+
+void QDeclarativeTextInput::setMaxLength(int ml)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->control->maxLength() == ml)
+        return;
+
+    d->control->setMaxLength(ml);
+
+    emit maximumLengthChanged(ml);
+}
+
+/*!
+    \qmlproperty bool TextInput::cursorVisible
+    Set to true when the TextInput shows a cursor.
+
+    This property is set and unset when the TextInput gets focus, so that other
+    properties can be bound to whether the cursor is currently showing. As it
+    gets set and unset automatically, when you set the value yourself you must
+    keep in mind that your value may be overwritten.
+
+    It can be set directly in script, for example if a KeyProxy might
+    forward keys to it and you desire it to look active when this happens
+    (but without actually giving it the focus).
+
+    It should not be set directly on the element, like in the below QML,
+    as the specified value will be overridden an lost on focus changes.
+
+    \code
+    TextInput {
+        text: "Text"
+        cursorVisible: false
+    }
+    \endcode
+
+    In the above snippet the cursor will still become visible when the
+    TextInput gains focus.
+*/
+bool QDeclarativeTextInput::isCursorVisible() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->cursorVisible;
+}
+
+void QDeclarativeTextInput::setCursorVisible(bool on)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->cursorVisible == on)
+        return;
+    d->cursorVisible = on;
+    d->control->setCursorBlinkPeriod(on?QApplication::cursorFlashTime():0);
+    //d->control should emit the cursor update regions
+    emit cursorVisibleChanged(d->cursorVisible);
+}
+
+/*!
+    \qmlproperty int TextInput::cursorPosition
+    The position of the cursor in the TextInput.
+*/
+int QDeclarativeTextInput::cursorPosition() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->control->cursor();
+}
+void QDeclarativeTextInput::setCursorPosition(int cp)
+{
+    Q_D(QDeclarativeTextInput);
+    d->control->moveCursor(cp);
+}
+
+/*!
+  \internal
+
+  Returns a Rect which encompasses the cursor, but which may be larger than is
+  required. Ignores custom cursor delegates.
+*/
+QRect QDeclarativeTextInput::cursorRect() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->control->cursorRect();
+}
+
+/*!
+    \qmlproperty int TextInput::selectionStart
+
+    The cursor position before the first character in the current selection.
+    Setting this and selectionEnd allows you to specify a selection in the
+    text edit.
+
+    Note that if selectionStart == selectionEnd then there is no current
+    selection. If you attempt to set selectionStart to a value outside of
+    the current text, selectionStart will not be changed.
+
+    \sa selectionEnd, cursorPosition, selectedText
+*/
+int QDeclarativeTextInput::selectionStart() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->lastSelectionStart;
+}
+
+void QDeclarativeTextInput::setSelectionStart(int s)
+{
+    Q_D(QDeclarativeTextInput);
+    if(d->lastSelectionStart == s || s < 0 || s > text().length())
+        return;
+    d->lastSelectionStart = s;
+    d->control->setSelection(s, d->lastSelectionEnd - s);
+}
+
+/*!
+    \qmlproperty int TextInput::selectionEnd
+
+    The cursor position after the last character in the current selection.
+    Setting this and selectionStart allows you to specify a selection in the
+    text edit.
+
+    Note that if selectionStart == selectionEnd then there is no current
+    selection. If you attempt to set selectionEnd to a value outside of
+    the current text, selectionEnd will not be changed.
+
+    \sa selectionStart, cursorPosition, selectedText
+*/
+int QDeclarativeTextInput::selectionEnd() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->lastSelectionEnd;
+}
+
+void QDeclarativeTextInput::setSelectionEnd(int s)
+{
+    Q_D(QDeclarativeTextInput);
+    if(d->lastSelectionEnd == s || s < 0 || s > text().length())
+        return;
+    d->lastSelectionEnd = s;
+    d->control->setSelection(d->lastSelectionStart, s - d->lastSelectionStart);
+}
+
+/*!
+    \qmlproperty string TextInput::selectedText
+
+    This read-only property provides the text currently selected in the
+    text input.
+
+    It is equivalent to the following snippet, but is faster and easier
+    to use.
+
+    \qml
+    myTextInput.text.toString().substring(myTextInput.selectionStart,
+        myTextInput.selectionEnd);
+    \endqml
+*/
+QString QDeclarativeTextInput::selectedText() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->control->selectedText();
+}
+
+/*!
+    \qmlproperty bool TextInput::focusOnPress
+
+    Whether the TextInput should gain focus on a mouse press. By default this is
+    set to true.
+*/
+bool QDeclarativeTextInput::focusOnPress() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->focusOnPress;
+}
+
+void QDeclarativeTextInput::setFocusOnPress(bool b)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->focusOnPress == b)
+        return;
+
+    d->focusOnPress = b;
+
+    emit focusOnPressChanged(d->focusOnPress);
+}
+
+/*!
+    \qmlproperty QValidator* TextInput::validator
+
+    Allows you to set a QValidator on the TextInput. When a validator is set
+    the TextInput will only accept input which leaves the text property in
+    an acceptable or intermediate state. The accepted signal will only be sent
+    if the text is in an acceptable state when enter is pressed.
+
+    Currently supported validators are QIntValidator, QDoubleValidator and
+    QRegExpValidator. For details, refer to their C++ documentation and remember
+    that all Q_PROPERTIES are accessible from Qml. A brief usage guide follows:
+
+    QIntValidator and QDoubleValidator both are controllable through two properties,
+    top and bottom. The difference is that for QIntValidator the top and bottom properties
+    should be integers, and for QDoubleValidator they should be doubles. QRegExpValidator
+    has a single string property, regExp, which should be set to the regular expression to
+    be used for validation. An example of using validators is shown below, which allows
+    input of integers between 11 and 31 into the text input:
+
+    \code
+    import Qt 4.6
+    TextInput{
+        validator: QIntValidator{bottom: 11; top: 31;}
+        focus: true
+    }
+    \endcode
+
+    \sa acceptableInput, inputMask
+*/
+QValidator* QDeclarativeTextInput::validator() const
+{
+    Q_D(const QDeclarativeTextInput);
+    //###const cast isn't good, but needed for property system?
+    return const_cast<QValidator*>(d->control->validator());
+}
+
+void QDeclarativeTextInput::setValidator(QValidator* v)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->control->validator() == v)
+        return;
+
+    d->control->setValidator(v);
+    if(!d->control->hasAcceptableInput()){
+        d->oldValidity = false;
+        emit acceptableInputChanged();
+    }
+
+    emit validatorChanged();
+}
+
+/*!
+    \qmlproperty string TextInput::inputMask
+
+    Allows you to set an input mask on the TextInput, restricting the allowable
+    text inputs. See QLineEdit::inputMask for further details, as the exact
+    same mask strings are used by TextInput.
+
+    \sa acceptableInput, validator
+*/
+QString QDeclarativeTextInput::inputMask() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->control->inputMask();
+}
+
+void QDeclarativeTextInput::setInputMask(const QString &im)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->control->inputMask() == im)
+        return;
+
+    d->control->setInputMask(im);
+    emit inputMaskChanged(d->control->inputMask());
+}
+
+/*!
+    \qmlproperty bool TextInput::acceptableInput
+
+    This property is always true unless a validator or input mask has been set.
+    If a validator or input mask has been set, this property will only be true
+    if the current text is acceptable to the validator or input mask as a final
+    string (not as an intermediate string).
+*/
+bool QDeclarativeTextInput::hasAcceptableInput() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->control->hasAcceptableInput();
+}
+
+/*!
+    \qmlproperty TextInput.EchoMode TextInput::echoMode
+
+    Specifies how the text should be displayed in the TextInput.
+    The default is Normal, which displays the text as it is. Other values
+    are Password, which displays asterixes instead of characters, NoEcho,
+    which displays nothing, and PasswordEchoOnEdit, which displays all but the
+    current character as asterixes.
+
+*/
+QDeclarativeTextInput::EchoMode QDeclarativeTextInput::echoMode() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return (QDeclarativeTextInput::EchoMode)d->control->echoMode();
+}
+
+void QDeclarativeTextInput::setEchoMode(QDeclarativeTextInput::EchoMode echo)
+{
+    Q_D(QDeclarativeTextInput);
+    if (echoMode() == echo)
+        return;
+
+    d->control->setEchoMode((uint)echo);
+    emit echoModeChanged(echoMode());
+}
+
+/*!
+    \qmlproperty Component TextInput::cursorDelegate
+    The delegate for the cursor in the TextInput.
+
+    If you set a cursorDelegate for a TextInput, this delegate will be used for
+    drawing the cursor instead of the standard cursor. An instance of the
+    delegate will be created and managed by the TextInput when a cursor is
+    needed, and the x property of delegate instance will be set so as
+    to be one pixel before the top left of the current character.
+
+    Note that the root item of the delegate component must be a QDeclarativeItem or
+    QDeclarativeItem derived item.
+*/
+QDeclarativeComponent* QDeclarativeTextInput::cursorDelegate() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->cursorComponent;
+}
+
+void QDeclarativeTextInput::setCursorDelegate(QDeclarativeComponent* c)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->cursorComponent == c)
+        return;
+
+    d->cursorComponent = c;
+    if(!c){
+        //note that the components are owned by something else
+        disconnect(d->control, SIGNAL(cursorPositionChanged(int, int)),
+                this, SLOT(moveCursor()));
+        delete d->cursorItem;
+    }else{
+        d->startCreatingCursor();
+    }
+
+    emit cursorDelegateChanged();
+}
+
+void QDeclarativeTextInputPrivate::startCreatingCursor()
+{
+    Q_Q(QDeclarativeTextInput);
+    q->connect(control, SIGNAL(cursorPositionChanged(int, int)),
+            q, SLOT(moveCursor()));
+    if(cursorComponent->isReady()){
+        q->createCursor();
+    }else if(cursorComponent->isLoading()){
+        q->connect(cursorComponent, SIGNAL(statusChanged(int)),
+                q, SLOT(createCursor()));
+    }else{//isError
+        qmlInfo(q) << QDeclarativeTextInput::tr("Could not load cursor delegate");
+        qWarning() << cursorComponent->errors();
+    }
+}
+
+void QDeclarativeTextInput::createCursor()
+{
+    Q_D(QDeclarativeTextInput);
+    if(d->cursorComponent->isError()){
+        qmlInfo(this) << tr("Could not load cursor delegate");
+        qWarning() << d->cursorComponent->errors();
+        return;
+    }
+
+    if(!d->cursorComponent->isReady())
+        return;
+
+    if(d->cursorItem)
+        delete d->cursorItem;
+    d->cursorItem = qobject_cast<QDeclarativeItem*>(d->cursorComponent->create());
+    if(!d->cursorItem){
+        qmlInfo(this) << tr("Could not instantiate cursor delegate");
+        //The failed instantiation should print its own error messages
+        return;
+    }
+
+    d->cursorItem->setParentItem(this);
+    d->cursorItem->setX(d->control->cursorToX());
+    d->cursorItem->setHeight(d->control->height());
+}
+
+void QDeclarativeTextInput::moveCursor()
+{
+    Q_D(QDeclarativeTextInput);
+    if(!d->cursorItem)
+        return;
+    d->cursorItem->setX(d->control->cursorToX() - d->hscroll);
+}
+
+int QDeclarativeTextInput::xToPos(int x)
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->control->xToPos(x - d->hscroll);
+}
+
+void QDeclarativeTextInput::focusChanged(bool hasFocus)
+{
+    Q_D(QDeclarativeTextInput);
+    d->focused = hasFocus;
+    setCursorVisible(hasFocus);
+    QDeclarativeItem::focusChanged(hasFocus);
+}
+
+void QDeclarativeTextInput::keyPressEvent(QKeyEvent* ev)
+{
+    Q_D(QDeclarativeTextInput);
+    if(((d->control->cursor() == 0 && ev->key() == Qt::Key_Left)
+            || (d->control->cursor() == d->control->text().length()
+                && ev->key() == Qt::Key_Right))
+            && (d->lastSelectionStart == d->lastSelectionEnd)){
+        //ignore when moving off the end
+        //unless there is a selection, because then moving will do something (deselect)
+        ev->ignore();
+    }else{
+        d->control->processKeyEvent(ev);
+    }
+    if (!ev->isAccepted())
+        QDeclarativePaintedItem::keyPressEvent(ev);
+}
+
+void QDeclarativeTextInput::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeTextInput);
+    if(d->focusOnPress){
+        QGraphicsItem *p = parentItem();//###Is there a better way to find my focus scope?
+        while(p) {
+            if(p->flags() & QGraphicsItem::ItemIsFocusScope){
+                p->setFocus();
+                break;
+            }
+            p = p->parentItem();
+        }
+        setFocus(true);
+    }
+    d->control->processEvent(event);
+}
+
+/*!
+\overload
+Handles the given mouse \a event.
+*/
+void QDeclarativeTextInput::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeTextInput);
+    QWidget *widget = event->widget();
+    if (widget && !d->control->isReadOnly() && boundingRect().contains(event->pos()))
+        qt_widget_private(widget)->handleSoftwareInputPanel(event->button(), d->focusOnPress);
+    d->control->processEvent(event);
+}
+
+bool QDeclarativeTextInput::event(QEvent* ev)
+{
+    Q_D(QDeclarativeTextInput);
+    //Anything we don't deal with ourselves, pass to the control
+    bool handled = false;
+    switch(ev->type()){
+        case QEvent::KeyPress:
+        case QEvent::KeyRelease://###Should the control be doing anything with release?
+        case QEvent::GraphicsSceneMousePress:
+        case QEvent::GraphicsSceneMouseRelease:
+            break;
+        default:
+            handled = d->control->processEvent(ev);
+    }
+    if(!handled)
+        return QDeclarativePaintedItem::event(ev);
+    return true;
+}
+
+void QDeclarativeTextInput::geometryChanged(const QRectF &newGeometry,
+                                  const QRectF &oldGeometry)
+{
+    if (newGeometry.width() != oldGeometry.width())
+        updateSize();
+    QDeclarativePaintedItem::geometryChanged(newGeometry, oldGeometry);
+}
+
+void QDeclarativeTextInput::drawContents(QPainter *p, const QRect &r)
+{
+    Q_D(QDeclarativeTextInput);
+    p->setRenderHint(QPainter::TextAntialiasing, true);
+    p->save();
+    p->setPen(QPen(d->color));
+    int flags = QLineControl::DrawText;
+    if(!isReadOnly() && d->cursorVisible && !d->cursorItem)
+        flags |= QLineControl::DrawCursor;
+    if (d->control->hasSelectedText()){
+            flags |= QLineControl::DrawSelections;
+    }
+
+    QPoint offset = QPoint(0,0);
+    if(d->hAlign != AlignLeft){
+        QFontMetrics fm = QFontMetrics(d->font);
+        //###Is this using bearing appropriately?
+        int minLB = qMax(0, -fm.minLeftBearing());
+        int minRB = qMax(0, -fm.minRightBearing());
+        int widthUsed = qRound(d->control->naturalTextWidth()) + 1 + minRB;
+        int hOffset = 0;
+        if(d->hAlign == AlignRight){
+            hOffset = width() - widthUsed;
+        }else if(d->hAlign == AlignHCenter){
+            hOffset = (width() - widthUsed) / 2;
+        }
+        hOffset -= minLB;
+        offset = QPoint(hOffset, 0);
+    }
+    QRect clipRect = r;
+    d->control->draw(p, offset, clipRect, flags);
+
+    p->restore();
+}
+
+/*!
+\overload
+Returns the value of the given \a property.
+*/
+QVariant QDeclarativeTextInput::inputMethodQuery(Qt::InputMethodQuery property) const
+{
+    Q_D(const QDeclarativeTextInput);
+    switch(property) {
+    case Qt::ImFont:
+        return font();
+    case Qt::ImCursorPosition:
+        return QVariant(d->control->cursor());
+    case Qt::ImSurroundingText:
+        return QVariant(text());
+    case Qt::ImCurrentSelection:
+        return QVariant(selectedText());
+    case Qt::ImMaximumTextLength:
+        return QVariant(maxLength());
+    case Qt::ImAnchorPosition:
+        if (d->control->selectionStart() == d->control->selectionEnd())
+            return QVariant(d->control->cursor());
+        else if (d->control->selectionStart() == d->control->cursor())
+            return QVariant(d->control->selectionEnd());
+        else
+            return QVariant(d->control->selectionStart());
+    default:
+        return QVariant();
+    }
+}
+
+void QDeclarativeTextInput::selectAll()
+{
+    Q_D(QDeclarativeTextInput);
+    d->control->setSelection(0, d->control->text().length());
+}
+
+
+/*!
+    \qmlproperty bool TextInput::smooth
+
+    Set this property if you want the text to be smoothly scaled or
+    transformed.  Smooth filtering gives better visual quality, but is slower.  If
+    the item is displayed at its natural size, this property has no visual or
+    performance effect.
+
+    \note Generally scaling artifacts are only visible if the item is stationary on
+    the screen.  A common pattern when animating an item is to disable smooth
+    filtering at the beginning of the animation and reenable it at the conclusion.
+*/
+
+void QDeclarativeTextInputPrivate::init()
+{
+    Q_Q(QDeclarativeTextInput);
+    control->setCursorWidth(1);
+    control->setPasswordCharacter(QLatin1Char('*'));
+    control->setLayoutDirection(Qt::LeftToRight);
+    q->setSmooth(smooth);
+    q->setAcceptedMouseButtons(Qt::LeftButton);
+    q->setFlag(QGraphicsItem::ItemHasNoContents, false);
+    q->setFlag(QGraphicsItem::ItemAcceptsInputMethod);
+    q->connect(control, SIGNAL(cursorPositionChanged(int,int)),
+               q, SLOT(cursorPosChanged()));
+    q->connect(control, SIGNAL(selectionChanged()),
+               q, SLOT(selectionChanged()));
+    q->connect(control, SIGNAL(textChanged(const QString &)),
+               q, SLOT(q_textChanged()));
+    q->connect(control, SIGNAL(accepted()),
+               q, SIGNAL(accepted()));
+    q->connect(control, SIGNAL(updateNeeded(QRect)),
+               q, SLOT(updateRect(QRect)));
+    q->connect(control, SIGNAL(cursorPositionChanged(int,int)),
+               q, SLOT(updateRect()));//TODO: Only update rect between pos's
+    q->connect(control, SIGNAL(selectionChanged()),
+               q, SLOT(updateRect()));//TODO: Only update rect in selection
+    //Note that above TODOs probably aren't that big a savings
+    q->updateSize();
+    oldValidity = control->hasAcceptableInput();
+    lastSelectionStart = 0;
+    lastSelectionEnd = 0;
+}
+
+void QDeclarativeTextInput::cursorPosChanged()
+{
+    Q_D(QDeclarativeTextInput);
+    emit cursorPositionChanged();
+
+    if(!d->control->hasSelectedText()){
+        if(d->lastSelectionStart != d->control->cursor()){
+            d->lastSelectionStart = d->control->cursor();
+            emit selectionStartChanged();
+        }
+        if(d->lastSelectionEnd != d->control->cursor()){
+            d->lastSelectionEnd = d->control->cursor();
+            emit selectionEndChanged();
+        }
+    }
+}
+
+void QDeclarativeTextInput::selectionChanged()
+{
+    Q_D(QDeclarativeTextInput);
+    emit selectedTextChanged();
+
+    if(d->lastSelectionStart != d->control->selectionStart()){
+        d->lastSelectionStart = d->control->selectionStart();
+        if(d->lastSelectionStart == -1)
+            d->lastSelectionStart = d->control->cursor();
+        emit selectionStartChanged();
+    }
+    if(d->lastSelectionEnd != d->control->selectionEnd()){
+        d->lastSelectionEnd = d->control->selectionEnd();
+        if(d->lastSelectionEnd == -1)
+            d->lastSelectionEnd = d->control->cursor();
+        emit selectionEndChanged();
+    }
+}
+
+void QDeclarativeTextInput::q_textChanged()
+{
+    Q_D(QDeclarativeTextInput);
+    updateSize();
+    emit textChanged();
+    if(hasAcceptableInput() != d->oldValidity){
+        d->oldValidity = hasAcceptableInput();
+        emit acceptableInputChanged();
+    }
+}
+
+void QDeclarativeTextInput::updateRect(const QRect &r)
+{
+    if(r == QRect())
+        clearCache();
+    else
+        dirtyCache(r);
+    update();
+}
+
+void QDeclarativeTextInput::updateSize(bool needsRedraw)
+{
+    Q_D(QDeclarativeTextInput);
+    int w = width();
+    int h = height();
+    setImplicitHeight(d->control->height());
+    int cursorWidth = d->control->cursorWidth();
+    if(d->cursorItem)
+        cursorWidth = d->cursorItem->width();
+    //### Is QFontMetrics too slow?
+    QFontMetricsF fm(d->font);
+    setImplicitWidth(fm.width(d->control->displayText())+cursorWidth);
+    setContentsSize(QSize(width(), height()));//Repaints if changed
+    if(w==width() && h==height() && needsRedraw){
+        clearCache();
+        update();
+    }
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
new file mode 100644
index 0000000..f690ae2
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
@@ -0,0 +1,232 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETEXTINPUT_H
+#define QDECLARATIVETEXTINPUT_H
+
+#include "qdeclarativetext_p.h"
+#include "qdeclarativepainteditem_p.h"
+
+#include <QGraphicsSceneMouseEvent>
+#include <QIntValidator>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeTextInputPrivate;
+class QValidator;
+class Q_DECLARATIVE_EXPORT QDeclarativeTextInput : public QDeclarativePaintedItem
+{
+    Q_OBJECT
+    Q_ENUMS(HAlignment)
+    Q_ENUMS(EchoMode)
+
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+    Q_PROPERTY(QColor selectionColor READ selectionColor WRITE setSelectionColor NOTIFY selectionColorChanged)
+    Q_PROPERTY(QColor selectedTextColor READ selectedTextColor WRITE setSelectedTextColor NOTIFY selectedTextColorChanged)
+    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
+    Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign NOTIFY horizontalAlignmentChanged)
+
+    Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly NOTIFY readOnlyChanged)
+    Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged)
+    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
+    Q_PROPERTY(QRect cursorRect READ cursorRect NOTIFY cursorPositionChanged)
+    Q_PROPERTY(QDeclarativeComponent *cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
+    Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged)
+    Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged)
+    Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectedTextChanged)
+
+    Q_PROPERTY(int maximumLength READ maxLength WRITE setMaxLength NOTIFY maximumLengthChanged)
+    Q_PROPERTY(QValidator* validator READ validator WRITE setValidator NOTIFY validatorChanged)
+    Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged)
+    Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints)
+
+    Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged)
+    Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged)
+    Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY focusOnPressChanged)
+
+public:
+    QDeclarativeTextInput(QDeclarativeItem* parent=0);
+    ~QDeclarativeTextInput();
+
+    enum EchoMode {//To match QLineEdit::EchoMode
+        Normal,
+        NoEcho,
+        Password,
+        PasswordEchoOnEdit
+    };
+
+    enum HAlignment {
+        AlignLeft = Qt::AlignLeft,
+        AlignRight = Qt::AlignRight,
+        AlignHCenter = Qt::AlignHCenter
+    };
+
+    //### Should we have this function, x based properties,
+    //### or copy TextEdit with x instead of QTextCursor?
+    Q_INVOKABLE int xToPos(int x);
+
+    QString text() const;
+    void setText(const QString &);
+
+    QFont font() const;
+    void setFont(const QFont &font);
+
+    QColor color() const;
+    void setColor(const QColor &c);
+
+    QColor selectionColor() const;
+    void setSelectionColor(const QColor &c);
+
+    QColor selectedTextColor() const;
+    void setSelectedTextColor(const QColor &c);
+
+    HAlignment hAlign() const;
+    void setHAlign(HAlignment align);
+
+    bool isReadOnly() const;
+    void setReadOnly(bool);
+
+    bool isCursorVisible() const;
+    void setCursorVisible(bool on);
+
+    int cursorPosition() const;
+    void setCursorPosition(int cp);
+
+    QRect cursorRect() const;
+
+    int selectionStart() const;
+    void setSelectionStart(int);
+
+    int selectionEnd() const;
+    void setSelectionEnd(int);
+
+    QString selectedText() const;
+
+    int maxLength() const;
+    void setMaxLength(int ml);
+
+    QValidator * validator() const;
+    void setValidator(QValidator* v);
+
+    QString inputMask() const;
+    void setInputMask(const QString &im);
+
+    EchoMode echoMode() const;
+    void setEchoMode(EchoMode echo);
+
+    QDeclarativeComponent* cursorDelegate() const;
+    void setCursorDelegate(QDeclarativeComponent*);
+
+    bool focusOnPress() const;
+    void setFocusOnPress(bool);
+
+    bool hasAcceptableInput() const;
+
+    void drawContents(QPainter *p,const QRect &r);
+    QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
+
+Q_SIGNALS:
+    void textChanged();
+    void cursorPositionChanged();
+    void selectionStartChanged();
+    void selectionEndChanged();
+    void selectedTextChanged();
+    void accepted();
+    void acceptableInputChanged();
+    void colorChanged(const QColor &color);
+    void selectionColorChanged(const QColor &color);
+    void selectedTextColorChanged(const QColor &color);
+    void fontChanged(const QFont &font);
+    void horizontalAlignmentChanged(HAlignment alignment);
+    void readOnlyChanged(bool isReadOnly);
+    void cursorVisibleChanged(bool isCursorVisible);
+    void cursorDelegateChanged();
+    void maximumLengthChanged(int maximumLength);
+    void validatorChanged();
+    void inputMaskChanged(const QString &inputMask);
+    void echoModeChanged(EchoMode echoMode);
+    void focusOnPressChanged(bool focusOnPress);
+
+protected:
+    virtual void geometryChanged(const QRectF &newGeometry,
+                                 const QRectF &oldGeometry);
+
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void keyPressEvent(QKeyEvent* ev);
+    bool event(QEvent *e);
+
+    void focusChanged(bool hasFocus);
+
+public Q_SLOTS:
+    void selectAll();
+
+private Q_SLOTS:
+    void updateSize(bool needsRedraw = true);
+    void q_textChanged();
+    void selectionChanged();
+    void createCursor();
+    void moveCursor();
+    void cursorPosChanged();
+    void updateRect(const QRect &r = QRect());
+
+private:
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeTextInput)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeTextInput)
+QML_DECLARE_TYPE(QValidator)
+QML_DECLARE_TYPE(QIntValidator)
+#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
+QML_DECLARE_TYPE(QDoubleValidator)
+QML_DECLARE_TYPE(QRegExpValidator)
+#endif
+
+QT_END_HEADER
+
+#endif // QDECLARATIVETEXTINPUT_H
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
new file mode 100644
index 0000000..3d28f40
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETEXTINPUT_P_H
+#define QDECLARATIVETEXTINPUT_P_H
+
+#include "qdeclarativetextinput_p.h"
+
+#include "qdeclarativepainteditem_p_p.h"
+
+#include <qdeclarative.h>
+
+#include <QPointer>
+
+#include <private/qlinecontrol_p.h>
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeTextInputPrivate : public QDeclarativePaintedItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeTextInput)
+public:
+    QDeclarativeTextInputPrivate() : control(new QLineControl(QString())),
+                 color((QRgb)0), style(QDeclarativeText::Normal),
+                 styleColor((QRgb)0), hAlign(QDeclarativeTextInput::AlignLeft),
+                 hscroll(0), oldScroll(0), focused(false), focusOnPress(true),
+                 cursorVisible(false)
+    {
+    }
+
+    ~QDeclarativeTextInputPrivate()
+    {
+        delete control;
+    }
+
+    void init();
+    void startCreatingCursor();
+
+    QLineControl* control;
+
+    QFont font;
+    QColor  color;
+    QColor  selectionColor;
+    QColor  selectedTextColor;
+    QDeclarativeText::TextStyle style;
+    QColor  styleColor;
+    QDeclarativeTextInput::HAlignment hAlign;
+    QPointer<QDeclarativeComponent> cursorComponent;
+    QPointer<QDeclarativeItem> cursorItem;
+
+    int lastSelectionStart;
+    int lastSelectionEnd;
+    int oldHeight;
+    int oldWidth;
+    bool oldValidity;
+    int hscroll;
+    int oldScroll;
+    bool focused;
+    bool focusOnPress;
+    bool cursorVisible;
+};
+
+QT_END_NAMESPACE
+
+#endif
+
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
new file mode 100644
index 0000000..bfe8db9
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -0,0 +1,1256 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativevisualitemmodel_p.h"
+
+#include "qdeclarativeitem.h"
+
+#include <qdeclarativecontext.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativeexpression.h>
+#include <qdeclarativepackage_p.h>
+#include <qdeclarativeopenmetaobject_p.h>
+#include <qdeclarativelistaccessor_p.h>
+#include <qdeclarativeinfo.h>
+#include <qdeclarativedeclarativedata_p.h>
+#include <qdeclarativepropertycache_p.h>
+#include <qdeclarativeguard_p.h>
+
+#include <qlistmodelinterface_p.h>
+#include <qhash.h>
+#include <qlist.h>
+#include <qmetaobjectbuilder_p.h>
+#include <QtCore/qdebug.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QHash<QObject*, QDeclarativeVisualItemModelAttached*> QDeclarativeVisualItemModelAttached::attachedProperties;
+
+
+class QDeclarativeVisualItemModelPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeVisualItemModel)
+public:
+    QDeclarativeVisualItemModelPrivate() : QObjectPrivate() {}
+
+    static void children_append(QDeclarativeListProperty<QDeclarativeItem> *prop, QDeclarativeItem *item) {
+        item->QObject::setParent(prop->object);
+        static_cast<QDeclarativeVisualItemModelPrivate *>(prop->data)->children.append(item);
+        static_cast<QDeclarativeVisualItemModelPrivate *>(prop->data)->itemAppended();
+        static_cast<QDeclarativeVisualItemModelPrivate *>(prop->data)->emitChildrenChanged();
+    }
+
+    void itemAppended() {
+        Q_Q(QDeclarativeVisualItemModel);
+        QDeclarativeVisualItemModelAttached *attached = QDeclarativeVisualItemModelAttached::properties(children.last());
+        attached->setIndex(children.count()-1);
+        emit q->itemsInserted(children.count()-1, 1);
+        emit q->countChanged();
+    }
+
+    void emitChildrenChanged() {
+        Q_Q(QDeclarativeVisualItemModel);
+        emit q->childrenChanged();
+    }
+
+    QList<QDeclarativeItem *> children;
+};
+
+
+/*!
+    \qmlclass VisualItemModel QDeclarativeVisualItemModel
+  \since 4.7
+    \brief The VisualItemModel allows items to be provided to a view.
+
+    The children of the VisualItemModel are provided in a model which
+    can be used in a view.  Note that no delegate should be
+    provided to a view since the VisualItemModel contains the
+    visual delegate (items).
+
+    An item can determine its index within the
+    model via the VisualItemModel.index attached property.
+
+    The example below places three colored rectangles in a ListView.
+    \code
+    Item {
+        VisualItemModel {
+            id: itemModel
+            Rectangle { height: 30; width: 80; color: "red" }
+            Rectangle { height: 30; width: 80; color: "green" }
+            Rectangle { height: 30; width: 80; color: "blue" }
+        }
+
+        ListView {
+            anchors.fill: parent
+            model: itemModel
+        }
+    }
+    \endcode
+*/
+QDeclarativeVisualItemModel::QDeclarativeVisualItemModel()
+    : QDeclarativeVisualModel(*(new QDeclarativeVisualItemModelPrivate))
+{
+}
+
+QDeclarativeListProperty<QDeclarativeItem> QDeclarativeVisualItemModel::children()
+{
+    Q_D(QDeclarativeVisualItemModel);
+    return QDeclarativeListProperty<QDeclarativeItem>(this, d, QDeclarativeVisualItemModelPrivate::children_append);
+}
+
+/*!
+    \qmlproperty int VisualItemModel::count
+
+    The number of items in the model.  This property is readonly.
+*/
+int QDeclarativeVisualItemModel::count() const
+{
+    Q_D(const QDeclarativeVisualItemModel);
+    return d->children.count();
+}
+
+bool QDeclarativeVisualItemModel::isValid() const
+{
+    return true;
+}
+
+QDeclarativeItem *QDeclarativeVisualItemModel::item(int index, bool)
+{
+    Q_D(QDeclarativeVisualItemModel);
+    return d->children.at(index);
+}
+
+QDeclarativeVisualModel::ReleaseFlags QDeclarativeVisualItemModel::release(QDeclarativeItem *)
+{
+    // Nothing to do
+    return 0;
+}
+
+void QDeclarativeVisualItemModel::completeItem()
+{
+    // Nothing to do
+}
+
+QString QDeclarativeVisualItemModel::stringValue(int index, const QString &name)
+{
+    Q_D(QDeclarativeVisualItemModel);
+    if (index < 0 || index >= d->children.count())
+        return QString();
+    return QDeclarativeEngine::contextForObject(d->children.at(index))->contextProperty(name).toString();
+}
+
+QVariant QDeclarativeVisualItemModel::evaluate(int index, const QString &expression, QObject *objectContext)
+{
+    Q_D(QDeclarativeVisualItemModel);
+    if (index < 0 || index >= d->children.count())
+        return QVariant();
+    QDeclarativeContext *ccontext = qmlContext(this);
+    QDeclarativeContext *ctxt = new QDeclarativeContext(ccontext);
+    ctxt->addDefaultObject(d->children.at(index));
+    QDeclarativeExpression e(ctxt, expression, objectContext);
+    QVariant value = e.value();
+    delete ctxt;
+    return value;
+}
+
+int QDeclarativeVisualItemModel::indexOf(QDeclarativeItem *item, QObject *) const
+{
+    Q_D(const QDeclarativeVisualItemModel);
+    return d->children.indexOf(item);
+}
+
+QDeclarativeVisualItemModelAttached *QDeclarativeVisualItemModel::qmlAttachedProperties(QObject *obj)
+{
+    return QDeclarativeVisualItemModelAttached::properties(obj);
+}
+
+//============================================================================
+
+class VDMDelegateDataType : public QDeclarativeOpenMetaObjectType
+{
+public:
+    VDMDelegateDataType(const QMetaObject *base, QDeclarativeEngine *engine) : QDeclarativeOpenMetaObjectType(base, engine) {}
+
+    void propertyCreated(int, QMetaPropertyBuilder &prop) {
+        prop.setWritable(false);
+    }
+};
+
+class QDeclarativeVisualDataModelParts;
+class QDeclarativeVisualDataModelData;
+class QDeclarativeVisualDataModelPrivate : public QObjectPrivate
+{
+public:
+    QDeclarativeVisualDataModelPrivate(QDeclarativeContext *);
+
+    static QDeclarativeVisualDataModelPrivate *get(QDeclarativeVisualDataModel *m) {
+        return static_cast<QDeclarativeVisualDataModelPrivate *>(QObjectPrivate::get(m));
+    }
+
+    QDeclarativeGuard<QListModelInterface> m_listModelInterface;
+    QDeclarativeGuard<QAbstractItemModel> m_abstractItemModel;
+    QDeclarativeGuard<QDeclarativeVisualDataModel> m_visualItemModel;
+    QString m_part;
+
+    QDeclarativeComponent *m_delegate;
+    QDeclarativeContext *m_context;
+    QList<int> m_roles;
+    QHash<QByteArray,int> m_roleNames;
+    void ensureRoles() {
+        if (m_roleNames.isEmpty()) {
+            if (m_listModelInterface) {
+                m_roles = m_listModelInterface->roles();
+                for (int ii = 0; ii < m_roles.count(); ++ii)
+                    m_roleNames.insert(m_listModelInterface->toString(m_roles.at(ii)).toUtf8(), m_roles.at(ii));
+                if (m_roles.count() == 1)
+                    m_roleNames.insert("modelData", m_roles.at(0));
+            } else if (m_abstractItemModel) {
+                for (QHash<int,QByteArray>::const_iterator it = m_abstractItemModel->roleNames().begin();
+                        it != m_abstractItemModel->roleNames().end(); ++it) {
+                    m_roles.append(it.key());
+                    m_roleNames.insert(*it, it.key());
+                }
+                if (m_roles.count() == 1)
+                    m_roleNames.insert("modelData", m_roles.at(0));
+            } else if (m_listAccessor) {
+                m_roleNames.insert("modelData", 0);
+                if (m_listAccessor->type() == QDeclarativeListAccessor::Instance) {
+                    if (QObject *object = m_listAccessor->at(0).value<QObject*>()) {
+                        int count = object->metaObject()->propertyCount();
+                        for (int ii = 1; ii < count; ++ii) {
+                            const QMetaProperty &prop = object->metaObject()->property(ii);
+                            m_roleNames.insert(prop.name(), 0);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    void createMetaData() {
+        if (!m_metaDataCreated) {
+            ensureRoles();
+            QHash<QByteArray, int>::const_iterator it = m_roleNames.begin();
+            while (it != m_roleNames.end()) {
+                m_delegateDataType->createProperty(it.key());
+                ++it;
+            }
+            m_metaDataCreated = true;
+        }
+    }
+
+    struct ObjectRef {
+        ObjectRef(QObject *object=0) : obj(object), ref(1) {}
+        QObject *obj;
+        int ref;
+    };
+    class Cache : public QHash<int, ObjectRef> {
+    public:
+        QObject *getItem(int index) {
+            QObject *item = 0;
+            QHash<int,ObjectRef>::iterator it = find(index);
+            if (it != end()) {
+                (*it).ref++;
+                item = (*it).obj;
+            }
+            return item;
+        }
+        QObject *item(int index) {
+            QObject *item = 0;
+            QHash<int, ObjectRef>::const_iterator it = find(index);
+            if (it != end())
+                item = (*it).obj;
+            return item;
+        }
+        void insertItem(int index, QObject *obj) {
+            insert(index, ObjectRef(obj));
+        }
+        bool releaseItem(QObject *obj) {
+            QHash<int, ObjectRef>::iterator it = begin();
+            for (; it != end(); ++it) {
+                ObjectRef &objRef = *it;
+                if (objRef.obj == obj) {
+                    if (--objRef.ref == 0) {
+                        erase(it);
+                        return true;
+                    }
+                    break;
+                }
+            }
+            return false;
+        }
+    };
+
+    int modelCount() const {
+        if (m_visualItemModel)
+            return m_visualItemModel->count();
+        if (m_listModelInterface)
+            return m_listModelInterface->count();
+        if (m_abstractItemModel)
+            return m_abstractItemModel->rowCount(m_root);
+        if (m_listAccessor)
+            return m_listAccessor->count();
+        return 0;
+    }
+
+    Cache m_cache;
+    QHash<QObject *, QDeclarativePackage*> m_packaged;
+
+    QDeclarativeVisualDataModelParts *m_parts;
+    friend class QDeclarativeVisualItemParts;
+
+    VDMDelegateDataType *m_delegateDataType;
+    friend class QDeclarativeVisualDataModelData;
+    bool m_metaDataCreated;
+    bool m_metaDataCacheable;
+
+    QDeclarativeVisualDataModelData *data(QObject *item);
+
+    QVariant m_modelVariant;
+    QDeclarativeListAccessor *m_listAccessor;
+
+    QModelIndex m_root;
+};
+
+class QDeclarativeVisualDataModelDataMetaObject : public QDeclarativeOpenMetaObject
+{
+public:
+    QDeclarativeVisualDataModelDataMetaObject(QObject *parent, QDeclarativeOpenMetaObjectType *type)
+    : QDeclarativeOpenMetaObject(parent, type) {}
+
+    virtual QVariant initialValue(int);
+    virtual int createProperty(const char *, const char *);
+
+private:
+    friend class QDeclarativeVisualDataModelData;
+    QHash<int,int> roleToProp;
+};
+
+class QDeclarativeVisualDataModelData : public QObject
+{
+Q_OBJECT
+public:
+    QDeclarativeVisualDataModelData(int index, QDeclarativeVisualDataModel *model);
+    ~QDeclarativeVisualDataModelData();
+
+    Q_PROPERTY(int index READ index NOTIFY indexChanged)
+    int index() const;
+    void setIndex(int index);
+
+    int propForRole(int) const;
+    void setValue(int, const QVariant &);
+
+Q_SIGNALS:
+    void indexChanged();
+
+private:
+    friend class QDeclarativeVisualDataModelDataMetaObject;
+    int m_index;
+    QDeclarativeGuard<QDeclarativeVisualDataModel> m_model;
+    QDeclarativeVisualDataModelDataMetaObject *m_meta;
+};
+
+int QDeclarativeVisualDataModelData::propForRole(int id) const
+{
+    QHash<int,int>::const_iterator it = m_meta->roleToProp.find(id);
+    if (it != m_meta->roleToProp.end())
+        return m_meta->roleToProp[id];
+    return -1;
+}
+
+void QDeclarativeVisualDataModelData::setValue(int id, const QVariant &val)
+{
+    m_meta->setValue(id, val);
+}
+
+int QDeclarativeVisualDataModelDataMetaObject::createProperty(const char *name, const char *type)
+{
+    QDeclarativeVisualDataModelData *data =
+        static_cast<QDeclarativeVisualDataModelData *>(object());
+
+    if (!data->m_model)
+        return -1;
+
+    QDeclarativeVisualDataModelPrivate *model = QDeclarativeVisualDataModelPrivate::get(data->m_model);
+
+    if ((!model->m_listModelInterface || !model->m_abstractItemModel) && model->m_listAccessor) {
+        if (model->m_listAccessor->type() == QDeclarativeListAccessor::ListProperty) {
+            model->ensureRoles();
+            QObject *object = model->m_listAccessor->at(data->m_index).value<QObject*>();
+            if (object && (object->property(name).isValid() || qstrcmp(name,"modelData")==0))
+                return QDeclarativeOpenMetaObject::createProperty(name, type);
+        }
+    }
+    return -1;
+}
+
+QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId)
+{
+    QDeclarativeVisualDataModelData *data =
+        static_cast<QDeclarativeVisualDataModelData *>(object());
+
+    Q_ASSERT(data->m_model);
+    QDeclarativeVisualDataModelPrivate *model = QDeclarativeVisualDataModelPrivate::get(data->m_model);
+
+    QByteArray propName = name(propId);
+    if ((!model->m_listModelInterface || !model->m_abstractItemModel) && model->m_listAccessor) {
+        if (propName == "modelData") {
+            if (model->m_listAccessor->type() == QDeclarativeListAccessor::Instance) {
+                QObject *object = model->m_listAccessor->at(0).value<QObject*>();
+                return object->metaObject()->property(1).read(object); // the first property after objectName
+            }
+            return model->m_listAccessor->at(data->m_index);
+        } else {
+            // return any property of a single object instance.
+            QObject *object = model->m_listAccessor->at(data->m_index).value<QObject*>();
+            return object->property(propName);
+        }
+    } else if (model->m_listModelInterface) {
+        model->ensureRoles();
+        QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
+        if (it != model->m_roleNames.end()) {
+            roleToProp.insert(*it, propId);
+            QVariant value = model->m_listModelInterface->data(data->m_index, *it);
+            return value;
+        } else if (model->m_roles.count() == 1 && propName == "modelData") {
+            //for compatability with other lists, assign modelData if there is only a single role
+            roleToProp.insert(model->m_roles.first(), propId);
+            QVariant value = model->m_listModelInterface->data(data->m_index, model->m_roles.first());
+            return value;
+        }
+    } else if (model->m_abstractItemModel) {
+        model->ensureRoles();
+        QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
+        if (it != model->m_roleNames.end()) {
+            roleToProp.insert(*it, propId);
+            QModelIndex index = model->m_abstractItemModel->index(data->m_index, 0, model->m_root);
+            return model->m_abstractItemModel->data(index, *it);
+        }
+    }
+    Q_ASSERT(!"Can never be reached");
+    return QVariant();
+}
+
+QDeclarativeVisualDataModelData::QDeclarativeVisualDataModelData(int index,
+                                               QDeclarativeVisualDataModel *model)
+: m_index(index), m_model(model), 
+m_meta(new QDeclarativeVisualDataModelDataMetaObject(this, QDeclarativeVisualDataModelPrivate::get(model)->m_delegateDataType))
+{
+    QDeclarativeVisualDataModelPrivate *modelPriv = QDeclarativeVisualDataModelPrivate::get(model);
+    if (modelPriv->m_metaDataCacheable) {
+        if (!modelPriv->m_metaDataCreated)
+            modelPriv->createMetaData();
+        m_meta->setCached(true);
+    }
+}
+
+QDeclarativeVisualDataModelData::~QDeclarativeVisualDataModelData()
+{
+}
+
+int QDeclarativeVisualDataModelData::index() const
+{
+    return m_index;
+}
+
+// This is internal only - it should not be set from qml
+void QDeclarativeVisualDataModelData::setIndex(int index)
+{
+    m_index = index;
+    emit indexChanged();
+}
+
+//---------------------------------------------------------------------------
+
+class QDeclarativeVisualDataModelPartsMetaObject : public QDeclarativeOpenMetaObject
+{
+public:
+    QDeclarativeVisualDataModelPartsMetaObject(QObject *parent)
+    : QDeclarativeOpenMetaObject(parent) {}
+
+    virtual void propertyCreated(int, QMetaPropertyBuilder &);
+    virtual QVariant initialValue(int);
+};
+
+class QDeclarativeVisualDataModelParts : public QObject
+{
+Q_OBJECT
+public:
+    QDeclarativeVisualDataModelParts(QDeclarativeVisualDataModel *parent);
+
+private:
+    friend class QDeclarativeVisualDataModelPartsMetaObject;
+    QDeclarativeVisualDataModel *model;
+};
+
+void QDeclarativeVisualDataModelPartsMetaObject::propertyCreated(int, QMetaPropertyBuilder &prop)
+{
+    prop.setWritable(false);
+}
+
+QVariant QDeclarativeVisualDataModelPartsMetaObject::initialValue(int id)
+{
+    QDeclarativeVisualDataModel *m = new QDeclarativeVisualDataModel;
+    m->setParent(object());
+    m->setPart(QString::fromUtf8(name(id)));
+    m->setModel(QVariant::fromValue(static_cast<QDeclarativeVisualDataModelParts *>(object())->model));
+
+    QVariant var = QVariant::fromValue((QObject *)m);
+    return var;
+}
+
+QDeclarativeVisualDataModelParts::QDeclarativeVisualDataModelParts(QDeclarativeVisualDataModel *parent)
+: QObject(parent), model(parent) 
+{
+    new QDeclarativeVisualDataModelPartsMetaObject(this);
+}
+
+QDeclarativeVisualDataModelPrivate::QDeclarativeVisualDataModelPrivate(QDeclarativeContext *ctxt)
+: m_listModelInterface(0), m_abstractItemModel(0), m_visualItemModel(0), m_delegate(0)
+, m_context(ctxt), m_parts(0), m_delegateDataType(0), m_metaDataCreated(false)
+, m_metaDataCacheable(false), m_listAccessor(0)
+{
+}
+
+QDeclarativeVisualDataModelData *QDeclarativeVisualDataModelPrivate::data(QObject *item)
+{
+    QDeclarativeVisualDataModelData *dataItem =
+        item->findChild<QDeclarativeVisualDataModelData *>();
+    Q_ASSERT(dataItem);
+    return dataItem;
+}
+
+//---------------------------------------------------------------------------
+
+/*!
+    \qmlclass VisualDataModel QDeclarativeVisualDataModel
+    \brief The VisualDataModel encapsulates a model and delegate
+
+    A VisualDataModel encapsulates a model and the delegate that will
+    be instantiated for items in the model.
+
+    It is usually not necessary to create a VisualDataModel directly,
+    since the QML views will create one internally.
+
+    The example below illustrates using a VisualDataModel with a ListView.
+
+    \code
+    VisualDataModel {
+        id: visualModel
+        model: myModel
+        delegate: Component {
+            Rectangle {
+                height: 25
+                width: 100
+                Text { text: "Name:" + name}
+            }
+        }
+    }
+    ListView {
+        width: 100
+        height: 100
+        anchors.fill: parent
+        model: visualModel
+    }
+    \endcode
+*/
+
+QDeclarativeVisualDataModel::QDeclarativeVisualDataModel()
+: QDeclarativeVisualModel(*(new QDeclarativeVisualDataModelPrivate(0)))
+{
+}
+
+QDeclarativeVisualDataModel::QDeclarativeVisualDataModel(QDeclarativeContext *ctxt)
+: QDeclarativeVisualModel(*(new QDeclarativeVisualDataModelPrivate(ctxt)))
+{
+}
+
+QDeclarativeVisualDataModel::~QDeclarativeVisualDataModel()
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (d->m_listAccessor)
+        delete d->m_listAccessor;
+    if (d->m_delegateDataType)
+        d->m_delegateDataType->release();
+}
+
+/*!
+    \qmlproperty model VisualDataModel::model
+    This property holds the model providing data for the VisualDataModel.
+
+    The model provides a set of data that is used to create the items
+    for a view.  For large or dynamic datasets the model is usually
+    provided by a C++ model object.  The C++ model object must be a \l
+    {QAbstractItemModel} subclass or a simple list.
+
+    Models can also be created directly in QML, using a \l{ListModel} or
+    \l{XmlListModel}.
+
+    \sa {qmlmodels}{Data Models}
+*/
+QVariant QDeclarativeVisualDataModel::model() const
+{
+    Q_D(const QDeclarativeVisualDataModel);
+    return d->m_modelVariant;
+}
+
+void QDeclarativeVisualDataModel::setModel(const QVariant &model)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    delete d->m_listAccessor;
+    d->m_listAccessor = 0;
+    d->m_modelVariant = model;
+    if (d->m_listModelInterface) {
+        // Assume caller has released all items.
+        QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsChanged(int,int,QList<int>)),
+                this, SLOT(_q_itemsChanged(int,int,QList<int>)));
+        QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsInserted(int,int)),
+                this, SLOT(_q_itemsInserted(int,int)));
+        QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsRemoved(int,int)),
+                this, SLOT(_q_itemsRemoved(int,int)));
+        QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsMoved(int,int,int)),
+                this, SLOT(_q_itemsMoved(int,int,int)));
+        d->m_listModelInterface = 0;
+    } else if (d->m_abstractItemModel) {
+        QObject::disconnect(d->m_abstractItemModel, SIGNAL(rowsInserted(const QModelIndex &,int,int)),
+                            this, SLOT(_q_rowsInserted(const QModelIndex &,int,int)));
+        QObject::disconnect(d->m_abstractItemModel, SIGNAL(rowsRemoved(const QModelIndex &,int,int)),
+                            this, SLOT(_q_rowsRemoved(const QModelIndex &,int,int)));
+        QObject::disconnect(d->m_abstractItemModel, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)),
+                            this, SLOT(_q_dataChanged(const QModelIndex&,const QModelIndex&)));
+        QObject::disconnect(d->m_abstractItemModel, SIGNAL(rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)),
+                            this, SLOT(_q_rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)));
+    } else if (d->m_visualItemModel) {
+        QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsInserted(int,int)),
+                         this, SIGNAL(itemsInserted(int,int)));
+        QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsRemoved(int,int)),
+                         this, SIGNAL(itemsRemoved(int,int)));
+        QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsMoved(int,int,int)),
+                         this, SIGNAL(itemsMoved(int,int,int)));
+        QObject::disconnect(d->m_visualItemModel, SIGNAL(createdPackage(int,QDeclarativePackage*)),
+                         this, SLOT(_q_createdPackage(int,QDeclarativePackage*)));
+        QObject::disconnect(d->m_visualItemModel, SIGNAL(destroyingPackage(QDeclarativePackage*)),
+                         this, SLOT(_q_destroyingPackage(QDeclarativePackage*)));
+        d->m_visualItemModel = 0;
+    }
+
+    d->m_roles.clear();
+    d->m_roleNames.clear();
+    if (d->m_delegateDataType)
+        d->m_delegateDataType->release();
+    d->m_metaDataCreated = 0;
+    d->m_metaDataCacheable = false;
+    d->m_delegateDataType = new VDMDelegateDataType(&QDeclarativeVisualDataModelData::staticMetaObject, d->m_context?d->m_context->engine():qmlEngine(this));
+
+    QObject *object = qvariant_cast<QObject *>(model);
+    if (object && (d->m_listModelInterface = qobject_cast<QListModelInterface *>(object))) {
+        QObject::connect(d->m_listModelInterface, SIGNAL(itemsChanged(int,int,QList<int>)),
+                         this, SLOT(_q_itemsChanged(int,int,QList<int>)));
+        QObject::connect(d->m_listModelInterface, SIGNAL(itemsInserted(int,int)),
+                         this, SLOT(_q_itemsInserted(int,int)));
+        QObject::connect(d->m_listModelInterface, SIGNAL(itemsRemoved(int,int)),
+                         this, SLOT(_q_itemsRemoved(int,int)));
+        QObject::connect(d->m_listModelInterface, SIGNAL(itemsMoved(int,int,int)),
+                         this, SLOT(_q_itemsMoved(int,int,int)));
+        d->m_metaDataCacheable = true;
+        if (d->m_delegate && d->m_listModelInterface->count())
+            emit itemsInserted(0, d->m_listModelInterface->count());
+        return;
+    } else if (object && (d->m_abstractItemModel = qobject_cast<QAbstractItemModel *>(object))) {
+        QObject::connect(d->m_abstractItemModel, SIGNAL(rowsInserted(const QModelIndex &,int,int)),
+                            this, SLOT(_q_rowsInserted(const QModelIndex &,int,int)));
+        QObject::connect(d->m_abstractItemModel, SIGNAL(rowsRemoved(const QModelIndex &,int,int)),
+                            this, SLOT(_q_rowsRemoved(const QModelIndex &,int,int)));
+        QObject::connect(d->m_abstractItemModel, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)),
+                            this, SLOT(_q_dataChanged(const QModelIndex&,const QModelIndex&)));
+        QObject::connect(d->m_abstractItemModel, SIGNAL(rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)),
+                            this, SLOT(_q_rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)));
+        d->m_metaDataCacheable = true;
+        return;
+    }
+    if ((d->m_visualItemModel = qvariant_cast<QDeclarativeVisualDataModel *>(model))) {
+        QObject::connect(d->m_visualItemModel, SIGNAL(itemsInserted(int,int)),
+                         this, SIGNAL(itemsInserted(int,int)));
+        QObject::connect(d->m_visualItemModel, SIGNAL(itemsRemoved(int,int)),
+                         this, SIGNAL(itemsRemoved(int,int)));
+        QObject::connect(d->m_visualItemModel, SIGNAL(itemsMoved(int,int,int)),
+                         this, SIGNAL(itemsMoved(int,int,int)));
+        QObject::connect(d->m_visualItemModel, SIGNAL(createdPackage(int,QDeclarativePackage*)),
+                         this, SLOT(_q_createdPackage(int,QDeclarativePackage*)));
+        QObject::connect(d->m_visualItemModel, SIGNAL(destroyingPackage(QDeclarativePackage*)),
+                         this, SLOT(_q_destroyingPackage(QDeclarativePackage*)));
+        return;
+    }
+    d->m_listAccessor = new QDeclarativeListAccessor;
+    d->m_listAccessor->setList(model, d->m_context?d->m_context->engine():qmlEngine(this));
+    if (d->m_listAccessor->type() != QDeclarativeListAccessor::ListProperty)
+        d->m_metaDataCacheable = true;
+    if (d->m_delegate && d->modelCount()) {
+        emit itemsInserted(0, d->modelCount());
+        emit countChanged();
+    }
+}
+
+/*!
+    \qmlproperty component VisualDataModel::delegate
+
+    The delegate provides a template defining each item instantiated by a view.
+    The index is exposed as an accessible \c index property.  Properties of the
+    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
+
+    Here is an example delegate:
+    \snippet doc/src/snippets/declarative/listview/listview.qml 0
+*/
+QDeclarativeComponent *QDeclarativeVisualDataModel::delegate() const
+{
+    Q_D(const QDeclarativeVisualDataModel);
+    if (d->m_visualItemModel)
+        return d->m_visualItemModel->delegate();
+    return d->m_delegate;
+}
+
+void QDeclarativeVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    bool wasValid = d->m_delegate != 0;
+    d->m_delegate = delegate;
+    if (!wasValid && d->modelCount() && d->m_delegate) {
+        emit itemsInserted(0, d->modelCount());
+        emit countChanged();
+    }
+    if (wasValid && !d->m_delegate && d->modelCount()) {
+        emit itemsRemoved(0, d->modelCount());
+        emit countChanged();
+    }
+}
+
+/*!
+    \qmlproperty QModelIndex VisualDataModel::rootIndex
+
+    QAbstractItemModel provides a heirachical tree of data, whereas
+    QML only operates on list data. rootIndex allows the children of
+    any node in a QAbstractItemModel to be provided by this model.
+
+    This property only affects models of type QAbstractItemModel.
+
+    \code
+    // main.cpp
+    Q_DECLARE_METATYPE(QModelIndex)
+
+    class MyModel : public QDirModel
+    {
+        Q_OBJECT
+    public:
+        MyModel(QDeclarativeContext *ctxt) : QDirModel(), context(ctxt) {
+            QHash<int,QByteArray> roles = roleNames();
+            roles.insert(FilePathRole, "path");
+            setRoleNames(roles);
+            context->setContextProperty("myModel", this);
+            context->setContextProperty("myRoot", QVariant::fromValue(index(0,0,QModelIndex())));
+        }
+
+        Q_INVOKABLE void setRoot(const QString &path) {
+            QModelIndex root = index(path);
+            context->setContextProperty("myRoot", QVariant::fromValue(root));
+        }
+
+        QDeclarativeContext *context;
+    };
+
+    int main(int argc, char ** argv)
+    {
+        QApplication app(argc, argv);
+
+        QDeclarativeView view;
+
+        MyModel model(view.rootContext());
+
+        view.setSource(QUrl("qrc:view.qml"));
+        view.show();
+
+        return app.exec();
+    }
+
+    #include "main.moc"
+    \endcode
+
+    \code
+    // view.qml
+    import Qt 4.6
+
+    ListView {
+        width: 200
+        height: 200
+        model: VisualDataModel {
+            model: myModel
+            rootIndex: myRoot
+            delegate: Component {
+                Rectangle {
+                    height: 25; width: 100
+                    Text { text: path }
+                    MouseRegion {
+                        anchors.fill: parent;
+                        onClicked: myModel.setRoot(path)
+                    }
+                }
+            }
+        }
+    }
+    \endcode
+
+*/
+QModelIndex QDeclarativeVisualDataModel::rootIndex() const
+{
+    Q_D(const QDeclarativeVisualDataModel);
+    return d->m_root;
+}
+
+void QDeclarativeVisualDataModel::setRootIndex(const QModelIndex &root)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (d->m_root != root) {
+        int oldCount = d->modelCount();
+        d->m_root = root;
+        int newCount = d->modelCount();
+        if (d->m_delegate && oldCount)
+            emit itemsRemoved(0, oldCount);
+        if (d->m_delegate && newCount)
+            emit itemsInserted(0, newCount);
+        if (newCount != oldCount)
+            emit countChanged();
+        emit rootIndexChanged();
+    }
+}
+
+QString QDeclarativeVisualDataModel::part() const
+{
+    Q_D(const QDeclarativeVisualDataModel);
+    return d->m_part;
+}
+
+void QDeclarativeVisualDataModel::setPart(const QString &part)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    d->m_part = part;
+}
+
+int QDeclarativeVisualDataModel::count() const
+{
+    Q_D(const QDeclarativeVisualDataModel);
+    return d->modelCount();
+}
+
+QDeclarativeItem *QDeclarativeVisualDataModel::item(int index, bool complete)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (d->m_visualItemModel)
+        return d->m_visualItemModel->item(index, d->m_part.toUtf8(), complete);
+    return item(index, QByteArray(), complete);
+}
+
+/*
+  Returns ReleaseStatus flags.
+*/
+QDeclarativeVisualDataModel::ReleaseFlags QDeclarativeVisualDataModel::release(QDeclarativeItem *item)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (d->m_visualItemModel)
+        return d->m_visualItemModel->release(item);
+
+    ReleaseFlags stat = 0;
+    QObject *obj = item;
+    bool inPackage = false;
+
+    QHash<QObject*,QDeclarativePackage*>::iterator it = d->m_packaged.find(item);
+    if (it != d->m_packaged.end()) {
+        QDeclarativePackage *package = *it;
+        d->m_packaged.erase(it);
+        if (d->m_packaged.contains(item))
+            stat |= Referenced;
+        inPackage = true;
+        obj = package; // fall through and delete
+    }
+
+    if (d->m_cache.releaseItem(obj)) {
+        if (inPackage) {
+            emit destroyingPackage(qobject_cast<QDeclarativePackage*>(obj));
+        } else {
+            item->setVisible(false);
+            static_cast<QGraphicsItem*>(item)->setParentItem(0);
+        }
+        stat |= Destroyed;
+        obj->deleteLater();
+    } else if (!inPackage) {
+        stat |= Referenced;
+    }
+
+    return stat;
+}
+
+QObject *QDeclarativeVisualDataModel::parts()
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (!d->m_parts) 
+        d->m_parts = new QDeclarativeVisualDataModelParts(this);
+    return d->m_parts;
+}
+
+QDeclarativeItem *QDeclarativeVisualDataModel::item(int index, const QByteArray &viewId, bool complete)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (d->m_visualItemModel)
+        return d->m_visualItemModel->item(index, viewId, complete);
+
+    if (d->modelCount() <= 0 || !d->m_delegate)
+        return 0;
+    QObject *nobj = d->m_cache.getItem(index);
+    if (!nobj) {
+        QDeclarativeContext *ccontext = d->m_context;
+        if (!ccontext) ccontext = qmlContext(this);
+        QDeclarativeContext *ctxt = new QDeclarativeContext(ccontext);
+        QDeclarativeVisualDataModelData *data = new QDeclarativeVisualDataModelData(index, this);
+        ctxt->setContextProperty(QLatin1String("model"), data);
+        ctxt->addDefaultObject(data);
+        nobj = d->m_delegate->beginCreate(ctxt);
+        if (complete)
+            d->m_delegate->completeCreate();
+        if (nobj) {
+            ctxt->setParent(nobj);
+            data->setParent(nobj);
+            d->m_cache.insertItem(index, nobj);
+            if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(nobj))
+                emit createdPackage(index, package);
+        } else {
+            delete data;
+            delete ctxt;
+            qWarning() << d->m_delegate->errors();
+        }
+    }
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(nobj);
+    if (!item) {
+        QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(nobj);
+        if (package) {
+            QObject *o = package->part(QString::fromUtf8(viewId));
+            item = qobject_cast<QDeclarativeItem *>(o);
+            if (item)
+                d->m_packaged.insertMulti(item, package);
+        }
+    }
+    if (!item) {
+        d->m_cache.releaseItem(nobj);
+        qmlInfo(d->m_delegate) << QDeclarativeVisualDataModel::tr("Delegate component must be Item type.");
+    }
+
+    return item;
+}
+
+void QDeclarativeVisualDataModel::completeItem()
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (d->m_visualItemModel) {
+        d->m_visualItemModel->completeItem();
+        return;
+    }
+
+    d->m_delegate->completeCreate();
+}
+
+QString QDeclarativeVisualDataModel::stringValue(int index, const QString &name)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (d->m_visualItemModel)
+        return d->m_visualItemModel->stringValue(index, name);
+
+    if ((!d->m_listModelInterface && !d->m_abstractItemModel) || !d->m_delegate)
+        return QString();
+
+    QString val;
+    QObject *data = 0;
+    bool tempData = false;
+
+    if (QObject *nobj = d->m_cache.item(index))
+        data = d->data(nobj);
+    if (!data) {
+        data = new QDeclarativeVisualDataModelData(index, this);
+        tempData = true;
+    }
+
+    QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(data);
+    if (ddata && ddata->propertyCache) {
+        QDeclarativePropertyCache::Data *prop = ddata->propertyCache->property(name);
+        if (prop) {
+            if (prop->propType == QVariant::String) {
+                void *args[] = { &val, 0 };
+                QMetaObject::metacall(data, QMetaObject::ReadProperty, prop->coreIndex, args);
+            } else if (prop->propType == qMetaTypeId<QVariant>()) {
+                QVariant v;
+                void *args[] = { &v, 0 };
+                QMetaObject::metacall(data, QMetaObject::ReadProperty, prop->coreIndex, args);
+                val = v.toString();
+            }
+        } else {
+            val = data->property(name.toUtf8()).toString();
+        }
+    } else {
+        val = data->property(name.toUtf8()).toString();
+    }
+
+    if (tempData)
+        delete data;
+
+    return val;
+}
+
+QVariant QDeclarativeVisualDataModel::evaluate(int index, const QString &expression, QObject *objectContext)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (d->m_visualItemModel)
+        return d->m_visualItemModel->evaluate(index, expression, objectContext);
+
+    if ((!d->m_listModelInterface && !d->m_abstractItemModel) || !d->m_delegate)
+        return QVariant();
+
+    QVariant value;
+    QObject *nobj = d->m_cache.item(index);
+    if (nobj) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(nobj);
+        if (item) {
+            QDeclarativeExpression e(qmlContext(item), expression, objectContext);
+            value = e.value();
+        }
+    } else {
+        QDeclarativeContext *ccontext = d->m_context;
+        if (!ccontext) ccontext = qmlContext(this);
+        QDeclarativeContext *ctxt = new QDeclarativeContext(ccontext);
+        QDeclarativeVisualDataModelData *data = new QDeclarativeVisualDataModelData(index, this);
+        ctxt->addDefaultObject(data);
+        QDeclarativeExpression e(ctxt, expression, objectContext);
+        value = e.value();
+        delete data;
+        delete ctxt;
+    }
+
+    return value;
+}
+
+int QDeclarativeVisualDataModel::indexOf(QDeclarativeItem *item, QObject *) const
+{
+    QVariant val = QDeclarativeEngine::contextForObject(item)->contextProperty(QLatin1String("index"));
+        return val.toInt();
+    return -1;
+}
+
+void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count,
+                                         const QList<int> &roles)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    // XXX - highly inefficient
+    for (int ii = index; ii < index + count; ++ii) {
+
+        if (QObject *item = d->m_cache.item(ii)) {
+            QDeclarativeVisualDataModelData *data = d->data(item);
+
+            for (int roleIdx = 0; roleIdx < roles.count(); ++roleIdx) {
+                int role = roles.at(roleIdx);
+                int propId = data->propForRole(role);
+                if (propId != -1) {
+                    if (d->m_listModelInterface) {
+                        data->setValue(propId, d->m_listModelInterface->data(ii, QList<int>() << role).value(role));
+                    } else if (d->m_abstractItemModel) {
+                        QModelIndex index = d->m_abstractItemModel->index(ii, 0, d->m_root);
+                        data->setValue(propId, d->m_abstractItemModel->data(index, role));
+                    }
+                }
+            }
+        }
+    }
+}
+
+void QDeclarativeVisualDataModel::_q_itemsInserted(int index, int count)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    // XXX - highly inefficient
+    QHash<int,QDeclarativeVisualDataModelPrivate::ObjectRef> items;
+    for (QHash<int,QDeclarativeVisualDataModelPrivate::ObjectRef>::Iterator iter = d->m_cache.begin();
+        iter != d->m_cache.end(); ) {
+
+        if (iter.key() >= index) {
+            QDeclarativeVisualDataModelPrivate::ObjectRef objRef = *iter;
+            int index = iter.key() + count;
+            iter = d->m_cache.erase(iter);
+
+            items.insert(index, objRef);
+
+            QDeclarativeVisualDataModelData *data = d->data(objRef.obj);
+            data->setIndex(index);
+        } else {
+            ++iter;
+        }
+    }
+    d->m_cache.unite(items);
+
+    emit itemsInserted(index, count);
+    emit countChanged();
+}
+
+void QDeclarativeVisualDataModel::_q_itemsRemoved(int index, int count)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    // XXX - highly inefficient
+    QHash<int, QDeclarativeVisualDataModelPrivate::ObjectRef> items;
+    for (QHash<int, QDeclarativeVisualDataModelPrivate::ObjectRef>::Iterator iter = d->m_cache.begin();
+        iter != d->m_cache.end(); ) {
+        if (iter.key() >= index && iter.key() < index + count) {
+            QDeclarativeVisualDataModelPrivate::ObjectRef objRef = *iter;
+            iter = d->m_cache.erase(iter);
+            items.insertMulti(-1, objRef); //XXX perhaps better to maintain separately
+            QDeclarativeVisualDataModelData *data = d->data(objRef.obj);
+            data->setIndex(-1);
+        } else if (iter.key() >= index + count) {
+            QDeclarativeVisualDataModelPrivate::ObjectRef objRef = *iter;
+            int index = iter.key() - count;
+            iter = d->m_cache.erase(iter);
+            items.insert(index, objRef);
+            QDeclarativeVisualDataModelData *data = d->data(objRef.obj);
+            data->setIndex(index);
+        } else {
+            ++iter;
+        }
+    }
+
+    d->m_cache.unite(items);
+    emit itemsRemoved(index, count);
+    emit countChanged();
+}
+
+void QDeclarativeVisualDataModel::_q_itemsMoved(int from, int to, int count)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    // XXX - highly inefficient
+    QHash<int,QDeclarativeVisualDataModelPrivate::ObjectRef> items;
+    for (QHash<int,QDeclarativeVisualDataModelPrivate::ObjectRef>::Iterator iter = d->m_cache.begin();
+        iter != d->m_cache.end(); ) {
+
+        if (iter.key() >= from && iter.key() < from + count) {
+            QDeclarativeVisualDataModelPrivate::ObjectRef objRef = *iter;
+            int index = iter.key() - from + to;
+            iter = d->m_cache.erase(iter);
+
+            items.insert(index, objRef);
+
+            QDeclarativeVisualDataModelData *data = d->data(objRef.obj);
+            data->setIndex(index);
+        } else {
+            ++iter;
+        }
+    }
+    for (QHash<int,QDeclarativeVisualDataModelPrivate::ObjectRef>::Iterator iter = d->m_cache.begin();
+        iter != d->m_cache.end(); ) {
+
+        int diff = from > to ? count : -count;
+        if (iter.key() >= qMin(from,to) && iter.key() < qMax(from+count,to+count)) {
+            QDeclarativeVisualDataModelPrivate::ObjectRef objRef = *iter;
+            int index = iter.key() + diff;
+            iter = d->m_cache.erase(iter);
+
+            items.insert(index, objRef);
+
+            QDeclarativeVisualDataModelData *data = d->data(objRef.obj);
+            data->setIndex(index);
+        } else {
+            ++iter;
+        }
+    }
+    d->m_cache.unite(items);
+
+    emit itemsMoved(from, to, count);
+}
+
+void QDeclarativeVisualDataModel::_q_rowsInserted(const QModelIndex &parent, int begin, int end)
+{
+    if (!parent.isValid())
+        _q_itemsInserted(begin, end - begin + 1);
+}
+
+void QDeclarativeVisualDataModel::_q_rowsRemoved(const QModelIndex &parent, int begin, int end)
+{
+    if (!parent.isValid())
+        _q_itemsRemoved(begin, end - begin + 1);
+}
+
+void QDeclarativeVisualDataModel::_q_rowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)
+{
+    const int count = sourceEnd - sourceStart + 1;
+    if (!destinationParent.isValid() && !sourceParent.isValid()) {
+        _q_itemsMoved(sourceStart, destinationRow, count);
+    } else if (!sourceParent.isValid()) {
+        _q_itemsRemoved(sourceStart, count);
+    } else if (!destinationParent.isValid()) {
+        _q_itemsInserted(destinationRow, count);
+    }
+}
+
+void QDeclarativeVisualDataModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    if (!begin.parent().isValid())
+        _q_itemsChanged(begin.row(), end.row() - begin.row() + 1, d->m_roles);
+}
+
+void QDeclarativeVisualDataModel::_q_createdPackage(int index, QDeclarativePackage *package)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    emit createdItem(index, qobject_cast<QDeclarativeItem*>(package->part(d->m_part)));
+}
+
+void QDeclarativeVisualDataModel::_q_destroyingPackage(QDeclarativePackage *package)
+{
+    Q_D(QDeclarativeVisualDataModel);
+    emit destroyingItem(qobject_cast<QDeclarativeItem*>(package->part(d->m_part)));
+}
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QListModelInterface)
+
+#include <qdeclarativevisualitemmodel.moc>
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
new file mode 100644
index 0000000..76c8994
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
@@ -0,0 +1,253 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEVISUALDATAMODEL_H
+#define QDECLARATIVEVISUALDATAMODEL_H
+
+#include <qdeclarative.h>
+
+#include <QtCore/qobject.h>
+#include <QtCore/qabstractitemmodel.h>
+
+QT_BEGIN_HEADER
+
+Q_DECLARE_METATYPE(QModelIndex)
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+/*****************************************************************************
+ *****************************************************************************
+ XXX Experimental
+ *****************************************************************************
+*****************************************************************************/
+
+class QDeclarativeItem;
+class QDeclarativeComponent;
+class QDeclarativePackage;
+class QDeclarativeVisualDataModelPrivate;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeVisualModel : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+
+public:
+    QDeclarativeVisualModel() {}
+    virtual ~QDeclarativeVisualModel() {}
+
+    enum ReleaseFlag { Referenced = 0x01, Destroyed = 0x02 };
+    Q_DECLARE_FLAGS(ReleaseFlags, ReleaseFlag)
+
+    virtual int count() const = 0;
+    virtual bool isValid() const = 0;
+    virtual QDeclarativeItem *item(int index, bool complete=true) = 0;
+    virtual ReleaseFlags release(QDeclarativeItem *item) = 0;
+    virtual void completeItem() = 0;
+    virtual QVariant evaluate(int index, const QString &expression, QObject *objectContext) = 0;
+    virtual QString stringValue(int, const QString &) { return QString(); }
+
+    virtual int indexOf(QDeclarativeItem *item, QObject *objectContext) const = 0;
+
+Q_SIGNALS:
+    void countChanged();
+    void itemsInserted(int index, int count);
+    void itemsRemoved(int index, int count);
+    void itemsMoved(int from, int to, int count);
+    void createdItem(int index, QDeclarativeItem *item);
+    void destroyingItem(QDeclarativeItem *item);
+
+protected:
+    QDeclarativeVisualModel(QObjectPrivate &dd, QObject *parent = 0)
+        : QObject(dd, parent) {}
+
+private:
+    Q_DISABLE_COPY(QDeclarativeVisualModel)
+};
+
+class QDeclarativeVisualItemModelAttached;
+class QDeclarativeVisualItemModelPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeVisualItemModel : public QDeclarativeVisualModel
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeVisualItemModel)
+
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
+    Q_CLASSINFO("DefaultProperty", "children")
+
+public:
+    QDeclarativeVisualItemModel();
+    virtual ~QDeclarativeVisualItemModel() {}
+
+    virtual int count() const;
+    virtual bool isValid() const;
+    virtual QDeclarativeItem *item(int index, bool complete=true);
+    virtual ReleaseFlags release(QDeclarativeItem *item);
+    virtual void completeItem();
+    virtual QString stringValue(int index, const QString &role);
+    virtual QVariant evaluate(int index, const QString &expression, QObject *objectContext);
+
+    virtual int indexOf(QDeclarativeItem *item, QObject *objectContext) const;
+
+    QDeclarativeListProperty<QDeclarativeItem> children();
+
+    static QDeclarativeVisualItemModelAttached *qmlAttachedProperties(QObject *obj);
+
+Q_SIGNALS:
+    void childrenChanged();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeVisualItemModel)
+};
+
+
+class Q_DECLARATIVE_EXPORT QDeclarativeVisualDataModel : public QDeclarativeVisualModel
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeVisualDataModel)
+
+    Q_PROPERTY(QVariant model READ model WRITE setModel)
+    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate)
+    Q_PROPERTY(QString part READ part WRITE setPart)
+    Q_PROPERTY(QObject *parts READ parts CONSTANT)
+    Q_PROPERTY(QModelIndex rootIndex READ rootIndex WRITE setRootIndex NOTIFY rootIndexChanged)
+    Q_CLASSINFO("DefaultProperty", "delegate")
+public:
+    QDeclarativeVisualDataModel();
+    QDeclarativeVisualDataModel(QDeclarativeContext *);
+    virtual ~QDeclarativeVisualDataModel();
+
+    QVariant model() const;
+    void setModel(const QVariant &);
+
+    QDeclarativeComponent *delegate() const;
+    void setDelegate(QDeclarativeComponent *);
+
+    QModelIndex rootIndex() const;
+    void setRootIndex(const QModelIndex &root);
+
+    QString part() const;
+    void setPart(const QString &);
+
+    int count() const;
+    bool isValid() const { return delegate() != 0; }
+    QDeclarativeItem *item(int index, bool complete=true);
+    QDeclarativeItem *item(int index, const QByteArray &, bool complete=true);
+    ReleaseFlags release(QDeclarativeItem *item);
+    void completeItem();
+    virtual QString stringValue(int index, const QString &role);
+    QVariant evaluate(int index, const QString &expression, QObject *objectContext);
+
+    int indexOf(QDeclarativeItem *item, QObject *objectContext) const;
+
+    QObject *parts();
+
+Q_SIGNALS:
+    void createdPackage(int index, QDeclarativePackage *package);
+    void destroyingPackage(QDeclarativePackage *package);
+    void rootIndexChanged();
+
+private Q_SLOTS:
+    void _q_itemsChanged(int, int, const QList<int> &);
+    void _q_itemsInserted(int index, int count);
+    void _q_itemsRemoved(int index, int count);
+    void _q_itemsMoved(int from, int to, int count);
+    void _q_rowsInserted(const QModelIndex &,int,int);
+    void _q_rowsRemoved(const QModelIndex &,int,int);
+    void _q_rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
+    void _q_dataChanged(const QModelIndex&,const QModelIndex&);
+    void _q_createdPackage(int index, QDeclarativePackage *package);
+    void _q_destroyingPackage(QDeclarativePackage *package);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeVisualDataModel)
+};
+
+class QDeclarativeVisualItemModelAttached : public QObject
+{
+    Q_OBJECT
+
+public:
+    QDeclarativeVisualItemModelAttached(QObject *parent)
+        : QObject(parent), m_index(0) {}
+    ~QDeclarativeVisualItemModelAttached() {
+        attachedProperties.remove(parent());
+    }
+
+    Q_PROPERTY(int index READ index NOTIFY indexChanged)
+    int index() const { return m_index; }
+    void setIndex(int idx) {
+        if (m_index != idx) {
+            m_index = idx;
+            emit indexChanged();
+        }
+    }
+
+    static QDeclarativeVisualItemModelAttached *properties(QObject *obj) {
+        QDeclarativeVisualItemModelAttached *rv = attachedProperties.value(obj);
+        if (!rv) {
+            rv = new QDeclarativeVisualItemModelAttached(obj);
+            attachedProperties.insert(obj, rv);
+        }
+        return rv;
+    }
+
+Q_SIGNALS:
+    void indexChanged();
+
+public:
+    int m_index;
+
+    static QHash<QObject*, QDeclarativeVisualItemModelAttached*> attachedProperties;
+};
+
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeVisualModel)
+QML_DECLARE_TYPE(QDeclarativeVisualItemModel)
+QML_DECLARE_TYPEINFO(QDeclarativeVisualItemModel, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QDeclarativeVisualDataModel)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEVISUALDATAMODEL_H
diff --git a/src/declarative/graphicsitems/qdeclarativewebview.cpp b/src/declarative/graphicsitems/qdeclarativewebview.cpp
new file mode 100644
index 0000000..61b5b56
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativewebview.cpp
@@ -0,0 +1,1335 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativewebview_p.h"
+#include "qdeclarativewebview_p_p.h"
+
+#include "qdeclarativepainteditem_p_p.h"
+
+#include <qdeclarative.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativestate_p.h>
+
+#include <QDebug>
+#include <QPen>
+#include <QFile>
+#include <QEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QBasicTimer>
+#include <QApplication>
+#include <QGraphicsSceneMouseEvent>
+#include <QtWebKit/QWebPage>
+#include <QtWebKit/QWebFrame>
+#include <QtWebKit/QWebElement>
+#include <QtWebKit/QWebSettings>
+#include <qlistmodelinterface_p.h>
+
+QT_BEGIN_NAMESPACE
+
+static const int MAX_DOUBLECLICK_TIME=500; // XXX need better gesture system
+
+class QDeclarativeWebViewPrivate : public QDeclarativePaintedItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeWebView)
+
+public:
+    QDeclarativeWebViewPrivate()
+      : QDeclarativePaintedItemPrivate(), page(0), preferredwidth(0), preferredheight(0),
+            progress(1.0), status(QDeclarativeWebView::Null), pending(PendingNone),
+            newWindowComponent(0), newWindowParent(0),
+            pressTime(400),
+            rendering(true)
+    {
+    }
+
+    QUrl url; // page url might be different if it has not loaded yet
+    QWebPage *page;
+
+    int preferredwidth, preferredheight;
+    qreal progress;
+    QDeclarativeWebView::Status status;
+    QString statusText;
+    enum { PendingNone, PendingUrl, PendingHtml, PendingContent } pending;
+    QUrl pending_url;
+    QString pending_string;
+    QByteArray pending_data;
+    mutable QDeclarativeWebSettings settings;
+    QDeclarativeComponent *newWindowComponent;
+    QDeclarativeItem *newWindowParent;
+
+    QBasicTimer pressTimer;
+    QPoint pressPoint;
+    int pressTime; // milliseconds before it's a "hold"
+
+
+    static void windowObjects_append(QDeclarativeListProperty<QObject> *prop, QObject *o) {
+        static_cast<QDeclarativeWebViewPrivate *>(prop->data)->windowObjects.append(o);
+        static_cast<QDeclarativeWebViewPrivate *>(prop->data)->updateWindowObjects();
+    }
+
+    void updateWindowObjects();
+    QObjectList windowObjects;
+
+    bool rendering;
+};
+
+/*!
+    \qmlclass WebView QDeclarativeWebView
+  \since 4.7
+    \brief The WebView item allows you to add web content to a canvas.
+    \inherits Item
+
+    A WebView renders web content based on a URL.
+
+    If the width and height of the item is not set, they will
+    dynamically adjust to a size appropriate for the content.
+    This width may be large for typical online web pages.
+
+    If the preferredWidth is set, the width will be this amount or larger,
+    usually laying out the web content to fit the preferredWidth.
+
+    \qml
+    WebView {
+        url: "http://www.nokia.com"
+        width: 490
+        height: 400
+        scale: 0.5
+        smooth: false
+        smoothCache: true
+    }
+    \endqml
+
+    \image webview.png
+
+    The item includes no scrolling, scaling,
+    toolbars, etc., those must be implemented around WebView. See the WebBrowser example
+    for a demonstration of this.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeWebView
+    \brief The QDeclarativeWebView class allows you to add web content to a QDeclarativeView.
+
+    A WebView renders web content base on a URL.
+
+    \image webview.png
+
+    The item includes no scrolling, scaling,
+    toolbars, etc., those must be implemented around WebView. See the WebBrowser example
+    for a demonstration of this.
+
+    A QDeclarativeWebView object can be instantiated in Qml using the tag \l WebView.
+*/
+
+QDeclarativeWebView::QDeclarativeWebView(QDeclarativeItem *parent)
+  : QDeclarativePaintedItem(*(new QDeclarativeWebViewPrivate), parent)
+{
+    init();
+}
+
+QDeclarativeWebView::~QDeclarativeWebView()
+{
+    Q_D(QDeclarativeWebView);
+    delete d->page;
+}
+
+void QDeclarativeWebView::init()
+{
+    Q_D(QDeclarativeWebView);
+
+    setAcceptHoverEvents(true);
+    setAcceptedMouseButtons(Qt::LeftButton);
+    setFlag(QGraphicsItem::ItemHasNoContents, false);
+
+    d->page = 0;
+}
+
+void QDeclarativeWebView::componentComplete()
+{
+    QDeclarativePaintedItem::componentComplete();
+    Q_D(QDeclarativeWebView);
+    switch (d->pending) {
+        case QDeclarativeWebViewPrivate::PendingUrl:
+            setUrl(d->pending_url);
+            break;
+        case QDeclarativeWebViewPrivate::PendingHtml:
+            setHtml(d->pending_string, d->pending_url);
+            break;
+        case QDeclarativeWebViewPrivate::PendingContent:
+            setContent(d->pending_data, d->pending_string, d->pending_url);
+            break;
+        default:
+            break;
+    }
+    d->pending = QDeclarativeWebViewPrivate::PendingNone;
+    d->updateWindowObjects();
+}
+
+QDeclarativeWebView::Status QDeclarativeWebView::status() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->status;
+}
+
+
+/*!
+    \qmlproperty real WebView::progress
+    This property holds the progress of loading the current URL, from 0 to 1.
+
+    If you just want to know when progress gets to 1, use
+    WebView::onLoadFinished() or WebView::onLoadFailed() instead.
+*/
+qreal QDeclarativeWebView::progress() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->progress;
+}
+
+void QDeclarativeWebView::doLoadStarted()
+{
+    Q_D(QDeclarativeWebView);
+
+    if (!d->url.isEmpty()) {
+        d->status = Loading;
+        emit statusChanged(d->status);
+    }
+    emit loadStarted();
+}
+
+void QDeclarativeWebView::doLoadProgress(int p)
+{
+    Q_D(QDeclarativeWebView);
+    if (d->progress == p/100.0)
+        return;
+    d->progress = p/100.0;
+    emit progressChanged();
+}
+
+void QDeclarativeWebView::pageUrlChanged()
+{
+    Q_D(QDeclarativeWebView);
+
+    page()->setViewportSize(QSize(
+        d->preferredwidth>0 ? d->preferredwidth : width(),
+        d->preferredheight>0 ? d->preferredheight : height()));
+    expandToWebPage();
+
+    if ((d->url.isEmpty() && page()->mainFrame()->url() != QUrl(QLatin1String("about:blank")))
+        || (d->url != page()->mainFrame()->url() && !page()->mainFrame()->url().isEmpty()))
+    {
+        d->url = page()->mainFrame()->url();
+        if (d->url == QUrl(QLatin1String("about:blank")))
+            d->url = QUrl();
+        emit urlChanged();
+    }
+}
+
+void QDeclarativeWebView::doLoadFinished(bool ok)
+{
+    Q_D(QDeclarativeWebView);
+
+    if (title().isEmpty())
+        pageUrlChanged(); // XXX bug 232556 - pages with no title never get urlChanged()
+
+    if (ok) {
+        d->status = d->url.isEmpty() ? Null : Ready;
+        emit loadFinished();
+    } else {
+        d->status = Error;
+        emit loadFailed();
+    }
+    emit statusChanged(d->status);
+}
+
+/*!
+    \qmlproperty url WebView::url
+    This property holds the URL to the page displayed in this item. It can be set,
+    but also can change spontaneously (eg. because of network redirection).
+
+    If the url is empty, the page is blank.
+
+    The url is always absolute (QML will resolve relative URL strings in the context
+    of the containing QML document).
+*/
+QUrl QDeclarativeWebView::url() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->url;
+}
+
+void QDeclarativeWebView::setUrl(const QUrl &url)
+{
+    Q_D(QDeclarativeWebView);
+    if (url == d->url)
+        return;
+
+    if (isComponentComplete()) {
+        d->url = url;
+        page()->setViewportSize(QSize(
+            d->preferredwidth>0 ? d->preferredwidth : width(),
+            d->preferredheight>0 ? d->preferredheight : height()));
+        QUrl seturl = url;
+        if (seturl.isEmpty())
+            seturl = QUrl(QLatin1String("about:blank"));
+
+        Q_ASSERT(!seturl.isRelative());
+
+        page()->mainFrame()->load(seturl);
+
+        emit urlChanged();
+    } else {
+        d->pending = d->PendingUrl;
+        d->pending_url = url;
+    }
+}
+
+/*!
+    \qmlproperty int WebView::preferredWidth
+    This property holds the ideal width for displaying the current URL.
+*/
+int QDeclarativeWebView::preferredWidth() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->preferredwidth;
+}
+
+void QDeclarativeWebView::setPreferredWidth(int iw)
+{
+    Q_D(QDeclarativeWebView);
+    if (d->preferredwidth == iw) return;
+    d->preferredwidth = iw;
+    //expandToWebPage();
+    emit preferredWidthChanged();
+}
+
+/*!
+    \qmlproperty int WebView::preferredHeight
+    This property holds the ideal height for displaying the current URL.
+    This only affects the area zoomed by heuristicZoom().
+*/
+int QDeclarativeWebView::preferredHeight() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->preferredheight;
+}
+void QDeclarativeWebView::setPreferredHeight(int ih)
+{
+    Q_D(QDeclarativeWebView);
+    if (d->preferredheight == ih) return;
+    d->preferredheight = ih;
+    emit preferredHeightChanged();
+}
+
+/*!
+    \qmlmethod bool WebView::evaluateJavaScript(string)
+
+    Evaluates the \a scriptSource JavaScript inside the context of the
+    main web frame, and returns the result of the last executed statement.
+
+    Note that this JavaScript does \e not have any access to QML objects
+    except as made available as windowObjects.
+*/
+QVariant QDeclarativeWebView::evaluateJavaScript(const QString &scriptSource)
+{
+    return this->page()->mainFrame()->evaluateJavaScript(scriptSource);
+}
+
+void QDeclarativeWebView::focusChanged(bool hasFocus)
+{
+    QFocusEvent e(hasFocus ? QEvent::FocusIn : QEvent::FocusOut);
+    page()->event(&e);
+    QDeclarativeItem::focusChanged(hasFocus);
+}
+
+void QDeclarativeWebView::initialLayout()
+{
+    // nothing useful to do at this point
+}
+
+void QDeclarativeWebView::noteContentsSizeChanged(const QSize&)
+{
+    expandToWebPage();
+}
+
+void QDeclarativeWebView::expandToWebPage()
+{
+    Q_D(QDeclarativeWebView);
+    QSize cs = page()->mainFrame()->contentsSize();
+    if (cs.width() < d->preferredwidth)
+        cs.setWidth(d->preferredwidth);
+    if (cs.height() < d->preferredheight)
+        cs.setHeight(d->preferredheight);
+    if (widthValid())
+        cs.setWidth(width());
+    if (heightValid())
+        cs.setHeight(height());
+    if (cs != page()->viewportSize()) {
+        page()->setViewportSize(cs);
+    }
+    if (cs != contentsSize())
+        setContentsSize(cs);
+}
+
+void QDeclarativeWebView::geometryChanged(const QRectF &newGeometry,
+                                 const QRectF &oldGeometry)
+{
+    if (newGeometry.size() != oldGeometry.size())
+        expandToWebPage();
+    QDeclarativePaintedItem::geometryChanged(newGeometry, oldGeometry);
+}
+
+void QDeclarativeWebView::paintPage(const QRect& r)
+{
+    dirtyCache(r);
+    update();
+}
+
+/*!
+    \qmlproperty list<object> WebView::javaScriptWindowObjects
+
+    This property is a list of object that are available from within
+    the webview's JavaScript context.
+
+    The \a object will be inserted as a child of the frame's window
+    object, under the name given by the attached property \c WebView.windowObjectName.
+
+    \qml
+    WebView {
+        javaScriptWindowObjects: Object {
+            WebView.windowObjectName: "coordinates"
+        }
+    }
+    \endqml
+
+    Properties of the object will be exposed as JavaScript properties and slots as
+    JavaScript methods.
+
+    If Javascript is not enabled for this page, then this property does nothing.
+*/
+QDeclarativeListProperty<QObject> QDeclarativeWebView::javaScriptWindowObjects()
+{
+    Q_D(QDeclarativeWebView);
+    return QDeclarativeListProperty<QObject>(this, d, &QDeclarativeWebViewPrivate::windowObjects_append);
+}
+
+QDeclarativeWebViewAttached *QDeclarativeWebView::qmlAttachedProperties(QObject *o)
+{
+    return new QDeclarativeWebViewAttached(o);
+}
+
+void QDeclarativeWebViewPrivate::updateWindowObjects()
+{
+    Q_Q(QDeclarativeWebView);
+    if (!q->isComponentComplete() || !page)
+        return;
+
+    for (int ii = 0; ii < windowObjects.count(); ++ii) {
+        QObject *object = windowObjects.at(ii);
+        QDeclarativeWebViewAttached *attached = static_cast<QDeclarativeWebViewAttached *>(qmlAttachedPropertiesObject<QDeclarativeWebView>(object));
+        if (attached && !attached->windowObjectName().isEmpty()) {
+            page->mainFrame()->addToJavaScriptWindowObject(attached->windowObjectName(), object);
+        }
+    }
+}
+
+bool QDeclarativeWebView::renderingEnabled() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->rendering;
+}
+
+void QDeclarativeWebView::setRenderingEnabled(bool enabled)
+{
+    Q_D(QDeclarativeWebView);
+    if (d->rendering == enabled)
+        return;
+    d->rendering = enabled;
+    emit renderingEnabledChanged();
+
+    setCacheFrozen(!enabled);
+    if (enabled)
+        clearCache();
+}
+
+
+void QDeclarativeWebView::drawContents(QPainter *p, const QRect &r)
+{
+    Q_D(QDeclarativeWebView);
+    if (d->rendering)
+        page()->mainFrame()->render(p,r);
+}
+
+QMouseEvent *QDeclarativeWebView::sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e)
+{
+    QEvent::Type t;
+    switch(e->type()) {
+    default:
+    case QEvent::GraphicsSceneMousePress:
+        t = QEvent::MouseButtonPress;
+        break;
+    case QEvent::GraphicsSceneMouseRelease:
+        t = QEvent::MouseButtonRelease;
+        break;
+    case QEvent::GraphicsSceneMouseMove:
+        t = QEvent::MouseMove;
+        break;
+    case QGraphicsSceneEvent::GraphicsSceneMouseDoubleClick:
+        t = QEvent::MouseButtonDblClick;
+        break;
+    }
+
+    QMouseEvent *me = new QMouseEvent(t, (e->pos()/contentsScale()).toPoint(), e->button(), e->buttons(), 0);
+    return me;
+}
+
+QMouseEvent *QDeclarativeWebView::sceneHoverMoveEventToMouseEvent(QGraphicsSceneHoverEvent *e)
+{
+    QEvent::Type t = QEvent::MouseMove;
+
+    QMouseEvent *me = new QMouseEvent(t, (e->pos()/contentsScale()).toPoint(), Qt::NoButton, Qt::NoButton, 0);
+
+    return me;
+}
+
+
+/*!
+    \qmlsignal WebView::onDoubleClick(clickx,clicky)
+
+    The WebView does not pass double-click events to the web engine, but rather
+    emits this signals.
+*/
+
+void QDeclarativeWebView::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
+{
+    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
+    emit doubleClick(me->x(),me->y());
+    delete me;
+}
+
+/*!
+    \qmlmethod bool WebView::heuristicZoom(clickX,clickY,maxzoom)
+
+    Finds a zoom that:
+    \list
+    \i shows a whole item
+    \i includes (\a clickX, \a clickY)
+    \i fits into the preferredWidth and preferredHeight
+    \i zooms by no more than \a maxzoom
+    \i is more than 10% above the current zoom
+    \endlist
+
+    If such a zoom exists, emits zoomTo(zoom,centerX,centerY) and returns true; otherwise,
+    no signal is emitted and returns false.
+*/
+bool QDeclarativeWebView::heuristicZoom(int clickX, int clickY, qreal maxzoom)
+{
+    Q_D(QDeclarativeWebView);
+    if (contentsScale() >= maxzoom/zoomFactor())
+        return false;
+    qreal ozf = contentsScale();
+    QRect showarea = elementAreaAt(clickX, clickY, d->preferredwidth/maxzoom, d->preferredheight/maxzoom);
+    qreal z = qMin(qreal(d->preferredwidth)/showarea.width(),qreal(d->preferredheight)/showarea.height());
+    if (z > maxzoom/zoomFactor())
+        z = maxzoom/zoomFactor();
+    if (z/ozf > 1.2) {
+        QRectF r(showarea.left()*z, showarea.top()*z, showarea.width()*z, showarea.height()*z);
+        emit zoomTo(z,r.x()+r.width()/2, r.y()+r.height()/2);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/*!
+    \qmlproperty int WebView::pressGrabTime
+
+    The number of milliseconds the user must press before the WebView
+    starts passing move events through to the web engine (rather than
+    letting other QML elements such as a Flickable take them).
+
+    Defaults to 400ms. Set to 0 to always grab and pass move events to
+    the web engine.
+*/
+int QDeclarativeWebView::pressGrabTime() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->pressTime;
+}
+
+void QDeclarativeWebView::setPressGrabTime(int ms)
+{
+    Q_D(QDeclarativeWebView);
+    if (d->pressTime == ms) 
+        return;
+    d->pressTime = ms;
+    emit pressGrabTimeChanged();
+}
+
+void QDeclarativeWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeWebView);
+
+    setFocus (true);
+    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
+
+    d->pressPoint = me->pos();
+    if (d->pressTime) {
+        d->pressTimer.start(d->pressTime,this);
+        setKeepMouseGrab(false);
+    } else {
+        grabMouse();
+        setKeepMouseGrab(true);
+    }
+
+    page()->event(me);
+    event->setAccepted(
+/*
+  It is not correct to send the press event upwards, if it is not accepted by WebKit
+  e.g. push button does not work, if done so as QGraphicsScene will not send the release event at all to WebKit
+  Might be a bug in WebKit, though
+  */
+#if 1 //QT_VERSION <= 0x040500 // XXX see bug 230835
+        true
+#else
+        me->isAccepted()
+#endif
+        );
+    delete me;
+    if (!event->isAccepted()) {
+        QDeclarativePaintedItem::mousePressEvent(event);
+    }
+}
+
+void QDeclarativeWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeWebView);
+
+    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
+    page()->event(me);
+    d->pressTimer.stop();
+    event->setAccepted(
+/*
+  It is not correct to send the press event upwards, if it is not accepted by WebKit
+  e.g. push button does not work, if done so as QGraphicsScene will not send all the events to WebKit
+  */
+#if 1 //QT_VERSION <= 0x040500 // XXX see bug 230835
+        true
+#else
+        me->isAccepted()
+#endif
+        );
+    delete me;
+    if (!event->isAccepted()) {
+        QDeclarativePaintedItem::mouseReleaseEvent(event);
+    }
+    setKeepMouseGrab(false);
+    ungrabMouse();
+}
+
+void QDeclarativeWebView::timerEvent(QTimerEvent *event)
+{
+    Q_D(QDeclarativeWebView);
+    if (event->timerId() == d->pressTimer.timerId()) {
+        d->pressTimer.stop();
+        grabMouse();
+        setKeepMouseGrab(true);
+    }
+}
+
+void QDeclarativeWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeWebView);
+
+    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
+    if (d->pressTimer.isActive()) {
+        if ((me->pos() - d->pressPoint).manhattanLength() > QApplication::startDragDistance())  {
+            d->pressTimer.stop();
+        }
+    }
+    if (keepMouseGrab()) {
+        page()->event(me);
+        event->setAccepted(
+/*
+  It is not correct to send the press event upwards, if it is not accepted by WebKit
+  e.g. push button does not work, if done so as QGraphicsScene will not send the release event at all to WebKit
+  Might be a bug in WebKit, though
+  */
+#if 1 // QT_VERSION <= 0x040500 // XXX see bug 230835
+            true
+#else
+            me->isAccepted()
+#endif
+        );
+    }
+    delete me;
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::mouseMoveEvent(event);
+
+}
+void QDeclarativeWebView::hoverMoveEvent (QGraphicsSceneHoverEvent * event)
+{
+    QMouseEvent *me = sceneHoverMoveEventToMouseEvent(event);
+    page()->event(me);
+    event->setAccepted(
+#if QT_VERSION <= 0x040500 // XXX see bug 230835
+        true
+#else
+        me->isAccepted()
+#endif
+    );
+    delete me;
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::hoverMoveEvent(event);
+}
+
+void QDeclarativeWebView::keyPressEvent(QKeyEvent* event)
+{
+    page()->event(event);
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::keyPressEvent(event);
+}
+
+void QDeclarativeWebView::keyReleaseEvent(QKeyEvent* event)
+{
+    page()->event(event);
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::keyReleaseEvent(event);
+}
+
+bool QDeclarativeWebView::sceneEvent(QEvent *event) 
+{ 
+    if (event->type() == QEvent::KeyPress) { 
+        QKeyEvent *k = static_cast<QKeyEvent *>(event); 
+        if (k->key() == Qt::Key_Tab || k->key() == Qt::Key_Backtab) { 
+            if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) { //### Add MetaModifier? 
+                page()->event(event); 
+                if (event->isAccepted()) 
+                    return true; 
+            } 
+        } 
+    } 
+    return QDeclarativePaintedItem::sceneEvent(event); 
+} 
+
+
+/*!
+    \qmlproperty action WebView::back
+    This property holds the action for causing the previous URL in the history to be displayed.
+*/
+QAction *QDeclarativeWebView::backAction() const
+{
+    return page()->action(QWebPage::Back);
+}
+
+/*!
+    \qmlproperty action WebView::forward
+    This property holds the action for causing the next URL in the history to be displayed.
+*/
+QAction *QDeclarativeWebView::forwardAction() const
+{
+    return page()->action(QWebPage::Forward);
+}
+
+/*!
+    \qmlproperty action WebView::reload
+    This property holds the action for reloading with the current URL
+*/
+QAction *QDeclarativeWebView::reloadAction() const
+{
+    return page()->action(QWebPage::Reload);
+}
+
+/*!
+    \qmlproperty action WebView::stop
+    This property holds the action for stopping loading with the current URL
+*/
+QAction *QDeclarativeWebView::stopAction() const
+{
+    return page()->action(QWebPage::Stop);
+}
+
+/*!
+    \qmlproperty real WebView::title
+    This property holds the title of the web page currently viewed
+
+    By default, this property contains an empty string.
+*/
+QString QDeclarativeWebView::title() const
+{
+    return page()->mainFrame()->title();
+}
+
+
+
+/*!
+    \qmlproperty pixmap WebView::icon
+    This property holds the icon associated with the web page currently viewed
+*/
+QPixmap QDeclarativeWebView::icon() const
+{
+    return page()->mainFrame()->icon().pixmap(QSize(256,256));
+}
+
+
+/*!
+    \qmlproperty real WebView::zoomFactor
+    This property holds the multiplier used to scale the contents of a Web page.
+*/
+void QDeclarativeWebView::setZoomFactor(qreal factor)
+{
+    Q_D(QDeclarativeWebView);
+    if (factor == page()->mainFrame()->zoomFactor())
+        return;
+
+    page()->mainFrame()->setZoomFactor(factor);
+    page()->setViewportSize(QSize(
+        d->preferredwidth>0 ? d->preferredwidth*factor : width()*factor,
+        d->preferredheight>0 ? d->preferredheight*factor : height()*factor));
+    expandToWebPage();
+
+    emit zoomFactorChanged();
+}
+
+qreal QDeclarativeWebView::zoomFactor() const
+{
+    return page()->mainFrame()->zoomFactor();
+}
+
+/*!
+    \qmlproperty string WebView::statusText
+
+    This property is the current status suggested by the current web page. In a web browser,
+    such status is often shown in some kind of status bar.
+*/
+void QDeclarativeWebView::setStatusText(const QString& s)
+{
+    Q_D(QDeclarativeWebView);
+    d->statusText = s;
+    emit statusTextChanged();
+}
+
+void QDeclarativeWebView::windowObjectCleared()
+{
+    Q_D(QDeclarativeWebView);
+    d->updateWindowObjects();
+}
+
+QString QDeclarativeWebView::statusText() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->statusText;
+}
+
+QWebPage *QDeclarativeWebView::page() const
+{
+    Q_D(const QDeclarativeWebView);
+
+    if (!d->page) {
+        QDeclarativeWebView *self = const_cast<QDeclarativeWebView*>(this);
+        QWebPage *wp = new QDeclarativeWebPage(self);
+
+        // QML items don't default to having a background,
+        // even though most we pages will set one anyway.
+        QPalette pal = QApplication::palette();
+        pal.setBrush(QPalette::Base, QColor::fromRgbF(0, 0, 0, 0));
+        wp->setPalette(pal);
+
+        wp->setNetworkAccessManager(qmlEngine(this)->networkAccessManager());
+
+        self->setPage(wp);
+
+        return wp;
+    }
+
+    return d->page;
+}
+
+
+// The QObject interface to settings().
+/*!
+    \qmlproperty string WebView::settings.standardFontFamily
+    \qmlproperty string WebView::settings.fixedFontFamily
+    \qmlproperty string WebView::settings.serifFontFamily
+    \qmlproperty string WebView::settings.sansSerifFontFamily
+    \qmlproperty string WebView::settings.cursiveFontFamily
+    \qmlproperty string WebView::settings.fantasyFontFamily
+
+    \qmlproperty int WebView::settings.minimumFontSize
+    \qmlproperty int WebView::settings.minimumLogicalFontSize
+    \qmlproperty int WebView::settings.defaultFontSize
+    \qmlproperty int WebView::settings.defaultFixedFontSize
+
+    \qmlproperty bool WebView::settings.autoLoadImages
+    \qmlproperty bool WebView::settings.javascriptEnabled
+    \qmlproperty bool WebView::settings.javaEnabled
+    \qmlproperty bool WebView::settings.pluginsEnabled
+    \qmlproperty bool WebView::settings.privateBrowsingEnabled
+    \qmlproperty bool WebView::settings.javascriptCanOpenWindows
+    \qmlproperty bool WebView::settings.javascriptCanAccessClipboard
+    \qmlproperty bool WebView::settings.developerExtrasEnabled
+    \qmlproperty bool WebView::settings.linksIncludedInFocusChain
+    \qmlproperty bool WebView::settings.zoomTextOnly
+    \qmlproperty bool WebView::settings.printElementBackgrounds
+    \qmlproperty bool WebView::settings.offlineStorageDatabaseEnabled
+    \qmlproperty bool WebView::settings.offlineWebApplicationCacheEnabled
+    \qmlproperty bool WebView::settings.localStorageDatabaseEnabled
+    \qmlproperty bool WebView::settings.localContentCanAccessRemoteUrls
+
+    These properties give access to the settings controlling the web view.
+
+    See QWebSettings for details of these properties.
+
+    \qml
+        WebView {
+            settings.pluginsEnabled: true
+            settings.standardFontFamily: "Arial"
+            ...
+        }
+    \endqml
+*/
+QDeclarativeWebSettings *QDeclarativeWebView::settingsObject() const
+{
+    Q_D(const QDeclarativeWebView);
+    d->settings.s = page()->settings();
+    return &d->settings;
+}
+
+void QDeclarativeWebView::setPage(QWebPage *page)
+{
+    Q_D(QDeclarativeWebView);
+    if (d->page == page)
+        return;
+    if (d->page) {
+        if (d->page->parent() == this) {
+            delete d->page;
+        } else {
+            d->page->disconnect(this);
+        }
+    }
+    d->page = page;
+    d->page->setViewportSize(QSize(
+        d->preferredwidth>0 ? d->preferredwidth : width(),
+        d->preferredheight>0 ? d->preferredheight : height()));
+    d->page->mainFrame()->setScrollBarPolicy(Qt::Horizontal,Qt::ScrollBarAlwaysOff);
+    d->page->mainFrame()->setScrollBarPolicy(Qt::Vertical,Qt::ScrollBarAlwaysOff);
+    connect(d->page,SIGNAL(repaintRequested(QRect)),this,SLOT(paintPage(QRect)));
+    connect(d->page->mainFrame(),SIGNAL(urlChanged(QUrl)),this,SLOT(pageUrlChanged()));
+    connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));
+    connect(d->page->mainFrame(), SIGNAL(iconChanged()), this, SIGNAL(iconChanged()));
+    connect(d->page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)), this, SLOT(noteContentsSizeChanged(QSize)));
+    connect(d->page->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(initialLayout()));
+
+    connect(d->page,SIGNAL(loadStarted()),this,SLOT(doLoadStarted()));
+    connect(d->page,SIGNAL(loadProgress(int)),this,SLOT(doLoadProgress(int)));
+    connect(d->page,SIGNAL(loadFinished(bool)),this,SLOT(doLoadFinished(bool)));
+    connect(d->page,SIGNAL(statusBarMessage(QString)),this,SLOT(setStatusText(QString)));
+
+    connect(d->page->mainFrame(),SIGNAL(javaScriptWindowObjectCleared()),this,SLOT(windowObjectCleared()));
+}
+
+/*!
+    \qmlsignal WebView::onLoadStarted()
+
+    This handler is called when the web engine begins loading
+    a page. Later, WebView::onLoadFinished() or WebView::onLoadFailed()
+    will be emitted.
+*/
+
+/*!
+    \qmlsignal WebView::onLoadFinished()
+
+    This handler is called when the web engine \e successfully
+    finishes loading a page, including any component content
+    (WebView::onLoadFailed() will be emitted otherwise).
+
+    \sa progress
+*/
+
+/*!
+    \qmlsignal WebView::onLoadFailed()
+
+    This handler is called when the web engine fails loading
+    a page or any component content
+    (WebView::onLoadFinished() will be emitted on success).
+*/
+
+void QDeclarativeWebView::load(const QNetworkRequest &request,
+          QNetworkAccessManager::Operation operation,
+          const QByteArray &body)
+{
+    page()->mainFrame()->load(request, operation, body);
+}
+
+QString QDeclarativeWebView::html() const
+{
+    return page()->mainFrame()->toHtml();
+}
+
+/*!
+    \qmlproperty string WebView::html
+    This property holds HTML text set directly
+
+    The html property can be set as a string.
+
+    \qml
+    WebView {
+        html: "<p>This is <b>HTML</b>."
+    }
+    \endqml
+*/
+void QDeclarativeWebView::setHtml(const QString &html, const QUrl &baseUrl)
+{
+    Q_D(QDeclarativeWebView);
+    page()->setViewportSize(QSize(
+        d->preferredwidth>0 ? d->preferredwidth : width(),
+        d->preferredheight>0 ? d->preferredheight : height()));
+    if (isComponentComplete())
+        page()->mainFrame()->setHtml(html, baseUrl);
+    else {
+        d->pending = d->PendingHtml;
+        d->pending_url = baseUrl;
+        d->pending_string = html;
+    }
+    emit htmlChanged();
+}
+
+void QDeclarativeWebView::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl)
+{
+    Q_D(QDeclarativeWebView);
+    page()->setViewportSize(QSize(
+        d->preferredwidth>0 ? d->preferredwidth : width(),
+        d->preferredheight>0 ? d->preferredheight : height()));
+
+    if (isComponentComplete())
+        page()->mainFrame()->setContent(data,mimeType,qmlContext(this)->resolvedUrl(baseUrl));
+    else {
+        d->pending = d->PendingContent;
+        d->pending_url = baseUrl;
+        d->pending_string = mimeType;
+        d->pending_data = data;
+    }
+}
+
+QWebHistory *QDeclarativeWebView::history() const
+{
+    return page()->history();
+}
+
+QWebSettings *QDeclarativeWebView::settings() const
+{
+    return page()->settings();
+}
+
+QDeclarativeWebView *QDeclarativeWebView::createWindow(QWebPage::WebWindowType type)
+{
+    Q_D(QDeclarativeWebView);
+    switch (type) {
+        case QWebPage::WebBrowserWindow: {
+            if (!d->newWindowComponent && d->newWindowParent)
+                qWarning("WebView::newWindowComponent not set - WebView::newWindowParent ignored");
+            else if (d->newWindowComponent && !d->newWindowParent)
+                qWarning("WebView::newWindowParent not set - WebView::newWindowComponent ignored");
+            else if (d->newWindowComponent && d->newWindowParent) {
+                QDeclarativeWebView *webview = 0;
+                QDeclarativeContext *windowContext = new QDeclarativeContext(qmlContext(this));
+
+                QObject *nobj = d->newWindowComponent->create(windowContext);
+                if (nobj) {
+                    windowContext->setParent(nobj);
+                    QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(nobj);
+                    if (!item) {
+                        delete nobj;
+                    } else {
+                        webview = item->findChild<QDeclarativeWebView*>();
+                        if (!webview) {
+                            delete item;
+                        } else {
+                            nobj->setParent(d->newWindowParent);
+                            static_cast<QGraphicsObject*>(item)->setParentItem(d->newWindowParent);
+                        }
+                    }
+                } else {
+                    delete windowContext;
+                }
+
+                return webview;
+            }
+        }
+        break;
+        case QWebPage::WebModalDialog: {
+            // Not supported
+        }
+    }
+    return 0;
+}
+
+/*!
+    \qmlproperty component WebView::newWindowComponent
+
+    This property holds the component to use for new windows.
+    The component must have a WebView somewhere in its structure.
+
+    When the web engine requests a new window, it will be an instance of
+    this component.
+
+    The parent of the new window is set by newWindowParent. It must be set.
+*/
+QDeclarativeComponent *QDeclarativeWebView::newWindowComponent() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->newWindowComponent;
+}
+
+void QDeclarativeWebView::setNewWindowComponent(QDeclarativeComponent *newWindow)
+{
+    Q_D(QDeclarativeWebView);
+    if (newWindow == d->newWindowComponent)
+        return;
+    d->newWindowComponent = newWindow;
+    emit newWindowComponentChanged();
+}
+
+
+/*!
+    \qmlproperty item WebView::newWindowParent
+
+    The parent item for new windows.
+
+    \sa newWindowComponent
+*/
+QDeclarativeItem *QDeclarativeWebView::newWindowParent() const
+{
+    Q_D(const QDeclarativeWebView);
+    return d->newWindowParent;
+}
+
+void QDeclarativeWebView::setNewWindowParent(QDeclarativeItem *parent)
+{
+    Q_D(QDeclarativeWebView);
+    if (parent == d->newWindowParent)
+        return;
+    if (d->newWindowParent && parent) {
+        QList<QGraphicsItem *> children = d->newWindowParent->childItems();
+        for (int i = 0; i < children.count(); ++i) {
+            children.at(i)->setParentItem(parent);
+        }
+    }
+    d->newWindowParent = parent;
+    emit newWindowParentChanged();    
+}
+
+/*!
+    Returns the area of the largest element at position (\a x,\a y) that is no larger
+    than \a maxwidth by \a maxheight pixels.
+
+    May return an area larger in the case when no smaller element is at the position.
+*/
+QRect QDeclarativeWebView::elementAreaAt(int x, int y, int maxwidth, int maxheight) const
+{
+    QWebHitTestResult hit = page()->mainFrame()->hitTestContent(QPoint(x,y));
+    QRect rv = hit.boundingRect();
+    QWebElement element = hit.enclosingBlockElement();
+    if (maxwidth<=0) maxwidth = INT_MAX;
+    if (maxheight<=0) maxheight = INT_MAX;
+    while (!element.parent().isNull() && element.geometry().width() <= maxwidth && element.geometry().height() <= maxheight) {
+        rv = element.geometry();
+        element = element.parent();
+    }
+    return rv;
+}
+
+/*!
+    \internal
+    \class QDeclarativeWebPage
+    \brief The QDeclarativeWebPage class is a QWebPage that can create QML plugins.
+
+    \sa QDeclarativeWebView
+*/
+QDeclarativeWebPage::QDeclarativeWebPage(QDeclarativeWebView *parent) :
+    QWebPage(parent)
+{
+}
+
+QDeclarativeWebPage::~QDeclarativeWebPage()
+{
+}
+
+void QDeclarativeWebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
+{
+    qWarning() << sourceID << ':' << lineNumber << ':' << message;
+}
+
+QString QDeclarativeWebPage::chooseFile(QWebFrame *originatingFrame, const QString& oldFile)
+{
+    // Not supported (it's modal)
+    Q_UNUSED(originatingFrame)
+    Q_UNUSED(oldFile)
+    return oldFile;
+}
+
+void QDeclarativeWebPage::javaScriptAlert(QWebFrame *originatingFrame, const QString& msg)
+{
+    Q_UNUSED(originatingFrame)
+    emit viewItem()->alert(msg);
+}
+
+bool QDeclarativeWebPage::javaScriptConfirm(QWebFrame *originatingFrame, const QString& msg)
+{
+    // Not supported (it's modal)
+    Q_UNUSED(originatingFrame)
+    Q_UNUSED(msg)
+    return false;
+}
+
+bool QDeclarativeWebPage::javaScriptPrompt(QWebFrame *originatingFrame, const QString& msg, const QString& defaultValue, QString* result)
+{
+    // Not supported (it's modal)
+    Q_UNUSED(originatingFrame)
+    Q_UNUSED(msg)
+    Q_UNUSED(defaultValue)
+    Q_UNUSED(result)
+    return false;
+}
+
+
+/*
+    Qt WebKit does not understand non-QWidget plugins, so dummy widgets
+    are created, parented to a single dummy tool window.
+
+    The requirements for QML object plugins are input to the Qt WebKit
+    non-QWidget plugin support, which will obsolete this kludge.
+*/
+class QWidget_Dummy_Plugin : public QWidget
+{
+    Q_OBJECT
+public:
+    static QWidget *dummy_shared_parent()
+    {
+        static QWidget *dsp = 0;
+        if (!dsp) {
+            dsp = new QWidget(0,Qt::Tool);
+            dsp->setGeometry(-10000,-10000,0,0);
+            dsp->show();
+        }
+        return dsp;
+    }
+    QWidget_Dummy_Plugin(const QUrl& url, QDeclarativeWebView *view, const QStringList &paramNames, const QStringList &paramValues) :
+        QWidget(dummy_shared_parent()),
+        propertyNames(paramNames),
+        propertyValues(paramValues),
+        webview(view)
+    {
+        QDeclarativeEngine *engine = qmlEngine(webview);
+        component = new QDeclarativeComponent(engine, url, this);
+        item = 0;
+        if (component->isLoading())
+            connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(qmlLoaded()));
+        else
+            qmlLoaded();
+    }
+
+public Q_SLOTS:
+    void qmlLoaded()
+    {
+        if (component->isError()) {
+            // ### Could instead give these errors to the WebView to handle.
+            qWarning() << component->errors();
+            return;
+        }
+        item = qobject_cast<QDeclarativeItem*>(component->create(qmlContext(webview)));
+        item->setParent(webview);
+        QString jsObjName;
+        for (int i=0; i<propertyNames.count(); ++i) {
+            if (propertyNames[i] != QLatin1String("type") && propertyNames[i] != QLatin1String("data")) {
+                item->setProperty(propertyNames[i].toUtf8(),propertyValues[i]);
+                if (propertyNames[i] == QLatin1String("objectname"))
+                    jsObjName = propertyValues[i]; 
+            }
+        }
+        if (!jsObjName.isNull()) { 
+            QWebFrame *f = webview->page()->mainFrame(); 
+            f->addToJavaScriptWindowObject(jsObjName, item); 
+        }
+        resizeEvent(0);
+        delete component;
+        component = 0;
+    }
+    void resizeEvent(QResizeEvent*)
+    {
+        if (item) {
+            item->setX(x());
+            item->setY(y());
+            item->setWidth(width());
+            item->setHeight(height());
+        }
+    }
+
+private:
+    QDeclarativeComponent *component;
+    QDeclarativeItem *item;
+    QStringList propertyNames, propertyValues;
+    QDeclarativeWebView *webview;
+};
+
+QDeclarativeWebView *QDeclarativeWebPage::viewItem()
+{
+    return static_cast<QDeclarativeWebView*>(parent());
+}
+
+QObject *QDeclarativeWebPage::createPlugin(const QString &, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
+{
+    QUrl comp = qmlContext(viewItem())->resolvedUrl(url);
+    return new QWidget_Dummy_Plugin(comp,viewItem(),paramNames,paramValues);
+}
+
+QWebPage *QDeclarativeWebPage::createWindow(WebWindowType type)
+{
+    QDeclarativeWebView *newView = viewItem()->createWindow(type);
+    if (newView)
+        return newView->page();
+    return 0;
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativewebview.moc>
diff --git a/src/declarative/graphicsitems/qdeclarativewebview_p.h b/src/declarative/graphicsitems/qdeclarativewebview_p.h
new file mode 100644
index 0000000..a65aab3
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativewebview_p.h
@@ -0,0 +1,286 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEWEBVIEW_H
+#define QDECLARATIVEWEBVIEW_H
+
+#include "qdeclarativepainteditem_p.h"
+
+#include <QtGui/QAction>
+#include <QtCore/QUrl>
+#include <QtNetwork/qnetworkaccessmanager.h>
+#include <QtWebKit/QWebPage>
+
+QT_BEGIN_HEADER
+
+class QWebHistory;
+class QWebSettings;
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+class QDeclarativeWebViewPrivate;
+class QNetworkRequest;
+class QDeclarativeWebView;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeWebPage : public QWebPage
+{
+    Q_OBJECT
+public:
+    explicit QDeclarativeWebPage(QDeclarativeWebView *parent);
+    ~QDeclarativeWebPage();
+protected:
+    QObject *createPlugin(const QString &classid, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
+    QWebPage *createWindow(WebWindowType type);
+    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
+    QString chooseFile(QWebFrame *originatingFrame, const QString& oldFile);
+    void javaScriptAlert(QWebFrame *originatingFrame, const QString& msg);
+    bool javaScriptConfirm(QWebFrame *originatingFrame, const QString& msg);
+    bool javaScriptPrompt(QWebFrame *originatingFrame, const QString& msg, const QString& defaultValue, QString* result);
+
+private:
+    QDeclarativeWebView *viewItem();
+};
+
+
+class QDeclarativeWebViewAttached;
+class QDeclarativeWebSettings;
+
+//### TODO: browser plugins
+
+class Q_DECLARATIVE_EXPORT QDeclarativeWebView : public QDeclarativePaintedItem
+{
+    Q_OBJECT
+
+    Q_ENUMS(Status SelectionMode)
+
+    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+    Q_PROPERTY(QPixmap icon READ icon NOTIFY iconChanged)
+    Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
+    Q_PROPERTY(QString statusText READ statusText NOTIFY statusTextChanged)
+
+    Q_PROPERTY(QString html READ html WRITE setHtml NOTIFY htmlChanged)
+
+    Q_PROPERTY(int pressGrabTime READ pressGrabTime WRITE setPressGrabTime NOTIFY pressGrabTimeChanged)
+
+    Q_PROPERTY(int preferredWidth READ preferredWidth WRITE setPreferredWidth NOTIFY preferredWidthChanged)
+    Q_PROPERTY(int preferredHeight READ preferredHeight WRITE setPreferredHeight NOTIFY preferredHeightChanged)
+    Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
+    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+
+    Q_PROPERTY(QAction* reload READ reloadAction CONSTANT)
+    Q_PROPERTY(QAction* back READ backAction CONSTANT)
+    Q_PROPERTY(QAction* forward READ forwardAction CONSTANT)
+    Q_PROPERTY(QAction* stop READ stopAction CONSTANT)
+
+    Q_PROPERTY(QDeclarativeWebSettings* settings READ settingsObject CONSTANT)
+
+    Q_PROPERTY(QDeclarativeListProperty<QObject> javaScriptWindowObjects READ javaScriptWindowObjects CONSTANT)
+
+    Q_PROPERTY(QDeclarativeComponent* newWindowComponent READ newWindowComponent WRITE setNewWindowComponent NOTIFY newWindowComponentChanged)
+    Q_PROPERTY(QDeclarativeItem* newWindowParent READ newWindowParent WRITE setNewWindowParent NOTIFY newWindowParentChanged)
+
+    Q_PROPERTY(bool renderingEnabled READ renderingEnabled WRITE setRenderingEnabled NOTIFY renderingEnabledChanged)
+
+public:
+    QDeclarativeWebView(QDeclarativeItem *parent=0);
+    ~QDeclarativeWebView();
+
+    QUrl url() const;
+    void setUrl(const QUrl &);
+
+    QString title() const;
+
+    QPixmap icon() const;
+
+    qreal zoomFactor() const;
+    void setZoomFactor(qreal);
+    Q_INVOKABLE bool heuristicZoom(int clickX, int clickY, qreal maxzoom);
+    QRect elementAreaAt(int x, int y, int minwidth, int minheight) const;
+
+    int pressGrabTime() const;
+    void setPressGrabTime(int);
+
+    int preferredWidth() const;
+    void setPreferredWidth(int);
+    int preferredHeight() const;
+    void setPreferredHeight(int);
+
+    enum Status { Null, Ready, Loading, Error };
+    Status status() const;
+    qreal progress() const;
+    QString statusText() const;
+
+    QAction *reloadAction() const;
+    QAction *backAction() const;
+    QAction *forwardAction() const;
+    QAction *stopAction() const;
+
+    QWebPage *page() const;
+    void setPage(QWebPage *page);
+
+    void load(const QNetworkRequest &request,
+              QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation,
+              const QByteArray &body = QByteArray());
+
+    QString html() const;
+
+    void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
+    void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
+
+    QWebHistory *history() const;
+    QWebSettings *settings() const;
+    QDeclarativeWebSettings *settingsObject() const;
+
+    bool renderingEnabled() const;
+    void setRenderingEnabled(bool);
+
+    QDeclarativeListProperty<QObject> javaScriptWindowObjects();
+
+    static QDeclarativeWebViewAttached *qmlAttachedProperties(QObject *);
+
+    QDeclarativeComponent *newWindowComponent() const;
+    void setNewWindowComponent(QDeclarativeComponent *newWindow);
+    QDeclarativeItem *newWindowParent() const;
+    void setNewWindowParent(QDeclarativeItem *newWindow);
+
+Q_SIGNALS:
+    void preferredWidthChanged();
+    void preferredHeightChanged();
+    void urlChanged();
+    void progressChanged();
+    void statusChanged(Status);
+    void titleChanged(const QString&);
+    void iconChanged();
+    void statusTextChanged();
+    void htmlChanged();
+    void pressGrabTimeChanged();
+    void zoomFactorChanged();
+    void newWindowComponentChanged();
+    void newWindowParentChanged();
+    void renderingEnabledChanged();
+
+    void loadStarted();
+    void loadFinished();
+    void loadFailed();
+
+    void doubleClick(int clickX, int clickY);
+
+    void zoomTo(qreal zoom, int centerX, int centerY);
+
+    void alert(const QString& message);
+
+public Q_SLOTS:
+    QVariant evaluateJavaScript(const QString&);
+
+private Q_SLOTS:
+    void expandToWebPage();
+    void paintPage(const QRect&);
+    void doLoadStarted();
+    void doLoadProgress(int p);
+    void doLoadFinished(bool ok);
+    void setStatusText(const QString&);
+    void windowObjectCleared();
+    void pageUrlChanged();
+    void noteContentsSizeChanged(const QSize&);
+    void initialLayout();
+
+protected:
+    void drawContents(QPainter *, const QRect &);
+
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+    void timerEvent(QTimerEvent *event);
+    void hoverMoveEvent (QGraphicsSceneHoverEvent * event);
+    void keyPressEvent(QKeyEvent* event);
+    void keyReleaseEvent(QKeyEvent* event);
+    virtual void geometryChanged(const QRectF &newGeometry,
+                                 const QRectF &oldGeometry);
+    virtual void focusChanged(bool);
+    virtual bool sceneEvent(QEvent *event);
+    QDeclarativeWebView *createWindow(QWebPage::WebWindowType type);
+
+private:
+    void init();
+    virtual void componentComplete();
+    Q_DISABLE_COPY(QDeclarativeWebView)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeWebView)
+    QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *);
+    QMouseEvent *sceneHoverMoveEventToMouseEvent(QGraphicsSceneHoverEvent *);
+    friend class QDeclarativeWebPage;
+};
+
+class QDeclarativeWebViewAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString windowObjectName READ windowObjectName WRITE setWindowObjectName)
+public:
+    QDeclarativeWebViewAttached(QObject *parent)
+        : QObject(parent)
+    {
+    }
+
+    QString windowObjectName() const
+    {
+        return m_windowObjectName;
+    }
+
+    void setWindowObjectName(const QString &n)
+    {
+        m_windowObjectName = n;
+    }
+
+private:
+    QString m_windowObjectName;
+};
+
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeWebView)
+QML_DECLARE_TYPEINFO(QDeclarativeWebView, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qdeclarativewebview_p_p.h b/src/declarative/graphicsitems/qdeclarativewebview_p_p.h
new file mode 100644
index 0000000..258b472
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativewebview_p_p.h
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEWEBVIEW_P_H
+#define QDECLARATIVEWEBVIEW_P_H
+
+#include <qdeclarative.h>
+
+#include <QtWebKit/QWebPage>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeWebSettings : public QObject {
+    Q_OBJECT
+
+    Q_PROPERTY(QString standardFontFamily READ standardFontFamily WRITE setStandardFontFamily)
+    Q_PROPERTY(QString fixedFontFamily READ fixedFontFamily WRITE setFixedFontFamily)
+    Q_PROPERTY(QString serifFontFamily READ serifFontFamily WRITE setSerifFontFamily)
+    Q_PROPERTY(QString sansSerifFontFamily READ sansSerifFontFamily WRITE setSansSerifFontFamily)
+    Q_PROPERTY(QString cursiveFontFamily READ cursiveFontFamily WRITE setCursiveFontFamily)
+    Q_PROPERTY(QString fantasyFontFamily READ fantasyFontFamily WRITE setFantasyFontFamily)
+
+    Q_PROPERTY(int minimumFontSize READ minimumFontSize WRITE setMinimumFontSize)
+    Q_PROPERTY(int minimumLogicalFontSize READ minimumLogicalFontSize WRITE setMinimumLogicalFontSize)
+    Q_PROPERTY(int defaultFontSize READ defaultFontSize WRITE setDefaultFontSize)
+    Q_PROPERTY(int defaultFixedFontSize READ defaultFixedFontSize WRITE setDefaultFixedFontSize)
+
+    Q_PROPERTY(bool autoLoadImages READ autoLoadImages WRITE setAutoLoadImages)
+    Q_PROPERTY(bool javascriptEnabled READ javascriptEnabled WRITE setJavascriptEnabled)
+    Q_PROPERTY(bool javaEnabled READ javaEnabled WRITE setJavaEnabled)
+    Q_PROPERTY(bool pluginsEnabled READ pluginsEnabled WRITE setPluginsEnabled)
+    Q_PROPERTY(bool privateBrowsingEnabled READ privateBrowsingEnabled WRITE setPrivateBrowsingEnabled)
+    Q_PROPERTY(bool javascriptCanOpenWindows READ javascriptCanOpenWindows WRITE setJavascriptCanOpenWindows)
+    Q_PROPERTY(bool javascriptCanAccessClipboard READ javascriptCanAccessClipboard WRITE setJavascriptCanAccessClipboard)
+    Q_PROPERTY(bool developerExtrasEnabled READ developerExtrasEnabled WRITE setDeveloperExtrasEnabled)
+    Q_PROPERTY(bool linksIncludedInFocusChain READ linksIncludedInFocusChain WRITE setLinksIncludedInFocusChain)
+    Q_PROPERTY(bool zoomTextOnly READ zoomTextOnly WRITE setZoomTextOnly)
+    Q_PROPERTY(bool printElementBackgrounds READ printElementBackgrounds WRITE setPrintElementBackgrounds)
+    Q_PROPERTY(bool offlineStorageDatabaseEnabled READ offlineStorageDatabaseEnabled WRITE setOfflineStorageDatabaseEnabled)
+    Q_PROPERTY(bool offlineWebApplicationCacheEnabled READ offlineWebApplicationCacheEnabled WRITE setOfflineWebApplicationCacheEnabled)
+    Q_PROPERTY(bool localStorageDatabaseEnabled READ localStorageDatabaseEnabled WRITE setLocalStorageDatabaseEnabled)
+    Q_PROPERTY(bool localContentCanAccessRemoteUrls READ localContentCanAccessRemoteUrls WRITE setLocalContentCanAccessRemoteUrls)
+
+public:
+    QDeclarativeWebSettings() {}
+
+    QString standardFontFamily() const { return s->fontFamily(QWebSettings::StandardFont); }
+    void setStandardFontFamily(const QString& f) { s->setFontFamily(QWebSettings::StandardFont,f); }
+    QString fixedFontFamily() const { return s->fontFamily(QWebSettings::FixedFont); }
+    void setFixedFontFamily(const QString& f) { s->setFontFamily(QWebSettings::FixedFont,f); }
+    QString serifFontFamily() const { return s->fontFamily(QWebSettings::SerifFont); }
+    void setSerifFontFamily(const QString& f) { s->setFontFamily(QWebSettings::SerifFont,f); }
+    QString sansSerifFontFamily() const { return s->fontFamily(QWebSettings::SansSerifFont); }
+    void setSansSerifFontFamily(const QString& f) { s->setFontFamily(QWebSettings::SansSerifFont,f); }
+    QString cursiveFontFamily() const { return s->fontFamily(QWebSettings::CursiveFont); }
+    void setCursiveFontFamily(const QString& f) { s->setFontFamily(QWebSettings::CursiveFont,f); }
+    QString fantasyFontFamily() const { return s->fontFamily(QWebSettings::FantasyFont); }
+    void setFantasyFontFamily(const QString& f) { s->setFontFamily(QWebSettings::FantasyFont,f); }
+
+    int minimumFontSize() const { return s->fontSize(QWebSettings::MinimumFontSize); }
+    void setMinimumFontSize(int size) { s->setFontSize(QWebSettings::MinimumFontSize,size); }
+    int minimumLogicalFontSize() const { return s->fontSize(QWebSettings::MinimumLogicalFontSize); }
+    void setMinimumLogicalFontSize(int size) { s->setFontSize(QWebSettings::MinimumLogicalFontSize,size); }
+    int defaultFontSize() const { return s->fontSize(QWebSettings::DefaultFontSize); }
+    void setDefaultFontSize(int size) { s->setFontSize(QWebSettings::DefaultFontSize,size); }
+    int defaultFixedFontSize() const { return s->fontSize(QWebSettings::DefaultFixedFontSize); }
+    void setDefaultFixedFontSize(int size) { s->setFontSize(QWebSettings::DefaultFixedFontSize,size); }
+
+    bool autoLoadImages() const { return s->testAttribute(QWebSettings::AutoLoadImages); }
+    void setAutoLoadImages(bool on) { s->setAttribute(QWebSettings::AutoLoadImages, on); }
+    bool javascriptEnabled() const { return s->testAttribute(QWebSettings::JavascriptEnabled); }
+    void setJavascriptEnabled(bool on) { s->setAttribute(QWebSettings::JavascriptEnabled, on); }
+    bool javaEnabled() const { return s->testAttribute(QWebSettings::JavaEnabled); }
+    void setJavaEnabled(bool on) { s->setAttribute(QWebSettings::JavaEnabled, on); }
+    bool pluginsEnabled() const { return s->testAttribute(QWebSettings::PluginsEnabled); }
+    void setPluginsEnabled(bool on) { s->setAttribute(QWebSettings::PluginsEnabled, on); }
+    bool privateBrowsingEnabled() const { return s->testAttribute(QWebSettings::PrivateBrowsingEnabled); }
+    void setPrivateBrowsingEnabled(bool on) { s->setAttribute(QWebSettings::PrivateBrowsingEnabled, on); }
+    bool javascriptCanOpenWindows() const { return s->testAttribute(QWebSettings::JavascriptCanOpenWindows); }
+    void setJavascriptCanOpenWindows(bool on) { s->setAttribute(QWebSettings::JavascriptCanOpenWindows, on); }
+    bool javascriptCanAccessClipboard() const { return s->testAttribute(QWebSettings::JavascriptCanAccessClipboard); }
+    void setJavascriptCanAccessClipboard(bool on) { s->setAttribute(QWebSettings::JavascriptCanAccessClipboard, on); }
+    bool developerExtrasEnabled() const { return s->testAttribute(QWebSettings::DeveloperExtrasEnabled); }
+    void setDeveloperExtrasEnabled(bool on) { s->setAttribute(QWebSettings::DeveloperExtrasEnabled, on); }
+    bool linksIncludedInFocusChain() const { return s->testAttribute(QWebSettings::LinksIncludedInFocusChain); }
+    void setLinksIncludedInFocusChain(bool on) { s->setAttribute(QWebSettings::LinksIncludedInFocusChain, on); }
+    bool zoomTextOnly() const { return s->testAttribute(QWebSettings::ZoomTextOnly); }
+    void setZoomTextOnly(bool on) { s->setAttribute(QWebSettings::ZoomTextOnly, on); }
+    bool printElementBackgrounds() const { return s->testAttribute(QWebSettings::PrintElementBackgrounds); }
+    void setPrintElementBackgrounds(bool on) { s->setAttribute(QWebSettings::PrintElementBackgrounds, on); }
+    bool offlineStorageDatabaseEnabled() const { return s->testAttribute(QWebSettings::OfflineStorageDatabaseEnabled); }
+    void setOfflineStorageDatabaseEnabled(bool on) { s->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, on); }
+    bool offlineWebApplicationCacheEnabled() const { return s->testAttribute(QWebSettings::OfflineWebApplicationCacheEnabled); }
+    void setOfflineWebApplicationCacheEnabled(bool on) { s->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, on); }
+    bool localStorageDatabaseEnabled() const { return s->testAttribute(QWebSettings::LocalStorageDatabaseEnabled); }
+    void setLocalStorageDatabaseEnabled(bool on) { s->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, on); }
+    bool localContentCanAccessRemoteUrls() const { return s->testAttribute(QWebSettings::LocalContentCanAccessRemoteUrls); }
+    void setLocalContentCanAccessRemoteUrls(bool on) { s->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, on); }
+
+    QWebSettings *s;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeWebSettings)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
deleted file mode 100644
index 72b4717..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
+++ /dev/null
@@ -1,1059 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsanchors_p_p.h"
-
-#include "qmlgraphicsitem.h"
-#include "qmlgraphicsitem_p.h"
-
-#include <qmlinfo.h>
-
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-
-//TODO: should we cache relationships, so we don't have to check each time (parent-child or sibling)?
-//TODO: support non-parent, non-sibling (need to find lowest common ancestor)
-
-//### const item?
-//local position
-static qreal position(QmlGraphicsItem *item, QmlGraphicsAnchorLine::AnchorLine anchorLine)
-{
-    qreal ret = 0.0;
-    switch(anchorLine) {
-    case QmlGraphicsAnchorLine::Left:
-        ret = item->x();
-        break;
-    case QmlGraphicsAnchorLine::Right:
-        ret = item->x() + item->width();
-        break;
-    case QmlGraphicsAnchorLine::Top:
-        ret = item->y();
-        break;
-    case QmlGraphicsAnchorLine::Bottom:
-        ret = item->y() + item->height();
-        break;
-    case QmlGraphicsAnchorLine::HCenter:
-        ret = item->x() + item->width()/2;
-        break;
-    case QmlGraphicsAnchorLine::VCenter:
-        ret = item->y() + item->height()/2;
-        break;
-    case QmlGraphicsAnchorLine::Baseline:
-        ret = item->y() + item->baselineOffset();
-        break;
-    default:
-        break;
-    }
-
-    return ret;
-}
-
-//position when origin is 0,0
-static qreal adjustedPosition(QmlGraphicsItem *item, QmlGraphicsAnchorLine::AnchorLine anchorLine)
-{
-    int ret = 0;
-    switch(anchorLine) {
-    case QmlGraphicsAnchorLine::Left:
-        ret = 0;
-        break;
-    case QmlGraphicsAnchorLine::Right:
-        ret = item->width();
-        break;
-    case QmlGraphicsAnchorLine::Top:
-        ret = 0;
-        break;
-    case QmlGraphicsAnchorLine::Bottom:
-        ret = item->height();
-        break;
-    case QmlGraphicsAnchorLine::HCenter:
-        ret = item->width()/2;
-        break;
-    case QmlGraphicsAnchorLine::VCenter:
-        ret = item->height()/2;
-        break;
-    case QmlGraphicsAnchorLine::Baseline:
-        ret = item->baselineOffset();
-        break;
-    default:
-        break;
-    }
-
-    return ret;
-}
-
-/*!
-    \internal
-    \class QmlGraphicsAnchors
-    \since 4.7
-    \ingroup group_layouts
-    \brief The QmlGraphicsAnchors class provides a way to lay out items relative to other items.
-
-    \warning Currently, only anchoring to siblings or parent is supported.
-*/
-
-QmlGraphicsAnchors::QmlGraphicsAnchors(QObject *parent)
-  : QObject(*new QmlGraphicsAnchorsPrivate(0), parent)
-{
-    qFatal("QmlGraphicsAnchors::QmlGraphicsAnchors(QObject*) called");
-}
-
-QmlGraphicsAnchors::QmlGraphicsAnchors(QmlGraphicsItem *item, QObject *parent)
-  : QObject(*new QmlGraphicsAnchorsPrivate(item), parent)
-{
-}
-
-QmlGraphicsAnchors::~QmlGraphicsAnchors()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->remDepend(d->fill);
-    d->remDepend(d->centerIn);
-    d->remDepend(d->left.item);
-    d->remDepend(d->right.item);
-    d->remDepend(d->top.item);
-    d->remDepend(d->bottom.item);
-    d->remDepend(d->vCenter.item);
-    d->remDepend(d->hCenter.item);
-    d->remDepend(d->baseline.item);
-}
-
-void QmlGraphicsAnchorsPrivate::fillChanged()
-{
-    if (!fill || !isItemComplete())
-        return;
-
-    if (updatingFill < 2) {
-        ++updatingFill;
-
-        if (fill == item->parentItem()) {                         //child-parent
-            setItemPos(QPointF(leftMargin, topMargin));
-        } else if (fill->parentItem() == item->parentItem()) {   //siblings
-            setItemPos(QPointF(fill->x()+leftMargin, fill->y()+topMargin));
-        }
-        setItemWidth(fill->width()-leftMargin-rightMargin);
-        setItemHeight(fill->height()-topMargin-bottomMargin);
-
-        --updatingFill;
-    } else {
-        // ### Make this certain :)
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Possible anchor loop detected on fill.");
-    }
-
-}
-
-void QmlGraphicsAnchorsPrivate::centerInChanged()
-{
-    if (!centerIn || fill || !isItemComplete())
-        return;
-
-    if (updatingCenterIn < 2) {
-        ++updatingCenterIn;
-
-        if (centerIn == item->parentItem()) {
-            QPointF p((item->parentItem()->width() - item->width()) / 2. + hCenterOffset,
-                      (item->parentItem()->height() - item->height()) / 2. + vCenterOffset);
-            setItemPos(p);
-
-        } else if (centerIn->parentItem() == item->parentItem()) {
-
-            QPointF p(centerIn->x() + (centerIn->width() - item->width()) / 2. + hCenterOffset,
-                      centerIn->y() + (centerIn->height() - item->height()) / 2. + vCenterOffset);
-            setItemPos(p);
-        }
-
-        --updatingCenterIn;
-    } else {
-        // ### Make this certain :)
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Possible anchor loop detected on centerIn.");
-    }
-}
-
-void QmlGraphicsAnchorsPrivate::clearItem(QmlGraphicsItem *item)
-{
-    if (!item)
-        return;
-    if (fill == item)
-        fill = 0;
-    if (centerIn == item)
-        centerIn = 0;
-    if (left.item == item) {
-        left.item = 0;
-        usedAnchors &= ~QmlGraphicsAnchors::HasLeftAnchor;
-    }
-    if (right.item == item) {
-        right.item = 0;
-        usedAnchors &= ~QmlGraphicsAnchors::HasRightAnchor;
-    }
-    if (top.item == item) {
-        top.item = 0;
-        usedAnchors &= ~QmlGraphicsAnchors::HasTopAnchor;
-    }
-    if (bottom.item == item) {
-        bottom.item = 0;
-        usedAnchors &= ~QmlGraphicsAnchors::HasBottomAnchor;
-    }
-    if (vCenter.item == item) {
-        vCenter.item = 0;
-        usedAnchors &= ~QmlGraphicsAnchors::HasVCenterAnchor;
-    }
-    if (hCenter.item == item) {
-        hCenter.item = 0;
-        usedAnchors &= ~QmlGraphicsAnchors::HasHCenterAnchor;
-    }
-    if (baseline.item == item) {
-        baseline.item = 0;
-        usedAnchors &= ~QmlGraphicsAnchors::HasBaselineAnchor;
-    }
-}
-
-void QmlGraphicsAnchorsPrivate::addDepend(QmlGraphicsItem *item)
-{
-    if (!item)
-        return;
-    QmlGraphicsItemPrivate *p =
-        static_cast<QmlGraphicsItemPrivate *>(QGraphicsItemPrivate::get(item));
-    p->addItemChangeListener(this, QmlGraphicsItemPrivate::Geometry);
-}
-
-void QmlGraphicsAnchorsPrivate::remDepend(QmlGraphicsItem *item)
-{
-    if (!item)
-        return;
-    QmlGraphicsItemPrivate *p =
-        static_cast<QmlGraphicsItemPrivate *>(QGraphicsItemPrivate::get(item));
-    p->removeItemChangeListener(this, QmlGraphicsItemPrivate::Geometry);
-}
-
-bool QmlGraphicsAnchorsPrivate::isItemComplete() const
-{
-    return componentComplete;
-}
-
-void QmlGraphicsAnchors::classBegin()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->componentComplete = false;
-}
-
-void QmlGraphicsAnchors::componentComplete()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->componentComplete = true;
-}
-
-void QmlGraphicsAnchorsPrivate::setItemHeight(qreal v)
-{
-    updatingMe = true;
-    item->setHeight(v);
-    updatingMe = false;
-}
-
-void QmlGraphicsAnchorsPrivate::setItemWidth(qreal v)
-{
-    updatingMe = true;
-    item->setWidth(v);
-    updatingMe = false;
-}
-
-void QmlGraphicsAnchorsPrivate::setItemX(qreal v)
-{
-    updatingMe = true;
-    item->setX(v);
-    updatingMe = false;
-}
-
-void QmlGraphicsAnchorsPrivate::setItemY(qreal v)
-{
-    updatingMe = true;
-    item->setY(v);
-    updatingMe = false;
-}
-
-void QmlGraphicsAnchorsPrivate::setItemPos(const QPointF &v)
-{
-    updatingMe = true;
-    item->setPos(v);
-    updatingMe = false;
-}
-
-void QmlGraphicsAnchorsPrivate::updateMe()
-{
-    if (updatingMe) {
-        updatingMe = false;
-        return;
-    }
-
-    fillChanged();
-    centerInChanged();
-    updateHorizontalAnchors();
-    updateVerticalAnchors();
-}
-
-void QmlGraphicsAnchorsPrivate::updateOnComplete()
-{
-    fillChanged();
-    centerInChanged();
-    updateHorizontalAnchors();
-    updateVerticalAnchors();
-}
-
-void QmlGraphicsAnchorsPrivate::itemGeometryChanged(QmlGraphicsItem *, const QRectF &newG, const QRectF &oldG)
-{
-    fillChanged();
-    centerInChanged();
-
-    if (newG.x() != oldG.x() || newG.width() != oldG.width())
-        updateHorizontalAnchors();
-    if (newG.y() != oldG.y() || newG.height() != oldG.height())
-        updateVerticalAnchors();
-}
-
-QmlGraphicsItem *QmlGraphicsAnchors::fill() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->fill;
-}
-
-void QmlGraphicsAnchors::setFill(QmlGraphicsItem *f)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->fill == f)
-        return;
-
-    if (!f) {
-        d->remDepend(d->fill);
-        d->fill = f;
-        emit fillChanged();
-        return;
-    }
-    if (f != d->item->parentItem() && f->parentItem() != d->item->parentItem()){
-        qmlInfo(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
-        return;
-    }
-    d->remDepend(d->fill);
-    d->fill = f;
-    d->addDepend(d->fill);
-    emit fillChanged();
-    d->fillChanged();
-}
-
-void QmlGraphicsAnchors::resetFill()
-{
-    setFill(0);
-}
-
-QmlGraphicsItem *QmlGraphicsAnchors::centerIn() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->centerIn;
-}
-
-void QmlGraphicsAnchors::setCenterIn(QmlGraphicsItem* c)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->centerIn == c)
-        return;
-
-    if (!c) {
-        d->remDepend(d->centerIn);
-        d->centerIn = c;
-        emit centerInChanged();
-        return;
-    }
-    if (c != d->item->parentItem() && c->parentItem() != d->item->parentItem()){
-        qmlInfo(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
-        return;
-    }
-
-    d->remDepend(d->centerIn);
-    d->centerIn = c;
-    d->addDepend(d->centerIn);
-    emit centerInChanged();
-    d->centerInChanged();
-}
-
-void QmlGraphicsAnchors::resetCenterIn()
-{
-    setCenterIn(0);
-}
-
-bool QmlGraphicsAnchorsPrivate::calcStretch(const QmlGraphicsAnchorLine &edge1,
-                                    const QmlGraphicsAnchorLine &edge2,
-                                    int offset1,
-                                    int offset2,
-                                    QmlGraphicsAnchorLine::AnchorLine line,
-                                    int &stretch)
-{
-    bool edge1IsParent = (edge1.item == item->parentItem());
-    bool edge2IsParent = (edge2.item == item->parentItem());
-    bool edge1IsSibling = (edge1.item->parentItem() == item->parentItem());
-    bool edge2IsSibling = (edge2.item->parentItem() == item->parentItem());
-
-    bool invalid = false;
-    if ((edge2IsParent && edge1IsParent) || (edge2IsSibling && edge1IsSibling)) {
-        stretch = ((int)position(edge2.item, edge2.anchorLine) + offset2)
-                    - ((int)position(edge1.item, edge1.anchorLine) + offset1);
-    } else if (edge2IsParent && edge1IsSibling) {
-        stretch = ((int)position(edge2.item, edge2.anchorLine) + offset2)
-                    - ((int)position(item->parentItem(), line)
-                    + (int)position(edge1.item, edge1.anchorLine) + offset1);
-    } else if (edge2IsSibling && edge1IsParent) {
-        stretch = ((int)position(item->parentItem(), line) + (int)position(edge2.item, edge2.anchorLine) + offset2)
-                    - ((int)position(edge1.item, edge1.anchorLine) + offset1);
-    } else
-        invalid = true;
-
-    return invalid;
-}
-
-void QmlGraphicsAnchorsPrivate::updateVerticalAnchors()
-{
-    if (fill || centerIn || !isItemComplete())
-        return;
-
-    if (updatingVerticalAnchor < 2) {
-        ++updatingVerticalAnchor;
-        if (usedAnchors & QmlGraphicsAnchors::HasTopAnchor) {
-            //Handle stretching
-            bool invalid = true;
-            int height = 0;
-            if (usedAnchors & QmlGraphicsAnchors::HasBottomAnchor) {
-                invalid = calcStretch(top, bottom, topMargin, -bottomMargin, QmlGraphicsAnchorLine::Top, height);
-            } else if (usedAnchors & QmlGraphicsAnchors::HasVCenterAnchor) {
-                invalid = calcStretch(top, vCenter, topMargin, vCenterOffset, QmlGraphicsAnchorLine::Top, height);
-                height *= 2;
-            }
-            if (!invalid)
-                setItemHeight(height);
-
-            //Handle top
-            if (top.item == item->parentItem()) {
-                setItemY(adjustedPosition(top.item, top.anchorLine) + topMargin);
-            } else if (top.item->parentItem() == item->parentItem()) {
-                setItemY(position(top.item, top.anchorLine) + topMargin);
-            }
-        } else if (usedAnchors & QmlGraphicsAnchors::HasBottomAnchor) {
-            //Handle stretching (top + bottom case is handled above)
-            if (usedAnchors & QmlGraphicsAnchors::HasVCenterAnchor) {
-                int height = 0;
-                bool invalid = calcStretch(vCenter, bottom, vCenterOffset, -bottomMargin,
-                                              QmlGraphicsAnchorLine::Top, height);
-                if (!invalid)
-                    setItemHeight(height*2);
-            }
-
-            //Handle bottom
-            if (bottom.item == item->parentItem()) {
-                setItemY(adjustedPosition(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
-            } else if (bottom.item->parentItem() == item->parentItem()) {
-                setItemY(position(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
-            }
-        } else if (usedAnchors & QmlGraphicsAnchors::HasVCenterAnchor) {
-            //(stetching handled above)
-
-            //Handle vCenter
-            if (vCenter.item == item->parentItem()) {
-                setItemY(adjustedPosition(vCenter.item, vCenter.anchorLine)
-                              - item->height()/2 + vCenterOffset);
-            } else if (vCenter.item->parentItem() == item->parentItem()) {
-                setItemY(position(vCenter.item, vCenter.anchorLine) - item->height()/2 + vCenterOffset);
-            }
-        } else if (usedAnchors & QmlGraphicsAnchors::HasBaselineAnchor) {
-            //Handle baseline
-            if (baseline.item == item->parentItem()) {
-                setItemY(adjustedPosition(baseline.item, baseline.anchorLine)
-                        - item->baselineOffset() + baselineOffset);
-            } else if (baseline.item->parentItem() == item->parentItem()) {
-                setItemY(position(baseline.item, baseline.anchorLine)
-                        - item->baselineOffset() + baselineOffset);
-            }
-        }
-        --updatingVerticalAnchor;
-    } else {
-        // ### Make this certain :)
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Possible anchor loop detected on vertical anchor.");
-    }
-}
-
-void QmlGraphicsAnchorsPrivate::updateHorizontalAnchors()
-{
-    if (fill || centerIn || !isItemComplete())
-        return;
-
-    if (updatingHorizontalAnchor < 2) {
-        ++updatingHorizontalAnchor;
-
-        if (usedAnchors & QmlGraphicsAnchors::HasLeftAnchor) {
-            //Handle stretching
-            bool invalid = true;
-            int width = 0;
-            if (usedAnchors & QmlGraphicsAnchors::HasRightAnchor) {
-                invalid = calcStretch(left, right, leftMargin, -rightMargin, QmlGraphicsAnchorLine::Left, width);
-            } else if (usedAnchors & QmlGraphicsAnchors::HasHCenterAnchor) {
-                invalid = calcStretch(left, hCenter, leftMargin, hCenterOffset, QmlGraphicsAnchorLine::Left, width);
-                width *= 2;
-            }
-            if (!invalid)
-                setItemWidth(width);
-
-            //Handle left
-            if (left.item == item->parentItem()) {
-                setItemX(adjustedPosition(left.item, left.anchorLine) + leftMargin);
-            } else if (left.item->parentItem() == item->parentItem()) {
-                setItemX(position(left.item, left.anchorLine) + leftMargin);
-            }
-        } else if (usedAnchors & QmlGraphicsAnchors::HasRightAnchor) {
-            //Handle stretching (left + right case is handled in updateLeftAnchor)
-            if (usedAnchors & QmlGraphicsAnchors::HasHCenterAnchor) {
-                int width = 0;
-                bool invalid = calcStretch(hCenter, right, hCenterOffset, -rightMargin,
-                                              QmlGraphicsAnchorLine::Left, width);
-                if (!invalid)
-                    setItemWidth(width*2);
-            }
-
-            //Handle right
-            if (right.item == item->parentItem()) {
-                setItemX(adjustedPosition(right.item, right.anchorLine) - item->width() - rightMargin);
-            } else if (right.item->parentItem() == item->parentItem()) {
-                setItemX(position(right.item, right.anchorLine) - item->width() - rightMargin);
-            }
-        } else if (usedAnchors & QmlGraphicsAnchors::HasHCenterAnchor) {
-            //Handle hCenter
-            if (hCenter.item == item->parentItem()) {
-                setItemX(adjustedPosition(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
-            } else if (hCenter.item->parentItem() == item->parentItem()) {
-                setItemX(position(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
-            }
-        }
-
-        --updatingHorizontalAnchor;
-    } else {
-        // ### Make this certain :)
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Possible anchor loop detected on horizontal anchor.");
-    }
-}
-
-QmlGraphicsAnchorLine QmlGraphicsAnchors::top() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->top;
-}
-
-void QmlGraphicsAnchors::setTop(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (!d->checkVAnchorValid(edge) || d->top == edge)
-        return;
-
-    d->usedAnchors |= HasTopAnchor;
-
-    if (!d->checkVValid()) {
-        d->usedAnchors &= ~HasTopAnchor;
-        return;
-    }
-
-    d->remDepend(d->top.item);
-    d->top = edge;
-    d->addDepend(d->top.item);
-    emit topChanged();
-    d->updateVerticalAnchors();
-}
-
-void QmlGraphicsAnchors::resetTop()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->usedAnchors &= ~HasTopAnchor;
-    d->remDepend(d->top.item);
-    d->top = QmlGraphicsAnchorLine();
-    emit topChanged();
-    d->updateVerticalAnchors();
-}
-
-QmlGraphicsAnchorLine QmlGraphicsAnchors::bottom() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->bottom;
-}
-
-void QmlGraphicsAnchors::setBottom(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (!d->checkVAnchorValid(edge) || d->bottom == edge)
-        return;
-
-    d->usedAnchors |= HasBottomAnchor;
-
-    if (!d->checkVValid()) {
-        d->usedAnchors &= ~HasBottomAnchor;
-        return;
-    }
-
-    d->remDepend(d->bottom.item);
-    d->bottom = edge;
-    d->addDepend(d->bottom.item);
-    emit bottomChanged();
-    d->updateVerticalAnchors();
-}
-
-void QmlGraphicsAnchors::resetBottom()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->usedAnchors &= ~HasBottomAnchor;
-    d->remDepend(d->bottom.item);
-    d->bottom = QmlGraphicsAnchorLine();
-    emit bottomChanged();
-    d->updateVerticalAnchors();
-}
-
-QmlGraphicsAnchorLine QmlGraphicsAnchors::verticalCenter() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->vCenter;
-}
-
-void QmlGraphicsAnchors::setVerticalCenter(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (!d->checkVAnchorValid(edge) || d->vCenter == edge)
-        return;
-
-    d->usedAnchors |= HasVCenterAnchor;
-
-    if (!d->checkVValid()) {
-        d->usedAnchors &= ~HasVCenterAnchor;
-        return;
-    }
-
-    d->remDepend(d->vCenter.item);
-    d->vCenter = edge;
-    d->addDepend(d->vCenter.item);
-    emit verticalCenterChanged();
-    d->updateVerticalAnchors();
-}
-
-void QmlGraphicsAnchors::resetVerticalCenter()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->usedAnchors &= ~HasVCenterAnchor;
-    d->remDepend(d->vCenter.item);
-    d->vCenter = QmlGraphicsAnchorLine();
-    emit verticalCenterChanged();
-    d->updateVerticalAnchors();
-}
-
-QmlGraphicsAnchorLine QmlGraphicsAnchors::baseline() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->baseline;
-}
-
-void QmlGraphicsAnchors::setBaseline(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (!d->checkVAnchorValid(edge) || d->baseline == edge)
-        return;
-
-    d->usedAnchors |= HasBaselineAnchor;
-
-    if (!d->checkVValid()) {
-        d->usedAnchors &= ~HasBaselineAnchor;
-        return;
-    }
-
-    d->remDepend(d->baseline.item);
-    d->baseline = edge;
-    d->addDepend(d->baseline.item);
-    emit baselineChanged();
-    d->updateVerticalAnchors();
-}
-
-void QmlGraphicsAnchors::resetBaseline()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->usedAnchors &= ~HasBaselineAnchor;
-    d->remDepend(d->baseline.item);
-    d->baseline = QmlGraphicsAnchorLine();
-    emit baselineChanged();
-    d->updateVerticalAnchors();
-}
-
-QmlGraphicsAnchorLine QmlGraphicsAnchors::left() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->left;
-}
-
-void QmlGraphicsAnchors::setLeft(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (!d->checkHAnchorValid(edge) || d->left == edge)
-        return;
-
-    d->usedAnchors |= HasLeftAnchor;
-
-    if (!d->checkHValid()) {
-        d->usedAnchors &= ~HasLeftAnchor;
-        return;
-    }
-
-    d->remDepend(d->left.item);
-    d->left = edge;
-    d->addDepend(d->left.item);
-    emit leftChanged();
-    d->updateHorizontalAnchors();
-}
-
-void QmlGraphicsAnchors::resetLeft()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->usedAnchors &= ~HasLeftAnchor;
-    d->remDepend(d->left.item);
-    d->left = QmlGraphicsAnchorLine();
-    emit leftChanged();
-    d->updateHorizontalAnchors();
-}
-
-QmlGraphicsAnchorLine QmlGraphicsAnchors::right() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->right;
-}
-
-void QmlGraphicsAnchors::setRight(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (!d->checkHAnchorValid(edge) || d->right == edge)
-        return;
-
-    d->usedAnchors |= HasRightAnchor;
-
-    if (!d->checkHValid()) {
-        d->usedAnchors &= ~HasRightAnchor;
-        return;
-    }
-
-    d->remDepend(d->right.item);
-    d->right = edge;
-    d->addDepend(d->right.item);
-    emit rightChanged();
-    d->updateHorizontalAnchors();
-}
-
-void QmlGraphicsAnchors::resetRight()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->usedAnchors &= ~HasRightAnchor;
-    d->remDepend(d->right.item);
-    d->right = QmlGraphicsAnchorLine();
-    emit rightChanged();
-    d->updateHorizontalAnchors();
-}
-
-QmlGraphicsAnchorLine QmlGraphicsAnchors::horizontalCenter() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->hCenter;
-}
-
-void QmlGraphicsAnchors::setHorizontalCenter(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (!d->checkHAnchorValid(edge) || d->hCenter == edge)
-        return;
-
-    d->usedAnchors |= HasHCenterAnchor;
-
-    if (!d->checkHValid()) {
-        d->usedAnchors &= ~HasHCenterAnchor;
-        return;
-    }
-
-    d->remDepend(d->hCenter.item);
-    d->hCenter = edge;
-    d->addDepend(d->hCenter.item);
-    emit horizontalCenterChanged();
-    d->updateHorizontalAnchors();
-}
-
-void QmlGraphicsAnchors::resetHorizontalCenter()
-{
-    Q_D(QmlGraphicsAnchors);
-    d->usedAnchors &= ~HasHCenterAnchor;
-    d->remDepend(d->hCenter.item);
-    d->hCenter = QmlGraphicsAnchorLine();
-    emit horizontalCenterChanged();
-    d->updateHorizontalAnchors();
-}
-
-qreal QmlGraphicsAnchors::leftMargin() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->leftMargin;
-}
-
-void QmlGraphicsAnchors::setLeftMargin(qreal offset)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->leftMargin == offset)
-        return;
-    d->leftMargin = offset;
-    if(d->fill)
-        d->fillChanged();
-    else
-        d->updateHorizontalAnchors();
-    emit leftMarginChanged();
-}
-
-qreal QmlGraphicsAnchors::rightMargin() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->rightMargin;
-}
-
-void QmlGraphicsAnchors::setRightMargin(qreal offset)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->rightMargin == offset)
-        return;
-    d->rightMargin = offset;
-    if(d->fill)
-        d->fillChanged();
-    else
-        d->updateHorizontalAnchors();
-    emit rightMarginChanged();
-}
-
-qreal QmlGraphicsAnchors::margins() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->margins;
-}
-
-void QmlGraphicsAnchors::setMargins(qreal offset)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->margins == offset)
-        return;
-    //###Is it significantly faster to set them directly so we can call fillChanged only once?
-    if(!d->rightMargin || d->rightMargin == d->margins)
-        setRightMargin(offset);
-    if(!d->leftMargin || d->leftMargin == d->margins)
-        setLeftMargin(offset);
-    if(!d->topMargin || d->topMargin == d->margins)
-        setTopMargin(offset);
-    if(!d->bottomMargin || d->bottomMargin == d->margins)
-        setBottomMargin(offset);
-    d->margins = offset;
-    emit marginsChanged();
-
-}
-
-qreal QmlGraphicsAnchors::horizontalCenterOffset() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->hCenterOffset;
-}
-
-void QmlGraphicsAnchors::setHorizontalCenterOffset(qreal offset)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->hCenterOffset == offset)
-        return;
-    d->hCenterOffset = offset;
-    if(d->centerIn)
-        d->centerInChanged();
-    else
-        d->updateHorizontalAnchors();
-    emit horizontalCenterOffsetChanged();
-}
-
-qreal QmlGraphicsAnchors::topMargin() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->topMargin;
-}
-
-void QmlGraphicsAnchors::setTopMargin(qreal offset)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->topMargin == offset)
-        return;
-    d->topMargin = offset;
-    if(d->fill)
-        d->fillChanged();
-    else
-        d->updateVerticalAnchors();
-    emit topMarginChanged();
-}
-
-qreal QmlGraphicsAnchors::bottomMargin() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->bottomMargin;
-}
-
-void QmlGraphicsAnchors::setBottomMargin(qreal offset)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->bottomMargin == offset)
-        return;
-    d->bottomMargin = offset;
-    if(d->fill)
-        d->fillChanged();
-    else
-        d->updateVerticalAnchors();
-    emit bottomMarginChanged();
-}
-
-qreal QmlGraphicsAnchors::verticalCenterOffset() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->vCenterOffset;
-}
-
-void QmlGraphicsAnchors::setVerticalCenterOffset(qreal offset)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->vCenterOffset == offset)
-        return;
-    d->vCenterOffset = offset;
-    if(d->centerIn)
-        d->centerInChanged();
-    else
-        d->updateVerticalAnchors();
-    emit verticalCenterOffsetChanged();
-}
-
-qreal QmlGraphicsAnchors::baselineOffset() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->baselineOffset;
-}
-
-void QmlGraphicsAnchors::setBaselineOffset(qreal offset)
-{
-    Q_D(QmlGraphicsAnchors);
-    if (d->baselineOffset == offset)
-        return;
-    d->baselineOffset = offset;
-    d->updateVerticalAnchors();
-    emit baselineOffsetChanged();
-}
-
-QmlGraphicsAnchors::UsedAnchors QmlGraphicsAnchors::usedAnchors() const
-{
-    Q_D(const QmlGraphicsAnchors);
-    return d->usedAnchors;
-}
-
-bool QmlGraphicsAnchorsPrivate::checkHValid() const
-{
-    if (usedAnchors & QmlGraphicsAnchors::HasLeftAnchor &&
-        usedAnchors & QmlGraphicsAnchors::HasRightAnchor &&
-        usedAnchors & QmlGraphicsAnchors::HasHCenterAnchor) {
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot specify left, right, and hcenter anchors.");
-        return false;
-    }
-
-    return true;
-}
-
-bool QmlGraphicsAnchorsPrivate::checkHAnchorValid(QmlGraphicsAnchorLine anchor) const
-{
-    if (!anchor.item) {
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot anchor to a null item.");
-        return false;
-    } else if (anchor.anchorLine & QmlGraphicsAnchorLine::Vertical_Mask) {
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot anchor a horizontal edge to a vertical edge.");
-        return false;
-    } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
-        return false;
-    } else if (anchor.item == item) {
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot anchor item to self.");
-        return false;
-    }
-
-    return true;
-}
-
-bool QmlGraphicsAnchorsPrivate::checkVValid() const
-{
-    if (usedAnchors & QmlGraphicsAnchors::HasTopAnchor &&
-        usedAnchors & QmlGraphicsAnchors::HasBottomAnchor &&
-        usedAnchors & QmlGraphicsAnchors::HasVCenterAnchor) {
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot specify top, bottom, and vcenter anchors.");
-        return false;
-    } else if (usedAnchors & QmlGraphicsAnchors::HasBaselineAnchor &&
-               (usedAnchors & QmlGraphicsAnchors::HasTopAnchor ||
-                usedAnchors & QmlGraphicsAnchors::HasBottomAnchor ||
-                usedAnchors & QmlGraphicsAnchors::HasVCenterAnchor)) {
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.");
-        return false;
-    }
-
-    return true;
-}
-
-bool QmlGraphicsAnchorsPrivate::checkVAnchorValid(QmlGraphicsAnchorLine anchor) const
-{
-    if (!anchor.item) {
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot anchor to a null item.");
-        return false;
-    } else if (anchor.anchorLine & QmlGraphicsAnchorLine::Horizontal_Mask) {
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot anchor a vertical edge to a horizontal edge.");
-        return false;
-    } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
-        return false;
-    } else if (anchor.item == item){
-        qmlInfo(item) << QmlGraphicsAnchors::tr("Cannot anchor item to self.");
-        return false;
-    }
-
-    return true;
-}
-
-#include <moc_qmlgraphicsanchors_p.cpp>
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
deleted file mode 100644
index 41911ff..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSANCHORS_H
-#define QMLGRAPHICSANCHORS_H
-
-#include "qmlgraphicsitem.h"
-
-#include <qml.h>
-
-#include <QtCore/QObject>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsAnchorsPrivate;
-class QmlGraphicsAnchorLine;
-class Q_DECLARATIVE_EXPORT QmlGraphicsAnchors : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QmlGraphicsAnchorLine left READ left WRITE setLeft RESET resetLeft NOTIFY leftChanged)
-    Q_PROPERTY(QmlGraphicsAnchorLine right READ right WRITE setRight RESET resetRight NOTIFY rightChanged)
-    Q_PROPERTY(QmlGraphicsAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter NOTIFY horizontalCenterChanged)
-    Q_PROPERTY(QmlGraphicsAnchorLine top READ top WRITE setTop RESET resetTop NOTIFY topChanged)
-    Q_PROPERTY(QmlGraphicsAnchorLine bottom READ bottom WRITE setBottom RESET resetBottom NOTIFY bottomChanged)
-    Q_PROPERTY(QmlGraphicsAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter NOTIFY verticalCenterChanged)
-    Q_PROPERTY(QmlGraphicsAnchorLine baseline READ baseline WRITE setBaseline RESET resetBaseline NOTIFY baselineChanged)
-    Q_PROPERTY(qreal margins READ margins WRITE setMargins NOTIFY marginsChanged)
-    Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged)
-    Q_PROPERTY(qreal rightMargin READ rightMargin WRITE setRightMargin NOTIFY rightMarginChanged)
-    Q_PROPERTY(qreal horizontalCenterOffset READ horizontalCenterOffset WRITE setHorizontalCenterOffset NOTIFY horizontalCenterOffsetChanged())
-    Q_PROPERTY(qreal topMargin READ topMargin WRITE setTopMargin NOTIFY topMarginChanged)
-    Q_PROPERTY(qreal bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged)
-    Q_PROPERTY(qreal verticalCenterOffset READ verticalCenterOffset WRITE setVerticalCenterOffset NOTIFY verticalCenterOffsetChanged())
-    Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged())
-    Q_PROPERTY(QmlGraphicsItem *fill READ fill WRITE setFill RESET resetFill NOTIFY fillChanged)
-    Q_PROPERTY(QmlGraphicsItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn NOTIFY centerInChanged)
-
-public:
-    QmlGraphicsAnchors(QObject *parent=0);
-    QmlGraphicsAnchors(QmlGraphicsItem *item, QObject *parent=0);
-    virtual ~QmlGraphicsAnchors();
-
-    enum UsedAnchor { 
-        HasLeftAnchor = 0x01,
-        HasRightAnchor = 0x02,
-        HasTopAnchor = 0x04,
-        HasBottomAnchor = 0x08,
-        HasHCenterAnchor = 0x10,
-        HasVCenterAnchor = 0x20,
-        HasBaselineAnchor = 0x40,
-        Horizontal_Mask = HasLeftAnchor | HasRightAnchor | HasHCenterAnchor,
-        Vertical_Mask = HasTopAnchor | HasBottomAnchor | HasVCenterAnchor | HasBaselineAnchor
-    };
-    Q_DECLARE_FLAGS(UsedAnchors, UsedAnchor)
-
-    QmlGraphicsAnchorLine left() const;
-    void setLeft(const QmlGraphicsAnchorLine &edge);
-    void resetLeft();
-
-    QmlGraphicsAnchorLine right() const;
-    void setRight(const QmlGraphicsAnchorLine &edge);
-    void resetRight();
-
-    QmlGraphicsAnchorLine horizontalCenter() const;
-    void setHorizontalCenter(const QmlGraphicsAnchorLine &edge);
-    void resetHorizontalCenter();
-
-    QmlGraphicsAnchorLine top() const;
-    void setTop(const QmlGraphicsAnchorLine &edge);
-    void resetTop();
-
-    QmlGraphicsAnchorLine bottom() const;
-    void setBottom(const QmlGraphicsAnchorLine &edge);
-    void resetBottom();
-
-    QmlGraphicsAnchorLine verticalCenter() const;
-    void setVerticalCenter(const QmlGraphicsAnchorLine &edge);
-    void resetVerticalCenter();
-
-    QmlGraphicsAnchorLine baseline() const;
-    void setBaseline(const QmlGraphicsAnchorLine &edge);
-    void resetBaseline();
-
-    qreal leftMargin() const;
-    void setLeftMargin(qreal);
-
-    qreal rightMargin() const;
-    void setRightMargin(qreal);
-
-    qreal horizontalCenterOffset() const;
-    void setHorizontalCenterOffset(qreal);
-
-    qreal topMargin() const;
-    void setTopMargin(qreal);
-
-    qreal bottomMargin() const;
-    void setBottomMargin(qreal);
-
-    qreal margins() const;
-    void setMargins(qreal);
-
-    qreal verticalCenterOffset() const;
-    void setVerticalCenterOffset(qreal);
-
-    qreal baselineOffset() const;
-    void setBaselineOffset(qreal);
-
-    QmlGraphicsItem *fill() const;
-    void setFill(QmlGraphicsItem *);
-    void resetFill();
-
-    QmlGraphicsItem *centerIn() const;
-    void setCenterIn(QmlGraphicsItem *);
-    void resetCenterIn();
-
-    UsedAnchors usedAnchors() const;
-
-    void classBegin();
-    void componentComplete();
-
-Q_SIGNALS:
-    void leftChanged();
-    void rightChanged();
-    void topChanged();
-    void bottomChanged();
-    void verticalCenterChanged();
-    void horizontalCenterChanged();
-    void baselineChanged();
-    void fillChanged();
-    void centerInChanged();
-    void leftMarginChanged();
-    void rightMarginChanged();
-    void topMarginChanged();
-    void bottomMarginChanged();
-    void marginsChanged();
-    void verticalCenterOffsetChanged();
-    void horizontalCenterOffsetChanged();
-    void baselineOffsetChanged();
-
-private:
-    friend class QmlGraphicsItem;
-    Q_DISABLE_COPY(QmlGraphicsAnchors)
-    Q_DECLARE_PRIVATE(QmlGraphicsAnchors)
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QmlGraphicsAnchors::UsedAnchors)
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsAnchors)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h
deleted file mode 100644
index a2e41d3..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSANCHORS_P_H
-#define QMLGRAPHICSANCHORS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsanchors_p.h"
-#include "qmlgraphicsitemchangelistener_p.h"
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsAnchorLine
-{
-public:
-    QmlGraphicsAnchorLine() : item(0), anchorLine(Invalid)
-    {
-    }
-
-    enum AnchorLine {
-        Invalid = 0x0,
-        Left = 0x01,
-        Right = 0x02,
-        Top = 0x04,
-        Bottom = 0x08,
-        HCenter = 0x10,
-        VCenter = 0x20,
-        Baseline = 0x40,
-        Horizontal_Mask = Left | Right | HCenter,
-        Vertical_Mask = Top | Bottom | VCenter | Baseline
-    };
-
-    QmlGraphicsItem *item;
-    AnchorLine anchorLine;
-
-    bool operator==(const QmlGraphicsAnchorLine& other) const
-    {
-        return item == other.item && anchorLine == other.anchorLine;
-    }
-};
-
-class QmlGraphicsAnchorsPrivate : public QObjectPrivate, public QmlGraphicsItemChangeListener
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsAnchors)
-public:
-    QmlGraphicsAnchorsPrivate(QmlGraphicsItem *i)
-      : updatingMe(false), updatingHorizontalAnchor(0),
-        updatingVerticalAnchor(0), updatingFill(0), updatingCenterIn(0), item(i), usedAnchors(0), fill(0),
-        centerIn(0), leftMargin(0), rightMargin(0), topMargin(0), bottomMargin(0),
-        margins(0), vCenterOffset(0), hCenterOffset(0), baselineOffset(0),
-        componentComplete(true)
-    {
-    }
-
-    void init()
-    {
-    }
-
-    void clearItem(QmlGraphicsItem *);
-
-    void addDepend(QmlGraphicsItem *);
-    void remDepend(QmlGraphicsItem *);
-    bool isItemComplete() const;
-
-    bool updatingMe;
-    int updatingHorizontalAnchor;
-    int updatingVerticalAnchor;
-    int updatingFill;
-    int updatingCenterIn;
-
-    void setItemHeight(qreal);
-    void setItemWidth(qreal);
-    void setItemX(qreal);
-    void setItemY(qreal);
-    void setItemPos(const QPointF &);
-
-    void updateOnComplete();
-    void updateMe();
-
-    // QmlGraphicsItemGeometryListener interface
-    void itemGeometryChanged(QmlGraphicsItem *, const QRectF &, const QRectF &);
-    QmlGraphicsAnchorsPrivate *anchorPrivate() { return this; }
-
-    bool checkHValid() const;
-    bool checkVValid() const;
-    bool checkHAnchorValid(QmlGraphicsAnchorLine anchor) const;
-    bool checkVAnchorValid(QmlGraphicsAnchorLine anchor) const;
-    bool calcStretch(const QmlGraphicsAnchorLine &edge1, const QmlGraphicsAnchorLine &edge2, int offset1, int offset2, QmlGraphicsAnchorLine::AnchorLine line, int &stretch);
-
-    void updateHorizontalAnchors();
-    void updateVerticalAnchors();
-    void fillChanged();
-    void centerInChanged();
-
-    QmlGraphicsItem *item;
-    QmlGraphicsAnchors::UsedAnchors usedAnchors;
-
-    QmlGraphicsItem *fill;
-    QmlGraphicsItem *centerIn;
-
-    QmlGraphicsAnchorLine left;
-    QmlGraphicsAnchorLine right;
-    QmlGraphicsAnchorLine top;
-    QmlGraphicsAnchorLine bottom;
-    QmlGraphicsAnchorLine vCenter;
-    QmlGraphicsAnchorLine hCenter;
-    QmlGraphicsAnchorLine baseline;
-
-    qreal leftMargin;
-    qreal rightMargin;
-    qreal topMargin;
-    qreal bottomMargin;
-    qreal margins;
-    qreal vCenterOffset;
-    qreal hCenterOffset;
-    qreal baselineOffset;
-
-    bool componentComplete;
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QmlGraphicsAnchorLine)
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
deleted file mode 100644
index 4dea33c..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsanimatedimage_p.h"
-#include "qmlgraphicsanimatedimage_p_p.h"
-
-#include <qmlengine.h>
-
-#include <QMovie>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlGraphicsAnimatedImage
-    \internal
-*/
-
-/*!
-    \qmlclass AnimatedImage QmlGraphicsAnimatedImage
-    \inherits Image
-    \since 4.7
-
-    This item provides for playing animations stored as images containing a series of frames,
-    such as GIF files. The full list of supported formats can be determined with
-    QMovie::supportedFormats().
-
-    \table
-    \row
-    \o \image animatedimageitem.gif
-    \o
-    \qml
-Item {
-    width: anim.width; height: anim.height+8
-    AnimatedImage { id: anim; source: "pics/games-anim.gif" }
-    Rectangle { color: "red"; width: 4; height: 8; y: anim.height
-        x: (anim.width-width)*anim.currentFrame/(anim.frameCount-1)
-    }
-}
-    \endqml
-    \endtable
-*/
-
-QmlGraphicsAnimatedImage::QmlGraphicsAnimatedImage(QmlGraphicsItem *parent)
-    : QmlGraphicsImage(*(new QmlGraphicsAnimatedImagePrivate), parent)
-{
-}
-
-QmlGraphicsAnimatedImage::~QmlGraphicsAnimatedImage()
-{
-    Q_D(QmlGraphicsAnimatedImage);
-    delete d->_movie;
-}
-
-/*!
-  \qmlproperty bool AnimatedImage::paused
-  This property holds whether the animated image is paused or not
-
-  Defaults to false, and can be set to true when you want to pause.
-*/
-bool QmlGraphicsAnimatedImage::isPaused() const
-{
-    Q_D(const QmlGraphicsAnimatedImage);
-    if(!d->_movie)
-        return false;
-    return d->_movie->state()==QMovie::Paused;
-}
-
-void QmlGraphicsAnimatedImage::setPaused(bool pause)
-{
-    Q_D(QmlGraphicsAnimatedImage);
-    if(pause == d->paused)
-        return;
-    d->paused = pause;
-    if(!d->_movie)
-        return;
-    d->_movie->setPaused(pause);
-}
-/*!
-  \qmlproperty bool AnimatedImage::playing
-  This property holds whether the animated image is playing or not
-
-  Defaults to true, so as to start playing immediately.
-*/
-bool QmlGraphicsAnimatedImage::isPlaying() const
-{
-    Q_D(const QmlGraphicsAnimatedImage);
-    if (!d->_movie)
-        return false;
-    return d->_movie->state()!=QMovie::NotRunning;
-}
-
-void QmlGraphicsAnimatedImage::setPlaying(bool play)
-{
-    Q_D(QmlGraphicsAnimatedImage);
-    if(play == d->playing)
-        return;
-    d->playing = play;
-    if (!d->_movie)
-        return;
-    if (play)
-        d->_movie->start();
-    else
-        d->_movie->stop();
-}
-
-/*!
-  \qmlproperty int AnimatedImage::currentFrame
-  \qmlproperty int AnimatedImage::frameCount
-
-  currentFrame is the frame that is currently visible. Watching when this changes can
-  allow other things to animate at the same time as the image. frameCount is the number
-  of frames in the animation. For some animation formats, frameCount is unknown and set to zero.
-*/
-int QmlGraphicsAnimatedImage::currentFrame() const
-{
-    Q_D(const QmlGraphicsAnimatedImage);
-    if (!d->_movie)
-        return d->preset_currentframe;
-    return d->_movie->currentFrameNumber();
-}
-
-void QmlGraphicsAnimatedImage::setCurrentFrame(int frame)
-{
-    Q_D(QmlGraphicsAnimatedImage);
-    if (!d->_movie) {
-        d->preset_currentframe = frame;
-        return;
-    }
-    d->_movie->jumpToFrame(frame);
-}
-
-int QmlGraphicsAnimatedImage::frameCount() const
-{
-    Q_D(const QmlGraphicsAnimatedImage);
-    if (!d->_movie)
-        return 0;
-    return d->_movie->frameCount();
-}
-
-static QString toLocalFileOrQrc(const QUrl& url)
-{
-    QString r = url.toLocalFile();
-    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
-        r = QLatin1Char(':') + url.path();
-    return r;
-}
-
-void QmlGraphicsAnimatedImage::setSource(const QUrl &url)
-{
-    Q_D(QmlGraphicsAnimatedImage);
-    if (url == d->url)
-        return;
-
-    delete d->_movie;
-    d->_movie = 0;
-
-    if (d->reply) {
-        d->reply->deleteLater();
-        d->reply = 0;
-    }
-
-    d->url = url;
-
-    if (url.isEmpty()) {
-        delete d->_movie;
-        d->status = Null;
-    } else {
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
-        QString lf = toLocalFileOrQrc(url);
-        if (!lf.isEmpty()) {
-            //### should be unified with movieRequestFinished
-            d->_movie = new QMovie(lf);
-            if (!d->_movie->isValid()){
-                qWarning() << "Error Reading Animated Image File" << d->url;
-                delete d->_movie;
-                d->_movie = 0;
-                return;
-            }
-            connect(d->_movie, SIGNAL(stateChanged(QMovie::MovieState)),
-                    this, SLOT(playingStatusChanged()));
-            connect(d->_movie, SIGNAL(frameChanged(int)),
-                    this, SLOT(movieUpdate()));
-            d->_movie->setCacheMode(QMovie::CacheAll);
-            if(d->playing)
-                d->_movie->start();
-            else
-                d->_movie->jumpToFrame(0);
-            if(d->paused)
-                d->_movie->setPaused(true);
-            d->setPixmap(d->_movie->currentPixmap());
-            d->status = Ready;
-            d->progress = 1.0;
-            emit statusChanged(d->status);
-            emit sourceChanged(d->url);
-            emit progressChanged(d->progress);
-            return;
-        }
-#endif
-        d->status = Loading;
-        QNetworkRequest req(d->url);
-        req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
-        d->reply = qmlEngine(this)->networkAccessManager()->get(req);
-        QObject::connect(d->reply, SIGNAL(finished()),
-                         this, SLOT(movieRequestFinished()));
-    }
-
-    emit statusChanged(d->status);
-}
-
-void QmlGraphicsAnimatedImage::movieRequestFinished()
-{
-    Q_D(QmlGraphicsAnimatedImage);
-    d->_movie = new QMovie(d->reply);
-    if (!d->_movie->isValid()){
-        qWarning() << "Error Reading Animated Image File " << d->url;
-        delete d->_movie;
-        d->_movie = 0;
-        return;
-    }
-    connect(d->_movie, SIGNAL(stateChanged(QMovie::MovieState)),
-            this, SLOT(playingStatusChanged()));
-    connect(d->_movie, SIGNAL(frameChanged(int)),
-            this, SLOT(movieUpdate()));
-    d->_movie->setCacheMode(QMovie::CacheAll);
-    if(d->playing)
-        d->_movie->start();
-    if (d->paused || !d->playing) {
-        d->_movie->jumpToFrame(d->preset_currentframe);
-        d->preset_currentframe = 0;
-    }
-    if(d->paused)
-        d->_movie->setPaused(true);
-    d->setPixmap(d->_movie->currentPixmap());
-}
-
-void QmlGraphicsAnimatedImage::movieUpdate()
-{
-    Q_D(QmlGraphicsAnimatedImage);
-    d->setPixmap(d->_movie->currentPixmap());
-    emit frameChanged();
-}
-
-void QmlGraphicsAnimatedImage::playingStatusChanged()
-{
-    Q_D(QmlGraphicsAnimatedImage);
-    if((d->_movie->state() != QMovie::NotRunning) != d->playing){
-        d->playing = (d->_movie->state() != QMovie::NotRunning);
-        emit playingChanged();
-    }
-    if((d->_movie->state() == QMovie::Paused) != d->paused){
-        d->playing = (d->_movie->state() == QMovie::Paused);
-        emit pausedChanged();
-    }
-}
-
-void QmlGraphicsAnimatedImage::componentComplete()
-{
-    Q_D(QmlGraphicsAnimatedImage);
-    QmlGraphicsImage::componentComplete();
-    if (!d->reply) {
-        setCurrentFrame(d->preset_currentframe);
-        d->preset_currentframe = 0;
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h
deleted file mode 100644
index a6cee0d..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSANIMATEDIMAGE_H
-#define QMLGRAPHICSANIMATEDIMAGE_H
-
-#include "qmlgraphicsimage_p.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QMovie;
-class QmlGraphicsAnimatedImagePrivate;
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsAnimatedImage : public QmlGraphicsImage
-{
-    Q_OBJECT
-
-    Q_PROPERTY(bool playing READ isPlaying WRITE setPlaying NOTIFY playingChanged)
-    Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
-    Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame NOTIFY frameChanged)
-    Q_PROPERTY(int frameCount READ frameCount)
-public:
-    QmlGraphicsAnimatedImage(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsAnimatedImage();
-
-    bool isPlaying() const;
-    void setPlaying(bool play);
-
-    bool isPaused() const;
-    void setPaused(bool pause);
-
-    int currentFrame() const;
-    void setCurrentFrame(int frame);
-
-    int frameCount() const;
-
-    // Extends QmlGraphicsImage's src property*/
-    virtual void setSource(const QUrl&);
-
-Q_SIGNALS:
-    void playingChanged();
-    void pausedChanged();
-    void frameChanged();
-
-private Q_SLOTS:
-    void movieUpdate();
-    void movieRequestFinished();
-    void playingStatusChanged();
-
-protected:
-    void componentComplete();
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsAnimatedImage)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsAnimatedImage)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsAnimatedImage)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h
deleted file mode 100644
index 5e04a93..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSANIMATEDIMAGE_P_H
-#define QMLGRAPHICSANIMATEDIMAGE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsimage_p_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QMovie;
-class QNetworkReply;
-
-class QmlGraphicsAnimatedImagePrivate : public QmlGraphicsImagePrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsAnimatedImage)
-
-public:
-    QmlGraphicsAnimatedImagePrivate()
-      : playing(true), paused(false), preset_currentframe(0), _movie(0), reply(0)
-    {
-    }
-
-    bool playing;
-    bool paused;
-    int preset_currentframe;
-    QMovie *_movie;
-    QNetworkReply *reply;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLGRAPHICSANIMATEDIMAGE_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
deleted file mode 100644
index 25a220f..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsborderimage_p.h"
-#include "qmlgraphicsborderimage_p_p.h"
-
-#include <qmlengine.h>
-
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QFile>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass BorderImage QmlGraphicsBorderImage
-    \brief The BorderImage element provides an image that can be used as a border.
-    \inherits Item
-    \since 4.7
-
-    \snippet snippets/declarative/border-image.qml 0
-
-    \image BorderImage.png
- */
-
-/*!
-    \class QmlGraphicsBorderImage BorderImage
-    \internal
-    \brief The QmlGraphicsBorderImage class provides an image item that you can add to a QmlView.
-*/
-
-QmlGraphicsBorderImage::QmlGraphicsBorderImage(QmlGraphicsItem *parent)
-  : QmlGraphicsImageBase(*(new QmlGraphicsBorderImagePrivate), parent)
-{
-}
-
-QmlGraphicsBorderImage::~QmlGraphicsBorderImage()
-{
-    Q_D(QmlGraphicsBorderImage);
-    if (d->sciReply)
-        d->sciReply->deleteLater();
-    if (d->sciPendingPixmapCache)
-        QmlPixmapCache::cancel(d->sciurl, this);
-}
-/*!
-    \qmlproperty enum BorderImage::status
-
-    This property holds the status of image loading.  It can be one of:
-    \list
-    \o Null - no image has been set
-    \o Ready - the image has been loaded
-    \o Loading - the image is currently being loaded
-    \o Error - an error occurred while loading the image
-    \endlist
-
-    \sa progress
-*/
-
-/*!
-    \qmlproperty real BorderImage::progress
-
-    This property holds the progress of image loading, from 0.0 (nothing loaded)
-    to 1.0 (finished).
-
-    \sa status
-*/
-
-/*!
-    \qmlproperty bool BorderImage::smooth
-
-    Set this property if you want the image to be smoothly filtered when scaled or
-    transformed.  Smooth filtering gives better visual quality, but is slower.  If
-    the image is displayed at its natural size, this property has no visual or
-    performance effect.
-
-    \note Generally scaling artifacts are only visible if the image is stationary on
-    the screen.  A common pattern when animating an image is to disable smooth
-    filtering at the beginning of the animation and reenable it at the conclusion.
-*/
-
-/*!
-    \qmlproperty url BorderImage::source
-
-    BorderImage can handle any image format supported by Qt, loaded from any URL scheme supported by Qt.
-
-    It can also handle .sci files, which are a Qml-specific format. A .sci file uses a simple text-based format that specifies
-    the borders, the image file and the tile rules.
-
-    The following .sci file sets the borders to 10 on each side for the image \c picture.png:
-    \qml
-    border.left: 10
-    border.top: 10
-    border.bottom: 10
-    border.right: 10
-    source: picture.png
-    \endqml
-
-    The URL may be absolute, or relative to the URL of the component.
-*/
-
-static QString toLocalFileOrQrc(const QUrl& url)
-{
-    QString r = url.toLocalFile();
-    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
-        r = QLatin1Char(':') + url.path();
-    return r;
-}
-
-
-void QmlGraphicsBorderImage::setSource(const QUrl &url)
-{
-    Q_D(QmlGraphicsBorderImage);
-    //equality is fairly expensive, so we bypass for simple, common case
-    if ((d->url.isEmpty() == url.isEmpty()) && url == d->url)
-        return;
-
-    if (d->sciReply) {
-        d->sciReply->deleteLater();
-        d->sciReply = 0;
-    }
-
-    if (d->pendingPixmapCache) {
-        QmlPixmapCache::cancel(d->url, this);
-        d->pendingPixmapCache = false;
-    }
-    if (d->sciPendingPixmapCache) {
-        QmlPixmapCache::cancel(d->sciurl, this);
-        d->sciPendingPixmapCache = false;
-    }
-
-    d->url = url;
-    d->sciurl = QUrl();
-    if (d->progress != 0.0) {
-        d->progress = 0.0;
-        emit progressChanged(d->progress);
-    }
-
-    if (url.isEmpty()) {
-        d->pix = QPixmap();
-        d->status = Null;
-        setImplicitWidth(0);
-        setImplicitHeight(0);
-        emit statusChanged(d->status);
-        emit sourceChanged(d->url);
-        update();
-    } else {
-        d->status = Loading;
-        if (d->url.path().endsWith(QLatin1String(".sci"))) {
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
-            QString lf = toLocalFileOrQrc(d->url);
-            if (!lf.isEmpty()) {
-                QFile file(lf);
-                file.open(QIODevice::ReadOnly);
-                setGridScaledImage(QmlGraphicsGridScaledImage(&file));
-            } else
-#endif
-            {
-                QNetworkRequest req(d->url);
-                d->sciReply = qmlEngine(this)->networkAccessManager()->get(req);
-                QObject::connect(d->sciReply, SIGNAL(finished()),
-                                 this, SLOT(sciRequestFinished()));
-            }
-        } else {
-            QmlPixmapReply::Status status = QmlPixmapCache::get(d->url, &d->pix);
-            if (status != QmlPixmapReply::Ready && status != QmlPixmapReply::Error) {
-                QmlPixmapReply *reply = QmlPixmapCache::request(qmlEngine(this), d->url);
-                d->pendingPixmapCache = true;
-                connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
-                connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
-                        this, SLOT(requestProgress(qint64,qint64)));
-            } else {
-                //### should be unified with requestFinished
-                setImplicitWidth(d->pix.width());
-                setImplicitHeight(d->pix.height());
-
-                if (d->pix.isNull())
-                    d->status = Error;
-                if (d->status == Loading)
-                    d->status = Ready;
-                d->progress = 1.0;
-                emit statusChanged(d->status);
-                emit sourceChanged(d->url);
-                emit progressChanged(d->progress);
-                update();
-            }
-        }
-    }
-
-    emit statusChanged(d->status);
-}
-
-/*!
-    \qmlproperty int BorderImage::border.left
-    \qmlproperty int BorderImage::border.right
-    \qmlproperty int BorderImage::border.top
-    \qmlproperty int BorderImage::border.bottom
-
-    \target ImagexmlpropertiesscaleGrid
-
-    The 4 border lines (2 horizontal and 2 vertical) break an image into 9 sections, as shown below:
-
-    \image declarative-scalegrid.png
-
-    When the image is scaled:
-    \list
-    \i the corners (sections 1, 3, 7, and 9) are not scaled at all
-    \i the middle (section 5) is scaled according to BorderImage::horizontalTileMode and BorderImage::verticalTileMode
-    \i sections 2 and 8 are scaled according to BorderImage::horizontalTileMode
-    \i sections 4 and 6 are scaled according to BorderImage::verticalTileMode
-    \endlist
-
-    Each border line (left, right, top, and bottom) specifies an offset from the respective side. For example, \c{border.bottom: 10} sets the bottom line 10 pixels up from the bottom of the image.
-
-    The border lines can also be specified using a
-    \l {BorderImage::source}{.sci file}.
-*/
-
-QmlGraphicsScaleGrid *QmlGraphicsBorderImage::border()
-{
-    Q_D(QmlGraphicsBorderImage);
-    return d->getScaleGrid();
-}
-
-/*!
-    \qmlproperty TileMode BorderImage::horizontalTileMode
-    \qmlproperty TileMode BorderImage::verticalTileMode
-
-    This property describes how to repeat or stretch the middle parts of the border image.
-
-    \list
-    \o Stretch - Scale the image to fit to the available area.
-    \o Repeat - Tile the image until there is no more space. May crop the last image.
-    \o Round - Like Repeat, but scales the images down to ensure that the last image is not cropped.
-    \endlist
-*/
-QmlGraphicsBorderImage::TileMode QmlGraphicsBorderImage::horizontalTileMode() const
-{
-    Q_D(const QmlGraphicsBorderImage);
-    return d->horizontalTileMode;
-}
-
-void QmlGraphicsBorderImage::setHorizontalTileMode(TileMode t)
-{
-    Q_D(QmlGraphicsBorderImage);
-    if (t != d->horizontalTileMode) {
-        d->horizontalTileMode = t;
-        emit horizontalTileModeChanged();
-        update();
-    }
-}
-
-QmlGraphicsBorderImage::TileMode QmlGraphicsBorderImage::verticalTileMode() const
-{
-    Q_D(const QmlGraphicsBorderImage);
-    return d->verticalTileMode;
-}
-
-void QmlGraphicsBorderImage::setVerticalTileMode(TileMode t)
-{
-    Q_D(QmlGraphicsBorderImage);
-    if (t != d->verticalTileMode) {
-        d->verticalTileMode = t;
-        emit verticalTileModeChanged();
-        update();
-    }
-}
-
-void QmlGraphicsBorderImage::setGridScaledImage(const QmlGraphicsGridScaledImage& sci)
-{
-    Q_D(QmlGraphicsBorderImage);
-    if (!sci.isValid()) {
-        d->status = Error;
-        emit statusChanged(d->status);
-    } else {
-        QmlGraphicsScaleGrid *sg = border();
-        sg->setTop(sci.gridTop());
-        sg->setBottom(sci.gridBottom());
-        sg->setLeft(sci.gridLeft());
-        sg->setRight(sci.gridRight());
-        d->horizontalTileMode = sci.horizontalTileRule();
-        d->verticalTileMode = sci.verticalTileRule();
-
-        d->sciurl = d->url.resolved(QUrl(sci.pixmapUrl()));
-        QmlPixmapReply::Status status = QmlPixmapCache::get(d->sciurl, &d->pix);
-        if (status != QmlPixmapReply::Ready && status != QmlPixmapReply::Error) {
-            QmlPixmapReply *reply = QmlPixmapCache::request(qmlEngine(this), d->sciurl);
-            d->sciPendingPixmapCache = true;
-            connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
-            connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
-                    this, SLOT(requestProgress(qint64,qint64)));
-        } else {
-            //### should be unified with requestFinished
-            setImplicitWidth(d->pix.width());
-            setImplicitHeight(d->pix.height());
-
-            if (d->pix.isNull())
-                d->status = Error;
-            if (d->status == Loading)
-                d->status = Ready;
-            d->progress = 1.0;
-            emit statusChanged(d->status);
-            emit sourceChanged(d->url);
-            emit progressChanged(1.0);
-            update();
-        }
-    }
-}
-
-void QmlGraphicsBorderImage::requestFinished()
-{
-    Q_D(QmlGraphicsBorderImage);
-
-    if (d->url.path().endsWith(QLatin1String(".sci"))) {
-        d->sciPendingPixmapCache = false;
-        QmlPixmapCache::get(d->sciurl, &d->pix);
-    } else {
-        d->pendingPixmapCache = false;
-        if (QmlPixmapCache::get(d->url, &d->pix) != QmlPixmapReply::Ready)
-            d->status = Error;
-    }
-    setImplicitWidth(d->pix.width());
-    setImplicitHeight(d->pix.height());
-
-    if (d->status == Loading)
-        d->status = Ready;
-    d->progress = 1.0;
-    emit statusChanged(d->status);
-    emit sourceChanged(d->url);
-    emit progressChanged(1.0);
-    update();
-}
-
-void QmlGraphicsBorderImage::sciRequestFinished()
-{
-    Q_D(QmlGraphicsBorderImage);
-    if (d->sciReply->error() != QNetworkReply::NoError) {
-        d->status = Error;
-        d->sciReply->deleteLater();
-        d->sciReply = 0;
-        emit statusChanged(d->status);
-    } else {
-        QmlGraphicsGridScaledImage sci(d->sciReply);
-        d->sciReply->deleteLater();
-        d->sciReply = 0;
-        setGridScaledImage(sci);
-    }
-}
-
-void QmlGraphicsBorderImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    Q_D(QmlGraphicsBorderImage);
-    if (d->pix.isNull())
-        return;
-
-    bool oldAA = p->testRenderHint(QPainter::Antialiasing);
-    bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
-    if (d->smooth)
-        p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
-
-    const QmlGraphicsScaleGrid *border = d->getScaleGrid();
-    QMargins margins(border->left(), border->top(), border->right(), border->bottom());
-    QTileRules rules((Qt::TileRule)d->horizontalTileMode, (Qt::TileRule)d->verticalTileMode);
-    qDrawBorderPixmap(p, QRect(0, 0, (int)d->width, (int)d->height), margins, d->pix, d->pix.rect(), margins, rules);
-    if (d->smooth) {
-        p->setRenderHint(QPainter::Antialiasing, oldAA);
-        p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
deleted file mode 100644
index 32dc388..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSBORDERIMAGE_H
-#define QMLGRAPHICSBORDERIMAGE_H
-
-#include "qmlgraphicsimagebase_p.h"
-
-#include <QtNetwork/qnetworkreply.h>
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsScaleGrid;
-class QmlGraphicsGridScaledImage;
-class QmlGraphicsBorderImagePrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsBorderImage : public QmlGraphicsImageBase
-{
-    Q_OBJECT
-    Q_ENUMS(TileMode)
-
-    Q_PROPERTY(QmlGraphicsScaleGrid *border READ border CONSTANT)
-    Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode NOTIFY horizontalTileModeChanged)
-    Q_PROPERTY(TileMode verticalTileMode READ verticalTileMode WRITE setVerticalTileMode NOTIFY verticalTileModeChanged)
-
-public:
-    QmlGraphicsBorderImage(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsBorderImage();
-
-    QmlGraphicsScaleGrid *border();
-
-    enum TileMode { Stretch = Qt::StretchTile, Repeat = Qt::RepeatTile, Round = Qt::RoundTile };
-
-    TileMode horizontalTileMode() const;
-    void setHorizontalTileMode(TileMode);
-
-    TileMode verticalTileMode() const;
-    void setVerticalTileMode(TileMode);
-
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-    void setSource(const QUrl &url);
-
-Q_SIGNALS:
-    void horizontalTileModeChanged();
-    void verticalTileModeChanged();
-
-private:
-    void setGridScaledImage(const QmlGraphicsGridScaledImage& sci);
-
-private Q_SLOTS:
-    void requestFinished();
-    void sciRequestFinished();
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsBorderImage)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsBorderImage)
-};
-
-QT_END_NAMESPACE
-QML_DECLARE_TYPE(QmlGraphicsBorderImage)
-QT_END_HEADER
-
-#endif // QMLGRAPHICSBORDERIMAGE_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h
deleted file mode 100644
index b97ae6d..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSBORDERIMAGE_P_H
-#define QMLGRAPHICSBORDERIMAGE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsimagebase_p_p.h"
-#include "qmlgraphicsscalegrid_p_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QNetworkReply;
-class QmlGraphicsBorderImagePrivate : public QmlGraphicsImageBasePrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsBorderImage)
-
-public:
-    QmlGraphicsBorderImagePrivate()
-      : border(0), sciReply(0),
-        sciPendingPixmapCache(false),
-        horizontalTileMode(QmlGraphicsBorderImage::Stretch),
-        verticalTileMode(QmlGraphicsBorderImage::Stretch)
-    {
-    }
-
-    ~QmlGraphicsBorderImagePrivate()
-    {
-    }
-
-    QmlGraphicsScaleGrid *getScaleGrid()
-    {
-        Q_Q(QmlGraphicsBorderImage);
-        if (!border)
-            border = new QmlGraphicsScaleGrid(q);
-        return border;
-    }
-
-    QmlGraphicsScaleGrid *border;
-    QUrl sciurl;
-    QNetworkReply *sciReply;
-    bool sciPendingPixmapCache;
-    QmlGraphicsBorderImage::TileMode horizontalTileMode;
-    QmlGraphicsBorderImage::TileMode verticalTileMode;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLGRAPHICSBORDERIMAGE_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicseffects.cpp b/src/declarative/graphicsitems/qmlgraphicseffects.cpp
deleted file mode 100644
index 6a93b12..0000000
--- a/src/declarative/graphicsitems/qmlgraphicseffects.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qml.h>
-
-#include <QtGui/qgraphicseffect.h>
-
-/*!
-    \qmlclass Blur QGraphicsBlurEffect
-    \brief The Blur object provides a blur effect.
-
-    A blur effect blurs the source item. This effect is useful for reducing details;
-    for example, when the a source loses focus and attention should be drawn to other
-    elements. Use blurRadius to control the level of detail and blurHint to control
-    the quality of the blur.
-
-    By default, the blur radius is 5 pixels.
-
-    \img graphicseffect-blur.png
-*/
-
-/*!
-    \qmlproperty real Blur::blurRadius
-
-    This controls how blurry an item will appear.
-
-    A smaller radius produces a sharper appearance, and a larger radius produces
-    a more blurred appearance.
-
-    The default radius is 5 pixels.
-*/
-/*!
-    \qmlproperty enumeration Blur::blurHint
-
-    Use Qt.PerformanceHint to specify a faster blur or Qt.QualityHint hint
-    to specify a higher quality blur.
-   
-    If the blur radius is animated, it is recommended you use Qt.PerformanceHint.
-
-    The default hint is Qt.PerformanceHint.
-*/
-
-/*!
-    \qmlclass Colorize QGraphicsColorizeEffect
-    \brief The Colorize object provides a colorize effect.
-
-    A colorize effect renders the source item with a tint of its color.
-
-    By default, the color is light blue.
-
-    \img graphicseffect-colorize.png
-*/
-
-/*!
-    \qmlproperty color Colorize::color
-    The color of the effect.
-
-    By default, the color is light blue.
-*/
-
-/*!
-    \qmlproperty real Colorize::strength
-
-    To what extent the source item is "colored". A strength of 0.0 is equal to no effect,
-    while 1.0 means full colorization. By default, the strength is 1.0.
-*/
-
-
-/*!
-    \qmlclass DropShadow QGraphicsDropShadowEffect
-    \brief The DropShadow object provides a drop shadow effect.
-
-    A drop shadow effect renders the source item with a drop shadow. The color of
-    the drop shadow can be modified using the color property. The drop
-    shadow offset can be modified using the xOffset and yOffset properties and the blur
-    radius of the drop shadow can be changed with the blurRadius property.
-
-    By default, the drop shadow is a semi-transparent dark gray shadow,
-    blurred with a radius of 1 at an offset of 8 pixels towards the lower right.
-
-    \img graphicseffect-drop-shadow.png
-*/
-
-/*!
-    \qmlproperty real DropShadow::xOffset
-    \qmlproperty real DropShadow::yOffset
-    The shadow offset in pixels.
-
-    By default, xOffset and yOffset are 8 pixels.
-*/
-
-/*!
-    \qmlproperty real DropShadow::blurRadius
-    The blur radius in pixels of the drop shadow.
-
-    Using a smaller radius results in a sharper shadow, whereas using a bigger
-    radius results in a more blurred shadow.
-
-    By default, the blur radius is 1 pixel.
-*/
-
-/*!
-    \qmlproperty color DropShadow::color
-    The color of the drop shadow.
-
-    By default, the drop color is a semi-transparent dark gray.
-*/
-
-
-/*!
-    \qmlclass Opacity QGraphicsOpacityEffect
-    \brief The Opacity object provides an opacity effect.
-
-    An opacity effect renders the source with an opacity. This effect is useful
-    for making the source semi-transparent, similar to a fade-in/fade-out
-    sequence. The opacity can be modified using the opacity property.
-
-    By default, the opacity is 0.7.
-
-    \img graphicseffect-opacity.png
-*/
-
-/*!
-    \qmlproperty real Opacity::opacity
-    This property specifies how opaque an item should appear.
-
-    The value should be in the range of 0.0 to 1.0, where 0.0 is
-    fully transparent and 1.0 is fully opaque.
-
-    By default, the opacity is 0.7.
-*/
-
diff --git a/src/declarative/graphicsitems/qmlgraphicseffects_p.h b/src/declarative/graphicsitems/qmlgraphicseffects_p.h
deleted file mode 100644
index 4b94a14..0000000
--- a/src/declarative/graphicsitems/qmlgraphicseffects_p.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSEFFECTS_P_H
-#define QMLGRAPHICSEFFECTS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qml.h>
-#include <QtGui/qgraphicseffect.h>
-
-QML_DECLARE_TYPE(QGraphicsEffect)
-QML_DECLARE_TYPE(QGraphicsBlurEffect)
-QML_DECLARE_TYPE(QGraphicsColorizeEffect)
-QML_DECLARE_TYPE(QGraphicsDropShadowEffect)
-QML_DECLARE_TYPE(QGraphicsOpacityEffect)
-
-#endif // QMLGRAPHICSEFFECTS_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsevents.cpp b/src/declarative/graphicsitems/qmlgraphicsevents.cpp
deleted file mode 100644
index e8ba885..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsevents.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsevents_p_p.h"
-
-QT_BEGIN_NAMESPACE
-/*!
-    \qmlclass KeyEvent QmlGraphicsKeyEvent
-    \since 4.7
-    \brief The KeyEvent object provides information about a key event.
-
-    For example, the following changes the Item's state property when the Enter
-    key is pressed:
-    \qml
-Item {
-    focus: true
-    Keys.onPressed: { if (event.key == Qt.Key_Enter) state = 'ShowDetails'; }
-}
-    \endqml
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsKeyEvent
-*/
-
-/*!
-    \qmlproperty int KeyEvent::key
-
-    This property holds the code of the key that was pressed or released.
-
-    See \l {Qt::Key}{Qt.Key} for the list of keyboard codes. These codes are
-    independent of the underlying window system. Note that this
-    function does not distinguish between capital and non-capital
-    letters, use the text() function (returning the Unicode text the
-    key generated) for this purpose.
-
-    A value of either 0 or \l {Qt::Key_unknown}{Qt.Key_Unknown} means that the event is not
-    the result of a known key; for example, it may be the result of
-    a compose sequence, a keyboard macro, or due to key event
-    compression.
-*/
-
-/*!
-    \qmlproperty string KeyEvent::text
-
-    This property holds the Unicode text that the key generated.
-    The text returned can be an empty string in cases where modifier keys,
-    such as Shift, Control, Alt, and Meta, are being pressed or released.
-    In such cases \c key will contain a valid value
-*/
-
-/*!
-    \qmlproperty bool KeyEvent::isAutoRepeat
-
-    This property holds whether this event comes from an auto-repeating key.
-*/
-
-/*!
-    \qmlproperty int KeyEvent::count
-
-    This property holds the number of keys involved in this event. If \l KeyEvent::text
-    is not empty, this is simply the length of the string.
-*/
-
-/*!
-    \qmlproperty bool KeyEvent::accepted
-
-    Setting \a accepted to true prevents the key event from being
-    propagated to the item's parent.
-
-    Generally, if the item acts on the key event then it should be accepted
-    so that ancestor items do not also respond to the same event.
-*/
-
-
-/*!
-    \qmlclass MouseEvent QmlGraphicsMouseEvent
-    \brief The MouseEvent object provides information about a mouse event.
-
-    The position of the mouse can be found via the x and y properties.
-    The button that caused the event is available via the button property.
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsMouseEvent
-*/
-
-/*!
-    \qmlproperty int MouseEvent::x
-    \qmlproperty int MouseEvent::y
-
-    These properties hold the position of the mouse event.
-*/
-
-/*!
-    \qmlproperty enum MouseEvent::button
-
-    This property holds the button that caused the event.  It can be one of:
-    \list
-    \o Qt.LeftButton
-    \o Qt.RightButton
-    \o Qt.MidButton
-    \endlist
-*/
-
-/*!
-    \qmlproperty bool MouseEvent::wasHeld
-
-    This property is true if the mouse button has been held pressed longer the
-    threshold (800ms).
-*/
-
-/*!
-    \qmlproperty int MouseEvent::buttons
-
-    This property holds the mouse buttons pressed when the event was generated.
-    For mouse move events, this is all buttons that are pressed down. For mouse
-    press and double click events this includes the button that caused the event.
-    For mouse release events this excludes the button that caused the event.
-
-    It contains a bitwise combination of:
-    \list
-    \o Qt.LeftButton
-    \o Qt.RightButton
-    \o Qt.MidButton
-    \endlist
-*/
-
-/*!
-    \qmlproperty int MouseEvent::modifiers
-
-    This property holds the keyboard modifier flags that existed immediately
-    before the event occurred.
-
-    It contains a bitwise combination of:
-    \list
-    \o Qt.NoModifier - No modifier key is pressed.
-    \o Qt.ShiftModifier	- A Shift key on the keyboard is pressed.
-    \o Qt.ControlModifier - A Ctrl key on the keyboard is pressed.
-    \o Qt.AltModifier - An Alt key on the keyboard is pressed.
-    \o Qt.MetaModifier - A Meta key on the keyboard is pressed.
-    \o Qt.KeypadModifier - A keypad button is pressed.
-    \endlist
-
-    For example, to react to a Shift key + Left mouse button click:
-    \qml
-MouseArea {
-    onClicked: { if (mouse.button == Qt.LeftButton && mouse.modifiers & Qt.ShiftModifier) doSomething(); }
-}
-    \endqml
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
deleted file mode 100644
index 0ed852a..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSEVENTS_P_H
-#define QMLGRAPHICSEVENTS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qml.h>
-
-#include <QtCore/qobject.h>
-#include <QtGui/qevent.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsKeyEvent : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int key READ key)
-    Q_PROPERTY(QString text READ text)
-    Q_PROPERTY(int modifiers READ modifiers)
-    Q_PROPERTY(bool isAutoRepeat READ isAutoRepeat)
-    Q_PROPERTY(int count READ count)
-    Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
-
-public:
-    QmlGraphicsKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString &text=QString(), bool autorep=false, ushort count=1)
-        : event(type, key, modifiers, text, autorep, count) { event.setAccepted(false); }
-    QmlGraphicsKeyEvent(const QKeyEvent &ke)
-        : event(ke) { event.setAccepted(false); }
-
-    int key() const { return event.key(); }
-    QString text() const { return event.text(); }
-    int modifiers() const { return event.modifiers(); }
-    bool isAutoRepeat() const { return event.isAutoRepeat(); }
-    int count() const { return event.count(); }
-
-    bool isAccepted() { return event.isAccepted(); }
-    void setAccepted(bool accepted) { event.setAccepted(accepted); }
-
-private:
-    QKeyEvent event;
-};
-
-class QmlGraphicsMouseEvent : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int x READ x)
-    Q_PROPERTY(int y READ y)
-    Q_PROPERTY(int button READ button)
-    Q_PROPERTY(int buttons READ buttons)
-    Q_PROPERTY(int modifiers READ modifiers)
-    Q_PROPERTY(bool wasHeld READ wasHeld)
-    Q_PROPERTY(bool isClick READ isClick)
-    Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
-
-public:
-    QmlGraphicsMouseEvent(int x, int y, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers
-                  , bool isClick=false, bool wasHeld=false)
-        : _x(x), _y(y), _button(button), _buttons(buttons), _modifiers(modifiers)
-          , _wasHeld(wasHeld), _isClick(isClick), _accepted(true) {}
-
-    int x() const { return _x; }
-    int y() const { return _y; }
-    int button() const { return _button; }
-    int buttons() const { return _buttons; }
-    int modifiers() const { return _modifiers; }
-    bool wasHeld() const { return _wasHeld; }
-    bool isClick() const { return _isClick; }
-
-    bool isAccepted() { return _accepted; }
-    void setAccepted(bool accepted) { _accepted = accepted; }
-
-private:
-    int _x;
-    int _y;
-    Qt::MouseButton _button;
-    Qt::MouseButtons _buttons;
-    Qt::KeyboardModifiers _modifiers;
-    bool _wasHeld;
-    bool _isClick;
-    bool _accepted;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsKeyEvent)
-QML_DECLARE_TYPE(QmlGraphicsMouseEvent)
-
-#endif // QMLGRAPHICSEVENTS_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
deleted file mode 100644
index e92fea4..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
+++ /dev/null
@@ -1,1324 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsflickable_p.h"
-#include "qmlgraphicsflickable_p_p.h"
-
-#include <QGraphicsSceneMouseEvent>
-#include <QPointer>
-#include <QTimer>
-
-QT_BEGIN_NAMESPACE
-
-
-// FlickThreshold determines how far the "mouse" must have moved
-// before we perform a flick.
-static const int FlickThreshold = 20;
-
-// Really slow flicks can be annoying.
-static const int minimumFlickVelocity = 200;
-
-QmlGraphicsFlickableVisibleArea::QmlGraphicsFlickableVisibleArea(QmlGraphicsFlickable *parent)
-    : QObject(parent), flickable(parent), m_xPosition(0.), m_widthRatio(0.)
-    , m_yPosition(0.), m_heightRatio(0.)
-{
-}
-
-qreal QmlGraphicsFlickableVisibleArea::widthRatio() const
-{
-    return m_widthRatio;
-}
-
-qreal QmlGraphicsFlickableVisibleArea::xPosition() const
-{
-    return m_xPosition;
-}
-
-qreal QmlGraphicsFlickableVisibleArea::heightRatio() const
-{
-    return m_heightRatio;
-}
-
-qreal QmlGraphicsFlickableVisibleArea::yPosition() const
-{
-    return m_yPosition;
-}
-
-void QmlGraphicsFlickableVisibleArea::updateVisible()
-{
-    QmlGraphicsFlickablePrivate *p = static_cast<QmlGraphicsFlickablePrivate *>(QGraphicsItemPrivate::get(flickable));
-    bool pageChange = false;
-
-    // Vertical
-    const qreal viewheight = flickable->height();
-    const qreal maxyextent = -flickable->maxYExtent() + flickable->minYExtent();
-    qreal pagePos = (-p->_moveY.value() + flickable->minYExtent()) / (maxyextent + viewheight);
-    qreal pageSize = viewheight / (maxyextent + viewheight);
-
-    if (pageSize != m_heightRatio) {
-        m_heightRatio = pageSize;
-        pageChange = true;
-    }
-    if (pagePos != m_yPosition) {
-        m_yPosition = pagePos;
-        pageChange = true;
-    }
-
-    // Horizontal
-    const qreal viewwidth = flickable->width();
-    const qreal maxxextent = -flickable->maxXExtent() + flickable->minXExtent();
-    pagePos = (-p->_moveX.value() + flickable->minXExtent()) / (maxxextent + viewwidth);
-    pageSize = viewwidth / (maxxextent + viewwidth);
-
-    if (pageSize != m_widthRatio) {
-        m_widthRatio = pageSize;
-        pageChange = true;
-    }
-    if (pagePos != m_xPosition) {
-        m_xPosition = pagePos;
-        pageChange = true;
-    }
-    if (pageChange)
-        emit pageChanged();
-}
-
-
-QmlGraphicsFlickablePrivate::QmlGraphicsFlickablePrivate()
-  : viewport(new QmlGraphicsItem)
-    , _moveX(this, &QmlGraphicsFlickablePrivate::setRoundedViewportX)
-    , _moveY(this, &QmlGraphicsFlickablePrivate::setRoundedViewportY)
-    , vWidth(-1), vHeight(-1), overShoot(true), flicked(false), moving(false), stealMouse(false)
-    , pressed(false), atXEnd(false), atXBeginning(true), atYEnd(false), atYBeginning(true)
-    , interactive(true), deceleration(500), maxVelocity(2000), reportedVelocitySmoothing(100)
-    , delayedPressEvent(0), delayedPressTarget(0), pressDelay(0), fixupDuration(200)
-    , horizontalVelocity(this), verticalVelocity(this), vTime(0), visibleArea(0)
-    , flickDirection(QmlGraphicsFlickable::AutoFlickDirection)
-{
-}
-
-void QmlGraphicsFlickablePrivate::init()
-{
-    Q_Q(QmlGraphicsFlickable);
-    viewport->setParent(q);
-    QObject::connect(&timeline, SIGNAL(updated()), q, SLOT(ticked()));
-    QObject::connect(&timeline, SIGNAL(completed()), q, SLOT(movementEnding()));
-    q->setAcceptedMouseButtons(Qt::LeftButton);
-    q->setFiltersChildEvents(true);
-    QObject::connect(viewport, SIGNAL(xChanged()), q, SIGNAL(positionXChanged()));
-    QObject::connect(viewport, SIGNAL(yChanged()), q, SIGNAL(positionYChanged()));
-    QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(heightChange()));
-    QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(widthChange()));
-}
-
-void QmlGraphicsFlickablePrivate::flickX(qreal velocity)
-{
-    Q_Q(QmlGraphicsFlickable);
-    qreal maxDistance = -1;
-    // -ve velocity means list is moving up
-    if (velocity > 0) {
-        const qreal minX = q->minXExtent();
-        if (_moveX.value() < minX)
-            maxDistance = qAbs(minX -_moveX.value() + (overShoot?30:0));
-        flickTargetX = minX;
-    } else {
-        const qreal maxX = q->maxXExtent();
-        if (_moveX.value() > maxX)
-            maxDistance = qAbs(maxX - _moveX.value()) + (overShoot?30:0);
-        flickTargetX = maxX;
-    }
-    if (maxDistance > 0) {
-        qreal v = velocity;
-        if (maxVelocity != -1 && maxVelocity < qAbs(v)) {
-            if (v < 0)
-                v = -maxVelocity;
-            else
-                v = maxVelocity;
-        }
-        timeline.reset(_moveX);
-        timeline.accel(_moveX, v, deceleration, maxDistance);
-        timeline.callback(QmlTimeLineCallback(&_moveX, fixupX_callback, this));
-        if (!flicked) {
-            flicked = true;
-            emit q->flickingChanged();
-            emit q->flickStarted();
-        }
-    } else {
-        timeline.reset(_moveX);
-        fixupX();
-    }
-}
-
-void QmlGraphicsFlickablePrivate::flickY(qreal velocity)
-{
-    Q_Q(QmlGraphicsFlickable);
-    qreal maxDistance = -1;
-    // -ve velocity means list is moving up
-    if (velocity > 0) {
-        const qreal minY = q->minYExtent();
-        if (_moveY.value() < minY)
-            maxDistance = qAbs(minY -_moveY.value() + (overShoot?30:0));
-        flickTargetY = minY;
-    } else {
-        const qreal maxY = q->maxYExtent();
-        if (_moveY.value() > maxY)
-            maxDistance = qAbs(maxY - _moveY.value()) + (overShoot?30:0);
-        flickTargetY = maxY;
-    }
-    if (maxDistance > 0) {
-        qreal v = velocity;
-        if (maxVelocity != -1 && maxVelocity < qAbs(v)) {
-            if (v < 0)
-                v = -maxVelocity;
-            else
-                v = maxVelocity;
-        }
-        timeline.reset(_moveY);
-        timeline.accel(_moveY, v, deceleration, maxDistance);
-        timeline.callback(QmlTimeLineCallback(&_moveY, fixupY_callback, this));
-        if (!flicked) {
-            flicked = true;
-            emit q->flickingChanged();
-            emit q->flickStarted();
-        }
-    } else {
-        timeline.reset(_moveY);
-        fixupY();
-    }
-}
-
-void QmlGraphicsFlickablePrivate::fixupX()
-{
-    Q_Q(QmlGraphicsFlickable);
-    if (!q->xflick() || _moveX.timeLine())
-        return;
-
-    if (_moveX.value() > q->minXExtent() || (q->maxXExtent() > q->minXExtent())) {
-        timeline.reset(_moveX);
-        if (_moveX.value() != q->minXExtent()) {
-            if (fixupDuration)
-                timeline.move(_moveX, q->minXExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-            else
-                _moveY.setValue(q->minYExtent());
-        }
-        //emit flickingChanged();
-    } else if (_moveX.value() < q->maxXExtent()) {
-        timeline.reset(_moveX);
-        if (fixupDuration)
-            timeline.move(_moveX,  q->maxXExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-        else
-            _moveY.setValue(q->maxYExtent());
-        //emit flickingChanged();
-    } else {
-        flicked = false;
-    }
-
-    vTime = timeline.time();
-}
-
-void QmlGraphicsFlickablePrivate::fixupY_callback(void *data)
-{
-    ((QmlGraphicsFlickablePrivate *)data)->fixupY();
-}
-
-void QmlGraphicsFlickablePrivate::fixupX_callback(void *data)
-{
-    ((QmlGraphicsFlickablePrivate *)data)->fixupX();
-}
-
-void QmlGraphicsFlickablePrivate::fixupY()
-{
-    Q_Q(QmlGraphicsFlickable);
-    if (!q->yflick() || _moveY.timeLine())
-        return;
-
-    if (_moveY.value() > q->minYExtent() || (q->maxYExtent() > q->minYExtent())) {
-        timeline.reset(_moveY);
-        if (_moveY.value() != q->minYExtent()) {
-            if (fixupDuration)
-                timeline.move(_moveY, q->minYExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-            else
-                _moveY.setValue(q->minYExtent());
-        }
-        //emit flickingChanged();
-    } else if (_moveY.value() < q->maxYExtent()) {
-        timeline.reset(_moveY);
-        if (fixupDuration)
-            timeline.move(_moveY,  q->maxYExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-        else
-            _moveY.setValue(q->maxYExtent());
-        //emit flickingChanged();
-    } else {
-        flicked = false;
-    }
-
-    vTime = timeline.time();
-}
-
-void QmlGraphicsFlickablePrivate::updateBeginningEnd()
-{
-    Q_Q(QmlGraphicsFlickable);
-    bool atBoundaryChange = false;
-
-    // Vertical
-    const int maxyextent = int(-q->maxYExtent());
-    const qreal ypos = -_moveY.value();
-    bool atBeginning = (ypos <= -q->minYExtent());
-    bool atEnd = (maxyextent <= ypos);
-
-    if (atBeginning != atYBeginning) {
-        atYBeginning = atBeginning;
-        atBoundaryChange = true;
-    }
-    if (atEnd != atYEnd) {
-        atYEnd = atEnd;
-        atBoundaryChange = true;
-    }
-
-    // Horizontal
-    const int maxxextent = int(-q->maxXExtent());
-    const qreal xpos = -_moveX.value();
-    atBeginning = (xpos <= -q->minXExtent());
-    atEnd = (maxxextent <= xpos);
-
-    if (atBeginning != atXBeginning) {
-        atXBeginning = atBeginning;
-        atBoundaryChange = true;
-    }
-    if (atEnd != atXEnd) {
-        atXEnd = atEnd;
-        atBoundaryChange = true;
-    }
-
-    if (atBoundaryChange)
-        emit q->isAtBoundaryChanged();
-
-    if (visibleArea)
-        visibleArea->updateVisible();
-}
-
-/*!
-    \qmlclass Flickable QmlGraphicsFlickable
-    \brief The Flickable item provides a surface that can be "flicked".
-    \inherits Item
-
-    Flickable places its children on a surface that can be dragged and flicked.
-
-    \code
-    Flickable {
-        width: 200; height: 200; viewportWidth: image.width; viewportHeight: image.height
-        Image { id: image; source: "bigimage.png" }
-    }
-    \endcode
-
-    \image flickable.gif
-
-    \note Flickable does not automatically clip its contents. If
-    it is not full-screen it is likely that \c clip should be set
-    to true.
-
-    \note Due to an implementation detail items placed inside a flickable cannot anchor to it by
-    id, use 'parent' instead.
-*/
-
-/*!
-    \qmlsignal Flickable::onMovementStarted()
-
-    This handler is called when the view begins moving due to user
-    interaction.
-*/
-
-/*!
-    \qmlsignal Flickable::onMovementEnded()
-
-    This handler is called when the view stops moving due to user
-    interaction.  If a flick was generated, this handler will
-    be triggered once the flick stops.  If a flick was not
-    generated, the handler will be triggered when the
-    user stops dragging - i.e. a mouse or touch release.
-*/
-
-/*!
-    \qmlsignal Flickable::onFlickStarted()
-
-    This handler is called when the view is flicked.  A flick
-    starts from the point that the mouse or touch is released,
-    while still in motion.
-*/
-
-/*!
-    \qmlsignal Flickable::onFlickEnded()
-
-    This handler is called when the view stops moving due to a flick.
-*/
-
-/*!
-    \qmlproperty real Flickable::visibleArea.xPosition
-    \qmlproperty real Flickable::visibleArea.widthRatio
-    \qmlproperty real Flickable::visibleArea.yPosition
-    \qmlproperty real Flickable::visibleArea.heightRatio
-
-    These properties describe the position and size of the currently viewed area.
-    The size is defined as the percentage of the full view currently visible,
-    scaled to 0.0 - 1.0.  The page position is in the range 0.0 (beginning) to
-    size ratio (end), i.e. yPosition is in the range 0.0 - heightRatio.
-
-    These properties are typically used to draw a scrollbar, for example:
-    \code
-    Rectangle {
-        opacity: 0.5; anchors.right: MyListView.right-2; width: 6
-        y: MyListView.visibleArea.yPosition * MyListView.height
-        height: MyListView.visibleArea.heightRatio * MyListView.height
-    }
-    \endcode
-*/
-
-QmlGraphicsFlickable::QmlGraphicsFlickable(QmlGraphicsItem *parent)
-  : QmlGraphicsItem(*(new QmlGraphicsFlickablePrivate), parent)
-{
-    Q_D(QmlGraphicsFlickable);
-    d->init();
-}
-
-QmlGraphicsFlickable::QmlGraphicsFlickable(QmlGraphicsFlickablePrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsItem(dd, parent)
-{
-    Q_D(QmlGraphicsFlickable);
-    d->init();
-}
-
-QmlGraphicsFlickable::~QmlGraphicsFlickable()
-{
-}
-
-/*!
-    \qmlproperty int Flickable::viewportX
-    \qmlproperty int Flickable::viewportY
-
-    These properties hold the surface coordinate currently at the top-left
-    corner of the Flickable. For example, if you flick an image up 100 pixels,
-    \c yPosition will be 100.
-*/
-qreal QmlGraphicsFlickable::viewportX() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return -d->_moveX.value();
-}
-
-void QmlGraphicsFlickable::setViewportX(qreal pos)
-{
-    Q_D(QmlGraphicsFlickable);
-    pos = qRound(pos);
-    d->timeline.reset(d->_moveX);
-    d->vTime = d->timeline.time();
-    if (-pos != d->_moveX.value()) {
-        d->_moveX.setValue(-pos);
-        viewportMoved();
-    }
-}
-
-qreal QmlGraphicsFlickable::viewportY() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return -d->_moveY.value();
-}
-
-void QmlGraphicsFlickable::setViewportY(qreal pos)
-{
-    Q_D(QmlGraphicsFlickable);
-    pos = qRound(pos);
-    d->timeline.reset(d->_moveY);
-    d->vTime = d->timeline.time();
-    if (-pos != d->_moveY.value()) {
-        d->_moveY.setValue(-pos);
-        viewportMoved();
-    }
-}
-
-/*!
-    \qmlproperty bool Flickable::interactive
-
-    A user cannot drag or flick a Flickable that is not interactive.
-
-    This property is useful for temporarily disabling flicking. This allows
-    special interaction with Flickable's children: for example, you might want to
-    freeze a flickable map while viewing detailed information on a location popup that is a child of the Flickable.
-*/
-bool QmlGraphicsFlickable::isInteractive() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->interactive;
-}
-
-void QmlGraphicsFlickable::setInteractive(bool interactive)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (interactive != d->interactive) {
-        d->interactive = interactive;
-        if (!interactive && d->flicked) {
-            d->timeline.clear();
-            d->vTime = d->timeline.time();
-            d->flicked = false;
-            emit flickingChanged();
-            emit flickEnded();
-        }
-        emit interactiveChanged();
-    }
-}
-
-/*!
-    \qmlproperty real Flickable::horizontalVelocity
-    \qmlproperty real Flickable::verticalVelocity
-    \qmlproperty real Flickable::reportedVelocitySmoothing
-
-    The instantaneous velocity of movement along the x and y axes, in pixels/sec.
-
-    The reported velocity is smoothed to avoid erratic output.
-    reportedVelocitySmoothing determines how much smoothing is applied.
-*/
-qreal QmlGraphicsFlickable::horizontalVelocity() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->horizontalVelocity.value();
-}
-
-qreal QmlGraphicsFlickable::verticalVelocity() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->verticalVelocity.value();
-}
-
-/*!
-    \qmlproperty bool Flickable::atXBeginning
-    \qmlproperty bool Flickable::atXEnd
-    \qmlproperty bool Flickable::atYBeginning
-    \qmlproperty bool Flickable::atYEnd
-
-    These properties are true if the flickable view is positioned at the beginning,
-    or end respecively.
-*/
-bool QmlGraphicsFlickable::isAtXEnd() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->atXEnd;
-}
-
-bool QmlGraphicsFlickable::isAtXBeginning() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->atXBeginning;
-}
-
-bool QmlGraphicsFlickable::isAtYEnd() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->atYEnd;
-}
-
-bool QmlGraphicsFlickable::isAtYBeginning() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->atYBeginning;
-}
-
-void QmlGraphicsFlickable::ticked()
-{
-    viewportMoved();
-}
-
-QmlGraphicsItem *QmlGraphicsFlickable::viewport()
-{
-    Q_D(QmlGraphicsFlickable);
-    return d->viewport;
-}
-
-QmlGraphicsFlickableVisibleArea *QmlGraphicsFlickable::visibleArea()
-{
-    Q_D(QmlGraphicsFlickable);
-    if (!d->visibleArea)
-        d->visibleArea = new QmlGraphicsFlickableVisibleArea(this);
-    return d->visibleArea;
-}
-
-/*!
-    \qmlproperty enumeration Flickable::flickDirection
-
-    This property determines which directions the view can be flicked.
-
-    \list
-    \o AutoFlickDirection (default) - allows flicking vertically if the
-    \e viewportHeight is not equal to the \e height of the Flickable.
-    Allows flicking horizontally if the \e viewportWidth is not equal
-    to the \e width of the Flickable.
-    \o HorizontalFlick - allows flicking horizontally.
-    \o VerticalFlick - allows flicking vertically.
-    \o HorizontalAndVerticalFlick - allows flicking in both directions.
-    \endlist
-*/
-QmlGraphicsFlickable::FlickDirection QmlGraphicsFlickable::flickDirection() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->flickDirection;
-}
-
-void QmlGraphicsFlickable::setFlickDirection(FlickDirection direction)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (direction != d->flickDirection) {
-        d->flickDirection = direction;
-        emit flickDirectionChanged();
-    }
-}
-
-void QmlGraphicsFlickablePrivate::handleMousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (interactive && timeline.isActive() && (qAbs(velocityX) > 10 || qAbs(velocityY) > 10))
-        stealMouse = true; // If we've been flicked then steal the click.
-    else
-        stealMouse = false;
-    pressed = true;
-    timeline.clear();
-    velocityX = 0;
-    velocityY = 0;
-    lastPos = QPoint();
-    QmlGraphicsItemPrivate::start(lastPosTime);
-    pressPos = event->pos();
-    pressX = _moveX.value();
-    pressY = _moveY.value();
-    flicked = false;
-    QmlGraphicsItemPrivate::start(pressTime);
-    QmlGraphicsItemPrivate::start(velocityTime);
-}
-
-void QmlGraphicsFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_Q(QmlGraphicsFlickable);
-    if (!interactive || lastPosTime.isNull())
-        return;
-    bool rejectY = false;
-    bool rejectX = false;
-    bool moved = false;
-
-    if (q->yflick()) {
-        int dy = int(event->pos().y() - pressPos.y());
-        if (qAbs(dy) > QApplication::startDragDistance() || QmlGraphicsItemPrivate::elapsed(pressTime) > 200) {
-            qreal newY = dy + pressY;
-            const qreal minY = q->minYExtent();
-            const qreal maxY = q->maxYExtent();
-            if (newY > minY)
-                newY = minY + (newY - minY) / 2;
-            if (newY < maxY && maxY - minY <= 0)
-                newY = maxY + (newY - maxY) / 2;
-            if (!q->overShoot() && (newY > minY || newY < maxY)) {
-                if (newY > minY)
-                    newY = minY;
-                else if (newY < maxY)
-                    newY = maxY;
-                else
-                    rejectY = true;
-            }
-            if (!rejectY) {
-                _moveY.setValue(newY);
-                moved = true;
-            }
-            if (qAbs(dy) > QApplication::startDragDistance())
-                stealMouse = true;
-        }
-    }
-
-    if (q->xflick()) {
-        int dx = int(event->pos().x() - pressPos.x());
-        if (qAbs(dx) > QApplication::startDragDistance() || QmlGraphicsItemPrivate::elapsed(pressTime) > 200) {
-            qreal newX = dx + pressX;
-            const qreal minX = q->minXExtent();
-            const qreal maxX = q->maxXExtent();
-            if (newX > minX)
-                newX = minX + (newX - minX) / 2;
-            if (newX < maxX && maxX - minX <= 0)
-                newX = maxX + (newX - maxX) / 2;
-            if (!q->overShoot() && (newX > minX || newX < maxX)) {
-                if (newX > minX)
-                    newX = minX;
-                else if (newX < maxX)
-                    newX = maxX;
-                else
-                    rejectX = true;
-            }
-            if (!rejectX) {
-                _moveX.setValue(newX);
-                moved = true;
-            }
-
-            if (qAbs(dx) > QApplication::startDragDistance())
-                stealMouse = true;
-        }
-    }
-
-    if (!lastPos.isNull()) {
-        qreal elapsed = qreal(QmlGraphicsItemPrivate::restart(lastPosTime)) / 1000.;
-        if (elapsed <= 0)
-            elapsed = 1;
-        if (q->yflick()) {
-            qreal diff = event->pos().y() - lastPos.y();
-            // average to reduce the effect of spurious moves
-            velocityY += diff / elapsed;
-            velocityY /= 2;
-        }
-
-        if (q->xflick()) {
-            qreal diff = event->pos().x() - lastPos.x();
-            // average to reduce the effect of spurious moves
-            velocityX += diff / elapsed;
-            velocityX /= 2;
-        }
-    }
-
-    if (rejectY) velocityY = 0;
-    if (rejectX) velocityX = 0;
-
-    if (moved) {
-        q->movementStarting();
-        q->viewportMoved();
-    }
-
-    lastPos = event->pos();
-}
-
-void QmlGraphicsFlickablePrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_Q(QmlGraphicsFlickable);
-    pressed = false;
-    if (lastPosTime.isNull())
-        return;
-
-    if (QmlGraphicsItemPrivate::elapsed(lastPosTime) > 100) {
-        // if we drag then pause before release we should not cause a flick.
-        velocityX = 0.0;
-        velocityY = 0.0;
-    }
-
-    vTime = timeline.time();
-    if (qAbs(velocityY) > 10 && qAbs(event->pos().y() - pressPos.y()) > FlickThreshold) {
-        qreal velocity = velocityY;
-        if (qAbs(velocity) < minimumFlickVelocity) // Minimum velocity to avoid annoyingly slow flicks.
-            velocity = velocity < 0 ? -minimumFlickVelocity : minimumFlickVelocity;
-        flickY(velocity);
-    } else {
-        fixupY();
-    }
-
-    if (qAbs(velocityX) > 10 && qAbs(event->pos().x() - pressPos.x()) > FlickThreshold) {
-        qreal velocity = velocityX;
-        if (qAbs(velocity) < minimumFlickVelocity) // Minimum velocity to avoid annoyingly slow flicks.
-            velocity = velocity < 0 ? -minimumFlickVelocity : minimumFlickVelocity;
-        flickX(velocity);
-    } else {
-        fixupX();
-    }
-
-    stealMouse = false;
-    lastPosTime = QTime();
-
-    if (!timeline.isActive())
-        q->movementEnding();
-}
-
-void QmlGraphicsFlickable::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->interactive) {
-        d->handleMousePressEvent(event);
-        event->accept();
-    } else {
-        QmlGraphicsItem::mousePressEvent(event);
-    }
-}
-
-void QmlGraphicsFlickable::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->interactive) {
-        d->handleMouseMoveEvent(event);
-        event->accept();
-    } else {
-        QmlGraphicsItem::mouseMoveEvent(event);
-    }
-}
-
-void QmlGraphicsFlickable::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->interactive) {
-        d->clearDelayedPress();
-        d->handleMouseReleaseEvent(event);
-        event->accept();
-        ungrabMouse();
-    } else {
-        QmlGraphicsItem::mouseReleaseEvent(event);
-    }
-}
-
-void QmlGraphicsFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (!d->interactive) {
-        QmlGraphicsItem::wheelEvent(event);
-    } else if (yflick()) {
-        if (event->delta() > 0)
-            d->velocityY = qMax(event->delta() - d->verticalVelocity.value(), qreal(250.0));
-        else
-            d->velocityY = qMin(event->delta() - d->verticalVelocity.value(), qreal(-250.0));
-        d->flicked = false;
-        d->flickY(d->velocityY);
-        event->accept();
-    } else if (xflick()) {
-        if (event->delta() > 0)
-            d->velocityX = qMax(event->delta() - d->horizontalVelocity.value(), qreal(250.0));
-        else
-            d->velocityX = qMin(event->delta() - d->horizontalVelocity.value(), qreal(-250.0));
-        d->flicked = false;
-        d->flickX(d->velocityX);
-        event->accept();
-    } else {
-        QmlGraphicsItem::wheelEvent(event);
-    }
-}
-
-void QmlGraphicsFlickablePrivate::captureDelayedPress(QGraphicsSceneMouseEvent *event)
-{
-    Q_Q(QmlGraphicsFlickable);
-    if (!q->scene() || pressDelay <= 0)
-        return;
-    delayedPressTarget = q->scene()->mouseGrabberItem();
-    delayedPressEvent = new QGraphicsSceneMouseEvent(event->type());
-    delayedPressEvent->setAccepted(false);
-    for (int i = 0x1; i <= 0x10; i <<= 1) {
-        if (event->buttons() & i) {
-            Qt::MouseButton button = Qt::MouseButton(i);
-            delayedPressEvent->setButtonDownPos(button, event->buttonDownPos(button));
-            delayedPressEvent->setButtonDownScenePos(button, event->buttonDownScenePos(button));
-            delayedPressEvent->setButtonDownScreenPos(button, event->buttonDownScreenPos(button));
-        }
-    }
-    delayedPressEvent->setButtons(event->buttons());
-    delayedPressEvent->setButton(event->button());
-    delayedPressEvent->setPos(event->pos());
-    delayedPressEvent->setScenePos(event->scenePos());
-    delayedPressEvent->setScreenPos(event->screenPos());
-    delayedPressEvent->setLastPos(event->lastPos());
-    delayedPressEvent->setLastScenePos(event->lastScenePos());
-    delayedPressEvent->setLastScreenPos(event->lastScreenPos());
-    delayedPressEvent->setModifiers(event->modifiers());
-    delayedPressTimer.start(pressDelay, q);
-}
-
-void QmlGraphicsFlickablePrivate::clearDelayedPress()
-{
-    if (delayedPressEvent) {
-        delayedPressTimer.stop();
-        delete delayedPressEvent;
-        delayedPressEvent = 0;
-    }
-}
-
-void QmlGraphicsFlickablePrivate::setRoundedViewportX(qreal x)
-{
-    viewport->setX(qRound(x));
-}
-
-void QmlGraphicsFlickablePrivate::setRoundedViewportY(qreal y)
-{
-    viewport->setY(qRound(y));
-}
-
-void QmlGraphicsFlickable::timerEvent(QTimerEvent *event)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (event->timerId() == d->delayedPressTimer.timerId()) {
-        d->delayedPressTimer.stop();
-        if (d->delayedPressEvent) {
-            QmlGraphicsItem *grabber = scene() ? qobject_cast<QmlGraphicsItem*>(scene()->mouseGrabberItem()) : 0;
-            if (!grabber || grabber != this)
-                scene()->sendEvent(d->delayedPressTarget, d->delayedPressEvent);
-            delete d->delayedPressEvent;
-            d->delayedPressEvent = 0;
-        }
-    }
-}
-
-qreal QmlGraphicsFlickable::minYExtent() const
-{
-    return 0.0;
-}
-
-qreal QmlGraphicsFlickable::minXExtent() const
-{
-    return 0.0;
-}
-
-/* returns -ve */
-qreal QmlGraphicsFlickable::maxXExtent() const
-{
-    return width() - vWidth();
-}
-/* returns -ve */
-qreal QmlGraphicsFlickable::maxYExtent() const
-{
-    return height() - vHeight();
-}
-
-void QmlGraphicsFlickable::viewportMoved()
-{
-    Q_D(QmlGraphicsFlickable);
-
-    int elapsed = QmlGraphicsItemPrivate::restart(d->velocityTime);
-    if (!elapsed)
-        return;
-
-    qreal prevY = d->lastFlickablePosition.x();
-    qreal prevX = d->lastFlickablePosition.y();
-    d->velocityTimeline.clear();
-    if (d->pressed) {
-        qreal horizontalVelocity = (prevX - d->_moveX.value()) * 1000 / elapsed;
-        qreal verticalVelocity = (prevY - d->_moveY.value()) * 1000 / elapsed;
-        d->velocityTimeline.move(d->horizontalVelocity, horizontalVelocity, d->reportedVelocitySmoothing);
-        d->velocityTimeline.move(d->horizontalVelocity, 0, d->reportedVelocitySmoothing);
-        d->velocityTimeline.move(d->verticalVelocity, verticalVelocity, d->reportedVelocitySmoothing);
-        d->velocityTimeline.move(d->verticalVelocity, 0, d->reportedVelocitySmoothing);
-    } else {
-        if (d->timeline.time() > d->vTime) {
-            qreal horizontalVelocity = (prevX - d->_moveX.value()) * 1000 / (d->timeline.time() - d->vTime);
-            qreal verticalVelocity = (prevY - d->_moveY.value()) * 1000 / (d->timeline.time() - d->vTime);
-            d->horizontalVelocity.setValue(horizontalVelocity);
-            d->verticalVelocity.setValue(verticalVelocity);
-        }
-    }
-
-    d->lastFlickablePosition = QPointF(d->_moveY.value(), d->_moveX.value());
-
-    d->vTime = d->timeline.time();
-    d->updateBeginningEnd();
-}
-
-void QmlGraphicsFlickable::cancelFlick()
-{
-    Q_D(QmlGraphicsFlickable);
-    d->timeline.reset(d->_moveX);
-    d->timeline.reset(d->_moveY);
-    movementEnding();
-}
-
-void QmlGraphicsFlickablePrivate::data_append(QmlListProperty<QObject> *prop, QObject *o)
-{
-    QmlGraphicsItem *i = qobject_cast<QmlGraphicsItem *>(o);
-    if (i)
-        i->setParentItem(static_cast<QmlGraphicsFlickablePrivate*>(prop->data)->viewport);
-    else
-        o->setParent(prop->object);
-}
-
-QmlListProperty<QObject> QmlGraphicsFlickable::flickableData()
-{
-    Q_D(QmlGraphicsFlickable);
-    return QmlListProperty<QObject>(this, (void *)d, QmlGraphicsFlickablePrivate::data_append);
-}
-
-QmlListProperty<QmlGraphicsItem> QmlGraphicsFlickable::flickableChildren()
-{
-    Q_D(QmlGraphicsFlickable);
-    return d->viewport->fxChildren();
-}
-
-/*!
-    \qmlproperty bool Flickable::overShoot
-    This property holds the number of pixels the surface may overshoot the
-    Flickable's boundaries when flicked.
-
-    If overShoot is non-zero the contents can be flicked beyond the boundary
-    of the Flickable before being moved back to the boundary.  This provides
-    the feeling that the edges of the view are soft, rather than a hard
-    physical boundary.
-*/
-bool QmlGraphicsFlickable::overShoot() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->overShoot;
-}
-
-void QmlGraphicsFlickable::setOverShoot(bool o)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->overShoot == o)
-        return;
-    d->overShoot = o;
-    emit overShootChanged();
-}
-
-/*!
-    \qmlproperty int Flickable::viewportWidth
-    \qmlproperty int Flickable::viewportHeight
-
-    The dimensions of the viewport (the surface controlled by Flickable). Typically this
-    should be set to the combined size of the items placed in the Flickable.
-
-    \code
-    Flickable {
-        width: 320; height: 480; viewportWidth: image.width; viewportHeight: image.height
-        Image { id: image; source: "bigimage.png" }
-    }
-    \endcode
-*/
-qreal QmlGraphicsFlickable::viewportWidth() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->vWidth;
-}
-
-void QmlGraphicsFlickable::setViewportWidth(qreal w)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->vWidth == w)
-        return;
-    d->vWidth = w;
-    if (w < 0)
-        d->viewport->setWidth(width());
-    else
-        d->viewport->setWidth(w);
-    // Make sure that we're entirely in view.
-    if (!d->pressed)
-        d->fixupX();
-    emit viewportWidthChanged();
-    d->updateBeginningEnd();
-}
-
-void QmlGraphicsFlickable::widthChange()
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->vWidth < 0) {
-        d->viewport->setWidth(width());
-        emit viewportWidthChanged();
-    }
-    d->updateBeginningEnd();
-}
-
-void QmlGraphicsFlickable::heightChange()
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->vHeight < 0) {
-        d->viewport->setHeight(height());
-        emit viewportHeightChanged();
-    }
-    d->updateBeginningEnd();
-}
-
-qreal QmlGraphicsFlickable::viewportHeight() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->vHeight;
-}
-
-void QmlGraphicsFlickable::setViewportHeight(qreal h)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->vHeight == h)
-        return;
-    d->vHeight = h;
-    if (h < 0)
-        d->viewport->setHeight(height());
-    else
-        d->viewport->setHeight(h);
-    // Make sure that we're entirely in view.
-    if (!d->pressed)
-        d->fixupY();
-    emit viewportHeightChanged();
-    d->updateBeginningEnd();
-}
-
-qreal QmlGraphicsFlickable::vWidth() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    if (d->vWidth < 0)
-        return width();
-    else
-        return d->vWidth;
-}
-
-qreal QmlGraphicsFlickable::vHeight() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    if (d->vHeight < 0)
-        return height();
-    else
-        return d->vHeight;
-}
-
-bool QmlGraphicsFlickable::xflick() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    if (d->flickDirection == QmlGraphicsFlickable::AutoFlickDirection)
-        return vWidth() != width();
-    return d->flickDirection & QmlGraphicsFlickable::HorizontalFlick;
-}
-
-bool QmlGraphicsFlickable::yflick() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    if (d->flickDirection == QmlGraphicsFlickable::AutoFlickDirection)
-        return vHeight() !=  height();
-    return d->flickDirection & QmlGraphicsFlickable::VerticalFlick;
-}
-
-bool QmlGraphicsFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsFlickable);
-    QGraphicsSceneMouseEvent mouseEvent(event->type());
-    QRectF myRect = mapToScene(QRectF(0, 0, width(), height())).boundingRect();
-
-    QGraphicsScene *s = scene();
-    QmlGraphicsItem *grabber = s ? qobject_cast<QmlGraphicsItem*>(s->mouseGrabberItem()) : 0;
-    if ((d->stealMouse || myRect.contains(event->scenePos().toPoint())) && (!grabber || !grabber->keepMouseGrab())) {
-        mouseEvent.setAccepted(false);
-        for (int i = 0x1; i <= 0x10; i <<= 1) {
-            if (event->buttons() & i) {
-                Qt::MouseButton button = Qt::MouseButton(i);
-                mouseEvent.setButtonDownPos(button, mapFromScene(event->buttonDownPos(button)));
-            }
-        }
-        mouseEvent.setScenePos(event->scenePos());
-        mouseEvent.setLastScenePos(event->lastScenePos());
-        mouseEvent.setPos(mapFromScene(event->scenePos()));
-        mouseEvent.setLastPos(mapFromScene(event->lastScenePos()));
-
-        switch(mouseEvent.type()) {
-        case QEvent::GraphicsSceneMouseMove:
-            d->handleMouseMoveEvent(&mouseEvent);
-            break;
-        case QEvent::GraphicsSceneMousePress:
-            if (d->delayedPressEvent)
-                return false;
-
-            d->handleMousePressEvent(&mouseEvent);
-            d->captureDelayedPress(event);
-            break;
-        case QEvent::GraphicsSceneMouseRelease:
-            if (d->delayedPressEvent) {
-                scene()->sendEvent(d->delayedPressTarget, d->delayedPressEvent);
-                d->clearDelayedPress();
-            }
-            d->handleMouseReleaseEvent(&mouseEvent);
-            break;
-        default:
-            break;
-        }
-        grabber = qobject_cast<QmlGraphicsItem*>(s->mouseGrabberItem());
-        if (grabber && d->stealMouse && !grabber->keepMouseGrab() && grabber != this) {
-            d->clearDelayedPress();
-            grabMouse();
-        }
-
-        return d->stealMouse || d->delayedPressEvent;
-    } else if (!d->lastPosTime.isNull()) {
-        d->lastPosTime = QTime();
-    }
-    if (mouseEvent.type() == QEvent::GraphicsSceneMouseRelease)
-        d->clearDelayedPress();
-    return false;
-}
-
-bool QmlGraphicsFlickable::sceneEventFilter(QGraphicsItem *i, QEvent *e)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (!isVisible() || !d->interactive)
-        return QmlGraphicsItem::sceneEventFilter(i, e);
-    switch (e->type()) {
-    case QEvent::GraphicsSceneMousePress:
-    case QEvent::GraphicsSceneMouseMove:
-    case QEvent::GraphicsSceneMouseRelease:
-        return sendMouseEvent(static_cast<QGraphicsSceneMouseEvent *>(e));
-    default:
-        break;
-    }
-
-    return QmlGraphicsItem::sceneEventFilter(i, e);
-}
-
-/*!
-    \qmlproperty real Flickable::maximumFlickVelocity
-    This property holds the maximum velocity that the user can flick the view in pixels/second.
-
-    The default is 2000 pixels/s
-*/
-qreal QmlGraphicsFlickable::maximumFlickVelocity() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->maxVelocity;
-}
-
-void QmlGraphicsFlickable::setMaximumFlickVelocity(qreal v)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (v == d->maxVelocity)
-        return;
-    d->maxVelocity = v;
-    emit maximumFlickVelocityChanged();
-}
-
-/*!
-    \qmlproperty real Flickable::flickDeceleration
-    This property holds the rate at which a flick will decelerate.
-
-    The default is 500.
-*/
-qreal QmlGraphicsFlickable::flickDeceleration() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->deceleration;
-}
-
-void QmlGraphicsFlickable::setFlickDeceleration(qreal deceleration)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (deceleration == d->deceleration)
-        return;
-    d->deceleration = deceleration;
-    emit flickDecelerationChanged();
-}
-
-/*!
-    \qmlproperty bool Flickable::flicking
-
-    This property holds whether the view is currently moving due to
-    the user flicking the view.
-*/
-bool QmlGraphicsFlickable::isFlicking() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->flicked;
-}
-
-/*!
-    \qmlproperty int Flickable::pressDelay
-
-    This property holds the time to delay (ms) delivering a press to
-    children of the Flickable.  This can be useful where reacting
-    to a press before a flicking action has undesireable effects.
-
-    If the flickable is dragged/flicked before the delay times out
-    the press event will not be delivered.  If the button is released
-    within the timeout, both the press and release will be delivered.
-*/
-int QmlGraphicsFlickable::pressDelay() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->pressDelay;
-}
-
-void QmlGraphicsFlickable::setPressDelay(int delay)
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->pressDelay == delay)
-        return;
-    d->pressDelay = delay;
-    emit pressDelayChanged();
-}
-
-qreal QmlGraphicsFlickable::reportedVelocitySmoothing() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->reportedVelocitySmoothing;
-}
-
-void QmlGraphicsFlickable::setReportedVelocitySmoothing(qreal reportedVelocitySmoothing)
-{
-    Q_D(QmlGraphicsFlickable);
-    Q_ASSERT(reportedVelocitySmoothing >= 0);
-    if (reportedVelocitySmoothing == d->reportedVelocitySmoothing)
-        return;
-    d->reportedVelocitySmoothing = reportedVelocitySmoothing;
-    emit reportedVelocitySmoothingChanged(reportedVelocitySmoothing);
-}
-
-/*!
-    \qmlproperty bool Flickable::moving
-
-    This property holds whether the view is currently moving due to
-    the user either dragging or flicking the view.
-*/
-bool QmlGraphicsFlickable::isMoving() const
-{
-    Q_D(const QmlGraphicsFlickable);
-    return d->moving;
-}
-
-void QmlGraphicsFlickable::movementStarting()
-{
-    Q_D(QmlGraphicsFlickable);
-    if (!d->moving) {
-        d->moving = true;
-        emit movingChanged();
-        emit movementStarted();
-    }
-}
-
-void QmlGraphicsFlickable::movementEnding()
-{
-    Q_D(QmlGraphicsFlickable);
-    if (d->moving) {
-        d->moving = false;
-        emit movingChanged();
-        emit movementEnded();
-    }
-    if (d->flicked) {
-        d->flicked = false;
-        emit flickingChanged();
-        emit flickEnded();
-    }
-    d->horizontalVelocity.setValue(0);
-    d->verticalVelocity.setValue(0);
-}
-
-void QmlGraphicsFlickablePrivate::updateVelocity()
-{
-    Q_Q(QmlGraphicsFlickable);
-    emit q->horizontalVelocityChanged();
-    emit q->verticalVelocityChanged();
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
deleted file mode 100644
index 580d01e..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSFLICKABLE_H
-#define QMLGRAPHICSFLICKABLE_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsFlickablePrivate;
-class QmlGraphicsFlickableVisibleArea;
-class Q_DECLARATIVE_EXPORT QmlGraphicsFlickable : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal viewportWidth READ viewportWidth WRITE setViewportWidth NOTIFY viewportWidthChanged)
-    Q_PROPERTY(qreal viewportHeight READ viewportHeight WRITE setViewportHeight NOTIFY viewportHeightChanged)
-    Q_PROPERTY(qreal viewportX READ viewportX WRITE setViewportX NOTIFY positionXChanged)
-    Q_PROPERTY(qreal viewportY READ viewportY WRITE setViewportY NOTIFY positionYChanged)
-
-    Q_PROPERTY(qreal horizontalVelocity READ horizontalVelocity NOTIFY horizontalVelocityChanged)
-    Q_PROPERTY(qreal verticalVelocity READ verticalVelocity NOTIFY verticalVelocityChanged)
-    Q_PROPERTY(qreal reportedVelocitySmoothing READ reportedVelocitySmoothing WRITE setReportedVelocitySmoothing NOTIFY reportedVelocitySmoothingChanged)
-
-    Q_PROPERTY(bool overShoot READ overShoot WRITE setOverShoot NOTIFY overShootChanged)
-    Q_PROPERTY(qreal maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity NOTIFY maximumFlickVelocityChanged)
-    Q_PROPERTY(qreal flickDeceleration READ flickDeceleration WRITE setFlickDeceleration NOTIFY flickDecelerationChanged)
-    Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged)
-    Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged)
-    Q_PROPERTY(FlickDirection flickDirection READ flickDirection WRITE setFlickDirection NOTIFY flickDirectionChanged)
-
-    Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged)
-    Q_PROPERTY(int pressDelay READ pressDelay WRITE setPressDelay NOTIFY pressDelayChanged)
-
-    Q_PROPERTY(bool atXEnd READ isAtXEnd NOTIFY isAtBoundaryChanged)
-    Q_PROPERTY(bool atYEnd READ isAtYEnd NOTIFY isAtBoundaryChanged)
-    Q_PROPERTY(bool atXBeginning READ isAtXBeginning NOTIFY isAtBoundaryChanged)
-    Q_PROPERTY(bool atYBeginning READ isAtYBeginning NOTIFY isAtBoundaryChanged)
-
-    Q_PROPERTY(QmlGraphicsFlickableVisibleArea *visibleArea READ visibleArea CONSTANT)
-
-    Q_PROPERTY(QmlListProperty<QObject> flickableData READ flickableData)
-    Q_PROPERTY(QmlListProperty<QmlGraphicsItem> flickableChildren READ flickableChildren)
-    Q_CLASSINFO("DefaultProperty", "flickableData")
-
-    Q_ENUMS(FlickDirection)
-
-public:
-    QmlGraphicsFlickable(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsFlickable();
-
-    QmlListProperty<QObject> flickableData();
-    QmlListProperty<QmlGraphicsItem> flickableChildren();
-
-    bool overShoot() const;
-    void setOverShoot(bool);
-
-    qreal viewportWidth() const;
-    void setViewportWidth(qreal);
-
-    qreal viewportHeight() const;
-    void setViewportHeight(qreal);
-
-    qreal viewportX() const;
-    void setViewportX(qreal pos);
-
-    qreal viewportY() const;
-    void setViewportY(qreal pos);
-
-    bool isMoving() const;
-    bool isFlicking() const;
-
-    int pressDelay() const;
-    void setPressDelay(int delay);
-
-    qreal reportedVelocitySmoothing() const;
-    void setReportedVelocitySmoothing(qreal);
-
-    qreal maximumFlickVelocity() const;
-    void setMaximumFlickVelocity(qreal);
-
-    qreal flickDeceleration() const;
-    void setFlickDeceleration(qreal);
-
-    bool isInteractive() const;
-    void setInteractive(bool);
-
-    qreal horizontalVelocity() const;
-    qreal verticalVelocity() const;
-
-    bool isAtXEnd() const;
-    bool isAtXBeginning() const;
-    bool isAtYEnd() const;
-    bool isAtYBeginning() const;
-
-    QmlGraphicsItem *viewport();
-
-    enum FlickDirection { AutoFlickDirection=0x00, HorizontalFlick=0x01, VerticalFlick=0x02, HorizontalAndVerticalFlick=0x03 };
-    FlickDirection flickDirection() const;
-    void setFlickDirection(FlickDirection);
-
-Q_SIGNALS:
-    void viewportWidthChanged();
-    void viewportHeightChanged();
-    void positionXChanged();
-    void positionYChanged();
-    void movingChanged();
-    void flickingChanged();
-    void movementStarted();
-    void movementEnded();
-    void flickStarted();
-    void flickEnded();
-    void reportedVelocitySmoothingChanged(int);
-    void horizontalVelocityChanged();
-    void verticalVelocityChanged();
-    void isAtBoundaryChanged();
-    void pageChanged();
-    void flickDirectionChanged();
-    void interactiveChanged();
-    void overShootChanged();
-    void maximumFlickVelocityChanged();
-    void flickDecelerationChanged();
-    void pressDelayChanged();
-
-protected:
-    virtual bool sceneEventFilter(QGraphicsItem *, QEvent *);
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    void wheelEvent(QGraphicsSceneWheelEvent *event);
-    void timerEvent(QTimerEvent *event);
-
-    QmlGraphicsFlickableVisibleArea *visibleArea();
-
-protected Q_SLOTS:
-    virtual void ticked();
-    void movementStarting();
-    void movementEnding();
-    void heightChange();
-    void widthChange();
-
-protected:
-    virtual qreal minXExtent() const;
-    virtual qreal minYExtent() const;
-    virtual qreal maxXExtent() const;
-    virtual qreal maxYExtent() const;
-    qreal vWidth() const;
-    qreal vHeight() const;
-    virtual void viewportMoved();
-    bool sendMouseEvent(QGraphicsSceneMouseEvent *event);
-
-    bool xflick() const;
-    bool yflick() const;
-    void cancelFlick();
-
-protected:
-    QmlGraphicsFlickable(QmlGraphicsFlickablePrivate &dd, QmlGraphicsItem *parent);
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsFlickable)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsFlickable)
-    friend class QmlGraphicsFlickableVisibleArea;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsFlickable)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
deleted file mode 100644
index e58cc0c..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSFLICKABLE_P_H
-#define QMLGRAPHICSFLICKABLE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsflickable_p.h"
-
-#include "qmlgraphicsitem_p.h"
-
-#include <qml.h>
-#include <qmltimeline_p_p.h>
-#include <qmlanimation_p_p.h>
-
-#include <qdatetime.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsFlickableVisibleArea;
-class QmlGraphicsFlickablePrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsFlickable)
-
-public:
-    QmlGraphicsFlickablePrivate();
-    void init();
-    virtual void flickX(qreal velocity);
-    virtual void flickY(qreal velocity);
-    virtual void fixupX();
-    virtual void fixupY();
-    void updateBeginningEnd();
-
-    void captureDelayedPress(QGraphicsSceneMouseEvent *event);
-    void clearDelayedPress();
-
-    void setRoundedViewportX(qreal x);
-    void setRoundedViewportY(qreal y);
-
-public:
-    QmlGraphicsItem *viewport;
-    QmlTimeLineValueProxy<QmlGraphicsFlickablePrivate> _moveX;
-    QmlTimeLineValueProxy<QmlGraphicsFlickablePrivate> _moveY;
-    QmlTimeLine timeline;
-    qreal vWidth;
-    qreal vHeight;
-    bool overShoot : 1;
-    bool flicked : 1;
-    bool moving : 1;
-    bool stealMouse : 1;
-    bool pressed : 1;
-    bool atXEnd : 1;
-    bool atXBeginning : 1;
-    bool atYEnd : 1;
-    bool atYBeginning : 1;
-    bool interactive : 1;
-    QTime lastPosTime;
-    QPointF lastPos;
-    QPointF pressPos;
-    qreal pressX;
-    qreal pressY;
-    qreal velocityX;
-    qreal velocityY;
-    QTime pressTime;
-    qreal deceleration;
-    qreal maxVelocity;
-    QTime velocityTime;
-    QPointF lastFlickablePosition;
-    qreal reportedVelocitySmoothing;
-    qreal flickTargetX;
-    qreal flickTargetY;
-    QGraphicsSceneMouseEvent *delayedPressEvent;
-    QGraphicsItem *delayedPressTarget;
-    QBasicTimer delayedPressTimer;
-    int pressDelay;
-    int fixupDuration;
-
-    static void fixupY_callback(void *);
-    static void fixupX_callback(void *);
-
-    void updateVelocity();
-    struct Velocity : public QmlTimeLineValue
-    {
-        Velocity(QmlGraphicsFlickablePrivate *p)
-            : parent(p) {}
-        virtual void setValue(qreal v) {
-            QmlTimeLineValue::setValue(v);
-            parent->updateVelocity();
-        }
-        QmlGraphicsFlickablePrivate *parent;
-    };
-    Velocity horizontalVelocity;
-    Velocity verticalVelocity;
-    int vTime;
-    QmlTimeLine velocityTimeline;
-    QmlGraphicsFlickableVisibleArea *visibleArea;
-    QmlGraphicsFlickable::FlickDirection flickDirection;
-
-    void handleMousePressEvent(QGraphicsSceneMouseEvent *);
-    void handleMouseMoveEvent(QGraphicsSceneMouseEvent *);
-    void handleMouseReleaseEvent(QGraphicsSceneMouseEvent *);
-
-    // flickableData property
-    static void data_append(QmlListProperty<QObject> *, QObject *);
-};
-
-class QmlGraphicsFlickableVisibleArea : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal xPosition READ xPosition NOTIFY pageChanged)
-    Q_PROPERTY(qreal yPosition READ yPosition NOTIFY pageChanged)
-    Q_PROPERTY(qreal widthRatio READ widthRatio NOTIFY pageChanged)
-    Q_PROPERTY(qreal heightRatio READ heightRatio NOTIFY pageChanged)
-
-public:
-    QmlGraphicsFlickableVisibleArea(QmlGraphicsFlickable *parent=0);
-
-    qreal xPosition() const;
-    qreal widthRatio() const;
-    qreal yPosition() const;
-    qreal heightRatio() const;
-
-    void updateVisible();
-
-signals:
-    void pageChanged();
-
-private:
-    QmlGraphicsFlickable *flickable;
-    qreal m_xPosition;
-    qreal m_widthRatio;
-    qreal m_yPosition;
-    qreal m_heightRatio;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsFlickableVisibleArea)
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
deleted file mode 100644
index f51c203..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsflipable_p.h"
-
-#include "qmlgraphicsitem_p.h"
-
-#include <qmlinfo.h>
-
-#include <QtGui/qgraphicstransform.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsFlipablePrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsFlipable)
-public:
-    QmlGraphicsFlipablePrivate() : current(QmlGraphicsFlipable::Front), front(0), back(0) {}
-
-    void updateSceneTransformFromParent();
-
-    QmlGraphicsFlipable::Side current;
-    QmlGraphicsItem *front;
-    QmlGraphicsItem *back;
-};
-
-/*!
-    \qmlclass Flipable QmlGraphicsFlipable
-    \since 4.7
-    \brief The Flipable item provides a surface that can be flipped.
-    \inherits Item
-
-    Flipable allows you to specify a front and a back and then flip between those sides.
-
-    Here's an example that flips between the front and back sides when clicked:
-
-    \qml
-
-    Flipable {
-        id: flipable
-        width: 250; height: 250
-        property int angle: 0
-
-        transform: Rotation {
-            id: rotation
-            origin.x: flipable.width/2; origin.y: flipable.height/2
-            axis.x: 0; axis.y: 1; axis.z: 0     // rotate around y-axis
-            angle: flipable.angle
-        }
-
-        front: Image { source: "front.png" }
-        back: Image { source: "back.png" }
-
-        states: State {
-            name: "back"
-            PropertyChanges { target: flipable; angle: 180 }
-        }
-
-        transitions: Transition {
-            NumberAnimation { properties: "angle"; duration: 2000 }
-        }
-
-        MouseArea {
-            // change between default and 'back' states
-            onClicked: flipable.state = (flipable.state == 'back' ? '' : 'back')
-            anchors.fill: parent
-        }
-    }
-    \endqml
-
-    \image flipable.gif
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsFlipable
-    \brief The QmlGraphicsFlipable class provides a flipable surface.
-
-    \ingroup group_widgets
-
-    QmlGraphicsFlipable allows you to specify a front and a back, as well as an
-    axis for the flip.
-*/
-
-QmlGraphicsFlipable::QmlGraphicsFlipable(QmlGraphicsItem *parent)
-: QmlGraphicsItem(*(new QmlGraphicsFlipablePrivate), parent)
-{
-}
-
-QmlGraphicsFlipable::~QmlGraphicsFlipable()
-{
-}
-
-/*!
-  \qmlproperty Item Flipable::front
-  \qmlproperty Item Flipable::back
-
-  The front and back sides of the flipable.
-*/
-
-QmlGraphicsItem *QmlGraphicsFlipable::front()
-{
-    Q_D(const QmlGraphicsFlipable);
-    return d->front;
-}
-
-void QmlGraphicsFlipable::setFront(QmlGraphicsItem *front)
-{
-    Q_D(QmlGraphicsFlipable);
-    if (d->front) {
-        qmlInfo(this) << tr("front is a write-once property");
-        return;
-    }
-    d->front = front;
-    d->front->setParentItem(this);
-    if (Back == d->current)
-        d->front->setOpacity(0.);
-}
-
-QmlGraphicsItem *QmlGraphicsFlipable::back()
-{
-    Q_D(const QmlGraphicsFlipable);
-    return d->back;
-}
-
-void QmlGraphicsFlipable::setBack(QmlGraphicsItem *back)
-{
-    Q_D(QmlGraphicsFlipable);
-    if (d->back) {
-        qmlInfo(this) << tr("back is a write-once property");
-        return;
-    }
-    d->back = back;
-    d->back->setParentItem(this);
-    if (Front == d->current)
-        d->back->setOpacity(0.);
-}
-
-/*!
-  \qmlproperty enumeration Flipable::side
-
-  The side of the Flippable currently visible. Possible values are \c
-  Front and \c Back.
-*/
-QmlGraphicsFlipable::Side QmlGraphicsFlipable::side() const
-{
-    Q_D(const QmlGraphicsFlipable);
-    if (d->dirtySceneTransform)
-        const_cast<QmlGraphicsFlipablePrivate *>(d)->updateSceneTransformFromParent();
-
-    return d->current;
-}
-
-// determination on the currently visible side of the flipable
-// has to be done on the complete scene transform to give
-// correct results.
-void QmlGraphicsFlipablePrivate::updateSceneTransformFromParent()
-{
-    Q_Q(QmlGraphicsFlipable);
-
-    QmlGraphicsItemPrivate::updateSceneTransformFromParent();
-    QPointF p1(0, 0);
-    QPointF p2(1, 0);
-    QPointF p3(1, 1);
-
-    p1 = sceneTransform.map(p1);
-    p2 = sceneTransform.map(p2);
-    p3 = sceneTransform.map(p3);
-
-    qreal cross = (p1.x() - p2.x()) * (p3.y() - p2.y()) -
-                  (p1.y() - p2.y()) * (p3.x() - p2.x());
-
-    QmlGraphicsFlipable::Side newSide;
-    if (cross > 0) {
-       newSide = QmlGraphicsFlipable::Back;
-    } else {
-        newSide = QmlGraphicsFlipable::Front;
-    }
-
-    if (newSide != current) {
-        current = newSide;
-        if (current == QmlGraphicsFlipable::Back) {
-            QTransform mat;
-            mat.translate(back->width()/2,back->height()/2);
-            if (back->width() && p1.x() >= p2.x())
-                mat.rotate(180, Qt::YAxis);
-            if (back->height() && p2.y() >= p3.y())
-                mat.rotate(180, Qt::XAxis);
-            mat.translate(-back->width()/2,-back->height()/2);
-            back->setTransform(mat);
-        }
-        if (front)
-            front->setOpacity((current==QmlGraphicsFlipable::Front)?1.:0.);
-        if (back)
-            back->setOpacity((current==QmlGraphicsFlipable::Back)?1.:0.);
-        emit q->sideChanged();
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
deleted file mode 100644
index 2b9e44e..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSFLIPABLE_H
-#define QMLGRAPHICSFLIPABLE_H
-
-#include "qmlgraphicsitem.h"
-
-#include <QtCore/QObject>
-#include <QtGui/QTransform>
-#include <QtGui/qvector3d.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsFlipablePrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsFlipable : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    Q_ENUMS(Side)
-    Q_PROPERTY(QmlGraphicsItem *front READ front WRITE setFront)
-    Q_PROPERTY(QmlGraphicsItem *back READ back WRITE setBack)
-    Q_PROPERTY(Side side READ side NOTIFY sideChanged)
-    //### flipAxis
-    //### flipRotation
-public:
-    QmlGraphicsFlipable(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsFlipable();
-
-    QmlGraphicsItem *front();
-    void setFront(QmlGraphicsItem *);
-
-    QmlGraphicsItem *back();
-    void setBack(QmlGraphicsItem *);
-
-    enum Side { Front, Back };
-    Side side() const;
-
-Q_SIGNALS:
-    void sideChanged();
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsFlipable)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsFlipable)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsFlipable)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSFLIPABLE_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
deleted file mode 100644
index 4d7af54..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsfocuspanel_p.h"
-
-#include <QtGui/qgraphicsscene.h>
-#include <QEvent>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-   \qmlclass FocusPanel QmlGraphicsFocusPanel
-    \since 4.7
-   \brief The FocusPanel item explicitly creates a focus panel.
-   \inherits Item
-
-    Focus panels assist in keyboard focus handling when building QML
-    applications.  All the details are covered in the 
-    \l {qmlfocus}{keyboard focus documentation}.
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsFocusPanel
-*/
-
-QmlGraphicsFocusPanel::QmlGraphicsFocusPanel(QmlGraphicsItem *parent) :
-    QmlGraphicsItem(parent)
-{
-    setFlag(ItemIsPanel);
-}
-
-QmlGraphicsFocusPanel::~QmlGraphicsFocusPanel()
-{
-}
-
-/*!
-    \qmlproperty bool FocusPanel::active
-
-    Sets whether the item is the active focus panel.
-*/
-
-bool QmlGraphicsFocusPanel::sceneEvent(QEvent *event)
-{
-    if (event->type() == QEvent::WindowActivate ||
-        event->type() == QEvent::WindowDeactivate)
-        emit activeChanged();
-    return QmlGraphicsItem::sceneEvent(event);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
deleted file mode 100644
index 935b04e..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSFOCUSPANEL_H
-#define QMLGRAPHICSFOCUSPANEL_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsFocusPanel : public QmlGraphicsItem
-{
-    Q_OBJECT
-    Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)
-public:
-    QmlGraphicsFocusPanel(QmlGraphicsItem *parent=0);
-    virtual ~QmlGraphicsFocusPanel();
-
-Q_SIGNALS:
-    void activeChanged();
-
-protected:
-    bool sceneEvent(QEvent *event);
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsFocusPanel)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsFocusPanel)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSFOCUSPANEL_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
deleted file mode 100644
index bba471a..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsfocusscope_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass FocusScope QmlGraphicsFocusScope
-    \since 4.7
-    \brief The FocusScope object explicitly creates a focus scope.
-    \inherits Item
-
-    Focus scopes assist in keyboard focus handling when building reusable QML
-    components.  All the details are covered in the
-    \l {qmlfocus}{keyboard focus documentation}.
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsFocusScope
-*/
-
-QmlGraphicsFocusScope::QmlGraphicsFocusScope(QmlGraphicsItem *parent) :
-    QmlGraphicsItem(parent)
-{
-    setFlag(QGraphicsItem::ItemIsFocusScope);
-}
-
-QmlGraphicsFocusScope::~QmlGraphicsFocusScope()
-{
-}
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
deleted file mode 100644
index ca53b01..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSFOCUSSCOPE_H
-#define QMLGRAPHICSFOCUSSCOPE_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-//### set component root as focusscope
-class Q_DECLARATIVE_EXPORT QmlGraphicsFocusScope : public QmlGraphicsItem
-{
-    Q_OBJECT
-public:
-    QmlGraphicsFocusScope(QmlGraphicsItem *parent=0);
-    virtual ~QmlGraphicsFocusScope();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsFocusScope)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSFOCUSSCOPE_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
deleted file mode 100644
index 692f7a9..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsgraphicsobjectcontainer_p.h"
-
-#include "qmlgraphicsitem_p.h"
-
-#include <QGraphicsObject>
-#include <QGraphicsWidget>
-#include <QGraphicsSceneResizeEvent>
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsGraphicsObjectContainerPrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsGraphicsObjectContainer)
-
-public:
-    QmlGraphicsGraphicsObjectContainerPrivate() : QmlGraphicsItemPrivate(), graphicsObject(0), syncedResize(false)
-    { }
-
-    void _q_updateSize();
-
-    void setFiltering(bool on)
-    {
-        Q_Q(QmlGraphicsGraphicsObjectContainer);
-        if (graphicsObject && graphicsObject->isWidget()) {
-            if (!on) {
-                graphicsObject->removeEventFilter(q);
-                QObject::disconnect(q, SIGNAL(widthChanged()), q, SLOT(_q_updateSize()));
-                QObject::disconnect(q, SIGNAL(heightChanged()), q, SLOT(_q_updateSize()));
-            } else {
-                graphicsObject->installEventFilter(q);
-                QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(_q_updateSize()));
-                QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(_q_updateSize()));
-            }
-        }
-    }
-
-
-    QGraphicsObject *graphicsObject;
-    bool syncedResize;
-};
-
-
-/*!
-    \qmlclass GraphicsObjectContainer QmlGraphicsGraphicsObjectContainer
-    \since 4.7
-    \brief The GraphicsObjectContainer element allows you to add QGraphicsObjects into Fluid UI elements.
-
-    While any QObject based class can be exposed to QML, QmlGraphicsItem
-    provides a lot of important functionality, including anchors and proper
-    management of child items. GraphicsObjectContainer helps provide these
-    functions to other QGraphicsObjects, so that they can be used unaltered in
-    a QML scene. QGraphicsObjects, which are not QmlGraphicsItems, and which are
-    placed in a QML scene outside of a GraphicsObjectContainer, will not appear
-    on screen at all.
-
-    A GraphicsObjectContainer can have one element inside it, and it must be a
-    QGraphicsObject or subclass which has been exposed to the QML engine.
-    The graphics object inside the GraphicsObjectContainer can then be used
-    like any other item in QML with the exception of not being reparentable
-    and not having the standard properties of QML items (such as anchors).
-
-    As the contained object is positioned relative to the container, anchors
-    affecting the container item will affect the onscreen position of the
-    contained item. If synchronizedResizing is set to true, then anchors
-    affecting the container item's size will also affect the contained item's
-    size.
-
-    Example:
-    \code
-    import Qt 4.6
-    import MyApp 2.1 as Widgets
-    Rectangle{
-        id: rect
-        property alias widgetPropertyThree: widget.myThirdProperty;
-        GraphicsObjectContainer{
-            synchronizedResizing: true
-            anchors.margins: 10
-            anchors.fill: parent
-            Widgets.MyWidget{
-                myProperty: "A Value"
-                myOtherProperty: rect.color
-            }
-        }
-    }
-    \endcode
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsGraphicsObjectContainer
-    \brief The QmlGraphicsGraphicsObjectContainer class allows you to add QGraphicsObjects into Fluid UI applications.
-*/
-
-QmlGraphicsGraphicsObjectContainer::QmlGraphicsGraphicsObjectContainer(QmlGraphicsItem *parent)
-: QmlGraphicsItem(*new QmlGraphicsGraphicsObjectContainerPrivate, parent)
-{
-}
-
-QmlGraphicsGraphicsObjectContainer::~QmlGraphicsGraphicsObjectContainer()
-{
-}
-
-QGraphicsObject *QmlGraphicsGraphicsObjectContainer::graphicsObject() const
-{
-    Q_D(const QmlGraphicsGraphicsObjectContainer);
-    return d->graphicsObject;
-}
-
-/*!
-    \qmlproperty QGraphicsObject GraphicsObjectContainer::graphicsObject
-    The QGraphicsObject associated with this element.
-*/
-void QmlGraphicsGraphicsObjectContainer::setGraphicsObject(QGraphicsObject *object)
-{
-    Q_D(QmlGraphicsGraphicsObjectContainer);
-    if (object == d->graphicsObject)
-        return;
-
-    //### remove previously set item?
-
-    d->setFiltering(false);
-
-    d->graphicsObject = object;
-
-    if (d->graphicsObject) {
-        d->graphicsObject->setParentItem(this);
-
-        if (d->syncedResize && d->graphicsObject->isWidget()) {
-            QGraphicsWidget *gw = static_cast<QGraphicsWidget*>(d->graphicsObject);
-            QSizeF gwSize = gw->size(); //### should we use sizeHint?
-            QSizeF newSize = gwSize;
-            if (heightValid())
-                newSize.setHeight(height());
-            if (widthValid())
-                newSize.setWidth(width());
-            if (gwSize != newSize)
-                gw->resize(newSize);
-
-            gwSize = gw->size();
-            setImplicitWidth(gwSize.width());
-            setImplicitHeight(gwSize.height());
-
-            d->setFiltering(true);
-        }
-    }
-}
-
-QVariant QmlGraphicsGraphicsObjectContainer::itemChange(GraphicsItemChange change, const QVariant &value)
-{
-    Q_D(QmlGraphicsGraphicsObjectContainer);
-    if (change == ItemSceneHasChanged) {
-        QGraphicsObject *o = d->graphicsObject;
-        d->graphicsObject = 0;
-        setGraphicsObject(o);
-    }
-    return QmlGraphicsItem::itemChange(change, value);
-}
-
-bool QmlGraphicsGraphicsObjectContainer::eventFilter(QObject *watched, QEvent *e)
-{
-    Q_D(QmlGraphicsGraphicsObjectContainer);
-    if (watched == d->graphicsObject && e->type() == QEvent::GraphicsSceneResize) {
-        if (d->graphicsObject && d->graphicsObject->isWidget() && d->syncedResize) {
-           QSizeF newSize = static_cast<QGraphicsWidget*>(d->graphicsObject)->size();
-           setImplicitWidth(newSize.width());
-           setImplicitHeight(newSize.height());
-       }
-    }
-    return QmlGraphicsItem::eventFilter(watched, e);
-}
-
-/*!
-    \qmlproperty bool GraphicsObjectContainer::synchronizedResizing
-
-    This property determines whether or not the container and graphics object will synchronize their
-    sizes.
-
-    \note This property only applies when wrapping a QGraphicsWidget.
-
-    If synchronizedResizing is enabled, the container and widget will
-    synchronize their sizes as follows.
-    \list
-    \o If a size has been set on the container, the widget will be resized to the container.
-    Any changes in the container's size will be reflected in the widget.
-
-    \o \e Otherwise, the container will initially be sized to the preferred size of the widget.
-    Any changes to the container's size will be reflected in the widget, and any changes to the
-    widget's size will be reflected in the container.
-    \endlist
-*/
-bool QmlGraphicsGraphicsObjectContainer::synchronizedResizing() const
-{
-    Q_D(const QmlGraphicsGraphicsObjectContainer);
-    return d->syncedResize;
-}
-
-void QmlGraphicsGraphicsObjectContainer::setSynchronizedResizing(bool on)
-{
-    Q_D(QmlGraphicsGraphicsObjectContainer);
-    if (on == d->syncedResize)
-        return;
-
-    d->syncedResize = on;
-    d->setFiltering(on);
-}
-
-void QmlGraphicsGraphicsObjectContainerPrivate::_q_updateSize()
-{
-    if (!graphicsObject || !graphicsObject->isWidget() || !syncedResize)
-        return;
-
-    QGraphicsWidget *gw = static_cast<QGraphicsWidget*>(graphicsObject);
-    const QSizeF newSize(width, height);
-    gw->resize(newSize);
-
-    //### will respecting the widgets min/max ever get us in trouble? (all other items always
-    //    size to exactly what you tell them)
-    /*QSizeF constrainedSize = newSize.expandedTo(gw->minimumSize()).boundedTo(gw->maximumSize());
-    gw->resize(constrainedSize);
-    if (constrainedSize != newSize) {
-        setImplicitWidth(constrainedSize.width());
-        setImplicitHeight(constrainedSize.height());
-    }*/
-}
-
-#include <moc_qmlgraphicsgraphicsobjectcontainer_p.cpp>
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
deleted file mode 100644
index e263aa0..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
-#define QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsObject;
-class QmlGraphicsGraphicsObjectContainerPrivate;
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsGraphicsObjectContainer : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    Q_CLASSINFO("DefaultProperty", "graphicsObject")
-    Q_PROPERTY(QGraphicsObject *graphicsObject READ graphicsObject WRITE setGraphicsObject)
-    Q_PROPERTY(bool synchronizedResizing READ synchronizedResizing WRITE setSynchronizedResizing)
-
-public:
-    QmlGraphicsGraphicsObjectContainer(QmlGraphicsItem *parent = 0);
-    ~QmlGraphicsGraphicsObjectContainer();
-
-    QGraphicsObject *graphicsObject() const;
-    void setGraphicsObject(QGraphicsObject *);
-
-    bool synchronizedResizing() const;
-    void setSynchronizedResizing(bool on);
-
-protected:
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
-    bool eventFilter(QObject *watched, QEvent *e);
-
-private:
-    Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsGraphicsObjectContainer)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QGraphicsObject)
-QML_DECLARE_TYPE(QmlGraphicsGraphicsObjectContainer)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
deleted file mode 100644
index ab87c03..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
+++ /dev/null
@@ -1,1723 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsgridview_p.h"
-
-#include "qmlgraphicsvisualitemmodel_p.h"
-#include "qmlgraphicsflickable_p_p.h"
-
-#include <qmleasefollow_p.h>
-
-#include <qlistmodelinterface_p.h>
-#include <QKeyEvent>
-
-QT_BEGIN_NAMESPACE
-
-QHash<QObject*, QmlGraphicsGridViewAttached*> QmlGraphicsGridViewAttached::attachedProperties;
-
-
-//----------------------------------------------------------------------------
-
-class FxGridItem
-{
-public:
-    FxGridItem(QmlGraphicsItem *i, QmlGraphicsGridView *v) : item(i), view(v) {
-        attached = QmlGraphicsGridViewAttached::properties(item);
-        attached->m_view = view;
-    }
-    ~FxGridItem() {}
-
-    qreal rowPos() const { return (view->flow() == QmlGraphicsGridView::LeftToRight ? item->y() : item->x()); }
-    qreal colPos() const { return (view->flow() == QmlGraphicsGridView::LeftToRight ? item->x() : item->y()); }
-    qreal endRowPos() const {
-        return view->flow() == QmlGraphicsGridView::LeftToRight
-                                ? item->y() + view->cellHeight() - 1
-                                : item->x() + view->cellWidth() - 1;
-    }
-    void setPosition(qreal col, qreal row) {
-        if (view->flow() == QmlGraphicsGridView::LeftToRight) {
-            item->setPos(QPointF(col, row));
-        } else {
-            item->setPos(QPointF(row, col));
-        }
-    }
-
-    QmlGraphicsItem *item;
-    QmlGraphicsGridView *view;
-    QmlGraphicsGridViewAttached *attached;
-    int index;
-};
-
-//----------------------------------------------------------------------------
-
-class QmlGraphicsGridViewPrivate : public QmlGraphicsFlickablePrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsGridView)
-
-public:
-    QmlGraphicsGridViewPrivate()
-    : currentItem(0), flow(QmlGraphicsGridView::LeftToRight)
-    , visiblePos(0), visibleIndex(0) , currentIndex(-1)
-    , cellWidth(100), cellHeight(100), columns(1), requestedIndex(-1)
-    , highlightComponent(0), highlight(0), trackedItem(0)
-    , moveReason(Other), buffer(0), highlightXAnimator(0), highlightYAnimator(0)
-    , bufferMode(NoBuffer)
-    , ownModel(false), wrap(false), autoHighlight(true)
-    , fixCurrentVisibility(false), lazyRelease(false), layoutScheduled(false)
-    , deferredRelease(false) {}
-
-    void init();
-    void clear();
-    FxGridItem *createItem(int modelIndex);
-    void releaseItem(FxGridItem *item);
-    void refill(qreal from, qreal to, bool doBuffer=false);
-
-    void updateGrid();
-    void scheduleLayout();
-    void layout(bool removed=false);
-    void updateUnrequestedIndexes();
-    void updateUnrequestedPositions();
-    void updateTrackedItem();
-    void createHighlight();
-    void updateHighlight();
-    void updateCurrent(int modelIndex);
-
-    FxGridItem *visibleItem(int modelIndex) const {
-        if (modelIndex >= visibleIndex && modelIndex < visibleIndex + visibleItems.count()) {
-            for (int i = modelIndex - visibleIndex; i < visibleItems.count(); ++i) {
-                FxGridItem *item = visibleItems.at(i);
-                if (item->index == modelIndex)
-                    return item;
-            }
-        }
-        return 0;
-    }
-
-    qreal position() const {
-        Q_Q(const QmlGraphicsGridView);
-        return flow == QmlGraphicsGridView::LeftToRight ? q->viewportY() : q->viewportX();
-    }
-    void setPosition(qreal pos) {
-        Q_Q(QmlGraphicsGridView);
-        if (flow == QmlGraphicsGridView::LeftToRight)
-            q->setViewportY(pos);
-        else
-            q->setViewportX(pos);
-    }
-    int size() const {
-        Q_Q(const QmlGraphicsGridView);
-        return flow == QmlGraphicsGridView::LeftToRight ? q->height() : q->width();
-    }
-    qreal startPosition() const {
-        qreal pos = 0;
-        if (!visibleItems.isEmpty())
-            pos = visibleItems.first()->rowPos() - visibleIndex / columns * rowSize();
-        return pos;
-    }
-
-    qreal endPosition() const {
-        qreal pos = 0;
-        if (model && model->count())
-            pos = rowPosAt(model->count() - 1) + rowSize();
-        return pos;
-    }
-
-    bool isValid() const {
-        return model && model->count() && model->isValid();
-    }
-
-    int rowSize() const {
-        return flow == QmlGraphicsGridView::LeftToRight ? cellHeight : cellWidth;
-    }
-    int colSize() const {
-        return flow == QmlGraphicsGridView::LeftToRight ? cellWidth : cellHeight;
-    }
-
-    qreal colPosAt(int modelIndex) const {
-        if (FxGridItem *item = visibleItem(modelIndex))
-            return item->colPos();
-        if (!visibleItems.isEmpty()) {
-            if (modelIndex < visibleIndex) {
-                int count = (visibleIndex - modelIndex) % columns;
-                int col = visibleItems.first()->colPos() / colSize();
-                col = (columns - count + col) % columns;
-                return col * colSize();
-            } else {
-                int count = columns - 1 - (modelIndex - visibleItems.last()->index - 1) % columns;
-                return visibleItems.last()->colPos() - count * colSize();
-            }
-        } else {
-            return (modelIndex % columns) * colSize();
-        }
-        return 0;
-    }
-    qreal rowPosAt(int modelIndex) const {
-        if (FxGridItem *item = visibleItem(modelIndex))
-            return item->rowPos();
-        if (!visibleItems.isEmpty()) {
-            if (modelIndex < visibleIndex) {
-                int firstCol = visibleItems.first()->colPos() / colSize();
-                int col = visibleIndex - modelIndex + (columns - firstCol - 1);
-                int rows = col / columns;
-                return visibleItems.first()->rowPos() - rows * rowSize();
-            } else {
-                int count = modelIndex - visibleItems.last()->index;
-                int col = visibleItems.last()->colPos() + count * colSize();
-                int rows = col / (columns * colSize());
-                return visibleItems.last()->rowPos() + rows * rowSize();
-            }
-        } else {
-             return (modelIndex / columns) * rowSize();
-        }
-        return 0;
-    }
-
-    FxGridItem *firstVisibleItem() const {
-        const qreal pos = position();
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxGridItem *item = visibleItems.at(i);
-            if (item->index != -1 && item->endRowPos() > pos)
-                return item;
-        }
-        return visibleItems.count() ? visibleItems.first() : 0;
-    }
-
-    // Map a model index to visibleItems list index.
-    // These may differ if removed items are still present in the visible list,
-    // e.g. doing a removal animation
-    int mapFromModel(int modelIndex) const {
-        if (modelIndex < visibleIndex || modelIndex >= visibleIndex + visibleItems.count())
-            return -1;
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxGridItem *listItem = visibleItems.at(i);
-            if (listItem->index == modelIndex)
-                return i + visibleIndex;
-            if (listItem->index > modelIndex)
-                return -1;
-        }
-        return -1; // Not in visibleList
-    }
-
-    // for debugging only
-    void checkVisible() const {
-        int skip = 0;
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxGridItem *listItem = visibleItems.at(i);
-            if (listItem->index == -1) {
-                ++skip;
-            } else if (listItem->index != visibleIndex + i - skip) {
-                for (int j = 0; j < visibleItems.count(); j++)
-                    qDebug() << " index" << j << "item index" << visibleItems.at(j)->index;
-                qFatal("index %d %d %d", visibleIndex, i, listItem->index);
-            }
-        }
-    }
-
-    QGuard<QmlGraphicsVisualModel> model;
-    QVariant modelVariant;
-    QList<FxGridItem*> visibleItems;
-    QHash<QmlGraphicsItem*,int> unrequestedItems;
-    FxGridItem *currentItem;
-    QmlGraphicsGridView::Flow flow;
-    int visiblePos;
-    int visibleIndex;
-    int currentIndex;
-    int cellWidth;
-    int cellHeight;
-    int columns;
-    int requestedIndex;
-    QmlComponent *highlightComponent;
-    FxGridItem *highlight;
-    FxGridItem *trackedItem;
-    enum MovementReason { Other, SetIndex, Mouse };
-    MovementReason moveReason;
-    int buffer;
-    QmlEaseFollow *highlightXAnimator;
-    QmlEaseFollow *highlightYAnimator;
-    enum BufferMode { NoBuffer = 0x00, BufferBefore = 0x01, BufferAfter = 0x02 };
-    BufferMode bufferMode;
-
-    bool ownModel : 1;
-    bool wrap : 1;
-    bool autoHighlight : 1;
-    bool fixCurrentVisibility : 1;
-    bool lazyRelease : 1;
-    bool layoutScheduled : 1;
-    bool deferredRelease : 1;
-};
-
-void QmlGraphicsGridViewPrivate::init()
-{
-    Q_Q(QmlGraphicsGridView);
-    q->setFlag(QGraphicsItem::ItemIsFocusScope);
-    QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(sizeChange()));
-    QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(sizeChange()));
-    q->setFlickDirection(QmlGraphicsFlickable::VerticalFlick);
-}
-
-void QmlGraphicsGridViewPrivate::clear()
-{
-    for (int i = 0; i < visibleItems.count(); ++i)
-        releaseItem(visibleItems.at(i));
-    visibleItems.clear();
-    visiblePos = 0;
-    visibleIndex = 0;
-    releaseItem(currentItem);
-    currentItem = 0;
-    createHighlight();
-    trackedItem = 0;
-}
-
-FxGridItem *QmlGraphicsGridViewPrivate::createItem(int modelIndex)
-{
-    Q_Q(QmlGraphicsGridView);
-    // create object
-    requestedIndex = modelIndex;
-    FxGridItem *listItem = 0;
-    if (QmlGraphicsItem *item = model->item(modelIndex, false)) {
-        listItem = new FxGridItem(item, q);
-        listItem->index = modelIndex;
-        // complete
-        model->completeItem();
-        listItem->item->setZValue(1);
-        listItem->item->setParent(q->viewport());
-        unrequestedItems.remove(listItem->item);
-    }
-    requestedIndex = 0;
-    return listItem;
-}
-
-
-void QmlGraphicsGridViewPrivate::releaseItem(FxGridItem *item)
-{
-    Q_Q(QmlGraphicsGridView);
-    if (!item || !model)
-        return;
-    if (trackedItem == item) {
-        QObject::disconnect(trackedItem->item, SIGNAL(yChanged()), q, SLOT(trackedPositionChanged()));
-        QObject::disconnect(trackedItem->item, SIGNAL(xChanged()), q, SLOT(trackedPositionChanged()));
-        trackedItem = 0;
-    }
-    if (model->release(item->item) == 0) {
-        // item was not destroyed, and we no longer reference it.
-        unrequestedItems.insert(item->item, model->indexOf(item->item, q));
-    }
-    delete item;
-}
-
-void QmlGraphicsGridViewPrivate::refill(qreal from, qreal to, bool doBuffer)
-{
-    Q_Q(QmlGraphicsGridView);
-    if (!isValid() || !q->isComponentComplete())
-        return;
-
-    qreal bufferFrom = from - buffer;
-    qreal bufferTo = to + buffer;
-    qreal fillFrom = from;
-    qreal fillTo = to;
-    if (doBuffer && (bufferMode & BufferAfter))
-        fillTo = bufferTo;
-    if (doBuffer && (bufferMode & BufferBefore))
-        fillFrom = bufferFrom;
-
-    bool changed = false;
-
-    int colPos = colPosAt(visibleIndex);
-    int rowPos = rowPosAt(visibleIndex);
-    int modelIndex = visibleIndex;
-    if (visibleItems.count()) {
-        rowPos = visibleItems.last()->rowPos();
-        colPos = visibleItems.last()->colPos() + colSize();
-        if (colPos > colSize() * (columns-1)) {
-            colPos = 0;
-            rowPos += rowSize();
-        }
-        int i = visibleItems.count() - 1;
-        while (i > 0 && visibleItems.at(i)->index == -1)
-            --i;
-        modelIndex = visibleItems.at(i)->index + 1;
-    }
-    int colNum = colPos / colSize();
-
-    FxGridItem *item = 0;
-
-    // Item creation and release is staggered in order to avoid
-    // creating/releasing multiple items in one frame
-    // while flicking (as much as possible).
-    while (modelIndex < model->count() && rowPos <= fillTo + rowSize()*(columns - colNum)/(columns+1)) {
-//        qDebug() << "refill: append item" << modelIndex;
-        if (!(item = createItem(modelIndex)))
-            break;
-        item->setPosition(colPos, rowPos);
-        visibleItems.append(item);
-        colPos += colSize();
-        colNum++;
-        if (colPos > colSize() * (columns-1)) {
-            colPos = 0;
-            colNum = 0;
-            rowPos += rowSize();
-        }
-        ++modelIndex;
-        changed = true;
-        if (doBuffer) // never buffer more than one item per frame
-            break;
-    }
-
-    if (visibleItems.count()) {
-        rowPos = visibleItems.first()->rowPos();
-        colPos = visibleItems.first()->colPos() - colSize();
-        if (colPos < 0) {
-            colPos = colSize() * (columns - 1);
-            rowPos -= rowSize();
-        }
-    }
-    colNum = colPos / colSize();
-    while (visibleIndex > 0 && rowPos + rowSize() - 1 >= fillFrom - rowSize()*(colNum+1)/(columns+1)){
-//        qDebug() << "refill: prepend item" << visibleIndex-1 << "top pos" << rowPos << colPos;
-        if (!(item = createItem(visibleIndex-1)))
-            break;
-        --visibleIndex;
-        item->setPosition(colPos, rowPos);
-        visibleItems.prepend(item);
-        colPos -= colSize();
-        colNum--;
-        if (colPos < 0) {
-            colPos = colSize() * (columns - 1);
-            colNum = columns-1;
-            rowPos -= rowSize();
-        }
-        changed = true;
-        if (doBuffer) // never buffer more than one item per frame
-            break;
-    }
-
-    if (!lazyRelease || !changed || deferredRelease) { // avoid destroying items in the same frame that we create
-        while (visibleItems.count() > 1
-               && (item = visibleItems.first())
-                    && item->endRowPos() < bufferFrom - rowSize()*(item->colPos()/colSize()+1)/(columns+1)) {
-            if (item->attached->delayRemove())
-                break;
-//            qDebug() << "refill: remove first" << visibleIndex << "top end pos" << item->endRowPos();
-            if (item->index != -1)
-                visibleIndex++;
-            visibleItems.removeFirst();
-            releaseItem(item);
-            changed = true;
-        }
-        while (visibleItems.count() > 1
-               && (item = visibleItems.last())
-                    && item->rowPos() > bufferTo + rowSize()*(columns - item->colPos()/colSize())/(columns+1)) {
-            if (item->attached->delayRemove())
-                break;
-//            qDebug() << "refill: remove last" << visibleIndex+visibleItems.count()-1;
-            visibleItems.removeLast();
-            releaseItem(item);
-            changed = true;
-        }
-        deferredRelease = false;
-    } else {
-        deferredRelease = true;
-    }
-    if (changed) {
-        if (flow == QmlGraphicsGridView::LeftToRight)
-            q->setViewportHeight(endPosition() - startPosition());
-        else
-            q->setViewportWidth(endPosition() - startPosition());
-    } else if (!doBuffer && buffer && bufferMode != NoBuffer) {
-        refill(from, to, true);
-    }
-    lazyRelease = false;
-}
-
-void QmlGraphicsGridViewPrivate::updateGrid()
-{
-    Q_Q(QmlGraphicsGridView);
-    columns = (int)qMax((flow == QmlGraphicsGridView::LeftToRight ? q->width() : q->height()) / colSize(), qreal(1.));
-    if (isValid()) {
-        if (flow == QmlGraphicsGridView::LeftToRight)
-            q->setViewportHeight(endPosition() - startPosition());
-        else
-            q->setViewportWidth(endPosition() - startPosition());
-    }
-}
-
-void QmlGraphicsGridViewPrivate::scheduleLayout()
-{
-    Q_Q(QmlGraphicsGridView);
-    if (!layoutScheduled) {
-        layoutScheduled = true;
-        QMetaObject::invokeMethod(q, "layout", Qt::QueuedConnection);
-    }
-}
-
-void QmlGraphicsGridViewPrivate::layout(bool removed)
-{
-    Q_Q(QmlGraphicsGridView);
-    layoutScheduled = false;
-    if (visibleItems.count()) {
-        qreal rowPos = visibleItems.first()->rowPos();
-        qreal colPos = visibleItems.first()->colPos();
-        int col = visibleIndex % columns;
-        if (colPos != col * colSize()) {
-            if (removed)
-                rowPos -= rowSize();
-            colPos = col * colSize();
-            visibleItems.first()->setPosition(colPos, rowPos);
-        }
-        for (int i = 1; i < visibleItems.count(); ++i) {
-            FxGridItem *item = visibleItems.at(i);
-            colPos += colSize();
-            if (colPos > colSize() * (columns-1)) {
-                colPos = 0;
-                rowPos += rowSize();
-            }
-            item->setPosition(colPos, rowPos);
-        }
-    }
-    q->refill();
-    updateHighlight();
-    moveReason = Other;
-    if (flow == QmlGraphicsGridView::LeftToRight) {
-        q->setViewportHeight(endPosition() - startPosition());
-        fixupY();
-    } else {
-        q->setViewportWidth(endPosition() - startPosition());
-        fixupX();
-    }
-    updateUnrequestedPositions();
-}
-
-void QmlGraphicsGridViewPrivate::updateUnrequestedIndexes()
-{
-    Q_Q(QmlGraphicsGridView);
-    QHash<QmlGraphicsItem*,int>::iterator it;
-    for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
-        *it = model->indexOf(it.key(), q);
-}
-
-void QmlGraphicsGridViewPrivate::updateUnrequestedPositions()
-{
-    QHash<QmlGraphicsItem*,int>::const_iterator it;
-    for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it) {
-        if (flow == QmlGraphicsGridView::LeftToRight) {
-            it.key()->setPos(QPointF(colPosAt(*it), rowPosAt(*it)));
-        } else {
-            it.key()->setPos(QPointF(rowPosAt(*it), colPosAt(*it)));
-        }
-    }
-}
-
-void QmlGraphicsGridViewPrivate::updateTrackedItem()
-{
-    Q_Q(QmlGraphicsGridView);
-    FxGridItem *item = currentItem;
-    if (highlight)
-        item = highlight;
-
-    FxGridItem *oldTracked = trackedItem;
-
-    if (trackedItem && item != trackedItem) {
-        QObject::disconnect(trackedItem->item, SIGNAL(yChanged()), q, SLOT(trackedPositionChanged()));
-        QObject::disconnect(trackedItem->item, SIGNAL(xChanged()), q, SLOT(trackedPositionChanged()));
-        trackedItem = 0;
-    }
-
-    if (!trackedItem && item) {
-        trackedItem = item;
-        QObject::connect(trackedItem->item, SIGNAL(yChanged()), q, SLOT(trackedPositionChanged()));
-        QObject::connect(trackedItem->item, SIGNAL(xChanged()), q, SLOT(trackedPositionChanged()));
-    }
-    if (trackedItem && trackedItem != oldTracked)
-        q->trackedPositionChanged();
-}
-
-void QmlGraphicsGridViewPrivate::createHighlight()
-{
-    Q_Q(QmlGraphicsGridView);
-    bool changed = false;
-    if (highlight) {
-        if (trackedItem == highlight)
-            trackedItem = 0;
-        delete highlight->item;
-        delete highlight;
-        highlight = 0;
-        delete highlightXAnimator;
-        delete highlightYAnimator;
-        highlightXAnimator = 0;
-        highlightYAnimator = 0;
-        changed = true;
-    }
-
-    if (currentItem) {
-        QmlGraphicsItem *item = 0;
-        if (highlightComponent) {
-            QmlContext *highlightContext = new QmlContext(qmlContext(q));
-            QObject *nobj = highlightComponent->create(highlightContext);
-            if (nobj) {
-                highlightContext->setParent(nobj);
-                item = qobject_cast<QmlGraphicsItem *>(nobj);
-                if (!item)
-                    delete nobj;
-            } else {
-                delete highlightContext;
-            }
-        } else {
-            item = new QmlGraphicsItem;
-            item->setParent(q->viewport());
-        }
-        if (item) {
-            item->setParent(q->viewport());
-            highlight = new FxGridItem(item, q);
-            highlightXAnimator = new QmlEaseFollow(q);
-            highlightXAnimator->setTarget(QmlMetaProperty(highlight->item, QLatin1String("x")));
-            highlightXAnimator->setDuration(150);
-            highlightXAnimator->setEnabled(autoHighlight);
-            highlightYAnimator = new QmlEaseFollow(q);
-            highlightYAnimator->setTarget(QmlMetaProperty(highlight->item, QLatin1String("y")));
-            highlightYAnimator->setDuration(150);
-            highlightYAnimator->setEnabled(autoHighlight);
-            changed = true;
-        }
-    }
-    if (changed)
-        emit q->highlightChanged();
-}
-
-void QmlGraphicsGridViewPrivate::updateHighlight()
-{
-    if ((!currentItem && highlight) || (currentItem && !highlight))
-        createHighlight();
-    if (currentItem && autoHighlight && highlight && !moving) {
-        // auto-update highlight
-        highlightXAnimator->setSourceValue(currentItem->item->x());
-        highlightYAnimator->setSourceValue(currentItem->item->y());
-        highlight->item->setWidth(currentItem->item->width());
-        highlight->item->setHeight(currentItem->item->height());
-    }
-    updateTrackedItem();
-}
-
-void QmlGraphicsGridViewPrivate::updateCurrent(int modelIndex)
-{
-    Q_Q(QmlGraphicsGridView);
-    if (!q->isComponentComplete() || !isValid() || modelIndex < 0 || modelIndex >= model->count()) {
-        if (currentItem) {
-            currentItem->attached->setIsCurrentItem(false);
-            releaseItem(currentItem);
-            currentItem = 0;
-            currentIndex = -1;
-            updateHighlight();
-            emit q->currentIndexChanged();
-        }
-        return;
-    }
-
-    if (currentItem && currentIndex == modelIndex) {
-        updateHighlight();
-        return;
-    }
-
-    FxGridItem *oldCurrentItem = currentItem;
-    currentIndex = modelIndex;
-    currentItem = createItem(modelIndex);
-    fixCurrentVisibility = true;
-    if (oldCurrentItem && (!currentItem || oldCurrentItem->item != currentItem->item))
-        oldCurrentItem->attached->setIsCurrentItem(false);
-    if (currentItem) {
-        currentItem->setPosition(colPosAt(modelIndex), rowPosAt(modelIndex));
-        currentItem->item->setFocus(true);
-        currentItem->attached->setIsCurrentItem(true);
-    }
-    updateHighlight();
-    emit q->currentIndexChanged();
-    releaseItem(oldCurrentItem);
-}
-
-//----------------------------------------------------------------------------
-
-/*!
-    \qmlclass GridView QmlGraphicsGridView
-    \inherits Flickable
-    \brief The GridView item provides a grid view of items provided by a model.
-
-    The model is typically provided by a QAbstractListModel "C++ model object",
-    but can also be created directly in QML.
-
-    The items are laid out top to bottom (vertically) or left to right (horizontally)
-    and may be flicked to scroll.
-
-    The below example creates a very simple grid, using a QML model.
-
-    \image gridview.png
-
-    \snippet doc/src/snippets/declarative/gridview/gridview.qml 3
-
-    The model is defined as a ListModel using QML:
-    \quotefile doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml
-
-    In this case ListModel is a handy way for us to test our UI.  In practice
-    the model would be implemented in C++, or perhaps via a SQL data source.
-*/
-QmlGraphicsGridView::QmlGraphicsGridView(QmlGraphicsItem *parent)
-    : QmlGraphicsFlickable(*(new QmlGraphicsGridViewPrivate), parent)
-{
-    Q_D(QmlGraphicsGridView);
-    d->init();
-}
-
-QmlGraphicsGridView::~QmlGraphicsGridView()
-{
-    Q_D(QmlGraphicsGridView);
-    d->clear();
-    if (d->ownModel)
-        delete d->model;
-}
-
-/*!
-    \qmlattachedproperty bool GridView::isCurrentItem
-    This attched property is true if this delegate is the current item; otherwise false.
-
-    It is attached to each instance of the delegate.
-*/
-
-/*!
-    \qmlattachedproperty GridView GridView::view
-    This attached property holds the view that manages this delegate instance.
-
-    It is attached to each instance of the delegate.
-*/
-
-/*!
-    \qmlattachedproperty bool GridView::delayRemove
-    This attached property holds whether the delegate may be destroyed.
-
-    It is attached to each instance of the delegate.
-
-    It is sometimes necessary to delay the destruction of an item
-    until an animation completes.
-
-    The example below ensures that the animation completes before
-    the item is removed from the grid.
-
-    \code
-    Component {
-        id: myDelegate
-        Item {
-            id: wrapper
-            GridView.onRemove: SequentialAnimation {
-                PropertyAction { target: wrapper.GridView; property: "delayRemove"; value: true }
-                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing: "easeInOutQuad" }
-                PropertyAction { target: wrapper.GridView; property: "delayRemove"; value: false }
-            }
-        }
-    }
-    \endcode
-*/
-
-/*!
-    \qmlattachedsignal GridView::onAdd()
-    This attached handler is called immediately after an item is added to the view.
-*/
-
-/*!
-    \qmlattachedsignal GridView::onRemove()
-    This attached handler is called immediately before an item is removed from the view.
-*/
-
-
-/*!
-  \qmlproperty model GridView::model
-  This property holds the model providing data for the grid.
-
-  The model provides a set of data that is used to create the items
-  for the view.  For large or dynamic datasets the model is usually
-  provided by a C++ model object.  The C++ model object must be a \l
-  {QAbstractItemModel} subclass, a VisualModel, or a simple list.
-
-  \sa {qmlmodels}{Data Models}
-*/
-QVariant QmlGraphicsGridView::model() const
-{
-    Q_D(const QmlGraphicsGridView);
-    return d->modelVariant;
-}
-
-void QmlGraphicsGridView::setModel(const QVariant &model)
-{
-    Q_D(QmlGraphicsGridView);
-    if (d->model) {
-        disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
-        disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
-        disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
-        disconnect(d->model, SIGNAL(createdItem(int, QmlGraphicsItem*)), this, SLOT(createdItem(int,QmlGraphicsItem*)));
-        disconnect(d->model, SIGNAL(destroyingItem(QmlGraphicsItem*)), this, SLOT(destroyingItem(QmlGraphicsItem*)));
-    }
-    d->clear();
-    d->modelVariant = model;
-    QObject *object = qvariant_cast<QObject*>(model);
-    QmlGraphicsVisualModel *vim = 0;
-    if (object && (vim = qobject_cast<QmlGraphicsVisualModel *>(object))) {
-        if (d->ownModel) {
-            delete d->model;
-            d->ownModel = false;
-        }
-        d->model = vim;
-    } else {
-        if (!d->ownModel) {
-            d->model = new QmlGraphicsVisualDataModel(qmlContext(this));
-            d->ownModel = true;
-        }
-        if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model))
-            dataModel->setModel(model);
-    }
-    if (d->model) {
-        if (isComponentComplete()) {
-            refill();
-            if (d->currentIndex >= d->model->count() || d->currentIndex < 0) {
-                setCurrentIndex(0);
-            } else {
-                d->moveReason = QmlGraphicsGridViewPrivate::SetIndex;
-                d->updateCurrent(d->currentIndex);
-            }
-        }
-        connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
-        connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
-        connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
-        connect(d->model, SIGNAL(createdItem(int, QmlGraphicsItem*)), this, SLOT(createdItem(int,QmlGraphicsItem*)));
-        connect(d->model, SIGNAL(destroyingItem(QmlGraphicsItem*)), this, SLOT(destroyingItem(QmlGraphicsItem*)));
-        emit countChanged();
-    }
-}
-
-/*!
-    \qmlproperty component GridView::delegate
-
-    The delegate provides a template defining each item instantiated by the view.
-    The index is exposed as an accessible \c index property.  Properties of the
-    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
-
-    Note that the GridView will layout the items based on the size of the root item
-    in the delegate.
-
-    Here is an example delegate:
-    \snippet doc/src/snippets/declarative/gridview/gridview.qml 0
-*/
-QmlComponent *QmlGraphicsGridView::delegate() const
-{
-    Q_D(const QmlGraphicsGridView);
-    if (d->model) {
-        if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model))
-            return dataModel->delegate();
-    }
-
-    return 0;
-}
-
-void QmlGraphicsGridView::setDelegate(QmlComponent *delegate)
-{
-    Q_D(QmlGraphicsGridView);
-    if (delegate == this->delegate())
-        return;
-
-    if (!d->ownModel) {
-        d->model = new QmlGraphicsVisualDataModel(qmlContext(this));
-        d->ownModel = true;
-    }
-    if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model)) {
-        dataModel->setDelegate(delegate);
-        if (isComponentComplete()) {
-            refill();
-            d->moveReason = QmlGraphicsGridViewPrivate::SetIndex;
-            d->updateCurrent(d->currentIndex);
-        }
-    }
-}
-
-/*!
-  \qmlproperty int GridView::currentIndex
-  \qmlproperty Item GridView::currentItem
-
-  \c currentIndex holds the index of the current item.
-  \c currentItem is the current item.  Note that the position of the current item
-  may only be approximate until it becomes visible in the view.
-*/
-int QmlGraphicsGridView::currentIndex() const
-{
-    Q_D(const QmlGraphicsGridView);
-    return d->currentIndex;
-}
-
-void QmlGraphicsGridView::setCurrentIndex(int index)
-{
-    Q_D(QmlGraphicsGridView);
-    if (isComponentComplete() && d->isValid() && index != d->currentIndex && index < d->model->count() && index >= 0) {
-        d->moveReason = QmlGraphicsGridViewPrivate::SetIndex;
-        cancelFlick();
-        d->updateCurrent(index);
-    } else {
-        d->currentIndex = index;
-    }
-}
-
-QmlGraphicsItem *QmlGraphicsGridView::currentItem()
-{
-    Q_D(QmlGraphicsGridView);
-    if (!d->currentItem)
-        return 0;
-    return d->currentItem->item;
-}
-
-/*!
-  \qmlproperty Item GridView::highlightItem
-
-  \c highlightItem holds the highlight item, which was created
-  from the \l highlight component.
-
-  The highlightItem is managed by the view unless
-  \l highlightFollowsCurrentItem is set to false.
-
-  \sa highlight, highlightFollowsCurrentItem
-*/
-QmlGraphicsItem *QmlGraphicsGridView::highlightItem()
-{
-    Q_D(QmlGraphicsGridView);
-    if (!d->highlight)
-        return 0;
-    return d->highlight->item;
-}
-
-/*!
-  \qmlproperty int GridView::count
-  This property holds the number of items in the view.
-*/
-int QmlGraphicsGridView::count() const
-{
-    Q_D(const QmlGraphicsGridView);
-    if (d->model)
-        return d->model->count();
-    return 0;
-}
-
-/*!
-  \qmlproperty component GridView::highlight
-  This property holds the component to use as the highlight.
-
-  An instance of the highlight component will be created for each view.
-  The geometry of the resultant component instance will be managed by the view
-  so as to stay with the current item, unless the highlightFollowsCurrentItem property is false.
-
-  The below example demonstrates how to make a simple highlight:
-  \snippet doc/src/snippets/declarative/gridview/gridview.qml 1
-
-  \sa highlightItem, highlightFollowsCurrentItem
-*/
-QmlComponent *QmlGraphicsGridView::highlight() const
-{
-    Q_D(const QmlGraphicsGridView);
-    return d->highlightComponent;
-}
-
-void QmlGraphicsGridView::setHighlight(QmlComponent *highlight)
-{
-    Q_D(QmlGraphicsGridView);
-    if (highlight != d->highlightComponent) {
-        d->highlightComponent = highlight;
-        d->updateCurrent(d->currentIndex);
-    }
-}
-
-/*!
-  \qmlproperty bool GridView::highlightFollowsCurrentItem
-  This property sets whether the highlight is managed by the view.
-
-  If highlightFollowsCurrentItem is true, the highlight will be moved smoothly
-  to follow the current item.  If highlightFollowsCurrentItem is false, the
-  highlight will not be moved by the view, and must be implemented
-  by the highlight component, for example:
-
-  \code
-  Component {
-      id: myHighlight
-      Rectangle {
-          id: wrapper; color: "lightsteelblue"; radius: 4; width: 320; height: 60
-          y: SpringFollow { source: Wrapper.GridView.view.currentItem.y; spring: 3; damping: 0.2 }
-          x: SpringFollow { source: Wrapper.GridView.view.currentItem.x; spring: 3; damping: 0.2 }
-      }
-  }
-  \endcode
-*/
-bool QmlGraphicsGridView::highlightFollowsCurrentItem() const
-{
-    Q_D(const QmlGraphicsGridView);
-    return d->autoHighlight;
-}
-
-void QmlGraphicsGridView::setHighlightFollowsCurrentItem(bool autoHighlight)
-{
-    Q_D(QmlGraphicsGridView);
-    if (d->autoHighlight != autoHighlight) {
-        d->autoHighlight = autoHighlight;
-        if (d->highlightXAnimator) {
-            d->highlightXAnimator->setEnabled(d->autoHighlight);
-            d->highlightYAnimator->setEnabled(d->autoHighlight);
-        }
-        d->updateHighlight();
-    }
-}
-
-/*!
-  \qmlproperty enumeration GridView::flow
-  This property holds the flow of the grid.
-
-  Possible values are \c LeftToRight (default) and \c TopToBottom.
-
-  If \a flow is \c LeftToRight, the view will scroll vertically.
-  If \a flow is \c TopToBottom, the view will scroll horizontally.
-*/
-QmlGraphicsGridView::Flow QmlGraphicsGridView::flow() const
-{
-    Q_D(const QmlGraphicsGridView);
-    return d->flow;
-}
-
-void QmlGraphicsGridView::setFlow(Flow flow)
-{
-    Q_D(QmlGraphicsGridView);
-    if (d->flow != flow) {
-        d->flow = flow;
-        if (d->flow == LeftToRight) {
-            setViewportWidth(-1);
-            setFlickDirection(QmlGraphicsFlickable::VerticalFlick);
-        } else {
-            setViewportHeight(-1);
-            setFlickDirection(QmlGraphicsFlickable::HorizontalFlick);
-        }
-        d->clear();
-        d->updateGrid();
-        refill();
-        d->updateCurrent(d->currentIndex);
-    }
-}
-
-/*!
-  \qmlproperty bool GridView::keyNavigationWraps
-  This property holds whether the grid wraps key navigation
-
-  If this property is true then key presses to move off of one end of the grid will cause the
-  selection to jump to the other side.
-*/
-bool QmlGraphicsGridView::isWrapEnabled() const
-{
-    Q_D(const QmlGraphicsGridView);
-    return d->wrap;
-}
-
-void QmlGraphicsGridView::setWrapEnabled(bool wrap)
-{
-    Q_D(QmlGraphicsGridView);
-    d->wrap = wrap;
-}
-
-/*!
-  \qmlproperty int GridView::cacheBuffer
-  This property holds the number of off-screen pixels to cache.
-
-  This property determines the number of pixels above the top of the view
-  and below the bottom of the view to cache.  Setting this value can make
-  scrolling the view smoother at the expense of additional memory usage.
-*/
-int QmlGraphicsGridView::cacheBuffer() const
-{
-    Q_D(const QmlGraphicsGridView);
-    return d->buffer;
-}
-
-void QmlGraphicsGridView::setCacheBuffer(int buffer)
-{
-    Q_D(QmlGraphicsGridView);
-    if (d->buffer != buffer) {
-        d->buffer = buffer;
-        if (isComponentComplete())
-            refill();
-    }
-}
-
-/*!
-  \qmlproperty int GridView::cellWidth
-  \qmlproperty int GridView::cellHeight
-
-  These properties holds the width and height of each cell in the grid
-
-  The default cell size is 100x100.
-*/
-int QmlGraphicsGridView::cellWidth() const
-{
-    Q_D(const QmlGraphicsGridView);
-    return d->cellWidth;
-}
-
-void QmlGraphicsGridView::setCellWidth(int cellWidth)
-{
-    Q_D(QmlGraphicsGridView);
-    if (cellWidth != d->cellWidth && cellWidth > 0) {
-        d->cellWidth = qMax(1, cellWidth);
-        d->updateGrid();
-        emit cellWidthChanged();
-        d->layout();
-    }
-}
-
-int QmlGraphicsGridView::cellHeight() const
-{
-    Q_D(const QmlGraphicsGridView);
-    return d->cellHeight;
-}
-
-void QmlGraphicsGridView::setCellHeight(int cellHeight)
-{
-    Q_D(QmlGraphicsGridView);
-    if (cellHeight != d->cellHeight && cellHeight > 0) {
-        d->cellHeight = qMax(1, cellHeight);
-        d->updateGrid();
-        emit cellHeightChanged();
-        d->layout();
-    }
-}
-
-void QmlGraphicsGridView::sizeChange()
-{
-    Q_D(QmlGraphicsGridView);
-    if (isComponentComplete()) {
-        d->updateGrid();
-        d->layout();
-    }
-}
-
-void QmlGraphicsGridView::viewportMoved()
-{
-    Q_D(QmlGraphicsGridView);
-    QmlGraphicsFlickable::viewportMoved();
-    d->lazyRelease = true;
-    if (d->flicked) {
-        if (yflick()) {
-            if (d->velocityY > 0)
-                d->bufferMode = QmlGraphicsGridViewPrivate::BufferBefore;
-            else if (d->velocityY < 0)
-                d->bufferMode = QmlGraphicsGridViewPrivate::BufferAfter;
-        }
-
-        if (xflick()) {
-            if (d->velocityX > 0)
-                d->bufferMode = QmlGraphicsGridViewPrivate::BufferBefore;
-            else if (d->velocityX < 0)
-                d->bufferMode = QmlGraphicsGridViewPrivate::BufferAfter;
-        }
-    }
-    refill();
-}
-
-qreal QmlGraphicsGridView::minYExtent() const
-{
-    Q_D(const QmlGraphicsGridView);
-    if (d->flow == QmlGraphicsGridView::TopToBottom)
-        return QmlGraphicsFlickable::minYExtent();
-    return -d->startPosition();
-}
-
-qreal QmlGraphicsGridView::maxYExtent() const
-{
-    Q_D(const QmlGraphicsGridView);
-    if (d->flow == QmlGraphicsGridView::TopToBottom)
-        return QmlGraphicsFlickable::maxYExtent();
-    qreal extent = -(d->endPosition() - height());
-    const qreal minY = minYExtent();
-    if (extent > minY)
-        extent = minY;
-    return extent;
-}
-
-qreal QmlGraphicsGridView::minXExtent() const
-{
-    Q_D(const QmlGraphicsGridView);
-    if (d->flow == QmlGraphicsGridView::LeftToRight)
-        return QmlGraphicsFlickable::minXExtent();
-    return -d->startPosition();
-}
-
-qreal QmlGraphicsGridView::maxXExtent() const
-{
-    Q_D(const QmlGraphicsGridView);
-    if (d->flow == QmlGraphicsGridView::LeftToRight)
-        return QmlGraphicsFlickable::maxXExtent();
-    qreal extent = -(d->endPosition() - width());
-    const qreal minX = minXExtent();
-    if (extent > minX)
-        extent = minX;
-    return extent;
-}
-
-void QmlGraphicsGridView::keyPressEvent(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsGridView);
-    QmlGraphicsFlickable::keyPressEvent(event);
-    if (event->isAccepted())
-        return;
-    if (d->model && d->model->count() && d->interactive) {
-        d->moveReason = QmlGraphicsGridViewPrivate::SetIndex;
-        int oldCurrent = currentIndex();
-        switch (event->key()) {
-        case Qt::Key_Up:
-            moveCurrentIndexUp();
-            break;
-        case Qt::Key_Down:
-            moveCurrentIndexDown();
-            break;
-        case Qt::Key_Left:
-            moveCurrentIndexLeft();
-            break;
-        case Qt::Key_Right:
-            moveCurrentIndexRight();
-            break;
-        default:
-            break;
-        }
-        if (oldCurrent != currentIndex()) {
-            event->accept();
-            return;
-        }
-    }
-    d->moveReason = QmlGraphicsGridViewPrivate::Other;
-    event->ignore();
-}
-
-/*!
-    \qmlmethod GridView::moveCurrentIndexUp()
-
-    Move the currentIndex up one item in the view.
-    The current index will wrap if keyNavigationWraps is true and it
-    is currently at the end.
-*/
-void QmlGraphicsGridView::moveCurrentIndexUp()
-{
-    Q_D(QmlGraphicsGridView);
-    if (d->flow == QmlGraphicsGridView::LeftToRight) {
-        if (currentIndex() >= d->columns || d->wrap) {
-            int index = currentIndex() - d->columns;
-            setCurrentIndex(index >= 0 ? index : d->model->count()-1);
-        }
-    } else {
-        if (currentIndex() > 0 || d->wrap) {
-            int index = currentIndex() - 1;
-            setCurrentIndex(index >= 0 ? index : d->model->count()-1);
-        }
-    }
-}
-
-/*!
-    \qmlmethod GridView::moveCurrentIndexDown()
-
-    Move the currentIndex down one item in the view.
-    The current index will wrap if keyNavigationWraps is true and it
-    is currently at the end.
-*/
-void QmlGraphicsGridView::moveCurrentIndexDown()
-{
-    Q_D(QmlGraphicsGridView);
-    if (d->flow == QmlGraphicsGridView::LeftToRight) {
-        if (currentIndex() < d->model->count() - d->columns || d->wrap) {
-            int index = currentIndex()+d->columns;
-            setCurrentIndex(index < d->model->count() ? index : 0);
-        }
-    } else {
-        if (currentIndex() < d->model->count() - 1 || d->wrap) {
-            int index = currentIndex() + 1;
-            setCurrentIndex(index < d->model->count() ? index : 0);
-        }
-    }
-}
-
-/*!
-    \qmlmethod GridView::moveCurrentIndexLeft()
-
-    Move the currentIndex left one item in the view.
-    The current index will wrap if keyNavigationWraps is true and it
-    is currently at the end.
-*/
-void QmlGraphicsGridView::moveCurrentIndexLeft()
-{
-    Q_D(QmlGraphicsGridView);
-    if (d->flow == QmlGraphicsGridView::LeftToRight) {
-        if (currentIndex() > 0 || d->wrap) {
-            int index = currentIndex() - 1;
-            setCurrentIndex(index >= 0 ? index : d->model->count()-1);
-        }
-    } else {
-        if (currentIndex() >= d->columns || d->wrap) {
-            int index = currentIndex() - d->columns;
-            setCurrentIndex(index >= 0 ? index : d->model->count()-1);
-        }
-    }
-}
-
-/*!
-    \qmlmethod GridView::moveCurrentIndexRight()
-
-    Move the currentIndex right one item in the view.
-    The current index will wrap if keyNavigationWraps is true and it
-    is currently at the end.
-*/
-void QmlGraphicsGridView::moveCurrentIndexRight()
-{
-    Q_D(QmlGraphicsGridView);
-    if (d->flow == QmlGraphicsGridView::LeftToRight) {
-        if (currentIndex() < d->model->count() - 1 || d->wrap) {
-            int index = currentIndex() + 1;
-            setCurrentIndex(index < d->model->count() ? index : 0);
-        }
-    } else {
-        if (currentIndex() < d->model->count() - d->columns || d->wrap) {
-            int index = currentIndex()+d->columns;
-            setCurrentIndex(index < d->model->count() ? index : 0);
-        }
-    }
-}
-
-void QmlGraphicsGridView::positionViewAtIndex(int index)
-{
-    Q_D(QmlGraphicsGridView);
-    if (!d->isValid() || index < 0 || index >= d->model->count())
-        return;
-
-    qreal maxExtent = d->flow == QmlGraphicsGridView::LeftToRight ? -maxYExtent() : -maxXExtent();
-    FxGridItem *item = d->visibleItem(index);
-    if (item) {
-        // Already created - just move to top of view
-        int pos = qMin(item->rowPos(), maxExtent);
-        d->setPosition(pos);
-    } else {
-        int pos = d->rowPosAt(index);
-        // save the currently visible items in case any of them end up visible again
-        QList<FxGridItem*> oldVisible = d->visibleItems;
-        d->visibleItems.clear();
-        d->visibleIndex = index - index % d->columns;
-        d->setPosition(pos);
-        // setPosition() will cause refill.  Adjust if we have moved beyond range
-        if (d->position() > maxExtent)
-            d->setPosition(maxExtent);
-        // now release the reference to all the old visible items.
-        for (int i = 0; i < oldVisible.count(); ++i)
-            d->releaseItem(oldVisible.at(i));
-    }
-}
-
-
-void QmlGraphicsGridView::componentComplete()
-{
-    Q_D(QmlGraphicsGridView);
-    QmlGraphicsFlickable::componentComplete();
-    d->updateGrid();
-    refill();
-    if (d->currentIndex < 0)
-        d->updateCurrent(0);
-    else
-        d->updateCurrent(d->currentIndex);
-}
-
-void QmlGraphicsGridView::trackedPositionChanged()
-{
-    Q_D(QmlGraphicsGridView);
-    if (!d->trackedItem || !d->currentItem)
-        return;
-    if (!isFlicking() && !d->moving && d->moveReason == QmlGraphicsGridViewPrivate::SetIndex) {
-        const qreal viewPos = d->position();
-        if (d->trackedItem->rowPos() < viewPos && d->currentItem->rowPos() < viewPos) {
-            d->setPosition(d->currentItem->rowPos() < d->trackedItem->rowPos() ? d->trackedItem->rowPos() : d->currentItem->rowPos());
-        } else if (d->trackedItem->endRowPos() > viewPos + d->size()
-                && d->currentItem->endRowPos() > viewPos + d->size()) {
-            qreal pos;
-            if (d->trackedItem->endRowPos() < d->currentItem->endRowPos()) {
-                pos = d->trackedItem->endRowPos() - d->size();
-                if (d->rowSize() > d->size())
-                    pos = d->trackedItem->rowPos();
-            } else {
-                pos = d->currentItem->endRowPos() - d->size();
-                if (d->rowSize() > d->size())
-                    pos = d->currentItem->rowPos();
-            }
-            d->setPosition(pos);
-        }
-    }
-}
-
-void QmlGraphicsGridView::itemsInserted(int modelIndex, int count)
-{
-    Q_D(QmlGraphicsGridView);
-    if (!d->visibleItems.count() || d->model->count() <= 1) {
-        refill();
-        d->updateCurrent(qMax(0, qMin(d->currentIndex, d->model->count()-1)));
-        emit countChanged();
-        return;
-    }
-
-    int index = d->mapFromModel(modelIndex);
-    if (index == -1) {
-        int i = d->visibleItems.count() - 1;
-        while (i > 0 && d->visibleItems.at(i)->index == -1)
-            --i;
-        if (d->visibleItems.at(i)->index + 1 == modelIndex) {
-            // Special case of appending an item to the model.
-            index = d->visibleIndex + d->visibleItems.count();
-        } else {
-            if (modelIndex <= d->visibleIndex) {
-                // Insert before visible items
-                d->visibleIndex += count;
-                for (int i = 0; i < d->visibleItems.count(); ++i) {
-                    FxGridItem *listItem = d->visibleItems.at(i);
-                    if (listItem->index != -1 && listItem->index >= modelIndex)
-                        listItem->index += count;
-                }
-            }
-            if (d->currentIndex >= modelIndex) {
-                // adjust current item index
-                d->currentIndex += count;
-                if (d->currentItem)
-                    d->currentItem->index = d->currentIndex;
-            }
-            d->layout();
-            emit countChanged();
-            return;
-        }
-    }
-
-    // At least some of the added items will be visible
-    int insertCount = count;
-    if (index < d->visibleIndex) {
-        insertCount -= d->visibleIndex - index;
-        index = d->visibleIndex;
-        modelIndex = d->visibleIndex;
-    }
-
-    index -= d->visibleIndex;
-    int to = d->buffer+d->position()+d->size()-1;
-    int colPos, rowPos;
-    if (index < d->visibleItems.count()) {
-        colPos = d->visibleItems.at(index)->colPos();
-        rowPos = d->visibleItems.at(index)->rowPos();
-    } else {
-        // appending items to visible list
-        colPos = d->visibleItems.at(index-1)->colPos() + d->colSize();
-        rowPos = d->visibleItems.at(index-1)->rowPos();
-        if (colPos > d->colSize() * (d->columns-1)) {
-            colPos = 0;
-            rowPos += d->rowSize();
-        }
-    }
-
-    QList<FxGridItem*> added;
-    int i = 0;
-    while (i < insertCount && rowPos <= to + d->rowSize()*(d->columns - (colPos/d->colSize()))/qreal(d->columns)) {
-        FxGridItem *item = d->createItem(modelIndex + i);
-        d->visibleItems.insert(index, item);
-        item->setPosition(colPos, rowPos);
-        added.append(item);
-        colPos += d->colSize();
-        if (colPos > d->colSize() * (d->columns-1)) {
-            colPos = 0;
-            rowPos += d->rowSize();
-        }
-        ++index;
-        ++i;
-    }
-    if (i < insertCount) {
-        // We didn't insert all our new items, which means anything
-        // beyond the current index is not visible - remove it.
-        while (d->visibleItems.count() > index) {
-            d->releaseItem(d->visibleItems.takeLast());
-        }
-    }
-
-    if (d->currentIndex >= modelIndex) {
-        // adjust current item index
-        d->currentIndex += count;
-        if (d->currentItem) {
-            d->currentItem->index = d->currentIndex;
-            d->currentItem->setPosition(d->colPosAt(d->currentIndex), d->rowPosAt(d->currentIndex));
-        }
-    }
-    // Update the indexes of the following visible items.
-    for (; index < d->visibleItems.count(); ++index) {
-        FxGridItem *listItem = d->visibleItems.at(index);
-        if (listItem->index != -1)
-            listItem->index += count;
-    }
-
-    // everything is in order now - emit add() signal
-    for (int j = 0; j < added.count(); ++j)
-        added.at(j)->attached->emitAdd();
-    d->layout();
-    emit countChanged();
-}
-
-void QmlGraphicsGridView::itemsRemoved(int modelIndex, int count)
-{
-    Q_D(QmlGraphicsGridView);
-    bool currentRemoved = d->currentIndex >= modelIndex && d->currentIndex < modelIndex + count;
-    bool removedVisible = false;
-
-    // Remove the items from the visible list, skipping anything already marked for removal
-    QList<FxGridItem*>::Iterator it = d->visibleItems.begin();
-    while (it != d->visibleItems.end()) {
-        FxGridItem *item = *it;
-        if (item->index == -1 || item->index < modelIndex) {
-            // already removed, or before removed items
-            if (item->index < modelIndex)
-                removedVisible = true;
-            ++it;
-        } else if (item->index >= modelIndex + count) {
-            // after removed items
-            item->index -= count;
-            ++it;
-        } else {
-            // removed item
-            removedVisible = true;
-            item->attached->emitRemove();
-            if (item->attached->delayRemove()) {
-                item->index = -1;
-                connect(item->attached, SIGNAL(delayRemoveChanged()), this, SLOT(destroyRemoved()), Qt::QueuedConnection);
-                ++it;
-            } else {
-                it = d->visibleItems.erase(it);
-                d->releaseItem(item);
-            }
-        }
-    }
-
-    // fix current
-    if (d->currentIndex >= modelIndex + count) {
-        d->currentIndex -= count;
-        if (d->currentItem)
-            d->currentItem->index -= count;
-    } else if (currentRemoved) {
-        // current item has been removed.
-        d->releaseItem(d->currentItem);
-        d->currentItem = 0;
-        d->currentIndex = -1;
-        d->updateCurrent(qMin(modelIndex, d->model->count()-1));
-    }
-
-    // update visibleIndex
-    for (it = d->visibleItems.begin(); it != d->visibleItems.end(); ++it) {
-        if ((*it)->index != -1) {
-            d->visibleIndex = (*it)->index;
-            break;
-        }
-    }
-
-    if (removedVisible) {
-        if (d->visibleItems.isEmpty()) {
-            d->visibleIndex = 0;
-            d->setPosition(0);
-            refill();
-        } else {
-            // Correct the positioning of the items
-            d->scheduleLayout();
-        }
-    }
-
-    emit countChanged();
-}
-
-void QmlGraphicsGridView::layout()
-{
-    Q_D(QmlGraphicsGridView);
-    if (d->layoutScheduled)
-        d->layout();
-}
-
-void QmlGraphicsGridView::destroyRemoved()
-{
-    Q_D(QmlGraphicsGridView);
-    for (QList<FxGridItem*>::Iterator it = d->visibleItems.begin();
-            it != d->visibleItems.end();) {
-        FxGridItem *listItem = *it;
-        if (listItem->index == -1 && listItem->attached->delayRemove() == false) {
-            d->releaseItem(listItem);
-            it = d->visibleItems.erase(it);
-        } else {
-            ++it;
-        }
-    }
-
-    // Correct the positioning of the items
-    d->layout();
-}
-
-void QmlGraphicsGridView::itemsMoved(int from, int to, int count)
-{
-    Q_D(QmlGraphicsGridView);
-    QHash<int,FxGridItem*> moved;
-
-    bool removedBeforeVisible = false;
-    FxGridItem *firstItem = d->firstVisibleItem();
-
-    if (from < to && from < d->visibleIndex && to > d->visibleIndex)
-        removedBeforeVisible = true;
-
-    QList<FxGridItem*>::Iterator it = d->visibleItems.begin();
-    while (it != d->visibleItems.end()) {
-        FxGridItem *item = *it;
-        if (item->index >= from && item->index < from + count) {
-            // take the items that are moving
-            item->index += (to-from);
-            moved.insert(item->index, item);
-            it = d->visibleItems.erase(it);
-            if (item->rowPos() < firstItem->rowPos())
-                removedBeforeVisible = true;
-        } else {
-            if (item->index > from && item->index != -1) {
-                // move everything after the moved items.
-                item->index -= count;
-                if (item->index < d->visibleIndex)
-                    d->visibleIndex = item->index;
-            } else if (item->index != -1) {
-                removedBeforeVisible = true;
-            }
-            ++it;
-        }
-    }
-
-    int remaining = count;
-    int endIndex = d->visibleIndex;
-    it = d->visibleItems.begin();
-    while (it != d->visibleItems.end()) {
-        FxGridItem *item = *it;
-        if (remaining && item->index >= to && item->index < to + count) {
-            // place items in the target position, reusing any existing items
-            FxGridItem *movedItem = moved.take(item->index);
-            if (!movedItem)
-                movedItem = d->createItem(item->index);
-            it = d->visibleItems.insert(it, movedItem);
-            ++it;
-            --remaining;
-        } else {
-            if (item->index != -1) {
-                if (item->index >= to) {
-                    // update everything after the moved items.
-                    item->index += count;
-                }
-                endIndex = item->index;
-            }
-            ++it;
-        }
-    }
-
-    // If we have moved items to the end of the visible items
-    // then add any existing moved items that we have
-    while (FxGridItem *item = moved.take(endIndex+1)) {
-        d->visibleItems.append(item);
-        ++endIndex;
-    }
-
-    // update visibleIndex
-    for (it = d->visibleItems.begin(); it != d->visibleItems.end(); ++it) {
-        if ((*it)->index != -1) {
-            d->visibleIndex = (*it)->index;
-            break;
-        }
-    }
-
-    // Fix current index
-    if (d->currentIndex >= 0 && d->currentItem) {
-        int oldCurrent = d->currentIndex;
-        d->currentIndex = d->model->indexOf(d->currentItem->item, this);
-        if (oldCurrent != d->currentIndex) {
-            d->currentItem->index = d->currentIndex;
-            emit currentIndexChanged();
-        }
-    }
-
-    // Whatever moved items remain are no longer visible items.
-    while (moved.count()) {
-        int idx = moved.begin().key();
-        FxGridItem *item = moved.take(idx);
-        if (item->item == d->currentItem->item)
-            item->setPosition(d->colPosAt(idx), d->rowPosAt(idx));
-        d->releaseItem(item);
-    }
-
-    d->layout(removedBeforeVisible);
-}
-
-void QmlGraphicsGridView::createdItem(int index, QmlGraphicsItem *item)
-{
-    Q_D(QmlGraphicsGridView);
-    item->setParentItem(this);
-    if (d->requestedIndex != index) {
-        item->setParentItem(this);
-        d->unrequestedItems.insert(item, index);
-        if (d->flow == QmlGraphicsGridView::LeftToRight) {
-            item->setPos(QPointF(d->colPosAt(index), d->rowPosAt(index)));
-        } else {
-            item->setPos(QPointF(d->rowPosAt(index), d->colPosAt(index)));
-        }
-    }
-}
-
-void QmlGraphicsGridView::destroyingItem(QmlGraphicsItem *item)
-{
-    Q_D(QmlGraphicsGridView);
-    d->unrequestedItems.remove(item);
-}
-
-
-void QmlGraphicsGridView::refill()
-{
-    Q_D(QmlGraphicsGridView);
-    d->refill(d->position(), d->position()+d->size()-1);
-}
-
-
-QmlGraphicsGridViewAttached *QmlGraphicsGridView::qmlAttachedProperties(QObject *obj)
-{
-    return QmlGraphicsGridViewAttached::properties(obj);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h
deleted file mode 100644
index bd18daf..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSGRIDVIEW_H
-#define QMLGRAPHICSGRIDVIEW_H
-
-#include "qmlgraphicsflickable_p.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-class QmlGraphicsVisualModel;
-class QmlGraphicsGridViewAttached;
-class QmlGraphicsGridViewPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsGridView : public QmlGraphicsFlickable
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsGridView)
-
-    Q_PROPERTY(QVariant model READ model WRITE setModel)
-    Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate)
-    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
-    Q_PROPERTY(QmlGraphicsItem *currentItem READ currentItem NOTIFY currentIndexChanged)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-
-    Q_PROPERTY(QmlComponent *highlight READ highlight WRITE setHighlight)
-    Q_PROPERTY(QmlGraphicsItem *highlightItem READ highlightItem NOTIFY highlightChanged)
-    Q_PROPERTY(bool highlightFollowsCurrentItem READ highlightFollowsCurrentItem WRITE setHighlightFollowsCurrentItem)
-
-    Q_PROPERTY(Flow flow READ flow WRITE setFlow)
-    Q_PROPERTY(bool keyNavigationWraps READ isWrapEnabled WRITE setWrapEnabled)
-    Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer)
-    Q_PROPERTY(int cellWidth READ cellWidth WRITE setCellWidth NOTIFY cellWidthChanged)
-    Q_PROPERTY(int cellHeight READ cellHeight WRITE setCellHeight NOTIFY cellHeightChanged)
-    Q_CLASSINFO("DefaultProperty", "data")
-
-public:
-    QmlGraphicsGridView(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsGridView();
-
-    QVariant model() const;
-    void setModel(const QVariant &);
-
-    QmlComponent *delegate() const;
-    void setDelegate(QmlComponent *);
-
-    int currentIndex() const;
-    void setCurrentIndex(int idx);
-
-    QmlGraphicsItem *currentItem();
-    QmlGraphicsItem *highlightItem();
-    int count() const;
-
-    QmlComponent *highlight() const;
-    void setHighlight(QmlComponent *highlight);
-
-    bool highlightFollowsCurrentItem() const;
-    void setHighlightFollowsCurrentItem(bool);
-
-    Q_ENUMS(Flow)
-    enum Flow { LeftToRight, TopToBottom };
-    Flow flow() const;
-    void setFlow(Flow);
-
-    bool isWrapEnabled() const;
-    void setWrapEnabled(bool);
-
-    int cacheBuffer() const;
-    void setCacheBuffer(int);
-
-    int cellWidth() const;
-    void setCellWidth(int);
-
-    int cellHeight() const;
-    void setCellHeight(int);
-
-    static QmlGraphicsGridViewAttached *qmlAttachedProperties(QObject *);
-
-public Q_SLOTS:
-    void moveCurrentIndexUp();
-    void moveCurrentIndexDown();
-    void moveCurrentIndexLeft();
-    void moveCurrentIndexRight();
-    void positionViewAtIndex(int index);
-
-Q_SIGNALS:
-    void countChanged();
-    void currentIndexChanged();
-    void cellWidthChanged();
-    void cellHeightChanged();
-    void highlightChanged();
-
-protected:
-    virtual void viewportMoved();
-    virtual qreal minYExtent() const;
-    virtual qreal maxYExtent() const;
-    virtual qreal minXExtent() const;
-    virtual qreal maxXExtent() const;
-    virtual void keyPressEvent(QKeyEvent *);
-    virtual void componentComplete();
-
-private Q_SLOTS:
-    void trackedPositionChanged();
-    void itemsInserted(int index, int count);
-    void itemsRemoved(int index, int count);
-    void itemsMoved(int from, int to, int count);
-    void destroyRemoved();
-    void createdItem(int index, QmlGraphicsItem *item);
-    void destroyingItem(QmlGraphicsItem *item);
-    void sizeChange();
-    void layout();
-
-private:
-    void refill();
-};
-
-class QmlGraphicsGridViewAttached : public QObject
-{
-    Q_OBJECT
-public:
-    QmlGraphicsGridViewAttached(QObject *parent)
-        : QObject(parent), m_isCurrent(false), m_delayRemove(false) {}
-    ~QmlGraphicsGridViewAttached() {
-        attachedProperties.remove(parent());
-    }
-
-    Q_PROPERTY(QmlGraphicsGridView *view READ view CONSTANT)
-    QmlGraphicsGridView *view() { return m_view; }
-
-    Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged)
-    bool isCurrentItem() const { return m_isCurrent; }
-    void setIsCurrentItem(bool c) {
-        if (m_isCurrent != c) {
-            m_isCurrent = c;
-            emit currentItemChanged();
-        }
-    }
-
-    Q_PROPERTY(bool delayRemove READ delayRemove WRITE setDelayRemove NOTIFY delayRemoveChanged)
-    bool delayRemove() const { return m_delayRemove; }
-    void setDelayRemove(bool delay) {
-        if (m_delayRemove != delay) {
-            m_delayRemove = delay;
-            emit delayRemoveChanged();
-        }
-    }
-
-    static QmlGraphicsGridViewAttached *properties(QObject *obj) {
-        QmlGraphicsGridViewAttached *rv = attachedProperties.value(obj);
-        if (!rv) {
-            rv = new QmlGraphicsGridViewAttached(obj);
-            attachedProperties.insert(obj, rv);
-        }
-        return rv;
-    }
-
-    void emitAdd() { emit add(); }
-    void emitRemove() { emit remove(); }
-
-Q_SIGNALS:
-    void currentItemChanged();
-    void delayRemoveChanged();
-    void add();
-    void remove();
-
-public:
-    QmlGraphicsGridView *m_view;
-    bool m_isCurrent;
-    bool m_delayRemove;
-
-    static QHash<QObject*, QmlGraphicsGridViewAttached*> attachedProperties;
-};
-
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsGridView)
-QML_DECLARE_TYPEINFO(QmlGraphicsGridView, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage.cpp b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
deleted file mode 100644
index 6e93c52..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsimage.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsimage_p.h"
-#include "qmlgraphicsimage_p_p.h"
-
-#include <QKeyEvent>
-#include <QPainter>
-
-QT_BEGIN_NAMESPACE
-
-
-/*!
-    \qmlclass Image QmlGraphicsImage
-    \since 4.7
-    \brief The Image element allows you to add bitmaps to a scene.
-    \inherits Item
-
-    The Image element supports untransformed, stretched and tiled.
-
-    For an explanation of stretching and tiling, see the fillMode property description.
-
-    Examples:
-    \table
-    \row
-    \o \image declarative-qtlogo1.png
-    \o Untransformed
-    \qml
-    Image { source: "pics/qtlogo.png" }
-    \endqml
-    \row
-    \o \image declarative-qtlogo2.png
-    \o fillMode: Stretch (default)
-    \qml
-    Image {
-        width: 160
-        height: 160
-        source: "pics/qtlogo.png"
-    }
-    \endqml
-    \row
-    \o \image declarative-qtlogo3.png
-    \o fillMode: Tile
-    \qml
-    Image {
-        fillMode: Image.Tile
-        width: 160; height: 160
-        source: "pics/qtlogo.png"
-    }
-    \endqml
-    \row
-    \o \image declarative-qtlogo6.png
-    \o fillMode: TileVertically
-    \qml
-    Image {
-        fillMode: Image.TileVertically
-        width: 160; height: 160
-        source: "pics/qtlogo.png"
-    }
-    \endqml
-    \row
-    \o \image declarative-qtlogo5.png
-    \o fillMode: TileHorizontally
-    \qml
-    Image {
-        fillMode: Image.TileHorizontally
-        width: 160; height: 160
-        source: "pics/qtlogo.png"
-    }
-    \endqml
-    \endtable
- */
-
-/*!
-    \internal
-    \class QmlGraphicsImage Image
-    \brief The QmlGraphicsImage class provides an image item that you can add to a QmlView.
-
-    \ingroup group_coreitems
-
-    Example:
-    \qml
-    Image { source: "pics/star.png" }
-    \endqml
-
-    A QmlGraphicsImage object can be instantiated in Qml using the tag \l Image.
-*/
-
-QmlGraphicsImage::QmlGraphicsImage(QmlGraphicsItem *parent)
-    : QmlGraphicsImageBase(*(new QmlGraphicsImagePrivate), parent)
-{
-    connect(this, SIGNAL(sourceChanged(QUrl)), this, SLOT(updatePaintedGeometry()));
-}
-
-QmlGraphicsImage::QmlGraphicsImage(QmlGraphicsImagePrivate &dd, QmlGraphicsItem *parent)
-    : QmlGraphicsImageBase(dd, parent)
-{
-}
-
-QmlGraphicsImage::~QmlGraphicsImage()
-{
-}
-
-void QmlGraphicsImage::setSource(const QUrl &url)
-{
-    QmlGraphicsImageBase::setSource(url);
-    updatePaintedGeometry();
-}
-
-/*!
-    \qmlproperty QPixmap Image::pixmap
-
-    This property holds the QPixmap image to display.
-
-    This is useful for displaying images provided by a C++ implementation,
-    for example, a model may provide a data role of type QPixmap.
-*/
-
-QPixmap QmlGraphicsImage::pixmap() const
-{
-    Q_D(const QmlGraphicsImage);
-    return d->pix;
-}
-
-void QmlGraphicsImage::setPixmap(const QPixmap &pix)
-{
-    Q_D(QmlGraphicsImage);
-    if (!d->url.isEmpty())
-        return;
-    d->setPixmap(pix);
-}
-
-void QmlGraphicsImagePrivate::setPixmap(const QPixmap &pixmap)
-{
-    Q_Q(QmlGraphicsImage);
-    pix = pixmap;
-
-    q->setImplicitWidth(pix.width());
-    q->setImplicitHeight(pix.height());
-    status = pix.isNull() ? QmlGraphicsImageBase::Null : QmlGraphicsImageBase::Ready;
-
-    q->update();
-    emit q->pixmapChanged();
-}
-
-/*!
-    \qmlproperty enumeration Image::fillMode
-
-    Set this property to define what happens when the image set for the item is smaller
-    than the size of the item.
-
-    \list
-    \o Stretch - the image is scaled to fit
-    \o PreserveAspectFit - the image is scaled uniformly to fit without cropping
-    \o PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary
-    \o Tile - the image is duplicated horizontally and vertically
-    \o TileVertically - the image is stretched horizontally and tiled vertically
-    \o TileHorizontally - the image is stretched vertically and tiled horizontally
-    \endlist
-
-    \image declarative-image_fillMode.gif
-*/
-QmlGraphicsImage::FillMode QmlGraphicsImage::fillMode() const
-{
-    Q_D(const QmlGraphicsImage);
-    return d->fillMode;
-}
-
-void QmlGraphicsImage::setFillMode(FillMode mode)
-{
-    Q_D(QmlGraphicsImage);
-    if (d->fillMode == mode)
-        return;
-    d->fillMode = mode;
-    update();
-    updatePaintedGeometry();
-    emit fillModeChanged();
-}
-
-qreal QmlGraphicsImage::paintedWidth() const
-{
-    Q_D(const QmlGraphicsImage);
-    return d->paintedWidth;
-}
-
-qreal QmlGraphicsImage::paintedHeight() const
-{
-    Q_D(const QmlGraphicsImage);
-    return d->paintedHeight;
-}
-
-/*!
-    \qmlproperty enum Image::status
-
-    This property holds the status of image loading.  It can be one of:
-    \list
-    \o Null - no image has been set
-    \o Ready - the image has been loaded
-    \o Loading - the image is currently being loaded
-    \o Error - an error occurred while loading the image
-    \endlist
-
-    \sa progress
-*/
-
-/*!
-    \qmlproperty real Image::progress
-
-    This property holds the progress of image loading, from 0.0 (nothing loaded)
-    to 1.0 (finished).
-
-    \sa status
-*/
-
-/*!
-    \qmlproperty bool Image::smooth
-
-    Set this property if you want the image to be smoothly filtered when scaled or
-    transformed.  Smooth filtering gives better visual quality, but is slower.  If
-    the image is displayed at its natural size, this property has no visual or
-    performance effect.
-
-    \note Generally scaling artifacts are only visible if the image is stationary on
-    the screen.  A common pattern when animating an image is to disable smooth
-    filtering at the beginning of the animation and reenable it at the conclusion.
-*/
-
-void QmlGraphicsImage::updatePaintedGeometry()
-{
-    Q_D(QmlGraphicsImage);
-
-    if (d->fillMode == PreserveAspectFit) {
-        qreal widthScale = width() / qreal(d->pix.width());
-        qreal heightScale = height() / qreal(d->pix.height());
-        if (!d->pix.width() || !d->pix.height())
-            return;
-        if (widthScale <= heightScale) {
-            d->paintedWidth = width();
-            d->paintedHeight = widthScale * qreal(d->pix.height());
-        } else if(heightScale < widthScale) {
-            d->paintedWidth = heightScale * qreal(d->pix.width());
-            d->paintedHeight = height();
-        }
-    } else {
-        d->paintedWidth = width();
-        d->paintedHeight = height();
-    }
-    emit paintedGeometryChanged();
-}
-
-void QmlGraphicsImage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
-{
-    QmlGraphicsImageBase::geometryChanged(newGeometry, oldGeometry);
-    updatePaintedGeometry();
-}
-
-/*!
-    \qmlproperty url Image::source
-
-    Image can handle any image format supported by Qt, loaded from any URL scheme supported by Qt.
-
-    The URL may be absolute, or relative to the URL of the component.
-*/
-
-void QmlGraphicsImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    Q_D(QmlGraphicsImage);
-    if (d->pix.isNull())
-        return;
-
-    bool oldAA = p->testRenderHint(QPainter::Antialiasing);
-    bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
-    if (d->smooth)
-        p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
-
-    if (width() != d->pix.width() || height() != d->pix.height()) {
-        if (d->fillMode >= Tile) {
-            if (d->fillMode == Tile)
-                p->drawTiledPixmap(QRectF(0,0,width(),height()), d->pix);
-            else if (d->fillMode == TileVertically)
-                p->drawTiledPixmap(QRectF(0,0,d->pix.width(),height()), d->pix);
-            else
-                p->drawTiledPixmap(QRectF(0,0,width(),d->pix.height()), d->pix);
-        } else {
-            qreal widthScale = width() / qreal(d->pix.width());
-            qreal heightScale = height() / qreal(d->pix.height());
-
-            QTransform scale;
-
-            if (d->fillMode == PreserveAspectFit) {
-                if (widthScale <= heightScale) {
-                    heightScale = widthScale;
-                    scale.translate(0, (height() - heightScale * d->pix.height()) / 2);
-                } else if(heightScale < widthScale) {
-                    widthScale = heightScale;
-                    scale.translate((width() - widthScale * d->pix.width()) / 2, 0);
-                }
-            } else if (d->fillMode == PreserveAspectCrop) {
-                if (widthScale < heightScale) {
-                    widthScale = heightScale;
-                    scale.translate((width() - widthScale * d->pix.width()) / 2, 0);
-                } else if(heightScale < widthScale) {
-                    heightScale = widthScale;
-                    scale.translate(0, (height() - heightScale * d->pix.height()) / 2);
-                }
-            }
-            if (clip()) {
-                p->save();
-                p->setClipRect(boundingRect(), Qt::IntersectClip);
-            }
-            scale.scale(widthScale, heightScale);
-            QTransform old = p->transform();
-            p->setWorldTransform(scale * old);
-            p->drawPixmap(0, 0, d->pix);
-            p->setWorldTransform(old);
-            if (clip()) {
-                p->restore();
-            }
-        }
-    } else {
-        p->drawPixmap(0, 0, d->pix);
-    }
-
-    if (d->smooth) {
-        p->setRenderHint(QPainter::Antialiasing, oldAA);
-        p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p.h
deleted file mode 100644
index b8befeb..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsimage_p.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSIMAGE_H
-#define QMLGRAPHICSIMAGE_H
-
-#include "qmlgraphicsimagebase_p.h"
-
-#include <QtNetwork/qnetworkreply.h>
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsImagePrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsImage : public QmlGraphicsImageBase
-{
-    Q_OBJECT
-    Q_ENUMS(FillMode)
-
-    Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap NOTIFY pixmapChanged DESIGNABLE false)
-    Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
-    Q_PROPERTY(qreal paintedWidth READ paintedWidth NOTIFY paintedGeometryChanged)
-    Q_PROPERTY(qreal paintedHeight READ paintedHeight NOTIFY paintedGeometryChanged)
-
-public:
-    QmlGraphicsImage(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsImage();
-
-    enum FillMode { Stretch, PreserveAspectFit, PreserveAspectCrop, Tile, TileVertically, TileHorizontally };
-    FillMode fillMode() const;
-    void setFillMode(FillMode);
-
-    QPixmap pixmap() const;
-    void setPixmap(const QPixmap &);
-
-    qreal paintedWidth() const;
-    qreal paintedHeight() const;
-
-    void setSource(const QUrl &url);
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-
-Q_SIGNALS:
-    void fillModeChanged();
-    void paintedGeometryChanged();
-
-protected:
-    QmlGraphicsImage(QmlGraphicsImagePrivate &dd, QmlGraphicsItem *parent);
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
-
-protected Q_SLOTS:
-    void updatePaintedGeometry();
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsImage)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsImage)
-};
-
-QT_END_NAMESPACE
-QML_DECLARE_TYPE(QmlGraphicsImage)
-QT_END_HEADER
-
-#endif // QMLGRAPHICSIMAGE_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
deleted file mode 100644
index e404935..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSIMAGE_P_H
-#define QMLGRAPHICSIMAGE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsitem_p.h"
-#include "qmlgraphicsimagebase_p_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsImagePrivate : public QmlGraphicsImageBasePrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsImage)
-
-public:
-    QmlGraphicsImagePrivate()
-      : fillMode(QmlGraphicsImage::Stretch), paintedWidth(0), paintedHeight(0)
-    {
-    }
-
-    QmlGraphicsImage::FillMode fillMode;
-    qreal paintedWidth;
-    qreal paintedHeight;
-    void setPixmap(const QPixmap &pix);
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLGRAPHICSIMAGE_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
deleted file mode 100644
index c09b661..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsimagebase_p.h"
-#include "qmlgraphicsimagebase_p_p.h"
-
-#include <qmlengine.h>
-#include <qmlpixmapcache_p.h>
-
-#include <QFile>
-
-QT_BEGIN_NAMESPACE
-
-QmlGraphicsImageBase::QmlGraphicsImageBase(QmlGraphicsImageBasePrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsItem(dd, parent)
-{
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
-}
-
-QmlGraphicsImageBase::~QmlGraphicsImageBase()
-{
-    Q_D(QmlGraphicsImageBase);
-    if (d->pendingPixmapCache)
-        QmlPixmapCache::cancel(d->url, this);
-}
-
-QmlGraphicsImageBase::Status QmlGraphicsImageBase::status() const
-{
-    Q_D(const QmlGraphicsImageBase);
-    return d->status;
-}
-
-
-qreal QmlGraphicsImageBase::progress() const
-{
-    Q_D(const QmlGraphicsImageBase);
-    return d->progress;
-}
-
-QUrl QmlGraphicsImageBase::source() const
-{
-    Q_D(const QmlGraphicsImageBase);
-    return d->url;
-}
-
-void QmlGraphicsImageBase::setSource(const QUrl &url)
-{
-    Q_D(QmlGraphicsImageBase);
-    //equality is fairly expensive, so we bypass for simple, common case
-    if ((d->url.isEmpty() == url.isEmpty()) && url == d->url)
-        return;
-
-    if (d->pendingPixmapCache) {
-        QmlPixmapCache::cancel(d->url, this);
-        d->pendingPixmapCache = false;
-    }
-
-    d->url = url;
-    if (d->progress != 0.0) {
-        d->progress = 0.0;
-        emit progressChanged(d->progress);
-    }
-
-    if (url.isEmpty()) {
-        d->pix = QPixmap();
-        d->status = Null;
-        setImplicitWidth(0);
-        setImplicitHeight(0);
-        emit statusChanged(d->status);
-        emit sourceChanged(d->url);
-        emit pixmapChanged();
-        update();
-    } else {
-        d->status = Loading;
-        QmlPixmapReply::Status status = QmlPixmapCache::get(d->url, &d->pix);
-        if (status != QmlPixmapReply::Ready && status != QmlPixmapReply::Error) {
-            QmlPixmapReply *reply = QmlPixmapCache::request(qmlEngine(this), d->url);
-            d->pendingPixmapCache = true;
-
-            static int replyDownloadProgress = -1;
-            static int replyFinished = -1;
-            static int thisRequestProgress = -1;
-            static int thisRequestFinished = -1;
-            if (replyDownloadProgress == -1) {
-                replyDownloadProgress = 
-                    QmlPixmapReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)");
-                replyFinished = 
-                    QmlPixmapReply::staticMetaObject.indexOfSignal("finished()");
-                thisRequestProgress = 
-                    QmlGraphicsImageBase::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)");
-                thisRequestFinished =
-                    QmlGraphicsImageBase::staticMetaObject.indexOfSlot("requestFinished()");
-            }
-
-            QMetaObject::connect(reply, replyFinished, this, 
-                                 thisRequestFinished, Qt::DirectConnection);
-            QMetaObject::connect(reply, replyDownloadProgress, this, 
-                                 thisRequestProgress, Qt::DirectConnection);
-        } else {
-            //### should be unified with requestFinished
-            if (status == QmlPixmapReply::Ready) {
-                setImplicitWidth(d->pix.width());
-                setImplicitHeight(d->pix.height());
-
-                if (d->status == Loading)
-                    d->status = Ready;
-            } else {
-                d->status = Error;
-            }
-            d->progress = 1.0;
-            emit statusChanged(d->status);
-            emit sourceChanged(d->url);
-            emit progressChanged(d->progress);
-            emit pixmapChanged();
-            update();
-        }
-    }
-
-    emit statusChanged(d->status);
-}
-
-void QmlGraphicsImageBase::requestFinished()
-{
-    Q_D(QmlGraphicsImageBase);
-
-    d->pendingPixmapCache = false;
-
-    if (QmlPixmapCache::get(d->url, &d->pix) != QmlPixmapReply::Ready)
-        d->status = Error;
-    setImplicitWidth(d->pix.width());
-    setImplicitHeight(d->pix.height());
-
-    if (d->status == Loading)
-        d->status = Ready;
-    d->progress = 1.0;
-    emit statusChanged(d->status);
-    emit sourceChanged(d->url);
-    emit progressChanged(1.0);
-    emit pixmapChanged();
-    update();
-}
-
-void QmlGraphicsImageBase::requestProgress(qint64 received, qint64 total)
-{
-    Q_D(QmlGraphicsImageBase);
-    if (d->status == Loading && total > 0) {
-        d->progress = qreal(received)/total;
-        emit progressChanged(d->progress);
-    }
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
deleted file mode 100644
index e8bda4c..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSIMAGEBASE_H
-#define QMLGRAPHICSIMAGEBASE_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsImageBasePrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsImageBase : public QmlGraphicsItem
-{
-    Q_OBJECT
-    Q_ENUMS(Status)
-
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
-
-public:
-    ~QmlGraphicsImageBase();
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
-    qreal progress() const;
-
-    QUrl source() const;
-    virtual void setSource(const QUrl &url);
-
-Q_SIGNALS:
-    void sourceChanged(const QUrl &);
-    void statusChanged(Status);
-    void progressChanged(qreal progress);
-    void pixmapChanged();
-
-protected:
-    QmlGraphicsImageBase(QmlGraphicsImageBasePrivate &dd, QmlGraphicsItem *parent);
-
-private Q_SLOTS:
-    virtual void requestFinished();
-    void requestProgress(qint64,qint64);
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsImageBase)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsImageBase)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSIMAGEBASE_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h
deleted file mode 100644
index d86785f..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSIMAGEBASE_P_H
-#define QMLGRAPHICSIMAGEBASE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsitem_p.h"
-
-#include <QtCore/QPointer>
-
-QT_BEGIN_NAMESPACE
-
-class QNetworkReply;
-class QmlGraphicsImageBasePrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsImageBase)
-
-public:
-    QmlGraphicsImageBasePrivate()
-      : status(QmlGraphicsImageBase::Null),
-        progress(0.0),
-        pendingPixmapCache(false)
-    {
-    }
-
-    QPixmap pix;
-    QmlGraphicsImageBase::Status status;
-    QUrl url;
-    qreal progress;
-    bool pendingPixmapCache;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
deleted file mode 100644
index fce4e36..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ /dev/null
@@ -1,2838 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsitem_p.h"
-#include "qmlgraphicsitem.h"
-
-#include "qmlgraphicsevents_p_p.h"
-
-#include <qfxperf_p_p.h>
-#include <qmlengine.h>
-#include <qmlopenmetaobject_p.h>
-#include <qmlstate_p.h>
-#include <qmlview.h>
-#include <qmlstategroup_p.h>
-#include <qmlcomponent.h>
-
-#include <QDebug>
-#include <QPen>
-#include <QFile>
-#include <QEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QtCore/qnumeric.h>
-#include <QtScript/qscriptengine.h>
-#include <QtGui/qgraphicstransform.h>
-#include <QtGui/qgraphicseffect.h>
-#include <qlistmodelinterface_p.h>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef FLT_MAX
-#define FLT_MAX 1E+37
-#endif
-
-#include "qmlgraphicseffects.cpp"
-
-/*!
-    \qmlclass Transform QGraphicsTransform
-    \since 4.7
-    \brief The Transform elements provide a way of building advanced transformations on Items.
-
-    The Transform elements let you create and control advanced transformations that can be configured
-    independently using specialized properties.
-
-    You can assign any number of Transform elements to an Item. Each Transform is applied in order,
-    one at a time, to the Item it's assigned to.
-
-    \sa Rotation, Scale
-*/
-
-/*!
-    \qmlclass Scale QGraphicsScale
-    \since 4.7
-    \brief The Scale object provides a way to scale an Item.
-
-    The Scale object gives more control over scaling than using Item's scale property. Specifically,
-    it allows a different scale for the x and y axes, and allows the scale to be relative to an
-    arbitrary point.
-
-    The following example scales the X axis of the Rectangle, relative to its interior point 25, 25:
-    \qml
-    Rectangle {
-        width: 100; height: 100
-        color: "blue"
-        transform: Scale { origin.x: 25; origin.y: 25; xScale: 3}
-    }
-    \endqml
-*/
-
-/*!
-    \qmlproperty real Scale::origin.x
-    \qmlproperty real Scale::origin.y
-
-    The point that the item is scaled from (i.e., the point that stays fixed relative to the parent as
-    the rest of the item grows). By default the origin is 0, 0.
-*/
-
-/*!
-    \qmlproperty real Scale::xScale
-
-    The scaling factor for the X axis.
-*/
-
-/*!
-    \qmlproperty real Scale::yScale
-
-    The scaling factor for the Y axis.
-*/
-
-/*!
-    \qmlclass Rotation QGraphicsRotation
-    \since 4.7
-    \brief The Rotation object provides a way to rotate an Item.
-
-    The Rotation object gives more control over rotation than using Item's rotation property.
-    Specifically, it allows (z axis) rotation to be relative to an arbitrary point.
-
-    The following example rotates a Rectangle around its interior point 25, 25:
-    \qml
-    Rectangle {
-        width: 100; height: 100
-        color: "blue"
-        transform: Rotation { origin.x: 25; origin.y: 25; angle: 45}
-    }
-    \endqml
-
-    Rotation also provides a way to specify 3D-like rotations for Items. For these types of
-    rotations you must specify the axis to rotate around in addition to the origin point.
-
-    The following example shows various 3D-like rotations applied to an \l Image.
-    \snippet doc/src/snippets/declarative/rotation.qml 0
-
-    \image axisrotation.png
-*/
-
-/*!
-    \qmlproperty real Rotation::origin.x
-    \qmlproperty real Rotation::origin.y
-
-    The origin point of the rotation (i.e., the point that stays fixed relative to the parent as
-    the rest of the item rotates). By default the origin is 0, 0.
-*/
-
-/*!
-    \qmlproperty real Rotation::axis.x
-    \qmlproperty real Rotation::axis.y
-    \qmlproperty real Rotation::axis.z
-
-    The axis to rotate around. For simple (2D) rotation around a point, you do not need to specify an axis,
-    as the default axis is the z axis (\c{ axis { x: 0; y: 0; z: 1 } }).
-
-    For a typical 3D-like rotation you will usually specify both the origin and the axis.
-
-    \image 3d-rotation-axis.png
-*/
-
-/*!
-    \qmlproperty real Rotation::angle
-
-    The angle to rotate, in degrees clockwise.
-*/
-
-
-/*!
-    \group group_animation
-    \title Animation
-*/
-
-/*!
-    \group group_coreitems
-    \title Basic Items
-*/
-
-/*!
-    \group group_effects
-    \title Effects
-*/
-
-/*!
-    \group group_layouts
-    \title Layouts
-*/
-
-/*!
-    \group group_states
-    \title States and Transitions
-*/
-
-/*!
-    \group group_utility
-    \title Utility
-*/
-
-/*!
-    \group group_views
-    \title Views
-*/
-
-/*!
-    \group group_widgets
-    \title Widgets
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsContents
-    \ingroup group_utility
-    \brief The QmlGraphicsContents class gives access to the height and width of an item's contents.
-
-*/
-
-QmlGraphicsContents::QmlGraphicsContents() : m_x(0), m_y(0), m_width(0), m_height(0)
-{
-}
-
-/*!
-    \qmlproperty real Item::childrenRect.x
-    \qmlproperty real Item::childrenRect.y
-    \qmlproperty real Item::childrenRect.width
-    \qmlproperty real Item::childrenRect.height
-
-    The childrenRect properties allow an item access to the geometry of its
-    children. This property is useful if you have an item that needs to be
-    sized to fit its children.
-*/
-
-QRectF QmlGraphicsContents::rectF() const
-{
-    return QRectF(m_x, m_y, m_width, m_height);
-}
-
-//TODO: optimization: only check sender(), if there is one
-void QmlGraphicsContents::calcHeight()
-{
-    qreal oldy = m_y;
-    qreal oldheight = m_height;
-
-    qreal top = FLT_MAX;
-    qreal bottom = 0;
-
-    QList<QGraphicsItem *> children = m_item->childItems();
-    for (int i = 0; i < children.count(); ++i) {
-        QmlGraphicsItem *child = qobject_cast<QmlGraphicsItem *>(children.at(i));
-        if(!child)//### Should this be ignoring non-QmlGraphicsItem graphicsobjects?
-            continue;
-        qreal y = child->y();
-        if (y + child->height() > bottom)
-            bottom = y + child->height();
-        if (y < top)
-            top = y;
-    }
-    if (!children.isEmpty())
-        m_y = top;
-    m_height = qMax(bottom - top, qreal(0.0));
-
-    if (m_height != oldheight || m_y != oldy)
-        emit rectChanged();
-}
-
-//TODO: optimization: only check sender(), if there is one
-void QmlGraphicsContents::calcWidth()
-{
-    qreal oldx = m_x;
-    qreal oldwidth = m_width;
-
-    qreal left = FLT_MAX;
-    qreal right = 0;
-
-    QList<QGraphicsItem *> children = m_item->childItems();
-    for (int i = 0; i < children.count(); ++i) {
-        QmlGraphicsItem *child = qobject_cast<QmlGraphicsItem *>(children.at(i));
-        if(!child)//### Should this be ignoring non-QmlGraphicsItem graphicsobjects?
-            continue;
-        qreal x = child->x();
-        if (x + child->width() > right)
-            right = x + child->width();
-        if (x < left)
-            left = x;
-    }
-    if (!children.isEmpty())
-        m_x = left;
-    m_width = qMax(right - left, qreal(0.0));
-
-    if (m_width != oldwidth || m_x != oldx)
-        emit rectChanged();
-}
-
-void QmlGraphicsContents::setItem(QmlGraphicsItem *item)
-{
-    m_item = item;
-
-    QList<QGraphicsItem *> children = m_item->childItems();
-    for (int i = 0; i < children.count(); ++i) {
-        QmlGraphicsItem *child = qobject_cast<QmlGraphicsItem *>(children.at(i));
-        if(!child)//### Should this be ignoring non-QmlGraphicsItem graphicsobjects?
-            continue;
-        connect(child, SIGNAL(heightChanged()), this, SLOT(calcHeight()));
-        connect(child, SIGNAL(yChanged()), this, SLOT(calcHeight()));
-        connect(child, SIGNAL(widthChanged()), this, SLOT(calcWidth()));
-        connect(child, SIGNAL(xChanged()), this, SLOT(calcWidth()));
-        connect(this, SIGNAL(rectChanged()), m_item, SIGNAL(childrenRectChanged()));
-    }
-
-    calcHeight();
-    calcWidth();
-}
-
-QmlGraphicsItemKeyFilter::QmlGraphicsItemKeyFilter(QmlGraphicsItem *item)
-: m_next(0)
-{
-    QmlGraphicsItemPrivate *p =
-        item?static_cast<QmlGraphicsItemPrivate *>(QGraphicsItemPrivate::get(item)):0;
-    if (p) {
-        m_next = p->keyHandler;
-        p->keyHandler = this;
-    }
-}
-
-QmlGraphicsItemKeyFilter::~QmlGraphicsItemKeyFilter()
-{
-}
-
-void QmlGraphicsItemKeyFilter::keyPressed(QKeyEvent *event)
-{
-    if (m_next) m_next->keyPressed(event);
-}
-
-void QmlGraphicsItemKeyFilter::keyReleased(QKeyEvent *event)
-{
-    if (m_next) m_next->keyReleased(event);
-}
-
-void QmlGraphicsItemKeyFilter::inputMethodEvent(QInputMethodEvent *event)
-{
-    if (m_next) m_next->inputMethodEvent(event);
-}
-
-QVariant QmlGraphicsItemKeyFilter::inputMethodQuery(Qt::InputMethodQuery query) const
-{
-    if (m_next) return m_next->inputMethodQuery(query);
-    return QVariant();
-}
-
-void QmlGraphicsItemKeyFilter::componentComplete()
-{
-    if (m_next) m_next->componentComplete();
-}
-
-
-/*!
-    \qmlclass KeyNavigation
-    \since 4.7
-    \brief The KeyNavigation attached property supports key navigation by arrow keys.
-
-    It is common in key-based UIs to use arrow keys to navigate
-    between focussed items.  The KeyNavigation property provides a
-    convenient way of specifying which item will gain focus
-    when an arrow key is pressed.  The following example provides
-    key navigation for a 2x2 grid of items.
-
-    \code
-    Grid {
-        columns: 2
-        width: 100; height: 100
-        Rectangle {
-            id: item1
-            focus: true
-            width: 50; height: 50
-            color: focus ? "red" : "lightgray"
-            KeyNavigation.right: item2
-            KeyNavigation.down: item3
-        }
-        Rectangle {
-            id: item2
-            width: 50; height: 50
-            color: focus ? "red" : "lightgray"
-            KeyNavigation.left: item1
-            KeyNavigation.down: item4
-        }
-        Rectangle {
-            id: item3
-            width: 50; height: 50
-            color: focus ? "red" : "lightgray"
-            KeyNavigation.right: item4
-            KeyNavigation.up: item1
-        }
-        Rectangle {
-            id: item4
-            width: 50; height: 50
-            color: focus ? "red" : "lightgray"
-            KeyNavigation.left: item3
-            KeyNavigation.up: item2
-        }
-    }
-    \endcode
-
-    KeyNavigation receives key events after the item it is attached to.
-    If the item accepts an arrow key event, the KeyNavigation
-    attached property will not receive an event for that key.
-
-    If an item has been set for a direction and the KeyNavigation
-    attached property receives the corresponding
-    key press and release events, the events will be accepted by
-    KeyNaviagtion and will not propagate any further.
-
-    \sa {Keys}{Keys attached property}
-*/
-
-/*!
-    \qmlproperty Item KeyNavigation::left
-    \qmlproperty Item KeyNavigation::right
-    \qmlproperty Item KeyNavigation::up
-    \qmlproperty Item KeyNavigation::down
-
-    These properties hold the item to assign focus to
-    when Key_Left, Key_Right, Key_Up or Key_Down are
-    pressed.
-*/
-
-QmlGraphicsKeyNavigationAttached::QmlGraphicsKeyNavigationAttached(QObject *parent)
-: QObject(*(new QmlGraphicsKeyNavigationAttachedPrivate), parent),
-  QmlGraphicsItemKeyFilter(qobject_cast<QmlGraphicsItem*>(parent))
-{
-}
-
-QmlGraphicsKeyNavigationAttached *
-QmlGraphicsKeyNavigationAttached::qmlAttachedProperties(QObject *obj)
-{
-    return new QmlGraphicsKeyNavigationAttached(obj);
-}
-
-QmlGraphicsItem *QmlGraphicsKeyNavigationAttached::left() const
-{
-    Q_D(const QmlGraphicsKeyNavigationAttached);
-    return d->left;
-}
-
-void QmlGraphicsKeyNavigationAttached::setLeft(QmlGraphicsItem *i)
-{
-    Q_D(QmlGraphicsKeyNavigationAttached);
-    d->left = i;
-    emit changed();
-}
-
-QmlGraphicsItem *QmlGraphicsKeyNavigationAttached::right() const
-{
-    Q_D(const QmlGraphicsKeyNavigationAttached);
-    return d->right;
-}
-
-void QmlGraphicsKeyNavigationAttached::setRight(QmlGraphicsItem *i)
-{
-    Q_D(QmlGraphicsKeyNavigationAttached);
-    d->right = i;
-    emit changed();
-}
-
-QmlGraphicsItem *QmlGraphicsKeyNavigationAttached::up() const
-{
-    Q_D(const QmlGraphicsKeyNavigationAttached);
-    return d->up;
-}
-
-void QmlGraphicsKeyNavigationAttached::setUp(QmlGraphicsItem *i)
-{
-    Q_D(QmlGraphicsKeyNavigationAttached);
-    d->up = i;
-    emit changed();
-}
-
-QmlGraphicsItem *QmlGraphicsKeyNavigationAttached::down() const
-{
-    Q_D(const QmlGraphicsKeyNavigationAttached);
-    return d->down;
-}
-
-void QmlGraphicsKeyNavigationAttached::setDown(QmlGraphicsItem *i)
-{
-    Q_D(QmlGraphicsKeyNavigationAttached);
-    d->down = i;
-    emit changed();
-}
-
-void QmlGraphicsKeyNavigationAttached::keyPressed(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsKeyNavigationAttached);
-
-    event->ignore();
-
-    switch(event->key()) {
-    case Qt::Key_Left:
-        if (d->left) {
-            d->left->setFocus(true);
-            event->accept();
-        }
-        break;
-    case Qt::Key_Right:
-        if (d->right) {
-            d->right->setFocus(true);
-            event->accept();
-        }
-        break;
-    case Qt::Key_Up:
-        if (d->up) {
-            d->up->setFocus(true);
-            event->accept();
-        }
-        break;
-    case Qt::Key_Down:
-        if (d->down) {
-            d->down->setFocus(true);
-            event->accept();
-        }
-        break;
-    default:
-        break;
-    }
-
-    if (!event->isAccepted()) QmlGraphicsItemKeyFilter::keyPressed(event);
-}
-
-void QmlGraphicsKeyNavigationAttached::keyReleased(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsKeyNavigationAttached);
-
-    event->ignore();
-
-    switch(event->key()) {
-    case Qt::Key_Left:
-        if (d->left) {
-            event->accept();
-        }
-        break;
-    case Qt::Key_Right:
-        if (d->right) {
-            event->accept();
-        }
-        break;
-    case Qt::Key_Up:
-        if (d->up) {
-            event->accept();
-        }
-        break;
-    case Qt::Key_Down:
-        if (d->down) {
-            event->accept();
-        }
-        break;
-    default:
-        break;
-    }
-
-    if (!event->isAccepted()) QmlGraphicsItemKeyFilter::keyReleased(event);
-}
-
-/*!
-    \qmlclass Keys
-    \since 4.7
-    \brief The Keys attached property provides key handling to Items.
-
-    All visual primitives support key handling via the \e Keys
-    attached property.  Keys can be handled via the \e onPressed
-    and \e onReleased signal properties.
-
-    The signal properties have a \l KeyEvent parameter, named
-    \e event which contains details of the event.  If a key is
-    handled \e event.accepted should be set to true to prevent the
-    event from propagating up the item heirarchy.
-
-    \code
-    Item {
-        focus: true
-        Keys.onPressed: {
-            if (event.key == Qt.Key_Left) {
-                console.log("move left");
-                event.accepted = true;
-            }
-        }
-    }
-    \endcode
-
-    Some keys may alternatively be handled via specific signal properties,
-    for example \e onSelectPressed.  These handlers automatically set
-    \e event.accepted to true.
-
-    \code
-    Item {
-        focus: true
-        Keys.onLeftPressed: console.log("move left")
-    }
-    \endcode
-
-    See \l {Qt::Key}{Qt.Key} for the list of keyboard codes.
-
-    \sa KeyEvent, {KeyNavigation}{KeyNavigation attached property}
-*/
-
-/*!
-    \qmlproperty bool Keys::enabled
-
-    This flags enables key handling if true (default); otherwise
-    no key handlers will be called.
-*/
-
-/*!
-    \qmlproperty List<Object> Keys::forwardTo
-
-    This property provides a way to forward key presses, key releases, and keyboard input
-    coming from input methods to other items. This can be useful when you want
-    one item to handle some keys (e.g. the up and down arrow keys), and another item to
-    handle other keys (e.g. the left and right arrow keys).  Once an item that has been
-    forwarded keys accepts the event it is no longer forwarded to items later in the
-    list.
-
-    This example forwards key events to two lists:
-    \qml
-    ListView { id: list1 ... }
-    ListView { id: list2 ... }
-    Keys.forwardTo: [list1, list2]
-    focus: true
-    \endqml
-*/
-
-/*!
-    \qmlsignal Keys::onPressed(event)
-
-    This handler is called when a key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onReleased(event)
-
-    This handler is called when a key has been released. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit0Pressed(event)
-
-    This handler is called when the digit '0' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit1Pressed(event)
-
-    This handler is called when the digit '1' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit2Pressed(event)
-
-    This handler is called when the digit '2' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit3Pressed(event)
-
-    This handler is called when the digit '3' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit4Pressed(event)
-
-    This handler is called when the digit '4' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit5Pressed(event)
-
-    This handler is called when the digit '5' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit6Pressed(event)
-
-    This handler is called when the digit '6' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit7Pressed(event)
-
-    This handler is called when the digit '7' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit8Pressed(event)
-
-    This handler is called when the digit '8' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDigit9Pressed(event)
-
-    This handler is called when the digit '9' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onLeftPressed(event)
-
-    This handler is called when the Left arrow has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onRightPressed(event)
-
-    This handler is called when the Right arrow has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onUpPressed(event)
-
-    This handler is called when the Up arrow has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDownPressed(event)
-
-    This handler is called when the Down arrow has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onAsteriskPressed(event)
-
-    This handler is called when the Asterisk '*' has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onEscapePressed(event)
-
-    This handler is called when the Escape key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onReturnPressed(event)
-
-    This handler is called when the Return key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onEnterPressed(event)
-
-    This handler is called when the Enter key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onDeletePressed(event)
-
-    This handler is called when the Delete key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onSpacePressed(event)
-
-    This handler is called when the Space key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onBackPressed(event)
-
-    This handler is called when the Back key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onCancelPressed(event)
-
-    This handler is called when the Cancel key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onSelectPressed(event)
-
-    This handler is called when the Select key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onYesPressed(event)
-
-    This handler is called when the Yes key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onNoPressed(event)
-
-    This handler is called when the No key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onContext1Pressed(event)
-
-    This handler is called when the Context1 key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onContext2Pressed(event)
-
-    This handler is called when the Context2 key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onContext3Pressed(event)
-
-    This handler is called when the Context3 key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onContext4Pressed(event)
-
-    This handler is called when the Context4 key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onCallPressed(event)
-
-    This handler is called when the Call key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onHangupPressed(event)
-
-    This handler is called when the Hangup key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onFlipPressed(event)
-
-    This handler is called when the Flip key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onMenuPressed(event)
-
-    This handler is called when the Menu key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onVolumeUpPressed(event)
-
-    This handler is called when the VolumeUp key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onVolumeDownPressed(event)
-
-    This handler is called when the VolumeDown key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-const QmlGraphicsKeysAttached::SigMap QmlGraphicsKeysAttached::sigMap[] = {
-    { Qt::Key_Left, "leftPressed" },
-    { Qt::Key_Right, "rightPressed" },
-    { Qt::Key_Up, "upPressed" },
-    { Qt::Key_Down, "downPressed" },
-    { Qt::Key_Asterisk, "asteriskPressed" },
-    { Qt::Key_NumberSign, "numberSignPressed" },
-    { Qt::Key_Escape, "escapePressed" },
-    { Qt::Key_Return, "returnPressed" },
-    { Qt::Key_Enter, "enterPressed" },
-    { Qt::Key_Delete, "deletePressed" },
-    { Qt::Key_Space, "spacePressed" },
-    { Qt::Key_Back, "backPressed" },
-    { Qt::Key_Cancel, "cancelPressed" },
-    { Qt::Key_Select, "selectPressed" },
-    { Qt::Key_Yes, "yesPressed" },
-    { Qt::Key_No, "noPressed" },
-    { Qt::Key_Context1, "context1Pressed" },
-    { Qt::Key_Context2, "context2Pressed" },
-    { Qt::Key_Context3, "context3Pressed" },
-    { Qt::Key_Context4, "context4Pressed" },
-    { Qt::Key_Call, "callPressed" },
-    { Qt::Key_Hangup, "hangupPressed" },
-    { Qt::Key_Flip, "flipPressed" },
-    { Qt::Key_Menu, "menuPressed" },
-    { Qt::Key_VolumeUp, "volumeUpPressed" },
-    { Qt::Key_VolumeDown, "volumeDownPressed" },
-    { 0, 0 }
-};
-
-bool QmlGraphicsKeysAttachedPrivate::isConnected(const char *signalName)
-{
-    return isSignalConnected(signalIndex(signalName));
-}
-
-QmlGraphicsKeysAttached::QmlGraphicsKeysAttached(QObject *parent)
-: QObject(*(new QmlGraphicsKeysAttachedPrivate), parent),
-  QmlGraphicsItemKeyFilter(qobject_cast<QmlGraphicsItem*>(parent))
-{
-    Q_D(QmlGraphicsKeysAttached);
-    d->item = qobject_cast<QmlGraphicsItem*>(parent);
-}
-
-QmlGraphicsKeysAttached::~QmlGraphicsKeysAttached()
-{
-}
-
-void QmlGraphicsKeysAttached::componentComplete()
-{
-    Q_D(QmlGraphicsKeysAttached);
-    if (d->item) {
-        for (int ii = 0; ii < d->targets.count(); ++ii) {
-            QGraphicsItem *targetItem = d->finalFocusProxy(d->targets.at(ii));
-            if (targetItem && (targetItem->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
-                d->item->setFlag(QGraphicsItem::ItemAcceptsInputMethod);
-                break;
-            }
-        }
-    }
-}
-
-void QmlGraphicsKeysAttached::keyPressed(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsKeysAttached);
-    if (!d->enabled || d->inPress) {
-        event->ignore();
-        return;
-    }
-
-    // first process forwards
-    if (d->item && d->item->scene()) {
-        d->inPress = true;
-        for (int ii = 0; ii < d->targets.count(); ++ii) {
-            QGraphicsItem *i = d->finalFocusProxy(d->targets.at(ii));
-            if (i) {
-                d->item->scene()->sendEvent(i, event);
-                if (event->isAccepted()) {
-                    d->inPress = false;
-                    return;
-                }
-            }
-        }
-        d->inPress = false;
-    }
-
-    QmlGraphicsKeyEvent ke(*event);
-    QByteArray keySignal = keyToSignal(event->key());
-    if (!keySignal.isEmpty()) {
-        keySignal += "(QmlGraphicsKeyEvent*)";
-        if (d->isConnected(keySignal)) {
-            // If we specifically handle a key then default to accepted
-            ke.setAccepted(true);
-            int idx = QmlGraphicsKeysAttached::staticMetaObject.indexOfSignal(keySignal);
-            metaObject()->method(idx).invoke(this, Qt::DirectConnection, Q_ARG(QmlGraphicsKeyEvent*, &ke));
-        }
-    }
-    if (!ke.isAccepted())
-        emit pressed(&ke);
-    event->setAccepted(ke.isAccepted());
-
-    if (!event->isAccepted()) QmlGraphicsItemKeyFilter::keyPressed(event);
-}
-
-void QmlGraphicsKeysAttached::keyReleased(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsKeysAttached);
-    if (!d->enabled || d->inRelease) {
-        event->ignore();
-        return;
-    }
-
-    if (d->item && d->item->scene()) {
-        d->inRelease = true;
-        for (int ii = 0; ii < d->targets.count(); ++ii) {
-            QGraphicsItem *i = d->finalFocusProxy(d->targets.at(ii));
-            if (i) {
-                d->item->scene()->sendEvent(i, event);
-                if (event->isAccepted()) {
-                    d->inRelease = false;
-                    return;
-                }
-            }
-        }
-        d->inRelease = false;
-    }
-
-    QmlGraphicsKeyEvent ke(*event);
-    emit released(&ke);
-    event->setAccepted(ke.isAccepted());
-
-    if (!event->isAccepted()) QmlGraphicsItemKeyFilter::keyReleased(event);
-}
-
-void QmlGraphicsKeysAttached::inputMethodEvent(QInputMethodEvent *event)
-{
-    Q_D(QmlGraphicsKeysAttached);
-    if (d->item && !d->inIM && d->item->scene()) {
-        d->inIM = true;
-        for (int ii = 0; ii < d->targets.count(); ++ii) {
-            QGraphicsItem *i = d->finalFocusProxy(d->targets.at(ii));
-            if (i && (i->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
-                d->item->scene()->sendEvent(i, event);
-                if (event->isAccepted()) {
-                    d->imeItem = i;
-                    d->inIM = false;
-                    return;
-                }
-            }
-        }
-        d->inIM = false;
-    }
-    if (!event->isAccepted()) QmlGraphicsItemKeyFilter::inputMethodEvent(event);
-}
-
-class QmlGraphicsItemAccessor : public QGraphicsItem
-{
-public:
-    QVariant doInputMethodQuery(Qt::InputMethodQuery query) const {
-        return QGraphicsItem::inputMethodQuery(query);
-    }
-};
-
-QVariant QmlGraphicsKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const
-{
-    Q_D(const QmlGraphicsKeysAttached);
-    if (d->item) {
-        for (int ii = 0; ii < d->targets.count(); ++ii) {
-                QGraphicsItem *i = d->finalFocusProxy(d->targets.at(ii));
-            if (i && (i->flags() & QGraphicsItem::ItemAcceptsInputMethod) && i == d->imeItem) { //### how robust is i == d->imeItem check?
-                QVariant v = static_cast<QmlGraphicsItemAccessor *>(i)->doInputMethodQuery(query);
-                if (v.userType() == QVariant::RectF)
-                    v = d->item->mapRectFromItem(i, v.toRectF());  //### cost?
-                return v;
-            }
-        }
-    }
-    return QmlGraphicsItemKeyFilter::inputMethodQuery(query);
-}
-
-QmlGraphicsKeysAttached *QmlGraphicsKeysAttached::qmlAttachedProperties(QObject *obj)
-{
-    return new QmlGraphicsKeysAttached(obj);
-}
-
-/*!
-    \class QmlGraphicsItem
-    \since 4.7
-    \brief The QmlGraphicsItem class provides the most basic of all visual items in QML.
-
-    All visual items in Qt Declarative inherit from QmlGraphicsItem.  Although QmlGraphicsItem
-    has no visual appearance, it defines all the properties that are
-    common across visual items - such as the x and y position, the
-    width and height, \l {anchor-layout}{anchoring} and key handling.
-
-    You can subclass QmlGraphicsItem to provide your own custom visual item that inherits
-    these features.
-*/
-
-/*!
-    \qmlclass Item QmlGraphicsItem
-    \since 4.7
-    \brief The Item is the most basic of all visual items in QML.
-
-    All visual items in Qt Declarative inherit from Item.  Although Item
-    has no visual appearance, it defines all the properties that are
-    common across visual items - such as the x and y position, the
-    width and height, \l {anchor-layout}{anchoring} and key handling.
-
-    Item is also useful for grouping items together.
-
-    \qml
-    Item {
-        Image {
-            source: "tile.png"
-        }
-        Image {
-            x: 80
-            width: 100
-            height: 100
-            source: "tile.png"
-        }
-        Image {
-            x: 190
-            width: 100
-            height: 100
-            fillMode: Image.Tile
-            source: "tile.png"
-        }
-    }
-    \endqml
-
-    \section1 Identity
-
-    Each item has an "id" - the identifier of the Item.
-
-    The identifier can be used in bindings and other expressions to
-    refer to the item. For example:
-
-    \qml
-    Text { id: myText; ... }
-    Text { text: myText.text }
-    \endqml
-
-    The identifier is available throughout to the \l {components}{component}
-    where it is declared.  The identifier must be unique in the component.
-
-    The id should not be thought of as a "property" - it makes no sense
-    to write \c myText.id, for example.
-
-    \section1 Key Handling
-
-    Key handling is available to all Item-based visual elements via the \l {Keys}{Keys}
-    attached property.  The \e Keys attached property provides basic handlers such
-    as \l {Keys::onPressed}{onPressed} and \l {Keys::onReleased}{onReleased},
-    as well as handlers for specific keys, such as
-    \l {Keys::onCancelPressed}{onCancelPressed}.  The example below
-    assigns \l {qmlfocus}{focus} to the item and handles
-    the Left key via the general \e onPressed handler and the Select key via the
-    onSelectPressed handler:
-
-    \qml
-    Item {
-        focus: true
-        Keys.onPressed: {
-            if (event.key == Qt.Key_Left) {
-                console.log("move left");
-                event.accepted = true;
-            }
-        }
-        Keys.onSelectPressed: console.log("Selected");
-    }
-    \endqml
-
-    See the \l {Keys}{Keys} attached property for detailed documentation.
-
-    \ingroup group_coreitems
-*/
-
-/*!
-    \property QmlGraphicsItem::baseline
-    \internal
-*/
-
-/*!
-    \property QmlGraphicsItem::effect
-    \internal
-*/
-
-/*!
-    \property QmlGraphicsItem::focus
-    \internal
-*/
-
-/*!
-    \property QmlGraphicsItem::wantsFocus
-    \internal
-*/
-
-/*!
-    \property QmlGraphicsItem::transformOrigin
-    \internal
-*/
-
-/*!
-    \fn void QmlGraphicsItem::childrenRectChanged()
-    \internal
-*/
-
-/*!
-    \fn void QmlGraphicsItem::baselineOffsetChanged()
-    \internal
-*/
-
-/*!
-    \fn void QmlGraphicsItem::widthChanged()
-    \internal
-*/
-
-/*!
-    \fn void QmlGraphicsItem::heightChanged()
-    \internal
-*/
-
-/*!
-    \fn void QmlGraphicsItem::stateChanged(const QString &state)
-    \internal
-*/
-
-/*!
-    \fn void QmlGraphicsItem::parentChanged()
-    \internal
-*/
-
-/*! \fn void QmlGraphicsItem::transformOriginChanged(TransformOrigin)
-  \internal
-*/
-
-/*!
-    \fn void QmlGraphicsItem::childrenChanged()
-    \internal
-*/
-
-/*!
-    \fn void QmlGraphicsItem::focusChanged()
-    \internal
-*/
-
-/*!
-    \fn void QmlGraphicsItem::wantsFocusChanged()
-    \internal
-*/
-
-// ### Must fix
-struct RegisterAnchorLineAtStartup {
-    RegisterAnchorLineAtStartup() {
-        qRegisterMetaType<QmlGraphicsAnchorLine>("QmlGraphicsAnchorLine");
-    }
-};
-static RegisterAnchorLineAtStartup registerAnchorLineAtStartup;
-
-
-/*!
-    \fn QmlGraphicsItem::QmlGraphicsItem(QmlGraphicsItem *parent)
-
-    Constructs a QmlGraphicsItem with the given \a parent.
-*/
-QmlGraphicsItem::QmlGraphicsItem(QmlGraphicsItem* parent)
-  : QGraphicsObject(*(new QmlGraphicsItemPrivate), parent, 0)
-{
-    Q_D(QmlGraphicsItem);
-    d->init(parent);
-}
-
-/*! \internal
-*/
-QmlGraphicsItem::QmlGraphicsItem(QmlGraphicsItemPrivate &dd, QmlGraphicsItem *parent)
-  : QGraphicsObject(dd, parent, 0)
-{
-    Q_D(QmlGraphicsItem);
-    d->init(parent);
-}
-
-/*!
-    Destroys the QmlGraphicsItem.
-*/
-QmlGraphicsItem::~QmlGraphicsItem()
-{
-    Q_D(QmlGraphicsItem);
-    for (int ii = 0; ii < d->changeListeners.count(); ++ii) {
-        QmlGraphicsAnchorsPrivate *anchor = d->changeListeners.at(ii).listener->anchorPrivate();
-        if (anchor)
-            anchor->clearItem(this);
-    }
-    if (!d->parent || (parentItem() && !parentItem()->QGraphicsItem::d_ptr->inDestructor)) {
-        for (int ii = 0; ii < d->changeListeners.count(); ++ii) {
-            QmlGraphicsAnchorsPrivate *anchor = d->changeListeners.at(ii).listener->anchorPrivate();
-            if (anchor && anchor->item && anchor->item->parentItem() != this) //child will be deleted anyway
-                anchor->updateOnComplete();
-        }
-    }
-    for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
-        const QmlGraphicsItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
-        if (change.types & QmlGraphicsItemPrivate::Destroyed)
-            change.listener->itemDestroyed(this);
-    }
-    d->changeListeners.clear();
-    delete d->_anchorLines; d->_anchorLines = 0;
-    delete d->_anchors; d->_anchors = 0;
-    delete d->_stateGroup; d->_stateGroup = 0;
-}
-
-/*!
-    \qmlproperty enum Item::transformOrigin
-    This property holds the origin point around which scale and rotation transform.
-
-    Nine transform origins are available, as shown in the image below.
-
-    \image declarative-transformorigin.png
-
-    This example rotates an image around its bottom-right corner.
-    \qml
-    Image {
-        source: "myimage.png"
-        transformOrigin: Item.BottomRight
-        rotate: 45
-    }
-    \endqml
-
-    The default transform origin is \c Center.
-*/
-
-/*!
-    \qmlproperty Item Item::parent
-    This property holds the parent of the item.
-*/
-
-/*!
-    \property QmlGraphicsItem::parent
-    This property holds the parent of the item.
-*/
-void QmlGraphicsItem::setParentItem(QmlGraphicsItem *parent)
-{
-    QmlGraphicsItem *oldParent = parentItem();
-    if (parent == oldParent || !parent) return;
-
-    QObject::setParent(parent);
-    QGraphicsObject::setParentItem(parent);
-}
-
-/*!
-    \fn void QmlGraphicsItem::setParent(QmlGraphicsItem *parent)
-    \overload
-    Sets both the parent object and parent item to \a parent. This
-    function avoids the programming error of calling setParent()
-    when you mean setParentItem().
-*/
-
-/*!
-    Returns the QmlGraphicsItem parent of this item.
-*/
-QmlGraphicsItem *QmlGraphicsItem::parentItem() const
-{
-    return qobject_cast<QmlGraphicsItem *>(QGraphicsObject::parentItem());
-}
-
-/*!
-    \qmlproperty list<Item> Item::children
-    \qmlproperty list<Object> Item::resources
-
-    The children property contains the list of visual children of this item.
-    The resources property contains non-visual resources that you want to
-    reference by name.
-
-    Generally you can rely on Item's default property to handle all this for
-    you, but it can come in handy in some cases.
-
-    \qml
-    Item {
-        children: [
-            Text {},
-            Rectangle {}
-        ]
-        resources: [
-            Component {
-                id: myComponent
-                Text {}
-            }
-        ]
-    }
-    \endqml
-*/
-
-/*!
-    \property QmlGraphicsItem::children
-    \internal
-*/
-
-/*!
-    \property QmlGraphicsItem::resources
-    \internal
-*/
-
-/*!
-    Returns true if construction of the QML component is complete; otherwise
-    returns false.
-
-    It is often desireable to delay some processing until the component is
-    completed.
-
-    \sa componentComplete()
-*/
-bool QmlGraphicsItem::isComponentComplete() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->_componentComplete;
-}
-
-/*!
-    \property QmlGraphicsItem::anchors
-    \internal
-*/
-
-/*! \internal */
-QmlGraphicsAnchors *QmlGraphicsItem::anchors()
-{
-    Q_D(QmlGraphicsItem);
-    return d->anchors();
-}
-
-void QmlGraphicsItemPrivate::data_append(QmlListProperty<QObject> *prop, QObject *o)
-{
-    QmlGraphicsItem *i = qobject_cast<QmlGraphicsItem *>(o);
-    if (i) 
-        i->setParentItem(static_cast<QmlGraphicsItem *>(prop->object));
-    else
-        o->setParent(static_cast<QmlGraphicsItem *>(prop->object));
-}
-
-QObject *QmlGraphicsItemPrivate::resources_at(QmlListProperty<QObject> *prop, int index)
-{
-    QObjectList children = prop->object->children();
-    if (index < children.count())
-        return children.at(index);
-    else
-        return 0;
-}
-
-void QmlGraphicsItemPrivate::resources_append(QmlListProperty<QObject> *prop, QObject *o)
-{
-    o->setParent(prop->object);
-}
-
-int QmlGraphicsItemPrivate::resources_count(QmlListProperty<QObject> *prop)
-{
-    return prop->object->children().count();
-}
-
-QmlGraphicsItem *QmlGraphicsItemPrivate::children_at(QmlListProperty<QmlGraphicsItem> *prop, int index)
-{
-    QList<QGraphicsItem *> children = static_cast<QmlGraphicsItem*>(prop->object)->childItems();
-
-    if (index < children.count())
-        return qobject_cast<QmlGraphicsItem *>(children.at(index));
-    else
-        return 0;
-}
-
-void QmlGraphicsItemPrivate::children_append(QmlListProperty<QmlGraphicsItem> *prop, QmlGraphicsItem *i)
-{
-    if (i)
-        i->setParentItem(static_cast<QmlGraphicsItem*>(prop->object));
-}
-
-int QmlGraphicsItemPrivate::children_count(QmlListProperty<QmlGraphicsItem> *prop)
-{
-    return static_cast<QmlGraphicsItem*>(prop->object)->childItems().count();
-}
-
-int QmlGraphicsItemPrivate::transform_count(QmlListProperty<QGraphicsTransform> *list)
-{
-    QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
-    if (object) {
-        QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(object);
-        return d->transformData ? d->transformData->graphicsTransforms.size() : 0;
-    } else {
-        return 0;
-    }
-}
-
-void QmlGraphicsItemPrivate::transform_append(QmlListProperty<QGraphicsTransform> *list, QGraphicsTransform *item)
-{
-    QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
-    if (object)
-        QGraphicsItemPrivate::get(object)->appendGraphicsTransform(item);
-}
-
-QGraphicsTransform *QmlGraphicsItemPrivate::transform_at(QmlListProperty<QGraphicsTransform> *list, int idx)
-{
-    QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
-    if (object) {
-        QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(object);
-        if (!d->transformData)
-            return 0;
-        return d->transformData->graphicsTransforms.at(idx);
-    } else {
-        return 0;
-    }
-}
-
-void QmlGraphicsItemPrivate::transform_clear(QmlListProperty<QGraphicsTransform> *list)
-{
-    QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
-    if (object) {
-        QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(object);
-        if (!d->transformData)
-            return;
-        object->setTransformations(QList<QGraphicsTransform *>());
-    }
-}
-
-/*!
-    \qmlproperty list<Object> Item::data
-    \default
-
-    The data property is allows you to freely mix visual children and resources
-    of an item.  If you assign a visual item to the data list it becomes
-    a child and if you assign any other object type, it is added as a resource.
-
-    So you can write:
-    \qml
-    Item {
-        Text {}
-        Rectangle {}
-        Script {}
-    }
-    \endqml
-
-    instead of:
-    \qml
-    Item {
-        children: [
-            Text {},
-            Rectangle {}
-        ]
-        resources: [
-            Script {}
-        ]
-    }
-    \endqml
-
-    data is a behind-the-scenes property: you should never need to explicitly
-    specify it.
- */
-
-/*!
-    \property QmlGraphicsItem::data
-    \internal
-*/
-
-/*! \internal */
-QmlListProperty<QObject> QmlGraphicsItem::data() 
-{
-    return QmlListProperty<QObject>(this, 0, QmlGraphicsItemPrivate::data_append);
-}
-
-/*!
-    \property QmlGraphicsItem::childrenRect
-    \brief The geometry of an item's children.
-
-    childrenRect provides an easy way to access the (collective) position and size of the item's children.
-*/
-QRectF QmlGraphicsItem::childrenRect()
-{
-    Q_D(QmlGraphicsItem);
-    if (!d->_contents) {
-        d->_contents = new QmlGraphicsContents;
-        d->_contents->setParent(this);
-        d->_contents->setItem(this);
-    }
-    return d->_contents->rectF();
-}
-
-bool QmlGraphicsItem::clip() const
-{
-    return flags() & ItemClipsChildrenToShape;
-}
-
-void QmlGraphicsItem::setClip(bool c)
-{
-    if (clip() == c)
-        return;
-    setFlag(ItemClipsChildrenToShape, c);
-    emit clipChanged();
-}
-
-/*!
-  \qmlproperty real Item::x
-  \qmlproperty real Item::y
-  \qmlproperty real Item::width
-  \qmlproperty real Item::height
-
-  Defines the item's position and size relative to its parent.
-
-  \qml
-  Item { x: 100; y: 100; width: 100; height: 100 }
-  \endqml
- */
-
-/*!
-  \property QmlGraphicsItem::width
-
-  Defines the item's width relative to its parent.
- */
-
-/*!
-  \property QmlGraphicsItem::height
-
-  Defines the item's height relative to its parent.
- */
-
-/*!
-  \qmlproperty real Item::z
-
-  Sets the stacking order of the item.  By default the stacking order is 0.
-
-  Items with a higher stacking value are drawn on top of items with a
-  lower stacking order.  Items with the same stacking value are drawn
-  bottom up in the order they appear.  Items with a negative stacking
-  value are drawn under their parent's content.
-
-  The following example shows the various effects of stacking order.
-
-  \table
-  \row
-  \o \image declarative-item_stacking1.png
-  \o Same \c z - later children above earlier children:
-  \qml
-  Item {
-      Rectangle {
-          color: "red"
-          width: 100; height: 100
-      }
-      Rectangle {
-          color: "blue"
-          x: 50; y: 50; width: 100; height: 100
-      }
-  }
-  \endqml
-  \row
-  \o \image declarative-item_stacking2.png
-  \o Higher \c z on top:
-  \qml
-  Item {
-      Rectangle {
-          z: 1
-          color: "red"
-          width: 100; height: 100
-      }
-      Rectangle {
-          color: "blue"
-          x: 50; y: 50; width: 100; height: 100
-      }
-  }
-  \endqml
-  \row
-  \o \image declarative-item_stacking3.png
-  \o Same \c z - children above parents:
-  \qml
-  Item {
-      Rectangle {
-          color: "red"
-          width: 100; height: 100
-          Rectangle {
-              color: "blue"
-              x: 50; y: 50; width: 100; height: 100
-          }
-      }
-  }
-  \endqml
-  \row
-  \o \image declarative-item_stacking4.png
-  \o Lower \c z below:
-  \qml
-  Item {
-      Rectangle {
-          color: "red"
-          width: 100; height: 100
-          Rectangle {
-              z: -1
-              color: "blue"
-              x: 50; y: 50; width: 100; height: 100
-          }
-      }
-  }
-  \endqml
-  \endtable
- */
-
-/*!
-    \qmlproperty bool Item::visible
-
-    Whether the item is visible. By default this is true.
-
-    \note visible is not linked to actual visibility; if an item
-    moves off screen, or the opacity changes to 0, this will
-    not affect the visible property.
-*/
-
-
-/*!
-  This function is called to handle this item's changes in
-  geometry from \a oldGeometry to \a newGeometry. If the two
-  geometries are the same, it doesn't do anything.
- */
-void QmlGraphicsItem::geometryChanged(const QRectF &newGeometry,
-                              const QRectF &oldGeometry)
-{
-    Q_D(QmlGraphicsItem);
-
-    if (d->_anchors)
-        d->_anchors->d_func()->updateMe();
-
-    if (transformOrigin() != QmlGraphicsItem::TopLeft)
-        setTransformOriginPoint(d->computeTransformOrigin());
-
-    if (newGeometry.x() != oldGeometry.x())
-        emit xChanged();
-    if (newGeometry.width() != oldGeometry.width())
-        emit widthChanged();
-    if (newGeometry.y() != oldGeometry.y())
-        emit yChanged();
-    if (newGeometry.height() != oldGeometry.height())
-        emit heightChanged();
-
-    for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
-        const QmlGraphicsItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
-        if (change.types & QmlGraphicsItemPrivate::Geometry)
-            change.listener->itemGeometryChanged(this, newGeometry, oldGeometry);
-    }
-}
-
-void QmlGraphicsItemPrivate::removeItemChangeListener(QmlGraphicsItemChangeListener *listener, ChangeTypes types)
-{
-    ChangeListener change(listener, types);
-    changeListeners.removeOne(change);
-}
-
-/*! \internal */
-void QmlGraphicsItem::keyPressEvent(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsItem);
-    if (d->keyHandler)
-        d->keyHandler->keyPressed(event);
-    else
-        event->ignore();
-}
-
-/*! \internal */
-void QmlGraphicsItem::keyReleaseEvent(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsItem);
-    if (d->keyHandler)
-        d->keyHandler->keyReleased(event);
-    else
-        event->ignore();
-}
-
-/*! \internal */
-void QmlGraphicsItem::inputMethodEvent(QInputMethodEvent *event)
-{
-    Q_D(QmlGraphicsItem);
-    if (d->keyHandler)
-        d->keyHandler->inputMethodEvent(event);
-    else
-        event->ignore();
-}
-
-/*! \internal */
-QVariant QmlGraphicsItem::inputMethodQuery(Qt::InputMethodQuery query) const
-{
-    Q_D(const QmlGraphicsItem);
-    QVariant v;
-    if (d->keyHandler)
-        v = d->keyHandler->inputMethodQuery(query);
-
-    if (!v.isValid())
-        v = QGraphicsObject::inputMethodQuery(query);
-
-    return v;
-}
-
-/*!
-    \internal
-*/
-QmlGraphicsAnchorLine QmlGraphicsItem::left() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->anchorLines()->left;
-}
-
-/*!
-    \internal
-*/
-QmlGraphicsAnchorLine QmlGraphicsItem::right() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->anchorLines()->right;
-}
-
-/*!
-    \internal
-*/
-QmlGraphicsAnchorLine QmlGraphicsItem::horizontalCenter() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->anchorLines()->hCenter;
-}
-
-/*!
-    \internal
-*/
-QmlGraphicsAnchorLine QmlGraphicsItem::top() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->anchorLines()->top;
-}
-
-/*!
-    \internal
-*/
-QmlGraphicsAnchorLine QmlGraphicsItem::bottom() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->anchorLines()->bottom;
-}
-
-/*!
-    \internal
-*/
-QmlGraphicsAnchorLine QmlGraphicsItem::verticalCenter() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->anchorLines()->vCenter;
-}
-
-
-/*!
-    \internal
-*/
-QmlGraphicsAnchorLine QmlGraphicsItem::baseline() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->anchorLines()->baseline;
-}
-
-/*!
-  \property QmlGraphicsItem::top
-  \internal
-*/
-
-/*!
-  \property QmlGraphicsItem::bottom
-  \internal
-*/
-
-/*!
-  \property QmlGraphicsItem::left
-  \internal
-*/
-
-/*!
-  \property QmlGraphicsItem::right
-  \internal
-*/
-
-/*!
-  \property QmlGraphicsItem::horizontalCenter
-  \internal
-*/
-
-/*!
-  \property QmlGraphicsItem::verticalCenter
-  \internal
-*/
-
-/*!
-  \qmlproperty AnchorLine Item::top
-  \qmlproperty AnchorLine Item::bottom
-  \qmlproperty AnchorLine Item::left
-  \qmlproperty AnchorLine Item::right
-  \qmlproperty AnchorLine Item::horizontalCenter
-  \qmlproperty AnchorLine Item::verticalCenter
-  \qmlproperty AnchorLine Item::baseline
-
-  The anchor lines of the item.
-
-  For more information see \l {anchor-layout}{Anchor Layouts}.
-*/
-
-/*!
-  \qmlproperty AnchorLine Item::anchors.top
-  \qmlproperty AnchorLine Item::anchors.bottom
-  \qmlproperty AnchorLine Item::anchors.left
-  \qmlproperty AnchorLine Item::anchors.right
-  \qmlproperty AnchorLine Item::anchors.horizontalCenter
-  \qmlproperty AnchorLine Item::anchors.verticalCenter
-  \qmlproperty AnchorLine Item::anchors.baseline
-
-  \qmlproperty Item Item::anchors.fill
-  \qmlproperty Item Item::anchors.centerIn
-
-  \qmlproperty real Item::anchors.margins
-  \qmlproperty real Item::anchors.topMargin
-  \qmlproperty real Item::anchors.bottomMargin
-  \qmlproperty real Item::anchors.leftMargin
-  \qmlproperty real Item::anchors.rightMargin
-  \qmlproperty real Item::anchors.horizontalCenterOffset
-  \qmlproperty real Item::anchors.verticalCenterOffset
-  \qmlproperty real Item::anchors.baselineOffset
-
-  Anchors provide a way to position an item by specifying its
-  relationship with other items.
-
-  Margins apply to top, bottom, left, right, and fill anchors.
-  The margins property can be used to set all of the various margins at once, to the same value.
-
-  Offsets apply for horizontal center, vertical center, and baseline anchors.
-
-  \table
-  \row
-  \o \image declarative-anchors_example.png
-  \o Text anchored to Image, horizontally centered and vertically below, with a margin.
-  \qml
-  Image { id: pic; ... }
-  Text {
-      id: label
-      anchors.horizontalCenter: pic.horizontalCenter
-      anchors.top: pic.bottom
-      anchors.topMargin: 5
-      ...
-  }
-  \endqml
-  \row
-  \o \image declarative-anchors_example2.png
-  \o
-  Left of Text anchored to right of Image, with a margin. The y
-  property of both defaults to 0.
-
-  \qml
-    Image { id: pic; ... }
-    Text {
-        id: label
-        anchors.left: pic.right
-        anchors.leftMargin: 5
-        ...
-    }
-  \endqml
-  \endtable
-
-  anchors.fill provides a convenient way for one item to have the
-  same geometry as another item, and is equivalent to connecting all
-  four directional anchors.
-
-  \note You can only anchor an item to siblings or a parent.
-
-  For more information see \l {anchor-layout}{Anchor Layouts}.
-*/
-
-/*!
-  \property QmlGraphicsItem::baselineOffset
-  \brief The position of the item's baseline in local coordinates.
-
-  The baseline of a Text item is the imaginary line on which the text
-  sits. Controls containing text usually set their baseline to the
-  baseline of their text.
-
-  For non-text items, a default baseline offset of 0 is used.
-*/
-qreal QmlGraphicsItem::baselineOffset() const
-{
-    Q_D(const QmlGraphicsItem);
-    if (!d->_baselineOffset.isValid()) {
-        return 0.0;
-    } else
-        return d->_baselineOffset;
-}
-
-void QmlGraphicsItem::setBaselineOffset(qreal offset)
-{
-    Q_D(QmlGraphicsItem);
-    if (offset == d->_baselineOffset)
-        return;
-
-    d->_baselineOffset = offset;
-    emit baselineOffsetChanged();
-
-    for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
-        const QmlGraphicsItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
-        if (change.types & QmlGraphicsItemPrivate::Geometry) {
-            QmlGraphicsAnchorsPrivate *anchor = change.listener->anchorPrivate();
-            if (anchor)
-                anchor->updateVerticalAnchors();
-        }
-    }
-}
-
-/*!
-  \qmlproperty real Item::rotation
-  This property holds the rotation of the item in degrees clockwise.
-
-  This specifies how many degrees to rotate the item around its transformOrigin.
-  The default rotation is 0 degrees (i.e. not rotated at all).
-
-  \table
-  \row
-  \o \image declarative-rotation.png
-  \o
-  \qml
-  Rectangle {
-      color: "blue"
-      width: 100; height: 100
-      Rectangle {
-          color: "red"
-          x: 25; y: 25; width: 50; height: 50
-          rotation: 30
-      }
-  }
-  \endqml
-  \endtable
-*/
-
-/*!
-  \qmlproperty real Item::scale
-  This property holds the scale of the item.
-
-  A scale of less than 1 means the item will be displayed smaller than
-  normal, and a scale of greater than 1 means the item will be
-  displayed larger than normal.  A negative scale means the item will
-  be mirrored.
-
-  By default, items are displayed at a scale of 1 (i.e. at their
-  normal size).
-
-  Scaling is from the item's transformOrigin.
-
-  \table
-  \row
-  \o \image declarative-scale.png
-  \o
-  \qml
-  Rectangle {
-      color: "blue"
-      width: 100; height: 100
-      Rectangle {
-          color: "green"
-          width: 25; height: 25
-      }
-      Rectangle {
-          color: "red"
-          x: 25; y: 25; width: 50; height: 50
-          scale: 1.4
-      }
-  }
-  \endqml
-  \endtable
-*/
-
-/*!
-  \qmlproperty real Item::opacity
-
-  The opacity of the item.  Opacity is specified as a number between 0
-  (fully transparent) and 1 (fully opaque).  The default is 1.
-
-  Opacity is an \e inherited attribute.  That is, the opacity is
-  also applied individually to child items.  In almost all cases this
-  is what you want.  If you can spot the issue in the following
-  example, you might need to use an \l Opacity effect instead.
-
-  \table
-  \row
-  \o \image declarative-item_opacity1.png
-  \o
-  \qml
-    Item {
-        Rectangle {
-            color: "red"
-            width: 100; height: 100
-            Rectangle {
-                color: "blue"
-                x: 50; y: 50; width: 100; height: 100
-            }
-        }
-    }
-  \endqml
-  \row
-  \o \image declarative-item_opacity2.png
-  \o
-  \qml
-    Item {
-        Rectangle {
-            opacity: 0.5
-            color: "red"
-            width: 100; height: 100
-            Rectangle {
-                color: "blue"
-                x: 50; y: 50; width: 100; height: 100
-            }
-        }
-    }
-  \endqml
-  \endtable
-*/
-
-/*!
-  Returns a value indicating whether mouse input should
-  remain with this item exclusively.
-
-  \sa setKeepMouseGrab()
- */
-bool QmlGraphicsItem::keepMouseGrab() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->_keepMouse;
-}
-
-/*!
-  The flag indicating whether the mouse should remain
-  with this item is set to \a keep.
-
-  This is useful for items that wish to grab and keep mouse
-  interaction following a predefined gesture.  For example,
-  an item that is interested in horizontal mouse movement
-  may set keepMouseGrab to true once a threshold has been
-  exceeded.  Once keepMouseGrab has been set to true, filtering
-  items will not react to mouse events.
-
-  If the item does not indicate that it wishes to retain mouse grab,
-  a filtering item may steal the grab. For example, Flickable may attempt
-  to steal a mouse grab if it detects that the user has begun to
-  move the viewport.
-
-  \sa keepMouseGrab()
- */
-void QmlGraphicsItem::setKeepMouseGrab(bool keep)
-{
-    Q_D(QmlGraphicsItem);
-    d->_keepMouse = keep;
-}
-
-/*!
-  \internal
-
-  This function emits the \e focusChanged signal.
-
-  Subclasses overriding this function should call up
-  to their base class.
-*/
-void QmlGraphicsItem::focusChanged(bool flag)
-{
-    Q_UNUSED(flag);
-    emit focusChanged();
-}
-
-/*! \internal */
-QmlListProperty<QmlGraphicsItem> QmlGraphicsItem::fxChildren()
-{
-    return QmlListProperty<QmlGraphicsItem>(this, 0, QmlGraphicsItemPrivate::children_append,
-                                                     QmlGraphicsItemPrivate::children_count, 
-                                                     QmlGraphicsItemPrivate::children_at); 
-}
-
-/*! \internal */
-QmlListProperty<QObject> QmlGraphicsItem::resources()
-{
-    return QmlListProperty<QObject>(this, 0, QmlGraphicsItemPrivate::resources_append, 
-                                             QmlGraphicsItemPrivate::resources_count, 
-                                             QmlGraphicsItemPrivate::resources_at); 
-}
-
-/*!
-  \qmlproperty list<State> Item::states
-  This property holds a list of states defined by the item.
-
-  \qml
-  Item {
-    states: [
-      State { ... },
-      State { ... }
-      ...
-    ]
-  }
-  \endqml
-
-  \sa {qmlstate}{States}
-*/
-
-/*!
-  \property QmlGraphicsItem::states
-  \internal
-*/
-/*! \internal */
-QmlListProperty<QmlState> QmlGraphicsItem::states()
-{
-    Q_D(QmlGraphicsItem);
-    return d->states()->statesProperty();
-}
-
-/*!
-  \qmlproperty list<Transition> Item::transitions
-  This property holds a list of transitions defined by the item.
-
-  \qml
-  Item {
-    transitions: [
-      Transition { ... },
-      Transition { ... }
-      ...
-    ]
-  }
-  \endqml
-
-  \sa {state-transitions}{Transitions}
-*/
-
-/*!
-  \property QmlGraphicsItem::transitions
-  \internal
-*/
-
-/*! \internal */
-QmlListProperty<QmlTransition> QmlGraphicsItem::transitions()
-{
-    Q_D(QmlGraphicsItem);
-    return d->states()->transitionsProperty();
-}
-
-/*
-  \qmlproperty list<Filter> Item::filter
-  This property holds a list of graphical filters to be applied to the item.
-
-  \l {Filter}{Filters} include things like \l {Blur}{blurring}
-  the item, or giving it a \l Reflection.  Some
-  filters may not be available on all canvases; if a filter is not
-  available on a certain canvas, it will simply not be applied for
-  that canvas (but the QML will still be considered valid).
-
-  \qml
-  Item {
-    filter: [
-      Blur { ... },
-      Relection { ... }
-      ...
-    ]
-  }
-  \endqml
-*/
-
-/*!
-  \qmlproperty bool Item::clip
-  This property holds whether clipping is enabled.
-
-  if clipping is enabled, an item will clip its own painting, as well
-  as the painting of its children, to its bounding rectangle.
-
-  Non-rectangular clipping regions are not supported for performance reasons.
-*/
-
-/*!
-  \property QmlGraphicsItem::clip
-  This property holds whether clipping is enabled.
-
-  if clipping is enabled, an item will clip its own painting, as well
-  as the painting of its children, to its bounding rectangle.
-
-  Non-rectangular clipping regions are not supported for performance reasons.
-*/
-
-/*!
-  \qmlproperty string Item::state
-
-  This property holds the name of the current state of the item.
-
-  This property is often used in scripts to change between states. For
-  example:
-
-  \qml
-    Script {
-        function toggle() {
-            if (button.state == 'On')
-                button.state = 'Off';
-            else
-                button.state = 'On';
-        }
-    }
-  \endqml
-
-  If the item is in its base state (i.e. no explicit state has been
-  set), \c state will be a blank string. Likewise, you can return an
-  item to its base state by setting its current state to \c ''.
-
-  \sa {qmlstates}{States}
-*/
-
-/*!
-  \property QmlGraphicsItem::state
-  \internal
-*/
-
-/*! \internal */
-QString QmlGraphicsItem::state() const
-{
-    Q_D(const QmlGraphicsItem);
-    if (!d->_stateGroup)
-        return QString();
-    else
-        return d->_stateGroup->state();
-}
-
-/*! \internal */
-void QmlGraphicsItem::setState(const QString &state)
-{
-    Q_D(QmlGraphicsItem);
-    d->states()->setState(state);
-}
-
-/*!
-  \qmlproperty list<Transform> Item::transform
-  This property holds the list of transformations to apply.
-
-  For more information see \l Transform.
-*/
-
-/*!
-  \property QmlGraphicsItem::transform
-  \internal
-*/
-
-/*! \internal */
-QmlListProperty<QGraphicsTransform> QmlGraphicsItem::transform()
-{
-    Q_D(QmlGraphicsItem);
-    return QmlListProperty<QGraphicsTransform>(this, 0, d->transform_append, d->transform_count,
-                                               d->transform_at, d->transform_clear);
-}
-
-/*!
-  \internal
-
-  classBegin() is called when the item is constructed, but its
-  properties have not yet been set.
-
-  \sa componentComplete(), isComponentComplete()
-*/
-void QmlGraphicsItem::classBegin()
-{
-    Q_D(QmlGraphicsItem);
-    d->_componentComplete = false;
-    if (d->_stateGroup)
-        d->_stateGroup->classBegin();
-    if (d->_anchors)
-        d->_anchors->classBegin();
-}
-
-/*!
-  \internal
-
-  componentComplete() is called when all items in the component
-  have been constructed.  It is often desireable to delay some
-  processing until the component is complete an all bindings in the
-  component have been resolved.
-*/
-void QmlGraphicsItem::componentComplete()
-{
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::ItemComponentComplete> cc;
-#endif
-
-    Q_D(QmlGraphicsItem);
-    d->_componentComplete = true;
-    if (d->_stateGroup)
-        d->_stateGroup->componentComplete();
-    if (d->_anchors) {
-        d->_anchors->componentComplete();
-        d->_anchors->d_func()->updateOnComplete();
-    }
-    if (d->keyHandler)
-        d->keyHandler->componentComplete();
-}
-
-QmlStateGroup *QmlGraphicsItemPrivate::states()
-{
-    Q_Q(QmlGraphicsItem);
-    if (!_stateGroup) {
-        _stateGroup = new QmlStateGroup;
-        if (!_componentComplete)
-            _stateGroup->classBegin();
-        QObject::connect(_stateGroup, SIGNAL(stateChanged(QString)),
-                         q, SIGNAL(stateChanged(QString)));
-    }
-
-    return _stateGroup;
-}
-
-QmlGraphicsItemPrivate::AnchorLines::AnchorLines(QmlGraphicsItem *q)
-{
-    left.item = q;
-    left.anchorLine = QmlGraphicsAnchorLine::Left;
-    right.item = q;
-    right.anchorLine = QmlGraphicsAnchorLine::Right;
-    hCenter.item = q;
-    hCenter.anchorLine = QmlGraphicsAnchorLine::HCenter;
-    top.item = q;
-    top.anchorLine = QmlGraphicsAnchorLine::Top;
-    bottom.item = q;
-    bottom.anchorLine = QmlGraphicsAnchorLine::Bottom;
-    vCenter.item = q;
-    vCenter.anchorLine = QmlGraphicsAnchorLine::VCenter;
-    baseline.item = q;
-    baseline.anchorLine = QmlGraphicsAnchorLine::Baseline;
-}
-
-QPointF QmlGraphicsItemPrivate::computeTransformOrigin() const
-{
-    Q_Q(const QmlGraphicsItem);
-
-    QRectF br = q->boundingRect();
-
-    switch(origin) {
-    default:
-    case QmlGraphicsItem::TopLeft:
-        return QPointF(0, 0);
-    case QmlGraphicsItem::Top:
-        return QPointF(br.width() / 2., 0);
-    case QmlGraphicsItem::TopRight:
-        return QPointF(br.width(), 0);
-    case QmlGraphicsItem::Left:
-        return QPointF(0, br.height() / 2.);
-    case QmlGraphicsItem::Center:
-        return QPointF(br.width() / 2., br.height() / 2.);
-    case QmlGraphicsItem::Right:
-        return QPointF(br.width(), br.height() / 2.);
-    case QmlGraphicsItem::BottomLeft:
-        return QPointF(0, br.height());
-    case QmlGraphicsItem::Bottom:
-        return QPointF(br.width() / 2., br.height());
-    case QmlGraphicsItem::BottomRight:
-        return QPointF(br.width(), br.height());
-    }
-}
-
-/*! \internal */
-bool QmlGraphicsItem::sceneEvent(QEvent *event)
-{
-    bool rv = QGraphicsItem::sceneEvent(event);
-
-    if (event->type() == QEvent::FocusIn ||
-        event->type() == QEvent::FocusOut) {
-        focusChanged(hasFocus());
-    }
-
-    return rv;
-}
-
-/*! \internal */
-QVariant QmlGraphicsItem::itemChange(GraphicsItemChange change,
-                                       const QVariant &value)
-{
-    Q_D(const QmlGraphicsItem);
-    switch (change) {
-    case ItemParentHasChanged:
-        emit parentChanged();
-        break;
-    case ItemChildAddedChange:
-    case ItemChildRemovedChange:
-        emit childrenChanged();
-        break;
-    case ItemVisibleHasChanged: {
-            for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
-                const QmlGraphicsItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
-                if (change.types & QmlGraphicsItemPrivate::Visibility) {
-                    change.listener->itemVisibilityChanged(this);
-                }
-            }
-        }
-        break;
-    case ItemOpacityHasChanged: {
-            for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
-                const QmlGraphicsItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
-                if (change.types & QmlGraphicsItemPrivate::Opacity) {
-                    change.listener->itemOpacityChanged(this);
-                }
-            }
-        }
-        break;
-    default:
-        break;
-    }
-
-    return QGraphicsItem::itemChange(change, value);
-}
-
-/*! \internal */
-QRectF QmlGraphicsItem::boundingRect() const
-{
-    Q_D(const QmlGraphicsItem);
-    return QRectF(0, 0, d->width, d->height);
-}
-
-/*!
-    \enum QmlGraphicsItem::TransformOrigin
-
-    Controls the point about which simple transforms like scale apply.
-
-    \value TopLeft The top-left corner of the item.
-    \value Top The center point of the top of the item.
-    \value TopRight The top-right corner of the item.
-    \value Left The left most point of the vertical middle.
-    \value Center The center of the item.
-    \value Right The right most point of the vertical middle.
-    \value BottomLeft The bottom-left corner of the item.
-    \value Bottom The center point of the bottom of the item.
-    \value BottomRight The bottom-right corner of the item.
-*/
-
-/*!
-    Returns the current transform origin.
-*/
-QmlGraphicsItem::TransformOrigin QmlGraphicsItem::transformOrigin() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->origin;
-}
-
-/*!
-    Set the transform \a origin.
-*/
-void QmlGraphicsItem::setTransformOrigin(TransformOrigin origin)
-{
-    Q_D(QmlGraphicsItem);
-    if (origin != d->origin) {
-        d->origin = origin;
-        QGraphicsItem::setTransformOriginPoint(d->computeTransformOrigin());
-        emit transformOriginChanged(d->origin);
-    }
-}
-
-/*!
-    \property QmlGraphicsItem::smooth
-    \brief whether the item is smoothly transformed.
-
-    This property is provided purely for the purpose of optimization. Turning
-    smooth transforms off is faster, but looks worse; turning smooth
-    transformations on is slower, but looks better.
-
-    By default smooth transformations are off.
-*/
-
-/*!
-    Returns true if the item should be drawn with antialiasing and
-    smooth pixmap filtering, false otherwise.
-
-    The default is false.
-
-    \sa setSmooth()
-*/
-bool QmlGraphicsItem::smooth() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->smooth;
-}
-
-/*!
-    Sets whether the item should be drawn with antialiasing and
-    smooth pixmap filtering to \a smooth.
-
-    \sa smooth()
-*/
-void QmlGraphicsItem::setSmooth(bool smooth)
-{
-    Q_D(QmlGraphicsItem);
-    if (d->smooth == smooth)
-        return;
-    d->smooth = smooth;
-    emit smoothChanged();
-    update();
-}
-
-qreal QmlGraphicsItem::width() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->width;
-}
-
-void QmlGraphicsItem::setWidth(qreal w)
-{
-    Q_D(QmlGraphicsItem);
-    if (qIsNaN(w))
-        return;
-
-    d->widthValid = true;
-    if (d->width == w)
-        return;
-
-    qreal oldWidth = d->width;
-
-    prepareGeometryChange();
-    d->width = w;
-    update();
-
-    geometryChanged(QRectF(x(), y(), width(), height()),
-                    QRectF(x(), y(), oldWidth, height()));
-}
-
-void QmlGraphicsItem::resetWidth()
-{
-    Q_D(QmlGraphicsItem);
-    d->widthValid = false;
-    setImplicitWidth(implicitWidth());
-}
-
-/*!
-    Returns the width of the item that is implied by other properties that determine the content.
-*/
-qreal QmlGraphicsItem::implicitWidth() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->implicitWidth;
-}
-
-/*!
-    Sets the implied width of the item to \a w.
-    This is the width implied by other properties that determine the content.
-*/
-void QmlGraphicsItem::setImplicitWidth(qreal w)
-{
-    Q_D(QmlGraphicsItem);
-    d->implicitWidth = w;
-    if (d->width == w || widthValid())
-        return;
-
-    qreal oldWidth = d->width;
-
-    prepareGeometryChange();
-    d->width = w;
-    update();
-
-    geometryChanged(QRectF(x(), y(), width(), height()),
-                    QRectF(x(), y(), oldWidth, height()));
-}
-
-/*!
-    Returns whether the width property has been set explicitly.
-*/
-bool QmlGraphicsItem::widthValid() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->widthValid;
-}
-
-qreal QmlGraphicsItem::height() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->height;
-}
-
-void QmlGraphicsItem::setHeight(qreal h)
-{
-    Q_D(QmlGraphicsItem);
-    if (qIsNaN(h))
-        return;
-
-    d->heightValid = true;
-    if (d->height == h)
-        return;
-
-    qreal oldHeight = d->height;
-
-    prepareGeometryChange();
-    d->height = h;
-    update();
-
-    geometryChanged(QRectF(x(), y(), width(), height()),
-                    QRectF(x(), y(), width(), oldHeight));
-}
-
-void QmlGraphicsItem::resetHeight()
-{
-    Q_D(QmlGraphicsItem);
-    d->heightValid = false;
-    setImplicitHeight(implicitHeight());
-}
-
-/*!
-    Returns the height of the item that is implied by other properties that determine the content.
-*/
-qreal QmlGraphicsItem::implicitHeight() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->implicitHeight;
-}
-
-/*!
-    Sets the implied height of the item to \a h.
-    This is the height implied by other properties that determine the content.
-*/
-void QmlGraphicsItem::setImplicitHeight(qreal h)
-{
-    Q_D(QmlGraphicsItem);
-    d->implicitHeight = h;
-    if (d->height == h || heightValid())
-        return;
-
-    qreal oldHeight = d->height;
-
-    prepareGeometryChange();
-    d->height = h;
-    update();
-
-    geometryChanged(QRectF(x(), y(), width(), height()),
-                    QRectF(x(), y(), width(), oldHeight));
-}
-
-/*!
-    Returns whether the height property has been set explicitly.
-*/
-bool QmlGraphicsItem::heightValid() const
-{
-    Q_D(const QmlGraphicsItem);
-    return d->heightValid;
-}
-
-/*!
-  \qmlproperty bool Item::wantsFocus
-
-  This property indicates whether the item has has an active focus request.
-
-  \sa {qmlfocus}{Keyboard Focus}
-*/
-
-/*! \internal */
-bool QmlGraphicsItem::wantsFocus() const
-{
-    return focusItem() != 0;
-}
-
-/*!
-  \qmlproperty bool Item::focus
-  This property indicates whether the item has keyboard input focus. Set this
-  property to true to request focus.
-
-  \sa {qmlfocus}{Keyboard Focus}
-*/
-
-/*! \internal */
-bool QmlGraphicsItem::hasFocus() const
-{
-    return QGraphicsItem::hasFocus();
-}
-
-/*! \internal */
-void QmlGraphicsItem::setFocus(bool focus)
-{
-    if (focus)
-        QGraphicsItem::setFocus(Qt::OtherFocusReason);
-    else
-        QGraphicsItem::clearFocus();
-}
-
-/*!
-    \reimp
-    \internal
-*/
-void QmlGraphicsItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
-{
-}
-
-/*!
-    \reimp
-    \internal
-*/
-bool QmlGraphicsItem::event(QEvent *ev)
-{
-    return QGraphicsObject::event(ev);
-}
-
-QDebug operator<<(QDebug debug, QmlGraphicsItem *item)
-{
-    if (!item) {
-        debug << "QmlGraphicsItem(0)";
-        return debug;
-    }
-
-    debug << item->metaObject()->className() << "(this =" << ((void*)item)
-          << ", parent =" << ((void*)item->parentItem())
-          << ", geometry =" << QRectF(item->pos(), QSizeF(item->width(), item->height()))
-          << ", z =" << item->zValue() << ')';
-    return debug;
-}
-
-int QmlGraphicsItemPrivate::consistentTime = -1;
-void QmlGraphicsItemPrivate::setConsistentTime(int t)
-{
-    consistentTime = t;
-}
-
-QTime QmlGraphicsItemPrivate::currentTime()
-{
-    if (consistentTime == -1)
-        return QTime::currentTime();
-    else
-        return QTime(0, 0).addMSecs(consistentTime);
-}
-
-void QmlGraphicsItemPrivate::start(QTime &t)
-{
-    t = currentTime();
-}
-
-int QmlGraphicsItemPrivate::elapsed(QTime &t)
-{
-    int n = t.msecsTo(currentTime());
-    if (n < 0)                                // passed midnight
-        n += 86400 * 1000;
-    return n;
-}
-
-int QmlGraphicsItemPrivate::restart(QTime &t)
-{
-    QTime time = currentTime();
-    int n = t.msecsTo(time);
-    if (n < 0)                                // passed midnight
-        n += 86400*1000;
-    t = time;
-    return n;
-}
-
-QT_END_NAMESPACE
-
-#include <moc_qmlgraphicsitem.cpp>
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.h b/src/declarative/graphicsitems/qmlgraphicsitem.h
deleted file mode 100644
index 891fc88..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsitem.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSITEM_H
-#define QMLGRAPHICSITEM_H
-
-#include <qml.h>
-#include <qmlcomponent.h>
-
-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtGui/qgraphicsitem.h>
-#include <QtGui/qgraphicstransform.h>
-#include <QtGui/qfont.h>
-#include <QtGui/qaction.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlState;
-class QmlGraphicsAnchorLine;
-class QmlTransition;
-class QmlGraphicsKeyEvent;
-class QmlGraphicsAnchors;
-class QmlGraphicsItemPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsItem : public QGraphicsObject, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlParserStatus)
-
-    Q_PROPERTY(QmlGraphicsItem * parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL)
-    Q_PROPERTY(QmlListProperty<QObject> data READ data DESIGNABLE false)
-    Q_PROPERTY(QmlListProperty<QmlGraphicsItem> children READ fxChildren DESIGNABLE false NOTIFY childrenChanged)
-    Q_PROPERTY(QmlListProperty<QObject> resources READ resources DESIGNABLE false)
-    Q_PROPERTY(QmlListProperty<QmlState> states READ states DESIGNABLE false)
-    Q_PROPERTY(QmlListProperty<QmlTransition> transitions READ transitions DESIGNABLE false)
-    Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
-    Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged RESET resetWidth FINAL)
-    Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY heightChanged RESET resetHeight FINAL)
-    Q_PROPERTY(QRectF childrenRect READ childrenRect NOTIFY childrenRectChanged DESIGNABLE false FINAL)
-    Q_PROPERTY(QmlGraphicsAnchors * anchors READ anchors DESIGNABLE false CONSTANT FINAL)
-    Q_PROPERTY(QmlGraphicsAnchorLine left READ left CONSTANT FINAL)
-    Q_PROPERTY(QmlGraphicsAnchorLine right READ right CONSTANT FINAL)
-    Q_PROPERTY(QmlGraphicsAnchorLine horizontalCenter READ horizontalCenter CONSTANT FINAL)
-    Q_PROPERTY(QmlGraphicsAnchorLine top READ top CONSTANT FINAL)
-    Q_PROPERTY(QmlGraphicsAnchorLine bottom READ bottom CONSTANT FINAL)
-    Q_PROPERTY(QmlGraphicsAnchorLine verticalCenter READ verticalCenter CONSTANT FINAL)
-    Q_PROPERTY(QmlGraphicsAnchorLine baseline READ baseline CONSTANT FINAL)
-    Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged)
-    Q_PROPERTY(bool clip READ clip WRITE setClip NOTIFY clipChanged) // ### move to QGI/QGO, NOTIFY
-    Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged FINAL)
-    Q_PROPERTY(bool wantsFocus READ wantsFocus NOTIFY wantsFocusChanged)
-    Q_PROPERTY(QmlListProperty<QGraphicsTransform> transform READ transform DESIGNABLE false FINAL)
-    Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin NOTIFY transformOriginChanged)
-    Q_PROPERTY(bool smooth READ smooth WRITE setSmooth NOTIFY smoothChanged)
-    Q_PROPERTY(QGraphicsEffect *effect READ graphicsEffect WRITE setGraphicsEffect)
-    Q_ENUMS(TransformOrigin)
-    Q_CLASSINFO("DefaultProperty", "data")
-
-public:
-    enum TransformOrigin {
-        TopLeft, Top, TopRight,
-        Left, Center, Right,
-        BottomLeft, Bottom, BottomRight
-    };
-
-    QmlGraphicsItem(QmlGraphicsItem *parent = 0);
-    virtual ~QmlGraphicsItem();
-
-    QmlGraphicsItem *parentItem() const;
-    void setParentItem(QmlGraphicsItem *parent);
-    void setParent(QmlGraphicsItem *parent) { setParentItem(parent); }
-
-    QmlListProperty<QObject> data();
-    QmlListProperty<QmlGraphicsItem> fxChildren();
-    QmlListProperty<QObject> resources();
-
-    QmlGraphicsAnchors *anchors();
-    QRectF childrenRect();
-
-    bool clip() const;
-    void setClip(bool);
-
-    QmlListProperty<QmlState> states();
-    QmlListProperty<QmlTransition> transitions();
-
-    QString state() const;
-    void setState(const QString &);
-
-    qreal baselineOffset() const;
-    void setBaselineOffset(qreal);
-
-    QmlListProperty<QGraphicsTransform> transform();
-
-    qreal width() const;
-    void setWidth(qreal);
-    void resetWidth();
-    qreal implicitWidth() const;
-
-    qreal height() const;
-    void setHeight(qreal);
-    void resetHeight();
-    qreal implicitHeight() const;
-
-    TransformOrigin transformOrigin() const;
-    void setTransformOrigin(TransformOrigin);
-
-    bool smooth() const;
-    void setSmooth(bool);
-
-    QRectF boundingRect() const;
-    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-
-    bool wantsFocus() const;
-    bool hasFocus() const;
-    void setFocus(bool);
-
-    bool keepMouseGrab() const;
-    void setKeepMouseGrab(bool);
-
-    QmlGraphicsAnchorLine left() const;
-    QmlGraphicsAnchorLine right() const;
-    QmlGraphicsAnchorLine horizontalCenter() const;
-    QmlGraphicsAnchorLine top() const;
-    QmlGraphicsAnchorLine bottom() const;
-    QmlGraphicsAnchorLine verticalCenter() const;
-    QmlGraphicsAnchorLine baseline() const;
-
-Q_SIGNALS:
-    void widthChanged();
-    void heightChanged();
-    void childrenChanged();
-    void childrenRectChanged();
-    void baselineOffsetChanged();
-    void stateChanged(const QString &);
-    void focusChanged();
-    void wantsFocusChanged();
-    void parentChanged();
-    void transformOriginChanged(TransformOrigin);
-    void smoothChanged();
-    void clipChanged();
-
-protected:
-    bool isComponentComplete() const;
-    virtual bool sceneEvent(QEvent *);
-    virtual bool event(QEvent *);
-    virtual QVariant itemChange(GraphicsItemChange, const QVariant &);
-
-    void setImplicitWidth(qreal);
-    bool widthValid() const; // ### better name?
-    void setImplicitHeight(qreal);
-    bool heightValid() const; // ### better name?
-
-    virtual void classBegin();
-    virtual void componentComplete();
-    virtual void focusChanged(bool);
-    virtual void keyPressEvent(QKeyEvent *event);
-    virtual void keyReleaseEvent(QKeyEvent *event);
-    virtual void inputMethodEvent(QInputMethodEvent *);
-    virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
-    virtual void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry);
-
-protected:
-    QmlGraphicsItem(QmlGraphicsItemPrivate &dd, QmlGraphicsItem *parent = 0);
-
-private:
-    friend class QmlStatePrivate;
-    friend class QmlGraphicsAnchors;
-    Q_DISABLE_COPY(QmlGraphicsItem)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsItem)
-};
-
-template<typename T>
-        T qobject_cast(QGraphicsObject *o)
-{
-    QObject *obj = o;
-    return qobject_cast<T>(obj);
-}
-
-// ### move to QGO
-template<typename T>
-T qobject_cast(QGraphicsItem *item)
-{
-    if (!item) return 0;
-    QObject *o = item->toGraphicsObject();
-    return qobject_cast<T>(o);
-}
-
-QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QmlGraphicsItem *item);
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsItem)
-QML_DECLARE_TYPE(QGraphicsTransform)
-QML_DECLARE_TYPE(QGraphicsScale)
-QML_DECLARE_TYPE(QGraphicsRotation)
-QML_DECLARE_TYPE(QAction)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSITEM_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
deleted file mode 100644
index 4860b83..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h
+++ /dev/null
@@ -1,471 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSITEM_P_H
-#define QMLGRAPHICSITEM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsitem.h"
-
-#include "qmlgraphicsanchors_p.h"
-#include "qmlgraphicsanchors_p_p.h"
-#include "qmlgraphicsitemchangelistener_p.h"
-#include <private/qpodvector_p.h>
-
-#include "../util/qmlstate_p.h"
-#include "../util/qmlnullablevalue_p_p.h"
-#include <qml.h>
-#include <qmlcontext.h>
-
-#include <QtCore/qlist.h>
-#include <QtCore/qdebug.h>
-
-#include <private/qgraphicsitem_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QNetworkReply;
-class QmlGraphicsItemKeyFilter;
-
-//### merge into private?
-class QmlGraphicsContents : public QObject
-{
-    Q_OBJECT
-public:
-    QmlGraphicsContents();
-
-    QRectF rectF() const;
-
-    void setItem(QmlGraphicsItem *item);
-
-public Q_SLOTS:
-    void calcHeight();
-    void calcWidth();
-
-Q_SIGNALS:
-    void rectChanged();
-
-private:
-    QmlGraphicsItem *m_item;
-    qreal m_x;
-    qreal m_y;
-    qreal m_width;
-    qreal m_height;
-};
-
-class QmlGraphicsItemPrivate : public QGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsItem)
-
-public:
-    QmlGraphicsItemPrivate()
-    : _anchors(0), _contents(0),
-      _baselineOffset(0),
-      _anchorLines(0),
-      _stateGroup(0), origin(QmlGraphicsItem::Center),
-      widthValid(false), heightValid(false),
-      _componentComplete(true), _keepMouse(false),
-      smooth(false), keyHandler(0),
-      width(0), height(0), implicitWidth(0), implicitHeight(0)
-    {
-        QGraphicsItemPrivate::acceptedMouseButtons = 0;
-        QGraphicsItemPrivate::flags = QGraphicsItem::GraphicsItemFlags(
-                                      QGraphicsItem::ItemHasNoContents
-                                      | QGraphicsItem::ItemIsFocusable
-                                      | QGraphicsItem::ItemNegativeZStacksBehindParent);
-
-    }
-
-    void init(QmlGraphicsItem *parent)
-    {
-        Q_Q(QmlGraphicsItem);
-
-        if (parent)
-            q->setParentItem(parent);
-        _baselineOffset.invalidate();
-        mouseSetsFocus = false;
-    }
-
-    QString _id;
-
-    // data property
-    static void data_append(QmlListProperty<QObject> *, QObject *);
-
-    // resources property
-    static QObject *resources_at(QmlListProperty<QObject> *, int);
-    static void resources_append(QmlListProperty<QObject> *, QObject *);
-    static int resources_count(QmlListProperty<QObject> *);
-
-    // children property
-    static QmlGraphicsItem *children_at(QmlListProperty<QmlGraphicsItem> *, int);
-    static void children_append(QmlListProperty<QmlGraphicsItem> *, QmlGraphicsItem *);
-    static int children_count(QmlListProperty<QmlGraphicsItem> *);
-
-    // transform property
-    static int transform_count(QmlListProperty<QGraphicsTransform> *list);
-    static void transform_append(QmlListProperty<QGraphicsTransform> *list, QGraphicsTransform *);
-    static QGraphicsTransform *transform_at(QmlListProperty<QGraphicsTransform> *list, int);
-    static void transform_clear(QmlListProperty<QGraphicsTransform> *list);
-
-    QmlGraphicsAnchors *anchors() {
-        if (!_anchors) {
-            Q_Q(QmlGraphicsItem);
-            _anchors = new QmlGraphicsAnchors(q);
-            if (!_componentComplete)
-                _anchors->classBegin();
-        }
-        return _anchors;
-    }
-    QmlGraphicsAnchors *_anchors;
-    QmlGraphicsContents *_contents;
-
-    QmlNullableValue<qreal> _baselineOffset;
-
-    struct AnchorLines {
-        AnchorLines(QmlGraphicsItem *);
-        QmlGraphicsAnchorLine left;
-        QmlGraphicsAnchorLine right;
-        QmlGraphicsAnchorLine hCenter;
-        QmlGraphicsAnchorLine top;
-        QmlGraphicsAnchorLine bottom;
-        QmlGraphicsAnchorLine vCenter;
-        QmlGraphicsAnchorLine baseline;
-    };
-    mutable AnchorLines *_anchorLines;
-    AnchorLines *anchorLines() const {
-        Q_Q(const QmlGraphicsItem);
-        if (!_anchorLines) _anchorLines =
-            new AnchorLines(const_cast<QmlGraphicsItem *>(q));
-        return _anchorLines;
-    }
-
-    enum ChangeType {
-        Geometry = 0x01,
-        SiblingOrder = 0x02,
-        Visibility = 0x04,
-        Opacity = 0x08,
-        Destroyed = 0x10
-    };
-
-    Q_DECLARE_FLAGS(ChangeTypes, ChangeType)
-
-    struct ChangeListener {
-        ChangeListener(QmlGraphicsItemChangeListener *l, QmlGraphicsItemPrivate::ChangeTypes t) : listener(l), types(t) {}
-        QmlGraphicsItemChangeListener *listener;
-        QmlGraphicsItemPrivate::ChangeTypes types;
-        bool operator==(const ChangeListener &other) const { return listener == other.listener && types == other.types; }
-    };
-
-    void addItemChangeListener(QmlGraphicsItemChangeListener *listener, ChangeTypes types) {
-        changeListeners.append(ChangeListener(listener, types));
-    }
-    void removeItemChangeListener(QmlGraphicsItemChangeListener *, ChangeTypes types);
-    QPODVector<ChangeListener,4> changeListeners;
-
-    QmlStateGroup *states();
-    QmlStateGroup *_stateGroup;
-
-    QmlGraphicsItem::TransformOrigin origin:4;
-    bool widthValid:1;
-    bool heightValid:1;
-    bool _componentComplete:1;
-    bool _keepMouse:1;
-    bool smooth:1;
-
-    QmlGraphicsItemKeyFilter *keyHandler;
-
-    qreal width;
-    qreal height;
-    qreal implicitWidth;
-    qreal implicitHeight;
-
-    QPointF computeTransformOrigin() const;
-
-    virtual void setPosHelper(const QPointF &pos)
-    {
-        Q_Q(QmlGraphicsItem);
-        QRectF oldGeometry(this->pos.x(), this->pos.y(), width, height);
-        QGraphicsItemPrivate::setPosHelper(pos);
-        q->geometryChanged(QRectF(this->pos.x(), this->pos.y(), width, height), oldGeometry);
-    }
-
-    // Reimplemented from QGraphicsItemPrivate
-    virtual void subFocusItemChange()
-    {
-        emit q_func()->wantsFocusChanged();
-    }
-
-    // Reimplemented from QGraphicsItemPrivate
-    virtual void siblingOrderChange()
-    {
-        Q_Q(QmlGraphicsItem);
-        for(int ii = 0; ii < changeListeners.count(); ++ii) {
-            const QmlGraphicsItemPrivate::ChangeListener &change = changeListeners.at(ii);
-            if (change.types & QmlGraphicsItemPrivate::SiblingOrder) {
-                change.listener->itemSiblingOrderChanged(q);
-            }
-        }
-    }
-
-    static int consistentTime;
-    static QTime currentTime();
-    static void Q_DECLARATIVE_EXPORT setConsistentTime(int t);
-    static void start(QTime &);
-    static int elapsed(QTime &);
-    static int restart(QTime &);
-};
-
-/*
-    Key filters can be installed on a QmlGraphicsItem, but not removed.  Currently they
-    are only used by attached objects (which are only destroyed on Item
-    destruction), so this isn't a problem.  If in future this becomes any form
-    of public API, they will have to support removal too.
-*/
-class QmlGraphicsItemKeyFilter
-{
-public:
-    QmlGraphicsItemKeyFilter(QmlGraphicsItem * = 0);
-    virtual ~QmlGraphicsItemKeyFilter();
-
-    virtual void keyPressed(QKeyEvent *event);
-    virtual void keyReleased(QKeyEvent *event);
-    virtual void inputMethodEvent(QInputMethodEvent *event);
-    virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
-    virtual void componentComplete();
-
-private:
-    QmlGraphicsItemKeyFilter *m_next;
-};
-
-class QmlGraphicsKeyNavigationAttachedPrivate : public QObjectPrivate
-{
-public:
-    QmlGraphicsKeyNavigationAttachedPrivate()
-        : QObjectPrivate(), left(0), right(0), up(0), down(0) {}
-
-    QmlGraphicsItem *left;
-    QmlGraphicsItem *right;
-    QmlGraphicsItem *up;
-    QmlGraphicsItem *down;
-};
-
-class QmlGraphicsKeyNavigationAttached : public QObject, public QmlGraphicsItemKeyFilter
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlGraphicsKeyNavigationAttached)
-
-    Q_PROPERTY(QmlGraphicsItem *left READ left WRITE setLeft NOTIFY changed)
-    Q_PROPERTY(QmlGraphicsItem *right READ right WRITE setRight NOTIFY changed)
-    Q_PROPERTY(QmlGraphicsItem *up READ up WRITE setUp NOTIFY changed)
-    Q_PROPERTY(QmlGraphicsItem *down READ down WRITE setDown NOTIFY changed)
-public:
-    QmlGraphicsKeyNavigationAttached(QObject * = 0);
-
-    QmlGraphicsItem *left() const;
-    void setLeft(QmlGraphicsItem *);
-    QmlGraphicsItem *right() const;
-    void setRight(QmlGraphicsItem *);
-    QmlGraphicsItem *up() const;
-    void setUp(QmlGraphicsItem *);
-    QmlGraphicsItem *down() const;
-    void setDown(QmlGraphicsItem *);
-
-    static QmlGraphicsKeyNavigationAttached *qmlAttachedProperties(QObject *);
-
-Q_SIGNALS:
-    void changed();
-
-private:
-    virtual void keyPressed(QKeyEvent *event);
-    virtual void keyReleased(QKeyEvent *event);
-};
-
-class QmlGraphicsKeysAttachedPrivate : public QObjectPrivate
-{
-public:
-    QmlGraphicsKeysAttachedPrivate()
-        : QObjectPrivate(), inPress(false), inRelease(false)
-        , inIM(false), enabled(true), imeItem(0), item(0)
-    {}
-
-    bool isConnected(const char *signalName);
-
-    QGraphicsItem *finalFocusProxy(QGraphicsItem *item) const
-    {
-        QGraphicsItem *fp;
-        while ((fp = item->focusProxy()))
-            item = fp;
-        return item;
-    }
-
-    //loop detection
-    bool inPress:1;
-    bool inRelease:1;
-    bool inIM:1;
-
-    bool enabled : 1;
-
-    QGraphicsItem *imeItem;
-    QList<QmlGraphicsItem *> targets;
-    QmlGraphicsItem *item;
-};
-
-class QmlGraphicsKeysAttached : public QObject, public QmlGraphicsItemKeyFilter
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlGraphicsKeysAttached)
-
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_PROPERTY(QmlListProperty<QmlGraphicsItem> forwardTo READ forwardTo)
-
-public:
-    QmlGraphicsKeysAttached(QObject *parent=0);
-    ~QmlGraphicsKeysAttached();
-
-    bool enabled() const { Q_D(const QmlGraphicsKeysAttached); return d->enabled; }
-    void setEnabled(bool enabled) {
-        Q_D(QmlGraphicsKeysAttached);
-        if (enabled != d->enabled) {
-            d->enabled = enabled;
-            emit enabledChanged();
-        }
-    }
-
-    QmlListProperty<QmlGraphicsItem> forwardTo() {
-        Q_D(QmlGraphicsKeysAttached);
-        return QmlListProperty<QmlGraphicsItem>(this, d->targets);
-    }
-
-    virtual void componentComplete();
-
-    static QmlGraphicsKeysAttached *qmlAttachedProperties(QObject *);
-
-Q_SIGNALS:
-    void enabledChanged();
-    void pressed(QmlGraphicsKeyEvent *event);
-    void released(QmlGraphicsKeyEvent *event);
-    void digit0Pressed(QmlGraphicsKeyEvent *event);
-    void digit1Pressed(QmlGraphicsKeyEvent *event);
-    void digit2Pressed(QmlGraphicsKeyEvent *event);
-    void digit3Pressed(QmlGraphicsKeyEvent *event);
-    void digit4Pressed(QmlGraphicsKeyEvent *event);
-    void digit5Pressed(QmlGraphicsKeyEvent *event);
-    void digit6Pressed(QmlGraphicsKeyEvent *event);
-    void digit7Pressed(QmlGraphicsKeyEvent *event);
-    void digit8Pressed(QmlGraphicsKeyEvent *event);
-    void digit9Pressed(QmlGraphicsKeyEvent *event);
-
-    void leftPressed(QmlGraphicsKeyEvent *event);
-    void rightPressed(QmlGraphicsKeyEvent *event);
-    void upPressed(QmlGraphicsKeyEvent *event);
-    void downPressed(QmlGraphicsKeyEvent *event);
-
-    void asteriskPressed(QmlGraphicsKeyEvent *event);
-    void numberSignPressed(QmlGraphicsKeyEvent *event);
-    void escapePressed(QmlGraphicsKeyEvent *event);
-    void returnPressed(QmlGraphicsKeyEvent *event);
-    void enterPressed(QmlGraphicsKeyEvent *event);
-    void deletePressed(QmlGraphicsKeyEvent *event);
-    void spacePressed(QmlGraphicsKeyEvent *event);
-    void backPressed(QmlGraphicsKeyEvent *event);
-    void cancelPressed(QmlGraphicsKeyEvent *event);
-    void selectPressed(QmlGraphicsKeyEvent *event);
-    void yesPressed(QmlGraphicsKeyEvent *event);
-    void noPressed(QmlGraphicsKeyEvent *event);
-    void context1Pressed(QmlGraphicsKeyEvent *event);
-    void context2Pressed(QmlGraphicsKeyEvent *event);
-    void context3Pressed(QmlGraphicsKeyEvent *event);
-    void context4Pressed(QmlGraphicsKeyEvent *event);
-    void callPressed(QmlGraphicsKeyEvent *event);
-    void hangupPressed(QmlGraphicsKeyEvent *event);
-    void flipPressed(QmlGraphicsKeyEvent *event);
-    void menuPressed(QmlGraphicsKeyEvent *event);
-    void volumeUpPressed(QmlGraphicsKeyEvent *event);
-    void volumeDownPressed(QmlGraphicsKeyEvent *event);
-
-private:
-    virtual void keyPressed(QKeyEvent *event);
-    virtual void keyReleased(QKeyEvent *event);
-    virtual void inputMethodEvent(QInputMethodEvent *);
-    virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
-
-    const QByteArray keyToSignal(int key) {
-        QByteArray keySignal;
-        if (key >= Qt::Key_0 && key <= Qt::Key_9) {
-            keySignal = "digit0Pressed";
-            keySignal[5] = '0' + (key - Qt::Key_0);
-        } else {
-            int i = 0;
-            while (sigMap[i].key && sigMap[i].key != key)
-                ++i;
-            keySignal = sigMap[i].sig;
-        }
-        return keySignal;
-    }
-
-    struct SigMap {
-        int key;
-        const char *sig;
-    };
-
-    static const SigMap sigMap[];
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QmlGraphicsItemPrivate::ChangeTypes);
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsKeysAttached)
-QML_DECLARE_TYPEINFO(QmlGraphicsKeysAttached, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QmlGraphicsKeyNavigationAttached)
-QML_DECLARE_TYPEINFO(QmlGraphicsKeyNavigationAttached, QML_HAS_ATTACHED_PROPERTIES)
-
-#endif // QMLGRAPHICSITEM_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsitemchangelistener_p.h b/src/declarative/graphicsitems/qmlgraphicsitemchangelistener_p.h
deleted file mode 100644
index a1c7b89..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsitemchangelistener_p.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSITEMCHANGELISTENER
-#define QMLGRAPHICSITEMCHANGELISTENER
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QRectF;
-class QmlGraphicsItem;
-class QmlGraphicsAnchorsPrivate;
-class QmlGraphicsItemChangeListener
-{
-public:
-    virtual void itemGeometryChanged(QmlGraphicsItem *, const QRectF &, const QRectF &) {}
-    virtual void itemSiblingOrderChanged(QmlGraphicsItem *) {}
-    virtual void itemVisibilityChanged(QmlGraphicsItem *) {}
-    virtual void itemOpacityChanged(QmlGraphicsItem *) {}
-    virtual void itemDestroyed(QmlGraphicsItem *) {}
-    virtual QmlGraphicsAnchorsPrivate *anchorPrivate() { return 0; }
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLGRAPHICSITEMCHANGELISTENER
diff --git a/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp b/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp
deleted file mode 100644
index 121026e..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsitemsmodule.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsitemsmodule_p.h"
-
-#include <QtGui/qaction.h>
-#include <QtGui/qvalidator.h>
-#include <QtGui/qgraphicseffect.h>
-
-#include "qmlgraphicsevents_p_p.h"
-#include "qmlgraphicseffects_p.h"
-#include "qmlgraphicsscalegrid_p_p.h"
-#include "qmlgraphicsanimatedimage_p.h"
-#include "qmlgraphicsborderimage_p.h"
-#include "qmlgraphicspositioners_p.h"
-#include "qmlgraphicsmousearea_p.h"
-#include "qmlgraphicsflickable_p.h"
-#include "qmlgraphicsflickable_p_p.h"
-#include "qmlgraphicsflipable_p.h"
-#include "qmlgraphicsfocuspanel_p.h"
-#include "qmlgraphicsfocusscope_p.h"
-#include "qmlgraphicsgraphicsobjectcontainer_p.h"
-#include "qmlgraphicsgridview_p.h"
-#include "qmlgraphicsimage_p.h"
-#include "qmlgraphicsitem_p.h"
-#include "qmlgraphicslayoutitem_p.h"
-#include "qmlgraphicslistview_p.h"
-#include "qmlgraphicsloader_p.h"
-#include "qmlgraphicsmousearea_p.h"
-#include "qmlgraphicsparticles_p.h"
-#include "qmlgraphicspath_p.h"
-#include "qmlgraphicspathview_p.h"
-#include "qmlgraphicsrectangle_p.h"
-#include "qmlgraphicsrepeater_p.h"
-#include "qmlgraphicstext_p.h"
-#include "qmlgraphicstextedit_p.h"
-#include "qmlgraphicstextinput_p.h"
-#include "qmlgraphicsvisualitemmodel_p.h"
-#ifdef QT_WEBKIT_LIB
-#include "qmlgraphicswebview_p.h"
-#include "qmlgraphicswebview_p_p.h"
-#endif
-#include "qmlgraphicsanchors_p.h"
-
-void QmlGraphicsItemModule::defineModule()
-{
-    QML_REGISTER_TYPE(Qt,4,6,AnimatedImage,QmlGraphicsAnimatedImage);
-    QML_REGISTER_TYPE(Qt,4,6,Blur,QGraphicsBlurEffect);
-    QML_REGISTER_TYPE(Qt,4,6,BorderImage,QmlGraphicsBorderImage);
-    QML_REGISTER_TYPE(Qt,4,6,Colorize,QGraphicsColorizeEffect);
-    QML_REGISTER_TYPE(Qt,4,6,Column,QmlGraphicsColumn);
-    QML_REGISTER_TYPE(Qt,4,6,Drag,QmlGraphicsDrag);
-    QML_REGISTER_TYPE(Qt,4,6,DropShadow,QGraphicsDropShadowEffect);
-    QML_REGISTER_TYPE(Qt,4,6,Flickable,QmlGraphicsFlickable);
-    QML_REGISTER_TYPE(Qt,4,6,Flipable,QmlGraphicsFlipable);
-    QML_REGISTER_TYPE(Qt,4,6,Flow,QmlGraphicsFlow);
-    QML_REGISTER_TYPE(Qt,4,6,FocusPanel,QmlGraphicsFocusPanel);
-    QML_REGISTER_TYPE(Qt,4,6,FocusScope,QmlGraphicsFocusScope);
-    QML_REGISTER_TYPE(Qt,4,6,Gradient,QmlGraphicsGradient);
-    QML_REGISTER_TYPE(Qt,4,6,GradientStop,QmlGraphicsGradientStop);
-    QML_REGISTER_TYPE(Qt,4,6,GraphicsObjectContainer,QmlGraphicsGraphicsObjectContainer);
-    QML_REGISTER_TYPE(Qt,4,6,Grid,QmlGraphicsGrid);
-    QML_REGISTER_TYPE(Qt,4,6,GridView,QmlGraphicsGridView);
-    QML_REGISTER_TYPE(Qt,4,6,Image,QmlGraphicsImage);
-    QML_REGISTER_TYPE(Qt,4,6,Item,QmlGraphicsItem);
-    QML_REGISTER_TYPE(Qt,4,6,KeyNavigation,QmlGraphicsKeyNavigationAttached);
-    QML_REGISTER_TYPE(Qt,4,6,Keys,QmlGraphicsKeysAttached);
-    QML_REGISTER_TYPE(Qt,4,6,LayoutItem,QmlGraphicsLayoutItem);
-    QML_REGISTER_TYPE(Qt,4,6,ListView,QmlGraphicsListView);
-    QML_REGISTER_TYPE(Qt,4,6,Loader,QmlGraphicsLoader);
-    QML_REGISTER_TYPE(Qt,4,6,MouseRegion,QmlGraphicsMouseArea);
-    QML_REGISTER_TYPE(Qt,4,6,MouseArea,QmlGraphicsMouseArea);
-    QML_REGISTER_TYPE(Qt,4,6,Opacity,QGraphicsOpacityEffect);
-    QML_REGISTER_TYPE(Qt,4,6,ParticleMotion,QmlGraphicsParticleMotion);
-    QML_REGISTER_TYPE(Qt,4,6,ParticleMotionGravity,QmlGraphicsParticleMotionGravity);
-    QML_REGISTER_TYPE(Qt,4,6,ParticleMotionLinear,QmlGraphicsParticleMotionLinear);
-    QML_REGISTER_TYPE(Qt,4,6,ParticleMotionWander,QmlGraphicsParticleMotionWander);
-    QML_REGISTER_TYPE(Qt,4,6,Particles,QmlGraphicsParticles);
-    QML_REGISTER_TYPE(Qt,4,6,Path,QmlGraphicsPath);
-    QML_REGISTER_TYPE(Qt,4,6,PathAttribute,QmlGraphicsPathAttribute);
-    QML_REGISTER_TYPE(Qt,4,6,PathCubic,QmlGraphicsPathCubic);
-    QML_REGISTER_TYPE(Qt,4,6,PathLine,QmlGraphicsPathLine);
-    QML_REGISTER_TYPE(Qt,4,6,PathPercent,QmlGraphicsPathPercent);
-    QML_REGISTER_TYPE(Qt,4,6,PathQuad,QmlGraphicsPathQuad);
-    QML_REGISTER_TYPE(Qt,4,6,PathView,QmlGraphicsPathView);
-    QML_REGISTER_TYPE(Qt,4,6,Pen,QmlGraphicsPen);
-    QML_REGISTER_TYPE(Qt,4,6,QIntValidator,QIntValidator);
-#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
-    QML_REGISTER_TYPE(Qt,4,7,QDoubleValidator,QDoubleValidator);
-    QML_REGISTER_TYPE(Qt,4,7,QRegExpValidator,QRegExpValidator);
-#endif
-    QML_REGISTER_TYPE(Qt,4,6,Rectangle,QmlGraphicsRectangle);
-    QML_REGISTER_TYPE(Qt,4,6,Repeater,QmlGraphicsRepeater);
-    QML_REGISTER_TYPE(Qt,4,6,Rotation,QGraphicsRotation);
-    QML_REGISTER_TYPE(Qt,4,6,Row,QmlGraphicsRow);
-    QML_REGISTER_TYPE(Qt,4,6,Scale,QGraphicsScale);
-    QML_REGISTER_TYPE(Qt,4,6,Text,QmlGraphicsText);
-    QML_REGISTER_TYPE(Qt,4,6,TextEdit,QmlGraphicsTextEdit);
-    QML_REGISTER_TYPE(Qt,4,6,TextInput,QmlGraphicsTextInput);
-    QML_REGISTER_TYPE(Qt,4,6,ViewSection,QmlGraphicsViewSection);
-    QML_REGISTER_TYPE(Qt,4,6,VisibleArea,QmlGraphicsFlickableVisibleArea);
-    QML_REGISTER_TYPE(Qt,4,6,VisualDataModel,QmlGraphicsVisualDataModel);
-    QML_REGISTER_TYPE(Qt,4,6,VisualItemModel,QmlGraphicsVisualItemModel);
-#ifdef QT_WEBKIT_LIB
-    QML_REGISTER_TYPE(Qt,4,6,WebView,QmlGraphicsWebView);
-#endif
-
-    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsAnchors);
-    QML_REGISTER_NOCREATE_TYPE(QGraphicsEffect);
-    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsKeyEvent);
-    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsMouseEvent);
-    QML_REGISTER_NOCREATE_TYPE(QGraphicsObject);
-    QML_REGISTER_NOCREATE_TYPE(QGraphicsTransform);
-    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsPathElement);
-    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsCurve);
-    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsScaleGrid);
-    QML_REGISTER_NOCREATE_TYPE(QValidator);
-    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsVisualModel);
-    QML_REGISTER_NOCREATE_TYPE(QAction);
-#ifdef QT_WEBKIT_LIB
-    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsWebSettings);
-#endif
-}
diff --git a/src/declarative/graphicsitems/qmlgraphicsitemsmodule_p.h b/src/declarative/graphicsitems/qmlgraphicsitemsmodule_p.h
deleted file mode 100644
index 76fea7e..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsitemsmodule_p.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSITEMMODULE_H
-#define QMLGRAPHICSITEMMODULE_H
-
-#include <qml.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsItemModule
-{
-public:
-    static void defineModule();
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSITEMMODULE_H
diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
deleted file mode 100644
index b55beda..0000000
--- a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicslayoutitem_p.h"
-
-#include <QDebug>
-
-#include <limits.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass LayoutItem QmlGraphicsLayoutItem
-    \since 4.7
-    \brief The LayoutItem element allows you to place your Fluid UI elements inside a classical Qt layout.
-
-    LayoutItem is a variant of Item with a couple of additional properties. These properties provide the size hints
-    needed for items to work in conjunction with Qt Layouts. The Qt Layout will resize the LayoutItem as appropriate,
-    taking its size hints into account, and you can propagate this to the other elements in your UI via anchors and bindings.
-
-    This is a QGraphicsLayoutItem subclass, and the properties merely expose the QGraphicsLayoutItem functionality to QML.
-    See the QGraphicsLayoutItem documentation for further details.
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsLayoutItem
-    \brief The QmlGraphicsLayoutItem class allows you to place your Fluid UI elements inside a classical Qt layout.
-*/
-
-
-/*!
-    \qmlproperty QSizeF LayoutItem::maximumSize
-
-    The maximumSize property can be set to specify the maximum desired size of this LayoutItem
-*/
-
-/*!
-    \qmlproperty QSizeF LayoutItem::minimumSize
-
-    The minimumSize property can be set to specify the minimum desired size of this LayoutItem
-*/
-
-/*!
-    \qmlproperty QSizeF LayoutItem::preferredSize
-
-    The preferredSize property can be set to specify the preferred size of this LayoutItem
-*/
-
-QmlGraphicsLayoutItem::QmlGraphicsLayoutItem(QmlGraphicsItem* parent)
-    : QmlGraphicsItem(parent), m_maximumSize(INT_MAX,INT_MAX), m_minimumSize(0,0), m_preferredSize(0,0)
-{
-    setGraphicsItem(this);
-}
-
-void QmlGraphicsLayoutItem::setGeometry(const QRectF & rect)
-{
-    setX(rect.x());
-    setY(rect.y());
-    setWidth(rect.width());
-    setHeight(rect.height());
-}
-
-QSizeF QmlGraphicsLayoutItem::sizeHint(Qt::SizeHint w, const QSizeF &constraint) const
-{
-    Q_UNUSED(constraint);
-    if(w == Qt::MinimumSize){
-        return m_minimumSize;
-    }else if(w == Qt::MaximumSize){
-        return m_maximumSize;
-    }else{
-        return m_preferredSize;
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
deleted file mode 100644
index fbc891d..0000000
--- a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSGRAPHICSLAYOUTITEM_H
-#define QMLGRAPHICSGRAPHICSLAYOUTITEM_H
-#include "qmlgraphicsitem.h"
-
-#include <QGraphicsLayoutItem>
-#include <QSizeF>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsLayoutItem : public QmlGraphicsItem, public QGraphicsLayoutItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayoutItem)
-    Q_PROPERTY(QSizeF maximumSize READ maximumSize WRITE setMaximumSize NOTIFY maximumSizeChanged)
-    Q_PROPERTY(QSizeF minimumSize READ minimumSize WRITE setMinimumSize NOTIFY minimumSizeChanged)
-    Q_PROPERTY(QSizeF preferredSize READ preferredSize WRITE setPreferredSize NOTIFY preferredSizeChanged)
-public:
-    QmlGraphicsLayoutItem(QmlGraphicsItem* parent=0);
-
-    QSizeF maximumSize() const { return m_maximumSize; }
-    void setMaximumSize(const QSizeF &s) { if(s==m_maximumSize) return; m_maximumSize = s; emit maximumSizeChanged(); }
-
-    QSizeF minimumSize() const { return m_minimumSize; }
-    void setMinimumSize(const QSizeF &s) { if(s==m_minimumSize) return; m_minimumSize = s; emit minimumSizeChanged(); }
-
-    QSizeF preferredSize() const { return m_preferredSize; }
-    void setPreferredSize(const QSizeF &s) { if(s==m_preferredSize) return; m_preferredSize = s; emit preferredSizeChanged(); }
-
-    virtual void setGeometry(const QRectF & rect);
-protected:
-    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
-
-Q_SIGNALS:
-    void maximumSizeChanged();
-    void minimumSizeChanged();
-    void preferredSizeChanged();
-
-private:
-    QSizeF m_maximumSize;
-    QSizeF m_minimumSize;
-    QSizeF m_preferredSize;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsLayoutItem)
-
-QT_END_HEADER
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
deleted file mode 100644
index 28b21c9..0000000
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ /dev/null
@@ -1,2716 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicslistview_p.h"
-
-#include "qmlgraphicsflickable_p_p.h"
-#include "qmlgraphicsvisualitemmodel_p.h"
-
-#include <qmleasefollow_p.h>
-#include <qmlexpression.h>
-#include <qmlengine.h>
-
-#include <qlistmodelinterface_p.h>
-#include <QKeyEvent>
-
-QT_BEGIN_NAMESPACE
-
-void QmlGraphicsViewSection::setProperty(const QString &property)
-{
-    if (property != m_property) {
-        m_property = property;
-        emit changed();
-    }
-}
-
-void QmlGraphicsViewSection::setCriteria(QmlGraphicsViewSection::SectionCriteria criteria)
-{
-    if (criteria != m_criteria) {
-        m_criteria = criteria;
-        emit changed();
-    }
-}
-
-void QmlGraphicsViewSection::setDelegate(QmlComponent *delegate)
-{
-    if (delegate != m_delegate) {
-        m_delegate = delegate;
-        emit delegateChanged();
-    }
-}
-
-QString QmlGraphicsViewSection::sectionString(const QString &value)
-{
-    if (m_criteria == FirstCharacter)
-        return value.isEmpty() ? QString() : value.at(0);
-    else
-        return value;
-}
-
-//----------------------------------------------------------------------------
-
-class FxListItem
-{
-public:
-    FxListItem(QmlGraphicsItem *i, QmlGraphicsListView *v) : item(i), section(0), view(v) {
-        attached = static_cast<QmlGraphicsListViewAttached*>(qmlAttachedPropertiesObject<QmlGraphicsListView>(item));
-        if (attached)
-            attached->m_view = view;
-    }
-    ~FxListItem() {}
-    qreal position() const {
-        if (section)
-            return (view->orientation() == QmlGraphicsListView::Vertical ? section->y() : section->x());
-        else
-            return (view->orientation() == QmlGraphicsListView::Vertical ? item->y() : item->x());
-    }
-    int size() const {
-        if (section)
-            return (view->orientation() == QmlGraphicsListView::Vertical ? item->height()+section->height() : item->width()+section->height());
-        else
-            return (view->orientation() == QmlGraphicsListView::Vertical ? item->height() : item->width());
-    }
-    qreal endPosition() const {
-        return (view->orientation() == QmlGraphicsListView::Vertical
-                                        ? item->y() + (item->height() > 0 ? item->height() : 1)
-                                        : item->x() + (item->width() > 0 ? item->width() : 1)) - 1;
-    }
-    void setPosition(qreal pos) {
-        if (view->orientation() == QmlGraphicsListView::Vertical) {
-            if (section) {
-                section->setY(pos);
-                pos += section->height();
-            }
-            item->setY(pos);
-        } else {
-            if (section) {
-                section->setX(pos);
-                pos += section->width();
-            }
-            item->setX(pos);
-        }
-    }
-
-    QmlGraphicsItem *item;
-    QmlGraphicsItem *section;
-    QmlGraphicsListView *view;
-    QmlGraphicsListViewAttached *attached;
-    int index;
-};
-
-//----------------------------------------------------------------------------
-
-class QmlGraphicsListViewPrivate : public QmlGraphicsFlickablePrivate, private QmlGraphicsItemChangeListener
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsListView)
-
-public:
-    QmlGraphicsListViewPrivate()
-        : currentItem(0), orient(QmlGraphicsListView::Vertical)
-        , visiblePos(0), visibleIndex(0)
-        , averageSize(100.0), currentIndex(-1), requestedIndex(-1)
-        , highlightRangeStart(0), highlightRangeEnd(0)
-        , highlightComponent(0), highlight(0), trackedItem(0)
-        , moveReason(Other), buffer(0), highlightPosAnimator(0), highlightSizeAnimator(0)
-        , sectionCriteria(0), spacing(0.0)
-        , highlightMoveSpeed(400), highlightResizeSpeed(400), highlightRange(QmlGraphicsListView::NoHighlightRange)
-        , snapMode(QmlGraphicsListView::NoSnap), overshootDist(0.0)
-        , footerComponent(0), footer(0), headerComponent(0), header(0)
-        , bufferMode(NoBuffer)
-        , ownModel(false), wrap(false), autoHighlight(true), haveHighlightRange(false)
-        , correctFlick(true), inFlickCorrection(false), lazyRelease(false)
-        , deferredRelease(false), minExtentDirty(true), maxExtentDirty(true)
-    {}
-
-    void init();
-    void clear();
-    FxListItem *createItem(int modelIndex);
-    void releaseItem(FxListItem *item);
-
-    FxListItem *visibleItem(int modelIndex) const {
-        if (modelIndex >= visibleIndex && modelIndex < visibleIndex + visibleItems.count()) {
-            for (int i = modelIndex - visibleIndex; i < visibleItems.count(); ++i) {
-                FxListItem *item = visibleItems.at(i);
-                if (item->index == modelIndex)
-                    return item;
-            }
-        }
-        return 0;
-    }
-
-    FxListItem *firstVisibleItem() const {
-        const qreal pos = position();
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxListItem *item = visibleItems.at(i);
-            if (item->index != -1 && item->endPosition() > pos)
-                return item;
-        }
-        return visibleItems.count() ? visibleItems.first() : 0;
-    }
-
-    FxListItem *nextVisibleItem() const {
-        const qreal pos = position();
-        bool foundFirst = false;
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxListItem *item = visibleItems.at(i);
-            if (item->index != -1) {
-                if (foundFirst)
-                    return item;
-                else if (item->position() < pos && item->endPosition() > pos)
-                    foundFirst = true;
-            }
-        }
-        return 0;
-    }
-
-    qreal position() const {
-        Q_Q(const QmlGraphicsListView);
-        return orient == QmlGraphicsListView::Vertical ? q->viewportY() : q->viewportX();
-    }
-    void setPosition(qreal pos) {
-        Q_Q(QmlGraphicsListView);
-        if (orient == QmlGraphicsListView::Vertical)
-            q->setViewportY(pos);
-        else
-            q->setViewportX(pos);
-    }
-    qreal size() const {
-        Q_Q(const QmlGraphicsListView);
-        return orient == QmlGraphicsListView::Vertical ? q->height() : q->width();
-    }
-
-    qreal startPosition() const {
-        qreal pos = 0;
-        if (!visibleItems.isEmpty()) {
-            pos = (*visibleItems.constBegin())->position();
-            if (visibleIndex > 0)
-                pos -= visibleIndex * (averageSize + spacing) - spacing;
-        }
-        return pos;
-    }
-
-    qreal endPosition() const {
-        qreal pos = 0;
-        if (!visibleItems.isEmpty()) {
-            int invisibleCount = visibleItems.count() - visibleIndex;
-            for (int i = visibleItems.count()-1; i >= 0; --i) {
-                if (visibleItems.at(i)->index != -1) {
-                    invisibleCount = model->count() - visibleItems.at(i)->index - 1;
-                    break;
-                }
-            }
-            pos = (*(--visibleItems.constEnd()))->endPosition() + invisibleCount * (averageSize + spacing);
-        }
-        return pos;
-    }
-
-    qreal positionAt(int modelIndex) const {
-        if (FxListItem *item = visibleItem(modelIndex))
-            return item->position();
-        if (!visibleItems.isEmpty()) {
-            if (modelIndex < visibleIndex) {
-                int count = visibleIndex - modelIndex;
-                return (*visibleItems.constBegin())->position() - count * (averageSize + spacing);
-            } else {
-                int idx = visibleItems.count() - 1;
-                while (idx >= 0 && visibleItems.at(idx)->index == -1)
-                    --idx;
-                if (idx < 0)
-                    idx = visibleIndex;
-                else
-                    idx = visibleItems.at(idx)->index;
-                int count = modelIndex - idx - 1;
-                return (*(--visibleItems.constEnd()))->endPosition() + spacing + count * (averageSize + spacing) + 1;
-            }
-        }
-        return 0;
-    }
-
-    QString sectionAt(int modelIndex) {
-        if (FxListItem *item = visibleItem(modelIndex))
-            return item->attached->section();
-
-        QString section;
-        if (sectionCriteria) {
-            QString propValue = model->stringValue(modelIndex, sectionCriteria->property());
-            section = sectionCriteria->sectionString(propValue);
-        }
-
-        return section;
-    }
-
-    bool isValid() const {
-        return model && model->count() && model->isValid();
-    }
-
-    int snapIndex() {
-        int index = currentIndex;
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxListItem *item = visibleItems[i];
-            if (item->index == -1)
-                continue;
-            qreal itemTop = item->position();
-            if (itemTop >= highlight->position()-item->size()/2 && itemTop < highlight->position()+item->size()/2)
-                return item->index;
-        }
-        return index;
-    }
-
-    qreal snapPosAt(qreal pos) {
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxListItem *item = visibleItems[i];
-            if (item->index == -1)
-                continue;
-            qreal itemTop = item->position();
-            if (item->index == model->count()-1 || (itemTop+item->size()/2 >= pos))
-                return item->position();
-        }
-        if (visibleItems.count()) {
-            qreal firstPos = visibleItems.first()->position();
-            qreal endPos = visibleItems.last()->position();
-            if (pos < firstPos) {
-                return firstPos - qRound((firstPos - pos) / averageSize) * averageSize;
-            } else if (pos > endPos)
-                return endPos + qRound((pos - endPos) / averageSize) * averageSize;
-        }
-        return qRound((pos - startPosition()) / averageSize) * averageSize + startPosition();
-    }
-
-    FxListItem *snapItemAt(qreal pos) {
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxListItem *item = visibleItems[i];
-            if (item->index == -1)
-                continue;
-            qreal itemTop = item->position();
-            if (item->index == model->count()-1 || (itemTop+item->size()/2 >= pos))
-                return item;
-        }
-        if (visibleItems.count() && visibleItems.first()->position() <= pos)
-            return visibleItems.first();
-        return 0;
-    }
-
-    int lastVisibleIndex() const {
-        int lastIndex = -1;
-        for (int i = visibleItems.count()-1; i >= 0; --i) {
-            FxListItem *listItem = visibleItems.at(i);
-            if (listItem->index != -1) {
-                lastIndex = listItem->index;
-                break;
-            }
-        }
-        return lastIndex;
-    }
-
-    // map a model index to visibleItems index.
-    // These may differ if removed items are still present in the visible list,
-    // e.g. doing a removal animation
-    int mapFromModel(int modelIndex) const {
-        if (modelIndex < visibleIndex || modelIndex >= visibleIndex + visibleItems.count())
-            return -1;
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxListItem *listItem = visibleItems.at(i);
-            if (listItem->index == modelIndex)
-                return i + visibleIndex;
-            if (listItem->index > modelIndex)
-                return -1;
-        }
-        return -1; // Not in visibleList
-    }
-
-    bool mapRangeFromModel(int &index, int &count) const {
-        if (index + count < visibleIndex)
-            return false;
-
-        int lastIndex = -1;
-        for (int i = visibleItems.count()-1; i >= 0; --i) {
-            FxListItem *listItem = visibleItems.at(i);
-            if (listItem->index != -1) {
-                lastIndex = listItem->index;
-                break;
-            }
-        }
-
-        if (index > lastIndex)
-            return false;
-
-        int last = qMin(index + count - 1, lastIndex);
-        index = qMax(index, visibleIndex);
-        count = last - index + 1;
-
-        return true;
-    }
-
-    void updateViewport() {
-        Q_Q(QmlGraphicsListView);
-        if (orient == QmlGraphicsListView::Vertical) {
-            q->setViewportHeight(endPosition() - startPosition() + 1);
-        } else {
-            q->setViewportWidth(endPosition() - startPosition() + 1);
-        }
-    }
-
-    void itemGeometryChanged(QmlGraphicsItem *, const QRectF &newGeometry, const QRectF &oldGeometry) {
-        if ((orient == QmlGraphicsListView::Vertical && newGeometry.height() != oldGeometry.height())
-            || newGeometry.width() != oldGeometry.width()) {
-            layout();
-            fixupPosition();
-        }
-    }
-
-    // for debugging only
-    void checkVisible() const {
-        int skip = 0;
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxListItem *listItem = visibleItems.at(i);
-            if (listItem->index == -1) {
-                ++skip;
-            } else if (listItem->index != visibleIndex + i - skip) {
-                qFatal("index %d %d %d", visibleIndex, i, listItem->index);
-            }
-        }
-    }
-
-    void refill(qreal from, qreal to, bool doBuffer = false);
-    void layout();
-    void updateUnrequestedIndexes();
-    void updateUnrequestedPositions();
-    void updateTrackedItem();
-    void createHighlight();
-    void updateHighlight();
-    void createSection(FxListItem *);
-    void updateSections();
-    void updateCurrentSection();
-    void updateCurrent(int);
-    void updateAverage();
-    void updateHeader();
-    void updateFooter();
-    void fixupPosition();
-    virtual void fixupY();
-    virtual void fixupX();
-    virtual void flickX(qreal velocity);
-    virtual void flickY(qreal velocity);
-
-    QGuard<QmlGraphicsVisualModel> model;
-    QVariant modelVariant;
-    QList<FxListItem*> visibleItems;
-    QHash<QmlGraphicsItem*,int> unrequestedItems;
-    FxListItem *currentItem;
-    QmlGraphicsListView::Orientation orient;
-    int visiblePos;
-    int visibleIndex;
-    qreal averageSize;
-    int currentIndex;
-    int requestedIndex;
-    qreal highlightRangeStart;
-    qreal highlightRangeEnd;
-    QmlComponent *highlightComponent;
-    FxListItem *highlight;
-    FxListItem *trackedItem;
-    enum MovementReason { Other, SetIndex, Mouse };
-    MovementReason moveReason;
-    int buffer;
-    QmlEaseFollow *highlightPosAnimator;
-    QmlEaseFollow *highlightSizeAnimator;
-    QmlGraphicsViewSection *sectionCriteria;
-    QString currentSection;
-    static const int sectionCacheSize = 3;
-    QmlGraphicsItem *sectionCache[sectionCacheSize];
-    qreal spacing;
-    qreal highlightMoveSpeed;
-    qreal highlightResizeSpeed;
-    QmlGraphicsListView::HighlightRangeMode highlightRange;
-    QmlGraphicsListView::SnapMode snapMode;
-    qreal overshootDist;
-    QmlComponent *footerComponent;
-    FxListItem *footer;
-    QmlComponent *headerComponent;
-    FxListItem *header;
-    enum BufferMode { NoBuffer = 0x00, BufferBefore = 0x01, BufferAfter = 0x02 };
-    int bufferMode;
-    mutable qreal minExtent;
-    mutable qreal maxExtent;
-
-    bool ownModel : 1;
-    bool wrap : 1;
-    bool autoHighlight : 1;
-    bool haveHighlightRange : 1;
-    bool correctFlick : 1;
-    bool inFlickCorrection : 1;
-    bool lazyRelease : 1;
-    bool deferredRelease : 1;
-    mutable bool minExtentDirty : 1;
-    mutable bool maxExtentDirty : 1;
-};
-
-void QmlGraphicsListViewPrivate::init()
-{
-    Q_Q(QmlGraphicsListView);
-    q->setFlag(QGraphicsItem::ItemIsFocusScope);
-    addItemChangeListener(this, Geometry);
-    QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
-    q->setFlickDirection(QmlGraphicsFlickable::VerticalFlick);
-    ::memset(sectionCache, 0, sizeof(QmlGraphicsItem*) * sectionCacheSize);
-}
-
-void QmlGraphicsListViewPrivate::clear()
-{
-    for (int i = 0; i < visibleItems.count(); ++i)
-        releaseItem(visibleItems.at(i));
-    visibleItems.clear();
-    for (int i = 0; i < sectionCacheSize; ++i) {
-        delete sectionCache[i];
-        sectionCache[i] = 0;
-    }
-    visiblePos = header ? header->size() : 0;
-    visibleIndex = 0;
-    releaseItem(currentItem);
-    currentItem = 0;
-    createHighlight();
-    trackedItem = 0;
-    minExtentDirty = true;
-    maxExtentDirty = true;
-}
-
-FxListItem *QmlGraphicsListViewPrivate::createItem(int modelIndex)
-{
-    Q_Q(QmlGraphicsListView);
-    // create object
-    requestedIndex = modelIndex;
-    FxListItem *listItem = 0;
-    if (QmlGraphicsItem *item = model->item(modelIndex, false)) {
-        listItem = new FxListItem(item, q);
-        listItem->index = modelIndex;
-        // initialise attached properties
-        if (sectionCriteria) {
-            QString propValue = model->stringValue(modelIndex, sectionCriteria->property());
-            listItem->attached->m_section = sectionCriteria->sectionString(propValue);
-            if (modelIndex > 0) {
-                if (FxListItem *item = visibleItem(modelIndex-1))
-                    listItem->attached->m_prevSection = item->attached->section();
-                else
-                    listItem->attached->m_prevSection = sectionAt(modelIndex-1);
-            }
-        }
-        // complete
-        model->completeItem();
-        listItem->item->setZValue(1);
-        listItem->item->setParent(q->viewport());
-        QmlGraphicsItemPrivate *itemPrivate = static_cast<QmlGraphicsItemPrivate*>(QGraphicsItemPrivate::get(item));
-        itemPrivate->addItemChangeListener(this, QmlGraphicsItemPrivate::Geometry);
-        if (sectionCriteria && sectionCriteria->delegate()) {
-            if (listItem->attached->m_prevSection != listItem->attached->m_section)
-                createSection(listItem);
-        }
-        unrequestedItems.remove(listItem->item);
-    }
-    requestedIndex = -1;
-
-    return listItem;
-}
-
-void QmlGraphicsListViewPrivate::releaseItem(FxListItem *item)
-{
-    Q_Q(QmlGraphicsListView);
-    if (!item || !model)
-        return;
-    if (trackedItem == item) {
-        const char *notifier1 = orient == QmlGraphicsListView::Vertical ? SIGNAL(yChanged()) : SIGNAL(xChanged());
-        const char *notifier2 = orient == QmlGraphicsListView::Vertical ? SIGNAL(heightChanged()) : SIGNAL(widthChanged());
-        QObject::disconnect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged()));
-        QObject::disconnect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged()));
-        trackedItem = 0;
-    }
-    QmlGraphicsItemPrivate *itemPrivate = static_cast<QmlGraphicsItemPrivate*>(QGraphicsItemPrivate::get(item->item));
-    itemPrivate->removeItemChangeListener(this, QmlGraphicsItemPrivate::Geometry);
-    if (model->release(item->item) == 0) {
-        // item was not destroyed, and we no longer reference it.
-        unrequestedItems.insert(item->item, model->indexOf(item->item, q));
-    }
-    if (item->section) {
-        int i = 0;
-        do {
-            if (!sectionCache[i]) {
-                sectionCache[i] = item->section;
-                sectionCache[i]->setVisible(false);
-                item->section = 0;
-                break;
-            }
-            ++i;
-        } while (i < sectionCacheSize);
-        delete item->section;
-    }
-    delete item;
-}
-
-void QmlGraphicsListViewPrivate::refill(qreal from, qreal to, bool doBuffer)
-{
-    Q_Q(QmlGraphicsListView);
-    if (!isValid() || !q->isComponentComplete())
-        return;
-    qreal bufferFrom = from - buffer;
-    qreal bufferTo = to + buffer;
-    qreal fillFrom = from;
-    qreal fillTo = to;
-    if (doBuffer && (bufferMode & BufferAfter))
-        fillTo = bufferTo;
-    if (doBuffer && (bufferMode & BufferBefore))
-        fillFrom = bufferFrom;
-
-    int modelIndex = visibleIndex;
-    qreal itemEnd = visiblePos-1;
-    if (!visibleItems.isEmpty()) {
-        visiblePos = (*visibleItems.constBegin())->position();
-        itemEnd = (*(--visibleItems.constEnd()))->endPosition() + spacing;
-        int i = visibleItems.count() - 1;
-        while (i > 0 && visibleItems.at(i)->index == -1)
-            --i;
-        modelIndex = visibleItems.at(i)->index + 1;
-    }
-
-    bool changed = false;
-    FxListItem *item = 0;
-    int pos = itemEnd + 1;
-    while (modelIndex < model->count() && pos <= fillTo) {
-        //qDebug() << "refill: append item" << modelIndex << "pos" << pos;
-        if (!(item = createItem(modelIndex)))
-            break;
-        item->setPosition(pos);
-        pos += item->size() + spacing;
-        visibleItems.append(item);
-        ++modelIndex;
-        changed = true;
-        if (doBuffer) // never buffer more than one item per frame
-            break;
-    }
-    while (visibleIndex > 0 && visibleIndex <= model->count() && visiblePos > fillFrom) {
-        //qDebug() << "refill: prepend item" << visibleIndex-1 << "current top pos" << visiblePos;
-        if (!(item = createItem(visibleIndex-1)))
-            break;
-        --visibleIndex;
-        visiblePos -= item->size() + spacing;
-        item->setPosition(visiblePos);
-        visibleItems.prepend(item);
-        changed = true;
-        if (doBuffer) // never buffer more than one item per frame
-            break;
-    }
-
-    if (!lazyRelease || !changed || deferredRelease) { // avoid destroying items in the same frame that we create
-        while (visibleItems.count() > 1 && (item = visibleItems.first()) && item->endPosition() < bufferFrom) {
-            if (item->attached->delayRemove())
-                break;
-            //qDebug() << "refill: remove first" << visibleIndex << "top end pos" << item->endPosition();
-            if (item->index != -1)
-                visibleIndex++;
-            visibleItems.removeFirst();
-            releaseItem(item);
-            changed = true;
-        }
-        while (visibleItems.count() > 1 && (item = visibleItems.last()) && item->position() > bufferTo) {
-            if (item->attached->delayRemove())
-                break;
-            //qDebug() << "refill: remove last" << visibleIndex+visibleItems.count()-1;
-            visibleItems.removeLast();
-            releaseItem(item);
-            changed = true;
-        }
-        deferredRelease = false;
-    } else {
-        deferredRelease = true;
-    }
-    if (changed) {
-        minExtentDirty = true;
-        maxExtentDirty = true;
-        if (visibleItems.count())
-            visiblePos = (*visibleItems.constBegin())->position();
-        updateAverage();
-        if (sectionCriteria)
-            updateCurrentSection();
-        if (header)
-            updateHeader();
-        if (footer)
-            updateFooter();
-        updateViewport();
-        updateUnrequestedPositions();
-    } else if (!doBuffer && buffer && bufferMode != NoBuffer) {
-        refill(from, to, true);
-    }
-    lazyRelease = false;
-}
-
-void QmlGraphicsListViewPrivate::layout()
-{
-    Q_Q(QmlGraphicsListView);
-    updateSections();
-    if (!visibleItems.isEmpty()) {
-        int oldEnd = visibleItems.last()->endPosition();
-        int pos = visibleItems.first()->endPosition() + spacing + 1;
-        for (int i=1; i < visibleItems.count(); ++i) {
-            FxListItem *item = visibleItems.at(i);
-            item->setPosition(pos);
-            pos += item->size() + spacing;
-        }
-        // move current item if it is after the visible items.
-        if (currentItem && currentIndex > lastVisibleIndex())
-            currentItem->setPosition(currentItem->position() + (visibleItems.last()->endPosition() - oldEnd));
-    }
-    if (!isValid())
-        return;
-    q->refill();
-    minExtentDirty = true;
-    maxExtentDirty = true;
-    updateHighlight();
-    fixupPosition();
-    q->refill();
-    if (header)
-        updateHeader();
-    if (footer)
-        updateFooter();
-    updateViewport();
-}
-
-void QmlGraphicsListViewPrivate::updateUnrequestedIndexes()
-{
-    Q_Q(QmlGraphicsListView);
-    QHash<QmlGraphicsItem*,int>::iterator it;
-    for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
-        *it = model->indexOf(it.key(), q);
-}
-
-void QmlGraphicsListViewPrivate::updateUnrequestedPositions()
-{
-    Q_Q(QmlGraphicsListView);
-    if (unrequestedItems.count()) {
-        qreal pos = position();
-        QHash<QmlGraphicsItem*,int>::const_iterator it;
-        for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it) {
-            QmlGraphicsItem *item = it.key();
-            if (orient == QmlGraphicsListView::Vertical) {
-                if (item->y() + item->height() > pos && item->y() < pos + q->height())
-                    item->setY(positionAt(*it));
-            } else {
-                if (item->x() + item->width() > pos && item->x() < pos + q->width())
-                    item->setX(positionAt(*it));
-            }
-        }
-    }
-}
-
-void QmlGraphicsListViewPrivate::updateTrackedItem()
-{
-    Q_Q(QmlGraphicsListView);
-    FxListItem *item = currentItem;
-    if (highlight)
-        item = highlight;
-
-    FxListItem *oldTracked = trackedItem;
-
-    const char *notifier1 = orient == QmlGraphicsListView::Vertical ? SIGNAL(yChanged()) : SIGNAL(xChanged());
-    const char *notifier2 = orient == QmlGraphicsListView::Vertical ? SIGNAL(heightChanged()) : SIGNAL(widthChanged());
-
-    if (trackedItem && item != trackedItem) {
-        QObject::disconnect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged()));
-        QObject::disconnect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged()));
-        trackedItem = 0;
-    }
-
-    if (!trackedItem && item) {
-        trackedItem = item;
-        QObject::connect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged()));
-        QObject::connect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged()));
-    }
-    if (trackedItem && trackedItem != oldTracked)
-        q->trackedPositionChanged();
-}
-
-void QmlGraphicsListViewPrivate::createHighlight()
-{
-    Q_Q(QmlGraphicsListView);
-    bool changed = false;
-    if (highlight) {
-        if (trackedItem == highlight)
-            trackedItem = 0;
-        delete highlight->item;
-        delete highlight;
-        highlight = 0;
-        delete highlightPosAnimator;
-        delete highlightSizeAnimator;
-        highlightPosAnimator = 0;
-        highlightSizeAnimator = 0;
-        changed = true;
-    }
-
-    if (currentItem) {
-        QmlGraphicsItem *item = 0;
-        if (highlightComponent) {
-            QmlContext *highlightContext = new QmlContext(qmlContext(q));
-            QObject *nobj = highlightComponent->create(highlightContext);
-            if (nobj) {
-                highlightContext->setParent(nobj);
-                item = qobject_cast<QmlGraphicsItem *>(nobj);
-                if (!item)
-                    delete nobj;
-            } else {
-                delete highlightContext;
-            }
-        } else {
-            item = new QmlGraphicsItem;
-        }
-        if (item) {
-            item->setParent(q->viewport());
-            highlight = new FxListItem(item, q);
-            if (orient == QmlGraphicsListView::Vertical)
-                highlight->item->setHeight(currentItem->item->height());
-            else
-                highlight->item->setWidth(currentItem->item->width());
-            const QLatin1String posProp(orient == QmlGraphicsListView::Vertical ? "y" : "x");
-            highlightPosAnimator = new QmlEaseFollow(q);
-            highlightPosAnimator->setTarget(QmlMetaProperty(highlight->item, posProp));
-            highlightPosAnimator->setVelocity(highlightMoveSpeed);
-            highlightPosAnimator->setEnabled(autoHighlight);
-            const QLatin1String sizeProp(orient == QmlGraphicsListView::Vertical ? "height" : "width");
-            highlightSizeAnimator = new QmlEaseFollow(q);
-            highlightSizeAnimator->setVelocity(highlightResizeSpeed);
-            highlightSizeAnimator->setTarget(QmlMetaProperty(highlight->item, sizeProp));
-            highlightSizeAnimator->setEnabled(autoHighlight);
-            changed = true;
-        }
-    }
-    if (changed)
-        emit q->highlightChanged();
-}
-
-void QmlGraphicsListViewPrivate::updateHighlight()
-{
-    if ((!currentItem && highlight) || (currentItem && !highlight))
-        createHighlight();
-    if (currentItem && autoHighlight && highlight && !moving) {
-        // auto-update highlight
-        highlightPosAnimator->setSourceValue(currentItem->position());
-        highlightSizeAnimator->setSourceValue(currentItem->size());
-        if (orient == QmlGraphicsListView::Vertical) {
-            if (highlight->item->width() == 0)
-                highlight->item->setWidth(currentItem->item->width());
-        } else {
-            if (highlight->item->height() == 0)
-                highlight->item->setHeight(currentItem->item->height());
-        }
-    }
-    updateTrackedItem();
-}
-
-void QmlGraphicsListViewPrivate::createSection(FxListItem *listItem)
-{
-    Q_Q(QmlGraphicsListView);
-    if (!sectionCriteria || !sectionCriteria->delegate())
-        return;
-    if (listItem->attached->m_prevSection != listItem->attached->m_section) {
-        if (!listItem->section) {
-            int i = sectionCacheSize-1;
-            while (i >= 0 && !sectionCache[i])
-                --i;
-            if (i >= 0) {
-                listItem->section = sectionCache[i];
-                sectionCache[i] = 0;
-                listItem->section->setVisible(true);
-                QmlContext *context = QmlEngine::contextForObject(listItem->section)->parentContext();
-                context->setContextProperty(QLatin1String("section"), listItem->attached->m_section);
-            } else {
-                QmlContext *context = new QmlContext(qmlContext(q));
-                context->setContextProperty(QLatin1String("section"), listItem->attached->m_section);
-                QObject *nobj = sectionCriteria->delegate()->create(context);
-                if (nobj) {
-                    context->setParent(nobj);
-                    listItem->section = qobject_cast<QmlGraphicsItem *>(nobj);
-                    if (!listItem->section) {
-                        delete nobj;
-                    } else {
-                        listItem->section->setZValue(1);
-                        listItem->section->setParent(q->viewport());
-                    }
-                } else {
-                    delete context;
-                }
-            }
-        }
-    } else if (listItem->section) {
-        int i = 0;
-        do {
-            if (!sectionCache[i]) {
-                sectionCache[i] = listItem->section;
-                sectionCache[i]->setVisible(false);
-                listItem->section = 0;
-                return;
-            }
-            ++i;
-        } while (i < sectionCacheSize);
-        delete listItem->section;
-        listItem->section = 0;
-    }
-}
-
-void QmlGraphicsListViewPrivate::updateSections()
-{
-    if (sectionCriteria) {
-        QString prevSection;
-        if (visibleIndex > 0)
-            prevSection = sectionAt(visibleIndex-1);
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            if (visibleItems.at(i)->index != -1) {
-                QmlGraphicsListViewAttached *attached = visibleItems.at(i)->attached;
-                attached->setPrevSection(prevSection);
-                createSection(visibleItems.at(i));
-                prevSection = attached->section();
-            }
-        }
-    }
-}
-
-void QmlGraphicsListViewPrivate::updateCurrentSection()
-{
-    if (!sectionCriteria || visibleItems.isEmpty()) {
-        currentSection = QString();
-        return;
-    }
-    int index = 0;
-    while (visibleItems.at(index)->endPosition() < position() && index < visibleItems.count())
-        ++index;
-
-    if (index < visibleItems.count())
-        currentSection = visibleItems.at(index)->attached->section();
-    else
-        currentSection = visibleItems.first()->attached->section();
-}
-
-void QmlGraphicsListViewPrivate::updateCurrent(int modelIndex)
-{
-    Q_Q(QmlGraphicsListView);
-    if (!q->isComponentComplete() || !isValid() || modelIndex < 0 || modelIndex >= model->count()) {
-        if (currentItem) {
-            currentItem->attached->setIsCurrentItem(false);
-            releaseItem(currentItem);
-            currentItem = 0;
-            currentIndex = -1;
-            updateHighlight();
-            emit q->currentIndexChanged();
-        }
-        return;
-    }
-
-    if (currentItem && currentIndex == modelIndex) {
-        updateHighlight();
-        return;
-    }
-    FxListItem *oldCurrentItem = currentItem;
-    currentIndex = modelIndex;
-    currentItem = createItem(modelIndex);
-    if (oldCurrentItem && (!currentItem || oldCurrentItem->item != currentItem->item))
-        oldCurrentItem->attached->setIsCurrentItem(false);
-    if (currentItem) {
-        if (modelIndex == visibleIndex - 1) {
-            // We can calculate exact postion in this case
-            currentItem->setPosition(visibleItems.first()->position() - currentItem->size() - spacing);
-        } else {
-            // Create current item now and position as best we can.
-            // Its position will be corrected when it becomes visible.
-            currentItem->setPosition(positionAt(modelIndex));
-        }
-        currentItem->item->setFocus(true);
-        currentItem->attached->setIsCurrentItem(true);
-    }
-    updateHighlight();
-    emit q->currentIndexChanged();
-    // Release the old current item
-    releaseItem(oldCurrentItem);
-}
-
-void QmlGraphicsListViewPrivate::updateAverage()
-{
-    if (!visibleItems.count())
-        return;
-    qreal sum = 0.0;
-    for (int i = 0; i < visibleItems.count(); ++i)
-        sum += visibleItems.at(i)->size();
-    averageSize = sum / visibleItems.count();
-}
-
-void QmlGraphicsListViewPrivate::updateFooter()
-{
-    Q_Q(QmlGraphicsListView);
-    if (!footer && footerComponent) {
-        QmlGraphicsItem *item = 0;
-        QmlContext *context = new QmlContext(qmlContext(q));
-        QObject *nobj = footerComponent->create(context);
-        if (nobj) {
-            context->setParent(nobj);
-            item = qobject_cast<QmlGraphicsItem *>(nobj);
-            if (!item)
-                delete nobj;
-        } else {
-            delete context;
-        }
-        if (item) {
-            item->setParent(q->viewport());
-            item->setZValue(1);
-            footer = new FxListItem(item, q);
-        }
-    }
-    if (footer) {
-        if (visibleItems.count()) {
-            qreal endPos = endPosition();
-            if (lastVisibleIndex() == model->count()-1) {
-                footer->setPosition(endPos);
-            } else {
-                qreal visiblePos = position() + q->height();
-                if (endPos <= visiblePos || footer->position() < endPos)
-                    footer->setPosition(endPos);
-            }
-        } else {
-            footer->setPosition(visiblePos);
-        }
-    }
-}
-
-void QmlGraphicsListViewPrivate::updateHeader()
-{
-    Q_Q(QmlGraphicsListView);
-    if (!header && headerComponent) {
-        QmlGraphicsItem *item = 0;
-        QmlContext *context = new QmlContext(qmlContext(q));
-        QObject *nobj = headerComponent->create(context);
-        if (nobj) {
-            context->setParent(nobj);
-            item = qobject_cast<QmlGraphicsItem *>(nobj);
-            if (!item)
-                delete nobj;
-        } else {
-            delete context;
-        }
-        if (item) {
-            item->setParent(q->viewport());
-            item->setZValue(1);
-            header = new FxListItem(item, q);
-            if (visibleItems.isEmpty())
-                visiblePos = header->size();
-        }
-    }
-    if (header) {
-        if (visibleItems.count()) {
-            qreal startPos = startPosition();
-            if (visibleIndex == 0) {
-                header->setPosition(startPos - header->size());
-            } else {
-                if (position() <= startPos || header->position() > startPos - header->size())
-                    header->setPosition(startPos - header->size());
-            }
-        } else {
-            header->setPosition(0);
-        }
-    }
-}
-
-void QmlGraphicsListViewPrivate::fixupPosition()
-{
-    moveReason = Other;
-    if (orient == QmlGraphicsListView::Vertical)
-        fixupY();
-    else
-        fixupX();
-}
-
-void QmlGraphicsListViewPrivate::fixupY()
-{
-    Q_Q(QmlGraphicsListView);
-    if (orient == QmlGraphicsListView::Horizontal)
-        return;
-    if (!q->yflick() || _moveY.timeLine())
-        return;
-
-    int oldDuration = fixupDuration;
-    fixupDuration = moveReason == Mouse ? fixupDuration : 0;
-
-    if (haveHighlightRange && highlightRange == QmlGraphicsListView::StrictlyEnforceRange) {
-        if (currentItem && currentItem->position() - position() != highlightRangeStart) {
-            qreal pos = currentItem->position() - highlightRangeStart;
-            timeline.reset(_moveY);
-            if (fixupDuration)
-                timeline.move(_moveY, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-            else
-                _moveY.setValue(-pos);
-            vTime = timeline.time();
-        }
-    } else if (snapMode != QmlGraphicsListView::NoSnap) {
-        if (FxListItem *item = snapItemAt(position())) {
-            qreal pos = qMin(item->position() - highlightRangeStart, -q->maxYExtent());
-            qreal dist = qAbs(_moveY + pos);
-            if (dist > 0) {
-                timeline.reset(_moveY);
-                if (fixupDuration)
-                    timeline.move(_moveY, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-                else
-                    _moveY.setValue(-pos);
-                vTime = timeline.time();
-            }
-        }
-    } else {
-        QmlGraphicsFlickablePrivate::fixupY();
-    }
-    fixupDuration = oldDuration;
-}
-
-void QmlGraphicsListViewPrivate::fixupX()
-{
-    Q_Q(QmlGraphicsListView);
-    if (orient == QmlGraphicsListView::Vertical)
-        return;
-    if (!q->xflick() || _moveX.timeLine())
-        return;
-
-    int oldDuration = fixupDuration;
-    fixupDuration = moveReason == Mouse ? fixupDuration : 0;
-
-    if (haveHighlightRange && highlightRange == QmlGraphicsListView::StrictlyEnforceRange) {
-        if (currentItem && currentItem->position() - position() != highlightRangeStart) {
-            qreal pos = currentItem->position() - highlightRangeStart;
-            timeline.reset(_moveX);
-            if (fixupDuration)
-                timeline.move(_moveX, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-            else
-                _moveX.setValue(-pos);
-            vTime = timeline.time();
-        }
-    } else if (snapMode != QmlGraphicsListView::NoSnap) {
-        if (FxListItem *item = snapItemAt(position())) {
-            qreal pos = qMin(item->position() - highlightRangeStart, -q->maxXExtent());
-            qreal dist = qAbs(_moveX + pos);
-            if (dist > 0) {
-                timeline.reset(_moveX);
-                if (fixupDuration)
-                    timeline.move(_moveX, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-                else
-                    _moveX.setValue(-pos);
-                vTime = timeline.time();
-            }
-        }
-    } else {
-        QmlGraphicsFlickablePrivate::fixupX();
-    }
-    fixupDuration = oldDuration;
-}
-
-void QmlGraphicsListViewPrivate::flickX(qreal velocity)
-{
-    Q_Q(QmlGraphicsListView);
-
-    moveReason = Mouse;
-    if ((!haveHighlightRange || highlightRange != QmlGraphicsListView::StrictlyEnforceRange) && snapMode == QmlGraphicsListView::NoSnap) {
-        QmlGraphicsFlickablePrivate::flickX(velocity);
-        return;
-    }
-    qreal maxDistance = -1;
-    const qreal maxX = q->maxXExtent();
-    const qreal minX = q->minXExtent();
-    // -ve velocity means list is moving up
-    if (velocity > 0) {
-        if (snapMode == QmlGraphicsListView::SnapOneItem) {
-            if (FxListItem *item = firstVisibleItem())
-                maxDistance = qAbs(item->position() + _moveX.value());
-        } else if (_moveX.value() < minX) {
-            maxDistance = qAbs(minX -_moveX.value() + (overShoot?30:0));
-        }
-        if (snapMode != QmlGraphicsListView::SnapToItem && highlightRange != QmlGraphicsListView::StrictlyEnforceRange)
-            flickTargetX = minX;
-    } else {
-        if (snapMode == QmlGraphicsListView::SnapOneItem) {
-            if (FxListItem *item = nextVisibleItem())
-                maxDistance = qAbs(item->position() + _moveX.value());
-        } else if (_moveX.value() > maxX) {
-            maxDistance = qAbs(maxX - _moveX.value()) + (overShoot?30:0);
-        }
-        if (snapMode != QmlGraphicsListView::SnapToItem && highlightRange != QmlGraphicsListView::StrictlyEnforceRange)
-            flickTargetX = maxX;
-    }
-    if (maxDistance > 0 && (snapMode != QmlGraphicsListView::NoSnap || highlightRange == QmlGraphicsListView::StrictlyEnforceRange)) {
-        // These modes require the list to stop exactly on an item boundary.
-        // The initial flick will estimate the boundary to stop on.
-        // Since list items can have variable sizes, the boundary will be
-        // reevaluated and adjusted as we approach the boundary.
-        qreal v = velocity;
-        if (maxVelocity != -1 && maxVelocity < qAbs(v)) {
-            if (v < 0)
-                v = -maxVelocity;
-            else
-                v = maxVelocity;
-        }
-        if (!flicked) {
-            // the initial flick - estimate boundary
-            qreal accel = deceleration;
-            qreal v2 = v * v;
-            qreal maxAccel = v2 / (2.0f * maxDistance);
-            if (maxAccel < accel) {
-                qreal dist = v2 / (accel * 2.0);
-                if (v > 0)
-                    dist = -dist;
-                flickTargetX = -snapPosAt(-(_moveX.value() - highlightRangeStart) + dist) + highlightRangeStart;
-                dist = -flickTargetX + _moveX.value();
-                accel = v2 / (2.0f * qAbs(dist));
-                overshootDist = 0.0;
-            } else {
-                flickTargetX = velocity > 0 ? minX : maxX;
-                overshootDist = overShoot ? 30 : 0;
-            }
-            timeline.reset(_moveX);
-            timeline.accel(_moveX, v, accel, maxDistance + overshootDist);
-            timeline.callback(QmlTimeLineCallback(&_moveX, fixupX_callback, this));
-            flicked = true;
-            emit q->flickingChanged();
-            emit q->flickStarted();
-            correctFlick = true;
-        } else {
-            // reevaluate the target boundary.
-            qreal newtarget = flickTargetX;
-            if (snapMode != QmlGraphicsListView::NoSnap || highlightRange == QmlGraphicsListView::StrictlyEnforceRange)
-                newtarget = -snapPosAt(-(flickTargetX - highlightRangeStart)) + highlightRangeStart;
-            if (velocity < 0 && newtarget < maxX)
-                newtarget = maxX;
-            else if (velocity > 0 && newtarget > minX)
-                newtarget = minX;
-            if (newtarget == flickTargetX) // boundary unchanged - nothing to do
-                return;
-            flickTargetX = newtarget;
-            qreal dist = -newtarget + _moveX.value();
-            if ((v < 0 && dist < 0) || (v > 0 && dist > 0)) {
-                correctFlick = false;
-                timeline.reset(_moveX);
-                fixupX();
-                return;
-            }
-            timeline.reset(_moveX);
-            timeline.accelDistance(_moveX, v, -dist + (v < 0 ? -overshootDist : overshootDist));
-            timeline.callback(QmlTimeLineCallback(&_moveX, fixupX_callback, this));
-        }
-    } else {
-        correctFlick = false;
-        timeline.reset(_moveX);
-        fixupX();
-    }
-}
-
-void QmlGraphicsListViewPrivate::flickY(qreal velocity)
-{
-    Q_Q(QmlGraphicsListView);
-
-    moveReason = Mouse;
-    if ((!haveHighlightRange || highlightRange != QmlGraphicsListView::StrictlyEnforceRange) && snapMode == QmlGraphicsListView::NoSnap) {
-        QmlGraphicsFlickablePrivate::flickY(velocity);
-        return;
-    }
-    qreal maxDistance = -1;
-    const qreal maxY = q->maxYExtent();
-    const qreal minY = q->minYExtent();
-    // -ve velocity means list is moving up
-    if (velocity > 0) {
-        if (snapMode == QmlGraphicsListView::SnapOneItem) {
-            if (FxListItem *item = firstVisibleItem())
-                maxDistance = qAbs(item->position() + _moveY.value());
-        } else if (_moveY.value() < minY) {
-            maxDistance = qAbs(minY -_moveY.value() + (overShoot?30:0));
-        }
-        if (snapMode != QmlGraphicsListView::SnapToItem && highlightRange != QmlGraphicsListView::StrictlyEnforceRange)
-            flickTargetY = minY;
-    } else {
-        if (snapMode == QmlGraphicsListView::SnapOneItem) {
-            if (FxListItem *item = nextVisibleItem())
-                maxDistance = qAbs(item->position() + _moveY.value());
-        } else if (_moveY.value() > maxY) {
-            maxDistance = qAbs(maxY - _moveY.value()) + (overShoot?30:0);
-        }
-        if (snapMode != QmlGraphicsListView::SnapToItem && highlightRange != QmlGraphicsListView::StrictlyEnforceRange)
-            flickTargetY = maxY;
-    }
-    if (maxDistance > 0 && (snapMode != QmlGraphicsListView::NoSnap || highlightRange == QmlGraphicsListView::StrictlyEnforceRange)) {
-        // These modes require the list to stop exactly on an item boundary.
-        // The initial flick will estimate the boundary to stop on.
-        // Since list items can have variable sizes, the boundary will be
-        // reevaluated and adjusted as we approach the boundary.
-        qreal v = velocity;
-        if (maxVelocity != -1 && maxVelocity < qAbs(v)) {
-            if (v < 0)
-                v = -maxVelocity;
-            else
-                v = maxVelocity;
-        }
-        if (!flicked) {
-            // the initial flick - estimate boundary
-            qreal accel = deceleration;
-            qreal v2 = v * v;
-            qreal maxAccel = v2 / (2.0f * maxDistance);
-            if (maxAccel < accel) {
-                qreal dist = v2 / (accel * 2.0);
-                if (v > 0)
-                    dist = -dist;
-                flickTargetY = -snapPosAt(-(_moveY.value() - highlightRangeStart) + dist) + highlightRangeStart;
-                dist = -flickTargetY + _moveY.value();
-                accel = v2 / (2.0f * qAbs(dist));
-                overshootDist = 0.0;
-            } else {
-                flickTargetY = velocity > 0 ? minY : maxY;
-                overshootDist = overShoot ? 30 : 0;
-            }
-            timeline.reset(_moveY);
-            timeline.accel(_moveY, v, accel, maxDistance + overshootDist);
-            timeline.callback(QmlTimeLineCallback(&_moveY, fixupY_callback, this));
-            flicked = true;
-            emit q->flickingChanged();
-            emit q->flickStarted();
-            correctFlick = true;
-        } else {
-            // reevaluate the target boundary.
-            qreal newtarget = flickTargetY;
-            if (snapMode != QmlGraphicsListView::NoSnap || highlightRange == QmlGraphicsListView::StrictlyEnforceRange)
-                newtarget = -snapPosAt(-(flickTargetY - highlightRangeStart)) + highlightRangeStart;
-            if (velocity < 0 && newtarget < maxY)
-                newtarget = maxY;
-            else if (velocity > 0 && newtarget > minY)
-                newtarget = minY;
-            if (newtarget == flickTargetY) // boundary unchanged - nothing to do
-                return;
-            flickTargetY = newtarget;
-            qreal dist = -newtarget + _moveY.value();
-            if ((v < 0 && dist < 0) || (v > 0 && dist > 0)) {
-                correctFlick = false;
-                timeline.reset(_moveY);
-                fixupY();
-                return;
-            }
-            timeline.reset(_moveY);
-            timeline.accelDistance(_moveY, v, -dist + (v < 0 ? -overshootDist : overshootDist));
-            timeline.callback(QmlTimeLineCallback(&_moveY, fixupY_callback, this));
-        }
-    } else {
-        correctFlick = false;
-        timeline.reset(_moveY);
-        fixupY();
-    }
-}
-
-//----------------------------------------------------------------------------
-
-/*!
-    \qmlclass ListView QmlGraphicsListView
-    \since 4.7
-    \inherits Flickable
-    \brief The ListView item provides a list view of items provided by a model.
-
-    The model is typically provided by a QAbstractListModel "C++ model object",
-    but can also be created directly in QML. The items are laid out vertically
-    or horizontally and may be flicked to scroll.
-
-    The below example creates a very simple vertical list, using a QML model.
-    \image trivialListView.png
-
-    The user interface defines a delegate to display an item, a highlight,
-    and the ListView which uses the above.
-
-    \snippet doc/src/snippets/declarative/listview/listview.qml 3
-
-    The model is defined as a ListModel using QML:
-    \quotefile doc/src/snippets/declarative/listview/dummydata/ContactModel.qml
-
-    In this case ListModel is a handy way for us to test our UI.  In practice
-    the model would be implemented in C++, or perhaps via a SQL data source.
-*/
-
-QmlGraphicsListView::QmlGraphicsListView(QmlGraphicsItem *parent)
-    : QmlGraphicsFlickable(*(new QmlGraphicsListViewPrivate), parent)
-{
-    Q_D(QmlGraphicsListView);
-    d->init();
-}
-
-QmlGraphicsListView::~QmlGraphicsListView()
-{
-    Q_D(QmlGraphicsListView);
-    d->clear();
-    if (d->ownModel)
-        delete d->model;
-    delete d->header;
-    delete d->footer;
-}
-
-/*!
-    \qmlattachedproperty bool ListView::isCurrentItem
-    This attached property is true if this delegate is the current item; otherwise false.
-
-    It is attached to each instance of the delegate.
-
-    This property may be used to adjust the appearance of the current item, for example:
-
-    \snippet doc/src/snippets/declarative/listview/highlight.qml 0
-*/
-
-/*!
-    \qmlattachedproperty ListView ListView::view
-    This attached property holds the view that manages this delegate instance.
-
-    It is attached to each instance of the delegate.
-*/
-
-/*!
-    \qmlattachedproperty string ListView::prevSection
-    This attached property holds the section of the previous element.
-
-    It is attached to each instance of the delegate.
-
-    The section is evaluated using the \l {ListView::section.property}{section} properties.
-*/
-
-/*!
-    \qmlattachedproperty string ListView::section
-    This attached property holds the section of this element.
-
-    It is attached to each instance of the delegate.
-
-    The section is evaluated using the \l {ListView::section.property}{section} properties.
-*/
-
-/*!
-    \qmlattachedproperty bool ListView::delayRemove
-    This attached property holds whether the delegate may be destroyed.
-
-    It is attached to each instance of the delegate.
-
-    It is sometimes necessary to delay the destruction of an item
-    until an animation completes.
-
-    The example below ensures that the animation completes before
-    the item is removed from the list.
-
-    \code
-    Component {
-        id: myDelegate
-        Item {
-            id: wrapper
-            ListView.onRemove: SequentialAnimation {
-                PropertyAction { target: wrapper.ListView; property: "delayRemove"; value: true }
-                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing: "easeInOutQuad" }
-                PropertyAction { target: wrapper.ListView; property: "delayRemove"; value: false }
-            }
-        }
-    }
-    \endcode
-*/
-
-/*!
-    \qmlattachedsignal ListView::onAdd()
-    This attached handler is called immediately after an item is added to the view.
-*/
-
-/*!
-    \qmlattachedsignal ListView::onRemove()
-    This attached handler is called immediately before an item is removed from the view.
-*/
-
-/*!
-    \qmlproperty model ListView::model
-    This property holds the model providing data for the list.
-
-    The model provides a set of data that is used to create the items
-    for the view.  For large or dynamic datasets the model is usually
-    provided by a C++ model object.  The C++ model object must be a \l
-    {QAbstractItemModel} subclass or a simple list.
-
-    Models can also be created directly in QML, using a \l{ListModel},
-    \l{XmlListModel} or \l{VisualItemModel}.
-
-    \sa {qmlmodels}{Data Models}
-*/
-QVariant QmlGraphicsListView::model() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->modelVariant;
-}
-
-void QmlGraphicsListView::setModel(const QVariant &model)
-{
-    Q_D(QmlGraphicsListView);
-    if (d->model) {
-        disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
-        disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
-        disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
-        disconnect(d->model, SIGNAL(createdItem(int, QmlGraphicsItem*)), this, SLOT(createdItem(int,QmlGraphicsItem*)));
-        disconnect(d->model, SIGNAL(destroyingItem(QmlGraphicsItem*)), this, SLOT(destroyingItem(QmlGraphicsItem*)));
-    }
-    d->clear();
-    d->modelVariant = model;
-    QObject *object = qvariant_cast<QObject*>(model);
-    QmlGraphicsVisualModel *vim = 0;
-    if (object && (vim = qobject_cast<QmlGraphicsVisualModel *>(object))) {
-        if (d->ownModel) {
-            delete d->model;
-            d->ownModel = false;
-        }
-        d->model = vim;
-    } else {
-        if (!d->ownModel) {
-            d->model = new QmlGraphicsVisualDataModel(qmlContext(this));
-            d->ownModel = true;
-        }
-        if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model))
-            dataModel->setModel(model);
-    }
-    if (d->model) {
-        if (isComponentComplete()) {
-            refill();
-            if (d->currentIndex >= d->model->count() || d->currentIndex < 0) {
-                setCurrentIndex(0);
-            } else {
-                d->moveReason = QmlGraphicsListViewPrivate::SetIndex;
-                d->updateCurrent(d->currentIndex);
-            }
-        }
-        connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
-        connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
-        connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
-        connect(d->model, SIGNAL(createdItem(int, QmlGraphicsItem*)), this, SLOT(createdItem(int,QmlGraphicsItem*)));
-        connect(d->model, SIGNAL(destroyingItem(QmlGraphicsItem*)), this, SLOT(destroyingItem(QmlGraphicsItem*)));
-        emit countChanged();
-    }
-}
-
-/*!
-    \qmlproperty component ListView::delegate
-
-    The delegate provides a template defining each item instantiated by the view.
-    The index is exposed as an accessible \c index property.  Properties of the
-    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
-
-    Note that the ListView will layout the items based on the size of the root item
-    in the delegate.
-
-    Here is an example delegate:
-    \snippet doc/src/snippets/declarative/listview/listview.qml 0
-*/
-QmlComponent *QmlGraphicsListView::delegate() const
-{
-    Q_D(const QmlGraphicsListView);
-    if (d->model) {
-        if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model))
-            return dataModel->delegate();
-    }
-
-    return 0;
-}
-
-void QmlGraphicsListView::setDelegate(QmlComponent *delegate)
-{
-    Q_D(QmlGraphicsListView);
-    if (delegate == this->delegate())
-        return;
-    if (!d->ownModel) {
-        d->model = new QmlGraphicsVisualDataModel(qmlContext(this));
-        d->ownModel = true;
-    }
-    if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model)) {
-        dataModel->setDelegate(delegate);
-        if (isComponentComplete()) {
-            for (int i = 0; i < d->visibleItems.count(); ++i)
-                d->releaseItem(d->visibleItems.at(i));
-            d->visibleItems.clear();
-            refill();
-            d->moveReason = QmlGraphicsListViewPrivate::SetIndex;
-            d->updateCurrent(d->currentIndex);
-        }
-    }
-}
-
-/*!
-    \qmlproperty int ListView::currentIndex
-    \qmlproperty Item ListView::currentItem
-
-    \c currentIndex holds the index of the current item.
-    \c currentItem is the current item.  Note that the position of the current item
-    may only be approximate until it becomes visible in the view.
-*/
-int QmlGraphicsListView::currentIndex() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->currentIndex;
-}
-
-void QmlGraphicsListView::setCurrentIndex(int index)
-{
-    Q_D(QmlGraphicsListView);
-    if (isComponentComplete() && d->isValid() && index != d->currentIndex && index < d->model->count() && index >= 0) {
-        d->moveReason = QmlGraphicsListViewPrivate::SetIndex;
-        cancelFlick();
-        d->updateCurrent(index);
-    } else {
-        d->currentIndex = index;
-    }
-}
-
-QmlGraphicsItem *QmlGraphicsListView::currentItem()
-{
-    Q_D(QmlGraphicsListView);
-    if (!d->currentItem)
-        return 0;
-    return d->currentItem->item;
-}
-
-/*!
-  \qmlproperty Item ListView::highlightItem
-
-  \c highlightItem holds the highlight item, which was created
-  from the \l highlight component.
-
-  The highlightItem is managed by the view unless
-  \l highlightFollowsCurrentItem is set to false.
-
-  \sa highlight, highlightFollowsCurrentItem
-*/
-QmlGraphicsItem *QmlGraphicsListView::highlightItem()
-{
-    Q_D(QmlGraphicsListView);
-    if (!d->highlight)
-        return 0;
-    return d->highlight->item;
-}
-
-/*!
-  \qmlproperty int ListView::count
-  This property holds the number of items in the view.
-*/
-int QmlGraphicsListView::count() const
-{
-    Q_D(const QmlGraphicsListView);
-    if (d->model)
-        return d->model->count();
-    return 0;
-}
-
-/*!
-    \qmlproperty component ListView::highlight
-    This property holds the component to use as the highlight.
-
-    An instance of the highlight component will be created for each list.
-    The geometry of the resultant component instance will be managed by the list
-    so as to stay with the current item, unless the highlightFollowsCurrentItem
-    property is false.
-
-    The below example demonstrates how to make a simple highlight
-    for a vertical list.
-
-    \snippet doc/src/snippets/declarative/listview/listview.qml 1
-    \image trivialListView.png
-
-    \sa highlightItem, highlightFollowsCurrentItem
-*/
-QmlComponent *QmlGraphicsListView::highlight() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->highlightComponent;
-}
-
-void QmlGraphicsListView::setHighlight(QmlComponent *highlight)
-{
-    Q_D(QmlGraphicsListView);
-    if (highlight != d->highlightComponent) {
-        d->highlightComponent = highlight;
-        d->createHighlight();
-        if (d->currentItem)
-            d->updateHighlight();
-    }
-}
-
-/*!
-    \qmlproperty bool ListView::highlightFollowsCurrentItem
-    This property holds whether the highlight is managed by the view.
-
-    If highlightFollowsCurrentItem is true, the highlight will be moved smoothly
-    to follow the current item.  If highlightFollowsCurrentItem is false, the
-    highlight will not be moved by the view, and must be implemented
-    by the highlight.  The following example creates a highlight with
-    its motion defined by the spring \l {SpringFollow}:
-
-    \snippet doc/src/snippets/declarative/listview/highlight.qml 1
-
-    Note that the highlight animation also affects the way that the view
-    is scrolled.  This is because the view moves to maintain the
-    highlight within the preferred highlight range (or visible viewport).
-
-    \sa highlight, highlightMoveSpeed
-*/
-bool QmlGraphicsListView::highlightFollowsCurrentItem() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->autoHighlight;
-}
-
-void QmlGraphicsListView::setHighlightFollowsCurrentItem(bool autoHighlight)
-{
-    Q_D(QmlGraphicsListView);
-    if (d->autoHighlight != autoHighlight) {
-        d->autoHighlight = autoHighlight;
-        if (d->highlightPosAnimator) {
-            d->highlightPosAnimator->setEnabled(d->autoHighlight);
-            d->highlightSizeAnimator->setEnabled(d->autoHighlight);
-        }
-        d->updateHighlight();
-    }
-}
-
-//###Possibly rename these properties, since they are very useful even without a highlight?
-/*!
-    \qmlproperty real ListView::preferredHighlightBegin
-    \qmlproperty real ListView::preferredHighlightEnd
-    \qmlproperty enumeration ListView::highlightRangeMode
-
-    These properties set the preferred range of the highlight (current item)
-    within the view.
-
-    Note that this is the correct way to influence where the
-    current item ends up when the list scrolls. For example, if you want the
-    currently selected item to be in the middle of the list, then set the
-    highlight range to be where the middle item would go. Then, when the list scrolls,
-    the currently selected item will be the item at that spot. This also applies to
-    when the currently selected item changes - it will scroll to within the preferred
-    highlight range. Furthermore, the behaviour of the current item index will occur
-    whether or not a highlight exists.
-
-    If highlightRangeMode is set to \e ApplyRange the view will
-    attempt to maintain the highlight within the range, however
-    the highlight can move outside of the range at the ends of the list
-    or due to a mouse interaction.
-
-    If highlightRangeMode is set to \e StrictlyEnforceRange the highlight will never
-    move outside of the range.  This means that the current item will change
-    if a keyboard or mouse action would cause the highlight to move
-    outside of the range.
-
-    The default value is \e NoHighlightRange.
-
-    Note that a valid range requires preferredHighlightEnd to be greater
-    than or equal to preferredHighlightBegin.
-*/
-qreal QmlGraphicsListView::preferredHighlightBegin() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->highlightRangeStart;
-}
-
-void QmlGraphicsListView::setPreferredHighlightBegin(qreal start)
-{
-    Q_D(QmlGraphicsListView);
-    d->highlightRangeStart = start;
-    d->haveHighlightRange = d->highlightRange != NoHighlightRange && d->highlightRangeStart <= d->highlightRangeEnd;
-}
-
-qreal QmlGraphicsListView::preferredHighlightEnd() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->highlightRangeEnd;
-}
-
-void QmlGraphicsListView::setPreferredHighlightEnd(qreal end)
-{
-    Q_D(QmlGraphicsListView);
-    d->highlightRangeEnd = end;
-    d->haveHighlightRange = d->highlightRange != NoHighlightRange && d->highlightRangeStart <= d->highlightRangeEnd;
-}
-
-QmlGraphicsListView::HighlightRangeMode QmlGraphicsListView::highlightRangeMode() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->highlightRange;
-}
-
-void QmlGraphicsListView::setHighlightRangeMode(HighlightRangeMode mode)
-{
-    Q_D(QmlGraphicsListView);
-    d->highlightRange = mode;
-    d->haveHighlightRange = d->highlightRange != NoHighlightRange && d->highlightRangeStart <= d->highlightRangeEnd;
-}
-
-/*!
-    \qmlproperty real ListView::spacing
-
-    This property holds the spacing to leave between items.
-*/
-qreal QmlGraphicsListView::spacing() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->spacing;
-}
-
-void QmlGraphicsListView::setSpacing(qreal spacing)
-{
-    Q_D(QmlGraphicsListView);
-    if (spacing != d->spacing) {
-        d->spacing = spacing;
-        d->layout();
-        emit spacingChanged();
-    }
-}
-
-/*!
-    \qmlproperty enumeration ListView::orientation
-    This property holds the orientation of the list.
-
-    Possible values are \c Vertical (default) and \c Horizontal.
-
-    Vertical Example:
-    \image trivialListView.png
-    Horizontal Example:
-    \image ListViewHorizontal.png
-*/
-QmlGraphicsListView::Orientation QmlGraphicsListView::orientation() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->orient;
-}
-
-void QmlGraphicsListView::setOrientation(QmlGraphicsListView::Orientation orientation)
-{
-    Q_D(QmlGraphicsListView);
-    if (d->orient != orientation) {
-        d->orient = orientation;
-        if (d->orient == QmlGraphicsListView::Vertical) {
-            setViewportWidth(-1);
-            setFlickDirection(VerticalFlick);
-        } else {
-            setViewportHeight(-1);
-            setFlickDirection(HorizontalFlick);
-        }
-        d->clear();
-        refill();
-        emit orientationChanged();
-        d->updateCurrent(d->currentIndex);
-    }
-}
-
-/*!
-    \qmlproperty bool ListView::keyNavigationWraps
-    This property holds whether the list wraps key navigation
-
-    If this property is true then key presses to move off of one end of the list will cause the
-    current item to jump to the other end.
-*/
-bool QmlGraphicsListView::isWrapEnabled() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->wrap;
-}
-
-void QmlGraphicsListView::setWrapEnabled(bool wrap)
-{
-    Q_D(QmlGraphicsListView);
-    d->wrap = wrap;
-}
-
-/*!
-    \qmlproperty int ListView::cacheBuffer
-    This property holds the number of off-screen pixels to cache.
-
-    This property determines the number of pixels above the top of the list
-    and below the bottom of the list to cache.  Setting this value can make
-    scrolling the list smoother at the expense of additional memory usage.
-*/
-int QmlGraphicsListView::cacheBuffer() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->buffer;
-}
-
-void QmlGraphicsListView::setCacheBuffer(int b)
-{
-    Q_D(QmlGraphicsListView);
-    if (d->buffer != b) {
-        d->buffer = b;
-        if (isComponentComplete()) {
-            d->bufferMode = QmlGraphicsListViewPrivate::BufferBefore | QmlGraphicsListViewPrivate::BufferAfter;
-            refill();
-        }
-    }
-}
-
-/*!
-    \qmlproperty string ListView::section.property
-    \qmlproperty enumeration ListView::section.criteria
-    These properties hold the expression to be evaluated for the section attached property.
-
-    section.property hold the name of the property to use to determine
-    the section the item is in.
-
-    section.criteria holds the criteria to use to get the section. It
-    can be either:
-    \list
-    \o ViewSection.FullString (default) - section is the value of the property.
-    \o ViewSection.FirstCharacter - section is the first character of the property value.
-    \endlist
-
-    Each item in the list has attached properties named \c ListView.section and
-    \c ListView.prevSection.  These may be used to place a section header for
-    related items.  The example below assumes that the model is sorted by size of
-    pet.  The section expression is the size property.  If \c ListView.section and
-    \c ListView.prevSection differ, the item will display a section header.
-
-    \snippet examples/declarative/listview/sections.qml 0
-
-    \image ListViewSections.png
-*/
-QmlGraphicsViewSection *QmlGraphicsListView::sectionCriteria()
-{
-    Q_D(QmlGraphicsListView);
-    if (!d->sectionCriteria)
-        d->sectionCriteria = new QmlGraphicsViewSection(this);
-    return d->sectionCriteria;
-}
-
-/*!
-    \qmlproperty string ListView::currentSection
-    This property holds the section that is currently at the beginning of the view.
-*/
-QString QmlGraphicsListView::currentSection() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->currentSection;
-}
-
-/*!
-    \qmlproperty real ListView::highlightMoveSpeed
-    \qmlproperty real ListView::highlightResizeSpeed
-    These properties hold the move and resize animation speed of the highlight delegate.
-
-    highlightFollowsCurrentItem must be true for these properties
-    to have effect.
-
-    The default value for these properties is 400 pixels/second.
-
-    \sa highlightFollowsCurrentItem
-*/
-qreal QmlGraphicsListView::highlightMoveSpeed() const
-{
-    Q_D(const QmlGraphicsListView);\
-    return d->highlightMoveSpeed;
-}
-
-void QmlGraphicsListView::setHighlightMoveSpeed(qreal speed)
-{
-    Q_D(QmlGraphicsListView);\
-    if (d->highlightMoveSpeed != speed) {
-        d->highlightMoveSpeed = speed;
-        if (d->highlightPosAnimator)
-            d->highlightPosAnimator->setVelocity(d->highlightMoveSpeed);
-        emit highlightMoveSpeedChanged();
-    }
-}
-
-qreal QmlGraphicsListView::highlightResizeSpeed() const
-{
-    Q_D(const QmlGraphicsListView);\
-    return d->highlightResizeSpeed;
-}
-
-void QmlGraphicsListView::setHighlightResizeSpeed(qreal speed)
-{
-    Q_D(QmlGraphicsListView);\
-    if (d->highlightResizeSpeed != speed) {
-        d->highlightResizeSpeed = speed;
-        if (d->highlightSizeAnimator)
-            d->highlightSizeAnimator->setVelocity(d->highlightResizeSpeed);
-        emit highlightResizeSpeedChanged();
-    }
-}
-
-/*!
-    \qmlproperty enumeration ListView::snapMode
-
-    This property determines where the view will settle following a drag or flick.
-    The allowed values are:
-
-    \list
-    \o NoSnap (default) - the view will stop anywhere within the visible area.
-    \o SnapToItem - the view will settle with an item aligned with the start of
-    the view.
-    \o SnapOneItem - the view will settle no more than one item away from the first
-    visible item at the time the mouse button is released.  This mode is particularly
-    useful for moving one page at a time.
-    \endlist
-*/
-QmlGraphicsListView::SnapMode QmlGraphicsListView::snapMode() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->snapMode;
-}
-
-void QmlGraphicsListView::setSnapMode(SnapMode mode)
-{
-    Q_D(QmlGraphicsListView);
-    if (d->snapMode != mode) {
-        d->snapMode = mode;
-    }
-}
-
-QmlComponent *QmlGraphicsListView::footer() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->footerComponent;
-}
-
-void QmlGraphicsListView::setFooter(QmlComponent *footer)
-{
-    Q_D(QmlGraphicsListView);
-    if (d->footerComponent != footer) {
-        if (d->footer) {
-            delete d->footer;
-            d->footer = 0;
-        }
-        d->footerComponent = footer;
-        d->minExtentDirty = true;
-        d->maxExtentDirty = true;
-        d->updateFooter();
-        d->updateViewport();
-    }
-}
-
-QmlComponent *QmlGraphicsListView::header() const
-{
-    Q_D(const QmlGraphicsListView);
-    return d->headerComponent;
-}
-
-void QmlGraphicsListView::setHeader(QmlComponent *header)
-{
-    Q_D(QmlGraphicsListView);
-    if (d->headerComponent != header) {
-        if (d->header) {
-            delete d->header;
-            d->header = 0;
-        }
-        d->headerComponent = header;
-        d->minExtentDirty = true;
-        d->maxExtentDirty = true;
-        d->updateHeader();
-        d->updateFooter();
-        d->updateViewport();
-    }
-}
-
-void QmlGraphicsListView::viewportMoved()
-{
-    Q_D(QmlGraphicsListView);
-    QmlGraphicsFlickable::viewportMoved();
-    d->lazyRelease = true;
-    refill();
-    if (isFlicking() || d->moving)
-        d->moveReason = QmlGraphicsListViewPrivate::Mouse;
-    if (d->moveReason != QmlGraphicsListViewPrivate::SetIndex) {
-        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
-            // reposition highlight
-            qreal pos = d->highlight->position();
-            if (pos > d->position() + d->highlightRangeEnd - 1 - d->highlight->size())
-                pos = d->position() + d->highlightRangeEnd - 1 - d->highlight->size();
-            if (pos < d->position() + d->highlightRangeStart)
-                pos = d->position() + d->highlightRangeStart;
-            d->highlight->setPosition(pos);
-
-            // update current index
-            int idx = d->snapIndex();
-            if (idx >= 0 && idx != d->currentIndex)
-                d->updateCurrent(idx);
-        }
-    }
-
-    if (d->flicked && d->correctFlick && !d->inFlickCorrection) {
-        d->inFlickCorrection = true;
-        // Near an end and it seems that the extent has changed?
-        // Recalculate the flick so that we don't end up in an odd position.
-        if (yflick()) {
-            if (d->velocityY > 0) {
-                const qreal minY = minYExtent();
-                if ((minY - d->_moveY.value() < height()/2 || d->flickTargetY - d->_moveY.value() < height()/2)
-                    && minY != d->flickTargetY)
-                    d->flickY(-d->verticalVelocity.value());
-                d->bufferMode = QmlGraphicsListViewPrivate::BufferBefore;
-            } else if (d->velocityY < 0) {
-                const qreal maxY = maxYExtent();
-                if ((d->_moveY.value() - maxY < height()/2 || d->_moveY.value() - d->flickTargetY < height()/2)
-                    && maxY != d->flickTargetY)
-                    d->flickY(-d->verticalVelocity.value());
-                d->bufferMode = QmlGraphicsListViewPrivate::BufferAfter;
-            }
-        }
-
-        if (xflick()) {
-            if (d->velocityX > 0) {
-                const qreal minX = minXExtent();
-                if ((minX - d->_moveX.value() < height()/2 || d->flickTargetX - d->_moveX.value() < height()/2)
-                    && minX != d->flickTargetX)
-                    d->flickX(-d->horizontalVelocity.value());
-                d->bufferMode = QmlGraphicsListViewPrivate::BufferBefore;
-            } else if (d->velocityX < 0) {
-                const qreal maxX = maxXExtent();
-                if ((d->_moveX.value() - maxX < height()/2 || d->_moveX.value() - d->flickTargetX < height()/2)
-                    && maxX != d->flickTargetX)
-                    d->flickX(-d->horizontalVelocity.value());
-                d->bufferMode = QmlGraphicsListViewPrivate::BufferAfter;
-            }
-        }
-        d->inFlickCorrection = false;
-    }
-}
-
-qreal QmlGraphicsListView::minYExtent() const
-{
-    Q_D(const QmlGraphicsListView);
-    if (d->orient == QmlGraphicsListView::Horizontal)
-        return QmlGraphicsFlickable::minYExtent();
-    if (d->minExtentDirty) {
-        d->minExtent = -d->startPosition();
-        if (d->header && d->visibleItems.count())
-            d->minExtent += d->header->size();
-        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
-            d->minExtent += d->highlightRangeStart;
-        d->minExtentDirty = false;
-    }
-
-    return d->minExtent;
-}
-
-qreal QmlGraphicsListView::maxYExtent() const
-{
-    Q_D(const QmlGraphicsListView);
-    if (d->orient == QmlGraphicsListView::Horizontal)
-        return height();
-    if (d->maxExtentDirty) {
-        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
-            d->maxExtent = -(d->positionAt(count()-1) - d->highlightRangeEnd);
-        else
-            d->maxExtent = -(d->endPosition() - height() + 1);
-        if (d->footer)
-            d->maxExtent -= d->footer->size();
-        qreal minY = minYExtent();
-        if (d->maxExtent > minY)
-            d->maxExtent = minY;
-        d->maxExtentDirty = false;
-    }
-    return d->maxExtent;
-}
-
-qreal QmlGraphicsListView::minXExtent() const
-{
-    Q_D(const QmlGraphicsListView);
-    if (d->orient == QmlGraphicsListView::Vertical)
-        return QmlGraphicsFlickable::minXExtent();
-    if (d->minExtentDirty) {
-        d->minExtent = -d->startPosition();
-        if (d->header)
-            d->minExtent += d->header->size();
-        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
-            d->minExtent += d->highlightRangeStart;
-        d->minExtentDirty = false;
-    }
-
-    return d->minExtent;
-}
-
-qreal QmlGraphicsListView::maxXExtent() const
-{
-    Q_D(const QmlGraphicsListView);
-    if (d->orient == QmlGraphicsListView::Vertical)
-        return width();
-    if (d->maxExtentDirty) {
-        if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange)
-            d->maxExtent = -(d->positionAt(count()-1) - d->highlightRangeEnd);
-        else
-            d->maxExtent = -(d->endPosition() - width() + 1);
-        if (d->footer)
-            d->maxExtent -= d->footer->size();
-        qreal minX = minXExtent();
-        if (d->maxExtent > minX)
-            d->maxExtent = minX;
-        d->maxExtentDirty = false;
-    }
-
-    return d->maxExtent;
-}
-
-void QmlGraphicsListView::keyPressEvent(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsListView);
-    QmlGraphicsFlickable::keyPressEvent(event);
-    if (event->isAccepted())
-        return;
-
-    if (d->model && d->model->count() && d->interactive) {
-        if ((d->orient == QmlGraphicsListView::Horizontal && event->key() == Qt::Key_Left)
-                    || (d->orient == QmlGraphicsListView::Vertical && event->key() == Qt::Key_Up)) {
-            if (currentIndex() > 0 || (d->wrap && !event->isAutoRepeat())) {
-                decrementCurrentIndex();
-                event->accept();
-                return;
-            } else if (d->wrap) {
-                event->accept();
-                return;
-            }
-        } else if ((d->orient == QmlGraphicsListView::Horizontal && event->key() == Qt::Key_Right)
-                    || (d->orient == QmlGraphicsListView::Vertical && event->key() == Qt::Key_Down)) {
-            if (currentIndex() < d->model->count() - 1 || (d->wrap && !event->isAutoRepeat())) {
-                incrementCurrentIndex();
-                event->accept();
-                return;
-            } else if (d->wrap) {
-                event->accept();
-                return;
-            }
-        }
-    }
-    event->ignore();
-}
-
-/*!
-    \qmlmethod ListView::incrementCurrentIndex()
-
-    Increments the current index.  The current index will wrap
-    if keyNavigationWraps is true and it is currently at the end.
-*/
-void QmlGraphicsListView::incrementCurrentIndex()
-{
-    Q_D(QmlGraphicsListView);
-    if (currentIndex() < d->model->count() - 1 || d->wrap) {
-        d->moveReason = QmlGraphicsListViewPrivate::SetIndex;
-        int index = currentIndex()+1;
-        cancelFlick();
-        d->updateCurrent(index < d->model->count() ? index : 0);
-    }
-}
-
-/*!
-    \qmlmethod ListView::decrementCurrentIndex()
-
-    Decrements the current index.  The current index will wrap
-    if keyNavigationWraps is true and it is currently at the beginning.
-*/
-void QmlGraphicsListView::decrementCurrentIndex()
-{
-    Q_D(QmlGraphicsListView);
-    if (currentIndex() > 0 || d->wrap) {
-        d->moveReason = QmlGraphicsListViewPrivate::SetIndex;
-        int index = currentIndex()-1;
-        cancelFlick();
-        d->updateCurrent(index >= 0 ? index : d->model->count()-1);
-    }
-}
-
-/*!
-    \qmlmethod ListView::positionViewAtIndex(int index)
-
-    Positions the view such that the \a index is at the top (or left for horizontal orientation) of the view.
-    If positioning the view at the index would cause empty space to be displayed at
-    the end of the view, the view will be positioned at the end.
-*/
-void QmlGraphicsListView::positionViewAtIndex(int index)
-{
-    Q_D(QmlGraphicsListView);
-    if (!d->isValid() || index < 0 || index >= d->model->count())
-        return;
-
-    qreal maxExtent = d->orient == QmlGraphicsListView::Vertical ? -maxYExtent() : -maxXExtent();
-    FxListItem *item = d->visibleItem(index);
-    if (item) {
-        // Already created - just move to top of view
-        int pos = qMin(item->position(), maxExtent);
-        d->setPosition(pos);
-    } else {
-        int pos = d->positionAt(index);
-        // save the currently visible items in case any of them end up visible again
-        QList<FxListItem*> oldVisible = d->visibleItems;
-        d->visibleItems.clear();
-        d->visiblePos = pos;
-        d->visibleIndex = index;
-        d->setPosition(pos);
-        // setPosition() will cause refill.  Adjust if we have moved beyond range.
-        if (d->position() > maxExtent)
-            d->setPosition(maxExtent);
-        // now release the reference to all the old visible items.
-        for (int i = 0; i < oldVisible.count(); ++i)
-            d->releaseItem(oldVisible.at(i));
-    }
-    d->fixupPosition();
-}
-
-
-void QmlGraphicsListView::componentComplete()
-{
-    Q_D(QmlGraphicsListView);
-    QmlGraphicsFlickable::componentComplete();
-    refill();
-    d->moveReason = QmlGraphicsListViewPrivate::SetIndex;
-    if (d->currentIndex < 0)
-        d->updateCurrent(0);
-    else
-        d->updateCurrent(d->currentIndex);
-    d->fixupPosition();
-}
-
-void QmlGraphicsListView::refill()
-{
-    Q_D(QmlGraphicsListView);
-    d->refill(d->position(), d->position()+d->size()-1);
-}
-
-void QmlGraphicsListView::trackedPositionChanged()
-{
-    Q_D(QmlGraphicsListView);
-    if (!d->trackedItem || !d->currentItem)
-        return;
-    if (!isFlicking() && !d->moving && d->moveReason == QmlGraphicsListViewPrivate::SetIndex) {
-        const qreal trackedPos = d->trackedItem->position();
-        const qreal viewPos = d->position();
-        if (d->haveHighlightRange) {
-            if (d->highlightRange == StrictlyEnforceRange) {
-                qreal pos = viewPos;
-                if (trackedPos > pos + d->highlightRangeEnd - d->trackedItem->size())
-                    pos = trackedPos - d->highlightRangeEnd + d->trackedItem->size();
-                if (trackedPos < pos + d->highlightRangeStart)
-                    pos = trackedPos - d->highlightRangeStart;
-                d->setPosition(pos);
-            } else {
-                qreal pos = viewPos;
-                if (trackedPos < d->startPosition() + d->highlightRangeStart) {
-                    pos = d->startPosition();
-                } else if (d->trackedItem->endPosition() > d->endPosition() - d->size() + d->highlightRangeEnd) {
-                    pos = d->endPosition() - d->size();
-                    if (pos < d->startPosition())
-                        pos = d->startPosition();
-                } else {
-                    if (trackedPos < viewPos + d->highlightRangeStart) {
-                        pos = trackedPos - d->highlightRangeStart;
-                    } else if (trackedPos > viewPos + d->highlightRangeEnd - d->trackedItem->size()) {
-                        pos = trackedPos - d->highlightRangeEnd + d->trackedItem->size();
-                    }
-                }
-                d->setPosition(pos);
-            }
-        } else {
-            if (trackedPos < viewPos && d->currentItem->position() < viewPos) {
-                d->setPosition(d->currentItem->position() < trackedPos ? trackedPos : d->currentItem->position());
-            } else if (d->trackedItem->endPosition() > viewPos + d->size()
-                        && d->currentItem->endPosition() > viewPos + d->size()) {
-                qreal pos;
-                if (d->trackedItem->endPosition() < d->currentItem->endPosition()) {
-                    pos = d->trackedItem->endPosition() - d->size();
-                    if (d->trackedItem->size() > d->size())
-                        pos = trackedPos;
-                } else {
-                    pos = d->currentItem->endPosition() - d->size();
-                    if (d->currentItem->size() > d->size())
-                        pos = d->currentItem->position();
-                }
-                d->setPosition(pos);
-            }
-        }
-    }
-}
-
-void QmlGraphicsListView::itemsInserted(int modelIndex, int count)
-{
-    Q_D(QmlGraphicsListView);
-    d->updateUnrequestedIndexes();
-    d->moveReason = QmlGraphicsListViewPrivate::Other;
-    if (!d->visibleItems.count() || d->model->count() <= 1) {
-        d->layout();
-        d->updateCurrent(qMax(0, qMin(d->currentIndex, d->model->count()-1)));
-        emit countChanged();
-        return;
-    }
-
-    int overlapCount = count;
-    if (!d->mapRangeFromModel(modelIndex, overlapCount)) {
-        int i = d->visibleItems.count() - 1;
-        while (i > 0 && d->visibleItems.at(i)->index == -1)
-            --i;
-        if (d->visibleItems.at(i)->index + 1 == modelIndex) {
-            // Special case of appending an item to the model.
-            modelIndex = d->visibleIndex + d->visibleItems.count();
-        } else {
-            if (modelIndex < d->visibleIndex) {
-                // Insert before visible items
-                d->visibleIndex += count;
-                for (int i = 0; i < d->visibleItems.count(); ++i) {
-                    FxListItem *listItem = d->visibleItems.at(i);
-                    if (listItem->index != -1 && listItem->index >= modelIndex)
-                        listItem->index += count;
-                }
-            }
-            if (d->currentIndex >= modelIndex) {
-                // adjust current item index
-                d->currentIndex += count;
-                if (d->currentItem)
-                    d->currentItem->index = d->currentIndex;
-            }
-            d->layout();
-            emit countChanged();
-            return;
-        }
-    }
-
-    // At least some of the added items will be visible
-
-    int index = modelIndex - d->visibleIndex;
-    // index can be the next item past the end of the visible items list (i.e. appended)
-    int pos = index < d->visibleItems.count() ? d->visibleItems.at(index)->position()
-                                                : d->visibleItems.at(index-1)->endPosition()+d->spacing+1;
-    int initialPos = pos;
-    int diff = 0;
-    QList<FxListItem*> added;
-    bool addedVisible = false;
-    FxListItem *firstVisible = d->firstVisibleItem();
-    if (firstVisible && pos < firstVisible->position()) {
-        // Insert items before the visible item.
-        int insertionIdx = index;
-        int i = 0;
-        int from = d->position() - d->buffer;
-        for (i = count-1; i >= 0 && pos > from; --i) {
-            addedVisible = true;
-            FxListItem *item = d->createItem(modelIndex + i);
-            d->visibleItems.insert(insertionIdx, item);
-            pos -= item->size() + d->spacing;
-            item->setPosition(pos);
-            index++;
-        }
-        if (i >= 0) {
-            // If we didn't insert all our new items - anything
-            // before the current index is not visible - remove it.
-            while (insertionIdx--) {
-                FxListItem *item = d->visibleItems.takeFirst();
-                if (item->index != -1)
-                    d->visibleIndex++;
-                d->releaseItem(item);
-            }
-        } else {
-            // adjust pos of items before inserted items.
-            for (int i = insertionIdx-1; i >= 0; i--) {
-                FxListItem *listItem = d->visibleItems.at(i);
-                listItem->setPosition(listItem->position() - (initialPos - pos));
-            }
-        }
-    } else {
-        int i = 0;
-        int to = d->buffer+d->position()+d->size()-1;
-        for (i = 0; i < count && pos <= to; ++i) {
-            addedVisible = true;
-            FxListItem *item = d->createItem(modelIndex + i);
-            d->visibleItems.insert(index, item);
-            item->setPosition(pos);
-            added.append(item);
-            pos += item->size() + d->spacing;
-            ++index;
-        }
-        if (i != count) {
-            // We didn't insert all our new items, which means anything
-            // beyond the current index is not visible - remove it.
-            while (d->visibleItems.count() > index)
-                d->releaseItem(d->visibleItems.takeLast());
-        }
-        diff = pos - initialPos;
-    }
-    if (d->currentIndex >= modelIndex) {
-        // adjust current item index
-        d->currentIndex += count;
-        if (d->currentItem) {
-            d->currentItem->index = d->currentIndex;
-            d->currentItem->setPosition(d->currentItem->position() + diff);
-        }
-    }
-    // Update the indexes of the following visible items.
-    for (; index < d->visibleItems.count(); ++index) {
-        FxListItem *listItem = d->visibleItems.at(index);
-        if (d->currentItem && listItem->item != d->currentItem->item)
-            listItem->setPosition(listItem->position() + diff);
-        if (listItem->index != -1)
-            listItem->index += count;
-    }
-    // everything is in order now - emit add() signal
-    for (int j = 0; j < added.count(); ++j)
-        added.at(j)->attached->emitAdd();
-
-    if (addedVisible)
-        d->layout();
-    emit countChanged();
-}
-
-void QmlGraphicsListView::itemsRemoved(int modelIndex, int count)
-{
-    Q_D(QmlGraphicsListView);
-    d->moveReason = QmlGraphicsListViewPrivate::Other;
-    d->updateUnrequestedIndexes();
-
-    FxListItem *firstVisible = d->firstVisibleItem();
-    int preRemovedSize = 0;
-    bool removedVisible = false;
-    // Remove the items from the visible list, skipping anything already marked for removal
-    QList<FxListItem*>::Iterator it = d->visibleItems.begin();
-    while (it != d->visibleItems.end()) {
-        FxListItem *item = *it;
-        if (item->index == -1 || item->index < modelIndex) {
-            // already removed, or before removed items
-            ++it;
-        } else if (item->index >= modelIndex + count) {
-            // after removed items
-            item->index -= count;
-            ++it;
-        } else {
-            // removed item
-            removedVisible = true;
-            item->attached->emitRemove();
-            if (item->attached->delayRemove()) {
-                item->index = -1;
-                connect(item->attached, SIGNAL(delayRemoveChanged()), this, SLOT(destroyRemoved()), Qt::QueuedConnection);
-                ++it;
-            } else {
-                if (item == firstVisible)
-                    firstVisible = 0;
-                if (firstVisible && item->position() < firstVisible->position())
-                    preRemovedSize += item->size();
-                it = d->visibleItems.erase(it);
-                d->releaseItem(item);
-            }
-        }
-    }
-
-    if (firstVisible && d->visibleItems.first() != firstVisible)
-        d->visibleItems.first()->setPosition(d->visibleItems.first()->position() + preRemovedSize);
-
-    // fix current
-    if (d->currentIndex >= modelIndex + count) {
-        d->currentIndex -= count;
-        if (d->currentItem)
-            d->currentItem->index -= count;
-    } else if (d->currentIndex >= modelIndex && d->currentIndex < modelIndex + count) {
-        // current item has been removed.
-        d->currentItem->attached->setIsCurrentItem(false);
-        d->releaseItem(d->currentItem);
-        d->currentItem = 0;
-        d->currentIndex = -1;
-        d->updateCurrent(qMin(modelIndex, d->model->count()-1));
-    }
-
-    // update visibleIndex
-    for (it = d->visibleItems.begin(); it != d->visibleItems.end(); ++it) {
-        if ((*it)->index != -1) {
-            d->visibleIndex = (*it)->index;
-            break;
-        }
-    }
-
-    if (removedVisible) {
-        if (d->visibleItems.isEmpty()) {
-            d->visibleIndex = 0;
-            d->visiblePos = d->header ? d->header->size() : 0;
-            d->timeline.clear();
-            d->setPosition(0);
-            if (d->model->count() == 0)
-                update();
-            else
-                refill();
-        } else {
-            // Correct the positioning of the items
-            d->layout();
-        }
-    }
-
-    emit countChanged();
-}
-
-void QmlGraphicsListView::destroyRemoved()
-{
-    Q_D(QmlGraphicsListView);
-    for (QList<FxListItem*>::Iterator it = d->visibleItems.begin();
-            it != d->visibleItems.end();) {
-        FxListItem *listItem = *it;
-        if (listItem->index == -1 && listItem->attached->delayRemove() == false) {
-            d->releaseItem(listItem);
-            it = d->visibleItems.erase(it);
-        } else {
-            ++it;
-        }
-    }
-
-    // Correct the positioning of the items
-    d->layout();
-}
-
-void QmlGraphicsListView::itemsMoved(int from, int to, int count)
-{
-    Q_D(QmlGraphicsListView);
-    d->updateUnrequestedIndexes();
-
-    if (d->visibleItems.isEmpty()) {
-        refill();
-        return;
-    }
-
-    d->moveReason = QmlGraphicsListViewPrivate::Other;
-    FxListItem *firstVisible = d->firstVisibleItem();
-    qreal firstItemPos = firstVisible->position();
-    QHash<int,FxListItem*> moved;
-    int moveBy = 0;
-
-    QList<FxListItem*>::Iterator it = d->visibleItems.begin();
-    while (it != d->visibleItems.end()) {
-        FxListItem *item = *it;
-        if (item->index >= from && item->index < from + count) {
-            // take the items that are moving
-            item->index += (to-from);
-            moved.insert(item->index, item);
-            if (item->position() < firstItemPos)
-                moveBy += item->size();
-            it = d->visibleItems.erase(it);
-        } else {
-            // move everything after the moved items.
-            if (item->index > from && item->index != -1)
-                item->index -= count;
-            ++it;
-        }
-    }
-
-    int remaining = count;
-    int endIndex = d->visibleIndex;
-    it = d->visibleItems.begin();
-    while (it != d->visibleItems.end()) {
-        FxListItem *item = *it;
-        if (remaining && item->index >= to && item->index < to + count) {
-            // place items in the target position, reusing any existing items
-            FxListItem *movedItem = moved.take(item->index);
-            if (!movedItem)
-                movedItem = d->createItem(item->index);
-            if (item->index <= firstVisible->index)
-                moveBy -= movedItem->size();
-            it = d->visibleItems.insert(it, movedItem);
-            ++it;
-            --remaining;
-        } else {
-            if (item->index != -1) {
-                if (item->index >= to) {
-                    // update everything after the moved items.
-                    item->index += count;
-                }
-                endIndex = item->index;
-            }
-            ++it;
-        }
-    }
-
-    // If we have moved items to the end of the visible items
-    // then add any existing moved items that we have
-    while (FxListItem *item = moved.take(endIndex+1)) {
-        d->visibleItems.append(item);
-        ++endIndex;
-    }
-
-    // update visibleIndex
-    for (it = d->visibleItems.begin(); it != d->visibleItems.end(); ++it) {
-        if ((*it)->index != -1) {
-            d->visibleIndex = (*it)->index;
-            break;
-        }
-    }
-
-    // Fix current index
-    if (d->currentIndex >= 0 && d->currentItem) {
-        int oldCurrent = d->currentIndex;
-        d->currentIndex = d->model->indexOf(d->currentItem->item, this);
-        if (oldCurrent != d->currentIndex) {
-            d->currentItem->index = d->currentIndex;
-            emit currentIndexChanged();
-        }
-    }
-
-    // Whatever moved items remain are no longer visible items.
-    while (moved.count()) {
-        int idx = moved.begin().key();
-        FxListItem *item = moved.take(idx);
-        if (item->item == d->currentItem->item)
-            item->setPosition(d->positionAt(idx));
-        d->releaseItem(item);
-    }
-
-    // Ensure we don't cause an ugly list scroll.
-    d->visibleItems.first()->setPosition(d->visibleItems.first()->position() + moveBy);
-
-    d->layout();
-}
-
-void QmlGraphicsListView::createdItem(int index, QmlGraphicsItem *item)
-{
-    Q_D(QmlGraphicsListView);
-    if (d->requestedIndex != index) {
-        item->setParentItem(viewport());
-        d->unrequestedItems.insert(item, index);
-        if (d->orient == QmlGraphicsListView::Vertical)
-            item->setY(d->positionAt(index));
-        else
-            item->setX(d->positionAt(index));
-    }
-}
-
-void QmlGraphicsListView::destroyingItem(QmlGraphicsItem *item)
-{
-    Q_D(QmlGraphicsListView);
-    d->unrequestedItems.remove(item);
-}
-
-void QmlGraphicsListView::animStopped()
-{
-    Q_D(QmlGraphicsListView);
-    d->moveReason = QmlGraphicsListViewPrivate::Other;
-    d->bufferMode = QmlGraphicsListViewPrivate::NoBuffer;
-}
-
-QmlGraphicsListViewAttached *QmlGraphicsListView::qmlAttachedProperties(QObject *obj)
-{
-    return new QmlGraphicsListViewAttached(obj);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
deleted file mode 100644
index c5b4aab..0000000
--- a/src/declarative/graphicsitems/qmlgraphicslistview_p.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSLISTVIEW_H
-#define QMLGRAPHICSLISTVIEW_H
-
-#include "qmlgraphicsflickable_p.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsViewSection : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY changed)
-    Q_PROPERTY(SectionCriteria criteria READ criteria WRITE setCriteria NOTIFY changed)
-    Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
-    Q_ENUMS(SectionCriteria)
-public:
-    QmlGraphicsViewSection(QObject *parent=0) : QObject(parent), m_criteria(FullString), m_delegate(0) {}
-
-    QString property() const { return m_property; }
-    void setProperty(const QString &);
-
-    enum SectionCriteria { FullString, FirstCharacter };
-    SectionCriteria criteria() const { return m_criteria; }
-    void setCriteria(SectionCriteria);
-
-    QmlComponent *delegate() const { return m_delegate; }
-    void setDelegate(QmlComponent *delegate);
-
-    QString sectionString(const QString &value);
-
-Q_SIGNALS:
-    void changed();
-    void delegateChanged();
-
-private:
-    QString m_property;
-    SectionCriteria m_criteria;
-    QmlComponent *m_delegate;
-};
-
-
-class QmlGraphicsVisualModel;
-class QmlGraphicsListViewAttached;
-class QmlGraphicsListViewPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsListView : public QmlGraphicsFlickable
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsListView)
-
-    Q_PROPERTY(QVariant model READ model WRITE setModel)
-    Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate)
-    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
-    Q_PROPERTY(QmlGraphicsItem *currentItem READ currentItem NOTIFY currentIndexChanged)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-
-    Q_PROPERTY(QmlComponent *highlight READ highlight WRITE setHighlight)
-    Q_PROPERTY(QmlGraphicsItem *highlightItem READ highlightItem NOTIFY highlightChanged)
-    Q_PROPERTY(bool highlightFollowsCurrentItem READ highlightFollowsCurrentItem WRITE setHighlightFollowsCurrentItem)
-    Q_PROPERTY(qreal highlightMoveSpeed READ highlightMoveSpeed WRITE setHighlightMoveSpeed NOTIFY highlightMoveSpeedChanged)
-    Q_PROPERTY(qreal highlightResizeSpeed READ highlightResizeSpeed WRITE setHighlightResizeSpeed NOTIFY highlightResizeSpeedChanged)
-
-    Q_PROPERTY(qreal preferredHighlightBegin READ preferredHighlightBegin WRITE setPreferredHighlightBegin)
-    Q_PROPERTY(qreal preferredHighlightEnd READ preferredHighlightEnd WRITE setPreferredHighlightEnd)
-    Q_PROPERTY(HighlightRangeMode highlightRangeMode READ highlightRangeMode WRITE setHighlightRangeMode)
-
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
-    Q_PROPERTY(Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged)
-    Q_PROPERTY(bool keyNavigationWraps READ isWrapEnabled WRITE setWrapEnabled)
-    Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer)
-    Q_PROPERTY(QmlGraphicsViewSection *section READ sectionCriteria CONSTANT)
-    Q_PROPERTY(QString currentSection READ currentSection NOTIFY currentSectionChanged)
-
-    Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode)
-
-    Q_PROPERTY(QmlComponent *header READ header WRITE setHeader)
-    Q_PROPERTY(QmlComponent *footer READ footer WRITE setFooter)
-
-    Q_ENUMS(HighlightRangeMode)
-    Q_ENUMS(Orientation)
-    Q_ENUMS(SnapMode)
-    Q_CLASSINFO("DefaultProperty", "data")
-
-public:
-    QmlGraphicsListView(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsListView();
-
-    QVariant model() const;
-    void setModel(const QVariant &);
-
-    QmlComponent *delegate() const;
-    void setDelegate(QmlComponent *);
-
-    int currentIndex() const;
-    void setCurrentIndex(int idx);
-
-    QmlGraphicsItem *currentItem();
-    QmlGraphicsItem *highlightItem();
-    int count() const;
-
-    QmlComponent *highlight() const;
-    void setHighlight(QmlComponent *highlight);
-
-    bool highlightFollowsCurrentItem() const;
-    void setHighlightFollowsCurrentItem(bool);
-
-    enum HighlightRangeMode { NoHighlightRange, ApplyRange, StrictlyEnforceRange };
-    HighlightRangeMode highlightRangeMode() const;
-    void setHighlightRangeMode(HighlightRangeMode mode);
-
-    qreal preferredHighlightBegin() const;
-    void setPreferredHighlightBegin(qreal);
-
-    qreal preferredHighlightEnd() const;
-    void setPreferredHighlightEnd(qreal);
-
-    qreal spacing() const;
-    void setSpacing(qreal spacing);
-
-    enum Orientation { Horizontal = Qt::Horizontal, Vertical = Qt::Vertical };
-    Orientation orientation() const;
-    void setOrientation(Orientation);
-
-    bool isWrapEnabled() const;
-    void setWrapEnabled(bool);
-
-    int cacheBuffer() const;
-    void setCacheBuffer(int);
-
-    QmlGraphicsViewSection *sectionCriteria();
-    QString currentSection() const;
-
-    qreal highlightMoveSpeed() const;
-    void setHighlightMoveSpeed(qreal);
-
-    qreal highlightResizeSpeed() const;
-    void setHighlightResizeSpeed(qreal);
-
-    enum SnapMode { NoSnap, SnapToItem, SnapOneItem };
-    SnapMode snapMode() const;
-    void setSnapMode(SnapMode mode);
-
-    QmlComponent *footer() const;
-    void setFooter(QmlComponent *);
-
-    QmlComponent *header() const;
-    void setHeader(QmlComponent *);
-
-    static QmlGraphicsListViewAttached *qmlAttachedProperties(QObject *);
-
-public Q_SLOTS:
-    void incrementCurrentIndex();
-    void decrementCurrentIndex();
-    void positionViewAtIndex(int index);
-
-Q_SIGNALS:
-    void countChanged();
-    void spacingChanged();
-    void orientationChanged();
-    void currentIndexChanged();
-    void currentSectionChanged();
-    void highlightMoveSpeedChanged();
-    void highlightResizeSpeedChanged();
-    void highlightChanged();
-
-protected:
-    virtual void viewportMoved();
-    virtual qreal minYExtent() const;
-    virtual qreal maxYExtent() const;
-    virtual qreal minXExtent() const;
-    virtual qreal maxXExtent() const;
-    virtual void keyPressEvent(QKeyEvent *);
-    virtual void componentComplete();
-
-private Q_SLOTS:
-    void refill();
-    void trackedPositionChanged();
-    void itemsInserted(int index, int count);
-    void itemsRemoved(int index, int count);
-    void itemsMoved(int from, int to, int count);
-    void destroyRemoved();
-    void createdItem(int index, QmlGraphicsItem *item);
-    void destroyingItem(QmlGraphicsItem *item);
-    void animStopped();
-};
-
-class QmlGraphicsListViewAttached : public QObject
-{
-    Q_OBJECT
-public:
-    QmlGraphicsListViewAttached(QObject *parent)
-        : QObject(parent), m_view(0), m_isCurrent(false), m_delayRemove(false) {}
-    ~QmlGraphicsListViewAttached() {}
-
-    Q_PROPERTY(QmlGraphicsListView *view READ view CONSTANT)
-    QmlGraphicsListView *view() { return m_view; }
-
-    Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged)
-    bool isCurrentItem() const { return m_isCurrent; }
-    void setIsCurrentItem(bool c) {
-        if (m_isCurrent != c) {
-            m_isCurrent = c;
-            emit currentItemChanged();
-        }
-    }
-
-    Q_PROPERTY(QString prevSection READ prevSection NOTIFY prevSectionChanged)
-    QString prevSection() const { return m_prevSection; }
-    void setPrevSection(const QString &sect) {
-        if (m_prevSection != sect) {
-            m_prevSection = sect;
-            emit prevSectionChanged();
-        }
-    }
-
-    Q_PROPERTY(QString section READ section NOTIFY sectionChanged)
-    QString section() const { return m_section; }
-    void setSection(const QString &sect) {
-        if (m_section != sect) {
-            m_section = sect;
-            emit sectionChanged();
-        }
-    }
-
-    Q_PROPERTY(bool delayRemove READ delayRemove WRITE setDelayRemove NOTIFY delayRemoveChanged)
-    bool delayRemove() const { return m_delayRemove; }
-    void setDelayRemove(bool delay) {
-        if (m_delayRemove != delay) {
-            m_delayRemove = delay;
-            emit delayRemoveChanged();
-        }
-    }
-
-    void emitAdd() { emit add(); }
-    void emitRemove() { emit remove(); }
-
-Q_SIGNALS:
-    void currentItemChanged();
-    void sectionChanged();
-    void prevSectionChanged();
-    void delayRemoveChanged();
-    void add();
-    void remove();
-
-public:
-    QmlGraphicsListView *m_view;
-    bool m_isCurrent;
-    mutable QString m_section;
-    QString m_prevSection;
-    bool m_delayRemove;
-};
-
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPEINFO(QmlGraphicsListView, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QmlGraphicsListView)
-QML_DECLARE_TYPE(QmlGraphicsViewSection)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
deleted file mode 100644
index b9780f2..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsloader_p_p.h"
-
-#include <qmlengine_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QmlGraphicsLoaderPrivate::QmlGraphicsLoaderPrivate()
-    : item(0), component(0), ownComponent(false)
-    , resizeMode(QmlGraphicsLoader::SizeLoaderToItem)
-{
-}
-
-QmlGraphicsLoaderPrivate::~QmlGraphicsLoaderPrivate()
-{
-}
-
-void QmlGraphicsLoaderPrivate::itemGeometryChanged(QmlGraphicsItem *resizeItem, const QRectF &newGeometry, const QRectF &oldGeometry)
-{
-    if (resizeItem == item && resizeMode == QmlGraphicsLoader::SizeLoaderToItem) {
-        _q_updateSize();
-    }
-    QmlGraphicsItemChangeListener::itemGeometryChanged(resizeItem, newGeometry, oldGeometry);
-}
-
-void QmlGraphicsLoaderPrivate::clear()
-{
-    if (ownComponent) {
-        delete component;
-        component = 0;
-        ownComponent = false;
-    }
-    source = QUrl();
-
-    if (item) {
-        if (QmlGraphicsItem *qmlItem = qobject_cast<QmlGraphicsItem*>(item)) {
-            if (resizeMode == QmlGraphicsLoader::SizeLoaderToItem) {
-                QmlGraphicsItemPrivate *p =
-                    static_cast<QmlGraphicsItemPrivate *>(QGraphicsItemPrivate::get(qmlItem));
-                p->removeItemChangeListener(this, QmlGraphicsItemPrivate::Geometry);
-            }
-        }
-
-        // We can't delete immediately because our item may have triggered
-        // the Loader to load a different item.
-        item->setVisible(false);
-        item->setParentItem(0);
-        item->deleteLater();
-        item = 0;
-    }
-}
-
-void QmlGraphicsLoaderPrivate::initResize()
-{
-    Q_Q(QmlGraphicsLoader);
-    if (QmlGraphicsItem *qmlItem = qobject_cast<QmlGraphicsItem*>(item)) {
-        if (resizeMode == QmlGraphicsLoader::SizeLoaderToItem) {
-            QmlGraphicsItemPrivate *p =
-                static_cast<QmlGraphicsItemPrivate *>(QGraphicsItemPrivate::get(qmlItem));
-            p->addItemChangeListener(this, QmlGraphicsItemPrivate::Geometry);
-        }
-    } else if (item && item->isWidget()) {
-        QGraphicsWidget *widget = static_cast<QGraphicsWidget*>(item);
-        if (resizeMode == QmlGraphicsLoader::SizeLoaderToItem) {
-            widget->installEventFilter(q);
-        }
-    }
-    _q_updateSize();
-}
-
-/*!
-    \qmlclass Loader QmlGraphicsLoader
-    \since 4.7
-    \inherits Item
-
-    \brief The Loader item allows dynamically loading an Item-based
-    subtree from a QML URL or Component.
-
-    Loader instantiates an item from a component. The component to
-    instantiate may be specified directly by the \c sourceComponent
-    property, or loaded from a URL via the \c source property.
-
-    It is also an effective means of delaying the creation of a component
-    until it is required:
-    \code
-    Loader { id: pageLoader }
-    Rectangle {
-        MouseArea { anchors.fill: parent; onClicked: pageLoader.source = "Page1.qml" }
-    }
-    \endcode
-
-    If the Loader source is changed, any previous items instantiated
-    will be destroyed.  Setting \c source to an empty string
-    will destroy the currently instantiated items, freeing resources
-    and leaving the Loader empty.  For example:
-
-    \code
-    pageLoader.source = ""
-    \endcode
-
-    unloads "Page1.qml" and frees resources consumed by it.
-
-    \sa {dynamic-object-creation}{Dynamic Object Creation}
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsLoader
-    \qmlclass Loader
- */
-
-/*!
-    Create a new QmlGraphicsLoader instance.
- */
-QmlGraphicsLoader::QmlGraphicsLoader(QmlGraphicsItem *parent)
-  : QmlGraphicsItem(*(new QmlGraphicsLoaderPrivate), parent)
-{
-}
-
-/*!
-    Destroy the loader instance.
- */
-QmlGraphicsLoader::~QmlGraphicsLoader()
-{
-}
-
-/*!
-    \qmlproperty url Loader::source
-    This property holds the URL of the QML component to
-    instantiate.
-
-    \sa sourceComponent, status, progress
-*/
-QUrl QmlGraphicsLoader::source() const
-{
-    Q_D(const QmlGraphicsLoader);
-    return d->source;
-}
-
-void QmlGraphicsLoader::setSource(const QUrl &url)
-{
-    Q_D(QmlGraphicsLoader);
-    if (d->source == url)
-        return;
-
-    d->clear();
-
-    d->source = url;
-    if (d->source.isEmpty()) {
-        emit sourceChanged();
-        emit statusChanged();
-        emit progressChanged();
-        emit itemChanged();
-        return;
-    }
-
-    d->component = new QmlComponent(qmlEngine(this), d->source, this);
-    d->ownComponent = true;
-    if (!d->component->isLoading()) {
-        d->_q_sourceLoaded();
-    } else {
-        connect(d->component, SIGNAL(statusChanged(QmlComponent::Status)),
-                this, SLOT(_q_sourceLoaded()));
-        connect(d->component, SIGNAL(progressChanged(qreal)),
-                this, SIGNAL(progressChanged()));
-        emit statusChanged();
-        emit progressChanged();
-        emit sourceChanged();
-        emit itemChanged();
-    }
-}
-
-/*!
-    \qmlproperty Component Loader::sourceComponent
-    The sourceComponent property holds the \l{Component} to instantiate.
-
-    \qml
-    Item {
-        Component {
-            id: redSquare
-            Rectangle { color: "red"; width: 10; height: 10 }
-        }
-
-        Loader { sourceComponent: redSquare }
-        Loader { sourceComponent: redSquare; x: 10 }
-    }
-    \endqml
-
-    \sa source, progress
-*/
-
-QmlComponent *QmlGraphicsLoader::sourceComponent() const
-{
-    Q_D(const QmlGraphicsLoader);
-    return d->component;
-}
-
-void QmlGraphicsLoader::setSourceComponent(QmlComponent *comp)
-{
-    Q_D(QmlGraphicsLoader);
-    if (comp == d->component)
-        return;
-
-    d->clear();
-
-    d->component = comp;
-    d->ownComponent = false;
-    if (!d->component) {
-        emit sourceChanged();
-        emit statusChanged();
-        emit progressChanged();
-        emit itemChanged();
-        return;
-    }
-
-    if (!d->component->isLoading()) {
-        d->_q_sourceLoaded();
-    } else {
-        connect(d->component, SIGNAL(statusChanged(QmlComponent::Status)),
-                this, SLOT(_q_sourceLoaded()));
-        connect(d->component, SIGNAL(progressChanged(qreal)),
-                this, SIGNAL(progressChanged()));
-        emit progressChanged();
-        emit sourceChanged();
-        emit statusChanged();
-        emit itemChanged();
-    }
-}
-
-void QmlGraphicsLoaderPrivate::_q_sourceLoaded()
-{
-    Q_Q(QmlGraphicsLoader);
-
-    if (component) {
-        QmlContext *ctxt = new QmlContext(qmlContext(q));
-        ctxt->addDefaultObject(q);
-
-        if (!component->errors().isEmpty()) {
-            qWarning() << component->errors();
-            emit q->sourceChanged();
-            emit q->statusChanged();
-            emit q->progressChanged();
-            return;
-        }
-
-        QObject *obj = component->create(ctxt);
-        if (obj) {
-            ctxt->setParent(obj);
-            item = qobject_cast<QGraphicsObject *>(obj);
-            if (item) {
-                if (QmlGraphicsItem* qmlItem = qobject_cast<QmlGraphicsItem *>(item)) {
-                    qmlItem->setParentItem(q);
-                } else {
-                    item->setParentItem(q);
-                    item->setParent(q);
-                }
-//                item->setFocus(true);
-                initResize();
-            }
-        } else {
-            delete obj;
-            delete ctxt;
-            source = QUrl();
-        }
-        emit q->sourceChanged();
-        emit q->statusChanged();
-        emit q->progressChanged();
-        emit q->itemChanged();
-    }
-}
-
-/*!
-    \qmlproperty enum Loader::status
-
-    This property holds the status of QML loading.  It can be one of:
-    \list
-    \o Null - no QML source has been set
-    \o Ready - the QML source has been loaded
-    \o Loading - the QML source is currently being loaded
-    \o Error - an error occurred while loading the QML source
-    \endlist
-
-    \sa progress
-*/
-
-QmlGraphicsLoader::Status QmlGraphicsLoader::status() const
-{
-    Q_D(const QmlGraphicsLoader);
-
-    if (d->component)
-        return static_cast<QmlGraphicsLoader::Status>(d->component->status());
-
-    if (d->item)
-        return Ready;
-
-    return d->source.isEmpty() ? Null : Error;
-}
-
-/*!
-    \qmlproperty real Loader::progress
-
-    This property holds the progress of QML data loading, from 0.0 (nothing loaded)
-    to 1.0 (finished).
-
-    \sa status
-*/
-qreal QmlGraphicsLoader::progress() const
-{
-    Q_D(const QmlGraphicsLoader);
-
-    if (d->item)
-        return 1.0;
-
-    if (d->component)
-        return d->component->progress();
-
-    return 0.0;
-}
-
-/*!
-    \qmlproperty enum Loader::resizeMode
-
-    This property determines how the Loader or item are resized:
-    \list
-    \o NoResize - no item will be resized
-    \o SizeLoaderToItem - the Loader will be sized to the size of the item, unless the size of the Loader has been otherwise specified.
-    \o SizeItemToLoader - the item will be sized to the size of the Loader.
-    \endlist
-
-    Note that changing from SizeItemToLoader to SizeLoaderToItem
-    after the component is loaded will not return the item or Loader
-    to it's original size.  This is due to the item size being adjusted
-    to the Loader size, thereby losing the original size of the item.
-    Future changes to the item's size will affect the loader, however.
-
-    The default resizeMode is SizeLoaderToItem.
-*/
-QmlGraphicsLoader::ResizeMode QmlGraphicsLoader::resizeMode() const
-{
-    Q_D(const QmlGraphicsLoader);
-    return d->resizeMode;
-}
-
-void QmlGraphicsLoader::setResizeMode(ResizeMode mode)
-{
-    Q_D(QmlGraphicsLoader);
-    if (mode == d->resizeMode)
-        return;
-
-    if (QmlGraphicsItem *qmlItem = qobject_cast<QmlGraphicsItem*>(d->item)) {
-        if (d->resizeMode == SizeLoaderToItem) {
-            QmlGraphicsItemPrivate *p =
-                static_cast<QmlGraphicsItemPrivate *>(QGraphicsItemPrivate::get(qmlItem));
-            p->removeItemChangeListener(d, QmlGraphicsItemPrivate::Geometry);
-        }
-    } else if (d->item && d->item->isWidget()) {
-        if (d->resizeMode == SizeLoaderToItem)
-            d->item->removeEventFilter(this);
-    }
-
-    d->resizeMode = mode;
-    emit resizeModeChanged();
-    d->initResize();
-}
-
-void QmlGraphicsLoaderPrivate::_q_updateSize()
-{
-    Q_Q(QmlGraphicsLoader);
-    if (!item)
-        return;
-    if (QmlGraphicsItem *qmlItem = qobject_cast<QmlGraphicsItem*>(item)) {
-        if (resizeMode == QmlGraphicsLoader::SizeLoaderToItem) {
-            q->setWidth(qmlItem->width());
-            q->setHeight(qmlItem->height());
-        } else if (resizeMode == QmlGraphicsLoader::SizeItemToLoader) {
-            qmlItem->setWidth(q->width());
-            qmlItem->setHeight(q->height());
-        }
-    } else if (item && item->isWidget()) {
-        QGraphicsWidget *widget = static_cast<QGraphicsWidget*>(item);
-        if (resizeMode == QmlGraphicsLoader::SizeLoaderToItem) {
-            QSizeF newSize = widget->size();
-            if (newSize.isValid()) {
-                q->setWidth(newSize.width());
-                q->setHeight(newSize.height());
-            }
-        } else if (resizeMode == QmlGraphicsLoader::SizeItemToLoader) {
-            QSizeF oldSize = widget->size();
-            QSizeF newSize = oldSize;
-            if (q->heightValid())
-                newSize.setHeight(q->height());
-            if (q->widthValid())
-                newSize.setWidth(q->width());
-            if (oldSize != newSize)
-                widget->resize(newSize);
-        }
-    }
-}
-
-/*!
-    \qmlproperty Item Loader::item
-    This property holds the top-level item created from source.
-*/
-QGraphicsObject *QmlGraphicsLoader::item() const
-{
-    Q_D(const QmlGraphicsLoader);
-    return d->item;
-}
-
-void QmlGraphicsLoader::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
-{
-    Q_D(QmlGraphicsLoader);
-    if (newGeometry != oldGeometry) {
-        if (d->resizeMode == SizeItemToLoader) {
-            d->_q_updateSize();
-        }
-    }
-    QmlGraphicsItem::geometryChanged(newGeometry, oldGeometry);
-}
-
-QVariant QmlGraphicsLoader::itemChange(GraphicsItemChange change, const QVariant &value)
-{
-    Q_D(QmlGraphicsLoader);
-    if (change == ItemSceneHasChanged) {
-        if (d->item && d->item->isWidget()) {
-            if (d->resizeMode == SizeLoaderToItem) {
-                d->item->removeEventFilter(this);
-                d->item->installEventFilter(this);
-            }
-        }
-    }
-    return QmlGraphicsItem::itemChange(change, value);
-}
-
-bool QmlGraphicsLoader::eventFilter(QObject *watched, QEvent *e)
-{
-    Q_D(QmlGraphicsLoader);
-    if (watched == d->item && e->type() == QEvent::GraphicsSceneResize) {
-        if (d->item && d->item->isWidget() && d->resizeMode == SizeLoaderToItem) {
-            d->_q_updateSize();
-       }
-    }
-    return QmlGraphicsItem::eventFilter(watched, e);
-}
-
-#include <moc_qmlgraphicsloader_p.cpp>
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p.h
deleted file mode 100644
index 0ab67ac..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsloader_p.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSLOADER_H
-#define QMLGRAPHICSLOADER_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsLoaderPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsLoader : public QmlGraphicsItem
-{
-    Q_OBJECT
-    Q_ENUMS(Status)
-    Q_ENUMS(ResizeMode)
-
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(QmlComponent *sourceComponent READ sourceComponent WRITE setSourceComponent NOTIFY sourceChanged)
-    Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode NOTIFY resizeModeChanged)
-    Q_PROPERTY(QGraphicsObject *item READ item NOTIFY itemChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
-
-public:
-    QmlGraphicsLoader(QmlGraphicsItem *parent=0);
-    virtual ~QmlGraphicsLoader();
-
-    QUrl source() const;
-    void setSource(const QUrl &);
-
-    QmlComponent *sourceComponent() const;
-    void setSourceComponent(QmlComponent *);
-
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
-    qreal progress() const;
-
-    enum ResizeMode { NoResize, SizeLoaderToItem, SizeItemToLoader };
-    ResizeMode resizeMode() const;
-    void setResizeMode(ResizeMode mode);
-
-    QGraphicsObject *item() const;
-
-Q_SIGNALS:
-    void itemChanged();
-    void sourceChanged();
-    void statusChanged();
-    void progressChanged();
-    void resizeModeChanged();
-
-protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
-    bool eventFilter(QObject *watched, QEvent *e);
-private:
-    Q_DISABLE_COPY(QmlGraphicsLoader)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsLoader)
-    Q_PRIVATE_SLOT(d_func(), void _q_sourceLoaded())
-    Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsLoader)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSLOADER_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h
deleted file mode 100644
index 61dab58..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSLOADER_P_H
-#define QMLGRAPHICSLOADER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsloader_p.h"
-
-#include "qmlgraphicsitem_p.h"
-#include "qmlgraphicsitemchangelistener_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlContext;
-class QmlGraphicsLoaderPrivate : public QmlGraphicsItemPrivate, public QmlGraphicsItemChangeListener
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsLoader)
-
-public:
-    QmlGraphicsLoaderPrivate();
-    ~QmlGraphicsLoaderPrivate();
-
-    void itemGeometryChanged(QmlGraphicsItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
-    void clear();
-    void initResize();
-
-    QUrl source;
-    QGraphicsObject *item;
-    QmlComponent *component;
-    bool ownComponent : 1;
-    QmlGraphicsLoader::ResizeMode resizeMode;
-
-    void _q_sourceLoaded();
-    void _q_updateSize();
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLGRAPHICSLOADER_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsmousearea.cpp b/src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
deleted file mode 100644
index 07354f4..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
+++ /dev/null
@@ -1,685 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsmousearea_p.h"
-#include "qmlgraphicsmousearea_p_p.h"
-
-#include "qmlgraphicsevents_p_p.h"
-
-#include <QGraphicsSceneMouseEvent>
-
-QT_BEGIN_NAMESPACE
-static const int PressAndHoldDelay = 800;
-
-QmlGraphicsDrag::QmlGraphicsDrag(QObject *parent)
-: QObject(parent), _target(0), _axis(XandYAxis), _xmin(0), _xmax(0), _ymin(0), _ymax(0)
-{
-}
-
-QmlGraphicsDrag::~QmlGraphicsDrag()
-{
-}
-
-QmlGraphicsItem *QmlGraphicsDrag::target() const
-{
-    return _target;
-}
-
-void QmlGraphicsDrag::setTarget(QmlGraphicsItem *t)
-{
-    if (_target == t)
-        return;
-    _target = t;
-    emit targetChanged();
-}
-
-QmlGraphicsDrag::Axis QmlGraphicsDrag::axis() const
-{
-    return _axis;
-}
-
-void QmlGraphicsDrag::setAxis(QmlGraphicsDrag::Axis a)
-{
-    if (_axis == a)
-        return;
-    _axis = a;
-    emit axisChanged();
-}
-
-qreal QmlGraphicsDrag::xmin() const
-{
-    return _xmin;
-}
-
-void QmlGraphicsDrag::setXmin(qreal m)
-{
-    if (_xmin == m)
-        return;
-    _xmin = m;
-    emit minimumXChanged();
-}
-
-qreal QmlGraphicsDrag::xmax() const
-{
-    return _xmax;
-}
-
-void QmlGraphicsDrag::setXmax(qreal m)
-{
-    if (_xmax == m)
-        return;
-    _xmax = m;
-    emit maximumXChanged();
-}
-
-qreal QmlGraphicsDrag::ymin() const
-{
-    return _ymin;
-}
-
-void QmlGraphicsDrag::setYmin(qreal m)
-{
-    if (_ymin == m)
-        return;
-    _ymin = m;
-    emit minimumYChanged();
-}
-
-qreal QmlGraphicsDrag::ymax() const
-{
-    return _ymax;
-}
-
-void QmlGraphicsDrag::setYmax(qreal m)
-{
-    if (_ymax == m)
-        return;
-    _ymax = m;
-    emit maximumYChanged();
-}
-
-QmlGraphicsMouseAreaPrivate::~QmlGraphicsMouseAreaPrivate()
-{
-    delete drag;
-}
-
-
-/*!
-    \qmlclass MouseRegion QmlGraphicsMouseRegion
-    \since 4.7
-    \brief The MouseArea item enables simple mouse handling.
-    \inherits Item
-
-    A MouseArea is typically used in conjunction with a visible item,
-    where the MouseArea effectively 'proxies' mouse handling for that
-    item. For example, we can put a MouseArea in a Rectangle that changes
-    the Rectangle color to red when clicked:
-    \snippet doc/src/snippets/declarative/mouseregion.qml 0
-
-    Many MouseArea signals pass a \l {MouseEvent}{mouse} parameter that contains
-    additional information about the mouse event, such as the position, button,
-    and any key modifiers.
-
-    Below we have the previous
-    example extended so as to give a different color when you right click.
-    \snippet doc/src/snippets/declarative/mouseregion.qml 1
-
-    For basic key handling, see the \l {Keys}{Keys attached property}.
-
-    MouseArea is an invisible item: it is never painted.
-
-    \sa MouseEvent
-*/
-
-/*!
-    \qmlsignal MouseArea::onEntered()
-
-    This handler is called when the mouse enters the mouse region.
-
-    By default the onEntered handler is only called while a button is
-    pressed.  Setting hoverEnabled to true enables handling of
-    onExited when no mouse button is pressed.
-
-    \sa hoverEnabled
-*/
-
-/*!
-    \qmlsignal MouseArea::onExited()
-
-    This handler is called when the mouse exists the mouse region.
-
-    By default the onExited handler is only called while a button is
-    pressed.  Setting hoverEnabled to true enables handling of
-    onExited when no mouse button is pressed.
-
-    \sa hoverEnabled
-*/
-
-/*!
-    \qmlsignal MouseArea::onPositionChanged(MouseEvent mouse)
-
-    This handler is called when the mouse position changes.
-
-    The \l {MouseEvent}{mouse} parameter provides information about the mouse, including the x and y
-    position, and any buttons currently pressed.
-
-    The \e accepted property of the MouseEvent parameter is ignored in this handler.
-
-    By default the onPositionChanged handler is only called while a button is
-    pressed.  Setting hoverEnabled to true enables handling of
-    onPositionChanged when no mouse button is pressed.
-*/
-
-/*!
-    \qmlsignal MouseArea::onClicked(mouse)
-
-    This handler is called when there is a click. A click is defined as a press followed by a release,
-    both inside the MouseArea (pressing, moving outside the MouseArea, and then moving back inside and
-    releasing is also considered a click).
-
-    The \l {MouseEvent}{mouse} parameter provides information about the click, including the x and y
-    position of the release of the click, and whether the click wasHeld.
-
-    The \e accepted property of the MouseEvent parameter is ignored in this handler.
-*/
-
-/*!
-    \qmlsignal MouseArea::onPressed(mouse)
-
-    This handler is called when there is a press.
-    The \l {MouseEvent}{mouse} parameter provides information about the press, including the x and y
-    position and which button was pressed.
-
-    The \e accepted property of the MouseEvent parameter determines whether this MouseArea
-    will handle the press and all future mouse events until release.  The default is to accept
-    the event and not allow other MouseArea beneath this one to handle the event.  If \e accepted
-    is set to false, no further events will be sent to this MouseArea until the button is next
-    pressed.
-*/
-
-/*!
-    \qmlsignal MouseArea::onReleased(mouse)
-
-    This handler is called when there is a release.
-    The \l {MouseEvent}{mouse} parameter provides information about the click, including the x and y
-    position of the release of the click, and whether the click wasHeld.
-
-    The \e accepted property of the MouseEvent parameter is ignored in this handler.
-*/
-
-/*!
-    \qmlsignal MouseArea::onPressAndHold(mouse)
-
-    This handler is called when there is a long press (currently 800ms).
-    The \l {MouseEvent}{mouse} parameter provides information about the press, including the x and y
-    position of the press, and which button is pressed.
-
-    The \e accepted property of the MouseEvent parameter is ignored in this handler.
-*/
-
-/*!
-    \qmlsignal MouseArea::onDoubleClicked(mouse)
-
-    This handler is called when there is a double-click (a press followed by a release followed by a press).
-    The \l {MouseEvent}{mouse} parameter provides information about the click, including the x and y
-    position of the release of the click, and whether the click wasHeld.
-
-    The \e accepted property of the MouseEvent parameter is ignored in this handler.
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsMouseArea
-    \brief The QmlGraphicsMouseArea class provides a simple mouse handling abstraction for use within Qml.
-
-    \ingroup group_coreitems
-
-    All QmlGraphicsItem derived classes can do mouse handling but the QmlGraphicsMouseArea class exposes mouse
-    handling data as properties and tracks flicking and dragging of the mouse.
-
-    A QmlGraphicsMouseArea object can be instantiated in Qml using the tag \l MouseArea.
- */
-QmlGraphicsMouseArea::QmlGraphicsMouseArea(QmlGraphicsItem *parent)
-  : QmlGraphicsItem(*(new QmlGraphicsMouseAreaPrivate), parent)
-{
-    Q_D(QmlGraphicsMouseArea);
-    d->init();
-}
-
-QmlGraphicsMouseArea::~QmlGraphicsMouseArea()
-{
-}
-
-/*!
-    \qmlproperty real MouseArea::mouseX
-    \qmlproperty real MouseArea::mouseY
-    These properties hold the coordinates of the mouse.
-
-    If the hoverEnabled property is false then these properties will only be valid
-    while a button is pressed, and will remain valid as long as the button is held
-    even if the mouse is moved outside the region.
-
-    If hoverEnabled is true then these properties will be valid:
-    \list
-        \i when no button is pressed, but the mouse is within the MouseArea (containsMouse is true).
-        \i if a button is pressed and held, even if it has since moved out of the region.
-    \endlist
-
-    The coordinates are relative to the MouseArea.
-*/
-qreal QmlGraphicsMouseArea::mouseX() const
-{
-    Q_D(const QmlGraphicsMouseArea);
-    return d->lastPos.x();
-}
-
-qreal QmlGraphicsMouseArea::mouseY() const
-{
-    Q_D(const QmlGraphicsMouseArea);
-    return d->lastPos.y();
-}
-
-/*!
-    \qmlproperty bool MouseArea::enabled
-    This property holds whether the item accepts mouse events.
-*/
-bool QmlGraphicsMouseArea::isEnabled() const
-{
-    Q_D(const QmlGraphicsMouseArea);
-    return d->absorb;
-}
-
-void QmlGraphicsMouseArea::setEnabled(bool a)
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (a != d->absorb) {
-        d->absorb = a;
-        emit enabledChanged();
-    }
-}
-/*!
-    \qmlproperty MouseButtons MouseArea::pressedButtons
-    This property holds the mouse buttons currently pressed.
-
-    It contains a bitwise combination of:
-    \list
-    \o Qt.LeftButton
-    \o Qt.RightButton
-    \o Qt.MidButton
-    \endlist
-
-    The code below displays "right" when the right mouse buttons is pressed:
-    \code
-    Text {
-        text: mr.pressedButtons & Qt.RightButton ? "right" : ""
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        MouseArea {
-            id: mr
-            acceptedButtons: Qt.LeftButton | Qt.RightButton
-            anchors.fill: parent
-        }
-    }
-    \endcode
-
-    \sa acceptedButtons
-*/
-Qt::MouseButtons QmlGraphicsMouseArea::pressedButtons() const
-{
-    Q_D(const QmlGraphicsMouseArea);
-    return d->lastButtons;
-}
-
-void QmlGraphicsMouseArea::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsMouseArea);
-    d->moved = false;
-    if (!d->absorb)
-        QmlGraphicsItem::mousePressEvent(event);
-    else {
-        d->longPress = false;
-        d->saveEvent(event);
-        if (d->drag) {
-            d->dragX = drag()->axis() & QmlGraphicsDrag::XAxis;
-            d->dragY = drag()->axis() & QmlGraphicsDrag::YAxis;
-        }
-        d->dragged = false;
-        setHovered(true);
-        d->start = event->pos();
-        d->startScene = event->scenePos();
-        // we should only start timer if pressAndHold is connected to.
-        if (d->isConnected("pressAndHold(QmlGraphicsMouseEvent*)"))
-            d->pressAndHoldTimer.start(PressAndHoldDelay, this);
-        setKeepMouseGrab(false);
-        event->setAccepted(setPressed(true));
-    }
-}
-
-void QmlGraphicsMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (!d->absorb) {
-        QmlGraphicsItem::mouseMoveEvent(event);
-        return;
-    }
-
-    d->saveEvent(event);
-
-    // ### we should skip this if these signals aren't used
-    // ### can GV handle this for us?
-    bool contains = boundingRect().contains(d->lastPos);
-    if (d->hovered && !contains)
-        setHovered(false);
-    else if (!d->hovered && contains)
-        setHovered(true);
-
-    if (d->drag && d->drag->target()) {
-        if (!d->moved) {
-            if (d->dragX) d->startX = drag()->target()->x();
-            if (d->dragY) d->startY = drag()->target()->y();
-        }
-
-        QPointF startLocalPos;
-        QPointF curLocalPos;
-        if (drag()->target()->parent()) {
-            startLocalPos = drag()->target()->parentItem()->mapFromScene(d->startScene);
-            curLocalPos = drag()->target()->parentItem()->mapFromScene(event->scenePos());
-        } else {
-            startLocalPos = d->startScene;
-            curLocalPos = event->scenePos();
-        }
-
-        const int dragThreshold = QApplication::startDragDistance();
-        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()) {
-            if ((!d->dragY && dy < dragThreshold && d->dragX && dx > dragThreshold)
-                || (!d->dragX && dx < dragThreshold && d->dragY && dy > dragThreshold)
-                || (d->dragX && d->dragY)) {
-                setKeepMouseGrab(true);
-            }
-        }
-
-        if (d->dragX) {
-            qreal x = (curLocalPos.x() - startLocalPos.x()) + d->startX;
-            if (x < drag()->xmin())
-                x = drag()->xmin();
-            else if (x > drag()->xmax())
-                x = drag()->xmax();
-            drag()->target()->setX(x);
-        }
-        if (d->dragY) {
-            qreal y = (curLocalPos.y() - startLocalPos.y()) + d->startY;
-            if (y < drag()->ymin())
-                y = drag()->ymin();
-            else if (y > drag()->ymax())
-                y = drag()->ymax();
-            drag()->target()->setY(y);
-        }
-    }
-    d->moved = true;
-    QmlGraphicsMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
-    emit positionChanged(&me);
-}
-
-
-void QmlGraphicsMouseArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (!d->absorb) {
-        QmlGraphicsItem::mouseReleaseEvent(event);
-    } else {
-        d->saveEvent(event);
-        setPressed(false);
-        // If we don't accept hover, we need to reset containsMouse.
-        if (!acceptHoverEvents())
-            setHovered(false);
-        setKeepMouseGrab(false);
-    }
-}
-
-void QmlGraphicsMouseArea::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (!d->absorb) {
-        QmlGraphicsItem::mouseDoubleClickEvent(event);
-    } else {
-        QmlGraphicsItem::mouseDoubleClickEvent(event);
-        if (event->isAccepted()) {
-            // Only deliver the event if we have accepted the press.
-            d->saveEvent(event);
-            QmlGraphicsMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, true, false);
-            emit this->doubleClicked(&me);
-        }
-    }
-}
-
-void QmlGraphicsMouseArea::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (!d->absorb)
-        QmlGraphicsItem::hoverEnterEvent(event);
-    else
-        setHovered(true);
-}
-
-void QmlGraphicsMouseArea::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (!d->absorb) {
-        QmlGraphicsItem::hoverEnterEvent(event);
-    } else {
-        d->lastPos = event->pos();
-        QmlGraphicsMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, d->lastButtons, d->lastModifiers, false, d->longPress);
-        emit positionChanged(&me);
-    }
-}
-
-void QmlGraphicsMouseArea::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (!d->absorb)
-        QmlGraphicsItem::hoverLeaveEvent(event);
-    else
-        setHovered(false);
-}
-
-bool QmlGraphicsMouseArea::sceneEvent(QEvent *event)
-{
-    bool rv = QmlGraphicsItem::sceneEvent(event);
-    if (event->type() == QEvent::UngrabMouse) {
-        Q_D(QmlGraphicsMouseArea);
-        if (d->pressed) {
-            // if our mouse grab has been removed (probably by Flickable), fix our
-            // state
-            d->pressed = false;
-            setKeepMouseGrab(false);
-            emit pressedChanged();
-            //emit hoveredChanged();
-        }
-    }
-    return rv;
-}
-
-void QmlGraphicsMouseArea::timerEvent(QTimerEvent *event)
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (event->timerId() == d->pressAndHoldTimer.timerId()) {
-        d->pressAndHoldTimer.stop();
-        if (d->pressed && d->dragged == false && d->hovered == true) {
-            d->longPress = true;
-            QmlGraphicsMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
-            emit pressAndHold(&me);
-        }
-    }
-}
-
-/*!
-    \qmlproperty bool MouseArea::hoverEnabled
-    This property holds whether hover events are handled.
-
-    By default, mouse events are only handled in response to a button event, or when a button is
-    pressed.  Hover enables handling of all mouse events even when no mouse button is
-    pressed.
-
-    This property affects the containsMouse property and the onEntered, onExited and onPositionChanged signals.
-*/
-
-/*!
-    \qmlproperty bool MouseArea::containsMouse
-    This property holds whether the mouse is currently inside the mouse region.
-
-    \warning This property is not updated if the region moves under the mouse: \e containsMouse will not change.
-    In addition, if hoverEnabled is false, containsMouse will only be valid when the mouse is pressed.
-*/
-bool QmlGraphicsMouseArea::hovered() const
-{
-    Q_D(const QmlGraphicsMouseArea);
-    return d->hovered;
-}
-
-/*!
-    \qmlproperty bool MouseArea::pressed
-    This property holds whether the mouse region is currently pressed.
-*/
-bool QmlGraphicsMouseArea::pressed() const
-{
-    Q_D(const QmlGraphicsMouseArea);
-    return d->pressed;
-}
-
-void QmlGraphicsMouseArea::setHovered(bool h)
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (d->hovered != h) {
-        d->hovered = h;
-        emit hoveredChanged();
-        d->hovered ? emit entered() : emit exited();
-    }
-}
-
-/*!
-    \qmlproperty Qt::MouseButtons MouseArea::acceptedButtons
-    This property holds the mouse buttons that the mouse region reacts to.
-
-    The available buttons are:
-    \list
-    \o Qt.LeftButton
-    \o Qt.RightButton
-    \o Qt.MidButton
-    \endlist
-
-    To accept more than one button the flags can be combined with the
-    "|" (or) operator:
-
-    \code
-    MouseArea { acceptedButtons: Qt.LeftButton | Qt.RightButton }
-    \endcode
-
-    The default is to accept the Left button.
-*/
-Qt::MouseButtons QmlGraphicsMouseArea::acceptedButtons() const
-{
-    return acceptedMouseButtons();
-}
-
-void QmlGraphicsMouseArea::setAcceptedButtons(Qt::MouseButtons buttons)
-{
-    if (buttons != acceptedMouseButtons()) {
-        setAcceptedMouseButtons(buttons);
-        emit acceptedButtonsChanged();
-    }
-}
-
-bool QmlGraphicsMouseArea::setPressed(bool p)
-{
-    Q_D(QmlGraphicsMouseArea);
-    bool isclick = d->pressed == true && p == false && d->dragged == false && d->hovered == true;
-
-    if (d->pressed != p) {
-        d->pressed = p;
-        QmlGraphicsMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, isclick, d->longPress);
-        if (d->pressed) {
-            emit positionChanged(&me);
-            emit pressed(&me);
-        } else {
-            emit released(&me);
-            if (isclick)
-                emit clicked(&me);
-        }
-
-        emit pressedChanged();
-        return me.isAccepted();
-    }
-    return false;
-}
-
-QmlGraphicsDrag *QmlGraphicsMouseArea::drag()
-{
-    Q_D(QmlGraphicsMouseArea);
-    if (!d->drag)
-        d->drag = new QmlGraphicsDrag;
-    return d->drag;
-}
-
-/*!
-    \qmlproperty Item MouseArea::drag.target
-    \qmlproperty Axis MouseArea::drag.axis
-    \qmlproperty real MouseArea::drag.minimumX
-    \qmlproperty real MouseArea::drag.maximumX
-    \qmlproperty real MouseArea::drag.minimumY
-    \qmlproperty real MouseArea::drag.maximumY
-
-    drag provides a convenient way to make an item draggable.
-
-    \list
-    \i \c target specifies the item to drag.
-    \i \c axis specifies whether dragging can be done horizontally (XAxis), vertically (YAxis), or both (XandYAxis)
-    \i the minimum and maximum properties limit how far the target can be dragged along the corresponding axes.
-    \endlist
-
-    The following example uses drag to reduce the opacity of an image as it moves to the right:
-    \snippet doc/src/snippets/declarative/drag.qml 0
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsmousearea_p.h b/src/declarative/graphicsitems/qmlgraphicsmousearea_p.h
deleted file mode 100644
index 2e2f8c9..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsmousearea_p.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSMOUSEAREA_H
-#define QMLGRAPHICSMOUSEAREA_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsDrag : public QObject
-{
-    Q_OBJECT
-
-    Q_ENUMS(Axis)
-    Q_PROPERTY(QmlGraphicsItem *target READ target WRITE setTarget NOTIFY targetChanged)
-    Q_PROPERTY(Axis axis READ axis WRITE setAxis NOTIFY axisChanged)
-    Q_PROPERTY(qreal minimumX READ xmin WRITE setXmin NOTIFY minimumXChanged)
-    Q_PROPERTY(qreal maximumX READ xmax WRITE setXmax NOTIFY maximumXChanged)
-    Q_PROPERTY(qreal minimumY READ ymin WRITE setYmin NOTIFY minimumYChanged)
-    Q_PROPERTY(qreal maximumY READ ymax WRITE setYmax NOTIFY maximumYChanged)
-    //### consider drag and drop
-
-public:
-    QmlGraphicsDrag(QObject *parent=0);
-    ~QmlGraphicsDrag();
-
-    QmlGraphicsItem *target() const;
-    void setTarget(QmlGraphicsItem *);
-
-    enum Axis { XAxis=0x01, YAxis=0x02, XandYAxis=0x03 };
-    Axis axis() const;
-    void setAxis(Axis);
-
-    qreal xmin() const;
-    void setXmin(qreal);
-    qreal xmax() const;
-    void setXmax(qreal);
-    qreal ymin() const;
-    void setYmin(qreal);
-    qreal ymax() const;
-    void setYmax(qreal);
-
-Q_SIGNALS:
-    void targetChanged();
-    void axisChanged();
-    void minimumXChanged();
-    void maximumXChanged();
-    void minimumYChanged();
-    void maximumYChanged();
-
-private:
-    QmlGraphicsItem *_target;
-    Axis _axis;
-    qreal _xmin;
-    qreal _xmax;
-    qreal _ymin;
-    qreal _ymax;
-    Q_DISABLE_COPY(QmlGraphicsDrag)
-};
-
-class QmlGraphicsMouseEvent;
-class QmlGraphicsMouseAreaPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsMouseArea : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    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 NOTIFY enabledChanged)
-    Q_PROPERTY(Qt::MouseButtons pressedButtons READ pressedButtons NOTIFY pressedChanged)
-    Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged)
-    Q_PROPERTY(bool hoverEnabled READ acceptHoverEvents WRITE setAcceptHoverEvents)
-    Q_PROPERTY(QmlGraphicsDrag *drag READ drag CONSTANT) //### add flicking to QmlGraphicsDrag or add a QmlGraphicsFlick ???
-
-public:
-    QmlGraphicsMouseArea(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsMouseArea();
-
-    qreal mouseX() const;
-    qreal mouseY() const;
-
-    bool isEnabled() const;
-    void setEnabled(bool);
-
-    bool hovered() const;
-    bool pressed() const;
-
-    Qt::MouseButtons pressedButtons() const;
-
-    Qt::MouseButtons acceptedButtons() const;
-    void setAcceptedButtons(Qt::MouseButtons buttons);
-
-    QmlGraphicsDrag *drag();
-
-Q_SIGNALS:
-    void hoveredChanged();
-    void pressedChanged();
-    void enabledChanged();
-    void acceptedButtonsChanged();
-    void positionChanged(QmlGraphicsMouseEvent *mouse);
-
-    void pressed(QmlGraphicsMouseEvent *mouse);
-    void pressAndHold(QmlGraphicsMouseEvent *mouse);
-    void released(QmlGraphicsMouseEvent *mouse);
-    void clicked(QmlGraphicsMouseEvent *mouse);
-    void doubleClicked(QmlGraphicsMouseEvent *mouse);
-    void entered();
-    void exited();
-
-protected:
-    void setHovered(bool);
-    bool setPressed(bool);
-
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-    void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
-    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-    bool sceneEvent(QEvent *);
-    void timerEvent(QTimerEvent *event);
-
-private:
-    void handlePress();
-    void handleRelease();
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsMouseArea)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsMouseArea)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsDrag)
-QML_DECLARE_TYPE(QmlGraphicsMouseArea)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSMOUSEAREA_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsmousearea_p_p.h b/src/declarative/graphicsitems/qmlgraphicsmousearea_p_p.h
deleted file mode 100644
index fadb430..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsmousearea_p_p.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSMOUSEREGION_P_H
-#define QMLGRAPHICSMOUSEREGION_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsitem_p.h"
-
-#include <qdatetime.h>
-#include <qbasictimer.h>
-#include <qgraphicssceneevent.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsMouseAreaPrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsMouseArea)
-
-public:
-    QmlGraphicsMouseAreaPrivate()
-      : absorb(true), hovered(false), pressed(false), longPress(false), drag(0)
-    {
-    }
-
-    ~QmlGraphicsMouseAreaPrivate();
-
-    void init()
-    {
-        Q_Q(QmlGraphicsMouseArea);
-        q->setAcceptedMouseButtons(Qt::LeftButton);
-    }
-
-    void saveEvent(QGraphicsSceneMouseEvent *event) {
-        lastPos = event->pos();
-        lastButton = event->button();
-        lastButtons = event->buttons();
-        lastModifiers = event->modifiers();
-    }
-
-    bool isConnected(const char *signal) {
-        Q_Q(QmlGraphicsMouseArea);
-        int idx = QObjectPrivate::get(q)->signalIndex(signal);
-        return QObjectPrivate::get(q)->isSignalConnected(idx);
-    }
-
-    bool absorb : 1;
-    bool hovered : 1;
-    bool pressed : 1;
-    bool longPress : 1;
-    bool moved : 1;
-    bool dragX : 1;
-    bool dragY : 1;
-    bool dragged : 1;
-    QmlGraphicsDrag *drag;
-    QPointF start;
-    QPointF startScene;
-    qreal startX;
-    qreal startY;
-    QPointF lastPos;
-    Qt::MouseButton lastButton;
-    Qt::MouseButtons lastButtons;
-    Qt::KeyboardModifiers lastModifiers;
-    QBasicTimer pressAndHoldTimer;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLGRAPHICSMOUSEREGION_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
deleted file mode 100644
index 3daa0c6..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
+++ /dev/null
@@ -1,466 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicspainteditem_p.h"
-#include "qmlgraphicspainteditem_p_p.h"
-
-#include <QDebug>
-#include <QPen>
-#include <QFile>
-#include <QEvent>
-#include <QApplication>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#include <QPaintEngine>
-#include <qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlGraphicsPaintedItem
-    \brief The QmlGraphicsPaintedItem class is an abstract base class for QmlView items that want cached painting.
-    \internal
-
-    This is a convenience class for implementing items that paint their contents
-    using a QPainter.  The contents of the item are cached behind the scenes.
-    The dirtyCache() function should be called if the contents change to
-    ensure the cache is refreshed the next time painting occurs.
-
-    To subclass QmlGraphicsPaintedItem, you must reimplement drawContents() to draw
-    the contents of the item.
-*/
-
-/*!
-    \fn void QmlGraphicsPaintedItem::drawContents(QPainter *painter, const QRect &rect)
-
-    This function is called when the cache needs to be refreshed. When
-    sub-classing QmlGraphicsPaintedItem this function should be implemented so as to
-    paint the contents of the item using the given \a painter for the
-    area of the contents specified by \a rect.
-*/
-
-/*!
-    \property QmlGraphicsPaintedItem::contentsSize
-    \brief The size of the contents
-
-    The contents size is the size of the item in regards to how it is painted
-    using the drawContents() function.  This is distinct from the size of the
-    item in regards to height() and width().
-*/
-
-// XXX bug in WebKit - can call repaintRequested and other cache-changing functions from within render!
-static int inpaint=0;
-static int inpaint_clearcache=0;
-
-/*!
-    Marks areas of the cache that intersect with the given \a rect as dirty and
-    in need of being refreshed.
-
-    \sa clearCache()
-*/
-void QmlGraphicsPaintedItem::dirtyCache(const QRect& rect)
-{
-    Q_D(QmlGraphicsPaintedItem);
-    QRect srect(qCeil(rect.x()*d->contentsScale),
-            qCeil(rect.y()*d->contentsScale),
-            qCeil(rect.width()*d->contentsScale),
-            qCeil(rect.height()*d->contentsScale));
-    for (int i=0; i < d->imagecache.count(); ) {
-        QmlGraphicsPaintedItemPrivate::ImageCacheItem *c = d->imagecache[i];
-        QRect isect = (c->area & srect) | c->dirty;
-        if (isect == c->area && !inpaint) {
-            delete d->imagecache.takeAt(i);
-        } else {
-            c->dirty = isect;
-            ++i;
-        }
-    }
-}
-
-/*!
-    Marks the entirety of the contents cache as dirty.
-
-    \sa dirtyCache()
-*/
-void QmlGraphicsPaintedItem::clearCache()
-{
-    if (inpaint) {
-        inpaint_clearcache=1;
-        return;
-    }
-    Q_D(QmlGraphicsPaintedItem);
-    qDeleteAll(d->imagecache);
-    d->imagecache.clear();
-}
-
-/*!
-    Returns the size of the contents.
-
-    \sa setContentsSize()
-*/
-QSize QmlGraphicsPaintedItem::contentsSize() const
-{
-    Q_D(const QmlGraphicsPaintedItem);
-    return d->contentsSize;
-}
-
-/*!
-    Sets the size of the contents to the given \a size.
-
-    \sa contentsSize()
-*/
-void QmlGraphicsPaintedItem::setContentsSize(const QSize &size)
-{
-    Q_D(QmlGraphicsPaintedItem);
-    if (d->contentsSize == size) return;
-    d->contentsSize = size;
-    setImplicitWidth(size.width()*d->contentsScale);
-    setImplicitHeight(size.height()*d->contentsScale);
-    clearCache();
-    update();
-    emit contentsSizeChanged();
-}
-
-qreal QmlGraphicsPaintedItem::contentsScale() const
-{
-    Q_D(const QmlGraphicsPaintedItem);
-    return d->contentsScale;
-}
-
-void QmlGraphicsPaintedItem::setContentsScale(qreal scale)
-{
-    Q_D(QmlGraphicsPaintedItem);
-    if (d->contentsScale == scale) return;
-    d->contentsScale = scale;
-    setImplicitWidth(d->contentsSize.width()*scale);
-    setImplicitHeight(d->contentsSize.height()*scale);
-    clearCache();
-    update();
-    emit contentsScaleChanged();
-}
-
-
-/*!
-    Constructs a new QmlGraphicsPaintedItem with the given \a parent.
-*/
-QmlGraphicsPaintedItem::QmlGraphicsPaintedItem(QmlGraphicsItem *parent)
-  : QmlGraphicsItem(*(new QmlGraphicsPaintedItemPrivate), parent)
-{
-    init();
-}
-
-/*!
-    \internal
-    Constructs a new QmlGraphicsPaintedItem with the given \a parent and
-    initialized private data member \a dd.
-*/
-QmlGraphicsPaintedItem::QmlGraphicsPaintedItem(QmlGraphicsPaintedItemPrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsItem(dd, parent)
-{
-    init();
-}
-
-/*!
-    Destroys the image item.
-*/
-QmlGraphicsPaintedItem::~QmlGraphicsPaintedItem()
-{
-    clearCache();
-}
-
-/*!
-    \internal
-*/
-void QmlGraphicsPaintedItem::init()
-{
-    connect(this,SIGNAL(widthChanged()),this,SLOT(clearCache()));
-    connect(this,SIGNAL(heightChanged()),this,SLOT(clearCache()));
-    connect(this,SIGNAL(visibleChanged()),this,SLOT(clearCache()));
-}
-
-void QmlGraphicsPaintedItem::setCacheFrozen(bool frozen)
-{
-    Q_D(QmlGraphicsPaintedItem);
-    if (d->cachefrozen == frozen)
-        return;
-    d->cachefrozen = frozen;
-    // XXX clear cache?
-}
-
-/*!
-    \reimp
-*/
-void QmlGraphicsPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    Q_D(QmlGraphicsPaintedItem);
-    const QRect content(0,0,qCeil(d->contentsSize.width()*d->contentsScale),
-                            qCeil(d->contentsSize.height()*d->contentsScale));
-    if (content.width() <= 0 || content.height() <= 0)
-        return;
-
-    ++inpaint;
-
-    const QTransform &x = p->deviceTransform();
-    QTransform xinv = x.inverted();
-    QRegion effectiveClip;
-    QRegion sysClip = p->paintEngine()->systemClip();
-    if (xinv.type() <= QTransform::TxScale && sysClip.numRects() < 5) {
-        // simple transform, region gets no more complicated...
-        effectiveClip = xinv.map(sysClip);
-    } else {
-        // do not make complicated regions...
-        effectiveClip = xinv.mapRect(sysClip.boundingRect());
-    }
-
-    QRegion topaint = p->clipRegion();
-    if (topaint.isEmpty()) {
-        if (effectiveClip.isEmpty())
-            topaint = QRect(0,0,p->device()->width(),p->device()->height());
-        else
-            topaint = effectiveClip;
-    } else if (!effectiveClip.isEmpty()) {
-        topaint &= effectiveClip;
-    }
-
-    topaint &= content;
-    QRegion uncached(content);
-    p->setRenderHints(QPainter::SmoothPixmapTransform, d->smooth);
-
-    int cachesize=0;
-    for (int i=0; i<d->imagecache.count(); ++i) {
-        QRect area = d->imagecache[i]->area;
-        if (topaint.contains(area)) {
-            QRectF target(area.x(), area.y(), area.width(), area.height());
-            if (!d->cachefrozen) {
-                if (!d->imagecache[i]->dirty.isNull() && topaint.contains(d->imagecache[i]->dirty)) {
-                    QPainter qp(&d->imagecache[i]->image);
-                    qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache);
-                    qp.translate(-area.x(), -area.y());
-                    qp.scale(d->contentsScale,d->contentsScale);
-                    QRect clip = d->imagecache[i]->dirty;
-                    QRect sclip(qFloor(clip.x()/d->contentsScale),
-                            qFloor(clip.y()/d->contentsScale),
-                            qCeil(clip.width()/d->contentsScale+clip.x()/d->contentsScale-qFloor(clip.x()/d->contentsScale)),
-                            qCeil(clip.height()/d->contentsScale+clip.y()/d->contentsScale-qFloor(clip.y()/d->contentsScale)));
-                    qp.setClipRect(sclip);
-                    if (d->fillColor.isValid()){
-                        if(d->fillColor.alpha() < 255){
-                            // ### Might not work outside of raster paintengine
-                            QPainter::CompositionMode prev = qp.compositionMode();
-                            qp.setCompositionMode(QPainter::CompositionMode_Source);
-                            qp.fillRect(sclip,d->fillColor);
-                            qp.setCompositionMode(prev);
-                        }else{
-                            qp.fillRect(sclip,d->fillColor);
-                        }
-                    }
-                    drawContents(&qp, sclip);
-                    d->imagecache[i]->dirty = QRect();
-                }
-            }
-            p->drawPixmap(target.toRect(), d->imagecache[i]->image);
-            topaint -= area;
-            d->imagecache[i]->age=0;
-        } else {
-            d->imagecache[i]->age++;
-        }
-        cachesize += area.width()*area.height();
-        uncached -= area;
-    }
-
-    if (!topaint.isEmpty()) {
-        if (!d->cachefrozen) {
-            // Find a sensible larger area, otherwise will paint lots of tiny images.
-            QRect biggerrect = topaint.boundingRect().adjusted(-64,-64,128,128);
-            cachesize += biggerrect.width() * biggerrect.height();
-            while (d->imagecache.count() && cachesize > d->max_imagecache_size) {
-                int oldest=-1;
-                int age=-1;
-                for (int i=0; i<d->imagecache.count(); ++i) {
-                    int a = d->imagecache[i]->age;
-                    if (a > age) {
-                        oldest = i;
-                        age = a;
-                    }
-                }
-                cachesize -= d->imagecache[oldest]->area.width()*d->imagecache[oldest]->area.height();
-                uncached += d->imagecache[oldest]->area;
-                delete d->imagecache.takeAt(oldest);
-            }
-            const QRegion bigger = QRegion(biggerrect) & uncached;
-            const QVector<QRect> rects = bigger.rects();
-            for (int i = 0; i < rects.count(); ++i) {
-                const QRect &r = rects.at(i);
-                QPixmap img(r.size());
-                if (d->fillColor.isValid())
-                    img.fill(d->fillColor);
-                {
-                    QPainter qp(&img);
-                    qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache);
-
-                    qp.translate(-r.x(),-r.y());
-                    qp.scale(d->contentsScale,d->contentsScale);
-                    QRect sclip(qFloor(r.x()/d->contentsScale),
-                            qFloor(r.y()/d->contentsScale),
-                            qCeil(r.width()/d->contentsScale+r.x()/d->contentsScale-qFloor(r.x()/d->contentsScale)),
-                            qCeil(r.height()/d->contentsScale+r.y()/d->contentsScale-qFloor(r.y()/d->contentsScale)));
-                    drawContents(&qp, sclip);
-                }
-                QmlGraphicsPaintedItemPrivate::ImageCacheItem *newitem = new QmlGraphicsPaintedItemPrivate::ImageCacheItem;
-                newitem->area = r;
-                newitem->image = img;
-                d->imagecache.append(newitem);
-                p->drawPixmap(r, newitem->image);
-            }
-        } else {
-            const QVector<QRect> rects = uncached.rects();
-            for (int i = 0; i < rects.count(); ++i)
-                p->fillRect(rects.at(i), Qt::lightGray);
-        }
-    }
-
-    if (inpaint_clearcache) {
-        clearCache();
-        inpaint_clearcache = 0;
-    }
-
-    --inpaint;
-}
-
-/*!
-  \qmlproperty int PaintedItem::pixelCacheSize
-
-  This property holds the maximum number of pixels of image cache to
-  allow. The default is 0.1 megapixels. The cache will not be larger
-  than the (unscaled) size of the WebView.
-*/
-/*!
-  \property QmlGraphicsPaintedItem::pixelCacheSize
-
-  The maximum number of pixels of image cache to allow. The default
-  is 0.1 megapixels. The cache will not be larger than the (unscaled)
-  size of the QmlGraphicsPaintedItem.
-*/
-int QmlGraphicsPaintedItem::pixelCacheSize() const
-{
-    Q_D(const QmlGraphicsPaintedItem);
-    return d->max_imagecache_size;
-}
-
-void QmlGraphicsPaintedItem::setPixelCacheSize(int pixels)
-{
-    Q_D(QmlGraphicsPaintedItem);
-    if (pixels < d->max_imagecache_size) {
-        int cachesize=0;
-        for (int i=0; i<d->imagecache.count(); ++i) {
-            QRect area = d->imagecache[i]->area;
-            cachesize += area.width()*area.height();
-        }
-        while (d->imagecache.count() && cachesize > pixels) {
-            int oldest=-1;
-            int age=-1;
-            for (int i=0; i<d->imagecache.count(); ++i) {
-                int a = d->imagecache[i]->age;
-                if (a > age) {
-                    oldest = i;
-                    age = a;
-                }
-            }
-            cachesize -= d->imagecache[oldest]->area.width()*d->imagecache[oldest]->area.height();
-            delete d->imagecache.takeAt(oldest);
-        }
-    }
-    d->max_imagecache_size = pixels;
-}
-
-
-
-/*!
-    \property QmlGraphicsPaintedItem::fillColor
-
-    The color to be used to fill the item prior to calling drawContents().
-    By default, this is Qt::transparent.
-
-    Performance improvements can be achieved if subclasses call this with either an
-    invalid color (QColor()), or an appropriate solid color.
-*/
-void QmlGraphicsPaintedItem::setFillColor(const QColor& c)
-{
-    Q_D(QmlGraphicsPaintedItem);
-    if (d->fillColor == c)
-        return;
-    d->fillColor = c;
-    emit fillColorChanged();
-    update();
-}
-
-QColor QmlGraphicsPaintedItem::fillColor() const
-{
-    Q_D(const QmlGraphicsPaintedItem);
-    return d->fillColor;
-}
-
-/*!
-    \qmlproperty bool PaintedItem::smoothCache
-
-    Controls whether the cached tiles of which the item is composed are
-    rendered smoothly when they are generated.
-
-    This is in addition toe Item::smooth, which controls the smooth painting of
-    the already-painted cached tiles under transformation.
-*/
-bool QmlGraphicsPaintedItem::smoothCache() const
-{
-    Q_D(const QmlGraphicsPaintedItem);
-    return d->smoothCache;
-}
-
-void QmlGraphicsPaintedItem::setSmoothCache(bool on)
-{
-    Q_D(QmlGraphicsPaintedItem);
-    if (d->smoothCache != on) {
-        d->smoothCache = on;
-        clearCache();
-    }
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
deleted file mode 100644
index f2f9be0..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSIMAGEITEM_H
-#define QMLGRAPHICSIMAGEITEM_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsPaintedItemPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsPaintedItem : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize NOTIFY contentsSizeChanged)
-    Q_PROPERTY(QColor fillColor READ fillColor WRITE setFillColor NOTIFY fillColorChanged)
-    Q_PROPERTY(int pixelCacheSize READ pixelCacheSize WRITE setPixelCacheSize)
-    Q_PROPERTY(bool smoothCache READ smoothCache WRITE setSmoothCache)
-    Q_PROPERTY(qreal contentsScale READ contentsScale WRITE setContentsScale NOTIFY contentsScaleChanged)
-
-
-public:
-    QmlGraphicsPaintedItem(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsPaintedItem();
-
-    QSize contentsSize() const;
-    void setContentsSize(const QSize &);
-
-    qreal contentsScale() const;
-    void setContentsScale(qreal);
-
-    int pixelCacheSize() const;
-    void setPixelCacheSize(int pixels);
-
-    bool smoothCache() const;
-    void setSmoothCache(bool on);
-
-    QColor fillColor() const;
-    void setFillColor(const QColor&);
-
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-
-protected:
-    QmlGraphicsPaintedItem(QmlGraphicsPaintedItemPrivate &dd, QmlGraphicsItem *parent);
-
-    virtual void drawContents(QPainter *p, const QRect &) = 0;
-
-    void setCacheFrozen(bool);
-
-Q_SIGNALS:
-    void fillColorChanged();
-    void contentsSizeChanged();
-    void contentsScaleChanged();
-
-protected Q_SLOTS:
-    void dirtyCache(const QRect &);
-    void clearCache();
-
-private:
-    void init();
-    Q_DISABLE_COPY(QmlGraphicsPaintedItem)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsPaintedItem)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsPaintedItem)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
deleted file mode 100644
index 7d49914..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSIMAGEITEM_P_H
-#define QMLGRAPHICSIMAGEITEM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsitem_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsPaintedItemPrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsPaintedItem)
-
-public:
-    QmlGraphicsPaintedItemPrivate()
-      : max_imagecache_size(100000), contentsScale(1.0), fillColor(Qt::transparent), cachefrozen(false), smoothCache(true)
-    {
-    }
-
-    struct ImageCacheItem {
-        ImageCacheItem() : age(0) {}
-        ~ImageCacheItem() { }
-        int age;
-        QRect area;
-        QRect dirty; // one dirty area (allows optimization of common cases)
-        QPixmap image;
-    };
-
-    QList<ImageCacheItem*> imagecache;
-
-    int max_imagecache_size;
-    QSize contentsSize;
-    qreal contentsScale;
-    QColor fillColor;
-    bool cachefrozen;
-    bool smoothCache;
-};
-
-QT_END_NAMESPACE
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
deleted file mode 100644
index 93127bc..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
+++ /dev/null
@@ -1,1295 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsparticles_p.h"
-
-#include "qmlgraphicsitem_p.h"
-
-#include <qmlpixmapcache_p.h>
-#include <qfxperf_p_p.h>
-#include <qmlanimation_p_p.h>
-
-#include <QNetworkReply>
-#include <QPainter>
-#include <QtGui/qdrawutil.h>
-#include <QVarLengthArray>
-
-#include <stdlib.h>
-#include <math.h>
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#define M_PI_2 (M_PI / 2.)
-#endif
-#ifndef INT_MAX
-#define INT_MAX 2147483647
-#endif
-
-QT_BEGIN_NAMESPACE
-#define PI_SQR 9.8696044
-// parabolic approximation
-inline qreal fastSin(qreal theta)
-{
-    const qreal b = 4 / M_PI;
-    const qreal c = -4 / PI_SQR;
-
-    qreal y = b * theta + c * theta * qAbs(theta);
-    return y;
-}
-
-inline qreal fastCos(qreal theta)
-{
-    theta += M_PI_2;
-    if (theta > M_PI)
-        theta -= 2 * M_PI;
-
-    return fastSin(theta);
-}
-
-class QmlGraphicsParticle
-{
-public:
-    QmlGraphicsParticle(int time) : lifeSpan(1000), fadeOutAge(800)
-        , opacity(0), birthTime(time), x_velocity(0), y_velocity(0)
-        , state(FadeIn), data(0)
-    {
-    }
-
-    int lifeSpan;
-    int fadeOutAge;
-    qreal x;
-    qreal y;
-    qreal opacity;
-    int birthTime;
-    qreal x_velocity;
-    qreal y_velocity;
-    enum State { FadeIn, Solid, FadeOut };
-    State state;
-    void *data;
-};
-
-//---------------------------------------------------------------------------
-
-/*!
-    \class QmlGraphicsParticleMotion
-    \ingroup group_effects
-    \brief The QmlGraphicsParticleMotion class is the base class for particle motion.
-    \internal
-
-    This class causes the particles to remain static.
-*/
-
-/*!
-    Constructs a QmlGraphicsParticleMotion with parent object \a parent.
-*/
-QmlGraphicsParticleMotion::QmlGraphicsParticleMotion(QObject *parent) :
-    QObject(parent)
-{
-}
-
-/*!
-    Move the \a particle to its new position.  \a interval is the number of
-    milliseconds elapsed since it was last moved.
-*/
-void QmlGraphicsParticleMotion::advance(QmlGraphicsParticle &particle, int interval)
-{
-    Q_UNUSED(particle);
-    Q_UNUSED(interval);
-}
-
-/*!
-    The \a particle has just been created.  Some motion strategies require
-    additional state information.  This can be allocated by this function.
-*/
-void QmlGraphicsParticleMotion::created(QmlGraphicsParticle &particle)
-{
-    Q_UNUSED(particle);
-}
-
-/*!
-    The \a particle is about to be destroyed.  Any additional memory
-    that has been allocated for the particle should be freed.
-*/
-void QmlGraphicsParticleMotion::destroy(QmlGraphicsParticle &particle)
-{
-    Q_UNUSED(particle);
-}
-
-/*!
-    \qmlclass ParticleMotionLinear
-    \since 4.7
-    \brief The ParticleMotionLinear object moves particles linearly.
-
-    \sa Particles
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsParticleMotionLinear
-    \ingroup group_effects
-    \brief The QmlGraphicsParticleMotionLinear class moves the particles linearly.
-*/
-
-void QmlGraphicsParticleMotionLinear::advance(QmlGraphicsParticle &p, int interval)
-{
-    p.x += interval * p.x_velocity;
-    p.y += interval * p.y_velocity;
-}
-
-/*!
-    \qmlclass ParticleMotionGravity
-    \since 4.7
-    \brief The ParticleMotionGravity object moves particles towards a point.
-
-    \sa Particles
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsParticleMotionGravity
-    \ingroup group_effects
-    \brief The QmlGraphicsParticleMotionGravity class moves the particles towards a point.
-*/
-
-/*!
-    \qmlproperty qreal ParticleMotionGravity::xattractor
-    \qmlproperty qreal ParticleMotionGravity::yattractor
-    These properties hold the x and y coordinates of the point attracting the particles.
-*/
-
-/*!
-    \qmlproperty qreal ParticleMotionGravity::acceleration
-    This property holds the acceleration to apply to the particles.
-*/
-
-/*!
-    \property QmlGraphicsParticleMotionGravity::xattractor
-    \brief the x coordinate of the point attracting the particles.
-*/
-
-/*!
-    \property QmlGraphicsParticleMotionGravity::yattractor
-    \brief the y coordinate of the point attracting the particles.
-*/
-
-/*!
-    \property QmlGraphicsParticleMotionGravity::acceleration
-    \brief the acceleration to apply to the particles.
-*/
-
-void QmlGraphicsParticleMotionGravity::setXAttractor(qreal x)
-{
-    if (qFuzzyCompare(x, _xAttr))
-        return;
-    _xAttr = x;
-    emit xattractorChanged();
-}
-
-void QmlGraphicsParticleMotionGravity::setYAttractor(qreal y)
-{
-    if (qFuzzyCompare(y, _yAttr))
-        return;
-    _yAttr = y;
-    emit yattractorChanged();
-}
-
-void QmlGraphicsParticleMotionGravity::setAcceleration(qreal accel)
-{
-    qreal scaledAccel = accel/1000000.0;
-    if (qFuzzyCompare(scaledAccel, _accel))
-        return;
-    _accel = scaledAccel;
-    emit accelerationChanged();
-}
-
-void QmlGraphicsParticleMotionGravity::advance(QmlGraphicsParticle &p, int interval)
-{
-    qreal xdiff = p.x - _xAttr;
-    qreal ydiff = p.y - _yAttr;
-
-    qreal xcomp = xdiff / (xdiff + ydiff);
-    qreal ycomp = ydiff / (xdiff + ydiff);
-
-    p.x_velocity += xcomp * _accel * interval;
-    p.y_velocity += ycomp * _accel * interval;
-
-    p.x += interval * p.x_velocity;
-    p.y += interval * p.y_velocity;
-}
-
-/*!
-    \qmlclass ParticleMotionWander
-    \since 4.7
-    \brief The ParticleMotionWander object moves particles in a somewhat random fashion.
-
-    The particles will continue roughly in the original direction, however will randomly
-    drift to each side.
-
-    The code below produces an effect similar to falling snow.
-
-    \qml
-Rectangle {
-    width: 240
-    height: 320
-    color: "black"
-
-    Particles {
-        y: 0
-        width: parent.width
-        height: 30
-        source: "star.png"
-        lifeSpan: 5000
-        count: 50
-        angle: 70
-        angleDeviation: 36
-        velocity: 30
-        velocityDeviation: 10
-        ParticleMotionWander {
-            xvariance: 30
-            pace: 100
-        }
-    }
-}
-    \endqml
-
-    \sa Particles
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsParticleMotionWander
-    \ingroup group_effects
-    \brief The QmlGraphicsParticleMotionWander class moves particles in a somewhat random fashion.
-
-    The particles will continue roughly in the original direction, however will randomly
-    drift to each side.
-*/
-
-/*!
-    \qmlproperty qreal QmlGraphicsParticleMotionWander::xvariance
-    \qmlproperty qreal QmlGraphicsParticleMotionWander::yvariance
-
-    These properties set the amount to wander in the x and y directions.
-*/
-
-/*!
-    \qmlproperty qreal QmlGraphicsParticleMotionWander::pace
-    This property holds how quickly the paricles will move from side to side.
-*/
-
-void QmlGraphicsParticleMotionWander::advance(QmlGraphicsParticle &p, int interval)
-{
-    if (!particles)
-        particles = qobject_cast<QmlGraphicsParticles*>(parent());
-    if (particles) {
-        Data *d = (Data*)p.data;
-        if (_xvariance != 0.) {
-            qreal xdiff = p.x_velocity - d->x_targetV;
-            if ((xdiff > d->x_peak && d->x_var > 0.0) || (xdiff < -d->x_peak && d->x_var < 0.0)) {
-                d->x_var = -d->x_var;
-                d->x_peak = _xvariance + _xvariance * qreal(qrand()) / RAND_MAX;
-            }
-            p.x_velocity += d->x_var * interval;
-        }
-        p.x += interval * p.x_velocity;
-
-        if (_yvariance != 0.) {
-            qreal ydiff = p.y_velocity - d->y_targetV;
-            if ((ydiff > d->y_peak && d->y_var > 0.0) || (ydiff < -d->y_peak && d->y_var < 0.0)) {
-                d->y_var = -d->y_var;
-                d->y_peak = _yvariance + _yvariance * qreal(qrand()) / RAND_MAX;
-            }
-            p.y_velocity += d->y_var * interval;
-        }
-        p.y += interval * p.y_velocity;
-    }
-}
-
-void QmlGraphicsParticleMotionWander::created(QmlGraphicsParticle &p)
-{
-    if (!p.data) {
-        Data *d = new Data;
-        p.data = (void*)d;
-        d->x_targetV = p.x_velocity;
-        d->y_targetV = p.y_velocity;
-        d->x_peak = _xvariance;
-        d->y_peak = _yvariance;
-        d->x_var = _pace * qreal(qrand()) / RAND_MAX / 1000.0;
-        d->y_var = _pace * qreal(qrand()) / RAND_MAX / 1000.0;
-    }
-}
-
-void QmlGraphicsParticleMotionWander::destroy(QmlGraphicsParticle &p)
-{
-    if (p.data)
-        delete (Data*)p.data;
-}
-
-void QmlGraphicsParticleMotionWander::setXVariance(qreal var)
-{
-    qreal scaledVar = var / 1000.0;
-    if (qFuzzyCompare(scaledVar, _xvariance))
-        return;
-    _xvariance = scaledVar;
-    emit xvarianceChanged();
-}
-
-void QmlGraphicsParticleMotionWander::setYVariance(qreal var)
-{
-    qreal scaledVar = var / 1000.0;
-    if (qFuzzyCompare(scaledVar, _yvariance))
-        return;
-    _yvariance = scaledVar;
-    emit yvarianceChanged();
-}
-
-void QmlGraphicsParticleMotionWander::setPace(qreal pace)
-{
-    qreal scaledPace = pace / 1000.0;
-    if (qFuzzyCompare(scaledPace, _pace))
-        return;
-    _pace = scaledPace;
-    emit paceChanged();
-}
-
-//---------------------------------------------------------------------------
-class QmlGraphicsParticlesPainter : public QmlGraphicsItem
-{
-public:
-    QmlGraphicsParticlesPainter(QmlGraphicsParticlesPrivate *p, QmlGraphicsItem* parent)
-        : QmlGraphicsItem(parent), d(p)
-    {
-        setFlag(QGraphicsItem::ItemHasNoContents, false);
-        maxX = minX = maxY = minY = 0;
-    }
-
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-
-    void updateSize();
-
-    qreal maxX;
-    qreal minX;
-    qreal maxY;
-    qreal minY;
-    QmlGraphicsParticlesPrivate* d;
-};
-
-//---------------------------------------------------------------------------
-class QmlGraphicsParticlesPrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsParticles)
-public:
-    QmlGraphicsParticlesPrivate()
-        : count(1), emissionRate(-1), emissionVariance(0.5), lifeSpan(1000)
-        , lifeSpanDev(1000), fadeInDur(200), fadeOutDur(300)
-        , angle(0), angleDev(0), velocity(0), velocityDev(0), emissionCarry(0.)
-        , addParticleTime(0), addParticleCount(0), lastAdvTime(0)
-        , motion(0), pendingPixmapCache(false), clock(this)
-    {
-    }
-
-    ~QmlGraphicsParticlesPrivate()
-    {
-    }
-
-    void init()
-    {
-        Q_Q(QmlGraphicsParticles);
-        paintItem = new QmlGraphicsParticlesPainter(this, q);
-    }
-
-    void tick(int time);
-    void createParticle(int time);
-    void updateOpacity(QmlGraphicsParticle &p, int age);
-
-    QUrl url;
-    QPixmap image;
-    int count;
-    int emissionRate;
-    qreal emissionVariance;
-    int lifeSpan;
-    int lifeSpanDev;
-    int fadeInDur;
-    int fadeOutDur;
-    qreal angle;
-    qreal angleDev;
-    qreal velocity;
-    qreal velocityDev;
-    qreal emissionCarry;
-    int addParticleTime;
-    int addParticleCount;
-    int lastAdvTime;
-    QmlGraphicsParticleMotion *motion;
-    QmlGraphicsParticlesPainter *paintItem;
-
-    bool pendingPixmapCache;
-
-    QList<QPair<int, int> > bursts;//countLeft, emissionRate pairs
-    QList<QmlGraphicsParticle> particles;
-    QTickAnimationProxy<QmlGraphicsParticlesPrivate, &QmlGraphicsParticlesPrivate::tick> clock;
-
-};
-
-void QmlGraphicsParticlesPrivate::tick(int time)
-{
-    Q_Q(QmlGraphicsParticles);
-    if (!motion)
-        motion = new QmlGraphicsParticleMotionLinear(q);
-
-    int oldCount = particles.count();
-    int removed = 0;
-    int interval = time - lastAdvTime;
-    for (int i = 0; i < particles.count(); ) {
-        QmlGraphicsParticle &particle = particles[i];
-        int age = time - particle.birthTime;
-        if (age >= particle.lifeSpan)  {
-            QmlGraphicsParticle part = particles.takeAt(i);
-            motion->destroy(part);
-            ++removed;
-        } else {
-            updateOpacity(particle, age);
-            motion->advance(particle, interval);
-            ++i;
-        }
-    }
-
-    if(emissionRate == -1)//Otherwise leave emission to the emission rate
-        while(removed-- && ((count == -1) || particles.count() < count))
-            createParticle(time);
-
-    if (!addParticleTime)
-        addParticleTime = time;
-
-    //Possibly emit new particles
-    if (((count == -1) || particles.count() < count) && emissionRate
-            && !(count==-1 && emissionRate==-1)) {
-        int emissionCount = -1;
-        if (emissionRate != -1){
-            qreal variance = 1.;
-            if (emissionVariance > 0.){
-                variance += (qreal(qrand())/RAND_MAX) * emissionVariance * (qrand()%2?-1.:1.);
-            }
-            qreal emission = emissionRate * (qreal(interval)/1000.);
-            emission = emission * variance + emissionCarry;
-            double tmpDbl;
-            emissionCarry = modf(emission, &tmpDbl);
-            emissionCount = (int)tmpDbl;
-            emissionCount = qMax(0,emissionCount);
-        }
-        while(((count == -1) || particles.count() < count) &&
-                (emissionRate==-1 || emissionCount--))
-            createParticle(time);
-    }
-
-    //Deal with emissions from requested bursts
-    for(int i=0; i<bursts.size(); i++){
-        int emission = 0;
-        if(bursts[i].second == -1){
-            emission = bursts[i].first;
-        }else{
-            qreal variance = 1.;
-            if (emissionVariance > 0.){
-                variance += (qreal(qrand())/RAND_MAX) * emissionVariance * (qrand()%2?-1.:1.);
-            }
-            qreal workingEmission = bursts[i].second * (qreal(interval)/1000.);
-            workingEmission *= variance;
-            emission = (int)workingEmission;
-            emission = qMax(emission, 0);
-        }
-        emission = qMin(emission, bursts[i].first);
-        bursts[i].first -= emission;
-        while(emission--)
-            createParticle(time);
-    }
-    for(int i=bursts.size()-1; i>=0; i--)
-        if(bursts[i].first <= 0)
-            bursts.removeAt(i);
-
-    lastAdvTime = time;
-    paintItem->updateSize();
-    paintItem->update();
-    if (!(oldCount || particles.count()) && (!count || !emissionRate) && bursts.isEmpty()) {
-        lastAdvTime = 0;
-        clock.stop();
-    }
-}
-
-void QmlGraphicsParticlesPrivate::createParticle(int time)
-{
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::CreateParticle> x;
-#endif
-    Q_Q(QmlGraphicsParticles);
-    QmlGraphicsParticle p(time);
-    p.x = q->x() + q->width() * qreal(qrand()) / RAND_MAX - image.width()/2.0;
-    p.y = q->y() + q->height() * qreal(qrand()) / RAND_MAX - image.height()/2.0;
-    p.lifeSpan = lifeSpan;
-    if (lifeSpanDev)
-        p.lifeSpan += int(lifeSpanDev/2 - lifeSpanDev * qreal(qrand()) / RAND_MAX);
-    p.fadeOutAge = p.lifeSpan - fadeOutDur;
-    if (fadeInDur == 0.) {
-        p.state= QmlGraphicsParticle::Solid;
-        p.opacity = 1.0;
-    }
-    qreal a = angle;
-    if (angleDev)
-        a += angleDev/2 - angleDev * qreal(qrand()) / RAND_MAX;
-    if (a > M_PI)
-        a = a - 2 * M_PI;
-    qreal v = velocity;
-    if (velocityDev)
-        v += velocityDev/2 - velocityDev * qreal(qrand()) / RAND_MAX;
-    p.x_velocity = v * fastCos(a);
-    p.y_velocity = v * fastSin(a);
-    particles.append(p);
-    motion->created(particles.last());
-}
-
-void QmlGraphicsParticlesPrivate::updateOpacity(QmlGraphicsParticle &p, int age)
-{
-    switch (p.state) {
-    case QmlGraphicsParticle::FadeIn:
-        if (age <= fadeInDur) {
-            p.opacity = qreal(age) / fadeInDur;
-            break;
-        } else {
-            p.opacity = 1.0;
-            p.state = QmlGraphicsParticle::Solid;
-            // Fall through
-        }
-    case QmlGraphicsParticle::Solid:
-        if (age <= p.fadeOutAge) {
-            break;
-        } else {
-            p.state = QmlGraphicsParticle::FadeOut;
-            // Fall through
-        }
-    case QmlGraphicsParticle::FadeOut:
-        p.opacity = qreal(p.lifeSpan - age) / fadeOutDur;
-        break;
-    }
-}
-
-/*!
-    \qmlclass Particles
-    \since 4.7
-    \brief The Particles object generates and moves particles.
-    \inherits Item
-
-    This element provides preliminary support for particles in QML,
-    and may be heavily changed or removed in later versions.
-
-    The particles created by this object cannot be dealt with
-    directly, they can only be controlled through the parameters of
-    the Particles object. The particles are all the same pixmap,
-    specified by the user.
-
-    The particles are painted relative to the parent of the Particles
-    object.  Moving the Particles object will not move the particles
-    already emitted.
-
-    The below example creates two differently behaving particle
-    sources.  The top one has particles falling from the top like
-    snow, the lower one has particles expelled up like a fountain.
-
-    \qml
-Rectangle {
-    width: 240
-    height: 320
-    color: "black"
-    Particles {
-        y: 0
-        width: parent.width
-        height: 30
-        source: "star.png"
-        lifeSpan: 5000
-        count: 50
-        angle: 70
-        angleDeviation: 36
-        velocity: 30
-        velocityDeviation: 10
-        ParticleMotionWander {
-            xvariance: 30
-            pace: 100
-        }
-    }
-    Particles {
-        y: 300
-        x: 120
-        width: 1
-        height: 1
-        source: "star.png"
-        lifeSpan: 5000
-        count: 200
-        angle: 270
-        angleDeviation: 45
-        velocity: 50
-        velocityDeviation: 30
-        ParticleMotionGravity {
-            yattractor: 1000
-            xattractor: 0
-            acceleration: 25
-        }
-    }
-}
-    \endqml
-    \image particles.gif
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsParticles
-    \ingroup group_effects
-    \brief The QmlGraphicsParticles class generates and moves particles.
-*/
-
-QmlGraphicsParticles::QmlGraphicsParticles(QmlGraphicsItem *parent)
-    : QmlGraphicsItem(*(new QmlGraphicsParticlesPrivate), parent)
-{
-    Q_D(QmlGraphicsParticles);
-    d->init();
-}
-
-QmlGraphicsParticles::~QmlGraphicsParticles()
-{
-    Q_D(QmlGraphicsParticles);
-    if (d->pendingPixmapCache)
-        QmlPixmapCache::cancel(d->url, this);
-}
-
-/*!
-    \qmlproperty string Particles::source
-    This property holds the URL of the particle image.
-*/
-
-/*!
-    \property QmlGraphicsParticles::source
-    \brief the URL of the particle image.
-*/
-QUrl QmlGraphicsParticles::source() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->url;
-}
-
-void QmlGraphicsParticles::imageLoaded()
-{
-    Q_D(QmlGraphicsParticles);
-    d->pendingPixmapCache = false;
-    QmlPixmapCache::get(d->url, &d->image);
-    d->paintItem->updateSize();
-    d->paintItem->update();
-}
-
-void QmlGraphicsParticles::setSource(const QUrl &name)
-{
-    Q_D(QmlGraphicsParticles);
-
-    if ((d->url.isEmpty() == name.isEmpty()) && name == d->url)
-        return;
-
-    if (d->pendingPixmapCache) {
-        QmlPixmapCache::cancel(d->url, this);
-        d->pendingPixmapCache = false;
-    }
-    if (name.isEmpty()) {
-        d->url = name;
-        d->image = QPixmap();
-        d->paintItem->updateSize();
-        d->paintItem->update();
-    } else {
-        d->url = name;
-        Q_ASSERT(!name.isRelative());
-        QmlPixmapReply::Status status = QmlPixmapCache::get(d->url, &d->image);
-        if (status != QmlPixmapReply::Ready && status != QmlPixmapReply::Error) {
-            QmlPixmapReply *reply = QmlPixmapCache::request(qmlEngine(this), d->url);
-            connect(reply, SIGNAL(finished()), this, SLOT(imageLoaded()));
-            d->pendingPixmapCache = true;
-        } else {
-            //### unify with imageLoaded
-            d->paintItem->updateSize();
-            d->paintItem->update();
-        }
-    }
-    emit sourceChanged();
-}
-
-/*!
-    \qmlproperty int Particles::count
-    This property holds the maximum number of particles
-
-    The particles element emits particles until it has count active
-    particles. When this number is reached, new particles are not emitted until
-    some of the current particles reach theend of their lifespan.
-
-    If count is -1 then there is no maximum number of active particles, and
-    particles will be constantly emitted at the rate specified by emissionRate.
-
-    If both count and emissionRate are set to -1, nothing will be emitted.
-
-*/
-
-/*!
-    \property QmlGraphicsParticles::count
-    \brief the maximum number of particles
-*/
-int QmlGraphicsParticles::count() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->count;
-}
-
-void QmlGraphicsParticles::setCount(int cnt)
-{
-    Q_D(QmlGraphicsParticles);
-    if (cnt == d->count)
-        return;
-
-    int oldCount = d->count;
-    d->count = cnt;
-    d->addParticleTime = 0;
-    d->addParticleCount = d->particles.count();
-    if (!oldCount && d->clock.state() != QAbstractAnimation::Running && d->count && d->emissionRate) {
-        d->clock.start();
-    }
-    d->paintItem->updateSize();
-    d->paintItem->update();
-    emit countChanged();
-}
-
-
-/*!
-    \qmlproperty int Particles::emissionRate
-    This property holds the target number of particles to emit every second.
-
-    The particles element will emit up to emissionRate particles every
-    second. Fewer particles may be emitted per second if the maximum number of
-    particles has been reached.
-
-    If emissionRate is set to -1 there is no limit to the number of
-    particles emitted per second, and particles will be instantly emitted to
-    reach the maximum number of particles specified by count.
-
-    The default value for emissionRate is -1.
-
-    If both count and emissionRate are set to -1, nothing will be emitted.
-*/
-
-/*!
-    \property QmlGraphicsParticles::emissionRate
-    \brief the emission rate of particles
-*/
-int QmlGraphicsParticles::emissionRate() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->emissionRate;
-}
-void QmlGraphicsParticles::setEmissionRate(int er)
-{
-    Q_D(QmlGraphicsParticles);
-    if(er == d->emissionRate)
-        return;
-    d->emissionRate = er;
-    if (d->clock.state() != QAbstractAnimation::Running && d->count && d->emissionRate) {
-            d->clock.start();
-    }
-    emit emissionRateChanged();
-}
-
-/*!
-    \qmlproperty qreal Particles::emissionVariance
-    This property holds how inconsistent the rate of particle emissions are.
-    It is a number between 0 (no variance) and 1 (some variance).
-
-    The expected number of particles emitted per second is emissionRate. If
-    emissionVariance is 0 then particles will be emitted consistently throughout
-    each second to reach that number. If emissionVariance is greater than 0 the
-    rate of particle emission will vary randomly throughout the second, with the
-    consequence that the actual number of particles emitted in one second will
-    vary randomly as well.
-
-    emissionVariance is the maximum deviation from emitting
-    emissionRate particles per second. An emissionVariance of 0 means you should
-    get exactly emissionRate particles emitted per second,
-    and an emissionVariance of 1 means you will get between zero and two times
-    emissionRate particles per second, but you should get emissionRate particles
-    per second on average.
-
-    Note that even with an emissionVariance of 0 there may be some variance due
-    to performance and hardware constraints.
-
-    The default value of emissionVariance is 0.5
-*/
-
-/*!
-    \property QmlGraphicsParticles::emissionVariance
-    \brief how much the particle emission amounts vary per tick
-*/
-
-qreal QmlGraphicsParticles::emissionVariance() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->emissionVariance;
-}
-
-void QmlGraphicsParticles::setEmissionVariance(qreal ev)
-{
-    Q_D(QmlGraphicsParticles);
-    if(d->emissionVariance == ev)
-        return;
-    d->emissionVariance = ev;
-    emit emissionVarianceChanged();
-}
-
-/*!
-    \qmlproperty int Particles::lifeSpan
-    \qmlproperty int Particles::lifeSpanDeviation
-
-    These properties describe the life span of each particle.
-
-    The default lifespan for a particle is 1000ms.
-
-    lifeSpanDeviation randomly varies the lifeSpan up to the specified variation.  For
-    example, the following creates particles whose lifeSpan will vary
-    from 150ms to 250ms:
-
-    \qml
-Particles {
-    source: "star.png"
-    lifeSpan: 200
-    lifeSpanDeviation: 100
-}
-    \endqml
-*/
-
-/*!
-    \property QmlGraphicsParticles::lifeSpan
-    \brief the life span of each particle.
-
-    Default value is 1000ms.
-
-    \sa QmlGraphicsParticles::lifeSpanDeviation
-*/
-int QmlGraphicsParticles::lifeSpan() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->lifeSpan;
-}
-
-void QmlGraphicsParticles::setLifeSpan(int ls)
-{
-    Q_D(QmlGraphicsParticles);
-    if(d->lifeSpan == ls)
-        return;
-    d->lifeSpan = ls;
-    emit lifeSpanChanged();
-}
-
-/*!
-    \property QmlGraphicsParticles::lifeSpanDeviation
-    \brief the maximum possible deviation from the set lifeSpan.
-
-    Randomly varies the lifeSpan up to the specified variation.  For
-    example, the following creates particles whose lifeSpan will vary
-    from 150ms to 250ms:
-
-\qml
-Particles {
-    source: "star.png"
-    lifeSpan: 200
-    lifeSpanDeviation: 100
-}
-\endqml
-
-    \sa QmlGraphicsParticles::lifeSpan
-*/
-int QmlGraphicsParticles::lifeSpanDeviation() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->lifeSpanDev;
-}
-
-void QmlGraphicsParticles::setLifeSpanDeviation(int dev)
-{
-    Q_D(QmlGraphicsParticles);
-    if(d->lifeSpanDev == dev)
-        return;
-    d->lifeSpanDev = dev;
-    emit lifeSpanDeviationChanged();
-}
-
-/*!
-    \qmlproperty int Particles::fadeInDuration
-    \qmlproperty int Particles::fadeOutDuration
-    These properties hold the time taken to fade the particles in and out.
-
-    By default fade in is 200ms and fade out is 300ms.
-*/
-
-/*!
-    \property QmlGraphicsParticles::fadeInDuration
-    \brief the time taken to fade in the particles.
-
-    Default value is 200ms.
-*/
-int QmlGraphicsParticles::fadeInDuration() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->fadeInDur;
-}
-
-void QmlGraphicsParticles::setFadeInDuration(int dur)
-{
-    Q_D(QmlGraphicsParticles);
-    if (dur < 0.0 || dur == d->fadeInDur)
-        return;
-    d->fadeInDur = dur;
-    emit fadeInDurationChanged();
-}
-
-/*!
-    \property QmlGraphicsParticles::fadeOutDuration
-    \brief the time taken to fade out the particles.
-
-    Default value is 300ms.
-*/
-int QmlGraphicsParticles::fadeOutDuration() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->fadeOutDur;
-}
-
-void QmlGraphicsParticles::setFadeOutDuration(int dur)
-{
-    Q_D(QmlGraphicsParticles);
-    if (dur < 0.0 || d->fadeOutDur == dur)
-        return;
-    d->fadeOutDur = dur;
-    emit fadeOutDurationChanged();
-}
-
-/*!
-    \qmlproperty real Particles::angle
-    \qmlproperty real Particles::angleDeviation
-
-    These properties control particle direction.
-
-    angleDeviation randomly varies the direction up to the specified variation.  For
-    example, the following creates particles whose initial direction will
-    vary from 15 degrees to 105 degrees:
-
-    \qml
-Particles {
-    source: "star.png"
-    angle: 60
-    angleDeviation: 90
-}
-    \endqml
-*/
-
-/*!
-    \property QmlGraphicsParticles::angle
-    \brief the initial angle of direction.
-
-    \sa QmlGraphicsParticles::angleDeviation
-*/
-qreal QmlGraphicsParticles::angle() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->angle * 180.0 / M_PI;
-}
-
-void QmlGraphicsParticles::setAngle(qreal angle)
-{
-    Q_D(QmlGraphicsParticles);
-    qreal radAngle = angle * M_PI / 180.0;
-    if(radAngle == d->angle)
-        return;
-    d->angle = radAngle;
-    emit angleChanged();
-}
-
-/*!
-    \property QmlGraphicsParticles::angleDeviation
-    \brief the maximum possible deviation from the set angle.
-
-    Randomly varies the direction up to the specified variation.  For
-    example, the following creates particles whose initial direction will
-    vary from 15 degrees to 105 degrees:
-
-\qml
-Particles {
-    source: "star.png"
-    angle: 60
-    angleDeviation: 90
-}
-\endqml
-
-    \sa QmlGraphicsParticles::angle
-*/
-qreal QmlGraphicsParticles::angleDeviation() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->angleDev * 180.0 / M_PI;
-}
-
-void QmlGraphicsParticles::setAngleDeviation(qreal dev)
-{
-    Q_D(QmlGraphicsParticles);
-    qreal radDev = dev * M_PI / 180.0;
-    if(radDev == d->angleDev)
-        return;
-    d->angleDev = radDev;
-    emit angleDeviationChanged();
-}
-
-/*!
-    \qmlproperty real Particles::velocity
-    \qmlproperty real Particles::velocityDeviation
-
-    These properties control the velocity of the particles.
-
-    velocityDeviation randomly varies the velocity up to the specified variation.  For
-    example, the following creates particles whose initial velocity will
-    vary from 40 to 60.
-
-    \qml
-Particles {
-    source: "star.png"
-    velocity: 50
-    velocityDeviation: 20
-}
-    \endqml
-*/
-
-/*!
-    \property QmlGraphicsParticles::velocity
-    \brief the initial velocity of the particles.
-
-    \sa QmlGraphicsParticles::velocityDeviation
-*/
-qreal QmlGraphicsParticles::velocity() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->velocity * 1000.0;
-}
-
-void QmlGraphicsParticles::setVelocity(qreal velocity)
-{
-    Q_D(QmlGraphicsParticles);
-    qreal realVel = velocity / 1000.0;
-    if(realVel == d->velocity)
-        return;
-    d->velocity = realVel;
-    emit velocityChanged();
-}
-
-/*!
-    \property QmlGraphicsParticles::velocityDeviation
-    \brief the maximum possible deviation from the set velocity.
-
-    Randomly varies the velocity up to the specified variation.  For
-    example, the following creates particles whose initial velocity will
-    vary from 40 to 60.
-
-\qml
-Particles {
-    source: "star.png"
-    velocity: 50
-    velocityDeviation: 20
-}
-\endqml
-
-    \sa QmlGraphicsParticles::velocity
-*/
-qreal QmlGraphicsParticles::velocityDeviation() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->velocityDev * 1000.0;
-}
-
-void QmlGraphicsParticles::setVelocityDeviation(qreal velocity)
-{
-    Q_D(QmlGraphicsParticles);
-    qreal realDev = velocity / 1000.0;
-    if(realDev == d->velocityDev)
-        return;
-    d->velocityDev = realDev;
-    emit velocityDeviationChanged();
-}
-
-/*!
-    \qmlproperty ParticleMotion Particles::motion
-    This property sets the type of motion to apply to the particles.
-
-    When a particle is created it will have an initial direction and velocity.
-    The motion of the particle during its lifeSpan is then influenced by the
-    motion property.
-
-    Default motion is ParticleMotionLinear.
-*/
-
-/*!
-    \property QmlGraphicsParticles::motion
-    \brief sets the type of motion to apply to the particles.
-
-    When a particle is created it will have an initial direction and velocity.
-    The motion of the particle during its lifeSpan is then influenced by the
-    motion property.
-
-    Default motion is QmlGraphicsParticleMotionLinear.
-*/
-QmlGraphicsParticleMotion *QmlGraphicsParticles::motion() const
-{
-    Q_D(const QmlGraphicsParticles);
-    return d->motion;
-}
-
-void QmlGraphicsParticles::setMotion(QmlGraphicsParticleMotion *motion)
-{
-    Q_D(QmlGraphicsParticles);
-    if (motion == d->motion)
-        return;
-    d->motion = motion;
-    emit motionChanged();
-}
-
-/*!
-    \qmlmethod Particles::burst(int count, int emissionRate)
-
-    Initiates a burst of particles.
-
-    This method takes two arguments. The first argument is the number
-    of particles to emit and the second argument is the emissionRate for the
-    burst. If the second argument is omitted, it is treated as -1. The burst
-    of particles has a separate emissionRate and count to the normal emission of
-    particles. The burst uses the same values as normal emission for all other
-    properties, including emissionVariance.
-
-    The normal emission of particles will continue during the burst, however
-    the particles created by the burst count towards the maximum number used by
-    normal emission. To avoid this behavior, use two Particles elements.
-
-*/
-void QmlGraphicsParticles::burst(int count, int emissionRate)
-{
-    Q_D(QmlGraphicsParticles);
-    d->bursts << qMakePair(count, emissionRate);
-    if (d->clock.state() != QAbstractAnimation::Running)
-        d->clock.start();
-}
-
-void QmlGraphicsParticlesPainter::updateSize()
-{
-    if (!isComponentComplete())
-        return;
-
-    const int parentX = parentItem()->x();
-    const int parentY = parentItem()->y();
-    for (int i = 0; i < d->particles.count(); ++i) {
-        const QmlGraphicsParticle &particle = d->particles.at(i);
-        if(particle.x > maxX)
-            maxX = particle.x;
-        if(particle.x < minX)
-            minX = particle.x;
-        if(particle.y > maxY)
-            maxY = particle.y;
-        if(particle.y < minY)
-            minY = particle.y;
-    }
-
-    int myWidth = (int)(maxX-minX+0.5)+d->image.width();
-    int myX = (int)(minX - parentX);
-    int myHeight = (int)(maxY-minY+0.5)+d->image.height();
-    int myY = (int)(minY - parentY);
-    setWidth(myWidth);
-    setHeight(myHeight);
-    setX(myX);
-    setY(myY);
-}
-
-void QmlGraphicsParticles::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    Q_UNUSED(p);
-    //painting is done by the ParticlesPainter, so it can have the right size
-}
-
-void QmlGraphicsParticlesPainter::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    if (d->image.isNull() || d->particles.isEmpty())
-        return;
-
-    const int myX = x() + parentItem()->x();
-    const int myY = y() + parentItem()->y();
-
-    QVarLengthArray<QDrawPixmaps::Data, 256> pixmapData;
-    pixmapData.resize(d->particles.count());
-
-    const QRectF sourceRect = d->image.rect();
-    qreal halfPWidth = sourceRect.width()/2.;
-    qreal halfPHeight = sourceRect.height()/2.;
-    for (int i = 0; i < d->particles.count(); ++i) {
-        const QmlGraphicsParticle &particle = d->particles.at(i);
-        pixmapData[i].point = QPointF(particle.x - myX + halfPWidth, particle.y - myY + halfPHeight);
-        pixmapData[i].opacity = particle.opacity;
-
-        //these never change
-        pixmapData[i].rotation = 0;
-        pixmapData[i].scaleX = 1;
-        pixmapData[i].scaleY = 1;
-        pixmapData[i].source = sourceRect;
-    }
-    qDrawPixmaps(p, pixmapData.data(), d->particles.count(), d->image);
-}
-
-void QmlGraphicsParticles::componentComplete()
-{
-    Q_D(QmlGraphicsParticles);
-    QmlGraphicsItem::componentComplete();
-    if (d->count) {
-        d->paintItem->updateSize();
-        d->clock.start();
-    }
-    if (d->lifeSpanDev > d->lifeSpan)
-        d->lifeSpanDev = d->lifeSpan;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
deleted file mode 100644
index 8e66335..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSPARTICLES_H
-#define QMLGRAPHICSPARTICLES_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsParticle;
-class QmlGraphicsParticles;
-class Q_DECLARATIVE_EXPORT QmlGraphicsParticleMotion : public QObject
-{
-    Q_OBJECT
-public:
-    QmlGraphicsParticleMotion(QObject *parent=0);
-
-    virtual void advance(QmlGraphicsParticle &, int interval);
-    virtual void created(QmlGraphicsParticle &);
-    virtual void destroy(QmlGraphicsParticle &);
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsParticleMotionLinear : public QmlGraphicsParticleMotion
-{
-    Q_OBJECT
-public:
-    QmlGraphicsParticleMotionLinear(QObject *parent=0)
-        : QmlGraphicsParticleMotion(parent) {}
-
-    virtual void advance(QmlGraphicsParticle &, int interval);
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsParticleMotionGravity : public QmlGraphicsParticleMotion
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal xattractor READ xAttractor WRITE setXAttractor NOTIFY xattractorChanged)
-    Q_PROPERTY(qreal yattractor READ yAttractor WRITE setYAttractor NOTIFY yattractorChanged)
-    Q_PROPERTY(qreal acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged)
-public:
-    QmlGraphicsParticleMotionGravity(QObject *parent=0)
-        : QmlGraphicsParticleMotion(parent), _xAttr(0.0), _yAttr(0.0), _accel(0.00005) {}
-
-    qreal xAttractor() const { return _xAttr; }
-    void setXAttractor(qreal x);
-
-    qreal yAttractor() const { return _yAttr; }
-    void setYAttractor(qreal y);
-
-    qreal acceleration() const { return _accel * 1000000; }
-    void setAcceleration(qreal accel);
-
-    virtual void advance(QmlGraphicsParticle &, int interval);
-
-Q_SIGNALS:
-    void xattractorChanged();
-    void yattractorChanged();
-    void accelerationChanged();
-
-private:
-    qreal _xAttr;
-    qreal _yAttr;
-    qreal _accel;
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsParticleMotionWander : public QmlGraphicsParticleMotion
-{
-    Q_OBJECT
-public:
-    QmlGraphicsParticleMotionWander()
-        : QmlGraphicsParticleMotion(), particles(0), _xvariance(0), _yvariance(0) {}
-
-    virtual void advance(QmlGraphicsParticle &, int interval);
-    virtual void created(QmlGraphicsParticle &);
-    virtual void destroy(QmlGraphicsParticle &);
-
-    struct Data {
-        qreal x_targetV;
-        qreal y_targetV;
-        qreal x_peak;
-        qreal y_peak;
-        qreal x_var;
-        qreal y_var;
-    };
-
-    Q_PROPERTY(qreal xvariance READ xVariance WRITE setXVariance NOTIFY xvarianceChanged)
-    qreal xVariance() const { return _xvariance * 1000.0; }
-    void setXVariance(qreal var);
-
-    Q_PROPERTY(qreal yvariance READ yVariance WRITE setYVariance NOTIFY yvarianceChanged)
-    qreal yVariance() const { return _yvariance * 1000.0; }
-    void setYVariance(qreal var);
-
-    Q_PROPERTY(qreal pace READ pace WRITE setPace NOTIFY paceChanged)
-    qreal pace() const { return _pace * 1000.0; }
-    void setPace(qreal pace);
-
-Q_SIGNALS:
-    void xvarianceChanged();
-    void yvarianceChanged();
-    void paceChanged();
-    
-private:
-    QmlGraphicsParticles *particles;
-    qreal _xvariance;
-    qreal _yvariance;
-    qreal _pace;
-};
-
-class QmlGraphicsParticlesPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsParticles : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged)
-    Q_PROPERTY(int emissionRate READ emissionRate WRITE setEmissionRate NOTIFY emissionRateChanged)
-    Q_PROPERTY(qreal emissionVariance READ emissionVariance WRITE setEmissionVariance NOTIFY emissionVarianceChanged)
-    Q_PROPERTY(int lifeSpan READ lifeSpan WRITE setLifeSpan NOTIFY lifeSpanChanged)
-    Q_PROPERTY(int lifeSpanDeviation READ lifeSpanDeviation WRITE setLifeSpanDeviation NOTIFY lifeSpanDeviationChanged)
-    Q_PROPERTY(int fadeInDuration READ fadeInDuration WRITE setFadeInDuration NOTIFY fadeInDurationChanged)
-    Q_PROPERTY(int fadeOutDuration READ fadeOutDuration WRITE setFadeOutDuration NOTIFY fadeOutDurationChanged)
-    Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
-    Q_PROPERTY(qreal angleDeviation READ angleDeviation WRITE setAngleDeviation NOTIFY angleDeviationChanged)
-    Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity NOTIFY velocityChanged)
-    Q_PROPERTY(qreal velocityDeviation READ velocityDeviation WRITE setVelocityDeviation NOTIFY velocityDeviationChanged)
-    Q_PROPERTY(QmlGraphicsParticleMotion *motion READ motion WRITE setMotion NOTIFY motionChanged)
-    Q_CLASSINFO("DefaultProperty", "motion")
-
-public:
-    QmlGraphicsParticles(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsParticles();
-
-    QUrl source() const;
-    void setSource(const QUrl &);
-
-    int count() const;
-    void setCount(int cnt);
-
-    int emissionRate() const;
-    void setEmissionRate(int);
-
-    qreal emissionVariance() const;
-    void setEmissionVariance(qreal);
-
-    int lifeSpan() const;
-    void setLifeSpan(int);
-
-    int lifeSpanDeviation() const;
-    void setLifeSpanDeviation(int);
-
-    int fadeInDuration() const;
-    void setFadeInDuration(int);
-
-    int fadeOutDuration() const;
-    void setFadeOutDuration(int);
-
-    qreal angle() const;
-    void setAngle(qreal);
-
-    qreal angleDeviation() const;
-    void setAngleDeviation(qreal);
-
-    qreal velocity() const;
-    void setVelocity(qreal);
-
-    qreal velocityDeviation() const;
-    void setVelocityDeviation(qreal);
-
-    QmlGraphicsParticleMotion *motion() const;
-    void setMotion(QmlGraphicsParticleMotion *);
-
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-
-public Q_SLOTS:
-    void burst(int count, int emissionRate=-1);
-
-protected:
-    virtual void componentComplete();
-
-Q_SIGNALS:
-    void sourceChanged();
-    void countChanged();
-    void emissionRateChanged();
-    void emissionVarianceChanged();
-    void lifeSpanChanged();
-    void lifeSpanDeviationChanged();
-    void fadeInDurationChanged();
-    void fadeOutDurationChanged();
-    void angleChanged();
-    void angleDeviationChanged();
-    void velocityChanged();
-    void velocityDeviationChanged();
-    void emittingChanged();
-    void motionChanged();
-
-private Q_SLOTS:
-    void imageLoaded();
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsParticles)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsParticles)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsParticleMotion)
-QML_DECLARE_TYPE(QmlGraphicsParticleMotionLinear)
-QML_DECLARE_TYPE(QmlGraphicsParticleMotionGravity)
-QML_DECLARE_TYPE(QmlGraphicsParticleMotionWander)
-QML_DECLARE_TYPE(QmlGraphicsParticles)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp
deleted file mode 100644
index 0da246f..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspath.cpp
+++ /dev/null
@@ -1,849 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicspath_p.h"
-#include "qmlgraphicspath_p_p.h"
-
-#include <qfxperf_p_p.h>
-
-#include <QSet>
-
-#include <private/qbezier_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass PathElement QmlGraphicsPathElement
-    \since 4.7
-    \brief PathElement is the base path type.
-
-    This type is the base for all path types.  It cannot
-    be instantiated.
-
-    \sa Path, PathAttribute, PathPercent, PathLine, PathQuad, PathCubic
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsPathElement
-    \ingroup group_utility
-*/
-
-/*!
-    \qmlclass Path QmlGraphicsPath
-    \since 4.7
-    \brief A Path object defines a path for use by \l PathView.
-
-    A Path is composed of one or more path segments - PathLine, PathQuad,
-    PathCubic.
-
-    The spacing of the items along the Path can be adjusted via a
-    PathPercent object.
-
-    PathAttribute allows named attributes with values to be defined
-    along the path.
-
-    \sa PathView, PathAttribute, PathPercent, PathLine, PathQuad, PathCubic
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsPath
-    \ingroup group_utility
-    \brief The QmlGraphicsPath class defines a path.
-    \sa QmlGraphicsPathView
-*/
-QmlGraphicsPath::QmlGraphicsPath(QObject *parent)
- : QObject(*(new QmlGraphicsPathPrivate), parent)
-{
-}
-
-QmlGraphicsPath::~QmlGraphicsPath()
-{
-}
-
-/*!
-    \qmlproperty real Path::startX
-    \qmlproperty real Path::startY
-    These properties hold the starting position of the path.
-*/
-qreal QmlGraphicsPath::startX() const
-{
-    Q_D(const QmlGraphicsPath);
-    return d->startX;
-}
-
-void QmlGraphicsPath::setStartX(qreal x)
-{
-    Q_D(QmlGraphicsPath);
-    d->startX = x;
-}
-
-qreal QmlGraphicsPath::startY() const
-{
-    Q_D(const QmlGraphicsPath);
-    return d->startY;
-}
-
-void QmlGraphicsPath::setStartY(qreal y)
-{
-    Q_D(QmlGraphicsPath);
-    d->startY = y;
-}
-
-/*!
-    \qmlproperty bool Path::closed
-    This property holds whether the start and end of the path are identical.
-*/
-bool QmlGraphicsPath::isClosed() const
-{
-    Q_D(const QmlGraphicsPath);
-    return d->closed;
-}
-
-/*!
-    \qmlproperty list<PathElement> Path::pathElements
-    This property holds the objects composing the path.
-
-    \default
-
-    A path can contain the following path objects:
-    \list
-        \i \l PathLine - a straight line to a given position.
-        \i \l PathQuad - a quadratic Bezier curve to a given position with a control point.
-        \i \l PathCubic - a cubic Bezier curve to a given position with two control points.
-        \i \l PathAttribute - an attribute at a given position in the path.
-        \i \l PathPercent - a way to spread out items along various segments of the path.
-    \endlist
-
-    \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 2
-*/
-
-QmlListProperty<QmlGraphicsPathElement> QmlGraphicsPath::pathElements()
-{
-    Q_D(QmlGraphicsPath);
-    return QmlListProperty<QmlGraphicsPathElement>(this, d->_pathElements);
-}
-
-void QmlGraphicsPath::interpolate(int idx, const QString &name, qreal value)
-{
-    Q_D(QmlGraphicsPath);
-    if (!idx)
-        return;
-
-    qreal lastValue = 0;
-    qreal lastPercent = 0;
-    int search = idx - 1;
-    while(search >= 0) {
-        const AttributePoint &point = d->_attributePoints.at(search);
-        if (point.values.contains(name)) {
-            lastValue = point.values.value(name);
-            lastPercent = point.origpercent;
-            break;
-        }
-        --search;
-    }
-
-    ++search;
-
-    const AttributePoint &curPoint = d->_attributePoints.at(idx);
-
-    for (int ii = search; ii < idx; ++ii) {
-        AttributePoint &point = d->_attributePoints[ii];
-
-        qreal val = lastValue + (value - lastValue) * (point.origpercent - lastPercent) / (curPoint.origpercent - lastPercent);
-        point.values.insert(name, val);
-    }
-}
-
-void QmlGraphicsPath::endpoint(const QString &name)
-{
-    Q_D(QmlGraphicsPath);
-    const AttributePoint &first = d->_attributePoints.first();
-    qreal val = first.values.value(name);
-    for (int ii = d->_attributePoints.count() - 1; ii >= 0; ii--) {
-        const AttributePoint &point = d->_attributePoints.at(ii);
-        if (point.values.contains(name)) {
-            for (int jj = ii + 1; jj < d->_attributePoints.count(); ++jj) {
-                AttributePoint &setPoint = d->_attributePoints[jj];
-                setPoint.values.insert(name, val);
-            }
-            return;
-        }
-    }
-}
-
-void QmlGraphicsPath::processPath()
-{
-    Q_D(QmlGraphicsPath);
-
-    d->_pointCache.clear();
-    d->_attributePoints.clear();
-    d->_path = QPainterPath();
-
-    AttributePoint first;
-    for (int ii = 0; ii < d->_attributes.count(); ++ii)
-        first.values[d->_attributes.at(ii)] = 0;
-    d->_attributePoints << first;
-
-    d->_path.moveTo(d->startX, d->startY);
-
-    QmlGraphicsCurve *lastCurve = 0;
-    foreach (QmlGraphicsPathElement *pathElement, d->_pathElements) {
-        if (QmlGraphicsCurve *curve = qobject_cast<QmlGraphicsCurve *>(pathElement)) {
-            curve->addToPath(d->_path);
-            AttributePoint p;
-            p.origpercent = d->_path.length();
-            d->_attributePoints << p;
-            lastCurve = curve;
-        } else if (QmlGraphicsPathAttribute *attribute = qobject_cast<QmlGraphicsPathAttribute *>(pathElement)) {
-            AttributePoint &point = d->_attributePoints.last();
-            point.values[attribute->name()] = attribute->value();
-            interpolate(d->_attributePoints.count() - 1, attribute->name(), attribute->value());
-        } else if (QmlGraphicsPathPercent *percent = qobject_cast<QmlGraphicsPathPercent *>(pathElement)) {
-            AttributePoint &point = d->_attributePoints.last();
-            point.values[QLatin1String("_qfx_percent")] = percent->value();
-            interpolate(d->_attributePoints.count() - 1, QLatin1String("_qfx_percent"), percent->value());
-        }
-    }
-
-    // Fixup end points
-    const AttributePoint &last = d->_attributePoints.last();
-    for (int ii = 0; ii < d->_attributes.count(); ++ii) {
-        if (!last.values.contains(d->_attributes.at(ii)))
-            endpoint(d->_attributes.at(ii));
-    }
-
-    // Adjust percent
-    qreal length = d->_path.length();
-    qreal prevpercent = 0;
-    qreal prevorigpercent = 0;
-    for (int ii = 0; ii < d->_attributePoints.count(); ++ii) {
-        const AttributePoint &point = d->_attributePoints.at(ii);
-        if (point.values.contains(QLatin1String("_qfx_percent"))) { //special string for QmlGraphicsPathPercent
-            if ( ii > 0) {
-                qreal scale = (d->_attributePoints[ii].origpercent/length - prevorigpercent) /
-                            (point.values.value(QLatin1String("_qfx_percent"))-prevpercent);
-                d->_attributePoints[ii].scale = scale;
-            }
-            d->_attributePoints[ii].origpercent /= length;
-            d->_attributePoints[ii].percent = point.values.value(QLatin1String("_qfx_percent"));
-            prevorigpercent = d->_attributePoints[ii].origpercent;
-            prevpercent = d->_attributePoints[ii].percent;
-        } else {
-            d->_attributePoints[ii].origpercent /= length;
-            d->_attributePoints[ii].percent = d->_attributePoints[ii].origpercent;
-        }
-    }
-
-    d->closed = lastCurve && d->startX == lastCurve->x() && d->startY == lastCurve->y();
-
-    emit changed();
-}
-
-void QmlGraphicsPath::componentComplete()
-{
-    Q_D(QmlGraphicsPath);
-    QSet<QString> attrs;
-    // First gather up all the attributes
-    foreach (QmlGraphicsPathElement *pathElement, d->_pathElements) {
-        if (QmlGraphicsPathAttribute *attribute =
-            qobject_cast<QmlGraphicsPathAttribute *>(pathElement))
-            attrs.insert(attribute->name());
-    }
-    d->_attributes = attrs.toList();
-
-    processPath();
-
-    foreach (QmlGraphicsPathElement *pathElement, d->_pathElements)
-        connect(pathElement, SIGNAL(changed()), this, SLOT(processPath()));
-}
-
-QPainterPath QmlGraphicsPath::path() const
-{
-    Q_D(const QmlGraphicsPath);
-    return d->_path;
-}
-
-QStringList QmlGraphicsPath::attributes() const
-{
-    Q_D(const QmlGraphicsPath);
-    return d->_attributes;
-}
-#include <QTime>
-
-static inline QBezier nextBezier(const QPainterPath &path, int *from, qreal *bezLength)
-{
-    const int lastElement = path.elementCount() - 1;
-    for (int i=*from; i <= lastElement; ++i) {
-        const QPainterPath::Element &e = path.elementAt(i);
-
-        switch (e.type) {
-        case QPainterPath::MoveToElement:
-            break;
-        case QPainterPath::LineToElement:
-        {
-            QLineF line(path.elementAt(i-1), e);
-            *bezLength = line.length();
-            QPointF a = path.elementAt(i-1);
-            QPointF delta = e - a;
-            *from = i+1;
-            return QBezier::fromPoints(a, a + delta / 3, a + 2 * delta / 3, e);
-        }
-        case QPainterPath::CurveToElement:
-        {
-            QBezier b = QBezier::fromPoints(path.elementAt(i-1),
-                                            e,
-                                            path.elementAt(i+1),
-                                            path.elementAt(i+2));
-            *bezLength = b.length();
-            *from = i+3;
-            return b;
-        }
-        default:
-            break;
-        }
-    }
-    *from = lastElement;
-    *bezLength = 0;
-    return QBezier();
-}
-
-void QmlGraphicsPath::createPointCache() const
-{
-    Q_D(const QmlGraphicsPath);
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::QmlGraphicsPathViewPathCache> pc;
-#endif
-    qreal pathLength = d->_path.length();
-    const int points = int(pathLength*2);
-    const int lastElement = d->_path.elementCount() - 1;
-    d->_pointCache.resize(points+1);
-
-    int currElement = 0;
-    qreal bezLength = 0;
-    QBezier currBez = nextBezier(d->_path, &currElement, &bezLength);
-    qreal currLength = bezLength;
-    qreal epc = currLength / pathLength;
-
-    for (int i = 0; i < d->_pointCache.size(); i++) {
-        //find which set we are in
-        qreal prevPercent = 0;
-        qreal prevOrigPercent = 0;
-        for (int ii = 0; ii < d->_attributePoints.count(); ++ii) {
-            qreal percent = qreal(i)/points;
-            const AttributePoint &point = d->_attributePoints.at(ii);
-            if (percent < point.percent || ii == d->_attributePoints.count() - 1) { //### || is special case for very last item
-                qreal elementPercent = (percent - prevPercent);
-
-                qreal spc = prevOrigPercent + elementPercent * point.scale;
-
-                while (spc > epc) {
-                    if (currElement > lastElement)
-                        break;
-                    currBez = nextBezier(d->_path, &currElement, &bezLength);
-                    if (bezLength == 0.0) {
-                        currLength = pathLength;
-                        epc = 1.0;
-                        break;
-                    }
-                    currLength += bezLength;
-                    epc = currLength / pathLength;
-                }
-                qreal realT = (pathLength * spc - (currLength - bezLength)) / bezLength;
-                d->_pointCache[i] = currBez.pointAt(qBound(qreal(0), realT, qreal(1)));
-                break;
-            }
-            prevOrigPercent = point.origpercent;
-            prevPercent = point.percent;
-        }
-    }
-}
-
-QPointF QmlGraphicsPath::pointAt(qreal p) const
-{
-    Q_D(const QmlGraphicsPath);
-    if (d->_pointCache.isEmpty()) {
-        createPointCache();
-    }
-    int idx = qRound(p*d->_pointCache.size());
-    if (idx >= d->_pointCache.size())
-        idx = d->_pointCache.size() - 1;
-    else if (idx < 0)
-        idx = 0;
-    return d->_pointCache.at(idx);
-}
-
-qreal QmlGraphicsPath::attributeAt(const QString &name, qreal percent) const
-{
-    Q_D(const QmlGraphicsPath);
-    if (percent < 0 || percent > 1)
-        return 0;
-
-    for (int ii = 0; ii < d->_attributePoints.count(); ++ii) {
-        const AttributePoint &point = d->_attributePoints.at(ii);
-
-        if (point.percent == percent) {
-            return point.values.value(name);
-        } else if (point.percent > percent) {
-            qreal lastValue =
-                ii?(d->_attributePoints.at(ii - 1).values.value(name)):0;
-            qreal lastPercent =
-                ii?(d->_attributePoints.at(ii - 1).percent):0;
-            qreal curValue = point.values.value(name);
-            qreal curPercent = point.percent;
-
-            return lastValue + (curValue - lastValue) * (percent - lastPercent) / (curPercent - lastPercent);
-        }
-    }
-
-    return 0;
-}
-
-/****************************************************************************/
-
-qreal QmlGraphicsCurve::x() const
-{
-    return _x;
-}
-
-void QmlGraphicsCurve::setX(qreal x)
-{
-    if (_x != x) {
-        _x = x;
-        emit changed();
-    }
-}
-
-qreal QmlGraphicsCurve::y() const
-{
-    return _y;
-}
-
-void QmlGraphicsCurve::setY(qreal y)
-{
-    if (_y != y) {
-        _y = y;
-        emit changed();
-    }
-}
-
-/****************************************************************************/
-
-/*!
-    \qmlclass PathAttribute QmlGraphicsPathAttribute
-    \since 4.7
-    \brief The PathAttribute allows setting an attribute at a given position in a Path.
-
-    The PathAttribute object allows attibutes consisting of a name and
-    a value to be specified for the endpoints of path segments.  The
-    attributes are exposed to the delegate as
-    \l{qmlintroduction.html#attached-properties} {Attached Properties}.
-    The value of an attribute at any particular point is interpolated
-    from the PathAttributes bounding the point.
-
-    The example below shows a path with the items scaled to 30% with
-    opacity 50% at the top of the path and scaled 100% with opacity
-    100% at the bottom.  Note the use of the PathView.scale and
-    PathView.opacity attached properties to set the scale and opacity
-    of the delegate.
-
-    \table
-    \row
-    \o \image declarative-pathattribute.png
-    \o
-    \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 0
-    \endtable
-
-   \sa Path
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsPathAttribute
-    \ingroup group_utility
-    \brief The QmlGraphicsPathAttribute class allows to set the value of an attribute at a given position in the path.
-
-    \sa QmlGraphicsPath
-*/
-
-
-/*!
-    \qmlproperty string PathAttribute::name
-    the name of the attribute to change.
-*/
-
-/*!
-    the name of the attribute to change.
-*/
-
-QString QmlGraphicsPathAttribute::name() const
-{
-    return _name;
-}
-
-void QmlGraphicsPathAttribute::setName(const QString &name)
-{
-    _name = name;
-}
-
-/*!
-   \qmlproperty string PathAttribute::value
-   the new value of the attribute.
-*/
-
-/*!
-    the new value of the attribute.
-*/
-qreal QmlGraphicsPathAttribute::value() const
-{
-    return _value;
-}
-
-void QmlGraphicsPathAttribute::setValue(qreal value)
-{
-    if (_value != value) {
-        _value = value;
-        emit changed();
-    }
-}
-
-/****************************************************************************/
-
-/*!
-    \qmlclass PathLine QmlGraphicsPathLine
-    \since 4.7
-    \brief The PathLine defines a straight line.
-
-    The example below creates a path consisting of a straight line from
-    0,100 to 200,100:
-
-    \qml
-    Path {
-        startX: 0; startY: 100
-        PathLine { x: 200; y: 100 }
-    }
-    \endqml
-
-    \sa Path, PathQuad, PathCubic
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsPathLine
-    \ingroup group_utility
-    \brief The QmlGraphicsPathLine class defines a straight line.
-
-    \sa QmlGraphicsPath
-*/
-
-/*!
-    \qmlproperty real PathLine::x
-    \qmlproperty real PathLine::y
-
-    Defines the end point of the line.
-*/
-
-void QmlGraphicsPathLine::addToPath(QPainterPath &path)
-{
-    path.lineTo(x(), y());
-}
-
-/****************************************************************************/
-
-/*!
-    \qmlclass PathQuad QmlGraphicsPathQuad
-    \since 4.7
-    \brief The PathQuad defines a quadratic Bezier curve with a control point.
-
-    The following QML produces the path shown below:
-    \table
-    \row
-    \o \image declarative-pathquad.png
-    \o
-    \qml
-    Path {
-        startX: 0; startY: 0
-        PathQuad x: 200; y: 0; controlX: 100; controlY: 150 }
-    }
-    \endqml
-    \endtable
-
-    \sa Path, PathCubic, PathLine
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsPathQuad
-    \ingroup group_utility
-    \brief The QmlGraphicsPathQuad class defines a quadratic Bezier curve with a control point.
-
-    \sa QmlGraphicsPath
-*/
-
-
-/*!
-    \qmlproperty real PathQuad::x
-    \qmlproperty real PathQuad::y
-
-    Defines the end point of the curve.
-*/
-
-/*!
-   \qmlproperty real PathQuad::controlX
-   \qmlproperty real PathQuad::controlY
-
-   Defines the position of the control point.
-*/
-
-/*!
-    the x position of the control point.
-*/
-qreal QmlGraphicsPathQuad::controlX() const
-{
-    return _controlX;
-}
-
-void QmlGraphicsPathQuad::setControlX(qreal x)
-{
-    if (_controlX != x) {
-        _controlX = x;
-        emit changed();
-    }
-}
-
-
-/*!
-    the y position of the control point.
-*/
-qreal QmlGraphicsPathQuad::controlY() const
-{
-    return _controlY;
-}
-
-void QmlGraphicsPathQuad::setControlY(qreal y)
-{
-    if (_controlY != y) {
-        _controlY = y;
-        emit changed();
-    }
-}
-
-void QmlGraphicsPathQuad::addToPath(QPainterPath &path)
-{
-    path.quadTo(controlX(), controlY(), x(), y());
-}
-
-/****************************************************************************/
-
-/*!
-   \qmlclass PathCubic QmlGraphicsPathCubic
-    \since 4.7
-   \brief The PathCubic defines a cubic Bezier curve with two control points.
-
-    The following QML produces the path shown below:
-    \table
-    \row
-    \o \image declarative-pathcubic.png
-    \o
-    \qml
-    Path {
-        startX: 20; startY: 0
-        PathCubic {
-            x: 180; y: 0; control1X: -10; control1Y: 90
-                          control2X: 210; control2Y: 90
-        }
-    }
-    \endqml
-    \endtable
-
-    \sa Path, PathQuad, PathLine
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsPathCubic
-    \ingroup group_utility
-    \brief The QmlGraphicsPathCubic class defines a cubic Bezier curve with two control points.
-
-    \sa QmlGraphicsPath
-*/
-
-/*!
-    \qmlproperty real PathCubic::x
-    \qmlproperty real PathCubic::y
-
-    Defines the end point of the curve.
-*/
-
-/*!
-   \qmlproperty real PathCubic::control1X
-   \qmlproperty real PathCubic::control1Y
-
-    Defines the position of the first control point.
-*/
-qreal QmlGraphicsPathCubic::control1X() const
-{
-    return _control1X;
-}
-
-void QmlGraphicsPathCubic::setControl1X(qreal x)
-{
-    if (_control1X != x) {
-        _control1X = x;
-        emit changed();
-    }
-}
-
-qreal QmlGraphicsPathCubic::control1Y() const
-{
-    return _control1Y;
-}
-
-void QmlGraphicsPathCubic::setControl1Y(qreal y)
-{
-    if (_control1Y != y) {
-        _control1Y = y;
-        emit changed();
-    }
-}
-
-/*!
-   \qmlproperty real PathCubic::control2X
-   \qmlproperty real PathCubic::control2Y
-
-    Defines the position of the second control point.
-*/
-qreal QmlGraphicsPathCubic::control2X() const
-{
-    return _control2X;
-}
-
-void QmlGraphicsPathCubic::setControl2X(qreal x)
-{
-    if (_control2X != x) {
-        _control2X = x;
-        emit changed();
-    }
-}
-
-qreal QmlGraphicsPathCubic::control2Y() const
-{
-    return _control2Y;
-}
-
-void QmlGraphicsPathCubic::setControl2Y(qreal y)
-{
-    if (_control2Y != y) {
-        _control2Y = y;
-        emit changed();
-    }
-}
-
-void QmlGraphicsPathCubic::addToPath(QPainterPath &path)
-{
-    path.cubicTo(control1X(), control1Y(), control2X(), control2Y(), x(), y());
-}
-
-/****************************************************************************/
-
-/*!
-    \qmlclass PathPercent QmlGraphicsPathPercent
-    \since 4.7
-    \brief The PathPercent manipulates the way a path is interpreted.
-
-    The examples below show the normal distrubution of items along a path
-    compared to a distribution which places 50% of the items along the
-    PathLine section of the path.
-    \table
-    \row
-    \o \image declarative-nopercent.png
-    \o
-    \qml
-    Path {
-        startX: 20; startY: 0
-        PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
-        PathLine { x: 150; y: 80 }
-        PathQuad { x: 180; y: 0; controlX: 200; controlY: 80 }
-    }
-    \endqml
-    \row
-    \o \image declarative-percent.png
-    \o
-    \qml
-    Path {
-        startX: 20; startY: 0
-        PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
-        PathPercent { value: 0.25 }
-        PathLine { x: 150; y: 80 }
-        PathPercent { value: 0.75 }
-        PathQuad { x: 180; y: 0; controlX: 200; controlY: 80 }
-        PathPercent { value: 1 }
-    }
-    \endqml
-    \endtable
-
-    \sa Path
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsPathPercent
-    \ingroup group_utility
-    \brief The QmlGraphicsPathPercent class manipulates the way a path is interpreted.
-
-    QmlGraphicsPathPercent allows you to bunch up items (or spread out items) along various
-    segments of a QmlGraphicsPathView's path.
-
-    \sa QmlGraphicsPath
-
-*/
-
-qreal QmlGraphicsPathPercent::value() const
-{
-    return _value;
-}
-
-void QmlGraphicsPathPercent::setValue(qreal value)
-{
-    _value = value;
-}
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p.h
deleted file mode 100644
index 7ba5bbc..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspath_p.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSPATH_H
-#define QMLGRAPHICSPATH_H
-
-#include "qmlgraphicsitem.h"
-
-#include <qml.h>
-
-#include <QtCore/QObject>
-#include <QtGui/QPainterPath>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-class Q_DECLARATIVE_EXPORT QmlGraphicsPathElement : public QObject
-{
-    Q_OBJECT
-public:
-    QmlGraphicsPathElement(QObject *parent=0) : QObject(parent) {}
-Q_SIGNALS:
-    void changed();
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsPathAttribute : public QmlGraphicsPathElement
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY changed)
-public:
-    QmlGraphicsPathAttribute(QObject *parent=0) : QmlGraphicsPathElement(parent), _value(0) {}
-
-
-    QString name() const;
-    void setName(const QString &name);
-
-    qreal value() const;
-    void setValue(qreal value);
-
-private:
-    QString _name;
-    qreal _value;
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsCurve : public QmlGraphicsPathElement
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal x READ x WRITE setX NOTIFY changed)
-    Q_PROPERTY(qreal y READ y WRITE setY NOTIFY changed)
-public:
-    QmlGraphicsCurve(QObject *parent=0) : QmlGraphicsPathElement(parent), _x(0), _y(0) {}
-
-    qreal x() const;
-    void setX(qreal x);
-
-    qreal y() const;
-    void setY(qreal y);
-
-    virtual void addToPath(QPainterPath &) {}
-
-private:
-    qreal _x;
-    qreal _y;
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsPathLine : public QmlGraphicsCurve
-{
-    Q_OBJECT
-public:
-    QmlGraphicsPathLine(QObject *parent=0) : QmlGraphicsCurve(parent) {}
-
-    void addToPath(QPainterPath &path);
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsPathQuad : public QmlGraphicsCurve
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal controlX READ controlX WRITE setControlX NOTIFY changed)
-    Q_PROPERTY(qreal controlY READ controlY WRITE setControlY NOTIFY changed)
-public:
-    QmlGraphicsPathQuad(QObject *parent=0) : QmlGraphicsCurve(parent), _controlX(0), _controlY(0) {}
-
-    qreal controlX() const;
-    void setControlX(qreal x);
-
-    qreal controlY() const;
-    void setControlY(qreal y);
-
-    void addToPath(QPainterPath &path);
-
-private:
-    qreal _controlX;
-    qreal _controlY;
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsPathCubic : public QmlGraphicsCurve
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal control1X READ control1X WRITE setControl1X NOTIFY changed)
-    Q_PROPERTY(qreal control1Y READ control1Y WRITE setControl1Y NOTIFY changed)
-    Q_PROPERTY(qreal control2X READ control2X WRITE setControl2X NOTIFY changed)
-    Q_PROPERTY(qreal control2Y READ control2Y WRITE setControl2Y NOTIFY changed)
-public:
-    QmlGraphicsPathCubic(QObject *parent=0) : QmlGraphicsCurve(parent), _control1X(0), _control1Y(0), _control2X(0), _control2Y(0) {}
-
-    qreal control1X() const;
-    void setControl1X(qreal x);
-
-    qreal control1Y() const;
-    void setControl1Y(qreal y);
-
-    qreal control2X() const;
-    void setControl2X(qreal x);
-
-    qreal control2Y() const;
-    void setControl2Y(qreal y);
-
-    void addToPath(QPainterPath &path);
-
-private:
-    int _control1X;
-    int _control1Y;
-    int _control2X;
-    int _control2Y;
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsPathPercent : public QmlGraphicsPathElement
-{
-    Q_OBJECT
-    Q_PROPERTY(qreal value READ value WRITE setValue)
-public:
-    QmlGraphicsPathPercent(QObject *parent=0) : QmlGraphicsPathElement(parent) {}
-
-    qreal value() const;
-    void setValue(qreal value);
-
-private:
-    qreal _value;
-};
-
-class QmlGraphicsPathPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsPath : public QObject, public QmlParserStatus
-{
-    Q_OBJECT
-
-    Q_INTERFACES(QmlParserStatus)
-    Q_PROPERTY(QmlListProperty<QmlGraphicsPathElement> pathElements READ pathElements)
-    Q_PROPERTY(qreal startX READ startX WRITE setStartX)
-    Q_PROPERTY(qreal startY READ startY WRITE setStartY)
-    Q_PROPERTY(bool closed READ isClosed NOTIFY changed)
-    Q_CLASSINFO("DefaultProperty", "pathElements")
-    Q_INTERFACES(QmlParserStatus)
-public:
-    QmlGraphicsPath(QObject *parent=0);
-    ~QmlGraphicsPath();
-
-    QmlListProperty<QmlGraphicsPathElement> pathElements();
-
-    qreal startX() const;
-    void setStartX(qreal x);
-
-    qreal startY() const;
-    void setStartY(qreal y);
-
-    bool isClosed() const;
-
-    QPainterPath path() const;
-    QStringList attributes() const;
-    qreal attributeAt(const QString &, qreal) const;
-    QPointF pointAt(qreal) const;
-
-Q_SIGNALS:
-    void changed();
-
-protected:
-    virtual void componentComplete();
-
-private Q_SLOTS:
-    void processPath();
-
-private:
-    struct AttributePoint {
-        AttributePoint() : percent(0), scale(1), origpercent(0) {}
-        AttributePoint(const AttributePoint &other)
-            : percent(other.percent), scale(other.scale), origpercent(other.origpercent), values(other.values) {}
-        AttributePoint &operator=(const AttributePoint &other) {
-            percent = other.percent; scale = other.scale; origpercent = other.origpercent; values = other.values; return *this;
-        }
-        qreal percent;      //massaged percent along the painter path
-        qreal scale;
-        qreal origpercent;  //'real' percent along the painter path
-        QHash<QString, qreal> values;
-    };
-
-    void interpolate(int idx, const QString &name, qreal value);
-    void endpoint(const QString &name);
-    void createPointCache() const;
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsPath)
-    Q_DECLARE_PRIVATE(QmlGraphicsPath)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsPathElement)
-QML_DECLARE_TYPE(QmlGraphicsPathAttribute)
-QML_DECLARE_TYPE(QmlGraphicsCurve)
-QML_DECLARE_TYPE(QmlGraphicsPathLine)
-QML_DECLARE_TYPE(QmlGraphicsPathQuad)
-QML_DECLARE_TYPE(QmlGraphicsPathCubic)
-QML_DECLARE_TYPE(QmlGraphicsPathPercent)
-QML_DECLARE_TYPE(QmlGraphicsPath)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSPATH_H
diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p_p.h
deleted file mode 100644
index acff7c8..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspath_p_p.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSPATH_P_H
-#define QMLGRAPHICSPATH_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicspath_p.h"
-
-#include <qml.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-class QmlGraphicsPathPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsPath)
-
-public:
-    QmlGraphicsPathPrivate() : startX(0), startY(0), closed(false) { }
-
-    QPainterPath _path;
-    QList<QmlGraphicsPathElement*> _pathElements;
-    mutable QVector<QPointF> _pointCache;
-    QList<QmlGraphicsPath::AttributePoint> _attributePoints;
-    QStringList _attributes;
-    int startX;
-    int startY;
-    bool closed;
-};
-
-QT_END_NAMESPACE
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
deleted file mode 100644
index 9a2c24d..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp
+++ /dev/null
@@ -1,979 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicspathview_p.h"
-#include "qmlgraphicspathview_p_p.h"
-
-#include <qmlstate_p.h>
-#include <qmlopenmetaobject_p.h>
-
-#include <QDebug>
-#include <QEvent>
-#include <qlistmodelinterface_p.h>
-#include <QGraphicsSceneEvent>
-
-#include <math.h>
-
-QT_BEGIN_NAMESPACE
-
-inline qreal qmlMod(qreal x, qreal y)
-{
-#ifdef QT_USE_MATH_H_FLOATS
-    if(sizeof(qreal) == sizeof(float))
-        return fmodf(float(x), float(y));
-    else
-#endif
-        return fmod(x, y);
-}
-
-
-class QmlGraphicsPathViewAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(bool onPath READ isOnPath NOTIFY onPathChanged)
-public:
-    QmlGraphicsPathViewAttached(QObject *parent)
-    : QObject(parent), mo(new QmlOpenMetaObject(this)), onPath(false)
-    {
-    }
-
-    ~QmlGraphicsPathViewAttached()
-    {
-        QmlGraphicsPathView::attachedProperties.remove(parent());
-    }
-
-    QVariant value(const QByteArray &name) const
-    {
-        return mo->value(name);
-    }
-    void setValue(const QByteArray &name, const QVariant &val)
-    {
-        mo->setValue(name, val);
-    }
-
-    bool isOnPath() const { return onPath; }
-    void setOnPath(bool on) {
-        if (on != onPath) {
-            onPath = on;
-            emit onPathChanged();
-        }
-    }
-
-Q_SIGNALS:
-    void onPathChanged();
-
-private:
-    QmlOpenMetaObject *mo;
-    bool onPath;
-};
-
-
-QmlGraphicsItem *QmlGraphicsPathViewPrivate::getItem(int modelIndex)
-{
-    Q_Q(QmlGraphicsPathView);
-    requestedIndex = modelIndex;
-    QmlGraphicsItem *item = model->item(modelIndex);
-    if (item) {
-        if (QObject *obj = QmlGraphicsPathView::qmlAttachedProperties(item))
-            static_cast<QmlGraphicsPathViewAttached *>(obj)->setOnPath(true);
-        item->setParentItem(q);
-    }
-    requestedIndex = -1;
-    return item;
-}
-
-void QmlGraphicsPathViewPrivate::releaseItem(QmlGraphicsItem *item)
-{
-    if (!item || !model)
-        return;
-    if (QObject *obj = QmlGraphicsPathView::qmlAttachedProperties(item))
-        static_cast<QmlGraphicsPathViewAttached *>(obj)->setOnPath(false);
-    if (model->release(item) == 0) {
-        if (QObject *obj = QmlGraphicsPathView::qmlAttachedProperties(item))
-            static_cast<QmlGraphicsPathViewAttached *>(obj)->setOnPath(false);
-    }
-}
-
-/*!
-    \qmlclass PathView QmlGraphicsPathView
-    \since 4.7
-    \brief The PathView element lays out model-provided items on a path.
-    \inherits Item
-
-    The model is typically provided by a QAbstractListModel "C++ model object", but can also be created directly in QML.
-
-    The items are laid out along a path defined by a \l Path and may be flicked to scroll.
-
-    \snippet doc/src/snippets/declarative/pathview/pathview.qml 0
-
-    \image pathview.gif
-
-    \sa Path
-*/
-
-QmlGraphicsPathView::QmlGraphicsPathView(QmlGraphicsItem *parent)
-  : QmlGraphicsItem(*(new QmlGraphicsPathViewPrivate), parent)
-{
-    Q_D(QmlGraphicsPathView);
-    d->init();
-}
-
-QmlGraphicsPathView::~QmlGraphicsPathView()
-{
-    Q_D(QmlGraphicsPathView);
-    if (d->ownModel)
-        delete d->model;
-}
-
-/*!
-    \qmlattachedproperty bool PathView::onPath
-    This attached property holds whether the item is currently on the path.
-
-    If a pathItemCount has been set, it is possible that some items may
-    be instantiated, but not considered to be currently on the path.
-    Usually, these items would be set invisible, for example:
-
-    \code
-    Component {
-        Rectangle {
-            visible: PathView.onPath
-            ...
-        }
-    }
-    \endcode
-
-    It is attached to each instance of the delegate.
-*/
-
-/*!
-    \qmlproperty model PathView::model
-    This property holds the model providing data for the view.
-
-    The model provides a set of data that is used to create the items for the view.
-    For large or dynamic datasets the model is usually provided by a C++ model object.
-    Models can also be created directly in XML, using the ListModel element.
-
-    \sa {qmlmodels}{Data Models}
-*/
-QVariant QmlGraphicsPathView::model() const
-{
-    Q_D(const QmlGraphicsPathView);
-    return d->modelVariant;
-}
-
-void QmlGraphicsPathView::setModel(const QVariant &model)
-{
-    Q_D(QmlGraphicsPathView);
-    if (d->model) {
-        disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
-        disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
-        disconnect(d->model, SIGNAL(createdItem(int, QmlGraphicsItem*)), this, SLOT(createdItem(int,QmlGraphicsItem*)));
-        for (int i=0; i<d->items.count(); i++){
-            QmlGraphicsItem *p = d->items[i];
-            d->model->release(p);
-        }
-        d->items.clear();
-    }
-
-    d->modelVariant = model;
-    QObject *object = qvariant_cast<QObject*>(model);
-    QmlGraphicsVisualModel *vim = 0;
-    if (object && (vim = qobject_cast<QmlGraphicsVisualModel *>(object))) {
-        if (d->ownModel) {
-            delete d->model;
-            d->ownModel = false;
-        }
-        d->model = vim;
-    } else {
-        if (!d->ownModel) {
-            d->model = new QmlGraphicsVisualDataModel(qmlContext(this));
-            d->ownModel = true;
-        }
-        if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model))
-            dataModel->setModel(model);
-    }
-    if (d->model) {
-        connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
-        connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
-        connect(d->model, SIGNAL(createdItem(int, QmlGraphicsItem*)), this, SLOT(createdItem(int,QmlGraphicsItem*)));
-    }
-    d->firstIndex = 0;
-    d->pathOffset = 0;
-    d->regenerate();
-    d->fixOffset();
-}
-
-/*!
-    \qmlproperty int PathView::count
-    This property holds the number of items in the model.
-*/
-int QmlGraphicsPathView::count() const
-{
-    Q_D(const QmlGraphicsPathView);
-    return d->model ? d->model->count() : 0;
-}
-
-/*!
-    \qmlproperty Path PathView::path
-    \default
-    This property holds the path used to lay out the items.
-    For more information see the \l Path documentation.
-*/
-QmlGraphicsPath *QmlGraphicsPathView::path() const
-{
-    Q_D(const QmlGraphicsPathView);
-    return d->path;
-}
-
-void QmlGraphicsPathView::setPath(QmlGraphicsPath *path)
-{
-    Q_D(QmlGraphicsPathView);
-    d->path = path;
-    connect(d->path, SIGNAL(changed()), this, SLOT(refill()));
-    d->regenerate();
-}
-
-/*!
-    \qmlproperty int PathView::currentIndex
-    This property holds the index of the current item.
-*/
-int QmlGraphicsPathView::currentIndex() const
-{
-    Q_D(const QmlGraphicsPathView);
-    return d->currentIndex;
-}
-
-void QmlGraphicsPathView::setCurrentIndex(int idx)
-{
-    Q_D(QmlGraphicsPathView);
-    if (d->model && d->model->count())
-        idx = qAbs(idx % d->model->count());
-    if (d->model && idx != d->currentIndex) {
-        d->currentIndex = idx;
-        if (d->model->count()) {
-            d->snapToCurrent();
-            int itemIndex = (idx - d->firstIndex + d->model->count()) % d->model->count();
-            if (itemIndex < d->items.count())
-                d->items.at(itemIndex)->setFocus(true);
-        }
-        emit currentIndexChanged();
-    }
-}
-
-/*!
-    \qmlproperty real PathView::offset
-
-    The offset specifies how far along the path the items are from their initial positions.
-*/
-qreal QmlGraphicsPathView::offset() const
-{
-    Q_D(const QmlGraphicsPathView);
-    return d->_offset;
-}
-
-void QmlGraphicsPathView::setOffset(qreal offset)
-{
-    Q_D(QmlGraphicsPathView);
-    d->setOffset(offset);
-    d->updateCurrent();
-}
-
-void QmlGraphicsPathViewPrivate::setOffset(qreal o)
-{
-    Q_Q(QmlGraphicsPathView);
-    if (_offset != o) {
-        _offset = qmlMod(o, qreal(100.0));
-        if (_offset < 0)
-            _offset = 100.0 + _offset;
-        q->refill();
-    }
-}
-
-/*!
-    \qmlproperty real PathView::snapPosition
-
-    This property determines the position (0-100) the nearest item will snap to.
-*/
-qreal QmlGraphicsPathView::snapPosition() const
-{
-    Q_D(const QmlGraphicsPathView);
-    return d->snapPos;
-}
-
-void QmlGraphicsPathView::setSnapPosition(qreal pos)
-{
-    Q_D(QmlGraphicsPathView);
-    d->snapPos = pos/100;
-    d->fixOffset();
-}
-
-/*!
-    \qmlproperty real PathView::dragMargin
-    This property holds the maximum distance from the path that initiate mouse dragging.
-
-    By default the path can only be dragged by clicking on an item.  If
-    dragMargin is greater than zero, a drag can be initiated by clicking
-    within dragMargin pixels of the path.
-*/
-qreal QmlGraphicsPathView::dragMargin() const
-{
-    Q_D(const QmlGraphicsPathView);
-    return d->dragMargin;
-}
-
-void QmlGraphicsPathView::setDragMargin(qreal dragMargin)
-{
-    Q_D(QmlGraphicsPathView);
-    d->dragMargin = dragMargin;
-}
-
-/*!
-    \qmlproperty component PathView::delegate
-
-    The delegate provides a template defining each item instantiated by the view.
-    The index is exposed as an accessible \c index property.  Properties of the
-    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
-
-    Note that the PathView will layout the items based on the size of the root
-    item in the delegate.
-
-    Here is an example delegate:
-    \snippet doc/src/snippets/declarative/pathview/pathview.qml 1
-*/
-QmlComponent *QmlGraphicsPathView::delegate() const
-{
-    Q_D(const QmlGraphicsPathView);
-     if (d->model) {
-        if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model))
-            return dataModel->delegate();
-    }
-
-    return 0;
-}
-
-void QmlGraphicsPathView::setDelegate(QmlComponent *c)
-{
-    Q_D(QmlGraphicsPathView);
-    if (!d->ownModel) {
-        d->model = new QmlGraphicsVisualDataModel(qmlContext(this));
-        d->ownModel = true;
-    }
-    if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model)) {
-        dataModel->setDelegate(c);
-        d->regenerate();
-    }
-}
-
-/*!
-  \qmlproperty int PathView::pathItemCount
-  This property holds the number of items visible on the path at any one time
-*/
-int QmlGraphicsPathView::pathItemCount() const
-{
-    Q_D(const QmlGraphicsPathView);
-    return d->pathItems;
-}
-
-void QmlGraphicsPathView::setPathItemCount(int i)
-{
-    Q_D(QmlGraphicsPathView);
-    if (i == d->pathItems)
-        return;
-    d->pathItems = i;
-    d->regenerate();
-}
-
-QPointF QmlGraphicsPathViewPrivate::pointNear(const QPointF &point, qreal *nearPercent) const
-{
-    //XXX maybe do recursively at increasing resolution.
-    qreal mindist = 1e10; // big number
-    QPointF nearPoint = path->pointAt(0);
-    qreal nearPc = 0;
-    for (qreal i=1; i < 1000; i++) {
-        QPointF pt = path->pointAt(i/1000.0);
-        QPointF diff = pt - point;
-        qreal dist = diff.x()*diff.x() + diff.y()*diff.y();
-        if (dist < mindist) {
-            nearPoint = pt;
-            nearPc = i;
-            mindist = dist;
-        }
-    }
-
-    if (nearPercent)
-        *nearPercent = nearPc / 10.0;
-
-    return nearPoint;
-}
-
-
-void QmlGraphicsPathView::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsPathView);
-    if (!d->items.count())
-        return;
-    QPointF scenePoint = mapToScene(event->pos());
-    int idx = 0;
-    for (; idx < d->items.count(); ++idx) {
-        QRectF rect = d->items.at(idx)->boundingRect();
-        rect = d->items.at(idx)->mapToScene(rect).boundingRect();
-        if (rect.contains(scenePoint))
-            break;
-    }
-    if (idx == d->items.count() && d->dragMargin == 0.)  // didn't click on an item
-        return;
-
-    d->startPoint = d->pointNear(event->pos(), &d->startPc);
-    if (idx == d->items.count()) {
-        qreal distance = qAbs(event->pos().x() - d->startPoint.x()) + qAbs(event->pos().y() - d->startPoint.y());
-        if (distance > d->dragMargin)
-            return;
-    }
-
-    d->stealMouse = false;
-    d->lastElapsed = 0;
-    d->lastDist = 0;
-    QmlGraphicsItemPrivate::start(d->lastPosTime);
-    d->tl.clear();
-}
-
-void QmlGraphicsPathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsPathView);
-    if (d->lastPosTime.isNull())
-        return;
-
-    if (!d->stealMouse) {
-        QPointF delta = event->pos() - d->startPoint;
-        if (qAbs(delta.x()) > QApplication::startDragDistance() && qAbs(delta.y()) > QApplication::startDragDistance())
-            d->stealMouse = true;
-    }
-
-    if (d->stealMouse) {
-        d->moveReason = QmlGraphicsPathViewPrivate::Mouse;
-        qreal newPc;
-        d->pointNear(event->pos(), &newPc);
-        qreal diff = newPc - d->startPc;
-        if (diff) {
-            setOffset(d->_offset + diff);
-
-            if (diff > 50)
-                diff -= 100;
-            else if (diff < -50)
-                diff += 100;
-
-            d->lastElapsed = QmlGraphicsItemPrivate::restart(d->lastPosTime);
-            d->lastDist = diff;
-            d->startPc = newPc;
-        }
-    }
-}
-
-void QmlGraphicsPathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
-{
-    Q_D(QmlGraphicsPathView);
-    if (d->lastPosTime.isNull())
-        return;
-
-    qreal elapsed = qreal(d->lastElapsed + QmlGraphicsItemPrivate::elapsed(d->lastPosTime)) / 1000.;
-    qreal velocity = elapsed > 0. ? d->lastDist / elapsed : 0;
-    if (d->model && d->model->count() && qAbs(velocity) > 5) {
-        if (velocity > 100)
-            velocity = 100;
-        else if (velocity < -100)
-            velocity = -100;
-        qreal inc = qmlMod(d->_offset - d->snapPos, qreal(100.0 / d->model->count()));
-        qreal dist = qAbs(velocity/2 - qmlMod(velocity/2, qreal(100.0 / d->model->count()) - inc));
-        d->moveOffset.setValue(d->_offset);
-        d->tl.accel(d->moveOffset, velocity, 10, dist);
-        d->tl.callback(QmlTimeLineCallback(&d->moveOffset, d->fixOffsetCallback, d));
-    } else {
-        d->fixOffset();
-    }
-
-    d->lastPosTime = QTime();
-    d->stealMouse = false;
-    ungrabMouse();
-}
-
-bool QmlGraphicsPathView::sendMouseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsPathView);
-    QGraphicsSceneMouseEvent mouseEvent(event->type());
-    QRectF myRect = mapToScene(QRectF(0, 0, width(), height())).boundingRect();
-    QGraphicsScene *s = scene();
-    QmlGraphicsItem *grabber = s ? qobject_cast<QmlGraphicsItem*>(s->mouseGrabberItem()) : 0;
-    if ((d->stealMouse || myRect.contains(event->scenePos().toPoint())) && (!grabber || !grabber->keepMouseGrab())) {
-        mouseEvent.setAccepted(false);
-        for (int i = 0x1; i <= 0x10; i <<= 1) {
-            if (event->buttons() & i) {
-                Qt::MouseButton button = Qt::MouseButton(i);
-                mouseEvent.setButtonDownPos(button, mapFromScene(event->buttonDownPos(button)));
-            }
-        }
-        mouseEvent.setScenePos(event->scenePos());
-        mouseEvent.setLastScenePos(event->lastScenePos());
-        mouseEvent.setPos(mapFromScene(event->scenePos()));
-        mouseEvent.setLastPos(mapFromScene(event->lastScenePos()));
-
-        switch(mouseEvent.type()) {
-        case QEvent::GraphicsSceneMouseMove:
-            mouseMoveEvent(&mouseEvent);
-            break;
-        case QEvent::GraphicsSceneMousePress:
-            mousePressEvent(&mouseEvent);
-            break;
-        case QEvent::GraphicsSceneMouseRelease:
-            mouseReleaseEvent(&mouseEvent);
-            break;
-        default:
-            break;
-        }
-        grabber = qobject_cast<QmlGraphicsItem*>(s->mouseGrabberItem());
-        if (grabber && d->stealMouse && !grabber->keepMouseGrab() && grabber != this)
-            grabMouse();
-
-        return d->stealMouse;
-    } else if (!d->lastPosTime.isNull()) {
-        d->lastPosTime = QTime();
-    }
-    return false;
-}
-
-bool QmlGraphicsPathView::sceneEventFilter(QGraphicsItem *i, QEvent *e)
-{
-    if (!isVisible())
-        return QmlGraphicsItem::sceneEventFilter(i, e);
-
-    switch (e->type()) {
-    case QEvent::GraphicsSceneMousePress:
-    case QEvent::GraphicsSceneMouseMove:
-    case QEvent::GraphicsSceneMouseRelease:
-        {
-            bool ret = sendMouseEvent(static_cast<QGraphicsSceneMouseEvent *>(e));
-            if (e->type() == QEvent::GraphicsSceneMouseRelease)
-                return ret;
-            break;
-        }
-    default:
-        break;
-    }
-
-    return QmlGraphicsItem::sceneEventFilter(i, e);
-}
-
-void QmlGraphicsPathView::componentComplete()
-{
-    Q_D(QmlGraphicsPathView);
-    QmlGraphicsItem::componentComplete();
-    d->regenerate();
-
-    // move to correct offset
-    if (d->items.count()) {
-        int itemIndex = (d->currentIndex - d->firstIndex + d->model->count()) % d->model->count();
-
-        itemIndex += d->pathOffset;
-        itemIndex %= d->items.count();
-        qreal targetOffset = qmlMod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
-
-        if (targetOffset < 0)
-            targetOffset = 100.0 + targetOffset;
-        if (targetOffset != d->_offset) {
-            d->moveOffset.setValue(targetOffset);
-        }
-    }
-}
-
-void QmlGraphicsPathViewPrivate::regenerate()
-{
-    Q_Q(QmlGraphicsPathView);
-    if (!q->isComponentComplete())
-        return;
-
-    for (int i=0; i<items.count(); i++){
-        QmlGraphicsItem *p = items[i];
-        releaseItem(p);
-    }
-    items.clear();
-
-    if (!isValid())
-        return;
-
-    if (firstIndex >= model->count())
-        firstIndex = model->count()-1;
-    if (pathOffset >= model->count())
-        pathOffset = model->count()-1;
-
-    int numItems = pathItems >= 0 ? pathItems : model->count();
-    for (int i=0; i < numItems && i < model->count(); ++i){
-        int index = (i + firstIndex) % model->count();
-        QmlGraphicsItem *item = getItem(index);
-        if (!item) {
-            qWarning() << "PathView: Cannot create item, index" << (i + firstIndex) % model->count();
-            return;
-        }
-        items.append(item);
-        item->setZValue(i);
-        if (currentIndex == index)
-            item->setFocus(true);
-    }
-    q->refill();
-}
-
-void QmlGraphicsPathViewPrivate::updateItem(QmlGraphicsItem *item, qreal percent)
-{
-    if (QObject *obj = QmlGraphicsPathView::qmlAttachedProperties(item)) {
-        foreach(const QString &attr, path->attributes())
-            static_cast<QmlGraphicsPathViewAttached *>(obj)->setValue(attr.toUtf8(), path->attributeAt(attr, percent));
-    }
-    QPointF pf = path->pointAt(percent);
-    item->setX(pf.x() - item->width()*item->scale()/2);
-    item->setY(pf.y() - item->height()*item->scale()/2);
-}
-
-void QmlGraphicsPathView::refill()
-{
-    Q_D(QmlGraphicsPathView);
-    if (!d->isValid() || !isComponentComplete())
-        return;
-
-    QList<qreal> positions;
-    for (int i=0; i<d->items.count(); i++){
-        qreal percent = i * (100. / d->items.count());
-        percent = percent + d->_offset;
-        percent = qmlMod(percent, qreal(100.0));
-        positions << qAbs(percent/100.0);
-    }
-
-    if (d->pathItems==-1) {
-        for (int i=0; i<positions.count(); i++)
-            d->updateItem(d->items.at(i), positions[i]);
-        return;
-    }
-
-    QList<qreal> rotatedPositions;
-    for (int i=0; i<d->items.count(); i++)
-        rotatedPositions << positions[(i + d->pathOffset + d->items.count()) % d->items.count()];
-
-    int wrapIndex= -1;
-    for (int i=0; i<d->items.count()-1; i++) {
-        if (rotatedPositions[i] > rotatedPositions[i+1]){
-            wrapIndex = i;
-            break;
-        }
-    }
-    if (wrapIndex != -1 ){
-        //A wraparound has occured
-        if (wrapIndex < d->items.count()/2){
-            while(wrapIndex-- >= 0){
-                QmlGraphicsItem* p = d->items.takeFirst();
-                d->updateItem(p, 0.0);
-                d->releaseItem(p);
-                d->firstIndex++;
-                d->firstIndex %= d->model->count();
-                int index = (d->firstIndex + d->items.count())%d->model->count();
-                QmlGraphicsItem *item = d->getItem(index);
-                item->setZValue(wrapIndex);
-                if (d->currentIndex == index)
-                    item->setFocus(true);
-                d->items << item;
-                d->pathOffset++;
-                d->pathOffset=d->pathOffset % d->items.count();
-            }
-        } else {
-            while(wrapIndex++ < d->items.count()-1){
-                QmlGraphicsItem* p = d->items.takeLast();
-                d->updateItem(p, 1.0);
-                d->releaseItem(p);
-                d->firstIndex--;
-                if (d->firstIndex < 0)
-                    d->firstIndex = d->model->count() - 1;
-                QmlGraphicsItem *item = d->getItem(d->firstIndex);
-                item->setZValue(d->firstIndex);
-                if (d->currentIndex == d->firstIndex)
-                    item->setFocus(true);
-                d->items.prepend(item);
-                d->pathOffset--;
-                if (d->pathOffset < 0)
-                    d->pathOffset = d->items.count() - 1;
-            }
-        }
-        for (int i=0; i<d->items.count(); i++)
-            rotatedPositions[i] = positions[(i + d->pathOffset + d->items.count())
-                                    % d->items.count()];
-    }
-    for (int i=0; i<d->items.count(); i++)
-        d->updateItem(d->items.at(i), rotatedPositions[i]);
-}
-
-void QmlGraphicsPathView::itemsInserted(int modelIndex, int count)
-{
-    //XXX support animated insertion
-    Q_D(QmlGraphicsPathView);
-    if (!d->isValid() || !isComponentComplete())
-        return;
-    if (d->pathItems == -1) {
-        for (int i = 0; i < count; ++i) {
-            QmlGraphicsItem *item = d->getItem(modelIndex + i);
-            item->setZValue(modelIndex + i);
-            d->items.insert(modelIndex + i, item);
-        }
-        refill();
-    } else {
-        //XXX This is pretty heavy handed until we reference count items.
-        d->regenerate();
-    }
-
-    // make sure the current item is still at the snap position
-    int itemIndex = (d->currentIndex - d->firstIndex + d->model->count())%d->model->count();
-    itemIndex += d->pathOffset;
-    itemIndex %= d->items.count();
-    qreal targetOffset = qmlMod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
-
-    if (targetOffset < 0)
-        targetOffset = 100.0 + targetOffset;
-    if (targetOffset != d->_offset)
-        d->moveOffset.setValue(targetOffset);
-}
-
-void QmlGraphicsPathView::itemsRemoved(int modelIndex, int count)
-{
-    //XXX support animated removal
-    Q_D(QmlGraphicsPathView);
-    if (!d->isValid() || !isComponentComplete())
-        return;
-    if (d->pathItems == -1) {
-        for (int i = 0; i < count; ++i) {
-            QmlGraphicsItem* p = d->items.takeAt(modelIndex);
-            d->model->release(p);
-        }
-        d->snapToCurrent();
-        refill();
-    } else {
-        d->regenerate();
-    }
-
-    if (d->model->count() == 0) {
-        d->currentIndex = -1;
-        d->moveOffset.setValue(0);
-        return;
-    }
-
-    // make sure the current item is still at the snap position
-    if (d->currentIndex >= d->model->count())
-        d->currentIndex = d->model->count() - 1;
-    int itemIndex = (d->currentIndex - d->firstIndex + d->model->count())%d->model->count();
-    itemIndex += d->pathOffset;
-    itemIndex %= d->items.count();
-    qreal targetOffset = qmlMod(100 + (d->snapPos*100) - 100.0 * itemIndex / d->items.count(), qreal(100.0));
-
-    if (targetOffset < 0)
-        targetOffset = 100.0 + targetOffset;
-    if (targetOffset != d->_offset)
-        d->moveOffset.setValue(targetOffset);
-}
-
-void QmlGraphicsPathView::createdItem(int index, QmlGraphicsItem *item)
-{
-    Q_D(QmlGraphicsPathView);
-    if (d->requestedIndex != index) {
-        item->setParentItem(this);
-        d->updateItem(item, index < d->firstIndex ? 0.0 : 1.0);
-    }
-}
-
-void QmlGraphicsPathView::destroyingItem(QmlGraphicsItem *item)
-{
-    Q_UNUSED(item);
-}
-
-void QmlGraphicsPathView::ticked()
-{
-    Q_D(QmlGraphicsPathView);
-    d->updateCurrent();
-}
-
-// find the item closest to the snap position
-int QmlGraphicsPathViewPrivate::calcCurrentIndex()
-{
-    int current = -1;
-    if (model && items.count()) {
-        _offset = qmlMod(_offset, qreal(100.0));
-        if (_offset < 0)
-            _offset += 100.0;
-
-        if (pathItems == -1) {
-            qreal delta = qmlMod(_offset - snapPos, qreal(100.0));
-            if (delta < 0)
-                delta = 100.0 + delta;
-            int ii = model->count() - qRound(delta * model->count() / 100);
-            if (ii < 0)
-                ii = 0;
-            current = ii;
-        } else {
-            qreal bestDiff=1e9;
-            int bestI=-1;
-            for (int i=0; i<items.count(); i++){
-                qreal percent = i * (100. / items.count());
-                percent = percent + _offset;
-                percent = qmlMod(percent, qreal(100.0));
-                qreal diff = qAbs(snapPos - (percent/100.0));
-                if (diff < bestDiff){
-                    bestDiff = diff;
-                    bestI = i;
-                }
-            }
-            int modelIndex = (bestI - pathOffset + items.count())%items.count();
-            modelIndex += firstIndex;
-            current = modelIndex;
-        }
-        current = qAbs(current % model->count());
-    }
-
-    return current;
-}
-
-void QmlGraphicsPathViewPrivate::updateCurrent()
-{
-    Q_Q(QmlGraphicsPathView);
-    if (moveReason != Mouse)
-        return;
-    int idx = calcCurrentIndex();
-    if (model && idx != currentIndex) {
-        currentIndex = idx;
-        int itemIndex = (idx - firstIndex + model->count()) % model->count();
-        if (itemIndex < items.count())
-            items.at(itemIndex)->setFocus(true);
-        emit q->currentIndexChanged();
-    }
-}
-
-void QmlGraphicsPathViewPrivate::fixOffsetCallback(void *d)
-{
-    ((QmlGraphicsPathViewPrivate *)d)->fixOffset();
-}
-
-void QmlGraphicsPathViewPrivate::fixOffset()
-{
-    Q_Q(QmlGraphicsPathView);
-    if (model && items.count()) {
-        int curr = calcCurrentIndex();
-        if (curr != currentIndex)
-            q->setCurrentIndex(curr);
-        else
-            snapToCurrent();
-    }
-}
-
-void QmlGraphicsPathViewPrivate::snapToCurrent()
-{
-    if (!model || model->count() <= 0)
-        return;
-
-    int itemIndex = (currentIndex - firstIndex + model->count()) % model->count();
-
-    //Rounds is the number of times round to make the current item visible
-    int rounds = itemIndex / items.count();
-    int otherWayRounds = (model->count() - (itemIndex)) / items.count();
-    if (otherWayRounds < rounds)
-        rounds = -otherWayRounds;
-
-    itemIndex += pathOffset;
-    if(model->count() % items.count() && itemIndex - model->count() + items.count() > 0){
-        //When model.count() is not a multiple of pathItemCount we need to manually
-        //fix the index so that going backwards one step works correctly.
-        itemIndex = itemIndex - model->count() + items.count();
-    }
-    itemIndex %= items.count();
-    qreal targetOffset = qmlMod(100 + (snapPos*100) - 100.0 * itemIndex / items.count(), qreal(100.0));
-
-    if (targetOffset < 0)
-        targetOffset = 100.0 + targetOffset;
-    if (targetOffset == _offset && rounds == 0)
-        return;
-
-    moveReason = Other;
-    tl.clear();
-    moveOffset.setValue(_offset);
-
-    if (rounds!=0){
-        //Compensate if the targetOffset would bring the target in from off the screen
-        qreal distance = targetOffset - _offset;
-        if (distance <= -50)
-            rounds--;
-        if (distance > 50)
-            rounds++;
-        tl.move(moveOffset, targetOffset + 100.0*(-rounds), QEasingCurve(QEasingCurve::InOutQuad),
-                int(100*items.count()*qMax((qreal)(2.0/items.count()),(qreal)qAbs(rounds))));
-        tl.callback(QmlTimeLineCallback(&moveOffset, fixOffsetCallback, this));
-        return;
-    }
-
-    if (targetOffset - _offset > 50.0) {
-        qreal distance = 100 - targetOffset + _offset;
-        tl.move(moveOffset, 0.0, QEasingCurve(QEasingCurve::OutQuad), int(200 * _offset / distance));
-        tl.set(moveOffset, 100.0);
-        tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::InQuad), int(200 * (100-targetOffset) / distance));
-    } else if (targetOffset - _offset <= -50.0) {
-        qreal distance = 100 - _offset + targetOffset;
-        tl.move(moveOffset, 100.0, QEasingCurve(QEasingCurve::OutQuad), int(200 * (100-_offset) / distance));
-        tl.set(moveOffset, 0.0);
-        tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::InQuad), int(200 * targetOffset / distance));
-    } else {
-        tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::InOutQuad), 200);
-    }
-}
-
-QHash<QObject*, QObject*> QmlGraphicsPathView::attachedProperties;
-QObject *QmlGraphicsPathView::qmlAttachedProperties(QObject *obj)
-{
-    QObject *rv = attachedProperties.value(obj);
-    if (!rv) {
-        rv = new QmlGraphicsPathViewAttached(obj);
-        attachedProperties.insert(obj, rv);
-    }
-    return rv;
-}
-
-QT_END_NAMESPACE
-
-#include <qmlgraphicspathview.moc>
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
deleted file mode 100644
index 8273ccc..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSPATHVIEW_H
-#define QMLGRAPHICSPATHVIEW_H
-
-#include "qmlgraphicsitem.h"
-#include "qmlgraphicspath_p.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsPathViewPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsPathView : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QVariant model READ model WRITE setModel)
-    Q_PROPERTY(QmlGraphicsPath *path READ path WRITE setPath)
-    Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
-    Q_PROPERTY(qreal offset READ offset WRITE setOffset NOTIFY offsetChanged)
-    Q_PROPERTY(qreal snapPosition READ snapPosition WRITE setSnapPosition)
-    Q_PROPERTY(qreal dragMargin READ dragMargin WRITE setDragMargin)
-    Q_PROPERTY(int count READ count)
-    Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate)
-    Q_PROPERTY(int pathItemCount READ pathItemCount WRITE setPathItemCount)
-
-public:
-    QmlGraphicsPathView(QmlGraphicsItem *parent=0);
-    virtual ~QmlGraphicsPathView();
-
-    QVariant model() const;
-    void setModel(const QVariant &);
-
-    QmlGraphicsPath *path() const;
-    void setPath(QmlGraphicsPath *);
-
-    int currentIndex() const;
-    void setCurrentIndex(int idx);
-
-    qreal offset() const;
-    void setOffset(qreal offset);
-
-    qreal snapPosition() const;
-    void setSnapPosition(qreal pos);
-
-    qreal dragMargin() const;
-    void setDragMargin(qreal margin);
-
-    int count() const;
-
-    QmlComponent *delegate() const;
-    void setDelegate(QmlComponent *);
-
-    int pathItemCount() const;
-    void setPathItemCount(int);
-
-    static QObject *qmlAttachedProperties(QObject *);
-
-Q_SIGNALS:
-    void currentIndexChanged();
-    void offsetChanged();
-
-protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
-    bool sendMouseEvent(QGraphicsSceneMouseEvent *event);
-    bool sceneEventFilter(QGraphicsItem *, QEvent *);
-    void componentComplete();
-
-private Q_SLOTS:
-    void refill();
-    void ticked();
-    void itemsInserted(int index, int count);
-    void itemsRemoved(int index, int count);
-    void createdItem(int index, QmlGraphicsItem *item);
-    void destroyingItem(QmlGraphicsItem *item);
-
-private:
-    friend class QmlGraphicsPathViewAttached;
-    static QHash<QObject*, QObject*> attachedProperties;
-    Q_DISABLE_COPY(QmlGraphicsPathView)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsPathView)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsPathView)
-QML_DECLARE_TYPEINFO(QmlGraphicsPathView, QML_HAS_ATTACHED_PROPERTIES)
-QT_END_HEADER
-
-#endif // QMLGRAPHICSPATHVIEW_H
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
deleted file mode 100644
index c635833..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSPATHVIEW_P_H
-#define QMLGRAPHICSPATHVIEW_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicspathview_p.h"
-
-#include "qmlgraphicsitem_p.h"
-#include "qmlgraphicsvisualitemmodel_p.h"
-
-#include <qml.h>
-#include <qmlanimation_p_p.h>
-
-#include <qdatetime.h>
-
-QT_BEGIN_NAMESPACE
-
-typedef struct PathViewItem{
-    int index;
-    QmlGraphicsItem* item;
-}PathViewItem;
-
-class QmlGraphicsPathViewPrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsPathView)
-
-public:
-    QmlGraphicsPathViewPrivate()
-      : path(0), currentIndex(0), startPc(0), lastDist(0)
-        , lastElapsed(0), stealMouse(false), ownModel(false), activeItem(0)
-        , snapPos(0), dragMargin(0), moveOffset(this, &QmlGraphicsPathViewPrivate::setOffset)
-        , firstIndex(0), pathItems(-1), pathOffset(0), requestedIndex(-1)
-        , moveReason(Other)
-    {
-    }
-
-    void init()
-    {
-        Q_Q(QmlGraphicsPathView);
-        _offset = 0;
-        q->setAcceptedMouseButtons(Qt::LeftButton);
-        q->setFlag(QGraphicsItem::ItemIsFocusScope);
-        q->setFiltersChildEvents(true);
-        q->connect(&tl, SIGNAL(updated()), q, SLOT(ticked()));
-    }
-
-    QmlGraphicsItem *getItem(int modelIndex);
-    void releaseItem(QmlGraphicsItem *item);
-
-    bool isValid() const {
-        return model && model->count() > 0 && model->isValid() && path;
-    }
-
-    int calcCurrentIndex();
-    void updateCurrent();
-    static void fixOffsetCallback(void*);
-    void fixOffset();
-    void setOffset(qreal offset);
-    void regenerate();
-    void updateItem(QmlGraphicsItem *, qreal);
-    void snapToCurrent();
-    QPointF pointNear(const QPointF &point, qreal *nearPercent=0) const;
-
-    QmlGraphicsPath *path;
-    int currentIndex;
-    qreal startPc;
-    QPointF startPoint;
-    qreal lastDist;
-    int lastElapsed;
-    qreal _offset;
-    bool stealMouse : 1;
-    bool ownModel : 1;
-    QTime lastPosTime;
-    QPointF lastPos;
-    QmlGraphicsItem *activeItem;
-    qreal snapPos;
-    qreal dragMargin;
-    QmlTimeLine tl;
-    QmlTimeLineValueProxy<QmlGraphicsPathViewPrivate> moveOffset;
-    int firstIndex;
-    int pathItems;
-    int pathOffset;
-    int requestedIndex;
-    QList<QmlGraphicsItem *> items;
-    QGuard<QmlGraphicsVisualModel> model;
-    QVariant modelVariant;
-    enum MovementReason { Other, Key, Mouse };
-    MovementReason moveReason;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
deleted file mode 100644
index fb71495..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
+++ /dev/null
@@ -1,891 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicspositioners_p.h"
-#include "qmlgraphicspositioners_p_p.h"
-
-#include <qml.h>
-#include <qmlstate_p.h>
-#include <qmlstategroup_p.h>
-#include <qmlstateoperations_p.h>
-#include <qfxperf_p_p.h>
-#include <QtCore/qmath.h>
-
-#include <QDebug>
-#include <QCoreApplication>
-
-QT_BEGIN_NAMESPACE
-
-static const QmlGraphicsItemPrivate::ChangeTypes watchedChanges
-    = QmlGraphicsItemPrivate::Geometry
-    | QmlGraphicsItemPrivate::SiblingOrder
-    | QmlGraphicsItemPrivate::Visibility
-    | QmlGraphicsItemPrivate::Opacity
-    | QmlGraphicsItemPrivate::Destroyed;
-
-void QmlGraphicsBasePositionerPrivate::watchChanges(QmlGraphicsItem *other)
-{
-    QmlGraphicsItemPrivate *otherPrivate = static_cast<QmlGraphicsItemPrivate*>(QGraphicsItemPrivate::get(other));
-    otherPrivate->addItemChangeListener(this, watchedChanges);
-}
-
-void QmlGraphicsBasePositionerPrivate::unwatchChanges(QmlGraphicsItem* other)
-{
-    QmlGraphicsItemPrivate *otherPrivate = static_cast<QmlGraphicsItemPrivate*>(QGraphicsItemPrivate::get(other));
-    otherPrivate->removeItemChangeListener(this, watchedChanges);
-}
-
-/*!
-    \internal
-    \class QmlGraphicsBasePositioner
-    \ingroup group_layouts
-    \brief The QmlGraphicsBasePositioner class provides a base for QmlGraphics layouts.
-
-    To create a QmlGraphics Positioner, simply subclass QmlGraphicsBasePositioner and implement
-    doLayout(), which is automatically called when the layout might need
-    updating. In doLayout() use the setX and setY functions from QmlBasePositioner, and the
-    base class will apply the positions along with the appropriate transitions. The items to
-    position are provided in order as the protected member positionedItems.
-
-    You also need to set a PositionerType, to declare whether you are positioning the x, y or both
-    for the child items. Depending on the chosen type, only x or y changes will be applied.
-
-    Note that the subclass is responsible for adding the
-    spacing in between items.
-*/
-QmlGraphicsBasePositioner::QmlGraphicsBasePositioner(PositionerType at, QmlGraphicsItem *parent)
-    : QmlGraphicsItem(*(new QmlGraphicsBasePositionerPrivate), parent)
-{
-    Q_D(QmlGraphicsBasePositioner);
-    d->init(at);
-}
-
-QmlGraphicsBasePositioner::QmlGraphicsBasePositioner(QmlGraphicsBasePositionerPrivate &dd, PositionerType at, QmlGraphicsItem *parent)
-    : QmlGraphicsItem(dd, parent)
-{
-    Q_D(QmlGraphicsBasePositioner);
-    d->init(at);
-}
-
-QmlGraphicsBasePositioner::~QmlGraphicsBasePositioner()
-{
-    Q_D(QmlGraphicsBasePositioner);
-    for (int i = 0; i < positionedItems.count(); ++i)
-        d->unwatchChanges(positionedItems.at(i).item);
-    positionedItems.clear();
-}
-
-int QmlGraphicsBasePositioner::spacing() const
-{
-    Q_D(const QmlGraphicsBasePositioner);
-    return d->spacing;
-}
-
-void QmlGraphicsBasePositioner::setSpacing(int s)
-{
-    Q_D(QmlGraphicsBasePositioner);
-    if (s==d->spacing)
-        return;
-    d->spacing = s;
-    prePositioning();
-    emit spacingChanged();
-}
-
-QmlTransition *QmlGraphicsBasePositioner::move() const
-{
-    Q_D(const QmlGraphicsBasePositioner);
-    return d->moveTransition;
-}
-
-void QmlGraphicsBasePositioner::setMove(QmlTransition *mt)
-{
-    Q_D(QmlGraphicsBasePositioner);
-    if (mt == d->moveTransition)
-        return;
-    d->moveTransition = mt;
-    emit moveChanged();
-}
-
-QmlTransition *QmlGraphicsBasePositioner::add() const
-{
-    Q_D(const QmlGraphicsBasePositioner);
-    return d->addTransition;
-}
-
-void QmlGraphicsBasePositioner::setAdd(QmlTransition *add)
-{
-    Q_D(QmlGraphicsBasePositioner);
-    if (add == d->addTransition)
-        return;
-
-    d->addTransition = add;
-    emit addChanged();
-}
-
-void QmlGraphicsBasePositioner::componentComplete()
-{
-    Q_D(QmlGraphicsBasePositioner);
-    QmlGraphicsItem::componentComplete();
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::BasepositionerComponentComplete> cc;
-#endif
-    positionedItems.reserve(d->QGraphicsItemPrivate::children.count());
-    prePositioning();
-}
-
-QVariant QmlGraphicsBasePositioner::itemChange(GraphicsItemChange change,
-                                       const QVariant &value)
-{
-    Q_D(QmlGraphicsBasePositioner);
-    if (change == ItemChildAddedChange){
-        QGraphicsItem* item = value.value<QGraphicsItem*>();
-        QmlGraphicsItem* child = 0;
-        if(item)
-            child = qobject_cast<QmlGraphicsItem*>(item->toGraphicsObject());
-        if (child)
-            prePositioning();
-    } else if (change == ItemChildRemovedChange) {
-        QGraphicsItem* item = value.value<QGraphicsItem*>();
-        QmlGraphicsItem* child = 0;
-        if(item)
-            child = qobject_cast<QmlGraphicsItem*>(item->toGraphicsObject());
-        if (child) {
-            QmlGraphicsBasePositioner::PositionedItem posItem(child);
-            int idx = positionedItems.find(posItem);
-            if (idx >= 0) {
-                d->unwatchChanges(child);
-                positionedItems.remove(idx);
-            }
-            prePositioning();
-        }
-    }
-
-    return QmlGraphicsItem::itemChange(change, value);
-}
-
-void QmlGraphicsBasePositioner::prePositioning()
-{
-    Q_D(QmlGraphicsBasePositioner);
-    if (!isComponentComplete())
-        return;
-
-    d->queuedPositioning = false;
-    //Need to order children by creation order modified by stacking order
-    QList<QGraphicsItem *> children = d->QGraphicsItemPrivate::children;
-    qSort(children.begin(), children.end(), d->insertionOrder);
-
-    for (int ii = 0; ii < children.count(); ++ii) {
-        QmlGraphicsItem *child = qobject_cast<QmlGraphicsItem *>(children.at(ii));
-        if (!child)
-            continue;
-        PositionedItem *item = 0;
-        PositionedItem posItem(child);
-        int wIdx = positionedItems.find(posItem);
-        if (wIdx < 0) {
-            d->watchChanges(child);
-            positionedItems.append(posItem);
-            item = &positionedItems[positionedItems.count()-1];
-        } else {
-            item = &positionedItems[wIdx];
-        }
-        if (child->opacity() <= 0.0 || !child->isVisible()) {
-            item->isVisible = false;
-            continue;
-        }
-        if (!item->isVisible) {
-            item->isVisible = true;
-            item->isNew = true;
-        } else {
-            item->isNew = false;
-        }
-    }
-    doPositioning();
-    if(d->addTransition || d->moveTransition)
-        finishApplyTransitions();
-    //Set implicit size to the size of its children
-    qreal h = 0.0f;
-    qreal w = 0.0f;
-    for (int i = 0; i < positionedItems.count(); ++i) {
-        const PositionedItem &posItem = positionedItems.at(i);
-        if (posItem.isVisible) {
-            h = qMax(h, posItem.item->y() + posItem.item->height());
-            w = qMax(w, posItem.item->x() + posItem.item->width());
-        }
-    }
-    setImplicitHeight(h);
-    setImplicitWidth(w);
-}
-
-void QmlGraphicsBasePositioner::positionX(int x, const PositionedItem &target)
-{
-    Q_D(QmlGraphicsBasePositioner);
-    if(d->type == Horizontal || d->type == Both){
-        if(!d->addTransition && !d->moveTransition){
-            target.item->setX(x);
-        }else{
-            if(target.isNew)
-                d->addActions << QmlAction(target.item, QLatin1String("x"), QVariant(x));
-            else
-                d->moveActions << QmlAction(target.item, QLatin1String("x"), QVariant(x));
-        }
-    }
-}
-
-void QmlGraphicsBasePositioner::positionY(int y, const PositionedItem &target)
-{
-    Q_D(QmlGraphicsBasePositioner);
-    if(d->type == Vertical || d->type == Both){
-        if(!d->addTransition && !d->moveTransition){
-            target.item->setY(y);
-        }else{
-            if(target.isNew)
-                d->addActions << QmlAction(target.item, QLatin1String("y"), QVariant(y));
-            else
-                d->moveActions << QmlAction(target.item, QLatin1String("y"), QVariant(y));
-        }
-    }
-}
-
-void QmlGraphicsBasePositioner::finishApplyTransitions()
-{
-    Q_D(QmlGraphicsBasePositioner);
-    // Note that if a transition is not set the transition manager will
-    // apply the changes directly, in the case add/move aren't set
-    d->addTransitionManager.transition(d->addActions, d->addTransition);
-    d->moveTransitionManager.transition(d->moveActions, d->moveTransition);
-    d->addActions.clear();
-    d->moveActions.clear();
-}
-
-/*!
-  \qmlclass Column QmlGraphicsColumn
-    \since 4.7
-  \brief The Column item lines up its children vertically.
-  \inherits Item
-
-  The Column item positions its child items so that they are vertically
-    aligned and not overlapping. Spacing between items can be added.
-
-  The below example positions differently shaped rectangles using a Column.
-  \table
-  \row
-  \o \image verticalpositioner_example.png
-  \o
-  \qml
-Column {
-    spacing: 2
-    Rectangle { color: "red"; width: 50; height: 50 }
-    Rectangle { color: "green"; width: 20; height: 50 }
-    Rectangle { color: "blue"; width: 50; height: 20 }
-}
-  \endqml
-  \endtable
-
-  Column also provides for transitions to be set when items are added, moved,
-  or removed in the positioner. Adding and removing apply both to items which are deleted
-  or have their position in the document changed so as to no longer be children of the positioner,
-  as well as to items which have their opacity set to or from zero so as to appear or disappear.
-
-  \table
-  \row
-  \o \image verticalpositioner_transition.gif
-  \o
-  \qml
-Column {
-    spacing: 2
-    remove: ...
-    add: ...
-    move: ...
-    ...
-}
-  \endqml
-  \endtable
-
-  Note that the positioner assumes that the x and y positions of its children
-  will not change. If you manually change the x or y properties in script, bind
-  the x or y properties, or use anchors on a child of a positioner, then the
-  positioner may exhibit strange behaviour.
-
-*/
-/*!
-    \qmlproperty Transition Column::add
-
-    This property holds the transition to be applied when adding an
-    item to the positioner. The transition will only be applied to the
-    added item(s).  Positioner transitions will only affect the
-    position (x,y) of items.
-
-    Added can mean that either the object has been created or
-    reparented, and thus is now a child or the positioner, or that the
-    object has had its opacity increased from zero, and thus is now
-    visible.
-
-
-*/
-/*!
-    \qmlproperty Transition Column::move
-
-    This property holds the transition to apply when moving an item
-    within the positioner.  Positioner transitions will only affect
-    the position (x,y) of items.
-
-    This can happen when other items are added or removed from the
-    positioner, or when items resize themselves.
-
-    \table
-    \row
-    \o \image positioner-move.gif
-    \o
-    \qml
-Column {
-    move: Transition {
-        NumberAnimation {
-            properties: "y"
-            easing: "easeOutBounce"
-        }
-    }
-}
-    \endqml
-    \endtable
-*/
-/*!
-  \qmlproperty int Column::spacing
-
-  spacing is the amount in pixels left empty between each adjacent
-  item, and defaults to 0.
-
-  The below example places a Grid containing a red, a blue and a
-  green rectangle on a gray background. The area the grid positioner
-  occupies is colored white. The top positioner has the default of no spacing,
-  and the bottom positioner has its spacing set to 2.
-
-  \image spacing_a.png
-  \image spacing_b.png
-
-*/
-/*!
-    \internal
-    \class QmlGraphicsColumn
-    \brief The QmlGraphicsColumn class lines up items vertically.
-    \ingroup group_positioners
-*/
-QmlGraphicsColumn::QmlGraphicsColumn(QmlGraphicsItem *parent)
-: QmlGraphicsBasePositioner(Vertical, parent)
-{
-}
-
-static inline bool isInvisible(QmlGraphicsItem *child)
-{
-    return child->opacity() == 0.0 || !child->isVisible() || !child->width() || !child->height();
-}
-
-void QmlGraphicsColumn::doPositioning()
-{
-    int voffset = 0;
-
-    for (int ii = 0; ii < positionedItems.count(); ++ii) {
-        const PositionedItem &child = positionedItems.at(ii);
-        if (!child.item || isInvisible(child.item))
-            continue;
-
-        if(child.item->y() != voffset)
-            positionY(voffset, child);
-
-        voffset += child.item->height();
-        voffset += spacing();
-    }
-}
-
-/*!
-  \qmlclass Row QmlGraphicsRow
-  \since 4.7
-  \brief The Row item lines up its children horizontally.
-  \inherits Item
-
-  The Row item positions its child items so that they are
-  horizontally aligned and not overlapping. Spacing can be added between the
-  items, and a margin around all items can also be added. It also provides for
-  transitions to be set when items are added, moved, or removed in the
-  positioner. Adding and removing apply both to items which are deleted or have
-  their position in the document changed so as to no longer be children of the
-  positioner, as well as to items which have their opacity set to or from zero
-  so as to appear or disappear.
-
-  The below example lays out differently shaped rectangles using a Row.
-  \qml
-Row {
-    spacing: 2
-    Rectangle { color: "red"; width: 50; height: 50 }
-    Rectangle { color: "green"; width: 20; height: 50 }
-    Rectangle { color: "blue"; width: 50; height: 20 }
-}
-  \endqml
-  \image horizontalpositioner_example.png
-
-  Note that the positioner assumes that the x and y positions of its children
-  will not change. If you manually change the x or y properties in script, bind
-  the x or y properties, or use anchors on a child of a positioner, then the
-  positioner may exhibit strange behaviour.
-
-*/
-/*!
-    \qmlproperty Transition Row::add
-    This property holds the transition to apply when adding an item to the positioner.
-    The transition will only be applied to the added item(s).
-    Positioner transitions will only affect the position (x,y) of items.
-
-    Added can mean that either the object has been created or
-    reparented, and thus is now a child or the positioner, or that the
-    object has had its opacity increased from zero, and thus is now
-    visible.
-
-
-*/
-/*!
-    \qmlproperty Transition Row::move
-
-    This property holds the transition to apply when moving an item
-    within the positioner.  Positioner transitions will only affect
-    the position (x,y) of items.
-
-    This can happen when other items are added or removed from the
-    positioner, or when items resize themselves.
-
-    \qml
-Row {
-    id: positioner
-    move: Transition {
-        NumberAnimation {
-            properties: "x"
-            ease: "easeOutBounce"
-        }
-    }
-}
-    \endqml
-
-*/
-/*!
-  \qmlproperty int Row::spacing
-
-  spacing is the amount in pixels left empty between each adjacent
-  item, and defaults to 0.
-
-  The below example places a Grid containing a red, a blue and a
-  green rectangle on a gray background. The area the grid positioner
-  occupies is colored white. The top positioner has the default of no spacing,
-  and the bottom positioner has its spacing set to 2.
-
-  \image spacing_a.png
-  \image spacing_b.png
-
-*/
-/*!
-    \internal
-    \class QmlGraphicsRow
-    \brief The QmlGraphicsRow class lines up items horizontally.
-    \ingroup group_positioners
-*/
-QmlGraphicsRow::QmlGraphicsRow(QmlGraphicsItem *parent)
-: QmlGraphicsBasePositioner(Horizontal, parent)
-{
-}
-
-void QmlGraphicsRow::doPositioning()
-{
-    int hoffset = 0;
-
-    for (int ii = 0; ii < positionedItems.count(); ++ii) {
-        const PositionedItem &child = positionedItems.at(ii);
-        if (!child.item || isInvisible(child.item))
-            continue;
-
-        if(child.item->x() != hoffset)
-            positionX(hoffset, child);
-
-        hoffset += child.item->width();
-        hoffset += spacing();
-    }
-}
-
-
-/*!
-  \qmlclass Grid QmlGraphicsGrid
-  \since 4.7
-  \brief The Grid item positions its children in a grid.
-  \inherits Item
-
-  The Grid item positions its child items so that they are
-  aligned in a grid and are not overlapping. Spacing can be added
-  between the items. It also provides for transitions to be set when items are
-  added, moved, or removed in the positioner. Adding and removing apply
-  both to items which are deleted or have their position in the
-  document changed so as to no longer be children of the positioner, as
-  well as to items which have their opacity set to or from zero so
-  as to appear or disappear.
-
-  The Grid defaults to using four columns, and as many rows as
-  are necessary to fit all the child items. The number of rows
-  and/or the number of columns can be constrained by setting the rows
-  or columns properties. The grid positioner calculates a grid with
-  rectangular cells of sufficient size to hold all items, and then
-  places the items in the cells, going across then down, and
-  positioning each item at the (0,0) corner of the cell. The below
-  example demonstrates this.
-
-  \table
-  \row
-  \o \image gridLayout_example.png
-  \o
-  \qml
-Grid {
-    columns: 3
-    spacing: 2
-    Rectangle { color: "red"; width: 50; height: 50 }
-    Rectangle { color: "green"; width: 20; height: 50 }
-    Rectangle { color: "blue"; width: 50; height: 20 }
-    Rectangle { color: "cyan"; width: 50; height: 50 }
-    Rectangle { color: "magenta"; width: 10; height: 10 }
-}
-  \endqml
-  \endtable
-
-  Note that the positioner assumes that the x and y positions of its children
-  will not change. If you manually change the x or y properties in script, bind
-  the x or y properties, or use anchors on a child of a positioner, then the
-  positioner may exhibit strange behaviour.
-*/
-/*!
-    \qmlproperty Transition Grid::add
-    This property holds the transition to apply when adding an item to the positioner.
-    The transition is only applied to the added item(s).
-    Positioner transitions will only affect the position (x,y) of items.
-
-    Added can mean that either the object has been created or
-    reparented, and thus is now a child or the positioner, or that the
-    object has had its opacity increased from zero, and thus is now
-    visible.
-
-
-*/
-/*!
-    \qmlproperty Transition Grid::move
-    This property holds the transition to apply when moving an item within the positioner.
-    Positioner transitions will only affect the position (x,y) of items.
-
-    This can happen when other items are added or removed from the positioner, or
-    when items resize themselves.
-
-    \qml
-Grid {
-    move: Transition {
-        NumberAnimation {
-            properties: "x,y"
-            ease: "easeOutBounce"
-        }
-    }
-}
-    \endqml
-
-*/
-/*!
-  \qmlproperty int Grid::spacing
-
-  spacing is the amount in pixels left empty between each adjacent
-  item, and defaults to 0.
-
-  The below example places a Grid containing a red, a blue and a
-  green rectangle on a gray background. The area the grid positioner
-  occupies is colored white. The top positioner has the default of no spacing,
-  and the bottom positioner has its spacing set to 2.
-
-  \image spacing_a.png
-  \image spacing_b.png
-
-*/
-/*!
-    \internal
-    \class QmlGraphicsGrid
-    \brief The QmlGraphicsGrid class lays out items in a grid.
-    \ingroup group_layouts
-
-*/
-QmlGraphicsGrid::QmlGraphicsGrid(QmlGraphicsItem *parent) :
-    QmlGraphicsBasePositioner(Both, parent)
-{
-    _columns=-1;
-    _rows=-1;
-}
-
-/*!
-    \qmlproperty int Grid::columns
-    This property holds the number of columns in the grid.
-
-    When the columns property is set the Grid will always have
-    that many columns. Note that if you do not have enough items to
-    fill this many columns some columns will be of zero width.
-*/
-
-/*!
-    \qmlproperty int Grid::rows
-    This property holds the number of rows in the grid.
-
-    When the rows property is set the Grid will always have that
-    many rows. Note that if you do not have enough items to fill this
-    many rows some rows will be of zero width.
-*/
-
-void QmlGraphicsGrid::setColumns(const int columns)
-{
-    if (columns == _columns)
-        return;
-    _columns = columns;
-    prePositioning();
-    emit columnsChanged();
-}
-
-void QmlGraphicsGrid::setRows(const int rows)
-{
-    if (rows == _rows)
-        return;
-    _rows = rows;
-    prePositioning();
-    emit rowsChanged();
-}
-
-void QmlGraphicsGrid::doPositioning()
-{
-    int c=_columns,r=_rows;//Actual number of rows/columns
-    int numVisible = positionedItems.count();
-    if (_columns==-1 && _rows==-1){
-        c = 4;
-        r = (numVisible+3)/4;
-    }else if (_rows==-1){
-        r = (numVisible+(_columns-1))/_columns;
-    }else if (_columns==-1){
-        c = (numVisible+(_rows-1))/_rows;
-    }
-
-    QList<int> maxColWidth;
-    QList<int> maxRowHeight;
-    int childIndex =0;
-    for (int i=0; i<r; i++){
-        for (int j=0; j<c; j++){
-            if (j==0)
-                maxRowHeight << 0;
-            if (i==0)
-                maxColWidth << 0;
-
-            if (childIndex == positionedItems.count())
-                continue;
-            const PositionedItem &child = positionedItems.at(childIndex++);
-            if (!child.item || isInvisible(child.item))
-                continue;
-            if (child.item->width() > maxColWidth[j])
-                maxColWidth[j] = child.item->width();
-            if (child.item->height() > maxRowHeight[i])
-                maxRowHeight[i] = child.item->height();
-        }
-    }
-
-    int xoffset=0;
-    int yoffset=0;
-    int curRow =0;
-    int curCol =0;
-    for (int i = 0; i < positionedItems.count(); ++i) {
-        const PositionedItem &child = positionedItems.at(i);
-        if (!child.item || isInvisible(child.item))
-            continue;
-        if((child.item->x()!=xoffset)||(child.item->y()!=yoffset)){
-            positionX(xoffset, child);
-            positionY(yoffset, child);
-        }
-        xoffset+=maxColWidth[curCol]+spacing();
-        curCol++;
-        curCol%=c;
-        if (!curCol){
-            yoffset+=maxRowHeight[curRow]+spacing();
-            xoffset=0;
-            curRow++;
-            if (curRow>=r)
-                break;
-        }
-    }
-}
-
-
-/*!
-  \qmlclass Flow QmlGraphicsFlow
-  \since 4.7
-  \brief The Flow item lines up its children side by side, wrapping as necessary.
-  \inherits Item
-
-
-*/
-/*!
-    \qmlproperty Transition Flow::add
-    This property holds the transition to apply when adding an item to the positioner.
-    The transition will only be applied to the added item(s).
-    Positioner transitions will only affect the position (x,y) of items.
-
-    Added can mean that either the object has been created or reparented, and thus is now a child or the positioner, or that the object has had its opacity increased from zero, and thus is now visible.
-
-
-*/
-/*!
-    \qmlproperty Transition Flow::move
-    This property holds the transition to apply when moving an item within the positioner.
-    Positioner transitions will only affect the position (x,y) of items.
-
-    This can happen when other items are added or removed from the positioner, or when items resize themselves.
-
-    \qml
-Flow {
-    id: positioner
-    move: Transition {
-        NumberAnimation {
-            properties: "x,y"
-            ease: "easeOutBounce"
-        }
-    }
-}
-    \endqml
-
-*/
-/*!
-  \qmlproperty int Flow::spacing
-
-  spacing is the amount in pixels left empty between each adjacent
-  item, and defaults to 0.
-
-*/
-
-class QmlGraphicsFlowPrivate : public QmlGraphicsBasePositionerPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsFlow)
-
-public:
-    QmlGraphicsFlowPrivate()
-        : QmlGraphicsBasePositionerPrivate(), flow(QmlGraphicsFlow::LeftToRight)
-    {}
-
-    QmlGraphicsFlow::Flow flow;
-};
-
-QmlGraphicsFlow::QmlGraphicsFlow(QmlGraphicsItem *parent)
-: QmlGraphicsBasePositioner(*(new QmlGraphicsFlowPrivate), Both, parent)
-{
-}
-
-/*!
-    \qmlproperty enumeration Flow::flow
-    This property holds the flow of the layout.
-
-    Possible values are \c LeftToRight (default) and \c TopToBottom.
-
-    If \a flow is \c LeftToRight, the items are positioned next to
-    to each other from left to right until the width of the Flow
-    is exceeded, then wrapped to the next line.
-    If \a flow is \c TopToBottom, the items are positioned next to each
-    other from top to bottom until the height of the Flow is exceeded,
-    then wrapped to the next column.
-*/
-QmlGraphicsFlow::Flow QmlGraphicsFlow::flow() const
-{
-    Q_D(const QmlGraphicsFlow);
-    return d->flow;
-}
-
-void QmlGraphicsFlow::setFlow(Flow flow)
-{
-    Q_D(QmlGraphicsFlow);
-    if (d->flow != flow) {
-        d->flow = flow;
-        prePositioning();
-        emit flowChanged();
-    }
-}
-
-void QmlGraphicsFlow::doPositioning()
-{
-    Q_D(QmlGraphicsFlow);
-
-    int hoffset = 0;
-    int voffset = 0;
-    int linemax = 0;
-
-    for (int i = 0; i < positionedItems.count(); ++i) {
-        const PositionedItem &child = positionedItems.at(i);
-        if (!child.item || isInvisible(child.item))
-            continue;
-
-        if (d->flow == LeftToRight)  {
-            if (hoffset && hoffset + child.item->width() > width()) {
-                hoffset = 0;
-                voffset += linemax + spacing();
-                linemax = 0;
-            }
-        } else {
-            if (voffset && voffset + child.item->height() > height()) {
-                voffset = 0;
-                hoffset += linemax + spacing();
-                linemax = 0;
-            }
-        }
-
-        if(child.item->x() != hoffset || child.item->y() != voffset){
-            positionX(hoffset, child);
-            positionY(voffset, child);
-        }
-
-        if (d->flow == LeftToRight)  {
-            hoffset += child.item->width();
-            hoffset += spacing();
-            linemax = qMax(linemax, qCeil(child.item->height()));
-        } else {
-            voffset += child.item->height();
-            voffset += spacing();
-            linemax = qMax(linemax, qCeil(child.item->width()));
-        }
-    }
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
deleted file mode 100644
index 2f905e5..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSLAYOUTS_H
-#define QMLGRAPHICSLAYOUTS_H
-
-#include "qmlgraphicsitem.h"
-
-#include "../util/qmlstate_p.h"
-#include <private/qpodvector_p.h>
-
-#include <QtCore/QObject>
-#include <QtCore/QString>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-class QmlGraphicsBasePositionerPrivate;
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsBasePositioner : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
-    Q_PROPERTY(QmlTransition *move READ move WRITE setMove NOTIFY moveChanged)
-    Q_PROPERTY(QmlTransition *add READ add WRITE setAdd NOTIFY addChanged)
-public:
-    enum PositionerType { None = 0x0, Horizontal = 0x1, Vertical = 0x2, Both = 0x3 };
-    QmlGraphicsBasePositioner(PositionerType, QmlGraphicsItem *parent);
-    ~QmlGraphicsBasePositioner();
-
-    int spacing() const;
-    void setSpacing(int);
-
-    QmlTransition *move() const;
-    void setMove(QmlTransition *);
-
-    QmlTransition *add() const;
-    void setAdd(QmlTransition *);
-
-protected:
-    QmlGraphicsBasePositioner(QmlGraphicsBasePositionerPrivate &dd, PositionerType at, QmlGraphicsItem *parent);
-    virtual void componentComplete();
-    virtual QVariant itemChange(GraphicsItemChange, const QVariant &);
-    void finishApplyTransitions();
-
-Q_SIGNALS:
-    void spacingChanged();
-    void moveChanged();
-    void addChanged();
-
-protected Q_SLOTS:
-    virtual void doPositioning()=0;
-    void prePositioning();
-
-protected:
-    struct PositionedItem {
-        PositionedItem(QmlGraphicsItem *i) : item(i), isNew(false), isVisible(true) {}
-        bool operator==(const PositionedItem &other) const { return other.item == item; }
-        QmlGraphicsItem *item;
-        bool isNew;
-        bool isVisible;
-    };
-
-    QPODVector<PositionedItem,8> positionedItems;
-    void positionX(int,const PositionedItem &target);
-    void positionY(int,const PositionedItem &target);
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsBasePositioner)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsBasePositioner)
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsColumn : public QmlGraphicsBasePositioner
-{
-    Q_OBJECT
-public:
-    QmlGraphicsColumn(QmlGraphicsItem *parent=0);
-protected Q_SLOTS:
-    virtual void doPositioning();
-private:
-    Q_DISABLE_COPY(QmlGraphicsColumn)
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsRow: public QmlGraphicsBasePositioner
-{
-    Q_OBJECT
-public:
-    QmlGraphicsRow(QmlGraphicsItem *parent=0);
-protected Q_SLOTS:
-    virtual void doPositioning();
-private:
-    Q_DISABLE_COPY(QmlGraphicsRow)
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsGrid : public QmlGraphicsBasePositioner
-{
-    Q_OBJECT
-    Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowChanged)
-    Q_PROPERTY(int columns READ columns WRITE setColumns NOTIFY columnsChanged)
-public:
-    QmlGraphicsGrid(QmlGraphicsItem *parent=0);
-
-    int rows() const {return _rows;}
-    void setRows(const int rows);
-
-    int columns() const {return _columns;}
-    void setColumns(const int columns);
-
-Q_SIGNALS:
-    void rowsChanged();
-    void columnsChanged();
-
-protected Q_SLOTS:
-    virtual void doPositioning();
-
-private:
-    int _rows;
-    int _columns;
-    Q_DISABLE_COPY(QmlGraphicsGrid)
-};
-
-class QmlGraphicsFlowPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsFlow: public QmlGraphicsBasePositioner
-{
-    Q_OBJECT
-    Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
-public:
-    QmlGraphicsFlow(QmlGraphicsItem *parent=0);
-
-    Q_ENUMS(Flow)
-    enum Flow { LeftToRight, TopToBottom };
-    Flow flow() const;
-    void setFlow(Flow);
-
-Q_SIGNALS:
-    void flowChanged();
-
-protected Q_SLOTS:
-    virtual void doPositioning();
-
-protected:
-    QmlGraphicsFlow(QmlGraphicsFlowPrivate &dd, QmlGraphicsItem *parent);
-private:
-    Q_DISABLE_COPY(QmlGraphicsFlow)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsFlow)
-};
-
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsColumn)
-QML_DECLARE_TYPE(QmlGraphicsRow)
-QML_DECLARE_TYPE(QmlGraphicsGrid)
-QML_DECLARE_TYPE(QmlGraphicsFlow)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
deleted file mode 100644
index e9b6aa8..0000000
--- a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSLAYOUTS_P_H
-#define QMLGRAPHICSLAYOUTS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicspositioners_p.h"
-
-#include "qmlgraphicsitem_p.h"
-
-#include <qmlstate_p.h>
-#include <qmltransitionmanager_p_p.h>
-#include <qmlstateoperations_p.h>
-
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QTimer>
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-class QmlGraphicsBasePositionerPrivate : public QmlGraphicsItemPrivate, public QmlGraphicsItemChangeListener
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsBasePositioner)
-
-public:
-    QmlGraphicsBasePositionerPrivate()
-        : spacing(0), type(QmlGraphicsBasePositioner::None), moveTransition(0), addTransition(0),
-          queuedPositioning(false)
-    {
-    }
-
-    void init(QmlGraphicsBasePositioner::PositionerType at)
-    {
-        type = at;
-    }
-
-    int spacing;
-    QmlGraphicsBasePositioner::PositionerType type;
-    QmlTransition *moveTransition;
-    QmlTransition *addTransition;
-    QmlStateOperation::ActionList addActions;
-    QmlStateOperation::ActionList moveActions;
-    QmlTransitionManager addTransitionManager;
-    QmlTransitionManager moveTransitionManager;
-
-    void watchChanges(QmlGraphicsItem *other);
-    void unwatchChanges(QmlGraphicsItem* other);
-    bool queuedPositioning;
-
-    virtual void itemSiblingOrderChanged(QmlGraphicsItem* other)
-    {
-        Q_Q(QmlGraphicsBasePositioner);
-        Q_UNUSED(other);
-        if(!queuedPositioning){
-            //Delay is due to many children often being reordered at once
-            //And we only want to reposition them all once
-            QTimer::singleShot(0,q,SLOT(prePositioning()));
-            queuedPositioning = true;
-        }
-    }
-
-    void itemGeometryChanged(QmlGraphicsItem *, const QRectF &newGeometry, const QRectF &oldGeometry)
-    {
-        Q_Q(QmlGraphicsBasePositioner);
-        if (newGeometry.size() != oldGeometry.size())
-            q->prePositioning();
-    }
-    virtual void itemVisibilityChanged(QmlGraphicsItem *)
-    {
-        Q_Q(QmlGraphicsBasePositioner);
-        q->prePositioning();
-    }
-    virtual void itemOpacityChanged(QmlGraphicsItem *)
-    {
-        Q_Q(QmlGraphicsBasePositioner);
-        q->prePositioning();
-    }
-
-    void itemDestroyed(QmlGraphicsItem *item)
-    {
-        Q_Q(QmlGraphicsBasePositioner);
-        q->positionedItems.removeOne(QmlGraphicsBasePositioner::PositionedItem(item));
-    }
-};
-
-QT_END_NAMESPACE
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
deleted file mode 100644
index adc4cf3..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
+++ /dev/null
@@ -1,466 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsrectangle_p.h"
-#include "qmlgraphicsrectangle_p_p.h"
-
-#include <QPainter>
-#include <QtCore/qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \internal
-    \class QmlGraphicsPen
-    \brief The QmlGraphicsPen class provides a pen used for drawing rectangle borders on a QmlView.
-
-    By default, the pen is invalid and nothing is drawn. You must either set a color (then the default
-    width is 1) or a width (then the default color is black).
-
-    A width of 1 indicates is a single-pixel line on the border of the item being painted.
-
-    Example:
-    \qml
-    Rectangle { border.width: 2; border.color: "red" ... }
-    \endqml
-*/
-
-void QmlGraphicsPen::setColor(const QColor &c)
-{
-    _color = c;
-    _valid = _color.alpha() ? true : false;
-    emit penChanged();
-}
-
-void QmlGraphicsPen::setWidth(int w)
-{
-    if (_width == w && _valid)
-        return;
-
-    _width = w;
-    _valid = (_width < 1) ? false : true;
-    emit penChanged();
-}
-
-
-/*!
-    \qmlclass GradientStop QmlGraphicsGradientStop
-  \since 4.7
-    \brief The GradientStop item defines the color at a position in a Gradient
-
-    \sa Gradient
-*/
-
-/*!
-    \qmlproperty real GradientStop::position
-    \qmlproperty color GradientStop::color
-
-    Sets a \e color at a \e position in a gradient.
-*/
-
-void QmlGraphicsGradientStop::updateGradient()
-{
-    if (QmlGraphicsGradient *grad = qobject_cast<QmlGraphicsGradient*>(parent()))
-        grad->doUpdate();
-}
-
-/*!
-    \qmlclass Gradient QmlGraphicsGradient
-  \since 4.7
-    \brief The Gradient item defines a gradient fill.
-
-    A gradient is defined by two or more colors, which will be blended seemlessly.  The
-    colors are specified at their position in the range 0.0 - 1.0 via
-    the GradientStop item.  For example, the following code paints a
-    rectangle with a gradient starting with red, blending to yellow at 1/3 of the
-    size of the rectangle, and ending with Green:
-
-    \table
-    \row
-    \o \image gradient.png
-    \o \quotefile doc/src/snippets/declarative/gradient.qml
-    \endtable
-
-    \sa GradientStop
-*/
-
-/*!
-    \qmlproperty list<GradientStop> Gradient::stops
-    This property holds the gradient stops describing the gradient.
-*/
-
-const QGradient *QmlGraphicsGradient::gradient() const
-{
-    if (!m_gradient && !m_stops.isEmpty()) {
-        m_gradient = new QLinearGradient(0,0,0,1.0);
-        for (int i = 0; i < m_stops.count(); ++i) {
-            const QmlGraphicsGradientStop *stop = m_stops.at(i);
-            m_gradient->setCoordinateMode(QGradient::ObjectBoundingMode);
-            m_gradient->setColorAt(stop->position(), stop->color());
-        }
-    }
-
-    return m_gradient;
-}
-
-void QmlGraphicsGradient::doUpdate()
-{
-    delete m_gradient;
-    m_gradient = 0;
-    emit updated();
-}
-
-
-/*!
-    \qmlclass Rectangle QmlGraphicsRectangle
-  \since 4.7
-    \brief The Rectangle item allows you to add rectangles to a scene.
-    \inherits Item
-
-    A Rectangle is painted having a solid fill (color) and an optional border.
-    You can also create rounded rectangles using the radius property.
-
-    \qml
-    Rectangle {
-        width: 100
-        height: 100
-        color: "red"
-        border.color: "black"
-        border.width: 5
-        radius: 10
-    }
-    \endqml
-
-    \image declarative-rect.png
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsRectangle
-    \brief The QmlGraphicsRectangle class provides a rectangle item that you can add to a QmlView.
-*/
-QmlGraphicsRectangle::QmlGraphicsRectangle(QmlGraphicsItem *parent)
-  : QmlGraphicsItem(*(new QmlGraphicsRectanglePrivate), parent)
-{
-    Q_D(QmlGraphicsRectangle);
-    d->init();
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
-}
-
-void QmlGraphicsRectangle::doUpdate()
-{
-    Q_D(QmlGraphicsRectangle);
-    d->rectImage = QPixmap();
-    const int pw = d->pen && d->pen->isValid() ? d->pen->width() : 0;
-    d->setPaintMargin((pw+1)/2);
-    update();
-}
-
-/*!
-    \qmlproperty int Rectangle::border.width
-    \qmlproperty color Rectangle::border.color
-
-    The width and color used to draw the border of the rectangle.
-
-    A width of 1 creates a thin line. For no line, use a width of 0 or a transparent color.
-
-    To keep the border smooth (rather than blurry), odd widths cause the rectangle to be painted at
-    a half-pixel offset;
-*/
-QmlGraphicsPen *QmlGraphicsRectangle::border()
-{
-    Q_D(QmlGraphicsRectangle);
-    return d->getPen();
-}
-
-/*!
-    \qmlproperty Gradient Rectangle::gradient
-
-    The gradient to use to fill the rectangle.
-
-    This property allows for the construction of simple vertical gradients.
-    Other gradients may by formed by adding rotation to the rectangle.
-
-    \table
-    \row
-    \o \image declarative-rect_gradient.png
-    \o
-    \qml
-    Rectangle { y: 0; width: 80; height: 80; color: "lightsteelblue" }
-    Rectangle { y: 100; width: 80; height: 80
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "lightsteelblue" }
-            GradientStop { position: 1.0; color: "blue" }
-        }
-    }
-    Rectangle { rotation: 90; x: 80; y: 200; width: 80; height: 80
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "lightsteelblue" }
-            GradientStop { position: 1.0; color: "blue" }
-        }
-    }
-    // The x offset is needed because the rotation is from the top left corner
-    \endqml
-    \endtable
-
-    If both a gradient and a color are specified, the gradient will be used.
-
-    \sa Gradient, color
-*/
-QmlGraphicsGradient *QmlGraphicsRectangle::gradient() const
-{
-    Q_D(const QmlGraphicsRectangle);
-    return d->gradient;
-}
-
-void QmlGraphicsRectangle::setGradient(QmlGraphicsGradient *gradient)
-{
-    Q_D(QmlGraphicsRectangle);
-    if (d->gradient == gradient)
-        return;
-    if (d->gradient)
-        disconnect(d->gradient, SIGNAL(updated()), this, SLOT(doUpdate()));
-    d->gradient = gradient;
-    if (d->gradient)
-        connect(d->gradient, SIGNAL(updated()), this, SLOT(doUpdate()));
-    update();
-}
-
-
-/*!
-    \qmlproperty real Rectangle::radius
-    This property holds the corner radius used to draw a rounded rectangle.
-
-    If radius is non-zero, the rectangle will be painted as a rounded rectangle, otherwise it will be
-    painted as a normal rectangle. The same radius is used by all 4 corners; there is currently
-    no way to specify different radii for different corners.
-*/
-qreal QmlGraphicsRectangle::radius() const
-{
-    Q_D(const QmlGraphicsRectangle);
-    return d->radius;
-}
-
-void QmlGraphicsRectangle::setRadius(qreal radius)
-{
-    Q_D(QmlGraphicsRectangle);
-    if (d->radius == radius)
-        return;
-
-    d->radius = radius;
-    d->rectImage = QPixmap();
-    update();
-    emit radiusChanged();
-}
-
-/*!
-    \qmlproperty color Rectangle::color
-    This property holds the color used to fill the rectangle.
-
-    \qml
-    // green rectangle using hexidecimal notation
-    Rectangle { color: "#00FF00" }
-
-    // steelblue rectangle using SVG color name
-    Rectangle { color: "steelblue" }
-    \endqml
-
-    The default color is white.
-
-    If both a gradient and a color are specified, the gradient will be used.
-*/
-QColor QmlGraphicsRectangle::color() const
-{
-    Q_D(const QmlGraphicsRectangle);
-    return d->color;
-}
-
-void QmlGraphicsRectangle::setColor(const QColor &c)
-{
-    Q_D(QmlGraphicsRectangle);
-    if (d->color == c)
-        return;
-
-    d->color = c;
-    d->rectImage = QPixmap();
-    update();
-    emit colorChanged();
-}
-
-void QmlGraphicsRectangle::generateRoundedRect()
-{
-    Q_D(QmlGraphicsRectangle);
-    if (d->rectImage.isNull()) {
-        const int pw = d->pen && d->pen->isValid() ? d->pen->width() : 0;
-        const int radius = qCeil(d->radius);    //ensure odd numbered width/height so we get 1-pixel center
-        d->rectImage = QPixmap(radius*2 + 3 + pw*2, radius*2 + 3 + pw*2);
-        d->rectImage.fill(Qt::transparent);
-        QPainter p(&(d->rectImage));
-        p.setRenderHint(QPainter::Antialiasing);
-        if (d->pen && d->pen->isValid()) {
-            QPen pn(QColor(d->pen->color()), d->pen->width());
-            p.setPen(pn);
-        } else {
-            p.setPen(Qt::NoPen);
-        }
-        p.setBrush(d->color);
-        if (pw%2)
-            p.drawRoundedRect(QRectF(qreal(pw)/2+1, qreal(pw)/2+1, d->rectImage.width()-(pw+1), d->rectImage.height()-(pw+1)), d->radius, d->radius);
-        else
-            p.drawRoundedRect(QRectF(qreal(pw)/2, qreal(pw)/2, d->rectImage.width()-pw, d->rectImage.height()-pw), d->radius, d->radius);
-    }
-}
-
-void QmlGraphicsRectangle::generateBorderedRect()
-{
-    Q_D(QmlGraphicsRectangle);
-    if (d->rectImage.isNull()) {
-        const int pw = d->pen && d->pen->isValid() ? d->pen->width() : 0;
-        d->rectImage = QPixmap(pw*2 + 3, pw*2 + 3);
-        d->rectImage.fill(Qt::transparent);
-        QPainter p(&(d->rectImage));
-        p.setRenderHint(QPainter::Antialiasing);
-        if (d->pen && d->pen->isValid()) {
-            QPen pn(QColor(d->pen->color()), d->pen->width());
-            pn.setJoinStyle(Qt::MiterJoin);
-            p.setPen(pn);
-        } else {
-            p.setPen(Qt::NoPen);
-        }
-        p.setBrush(d->color);
-        if (pw%2)
-            p.drawRect(QRectF(qreal(pw)/2+1, qreal(pw)/2+1, d->rectImage.width()-(pw+1), d->rectImage.height()-(pw+1)));
-        else
-            p.drawRect(QRectF(qreal(pw)/2, qreal(pw)/2, d->rectImage.width()-pw, d->rectImage.height()-pw));
-    }
-}
-
-void QmlGraphicsRectangle::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    Q_D(QmlGraphicsRectangle);
-    if (d->radius > 0 || (d->pen && d->pen->isValid())
-        || (d->gradient && d->gradient->gradient()) ) {
-        drawRect(*p);
-    }
-    else {
-        bool oldAA = p->testRenderHint(QPainter::Antialiasing);
-        if (d->smooth)
-            p->setRenderHints(QPainter::Antialiasing, true);
-        p->fillRect(QRectF(0, 0, width(), height()), d->color);
-        if (d->smooth)
-            p->setRenderHint(QPainter::Antialiasing, oldAA);
-    }
-}
-
-void QmlGraphicsRectangle::drawRect(QPainter &p)
-{
-    Q_D(QmlGraphicsRectangle);
-    if (d->gradient && d->gradient->gradient()) {
-        // XXX This path is still slower than the image path
-        // Image path won't work for gradients though
-        bool oldAA = p.testRenderHint(QPainter::Antialiasing);
-        if (d->smooth)
-            p.setRenderHint(QPainter::Antialiasing);
-        if (d->pen && d->pen->isValid()) {
-            QPen pn(QColor(d->pen->color()), d->pen->width());
-            p.setPen(pn);
-        } else {
-            p.setPen(Qt::NoPen);
-        }
-        p.setBrush(*d->gradient->gradient());
-        if (d->radius > 0.)
-            p.drawRoundedRect(0, 0, width(), height(), d->radius, d->radius);
-        else
-            p.drawRect(0, 0, width(), height());
-        if (d->smooth)
-            p.setRenderHint(QPainter::Antialiasing, oldAA);
-    } else {
-        bool oldAA = p.testRenderHint(QPainter::Antialiasing);
-        bool oldSmooth = p.testRenderHint(QPainter::SmoothPixmapTransform);
-        if (d->smooth)
-            p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
-
-        const int pw = d->pen && d->pen->isValid() ? (d->pen->width()+1)/2*2 : 0;
-
-        if (d->radius > 0)
-            generateRoundedRect();
-        else
-            generateBorderedRect();
-
-        int xOffset = (d->rectImage.width()-1)/2;
-        int yOffset = (d->rectImage.height()-1)/2;
-        Q_ASSERT(d->rectImage.width() == 2*xOffset + 1);
-        Q_ASSERT(d->rectImage.height() == 2*yOffset + 1);
-
-        QMargins margins(xOffset, yOffset, xOffset, yOffset);
-        QTileRules rules(Qt::StretchTile, Qt::StretchTile);
-        //NOTE: even though our item may have qreal-based width and height, qDrawBorderPixmap only supports QRects
-        qDrawBorderPixmap(&p, QRect(-pw/2, -pw/2, width()+pw, height()+pw), margins, d->rectImage, d->rectImage.rect(), margins, rules);
-
-        if (d->smooth) {
-            p.setRenderHint(QPainter::Antialiasing, oldAA);
-            p.setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
-        }
-    }
-}
-
-/*!
-    \qmlproperty bool Rectangle::smooth
-
-    Set this property if you want the item to be smoothly scaled or
-    transformed.  Smooth filtering gives better visual quality, but is slower.  If
-    the item is displayed at its natural size, this property has no visual or
-    performance effect.
-
-    \note Generally scaling artifacts are only visible if the item is stationary on
-    the screen.  A common pattern when animating an item is to disable smooth
-    filtering at the beginning of the animation and reenable it at the conclusion.
-
-    \image rect-smooth.png
-*/
-
-QRectF QmlGraphicsRectangle::boundingRect() const
-{
-    Q_D(const QmlGraphicsRectangle);
-    return QRectF(-d->paintmargin, -d->paintmargin, d->width+d->paintmargin*2, d->height+d->paintmargin*2);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
deleted file mode 100644
index 66552f6..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSRECT_H
-#define QMLGRAPHICSRECT_H
-
-#include "qmlgraphicsitem.h"
-
-#include <QtGui/qbrush.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-class Q_DECLARATIVE_EXPORT QmlGraphicsPen : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int width READ width WRITE setWidth NOTIFY penChanged)
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY penChanged)
-public:
-    QmlGraphicsPen(QObject *parent=0)
-        : QObject(parent), _width(1), _color("#000000"), _valid(false)
-    {}
-
-    int width() const { return _width; }
-    void setWidth(int w);
-
-    QColor color() const { return _color; }
-    void setColor(const QColor &c);
-
-    bool isValid() { return _valid; };
-
-Q_SIGNALS:
-    void penChanged();
-
-private:
-    int _width;
-    QColor _color;
-    bool _valid;
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsGradientStop : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal position READ position WRITE setPosition)
-    Q_PROPERTY(QColor color READ color WRITE setColor)
-
-public:
-    QmlGraphicsGradientStop(QObject *parent=0) : QObject(parent) {}
-
-    qreal position() const { return m_position; }
-    void setPosition(qreal position) { m_position = position; updateGradient(); }
-
-    QColor color() const { return m_color; }
-    void setColor(const QColor &color) { m_color = color; updateGradient(); }
-
-private:
-    void updateGradient();
-
-private:
-    qreal m_position;
-    QColor m_color;
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsGradient : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QmlListProperty<QmlGraphicsGradientStop> stops READ stops)
-    Q_CLASSINFO("DefaultProperty", "stops")
-
-public:
-    QmlGraphicsGradient(QObject *parent=0) : QObject(parent), m_gradient(0) {}
-    ~QmlGraphicsGradient() { delete m_gradient; }
-
-    QmlListProperty<QmlGraphicsGradientStop> stops() { return QmlListProperty<QmlGraphicsGradientStop>(this, m_stops); }
-
-    const QGradient *gradient() const;
-
-Q_SIGNALS:
-    void updated();
-
-private:
-    void doUpdate();
-
-private:
-    QList<QmlGraphicsGradientStop *> m_stops;
-    mutable QGradient *m_gradient;
-    friend class QmlGraphicsGradientStop;
-};
-
-class QmlGraphicsRectanglePrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsRectangle : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-    Q_PROPERTY(QmlGraphicsGradient *gradient READ gradient WRITE setGradient)
-    Q_PROPERTY(QmlGraphicsPen * border READ border CONSTANT)
-    Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged)
-public:
-    QmlGraphicsRectangle(QmlGraphicsItem *parent=0);
-
-    QColor color() const;
-    void setColor(const QColor &);
-
-    QmlGraphicsPen *border();
-
-    QmlGraphicsGradient *gradient() const;
-    void setGradient(QmlGraphicsGradient *gradient);
-
-    qreal radius() const;
-    void setRadius(qreal radius);
-
-    QRectF boundingRect() const;
-
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-
-Q_SIGNALS:
-    void colorChanged();
-    void radiusChanged();
-
-private Q_SLOTS:
-    void doUpdate();
-
-private:
-    void generateRoundedRect();
-    void generateBorderedRect();
-    void drawRect(QPainter &painter);
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsRectangle)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsRectangle)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsPen)
-QML_DECLARE_TYPE(QmlGraphicsGradientStop)
-QML_DECLARE_TYPE(QmlGraphicsGradient)
-QML_DECLARE_TYPE(QmlGraphicsRectangle)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSRECT_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h
deleted file mode 100644
index f91e7e2..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSRECT_P_H
-#define QMLGRAPHICSRECT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsitem_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsGradient;
-class QmlGraphicsRectangle;
-class QmlGraphicsRectanglePrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsRectangle)
-
-public:
-    QmlGraphicsRectanglePrivate() :
-    color(Qt::white), gradient(0), pen(0), radius(0), paintmargin(0)
-    {
-    }
-
-    ~QmlGraphicsRectanglePrivate()
-    {
-        delete pen;
-    }
-
-    void init()
-    {
-    }
-
-    QColor getColor();
-    QColor color;
-    QmlGraphicsGradient *gradient;
-    QmlGraphicsPen *getPen() {
-        if (!pen) {
-            Q_Q(QmlGraphicsRectangle);
-            pen = new QmlGraphicsPen;
-            QObject::connect(pen, SIGNAL(penChanged()), q, SLOT(doUpdate()));
-        }
-        return pen;
-    }
-    QmlGraphicsPen *pen;
-    qreal radius;
-    qreal paintmargin;
-    QPixmap rectImage;
-
-    void setPaintMargin(qreal margin)
-    {
-        Q_Q(QmlGraphicsRectangle);
-        if (margin == paintmargin)
-            return;
-        q->prepareGeometryChange();
-        paintmargin = margin;
-    }
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLGRAPHICSRECT_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
deleted file mode 100644
index 23c3aae..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsrepeater_p.h"
-#include "qmlgraphicsrepeater_p_p.h"
-
-#include "qmlgraphicsvisualitemmodel_p.h"
-
-#include <qmllistaccessor_p.h>
-
-#include <qlistmodelinterface_p.h>
-
-QT_BEGIN_NAMESPACE
-QmlGraphicsRepeaterPrivate::QmlGraphicsRepeaterPrivate()
-: model(0), ownModel(false)
-{
-}
-
-QmlGraphicsRepeaterPrivate::~QmlGraphicsRepeaterPrivate()
-{
-    if (ownModel)
-        delete model;
-}
-
-/*!
-    \qmlclass Repeater QmlGraphicsRepeater
-  \since 4.7
-    \inherits Item
-
-    \brief The Repeater item allows you to repeat a component based on a model.
-
-    The Repeater item is used when you want to create a large number of
-    similar items.  For each entry in the model, an item is instantiated
-    in a context seeded with data from the model.  If the repeater will
-    be instantiating a large number of instances, it may be more efficient to
-    use one of Qt Declarative's \l {xmlViews}{view items}.
-
-    The model may be either an object list, a string list, a number or a Qt model.
-    In each case, the data element and the index is exposed to each instantiated
-    component.  
-    
-    The index is always exposed as an accessible \c index property.
-    In the case of an object or string list, the data element (of type string
-    or object) is available as the \c modelData property.  In the case of a Qt model,
-    all roles are available as named properties just like in the view classes. The
-    following example shows how to use the index property inside the instantiated
-    items.
-
-    \snippet doc/src/snippets/declarative/repeater-index.qml 0
-
-    \image repeater-index.png
-
-    Items instantiated by the Repeater are inserted, in order, as
-    children of the Repeater's parent.  The insertion starts immediately after
-    the repeater's position in its parent stacking list.  This is to allow
-    you to use a Repeater inside a layout.  The following QML example shows how
-    the instantiated items would visually appear stacked between the red and
-    blue rectangles.
-
-    \snippet doc/src/snippets/declarative/repeater.qml 0
-
-    \image repeater.png
-
-    The repeater instance continues to own all items it instantiates, even
-    if they are otherwise manipulated.  It is illegal to manually remove an item
-    created by the Repeater.
- */
-
-/*!
-    \internal
-    \class QmlGraphicsRepeater
-    \qmlclass Repeater
-
-    XXX Repeater is very conservative in how it instatiates/deletes items.  Also
-    new model entries will not be created and old ones will not be removed.
- */
-
-/*!
-    Create a new QmlGraphicsRepeater instance.
- */
-QmlGraphicsRepeater::QmlGraphicsRepeater(QmlGraphicsItem *parent)
-  : QmlGraphicsItem(*(new QmlGraphicsRepeaterPrivate), parent)
-{
-}
-
-/*!
-    Destroy the repeater instance.  All items it instantiated are also
-    destroyed.
- */
-QmlGraphicsRepeater::~QmlGraphicsRepeater()
-{
-}
-
-/*!
-    \qmlproperty any Repeater::model
-
-    The model providing data for the repeater.
-
-    The model may be either an object list, a string list, a number or a Qt model.
-    In each case, the data element and the index is exposed to each instantiated
-    component.  The index is always exposed as an accessible \c index property.
-    In the case of an object or string list, the data element (of type string
-    or object) is available as the \c modelData property.  In the case of a Qt model,
-    all roles are available as named properties just like in the view classes.
-
-    As a special case the model can also be merely a number. In this case it will
-    create that many instances of the component. They will also be assigned an index
-    based on the order they are created.
-
-    Models can also be created directly in QML, using a \l{ListModel} or \l{XmlListModel}.
-
-    \sa {qmlmodels}{Data Models}
-*/
-QVariant QmlGraphicsRepeater::model() const
-{
-    Q_D(const QmlGraphicsRepeater);
-    return d->dataSource;
-}
-
-void QmlGraphicsRepeater::setModel(const QVariant &model)
-{
-    Q_D(QmlGraphicsRepeater);
-    if (d->dataSource == model)
-        return;
-
-    clear();
-    if (d->model) {
-        disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
-        disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
-        disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
-        /*
-        disconnect(d->model, SIGNAL(createdItem(int, QmlGraphicsItem*)), this, SLOT(createdItem(int,QmlGraphicsItem*)));
-        disconnect(d->model, SIGNAL(destroyingItem(QmlGraphicsItem*)), this, SLOT(destroyingItem(QmlGraphicsItem*)));
-    */
-    }
-    d->dataSource = model;
-    emit modelChanged();
-    QObject *object = qvariant_cast<QObject*>(model);
-    QmlGraphicsVisualModel *vim = 0;
-    if (object && (vim = qobject_cast<QmlGraphicsVisualModel *>(object))) {
-        if (d->ownModel) {
-            delete d->model;
-            d->ownModel = false;
-        }
-        d->model = vim;
-    } else {
-        if (!d->ownModel) {
-            d->model = new QmlGraphicsVisualDataModel(qmlContext(this));
-            d->ownModel = true;
-        }
-        if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model))
-            dataModel->setModel(model);
-    }
-    if (d->model) {
-        connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
-        connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
-        connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
-        /*
-        connect(d->model, SIGNAL(createdItem(int, QmlGraphicsItem*)), this, SLOT(createdItem(int,QmlGraphicsItem*)));
-        connect(d->model, SIGNAL(destroyingItem(QmlGraphicsItem*)), this, SLOT(destroyingItem(QmlGraphicsItem*)));
-        */
-        regenerate();
-        emit countChanged();
-    }
-}
-
-/*!
-    \qmlproperty Component Repeater::delegate
-    \default
-
-    The delegate provides a template defining each item instantiated by the repeater.
-    The index is exposed as an accessible \c index property.  Properties of the
-    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
- */
-QmlComponent *QmlGraphicsRepeater::delegate() const
-{
-    Q_D(const QmlGraphicsRepeater);
-    if (d->model) {
-        if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model))
-            return dataModel->delegate();
-    }
-
-    return 0;
-}
-
-void QmlGraphicsRepeater::setDelegate(QmlComponent *delegate)
-{
-    Q_D(QmlGraphicsRepeater);
-    if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model))
-       if (delegate == dataModel->delegate())
-           return;
-
-    if (!d->ownModel) {
-        d->model = new QmlGraphicsVisualDataModel(qmlContext(this));
-        d->ownModel = true;
-    }
-    if (QmlGraphicsVisualDataModel *dataModel = qobject_cast<QmlGraphicsVisualDataModel*>(d->model)) {
-        dataModel->setDelegate(delegate);
-        regenerate();
-        emit delegateChanged();
-    }
-}
-
-/*!
-    \qmlproperty int Repeater::count
-
-    This property holds the number of items in the repeater.
-*/
-int QmlGraphicsRepeater::count() const
-{
-    Q_D(const QmlGraphicsRepeater);
-    if (d->model)
-        return d->model->count();
-    return 0;
-}
-
-
-/*!
-    \internal
- */
-void QmlGraphicsRepeater::componentComplete()
-{
-    QmlGraphicsItem::componentComplete();
-    regenerate();
-}
-
-/*!
-    \internal
- */
-QVariant QmlGraphicsRepeater::itemChange(GraphicsItemChange change,
-                                       const QVariant &value)
-{
-    QVariant rv = QmlGraphicsItem::itemChange(change, value);
-    if (change == ItemParentHasChanged) {
-        regenerate();
-    }
-
-    return rv;
-}
-
-void QmlGraphicsRepeater::clear()
-{
-    Q_D(QmlGraphicsRepeater);
-    if (d->model) {
-        foreach (QmlGraphicsItem *item, d->deletables) {
-            item->setParentItem(this);
-            d->model->release(item);
-        }
-    }
-    d->deletables.clear();
-}
-
-/*!
-    \internal
- */
-void QmlGraphicsRepeater::regenerate()
-{
-    Q_D(QmlGraphicsRepeater);
-
-    clear();
-
-    if (!d->model || !d->model->count() || !d->model->isValid() || !parentItem() || !isComponentComplete())
-        return;
-
-    for (int ii = 0; ii < count(); ++ii) {
-        QmlGraphicsItem *item = d->model->item(ii);
-        if (item) {
-            item->setParent(parentItem());
-            item->stackBefore(this);
-            d->deletables << item;
-        }
-    }
-}
-
-void QmlGraphicsRepeater::itemsInserted(int, int)
-{
-    regenerate();
-}
-
-void QmlGraphicsRepeater::itemsRemoved(int, int)
-{
-    regenerate();
-}
-
-void QmlGraphicsRepeater::itemsMoved(int,int,int)
-{
-    regenerate();
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
deleted file mode 100644
index 2324916..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSREPEATER_H
-#define QMLGRAPHICSREPEATER_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsRepeaterPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsRepeater : public QmlGraphicsItem
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged)
-    Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_CLASSINFO("DefaultProperty", "delegate")
-
-public:
-    QmlGraphicsRepeater(QmlGraphicsItem *parent=0);
-    virtual ~QmlGraphicsRepeater();
-
-    QVariant model() const;
-    void setModel(const QVariant &);
-
-    QmlComponent *delegate() const;
-    void setDelegate(QmlComponent *);
-
-    int count() const;
-
-Q_SIGNALS:
-    void modelChanged();
-    void delegateChanged();
-    void countChanged();
-private:
-    void clear();
-    void regenerate();
-
-protected:
-    virtual void componentComplete();
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
-
-private Q_SLOTS:
-    void itemsInserted(int,int);
-    void itemsRemoved(int,int);
-    void itemsMoved(int,int,int);
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsRepeater)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsRepeater)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsRepeater)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSREPEATER_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h
deleted file mode 100644
index 5680288..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSREPEATER_P_H
-#define QMLGRAPHICSREPEATER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsrepeater_p.h"
-
-#include "qmlgraphicsitem_p.h"
-
-#include <QPointer>
-
-QT_BEGIN_NAMESPACE
-
-class QmlContext;
-class QmlGraphicsVisualModel;
-class QmlGraphicsRepeaterPrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsRepeater)
-
-public:
-    QmlGraphicsRepeaterPrivate();
-    ~QmlGraphicsRepeaterPrivate();
-
-    QmlGraphicsVisualModel *model;
-    QVariant dataSource;
-    bool ownModel;
-
-    QList<QPointer<QmlGraphicsItem> > deletables;
-};
-
-QT_END_NAMESPACE
-#endif // QMLGRAPHICSREPEATER_P_H
diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp b/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp
deleted file mode 100644
index 1956939..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsscalegrid_p_p.h"
-
-#include <qml.h>
-
-#include <QBuffer>
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-/*!
-    \internal
-    \class QmlGraphicsScaleGrid
-    \brief The QmlGraphicsScaleGrid class allows you to specify a 3x3 grid to use in scaling an image.
-*/
-
-QmlGraphicsScaleGrid::QmlGraphicsScaleGrid(QObject *parent) : QObject(parent), _left(0), _top(0), _right(0), _bottom(0)
-{
-}
-
-QmlGraphicsScaleGrid::~QmlGraphicsScaleGrid()
-{
-}
-
-bool QmlGraphicsScaleGrid::isNull() const
-{
-    return !_left && !_top && !_right && !_bottom;
-}
-
-void QmlGraphicsScaleGrid::setLeft(int pos)
-{
-    if (_left != pos) {
-        _left = pos;
-        emit borderChanged();
-    }
-}
-
-void QmlGraphicsScaleGrid::setTop(int pos)
-{
-    if (_top != pos) {
-        _top = pos;
-        emit borderChanged();
-    }
-}
-
-void QmlGraphicsScaleGrid::setRight(int pos)
-{
-    if (_right != pos) {
-        _right = pos;
-        emit borderChanged();
-    }
-}
-
-void QmlGraphicsScaleGrid::setBottom(int pos)
-{
-    if (_bottom != pos) {
-        _bottom = pos;
-        emit borderChanged();
-    }
-}
-
-QmlGraphicsGridScaledImage::QmlGraphicsGridScaledImage()
-: _l(-1), _r(-1), _t(-1), _b(-1),
-  _h(QmlGraphicsBorderImage::Stretch), _v(QmlGraphicsBorderImage::Stretch)
-{
-}
-
-QmlGraphicsGridScaledImage::QmlGraphicsGridScaledImage(const QmlGraphicsGridScaledImage &o)
-: _l(o._l), _r(o._r), _t(o._t), _b(o._b), _h(o._h), _v(o._v), _pix(o._pix)
-{
-}
-
-QmlGraphicsGridScaledImage &QmlGraphicsGridScaledImage::operator=(const QmlGraphicsGridScaledImage &o)
-{
-    _l = o._l;
-    _r = o._r;
-    _t = o._t;
-    _b = o._b;
-    _h = o._h;
-    _v = o._v;
-    _pix = o._pix;
-    return *this;
-}
-
-QmlGraphicsGridScaledImage::QmlGraphicsGridScaledImage(QIODevice *data)
-: _l(-1), _r(-1), _t(-1), _b(-1), _h(QmlGraphicsBorderImage::Stretch), _v(QmlGraphicsBorderImage::Stretch)
-{
-    int l = -1;
-    int r = -1;
-    int t = -1;
-    int b = -1;
-    QString imgFile;
-
-    while(!data->atEnd()) {
-        QString line = QString::fromUtf8(data->readLine().trimmed());
-        if (line.isEmpty() || line.startsWith(QLatin1Char('#')))
-            continue;
-
-        QStringList list = line.split(QLatin1Char(':'));
-        if (list.count() != 2)
-            return;
-
-        list[0] = list[0].trimmed();
-        list[1] = list[1].trimmed();
-
-        if (list[0] == QLatin1String("border.left"))
-            l = list[1].toInt();
-        else if (list[0] == QLatin1String("border.right"))
-            r = list[1].toInt();
-        else if (list[0] == QLatin1String("border.top"))
-            t = list[1].toInt();
-        else if (list[0] == QLatin1String("border.bottom"))
-            b = list[1].toInt();
-        else if (list[0] == QLatin1String("source"))
-            imgFile = list[1];
-        else if (list[0] == QLatin1String("horizontalTileRule"))
-            _h = stringToRule(list[1]);
-        else if (list[0] == QLatin1String("verticalTileRule"))
-            _v = stringToRule(list[1]);
-    }
-
-    if (l < 0 || r < 0 || t < 0 || b < 0 || imgFile.isEmpty())
-        return;
-
-    _l = l; _r = r; _t = t; _b = b;
-
-    _pix = imgFile;
-}
-
-QmlGraphicsBorderImage::TileMode QmlGraphicsGridScaledImage::stringToRule(const QString &s)
-{
-    if (s == QLatin1String("Stretch"))
-        return QmlGraphicsBorderImage::Stretch;
-    if (s == QLatin1String("Repeat"))
-        return QmlGraphicsBorderImage::Repeat;
-    if (s == QLatin1String("Round"))
-        return QmlGraphicsBorderImage::Round;
-
-    qWarning() << "Unknown tile rule specified. Using Stretch";
-    return QmlGraphicsBorderImage::Stretch;
-}
-
-bool QmlGraphicsGridScaledImage::isValid() const
-{
-    return _l >= 0;
-}
-
-int QmlGraphicsGridScaledImage::gridLeft() const
-{
-    return _l;
-}
-
-int QmlGraphicsGridScaledImage::gridRight() const
-{
-    return _r;
-}
-
-int QmlGraphicsGridScaledImage::gridTop() const
-{
-    return _t;
-}
-
-int QmlGraphicsGridScaledImage::gridBottom() const
-{
-    return _b;
-}
-
-QString QmlGraphicsGridScaledImage::pixmapUrl() const
-{
-    return _pix;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
deleted file mode 100644
index 650be62..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSSCALEGRID_H
-#define QMLGRAPHICSSCALEGRID_H
-
-#include "qmlgraphicsborderimage_p.h"
-
-#include "../util/qmlpixmapcache_p.h"
-#include <qml.h>
-
-#include <QtCore/QString>
-#include <QtCore/QObject>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsScaleGrid : public QObject
-{
-    Q_OBJECT
-    Q_ENUMS(TileRule)
-
-    Q_PROPERTY(int left READ left WRITE setLeft NOTIFY borderChanged)
-    Q_PROPERTY(int top READ top WRITE setTop NOTIFY borderChanged)
-    Q_PROPERTY(int right READ right WRITE setRight NOTIFY borderChanged)
-    Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY borderChanged)
-
-public:
-    QmlGraphicsScaleGrid(QObject *parent=0);
-    ~QmlGraphicsScaleGrid();
-
-    bool isNull() const;
-
-    int left() const { return _left; }
-    void setLeft(int);
-
-    int top() const { return _top; }
-    void setTop(int);
-
-    int right() const { return _right; }
-    void setRight(int);
-
-    int  bottom() const { return _bottom; }
-    void setBottom(int);
-
-Q_SIGNALS:
-    void borderChanged();
-
-private:
-    int _left;
-    int _top;
-    int _right;
-    int _bottom;
-};
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsGridScaledImage
-{
-public:
-    QmlGraphicsGridScaledImage();
-    QmlGraphicsGridScaledImage(const QmlGraphicsGridScaledImage &);
-    QmlGraphicsGridScaledImage(QIODevice*);
-    QmlGraphicsGridScaledImage &operator=(const QmlGraphicsGridScaledImage &);
-    bool isValid() const;
-    int gridLeft() const;
-    int gridRight() const;
-    int gridTop() const;
-    int gridBottom() const;
-    QmlGraphicsBorderImage::TileMode horizontalTileRule() const { return _h; }
-    QmlGraphicsBorderImage::TileMode verticalTileRule() const { return _v; }
-
-    QString pixmapUrl() const;
-
-private:
-    static QmlGraphicsBorderImage::TileMode stringToRule(const QString &);
-
-private:
-    int _l;
-    int _r;
-    int _t;
-    int _b;
-    QmlGraphicsBorderImage::TileMode _h;
-    QmlGraphicsBorderImage::TileMode _v;
-    QString _pix;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsScaleGrid)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSSCALEGRID_H
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
deleted file mode 100644
index 57b44d2..0000000
--- a/src/declarative/graphicsitems/qmlgraphicstext.cpp
+++ /dev/null
@@ -1,936 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicstext_p.h"
-#include "qmlgraphicstext_p_p.h"
-#include <qmlstyledtext_p.h>
-
-#include <qfxperf_p_p.h>
-
-#include <QTextLayout>
-#include <QTextLine>
-#include <QTextDocument>
-#include <QTextCursor>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#include <QAbstractTextDocumentLayout>
-#include <qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass Text QmlGraphicsText
-  \since 4.7
-    \brief The Text item allows you to add formatted text to a scene.
-    \inherits Item
-
-    It can display both plain and rich text. For example:
-
-    \qml
-    Text { text: "Hello World!"; font.family: "Helvetica"; font.pointSize: 24; color: "red" }
-    Text { text: "<b>Hello</b> <i>World!</i>" }
-    \endqml
-
-    \image declarative-text.png
-
-    If height and width are not explicitly set, Text will attempt to determine how
-    much room is needed and set it accordingly. Unless \c wrap is set, it will always
-    prefer width to height (all text will be placed on a single line).
-
-    The \c elide property can alternatively be used to fit a single line of
-    plain text to a set width.
-
-    Text provides read-only text. For editable text, see \l TextEdit.
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsText
-    \qmlclass Text
-    \ingroup group_coreitems
-
-    \brief The QmlGraphicsText class provides a formatted text item that you can add to a QmlView.
-
-    Text was designed for read-only text; it does not allow for any text editing.
-    It can display both plain and rich text. For example:
-
-    \qml
-    Text { text: "Hello World!"; font.family: "Helvetica"; font.pointSize: 24; color: "red" }
-    Text { text: "<b>Hello</b> <i>World!</i>" }
-    \endqml
-
-    \image text.png
-
-    If height and width are not explicitly set, Text will attempt to determine how
-    much room is needed and set it accordingly. Unless \c wrap is set, it will always
-    prefer width to height (all text will be placed on a single line).
-
-    The \c elide property can alternatively be used to fit a line of plain text to a set width.
-
-    A QmlGraphicsText object can be instantiated in Qml using the tag \c Text.
-*/
-QmlGraphicsText::QmlGraphicsText(QmlGraphicsItem *parent)
-  : QmlGraphicsItem(*(new QmlGraphicsTextPrivate), parent)
-{
-    setAcceptedMouseButtons(Qt::LeftButton);
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
-}
-
-QmlGraphicsText::~QmlGraphicsText()
-{
-}
-
-
-QmlGraphicsTextPrivate::~QmlGraphicsTextPrivate()
-{
-}
-
-/*!
-    \qmlproperty string Text::font.family
-    \qmlproperty bool Text::font.bold
-    \qmlproperty bool Text::font.italic
-    \qmlproperty bool Text::font.underline
-    \qmlproperty real Text::font.pointSize
-    \qmlproperty int Text::font.pixelSize
-
-    Set the Text's font attributes.
-*/
-QFont QmlGraphicsText::font() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->font;
-}
-
-void QmlGraphicsText::setFont(const QFont &font)
-{
-    Q_D(QmlGraphicsText);
-    if (d->font == font)
-        return;
-
-    d->font = font;
-
-    d->updateLayout();
-    d->markImgDirty();
-    emit fontChanged(d->font);
-}
-
-void QmlGraphicsText::setText(const QString &n)
-{
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::QmlGraphicsText_setText> st;
-#endif
-    Q_D(QmlGraphicsText);
-    if (d->text == n)
-        return;
-
-    d->richText = d->format == RichText || (d->format == AutoText && Qt::mightBeRichText(n));
-    if (d->richText) {
-        if (!d->doc) {
-            d->doc = new QTextDocument(this);
-            d->doc->setDocumentMargin(0);
-        }
-        d->doc->setHtml(n);
-    }
-
-    d->text = n;
-    d->updateLayout();
-    d->markImgDirty();
-    emit textChanged(d->text);
-}
-
-/*!
-    \qmlproperty string Text::text
-
-    The text to display.  Text supports both plain and rich text strings.
-
-    The item will try to automatically determine whether the text should
-    be treated as rich text. This determination is made using Qt::mightBeRichText().
-*/
-QString QmlGraphicsText::text() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->text;
-}
-
-void QmlGraphicsText::setColor(const QColor &color)
-{
-    Q_D(QmlGraphicsText);
-    if (d->color == color)
-        return;
-
-    d->color = color;
-    d->markImgDirty();
-    emit colorChanged(d->color);
-}
-
-/*!
-    \qmlproperty color Text::color
-
-    The text color.
-
-    \qml
-    //green text using hexadecimal notation
-    Text { color: "#00FF00"; ... }
-
-    //steelblue text using SVG color name
-    Text { color: "steelblue"; ... }
-    \endqml
-*/
-
-QColor QmlGraphicsText::color() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->color;
-}
-
-/*!
-    \qmlproperty enumeration Text::style
-
-    Set an additional text style.
-
-    Supported text styles are \c Normal, \c Outline, \c Raised and \c Sunken.
-
-    \qml
-    Row {
-        Text { font.pointSize: 24; text: "Normal" }
-        Text { font.pointSize: 24; text: "Raised";  style: Text.Raised;  styleColor: "#AAAAAA" }
-        Text { font.pointSize: 24; text: "Outline"; style: Text.Outline; styleColor: "red" }
-        Text { font.pointSize: 24; text: "Sunken";  style: Text.Sunken;  styleColor: "#AAAAAA" }
-    }
-    \endqml
-
-    \image declarative-textstyle.png
-*/
-QmlGraphicsText::TextStyle QmlGraphicsText::style() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->style;
-}
-
-void QmlGraphicsText::setStyle(QmlGraphicsText::TextStyle style)
-{
-    Q_D(QmlGraphicsText);
-    if (d->style == style)
-        return;
-
-    d->style = style;
-    d->markImgDirty();
-    emit styleChanged(d->style);
-}
-
-void QmlGraphicsText::setStyleColor(const QColor &color)
-{
-    Q_D(QmlGraphicsText);
-    if (d->styleColor == color)
-        return;
-
-    d->styleColor = color;
-    d->markImgDirty();
-    emit styleColorChanged(d->styleColor);
-}
-
-/*!
-    \qmlproperty color Text::styleColor
-
-    Defines the secondary color used by text styles.
-
-    \c styleColor is used as the outline color for outlined text, and as the
-    shadow color for raised or sunken text. If no style has been set, it is not
-    used at all.
- */
-QColor QmlGraphicsText::styleColor() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->styleColor;
-}
-
-/*!
-    \qmlproperty enumeration Text::horizontalAlignment
-    \qmlproperty enumeration Text::verticalAlignment
-
-    Sets the horizontal and vertical alignment of the text within the Text items
-    width and height.  By default, the text is top-left aligned.
-
-    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
-    \c AlignHCenter.  The valid values for \c verticalAlignment are \c AlignTop, \c AlignBottom
-    and \c AlignVCenter.
-*/
-QmlGraphicsText::HAlignment QmlGraphicsText::hAlign() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->hAlign;
-}
-
-void QmlGraphicsText::setHAlign(HAlignment align)
-{
-    Q_D(QmlGraphicsText);
-    if (d->hAlign == align)
-        return;
-
-    d->hAlign = align;
-    emit horizontalAlignmentChanged(align);
-}
-
-QmlGraphicsText::VAlignment QmlGraphicsText::vAlign() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->vAlign;
-}
-
-void QmlGraphicsText::setVAlign(VAlignment align)
-{
-    Q_D(QmlGraphicsText);
-    if (d->vAlign == align)
-        return;
-
-    d->vAlign = align;
-    emit verticalAlignmentChanged(align);
-}
-
-/*!
-    \qmlproperty bool Text::wrap
-
-    Set this property to wrap the text to the Text item's width.  The text will only
-    wrap if an explicit width has been set.
-
-    Wrapping is done on word boundaries (i.e. it is a "word-wrap"). If the text cannot be
-    word-wrapped to the specified width it will be partially drawn outside of the item's bounds.
-    If this is undesirable then enable clipping on the item (Item::clip).
-
-    Wrapping is off by default.
-*/
-//### Future may provide choice of wrap modes, such as QTextOption::WrapAtWordBoundaryOrAnywhere
-bool QmlGraphicsText::wrap() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->wrap;
-}
-
-void QmlGraphicsText::setWrap(bool w)
-{
-    Q_D(QmlGraphicsText);
-    if (w == d->wrap)
-        return;
-
-    d->wrap = w;
-
-    d->updateLayout();
-    d->markImgDirty();
-    emit wrapChanged(d->wrap);
-}
-
-/*!
-    \qmlproperty enumeration Text::textFormat
-
-    The way the text property should be displayed.
-
-    Supported text formats are \c AutoText, \c PlainText, \c RichText and \c StyledText
-
-    The default is AutoText.  If the text format is AutoText the text element
-    will automatically determine whether the text should be treated as
-    rich text.  This determination is made using Qt::mightBeRichText().
-
-    StyledText is an optimized format supporting some basic text
-    styling markup, in the style of html 3.2:
-
-    \code
-    <font size="4" color="#ff0000">font size and color</font>
-    <b>bold</b>
-    <i>italic</i>
-    <br>
-    &gt; &lt; &amp;
-    \endcode
-
-    \c StyledText parser is strict, requiring tags to be correctly nested.
-
-    \table
-    \row
-    \o
-    \qml
-Column {
-    TextEdit {
-        font.pointSize: 24
-        text: "<b>Hello</b> <i>World!</i>"
-    }
-    TextEdit {
-        font.pointSize: 24
-        textFormat: "RichText"
-        text: "<b>Hello</b> <i>World!</i>"
-    }
-    TextEdit {
-        font.pointSize: 24
-        textFormat: "PlainText"
-        text: "<b>Hello</b> <i>World!</i>"
-    }
-}
-    \endqml
-    \o \image declarative-textformat.png
-    \endtable
-*/
-
-QmlGraphicsText::TextFormat QmlGraphicsText::textFormat() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->format;
-}
-
-void QmlGraphicsText::setTextFormat(TextFormat format)
-{
-    Q_D(QmlGraphicsText);
-    if (format == d->format)
-        return;
-    d->format = format;
-    bool wasRich = d->richText;
-    d->richText = format == RichText || (format == AutoText && Qt::mightBeRichText(d->text));
-
-    if (wasRich && !d->richText) {
-        //### delete control? (and vice-versa below)
-        d->updateLayout();
-        d->markImgDirty();
-    } else if (!wasRich && d->richText) {
-        if (!d->doc) {
-            d->doc = new QTextDocument(this);
-            d->doc->setDocumentMargin(0);
-        }
-        d->doc->setHtml(d->text);
-        d->updateLayout();
-        d->markImgDirty();
-    }
-
-    emit textFormatChanged(d->format);
-}
-
-/*!
-    \qmlproperty enumeration Text::elide
-
-    Set this property to elide parts of the text fit to the Text item's width.
-    The text will only elide if an explicit width has been set.
-
-    This property cannot be used with wrap enabled or with rich text.
-
-    Eliding can be \c ElideNone (the default), \c ElideLeft, \c ElideMiddle, or \c ElideRight.
-
-    If the text is a multi-length string, and the mode is not \c ElideNone,
-    the first string that fits will be used, otherwise the last will be elided.
-
-    Multi-length strings are ordered from longest to shortest, separated by the
-    Unicode "String Terminator" character \c U009C (write this in QML with \c{"\u009C"} or \c{"\x9C"}).
-*/
-QmlGraphicsText::TextElideMode QmlGraphicsText::elideMode() const
-{
-    Q_D(const QmlGraphicsText);
-    return d->elideMode;
-}
-
-void QmlGraphicsText::setElideMode(QmlGraphicsText::TextElideMode mode)
-{
-    Q_D(QmlGraphicsText);
-    if (mode == d->elideMode)
-        return;
-
-    d->elideMode = mode;
-
-    d->updateLayout();
-    d->markImgDirty();
-    emit elideModeChanged(d->elideMode);
-}
-
-void QmlGraphicsText::geometryChanged(const QRectF &newGeometry,
-                              const QRectF &oldGeometry)
-{
-    Q_D(QmlGraphicsText);
-    if (newGeometry.width() != oldGeometry.width()) {
-        if (d->wrap || d->elideMode != QmlGraphicsText::ElideNone) {
-            //re-elide if needed
-            if (d->singleline && d->elideMode != QmlGraphicsText::ElideNone &&
-                isComponentComplete() && widthValid()) {
-
-                QFontMetrics fm(d->font);
-                QString tmp = fm.elidedText(d->text,(Qt::TextElideMode)d->elideMode,width()); // XXX still worth layout...?
-                d->layout.setText(tmp);
-            }
-
-            d->imgDirty = true;
-            d->updateSize();
-        }
-    }
-    QmlGraphicsItem::geometryChanged(newGeometry, oldGeometry);
-}
-
-void QmlGraphicsTextPrivate::updateLayout()
-{
-    Q_Q(QmlGraphicsText);
-    if (q->isComponentComplete()) {
-        //setup instance of QTextLayout for all cases other than richtext
-        if (!richText) {
-            layout.clearLayout();
-            layout.setFont(font);
-            if (format != QmlGraphicsText::StyledText) {
-                QString tmp = text;
-                tmp.replace(QLatin1Char('\n'), QChar::LineSeparator);
-                singleline = !tmp.contains(QChar::LineSeparator);
-                if (singleline && elideMode != QmlGraphicsText::ElideNone && q->widthValid()) {
-                    QFontMetrics fm(font);
-                    tmp = fm.elidedText(tmp,(Qt::TextElideMode)elideMode,q->width()); // XXX still worth layout...?
-                }
-                layout.setText(tmp);
-            } else {
-                singleline = false;
-                QmlStyledText::parse(text, layout);
-            }
-        }
-        updateSize();
-    } else {
-        dirty = true;
-    }
-}
-
-void QmlGraphicsTextPrivate::updateSize()
-{
-    Q_Q(QmlGraphicsText);
-    if (q->isComponentComplete()) {
-        QFontMetrics fm(font);
-        if (text.isEmpty()) {
-            q->setImplicitHeight(fm.height());
-            return;
-        }
-
-        int dy = q->height();
-        QSize size(0, 0);
-
-        //setup instance of QTextLayout for all cases other than richtext
-        if (!richText) {
-            size = setupTextLayout(&layout);
-            cachedLayoutSize = size;
-            dy -= size.height();
-        } else {
-            singleline = false; // richtext can't elide or be optimized for single-line case
-            doc->setDefaultFont(font);
-            QTextOption option((Qt::Alignment)int(hAlign | vAlign));
-            if (wrap)
-                option.setWrapMode(QTextOption::WordWrap);
-            else
-                option.setWrapMode(QTextOption::NoWrap);
-            doc->setDefaultTextOption(option);
-            if (wrap && !q->heightValid() && q->widthValid())
-                doc->setTextWidth(q->width());
-            else
-                doc->setTextWidth(doc->idealWidth()); // ### Text does not align if width is not set (QTextDoc bug)
-            dy -= (int)doc->size().height();
-            cachedLayoutSize = doc->size().toSize();
-        }
-        int yoff = 0;
-
-        if (q->heightValid()) {
-            if (vAlign == QmlGraphicsText::AlignBottom)
-                yoff = dy;
-            else if (vAlign == QmlGraphicsText::AlignVCenter)
-                yoff = dy/2;
-        }
-        q->setBaselineOffset(fm.ascent() + yoff);
-
-        //### need to comfirm cost of always setting these for richText
-        q->setImplicitWidth(richText ? (int)doc->idealWidth() : size.width());
-        q->setImplicitHeight(richText ? (int)doc->size().height() : size.height());
-    } else {
-        dirty = true;
-    }
-}
-
-// ### text layout handling should be profiled and optimized as needed
-// what about QStackTextEngine engine(tmp, d->font.font()); QTextLayout textLayout(&engine);
-
-void QmlGraphicsTextPrivate::drawOutline()
-{
-    QPixmap img = QPixmap(imgStyleCache.width()+2,imgStyleCache.height()+2);
-    img.fill(Qt::transparent);
-
-    QPainter ppm(&img);
-
-    QPoint pos(imgCache.rect().topLeft());
-    pos += QPoint(-1, 0);
-    ppm.drawPixmap(pos, imgStyleCache);
-    pos += QPoint(2, 0);
-    ppm.drawPixmap(pos, imgStyleCache);
-    pos += QPoint(-1, -1);
-    ppm.drawPixmap(pos, imgStyleCache);
-    pos += QPoint(0, 2);
-    ppm.drawPixmap(pos, imgStyleCache);
-
-    pos += QPoint(0, -1);
-    ppm.drawPixmap(pos, imgCache);
-    ppm.end();
-
-    imgCache = img;
-}
-
-void QmlGraphicsTextPrivate::drawOutline(int yOffset)
-{
-    QPixmap img = QPixmap(imgStyleCache.width()+2,imgStyleCache.height()+2);
-    img.fill(Qt::transparent);
-
-    QPainter ppm(&img);
-
-    QPoint pos(imgCache.rect().topLeft());
-    pos += QPoint(0, yOffset);
-    ppm.drawPixmap(pos, imgStyleCache);
-
-    pos += QPoint(0, -yOffset);
-    ppm.drawPixmap(pos, imgCache);
-    ppm.end();
-
-    imgCache = img;
-}
-
-QSize QmlGraphicsTextPrivate::setupTextLayout(QTextLayout *layout)
-{
-    Q_Q(QmlGraphicsText);
-    layout->setCacheEnabled(true);
-
-    int height = 0;
-    qreal widthUsed = 0;
-    qreal lineWidth = 0;
-
-    //set manual width
-    if ((wrap || elideMode != QmlGraphicsText::ElideNone) && q->widthValid())
-        lineWidth = q->width();
-
-    layout->beginLayout();
-
-    while (1) {
-        QTextLine line = layout->createLine();
-        if (!line.isValid())
-            break;
-
-        if ((wrap || elideMode != QmlGraphicsText::ElideNone) && q->widthValid())
-            line.setLineWidth(lineWidth);
-    }
-    layout->endLayout();
-
-    int x = 0;
-    for (int i = 0; i < layout->lineCount(); ++i) {
-        QTextLine line = layout->lineAt(i);
-        widthUsed = qMax(widthUsed, line.naturalTextWidth());
-        line.setPosition(QPointF(0, height));
-        height += int(line.height());
-
-        if (!cache) {
-            if (hAlign == QmlGraphicsText::AlignLeft) {
-                x = 0;
-            } else if (hAlign == QmlGraphicsText::AlignRight) {
-                x = q->width() - (int)line.naturalTextWidth();
-            } else if (hAlign == QmlGraphicsText::AlignHCenter) {
-                x = (q->width() - (int)line.naturalTextWidth()) / 2;
-            }
-            line.setPosition(QPoint(x, (int)line.y()));
-        }
-    }
-
-    return QSize(qCeil(widthUsed), height);
-}
-
-QPixmap QmlGraphicsTextPrivate::wrappedTextImage(bool drawStyle)
-{
-    //do layout
-    QSize size = cachedLayoutSize;
-
-    int x = 0;
-    for (int i = 0; i < layout.lineCount(); ++i) {
-        QTextLine line = layout.lineAt(i);
-        if (hAlign == QmlGraphicsText::AlignLeft) {
-            x = 0;
-        } else if (hAlign == QmlGraphicsText::AlignRight) {
-            x = size.width() - (int)line.naturalTextWidth();
-        } else if (hAlign == QmlGraphicsText::AlignHCenter) {
-            x = (size.width() - (int)line.naturalTextWidth()) / 2;
-        }
-        line.setPosition(QPoint(x, (int)line.y()));
-    }
-
-    //paint text
-    QPixmap img(size);
-    if (!size.isEmpty()) {
-        img.fill(Qt::transparent);
-        QPainter p(&img);
-        drawWrappedText(&p, QPointF(0,0), drawStyle);
-    }
-    return img;
-}
-
-void QmlGraphicsTextPrivate::drawWrappedText(QPainter *p, const QPointF &pos, bool drawStyle)
-{
-    if (drawStyle)
-        p->setPen(styleColor);
-    else
-        p->setPen(color);
-    p->setFont(font);
-    layout.draw(p, pos);
-}
-
-QPixmap QmlGraphicsTextPrivate::richTextImage(bool drawStyle)
-{
-    QSize size = doc->size().toSize();
-
-    //paint text
-    QPixmap img(size);
-    img.fill(Qt::transparent);
-    QPainter p(&img);
-
-    QAbstractTextDocumentLayout::PaintContext context;
-
-    if (drawStyle) {
-        context.palette.setColor(QPalette::Text, styleColor);
-        // ### Do we really want this?
-        QTextOption colorOption;
-        colorOption.setFlags(QTextOption::SuppressColors);
-        doc->setDefaultTextOption(colorOption);
-    } else {
-        context.palette.setColor(QPalette::Text, color);
-    }
-    doc->documentLayout()->draw(&p, context);
-    if (drawStyle)
-        doc->setDefaultTextOption(QTextOption());
-    return img;
-}
-
-void QmlGraphicsTextPrivate::checkImgCache()
-{
-    if (!imgDirty)
-        return;
-
-    bool empty = text.isEmpty();
-    if (empty) {
-        imgCache = QPixmap();
-        imgStyleCache = QPixmap();
-    } else if (richText) {
-        imgCache = richTextImage(false);
-        if (style != QmlGraphicsText::Normal)
-            imgStyleCache = richTextImage(true); //### should use styleColor
-    } else {
-        imgCache = wrappedTextImage(false);
-        if (style != QmlGraphicsText::Normal)
-            imgStyleCache = wrappedTextImage(true); //### should use styleColor
-    }
-    if (!empty)
-        switch (style) {
-        case QmlGraphicsText::Outline:
-            drawOutline();
-            break;
-        case QmlGraphicsText::Sunken:
-            drawOutline(-1);
-            break;
-        case QmlGraphicsText::Raised:
-            drawOutline(1);
-            break;
-        default:
-            break;
-        }
-
-    imgDirty = false;
-}
-
-void QmlGraphicsText::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    Q_D(QmlGraphicsText);
-
-    if (d->cache || d->style != Normal) {
-        d->checkImgCache();
-        if (d->imgCache.isNull())
-            return;
-
-        bool oldAA = p->testRenderHint(QPainter::Antialiasing);
-        bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
-        if (d->smooth)
-            p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
-
-        int w = width();
-        int h = height();
-
-        int x = 0;
-        int y = 0;
-
-        switch (d->hAlign) {
-        case AlignLeft:
-            x = 0;
-            break;
-        case AlignRight:
-            x = w - d->imgCache.width();
-            break;
-        case AlignHCenter:
-            x = (w - d->imgCache.width()) / 2;
-            break;
-        }
-
-        switch (d->vAlign) {
-        case AlignTop:
-            y = 0;
-            break;
-        case AlignBottom:
-            y = h - d->imgCache.height();
-            break;
-        case AlignVCenter:
-            y = (h - d->imgCache.height()) / 2;
-            break;
-        }
-
-        bool needClip = !clip() && (d->imgCache.width() > width() ||
-                                    d->imgCache.height() > height());
-
-        if (needClip) {
-            p->save();
-            p->setClipRect(boundingRect(), Qt::IntersectClip);
-        }
-        p->drawPixmap(x, y, d->imgCache);
-        if (needClip)
-            p->restore();
-
-        if (d->smooth) {
-            p->setRenderHint(QPainter::Antialiasing, oldAA);
-            p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
-        }
-    } else {
-        int h = height();
-        int y = 0;
-
-        switch (d->vAlign) {
-        case AlignTop:
-            y = 0;
-            break;
-        case AlignBottom:
-            y = h - d->cachedLayoutSize.height();
-            break;
-        case AlignVCenter:
-            y = (h - d->cachedLayoutSize.height()) / 2;
-            break;
-        }
-        bool needClip = !clip() && (d->cachedLayoutSize.width() > width() ||
-                                    d->cachedLayoutSize.height() > height());
-
-        if (needClip) {
-            p->save();
-            p->setClipRect(boundingRect(), Qt::IntersectClip);
-        }
-        if (d->richText) {
-            QAbstractTextDocumentLayout::PaintContext context;
-            context.palette.setColor(QPalette::Text, d->color);
-            p->translate(0, y);
-            d->doc->documentLayout()->draw(p, context);
-            p->translate(0, -y);
-        } else {
-            d->drawWrappedText(p, QPointF(0,y), false);
-        }
-        if (needClip)
-            p->restore();
-    }
-}
-
-/*!
-    \qmlproperty bool Text::smooth
-
-    Set this property if you want the text to be smoothly scaled or
-    transformed.  Smooth filtering gives better visual quality, but is slower.  If
-    the item is displayed at its natural size, this property has no visual or
-    performance effect.
-
-    \note Generally scaling artifacts are only visible if the item is stationary on
-    the screen.  A common pattern when animating an item is to disable smooth
-    filtering at the beginning of the animation and reenable it at the conclusion.
-*/
-
-void QmlGraphicsText::componentComplete()
-{
-    Q_D(QmlGraphicsText);
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::TextComponentComplete> cc;
-#endif
-    QmlGraphicsItem::componentComplete();
-    if (d->dirty) {
-        d->updateLayout();
-        d->dirty = false;
-    }
-}
-
-/*!
-  \overload
-  Handles the given mouse \a event.
- */
-void QmlGraphicsText::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsText);
-
-    if (!d->richText || !d->doc || d->doc->documentLayout()->anchorAt(event->pos()).isEmpty()) {
-        event->setAccepted(false);
-        d->activeLink = QString();
-    } else {
-        d->activeLink = d->doc->documentLayout()->anchorAt(event->pos());
-    }
-
-    // ### may malfunction if two of the same links are clicked & dragged onto each other)
-
-    if (!event->isAccepted())
-        QmlGraphicsItem::mousePressEvent(event);
-
-}
-
-/*!
-    \qmlsignal Text::linkActivated(link)
-
-    This handler is called when the user clicks on a link embedded in the text.
-*/
-
-/*!
-  \overload
-  Handles the given mouse \a event.
- */
-void QmlGraphicsText::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsText);
-
-        // ### confirm the link, and send a signal out
-    if (d->richText && d->doc && d->activeLink == d->doc->documentLayout()->anchorAt(event->pos()))
-        emit linkActivated(d->activeLink);
-    else
-        event->setAccepted(false);
-
-    if (!event->isAccepted())
-        QmlGraphicsItem::mouseReleaseEvent(event);
-}
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p.h
deleted file mode 100644
index ad35524..0000000
--- a/src/declarative/graphicsitems/qmlgraphicstext_p.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSTEXT_H
-#define QMLGRAPHICSTEXT_H
-
-#include "qmlgraphicsitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-class QmlGraphicsTextPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsText : public QmlGraphicsItem
-{
-    Q_OBJECT
-    Q_ENUMS(HAlignment)
-    Q_ENUMS(VAlignment)
-    Q_ENUMS(TextStyle)
-    Q_ENUMS(TextFormat)
-    Q_ENUMS(TextElideMode)
-
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
-    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-    Q_PROPERTY(TextStyle style READ style WRITE setStyle NOTIFY styleChanged)
-    Q_PROPERTY(QColor styleColor READ styleColor WRITE setStyleColor NOTIFY styleColorChanged)
-    Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign NOTIFY horizontalAlignmentChanged)
-    Q_PROPERTY(VAlignment verticalAlignment READ vAlign WRITE setVAlign NOTIFY verticalAlignmentChanged)
-    Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapChanged) //### there are several wrap modes in Qt
-    Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat NOTIFY textFormatChanged)
-    Q_PROPERTY(TextElideMode elide READ elideMode WRITE setElideMode NOTIFY elideModeChanged) //### elideMode?
-
-public:
-    QmlGraphicsText(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsText();
-
-    enum HAlignment { AlignLeft = Qt::AlignLeft,
-                       AlignRight = Qt::AlignRight,
-                       AlignHCenter = Qt::AlignHCenter };
-    enum VAlignment { AlignTop = Qt::AlignTop,
-                       AlignBottom = Qt::AlignBottom,
-                       AlignVCenter = Qt::AlignVCenter };
-    enum TextStyle { Normal,
-                      Outline,
-                      Raised,
-                      Sunken };
-    enum TextFormat { PlainText = Qt::PlainText,
-                       RichText = Qt::RichText,
-                       AutoText = Qt::AutoText,
-                       StyledText = 4 };
-    enum TextElideMode { ElideLeft = Qt::ElideLeft,
-                          ElideRight = Qt::ElideRight,
-                          ElideMiddle = Qt::ElideMiddle,
-                          ElideNone = Qt::ElideNone };
-
-    QString text() const;
-    void setText(const QString &);
-
-    QFont font() const;
-    void setFont(const QFont &font);
-
-    QColor color() const;
-    void setColor(const QColor &c);
-
-    TextStyle style() const;
-    void setStyle(TextStyle style);
-
-    QColor styleColor() const;
-    void setStyleColor(const QColor &c);
-
-    HAlignment hAlign() const;
-    void setHAlign(HAlignment align);
-
-    VAlignment vAlign() const;
-    void setVAlign(VAlignment align);
-
-    bool wrap() const;
-    void setWrap(bool w);
-
-    TextFormat textFormat() const;
-    void setTextFormat(TextFormat format);
-
-    TextElideMode elideMode() const;
-    void setElideMode(TextElideMode);
-
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-
-    virtual void componentComplete();
-
-Q_SIGNALS:
-    void textChanged(const QString &text);
-    void linkActivated(const QString &link);
-    void fontChanged(const QFont &font);
-    void colorChanged(const QColor &color);
-    void styleChanged(TextStyle style);
-    void styleColorChanged(const QColor &color);
-    void horizontalAlignmentChanged(HAlignment alignment);
-    void verticalAlignmentChanged(VAlignment alignment);
-    void wrapChanged(bool wrap);
-    void textFormatChanged(TextFormat textFormat);
-    void elideModeChanged(TextElideMode mode);
-
-protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    virtual void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry);
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsText)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsText)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsText)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p_p.h
deleted file mode 100644
index f67d57c..0000000
--- a/src/declarative/graphicsitems/qmlgraphicstext_p_p.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSTEXT_P_H
-#define QMLGRAPHICSTEXT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsitem.h"
-#include "qmlgraphicsitem_p.h"
-
-#include <qml.h>
-
-#include <QtGui/qtextlayout.h>
-
-QT_BEGIN_NAMESPACE
-
-class QTextLayout;
-class QTextDocument;
-
-class QmlGraphicsTextPrivate : public QmlGraphicsItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsText)
-public:
-    QmlGraphicsTextPrivate()
-      : color((QRgb)0), style(QmlGraphicsText::Normal), imgDirty(true),
-        hAlign(QmlGraphicsText::AlignLeft), vAlign(QmlGraphicsText::AlignTop), elideMode(QmlGraphicsText::ElideNone),
-        dirty(true), wrap(false), richText(false), singleline(false), cache(true), doc(0),
-        format(QmlGraphicsText::AutoText)
-    {
-#if defined(QML_NO_TEXT_CACHE)
-        cache = false;
-#endif
-    }
-
-    ~QmlGraphicsTextPrivate();
-
-    void updateSize();
-    void updateLayout();
-    void markImgDirty() {
-        Q_Q(QmlGraphicsText);
-        imgDirty = true;
-        if (q->isComponentComplete())
-            q->update();
-    }
-    void checkImgCache();
-
-    void drawOutline();
-    void drawOutline(int yOffset);
-
-    QPixmap wrappedTextImage(bool drawStyle);
-    void drawWrappedText(QPainter *p, const QPointF &pos, bool drawStyle);
-    QPixmap richTextImage(bool drawStyle);
-    QSize setupTextLayout(QTextLayout *layout);
-
-    QString text;
-    QFont font;
-    QColor  color;
-    QmlGraphicsText::TextStyle style;
-    QColor  styleColor;
-    QString activeLink;
-    bool imgDirty;
-    QPixmap imgCache;
-    QPixmap imgStyleCache;
-    QmlGraphicsText::HAlignment hAlign;
-    QmlGraphicsText::VAlignment vAlign;
-    QmlGraphicsText::TextElideMode elideMode;    
-    bool dirty:1;
-    bool wrap:1;
-    bool richText:1;
-    bool singleline:1;
-    bool cache:1;
-    QTextDocument *doc;
-    QTextLayout layout;
-    QSize cachedLayoutSize;
-    QmlGraphicsText::TextFormat format;
-};
-
-QT_END_NAMESPACE
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
deleted file mode 100644
index 364751d..0000000
--- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
+++ /dev/null
@@ -1,1035 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicstextedit_p.h"
-#include "qmlgraphicstextedit_p_p.h"
-
-#include "qmlgraphicsevents_p_p.h"
-
-#include <qfxperf_p_p.h>
-
-#include <QTextLayout>
-#include <QTextLine>
-#include <QTextDocument>
-#include <QGraphicsSceneMouseEvent>
-#include <QDebug>
-#include <QPainter>
-
-#include <private/qtextcontrol_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass TextEdit QmlGraphicsTextEdit
-  \since 4.7
-    \brief The TextEdit item allows you to add editable formatted text to a scene.
-
-    It can display both plain and rich text. For example:
-
-    \qml
-TextEdit {
-    id: edit
-    text: "<b>Hello</b> <i>World!</i>"
-    focus: true
-    font.family: "Helvetica"
-    font.pointSize: 20
-    color: "blue"
-    width: 240
-}
-    \endqml
-
-    \image declarative-textedit.gif
-
-    \sa Text
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsTextEdit
-    \qmlclass TextEdit
-    \ingroup group_coreitems
-
-    \brief The QmlGraphicsTextEdit class provides an editable formatted text item that you can add to a QmlView.
-
-    It can display both plain and rich text.
-
-    \image declarative-textedit.png
-
-    A QmlGraphicsTextEdit object can be instantiated in Qml using the tag \c &lt;TextEdit&gt;.
-*/
-
-/*!
-    Constructs a new QmlGraphicsTextEdit.
-*/
-QmlGraphicsTextEdit::QmlGraphicsTextEdit(QmlGraphicsItem *parent)
-: QmlGraphicsPaintedItem(*(new QmlGraphicsTextEditPrivate), parent)
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->init();
-}
-
-QString QmlGraphicsTextEdit::text() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-
-    if (d->richText)
-        return d->document->toHtml();
-    else
-        return d->document->toPlainText();
-}
-
-/*!
-    \qmlproperty string TextEdit::font.family
-    \qmlproperty bool TextEdit::font.bold
-    \qmlproperty bool TextEdit::font.italic
-    \qmlproperty bool TextEdit::font.underline
-    \qmlproperty real TextEdit::font.pointSize
-    \qmlproperty int TextEdit::font.pixelSize
-
-    Set the TextEdit's font attributes.
-*/
-
-/*!
-    \qmlproperty string TextEdit::text
-
-    The text to display.  If the text format is AutoText the text edit will
-    automatically determine whether the text should be treated as
-    rich text.  This determination is made using Qt::mightBeRichText().
-*/
-void QmlGraphicsTextEdit::setText(const QString &text)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (QmlGraphicsTextEdit::text() == text)
-        return;
-    d->text = text;
-    d->richText = d->format == RichText || (d->format == AutoText && Qt::mightBeRichText(text));
-    if (d->richText) {
-        d->control->setHtml(text);
-    } else {
-        d->control->setPlainText(text);
-    }
-    q_textChanged();
-}
-
-/*!
-    \qmlproperty enumeration TextEdit::textFormat
-
-    The way the text property should be displayed.
-
-    Supported text formats are \c AutoText, \c PlainText and \c RichText.
-
-    The default is AutoText.  If the text format is AutoText the text edit
-    will automatically determine whether the text should be treated as
-    rich text.  This determination is made using Qt::mightBeRichText().
-
-    \table
-    \row
-    \o
-    \qml
-Column {
-    TextEdit {
-        font.pointSize: 24
-        text: "<b>Hello</b> <i>World!</i>"
-    }
-    TextEdit {
-        font.pointSize: 24
-        textFormat: "RichText"
-        text: "<b>Hello</b> <i>World!</i>"
-    }
-    TextEdit {
-        font.pointSize: 24
-        textFormat: "PlainText"
-        text: "<b>Hello</b> <i>World!</i>"
-    }
-}
-    \endqml
-    \o \image declarative-textformat.png
-    \endtable
-*/
-QmlGraphicsTextEdit::TextFormat QmlGraphicsTextEdit::textFormat() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->format;
-}
-
-void QmlGraphicsTextEdit::setTextFormat(TextFormat format)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (format == d->format)
-        return;
-    bool wasRich = d->richText;
-    d->richText = format == RichText || (format == AutoText && Qt::mightBeRichText(d->text));
-
-    if (wasRich && !d->richText) {
-        d->control->setPlainText(d->text);
-        updateSize();
-    } else if (!wasRich && d->richText) {
-        d->control->setHtml(d->text);
-        updateSize();
-    }
-    d->format = format;
-    emit textFormatChanged(d->format);
-}
-
-QFont QmlGraphicsTextEdit::font() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->font;
-}
-
-void QmlGraphicsTextEdit::setFont(const QFont &font)
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->font = font;
-
-    clearCache();
-    d->document->setDefaultFont(d->font);
-    if(d->cursor){
-        d->cursor->setHeight(QFontMetrics(d->font).height());
-        moveCursorDelegate();
-    }
-    updateSize();
-    update();
-}
-
-/*!
-    \qmlproperty color TextEdit::color
-
-    The text color.
-
-    \qml
-// green text using hexadecimal notation
-TextEdit { color: "#00FF00"; ...  }
-
-// steelblue text using SVG color name
-TextEdit { color: "steelblue"; ...  }
-    \endqml
-*/
-QColor QmlGraphicsTextEdit::color() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->color;
-}
-
-void QmlGraphicsTextEdit::setColor(const QColor &color)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (d->color == color)
-        return;
-
-    clearCache();
-    d->color = color;
-    QPalette pal = d->control->palette();
-    pal.setColor(QPalette::Text, color);
-    d->control->setPalette(pal);
-    update();
-    emit colorChanged(d->color);
-}
-
-/*!
-    \qmlproperty color TextEdit::selectionColor
-
-    The text highlight color, used behind selections.
-*/
-QColor QmlGraphicsTextEdit::selectionColor() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->selectionColor;
-}
-
-void QmlGraphicsTextEdit::setSelectionColor(const QColor &color)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (d->selectionColor == color)
-        return;
-
-    clearCache();
-    d->selectionColor = color;
-    QPalette pal = d->control->palette();
-    pal.setColor(QPalette::Highlight, color);
-    d->control->setPalette(pal);
-    update();
-    emit selectionColorChanged(d->selectionColor);
-}
-
-/*!
-    \qmlproperty color TextEdit::selectedTextColor
-
-    The selected text color, used in selections.
-*/
-QColor QmlGraphicsTextEdit::selectedTextColor() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->selectedTextColor;
-}
-
-void QmlGraphicsTextEdit::setSelectedTextColor(const QColor &color)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (d->selectedTextColor == color)
-        return;
-
-    clearCache();
-    d->selectedTextColor = color;
-    QPalette pal = d->control->palette();
-    pal.setColor(QPalette::HighlightedText, color);
-    d->control->setPalette(pal);
-    update();
-    emit selectedTextColorChanged(d->selectedTextColor);
-}
-
-/*!
-    \qmlproperty enumeration TextEdit::horizontalAlignment
-    \qmlproperty enumeration TextEdit::verticalAlignment
-
-    Sets the horizontal and vertical alignment of the text within the TextEdit items
-    width and height.  By default, the text is top-left aligned.
-
-    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
-    \c AlignHCenter.  The valid values for \c verticalAlignment are \c AlignTop, \c AlignBottom
-    and \c AlignVCenter.
-*/
-QmlGraphicsTextEdit::HAlignment QmlGraphicsTextEdit::hAlign() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->hAlign;
-}
-
-void QmlGraphicsTextEdit::setHAlign(QmlGraphicsTextEdit::HAlignment alignment)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (alignment == d->hAlign)
-        return;
-    d->hAlign = alignment;
-    d->updateDefaultTextOption();
-    updateSize();
-    emit horizontalAlignmentChanged(d->hAlign);
-}
-
-QmlGraphicsTextEdit::VAlignment QmlGraphicsTextEdit::vAlign() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->vAlign;
-}
-
-void QmlGraphicsTextEdit::setVAlign(QmlGraphicsTextEdit::VAlignment alignment)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (alignment == d->vAlign)
-        return;
-    d->vAlign = alignment;
-    d->updateDefaultTextOption();
-    updateSize();
-    emit verticalAlignmentChanged(d->vAlign);
-}
-
-bool QmlGraphicsTextEdit::wrap() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->wrap;
-}
-
-/*!
-    \qmlproperty bool TextEdit::wrap
-
-    Set this property to wrap the text to the TextEdit item's width.
-    The text will only wrap if an explicit width has been set.
-
-    Wrapping is done on word boundaries (i.e. it is a "word-wrap"). Wrapping is off by default.
-*/
-void QmlGraphicsTextEdit::setWrap(bool w)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (w == d->wrap)
-        return;
-    d->wrap = w;
-    d->updateDefaultTextOption();
-    updateSize();
-    emit wrapChanged(d->wrap);
-}
-
-/*!
-    \qmlproperty bool TextEdit::cursorVisible
-    If true the text edit shows a cursor.
-
-    This property is set and unset when the text edit gets focus, but it can also
-    be set directly (useful, for example, if a KeyProxy might forward keys to it).
-*/
-bool QmlGraphicsTextEdit::isCursorVisible() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->cursorVisible;
-}
-
-void QmlGraphicsTextEdit::setCursorVisible(bool on)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (d->cursorVisible == on)
-        return;
-    d->cursorVisible = on;
-    QFocusEvent focusEvent(on ? QEvent::FocusIn : QEvent::FocusOut);
-    if (!on && !d->persistentSelection)
-        d->control->setCursorIsFocusIndicator(true);
-    d->control->processEvent(&focusEvent, QPointF(0, 0));
-    emit cursorVisibleChanged(d->cursorVisible);
-}
-
-/*!
-    \qmlproperty int TextEdit::cursorPosition
-    The position of the cursor in the TextEdit.
-*/
-int QmlGraphicsTextEdit::cursorPosition() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->control->textCursor().position();
-}
-
-void QmlGraphicsTextEdit::setCursorPosition(int pos)
-{
-    Q_D(QmlGraphicsTextEdit);
-    QTextCursor cursor = d->control->textCursor();
-    if (cursor.position() == pos)
-        return;
-    cursor.setPosition(pos);
-    d->control->setTextCursor(cursor);
-}
-
-/*!
-    \qmlproperty Component TextEdit::cursorDelegate
-    The delegate for the cursor in the TextEdit.
-
-    If you set a cursorDelegate for a TextEdit, this delegate will be used for
-    drawing the cursor instead of the standard cursor. An instance of the
-    delegate will be created and managed by the text edit when a cursor is
-    needed, and the x and y properties of delegate instance will be set so as
-    to be one pixel before the top left of the current character.
-
-    Note that the root item of the delegate component must be a QmlGraphicsItem or
-    QmlGraphicsItem derived item.
-*/
-QmlComponent* QmlGraphicsTextEdit::cursorDelegate() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->cursorComponent;
-}
-
-void QmlGraphicsTextEdit::setCursorDelegate(QmlComponent* c)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if(d->cursorComponent){
-        if(d->cursor){
-            disconnect(d->control, SIGNAL(cursorPositionChanged()),
-                    this, SLOT(moveCursorDelegate()));
-            d->control->setCursorWidth(-1);
-            dirtyCache(cursorRect());
-            delete d->cursor;
-            d->cursor = 0;
-        }
-    }
-    d->cursorComponent = c;
-    if(c && c->isReady()){
-        loadCursorDelegate();
-    }else{
-        if(c)
-            connect(c, SIGNAL(statusChanged()),
-                    this, SLOT(loadCursorDelegate()));
-    }
-
-    emit cursorDelegateChanged();
-}
-
-void QmlGraphicsTextEdit::loadCursorDelegate()
-{
-    Q_D(QmlGraphicsTextEdit);
-    if(d->cursorComponent->isLoading())
-        return;
-    d->cursor = qobject_cast<QmlGraphicsItem*>(d->cursorComponent->create(qmlContext(this)));
-    if(d->cursor){
-        connect(d->control, SIGNAL(cursorPositionChanged()),
-                this, SLOT(moveCursorDelegate()));
-        d->control->setCursorWidth(0);
-        dirtyCache(cursorRect());
-        d->cursor->setParentItem(this);
-        d->cursor->setHeight(QFontMetrics(d->font).height());
-        moveCursorDelegate();
-    }else{
-        qWarning() << QLatin1String("Error loading cursor delegate for TextEdit:") + objectName();
-    }
-}
-
-/*!
-    \qmlproperty int TextEdit::selectionStart
-
-    The cursor position before the first character in the current selection.
-    Setting this and selectionEnd allows you to specify a selection in the
-    text edit.
-
-    Note that if selectionStart == selectionEnd then there is no current
-    selection. If you attempt to set selectionStart to a value outside of
-    the current text, selectionStart will not be changed.
-
-    \sa selectionEnd, cursorPosition, selectedText
-*/
-int QmlGraphicsTextEdit::selectionStart() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->control->textCursor().selectionStart();
-}
-
-void QmlGraphicsTextEdit::setSelectionStart(int s)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if(d->lastSelectionStart == s || s < 0 || s > text().length())
-        return;
-    d->lastSelectionStart = s;
-    d->updateSelection();// Will emit the relevant signals
-}
-
-/*!
-    \qmlproperty int TextEdit::selectionEnd
-
-    The cursor position after the last character in the current selection.
-    Setting this and selectionStart allows you to specify a selection in the
-    text edit.
-
-    Note that if selectionStart == selectionEnd then there is no current
-    selection. If you attempt to set selectionEnd to a value outside of
-    the current text, selectionEnd will not be changed.
-
-    \sa selectionStart, cursorPosition, selectedText
-*/
-int QmlGraphicsTextEdit::selectionEnd() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->control->textCursor().selectionEnd();
-}
-
-void QmlGraphicsTextEdit::setSelectionEnd(int s)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if(d->lastSelectionEnd == s || s < 0 || s > text().length())
-        return;
-    d->lastSelectionEnd = s;
-    d->updateSelection();// Will emit the relevant signals
-}
-
-/*!
-    \qmlproperty string TextEdit::selectedText
-
-    This read-only property provides the text currently selected in the
-    text edit.
-
-    It is equivalent to the following snippet, but is faster and easier
-    to use.
-    \code
-    //myTextEdit is the id of the TextEdit
-    myTextEdit.text.toString().substring(myTextEdit.selectionStart,
-            myTextEdit.selectionEnd);
-    \endcode
-*/
-QString QmlGraphicsTextEdit::selectedText() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->control->textCursor().selectedText();
-}
-
-/*!
-    \qmlproperty bool TextEdit::focusOnPress
-
-    Whether the TextEdit should gain focus on a mouse press. By default this is
-    set to true.
-*/
-bool QmlGraphicsTextEdit::focusOnPress() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->focusOnPress;
-}
-
-void QmlGraphicsTextEdit::setFocusOnPress(bool on)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (d->focusOnPress == on)
-        return;
-    d->focusOnPress = on;
-    emit focusOnPressChanged(d->focusOnPress);
-}
-
-/*!
-    \qmlproperty bool TextEdit::persistentSelection
-
-    Whether the TextEdit should keep the selection visible when it loses focus to another
-    item in the scene. By default this is set to true;
-*/
-bool QmlGraphicsTextEdit::persistentSelection() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->persistentSelection;
-}
-
-void QmlGraphicsTextEdit::setPersistentSelection(bool on)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (d->persistentSelection == on)
-        return;
-    d->persistentSelection = on;
-    emit persistentSelectionChanged(d->persistentSelection);
-}
-
-qreal QmlGraphicsTextEdit::textMargin() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->textMargin;
-}
-
-void QmlGraphicsTextEdit::setTextMargin(qreal margin)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (d->textMargin == margin)
-        return;
-    d->textMargin = margin;
-    d->document->setDocumentMargin(d->textMargin);
-    emit textMarginChanged(d->textMargin);
-}
-
-void QmlGraphicsTextEdit::geometryChanged(const QRectF &newGeometry,
-                                  const QRectF &oldGeometry)
-{
-    if (newGeometry.width() != oldGeometry.width())
-        updateSize();
-    QmlGraphicsPaintedItem::geometryChanged(newGeometry, oldGeometry);
-}
-
-/*!
-    Ensures any delayed caching or data loading the class
-    needs to performed is complete.
-*/
-void QmlGraphicsTextEdit::componentComplete()
-{
-    Q_D(QmlGraphicsTextEdit);
-    QmlGraphicsPaintedItem::componentComplete();
-    if (d->dirty) {
-        updateSize();
-        d->dirty = false;
-    }
-}
-
-/*!
-    \qmlproperty bool TextEdit::readOnly
-
-    Whether the user an interact with the TextEdit item. If this
-    property is set to true the text cannot be edited by user interaction.
-
-    By default this property is false.
-*/
-void QmlGraphicsTextEdit::setReadOnly(bool r)
-{
-    Q_D(QmlGraphicsTextEdit);    
-    if (r == isReadOnly())
-        return;
-
-
-    Qt::TextInteractionFlags flags = Qt::NoTextInteraction;
-    if (r) {
-        flags = Qt::TextSelectableByMouse;
-    } else {
-        flags = Qt::TextEditorInteraction;
-    }
-    d->control->setTextInteractionFlags(flags);
-    if (!r)
-        d->control->moveCursor(QTextCursor::End);
-
-    emit readOnlyChanged(r);
-}
-
-bool QmlGraphicsTextEdit::isReadOnly() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return !(d->control->textInteractionFlags() & Qt::TextEditable);
-}
-
-/*!
-    Sets how the text edit should interact with user input to the given
-    \a flags.
-*/
-void QmlGraphicsTextEdit::setTextInteractionFlags(Qt::TextInteractionFlags flags)
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->control->setTextInteractionFlags(flags);
-}
-
-/*!
-    Returns the flags specifying how the text edit should interact
-    with user input.
-*/
-Qt::TextInteractionFlags QmlGraphicsTextEdit::textInteractionFlags() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->control->textInteractionFlags();
-}
-
-/*!
-    Returns the rectangle where the text cursor is rendered
-    within the text edit.
-*/
-QRect QmlGraphicsTextEdit::cursorRect() const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->control->cursorRect().toRect();
-}
-
-
-/*!
-\overload
-Handles the given \a event.
-*/
-bool QmlGraphicsTextEdit::event(QEvent *event)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (event->type() == QEvent::ShortcutOverride) {
-        d->control->processEvent(event, QPointF(0, 0));
-        return event->isAccepted();
-    }
-    return QmlGraphicsPaintedItem::event(event);
-}
-
-/*!
-\overload
-Handles the given key \a event.
-*/
-void QmlGraphicsTextEdit::keyPressEvent(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->control->processEvent(event, QPointF(0, 0));
-
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::keyPressEvent(event);
-}
-
-/*!
-\overload
-Handles the given key \a event.
-*/
-void QmlGraphicsTextEdit::keyReleaseEvent(QKeyEvent *event)
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->control->processEvent(event, QPointF(0, 0));
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::keyReleaseEvent(event);
-}
-
-/*!
-    \overload
-    Handles changing of the focus property.  Focus is applied to the control
-    even if the edit does not have active focus.  This is because things
-    like KeyProxy can give the behavior of focus even when hasFocus() isn't
-    true.
-*/
-void QmlGraphicsTextEdit::focusChanged(bool hasFocus)
-{
-    setCursorVisible(hasFocus);
-    QmlGraphicsItem::focusChanged(hasFocus);
-}
-
-/*!
-    Causes all text to be selected.
-*/
-void QmlGraphicsTextEdit::selectAll()
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->control->selectAll();
-}
-
-/*!
-\overload
-Handles the given mouse \a event.
-*/
-void QmlGraphicsTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (d->focusOnPress){
-        QGraphicsItem *p = parentItem();//###Is there a better way to find my focus scope?
-        while(p) {
-            if(p->flags() & QGraphicsItem::ItemIsFocusScope){
-                p->setFocus();
-                break;
-            }
-            p = p->parentItem();
-        }
-        setFocus(true);
-    }
-    d->control->processEvent(event, QPointF(0, 0));
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::mousePressEvent(event);
-}
-
-/*!
-\overload
-Handles the given mouse \a event.
-*/
-void QmlGraphicsTextEdit::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsTextEdit);
-    QWidget *widget = event->widget();
-    if (widget && (d->control->textInteractionFlags() & Qt::TextEditable) && boundingRect().contains(event->pos()))
-        qt_widget_private(widget)->handleSoftwareInputPanel(event->button(), d->focusOnPress);
-
-    d->control->processEvent(event, QPointF(0, 0));
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::mousePressEvent(event);
-}
-
-/*!
-\overload
-Handles the given mouse \a event.
-*/
-void QmlGraphicsTextEdit::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->control->processEvent(event, QPointF(0, 0));
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::mouseDoubleClickEvent(event);
-}
-
-/*!
-\overload
-Handles the given mouse \a event.
-*/
-void QmlGraphicsTextEdit::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->control->processEvent(event, QPointF(0, 0));
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::mousePressEvent(event);
-}
-
-/*!
-\overload
-Handles the given input method \a event.
-*/
-void QmlGraphicsTextEdit::inputMethodEvent(QInputMethodEvent *event)
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->control->processEvent(event, QPointF(0, 0));
-}
-
-/*!
-\overload
-Returns the value of the given \a property.
-*/
-QVariant QmlGraphicsTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
-{
-    Q_D(const QmlGraphicsTextEdit);
-    return d->control->inputMethodQuery(property);
-}
-
-/*!
-Draws the contents of the text edit using the given \a painter within
-the given \a bounds.
-*/
-void QmlGraphicsTextEdit::drawContents(QPainter *painter, const QRect &bounds)
-{
-    Q_D(QmlGraphicsTextEdit);
-
-    painter->setRenderHint(QPainter::TextAntialiasing, true);
-
-    d->control->drawContents(painter, bounds);
-}
-
-void QmlGraphicsTextEdit::updateImgCache(const QRectF &r)
-{
-    dirtyCache(r.toRect());
-    emit update();
-}
-
-/*!
-    \qmlproperty bool TextEdit::smooth
-
-    Set this property if you want the text to be smoothly scaled or
-    transformed.  Smooth filtering gives better visual quality, but is slower.  If
-    the item is displayed at its natural size, this property has no visual or
-    performance effect.
-
-    \note Generally scaling artifacts are only visible if the item is stationary on
-    the screen.  A common pattern when animating an item is to disable smooth
-    filtering at the beginning of the animation and reenable it at the conclusion.
-*/
-
-void QmlGraphicsTextEditPrivate::init()
-{
-    Q_Q(QmlGraphicsTextEdit);
-
-    q->setSmooth(smooth);
-    q->setAcceptedMouseButtons(Qt::LeftButton);
-    q->setFlag(QGraphicsItem::ItemHasNoContents, false);
-    q->setFlag(QGraphicsItem::ItemAcceptsInputMethod);
-
-    control = new QTextControl(q);
-    control->setIgnoreUnusedNavigationEvents(true);
-
-    QObject::connect(control, SIGNAL(updateRequest(QRectF)), q, SLOT(updateImgCache(QRectF)));
-
-    QObject::connect(control, SIGNAL(textChanged()), q, SLOT(q_textChanged()));
-    QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged()));
-    QObject::connect(control, SIGNAL(selectionChanged()), q, SLOT(updateSelectionMarkers()));
-    QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(updateSelectionMarkers()));
-    QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));
-
-    document = control->document();
-    document->setDefaultFont(font);
-    document->setDocumentMargin(textMargin);
-    document->setUndoRedoEnabled(false); // flush undo buffer.
-    document->setUndoRedoEnabled(true);
-    updateDefaultTextOption();
-}
-
-void QmlGraphicsTextEdit::q_textChanged()
-{
-    updateSize();
-    emit textChanged(text());
-}
-
-void QmlGraphicsTextEdit::moveCursorDelegate()
-{
-    Q_D(QmlGraphicsTextEdit);
-    if(!d->cursor)
-        return;
-    QRectF cursorRect = d->control->cursorRect();
-    d->cursor->setX(cursorRect.x());
-    d->cursor->setY(cursorRect.y());
-}
-
-void QmlGraphicsTextEditPrivate::updateSelection()
-{
-    Q_Q(QmlGraphicsTextEdit);
-    QTextCursor cursor = control->textCursor();
-    bool startChange = (lastSelectionStart != cursor.selectionStart());
-    bool endChange = (lastSelectionEnd != cursor.selectionEnd());
-    //### Is it worth calculating a more minimal set of movements?
-    cursor.beginEditBlock();
-    cursor.setPosition(lastSelectionStart, QTextCursor::MoveAnchor);
-    cursor.setPosition(lastSelectionEnd, QTextCursor::KeepAnchor);
-    cursor.endEditBlock();
-    control->setTextCursor(cursor);
-    if(startChange)
-        q->selectionStartChanged();
-    if(endChange)
-        q->selectionEndChanged();
-    startChange = (lastSelectionStart != control->textCursor().selectionStart());
-    endChange = (lastSelectionEnd != control->textCursor().selectionEnd());
-    if(startChange || endChange)
-        qWarning() << "QmlGraphicsTextEditPrivate::updateSelection() has failed you.";
-}
-
-void QmlGraphicsTextEdit::updateSelectionMarkers()
-{
-    Q_D(QmlGraphicsTextEdit);
-    if(d->lastSelectionStart != d->control->textCursor().selectionStart()){
-        d->lastSelectionStart = d->control->textCursor().selectionStart();
-        emit selectionStartChanged();
-    }
-    if(d->lastSelectionEnd != d->control->textCursor().selectionEnd()){
-        d->lastSelectionEnd = d->control->textCursor().selectionEnd();
-        emit selectionEndChanged();
-    }
-}
-
-//### we should perhaps be a bit smarter here -- depending on what has changed, we shouldn't
-//    need to do all the calculations each time
-void QmlGraphicsTextEdit::updateSize()
-{
-    Q_D(QmlGraphicsTextEdit);
-    if (isComponentComplete()) {
-        QFontMetrics fm = QFontMetrics(d->font);
-        int dy = height();
-        // ### assumes that if the width is set, the text will fill to edges
-        // ### (unless wrap is false, then clipping will occur)
-        if (widthValid())
-            d->document->setTextWidth(width());
-        dy -= (int)d->document->size().height();
-
-        int yoff = 0;
-        if (heightValid()) {
-            if (d->vAlign == AlignBottom)
-                yoff = dy;
-            else if (d->vAlign == AlignVCenter)
-                yoff = dy/2;
-        }
-        setBaselineOffset(fm.ascent() + yoff + d->textMargin);
-
-        //### need to comfirm cost of always setting these
-        int newWidth = (int)d->document->idealWidth();
-        d->document->setTextWidth(newWidth); // ### QTextDoc> Alignment will not work unless textWidth is set. Does Text need this line as well?
-        int cursorWidth = 1;
-        if(d->cursor)
-            cursorWidth = d->cursor->width();
-        newWidth += cursorWidth;
-        if(!d->document->isEmpty())
-            newWidth += 3;// ### Need a better way of accounting for space between char and cursor
-        // ### Setting the implicitWidth triggers another updateSize(), and unless there are bindings nothing has changed.
-        setImplicitWidth(newWidth);
-        setImplicitHeight(d->text.isEmpty() ? fm.height() : (int)d->document->size().height());
-
-        setContentsSize(QSize(width(), height()));
-    } else {
-        d->dirty = true;
-    }
-    emit update();
-}
-
-void QmlGraphicsTextEditPrivate::updateDefaultTextOption()
-{
-    QTextOption opt = document->defaultTextOption();
-    int oldAlignment = opt.alignment();
-    opt.setAlignment((Qt::Alignment)(int)(hAlign | vAlign));
-
-    QTextOption::WrapMode oldWrapMode = opt.wrapMode();
-
-    if (wrap)
-        opt.setWrapMode(QTextOption::WordWrap);
-    else
-        opt.setWrapMode(QTextOption::NoWrap);
-
-    if (oldWrapMode == opt.wrapMode() && oldAlignment == opt.alignment())
-        return;
-    document->setDefaultTextOption(opt);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
deleted file mode 100644
index 337cd9d..0000000
--- a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSTEXTEDIT_H
-#define QMLGRAPHICSTEXTEDIT_H
-
-#include "qmlgraphicstext_p.h"
-#include "qmlgraphicspainteditem_p.h"
-
-#include <QtGui/qtextdocument.h>
-#include <QtGui/qtextoption.h>
-#include <QtGui/qtextcursor.h>
-#include <QtGui/qtextformat.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-
-class QmlGraphicsTextEditPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsTextEdit : public QmlGraphicsPaintedItem
-{
-    Q_OBJECT
-    Q_ENUMS(VAlignment)
-    Q_ENUMS(HAlignment)
-    Q_ENUMS(TextFormat)
-
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-    Q_PROPERTY(QColor selectionColor READ selectionColor WRITE setSelectionColor NOTIFY selectionColorChanged)
-    Q_PROPERTY(QColor selectedTextColor READ selectedTextColor WRITE setSelectedTextColor NOTIFY selectedTextColorChanged)
-    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
-    Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign NOTIFY horizontalAlignmentChanged)
-    Q_PROPERTY(VAlignment verticalAlignment READ vAlign WRITE setVAlign NOTIFY verticalAlignmentChanged)
-    Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapChanged) //### other wrap modes
-    Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat NOTIFY textFormatChanged)
-    Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly NOTIFY readOnlyChanged)
-    Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged)
-    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
-    Q_PROPERTY(QmlComponent* cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
-    Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged)
-    Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged)
-    Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectionChanged)
-    Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY focusOnPressChanged)
-    Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection NOTIFY persistentSelectionChanged)
-    Q_PROPERTY(qreal textMargin READ textMargin WRITE setTextMargin NOTIFY textMarginChanged)
-    Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints)
-
-public:
-    QmlGraphicsTextEdit(QmlGraphicsItem *parent=0);
-
-    enum HAlignment {
-        AlignLeft = Qt::AlignLeft,
-        AlignRight = Qt::AlignRight,
-        AlignHCenter = Qt::AlignHCenter
-    };
-
-    enum VAlignment {
-        AlignTop = Qt::AlignTop,
-        AlignBottom = Qt::AlignBottom,
-        AlignVCenter = Qt::AlignVCenter
-    };
-
-    enum TextFormat {
-        PlainText = Qt::PlainText,
-        RichText = Qt::RichText,
-        AutoText = Qt::AutoText
-    };
-
-    QString text() const;
-    void setText(const QString &);
-
-    TextFormat textFormat() const;
-    void setTextFormat(TextFormat format);
-
-    QFont font() const;
-    void setFont(const QFont &font);
-
-    QColor color() const;
-    void setColor(const QColor &c);
-
-    QColor selectionColor() const;
-    void setSelectionColor(const QColor &c);
-
-    QColor selectedTextColor() const;
-    void setSelectedTextColor(const QColor &c);
-
-    HAlignment hAlign() const;
-    void setHAlign(HAlignment align);
-
-    VAlignment vAlign() const;
-    void setVAlign(VAlignment align);
-
-    bool wrap() const;
-    void setWrap(bool w);
-
-    bool isCursorVisible() const;
-    void setCursorVisible(bool on);
-
-    int cursorPosition() const;
-    void setCursorPosition(int pos);
-
-    QmlComponent* cursorDelegate() const;
-    void setCursorDelegate(QmlComponent*);
-
-    int selectionStart() const;
-    void setSelectionStart(int);
-
-    int selectionEnd() const;
-    void setSelectionEnd(int);
-
-    QString selectedText() const;
-
-    bool focusOnPress() const;
-    void setFocusOnPress(bool on);
-
-    bool persistentSelection() const;
-    void setPersistentSelection(bool on);
-
-    qreal textMargin() const;
-    void setTextMargin(qreal margin);
-
-    virtual void componentComplete();
-
-    /* FROM EDIT */
-    void setReadOnly(bool);
-    bool isReadOnly() const;
-
-    void setTextInteractionFlags(Qt::TextInteractionFlags flags);
-    Qt::TextInteractionFlags textInteractionFlags() const;
-
-    QRect cursorRect() const;
-
-    QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
-
-Q_SIGNALS:
-    void textChanged(const QString &);
-    void cursorPositionChanged();
-    void selectionStartChanged();
-    void selectionEndChanged();
-    void selectionChanged();
-    void colorChanged(const QColor &color);
-    void selectionColorChanged(const QColor &color);
-    void selectedTextColorChanged(const QColor &color);
-    void fontChanged(const QFont &font);
-    void horizontalAlignmentChanged(HAlignment alignment);
-    void verticalAlignmentChanged(VAlignment alignment);
-    void wrapChanged(bool isWrapped);
-    void textFormatChanged(TextFormat textFormat);
-    void readOnlyChanged(bool isReadOnly);
-    void cursorVisibleChanged(bool isCursorVisible);
-    void cursorDelegateChanged();
-    void focusOnPressChanged(bool focusIsPressed);
-    void persistentSelectionChanged(bool isPersistentSelection);
-    void textMarginChanged(qreal textMargin);
-
-public Q_SLOTS:
-    void selectAll();
-
-private Q_SLOTS:
-    void updateImgCache(const QRectF &rect);
-    void q_textChanged();
-    void updateSelectionMarkers();
-    void moveCursorDelegate();
-    void loadCursorDelegate();
-
-private:
-    void updateSize();
-
-protected:
-    virtual void geometryChanged(const QRectF &newGeometry, 
-                                 const QRectF &oldGeometry);
-
-    bool event(QEvent *);
-    void keyPressEvent(QKeyEvent *);
-    void keyReleaseEvent(QKeyEvent *);
-
-    void focusChanged(bool);
-
-    // mouse filter?
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-
-    void inputMethodEvent(QInputMethodEvent *e);
-
-    void drawContents(QPainter *, const QRect &);
-private:
-    Q_DISABLE_COPY(QmlGraphicsTextEdit)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsTextEdit)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsTextEdit)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h
deleted file mode 100644
index 7d4ca88..0000000
--- a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSTEXTEDIT_P_H
-#define QMLGRAPHICSTEXTEDIT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlgraphicsitem.h"
-#include "qmlgraphicspainteditem_p_p.h"
-
-#include <qml.h>
-
-QT_BEGIN_NAMESPACE
-class QTextLayout;
-class QTextDocument;
-class QTextControl;
-class QmlGraphicsTextEditPrivate : public QmlGraphicsPaintedItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsTextEdit)
-
-public:
-    QmlGraphicsTextEditPrivate()
-      : color("black"), imgDirty(true), hAlign(QmlGraphicsTextEdit::AlignLeft), vAlign(QmlGraphicsTextEdit::AlignTop),
-      dirty(false), wrap(false), richText(false), cursorVisible(false), focusOnPress(true),
-      persistentSelection(true), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0),
-      cursorComponent(0), cursor(0), format(QmlGraphicsTextEdit::AutoText), document(0)
-    {
-    }
-
-    void init();
-
-    void updateDefaultTextOption();
-    void relayoutDocument();
-    void updateSelection();
-
-    QString text;
-    QFont font;
-    QColor  color;
-    QColor  selectionColor;
-    QColor  selectedTextColor;
-    QString style;
-    QColor  styleColor;
-    bool imgDirty;
-    QPixmap imgCache;
-    QPixmap imgStyleCache;
-    QmlGraphicsTextEdit::HAlignment hAlign;
-    QmlGraphicsTextEdit::VAlignment vAlign;
-    bool dirty;
-    bool wrap;
-    bool richText;
-    bool cursorVisible;
-    bool focusOnPress;
-    bool persistentSelection;
-    qreal textMargin;
-    int lastSelectionStart;
-    int lastSelectionEnd;
-    QmlComponent* cursorComponent;
-    QmlGraphicsItem* cursor;
-    QmlGraphicsTextEdit::TextFormat format;
-    QTextDocument *document;
-    QTextControl *control;
-};
-
-QT_END_NAMESPACE
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
deleted file mode 100644
index d3c1f1f..0000000
--- a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
+++ /dev/null
@@ -1,913 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicstextinput_p.h"
-#include "qmlgraphicstextinput_p_p.h"
-
-#include <qmlinfo.h>
-
-#include <QValidator>
-#include <QApplication>
-#include <QFontMetrics>
-#include <QPainter>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass TextInput QmlGraphicsTextInput
-  \since 4.7
-    The TextInput item allows you to add an editable line of text to a scene.
-
-    TextInput can only display a single line of text, and can only display
-    plain text. However it can provide addition input constraints on the text.
-
-    Input constraints include setting a QValidator, an input mask, or a
-    maximum input length.
-*/
-QmlGraphicsTextInput::QmlGraphicsTextInput(QmlGraphicsItem* parent)
-    : QmlGraphicsPaintedItem(*(new QmlGraphicsTextInputPrivate), parent)
-{
-    Q_D(QmlGraphicsTextInput);
-    d->init();
-}
-
-QmlGraphicsTextInput::~QmlGraphicsTextInput()
-{
-}
-
-/*!
-    \qmlproperty string TextInput::text
-
-    The text in the TextInput.
-*/
-
-QString QmlGraphicsTextInput::text() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->control->text();
-}
-
-void QmlGraphicsTextInput::setText(const QString &s)
-{
-    Q_D(QmlGraphicsTextInput);
-    if(s == text())
-        return;
-    d->control->setText(s);
-    //emit textChanged();
-}
-
-/*!
-    \qmlproperty string TextInput::font.family
-    \qmlproperty bool TextInput::font.bold
-    \qmlproperty bool TextInput::font.italic
-    \qmlproperty bool TextInput::font.underline
-    \qmlproperty real TextInput::font.pointSize
-    \qmlproperty int TextInput::font.pixelSize
-
-    Set the TextInput's font attributes.
-*/
-QFont QmlGraphicsTextInput::font() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->font;
-}
-
-void QmlGraphicsTextInput::setFont(const QFont &font)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->font == font)
-        return;
-
-    d->font = font;
-
-    d->control->setFont(d->font);
-    if(d->cursorItem){
-        d->cursorItem->setHeight(QFontMetrics(d->font).height());
-        moveCursor();
-    }
-    updateSize();
-    emit fontChanged(d->font);
-}
-
-/*!
-    \qmlproperty color TextInput::color
-
-    The text color.
-*/
-QColor QmlGraphicsTextInput::color() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->color;
-}
-
-void QmlGraphicsTextInput::setColor(const QColor &c)
-{
-    Q_D(QmlGraphicsTextInput);
-    d->color = c;
-}
-
-
-/*!
-    \qmlproperty color TextInput::selectionColor
-
-    The text highlight color, used behind selections.
-*/
-QColor QmlGraphicsTextInput::selectionColor() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->selectionColor;
-}
-
-void QmlGraphicsTextInput::setSelectionColor(const QColor &color)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->selectionColor == color)
-        return;
-
-    d->selectionColor = color;
-    QPalette p = d->control->palette();
-    p.setColor(QPalette::Highlight, d->selectionColor);
-    d->control->setPalette(p);
-    emit selectionColorChanged(color);
-}
-
-/*!
-    \qmlproperty color TextInput::selectedTextColor
-
-    The highlighted text color, used in selections.
-*/
-QColor QmlGraphicsTextInput::selectedTextColor() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->selectedTextColor;
-}
-
-void QmlGraphicsTextInput::setSelectedTextColor(const QColor &color)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->selectedTextColor == color)
-        return;
-
-    d->selectedTextColor = color;
-    QPalette p = d->control->palette();
-    p.setColor(QPalette::HighlightedText, d->selectedTextColor);
-    d->control->setPalette(p);
-    emit selectedTextColorChanged(color);
-}
-
-/*!
-    \qmlproperty enumeration TextInput::horizontalAlignment
-
-    Sets the horizontal alignment of the text within the TextInput item's
-    width and height.  By default, the text is left aligned.
-
-    TextInput does not have vertical alignment, as the natural height is
-    exactly the height of the single line of text. If you set the height
-    manually to something larger, TextInput will always be top aligned
-    vertically. You can use anchors to align it however you want within
-    another item.
-
-    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
-    \c AlignHCenter.
-*/
-QmlGraphicsTextInput::HAlignment QmlGraphicsTextInput::hAlign() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->hAlign;
-}
-
-void QmlGraphicsTextInput::setHAlign(HAlignment align)
-{
-    Q_D(QmlGraphicsTextInput);
-    if(align == d->hAlign)
-        return;
-    d->hAlign = align;
-    emit horizontalAlignmentChanged(d->hAlign);
-}
-
-bool QmlGraphicsTextInput::isReadOnly() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->control->isReadOnly();
-}
-
-void QmlGraphicsTextInput::setReadOnly(bool ro)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->control->isReadOnly() == ro)
-        return;
-
-    d->control->setReadOnly(ro);
-
-    emit readOnlyChanged(ro);
-}
-
-int QmlGraphicsTextInput::maxLength() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->control->maxLength();
-}
-
-void QmlGraphicsTextInput::setMaxLength(int ml)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->control->maxLength() == ml)
-        return;
-
-    d->control->setMaxLength(ml);
-
-    emit maximumLengthChanged(ml);
-}
-
-/*!
-    \qmlproperty bool TextInput::cursorVisible
-    Set to true when the TextInput shows a cursor.
-
-    This property is set and unset when the TextInput gets focus, so that other
-    properties can be bound to whether the cursor is currently showing. As it
-    gets set and unset automatically, when you set the value yourself you must
-    keep in mind that your value may be overwritten.
-
-    It can be set directly in script, for example if a KeyProxy might
-    forward keys to it and you desire it to look active when this happens
-    (but without actually giving it the focus).
-
-    It should not be set directly on the element, like in the below QML,
-    as the specified value will be overridden an lost on focus changes.
-
-    \code
-    TextInput {
-        text: "Text"
-        cursorVisible: false
-    }
-    \endcode
-
-    In the above snippet the cursor will still become visible when the
-    TextInput gains focus.
-*/
-bool QmlGraphicsTextInput::isCursorVisible() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->cursorVisible;
-}
-
-void QmlGraphicsTextInput::setCursorVisible(bool on)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->cursorVisible == on)
-        return;
-    d->cursorVisible = on;
-    d->control->setCursorBlinkPeriod(on?QApplication::cursorFlashTime():0);
-    //d->control should emit the cursor update regions
-    emit cursorVisibleChanged(d->cursorVisible);
-}
-
-/*!
-    \qmlproperty int TextInput::cursorPosition
-    The position of the cursor in the TextInput.
-*/
-int QmlGraphicsTextInput::cursorPosition() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->control->cursor();
-}
-void QmlGraphicsTextInput::setCursorPosition(int cp)
-{
-    Q_D(QmlGraphicsTextInput);
-    d->control->moveCursor(cp);
-}
-
-/*!
-  \internal
-
-  Returns a Rect which encompasses the cursor, but which may be larger than is
-  required. Ignores custom cursor delegates.
-*/
-QRect QmlGraphicsTextInput::cursorRect() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->control->cursorRect();
-}
-
-/*!
-    \qmlproperty int TextInput::selectionStart
-
-    The cursor position before the first character in the current selection.
-    Setting this and selectionEnd allows you to specify a selection in the
-    text edit.
-
-    Note that if selectionStart == selectionEnd then there is no current
-    selection. If you attempt to set selectionStart to a value outside of
-    the current text, selectionStart will not be changed.
-
-    \sa selectionEnd, cursorPosition, selectedText
-*/
-int QmlGraphicsTextInput::selectionStart() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->lastSelectionStart;
-}
-
-void QmlGraphicsTextInput::setSelectionStart(int s)
-{
-    Q_D(QmlGraphicsTextInput);
-    if(d->lastSelectionStart == s || s < 0 || s > text().length())
-        return;
-    d->lastSelectionStart = s;
-    d->control->setSelection(s, d->lastSelectionEnd - s);
-}
-
-/*!
-    \qmlproperty int TextInput::selectionEnd
-
-    The cursor position after the last character in the current selection.
-    Setting this and selectionStart allows you to specify a selection in the
-    text edit.
-
-    Note that if selectionStart == selectionEnd then there is no current
-    selection. If you attempt to set selectionEnd to a value outside of
-    the current text, selectionEnd will not be changed.
-
-    \sa selectionStart, cursorPosition, selectedText
-*/
-int QmlGraphicsTextInput::selectionEnd() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->lastSelectionEnd;
-}
-
-void QmlGraphicsTextInput::setSelectionEnd(int s)
-{
-    Q_D(QmlGraphicsTextInput);
-    if(d->lastSelectionEnd == s || s < 0 || s > text().length())
-        return;
-    d->lastSelectionEnd = s;
-    d->control->setSelection(d->lastSelectionStart, s - d->lastSelectionStart);
-}
-
-/*!
-    \qmlproperty string TextInput::selectedText
-
-    This read-only property provides the text currently selected in the
-    text input.
-
-    It is equivalent to the following snippet, but is faster and easier
-    to use.
-
-    \qml
-    myTextInput.text.toString().substring(myTextInput.selectionStart,
-        myTextInput.selectionEnd);
-    \endqml
-*/
-QString QmlGraphicsTextInput::selectedText() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->control->selectedText();
-}
-
-/*!
-    \qmlproperty bool TextInput::focusOnPress
-
-    Whether the TextInput should gain focus on a mouse press. By default this is
-    set to true.
-*/
-bool QmlGraphicsTextInput::focusOnPress() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->focusOnPress;
-}
-
-void QmlGraphicsTextInput::setFocusOnPress(bool b)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->focusOnPress == b)
-        return;
-
-    d->focusOnPress = b;
-
-    emit focusOnPressChanged(d->focusOnPress);
-}
-
-/*!
-    \qmlproperty QValidator* TextInput::validator
-
-    Allows you to set a QValidator on the TextInput. When a validator is set
-    the TextInput will only accept input which leaves the text property in
-    an acceptable or intermediate state. The accepted signal will only be sent
-    if the text is in an acceptable state when enter is pressed.
-
-    Currently supported validators are QIntValidator, QDoubleValidator and
-    QRegExpValidator. For details, refer to their C++ documentation and remember
-    that all Q_PROPERTIES are accessible from Qml. A brief usage guide follows:
-
-    QIntValidator and QDoubleValidator both are controllable through two properties,
-    top and bottom. The difference is that for QIntValidator the top and bottom properties
-    should be integers, and for QDoubleValidator they should be doubles. QRegExpValidator
-    has a single string property, regExp, which should be set to the regular expression to
-    be used for validation. An example of using validators is shown below, which allows
-    input of integers between 11 and 31 into the text input:
-
-    \code
-    import Qt 4.6
-    TextInput{
-        validator: QIntValidator{bottom: 11; top: 31;}
-        focus: true
-    }
-    \endcode
-
-    \sa acceptableInput, inputMask
-*/
-QValidator* QmlGraphicsTextInput::validator() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    //###const cast isn't good, but needed for property system?
-    return const_cast<QValidator*>(d->control->validator());
-}
-
-void QmlGraphicsTextInput::setValidator(QValidator* v)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->control->validator() == v)
-        return;
-
-    d->control->setValidator(v);
-    if(!d->control->hasAcceptableInput()){
-        d->oldValidity = false;
-        emit acceptableInputChanged();
-    }
-
-    emit validatorChanged();
-}
-
-/*!
-    \qmlproperty string TextInput::inputMask
-
-    Allows you to set an input mask on the TextInput, restricting the allowable
-    text inputs. See QLineEdit::inputMask for further details, as the exact
-    same mask strings are used by TextInput.
-
-    \sa acceptableInput, validator
-*/
-QString QmlGraphicsTextInput::inputMask() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->control->inputMask();
-}
-
-void QmlGraphicsTextInput::setInputMask(const QString &im)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->control->inputMask() == im)
-        return;
-
-    d->control->setInputMask(im);
-    emit inputMaskChanged(d->control->inputMask());
-}
-
-/*!
-    \qmlproperty bool TextInput::acceptableInput
-
-    This property is always true unless a validator or input mask has been set.
-    If a validator or input mask has been set, this property will only be true
-    if the current text is acceptable to the validator or input mask as a final
-    string (not as an intermediate string).
-*/
-bool QmlGraphicsTextInput::hasAcceptableInput() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->control->hasAcceptableInput();
-}
-
-/*!
-    \qmlproperty TextInput.EchoMode TextInput::echoMode
-
-    Specifies how the text should be displayed in the TextInput.
-    The default is Normal, which displays the text as it is. Other values
-    are Password, which displays asterixes instead of characters, NoEcho,
-    which displays nothing, and PasswordEchoOnEdit, which displays all but the
-    current character as asterixes.
-
-*/
-QmlGraphicsTextInput::EchoMode QmlGraphicsTextInput::echoMode() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return (QmlGraphicsTextInput::EchoMode)d->control->echoMode();
-}
-
-void QmlGraphicsTextInput::setEchoMode(QmlGraphicsTextInput::EchoMode echo)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (echoMode() == echo)
-        return;
-
-    d->control->setEchoMode((uint)echo);
-    emit echoModeChanged(echoMode());
-}
-
-/*!
-    \qmlproperty Component TextInput::cursorDelegate
-    The delegate for the cursor in the TextInput.
-
-    If you set a cursorDelegate for a TextInput, this delegate will be used for
-    drawing the cursor instead of the standard cursor. An instance of the
-    delegate will be created and managed by the TextInput when a cursor is
-    needed, and the x property of delegate instance will be set so as
-    to be one pixel before the top left of the current character.
-
-    Note that the root item of the delegate component must be a QmlGraphicsItem or
-    QmlGraphicsItem derived item.
-*/
-QmlComponent* QmlGraphicsTextInput::cursorDelegate() const
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->cursorComponent;
-}
-
-void QmlGraphicsTextInput::setCursorDelegate(QmlComponent* c)
-{
-    Q_D(QmlGraphicsTextInput);
-    if (d->cursorComponent == c)
-        return;
-
-    d->cursorComponent = c;
-    if(!c){
-        //note that the components are owned by something else
-        disconnect(d->control, SIGNAL(cursorPositionChanged(int, int)),
-                this, SLOT(moveCursor()));
-        delete d->cursorItem;
-    }else{
-        d->startCreatingCursor();
-    }
-
-    emit cursorDelegateChanged();
-}
-
-void QmlGraphicsTextInputPrivate::startCreatingCursor()
-{
-    Q_Q(QmlGraphicsTextInput);
-    q->connect(control, SIGNAL(cursorPositionChanged(int, int)),
-            q, SLOT(moveCursor()));
-    if(cursorComponent->isReady()){
-        q->createCursor();
-    }else if(cursorComponent->isLoading()){
-        q->connect(cursorComponent, SIGNAL(statusChanged(int)),
-                q, SLOT(createCursor()));
-    }else{//isError
-        qmlInfo(q) << QmlGraphicsTextInput::tr("Could not load cursor delegate");
-        qWarning() << cursorComponent->errors();
-    }
-}
-
-void QmlGraphicsTextInput::createCursor()
-{
-    Q_D(QmlGraphicsTextInput);
-    if(d->cursorComponent->isError()){
-        qmlInfo(this) << tr("Could not load cursor delegate");
-        qWarning() << d->cursorComponent->errors();
-        return;
-    }
-
-    if(!d->cursorComponent->isReady())
-        return;
-
-    if(d->cursorItem)
-        delete d->cursorItem;
-    d->cursorItem = qobject_cast<QmlGraphicsItem*>(d->cursorComponent->create());
-    if(!d->cursorItem){
-        qmlInfo(this) << tr("Could not instantiate cursor delegate");
-        //The failed instantiation should print its own error messages
-        return;
-    }
-
-    d->cursorItem->setParentItem(this);
-    d->cursorItem->setX(d->control->cursorToX());
-    d->cursorItem->setHeight(d->control->height());
-}
-
-void QmlGraphicsTextInput::moveCursor()
-{
-    Q_D(QmlGraphicsTextInput);
-    if(!d->cursorItem)
-        return;
-    d->cursorItem->setX(d->control->cursorToX() - d->hscroll);
-}
-
-int QmlGraphicsTextInput::xToPos(int x)
-{
-    Q_D(const QmlGraphicsTextInput);
-    return d->control->xToPos(x - d->hscroll);
-}
-
-void QmlGraphicsTextInput::focusChanged(bool hasFocus)
-{
-    Q_D(QmlGraphicsTextInput);
-    d->focused = hasFocus;
-    setCursorVisible(hasFocus);
-    QmlGraphicsItem::focusChanged(hasFocus);
-}
-
-void QmlGraphicsTextInput::keyPressEvent(QKeyEvent* ev)
-{
-    Q_D(QmlGraphicsTextInput);
-    if(((d->control->cursor() == 0 && ev->key() == Qt::Key_Left)
-            || (d->control->cursor() == d->control->text().length()
-                && ev->key() == Qt::Key_Right))
-            && (d->lastSelectionStart == d->lastSelectionEnd)){
-        //ignore when moving off the end
-        //unless there is a selection, because then moving will do something (deselect)
-        ev->ignore();
-    }else{
-        d->control->processKeyEvent(ev);
-    }
-    if (!ev->isAccepted())
-        QmlGraphicsPaintedItem::keyPressEvent(ev);
-}
-
-void QmlGraphicsTextInput::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsTextInput);
-    if(d->focusOnPress){
-        QGraphicsItem *p = parentItem();//###Is there a better way to find my focus scope?
-        while(p) {
-            if(p->flags() & QGraphicsItem::ItemIsFocusScope){
-                p->setFocus();
-                break;
-            }
-            p = p->parentItem();
-        }
-        setFocus(true);
-    }
-    d->control->processEvent(event);
-}
-
-/*!
-\overload
-Handles the given mouse \a event.
-*/
-void QmlGraphicsTextInput::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsTextInput);
-    QWidget *widget = event->widget();
-    if (widget && !d->control->isReadOnly() && boundingRect().contains(event->pos()))
-        qt_widget_private(widget)->handleSoftwareInputPanel(event->button(), d->focusOnPress);
-    d->control->processEvent(event);
-}
-
-bool QmlGraphicsTextInput::event(QEvent* ev)
-{
-    Q_D(QmlGraphicsTextInput);
-    //Anything we don't deal with ourselves, pass to the control
-    bool handled = false;
-    switch(ev->type()){
-        case QEvent::KeyPress:
-        case QEvent::KeyRelease://###Should the control be doing anything with release?
-        case QEvent::GraphicsSceneMousePress:
-        case QEvent::GraphicsSceneMouseRelease:
-            break;
-        default:
-            handled = d->control->processEvent(ev);
-    }
-    if(!handled)
-        return QmlGraphicsPaintedItem::event(ev);
-    return true;
-}
-
-void QmlGraphicsTextInput::geometryChanged(const QRectF &newGeometry,
-                                  const QRectF &oldGeometry)
-{
-    if (newGeometry.width() != oldGeometry.width())
-        updateSize();
-    QmlGraphicsPaintedItem::geometryChanged(newGeometry, oldGeometry);
-}
-
-void QmlGraphicsTextInput::drawContents(QPainter *p, const QRect &r)
-{
-    Q_D(QmlGraphicsTextInput);
-    p->setRenderHint(QPainter::TextAntialiasing, true);
-    p->save();
-    p->setPen(QPen(d->color));
-    int flags = QLineControl::DrawText;
-    if(!isReadOnly() && d->cursorVisible && !d->cursorItem)
-        flags |= QLineControl::DrawCursor;
-    if (d->control->hasSelectedText()){
-            flags |= QLineControl::DrawSelections;
-    }
-
-    QPoint offset = QPoint(0,0);
-    if(d->hAlign != AlignLeft){
-        QFontMetrics fm = QFontMetrics(d->font);
-        //###Is this using bearing appropriately?
-        int minLB = qMax(0, -fm.minLeftBearing());
-        int minRB = qMax(0, -fm.minRightBearing());
-        int widthUsed = qRound(d->control->naturalTextWidth()) + 1 + minRB;
-        int hOffset = 0;
-        if(d->hAlign == AlignRight){
-            hOffset = width() - widthUsed;
-        }else if(d->hAlign == AlignHCenter){
-            hOffset = (width() - widthUsed) / 2;
-        }
-        hOffset -= minLB;
-        offset = QPoint(hOffset, 0);
-    }
-    QRect clipRect = r;
-    d->control->draw(p, offset, clipRect, flags);
-
-    p->restore();
-}
-
-/*!
-\overload
-Returns the value of the given \a property.
-*/
-QVariant QmlGraphicsTextInput::inputMethodQuery(Qt::InputMethodQuery property) const
-{
-    Q_D(const QmlGraphicsTextInput);
-    switch(property) {
-    case Qt::ImFont:
-        return font();
-    case Qt::ImCursorPosition:
-        return QVariant(d->control->cursor());
-    case Qt::ImSurroundingText:
-        return QVariant(text());
-    case Qt::ImCurrentSelection:
-        return QVariant(selectedText());
-    case Qt::ImMaximumTextLength:
-        return QVariant(maxLength());
-    case Qt::ImAnchorPosition:
-        if (d->control->selectionStart() == d->control->selectionEnd())
-            return QVariant(d->control->cursor());
-        else if (d->control->selectionStart() == d->control->cursor())
-            return QVariant(d->control->selectionEnd());
-        else
-            return QVariant(d->control->selectionStart());
-    default:
-        return QVariant();
-    }
-}
-
-void QmlGraphicsTextInput::selectAll()
-{
-    Q_D(QmlGraphicsTextInput);
-    d->control->setSelection(0, d->control->text().length());
-}
-
-
-/*!
-    \qmlproperty bool TextInput::smooth
-
-    Set this property if you want the text to be smoothly scaled or
-    transformed.  Smooth filtering gives better visual quality, but is slower.  If
-    the item is displayed at its natural size, this property has no visual or
-    performance effect.
-
-    \note Generally scaling artifacts are only visible if the item is stationary on
-    the screen.  A common pattern when animating an item is to disable smooth
-    filtering at the beginning of the animation and reenable it at the conclusion.
-*/
-
-void QmlGraphicsTextInputPrivate::init()
-{
-    Q_Q(QmlGraphicsTextInput);
-    control->setCursorWidth(1);
-    control->setPasswordCharacter(QLatin1Char('*'));
-    control->setLayoutDirection(Qt::LeftToRight);
-    q->setSmooth(smooth);
-    q->setAcceptedMouseButtons(Qt::LeftButton);
-    q->setFlag(QGraphicsItem::ItemHasNoContents, false);
-    q->setFlag(QGraphicsItem::ItemAcceptsInputMethod);
-    q->connect(control, SIGNAL(cursorPositionChanged(int,int)),
-               q, SLOT(cursorPosChanged()));
-    q->connect(control, SIGNAL(selectionChanged()),
-               q, SLOT(selectionChanged()));
-    q->connect(control, SIGNAL(textChanged(const QString &)),
-               q, SLOT(q_textChanged()));
-    q->connect(control, SIGNAL(accepted()),
-               q, SIGNAL(accepted()));
-    q->connect(control, SIGNAL(updateNeeded(QRect)),
-               q, SLOT(updateRect(QRect)));
-    q->connect(control, SIGNAL(cursorPositionChanged(int,int)),
-               q, SLOT(updateRect()));//TODO: Only update rect between pos's
-    q->connect(control, SIGNAL(selectionChanged()),
-               q, SLOT(updateRect()));//TODO: Only update rect in selection
-    //Note that above TODOs probably aren't that big a savings
-    q->updateSize();
-    oldValidity = control->hasAcceptableInput();
-    lastSelectionStart = 0;
-    lastSelectionEnd = 0;
-}
-
-void QmlGraphicsTextInput::cursorPosChanged()
-{
-    Q_D(QmlGraphicsTextInput);
-    emit cursorPositionChanged();
-
-    if(!d->control->hasSelectedText()){
-        if(d->lastSelectionStart != d->control->cursor()){
-            d->lastSelectionStart = d->control->cursor();
-            emit selectionStartChanged();
-        }
-        if(d->lastSelectionEnd != d->control->cursor()){
-            d->lastSelectionEnd = d->control->cursor();
-            emit selectionEndChanged();
-        }
-    }
-}
-
-void QmlGraphicsTextInput::selectionChanged()
-{
-    Q_D(QmlGraphicsTextInput);
-    emit selectedTextChanged();
-
-    if(d->lastSelectionStart != d->control->selectionStart()){
-        d->lastSelectionStart = d->control->selectionStart();
-        if(d->lastSelectionStart == -1)
-            d->lastSelectionStart = d->control->cursor();
-        emit selectionStartChanged();
-    }
-    if(d->lastSelectionEnd != d->control->selectionEnd()){
-        d->lastSelectionEnd = d->control->selectionEnd();
-        if(d->lastSelectionEnd == -1)
-            d->lastSelectionEnd = d->control->cursor();
-        emit selectionEndChanged();
-    }
-}
-
-void QmlGraphicsTextInput::q_textChanged()
-{
-    Q_D(QmlGraphicsTextInput);
-    updateSize();
-    emit textChanged();
-    if(hasAcceptableInput() != d->oldValidity){
-        d->oldValidity = hasAcceptableInput();
-        emit acceptableInputChanged();
-    }
-}
-
-void QmlGraphicsTextInput::updateRect(const QRect &r)
-{
-    if(r == QRect())
-        clearCache();
-    else
-        dirtyCache(r);
-    update();
-}
-
-void QmlGraphicsTextInput::updateSize(bool needsRedraw)
-{
-    Q_D(QmlGraphicsTextInput);
-    int w = width();
-    int h = height();
-    setImplicitHeight(d->control->height());
-    int cursorWidth = d->control->cursorWidth();
-    if(d->cursorItem)
-        cursorWidth = d->cursorItem->width();
-    //### Is QFontMetrics too slow?
-    QFontMetricsF fm(d->font);
-    setImplicitWidth(fm.width(d->control->displayText())+cursorWidth);
-    setContentsSize(QSize(width(), height()));//Repaints if changed
-    if(w==width() && h==height() && needsRedraw){
-        clearCache();
-        update();
-    }
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
deleted file mode 100644
index 2b37b78..0000000
--- a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSTEXTINPUT_H
-#define QMLGRAPHICSTEXTINPUT_H
-
-#include "qmlgraphicstext_p.h"
-#include "qmlgraphicspainteditem_p.h"
-
-#include <QGraphicsSceneMouseEvent>
-#include <QIntValidator>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsTextInputPrivate;
-class QValidator;
-class Q_DECLARATIVE_EXPORT QmlGraphicsTextInput : public QmlGraphicsPaintedItem
-{
-    Q_OBJECT
-    Q_ENUMS(HAlignment)
-    Q_ENUMS(EchoMode)
-
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-    Q_PROPERTY(QColor selectionColor READ selectionColor WRITE setSelectionColor NOTIFY selectionColorChanged)
-    Q_PROPERTY(QColor selectedTextColor READ selectedTextColor WRITE setSelectedTextColor NOTIFY selectedTextColorChanged)
-    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
-    Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign NOTIFY horizontalAlignmentChanged)
-
-    Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly NOTIFY readOnlyChanged)
-    Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged)
-    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
-    Q_PROPERTY(QRect cursorRect READ cursorRect NOTIFY cursorPositionChanged)
-    Q_PROPERTY(QmlComponent *cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
-    Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged)
-    Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged)
-    Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectedTextChanged)
-
-    Q_PROPERTY(int maximumLength READ maxLength WRITE setMaxLength NOTIFY maximumLengthChanged)
-    Q_PROPERTY(QValidator* validator READ validator WRITE setValidator NOTIFY validatorChanged)
-    Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged)
-    Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints)
-
-    Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged)
-    Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged)
-    Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY focusOnPressChanged)
-
-public:
-    QmlGraphicsTextInput(QmlGraphicsItem* parent=0);
-    ~QmlGraphicsTextInput();
-
-    enum EchoMode {//To match QLineEdit::EchoMode
-        Normal,
-        NoEcho,
-        Password,
-        PasswordEchoOnEdit
-    };
-
-    enum HAlignment {
-        AlignLeft = Qt::AlignLeft,
-        AlignRight = Qt::AlignRight,
-        AlignHCenter = Qt::AlignHCenter
-    };
-
-    //### Should we have this function, x based properties,
-    //### or copy TextEdit with x instead of QTextCursor?
-    Q_INVOKABLE int xToPos(int x);
-
-    QString text() const;
-    void setText(const QString &);
-
-    QFont font() const;
-    void setFont(const QFont &font);
-
-    QColor color() const;
-    void setColor(const QColor &c);
-
-    QColor selectionColor() const;
-    void setSelectionColor(const QColor &c);
-
-    QColor selectedTextColor() const;
-    void setSelectedTextColor(const QColor &c);
-
-    HAlignment hAlign() const;
-    void setHAlign(HAlignment align);
-
-    bool isReadOnly() const;
-    void setReadOnly(bool);
-
-    bool isCursorVisible() const;
-    void setCursorVisible(bool on);
-
-    int cursorPosition() const;
-    void setCursorPosition(int cp);
-
-    QRect cursorRect() const;
-
-    int selectionStart() const;
-    void setSelectionStart(int);
-
-    int selectionEnd() const;
-    void setSelectionEnd(int);
-
-    QString selectedText() const;
-
-    int maxLength() const;
-    void setMaxLength(int ml);
-
-    QValidator * validator() const;
-    void setValidator(QValidator* v);
-
-    QString inputMask() const;
-    void setInputMask(const QString &im);
-
-    EchoMode echoMode() const;
-    void setEchoMode(EchoMode echo);
-
-    QmlComponent* cursorDelegate() const;
-    void setCursorDelegate(QmlComponent*);
-
-    bool focusOnPress() const;
-    void setFocusOnPress(bool);
-
-    bool hasAcceptableInput() const;
-
-    void drawContents(QPainter *p,const QRect &r);
-    QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
-
-Q_SIGNALS:
-    void textChanged();
-    void cursorPositionChanged();
-    void selectionStartChanged();
-    void selectionEndChanged();
-    void selectedTextChanged();
-    void accepted();
-    void acceptableInputChanged();
-    void colorChanged(const QColor &color);
-    void selectionColorChanged(const QColor &color);
-    void selectedTextColorChanged(const QColor &color);
-    void fontChanged(const QFont &font);
-    void horizontalAlignmentChanged(HAlignment alignment);
-    void readOnlyChanged(bool isReadOnly);
-    void cursorVisibleChanged(bool isCursorVisible);
-    void cursorDelegateChanged();
-    void maximumLengthChanged(int maximumLength);
-    void validatorChanged();
-    void inputMaskChanged(const QString &inputMask);
-    void echoModeChanged(EchoMode echoMode);
-    void focusOnPressChanged(bool focusOnPress);
-
-protected:
-    virtual void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry);
-
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    void keyPressEvent(QKeyEvent* ev);
-    bool event(QEvent *e);
-
-    void focusChanged(bool hasFocus);
-
-public Q_SLOTS:
-    void selectAll();
-
-private Q_SLOTS:
-    void updateSize(bool needsRedraw = true);
-    void q_textChanged();
-    void selectionChanged();
-    void createCursor();
-    void moveCursor();
-    void cursorPosChanged();
-    void updateRect(const QRect &r = QRect());
-
-private:
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsTextInput)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsTextInput)
-QML_DECLARE_TYPE(QValidator)
-QML_DECLARE_TYPE(QIntValidator)
-#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
-QML_DECLARE_TYPE(QDoubleValidator)
-QML_DECLARE_TYPE(QRegExpValidator)
-#endif
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSTEXTINPUT_H
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h
deleted file mode 100644
index 694ec93..0000000
--- a/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSTEXTINPUT_P_H
-#define QMLGRAPHICSTEXTINPUT_P_H
-
-#include "qmlgraphicstextinput_p.h"
-
-#include "qmlgraphicspainteditem_p_p.h"
-
-#include <qml.h>
-
-#include <QPointer>
-
-#include <private/qlinecontrol_p.h>
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsTextInputPrivate : public QmlGraphicsPaintedItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsTextInput)
-public:
-    QmlGraphicsTextInputPrivate() : control(new QLineControl(QString())),
-                 color((QRgb)0), style(QmlGraphicsText::Normal),
-                 styleColor((QRgb)0), hAlign(QmlGraphicsTextInput::AlignLeft),
-                 hscroll(0), oldScroll(0), focused(false), focusOnPress(true),
-                 cursorVisible(false)
-    {
-    }
-
-    ~QmlGraphicsTextInputPrivate()
-    {
-        delete control;
-    }
-
-    void init();
-    void startCreatingCursor();
-
-    QLineControl* control;
-
-    QFont font;
-    QColor  color;
-    QColor  selectionColor;
-    QColor  selectedTextColor;
-    QmlGraphicsText::TextStyle style;
-    QColor  styleColor;
-    QmlGraphicsTextInput::HAlignment hAlign;
-    QPointer<QmlComponent> cursorComponent;
-    QPointer<QmlGraphicsItem> cursorItem;
-
-    int lastSelectionStart;
-    int lastSelectionEnd;
-    int oldHeight;
-    int oldWidth;
-    bool oldValidity;
-    int hscroll;
-    int oldScroll;
-    bool focused;
-    bool focusOnPress;
-    bool cursorVisible;
-};
-
-QT_END_NAMESPACE
-
-#endif
-
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
deleted file mode 100644
index 97e4a97..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ /dev/null
@@ -1,1256 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsvisualitemmodel_p.h"
-
-#include "qmlgraphicsitem.h"
-
-#include <qmlcontext.h>
-#include <qmlengine.h>
-#include <qmlexpression.h>
-#include <qmlpackage_p.h>
-#include <qmlopenmetaobject_p.h>
-#include <qmllistaccessor_p.h>
-#include <qmlinfo.h>
-#include <qmldeclarativedata_p.h>
-#include <qmlpropertycache_p.h>
-#include <qmlguard_p.h>
-
-#include <qlistmodelinterface_p.h>
-#include <qhash.h>
-#include <qlist.h>
-#include <qmetaobjectbuilder_p.h>
-#include <QtCore/qdebug.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QHash<QObject*, QmlGraphicsVisualItemModelAttached*> QmlGraphicsVisualItemModelAttached::attachedProperties;
-
-
-class QmlGraphicsVisualItemModelPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsVisualItemModel)
-public:
-    QmlGraphicsVisualItemModelPrivate() : QObjectPrivate() {}
-
-    static void children_append(QmlListProperty<QmlGraphicsItem> *prop, QmlGraphicsItem *item) {
-        item->QObject::setParent(prop->object);
-        static_cast<QmlGraphicsVisualItemModelPrivate *>(prop->data)->children.append(item);
-        static_cast<QmlGraphicsVisualItemModelPrivate *>(prop->data)->itemAppended();
-        static_cast<QmlGraphicsVisualItemModelPrivate *>(prop->data)->emitChildrenChanged();
-    }
-
-    void itemAppended() {
-        Q_Q(QmlGraphicsVisualItemModel);
-        QmlGraphicsVisualItemModelAttached *attached = QmlGraphicsVisualItemModelAttached::properties(children.last());
-        attached->setIndex(children.count()-1);
-        emit q->itemsInserted(children.count()-1, 1);
-        emit q->countChanged();
-    }
-
-    void emitChildrenChanged() {
-        Q_Q(QmlGraphicsVisualItemModel);
-        emit q->childrenChanged();
-    }
-
-    QList<QmlGraphicsItem *> children;
-};
-
-
-/*!
-    \qmlclass VisualItemModel QmlGraphicsVisualItemModel
-  \since 4.7
-    \brief The VisualItemModel allows items to be provided to a view.
-
-    The children of the VisualItemModel are provided in a model which
-    can be used in a view.  Note that no delegate should be
-    provided to a view since the VisualItemModel contains the
-    visual delegate (items).
-
-    An item can determine its index within the
-    model via the VisualItemModel.index attached property.
-
-    The example below places three colored rectangles in a ListView.
-    \code
-    Item {
-        VisualItemModel {
-            id: itemModel
-            Rectangle { height: 30; width: 80; color: "red" }
-            Rectangle { height: 30; width: 80; color: "green" }
-            Rectangle { height: 30; width: 80; color: "blue" }
-        }
-
-        ListView {
-            anchors.fill: parent
-            model: itemModel
-        }
-    }
-    \endcode
-*/
-QmlGraphicsVisualItemModel::QmlGraphicsVisualItemModel()
-    : QmlGraphicsVisualModel(*(new QmlGraphicsVisualItemModelPrivate))
-{
-}
-
-QmlListProperty<QmlGraphicsItem> QmlGraphicsVisualItemModel::children()
-{
-    Q_D(QmlGraphicsVisualItemModel);
-    return QmlListProperty<QmlGraphicsItem>(this, d, QmlGraphicsVisualItemModelPrivate::children_append);
-}
-
-/*!
-    \qmlproperty int VisualItemModel::count
-
-    The number of items in the model.  This property is readonly.
-*/
-int QmlGraphicsVisualItemModel::count() const
-{
-    Q_D(const QmlGraphicsVisualItemModel);
-    return d->children.count();
-}
-
-bool QmlGraphicsVisualItemModel::isValid() const
-{
-    return true;
-}
-
-QmlGraphicsItem *QmlGraphicsVisualItemModel::item(int index, bool)
-{
-    Q_D(QmlGraphicsVisualItemModel);
-    return d->children.at(index);
-}
-
-QmlGraphicsVisualModel::ReleaseFlags QmlGraphicsVisualItemModel::release(QmlGraphicsItem *)
-{
-    // Nothing to do
-    return 0;
-}
-
-void QmlGraphicsVisualItemModel::completeItem()
-{
-    // Nothing to do
-}
-
-QString QmlGraphicsVisualItemModel::stringValue(int index, const QString &name)
-{
-    Q_D(QmlGraphicsVisualItemModel);
-    if (index < 0 || index >= d->children.count())
-        return QString();
-    return QmlEngine::contextForObject(d->children.at(index))->contextProperty(name).toString();
-}
-
-QVariant QmlGraphicsVisualItemModel::evaluate(int index, const QString &expression, QObject *objectContext)
-{
-    Q_D(QmlGraphicsVisualItemModel);
-    if (index < 0 || index >= d->children.count())
-        return QVariant();
-    QmlContext *ccontext = qmlContext(this);
-    QmlContext *ctxt = new QmlContext(ccontext);
-    ctxt->addDefaultObject(d->children.at(index));
-    QmlExpression e(ctxt, expression, objectContext);
-    QVariant value = e.value();
-    delete ctxt;
-    return value;
-}
-
-int QmlGraphicsVisualItemModel::indexOf(QmlGraphicsItem *item, QObject *) const
-{
-    Q_D(const QmlGraphicsVisualItemModel);
-    return d->children.indexOf(item);
-}
-
-QmlGraphicsVisualItemModelAttached *QmlGraphicsVisualItemModel::qmlAttachedProperties(QObject *obj)
-{
-    return QmlGraphicsVisualItemModelAttached::properties(obj);
-}
-
-//============================================================================
-
-class VDMDelegateDataType : public QmlOpenMetaObjectType
-{
-public:
-    VDMDelegateDataType(const QMetaObject *base, QmlEngine *engine) : QmlOpenMetaObjectType(base, engine) {}
-
-    void propertyCreated(int, QMetaPropertyBuilder &prop) {
-        prop.setWritable(false);
-    }
-};
-
-class QmlGraphicsVisualDataModelParts;
-class QmlGraphicsVisualDataModelData;
-class QmlGraphicsVisualDataModelPrivate : public QObjectPrivate
-{
-public:
-    QmlGraphicsVisualDataModelPrivate(QmlContext *);
-
-    static QmlGraphicsVisualDataModelPrivate *get(QmlGraphicsVisualDataModel *m) {
-        return static_cast<QmlGraphicsVisualDataModelPrivate *>(QObjectPrivate::get(m));
-    }
-
-    QmlGuard<QListModelInterface> m_listModelInterface;
-    QmlGuard<QAbstractItemModel> m_abstractItemModel;
-    QmlGuard<QmlGraphicsVisualDataModel> m_visualItemModel;
-    QString m_part;
-
-    QmlComponent *m_delegate;
-    QmlContext *m_context;
-    QList<int> m_roles;
-    QHash<QByteArray,int> m_roleNames;
-    void ensureRoles() {
-        if (m_roleNames.isEmpty()) {
-            if (m_listModelInterface) {
-                m_roles = m_listModelInterface->roles();
-                for (int ii = 0; ii < m_roles.count(); ++ii)
-                    m_roleNames.insert(m_listModelInterface->toString(m_roles.at(ii)).toUtf8(), m_roles.at(ii));
-                if (m_roles.count() == 1)
-                    m_roleNames.insert("modelData", m_roles.at(0));
-            } else if (m_abstractItemModel) {
-                for (QHash<int,QByteArray>::const_iterator it = m_abstractItemModel->roleNames().begin();
-                        it != m_abstractItemModel->roleNames().end(); ++it) {
-                    m_roles.append(it.key());
-                    m_roleNames.insert(*it, it.key());
-                }
-                if (m_roles.count() == 1)
-                    m_roleNames.insert("modelData", m_roles.at(0));
-            } else if (m_listAccessor) {
-                m_roleNames.insert("modelData", 0);
-                if (m_listAccessor->type() == QmlListAccessor::Instance) {
-                    if (QObject *object = m_listAccessor->at(0).value<QObject*>()) {
-                        int count = object->metaObject()->propertyCount();
-                        for (int ii = 1; ii < count; ++ii) {
-                            const QMetaProperty &prop = object->metaObject()->property(ii);
-                            m_roleNames.insert(prop.name(), 0);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    void createMetaData() {
-        if (!m_metaDataCreated) {
-            ensureRoles();
-            QHash<QByteArray, int>::const_iterator it = m_roleNames.begin();
-            while (it != m_roleNames.end()) {
-                m_delegateDataType->createProperty(it.key());
-                ++it;
-            }
-            m_metaDataCreated = true;
-        }
-    }
-
-    struct ObjectRef {
-        ObjectRef(QObject *object=0) : obj(object), ref(1) {}
-        QObject *obj;
-        int ref;
-    };
-    class Cache : public QHash<int, ObjectRef> {
-    public:
-        QObject *getItem(int index) {
-            QObject *item = 0;
-            QHash<int,ObjectRef>::iterator it = find(index);
-            if (it != end()) {
-                (*it).ref++;
-                item = (*it).obj;
-            }
-            return item;
-        }
-        QObject *item(int index) {
-            QObject *item = 0;
-            QHash<int, ObjectRef>::const_iterator it = find(index);
-            if (it != end())
-                item = (*it).obj;
-            return item;
-        }
-        void insertItem(int index, QObject *obj) {
-            insert(index, ObjectRef(obj));
-        }
-        bool releaseItem(QObject *obj) {
-            QHash<int, ObjectRef>::iterator it = begin();
-            for (; it != end(); ++it) {
-                ObjectRef &objRef = *it;
-                if (objRef.obj == obj) {
-                    if (--objRef.ref == 0) {
-                        erase(it);
-                        return true;
-                    }
-                    break;
-                }
-            }
-            return false;
-        }
-    };
-
-    int modelCount() const {
-        if (m_visualItemModel)
-            return m_visualItemModel->count();
-        if (m_listModelInterface)
-            return m_listModelInterface->count();
-        if (m_abstractItemModel)
-            return m_abstractItemModel->rowCount(m_root);
-        if (m_listAccessor)
-            return m_listAccessor->count();
-        return 0;
-    }
-
-    Cache m_cache;
-    QHash<QObject *, QmlPackage*> m_packaged;
-
-    QmlGraphicsVisualDataModelParts *m_parts;
-    friend class QmlGraphicsVisualItemParts;
-
-    VDMDelegateDataType *m_delegateDataType;
-    friend class QmlGraphicsVisualDataModelData;
-    bool m_metaDataCreated;
-    bool m_metaDataCacheable;
-
-    QmlGraphicsVisualDataModelData *data(QObject *item);
-
-    QVariant m_modelVariant;
-    QmlListAccessor *m_listAccessor;
-
-    QModelIndex m_root;
-};
-
-class QmlGraphicsVisualDataModelDataMetaObject : public QmlOpenMetaObject
-{
-public:
-    QmlGraphicsVisualDataModelDataMetaObject(QObject *parent, QmlOpenMetaObjectType *type)
-    : QmlOpenMetaObject(parent, type) {}
-
-    virtual QVariant initialValue(int);
-    virtual int createProperty(const char *, const char *);
-
-private:
-    friend class QmlGraphicsVisualDataModelData;
-    QHash<int,int> roleToProp;
-};
-
-class QmlGraphicsVisualDataModelData : public QObject
-{
-Q_OBJECT
-public:
-    QmlGraphicsVisualDataModelData(int index, QmlGraphicsVisualDataModel *model);
-    ~QmlGraphicsVisualDataModelData();
-
-    Q_PROPERTY(int index READ index NOTIFY indexChanged)
-    int index() const;
-    void setIndex(int index);
-
-    int propForRole(int) const;
-    void setValue(int, const QVariant &);
-
-Q_SIGNALS:
-    void indexChanged();
-
-private:
-    friend class QmlGraphicsVisualDataModelDataMetaObject;
-    int m_index;
-    QmlGuard<QmlGraphicsVisualDataModel> m_model;
-    QmlGraphicsVisualDataModelDataMetaObject *m_meta;
-};
-
-int QmlGraphicsVisualDataModelData::propForRole(int id) const
-{
-    QHash<int,int>::const_iterator it = m_meta->roleToProp.find(id);
-    if (it != m_meta->roleToProp.end())
-        return m_meta->roleToProp[id];
-    return -1;
-}
-
-void QmlGraphicsVisualDataModelData::setValue(int id, const QVariant &val)
-{
-    m_meta->setValue(id, val);
-}
-
-int QmlGraphicsVisualDataModelDataMetaObject::createProperty(const char *name, const char *type)
-{
-    QmlGraphicsVisualDataModelData *data =
-        static_cast<QmlGraphicsVisualDataModelData *>(object());
-
-    if (!data->m_model)
-        return -1;
-
-    QmlGraphicsVisualDataModelPrivate *model = QmlGraphicsVisualDataModelPrivate::get(data->m_model);
-
-    if ((!model->m_listModelInterface || !model->m_abstractItemModel) && model->m_listAccessor) {
-        if (model->m_listAccessor->type() == QmlListAccessor::ListProperty) {
-            model->ensureRoles();
-            QObject *object = model->m_listAccessor->at(data->m_index).value<QObject*>();
-            if (object && (object->property(name).isValid() || qstrcmp(name,"modelData")==0))
-                return QmlOpenMetaObject::createProperty(name, type);
-        }
-    }
-    return -1;
-}
-
-QVariant QmlGraphicsVisualDataModelDataMetaObject::initialValue(int propId)
-{
-    QmlGraphicsVisualDataModelData *data =
-        static_cast<QmlGraphicsVisualDataModelData *>(object());
-
-    Q_ASSERT(data->m_model);
-    QmlGraphicsVisualDataModelPrivate *model = QmlGraphicsVisualDataModelPrivate::get(data->m_model);
-
-    QByteArray propName = name(propId);
-    if ((!model->m_listModelInterface || !model->m_abstractItemModel) && model->m_listAccessor) {
-        if (propName == "modelData") {
-            if (model->m_listAccessor->type() == QmlListAccessor::Instance) {
-                QObject *object = model->m_listAccessor->at(0).value<QObject*>();
-                return object->metaObject()->property(1).read(object); // the first property after objectName
-            }
-            return model->m_listAccessor->at(data->m_index);
-        } else {
-            // return any property of a single object instance.
-            QObject *object = model->m_listAccessor->at(data->m_index).value<QObject*>();
-            return object->property(propName);
-        }
-    } else if (model->m_listModelInterface) {
-        model->ensureRoles();
-        QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
-        if (it != model->m_roleNames.end()) {
-            roleToProp.insert(*it, propId);
-            QVariant value = model->m_listModelInterface->data(data->m_index, *it);
-            return value;
-        } else if (model->m_roles.count() == 1 && propName == "modelData") {
-            //for compatability with other lists, assign modelData if there is only a single role
-            roleToProp.insert(model->m_roles.first(), propId);
-            QVariant value = model->m_listModelInterface->data(data->m_index, model->m_roles.first());
-            return value;
-        }
-    } else if (model->m_abstractItemModel) {
-        model->ensureRoles();
-        QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
-        if (it != model->m_roleNames.end()) {
-            roleToProp.insert(*it, propId);
-            QModelIndex index = model->m_abstractItemModel->index(data->m_index, 0, model->m_root);
-            return model->m_abstractItemModel->data(index, *it);
-        }
-    }
-    Q_ASSERT(!"Can never be reached");
-    return QVariant();
-}
-
-QmlGraphicsVisualDataModelData::QmlGraphicsVisualDataModelData(int index,
-                                               QmlGraphicsVisualDataModel *model)
-: m_index(index), m_model(model), 
-m_meta(new QmlGraphicsVisualDataModelDataMetaObject(this, QmlGraphicsVisualDataModelPrivate::get(model)->m_delegateDataType))
-{
-    QmlGraphicsVisualDataModelPrivate *modelPriv = QmlGraphicsVisualDataModelPrivate::get(model);
-    if (modelPriv->m_metaDataCacheable) {
-        if (!modelPriv->m_metaDataCreated)
-            modelPriv->createMetaData();
-        m_meta->setCached(true);
-    }
-}
-
-QmlGraphicsVisualDataModelData::~QmlGraphicsVisualDataModelData()
-{
-}
-
-int QmlGraphicsVisualDataModelData::index() const
-{
-    return m_index;
-}
-
-// This is internal only - it should not be set from qml
-void QmlGraphicsVisualDataModelData::setIndex(int index)
-{
-    m_index = index;
-    emit indexChanged();
-}
-
-//---------------------------------------------------------------------------
-
-class QmlGraphicsVisualDataModelPartsMetaObject : public QmlOpenMetaObject
-{
-public:
-    QmlGraphicsVisualDataModelPartsMetaObject(QObject *parent)
-    : QmlOpenMetaObject(parent) {}
-
-    virtual void propertyCreated(int, QMetaPropertyBuilder &);
-    virtual QVariant initialValue(int);
-};
-
-class QmlGraphicsVisualDataModelParts : public QObject
-{
-Q_OBJECT
-public:
-    QmlGraphicsVisualDataModelParts(QmlGraphicsVisualDataModel *parent);
-
-private:
-    friend class QmlGraphicsVisualDataModelPartsMetaObject;
-    QmlGraphicsVisualDataModel *model;
-};
-
-void QmlGraphicsVisualDataModelPartsMetaObject::propertyCreated(int, QMetaPropertyBuilder &prop)
-{
-    prop.setWritable(false);
-}
-
-QVariant QmlGraphicsVisualDataModelPartsMetaObject::initialValue(int id)
-{
-    QmlGraphicsVisualDataModel *m = new QmlGraphicsVisualDataModel;
-    m->setParent(object());
-    m->setPart(QString::fromUtf8(name(id)));
-    m->setModel(QVariant::fromValue(static_cast<QmlGraphicsVisualDataModelParts *>(object())->model));
-
-    QVariant var = QVariant::fromValue((QObject *)m);
-    return var;
-}
-
-QmlGraphicsVisualDataModelParts::QmlGraphicsVisualDataModelParts(QmlGraphicsVisualDataModel *parent)
-: QObject(parent), model(parent) 
-{
-    new QmlGraphicsVisualDataModelPartsMetaObject(this);
-}
-
-QmlGraphicsVisualDataModelPrivate::QmlGraphicsVisualDataModelPrivate(QmlContext *ctxt)
-: m_listModelInterface(0), m_abstractItemModel(0), m_visualItemModel(0), m_delegate(0)
-, m_context(ctxt), m_parts(0), m_delegateDataType(0), m_metaDataCreated(false)
-, m_metaDataCacheable(false), m_listAccessor(0)
-{
-}
-
-QmlGraphicsVisualDataModelData *QmlGraphicsVisualDataModelPrivate::data(QObject *item)
-{
-    QmlGraphicsVisualDataModelData *dataItem =
-        item->findChild<QmlGraphicsVisualDataModelData *>();
-    Q_ASSERT(dataItem);
-    return dataItem;
-}
-
-//---------------------------------------------------------------------------
-
-/*!
-    \qmlclass VisualDataModel QmlGraphicsVisualDataModel
-    \brief The VisualDataModel encapsulates a model and delegate
-
-    A VisualDataModel encapsulates a model and the delegate that will
-    be instantiated for items in the model.
-
-    It is usually not necessary to create a VisualDataModel directly,
-    since the QML views will create one internally.
-
-    The example below illustrates using a VisualDataModel with a ListView.
-
-    \code
-    VisualDataModel {
-        id: visualModel
-        model: myModel
-        delegate: Component {
-            Rectangle {
-                height: 25
-                width: 100
-                Text { text: "Name:" + name}
-            }
-        }
-    }
-    ListView {
-        width: 100
-        height: 100
-        anchors.fill: parent
-        model: visualModel
-    }
-    \endcode
-*/
-
-QmlGraphicsVisualDataModel::QmlGraphicsVisualDataModel()
-: QmlGraphicsVisualModel(*(new QmlGraphicsVisualDataModelPrivate(0)))
-{
-}
-
-QmlGraphicsVisualDataModel::QmlGraphicsVisualDataModel(QmlContext *ctxt)
-: QmlGraphicsVisualModel(*(new QmlGraphicsVisualDataModelPrivate(ctxt)))
-{
-}
-
-QmlGraphicsVisualDataModel::~QmlGraphicsVisualDataModel()
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (d->m_listAccessor)
-        delete d->m_listAccessor;
-    if (d->m_delegateDataType)
-        d->m_delegateDataType->release();
-}
-
-/*!
-    \qmlproperty model VisualDataModel::model
-    This property holds the model providing data for the VisualDataModel.
-
-    The model provides a set of data that is used to create the items
-    for a view.  For large or dynamic datasets the model is usually
-    provided by a C++ model object.  The C++ model object must be a \l
-    {QAbstractItemModel} subclass or a simple list.
-
-    Models can also be created directly in QML, using a \l{ListModel} or
-    \l{XmlListModel}.
-
-    \sa {qmlmodels}{Data Models}
-*/
-QVariant QmlGraphicsVisualDataModel::model() const
-{
-    Q_D(const QmlGraphicsVisualDataModel);
-    return d->m_modelVariant;
-}
-
-void QmlGraphicsVisualDataModel::setModel(const QVariant &model)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    delete d->m_listAccessor;
-    d->m_listAccessor = 0;
-    d->m_modelVariant = model;
-    if (d->m_listModelInterface) {
-        // Assume caller has released all items.
-        QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsChanged(int,int,QList<int>)),
-                this, SLOT(_q_itemsChanged(int,int,QList<int>)));
-        QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsInserted(int,int)),
-                this, SLOT(_q_itemsInserted(int,int)));
-        QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsRemoved(int,int)),
-                this, SLOT(_q_itemsRemoved(int,int)));
-        QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsMoved(int,int,int)),
-                this, SLOT(_q_itemsMoved(int,int,int)));
-        d->m_listModelInterface = 0;
-    } else if (d->m_abstractItemModel) {
-        QObject::disconnect(d->m_abstractItemModel, SIGNAL(rowsInserted(const QModelIndex &,int,int)),
-                            this, SLOT(_q_rowsInserted(const QModelIndex &,int,int)));
-        QObject::disconnect(d->m_abstractItemModel, SIGNAL(rowsRemoved(const QModelIndex &,int,int)),
-                            this, SLOT(_q_rowsRemoved(const QModelIndex &,int,int)));
-        QObject::disconnect(d->m_abstractItemModel, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)),
-                            this, SLOT(_q_dataChanged(const QModelIndex&,const QModelIndex&)));
-        QObject::disconnect(d->m_abstractItemModel, SIGNAL(rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)),
-                            this, SLOT(_q_rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)));
-    } else if (d->m_visualItemModel) {
-        QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsInserted(int,int)),
-                         this, SIGNAL(itemsInserted(int,int)));
-        QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsRemoved(int,int)),
-                         this, SIGNAL(itemsRemoved(int,int)));
-        QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsMoved(int,int,int)),
-                         this, SIGNAL(itemsMoved(int,int,int)));
-        QObject::disconnect(d->m_visualItemModel, SIGNAL(createdPackage(int,QmlPackage*)),
-                         this, SLOT(_q_createdPackage(int,QmlPackage*)));
-        QObject::disconnect(d->m_visualItemModel, SIGNAL(destroyingPackage(QmlPackage*)),
-                         this, SLOT(_q_destroyingPackage(QmlPackage*)));
-        d->m_visualItemModel = 0;
-    }
-
-    d->m_roles.clear();
-    d->m_roleNames.clear();
-    if (d->m_delegateDataType)
-        d->m_delegateDataType->release();
-    d->m_metaDataCreated = 0;
-    d->m_metaDataCacheable = false;
-    d->m_delegateDataType = new VDMDelegateDataType(&QmlGraphicsVisualDataModelData::staticMetaObject, d->m_context?d->m_context->engine():qmlEngine(this));
-
-    QObject *object = qvariant_cast<QObject *>(model);
-    if (object && (d->m_listModelInterface = qobject_cast<QListModelInterface *>(object))) {
-        QObject::connect(d->m_listModelInterface, SIGNAL(itemsChanged(int,int,QList<int>)),
-                         this, SLOT(_q_itemsChanged(int,int,QList<int>)));
-        QObject::connect(d->m_listModelInterface, SIGNAL(itemsInserted(int,int)),
-                         this, SLOT(_q_itemsInserted(int,int)));
-        QObject::connect(d->m_listModelInterface, SIGNAL(itemsRemoved(int,int)),
-                         this, SLOT(_q_itemsRemoved(int,int)));
-        QObject::connect(d->m_listModelInterface, SIGNAL(itemsMoved(int,int,int)),
-                         this, SLOT(_q_itemsMoved(int,int,int)));
-        d->m_metaDataCacheable = true;
-        if (d->m_delegate && d->m_listModelInterface->count())
-            emit itemsInserted(0, d->m_listModelInterface->count());
-        return;
-    } else if (object && (d->m_abstractItemModel = qobject_cast<QAbstractItemModel *>(object))) {
-        QObject::connect(d->m_abstractItemModel, SIGNAL(rowsInserted(const QModelIndex &,int,int)),
-                            this, SLOT(_q_rowsInserted(const QModelIndex &,int,int)));
-        QObject::connect(d->m_abstractItemModel, SIGNAL(rowsRemoved(const QModelIndex &,int,int)),
-                            this, SLOT(_q_rowsRemoved(const QModelIndex &,int,int)));
-        QObject::connect(d->m_abstractItemModel, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)),
-                            this, SLOT(_q_dataChanged(const QModelIndex&,const QModelIndex&)));
-        QObject::connect(d->m_abstractItemModel, SIGNAL(rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)),
-                            this, SLOT(_q_rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)));
-        d->m_metaDataCacheable = true;
-        return;
-    }
-    if ((d->m_visualItemModel = qvariant_cast<QmlGraphicsVisualDataModel *>(model))) {
-        QObject::connect(d->m_visualItemModel, SIGNAL(itemsInserted(int,int)),
-                         this, SIGNAL(itemsInserted(int,int)));
-        QObject::connect(d->m_visualItemModel, SIGNAL(itemsRemoved(int,int)),
-                         this, SIGNAL(itemsRemoved(int,int)));
-        QObject::connect(d->m_visualItemModel, SIGNAL(itemsMoved(int,int,int)),
-                         this, SIGNAL(itemsMoved(int,int,int)));
-        QObject::connect(d->m_visualItemModel, SIGNAL(createdPackage(int,QmlPackage*)),
-                         this, SLOT(_q_createdPackage(int,QmlPackage*)));
-        QObject::connect(d->m_visualItemModel, SIGNAL(destroyingPackage(QmlPackage*)),
-                         this, SLOT(_q_destroyingPackage(QmlPackage*)));
-        return;
-    }
-    d->m_listAccessor = new QmlListAccessor;
-    d->m_listAccessor->setList(model, d->m_context?d->m_context->engine():qmlEngine(this));
-    if (d->m_listAccessor->type() != QmlListAccessor::ListProperty)
-        d->m_metaDataCacheable = true;
-    if (d->m_delegate && d->modelCount()) {
-        emit itemsInserted(0, d->modelCount());
-        emit countChanged();
-    }
-}
-
-/*!
-    \qmlproperty component VisualDataModel::delegate
-
-    The delegate provides a template defining each item instantiated by a view.
-    The index is exposed as an accessible \c index property.  Properties of the
-    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
-
-    Here is an example delegate:
-    \snippet doc/src/snippets/declarative/listview/listview.qml 0
-*/
-QmlComponent *QmlGraphicsVisualDataModel::delegate() const
-{
-    Q_D(const QmlGraphicsVisualDataModel);
-    if (d->m_visualItemModel)
-        return d->m_visualItemModel->delegate();
-    return d->m_delegate;
-}
-
-void QmlGraphicsVisualDataModel::setDelegate(QmlComponent *delegate)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    bool wasValid = d->m_delegate != 0;
-    d->m_delegate = delegate;
-    if (!wasValid && d->modelCount() && d->m_delegate) {
-        emit itemsInserted(0, d->modelCount());
-        emit countChanged();
-    }
-    if (wasValid && !d->m_delegate && d->modelCount()) {
-        emit itemsRemoved(0, d->modelCount());
-        emit countChanged();
-    }
-}
-
-/*!
-    \qmlproperty QModelIndex VisualDataModel::rootIndex
-
-    QAbstractItemModel provides a heirachical tree of data, whereas
-    QML only operates on list data. rootIndex allows the children of
-    any node in a QAbstractItemModel to be provided by this model.
-
-    This property only affects models of type QAbstractItemModel.
-
-    \code
-    // main.cpp
-    Q_DECLARE_METATYPE(QModelIndex)
-
-    class MyModel : public QDirModel
-    {
-        Q_OBJECT
-    public:
-        MyModel(QmlContext *ctxt) : QDirModel(), context(ctxt) {
-            QHash<int,QByteArray> roles = roleNames();
-            roles.insert(FilePathRole, "path");
-            setRoleNames(roles);
-            context->setContextProperty("myModel", this);
-            context->setContextProperty("myRoot", QVariant::fromValue(index(0,0,QModelIndex())));
-        }
-
-        Q_INVOKABLE void setRoot(const QString &path) {
-            QModelIndex root = index(path);
-            context->setContextProperty("myRoot", QVariant::fromValue(root));
-        }
-
-        QmlContext *context;
-    };
-
-    int main(int argc, char ** argv)
-    {
-        QApplication app(argc, argv);
-
-        QmlView view;
-
-        MyModel model(view.rootContext());
-
-        view.setSource(QUrl("qrc:view.qml"));
-        view.show();
-
-        return app.exec();
-    }
-
-    #include "main.moc"
-    \endcode
-
-    \code
-    // view.qml
-    import Qt 4.6
-
-    ListView {
-        width: 200
-        height: 200
-        model: VisualDataModel {
-            model: myModel
-            rootIndex: myRoot
-            delegate: Component {
-                Rectangle {
-                    height: 25; width: 100
-                    Text { text: path }
-                    MouseRegion {
-                        anchors.fill: parent;
-                        onClicked: myModel.setRoot(path)
-                    }
-                }
-            }
-        }
-    }
-    \endcode
-
-*/
-QModelIndex QmlGraphicsVisualDataModel::rootIndex() const
-{
-    Q_D(const QmlGraphicsVisualDataModel);
-    return d->m_root;
-}
-
-void QmlGraphicsVisualDataModel::setRootIndex(const QModelIndex &root)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (d->m_root != root) {
-        int oldCount = d->modelCount();
-        d->m_root = root;
-        int newCount = d->modelCount();
-        if (d->m_delegate && oldCount)
-            emit itemsRemoved(0, oldCount);
-        if (d->m_delegate && newCount)
-            emit itemsInserted(0, newCount);
-        if (newCount != oldCount)
-            emit countChanged();
-        emit rootIndexChanged();
-    }
-}
-
-QString QmlGraphicsVisualDataModel::part() const
-{
-    Q_D(const QmlGraphicsVisualDataModel);
-    return d->m_part;
-}
-
-void QmlGraphicsVisualDataModel::setPart(const QString &part)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    d->m_part = part;
-}
-
-int QmlGraphicsVisualDataModel::count() const
-{
-    Q_D(const QmlGraphicsVisualDataModel);
-    return d->modelCount();
-}
-
-QmlGraphicsItem *QmlGraphicsVisualDataModel::item(int index, bool complete)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (d->m_visualItemModel)
-        return d->m_visualItemModel->item(index, d->m_part.toUtf8(), complete);
-    return item(index, QByteArray(), complete);
-}
-
-/*
-  Returns ReleaseStatus flags.
-*/
-QmlGraphicsVisualDataModel::ReleaseFlags QmlGraphicsVisualDataModel::release(QmlGraphicsItem *item)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (d->m_visualItemModel)
-        return d->m_visualItemModel->release(item);
-
-    ReleaseFlags stat = 0;
-    QObject *obj = item;
-    bool inPackage = false;
-
-    QHash<QObject*,QmlPackage*>::iterator it = d->m_packaged.find(item);
-    if (it != d->m_packaged.end()) {
-        QmlPackage *package = *it;
-        d->m_packaged.erase(it);
-        if (d->m_packaged.contains(item))
-            stat |= Referenced;
-        inPackage = true;
-        obj = package; // fall through and delete
-    }
-
-    if (d->m_cache.releaseItem(obj)) {
-        if (inPackage) {
-            emit destroyingPackage(qobject_cast<QmlPackage*>(obj));
-        } else {
-            item->setVisible(false);
-            static_cast<QGraphicsItem*>(item)->setParentItem(0);
-        }
-        stat |= Destroyed;
-        obj->deleteLater();
-    } else if (!inPackage) {
-        stat |= Referenced;
-    }
-
-    return stat;
-}
-
-QObject *QmlGraphicsVisualDataModel::parts()
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (!d->m_parts) 
-        d->m_parts = new QmlGraphicsVisualDataModelParts(this);
-    return d->m_parts;
-}
-
-QmlGraphicsItem *QmlGraphicsVisualDataModel::item(int index, const QByteArray &viewId, bool complete)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (d->m_visualItemModel)
-        return d->m_visualItemModel->item(index, viewId, complete);
-
-    if (d->modelCount() <= 0 || !d->m_delegate)
-        return 0;
-    QObject *nobj = d->m_cache.getItem(index);
-    if (!nobj) {
-        QmlContext *ccontext = d->m_context;
-        if (!ccontext) ccontext = qmlContext(this);
-        QmlContext *ctxt = new QmlContext(ccontext);
-        QmlGraphicsVisualDataModelData *data = new QmlGraphicsVisualDataModelData(index, this);
-        ctxt->setContextProperty(QLatin1String("model"), data);
-        ctxt->addDefaultObject(data);
-        nobj = d->m_delegate->beginCreate(ctxt);
-        if (complete)
-            d->m_delegate->completeCreate();
-        if (nobj) {
-            ctxt->setParent(nobj);
-            data->setParent(nobj);
-            d->m_cache.insertItem(index, nobj);
-            if (QmlPackage *package = qobject_cast<QmlPackage *>(nobj))
-                emit createdPackage(index, package);
-        } else {
-            delete data;
-            delete ctxt;
-            qWarning() << d->m_delegate->errors();
-        }
-    }
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(nobj);
-    if (!item) {
-        QmlPackage *package = qobject_cast<QmlPackage *>(nobj);
-        if (package) {
-            QObject *o = package->part(QString::fromUtf8(viewId));
-            item = qobject_cast<QmlGraphicsItem *>(o);
-            if (item)
-                d->m_packaged.insertMulti(item, package);
-        }
-    }
-    if (!item) {
-        d->m_cache.releaseItem(nobj);
-        qmlInfo(d->m_delegate) << QmlGraphicsVisualDataModel::tr("Delegate component must be Item type.");
-    }
-
-    return item;
-}
-
-void QmlGraphicsVisualDataModel::completeItem()
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (d->m_visualItemModel) {
-        d->m_visualItemModel->completeItem();
-        return;
-    }
-
-    d->m_delegate->completeCreate();
-}
-
-QString QmlGraphicsVisualDataModel::stringValue(int index, const QString &name)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (d->m_visualItemModel)
-        return d->m_visualItemModel->stringValue(index, name);
-
-    if ((!d->m_listModelInterface && !d->m_abstractItemModel) || !d->m_delegate)
-        return QString();
-
-    QString val;
-    QObject *data = 0;
-    bool tempData = false;
-
-    if (QObject *nobj = d->m_cache.item(index))
-        data = d->data(nobj);
-    if (!data) {
-        data = new QmlGraphicsVisualDataModelData(index, this);
-        tempData = true;
-    }
-
-    QmlDeclarativeData *ddata = QmlDeclarativeData::get(data);
-    if (ddata && ddata->propertyCache) {
-        QmlPropertyCache::Data *prop = ddata->propertyCache->property(name);
-        if (prop) {
-            if (prop->propType == QVariant::String) {
-                void *args[] = { &val, 0 };
-                QMetaObject::metacall(data, QMetaObject::ReadProperty, prop->coreIndex, args);
-            } else if (prop->propType == qMetaTypeId<QVariant>()) {
-                QVariant v;
-                void *args[] = { &v, 0 };
-                QMetaObject::metacall(data, QMetaObject::ReadProperty, prop->coreIndex, args);
-                val = v.toString();
-            }
-        } else {
-            val = data->property(name.toUtf8()).toString();
-        }
-    } else {
-        val = data->property(name.toUtf8()).toString();
-    }
-
-    if (tempData)
-        delete data;
-
-    return val;
-}
-
-QVariant QmlGraphicsVisualDataModel::evaluate(int index, const QString &expression, QObject *objectContext)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (d->m_visualItemModel)
-        return d->m_visualItemModel->evaluate(index, expression, objectContext);
-
-    if ((!d->m_listModelInterface && !d->m_abstractItemModel) || !d->m_delegate)
-        return QVariant();
-
-    QVariant value;
-    QObject *nobj = d->m_cache.item(index);
-    if (nobj) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(nobj);
-        if (item) {
-            QmlExpression e(qmlContext(item), expression, objectContext);
-            value = e.value();
-        }
-    } else {
-        QmlContext *ccontext = d->m_context;
-        if (!ccontext) ccontext = qmlContext(this);
-        QmlContext *ctxt = new QmlContext(ccontext);
-        QmlGraphicsVisualDataModelData *data = new QmlGraphicsVisualDataModelData(index, this);
-        ctxt->addDefaultObject(data);
-        QmlExpression e(ctxt, expression, objectContext);
-        value = e.value();
-        delete data;
-        delete ctxt;
-    }
-
-    return value;
-}
-
-int QmlGraphicsVisualDataModel::indexOf(QmlGraphicsItem *item, QObject *) const
-{
-    QVariant val = QmlEngine::contextForObject(item)->contextProperty(QLatin1String("index"));
-        return val.toInt();
-    return -1;
-}
-
-void QmlGraphicsVisualDataModel::_q_itemsChanged(int index, int count,
-                                         const QList<int> &roles)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    // XXX - highly inefficient
-    for (int ii = index; ii < index + count; ++ii) {
-
-        if (QObject *item = d->m_cache.item(ii)) {
-            QmlGraphicsVisualDataModelData *data = d->data(item);
-
-            for (int roleIdx = 0; roleIdx < roles.count(); ++roleIdx) {
-                int role = roles.at(roleIdx);
-                int propId = data->propForRole(role);
-                if (propId != -1) {
-                    if (d->m_listModelInterface) {
-                        data->setValue(propId, d->m_listModelInterface->data(ii, QList<int>() << role).value(role));
-                    } else if (d->m_abstractItemModel) {
-                        QModelIndex index = d->m_abstractItemModel->index(ii, 0, d->m_root);
-                        data->setValue(propId, d->m_abstractItemModel->data(index, role));
-                    }
-                }
-            }
-        }
-    }
-}
-
-void QmlGraphicsVisualDataModel::_q_itemsInserted(int index, int count)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    // XXX - highly inefficient
-    QHash<int,QmlGraphicsVisualDataModelPrivate::ObjectRef> items;
-    for (QHash<int,QmlGraphicsVisualDataModelPrivate::ObjectRef>::Iterator iter = d->m_cache.begin();
-        iter != d->m_cache.end(); ) {
-
-        if (iter.key() >= index) {
-            QmlGraphicsVisualDataModelPrivate::ObjectRef objRef = *iter;
-            int index = iter.key() + count;
-            iter = d->m_cache.erase(iter);
-
-            items.insert(index, objRef);
-
-            QmlGraphicsVisualDataModelData *data = d->data(objRef.obj);
-            data->setIndex(index);
-        } else {
-            ++iter;
-        }
-    }
-    d->m_cache.unite(items);
-
-    emit itemsInserted(index, count);
-    emit countChanged();
-}
-
-void QmlGraphicsVisualDataModel::_q_itemsRemoved(int index, int count)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    // XXX - highly inefficient
-    QHash<int, QmlGraphicsVisualDataModelPrivate::ObjectRef> items;
-    for (QHash<int, QmlGraphicsVisualDataModelPrivate::ObjectRef>::Iterator iter = d->m_cache.begin();
-        iter != d->m_cache.end(); ) {
-        if (iter.key() >= index && iter.key() < index + count) {
-            QmlGraphicsVisualDataModelPrivate::ObjectRef objRef = *iter;
-            iter = d->m_cache.erase(iter);
-            items.insertMulti(-1, objRef); //XXX perhaps better to maintain separately
-            QmlGraphicsVisualDataModelData *data = d->data(objRef.obj);
-            data->setIndex(-1);
-        } else if (iter.key() >= index + count) {
-            QmlGraphicsVisualDataModelPrivate::ObjectRef objRef = *iter;
-            int index = iter.key() - count;
-            iter = d->m_cache.erase(iter);
-            items.insert(index, objRef);
-            QmlGraphicsVisualDataModelData *data = d->data(objRef.obj);
-            data->setIndex(index);
-        } else {
-            ++iter;
-        }
-    }
-
-    d->m_cache.unite(items);
-    emit itemsRemoved(index, count);
-    emit countChanged();
-}
-
-void QmlGraphicsVisualDataModel::_q_itemsMoved(int from, int to, int count)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    // XXX - highly inefficient
-    QHash<int,QmlGraphicsVisualDataModelPrivate::ObjectRef> items;
-    for (QHash<int,QmlGraphicsVisualDataModelPrivate::ObjectRef>::Iterator iter = d->m_cache.begin();
-        iter != d->m_cache.end(); ) {
-
-        if (iter.key() >= from && iter.key() < from + count) {
-            QmlGraphicsVisualDataModelPrivate::ObjectRef objRef = *iter;
-            int index = iter.key() - from + to;
-            iter = d->m_cache.erase(iter);
-
-            items.insert(index, objRef);
-
-            QmlGraphicsVisualDataModelData *data = d->data(objRef.obj);
-            data->setIndex(index);
-        } else {
-            ++iter;
-        }
-    }
-    for (QHash<int,QmlGraphicsVisualDataModelPrivate::ObjectRef>::Iterator iter = d->m_cache.begin();
-        iter != d->m_cache.end(); ) {
-
-        int diff = from > to ? count : -count;
-        if (iter.key() >= qMin(from,to) && iter.key() < qMax(from+count,to+count)) {
-            QmlGraphicsVisualDataModelPrivate::ObjectRef objRef = *iter;
-            int index = iter.key() + diff;
-            iter = d->m_cache.erase(iter);
-
-            items.insert(index, objRef);
-
-            QmlGraphicsVisualDataModelData *data = d->data(objRef.obj);
-            data->setIndex(index);
-        } else {
-            ++iter;
-        }
-    }
-    d->m_cache.unite(items);
-
-    emit itemsMoved(from, to, count);
-}
-
-void QmlGraphicsVisualDataModel::_q_rowsInserted(const QModelIndex &parent, int begin, int end)
-{
-    if (!parent.isValid())
-        _q_itemsInserted(begin, end - begin + 1);
-}
-
-void QmlGraphicsVisualDataModel::_q_rowsRemoved(const QModelIndex &parent, int begin, int end)
-{
-    if (!parent.isValid())
-        _q_itemsRemoved(begin, end - begin + 1);
-}
-
-void QmlGraphicsVisualDataModel::_q_rowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)
-{
-    const int count = sourceEnd - sourceStart + 1;
-    if (!destinationParent.isValid() && !sourceParent.isValid()) {
-        _q_itemsMoved(sourceStart, destinationRow, count);
-    } else if (!sourceParent.isValid()) {
-        _q_itemsRemoved(sourceStart, count);
-    } else if (!destinationParent.isValid()) {
-        _q_itemsInserted(destinationRow, count);
-    }
-}
-
-void QmlGraphicsVisualDataModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    if (!begin.parent().isValid())
-        _q_itemsChanged(begin.row(), end.row() - begin.row() + 1, d->m_roles);
-}
-
-void QmlGraphicsVisualDataModel::_q_createdPackage(int index, QmlPackage *package)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    emit createdItem(index, qobject_cast<QmlGraphicsItem*>(package->part(d->m_part)));
-}
-
-void QmlGraphicsVisualDataModel::_q_destroyingPackage(QmlPackage *package)
-{
-    Q_D(QmlGraphicsVisualDataModel);
-    emit destroyingItem(qobject_cast<QmlGraphicsItem*>(package->part(d->m_part)));
-}
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QListModelInterface)
-
-#include <qmlgraphicsvisualitemmodel.moc>
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
deleted file mode 100644
index 7dc41a8..0000000
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSVISUALDATAMODEL_H
-#define QMLGRAPHICSVISUALDATAMODEL_H
-
-#include <qml.h>
-
-#include <QtCore/qobject.h>
-#include <QtCore/qabstractitemmodel.h>
-
-QT_BEGIN_HEADER
-
-Q_DECLARE_METATYPE(QModelIndex)
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-/*****************************************************************************
- *****************************************************************************
- XXX Experimental
- *****************************************************************************
-*****************************************************************************/
-
-class QmlGraphicsItem;
-class QmlComponent;
-class QmlPackage;
-class QmlGraphicsVisualDataModelPrivate;
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsVisualModel : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-
-public:
-    QmlGraphicsVisualModel() {}
-    virtual ~QmlGraphicsVisualModel() {}
-
-    enum ReleaseFlag { Referenced = 0x01, Destroyed = 0x02 };
-    Q_DECLARE_FLAGS(ReleaseFlags, ReleaseFlag)
-
-    virtual int count() const = 0;
-    virtual bool isValid() const = 0;
-    virtual QmlGraphicsItem *item(int index, bool complete=true) = 0;
-    virtual ReleaseFlags release(QmlGraphicsItem *item) = 0;
-    virtual void completeItem() = 0;
-    virtual QVariant evaluate(int index, const QString &expression, QObject *objectContext) = 0;
-    virtual QString stringValue(int, const QString &) { return QString(); }
-
-    virtual int indexOf(QmlGraphicsItem *item, QObject *objectContext) const = 0;
-
-Q_SIGNALS:
-    void countChanged();
-    void itemsInserted(int index, int count);
-    void itemsRemoved(int index, int count);
-    void itemsMoved(int from, int to, int count);
-    void createdItem(int index, QmlGraphicsItem *item);
-    void destroyingItem(QmlGraphicsItem *item);
-
-protected:
-    QmlGraphicsVisualModel(QObjectPrivate &dd, QObject *parent = 0)
-        : QObject(dd, parent) {}
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsVisualModel)
-};
-
-class QmlGraphicsVisualItemModelAttached;
-class QmlGraphicsVisualItemModelPrivate;
-class Q_DECLARATIVE_EXPORT QmlGraphicsVisualItemModel : public QmlGraphicsVisualModel
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlGraphicsVisualItemModel)
-
-    Q_PROPERTY(QmlListProperty<QmlGraphicsItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
-    Q_CLASSINFO("DefaultProperty", "children")
-
-public:
-    QmlGraphicsVisualItemModel();
-    virtual ~QmlGraphicsVisualItemModel() {}
-
-    virtual int count() const;
-    virtual bool isValid() const;
-    virtual QmlGraphicsItem *item(int index, bool complete=true);
-    virtual ReleaseFlags release(QmlGraphicsItem *item);
-    virtual void completeItem();
-    virtual QString stringValue(int index, const QString &role);
-    virtual QVariant evaluate(int index, const QString &expression, QObject *objectContext);
-
-    virtual int indexOf(QmlGraphicsItem *item, QObject *objectContext) const;
-
-    QmlListProperty<QmlGraphicsItem> children();
-
-    static QmlGraphicsVisualItemModelAttached *qmlAttachedProperties(QObject *obj);
-
-Q_SIGNALS:
-    void childrenChanged();
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsVisualItemModel)
-};
-
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsVisualDataModel : public QmlGraphicsVisualModel
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlGraphicsVisualDataModel)
-
-    Q_PROPERTY(QVariant model READ model WRITE setModel)
-    Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate)
-    Q_PROPERTY(QString part READ part WRITE setPart)
-    Q_PROPERTY(QObject *parts READ parts CONSTANT)
-    Q_PROPERTY(QModelIndex rootIndex READ rootIndex WRITE setRootIndex NOTIFY rootIndexChanged)
-    Q_CLASSINFO("DefaultProperty", "delegate")
-public:
-    QmlGraphicsVisualDataModel();
-    QmlGraphicsVisualDataModel(QmlContext *);
-    virtual ~QmlGraphicsVisualDataModel();
-
-    QVariant model() const;
-    void setModel(const QVariant &);
-
-    QmlComponent *delegate() const;
-    void setDelegate(QmlComponent *);
-
-    QModelIndex rootIndex() const;
-    void setRootIndex(const QModelIndex &root);
-
-    QString part() const;
-    void setPart(const QString &);
-
-    int count() const;
-    bool isValid() const { return delegate() != 0; }
-    QmlGraphicsItem *item(int index, bool complete=true);
-    QmlGraphicsItem *item(int index, const QByteArray &, bool complete=true);
-    ReleaseFlags release(QmlGraphicsItem *item);
-    void completeItem();
-    virtual QString stringValue(int index, const QString &role);
-    QVariant evaluate(int index, const QString &expression, QObject *objectContext);
-
-    int indexOf(QmlGraphicsItem *item, QObject *objectContext) const;
-
-    QObject *parts();
-
-Q_SIGNALS:
-    void createdPackage(int index, QmlPackage *package);
-    void destroyingPackage(QmlPackage *package);
-    void rootIndexChanged();
-
-private Q_SLOTS:
-    void _q_itemsChanged(int, int, const QList<int> &);
-    void _q_itemsInserted(int index, int count);
-    void _q_itemsRemoved(int index, int count);
-    void _q_itemsMoved(int from, int to, int count);
-    void _q_rowsInserted(const QModelIndex &,int,int);
-    void _q_rowsRemoved(const QModelIndex &,int,int);
-    void _q_rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
-    void _q_dataChanged(const QModelIndex&,const QModelIndex&);
-    void _q_createdPackage(int index, QmlPackage *package);
-    void _q_destroyingPackage(QmlPackage *package);
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsVisualDataModel)
-};
-
-class QmlGraphicsVisualItemModelAttached : public QObject
-{
-    Q_OBJECT
-
-public:
-    QmlGraphicsVisualItemModelAttached(QObject *parent)
-        : QObject(parent), m_index(0) {}
-    ~QmlGraphicsVisualItemModelAttached() {
-        attachedProperties.remove(parent());
-    }
-
-    Q_PROPERTY(int index READ index NOTIFY indexChanged)
-    int index() const { return m_index; }
-    void setIndex(int idx) {
-        if (m_index != idx) {
-            m_index = idx;
-            emit indexChanged();
-        }
-    }
-
-    static QmlGraphicsVisualItemModelAttached *properties(QObject *obj) {
-        QmlGraphicsVisualItemModelAttached *rv = attachedProperties.value(obj);
-        if (!rv) {
-            rv = new QmlGraphicsVisualItemModelAttached(obj);
-            attachedProperties.insert(obj, rv);
-        }
-        return rv;
-    }
-
-Q_SIGNALS:
-    void indexChanged();
-
-public:
-    int m_index;
-
-    static QHash<QObject*, QmlGraphicsVisualItemModelAttached*> attachedProperties;
-};
-
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsVisualModel)
-QML_DECLARE_TYPE(QmlGraphicsVisualItemModel)
-QML_DECLARE_TYPEINFO(QmlGraphicsVisualItemModel, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QmlGraphicsVisualDataModel)
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSVISUALDATAMODEL_H
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
deleted file mode 100644
index 92ec4c4..0000000
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ /dev/null
@@ -1,1335 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicswebview_p.h"
-#include "qmlgraphicswebview_p_p.h"
-
-#include "qmlgraphicspainteditem_p_p.h"
-
-#include <qml.h>
-#include <qmlengine.h>
-#include <qmlstate_p.h>
-
-#include <QDebug>
-#include <QPen>
-#include <QFile>
-#include <QEvent>
-#include <QMouseEvent>
-#include <QKeyEvent>
-#include <QBasicTimer>
-#include <QApplication>
-#include <QGraphicsSceneMouseEvent>
-#include <QtWebKit/QWebPage>
-#include <QtWebKit/QWebFrame>
-#include <QtWebKit/QWebElement>
-#include <QtWebKit/QWebSettings>
-#include <qlistmodelinterface_p.h>
-
-QT_BEGIN_NAMESPACE
-
-static const int MAX_DOUBLECLICK_TIME=500; // XXX need better gesture system
-
-class QmlGraphicsWebViewPrivate : public QmlGraphicsPaintedItemPrivate
-{
-    Q_DECLARE_PUBLIC(QmlGraphicsWebView)
-
-public:
-    QmlGraphicsWebViewPrivate()
-      : QmlGraphicsPaintedItemPrivate(), page(0), preferredwidth(0), preferredheight(0),
-            progress(1.0), status(QmlGraphicsWebView::Null), pending(PendingNone),
-            newWindowComponent(0), newWindowParent(0),
-            pressTime(400),
-            rendering(true)
-    {
-    }
-
-    QUrl url; // page url might be different if it has not loaded yet
-    QWebPage *page;
-
-    int preferredwidth, preferredheight;
-    qreal progress;
-    QmlGraphicsWebView::Status status;
-    QString statusText;
-    enum { PendingNone, PendingUrl, PendingHtml, PendingContent } pending;
-    QUrl pending_url;
-    QString pending_string;
-    QByteArray pending_data;
-    mutable QmlGraphicsWebSettings settings;
-    QmlComponent *newWindowComponent;
-    QmlGraphicsItem *newWindowParent;
-
-    QBasicTimer pressTimer;
-    QPoint pressPoint;
-    int pressTime; // milliseconds before it's a "hold"
-
-
-    static void windowObjects_append(QmlListProperty<QObject> *prop, QObject *o) {
-        static_cast<QmlGraphicsWebViewPrivate *>(prop->data)->windowObjects.append(o);
-        static_cast<QmlGraphicsWebViewPrivate *>(prop->data)->updateWindowObjects();
-    }
-
-    void updateWindowObjects();
-    QObjectList windowObjects;
-
-    bool rendering;
-};
-
-/*!
-    \qmlclass WebView QmlGraphicsWebView
-  \since 4.7
-    \brief The WebView item allows you to add web content to a canvas.
-    \inherits Item
-
-    A WebView renders web content based on a URL.
-
-    If the width and height of the item is not set, they will
-    dynamically adjust to a size appropriate for the content.
-    This width may be large for typical online web pages.
-
-    If the preferredWidth is set, the width will be this amount or larger,
-    usually laying out the web content to fit the preferredWidth.
-
-    \qml
-    WebView {
-        url: "http://www.nokia.com"
-        width: 490
-        height: 400
-        scale: 0.5
-        smooth: false
-        smoothCache: true
-    }
-    \endqml
-
-    \image webview.png
-
-    The item includes no scrolling, scaling,
-    toolbars, etc., those must be implemented around WebView. See the WebBrowser example
-    for a demonstration of this.
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsWebView
-    \brief The QmlGraphicsWebView class allows you to add web content to a QmlView.
-
-    A WebView renders web content base on a URL.
-
-    \image webview.png
-
-    The item includes no scrolling, scaling,
-    toolbars, etc., those must be implemented around WebView. See the WebBrowser example
-    for a demonstration of this.
-
-    A QmlGraphicsWebView object can be instantiated in Qml using the tag \l WebView.
-*/
-
-QmlGraphicsWebView::QmlGraphicsWebView(QmlGraphicsItem *parent)
-  : QmlGraphicsPaintedItem(*(new QmlGraphicsWebViewPrivate), parent)
-{
-    init();
-}
-
-QmlGraphicsWebView::~QmlGraphicsWebView()
-{
-    Q_D(QmlGraphicsWebView);
-    delete d->page;
-}
-
-void QmlGraphicsWebView::init()
-{
-    Q_D(QmlGraphicsWebView);
-
-    setAcceptHoverEvents(true);
-    setAcceptedMouseButtons(Qt::LeftButton);
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
-
-    d->page = 0;
-}
-
-void QmlGraphicsWebView::componentComplete()
-{
-    QmlGraphicsPaintedItem::componentComplete();
-    Q_D(QmlGraphicsWebView);
-    switch (d->pending) {
-        case QmlGraphicsWebViewPrivate::PendingUrl:
-            setUrl(d->pending_url);
-            break;
-        case QmlGraphicsWebViewPrivate::PendingHtml:
-            setHtml(d->pending_string, d->pending_url);
-            break;
-        case QmlGraphicsWebViewPrivate::PendingContent:
-            setContent(d->pending_data, d->pending_string, d->pending_url);
-            break;
-        default:
-            break;
-    }
-    d->pending = QmlGraphicsWebViewPrivate::PendingNone;
-    d->updateWindowObjects();
-}
-
-QmlGraphicsWebView::Status QmlGraphicsWebView::status() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->status;
-}
-
-
-/*!
-    \qmlproperty real WebView::progress
-    This property holds the progress of loading the current URL, from 0 to 1.
-
-    If you just want to know when progress gets to 1, use
-    WebView::onLoadFinished() or WebView::onLoadFailed() instead.
-*/
-qreal QmlGraphicsWebView::progress() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->progress;
-}
-
-void QmlGraphicsWebView::doLoadStarted()
-{
-    Q_D(QmlGraphicsWebView);
-
-    if (!d->url.isEmpty()) {
-        d->status = Loading;
-        emit statusChanged(d->status);
-    }
-    emit loadStarted();
-}
-
-void QmlGraphicsWebView::doLoadProgress(int p)
-{
-    Q_D(QmlGraphicsWebView);
-    if (d->progress == p/100.0)
-        return;
-    d->progress = p/100.0;
-    emit progressChanged();
-}
-
-void QmlGraphicsWebView::pageUrlChanged()
-{
-    Q_D(QmlGraphicsWebView);
-
-    page()->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth : width(),
-        d->preferredheight>0 ? d->preferredheight : height()));
-    expandToWebPage();
-
-    if ((d->url.isEmpty() && page()->mainFrame()->url() != QUrl(QLatin1String("about:blank")))
-        || (d->url != page()->mainFrame()->url() && !page()->mainFrame()->url().isEmpty()))
-    {
-        d->url = page()->mainFrame()->url();
-        if (d->url == QUrl(QLatin1String("about:blank")))
-            d->url = QUrl();
-        emit urlChanged();
-    }
-}
-
-void QmlGraphicsWebView::doLoadFinished(bool ok)
-{
-    Q_D(QmlGraphicsWebView);
-
-    if (title().isEmpty())
-        pageUrlChanged(); // XXX bug 232556 - pages with no title never get urlChanged()
-
-    if (ok) {
-        d->status = d->url.isEmpty() ? Null : Ready;
-        emit loadFinished();
-    } else {
-        d->status = Error;
-        emit loadFailed();
-    }
-    emit statusChanged(d->status);
-}
-
-/*!
-    \qmlproperty url WebView::url
-    This property holds the URL to the page displayed in this item. It can be set,
-    but also can change spontaneously (eg. because of network redirection).
-
-    If the url is empty, the page is blank.
-
-    The url is always absolute (QML will resolve relative URL strings in the context
-    of the containing QML document).
-*/
-QUrl QmlGraphicsWebView::url() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->url;
-}
-
-void QmlGraphicsWebView::setUrl(const QUrl &url)
-{
-    Q_D(QmlGraphicsWebView);
-    if (url == d->url)
-        return;
-
-    if (isComponentComplete()) {
-        d->url = url;
-        page()->setViewportSize(QSize(
-            d->preferredwidth>0 ? d->preferredwidth : width(),
-            d->preferredheight>0 ? d->preferredheight : height()));
-        QUrl seturl = url;
-        if (seturl.isEmpty())
-            seturl = QUrl(QLatin1String("about:blank"));
-
-        Q_ASSERT(!seturl.isRelative());
-
-        page()->mainFrame()->load(seturl);
-
-        emit urlChanged();
-    } else {
-        d->pending = d->PendingUrl;
-        d->pending_url = url;
-    }
-}
-
-/*!
-    \qmlproperty int WebView::preferredWidth
-    This property holds the ideal width for displaying the current URL.
-*/
-int QmlGraphicsWebView::preferredWidth() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->preferredwidth;
-}
-
-void QmlGraphicsWebView::setPreferredWidth(int iw)
-{
-    Q_D(QmlGraphicsWebView);
-    if (d->preferredwidth == iw) return;
-    d->preferredwidth = iw;
-    //expandToWebPage();
-    emit preferredWidthChanged();
-}
-
-/*!
-    \qmlproperty int WebView::preferredHeight
-    This property holds the ideal height for displaying the current URL.
-    This only affects the area zoomed by heuristicZoom().
-*/
-int QmlGraphicsWebView::preferredHeight() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->preferredheight;
-}
-void QmlGraphicsWebView::setPreferredHeight(int ih)
-{
-    Q_D(QmlGraphicsWebView);
-    if (d->preferredheight == ih) return;
-    d->preferredheight = ih;
-    emit preferredHeightChanged();
-}
-
-/*!
-    \qmlmethod bool WebView::evaluateJavaScript(string)
-
-    Evaluates the \a scriptSource JavaScript inside the context of the
-    main web frame, and returns the result of the last executed statement.
-
-    Note that this JavaScript does \e not have any access to QML objects
-    except as made available as windowObjects.
-*/
-QVariant QmlGraphicsWebView::evaluateJavaScript(const QString &scriptSource)
-{
-    return this->page()->mainFrame()->evaluateJavaScript(scriptSource);
-}
-
-void QmlGraphicsWebView::focusChanged(bool hasFocus)
-{
-    QFocusEvent e(hasFocus ? QEvent::FocusIn : QEvent::FocusOut);
-    page()->event(&e);
-    QmlGraphicsItem::focusChanged(hasFocus);
-}
-
-void QmlGraphicsWebView::initialLayout()
-{
-    // nothing useful to do at this point
-}
-
-void QmlGraphicsWebView::noteContentsSizeChanged(const QSize&)
-{
-    expandToWebPage();
-}
-
-void QmlGraphicsWebView::expandToWebPage()
-{
-    Q_D(QmlGraphicsWebView);
-    QSize cs = page()->mainFrame()->contentsSize();
-    if (cs.width() < d->preferredwidth)
-        cs.setWidth(d->preferredwidth);
-    if (cs.height() < d->preferredheight)
-        cs.setHeight(d->preferredheight);
-    if (widthValid())
-        cs.setWidth(width());
-    if (heightValid())
-        cs.setHeight(height());
-    if (cs != page()->viewportSize()) {
-        page()->setViewportSize(cs);
-    }
-    if (cs != contentsSize())
-        setContentsSize(cs);
-}
-
-void QmlGraphicsWebView::geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry)
-{
-    if (newGeometry.size() != oldGeometry.size())
-        expandToWebPage();
-    QmlGraphicsPaintedItem::geometryChanged(newGeometry, oldGeometry);
-}
-
-void QmlGraphicsWebView::paintPage(const QRect& r)
-{
-    dirtyCache(r);
-    update();
-}
-
-/*!
-    \qmlproperty list<object> WebView::javaScriptWindowObjects
-
-    This property is a list of object that are available from within
-    the webview's JavaScript context.
-
-    The \a object will be inserted as a child of the frame's window
-    object, under the name given by the attached property \c WebView.windowObjectName.
-
-    \qml
-    WebView {
-        javaScriptWindowObjects: Object {
-            WebView.windowObjectName: "coordinates"
-        }
-    }
-    \endqml
-
-    Properties of the object will be exposed as JavaScript properties and slots as
-    JavaScript methods.
-
-    If Javascript is not enabled for this page, then this property does nothing.
-*/
-QmlListProperty<QObject> QmlGraphicsWebView::javaScriptWindowObjects()
-{
-    Q_D(QmlGraphicsWebView);
-    return QmlListProperty<QObject>(this, d, &QmlGraphicsWebViewPrivate::windowObjects_append);
-}
-
-QmlGraphicsWebViewAttached *QmlGraphicsWebView::qmlAttachedProperties(QObject *o)
-{
-    return new QmlGraphicsWebViewAttached(o);
-}
-
-void QmlGraphicsWebViewPrivate::updateWindowObjects()
-{
-    Q_Q(QmlGraphicsWebView);
-    if (!q->isComponentComplete() || !page)
-        return;
-
-    for (int ii = 0; ii < windowObjects.count(); ++ii) {
-        QObject *object = windowObjects.at(ii);
-        QmlGraphicsWebViewAttached *attached = static_cast<QmlGraphicsWebViewAttached *>(qmlAttachedPropertiesObject<QmlGraphicsWebView>(object));
-        if (attached && !attached->windowObjectName().isEmpty()) {
-            page->mainFrame()->addToJavaScriptWindowObject(attached->windowObjectName(), object);
-        }
-    }
-}
-
-bool QmlGraphicsWebView::renderingEnabled() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->rendering;
-}
-
-void QmlGraphicsWebView::setRenderingEnabled(bool enabled)
-{
-    Q_D(QmlGraphicsWebView);
-    if (d->rendering == enabled)
-        return;
-    d->rendering = enabled;
-    emit renderingEnabledChanged();
-
-    setCacheFrozen(!enabled);
-    if (enabled)
-        clearCache();
-}
-
-
-void QmlGraphicsWebView::drawContents(QPainter *p, const QRect &r)
-{
-    Q_D(QmlGraphicsWebView);
-    if (d->rendering)
-        page()->mainFrame()->render(p,r);
-}
-
-QMouseEvent *QmlGraphicsWebView::sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e)
-{
-    QEvent::Type t;
-    switch(e->type()) {
-    default:
-    case QEvent::GraphicsSceneMousePress:
-        t = QEvent::MouseButtonPress;
-        break;
-    case QEvent::GraphicsSceneMouseRelease:
-        t = QEvent::MouseButtonRelease;
-        break;
-    case QEvent::GraphicsSceneMouseMove:
-        t = QEvent::MouseMove;
-        break;
-    case QGraphicsSceneEvent::GraphicsSceneMouseDoubleClick:
-        t = QEvent::MouseButtonDblClick;
-        break;
-    }
-
-    QMouseEvent *me = new QMouseEvent(t, (e->pos()/contentsScale()).toPoint(), e->button(), e->buttons(), 0);
-    return me;
-}
-
-QMouseEvent *QmlGraphicsWebView::sceneHoverMoveEventToMouseEvent(QGraphicsSceneHoverEvent *e)
-{
-    QEvent::Type t = QEvent::MouseMove;
-
-    QMouseEvent *me = new QMouseEvent(t, (e->pos()/contentsScale()).toPoint(), Qt::NoButton, Qt::NoButton, 0);
-
-    return me;
-}
-
-
-/*!
-    \qmlsignal WebView::onDoubleClick(clickx,clicky)
-
-    The WebView does not pass double-click events to the web engine, but rather
-    emits this signals.
-*/
-
-void QmlGraphicsWebView::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
-{
-    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
-    emit doubleClick(me->x(),me->y());
-    delete me;
-}
-
-/*!
-    \qmlmethod bool WebView::heuristicZoom(clickX,clickY,maxzoom)
-
-    Finds a zoom that:
-    \list
-    \i shows a whole item
-    \i includes (\a clickX, \a clickY)
-    \i fits into the preferredWidth and preferredHeight
-    \i zooms by no more than \a maxzoom
-    \i is more than 10% above the current zoom
-    \endlist
-
-    If such a zoom exists, emits zoomTo(zoom,centerX,centerY) and returns true; otherwise,
-    no signal is emitted and returns false.
-*/
-bool QmlGraphicsWebView::heuristicZoom(int clickX, int clickY, qreal maxzoom)
-{
-    Q_D(QmlGraphicsWebView);
-    if (contentsScale() >= maxzoom/zoomFactor())
-        return false;
-    qreal ozf = contentsScale();
-    QRect showarea = elementAreaAt(clickX, clickY, d->preferredwidth/maxzoom, d->preferredheight/maxzoom);
-    qreal z = qMin(qreal(d->preferredwidth)/showarea.width(),qreal(d->preferredheight)/showarea.height());
-    if (z > maxzoom/zoomFactor())
-        z = maxzoom/zoomFactor();
-    if (z/ozf > 1.2) {
-        QRectF r(showarea.left()*z, showarea.top()*z, showarea.width()*z, showarea.height()*z);
-        emit zoomTo(z,r.x()+r.width()/2, r.y()+r.height()/2);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/*!
-    \qmlproperty int WebView::pressGrabTime
-
-    The number of milliseconds the user must press before the WebView
-    starts passing move events through to the web engine (rather than
-    letting other QML elements such as a Flickable take them).
-
-    Defaults to 400ms. Set to 0 to always grab and pass move events to
-    the web engine.
-*/
-int QmlGraphicsWebView::pressGrabTime() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->pressTime;
-}
-
-void QmlGraphicsWebView::setPressGrabTime(int ms)
-{
-    Q_D(QmlGraphicsWebView);
-    if (d->pressTime == ms) 
-        return;
-    d->pressTime = ms;
-    emit pressGrabTimeChanged();
-}
-
-void QmlGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsWebView);
-
-    setFocus (true);
-    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
-
-    d->pressPoint = me->pos();
-    if (d->pressTime) {
-        d->pressTimer.start(d->pressTime,this);
-        setKeepMouseGrab(false);
-    } else {
-        grabMouse();
-        setKeepMouseGrab(true);
-    }
-
-    page()->event(me);
-    event->setAccepted(
-/*
-  It is not correct to send the press event upwards, if it is not accepted by WebKit
-  e.g. push button does not work, if done so as QGraphicsScene will not send the release event at all to WebKit
-  Might be a bug in WebKit, though
-  */
-#if 1 //QT_VERSION <= 0x040500 // XXX see bug 230835
-        true
-#else
-        me->isAccepted()
-#endif
-        );
-    delete me;
-    if (!event->isAccepted()) {
-        QmlGraphicsPaintedItem::mousePressEvent(event);
-    }
-}
-
-void QmlGraphicsWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsWebView);
-
-    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
-    page()->event(me);
-    d->pressTimer.stop();
-    event->setAccepted(
-/*
-  It is not correct to send the press event upwards, if it is not accepted by WebKit
-  e.g. push button does not work, if done so as QGraphicsScene will not send all the events to WebKit
-  */
-#if 1 //QT_VERSION <= 0x040500 // XXX see bug 230835
-        true
-#else
-        me->isAccepted()
-#endif
-        );
-    delete me;
-    if (!event->isAccepted()) {
-        QmlGraphicsPaintedItem::mouseReleaseEvent(event);
-    }
-    setKeepMouseGrab(false);
-    ungrabMouse();
-}
-
-void QmlGraphicsWebView::timerEvent(QTimerEvent *event)
-{
-    Q_D(QmlGraphicsWebView);
-    if (event->timerId() == d->pressTimer.timerId()) {
-        d->pressTimer.stop();
-        grabMouse();
-        setKeepMouseGrab(true);
-    }
-}
-
-void QmlGraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_D(QmlGraphicsWebView);
-
-    QMouseEvent *me = sceneMouseEventToMouseEvent(event);
-    if (d->pressTimer.isActive()) {
-        if ((me->pos() - d->pressPoint).manhattanLength() > QApplication::startDragDistance())  {
-            d->pressTimer.stop();
-        }
-    }
-    if (keepMouseGrab()) {
-        page()->event(me);
-        event->setAccepted(
-/*
-  It is not correct to send the press event upwards, if it is not accepted by WebKit
-  e.g. push button does not work, if done so as QGraphicsScene will not send the release event at all to WebKit
-  Might be a bug in WebKit, though
-  */
-#if 1 // QT_VERSION <= 0x040500 // XXX see bug 230835
-            true
-#else
-            me->isAccepted()
-#endif
-        );
-    }
-    delete me;
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::mouseMoveEvent(event);
-
-}
-void QmlGraphicsWebView::hoverMoveEvent (QGraphicsSceneHoverEvent * event)
-{
-    QMouseEvent *me = sceneHoverMoveEventToMouseEvent(event);
-    page()->event(me);
-    event->setAccepted(
-#if QT_VERSION <= 0x040500 // XXX see bug 230835
-        true
-#else
-        me->isAccepted()
-#endif
-    );
-    delete me;
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::hoverMoveEvent(event);
-}
-
-void QmlGraphicsWebView::keyPressEvent(QKeyEvent* event)
-{
-    page()->event(event);
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::keyPressEvent(event);
-}
-
-void QmlGraphicsWebView::keyReleaseEvent(QKeyEvent* event)
-{
-    page()->event(event);
-    if (!event->isAccepted())
-        QmlGraphicsPaintedItem::keyReleaseEvent(event);
-}
-
-bool QmlGraphicsWebView::sceneEvent(QEvent *event) 
-{ 
-    if (event->type() == QEvent::KeyPress) { 
-        QKeyEvent *k = static_cast<QKeyEvent *>(event); 
-        if (k->key() == Qt::Key_Tab || k->key() == Qt::Key_Backtab) { 
-            if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) { //### Add MetaModifier? 
-                page()->event(event); 
-                if (event->isAccepted()) 
-                    return true; 
-            } 
-        } 
-    } 
-    return QmlGraphicsPaintedItem::sceneEvent(event); 
-} 
-
-
-/*!
-    \qmlproperty action WebView::back
-    This property holds the action for causing the previous URL in the history to be displayed.
-*/
-QAction *QmlGraphicsWebView::backAction() const
-{
-    return page()->action(QWebPage::Back);
-}
-
-/*!
-    \qmlproperty action WebView::forward
-    This property holds the action for causing the next URL in the history to be displayed.
-*/
-QAction *QmlGraphicsWebView::forwardAction() const
-{
-    return page()->action(QWebPage::Forward);
-}
-
-/*!
-    \qmlproperty action WebView::reload
-    This property holds the action for reloading with the current URL
-*/
-QAction *QmlGraphicsWebView::reloadAction() const
-{
-    return page()->action(QWebPage::Reload);
-}
-
-/*!
-    \qmlproperty action WebView::stop
-    This property holds the action for stopping loading with the current URL
-*/
-QAction *QmlGraphicsWebView::stopAction() const
-{
-    return page()->action(QWebPage::Stop);
-}
-
-/*!
-    \qmlproperty real WebView::title
-    This property holds the title of the web page currently viewed
-
-    By default, this property contains an empty string.
-*/
-QString QmlGraphicsWebView::title() const
-{
-    return page()->mainFrame()->title();
-}
-
-
-
-/*!
-    \qmlproperty pixmap WebView::icon
-    This property holds the icon associated with the web page currently viewed
-*/
-QPixmap QmlGraphicsWebView::icon() const
-{
-    return page()->mainFrame()->icon().pixmap(QSize(256,256));
-}
-
-
-/*!
-    \qmlproperty real WebView::zoomFactor
-    This property holds the multiplier used to scale the contents of a Web page.
-*/
-void QmlGraphicsWebView::setZoomFactor(qreal factor)
-{
-    Q_D(QmlGraphicsWebView);
-    if (factor == page()->mainFrame()->zoomFactor())
-        return;
-
-    page()->mainFrame()->setZoomFactor(factor);
-    page()->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth*factor : width()*factor,
-        d->preferredheight>0 ? d->preferredheight*factor : height()*factor));
-    expandToWebPage();
-
-    emit zoomFactorChanged();
-}
-
-qreal QmlGraphicsWebView::zoomFactor() const
-{
-    return page()->mainFrame()->zoomFactor();
-}
-
-/*!
-    \qmlproperty string WebView::statusText
-
-    This property is the current status suggested by the current web page. In a web browser,
-    such status is often shown in some kind of status bar.
-*/
-void QmlGraphicsWebView::setStatusText(const QString& s)
-{
-    Q_D(QmlGraphicsWebView);
-    d->statusText = s;
-    emit statusTextChanged();
-}
-
-void QmlGraphicsWebView::windowObjectCleared()
-{
-    Q_D(QmlGraphicsWebView);
-    d->updateWindowObjects();
-}
-
-QString QmlGraphicsWebView::statusText() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->statusText;
-}
-
-QWebPage *QmlGraphicsWebView::page() const
-{
-    Q_D(const QmlGraphicsWebView);
-
-    if (!d->page) {
-        QmlGraphicsWebView *self = const_cast<QmlGraphicsWebView*>(this);
-        QWebPage *wp = new QmlGraphicsWebPage(self);
-
-        // QML items don't default to having a background,
-        // even though most we pages will set one anyway.
-        QPalette pal = QApplication::palette();
-        pal.setBrush(QPalette::Base, QColor::fromRgbF(0, 0, 0, 0));
-        wp->setPalette(pal);
-
-        wp->setNetworkAccessManager(qmlEngine(this)->networkAccessManager());
-
-        self->setPage(wp);
-
-        return wp;
-    }
-
-    return d->page;
-}
-
-
-// The QObject interface to settings().
-/*!
-    \qmlproperty string WebView::settings.standardFontFamily
-    \qmlproperty string WebView::settings.fixedFontFamily
-    \qmlproperty string WebView::settings.serifFontFamily
-    \qmlproperty string WebView::settings.sansSerifFontFamily
-    \qmlproperty string WebView::settings.cursiveFontFamily
-    \qmlproperty string WebView::settings.fantasyFontFamily
-
-    \qmlproperty int WebView::settings.minimumFontSize
-    \qmlproperty int WebView::settings.minimumLogicalFontSize
-    \qmlproperty int WebView::settings.defaultFontSize
-    \qmlproperty int WebView::settings.defaultFixedFontSize
-
-    \qmlproperty bool WebView::settings.autoLoadImages
-    \qmlproperty bool WebView::settings.javascriptEnabled
-    \qmlproperty bool WebView::settings.javaEnabled
-    \qmlproperty bool WebView::settings.pluginsEnabled
-    \qmlproperty bool WebView::settings.privateBrowsingEnabled
-    \qmlproperty bool WebView::settings.javascriptCanOpenWindows
-    \qmlproperty bool WebView::settings.javascriptCanAccessClipboard
-    \qmlproperty bool WebView::settings.developerExtrasEnabled
-    \qmlproperty bool WebView::settings.linksIncludedInFocusChain
-    \qmlproperty bool WebView::settings.zoomTextOnly
-    \qmlproperty bool WebView::settings.printElementBackgrounds
-    \qmlproperty bool WebView::settings.offlineStorageDatabaseEnabled
-    \qmlproperty bool WebView::settings.offlineWebApplicationCacheEnabled
-    \qmlproperty bool WebView::settings.localStorageDatabaseEnabled
-    \qmlproperty bool WebView::settings.localContentCanAccessRemoteUrls
-
-    These properties give access to the settings controlling the web view.
-
-    See QWebSettings for details of these properties.
-
-    \qml
-        WebView {
-            settings.pluginsEnabled: true
-            settings.standardFontFamily: "Arial"
-            ...
-        }
-    \endqml
-*/
-QmlGraphicsWebSettings *QmlGraphicsWebView::settingsObject() const
-{
-    Q_D(const QmlGraphicsWebView);
-    d->settings.s = page()->settings();
-    return &d->settings;
-}
-
-void QmlGraphicsWebView::setPage(QWebPage *page)
-{
-    Q_D(QmlGraphicsWebView);
-    if (d->page == page)
-        return;
-    if (d->page) {
-        if (d->page->parent() == this) {
-            delete d->page;
-        } else {
-            d->page->disconnect(this);
-        }
-    }
-    d->page = page;
-    d->page->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth : width(),
-        d->preferredheight>0 ? d->preferredheight : height()));
-    d->page->mainFrame()->setScrollBarPolicy(Qt::Horizontal,Qt::ScrollBarAlwaysOff);
-    d->page->mainFrame()->setScrollBarPolicy(Qt::Vertical,Qt::ScrollBarAlwaysOff);
-    connect(d->page,SIGNAL(repaintRequested(QRect)),this,SLOT(paintPage(QRect)));
-    connect(d->page->mainFrame(),SIGNAL(urlChanged(QUrl)),this,SLOT(pageUrlChanged()));
-    connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));
-    connect(d->page->mainFrame(), SIGNAL(iconChanged()), this, SIGNAL(iconChanged()));
-    connect(d->page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)), this, SLOT(noteContentsSizeChanged(QSize)));
-    connect(d->page->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(initialLayout()));
-
-    connect(d->page,SIGNAL(loadStarted()),this,SLOT(doLoadStarted()));
-    connect(d->page,SIGNAL(loadProgress(int)),this,SLOT(doLoadProgress(int)));
-    connect(d->page,SIGNAL(loadFinished(bool)),this,SLOT(doLoadFinished(bool)));
-    connect(d->page,SIGNAL(statusBarMessage(QString)),this,SLOT(setStatusText(QString)));
-
-    connect(d->page->mainFrame(),SIGNAL(javaScriptWindowObjectCleared()),this,SLOT(windowObjectCleared()));
-}
-
-/*!
-    \qmlsignal WebView::onLoadStarted()
-
-    This handler is called when the web engine begins loading
-    a page. Later, WebView::onLoadFinished() or WebView::onLoadFailed()
-    will be emitted.
-*/
-
-/*!
-    \qmlsignal WebView::onLoadFinished()
-
-    This handler is called when the web engine \e successfully
-    finishes loading a page, including any component content
-    (WebView::onLoadFailed() will be emitted otherwise).
-
-    \sa progress
-*/
-
-/*!
-    \qmlsignal WebView::onLoadFailed()
-
-    This handler is called when the web engine fails loading
-    a page or any component content
-    (WebView::onLoadFinished() will be emitted on success).
-*/
-
-void QmlGraphicsWebView::load(const QNetworkRequest &request,
-          QNetworkAccessManager::Operation operation,
-          const QByteArray &body)
-{
-    page()->mainFrame()->load(request, operation, body);
-}
-
-QString QmlGraphicsWebView::html() const
-{
-    return page()->mainFrame()->toHtml();
-}
-
-/*!
-    \qmlproperty string WebView::html
-    This property holds HTML text set directly
-
-    The html property can be set as a string.
-
-    \qml
-    WebView {
-        html: "<p>This is <b>HTML</b>."
-    }
-    \endqml
-*/
-void QmlGraphicsWebView::setHtml(const QString &html, const QUrl &baseUrl)
-{
-    Q_D(QmlGraphicsWebView);
-    page()->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth : width(),
-        d->preferredheight>0 ? d->preferredheight : height()));
-    if (isComponentComplete())
-        page()->mainFrame()->setHtml(html, baseUrl);
-    else {
-        d->pending = d->PendingHtml;
-        d->pending_url = baseUrl;
-        d->pending_string = html;
-    }
-    emit htmlChanged();
-}
-
-void QmlGraphicsWebView::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl)
-{
-    Q_D(QmlGraphicsWebView);
-    page()->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth : width(),
-        d->preferredheight>0 ? d->preferredheight : height()));
-
-    if (isComponentComplete())
-        page()->mainFrame()->setContent(data,mimeType,qmlContext(this)->resolvedUrl(baseUrl));
-    else {
-        d->pending = d->PendingContent;
-        d->pending_url = baseUrl;
-        d->pending_string = mimeType;
-        d->pending_data = data;
-    }
-}
-
-QWebHistory *QmlGraphicsWebView::history() const
-{
-    return page()->history();
-}
-
-QWebSettings *QmlGraphicsWebView::settings() const
-{
-    return page()->settings();
-}
-
-QmlGraphicsWebView *QmlGraphicsWebView::createWindow(QWebPage::WebWindowType type)
-{
-    Q_D(QmlGraphicsWebView);
-    switch (type) {
-        case QWebPage::WebBrowserWindow: {
-            if (!d->newWindowComponent && d->newWindowParent)
-                qWarning("WebView::newWindowComponent not set - WebView::newWindowParent ignored");
-            else if (d->newWindowComponent && !d->newWindowParent)
-                qWarning("WebView::newWindowParent not set - WebView::newWindowComponent ignored");
-            else if (d->newWindowComponent && d->newWindowParent) {
-                QmlGraphicsWebView *webview = 0;
-                QmlContext *windowContext = new QmlContext(qmlContext(this));
-
-                QObject *nobj = d->newWindowComponent->create(windowContext);
-                if (nobj) {
-                    windowContext->setParent(nobj);
-                    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(nobj);
-                    if (!item) {
-                        delete nobj;
-                    } else {
-                        webview = item->findChild<QmlGraphicsWebView*>();
-                        if (!webview) {
-                            delete item;
-                        } else {
-                            nobj->setParent(d->newWindowParent);
-                            static_cast<QGraphicsObject*>(item)->setParentItem(d->newWindowParent);
-                        }
-                    }
-                } else {
-                    delete windowContext;
-                }
-
-                return webview;
-            }
-        }
-        break;
-        case QWebPage::WebModalDialog: {
-            // Not supported
-        }
-    }
-    return 0;
-}
-
-/*!
-    \qmlproperty component WebView::newWindowComponent
-
-    This property holds the component to use for new windows.
-    The component must have a WebView somewhere in its structure.
-
-    When the web engine requests a new window, it will be an instance of
-    this component.
-
-    The parent of the new window is set by newWindowParent. It must be set.
-*/
-QmlComponent *QmlGraphicsWebView::newWindowComponent() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->newWindowComponent;
-}
-
-void QmlGraphicsWebView::setNewWindowComponent(QmlComponent *newWindow)
-{
-    Q_D(QmlGraphicsWebView);
-    if (newWindow == d->newWindowComponent)
-        return;
-    d->newWindowComponent = newWindow;
-    emit newWindowComponentChanged();
-}
-
-
-/*!
-    \qmlproperty item WebView::newWindowParent
-
-    The parent item for new windows.
-
-    \sa newWindowComponent
-*/
-QmlGraphicsItem *QmlGraphicsWebView::newWindowParent() const
-{
-    Q_D(const QmlGraphicsWebView);
-    return d->newWindowParent;
-}
-
-void QmlGraphicsWebView::setNewWindowParent(QmlGraphicsItem *parent)
-{
-    Q_D(QmlGraphicsWebView);
-    if (parent == d->newWindowParent)
-        return;
-    if (d->newWindowParent && parent) {
-        QList<QGraphicsItem *> children = d->newWindowParent->childItems();
-        for (int i = 0; i < children.count(); ++i) {
-            children.at(i)->setParentItem(parent);
-        }
-    }
-    d->newWindowParent = parent;
-    emit newWindowParentChanged();    
-}
-
-/*!
-    Returns the area of the largest element at position (\a x,\a y) that is no larger
-    than \a maxwidth by \a maxheight pixels.
-
-    May return an area larger in the case when no smaller element is at the position.
-*/
-QRect QmlGraphicsWebView::elementAreaAt(int x, int y, int maxwidth, int maxheight) const
-{
-    QWebHitTestResult hit = page()->mainFrame()->hitTestContent(QPoint(x,y));
-    QRect rv = hit.boundingRect();
-    QWebElement element = hit.enclosingBlockElement();
-    if (maxwidth<=0) maxwidth = INT_MAX;
-    if (maxheight<=0) maxheight = INT_MAX;
-    while (!element.parent().isNull() && element.geometry().width() <= maxwidth && element.geometry().height() <= maxheight) {
-        rv = element.geometry();
-        element = element.parent();
-    }
-    return rv;
-}
-
-/*!
-    \internal
-    \class QmlGraphicsWebPage
-    \brief The QmlGraphicsWebPage class is a QWebPage that can create QML plugins.
-
-    \sa QmlGraphicsWebView
-*/
-QmlGraphicsWebPage::QmlGraphicsWebPage(QmlGraphicsWebView *parent) :
-    QWebPage(parent)
-{
-}
-
-QmlGraphicsWebPage::~QmlGraphicsWebPage()
-{
-}
-
-void QmlGraphicsWebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
-{
-    qWarning() << sourceID << ':' << lineNumber << ':' << message;
-}
-
-QString QmlGraphicsWebPage::chooseFile(QWebFrame *originatingFrame, const QString& oldFile)
-{
-    // Not supported (it's modal)
-    Q_UNUSED(originatingFrame)
-    Q_UNUSED(oldFile)
-    return oldFile;
-}
-
-void QmlGraphicsWebPage::javaScriptAlert(QWebFrame *originatingFrame, const QString& msg)
-{
-    Q_UNUSED(originatingFrame)
-    emit viewItem()->alert(msg);
-}
-
-bool QmlGraphicsWebPage::javaScriptConfirm(QWebFrame *originatingFrame, const QString& msg)
-{
-    // Not supported (it's modal)
-    Q_UNUSED(originatingFrame)
-    Q_UNUSED(msg)
-    return false;
-}
-
-bool QmlGraphicsWebPage::javaScriptPrompt(QWebFrame *originatingFrame, const QString& msg, const QString& defaultValue, QString* result)
-{
-    // Not supported (it's modal)
-    Q_UNUSED(originatingFrame)
-    Q_UNUSED(msg)
-    Q_UNUSED(defaultValue)
-    Q_UNUSED(result)
-    return false;
-}
-
-
-/*
-    Qt WebKit does not understand non-QWidget plugins, so dummy widgets
-    are created, parented to a single dummy tool window.
-
-    The requirements for QML object plugins are input to the Qt WebKit
-    non-QWidget plugin support, which will obsolete this kludge.
-*/
-class QWidget_Dummy_Plugin : public QWidget
-{
-    Q_OBJECT
-public:
-    static QWidget *dummy_shared_parent()
-    {
-        static QWidget *dsp = 0;
-        if (!dsp) {
-            dsp = new QWidget(0,Qt::Tool);
-            dsp->setGeometry(-10000,-10000,0,0);
-            dsp->show();
-        }
-        return dsp;
-    }
-    QWidget_Dummy_Plugin(const QUrl& url, QmlGraphicsWebView *view, const QStringList &paramNames, const QStringList &paramValues) :
-        QWidget(dummy_shared_parent()),
-        propertyNames(paramNames),
-        propertyValues(paramValues),
-        webview(view)
-    {
-        QmlEngine *engine = qmlEngine(webview);
-        component = new QmlComponent(engine, url, this);
-        item = 0;
-        if (component->isLoading())
-            connect(component, SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(qmlLoaded()));
-        else
-            qmlLoaded();
-    }
-
-public Q_SLOTS:
-    void qmlLoaded()
-    {
-        if (component->isError()) {
-            // ### Could instead give these errors to the WebView to handle.
-            qWarning() << component->errors();
-            return;
-        }
-        item = qobject_cast<QmlGraphicsItem*>(component->create(qmlContext(webview)));
-        item->setParent(webview);
-        QString jsObjName;
-        for (int i=0; i<propertyNames.count(); ++i) {
-            if (propertyNames[i] != QLatin1String("type") && propertyNames[i] != QLatin1String("data")) {
-                item->setProperty(propertyNames[i].toUtf8(),propertyValues[i]);
-                if (propertyNames[i] == QLatin1String("objectname"))
-                    jsObjName = propertyValues[i]; 
-            }
-        }
-        if (!jsObjName.isNull()) { 
-            QWebFrame *f = webview->page()->mainFrame(); 
-            f->addToJavaScriptWindowObject(jsObjName, item); 
-        }
-        resizeEvent(0);
-        delete component;
-        component = 0;
-    }
-    void resizeEvent(QResizeEvent*)
-    {
-        if (item) {
-            item->setX(x());
-            item->setY(y());
-            item->setWidth(width());
-            item->setHeight(height());
-        }
-    }
-
-private:
-    QmlComponent *component;
-    QmlGraphicsItem *item;
-    QStringList propertyNames, propertyValues;
-    QmlGraphicsWebView *webview;
-};
-
-QmlGraphicsWebView *QmlGraphicsWebPage::viewItem()
-{
-    return static_cast<QmlGraphicsWebView*>(parent());
-}
-
-QObject *QmlGraphicsWebPage::createPlugin(const QString &, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
-{
-    QUrl comp = qmlContext(viewItem())->resolvedUrl(url);
-    return new QWidget_Dummy_Plugin(comp,viewItem(),paramNames,paramValues);
-}
-
-QWebPage *QmlGraphicsWebPage::createWindow(WebWindowType type)
-{
-    QmlGraphicsWebView *newView = viewItem()->createWindow(type);
-    if (newView)
-        return newView->page();
-    return 0;
-}
-
-QT_END_NAMESPACE
-
-#include <qmlgraphicswebview.moc>
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
deleted file mode 100644
index ca63be9..0000000
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSWEBVIEW_H
-#define QMLGRAPHICSWEBVIEW_H
-
-#include "qmlgraphicspainteditem_p.h"
-
-#include <QtGui/QAction>
-#include <QtCore/QUrl>
-#include <QtNetwork/qnetworkaccessmanager.h>
-#include <QtWebKit/QWebPage>
-
-QT_BEGIN_HEADER
-
-class QWebHistory;
-class QWebSettings;
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-class QmlGraphicsWebViewPrivate;
-class QNetworkRequest;
-class QmlGraphicsWebView;
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsWebPage : public QWebPage
-{
-    Q_OBJECT
-public:
-    explicit QmlGraphicsWebPage(QmlGraphicsWebView *parent);
-    ~QmlGraphicsWebPage();
-protected:
-    QObject *createPlugin(const QString &classid, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
-    QWebPage *createWindow(WebWindowType type);
-    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
-    QString chooseFile(QWebFrame *originatingFrame, const QString& oldFile);
-    void javaScriptAlert(QWebFrame *originatingFrame, const QString& msg);
-    bool javaScriptConfirm(QWebFrame *originatingFrame, const QString& msg);
-    bool javaScriptPrompt(QWebFrame *originatingFrame, const QString& msg, const QString& defaultValue, QString* result);
-
-private:
-    QmlGraphicsWebView *viewItem();
-};
-
-
-class QmlGraphicsWebViewAttached;
-class QmlGraphicsWebSettings;
-
-//### TODO: browser plugins
-
-class Q_DECLARATIVE_EXPORT QmlGraphicsWebView : public QmlGraphicsPaintedItem
-{
-    Q_OBJECT
-
-    Q_ENUMS(Status SelectionMode)
-
-    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
-    Q_PROPERTY(QPixmap icon READ icon NOTIFY iconChanged)
-    Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
-    Q_PROPERTY(QString statusText READ statusText NOTIFY statusTextChanged)
-
-    Q_PROPERTY(QString html READ html WRITE setHtml NOTIFY htmlChanged)
-
-    Q_PROPERTY(int pressGrabTime READ pressGrabTime WRITE setPressGrabTime NOTIFY pressGrabTimeChanged)
-
-    Q_PROPERTY(int preferredWidth READ preferredWidth WRITE setPreferredWidth NOTIFY preferredWidthChanged)
-    Q_PROPERTY(int preferredHeight READ preferredHeight WRITE setPreferredHeight NOTIFY preferredHeightChanged)
-    Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
-    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-
-    Q_PROPERTY(QAction* reload READ reloadAction CONSTANT)
-    Q_PROPERTY(QAction* back READ backAction CONSTANT)
-    Q_PROPERTY(QAction* forward READ forwardAction CONSTANT)
-    Q_PROPERTY(QAction* stop READ stopAction CONSTANT)
-
-    Q_PROPERTY(QmlGraphicsWebSettings* settings READ settingsObject CONSTANT)
-
-    Q_PROPERTY(QmlListProperty<QObject> javaScriptWindowObjects READ javaScriptWindowObjects CONSTANT)
-
-    Q_PROPERTY(QmlComponent* newWindowComponent READ newWindowComponent WRITE setNewWindowComponent NOTIFY newWindowComponentChanged)
-    Q_PROPERTY(QmlGraphicsItem* newWindowParent READ newWindowParent WRITE setNewWindowParent NOTIFY newWindowParentChanged)
-
-    Q_PROPERTY(bool renderingEnabled READ renderingEnabled WRITE setRenderingEnabled NOTIFY renderingEnabledChanged)
-
-public:
-    QmlGraphicsWebView(QmlGraphicsItem *parent=0);
-    ~QmlGraphicsWebView();
-
-    QUrl url() const;
-    void setUrl(const QUrl &);
-
-    QString title() const;
-
-    QPixmap icon() const;
-
-    qreal zoomFactor() const;
-    void setZoomFactor(qreal);
-    Q_INVOKABLE bool heuristicZoom(int clickX, int clickY, qreal maxzoom);
-    QRect elementAreaAt(int x, int y, int minwidth, int minheight) const;
-
-    int pressGrabTime() const;
-    void setPressGrabTime(int);
-
-    int preferredWidth() const;
-    void setPreferredWidth(int);
-    int preferredHeight() const;
-    void setPreferredHeight(int);
-
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
-    qreal progress() const;
-    QString statusText() const;
-
-    QAction *reloadAction() const;
-    QAction *backAction() const;
-    QAction *forwardAction() const;
-    QAction *stopAction() const;
-
-    QWebPage *page() const;
-    void setPage(QWebPage *page);
-
-    void load(const QNetworkRequest &request,
-              QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation,
-              const QByteArray &body = QByteArray());
-
-    QString html() const;
-
-    void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
-    void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
-
-    QWebHistory *history() const;
-    QWebSettings *settings() const;
-    QmlGraphicsWebSettings *settingsObject() const;
-
-    bool renderingEnabled() const;
-    void setRenderingEnabled(bool);
-
-    QmlListProperty<QObject> javaScriptWindowObjects();
-
-    static QmlGraphicsWebViewAttached *qmlAttachedProperties(QObject *);
-
-    QmlComponent *newWindowComponent() const;
-    void setNewWindowComponent(QmlComponent *newWindow);
-    QmlGraphicsItem *newWindowParent() const;
-    void setNewWindowParent(QmlGraphicsItem *newWindow);
-
-Q_SIGNALS:
-    void preferredWidthChanged();
-    void preferredHeightChanged();
-    void urlChanged();
-    void progressChanged();
-    void statusChanged(Status);
-    void titleChanged(const QString&);
-    void iconChanged();
-    void statusTextChanged();
-    void htmlChanged();
-    void pressGrabTimeChanged();
-    void zoomFactorChanged();
-    void newWindowComponentChanged();
-    void newWindowParentChanged();
-    void renderingEnabledChanged();
-
-    void loadStarted();
-    void loadFinished();
-    void loadFailed();
-
-    void doubleClick(int clickX, int clickY);
-
-    void zoomTo(qreal zoom, int centerX, int centerY);
-
-    void alert(const QString& message);
-
-public Q_SLOTS:
-    QVariant evaluateJavaScript(const QString&);
-
-private Q_SLOTS:
-    void expandToWebPage();
-    void paintPage(const QRect&);
-    void doLoadStarted();
-    void doLoadProgress(int p);
-    void doLoadFinished(bool ok);
-    void setStatusText(const QString&);
-    void windowObjectCleared();
-    void pageUrlChanged();
-    void noteContentsSizeChanged(const QSize&);
-    void initialLayout();
-
-protected:
-    void drawContents(QPainter *, const QRect &);
-
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
-    void timerEvent(QTimerEvent *event);
-    void hoverMoveEvent (QGraphicsSceneHoverEvent * event);
-    void keyPressEvent(QKeyEvent* event);
-    void keyReleaseEvent(QKeyEvent* event);
-    virtual void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry);
-    virtual void focusChanged(bool);
-    virtual bool sceneEvent(QEvent *event);
-    QmlGraphicsWebView *createWindow(QWebPage::WebWindowType type);
-
-private:
-    void init();
-    virtual void componentComplete();
-    Q_DISABLE_COPY(QmlGraphicsWebView)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsWebView)
-    QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *);
-    QMouseEvent *sceneHoverMoveEventToMouseEvent(QGraphicsSceneHoverEvent *);
-    friend class QmlGraphicsWebPage;
-};
-
-class QmlGraphicsWebViewAttached : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString windowObjectName READ windowObjectName WRITE setWindowObjectName)
-public:
-    QmlGraphicsWebViewAttached(QObject *parent)
-        : QObject(parent)
-    {
-    }
-
-    QString windowObjectName() const
-    {
-        return m_windowObjectName;
-    }
-
-    void setWindowObjectName(const QString &n)
-    {
-        m_windowObjectName = n;
-    }
-
-private:
-    QString m_windowObjectName;
-};
-
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsWebView)
-QML_DECLARE_TYPEINFO(QmlGraphicsWebView, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h
deleted file mode 100644
index e132cae..0000000
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSWEBVIEW_P_H
-#define QMLGRAPHICSWEBVIEW_P_H
-
-#include <qml.h>
-
-#include <QtWebKit/QWebPage>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsWebSettings : public QObject {
-    Q_OBJECT
-
-    Q_PROPERTY(QString standardFontFamily READ standardFontFamily WRITE setStandardFontFamily)
-    Q_PROPERTY(QString fixedFontFamily READ fixedFontFamily WRITE setFixedFontFamily)
-    Q_PROPERTY(QString serifFontFamily READ serifFontFamily WRITE setSerifFontFamily)
-    Q_PROPERTY(QString sansSerifFontFamily READ sansSerifFontFamily WRITE setSansSerifFontFamily)
-    Q_PROPERTY(QString cursiveFontFamily READ cursiveFontFamily WRITE setCursiveFontFamily)
-    Q_PROPERTY(QString fantasyFontFamily READ fantasyFontFamily WRITE setFantasyFontFamily)
-
-    Q_PROPERTY(int minimumFontSize READ minimumFontSize WRITE setMinimumFontSize)
-    Q_PROPERTY(int minimumLogicalFontSize READ minimumLogicalFontSize WRITE setMinimumLogicalFontSize)
-    Q_PROPERTY(int defaultFontSize READ defaultFontSize WRITE setDefaultFontSize)
-    Q_PROPERTY(int defaultFixedFontSize READ defaultFixedFontSize WRITE setDefaultFixedFontSize)
-
-    Q_PROPERTY(bool autoLoadImages READ autoLoadImages WRITE setAutoLoadImages)
-    Q_PROPERTY(bool javascriptEnabled READ javascriptEnabled WRITE setJavascriptEnabled)
-    Q_PROPERTY(bool javaEnabled READ javaEnabled WRITE setJavaEnabled)
-    Q_PROPERTY(bool pluginsEnabled READ pluginsEnabled WRITE setPluginsEnabled)
-    Q_PROPERTY(bool privateBrowsingEnabled READ privateBrowsingEnabled WRITE setPrivateBrowsingEnabled)
-    Q_PROPERTY(bool javascriptCanOpenWindows READ javascriptCanOpenWindows WRITE setJavascriptCanOpenWindows)
-    Q_PROPERTY(bool javascriptCanAccessClipboard READ javascriptCanAccessClipboard WRITE setJavascriptCanAccessClipboard)
-    Q_PROPERTY(bool developerExtrasEnabled READ developerExtrasEnabled WRITE setDeveloperExtrasEnabled)
-    Q_PROPERTY(bool linksIncludedInFocusChain READ linksIncludedInFocusChain WRITE setLinksIncludedInFocusChain)
-    Q_PROPERTY(bool zoomTextOnly READ zoomTextOnly WRITE setZoomTextOnly)
-    Q_PROPERTY(bool printElementBackgrounds READ printElementBackgrounds WRITE setPrintElementBackgrounds)
-    Q_PROPERTY(bool offlineStorageDatabaseEnabled READ offlineStorageDatabaseEnabled WRITE setOfflineStorageDatabaseEnabled)
-    Q_PROPERTY(bool offlineWebApplicationCacheEnabled READ offlineWebApplicationCacheEnabled WRITE setOfflineWebApplicationCacheEnabled)
-    Q_PROPERTY(bool localStorageDatabaseEnabled READ localStorageDatabaseEnabled WRITE setLocalStorageDatabaseEnabled)
-    Q_PROPERTY(bool localContentCanAccessRemoteUrls READ localContentCanAccessRemoteUrls WRITE setLocalContentCanAccessRemoteUrls)
-
-public:
-    QmlGraphicsWebSettings() {}
-
-    QString standardFontFamily() const { return s->fontFamily(QWebSettings::StandardFont); }
-    void setStandardFontFamily(const QString& f) { s->setFontFamily(QWebSettings::StandardFont,f); }
-    QString fixedFontFamily() const { return s->fontFamily(QWebSettings::FixedFont); }
-    void setFixedFontFamily(const QString& f) { s->setFontFamily(QWebSettings::FixedFont,f); }
-    QString serifFontFamily() const { return s->fontFamily(QWebSettings::SerifFont); }
-    void setSerifFontFamily(const QString& f) { s->setFontFamily(QWebSettings::SerifFont,f); }
-    QString sansSerifFontFamily() const { return s->fontFamily(QWebSettings::SansSerifFont); }
-    void setSansSerifFontFamily(const QString& f) { s->setFontFamily(QWebSettings::SansSerifFont,f); }
-    QString cursiveFontFamily() const { return s->fontFamily(QWebSettings::CursiveFont); }
-    void setCursiveFontFamily(const QString& f) { s->setFontFamily(QWebSettings::CursiveFont,f); }
-    QString fantasyFontFamily() const { return s->fontFamily(QWebSettings::FantasyFont); }
-    void setFantasyFontFamily(const QString& f) { s->setFontFamily(QWebSettings::FantasyFont,f); }
-
-    int minimumFontSize() const { return s->fontSize(QWebSettings::MinimumFontSize); }
-    void setMinimumFontSize(int size) { s->setFontSize(QWebSettings::MinimumFontSize,size); }
-    int minimumLogicalFontSize() const { return s->fontSize(QWebSettings::MinimumLogicalFontSize); }
-    void setMinimumLogicalFontSize(int size) { s->setFontSize(QWebSettings::MinimumLogicalFontSize,size); }
-    int defaultFontSize() const { return s->fontSize(QWebSettings::DefaultFontSize); }
-    void setDefaultFontSize(int size) { s->setFontSize(QWebSettings::DefaultFontSize,size); }
-    int defaultFixedFontSize() const { return s->fontSize(QWebSettings::DefaultFixedFontSize); }
-    void setDefaultFixedFontSize(int size) { s->setFontSize(QWebSettings::DefaultFixedFontSize,size); }
-
-    bool autoLoadImages() const { return s->testAttribute(QWebSettings::AutoLoadImages); }
-    void setAutoLoadImages(bool on) { s->setAttribute(QWebSettings::AutoLoadImages, on); }
-    bool javascriptEnabled() const { return s->testAttribute(QWebSettings::JavascriptEnabled); }
-    void setJavascriptEnabled(bool on) { s->setAttribute(QWebSettings::JavascriptEnabled, on); }
-    bool javaEnabled() const { return s->testAttribute(QWebSettings::JavaEnabled); }
-    void setJavaEnabled(bool on) { s->setAttribute(QWebSettings::JavaEnabled, on); }
-    bool pluginsEnabled() const { return s->testAttribute(QWebSettings::PluginsEnabled); }
-    void setPluginsEnabled(bool on) { s->setAttribute(QWebSettings::PluginsEnabled, on); }
-    bool privateBrowsingEnabled() const { return s->testAttribute(QWebSettings::PrivateBrowsingEnabled); }
-    void setPrivateBrowsingEnabled(bool on) { s->setAttribute(QWebSettings::PrivateBrowsingEnabled, on); }
-    bool javascriptCanOpenWindows() const { return s->testAttribute(QWebSettings::JavascriptCanOpenWindows); }
-    void setJavascriptCanOpenWindows(bool on) { s->setAttribute(QWebSettings::JavascriptCanOpenWindows, on); }
-    bool javascriptCanAccessClipboard() const { return s->testAttribute(QWebSettings::JavascriptCanAccessClipboard); }
-    void setJavascriptCanAccessClipboard(bool on) { s->setAttribute(QWebSettings::JavascriptCanAccessClipboard, on); }
-    bool developerExtrasEnabled() const { return s->testAttribute(QWebSettings::DeveloperExtrasEnabled); }
-    void setDeveloperExtrasEnabled(bool on) { s->setAttribute(QWebSettings::DeveloperExtrasEnabled, on); }
-    bool linksIncludedInFocusChain() const { return s->testAttribute(QWebSettings::LinksIncludedInFocusChain); }
-    void setLinksIncludedInFocusChain(bool on) { s->setAttribute(QWebSettings::LinksIncludedInFocusChain, on); }
-    bool zoomTextOnly() const { return s->testAttribute(QWebSettings::ZoomTextOnly); }
-    void setZoomTextOnly(bool on) { s->setAttribute(QWebSettings::ZoomTextOnly, on); }
-    bool printElementBackgrounds() const { return s->testAttribute(QWebSettings::PrintElementBackgrounds); }
-    void setPrintElementBackgrounds(bool on) { s->setAttribute(QWebSettings::PrintElementBackgrounds, on); }
-    bool offlineStorageDatabaseEnabled() const { return s->testAttribute(QWebSettings::OfflineStorageDatabaseEnabled); }
-    void setOfflineStorageDatabaseEnabled(bool on) { s->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, on); }
-    bool offlineWebApplicationCacheEnabled() const { return s->testAttribute(QWebSettings::OfflineWebApplicationCacheEnabled); }
-    void setOfflineWebApplicationCacheEnabled(bool on) { s->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, on); }
-    bool localStorageDatabaseEnabled() const { return s->testAttribute(QWebSettings::LocalStorageDatabaseEnabled); }
-    void setLocalStorageDatabaseEnabled(bool on) { s->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, on); }
-    bool localContentCanAccessRemoteUrls() const { return s->testAttribute(QWebSettings::LocalContentCanAccessRemoteUrls); }
-    void setLocalContentCanAccessRemoteUrls(bool on) { s->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, on); }
-
-    QWebSettings *s;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsWebSettings)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/qml/parser/parser.pri b/src/declarative/qml/parser/parser.pri
index 4530479..fd4361c 100644
--- a/src/declarative/qml/parser/parser.pri
+++ b/src/declarative/qml/parser/parser.pri
@@ -1,21 +1,21 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qmljsast_p.h \
-    $$PWD/qmljsastfwd_p.h \
-    $$PWD/qmljsastvisitor_p.h \
-    $$PWD/qmljsengine_p.h \
-    $$PWD/qmljsgrammar_p.h \
-    $$PWD/qmljslexer_p.h \
-    $$PWD/qmljsmemorypool_p.h \
-    $$PWD/qmljsnodepool_p.h \
-    $$PWD/qmljsparser_p.h \
-    $$PWD/qmljsglobal_p.h
+    $$PWD/qdeclarativejsast_p.h \
+    $$PWD/qdeclarativejsastfwd_p.h \
+    $$PWD/qdeclarativejsastvisitor_p.h \
+    $$PWD/qdeclarativejsengine_p.h \
+    $$PWD/qdeclarativejsgrammar_p.h \
+    $$PWD/qdeclarativejslexer_p.h \
+    $$PWD/qdeclarativejsmemorypool_p.h \
+    $$PWD/qdeclarativejsnodepool_p.h \
+    $$PWD/qdeclarativejsparser_p.h \
+    $$PWD/qdeclarativejsglobal_p.h
 
 SOURCES += \
-    $$PWD/qmljsast.cpp \
-    $$PWD/qmljsastvisitor.cpp \
-    $$PWD/qmljsengine_p.cpp \
-    $$PWD/qmljsgrammar.cpp \
-    $$PWD/qmljslexer.cpp \
-    $$PWD/qmljsparser.cpp
+    $$PWD/qdeclarativejsast.cpp \
+    $$PWD/qdeclarativejsastvisitor.cpp \
+    $$PWD/qdeclarativejsengine_p.cpp \
+    $$PWD/qdeclarativejsgrammar.cpp \
+    $$PWD/qdeclarativejslexer.cpp \
+    $$PWD/qdeclarativejsparser.cpp
diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g
new file mode 100644
index 0000000..e1cb5a5
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejs.g
@@ -0,0 +1,3075 @@
+----------------------------------------------------------------------------
+--
+-- Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+-- All rights reserved.
+-- Contact: Nokia Corporation (qt-info@nokia.com)
+--
+-- This file is part of the QtDeclarative module of the Qt Toolkit.
+--
+-- $QT_BEGIN_LICENSE:LGPL-ONLY$
+-- GNU Lesser General Public License Usage
+-- This file may be used under the terms of the GNU Lesser
+-- General Public License version 2.1 as published by the Free Software
+-- Foundation and appearing in the file LICENSE.LGPL included in the
+-- packaging of this file.  Please review the following information to
+-- ensure the GNU Lesser General Public License version 2.1 requirements
+-- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+--
+-- If you have questions regarding the use of this file, please contact
+-- Nokia at qt-info@nokia.com.
+-- $QT_END_LICENSE$
+--
+----------------------------------------------------------------------------
+
+%parser         QDeclarativeJSGrammar
+%decl           qdeclarativejsparser_p.h
+%impl           qdeclarativejsparser.cpp
+%expect         2
+%expect-rr      2
+
+%token T_AND "&"                T_AND_AND "&&"              T_AND_EQ "&="
+%token T_BREAK "break"          T_CASE "case"               T_CATCH "catch"
+%token T_COLON ":"              T_COMMA ";"                 T_CONTINUE "continue"
+%token T_DEFAULT "default"      T_DELETE "delete"           T_DIVIDE_ "/"
+%token T_DIVIDE_EQ "/="         T_DO "do"                   T_DOT "."
+%token T_ELSE "else"            T_EQ "="                    T_EQ_EQ "=="
+%token T_EQ_EQ_EQ "==="         T_FINALLY "finally"         T_FOR "for"
+%token T_FUNCTION "function"    T_GE ">="                   T_GT ">"
+%token T_GT_GT ">>"             T_GT_GT_EQ ">>="            T_GT_GT_GT ">>>"
+%token T_GT_GT_GT_EQ ">>>="     T_IDENTIFIER "identifier"   T_IF "if"
+%token T_IN "in"                T_INSTANCEOF "instanceof"   T_LBRACE "{"
+%token T_LBRACKET "["           T_LE "<="                   T_LPAREN "("
+%token T_LT "<"                 T_LT_LT "<<"                T_LT_LT_EQ "<<="
+%token T_MINUS "-"              T_MINUS_EQ "-="             T_MINUS_MINUS "--"
+%token T_NEW "new"              T_NOT "!"                   T_NOT_EQ "!="
+%token T_NOT_EQ_EQ "!=="        T_NUMERIC_LITERAL "numeric literal"     T_OR "|"
+%token T_OR_EQ "|="             T_OR_OR "||"                T_PLUS "+"
+%token T_PLUS_EQ "+="           T_PLUS_PLUS "++"            T_QUESTION "?"
+%token T_RBRACE "}"             T_RBRACKET "]"              T_REMAINDER "%"
+%token T_REMAINDER_EQ "%="      T_RETURN "return"           T_RPAREN ")"
+%token T_SEMICOLON ";"          T_AUTOMATIC_SEMICOLON       T_STAR "*"
+%token T_STAR_EQ "*="           T_STRING_LITERAL "string literal"
+%token T_PROPERTY "property"    T_SIGNAL "signal"           T_READONLY "readonly"
+%token T_SWITCH "switch"        T_THIS "this"               T_THROW "throw"
+%token T_TILDE "~"              T_TRY "try"                 T_TYPEOF "typeof"
+%token T_VAR "var"              T_VOID "void"               T_WHILE "while"
+%token T_WITH "with"            T_XOR "^"                   T_XOR_EQ "^="
+%token T_NULL "null"            T_TRUE "true"               T_FALSE "false"
+%token T_CONST "const"
+%token T_DEBUGGER "debugger"
+%token T_RESERVED_WORD "reserved word"
+%token T_MULTILINE_STRING_LITERAL "multiline string literal"
+%token T_COMMENT "comment"
+
+--- context keywords.
+%token T_PUBLIC "public"
+%token T_IMPORT "import"
+%token T_AS "as"
+
+--- feed tokens
+%token T_FEED_UI_PROGRAM
+%token T_FEED_UI_OBJECT_MEMBER
+%token T_FEED_JS_STATEMENT
+%token T_FEED_JS_EXPRESSION
+%token T_FEED_JS_SOURCE_ELEMENT
+%token T_FEED_JS_PROGRAM
+
+%nonassoc SHIFT_THERE
+%nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY T_READONLY
+%nonassoc REDUCE_HERE
+
+%start TopLevel
+
+/./****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QtDebug>
+#include <QtGui/QApplication>
+
+#include <string.h>
+
+#include "qdeclarativejsengine_p.h"
+#include "qdeclarativejslexer_p.h"
+#include "qdeclarativejsast_p.h"
+#include "qdeclarativejsnodepool_p.h"
+
+./
+
+/:/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+//
+// This file is automatically generated from qmljs.g.
+// Changes will be lost.
+//
+
+#ifndef QDECLARATIVEJSPARSER_P_H
+#define QDECLARATIVEJSPARSER_P_H
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsgrammar_p.h"
+#include "qdeclarativejsast_p.h"
+#include "qdeclarativejsengine_p.h"
+
+#include <QtCore/QList>
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+class Engine;
+class NameId;
+
+class QML_PARSER_EXPORT Parser: protected $table
+{
+public:
+    union Value {
+      int ival;
+      double dval;
+      NameId *sval;
+      AST::ArgumentList *ArgumentList;
+      AST::CaseBlock *CaseBlock;
+      AST::CaseClause *CaseClause;
+      AST::CaseClauses *CaseClauses;
+      AST::Catch *Catch;
+      AST::DefaultClause *DefaultClause;
+      AST::ElementList *ElementList;
+      AST::Elision *Elision;
+      AST::ExpressionNode *Expression;
+      AST::Finally *Finally;
+      AST::FormalParameterList *FormalParameterList;
+      AST::FunctionBody *FunctionBody;
+      AST::FunctionDeclaration *FunctionDeclaration;
+      AST::Node *Node;
+      AST::PropertyName *PropertyName;
+      AST::PropertyNameAndValueList *PropertyNameAndValueList;
+      AST::SourceElement *SourceElement;
+      AST::SourceElements *SourceElements;
+      AST::Statement *Statement;
+      AST::StatementList *StatementList;
+      AST::Block *Block;
+      AST::VariableDeclaration *VariableDeclaration;
+      AST::VariableDeclarationList *VariableDeclarationList;
+
+      AST::UiProgram *UiProgram;
+      AST::UiImportList *UiImportList;
+      AST::UiImport *UiImport;
+      AST::UiParameterList *UiParameterList;
+      AST::UiPublicMember *UiPublicMember;
+      AST::UiObjectDefinition *UiObjectDefinition;
+      AST::UiObjectInitializer *UiObjectInitializer;
+      AST::UiObjectBinding *UiObjectBinding;
+      AST::UiScriptBinding *UiScriptBinding;
+      AST::UiArrayBinding *UiArrayBinding;
+      AST::UiObjectMember *UiObjectMember;
+      AST::UiObjectMemberList *UiObjectMemberList;
+      AST::UiArrayMemberList *UiArrayMemberList;
+      AST::UiQualifiedId *UiQualifiedId;
+      AST::UiSignature *UiSignature;
+      AST::UiFormalList *UiFormalList;
+      AST::UiFormal *UiFormal;
+    };
+
+public:
+    Parser(Engine *engine);
+    ~Parser();
+
+    // parse a UI program
+    bool parse() { return parse(T_FEED_UI_PROGRAM); }
+    bool parseStatement() { return parse(T_FEED_JS_STATEMENT); }
+    bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
+    bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
+    bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
+    bool parseProgram() { return parse(T_FEED_JS_PROGRAM); }
+
+    AST::UiProgram *ast() const
+    { return AST::cast<AST::UiProgram *>(program); }
+
+    AST::Statement *statement() const
+    {
+        if (! program)
+            return 0;
+
+        return program->statementCast();
+    }
+
+    AST::ExpressionNode *expression() const
+    {
+        if (! program)
+            return 0;
+
+        return program->expressionCast();
+    }
+
+    AST::UiObjectMember *uiObjectMember() const
+    {
+        if (! program)
+            return 0;
+
+        return program->uiObjectMemberCast();
+    }
+
+    AST::Node *rootNode() const
+    { return program; }
+
+    QList<DiagnosticMessage> diagnosticMessages() const
+    { return diagnostic_messages; }
+
+    inline DiagnosticMessage diagnosticMessage() const
+    {
+        foreach (const DiagnosticMessage &d, diagnostic_messages) {
+            if (! d.kind == DiagnosticMessage::Warning)
+                return d;
+        }
+
+        return DiagnosticMessage();
+    }
+
+    inline QString errorMessage() const
+    { return diagnosticMessage().message; }
+
+    inline int errorLineNumber() const
+    { return diagnosticMessage().loc.startLine; }
+
+    inline int errorColumnNumber() const
+    { return diagnosticMessage().loc.startColumn; }
+
+protected:
+    bool parse(int startToken);
+
+    void reallocateStack();
+
+    inline Value &sym(int index)
+    { return sym_stack [tos + index - 1]; }
+
+    inline AST::SourceLocation &loc(int index)
+    { return location_stack [tos + index - 1]; }
+
+    AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
+
+protected:
+    Engine *driver;
+    int tos;
+    int stack_size;
+    Value *sym_stack;
+    int *state_stack;
+    AST::SourceLocation *location_stack;
+
+    AST::Node *program;
+
+    // error recovery
+    enum { TOKEN_BUFFER_SIZE = 3 };
+
+    struct SavedToken {
+       int token;
+       double dval;
+       AST::SourceLocation loc;
+    };
+
+    double yylval;
+    AST::SourceLocation yylloc;
+    AST::SourceLocation yyprevlloc;
+
+    SavedToken token_buffer[TOKEN_BUFFER_SIZE];
+    SavedToken *first_token;
+    SavedToken *last_token;
+
+    QList<DiagnosticMessage> diagnostic_messages;
+};
+
+} // end of namespace QDeclarativeJS
+
+
+:/
+
+
+/.
+
+#include "qdeclarativejsparser_p.h"
+#include <QVarLengthArray>
+
+//
+// This file is automatically generated from qmljs.g.
+// Changes will be lost.
+//
+
+using namespace QDeclarativeJS;
+
+QT_QML_BEGIN_NAMESPACE
+
+void Parser::reallocateStack()
+{
+    if (! stack_size)
+        stack_size = 128;
+    else
+        stack_size <<= 1;
+
+    sym_stack = reinterpret_cast<Value*> (qRealloc(sym_stack, stack_size * sizeof(Value)));
+    state_stack = reinterpret_cast<int*> (qRealloc(state_stack, stack_size * sizeof(int)));
+    location_stack = reinterpret_cast<AST::SourceLocation*> (qRealloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
+}
+
+inline static bool automatic(Engine *driver, int token)
+{
+    return token == $table::T_RBRACE
+        || token == 0
+        || driver->lexer()->prevTerminator();
+}
+
+
+Parser::Parser(Engine *engine):
+    driver(engine),
+    tos(0),
+    stack_size(0),
+    sym_stack(0),
+    state_stack(0),
+    location_stack(0),
+    first_token(0),
+    last_token(0)
+{
+}
+
+Parser::~Parser()
+{
+    if (stack_size) {
+        qFree(sym_stack);
+        qFree(state_stack);
+        qFree(location_stack);
+    }
+}
+
+static inline AST::SourceLocation location(Lexer *lexer)
+{
+    AST::SourceLocation loc;
+    loc.offset = lexer->tokenOffset();
+    loc.length = lexer->tokenLength();
+    loc.startLine = lexer->startLineNo();
+    loc.startColumn = lexer->startColumnNo();
+    return loc;
+}
+
+AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
+{
+    QVarLengthArray<NameId *, 4> nameIds;
+    QVarLengthArray<AST::SourceLocation, 4> locations;
+
+    AST::ExpressionNode *it = expr;
+    while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
+        nameIds.append(m->name);
+        locations.append(m->identifierToken);
+        it = m->base;
+    }
+
+    if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
+        AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
+        q->identifierToken = idExpr->identifierToken;
+
+        AST::UiQualifiedId *currentId = q;
+        for (int i = nameIds.size() - 1; i != -1; --i) {
+            currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
+            currentId->identifierToken = locations[i];
+        }
+
+        return currentId->finish();
+    }
+
+    return 0;
+}
+
+bool Parser::parse(int startToken)
+{
+    Lexer *lexer = driver->lexer();
+    bool hadErrors = false;
+    int yytoken = -1;
+    int action = 0;
+
+    token_buffer[0].token = startToken;
+    first_token = &token_buffer[0];
+    last_token = &token_buffer[1];
+
+    tos = -1;
+    program = 0;
+
+    do {
+        if (++tos == stack_size)
+            reallocateStack();
+
+        state_stack[tos] = action;
+
+    _Lcheck_token:
+        if (yytoken == -1 && -TERMINAL_COUNT != action_index[action]) {
+            yyprevlloc = yylloc;
+
+            if (first_token == last_token) {
+                yytoken = lexer->lex();
+                yylval = lexer->dval();
+                yylloc = location(lexer);
+            } else {
+                yytoken = first_token->token;
+                yylval = first_token->dval;
+                yylloc = first_token->loc;
+                ++first_token;
+            }
+        }
+
+        action = t_action(action, yytoken);
+        if (action > 0) {
+            if (action != ACCEPT_STATE) {
+                yytoken = -1;
+                sym(1).dval = yylval;
+                loc(1) = yylloc;
+            } else {
+              --tos;
+              return ! hadErrors;
+            }
+        } else if (action < 0) {
+          const int r = -action - 1;
+          tos -= rhs[r];
+
+          switch (r) {
+./
+
+--------------------------------------------------------------------------------------------------------
+-- Declarative UI
+--------------------------------------------------------------------------------------------------------
+
+TopLevel: T_FEED_UI_PROGRAM UiProgram ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_JS_STATEMENT Statement ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_JS_EXPRESSION Expression ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_JS_SOURCE_ELEMENT SourceElement ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_UI_OBJECT_MEMBER UiObjectMember ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_JS_PROGRAM Program ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+UiProgram: UiImportListOpt UiRootMember ;
+/.
+case $rule_number: {
+  sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
+        sym(2).UiObjectMemberList->finish());
+} break;
+./
+
+UiImportListOpt: Empty ;
+UiImportListOpt: UiImportList ;
+/.
+case $rule_number: {
+    sym(1).Node = sym(1).UiImportList->finish();
+} break;
+./
+
+UiImportList: UiImport ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport);
+} break;
+./
+
+UiImportList: UiImportList UiImport ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(),
+        sym(1).UiImportList, sym(2).UiImport);
+} break;
+./
+
+ImportId: MemberExpression ;
+
+UiImport: UiImportHead T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_SEMICOLON ;
+/.
+case $rule_number: {
+    sym(1).UiImport->semicolonToken = loc(2);
+} break;
+./
+
+UiImport: UiImportHead T_NUMERIC_LITERAL T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_NUMERIC_LITERAL T_SEMICOLON ;
+/.
+case $rule_number: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->semicolonToken = loc(3);
+} break;
+./
+
+UiImport: UiImportHead T_NUMERIC_LITERAL T_AS JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_NUMERIC_LITERAL T_AS JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->asToken = loc(3);
+    sym(1).UiImport->importIdToken = loc(4);
+    sym(1).UiImport->importId = sym(4).sval;
+    sym(1).UiImport->semicolonToken = loc(5);
+} break;
+./
+
+UiImport: UiImportHead T_AS JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_AS JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+    sym(1).UiImport->asToken = loc(2);
+    sym(1).UiImport->importIdToken = loc(3);
+    sym(1).UiImport->importId = sym(3).sval;
+    sym(1).UiImport->semicolonToken = loc(4);
+} break;
+./
+
+
+UiImportHead: T_IMPORT ImportId ;
+/.
+case $rule_number: {
+    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;
+./
+
+Empty: ;
+/.
+case $rule_number: {
+    sym(1).Node = 0;
+} break;
+./
+
+UiRootMember: UiObjectDefinition ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+./
+
+UiObjectMemberList: UiObjectMember ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+./
+
+UiObjectMemberList: UiObjectMemberList UiObjectMember ;
+/.
+case $rule_number: {
+    AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
+        sym(1).UiObjectMemberList, sym(2).UiObjectMember);
+    sym(1).Node = node;
+} break;
+./
+
+UiArrayMemberList: UiObjectDefinition ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+./
+
+UiArrayMemberList: UiArrayMemberList T_COMMA UiObjectDefinition ;
+/.
+case $rule_number: {
+    AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(),
+        sym(1).UiArrayMemberList, sym(3).UiObjectMember);
+    node->commaToken = loc(2);
+    sym(1).Node = node;
+} break;
+./
+
+UiObjectInitializer: T_LBRACE T_RBRACE ;
+/.
+case $rule_number: {
+    AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0);
+    node->lbraceToken = loc(1);
+    node->rbraceToken = loc(2);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectInitializer: T_LBRACE UiObjectMemberList T_RBRACE ;
+/.
+case $rule_number: {
+    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;
+./
+
+UiObjectDefinition: UiQualifiedId UiObjectInitializer ;
+/.
+case $rule_number: {
+    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
+        sym(2).UiObjectInitializer);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: UiObjectDefinition ;
+
+UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
+/.
+case $rule_number: {
+    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish());
+    node->colonToken = loc(2);
+    node->lbracketToken = loc(3);
+    node->rbracketToken = loc(5);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: UiQualifiedId             T_COLON UiQualifiedId  UiObjectInitializer ;
+/.
+case $rule_number: {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(1).UiQualifiedId, sym(3).UiQualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+} break;
+./
+
+UiObjectMember: UiQualifiedId T_COLON Block ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON EmptyStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if statement in a binding?
+/.case $rule_number:./
+
+/.
+{
+    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId, sym(3).Statement);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+}   break;
+./
+
+UiPropertyType: T_VAR ;
+/.
+case $rule_number:
+./
+UiPropertyType: T_RESERVED_WORD ;
+/.
+case $rule_number: {
+    sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+    break;
+}
+./
+
+UiPropertyType: T_IDENTIFIER ;
+
+UiParameterListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+UiParameterListOpt: UiParameterList ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).UiParameterList->finish ();
+} break;
+./
+
+UiParameterList: UiPropertyType JsIdentifier ;
+/.
+case $rule_number: {
+  AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
+  node->identifierToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+UiParameterList: UiParameterList T_COMMA UiPropertyType JsIdentifier ;
+/.
+case $rule_number: {
+  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;
+./
+
+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 ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
+    node->type = AST::UiPublicMember::Signal;
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(2);
+    node->parameters = sym(4).UiParameterList;
+    node->semicolonToken = loc(6);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
+    node->type = AST::UiPublicMember::Signal;
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(2);
+    node->semicolonToken = loc(3);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT T_IDENTIFIER T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
+    node->typeModifier = sym(2).sval;
+    node->propertyToken = loc(1);
+    node->typeModifierToken = loc(2);
+    node->typeToken = loc(4);
+    node->identifierToken = loc(6);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->semicolonToken = loc(4);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
+    node->isDefaultMember = true;
+    node->defaultToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->semicolonToken = loc(5);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
+        sym(5).Expression);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->colonToken = loc(4);
+    node->semicolonToken = loc(6);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
+        sym(6).Expression);
+    node->isReadonlyMember = true;
+    node->readonlyToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->colonToken = loc(5);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
+        sym(6).Expression);
+    node->isDefaultMember = true;
+    node->defaultToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->colonToken = loc(5);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: FunctionDeclaration ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
+}   break;
+./
+
+UiObjectMember: VariableStatement ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
+}   break;
+./
+
+JsIdentifier: T_IDENTIFIER;
+
+JsIdentifier: T_PROPERTY ;
+/.
+case $rule_number: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_PROPERTY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+./
+
+JsIdentifier: T_SIGNAL ;
+/.
+case $rule_number: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_SIGNAL]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+./
+
+JsIdentifier: T_READONLY ;
+/.
+case $rule_number: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_READONLY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+./
+
+--------------------------------------------------------------------------------------------------------
+-- Expressions
+--------------------------------------------------------------------------------------------------------
+
+PrimaryExpression: T_THIS ;
+/.
+case $rule_number: {
+  AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
+  node->thisToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: JsIdentifier ;
+/.
+case $rule_number: {
+  AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_NULL ;
+/.
+case $rule_number: {
+  AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
+  node->nullToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_TRUE ;
+/.
+case $rule_number: {
+  AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
+  node->trueToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_FALSE ;
+/.
+case $rule_number: {
+  AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
+  node->falseToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_NUMERIC_LITERAL ;
+/.
+case $rule_number: {
+  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_MULTILINE_STRING_LITERAL ;
+/.case $rule_number:./
+
+PrimaryExpression: T_STRING_LITERAL ;
+/.
+case $rule_number: {
+  AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_DIVIDE_ ;
+/:
+#define J_SCRIPT_REGEXPLITERAL_RULE1 $rule_number
+:/
+/.
+case $rule_number: {
+  bool rx = lexer->scanRegExp(Lexer::NoPrefix);
+  if (!rx) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+    return false; // ### remove me
+  }
+  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_DIVIDE_EQ ;
+/:
+#define J_SCRIPT_REGEXPLITERAL_RULE2 $rule_number
+:/
+/.
+case $rule_number: {
+  bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
+  if (!rx) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+    return false;
+  }
+  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET Elision T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish());
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET ElementList T_RBRACKET ;
+/.
+case $rule_number: {
+  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;
+./
+
+PrimaryExpression: T_LBRACKET ElementList T_COMMA T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET ElementList T_COMMA Elision T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    sym(4).Elision->finish());
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(5);
+  sym(1).Node = node;
+} break;
+./
+
+-- PrimaryExpression: T_LBRACE T_RBRACE ;
+-- /.
+-- case $rule_number: {
+--   sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
+-- } break;
+-- ./
+
+PrimaryExpression: T_LBRACE PropertyNameAndValueListOpt T_RBRACE ;
+/.
+case $rule_number: {
+  AST::ObjectLiteral *node = 0;
+  if (sym(2).Node)
+    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
+        sym(2).PropertyNameAndValueList->finish ());
+  else
+    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
+  node->lbraceToken = loc(1);
+  node->lbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACE PropertyNameAndValueList T_COMMA T_RBRACE ;
+/.
+case $rule_number: {
+  AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
+    sym(2).PropertyNameAndValueList->finish ());
+  node->lbraceToken = loc(1);
+  node->lbraceToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LPAREN Expression T_RPAREN ;
+/.
+case $rule_number: {
+  AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
+  node->lparenToken = loc(1);
+  node->rparenToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+UiQualifiedId: MemberExpression ;
+/.
+case $rule_number: {
+  if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
+      QLatin1String("Ignored annotation")));
+
+    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 ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
+} break;
+./
+
+ElementList: Elision AssignmentExpression ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
+} break;
+./
+
+ElementList: ElementList T_COMMA AssignmentExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+ElementList: ElementList T_COMMA Elision AssignmentExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+Elision: T_COMMA ;
+/.
+case $rule_number: {
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
+  node->commaToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+Elision: Elision T_COMMA ;
+/.
+case $rule_number: {
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyNameAndValueList: PropertyName T_COLON AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
+      sym(1).PropertyName, sym(3).Expression);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyNameAndValueList: PropertyNameAndValueList T_COMMA PropertyName T_COLON AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
+      sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
+  node->commaToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: T_IDENTIFIER %prec REDUCE_HERE ;
+/.
+case $rule_number: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: T_SIGNAL ;
+/.case $rule_number:./
+
+PropertyName: T_PROPERTY ;
+/.
+case $rule_number: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: T_STRING_LITERAL ;
+/.
+case $rule_number: {
+  AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: T_NUMERIC_LITERAL ;
+/.
+case $rule_number: {
+  AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: ReservedIdentifier ;
+/.
+case $rule_number: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+ReservedIdentifier: T_BREAK ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_CASE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_CATCH ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_CONTINUE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_DEFAULT ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_DELETE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_DO ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_ELSE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_FALSE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_FINALLY ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_FOR ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_FUNCTION ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_IF ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_IN ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_INSTANCEOF ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_NEW ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_NULL ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_RETURN ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_SWITCH ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_THIS ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_THROW ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_TRUE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_TRY ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_TYPEOF ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_VAR ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_VOID ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_WHILE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_CONST ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_DEBUGGER ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_RESERVED_WORD ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_WITH ;
+/.
+case $rule_number:
+{
+  sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+} break;
+./
+
+PropertyIdentifier: JsIdentifier ;
+PropertyIdentifier: ReservedIdentifier ;
+
+MemberExpression: PrimaryExpression ;
+MemberExpression: FunctionExpression ;
+
+MemberExpression: MemberExpression T_LBRACKET Expression T_RBRACKET ;
+/.
+case $rule_number: {
+  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;
+./
+
+MemberExpression: MemberExpression T_DOT PropertyIdentifier ;
+/.
+case $rule_number: {
+  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;
+./
+
+MemberExpression: T_NEW MemberExpression T_LPAREN ArgumentListOpt T_RPAREN ;
+/.
+case $rule_number: {
+  AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
+  node->newToken = loc(1);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  sym(1).Node = node;
+} break;
+./
+
+NewExpression: MemberExpression ;
+
+NewExpression: T_NEW NewExpression ;
+/.
+case $rule_number: {
+  AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
+  node->newToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+CallExpression: MemberExpression T_LPAREN ArgumentListOpt T_RPAREN ;
+/.
+case $rule_number: {
+  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;
+./
+
+CallExpression: CallExpression T_LPAREN ArgumentListOpt T_RPAREN ;
+/.
+case $rule_number: {
+  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;
+./
+
+CallExpression: CallExpression T_LBRACKET Expression T_RBRACKET ;
+/.
+case $rule_number: {
+  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;
+./
+
+CallExpression: CallExpression T_DOT PropertyIdentifier ;
+/.
+case $rule_number: {
+  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;
+./
+
+ArgumentListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+ArgumentListOpt: ArgumentList ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).ArgumentList->finish();
+} break;
+./
+
+ArgumentList: AssignmentExpression ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
+} break;
+./
+
+ArgumentList: ArgumentList T_COMMA AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+LeftHandSideExpression: NewExpression ;
+LeftHandSideExpression: CallExpression ;
+PostfixExpression: LeftHandSideExpression ;
+
+PostfixExpression: LeftHandSideExpression T_PLUS_PLUS ;
+/.
+case $rule_number: {
+  AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
+  node->incrementToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+PostfixExpression: LeftHandSideExpression T_MINUS_MINUS ;
+/.
+case $rule_number: {
+  AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
+  node->decrementToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: PostfixExpression ;
+
+UnaryExpression: T_DELETE UnaryExpression ;
+/.
+case $rule_number: {
+  AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
+  node->deleteToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_VOID UnaryExpression ;
+/.
+case $rule_number: {
+  AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
+  node->voidToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_TYPEOF UnaryExpression ;
+/.
+case $rule_number: {
+  AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
+  node->typeofToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_PLUS_PLUS UnaryExpression ;
+/.
+case $rule_number: {
+  AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
+  node->incrementToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_MINUS_MINUS UnaryExpression ;
+/.
+case $rule_number: {
+  AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
+  node->decrementToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_PLUS UnaryExpression ;
+/.
+case $rule_number: {
+  AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
+  node->plusToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_MINUS UnaryExpression ;
+/.
+case $rule_number: {
+  AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
+  node->minusToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_TILDE UnaryExpression ;
+/.
+case $rule_number: {
+  AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
+  node->tildeToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_NOT UnaryExpression ;
+/.
+case $rule_number: {
+  AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
+  node->notToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+MultiplicativeExpression: UnaryExpression ;
+
+MultiplicativeExpression: MultiplicativeExpression T_STAR UnaryExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+MultiplicativeExpression: MultiplicativeExpression T_DIVIDE_ UnaryExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+MultiplicativeExpression: MultiplicativeExpression T_REMAINDER UnaryExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+AdditiveExpression: MultiplicativeExpression ;
+
+AdditiveExpression: AdditiveExpression T_PLUS MultiplicativeExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+AdditiveExpression: AdditiveExpression T_MINUS MultiplicativeExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+ShiftExpression: AdditiveExpression ;
+
+ShiftExpression: ShiftExpression T_LT_LT AdditiveExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+ShiftExpression: ShiftExpression T_GT_GT AdditiveExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+ShiftExpression: ShiftExpression T_GT_GT_GT AdditiveExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpression: ShiftExpression ;
+
+RelationalExpression: RelationalExpression T_LT ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpression: RelationalExpression T_GT ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpression: RelationalExpression T_LE ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpression: RelationalExpression T_GE ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpression: RelationalExpression T_INSTANCEOF ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpression: RelationalExpression T_IN ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpressionNotIn: ShiftExpression ;
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_LT ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_GT ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_LE ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_GE ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_INSTANCEOF ShiftExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+EqualityExpression: RelationalExpression ;
+
+EqualityExpression: EqualityExpression T_EQ_EQ RelationalExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+EqualityExpression: EqualityExpression T_NOT_EQ RelationalExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+EqualityExpression: EqualityExpression T_EQ_EQ_EQ RelationalExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+EqualityExpression: EqualityExpression T_NOT_EQ_EQ RelationalExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+EqualityExpressionNotIn: RelationalExpressionNotIn ;
+
+EqualityExpressionNotIn: EqualityExpressionNotIn T_EQ_EQ RelationalExpressionNotIn ;
+/.
+case $rule_number: {
+  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;
+./
+
+EqualityExpressionNotIn: EqualityExpressionNotIn T_NOT_EQ RelationalExpressionNotIn;
+/.
+case $rule_number: {
+  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;
+./
+
+EqualityExpressionNotIn: EqualityExpressionNotIn T_EQ_EQ_EQ RelationalExpressionNotIn ;
+/.
+case $rule_number: {
+  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;
+./
+
+EqualityExpressionNotIn: EqualityExpressionNotIn T_NOT_EQ_EQ RelationalExpressionNotIn ;
+/.
+case $rule_number: {
+  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;
+./
+
+BitwiseANDExpression: EqualityExpression ;
+
+BitwiseANDExpression: BitwiseANDExpression T_AND EqualityExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+BitwiseANDExpressionNotIn: EqualityExpressionNotIn ;
+
+BitwiseANDExpressionNotIn: BitwiseANDExpressionNotIn T_AND EqualityExpressionNotIn ;
+/.
+case $rule_number: {
+  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;
+./
+
+BitwiseXORExpression: BitwiseANDExpression ;
+
+BitwiseXORExpression: BitwiseXORExpression T_XOR BitwiseANDExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+BitwiseXORExpressionNotIn: BitwiseANDExpressionNotIn ;
+
+BitwiseXORExpressionNotIn: BitwiseXORExpressionNotIn T_XOR BitwiseANDExpressionNotIn ;
+/.
+case $rule_number: {
+  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;
+./
+
+BitwiseORExpression: BitwiseXORExpression ;
+
+BitwiseORExpression: BitwiseORExpression T_OR BitwiseXORExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+BitwiseORExpressionNotIn: BitwiseXORExpressionNotIn ;
+
+BitwiseORExpressionNotIn: BitwiseORExpressionNotIn T_OR BitwiseXORExpressionNotIn ;
+/.
+case $rule_number: {
+  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;
+./
+
+LogicalANDExpression: BitwiseORExpression ;
+
+LogicalANDExpression: LogicalANDExpression T_AND_AND BitwiseORExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+LogicalANDExpressionNotIn: BitwiseORExpressionNotIn ;
+
+LogicalANDExpressionNotIn: LogicalANDExpressionNotIn T_AND_AND BitwiseORExpressionNotIn ;
+/.
+case $rule_number: {
+  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;
+./
+
+LogicalORExpression: LogicalANDExpression ;
+
+LogicalORExpression: LogicalORExpression T_OR_OR LogicalANDExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+LogicalORExpressionNotIn: LogicalANDExpressionNotIn ;
+
+LogicalORExpressionNotIn: LogicalORExpressionNotIn T_OR_OR LogicalANDExpressionNotIn ;
+/.
+case $rule_number: {
+  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;
+./
+
+ConditionalExpression: LogicalORExpression ;
+
+ConditionalExpression: LogicalORExpression T_QUESTION AssignmentExpression T_COLON AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
+    sym(3).Expression, sym(5).Expression);
+  node->questionToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+ConditionalExpressionNotIn: LogicalORExpressionNotIn ;
+
+ConditionalExpressionNotIn: LogicalORExpressionNotIn T_QUESTION AssignmentExpressionNotIn T_COLON AssignmentExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
+    sym(3).Expression, sym(5).Expression);
+  node->questionToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+AssignmentExpression: ConditionalExpression ;
+
+AssignmentExpression: LeftHandSideExpression AssignmentOperator AssignmentExpression ;
+/.
+case $rule_number: {
+  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;
+./
+
+AssignmentExpressionNotIn: ConditionalExpressionNotIn ;
+
+AssignmentExpressionNotIn: LeftHandSideExpression AssignmentOperator AssignmentExpressionNotIn ;
+/.
+case $rule_number: {
+  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;
+./
+
+AssignmentOperator: T_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::Assign;
+} break;
+./
+
+AssignmentOperator: T_STAR_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceMul;
+} break;
+./
+
+AssignmentOperator: T_DIVIDE_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceDiv;
+} break;
+./
+
+AssignmentOperator: T_REMAINDER_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceMod;
+} break;
+./
+
+AssignmentOperator: T_PLUS_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceAdd;
+} break;
+./
+
+AssignmentOperator: T_MINUS_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceSub;
+} break;
+./
+
+AssignmentOperator: T_LT_LT_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceLeftShift;
+} break;
+./
+
+AssignmentOperator: T_GT_GT_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceRightShift;
+} break;
+./
+
+AssignmentOperator: T_GT_GT_GT_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceURightShift;
+} break;
+./
+
+AssignmentOperator: T_AND_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceAnd;
+} break;
+./
+
+AssignmentOperator: T_XOR_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceXor;
+} break;
+./
+
+AssignmentOperator: T_OR_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceOr;
+} break;
+./
+
+Expression: AssignmentExpression ;
+
+Expression: Expression T_COMMA AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ExpressionOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+ExpressionOpt: Expression ;
+
+ExpressionNotIn: AssignmentExpressionNotIn ;
+
+ExpressionNotIn: ExpressionNotIn T_COMMA AssignmentExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ExpressionNotInOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+ExpressionNotInOpt: ExpressionNotIn ;
+
+Statement: Block ;
+Statement: VariableStatement ;
+Statement: EmptyStatement ;
+Statement: ExpressionStatement ;
+Statement: IfStatement ;
+Statement: IterationStatement ;
+Statement: ContinueStatement ;
+Statement: BreakStatement ;
+Statement: ReturnStatement ;
+Statement: WithStatement ;
+Statement: LabelledStatement ;
+Statement: SwitchStatement ;
+Statement: ThrowStatement ;
+Statement: TryStatement ;
+Statement: DebuggerStatement ;
+
+
+Block: T_LBRACE StatementListOpt T_RBRACE ;
+/.
+case $rule_number: {
+  AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+StatementList: Statement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
+} break;
+./
+
+StatementList: StatementList Statement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
+} break;
+./
+
+StatementListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+StatementListOpt: StatementList ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).StatementList->finish ();
+} break;
+./
+
+VariableStatement: VariableDeclarationKind VariableDeclarationList T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+VariableStatement: VariableDeclarationKind VariableDeclarationList T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
+     sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
+  node->declarationKindToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+VariableDeclarationKind: T_CONST ;
+/.
+case $rule_number: {
+  sym(1).ival = T_CONST;
+} break;
+./
+
+VariableDeclarationKind: T_VAR ;
+/.
+case $rule_number: {
+  sym(1).ival = T_VAR;
+} break;
+./
+
+VariableDeclarationList: VariableDeclaration ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
+} break;
+./
+
+VariableDeclarationList: VariableDeclarationList T_COMMA VariableDeclaration ;
+/.
+case $rule_number: {
+  AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
+    sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+VariableDeclarationListNotIn: VariableDeclarationNotIn ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
+} break;
+./
+
+VariableDeclarationListNotIn: VariableDeclarationListNotIn T_COMMA VariableDeclarationNotIn ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
+} break;
+./
+
+VariableDeclaration: JsIdentifier InitialiserOpt ;
+/.
+case $rule_number: {
+  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+VariableDeclarationNotIn: JsIdentifier InitialiserNotInOpt ;
+/.
+case $rule_number: {
+  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+Initialiser: T_EQ AssignmentExpression ;
+/.
+case $rule_number: {
+  // ### TODO: AST for initializer
+  sym(1) = sym(2);
+} break;
+./
+
+InitialiserOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+InitialiserOpt: Initialiser ;
+
+InitialiserNotIn: T_EQ AssignmentExpressionNotIn ;
+/.
+case $rule_number: {
+  // ### TODO: AST for initializer
+  sym(1) = sym(2);
+} break;
+./
+
+InitialiserNotInOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+InitialiserNotInOpt: InitialiserNotIn ;
+
+EmptyStatement: T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
+  node->semicolonToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+ExpressionStatement: Expression T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ExpressionStatement: Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+IfStatement: T_IF T_LPAREN Expression T_RPAREN Statement T_ELSE Statement ;
+/.
+case $rule_number: {
+  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);
+  node->rparenToken = loc(4);
+  node->elseToken = loc(5);
+  sym(1).Node = node;
+} break;
+./
+
+IfStatement: T_IF T_LPAREN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->ifToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+
+IterationStatement: T_DO Statement T_WHILE T_LPAREN Expression T_RPAREN T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+IterationStatement: T_DO Statement T_WHILE T_LPAREN Expression T_RPAREN T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
+  node->doToken = loc(1);
+  node->whileToken = loc(3);
+  node->lparenToken = loc(4);
+  node->rparenToken = loc(6);
+  node->semicolonToken = loc(7);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_WHILE T_LPAREN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->whileToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_FOR T_LPAREN ExpressionNotInOpt T_SEMICOLON ExpressionOpt T_SEMICOLON ExpressionOpt T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
+    sym(5).Expression, sym(7).Expression, sym(9).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->firstSemicolonToken = loc(4);
+  node->secondSemicolonToken = loc(6);
+  node->rparenToken = loc(8);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_FOR T_LPAREN T_VAR VariableDeclarationListNotIn T_SEMICOLON ExpressionOpt T_SEMICOLON ExpressionOpt T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
+     sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
+     sym(8).Expression, sym(10).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->varToken = loc(3);
+  node->firstSemicolonToken = loc(5);
+  node->secondSemicolonToken = loc(7);
+  node->rparenToken = loc(9);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_FOR T_LPAREN LeftHandSideExpression T_IN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
+    sym(5).Expression, sym(7).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->inToken = loc(4);
+  node->rparenToken = loc(6);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_FOR T_LPAREN T_VAR VariableDeclarationNotIn T_IN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
+    sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->varToken = loc(3);
+  node->inToken = loc(5);
+  node->rparenToken = loc(7);
+  sym(1).Node = node;
+} break;
+./
+
+ContinueStatement: T_CONTINUE T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ContinueStatement: T_CONTINUE T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
+  node->continueToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ContinueStatement: T_CONTINUE JsIdentifier T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ContinueStatement: T_CONTINUE JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
+  node->continueToken = loc(1);
+  node->identifierToken = loc(2);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+BreakStatement: T_BREAK T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+BreakStatement: T_BREAK T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
+  node->breakToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+BreakStatement: T_BREAK JsIdentifier T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+BreakStatement: T_BREAK JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
+  node->breakToken = loc(1);
+  node->identifierToken = loc(2);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+ReturnStatement: T_RETURN ExpressionOpt T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ReturnStatement: T_RETURN ExpressionOpt T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
+  node->returnToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+WithStatement: T_WITH T_LPAREN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->withToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+SwitchStatement: T_SWITCH T_LPAREN Expression T_RPAREN CaseBlock ;
+/.
+case $rule_number: {
+  AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
+  node->switchToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+CaseBlock: T_LBRACE CaseClausesOpt T_RBRACE ;
+/.
+case $rule_number: {
+  AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+CaseBlock: T_LBRACE CaseClausesOpt DefaultClause CaseClausesOpt T_RBRACE ;
+/.
+case $rule_number: {
+  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;
+./
+
+CaseClauses: CaseClause ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
+} break;
+./
+
+CaseClauses: CaseClauses CaseClause ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
+} break;
+./
+
+CaseClausesOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+CaseClausesOpt: CaseClauses ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).CaseClauses->finish ();
+} break;
+./
+
+CaseClause: T_CASE Expression T_COLON StatementListOpt ;
+/.
+case $rule_number: {
+  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;
+./
+
+DefaultClause: T_DEFAULT T_COLON StatementListOpt ;
+/.
+case $rule_number: {
+  AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
+  node->defaultToken = loc(1);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+LabelledStatement: T_SIGNAL T_COLON Statement ;
+/.case $rule_number:./
+
+LabelledStatement: T_PROPERTY T_COLON Statement ;
+/.
+case $rule_number: {
+  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;
+./
+
+LabelledStatement: T_IDENTIFIER T_COLON Statement ;
+/.
+case $rule_number: {
+  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;
+./
+
+ThrowStatement: T_THROW Expression T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ThrowStatement: T_THROW Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
+  node->throwToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+TryStatement: T_TRY Block Catch ;
+/.
+case $rule_number: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+TryStatement: T_TRY Block Finally ;
+/.
+case $rule_number: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+TryStatement: T_TRY Block Catch Finally ;
+/.
+case $rule_number: {
+  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;
+./
+
+Catch: T_CATCH T_LPAREN JsIdentifier T_RPAREN Block ;
+/.
+case $rule_number: {
+  AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
+  node->catchToken = loc(1);
+  node->lparenToken = loc(2);
+  node->identifierToken = loc(3);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+Finally: T_FINALLY Block ;
+/.
+case $rule_number: {
+  AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
+  node->finallyToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+DebuggerStatement: T_DEBUGGER T_AUTOMATIC_SEMICOLON ; -- automatic semicolon
+DebuggerStatement: T_DEBUGGER T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
+  node->debuggerToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+FunctionDeclaration: T_FUNCTION JsIdentifier T_LPAREN FormalParameterListOpt T_RPAREN T_LBRACE FunctionBodyOpt T_RBRACE ;
+/.
+case $rule_number: {
+  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);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  node->lbraceToken = loc(6);
+  node->rbraceToken = loc(8);
+  sym(1).Node = node;
+} break;
+./
+
+FunctionExpression: T_FUNCTION IdentifierOpt T_LPAREN FormalParameterListOpt T_RPAREN T_LBRACE FunctionBodyOpt T_RBRACE ;
+/.
+case $rule_number: {
+  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)
+      node->identifierToken = loc(2);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  node->lbraceToken = loc(6);
+  node->rbraceToken = loc(8);
+  sym(1).Node = node;
+} break;
+./
+
+FormalParameterList: JsIdentifier ;
+/.
+case $rule_number: {
+  AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+FormalParameterList: FormalParameterList T_COMMA JsIdentifier ;
+/.
+case $rule_number: {
+  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;
+./
+
+FormalParameterListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+FormalParameterListOpt: FormalParameterList ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).FormalParameterList->finish ();
+} break;
+./
+
+FunctionBodyOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+FunctionBodyOpt: FunctionBody ;
+
+FunctionBody: SourceElements ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+./
+
+Program: SourceElements ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+./
+
+SourceElements: SourceElement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
+} break;
+./
+
+SourceElements: SourceElements SourceElement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
+} break;
+./
+
+SourceElement: Statement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
+} break;
+./
+
+SourceElement: FunctionDeclaration ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
+} break;
+./
+
+IdentifierOpt: ;
+/.
+case $rule_number: {
+  sym(1).sval = 0;
+} break;
+./
+
+IdentifierOpt: JsIdentifier ;
+
+PropertyNameAndValueListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+PropertyNameAndValueListOpt: PropertyNameAndValueList ;
+
+/.
+            } // switch
+            action = nt_action(state_stack[tos], lhs[r] - TERMINAL_COUNT);
+        } // if
+    } while (action != 0);
+
+    if (first_token == last_token) {
+        const int errorState = state_stack[tos];
+
+        // automatic insertion of `;'
+        if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
+            SavedToken &tk = token_buffer[0];
+            tk.token = yytoken;
+            tk.dval = yylval;
+            tk.loc = yylloc;
+
+            yylloc = yyprevlloc;
+            yylloc.offset += yylloc.length;
+            yylloc.startColumn += yylloc.length;
+            yylloc.length = 0;
+
+            //const QString msg = qApp->translate("QDeclarativeParser", "Missing `;'");
+            //diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, yylloc, msg));
+
+            first_token = &token_buffer[0];
+            last_token = &token_buffer[1];
+
+            yytoken = T_SEMICOLON;
+            yylval = 0;
+
+            action = errorState;
+
+            goto _Lcheck_token;
+        }
+
+        hadErrors = true;
+
+        token_buffer[0].token = yytoken;
+        token_buffer[0].dval = yylval;
+        token_buffer[0].loc = yylloc;
+
+        token_buffer[1].token = yytoken = lexer->lex();
+        token_buffer[1].dval  = yylval  = lexer->dval();
+        token_buffer[1].loc   = yylloc  = location(lexer);
+
+        if (t_action(errorState, yytoken)) {
+            QString msg;
+            int token = token_buffer[0].token;
+            if (token < 0 || token >= TERMINAL_COUNT)
+                msg = qApp->translate("QDeclarativeParser", "Syntax error");
+            else
+                msg = qApp->translate("QDeclarativeParser", "Unexpected token `%1'").arg(QLatin1String(spell[token]));
+            diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+            action = errorState;
+            goto _Lcheck_token;
+        }
+
+        static int tokens[] = {
+            T_PLUS,
+            T_EQ,
+
+            T_COMMA,
+            T_COLON,
+            T_SEMICOLON,
+
+            T_RPAREN, T_RBRACKET, T_RBRACE,
+
+            T_NUMERIC_LITERAL,
+            T_IDENTIFIER,
+
+            T_LPAREN, T_LBRACKET, T_LBRACE,
+
+            EOF_SYMBOL
+        };
+
+        for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) {
+            int a = t_action(errorState, *tk);
+            if (a > 0 && t_action(a, yytoken)) {
+                const QString msg = qApp->translate("QDeclarativeParser", "Expected token `%1'").arg(QLatin1String(spell[*tk]));
+                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+                yytoken = *tk;
+                yylval = 0;
+                yylloc = token_buffer[0].loc;
+                yylloc.length = 0;
+
+                first_token = &token_buffer[0];
+                last_token = &token_buffer[2];
+
+                action = errorState;
+                goto _Lcheck_token;
+            }
+        }
+
+        for (int tk = 1; tk < TERMINAL_COUNT; ++tk) {
+            if (tk == T_AUTOMATIC_SEMICOLON || tk == T_FEED_UI_PROGRAM    ||
+                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION ||
+                tk == T_FEED_JS_SOURCE_ELEMENT)
+               continue;
+
+            int a = t_action(errorState, tk);
+            if (a > 0 && t_action(a, yytoken)) {
+                const QString msg = qApp->translate("QDeclarativeParser", "Expected token `%1'").arg(QLatin1String(spell[tk]));
+                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+                yytoken = tk;
+                yylval = 0;
+                yylloc = token_buffer[0].loc;
+                yylloc.length = 0;
+
+                action = errorState;
+                goto _Lcheck_token;
+            }
+        }
+
+        const QString msg = qApp->translate("QDeclarativeParser", "Syntax error");
+        diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+    }
+
+    return false;
+}
+
+QT_QML_END_NAMESPACE
+
+
+./
+/:
+QT_QML_END_NAMESPACE
+
+
+
+#endif // QDECLARATIVEJSPARSER_P_H
+:/
diff --git a/src/declarative/qml/parser/qdeclarativejsast.cpp b/src/declarative/qml/parser/qdeclarativejsast.cpp
new file mode 100644
index 0000000..3b569a7
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsast.cpp
@@ -0,0 +1,955 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativejsast_p.h"
+
+#include "qdeclarativejsastvisitor_p.h"
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS { namespace AST {
+
+void Node::accept(Visitor *visitor)
+{
+    if (visitor->preVisit(this)) {
+        accept0(visitor);
+    }
+    visitor->postVisit(this);
+}
+
+void Node::accept(Node *node, Visitor *visitor)
+{
+    if (node)
+        node->accept(visitor);
+}
+
+ExpressionNode *Node::expressionCast()
+{
+    return 0;
+}
+
+BinaryExpression *Node::binaryExpressionCast()
+{
+    return 0;
+}
+
+Statement *Node::statementCast()
+{
+    return 0;
+}
+
+UiObjectMember *Node::uiObjectMemberCast()
+{
+    return 0;
+}
+
+ExpressionNode *ExpressionNode::expressionCast()
+{
+    return this;
+}
+
+BinaryExpression *BinaryExpression::binaryExpressionCast()
+{
+    return this;
+}
+
+Statement *Statement::statementCast()
+{
+    return this;
+}
+
+UiObjectMember *UiObjectMember::uiObjectMemberCast()
+{
+    return this;
+}
+
+void NestedExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+    visitor->endVisit(this);
+}
+
+void ThisExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void IdentifierExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void NullExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void TrueLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void FalseLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void StringLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void NumericLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void RegExpLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void ArrayLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(elements, visitor);
+        accept(elision, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ObjectLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(properties, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ElementList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (ElementList *it = this; it; it = it->next) {
+            accept(it->elision, visitor);
+            accept(it->expression, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void Elision::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        // ###
+    }
+
+    visitor->endVisit(this);
+}
+
+void PropertyNameAndValueList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (PropertyNameAndValueList *it = this; it; it = it->next) {
+            accept(it->name, visitor);
+            accept(it->value, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void IdentifierPropertyName::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void StringLiteralPropertyName::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void NumericLiteralPropertyName::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void ArrayMemberExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void FieldMemberExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void NewMemberExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+        accept(arguments, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void NewExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void CallExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+        accept(arguments, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ArgumentList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (ArgumentList *it = this; it; it = it->next) {
+            accept(it->expression, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void PostIncrementExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void PostDecrementExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void DeleteExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void VoidExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void TypeOfExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void PreIncrementExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void PreDecrementExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UnaryPlusExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UnaryMinusExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void TildeExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void NotExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void BinaryExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(left, visitor);
+        accept(right, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ConditionalExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(ok, visitor);
+        accept(ko, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Expression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(left, visitor);
+        accept(right, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Block::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void StatementList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (StatementList *it = this; it; it = it->next) {
+            accept(it->statement, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void VariableStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(declarations, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void VariableDeclarationList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (VariableDeclarationList *it = this; it; it = it->next) {
+            accept(it->declaration, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void VariableDeclaration::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void EmptyStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void ExpressionStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void IfStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(ok, visitor);
+        accept(ko, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void DoWhileStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void WhileStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ForStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(initialiser, visitor);
+        accept(condition, visitor);
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void LocalForStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(declarations, visitor);
+        accept(condition, visitor);
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ForEachStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(initialiser, visitor);
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void LocalForEachStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(declaration, visitor);
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ContinueStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void BreakStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void ReturnStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void WithStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void SwitchStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(block, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void CaseBlock::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(clauses, visitor);
+        accept(defaultClause, visitor);
+        accept(moreClauses, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void CaseClauses::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (CaseClauses *it = this; it; it = it->next) {
+            accept(it->clause, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void CaseClause::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(statements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void DefaultClause::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void LabelledStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ThrowStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void TryStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+        accept(catchExpression, visitor);
+        accept(finallyExpression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Catch::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Finally::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void FunctionDeclaration::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(formals, visitor);
+        accept(body, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void FunctionExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(formals, visitor);
+        accept(body, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void FormalParameterList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        // ###
+    }
+
+    visitor->endVisit(this);
+}
+
+void FunctionBody::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(elements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Program::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(elements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void SourceElements::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (SourceElements *it = this; it; it = it->next) {
+            accept(it->element, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void FunctionSourceElement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(declaration, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void StatementSourceElement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void DebuggerStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiProgram::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(imports, visitor);
+        accept(members, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiSignature::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(formals, visitor);
+    }
+    visitor->endVisit(this);
+}
+
+void UiFormalList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (UiFormalList *it = this; it; it = it->next) {
+            accept(it->formal, visitor);
+        }
+    }
+    visitor->endVisit(this);
+}
+
+void UiFormal::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+    visitor->endVisit(this);
+}
+
+void UiPublicMember::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiObjectDefinition::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(qualifiedTypeNameId, visitor);
+        accept(initializer, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiObjectInitializer::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(members, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiObjectBinding::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(qualifiedId, visitor);
+        accept(qualifiedTypeNameId, visitor);
+        accept(initializer, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiScriptBinding::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(qualifiedId, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiArrayBinding::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(qualifiedId, visitor);
+        accept(members, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiObjectMemberList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (UiObjectMemberList *it = this; it; it = it->next)
+            accept(it->member, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiArrayMemberList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (UiArrayMemberList *it = this; it; it = it->next)
+            accept(it->member, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiQualifiedId::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiImport::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(importUri, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiImportList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(import, visitor);
+        accept(next, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiSourceElement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(sourceElement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+} } // namespace QDeclarativeJS::AST
+
+QT_QML_END_NAMESPACE
+
+
diff --git a/src/declarative/qml/parser/qdeclarativejsast_p.h b/src/declarative/qml/parser/qdeclarativejsast_p.h
new file mode 100644
index 0000000..0a83fe2
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsast_p.h
@@ -0,0 +1,2678 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSAST_P_H
+#define QDECLARATIVEJSAST_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsastvisitor_p.h"
+#include "qdeclarativejsglobal_p.h"
+
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+#define QDECLARATIVEJS_DECLARE_AST_NODE(name) \
+  enum { K = Kind_##name };
+
+namespace QSOperator // ### rename
+{
+
+enum Op {
+    Add,
+    And,
+    InplaceAnd,
+    Assign,
+    BitAnd,
+    BitOr,
+    BitXor,
+    InplaceSub,
+    Div,
+    InplaceDiv,
+    Equal,
+    Ge,
+    Gt,
+    In,
+    InplaceAdd,
+    InstanceOf,
+    Le,
+    LShift,
+    InplaceLeftShift,
+    Lt,
+    Mod,
+    InplaceMod,
+    Mul,
+    InplaceMul,
+    NotEqual,
+    Or,
+    InplaceOr,
+    RShift,
+    InplaceRightShift,
+    StrictEqual,
+    StrictNotEqual,
+    Sub,
+    URShift,
+    InplaceURightShift,
+    InplaceXor
+};
+
+} // namespace QSOperator
+
+namespace QDeclarativeJS {
+class NameId;
+namespace AST {
+
+template <typename _T1, typename _T2>
+_T1 cast(_T2 *ast)
+{
+    if (ast && ast->kind == static_cast<_T1>(0)->K)
+        return static_cast<_T1>(ast);
+
+    return 0;
+}
+
+class QML_PARSER_EXPORT Node
+{
+public:
+    enum Kind {
+        Kind_Undefined,
+
+        Kind_ArgumentList,
+        Kind_ArrayLiteral,
+        Kind_ArrayMemberExpression,
+        Kind_BinaryExpression,
+        Kind_Block,
+        Kind_BreakStatement,
+        Kind_CallExpression,
+        Kind_CaseBlock,
+        Kind_CaseClause,
+        Kind_CaseClauses,
+        Kind_Catch,
+        Kind_ConditionalExpression,
+        Kind_ContinueStatement,
+        Kind_DebuggerStatement,
+        Kind_DefaultClause,
+        Kind_DeleteExpression,
+        Kind_DoWhileStatement,
+        Kind_ElementList,
+        Kind_Elision,
+        Kind_EmptyStatement,
+        Kind_Expression,
+        Kind_ExpressionStatement,
+        Kind_FalseLiteral,
+        Kind_FieldMemberExpression,
+        Kind_Finally,
+        Kind_ForEachStatement,
+        Kind_ForStatement,
+        Kind_FormalParameterList,
+        Kind_FunctionBody,
+        Kind_FunctionDeclaration,
+        Kind_FunctionExpression,
+        Kind_FunctionSourceElement,
+        Kind_IdentifierExpression,
+        Kind_IdentifierPropertyName,
+        Kind_IfStatement,
+        Kind_LabelledStatement,
+        Kind_LocalForEachStatement,
+        Kind_LocalForStatement,
+        Kind_NewExpression,
+        Kind_NewMemberExpression,
+        Kind_NotExpression,
+        Kind_NullExpression,
+        Kind_NumericLiteral,
+        Kind_NumericLiteralPropertyName,
+        Kind_ObjectLiteral,
+        Kind_PostDecrementExpression,
+        Kind_PostIncrementExpression,
+        Kind_PreDecrementExpression,
+        Kind_PreIncrementExpression,
+        Kind_Program,
+        Kind_PropertyName,
+        Kind_PropertyNameAndValueList,
+        Kind_RegExpLiteral,
+        Kind_ReturnStatement,
+        Kind_SourceElement,
+        Kind_SourceElements,
+        Kind_StatementList,
+        Kind_StatementSourceElement,
+        Kind_StringLiteral,
+        Kind_StringLiteralPropertyName,
+        Kind_SwitchStatement,
+        Kind_ThisExpression,
+        Kind_ThrowStatement,
+        Kind_TildeExpression,
+        Kind_TrueLiteral,
+        Kind_TryStatement,
+        Kind_TypeOfExpression,
+        Kind_UnaryMinusExpression,
+        Kind_UnaryPlusExpression,
+        Kind_VariableDeclaration,
+        Kind_VariableDeclarationList,
+        Kind_VariableStatement,
+        Kind_VoidExpression,
+        Kind_WhileStatement,
+        Kind_WithStatement,
+        Kind_NestedExpression,
+
+        Kind_UiArrayBinding,
+        Kind_UiImport,
+        Kind_UiImportList,
+        Kind_UiObjectBinding,
+        Kind_UiObjectDefinition,
+        Kind_UiObjectInitializer,
+        Kind_UiObjectMemberList,
+        Kind_UiArrayMemberList,
+        Kind_UiProgram,
+        Kind_UiParameterList,
+        Kind_UiPublicMember,
+        Kind_UiQualifiedId,
+        Kind_UiScriptBinding,
+        Kind_UiSourceElement,
+        Kind_UiFormal,
+        Kind_UiFormalList,
+        Kind_UiSignature
+    };
+
+    inline Node()
+        : kind(Kind_Undefined) {}
+
+    virtual ~Node() {}
+
+    virtual ExpressionNode *expressionCast();
+    virtual BinaryExpression *binaryExpressionCast();
+    virtual Statement *statementCast();
+    virtual UiObjectMember *uiObjectMemberCast();
+
+    void accept(Visitor *visitor);
+    static void accept(Node *node, Visitor *visitor);
+
+    inline static void acceptChild(Node *node, Visitor *visitor)
+    { return accept(node, visitor); } // ### remove
+
+    virtual void accept0(Visitor *visitor) = 0;
+
+// attributes
+    int kind;
+};
+
+class QML_PARSER_EXPORT ExpressionNode: public Node
+{
+public:
+    ExpressionNode() {}
+    virtual ~ExpressionNode() {}
+
+    virtual ExpressionNode *expressionCast();
+
+    virtual SourceLocation firstSourceLocation() const = 0;
+    virtual SourceLocation lastSourceLocation() const = 0;
+};
+
+class QML_PARSER_EXPORT Statement: public Node
+{
+public:
+    Statement() {}
+    virtual ~Statement() {}
+
+    virtual Statement *statementCast();
+
+    virtual SourceLocation firstSourceLocation() const = 0;
+    virtual SourceLocation lastSourceLocation() const = 0;
+};
+
+class QML_PARSER_EXPORT UiFormal: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiFormal)
+
+    UiFormal(NameId *name, NameId *alias = 0)
+      : name(name), alias(alias)
+    { }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *name;
+    NameId *alias;
+    SourceLocation identifierToken;
+    SourceLocation asToken;
+    SourceLocation aliasToken;
+};
+
+class QML_PARSER_EXPORT UiFormalList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiFormalList)
+
+    UiFormalList(UiFormal *formal)
+            : formal(formal), next(this) {}
+
+    UiFormalList(UiFormalList *previous, UiFormal *formal)
+            : formal(formal)
+    {
+        next = previous->next;
+        previous->next = this;
+    }
+
+    UiFormalList *finish()
+    {
+        UiFormalList *head = next;
+        next = 0;
+        return head;
+    }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiFormal *formal;
+    UiFormalList *next;
+};
+
+class QML_PARSER_EXPORT UiSignature: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiSignature)
+
+    UiSignature(UiFormalList *formals = 0)
+        : formals(formals)
+    { }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    SourceLocation lparenToken;
+    UiFormalList *formals;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT NestedExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NestedExpression)
+
+    NestedExpression(ExpressionNode *expression)
+        : expression(expression)
+    { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return lparenToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rparenToken; }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ThisExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ThisExpression)
+
+    ThisExpression() { kind = K; }
+    virtual ~ThisExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return thisToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return thisToken; }
+
+// attributes
+    SourceLocation thisToken;
+};
+
+class QML_PARSER_EXPORT IdentifierExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(IdentifierExpression)
+
+    IdentifierExpression(NameId *n):
+        name (n) { kind = K; }
+
+    virtual ~IdentifierExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return identifierToken; }
+
+// attributes
+    NameId *name;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT NullExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NullExpression)
+
+    NullExpression() { kind = K; }
+    virtual ~NullExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return nullToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return nullToken; }
+
+// attributes
+    SourceLocation nullToken;
+};
+
+class QML_PARSER_EXPORT TrueLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(TrueLiteral)
+
+    TrueLiteral() { kind = K; }
+    virtual ~TrueLiteral() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return trueToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return trueToken; }
+
+// attributes
+    SourceLocation trueToken;
+};
+
+class QML_PARSER_EXPORT FalseLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FalseLiteral)
+
+    FalseLiteral() { kind = K; }
+    virtual ~FalseLiteral() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return falseToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return falseToken; }
+
+// attributes
+    SourceLocation falseToken;
+};
+
+class QML_PARSER_EXPORT NumericLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NumericLiteral)
+
+    NumericLiteral(double v):
+        value(v) { kind = K; }
+    virtual ~NumericLiteral() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return literalToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return literalToken; }
+
+// attributes:
+    double value;
+    SourceLocation literalToken;
+};
+
+class QML_PARSER_EXPORT StringLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(StringLiteral)
+
+    StringLiteral(NameId *v):
+        value (v) { kind = K; }
+
+    virtual ~StringLiteral() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return literalToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return literalToken; }
+
+// attributes:
+    NameId *value;
+    SourceLocation literalToken;
+};
+
+class QML_PARSER_EXPORT RegExpLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(RegExpLiteral)
+
+    RegExpLiteral(NameId *p, int f):
+        pattern (p), flags (f) { kind = K; }
+
+    virtual ~RegExpLiteral() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return literalToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return literalToken; }
+
+// attributes:
+    NameId *pattern;
+    int flags;
+    SourceLocation literalToken;
+};
+
+class QML_PARSER_EXPORT ArrayLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ArrayLiteral)
+
+    ArrayLiteral(Elision *e):
+        elements (0), elision (e)
+        { kind = K; }
+
+    ArrayLiteral(ElementList *elts):
+        elements (elts), elision (0)
+        { kind = K; }
+
+    ArrayLiteral(ElementList *elts, Elision *e):
+        elements (elts), elision (e)
+        { kind = K; }
+
+    virtual ~ArrayLiteral() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return lbracketToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbracketToken; }
+
+// attributes
+    ElementList *elements;
+    Elision *elision;
+    SourceLocation lbracketToken;
+    SourceLocation commaToken;
+    SourceLocation rbracketToken;
+};
+
+class QML_PARSER_EXPORT ObjectLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ObjectLiteral)
+
+    ObjectLiteral():
+        properties (0) { kind = K; }
+
+    ObjectLiteral(PropertyNameAndValueList *plist):
+        properties (plist) { kind = K; }
+
+    virtual ~ObjectLiteral() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return lbraceToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbraceToken; }
+
+// attributes
+    PropertyNameAndValueList *properties;
+    SourceLocation lbraceToken;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT ElementList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ElementList)
+
+    ElementList(Elision *e, ExpressionNode *expr):
+        elision (e), expression (expr), next (this)
+    { kind = K; }
+
+    ElementList(ElementList *previous, Elision *e, ExpressionNode *expr):
+        elision (e), expression (expr)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~ElementList() {}
+
+    inline ElementList *finish ()
+    {
+        ElementList *front = next;
+        next = 0;
+        return front;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    Elision *elision;
+    ExpressionNode *expression;
+    ElementList *next;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT Elision: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Elision)
+
+    Elision():
+        next (this) { kind = K; }
+
+    Elision(Elision *previous)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~Elision() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    inline Elision *finish ()
+    {
+        Elision *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    Elision *next;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT PropertyNameAndValueList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PropertyNameAndValueList)
+
+    PropertyNameAndValueList(PropertyName *n, ExpressionNode *v):
+        name (n), value (v), next (this)
+        { kind = K; }
+
+    PropertyNameAndValueList(PropertyNameAndValueList *previous, PropertyName *n, ExpressionNode *v):
+        name (n), value (v)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~PropertyNameAndValueList() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    inline PropertyNameAndValueList *finish ()
+    {
+        PropertyNameAndValueList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    PropertyName *name;
+    ExpressionNode *value;
+    PropertyNameAndValueList *next;
+    SourceLocation colonToken;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT PropertyName: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PropertyName)
+
+    PropertyName() { kind = K; }
+    virtual ~PropertyName() {}
+
+// attributes
+    SourceLocation propertyNameToken;
+};
+
+class QML_PARSER_EXPORT IdentifierPropertyName: public PropertyName
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(IdentifierPropertyName)
+
+    IdentifierPropertyName(NameId *n):
+        id (n) { kind = K; }
+
+    virtual ~IdentifierPropertyName() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *id;
+};
+
+class QML_PARSER_EXPORT StringLiteralPropertyName: public PropertyName
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(StringLiteralPropertyName)
+
+    StringLiteralPropertyName(NameId *n):
+        id (n) { kind = K; }
+    virtual ~StringLiteralPropertyName() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *id;
+};
+
+class QML_PARSER_EXPORT NumericLiteralPropertyName: public PropertyName
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NumericLiteralPropertyName)
+
+    NumericLiteralPropertyName(double n):
+        id (n) { kind = K; }
+    virtual ~NumericLiteralPropertyName() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    double id;
+};
+
+class QML_PARSER_EXPORT ArrayMemberExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ArrayMemberExpression)
+
+    ArrayMemberExpression(ExpressionNode *b, ExpressionNode *e):
+        base (b), expression (e)
+        { kind = K; }
+
+    virtual ~ArrayMemberExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbracketToken; }
+
+// attributes
+    ExpressionNode *base;
+    ExpressionNode *expression;
+    SourceLocation lbracketToken;
+    SourceLocation rbracketToken;
+};
+
+class QML_PARSER_EXPORT FieldMemberExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FieldMemberExpression)
+
+    FieldMemberExpression(ExpressionNode *b, NameId *n):
+        base (b), name (n)
+        { kind = K; }
+
+    virtual ~FieldMemberExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return identifierToken; }
+
+    // attributes
+    ExpressionNode *base;
+    NameId *name;
+    SourceLocation dotToken;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT NewMemberExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NewMemberExpression)
+
+    NewMemberExpression(ExpressionNode *b, ArgumentList *a):
+        base (b), arguments (a)
+        { kind = K; }
+
+    virtual ~NewMemberExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return newToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rparenToken; }
+
+    // attributes
+    ExpressionNode *base;
+    ArgumentList *arguments;
+    SourceLocation newToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT NewExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NewExpression)
+
+    NewExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~NewExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return newToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation newToken;
+};
+
+class QML_PARSER_EXPORT CallExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(CallExpression)
+
+    CallExpression(ExpressionNode *b, ArgumentList *a):
+        base (b), arguments (a)
+        { kind = K; }
+
+    virtual ~CallExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rparenToken; }
+
+// attributes
+    ExpressionNode *base;
+    ArgumentList *arguments;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ArgumentList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ArgumentList)
+
+    ArgumentList(ExpressionNode *e):
+        expression (e), next (this)
+        { kind = K; }
+
+    ArgumentList(ArgumentList *previous, ExpressionNode *e):
+        expression (e)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~ArgumentList() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    inline ArgumentList *finish ()
+    {
+        ArgumentList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    ExpressionNode *expression;
+    ArgumentList *next;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT PostIncrementExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PostIncrementExpression)
+
+    PostIncrementExpression(ExpressionNode *b):
+        base (b) { kind = K; }
+
+    virtual ~PostIncrementExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return incrementToken; }
+
+// attributes
+    ExpressionNode *base;
+    SourceLocation incrementToken;
+};
+
+class QML_PARSER_EXPORT PostDecrementExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PostDecrementExpression)
+
+    PostDecrementExpression(ExpressionNode *b):
+        base (b) { kind = K; }
+
+    virtual ~PostDecrementExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return decrementToken; }
+
+// attributes
+    ExpressionNode *base;
+    SourceLocation decrementToken;
+};
+
+class QML_PARSER_EXPORT DeleteExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(DeleteExpression)
+
+    DeleteExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+    virtual ~DeleteExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return deleteToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation deleteToken;
+};
+
+class QML_PARSER_EXPORT VoidExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(VoidExpression)
+
+    VoidExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~VoidExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return voidToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation voidToken;
+};
+
+class QML_PARSER_EXPORT TypeOfExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(TypeOfExpression)
+
+    TypeOfExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~TypeOfExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return typeofToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation typeofToken;
+};
+
+class QML_PARSER_EXPORT PreIncrementExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PreIncrementExpression)
+
+    PreIncrementExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~PreIncrementExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return incrementToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation incrementToken;
+};
+
+class QML_PARSER_EXPORT PreDecrementExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PreDecrementExpression)
+
+    PreDecrementExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~PreDecrementExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return decrementToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation decrementToken;
+};
+
+class QML_PARSER_EXPORT UnaryPlusExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UnaryPlusExpression)
+
+    UnaryPlusExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~UnaryPlusExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return plusToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation plusToken;
+};
+
+class QML_PARSER_EXPORT UnaryMinusExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UnaryMinusExpression)
+
+    UnaryMinusExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~UnaryMinusExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return minusToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation minusToken;
+};
+
+class QML_PARSER_EXPORT TildeExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(TildeExpression)
+
+    TildeExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~TildeExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return tildeToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation tildeToken;
+};
+
+class QML_PARSER_EXPORT NotExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NotExpression)
+
+    NotExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~NotExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return notToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation notToken;
+};
+
+class QML_PARSER_EXPORT BinaryExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(BinaryExpression)
+
+    BinaryExpression(ExpressionNode *l, int o, ExpressionNode *r):
+        left (l), op (o), right (r)
+        { kind = K; }
+
+    virtual ~BinaryExpression() {}
+
+    virtual BinaryExpression *binaryExpressionCast();
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return left->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return right->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *left;
+    int op;
+    ExpressionNode *right;
+    SourceLocation operatorToken;
+};
+
+class QML_PARSER_EXPORT ConditionalExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ConditionalExpression)
+
+    ConditionalExpression(ExpressionNode *e, ExpressionNode *t, ExpressionNode *f):
+        expression (e), ok (t), ko (f)
+        { kind = K; }
+
+    virtual ~ConditionalExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return expression->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return ko->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    ExpressionNode *ok;
+    ExpressionNode *ko;
+    SourceLocation questionToken;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT Expression: public ExpressionNode // ### rename
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Expression)
+
+    Expression(ExpressionNode *l, ExpressionNode *r):
+        left (l), right (r) { kind = K; }
+
+    virtual ~Expression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return left->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return right->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *left;
+    ExpressionNode *right;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT Block: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Block)
+
+    Block(StatementList *slist):
+        statements (slist) { kind = K; }
+
+    virtual ~Block() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return lbraceToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbraceToken; }
+
+    // attributes
+    StatementList *statements;
+    SourceLocation lbraceToken;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT StatementList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(StatementList)
+
+    StatementList(Statement *stmt):
+        statement (stmt), next (this)
+        { kind = K; }
+
+    StatementList(StatementList *previous, Statement *stmt):
+        statement (stmt)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~StatementList() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    inline StatementList *finish ()
+    {
+        StatementList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    Statement *statement;
+    StatementList *next;
+};
+
+class QML_PARSER_EXPORT VariableStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(VariableStatement)
+
+    VariableStatement(VariableDeclarationList *vlist):
+        declarations (vlist)
+        { kind = K; }
+
+    virtual ~VariableStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return declarationKindToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    VariableDeclarationList *declarations;
+    SourceLocation declarationKindToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT VariableDeclaration: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(VariableDeclaration)
+
+    VariableDeclaration(NameId *n, ExpressionNode *e):
+        name (n), expression (e), readOnly(false)
+        { kind = K; }
+
+    virtual ~VariableDeclaration() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *name;
+    ExpressionNode *expression;
+    bool readOnly;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT VariableDeclarationList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(VariableDeclarationList)
+
+    VariableDeclarationList(VariableDeclaration *decl):
+        declaration (decl), next (this)
+        { kind = K; }
+
+    VariableDeclarationList(VariableDeclarationList *previous, VariableDeclaration *decl):
+        declaration (decl)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~VariableDeclarationList() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    inline VariableDeclarationList *finish (bool readOnly)
+    {
+        VariableDeclarationList *front = next;
+        next = 0;
+        if (readOnly) {
+            VariableDeclarationList *vdl;
+            for (vdl = front; vdl != 0; vdl = vdl->next)
+                vdl->declaration->readOnly = true;
+        }
+        return front;
+    }
+
+// attributes
+    VariableDeclaration *declaration;
+    VariableDeclarationList *next;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT EmptyStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(EmptyStatement)
+
+    EmptyStatement() { kind = K; }
+    virtual ~EmptyStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return semicolonToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT ExpressionStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ExpressionStatement)
+
+    ExpressionStatement(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~ExpressionStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return expression->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT IfStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(IfStatement)
+
+    IfStatement(ExpressionNode *e, Statement *t, Statement *f = 0):
+        expression (e), ok (t), ko (f)
+        { kind = K; }
+
+    virtual ~IfStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return ifToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+        if (ko)
+            return ko->lastSourceLocation();
+
+        return ok->lastSourceLocation();
+    }
+
+// attributes
+    ExpressionNode *expression;
+    Statement *ok;
+    Statement *ko;
+    SourceLocation ifToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+    SourceLocation elseToken;
+};
+
+class QML_PARSER_EXPORT DoWhileStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(DoWhileStatement)
+
+    DoWhileStatement(Statement *stmt, ExpressionNode *e):
+        statement (stmt), expression (e)
+        { kind = K; }
+
+    virtual ~DoWhileStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return doToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    Statement *statement;
+    ExpressionNode *expression;
+    SourceLocation doToken;
+    SourceLocation whileToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT WhileStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(WhileStatement)
+
+    WhileStatement(ExpressionNode *e, Statement *stmt):
+        expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual ~WhileStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return whileToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation whileToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ForStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ForStatement)
+
+    ForStatement(ExpressionNode *i, ExpressionNode *c, ExpressionNode *e, Statement *stmt):
+        initialiser (i), condition (c), expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual ~ForStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return forToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *initialiser;
+    ExpressionNode *condition;
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation forToken;
+    SourceLocation lparenToken;
+    SourceLocation firstSemicolonToken;
+    SourceLocation secondSemicolonToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT LocalForStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(LocalForStatement)
+
+    LocalForStatement(VariableDeclarationList *vlist, ExpressionNode *c, ExpressionNode *e, Statement *stmt):
+        declarations (vlist), condition (c), expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual ~LocalForStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return forToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    VariableDeclarationList *declarations;
+    ExpressionNode *condition;
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation forToken;
+    SourceLocation lparenToken;
+    SourceLocation varToken;
+    SourceLocation firstSemicolonToken;
+    SourceLocation secondSemicolonToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ForEachStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ForEachStatement)
+
+    ForEachStatement(ExpressionNode *i, ExpressionNode *e, Statement *stmt):
+        initialiser (i), expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual ~ForEachStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return forToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *initialiser;
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation forToken;
+    SourceLocation lparenToken;
+    SourceLocation inToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT LocalForEachStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(LocalForEachStatement)
+
+    LocalForEachStatement(VariableDeclaration *v, ExpressionNode *e, Statement *stmt):
+        declaration (v), expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual ~LocalForEachStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return forToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    VariableDeclaration *declaration;
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation forToken;
+    SourceLocation lparenToken;
+    SourceLocation varToken;
+    SourceLocation inToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ContinueStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ContinueStatement)
+
+    ContinueStatement(NameId *l = 0):
+        label (l) { kind = K; }
+
+    virtual ~ContinueStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return continueToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    NameId *label;
+    SourceLocation continueToken;
+    SourceLocation identifierToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT BreakStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(BreakStatement)
+
+    BreakStatement(NameId *l = 0):
+        label (l) { kind = K; }
+
+    virtual ~BreakStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return breakToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+    // attributes
+    NameId *label;
+    SourceLocation breakToken;
+    SourceLocation identifierToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT ReturnStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ReturnStatement)
+
+    ReturnStatement(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~ReturnStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return returnToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation returnToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT WithStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(WithStatement)
+
+    WithStatement(ExpressionNode *e, Statement *stmt):
+        expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual ~WithStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return withToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation withToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT CaseBlock: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(CaseBlock)
+
+    CaseBlock(CaseClauses *c, DefaultClause *d = 0, CaseClauses *r = 0):
+        clauses (c), defaultClause (d), moreClauses (r)
+        { kind = K; }
+
+    virtual ~CaseBlock() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    CaseClauses *clauses;
+    DefaultClause *defaultClause;
+    CaseClauses *moreClauses;
+    SourceLocation lbraceToken;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT SwitchStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(SwitchStatement)
+
+    SwitchStatement(ExpressionNode *e, CaseBlock *b):
+        expression (e), block (b)
+        { kind = K; }
+
+    virtual ~SwitchStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return switchToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return block->rbraceToken; }
+
+// attributes
+    ExpressionNode *expression;
+    CaseBlock *block;
+    SourceLocation switchToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT CaseClauses: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(CaseClauses)
+
+    CaseClauses(CaseClause *c):
+        clause (c), next (this)
+        { kind = K; }
+
+    CaseClauses(CaseClauses *previous, CaseClause *c):
+        clause (c)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~CaseClauses() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    inline CaseClauses *finish ()
+    {
+        CaseClauses *front = next;
+        next = 0;
+        return front;
+    }
+
+//attributes
+    CaseClause *clause;
+    CaseClauses *next;
+};
+
+class QML_PARSER_EXPORT CaseClause: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(CaseClause)
+
+    CaseClause(ExpressionNode *e, StatementList *slist):
+        expression (e), statements (slist)
+        { kind = K; }
+
+    virtual ~CaseClause() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    ExpressionNode *expression;
+    StatementList *statements;
+    SourceLocation caseToken;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT DefaultClause: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(DefaultClause)
+
+    DefaultClause(StatementList *slist):
+        statements (slist)
+        { kind = K; }
+
+    virtual ~DefaultClause() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    StatementList *statements;
+    SourceLocation defaultToken;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT LabelledStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(LabelledStatement)
+
+    LabelledStatement(NameId *l, Statement *stmt):
+        label (l), statement (stmt)
+        { kind = K; }
+
+    virtual ~LabelledStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    NameId *label;
+    Statement *statement;
+    SourceLocation identifierToken;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT ThrowStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ThrowStatement)
+
+    ThrowStatement(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual ~ThrowStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return throwToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+    // attributes
+    ExpressionNode *expression;
+    SourceLocation throwToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT Catch: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Catch)
+
+    Catch(NameId *n, Block *stmt):
+        name (n), statement (stmt)
+        { kind = K; }
+
+    virtual ~Catch() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *name;
+    Block *statement;
+    SourceLocation catchToken;
+    SourceLocation lparenToken;
+    SourceLocation identifierToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT Finally: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Finally)
+
+    Finally(Block *stmt):
+        statement (stmt)
+        { kind = K; }
+
+    virtual ~Finally() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    Block *statement;
+    SourceLocation finallyToken;
+};
+
+class QML_PARSER_EXPORT TryStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(TryStatement)
+
+    TryStatement(Statement *stmt, Catch *c, Finally *f):
+        statement (stmt), catchExpression (c), finallyExpression (f)
+        { kind = K; }
+
+    TryStatement(Statement *stmt, Finally *f):
+        statement (stmt), catchExpression (0), finallyExpression (f)
+        { kind = K; }
+
+    TryStatement(Statement *stmt, Catch *c):
+        statement (stmt), catchExpression (c), finallyExpression (0)
+        { kind = K; }
+
+    virtual ~TryStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return tryToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+        if (finallyExpression)
+            return finallyExpression->statement->rbraceToken;
+        else if (catchExpression)
+            return catchExpression->statement->rbraceToken;
+
+        return statement->lastSourceLocation();
+    }
+
+// attributes
+    Statement *statement;
+    Catch *catchExpression;
+    Finally *finallyExpression;
+    SourceLocation tryToken;
+};
+
+class QML_PARSER_EXPORT FunctionExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FunctionExpression)
+
+    FunctionExpression(NameId *n, FormalParameterList *f, FunctionBody *b):
+        name (n), formals (f), body (b)
+        { kind = K; }
+
+    virtual ~FunctionExpression() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return functionToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbraceToken; }
+
+// attributes
+    NameId *name;
+    FormalParameterList *formals;
+    FunctionBody *body;
+    SourceLocation functionToken;
+    SourceLocation identifierToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+    SourceLocation lbraceToken;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT FunctionDeclaration: public FunctionExpression
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FunctionDeclaration)
+
+    FunctionDeclaration(NameId *n, FormalParameterList *f, FunctionBody *b):
+        FunctionExpression(n, f, b)
+        { kind = K; }
+
+    virtual ~FunctionDeclaration() {}
+
+    virtual void accept0(Visitor *visitor);
+};
+
+class QML_PARSER_EXPORT FormalParameterList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FormalParameterList)
+
+    FormalParameterList(NameId *n):
+        name (n), next (this)
+        { kind = K; }
+
+    FormalParameterList(FormalParameterList *previous, NameId *n):
+        name (n)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~FormalParameterList() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    inline FormalParameterList *finish ()
+    {
+        FormalParameterList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    NameId *name;
+    FormalParameterList *next;
+    SourceLocation commaToken;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT FunctionBody: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FunctionBody)
+
+    FunctionBody(SourceElements *elts):
+        elements (elts)
+        { kind = K; }
+
+    virtual ~FunctionBody() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    SourceElements *elements;
+};
+
+class QML_PARSER_EXPORT Program: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Program)
+
+    Program(SourceElements *elts):
+        elements (elts)
+        { kind = K; }
+
+    virtual ~Program() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    SourceElements *elements;
+};
+
+class QML_PARSER_EXPORT SourceElements: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(SourceElements)
+
+    SourceElements(SourceElement *elt):
+        element (elt), next (this)
+        { kind = K; }
+
+    SourceElements(SourceElements *previous, SourceElement *elt):
+        element (elt)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~SourceElements() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    inline SourceElements *finish ()
+    {
+        SourceElements *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    SourceElement *element;
+    SourceElements *next;
+};
+
+class QML_PARSER_EXPORT SourceElement: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(SourceElement)
+
+    inline SourceElement()
+        { kind = K; }
+
+    virtual ~SourceElement() {}
+};
+
+class QML_PARSER_EXPORT FunctionSourceElement: public SourceElement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FunctionSourceElement)
+
+    FunctionSourceElement(FunctionDeclaration *f):
+        declaration (f)
+        { kind = K; }
+
+    virtual ~FunctionSourceElement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    FunctionDeclaration *declaration;
+};
+
+class QML_PARSER_EXPORT StatementSourceElement: public SourceElement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(StatementSourceElement)
+
+    StatementSourceElement(Statement *stmt):
+        statement (stmt)
+        { kind = K; }
+
+    virtual ~StatementSourceElement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    Statement *statement;
+};
+
+class QML_PARSER_EXPORT DebuggerStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(DebuggerStatement)
+
+    DebuggerStatement()
+        { kind = K; }
+
+    virtual ~DebuggerStatement() {}
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return debuggerToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    SourceLocation debuggerToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT UiProgram: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiProgram)
+
+    UiProgram(UiImportList *imports, UiObjectMemberList *members)
+        : imports(imports), members(members)
+    { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiImportList *imports;
+    UiObjectMemberList *members;
+};
+
+class QML_PARSER_EXPORT UiQualifiedId: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiQualifiedId)
+
+    UiQualifiedId(NameId *name)
+        : next(this), name(name)
+    { kind = K; }
+
+    UiQualifiedId(UiQualifiedId *previous, NameId *name)
+        : name(name)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~UiQualifiedId() {}
+
+    UiQualifiedId *finish()
+    {
+        UiQualifiedId *head = next;
+        next = 0;
+        return head;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *next;
+    NameId *name;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT UiImport: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiImport)
+
+    UiImport(NameId *fileName)
+        : fileName(fileName), importUri(0), importId(0)
+    { kind = K; }
+
+    UiImport(UiQualifiedId *uri)
+        : fileName(0), importUri(uri), importId(0)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return importToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *fileName;
+    UiQualifiedId *importUri;
+    NameId *importId;
+    SourceLocation importToken;
+    SourceLocation fileNameToken;
+    SourceLocation versionToken;
+    SourceLocation asToken;
+    SourceLocation importIdToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT UiImportList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiImportList)
+
+    UiImportList(UiImport *import)
+        : import(import),
+          next(this)
+    { kind = K; }
+
+    UiImportList(UiImportList *previous, UiImport *import)
+        : import(import)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual SourceLocation firstSourceLocation() const
+    {
+        if (import) return import->firstSourceLocation();
+        else return SourceLocation();
+    }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+        for (const UiImportList *it = this; it; it = it->next)
+            if (!it->next && it->import)
+                return it->import->lastSourceLocation();
+
+        return SourceLocation();
+    }
+
+    UiImportList *finish()
+    {
+        UiImportList *head = next;
+        next = 0;
+        return head;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiImport *import;
+    UiImportList *next;
+};
+
+class QML_PARSER_EXPORT UiObjectMember: public Node
+{
+public:
+    virtual SourceLocation firstSourceLocation() const = 0;
+    virtual SourceLocation lastSourceLocation() const = 0;
+
+    virtual UiObjectMember *uiObjectMemberCast();
+};
+
+class QML_PARSER_EXPORT UiObjectMemberList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiObjectMemberList)
+
+    UiObjectMemberList(UiObjectMember *member)
+        : next(this), member(member)
+    { kind = K; }
+
+    UiObjectMemberList(UiObjectMemberList *previous, UiObjectMember *member)
+        : member(member)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    UiObjectMemberList *finish()
+    {
+        UiObjectMemberList *head = next;
+        next = 0;
+        return head;
+    }
+
+// attributes
+    UiObjectMemberList *next;
+    UiObjectMember *member;
+};
+
+class QML_PARSER_EXPORT UiArrayMemberList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiArrayMemberList)
+
+    UiArrayMemberList(UiObjectMember *member)
+        : next(this), member(member)
+    { kind = K; }
+
+    UiArrayMemberList(UiArrayMemberList *previous, UiObjectMember *member)
+        : member(member)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    UiArrayMemberList *finish()
+    {
+        UiArrayMemberList *head = next;
+        next = 0;
+        return head;
+    }
+
+// attributes
+    UiArrayMemberList *next;
+    UiObjectMember *member;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT UiObjectInitializer: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiObjectInitializer)
+
+    UiObjectInitializer(UiObjectMemberList *members)
+        : members(members)
+    { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    SourceLocation lbraceToken;
+    UiObjectMemberList *members;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT UiParameterList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiParameterList)
+
+    UiParameterList(NameId *t, NameId *n):
+        type (t), name (n), next (this)
+        { kind = K; }
+
+    UiParameterList(UiParameterList *previous, NameId *t, NameId *n):
+        type (t), name (n)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual ~UiParameterList() {}
+
+    virtual void accept0(Visitor *) {}
+
+    inline UiParameterList *finish ()
+    {
+        UiParameterList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    NameId *type;
+    NameId *name;
+    UiParameterList *next;
+    SourceLocation commaToken;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT UiPublicMember: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiPublicMember)
+
+    UiPublicMember(NameId *memberType,
+                   NameId *name)
+        : type(Property), typeModifier(0), memberType(memberType), name(name), expression(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
+    { kind = K; }
+
+    UiPublicMember(NameId *memberType,
+                   NameId *name,
+                   ExpressionNode *expression)
+        : type(Property), typeModifier(0), memberType(memberType), name(name), expression(expression), isDefaultMember(false), isReadonlyMember(false), parameters(0)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    {
+      if (defaultToken.isValid())
+        return defaultToken;
+      else if (readonlyToken.isValid())
+          return readonlyToken;
+
+      return propertyToken;
+    }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+      return semicolonToken;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    enum { Signal, Property } type;
+    NameId *typeModifier;
+    NameId *memberType;
+    NameId *name;
+    ExpressionNode *expression;
+    bool isDefaultMember;
+    bool isReadonlyMember;
+    UiParameterList *parameters;
+    SourceLocation defaultToken;
+    SourceLocation readonlyToken;
+    SourceLocation propertyToken;
+    SourceLocation typeModifierToken;
+    SourceLocation typeToken;
+    SourceLocation identifierToken;
+    SourceLocation colonToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT UiObjectDefinition: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiObjectDefinition)
+
+    UiObjectDefinition(UiQualifiedId *qualifiedTypeNameId,
+                       UiObjectInitializer *initializer)
+        : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return qualifiedTypeNameId->identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return initializer->rbraceToken; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *qualifiedTypeNameId;
+    UiObjectInitializer *initializer;
+};
+
+class QML_PARSER_EXPORT UiSourceElement: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiSourceElement)
+
+    UiSourceElement(Node *sourceElement)
+        : sourceElement(sourceElement)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    {
+      if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement))
+        return funDecl->firstSourceLocation();
+      else if (VariableStatement *varStmt = cast<VariableStatement *>(sourceElement))
+        return varStmt->firstSourceLocation();
+
+      return SourceLocation();
+    }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+      if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement))
+        return funDecl->lastSourceLocation();
+      else if (VariableStatement *varStmt = cast<VariableStatement *>(sourceElement))
+        return varStmt->lastSourceLocation();
+
+      return SourceLocation();
+    }
+
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    Node *sourceElement;
+};
+
+class QML_PARSER_EXPORT UiObjectBinding: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiObjectBinding)
+
+    UiObjectBinding(UiQualifiedId *qualifiedId,
+                    UiQualifiedId *qualifiedTypeNameId,
+                    UiObjectInitializer *initializer)
+        : qualifiedId(qualifiedId),
+          qualifiedTypeNameId(qualifiedTypeNameId),
+          initializer(initializer)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return qualifiedId->identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return initializer->rbraceToken; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *qualifiedId;
+    UiQualifiedId *qualifiedTypeNameId;
+    UiObjectInitializer *initializer;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT UiScriptBinding: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiScriptBinding)
+
+    UiScriptBinding(UiQualifiedId *qualifiedId,
+                    Statement *statement)
+        : qualifiedId(qualifiedId),
+          statement(statement)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return qualifiedId->identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *qualifiedId;
+    Statement *statement;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT UiArrayBinding: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiArrayBinding)
+
+    UiArrayBinding(UiQualifiedId *qualifiedId,
+                   UiArrayMemberList *members)
+        : qualifiedId(qualifiedId),
+          members(members)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return qualifiedId->identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbracketToken; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *qualifiedId;
+    UiArrayMemberList *members;
+    SourceLocation colonToken;
+    SourceLocation lbracketToken;
+    SourceLocation rbracketToken;
+};
+
+} } // namespace AST
+
+
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/src/declarative/qml/parser/qdeclarativejsastfwd_p.h b/src/declarative/qml/parser/qdeclarativejsastfwd_p.h
new file mode 100644
index 0000000..5a444b7
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsastfwd_p.h
@@ -0,0 +1,189 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSAST_FWD_P_H
+#define QDECLARATIVEJSAST_FWD_P_H
+
+#include "qdeclarativejsglobal_p.h"
+
+#include <QtCore/qglobal.h>
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS { namespace AST {
+
+class SourceLocation
+{
+public:
+    SourceLocation(quint32 offset = 0, quint32 length = 0, quint32 line = 0, quint32 column = 0)
+        : offset(offset), length(length),
+          startLine(line), startColumn(column)
+    { }
+
+    bool isValid() const { return length != 0; }
+
+    quint32 begin() const { return offset; }
+    quint32 end() const { return offset + length; }
+
+// attributes
+    // ### encode
+    quint32 offset;
+    quint32 length;
+    quint32 startLine;
+    quint32 startColumn;
+};
+
+class Visitor;
+class Node;
+class ExpressionNode;
+class Statement;
+class ThisExpression;
+class IdentifierExpression;
+class NullExpression;
+class TrueLiteral;
+class FalseLiteral;
+class NumericLiteral;
+class StringLiteral;
+class RegExpLiteral;
+class ArrayLiteral;
+class ObjectLiteral;
+class ElementList;
+class Elision;
+class PropertyNameAndValueList;
+class PropertyName;
+class IdentifierPropertyName;
+class StringLiteralPropertyName;
+class NumericLiteralPropertyName;
+class ArrayMemberExpression;
+class FieldMemberExpression;
+class NewMemberExpression;
+class NewExpression;
+class CallExpression;
+class ArgumentList;
+class PostIncrementExpression;
+class PostDecrementExpression;
+class DeleteExpression;
+class VoidExpression;
+class TypeOfExpression;
+class PreIncrementExpression;
+class PreDecrementExpression;
+class UnaryPlusExpression;
+class UnaryMinusExpression;
+class TildeExpression;
+class NotExpression;
+class BinaryExpression;
+class ConditionalExpression;
+class Expression; // ### rename
+class Block;
+class StatementList;
+class VariableStatement;
+class VariableDeclarationList;
+class VariableDeclaration;
+class EmptyStatement;
+class ExpressionStatement;
+class IfStatement;
+class DoWhileStatement;
+class WhileStatement;
+class ForStatement;
+class LocalForStatement;
+class ForEachStatement;
+class LocalForEachStatement;
+class ContinueStatement;
+class BreakStatement;
+class ReturnStatement;
+class WithStatement;
+class SwitchStatement;
+class CaseBlock;
+class CaseClauses;
+class CaseClause;
+class DefaultClause;
+class LabelledStatement;
+class ThrowStatement;
+class TryStatement;
+class Catch;
+class Finally;
+class FunctionDeclaration;
+class FunctionExpression;
+class FormalParameterList;
+class FunctionBody;
+class Program;
+class SourceElements;
+class SourceElement;
+class FunctionSourceElement;
+class StatementSourceElement;
+class DebuggerStatement;
+class NestedExpression;
+
+// ui elements
+class UiProgram;
+class UiImportList;
+class UiImport;
+class UiPublicMember;
+class UiObjectDefinition;
+class UiObjectInitializer;
+class UiObjectBinding;
+class UiScriptBinding;
+class UiSourceElement;
+class UiArrayBinding;
+class UiObjectMember;
+class UiObjectMemberList;
+class UiArrayMemberList;
+class UiQualifiedId;
+class UiFormalList;
+class UiFormal;
+class UiSignature;
+
+} } // namespace AST
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp b/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp
new file mode 100644
index 0000000..d8002cf
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativejsastvisitor_p.h"
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS { namespace AST {
+
+Visitor::Visitor()
+{
+}
+
+Visitor::~Visitor()
+{
+}
+
+} } // namespace QDeclarativeJS::AST
+
+QT_QML_END_NAMESPACE
diff --git a/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h b/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h
new file mode 100644
index 0000000..82abbcf
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h
@@ -0,0 +1,335 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSASTVISITOR_P_H
+#define QDECLARATIVEJSASTVISITOR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsastfwd_p.h"
+#include "qdeclarativejsglobal_p.h"
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS { namespace AST {
+
+class QML_PARSER_EXPORT Visitor
+{
+public:
+    Visitor();
+    virtual ~Visitor();
+
+    virtual bool preVisit(Node *) { return true; }
+    virtual void postVisit(Node *) {}
+
+    // Ui
+    virtual bool visit(UiProgram *) { return true; }
+    virtual bool visit(UiImportList *) { return true; }
+    virtual bool visit(UiImport *) { return true; }
+    virtual bool visit(UiPublicMember *) { return true; }
+    virtual bool visit(UiSourceElement *) { return true; }
+    virtual bool visit(UiObjectDefinition *) { return true; }
+    virtual bool visit(UiObjectInitializer *) { return true; }
+    virtual bool visit(UiObjectBinding *) { return true; }
+    virtual bool visit(UiScriptBinding *) { return true; }
+    virtual bool visit(UiArrayBinding *) { return true; }
+    virtual bool visit(UiObjectMemberList *) { return true; }
+    virtual bool visit(UiArrayMemberList *) { return true; }
+    virtual bool visit(UiQualifiedId *) { return true; }
+    virtual bool visit(UiSignature *) { return true; }
+    virtual bool visit(UiFormalList *) { return true; }
+    virtual bool visit(UiFormal *) { return true; }
+
+    virtual void endVisit(UiProgram *) {}
+    virtual void endVisit(UiImportList *) {}
+    virtual void endVisit(UiImport *) {}
+    virtual void endVisit(UiPublicMember *) {}
+    virtual void endVisit(UiSourceElement *) {}
+    virtual void endVisit(UiObjectDefinition *) {}
+    virtual void endVisit(UiObjectInitializer *) {}
+    virtual void endVisit(UiObjectBinding *) {}
+    virtual void endVisit(UiScriptBinding *) {}
+    virtual void endVisit(UiArrayBinding *) {}
+    virtual void endVisit(UiObjectMemberList *) {}
+    virtual void endVisit(UiArrayMemberList *) {}
+    virtual void endVisit(UiQualifiedId *) {}
+    virtual void endVisit(UiSignature *) {}
+    virtual void endVisit(UiFormalList *) {}
+    virtual void endVisit(UiFormal *) {}
+
+    // QDeclarativeJS
+    virtual bool visit(ThisExpression *) { return true; }
+    virtual void endVisit(ThisExpression *) {}
+
+    virtual bool visit(IdentifierExpression *) { return true; }
+    virtual void endVisit(IdentifierExpression *) {}
+
+    virtual bool visit(NullExpression *) { return true; }
+    virtual void endVisit(NullExpression *) {}
+
+    virtual bool visit(TrueLiteral *) { return true; }
+    virtual void endVisit(TrueLiteral *) {}
+
+    virtual bool visit(FalseLiteral *) { return true; }
+    virtual void endVisit(FalseLiteral *) {}
+
+    virtual bool visit(StringLiteral *) { return true; }
+    virtual void endVisit(StringLiteral *) {}
+
+    virtual bool visit(NumericLiteral *) { return true; }
+    virtual void endVisit(NumericLiteral *) {}
+
+    virtual bool visit(RegExpLiteral *) { return true; }
+    virtual void endVisit(RegExpLiteral *) {}
+
+    virtual bool visit(ArrayLiteral *) { return true; }
+    virtual void endVisit(ArrayLiteral *) {}
+
+    virtual bool visit(ObjectLiteral *) { return true; }
+    virtual void endVisit(ObjectLiteral *) {}
+
+    virtual bool visit(ElementList *) { return true; }
+    virtual void endVisit(ElementList *) {}
+
+    virtual bool visit(Elision *) { return true; }
+    virtual void endVisit(Elision *) {}
+
+    virtual bool visit(PropertyNameAndValueList *) { return true; }
+    virtual void endVisit(PropertyNameAndValueList *) {}
+
+    virtual bool visit(NestedExpression *) { return true; }
+    virtual void endVisit(NestedExpression *) {}
+
+    virtual bool visit(IdentifierPropertyName *) { return true; }
+    virtual void endVisit(IdentifierPropertyName *) {}
+
+    virtual bool visit(StringLiteralPropertyName *) { return true; }
+    virtual void endVisit(StringLiteralPropertyName *) {}
+
+    virtual bool visit(NumericLiteralPropertyName *) { return true; }
+    virtual void endVisit(NumericLiteralPropertyName *) {}
+
+    virtual bool visit(ArrayMemberExpression *) { return true; }
+    virtual void endVisit(ArrayMemberExpression *) {}
+
+    virtual bool visit(FieldMemberExpression *) { return true; }
+    virtual void endVisit(FieldMemberExpression *) {}
+
+    virtual bool visit(NewMemberExpression *) { return true; }
+    virtual void endVisit(NewMemberExpression *) {}
+
+    virtual bool visit(NewExpression *) { return true; }
+    virtual void endVisit(NewExpression *) {}
+
+    virtual bool visit(CallExpression *) { return true; }
+    virtual void endVisit(CallExpression *) {}
+
+    virtual bool visit(ArgumentList *) { return true; }
+    virtual void endVisit(ArgumentList *) {}
+
+    virtual bool visit(PostIncrementExpression *) { return true; }
+    virtual void endVisit(PostIncrementExpression *) {}
+
+    virtual bool visit(PostDecrementExpression *) { return true; }
+    virtual void endVisit(PostDecrementExpression *) {}
+
+    virtual bool visit(DeleteExpression *) { return true; }
+    virtual void endVisit(DeleteExpression *) {}
+
+    virtual bool visit(VoidExpression *) { return true; }
+    virtual void endVisit(VoidExpression *) {}
+
+    virtual bool visit(TypeOfExpression *) { return true; }
+    virtual void endVisit(TypeOfExpression *) {}
+
+    virtual bool visit(PreIncrementExpression *) { return true; }
+    virtual void endVisit(PreIncrementExpression *) {}
+
+    virtual bool visit(PreDecrementExpression *) { return true; }
+    virtual void endVisit(PreDecrementExpression *) {}
+
+    virtual bool visit(UnaryPlusExpression *) { return true; }
+    virtual void endVisit(UnaryPlusExpression *) {}
+
+    virtual bool visit(UnaryMinusExpression *) { return true; }
+    virtual void endVisit(UnaryMinusExpression *) {}
+
+    virtual bool visit(TildeExpression *) { return true; }
+    virtual void endVisit(TildeExpression *) {}
+
+    virtual bool visit(NotExpression *) { return true; }
+    virtual void endVisit(NotExpression *) {}
+
+    virtual bool visit(BinaryExpression *) { return true; }
+    virtual void endVisit(BinaryExpression *) {}
+
+    virtual bool visit(ConditionalExpression *) { return true; }
+    virtual void endVisit(ConditionalExpression *) {}
+
+    virtual bool visit(Expression *) { return true; }
+    virtual void endVisit(Expression *) {}
+
+    virtual bool visit(Block *) { return true; }
+    virtual void endVisit(Block *) {}
+
+    virtual bool visit(StatementList *) { return true; }
+    virtual void endVisit(StatementList *) {}
+
+    virtual bool visit(VariableStatement *) { return true; }
+    virtual void endVisit(VariableStatement *) {}
+
+    virtual bool visit(VariableDeclarationList *) { return true; }
+    virtual void endVisit(VariableDeclarationList *) {}
+
+    virtual bool visit(VariableDeclaration *) { return true; }
+    virtual void endVisit(VariableDeclaration *) {}
+
+    virtual bool visit(EmptyStatement *) { return true; }
+    virtual void endVisit(EmptyStatement *) {}
+
+    virtual bool visit(ExpressionStatement *) { return true; }
+    virtual void endVisit(ExpressionStatement *) {}
+
+    virtual bool visit(IfStatement *) { return true; }
+    virtual void endVisit(IfStatement *) {}
+
+    virtual bool visit(DoWhileStatement *) { return true; }
+    virtual void endVisit(DoWhileStatement *) {}
+
+    virtual bool visit(WhileStatement *) { return true; }
+    virtual void endVisit(WhileStatement *) {}
+
+    virtual bool visit(ForStatement *) { return true; }
+    virtual void endVisit(ForStatement *) {}
+
+    virtual bool visit(LocalForStatement *) { return true; }
+    virtual void endVisit(LocalForStatement *) {}
+
+    virtual bool visit(ForEachStatement *) { return true; }
+    virtual void endVisit(ForEachStatement *) {}
+
+    virtual bool visit(LocalForEachStatement *) { return true; }
+    virtual void endVisit(LocalForEachStatement *) {}
+
+    virtual bool visit(ContinueStatement *) { return true; }
+    virtual void endVisit(ContinueStatement *) {}
+
+    virtual bool visit(BreakStatement *) { return true; }
+    virtual void endVisit(BreakStatement *) {}
+
+    virtual bool visit(ReturnStatement *) { return true; }
+    virtual void endVisit(ReturnStatement *) {}
+
+    virtual bool visit(WithStatement *) { return true; }
+    virtual void endVisit(WithStatement *) {}
+
+    virtual bool visit(SwitchStatement *) { return true; }
+    virtual void endVisit(SwitchStatement *) {}
+
+    virtual bool visit(CaseBlock *) { return true; }
+    virtual void endVisit(CaseBlock *) {}
+
+    virtual bool visit(CaseClauses *) { return true; }
+    virtual void endVisit(CaseClauses *) {}
+
+    virtual bool visit(CaseClause *) { return true; }
+    virtual void endVisit(CaseClause *) {}
+
+    virtual bool visit(DefaultClause *) { return true; }
+    virtual void endVisit(DefaultClause *) {}
+
+    virtual bool visit(LabelledStatement *) { return true; }
+    virtual void endVisit(LabelledStatement *) {}
+
+    virtual bool visit(ThrowStatement *) { return true; }
+    virtual void endVisit(ThrowStatement *) {}
+
+    virtual bool visit(TryStatement *) { return true; }
+    virtual void endVisit(TryStatement *) {}
+
+    virtual bool visit(Catch *) { return true; }
+    virtual void endVisit(Catch *) {}
+
+    virtual bool visit(Finally *) { return true; }
+    virtual void endVisit(Finally *) {}
+
+    virtual bool visit(FunctionDeclaration *) { return true; }
+    virtual void endVisit(FunctionDeclaration *) {}
+
+    virtual bool visit(FunctionExpression *) { return true; }
+    virtual void endVisit(FunctionExpression *) {}
+
+    virtual bool visit(FormalParameterList *) { return true; }
+    virtual void endVisit(FormalParameterList *) {}
+
+    virtual bool visit(FunctionBody *) { return true; }
+    virtual void endVisit(FunctionBody *) {}
+
+    virtual bool visit(Program *) { return true; }
+    virtual void endVisit(Program *) {}
+
+    virtual bool visit(SourceElements *) { return true; }
+    virtual void endVisit(SourceElements *) {}
+
+    virtual bool visit(FunctionSourceElement *) { return true; }
+    virtual void endVisit(FunctionSourceElement *) {}
+
+    virtual bool visit(StatementSourceElement *) { return true; }
+    virtual void endVisit(StatementSourceElement *) {}
+
+    virtual bool visit(DebuggerStatement *) { return true; }
+    virtual void endVisit(DebuggerStatement *) {}
+};
+
+} } // namespace AST
+
+QT_QML_END_NAMESPACE
+
+#endif // QDECLARATIVEJSASTVISITOR_P_H
diff --git a/src/declarative/qml/parser/qdeclarativejsengine_p.cpp b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp
new file mode 100644
index 0000000..7d39134
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp
@@ -0,0 +1,212 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativejsengine_p.h"
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsnodepool_p.h"
+
+#include <qnumeric.h>
+#include <QHash>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+uint qHash(const QDeclarativeJS::NameId &id)
+{ return qHash(id.asString()); }
+
+QString numberToString(double value)
+{ return QString::number(value); }
+
+int Ecma::RegExp::flagFromChar(const QChar &ch)
+{
+    static QHash<QChar, int> flagsHash;
+    if (flagsHash.isEmpty()) {
+        flagsHash[QLatin1Char('g')] = Global;
+        flagsHash[QLatin1Char('i')] = IgnoreCase;
+        flagsHash[QLatin1Char('m')] = Multiline;
+    }
+    QHash<QChar, int>::const_iterator it;
+    it = flagsHash.constFind(ch);
+    if (it == flagsHash.constEnd())
+        return 0;
+    return it.value();
+}
+
+QString Ecma::RegExp::flagsToString(int flags)
+{
+    QString result;
+    if (flags & Global)
+        result += QLatin1Char('g');
+    if (flags & IgnoreCase)
+        result += QLatin1Char('i');
+    if (flags & Multiline)
+        result += QLatin1Char('m');
+    return result;
+}
+
+NodePool::NodePool(const QString &fileName, Engine *engine)
+    : m_fileName(fileName), m_engine(engine)
+{
+    m_engine->setNodePool(this);
+}
+
+NodePool::~NodePool()
+{
+}
+
+Code *NodePool::createCompiledCode(AST::Node *, CompilationUnit &)
+{
+    Q_ASSERT(0);
+    return 0;
+}
+
+static int toDigit(char c)
+{
+    if ((c >= '0') && (c <= '9'))
+        return c - '0';
+    else if ((c >= 'a') && (c <= 'z'))
+        return 10 + c - 'a';
+    else if ((c >= 'A') && (c <= 'Z'))
+        return 10 + c - 'A';
+    return -1;
+}
+
+double integerFromString(const char *buf, int size, int radix)
+{
+    if (size == 0)
+        return qSNaN();
+
+    double sign = 1.0;
+    int i = 0;
+    if (buf[0] == '+') {
+        ++i;
+    } else if (buf[0] == '-') {
+        sign = -1.0;
+        ++i;
+    }
+
+    if (((size-i) >= 2) && (buf[i] == '0')) {
+        if (((buf[i+1] == 'x') || (buf[i+1] == 'X'))
+            && (radix < 34)) {
+            if ((radix != 0) && (radix != 16))
+                return 0;
+            radix = 16;
+            i += 2;
+        } else {
+            if (radix == 0) {
+                radix = 8;
+                ++i;
+            }
+        }
+    } else if (radix == 0) {
+        radix = 10;
+    }
+
+    int j = i;
+    for ( ; i < size; ++i) {
+        int d = toDigit(buf[i]);
+        if ((d == -1) || (d >= radix))
+            break;
+    }
+    double result;
+    if (j == i) {
+        if (!qstrcmp(buf, "Infinity"))
+            result = qInf();
+        else
+            result = qSNaN();
+    } else {
+        result = 0;
+        double multiplier = 1;
+        for (--i ; i >= j; --i, multiplier *= radix)
+            result += toDigit(buf[i]) * multiplier;
+    }
+    result *= sign;
+    return result;
+}
+
+double integerFromString(const QString &str, int radix)
+{
+    QByteArray ba = str.trimmed().toLatin1();
+    return integerFromString(ba.constData(), ba.size(), radix);
+}
+
+
+Engine::Engine()
+    : _lexer(0), _nodePool(0)
+{ }
+
+Engine::~Engine()
+{ }
+
+QSet<NameId> Engine::literals() const
+{ return _literals; }
+
+void Engine::addComment(int pos, int len, int line, int col)
+{ if (len > 0) _comments.append(QDeclarativeJS::AST::SourceLocation(pos, len, line, col)); }
+
+QList<QDeclarativeJS::AST::SourceLocation> Engine::comments() const
+{ return _comments; }
+
+NameId *Engine::intern(const QChar *u, int s)
+{ return const_cast<NameId *>(&*_literals.insert(NameId(u, s))); }
+
+QString Engine::toString(NameId *id)
+{ return id->asString(); }
+
+Lexer *Engine::lexer() const
+{ return _lexer; }
+
+void Engine::setLexer(Lexer *lexer)
+{ _lexer = lexer; }
+
+NodePool *Engine::nodePool() const
+{ return _nodePool; }
+
+void Engine::setNodePool(NodePool *nodePool)
+{ _nodePool = nodePool; }
+
+
+
+} // end of namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
diff --git a/src/declarative/qml/parser/qdeclarativejsengine_p.h b/src/declarative/qml/parser/qdeclarativejsengine_p.h
new file mode 100644
index 0000000..61188f7
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsengine_p.h
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSENGINE_P_H
+#define QDECLARATIVEJSENGINE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsastfwd_p.h"
+
+#include <QString>
+#include <QSet>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+class QML_PARSER_EXPORT NameId
+{
+    QString _text;
+
+public:
+    NameId(const QChar *u, int s)
+        : _text(u, s)
+    { }
+
+    const QString asString() const
+    { return _text; }
+
+    bool operator == (const NameId &other) const
+    { return _text == other._text; }
+
+    bool operator != (const NameId &other) const
+    { return _text != other._text; }
+
+    bool operator < (const NameId &other) const
+    { return _text < other._text; }
+};
+
+uint qHash(const QDeclarativeJS::NameId &id);
+
+} // end of namespace QDeclarativeJS
+
+#if defined(Q_CC_MSVC) && _MSC_VER <= 1300
+//this ensures that code outside QDeclarativeJS can use the hash function
+//it also a workaround for some compilers
+inline uint qHash(const QDeclarativeJS::NameId &nameId) { return QDeclarativeJS::qHash(nameId); }
+#endif
+
+namespace QDeclarativeJS {
+
+class Lexer;
+class NodePool;
+
+namespace Ecma {
+
+class QML_PARSER_EXPORT RegExp
+{
+public:
+    enum RegExpFlag {
+        Global     = 0x01,
+        IgnoreCase = 0x02,
+        Multiline  = 0x04
+    };
+
+public:
+    static int flagFromChar(const QChar &);
+    static QString flagsToString(int flags);
+};
+
+} // end of namespace Ecma
+
+class QML_PARSER_EXPORT DiagnosticMessage
+{
+public:
+    enum Kind { Warning, Error };
+
+    DiagnosticMessage()
+        : kind(Error) {}
+
+    DiagnosticMessage(Kind kind, const AST::SourceLocation &loc, const QString &message)
+        : kind(kind), loc(loc), message(message) {}
+
+    bool isWarning() const
+    { return kind == Warning; }
+
+    bool isError() const
+    { return kind == Error; }
+
+    Kind kind;
+    AST::SourceLocation loc;
+    QString message;
+};
+
+class QML_PARSER_EXPORT Engine
+{
+    Lexer *_lexer;
+    NodePool *_nodePool;
+    QSet<NameId> _literals;
+    QList<QDeclarativeJS::AST::SourceLocation> _comments;
+
+public:
+    Engine();
+    ~Engine();
+
+    QSet<NameId> literals() const;
+
+    void addComment(int pos, int len, int line, int col);
+    QList<QDeclarativeJS::AST::SourceLocation> comments() const;
+
+    NameId *intern(const QChar *u, int s);
+
+    static QString toString(NameId *id);
+
+    Lexer *lexer() const;
+    void setLexer(Lexer *lexer);
+
+    NodePool *nodePool() const;
+    void setNodePool(NodePool *nodePool);
+};
+
+} // end of namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
+
+#endif // QDECLARATIVEJSENGINE_P_H
diff --git a/src/declarative/qml/parser/qdeclarativejsglobal_p.h b/src/declarative/qml/parser/qdeclarativejsglobal_p.h
new file mode 100644
index 0000000..7c901ae
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsglobal_p.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QDECLARATIVEJSGLOBAL_P_H
+#define QDECLARATIVEJSGLOBAL_P_H
+
+#include <QtCore/qglobal.h>
+
+#ifdef QT_CREATOR
+#  define QT_QML_BEGIN_NAMESPACE
+#  define QT_QML_END_NAMESPACE
+
+#  ifdef QDECLARATIVEJS_BUILD_DIR
+#    define QML_PARSER_EXPORT Q_DECL_EXPORT
+#  elif QML_BUILD_STATIC_LIB
+#    define QML_PARSER_EXPORT
+#  else
+#    define QML_PARSER_EXPORT Q_DECL_IMPORT
+#  endif // QDECLARATIVEJS_BUILD_DIR
+
+#else // !QT_CREATOR
+#  define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
+#  define QT_QML_END_NAMESPACE QT_END_NAMESPACE
+#  define QML_PARSER_EXPORT
+#endif // QT_CREATOR
+
+#endif // QDECLARATIVEJSGLOBAL_P_H
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
new file mode 100644
index 0000000..aadb432
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
@@ -0,0 +1,939 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// This file was generated by qlalr - DO NOT EDIT!
+#include "qdeclarativejsgrammar_p.h"
+
+QT_BEGIN_NAMESPACE
+
+const char *const QDeclarativeJSGrammar::spell [] = {
+  "end of file", "&", "&&", "&=", "break", "case", "catch", ":", ";", "continue", 
+  "default", "delete", "/", "/=", "do", ".", "else", "=", "==", "===", 
+  "finally", "for", "function", ">=", ">", ">>", ">>=", ">>>", ">>>=", "identifier", 
+  "if", "in", "instanceof", "{", "[", "<=", "(", "<", "<<", "<<=", 
+  "-", "-=", "--", "new", "!", "!=", "!==", "numeric literal", "|", "|=", 
+  "||", "+", "+=", "++", "?", "}", "]", "%", "%=", "return", 
+  ")", ";", 0, "*", "*=", "string literal", "property", "signal", "readonly", "switch", 
+  "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", 
+  "^=", "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "comment", "public", 
+  "import", "as", 0, 0, 0, 0, 0, 0, 0, 0};
+
+const short QDeclarativeJSGrammar::lhs [] = {
+  100, 100, 100, 100, 100, 100, 101, 107, 107, 110, 
+  110, 112, 111, 111, 111, 111, 111, 111, 111, 111, 
+  114, 109, 108, 117, 117, 118, 118, 119, 119, 116, 
+  105, 105, 105, 105, 105, 105, 105, 125, 125, 125, 
+  126, 126, 127, 127, 105, 105, 105, 105, 105, 105, 
+  105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
+  105, 105, 115, 115, 115, 115, 130, 130, 130, 130, 
+  130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+  130, 130, 130, 130, 120, 132, 132, 132, 132, 131, 
+  131, 134, 134, 136, 136, 136, 136, 136, 136, 137, 
+  137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 
+  137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 
+  137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 
+  138, 138, 113, 113, 113, 113, 113, 141, 141, 142, 
+  142, 142, 142, 140, 140, 143, 143, 144, 144, 145, 
+  145, 145, 146, 146, 146, 146, 146, 146, 146, 146, 
+  146, 146, 147, 147, 147, 147, 148, 148, 148, 149, 
+  149, 149, 149, 150, 150, 150, 150, 150, 150, 150, 
+  151, 151, 151, 151, 151, 151, 152, 152, 152, 152, 
+  152, 153, 153, 153, 153, 153, 154, 154, 155, 155, 
+  156, 156, 157, 157, 158, 158, 159, 159, 160, 160, 
+  161, 161, 162, 162, 163, 163, 164, 164, 165, 165, 
+  135, 135, 166, 166, 167, 167, 167, 167, 167, 167, 
+  167, 167, 167, 167, 167, 167, 103, 103, 168, 168, 
+  169, 169, 170, 170, 102, 102, 102, 102, 102, 102, 
+  102, 102, 102, 102, 102, 102, 102, 102, 102, 121, 
+  182, 182, 181, 181, 129, 129, 183, 183, 184, 184, 
+  186, 186, 185, 187, 190, 188, 188, 191, 189, 189, 
+  122, 123, 123, 124, 124, 171, 171, 171, 171, 171, 
+  171, 171, 172, 172, 172, 172, 173, 173, 173, 173, 
+  174, 174, 175, 177, 192, 192, 195, 195, 193, 193, 
+  196, 194, 176, 176, 176, 178, 178, 179, 179, 179, 
+  197, 198, 180, 180, 128, 139, 202, 202, 199, 199, 
+  200, 200, 203, 106, 204, 204, 104, 104, 201, 201, 
+  133, 133, 205};
+
+const short QDeclarativeJSGrammar::rhs [] = {
+  2, 2, 2, 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, 7, 7, 
+  4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 2, 3, 3, 4, 
+  5, 3, 4, 3, 1, 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, 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, 1, 2, 1, 1, 0, 1, 
+  0, 1, 2};
+
+const short QDeclarativeJSGrammar::action_default [] = {
+  0, 0, 0, 0, 0, 0, 22, 0, 170, 237, 
+  201, 209, 205, 149, 221, 197, 3, 134, 68, 150, 
+  213, 217, 138, 167, 148, 153, 133, 187, 174, 0, 
+  75, 76, 71, 339, 63, 341, 0, 0, 0, 0, 
+  73, 0, 0, 69, 72, 0, 0, 64, 66, 65, 
+  74, 67, 0, 70, 0, 0, 163, 0, 0, 150, 
+  169, 152, 151, 0, 0, 0, 165, 166, 164, 168, 
+  0, 198, 0, 0, 0, 0, 188, 0, 0, 0, 
+  0, 0, 0, 178, 0, 0, 0, 172, 173, 171, 
+  176, 180, 179, 177, 175, 190, 189, 191, 0, 206, 
+  0, 202, 0, 0, 144, 131, 143, 132, 100, 101, 
+  102, 127, 103, 128, 104, 105, 106, 107, 108, 109, 
+  110, 111, 112, 113, 114, 115, 116, 129, 117, 118, 
+  119, 120, 121, 122, 123, 124, 125, 126, 130, 0, 
+  0, 142, 238, 145, 0, 146, 0, 147, 141, 0, 
+  234, 227, 225, 232, 233, 231, 230, 236, 229, 228, 
+  226, 235, 222, 0, 210, 0, 0, 214, 0, 0, 
+  218, 0, 0, 144, 136, 0, 135, 0, 140, 154, 
+  0, 340, 329, 330, 0, 327, 0, 328, 0, 331, 
+  245, 252, 251, 259, 247, 0, 248, 332, 0, 338, 
+  249, 250, 255, 253, 335, 333, 337, 256, 0, 267, 
+  0, 0, 0, 0, 339, 63, 0, 341, 64, 239, 
+  281, 65, 0, 0, 0, 268, 0, 0, 257, 258, 
+  0, 246, 254, 282, 283, 326, 336, 0, 297, 298, 
+  299, 300, 0, 293, 294, 295, 296, 323, 324, 0, 
+  0, 0, 0, 0, 286, 287, 243, 241, 203, 211, 
+  207, 223, 199, 244, 0, 150, 215, 219, 192, 181, 
+  0, 0, 200, 0, 0, 0, 0, 193, 0, 0, 
+  0, 0, 0, 185, 183, 186, 184, 182, 195, 194, 
+  196, 0, 208, 0, 204, 0, 242, 150, 0, 224, 
+  239, 240, 0, 239, 0, 0, 289, 0, 0, 0, 
+  291, 0, 212, 0, 0, 216, 0, 0, 220, 279, 
+  0, 271, 280, 274, 0, 278, 0, 239, 272, 0, 
+  239, 0, 0, 290, 0, 0, 0, 292, 340, 329, 
+  0, 0, 331, 0, 325, 0, 315, 0, 0, 0, 
+  285, 0, 284, 0, 342, 0, 99, 261, 264, 0, 
+  100, 267, 103, 128, 105, 106, 71, 110, 111, 63, 
+  112, 115, 69, 72, 64, 239, 65, 74, 118, 67, 
+  120, 70, 122, 123, 268, 125, 126, 130, 0, 92, 
+  0, 0, 94, 98, 96, 83, 95, 97, 0, 93, 
+  82, 262, 260, 138, 139, 144, 0, 137, 0, 314, 
+  0, 301, 302, 0, 313, 0, 0, 0, 304, 309, 
+  307, 310, 0, 0, 308, 309, 0, 305, 0, 306, 
+  263, 312, 0, 263, 311, 0, 316, 317, 0, 263, 
+  318, 319, 0, 0, 320, 0, 0, 0, 321, 322, 
+  156, 155, 0, 0, 0, 288, 0, 0, 0, 303, 
+  276, 269, 0, 277, 273, 0, 275, 265, 0, 266, 
+  270, 86, 0, 0, 90, 77, 0, 79, 88, 0, 
+  80, 89, 91, 81, 87, 78, 0, 84, 160, 158, 
+  162, 159, 157, 161, 6, 334, 4, 2, 61, 85, 
+  0, 0, 64, 66, 65, 31, 5, 0, 62, 0, 
+  40, 39, 38, 0, 0, 53, 0, 54, 0, 59, 
+  60, 0, 40, 0, 0, 0, 0, 0, 49, 50, 
+  0, 51, 0, 52, 0, 55, 56, 0, 0, 0, 
+  0, 0, 57, 58, 0, 47, 41, 48, 42, 0, 
+  0, 0, 0, 44, 0, 45, 46, 43, 0, 0, 
+  30, 34, 35, 36, 37, 138, 263, 0, 0, 100, 
+  267, 103, 128, 105, 106, 71, 110, 111, 63, 112, 
+  115, 69, 72, 64, 239, 65, 74, 118, 67, 120, 
+  70, 122, 123, 268, 125, 126, 130, 138, 0, 26, 
+  0, 0, 32, 27, 33, 28, 24, 0, 29, 25, 
+  8, 0, 10, 0, 9, 0, 1, 21, 12, 0, 
+  13, 0, 14, 0, 19, 20, 0, 15, 16, 0, 
+  17, 18, 11, 23, 7, 343};
+
+const short QDeclarativeJSGrammar::goto_default [] = {
+  7, 616, 206, 195, 204, 506, 494, 615, 634, 610, 
+  614, 612, 617, 22, 613, 18, 505, 607, 598, 560, 
+  507, 190, 194, 196, 200, 523, 549, 548, 199, 231, 
+  26, 473, 472, 355, 354, 9, 353, 356, 106, 17, 
+  144, 24, 13, 143, 19, 25, 56, 23, 8, 28, 
+  27, 268, 15, 262, 10, 258, 12, 260, 11, 259, 
+  20, 266, 21, 267, 14, 261, 257, 298, 410, 263, 
+  264, 201, 192, 191, 203, 232, 202, 207, 228, 229, 
+  193, 359, 358, 230, 462, 461, 320, 321, 464, 323, 
+  463, 322, 418, 422, 425, 421, 420, 440, 441, 184, 
+  198, 180, 183, 197, 205, 0};
+
+const short QDeclarativeJSGrammar::action_index [] = {
+  439, 1109, 2228, 2228, 2132, 814, -74, 18, 147, -100, 
+  31, -17, -49, 232, -100, 318, 85, -100, -100, 554, 
+  33, 94, 331, 215, -100, -100, -100, 448, 231, 1109, 
+  -100, -100, -100, 320, -100, 1940, 1472, 1109, 1109, 1109, 
+  -100, 724, 1109, -100, -100, 1109, 1109, -100, -100, -100, 
+  -100, -100, 1109, -100, 1109, 1109, -100, 1109, 1109, 129, 
+  157, -100, -100, 1109, 1109, 1109, -100, -100, -100, 200, 
+  1109, 293, 1109, 1109, 1109, 1109, 466, 1109, 1109, 1109, 
+  1109, 1109, 1109, 179, 1109, 1109, 1109, 119, 125, 95, 
+  188, 198, 184, 203, 178, 567, 567, 484, 1109, -5, 
+  1109, 67, 1844, 1109, 1109, -100, -100, -100, -100, -100, 
+  -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, 
+  -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, 
+  -100, -100, -100, -100, -100, -100, -100, -100, -100, 110, 
+  1109, -100, -100, 70, 61, -100, 1109, -100, -100, 1109, 
+  -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, 
+  -100, -100, -100, 1109, 55, 1109, 1109, 73, 63, 1109, 
+  -100, 1844, 1109, 1109, -100, 141, -100, 41, -100, -100, 
+  87, -100, 255, 80, 78, -100, 287, -100, 83, 2228, 
+  -100, -100, -100, -100, -100, 225, -100, -100, 52, -100, 
+  -100, -100, -100, -100, -100, 2228, -100, -100, 420, -100, 
+  408, 113, 2132, 50, 330, 65, 46, 2420, 72, 1109, 
+  -100, 74, 75, 1109, 77, -100, 53, 56, -100, -100, 
+  323, -100, -100, -100, -100, -100, -100, 96, -100, -100, 
+  -100, -100, 99, -100, -100, -100, -100, -100, -100, 60, 
+  47, 1109, 118, 93, -100, -100, 1291, -100, 79, 66, 
+  64, -100, 413, 76, 51, 664, 89, 97, 393, 183, 
+  337, 1109, 413, 1109, 1109, 1109, 1109, 411, 1109, 1109, 
+  1109, 1109, 1109, 252, 272, 212, 217, 221, 490, 490, 
+  383, 1109, 64, 1109, 84, 1109, -100, 536, 1109, -100, 
+  1109, 69, 68, 1109, 44, 2132, -100, 1109, 124, 2132, 
+  -100, 1109, 54, 1109, 1109, 71, 88, 1109, -100, 82, 
+  122, 154, -100, -100, 1109, -100, 343, 1109, -100, 81, 
+  1109, 90, 2132, -100, 1109, 112, 2132, -100, 86, 333, 
+  -39, -10, 2228, -33, -100, 2132, -100, 1109, 246, 2132, 
+  4, 2132, -100, 10, 16, -21, -100, -100, 2132, -26, 
+  480, 19, 462, 128, 1109, 2132, 6, -9, 400, 8, 
+  -22, 840, -3, -6, -100, 1202, -100, -7, -28, 5, 
+  1109, 2, -23, 1109, 0, 1109, -34, -30, 1109, -100, 
+  2036, 21, -100, -100, -100, -100, -100, -100, 1109, -100, 
+  -100, -100, -100, 209, -100, 1109, 40, -100, 2132, -100, 
+  101, -100, -100, 2132, -100, 1109, 120, 43, -100, 62, 
+  -100, 59, 109, 1109, -100, 57, 58, -100, 39, -100, 
+  2132, -100, 117, 2132, -100, 199, -100, -100, 107, 2132, 
+  34, -100, 24, 11, -100, 346, -19, 14, -100, -100, 
+  -100, -100, 1109, 133, 2132, -100, 1109, 126, 2132, -100, 
+  20, -100, 173, -100, -100, 1109, -100, -100, 303, -100, 
+  -100, -100, 100, 1656, -100, -100, 1564, -100, -100, 1748, 
+  -100, -100, -100, -100, -100, -100, 131, -100, -100, -100, 
+  -100, -100, -100, -100, -100, 2228, -100, -100, -100, 158, 
+  -20, 752, 165, -16, 22, -100, -100, 98, -100, 189, 
+  -100, -100, -100, 28, 170, -100, 1109, -100, 230, -100, 
+  -100, 247, 1, 13, 238, 37, -24, 106, -100, -100, 
+  273, -100, 1109, -100, 265, -100, -100, 242, -4, 12, 
+  1109, 241, -100, -100, 234, -100, 245, -100, 3, 9, 
+  311, 190, 316, -100, 134, -100, -100, -100, 1380, 1020, 
+  -100, -100, -100, -100, -100, 359, 2324, 1472, 15, 444, 
+  38, 394, 138, 1109, 2132, 36, 17, 397, 42, 23, 
+  840, 32, 29, -100, 1202, -100, 26, 35, 48, 1109, 
+  45, 25, 1109, 49, 1109, 27, 30, 314, 132, -100, 
+  7, 752, -100, -100, -100, -100, -100, 930, -100, -100, 
+  -100, 752, -100, 253, -87, 617, -100, -100, 102, 290, 
+  -100, 191, -100, 140, -100, -100, 275, -100, -100, 91, 
+  -100, -100, -100, -100, -100, -100, 
+
+  -106, 12, -87, 18, 17, 212, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -53, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, 162, 
+  -106, -106, -106, -4, -106, -106, -11, 24, 75, 76, 
+  -106, 83, 55, -106, -106, 157, 158, -106, -106, -106, 
+  -106, -106, 150, -106, 172, 176, -106, 168, 167, -106, 
+  -106, -106, -106, 173, 154, 115, -106, -106, -106, -106, 
+  147, -106, 121, 113, 112, 125, -106, 128, 143, 146, 
+  140, 139, 136, -106, 122, 138, 130, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, 149, -106, 
+  153, -106, 110, 82, 46, -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, 
+  35, -106, -106, -106, -106, -106, 37, -106, -106, 45, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, 92, -106, 88, 58, -106, -106, 51, 
+  -106, 209, 72, 78, -106, -106, -106, -106, -106, -106, 
+  -106, -106, 27, -106, -106, -106, 63, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, 50, -106, -106, 28, -106, 
+  29, -106, 47, -106, 33, -106, -106, 66, -106, 73, 
+  -106, -106, -106, 81, 53, -106, -106, -106, -106, -106, 
+  -13, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, 9, -106, -106, -106, -106, 111, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  3, 186, -106, 220, 228, 234, 204, -106, 90, 91, 
+  94, 97, 93, -106, -106, -106, -106, -106, -106, -106, 
+  -106, 210, -106, 187, -106, 214, -106, -106, 208, -106, 
+  207, -106, -106, 155, -106, 8, -106, 4, -106, -1, 
+  -106, 217, -106, 177, 185, -106, -106, 184, -106, -106, 
+  -106, -106, -106, -106, 183, -106, 194, 105, -106, -106, 
+  99, -106, 71, -106, 74, -106, 65, -106, -106, 114, 
+  -106, -106, -55, -106, -106, 64, -106, 44, -106, 30, 
+  -106, 31, -106, -106, -106, -106, -106, -106, 57, -106, 
+  36, -106, 40, -106, 70, 59, -106, -106, 42, -106, 
+  -106, 104, -106, -106, -106, 38, -106, -106, -106, -106, 
+  79, -106, 69, 108, -106, 84, -106, -106, 56, -106, 
+  68, -106, -106, -106, -106, -106, -106, -106, 52, -106, 
+  -106, -106, -106, -106, -106, 109, -106, -106, 77, -106, 
+  -106, -106, -106, 86, -106, 80, -106, -106, -106, -106, 
+  -106, -59, -106, 43, -106, -63, -106, -106, -106, -106, 
+  98, -106, -106, 95, -106, -106, -106, -106, -106, 60, 
+  -34, -106, -106, 32, -106, 41, -106, 39, -106, -106, 
+  -106, -106, 49, -106, 61, -106, 62, -106, 48, -106, 
+  -106, -106, -106, -106, -106, 23, -106, -106, 96, -106, 
+  -106, -106, -106, 34, -106, -106, 133, -106, -106, 54, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, 67, -106, -106, -106, -106, 
+  -106, 22, -106, -106, -106, -106, -106, -106, -106, -22, 
+  -106, -106, -106, -106, -106, -106, 2, -106, -106, -106, 
+  -106, -106, -106, -106, -19, -106, -106, -106, -106, -106, 
+  -106, -106, 100, -106, -106, -106, -106, -21, -106, -106, 
+  -3, -106, -106, -106, -106, -106, 13, -106, -106, -106, 
+  11, 14, 10, -106, -106, -106, -106, -106, 279, 283, 
+  -106, -106, -106, -106, -106, -106, 19, 273, 15, 16, 
+  -106, 21, -106, 224, 6, -106, -106, 25, -106, -106, 
+  85, -106, -106, -106, 26, -106, -106, -106, -106, 20, 
+  -106, 7, 87, -106, 107, -106, -106, -106, -106, -106, 
+  -106, 317, -106, -106, -106, -106, -106, 277, -106, -106, 
+  -106, 0, -106, -106, -2, 271, -106, -106, -106, 1, 
+  -106, -106, -106, -106, -106, -106, 5, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106};
+
+const short QDeclarativeJSGrammar::action_info [] = {
+  -97, -98, 452, 611, -116, 527, 456, -124, 415, -121, 
+  439, 551, -119, -108, 347, -94, 611, 388, 635, 540, 
+  351, 341, 344, 342, 390, 539, -127, 256, 398, 402, 
+  100, 98, 70, -97, 400, 163, -98, 465, 524, -116, 
+  559, 447, 530, -108, 439, -127, 509, 439, 559, -94, 
+  537, 544, -121, 256, 443, -119, -124, 514, 439, 347, 
+  445, 526, 423, 452, 423, 430, 456, 423, 70, 554, 
+  169, 415, 345, 311, 100, 163, 419, 140, 146, 408, 
+  271, 413, 347, 251, 295, 271, 256, 0, 186, 452, 
+  0, 311, 456, 140, 429, 317, 0, 0, 0, 324, 
+  407, 178, 291, 98, 305, 558, 0, 235, 476, 0, 
+  439, 415, 300, 442, 291, 0, 189, 171, 140, 426, 
+  140, 148, 339, 182, 433, 140, 140, 443, 140, 303, 
+  326, 559, 140, 0, 140, 57, 172, 250, 188, 140, 
+  601, 140, 330, 293, 165, 0, 58, 313, 166, 140, 
+  332, 314, 631, 630, 255, 254, 477, 241, 240, 57, 
+  246, 245, 412, 411, 427, 57, 141, 529, 528, 63, 
+  58, 61, 336, 171, 248, 247, 58, 516, 253, 0, 
+  417, 468, 62, 327, 309, 334, 458, 57, 602, 248, 
+  247, 487, 172, 454, 522, 556, 555, 176, 58, 248, 
+  247, 625, 624, 84, 84, 85, 85, 140, 84, 84, 
+  85, 85, 63, 84, 64, 85, 86, 86, 510, 510, 
+  65, 86, 86, 84, 171, 85, 86, 63, 84, 0, 
+  85, 517, 515, 140, 469, 467, 86, 84, 140, 85, 
+  512, 86, 84, 172, 85, 405, 84, 102, 85, 140, 
+  86, 511, 628, 627, 140, 86, 84, 64, 85, 86, 
+  437, 436, 171, 65, 512, 512, 103, 510, 104, 86, 
+  546, 510, 64, 140, 510, 511, 511, 84, 65, 85, 
+  532, 172, 626, 405, 34, 0, 234, 233, 0, 0, 
+  86, 520, 519, 0, 0, 547, 545, 84, 0, 85, 
+  621, 0, 543, 542, 34, 0, 349, 0, 0, 0, 
+  86, 72, 73, 512, 622, 620, 34, 512, 0, 34, 
+  512, 47, 49, 48, 511, 0, 536, 535, 511, 171, 
+  0, 511, 34, 0, 533, 531, 72, 73, 74, 75, 
+  34, 47, 49, 48, 619, 34, 171, -85, 172, 34, 
+  173, 0, 34, 47, 49, 48, 47, 49, 48, 34, 
+  0, 0, 34, 74, 75, 172, 34, 173, 0, 47, 
+  49, 48, 34, 0, 171, 34, 0, 47, 49, 48, 
+  0, 0, 47, 49, 48, 0, 47, 49, 48, 47, 
+  49, 48, -85, 172, 0, 173, 47, 49, 48, 47, 
+  49, 48, 0, 47, 49, 48, 278, 279, 0, 47, 
+  49, 48, 47, 49, 48, 280, 278, 279, 281, 0, 
+  282, 0, 0, 34, 0, 280, 34, 0, 281, 34, 
+  282, 273, 274, -339, 278, 279, -339, 34, 0, 0, 
+  0, 0, 0, 280, 0, 0, 281, 0, 282, 34, 
+  0, 0, 0, 0, 0, 244, 243, 0, 275, 276, 
+  47, 49, 48, 47, 49, 48, 47, 49, 48, 244, 
+  243, 77, 78, 34, 47, 49, 48, 0, 0, 79, 
+  80, 239, 238, 81, 0, 82, 47, 49, 48, 77, 
+  78, 34, 0, 0, 0, 0, 0, 79, 80, 0, 
+  0, 81, 0, 82, 0, 239, 238, 77, 78, 34, 
+  47, 49, 48, 278, 279, 79, 80, 0, 0, 81, 
+  0, 82, 280, 244, 243, 281, 0, 282, 47, 49, 
+  48, 6, 5, 4, 1, 3, 2, 0, 0, 150, 
+  0, 239, 238, 0, 0, 0, 47, 49, 48, 151, 
+  0, 0, 0, 152, 0, 0, 0, 150, 0, 0, 
+  0, 0, 153, 0, 154, 0, 0, 151, 0, 0, 
+  0, 152, 0, 0, 0, 155, 0, 156, 61, 0, 
+  153, 0, 154, 0, 0, 157, 0, 0, 158, 62, 
+  77, 78, 0, 155, 159, 156, 61, 0, 79, 80, 
+  160, 0, 81, 157, 82, 0, 158, 62, 0, 0, 
+  0, 0, 159, 0, 0, 0, 161, 0, 160, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 
+  31, 0, 0, 0, 161, 0, 0, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 0, 0, 0, 0, 0, 0, 
+  501, 0, 0, 0, 44, 0, 0, 150, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 151, 0, 0, 
+  0, 152, 50, 47, 49, 48, 0, 51, 0, 0, 
+  153, 0, 154, 0, 0, 307, 0, 0, 43, 53, 
+  32, 0, 0, 155, 40, 156, 61, 0, 0, 0, 
+  0, 0, 0, 157, 0, 0, 158, 62, 0, 0, 
+  0, 0, 159, 0, 0, 0, 0, 0, 160, 0, 
+  0, 0, 0, 0, 0, 0, 30, 31, 0, 0, 
+  0, 0, 0, 0, 161, 0, 33, 0, 0, 0, 
+  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
+  37, 0, 0, 0, 30, 31, 0, 41, 0, 0, 
+  0, 44, 0, 0, 33, 0, 0, 0, 0, 0, 
+  0, 34, 0, 0, 0, 35, 36, 0, 37, 50, 
+  47, 49, 48, 0, 51, 501, 0, 0, 0, 44, 
+  0, 0, 0, 0, 0, 43, 53, 32, 0, 0, 
+  0, 40, 0, 0, 0, 0, 0, 50, 47, 49, 
+  48, 0, 51, 0, 500, 0, 30, 31, 0, 0, 
+  0, 0, 0, 43, 53, 32, 214, 0, 0, 40, 
+  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
+  37, 0, 30, 31, 0, 0, 0, 501, 0, 0, 
+  0, 44, 33, 0, 0, 0, 0, 0, 0, 34, 
+  0, 0, 0, 35, 36, 0, 37, 0, 0, 50, 
+  502, 504, 503, 41, 51, 0, 0, 44, 0, 225, 
+  0, 0, 0, 0, 0, 43, 53, 32, 209, 0, 
+  0, 40, 0, 0, 0, 50, 47, 49, 48, 0, 
+  51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  500, 0, 30, 31, 0, 0, 0, 0, 0, 0, 
+  0, 0, 214, 0, 0, 0, 0, 0, 0, 34, 
+  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
+  0, 0, 0, 501, 0, 0, 0, 44, 0, 0, 
+  0, 0, 0, 0, 0, 608, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 50, 502, 504, 503, 0, 
+  51, 0, 0, 0, 0, 225, 0, 0, 0, 0, 
+  0, 43, 53, 32, 209, 0, 0, 40, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  500, 0, 30, 31, 0, 0, 0, 0, 0, 0, 
+  0, 0, 214, 0, 0, 0, 0, 0, 0, 34, 
+  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
+  0, 0, 0, 501, 0, 0, 0, 44, 0, 0, 
+  0, 0, 0, 0, 0, 605, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 50, 502, 504, 503, 0, 
+  51, 0, 0, 0, 0, 225, 0, 0, 0, 0, 
+  0, 43, 53, 32, 209, 0, 0, 40, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  29, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
+  0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
+  0, 0, 35, 36, 0, 37, 0, 0, 0, 38, 
+  0, 39, 41, 42, 0, 0, 44, 0, 0, 0, 
+  45, 0, 46, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 50, 47, 49, 48, 0, 51, 
+  0, 52, 0, 54, 0, 55, 0, 0, 0, 0, 
+  43, 53, 32, 0, 0, 0, 40, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, -117, 
+  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
+  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
+  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
+  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
+  0, 0, 0, 45, 0, 46, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 50, 47, 49, 
+  48, 0, 51, 0, 52, 0, 54, 0, 55, 0, 
+  0, 0, 0, 43, 53, 32, 0, 0, 0, 40, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
+  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
+  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
+  0, 0, 45, 0, 46, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 50, 47, 49, 48, 
+  0, 51, 0, 52, 0, 54, 270, 55, 0, 0, 
+  0, 0, 43, 53, 32, 0, 0, 0, 40, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
+  0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 
+  216, 0, 0, 566, 567, 0, 37, 0, 0, 0, 
+  38, 0, 39, 41, 42, 0, 0, 44, 0, 0, 
+  0, 45, 0, 46, 0, 0, 0, 0, 0, 0, 
+  0, 220, 0, 0, 0, 50, 47, 49, 48, 0, 
+  51, 0, 52, 0, 54, 0, 55, 0, 0, 0, 
+  0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  474, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
+  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
+  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
+  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
+  0, 0, 0, 45, 0, 46, 0, 0, 475, 0, 
+  0, 0, 0, 0, 0, 0, 0, 50, 47, 49, 
+  48, 0, 51, 0, 52, 0, 54, 0, 55, 0, 
+  0, 0, 0, 43, 53, 32, 0, 0, 0, 40, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 474, 0, 0, 29, 30, 31, 0, 0, 
+  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
+  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
+  37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
+  0, 44, 0, 0, 0, 45, 0, 46, 0, 0, 
+  480, 0, 0, 0, 0, 0, 0, 0, 0, 50, 
+  47, 49, 48, 0, 51, 0, 52, 0, 54, 0, 
+  55, 0, 0, 0, 0, 43, 53, 32, 0, 0, 
+  0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 482, 0, 0, 29, 30, 31, 
+  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
+  0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 
+  36, 0, 37, 0, 0, 0, 38, 0, 39, 41, 
+  42, 0, 0, 44, 0, 0, 0, 45, 0, 46, 
+  0, 0, 485, 0, 0, 0, 0, 0, 0, 0, 
+  0, 50, 47, 49, 48, 0, 51, 0, 52, 0, 
+  54, 0, 55, 0, 0, 0, 0, 43, 53, 32, 
+  0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 482, 0, 0, 29, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  33, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
+  0, 35, 36, 0, 37, 0, 0, 0, 38, 0, 
+  39, 41, 42, 0, 0, 44, 0, 0, 0, 45, 
+  0, 46, 0, 0, 483, 0, 0, 0, 0, 0, 
+  0, 0, 0, 50, 47, 49, 48, 0, 51, 0, 
+  52, 0, 54, 0, 55, 0, 0, 0, 0, 43, 
+  53, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 108, 109, 
+  110, 0, 0, 112, 114, 115, 0, 0, 116, 0, 
+  117, 0, 0, 0, 119, 120, 121, 0, 0, 0, 
+  0, 0, 0, 34, 122, 123, 124, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 125, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 
+  47, 49, 48, 129, 130, 131, 0, 133, 134, 135, 
+  136, 137, 138, 0, 0, 126, 132, 118, 111, 113, 
+  127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 108, 109, 110, 0, 0, 112, 
+  114, 115, 0, 0, 116, 0, 117, 0, 0, 0, 
+  119, 120, 121, 0, 0, 0, 0, 0, 0, 392, 
+  122, 123, 124, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 125, 0, 0, 0, 393, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 
+  0, 0, 0, 0, 0, 397, 394, 396, 0, 129, 
+  130, 131, 0, 133, 134, 135, 136, 137, 138, 0, 
+  0, 126, 132, 118, 111, 113, 127, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  108, 109, 110, 0, 0, 112, 114, 115, 0, 0, 
+  116, 0, 117, 0, 0, 0, 119, 120, 121, 0, 
+  0, 0, 0, 0, 0, 392, 122, 123, 124, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 125, 
+  0, 0, 0, 393, 0, 0, 0, 0, 0, 0, 
+  0, 395, 0, 0, 0, 128, 0, 0, 0, 0, 
+  0, 397, 394, 396, 0, 129, 130, 131, 0, 133, 
+  134, 135, 136, 137, 138, 0, 0, 126, 132, 118, 
+  111, 113, 127, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 208, 0, 0, 0, 
+  0, 210, 0, 29, 30, 31, 212, 0, 0, 0, 
+  0, 0, 0, 213, 33, 0, 0, 0, 0, 0, 
+  0, 215, 216, 0, 0, 217, 36, 0, 37, 0, 
+  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
+  0, 0, 0, 45, 0, 46, 0, 0, 0, 0, 
+  0, 219, 0, 220, 0, 0, 0, 50, 218, 221, 
+  48, 222, 51, 223, 52, 224, 54, 225, 55, 226, 
+  227, 0, 0, 43, 53, 32, 209, 211, 0, 40, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 208, 0, 0, 0, 0, 210, 0, 29, 
+  30, 31, 212, 0, 0, 0, 0, 0, 0, 213, 
+  214, 0, 0, 0, 0, 0, 0, 215, 216, 0, 
+  0, 217, 36, 0, 37, 0, 0, 0, 38, 0, 
+  39, 41, 42, 0, 0, 44, 0, 0, 0, 45, 
+  0, 46, 0, 0, 0, 0, 0, 219, 0, 220, 
+  0, 0, 0, 50, 218, 221, 48, 222, 51, 223, 
+  52, 224, 54, 225, 55, 226, 227, 0, 0, 43, 
+  53, 32, 209, 211, 0, 40, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 569, 109, 
+  110, 0, 0, 571, 114, 573, 30, 31, 574, 0, 
+  117, 0, 0, 0, 119, 576, 577, 0, 0, 0, 
+  0, 0, 0, 578, 579, 123, 124, 217, 36, 0, 
+  37, 0, 0, 0, 38, 0, 39, 580, 42, 0, 
+  0, 582, 0, 0, 0, 45, 0, 46, 0, 0, 
+  0, 0, 0, 584, 0, 220, 0, 0, 0, 586, 
+  583, 585, 48, 587, 588, 589, 52, 591, 592, 593, 
+  594, 595, 596, 0, 0, 581, 590, 575, 570, 572, 
+  127, 40, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 360, 109, 110, 0, 0, 362, 
+  114, 364, 30, 31, 365, 0, 117, 0, 0, 0, 
+  119, 367, 368, 0, 0, 0, 0, 0, 0, 369, 
+  370, 123, 124, 217, 36, 0, 37, 0, 0, 0, 
+  38, 0, 39, 371, 42, 0, 0, 373, 0, 0, 
+  0, 45, 0, 46, 0, -263, 0, 0, 0, 375, 
+  0, 220, 0, 0, 0, 377, 374, 376, 48, 378, 
+  379, 380, 52, 382, 383, 384, 385, 386, 387, 0, 
+  0, 372, 381, 366, 361, 363, 127, 40, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+
+  541, 310, 460, 513, 538, 518, 525, 308, 249, 632, 
+  306, 181, 252, 618, 149, 16, 623, 495, 319, 497, 
+  629, 357, 496, 435, 471, 553, 557, 486, 438, 301, 
+  428, 237, 350, 352, 604, 521, 242, 424, 550, 552, 
+  181, 301, 185, 237, 242, 343, 432, 348, 338, 249, 
+  459, 237, 453, 449, 236, 242, 446, 181, 466, 401, 
+  448, 249, 357, 455, 444, 457, 346, 337, 357, 484, 
+  142, 236, 147, 333, 438, 175, 301, 335, 187, 409, 
+  162, 145, 435, 416, 435, 139, 170, 399, 414, 481, 
+  438, 389, 0, 168, 0, 0, 403, 357, 403, 59, 
+  357, 490, 301, 534, 391, 0, 0, 0, 301, 0, 
+  0, 460, 0, 145, 59, 0, 179, 403, 177, 59, 
+  59, 488, 489, 0, 404, 105, 404, 0, 59, 185, 
+  451, 59, 59, 450, 59, 59, 59, 59, 59, 283, 
+  284, 59, 287, 285, 145, 404, 286, 107, 167, 406, 
+  164, 59, 59, 451, 450, 265, 59, 59, 301, 59, 
+  269, 68, 96, 95, 479, 59, 59, 331, 478, 59, 
+  87, 76, 59, 329, 59, 97, 434, 83, 89, 431, 
+  59, 470, 59, 59, 59, 94, 88, 59, 93, 92, 
+  59, 59, 90, 59, 59, 91, 493, 59, 59, 71, 
+  67, 59, 59, 491, 492, 99, 59, 101, 179, 319, 
+  301, 59, 59, 340, 69, 60, 59, 59, 450, 66, 
+  59, 59, 451, 304, 105, 499, 269, 297, 297, 297, 
+  59, 59, 269, 269, 269, 269, 269, 0, 315, 272, 
+  498, 508, 294, 0, 0, 0, 107, 174, 59, 325, 
+  318, 316, 297, 269, 59, 290, 0, 269, 297, 269, 
+  0, 59, 0, 269, 59, 0, 269, 292, 59, 269, 
+  179, 277, 59, 0, 299, 302, 312, 269, 59, 288, 
+  296, 328, 609, 269, 499, 289, 597, 633, 606, 599, 
+  499, 600, 565, 600, 0, 0, 499, 0, 0, 568, 
+  561, 562, 563, 564, 0, 498, 508, 0, 471, 0, 
+  0, 498, 508, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  499, 0, 0, 603, 0, 0, 0, 600, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0};
+
+const short QDeclarativeJSGrammar::action_check [] = {
+  7, 7, 36, 90, 7, 29, 36, 7, 36, 7, 
+  33, 8, 7, 7, 36, 7, 90, 7, 0, 7, 
+  16, 60, 55, 33, 8, 29, 7, 36, 7, 55, 
+  79, 48, 1, 7, 55, 2, 7, 17, 37, 7, 
+  33, 60, 29, 7, 33, 7, 66, 33, 33, 7, 
+  66, 29, 7, 36, 20, 7, 7, 29, 33, 36, 
+  36, 24, 5, 36, 5, 7, 36, 5, 1, 60, 
+  7, 36, 7, 2, 79, 2, 33, 8, 8, 7, 
+  1, 7, 36, 36, 8, 1, 36, -1, 8, 36, 
+  -1, 2, 36, 8, 55, 7, -1, -1, -1, 17, 
+  60, 60, 48, 48, 60, 7, -1, 55, 8, -1, 
+  33, 36, 61, 6, 48, -1, 33, 15, 8, 10, 
+  8, 60, 36, 36, 7, 8, 8, 20, 8, 61, 
+  8, 33, 8, -1, 8, 40, 34, 77, 60, 8, 
+  8, 8, 61, 79, 50, -1, 51, 50, 54, 8, 
+  60, 54, 61, 62, 61, 62, 56, 61, 62, 40, 
+  61, 62, 61, 62, 55, 40, 56, 61, 62, 12, 
+  51, 42, 60, 15, 61, 62, 51, 7, 60, -1, 
+  60, 8, 53, 61, 60, 31, 60, 40, 56, 61, 
+  62, 60, 34, 60, 29, 61, 62, 56, 51, 61, 
+  62, 61, 62, 25, 25, 27, 27, 8, 25, 25, 
+  27, 27, 12, 25, 57, 27, 38, 38, 29, 29, 
+  63, 38, 38, 25, 15, 27, 38, 12, 25, -1, 
+  27, 61, 62, 8, 61, 62, 38, 25, 8, 27, 
+  75, 38, 25, 34, 27, 36, 25, 15, 27, 8, 
+  38, 86, 61, 62, 8, 38, 25, 57, 27, 38, 
+  61, 62, 15, 63, 75, 75, 34, 29, 36, 38, 
+  36, 29, 57, 8, 29, 86, 86, 25, 63, 27, 
+  7, 34, 91, 36, 29, -1, 61, 62, -1, -1, 
+  38, 61, 62, -1, -1, 61, 62, 25, -1, 27, 
+  47, -1, 61, 62, 29, -1, 60, -1, -1, -1, 
+  38, 18, 19, 75, 61, 62, 29, 75, -1, 29, 
+  75, 66, 67, 68, 86, -1, 61, 62, 86, 15, 
+  -1, 86, 29, -1, 61, 62, 18, 19, 45, 46, 
+  29, 66, 67, 68, 91, 29, 15, 33, 34, 29, 
+  36, -1, 29, 66, 67, 68, 66, 67, 68, 29, 
+  -1, -1, 29, 45, 46, 34, 29, 36, -1, 66, 
+  67, 68, 29, -1, 15, 29, -1, 66, 67, 68, 
+  -1, -1, 66, 67, 68, -1, 66, 67, 68, 66, 
+  67, 68, 33, 34, -1, 36, 66, 67, 68, 66, 
+  67, 68, -1, 66, 67, 68, 23, 24, -1, 66, 
+  67, 68, 66, 67, 68, 32, 23, 24, 35, -1, 
+  37, -1, -1, 29, -1, 32, 29, -1, 35, 29, 
+  37, 18, 19, 36, 23, 24, 36, 29, -1, -1, 
+  -1, -1, -1, 32, -1, -1, 35, -1, 37, 29, 
+  -1, -1, -1, -1, -1, 61, 62, -1, 45, 46, 
+  66, 67, 68, 66, 67, 68, 66, 67, 68, 61, 
+  62, 23, 24, 29, 66, 67, 68, -1, -1, 31, 
+  32, 61, 62, 35, -1, 37, 66, 67, 68, 23, 
+  24, 29, -1, -1, -1, -1, -1, 31, 32, -1, 
+  -1, 35, -1, 37, -1, 61, 62, 23, 24, 29, 
+  66, 67, 68, 23, 24, 31, 32, -1, -1, 35, 
+  -1, 37, 32, 61, 62, 35, -1, 37, 66, 67, 
+  68, 92, 93, 94, 95, 96, 97, -1, -1, 3, 
+  -1, 61, 62, -1, -1, -1, 66, 67, 68, 13, 
+  -1, -1, -1, 17, -1, -1, -1, 3, -1, -1, 
+  -1, -1, 26, -1, 28, -1, -1, 13, -1, -1, 
+  -1, 17, -1, -1, -1, 39, -1, 41, 42, -1, 
+  26, -1, 28, -1, -1, 49, -1, -1, 52, 53, 
+  23, 24, -1, 39, 58, 41, 42, -1, 31, 32, 
+  64, -1, 35, 49, 37, -1, 52, 53, -1, -1, 
+  -1, -1, 58, -1, -1, -1, 80, -1, 64, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 12, 
+  13, -1, -1, -1, 80, -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, 3, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, 
+  -1, 17, 65, 66, 67, 68, -1, 70, -1, -1, 
+  26, -1, 28, -1, -1, 31, -1, -1, 81, 82, 
+  83, -1, -1, 39, 87, 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, 12, 13, -1, -1, 
+  -1, -1, -1, -1, 80, -1, 22, -1, -1, -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, 68, -1, 70, 43, -1, -1, -1, 47, 
+  -1, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
+  -1, 87, -1, -1, -1, -1, -1, 65, 66, 67, 
+  68, -1, 70, -1, 10, -1, 12, 13, -1, -1, 
+  -1, -1, -1, 81, 82, 83, 22, -1, -1, 87, 
+  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
+  36, -1, 12, 13, -1, -1, -1, 43, -1, -1, 
+  -1, 47, 22, -1, -1, -1, -1, -1, -1, 29, 
+  -1, -1, -1, 33, 34, -1, 36, -1, -1, 65, 
+  66, 67, 68, 43, 70, -1, -1, 47, -1, 75, 
+  -1, -1, -1, -1, -1, 81, 82, 83, 84, -1, 
+  -1, 87, -1, -1, -1, 65, 66, 67, 68, -1, 
+  70, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
+  -1, -1, -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, 68, -1, 
+  70, -1, -1, -1, -1, 75, -1, -1, -1, -1, 
+  -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, 
+  -1, -1, -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, 68, -1, 
+  70, -1, -1, -1, -1, 75, -1, -1, -1, -1, 
+  -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, 
+  -1, -1, -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, 68, -1, 70, 
+  -1, 72, -1, 74, -1, 76, -1, -1, -1, -1, 
+  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
+  -1, -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, 
+  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
+  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
+  -1, -1, -1, -1, -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, 68, 
+  -1, 70, -1, 72, -1, 74, 75, 76, -1, -1, 
+  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
+  -1, -1, -1, -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, 68, -1, 
+  70, -1, 72, -1, 74, -1, 76, -1, -1, -1, 
+  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  8, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
+  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
+  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
+  -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
+  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
+  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
+  56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
+  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
+  -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 8, -1, -1, 11, 12, 13, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
+  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
+  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
+  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
+  -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 
+  74, -1, 76, -1, -1, -1, -1, 81, 82, 83, 
+  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 8, -1, -1, 11, 
+  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
+  42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
+  -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
+  72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
+  82, 83, -1, -1, -1, 87, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 59, -1, -1, -1, -1, -1, -1, 
+  66, 67, 68, 69, 70, 71, -1, 73, 74, 75, 
+  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
+  86, -1, -1, -1, -1, -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, -1, 69, 
+  70, 71, -1, 73, 74, 75, 76, 77, 78, -1, 
+  -1, 81, 82, 83, 84, 85, 86, -1, -1, -1, 
+  -1, -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, -1, 69, 70, 71, -1, 73, 
+  74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
+  84, 85, 86, -1, -1, -1, -1, -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, 
+  78, -1, -1, 81, 82, 83, 84, 85, -1, 87, 
+  -1, -1, -1, -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, 78, -1, -1, 81, 
+  82, 83, 84, 85, -1, 87, -1, -1, -1, -1, 
+  -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, 78, -1, -1, 81, 82, 83, 84, 85, 
+  86, 87, -1, -1, -1, -1, -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, 78, -1, 
+  -1, 81, 82, 83, 84, 85, 86, 87, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+
+  3, 2, 15, 25, 25, 3, 25, 3, 2, 11, 
+  2, 15, 3, 13, 67, 3, 15, 104, 15, 2, 
+  15, 2, 4, 3, 35, 15, 15, 3, 21, 3, 
+  93, 15, 2, 2, 19, 13, 15, 96, 25, 25, 
+  15, 3, 15, 15, 15, 100, 3, 3, 15, 2, 
+  2, 15, 3, 21, 4, 15, 15, 15, 35, 2, 
+  21, 2, 2, 2, 98, 3, 2, 2, 2, 35, 
+  35, 4, 35, 2, 21, 3, 3, 3, 15, 2, 
+  35, 35, 3, 3, 3, 3, 35, 35, 2, 35, 
+  21, 35, -1, 35, -1, -1, 13, 2, 13, 44, 
+  2, 46, 3, 3, 36, -1, -1, -1, 3, -1, 
+  -1, 15, -1, 35, 44, -1, 46, 13, 40, 44, 
+  44, 46, 46, -1, 41, 15, 41, -1, 44, 15, 
+  46, 44, 44, 46, 44, 44, 44, 44, 44, 49, 
+  49, 44, 49, 49, 35, 41, 49, 37, 60, 40, 
+  58, 44, 44, 46, 46, 44, 44, 44, 3, 44, 
+  49, 46, 50, 50, 31, 44, 44, 68, 35, 44, 
+  48, 50, 44, 68, 44, 50, 81, 49, 48, 81, 
+  44, 85, 44, 44, 44, 49, 48, 44, 49, 49, 
+  44, 44, 49, 44, 44, 49, 46, 44, 44, 52, 
+  46, 44, 44, 46, 46, 56, 44, 54, 46, 15, 
+  3, 44, 44, 99, 47, 47, 44, 44, 46, 46, 
+  44, 44, 46, 68, 15, 13, 49, 44, 44, 44, 
+  44, 44, 49, 49, 49, 49, 49, -1, 61, 53, 
+  28, 29, 55, -1, -1, -1, 37, 38, 44, 66, 
+  66, 66, 44, 49, 44, 51, -1, 49, 44, 49, 
+  -1, 44, -1, 49, 44, -1, 49, 57, 44, 49, 
+  46, 51, 44, -1, 66, 68, 59, 49, 44, 51, 
+  66, 87, 5, 49, 13, 51, 13, 16, 5, 16, 
+  13, 20, 13, 20, -1, -1, 13, -1, -1, 20, 
+  21, 22, 23, 24, -1, 28, 29, -1, 35, -1, 
+  -1, 28, 29, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  13, -1, -1, 16, -1, -1, -1, 20, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1};
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
new file mode 100644
index 0000000..d6c3d6b
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+// This file was generated by qlalr - DO NOT EDIT!
+#ifndef QDECLARATIVEJSGRAMMAR_P_H
+#define QDECLARATIVEJSGRAMMAR_P_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeJSGrammar
+{
+public:
+  enum VariousConstants {
+    EOF_SYMBOL = 0,
+    REDUCE_HERE = 99,
+    SHIFT_THERE = 98,
+    T_AND = 1,
+    T_AND_AND = 2,
+    T_AND_EQ = 3,
+    T_AS = 91,
+    T_AUTOMATIC_SEMICOLON = 62,
+    T_BREAK = 4,
+    T_CASE = 5,
+    T_CATCH = 6,
+    T_COLON = 7,
+    T_COMMA = 8,
+    T_COMMENT = 88,
+    T_CONST = 84,
+    T_CONTINUE = 9,
+    T_DEBUGGER = 85,
+    T_DEFAULT = 10,
+    T_DELETE = 11,
+    T_DIVIDE_ = 12,
+    T_DIVIDE_EQ = 13,
+    T_DO = 14,
+    T_DOT = 15,
+    T_ELSE = 16,
+    T_EQ = 17,
+    T_EQ_EQ = 18,
+    T_EQ_EQ_EQ = 19,
+    T_FALSE = 83,
+    T_FEED_JS_EXPRESSION = 95,
+    T_FEED_JS_PROGRAM = 97,
+    T_FEED_JS_SOURCE_ELEMENT = 96,
+    T_FEED_JS_STATEMENT = 94,
+    T_FEED_UI_OBJECT_MEMBER = 93,
+    T_FEED_UI_PROGRAM = 92,
+    T_FINALLY = 20,
+    T_FOR = 21,
+    T_FUNCTION = 22,
+    T_GE = 23,
+    T_GT = 24,
+    T_GT_GT = 25,
+    T_GT_GT_EQ = 26,
+    T_GT_GT_GT = 27,
+    T_GT_GT_GT_EQ = 28,
+    T_IDENTIFIER = 29,
+    T_IF = 30,
+    T_IMPORT = 90,
+    T_IN = 31,
+    T_INSTANCEOF = 32,
+    T_LBRACE = 33,
+    T_LBRACKET = 34,
+    T_LE = 35,
+    T_LPAREN = 36,
+    T_LT = 37,
+    T_LT_LT = 38,
+    T_LT_LT_EQ = 39,
+    T_MINUS = 40,
+    T_MINUS_EQ = 41,
+    T_MINUS_MINUS = 42,
+    T_MULTILINE_STRING_LITERAL = 87,
+    T_NEW = 43,
+    T_NOT = 44,
+    T_NOT_EQ = 45,
+    T_NOT_EQ_EQ = 46,
+    T_NULL = 81,
+    T_NUMERIC_LITERAL = 47,
+    T_OR = 48,
+    T_OR_EQ = 49,
+    T_OR_OR = 50,
+    T_PLUS = 51,
+    T_PLUS_EQ = 52,
+    T_PLUS_PLUS = 53,
+    T_PROPERTY = 66,
+    T_PUBLIC = 89,
+    T_QUESTION = 54,
+    T_RBRACE = 55,
+    T_RBRACKET = 56,
+    T_READONLY = 68,
+    T_REMAINDER = 57,
+    T_REMAINDER_EQ = 58,
+    T_RESERVED_WORD = 86,
+    T_RETURN = 59,
+    T_RPAREN = 60,
+    T_SEMICOLON = 61,
+    T_SIGNAL = 67,
+    T_STAR = 63,
+    T_STAR_EQ = 64,
+    T_STRING_LITERAL = 65,
+    T_SWITCH = 69,
+    T_THIS = 70,
+    T_THROW = 71,
+    T_TILDE = 72,
+    T_TRUE = 82,
+    T_TRY = 73,
+    T_TYPEOF = 74,
+    T_VAR = 75,
+    T_VOID = 76,
+    T_WHILE = 77,
+    T_WITH = 78,
+    T_XOR = 79,
+    T_XOR_EQ = 80,
+
+    ACCEPT_STATE = 635,
+    RULE_COUNT = 343,
+    STATE_COUNT = 636,
+    TERMINAL_COUNT = 100,
+    NON_TERMINAL_COUNT = 106,
+
+    GOTO_INDEX_OFFSET = 636,
+    GOTO_INFO_OFFSET = 2520,
+    GOTO_CHECK_OFFSET = 2520
+  };
+
+  static const char  *const    spell [];
+  static const short             lhs [];
+  static const short             rhs [];
+  static const short    goto_default [];
+  static const short  action_default [];
+  static const short    action_index [];
+  static const short     action_info [];
+  static const short    action_check [];
+
+  static inline int nt_action (int state, int nt)
+  {
+    const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;
+    if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)
+      return goto_default [nt];
+
+    return action_info [GOTO_INFO_OFFSET + yyn];
+  }
+
+  static inline int t_action (int state, int token)
+  {
+    const int yyn = action_index [state] + token;
+
+    if (yyn < 0 || action_check [yyn] != token)
+      return - action_default [state];
+
+    return action_info [yyn];
+  }
+};
+
+
+QT_END_NAMESPACE
+#endif // QDECLARATIVEJSGRAMMAR_P_H
+
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp
new file mode 100644
index 0000000..384d00c
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp
@@ -0,0 +1,1161 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "qdeclarativejslexer_p.h"
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsengine_p.h"
+#include "qdeclarativejsgrammar_p.h"
+
+#include <QtCore/qcoreapplication.h>
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+QT_QML_BEGIN_NAMESPACE
+
+extern double qstrtod(const char *s00, char const **se, bool *ok);
+
+#define shiftWindowsLineBreak() \
+    do { \
+        if (((current == '\r') && (next1 == '\n')) \
+            || ((current == '\n') && (next1 == '\r'))) { \
+            shift(1); \
+        } \
+    } \
+    while (0)
+
+namespace QDeclarativeJS {
+extern double integerFromString(const char *buf, int size, int radix);
+}
+
+using namespace QDeclarativeJS;
+
+Lexer::Lexer(Engine *eng, bool tokenizeComments)
+    : driver(eng),
+      yylineno(0),
+      done(false),
+      size8(128), size16(128),
+      pos8(0), pos16(0),
+      terminator(false),
+      restrKeyword(false),
+      delimited(false),
+      stackToken(-1),
+      state(Start),
+      pos(0),
+      code(0), length(0),
+      yycolumn(0),
+      startpos(0),
+      startlineno(0), startcolumn(0),
+      bol(true),
+      current(0), next1(0), next2(0), next3(0),
+      err(NoError),
+      wantRx(false),
+      check_reserved(true),
+      parenthesesState(IgnoreParentheses),
+      parenthesesCount(0),
+      prohibitAutomaticSemicolon(false),
+      tokenizeComments(tokenizeComments)
+{
+    driver->setLexer(this);
+    // allocate space for read buffers
+    buffer8 = new char[size8];
+    buffer16 = new QChar[size16];
+    pattern = 0;
+    flags = 0;
+
+}
+
+Lexer::~Lexer()
+{
+    delete [] buffer8;
+    delete [] buffer16;
+}
+
+void Lexer::setCode(const QString &c, int lineno)
+{
+    errmsg = QString();
+    yylineno = lineno;
+    yycolumn = 1;
+    restrKeyword = false;
+    delimited = false;
+    stackToken = -1;
+    pos = 0;
+    code = c.unicode();
+    length = c.length();
+    bol = true;
+
+    // read first characters
+    current = (length > 0) ? code[0].unicode() : 0;
+    next1 = (length > 1) ? code[1].unicode() : 0;
+    next2 = (length > 2) ? code[2].unicode() : 0;
+    next3 = (length > 3) ? code[3].unicode() : 0;
+}
+
+void Lexer::shift(uint p)
+{
+    while (p--) {
+        ++pos;
+        ++yycolumn;
+        current = next1;
+        next1 = next2;
+        next2 = next3;
+        next3 = (pos + 3 < length) ? code[pos+3].unicode() : 0;
+    }
+}
+
+void Lexer::setDone(State s)
+{
+    state = s;
+    done = true;
+}
+
+int Lexer::findReservedWord(const QChar *c, int size) const
+{
+    switch (size) {
+    case 2: {
+        if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('o'))
+            return QDeclarativeJSGrammar::T_DO;
+        else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('f'))
+            return QDeclarativeJSGrammar::T_IF;
+        else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n'))
+            return QDeclarativeJSGrammar::T_IN;
+        else if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('s'))
+            return QDeclarativeJSGrammar::T_AS;
+    }   break;
+
+    case 3: {
+        if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('o') && c[2] == QLatin1Char('r'))
+            return QDeclarativeJSGrammar::T_FOR;
+        else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('e') && c[2] == QLatin1Char('w'))
+            return QDeclarativeJSGrammar::T_NEW;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('r') && c[2] == QLatin1Char('y'))
+            return QDeclarativeJSGrammar::T_TRY;
+        else if (c[0] == QLatin1Char('v') && c[1] == QLatin1Char('a') && c[2] == QLatin1Char('r'))
+            return QDeclarativeJSGrammar::T_VAR;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n') && c[2] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 4: {
+        if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('a')
+                && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_CASE;
+        else if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('l')
+                && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_ELSE;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('h')
+                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('s'))
+            return QDeclarativeJSGrammar::T_THIS;
+        else if (c[0] == QLatin1Char('v') && c[1] == QLatin1Char('o')
+                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('d'))
+            return QDeclarativeJSGrammar::T_VOID;
+        else if (c[0] == QLatin1Char('w') && c[1] == QLatin1Char('i')
+                && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('h'))
+            return QDeclarativeJSGrammar::T_WITH;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('r')
+                && c[2] == QLatin1Char('u') && c[3] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_TRUE;
+        else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('u')
+                && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('l'))
+            return QDeclarativeJSGrammar::T_NULL;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('n')
+                    && c[2] == QLatin1Char('u') && c[3] == QLatin1Char('m'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('b') && c[1] == QLatin1Char('y')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('l') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('g'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('h')
+                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('r'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('g') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('o'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 5: {
+        if (c[0] == QLatin1Char('b') && c[1] == QLatin1Char('r')
+                && c[2] == QLatin1Char('e') && c[3] == QLatin1Char('a')
+                && c[4] == QLatin1Char('k'))
+            return QDeclarativeJSGrammar::T_BREAK;
+        else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('a')
+                && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('c')
+                && c[4] == QLatin1Char('h'))
+            return QDeclarativeJSGrammar::T_CATCH;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('h')
+                && c[2] == QLatin1Char('r') && c[3] == QLatin1Char('o')
+                && c[4] == QLatin1Char('w'))
+            return QDeclarativeJSGrammar::T_THROW;
+        else if (c[0] == QLatin1Char('w') && c[1] == QLatin1Char('h')
+                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('l')
+                && c[4] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_WHILE;
+        else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('o')
+                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('s')
+                && c[4] == QLatin1Char('t'))
+            return QDeclarativeJSGrammar::T_CONST;
+        else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('a')
+                && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('s')
+                && c[4] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_FALSE;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('h')
+                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('r')
+                    && c[4] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('u')
+                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('e')
+                    && c[4] == QLatin1Char('r'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('i')
+                    && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('a')
+                    && c[4] == QLatin1Char('l'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('l')
+                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('s')
+                    && c[4] == QLatin1Char('s'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('l')
+                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('a')
+                    && c[4] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 6: {
+        if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('e')
+                && c[4] == QLatin1Char('t') && c[5] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_DELETE;
+        else if (c[0] == QLatin1Char('r') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('u')
+                && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('n'))
+            return QDeclarativeJSGrammar::T_RETURN;
+        else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('w')
+                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('t')
+                && c[4] == QLatin1Char('c') && c[5] == QLatin1Char('h'))
+            return QDeclarativeJSGrammar::T_SWITCH;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('y')
+                && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('e')
+                && c[4] == QLatin1Char('o') && c[5] == QLatin1Char('f'))
+            return QDeclarativeJSGrammar::T_TYPEOF;
+        else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('m')
+            && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o')
+            && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('t'))
+            return QDeclarativeJSGrammar::T_IMPORT;
+        else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('i')
+            && c[2] == QLatin1Char('g') && c[3] == QLatin1Char('n')
+            && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('l'))
+            return QDeclarativeJSGrammar::T_SIGNAL;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('x')
+                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o')
+                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('t')
+                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('t')
+                    && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('c'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('u') && c[3] == QLatin1Char('b')
+                    && c[4] == QLatin1Char('l') && c[5] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('m')
+                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o')
+                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('u')
+                    && c[2] == QLatin1Char('b') && c[3] == QLatin1Char('l')
+                    && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('c'))
+                return QDeclarativeJSGrammar::T_PUBLIC;
+            else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('a')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('i')
+                    && c[4] == QLatin1Char('v') && c[5] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('h')
+                    && c[2] == QLatin1Char('r') && c[3] == QLatin1Char('o')
+                    && c[4] == QLatin1Char('w') && c[5] == QLatin1Char('s'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 7: {
+        if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('f') && c[3] == QLatin1Char('a')
+                && c[4] == QLatin1Char('u') && c[5] == QLatin1Char('l')
+                && c[6] == QLatin1Char('t'))
+            return QDeclarativeJSGrammar::T_DEFAULT;
+        else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('i')
+                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('a')
+                && c[4] == QLatin1Char('l') && c[5] == QLatin1Char('l')
+                && c[6] == QLatin1Char('y'))
+            return QDeclarativeJSGrammar::T_FINALLY;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('b') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('l')
+                    && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('a')
+                    && c[6] == QLatin1Char('n'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('x')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('e')
+                    && c[4] == QLatin1Char('n') && c[5] == QLatin1Char('d')
+                    && c[6] == QLatin1Char('s'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('a')
+                    && c[2] == QLatin1Char('c') && c[3] == QLatin1Char('k')
+                    && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('g')
+                    && c[6] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('r')
+                    && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('v')
+                    && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('t')
+                    && c[6] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 8: {
+        if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('o')
+                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('t')
+                && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('n')
+                && c[6] == QLatin1Char('u') && c[7] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_CONTINUE;
+        else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('u')
+                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('c')
+                && c[4] == QLatin1Char('t') && c[5] == QLatin1Char('i')
+                && c[6] == QLatin1Char('o') && c[7] == QLatin1Char('n'))
+            return QDeclarativeJSGrammar::T_FUNCTION;
+        else if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('b') && c[3] == QLatin1Char('u')
+                && c[4] == QLatin1Char('g') && c[5] == QLatin1Char('g')
+                && c[6] == QLatin1Char('e') && c[7] == QLatin1Char('r'))
+            return QDeclarativeJSGrammar::T_DEBUGGER;
+        else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('r')
+                && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('p')
+                && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('r')
+                && c[6] == QLatin1Char('t') && c[7] == QLatin1Char('y'))
+            return QDeclarativeJSGrammar::T_PROPERTY;
+        else if (c[0] == QLatin1Char('r') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('d')
+                && c[4] == QLatin1Char('o') && c[5] == QLatin1Char('n')
+                && c[6] == QLatin1Char('l') && c[7] == QLatin1Char('y'))
+            return QDeclarativeJSGrammar::T_READONLY;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('b')
+                    && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('t')
+                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('a')
+                    && c[6] == QLatin1Char('c') && c[7] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('v') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('a')
+                    && c[4] == QLatin1Char('t') && c[5] == QLatin1Char('i')
+                    && c[6] == QLatin1Char('l') && c[7] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 9: {
+        if (check_reserved) {
+            if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('e')
+                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('f')
+                    && c[6] == QLatin1Char('a') && c[7] == QLatin1Char('c')
+                    && c[8] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('r')
+                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('n')
+                    && c[4] == QLatin1Char('s') && c[5] == QLatin1Char('i')
+                    && c[6] == QLatin1Char('e') && c[7] == QLatin1Char('n')
+                    && c[8] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('r')
+                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('t')
+                    && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('c')
+                    && c[6] == QLatin1Char('t') && c[7] == QLatin1Char('e')
+                    && c[8] == QLatin1Char('d'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 10: {
+        if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n')
+                && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('t')
+                && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('n')
+                && c[6] == QLatin1Char('c') && c[7] == QLatin1Char('e')
+                && c[8] == QLatin1Char('o') && c[9] == QLatin1Char('f'))
+            return QDeclarativeJSGrammar::T_INSTANCEOF;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('m')
+                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('l')
+                    && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('m')
+                    && c[6] == QLatin1Char('e') && c[7] == QLatin1Char('n')
+                    && c[8] == QLatin1Char('t') && c[9] == QLatin1Char('s'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 12: {
+        if (check_reserved) {
+            if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('y')
+                    && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('c')
+                    && c[4] == QLatin1Char('h') && c[5] == QLatin1Char('r')
+                    && c[6] == QLatin1Char('o') && c[7] == QLatin1Char('n')
+                    && c[8] == QLatin1Char('i') && c[9] == QLatin1Char('z')
+                    && c[10] == QLatin1Char('e') && c[11] == QLatin1Char('d'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    } // switch
+
+    return -1;
+}
+
+int Lexer::lex()
+{
+    int token = 0;
+    state = Start;
+    ushort stringType = 0; // either single or double quotes
+    bool multiLineString = false;
+    pos8 = pos16 = 0;
+    done = false;
+    terminator = false;
+
+    // did we push a token on the stack previously ?
+    // (after an automatic semicolon insertion)
+    if (stackToken >= 0) {
+        setDone(Other);
+        token = stackToken;
+        stackToken = -1;
+    }
+
+    while (!done) {
+        switch (state) {
+        case Start:
+            if (isWhiteSpace()) {
+                // do nothing
+            } else if (current == '/' && next1 == '/') {
+                recordStartPos();
+                shift(1);
+                state = InSingleLineComment;
+            } else if (current == '/' && next1 == '*') {
+                recordStartPos();
+                shift(1);
+                state = InMultiLineComment;
+            } else if (current == 0) {
+                syncProhibitAutomaticSemicolon();
+                if (!terminator && !delimited && !prohibitAutomaticSemicolon) {
+                    // automatic semicolon insertion if program incomplete
+                    token = QDeclarativeJSGrammar::T_SEMICOLON;
+                    stackToken = 0;
+                    setDone(Other);
+                } else {
+                    setDone(Eof);
+                }
+            } else if (isLineTerminator()) {
+                shiftWindowsLineBreak();
+                yylineno++;
+                yycolumn = 0;
+                bol = true;
+                terminator = true;
+                syncProhibitAutomaticSemicolon();
+                if (restrKeyword) {
+                    token = QDeclarativeJSGrammar::T_SEMICOLON;
+                    setDone(Other);
+                }
+            } else if (current == '"' || current == '\'') {
+                recordStartPos();
+                state = InString;
+                multiLineString = false;
+                stringType = current;
+            } else if (isIdentLetter(current)) {
+                recordStartPos();
+                record16(current);
+                state = InIdentifier;
+            } else if (current == '0') {
+                recordStartPos();
+                record8(current);
+                state = InNum0;
+            } else if (isDecimalDigit(current)) {
+                recordStartPos();
+                record8(current);
+                state = InNum;
+            } else if (current == '.' && isDecimalDigit(next1)) {
+                recordStartPos();
+                record8(current);
+                state = InDecimal;
+            } else {
+                recordStartPos();
+                token = matchPunctuator(current, next1, next2, next3);
+                if (token != -1) {
+                    if (terminator && !delimited && !prohibitAutomaticSemicolon
+                        && (token == QDeclarativeJSGrammar::T_PLUS_PLUS
+                            || token == QDeclarativeJSGrammar::T_MINUS_MINUS)) {
+                        // automatic semicolon insertion
+                        stackToken = token;
+                        token = QDeclarativeJSGrammar::T_SEMICOLON;
+                    }
+                    setDone(Other);
+                }
+                else {
+                    setDone(Bad);
+                    err = IllegalCharacter;
+                    errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal character");
+                }
+            }
+            break;
+        case InString:
+            if (current == stringType) {
+                shift(1);
+                setDone(String);
+            } else if (isLineTerminator()) {
+                multiLineString = true;
+                record16(current);
+            } else if (current == 0 || isLineTerminator()) {
+                setDone(Bad);
+                err = UnclosedStringLiteral;
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Unclosed string at end of line");
+            } else if (current == '\\') {
+                state = InEscapeSequence;
+            } else {
+                record16(current);
+            }
+            break;
+            // Escape Sequences inside of strings
+        case InEscapeSequence:
+            if (isOctalDigit(current)) {
+                if (current >= '0' && current <= '3' &&
+                     isOctalDigit(next1) && isOctalDigit(next2)) {
+                    record16(convertOctal(current, next1, next2));
+                    shift(2);
+                    state = InString;
+                } else if (isOctalDigit(current) &&
+                            isOctalDigit(next1)) {
+                    record16(convertOctal('0', current, next1));
+                    shift(1);
+                    state = InString;
+                } else if (isOctalDigit(current)) {
+                    record16(convertOctal('0', '0', current));
+                    state = InString;
+                } else {
+                    setDone(Bad);
+                    err = IllegalEscapeSequence;
+                    errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal escape squence");
+                }
+            } else if (current == 'x')
+                state = InHexEscape;
+            else if (current == 'u')
+                state = InUnicodeEscape;
+            else {
+                if (isLineTerminator()) {
+                    shiftWindowsLineBreak();
+                    yylineno++;
+                    yycolumn = 0;
+                    bol = true;
+                } else {
+                    record16(singleEscape(current));
+                }
+                state = InString;
+            }
+            break;
+        case InHexEscape:
+            if (isHexDigit(current) && isHexDigit(next1)) {
+                state = InString;
+                record16(QLatin1Char(convertHex(current, next1)));
+                shift(1);
+            } else if (current == stringType) {
+                record16(QLatin1Char('x'));
+                shift(1);
+                setDone(String);
+            } else {
+                record16(QLatin1Char('x'));
+                record16(current);
+                state = InString;
+            }
+            break;
+        case InUnicodeEscape:
+            if (isHexDigit(current) && isHexDigit(next1) &&
+                 isHexDigit(next2) && isHexDigit(next3)) {
+                record16(convertUnicode(current, next1, next2, next3));
+                shift(3);
+                state = InString;
+            } else if (current == stringType) {
+                record16(QLatin1Char('u'));
+                shift(1);
+                setDone(String);
+            } else {
+                setDone(Bad);
+                err = IllegalUnicodeEscapeSequence;
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal unicode escape sequence");
+            }
+            break;
+        case InSingleLineComment:
+            if (isLineTerminator()) {
+                shiftWindowsLineBreak();
+                yylineno++;
+                yycolumn = 0;
+                terminator = true;
+                bol = true;
+                if (restrKeyword) {
+                    token = QDeclarativeJSGrammar::T_SEMICOLON;
+                    setDone(Other);
+                } else
+                    state = Start;
+                driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
+            } else if (current == 0) {
+                driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
+                setDone(Eof);
+            }
+
+            break;
+        case InMultiLineComment:
+            if (current == 0) {
+                setDone(Bad);
+                err = UnclosedComment;
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Unclosed comment at end of file");
+                driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
+            } else if (isLineTerminator()) {
+                shiftWindowsLineBreak();
+                yylineno++;
+            } else if (current == '*' && next1 == '/') {
+                state = Start;
+                shift(1);
+                driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
+            }
+
+            break;
+        case InIdentifier:
+            if (isIdentLetter(current) || isDecimalDigit(current)) {
+                record16(current);
+                break;
+            }
+            setDone(Identifier);
+            break;
+        case InNum0:
+            if (current == 'x' || current == 'X') {
+                record8(current);
+                state = InHex;
+            } else if (current == '.') {
+                record8(current);
+                state = InDecimal;
+            } else if (current == 'e' || current == 'E') {
+                record8(current);
+                state = InExponentIndicator;
+            } else if (isOctalDigit(current)) {
+                record8(current);
+                state = InOctal;
+            } else if (isDecimalDigit(current)) {
+                record8(current);
+                state = InDecimal;
+            } else {
+                setDone(Number);
+            }
+            break;
+        case InHex:
+            if (isHexDigit(current))
+                record8(current);
+            else
+                setDone(Hex);
+            break;
+        case InOctal:
+            if (isOctalDigit(current)) {
+                record8(current);
+            } else if (isDecimalDigit(current)) {
+                record8(current);
+                state = InDecimal;
+            } else {
+                setDone(Octal);
+            }
+            break;
+        case InNum:
+            if (isDecimalDigit(current)) {
+                record8(current);
+            } else if (current == '.') {
+                record8(current);
+                state = InDecimal;
+            } else if (current == 'e' || current == 'E') {
+                record8(current);
+                state = InExponentIndicator;
+            } else {
+                setDone(Number);
+            }
+            break;
+        case InDecimal:
+            if (isDecimalDigit(current)) {
+                record8(current);
+            } else if (current == 'e' || current == 'E') {
+                record8(current);
+                state = InExponentIndicator;
+            } else {
+                setDone(Number);
+            }
+            break;
+        case InExponentIndicator:
+            if (current == '+' || current == '-') {
+                record8(current);
+            } else if (isDecimalDigit(current)) {
+                record8(current);
+                state = InExponent;
+            } else {
+                setDone(Bad);
+                err = IllegalExponentIndicator;
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal syntax for exponential number");
+            }
+            break;
+        case InExponent:
+            if (isDecimalDigit(current)) {
+                record8(current);
+            } else {
+                setDone(Number);
+            }
+            break;
+        default:
+            Q_ASSERT_X(0, "Lexer::lex", "Unhandled state in switch statement");
+        }
+
+        // move on to the next character
+        if (!done)
+            shift(1);
+        if (state != Start && state != InSingleLineComment)
+            bol = false;
+    }
+
+    // no identifiers allowed directly after numeric literal, e.g. "3in" is bad
+    if ((state == Number || state == Octal || state == Hex)
+         && isIdentLetter(current)) {
+        state = Bad;
+        err = IllegalIdentifier;
+        errmsg = QCoreApplication::translate("QDeclarativeParser", "Identifier cannot start with numeric literal");
+    }
+
+    // terminate string
+    buffer8[pos8] = '\0';
+
+    double dval = 0;
+    if (state == Number) {
+        dval = qstrtod(buffer8, 0, 0);
+    } else if (state == Hex) { // scan hex numbers
+        dval = integerFromString(buffer8, pos8, 16);
+        state = Number;
+    } else if (state == Octal) {   // scan octal number
+        dval = integerFromString(buffer8, pos8, 8);
+        state = Number;
+    }
+
+    restrKeyword = false;
+    delimited = false;
+
+    switch (parenthesesState) {
+    case IgnoreParentheses:
+        break;
+    case CountParentheses:
+        if (token == QDeclarativeJSGrammar::T_RPAREN) {
+            --parenthesesCount;
+            if (parenthesesCount == 0)
+                parenthesesState = BalancedParentheses;
+        } else if (token == QDeclarativeJSGrammar::T_LPAREN) {
+            ++parenthesesCount;
+        }
+        break;
+    case BalancedParentheses:
+        parenthesesState = IgnoreParentheses;
+        break;
+    }
+
+    switch (state) {
+    case Eof:
+        return 0;
+    case Other:
+        if (token == QDeclarativeJSGrammar::T_RBRACE || token == QDeclarativeJSGrammar::T_SEMICOLON)
+            delimited = true;
+        return token;
+    case Identifier:
+        if ((token = findReservedWord(buffer16, pos16)) < 0) {
+            /* TODO: close leak on parse error. same holds true for String */
+            if (driver)
+                qsyylval.ustr = driver->intern(buffer16, pos16);
+            else
+                qsyylval.ustr = 0;
+            return QDeclarativeJSGrammar::T_IDENTIFIER;
+        }
+        if (token == QDeclarativeJSGrammar::T_CONTINUE || token == QDeclarativeJSGrammar::T_BREAK
+            || token == QDeclarativeJSGrammar::T_RETURN || token == QDeclarativeJSGrammar::T_THROW) {
+            restrKeyword = true;
+        } else if (token == QDeclarativeJSGrammar::T_IF || token == QDeclarativeJSGrammar::T_FOR
+                   || token == QDeclarativeJSGrammar::T_WHILE || token == QDeclarativeJSGrammar::T_WITH) {
+            parenthesesState = CountParentheses;
+            parenthesesCount = 0;
+        } else if (token == QDeclarativeJSGrammar::T_DO) {
+            parenthesesState = BalancedParentheses;
+        }
+        return token;
+    case String:
+        if (driver)
+            qsyylval.ustr = driver->intern(buffer16, pos16);
+        else
+            qsyylval.ustr = 0;
+        return multiLineString?QDeclarativeJSGrammar::T_MULTILINE_STRING_LITERAL:QDeclarativeJSGrammar::T_STRING_LITERAL;
+    case Number:
+        qsyylval.dval = dval;
+        return QDeclarativeJSGrammar::T_NUMERIC_LITERAL;
+    case Bad:
+        return -1;
+    default:
+        Q_ASSERT(!"unhandled numeration value in switch");
+        return -1;
+    }
+}
+
+bool Lexer::isWhiteSpace() const
+{
+    return (current == ' ' || current == '\t' ||
+             current == 0x0b || current == 0x0c);
+}
+
+bool Lexer::isLineTerminator() const
+{
+    return (current == '\n' || current == '\r');
+}
+
+bool Lexer::isIdentLetter(ushort c)
+{
+    // ASCII-biased, since all reserved words are ASCII, aand hence the
+    // bulk of content to be parsed.
+    if ((c >= 'a' && c <= 'z')
+            || (c >= 'A' && c <= 'Z')
+            || c == '$'
+            || c == '_')
+        return true;
+    if (c < 128)
+        return false;
+    return QChar(c).isLetterOrNumber();
+}
+
+bool Lexer::isDecimalDigit(ushort c)
+{
+    return (c >= '0' && c <= '9');
+}
+
+bool Lexer::isHexDigit(ushort c) const
+{
+    return ((c >= '0' && c <= '9')
+            || (c >= 'a' && c <= 'f')
+            || (c >= 'A' && c <= 'F'));
+}
+
+bool Lexer::isOctalDigit(ushort c) const
+{
+    return (c >= '0' && c <= '7');
+}
+
+int Lexer::matchPunctuator(ushort c1, ushort c2,
+                            ushort c3, ushort c4)
+{
+    if (c1 == '>' && c2 == '>' && c3 == '>' && c4 == '=') {
+        shift(4);
+        return QDeclarativeJSGrammar::T_GT_GT_GT_EQ;
+    } else if (c1 == '=' && c2 == '=' && c3 == '=') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_EQ_EQ_EQ;
+    } else if (c1 == '!' && c2 == '=' && c3 == '=') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_NOT_EQ_EQ;
+    } else if (c1 == '>' && c2 == '>' && c3 == '>') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_GT_GT_GT;
+    } else if (c1 == '<' && c2 == '<' && c3 == '=') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_LT_LT_EQ;
+    } else if (c1 == '>' && c2 == '>' && c3 == '=') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_GT_GT_EQ;
+    } else if (c1 == '<' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_LE;
+    } else if (c1 == '>' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_GE;
+    } else if (c1 == '!' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_NOT_EQ;
+    } else if (c1 == '+' && c2 == '+') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_PLUS_PLUS;
+    } else if (c1 == '-' && c2 == '-') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_MINUS_MINUS;
+    } else if (c1 == '=' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_EQ_EQ;
+    } else if (c1 == '+' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_PLUS_EQ;
+    } else if (c1 == '-' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_MINUS_EQ;
+    } else if (c1 == '*' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_STAR_EQ;
+    } else if (c1 == '/' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_DIVIDE_EQ;
+    } else if (c1 == '&' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_AND_EQ;
+    } else if (c1 == '^' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_XOR_EQ;
+    } else if (c1 == '%' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_REMAINDER_EQ;
+    } else if (c1 == '|' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_OR_EQ;
+    } else if (c1 == '<' && c2 == '<') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_LT_LT;
+    } else if (c1 == '>' && c2 == '>') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_GT_GT;
+    } else if (c1 == '&' && c2 == '&') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_AND_AND;
+    } else if (c1 == '|' && c2 == '|') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_OR_OR;
+    }
+
+    switch(c1) {
+        case '=': shift(1); return QDeclarativeJSGrammar::T_EQ;
+        case '>': shift(1); return QDeclarativeJSGrammar::T_GT;
+        case '<': shift(1); return QDeclarativeJSGrammar::T_LT;
+        case ',': shift(1); return QDeclarativeJSGrammar::T_COMMA;
+        case '!': shift(1); return QDeclarativeJSGrammar::T_NOT;
+        case '~': shift(1); return QDeclarativeJSGrammar::T_TILDE;
+        case '?': shift(1); return QDeclarativeJSGrammar::T_QUESTION;
+        case ':': shift(1); return QDeclarativeJSGrammar::T_COLON;
+        case '.': shift(1); return QDeclarativeJSGrammar::T_DOT;
+        case '+': shift(1); return QDeclarativeJSGrammar::T_PLUS;
+        case '-': shift(1); return QDeclarativeJSGrammar::T_MINUS;
+        case '*': shift(1); return QDeclarativeJSGrammar::T_STAR;
+        case '/': shift(1); return QDeclarativeJSGrammar::T_DIVIDE_;
+        case '&': shift(1); return QDeclarativeJSGrammar::T_AND;
+        case '|': shift(1); return QDeclarativeJSGrammar::T_OR;
+        case '^': shift(1); return QDeclarativeJSGrammar::T_XOR;
+        case '%': shift(1); return QDeclarativeJSGrammar::T_REMAINDER;
+        case '(': shift(1); return QDeclarativeJSGrammar::T_LPAREN;
+        case ')': shift(1); return QDeclarativeJSGrammar::T_RPAREN;
+        case '{': shift(1); return QDeclarativeJSGrammar::T_LBRACE;
+        case '}': shift(1); return QDeclarativeJSGrammar::T_RBRACE;
+        case '[': shift(1); return QDeclarativeJSGrammar::T_LBRACKET;
+        case ']': shift(1); return QDeclarativeJSGrammar::T_RBRACKET;
+        case ';': shift(1); return QDeclarativeJSGrammar::T_SEMICOLON;
+
+        default: return -1;
+    }
+}
+
+ushort Lexer::singleEscape(ushort c) const
+{
+    switch(c) {
+    case 'b':
+        return 0x08;
+    case 't':
+        return 0x09;
+    case 'n':
+        return 0x0A;
+    case 'v':
+        return 0x0B;
+    case 'f':
+        return 0x0C;
+    case 'r':
+        return 0x0D;
+    case '"':
+        return 0x22;
+    case '\'':
+        return 0x27;
+    case '\\':
+        return 0x5C;
+    default:
+        return c;
+    }
+}
+
+ushort Lexer::convertOctal(ushort c1, ushort c2,
+                            ushort c3) const
+{
+    return ((c1 - '0') * 64 + (c2 - '0') * 8 + c3 - '0');
+}
+
+unsigned char Lexer::convertHex(ushort c)
+{
+    if (c >= '0' && c <= '9')
+        return (c - '0');
+    else if (c >= 'a' && c <= 'f')
+        return (c - 'a' + 10);
+    else
+        return (c - 'A' + 10);
+}
+
+unsigned char Lexer::convertHex(ushort c1, ushort c2)
+{
+    return ((convertHex(c1) << 4) + convertHex(c2));
+}
+
+QChar Lexer::convertUnicode(ushort c1, ushort c2,
+                             ushort c3, ushort c4)
+{
+    return QChar((convertHex(c3) << 4) + convertHex(c4),
+                  (convertHex(c1) << 4) + convertHex(c2));
+}
+
+void Lexer::record8(ushort c)
+{
+    Q_ASSERT(c <= 0xff);
+
+    // enlarge buffer if full
+    if (pos8 >= size8 - 1) {
+        char *tmp = new char[2 * size8];
+        memcpy(tmp, buffer8, size8 * sizeof(char));
+        delete [] buffer8;
+        buffer8 = tmp;
+        size8 *= 2;
+    }
+
+    buffer8[pos8++] = (char) c;
+}
+
+void Lexer::record16(QChar c)
+{
+    // enlarge buffer if full
+    if (pos16 >= size16 - 1) {
+        QChar *tmp = new QChar[2 * size16];
+        memcpy(tmp, buffer16, size16 * sizeof(QChar));
+        delete [] buffer16;
+        buffer16 = tmp;
+        size16 *= 2;
+    }
+
+    buffer16[pos16++] = c;
+}
+
+void Lexer::recordStartPos()
+{
+    startpos = pos;
+    startlineno = yylineno;
+    startcolumn = yycolumn;
+}
+
+bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
+{
+    pos16 = 0;
+    bool lastWasEscape = false;
+
+    if (prefix == EqualPrefix)
+        record16(QLatin1Char('='));
+
+    while (1) {
+        if (isLineTerminator() || current == 0) {
+            errmsg = QCoreApplication::translate("QDeclarativeParser", "Unterminated regular expression literal");
+            return false;
+        }
+        else if (current != '/' || lastWasEscape == true)
+            {
+                record16(current);
+                lastWasEscape = !lastWasEscape && (current == '\\');
+            }
+        else {
+            if (driver)
+                pattern = driver->intern(buffer16, pos16);
+            else
+                pattern = 0;
+            pos16 = 0;
+            shift(1);
+            break;
+        }
+        shift(1);
+    }
+
+    flags = 0;
+    while (isIdentLetter(current)) {
+        int flag = Ecma::RegExp::flagFromChar(current);
+        if (flag == 0) {
+            errmsg = QCoreApplication::translate("QDeclarativeParser", "Invalid regular expression flag '%0'")
+                     .arg(QChar(current));
+            return false;
+        }
+        flags |= flag;
+        record16(current);
+        shift(1);
+    }
+
+    return true;
+}
+
+void Lexer::syncProhibitAutomaticSemicolon()
+{
+    if (parenthesesState == BalancedParentheses) {
+        // we have seen something like "if (foo)", which means we should
+        // never insert an automatic semicolon at this point, since it would
+        // then be expanded into an empty statement (ECMA-262 7.9.1)
+        prohibitAutomaticSemicolon = true;
+        parenthesesState = IgnoreParentheses;
+    } else {
+        prohibitAutomaticSemicolon = false;
+    }
+}
+
+QT_QML_END_NAMESPACE
+
+
diff --git a/src/declarative/qml/parser/qdeclarativejslexer_p.h b/src/declarative/qml/parser/qdeclarativejslexer_p.h
new file mode 100644
index 0000000..71bd08c
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejslexer_p.h
@@ -0,0 +1,249 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSLEXER_P_H
+#define QDECLARATIVEJSLEXER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsglobal_p.h"
+
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+class Engine;
+class NameId;
+
+class QML_PARSER_EXPORT Lexer
+{
+public:
+    Lexer(Engine *eng, bool tokenizeComments = false);
+    ~Lexer();
+
+    void setCode(const QString &c, int lineno);
+    int lex();
+
+    int currentLineNo() const { return yylineno; }
+    int currentColumnNo() const { return yycolumn; }
+
+    int tokenOffset() const { return startpos; }
+    int tokenLength() const { return pos - startpos; }
+
+    int startLineNo() const { return startlineno; }
+    int startColumnNo() const { return startcolumn; }
+
+    int endLineNo() const { return currentLineNo(); }
+    int endColumnNo() const
+    { int col = currentColumnNo(); return (col > 0) ? col - 1 : col; }
+
+    bool prevTerminator() const { return terminator; }
+
+    enum State { Start,
+                 Identifier,
+                 InIdentifier,
+                 InSingleLineComment,
+                 InMultiLineComment,
+                 InNum,
+                 InNum0,
+                 InHex,
+                 InOctal,
+                 InDecimal,
+                 InExponentIndicator,
+                 InExponent,
+                 Hex,
+                 Octal,
+                 Number,
+                 String,
+                 Eof,
+                 InString,
+                 InEscapeSequence,
+                 InHexEscape,
+                 InUnicodeEscape,
+                 Other,
+                 Bad };
+
+    enum Error {
+        NoError,
+        IllegalCharacter,
+        UnclosedStringLiteral,
+        IllegalEscapeSequence,
+        IllegalUnicodeEscapeSequence,
+        UnclosedComment,
+        IllegalExponentIndicator,
+        IllegalIdentifier
+    };
+
+    enum ParenthesesState {
+        IgnoreParentheses,
+        CountParentheses,
+        BalancedParentheses
+    };
+
+    enum RegExpBodyPrefix {
+        NoPrefix,
+        EqualPrefix
+    };
+
+    bool scanRegExp(RegExpBodyPrefix prefix = NoPrefix);
+
+    NameId *pattern;
+    int flags;
+
+    State lexerState() const
+        { return state; }
+
+    QString errorMessage() const
+        { return errmsg; }
+    void setErrorMessage(const QString &err)
+        { errmsg = err; }
+    void setErrorMessage(const char *err)
+        { setErrorMessage(QString::fromLatin1(err)); }
+
+    Error error() const
+        { return err; }
+    void clearError()
+        { err = NoError; }
+
+private:
+    Engine *driver;
+    int yylineno;
+    bool done;
+    char *buffer8;
+    QChar *buffer16;
+    uint size8, size16;
+    uint pos8, pos16;
+    bool terminator;
+    bool restrKeyword;
+    // encountered delimiter like "'" and "}" on last run
+    bool delimited;
+    int stackToken;
+
+    State state;
+    void setDone(State s);
+    uint pos;
+    void shift(uint p);
+    int lookupKeyword(const char *);
+
+    bool isWhiteSpace() const;
+    bool isLineTerminator() const;
+    bool isHexDigit(ushort c) const;
+    bool isOctalDigit(ushort c) const;
+
+    int matchPunctuator(ushort c1, ushort c2,
+                         ushort c3, ushort c4);
+    ushort singleEscape(ushort c) const;
+    ushort convertOctal(ushort c1, ushort c2,
+                         ushort c3) const;
+public:
+    static unsigned char convertHex(ushort c1);
+    static unsigned char convertHex(ushort c1, ushort c2);
+    static QChar convertUnicode(ushort c1, ushort c2,
+                                 ushort c3, ushort c4);
+    static bool isIdentLetter(ushort c);
+    static bool isDecimalDigit(ushort c);
+
+    inline int ival() const { return qsyylval.ival; }
+    inline double dval() const { return qsyylval.dval; }
+    inline NameId *ustr() const { return qsyylval.ustr; }
+
+    const QChar *characterBuffer() const { return buffer16; }
+    int characterCount() const { return pos16; }
+
+private:
+    void record8(ushort c);
+    void record16(QChar c);
+    void recordStartPos();
+
+    int findReservedWord(const QChar *buffer, int size) const;
+
+    void syncProhibitAutomaticSemicolon();
+
+    const QChar *code;
+    uint length;
+    int yycolumn;
+    int startpos;
+    int startlineno;
+    int startcolumn;
+    int bol;     // begin of line
+
+    union {
+        int ival;
+        double dval;
+        NameId *ustr;
+    } qsyylval;
+
+    // current and following unicode characters
+    ushort current, next1, next2, next3;
+
+    struct keyword {
+        const char *name;
+        int token;
+    };
+
+    QString errmsg;
+    Error err;
+
+    bool wantRx;
+    bool check_reserved;
+
+    ParenthesesState parenthesesState;
+    int parenthesesCount;
+    bool prohibitAutomaticSemicolon;
+    bool tokenizeComments;
+};
+
+} // namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h b/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h
new file mode 100644
index 0000000..c8d52d0
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSMEMORYPOOL_P_H
+#define QDECLARATIVEJSMEMORYPOOL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsglobal_p.h"
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qshareddata.h>
+
+#include <string.h>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+class QML_PARSER_EXPORT MemoryPool : public QSharedData
+{
+public:
+    enum { maxBlockCount = -1 };
+    enum { defaultBlockSize = 1 << 12 };
+
+    MemoryPool() {
+        m_blockIndex = maxBlockCount;
+        m_currentIndex = 0;
+        m_storage = 0;
+        m_currentBlock = 0;
+        m_currentBlockSize = 0;
+    }
+
+    virtual ~MemoryPool() {
+        for (int index = 0; index < m_blockIndex + 1; ++index)
+            qFree(m_storage[index]);
+
+        qFree(m_storage);
+    }
+
+    char *allocate(int bytes) {
+        bytes += (8 - bytes) & 7; // ensure multiple of 8 bytes (maintain alignment)
+        if (m_currentBlock == 0 || m_currentBlockSize < m_currentIndex + bytes) {
+            ++m_blockIndex;
+            m_currentBlockSize = defaultBlockSize << m_blockIndex;
+
+            m_storage = reinterpret_cast<char**>(qRealloc(m_storage, sizeof(char*) * (1 + m_blockIndex)));
+            m_currentBlock = m_storage[m_blockIndex] = reinterpret_cast<char*>(qMalloc(m_currentBlockSize));
+            ::memset(m_currentBlock, 0, m_currentBlockSize);
+
+            m_currentIndex = (8 - quintptr(m_currentBlock)) & 7; // ensure first chunk is 64-bit aligned
+            Q_ASSERT(m_currentIndex + bytes <= m_currentBlockSize);
+        }
+
+        char *p = reinterpret_cast<char *>
+            (m_currentBlock + m_currentIndex);
+
+        m_currentIndex += bytes;
+
+        return p;
+    }
+
+    int bytesAllocated() const {
+        int bytes = 0;
+        for (int index = 0; index < m_blockIndex; ++index)
+            bytes += (defaultBlockSize << index);
+        bytes += m_currentIndex;
+        return bytes;
+    }
+
+private:
+    int m_blockIndex;
+    int m_currentIndex;
+    char *m_currentBlock;
+    int m_currentBlockSize;
+    char **m_storage;
+
+private:
+    Q_DISABLE_COPY(MemoryPool)
+};
+
+} // namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/src/declarative/qml/parser/qdeclarativejsnodepool_p.h b/src/declarative/qml/parser/qdeclarativejsnodepool_p.h
new file mode 100644
index 0000000..94637fd
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsnodepool_p.h
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSNODEPOOL_P_H
+#define QDECLARATIVEJSNODEPOOL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsmemorypool_p.h"
+
+#include <QtCore/QHash>
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+namespace AST {
+class Node;
+} // namespace AST
+
+class Code;
+class CompilationUnit;
+class Engine;
+
+template <typename NodeType>
+inline NodeType *makeAstNode(MemoryPool *storage)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType();
+    return node;
+}
+
+template <typename NodeType, typename Arg1>
+inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1);
+    return node;
+}
+
+template <typename NodeType, typename Arg1, typename Arg2>
+inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1, arg2);
+    return node;
+}
+
+template <typename NodeType, typename Arg1, typename Arg2, typename Arg3>
+inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2, Arg3 arg3)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1, arg2, arg3);
+    return node;
+}
+
+template <typename NodeType, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1, arg2, arg3, arg4);
+    return node;
+}
+
+class QML_PARSER_EXPORT NodePool : public MemoryPool
+{
+public:
+    NodePool(const QString &fileName, Engine *engine);
+    virtual ~NodePool();
+
+    Code *createCompiledCode(AST::Node *node, CompilationUnit &compilation);
+
+    inline QString fileName() const { return m_fileName; }
+    inline Engine *engine() const { return m_engine; }
+#ifndef J_SCRIPT_NO_EVENT_NOTIFY
+    inline qint64 id() const { return m_id; }
+#endif
+
+private:
+    QHash<AST::Node*, Code*> m_codeCache;
+    QString m_fileName;
+    Engine *m_engine;
+#ifndef J_SCRIPT_NO_EVENT_NOTIFY
+    qint64 m_id;
+#endif
+
+private:
+    Q_DISABLE_COPY(NodePool)
+};
+
+} // namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp
new file mode 100644
index 0000000..4aa4960
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp
@@ -0,0 +1,1843 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QtDebug>
+#include <QtGui/QApplication>
+
+#include <string.h>
+
+#include "qdeclarativejsengine_p.h"
+#include "qdeclarativejslexer_p.h"
+#include "qdeclarativejsast_p.h"
+#include "qdeclarativejsnodepool_p.h"
+
+
+
+#include "qdeclarativejsparser_p.h"
+#include <QVarLengthArray>
+
+//
+// This file is automatically generated from qmljs.g.
+// Changes will be lost.
+//
+
+using namespace QDeclarativeJS;
+
+QT_QML_BEGIN_NAMESPACE
+
+void Parser::reallocateStack()
+{
+    if (! stack_size)
+        stack_size = 128;
+    else
+        stack_size <<= 1;
+
+    sym_stack = reinterpret_cast<Value*> (qRealloc(sym_stack, stack_size * sizeof(Value)));
+    state_stack = reinterpret_cast<int*> (qRealloc(state_stack, stack_size * sizeof(int)));
+    location_stack = reinterpret_cast<AST::SourceLocation*> (qRealloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
+}
+
+inline static bool automatic(Engine *driver, int token)
+{
+    return token == QDeclarativeJSGrammar::T_RBRACE
+        || token == 0
+        || driver->lexer()->prevTerminator();
+}
+
+
+Parser::Parser(Engine *engine):
+    driver(engine),
+    tos(0),
+    stack_size(0),
+    sym_stack(0),
+    state_stack(0),
+    location_stack(0),
+    first_token(0),
+    last_token(0)
+{
+}
+
+Parser::~Parser()
+{
+    if (stack_size) {
+        qFree(sym_stack);
+        qFree(state_stack);
+        qFree(location_stack);
+    }
+}
+
+static inline AST::SourceLocation location(Lexer *lexer)
+{
+    AST::SourceLocation loc;
+    loc.offset = lexer->tokenOffset();
+    loc.length = lexer->tokenLength();
+    loc.startLine = lexer->startLineNo();
+    loc.startColumn = lexer->startColumnNo();
+    return loc;
+}
+
+AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
+{
+    QVarLengthArray<NameId *, 4> nameIds;
+    QVarLengthArray<AST::SourceLocation, 4> locations;
+
+    AST::ExpressionNode *it = expr;
+    while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
+        nameIds.append(m->name);
+        locations.append(m->identifierToken);
+        it = m->base;
+    }
+
+    if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
+        AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
+        q->identifierToken = idExpr->identifierToken;
+
+        AST::UiQualifiedId *currentId = q;
+        for (int i = nameIds.size() - 1; i != -1; --i) {
+            currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
+            currentId->identifierToken = locations[i];
+        }
+
+        return currentId->finish();
+    }
+
+    return 0;
+}
+
+bool Parser::parse(int startToken)
+{
+    Lexer *lexer = driver->lexer();
+    bool hadErrors = false;
+    int yytoken = -1;
+    int action = 0;
+
+    token_buffer[0].token = startToken;
+    first_token = &token_buffer[0];
+    last_token = &token_buffer[1];
+
+    tos = -1;
+    program = 0;
+
+    do {
+        if (++tos == stack_size)
+            reallocateStack();
+
+        state_stack[tos] = action;
+
+    _Lcheck_token:
+        if (yytoken == -1 && -TERMINAL_COUNT != action_index[action]) {
+            yyprevlloc = yylloc;
+
+            if (first_token == last_token) {
+                yytoken = lexer->lex();
+                yylval = lexer->dval();
+                yylloc = location(lexer);
+            } else {
+                yytoken = first_token->token;
+                yylval = first_token->dval;
+                yylloc = first_token->loc;
+                ++first_token;
+            }
+        }
+
+        action = t_action(action, yytoken);
+        if (action > 0) {
+            if (action != ACCEPT_STATE) {
+                yytoken = -1;
+                sym(1).dval = yylval;
+                loc(1) = yylloc;
+            } else {
+              --tos;
+              return ! hadErrors;
+            }
+        } else if (action < 0) {
+          const int r = -action - 1;
+          tos -= rhs[r];
+
+          switch (r) {
+
+case 0: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 1: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 2: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 3: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 4: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 5: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 6: {
+  sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
+        sym(2).UiObjectMemberList->finish());
+} break;
+
+case 8: {
+    sym(1).Node = sym(1).UiImportList->finish();
+} break;
+
+case 9: {
+    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport);
+} break;
+
+case 10: {
+    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(),
+        sym(1).UiImportList, sym(2).UiImport);
+} break;
+
+case 13: {
+    sym(1).UiImport->semicolonToken = loc(2);
+} break;
+
+case 15: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->semicolonToken = loc(3);
+} break;
+
+case 17: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->asToken = loc(3);
+    sym(1).UiImport->importIdToken = loc(4);
+    sym(1).UiImport->importId = sym(4).sval;
+    sym(1).UiImport->semicolonToken = loc(5);
+} break;
+
+case 19: {
+    sym(1).UiImport->asToken = loc(2);
+    sym(1).UiImport->importIdToken = loc(3);
+    sym(1).UiImport->importId = sym(3).sval;
+    sym(1).UiImport->semicolonToken = loc(4);
+} break;
+
+case 20: {
+    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;
+
+case 21: {
+    sym(1).Node = 0;
+} break;
+
+case 22: {
+    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+
+case 23: {
+    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+
+case 24: {
+    AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
+        sym(1).UiObjectMemberList, sym(2).UiObjectMember);
+    sym(1).Node = node;
+} break;
+
+case 25: {
+    sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+
+case 26: {
+    AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(),
+        sym(1).UiArrayMemberList, sym(3).UiObjectMember);
+    node->commaToken = loc(2);
+    sym(1).Node = node;
+} break;
+
+case 27: {
+    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 28: {
+    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 29: {
+    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
+        sym(2).UiObjectInitializer);
+    sym(1).Node = node;
+}   break;
+
+case 31: {
+    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+        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 32: {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(1).UiQualifiedId, sym(3).UiQualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+} break;
+case 33:case 34:case 35:case 36:
+{
+    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId, sym(3).Statement);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+}   break;
+
+case 37:
+
+case 38: {
+    sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+    break;
+}
+
+case 40: {
+  sym(1).Node = 0;
+} break;
+
+case 41: {
+  sym(1).Node = sym(1).UiParameterList->finish ();
+} break;
+
+case 42: {
+  AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
+  node->identifierToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 43: {
+  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 45: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
+    node->type = AST::UiPublicMember::Signal;
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(2);
+    node->parameters = sym(4).UiParameterList;
+    node->semicolonToken = loc(6);
+    sym(1).Node = node;
+}   break;
+
+case 47: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
+    node->type = AST::UiPublicMember::Signal;
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(2);
+    node->semicolonToken = loc(3);
+    sym(1).Node = node;
+}   break;
+
+case 49: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
+    node->typeModifier = sym(2).sval;
+    node->propertyToken = loc(1);
+    node->typeModifierToken = loc(2);
+    node->typeToken = loc(4);
+    node->identifierToken = loc(6);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+
+case 51: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->semicolonToken = loc(4);
+    sym(1).Node = node;
+}   break;
+
+case 53: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
+    node->isDefaultMember = true;
+    node->defaultToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->semicolonToken = loc(5);
+    sym(1).Node = node;
+}   break;
+
+case 55: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
+        sym(5).Expression);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->colonToken = loc(4);
+    node->semicolonToken = loc(6);
+    sym(1).Node = node;
+}   break;
+
+case 57: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
+        sym(6).Expression);
+    node->isReadonlyMember = true;
+    node->readonlyToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->colonToken = loc(5);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+
+case 59: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
+        sym(6).Expression);
+    node->isDefaultMember = true;
+    node->defaultToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->colonToken = loc(5);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+
+case 60: {
+    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
+}   break;
+
+case 61: {
+    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
+}   break;
+
+case 63: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_PROPERTY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+
+case 64: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_SIGNAL]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+
+case 65: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_READONLY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+
+case 66: {
+  AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
+  node->thisToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 67: {
+  AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 68: {
+  AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
+  node->nullToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 69: {
+  AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
+  node->trueToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 70: {
+  AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
+  node->falseToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 71: {
+  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+case 72:
+case 73: {
+  AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 74: {
+  bool rx = lexer->scanRegExp(Lexer::NoPrefix);
+  if (!rx) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+    return false; // ### remove me
+  }
+  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 75: {
+  bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
+  if (!rx) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+    return false;
+  }
+  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 76: {
+  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 77: {
+  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 78: {
+  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 79: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 80: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    sym(4).Elision->finish());
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(5);
+  sym(1).Node = node;
+} break;
+
+case 81: {
+  AST::ObjectLiteral *node = 0;
+  if (sym(2).Node)
+    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
+        sym(2).PropertyNameAndValueList->finish ());
+  else
+    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
+  node->lbraceToken = loc(1);
+  node->lbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 82: {
+  AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
+    sym(2).PropertyNameAndValueList->finish ());
+  node->lbraceToken = loc(1);
+  node->lbraceToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 83: {
+  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 84: {
+  if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
+      QLatin1String("Ignored annotation")));
+
+    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;
+
+case 85: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
+} break;
+
+case 86: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
+} break;
+
+case 87: {
+  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 88: {
+  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 89: {
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
+  node->commaToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 90: {
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 91: {
+  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
+      sym(1).PropertyName, sym(3).Expression);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 92: {
+  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
+      sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
+  node->commaToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 93: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+case 94:
+case 95: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 96: {
+  AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 97: {
+  AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 98: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 99:
+
+case 100:
+
+case 101:
+
+case 102:
+
+case 103:
+
+case 104:
+
+case 105:
+
+case 106:
+
+case 107:
+
+case 108:
+
+case 109:
+
+case 110:
+
+case 111:
+
+case 112:
+
+case 113:
+
+case 114:
+
+case 115:
+
+case 116:
+
+case 117:
+
+case 118:
+
+case 119:
+
+case 120:
+
+case 121:
+
+case 122:
+
+case 123:
+
+case 124:
+
+case 125:
+
+case 126:
+
+case 127:
+
+case 128:
+
+case 129:
+{
+  sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+} break;
+
+case 134: {
+  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 135: {
+  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 136: {
+  AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
+  node->newToken = loc(1);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  sym(1).Node = node;
+} break;
+
+case 138: {
+  AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
+  node->newToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 139: {
+  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 140: {
+  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 141: {
+  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 142: {
+  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 143: {
+  sym(1).Node = 0;
+} break;
+
+case 144: {
+  sym(1).Node = sym(1).ArgumentList->finish();
+} break;
+
+case 145: {
+  sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
+} break;
+
+case 146: {
+  AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 150: {
+  AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
+  node->incrementToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 151: {
+  AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
+  node->decrementToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 153: {
+  AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
+  node->deleteToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 154: {
+  AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
+  node->voidToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 155: {
+  AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
+  node->typeofToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 156: {
+  AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
+  node->incrementToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 157: {
+  AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
+  node->decrementToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 158: {
+  AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
+  node->plusToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 159: {
+  AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
+  node->minusToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 160: {
+  AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
+  node->tildeToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 161: {
+  AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
+  node->notToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 163: {
+  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 164: {
+  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 165: {
+  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 167: {
+  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 168: {
+  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 170: {
+  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 171: {
+  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 172: {
+  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 174: {
+  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 175: {
+  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 176: {
+  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 177: {
+  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 178: {
+  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 179: {
+  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 181: {
+  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 182: {
+  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 183: {
+  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 184: {
+  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 185: {
+  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: {
+  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 188: {
+  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 189: {
+  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 190: {
+  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 192: {
+  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 193: {
+  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 194: {
+  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 195: {
+  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 197: {
+  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 199: {
+  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 201: {
+  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 203: {
+  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 205: {
+  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 207: {
+  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 209: {
+  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 211: {
+  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 213: {
+  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 215: {
+  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 217: {
+  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
+    sym(3).Expression, sym(5).Expression);
+  node->questionToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 219: {
+  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
+    sym(3).Expression, sym(5).Expression);
+  node->questionToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 221: {
+  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 223: {
+  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 224: {
+  sym(1).ival = QSOperator::Assign;
+} break;
+
+case 225: {
+  sym(1).ival = QSOperator::InplaceMul;
+} break;
+
+case 226: {
+  sym(1).ival = QSOperator::InplaceDiv;
+} break;
+
+case 227: {
+  sym(1).ival = QSOperator::InplaceMod;
+} break;
+
+case 228: {
+  sym(1).ival = QSOperator::InplaceAdd;
+} break;
+
+case 229: {
+  sym(1).ival = QSOperator::InplaceSub;
+} break;
+
+case 230: {
+  sym(1).ival = QSOperator::InplaceLeftShift;
+} break;
+
+case 231: {
+  sym(1).ival = QSOperator::InplaceRightShift;
+} break;
+
+case 232: {
+  sym(1).ival = QSOperator::InplaceURightShift;
+} break;
+
+case 233: {
+  sym(1).ival = QSOperator::InplaceAnd;
+} break;
+
+case 234: {
+  sym(1).ival = QSOperator::InplaceXor;
+} break;
+
+case 235: {
+  sym(1).ival = QSOperator::InplaceOr;
+} break;
+
+case 237: {
+  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 238: {
+  sym(1).Node = 0;
+} break;
+
+case 241: {
+  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 242: {
+  sym(1).Node = 0;
+} break;
+
+case 259: {
+  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 260: {
+  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
+} break;
+
+case 261: {
+  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
+} break;
+
+case 262: {
+  sym(1).Node = 0;
+} break;
+
+case 263: {
+  sym(1).Node = sym(1).StatementList->finish ();
+} break;
+
+case 265: {
+  AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
+     sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
+  node->declarationKindToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 266: {
+  sym(1).ival = T_CONST;
+} break;
+
+case 267: {
+  sym(1).ival = T_VAR;
+} break;
+
+case 268: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
+} break;
+
+case 269: {
+  AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
+    sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 270: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
+} break;
+
+case 271: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
+} break;
+
+case 272: {
+  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 273: {
+  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 274: {
+  // ### TODO: AST for initializer
+  sym(1) = sym(2);
+} break;
+
+case 275: {
+  sym(1).Node = 0;
+} break;
+
+case 277: {
+  // ### TODO: AST for initializer
+  sym(1) = sym(2);
+} break;
+
+case 278: {
+  sym(1).Node = 0;
+} break;
+
+case 280: {
+  AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
+  node->semicolonToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 282: {
+  AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 283: {
+  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);
+  node->rparenToken = loc(4);
+  node->elseToken = loc(5);
+  sym(1).Node = node;
+} break;
+
+case 284: {
+  AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->ifToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 286: {
+  AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
+  node->doToken = loc(1);
+  node->whileToken = loc(3);
+  node->lparenToken = loc(4);
+  node->rparenToken = loc(6);
+  node->semicolonToken = loc(7);
+  sym(1).Node = node;
+} break;
+
+case 287: {
+  AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->whileToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 288: {
+  AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
+    sym(5).Expression, sym(7).Expression, sym(9).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->firstSemicolonToken = loc(4);
+  node->secondSemicolonToken = loc(6);
+  node->rparenToken = loc(8);
+  sym(1).Node = node;
+} break;
+
+case 289: {
+  AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
+     sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
+     sym(8).Expression, sym(10).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->varToken = loc(3);
+  node->firstSemicolonToken = loc(5);
+  node->secondSemicolonToken = loc(7);
+  node->rparenToken = loc(9);
+  sym(1).Node = node;
+} break;
+
+case 290: {
+  AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
+    sym(5).Expression, sym(7).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->inToken = loc(4);
+  node->rparenToken = loc(6);
+  sym(1).Node = node;
+} break;
+
+case 291: {
+  AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
+    sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->varToken = loc(3);
+  node->inToken = loc(5);
+  node->rparenToken = loc(7);
+  sym(1).Node = node;
+} break;
+
+case 293: {
+  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
+  node->continueToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 295: {
+  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
+  node->continueToken = loc(1);
+  node->identifierToken = loc(2);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 297: {
+  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
+  node->breakToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 299: {
+  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
+  node->breakToken = loc(1);
+  node->identifierToken = loc(2);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 301: {
+  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 302: {
+  AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->withToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 303: {
+  AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
+  node->switchToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 304: {
+  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 305: {
+  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 306: {
+  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
+} break;
+
+case 307: {
+  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
+} break;
+
+case 308: {
+  sym(1).Node = 0;
+} break;
+
+case 309: {
+  sym(1).Node = sym(1).CaseClauses->finish ();
+} break;
+
+case 310: {
+  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 311: {
+  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 312:
+case 313: {
+  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 314: {
+  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 316: {
+  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 317: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 318: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 319: {
+  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 320: {
+  AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
+  node->catchToken = loc(1);
+  node->lparenToken = loc(2);
+  node->identifierToken = loc(3);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 321: {
+  AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
+  node->finallyToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 323: {
+  AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
+  node->debuggerToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 324: {
+  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);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  node->lbraceToken = loc(6);
+  node->rbraceToken = loc(8);
+  sym(1).Node = node;
+} break;
+
+case 325: {
+  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)
+      node->identifierToken = loc(2);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  node->lbraceToken = loc(6);
+  node->rbraceToken = loc(8);
+  sym(1).Node = node;
+} break;
+
+case 326: {
+  AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 327: {
+  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 328: {
+  sym(1).Node = 0;
+} break;
+
+case 329: {
+  sym(1).Node = sym(1).FormalParameterList->finish ();
+} break;
+
+case 330: {
+  sym(1).Node = 0;
+} break;
+
+case 332: {
+  sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+
+case 333: {
+  sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+
+case 334: {
+  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
+} break;
+
+case 335: {
+  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
+} break;
+
+case 336: {
+  sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
+} break;
+
+case 337: {
+  sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
+} break;
+
+case 338: {
+  sym(1).sval = 0;
+} break;
+
+case 340: {
+  sym(1).Node = 0;
+} break;
+
+            } // switch
+            action = nt_action(state_stack[tos], lhs[r] - TERMINAL_COUNT);
+        } // if
+    } while (action != 0);
+
+    if (first_token == last_token) {
+        const int errorState = state_stack[tos];
+
+        // automatic insertion of `;'
+        if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
+            SavedToken &tk = token_buffer[0];
+            tk.token = yytoken;
+            tk.dval = yylval;
+            tk.loc = yylloc;
+
+            yylloc = yyprevlloc;
+            yylloc.offset += yylloc.length;
+            yylloc.startColumn += yylloc.length;
+            yylloc.length = 0;
+
+            //const QString msg = qApp->translate("QDeclarativeParser", "Missing `;'");
+            //diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, yylloc, msg));
+
+            first_token = &token_buffer[0];
+            last_token = &token_buffer[1];
+
+            yytoken = T_SEMICOLON;
+            yylval = 0;
+
+            action = errorState;
+
+            goto _Lcheck_token;
+        }
+
+        hadErrors = true;
+
+        token_buffer[0].token = yytoken;
+        token_buffer[0].dval = yylval;
+        token_buffer[0].loc = yylloc;
+
+        token_buffer[1].token = yytoken = lexer->lex();
+        token_buffer[1].dval  = yylval  = lexer->dval();
+        token_buffer[1].loc   = yylloc  = location(lexer);
+
+        if (t_action(errorState, yytoken)) {
+            QString msg;
+            int token = token_buffer[0].token;
+            if (token < 0 || token >= TERMINAL_COUNT)
+                msg = qApp->translate("QDeclarativeParser", "Syntax error");
+            else
+                msg = qApp->translate("QDeclarativeParser", "Unexpected token `%1'").arg(QLatin1String(spell[token]));
+            diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+            action = errorState;
+            goto _Lcheck_token;
+        }
+
+        static int tokens[] = {
+            T_PLUS,
+            T_EQ,
+
+            T_COMMA,
+            T_COLON,
+            T_SEMICOLON,
+
+            T_RPAREN, T_RBRACKET, T_RBRACE,
+
+            T_NUMERIC_LITERAL,
+            T_IDENTIFIER,
+
+            T_LPAREN, T_LBRACKET, T_LBRACE,
+
+            EOF_SYMBOL
+        };
+
+        for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) {
+            int a = t_action(errorState, *tk);
+            if (a > 0 && t_action(a, yytoken)) {
+                const QString msg = qApp->translate("QDeclarativeParser", "Expected token `%1'").arg(QLatin1String(spell[*tk]));
+                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+                yytoken = *tk;
+                yylval = 0;
+                yylloc = token_buffer[0].loc;
+                yylloc.length = 0;
+
+                first_token = &token_buffer[0];
+                last_token = &token_buffer[2];
+
+                action = errorState;
+                goto _Lcheck_token;
+            }
+        }
+
+        for (int tk = 1; tk < TERMINAL_COUNT; ++tk) {
+            if (tk == T_AUTOMATIC_SEMICOLON || tk == T_FEED_UI_PROGRAM    ||
+                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION ||
+                tk == T_FEED_JS_SOURCE_ELEMENT)
+               continue;
+
+            int a = t_action(errorState, tk);
+            if (a > 0 && t_action(a, yytoken)) {
+                const QString msg = qApp->translate("QDeclarativeParser", "Expected token `%1'").arg(QLatin1String(spell[tk]));
+                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+                yytoken = tk;
+                yylval = 0;
+                yylloc = token_buffer[0].loc;
+                yylloc.length = 0;
+
+                action = errorState;
+                goto _Lcheck_token;
+            }
+        }
+
+        const QString msg = qApp->translate("QDeclarativeParser", "Syntax error");
+        diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+    }
+
+    return false;
+}
+
+QT_QML_END_NAMESPACE
+
+
diff --git a/src/declarative/qml/parser/qdeclarativejsparser_p.h b/src/declarative/qml/parser/qdeclarativejsparser_p.h
new file mode 100644
index 0000000..c7e097a
--- /dev/null
+++ b/src/declarative/qml/parser/qdeclarativejsparser_p.h
@@ -0,0 +1,246 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+//
+// This file is automatically generated from qmljs.g.
+// Changes will be lost.
+//
+
+#ifndef QDECLARATIVEJSPARSER_P_H
+#define QDECLARATIVEJSPARSER_P_H
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsgrammar_p.h"
+#include "qdeclarativejsast_p.h"
+#include "qdeclarativejsengine_p.h"
+
+#include <QtCore/QList>
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+class Engine;
+class NameId;
+
+class QML_PARSER_EXPORT Parser: protected QDeclarativeJSGrammar
+{
+public:
+    union Value {
+      int ival;
+      double dval;
+      NameId *sval;
+      AST::ArgumentList *ArgumentList;
+      AST::CaseBlock *CaseBlock;
+      AST::CaseClause *CaseClause;
+      AST::CaseClauses *CaseClauses;
+      AST::Catch *Catch;
+      AST::DefaultClause *DefaultClause;
+      AST::ElementList *ElementList;
+      AST::Elision *Elision;
+      AST::ExpressionNode *Expression;
+      AST::Finally *Finally;
+      AST::FormalParameterList *FormalParameterList;
+      AST::FunctionBody *FunctionBody;
+      AST::FunctionDeclaration *FunctionDeclaration;
+      AST::Node *Node;
+      AST::PropertyName *PropertyName;
+      AST::PropertyNameAndValueList *PropertyNameAndValueList;
+      AST::SourceElement *SourceElement;
+      AST::SourceElements *SourceElements;
+      AST::Statement *Statement;
+      AST::StatementList *StatementList;
+      AST::Block *Block;
+      AST::VariableDeclaration *VariableDeclaration;
+      AST::VariableDeclarationList *VariableDeclarationList;
+
+      AST::UiProgram *UiProgram;
+      AST::UiImportList *UiImportList;
+      AST::UiImport *UiImport;
+      AST::UiParameterList *UiParameterList;
+      AST::UiPublicMember *UiPublicMember;
+      AST::UiObjectDefinition *UiObjectDefinition;
+      AST::UiObjectInitializer *UiObjectInitializer;
+      AST::UiObjectBinding *UiObjectBinding;
+      AST::UiScriptBinding *UiScriptBinding;
+      AST::UiArrayBinding *UiArrayBinding;
+      AST::UiObjectMember *UiObjectMember;
+      AST::UiObjectMemberList *UiObjectMemberList;
+      AST::UiArrayMemberList *UiArrayMemberList;
+      AST::UiQualifiedId *UiQualifiedId;
+      AST::UiSignature *UiSignature;
+      AST::UiFormalList *UiFormalList;
+      AST::UiFormal *UiFormal;
+    };
+
+public:
+    Parser(Engine *engine);
+    ~Parser();
+
+    // parse a UI program
+    bool parse() { return parse(T_FEED_UI_PROGRAM); }
+    bool parseStatement() { return parse(T_FEED_JS_STATEMENT); }
+    bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
+    bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
+    bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
+    bool parseProgram() { return parse(T_FEED_JS_PROGRAM); }
+
+    AST::UiProgram *ast() const
+    { return AST::cast<AST::UiProgram *>(program); }
+
+    AST::Statement *statement() const
+    {
+        if (! program)
+            return 0;
+
+        return program->statementCast();
+    }
+
+    AST::ExpressionNode *expression() const
+    {
+        if (! program)
+            return 0;
+
+        return program->expressionCast();
+    }
+
+    AST::UiObjectMember *uiObjectMember() const
+    {
+        if (! program)
+            return 0;
+
+        return program->uiObjectMemberCast();
+    }
+
+    AST::Node *rootNode() const
+    { return program; }
+
+    QList<DiagnosticMessage> diagnosticMessages() const
+    { return diagnostic_messages; }
+
+    inline DiagnosticMessage diagnosticMessage() const
+    {
+        foreach (const DiagnosticMessage &d, diagnostic_messages) {
+            if (! d.kind == DiagnosticMessage::Warning)
+                return d;
+        }
+
+        return DiagnosticMessage();
+    }
+
+    inline QString errorMessage() const
+    { return diagnosticMessage().message; }
+
+    inline int errorLineNumber() const
+    { return diagnosticMessage().loc.startLine; }
+
+    inline int errorColumnNumber() const
+    { return diagnosticMessage().loc.startColumn; }
+
+protected:
+    bool parse(int startToken);
+
+    void reallocateStack();
+
+    inline Value &sym(int index)
+    { return sym_stack [tos + index - 1]; }
+
+    inline AST::SourceLocation &loc(int index)
+    { return location_stack [tos + index - 1]; }
+
+    AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
+
+protected:
+    Engine *driver;
+    int tos;
+    int stack_size;
+    Value *sym_stack;
+    int *state_stack;
+    AST::SourceLocation *location_stack;
+
+    AST::Node *program;
+
+    // error recovery
+    enum { TOKEN_BUFFER_SIZE = 3 };
+
+    struct SavedToken {
+       int token;
+       double dval;
+       AST::SourceLocation loc;
+    };
+
+    double yylval;
+    AST::SourceLocation yylloc;
+    AST::SourceLocation yyprevlloc;
+
+    SavedToken token_buffer[TOKEN_BUFFER_SIZE];
+    SavedToken *first_token;
+    SavedToken *last_token;
+
+    QList<DiagnosticMessage> diagnostic_messages;
+};
+
+} // end of namespace QDeclarativeJS
+
+
+
+#define J_SCRIPT_REGEXPLITERAL_RULE1 74
+
+#define J_SCRIPT_REGEXPLITERAL_RULE2 75
+
+QT_QML_END_NAMESPACE
+
+
+
+#endif // QDECLARATIVEJSPARSER_P_H
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g
deleted file mode 100644
index 90949d5..0000000
--- a/src/declarative/qml/parser/qmljs.g
+++ /dev/null
@@ -1,3075 +0,0 @@
-----------------------------------------------------------------------------
---
--- Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
--- All rights reserved.
--- Contact: Nokia Corporation (qt-info@nokia.com)
---
--- This file is part of the QtDeclarative module of the Qt Toolkit.
---
--- $QT_BEGIN_LICENSE:LGPL-ONLY$
--- GNU Lesser General Public License Usage
--- This file may be used under the terms of the GNU Lesser
--- General Public License version 2.1 as published by the Free Software
--- Foundation and appearing in the file LICENSE.LGPL included in the
--- packaging of this file.  Please review the following information to
--- ensure the GNU Lesser General Public License version 2.1 requirements
--- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
---
--- If you have questions regarding the use of this file, please contact
--- Nokia at qt-info@nokia.com.
--- $QT_END_LICENSE$
---
-----------------------------------------------------------------------------
-
-%parser         QmlJSGrammar
-%decl           qmljsparser_p.h
-%impl           qmljsparser.cpp
-%expect         2
-%expect-rr      2
-
-%token T_AND "&"                T_AND_AND "&&"              T_AND_EQ "&="
-%token T_BREAK "break"          T_CASE "case"               T_CATCH "catch"
-%token T_COLON ":"              T_COMMA ";"                 T_CONTINUE "continue"
-%token T_DEFAULT "default"      T_DELETE "delete"           T_DIVIDE_ "/"
-%token T_DIVIDE_EQ "/="         T_DO "do"                   T_DOT "."
-%token T_ELSE "else"            T_EQ "="                    T_EQ_EQ "=="
-%token T_EQ_EQ_EQ "==="         T_FINALLY "finally"         T_FOR "for"
-%token T_FUNCTION "function"    T_GE ">="                   T_GT ">"
-%token T_GT_GT ">>"             T_GT_GT_EQ ">>="            T_GT_GT_GT ">>>"
-%token T_GT_GT_GT_EQ ">>>="     T_IDENTIFIER "identifier"   T_IF "if"
-%token T_IN "in"                T_INSTANCEOF "instanceof"   T_LBRACE "{"
-%token T_LBRACKET "["           T_LE "<="                   T_LPAREN "("
-%token T_LT "<"                 T_LT_LT "<<"                T_LT_LT_EQ "<<="
-%token T_MINUS "-"              T_MINUS_EQ "-="             T_MINUS_MINUS "--"
-%token T_NEW "new"              T_NOT "!"                   T_NOT_EQ "!="
-%token T_NOT_EQ_EQ "!=="        T_NUMERIC_LITERAL "numeric literal"     T_OR "|"
-%token T_OR_EQ "|="             T_OR_OR "||"                T_PLUS "+"
-%token T_PLUS_EQ "+="           T_PLUS_PLUS "++"            T_QUESTION "?"
-%token T_RBRACE "}"             T_RBRACKET "]"              T_REMAINDER "%"
-%token T_REMAINDER_EQ "%="      T_RETURN "return"           T_RPAREN ")"
-%token T_SEMICOLON ";"          T_AUTOMATIC_SEMICOLON       T_STAR "*"
-%token T_STAR_EQ "*="           T_STRING_LITERAL "string literal"
-%token T_PROPERTY "property"    T_SIGNAL "signal"           T_READONLY "readonly"
-%token T_SWITCH "switch"        T_THIS "this"               T_THROW "throw"
-%token T_TILDE "~"              T_TRY "try"                 T_TYPEOF "typeof"
-%token T_VAR "var"              T_VOID "void"               T_WHILE "while"
-%token T_WITH "with"            T_XOR "^"                   T_XOR_EQ "^="
-%token T_NULL "null"            T_TRUE "true"               T_FALSE "false"
-%token T_CONST "const"
-%token T_DEBUGGER "debugger"
-%token T_RESERVED_WORD "reserved word"
-%token T_MULTILINE_STRING_LITERAL "multiline string literal"
-%token T_COMMENT "comment"
-
---- context keywords.
-%token T_PUBLIC "public"
-%token T_IMPORT "import"
-%token T_AS "as"
-
---- feed tokens
-%token T_FEED_UI_PROGRAM
-%token T_FEED_UI_OBJECT_MEMBER
-%token T_FEED_JS_STATEMENT
-%token T_FEED_JS_EXPRESSION
-%token T_FEED_JS_SOURCE_ELEMENT
-%token T_FEED_JS_PROGRAM
-
-%nonassoc SHIFT_THERE
-%nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY T_READONLY
-%nonassoc REDUCE_HERE
-
-%start TopLevel
-
-/./****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QtDebug>
-#include <QtGui/QApplication>
-
-#include <string.h>
-
-#include "qmljsengine_p.h"
-#include "qmljslexer_p.h"
-#include "qmljsast_p.h"
-#include "qmljsnodepool_p.h"
-
-./
-
-/:/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-//
-// This file is automatically generated from qmljs.g.
-// Changes will be lost.
-//
-
-#ifndef QMLJSPARSER_P_H
-#define QMLJSPARSER_P_H
-
-#include "qmljsglobal_p.h"
-#include "qmljsgrammar_p.h"
-#include "qmljsast_p.h"
-#include "qmljsengine_p.h"
-
-#include <QtCore/QList>
-#include <QtCore/QString>
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS {
-
-class Engine;
-class NameId;
-
-class QML_PARSER_EXPORT Parser: protected $table
-{
-public:
-    union Value {
-      int ival;
-      double dval;
-      NameId *sval;
-      AST::ArgumentList *ArgumentList;
-      AST::CaseBlock *CaseBlock;
-      AST::CaseClause *CaseClause;
-      AST::CaseClauses *CaseClauses;
-      AST::Catch *Catch;
-      AST::DefaultClause *DefaultClause;
-      AST::ElementList *ElementList;
-      AST::Elision *Elision;
-      AST::ExpressionNode *Expression;
-      AST::Finally *Finally;
-      AST::FormalParameterList *FormalParameterList;
-      AST::FunctionBody *FunctionBody;
-      AST::FunctionDeclaration *FunctionDeclaration;
-      AST::Node *Node;
-      AST::PropertyName *PropertyName;
-      AST::PropertyNameAndValueList *PropertyNameAndValueList;
-      AST::SourceElement *SourceElement;
-      AST::SourceElements *SourceElements;
-      AST::Statement *Statement;
-      AST::StatementList *StatementList;
-      AST::Block *Block;
-      AST::VariableDeclaration *VariableDeclaration;
-      AST::VariableDeclarationList *VariableDeclarationList;
-
-      AST::UiProgram *UiProgram;
-      AST::UiImportList *UiImportList;
-      AST::UiImport *UiImport;
-      AST::UiParameterList *UiParameterList;
-      AST::UiPublicMember *UiPublicMember;
-      AST::UiObjectDefinition *UiObjectDefinition;
-      AST::UiObjectInitializer *UiObjectInitializer;
-      AST::UiObjectBinding *UiObjectBinding;
-      AST::UiScriptBinding *UiScriptBinding;
-      AST::UiArrayBinding *UiArrayBinding;
-      AST::UiObjectMember *UiObjectMember;
-      AST::UiObjectMemberList *UiObjectMemberList;
-      AST::UiArrayMemberList *UiArrayMemberList;
-      AST::UiQualifiedId *UiQualifiedId;
-      AST::UiSignature *UiSignature;
-      AST::UiFormalList *UiFormalList;
-      AST::UiFormal *UiFormal;
-    };
-
-public:
-    Parser(Engine *engine);
-    ~Parser();
-
-    // parse a UI program
-    bool parse() { return parse(T_FEED_UI_PROGRAM); }
-    bool parseStatement() { return parse(T_FEED_JS_STATEMENT); }
-    bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
-    bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
-    bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
-    bool parseProgram() { return parse(T_FEED_JS_PROGRAM); }
-
-    AST::UiProgram *ast() const
-    { return AST::cast<AST::UiProgram *>(program); }
-
-    AST::Statement *statement() const
-    {
-        if (! program)
-            return 0;
-
-        return program->statementCast();
-    }
-
-    AST::ExpressionNode *expression() const
-    {
-        if (! program)
-            return 0;
-
-        return program->expressionCast();
-    }
-
-    AST::UiObjectMember *uiObjectMember() const
-    {
-        if (! program)
-            return 0;
-
-        return program->uiObjectMemberCast();
-    }
-
-    AST::Node *rootNode() const
-    { return program; }
-
-    QList<DiagnosticMessage> diagnosticMessages() const
-    { return diagnostic_messages; }
-
-    inline DiagnosticMessage diagnosticMessage() const
-    {
-        foreach (const DiagnosticMessage &d, diagnostic_messages) {
-            if (! d.kind == DiagnosticMessage::Warning)
-                return d;
-        }
-
-        return DiagnosticMessage();
-    }
-
-    inline QString errorMessage() const
-    { return diagnosticMessage().message; }
-
-    inline int errorLineNumber() const
-    { return diagnosticMessage().loc.startLine; }
-
-    inline int errorColumnNumber() const
-    { return diagnosticMessage().loc.startColumn; }
-
-protected:
-    bool parse(int startToken);
-
-    void reallocateStack();
-
-    inline Value &sym(int index)
-    { return sym_stack [tos + index - 1]; }
-
-    inline AST::SourceLocation &loc(int index)
-    { return location_stack [tos + index - 1]; }
-
-    AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
-
-protected:
-    Engine *driver;
-    int tos;
-    int stack_size;
-    Value *sym_stack;
-    int *state_stack;
-    AST::SourceLocation *location_stack;
-
-    AST::Node *program;
-
-    // error recovery
-    enum { TOKEN_BUFFER_SIZE = 3 };
-
-    struct SavedToken {
-       int token;
-       double dval;
-       AST::SourceLocation loc;
-    };
-
-    double yylval;
-    AST::SourceLocation yylloc;
-    AST::SourceLocation yyprevlloc;
-
-    SavedToken token_buffer[TOKEN_BUFFER_SIZE];
-    SavedToken *first_token;
-    SavedToken *last_token;
-
-    QList<DiagnosticMessage> diagnostic_messages;
-};
-
-} // end of namespace QmlJS
-
-
-:/
-
-
-/.
-
-#include "qmljsparser_p.h"
-#include <QVarLengthArray>
-
-//
-// This file is automatically generated from qmljs.g.
-// Changes will be lost.
-//
-
-using namespace QmlJS;
-
-QT_QML_BEGIN_NAMESPACE
-
-void Parser::reallocateStack()
-{
-    if (! stack_size)
-        stack_size = 128;
-    else
-        stack_size <<= 1;
-
-    sym_stack = reinterpret_cast<Value*> (qRealloc(sym_stack, stack_size * sizeof(Value)));
-    state_stack = reinterpret_cast<int*> (qRealloc(state_stack, stack_size * sizeof(int)));
-    location_stack = reinterpret_cast<AST::SourceLocation*> (qRealloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
-}
-
-inline static bool automatic(Engine *driver, int token)
-{
-    return token == $table::T_RBRACE
-        || token == 0
-        || driver->lexer()->prevTerminator();
-}
-
-
-Parser::Parser(Engine *engine):
-    driver(engine),
-    tos(0),
-    stack_size(0),
-    sym_stack(0),
-    state_stack(0),
-    location_stack(0),
-    first_token(0),
-    last_token(0)
-{
-}
-
-Parser::~Parser()
-{
-    if (stack_size) {
-        qFree(sym_stack);
-        qFree(state_stack);
-        qFree(location_stack);
-    }
-}
-
-static inline AST::SourceLocation location(Lexer *lexer)
-{
-    AST::SourceLocation loc;
-    loc.offset = lexer->tokenOffset();
-    loc.length = lexer->tokenLength();
-    loc.startLine = lexer->startLineNo();
-    loc.startColumn = lexer->startColumnNo();
-    return loc;
-}
-
-AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
-{
-    QVarLengthArray<NameId *, 4> nameIds;
-    QVarLengthArray<AST::SourceLocation, 4> locations;
-
-    AST::ExpressionNode *it = expr;
-    while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
-        nameIds.append(m->name);
-        locations.append(m->identifierToken);
-        it = m->base;
-    }
-
-    if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
-        AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
-        q->identifierToken = idExpr->identifierToken;
-
-        AST::UiQualifiedId *currentId = q;
-        for (int i = nameIds.size() - 1; i != -1; --i) {
-            currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
-            currentId->identifierToken = locations[i];
-        }
-
-        return currentId->finish();
-    }
-
-    return 0;
-}
-
-bool Parser::parse(int startToken)
-{
-    Lexer *lexer = driver->lexer();
-    bool hadErrors = false;
-    int yytoken = -1;
-    int action = 0;
-
-    token_buffer[0].token = startToken;
-    first_token = &token_buffer[0];
-    last_token = &token_buffer[1];
-
-    tos = -1;
-    program = 0;
-
-    do {
-        if (++tos == stack_size)
-            reallocateStack();
-
-        state_stack[tos] = action;
-
-    _Lcheck_token:
-        if (yytoken == -1 && -TERMINAL_COUNT != action_index[action]) {
-            yyprevlloc = yylloc;
-
-            if (first_token == last_token) {
-                yytoken = lexer->lex();
-                yylval = lexer->dval();
-                yylloc = location(lexer);
-            } else {
-                yytoken = first_token->token;
-                yylval = first_token->dval;
-                yylloc = first_token->loc;
-                ++first_token;
-            }
-        }
-
-        action = t_action(action, yytoken);
-        if (action > 0) {
-            if (action != ACCEPT_STATE) {
-                yytoken = -1;
-                sym(1).dval = yylval;
-                loc(1) = yylloc;
-            } else {
-              --tos;
-              return ! hadErrors;
-            }
-        } else if (action < 0) {
-          const int r = -action - 1;
-          tos -= rhs[r];
-
-          switch (r) {
-./
-
---------------------------------------------------------------------------------------------------------
--- Declarative UI
---------------------------------------------------------------------------------------------------------
-
-TopLevel: T_FEED_UI_PROGRAM UiProgram ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-./
-
-TopLevel: T_FEED_JS_STATEMENT Statement ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-./
-
-TopLevel: T_FEED_JS_EXPRESSION Expression ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-./
-
-TopLevel: T_FEED_JS_SOURCE_ELEMENT SourceElement ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-./
-
-TopLevel: T_FEED_UI_OBJECT_MEMBER UiObjectMember ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-./
-
-TopLevel: T_FEED_JS_PROGRAM Program ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-./
-
-UiProgram: UiImportListOpt UiRootMember ;
-/.
-case $rule_number: {
-  sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
-        sym(2).UiObjectMemberList->finish());
-} break;
-./
-
-UiImportListOpt: Empty ;
-UiImportListOpt: UiImportList ;
-/.
-case $rule_number: {
-    sym(1).Node = sym(1).UiImportList->finish();
-} break;
-./
-
-UiImportList: UiImport ;
-/.
-case $rule_number: {
-    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport);
-} break;
-./
-
-UiImportList: UiImportList UiImport ;
-/.
-case $rule_number: {
-    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(),
-        sym(1).UiImportList, sym(2).UiImport);
-} break;
-./
-
-ImportId: MemberExpression ;
-
-UiImport: UiImportHead T_AUTOMATIC_SEMICOLON ;
-UiImport: UiImportHead T_SEMICOLON ;
-/.
-case $rule_number: {
-    sym(1).UiImport->semicolonToken = loc(2);
-} break;
-./
-
-UiImport: UiImportHead T_NUMERIC_LITERAL T_AUTOMATIC_SEMICOLON ;
-UiImport: UiImportHead T_NUMERIC_LITERAL T_SEMICOLON ;
-/.
-case $rule_number: {
-    sym(1).UiImport->versionToken = loc(2);
-    sym(1).UiImport->semicolonToken = loc(3);
-} break;
-./
-
-UiImport: UiImportHead T_NUMERIC_LITERAL T_AS JsIdentifier T_AUTOMATIC_SEMICOLON ;
-UiImport: UiImportHead T_NUMERIC_LITERAL T_AS JsIdentifier T_SEMICOLON ;
-/.
-case $rule_number: {
-    sym(1).UiImport->versionToken = loc(2);
-    sym(1).UiImport->asToken = loc(3);
-    sym(1).UiImport->importIdToken = loc(4);
-    sym(1).UiImport->importId = sym(4).sval;
-    sym(1).UiImport->semicolonToken = loc(5);
-} break;
-./
-
-UiImport: UiImportHead T_AS JsIdentifier T_AUTOMATIC_SEMICOLON ;
-UiImport: UiImportHead T_AS JsIdentifier T_SEMICOLON ;
-/.
-case $rule_number: {
-    sym(1).UiImport->asToken = loc(2);
-    sym(1).UiImport->importIdToken = loc(3);
-    sym(1).UiImport->importId = sym(3).sval;
-    sym(1).UiImport->semicolonToken = loc(4);
-} break;
-./
-
-
-UiImportHead: T_IMPORT ImportId ;
-/.
-case $rule_number: {
-    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;
-./
-
-Empty: ;
-/.
-case $rule_number: {
-    sym(1).Node = 0;
-} break;
-./
-
-UiRootMember: UiObjectDefinition ;
-/.
-case $rule_number: {
-    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
-} break;
-./
-
-UiObjectMemberList: UiObjectMember ;
-/.
-case $rule_number: {
-    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
-} break;
-./
-
-UiObjectMemberList: UiObjectMemberList UiObjectMember ;
-/.
-case $rule_number: {
-    AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
-        sym(1).UiObjectMemberList, sym(2).UiObjectMember);
-    sym(1).Node = node;
-} break;
-./
-
-UiArrayMemberList: UiObjectDefinition ;
-/.
-case $rule_number: {
-    sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember);
-} break;
-./
-
-UiArrayMemberList: UiArrayMemberList T_COMMA UiObjectDefinition ;
-/.
-case $rule_number: {
-    AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(),
-        sym(1).UiArrayMemberList, sym(3).UiObjectMember);
-    node->commaToken = loc(2);
-    sym(1).Node = node;
-} break;
-./
-
-UiObjectInitializer: T_LBRACE T_RBRACE ;
-/.
-case $rule_number: {
-    AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0);
-    node->lbraceToken = loc(1);
-    node->rbraceToken = loc(2);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectInitializer: T_LBRACE UiObjectMemberList T_RBRACE ;
-/.
-case $rule_number: {
-    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;
-./
-
-UiObjectDefinition: UiQualifiedId UiObjectInitializer ;
-/.
-case $rule_number: {
-    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
-        sym(2).UiObjectInitializer);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: UiObjectDefinition ;
-
-UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
-/.
-case $rule_number: {
-    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
-        sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish());
-    node->colonToken = loc(2);
-    node->lbracketToken = loc(3);
-    node->rbracketToken = loc(5);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: UiQualifiedId             T_COLON UiQualifiedId  UiObjectInitializer ;
-/.
-case $rule_number: {
-    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
-      sym(1).UiQualifiedId, sym(3).UiQualifiedId, sym(4).UiObjectInitializer);
-    node->colonToken = loc(2);
-    sym(1).Node = node;
-} break;
-./
-
-UiObjectMember: UiQualifiedId T_COLON Block ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId T_COLON EmptyStatement ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if statement in a binding?
-/.case $rule_number:./
-
-/.
-{
-    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
-        sym(1).UiQualifiedId, sym(3).Statement);
-    node->colonToken = loc(2);
-    sym(1).Node = node;
-}   break;
-./
-
-UiPropertyType: T_VAR ;
-/.
-case $rule_number:
-./
-UiPropertyType: T_RESERVED_WORD ;
-/.
-case $rule_number: {
-    sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
-    break;
-}
-./
-
-UiPropertyType: T_IDENTIFIER ;
-
-UiParameterListOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-UiParameterListOpt: UiParameterList ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(1).UiParameterList->finish ();
-} break;
-./
-
-UiParameterList: UiPropertyType JsIdentifier ;
-/.
-case $rule_number: {
-  AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
-  node->identifierToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-UiParameterList: UiParameterList T_COMMA UiPropertyType JsIdentifier ;
-/.
-case $rule_number: {
-  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;
-./
-
-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 ;
-/.
-case $rule_number: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
-    node->type = AST::UiPublicMember::Signal;
-    node->propertyToken = loc(1);
-    node->typeToken = loc(2);
-    node->identifierToken = loc(2);
-    node->parameters = sym(4).UiParameterList;
-    node->semicolonToken = loc(6);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: T_SIGNAL T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_SIGNAL T_IDENTIFIER T_SEMICOLON ;
-/.
-case $rule_number: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
-    node->type = AST::UiPublicMember::Signal;
-    node->propertyToken = loc(1);
-    node->typeToken = loc(2);
-    node->identifierToken = loc(2);
-    node->semicolonToken = loc(3);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT T_IDENTIFIER T_SEMICOLON ;
-/.
-case $rule_number: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
-    node->typeModifier = sym(2).sval;
-    node->propertyToken = loc(1);
-    node->typeModifierToken = loc(2);
-    node->typeToken = loc(4);
-    node->identifierToken = loc(6);
-    node->semicolonToken = loc(7);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_SEMICOLON ;
-/.
-case $rule_number: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
-    node->propertyToken = loc(1);
-    node->typeToken = loc(2);
-    node->identifierToken = loc(3);
-    node->semicolonToken = loc(4);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_SEMICOLON ;
-/.
-case $rule_number: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
-    node->isDefaultMember = true;
-    node->defaultToken = loc(1);
-    node->propertyToken = loc(2);
-    node->typeToken = loc(3);
-    node->identifierToken = loc(4);
-    node->semicolonToken = loc(5);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
-/.
-case $rule_number: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
-        sym(5).Expression);
-    node->propertyToken = loc(1);
-    node->typeToken = loc(2);
-    node->identifierToken = loc(3);
-    node->colonToken = loc(4);
-    node->semicolonToken = loc(6);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: T_READONLY T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_READONLY T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
-/.
-case $rule_number: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
-        sym(6).Expression);
-    node->isReadonlyMember = true;
-    node->readonlyToken = loc(1);
-    node->propertyToken = loc(2);
-    node->typeToken = loc(3);
-    node->identifierToken = loc(4);
-    node->colonToken = loc(5);
-    node->semicolonToken = loc(7);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
-/.
-case $rule_number: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
-        sym(6).Expression);
-    node->isDefaultMember = true;
-    node->defaultToken = loc(1);
-    node->propertyToken = loc(2);
-    node->typeToken = loc(3);
-    node->identifierToken = loc(4);
-    node->colonToken = loc(5);
-    node->semicolonToken = loc(7);
-    sym(1).Node = node;
-}   break;
-./
-
-UiObjectMember: FunctionDeclaration ;
-/.
-case $rule_number: {
-    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
-}   break;
-./
-
-UiObjectMember: VariableStatement ;
-/.
-case $rule_number: {
-    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
-}   break;
-./
-
-JsIdentifier: T_IDENTIFIER;
-
-JsIdentifier: T_PROPERTY ;
-/.
-case $rule_number: {
-    QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
-    sym(1).sval = driver->intern(s.constData(), s.length());
-    break;
-}
-./
-
-JsIdentifier: T_SIGNAL ;
-/.
-case $rule_number: {
-    QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
-    sym(1).sval = driver->intern(s.constData(), s.length());
-    break;
-}
-./
-
-JsIdentifier: T_READONLY ;
-/.
-case $rule_number: {
-    QString s = QLatin1String(QmlJSGrammar::spell[T_READONLY]);
-    sym(1).sval = driver->intern(s.constData(), s.length());
-    break;
-}
-./
-
---------------------------------------------------------------------------------------------------------
--- Expressions
---------------------------------------------------------------------------------------------------------
-
-PrimaryExpression: T_THIS ;
-/.
-case $rule_number: {
-  AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
-  node->thisToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: JsIdentifier ;
-/.
-case $rule_number: {
-  AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
-  node->identifierToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_NULL ;
-/.
-case $rule_number: {
-  AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
-  node->nullToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_TRUE ;
-/.
-case $rule_number: {
-  AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
-  node->trueToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_FALSE ;
-/.
-case $rule_number: {
-  AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
-  node->falseToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_NUMERIC_LITERAL ;
-/.
-case $rule_number: {
-  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_MULTILINE_STRING_LITERAL ;
-/.case $rule_number:./
-
-PrimaryExpression: T_STRING_LITERAL ;
-/.
-case $rule_number: {
-  AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_DIVIDE_ ;
-/:
-#define J_SCRIPT_REGEXPLITERAL_RULE1 $rule_number
-:/
-/.
-case $rule_number: {
-  bool rx = lexer->scanRegExp(Lexer::NoPrefix);
-  if (!rx) {
-    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
-    return false; // ### remove me
-  }
-  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_DIVIDE_EQ ;
-/:
-#define J_SCRIPT_REGEXPLITERAL_RULE2 $rule_number
-:/
-/.
-case $rule_number: {
-  bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
-  if (!rx) {
-    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
-    return false;
-  }
-  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_LBRACKET T_RBRACKET ;
-/.
-case $rule_number: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0);
-  node->lbracketToken = loc(1);
-  node->rbracketToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_LBRACKET Elision T_RBRACKET ;
-/.
-case $rule_number: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish());
-  node->lbracketToken = loc(1);
-  node->rbracketToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_LBRACKET ElementList T_RBRACKET ;
-/.
-case $rule_number: {
-  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;
-./
-
-PrimaryExpression: T_LBRACKET ElementList T_COMMA T_RBRACKET ;
-/.
-case $rule_number: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
-    (AST::Elision *) 0);
-  node->lbracketToken = loc(1);
-  node->commaToken = loc(3);
-  node->rbracketToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_LBRACKET ElementList T_COMMA Elision T_RBRACKET ;
-/.
-case $rule_number: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
-    sym(4).Elision->finish());
-  node->lbracketToken = loc(1);
-  node->commaToken = loc(3);
-  node->rbracketToken = loc(5);
-  sym(1).Node = node;
-} break;
-./
-
--- PrimaryExpression: T_LBRACE T_RBRACE ;
--- /.
--- case $rule_number: {
---   sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
--- } break;
--- ./
-
-PrimaryExpression: T_LBRACE PropertyNameAndValueListOpt T_RBRACE ;
-/.
-case $rule_number: {
-  AST::ObjectLiteral *node = 0;
-  if (sym(2).Node)
-    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
-        sym(2).PropertyNameAndValueList->finish ());
-  else
-    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
-  node->lbraceToken = loc(1);
-  node->lbraceToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_LBRACE PropertyNameAndValueList T_COMMA T_RBRACE ;
-/.
-case $rule_number: {
-  AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
-    sym(2).PropertyNameAndValueList->finish ());
-  node->lbraceToken = loc(1);
-  node->lbraceToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-PrimaryExpression: T_LPAREN Expression T_RPAREN ;
-/.
-case $rule_number: {
-  AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
-  node->lparenToken = loc(1);
-  node->rparenToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-UiQualifiedId: MemberExpression ;
-/.
-case $rule_number: {
-  if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
-    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
-      QLatin1String("Ignored annotation")));
-
-    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 ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
-} break;
-./
-
-ElementList: Elision AssignmentExpression ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
-} break;
-./
-
-ElementList: ElementList T_COMMA AssignmentExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-ElementList: ElementList T_COMMA Elision AssignmentExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-Elision: T_COMMA ;
-/.
-case $rule_number: {
-  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
-  node->commaToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-Elision: Elision T_COMMA ;
-/.
-case $rule_number: {
-  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-PropertyNameAndValueList: PropertyName T_COLON AssignmentExpression ;
-/.
-case $rule_number: {
-  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
-      sym(1).PropertyName, sym(3).Expression);
-  node->colonToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-PropertyNameAndValueList: PropertyNameAndValueList T_COMMA PropertyName T_COLON AssignmentExpression ;
-/.
-case $rule_number: {
-  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
-      sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
-  node->commaToken = loc(2);
-  node->colonToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-PropertyName: T_IDENTIFIER %prec REDUCE_HERE ;
-/.
-case $rule_number: {
-  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PropertyName: T_SIGNAL ;
-/.case $rule_number:./
-
-PropertyName: T_PROPERTY ;
-/.
-case $rule_number: {
-  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PropertyName: T_STRING_LITERAL ;
-/.
-case $rule_number: {
-  AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PropertyName: T_NUMERIC_LITERAL ;
-/.
-case $rule_number: {
-  AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-PropertyName: ReservedIdentifier ;
-/.
-case $rule_number: {
-  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-ReservedIdentifier: T_BREAK ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_CASE ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_CATCH ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_CONTINUE ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_DEFAULT ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_DELETE ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_DO ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_ELSE ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_FALSE ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_FINALLY ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_FOR ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_FUNCTION ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_IF ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_IN ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_INSTANCEOF ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_NEW ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_NULL ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_RETURN ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_SWITCH ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_THIS ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_THROW ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_TRUE ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_TRY ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_TYPEOF ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_VAR ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_VOID ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_WHILE ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_CONST ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_DEBUGGER ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_RESERVED_WORD ;
-/.
-case $rule_number:
-./
-ReservedIdentifier: T_WITH ;
-/.
-case $rule_number:
-{
-  sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
-} break;
-./
-
-PropertyIdentifier: JsIdentifier ;
-PropertyIdentifier: ReservedIdentifier ;
-
-MemberExpression: PrimaryExpression ;
-MemberExpression: FunctionExpression ;
-
-MemberExpression: MemberExpression T_LBRACKET Expression T_RBRACKET ;
-/.
-case $rule_number: {
-  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;
-./
-
-MemberExpression: MemberExpression T_DOT PropertyIdentifier ;
-/.
-case $rule_number: {
-  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;
-./
-
-MemberExpression: T_NEW MemberExpression T_LPAREN ArgumentListOpt T_RPAREN ;
-/.
-case $rule_number: {
-  AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
-  node->newToken = loc(1);
-  node->lparenToken = loc(3);
-  node->rparenToken = loc(5);
-  sym(1).Node = node;
-} break;
-./
-
-NewExpression: MemberExpression ;
-
-NewExpression: T_NEW NewExpression ;
-/.
-case $rule_number: {
-  AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
-  node->newToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-CallExpression: MemberExpression T_LPAREN ArgumentListOpt T_RPAREN ;
-/.
-case $rule_number: {
-  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;
-./
-
-CallExpression: CallExpression T_LPAREN ArgumentListOpt T_RPAREN ;
-/.
-case $rule_number: {
-  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;
-./
-
-CallExpression: CallExpression T_LBRACKET Expression T_RBRACKET ;
-/.
-case $rule_number: {
-  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;
-./
-
-CallExpression: CallExpression T_DOT PropertyIdentifier ;
-/.
-case $rule_number: {
-  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;
-./
-
-ArgumentListOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-ArgumentListOpt: ArgumentList ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(1).ArgumentList->finish();
-} break;
-./
-
-ArgumentList: AssignmentExpression ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
-} break;
-./
-
-ArgumentList: ArgumentList T_COMMA AssignmentExpression ;
-/.
-case $rule_number: {
-  AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-LeftHandSideExpression: NewExpression ;
-LeftHandSideExpression: CallExpression ;
-PostfixExpression: LeftHandSideExpression ;
-
-PostfixExpression: LeftHandSideExpression T_PLUS_PLUS ;
-/.
-case $rule_number: {
-  AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
-  node->incrementToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-PostfixExpression: LeftHandSideExpression T_MINUS_MINUS ;
-/.
-case $rule_number: {
-  AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
-  node->decrementToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-UnaryExpression: PostfixExpression ;
-
-UnaryExpression: T_DELETE UnaryExpression ;
-/.
-case $rule_number: {
-  AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
-  node->deleteToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-UnaryExpression: T_VOID UnaryExpression ;
-/.
-case $rule_number: {
-  AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
-  node->voidToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-UnaryExpression: T_TYPEOF UnaryExpression ;
-/.
-case $rule_number: {
-  AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
-  node->typeofToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-UnaryExpression: T_PLUS_PLUS UnaryExpression ;
-/.
-case $rule_number: {
-  AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
-  node->incrementToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-UnaryExpression: T_MINUS_MINUS UnaryExpression ;
-/.
-case $rule_number: {
-  AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
-  node->decrementToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-UnaryExpression: T_PLUS UnaryExpression ;
-/.
-case $rule_number: {
-  AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
-  node->plusToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-UnaryExpression: T_MINUS UnaryExpression ;
-/.
-case $rule_number: {
-  AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
-  node->minusToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-UnaryExpression: T_TILDE UnaryExpression ;
-/.
-case $rule_number: {
-  AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
-  node->tildeToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-UnaryExpression: T_NOT UnaryExpression ;
-/.
-case $rule_number: {
-  AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
-  node->notToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-MultiplicativeExpression: UnaryExpression ;
-
-MultiplicativeExpression: MultiplicativeExpression T_STAR UnaryExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-MultiplicativeExpression: MultiplicativeExpression T_DIVIDE_ UnaryExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-MultiplicativeExpression: MultiplicativeExpression T_REMAINDER UnaryExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-AdditiveExpression: MultiplicativeExpression ;
-
-AdditiveExpression: AdditiveExpression T_PLUS MultiplicativeExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-AdditiveExpression: AdditiveExpression T_MINUS MultiplicativeExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-ShiftExpression: AdditiveExpression ;
-
-ShiftExpression: ShiftExpression T_LT_LT AdditiveExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-ShiftExpression: ShiftExpression T_GT_GT AdditiveExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-ShiftExpression: ShiftExpression T_GT_GT_GT AdditiveExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpression: ShiftExpression ;
-
-RelationalExpression: RelationalExpression T_LT ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpression: RelationalExpression T_GT ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpression: RelationalExpression T_LE ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpression: RelationalExpression T_GE ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpression: RelationalExpression T_INSTANCEOF ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpression: RelationalExpression T_IN ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpressionNotIn: ShiftExpression ;
-
-RelationalExpressionNotIn: RelationalExpressionNotIn T_LT ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpressionNotIn: RelationalExpressionNotIn T_GT ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpressionNotIn: RelationalExpressionNotIn T_LE ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpressionNotIn: RelationalExpressionNotIn T_GE ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-RelationalExpressionNotIn: RelationalExpressionNotIn T_INSTANCEOF ShiftExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-EqualityExpression: RelationalExpression ;
-
-EqualityExpression: EqualityExpression T_EQ_EQ RelationalExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-EqualityExpression: EqualityExpression T_NOT_EQ RelationalExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-EqualityExpression: EqualityExpression T_EQ_EQ_EQ RelationalExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-EqualityExpression: EqualityExpression T_NOT_EQ_EQ RelationalExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-EqualityExpressionNotIn: RelationalExpressionNotIn ;
-
-EqualityExpressionNotIn: EqualityExpressionNotIn T_EQ_EQ RelationalExpressionNotIn ;
-/.
-case $rule_number: {
-  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;
-./
-
-EqualityExpressionNotIn: EqualityExpressionNotIn T_NOT_EQ RelationalExpressionNotIn;
-/.
-case $rule_number: {
-  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;
-./
-
-EqualityExpressionNotIn: EqualityExpressionNotIn T_EQ_EQ_EQ RelationalExpressionNotIn ;
-/.
-case $rule_number: {
-  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;
-./
-
-EqualityExpressionNotIn: EqualityExpressionNotIn T_NOT_EQ_EQ RelationalExpressionNotIn ;
-/.
-case $rule_number: {
-  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;
-./
-
-BitwiseANDExpression: EqualityExpression ;
-
-BitwiseANDExpression: BitwiseANDExpression T_AND EqualityExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-BitwiseANDExpressionNotIn: EqualityExpressionNotIn ;
-
-BitwiseANDExpressionNotIn: BitwiseANDExpressionNotIn T_AND EqualityExpressionNotIn ;
-/.
-case $rule_number: {
-  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;
-./
-
-BitwiseXORExpression: BitwiseANDExpression ;
-
-BitwiseXORExpression: BitwiseXORExpression T_XOR BitwiseANDExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-BitwiseXORExpressionNotIn: BitwiseANDExpressionNotIn ;
-
-BitwiseXORExpressionNotIn: BitwiseXORExpressionNotIn T_XOR BitwiseANDExpressionNotIn ;
-/.
-case $rule_number: {
-  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;
-./
-
-BitwiseORExpression: BitwiseXORExpression ;
-
-BitwiseORExpression: BitwiseORExpression T_OR BitwiseXORExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-BitwiseORExpressionNotIn: BitwiseXORExpressionNotIn ;
-
-BitwiseORExpressionNotIn: BitwiseORExpressionNotIn T_OR BitwiseXORExpressionNotIn ;
-/.
-case $rule_number: {
-  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;
-./
-
-LogicalANDExpression: BitwiseORExpression ;
-
-LogicalANDExpression: LogicalANDExpression T_AND_AND BitwiseORExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-LogicalANDExpressionNotIn: BitwiseORExpressionNotIn ;
-
-LogicalANDExpressionNotIn: LogicalANDExpressionNotIn T_AND_AND BitwiseORExpressionNotIn ;
-/.
-case $rule_number: {
-  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;
-./
-
-LogicalORExpression: LogicalANDExpression ;
-
-LogicalORExpression: LogicalORExpression T_OR_OR LogicalANDExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-LogicalORExpressionNotIn: LogicalANDExpressionNotIn ;
-
-LogicalORExpressionNotIn: LogicalORExpressionNotIn T_OR_OR LogicalANDExpressionNotIn ;
-/.
-case $rule_number: {
-  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;
-./
-
-ConditionalExpression: LogicalORExpression ;
-
-ConditionalExpression: LogicalORExpression T_QUESTION AssignmentExpression T_COLON AssignmentExpression ;
-/.
-case $rule_number: {
-  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
-    sym(3).Expression, sym(5).Expression);
-  node->questionToken = loc(2);
-  node->colonToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-ConditionalExpressionNotIn: LogicalORExpressionNotIn ;
-
-ConditionalExpressionNotIn: LogicalORExpressionNotIn T_QUESTION AssignmentExpressionNotIn T_COLON AssignmentExpressionNotIn ;
-/.
-case $rule_number: {
-  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
-    sym(3).Expression, sym(5).Expression);
-  node->questionToken = loc(2);
-  node->colonToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-AssignmentExpression: ConditionalExpression ;
-
-AssignmentExpression: LeftHandSideExpression AssignmentOperator AssignmentExpression ;
-/.
-case $rule_number: {
-  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;
-./
-
-AssignmentExpressionNotIn: ConditionalExpressionNotIn ;
-
-AssignmentExpressionNotIn: LeftHandSideExpression AssignmentOperator AssignmentExpressionNotIn ;
-/.
-case $rule_number: {
-  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;
-./
-
-AssignmentOperator: T_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::Assign;
-} break;
-./
-
-AssignmentOperator: T_STAR_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceMul;
-} break;
-./
-
-AssignmentOperator: T_DIVIDE_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceDiv;
-} break;
-./
-
-AssignmentOperator: T_REMAINDER_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceMod;
-} break;
-./
-
-AssignmentOperator: T_PLUS_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceAdd;
-} break;
-./
-
-AssignmentOperator: T_MINUS_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceSub;
-} break;
-./
-
-AssignmentOperator: T_LT_LT_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceLeftShift;
-} break;
-./
-
-AssignmentOperator: T_GT_GT_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceRightShift;
-} break;
-./
-
-AssignmentOperator: T_GT_GT_GT_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceURightShift;
-} break;
-./
-
-AssignmentOperator: T_AND_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceAnd;
-} break;
-./
-
-AssignmentOperator: T_XOR_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceXor;
-} break;
-./
-
-AssignmentOperator: T_OR_EQ ;
-/.
-case $rule_number: {
-  sym(1).ival = QSOperator::InplaceOr;
-} break;
-./
-
-Expression: AssignmentExpression ;
-
-Expression: Expression T_COMMA AssignmentExpression ;
-/.
-case $rule_number: {
-  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-ExpressionOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-ExpressionOpt: Expression ;
-
-ExpressionNotIn: AssignmentExpressionNotIn ;
-
-ExpressionNotIn: ExpressionNotIn T_COMMA AssignmentExpressionNotIn ;
-/.
-case $rule_number: {
-  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-ExpressionNotInOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-ExpressionNotInOpt: ExpressionNotIn ;
-
-Statement: Block ;
-Statement: VariableStatement ;
-Statement: EmptyStatement ;
-Statement: ExpressionStatement ;
-Statement: IfStatement ;
-Statement: IterationStatement ;
-Statement: ContinueStatement ;
-Statement: BreakStatement ;
-Statement: ReturnStatement ;
-Statement: WithStatement ;
-Statement: LabelledStatement ;
-Statement: SwitchStatement ;
-Statement: ThrowStatement ;
-Statement: TryStatement ;
-Statement: DebuggerStatement ;
-
-
-Block: T_LBRACE StatementListOpt T_RBRACE ;
-/.
-case $rule_number: {
-  AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
-  node->lbraceToken = loc(1);
-  node->rbraceToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-StatementList: Statement ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
-} break;
-./
-
-StatementList: StatementList Statement ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
-} break;
-./
-
-StatementListOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-StatementListOpt: StatementList ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(1).StatementList->finish ();
-} break;
-./
-
-VariableStatement: VariableDeclarationKind VariableDeclarationList T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-VariableStatement: VariableDeclarationKind VariableDeclarationList T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
-     sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
-  node->declarationKindToken = loc(1);
-  node->semicolonToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-VariableDeclarationKind: T_CONST ;
-/.
-case $rule_number: {
-  sym(1).ival = T_CONST;
-} break;
-./
-
-VariableDeclarationKind: T_VAR ;
-/.
-case $rule_number: {
-  sym(1).ival = T_VAR;
-} break;
-./
-
-VariableDeclarationList: VariableDeclaration ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
-} break;
-./
-
-VariableDeclarationList: VariableDeclarationList T_COMMA VariableDeclaration ;
-/.
-case $rule_number: {
-  AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
-    sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-VariableDeclarationListNotIn: VariableDeclarationNotIn ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
-} break;
-./
-
-VariableDeclarationListNotIn: VariableDeclarationListNotIn T_COMMA VariableDeclarationNotIn ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
-} break;
-./
-
-VariableDeclaration: JsIdentifier InitialiserOpt ;
-/.
-case $rule_number: {
-  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
-  node->identifierToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-VariableDeclarationNotIn: JsIdentifier InitialiserNotInOpt ;
-/.
-case $rule_number: {
-  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
-  node->identifierToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-Initialiser: T_EQ AssignmentExpression ;
-/.
-case $rule_number: {
-  // ### TODO: AST for initializer
-  sym(1) = sym(2);
-} break;
-./
-
-InitialiserOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-InitialiserOpt: Initialiser ;
-
-InitialiserNotIn: T_EQ AssignmentExpressionNotIn ;
-/.
-case $rule_number: {
-  // ### TODO: AST for initializer
-  sym(1) = sym(2);
-} break;
-./
-
-InitialiserNotInOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-InitialiserNotInOpt: InitialiserNotIn ;
-
-EmptyStatement: T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
-  node->semicolonToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-ExpressionStatement: Expression T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-ExpressionStatement: Expression T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-IfStatement: T_IF T_LPAREN Expression T_RPAREN Statement T_ELSE Statement ;
-/.
-case $rule_number: {
-  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);
-  node->rparenToken = loc(4);
-  node->elseToken = loc(5);
-  sym(1).Node = node;
-} break;
-./
-
-IfStatement: T_IF T_LPAREN Expression T_RPAREN Statement ;
-/.
-case $rule_number: {
-  AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
-  node->ifToken = loc(1);
-  node->lparenToken = loc(2);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-
-IterationStatement: T_DO Statement T_WHILE T_LPAREN Expression T_RPAREN T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-IterationStatement: T_DO Statement T_WHILE T_LPAREN Expression T_RPAREN T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
-  node->doToken = loc(1);
-  node->whileToken = loc(3);
-  node->lparenToken = loc(4);
-  node->rparenToken = loc(6);
-  node->semicolonToken = loc(7);
-  sym(1).Node = node;
-} break;
-./
-
-IterationStatement: T_WHILE T_LPAREN Expression T_RPAREN Statement ;
-/.
-case $rule_number: {
-  AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
-  node->whileToken = loc(1);
-  node->lparenToken = loc(2);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-IterationStatement: T_FOR T_LPAREN ExpressionNotInOpt T_SEMICOLON ExpressionOpt T_SEMICOLON ExpressionOpt T_RPAREN Statement ;
-/.
-case $rule_number: {
-  AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
-    sym(5).Expression, sym(7).Expression, sym(9).Statement);
-  node->forToken = loc(1);
-  node->lparenToken = loc(2);
-  node->firstSemicolonToken = loc(4);
-  node->secondSemicolonToken = loc(6);
-  node->rparenToken = loc(8);
-  sym(1).Node = node;
-} break;
-./
-
-IterationStatement: T_FOR T_LPAREN T_VAR VariableDeclarationListNotIn T_SEMICOLON ExpressionOpt T_SEMICOLON ExpressionOpt T_RPAREN Statement ;
-/.
-case $rule_number: {
-  AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
-     sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
-     sym(8).Expression, sym(10).Statement);
-  node->forToken = loc(1);
-  node->lparenToken = loc(2);
-  node->varToken = loc(3);
-  node->firstSemicolonToken = loc(5);
-  node->secondSemicolonToken = loc(7);
-  node->rparenToken = loc(9);
-  sym(1).Node = node;
-} break;
-./
-
-IterationStatement: T_FOR T_LPAREN LeftHandSideExpression T_IN Expression T_RPAREN Statement ;
-/.
-case $rule_number: {
-  AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
-    sym(5).Expression, sym(7).Statement);
-  node->forToken = loc(1);
-  node->lparenToken = loc(2);
-  node->inToken = loc(4);
-  node->rparenToken = loc(6);
-  sym(1).Node = node;
-} break;
-./
-
-IterationStatement: T_FOR T_LPAREN T_VAR VariableDeclarationNotIn T_IN Expression T_RPAREN Statement ;
-/.
-case $rule_number: {
-  AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
-    sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
-  node->forToken = loc(1);
-  node->lparenToken = loc(2);
-  node->varToken = loc(3);
-  node->inToken = loc(5);
-  node->rparenToken = loc(7);
-  sym(1).Node = node;
-} break;
-./
-
-ContinueStatement: T_CONTINUE T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-ContinueStatement: T_CONTINUE T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
-  node->continueToken = loc(1);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-ContinueStatement: T_CONTINUE JsIdentifier T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-ContinueStatement: T_CONTINUE JsIdentifier T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
-  node->continueToken = loc(1);
-  node->identifierToken = loc(2);
-  node->semicolonToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-BreakStatement: T_BREAK T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-BreakStatement: T_BREAK T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
-  node->breakToken = loc(1);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-BreakStatement: T_BREAK JsIdentifier T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-BreakStatement: T_BREAK JsIdentifier T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
-  node->breakToken = loc(1);
-  node->identifierToken = loc(2);
-  node->semicolonToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-ReturnStatement: T_RETURN ExpressionOpt T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-ReturnStatement: T_RETURN ExpressionOpt T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
-  node->returnToken = loc(1);
-  node->semicolonToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-WithStatement: T_WITH T_LPAREN Expression T_RPAREN Statement ;
-/.
-case $rule_number: {
-  AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
-  node->withToken = loc(1);
-  node->lparenToken = loc(2);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-SwitchStatement: T_SWITCH T_LPAREN Expression T_RPAREN CaseBlock ;
-/.
-case $rule_number: {
-  AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
-  node->switchToken = loc(1);
-  node->lparenToken = loc(2);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-CaseBlock: T_LBRACE CaseClausesOpt T_RBRACE ;
-/.
-case $rule_number: {
-  AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
-  node->lbraceToken = loc(1);
-  node->rbraceToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-CaseBlock: T_LBRACE CaseClausesOpt DefaultClause CaseClausesOpt T_RBRACE ;
-/.
-case $rule_number: {
-  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;
-./
-
-CaseClauses: CaseClause ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
-} break;
-./
-
-CaseClauses: CaseClauses CaseClause ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
-} break;
-./
-
-CaseClausesOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-CaseClausesOpt: CaseClauses ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(1).CaseClauses->finish ();
-} break;
-./
-
-CaseClause: T_CASE Expression T_COLON StatementListOpt ;
-/.
-case $rule_number: {
-  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;
-./
-
-DefaultClause: T_DEFAULT T_COLON StatementListOpt ;
-/.
-case $rule_number: {
-  AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
-  node->defaultToken = loc(1);
-  node->colonToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-LabelledStatement: T_SIGNAL T_COLON Statement ;
-/.case $rule_number:./
-
-LabelledStatement: T_PROPERTY T_COLON Statement ;
-/.
-case $rule_number: {
-  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;
-./
-
-LabelledStatement: T_IDENTIFIER T_COLON Statement ;
-/.
-case $rule_number: {
-  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;
-./
-
-ThrowStatement: T_THROW Expression T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-ThrowStatement: T_THROW Expression T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
-  node->throwToken = loc(1);
-  node->semicolonToken = loc(3);
-  sym(1).Node = node;
-} break;
-./
-
-TryStatement: T_TRY Block Catch ;
-/.
-case $rule_number: {
-  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
-  node->tryToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-TryStatement: T_TRY Block Finally ;
-/.
-case $rule_number: {
-  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
-  node->tryToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-TryStatement: T_TRY Block Catch Finally ;
-/.
-case $rule_number: {
-  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;
-./
-
-Catch: T_CATCH T_LPAREN JsIdentifier T_RPAREN Block ;
-/.
-case $rule_number: {
-  AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
-  node->catchToken = loc(1);
-  node->lparenToken = loc(2);
-  node->identifierToken = loc(3);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-./
-
-Finally: T_FINALLY Block ;
-/.
-case $rule_number: {
-  AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
-  node->finallyToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-DebuggerStatement: T_DEBUGGER T_AUTOMATIC_SEMICOLON ; -- automatic semicolon
-DebuggerStatement: T_DEBUGGER T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
-  node->debuggerToken = loc(1);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
-} break;
-./
-
-FunctionDeclaration: T_FUNCTION JsIdentifier T_LPAREN FormalParameterListOpt T_RPAREN T_LBRACE FunctionBodyOpt T_RBRACE ;
-/.
-case $rule_number: {
-  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);
-  node->lparenToken = loc(3);
-  node->rparenToken = loc(5);
-  node->lbraceToken = loc(6);
-  node->rbraceToken = loc(8);
-  sym(1).Node = node;
-} break;
-./
-
-FunctionExpression: T_FUNCTION IdentifierOpt T_LPAREN FormalParameterListOpt T_RPAREN T_LBRACE FunctionBodyOpt T_RBRACE ;
-/.
-case $rule_number: {
-  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)
-      node->identifierToken = loc(2);
-  node->lparenToken = loc(3);
-  node->rparenToken = loc(5);
-  node->lbraceToken = loc(6);
-  node->rbraceToken = loc(8);
-  sym(1).Node = node;
-} break;
-./
-
-FormalParameterList: JsIdentifier ;
-/.
-case $rule_number: {
-  AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
-  node->identifierToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
-
-FormalParameterList: FormalParameterList T_COMMA JsIdentifier ;
-/.
-case $rule_number: {
-  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;
-./
-
-FormalParameterListOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-FormalParameterListOpt: FormalParameterList ;
-/.
-case $rule_number: {
-  sym(1).Node = sym(1).FormalParameterList->finish ();
-} break;
-./
-
-FunctionBodyOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-FunctionBodyOpt: FunctionBody ;
-
-FunctionBody: SourceElements ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
-} break;
-./
-
-Program: SourceElements ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
-} break;
-./
-
-SourceElements: SourceElement ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
-} break;
-./
-
-SourceElements: SourceElements SourceElement ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
-} break;
-./
-
-SourceElement: Statement ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
-} break;
-./
-
-SourceElement: FunctionDeclaration ;
-/.
-case $rule_number: {
-  sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
-} break;
-./
-
-IdentifierOpt: ;
-/.
-case $rule_number: {
-  sym(1).sval = 0;
-} break;
-./
-
-IdentifierOpt: JsIdentifier ;
-
-PropertyNameAndValueListOpt: ;
-/.
-case $rule_number: {
-  sym(1).Node = 0;
-} break;
-./
-
-PropertyNameAndValueListOpt: PropertyNameAndValueList ;
-
-/.
-            } // switch
-            action = nt_action(state_stack[tos], lhs[r] - TERMINAL_COUNT);
-        } // if
-    } while (action != 0);
-
-    if (first_token == last_token) {
-        const int errorState = state_stack[tos];
-
-        // automatic insertion of `;'
-        if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
-            SavedToken &tk = token_buffer[0];
-            tk.token = yytoken;
-            tk.dval = yylval;
-            tk.loc = yylloc;
-
-            yylloc = yyprevlloc;
-            yylloc.offset += yylloc.length;
-            yylloc.startColumn += yylloc.length;
-            yylloc.length = 0;
-
-            //const QString msg = qApp->translate("QmlParser", "Missing `;'");
-            //diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, yylloc, msg));
-
-            first_token = &token_buffer[0];
-            last_token = &token_buffer[1];
-
-            yytoken = T_SEMICOLON;
-            yylval = 0;
-
-            action = errorState;
-
-            goto _Lcheck_token;
-        }
-
-        hadErrors = true;
-
-        token_buffer[0].token = yytoken;
-        token_buffer[0].dval = yylval;
-        token_buffer[0].loc = yylloc;
-
-        token_buffer[1].token = yytoken = lexer->lex();
-        token_buffer[1].dval  = yylval  = lexer->dval();
-        token_buffer[1].loc   = yylloc  = location(lexer);
-
-        if (t_action(errorState, yytoken)) {
-            QString msg;
-            int token = token_buffer[0].token;
-            if (token < 0 || token >= TERMINAL_COUNT)
-                msg = qApp->translate("QmlParser", "Syntax error");
-            else
-                msg = qApp->translate("QmlParser", "Unexpected token `%1'").arg(QLatin1String(spell[token]));
-            diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
-
-            action = errorState;
-            goto _Lcheck_token;
-        }
-
-        static int tokens[] = {
-            T_PLUS,
-            T_EQ,
-
-            T_COMMA,
-            T_COLON,
-            T_SEMICOLON,
-
-            T_RPAREN, T_RBRACKET, T_RBRACE,
-
-            T_NUMERIC_LITERAL,
-            T_IDENTIFIER,
-
-            T_LPAREN, T_LBRACKET, T_LBRACE,
-
-            EOF_SYMBOL
-        };
-
-        for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) {
-            int a = t_action(errorState, *tk);
-            if (a > 0 && t_action(a, yytoken)) {
-                const QString msg = qApp->translate("QmlParser", "Expected token `%1'").arg(QLatin1String(spell[*tk]));
-                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
-
-                yytoken = *tk;
-                yylval = 0;
-                yylloc = token_buffer[0].loc;
-                yylloc.length = 0;
-
-                first_token = &token_buffer[0];
-                last_token = &token_buffer[2];
-
-                action = errorState;
-                goto _Lcheck_token;
-            }
-        }
-
-        for (int tk = 1; tk < TERMINAL_COUNT; ++tk) {
-            if (tk == T_AUTOMATIC_SEMICOLON || tk == T_FEED_UI_PROGRAM    ||
-                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION ||
-                tk == T_FEED_JS_SOURCE_ELEMENT)
-               continue;
-
-            int a = t_action(errorState, tk);
-            if (a > 0 && t_action(a, yytoken)) {
-                const QString msg = qApp->translate("QmlParser", "Expected token `%1'").arg(QLatin1String(spell[tk]));
-                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
-
-                yytoken = tk;
-                yylval = 0;
-                yylloc = token_buffer[0].loc;
-                yylloc.length = 0;
-
-                action = errorState;
-                goto _Lcheck_token;
-            }
-        }
-
-        const QString msg = qApp->translate("QmlParser", "Syntax error");
-        diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
-    }
-
-    return false;
-}
-
-QT_QML_END_NAMESPACE
-
-
-./
-/:
-QT_QML_END_NAMESPACE
-
-
-
-#endif // QMLJSPARSER_P_H
-:/
diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp
deleted file mode 100644
index d3ceba6..0000000
--- a/src/declarative/qml/parser/qmljsast.cpp
+++ /dev/null
@@ -1,955 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmljsast_p.h"
-
-#include "qmljsastvisitor_p.h"
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS { namespace AST {
-
-void Node::accept(Visitor *visitor)
-{
-    if (visitor->preVisit(this)) {
-        accept0(visitor);
-    }
-    visitor->postVisit(this);
-}
-
-void Node::accept(Node *node, Visitor *visitor)
-{
-    if (node)
-        node->accept(visitor);
-}
-
-ExpressionNode *Node::expressionCast()
-{
-    return 0;
-}
-
-BinaryExpression *Node::binaryExpressionCast()
-{
-    return 0;
-}
-
-Statement *Node::statementCast()
-{
-    return 0;
-}
-
-UiObjectMember *Node::uiObjectMemberCast()
-{
-    return 0;
-}
-
-ExpressionNode *ExpressionNode::expressionCast()
-{
-    return this;
-}
-
-BinaryExpression *BinaryExpression::binaryExpressionCast()
-{
-    return this;
-}
-
-Statement *Statement::statementCast()
-{
-    return this;
-}
-
-UiObjectMember *UiObjectMember::uiObjectMemberCast()
-{
-    return this;
-}
-
-void NestedExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-    visitor->endVisit(this);
-}
-
-void ThisExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void IdentifierExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void NullExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void TrueLiteral::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void FalseLiteral::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void StringLiteral::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void NumericLiteral::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void RegExpLiteral::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void ArrayLiteral::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(elements, visitor);
-        accept(elision, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void ObjectLiteral::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(properties, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void ElementList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (ElementList *it = this; it; it = it->next) {
-            accept(it->elision, visitor);
-            accept(it->expression, visitor);
-        }
-    }
-
-    visitor->endVisit(this);
-}
-
-void Elision::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        // ###
-    }
-
-    visitor->endVisit(this);
-}
-
-void PropertyNameAndValueList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (PropertyNameAndValueList *it = this; it; it = it->next) {
-            accept(it->name, visitor);
-            accept(it->value, visitor);
-        }
-    }
-
-    visitor->endVisit(this);
-}
-
-void IdentifierPropertyName::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void StringLiteralPropertyName::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void NumericLiteralPropertyName::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void ArrayMemberExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(base, visitor);
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void FieldMemberExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(base, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void NewMemberExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(base, visitor);
-        accept(arguments, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void NewExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void CallExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(base, visitor);
-        accept(arguments, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void ArgumentList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (ArgumentList *it = this; it; it = it->next) {
-            accept(it->expression, visitor);
-        }
-    }
-
-    visitor->endVisit(this);
-}
-
-void PostIncrementExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(base, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void PostDecrementExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(base, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void DeleteExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void VoidExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void TypeOfExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void PreIncrementExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void PreDecrementExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UnaryPlusExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UnaryMinusExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void TildeExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void NotExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void BinaryExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(left, visitor);
-        accept(right, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void ConditionalExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-        accept(ok, visitor);
-        accept(ko, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void Expression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(left, visitor);
-        accept(right, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void Block::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(statements, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void StatementList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (StatementList *it = this; it; it = it->next) {
-            accept(it->statement, visitor);
-        }
-    }
-
-    visitor->endVisit(this);
-}
-
-void VariableStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(declarations, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void VariableDeclarationList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (VariableDeclarationList *it = this; it; it = it->next) {
-            accept(it->declaration, visitor);
-        }
-    }
-
-    visitor->endVisit(this);
-}
-
-void VariableDeclaration::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void EmptyStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void ExpressionStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void IfStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-        accept(ok, visitor);
-        accept(ko, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void DoWhileStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(statement, visitor);
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void WhileStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void ForStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(initialiser, visitor);
-        accept(condition, visitor);
-        accept(expression, visitor);
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void LocalForStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(declarations, visitor);
-        accept(condition, visitor);
-        accept(expression, visitor);
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void ForEachStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(initialiser, visitor);
-        accept(expression, visitor);
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void LocalForEachStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(declaration, visitor);
-        accept(expression, visitor);
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void ContinueStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void BreakStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void ReturnStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void WithStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void SwitchStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-        accept(block, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void CaseBlock::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(clauses, visitor);
-        accept(defaultClause, visitor);
-        accept(moreClauses, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void CaseClauses::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (CaseClauses *it = this; it; it = it->next) {
-            accept(it->clause, visitor);
-        }
-    }
-
-    visitor->endVisit(this);
-}
-
-void CaseClause::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-        accept(statements, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void DefaultClause::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(statements, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void LabelledStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void ThrowStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void TryStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(statement, visitor);
-        accept(catchExpression, visitor);
-        accept(finallyExpression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void Catch::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void Finally::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void FunctionDeclaration::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(formals, visitor);
-        accept(body, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void FunctionExpression::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(formals, visitor);
-        accept(body, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void FormalParameterList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        // ###
-    }
-
-    visitor->endVisit(this);
-}
-
-void FunctionBody::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(elements, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void Program::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(elements, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void SourceElements::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (SourceElements *it = this; it; it = it->next) {
-            accept(it->element, visitor);
-        }
-    }
-
-    visitor->endVisit(this);
-}
-
-void FunctionSourceElement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(declaration, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void StatementSourceElement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void DebuggerStatement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiProgram::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(imports, visitor);
-        accept(members, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiSignature::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(formals, visitor);
-    }
-    visitor->endVisit(this);
-}
-
-void UiFormalList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (UiFormalList *it = this; it; it = it->next) {
-            accept(it->formal, visitor);
-        }
-    }
-    visitor->endVisit(this);
-}
-
-void UiFormal::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-    visitor->endVisit(this);
-}
-
-void UiPublicMember::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(expression, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiObjectDefinition::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(qualifiedTypeNameId, visitor);
-        accept(initializer, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiObjectInitializer::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(members, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiObjectBinding::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(qualifiedId, visitor);
-        accept(qualifiedTypeNameId, visitor);
-        accept(initializer, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiScriptBinding::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(qualifiedId, visitor);
-        accept(statement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiArrayBinding::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(qualifiedId, visitor);
-        accept(members, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiObjectMemberList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (UiObjectMemberList *it = this; it; it = it->next)
-            accept(it->member, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiArrayMemberList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (UiArrayMemberList *it = this; it; it = it->next)
-            accept(it->member, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiQualifiedId::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiImport::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(importUri, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiImportList::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(import, visitor);
-        accept(next, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void UiSourceElement::accept0(Visitor *visitor)
-{
-    if (visitor->visit(this)) {
-        accept(sourceElement, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-} } // namespace QmlJS::AST
-
-QT_QML_END_NAMESPACE
-
-
diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h
deleted file mode 100644
index 9de733c..0000000
--- a/src/declarative/qml/parser/qmljsast_p.h
+++ /dev/null
@@ -1,2678 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLJSAST_P_H
-#define QMLJSAST_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmljsastvisitor_p.h"
-#include "qmljsglobal_p.h"
-
-#include <QtCore/QString>
-
-QT_QML_BEGIN_NAMESPACE
-
-#define QMLJS_DECLARE_AST_NODE(name) \
-  enum { K = Kind_##name };
-
-namespace QSOperator // ### rename
-{
-
-enum Op {
-    Add,
-    And,
-    InplaceAnd,
-    Assign,
-    BitAnd,
-    BitOr,
-    BitXor,
-    InplaceSub,
-    Div,
-    InplaceDiv,
-    Equal,
-    Ge,
-    Gt,
-    In,
-    InplaceAdd,
-    InstanceOf,
-    Le,
-    LShift,
-    InplaceLeftShift,
-    Lt,
-    Mod,
-    InplaceMod,
-    Mul,
-    InplaceMul,
-    NotEqual,
-    Or,
-    InplaceOr,
-    RShift,
-    InplaceRightShift,
-    StrictEqual,
-    StrictNotEqual,
-    Sub,
-    URShift,
-    InplaceURightShift,
-    InplaceXor
-};
-
-} // namespace QSOperator
-
-namespace QmlJS {
-class NameId;
-namespace AST {
-
-template <typename _T1, typename _T2>
-_T1 cast(_T2 *ast)
-{
-    if (ast && ast->kind == static_cast<_T1>(0)->K)
-        return static_cast<_T1>(ast);
-
-    return 0;
-}
-
-class QML_PARSER_EXPORT Node
-{
-public:
-    enum Kind {
-        Kind_Undefined,
-
-        Kind_ArgumentList,
-        Kind_ArrayLiteral,
-        Kind_ArrayMemberExpression,
-        Kind_BinaryExpression,
-        Kind_Block,
-        Kind_BreakStatement,
-        Kind_CallExpression,
-        Kind_CaseBlock,
-        Kind_CaseClause,
-        Kind_CaseClauses,
-        Kind_Catch,
-        Kind_ConditionalExpression,
-        Kind_ContinueStatement,
-        Kind_DebuggerStatement,
-        Kind_DefaultClause,
-        Kind_DeleteExpression,
-        Kind_DoWhileStatement,
-        Kind_ElementList,
-        Kind_Elision,
-        Kind_EmptyStatement,
-        Kind_Expression,
-        Kind_ExpressionStatement,
-        Kind_FalseLiteral,
-        Kind_FieldMemberExpression,
-        Kind_Finally,
-        Kind_ForEachStatement,
-        Kind_ForStatement,
-        Kind_FormalParameterList,
-        Kind_FunctionBody,
-        Kind_FunctionDeclaration,
-        Kind_FunctionExpression,
-        Kind_FunctionSourceElement,
-        Kind_IdentifierExpression,
-        Kind_IdentifierPropertyName,
-        Kind_IfStatement,
-        Kind_LabelledStatement,
-        Kind_LocalForEachStatement,
-        Kind_LocalForStatement,
-        Kind_NewExpression,
-        Kind_NewMemberExpression,
-        Kind_NotExpression,
-        Kind_NullExpression,
-        Kind_NumericLiteral,
-        Kind_NumericLiteralPropertyName,
-        Kind_ObjectLiteral,
-        Kind_PostDecrementExpression,
-        Kind_PostIncrementExpression,
-        Kind_PreDecrementExpression,
-        Kind_PreIncrementExpression,
-        Kind_Program,
-        Kind_PropertyName,
-        Kind_PropertyNameAndValueList,
-        Kind_RegExpLiteral,
-        Kind_ReturnStatement,
-        Kind_SourceElement,
-        Kind_SourceElements,
-        Kind_StatementList,
-        Kind_StatementSourceElement,
-        Kind_StringLiteral,
-        Kind_StringLiteralPropertyName,
-        Kind_SwitchStatement,
-        Kind_ThisExpression,
-        Kind_ThrowStatement,
-        Kind_TildeExpression,
-        Kind_TrueLiteral,
-        Kind_TryStatement,
-        Kind_TypeOfExpression,
-        Kind_UnaryMinusExpression,
-        Kind_UnaryPlusExpression,
-        Kind_VariableDeclaration,
-        Kind_VariableDeclarationList,
-        Kind_VariableStatement,
-        Kind_VoidExpression,
-        Kind_WhileStatement,
-        Kind_WithStatement,
-        Kind_NestedExpression,
-
-        Kind_UiArrayBinding,
-        Kind_UiImport,
-        Kind_UiImportList,
-        Kind_UiObjectBinding,
-        Kind_UiObjectDefinition,
-        Kind_UiObjectInitializer,
-        Kind_UiObjectMemberList,
-        Kind_UiArrayMemberList,
-        Kind_UiProgram,
-        Kind_UiParameterList,
-        Kind_UiPublicMember,
-        Kind_UiQualifiedId,
-        Kind_UiScriptBinding,
-        Kind_UiSourceElement,
-        Kind_UiFormal,
-        Kind_UiFormalList,
-        Kind_UiSignature
-    };
-
-    inline Node()
-        : kind(Kind_Undefined) {}
-
-    virtual ~Node() {}
-
-    virtual ExpressionNode *expressionCast();
-    virtual BinaryExpression *binaryExpressionCast();
-    virtual Statement *statementCast();
-    virtual UiObjectMember *uiObjectMemberCast();
-
-    void accept(Visitor *visitor);
-    static void accept(Node *node, Visitor *visitor);
-
-    inline static void acceptChild(Node *node, Visitor *visitor)
-    { return accept(node, visitor); } // ### remove
-
-    virtual void accept0(Visitor *visitor) = 0;
-
-// attributes
-    int kind;
-};
-
-class QML_PARSER_EXPORT ExpressionNode: public Node
-{
-public:
-    ExpressionNode() {}
-    virtual ~ExpressionNode() {}
-
-    virtual ExpressionNode *expressionCast();
-
-    virtual SourceLocation firstSourceLocation() const = 0;
-    virtual SourceLocation lastSourceLocation() const = 0;
-};
-
-class QML_PARSER_EXPORT Statement: public Node
-{
-public:
-    Statement() {}
-    virtual ~Statement() {}
-
-    virtual Statement *statementCast();
-
-    virtual SourceLocation firstSourceLocation() const = 0;
-    virtual SourceLocation lastSourceLocation() const = 0;
-};
-
-class QML_PARSER_EXPORT UiFormal: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiFormal)
-
-    UiFormal(NameId *name, NameId *alias = 0)
-      : name(name), alias(alias)
-    { }
-
-    virtual SourceLocation firstSourceLocation() const
-    { return SourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return SourceLocation(); }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    NameId *name;
-    NameId *alias;
-    SourceLocation identifierToken;
-    SourceLocation asToken;
-    SourceLocation aliasToken;
-};
-
-class QML_PARSER_EXPORT UiFormalList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiFormalList)
-
-    UiFormalList(UiFormal *formal)
-            : formal(formal), next(this) {}
-
-    UiFormalList(UiFormalList *previous, UiFormal *formal)
-            : formal(formal)
-    {
-        next = previous->next;
-        previous->next = this;
-    }
-
-    UiFormalList *finish()
-    {
-        UiFormalList *head = next;
-        next = 0;
-        return head;
-    }
-
-    virtual SourceLocation firstSourceLocation() const
-    { return SourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return SourceLocation(); }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    UiFormal *formal;
-    UiFormalList *next;
-};
-
-class QML_PARSER_EXPORT UiSignature: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiSignature)
-
-    UiSignature(UiFormalList *formals = 0)
-        : formals(formals)
-    { }
-
-    virtual SourceLocation firstSourceLocation() const
-    { return SourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return SourceLocation(); }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    SourceLocation lparenToken;
-    UiFormalList *formals;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT NestedExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(NestedExpression)
-
-    NestedExpression(ExpressionNode *expression)
-        : expression(expression)
-    { kind = K; }
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return lparenToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return rparenToken; }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation lparenToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT ThisExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ThisExpression)
-
-    ThisExpression() { kind = K; }
-    virtual ~ThisExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return thisToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return thisToken; }
-
-// attributes
-    SourceLocation thisToken;
-};
-
-class QML_PARSER_EXPORT IdentifierExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(IdentifierExpression)
-
-    IdentifierExpression(NameId *n):
-        name (n) { kind = K; }
-
-    virtual ~IdentifierExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return identifierToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return identifierToken; }
-
-// attributes
-    NameId *name;
-    SourceLocation identifierToken;
-};
-
-class QML_PARSER_EXPORT NullExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(NullExpression)
-
-    NullExpression() { kind = K; }
-    virtual ~NullExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return nullToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return nullToken; }
-
-// attributes
-    SourceLocation nullToken;
-};
-
-class QML_PARSER_EXPORT TrueLiteral: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(TrueLiteral)
-
-    TrueLiteral() { kind = K; }
-    virtual ~TrueLiteral() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return trueToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return trueToken; }
-
-// attributes
-    SourceLocation trueToken;
-};
-
-class QML_PARSER_EXPORT FalseLiteral: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(FalseLiteral)
-
-    FalseLiteral() { kind = K; }
-    virtual ~FalseLiteral() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return falseToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return falseToken; }
-
-// attributes
-    SourceLocation falseToken;
-};
-
-class QML_PARSER_EXPORT NumericLiteral: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(NumericLiteral)
-
-    NumericLiteral(double v):
-        value(v) { kind = K; }
-    virtual ~NumericLiteral() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return literalToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return literalToken; }
-
-// attributes:
-    double value;
-    SourceLocation literalToken;
-};
-
-class QML_PARSER_EXPORT StringLiteral: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(StringLiteral)
-
-    StringLiteral(NameId *v):
-        value (v) { kind = K; }
-
-    virtual ~StringLiteral() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return literalToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return literalToken; }
-
-// attributes:
-    NameId *value;
-    SourceLocation literalToken;
-};
-
-class QML_PARSER_EXPORT RegExpLiteral: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(RegExpLiteral)
-
-    RegExpLiteral(NameId *p, int f):
-        pattern (p), flags (f) { kind = K; }
-
-    virtual ~RegExpLiteral() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return literalToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return literalToken; }
-
-// attributes:
-    NameId *pattern;
-    int flags;
-    SourceLocation literalToken;
-};
-
-class QML_PARSER_EXPORT ArrayLiteral: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ArrayLiteral)
-
-    ArrayLiteral(Elision *e):
-        elements (0), elision (e)
-        { kind = K; }
-
-    ArrayLiteral(ElementList *elts):
-        elements (elts), elision (0)
-        { kind = K; }
-
-    ArrayLiteral(ElementList *elts, Elision *e):
-        elements (elts), elision (e)
-        { kind = K; }
-
-    virtual ~ArrayLiteral() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return lbracketToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return rbracketToken; }
-
-// attributes
-    ElementList *elements;
-    Elision *elision;
-    SourceLocation lbracketToken;
-    SourceLocation commaToken;
-    SourceLocation rbracketToken;
-};
-
-class QML_PARSER_EXPORT ObjectLiteral: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ObjectLiteral)
-
-    ObjectLiteral():
-        properties (0) { kind = K; }
-
-    ObjectLiteral(PropertyNameAndValueList *plist):
-        properties (plist) { kind = K; }
-
-    virtual ~ObjectLiteral() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return lbraceToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return rbraceToken; }
-
-// attributes
-    PropertyNameAndValueList *properties;
-    SourceLocation lbraceToken;
-    SourceLocation rbraceToken;
-};
-
-class QML_PARSER_EXPORT ElementList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ElementList)
-
-    ElementList(Elision *e, ExpressionNode *expr):
-        elision (e), expression (expr), next (this)
-    { kind = K; }
-
-    ElementList(ElementList *previous, Elision *e, ExpressionNode *expr):
-        elision (e), expression (expr)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~ElementList() {}
-
-    inline ElementList *finish ()
-    {
-        ElementList *front = next;
-        next = 0;
-        return front;
-    }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    Elision *elision;
-    ExpressionNode *expression;
-    ElementList *next;
-    SourceLocation commaToken;
-};
-
-class QML_PARSER_EXPORT Elision: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(Elision)
-
-    Elision():
-        next (this) { kind = K; }
-
-    Elision(Elision *previous)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~Elision() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    inline Elision *finish ()
-    {
-        Elision *front = next;
-        next = 0;
-        return front;
-    }
-
-// attributes
-    Elision *next;
-    SourceLocation commaToken;
-};
-
-class QML_PARSER_EXPORT PropertyNameAndValueList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(PropertyNameAndValueList)
-
-    PropertyNameAndValueList(PropertyName *n, ExpressionNode *v):
-        name (n), value (v), next (this)
-        { kind = K; }
-
-    PropertyNameAndValueList(PropertyNameAndValueList *previous, PropertyName *n, ExpressionNode *v):
-        name (n), value (v)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~PropertyNameAndValueList() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    inline PropertyNameAndValueList *finish ()
-    {
-        PropertyNameAndValueList *front = next;
-        next = 0;
-        return front;
-    }
-
-// attributes
-    PropertyName *name;
-    ExpressionNode *value;
-    PropertyNameAndValueList *next;
-    SourceLocation colonToken;
-    SourceLocation commaToken;
-};
-
-class QML_PARSER_EXPORT PropertyName: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(PropertyName)
-
-    PropertyName() { kind = K; }
-    virtual ~PropertyName() {}
-
-// attributes
-    SourceLocation propertyNameToken;
-};
-
-class QML_PARSER_EXPORT IdentifierPropertyName: public PropertyName
-{
-public:
-    QMLJS_DECLARE_AST_NODE(IdentifierPropertyName)
-
-    IdentifierPropertyName(NameId *n):
-        id (n) { kind = K; }
-
-    virtual ~IdentifierPropertyName() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    NameId *id;
-};
-
-class QML_PARSER_EXPORT StringLiteralPropertyName: public PropertyName
-{
-public:
-    QMLJS_DECLARE_AST_NODE(StringLiteralPropertyName)
-
-    StringLiteralPropertyName(NameId *n):
-        id (n) { kind = K; }
-    virtual ~StringLiteralPropertyName() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    NameId *id;
-};
-
-class QML_PARSER_EXPORT NumericLiteralPropertyName: public PropertyName
-{
-public:
-    QMLJS_DECLARE_AST_NODE(NumericLiteralPropertyName)
-
-    NumericLiteralPropertyName(double n):
-        id (n) { kind = K; }
-    virtual ~NumericLiteralPropertyName() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    double id;
-};
-
-class QML_PARSER_EXPORT ArrayMemberExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ArrayMemberExpression)
-
-    ArrayMemberExpression(ExpressionNode *b, ExpressionNode *e):
-        base (b), expression (e)
-        { kind = K; }
-
-    virtual ~ArrayMemberExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return base->firstSourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return rbracketToken; }
-
-// attributes
-    ExpressionNode *base;
-    ExpressionNode *expression;
-    SourceLocation lbracketToken;
-    SourceLocation rbracketToken;
-};
-
-class QML_PARSER_EXPORT FieldMemberExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(FieldMemberExpression)
-
-    FieldMemberExpression(ExpressionNode *b, NameId *n):
-        base (b), name (n)
-        { kind = K; }
-
-    virtual ~FieldMemberExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return base->firstSourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return identifierToken; }
-
-    // attributes
-    ExpressionNode *base;
-    NameId *name;
-    SourceLocation dotToken;
-    SourceLocation identifierToken;
-};
-
-class QML_PARSER_EXPORT NewMemberExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(NewMemberExpression)
-
-    NewMemberExpression(ExpressionNode *b, ArgumentList *a):
-        base (b), arguments (a)
-        { kind = K; }
-
-    virtual ~NewMemberExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return newToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return rparenToken; }
-
-    // attributes
-    ExpressionNode *base;
-    ArgumentList *arguments;
-    SourceLocation newToken;
-    SourceLocation lparenToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT NewExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(NewExpression)
-
-    NewExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~NewExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return newToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation newToken;
-};
-
-class QML_PARSER_EXPORT CallExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(CallExpression)
-
-    CallExpression(ExpressionNode *b, ArgumentList *a):
-        base (b), arguments (a)
-        { kind = K; }
-
-    virtual ~CallExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return base->firstSourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return rparenToken; }
-
-// attributes
-    ExpressionNode *base;
-    ArgumentList *arguments;
-    SourceLocation lparenToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT ArgumentList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ArgumentList)
-
-    ArgumentList(ExpressionNode *e):
-        expression (e), next (this)
-        { kind = K; }
-
-    ArgumentList(ArgumentList *previous, ExpressionNode *e):
-        expression (e)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~ArgumentList() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    inline ArgumentList *finish ()
-    {
-        ArgumentList *front = next;
-        next = 0;
-        return front;
-    }
-
-// attributes
-    ExpressionNode *expression;
-    ArgumentList *next;
-    SourceLocation commaToken;
-};
-
-class QML_PARSER_EXPORT PostIncrementExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(PostIncrementExpression)
-
-    PostIncrementExpression(ExpressionNode *b):
-        base (b) { kind = K; }
-
-    virtual ~PostIncrementExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return base->firstSourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return incrementToken; }
-
-// attributes
-    ExpressionNode *base;
-    SourceLocation incrementToken;
-};
-
-class QML_PARSER_EXPORT PostDecrementExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(PostDecrementExpression)
-
-    PostDecrementExpression(ExpressionNode *b):
-        base (b) { kind = K; }
-
-    virtual ~PostDecrementExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return base->firstSourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return decrementToken; }
-
-// attributes
-    ExpressionNode *base;
-    SourceLocation decrementToken;
-};
-
-class QML_PARSER_EXPORT DeleteExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(DeleteExpression)
-
-    DeleteExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-    virtual ~DeleteExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return deleteToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation deleteToken;
-};
-
-class QML_PARSER_EXPORT VoidExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(VoidExpression)
-
-    VoidExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~VoidExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return voidToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation voidToken;
-};
-
-class QML_PARSER_EXPORT TypeOfExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(TypeOfExpression)
-
-    TypeOfExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~TypeOfExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return typeofToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation typeofToken;
-};
-
-class QML_PARSER_EXPORT PreIncrementExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(PreIncrementExpression)
-
-    PreIncrementExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~PreIncrementExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return incrementToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation incrementToken;
-};
-
-class QML_PARSER_EXPORT PreDecrementExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(PreDecrementExpression)
-
-    PreDecrementExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~PreDecrementExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return decrementToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation decrementToken;
-};
-
-class QML_PARSER_EXPORT UnaryPlusExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UnaryPlusExpression)
-
-    UnaryPlusExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~UnaryPlusExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return plusToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation plusToken;
-};
-
-class QML_PARSER_EXPORT UnaryMinusExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UnaryMinusExpression)
-
-    UnaryMinusExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~UnaryMinusExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return minusToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation minusToken;
-};
-
-class QML_PARSER_EXPORT TildeExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(TildeExpression)
-
-    TildeExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~TildeExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return tildeToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation tildeToken;
-};
-
-class QML_PARSER_EXPORT NotExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(NotExpression)
-
-    NotExpression(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~NotExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return notToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return expression->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation notToken;
-};
-
-class QML_PARSER_EXPORT BinaryExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(BinaryExpression)
-
-    BinaryExpression(ExpressionNode *l, int o, ExpressionNode *r):
-        left (l), op (o), right (r)
-        { kind = K; }
-
-    virtual ~BinaryExpression() {}
-
-    virtual BinaryExpression *binaryExpressionCast();
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return left->firstSourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return right->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *left;
-    int op;
-    ExpressionNode *right;
-    SourceLocation operatorToken;
-};
-
-class QML_PARSER_EXPORT ConditionalExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ConditionalExpression)
-
-    ConditionalExpression(ExpressionNode *e, ExpressionNode *t, ExpressionNode *f):
-        expression (e), ok (t), ko (f)
-        { kind = K; }
-
-    virtual ~ConditionalExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return expression->firstSourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return ko->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    ExpressionNode *ok;
-    ExpressionNode *ko;
-    SourceLocation questionToken;
-    SourceLocation colonToken;
-};
-
-class QML_PARSER_EXPORT Expression: public ExpressionNode // ### rename
-{
-public:
-    QMLJS_DECLARE_AST_NODE(Expression)
-
-    Expression(ExpressionNode *l, ExpressionNode *r):
-        left (l), right (r) { kind = K; }
-
-    virtual ~Expression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return left->firstSourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return right->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *left;
-    ExpressionNode *right;
-    SourceLocation commaToken;
-};
-
-class QML_PARSER_EXPORT Block: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(Block)
-
-    Block(StatementList *slist):
-        statements (slist) { kind = K; }
-
-    virtual ~Block() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return lbraceToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return rbraceToken; }
-
-    // attributes
-    StatementList *statements;
-    SourceLocation lbraceToken;
-    SourceLocation rbraceToken;
-};
-
-class QML_PARSER_EXPORT StatementList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(StatementList)
-
-    StatementList(Statement *stmt):
-        statement (stmt), next (this)
-        { kind = K; }
-
-    StatementList(StatementList *previous, Statement *stmt):
-        statement (stmt)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~StatementList() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    inline StatementList *finish ()
-    {
-        StatementList *front = next;
-        next = 0;
-        return front;
-    }
-
-// attributes
-    Statement *statement;
-    StatementList *next;
-};
-
-class QML_PARSER_EXPORT VariableStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(VariableStatement)
-
-    VariableStatement(VariableDeclarationList *vlist):
-        declarations (vlist)
-        { kind = K; }
-
-    virtual ~VariableStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return declarationKindToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-// attributes
-    VariableDeclarationList *declarations;
-    SourceLocation declarationKindToken;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT VariableDeclaration: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(VariableDeclaration)
-
-    VariableDeclaration(NameId *n, ExpressionNode *e):
-        name (n), expression (e), readOnly(false)
-        { kind = K; }
-
-    virtual ~VariableDeclaration() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    NameId *name;
-    ExpressionNode *expression;
-    bool readOnly;
-    SourceLocation identifierToken;
-};
-
-class QML_PARSER_EXPORT VariableDeclarationList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(VariableDeclarationList)
-
-    VariableDeclarationList(VariableDeclaration *decl):
-        declaration (decl), next (this)
-        { kind = K; }
-
-    VariableDeclarationList(VariableDeclarationList *previous, VariableDeclaration *decl):
-        declaration (decl)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~VariableDeclarationList() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    inline VariableDeclarationList *finish (bool readOnly)
-    {
-        VariableDeclarationList *front = next;
-        next = 0;
-        if (readOnly) {
-            VariableDeclarationList *vdl;
-            for (vdl = front; vdl != 0; vdl = vdl->next)
-                vdl->declaration->readOnly = true;
-        }
-        return front;
-    }
-
-// attributes
-    VariableDeclaration *declaration;
-    VariableDeclarationList *next;
-    SourceLocation commaToken;
-};
-
-class QML_PARSER_EXPORT EmptyStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(EmptyStatement)
-
-    EmptyStatement() { kind = K; }
-    virtual ~EmptyStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return semicolonToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-// attributes
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT ExpressionStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ExpressionStatement)
-
-    ExpressionStatement(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~ExpressionStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return expression->firstSourceLocation(); }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT IfStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(IfStatement)
-
-    IfStatement(ExpressionNode *e, Statement *t, Statement *f = 0):
-        expression (e), ok (t), ko (f)
-        { kind = K; }
-
-    virtual ~IfStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return ifToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    {
-        if (ko)
-            return ko->lastSourceLocation();
-
-        return ok->lastSourceLocation();
-    }
-
-// attributes
-    ExpressionNode *expression;
-    Statement *ok;
-    Statement *ko;
-    SourceLocation ifToken;
-    SourceLocation lparenToken;
-    SourceLocation rparenToken;
-    SourceLocation elseToken;
-};
-
-class QML_PARSER_EXPORT DoWhileStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(DoWhileStatement)
-
-    DoWhileStatement(Statement *stmt, ExpressionNode *e):
-        statement (stmt), expression (e)
-        { kind = K; }
-
-    virtual ~DoWhileStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return doToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-// attributes
-    Statement *statement;
-    ExpressionNode *expression;
-    SourceLocation doToken;
-    SourceLocation whileToken;
-    SourceLocation lparenToken;
-    SourceLocation rparenToken;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT WhileStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(WhileStatement)
-
-    WhileStatement(ExpressionNode *e, Statement *stmt):
-        expression (e), statement (stmt)
-        { kind = K; }
-
-    virtual ~WhileStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return whileToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return statement->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    Statement *statement;
-    SourceLocation whileToken;
-    SourceLocation lparenToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT ForStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ForStatement)
-
-    ForStatement(ExpressionNode *i, ExpressionNode *c, ExpressionNode *e, Statement *stmt):
-        initialiser (i), condition (c), expression (e), statement (stmt)
-        { kind = K; }
-
-    virtual ~ForStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return forToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return statement->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *initialiser;
-    ExpressionNode *condition;
-    ExpressionNode *expression;
-    Statement *statement;
-    SourceLocation forToken;
-    SourceLocation lparenToken;
-    SourceLocation firstSemicolonToken;
-    SourceLocation secondSemicolonToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT LocalForStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(LocalForStatement)
-
-    LocalForStatement(VariableDeclarationList *vlist, ExpressionNode *c, ExpressionNode *e, Statement *stmt):
-        declarations (vlist), condition (c), expression (e), statement (stmt)
-        { kind = K; }
-
-    virtual ~LocalForStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return forToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return statement->lastSourceLocation(); }
-
-// attributes
-    VariableDeclarationList *declarations;
-    ExpressionNode *condition;
-    ExpressionNode *expression;
-    Statement *statement;
-    SourceLocation forToken;
-    SourceLocation lparenToken;
-    SourceLocation varToken;
-    SourceLocation firstSemicolonToken;
-    SourceLocation secondSemicolonToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT ForEachStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ForEachStatement)
-
-    ForEachStatement(ExpressionNode *i, ExpressionNode *e, Statement *stmt):
-        initialiser (i), expression (e), statement (stmt)
-        { kind = K; }
-
-    virtual ~ForEachStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return forToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return statement->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *initialiser;
-    ExpressionNode *expression;
-    Statement *statement;
-    SourceLocation forToken;
-    SourceLocation lparenToken;
-    SourceLocation inToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT LocalForEachStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(LocalForEachStatement)
-
-    LocalForEachStatement(VariableDeclaration *v, ExpressionNode *e, Statement *stmt):
-        declaration (v), expression (e), statement (stmt)
-        { kind = K; }
-
-    virtual ~LocalForEachStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return forToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return statement->lastSourceLocation(); }
-
-// attributes
-    VariableDeclaration *declaration;
-    ExpressionNode *expression;
-    Statement *statement;
-    SourceLocation forToken;
-    SourceLocation lparenToken;
-    SourceLocation varToken;
-    SourceLocation inToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT ContinueStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ContinueStatement)
-
-    ContinueStatement(NameId *l = 0):
-        label (l) { kind = K; }
-
-    virtual ~ContinueStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return continueToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-// attributes
-    NameId *label;
-    SourceLocation continueToken;
-    SourceLocation identifierToken;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT BreakStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(BreakStatement)
-
-    BreakStatement(NameId *l = 0):
-        label (l) { kind = K; }
-
-    virtual ~BreakStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return breakToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-    // attributes
-    NameId *label;
-    SourceLocation breakToken;
-    SourceLocation identifierToken;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT ReturnStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ReturnStatement)
-
-    ReturnStatement(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~ReturnStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return returnToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-// attributes
-    ExpressionNode *expression;
-    SourceLocation returnToken;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT WithStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(WithStatement)
-
-    WithStatement(ExpressionNode *e, Statement *stmt):
-        expression (e), statement (stmt)
-        { kind = K; }
-
-    virtual ~WithStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return withToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return statement->lastSourceLocation(); }
-
-// attributes
-    ExpressionNode *expression;
-    Statement *statement;
-    SourceLocation withToken;
-    SourceLocation lparenToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT CaseBlock: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(CaseBlock)
-
-    CaseBlock(CaseClauses *c, DefaultClause *d = 0, CaseClauses *r = 0):
-        clauses (c), defaultClause (d), moreClauses (r)
-        { kind = K; }
-
-    virtual ~CaseBlock() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    CaseClauses *clauses;
-    DefaultClause *defaultClause;
-    CaseClauses *moreClauses;
-    SourceLocation lbraceToken;
-    SourceLocation rbraceToken;
-};
-
-class QML_PARSER_EXPORT SwitchStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(SwitchStatement)
-
-    SwitchStatement(ExpressionNode *e, CaseBlock *b):
-        expression (e), block (b)
-        { kind = K; }
-
-    virtual ~SwitchStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return switchToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return block->rbraceToken; }
-
-// attributes
-    ExpressionNode *expression;
-    CaseBlock *block;
-    SourceLocation switchToken;
-    SourceLocation lparenToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT CaseClauses: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(CaseClauses)
-
-    CaseClauses(CaseClause *c):
-        clause (c), next (this)
-        { kind = K; }
-
-    CaseClauses(CaseClauses *previous, CaseClause *c):
-        clause (c)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~CaseClauses() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    inline CaseClauses *finish ()
-    {
-        CaseClauses *front = next;
-        next = 0;
-        return front;
-    }
-
-//attributes
-    CaseClause *clause;
-    CaseClauses *next;
-};
-
-class QML_PARSER_EXPORT CaseClause: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(CaseClause)
-
-    CaseClause(ExpressionNode *e, StatementList *slist):
-        expression (e), statements (slist)
-        { kind = K; }
-
-    virtual ~CaseClause() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    ExpressionNode *expression;
-    StatementList *statements;
-    SourceLocation caseToken;
-    SourceLocation colonToken;
-};
-
-class QML_PARSER_EXPORT DefaultClause: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(DefaultClause)
-
-    DefaultClause(StatementList *slist):
-        statements (slist)
-        { kind = K; }
-
-    virtual ~DefaultClause() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    StatementList *statements;
-    SourceLocation defaultToken;
-    SourceLocation colonToken;
-};
-
-class QML_PARSER_EXPORT LabelledStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(LabelledStatement)
-
-    LabelledStatement(NameId *l, Statement *stmt):
-        label (l), statement (stmt)
-        { kind = K; }
-
-    virtual ~LabelledStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return identifierToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return statement->lastSourceLocation(); }
-
-// attributes
-    NameId *label;
-    Statement *statement;
-    SourceLocation identifierToken;
-    SourceLocation colonToken;
-};
-
-class QML_PARSER_EXPORT ThrowStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(ThrowStatement)
-
-    ThrowStatement(ExpressionNode *e):
-        expression (e) { kind = K; }
-
-    virtual ~ThrowStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return throwToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-    // attributes
-    ExpressionNode *expression;
-    SourceLocation throwToken;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT Catch: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(Catch)
-
-    Catch(NameId *n, Block *stmt):
-        name (n), statement (stmt)
-        { kind = K; }
-
-    virtual ~Catch() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    NameId *name;
-    Block *statement;
-    SourceLocation catchToken;
-    SourceLocation lparenToken;
-    SourceLocation identifierToken;
-    SourceLocation rparenToken;
-};
-
-class QML_PARSER_EXPORT Finally: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(Finally)
-
-    Finally(Block *stmt):
-        statement (stmt)
-        { kind = K; }
-
-    virtual ~Finally() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    Block *statement;
-    SourceLocation finallyToken;
-};
-
-class QML_PARSER_EXPORT TryStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(TryStatement)
-
-    TryStatement(Statement *stmt, Catch *c, Finally *f):
-        statement (stmt), catchExpression (c), finallyExpression (f)
-        { kind = K; }
-
-    TryStatement(Statement *stmt, Finally *f):
-        statement (stmt), catchExpression (0), finallyExpression (f)
-        { kind = K; }
-
-    TryStatement(Statement *stmt, Catch *c):
-        statement (stmt), catchExpression (c), finallyExpression (0)
-        { kind = K; }
-
-    virtual ~TryStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return tryToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    {
-        if (finallyExpression)
-            return finallyExpression->statement->rbraceToken;
-        else if (catchExpression)
-            return catchExpression->statement->rbraceToken;
-
-        return statement->lastSourceLocation();
-    }
-
-// attributes
-    Statement *statement;
-    Catch *catchExpression;
-    Finally *finallyExpression;
-    SourceLocation tryToken;
-};
-
-class QML_PARSER_EXPORT FunctionExpression: public ExpressionNode
-{
-public:
-    QMLJS_DECLARE_AST_NODE(FunctionExpression)
-
-    FunctionExpression(NameId *n, FormalParameterList *f, FunctionBody *b):
-        name (n), formals (f), body (b)
-        { kind = K; }
-
-    virtual ~FunctionExpression() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return functionToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return rbraceToken; }
-
-// attributes
-    NameId *name;
-    FormalParameterList *formals;
-    FunctionBody *body;
-    SourceLocation functionToken;
-    SourceLocation identifierToken;
-    SourceLocation lparenToken;
-    SourceLocation rparenToken;
-    SourceLocation lbraceToken;
-    SourceLocation rbraceToken;
-};
-
-class QML_PARSER_EXPORT FunctionDeclaration: public FunctionExpression
-{
-public:
-    QMLJS_DECLARE_AST_NODE(FunctionDeclaration)
-
-    FunctionDeclaration(NameId *n, FormalParameterList *f, FunctionBody *b):
-        FunctionExpression(n, f, b)
-        { kind = K; }
-
-    virtual ~FunctionDeclaration() {}
-
-    virtual void accept0(Visitor *visitor);
-};
-
-class QML_PARSER_EXPORT FormalParameterList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(FormalParameterList)
-
-    FormalParameterList(NameId *n):
-        name (n), next (this)
-        { kind = K; }
-
-    FormalParameterList(FormalParameterList *previous, NameId *n):
-        name (n)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~FormalParameterList() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    inline FormalParameterList *finish ()
-    {
-        FormalParameterList *front = next;
-        next = 0;
-        return front;
-    }
-
-// attributes
-    NameId *name;
-    FormalParameterList *next;
-    SourceLocation commaToken;
-    SourceLocation identifierToken;
-};
-
-class QML_PARSER_EXPORT FunctionBody: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(FunctionBody)
-
-    FunctionBody(SourceElements *elts):
-        elements (elts)
-        { kind = K; }
-
-    virtual ~FunctionBody() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    SourceElements *elements;
-};
-
-class QML_PARSER_EXPORT Program: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(Program)
-
-    Program(SourceElements *elts):
-        elements (elts)
-        { kind = K; }
-
-    virtual ~Program() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    SourceElements *elements;
-};
-
-class QML_PARSER_EXPORT SourceElements: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(SourceElements)
-
-    SourceElements(SourceElement *elt):
-        element (elt), next (this)
-        { kind = K; }
-
-    SourceElements(SourceElements *previous, SourceElement *elt):
-        element (elt)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~SourceElements() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    inline SourceElements *finish ()
-    {
-        SourceElements *front = next;
-        next = 0;
-        return front;
-    }
-
-// attributes
-    SourceElement *element;
-    SourceElements *next;
-};
-
-class QML_PARSER_EXPORT SourceElement: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(SourceElement)
-
-    inline SourceElement()
-        { kind = K; }
-
-    virtual ~SourceElement() {}
-};
-
-class QML_PARSER_EXPORT FunctionSourceElement: public SourceElement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(FunctionSourceElement)
-
-    FunctionSourceElement(FunctionDeclaration *f):
-        declaration (f)
-        { kind = K; }
-
-    virtual ~FunctionSourceElement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    FunctionDeclaration *declaration;
-};
-
-class QML_PARSER_EXPORT StatementSourceElement: public SourceElement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(StatementSourceElement)
-
-    StatementSourceElement(Statement *stmt):
-        statement (stmt)
-        { kind = K; }
-
-    virtual ~StatementSourceElement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    Statement *statement;
-};
-
-class QML_PARSER_EXPORT DebuggerStatement: public Statement
-{
-public:
-    QMLJS_DECLARE_AST_NODE(DebuggerStatement)
-
-    DebuggerStatement()
-        { kind = K; }
-
-    virtual ~DebuggerStatement() {}
-
-    virtual void accept0(Visitor *visitor);
-
-    virtual SourceLocation firstSourceLocation() const
-    { return debuggerToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-// attributes
-    SourceLocation debuggerToken;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT UiProgram: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiProgram)
-
-    UiProgram(UiImportList *imports, UiObjectMemberList *members)
-        : imports(imports), members(members)
-    { kind = K; }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    UiImportList *imports;
-    UiObjectMemberList *members;
-};
-
-class QML_PARSER_EXPORT UiQualifiedId: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiQualifiedId)
-
-    UiQualifiedId(NameId *name)
-        : next(this), name(name)
-    { kind = K; }
-
-    UiQualifiedId(UiQualifiedId *previous, NameId *name)
-        : name(name)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~UiQualifiedId() {}
-
-    UiQualifiedId *finish()
-    {
-        UiQualifiedId *head = next;
-        next = 0;
-        return head;
-    }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    UiQualifiedId *next;
-    NameId *name;
-    SourceLocation identifierToken;
-};
-
-class QML_PARSER_EXPORT UiImport: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiImport)
-
-    UiImport(NameId *fileName)
-        : fileName(fileName), importUri(0), importId(0)
-    { kind = K; }
-
-    UiImport(UiQualifiedId *uri)
-        : fileName(0), importUri(uri), importId(0)
-    { kind = K; }
-
-    virtual SourceLocation firstSourceLocation() const
-    { return importToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return semicolonToken; }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    NameId *fileName;
-    UiQualifiedId *importUri;
-    NameId *importId;
-    SourceLocation importToken;
-    SourceLocation fileNameToken;
-    SourceLocation versionToken;
-    SourceLocation asToken;
-    SourceLocation importIdToken;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT UiImportList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiImportList)
-
-    UiImportList(UiImport *import)
-        : import(import),
-          next(this)
-    { kind = K; }
-
-    UiImportList(UiImportList *previous, UiImport *import)
-        : import(import)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual SourceLocation firstSourceLocation() const
-    {
-        if (import) return import->firstSourceLocation();
-        else return SourceLocation();
-    }
-
-    virtual SourceLocation lastSourceLocation() const
-    {
-        for (const UiImportList *it = this; it; it = it->next)
-            if (!it->next && it->import)
-                return it->import->lastSourceLocation();
-
-        return SourceLocation();
-    }
-
-    UiImportList *finish()
-    {
-        UiImportList *head = next;
-        next = 0;
-        return head;
-    }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    UiImport *import;
-    UiImportList *next;
-};
-
-class QML_PARSER_EXPORT UiObjectMember: public Node
-{
-public:
-    virtual SourceLocation firstSourceLocation() const = 0;
-    virtual SourceLocation lastSourceLocation() const = 0;
-
-    virtual UiObjectMember *uiObjectMemberCast();
-};
-
-class QML_PARSER_EXPORT UiObjectMemberList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiObjectMemberList)
-
-    UiObjectMemberList(UiObjectMember *member)
-        : next(this), member(member)
-    { kind = K; }
-
-    UiObjectMemberList(UiObjectMemberList *previous, UiObjectMember *member)
-        : member(member)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual void accept0(Visitor *visitor);
-
-    UiObjectMemberList *finish()
-    {
-        UiObjectMemberList *head = next;
-        next = 0;
-        return head;
-    }
-
-// attributes
-    UiObjectMemberList *next;
-    UiObjectMember *member;
-};
-
-class QML_PARSER_EXPORT UiArrayMemberList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiArrayMemberList)
-
-    UiArrayMemberList(UiObjectMember *member)
-        : next(this), member(member)
-    { kind = K; }
-
-    UiArrayMemberList(UiArrayMemberList *previous, UiObjectMember *member)
-        : member(member)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual void accept0(Visitor *visitor);
-
-    UiArrayMemberList *finish()
-    {
-        UiArrayMemberList *head = next;
-        next = 0;
-        return head;
-    }
-
-// attributes
-    UiArrayMemberList *next;
-    UiObjectMember *member;
-    SourceLocation commaToken;
-};
-
-class QML_PARSER_EXPORT UiObjectInitializer: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiObjectInitializer)
-
-    UiObjectInitializer(UiObjectMemberList *members)
-        : members(members)
-    { kind = K; }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    SourceLocation lbraceToken;
-    UiObjectMemberList *members;
-    SourceLocation rbraceToken;
-};
-
-class QML_PARSER_EXPORT UiParameterList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiParameterList)
-
-    UiParameterList(NameId *t, NameId *n):
-        type (t), name (n), next (this)
-        { kind = K; }
-
-    UiParameterList(UiParameterList *previous, NameId *t, NameId *n):
-        type (t), name (n)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    virtual ~UiParameterList() {}
-
-    virtual void accept0(Visitor *) {}
-
-    inline UiParameterList *finish ()
-    {
-        UiParameterList *front = next;
-        next = 0;
-        return front;
-    }
-
-// attributes
-    NameId *type;
-    NameId *name;
-    UiParameterList *next;
-    SourceLocation commaToken;
-    SourceLocation identifierToken;
-};
-
-class QML_PARSER_EXPORT UiPublicMember: public UiObjectMember
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiPublicMember)
-
-    UiPublicMember(NameId *memberType,
-                   NameId *name)
-        : type(Property), typeModifier(0), memberType(memberType), name(name), expression(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
-    { kind = K; }
-
-    UiPublicMember(NameId *memberType,
-                   NameId *name,
-                   ExpressionNode *expression)
-        : type(Property), typeModifier(0), memberType(memberType), name(name), expression(expression), isDefaultMember(false), isReadonlyMember(false), parameters(0)
-    { kind = K; }
-
-    virtual SourceLocation firstSourceLocation() const
-    {
-      if (defaultToken.isValid())
-        return defaultToken;
-      else if (readonlyToken.isValid())
-          return readonlyToken;
-
-      return propertyToken;
-    }
-
-    virtual SourceLocation lastSourceLocation() const
-    {
-      return semicolonToken;
-    }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    enum { Signal, Property } type;
-    NameId *typeModifier;
-    NameId *memberType;
-    NameId *name;
-    ExpressionNode *expression;
-    bool isDefaultMember;
-    bool isReadonlyMember;
-    UiParameterList *parameters;
-    SourceLocation defaultToken;
-    SourceLocation readonlyToken;
-    SourceLocation propertyToken;
-    SourceLocation typeModifierToken;
-    SourceLocation typeToken;
-    SourceLocation identifierToken;
-    SourceLocation colonToken;
-    SourceLocation semicolonToken;
-};
-
-class QML_PARSER_EXPORT UiObjectDefinition: public UiObjectMember
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiObjectDefinition)
-
-    UiObjectDefinition(UiQualifiedId *qualifiedTypeNameId,
-                       UiObjectInitializer *initializer)
-        : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer)
-    { kind = K; }
-
-    virtual SourceLocation firstSourceLocation() const
-    { return qualifiedTypeNameId->identifierToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return initializer->rbraceToken; }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    UiQualifiedId *qualifiedTypeNameId;
-    UiObjectInitializer *initializer;
-};
-
-class QML_PARSER_EXPORT UiSourceElement: public UiObjectMember
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiSourceElement)
-
-    UiSourceElement(Node *sourceElement)
-        : sourceElement(sourceElement)
-    { kind = K; }
-
-    virtual SourceLocation firstSourceLocation() const
-    {
-      if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement))
-        return funDecl->firstSourceLocation();
-      else if (VariableStatement *varStmt = cast<VariableStatement *>(sourceElement))
-        return varStmt->firstSourceLocation();
-
-      return SourceLocation();
-    }
-
-    virtual SourceLocation lastSourceLocation() const
-    {
-      if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement))
-        return funDecl->lastSourceLocation();
-      else if (VariableStatement *varStmt = cast<VariableStatement *>(sourceElement))
-        return varStmt->lastSourceLocation();
-
-      return SourceLocation();
-    }
-
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    Node *sourceElement;
-};
-
-class QML_PARSER_EXPORT UiObjectBinding: public UiObjectMember
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiObjectBinding)
-
-    UiObjectBinding(UiQualifiedId *qualifiedId,
-                    UiQualifiedId *qualifiedTypeNameId,
-                    UiObjectInitializer *initializer)
-        : qualifiedId(qualifiedId),
-          qualifiedTypeNameId(qualifiedTypeNameId),
-          initializer(initializer)
-    { kind = K; }
-
-    virtual SourceLocation firstSourceLocation() const
-    { return qualifiedId->identifierToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return initializer->rbraceToken; }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    UiQualifiedId *qualifiedId;
-    UiQualifiedId *qualifiedTypeNameId;
-    UiObjectInitializer *initializer;
-    SourceLocation colonToken;
-};
-
-class QML_PARSER_EXPORT UiScriptBinding: public UiObjectMember
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiScriptBinding)
-
-    UiScriptBinding(UiQualifiedId *qualifiedId,
-                    Statement *statement)
-        : qualifiedId(qualifiedId),
-          statement(statement)
-    { kind = K; }
-
-    virtual SourceLocation firstSourceLocation() const
-    { return qualifiedId->identifierToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return statement->lastSourceLocation(); }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    UiQualifiedId *qualifiedId;
-    Statement *statement;
-    SourceLocation colonToken;
-};
-
-class QML_PARSER_EXPORT UiArrayBinding: public UiObjectMember
-{
-public:
-    QMLJS_DECLARE_AST_NODE(UiArrayBinding)
-
-    UiArrayBinding(UiQualifiedId *qualifiedId,
-                   UiArrayMemberList *members)
-        : qualifiedId(qualifiedId),
-          members(members)
-    { kind = K; }
-
-    virtual SourceLocation firstSourceLocation() const
-    { return qualifiedId->identifierToken; }
-
-    virtual SourceLocation lastSourceLocation() const
-    { return rbracketToken; }
-
-    virtual void accept0(Visitor *visitor);
-
-// attributes
-    UiQualifiedId *qualifiedId;
-    UiArrayMemberList *members;
-    SourceLocation colonToken;
-    SourceLocation lbracketToken;
-    SourceLocation rbracketToken;
-};
-
-} } // namespace AST
-
-
-
-QT_QML_END_NAMESPACE
-
-#endif
diff --git a/src/declarative/qml/parser/qmljsastfwd_p.h b/src/declarative/qml/parser/qmljsastfwd_p.h
deleted file mode 100644
index 2c42fd9..0000000
--- a/src/declarative/qml/parser/qmljsastfwd_p.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLJSAST_FWD_P_H
-#define QMLJSAST_FWD_P_H
-
-#include "qmljsglobal_p.h"
-
-#include <QtCore/qglobal.h>
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS { namespace AST {
-
-class SourceLocation
-{
-public:
-    SourceLocation(quint32 offset = 0, quint32 length = 0, quint32 line = 0, quint32 column = 0)
-        : offset(offset), length(length),
-          startLine(line), startColumn(column)
-    { }
-
-    bool isValid() const { return length != 0; }
-
-    quint32 begin() const { return offset; }
-    quint32 end() const { return offset + length; }
-
-// attributes
-    // ### encode
-    quint32 offset;
-    quint32 length;
-    quint32 startLine;
-    quint32 startColumn;
-};
-
-class Visitor;
-class Node;
-class ExpressionNode;
-class Statement;
-class ThisExpression;
-class IdentifierExpression;
-class NullExpression;
-class TrueLiteral;
-class FalseLiteral;
-class NumericLiteral;
-class StringLiteral;
-class RegExpLiteral;
-class ArrayLiteral;
-class ObjectLiteral;
-class ElementList;
-class Elision;
-class PropertyNameAndValueList;
-class PropertyName;
-class IdentifierPropertyName;
-class StringLiteralPropertyName;
-class NumericLiteralPropertyName;
-class ArrayMemberExpression;
-class FieldMemberExpression;
-class NewMemberExpression;
-class NewExpression;
-class CallExpression;
-class ArgumentList;
-class PostIncrementExpression;
-class PostDecrementExpression;
-class DeleteExpression;
-class VoidExpression;
-class TypeOfExpression;
-class PreIncrementExpression;
-class PreDecrementExpression;
-class UnaryPlusExpression;
-class UnaryMinusExpression;
-class TildeExpression;
-class NotExpression;
-class BinaryExpression;
-class ConditionalExpression;
-class Expression; // ### rename
-class Block;
-class StatementList;
-class VariableStatement;
-class VariableDeclarationList;
-class VariableDeclaration;
-class EmptyStatement;
-class ExpressionStatement;
-class IfStatement;
-class DoWhileStatement;
-class WhileStatement;
-class ForStatement;
-class LocalForStatement;
-class ForEachStatement;
-class LocalForEachStatement;
-class ContinueStatement;
-class BreakStatement;
-class ReturnStatement;
-class WithStatement;
-class SwitchStatement;
-class CaseBlock;
-class CaseClauses;
-class CaseClause;
-class DefaultClause;
-class LabelledStatement;
-class ThrowStatement;
-class TryStatement;
-class Catch;
-class Finally;
-class FunctionDeclaration;
-class FunctionExpression;
-class FormalParameterList;
-class FunctionBody;
-class Program;
-class SourceElements;
-class SourceElement;
-class FunctionSourceElement;
-class StatementSourceElement;
-class DebuggerStatement;
-class NestedExpression;
-
-// ui elements
-class UiProgram;
-class UiImportList;
-class UiImport;
-class UiPublicMember;
-class UiObjectDefinition;
-class UiObjectInitializer;
-class UiObjectBinding;
-class UiScriptBinding;
-class UiSourceElement;
-class UiArrayBinding;
-class UiObjectMember;
-class UiObjectMemberList;
-class UiArrayMemberList;
-class UiQualifiedId;
-class UiFormalList;
-class UiFormal;
-class UiSignature;
-
-} } // namespace AST
-
-QT_QML_END_NAMESPACE
-
-#endif
diff --git a/src/declarative/qml/parser/qmljsastvisitor.cpp b/src/declarative/qml/parser/qmljsastvisitor.cpp
deleted file mode 100644
index bd7439c..0000000
--- a/src/declarative/qml/parser/qmljsastvisitor.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmljsastvisitor_p.h"
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS { namespace AST {
-
-Visitor::Visitor()
-{
-}
-
-Visitor::~Visitor()
-{
-}
-
-} } // namespace QmlJS::AST
-
-QT_QML_END_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsastvisitor_p.h b/src/declarative/qml/parser/qmljsastvisitor_p.h
deleted file mode 100644
index 9007a2c..0000000
--- a/src/declarative/qml/parser/qmljsastvisitor_p.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLJSASTVISITOR_P_H
-#define QMLJSASTVISITOR_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmljsastfwd_p.h"
-#include "qmljsglobal_p.h"
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS { namespace AST {
-
-class QML_PARSER_EXPORT Visitor
-{
-public:
-    Visitor();
-    virtual ~Visitor();
-
-    virtual bool preVisit(Node *) { return true; }
-    virtual void postVisit(Node *) {}
-
-    // Ui
-    virtual bool visit(UiProgram *) { return true; }
-    virtual bool visit(UiImportList *) { return true; }
-    virtual bool visit(UiImport *) { return true; }
-    virtual bool visit(UiPublicMember *) { return true; }
-    virtual bool visit(UiSourceElement *) { return true; }
-    virtual bool visit(UiObjectDefinition *) { return true; }
-    virtual bool visit(UiObjectInitializer *) { return true; }
-    virtual bool visit(UiObjectBinding *) { return true; }
-    virtual bool visit(UiScriptBinding *) { return true; }
-    virtual bool visit(UiArrayBinding *) { return true; }
-    virtual bool visit(UiObjectMemberList *) { return true; }
-    virtual bool visit(UiArrayMemberList *) { return true; }
-    virtual bool visit(UiQualifiedId *) { return true; }
-    virtual bool visit(UiSignature *) { return true; }
-    virtual bool visit(UiFormalList *) { return true; }
-    virtual bool visit(UiFormal *) { return true; }
-
-    virtual void endVisit(UiProgram *) {}
-    virtual void endVisit(UiImportList *) {}
-    virtual void endVisit(UiImport *) {}
-    virtual void endVisit(UiPublicMember *) {}
-    virtual void endVisit(UiSourceElement *) {}
-    virtual void endVisit(UiObjectDefinition *) {}
-    virtual void endVisit(UiObjectInitializer *) {}
-    virtual void endVisit(UiObjectBinding *) {}
-    virtual void endVisit(UiScriptBinding *) {}
-    virtual void endVisit(UiArrayBinding *) {}
-    virtual void endVisit(UiObjectMemberList *) {}
-    virtual void endVisit(UiArrayMemberList *) {}
-    virtual void endVisit(UiQualifiedId *) {}
-    virtual void endVisit(UiSignature *) {}
-    virtual void endVisit(UiFormalList *) {}
-    virtual void endVisit(UiFormal *) {}
-
-    // QmlJS
-    virtual bool visit(ThisExpression *) { return true; }
-    virtual void endVisit(ThisExpression *) {}
-
-    virtual bool visit(IdentifierExpression *) { return true; }
-    virtual void endVisit(IdentifierExpression *) {}
-
-    virtual bool visit(NullExpression *) { return true; }
-    virtual void endVisit(NullExpression *) {}
-
-    virtual bool visit(TrueLiteral *) { return true; }
-    virtual void endVisit(TrueLiteral *) {}
-
-    virtual bool visit(FalseLiteral *) { return true; }
-    virtual void endVisit(FalseLiteral *) {}
-
-    virtual bool visit(StringLiteral *) { return true; }
-    virtual void endVisit(StringLiteral *) {}
-
-    virtual bool visit(NumericLiteral *) { return true; }
-    virtual void endVisit(NumericLiteral *) {}
-
-    virtual bool visit(RegExpLiteral *) { return true; }
-    virtual void endVisit(RegExpLiteral *) {}
-
-    virtual bool visit(ArrayLiteral *) { return true; }
-    virtual void endVisit(ArrayLiteral *) {}
-
-    virtual bool visit(ObjectLiteral *) { return true; }
-    virtual void endVisit(ObjectLiteral *) {}
-
-    virtual bool visit(ElementList *) { return true; }
-    virtual void endVisit(ElementList *) {}
-
-    virtual bool visit(Elision *) { return true; }
-    virtual void endVisit(Elision *) {}
-
-    virtual bool visit(PropertyNameAndValueList *) { return true; }
-    virtual void endVisit(PropertyNameAndValueList *) {}
-
-    virtual bool visit(NestedExpression *) { return true; }
-    virtual void endVisit(NestedExpression *) {}
-
-    virtual bool visit(IdentifierPropertyName *) { return true; }
-    virtual void endVisit(IdentifierPropertyName *) {}
-
-    virtual bool visit(StringLiteralPropertyName *) { return true; }
-    virtual void endVisit(StringLiteralPropertyName *) {}
-
-    virtual bool visit(NumericLiteralPropertyName *) { return true; }
-    virtual void endVisit(NumericLiteralPropertyName *) {}
-
-    virtual bool visit(ArrayMemberExpression *) { return true; }
-    virtual void endVisit(ArrayMemberExpression *) {}
-
-    virtual bool visit(FieldMemberExpression *) { return true; }
-    virtual void endVisit(FieldMemberExpression *) {}
-
-    virtual bool visit(NewMemberExpression *) { return true; }
-    virtual void endVisit(NewMemberExpression *) {}
-
-    virtual bool visit(NewExpression *) { return true; }
-    virtual void endVisit(NewExpression *) {}
-
-    virtual bool visit(CallExpression *) { return true; }
-    virtual void endVisit(CallExpression *) {}
-
-    virtual bool visit(ArgumentList *) { return true; }
-    virtual void endVisit(ArgumentList *) {}
-
-    virtual bool visit(PostIncrementExpression *) { return true; }
-    virtual void endVisit(PostIncrementExpression *) {}
-
-    virtual bool visit(PostDecrementExpression *) { return true; }
-    virtual void endVisit(PostDecrementExpression *) {}
-
-    virtual bool visit(DeleteExpression *) { return true; }
-    virtual void endVisit(DeleteExpression *) {}
-
-    virtual bool visit(VoidExpression *) { return true; }
-    virtual void endVisit(VoidExpression *) {}
-
-    virtual bool visit(TypeOfExpression *) { return true; }
-    virtual void endVisit(TypeOfExpression *) {}
-
-    virtual bool visit(PreIncrementExpression *) { return true; }
-    virtual void endVisit(PreIncrementExpression *) {}
-
-    virtual bool visit(PreDecrementExpression *) { return true; }
-    virtual void endVisit(PreDecrementExpression *) {}
-
-    virtual bool visit(UnaryPlusExpression *) { return true; }
-    virtual void endVisit(UnaryPlusExpression *) {}
-
-    virtual bool visit(UnaryMinusExpression *) { return true; }
-    virtual void endVisit(UnaryMinusExpression *) {}
-
-    virtual bool visit(TildeExpression *) { return true; }
-    virtual void endVisit(TildeExpression *) {}
-
-    virtual bool visit(NotExpression *) { return true; }
-    virtual void endVisit(NotExpression *) {}
-
-    virtual bool visit(BinaryExpression *) { return true; }
-    virtual void endVisit(BinaryExpression *) {}
-
-    virtual bool visit(ConditionalExpression *) { return true; }
-    virtual void endVisit(ConditionalExpression *) {}
-
-    virtual bool visit(Expression *) { return true; }
-    virtual void endVisit(Expression *) {}
-
-    virtual bool visit(Block *) { return true; }
-    virtual void endVisit(Block *) {}
-
-    virtual bool visit(StatementList *) { return true; }
-    virtual void endVisit(StatementList *) {}
-
-    virtual bool visit(VariableStatement *) { return true; }
-    virtual void endVisit(VariableStatement *) {}
-
-    virtual bool visit(VariableDeclarationList *) { return true; }
-    virtual void endVisit(VariableDeclarationList *) {}
-
-    virtual bool visit(VariableDeclaration *) { return true; }
-    virtual void endVisit(VariableDeclaration *) {}
-
-    virtual bool visit(EmptyStatement *) { return true; }
-    virtual void endVisit(EmptyStatement *) {}
-
-    virtual bool visit(ExpressionStatement *) { return true; }
-    virtual void endVisit(ExpressionStatement *) {}
-
-    virtual bool visit(IfStatement *) { return true; }
-    virtual void endVisit(IfStatement *) {}
-
-    virtual bool visit(DoWhileStatement *) { return true; }
-    virtual void endVisit(DoWhileStatement *) {}
-
-    virtual bool visit(WhileStatement *) { return true; }
-    virtual void endVisit(WhileStatement *) {}
-
-    virtual bool visit(ForStatement *) { return true; }
-    virtual void endVisit(ForStatement *) {}
-
-    virtual bool visit(LocalForStatement *) { return true; }
-    virtual void endVisit(LocalForStatement *) {}
-
-    virtual bool visit(ForEachStatement *) { return true; }
-    virtual void endVisit(ForEachStatement *) {}
-
-    virtual bool visit(LocalForEachStatement *) { return true; }
-    virtual void endVisit(LocalForEachStatement *) {}
-
-    virtual bool visit(ContinueStatement *) { return true; }
-    virtual void endVisit(ContinueStatement *) {}
-
-    virtual bool visit(BreakStatement *) { return true; }
-    virtual void endVisit(BreakStatement *) {}
-
-    virtual bool visit(ReturnStatement *) { return true; }
-    virtual void endVisit(ReturnStatement *) {}
-
-    virtual bool visit(WithStatement *) { return true; }
-    virtual void endVisit(WithStatement *) {}
-
-    virtual bool visit(SwitchStatement *) { return true; }
-    virtual void endVisit(SwitchStatement *) {}
-
-    virtual bool visit(CaseBlock *) { return true; }
-    virtual void endVisit(CaseBlock *) {}
-
-    virtual bool visit(CaseClauses *) { return true; }
-    virtual void endVisit(CaseClauses *) {}
-
-    virtual bool visit(CaseClause *) { return true; }
-    virtual void endVisit(CaseClause *) {}
-
-    virtual bool visit(DefaultClause *) { return true; }
-    virtual void endVisit(DefaultClause *) {}
-
-    virtual bool visit(LabelledStatement *) { return true; }
-    virtual void endVisit(LabelledStatement *) {}
-
-    virtual bool visit(ThrowStatement *) { return true; }
-    virtual void endVisit(ThrowStatement *) {}
-
-    virtual bool visit(TryStatement *) { return true; }
-    virtual void endVisit(TryStatement *) {}
-
-    virtual bool visit(Catch *) { return true; }
-    virtual void endVisit(Catch *) {}
-
-    virtual bool visit(Finally *) { return true; }
-    virtual void endVisit(Finally *) {}
-
-    virtual bool visit(FunctionDeclaration *) { return true; }
-    virtual void endVisit(FunctionDeclaration *) {}
-
-    virtual bool visit(FunctionExpression *) { return true; }
-    virtual void endVisit(FunctionExpression *) {}
-
-    virtual bool visit(FormalParameterList *) { return true; }
-    virtual void endVisit(FormalParameterList *) {}
-
-    virtual bool visit(FunctionBody *) { return true; }
-    virtual void endVisit(FunctionBody *) {}
-
-    virtual bool visit(Program *) { return true; }
-    virtual void endVisit(Program *) {}
-
-    virtual bool visit(SourceElements *) { return true; }
-    virtual void endVisit(SourceElements *) {}
-
-    virtual bool visit(FunctionSourceElement *) { return true; }
-    virtual void endVisit(FunctionSourceElement *) {}
-
-    virtual bool visit(StatementSourceElement *) { return true; }
-    virtual void endVisit(StatementSourceElement *) {}
-
-    virtual bool visit(DebuggerStatement *) { return true; }
-    virtual void endVisit(DebuggerStatement *) {}
-};
-
-} } // namespace AST
-
-QT_QML_END_NAMESPACE
-
-#endif // QMLJSASTVISITOR_P_H
diff --git a/src/declarative/qml/parser/qmljsengine_p.cpp b/src/declarative/qml/parser/qmljsengine_p.cpp
deleted file mode 100644
index 84bb1c5..0000000
--- a/src/declarative/qml/parser/qmljsengine_p.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmljsengine_p.h"
-
-#include "qmljsglobal_p.h"
-#include "qmljsnodepool_p.h"
-
-#include <qnumeric.h>
-#include <QHash>
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS {
-
-uint qHash(const QmlJS::NameId &id)
-{ return qHash(id.asString()); }
-
-QString numberToString(double value)
-{ return QString::number(value); }
-
-int Ecma::RegExp::flagFromChar(const QChar &ch)
-{
-    static QHash<QChar, int> flagsHash;
-    if (flagsHash.isEmpty()) {
-        flagsHash[QLatin1Char('g')] = Global;
-        flagsHash[QLatin1Char('i')] = IgnoreCase;
-        flagsHash[QLatin1Char('m')] = Multiline;
-    }
-    QHash<QChar, int>::const_iterator it;
-    it = flagsHash.constFind(ch);
-    if (it == flagsHash.constEnd())
-        return 0;
-    return it.value();
-}
-
-QString Ecma::RegExp::flagsToString(int flags)
-{
-    QString result;
-    if (flags & Global)
-        result += QLatin1Char('g');
-    if (flags & IgnoreCase)
-        result += QLatin1Char('i');
-    if (flags & Multiline)
-        result += QLatin1Char('m');
-    return result;
-}
-
-NodePool::NodePool(const QString &fileName, Engine *engine)
-    : m_fileName(fileName), m_engine(engine)
-{
-    m_engine->setNodePool(this);
-}
-
-NodePool::~NodePool()
-{
-}
-
-Code *NodePool::createCompiledCode(AST::Node *, CompilationUnit &)
-{
-    Q_ASSERT(0);
-    return 0;
-}
-
-static int toDigit(char c)
-{
-    if ((c >= '0') && (c <= '9'))
-        return c - '0';
-    else if ((c >= 'a') && (c <= 'z'))
-        return 10 + c - 'a';
-    else if ((c >= 'A') && (c <= 'Z'))
-        return 10 + c - 'A';
-    return -1;
-}
-
-double integerFromString(const char *buf, int size, int radix)
-{
-    if (size == 0)
-        return qSNaN();
-
-    double sign = 1.0;
-    int i = 0;
-    if (buf[0] == '+') {
-        ++i;
-    } else if (buf[0] == '-') {
-        sign = -1.0;
-        ++i;
-    }
-
-    if (((size-i) >= 2) && (buf[i] == '0')) {
-        if (((buf[i+1] == 'x') || (buf[i+1] == 'X'))
-            && (radix < 34)) {
-            if ((radix != 0) && (radix != 16))
-                return 0;
-            radix = 16;
-            i += 2;
-        } else {
-            if (radix == 0) {
-                radix = 8;
-                ++i;
-            }
-        }
-    } else if (radix == 0) {
-        radix = 10;
-    }
-
-    int j = i;
-    for ( ; i < size; ++i) {
-        int d = toDigit(buf[i]);
-        if ((d == -1) || (d >= radix))
-            break;
-    }
-    double result;
-    if (j == i) {
-        if (!qstrcmp(buf, "Infinity"))
-            result = qInf();
-        else
-            result = qSNaN();
-    } else {
-        result = 0;
-        double multiplier = 1;
-        for (--i ; i >= j; --i, multiplier *= radix)
-            result += toDigit(buf[i]) * multiplier;
-    }
-    result *= sign;
-    return result;
-}
-
-double integerFromString(const QString &str, int radix)
-{
-    QByteArray ba = str.trimmed().toLatin1();
-    return integerFromString(ba.constData(), ba.size(), radix);
-}
-
-
-Engine::Engine()
-    : _lexer(0), _nodePool(0)
-{ }
-
-Engine::~Engine()
-{ }
-
-QSet<NameId> Engine::literals() const
-{ return _literals; }
-
-void Engine::addComment(int pos, int len, int line, int col)
-{ if (len > 0) _comments.append(QmlJS::AST::SourceLocation(pos, len, line, col)); }
-
-QList<QmlJS::AST::SourceLocation> Engine::comments() const
-{ return _comments; }
-
-NameId *Engine::intern(const QChar *u, int s)
-{ return const_cast<NameId *>(&*_literals.insert(NameId(u, s))); }
-
-QString Engine::toString(NameId *id)
-{ return id->asString(); }
-
-Lexer *Engine::lexer() const
-{ return _lexer; }
-
-void Engine::setLexer(Lexer *lexer)
-{ _lexer = lexer; }
-
-NodePool *Engine::nodePool() const
-{ return _nodePool; }
-
-void Engine::setNodePool(NodePool *nodePool)
-{ _nodePool = nodePool; }
-
-
-
-} // end of namespace QmlJS
-
-QT_QML_END_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsengine_p.h b/src/declarative/qml/parser/qmljsengine_p.h
deleted file mode 100644
index ebfeb1b..0000000
--- a/src/declarative/qml/parser/qmljsengine_p.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLJSENGINE_P_H
-#define QMLJSENGINE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmljsglobal_p.h"
-#include "qmljsastfwd_p.h"
-
-#include <QString>
-#include <QSet>
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS {
-class QML_PARSER_EXPORT NameId
-{
-    QString _text;
-
-public:
-    NameId(const QChar *u, int s)
-        : _text(u, s)
-    { }
-
-    const QString asString() const
-    { return _text; }
-
-    bool operator == (const NameId &other) const
-    { return _text == other._text; }
-
-    bool operator != (const NameId &other) const
-    { return _text != other._text; }
-
-    bool operator < (const NameId &other) const
-    { return _text < other._text; }
-};
-
-uint qHash(const QmlJS::NameId &id);
-
-} // end of namespace QmlJS
-
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1300
-//this ensures that code outside QmlJS can use the hash function
-//it also a workaround for some compilers
-inline uint qHash(const QmlJS::NameId &nameId) { return QmlJS::qHash(nameId); }
-#endif
-
-namespace QmlJS {
-
-class Lexer;
-class NodePool;
-
-namespace Ecma {
-
-class QML_PARSER_EXPORT RegExp
-{
-public:
-    enum RegExpFlag {
-        Global     = 0x01,
-        IgnoreCase = 0x02,
-        Multiline  = 0x04
-    };
-
-public:
-    static int flagFromChar(const QChar &);
-    static QString flagsToString(int flags);
-};
-
-} // end of namespace Ecma
-
-class QML_PARSER_EXPORT DiagnosticMessage
-{
-public:
-    enum Kind { Warning, Error };
-
-    DiagnosticMessage()
-        : kind(Error) {}
-
-    DiagnosticMessage(Kind kind, const AST::SourceLocation &loc, const QString &message)
-        : kind(kind), loc(loc), message(message) {}
-
-    bool isWarning() const
-    { return kind == Warning; }
-
-    bool isError() const
-    { return kind == Error; }
-
-    Kind kind;
-    AST::SourceLocation loc;
-    QString message;
-};
-
-class QML_PARSER_EXPORT Engine
-{
-    Lexer *_lexer;
-    NodePool *_nodePool;
-    QSet<NameId> _literals;
-    QList<QmlJS::AST::SourceLocation> _comments;
-
-public:
-    Engine();
-    ~Engine();
-
-    QSet<NameId> literals() const;
-
-    void addComment(int pos, int len, int line, int col);
-    QList<QmlJS::AST::SourceLocation> comments() const;
-
-    NameId *intern(const QChar *u, int s);
-
-    static QString toString(NameId *id);
-
-    Lexer *lexer() const;
-    void setLexer(Lexer *lexer);
-
-    NodePool *nodePool() const;
-    void setNodePool(NodePool *nodePool);
-};
-
-} // end of namespace QmlJS
-
-QT_QML_END_NAMESPACE
-
-#endif // QMLJSENGINE_P_H
diff --git a/src/declarative/qml/parser/qmljsglobal_p.h b/src/declarative/qml/parser/qmljsglobal_p.h
deleted file mode 100644
index 4457450..0000000
--- a/src/declarative/qml/parser/qmljsglobal_p.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef QMLJSGLOBAL_P_H
-#define QMLJSGLOBAL_P_H
-
-#include <QtCore/qglobal.h>
-
-#ifdef QT_CREATOR
-#  define QT_QML_BEGIN_NAMESPACE
-#  define QT_QML_END_NAMESPACE
-
-#  ifdef QMLJS_BUILD_DIR
-#    define QML_PARSER_EXPORT Q_DECL_EXPORT
-#  elif QML_BUILD_STATIC_LIB
-#    define QML_PARSER_EXPORT
-#  else
-#    define QML_PARSER_EXPORT Q_DECL_IMPORT
-#  endif // QMLJS_BUILD_DIR
-
-#else // !QT_CREATOR
-#  define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
-#  define QT_QML_END_NAMESPACE QT_END_NAMESPACE
-#  define QML_PARSER_EXPORT
-#endif // QT_CREATOR
-
-#endif // QMLJSGLOBAL_P_H
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
deleted file mode 100644
index 12071db..0000000
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ /dev/null
@@ -1,939 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// This file was generated by qlalr - DO NOT EDIT!
-#include "qmljsgrammar_p.h"
-
-QT_BEGIN_NAMESPACE
-
-const char *const QmlJSGrammar::spell [] = {
-  "end of file", "&", "&&", "&=", "break", "case", "catch", ":", ";", "continue", 
-  "default", "delete", "/", "/=", "do", ".", "else", "=", "==", "===", 
-  "finally", "for", "function", ">=", ">", ">>", ">>=", ">>>", ">>>=", "identifier", 
-  "if", "in", "instanceof", "{", "[", "<=", "(", "<", "<<", "<<=", 
-  "-", "-=", "--", "new", "!", "!=", "!==", "numeric literal", "|", "|=", 
-  "||", "+", "+=", "++", "?", "}", "]", "%", "%=", "return", 
-  ")", ";", 0, "*", "*=", "string literal", "property", "signal", "readonly", "switch", 
-  "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", 
-  "^=", "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "comment", "public", 
-  "import", "as", 0, 0, 0, 0, 0, 0, 0, 0};
-
-const short QmlJSGrammar::lhs [] = {
-  100, 100, 100, 100, 100, 100, 101, 107, 107, 110, 
-  110, 112, 111, 111, 111, 111, 111, 111, 111, 111, 
-  114, 109, 108, 117, 117, 118, 118, 119, 119, 116, 
-  105, 105, 105, 105, 105, 105, 105, 125, 125, 125, 
-  126, 126, 127, 127, 105, 105, 105, 105, 105, 105, 
-  105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-  105, 105, 115, 115, 115, 115, 130, 130, 130, 130, 
-  130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-  130, 130, 130, 130, 120, 132, 132, 132, 132, 131, 
-  131, 134, 134, 136, 136, 136, 136, 136, 136, 137, 
-  137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 
-  137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 
-  137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 
-  138, 138, 113, 113, 113, 113, 113, 141, 141, 142, 
-  142, 142, 142, 140, 140, 143, 143, 144, 144, 145, 
-  145, 145, 146, 146, 146, 146, 146, 146, 146, 146, 
-  146, 146, 147, 147, 147, 147, 148, 148, 148, 149, 
-  149, 149, 149, 150, 150, 150, 150, 150, 150, 150, 
-  151, 151, 151, 151, 151, 151, 152, 152, 152, 152, 
-  152, 153, 153, 153, 153, 153, 154, 154, 155, 155, 
-  156, 156, 157, 157, 158, 158, 159, 159, 160, 160, 
-  161, 161, 162, 162, 163, 163, 164, 164, 165, 165, 
-  135, 135, 166, 166, 167, 167, 167, 167, 167, 167, 
-  167, 167, 167, 167, 167, 167, 103, 103, 168, 168, 
-  169, 169, 170, 170, 102, 102, 102, 102, 102, 102, 
-  102, 102, 102, 102, 102, 102, 102, 102, 102, 121, 
-  182, 182, 181, 181, 129, 129, 183, 183, 184, 184, 
-  186, 186, 185, 187, 190, 188, 188, 191, 189, 189, 
-  122, 123, 123, 124, 124, 171, 171, 171, 171, 171, 
-  171, 171, 172, 172, 172, 172, 173, 173, 173, 173, 
-  174, 174, 175, 177, 192, 192, 195, 195, 193, 193, 
-  196, 194, 176, 176, 176, 178, 178, 179, 179, 179, 
-  197, 198, 180, 180, 128, 139, 202, 202, 199, 199, 
-  200, 200, 203, 106, 204, 204, 104, 104, 201, 201, 
-  133, 133, 205};
-
-const short QmlJSGrammar::rhs [] = {
-  2, 2, 2, 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, 7, 7, 
-  4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 2, 3, 3, 4, 
-  5, 3, 4, 3, 1, 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, 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, 1, 2, 1, 1, 0, 1, 
-  0, 1, 2};
-
-const short QmlJSGrammar::action_default [] = {
-  0, 0, 0, 0, 0, 0, 22, 0, 170, 237, 
-  201, 209, 205, 149, 221, 197, 3, 134, 68, 150, 
-  213, 217, 138, 167, 148, 153, 133, 187, 174, 0, 
-  75, 76, 71, 339, 63, 341, 0, 0, 0, 0, 
-  73, 0, 0, 69, 72, 0, 0, 64, 66, 65, 
-  74, 67, 0, 70, 0, 0, 163, 0, 0, 150, 
-  169, 152, 151, 0, 0, 0, 165, 166, 164, 168, 
-  0, 198, 0, 0, 0, 0, 188, 0, 0, 0, 
-  0, 0, 0, 178, 0, 0, 0, 172, 173, 171, 
-  176, 180, 179, 177, 175, 190, 189, 191, 0, 206, 
-  0, 202, 0, 0, 144, 131, 143, 132, 100, 101, 
-  102, 127, 103, 128, 104, 105, 106, 107, 108, 109, 
-  110, 111, 112, 113, 114, 115, 116, 129, 117, 118, 
-  119, 120, 121, 122, 123, 124, 125, 126, 130, 0, 
-  0, 142, 238, 145, 0, 146, 0, 147, 141, 0, 
-  234, 227, 225, 232, 233, 231, 230, 236, 229, 228, 
-  226, 235, 222, 0, 210, 0, 0, 214, 0, 0, 
-  218, 0, 0, 144, 136, 0, 135, 0, 140, 154, 
-  0, 340, 329, 330, 0, 327, 0, 328, 0, 331, 
-  245, 252, 251, 259, 247, 0, 248, 332, 0, 338, 
-  249, 250, 255, 253, 335, 333, 337, 256, 0, 267, 
-  0, 0, 0, 0, 339, 63, 0, 341, 64, 239, 
-  281, 65, 0, 0, 0, 268, 0, 0, 257, 258, 
-  0, 246, 254, 282, 283, 326, 336, 0, 297, 298, 
-  299, 300, 0, 293, 294, 295, 296, 323, 324, 0, 
-  0, 0, 0, 0, 286, 287, 243, 241, 203, 211, 
-  207, 223, 199, 244, 0, 150, 215, 219, 192, 181, 
-  0, 0, 200, 0, 0, 0, 0, 193, 0, 0, 
-  0, 0, 0, 185, 183, 186, 184, 182, 195, 194, 
-  196, 0, 208, 0, 204, 0, 242, 150, 0, 224, 
-  239, 240, 0, 239, 0, 0, 289, 0, 0, 0, 
-  291, 0, 212, 0, 0, 216, 0, 0, 220, 279, 
-  0, 271, 280, 274, 0, 278, 0, 239, 272, 0, 
-  239, 0, 0, 290, 0, 0, 0, 292, 340, 329, 
-  0, 0, 331, 0, 325, 0, 315, 0, 0, 0, 
-  285, 0, 284, 0, 342, 0, 99, 261, 264, 0, 
-  100, 267, 103, 128, 105, 106, 71, 110, 111, 63, 
-  112, 115, 69, 72, 64, 239, 65, 74, 118, 67, 
-  120, 70, 122, 123, 268, 125, 126, 130, 0, 92, 
-  0, 0, 94, 98, 96, 83, 95, 97, 0, 93, 
-  82, 262, 260, 138, 139, 144, 0, 137, 0, 314, 
-  0, 301, 302, 0, 313, 0, 0, 0, 304, 309, 
-  307, 310, 0, 0, 308, 309, 0, 305, 0, 306, 
-  263, 312, 0, 263, 311, 0, 316, 317, 0, 263, 
-  318, 319, 0, 0, 320, 0, 0, 0, 321, 322, 
-  156, 155, 0, 0, 0, 288, 0, 0, 0, 303, 
-  276, 269, 0, 277, 273, 0, 275, 265, 0, 266, 
-  270, 86, 0, 0, 90, 77, 0, 79, 88, 0, 
-  80, 89, 91, 81, 87, 78, 0, 84, 160, 158, 
-  162, 159, 157, 161, 6, 334, 4, 2, 61, 85, 
-  0, 0, 64, 66, 65, 31, 5, 0, 62, 0, 
-  40, 39, 38, 0, 0, 53, 0, 54, 0, 59, 
-  60, 0, 40, 0, 0, 0, 0, 0, 49, 50, 
-  0, 51, 0, 52, 0, 55, 56, 0, 0, 0, 
-  0, 0, 57, 58, 0, 47, 41, 48, 42, 0, 
-  0, 0, 0, 44, 0, 45, 46, 43, 0, 0, 
-  30, 34, 35, 36, 37, 138, 263, 0, 0, 100, 
-  267, 103, 128, 105, 106, 71, 110, 111, 63, 112, 
-  115, 69, 72, 64, 239, 65, 74, 118, 67, 120, 
-  70, 122, 123, 268, 125, 126, 130, 138, 0, 26, 
-  0, 0, 32, 27, 33, 28, 24, 0, 29, 25, 
-  8, 0, 10, 0, 9, 0, 1, 21, 12, 0, 
-  13, 0, 14, 0, 19, 20, 0, 15, 16, 0, 
-  17, 18, 11, 23, 7, 343};
-
-const short QmlJSGrammar::goto_default [] = {
-  7, 616, 206, 195, 204, 506, 494, 615, 634, 610, 
-  614, 612, 617, 22, 613, 18, 505, 607, 598, 560, 
-  507, 190, 194, 196, 200, 523, 549, 548, 199, 231, 
-  26, 473, 472, 355, 354, 9, 353, 356, 106, 17, 
-  144, 24, 13, 143, 19, 25, 56, 23, 8, 28, 
-  27, 268, 15, 262, 10, 258, 12, 260, 11, 259, 
-  20, 266, 21, 267, 14, 261, 257, 298, 410, 263, 
-  264, 201, 192, 191, 203, 232, 202, 207, 228, 229, 
-  193, 359, 358, 230, 462, 461, 320, 321, 464, 323, 
-  463, 322, 418, 422, 425, 421, 420, 440, 441, 184, 
-  198, 180, 183, 197, 205, 0};
-
-const short QmlJSGrammar::action_index [] = {
-  439, 1109, 2228, 2228, 2132, 814, -74, 18, 147, -100, 
-  31, -17, -49, 232, -100, 318, 85, -100, -100, 554, 
-  33, 94, 331, 215, -100, -100, -100, 448, 231, 1109, 
-  -100, -100, -100, 320, -100, 1940, 1472, 1109, 1109, 1109, 
-  -100, 724, 1109, -100, -100, 1109, 1109, -100, -100, -100, 
-  -100, -100, 1109, -100, 1109, 1109, -100, 1109, 1109, 129, 
-  157, -100, -100, 1109, 1109, 1109, -100, -100, -100, 200, 
-  1109, 293, 1109, 1109, 1109, 1109, 466, 1109, 1109, 1109, 
-  1109, 1109, 1109, 179, 1109, 1109, 1109, 119, 125, 95, 
-  188, 198, 184, 203, 178, 567, 567, 484, 1109, -5, 
-  1109, 67, 1844, 1109, 1109, -100, -100, -100, -100, -100, 
-  -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, 
-  -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, 
-  -100, -100, -100, -100, -100, -100, -100, -100, -100, 110, 
-  1109, -100, -100, 70, 61, -100, 1109, -100, -100, 1109, 
-  -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, 
-  -100, -100, -100, 1109, 55, 1109, 1109, 73, 63, 1109, 
-  -100, 1844, 1109, 1109, -100, 141, -100, 41, -100, -100, 
-  87, -100, 255, 80, 78, -100, 287, -100, 83, 2228, 
-  -100, -100, -100, -100, -100, 225, -100, -100, 52, -100, 
-  -100, -100, -100, -100, -100, 2228, -100, -100, 420, -100, 
-  408, 113, 2132, 50, 330, 65, 46, 2420, 72, 1109, 
-  -100, 74, 75, 1109, 77, -100, 53, 56, -100, -100, 
-  323, -100, -100, -100, -100, -100, -100, 96, -100, -100, 
-  -100, -100, 99, -100, -100, -100, -100, -100, -100, 60, 
-  47, 1109, 118, 93, -100, -100, 1291, -100, 79, 66, 
-  64, -100, 413, 76, 51, 664, 89, 97, 393, 183, 
-  337, 1109, 413, 1109, 1109, 1109, 1109, 411, 1109, 1109, 
-  1109, 1109, 1109, 252, 272, 212, 217, 221, 490, 490, 
-  383, 1109, 64, 1109, 84, 1109, -100, 536, 1109, -100, 
-  1109, 69, 68, 1109, 44, 2132, -100, 1109, 124, 2132, 
-  -100, 1109, 54, 1109, 1109, 71, 88, 1109, -100, 82, 
-  122, 154, -100, -100, 1109, -100, 343, 1109, -100, 81, 
-  1109, 90, 2132, -100, 1109, 112, 2132, -100, 86, 333, 
-  -39, -10, 2228, -33, -100, 2132, -100, 1109, 246, 2132, 
-  4, 2132, -100, 10, 16, -21, -100, -100, 2132, -26, 
-  480, 19, 462, 128, 1109, 2132, 6, -9, 400, 8, 
-  -22, 840, -3, -6, -100, 1202, -100, -7, -28, 5, 
-  1109, 2, -23, 1109, 0, 1109, -34, -30, 1109, -100, 
-  2036, 21, -100, -100, -100, -100, -100, -100, 1109, -100, 
-  -100, -100, -100, 209, -100, 1109, 40, -100, 2132, -100, 
-  101, -100, -100, 2132, -100, 1109, 120, 43, -100, 62, 
-  -100, 59, 109, 1109, -100, 57, 58, -100, 39, -100, 
-  2132, -100, 117, 2132, -100, 199, -100, -100, 107, 2132, 
-  34, -100, 24, 11, -100, 346, -19, 14, -100, -100, 
-  -100, -100, 1109, 133, 2132, -100, 1109, 126, 2132, -100, 
-  20, -100, 173, -100, -100, 1109, -100, -100, 303, -100, 
-  -100, -100, 100, 1656, -100, -100, 1564, -100, -100, 1748, 
-  -100, -100, -100, -100, -100, -100, 131, -100, -100, -100, 
-  -100, -100, -100, -100, -100, 2228, -100, -100, -100, 158, 
-  -20, 752, 165, -16, 22, -100, -100, 98, -100, 189, 
-  -100, -100, -100, 28, 170, -100, 1109, -100, 230, -100, 
-  -100, 247, 1, 13, 238, 37, -24, 106, -100, -100, 
-  273, -100, 1109, -100, 265, -100, -100, 242, -4, 12, 
-  1109, 241, -100, -100, 234, -100, 245, -100, 3, 9, 
-  311, 190, 316, -100, 134, -100, -100, -100, 1380, 1020, 
-  -100, -100, -100, -100, -100, 359, 2324, 1472, 15, 444, 
-  38, 394, 138, 1109, 2132, 36, 17, 397, 42, 23, 
-  840, 32, 29, -100, 1202, -100, 26, 35, 48, 1109, 
-  45, 25, 1109, 49, 1109, 27, 30, 314, 132, -100, 
-  7, 752, -100, -100, -100, -100, -100, 930, -100, -100, 
-  -100, 752, -100, 253, -87, 617, -100, -100, 102, 290, 
-  -100, 191, -100, 140, -100, -100, 275, -100, -100, 91, 
-  -100, -100, -100, -100, -100, -100, 
-
-  -106, 12, -87, 18, 17, 212, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -53, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, 162, 
-  -106, -106, -106, -4, -106, -106, -11, 24, 75, 76, 
-  -106, 83, 55, -106, -106, 157, 158, -106, -106, -106, 
-  -106, -106, 150, -106, 172, 176, -106, 168, 167, -106, 
-  -106, -106, -106, 173, 154, 115, -106, -106, -106, -106, 
-  147, -106, 121, 113, 112, 125, -106, 128, 143, 146, 
-  140, 139, 136, -106, 122, 138, 130, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, 149, -106, 
-  153, -106, 110, 82, 46, -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, 
-  35, -106, -106, -106, -106, -106, 37, -106, -106, 45, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, 92, -106, 88, 58, -106, -106, 51, 
-  -106, 209, 72, 78, -106, -106, -106, -106, -106, -106, 
-  -106, -106, 27, -106, -106, -106, 63, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, 50, -106, -106, 28, -106, 
-  29, -106, 47, -106, 33, -106, -106, 66, -106, 73, 
-  -106, -106, -106, 81, 53, -106, -106, -106, -106, -106, 
-  -13, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, 9, -106, -106, -106, -106, 111, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  3, 186, -106, 220, 228, 234, 204, -106, 90, 91, 
-  94, 97, 93, -106, -106, -106, -106, -106, -106, -106, 
-  -106, 210, -106, 187, -106, 214, -106, -106, 208, -106, 
-  207, -106, -106, 155, -106, 8, -106, 4, -106, -1, 
-  -106, 217, -106, 177, 185, -106, -106, 184, -106, -106, 
-  -106, -106, -106, -106, 183, -106, 194, 105, -106, -106, 
-  99, -106, 71, -106, 74, -106, 65, -106, -106, 114, 
-  -106, -106, -55, -106, -106, 64, -106, 44, -106, 30, 
-  -106, 31, -106, -106, -106, -106, -106, -106, 57, -106, 
-  36, -106, 40, -106, 70, 59, -106, -106, 42, -106, 
-  -106, 104, -106, -106, -106, 38, -106, -106, -106, -106, 
-  79, -106, 69, 108, -106, 84, -106, -106, 56, -106, 
-  68, -106, -106, -106, -106, -106, -106, -106, 52, -106, 
-  -106, -106, -106, -106, -106, 109, -106, -106, 77, -106, 
-  -106, -106, -106, 86, -106, 80, -106, -106, -106, -106, 
-  -106, -59, -106, 43, -106, -63, -106, -106, -106, -106, 
-  98, -106, -106, 95, -106, -106, -106, -106, -106, 60, 
-  -34, -106, -106, 32, -106, 41, -106, 39, -106, -106, 
-  -106, -106, 49, -106, 61, -106, 62, -106, 48, -106, 
-  -106, -106, -106, -106, -106, 23, -106, -106, 96, -106, 
-  -106, -106, -106, 34, -106, -106, 133, -106, -106, 54, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, 67, -106, -106, -106, -106, 
-  -106, 22, -106, -106, -106, -106, -106, -106, -106, -22, 
-  -106, -106, -106, -106, -106, -106, 2, -106, -106, -106, 
-  -106, -106, -106, -106, -19, -106, -106, -106, -106, -106, 
-  -106, -106, 100, -106, -106, -106, -106, -21, -106, -106, 
-  -3, -106, -106, -106, -106, -106, 13, -106, -106, -106, 
-  11, 14, 10, -106, -106, -106, -106, -106, 279, 283, 
-  -106, -106, -106, -106, -106, -106, 19, 273, 15, 16, 
-  -106, 21, -106, 224, 6, -106, -106, 25, -106, -106, 
-  85, -106, -106, -106, 26, -106, -106, -106, -106, 20, 
-  -106, 7, 87, -106, 107, -106, -106, -106, -106, -106, 
-  -106, 317, -106, -106, -106, -106, -106, 277, -106, -106, 
-  -106, 0, -106, -106, -2, 271, -106, -106, -106, 1, 
-  -106, -106, -106, -106, -106, -106, 5, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106};
-
-const short QmlJSGrammar::action_info [] = {
-  -97, -98, 452, 611, -116, 527, 456, -124, 415, -121, 
-  439, 551, -119, -108, 347, -94, 611, 388, 635, 540, 
-  351, 341, 344, 342, 390, 539, -127, 256, 398, 402, 
-  100, 98, 70, -97, 400, 163, -98, 465, 524, -116, 
-  559, 447, 530, -108, 439, -127, 509, 439, 559, -94, 
-  537, 544, -121, 256, 443, -119, -124, 514, 439, 347, 
-  445, 526, 423, 452, 423, 430, 456, 423, 70, 554, 
-  169, 415, 345, 311, 100, 163, 419, 140, 146, 408, 
-  271, 413, 347, 251, 295, 271, 256, 0, 186, 452, 
-  0, 311, 456, 140, 429, 317, 0, 0, 0, 324, 
-  407, 178, 291, 98, 305, 558, 0, 235, 476, 0, 
-  439, 415, 300, 442, 291, 0, 189, 171, 140, 426, 
-  140, 148, 339, 182, 433, 140, 140, 443, 140, 303, 
-  326, 559, 140, 0, 140, 57, 172, 250, 188, 140, 
-  601, 140, 330, 293, 165, 0, 58, 313, 166, 140, 
-  332, 314, 631, 630, 255, 254, 477, 241, 240, 57, 
-  246, 245, 412, 411, 427, 57, 141, 529, 528, 63, 
-  58, 61, 336, 171, 248, 247, 58, 516, 253, 0, 
-  417, 468, 62, 327, 309, 334, 458, 57, 602, 248, 
-  247, 487, 172, 454, 522, 556, 555, 176, 58, 248, 
-  247, 625, 624, 84, 84, 85, 85, 140, 84, 84, 
-  85, 85, 63, 84, 64, 85, 86, 86, 510, 510, 
-  65, 86, 86, 84, 171, 85, 86, 63, 84, 0, 
-  85, 517, 515, 140, 469, 467, 86, 84, 140, 85, 
-  512, 86, 84, 172, 85, 405, 84, 102, 85, 140, 
-  86, 511, 628, 627, 140, 86, 84, 64, 85, 86, 
-  437, 436, 171, 65, 512, 512, 103, 510, 104, 86, 
-  546, 510, 64, 140, 510, 511, 511, 84, 65, 85, 
-  532, 172, 626, 405, 34, 0, 234, 233, 0, 0, 
-  86, 520, 519, 0, 0, 547, 545, 84, 0, 85, 
-  621, 0, 543, 542, 34, 0, 349, 0, 0, 0, 
-  86, 72, 73, 512, 622, 620, 34, 512, 0, 34, 
-  512, 47, 49, 48, 511, 0, 536, 535, 511, 171, 
-  0, 511, 34, 0, 533, 531, 72, 73, 74, 75, 
-  34, 47, 49, 48, 619, 34, 171, -85, 172, 34, 
-  173, 0, 34, 47, 49, 48, 47, 49, 48, 34, 
-  0, 0, 34, 74, 75, 172, 34, 173, 0, 47, 
-  49, 48, 34, 0, 171, 34, 0, 47, 49, 48, 
-  0, 0, 47, 49, 48, 0, 47, 49, 48, 47, 
-  49, 48, -85, 172, 0, 173, 47, 49, 48, 47, 
-  49, 48, 0, 47, 49, 48, 278, 279, 0, 47, 
-  49, 48, 47, 49, 48, 280, 278, 279, 281, 0, 
-  282, 0, 0, 34, 0, 280, 34, 0, 281, 34, 
-  282, 273, 274, -339, 278, 279, -339, 34, 0, 0, 
-  0, 0, 0, 280, 0, 0, 281, 0, 282, 34, 
-  0, 0, 0, 0, 0, 244, 243, 0, 275, 276, 
-  47, 49, 48, 47, 49, 48, 47, 49, 48, 244, 
-  243, 77, 78, 34, 47, 49, 48, 0, 0, 79, 
-  80, 239, 238, 81, 0, 82, 47, 49, 48, 77, 
-  78, 34, 0, 0, 0, 0, 0, 79, 80, 0, 
-  0, 81, 0, 82, 0, 239, 238, 77, 78, 34, 
-  47, 49, 48, 278, 279, 79, 80, 0, 0, 81, 
-  0, 82, 280, 244, 243, 281, 0, 282, 47, 49, 
-  48, 6, 5, 4, 1, 3, 2, 0, 0, 150, 
-  0, 239, 238, 0, 0, 0, 47, 49, 48, 151, 
-  0, 0, 0, 152, 0, 0, 0, 150, 0, 0, 
-  0, 0, 153, 0, 154, 0, 0, 151, 0, 0, 
-  0, 152, 0, 0, 0, 155, 0, 156, 61, 0, 
-  153, 0, 154, 0, 0, 157, 0, 0, 158, 62, 
-  77, 78, 0, 155, 159, 156, 61, 0, 79, 80, 
-  160, 0, 81, 157, 82, 0, 158, 62, 0, 0, 
-  0, 0, 159, 0, 0, 0, 161, 0, 160, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 
-  31, 0, 0, 0, 161, 0, 0, 0, 0, 33, 
-  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
-  35, 36, 0, 37, 0, 0, 0, 0, 0, 0, 
-  501, 0, 0, 0, 44, 0, 0, 150, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 151, 0, 0, 
-  0, 152, 50, 47, 49, 48, 0, 51, 0, 0, 
-  153, 0, 154, 0, 0, 307, 0, 0, 43, 53, 
-  32, 0, 0, 155, 40, 156, 61, 0, 0, 0, 
-  0, 0, 0, 157, 0, 0, 158, 62, 0, 0, 
-  0, 0, 159, 0, 0, 0, 0, 0, 160, 0, 
-  0, 0, 0, 0, 0, 0, 30, 31, 0, 0, 
-  0, 0, 0, 0, 161, 0, 33, 0, 0, 0, 
-  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
-  37, 0, 0, 0, 30, 31, 0, 41, 0, 0, 
-  0, 44, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 34, 0, 0, 0, 35, 36, 0, 37, 50, 
-  47, 49, 48, 0, 51, 501, 0, 0, 0, 44, 
-  0, 0, 0, 0, 0, 43, 53, 32, 0, 0, 
-  0, 40, 0, 0, 0, 0, 0, 50, 47, 49, 
-  48, 0, 51, 0, 500, 0, 30, 31, 0, 0, 
-  0, 0, 0, 43, 53, 32, 214, 0, 0, 40, 
-  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
-  37, 0, 30, 31, 0, 0, 0, 501, 0, 0, 
-  0, 44, 33, 0, 0, 0, 0, 0, 0, 34, 
-  0, 0, 0, 35, 36, 0, 37, 0, 0, 50, 
-  502, 504, 503, 41, 51, 0, 0, 44, 0, 225, 
-  0, 0, 0, 0, 0, 43, 53, 32, 209, 0, 
-  0, 40, 0, 0, 0, 50, 47, 49, 48, 0, 
-  51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  500, 0, 30, 31, 0, 0, 0, 0, 0, 0, 
-  0, 0, 214, 0, 0, 0, 0, 0, 0, 34, 
-  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
-  0, 0, 0, 501, 0, 0, 0, 44, 0, 0, 
-  0, 0, 0, 0, 0, 608, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 50, 502, 504, 503, 0, 
-  51, 0, 0, 0, 0, 225, 0, 0, 0, 0, 
-  0, 43, 53, 32, 209, 0, 0, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  500, 0, 30, 31, 0, 0, 0, 0, 0, 0, 
-  0, 0, 214, 0, 0, 0, 0, 0, 0, 34, 
-  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
-  0, 0, 0, 501, 0, 0, 0, 44, 0, 0, 
-  0, 0, 0, 0, 0, 605, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 50, 502, 504, 503, 0, 
-  51, 0, 0, 0, 0, 225, 0, 0, 0, 0, 
-  0, 43, 53, 32, 209, 0, 0, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  29, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
-  0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
-  0, 0, 35, 36, 0, 37, 0, 0, 0, 38, 
-  0, 39, 41, 42, 0, 0, 44, 0, 0, 0, 
-  45, 0, 46, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 50, 47, 49, 48, 0, 51, 
-  0, 52, 0, 54, 0, 55, 0, 0, 0, 0, 
-  43, 53, 32, 0, 0, 0, 40, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, -117, 
-  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 45, 0, 46, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 50, 47, 49, 
-  48, 0, 51, 0, 52, 0, 54, 0, 55, 0, 
-  0, 0, 0, 43, 53, 32, 0, 0, 0, 40, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
-  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
-  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
-  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
-  0, 0, 45, 0, 46, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 50, 47, 49, 48, 
-  0, 51, 0, 52, 0, 54, 270, 55, 0, 0, 
-  0, 0, 43, 53, 32, 0, 0, 0, 40, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
-  0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 
-  216, 0, 0, 566, 567, 0, 37, 0, 0, 0, 
-  38, 0, 39, 41, 42, 0, 0, 44, 0, 0, 
-  0, 45, 0, 46, 0, 0, 0, 0, 0, 0, 
-  0, 220, 0, 0, 0, 50, 47, 49, 48, 0, 
-  51, 0, 52, 0, 54, 0, 55, 0, 0, 0, 
-  0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  474, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 45, 0, 46, 0, 0, 475, 0, 
-  0, 0, 0, 0, 0, 0, 0, 50, 47, 49, 
-  48, 0, 51, 0, 52, 0, 54, 0, 55, 0, 
-  0, 0, 0, 43, 53, 32, 0, 0, 0, 40, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 474, 0, 0, 29, 30, 31, 0, 0, 
-  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
-  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
-  37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
-  0, 44, 0, 0, 0, 45, 0, 46, 0, 0, 
-  480, 0, 0, 0, 0, 0, 0, 0, 0, 50, 
-  47, 49, 48, 0, 51, 0, 52, 0, 54, 0, 
-  55, 0, 0, 0, 0, 43, 53, 32, 0, 0, 
-  0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 482, 0, 0, 29, 30, 31, 
-  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
-  0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 
-  36, 0, 37, 0, 0, 0, 38, 0, 39, 41, 
-  42, 0, 0, 44, 0, 0, 0, 45, 0, 46, 
-  0, 0, 485, 0, 0, 0, 0, 0, 0, 0, 
-  0, 50, 47, 49, 48, 0, 51, 0, 52, 0, 
-  54, 0, 55, 0, 0, 0, 0, 43, 53, 32, 
-  0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 482, 0, 0, 29, 
-  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
-  33, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
-  0, 35, 36, 0, 37, 0, 0, 0, 38, 0, 
-  39, 41, 42, 0, 0, 44, 0, 0, 0, 45, 
-  0, 46, 0, 0, 483, 0, 0, 0, 0, 0, 
-  0, 0, 0, 50, 47, 49, 48, 0, 51, 0, 
-  52, 0, 54, 0, 55, 0, 0, 0, 0, 43, 
-  53, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 108, 109, 
-  110, 0, 0, 112, 114, 115, 0, 0, 116, 0, 
-  117, 0, 0, 0, 119, 120, 121, 0, 0, 0, 
-  0, 0, 0, 34, 122, 123, 124, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 125, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 
-  47, 49, 48, 129, 130, 131, 0, 133, 134, 135, 
-  136, 137, 138, 0, 0, 126, 132, 118, 111, 113, 
-  127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 108, 109, 110, 0, 0, 112, 
-  114, 115, 0, 0, 116, 0, 117, 0, 0, 0, 
-  119, 120, 121, 0, 0, 0, 0, 0, 0, 392, 
-  122, 123, 124, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 125, 0, 0, 0, 393, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 
-  0, 0, 0, 0, 0, 397, 394, 396, 0, 129, 
-  130, 131, 0, 133, 134, 135, 136, 137, 138, 0, 
-  0, 126, 132, 118, 111, 113, 127, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  108, 109, 110, 0, 0, 112, 114, 115, 0, 0, 
-  116, 0, 117, 0, 0, 0, 119, 120, 121, 0, 
-  0, 0, 0, 0, 0, 392, 122, 123, 124, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 125, 
-  0, 0, 0, 393, 0, 0, 0, 0, 0, 0, 
-  0, 395, 0, 0, 0, 128, 0, 0, 0, 0, 
-  0, 397, 394, 396, 0, 129, 130, 131, 0, 133, 
-  134, 135, 136, 137, 138, 0, 0, 126, 132, 118, 
-  111, 113, 127, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 208, 0, 0, 0, 
-  0, 210, 0, 29, 30, 31, 212, 0, 0, 0, 
-  0, 0, 0, 213, 33, 0, 0, 0, 0, 0, 
-  0, 215, 216, 0, 0, 217, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 45, 0, 46, 0, 0, 0, 0, 
-  0, 219, 0, 220, 0, 0, 0, 50, 218, 221, 
-  48, 222, 51, 223, 52, 224, 54, 225, 55, 226, 
-  227, 0, 0, 43, 53, 32, 209, 211, 0, 40, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 208, 0, 0, 0, 0, 210, 0, 29, 
-  30, 31, 212, 0, 0, 0, 0, 0, 0, 213, 
-  214, 0, 0, 0, 0, 0, 0, 215, 216, 0, 
-  0, 217, 36, 0, 37, 0, 0, 0, 38, 0, 
-  39, 41, 42, 0, 0, 44, 0, 0, 0, 45, 
-  0, 46, 0, 0, 0, 0, 0, 219, 0, 220, 
-  0, 0, 0, 50, 218, 221, 48, 222, 51, 223, 
-  52, 224, 54, 225, 55, 226, 227, 0, 0, 43, 
-  53, 32, 209, 211, 0, 40, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 569, 109, 
-  110, 0, 0, 571, 114, 573, 30, 31, 574, 0, 
-  117, 0, 0, 0, 119, 576, 577, 0, 0, 0, 
-  0, 0, 0, 578, 579, 123, 124, 217, 36, 0, 
-  37, 0, 0, 0, 38, 0, 39, 580, 42, 0, 
-  0, 582, 0, 0, 0, 45, 0, 46, 0, 0, 
-  0, 0, 0, 584, 0, 220, 0, 0, 0, 586, 
-  583, 585, 48, 587, 588, 589, 52, 591, 592, 593, 
-  594, 595, 596, 0, 0, 581, 590, 575, 570, 572, 
-  127, 40, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 360, 109, 110, 0, 0, 362, 
-  114, 364, 30, 31, 365, 0, 117, 0, 0, 0, 
-  119, 367, 368, 0, 0, 0, 0, 0, 0, 369, 
-  370, 123, 124, 217, 36, 0, 37, 0, 0, 0, 
-  38, 0, 39, 371, 42, 0, 0, 373, 0, 0, 
-  0, 45, 0, 46, 0, -263, 0, 0, 0, 375, 
-  0, 220, 0, 0, 0, 377, 374, 376, 48, 378, 
-  379, 380, 52, 382, 383, 384, 385, 386, 387, 0, 
-  0, 372, 381, 366, 361, 363, 127, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-
-  541, 310, 460, 513, 538, 518, 525, 308, 249, 632, 
-  306, 181, 252, 618, 149, 16, 623, 495, 319, 497, 
-  629, 357, 496, 435, 471, 553, 557, 486, 438, 301, 
-  428, 237, 350, 352, 604, 521, 242, 424, 550, 552, 
-  181, 301, 185, 237, 242, 343, 432, 348, 338, 249, 
-  459, 237, 453, 449, 236, 242, 446, 181, 466, 401, 
-  448, 249, 357, 455, 444, 457, 346, 337, 357, 484, 
-  142, 236, 147, 333, 438, 175, 301, 335, 187, 409, 
-  162, 145, 435, 416, 435, 139, 170, 399, 414, 481, 
-  438, 389, 0, 168, 0, 0, 403, 357, 403, 59, 
-  357, 490, 301, 534, 391, 0, 0, 0, 301, 0, 
-  0, 460, 0, 145, 59, 0, 179, 403, 177, 59, 
-  59, 488, 489, 0, 404, 105, 404, 0, 59, 185, 
-  451, 59, 59, 450, 59, 59, 59, 59, 59, 283, 
-  284, 59, 287, 285, 145, 404, 286, 107, 167, 406, 
-  164, 59, 59, 451, 450, 265, 59, 59, 301, 59, 
-  269, 68, 96, 95, 479, 59, 59, 331, 478, 59, 
-  87, 76, 59, 329, 59, 97, 434, 83, 89, 431, 
-  59, 470, 59, 59, 59, 94, 88, 59, 93, 92, 
-  59, 59, 90, 59, 59, 91, 493, 59, 59, 71, 
-  67, 59, 59, 491, 492, 99, 59, 101, 179, 319, 
-  301, 59, 59, 340, 69, 60, 59, 59, 450, 66, 
-  59, 59, 451, 304, 105, 499, 269, 297, 297, 297, 
-  59, 59, 269, 269, 269, 269, 269, 0, 315, 272, 
-  498, 508, 294, 0, 0, 0, 107, 174, 59, 325, 
-  318, 316, 297, 269, 59, 290, 0, 269, 297, 269, 
-  0, 59, 0, 269, 59, 0, 269, 292, 59, 269, 
-  179, 277, 59, 0, 299, 302, 312, 269, 59, 288, 
-  296, 328, 609, 269, 499, 289, 597, 633, 606, 599, 
-  499, 600, 565, 600, 0, 0, 499, 0, 0, 568, 
-  561, 562, 563, 564, 0, 498, 508, 0, 471, 0, 
-  0, 498, 508, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  499, 0, 0, 603, 0, 0, 0, 600, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0};
-
-const short QmlJSGrammar::action_check [] = {
-  7, 7, 36, 90, 7, 29, 36, 7, 36, 7, 
-  33, 8, 7, 7, 36, 7, 90, 7, 0, 7, 
-  16, 60, 55, 33, 8, 29, 7, 36, 7, 55, 
-  79, 48, 1, 7, 55, 2, 7, 17, 37, 7, 
-  33, 60, 29, 7, 33, 7, 66, 33, 33, 7, 
-  66, 29, 7, 36, 20, 7, 7, 29, 33, 36, 
-  36, 24, 5, 36, 5, 7, 36, 5, 1, 60, 
-  7, 36, 7, 2, 79, 2, 33, 8, 8, 7, 
-  1, 7, 36, 36, 8, 1, 36, -1, 8, 36, 
-  -1, 2, 36, 8, 55, 7, -1, -1, -1, 17, 
-  60, 60, 48, 48, 60, 7, -1, 55, 8, -1, 
-  33, 36, 61, 6, 48, -1, 33, 15, 8, 10, 
-  8, 60, 36, 36, 7, 8, 8, 20, 8, 61, 
-  8, 33, 8, -1, 8, 40, 34, 77, 60, 8, 
-  8, 8, 61, 79, 50, -1, 51, 50, 54, 8, 
-  60, 54, 61, 62, 61, 62, 56, 61, 62, 40, 
-  61, 62, 61, 62, 55, 40, 56, 61, 62, 12, 
-  51, 42, 60, 15, 61, 62, 51, 7, 60, -1, 
-  60, 8, 53, 61, 60, 31, 60, 40, 56, 61, 
-  62, 60, 34, 60, 29, 61, 62, 56, 51, 61, 
-  62, 61, 62, 25, 25, 27, 27, 8, 25, 25, 
-  27, 27, 12, 25, 57, 27, 38, 38, 29, 29, 
-  63, 38, 38, 25, 15, 27, 38, 12, 25, -1, 
-  27, 61, 62, 8, 61, 62, 38, 25, 8, 27, 
-  75, 38, 25, 34, 27, 36, 25, 15, 27, 8, 
-  38, 86, 61, 62, 8, 38, 25, 57, 27, 38, 
-  61, 62, 15, 63, 75, 75, 34, 29, 36, 38, 
-  36, 29, 57, 8, 29, 86, 86, 25, 63, 27, 
-  7, 34, 91, 36, 29, -1, 61, 62, -1, -1, 
-  38, 61, 62, -1, -1, 61, 62, 25, -1, 27, 
-  47, -1, 61, 62, 29, -1, 60, -1, -1, -1, 
-  38, 18, 19, 75, 61, 62, 29, 75, -1, 29, 
-  75, 66, 67, 68, 86, -1, 61, 62, 86, 15, 
-  -1, 86, 29, -1, 61, 62, 18, 19, 45, 46, 
-  29, 66, 67, 68, 91, 29, 15, 33, 34, 29, 
-  36, -1, 29, 66, 67, 68, 66, 67, 68, 29, 
-  -1, -1, 29, 45, 46, 34, 29, 36, -1, 66, 
-  67, 68, 29, -1, 15, 29, -1, 66, 67, 68, 
-  -1, -1, 66, 67, 68, -1, 66, 67, 68, 66, 
-  67, 68, 33, 34, -1, 36, 66, 67, 68, 66, 
-  67, 68, -1, 66, 67, 68, 23, 24, -1, 66, 
-  67, 68, 66, 67, 68, 32, 23, 24, 35, -1, 
-  37, -1, -1, 29, -1, 32, 29, -1, 35, 29, 
-  37, 18, 19, 36, 23, 24, 36, 29, -1, -1, 
-  -1, -1, -1, 32, -1, -1, 35, -1, 37, 29, 
-  -1, -1, -1, -1, -1, 61, 62, -1, 45, 46, 
-  66, 67, 68, 66, 67, 68, 66, 67, 68, 61, 
-  62, 23, 24, 29, 66, 67, 68, -1, -1, 31, 
-  32, 61, 62, 35, -1, 37, 66, 67, 68, 23, 
-  24, 29, -1, -1, -1, -1, -1, 31, 32, -1, 
-  -1, 35, -1, 37, -1, 61, 62, 23, 24, 29, 
-  66, 67, 68, 23, 24, 31, 32, -1, -1, 35, 
-  -1, 37, 32, 61, 62, 35, -1, 37, 66, 67, 
-  68, 92, 93, 94, 95, 96, 97, -1, -1, 3, 
-  -1, 61, 62, -1, -1, -1, 66, 67, 68, 13, 
-  -1, -1, -1, 17, -1, -1, -1, 3, -1, -1, 
-  -1, -1, 26, -1, 28, -1, -1, 13, -1, -1, 
-  -1, 17, -1, -1, -1, 39, -1, 41, 42, -1, 
-  26, -1, 28, -1, -1, 49, -1, -1, 52, 53, 
-  23, 24, -1, 39, 58, 41, 42, -1, 31, 32, 
-  64, -1, 35, 49, 37, -1, 52, 53, -1, -1, 
-  -1, -1, 58, -1, -1, -1, 80, -1, 64, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 12, 
-  13, -1, -1, -1, 80, -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, 3, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, 
-  -1, 17, 65, 66, 67, 68, -1, 70, -1, -1, 
-  26, -1, 28, -1, -1, 31, -1, -1, 81, 82, 
-  83, -1, -1, 39, 87, 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, 12, 13, -1, -1, 
-  -1, -1, -1, -1, 80, -1, 22, -1, -1, -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, 68, -1, 70, 43, -1, -1, -1, 47, 
-  -1, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, -1, 65, 66, 67, 
-  68, -1, 70, -1, 10, -1, 12, 13, -1, -1, 
-  -1, -1, -1, 81, 82, 83, 22, -1, -1, 87, 
-  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
-  36, -1, 12, 13, -1, -1, -1, 43, -1, -1, 
-  -1, 47, 22, -1, -1, -1, -1, -1, -1, 29, 
-  -1, -1, -1, 33, 34, -1, 36, -1, -1, 65, 
-  66, 67, 68, 43, 70, -1, -1, 47, -1, 75, 
-  -1, -1, -1, -1, -1, 81, 82, 83, 84, -1, 
-  -1, 87, -1, -1, -1, 65, 66, 67, 68, -1, 
-  70, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
-  -1, -1, -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, 68, -1, 
-  70, -1, -1, -1, -1, 75, -1, -1, -1, -1, 
-  -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, 
-  -1, -1, -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, 68, -1, 
-  70, -1, -1, -1, -1, 75, -1, -1, -1, -1, 
-  -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, 
-  -1, -1, -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, 68, -1, 70, 
-  -1, 72, -1, 74, -1, 76, -1, -1, -1, -1, 
-  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
-  -1, -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, 
-  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
-  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, -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, 68, 
-  -1, 70, -1, 72, -1, 74, 75, 76, -1, -1, 
-  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
-  -1, -1, -1, -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, 68, -1, 
-  70, -1, 72, -1, 74, -1, 76, -1, -1, -1, 
-  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  8, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
-  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
-  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
-  -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
-  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
-  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
-  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
-  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
-  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
-  56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
-  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
-  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 8, -1, -1, 11, 12, 13, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
-  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
-  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
-  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
-  -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 
-  74, -1, 76, -1, -1, -1, -1, 81, 82, 83, 
-  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 8, -1, -1, 11, 
-  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
-  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
-  -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
-  42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
-  -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
-  72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
-  82, 83, -1, -1, -1, 87, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 59, -1, -1, -1, -1, -1, -1, 
-  66, 67, 68, 69, 70, 71, -1, 73, 74, 75, 
-  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
-  86, -1, -1, -1, -1, -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, -1, 69, 
-  70, 71, -1, 73, 74, 75, 76, 77, 78, -1, 
-  -1, 81, 82, 83, 84, 85, 86, -1, -1, -1, 
-  -1, -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, -1, 69, 70, 71, -1, 73, 
-  74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
-  84, 85, 86, -1, -1, -1, -1, -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, 
-  78, -1, -1, 81, 82, 83, 84, 85, -1, 87, 
-  -1, -1, -1, -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, 78, -1, -1, 81, 
-  82, 83, 84, 85, -1, 87, -1, -1, -1, -1, 
-  -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, 78, -1, -1, 81, 82, 83, 84, 85, 
-  86, 87, -1, -1, -1, -1, -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, 78, -1, 
-  -1, 81, 82, 83, 84, 85, 86, 87, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-
-  3, 2, 15, 25, 25, 3, 25, 3, 2, 11, 
-  2, 15, 3, 13, 67, 3, 15, 104, 15, 2, 
-  15, 2, 4, 3, 35, 15, 15, 3, 21, 3, 
-  93, 15, 2, 2, 19, 13, 15, 96, 25, 25, 
-  15, 3, 15, 15, 15, 100, 3, 3, 15, 2, 
-  2, 15, 3, 21, 4, 15, 15, 15, 35, 2, 
-  21, 2, 2, 2, 98, 3, 2, 2, 2, 35, 
-  35, 4, 35, 2, 21, 3, 3, 3, 15, 2, 
-  35, 35, 3, 3, 3, 3, 35, 35, 2, 35, 
-  21, 35, -1, 35, -1, -1, 13, 2, 13, 44, 
-  2, 46, 3, 3, 36, -1, -1, -1, 3, -1, 
-  -1, 15, -1, 35, 44, -1, 46, 13, 40, 44, 
-  44, 46, 46, -1, 41, 15, 41, -1, 44, 15, 
-  46, 44, 44, 46, 44, 44, 44, 44, 44, 49, 
-  49, 44, 49, 49, 35, 41, 49, 37, 60, 40, 
-  58, 44, 44, 46, 46, 44, 44, 44, 3, 44, 
-  49, 46, 50, 50, 31, 44, 44, 68, 35, 44, 
-  48, 50, 44, 68, 44, 50, 81, 49, 48, 81, 
-  44, 85, 44, 44, 44, 49, 48, 44, 49, 49, 
-  44, 44, 49, 44, 44, 49, 46, 44, 44, 52, 
-  46, 44, 44, 46, 46, 56, 44, 54, 46, 15, 
-  3, 44, 44, 99, 47, 47, 44, 44, 46, 46, 
-  44, 44, 46, 68, 15, 13, 49, 44, 44, 44, 
-  44, 44, 49, 49, 49, 49, 49, -1, 61, 53, 
-  28, 29, 55, -1, -1, -1, 37, 38, 44, 66, 
-  66, 66, 44, 49, 44, 51, -1, 49, 44, 49, 
-  -1, 44, -1, 49, 44, -1, 49, 57, 44, 49, 
-  46, 51, 44, -1, 66, 68, 59, 49, 44, 51, 
-  66, 87, 5, 49, 13, 51, 13, 16, 5, 16, 
-  13, 20, 13, 20, -1, -1, 13, -1, -1, 20, 
-  21, 22, 23, 24, -1, 28, 29, -1, 35, -1, 
-  -1, 28, 29, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  13, -1, -1, 16, -1, -1, -1, 20, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1};
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h
deleted file mode 100644
index 21fddba..0000000
--- a/src/declarative/qml/parser/qmljsgrammar_p.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-// This file was generated by qlalr - DO NOT EDIT!
-#ifndef QMLJSGRAMMAR_P_H
-#define QMLJSGRAMMAR_P_H
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlJSGrammar
-{
-public:
-  enum VariousConstants {
-    EOF_SYMBOL = 0,
-    REDUCE_HERE = 99,
-    SHIFT_THERE = 98,
-    T_AND = 1,
-    T_AND_AND = 2,
-    T_AND_EQ = 3,
-    T_AS = 91,
-    T_AUTOMATIC_SEMICOLON = 62,
-    T_BREAK = 4,
-    T_CASE = 5,
-    T_CATCH = 6,
-    T_COLON = 7,
-    T_COMMA = 8,
-    T_COMMENT = 88,
-    T_CONST = 84,
-    T_CONTINUE = 9,
-    T_DEBUGGER = 85,
-    T_DEFAULT = 10,
-    T_DELETE = 11,
-    T_DIVIDE_ = 12,
-    T_DIVIDE_EQ = 13,
-    T_DO = 14,
-    T_DOT = 15,
-    T_ELSE = 16,
-    T_EQ = 17,
-    T_EQ_EQ = 18,
-    T_EQ_EQ_EQ = 19,
-    T_FALSE = 83,
-    T_FEED_JS_EXPRESSION = 95,
-    T_FEED_JS_PROGRAM = 97,
-    T_FEED_JS_SOURCE_ELEMENT = 96,
-    T_FEED_JS_STATEMENT = 94,
-    T_FEED_UI_OBJECT_MEMBER = 93,
-    T_FEED_UI_PROGRAM = 92,
-    T_FINALLY = 20,
-    T_FOR = 21,
-    T_FUNCTION = 22,
-    T_GE = 23,
-    T_GT = 24,
-    T_GT_GT = 25,
-    T_GT_GT_EQ = 26,
-    T_GT_GT_GT = 27,
-    T_GT_GT_GT_EQ = 28,
-    T_IDENTIFIER = 29,
-    T_IF = 30,
-    T_IMPORT = 90,
-    T_IN = 31,
-    T_INSTANCEOF = 32,
-    T_LBRACE = 33,
-    T_LBRACKET = 34,
-    T_LE = 35,
-    T_LPAREN = 36,
-    T_LT = 37,
-    T_LT_LT = 38,
-    T_LT_LT_EQ = 39,
-    T_MINUS = 40,
-    T_MINUS_EQ = 41,
-    T_MINUS_MINUS = 42,
-    T_MULTILINE_STRING_LITERAL = 87,
-    T_NEW = 43,
-    T_NOT = 44,
-    T_NOT_EQ = 45,
-    T_NOT_EQ_EQ = 46,
-    T_NULL = 81,
-    T_NUMERIC_LITERAL = 47,
-    T_OR = 48,
-    T_OR_EQ = 49,
-    T_OR_OR = 50,
-    T_PLUS = 51,
-    T_PLUS_EQ = 52,
-    T_PLUS_PLUS = 53,
-    T_PROPERTY = 66,
-    T_PUBLIC = 89,
-    T_QUESTION = 54,
-    T_RBRACE = 55,
-    T_RBRACKET = 56,
-    T_READONLY = 68,
-    T_REMAINDER = 57,
-    T_REMAINDER_EQ = 58,
-    T_RESERVED_WORD = 86,
-    T_RETURN = 59,
-    T_RPAREN = 60,
-    T_SEMICOLON = 61,
-    T_SIGNAL = 67,
-    T_STAR = 63,
-    T_STAR_EQ = 64,
-    T_STRING_LITERAL = 65,
-    T_SWITCH = 69,
-    T_THIS = 70,
-    T_THROW = 71,
-    T_TILDE = 72,
-    T_TRUE = 82,
-    T_TRY = 73,
-    T_TYPEOF = 74,
-    T_VAR = 75,
-    T_VOID = 76,
-    T_WHILE = 77,
-    T_WITH = 78,
-    T_XOR = 79,
-    T_XOR_EQ = 80,
-
-    ACCEPT_STATE = 635,
-    RULE_COUNT = 343,
-    STATE_COUNT = 636,
-    TERMINAL_COUNT = 100,
-    NON_TERMINAL_COUNT = 106,
-
-    GOTO_INDEX_OFFSET = 636,
-    GOTO_INFO_OFFSET = 2520,
-    GOTO_CHECK_OFFSET = 2520
-  };
-
-  static const char  *const    spell [];
-  static const short             lhs [];
-  static const short             rhs [];
-  static const short    goto_default [];
-  static const short  action_default [];
-  static const short    action_index [];
-  static const short     action_info [];
-  static const short    action_check [];
-
-  static inline int nt_action (int state, int nt)
-  {
-    const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;
-    if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)
-      return goto_default [nt];
-
-    return action_info [GOTO_INFO_OFFSET + yyn];
-  }
-
-  static inline int t_action (int state, int token)
-  {
-    const int yyn = action_index [state] + token;
-
-    if (yyn < 0 || action_check [yyn] != token)
-      return - action_default [state];
-
-    return action_info [yyn];
-  }
-};
-
-
-QT_END_NAMESPACE
-#endif // QMLJSGRAMMAR_P_H
-
diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp
deleted file mode 100644
index 816542f..0000000
--- a/src/declarative/qml/parser/qmljslexer.cpp
+++ /dev/null
@@ -1,1161 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "qmljslexer_p.h"
-
-#include "qmljsglobal_p.h"
-#include "qmljsengine_p.h"
-#include "qmljsgrammar_p.h"
-
-#include <QtCore/qcoreapplication.h>
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-QT_QML_BEGIN_NAMESPACE
-
-extern double qstrtod(const char *s00, char const **se, bool *ok);
-
-#define shiftWindowsLineBreak() \
-    do { \
-        if (((current == '\r') && (next1 == '\n')) \
-            || ((current == '\n') && (next1 == '\r'))) { \
-            shift(1); \
-        } \
-    } \
-    while (0)
-
-namespace QmlJS {
-extern double integerFromString(const char *buf, int size, int radix);
-}
-
-using namespace QmlJS;
-
-Lexer::Lexer(Engine *eng, bool tokenizeComments)
-    : driver(eng),
-      yylineno(0),
-      done(false),
-      size8(128), size16(128),
-      pos8(0), pos16(0),
-      terminator(false),
-      restrKeyword(false),
-      delimited(false),
-      stackToken(-1),
-      state(Start),
-      pos(0),
-      code(0), length(0),
-      yycolumn(0),
-      startpos(0),
-      startlineno(0), startcolumn(0),
-      bol(true),
-      current(0), next1(0), next2(0), next3(0),
-      err(NoError),
-      wantRx(false),
-      check_reserved(true),
-      parenthesesState(IgnoreParentheses),
-      parenthesesCount(0),
-      prohibitAutomaticSemicolon(false),
-      tokenizeComments(tokenizeComments)
-{
-    driver->setLexer(this);
-    // allocate space for read buffers
-    buffer8 = new char[size8];
-    buffer16 = new QChar[size16];
-    pattern = 0;
-    flags = 0;
-
-}
-
-Lexer::~Lexer()
-{
-    delete [] buffer8;
-    delete [] buffer16;
-}
-
-void Lexer::setCode(const QString &c, int lineno)
-{
-    errmsg = QString();
-    yylineno = lineno;
-    yycolumn = 1;
-    restrKeyword = false;
-    delimited = false;
-    stackToken = -1;
-    pos = 0;
-    code = c.unicode();
-    length = c.length();
-    bol = true;
-
-    // read first characters
-    current = (length > 0) ? code[0].unicode() : 0;
-    next1 = (length > 1) ? code[1].unicode() : 0;
-    next2 = (length > 2) ? code[2].unicode() : 0;
-    next3 = (length > 3) ? code[3].unicode() : 0;
-}
-
-void Lexer::shift(uint p)
-{
-    while (p--) {
-        ++pos;
-        ++yycolumn;
-        current = next1;
-        next1 = next2;
-        next2 = next3;
-        next3 = (pos + 3 < length) ? code[pos+3].unicode() : 0;
-    }
-}
-
-void Lexer::setDone(State s)
-{
-    state = s;
-    done = true;
-}
-
-int Lexer::findReservedWord(const QChar *c, int size) const
-{
-    switch (size) {
-    case 2: {
-        if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('o'))
-            return QmlJSGrammar::T_DO;
-        else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('f'))
-            return QmlJSGrammar::T_IF;
-        else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n'))
-            return QmlJSGrammar::T_IN;
-        else if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('s'))
-            return QmlJSGrammar::T_AS;
-    }   break;
-
-    case 3: {
-        if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('o') && c[2] == QLatin1Char('r'))
-            return QmlJSGrammar::T_FOR;
-        else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('e') && c[2] == QLatin1Char('w'))
-            return QmlJSGrammar::T_NEW;
-        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('r') && c[2] == QLatin1Char('y'))
-            return QmlJSGrammar::T_TRY;
-        else if (c[0] == QLatin1Char('v') && c[1] == QLatin1Char('a') && c[2] == QLatin1Char('r'))
-            return QmlJSGrammar::T_VAR;
-        else if (check_reserved) {
-            if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n') && c[2] == QLatin1Char('t'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-        }
-    }   break;
-
-    case 4: {
-        if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('a')
-                && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('e'))
-            return QmlJSGrammar::T_CASE;
-        else if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('l')
-                && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('e'))
-            return QmlJSGrammar::T_ELSE;
-        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('h')
-                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('s'))
-            return QmlJSGrammar::T_THIS;
-        else if (c[0] == QLatin1Char('v') && c[1] == QLatin1Char('o')
-                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('d'))
-            return QmlJSGrammar::T_VOID;
-        else if (c[0] == QLatin1Char('w') && c[1] == QLatin1Char('i')
-                && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('h'))
-            return QmlJSGrammar::T_WITH;
-        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('r')
-                && c[2] == QLatin1Char('u') && c[3] == QLatin1Char('e'))
-            return QmlJSGrammar::T_TRUE;
-        else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('u')
-                && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('l'))
-            return QmlJSGrammar::T_NULL;
-        else if (check_reserved) {
-            if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('n')
-                    && c[2] == QLatin1Char('u') && c[3] == QLatin1Char('m'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('b') && c[1] == QLatin1Char('y')
-                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('e'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('l') && c[1] == QLatin1Char('o')
-                    && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('g'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('h')
-                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('r'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('g') && c[1] == QLatin1Char('o')
-                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('o'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-        }
-    }   break;
-
-    case 5: {
-        if (c[0] == QLatin1Char('b') && c[1] == QLatin1Char('r')
-                && c[2] == QLatin1Char('e') && c[3] == QLatin1Char('a')
-                && c[4] == QLatin1Char('k'))
-            return QmlJSGrammar::T_BREAK;
-        else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('a')
-                && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('c')
-                && c[4] == QLatin1Char('h'))
-            return QmlJSGrammar::T_CATCH;
-        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('h')
-                && c[2] == QLatin1Char('r') && c[3] == QLatin1Char('o')
-                && c[4] == QLatin1Char('w'))
-            return QmlJSGrammar::T_THROW;
-        else if (c[0] == QLatin1Char('w') && c[1] == QLatin1Char('h')
-                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('l')
-                && c[4] == QLatin1Char('e'))
-            return QmlJSGrammar::T_WHILE;
-        else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('o')
-                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('s')
-                && c[4] == QLatin1Char('t'))
-            return QmlJSGrammar::T_CONST;
-        else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('a')
-                && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('s')
-                && c[4] == QLatin1Char('e'))
-            return QmlJSGrammar::T_FALSE;
-        else if (check_reserved) {
-            if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('h')
-                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('r')
-                    && c[4] == QLatin1Char('t'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('u')
-                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('e')
-                    && c[4] == QLatin1Char('r'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('i')
-                    && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('a')
-                    && c[4] == QLatin1Char('l'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('l')
-                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('s')
-                    && c[4] == QLatin1Char('s'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('l')
-                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('a')
-                    && c[4] == QLatin1Char('t'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-        }
-    }   break;
-
-    case 6: {
-        if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('e')
-                && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('e')
-                && c[4] == QLatin1Char('t') && c[5] == QLatin1Char('e'))
-            return QmlJSGrammar::T_DELETE;
-        else if (c[0] == QLatin1Char('r') && c[1] == QLatin1Char('e')
-                && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('u')
-                && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('n'))
-            return QmlJSGrammar::T_RETURN;
-        else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('w')
-                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('t')
-                && c[4] == QLatin1Char('c') && c[5] == QLatin1Char('h'))
-            return QmlJSGrammar::T_SWITCH;
-        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('y')
-                && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('e')
-                && c[4] == QLatin1Char('o') && c[5] == QLatin1Char('f'))
-            return QmlJSGrammar::T_TYPEOF;
-        else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('m')
-            && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o')
-            && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('t'))
-            return QmlJSGrammar::T_IMPORT;
-        else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('i')
-            && c[2] == QLatin1Char('g') && c[3] == QLatin1Char('n')
-            && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('l'))
-            return QmlJSGrammar::T_SIGNAL;
-        else if (check_reserved) {
-            if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('x')
-                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o')
-                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('t'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('t')
-                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('t')
-                    && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('c'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('o')
-                    && c[2] == QLatin1Char('u') && c[3] == QLatin1Char('b')
-                    && c[4] == QLatin1Char('l') && c[5] == QLatin1Char('e'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('m')
-                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o')
-                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('t'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('u')
-                    && c[2] == QLatin1Char('b') && c[3] == QLatin1Char('l')
-                    && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('c'))
-                return QmlJSGrammar::T_PUBLIC;
-            else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('a')
-                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('i')
-                    && c[4] == QLatin1Char('v') && c[5] == QLatin1Char('e'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('h')
-                    && c[2] == QLatin1Char('r') && c[3] == QLatin1Char('o')
-                    && c[4] == QLatin1Char('w') && c[5] == QLatin1Char('s'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-        }
-    }   break;
-
-    case 7: {
-        if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('e')
-                && c[2] == QLatin1Char('f') && c[3] == QLatin1Char('a')
-                && c[4] == QLatin1Char('u') && c[5] == QLatin1Char('l')
-                && c[6] == QLatin1Char('t'))
-            return QmlJSGrammar::T_DEFAULT;
-        else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('i')
-                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('a')
-                && c[4] == QLatin1Char('l') && c[5] == QLatin1Char('l')
-                && c[6] == QLatin1Char('y'))
-            return QmlJSGrammar::T_FINALLY;
-        else if (check_reserved) {
-            if (c[0] == QLatin1Char('b') && c[1] == QLatin1Char('o')
-                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('l')
-                    && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('a')
-                    && c[6] == QLatin1Char('n'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('x')
-                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('e')
-                    && c[4] == QLatin1Char('n') && c[5] == QLatin1Char('d')
-                    && c[6] == QLatin1Char('s'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('a')
-                    && c[2] == QLatin1Char('c') && c[3] == QLatin1Char('k')
-                    && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('g')
-                    && c[6] == QLatin1Char('e'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('r')
-                    && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('v')
-                    && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('t')
-                    && c[6] == QLatin1Char('e'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-        }
-    }   break;
-
-    case 8: {
-        if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('o')
-                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('t')
-                && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('n')
-                && c[6] == QLatin1Char('u') && c[7] == QLatin1Char('e'))
-            return QmlJSGrammar::T_CONTINUE;
-        else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('u')
-                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('c')
-                && c[4] == QLatin1Char('t') && c[5] == QLatin1Char('i')
-                && c[6] == QLatin1Char('o') && c[7] == QLatin1Char('n'))
-            return QmlJSGrammar::T_FUNCTION;
-        else if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('e')
-                && c[2] == QLatin1Char('b') && c[3] == QLatin1Char('u')
-                && c[4] == QLatin1Char('g') && c[5] == QLatin1Char('g')
-                && c[6] == QLatin1Char('e') && c[7] == QLatin1Char('r'))
-            return QmlJSGrammar::T_DEBUGGER;
-        else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('r')
-                && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('p')
-                && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('r')
-                && c[6] == QLatin1Char('t') && c[7] == QLatin1Char('y'))
-            return QmlJSGrammar::T_PROPERTY;
-        else if (c[0] == QLatin1Char('r') && c[1] == QLatin1Char('e')
-                && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('d')
-                && c[4] == QLatin1Char('o') && c[5] == QLatin1Char('n')
-                && c[6] == QLatin1Char('l') && c[7] == QLatin1Char('y'))
-            return QmlJSGrammar::T_READONLY;
-        else if (check_reserved) {
-            if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('b')
-                    && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('t')
-                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('a')
-                    && c[6] == QLatin1Char('c') && c[7] == QLatin1Char('t'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('v') && c[1] == QLatin1Char('o')
-                    && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('a')
-                    && c[4] == QLatin1Char('t') && c[5] == QLatin1Char('i')
-                    && c[6] == QLatin1Char('l') && c[7] == QLatin1Char('e'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-        }
-    }   break;
-
-    case 9: {
-        if (check_reserved) {
-            if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n')
-                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('e')
-                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('f')
-                    && c[6] == QLatin1Char('a') && c[7] == QLatin1Char('c')
-                    && c[8] == QLatin1Char('e'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('r')
-                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('n')
-                    && c[4] == QLatin1Char('s') && c[5] == QLatin1Char('i')
-                    && c[6] == QLatin1Char('e') && c[7] == QLatin1Char('n')
-                    && c[8] == QLatin1Char('t'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('r')
-                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('t')
-                    && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('c')
-                    && c[6] == QLatin1Char('t') && c[7] == QLatin1Char('e')
-                    && c[8] == QLatin1Char('d'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-        }
-    }   break;
-
-    case 10: {
-        if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n')
-                && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('t')
-                && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('n')
-                && c[6] == QLatin1Char('c') && c[7] == QLatin1Char('e')
-                && c[8] == QLatin1Char('o') && c[9] == QLatin1Char('f'))
-            return QmlJSGrammar::T_INSTANCEOF;
-        else if (check_reserved) {
-            if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('m')
-                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('l')
-                    && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('m')
-                    && c[6] == QLatin1Char('e') && c[7] == QLatin1Char('n')
-                    && c[8] == QLatin1Char('t') && c[9] == QLatin1Char('s'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-        }
-    }   break;
-
-    case 12: {
-        if (check_reserved) {
-            if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('y')
-                    && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('c')
-                    && c[4] == QLatin1Char('h') && c[5] == QLatin1Char('r')
-                    && c[6] == QLatin1Char('o') && c[7] == QLatin1Char('n')
-                    && c[8] == QLatin1Char('i') && c[9] == QLatin1Char('z')
-                    && c[10] == QLatin1Char('e') && c[11] == QLatin1Char('d'))
-                return QmlJSGrammar::T_RESERVED_WORD;
-        }
-    }   break;
-
-    } // switch
-
-    return -1;
-}
-
-int Lexer::lex()
-{
-    int token = 0;
-    state = Start;
-    ushort stringType = 0; // either single or double quotes
-    bool multiLineString = false;
-    pos8 = pos16 = 0;
-    done = false;
-    terminator = false;
-
-    // did we push a token on the stack previously ?
-    // (after an automatic semicolon insertion)
-    if (stackToken >= 0) {
-        setDone(Other);
-        token = stackToken;
-        stackToken = -1;
-    }
-
-    while (!done) {
-        switch (state) {
-        case Start:
-            if (isWhiteSpace()) {
-                // do nothing
-            } else if (current == '/' && next1 == '/') {
-                recordStartPos();
-                shift(1);
-                state = InSingleLineComment;
-            } else if (current == '/' && next1 == '*') {
-                recordStartPos();
-                shift(1);
-                state = InMultiLineComment;
-            } else if (current == 0) {
-                syncProhibitAutomaticSemicolon();
-                if (!terminator && !delimited && !prohibitAutomaticSemicolon) {
-                    // automatic semicolon insertion if program incomplete
-                    token = QmlJSGrammar::T_SEMICOLON;
-                    stackToken = 0;
-                    setDone(Other);
-                } else {
-                    setDone(Eof);
-                }
-            } else if (isLineTerminator()) {
-                shiftWindowsLineBreak();
-                yylineno++;
-                yycolumn = 0;
-                bol = true;
-                terminator = true;
-                syncProhibitAutomaticSemicolon();
-                if (restrKeyword) {
-                    token = QmlJSGrammar::T_SEMICOLON;
-                    setDone(Other);
-                }
-            } else if (current == '"' || current == '\'') {
-                recordStartPos();
-                state = InString;
-                multiLineString = false;
-                stringType = current;
-            } else if (isIdentLetter(current)) {
-                recordStartPos();
-                record16(current);
-                state = InIdentifier;
-            } else if (current == '0') {
-                recordStartPos();
-                record8(current);
-                state = InNum0;
-            } else if (isDecimalDigit(current)) {
-                recordStartPos();
-                record8(current);
-                state = InNum;
-            } else if (current == '.' && isDecimalDigit(next1)) {
-                recordStartPos();
-                record8(current);
-                state = InDecimal;
-            } else {
-                recordStartPos();
-                token = matchPunctuator(current, next1, next2, next3);
-                if (token != -1) {
-                    if (terminator && !delimited && !prohibitAutomaticSemicolon
-                        && (token == QmlJSGrammar::T_PLUS_PLUS
-                            || token == QmlJSGrammar::T_MINUS_MINUS)) {
-                        // automatic semicolon insertion
-                        stackToken = token;
-                        token = QmlJSGrammar::T_SEMICOLON;
-                    }
-                    setDone(Other);
-                }
-                else {
-                    setDone(Bad);
-                    err = IllegalCharacter;
-                    errmsg = QCoreApplication::translate("QmlParser", "Illegal character");
-                }
-            }
-            break;
-        case InString:
-            if (current == stringType) {
-                shift(1);
-                setDone(String);
-            } else if (isLineTerminator()) {
-                multiLineString = true;
-                record16(current);
-            } else if (current == 0 || isLineTerminator()) {
-                setDone(Bad);
-                err = UnclosedStringLiteral;
-                errmsg = QCoreApplication::translate("QmlParser", "Unclosed string at end of line");
-            } else if (current == '\\') {
-                state = InEscapeSequence;
-            } else {
-                record16(current);
-            }
-            break;
-            // Escape Sequences inside of strings
-        case InEscapeSequence:
-            if (isOctalDigit(current)) {
-                if (current >= '0' && current <= '3' &&
-                     isOctalDigit(next1) && isOctalDigit(next2)) {
-                    record16(convertOctal(current, next1, next2));
-                    shift(2);
-                    state = InString;
-                } else if (isOctalDigit(current) &&
-                            isOctalDigit(next1)) {
-                    record16(convertOctal('0', current, next1));
-                    shift(1);
-                    state = InString;
-                } else if (isOctalDigit(current)) {
-                    record16(convertOctal('0', '0', current));
-                    state = InString;
-                } else {
-                    setDone(Bad);
-                    err = IllegalEscapeSequence;
-                    errmsg = QCoreApplication::translate("QmlParser", "Illegal escape squence");
-                }
-            } else if (current == 'x')
-                state = InHexEscape;
-            else if (current == 'u')
-                state = InUnicodeEscape;
-            else {
-                if (isLineTerminator()) {
-                    shiftWindowsLineBreak();
-                    yylineno++;
-                    yycolumn = 0;
-                    bol = true;
-                } else {
-                    record16(singleEscape(current));
-                }
-                state = InString;
-            }
-            break;
-        case InHexEscape:
-            if (isHexDigit(current) && isHexDigit(next1)) {
-                state = InString;
-                record16(QLatin1Char(convertHex(current, next1)));
-                shift(1);
-            } else if (current == stringType) {
-                record16(QLatin1Char('x'));
-                shift(1);
-                setDone(String);
-            } else {
-                record16(QLatin1Char('x'));
-                record16(current);
-                state = InString;
-            }
-            break;
-        case InUnicodeEscape:
-            if (isHexDigit(current) && isHexDigit(next1) &&
-                 isHexDigit(next2) && isHexDigit(next3)) {
-                record16(convertUnicode(current, next1, next2, next3));
-                shift(3);
-                state = InString;
-            } else if (current == stringType) {
-                record16(QLatin1Char('u'));
-                shift(1);
-                setDone(String);
-            } else {
-                setDone(Bad);
-                err = IllegalUnicodeEscapeSequence;
-                errmsg = QCoreApplication::translate("QmlParser", "Illegal unicode escape sequence");
-            }
-            break;
-        case InSingleLineComment:
-            if (isLineTerminator()) {
-                shiftWindowsLineBreak();
-                yylineno++;
-                yycolumn = 0;
-                terminator = true;
-                bol = true;
-                if (restrKeyword) {
-                    token = QmlJSGrammar::T_SEMICOLON;
-                    setDone(Other);
-                } else
-                    state = Start;
-                driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
-            } else if (current == 0) {
-                driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
-                setDone(Eof);
-            }
-
-            break;
-        case InMultiLineComment:
-            if (current == 0) {
-                setDone(Bad);
-                err = UnclosedComment;
-                errmsg = QCoreApplication::translate("QmlParser", "Unclosed comment at end of file");
-                driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
-            } else if (isLineTerminator()) {
-                shiftWindowsLineBreak();
-                yylineno++;
-            } else if (current == '*' && next1 == '/') {
-                state = Start;
-                shift(1);
-                driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
-            }
-
-            break;
-        case InIdentifier:
-            if (isIdentLetter(current) || isDecimalDigit(current)) {
-                record16(current);
-                break;
-            }
-            setDone(Identifier);
-            break;
-        case InNum0:
-            if (current == 'x' || current == 'X') {
-                record8(current);
-                state = InHex;
-            } else if (current == '.') {
-                record8(current);
-                state = InDecimal;
-            } else if (current == 'e' || current == 'E') {
-                record8(current);
-                state = InExponentIndicator;
-            } else if (isOctalDigit(current)) {
-                record8(current);
-                state = InOctal;
-            } else if (isDecimalDigit(current)) {
-                record8(current);
-                state = InDecimal;
-            } else {
-                setDone(Number);
-            }
-            break;
-        case InHex:
-            if (isHexDigit(current))
-                record8(current);
-            else
-                setDone(Hex);
-            break;
-        case InOctal:
-            if (isOctalDigit(current)) {
-                record8(current);
-            } else if (isDecimalDigit(current)) {
-                record8(current);
-                state = InDecimal;
-            } else {
-                setDone(Octal);
-            }
-            break;
-        case InNum:
-            if (isDecimalDigit(current)) {
-                record8(current);
-            } else if (current == '.') {
-                record8(current);
-                state = InDecimal;
-            } else if (current == 'e' || current == 'E') {
-                record8(current);
-                state = InExponentIndicator;
-            } else {
-                setDone(Number);
-            }
-            break;
-        case InDecimal:
-            if (isDecimalDigit(current)) {
-                record8(current);
-            } else if (current == 'e' || current == 'E') {
-                record8(current);
-                state = InExponentIndicator;
-            } else {
-                setDone(Number);
-            }
-            break;
-        case InExponentIndicator:
-            if (current == '+' || current == '-') {
-                record8(current);
-            } else if (isDecimalDigit(current)) {
-                record8(current);
-                state = InExponent;
-            } else {
-                setDone(Bad);
-                err = IllegalExponentIndicator;
-                errmsg = QCoreApplication::translate("QmlParser", "Illegal syntax for exponential number");
-            }
-            break;
-        case InExponent:
-            if (isDecimalDigit(current)) {
-                record8(current);
-            } else {
-                setDone(Number);
-            }
-            break;
-        default:
-            Q_ASSERT_X(0, "Lexer::lex", "Unhandled state in switch statement");
-        }
-
-        // move on to the next character
-        if (!done)
-            shift(1);
-        if (state != Start && state != InSingleLineComment)
-            bol = false;
-    }
-
-    // no identifiers allowed directly after numeric literal, e.g. "3in" is bad
-    if ((state == Number || state == Octal || state == Hex)
-         && isIdentLetter(current)) {
-        state = Bad;
-        err = IllegalIdentifier;
-        errmsg = QCoreApplication::translate("QmlParser", "Identifier cannot start with numeric literal");
-    }
-
-    // terminate string
-    buffer8[pos8] = '\0';
-
-    double dval = 0;
-    if (state == Number) {
-        dval = qstrtod(buffer8, 0, 0);
-    } else if (state == Hex) { // scan hex numbers
-        dval = integerFromString(buffer8, pos8, 16);
-        state = Number;
-    } else if (state == Octal) {   // scan octal number
-        dval = integerFromString(buffer8, pos8, 8);
-        state = Number;
-    }
-
-    restrKeyword = false;
-    delimited = false;
-
-    switch (parenthesesState) {
-    case IgnoreParentheses:
-        break;
-    case CountParentheses:
-        if (token == QmlJSGrammar::T_RPAREN) {
-            --parenthesesCount;
-            if (parenthesesCount == 0)
-                parenthesesState = BalancedParentheses;
-        } else if (token == QmlJSGrammar::T_LPAREN) {
-            ++parenthesesCount;
-        }
-        break;
-    case BalancedParentheses:
-        parenthesesState = IgnoreParentheses;
-        break;
-    }
-
-    switch (state) {
-    case Eof:
-        return 0;
-    case Other:
-        if (token == QmlJSGrammar::T_RBRACE || token == QmlJSGrammar::T_SEMICOLON)
-            delimited = true;
-        return token;
-    case Identifier:
-        if ((token = findReservedWord(buffer16, pos16)) < 0) {
-            /* TODO: close leak on parse error. same holds true for String */
-            if (driver)
-                qsyylval.ustr = driver->intern(buffer16, pos16);
-            else
-                qsyylval.ustr = 0;
-            return QmlJSGrammar::T_IDENTIFIER;
-        }
-        if (token == QmlJSGrammar::T_CONTINUE || token == QmlJSGrammar::T_BREAK
-            || token == QmlJSGrammar::T_RETURN || token == QmlJSGrammar::T_THROW) {
-            restrKeyword = true;
-        } else if (token == QmlJSGrammar::T_IF || token == QmlJSGrammar::T_FOR
-                   || token == QmlJSGrammar::T_WHILE || token == QmlJSGrammar::T_WITH) {
-            parenthesesState = CountParentheses;
-            parenthesesCount = 0;
-        } else if (token == QmlJSGrammar::T_DO) {
-            parenthesesState = BalancedParentheses;
-        }
-        return token;
-    case String:
-        if (driver)
-            qsyylval.ustr = driver->intern(buffer16, pos16);
-        else
-            qsyylval.ustr = 0;
-        return multiLineString?QmlJSGrammar::T_MULTILINE_STRING_LITERAL:QmlJSGrammar::T_STRING_LITERAL;
-    case Number:
-        qsyylval.dval = dval;
-        return QmlJSGrammar::T_NUMERIC_LITERAL;
-    case Bad:
-        return -1;
-    default:
-        Q_ASSERT(!"unhandled numeration value in switch");
-        return -1;
-    }
-}
-
-bool Lexer::isWhiteSpace() const
-{
-    return (current == ' ' || current == '\t' ||
-             current == 0x0b || current == 0x0c);
-}
-
-bool Lexer::isLineTerminator() const
-{
-    return (current == '\n' || current == '\r');
-}
-
-bool Lexer::isIdentLetter(ushort c)
-{
-    // ASCII-biased, since all reserved words are ASCII, aand hence the
-    // bulk of content to be parsed.
-    if ((c >= 'a' && c <= 'z')
-            || (c >= 'A' && c <= 'Z')
-            || c == '$'
-            || c == '_')
-        return true;
-    if (c < 128)
-        return false;
-    return QChar(c).isLetterOrNumber();
-}
-
-bool Lexer::isDecimalDigit(ushort c)
-{
-    return (c >= '0' && c <= '9');
-}
-
-bool Lexer::isHexDigit(ushort c) const
-{
-    return ((c >= '0' && c <= '9')
-            || (c >= 'a' && c <= 'f')
-            || (c >= 'A' && c <= 'F'));
-}
-
-bool Lexer::isOctalDigit(ushort c) const
-{
-    return (c >= '0' && c <= '7');
-}
-
-int Lexer::matchPunctuator(ushort c1, ushort c2,
-                            ushort c3, ushort c4)
-{
-    if (c1 == '>' && c2 == '>' && c3 == '>' && c4 == '=') {
-        shift(4);
-        return QmlJSGrammar::T_GT_GT_GT_EQ;
-    } else if (c1 == '=' && c2 == '=' && c3 == '=') {
-        shift(3);
-        return QmlJSGrammar::T_EQ_EQ_EQ;
-    } else if (c1 == '!' && c2 == '=' && c3 == '=') {
-        shift(3);
-        return QmlJSGrammar::T_NOT_EQ_EQ;
-    } else if (c1 == '>' && c2 == '>' && c3 == '>') {
-        shift(3);
-        return QmlJSGrammar::T_GT_GT_GT;
-    } else if (c1 == '<' && c2 == '<' && c3 == '=') {
-        shift(3);
-        return QmlJSGrammar::T_LT_LT_EQ;
-    } else if (c1 == '>' && c2 == '>' && c3 == '=') {
-        shift(3);
-        return QmlJSGrammar::T_GT_GT_EQ;
-    } else if (c1 == '<' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_LE;
-    } else if (c1 == '>' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_GE;
-    } else if (c1 == '!' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_NOT_EQ;
-    } else if (c1 == '+' && c2 == '+') {
-        shift(2);
-        return QmlJSGrammar::T_PLUS_PLUS;
-    } else if (c1 == '-' && c2 == '-') {
-        shift(2);
-        return QmlJSGrammar::T_MINUS_MINUS;
-    } else if (c1 == '=' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_EQ_EQ;
-    } else if (c1 == '+' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_PLUS_EQ;
-    } else if (c1 == '-' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_MINUS_EQ;
-    } else if (c1 == '*' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_STAR_EQ;
-    } else if (c1 == '/' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_DIVIDE_EQ;
-    } else if (c1 == '&' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_AND_EQ;
-    } else if (c1 == '^' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_XOR_EQ;
-    } else if (c1 == '%' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_REMAINDER_EQ;
-    } else if (c1 == '|' && c2 == '=') {
-        shift(2);
-        return QmlJSGrammar::T_OR_EQ;
-    } else if (c1 == '<' && c2 == '<') {
-        shift(2);
-        return QmlJSGrammar::T_LT_LT;
-    } else if (c1 == '>' && c2 == '>') {
-        shift(2);
-        return QmlJSGrammar::T_GT_GT;
-    } else if (c1 == '&' && c2 == '&') {
-        shift(2);
-        return QmlJSGrammar::T_AND_AND;
-    } else if (c1 == '|' && c2 == '|') {
-        shift(2);
-        return QmlJSGrammar::T_OR_OR;
-    }
-
-    switch(c1) {
-        case '=': shift(1); return QmlJSGrammar::T_EQ;
-        case '>': shift(1); return QmlJSGrammar::T_GT;
-        case '<': shift(1); return QmlJSGrammar::T_LT;
-        case ',': shift(1); return QmlJSGrammar::T_COMMA;
-        case '!': shift(1); return QmlJSGrammar::T_NOT;
-        case '~': shift(1); return QmlJSGrammar::T_TILDE;
-        case '?': shift(1); return QmlJSGrammar::T_QUESTION;
-        case ':': shift(1); return QmlJSGrammar::T_COLON;
-        case '.': shift(1); return QmlJSGrammar::T_DOT;
-        case '+': shift(1); return QmlJSGrammar::T_PLUS;
-        case '-': shift(1); return QmlJSGrammar::T_MINUS;
-        case '*': shift(1); return QmlJSGrammar::T_STAR;
-        case '/': shift(1); return QmlJSGrammar::T_DIVIDE_;
-        case '&': shift(1); return QmlJSGrammar::T_AND;
-        case '|': shift(1); return QmlJSGrammar::T_OR;
-        case '^': shift(1); return QmlJSGrammar::T_XOR;
-        case '%': shift(1); return QmlJSGrammar::T_REMAINDER;
-        case '(': shift(1); return QmlJSGrammar::T_LPAREN;
-        case ')': shift(1); return QmlJSGrammar::T_RPAREN;
-        case '{': shift(1); return QmlJSGrammar::T_LBRACE;
-        case '}': shift(1); return QmlJSGrammar::T_RBRACE;
-        case '[': shift(1); return QmlJSGrammar::T_LBRACKET;
-        case ']': shift(1); return QmlJSGrammar::T_RBRACKET;
-        case ';': shift(1); return QmlJSGrammar::T_SEMICOLON;
-
-        default: return -1;
-    }
-}
-
-ushort Lexer::singleEscape(ushort c) const
-{
-    switch(c) {
-    case 'b':
-        return 0x08;
-    case 't':
-        return 0x09;
-    case 'n':
-        return 0x0A;
-    case 'v':
-        return 0x0B;
-    case 'f':
-        return 0x0C;
-    case 'r':
-        return 0x0D;
-    case '"':
-        return 0x22;
-    case '\'':
-        return 0x27;
-    case '\\':
-        return 0x5C;
-    default:
-        return c;
-    }
-}
-
-ushort Lexer::convertOctal(ushort c1, ushort c2,
-                            ushort c3) const
-{
-    return ((c1 - '0') * 64 + (c2 - '0') * 8 + c3 - '0');
-}
-
-unsigned char Lexer::convertHex(ushort c)
-{
-    if (c >= '0' && c <= '9')
-        return (c - '0');
-    else if (c >= 'a' && c <= 'f')
-        return (c - 'a' + 10);
-    else
-        return (c - 'A' + 10);
-}
-
-unsigned char Lexer::convertHex(ushort c1, ushort c2)
-{
-    return ((convertHex(c1) << 4) + convertHex(c2));
-}
-
-QChar Lexer::convertUnicode(ushort c1, ushort c2,
-                             ushort c3, ushort c4)
-{
-    return QChar((convertHex(c3) << 4) + convertHex(c4),
-                  (convertHex(c1) << 4) + convertHex(c2));
-}
-
-void Lexer::record8(ushort c)
-{
-    Q_ASSERT(c <= 0xff);
-
-    // enlarge buffer if full
-    if (pos8 >= size8 - 1) {
-        char *tmp = new char[2 * size8];
-        memcpy(tmp, buffer8, size8 * sizeof(char));
-        delete [] buffer8;
-        buffer8 = tmp;
-        size8 *= 2;
-    }
-
-    buffer8[pos8++] = (char) c;
-}
-
-void Lexer::record16(QChar c)
-{
-    // enlarge buffer if full
-    if (pos16 >= size16 - 1) {
-        QChar *tmp = new QChar[2 * size16];
-        memcpy(tmp, buffer16, size16 * sizeof(QChar));
-        delete [] buffer16;
-        buffer16 = tmp;
-        size16 *= 2;
-    }
-
-    buffer16[pos16++] = c;
-}
-
-void Lexer::recordStartPos()
-{
-    startpos = pos;
-    startlineno = yylineno;
-    startcolumn = yycolumn;
-}
-
-bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
-{
-    pos16 = 0;
-    bool lastWasEscape = false;
-
-    if (prefix == EqualPrefix)
-        record16(QLatin1Char('='));
-
-    while (1) {
-        if (isLineTerminator() || current == 0) {
-            errmsg = QCoreApplication::translate("QmlParser", "Unterminated regular expression literal");
-            return false;
-        }
-        else if (current != '/' || lastWasEscape == true)
-            {
-                record16(current);
-                lastWasEscape = !lastWasEscape && (current == '\\');
-            }
-        else {
-            if (driver)
-                pattern = driver->intern(buffer16, pos16);
-            else
-                pattern = 0;
-            pos16 = 0;
-            shift(1);
-            break;
-        }
-        shift(1);
-    }
-
-    flags = 0;
-    while (isIdentLetter(current)) {
-        int flag = Ecma::RegExp::flagFromChar(current);
-        if (flag == 0) {
-            errmsg = QCoreApplication::translate("QmlParser", "Invalid regular expression flag '%0'")
-                     .arg(QChar(current));
-            return false;
-        }
-        flags |= flag;
-        record16(current);
-        shift(1);
-    }
-
-    return true;
-}
-
-void Lexer::syncProhibitAutomaticSemicolon()
-{
-    if (parenthesesState == BalancedParentheses) {
-        // we have seen something like "if (foo)", which means we should
-        // never insert an automatic semicolon at this point, since it would
-        // then be expanded into an empty statement (ECMA-262 7.9.1)
-        prohibitAutomaticSemicolon = true;
-        parenthesesState = IgnoreParentheses;
-    } else {
-        prohibitAutomaticSemicolon = false;
-    }
-}
-
-QT_QML_END_NAMESPACE
-
-
diff --git a/src/declarative/qml/parser/qmljslexer_p.h b/src/declarative/qml/parser/qmljslexer_p.h
deleted file mode 100644
index 8f95a90..0000000
--- a/src/declarative/qml/parser/qmljslexer_p.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLJSLEXER_P_H
-#define QMLJSLEXER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmljsglobal_p.h"
-
-#include <QtCore/QString>
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS {
-
-class Engine;
-class NameId;
-
-class QML_PARSER_EXPORT Lexer
-{
-public:
-    Lexer(Engine *eng, bool tokenizeComments = false);
-    ~Lexer();
-
-    void setCode(const QString &c, int lineno);
-    int lex();
-
-    int currentLineNo() const { return yylineno; }
-    int currentColumnNo() const { return yycolumn; }
-
-    int tokenOffset() const { return startpos; }
-    int tokenLength() const { return pos - startpos; }
-
-    int startLineNo() const { return startlineno; }
-    int startColumnNo() const { return startcolumn; }
-
-    int endLineNo() const { return currentLineNo(); }
-    int endColumnNo() const
-    { int col = currentColumnNo(); return (col > 0) ? col - 1 : col; }
-
-    bool prevTerminator() const { return terminator; }
-
-    enum State { Start,
-                 Identifier,
-                 InIdentifier,
-                 InSingleLineComment,
-                 InMultiLineComment,
-                 InNum,
-                 InNum0,
-                 InHex,
-                 InOctal,
-                 InDecimal,
-                 InExponentIndicator,
-                 InExponent,
-                 Hex,
-                 Octal,
-                 Number,
-                 String,
-                 Eof,
-                 InString,
-                 InEscapeSequence,
-                 InHexEscape,
-                 InUnicodeEscape,
-                 Other,
-                 Bad };
-
-    enum Error {
-        NoError,
-        IllegalCharacter,
-        UnclosedStringLiteral,
-        IllegalEscapeSequence,
-        IllegalUnicodeEscapeSequence,
-        UnclosedComment,
-        IllegalExponentIndicator,
-        IllegalIdentifier
-    };
-
-    enum ParenthesesState {
-        IgnoreParentheses,
-        CountParentheses,
-        BalancedParentheses
-    };
-
-    enum RegExpBodyPrefix {
-        NoPrefix,
-        EqualPrefix
-    };
-
-    bool scanRegExp(RegExpBodyPrefix prefix = NoPrefix);
-
-    NameId *pattern;
-    int flags;
-
-    State lexerState() const
-        { return state; }
-
-    QString errorMessage() const
-        { return errmsg; }
-    void setErrorMessage(const QString &err)
-        { errmsg = err; }
-    void setErrorMessage(const char *err)
-        { setErrorMessage(QString::fromLatin1(err)); }
-
-    Error error() const
-        { return err; }
-    void clearError()
-        { err = NoError; }
-
-private:
-    Engine *driver;
-    int yylineno;
-    bool done;
-    char *buffer8;
-    QChar *buffer16;
-    uint size8, size16;
-    uint pos8, pos16;
-    bool terminator;
-    bool restrKeyword;
-    // encountered delimiter like "'" and "}" on last run
-    bool delimited;
-    int stackToken;
-
-    State state;
-    void setDone(State s);
-    uint pos;
-    void shift(uint p);
-    int lookupKeyword(const char *);
-
-    bool isWhiteSpace() const;
-    bool isLineTerminator() const;
-    bool isHexDigit(ushort c) const;
-    bool isOctalDigit(ushort c) const;
-
-    int matchPunctuator(ushort c1, ushort c2,
-                         ushort c3, ushort c4);
-    ushort singleEscape(ushort c) const;
-    ushort convertOctal(ushort c1, ushort c2,
-                         ushort c3) const;
-public:
-    static unsigned char convertHex(ushort c1);
-    static unsigned char convertHex(ushort c1, ushort c2);
-    static QChar convertUnicode(ushort c1, ushort c2,
-                                 ushort c3, ushort c4);
-    static bool isIdentLetter(ushort c);
-    static bool isDecimalDigit(ushort c);
-
-    inline int ival() const { return qsyylval.ival; }
-    inline double dval() const { return qsyylval.dval; }
-    inline NameId *ustr() const { return qsyylval.ustr; }
-
-    const QChar *characterBuffer() const { return buffer16; }
-    int characterCount() const { return pos16; }
-
-private:
-    void record8(ushort c);
-    void record16(QChar c);
-    void recordStartPos();
-
-    int findReservedWord(const QChar *buffer, int size) const;
-
-    void syncProhibitAutomaticSemicolon();
-
-    const QChar *code;
-    uint length;
-    int yycolumn;
-    int startpos;
-    int startlineno;
-    int startcolumn;
-    int bol;     // begin of line
-
-    union {
-        int ival;
-        double dval;
-        NameId *ustr;
-    } qsyylval;
-
-    // current and following unicode characters
-    ushort current, next1, next2, next3;
-
-    struct keyword {
-        const char *name;
-        int token;
-    };
-
-    QString errmsg;
-    Error err;
-
-    bool wantRx;
-    bool check_reserved;
-
-    ParenthesesState parenthesesState;
-    int parenthesesCount;
-    bool prohibitAutomaticSemicolon;
-    bool tokenizeComments;
-};
-
-} // namespace QmlJS
-
-QT_QML_END_NAMESPACE
-
-#endif
diff --git a/src/declarative/qml/parser/qmljsmemorypool_p.h b/src/declarative/qml/parser/qmljsmemorypool_p.h
deleted file mode 100644
index 5dffdc8..0000000
--- a/src/declarative/qml/parser/qmljsmemorypool_p.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLJSMEMORYPOOL_P_H
-#define QMLJSMEMORYPOOL_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmljsglobal_p.h"
-
-#include <QtCore/qglobal.h>
-#include <QtCore/qshareddata.h>
-
-#include <string.h>
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS {
-
-class QML_PARSER_EXPORT MemoryPool : public QSharedData
-{
-public:
-    enum { maxBlockCount = -1 };
-    enum { defaultBlockSize = 1 << 12 };
-
-    MemoryPool() {
-        m_blockIndex = maxBlockCount;
-        m_currentIndex = 0;
-        m_storage = 0;
-        m_currentBlock = 0;
-        m_currentBlockSize = 0;
-    }
-
-    virtual ~MemoryPool() {
-        for (int index = 0; index < m_blockIndex + 1; ++index)
-            qFree(m_storage[index]);
-
-        qFree(m_storage);
-    }
-
-    char *allocate(int bytes) {
-        bytes += (8 - bytes) & 7; // ensure multiple of 8 bytes (maintain alignment)
-        if (m_currentBlock == 0 || m_currentBlockSize < m_currentIndex + bytes) {
-            ++m_blockIndex;
-            m_currentBlockSize = defaultBlockSize << m_blockIndex;
-
-            m_storage = reinterpret_cast<char**>(qRealloc(m_storage, sizeof(char*) * (1 + m_blockIndex)));
-            m_currentBlock = m_storage[m_blockIndex] = reinterpret_cast<char*>(qMalloc(m_currentBlockSize));
-            ::memset(m_currentBlock, 0, m_currentBlockSize);
-
-            m_currentIndex = (8 - quintptr(m_currentBlock)) & 7; // ensure first chunk is 64-bit aligned
-            Q_ASSERT(m_currentIndex + bytes <= m_currentBlockSize);
-        }
-
-        char *p = reinterpret_cast<char *>
-            (m_currentBlock + m_currentIndex);
-
-        m_currentIndex += bytes;
-
-        return p;
-    }
-
-    int bytesAllocated() const {
-        int bytes = 0;
-        for (int index = 0; index < m_blockIndex; ++index)
-            bytes += (defaultBlockSize << index);
-        bytes += m_currentIndex;
-        return bytes;
-    }
-
-private:
-    int m_blockIndex;
-    int m_currentIndex;
-    char *m_currentBlock;
-    int m_currentBlockSize;
-    char **m_storage;
-
-private:
-    Q_DISABLE_COPY(MemoryPool)
-};
-
-} // namespace QmlJS
-
-QT_QML_END_NAMESPACE
-
-#endif
diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h
deleted file mode 100644
index 2055a7e..0000000
--- a/src/declarative/qml/parser/qmljsnodepool_p.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLJSNODEPOOL_P_H
-#define QMLJSNODEPOOL_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmljsglobal_p.h"
-#include "qmljsmemorypool_p.h"
-
-#include <QtCore/QHash>
-#include <QtCore/QString>
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS {
-
-namespace AST {
-class Node;
-} // namespace AST
-
-class Code;
-class CompilationUnit;
-class Engine;
-
-template <typename NodeType>
-inline NodeType *makeAstNode(MemoryPool *storage)
-{
-    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType();
-    return node;
-}
-
-template <typename NodeType, typename Arg1>
-inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1)
-{
-    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1);
-    return node;
-}
-
-template <typename NodeType, typename Arg1, typename Arg2>
-inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2)
-{
-    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1, arg2);
-    return node;
-}
-
-template <typename NodeType, typename Arg1, typename Arg2, typename Arg3>
-inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2, Arg3 arg3)
-{
-    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1, arg2, arg3);
-    return node;
-}
-
-template <typename NodeType, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
-inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4)
-{
-    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1, arg2, arg3, arg4);
-    return node;
-}
-
-class QML_PARSER_EXPORT NodePool : public MemoryPool
-{
-public:
-    NodePool(const QString &fileName, Engine *engine);
-    virtual ~NodePool();
-
-    Code *createCompiledCode(AST::Node *node, CompilationUnit &compilation);
-
-    inline QString fileName() const { return m_fileName; }
-    inline Engine *engine() const { return m_engine; }
-#ifndef J_SCRIPT_NO_EVENT_NOTIFY
-    inline qint64 id() const { return m_id; }
-#endif
-
-private:
-    QHash<AST::Node*, Code*> m_codeCache;
-    QString m_fileName;
-    Engine *m_engine;
-#ifndef J_SCRIPT_NO_EVENT_NOTIFY
-    qint64 m_id;
-#endif
-
-private:
-    Q_DISABLE_COPY(NodePool)
-};
-
-} // namespace QmlJS
-
-QT_QML_END_NAMESPACE
-
-#endif
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
deleted file mode 100644
index 856d06d..0000000
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ /dev/null
@@ -1,1843 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QtDebug>
-#include <QtGui/QApplication>
-
-#include <string.h>
-
-#include "qmljsengine_p.h"
-#include "qmljslexer_p.h"
-#include "qmljsast_p.h"
-#include "qmljsnodepool_p.h"
-
-
-
-#include "qmljsparser_p.h"
-#include <QVarLengthArray>
-
-//
-// This file is automatically generated from qmljs.g.
-// Changes will be lost.
-//
-
-using namespace QmlJS;
-
-QT_QML_BEGIN_NAMESPACE
-
-void Parser::reallocateStack()
-{
-    if (! stack_size)
-        stack_size = 128;
-    else
-        stack_size <<= 1;
-
-    sym_stack = reinterpret_cast<Value*> (qRealloc(sym_stack, stack_size * sizeof(Value)));
-    state_stack = reinterpret_cast<int*> (qRealloc(state_stack, stack_size * sizeof(int)));
-    location_stack = reinterpret_cast<AST::SourceLocation*> (qRealloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
-}
-
-inline static bool automatic(Engine *driver, int token)
-{
-    return token == QmlJSGrammar::T_RBRACE
-        || token == 0
-        || driver->lexer()->prevTerminator();
-}
-
-
-Parser::Parser(Engine *engine):
-    driver(engine),
-    tos(0),
-    stack_size(0),
-    sym_stack(0),
-    state_stack(0),
-    location_stack(0),
-    first_token(0),
-    last_token(0)
-{
-}
-
-Parser::~Parser()
-{
-    if (stack_size) {
-        qFree(sym_stack);
-        qFree(state_stack);
-        qFree(location_stack);
-    }
-}
-
-static inline AST::SourceLocation location(Lexer *lexer)
-{
-    AST::SourceLocation loc;
-    loc.offset = lexer->tokenOffset();
-    loc.length = lexer->tokenLength();
-    loc.startLine = lexer->startLineNo();
-    loc.startColumn = lexer->startColumnNo();
-    return loc;
-}
-
-AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
-{
-    QVarLengthArray<NameId *, 4> nameIds;
-    QVarLengthArray<AST::SourceLocation, 4> locations;
-
-    AST::ExpressionNode *it = expr;
-    while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
-        nameIds.append(m->name);
-        locations.append(m->identifierToken);
-        it = m->base;
-    }
-
-    if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
-        AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
-        q->identifierToken = idExpr->identifierToken;
-
-        AST::UiQualifiedId *currentId = q;
-        for (int i = nameIds.size() - 1; i != -1; --i) {
-            currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
-            currentId->identifierToken = locations[i];
-        }
-
-        return currentId->finish();
-    }
-
-    return 0;
-}
-
-bool Parser::parse(int startToken)
-{
-    Lexer *lexer = driver->lexer();
-    bool hadErrors = false;
-    int yytoken = -1;
-    int action = 0;
-
-    token_buffer[0].token = startToken;
-    first_token = &token_buffer[0];
-    last_token = &token_buffer[1];
-
-    tos = -1;
-    program = 0;
-
-    do {
-        if (++tos == stack_size)
-            reallocateStack();
-
-        state_stack[tos] = action;
-
-    _Lcheck_token:
-        if (yytoken == -1 && -TERMINAL_COUNT != action_index[action]) {
-            yyprevlloc = yylloc;
-
-            if (first_token == last_token) {
-                yytoken = lexer->lex();
-                yylval = lexer->dval();
-                yylloc = location(lexer);
-            } else {
-                yytoken = first_token->token;
-                yylval = first_token->dval;
-                yylloc = first_token->loc;
-                ++first_token;
-            }
-        }
-
-        action = t_action(action, yytoken);
-        if (action > 0) {
-            if (action != ACCEPT_STATE) {
-                yytoken = -1;
-                sym(1).dval = yylval;
-                loc(1) = yylloc;
-            } else {
-              --tos;
-              return ! hadErrors;
-            }
-        } else if (action < 0) {
-          const int r = -action - 1;
-          tos -= rhs[r];
-
-          switch (r) {
-
-case 0: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-
-case 1: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-
-case 2: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-
-case 3: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-
-case 4: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-
-case 5: {
-  sym(1).Node = sym(2).Node;
-  program = sym(1).Node;
-} break;
-
-case 6: {
-  sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
-        sym(2).UiObjectMemberList->finish());
-} break;
-
-case 8: {
-    sym(1).Node = sym(1).UiImportList->finish();
-} break;
-
-case 9: {
-    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport);
-} break;
-
-case 10: {
-    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(),
-        sym(1).UiImportList, sym(2).UiImport);
-} break;
-
-case 13: {
-    sym(1).UiImport->semicolonToken = loc(2);
-} break;
-
-case 15: {
-    sym(1).UiImport->versionToken = loc(2);
-    sym(1).UiImport->semicolonToken = loc(3);
-} break;
-
-case 17: {
-    sym(1).UiImport->versionToken = loc(2);
-    sym(1).UiImport->asToken = loc(3);
-    sym(1).UiImport->importIdToken = loc(4);
-    sym(1).UiImport->importId = sym(4).sval;
-    sym(1).UiImport->semicolonToken = loc(5);
-} break;
-
-case 19: {
-    sym(1).UiImport->asToken = loc(2);
-    sym(1).UiImport->importIdToken = loc(3);
-    sym(1).UiImport->importId = sym(3).sval;
-    sym(1).UiImport->semicolonToken = loc(4);
-} break;
-
-case 20: {
-    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;
-
-case 21: {
-    sym(1).Node = 0;
-} break;
-
-case 22: {
-    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
-} break;
-
-case 23: {
-    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
-} break;
-
-case 24: {
-    AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
-        sym(1).UiObjectMemberList, sym(2).UiObjectMember);
-    sym(1).Node = node;
-} break;
-
-case 25: {
-    sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember);
-} break;
-
-case 26: {
-    AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(),
-        sym(1).UiArrayMemberList, sym(3).UiObjectMember);
-    node->commaToken = loc(2);
-    sym(1).Node = node;
-} break;
-
-case 27: {
-    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 28: {
-    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 29: {
-    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
-        sym(2).UiObjectInitializer);
-    sym(1).Node = node;
-}   break;
-
-case 31: {
-    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
-        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 32: {
-    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
-      sym(1).UiQualifiedId, sym(3).UiQualifiedId, sym(4).UiObjectInitializer);
-    node->colonToken = loc(2);
-    sym(1).Node = node;
-} break;
-case 33:case 34:case 35:case 36:
-{
-    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
-        sym(1).UiQualifiedId, sym(3).Statement);
-    node->colonToken = loc(2);
-    sym(1).Node = node;
-}   break;
-
-case 37:
-
-case 38: {
-    sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
-    break;
-}
-
-case 40: {
-  sym(1).Node = 0;
-} break;
-
-case 41: {
-  sym(1).Node = sym(1).UiParameterList->finish ();
-} break;
-
-case 42: {
-  AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
-  node->identifierToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 43: {
-  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 45: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
-    node->type = AST::UiPublicMember::Signal;
-    node->propertyToken = loc(1);
-    node->typeToken = loc(2);
-    node->identifierToken = loc(2);
-    node->parameters = sym(4).UiParameterList;
-    node->semicolonToken = loc(6);
-    sym(1).Node = node;
-}   break;
-
-case 47: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
-    node->type = AST::UiPublicMember::Signal;
-    node->propertyToken = loc(1);
-    node->typeToken = loc(2);
-    node->identifierToken = loc(2);
-    node->semicolonToken = loc(3);
-    sym(1).Node = node;
-}   break;
-
-case 49: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
-    node->typeModifier = sym(2).sval;
-    node->propertyToken = loc(1);
-    node->typeModifierToken = loc(2);
-    node->typeToken = loc(4);
-    node->identifierToken = loc(6);
-    node->semicolonToken = loc(7);
-    sym(1).Node = node;
-}   break;
-
-case 51: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
-    node->propertyToken = loc(1);
-    node->typeToken = loc(2);
-    node->identifierToken = loc(3);
-    node->semicolonToken = loc(4);
-    sym(1).Node = node;
-}   break;
-
-case 53: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
-    node->isDefaultMember = true;
-    node->defaultToken = loc(1);
-    node->propertyToken = loc(2);
-    node->typeToken = loc(3);
-    node->identifierToken = loc(4);
-    node->semicolonToken = loc(5);
-    sym(1).Node = node;
-}   break;
-
-case 55: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
-        sym(5).Expression);
-    node->propertyToken = loc(1);
-    node->typeToken = loc(2);
-    node->identifierToken = loc(3);
-    node->colonToken = loc(4);
-    node->semicolonToken = loc(6);
-    sym(1).Node = node;
-}   break;
-
-case 57: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
-        sym(6).Expression);
-    node->isReadonlyMember = true;
-    node->readonlyToken = loc(1);
-    node->propertyToken = loc(2);
-    node->typeToken = loc(3);
-    node->identifierToken = loc(4);
-    node->colonToken = loc(5);
-    node->semicolonToken = loc(7);
-    sym(1).Node = node;
-}   break;
-
-case 59: {
-    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
-        sym(6).Expression);
-    node->isDefaultMember = true;
-    node->defaultToken = loc(1);
-    node->propertyToken = loc(2);
-    node->typeToken = loc(3);
-    node->identifierToken = loc(4);
-    node->colonToken = loc(5);
-    node->semicolonToken = loc(7);
-    sym(1).Node = node;
-}   break;
-
-case 60: {
-    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
-}   break;
-
-case 61: {
-    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
-}   break;
-
-case 63: {
-    QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
-    sym(1).sval = driver->intern(s.constData(), s.length());
-    break;
-}
-
-case 64: {
-    QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
-    sym(1).sval = driver->intern(s.constData(), s.length());
-    break;
-}
-
-case 65: {
-    QString s = QLatin1String(QmlJSGrammar::spell[T_READONLY]);
-    sym(1).sval = driver->intern(s.constData(), s.length());
-    break;
-}
-
-case 66: {
-  AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
-  node->thisToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 67: {
-  AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
-  node->identifierToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 68: {
-  AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
-  node->nullToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 69: {
-  AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
-  node->trueToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 70: {
-  AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
-  node->falseToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 71: {
-  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-case 72:
-case 73: {
-  AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 74: {
-  bool rx = lexer->scanRegExp(Lexer::NoPrefix);
-  if (!rx) {
-    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
-    return false; // ### remove me
-  }
-  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 75: {
-  bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
-  if (!rx) {
-    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
-    return false;
-  }
-  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 76: {
-  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 77: {
-  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 78: {
-  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 79: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
-    (AST::Elision *) 0);
-  node->lbracketToken = loc(1);
-  node->commaToken = loc(3);
-  node->rbracketToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 80: {
-  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
-    sym(4).Elision->finish());
-  node->lbracketToken = loc(1);
-  node->commaToken = loc(3);
-  node->rbracketToken = loc(5);
-  sym(1).Node = node;
-} break;
-
-case 81: {
-  AST::ObjectLiteral *node = 0;
-  if (sym(2).Node)
-    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
-        sym(2).PropertyNameAndValueList->finish ());
-  else
-    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
-  node->lbraceToken = loc(1);
-  node->lbraceToken = loc(3);
-  sym(1).Node = node;
-} break;
-
-case 82: {
-  AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
-    sym(2).PropertyNameAndValueList->finish ());
-  node->lbraceToken = loc(1);
-  node->lbraceToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 83: {
-  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 84: {
-  if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
-    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
-      QLatin1String("Ignored annotation")));
-
-    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;
-
-case 85: {
-  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
-} break;
-
-case 86: {
-  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
-} break;
-
-case 87: {
-  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 88: {
-  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 89: {
-  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
-  node->commaToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 90: {
-  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 91: {
-  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
-      sym(1).PropertyName, sym(3).Expression);
-  node->colonToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 92: {
-  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
-      sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
-  node->commaToken = loc(2);
-  node->colonToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 93: {
-  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-case 94:
-case 95: {
-  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 96: {
-  AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 97: {
-  AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 98: {
-  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
-  node->propertyNameToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 99:
-
-case 100:
-
-case 101:
-
-case 102:
-
-case 103:
-
-case 104:
-
-case 105:
-
-case 106:
-
-case 107:
-
-case 108:
-
-case 109:
-
-case 110:
-
-case 111:
-
-case 112:
-
-case 113:
-
-case 114:
-
-case 115:
-
-case 116:
-
-case 117:
-
-case 118:
-
-case 119:
-
-case 120:
-
-case 121:
-
-case 122:
-
-case 123:
-
-case 124:
-
-case 125:
-
-case 126:
-
-case 127:
-
-case 128:
-
-case 129:
-{
-  sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
-} break;
-
-case 134: {
-  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 135: {
-  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 136: {
-  AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
-  node->newToken = loc(1);
-  node->lparenToken = loc(3);
-  node->rparenToken = loc(5);
-  sym(1).Node = node;
-} break;
-
-case 138: {
-  AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
-  node->newToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 139: {
-  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 140: {
-  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 141: {
-  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 142: {
-  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 143: {
-  sym(1).Node = 0;
-} break;
-
-case 144: {
-  sym(1).Node = sym(1).ArgumentList->finish();
-} break;
-
-case 145: {
-  sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
-} break;
-
-case 146: {
-  AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 150: {
-  AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
-  node->incrementToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 151: {
-  AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
-  node->decrementToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 153: {
-  AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
-  node->deleteToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 154: {
-  AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
-  node->voidToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 155: {
-  AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
-  node->typeofToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 156: {
-  AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
-  node->incrementToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 157: {
-  AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
-  node->decrementToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 158: {
-  AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
-  node->plusToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 159: {
-  AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
-  node->minusToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 160: {
-  AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
-  node->tildeToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 161: {
-  AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
-  node->notToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 163: {
-  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 164: {
-  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 165: {
-  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 167: {
-  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 168: {
-  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 170: {
-  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 171: {
-  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 172: {
-  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 174: {
-  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 175: {
-  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 176: {
-  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 177: {
-  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 178: {
-  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 179: {
-  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 181: {
-  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 182: {
-  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 183: {
-  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 184: {
-  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 185: {
-  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: {
-  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 188: {
-  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 189: {
-  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 190: {
-  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 192: {
-  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 193: {
-  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 194: {
-  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 195: {
-  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 197: {
-  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 199: {
-  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 201: {
-  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 203: {
-  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 205: {
-  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 207: {
-  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 209: {
-  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 211: {
-  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 213: {
-  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 215: {
-  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 217: {
-  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
-    sym(3).Expression, sym(5).Expression);
-  node->questionToken = loc(2);
-  node->colonToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 219: {
-  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
-    sym(3).Expression, sym(5).Expression);
-  node->questionToken = loc(2);
-  node->colonToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 221: {
-  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 223: {
-  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 224: {
-  sym(1).ival = QSOperator::Assign;
-} break;
-
-case 225: {
-  sym(1).ival = QSOperator::InplaceMul;
-} break;
-
-case 226: {
-  sym(1).ival = QSOperator::InplaceDiv;
-} break;
-
-case 227: {
-  sym(1).ival = QSOperator::InplaceMod;
-} break;
-
-case 228: {
-  sym(1).ival = QSOperator::InplaceAdd;
-} break;
-
-case 229: {
-  sym(1).ival = QSOperator::InplaceSub;
-} break;
-
-case 230: {
-  sym(1).ival = QSOperator::InplaceLeftShift;
-} break;
-
-case 231: {
-  sym(1).ival = QSOperator::InplaceRightShift;
-} break;
-
-case 232: {
-  sym(1).ival = QSOperator::InplaceURightShift;
-} break;
-
-case 233: {
-  sym(1).ival = QSOperator::InplaceAnd;
-} break;
-
-case 234: {
-  sym(1).ival = QSOperator::InplaceXor;
-} break;
-
-case 235: {
-  sym(1).ival = QSOperator::InplaceOr;
-} break;
-
-case 237: {
-  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 238: {
-  sym(1).Node = 0;
-} break;
-
-case 241: {
-  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 242: {
-  sym(1).Node = 0;
-} break;
-
-case 259: {
-  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 260: {
-  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
-} break;
-
-case 261: {
-  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
-} break;
-
-case 262: {
-  sym(1).Node = 0;
-} break;
-
-case 263: {
-  sym(1).Node = sym(1).StatementList->finish ();
-} break;
-
-case 265: {
-  AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
-     sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
-  node->declarationKindToken = loc(1);
-  node->semicolonToken = loc(3);
-  sym(1).Node = node;
-} break;
-
-case 266: {
-  sym(1).ival = T_CONST;
-} break;
-
-case 267: {
-  sym(1).ival = T_VAR;
-} break;
-
-case 268: {
-  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
-} break;
-
-case 269: {
-  AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
-    sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
-  node->commaToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 270: {
-  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
-} break;
-
-case 271: {
-  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
-} break;
-
-case 272: {
-  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
-  node->identifierToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 273: {
-  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
-  node->identifierToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 274: {
-  // ### TODO: AST for initializer
-  sym(1) = sym(2);
-} break;
-
-case 275: {
-  sym(1).Node = 0;
-} break;
-
-case 277: {
-  // ### TODO: AST for initializer
-  sym(1) = sym(2);
-} break;
-
-case 278: {
-  sym(1).Node = 0;
-} break;
-
-case 280: {
-  AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
-  node->semicolonToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 282: {
-  AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 283: {
-  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);
-  node->rparenToken = loc(4);
-  node->elseToken = loc(5);
-  sym(1).Node = node;
-} break;
-
-case 284: {
-  AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
-  node->ifToken = loc(1);
-  node->lparenToken = loc(2);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 286: {
-  AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
-  node->doToken = loc(1);
-  node->whileToken = loc(3);
-  node->lparenToken = loc(4);
-  node->rparenToken = loc(6);
-  node->semicolonToken = loc(7);
-  sym(1).Node = node;
-} break;
-
-case 287: {
-  AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
-  node->whileToken = loc(1);
-  node->lparenToken = loc(2);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 288: {
-  AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
-    sym(5).Expression, sym(7).Expression, sym(9).Statement);
-  node->forToken = loc(1);
-  node->lparenToken = loc(2);
-  node->firstSemicolonToken = loc(4);
-  node->secondSemicolonToken = loc(6);
-  node->rparenToken = loc(8);
-  sym(1).Node = node;
-} break;
-
-case 289: {
-  AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
-     sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
-     sym(8).Expression, sym(10).Statement);
-  node->forToken = loc(1);
-  node->lparenToken = loc(2);
-  node->varToken = loc(3);
-  node->firstSemicolonToken = loc(5);
-  node->secondSemicolonToken = loc(7);
-  node->rparenToken = loc(9);
-  sym(1).Node = node;
-} break;
-
-case 290: {
-  AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
-    sym(5).Expression, sym(7).Statement);
-  node->forToken = loc(1);
-  node->lparenToken = loc(2);
-  node->inToken = loc(4);
-  node->rparenToken = loc(6);
-  sym(1).Node = node;
-} break;
-
-case 291: {
-  AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
-    sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
-  node->forToken = loc(1);
-  node->lparenToken = loc(2);
-  node->varToken = loc(3);
-  node->inToken = loc(5);
-  node->rparenToken = loc(7);
-  sym(1).Node = node;
-} break;
-
-case 293: {
-  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
-  node->continueToken = loc(1);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 295: {
-  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
-  node->continueToken = loc(1);
-  node->identifierToken = loc(2);
-  node->semicolonToken = loc(3);
-  sym(1).Node = node;
-} break;
-
-case 297: {
-  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
-  node->breakToken = loc(1);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 299: {
-  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
-  node->breakToken = loc(1);
-  node->identifierToken = loc(2);
-  node->semicolonToken = loc(3);
-  sym(1).Node = node;
-} break;
-
-case 301: {
-  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 302: {
-  AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
-  node->withToken = loc(1);
-  node->lparenToken = loc(2);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 303: {
-  AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
-  node->switchToken = loc(1);
-  node->lparenToken = loc(2);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 304: {
-  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 305: {
-  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 306: {
-  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
-} break;
-
-case 307: {
-  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
-} break;
-
-case 308: {
-  sym(1).Node = 0;
-} break;
-
-case 309: {
-  sym(1).Node = sym(1).CaseClauses->finish ();
-} break;
-
-case 310: {
-  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 311: {
-  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 312:
-case 313: {
-  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 314: {
-  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 316: {
-  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 317: {
-  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
-  node->tryToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 318: {
-  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
-  node->tryToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 319: {
-  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 320: {
-  AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
-  node->catchToken = loc(1);
-  node->lparenToken = loc(2);
-  node->identifierToken = loc(3);
-  node->rparenToken = loc(4);
-  sym(1).Node = node;
-} break;
-
-case 321: {
-  AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
-  node->finallyToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 323: {
-  AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
-  node->debuggerToken = loc(1);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 324: {
-  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);
-  node->lparenToken = loc(3);
-  node->rparenToken = loc(5);
-  node->lbraceToken = loc(6);
-  node->rbraceToken = loc(8);
-  sym(1).Node = node;
-} break;
-
-case 325: {
-  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)
-      node->identifierToken = loc(2);
-  node->lparenToken = loc(3);
-  node->rparenToken = loc(5);
-  node->lbraceToken = loc(6);
-  node->rbraceToken = loc(8);
-  sym(1).Node = node;
-} break;
-
-case 326: {
-  AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
-  node->identifierToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 327: {
-  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 328: {
-  sym(1).Node = 0;
-} break;
-
-case 329: {
-  sym(1).Node = sym(1).FormalParameterList->finish ();
-} break;
-
-case 330: {
-  sym(1).Node = 0;
-} break;
-
-case 332: {
-  sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
-} break;
-
-case 333: {
-  sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
-} break;
-
-case 334: {
-  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
-} break;
-
-case 335: {
-  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
-} break;
-
-case 336: {
-  sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
-} break;
-
-case 337: {
-  sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
-} break;
-
-case 338: {
-  sym(1).sval = 0;
-} break;
-
-case 340: {
-  sym(1).Node = 0;
-} break;
-
-            } // switch
-            action = nt_action(state_stack[tos], lhs[r] - TERMINAL_COUNT);
-        } // if
-    } while (action != 0);
-
-    if (first_token == last_token) {
-        const int errorState = state_stack[tos];
-
-        // automatic insertion of `;'
-        if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
-            SavedToken &tk = token_buffer[0];
-            tk.token = yytoken;
-            tk.dval = yylval;
-            tk.loc = yylloc;
-
-            yylloc = yyprevlloc;
-            yylloc.offset += yylloc.length;
-            yylloc.startColumn += yylloc.length;
-            yylloc.length = 0;
-
-            //const QString msg = qApp->translate("QmlParser", "Missing `;'");
-            //diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, yylloc, msg));
-
-            first_token = &token_buffer[0];
-            last_token = &token_buffer[1];
-
-            yytoken = T_SEMICOLON;
-            yylval = 0;
-
-            action = errorState;
-
-            goto _Lcheck_token;
-        }
-
-        hadErrors = true;
-
-        token_buffer[0].token = yytoken;
-        token_buffer[0].dval = yylval;
-        token_buffer[0].loc = yylloc;
-
-        token_buffer[1].token = yytoken = lexer->lex();
-        token_buffer[1].dval  = yylval  = lexer->dval();
-        token_buffer[1].loc   = yylloc  = location(lexer);
-
-        if (t_action(errorState, yytoken)) {
-            QString msg;
-            int token = token_buffer[0].token;
-            if (token < 0 || token >= TERMINAL_COUNT)
-                msg = qApp->translate("QmlParser", "Syntax error");
-            else
-                msg = qApp->translate("QmlParser", "Unexpected token `%1'").arg(QLatin1String(spell[token]));
-            diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
-
-            action = errorState;
-            goto _Lcheck_token;
-        }
-
-        static int tokens[] = {
-            T_PLUS,
-            T_EQ,
-
-            T_COMMA,
-            T_COLON,
-            T_SEMICOLON,
-
-            T_RPAREN, T_RBRACKET, T_RBRACE,
-
-            T_NUMERIC_LITERAL,
-            T_IDENTIFIER,
-
-            T_LPAREN, T_LBRACKET, T_LBRACE,
-
-            EOF_SYMBOL
-        };
-
-        for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) {
-            int a = t_action(errorState, *tk);
-            if (a > 0 && t_action(a, yytoken)) {
-                const QString msg = qApp->translate("QmlParser", "Expected token `%1'").arg(QLatin1String(spell[*tk]));
-                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
-
-                yytoken = *tk;
-                yylval = 0;
-                yylloc = token_buffer[0].loc;
-                yylloc.length = 0;
-
-                first_token = &token_buffer[0];
-                last_token = &token_buffer[2];
-
-                action = errorState;
-                goto _Lcheck_token;
-            }
-        }
-
-        for (int tk = 1; tk < TERMINAL_COUNT; ++tk) {
-            if (tk == T_AUTOMATIC_SEMICOLON || tk == T_FEED_UI_PROGRAM    ||
-                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION ||
-                tk == T_FEED_JS_SOURCE_ELEMENT)
-               continue;
-
-            int a = t_action(errorState, tk);
-            if (a > 0 && t_action(a, yytoken)) {
-                const QString msg = qApp->translate("QmlParser", "Expected token `%1'").arg(QLatin1String(spell[tk]));
-                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
-
-                yytoken = tk;
-                yylval = 0;
-                yylloc = token_buffer[0].loc;
-                yylloc.length = 0;
-
-                action = errorState;
-                goto _Lcheck_token;
-            }
-        }
-
-        const QString msg = qApp->translate("QmlParser", "Syntax error");
-        diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
-    }
-
-    return false;
-}
-
-QT_QML_END_NAMESPACE
-
-
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
deleted file mode 100644
index 42fb422..0000000
--- a/src/declarative/qml/parser/qmljsparser_p.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-//
-// This file is automatically generated from qmljs.g.
-// Changes will be lost.
-//
-
-#ifndef QMLJSPARSER_P_H
-#define QMLJSPARSER_P_H
-
-#include "qmljsglobal_p.h"
-#include "qmljsgrammar_p.h"
-#include "qmljsast_p.h"
-#include "qmljsengine_p.h"
-
-#include <QtCore/QList>
-#include <QtCore/QString>
-
-QT_QML_BEGIN_NAMESPACE
-
-namespace QmlJS {
-
-class Engine;
-class NameId;
-
-class QML_PARSER_EXPORT Parser: protected QmlJSGrammar
-{
-public:
-    union Value {
-      int ival;
-      double dval;
-      NameId *sval;
-      AST::ArgumentList *ArgumentList;
-      AST::CaseBlock *CaseBlock;
-      AST::CaseClause *CaseClause;
-      AST::CaseClauses *CaseClauses;
-      AST::Catch *Catch;
-      AST::DefaultClause *DefaultClause;
-      AST::ElementList *ElementList;
-      AST::Elision *Elision;
-      AST::ExpressionNode *Expression;
-      AST::Finally *Finally;
-      AST::FormalParameterList *FormalParameterList;
-      AST::FunctionBody *FunctionBody;
-      AST::FunctionDeclaration *FunctionDeclaration;
-      AST::Node *Node;
-      AST::PropertyName *PropertyName;
-      AST::PropertyNameAndValueList *PropertyNameAndValueList;
-      AST::SourceElement *SourceElement;
-      AST::SourceElements *SourceElements;
-      AST::Statement *Statement;
-      AST::StatementList *StatementList;
-      AST::Block *Block;
-      AST::VariableDeclaration *VariableDeclaration;
-      AST::VariableDeclarationList *VariableDeclarationList;
-
-      AST::UiProgram *UiProgram;
-      AST::UiImportList *UiImportList;
-      AST::UiImport *UiImport;
-      AST::UiParameterList *UiParameterList;
-      AST::UiPublicMember *UiPublicMember;
-      AST::UiObjectDefinition *UiObjectDefinition;
-      AST::UiObjectInitializer *UiObjectInitializer;
-      AST::UiObjectBinding *UiObjectBinding;
-      AST::UiScriptBinding *UiScriptBinding;
-      AST::UiArrayBinding *UiArrayBinding;
-      AST::UiObjectMember *UiObjectMember;
-      AST::UiObjectMemberList *UiObjectMemberList;
-      AST::UiArrayMemberList *UiArrayMemberList;
-      AST::UiQualifiedId *UiQualifiedId;
-      AST::UiSignature *UiSignature;
-      AST::UiFormalList *UiFormalList;
-      AST::UiFormal *UiFormal;
-    };
-
-public:
-    Parser(Engine *engine);
-    ~Parser();
-
-    // parse a UI program
-    bool parse() { return parse(T_FEED_UI_PROGRAM); }
-    bool parseStatement() { return parse(T_FEED_JS_STATEMENT); }
-    bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
-    bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
-    bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
-    bool parseProgram() { return parse(T_FEED_JS_PROGRAM); }
-
-    AST::UiProgram *ast() const
-    { return AST::cast<AST::UiProgram *>(program); }
-
-    AST::Statement *statement() const
-    {
-        if (! program)
-            return 0;
-
-        return program->statementCast();
-    }
-
-    AST::ExpressionNode *expression() const
-    {
-        if (! program)
-            return 0;
-
-        return program->expressionCast();
-    }
-
-    AST::UiObjectMember *uiObjectMember() const
-    {
-        if (! program)
-            return 0;
-
-        return program->uiObjectMemberCast();
-    }
-
-    AST::Node *rootNode() const
-    { return program; }
-
-    QList<DiagnosticMessage> diagnosticMessages() const
-    { return diagnostic_messages; }
-
-    inline DiagnosticMessage diagnosticMessage() const
-    {
-        foreach (const DiagnosticMessage &d, diagnostic_messages) {
-            if (! d.kind == DiagnosticMessage::Warning)
-                return d;
-        }
-
-        return DiagnosticMessage();
-    }
-
-    inline QString errorMessage() const
-    { return diagnosticMessage().message; }
-
-    inline int errorLineNumber() const
-    { return diagnosticMessage().loc.startLine; }
-
-    inline int errorColumnNumber() const
-    { return diagnosticMessage().loc.startColumn; }
-
-protected:
-    bool parse(int startToken);
-
-    void reallocateStack();
-
-    inline Value &sym(int index)
-    { return sym_stack [tos + index - 1]; }
-
-    inline AST::SourceLocation &loc(int index)
-    { return location_stack [tos + index - 1]; }
-
-    AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
-
-protected:
-    Engine *driver;
-    int tos;
-    int stack_size;
-    Value *sym_stack;
-    int *state_stack;
-    AST::SourceLocation *location_stack;
-
-    AST::Node *program;
-
-    // error recovery
-    enum { TOKEN_BUFFER_SIZE = 3 };
-
-    struct SavedToken {
-       int token;
-       double dval;
-       AST::SourceLocation loc;
-    };
-
-    double yylval;
-    AST::SourceLocation yylloc;
-    AST::SourceLocation yyprevlloc;
-
-    SavedToken token_buffer[TOKEN_BUFFER_SIZE];
-    SavedToken *first_token;
-    SavedToken *last_token;
-
-    QList<DiagnosticMessage> diagnostic_messages;
-};
-
-} // end of namespace QmlJS
-
-
-
-#define J_SCRIPT_REGEXPLITERAL_RULE1 74
-
-#define J_SCRIPT_REGEXPLITERAL_RULE2 75
-
-QT_QML_END_NAMESPACE
-
-
-
-#endif // QMLJSPARSER_P_H
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
new file mode 100644
index 0000000..ee5a27a
--- /dev/null
+++ b/src/declarative/qml/qdeclarative.h
@@ -0,0 +1,132 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QML_H
+#define QML_H
+
+#include "qdeclarativemetatype.h"
+#include "qdeclarativemetaproperty.h"
+#include "qdeclarativeparserstatus.h"
+#include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarativelist.h"
+
+#include <QtCore/qbytearray.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qurl.h>
+#include <QtCore/qmetaobject.h>
+
+QT_BEGIN_HEADER
+
+#define QML_DECLARE_TYPE(TYPE) \
+    Q_DECLARE_METATYPE(TYPE *) \
+    Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>) 
+
+#define QML_DECLARE_TYPE_HASMETATYPE(TYPE) \
+    Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>) 
+
+#define QML_DECLARE_INTERFACE(INTERFACE) \
+    QML_DECLARE_TYPE(INTERFACE)
+
+#define QML_DECLARE_INTERFACE_HASMETATYPE(INTERFACE) \
+    QML_DECLARE_TYPE_HASMETATYPE(INTERFACE)
+
+enum { /* TYPEINFO flags */
+    QML_HAS_ATTACHED_PROPERTIES = 0x01,
+};
+
+#define QML_DECLARE_TYPEINFO(TYPE, FLAGS) \
+QT_BEGIN_NAMESPACE \
+template <> \
+class QDeclarativeTypeInfo<TYPE > \
+{ \
+public: \
+    enum { \
+        hasAttachedProperties = (((FLAGS) & QML_HAS_ATTACHED_PROPERTIES) == QML_HAS_ATTACHED_PROPERTIES) \
+    }; \
+}; \
+QT_END_NAMESPACE
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+#define QML_REGISTER_INTERFACE(INTERFACE) \
+    qmlRegisterInterface<INTERFACE>(#INTERFACE)
+
+#define QML_REGISTER_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \
+    qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE)
+
+#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,TYPE,CLASS) \
+    qmlRegisterType<CLASS>(#URI, VMAJ, VMIN, #TYPE, #CLASS)
+
+#define QML_REGISTER_NOCREATE_TYPE(CLASS) \
+    qmlRegisterType<CLASS>(#CLASS)
+
+class QDeclarativeContext;
+class QDeclarativeEngine;
+Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *);
+Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *);
+Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *);
+Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
+
+template<typename T>
+QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true)
+{
+    // ### is this threadsafe?
+    static int idx = -1;
+
+    if (idx == -1)
+        idx = QDeclarativeMetaType::attachedPropertiesFuncId(&T::staticMetaObject);
+
+    if (idx == -1 || !obj)
+        return 0;
+
+    return qmlAttachedPropertiesObjectById(idx, obj, create);
+}
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QObject)
+Q_DECLARE_METATYPE(QVariant)
+
+QT_END_HEADER
+
+#endif // QML_H
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
new file mode 100644
index 0000000..5ac5701
--- /dev/null
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -0,0 +1,308 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativebinding_p_p.h"
+
+#include "qdeclarative.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativeinfo.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativedeclarativedata_p.h"
+#include "qdeclarativestringconverters_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QVariant>
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeBindingData::QDeclarativeBindingData()
+: updating(false), enabled(false)
+{
+}
+
+QDeclarativeBindingData::~QDeclarativeBindingData()
+{
+    removeError();
+}
+
+void QDeclarativeBindingData::refresh()
+{
+    if (enabled && !updating && q) {
+        QDeclarativeBinding *b = static_cast<QDeclarativeBinding *>(QDeclarativeExpressionPrivate::get(q));
+        b->update();
+    }
+}
+
+QDeclarativeBindingPrivate::QDeclarativeBindingPrivate()
+: QDeclarativeExpressionPrivate(new QDeclarativeBindingData)
+{
+}
+
+QDeclarativeBinding::QDeclarativeBinding(void *data, QDeclarativeRefCount *rc, QObject *obj, QDeclarativeContext *ctxt, const QString &url, int lineNumber, QObject *parent)
+: QDeclarativeExpression(ctxt, data, rc, obj, url, lineNumber, *new QDeclarativeBindingPrivate)
+{
+    setParent(parent);
+    setNotifyOnValueChanged(true);
+}
+
+QDeclarativeBinding::QDeclarativeBinding(const QString &str, QObject *obj, QDeclarativeContext *ctxt, QObject *parent)
+: QDeclarativeExpression(ctxt, str, obj, *new QDeclarativeBindingPrivate)
+{
+    setParent(parent);
+    setNotifyOnValueChanged(true);
+}
+
+QDeclarativeBinding::~QDeclarativeBinding()
+{
+}
+
+void QDeclarativeBinding::setTarget(const QDeclarativeMetaProperty &prop)
+{
+    Q_D(QDeclarativeBinding);
+    d->bindingData()->property = prop;
+
+    update();
+}
+
+QDeclarativeMetaProperty QDeclarativeBinding::property() const 
+{
+   Q_D(const QDeclarativeBinding);
+   return d->bindingData()->property; 
+}
+
+void QDeclarativeBinding::update(QDeclarativeMetaProperty::WriteFlags flags)
+{
+    Q_D(QDeclarativeBinding);
+
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::BindableValueUpdate> bu;
+#endif
+    QDeclarativeBindingData *data = d->bindingData();
+
+    if (!data->enabled)
+        return;
+
+    data->addref();
+
+    if (!data->updating) {
+        data->updating = true;
+
+        if (data->property.propertyCategory() == QDeclarativeMetaProperty::Bindable) {
+
+            int idx = data->property.coreIndex();
+            Q_ASSERT(idx != -1);
+
+
+            QDeclarativeBinding *t = this;
+            int status = -1;
+            void *a[] = { &t, 0, &status, &flags };
+            QMetaObject::metacall(data->property.object(),
+                                  QMetaObject::WriteProperty,
+                                  idx, a);
+
+        } else {
+            bool isUndefined = false;
+            QVariant value = this->value(&isUndefined);
+
+            if (isUndefined && !data->error.isValid() && data->property.isResettable()) {
+
+                data->property.reset();
+
+            } else if (isUndefined && !data->error.isValid()) {
+
+                QUrl url = QUrl(data->url);
+                int line = data->line;
+                if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
+
+                data->error.setUrl(url);
+                data->error.setLine(line);
+                data->error.setColumn(-1);
+                data->error.setDescription(QLatin1String("Unable to assign [undefined] to ") + QLatin1String(QMetaType::typeName(data->property.propertyType())));
+
+            } else if (!isUndefined && data->property.object() && 
+                       !data->property.write(value, flags)) {
+
+                QUrl url = QUrl(data->url);
+                int line = data->line;
+                if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
+
+                const char *valueType = 0;
+                if (value.userType() == QVariant::Invalid) valueType = "null";
+                else valueType = QMetaType::typeName(value.userType());
+
+                data->error.setUrl(url);
+                data->error.setLine(line);
+                data->error.setColumn(-1);
+                data->error.setDescription(QLatin1String("Unable to assign ") +
+                                           QLatin1String(valueType) +
+                                           QLatin1String(" to ") +
+                                           QLatin1String(QMetaType::typeName(data->property.propertyType())));
+            }
+
+            if (data->error.isValid()) {
+                QDeclarativeEnginePrivate *p = (data->context() && data->context()->engine())?
+                    QDeclarativeEnginePrivate::get(data->context()->engine()):0;
+               if (!data->addError(p)) 
+                   qWarning().nospace() << qPrintable(this->error().toString());
+            } else {
+                data->removeError();
+            }
+        }
+
+        data->updating = false;
+    } else {
+        qmlInfo(data->property.object()) << tr("Binding loop detected for property \"%1\"").arg(data->property.name());
+    }
+
+    data->release();
+}
+
+void QDeclarativeBindingPrivate::emitValueChanged()
+{
+    Q_Q(QDeclarativeBinding);
+    q->update();
+}
+
+void QDeclarativeBinding::setEnabled(bool e, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    Q_D(QDeclarativeBinding);
+    d->bindingData()->enabled = e;
+    setNotifyOnValueChanged(e);
+
+    QDeclarativeAbstractBinding::setEnabled(e, flags);
+
+    if (e) {
+        addToObject(d->bindingData()->property.object());
+        update(flags);
+    } else {
+        removeFromObject();
+    }
+}
+
+int QDeclarativeBinding::propertyIndex()
+{
+    Q_D(QDeclarativeBinding);
+    return d->bindingData()->property.coreIndex();
+}
+
+bool QDeclarativeBinding::enabled() const
+{
+    Q_D(const QDeclarativeBinding);
+
+    return d->bindingData()->enabled;
+}
+
+QString QDeclarativeBinding::expression() const
+{
+    return QDeclarativeExpression::expression();
+}
+
+QDeclarativeAbstractBinding::QDeclarativeAbstractBinding()
+: m_object(0), m_mePtr(0), m_prevBinding(0), m_nextBinding(0)
+{
+}
+
+QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding()
+{
+    removeFromObject();
+    if (m_mePtr)
+        *m_mePtr = 0;
+}
+
+void QDeclarativeAbstractBinding::destroy()
+{
+    delete this;
+}
+
+void QDeclarativeAbstractBinding::addToObject(QObject *object)
+{
+    Q_ASSERT(object);
+
+    removeFromObject();
+
+    Q_ASSERT(!m_prevBinding);
+
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object, true);
+    m_nextBinding = data->bindings;
+    if (m_nextBinding) m_nextBinding->m_prevBinding = &m_nextBinding;
+    m_prevBinding = &data->bindings;
+    data->bindings = this;
+    m_object = object;
+
+    data->setBindingBit(m_object, propertyIndex());
+}
+
+void QDeclarativeAbstractBinding::removeFromObject()
+{
+    if (m_prevBinding) {
+        Q_ASSERT(m_object);
+
+        *m_prevBinding = m_nextBinding;
+        if (m_nextBinding) m_nextBinding->m_prevBinding = m_prevBinding;
+        m_prevBinding = 0;
+        m_nextBinding = 0;
+
+        QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(m_object, false);
+        if (data) data->clearBindingBit(propertyIndex());
+        m_object = 0;
+    }
+}
+
+void QDeclarativeAbstractBinding::clear()
+{
+    if (m_mePtr)
+        *m_mePtr = 0;
+}
+
+QString QDeclarativeAbstractBinding::expression() const
+{
+    return QLatin1String("<Unknown>");
+}
+
+void QDeclarativeAbstractBinding::setEnabled(bool e, QDeclarativeMetaProperty::WriteFlags)
+{
+    if (e) m_mePtr = 0;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
new file mode 100644
index 0000000..432bf22
--- /dev/null
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEBINDING_P_H
+#define QDECLARATIVEBINDING_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarative.h"
+#include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarativeexpression.h"
+
+#include <QtCore/QObject>
+#include <QtCore/QMetaProperty>
+
+QT_BEGIN_NAMESPACE
+
+class Q_AUTOTEST_EXPORT QDeclarativeAbstractBinding
+{
+public:
+    QDeclarativeAbstractBinding();
+    virtual ~QDeclarativeAbstractBinding();
+
+    virtual void destroy();
+
+    virtual QString expression() const;
+
+    void setEnabled(bool e) { setEnabled(e, QDeclarativeMetaProperty::DontRemoveBinding); }
+    virtual void setEnabled(bool, QDeclarativeMetaProperty::WriteFlags) = 0;
+    virtual int propertyIndex() = 0;
+
+    void update() { update(QDeclarativeMetaProperty::DontRemoveBinding); }
+    virtual void update(QDeclarativeMetaProperty::WriteFlags) = 0;
+
+    void addToObject(QObject *);
+    void removeFromObject();
+
+protected:
+    void clear();
+
+private:
+    friend class QDeclarativeDeclarativeData;
+    friend class QDeclarativeMetaProperty;
+    friend class QDeclarativeMetaPropertyPrivate;
+    friend class QDeclarativeVME;
+
+    QObject *m_object;
+    QDeclarativeAbstractBinding **m_mePtr;
+    QDeclarativeAbstractBinding **m_prevBinding;
+    QDeclarativeAbstractBinding  *m_nextBinding;
+};
+
+class QDeclarativeContext;
+class QDeclarativeBindingPrivate;
+class Q_AUTOTEST_EXPORT QDeclarativeBinding : public QDeclarativeExpression, public QDeclarativeAbstractBinding
+{
+Q_OBJECT
+public:
+    QDeclarativeBinding(const QString &, QObject *, QDeclarativeContext *, QObject *parent=0);
+    QDeclarativeBinding(void *, QDeclarativeRefCount *, QObject *, QDeclarativeContext *, const QString &, int, 
+               QObject *parent);
+    ~QDeclarativeBinding();
+
+    void setTarget(const QDeclarativeMetaProperty &);
+    QDeclarativeMetaProperty property() const;
+
+    bool enabled() const;
+
+    // Inherited from  QDeclarativeAbstractBinding
+    virtual void setEnabled(bool, QDeclarativeMetaProperty::WriteFlags flags);
+    virtual int propertyIndex();
+    virtual void update(QDeclarativeMetaProperty::WriteFlags flags);
+    virtual QString expression() const;
+
+public Q_SLOTS:
+    void update() { update(QDeclarativeMetaProperty::DontRemoveBinding); }
+
+protected:
+    void emitValueChanged();
+
+private:
+    Q_DECLARE_PRIVATE(QDeclarativeBinding)
+};
+Q_DECLARE_METATYPE(QDeclarativeBinding*);
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEBINDING_P_H
diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h
new file mode 100644
index 0000000..ac88400
--- /dev/null
+++ b/src/declarative/qml/qdeclarativebinding_p_p.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEBINDING_P_P_H
+#define QDECLARATIVEBINDING_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativebinding_p.h"
+
+#include "qdeclarativemetaproperty.h"
+#include "qdeclarativeexpression_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeBindingData : public QDeclarativeExpressionData
+{
+public:
+    QDeclarativeBindingData();
+    virtual ~QDeclarativeBindingData();
+
+    bool updating:1;
+    bool enabled:1;
+
+    QDeclarativeMetaProperty property;
+
+    virtual void refresh();
+};
+
+class QDeclarativeBindingPrivate : public QDeclarativeExpressionPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeBinding)
+public:
+    QDeclarativeBindingPrivate();
+
+    QDeclarativeBindingData *bindingData() { return static_cast<QDeclarativeBindingData *>(data); }
+    const QDeclarativeBindingData *bindingData() const { return static_cast<const QDeclarativeBindingData *>(data); }
+
+    virtual void emitValueChanged();
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEBINDING_P_P_H
diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp
new file mode 100644
index 0000000..c47df32
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeboundsignal.cpp
@@ -0,0 +1,263 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeboundsignal_p.h"
+
+#include "qmetaobjectbuilder_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeexpression_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativemetatype.h"
+#include "qdeclarative.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativeglobal_p.h"
+
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeBoundSignalParameters : public QObject
+{
+Q_OBJECT
+public:
+    QDeclarativeBoundSignalParameters(const QMetaMethod &, QObject * = 0);
+    ~QDeclarativeBoundSignalParameters();
+
+    void setValues(void **);
+    void clearValues();
+
+private:
+    friend class MetaObject;
+    int metaCall(QMetaObject::Call, int _id, void **);
+    struct MetaObject : public QAbstractDynamicMetaObject {
+        MetaObject(QDeclarativeBoundSignalParameters *b)
+            : parent(b) {}
+
+        int metaCall(QMetaObject::Call c, int id, void **a) { 
+            return parent->metaCall(c, id, a);
+        }
+        QDeclarativeBoundSignalParameters *parent;
+    };
+
+    int *types;
+    void **values;
+    QMetaObject *myMetaObject;
+};
+
+static int evaluateIdx = -1;
+
+QDeclarativeAbstractBoundSignal::QDeclarativeAbstractBoundSignal(QObject *parent)
+: QObject(parent)
+{
+}
+
+QDeclarativeAbstractBoundSignal::~QDeclarativeAbstractBoundSignal()
+{
+}
+
+QDeclarativeBoundSignal::QDeclarativeBoundSignal(QObject *scope, const QMetaMethod &signal, 
+                               QObject *parent)
+: m_expression(0), m_signal(signal), m_paramsValid(false), m_params(0)
+{
+    // A cached evaluation of the QDeclarativeExpression::value() slot index.
+    //
+    // This is thread safe.  Although it may be updated by two threads, they
+    // will both set it to the same value - so the worst thing that can happen
+    // is that they both do the work to figure it out.  Boo hoo.
+    if (evaluateIdx == -1) evaluateIdx = metaObject()->methodCount();
+
+    QDeclarativeGraphics_setParent_noEvent(this, parent);
+    QMetaObject::connect(scope, m_signal.methodIndex(), this, evaluateIdx);
+}
+
+QDeclarativeBoundSignal::QDeclarativeBoundSignal(QDeclarativeContext *ctxt, const QString &val, 
+                               QObject *scope, const QMetaMethod &signal,
+                               QObject *parent)
+: m_expression(0), m_signal(signal), m_paramsValid(false), m_params(0)
+{
+    // A cached evaluation of the QDeclarativeExpression::value() slot index.
+    //
+    // This is thread safe.  Although it may be updated by two threads, they
+    // will both set it to the same value - so the worst thing that can happen
+    // is that they both do the work to figure it out.  Boo hoo.
+    if (evaluateIdx == -1) evaluateIdx = metaObject()->methodCount();
+
+    QDeclarativeGraphics_setParent_noEvent(this, parent);
+    QMetaObject::connect(scope, m_signal.methodIndex(), this, evaluateIdx);
+
+    m_expression = new QDeclarativeExpression(ctxt, val, scope);
+}
+
+QDeclarativeBoundSignal::~QDeclarativeBoundSignal()
+{
+    delete m_expression;
+    m_expression = 0;
+}
+
+int QDeclarativeBoundSignal::index() const 
+{ 
+    return m_signal.methodIndex();
+}
+
+/*!
+    Returns the signal expression.
+*/
+QDeclarativeExpression *QDeclarativeBoundSignal::expression() const
+{
+    return m_expression;
+}
+
+/*!
+    Sets the signal expression to \a e.  Returns the current signal expression,
+    or null if there is no signal expression.
+
+    The QDeclarativeBoundSignal instance takes ownership of \a e.  The caller is 
+    assumes ownership of the returned QDeclarativeExpression.
+*/
+QDeclarativeExpression *QDeclarativeBoundSignal::setExpression(QDeclarativeExpression *e)
+{
+    QDeclarativeExpression *rv = m_expression;
+    m_expression = e;
+    if (m_expression) m_expression->setNotifyOnValueChanged(false);
+    return rv;
+}
+
+QDeclarativeBoundSignal *QDeclarativeBoundSignal::cast(QObject *o)
+{
+    QDeclarativeAbstractBoundSignal *s = qobject_cast<QDeclarativeAbstractBoundSignal*>(o);
+    return static_cast<QDeclarativeBoundSignal *>(s);
+}
+
+int QDeclarativeBoundSignal::qt_metacall(QMetaObject::Call c, int id, void **a)
+{
+    if (c == QMetaObject::InvokeMetaMethod && id == evaluateIdx) {
+        if (!m_paramsValid) {
+            if (!m_signal.parameterTypes().isEmpty())
+                m_params = new QDeclarativeBoundSignalParameters(m_signal, this);
+            m_paramsValid = true;
+        }
+
+        if (m_params) m_params->setValues(a);
+        if (m_expression) {
+            QDeclarativeExpressionPrivate::get(m_expression)->value(m_params);
+            if (m_expression && m_expression->hasError())
+                qWarning().nospace() << qPrintable(m_expression->error().toString());
+        }
+        if (m_params) m_params->clearValues();
+        return -1;
+    } else {
+        return QObject::qt_metacall(c, id, a);
+    }
+}
+
+QDeclarativeBoundSignalParameters::QDeclarativeBoundSignalParameters(const QMetaMethod &method, 
+                                                   QObject *parent)
+: QObject(parent), types(0), values(0)
+{
+    MetaObject *mo = new MetaObject(this);
+
+    // ### Optimize!
+    // ### Ensure only supported types are allowed, otherwise it might crash
+    QMetaObjectBuilder mob;
+    mob.setSuperClass(&QDeclarativeBoundSignalParameters::staticMetaObject);
+    mob.setClassName("QDeclarativeBoundSignalParameters");
+
+    QList<QByteArray> paramTypes = method.parameterTypes();
+    QList<QByteArray> paramNames = method.parameterNames();
+    types = new int[paramTypes.count()];
+    for (int ii = 0; ii < paramTypes.count(); ++ii) {
+        const QByteArray &type = paramTypes.at(ii);
+        const QByteArray &name = paramNames.at(ii);
+
+        if (name.isEmpty() || type.isEmpty()) {
+            types[ii] = 0;
+            continue;
+        }
+
+        QVariant::Type t = (QVariant::Type)QMetaType::type(type.constData());
+        if (QDeclarativeMetaType::isQObject(t)) {
+            types[ii] = QMetaType::QObjectStar;
+            QMetaPropertyBuilder prop = mob.addProperty(name, "QObject*");
+            prop.setWritable(false);
+        } else {
+            types[ii] = t;
+            QMetaPropertyBuilder prop = mob.addProperty(name, type);
+            prop.setWritable(false);
+        }
+    }
+    myMetaObject = mob.toMetaObject();
+    *static_cast<QMetaObject *>(mo) = *myMetaObject;
+
+    d_ptr->metaObject = mo;
+}
+
+QDeclarativeBoundSignalParameters::~QDeclarativeBoundSignalParameters()
+{
+    delete [] types;
+    qFree(myMetaObject);
+}
+
+void QDeclarativeBoundSignalParameters::setValues(void **v)
+{
+    values = v;
+}
+
+void QDeclarativeBoundSignalParameters::clearValues()
+{
+    values = 0;
+}
+
+int QDeclarativeBoundSignalParameters::metaCall(QMetaObject::Call c, int id, void **a)
+{
+    if (!values)
+        return -1;
+
+    if (c == QMetaObject::ReadProperty && id >= 1) {
+        QDeclarativeMetaType::copy(types[id - 1], a[0], values[id]);
+        return -1;
+    } else {
+        return qt_metacall(c, id, a);
+    }
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativeboundsignal.moc>
diff --git a/src/declarative/qml/qdeclarativeboundsignal_p.h b/src/declarative/qml/qdeclarativeboundsignal_p.h
new file mode 100644
index 0000000..bba4eec
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeboundsignal_p.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEBOUNDSIGNAL_P_H
+#define QDECLARATIVEBOUNDSIGNAL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeexpression.h"
+
+#include <QtCore/qmetaobject.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeAbstractBoundSignal : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeAbstractBoundSignal(QObject *parent = 0);
+    virtual ~QDeclarativeAbstractBoundSignal() = 0;
+};
+
+class QDeclarativeBoundSignalParameters;
+class QDeclarativeBoundSignal : public QDeclarativeAbstractBoundSignal
+{
+public:
+    QDeclarativeBoundSignal(QObject *scope, const QMetaMethod &signal, QObject *parent);
+    QDeclarativeBoundSignal(QDeclarativeContext *ctxt, const QString &val, QObject *scope, 
+                   const QMetaMethod &signal, QObject *parent);
+    virtual ~QDeclarativeBoundSignal();
+
+    int index() const;
+
+    QDeclarativeExpression *expression() const;
+    QDeclarativeExpression *setExpression(QDeclarativeExpression *);
+
+    static QDeclarativeBoundSignal *cast(QObject *);
+
+protected:
+    virtual int qt_metacall(QMetaObject::Call c, int id, void **a);
+
+private:
+    QDeclarativeExpression *m_expression;
+    QMetaMethod m_signal;
+    bool m_paramsValid;
+    QDeclarativeBoundSignalParameters *m_params;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEBOUNDSIGNAL_P_H
diff --git a/src/declarative/qml/qdeclarativeclassfactory.cpp b/src/declarative/qml/qdeclarativeclassfactory.cpp
new file mode 100644
index 0000000..ae4975c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeclassfactory.cpp
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeclassfactory_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeClassFactory::~QDeclarativeClassFactory()
+{
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeclassfactory_p.h b/src/declarative/qml/qdeclarativeclassfactory_p.h
new file mode 100644
index 0000000..9f4a3de
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeclassfactory_p.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECLASSFACTORY_P_H
+#define QDECLARATIVECLASSFACTORY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QByteArray;
+class QUrl;
+class QDeclarativeComponent;
+
+class QDeclarativeClassFactory 
+{
+public:
+    virtual ~QDeclarativeClassFactory();
+    virtual QDeclarativeComponent *create(const QByteArray &, const QUrl& baseUrl, QDeclarativeEngine*) = 0;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVECLASSFACTORY_P_H
diff --git a/src/declarative/qml/qdeclarativecleanup.cpp b/src/declarative/qml/qdeclarativecleanup.cpp
new file mode 100644
index 0000000..0fa49d1
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecleanup.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativecleanup_p.h"
+
+#include "qdeclarativeengine_p.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+\internal
+\class QDeclarativeCleanup
+\brief The QDeclarativeCleanup provides a callback when a QDeclarativeEngine is deleted. 
+
+Any object that needs cleanup to occur before the QDeclarativeEngine's QScriptEngine is
+destroyed should inherit from QDeclarativeCleanup.  The clear() virtual method will be
+called by QDeclarativeEngine just before it deletes the QScriptEngine.
+*/
+
+/*!
+\internal
+
+Create a QDeclarativeCleanup for \a engine
+*/
+QDeclarativeCleanup::QDeclarativeCleanup(QDeclarativeEngine *engine)
+: prev(0), next(0)
+{
+    if (!engine)
+        return;
+
+    QDeclarativeEnginePrivate *p = QDeclarativeEnginePrivate::get(engine);
+
+    if (p->cleanup) next = p->cleanup;
+    p->cleanup = this;
+    prev = &p->cleanup;
+    if (next) next->prev = &next;
+}
+
+/*!
+\internal
+*/
+QDeclarativeCleanup::~QDeclarativeCleanup()
+{
+    if (prev) *prev = next;
+    if (next) next->prev = prev;
+    prev = 0; 
+    next = 0;
+}
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecleanup_p.h b/src/declarative/qml/qdeclarativecleanup_p.h
new file mode 100644
index 0000000..e9b6b45
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecleanup_p.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECLEANUP_P_H
+#define QDECLARATIVECLEANUP_P_H
+
+#include <QtCore/qglobal.h>
+
+// 
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QDeclarativeCleanup
+{
+public:
+    QDeclarativeCleanup(QDeclarativeEngine *);
+    virtual ~QDeclarativeCleanup();
+
+protected:
+    virtual void clear() = 0;
+
+private:
+    friend class QDeclarativeEnginePrivate;
+    QDeclarativeCleanup **prev;
+    QDeclarativeCleanup  *next;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVECLEANUP_P_H
+
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
new file mode 100644
index 0000000..face22c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -0,0 +1,2738 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// #define COMPILEDBINDINGS_DEBUG
+
+#include "qdeclarativecompiledbindings_p.h"
+
+#include <QtDeclarative/qdeclarativeinfo.h>
+#include <private/qdeclarativecontext_p.h>
+#include <private/qdeclarativejsast_p.h>
+#include <private/qdeclarativejsengine_p.h>
+#include <private/qdeclarativeexpression_p.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qnumeric.h>
+#include <private/qdeclarativeanchors_p_p.h>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QDeclarativeJS;
+
+namespace {
+// Supported types: int, qreal, QString (needs constr/destr), QObject*, bool
+struct Register {
+    void setUndefined() { type = 0; }
+    void setUnknownButDefined() { type = -1; }
+    void setNaN() { setqreal(qSNaN()); }
+    bool isUndefined() const { return type == 0; }
+
+    void setQObject(QObject *o) { *((QObject **)data) = o; type = QMetaType::QObjectStar; }
+    QObject *getQObject() const { return *((QObject **)data); }
+
+    void setqreal(qreal v) { *((qreal *)data) = v; type = QMetaType::QReal; }
+    qreal getqreal() const { return *((qreal *)data); }
+
+    void setint(int v) { *((int *)data) = v; type = QMetaType::Int; }
+    int getint() const { return *((int *)data); }
+
+    void setbool(bool v) { *((bool *)data) = v; type = QMetaType::Bool; }
+    bool getbool() const { return *((bool *)data); }
+
+    QVariant *getvariantptr() { return (QVariant *)typeDataPtr(); }
+    QString *getstringptr() { return (QString *)typeDataPtr(); }
+    QUrl *geturlptr() { return (QUrl *)typeDataPtr(); }
+    const QVariant *getvariantptr() const { return (QVariant *)typeDataPtr(); }
+    const QString *getstringptr() const { return (QString *)typeDataPtr(); }
+    const QUrl *geturlptr() const { return (QUrl *)typeDataPtr(); }
+
+    void *typeDataPtr() { return (void *)&data; }
+    void *typeMemory() { return (void *)data; }
+    const void *typeDataPtr() const { return (void *)&data; }
+    const void *typeMemory() const { return (void *)data; }
+
+    int gettype() const { return type; }
+    void settype(int t) { type = t; }
+
+    int type;          // Optional type
+    void *data[2];     // Object stored here
+};
+}
+
+class QDeclarativeCompiledBindingsPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeCompiledBindings)
+
+public:
+    QDeclarativeCompiledBindingsPrivate();
+    virtual ~QDeclarativeCompiledBindingsPrivate();
+
+    struct Binding : public QDeclarativeAbstractBinding, public QDeclarativeDelayedError {
+        Binding() : enabled(false), updating(0), property(0),
+                    scope(0), target(0), parent(0) {}
+
+        // Inherited from QDeclarativeAbstractBinding
+        virtual void setEnabled(bool, QDeclarativeMetaProperty::WriteFlags flags);
+        virtual int propertyIndex();
+        virtual void update(QDeclarativeMetaProperty::WriteFlags flags);
+        virtual void destroy();
+
+        int index:30;
+        bool enabled:1;
+        bool updating:1;
+        int property;
+        QObject *scope;
+        QObject *target;
+
+        QDeclarativeCompiledBindingsPrivate *parent;
+    };
+
+    struct Subscription {
+        struct Signal {
+            QDeclarativeGuard<QObject> source;
+            int notifyIndex;
+        };
+
+        enum { InvalidType, SignalType, IdType } type;
+        inline Subscription();
+        inline ~Subscription();
+        bool isSignal() const { return type == SignalType; }
+        bool isId() const { return type == IdType; }
+        inline Signal *signal();
+        inline QDeclarativeContextPrivate::IdNotifier *id();
+        union {
+            char signalData[sizeof(Signal)];
+            char idData[sizeof(QDeclarativeContextPrivate::IdNotifier)];
+        };
+    };
+    Subscription *subscriptions;
+    QScriptDeclarativeClass::PersistentIdentifier *identifiers;
+
+    void run(Binding *);
+
+    const char *programData;
+    Binding *m_bindings;
+    quint32 *m_signalTable;
+
+    static int methodCount;
+
+    void init();
+    void run(int instr, QDeclarativeContextPrivate *context, 
+             QDeclarativeDelayedError *error, QObject *scope, QObject *output);
+
+
+    inline void unsubscribe(int subIndex);
+    inline void subscribeId(QDeclarativeContextPrivate *p, int idIndex, int subIndex);
+    inline void subscribe(QObject *o, int notifyIndex, int subIndex);
+
+    QDeclarativePropertyCache::Data *findproperty(QObject *obj, 
+                                         const QScriptDeclarativeClass::Identifier &name,
+                                         QDeclarativeEnginePrivate *enginePriv, 
+                                         QDeclarativePropertyCache::Data &local);
+    bool findproperty(QObject *obj, 
+                      Register *output, 
+                      QDeclarativeEnginePrivate *enginePriv,
+                      int subIdx, 
+                      const QScriptDeclarativeClass::Identifier &name,
+                      bool isTerminal);
+    void findgeneric(Register *output,                                 // value output
+                     int subIdx,                                       // Subscription index in config
+                     QDeclarativeContextPrivate *context,                       // Context to search in
+                     const QScriptDeclarativeClass::Identifier &name, 
+                     bool isTerminal);
+};
+
+QDeclarativeCompiledBindingsPrivate::QDeclarativeCompiledBindingsPrivate()
+: subscriptions(0), identifiers(0)
+{
+}
+
+QDeclarativeCompiledBindingsPrivate::~QDeclarativeCompiledBindingsPrivate()
+{
+    delete [] subscriptions; subscriptions = 0;
+    delete [] identifiers; identifiers = 0;
+}
+
+QDeclarativeCompiledBindingsPrivate::Subscription::Subscription()
+: type(InvalidType)
+{
+}
+
+QDeclarativeCompiledBindingsPrivate::Subscription::~Subscription()
+{
+    if (type == SignalType) ((Signal *)signalData)->~Signal();
+    else if (type == IdType) ((QDeclarativeContextPrivate::IdNotifier *)idData)->~IdNotifier();
+}
+
+
+int QDeclarativeCompiledBindingsPrivate::methodCount = -1;
+
+QDeclarativeCompiledBindings::QDeclarativeCompiledBindings(const char *program, QDeclarativeContext *context)
+: QObject(*(new QDeclarativeCompiledBindingsPrivate))
+{
+    Q_D(QDeclarativeCompiledBindings);
+
+    if (d->methodCount == -1)
+        d->methodCount = QDeclarativeCompiledBindings::staticMetaObject.methodCount();
+
+    d->programData = program;
+
+    d->init();
+
+    QDeclarativeAbstractExpression::setContext(context);
+}
+
+QDeclarativeCompiledBindings::~QDeclarativeCompiledBindings()
+{
+    Q_D(QDeclarativeCompiledBindings);
+
+    delete [] d->m_bindings;
+}
+
+QDeclarativeAbstractBinding *QDeclarativeCompiledBindings::configBinding(int index, QObject *target, 
+                                                        QObject *scope, int property)
+{
+    Q_D(QDeclarativeCompiledBindings);
+
+    QDeclarativeCompiledBindingsPrivate::Binding *rv = d->m_bindings + index;
+
+    rv->index = index;
+    rv->property = property;
+    rv->target = target;
+    rv->scope = scope;
+    rv->parent = d;
+
+    addref(); // This is decremented in Binding::destroy()
+
+    return rv;
+}
+
+void QDeclarativeCompiledBindingsPrivate::Binding::setEnabled(bool e, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    if (e) {
+        addToObject(target);
+        update(flags);
+    } else {
+        removeFromObject();
+    }
+
+    QDeclarativeAbstractBinding::setEnabled(e, flags);
+
+    if (enabled != e) {
+        enabled = e;
+
+        if (e) update(flags);
+    }
+}
+
+int QDeclarativeCompiledBindingsPrivate::Binding::propertyIndex()
+{
+    return property & 0xFFFF;
+}
+
+void QDeclarativeCompiledBindingsPrivate::Binding::update(QDeclarativeMetaProperty::WriteFlags)
+{
+    parent->run(this);
+}
+
+void QDeclarativeCompiledBindingsPrivate::Binding::destroy()
+{
+    enabled = false;
+    removeFromObject();
+    parent->q_func()->release();
+    clear();
+}
+
+int QDeclarativeCompiledBindings::qt_metacall(QMetaObject::Call c, int id, void **)
+{
+    Q_D(QDeclarativeCompiledBindings);
+
+    if (c == QMetaObject::InvokeMetaMethod && id >= d->methodCount) {
+        id -= d->methodCount;
+
+        quint32 *reeval = d->m_signalTable + d->m_signalTable[id];
+        quint32 count = *reeval;
+        ++reeval;
+        for (quint32 ii = 0; ii < count; ++ii) {
+            d->run(d->m_bindings + reeval[ii]);
+        }
+    }
+    return -1;
+}
+
+void QDeclarativeCompiledBindingsPrivate::run(Binding *binding)
+{
+    Q_Q(QDeclarativeCompiledBindings);
+
+    if (!binding->enabled)
+        return;
+    if (binding->updating)
+        qWarning("ERROR: Circular binding");
+
+    QDeclarativeContext *context = q->QDeclarativeAbstractExpression::context();
+    if (!context) {
+        qWarning("QDeclarativeCompiledBindings: Attempted to evaluate an expression in an invalid context");
+        return;
+    }
+    QDeclarativeContextPrivate *cp = QDeclarativeContextPrivate::get(context);
+
+    if (binding->property & 0xFFFF0000) {
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(cp->engine);
+
+        QDeclarativeValueType *vt = ep->valueTypes[(binding->property >> 16) & 0xFF];
+        Q_ASSERT(vt);
+        vt->read(binding->target, binding->property & 0xFFFF);
+
+        QObject *target = vt;
+        run(binding->index, cp, binding, binding->scope, target);
+
+        vt->write(binding->target, binding->property & 0xFFFF, 
+                  QDeclarativeMetaProperty::DontRemoveBinding);
+    } else {
+        run(binding->index, cp, binding, binding->scope, binding->target);
+    }
+}
+
+QDeclarativeCompiledBindingsPrivate::Subscription::Signal *QDeclarativeCompiledBindingsPrivate::Subscription::signal() 
+{
+    if (type == IdType) ((QDeclarativeContextPrivate::IdNotifier *)idData)->~IdNotifier();
+    if (type != SignalType) new (signalData) Signal;
+    type = SignalType;
+    return (Signal *)signalData;
+}
+
+QDeclarativeContextPrivate::IdNotifier *QDeclarativeCompiledBindingsPrivate::Subscription::id()
+{
+    if (type == SignalType) ((Signal *)signalData)->~Signal();
+    if (type != IdType) new (idData) QDeclarativeContextPrivate::IdNotifier;
+    type = IdType;
+    return (QDeclarativeContextPrivate::IdNotifier *)idData;
+}
+
+namespace {
+// This structure is exactly 8-bytes in size
+struct Instr {
+    enum {
+        Noop,
+
+        Subscribe,               // subscribe
+        SubscribeId,             // subscribe
+
+        LoadId,                  // load
+        LoadScope,               // load
+        LoadRoot,                // load
+        LoadAttached,            // attached
+
+        ConvertIntToReal,        // unaryop
+        ConvertRealToInt,        // unaryop
+
+        Real,                    // real_value
+        Int,                     // int_value
+        Bool,                    // bool_value
+        String,                  // string_value
+
+        AddReal,                 // binaryop
+        AddInt,                  // binaryop
+        AddString,               // binaryop
+
+        MinusReal,               // binaryop
+        MinusInt,                // binaryop
+
+        CompareReal,             // binaryop
+        CompareString,           // binaryop
+
+        NotCompareReal,          // binaryop
+        NotCompareString,        // binaryop
+        
+        GreaterThanReal,         // binaryop
+        MaxReal,                 // binaryop 
+        MinReal,                 // binaryop
+
+        NewString,               // construct
+        NewUrl,                  // construct
+
+        CleanupUrl,              // cleanup
+        CleanupString,           // cleanup
+
+        Copy,                    // copy
+        Fetch,                   // fetch
+        Store,                   // store
+
+        Skip,                    // skip
+
+        Done,
+
+        // Speculative property resolution
+        InitString,              // initstring
+        FindGeneric,             // find 
+        FindGenericTerminal,     // find 
+        FindProperty,            // find 
+        FindPropertyTerminal,    // find 
+        CleanupGeneric,          // cleanup
+        ConvertGenericToReal,    // unaryop
+        ConvertGenericToBool,    // unaryop
+        ConvertGenericToString,  // unaryop
+        ConvertGenericToUrl,     // unaryop
+    };
+
+    union {
+        struct {
+            quint8 type;
+            quint8 packing[7];
+        } common;
+        struct {
+            quint8 type;
+            quint8 packing[3];
+            quint16 subscriptions;
+            quint16 identifiers;
+        } init;
+        struct {
+            quint8 type;
+            qint8 reg;
+            quint16 offset;
+            quint32 index;
+        } subscribe;
+        struct {
+            quint8 type;
+            qint8 reg;
+            quint8 packing[2];
+            quint32 index;
+        } load;
+        struct {
+            quint8 type;
+            qint8 output;
+            qint8 reg;
+            quint8 exceptionId;
+            quint32 index;
+        } attached;
+        struct {
+            quint8 type;
+            qint8 output;
+            qint8 reg;
+            quint8 exceptionId;
+            quint32 index;
+        } store;
+        struct {
+            quint8 type;
+            qint8 output;
+            qint8 objectReg;
+            quint8 exceptionId;
+            quint32 index;
+        } fetch;
+        struct {
+            quint8 type;
+            qint8 reg;
+            qint8 src;
+            quint8 packing[5];
+        } copy;
+        struct {
+            quint8 type;
+            qint8 reg;
+            quint8 packing[6];
+        } construct;
+        struct {
+            quint8 type;
+            qint8 reg;
+            quint8 packing[2];
+            float value;
+        } real_value;
+        struct {
+            quint8 type;
+            qint8 reg;
+            quint8 packing[2];
+            int value;
+        } int_value;
+        struct {
+            quint8 type;
+            qint8 reg;
+            bool value;
+            quint8 packing[5];
+        } bool_value;
+        struct {
+            quint8 type;
+            qint8 reg;
+            quint16 length;
+            quint32 offset;
+        } string_value;
+        struct {
+            quint8 type;
+            qint8 output;
+            qint8 src1;
+            qint8 src2;
+            quint8 packing[4];
+        } binaryop;
+        struct {
+            quint8 type;
+            qint8 output;
+            qint8 src;
+            quint8 packing[5];
+        } unaryop;
+        struct {
+            quint8 type;
+            qint8 reg;
+            quint8 packing[2];
+            quint32 count;
+        } skip;
+        struct {
+            quint8 type;
+            qint8 reg;
+            qint8 src;
+            quint8 exceptionId;
+            quint16 name; 
+            quint16 subscribeIndex;
+        } find;
+        struct {
+            quint8 type;
+            qint8 reg;
+            quint8 packing[6];
+        } cleanup;
+        struct {
+            quint8 type;
+            quint8 packing[1];
+            quint16 offset;
+            quint32 dataIdx;
+        } initstring;
+    };
+};
+
+struct Program {
+    quint32 bindings;
+    quint32 dataLength;
+    quint32 signalTableOffset;
+    quint32 exceptionDataOffset;
+    quint16 subscriptions;
+    quint16 identifiers;
+    quint16 instructionCount;
+    quint16 dummy;
+
+    const char *data() const { return ((const char *)this) + sizeof(Program); }
+    const Instr *instructions() const { return (const Instr *)(data() + dataLength); }
+};
+}
+
+struct QDeclarativeBindingCompilerPrivate
+{
+    struct Result {
+        Result() : unknownType(false), metaObject(0), type(-1), reg(-1) {}
+        bool operator==(const Result &o) const { 
+            return unknownType == o.unknownType &&
+                   metaObject == o.metaObject && 
+                   type == o.type &&
+                   reg == o.reg; 
+        }
+        bool operator!=(const Result &o) const { 
+            return !(*this == o);
+        }
+        bool unknownType;
+        const QMetaObject *metaObject;
+        int type;
+        int reg;
+
+        QSet<QString> subscriptionSet;
+    };
+
+    QDeclarativeBindingCompilerPrivate() : registers(0) {}
+
+    void resetInstanceState();
+    int commitCompile();
+
+    QDeclarativeParser::Object *context;
+    QDeclarativeParser::Object *component;
+    QDeclarativeParser::Property *destination;
+    QHash<QString, QDeclarativeParser::Object *> ids;
+    QDeclarativeEnginePrivate::Imports imports;
+    QDeclarativeEnginePrivate *engine;
+
+    QString contextName() const { return QLatin1String("$$$SCOPE_") + QString::number((intptr_t)context, 16); }
+
+    bool compile(QDeclarativeJS::AST::Node *);
+
+    bool parseExpression(QDeclarativeJS::AST::Node *, Result &);
+
+    bool tryName(QDeclarativeJS::AST::Node *);
+    bool parseName(QDeclarativeJS::AST::Node *, Result &);
+
+    bool tryArith(QDeclarativeJS::AST::Node *);
+    bool parseArith(QDeclarativeJS::AST::Node *, Result &);
+    bool numberArith(Result &, const Result &, const Result &, QSOperator::Op op);
+    bool stringArith(Result &, const Result &, const Result &, QSOperator::Op op);
+
+    bool tryLogic(QDeclarativeJS::AST::Node *);
+    bool parseLogic(QDeclarativeJS::AST::Node *, Result &);
+
+    bool tryConditional(QDeclarativeJS::AST::Node *);
+    bool parseConditional(QDeclarativeJS::AST::Node *, Result &);
+
+    bool tryConstant(QDeclarativeJS::AST::Node *);
+    bool parseConstant(QDeclarativeJS::AST::Node *, Result &);
+
+    bool tryMethod(QDeclarativeJS::AST::Node *);
+    bool parseMethod(QDeclarativeJS::AST::Node *, Result &);
+
+    bool buildName(QStringList &, QDeclarativeJS::AST::Node *, QList<QDeclarativeJS::AST::ExpressionNode *> *nodes = 0);
+    bool fetch(Result &type, const QMetaObject *, int reg, int idx, const QStringList &, QDeclarativeJS::AST::ExpressionNode *);
+
+    quint32 registers;
+    QHash<int, QPair<int, int> > registerCleanups;
+    int acquireReg(int cleanup = Instr::Noop, int cleanupType = 0);
+    void registerCleanup(int reg, int cleanup, int cleanupType = 0);
+    void releaseReg(int);
+
+    int registerLiteralString(const QString &);
+    int registerString(const QString &);
+    QHash<QString, QPair<int, int> > registeredStrings;
+    QByteArray data;
+
+    bool subscription(const QStringList &, Result *);
+    int subscriptionIndex(const QStringList &);
+    bool subscriptionNeutral(const QSet<QString> &base, const QSet<QString> &lhs, const QSet<QString> &rhs);
+
+    quint8 exceptionId(QDeclarativeJS::AST::ExpressionNode *);
+    QVector<quint64> exceptions;
+
+    QSet<int> usedSubscriptionIds;
+    QSet<QString> subscriptionSet;
+    QHash<QString, int> subscriptionIds;
+    QVector<Instr> bytecode;
+
+    // Committed binding data
+    struct {
+        QList<int> offsets;
+        QList<QSet<int> > dependencies;
+
+        QVector<Instr> bytecode;
+        QByteArray data;
+        QHash<QString, int> subscriptionIds;
+        QVector<quint64> exceptions;
+
+        QHash<QString, QPair<int, int> > registeredStrings;
+
+        int count() const { return offsets.count(); }
+    } committed;
+
+    QByteArray buildSignalTable() const;
+    QByteArray buildExceptionData() const;
+};
+
+void QDeclarativeCompiledBindingsPrivate::unsubscribe(int subIndex)
+{
+    Q_Q(QDeclarativeCompiledBindings);
+
+    QDeclarativeCompiledBindingsPrivate::Subscription *sub = (subscriptions + subIndex);
+    if (sub->isSignal()) {
+        QDeclarativeCompiledBindingsPrivate::Subscription::Signal *s = sub->signal();
+        if (s->source)
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
+            QMetaObject::disconnectOne(s->source, s->notifyIndex, 
+                                       q, methodCount + subIndex);
+#else
+            // QTBUG-6781
+            QMetaObject::disconnect(s->source, s->notifyIndex, 
+                                    q, methodCount + subIndex);
+#endif
+    } else if (sub->isId()) {
+        sub->id()->clear();
+    }
+}
+
+void QDeclarativeCompiledBindingsPrivate::subscribeId(QDeclarativeContextPrivate *p, int idIndex, int subIndex)
+{
+    Q_Q(QDeclarativeCompiledBindings);
+
+    unsubscribe(subIndex);
+
+    if (p->idValues[idIndex]) {
+        QDeclarativeCompiledBindingsPrivate::Subscription *sub = (subscriptions + subIndex);
+        QDeclarativeContextPrivate::IdNotifier *i = sub->id();
+
+        i->next = p->idValues[idIndex].bindings;
+        i->prev = &p->idValues[idIndex].bindings;
+        p->idValues[idIndex].bindings = i;
+        if (i->next) i->next->prev = &i->next;
+
+        i->target = q;
+        i->methodIndex = methodCount + subIndex;
+    }
+}
+ 
+void QDeclarativeCompiledBindingsPrivate::subscribe(QObject *o, int notifyIndex, int subIndex)
+{
+    Q_Q(QDeclarativeCompiledBindings);
+
+    QDeclarativeCompiledBindingsPrivate::Subscription *sub = (subscriptions + subIndex);
+    
+    if (sub->isId())
+        unsubscribe(subIndex);
+
+    QDeclarativeCompiledBindingsPrivate::Subscription::Signal *s = sub->signal();
+    if (o != s->source || notifyIndex != s->notifyIndex)  {
+        if (s->source)
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
+            QMetaObject::disconnectOne(s->source, s->notifyIndex, 
+                                       q, methodCount + subIndex);
+#else
+            // QTBUG-6781
+            QMetaObject::disconnect(s->source, s->notifyIndex, 
+                                    q, methodCount + subIndex);
+#endif
+        s->source = o;
+        s->notifyIndex = notifyIndex;
+        if (s->source && s->notifyIndex != -1) 
+            QMetaObject::connect(s->source, s->notifyIndex, q,
+                                 methodCount + subIndex, Qt::DirectConnection);
+    } 
+}
+
+// Conversion functions - these MUST match the QtScript expression path
+inline static qreal toReal(Register *reg, int type, bool *ok = 0)
+{
+    if (ok) *ok = true;
+
+    if (type == QMetaType::QReal) {
+        return reg->getqreal();
+    } else if (type == qMetaTypeId<QVariant>()) {
+        return reg->getvariantptr()->toReal();
+    } else {
+        if (ok) *ok = false;
+        return 0;
+    }
+}
+
+inline static QString toString(Register *reg, int type, bool *ok = 0)
+{
+    if (ok) *ok = true;
+
+    if (type == QMetaType::QReal) {
+        return QString::number(reg->getqreal());
+    } else if (type == QMetaType::Int) {
+        return QString::number(reg->getint());
+    } else if (type == qMetaTypeId<QVariant>()) {
+        return reg->getvariantptr()->toString();
+    } else if (type == QMetaType::QString) {
+        return *reg->getstringptr();
+    } else {
+        if (ok) *ok = false;
+        return QString();
+    }
+}
+
+inline static bool toBool(Register *reg, int type, bool *ok = 0)
+{
+    if (ok) *ok = true;
+
+    if (type == QMetaType::Bool) {
+        return reg->getbool();
+    } else if (type == qMetaTypeId<QVariant>()) {
+        return reg->getvariantptr()->toBool();
+    } else {
+        if (ok) *ok = false;
+        return false;
+    }
+}
+
+inline static QUrl toUrl(Register *reg, int type, QDeclarativeContextPrivate *context, bool *ok = 0)
+{
+    if (ok) *ok = true;
+
+    QUrl base;
+    if (type == qMetaTypeId<QVariant>()) {
+        QVariant *var = reg->getvariantptr();
+        int vt = var->type();
+        if (vt == QVariant::Url) {
+            base = var->toUrl();
+        } else if (vt == QVariant::ByteArray) {
+            base = QUrl(QString::fromUtf8(var->toByteArray()));
+        } else if (vt == QVariant::String) {
+            base = QUrl(var->toString());
+        } else {
+            if (ok) *ok = false;
+            return QUrl();
+        }
+    } else if (type == QMetaType::QString) {
+        base = QUrl(*reg->getstringptr());
+    } else {
+        if (ok) *ok = false;
+        return QUrl();
+    }
+
+    if (!base.isEmpty() && base.isRelative())
+        return context->url.resolved(base);
+    else
+        return base;
+}
+
+static QObject *variantToQObject(const QVariant &value, bool *ok)
+{
+    if (ok) *ok = true;
+
+    if (value.userType() == QMetaType::QObjectStar) {
+        return qvariant_cast<QObject*>(value);
+    } else {
+        if (ok) *ok = false;
+        return 0;
+    }
+}
+
+bool QDeclarativeCompiledBindingsPrivate::findproperty(QObject *obj, Register *output, 
+                                              QDeclarativeEnginePrivate *enginePriv,
+                                              int subIdx, const QScriptDeclarativeClass::Identifier &name,
+                                              bool isTerminal)
+{
+    if (!obj) {
+        output->setUndefined();
+        return false;
+    }
+
+    QDeclarativePropertyCache::Data local;
+    QDeclarativePropertyCache::Data *property = 
+        QDeclarativePropertyCache::property(QDeclarativeEnginePrivate::get(enginePriv), obj, name, local);
+
+    if (property) {
+        if (subIdx != -1)
+            subscribe(obj, property->notifyIndex, subIdx);
+
+        if (property->flags & QDeclarativePropertyCache::Data::IsQObjectDerived) {
+            void *args[] = { output->typeDataPtr(), 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
+            output->settype(QMetaType::QObjectStar);
+        } else if (property->propType == qMetaTypeId<QVariant>()) {
+            QVariant v;
+            void *args[] = { &v, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
+
+            if (isTerminal) {
+                new (output->typeDataPtr()) QVariant(v);
+                output->settype(qMetaTypeId<QVariant>());
+            } else {
+                bool ok;
+                output->setQObject(variantToQObject(v, &ok));
+                if (!ok) 
+                    output->setUndefined();
+                else
+                    output->settype(QMetaType::QObjectStar);
+            }
+
+        } else {
+            if (!isTerminal) {
+                output->setUndefined();
+            } else if (property->propType == QMetaType::QReal) {
+                void *args[] = { output->typeDataPtr(), 0 };
+                QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
+                output->settype(QMetaType::QReal);
+            } else if (property->propType == QMetaType::Int) {
+                void *args[] = { output->typeDataPtr(), 0 };
+                QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
+                output->settype(QMetaType::Int);
+            } else if (property->propType == QMetaType::Bool) {
+                void *args[] = { output->typeDataPtr(), 0 };
+                QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
+                output->settype(QMetaType::Bool);
+            } else if (property->propType == QMetaType::QString) {
+                new (output->typeDataPtr()) QString();
+                void *args[] = { output->typeDataPtr(), 0 };
+                QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
+                output->settype(QMetaType::QString);
+            } else {
+                new (output->typeDataPtr()) 
+                    QVariant(obj->metaObject()->property(property->coreIndex).read(obj));
+                output->settype(qMetaTypeId<QVariant>());
+            }
+        }
+
+        return true;
+    } else {
+        output->setUndefined();
+        return false;
+    }
+}
+
+void QDeclarativeCompiledBindingsPrivate::findgeneric(Register *output, 
+                                             int subIdx,      
+                                             QDeclarativeContextPrivate *context,
+                                             const QScriptDeclarativeClass::Identifier &name, 
+                                             bool isTerminal)
+{
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(context->engine);
+
+    while (context) {
+
+        int contextPropertyIndex = context->propertyNames?context->propertyNames->value(name):-1;
+
+
+        if (contextPropertyIndex != -1) {
+
+            if (subIdx != -1) 
+                subscribe(QDeclarativeContextPrivate::get(context), contextPropertyIndex + context->notifyIndex, subIdx);
+
+            if (contextPropertyIndex < context->idValueCount) {
+                output->setQObject(context->idValues[contextPropertyIndex]);
+                output->settype(QMetaType::QObjectStar);
+            } else {
+                const QVariant &value = context->propertyValues.at(contextPropertyIndex);
+                if (isTerminal) {
+                    new (output->typeDataPtr()) QVariant(value);
+                    output->settype(qMetaTypeId<QVariant>());
+                } else {
+                    bool ok;
+                    output->setQObject(variantToQObject(value, &ok));
+                    if (!ok) { output->setUndefined(); }
+                    else { output->settype(QMetaType::QObjectStar); }
+                    return;
+                }
+            }
+
+            return;
+        }
+
+        for (int ii = 0; ii < context->scripts.count(); ++ii) {
+            QScriptValue function = QScriptDeclarativeClass::function(context->scripts.at(ii), name);
+            if (function.isValid()) {
+                qFatal("Binding optimizer resolved name to QScript method");
+            }
+        }
+
+        if (QObject *root = context->defaultObjects.isEmpty()?0:context->defaultObjects.first()) {
+
+            if (findproperty(root, output, enginePriv, subIdx, name, isTerminal))
+                return;
+
+        }
+
+        if (context->parent) {
+            context = QDeclarativeContextPrivate::get(context->parent);
+        } else {
+            context = 0;
+        }
+    }
+
+    output->setUndefined();
+}
+
+void QDeclarativeCompiledBindingsPrivate::init()
+{
+    Program *program = (Program *)programData;
+    if (program->subscriptions)
+        subscriptions = new QDeclarativeCompiledBindingsPrivate::Subscription[program->subscriptions];
+    if (program->identifiers)
+        identifiers = new QScriptDeclarativeClass::PersistentIdentifier[program->identifiers];
+
+    m_signalTable = (quint32 *)(program->data() + program->signalTableOffset);
+    m_bindings = new QDeclarativeCompiledBindingsPrivate::Binding[program->bindings];
+}
+
+static void throwException(int id, QDeclarativeDelayedError *error, 
+                           Program *program, QDeclarativeContextPrivate *context,
+                           const QString &description = QString())
+{
+    error->error.setUrl(context->url);
+    if (description.isEmpty())
+        error->error.setDescription(QLatin1String("TypeError: Result of expression is not an object"));
+    else
+        error->error.setDescription(description);
+    if (id != 0xFF) {
+        quint64 e = *((quint64 *)(program->data() + program->exceptionDataOffset) + id); 
+        error->error.setLine((e >> 32) & 0xFFFFFFFF);
+        error->error.setColumn(e & 0xFFFFFFFF); 
+    } else {
+        error->error.setLine(-1);
+        error->error.setColumn(-1);
+    }
+    if (!context->engine || !error->addError(QDeclarativeEnginePrivate::get(context->engine)))
+        qWarning() << error->error;
+}
+
+static void dumpInstruction(const Instr *instr)
+{
+    switch (instr->common.type) {
+    case Instr::Noop:
+        qWarning().nospace() << "Noop";
+        break;
+    case Instr::Subscribe:
+        qWarning().nospace() << "Subscribe" << "\t\t" << instr->subscribe.offset << "\t" << instr->subscribe.reg << "\t" << instr->subscribe.index;
+        break;
+    case Instr::SubscribeId:
+        qWarning().nospace() << "SubscribeId" << "\t\t" << instr->subscribe.offset << "\t" << instr->subscribe.reg << "\t" << instr->subscribe.index;
+        break;
+    case Instr::LoadId:
+        qWarning().nospace() << "LoadId" << "\t\t\t" << instr->load.index << "\t" << instr->load.reg;
+        break;
+    case Instr::LoadScope:
+        qWarning().nospace() << "LoadScope" << "\t\t" << instr->load.index << "\t" << instr->load.reg;
+        break;
+    case Instr::LoadRoot:
+        qWarning().nospace() << "LoadRoot" << "\t\t" << instr->load.index << "\t" << instr->load.reg;
+        break;
+    case Instr::LoadAttached:
+        qWarning().nospace() << "LoadAttached" << "\t\t" << instr->attached.output << "\t" << instr->attached.reg << "\t" << instr->attached.index;
+        break;
+    case Instr::ConvertIntToReal:
+        qWarning().nospace() << "ConvertIntToReal" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
+        break;
+    case Instr::ConvertRealToInt:
+        qWarning().nospace() << "ConvertRealToInt" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
+        break;
+    case Instr::Real:
+        qWarning().nospace() << "Real" << "\t\t\t" << instr->real_value.reg << "\t" << instr->real_value.value;
+        break;
+    case Instr::Int:
+        qWarning().nospace() << "Int" << "\t\t\t" << instr->int_value.reg << "\t" << instr->int_value.value;
+        break;
+    case Instr::Bool:
+        qWarning().nospace() << "Bool" << "\t\t\t" << instr->bool_value.reg << "\t" << instr->bool_value.value;
+        break;
+    case Instr::String:
+        qWarning().nospace() << "String" << "\t\t\t" << instr->string_value.reg << "\t" << instr->string_value.offset << "\t" << instr->string_value.length;
+        break;
+    case Instr::AddReal:
+        qWarning().nospace() << "AddReal" << "\t\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::AddInt:
+        qWarning().nospace() << "AddInt" << "\t\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::AddString:
+        qWarning().nospace() << "AddString" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::MinusReal:
+        qWarning().nospace() << "MinusReal" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::MinusInt:
+        qWarning().nospace() << "MinusInt" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::CompareReal:
+        qWarning().nospace() << "CompareReal" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::CompareString:
+        qWarning().nospace() << "CompareString" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::NotCompareReal:
+        qWarning().nospace() << "NotCompareReal" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::NotCompareString:
+        qWarning().nospace() << "NotCompareString" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::GreaterThanReal:
+        qWarning().nospace() << "GreaterThanReal" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::MaxReal:
+        qWarning().nospace() << "MaxReal" << "\t\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::MinReal:
+        qWarning().nospace() << "MinReal" << "\t\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
+        break;
+    case Instr::NewString:
+        qWarning().nospace() << "NewString" << "\t\t" << instr->construct.reg;
+        break;
+    case Instr::NewUrl:
+        qWarning().nospace() << "NewUrl" << "\t\t\t" << instr->construct.reg;
+        break;
+    case Instr::CleanupString:
+        qWarning().nospace() << "CleanupString" << "\t\t" << instr->cleanup.reg;
+        break;
+    case Instr::CleanupUrl:
+        qWarning().nospace() << "CleanupUrl" << "\t\t" << instr->cleanup.reg;
+        break;
+    case Instr::Fetch:
+        qWarning().nospace() << "Fetch" << "\t\t\t" << instr->fetch.output << "\t" << instr->fetch.index << "\t" << instr->fetch.objectReg;
+        break;
+    case Instr::Store:
+        qWarning().nospace() << "Store" << "\t\t\t" << instr->store.output << "\t" << instr->store.index << "\t" << instr->store.reg;
+        break;
+    case Instr::Copy:
+        qWarning().nospace() << "Copy" << "\t\t\t" << instr->copy.reg << "\t" << instr->copy.src;
+        break;
+    case Instr::Skip:
+        qWarning().nospace() << "Skip" << "\t\t\t" << instr->skip.reg << "\t" << instr->skip.count;
+        break;
+    case Instr::Done:
+        qWarning().nospace() << "Done";
+        break;
+    case Instr::InitString:
+        qWarning().nospace() << "InitString" << "\t\t" << instr->initstring.offset << "\t" << instr->initstring.dataIdx;
+        break;
+    case Instr::FindGeneric:
+        qWarning().nospace() << "FindGeneric" << "\t\t" << instr->find.reg << "\t" << instr->find.name;
+        break;
+    case Instr::FindGenericTerminal:
+        qWarning().nospace() << "FindGenericTerminal" << "\t" << instr->find.reg << "\t" <<  instr->find.name;
+        break;
+    case Instr::FindProperty:
+        qWarning().nospace() << "FindProperty" << "\t\t" << instr->find.reg << "\t" << instr->find.src << "\t" << instr->find.name;
+        break;
+    case Instr::FindPropertyTerminal:
+        qWarning().nospace() << "FindPropertyTerminal" << "\t" << instr->find.reg << "\t" << instr->find.src << "\t" << instr->find.name;
+        break;
+    case Instr::CleanupGeneric:
+        qWarning().nospace() << "CleanupGeneric" << "\t\t" << instr->cleanup.reg;
+        break;
+    case Instr::ConvertGenericToReal:
+        qWarning().nospace() << "ConvertGenericToReal" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
+        break;
+    case Instr::ConvertGenericToBool:
+        qWarning().nospace() << "ConvertGenericToBool" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
+        break;
+    case Instr::ConvertGenericToString:
+        qWarning().nospace() << "ConvertGenericToString" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
+        break;
+    case Instr::ConvertGenericToUrl:
+        qWarning().nospace() << "ConvertGenericToUrl" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
+        break;
+    default:
+        qWarning().nospace() << "Unknown";
+        break;
+    }
+}
+
+void QDeclarativeCompiledBindingsPrivate::run(int instrIndex,
+                                     QDeclarativeContextPrivate *context, QDeclarativeDelayedError *error,
+                                     QObject *scope, QObject *output)
+{
+    error->removeError();
+
+    Register registers[32];
+    int storeFlags = 0;
+
+    QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(context->engine);
+    Program *program = (Program *)programData;
+    const Instr *instr = program->instructions();
+    instr += instrIndex;
+    const char *data = program->data();
+
+#ifdef COMPILEDBINDINGS_DEBUG
+    qWarning().nospace() << "Begin binding run";
+#endif
+
+    while (instr) {
+#ifdef COMPILEDBINDINGS_DEBUG
+        dumpInstruction(instr);
+#endif
+
+    switch (instr->common.type) {
+    case Instr::Noop:
+        break;
+
+    case Instr::SubscribeId:
+        subscribeId(context, instr->subscribe.index, instr->subscribe.offset);
+        break;
+
+    case Instr::Subscribe:
+    {
+        QObject *o = 0;
+        const Register &object = registers[instr->subscribe.reg];
+        if (!object.isUndefined()) o = object.getQObject();
+        subscribe(o, instr->subscribe.index, instr->subscribe.offset);
+    }
+        break;
+
+    case Instr::LoadId:
+        registers[instr->load.reg].setQObject(context->idValues[instr->load.index].data());
+        break;
+
+    case Instr::LoadScope:
+        registers[instr->load.reg].setQObject(scope);
+        break;
+
+    case Instr::LoadRoot:
+        registers[instr->load.reg].setQObject(context->defaultObjects.at(0));
+        break;
+
+    case Instr::LoadAttached:
+    {
+        const Register &input = registers[instr->attached.reg];
+        Register &output = registers[instr->attached.output];
+        if (input.isUndefined()) {
+            throwException(instr->attached.exceptionId, error, program, context);
+            return;
+        }
+
+        QObject *object = registers[instr->attached.reg].getQObject();
+        if (!object) {
+            output.setUndefined();
+        } else {
+            QObject *attached = 
+                qmlAttachedPropertiesObjectById(instr->attached.index, 
+                                                registers[instr->attached.reg].getQObject(), 
+                                                true);
+            Q_ASSERT(attached);
+            output.setQObject(attached);
+        }
+    }
+        break;
+
+    case Instr::ConvertIntToReal:
+    {
+        const Register &input = registers[instr->unaryop.src];
+        Register &output = registers[instr->unaryop.output];
+        if (input.isUndefined()) output.setUndefined();
+        else output.setqreal(qreal(input.getint()));
+    }
+        break;
+
+    case Instr::ConvertRealToInt:
+    {
+        const Register &input = registers[instr->unaryop.src];
+        Register &output = registers[instr->unaryop.output];
+        if (input.isUndefined()) output.setUndefined();
+        else output.setint(int(input.getqreal()));
+    }
+        break;
+
+    case Instr::Real:
+        registers[instr->real_value.reg].setqreal(instr->real_value.value);
+        break;
+
+    case Instr::Int:
+        registers[instr->int_value.reg].setint(instr->int_value.value);
+        break;
+        
+    case Instr::Bool:
+        registers[instr->bool_value.reg].setbool(instr->bool_value.value);
+        break;
+
+    case Instr::String:
+    {
+        Register &output = registers[instr->string_value.reg];
+        new (output.getstringptr()) 
+            QString((QChar *)(data + instr->string_value.offset), instr->string_value.length);
+        output.settype(QMetaType::QString);
+    }
+        break;
+
+    case Instr::AddReal:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
+        else output.setqreal(lhs.getqreal() + rhs.getqreal());
+    }
+        break;
+
+    case Instr::AddInt:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
+        else output.setint(lhs.getint() + rhs.getint());
+    }
+        break;
+        
+    case Instr::AddString:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() && rhs.isUndefined()) { output.setNaN(); }
+        else {
+            if (lhs.isUndefined())
+                new (output.getstringptr())
+                    QString(QLatin1String("undefined") + *registers[instr->binaryop.src2].getstringptr());
+            else if (rhs.isUndefined())
+                new (output.getstringptr())
+                    QString(*registers[instr->binaryop.src1].getstringptr() + QLatin1String("undefined"));
+            else
+                new (output.getstringptr()) 
+                    QString(*registers[instr->binaryop.src1].getstringptr() + 
+                            *registers[instr->binaryop.src2].getstringptr());
+            output.settype(QMetaType::QString);
+        }
+    }
+        break;
+
+    case Instr::MinusReal:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
+        else output.setqreal(lhs.getqreal() - rhs.getqreal());
+    }
+        break;
+
+    case Instr::MinusInt:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
+        else output.setint(lhs.getint() - rhs.getint());
+    }
+        break;
+
+    case Instr::CompareReal:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(lhs.isUndefined() == rhs.isUndefined());
+        else output.setbool(lhs.getqreal() == rhs.getqreal());
+    }
+        break;
+
+    case Instr::CompareString:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(lhs.isUndefined() == rhs.isUndefined());
+        else output.setbool(*lhs.getstringptr() == *rhs.getstringptr());
+    }
+        break;
+
+    case Instr::NotCompareReal:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(lhs.isUndefined() != rhs.isUndefined());
+        else output.setbool(lhs.getqreal() != rhs.getqreal());
+    }
+        break;
+
+    case Instr::NotCompareString:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(lhs.isUndefined() != rhs.isUndefined());
+        else output.setbool(*lhs.getstringptr() != *rhs.getstringptr());
+    }
+        break;
+
+    case Instr::GreaterThanReal:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(false);
+        else output.setbool(lhs.getqreal() > rhs.getqreal());
+    }
+        break;
+
+    case Instr::MaxReal:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
+        else output.setqreal(qMax(lhs.getqreal(), rhs.getqreal()));
+    }
+        break;
+
+    case Instr::MinReal:
+    {
+        const Register &lhs = registers[instr->binaryop.src1];
+        const Register &rhs = registers[instr->binaryop.src2];
+        Register &output = registers[instr->binaryop.output];
+        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
+        else output.setqreal(qMin(lhs.getqreal(), rhs.getqreal()));
+    }
+        break;
+
+    case Instr::NewString:
+    {
+        Register &output = registers[instr->construct.reg];
+        new (output.getstringptr()) QString;
+        output.settype(QMetaType::QString);
+    }
+        break;
+
+    case Instr::NewUrl:
+    {
+        Register &output = registers[instr->construct.reg];
+        new (output.geturlptr()) QUrl;
+        output.settype(QMetaType::QUrl);
+    }
+        break;
+
+    case Instr::CleanupString:
+        registers[instr->cleanup.reg].getstringptr()->~QString();
+        break;
+
+    case Instr::CleanupUrl:
+        registers[instr->cleanup.reg].geturlptr()->~QUrl();
+        break;
+
+    case Instr::Fetch:
+    {
+        const Register &input = registers[instr->fetch.objectReg];
+        Register &output = registers[instr->fetch.output];
+
+        if (input.isUndefined()) {
+            throwException(instr->fetch.exceptionId, error, program, context);
+            return;
+        }
+
+        QObject *object = input.getQObject();
+        if (!object) {
+            output.setUndefined();
+        } else {
+            void *argv[] = { output.typeDataPtr(), 0 };
+            QMetaObject::metacall(object, QMetaObject::ReadProperty, instr->fetch.index, argv);
+        }
+    }
+        break;
+
+    case Instr::Store:
+    {
+        Register &data = registers[instr->store.reg];
+        if (data.isUndefined()) {
+            throwException(instr->store.exceptionId, error, program, context,
+                           QLatin1String("Unable to assign undefined value"));
+            return;
+        }
+
+        int status = -1;
+        void *argv[] = { data.typeDataPtr(), 0, &status, &storeFlags };
+        QMetaObject::metacall(output, QMetaObject::WriteProperty, 
+                              instr->store.index, argv);
+    }
+        break;
+
+    case Instr::Copy:
+        registers[instr->copy.reg] = registers[instr->copy.src];
+        break;
+
+    case Instr::Skip:
+        if (instr->skip.reg == -1 || !registers[instr->skip.reg].getbool()) 
+            instr += instr->skip.count;
+        break;
+
+    case Instr::Done:
+        return;
+
+    case Instr::InitString:
+        if (!identifiers[instr->initstring.offset].identifier) {
+            quint32 len = *(quint32 *)(data + instr->initstring.dataIdx);
+            QChar *strdata = (QChar *)(data + instr->initstring.dataIdx + sizeof(quint32)); 
+
+            QString str = QString::fromRawData(strdata, len);
+
+            identifiers[instr->initstring.offset] = engine->objectClass->createPersistentIdentifier(str);
+        }
+        break;
+
+    case Instr::FindGenericTerminal:
+    case Instr::FindGeneric:
+        // We start the search in the parent context, as we know that the 
+        // name is not present in the current context or it would have been
+        // found during the static compile
+        findgeneric(registers + instr->find.reg, instr->find.subscribeIndex, 
+                    QDeclarativeContextPrivate::get(context->parent),
+                    identifiers[instr->find.name].identifier, 
+                    instr->common.type == Instr::FindGenericTerminal);
+        break;
+
+    case Instr::FindPropertyTerminal:
+    case Instr::FindProperty:
+    {
+        const Register &object = registers[instr->find.src];
+        if (object.isUndefined()) {
+            throwException(instr->find.exceptionId, error, program, context);
+            return;
+        }
+
+        findproperty(object.getQObject(), registers + instr->find.reg, 
+                     QDeclarativeEnginePrivate::get(context->engine), 
+                     instr->find.subscribeIndex, identifiers[instr->find.name].identifier, 
+                     instr->common.type == Instr::FindPropertyTerminal);
+    }
+        break;
+
+    case Instr::CleanupGeneric:
+    {
+        int type = registers[instr->cleanup.reg].gettype();
+        if (type == qMetaTypeId<QVariant>()) {
+            registers[instr->cleanup.reg].getvariantptr()->~QVariant();
+        } else if (type == QMetaType::QString) {
+            registers[instr->cleanup.reg].getstringptr()->~QString();
+        } else if (type == QMetaType::QUrl) {
+            registers[instr->cleanup.reg].geturlptr()->~QUrl();
+        }
+    }
+        break;
+
+    case Instr::ConvertGenericToReal:
+    {
+        Register &output = registers[instr->unaryop.output];
+        Register &input = registers[instr->unaryop.src];
+        bool ok = true;
+        output.setqreal(toReal(&input, input.gettype(), &ok));
+        if (!ok) output.setUndefined();
+    }
+        break;
+
+    case Instr::ConvertGenericToBool:
+    {
+        Register &output = registers[instr->unaryop.output];
+        Register &input = registers[instr->unaryop.src];
+        bool ok = true;
+        output.setbool(toBool(&input, input.gettype(), &ok));
+        if (!ok) output.setUndefined();
+    }
+        break;
+
+    case Instr::ConvertGenericToString:
+    {
+        Register &output = registers[instr->unaryop.output];
+        Register &input = registers[instr->unaryop.src];
+        bool ok = true;
+        QString str = toString(&input, input.gettype(), &ok);
+        if (ok) { new (output.getstringptr()) QString(str); output.settype(QMetaType::QString); }
+        else { output.setUndefined(); }
+    }
+        break;
+
+    case Instr::ConvertGenericToUrl:
+    {
+        Register &output = registers[instr->unaryop.output];
+        Register &input = registers[instr->unaryop.src];
+        bool ok = true;
+        QUrl url = toUrl(&input, input.gettype(), context, &ok);
+        if (ok) { new (output.geturlptr()) QUrl(url); output.settype(QMetaType::QUrl); }
+        else { output.setUndefined(); }
+    }
+        break;
+
+    default:
+        qFatal("EEK");
+        break;
+    }
+
+    instr++;
+    }
+}
+
+void QDeclarativeBindingCompiler::dump(const QByteArray &programData)
+{
+    const Program *program = (const Program *)programData.constData();
+
+    qWarning() << "Program.bindings:" << program->bindings;
+    qWarning() << "Program.dataLength:" << program->dataLength;
+    qWarning() << "Program.subscriptions:" << program->subscriptions;
+    qWarning() << "Program.indentifiers:" << program->identifiers;
+
+    int count = program->instructionCount;
+    const Instr *instr = program->instructions();
+
+    while (count--) {
+
+        dumpInstruction(instr);
+        ++instr;
+    }
+}
+
+/*!
+Clear the state associated with attempting to compile a specific binding.
+This does not clear the global "commited binding" states.
+*/
+void QDeclarativeBindingCompilerPrivate::resetInstanceState()
+{
+    registers = 0;
+    registerCleanups.clear();
+    data = committed.data;
+    exceptions = committed.exceptions;
+    usedSubscriptionIds.clear();
+    subscriptionSet.clear();
+    subscriptionIds = committed.subscriptionIds;
+    registeredStrings = committed.registeredStrings;
+    bytecode.clear();
+}
+
+/*!
+Mark the last compile as successful, and add it to the "committed data"
+section.
+
+Returns the index for the committed binding.
+*/
+int QDeclarativeBindingCompilerPrivate::commitCompile()
+{
+    int rv = committed.count();
+    committed.offsets << committed.bytecode.count();
+    committed.dependencies << usedSubscriptionIds;
+    committed.bytecode << bytecode;
+    committed.data = data;
+    committed.exceptions = exceptions;
+    committed.subscriptionIds = subscriptionIds;
+    committed.registeredStrings = registeredStrings;
+    return rv;
+}
+
+bool QDeclarativeBindingCompilerPrivate::compile(QDeclarativeJS::AST::Node *node)
+{
+    resetInstanceState();
+
+    if (destination->type == -1)
+        return false;
+
+    Result type;
+
+    if (!parseExpression(node, type)) 
+        return false;
+
+    if (subscriptionSet.count() > 0xFFFF ||
+            registeredStrings.count() > 0xFFFF)
+        return false;
+
+    if (type.unknownType) {
+        if (destination->type != QMetaType::QReal &&
+            destination->type != QVariant::String &&
+            destination->type != QMetaType::Bool &&
+            destination->type != QVariant::Url)
+            return false;
+
+        int convertReg = acquireReg();
+
+        if (destination->type == QMetaType::QReal) {
+            Instr convert;
+            convert.common.type = Instr::ConvertGenericToReal;
+            convert.unaryop.output = convertReg;
+            convert.unaryop.src = type.reg;
+            bytecode << convert;
+        } else if (destination->type == QVariant::String) {
+            Instr convert;
+            convert.common.type = Instr::ConvertGenericToString;
+            convert.unaryop.output = convertReg;
+            convert.unaryop.src = type.reg;
+            bytecode << convert;
+        } else if (destination->type == QMetaType::Bool) {
+            Instr convert;
+            convert.common.type = Instr::ConvertGenericToBool;
+            convert.unaryop.output = convertReg;
+            convert.unaryop.src = type.reg;
+            bytecode << convert;
+        } else if (destination->type == QVariant::Url) {
+            Instr convert;
+            convert.common.type = Instr::ConvertGenericToUrl;
+            convert.unaryop.output = convertReg;
+            convert.unaryop.src = type.reg;
+            bytecode << convert;
+        }
+
+        Instr cleanup;
+        cleanup.common.type = Instr::CleanupGeneric;
+        cleanup.cleanup.reg = type.reg;
+        bytecode << cleanup;
+
+        Instr instr;
+        instr.common.type = Instr::Store;
+        instr.store.output = 0;
+        instr.store.index = destination->index;
+        instr.store.reg = convertReg;
+        instr.store.exceptionId = exceptionId(node->expressionCast());
+        bytecode << instr;
+
+        if (destination->type == QVariant::String) {
+            Instr cleanup;
+            cleanup.common.type = Instr::CleanupString;
+            cleanup.cleanup.reg = convertReg;
+            bytecode << cleanup;
+        } else if (destination->type == QVariant::Url) {
+            Instr cleanup;
+            cleanup.common.type = Instr::CleanupUrl;
+            cleanup.cleanup.reg = convertReg;
+            bytecode << cleanup;
+        }
+
+        releaseReg(convertReg);
+
+        Instr done;
+        done.common.type = Instr::Done;
+        bytecode << done;
+
+        return true;
+    } else {
+        // Can we store the final value?
+        if (type.type == QVariant::Int &&
+            destination->type == QMetaType::QReal) {
+            Instr instr;
+            instr.common.type = Instr::ConvertIntToReal;
+            instr.unaryop.output = type.reg;
+            instr.unaryop.src = type.reg;
+            bytecode << instr;
+            type.type = QMetaType::QReal;
+        } else if (type.type == QMetaType::QReal &&
+                   destination->type == QVariant::Int) {
+            Instr instr;
+            instr.common.type = Instr::ConvertRealToInt;
+            instr.unaryop.output = type.reg;
+            instr.unaryop.src = type.reg;
+            bytecode << instr;
+            type.type = QVariant::Int;
+        } else if (type.type == destination->type) {
+        } else {
+            const QMetaObject *from = type.metaObject;
+            const QMetaObject *to = engine->rawMetaObjectForType(destination->type);
+
+            if (QDeclarativeMetaPropertyPrivate::canConvert(from, to))
+                type.type = destination->type;
+        }
+
+        if (type.type == destination->type) {
+            Instr instr;
+            instr.common.type = Instr::Store;
+            instr.store.output = 0;
+            instr.store.index = destination->index;
+            instr.store.reg = type.reg;
+            instr.store.exceptionId = exceptionId(node->expressionCast());
+            bytecode << instr;
+
+            releaseReg(type.reg);
+
+            Instr done;
+            done.common.type = Instr::Done;
+            bytecode << done;
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
+
+bool QDeclarativeBindingCompilerPrivate::parseExpression(QDeclarativeJS::AST::Node *node, Result &type)
+{
+    while (node->kind == AST::Node::Kind_NestedExpression)
+        node = static_cast<AST::NestedExpression *>(node)->expression;
+
+    if (tryArith(node)) {
+        if (!parseArith(node, type)) return false;
+    } else if (tryLogic(node)) {
+        if (!parseLogic(node, type)) return false;
+    } else if (tryConditional(node)) {
+        if (!parseConditional(node, type)) return false;
+    } else if (tryName(node)) {
+        if (!parseName(node, type)) return false;
+    } else if (tryConstant(node)) {
+        if (!parseConstant(node, type)) return false;
+    } else if (tryMethod(node)) {
+        if (!parseMethod(node, type)) return false;
+    } else {
+        return false;
+    }
+    return true;
+}
+
+bool QDeclarativeBindingCompilerPrivate::tryName(QDeclarativeJS::AST::Node *node)
+{
+    return node->kind == AST::Node::Kind_IdentifierExpression ||
+           node->kind == AST::Node::Kind_FieldMemberExpression;
+}
+
+bool QDeclarativeBindingCompilerPrivate::parseName(AST::Node *node, Result &type)
+{
+    QStringList nameParts;
+    QList<AST::ExpressionNode *> nameNodes;
+    if (!buildName(nameParts, node, &nameNodes))
+        return false;
+
+    int reg = acquireReg();
+    if (reg == -1)
+        return false;
+    type.reg = reg;
+
+    QDeclarativeParser::Object *absType = 0;
+
+    QStringList subscribeName;
+
+    bool wasAttachedObject = false;
+
+    for (int ii = 0; ii < nameParts.count(); ++ii) {
+        const QString &name = nameParts.at(ii);
+
+        // We don't handle signal properties or attached properties
+        if (name.length() > 2 && name.startsWith(QLatin1String("on")) &&
+            name.at(2).isUpper())
+            return false;
+
+        QDeclarativeType *attachType = 0;
+        if (name.at(0).isUpper()) {
+            // Could be an attached property
+            if (ii == nameParts.count() - 1)
+                return false;
+            if (nameParts.at(ii + 1).at(0).isUpper())
+                return false;
+
+            QDeclarativeEnginePrivate::ImportedNamespace *ns = 0;
+            if (!engine->resolveType(imports, name.toUtf8(), &attachType, 0, 0, 0, &ns))
+                return false;
+            if (ns || !attachType || !attachType->attachedPropertiesType())
+                return false;
+
+            wasAttachedObject = true;
+        } 
+
+        if (ii == 0) {
+
+            if (attachType) {
+                Instr instr;
+                instr.common.type = Instr::LoadScope;
+                instr.load.index = 0;
+                instr.load.reg = reg;
+                bytecode << instr;
+
+                Instr attach;
+                attach.common.type = Instr::LoadAttached;
+                attach.attached.output = reg;
+                attach.attached.reg = reg;
+                attach.attached.index = attachType->index();
+                attach.attached.exceptionId = exceptionId(nameNodes.at(ii));
+                bytecode << attach;
+
+                subscribeName << contextName();
+                subscribeName << QLatin1String("$$$ATTACH_") + name;
+
+                absType = 0;
+                type.metaObject = attachType->attachedPropertiesType();
+
+                continue;
+            } else if (ids.contains(name)) {
+                QDeclarativeParser::Object *idObject = ids.value(name);
+                absType = idObject;
+                type.metaObject = absType->metaObject();
+
+                // We check if the id object is the root or 
+                // scope object to avoid a subscription
+                if (idObject == component) {
+                    Instr instr;
+                    instr.common.type = Instr::LoadRoot;
+                    instr.load.index = 0;
+                    instr.load.reg = reg;
+                    bytecode << instr;
+                } else if (idObject == context) {
+                    Instr instr;
+                    instr.common.type = Instr::LoadScope;
+                    instr.load.index = 0;
+                    instr.load.reg = reg;
+                    bytecode << instr;
+                } else {
+                    Instr instr;
+                    instr.common.type = Instr::LoadId;
+                    instr.load.index = idObject->idIndex;
+                    instr.load.reg = reg;
+                    bytecode << instr;
+
+                    subscribeName << QLatin1String("$$$ID_") + name;
+
+                    if (subscription(subscribeName, &type)) {
+                        Instr sub;
+                        sub.common.type = Instr::SubscribeId;
+                        sub.subscribe.offset = subscriptionIndex(subscribeName);
+                        sub.subscribe.reg = reg;
+                        sub.subscribe.index = instr.load.index;
+                        bytecode << sub;
+                    }
+                }
+
+            } else {
+
+                QByteArray utf8Name = name.toUtf8();
+                const char *cname = utf8Name.constData();
+
+                int d0Idx = (context == component)?-1:context->metaObject()->indexOfProperty(cname);
+                int d1Idx = -1;
+                if (d0Idx == -1)
+                    d1Idx = component->metaObject()->indexOfProperty(cname);
+
+                if (d0Idx != -1) {
+                    Instr instr;
+                    instr.common.type = Instr::LoadScope;
+                    instr.load.index = 0;
+                    instr.load.reg = reg;
+                    bytecode << instr;
+
+                    subscribeName << contextName();
+                    subscribeName << name;
+
+                    if (!fetch(type, context->metaObject(), reg, d0Idx, subscribeName, nameNodes.at(ii)))
+                        return false;
+                } else if(d1Idx != -1) {
+                    Instr instr;
+                    instr.common.type = Instr::LoadRoot;
+                    instr.load.index = 0;
+                    instr.load.reg = reg;
+                    bytecode << instr;
+
+                    subscribeName << QLatin1String("$$$ROOT");
+                    subscribeName << name;
+
+                    if (!fetch(type, component->metaObject(), reg, d1Idx, subscribeName, nameNodes.at(ii)))
+                        return false;
+                } else {
+                    Instr find;
+                    if (nameParts.count() == 1)
+                        find.common.type = Instr::FindGenericTerminal;
+                    else
+                        find.common.type = Instr::FindGeneric;
+
+                    find.find.reg = reg;
+                    find.find.src = -1;
+                    find.find.name = registerString(name);
+                    find.find.exceptionId = exceptionId(nameNodes.at(ii));
+
+                    subscribeName << QString(QLatin1String("$$$Generic_") + name);
+                    if (subscription(subscribeName, &type)) 
+                        find.find.subscribeIndex = subscriptionIndex(subscribeName);
+                    else
+                        find.find.subscribeIndex = -1;
+
+                    bytecode << find;
+                    type.unknownType = true;
+                } 
+
+                if (!type.unknownType && type.type == -1)
+                    return false; // Couldn't fetch that type
+            } 
+
+        } else {
+
+            if (attachType) {
+                Instr attach;
+                attach.common.type = Instr::LoadAttached;
+                attach.attached.output = reg;
+                attach.attached.reg = reg;
+                attach.attached.index = attachType->index();
+                bytecode << attach;
+
+                absType = 0;
+                type.metaObject = attachType->attachedPropertiesType();
+
+                subscribeName << QLatin1String("$$$ATTACH_") + name;
+                continue;
+            }
+
+            const QMetaObject *mo = 0;
+            if (absType)
+                mo = absType->metaObject();
+            else if (type.metaObject)
+                mo = type.metaObject;
+
+            QByteArray utf8Name = name.toUtf8();
+            const char *cname = utf8Name.constData();
+            int idx = mo?mo->indexOfProperty(cname):-1;
+            if (absType && idx == -1)
+                return false;
+
+            subscribeName << name;
+
+            if (absType || (wasAttachedObject && idx != -1) || (mo && mo->property(idx).isFinal())) {
+                absType = 0; 
+                if (!fetch(type, mo, reg, idx, subscribeName, nameNodes.at(ii)))
+                    return false;
+            } else {
+
+                Instr prop;
+                if (ii == nameParts.count() -1 ) 
+                    prop.common.type = Instr::FindPropertyTerminal;
+                else
+                    prop.common.type = Instr::FindProperty;
+
+                prop.find.reg = reg;
+                prop.find.src = reg;
+                prop.find.name = registerString(name);
+                prop.find.exceptionId = exceptionId(nameNodes.at(ii));
+
+                if (subscription(subscribeName, &type))
+                    prop.find.subscribeIndex = subscriptionIndex(subscribeName);
+                else
+                    prop.find.subscribeIndex = -1;
+
+                type.unknownType = true;
+                type.metaObject = 0;
+                type.type = -1;
+                type.reg = reg;
+                bytecode << prop;
+            }
+        }
+
+        wasAttachedObject = false;
+    }
+
+    return true;
+}
+
+bool QDeclarativeBindingCompilerPrivate::tryArith(QDeclarativeJS::AST::Node *node)
+{
+    if (node->kind != AST::Node::Kind_BinaryExpression)
+        return false;
+
+    AST::BinaryExpression *expression = static_cast<AST::BinaryExpression *>(node);
+    if (expression->op == QSOperator::Add ||
+        expression->op == QSOperator::Sub)
+        return true;
+    else
+        return false;
+}
+
+bool QDeclarativeBindingCompilerPrivate::parseArith(QDeclarativeJS::AST::Node *node, Result &type)
+{
+    AST::BinaryExpression *expression = static_cast<AST::BinaryExpression *>(node);
+
+    type.reg = acquireReg();
+
+    Result lhs;
+    Result rhs;
+
+    if (!parseExpression(expression->left, lhs)) return false;
+    if (!parseExpression(expression->right, rhs)) return false;
+
+    if ((lhs.type == QVariant::Int || lhs.type == QMetaType::QReal) &&
+        (rhs.type == QVariant::Int || rhs.type == QMetaType::QReal))
+        return numberArith(type, lhs, rhs, (QSOperator::Op)expression->op);
+    else if(expression->op == QSOperator::Sub)
+        return numberArith(type, lhs, rhs, (QSOperator::Op)expression->op);
+    else if ((lhs.type == QMetaType::QString || lhs.unknownType) && 
+             (rhs.type == QMetaType::QString || rhs.unknownType) && 
+             (lhs.type == QMetaType::QString || rhs.type == QMetaType::QString))
+        return stringArith(type, lhs, rhs, (QSOperator::Op)expression->op);
+    else
+        return false;
+}
+
+bool QDeclarativeBindingCompilerPrivate::numberArith(Result &type, const Result &lhs, const Result &rhs, QSOperator::Op op)
+{
+    bool nativeReal = rhs.type == QMetaType::QReal ||
+                      lhs.type == QMetaType::QReal ||
+                      lhs.unknownType ||
+                      rhs.unknownType;
+
+    if (nativeReal && lhs.type == QMetaType::Int) {
+        Instr convert;
+        convert.common.type = Instr::ConvertIntToReal;
+        convert.unaryop.output = lhs.reg;
+        convert.unaryop.src = lhs.reg;
+        bytecode << convert;
+    }
+
+    if (nativeReal && rhs.type == QMetaType::Int) {
+        Instr convert;
+        convert.common.type = Instr::ConvertIntToReal;
+        convert.unaryop.output = rhs.reg;
+        convert.unaryop.src = rhs.reg;
+        bytecode << convert;
+    }
+
+    int lhsTmp = -1;
+    int rhsTmp = -1;
+    if (lhs.unknownType) {
+        lhsTmp = acquireReg();
+
+        Instr conv;
+        conv.common.type = Instr::ConvertGenericToReal;
+        conv.unaryop.output = lhsTmp;
+        conv.unaryop.src = lhs.reg;
+        bytecode << conv;
+    }
+
+    if (rhs.unknownType) {
+        rhsTmp = acquireReg();
+
+        Instr conv;
+        conv.common.type = Instr::ConvertGenericToReal;
+        conv.unaryop.output = rhsTmp;
+        conv.unaryop.src = rhs.reg;
+        bytecode << conv;
+    }
+
+    Instr arith;
+    if (op == QSOperator::Add) {
+        arith.common.type = nativeReal?Instr::AddReal:Instr::AddInt;
+    } else if (op == QSOperator::Sub) {
+        arith.common.type = nativeReal?Instr::MinusReal:Instr::MinusInt;
+    } else {
+        qFatal("Unsupported arithmetic operator");
+    }
+
+    arith.binaryop.output = type.reg;
+    arith.binaryop.src1 = (lhsTmp == -1)?lhs.reg:lhsTmp;
+    arith.binaryop.src2 = (rhsTmp == -1)?rhs.reg:rhsTmp;
+    bytecode << arith;
+
+    type.metaObject = 0;
+    type.type = nativeReal?QMetaType::QReal:QMetaType::Int;
+    type.subscriptionSet.unite(lhs.subscriptionSet);
+    type.subscriptionSet.unite(rhs.subscriptionSet);
+
+    if (lhsTmp != -1) releaseReg(lhsTmp);
+    if (rhsTmp != -1) releaseReg(rhsTmp);
+    releaseReg(lhs.reg);
+    releaseReg(rhs.reg);
+
+    return true;
+}
+
+bool QDeclarativeBindingCompilerPrivate::stringArith(Result &type, const Result &lhs, const Result &rhs, QSOperator::Op op)
+{
+    if (op != QSOperator::Add)
+        return false;
+
+    int lhsTmp = -1;
+    int rhsTmp = -1;
+
+    if (lhs.unknownType) {
+        lhsTmp = acquireReg(Instr::CleanupString);
+
+        Instr convert;
+        convert.common.type = Instr::ConvertGenericToString;
+        convert.unaryop.output = lhsTmp;
+        convert.unaryop.src = lhs.reg;
+        bytecode << convert;
+    }
+
+    if (rhs.unknownType) {
+        rhsTmp = acquireReg(Instr::CleanupString);
+
+        Instr convert;
+        convert.common.type = Instr::ConvertGenericToString;
+        convert.unaryop.output = rhsTmp;
+        convert.unaryop.src = rhs.reg;
+        bytecode << convert;
+    }
+
+    type.reg = acquireReg(Instr::CleanupString);
+    type.type = QMetaType::QString;
+
+    Instr add;
+    add.common.type = Instr::AddString;
+    add.binaryop.output = type.reg;
+    add.binaryop.src1 = (lhsTmp == -1)?lhs.reg:lhsTmp;
+    add.binaryop.src2 = (rhsTmp == -1)?rhs.reg:rhsTmp;
+    bytecode << add;
+
+    if (lhsTmp != -1) releaseReg(lhsTmp);
+    if (rhsTmp != -1) releaseReg(rhsTmp);
+
+    return true;
+}
+
+bool QDeclarativeBindingCompilerPrivate::tryLogic(QDeclarativeJS::AST::Node *node)
+{
+    if (node->kind != AST::Node::Kind_BinaryExpression)
+        return false;
+
+    AST::BinaryExpression *expression = static_cast<AST::BinaryExpression *>(node);
+    if (expression->op == QSOperator::Gt ||
+        expression->op == QSOperator::Equal ||
+        expression->op == QSOperator::NotEqual)
+        return true;
+    else
+        return false;
+}
+
+bool QDeclarativeBindingCompilerPrivate::parseLogic(QDeclarativeJS::AST::Node *node, Result &type)
+{
+    AST::BinaryExpression *expression = static_cast<AST::BinaryExpression *>(node);
+
+    Result lhs;
+    Result rhs;
+
+    if (!parseExpression(expression->left, lhs)) return false;
+    if (!parseExpression(expression->right, rhs)) return false;
+
+    type.reg = acquireReg();
+    type.metaObject = 0;
+    type.type = QVariant::Bool;
+
+    if (lhs.type == QMetaType::QReal && rhs.type == QMetaType::QReal) {
+
+        Instr op;
+        if (expression->op == QSOperator::Gt)
+            op.common.type = Instr::GreaterThanReal;
+        else if (expression->op == QSOperator::Equal)
+            op.common.type = Instr::CompareReal;
+        else if (expression->op == QSOperator::NotEqual)
+            op.common.type = Instr::NotCompareReal;
+        else
+            return false;
+        op.binaryop.output = type.reg;
+        op.binaryop.src1 = lhs.reg;
+        op.binaryop.src2 = rhs.reg;
+        bytecode << op;
+
+
+    } else if (lhs.type == QMetaType::QString && rhs.type == QMetaType::QString) {
+
+        Instr op;
+        if (expression->op == QSOperator::Equal)
+            op.common.type = Instr::CompareString;
+        else if (expression->op == QSOperator::NotEqual)
+            op.common.type = Instr::NotCompareString;
+        else
+            return false;
+        op.binaryop.output = type.reg;
+        op.binaryop.src1 = lhs.reg;
+        op.binaryop.src2 = rhs.reg;
+        bytecode << op;
+
+    } else {
+        return false;
+    }
+
+    releaseReg(lhs.reg);
+    releaseReg(rhs.reg);
+
+    return true;
+}
+
+bool QDeclarativeBindingCompilerPrivate::tryConditional(QDeclarativeJS::AST::Node *node)
+{
+    return (node->kind == AST::Node::Kind_ConditionalExpression);
+}
+
+bool QDeclarativeBindingCompilerPrivate::parseConditional(QDeclarativeJS::AST::Node *node, Result &type)
+{
+    AST::ConditionalExpression *expression = static_cast<AST::ConditionalExpression *>(node);
+
+    AST::Node *test = expression->expression;
+    if (test->kind == AST::Node::Kind_NestedExpression)
+        test = static_cast<AST::NestedExpression*>(test)->expression;
+
+    Result etype;
+    if (!parseExpression(test, etype)) return false;
+
+    if (etype.type != QVariant::Bool) 
+        return false;
+
+    Instr skip;
+    skip.common.type = Instr::Skip;
+    skip.skip.reg = etype.reg;
+    skip.skip.count = 0;
+    int skipIdx = bytecode.count();
+    bytecode << skip;
+
+    // Release to allow reuse of reg
+    releaseReg(etype.reg);
+
+    QSet<QString> preSubSet = subscriptionSet;
+
+    // int preConditionalSubscriptions = subscriptionSet.count();
+
+    Result ok;
+    if (!parseExpression(expression->ok, ok)) return false;
+    if (ok.unknownType) return false;
+
+    int skipIdx2 = bytecode.count();
+    skip.skip.reg = -1;
+    bytecode << skip;
+
+    // Release to allow reuse of reg
+    releaseReg(ok.reg);
+    bytecode[skipIdx].skip.count = bytecode.count() - skipIdx - 1;
+
+    subscriptionSet = preSubSet;
+
+    Result ko;
+    if (!parseExpression(expression->ko, ko)) return false;
+    if (ko.unknownType) return false;
+
+    // Release to allow reuse of reg
+    releaseReg(ko.reg);
+    bytecode[skipIdx2].skip.count = bytecode.count() - skipIdx2 - 1;
+
+    if (ok != ko)
+        return false; // Must be same type and in same register
+
+    subscriptionSet = preSubSet;
+
+    if (!subscriptionNeutral(subscriptionSet, ok.subscriptionSet, ko.subscriptionSet))
+        return false; // Conditionals cannot introduce new subscriptions
+
+    type = ok;
+
+    return true;
+}
+
+bool QDeclarativeBindingCompilerPrivate::tryConstant(QDeclarativeJS::AST::Node *node)
+{
+    return node->kind == AST::Node::Kind_TrueLiteral ||
+           node->kind == AST::Node::Kind_FalseLiteral ||
+           node->kind == AST::Node::Kind_NumericLiteral ||
+           node->kind == AST::Node::Kind_StringLiteral;
+}
+
+bool QDeclarativeBindingCompilerPrivate::parseConstant(QDeclarativeJS::AST::Node *node, Result &type)
+{
+    type.metaObject = 0;
+    type.type = -1;
+    type.reg = acquireReg();
+
+    if (node->kind == AST::Node::Kind_TrueLiteral) {
+        type.type = QVariant::Bool;
+        Instr instr;
+        instr.common.type = Instr::Bool;
+        instr.bool_value.reg = type.reg;
+        instr.bool_value.value = true;
+        bytecode << instr;
+        return true;
+    } else if (node->kind == AST::Node::Kind_FalseLiteral) {
+        type.type = QVariant::Bool;
+        Instr instr;
+        instr.common.type = Instr::Bool;
+        instr.bool_value.reg = type.reg;
+        instr.bool_value.value = false;
+        bytecode << instr;
+        return true;
+    } else if (node->kind == AST::Node::Kind_NumericLiteral) {
+        qreal value = qreal(static_cast<AST::NumericLiteral *>(node)->value);
+
+        if (qreal(float(value)) != value)
+            return false;
+
+        type.type = QMetaType::QReal;
+        Instr instr;
+        instr.common.type = Instr::Real;
+        instr.real_value.reg = type.reg;
+        instr.real_value.value = float(value);
+        bytecode << instr;
+        return true;
+    } else if (node->kind == AST::Node::Kind_StringLiteral) {
+        QString str = static_cast<AST::StringLiteral *>(node)->value->asString();
+        type.type = QMetaType::QString;
+        type.reg = registerLiteralString(str);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool QDeclarativeBindingCompilerPrivate::tryMethod(QDeclarativeJS::AST::Node *node)
+{
+    return node->kind == AST::Node::Kind_CallExpression; 
+}
+
+bool QDeclarativeBindingCompilerPrivate::parseMethod(QDeclarativeJS::AST::Node *node, Result &result)
+{
+    AST::CallExpression *expr = static_cast<AST::CallExpression *>(node);
+
+    QStringList name;
+    if (!buildName(name, expr->base))
+        return false;
+
+    if (name.count() != 2 || name.at(0) != QLatin1String("Math"))
+        return false;
+
+    QString method = name.at(1);
+
+    AST::ArgumentList *args = expr->arguments;
+    if (!args) return false;
+    AST::ExpressionNode *arg0 = args->expression;
+    args = args->next;
+    if (!args) return false;
+    AST::ExpressionNode *arg1 = args->expression;
+    if (args->next != 0) return false;
+    if (!arg0 || !arg1) return false;
+
+    Result r0;
+    if (!parseExpression(arg0, r0)) return false;
+    Result r1;
+    if (!parseExpression(arg1, r1)) return false;
+
+    if (r0.type != QMetaType::QReal || r1.type != QMetaType::QReal)
+        return false;
+
+    Instr op;
+    if (method == QLatin1String("max")) {
+        op.common.type = Instr::MaxReal;
+    } else if (method == QLatin1String("min")) {
+        op.common.type = Instr::MinReal;
+    } else {
+        return false;
+    }
+    // We release early to reuse registers
+    releaseReg(r0.reg);
+    releaseReg(r1.reg);
+
+    op.binaryop.output = acquireReg();
+    op.binaryop.src1 = r0.reg;
+    op.binaryop.src2 = r1.reg;
+    bytecode << op;
+
+    result.type = QMetaType::QReal;
+    result.reg = op.binaryop.output;
+
+    return true;
+}
+
+bool QDeclarativeBindingCompilerPrivate::buildName(QStringList &name,
+                                       QDeclarativeJS::AST::Node *node,
+                                       QList<QDeclarativeJS::AST::ExpressionNode *> *nodes)
+{
+    if (node->kind == AST::Node::Kind_IdentifierExpression) {
+        name << static_cast<AST::IdentifierExpression*>(node)->name->asString();
+        if (nodes) *nodes << static_cast<AST::IdentifierExpression*>(node);
+    } else if (node->kind == AST::Node::Kind_FieldMemberExpression) {
+        AST::FieldMemberExpression *expr =
+            static_cast<AST::FieldMemberExpression *>(node);
+
+        if (!buildName(name, expr->base, nodes))
+            return false;
+
+        name << expr->name->asString();
+        if (nodes) *nodes << expr;
+    } else {
+        return false;
+    }
+
+    return true;
+}
+
+
+bool QDeclarativeBindingCompilerPrivate::fetch(Result &rv, const QMetaObject *mo, int reg, 
+                                      int idx, const QStringList &subName, QDeclarativeJS::AST::ExpressionNode *node)
+{
+    QMetaProperty prop = mo->property(idx);
+    rv.metaObject = 0;
+    rv.type = 0;
+
+    if (subscription(subName, &rv) && prop.hasNotifySignal() && prop.notifySignalIndex() != -1) {
+        Instr sub;
+        sub.common.type = Instr::Subscribe;
+        sub.subscribe.offset = subscriptionIndex(subName);
+        sub.subscribe.reg = reg;
+        sub.subscribe.index = prop.notifySignalIndex();
+        bytecode << sub;
+    }
+
+    Instr fetch;
+    fetch.common.type = Instr::Fetch;
+    fetch.fetch.objectReg = reg;
+    fetch.fetch.index = idx;
+    fetch.fetch.output = reg;
+    fetch.fetch.exceptionId = exceptionId(node);
+
+    rv.type = prop.userType();
+    rv.metaObject = engine->metaObjectForType(rv.type);
+    rv.reg = reg;
+
+    if (rv.type == QMetaType::QString) {
+        int tmp = acquireReg();
+        Instr copy;
+        copy.common.type = Instr::Copy;
+        copy.copy.reg = tmp;
+        copy.copy.src = reg;
+        bytecode << copy;
+        releaseReg(tmp);
+        fetch.fetch.objectReg = tmp;
+
+        Instr setup;
+        setup.common.type = Instr::NewString;
+        setup.construct.reg = reg;
+        bytecode << setup;
+        registerCleanup(reg, Instr::CleanupString);
+    }
+
+    bytecode << fetch;
+
+    if (!rv.metaObject &&
+        rv.type != QMetaType::QReal &&
+        rv.type != QMetaType::Int &&
+        rv.type != QMetaType::Bool &&
+        rv.type != qMetaTypeId<QDeclarativeAnchorLine>() &&
+        rv.type != QMetaType::QString) {
+        rv.metaObject = 0;
+        rv.type = 0;
+        return false; // Unsupported type (string not supported yet);
+    }
+
+    return true;
+}
+
+void QDeclarativeBindingCompilerPrivate::registerCleanup(int reg, int cleanup, int cleanupType)
+{
+    registerCleanups.insert(reg, qMakePair(cleanup, cleanupType));
+}
+
+int QDeclarativeBindingCompilerPrivate::acquireReg(int cleanup, int cleanupType)
+{
+    for (int ii = 0; ii < 32; ++ii) {
+        if (!(registers & (1 << ii))) {
+            registers |= (1 << ii);
+
+            if (cleanup != Instr::Noop)
+                registerCleanup(ii, cleanup, cleanupType);
+
+            return ii;
+        }
+    }
+    return -1;
+}
+
+void QDeclarativeBindingCompilerPrivate::releaseReg(int reg)
+{
+    Q_ASSERT(reg >= 0 && reg <= 31);
+
+    if (registerCleanups.contains(reg)) {
+        QPair<int, int> c = registerCleanups[reg];
+        registerCleanups.remove(reg);
+        Instr cleanup;
+        cleanup.common.type = (quint8)c.first;
+        cleanup.cleanup.reg = reg;
+        bytecode << cleanup;
+    }
+
+    quint32 mask = 1 << reg;
+    registers &= ~mask;
+}
+
+// Returns a reg
+int QDeclarativeBindingCompilerPrivate::registerLiteralString(const QString &str)
+{
+    QByteArray strdata((const char *)str.constData(), str.length() * sizeof(QChar));
+    int offset = data.count();
+    data += strdata;
+
+    int reg = acquireReg(Instr::CleanupString);
+
+    Instr string;
+    string.common.type = Instr::String;
+    string.string_value.reg = reg;
+    string.string_value.offset = offset;
+    string.string_value.length = str.length();
+    bytecode << string;
+
+    return reg;
+}
+
+// Returns an identifier offset
+int QDeclarativeBindingCompilerPrivate::registerString(const QString &string)
+{
+    Q_ASSERT(!string.isEmpty());
+
+    QHash<QString, QPair<int, int> >::ConstIterator iter = registeredStrings.find(string);
+
+    if (iter == registeredStrings.end()) {
+        quint32 len = string.length();
+        QByteArray lendata((const char *)&len, sizeof(quint32));
+        QByteArray strdata((const char *)string.constData(), string.length() * sizeof(QChar));
+        strdata.prepend(lendata);
+        int rv = data.count();
+        data += strdata;
+
+        iter = registeredStrings.insert(string, qMakePair(registeredStrings.count(), rv));
+    } 
+
+    Instr reg;
+    reg.common.type = Instr::InitString;
+    reg.initstring.offset = iter->first;
+    reg.initstring.dataIdx = iter->second;
+    bytecode << reg;
+    return reg.initstring.offset;
+}
+
+bool QDeclarativeBindingCompilerPrivate::subscription(const QStringList &sub, Result *result)
+{
+    QString str = sub.join(QLatin1String("."));
+    result->subscriptionSet.insert(str);
+
+    if (subscriptionSet.contains(str)) {
+        return false;
+    } else {
+        subscriptionSet.insert(str);
+        return true;
+    }
+}
+
+int QDeclarativeBindingCompilerPrivate::subscriptionIndex(const QStringList &sub)
+{
+    QString str = sub.join(QLatin1String("."));
+    QHash<QString, int>::ConstIterator iter = subscriptionIds.find(str);
+    if (iter == subscriptionIds.end()) 
+        iter = subscriptionIds.insert(str, subscriptionIds.count());
+    usedSubscriptionIds.insert(*iter);
+    return *iter;
+}
+
+/*
+    Returns true if lhs contains no subscriptions that aren't also in base or rhs AND
+    rhs contains no subscriptions that aren't also in base or lhs.
+*/ 
+bool QDeclarativeBindingCompilerPrivate::subscriptionNeutral(const QSet<QString> &base, 
+                                             const QSet<QString> &lhs, 
+                                             const QSet<QString> &rhs)
+{
+    QSet<QString> difflhs = lhs;
+    difflhs.subtract(rhs);
+    QSet<QString> diffrhs = rhs;
+    diffrhs.subtract(lhs);
+
+    difflhs.unite(diffrhs);
+    difflhs.subtract(base);
+
+    return difflhs.isEmpty();
+}
+
+quint8 QDeclarativeBindingCompilerPrivate::exceptionId(QDeclarativeJS::AST::ExpressionNode *n)
+{
+    quint8 rv = 0xFF;
+    if (n && exceptions.count() < 0xFF) {
+        rv = (quint8)exceptions.count();
+        QDeclarativeJS::AST::SourceLocation l = n->firstSourceLocation();
+        quint64 e = l.startLine;
+        e <<= 32;
+        e |= l.startColumn;
+        exceptions.append(e);
+    }
+    return rv;
+}
+
+QDeclarativeBindingCompiler::QDeclarativeBindingCompiler()
+: d(new QDeclarativeBindingCompilerPrivate)
+{
+}
+
+QDeclarativeBindingCompiler::~QDeclarativeBindingCompiler()
+{
+    delete d; d = 0;
+}
+
+/* 
+Returns true if any bindings were compiled.
+*/
+bool QDeclarativeBindingCompiler::isValid() const
+{
+    return !d->committed.bytecode.isEmpty();
+}
+
+/* 
+-1 on failure, otherwise the binding index to use.
+*/
+int QDeclarativeBindingCompiler::compile(const Expression &expression, QDeclarativeEnginePrivate *engine)
+{
+    if (!expression.expression.asAST()) return false;
+
+    d->context = expression.context;
+    d->component = expression.component;
+    d->destination = expression.property;
+    d->ids = expression.ids;
+    d->imports = expression.imports;
+    d->engine = engine;
+
+    if (d->compile(expression.expression.asAST())) {
+        return d->commitCompile();
+    } else {
+        return -1;
+    }
+}
+
+
+QByteArray QDeclarativeBindingCompilerPrivate::buildSignalTable() const
+{
+    QHash<int, QList<int> > table;
+
+    for (int ii = 0; ii < committed.count(); ++ii) {
+        const QSet<int> &deps = committed.dependencies.at(ii);
+        for (QSet<int>::ConstIterator iter = deps.begin(); iter != deps.end(); ++iter) 
+            table[*iter].append(ii);
+    }
+
+    QVector<quint32> header;
+    QVector<quint32> data;
+    for (int ii = 0; ii < committed.subscriptionIds.count(); ++ii) {
+        header.append(committed.subscriptionIds.count() + data.count());
+        const QList<int> &bindings = table[ii];
+        data.append(bindings.count());
+        for (int jj = 0; jj < bindings.count(); ++jj)
+            data.append(bindings.at(jj));
+    }
+    header << data;
+
+    return QByteArray((const char *)header.constData(), header.count() * sizeof(quint32));
+}
+
+QByteArray QDeclarativeBindingCompilerPrivate::buildExceptionData() const
+{
+    QByteArray rv;
+    rv.resize(committed.exceptions.count() * sizeof(quint64));
+    ::memcpy(rv.data(), committed.exceptions.constData(), rv.size());
+    return rv;
+}
+
+/* 
+Returns the compiled program.
+*/
+QByteArray QDeclarativeBindingCompiler::program() const
+{
+    QByteArray programData;
+
+    if (isValid()) {
+        Program prog;
+        prog.bindings = d->committed.count();
+
+        QVector<Instr> bytecode;
+        Instr skip;
+        skip.common.type = Instr::Skip;
+        skip.skip.reg = -1;
+        for (int ii = 0; ii < d->committed.count(); ++ii) {
+            skip.skip.count = d->committed.count() - ii - 1;
+            skip.skip.count+= d->committed.offsets.at(ii);
+            bytecode << skip;
+        }
+        bytecode << d->committed.bytecode;
+
+        QByteArray data = d->committed.data;
+        while (data.count() % 4) data.append('\0');
+        prog.signalTableOffset = data.count();
+        data += d->buildSignalTable();
+        while (data.count() % 4) data.append('\0');
+        prog.exceptionDataOffset = data.count();
+        data += d->buildExceptionData();
+
+        prog.dataLength = 4 * ((data.size() + 3) / 4);
+        prog.subscriptions = d->committed.subscriptionIds.count();
+        prog.identifiers = d->committed.registeredStrings.count();
+        prog.instructionCount = bytecode.count();
+        int size = sizeof(Program) + bytecode.count() * sizeof(Instr);
+        size += prog.dataLength;
+
+        programData.resize(size);
+        memcpy(programData.data(), &prog, sizeof(Program));
+        if (prog.dataLength)
+            memcpy((char *)((Program *)programData.data())->data(), data.constData(), 
+                   data.size());
+        memcpy((char *)((Program *)programData.data())->instructions(), bytecode.constData(), 
+               bytecode.count() * sizeof(Instr));
+    } 
+
+    return programData;
+}
+
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecompiledbindings_p.h b/src/declarative/qml/qdeclarativecompiledbindings_p.h
new file mode 100644
index 0000000..2e24371
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecompiledbindings_p.h
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEBINDINGOPTIMIZATIONS_P_H
+#define QDECLARATIVEBINDINGOPTIMIZATIONS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeexpression_p.h"
+#include "qdeclarativebinding_p.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeBindingCompilerPrivate;
+class QDeclarativeBindingCompiler
+{
+public:
+    QDeclarativeBindingCompiler();
+    ~QDeclarativeBindingCompiler();
+
+    // Returns true if bindings were compiled
+    bool isValid() const;
+
+    struct Expression
+    {
+        QDeclarativeParser::Object *component;
+        QDeclarativeParser::Object *context;
+        QDeclarativeParser::Property *property;
+        QDeclarativeParser::Variant expression;
+        QHash<QString, QDeclarativeParser::Object *> ids;
+        QDeclarativeEnginePrivate::Imports imports;
+    };
+
+    // -1 on failure, otherwise the binding index to use
+    int compile(const Expression &, QDeclarativeEnginePrivate *);
+
+    // Returns the compiled program
+    QByteArray program() const;
+
+    static void dump(const QByteArray &);
+private:
+    QDeclarativeBindingCompilerPrivate *d;
+};
+
+class QDeclarativeCompiledBindingsPrivate;
+class QDeclarativeCompiledBindings : public QObject, public QDeclarativeAbstractExpression, public QDeclarativeRefCount
+{
+public:
+    QDeclarativeCompiledBindings(const char *program, QDeclarativeContext *context);
+    virtual ~QDeclarativeCompiledBindings();
+
+    QDeclarativeAbstractBinding *configBinding(int index, QObject *target, QObject *scope, int property);
+
+protected:
+    int qt_metacall(QMetaObject::Call, int, void **);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeCompiledBindings);
+    Q_DECLARE_PRIVATE(QDeclarativeCompiledBindings);
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEBINDINGOPTIMIZATIONS_P_H
+
diff --git a/src/declarative/qml/qdeclarativecompileddata.cpp b/src/declarative/qml/qdeclarativecompileddata.cpp
new file mode 100644
index 0000000..bdf16a3
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecompileddata.cpp
@@ -0,0 +1,239 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativecomponent.h"
+#include "qdeclarativecomponent_p.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativecontext_p.h"
+
+#include <QtCore/qdebug.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+int QDeclarativeCompiledData::pack(const char *data, size_t size)
+{
+    const char *p = packData.constData();
+    unsigned int ps = packData.size();
+
+    for (unsigned int ii = 0; (ii + size) <= ps; ii += sizeof(int)) {
+        if (0 == ::memcmp(p + ii, data, size))
+            return ii;
+    }
+
+    int rv = packData.size();
+    packData.append(data, size);
+    return rv;
+}
+
+int QDeclarativeCompiledData::indexForString(const QString &data)
+{
+    int idx = primitives.indexOf(data);
+    if (idx == -1) {
+        idx = primitives.count();
+        primitives << data;
+    }
+    return idx;
+}
+
+int QDeclarativeCompiledData::indexForByteArray(const QByteArray &data)
+{
+    int idx = datas.indexOf(data);
+    if (idx == -1) {
+        idx = datas.count();
+        datas << data;
+    }
+    return idx;
+}
+
+int QDeclarativeCompiledData::indexForUrl(const QUrl &data)
+{
+    int idx = urls.indexOf(data);
+    if (idx == -1) {
+        idx = urls.count();
+        urls << data;
+    }
+    return idx;
+}
+
+int QDeclarativeCompiledData::indexForFloat(float *data, int count)
+{
+    Q_ASSERT(count > 0);
+
+    for (int ii = 0; ii <= floatData.count() - count; ++ii) {
+        bool found = true;
+        for (int jj = 0; jj < count; ++jj) {
+            if (floatData.at(ii + jj) != data[jj]) {
+                found = false;
+                break;
+            }
+        }
+
+        if (found)
+            return ii;
+    }
+
+    int idx = floatData.count();
+    for (int ii = 0; ii < count; ++ii)
+        floatData << data[ii];
+
+    return idx;
+}
+
+int QDeclarativeCompiledData::indexForInt(int *data, int count)
+{
+    Q_ASSERT(count > 0);
+
+    for (int ii = 0; ii <= intData.count() - count; ++ii) {
+        bool found = true;
+        for (int jj = 0; jj < count; ++jj) {
+            if (intData.at(ii + jj) != data[jj]) {
+                found = false;
+                break;
+            }
+        }
+
+        if (found)
+            return ii;
+    }
+
+    int idx = intData.count();
+    for (int ii = 0; ii < count; ++ii)
+        intData << data[ii];
+
+    return idx;
+}
+
+int QDeclarativeCompiledData::indexForLocation(const QDeclarativeParser::Location &l)
+{
+    // ### FIXME
+    int rv = locations.count();
+    locations << l;
+    return rv;
+}
+
+int QDeclarativeCompiledData::indexForLocation(const QDeclarativeParser::LocationSpan &l)
+{
+    // ### FIXME
+    int rv = locations.count();
+    locations << l.start << l.end;
+    return rv;
+}
+
+QDeclarativeCompiledData::QDeclarativeCompiledData(QDeclarativeEngine *engine)
+: QDeclarativeCleanup(engine), importCache(0), root(0), rootPropertyCache(0)
+{
+}
+
+QDeclarativeCompiledData::~QDeclarativeCompiledData()
+{
+    for (int ii = 0; ii < types.count(); ++ii) {
+        if (types.at(ii).ref)
+            types.at(ii).ref->release();
+    }
+
+    for (int ii = 0; ii < propertyCaches.count(); ++ii) 
+        propertyCaches.at(ii)->release();
+
+    for (int ii = 0; ii < contextCaches.count(); ++ii)
+        contextCaches.at(ii)->release();
+
+    if (importCache)
+        importCache->release();
+
+    if (rootPropertyCache)
+        rootPropertyCache->release();
+
+    qDeleteAll(cachedPrograms);
+    qDeleteAll(cachedClosures);
+}
+
+void QDeclarativeCompiledData::clear()
+{
+    qDeleteAll(cachedPrograms);
+    qDeleteAll(cachedClosures);
+    for (int ii = 0; ii < cachedClosures.count(); ++ii)
+        cachedClosures[ii] = 0;
+    for (int ii = 0; ii < cachedPrograms.count(); ++ii)
+        cachedPrograms[ii] = 0;
+}
+
+
+QObject *QDeclarativeCompiledData::TypeReference::createInstance(QDeclarativeContext *ctxt, const QBitField &bindings) const
+{
+    if (type) {
+        QObject *rv = type->create();
+        if (rv)
+            QDeclarativeEngine::setContextForObject(rv, ctxt);
+        return rv;
+    } else {
+        Q_ASSERT(component);
+        return QDeclarativeComponentPrivate::get(component)->create(ctxt, bindings);
+    } 
+}
+
+const QMetaObject *QDeclarativeCompiledData::TypeReference::metaObject() const
+{
+    if (type) {
+        return type->metaObject();
+    } else {
+        Q_ASSERT(component);
+        return static_cast<QDeclarativeComponentPrivate *>(QObjectPrivate::get(component))->cc->root;
+    }
+}
+
+void QDeclarativeCompiledData::dumpInstructions()
+{
+    if (!name.isEmpty())
+        qWarning() << name;
+    qWarning().nospace() << "Index\tLine\tOperation\t\tData1\tData2\tData3\tComments";
+    qWarning().nospace() << "-------------------------------------------------------------------------------";
+    for (int ii = 0; ii < bytecode.count(); ++ii) {
+        dump(&bytecode[ii], ii);
+    }
+    qWarning().nospace() << "-------------------------------------------------------------------------------";
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
new file mode 100644
index 0000000..0593a5d
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -0,0 +1,2779 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativecompiler_p.h"
+
+#include "qdeclarativecompositetypedata_p.h"
+#include "qdeclarativeparser_p.h"
+#include "qdeclarativescriptparser_p.h"
+#include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarativecomponent.h"
+#include "qmetaobjectbuilder_p.h"
+#include "qdeclarativestringconverters_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativemetatype.h"
+#include "qdeclarativecustomparser_p_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativecomponent_p.h"
+#include "parser/qdeclarativejsast_p.h"
+#include "qdeclarativevmemetaobject_p.h"
+#include "qdeclarativeexpression_p.h"
+#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativerewrite_p.h"
+#include "qdeclarativescriptstring.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativescriptparser_p.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativecompiledbindings_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QCoreApplication>
+#include <QColor>
+#include <QDebug>
+#include <QPointF>
+#include <QSizeF>
+#include <QRectF>
+#include <QAtomicInt>
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+DEFINE_BOOL_CONFIG_OPTION(compilerDump, QML_COMPILER_DUMP);
+DEFINE_BOOL_CONFIG_OPTION(compilerStatDump, QML_COMPILER_STATISTICS_DUMP);
+DEFINE_BOOL_CONFIG_OPTION(qmlExperimental, QML_EXPERIMENTAL);
+
+using namespace QDeclarativeParser;
+
+/*!
+    Instantiate a new QDeclarativeCompiler.
+*/
+QDeclarativeCompiler::QDeclarativeCompiler()
+: output(0), engine(0), unitRoot(0), unit(0)
+{
+}
+
+/*!
+    Returns true if the last call to compile() caused errors.
+
+    \sa errors()
+*/
+bool QDeclarativeCompiler::isError() const
+{
+    return !exceptions.isEmpty();
+}
+
+/*!
+    Return the list of errors from the last call to compile(), or an empty list
+    if there were no errors.
+*/
+QList<QDeclarativeError> QDeclarativeCompiler::errors() const
+{
+    return exceptions;
+}
+
+/*!
+    Returns true if \a val is a legal object id, false otherwise.
+
+    Legal ids must start with a lower-case letter or underscore, and contain only
+    letters, numbers and underscores.
+*/
+bool QDeclarativeCompiler::isValidId(const QString &val)
+{
+    if (val.isEmpty())
+        return false;
+
+    if (val.at(0).isLetter() && !val.at(0).isLower()) {
+        qWarning().nospace() << "id " << val << " is invalid: ids cannot start with uppercase letters";
+        return false;
+    }
+
+    QChar u(QLatin1Char('_'));
+    for (int ii = 0; ii < val.count(); ++ii)
+        if (val.at(ii) != u &&
+           ((ii == 0 && !val.at(ii).isLetter()) ||
+           (ii != 0 && !val.at(ii).isLetterOrNumber())) )
+            return false;
+
+    return true;
+}
+
+/*!
+    Returns true if \a name refers to an attached property, false otherwise.
+
+    Attached property names are those that start with a capital letter.
+*/
+bool QDeclarativeCompiler::isAttachedPropertyName(const QByteArray &name)
+{
+    return !name.isEmpty() && name.at(0) >= 'A' && name.at(0) <= 'Z';
+}
+
+/*!
+    Returns true if \a name refers to a signal property, false otherwise.
+
+    Signal property names are those that start with "on", followed by a capital
+    letter.
+*/
+bool QDeclarativeCompiler::isSignalPropertyName(const QByteArray &name)
+{
+    return name.length() >= 3 && name.startsWith("on") &&
+           'A' <= name.at(2) && 'Z' >= name.at(2);
+}
+
+/*!
+    \macro COMPILE_EXCEPTION
+    \internal
+    Inserts an error into the QDeclarativeCompiler error list, and returns false
+    (failure).
+
+    \a token is used to source the error line and column, and \a desc is the
+    error itself.  \a desc can be an expression that can be piped into QDebug.
+
+    For example:
+
+    \code
+    COMPILE_EXCEPTION(property, QCoreApplication::translate("QDeclarativeCompiler","Error for property \"%1\"").arg(QString::fromUtf8(property->name)));
+    \endcode
+*/
+#define COMPILE_EXCEPTION(token, desc) \
+    {  \
+        QString exceptionDescription; \
+        QDeclarativeError error; \
+        error.setUrl(output->url); \
+        error.setLine((token)->location.start.line); \
+        error.setColumn((token)->location.start.column); \
+        error.setDescription(desc.trimmed()); \
+        exceptions << error; \
+        return false; \
+    }
+
+/*!
+    \macro COMPILE_CHECK
+    \internal
+    Returns false if \a is false, otherwise does nothing.
+*/
+#define COMPILE_CHECK(a) \
+    { \
+        if (!a) return false; \
+    }
+
+/*!
+    Returns true if literal \a v can be assigned to property \a prop, otherwise
+    false.
+
+    This test corresponds to action taken by genLiteralAssignment().  Any change
+    made here, must have a corresponding action in genLiteralAssigment().
+*/
+bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop,
+                                        QDeclarativeParser::Value *v)
+{
+    QString string = v->value.asScript();
+
+    if (!prop.isWritable())
+        COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop.name())));
+
+    if (prop.isEnumType()) {
+        int value;
+        if (prop.isFlagType()) {
+            value = prop.enumerator().keysToValue(string.toUtf8().constData());
+        } else
+            value = prop.enumerator().keyToValue(string.toUtf8().constData());
+        if (value == -1)
+            COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: unknown enumeration"));
+        return true;
+    }
+    int type = prop.userType();
+    switch(type) {
+        case -1:
+            break;
+        case QVariant::String:
+            if (!v->value.isString()) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: string expected"));
+            break;
+        case QVariant::Url:
+            if (!v->value.isString()) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: url expected"));
+            break;
+        case QVariant::UInt:
+            {
+            bool ok;
+            string.toUInt(&ok);
+            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: unsigned int expected"));
+            }
+            break;
+        case QVariant::Int:
+            {
+            bool ok;
+            string.toInt(&ok);
+            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: int expected"));
+            }
+            break;
+        case QMetaType::Float:
+            {
+            bool ok;
+            string.toFloat(&ok);
+            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: float expected"));
+            }
+            break;
+        case QVariant::Double:
+            {
+            bool ok;
+            string.toDouble(&ok);
+            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: double expected"));
+            }
+            break;
+        case QVariant::Color:
+            {
+            bool ok;
+            QDeclarativeStringConverters::colorFromString(string, &ok);
+            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: color expected"));
+            }
+            break;
+        case QVariant::Date:
+            {
+            bool ok;
+            QDeclarativeStringConverters::dateFromString(string, &ok);
+            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: date expected"));
+            }
+            break;
+        case QVariant::Time:
+            {
+            bool ok;
+            QDeclarativeStringConverters::timeFromString(string, &ok);
+            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: time expected"));
+            }
+            break;
+        case QVariant::DateTime:
+            {
+            bool ok;
+            QDeclarativeStringConverters::dateTimeFromString(string, &ok);
+            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: datetime expected"));
+            }
+            break;
+        case QVariant::Point:
+        case QVariant::PointF:
+            {
+            bool ok;
+            QPointF point = QDeclarativeStringConverters::pointFFromString(string, &ok);
+            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: point expected"));
+            }
+            break;
+        case QVariant::Size:
+        case QVariant::SizeF:
+            {
+            bool ok;
+            QSizeF size = QDeclarativeStringConverters::sizeFFromString(string, &ok);
+            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: size expected"));
+            }
+            break;
+        case QVariant::Rect:
+        case QVariant::RectF:
+            {
+            bool ok;
+            QRectF rect = QDeclarativeStringConverters::rectFFromString(string, &ok);
+            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: rect expected"));
+            }
+            break;
+        case QVariant::Bool:
+            {
+            if (!v->value.isBoolean()) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: boolean expected"));
+            }
+            break;
+        case QVariant::Vector3D:
+            {
+            bool ok;
+            QDeclarativeStringConverters::vector3DFromString(string, &ok);
+            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: 3D vector expected"));
+            }
+            break;
+        default:
+            {
+            int t = prop.userType();
+            QDeclarativeMetaType::StringConverter converter =
+                QDeclarativeMetaType::customStringConverter(t);
+            if (!converter)
+                COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: unsupported type \"%1\"").arg(QString::fromLatin1(QVariant::typeToName(prop.type()))));
+            }
+            break;
+    }
+    return true;
+}
+
+/*!
+    Generate a store instruction for assigning literal \a v to property \a prop.
+
+    Any literal assignment that is approved in testLiteralAssignment() must have
+    a corresponding action in this method.
+*/
+void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop,
+                                       QDeclarativeParser::Value *v)
+{
+    QString string = v->value.asScript();
+
+    QDeclarativeInstruction instr;
+    instr.line = v->location.start.line;
+    if (prop.isEnumType()) {
+        int value;
+        if (prop.isFlagType()) {
+            value = prop.enumerator().keysToValue(string.toUtf8().constData());
+        } else
+            value = prop.enumerator().keyToValue(string.toUtf8().constData());
+
+        instr.type = QDeclarativeInstruction::StoreInteger;
+        instr.storeInteger.propertyIndex = prop.propertyIndex();
+        instr.storeInteger.value = value;
+        output->bytecode << instr;
+        return;
+    }
+
+    int type = prop.userType();
+    switch(type) {
+        case -1:
+            {
+            instr.type = QDeclarativeInstruction::StoreVariant;
+            instr.storeString.propertyIndex = prop.propertyIndex();
+            instr.storeString.value = output->indexForString(string);
+            }
+            break;
+        case QVariant::String:
+            {
+            instr.type = QDeclarativeInstruction::StoreString;
+            instr.storeString.propertyIndex = prop.propertyIndex();
+            instr.storeString.value = output->indexForString(string);
+            }
+            break;
+        case QVariant::Url:
+            {
+            instr.type = QDeclarativeInstruction::StoreUrl;
+            QUrl u = string.isEmpty() ? QUrl() : output->url.resolved(QUrl(string));
+            instr.storeUrl.propertyIndex = prop.propertyIndex();
+            instr.storeUrl.value = output->indexForUrl(u);
+            }
+            break;
+        case QVariant::UInt:
+            {
+            instr.type = QDeclarativeInstruction::StoreInteger;
+            instr.storeInteger.propertyIndex = prop.propertyIndex();
+            instr.storeInteger.value = string.toUInt();
+            }
+            break;
+        case QVariant::Int:
+            {
+            instr.type = QDeclarativeInstruction::StoreInteger;
+            instr.storeInteger.propertyIndex = prop.propertyIndex();
+            instr.storeInteger.value = string.toInt();
+            }
+            break;
+        case QMetaType::Float:
+            {
+            instr.type = QDeclarativeInstruction::StoreFloat;
+            instr.storeFloat.propertyIndex = prop.propertyIndex();
+            instr.storeFloat.value = string.toFloat();
+            }
+            break;
+        case QVariant::Double:
+            {
+            instr.type = QDeclarativeInstruction::StoreDouble;
+            instr.storeDouble.propertyIndex = prop.propertyIndex();
+            instr.storeDouble.value = string.toDouble();
+            }
+            break;
+        case QVariant::Color:
+            {
+            QColor c = QDeclarativeStringConverters::colorFromString(string);
+            instr.type = QDeclarativeInstruction::StoreColor;
+            instr.storeColor.propertyIndex = prop.propertyIndex();
+            instr.storeColor.value = c.rgba();
+            }
+            break;
+        case QVariant::Date:
+            {
+            QDate d = QDeclarativeStringConverters::dateFromString(string);
+            instr.type = QDeclarativeInstruction::StoreDate;
+            instr.storeDate.propertyIndex = prop.propertyIndex();
+            instr.storeDate.value = d.toJulianDay();
+            }
+            break;
+        case QVariant::Time:
+            {
+            QTime time = QDeclarativeStringConverters::timeFromString(string);
+            int data[] = { time.hour(), time.minute(),
+                           time.second(), time.msec() };
+            int index = output->indexForInt(data, 4);
+            instr.type = QDeclarativeInstruction::StoreTime;
+            instr.storeTime.propertyIndex = prop.propertyIndex();
+            instr.storeTime.valueIndex = index;
+            }
+            break;
+        case QVariant::DateTime:
+            {
+            QDateTime dateTime = QDeclarativeStringConverters::dateTimeFromString(string);
+            int data[] = { dateTime.date().toJulianDay(),
+                           dateTime.time().hour(),
+                           dateTime.time().minute(),
+                           dateTime.time().second(),
+                           dateTime.time().msec() };
+            int index = output->indexForInt(data, 5);
+            instr.type = QDeclarativeInstruction::StoreDateTime;
+            instr.storeDateTime.propertyIndex = prop.propertyIndex();
+            instr.storeDateTime.valueIndex = index;
+            }
+            break;
+        case QVariant::Point:
+        case QVariant::PointF:
+            {
+            bool ok;
+            QPointF point =
+                QDeclarativeStringConverters::pointFFromString(string, &ok);
+            float data[] = { point.x(), point.y() };
+            int index = output->indexForFloat(data, 2);
+            if (type == QVariant::PointF)
+                instr.type = QDeclarativeInstruction::StorePointF;
+            else
+                instr.type = QDeclarativeInstruction::StorePoint;
+            instr.storeRealPair.propertyIndex = prop.propertyIndex();
+            instr.storeRealPair.valueIndex = index;
+            }
+            break;
+        case QVariant::Size:
+        case QVariant::SizeF:
+            {
+            bool ok;
+            QSizeF size = QDeclarativeStringConverters::sizeFFromString(string, &ok);
+            float data[] = { size.width(), size.height() };
+            int index = output->indexForFloat(data, 2);
+            if (type == QVariant::SizeF)
+                instr.type = QDeclarativeInstruction::StoreSizeF;
+            else
+                instr.type = QDeclarativeInstruction::StoreSize;
+            instr.storeRealPair.propertyIndex = prop.propertyIndex();
+            instr.storeRealPair.valueIndex = index;
+            }
+            break;
+        case QVariant::Rect:
+        case QVariant::RectF:
+            {
+            bool ok;
+            QRectF rect = QDeclarativeStringConverters::rectFFromString(string, &ok);
+            float data[] = { rect.x(), rect.y(),
+                             rect.width(), rect.height() };
+            int index = output->indexForFloat(data, 4);
+            if (type == QVariant::RectF)
+                instr.type = QDeclarativeInstruction::StoreRectF;
+            else
+                instr.type = QDeclarativeInstruction::StoreRect;
+            instr.storeRect.propertyIndex = prop.propertyIndex();
+            instr.storeRect.valueIndex = index;
+            }
+            break;
+        case QVariant::Bool:
+            {
+            bool b = v->value.asBoolean();
+            instr.type = QDeclarativeInstruction::StoreBool;
+            instr.storeBool.propertyIndex = prop.propertyIndex();
+            instr.storeBool.value = b;
+            }
+            break;
+        case QVariant::Vector3D:
+            {
+            bool ok;
+            QVector3D vector =
+                QDeclarativeStringConverters::vector3DFromString(string, &ok);
+            float data[] = { vector.x(), vector.y(), vector.z() };
+            int index = output->indexForFloat(data, 3);
+            instr.type = QDeclarativeInstruction::StoreVector3D;
+            instr.storeRealPair.propertyIndex = prop.propertyIndex();
+            instr.storeRealPair.valueIndex = index;
+            }
+            break;
+        default:
+            {
+            int t = prop.userType();
+            int index = output->customTypeData.count();
+            instr.type = QDeclarativeInstruction::AssignCustomType;
+            instr.assignCustomType.propertyIndex = prop.propertyIndex();
+            instr.assignCustomType.valueIndex = index;
+
+            QDeclarativeCompiledData::CustomTypeData data;
+            data.index = output->indexForString(string);
+            data.type = t;
+            output->customTypeData << data;
+            }
+            break;
+    }
+    output->bytecode << instr;
+}
+
+/*!
+    Resets data by clearing the lists that the QDeclarativeCompiler modifies.
+*/
+void QDeclarativeCompiler::reset(QDeclarativeCompiledData *data)
+{
+    data->types.clear();
+    data->primitives.clear();
+    data->floatData.clear();
+    data->intData.clear();
+    data->customTypeData.clear();
+    data->datas.clear();
+    data->bytecode.clear();
+}
+
+/*!
+    Compile \a unit, and store the output in \a out.  \a engine is the QDeclarativeEngine
+    with which the QDeclarativeCompiledData will be associated.
+
+    Returns true on success, false on failure.  On failure, the compile errors
+    are available from errors().
+
+    If the environment variant QML_COMPILER_DUMP is set
+    (eg. QML_COMPILER_DUMP=1) the compiled instructions will be dumped to stderr
+    on a successful compiler.
+*/
+bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine,
+                          QDeclarativeCompositeTypeData *unit,
+                          QDeclarativeCompiledData *out)
+{
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::Compilation> pc;
+#endif
+    exceptions.clear();
+
+    Q_ASSERT(out);
+    reset(out);
+
+    output = out;
+
+    // Compile types
+    for (int ii = 0; ii < unit->types.count(); ++ii) {
+        QDeclarativeCompositeTypeData::TypeReference &tref = unit->types[ii];
+        QDeclarativeCompiledData::TypeReference ref;
+        QDeclarativeScriptParser::TypeReference *parserRef = unit->data.referencedTypes().at(ii);
+        if (tref.type)
+            ref.type = tref.type;
+        else if (tref.unit) {
+            ref.component = tref.unit->toComponent(engine);
+
+            if (ref.component->isError()) {
+                QDeclarativeError error;
+                error.setUrl(output->url);
+                error.setDescription(QLatin1String("Unable to create type ") +
+                                     parserRef->name);
+                if (!parserRef->refObjects.isEmpty()) {
+                    QDeclarativeParser::Object *parserObject = parserRef->refObjects.first();
+                    error.setLine(parserObject->location.start.line);
+                    error.setColumn(parserObject->location.start.column);
+                }
+
+                exceptions << error;
+                exceptions << ref.component->errors();
+                reset(out);
+                return false;
+            }
+            ref.ref = tref.unit;
+            ref.ref->addref();
+        }
+        ref.className = parserRef->name.toUtf8();
+        out->types << ref;
+    }
+
+    Object *root = unit->data.tree();
+    Q_ASSERT(root);
+
+    this->engine = engine;
+    this->unit = unit;
+    this->unitRoot = root;
+    compileTree(root);
+
+    if (!isError()) {
+        if (compilerDump())
+            out->dumpInstructions();
+        if (compilerStatDump())
+            dumpStats();
+    } else {
+        reset(out);
+    }
+
+    compileState = ComponentCompileState();
+    savedCompileStates.clear();
+    output = 0;
+    this->engine = 0;
+    this->unit = 0;
+    this->unitRoot = 0;
+
+    return !isError();
+}
+
+void QDeclarativeCompiler::compileTree(Object *tree)
+{
+    compileState.root = tree;
+
+    if (!buildObject(tree, BindingContext()) || !completeComponentBuild())
+        return;
+
+    QDeclarativeInstruction init;
+    init.type = QDeclarativeInstruction::Init;
+    init.line = 0;
+    init.init.bindingsSize = compileState.bindings.count();
+    init.init.parserStatusSize = compileState.parserStatusCount;
+    init.init.contextCache = genContextCache();
+    if (compileState.compiledBindingData.isEmpty())
+        init.init.compiledBinding = -1;
+    else
+        init.init.compiledBinding = output->indexForByteArray(compileState.compiledBindingData);
+    output->bytecode << init;
+
+    genObject(tree);
+
+    QDeclarativeInstruction def;
+    init.line = 0;
+    def.type = QDeclarativeInstruction::SetDefault;
+    output->bytecode << def;
+
+    output->imports = unit->imports;
+    output->importCache = output->imports.cache(engine);
+
+    Q_ASSERT(tree->metatype);
+
+    if (tree->metadata.isEmpty()) {
+        output->root = tree->metatype;
+    } else {
+        static_cast<QMetaObject &>(output->rootData) = *tree->metaObject();
+        output->root = &output->rootData;
+    }
+    if (!tree->metadata.isEmpty()) 
+        QDeclarativeEnginePrivate::get(engine)->registerCompositeType(output);
+}
+
+static bool ValuePtrLessThan(const Value *t1, const Value *t2) 
+{
+    return t1->location.start.line < t2->location.start.line ||
+           (t1->location.start.line == t2->location.start.line &&
+            t1->location.start.column < t2->location.start.column);
+}
+
+bool QDeclarativeCompiler::buildObject(Object *obj, const BindingContext &ctxt)
+{
+    componentStat.objects++;
+
+    Q_ASSERT (obj->type != -1);
+    const QDeclarativeCompiledData::TypeReference &tr =
+        output->types.at(obj->type);
+    obj->metatype = tr.metaObject();
+
+    if (tr.component)
+        obj->url = tr.component->url();
+    if (tr.type)
+        obj->typeName = tr.type->qmlTypeName();
+    obj->className = tr.className;
+
+    // This object is a "Component" element
+    if (tr.type && obj->metatype == &QDeclarativeComponent::staticMetaObject) {
+        COMPILE_CHECK(buildComponent(obj, ctxt));
+        return true;
+    } 
+
+    // Build any script blocks for this type
+    for (int ii = 0; ii < obj->scriptBlockObjects.count(); ++ii)
+        COMPILE_CHECK(buildScript(obj, obj->scriptBlockObjects.at(ii)));
+
+    // Object instantiations reset the binding context
+    BindingContext objCtxt(obj);
+
+    // Create the synthesized meta object, ignoring aliases
+    COMPILE_CHECK(mergeDynamicMetaProperties(obj));
+    COMPILE_CHECK(buildDynamicMeta(obj, IgnoreAliases));
+
+    // Find the native type and check for the QDeclarativeParserStatus interface
+    QDeclarativeType *type = toQmlType(obj);
+    Q_ASSERT(type);
+    obj->parserStatusCast = type->parserStatusCast();
+    if (obj->parserStatusCast != -1)
+        compileState.parserStatusCount++;
+
+    // Check if this is a custom parser type.  Custom parser types allow
+    // assignments to non-existent properties.  These assignments are then
+    // compiled by the type.
+    bool isCustomParser = output->types.at(obj->type).type &&
+                          output->types.at(obj->type).type->customParser() != 0;
+    QList<QDeclarativeCustomParserProperty> customProps;
+
+    // Fetch the list of deferred properties
+    QStringList deferredList = deferredProperties(obj);
+
+    // Must do id property first.  This is to ensure that the id given to any
+    // id reference created matches the order in which the objects are
+    // instantiated
+    foreach(Property *prop, obj->properties) {
+        if (prop->name == "id") {
+            COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
+            break;
+        }
+    }
+
+    // Merge 
+    Property *defaultProperty = 0;
+    Property *skipProperty = 0;
+    if (obj->defaultProperty) {
+        const QMetaObject *metaObject = obj->metaObject();
+        Q_ASSERT(metaObject);
+        QMetaProperty p = QDeclarativeMetaType::defaultProperty(metaObject);
+        if (p.name()) {
+            Property *explicitProperty = obj->getProperty(p.name(), false);
+            if (explicitProperty && !explicitProperty->value) {
+                skipProperty = explicitProperty;
+
+                defaultProperty = new Property;
+                defaultProperty->parent = obj;
+                defaultProperty->isDefault = true;
+                defaultProperty->location = obj->defaultProperty->location;
+                defaultProperty->listValueRange = obj->defaultProperty->listValueRange;
+                defaultProperty->listCommaPositions = obj->defaultProperty->listCommaPositions;
+
+                defaultProperty->values  = obj->defaultProperty->values;
+                defaultProperty->values += explicitProperty->values;
+                foreach(Value *value, defaultProperty->values)
+                    value->addref();
+                qSort(defaultProperty->values.begin(), defaultProperty->values.end(), ValuePtrLessThan);
+
+            } else {
+                defaultProperty = obj->defaultProperty;
+                defaultProperty->addref();
+            }
+        } else {
+            defaultProperty = obj->defaultProperty;
+            defaultProperty->addref();
+        }
+    }
+
+    // Build all explicit properties specified
+    foreach(Property *prop, obj->properties) {
+
+        if (prop == skipProperty)
+            continue;
+        if (prop->name == "id")
+            continue;
+
+        bool canDefer = false;
+        if (isCustomParser) {
+            if (doesPropertyExist(prop, obj)) {
+                int ids = compileState.ids.count();
+                COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
+                canDefer = ids == compileState.ids.count();
+            } else {
+                customProps << QDeclarativeCustomParserNodePrivate::fromProperty(prop);
+            }
+        } else {
+            if (isSignalPropertyName(prop->name)) {
+                COMPILE_CHECK(buildSignal(prop,obj,objCtxt));
+            } else {
+                int ids = compileState.ids.count();
+                COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
+                canDefer = ids == compileState.ids.count();
+            }
+        }
+
+        if (canDefer && !deferredList.isEmpty() &&
+            deferredList.contains(QString::fromUtf8(prop->name)))
+            prop->isDeferred = true;
+
+    }
+
+    // Build the default property
+    if (defaultProperty)  {
+        Property *prop = defaultProperty;
+
+        bool canDefer = false;
+        if (isCustomParser) {
+            if (doesPropertyExist(prop, obj)) {
+                int ids = compileState.ids.count();
+                COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
+                canDefer = ids == compileState.ids.count();
+            } else {
+                customProps << QDeclarativeCustomParserNodePrivate::fromProperty(prop);
+            }
+        } else {
+            int ids = compileState.ids.count();
+            COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
+            canDefer = ids == compileState.ids.count();
+        }
+
+        if (canDefer && !deferredList.isEmpty() &&
+            deferredList.contains(QString::fromUtf8(prop->name)))
+            prop->isDeferred = true;
+    }
+
+    if (defaultProperty) 
+        defaultProperty->release();
+
+    // Compile custom parser parts
+    if (isCustomParser && !customProps.isEmpty()) {
+        QDeclarativeCustomParser *cp = output->types.at(obj->type).type->customParser();
+        cp->clearErrors();
+        obj->custom = cp->compile(customProps);
+        foreach (QDeclarativeError err, cp->errors()) {
+            err.setUrl(output->url);
+            exceptions << err;
+        }
+    }
+
+    return true;
+}
+
+void QDeclarativeCompiler::genObject(QDeclarativeParser::Object *obj)
+{
+    const QDeclarativeCompiledData::TypeReference &tr =
+        output->types.at(obj->type);
+    if (tr.type && obj->metatype == &QDeclarativeComponent::staticMetaObject) {
+        genComponent(obj);
+        return;
+    }
+
+    // Create the object
+    QDeclarativeInstruction create;
+    create.type = QDeclarativeInstruction::CreateObject;
+    create.line = obj->location.start.line;
+    create.create.column = obj->location.start.column;
+    create.create.data = -1;
+    if (!obj->custom.isEmpty())
+        create.create.data = output->indexForByteArray(obj->custom);
+    create.create.type = obj->type;
+    if (!output->types.at(create.create.type).type && 
+        !obj->bindingBitmask.isEmpty()) {
+        Q_ASSERT(obj->bindingBitmask.size() % 4 == 0);
+        create.create.bindingBits = 
+            output->indexForByteArray(obj->bindingBitmask);
+    } else {
+        create.create.bindingBits = -1;
+    }
+    output->bytecode << create;
+
+    // Setup the synthesized meta object if necessary
+    if (!obj->metadata.isEmpty()) {
+        QDeclarativeInstruction meta;
+        meta.type = QDeclarativeInstruction::StoreMetaObject;
+        meta.line = 0;
+        meta.storeMeta.data = output->indexForByteArray(obj->metadata);
+        meta.storeMeta.aliasData = output->indexForByteArray(obj->synthdata);
+        meta.storeMeta.propertyCache = output->propertyCaches.count();
+        // ### Surely the creation of this property cache could be more efficient
+        QDeclarativePropertyCache *propertyCache = 0;
+        if (tr.component && QDeclarativeComponentPrivate::get(tr.component)->cc->rootPropertyCache) {
+            propertyCache = QDeclarativeComponentPrivate::get(tr.component)->cc->rootPropertyCache->copy();
+        } else {
+            propertyCache = QDeclarativePropertyCache::create(engine, obj->metaObject()->superClass());
+        }
+        propertyCache->append(engine, obj->metaObject(), QDeclarativePropertyCache::Data::NoFlags,
+                              QDeclarativePropertyCache::Data::IsVMEFunction);
+        if (obj == unitRoot) {
+            propertyCache->addref();
+            output->rootPropertyCache = propertyCache;
+        }
+        output->propertyCaches << propertyCache;
+        output->bytecode << meta;
+    }
+
+    // Set the object id
+    if (!obj->id.isEmpty()) {
+        QDeclarativeInstruction id;
+        id.type = QDeclarativeInstruction::SetId;
+        id.line = 0;
+        id.setId.value = output->indexForString(obj->id);
+        id.setId.index = obj->idIndex;
+        output->bytecode << id;
+    }
+
+    // Set any script blocks
+    for (int ii = 0; ii < obj->scripts.count(); ++ii) {
+        QDeclarativeInstruction script;
+        script.type = QDeclarativeInstruction::StoreScript;
+        script.line = 0; // ###
+        int idx = output->scripts.count();
+        output->scripts << obj->scripts.at(ii);
+        script.storeScript.value = idx;
+        output->bytecode << script;
+    }
+
+    // Begin the class
+    if (obj->parserStatusCast != -1) {
+        QDeclarativeInstruction begin;
+        begin.type = QDeclarativeInstruction::BeginObject;
+        begin.begin.castValue = obj->parserStatusCast;
+        begin.line = obj->location.start.line;
+        output->bytecode << begin;
+    }
+
+    genObjectBody(obj);
+}
+
+void QDeclarativeCompiler::genObjectBody(QDeclarativeParser::Object *obj)
+{
+    typedef QPair<Property *, int> PropPair;
+    foreach(const PropPair &prop, obj->scriptStringProperties) {
+        QDeclarativeInstruction ss;
+        ss.type = QDeclarativeInstruction::StoreScriptString;
+        ss.storeScriptString.propertyIndex = prop.first->index;
+        ss.storeScriptString.value = 
+            output->indexForString(prop.first->values.at(0)->value.asScript());
+        ss.storeScriptString.scope = prop.second;
+        output->bytecode << ss;
+    }
+
+    bool seenDefer = false;
+    foreach(Property *prop, obj->valueProperties) {
+        if (prop->isDeferred) {
+            seenDefer = true;
+            continue;
+        }
+        genValueProperty(prop, obj);
+    }
+    if (seenDefer) {
+        QDeclarativeInstruction defer;
+        defer.type = QDeclarativeInstruction::Defer;
+        defer.line = 0;
+        defer.defer.deferCount = 0;
+        int deferIdx = output->bytecode.count();
+        output->bytecode << defer;
+
+        QDeclarativeInstruction init;
+        init.type = QDeclarativeInstruction::Init;
+        init.init.bindingsSize = compileState.bindings.count(); // XXX - bigger than necessary
+        init.init.parserStatusSize = compileState.parserStatusCount; // XXX - bigger than necessary
+        init.init.contextCache = -1;
+        init.init.compiledBinding = -1;
+        output->bytecode << init;
+
+        foreach(Property *prop, obj->valueProperties) {
+            if (!prop->isDeferred)
+                continue;
+            genValueProperty(prop, obj);
+        }
+
+        output->bytecode[deferIdx].defer.deferCount =
+            output->bytecode.count() - deferIdx - 1;
+    }
+
+    foreach(Property *prop, obj->signalProperties) {
+
+        QDeclarativeParser::Value *v = prop->values.at(0);
+
+        if (v->type == Value::SignalObject) {
+
+            genObject(v->object);
+
+            QDeclarativeInstruction assign;
+            assign.type = QDeclarativeInstruction::AssignSignalObject;
+            assign.line = v->location.start.line;
+            assign.assignSignalObject.signal =
+                output->indexForByteArray(prop->name);
+            output->bytecode << assign;
+
+        } else if (v->type == Value::SignalExpression) {
+
+            QDeclarativeInstruction store;
+            store.type = QDeclarativeInstruction::StoreSignal;
+            store.line = v->location.start.line;
+            store.storeSignal.signalIndex = prop->index;
+            store.storeSignal.value =
+                output->indexForString(v->value.asScript().trimmed());
+            output->bytecode << store;
+
+        }
+
+    }
+
+    foreach(Property *prop, obj->attachedProperties) {
+        QDeclarativeInstruction fetch;
+        fetch.type = QDeclarativeInstruction::FetchAttached;
+        fetch.line = prop->location.start.line;
+        fetch.fetchAttached.id = prop->index;
+        output->bytecode << fetch;
+
+        genObjectBody(prop->value);
+
+        QDeclarativeInstruction pop;
+        pop.type = QDeclarativeInstruction::PopFetchedObject;
+        pop.line = prop->location.start.line;
+        output->bytecode << pop;
+    }
+
+    foreach(Property *prop, obj->groupedProperties) {
+        QDeclarativeInstruction fetch;
+        fetch.type = QDeclarativeInstruction::FetchObject;
+        fetch.fetch.property = prop->index;
+        fetch.line = prop->location.start.line;
+        output->bytecode << fetch;
+
+        genObjectBody(prop->value);
+
+        QDeclarativeInstruction pop;
+        pop.type = QDeclarativeInstruction::PopFetchedObject;
+        pop.line = prop->location.start.line;
+        output->bytecode << pop;
+    }
+
+    foreach(Property *prop, obj->valueTypeProperties) {
+        QDeclarativeInstruction fetch;
+        fetch.type = QDeclarativeInstruction::FetchValueType;
+        fetch.fetchValue.property = prop->index;
+        fetch.fetchValue.type = prop->type;
+        fetch.line = prop->location.start.line;
+
+        output->bytecode << fetch;
+
+        foreach(Property *vprop, prop->value->valueProperties) {
+            genPropertyAssignment(vprop, prop->value, prop);
+        }
+
+        QDeclarativeInstruction pop;
+        pop.type = QDeclarativeInstruction::PopValueType;
+        pop.fetchValue.property = prop->index;
+        pop.fetchValue.type = prop->type;
+        pop.line = prop->location.start.line;
+        output->bytecode << pop;
+    }
+}
+
+void QDeclarativeCompiler::genComponent(QDeclarativeParser::Object *obj)
+{
+    QDeclarativeParser::Object *root = obj->defaultProperty->values.at(0)->object;
+    Q_ASSERT(root);
+
+    QDeclarativeInstruction create;
+    create.type = QDeclarativeInstruction::CreateComponent;
+    create.line = root->location.start.line;
+    create.createComponent.column = root->location.start.column;
+    create.createComponent.endLine = root->location.end.line;
+    output->bytecode << create;
+    int count = output->bytecode.count();
+
+    ComponentCompileState oldCompileState = compileState;
+    compileState = componentState(root);
+
+    QDeclarativeInstruction init;
+    init.type = QDeclarativeInstruction::Init;
+    init.init.bindingsSize = compileState.bindings.count();
+    init.init.parserStatusSize = compileState.parserStatusCount;
+    init.init.contextCache = genContextCache();
+    if (compileState.compiledBindingData.isEmpty())
+        init.init.compiledBinding = -1;
+    else
+        init.init.compiledBinding = output->indexForByteArray(compileState.compiledBindingData);
+    init.line = obj->location.start.line;
+    output->bytecode << init;
+
+    genObject(root);
+
+    QDeclarativeInstruction def;
+    init.line = 0;
+    def.type = QDeclarativeInstruction::SetDefault;
+    output->bytecode << def;
+
+    output->bytecode[count - 1].createComponent.count =
+        output->bytecode.count() - count;
+
+    compileState = oldCompileState;
+
+    if (!obj->id.isEmpty()) {
+        QDeclarativeInstruction id;
+        id.type = QDeclarativeInstruction::SetId;
+        id.line = 0;
+        id.setId.value = output->indexForString(obj->id);
+        id.setId.index = obj->idIndex;
+        output->bytecode << id;
+    }
+}
+
+bool QDeclarativeCompiler::buildComponent(QDeclarativeParser::Object *obj,
+                                 const BindingContext &ctxt)
+{
+    // The special "Component" element can only have the id property and a
+    // default property, that actually defines the component's tree
+
+    // Find, check and set the "id" property (if any)
+    Property *idProp = 0;
+    if (obj->properties.count() > 1 ||
+       (obj->properties.count() == 1 && obj->properties.begin().key() != "id"))
+        COMPILE_EXCEPTION(*obj->properties.begin(), QCoreApplication::translate("QDeclarativeCompiler","Component elements may not contain properties other than id"));
+       
+    if (!obj->scriptBlockObjects.isEmpty())
+        COMPILE_EXCEPTION(obj->scriptBlockObjects.first(), QCoreApplication::translate("QDeclarativeCompiler","Component elements may not contain script blocks"));
+
+    if (obj->properties.count())
+        idProp = *obj->properties.begin();
+
+    if (idProp && (idProp->value || idProp->values.count() > 1 || !isValidId(idProp->values.first()->primitive())))
+        COMPILE_EXCEPTION(idProp, QCoreApplication::translate("QDeclarativeCompiler","Invalid component id specification"));
+
+    if (idProp) {
+        QString idVal = idProp->values.first()->primitive();
+
+        if (compileState.ids.contains(idVal))
+            COMPILE_EXCEPTION(idProp, QCoreApplication::translate("QDeclarativeCompiler","id is not unique"));
+
+        obj->id = idVal;
+        addId(idVal, obj);
+    }
+
+    // Check the Component tree is well formed
+    if (obj->defaultProperty &&
+       (obj->defaultProperty->value || obj->defaultProperty->values.count() > 1 ||
+        (obj->defaultProperty->values.count() == 1 && !obj->defaultProperty->values.first()->object)))
+        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QDeclarativeCompiler","Invalid component body specification"));
+
+    Object *root = 0;
+    if (obj->defaultProperty && obj->defaultProperty->values.count())
+        root = obj->defaultProperty->values.first()->object;
+
+    if (!root)
+        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QDeclarativeCompiler","Cannot create empty component specification"));
+
+    // Build the component tree
+    COMPILE_CHECK(buildComponentFromRoot(root, ctxt));
+
+    return true;
+}
+
+bool QDeclarativeCompiler::buildScript(QDeclarativeParser::Object *obj, QDeclarativeParser::Object *script)
+{
+    Object::ScriptBlock scriptBlock;
+
+    if (script->properties.count() == 1 && 
+        script->properties.begin().key() == QByteArray("source")) {
+
+        Property *source = *script->properties.begin();
+        if (script->defaultProperty)
+            COMPILE_EXCEPTION(source, QCoreApplication::translate("QDeclarativeCompiler","Invalid Script block.  Specify either the source property or inline script"));
+
+        if (source->value || source->values.count() != 1 ||
+            source->values.at(0)->object || !source->values.at(0)->value.isStringList())
+            COMPILE_EXCEPTION(source, QCoreApplication::translate("QDeclarativeCompiler","Invalid Script source value"));
+
+        QStringList sources = source->values.at(0)->value.asStringList();
+
+        for (int jj = 0; jj < sources.count(); ++jj) {
+            QString sourceUrl = output->url.resolved(QUrl(sources.at(jj))).toString();
+            QString scriptCode;
+            int lineNumber = 1;
+
+            for (int ii = 0; ii < unit->resources.count(); ++ii) {
+                if (unit->resources.at(ii)->url == sourceUrl) {
+                    scriptCode = QString::fromUtf8(unit->resources.at(ii)->data);
+                    break;
+                }
+            }
+
+            if (!scriptCode.isEmpty()) {
+                scriptBlock.codes.append(scriptCode);
+                scriptBlock.files.append(sourceUrl);
+                scriptBlock.lineNumbers.append(lineNumber);
+            }
+        }
+
+    } else if (!script->properties.isEmpty()) {
+        COMPILE_EXCEPTION(*script->properties.begin(), QCoreApplication::translate("QDeclarativeCompiler","Properties cannot be set on Script block"));
+    } else if (script->defaultProperty) {
+
+        QString scriptCode;
+        int lineNumber = 1;
+        QString sourceUrl = output->url.toString();
+
+        QDeclarativeParser::Location currentLocation;
+
+        for (int ii = 0; ii < script->defaultProperty->values.count(); ++ii) {
+            Value *v = script->defaultProperty->values.at(ii);
+            if (lineNumber == 1)
+                lineNumber = v->location.start.line;
+            if (v->object || !v->value.isString())
+                COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid Script block"));
+
+            if (ii == 0) {
+                currentLocation = v->location.start;
+                scriptCode.append(QString(currentLocation.column, QLatin1Char(' ')));
+            }
+
+            while (currentLocation.line < v->location.start.line) {
+                scriptCode.append(QLatin1Char('\n'));
+                currentLocation.line++;
+                currentLocation.column = 0;
+            }
+
+            scriptCode.append(QString(v->location.start.column - currentLocation.column, QLatin1Char(' ')));
+
+            scriptCode += v->value.asString();
+            currentLocation = v->location.end;
+            currentLocation.column++;
+        }
+
+        if (!scriptCode.isEmpty()) {
+            scriptBlock.codes.append(scriptCode);
+            scriptBlock.files.append(sourceUrl);
+            scriptBlock.lineNumbers.append(lineNumber);
+        }
+    }
+
+    if (!scriptBlock.codes.isEmpty())
+        obj->scripts << scriptBlock;
+
+    return true;
+}
+
+bool QDeclarativeCompiler::buildComponentFromRoot(QDeclarativeParser::Object *obj,
+                                         const BindingContext &ctxt)
+{
+    ComponentCompileState oldComponentCompileState = compileState;
+    ComponentStat oldComponentStat = componentStat;
+
+    compileState = ComponentCompileState();
+    compileState.root = obj;
+
+    componentStat = ComponentStat();
+    componentStat.lineNumber = obj->location.start.line;
+
+    if (obj)
+        COMPILE_CHECK(buildObject(obj, ctxt));
+
+    COMPILE_CHECK(completeComponentBuild());
+
+    compileState = oldComponentCompileState;
+    componentStat = oldComponentStat;
+
+    return true;
+}
+
+
+// Build a sub-object.  A sub-object is one that was not created directly by
+// QML - such as a grouped property object, or an attached object.  Sub-object's
+// can't have an id, involve a custom parser, have attached properties etc.
+bool QDeclarativeCompiler::buildSubObject(Object *obj, const BindingContext &ctxt)
+{
+    Q_ASSERT(obj->metatype);
+    Q_ASSERT(!obj->defaultProperty);
+    Q_ASSERT(ctxt.isSubContext()); // sub-objects must always be in a binding
+                                   // sub-context
+
+    foreach(Property *prop, obj->properties) {
+        if (isSignalPropertyName(prop->name)) {
+            COMPILE_CHECK(buildSignal(prop, obj, ctxt));
+        } else {
+            COMPILE_CHECK(buildProperty(prop, obj, ctxt));
+        }
+    }
+
+    return true;
+}
+
+int QDeclarativeCompiler::componentTypeRef()
+{
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/Component",4,6);
+    for (int ii = output->types.count() - 1; ii >= 0; --ii) {
+        if (output->types.at(ii).type == t)
+            return ii;
+    }
+    QDeclarativeCompiledData::TypeReference ref;
+    ref.className = "Component";
+    ref.type = t;
+    output->types << ref;
+    return output->types.count() - 1;
+}
+
+int QDeclarativeCompiler::findSignalByName(const QMetaObject *mo, const QByteArray &name)
+{
+    int methods = mo->methodCount();
+    for (int ii = methods - 1; ii >= 0; --ii) {
+        QMetaMethod method = mo->method(ii);
+        QByteArray methodName = method.signature();
+        int idx = methodName.indexOf('(');
+        methodName = methodName.left(idx);
+
+        if (methodName == name)
+            return ii;
+    }
+    return -1;
+}
+
+bool QDeclarativeCompiler::buildSignal(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj,
+                              const BindingContext &ctxt)
+{
+    Q_ASSERT(obj->metaObject());
+    Q_ASSERT(!prop->isEmpty());
+
+    QByteArray name = prop->name;
+    Q_ASSERT(name.startsWith("on"));
+    name = name.mid(2);
+    if(name[0] >= 'A' && name[0] <= 'Z')
+        name[0] = name[0] - 'A' + 'a';
+
+    int sigIdx = findSignalByName(obj->metaObject(), name);
+
+    if (sigIdx == -1) {
+
+        // If the "on<Signal>" name doesn't resolve into a signal, try it as a
+        // property.
+        COMPILE_CHECK(buildProperty(prop, obj, ctxt));
+
+    }  else {
+
+        if (prop->value || prop->values.count() > 1)
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Incorrectly specified signal"));
+
+        prop->index = sigIdx;
+        obj->addSignalProperty(prop);
+
+        if (prop->values.at(0)->object) {
+            COMPILE_CHECK(buildObject(prop->values.at(0)->object, ctxt));
+            prop->values.at(0)->type = Value::SignalObject;
+        } else {
+            prop->values.at(0)->type = Value::SignalExpression;
+
+            QString script = prop->values.at(0)->value.asScript().trimmed();
+            if (script.isEmpty())
+                COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Empty signal assignment"));
+        }
+    }
+
+    return true;
+}
+
+
+/*!
+    Returns true if (value) property \a prop exists on obj, false otherwise.
+*/
+bool QDeclarativeCompiler::doesPropertyExist(QDeclarativeParser::Property *prop,
+                                    QDeclarativeParser::Object *obj)
+{
+    if(isAttachedPropertyName(prop->name) || prop->name == "id")
+        return true;
+
+    const QMetaObject *mo = obj->metaObject();
+    if (mo) {
+        if (prop->isDefault) {
+            QMetaProperty p = QDeclarativeMetaType::defaultProperty(mo);
+            return p.name() != 0;
+        } else {
+            int idx = mo->indexOfProperty(prop->name.constData());
+            return idx != -1;
+        }
+    }
+
+    return false;
+}
+
+bool QDeclarativeCompiler::buildProperty(QDeclarativeParser::Property *prop,
+                                QDeclarativeParser::Object *obj,
+                                const BindingContext &ctxt)
+{
+    if (prop->isEmpty())
+        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Empty property assignment"));
+
+    const QMetaObject *metaObject = obj->metaObject();
+    Q_ASSERT(metaObject);
+
+    if (isAttachedPropertyName(prop->name)) {
+        // Setup attached property data
+
+        if (ctxt.isSubContext()) {
+            // Attached properties cannot be used on sub-objects.  Sub-objects
+            // always exist in a binding sub-context, which is what we test
+            // for here.
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Attached properties cannot be used here"));
+        }
+
+        QDeclarativeType *type = 0;
+        QDeclarativeEnginePrivate::ImportedNamespace *typeNamespace = 0;
+        QDeclarativeEnginePrivate::get(engine)->resolveType(unit->imports, prop->name, 
+                                                   &type, 0, 0, 0, &typeNamespace);
+
+        if (typeNamespace) {
+            // ### We might need to indicate that this property is a namespace 
+            // for the DOM API
+            COMPILE_CHECK(buildPropertyInNamespace(typeNamespace, prop, obj, 
+                                                   ctxt));
+            return true;
+        } else if (!type || !type->attachedPropertiesType())  {
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Non-existent attached object"));
+        }
+
+        if (!prop->value)
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Invalid attached object assignment"));
+
+        Q_ASSERT(type->attachedPropertiesFunction());
+        prop->index = type->index();
+        prop->value->metatype = type->attachedPropertiesType();
+    } else {
+        // Setup regular property data
+        QMetaProperty p;
+
+        if (prop->isDefault) {
+            p = QDeclarativeMetaType::defaultProperty(metaObject);
+
+            if (p.name()) {
+                prop->index = p.propertyIndex();
+                prop->name = p.name();
+            }
+
+        } else {
+            prop->index = metaObject->indexOfProperty(prop->name.constData());
+
+            if (prop->index != -1) {
+                p = metaObject->property(prop->index);
+                Q_ASSERT(p.name());
+            }
+        }
+
+        // We can't error here as the "id" property does not require a
+        // successful index resolution
+        if (p.name()) {
+            prop->type = p.userType();
+        }
+    }
+
+    if (prop->index != -1) 
+        prop->parent->setBindingBit(prop->index);
+
+    if (!prop->isDefault && prop->name == "id" && !ctxt.isSubContext()) {
+
+        // The magic "id" behavior doesn't apply when "id" is resolved as a
+        // default property or to sub-objects (which are always in binding
+        // sub-contexts)
+        COMPILE_CHECK(buildIdProperty(prop, obj));
+        if (prop->type == QVariant::String &&
+            prop->values.at(0)->value.isString())
+            COMPILE_CHECK(buildPropertyAssignment(prop, obj, ctxt));
+
+    } else if (isAttachedPropertyName(prop->name)) {
+
+        COMPILE_CHECK(buildAttachedProperty(prop, obj, ctxt));
+
+    } else if (prop->index == -1) {
+
+        if (prop->isDefault) {
+            COMPILE_EXCEPTION(prop->values.first(), QCoreApplication::translate("QDeclarativeCompiler","Cannot assign to non-existent default property"));
+        } else {
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(prop->name)));
+        }
+
+    } else if (prop->value) {
+
+        COMPILE_CHECK(buildGroupedProperty(prop, obj, ctxt));
+
+    } else if (QDeclarativeEnginePrivate::get(engine)->isList(prop->type)) {
+
+        COMPILE_CHECK(buildListProperty(prop, obj, ctxt));
+
+    } else if (prop->type == qMetaTypeId<QDeclarativeScriptString>()) {
+
+        COMPILE_CHECK(buildScriptStringProperty(prop, obj, ctxt));
+
+    } else {
+
+        COMPILE_CHECK(buildPropertyAssignment(prop, obj, ctxt));
+
+    }
+
+    return true;
+}
+
+bool 
+QDeclarativeCompiler::buildPropertyInNamespace(QDeclarativeEnginePrivate::ImportedNamespace *ns,
+                                      QDeclarativeParser::Property *nsProp, 
+                                      QDeclarativeParser::Object *obj, 
+                                      const BindingContext &ctxt)
+{
+    if (!nsProp->value)
+        COMPILE_EXCEPTION(nsProp, QCoreApplication::translate("QDeclarativeCompiler","Invalid use of namespace"));
+
+    foreach (Property *prop, nsProp->value->properties) {
+
+        if (!isAttachedPropertyName(prop->name))
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Not an attached property name"));
+
+        // Setup attached property data
+
+        QDeclarativeType *type = 0;
+        QDeclarativeEnginePrivate::get(engine)->resolveTypeInNamespace(ns, prop->name,
+                                                              &type, 0, 0, 0);
+
+        if (!type || !type->attachedPropertiesType()) 
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Non-existent attached object"));
+
+        if (!prop->value)
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Invalid attached object assignment"));
+
+        Q_ASSERT(type->attachedPropertiesFunction());
+        prop->index = type->index();
+        prop->value->metatype = type->attachedPropertiesType();
+
+        COMPILE_CHECK(buildAttachedProperty(prop, obj, ctxt));
+    }
+
+    return true;
+}
+
+void QDeclarativeCompiler::genValueProperty(QDeclarativeParser::Property *prop,
+                                   QDeclarativeParser::Object *obj)
+{
+    if (QDeclarativeEnginePrivate::get(engine)->isList(prop->type)) {
+        genListProperty(prop, obj);
+    } else {
+        genPropertyAssignment(prop, obj);
+    }
+}
+
+void QDeclarativeCompiler::genListProperty(QDeclarativeParser::Property *prop,
+                                  QDeclarativeParser::Object *obj)
+{
+    int listType = QDeclarativeEnginePrivate::get(engine)->listType(prop->type);
+
+    QDeclarativeInstruction fetch;
+    fetch.type = QDeclarativeInstruction::FetchQList;
+    fetch.line = prop->location.start.line;
+    fetch.fetchQmlList.property = prop->index;
+    bool listTypeIsInterface = QDeclarativeMetaType::isInterface(listType);
+    fetch.fetchQmlList.type = listType;
+    output->bytecode << fetch;
+
+    for (int ii = 0; ii < prop->values.count(); ++ii) {
+        Value *v = prop->values.at(ii);
+
+        if (v->type == Value::CreatedObject) {
+
+            genObject(v->object);
+            if (listTypeIsInterface) {
+                QDeclarativeInstruction assign;
+                assign.type = QDeclarativeInstruction::AssignObjectList;
+                assign.line = prop->location.start.line;
+                output->bytecode << assign;
+            } else {
+                QDeclarativeInstruction store;
+                store.type = QDeclarativeInstruction::StoreObjectQList;
+                store.line = prop->location.start.line;
+                output->bytecode << store;
+            }
+
+        } else if (v->type == Value::PropertyBinding) {
+
+            genBindingAssignment(v, prop, obj);
+
+        }
+
+    }
+
+    QDeclarativeInstruction pop;
+    pop.type = QDeclarativeInstruction::PopQList;
+    pop.line = prop->location.start.line;
+    output->bytecode << pop;
+}
+
+void QDeclarativeCompiler::genPropertyAssignment(QDeclarativeParser::Property *prop,
+                                        QDeclarativeParser::Object *obj,
+                                        QDeclarativeParser::Property *valueTypeProperty)
+{
+    for (int ii = 0; ii < prop->values.count(); ++ii) {
+        QDeclarativeParser::Value *v = prop->values.at(ii);
+
+        if (v->type == Value::CreatedObject) {
+
+            genObject(v->object);
+
+            if (QDeclarativeMetaType::isInterface(prop->type)) {
+
+                QDeclarativeInstruction store;
+                store.type = QDeclarativeInstruction::StoreInterface;
+                store.line = v->object->location.start.line;
+                store.storeObject.propertyIndex = prop->index;
+                output->bytecode << store;
+
+            } else if (prop->type == -1) {
+
+                QDeclarativeInstruction store;
+                store.type = QDeclarativeInstruction::StoreVariantObject;
+                store.line = v->object->location.start.line;
+                store.storeObject.propertyIndex = prop->index;
+                output->bytecode << store;
+
+            } else {
+
+                QDeclarativeInstruction store;
+                store.type = QDeclarativeInstruction::StoreObject;
+                store.line = v->object->location.start.line;
+                store.storeObject.propertyIndex = prop->index;
+                output->bytecode << store;
+
+            }
+        } else if (v->type == Value::ValueSource) {
+            genObject(v->object);
+
+            QDeclarativeInstruction store;
+            store.type = QDeclarativeInstruction::StoreValueSource;
+            store.line = v->object->location.start.line;
+            if (valueTypeProperty) {
+                store.assignValueSource.property = genValueTypeData(prop, valueTypeProperty);
+                store.assignValueSource.owner = 1;
+            } else {
+                store.assignValueSource.property = genPropertyData(prop);
+                store.assignValueSource.owner = 0;
+            }
+            QDeclarativeType *valueType = toQmlType(v->object);
+            store.assignValueSource.castValue = valueType->propertyValueSourceCast();
+            output->bytecode << store;
+
+        } else if (v->type == Value::ValueInterceptor) {
+            genObject(v->object);
+
+            QDeclarativeInstruction store;
+            store.type = QDeclarativeInstruction::StoreValueInterceptor;
+            store.line = v->object->location.start.line;
+            if (valueTypeProperty) {
+                store.assignValueInterceptor.property = genValueTypeData(prop, valueTypeProperty);
+                store.assignValueInterceptor.owner = 1;
+            } else {
+                store.assignValueInterceptor.property = genPropertyData(prop);
+                store.assignValueInterceptor.owner = 0;
+            }
+            QDeclarativeType *valueType = toQmlType(v->object);
+            store.assignValueInterceptor.castValue = valueType->propertyValueInterceptorCast();
+            output->bytecode << store;
+
+        } else if (v->type == Value::PropertyBinding) {
+
+            genBindingAssignment(v, prop, obj, valueTypeProperty);
+
+        } else if (v->type == Value::Literal) {
+
+            QMetaProperty mp = obj->metaObject()->property(prop->index);
+            genLiteralAssignment(mp, v);
+
+        }
+
+    }
+}
+
+bool QDeclarativeCompiler::buildIdProperty(QDeclarativeParser::Property *prop,
+                                  QDeclarativeParser::Object *obj)
+{
+    if (prop->value ||
+        prop->values.count() > 1 ||
+        prop->values.at(0)->object)
+        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Invalid use of id property"));
+
+    QDeclarativeParser::Value *idValue = prop->values.at(0);
+    QString val = idValue->primitive();
+
+    if (!isValidId(val))
+        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","\"%1\" is not a valid object id").arg(val));
+
+    // We disallow id's that conflict with import prefixes and types
+    QDeclarativeEnginePrivate::ImportedNamespace *ns = 0;
+    QDeclarativeType *type = 0;
+    QDeclarativeEnginePrivate::get(engine)->resolveType(unit->imports, val.toUtf8(), 
+                                               &type, 0, 0, 0, &ns);
+    if (type)
+        COMPILE_EXCEPTION(idValue, QCoreApplication::translate("QDeclarativeCompiler","id conflicts with type name"));
+    if (ns)
+        COMPILE_EXCEPTION(idValue, QCoreApplication::translate("QDeclarativeCompiler","id conflicts with namespace prefix"));
+
+    if (compileState.ids.contains(val))
+        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","id is not unique"));
+
+    prop->values.at(0)->type = Value::Id;
+
+    obj->id = val;
+    addId(val, obj);
+
+    return true;
+}
+
+void QDeclarativeCompiler::addId(const QString &id, QDeclarativeParser::Object *obj)
+{
+    Q_ASSERT(!compileState.ids.contains(id));
+    Q_ASSERT(obj->id == id);
+    obj->idIndex = compileState.ids.count();
+    compileState.ids.insert(id, obj);
+    compileState.idIndexes.insert(obj->idIndex, obj);
+}
+
+void QDeclarativeCompiler::addBindingReference(const BindingReference &ref)
+{
+    Q_ASSERT(ref.value && !compileState.bindings.contains(ref.value));
+    compileState.bindings.insert(ref.value, ref);
+}
+
+void QDeclarativeCompiler::saveComponentState()
+{
+    Q_ASSERT(compileState.root);
+    Q_ASSERT(!savedCompileStates.contains(compileState.root));
+
+    savedCompileStates.insert(compileState.root, compileState);
+    savedComponentStats.append(componentStat);
+}
+
+QDeclarativeCompiler::ComponentCompileState
+QDeclarativeCompiler::componentState(QDeclarativeParser::Object *obj)
+{
+    Q_ASSERT(savedCompileStates.contains(obj));
+    return savedCompileStates.value(obj);
+}
+
+// Build attached property object.  In this example,
+// Text {
+//    GridView.row: 10
+// }
+// GridView is an attached property object.
+bool QDeclarativeCompiler::buildAttachedProperty(QDeclarativeParser::Property *prop,
+                                        QDeclarativeParser::Object *obj,
+                                        const BindingContext &ctxt)
+{
+    Q_ASSERT(prop->value);
+    Q_ASSERT(prop->index != -1); // This is set in buildProperty()
+
+    obj->addAttachedProperty(prop);
+
+    COMPILE_CHECK(buildSubObject(prop->value, ctxt.incr()));
+
+    return true;
+}
+
+
+// Build "grouped" properties. In this example:
+// Text {
+//     font.pointSize: 12
+//     font.family: "Helvetica"
+// }
+// font is a nested property.  pointSize and family are not.
+bool QDeclarativeCompiler::buildGroupedProperty(QDeclarativeParser::Property *prop,
+                                       QDeclarativeParser::Object *obj,
+                                       const BindingContext &ctxt)
+{
+    Q_ASSERT(prop->type != 0);
+    Q_ASSERT(prop->index != -1);
+
+    if (prop->values.count())
+        COMPILE_EXCEPTION(prop->values.first(), QCoreApplication::translate("QDeclarativeCompiler", "Invalid value in grouped property"));
+
+    if (prop->type < (int)QVariant::UserType) {
+        QDeclarativeEnginePrivate *ep =
+            static_cast<QDeclarativeEnginePrivate *>(QObjectPrivate::get(engine));
+        if (prop->type >= 0 /* QVariant == -1 */ && ep->valueTypes[prop->type]) {
+            COMPILE_CHECK(buildValueTypeProperty(ep->valueTypes[prop->type],
+                                                 prop->value, obj, ctxt.incr()));
+            obj->addValueTypeProperty(prop);
+        } else {
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Invalid grouped property access"));
+        }
+
+    } else {
+        // Load the nested property's meta type
+        prop->value->metatype = 
+            QDeclarativeEnginePrivate::get(engine)->metaObjectForType(prop->type);
+        if (!prop->value->metatype)
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Invalid grouped property access"));
+
+        obj->addGroupedProperty(prop);
+
+        COMPILE_CHECK(buildSubObject(prop->value, ctxt.incr()));
+    }
+
+    return true;
+}
+
+bool QDeclarativeCompiler::buildValueTypeProperty(QObject *type,
+                                         QDeclarativeParser::Object *obj,
+                                         QDeclarativeParser::Object *baseObj,
+                                         const BindingContext &ctxt)
+{
+    if (obj->defaultProperty)
+        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QDeclarativeCompiler","Invalid property use"));
+    obj->metatype = type->metaObject();
+
+    foreach (Property *prop, obj->properties) {
+        int idx = type->metaObject()->indexOfProperty(prop->name.constData());
+        if (idx == -1)
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(prop->name)));
+        QMetaProperty p = type->metaObject()->property(idx);
+        prop->index = idx;
+        prop->type = p.userType();
+
+        if (prop->value)
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Property assignment expected"));
+
+        if (prop->values.count() != 1)
+            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Single property assignment expected"));
+
+        Value *value = prop->values.at(0);
+
+        if (value->object) {
+            bool isPropertyValue = output->types.at(value->object->type).type->propertyValueSourceCast() != -1;
+            bool isPropertyInterceptor = output->types.at(value->object->type).type->propertyValueInterceptorCast() != -1;
+            if (!isPropertyValue && !isPropertyInterceptor) {
+                COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Unexpected object assignment"));
+            } else {
+                COMPILE_CHECK(buildObject(value->object, ctxt));
+
+                if (isPropertyInterceptor && baseObj->synthdata.isEmpty())
+                    buildDynamicMeta(baseObj, ForceCreation);
+                value->type = isPropertyValue ? Value::ValueSource : Value::ValueInterceptor;
+            }
+        } else if (value->value.isScript()) {
+            // ### Check for writability
+            BindingReference reference;
+            reference.expression = value->value;
+            reference.property = prop;
+            reference.value = value;
+            reference.bindingContext = ctxt;
+            reference.bindingContext.owner++;
+            addBindingReference(reference);
+            value->type = Value::PropertyBinding;
+        } else  {
+            COMPILE_CHECK(testLiteralAssignment(p, value));
+            value->type = Value::Literal;
+        }
+        obj->addValueProperty(prop);
+    }
+
+    return true;
+}
+
+// Build assignments to QML lists.  QML lists are properties of type
+// QList<T *> * and QDeclarativeList<T *> *.
+//
+// QList<T *> * types can accept a list of objects, or a single binding
+// QDeclarativeList<T *> * types can accept a list of objects
+bool QDeclarativeCompiler::buildListProperty(QDeclarativeParser::Property *prop,
+                                    QDeclarativeParser::Object *obj,
+                                    const BindingContext &ctxt)
+{
+    Q_ASSERT(QDeclarativeEnginePrivate::get(engine)->isList(prop->type));
+
+    int t = prop->type;
+
+    obj->addValueProperty(prop);
+
+    int listType = QDeclarativeEnginePrivate::get(engine)->listType(t);
+    bool listTypeIsInterface = QDeclarativeMetaType::isInterface(listType);
+
+    bool assignedBinding = false;
+    for (int ii = 0; ii < prop->values.count(); ++ii) {
+        Value *v = prop->values.at(ii);
+        if (v->object) {
+            v->type = Value::CreatedObject;
+            COMPILE_CHECK(buildObject(v->object, ctxt));
+
+            // We check object coercian here.  We check interface assignment
+            // at runtime.
+            if (!listTypeIsInterface) {
+                if (!canCoerce(listType, v->object)) {
+                    COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Cannot assign object to list"));
+                }
+            }
+
+        } else if (v->value.isScript()) {
+            if (assignedBinding)
+                COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Can only assign one binding to lists"));
+
+            assignedBinding = true;
+            COMPILE_CHECK(buildBinding(v, prop, ctxt));
+            v->type = Value::PropertyBinding;
+        } else {
+            COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Cannot assign primitives to lists"));
+        }
+    }
+
+    return true;
+}
+
+// Compiles an assignment to a QDeclarativeScriptString property
+bool QDeclarativeCompiler::buildScriptStringProperty(QDeclarativeParser::Property *prop,
+                                            QDeclarativeParser::Object *obj,
+                                            const BindingContext &ctxt)
+{
+    if (prop->values.count() > 1) 
+        COMPILE_EXCEPTION(prop->values.at(1), QCoreApplication::translate("QDeclarativeCompiler", "Cannot assign multiple values to a script property"));
+
+    if (prop->values.at(0)->object || !prop->values.at(0)->value.isScript())
+        COMPILE_EXCEPTION(prop->values.at(0), QCoreApplication::translate("QDeclarativeCompiler", "Invalid property assignment: script expected"));
+
+    obj->addScriptStringProperty(prop, ctxt.stack);
+
+    return true;
+}
+
+// Compile regular property assignments of the form "property: <value>"
+//
+// ### The following problems exist
+//
+// There is no distinction between how "lists" of values are specified.  This
+//    Item {
+//        children: Item {}
+//        children: Item {}
+//    }
+// is identical to
+//    Item {
+//        children: [ Item {}, Item {} ]
+//    }
+//
+// We allow assignming multiple values to single value properties
+bool QDeclarativeCompiler::buildPropertyAssignment(QDeclarativeParser::Property *prop,
+                                          QDeclarativeParser::Object *obj,
+                                          const BindingContext &ctxt)
+{
+    obj->addValueProperty(prop);
+
+    for (int ii = 0; ii < prop->values.count(); ++ii) {
+        Value *v = prop->values.at(ii);
+        if (v->object) {
+
+            COMPILE_CHECK(buildPropertyObjectAssignment(prop, obj, v, ctxt));
+
+        } else {
+
+            COMPILE_CHECK(buildPropertyLiteralAssignment(prop, obj, v, ctxt));
+
+        }
+    }
+
+    return true;
+}
+
+// Compile assigning a single object instance to a regular property
+bool QDeclarativeCompiler::buildPropertyObjectAssignment(QDeclarativeParser::Property *prop,
+                                                QDeclarativeParser::Object *obj,
+                                                QDeclarativeParser::Value *v,
+                                                const BindingContext &ctxt)
+{
+    Q_ASSERT(prop->index != -1);
+    Q_ASSERT(v->object->type != -1);
+
+    if (!obj->metaObject()->property(prop->index).isWritable())
+        COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop->name)));
+
+    if (QDeclarativeMetaType::isInterface(prop->type)) {
+
+        // Assigning an object to an interface ptr property
+        COMPILE_CHECK(buildObject(v->object, ctxt));
+
+        v->type = Value::CreatedObject;
+
+    } else if (prop->type == -1) {
+
+        // Assigning an object to a QVariant
+        COMPILE_CHECK(buildObject(v->object, ctxt));
+
+        v->type = Value::CreatedObject;
+    } else {
+        // Normally buildObject() will set this up, but we need the static
+        // meta object earlier to test for assignability.  It doesn't matter
+        // that there may still be outstanding synthesized meta object changes
+        // on this type, as they are not relevant for assignability testing
+        v->object->metatype = output->types.at(v->object->type).metaObject();
+        Q_ASSERT(v->object->metaObject());
+
+        // Will be true if the assigned type inherits QDeclarativePropertyValueSource
+        bool isPropertyValue = false;
+        // Will be true if the assigned type inherits QDeclarativePropertyValueInterceptor
+        bool isPropertyInterceptor = false;
+        if (QDeclarativeType *valueType = toQmlType(v->object)) {
+            isPropertyValue = valueType->propertyValueSourceCast() != -1;
+            isPropertyInterceptor = valueType->propertyValueInterceptorCast() != -1;
+        }
+
+        // We want to raw metaObject here as the raw metaobject is the
+        // actual property type before we applied any extensions that might
+        // effect the properties on the type, but don't effect assignability
+        const QMetaObject *propertyMetaObject =
+            QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(prop->type);
+
+        // Will be true if the assgned type inherits propertyMetaObject
+        bool isAssignable = false;
+        // Determine isAssignable value
+        if (propertyMetaObject) {
+            const QMetaObject *c = v->object->metatype;
+            while(c) {
+                isAssignable |= (QDeclarativeMetaPropertyPrivate::equal(c, propertyMetaObject));
+                c = c->superClass();
+            }
+        }
+
+        if (isAssignable) {
+            // Simple assignment
+            COMPILE_CHECK(buildObject(v->object, ctxt));
+
+            v->type = Value::CreatedObject;
+        } else if (propertyMetaObject == &QDeclarativeComponent::staticMetaObject) {
+            // Automatic "Component" insertion
+            QDeclarativeParser::Object *root = v->object;
+            QDeclarativeParser::Object *component = new QDeclarativeParser::Object;
+            component->type = componentTypeRef();
+            component->typeName = "Qt/Component";
+            component->metatype = &QDeclarativeComponent::staticMetaObject;
+            component->location = root->location;
+            QDeclarativeParser::Value *componentValue = new QDeclarativeParser::Value;
+            componentValue->object = root;
+            component->getDefaultProperty()->addValue(componentValue);
+            v->object = component;
+            COMPILE_CHECK(buildPropertyObjectAssignment(prop, obj, v, ctxt));
+        } else if (isPropertyValue || isPropertyInterceptor) {
+            // Assign as a property value source
+            COMPILE_CHECK(buildObject(v->object, ctxt));
+
+            if (isPropertyInterceptor && prop->parent->synthdata.isEmpty())
+                   buildDynamicMeta(prop->parent, ForceCreation);
+            v->type = isPropertyValue ? Value::ValueSource : Value::ValueInterceptor;
+        } else {
+            COMPILE_EXCEPTION(v->object, QCoreApplication::translate("QDeclarativeCompiler","Cannot assign object to property"));
+        }
+    }
+
+    return true;
+}
+
+// Compile assigning a literal or binding to a regular property
+bool QDeclarativeCompiler::buildPropertyLiteralAssignment(QDeclarativeParser::Property *prop,
+                                                 QDeclarativeParser::Object *obj,
+                                                 QDeclarativeParser::Value *v,
+                                                 const BindingContext &ctxt)
+{
+    Q_ASSERT(prop->index != -1);
+
+    if (v->value.isScript()) {
+
+        //optimization for <Type>.<EnumValue> enum assignments
+        bool isEnumAssignment = false;
+        COMPILE_CHECK(testQualifiedEnumAssignment(obj->metaObject()->property(prop->index), obj, v, &isEnumAssignment));
+        if (isEnumAssignment) {
+            v->type = Value::Literal;
+            return true;
+        }
+
+        COMPILE_CHECK(buildBinding(v, prop, ctxt));
+
+        v->type = Value::PropertyBinding;
+
+    } else {
+
+        COMPILE_CHECK(testLiteralAssignment(obj->metaObject()->property(prop->index), v));
+
+        v->type = Value::Literal;
+    }
+
+    return true;
+}
+
+bool QDeclarativeCompiler::testQualifiedEnumAssignment(const QMetaProperty &prop,
+                                              QDeclarativeParser::Object *obj,
+                                              QDeclarativeParser::Value *v,
+                                              bool *isAssignment)
+{
+    *isAssignment = false;
+    if (!prop.isEnumType())
+        return true;
+
+    if (!prop.isWritable())
+        COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop.name())));
+
+    QString string = v->value.asString();
+    if (!string.at(0).isUpper())
+        return true;
+
+    QStringList parts = string.split(QLatin1Char('.'));
+    if (parts.count() != 2)
+        return true;
+
+    QString typeName = parts.at(0);
+    QDeclarativeType *type = 0;
+    QDeclarativeEnginePrivate::get(engine)->resolveType(unit->imports, typeName.toUtf8(),
+                                               &type, 0, 0, 0, 0);
+
+    if (!type || obj->typeName != type->qmlTypeName())
+        return true;
+
+    QString enumValue = parts.at(1);
+    int value;
+    if (prop.isFlagType()) {
+        value = prop.enumerator().keysToValue(enumValue.toUtf8().constData());
+    } else
+        value = prop.enumerator().keyToValue(enumValue.toUtf8().constData());
+    if (value == -1)
+        return true;
+
+    v->type = Value::Literal;
+    v->value = QDeclarativeParser::Variant(enumValue);
+    *isAssignment = true;
+
+    return true;
+}
+
+// Ensures that the dynamic meta specification on obj is valid
+bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj)
+{
+    QSet<QByteArray> propNames;
+    QSet<QByteArray> methodNames;
+    bool seenDefaultProperty = false;
+
+    // Check properties
+    for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
+        const QDeclarativeParser::Object::DynamicProperty &prop =
+            obj->dynamicProperties.at(ii);
+
+        if (prop.isDefaultProperty) {
+            if (seenDefaultProperty)
+                COMPILE_EXCEPTION(&prop, QCoreApplication::translate("QDeclarativeCompiler","Duplicate default property"));
+            seenDefaultProperty = true;
+        }
+
+        if (propNames.contains(prop.name))
+            COMPILE_EXCEPTION(&prop, QCoreApplication::translate("QDeclarativeCompiler","Duplicate property name"));
+
+        propNames.insert(prop.name);
+    }
+
+    for (int ii = 0; ii < obj->dynamicSignals.count(); ++ii) {
+        QByteArray name = obj->dynamicSignals.at(ii).name;
+        if (methodNames.contains(name))
+            COMPILE_EXCEPTION(obj, QCoreApplication::translate("QDeclarativeCompiler","Duplicate signal name"));
+        methodNames.insert(name);
+    }
+    for (int ii = 0; ii < obj->dynamicSlots.count(); ++ii) {
+        QByteArray name = obj->dynamicSlots.at(ii).name;
+        if (methodNames.contains(name))
+            COMPILE_EXCEPTION(obj, QCoreApplication::translate("QDeclarativeCompiler","Duplicate method name"));
+        methodNames.insert(name);
+    }
+
+    return true;
+}
+
+bool QDeclarativeCompiler::mergeDynamicMetaProperties(QDeclarativeParser::Object *obj)
+{
+    for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
+        const Object::DynamicProperty &p = obj->dynamicProperties.at(ii);
+
+        if (!p.defaultValue || p.type == Object::DynamicProperty::Alias)
+            continue;
+
+        Property *property = 0;
+        if (p.isDefaultProperty)
+            property = obj->getDefaultProperty();
+        else
+            property = obj->getProperty(p.name);
+
+        if (property->value)
+            COMPILE_EXCEPTION(property, QCoreApplication::translate("QDeclarativeCompiler","Invalid property nesting"));
+
+        for (int ii = 0; ii < p.defaultValue->values.count(); ++ii) {
+            Value *v = p.defaultValue->values.at(ii);
+            v->addref();
+            property->values.append(v);
+        }
+    }
+    return true;
+}
+
+Q_GLOBAL_STATIC(QAtomicInt, classIndexCounter)
+
+bool QDeclarativeCompiler::buildDynamicMeta(QDeclarativeParser::Object *obj, DynamicMetaMode mode)
+{
+    Q_ASSERT(obj);
+    Q_ASSERT(obj->metatype);
+
+    if (mode != ForceCreation &&
+        obj->dynamicProperties.isEmpty() &&
+        obj->dynamicSignals.isEmpty() &&
+        obj->dynamicSlots.isEmpty())
+        return true;
+
+    COMPILE_CHECK(checkDynamicMeta(obj));
+
+    QByteArray dynamicData(sizeof(QDeclarativeVMEMetaData), (char)0);
+
+    QByteArray newClassName = obj->metatype->className();
+    newClassName.append("_QML_");
+    int idx = classIndexCounter()->fetchAndAddRelaxed(1);
+    newClassName.append(QByteArray::number(idx));
+    if (compileState.root == obj) {
+        QString path = output->url.path();
+        int lastSlash = path.lastIndexOf(QLatin1Char('/'));
+        if (lastSlash > -1) {
+            QString nameBase = path.mid(lastSlash + 1, path.length()-lastSlash-5);
+            if (!nameBase.isEmpty() && nameBase.at(0).isUpper())
+                newClassName = nameBase.toUtf8() + "_QMLTYPE_" + QByteArray::number(idx);
+        }
+    }
+
+    QMetaObjectBuilder builder;
+    builder.setClassName(newClassName);
+    builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
+
+    bool hasAlias = false;
+    for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
+        const Object::DynamicProperty &p = obj->dynamicProperties.at(ii);
+
+        int propIdx =
+            obj->metaObject()->indexOfProperty(p.name.constData());
+        if (-1 != propIdx) {
+            QMetaProperty prop = obj->metaObject()->property(propIdx);
+            if (prop.isFinal())
+                COMPILE_EXCEPTION(&p, QCoreApplication::translate("QDeclarativeCompiler","Cannot override FINAL property"));
+        }
+
+        if (p.isDefaultProperty &&
+            (p.type != Object::DynamicProperty::Alias ||
+             mode == ResolveAliases))
+            builder.addClassInfo("DefaultProperty", p.name);
+
+        QByteArray type;
+        int propertyType = 0;
+        bool readonly = false;
+        switch(p.type) {
+        case Object::DynamicProperty::Alias:
+            hasAlias = true;
+            continue;
+            break;
+        case Object::DynamicProperty::CustomList:
+        case Object::DynamicProperty::Custom:
+            {
+                QByteArray customTypeName;
+                QDeclarativeType *qmltype = 0;
+                QUrl url;
+                QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(engine);
+                if (!priv->resolveType(unit->imports, p.customType, &qmltype, 
+                                       &url, 0, 0, 0)) 
+                    COMPILE_EXCEPTION(&p, QCoreApplication::translate("QDeclarativeCompiler","Invalid property type"));
+
+                if (!qmltype) {
+                    QDeclarativeCompositeTypeData *tdata = priv->typeManager.get(url);
+                    Q_ASSERT(tdata);
+                    Q_ASSERT(tdata->status == QDeclarativeCompositeTypeData::Complete);
+
+                    QDeclarativeCompiledData *data = tdata->toCompiledComponent(engine);
+                    customTypeName = data->root->className();
+                } else {
+                    customTypeName = qmltype->typeName();
+                }
+
+                if (p.type == Object::DynamicProperty::Custom) {
+                    type = customTypeName + '*';
+                    propertyType = QMetaType::QObjectStar;
+                } else {
+                    readonly = true;
+                    type = "QDeclarativeListProperty<";
+                    type.append(customTypeName);
+                    type.append(">");
+                    propertyType = qMetaTypeId<QDeclarativeListProperty<QObject> >();
+                }
+            }
+            break;
+        case Object::DynamicProperty::Variant:
+            propertyType = -1;
+            type = "QVariant";
+            break;
+        case Object::DynamicProperty::Int:
+            propertyType = QVariant::Int;
+            type = "int";
+            break;
+        case Object::DynamicProperty::Bool:
+            propertyType = QVariant::Bool;
+            type = "bool";
+            break;
+        case Object::DynamicProperty::Real:
+            propertyType = QVariant::Double;
+            type = "double";
+            break;
+        case Object::DynamicProperty::String:
+            propertyType = QVariant::String;
+            type = "QString";
+            break;
+        case Object::DynamicProperty::Url:
+            propertyType = QVariant::Url;
+            type = "QUrl";
+            break;
+        case Object::DynamicProperty::Color:
+            propertyType = QVariant::Color;
+            type = "QColor";
+            break;
+        case Object::DynamicProperty::Date:
+            propertyType = QVariant::Date;
+            type = "QDate";
+            break;
+        }
+
+        ((QDeclarativeVMEMetaData *)dynamicData.data())->propertyCount++;
+        QDeclarativeVMEMetaData::PropertyData propertyData = { propertyType };
+        dynamicData.append((char *)&propertyData, sizeof(propertyData));
+
+        builder.addSignal(p.name + "Changed()");
+        QMetaPropertyBuilder propBuilder = 
+            builder.addProperty(p.name, type, builder.methodCount() - 1);
+        propBuilder.setScriptable(true);
+        propBuilder.setWritable(!readonly);
+    }
+
+    if (mode == ResolveAliases) {
+        for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
+            const Object::DynamicProperty &p = obj->dynamicProperties.at(ii);
+
+            if (p.type == Object::DynamicProperty::Alias) {
+                ((QDeclarativeVMEMetaData *)dynamicData.data())->aliasCount++;
+                compileAlias(builder, dynamicData, obj, p);
+            }
+        }
+    }
+
+    for (int ii = 0; ii < obj->dynamicSignals.count(); ++ii) {
+        const Object::DynamicSignal &s = obj->dynamicSignals.at(ii);
+        QByteArray sig(s.name + '(');
+        for (int jj = 0; jj < s.parameterTypes.count(); ++jj) {
+            if (jj) sig.append(',');
+            sig.append(s.parameterTypes.at(jj));
+        }
+        sig.append(')');
+        QMetaMethodBuilder b = builder.addSignal(sig);
+        b.setParameterNames(s.parameterNames);
+        ((QDeclarativeVMEMetaData *)dynamicData.data())->signalCount++;
+    }
+
+    QStringList funcScripts;
+
+    for (int ii = 0; ii < obj->dynamicSlots.count(); ++ii) {
+        Object::DynamicSlot &s = obj->dynamicSlots[ii];
+        QByteArray sig(s.name + '(');
+        QString funcScript(QLatin1String("(function("));
+
+        for (int jj = 0; jj < s.parameterNames.count(); ++jj) {
+            if (jj) { 
+                sig.append(',');
+                funcScript.append(QLatin1Char(','));
+            }
+            funcScript.append(QLatin1String(s.parameterNames.at(jj)));
+            sig.append("QVariant");
+        }
+        sig.append(')');
+        funcScript.append(QLatin1Char(')'));
+        funcScript.append(s.body);
+        funcScript.append(QLatin1Char(')'));
+        funcScripts << funcScript;
+
+        QMetaMethodBuilder b = builder.addSlot(sig);
+        b.setReturnType("QVariant");
+        b.setParameterNames(s.parameterNames);
+
+        ((QDeclarativeVMEMetaData *)dynamicData.data())->methodCount++;
+        QDeclarativeVMEMetaData::MethodData methodData =
+             { s.parameterNames.count(), 0, funcScript.length(), 0 };
+
+        dynamicData.append((char *)&methodData, sizeof(methodData));
+    }
+
+    for (int ii = 0; ii < obj->dynamicSlots.count(); ++ii) {
+        const QString &funcScript = funcScripts.at(ii);
+        QDeclarativeVMEMetaData::MethodData *data =
+            ((QDeclarativeVMEMetaData *)dynamicData.data())->methodData() + ii;
+
+        data->bodyOffset = dynamicData.size();
+
+        dynamicData.append((const char *)funcScript.constData(),
+                           (funcScript.length() * sizeof(QChar)));
+    }
+
+    obj->metadata = builder.toRelocatableData();
+    builder.fromRelocatableData(&obj->extObject, obj->metatype, obj->metadata);
+
+    if (mode == IgnoreAliases && hasAlias)
+        compileState.aliasingObjects << obj;
+
+    obj->synthdata = dynamicData;
+
+    return true;
+}
+
+#include <qdeclarativejsparser_p.h>
+
+static QStringList astNodeToStringList(QDeclarativeJS::AST::Node *node)
+{
+    if (node->kind == QDeclarativeJS::AST::Node::Kind_IdentifierExpression) {
+        QString name =
+            static_cast<QDeclarativeJS::AST::IdentifierExpression *>(node)->name->asString();
+        return QStringList() << name;
+    } else if (node->kind == QDeclarativeJS::AST::Node::Kind_FieldMemberExpression) {
+        QDeclarativeJS::AST::FieldMemberExpression *expr = static_cast<QDeclarativeJS::AST::FieldMemberExpression *>(node);
+
+        QStringList rv = astNodeToStringList(expr->base);
+        if (rv.isEmpty())
+            return rv;
+        rv.append(expr->name->asString());
+        return rv;
+    }
+    return QStringList();
+}
+
+bool QDeclarativeCompiler::compileAlias(QMetaObjectBuilder &builder,
+                               QByteArray &data,
+                               Object *obj,
+                               const Object::DynamicProperty &prop)
+{
+    if (!prop.defaultValue)
+        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QDeclarativeCompiler","No property alias location"));
+
+    if (prop.defaultValue->values.count() != 1 ||
+        prop.defaultValue->values.at(0)->object ||
+        !prop.defaultValue->values.at(0)->value.isScript())
+        COMPILE_EXCEPTION(prop.defaultValue, QCoreApplication::translate("QDeclarativeCompiler","Invalid alias location"));
+
+    QDeclarativeJS::AST::Node *node = prop.defaultValue->values.at(0)->value.asAST();
+    if (!node)
+        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QDeclarativeCompiler","No property alias location")); // ### Can this happen?
+
+    QStringList alias = astNodeToStringList(node);
+
+    if (alias.count() != 1 && alias.count() != 2)
+        COMPILE_EXCEPTION(prop.defaultValue, QCoreApplication::translate("QDeclarativeCompiler","Invalid alias reference. An alias reference must be specified as <id> or <id>.<property>"));
+
+    if (!compileState.ids.contains(alias.at(0)))
+        COMPILE_EXCEPTION(prop.defaultValue, QCoreApplication::translate("QDeclarativeCompiler","Invalid alias reference. Unable to find id \"%1\"").arg(alias.at(0)));
+
+    Object *idObject = compileState.ids[alias.at(0)];
+
+    QByteArray typeName;
+
+    int propIdx = -1;
+    int flags = 0;
+    bool writable = false;
+    if (alias.count() == 2) {
+        propIdx = idObject->metaObject()->indexOfProperty(alias.at(1).toUtf8().constData());
+
+        if (-1 == propIdx)
+            COMPILE_EXCEPTION(prop.defaultValue, QCoreApplication::translate("QDeclarativeCompiler","Invalid alias location"));
+
+        QMetaProperty aliasProperty = idObject->metaObject()->property(propIdx);
+        writable = aliasProperty.isWritable();
+
+        if (aliasProperty.isEnumType()) 
+            typeName = "int";  // Avoid introducing a dependency on the aliased metaobject
+        else
+            typeName = aliasProperty.typeName();
+    } else {
+        typeName = idObject->metaObject()->className();
+
+        //use the base type since it has been registered with metatype system
+        int index = typeName.indexOf("_QML_");
+        if (index != -1) {
+            typeName = typeName.left(index);
+        } else {
+            index = typeName.indexOf("_QMLTYPE_");
+            const QMetaObject *mo = idObject->metaObject();
+            while (index != -1 && mo) {
+                typeName = mo->superClass()->className();
+                index = typeName.indexOf("_QMLTYPE_");
+                mo = mo->superClass();
+            }
+        }
+
+        typeName += '*';
+    }
+
+    if (typeName.endsWith('*'))
+        flags |= QML_ALIAS_FLAG_PTR;
+
+    data.append((const char *)&idObject->idIndex, sizeof(idObject->idIndex));
+    data.append((const char *)&propIdx, sizeof(propIdx));
+    data.append((const char *)&flags, sizeof(flags));
+
+    builder.addSignal(prop.name + "Changed()");
+    QMetaPropertyBuilder propBuilder = 
+        builder.addProperty(prop.name, typeName.constData(), builder.methodCount() - 1);
+    propBuilder.setScriptable(true);
+    propBuilder.setWritable(writable);
+    return true;
+}
+
+bool QDeclarativeCompiler::buildBinding(QDeclarativeParser::Value *value,
+                               QDeclarativeParser::Property *prop,
+                               const BindingContext &ctxt)
+{
+    Q_ASSERT(prop->index != -1);
+    Q_ASSERT(prop->parent);
+    Q_ASSERT(prop->parent->metaObject());
+
+    QMetaProperty mp = prop->parent->metaObject()->property(prop->index);
+    if (!mp.isWritable() && !QDeclarativeMetaType::isList(prop->type))
+        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop->name)));
+
+    BindingReference reference;
+    reference.expression = value->value;
+    reference.property = prop;
+    reference.value = value;
+    reference.bindingContext = ctxt;
+    addBindingReference(reference);
+
+    return true;
+}
+
+void QDeclarativeCompiler::genBindingAssignment(QDeclarativeParser::Value *binding,
+                                       QDeclarativeParser::Property *prop,
+                                       QDeclarativeParser::Object *obj,
+                                       QDeclarativeParser::Property *valueTypeProperty)
+{
+    Q_UNUSED(obj);
+    Q_ASSERT(compileState.bindings.contains(binding));
+
+    const BindingReference &ref = compileState.bindings.value(binding);
+    if (ref.dataType == BindingReference::Experimental) {
+        QDeclarativeInstruction store;
+        store.type = QDeclarativeInstruction::StoreCompiledBinding;
+        store.assignBinding.value = ref.compiledIndex;
+        store.assignBinding.context = ref.bindingContext.stack;
+        store.assignBinding.owner = ref.bindingContext.owner;
+        if (valueTypeProperty) 
+            store.assignBinding.property = (valueTypeProperty->index & 0xFFFF) |
+                                           ((valueTypeProperty->type & 0xFF)) << 16 |
+                                           ((prop->index & 0xFF) << 24);
+        else 
+            store.assignBinding.property = prop->index;
+        store.line = binding->location.start.line;
+        output->bytecode << store;
+        return;
+    }
+
+    QDeclarativeInstruction store;
+    store.type = QDeclarativeInstruction::StoreBinding;
+    store.assignBinding.value = output->indexForByteArray(ref.compiledData);
+    store.assignBinding.context = ref.bindingContext.stack;
+    store.assignBinding.owner = ref.bindingContext.owner;
+    store.line = binding->location.start.line;
+
+    Q_ASSERT(ref.bindingContext.owner == 0 ||
+             (ref.bindingContext.owner != 0 && valueTypeProperty));
+    if (ref.bindingContext.owner) {
+        store.assignBinding.property = genValueTypeData(prop, valueTypeProperty);
+    } else {
+        store.assignBinding.property = genPropertyData(prop);
+    }
+
+    output->bytecode << store;
+}
+
+int QDeclarativeCompiler::genContextCache()
+{
+    if (compileState.ids.count() == 0)
+        return -1;
+
+    QDeclarativeIntegerCache *cache = new QDeclarativeIntegerCache(engine);
+
+    for (QHash<QString, QDeclarativeParser::Object *>::ConstIterator iter = compileState.ids.begin();
+         iter != compileState.ids.end();
+         ++iter) 
+        cache->add(iter.key(), (*iter)->idIndex);
+
+    output->contextCaches.append(cache);
+    return output->contextCaches.count() - 1;
+}
+
+int QDeclarativeCompiler::genValueTypeData(QDeclarativeParser::Property *valueTypeProp, 
+                                  QDeclarativeParser::Property *prop)
+{
+    QByteArray data =
+        QDeclarativeMetaPropertyPrivate::saveValueType(prop->parent->metaObject(), prop->index, 
+                                              QDeclarativeEnginePrivate::get(engine)->valueTypes[prop->type]->metaObject(), 
+                                              valueTypeProp->index);
+//                valueTypeProp->index, valueTypeProp->type);
+
+    return output->indexForByteArray(data);
+}
+
+int QDeclarativeCompiler::genPropertyData(QDeclarativeParser::Property *prop)
+{
+    return output->indexForByteArray(QDeclarativeMetaPropertyPrivate::saveProperty(prop->parent->metaObject(), prop->index));
+}
+
+bool QDeclarativeCompiler::completeComponentBuild()
+{
+    componentStat.ids = compileState.ids.count();
+
+    for (int ii = 0; ii < compileState.aliasingObjects.count(); ++ii) {
+        Object *aliasObject = compileState.aliasingObjects.at(ii);
+        COMPILE_CHECK(buildDynamicMeta(aliasObject, ResolveAliases));
+    }
+
+    QDeclarativeBindingCompiler::Expression expr;
+    expr.component = compileState.root;
+    expr.ids = compileState.ids;
+
+    QDeclarativeBindingCompiler bindingCompiler;
+
+    for (QHash<QDeclarativeParser::Value*,BindingReference>::Iterator iter = compileState.bindings.begin(); iter != compileState.bindings.end(); ++iter) {
+        BindingReference &binding = *iter;
+
+        expr.context = binding.bindingContext.object;
+        expr.property = binding.property;
+        expr.expression = binding.expression;
+        expr.imports = unit->imports;
+
+        if (qmlExperimental()) {
+            int index = bindingCompiler.compile(expr, QDeclarativeEnginePrivate::get(engine));
+            if (index != -1) {
+                qWarning() << "Accepted for optimization:" << qPrintable(expr.expression.asScript());
+                binding.dataType = BindingReference::Experimental;
+                binding.compiledIndex = index;
+                componentStat.optimizedBindings++;
+                continue;
+            } else {
+                qWarning() << "Rejected for optimization:" << qPrintable(expr.expression.asScript());
+            }
+        }
+
+        binding.dataType = BindingReference::QtScript;
+
+        // Pre-rewrite the expression
+        QString expression = binding.expression.asScript();
+
+        // ### Optimize
+        QDeclarativeRewrite::SharedBindingTester sharableTest;
+        bool isSharable = sharableTest.isSharable(expression);
+        
+        QDeclarativeRewrite::RewriteBinding rewriteBinding;
+        expression = rewriteBinding(expression);
+
+        quint32 length = expression.length();
+        quint32 pc; 
+        
+        if (isSharable) {
+            pc = output->cachedClosures.count();
+            pc |= 0x80000000;
+            output->cachedClosures.append(0);
+        } else {
+            pc = output->cachedPrograms.length();
+            output->cachedPrograms.append(0);
+        }
+
+        binding.compiledData =
+            QByteArray((const char *)&pc, sizeof(quint32)) +
+            QByteArray((const char *)&length, sizeof(quint32)) +
+            QByteArray((const char *)expression.constData(), 
+                       expression.length() * sizeof(QChar));
+
+        componentStat.scriptBindings++;
+    }
+
+    if (bindingCompiler.isValid()) {
+        compileState.compiledBindingData = bindingCompiler.program();
+        QDeclarativeBindingCompiler::dump(compileState.compiledBindingData);
+    }
+
+    saveComponentState();
+
+    return true;
+}
+
+void QDeclarativeCompiler::dumpStats()
+{
+    qWarning().nospace() << "QML Document: " << output->url.toString();
+    for (int ii = 0; ii < savedComponentStats.count(); ++ii) {
+        const ComponentStat &stat = savedComponentStats.at(ii);
+        qWarning().nospace() << "    Component Line " << stat.lineNumber;
+        qWarning().nospace() << "        Total Objects:      " << stat.objects;
+        qWarning().nospace() << "        IDs Used:           " << stat.ids;
+        qWarning().nospace() << "        Optimized Bindings: " << stat.optimizedBindings;
+        qWarning().nospace() << "        QScript Bindings:   " << stat.scriptBindings;
+    }
+}
+
+/*!
+    Returns true if from can be assigned to a (QObject) property of type
+    to.
+*/
+bool QDeclarativeCompiler::canCoerce(int to, QDeclarativeParser::Object *from)
+{
+    const QMetaObject *toMo = 
+        QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(to);
+    const QMetaObject *fromMo = from->metaObject();
+
+    while (fromMo) {
+        if (QDeclarativeMetaPropertyPrivate::equal(fromMo, toMo))
+            return true;
+        fromMo = fromMo->superClass();
+    }
+    return false;
+}
+
+/*!
+    Returns true if from can be assigned to a (QObject) property of type
+    to.
+*/
+bool QDeclarativeCompiler::canCoerce(int to, int from)
+{
+    const QMetaObject *toMo = 
+        QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(to);
+    const QMetaObject *fromMo = 
+        QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(from);
+
+    while (fromMo) {
+        if (QDeclarativeMetaPropertyPrivate::equal(fromMo, toMo))
+            return true;
+        fromMo = fromMo->superClass();
+    }
+    return false;
+}
+
+QDeclarativeType *QDeclarativeCompiler::toQmlType(QDeclarativeParser::Object *from)
+{
+    // ### Optimize
+    const QMetaObject *mo = from->metatype;
+    QDeclarativeType *type = 0;
+    while (!type && mo) {
+        type = QDeclarativeMetaType::qmlType(mo);
+        mo = mo->superClass();
+    }
+   return type;
+}
+
+QStringList QDeclarativeCompiler::deferredProperties(QDeclarativeParser::Object *obj)
+{
+    const QMetaObject *mo = obj->metatype;
+
+    int idx = mo->indexOfClassInfo("DeferredPropertyNames");
+    if (idx == -1)
+        return QStringList();
+
+    QMetaClassInfo classInfo = mo->classInfo(idx);
+    QStringList rv = QString::fromUtf8(classInfo.value()).split(QLatin1Char(','));
+    return rv;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
new file mode 100644
index 0000000..627490d
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -0,0 +1,337 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECOMPILER_P_H
+#define QDECLARATIVECOMPILER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarative.h"
+#include "qdeclarativeerror.h"
+#include "qdeclarativeinstruction_p.h"
+#include "qdeclarativecompositetypemanager_p.h"
+#include "qdeclarativeparser_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qbitfield_p.h"
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativeintegercache_p.h"
+#include "qdeclarativetypenamecache_p.h"
+
+#include <QtCore/qbytearray.h>
+#include <QtCore/qset.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QDeclarativeComponent;
+class QDeclarativeContext;
+
+class QScriptProgram;
+class Q_AUTOTEST_EXPORT QDeclarativeCompiledData : public QDeclarativeRefCount, public QDeclarativeCleanup
+{
+public:
+    QDeclarativeCompiledData(QDeclarativeEngine *engine);
+    virtual ~QDeclarativeCompiledData();
+
+    QString name;
+    QUrl url;
+    QDeclarativeEnginePrivate::Imports imports;
+    QDeclarativeTypeNameCache *importCache;
+
+    struct TypeReference 
+    {
+        TypeReference()
+        : type(0), component(0), ref(0) {}
+
+        QByteArray className;
+        QDeclarativeType *type;
+        QDeclarativeComponent *component;
+
+        QDeclarativeRefCount *ref;
+        QObject *createInstance(QDeclarativeContext *, const QBitField &) const;
+        const QMetaObject *metaObject() const;
+    };
+    QList<TypeReference> types;
+    struct CustomTypeData
+    {
+        int index;
+        int type;
+    };
+
+    const QMetaObject *root;
+    QAbstractDynamicMetaObject rootData;
+    QDeclarativePropertyCache *rootPropertyCache;
+    QList<QString> primitives;
+    QList<float> floatData;
+    QList<int> intData;
+    QList<CustomTypeData> customTypeData;
+    QList<QByteArray> datas;
+    QList<QDeclarativeParser::Location> locations;
+    QList<QDeclarativeInstruction> bytecode;
+    QList<QScriptProgram *> cachedPrograms;
+    QList<QScriptValue *> cachedClosures;
+    QList<QDeclarativePropertyCache *> propertyCaches;
+    QList<QDeclarativeIntegerCache *> contextCaches;
+    QList<QDeclarativeParser::Object::ScriptBlock> scripts;
+    QList<QUrl> urls;
+
+    void dumpInstructions();
+
+protected:
+    virtual void clear(); // From QDeclarativeCleanup
+
+private:
+    void dump(QDeclarativeInstruction *, int idx = -1);
+    QDeclarativeCompiledData(const QDeclarativeCompiledData &other);
+    QDeclarativeCompiledData &operator=(const QDeclarativeCompiledData &other);
+    QByteArray packData;
+    friend class QDeclarativeCompiler;
+    int pack(const char *, size_t);
+
+    int indexForString(const QString &);
+    int indexForByteArray(const QByteArray &);
+    int indexForFloat(float *, int);
+    int indexForInt(int *, int);
+    int indexForLocation(const QDeclarativeParser::Location &);
+    int indexForLocation(const QDeclarativeParser::LocationSpan &);
+    int indexForUrl(const QUrl &);
+};
+
+class QMetaObjectBuilder;
+class Q_DECLARATIVE_EXPORT QDeclarativeCompiler
+{
+public:
+    QDeclarativeCompiler();
+
+    bool compile(QDeclarativeEngine *, QDeclarativeCompositeTypeData *, QDeclarativeCompiledData *);
+
+    bool isError() const;
+    QList<QDeclarativeError> errors() const;
+
+    static bool isValidId(const QString &);
+    static bool isAttachedPropertyName(const QByteArray &);
+    static bool isSignalPropertyName(const QByteArray &);
+
+private:
+    static void reset(QDeclarativeCompiledData *);
+
+    struct BindingContext {
+        BindingContext()
+            : stack(0), owner(0), object(0) {}
+        BindingContext(QDeclarativeParser::Object *o)
+            : stack(0), owner(0), object(o) {}
+        BindingContext incr() const {
+            BindingContext rv(object);
+            rv.stack = stack + 1;
+            return rv;
+        }
+        bool isSubContext() const { return stack != 0; }
+        int stack;
+        int owner;
+        QDeclarativeParser::Object *object;
+    };
+
+    void compileTree(QDeclarativeParser::Object *tree);
+
+
+    bool buildObject(QDeclarativeParser::Object *obj, const BindingContext &);
+    bool buildScript(QDeclarativeParser::Object *obj, QDeclarativeParser::Object *script);
+    bool buildComponent(QDeclarativeParser::Object *obj, const BindingContext &);
+    bool buildSubObject(QDeclarativeParser::Object *obj, const BindingContext &);
+    bool buildSignal(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj, 
+                     const BindingContext &);
+    bool buildProperty(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj, 
+                       const BindingContext &);
+    bool buildPropertyInNamespace(QDeclarativeEnginePrivate::ImportedNamespace *ns,
+                                  QDeclarativeParser::Property *prop, 
+                                  QDeclarativeParser::Object *obj, 
+                                  const BindingContext &);
+    bool buildIdProperty(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj);
+    bool buildAttachedProperty(QDeclarativeParser::Property *prop, 
+                               QDeclarativeParser::Object *obj,
+                               const BindingContext &ctxt);
+    bool buildGroupedProperty(QDeclarativeParser::Property *prop,
+                              QDeclarativeParser::Object *obj,
+                              const BindingContext &ctxt);
+    bool buildValueTypeProperty(QObject *type, 
+                                QDeclarativeParser::Object *obj, 
+                                QDeclarativeParser::Object *baseObj,
+                                const BindingContext &ctxt);
+    bool buildListProperty(QDeclarativeParser::Property *prop,
+                           QDeclarativeParser::Object *obj,
+                           const BindingContext &ctxt);
+    bool buildScriptStringProperty(QDeclarativeParser::Property *prop,
+                                   QDeclarativeParser::Object *obj,
+                                   const BindingContext &ctxt);
+    bool buildPropertyAssignment(QDeclarativeParser::Property *prop,
+                                 QDeclarativeParser::Object *obj,
+                                 const BindingContext &ctxt);
+    bool buildPropertyObjectAssignment(QDeclarativeParser::Property *prop,
+                                       QDeclarativeParser::Object *obj,
+                                       QDeclarativeParser::Value *value,
+                                       const BindingContext &ctxt);
+    bool buildPropertyLiteralAssignment(QDeclarativeParser::Property *prop,
+                                        QDeclarativeParser::Object *obj,
+                                        QDeclarativeParser::Value *value,
+                                        const BindingContext &ctxt);
+    bool doesPropertyExist(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj);
+    bool testLiteralAssignment(const QMetaProperty &prop, 
+                               QDeclarativeParser::Value *value);
+    bool testQualifiedEnumAssignment(const QMetaProperty &prop,
+                                     QDeclarativeParser::Object *obj,
+                                     QDeclarativeParser::Value *value,
+                                     bool *isAssignment);
+    enum DynamicMetaMode { IgnoreAliases, ResolveAliases, ForceCreation };
+    bool mergeDynamicMetaProperties(QDeclarativeParser::Object *obj);
+    bool buildDynamicMeta(QDeclarativeParser::Object *obj, DynamicMetaMode mode);
+    bool checkDynamicMeta(QDeclarativeParser::Object *obj);
+    bool buildBinding(QDeclarativeParser::Value *, QDeclarativeParser::Property *prop,
+                      const BindingContext &ctxt);
+    bool buildComponentFromRoot(QDeclarativeParser::Object *obj, const BindingContext &);
+    bool compileAlias(QMetaObjectBuilder &, 
+                      QByteArray &data,
+                      QDeclarativeParser::Object *obj, 
+                      const QDeclarativeParser::Object::DynamicProperty &);
+    bool completeComponentBuild();
+
+
+    void genObject(QDeclarativeParser::Object *obj);
+    void genObjectBody(QDeclarativeParser::Object *obj);
+    void genComponent(QDeclarativeParser::Object *obj);
+    void genValueProperty(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj);
+    void genListProperty(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj);
+    void genPropertyAssignment(QDeclarativeParser::Property *prop, 
+                               QDeclarativeParser::Object *obj,
+                               QDeclarativeParser::Property *valueTypeProperty = 0);
+    void genLiteralAssignment(const QMetaProperty &prop, 
+                              QDeclarativeParser::Value *value);
+    void genBindingAssignment(QDeclarativeParser::Value *binding, 
+                              QDeclarativeParser::Property *prop, 
+                              QDeclarativeParser::Object *obj,
+                              QDeclarativeParser::Property *valueTypeProperty = 0);
+    int genContextCache();
+
+    int genValueTypeData(QDeclarativeParser::Property *prop, QDeclarativeParser::Property *valueTypeProp);
+    int genPropertyData(QDeclarativeParser::Property *prop);
+
+    int componentTypeRef();
+
+    static int findSignalByName(const QMetaObject *, const QByteArray &name);
+    static QDeclarativeType *toQmlType(QDeclarativeParser::Object *from);
+    bool canCoerce(int to, QDeclarativeParser::Object *from);
+    bool canCoerce(int to, int from);
+
+    QStringList deferredProperties(QDeclarativeParser::Object *);
+
+    void addId(const QString &, QDeclarativeParser::Object *);
+
+    void dumpStats();
+
+    struct BindingReference {
+        QDeclarativeParser::Variant expression;
+        QDeclarativeParser::Property *property;
+        QDeclarativeParser::Value *value;
+
+        enum DataType { QtScript, Experimental };
+        DataType dataType;
+
+        int compiledIndex;
+
+        QByteArray compiledData;
+        BindingContext bindingContext;
+    };
+    void addBindingReference(const BindingReference &);
+
+    struct ComponentCompileState
+    {
+        ComponentCompileState() 
+            : parserStatusCount(0), pushedProperties(0), root(0) {}
+        QHash<QString, QDeclarativeParser::Object *> ids;
+        QHash<int, QDeclarativeParser::Object *> idIndexes;
+        int parserStatusCount;
+        int pushedProperties;
+
+        QByteArray compiledBindingData;
+
+        QHash<QDeclarativeParser::Value *, BindingReference> bindings;
+        QList<QDeclarativeParser::Object *> aliasingObjects;
+        QDeclarativeParser::Object *root;
+    };
+    ComponentCompileState compileState;
+
+    struct ComponentStat
+    {
+        ComponentStat() 
+            : ids(0), scriptBindings(0), optimizedBindings(0), objects(0) {}
+
+        int lineNumber;
+
+        int ids;
+        int scriptBindings;
+        int optimizedBindings;
+        int objects;
+    };
+    ComponentStat componentStat;
+
+    void saveComponentState();
+
+    ComponentCompileState componentState(QDeclarativeParser::Object *);
+    QHash<QDeclarativeParser::Object *, ComponentCompileState> savedCompileStates;
+    QList<ComponentStat> savedComponentStats;
+
+    QList<QDeclarativeError> exceptions;
+    QDeclarativeCompiledData *output;
+    QDeclarativeEngine *engine;
+    QDeclarativeParser::Object *unitRoot;
+    QDeclarativeCompositeTypeData *unit;
+};
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVECOMPILER_P_H
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
new file mode 100644
index 0000000..beaba4a
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -0,0 +1,798 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativecomponent.h"
+#include "qdeclarativecomponent_p.h"
+
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativecompositetypedata_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativevme_p.h"
+#include "qdeclarative.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativebinding_p_p.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativescriptparser_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QStack>
+#include <QStringList>
+#include <QFileInfo>
+#include <QtCore/qdebug.h>
+#include <QApplication>
+
+QT_BEGIN_NAMESPACE
+
+class QByteArray;
+int statusId = qRegisterMetaType<QDeclarativeComponent::Status>("QDeclarativeComponent::Status");
+
+/*!
+    \class QDeclarativeComponent
+  \since 4.7
+    \brief The QDeclarativeComponent class encapsulates a QML component description.
+    \mainclass
+*/
+
+/*!
+    \qmlclass Component QDeclarativeComponent
+  \since 4.7
+    \brief The Component element encapsulates a QML component description.
+
+    Components are reusable, encapsulated Qml element with a well-defined interface.
+    They are often defined in \l {qdeclarativedocuments.html}{Component Files}.
+
+    The \e Component element allows defining components within a QML file.
+    This can be useful for reusing a small component within a single QML
+    file, or for defining a component that logically belongs with the
+    file containing it.
+
+    \qml
+Item {
+    Component {
+        id: redSquare
+        Rectangle {
+            color: "red"
+            width: 10
+            height: 10
+        }
+    }
+    Loader { sourceComponent: redSquare }
+    Loader { sourceComponent: redSquare; x: 20 }
+}
+    \endqml
+
+    \section1 Attached Properties
+
+    \e onCompleted
+
+    Emitted after component "startup" has completed.  This can be used to
+    execute script code at startup, once the full QML environment has been 
+    established.
+
+    The \c {Component::onCompleted} attached property can be applied to
+    any element.  The order of running the \c onCompleted scripts is
+    undefined.
+
+    \qml
+    Rectangle {
+        Component.onCompleted: console.log("Completed Running!")
+        Rectangle {
+            Component.onCompleted: console.log("Nested Completed Running!")
+        }
+    }
+    \endqml
+*/
+
+/*!
+    \enum QDeclarativeComponent::Status
+    
+    Specifies the loading status of the QDeclarativeComponent.
+
+    \value Null This QDeclarativeComponent has no data.  Call loadUrl() or setData() to add QML content.
+    \value Ready This QDeclarativeComponent is ready and create() may be called.
+    \value Loading This QDeclarativeComponent is loading network data.
+    \value Error An error has occured.  Calling errorDescription() to retrieve a description.
+*/
+
+void QDeclarativeComponentPrivate::typeDataReady()
+{
+    Q_Q(QDeclarativeComponent);
+
+    Q_ASSERT(typeData);
+
+    fromTypeData(typeData);
+    typeData = 0;
+
+    emit q->statusChanged(q->status());
+}
+
+void QDeclarativeComponentPrivate::updateProgress(qreal p)
+{
+    Q_Q(QDeclarativeComponent);
+
+    progress = p;
+    emit q->progressChanged(p);
+}
+
+void QDeclarativeComponentPrivate::fromTypeData(QDeclarativeCompositeTypeData *data)
+{
+    url = data->imports.baseUrl();
+    QDeclarativeCompiledData *c = data->toCompiledComponent(engine);
+
+    if (!c) {
+        Q_ASSERT(data->status == QDeclarativeCompositeTypeData::Error);
+
+        state.errors = data->errors;
+
+    } else {
+
+        cc = c;
+
+    }
+
+    data->release();
+}
+
+void QDeclarativeComponentPrivate::clear()
+{
+    if (typeData) {
+        typeData->remWaiter(this);
+        typeData->release();
+        typeData = 0;
+    }
+        
+    if (cc) { 
+        cc->release();
+        cc = 0;
+    }
+}
+
+/*!
+    \internal
+*/
+QDeclarativeComponent::QDeclarativeComponent(QObject *parent)
+    : QObject(*(new QDeclarativeComponentPrivate), parent)
+{
+}
+
+/*!
+    Destruct the QDeclarativeComponent.
+*/
+QDeclarativeComponent::~QDeclarativeComponent()
+{
+    Q_D(QDeclarativeComponent);
+
+    if (d->state.completePending) {
+        qWarning("QDeclarativeComponent: Component destroyed while completion pending");
+        d->completeCreate();
+    }
+
+    if (d->typeData) {
+        d->typeData->remWaiter(d);
+        d->typeData->release();
+    }
+    if (d->cc)
+        d->cc->release();
+}
+
+/*!
+    \property QDeclarativeComponent::status
+    The component's current \l{QDeclarativeComponent::Status} {status}.
+ */
+QDeclarativeComponent::Status QDeclarativeComponent::status() const
+{
+    Q_D(const QDeclarativeComponent);
+
+    if (d->typeData)
+        return Loading;
+    else if (!d->state.errors.isEmpty())
+        return Error;
+    else if (d->engine && d->cc)
+        return Ready;
+    else
+        return Null;
+}
+
+/*!
+    \property QDeclarativeComponent::isNull
+
+    Is true if the component is in the Null state, false otherwise.
+
+    Equivalent to status() == QDeclarativeComponent::Null.
+*/
+bool QDeclarativeComponent::isNull() const
+{
+    return status() == Null;
+}
+
+/*!
+    \property QDeclarativeComponent::isReady
+
+    Is true if the component is in the Ready state, false otherwise.
+
+    Equivalent to status() == QDeclarativeComponent::Ready.
+*/
+bool QDeclarativeComponent::isReady() const
+{
+    return status() == Ready;
+}
+
+/*!
+    \property QDeclarativeComponent::isError
+
+    Is true if the component is in the Error state, false otherwise.
+
+    Equivalent to status() == QDeclarativeComponent::Error.
+*/
+bool QDeclarativeComponent::isError() const
+{
+    return status() == Error;
+}
+
+/*!
+    \property QDeclarativeComponent::isLoading
+
+    Is true if the component is in the Loading state, false otherwise.
+
+    Equivalent to status() == QDeclarativeComponent::Loading.
+*/
+bool QDeclarativeComponent::isLoading() const
+{
+    return status() == Loading;
+}
+
+/*!
+    \property QDeclarativeComponent::progress
+    The progress of loading the component, from 0.0 (nothing loaded)
+    to 1.0 (finished).
+*/
+qreal QDeclarativeComponent::progress() const
+{
+    Q_D(const QDeclarativeComponent);
+    return d->progress;
+}
+
+/*!
+    \fn void QDeclarativeComponent::progressChanged(qreal progress)
+
+    Emitted whenever the component's loading progress changes.  \a progress will be the
+    current progress between 0.0 (nothing loaded) and 1.0 (finished).
+*/
+
+/*!
+    \fn void QDeclarativeComponent::statusChanged(QDeclarativeComponent::Status status)
+
+    Emitted whenever the component's status changes.  \a status will be the
+    new status.
+*/
+
+/*!
+    Create a QDeclarativeComponent with no data and give it the specified
+    \a engine and \a parent. Set the data with setData().
+*/
+QDeclarativeComponent::QDeclarativeComponent(QDeclarativeEngine *engine, QObject *parent)
+    : QObject(*(new QDeclarativeComponentPrivate), parent)
+{
+    Q_D(QDeclarativeComponent);
+    d->engine = engine;
+}
+
+/*!
+    Create a QDeclarativeComponent from the given \a url and give it the
+    specified \a parent and \a engine.
+
+    \sa loadUrl()
+*/
+QDeclarativeComponent::QDeclarativeComponent(QDeclarativeEngine *engine, const QUrl &url, QObject *parent)
+: QObject(*(new QDeclarativeComponentPrivate), parent)
+{
+    Q_D(QDeclarativeComponent);
+    d->engine = engine;
+    loadUrl(url);
+}
+
+/*!
+    Create a QDeclarativeComponent from the given \a fileName and give it the specified 
+    \a parent and \a engine.
+
+    \sa loadUrl()
+*/
+QDeclarativeComponent::QDeclarativeComponent(QDeclarativeEngine *engine, const QString &fileName, 
+                           QObject *parent)
+: QObject(*(new QDeclarativeComponentPrivate), parent)
+{
+    Q_D(QDeclarativeComponent);
+    d->engine = engine;
+    loadUrl(QUrl::fromLocalFile(fileName));
+}
+
+/*!
+    \internal
+*/
+QDeclarativeComponent::QDeclarativeComponent(QDeclarativeEngine *engine, QDeclarativeCompiledData *cc, int start, int count, QObject *parent)
+    : QObject(*(new QDeclarativeComponentPrivate), parent)
+{
+    Q_D(QDeclarativeComponent);
+    d->engine = engine;
+    d->cc = cc;
+    cc->addref();
+    d->start = start;
+    d->count = count;
+    d->url = cc->url;
+    d->progress = 1.0;
+}
+
+/*!
+    Sets the QDeclarativeComponent to use the given QML \a data.  If \a url
+    is provided, it is used to set the component name and to provide
+    a base path for items resolved by this component.
+*/
+void QDeclarativeComponent::setData(const QByteArray &data, const QUrl &url)
+{
+    Q_D(QDeclarativeComponent);
+
+    d->clear();
+
+    d->url = url;
+
+    QDeclarativeCompositeTypeData *typeData = 
+        QDeclarativeEnginePrivate::get(d->engine)->typeManager.getImmediate(data, url);
+    
+    if (typeData->status == QDeclarativeCompositeTypeData::Waiting
+     || typeData->status == QDeclarativeCompositeTypeData::WaitingResources)
+    {
+        d->typeData = typeData;
+        d->typeData->addWaiter(d);
+
+    } else {
+
+        d->fromTypeData(typeData);
+
+    }
+
+    d->progress = 1.0;
+    emit statusChanged(status());
+    emit progressChanged(d->progress);
+}
+
+/*!
+Returns the QDeclarativeContext the component was created in.  This is only
+valid for components created directly from QML.
+*/
+QDeclarativeContext *QDeclarativeComponent::creationContext() const
+{
+    Q_D(const QDeclarativeComponent);
+    if(d->creationContext)
+        return d->creationContext;
+    QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(this);
+    if (ddata)
+        return ddata->context;
+    else
+        return 0;
+}
+
+/*!
+  \internal
+  Sets the QDeclarativeContext the component was created in. This is only
+  desirable for components created in QML script.
+*/
+void QDeclarativeComponent::setCreationContext(QDeclarativeContext* c)
+{
+    Q_D(QDeclarativeComponent);
+    d->creationContext = c;
+}
+
+/*!
+    Load the QDeclarativeComponent from the provided \a url.
+*/
+void QDeclarativeComponent::loadUrl(const QUrl &url)
+{
+    Q_D(QDeclarativeComponent);
+
+    d->clear();
+
+    if (url.isRelative() && !url.isEmpty())
+        d->url = d->engine->baseUrl().resolved(url);
+    else
+        d->url = url;
+
+    QDeclarativeCompositeTypeData *data = 
+        QDeclarativeEnginePrivate::get(d->engine)->typeManager.get(d->url);
+
+    if (data->status == QDeclarativeCompositeTypeData::Waiting
+     || data->status == QDeclarativeCompositeTypeData::WaitingResources)
+    {
+        d->typeData = data;
+        d->typeData->addWaiter(d);
+        d->progress = data->progress;
+    } else {
+        d->fromTypeData(data);
+        d->progress = 1.0;
+    }
+
+    emit statusChanged(status());
+    emit progressChanged(d->progress);
+}
+
+/*!
+    Return the list of errors that occured during the last compile or create
+    operation.  An empty list is returned if isError() is not set.
+*/
+QList<QDeclarativeError> QDeclarativeComponent::errors() const
+{
+    Q_D(const QDeclarativeComponent);
+    if (isError())
+        return d->state.errors;
+    else
+        return QList<QDeclarativeError>();
+}
+
+/*!
+    \internal
+    errorsString is only meant as a way to get the errors in script
+*/
+QString QDeclarativeComponent::errorsString() const
+{
+    Q_D(const QDeclarativeComponent);
+    QString ret;
+    if(!isError())
+        return ret;
+    foreach(const QDeclarativeError &e, d->state.errors) {
+        ret += e.url().toString() + QLatin1Char(':') +
+               QString::number(e.line()) + QLatin1Char(' ') +
+               e.description() + QLatin1Char('\n');
+    }
+    return ret;
+}
+
+/*!
+    \property QDeclarativeComponent::url
+    The component URL.  This is the URL passed to either the constructor,
+    or the loadUrl() or setData() methods.
+*/
+QUrl QDeclarativeComponent::url() const
+{
+    Q_D(const QDeclarativeComponent);
+    return d->url;
+}
+
+/*!
+    \internal
+*/
+QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, QObject *parent)
+    : QObject(dd, parent)
+{
+}
+
+
+/*!
+    \internal
+    A version of create which returns a scriptObject, for use in script
+*/
+QScriptValue QDeclarativeComponent::createObject()
+{
+    Q_D(QDeclarativeComponent);
+    QDeclarativeContext* ctxt = creationContext();
+    if(!ctxt){
+        qWarning() << QLatin1String("createObject can only be used in QML");
+        return QScriptValue();
+    }
+    QObject* ret = create(ctxt);
+    return QDeclarativeEnginePrivate::qmlScriptObject(ret, d->engine);
+}
+
+/*!
+    Create an object instance from this component.  Returns 0 if creation
+    failed.  \a context specifies the context within which to create the object
+    instance.  
+
+    If \a context is 0 (the default), it will create the instance in the
+    engine' s \l {QDeclarativeEngine::rootContext()}{root context}.
+*/
+QObject *QDeclarativeComponent::create(QDeclarativeContext *context)
+{
+    Q_D(QDeclarativeComponent);
+
+    return d->create(context, QBitField());
+}
+
+QObject *QDeclarativeComponentPrivate::create(QDeclarativeContext *context, 
+                                     const QBitField &bindings)
+{
+    if (!context)
+        context = engine->rootContext();
+
+    if (context->engine() != engine) {
+        qWarning("QDeclarativeComponent::create(): Must create component in context from the same QDeclarativeEngine");
+        return 0;
+    }
+
+    QObject *rv = beginCreate(context, bindings);
+    completeCreate();
+    return rv;
+}
+
+/*!
+    This method provides more advanced control over component instance creation.
+    In general, programmers should use QDeclarativeComponent::create() to create a 
+    component.
+
+    Create an object instance from this component.  Returns 0 if creation
+    failed.  \a context specifies the context within which to create the object
+    instance.  
+
+    When QDeclarativeComponent constructs an instance, it occurs in three steps:
+    \list 1
+    \i The object hierarchy is created, and constant values are assigned.
+    \i Property bindings are evaluated for the the first time.
+    \i If applicable, QDeclarativeParserStatus::componentComplete() is called on objects.
+    \endlist 
+    QDeclarativeComponent::beginCreate() differs from QDeclarativeComponent::create() in that it
+    only performs step 1.  QDeclarativeComponent::completeCreate() must be called to 
+    complete steps 2 and 3.
+
+    This breaking point is sometimes useful when using attached properties to
+    communicate information to an instantiated component, as it allows their
+    initial values to be configured before property bindings take effect.
+*/
+QObject *QDeclarativeComponent::beginCreate(QDeclarativeContext *context)
+{
+    Q_D(QDeclarativeComponent);
+    return d->beginCreate(context, QBitField());
+}
+
+QObject *
+QDeclarativeComponentPrivate::beginCreate(QDeclarativeContext *context, const QBitField &bindings)
+{
+    Q_Q(QDeclarativeComponent);
+    if (!context) {
+        qWarning("QDeclarativeComponent::beginCreate(): Cannot create a component in a null context");
+        return 0;
+    }
+
+    if (context->engine() != engine) {
+        qWarning("QDeclarativeComponent::beginCreate(): Must create component in context from the same QDeclarativeEngine");
+        return 0;
+    }
+
+    if (state.completePending) {
+        qWarning("QDeclarativeComponent: Cannot create new component instance before completing the previous");
+        return 0;
+    }
+
+    if (!q->isReady()) {
+        qWarning("QDeclarativeComponent: Component is not ready");
+        return 0;
+    }
+
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+
+    QDeclarativeContextPrivate *contextPriv = 
+        static_cast<QDeclarativeContextPrivate *>(QObjectPrivate::get(context));
+    QDeclarativeContext *ctxt = new QDeclarativeContext(context, 0, true);
+    static_cast<QDeclarativeContextPrivate*>(ctxt->d_func())->url = cc->url;
+    static_cast<QDeclarativeContextPrivate*>(ctxt->d_func())->imports = cc->importCache;
+    cc->importCache->addref();
+
+    QObject *rv = begin(ctxt, ep, cc, start, count, &state, bindings);
+
+    if (rv) {
+        QDeclarativeGraphics_setParent_noEvent(ctxt, rv);
+    } else {
+        delete ctxt;
+    }
+
+    if (rv && !contextPriv->isInternal && ep->isDebugging)
+        contextPriv->instances.append(rv);
+    return rv;
+}
+
+QObject * QDeclarativeComponentPrivate::begin(QDeclarativeContext *ctxt, QDeclarativeEnginePrivate *enginePriv,
+                                     QDeclarativeCompiledData *component, int start, int count,
+                                     ConstructionState *state, const QBitField &bindings)
+{
+    bool isRoot = !enginePriv->inBeginCreate;
+    enginePriv->inBeginCreate = true;
+
+    QDeclarativeVME vme;
+    QObject *rv = vme.run(ctxt, component, start, count, bindings);
+
+    if (vme.isError()) 
+        state->errors = vme.errors();
+
+    if (isRoot) {
+        enginePriv->inBeginCreate = false;
+
+        state->bindValues = enginePriv->bindValues;
+        state->parserStatus = enginePriv->parserStatus;
+        state->componentAttacheds = enginePriv->componentAttacheds;
+        if (state->componentAttacheds)
+            state->componentAttacheds->prev = &state->componentAttacheds;
+
+        enginePriv->componentAttacheds = 0;
+        enginePriv->bindValues.clear();
+        enginePriv->parserStatus.clear();
+        state->completePending = true;
+        enginePriv->inProgressCreations++;
+    }
+
+    return rv;
+}
+
+void QDeclarativeComponentPrivate::beginDeferred(QDeclarativeContext *, QDeclarativeEnginePrivate *enginePriv,
+                                        QObject *object, ConstructionState *state)
+{
+    bool isRoot = !enginePriv->inBeginCreate;
+    enginePriv->inBeginCreate = true;
+
+    QDeclarativeVME vme;
+    vme.runDeferred(object);
+
+    if (vme.isError()) 
+        state->errors = vme.errors();
+
+    if (isRoot) {
+        enginePriv->inBeginCreate = false;
+
+        state->bindValues = enginePriv->bindValues;
+        state->parserStatus = enginePriv->parserStatus;
+        state->componentAttacheds = enginePriv->componentAttacheds;
+        if (state->componentAttacheds)
+            state->componentAttacheds->prev = &state->componentAttacheds;
+
+        enginePriv->componentAttacheds = 0;
+        enginePriv->bindValues.clear();
+        enginePriv->parserStatus.clear();
+        state->completePending = true;
+        enginePriv->inProgressCreations++;
+    }
+}
+
+void QDeclarativeComponentPrivate::complete(QDeclarativeEnginePrivate *enginePriv, ConstructionState *state)
+{
+    if (state->completePending) {
+
+        for (int ii = 0; ii < state->bindValues.count(); ++ii) {
+            QDeclarativeEnginePrivate::SimpleList<QDeclarativeAbstractBinding> bv = 
+                state->bindValues.at(ii);
+            for (int jj = 0; jj < bv.count; ++jj) {
+                if(bv.at(jj)) 
+                    bv.at(jj)->setEnabled(true, QDeclarativeMetaProperty::BypassInterceptor | 
+                                                QDeclarativeMetaProperty::DontRemoveBinding);
+            }
+            QDeclarativeEnginePrivate::clear(bv);
+        }
+
+        for (int ii = 0; ii < state->parserStatus.count(); ++ii) {
+            QDeclarativeEnginePrivate::SimpleList<QDeclarativeParserStatus> ps = 
+                state->parserStatus.at(ii);
+
+            for (int jj = ps.count - 1; jj >= 0; --jj) {
+                QDeclarativeParserStatus *status = ps.at(jj);
+                if (status && status->d) {
+                    status->d = 0;
+                    status->componentComplete();
+                }
+            }
+            QDeclarativeEnginePrivate::clear(ps);
+        }
+
+        while (state->componentAttacheds) {
+            QDeclarativeComponentAttached *a = state->componentAttacheds;
+            if (a->next) a->next->prev = &state->componentAttacheds;
+            state->componentAttacheds = a->next;
+            a->prev = 0; a->next = 0;
+            emit a->completed();
+        }
+
+        state->bindValues.clear();
+        state->parserStatus.clear();
+        state->completePending = false;
+
+        enginePriv->inProgressCreations--;
+        if (0 == enginePriv->inProgressCreations) {
+            while (enginePriv->erroredBindings) {
+                qWarning().nospace() << qPrintable(enginePriv->erroredBindings->error.toString());
+                enginePriv->erroredBindings->removeError();
+            }
+        }
+    }
+}
+
+/*!
+    This method provides more advanced control over component instance creation.
+    In general, programmers should use QDeclarativeComponent::create() to create a 
+    component.
+
+    Complete a component creation begin with QDeclarativeComponent::beginCreate().
+*/
+void QDeclarativeComponent::completeCreate()
+{
+    Q_D(QDeclarativeComponent);
+    d->completeCreate();
+}
+
+void QDeclarativeComponentPrivate::completeCreate()
+{
+    if (state.completePending) {
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+        complete(ep, &state);
+    }
+}
+
+QDeclarativeComponentAttached::QDeclarativeComponentAttached(QObject *parent)
+: QObject(parent), prev(0), next(0)
+{
+}
+
+QDeclarativeComponentAttached::~QDeclarativeComponentAttached()
+{
+    if (prev) *prev = next;
+    if (next) next->prev = prev;
+    prev = 0;
+    next = 0;
+}
+
+/*!
+    \internal
+*/
+QDeclarativeComponentAttached *QDeclarativeComponent::qmlAttachedProperties(QObject *obj)
+{
+    QDeclarativeComponentAttached *a = new QDeclarativeComponentAttached(obj);
+
+    QDeclarativeEngine *engine = qmlEngine(obj);
+    if (!engine || !QDeclarativeEnginePrivate::get(engine)->inBeginCreate)
+        return a;
+
+    QDeclarativeEnginePrivate *p = QDeclarativeEnginePrivate::get(engine);
+
+    a->next = p->componentAttacheds;
+    a->prev = &p->componentAttacheds;
+    if (a->next) a->next->prev = &a->next;
+    p->componentAttacheds = a;
+
+    return a;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
new file mode 100644
index 0000000..aec0480
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECOMPONENT_H
+#define QDECLARATIVECOMPONENT_H
+
+#include "qdeclarative.h"
+#include "qdeclarativeerror.h"
+
+#include <QtCore/qobject.h>
+#include <QtCore/qstring.h>
+#include <QtScript/qscriptvalue.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeCompiledData;
+class QByteArray;
+class QDeclarativeComponentPrivate;
+class QDeclarativeEngine;
+class QDeclarativeComponentAttached;
+class Q_DECLARATIVE_EXPORT QDeclarativeComponent : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeComponent)
+    Q_PROPERTY(bool isNull READ isNull NOTIFY statusChanged)
+    Q_PROPERTY(bool isReady READ isReady NOTIFY statusChanged)
+    Q_PROPERTY(bool isError READ isError NOTIFY statusChanged)
+    Q_PROPERTY(bool isLoading READ isLoading NOTIFY statusChanged)
+    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(QUrl url READ url CONSTANT)
+
+public:
+    QDeclarativeComponent(QObject *parent = 0);
+    QDeclarativeComponent(QDeclarativeEngine *, QObject *parent=0);
+    QDeclarativeComponent(QDeclarativeEngine *, const QString &fileName, QObject *parent = 0);
+    QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = 0);
+    virtual ~QDeclarativeComponent();
+
+    Q_ENUMS(Status)
+    enum Status { Null, Ready, Loading, Error };
+    Status status() const;
+
+    bool isNull() const;
+    bool isReady() const;
+    bool isError() const;
+    bool isLoading() const;
+
+    QList<QDeclarativeError> errors() const;
+    Q_INVOKABLE QString errorsString() const;
+
+    qreal progress() const;
+
+    QUrl url() const;
+
+    virtual QObject *create(QDeclarativeContext *context = 0);
+    virtual QObject *beginCreate(QDeclarativeContext *);
+    virtual void completeCreate();
+
+    Q_INVOKABLE QScriptValue createObject();
+
+    void loadUrl(const QUrl &url);
+    void setData(const QByteArray &, const QUrl &baseUrl);
+
+    void setCreationContext(QDeclarativeContext*);
+    QDeclarativeContext *creationContext() const;
+
+    static QDeclarativeComponentAttached *qmlAttachedProperties(QObject *);
+
+Q_SIGNALS:
+    void statusChanged(QDeclarativeComponent::Status);
+    void progressChanged(qreal);
+
+protected:
+    QDeclarativeComponent(QDeclarativeComponentPrivate &dd, QObject* parent);
+
+private:
+    QDeclarativeComponent(QDeclarativeEngine *, QDeclarativeCompiledData *, int, int, QObject *parent);
+
+    friend class QDeclarativeVME;
+    friend class QDeclarativeCompositeTypeData;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDeclarativeComponent::Status)
+QML_DECLARE_TYPE(QDeclarativeComponent)
+QML_DECLARE_TYPEINFO(QDeclarativeComponent, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVECOMPONENT_H
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h
new file mode 100644
index 0000000..3155813
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecomponent_p.h
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECOMPONENT_P_H
+#define QDECLARATIVECOMPONENT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativecomponent.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativecompositetypemanager_p.h"
+#include "qbitfield_p.h"
+#include "qdeclarativeerror.h"
+#include "qdeclarative.h"
+
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QList>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeComponent;
+class QDeclarativeEngine;
+class QDeclarativeCompiledData;
+
+class QDeclarativeComponentAttached;
+class QDeclarativeComponentPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeComponent)
+        
+public:
+    QDeclarativeComponentPrivate() : typeData(0), progress(0.), start(-1), count(-1), cc(0), engine(0), creationContext(0) {}
+
+    QObject *create(QDeclarativeContext *context, const QBitField &);
+    QObject *beginCreate(QDeclarativeContext *, const QBitField &);
+    void completeCreate();
+
+    QDeclarativeCompositeTypeData *typeData;
+    void typeDataReady();
+    void updateProgress(qreal);
+    
+    void fromTypeData(QDeclarativeCompositeTypeData *data);
+
+    QUrl url;
+    qreal progress;
+
+    int start;
+    int count;
+    QDeclarativeCompiledData *cc;
+
+    struct ConstructionState {
+        ConstructionState() : componentAttacheds(0), completePending(false) {}
+        QList<QDeclarativeEnginePrivate::SimpleList<QDeclarativeAbstractBinding> > bindValues;
+        QList<QDeclarativeEnginePrivate::SimpleList<QDeclarativeParserStatus> > parserStatus;
+        QDeclarativeComponentAttached *componentAttacheds;
+        QList<QDeclarativeError> errors;
+        bool completePending;
+    };
+    ConstructionState state;
+
+    static QObject *begin(QDeclarativeContext *ctxt, QDeclarativeEnginePrivate *enginePriv,
+                          QDeclarativeCompiledData *component, int start, int count,
+                          ConstructionState *state, const QBitField &bindings = QBitField());
+    static void beginDeferred(QDeclarativeContext *ctxt, QDeclarativeEnginePrivate *enginePriv,
+                              QObject *object, ConstructionState *state);
+    static void complete(QDeclarativeEnginePrivate *enginePriv, ConstructionState *state);
+
+    QDeclarativeEngine *engine;
+    QDeclarativeContext *creationContext;
+
+    void clear();
+
+    static QDeclarativeComponentPrivate *get(QDeclarativeComponent *c) {
+        return static_cast<QDeclarativeComponentPrivate *>(QObjectPrivate::get(c));
+    }
+};
+
+class QDeclarativeComponentAttached : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeComponentAttached(QObject *parent = 0);
+    ~QDeclarativeComponentAttached();
+
+    QDeclarativeComponentAttached **prev;
+    QDeclarativeComponentAttached *next;
+
+Q_SIGNALS:
+    void completed();
+
+private:
+    friend class QDeclarativeComponentPrivate;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVECOMPONENT_P_H
diff --git a/src/declarative/qml/qdeclarativecompositetypedata_p.h b/src/declarative/qml/qdeclarativecompositetypedata_p.h
new file mode 100644
index 0000000..fb26af9
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecompositetypedata_p.h
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECOMPOSITETYPEDATA_P_H
+#define QDECLARATIVECOMPOSITETYPEDATA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeengine_p.h"
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeCompositeTypeResource;
+class QDeclarativeCompositeTypeData : public QDeclarativeRefCount
+{
+public:
+    QDeclarativeCompositeTypeData();
+    virtual ~QDeclarativeCompositeTypeData();
+
+    enum Status {
+        Invalid,
+        Complete,
+        Error,
+        Waiting,
+        WaitingResources
+    };
+    Status status;
+    enum ErrorType {
+        NoError,
+        AccessError,
+        GeneralError
+    };
+    ErrorType errorType;
+
+    QList<QDeclarativeError> errors;
+
+    QDeclarativeEnginePrivate::Imports imports;
+
+    QList<QDeclarativeCompositeTypeData *> dependants;
+
+    // Return a QDeclarativeComponent if the QDeclarativeCompositeTypeData is not in the Waiting
+    // state.  The QDeclarativeComponent is owned by the QDeclarativeCompositeTypeData, so a
+    // reference should be kept to keep the QDeclarativeComponent alive.
+    QDeclarativeComponent *toComponent(QDeclarativeEngine *);
+    // Return a QDeclarativeCompiledData if possible, or 0 if an error
+    // occurs
+    QDeclarativeCompiledData *toCompiledComponent(QDeclarativeEngine *);
+
+    struct TypeReference
+    {
+        TypeReference();
+
+        QDeclarativeType *type;
+        QDeclarativeCompositeTypeData *unit;
+    };
+
+    QList<TypeReference> types;
+    QList<QDeclarativeCompositeTypeResource *> resources;
+
+    // Add or remove p as a waiter.  When the QDeclarativeCompositeTypeData becomes
+    // ready, the QDeclarativeComponentPrivate::typeDataReady() method will be invoked on
+    // p.  The waiter is automatically removed when the typeDataReady() method
+    // is invoked, so there is no need to call remWaiter() in this case.
+    void addWaiter(QDeclarativeComponentPrivate *p);
+    void remWaiter(QDeclarativeComponentPrivate *p);
+
+    qreal progress;
+
+private:
+    friend class QDeclarativeCompositeTypeManager;
+    friend class QDeclarativeCompiler;
+    friend class QDeclarativeDomDocument;
+
+    QDeclarativeScriptParser data;
+    QList<QDeclarativeComponentPrivate *> waiters;
+    QDeclarativeComponent *component;
+    QDeclarativeCompiledData *compiledComponent;
+};
+
+class QDeclarativeCompositeTypeResource : public QDeclarativeRefCount
+{
+public:
+    QDeclarativeCompositeTypeResource();
+    virtual ~QDeclarativeCompositeTypeResource();
+
+    enum Status {
+        Invalid,
+        Complete,
+        Error,
+        Waiting
+    };
+    Status status;
+
+    QList<QDeclarativeCompositeTypeData *> dependants;
+
+    QString url;
+    QByteArray data;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVECOMPOSITETYPEDATA_P_H
+
diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
new file mode 100644
index 0000000..b90a598
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
@@ -0,0 +1,670 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativecompositetypemanager_p.h"
+
+#include "qdeclarativecompositetypedata_p.h"
+#include "qdeclarativescriptparser_p.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativecomponent.h"
+#include "qdeclarativecomponent_p.h"
+#include "qdeclarativecompiler_p.h"
+
+#include <QtNetwork/qnetworkreply.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qfile.h>
+
+QT_BEGIN_NAMESPACE
+
+#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0))
+inline uint qHash(const QUrl &uri)
+{
+    return qHash(uri.toEncoded(QUrl::FormattingOption(0x100)));
+}
+#endif
+
+QDeclarativeCompositeTypeData::QDeclarativeCompositeTypeData()
+: status(Invalid), errorType(NoError), component(0), compiledComponent(0)
+{
+}
+
+QDeclarativeCompositeTypeData::~QDeclarativeCompositeTypeData()
+{
+    for (int ii = 0; ii < dependants.count(); ++ii)
+        dependants.at(ii)->release();
+
+    for (int ii = 0; ii < resources.count(); ++ii)
+        resources.at(ii)->release();
+
+    if (compiledComponent)
+        compiledComponent->release();
+
+    if (component) 
+        delete component;
+}
+
+QDeclarativeCompositeTypeResource::QDeclarativeCompositeTypeResource()
+{
+}
+
+QDeclarativeCompositeTypeResource::~QDeclarativeCompositeTypeResource()
+{
+    for (int ii = 0; ii < dependants.count(); ++ii)
+        dependants.at(ii)->release();
+}
+
+void QDeclarativeCompositeTypeData::addWaiter(QDeclarativeComponentPrivate *p)
+{
+    waiters << p;
+}
+
+void QDeclarativeCompositeTypeData::remWaiter(QDeclarativeComponentPrivate *p)
+{
+    waiters.removeAll(p);
+}
+
+QDeclarativeComponent *QDeclarativeCompositeTypeData::toComponent(QDeclarativeEngine *engine)
+{
+    if (!component) {
+
+        QDeclarativeCompiledData *cc = toCompiledComponent(engine);
+        if (cc) {
+            component = new QDeclarativeComponent(engine, cc, -1, -1, 0);
+            cc->release();
+        } else {
+            component = new QDeclarativeComponent(engine, 0);
+            component->d_func()->url = imports.baseUrl();
+            component->d_func()->state.errors = errors;
+        }
+
+    }
+
+    return component;
+}
+
+QDeclarativeCompiledData *
+QDeclarativeCompositeTypeData::toCompiledComponent(QDeclarativeEngine *engine)
+{
+    if (status == Complete && !compiledComponent) {
+
+        compiledComponent = new QDeclarativeCompiledData(engine);
+        compiledComponent->url = imports.baseUrl();
+        compiledComponent->name = compiledComponent->url.toString();
+
+        QDeclarativeCompiler compiler;
+        if (!compiler.compile(engine, this, compiledComponent)) {
+            status = Error;
+            errors = compiler.errors();
+            compiledComponent->release();
+            compiledComponent = 0;
+        }
+
+        // Data is no longer needed once we have a compiled component
+        data.clear();
+    }
+
+    if (compiledComponent)
+        compiledComponent->addref();
+
+    return compiledComponent;
+}
+
+QDeclarativeCompositeTypeData::TypeReference::TypeReference()
+: type(0), unit(0)
+{
+}
+
+QDeclarativeCompositeTypeManager::QDeclarativeCompositeTypeManager(QDeclarativeEngine *e)
+: engine(e)
+{
+}
+
+QDeclarativeCompositeTypeManager::~QDeclarativeCompositeTypeManager()
+{
+    for (Components::Iterator iter = components.begin(); iter != components.end();) {
+        (*iter)->release();
+        iter = components.erase(iter);
+    }
+    for (Resources::Iterator iter = resources.begin(); iter != resources.end();) {
+        (*iter)->release();
+        iter = resources.erase(iter);
+    }
+}
+
+QDeclarativeCompositeTypeData *QDeclarativeCompositeTypeManager::get(const QUrl &url)
+{
+    QDeclarativeCompositeTypeData *unit = components.value(url);
+
+    if (!unit) {
+        unit = new QDeclarativeCompositeTypeData;
+        unit->status = QDeclarativeCompositeTypeData::Waiting;
+        unit->progress = 0.0;
+        unit->imports.setBaseUrl(url);
+        components.insert(url, unit);
+
+        loadSource(unit);
+    }
+
+    unit->addref();
+    return unit;
+}
+
+QDeclarativeCompositeTypeData *
+QDeclarativeCompositeTypeManager::getImmediate(const QByteArray &data, const QUrl &url)
+{
+    QDeclarativeCompositeTypeData *unit = new QDeclarativeCompositeTypeData;
+    unit->status = QDeclarativeCompositeTypeData::Waiting;
+    unit->imports.setBaseUrl(url);
+    setData(unit, data, url);
+    return unit;
+}
+
+void QDeclarativeCompositeTypeManager::clearCache()
+{
+    for (Components::Iterator iter = components.begin(); iter != components.end();) {
+        if ((*iter)->status != QDeclarativeCompositeTypeData::Waiting) {
+            (*iter)->release();
+            iter = components.erase(iter);
+        } else {
+            ++iter;
+        }
+    }
+
+    for (Resources::Iterator iter = resources.begin(); iter != resources.end();) {
+        if ((*iter)->status != QDeclarativeCompositeTypeResource::Waiting) {
+            (*iter)->release();
+            iter = resources.erase(iter);
+        } else {
+            ++iter;
+        }
+    }
+}
+
+void QDeclarativeCompositeTypeManager::replyFinished()
+{
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+
+    QDeclarativeCompositeTypeData *unit = components.value(reply->url());
+    Q_ASSERT(unit);
+
+    if (reply->error() != QNetworkReply::NoError) {
+        QString errorDescription;
+        // ### - Fill in error
+        errorDescription = QLatin1String("Network error for URL ") + 
+                      reply->url().toString();
+
+        unit->status = QDeclarativeCompositeTypeData::Error;
+        // ### FIXME
+        QDeclarativeError error;
+        error.setDescription(errorDescription);
+        unit->errorType = QDeclarativeCompositeTypeData::AccessError;
+        unit->errors << error;
+        doComplete(unit);
+
+    } else {
+        QByteArray data = reply->readAll();
+
+        setData(unit, data, reply->url());
+    }
+
+    reply->deleteLater();
+}
+
+void QDeclarativeCompositeTypeManager::resourceReplyFinished()
+{
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+
+    QDeclarativeCompositeTypeResource *resource = resources.value(reply->url());
+    Q_ASSERT(resource);
+
+    if (reply->error() != QNetworkReply::NoError) {
+
+        resource->status = QDeclarativeCompositeTypeResource::Error;
+
+    } else {
+
+        resource->status = QDeclarativeCompositeTypeResource::Complete;
+        resource->data = reply->readAll();
+
+    }
+
+    doComplete(resource);
+    reply->deleteLater();
+}
+
+static QString toLocalFileOrQrc(const QUrl& url)
+{
+    QString r = url.toLocalFile();
+    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
+        r = QLatin1Char(':') + url.path();
+    return r;
+}
+
+void QDeclarativeCompositeTypeManager::loadResource(QDeclarativeCompositeTypeResource *resource)
+{
+    QUrl url(resource->url);
+
+    QString lf = toLocalFileOrQrc(url);
+    if (!lf.isEmpty()) {
+
+        QFile file(lf);
+        if (file.open(QFile::ReadOnly)) {
+            resource->data = file.readAll();
+            resource->status = QDeclarativeCompositeTypeResource::Complete;
+        } else {
+            resource->status = QDeclarativeCompositeTypeResource::Error;
+        }
+
+    } else {
+
+        QNetworkReply *reply = 
+            engine->networkAccessManager()->get(QNetworkRequest(url));
+        QObject::connect(reply, SIGNAL(finished()),
+                         this, SLOT(resourceReplyFinished()));
+
+    }
+}
+
+void QDeclarativeCompositeTypeManager::loadSource(QDeclarativeCompositeTypeData *unit)
+{
+    QUrl url(unit->imports.baseUrl());
+
+    QString lf = toLocalFileOrQrc(url);
+    if (!lf.isEmpty()) {
+
+        QFile file(lf);
+        if (file.open(QFile::ReadOnly)) {
+            QByteArray data = file.readAll();
+            setData(unit, data, url);
+        } else {
+            QString errorDescription;
+            // ### - Fill in error
+            errorDescription = QLatin1String("File error for URL ") + url.toString();
+            unit->status = QDeclarativeCompositeTypeData::Error;
+            // ### FIXME
+            QDeclarativeError error;
+            error.setDescription(errorDescription);
+            unit->errorType = QDeclarativeCompositeTypeData::AccessError;
+            unit->errors << error;
+            doComplete(unit);
+        }
+
+    } else {
+        QNetworkReply *reply = 
+            engine->networkAccessManager()->get(QNetworkRequest(url));
+        QObject::connect(reply, SIGNAL(finished()),
+                         this, SLOT(replyFinished()));
+        QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
+                         this, SLOT(requestProgress(qint64,qint64)));
+    }
+}
+
+void QDeclarativeCompositeTypeManager::requestProgress(qint64 received, qint64 total)
+{
+    if (total <= 0)
+        return;
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+
+    QDeclarativeCompositeTypeData *unit = components.value(reply->url());
+    Q_ASSERT(unit);
+
+    unit->progress = qreal(received)/total;
+
+    foreach (QDeclarativeComponentPrivate *comp, unit->waiters)
+        comp->updateProgress(unit->progress);
+}
+
+void QDeclarativeCompositeTypeManager::setData(QDeclarativeCompositeTypeData *unit, 
+                                     const QByteArray &data,
+                                     const QUrl &url)
+{
+    bool ok = true;
+    if (!unit->data.parse(data, url)) {
+        ok = false;
+        unit->errors << unit->data.errors();
+    }
+
+    if (ok) {
+        compile(unit);
+    } else {
+        unit->status = QDeclarativeCompositeTypeData::Error;
+        unit->errorType = QDeclarativeCompositeTypeData::GeneralError;
+        doComplete(unit);
+    }
+}
+
+void QDeclarativeCompositeTypeManager::doComplete(QDeclarativeCompositeTypeData *unit)
+{
+    for (int ii = 0; ii < unit->dependants.count(); ++ii) {
+        checkComplete(unit->dependants.at(ii));
+        unit->dependants.at(ii)->release();
+    }
+    unit->dependants.clear();
+
+    while(!unit->waiters.isEmpty()) {
+        QDeclarativeComponentPrivate *p = unit->waiters.takeFirst();
+        p->typeDataReady();
+    }
+}
+
+void QDeclarativeCompositeTypeManager::doComplete(QDeclarativeCompositeTypeResource *resource)
+{
+    for (int ii = 0; ii < resource->dependants.count(); ++ii) {
+        checkComplete(resource->dependants.at(ii));
+        resource->dependants.at(ii)->release();
+    }
+    resource->dependants.clear();
+}
+
+void QDeclarativeCompositeTypeManager::checkComplete(QDeclarativeCompositeTypeData *unit)
+{
+    if (unit->status != QDeclarativeCompositeTypeData::Waiting
+     && unit->status != QDeclarativeCompositeTypeData::WaitingResources)
+        return;
+
+    int waiting = 0;
+    for (int ii = 0; ii < unit->resources.count(); ++ii) {
+        QDeclarativeCompositeTypeResource *r = unit->resources.at(ii);
+
+        if (!r)
+            continue;
+
+        if (r->status == QDeclarativeCompositeTypeResource::Error) {
+            unit->status = QDeclarativeCompositeTypeData::Error;
+            QDeclarativeError error;
+            error.setUrl(unit->imports.baseUrl());
+            error.setDescription(tr("Resource %1 unavailable").arg(r->url));
+            unit->errors << error;
+            doComplete(unit);
+            return;
+        } else if (r->status == QDeclarativeCompositeTypeResource::Waiting) {
+            waiting++;
+        }
+    }
+
+    if (waiting == 0) {
+        if (unit->status == QDeclarativeCompositeTypeData::WaitingResources) {
+            waiting += resolveTypes(unit);
+            if (unit->status != QDeclarativeCompositeTypeData::Error) {
+                if (waiting)
+                    unit->status = QDeclarativeCompositeTypeData::Waiting;
+            } else {
+                return;
+            }
+        } else {
+            for (int ii = 0; ii < unit->types.count(); ++ii) {
+                QDeclarativeCompositeTypeData *u = unit->types.at(ii).unit;
+
+                if (!u)
+                    continue;
+
+                if (u->status == QDeclarativeCompositeTypeData::Error) {
+                    unit->status = QDeclarativeCompositeTypeData::Error;
+                    unit->errors = u->errors;
+                    doComplete(unit);
+                    return;
+                } else if (u->status == QDeclarativeCompositeTypeData::Waiting) {
+                    waiting++;
+                }
+            }
+        }
+    }
+
+    if (!waiting) {
+        unit->status = QDeclarativeCompositeTypeData::Complete;
+        doComplete(unit);
+    }
+}
+
+int QDeclarativeCompositeTypeManager::resolveTypes(QDeclarativeCompositeTypeData *unit)
+{
+    // not called until all resources are loaded (they include import URLs)
+
+    int waiting = 0;
+
+    foreach (QDeclarativeScriptParser::Import imp, unit->data.imports()) {
+        QString qmldir;
+        if (imp.type == QDeclarativeScriptParser::Import::File && imp.qualifier.isEmpty()) {
+            QString importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir"))).toString();
+            for (int ii = 0; ii < unit->resources.count(); ++ii) {
+                if (unit->resources.at(ii)->url == importUrl) {
+                    qmldir = QString::fromUtf8(unit->resources.at(ii)->data);
+                    break;
+                }
+            }
+        }
+
+        int vmaj = -1;
+        int vmin = -1;
+        if (!imp.version.isEmpty()) {
+            int dot = imp.version.indexOf(QLatin1Char('.'));
+            if (dot < 0) {
+                vmaj = imp.version.toInt();
+                vmin = 0;
+            } else {
+                vmaj = imp.version.left(dot).toInt();
+                vmin = imp.version.mid(dot+1).toInt();
+            }
+        }
+
+        if (!QDeclarativeEnginePrivate::get(engine)->
+                addToImport(&unit->imports, qmldir, imp.uri, imp.qualifier, vmaj, vmin, imp.type))
+        {
+            QDeclarativeError error;
+            error.setUrl(unit->imports.baseUrl());
+            error.setDescription(tr("Import %1 unavailable").arg(imp.uri));
+            unit->status = QDeclarativeCompositeTypeData::Error;
+            unit->errorType = QDeclarativeCompositeTypeData::GeneralError;
+            unit->errors << error;
+            doComplete(unit);
+            return 0;
+        }
+    }
+
+    QList<QDeclarativeScriptParser::TypeReference*> types = unit->data.referencedTypes();
+
+    for (int ii = 0; ii < types.count(); ++ii) {
+        QDeclarativeScriptParser::TypeReference *parserRef = types.at(ii);
+        QByteArray typeName = parserRef->name.toUtf8();
+
+        QDeclarativeCompositeTypeData::TypeReference ref;
+
+        QUrl url;
+        int majorVersion;
+        int minorVersion;
+        QDeclarativeEnginePrivate::ImportedNamespace *typeNamespace = 0;
+        if (!QDeclarativeEnginePrivate::get(engine)->resolveType(unit->imports, typeName, &ref.type, &url, &majorVersion, &minorVersion, &typeNamespace)
+                || typeNamespace)
+        {
+            // Known to not be a type:
+            //  - known to be a namespace (Namespace {})
+            //  - type with unknown namespace (UnknownNamespace.SomeType {})
+            QDeclarativeError error;
+            error.setUrl(unit->imports.baseUrl());
+            if (typeNamespace)
+                error.setDescription(tr("Namespace %1 cannot be used as a type").arg(QString::fromUtf8(typeName)));
+            else
+                error.setDescription(tr("%1 is not a type").arg(QString::fromUtf8(typeName)));
+            if (!parserRef->refObjects.isEmpty()) {
+                QDeclarativeParser::Object *obj = parserRef->refObjects.first();
+                error.setLine(obj->location.start.line);
+                error.setColumn(obj->location.start.column);
+            }
+            unit->status = QDeclarativeCompositeTypeData::Error;
+            unit->errorType = QDeclarativeCompositeTypeData::GeneralError;
+            unit->errors << error;
+            doComplete(unit);
+            return 0;
+        }
+
+        if (ref.type) {
+            foreach (QDeclarativeParser::Object *obj, parserRef->refObjects) {
+               // store namespace for DOM
+               obj->majorVersion = majorVersion;
+               obj->minorVersion = minorVersion;
+            }
+            unit->types << ref;
+            continue;
+        }
+
+        QDeclarativeCompositeTypeData *urlUnit = components.value(url);
+
+        if (!urlUnit) {
+            urlUnit = new QDeclarativeCompositeTypeData;
+            urlUnit->status = QDeclarativeCompositeTypeData::Waiting;
+            urlUnit->imports.setBaseUrl(url);
+            components.insert(url, urlUnit);
+
+            loadSource(urlUnit);
+        }
+
+        ref.unit = urlUnit;
+        switch(urlUnit->status) {
+        case QDeclarativeCompositeTypeData::Invalid:
+        case QDeclarativeCompositeTypeData::Error:
+            unit->status = QDeclarativeCompositeTypeData::Error;
+            {
+                QDeclarativeError error;
+                error.setUrl(unit->imports.baseUrl());
+                error.setDescription(tr("Type %1 unavailable").arg(QString::fromUtf8(typeName)));
+                if (!parserRef->refObjects.isEmpty()) {
+                    QDeclarativeParser::Object *obj = parserRef->refObjects.first();
+                    error.setLine(obj->location.start.line);
+                    error.setColumn(obj->location.start.column);
+                }
+                unit->errors << error;
+            }
+            if (urlUnit->errorType != QDeclarativeCompositeTypeData::AccessError) 
+                unit->errors << urlUnit->errors;
+            doComplete(unit);
+            return 0;
+
+        case QDeclarativeCompositeTypeData::Complete:
+            break;
+
+        case QDeclarativeCompositeTypeData::Waiting:
+        case QDeclarativeCompositeTypeData::WaitingResources:
+            unit->addref();
+            ref.unit->dependants << unit;
+            waiting++;
+            break;
+        }
+
+        unit->types << ref;
+    }
+    return waiting;
+}
+
+// ### Check ref counting in here
+void QDeclarativeCompositeTypeManager::compile(QDeclarativeCompositeTypeData *unit)
+{
+    int waiting = 0;
+
+    QList<QUrl> resourceList = unit->data.referencedResources();
+
+    foreach (QDeclarativeScriptParser::Import imp, unit->data.imports()) {
+        if (imp.type == QDeclarativeScriptParser::Import::File && imp.qualifier.isEmpty()) {
+            QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir")));
+            if (toLocalFileOrQrc(importUrl).isEmpty()) {
+                // Import requires remote qmldir
+                resourceList.prepend(importUrl);
+            }
+        }
+    }
+
+    for (int ii = 0; ii < resourceList.count(); ++ii) {
+        QUrl url = unit->imports.baseUrl().resolved(resourceList.at(ii));
+
+        QDeclarativeCompositeTypeResource *resource = resources.value(url);
+
+        if (!resource) {
+            resource = new QDeclarativeCompositeTypeResource;
+            resource->status = QDeclarativeCompositeTypeResource::Waiting;
+            resource->url = url.toString();
+            resources.insert(url, resource);
+
+            loadResource(resource);
+        }
+
+        switch(resource->status) {
+        case QDeclarativeCompositeTypeResource::Invalid:
+        case QDeclarativeCompositeTypeResource::Error:
+            unit->status = QDeclarativeCompositeTypeData::Error;
+            {
+                QDeclarativeError error;
+                error.setUrl(unit->imports.baseUrl());
+                error.setDescription(tr("Resource %1 unavailable").arg(resource->url));
+                unit->errors << error;
+            }
+            doComplete(unit);
+            return;
+
+        case QDeclarativeCompositeTypeData::Complete:
+            break;
+
+        case QDeclarativeCompositeTypeData::Waiting:
+            unit->addref();
+            resource->dependants << unit;
+            waiting++;
+            break;
+        }
+
+        resource->addref();
+        unit->resources << resource;
+    }
+
+    if (waiting == 0) {
+        waiting += resolveTypes(unit);
+        if (unit->status != QDeclarativeCompositeTypeData::Error) {
+            if (!waiting) {
+                unit->status = QDeclarativeCompositeTypeData::Complete;
+                doComplete(unit);
+            } else {
+                unit->status = QDeclarativeCompositeTypeData::Waiting;
+            }
+        }
+    } else {
+        unit->status = QDeclarativeCompositeTypeData::WaitingResources;
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecompositetypemanager_p.h b/src/declarative/qml/qdeclarativecompositetypemanager_p.h
new file mode 100644
index 0000000..03d16b8
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecompositetypemanager_p.h
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECOMPOSITETYPEMANAGER_P_H
+#define QDECLARATIVECOMPOSITETYPEMANAGER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativescriptparser_p.h"
+#include "qdeclarativerefcount_p.h"
+#include "qdeclarativeerror.h"
+#include "qdeclarativeengine.h"
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeCompiledData;
+class QDeclarativeComponentPrivate;
+class QDeclarativeComponent;
+class QDeclarativeDomDocument;
+
+class QDeclarativeCompositeTypeData;
+class QDeclarativeCompositeTypeResource;
+
+class QDeclarativeCompositeTypeManager : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeCompositeTypeManager(QDeclarativeEngine *);
+    ~QDeclarativeCompositeTypeManager();
+
+    // Return a QDeclarativeCompositeTypeData for url.  The QDeclarativeCompositeTypeData may be 
+    // cached.
+    QDeclarativeCompositeTypeData *get(const QUrl &url);
+    // Return a QDeclarativeCompositeTypeData for data, with the provided base url.  The
+   //  QDeclarativeCompositeTypeData will not be cached.
+    QDeclarativeCompositeTypeData *getImmediate(const QByteArray &data, const QUrl &url);
+
+    // Clear cached types.  Only types that aren't in the Waiting state will
+    // be cleared.
+    void clearCache();
+
+private Q_SLOTS:
+    void replyFinished();
+    void resourceReplyFinished();
+    void requestProgress(qint64 received, qint64 total);
+
+private:
+    void loadSource(QDeclarativeCompositeTypeData *);
+    void loadResource(QDeclarativeCompositeTypeResource *);
+    void compile(QDeclarativeCompositeTypeData *);
+    void setData(QDeclarativeCompositeTypeData *, const QByteArray &, const QUrl &);
+
+    void doComplete(QDeclarativeCompositeTypeData *);
+    void doComplete(QDeclarativeCompositeTypeResource *);
+    void checkComplete(QDeclarativeCompositeTypeData *);
+    int resolveTypes(QDeclarativeCompositeTypeData *);
+
+    QDeclarativeEngine *engine;
+    typedef QHash<QUrl, QDeclarativeCompositeTypeData *> Components;
+    Components components;
+    typedef QHash<QUrl, QDeclarativeCompositeTypeResource *> Resources;
+    Resources resources;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVECOMPOSITETYPEMANAGER_P_H
+
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
new file mode 100644
index 0000000..b244cd8
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -0,0 +1,574 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativecontext.h"
+#include "qdeclarativecontext_p.h"
+
+#include "qdeclarativeexpression_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativecompiledbindings_p.h"
+#include "qdeclarativeinfo.h"
+
+#include <qscriptengine.h>
+#include <QtCore/qvarlengtharray.h>
+#include <QtCore/qdebug.h>
+
+#include <private/qscriptdeclarativeclass_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeContextPrivate::QDeclarativeContextPrivate()
+: parent(0), engine(0), isInternal(false), propertyNames(0), 
+  notifyIndex(-1), highPriorityCount(0), imports(0), expressions(0), contextObjects(0),
+  idValues(0), idValueCount(0), optimizedBindings(0)
+{
+}
+
+void QDeclarativeContextPrivate::addScript(const QDeclarativeParser::Object::ScriptBlock &script, QObject *scopeObject)
+{
+    Q_Q(QDeclarativeContext);
+
+    if (!engine) 
+        return;
+
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
+    scriptContext->pushScope(enginePriv->contextClass->newContext(q, scopeObject));
+    
+    QScriptValue scope = scriptEngine->newObject();
+    scriptContext->setActivationObject(scope);
+
+    for (int ii = 0; ii < script.codes.count(); ++ii) {
+        scriptEngine->evaluate(script.codes.at(ii), script.files.at(ii), script.lineNumbers.at(ii));
+
+        if (scriptEngine->hasUncaughtException()) {
+            QDeclarativeError error;
+            QDeclarativeExpressionPrivate::exceptionToError(scriptEngine, error);
+            qWarning().nospace() << qPrintable(error.toString());
+        }
+    }
+
+    scriptEngine->popContext();
+
+    scripts.append(scope);
+}
+
+void QDeclarativeContextPrivate::destroyed(ContextGuard *guard)
+{
+    Q_Q(QDeclarativeContext);
+
+    // process of being deleted (which is *probably* why obj has been destroyed
+    // anyway), as we're about to get deleted which will invalidate all the
+    // expressions that could depend on us
+    QObject *parent = q->parent();
+    if (parent && QObjectPrivate::get(parent)->wasDeleted) 
+        return;
+
+    while(guard->bindings) {
+        QObject *o = guard->bindings->target;
+        int mi = guard->bindings->methodIndex;
+        guard->bindings->clear();
+        if (o) o->qt_metacall(QMetaObject::InvokeMetaMethod, mi, 0);
+    }
+
+    for (int ii = 0; ii < idValueCount; ++ii) {
+        if (&idValues[ii] == guard) {
+            QMetaObject::activate(q, ii + notifyIndex, 0);
+            return;
+        }
+    }
+}
+
+void QDeclarativeContextPrivate::init()
+{
+    Q_Q(QDeclarativeContext);
+
+    if (parent) 
+        parent->d_func()->childContexts.insert(q);
+}
+
+/*!
+    \class QDeclarativeContext
+  \since 4.7
+    \brief The QDeclarativeContext class defines a context within a QML engine.
+    \mainclass
+
+    Contexts allow data to be exposed to the QML components instantiated by the
+    QML engine.
+
+    Each QDeclarativeContext contains a set of properties, distinct from
+    its QObject properties, that allow data to be
+    explicitly bound to a context by name.  The context properties are defined or
+    updated by calling QDeclarativeContext::setContextProperty().  The following example shows
+    a Qt model being bound to a context and then accessed from a QML file.
+
+    \code
+    QDeclarativeEngine engine;
+    QDeclarativeContext context(engine.rootContext());
+    context.setContextProperty("myModel", modelData);
+
+    QDeclarativeComponent component(&engine, "ListView { model=myModel }");
+    component.create(&context);
+    \endcode
+
+    To simplify binding and maintaining larger data sets, QObject's can be
+    added to a QDeclarativeContext.  These objects are known as the context's default
+    objects.  In this case all the properties of the QObject are
+    made available by name in the context, as though they were all individually
+    added by calling QDeclarativeContext::setContextProperty().  Changes to the property's
+    values are detected through the property's notify signal.  This method is
+    also slightly more faster than manually adding property values.
+
+    The following example has the same effect as the one above, but it is
+    achieved using a default object.
+
+    \code
+    class MyDataSet : ... {
+        ...
+        Q_PROPERTY(QAbstractItemModel *myModel READ model NOTIFY modelChanged)
+        ...
+    };
+
+    MyDataSet myDataSet;
+    QDeclarativeEngine engine;
+    QDeclarativeContext context(engine.rootContext());
+    context.addDefaultObject(&myDataSet);
+
+    QDeclarativeComponent component(&engine, "ListView { model=myModel }");
+    component.create(&context);
+    \endcode
+
+    Default objects added first take precedence over those added later.  All properties 
+    added explicitly by QDeclarativeContext::setContextProperty() take precedence over default 
+    object properties.
+
+    Contexts are hierarchal, with the \l {QDeclarativeEngine::rootContext()}{root context}
+    being created by the QDeclarativeEngine.  A component instantiated in a given context
+    has access to that context's data, as well as the data defined by its
+    ancestor contexts.  Data values (including those added implicitly by the
+    default objects) in a context override those in ancestor contexts.  Data
+    that should be available to all components instantiated by the QDeclarativeEngine
+    should be added to the \l {QDeclarativeEngine::rootContext()}{root context}.
+
+    In the following example,
+
+    \code
+    QDeclarativeEngine engine;
+    QDeclarativeContext context1(engine.rootContext());
+    QDeclarativeContext context2(&context1);
+    QDeclarativeContext context3(&context2);
+
+    context1.setContextProperty("a", 12);
+    context2.setContextProperty("b", 13);
+    context3.setContextProperty("a", 14);
+    context3.setContextProperty("c", 14);
+    \endcode
+
+    a QML component instantiated in context1 would have access to the "a" data,
+    a QML component instantiated in context2 would have access to the "a" and
+    "b" data, and a QML component instantiated in context3 would have access to
+    the "a", "b" and "c" data - although its "a" data would return 14, unlike
+    that in context1 or context2.
+*/
+
+/*! \internal */
+QDeclarativeContext::QDeclarativeContext(QDeclarativeEngine *e, bool)
+: QObject(*(new QDeclarativeContextPrivate))
+{
+    Q_D(QDeclarativeContext);
+    d->engine = e;
+    d->init();
+}
+
+/*!
+    Create a new QDeclarativeContext as a child of \a engine's root context, and the
+    QObject \a parent.
+*/
+QDeclarativeContext::QDeclarativeContext(QDeclarativeEngine *engine, QObject *parent)
+: QObject(*(new QDeclarativeContextPrivate), parent)
+{
+    Q_D(QDeclarativeContext);
+    QDeclarativeContext *parentContext = engine?engine->rootContext():0;
+    d->parent = parentContext;
+    d->engine = parentContext->engine();
+    d->init();
+}
+
+/*!
+    Create a new QDeclarativeContext with the given \a parentContext, and the
+    QObject \a parent.
+*/
+QDeclarativeContext::QDeclarativeContext(QDeclarativeContext *parentContext, QObject *parent)
+: QObject(*(new QDeclarativeContextPrivate), parent)
+{
+    Q_D(QDeclarativeContext);
+    d->parent = parentContext;
+    d->engine = parentContext->engine();
+    d->init();
+}
+
+/*!
+    \internal
+*/
+QDeclarativeContext::QDeclarativeContext(QDeclarativeContext *parentContext, QObject *parent, bool)
+: QObject(*(new QDeclarativeContextPrivate), parent)
+{
+    Q_D(QDeclarativeContext);
+    d->parent = parentContext;
+    d->engine = parentContext->engine();
+    d->isInternal = true;
+    d->init();
+}
+
+/*!
+    Destroys the QDeclarativeContext.
+
+    Any expressions, or sub-contexts dependent on this context will be
+    invalidated, but not destroyed (unless they are parented to the QDeclarativeContext
+    object).
+ */
+QDeclarativeContext::~QDeclarativeContext()
+{
+    Q_D(QDeclarativeContext);
+    if (d->parent) 
+        d->parent->d_func()->childContexts.remove(this);
+
+    for (QSet<QDeclarativeContext *>::ConstIterator iter = d->childContexts.begin();
+            iter != d->childContexts.end();
+            ++iter) {
+        (*iter)->d_func()->invalidateEngines();
+        (*iter)->d_func()->parent = 0;
+    }
+
+    QDeclarativeAbstractExpression *expression = d->expressions;
+    while (expression) {
+        QDeclarativeAbstractExpression *nextExpression = expression->m_nextExpression;
+
+        expression->m_context = 0;
+        expression->m_prevExpression = 0;
+        expression->m_nextExpression = 0;
+
+        expression = nextExpression;
+    }
+
+    while (d->contextObjects) {
+        QDeclarativeDeclarativeData *co = d->contextObjects;
+        d->contextObjects = d->contextObjects->nextContextObject;
+
+        co->context = 0;
+        co->nextContextObject = 0;
+        co->prevContextObject = 0;
+    }
+
+    if (d->propertyNames)
+        d->propertyNames->release();
+
+    if (d->imports)
+        d->imports->release();
+
+    if (d->optimizedBindings)
+        d->optimizedBindings->release();
+
+    delete [] d->idValues;
+}
+
+void QDeclarativeContextPrivate::invalidateEngines()
+{
+    if (!engine)
+        return;
+    engine = 0;
+    for (QSet<QDeclarativeContext *>::ConstIterator iter = childContexts.begin();
+            iter != childContexts.end();
+            ++iter) {
+        (*iter)->d_func()->invalidateEngines();
+    }
+}
+
+/* 
+Refreshes all expressions that could possibly depend on this context.
+Refreshing flushes all context-tree dependent caches in the expressions, and should occur every
+time the context tree *structure* (not values) changes.
+*/
+void QDeclarativeContextPrivate::refreshExpressions()
+{
+    for (QSet<QDeclarativeContext *>::ConstIterator iter = childContexts.begin();
+            iter != childContexts.end();
+            ++iter) {
+        (*iter)->d_func()->refreshExpressions();
+    }
+
+    QDeclarativeAbstractExpression *expression = expressions;
+    while (expression) {
+        expression->refresh();
+        expression = expression->m_nextExpression;
+    }
+}
+
+/*!
+    Return the context's QDeclarativeEngine, or 0 if the context has no QDeclarativeEngine or the
+    QDeclarativeEngine was destroyed.
+*/
+QDeclarativeEngine *QDeclarativeContext::engine() const
+{
+    Q_D(const QDeclarativeContext);
+    return d->engine;
+}
+
+/*!
+    Return the context's parent QDeclarativeContext, or 0 if this context has no
+    parent or if the parent has been destroyed.
+*/
+QDeclarativeContext *QDeclarativeContext::parentContext() const
+{
+    Q_D(const QDeclarativeContext);
+    return d->parent;
+}
+
+/*!
+    Add \a defaultObject to this context.  The object will be added after
+    any existing default objects.
+*/
+void QDeclarativeContext::addDefaultObject(QObject *defaultObject)
+{
+    Q_D(QDeclarativeContext);
+    d->defaultObjects.prepend(defaultObject);
+}
+
+/*!
+    Set a the \a value of the \a name property on this context.
+*/
+void QDeclarativeContext::setContextProperty(const QString &name, const QVariant &value)
+{
+    Q_D(QDeclarativeContext);
+    if (d->notifyIndex == -1)
+        d->notifyIndex = this->metaObject()->methodCount();
+
+    if (d->engine) {
+        bool ok;
+        QObject *o = QDeclarativeEnginePrivate::get(d->engine)->toQObject(value, &ok);
+        if (ok) {
+            setContextProperty(name, o);
+            return;
+        }
+    }
+
+    if (!d->propertyNames) d->propertyNames = new QDeclarativeIntegerCache(d->engine);
+
+    int idx = d->propertyNames->value(name);
+    if (idx == -1) {
+        d->propertyNames->add(name, d->idValueCount + d->propertyValues.count());
+        d->propertyValues.append(value);
+
+        d->refreshExpressions();
+    } else {
+        d->propertyValues[idx] = value;
+        QMetaObject::activate(this, idx + d->notifyIndex, 0);
+    }
+}
+
+void QDeclarativeContextPrivate::setIdProperty(int idx, QObject *obj)
+{
+    if (notifyIndex == -1) {
+        Q_Q(QDeclarativeContext);
+        notifyIndex = q->metaObject()->methodCount();
+    }
+
+    idValues[idx].priv = this;
+    idValues[idx] = obj;
+}
+
+void QDeclarativeContextPrivate::setIdPropertyData(QDeclarativeIntegerCache *data)
+{
+    Q_ASSERT(!propertyNames);
+    propertyNames = data;
+    propertyNames->addref();
+
+    idValueCount = data->count();
+    idValues = new ContextGuard[idValueCount];
+}
+
+/*!
+    Set the \a value of the \a name property on this context.
+
+    QDeclarativeContext does \bold not take ownership of \a value.
+*/
+void QDeclarativeContext::setContextProperty(const QString &name, QObject *value)
+{
+    Q_D(QDeclarativeContext);
+    if (d->notifyIndex == -1)
+        d->notifyIndex = this->metaObject()->methodCount();
+
+    if (!d->propertyNames) d->propertyNames = new QDeclarativeIntegerCache(d->engine);
+    int idx = d->propertyNames->value(name);
+
+    if (idx == -1) {
+        d->propertyNames->add(name, d->idValueCount  + d->propertyValues.count());
+        d->propertyValues.append(QVariant::fromValue(value));
+
+        d->refreshExpressions();
+    } else {
+        d->propertyValues[idx] = QVariant::fromValue(value);
+        QMetaObject::activate(this, idx + d->notifyIndex, 0);
+    }
+}
+
+/*!
+  Returns the value of the \a name property for this context
+  as a QVariant.
+ */
+QVariant QDeclarativeContext::contextProperty(const QString &name) const
+{
+    Q_D(const QDeclarativeContext);
+    QVariant value;
+    int idx = -1;
+    if (d->propertyNames)
+        idx = d->propertyNames->value(name);
+
+    if (idx == -1) {
+        QByteArray utf8Name = name.toUtf8();
+        for (int ii = d->defaultObjects.count() - 1; ii >= 0; --ii) {
+            QObject *obj = d->defaultObjects.at(ii);
+            QDeclarativePropertyCache::Data local;
+            QDeclarativePropertyCache::Data *property = QDeclarativePropertyCache::property(d->engine, obj, name, local);
+
+            if (property) {
+                value = obj->metaObject()->property(property->coreIndex).read(obj);
+                break;
+            }
+        }
+        if (!value.isValid() && parentContext())
+            value = parentContext()->contextProperty(name);
+    } else {
+        value = d->propertyValues[idx];
+    }
+
+    return value;
+}
+
+/*!
+    Resolves the URL \a src relative to the URL of the
+    containing component.
+
+    \sa QDeclarativeEngine::baseUrl(), setBaseUrl()
+*/
+QUrl QDeclarativeContext::resolvedUrl(const QUrl &src)
+{
+    Q_D(QDeclarativeContext);
+    QDeclarativeContext *ctxt = this;
+    if (src.isRelative() && !src.isEmpty()) {
+        if (ctxt) {
+            while(ctxt) {
+                if(ctxt->d_func()->url.isValid())
+                    break;
+                else
+                    ctxt = ctxt->parentContext();
+            }
+
+            if (ctxt)
+                return ctxt->d_func()->url.resolved(src);
+            else if (d->engine)
+                return d->engine->baseUrl().resolved(src);
+        }
+        return QUrl();
+    } else {
+        return src;
+    }
+}
+
+/*!
+    Explicitly sets the url resolvedUrl() will use for relative references to \a baseUrl.
+
+    Calling this function will override the url of the containing
+    component used by default.
+
+    \sa resolvedUrl()
+*/
+void QDeclarativeContext::setBaseUrl(const QUrl &baseUrl)
+{
+    d_func()->url = baseUrl;
+}
+
+/*!
+    Returns the base url of the component, or the containing component
+    if none is set.
+*/
+QUrl QDeclarativeContext::baseUrl() const
+{
+    const QDeclarativeContext* p = this;
+    while (p && p->d_func()->url.isEmpty()) {
+        p = p->parentContext();
+    }
+    if (p)
+        return p->d_func()->url;
+    else
+        return QUrl();
+}
+
+int QDeclarativeContextPrivate::context_count(QDeclarativeListProperty<QObject> *prop)
+{
+    QDeclarativeContext *context = static_cast<QDeclarativeContext*>(prop->object);
+    QDeclarativeContextPrivate *d = QDeclarativeContextPrivate::get(context);
+    int contextProperty = (int)(intptr_t)prop->data;
+
+    if (d->propertyValues.at(contextProperty).userType() != qMetaTypeId<QList<QObject*> >()) {
+        return 0;
+    } else {
+        return ((const QList<QObject> *)d->propertyValues.at(contextProperty).constData())->count();
+    }
+}
+
+QObject *QDeclarativeContextPrivate::context_at(QDeclarativeListProperty<QObject> *prop, int index)
+{
+    QDeclarativeContext *context = static_cast<QDeclarativeContext*>(prop->object);
+    QDeclarativeContextPrivate *d = QDeclarativeContextPrivate::get(context);
+    int contextProperty = (int)(intptr_t)prop->data;
+
+    if (d->propertyValues.at(contextProperty).userType() != qMetaTypeId<QList<QObject*> >()) {
+        return 0;
+    } else {
+        return ((const QList<QObject*> *)d->propertyValues.at(contextProperty).constData())->at(index);
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h
new file mode 100644
index 0000000..0fb9bee
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecontext.h
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECONTEXT_H
+#define QDECLARATIVECONTEXT_H
+
+#include <QtCore/qurl.h>
+#include <QtCore/qobject.h>
+#include <QtScript/qscriptvalue.h>
+#include <QtCore/qmetatype.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QString;
+class QDeclarativeEngine;
+class QDeclarativeRefCount;
+class QDeclarativeContextPrivate;
+class QDeclarativeCompositeTypeData;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeContext : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeContext)
+
+public:
+    QDeclarativeContext(QDeclarativeEngine *parent, QObject *objParent=0);
+    QDeclarativeContext(QDeclarativeContext *parent, QObject *objParent=0);
+    virtual ~QDeclarativeContext();
+
+    QDeclarativeEngine *engine() const;
+    QDeclarativeContext *parentContext() const;
+
+    void addDefaultObject(QObject *);
+    void setContextProperty(const QString &, QObject *);
+    void setContextProperty(const QString &, const QVariant &);
+
+    QVariant contextProperty(const QString &) const;
+
+    QUrl resolvedUrl(const QUrl &);
+
+    void setBaseUrl(const QUrl &);
+    QUrl baseUrl() const;
+
+private:
+    friend class QDeclarativeVME;
+    friend class QDeclarativeEngine;
+    friend class QDeclarativeEnginePrivate;
+    friend class QDeclarativeExpression;
+    friend class QDeclarativeExpressionPrivate;
+    friend class QDeclarativeContextScriptClass;
+    friend class QDeclarativeObjectScriptClass;
+    friend class QDeclarativeComponent;
+    friend class QDeclarativeComponentPrivate;
+    friend class QDeclarativeScriptPrivate;
+    friend class QDeclarativeBoundSignalProxy;
+    QDeclarativeContext(QDeclarativeContext *parent, QObject *objParent, bool);
+    QDeclarativeContext(QDeclarativeEngine *, bool);
+};
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QList<QObject*>);
+
+QT_END_HEADER
+
+#endif // QDECLARATIVECONTEXT_H
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
new file mode 100644
index 0000000..8297280
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -0,0 +1,195 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECONTEXT_P_H
+#define QDECLARATIVECONTEXT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativecontext.h"
+
+#include "qdeclarativedeclarativedata_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeintegercache_p.h"
+#include "qdeclarativetypenamecache_p.h"
+
+#include <QtCore/qhash.h>
+#include <QtScript/qscriptvalue.h>
+#include <QtCore/qset.h>
+
+#include <private/qobject_p.h>
+#include "qdeclarativeguard_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeContext;
+class QDeclarativeExpression;
+class QDeclarativeEngine;
+class QDeclarativeExpression;
+class QDeclarativeExpressionPrivate;
+class QDeclarativeAbstractExpression;
+class QDeclarativeBinding_Id;
+class QDeclarativeCompiledBindings;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeContextPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeContext)
+public:
+    QDeclarativeContextPrivate();
+
+    QDeclarativeContext *parent;
+    QDeclarativeEngine *engine;
+
+    bool isInternal;
+
+    QDeclarativeIntegerCache *propertyNames;
+    QList<QVariant> propertyValues;
+    int notifyIndex;
+
+    QObjectList defaultObjects;
+    int highPriorityCount;
+
+    QList<QScriptValue> scripts;
+    void addScript(const QDeclarativeParser::Object::ScriptBlock &, QObject *);
+
+    QUrl url;
+
+    QDeclarativeTypeNameCache *imports;
+
+    void init();
+
+    void invalidateEngines();
+    void refreshExpressions();
+    QSet<QDeclarativeContext *> childContexts;
+
+    QDeclarativeAbstractExpression *expressions;
+
+    QDeclarativeDeclarativeData *contextObjects;
+
+    struct IdNotifier 
+    {
+        inline IdNotifier();
+        inline ~IdNotifier();
+        
+        inline void clear();
+
+        IdNotifier *next;
+        IdNotifier**prev;
+        QObject *target;
+        int methodIndex;
+    };
+
+    struct ContextGuard : public QDeclarativeGuard<QObject>
+    {
+        inline ContextGuard();
+        inline ContextGuard &operator=(QObject *obj);
+        inline virtual void objectDestroyed(QObject *);
+
+        QDeclarativeContextPrivate *priv;
+        IdNotifier *bindings;
+    };
+    ContextGuard *idValues;
+    int idValueCount;
+    void setIdProperty(int, QObject *);
+    void setIdPropertyData(QDeclarativeIntegerCache *);
+    void destroyed(ContextGuard *);
+
+    static QDeclarativeContextPrivate *get(QDeclarativeContext *context) {
+        return static_cast<QDeclarativeContextPrivate *>(QObjectPrivate::get(context));
+    }
+    static QDeclarativeContext *get(QDeclarativeContextPrivate *context) {
+        return static_cast<QDeclarativeContext *>(context->q_func());
+    }
+
+    QDeclarativeCompiledBindings *optimizedBindings;
+
+    // Only used for debugging
+    QList<QPointer<QObject> > instances;
+
+    static int context_count(QDeclarativeListProperty<QObject> *);
+    static QObject *context_at(QDeclarativeListProperty<QObject> *, int);
+};
+
+QDeclarativeContextPrivate::IdNotifier::IdNotifier()
+: next(0), prev(0), target(0), methodIndex(-1)
+{
+}
+
+QDeclarativeContextPrivate::IdNotifier::~IdNotifier()
+{
+    clear();
+}
+
+void QDeclarativeContextPrivate::IdNotifier::clear()
+{
+    if (next) next->prev = prev;
+    if (prev) *prev = next;
+    next = 0; prev = 0; target = 0;
+    methodIndex = -1;
+}
+
+QDeclarativeContextPrivate::ContextGuard::ContextGuard() 
+: priv(0), bindings(0) 
+{
+}
+
+QDeclarativeContextPrivate::ContextGuard &QDeclarativeContextPrivate::ContextGuard::operator=(QObject *obj) 
+{
+    (QDeclarativeGuard<QObject>&)*this = obj; return *this;
+}
+
+void QDeclarativeContextPrivate::ContextGuard::objectDestroyed(QObject *) 
+{ 
+    priv->destroyed(this); 
+}
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVECONTEXT_P_H
diff --git a/src/declarative/qml/qdeclarativecontextscriptclass.cpp b/src/declarative/qml/qdeclarativecontextscriptclass.cpp
new file mode 100644
index 0000000..7deed0b
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecontextscriptclass.cpp
@@ -0,0 +1,275 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativecontextscriptclass_p.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativetypenamescriptclass_p.h"
+#include "qdeclarativelistscriptclass_p.h"
+#include "qdeclarativeguard_p.h"
+
+QT_BEGIN_NAMESPACE
+
+struct ContextData : public QScriptDeclarativeClass::Object {
+    ContextData() : isSharedContext(true) {}
+    ContextData(QDeclarativeContext *c, QObject *o) : context(c), scopeObject(o), isSharedContext(false) {}
+    QDeclarativeGuard<QDeclarativeContext> context;
+    QDeclarativeGuard<QObject> scopeObject;
+    bool isSharedContext;
+
+    QDeclarativeContext *getContext(QDeclarativeEngine *engine) {
+        if (isSharedContext) {
+            return QDeclarativeEnginePrivate::get(engine)->sharedContext;
+        } else {
+            return context.data();
+        }
+    }
+
+    QObject *getScope(QDeclarativeEngine *engine) {
+        if (isSharedContext) {
+            return QDeclarativeEnginePrivate::get(engine)->sharedScope;
+        } else {
+            return scopeObject.data();
+        }
+    }
+};
+
+/*
+    The QDeclarativeContextScriptClass handles property access for a QDeclarativeContext
+    via QtScript.
+ */
+QDeclarativeContextScriptClass::QDeclarativeContextScriptClass(QDeclarativeEngine *bindEngine)
+: QDeclarativeScriptClass(QDeclarativeEnginePrivate::getScriptEngine(bindEngine)), engine(bindEngine),
+  lastScopeObject(0), lastContext(0), lastData(0), lastPropertyIndex(-1), lastDefaultObject(-1)
+{
+}
+
+QDeclarativeContextScriptClass::~QDeclarativeContextScriptClass()
+{
+}
+
+QScriptValue QDeclarativeContextScriptClass::newContext(QDeclarativeContext *context, QObject *scopeObject)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    return newObject(scriptEngine, this, new ContextData(context, scopeObject));
+}
+
+QScriptValue QDeclarativeContextScriptClass::newSharedContext()
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    return newObject(scriptEngine, this, new ContextData());
+}
+
+QDeclarativeContext *QDeclarativeContextScriptClass::contextFromValue(const QScriptValue &v)
+{
+    if (scriptClass(v) != this)
+        return 0;
+
+    ContextData *data = (ContextData *)object(v);
+    return data->getContext(engine);
+}
+
+QScriptClass::QueryFlags 
+QDeclarativeContextScriptClass::queryProperty(Object *object, const Identifier &name, 
+                                     QScriptClass::QueryFlags flags)
+{
+    Q_UNUSED(flags);
+    
+    lastScopeObject = 0;
+    lastContext = 0;
+    lastData = 0;
+    lastPropertyIndex = -1;
+    lastDefaultObject = -1;
+
+    QDeclarativeContext *bindContext = ((ContextData *)object)->getContext(engine);
+    QObject *scopeObject = ((ContextData *)object)->getScope(engine);
+    if (!bindContext)
+        return 0;
+
+    bool includeTypes = true;
+    while (bindContext) {
+        QScriptClass::QueryFlags rv = 
+            queryProperty(bindContext, scopeObject, name, flags, includeTypes);
+        scopeObject = 0; // Only applies to the first context
+        includeTypes = false; // Only applies to the first context
+        if (rv) return rv;
+        bindContext = bindContext->parentContext();
+    }
+
+    return 0;
+}
+
+QScriptClass::QueryFlags 
+QDeclarativeContextScriptClass::queryProperty(QDeclarativeContext *bindContext, QObject *scopeObject,
+                                     const Identifier &name,
+                                     QScriptClass::QueryFlags flags, 
+                                     bool includeTypes)
+{
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+    QDeclarativeContextPrivate *cp = QDeclarativeContextPrivate::get(bindContext);
+
+    lastPropertyIndex = cp->propertyNames?cp->propertyNames->value(name):-1;
+    if (lastPropertyIndex != -1) {
+        lastContext = bindContext;
+        return QScriptClass::HandlesReadAccess;
+    }
+
+    if (includeTypes && cp->imports) { 
+        QDeclarativeTypeNameCache::Data *data = cp->imports->data(name);
+
+        if (data)  {
+            lastData = data;
+            lastContext = bindContext;
+            return QScriptClass::HandlesReadAccess;
+        }
+    }
+
+    for (int ii = 0; ii < cp->scripts.count(); ++ii) {
+        lastFunction = QScriptDeclarativeClass::function(cp->scripts.at(ii), name);
+        if (lastFunction.isValid()) {
+            lastContext = bindContext;
+            return QScriptClass::HandlesReadAccess;
+        }
+    }
+
+    if (scopeObject) {
+        QScriptClass::QueryFlags rv = 
+            ep->objectClass->queryProperty(scopeObject, name, flags, bindContext, 
+                                           QDeclarativeObjectScriptClass::ImplicitObject | QDeclarativeObjectScriptClass::SkipAttachedProperties);
+        if (rv) {
+            lastScopeObject = scopeObject;
+            lastContext = bindContext;
+            return rv;
+        }
+    }
+
+    for (int ii = cp->defaultObjects.count() - 1; ii >= 0; --ii) {
+        QScriptClass::QueryFlags rv = 
+            ep->objectClass->queryProperty(cp->defaultObjects.at(ii), name, flags, bindContext, 
+                                           QDeclarativeObjectScriptClass::ImplicitObject | QDeclarativeObjectScriptClass::SkipAttachedProperties);
+
+        if (rv) {
+            lastDefaultObject = ii;
+            lastContext = bindContext;
+            return rv;
+        }
+    }
+
+    return 0;
+}
+
+QDeclarativeContextScriptClass::ScriptValue
+QDeclarativeContextScriptClass::property(Object *object, const Identifier &name)
+{
+    Q_UNUSED(object);
+
+    QDeclarativeContext *bindContext = lastContext;
+    Q_ASSERT(bindContext);
+
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+    QDeclarativeContextPrivate *cp = QDeclarativeContextPrivate::get(bindContext);
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    if (lastScopeObject) {
+
+        return ep->objectClass->property(lastScopeObject, name);
+
+    } else if (lastData) {
+
+        if (lastData->type)
+            return Value(scriptEngine, ep->typeNameClass->newObject(cp->defaultObjects.at(0), lastData->type));
+        else
+            return Value(scriptEngine, ep->typeNameClass->newObject(cp->defaultObjects.at(0), lastData->typeNamespace));
+
+    } else if (lastPropertyIndex != -1) {
+
+        QScriptValue rv;
+        if (lastPropertyIndex < cp->idValueCount) {
+            rv =  ep->objectClass->newQObject(cp->idValues[lastPropertyIndex].data());
+        } else {
+            const QVariant &value = cp->propertyValues.at(lastPropertyIndex);
+            if (value.userType() == qMetaTypeId<QList<QObject*> >()) {
+                rv = ep->listClass->newList(QDeclarativeListProperty<QObject>(bindContext, (void*)lastPropertyIndex, 0, QDeclarativeContextPrivate::context_count, QDeclarativeContextPrivate::context_at), qMetaTypeId<QDeclarativeListProperty<QObject> >());
+            } else {
+                rv = ep->scriptValueFromVariant(value);
+            }
+        }
+
+        ep->capturedProperties << 
+            QDeclarativeEnginePrivate::CapturedProperty(bindContext, -1, lastPropertyIndex + cp->notifyIndex);
+
+        return Value(scriptEngine, rv);
+    } else if(lastDefaultObject != -1) {
+
+        // Default object property
+        return ep->objectClass->property(cp->defaultObjects.at(lastDefaultObject), name);
+
+    } else {
+
+        return Value(scriptEngine, lastFunction);
+
+    }
+}
+
+void QDeclarativeContextScriptClass::setProperty(Object *object, const Identifier &name, 
+                                        const QScriptValue &value)
+{
+    Q_UNUSED(object);
+    Q_ASSERT(lastScopeObject || lastDefaultObject != -1);
+
+    QDeclarativeContext *bindContext = lastContext;
+    Q_ASSERT(bindContext);
+
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+    QDeclarativeContextPrivate *cp = QDeclarativeContextPrivate::get(bindContext);
+
+    if (lastScopeObject) {
+        ep->objectClass->setProperty(lastScopeObject, name, value, bindContext);
+    } else {
+        ep->objectClass->setProperty(cp->defaultObjects.at(lastDefaultObject), name, value,
+                                     bindContext);
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecontextscriptclass_p.h b/src/declarative/qml/qdeclarativecontextscriptclass_p.h
new file mode 100644
index 0000000..26086ec
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecontextscriptclass_p.h
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECONTEXTSCRIPTCLASS_P_H
+#define QDECLARATIVECONTEXTSCRIPTCLASS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativetypenamecache_p.h"
+#include "qdeclarativescriptclass_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QDeclarativeContext;
+class QDeclarativeContextScriptClass : public QDeclarativeScriptClass
+{
+public:
+    QDeclarativeContextScriptClass(QDeclarativeEngine *);
+    ~QDeclarativeContextScriptClass();
+
+    QScriptValue newContext(QDeclarativeContext *, QObject * = 0);
+    QScriptValue newSharedContext();
+
+    QDeclarativeContext *contextFromValue(const QScriptValue &);
+
+protected:
+    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
+                                                   QScriptClass::QueryFlags flags);
+    virtual ScriptValue property(Object *, const Identifier &);
+    virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
+
+private:
+    QScriptClass::QueryFlags queryProperty(QDeclarativeContext *, QObject *scopeObject, 
+                                           const Identifier &,
+                                           QScriptClass::QueryFlags flags,
+                                           bool includeTypes);
+
+    QDeclarativeEngine *engine;
+
+    QObject *lastScopeObject;
+    QDeclarativeContext *lastContext;
+    QDeclarativeTypeNameCache::Data *lastData;
+    int lastPropertyIndex;
+    int lastDefaultObject;
+    QScriptValue lastFunction;
+
+    uint m_id;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVECONTEXTSCRIPTCLASS_P_H
+
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp
new file mode 100644
index 0000000..67f0963
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecustomparser.cpp
@@ -0,0 +1,263 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativecustomparser_p.h"
+#include "qdeclarativecustomparser_p_p.h"
+
+#include "qdeclarativeparser_p.h"
+
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QDeclarativeParser;
+
+/*!
+    \class QDeclarativeCustomParser
+    \brief The QDeclarativeCustomParser class allows you to add new arbitrary types to QML.
+    \internal
+
+    By subclassing QDeclarativeCustomParser, you can add a parser for
+    building a particular type.
+
+    The subclass must implement compile() and setCustomData(), and register
+    itself in the meta type system by calling the macro:
+
+    \code
+    QML_REGISTER_CUSTOM_TYPE(Module, MajorVersion, MinorVersion, Name, TypeClass, ParserClass)
+    \endcode
+*/
+
+/*
+    \fn QByteArray QDeclarativeCustomParser::compile(const QList<QDeclarativeCustomParserProperty> & properties)
+
+    The custom parser processes \a properties, and returns
+    a QByteArray containing data meaningful only to the
+    custom parser; the type engine will pass this same data to
+    setCustomData() when making an instance of the data.
+
+    Errors must be reported via the error() functions.
+
+    The QByteArray may be cached between executions of the system, so
+    it must contain correctly-serialized data (not, for example,
+    pointers to stack objects).
+*/
+
+/*
+    \fn void QDeclarativeCustomParser::setCustomData(QObject *object, const QByteArray &data)
+
+    This function sets \a object to have the properties defined
+    by \a data, which is a block of data previously returned by a call
+    to compile().
+
+    The \a object will be an instance of the TypeClass specified by QML_REGISTER_CUSTOM_TYPE.
+*/
+
+QDeclarativeCustomParserNode 
+QDeclarativeCustomParserNodePrivate::fromObject(QDeclarativeParser::Object *root)
+{
+    QDeclarativeCustomParserNode rootNode;
+    rootNode.d->name = root->typeName;
+    rootNode.d->location = root->location.start;
+
+    for(QHash<QByteArray, Property *>::Iterator iter = root->properties.begin();
+        iter != root->properties.end();
+        ++iter) {
+
+        Property *p = *iter;
+
+        rootNode.d->properties << fromProperty(p);
+    }
+
+    return rootNode;
+}
+
+QDeclarativeCustomParserProperty 
+QDeclarativeCustomParserNodePrivate::fromProperty(QDeclarativeParser::Property *p)
+{
+    QDeclarativeCustomParserProperty prop;
+    prop.d->name = p->name;
+    prop.d->isList = (p->values.count() > 1);
+    prop.d->location = p->location.start;
+
+    if (p->value) {
+        QDeclarativeCustomParserNode node = fromObject(p->value);
+        QList<QDeclarativeCustomParserProperty> props = node.properties();
+        for (int ii = 0; ii < props.count(); ++ii)
+            prop.d->values << QVariant::fromValue(props.at(ii));
+    } else {
+        for(int ii = 0; ii < p->values.count(); ++ii) {
+            Value *v = p->values.at(ii);
+            v->type = QDeclarativeParser::Value::Literal;
+
+            if(v->object) {
+                QDeclarativeCustomParserNode node = fromObject(v->object);
+                prop.d->values << QVariant::fromValue(node);
+            } else {
+                prop.d->values << QVariant::fromValue(v->value);
+            }
+
+        }
+    }
+
+    return prop;
+}
+
+QDeclarativeCustomParserNode::QDeclarativeCustomParserNode()
+: d(new QDeclarativeCustomParserNodePrivate)
+{
+}
+
+QDeclarativeCustomParserNode::QDeclarativeCustomParserNode(const QDeclarativeCustomParserNode &other)
+: d(new QDeclarativeCustomParserNodePrivate)
+{
+    *this = other;
+}
+
+QDeclarativeCustomParserNode &QDeclarativeCustomParserNode::operator=(const QDeclarativeCustomParserNode &other)
+{
+    d->name = other.d->name;
+    d->properties = other.d->properties;
+    d->location = other.d->location;
+    return *this;
+}
+
+QDeclarativeCustomParserNode::~QDeclarativeCustomParserNode()
+{
+    delete d; d = 0;
+}
+
+QByteArray QDeclarativeCustomParserNode::name() const
+{
+    return d->name;
+}
+
+QList<QDeclarativeCustomParserProperty> QDeclarativeCustomParserNode::properties() const
+{
+    return d->properties;
+}
+
+QDeclarativeParser::Location QDeclarativeCustomParserNode::location() const
+{
+    return d->location;
+}
+
+QDeclarativeCustomParserProperty::QDeclarativeCustomParserProperty()
+: d(new QDeclarativeCustomParserPropertyPrivate)
+{
+}
+
+QDeclarativeCustomParserProperty::QDeclarativeCustomParserProperty(const QDeclarativeCustomParserProperty &other)
+: d(new QDeclarativeCustomParserPropertyPrivate)
+{
+    *this = other;
+}
+
+QDeclarativeCustomParserProperty &QDeclarativeCustomParserProperty::operator=(const QDeclarativeCustomParserProperty &other)
+{
+    d->name = other.d->name;
+    d->isList = other.d->isList;
+    d->values = other.d->values;
+    d->location = other.d->location;
+    return *this;
+}
+
+QDeclarativeCustomParserProperty::~QDeclarativeCustomParserProperty()
+{
+    delete d; d = 0;
+}
+
+QByteArray QDeclarativeCustomParserProperty::name() const
+{
+    return d->name;
+}
+
+bool QDeclarativeCustomParserProperty::isList() const
+{
+    return d->isList;
+}
+
+QDeclarativeParser::Location QDeclarativeCustomParserProperty::location() const
+{
+    return d->location;
+}
+
+QList<QVariant> QDeclarativeCustomParserProperty::assignedValues() const
+{
+    return d->values;
+}
+
+void QDeclarativeCustomParser::clearErrors()
+{
+    exceptions.clear();
+}
+
+/*!
+    Reports an error in parsing \a prop, with the given \a description.
+
+    An error is generated referring to the position of \a node in the source file.
+*/
+void QDeclarativeCustomParser::error(const QDeclarativeCustomParserProperty& prop, const QString& description)
+{
+    QDeclarativeError error;
+    QString exceptionDescription;
+    error.setLine(prop.location().line);
+    error.setColumn(prop.location().column);
+    error.setDescription(description);
+    exceptions << error;
+}
+
+/*!
+    Reports an error in parsing \a node, with the given \a description.
+
+    An error is generated referring to the position of \a node in the source file.
+*/
+void QDeclarativeCustomParser::error(const QDeclarativeCustomParserNode& node, const QString& description)
+{
+    QDeclarativeError error;
+    QString exceptionDescription;
+    error.setLine(node.location().line);
+    error.setColumn(node.location().column);
+    error.setDescription(description);
+    exceptions << error;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
new file mode 100644
index 0000000..cef1f3c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECUSTOMPARSER_H
+#define QDECLARATIVECUSTOMPARSER_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativemetatype.h"
+#include "qdeclarativeerror.h"
+#include "qdeclarativeparser_p.h"
+
+#include <QtCore/qbytearray.h>
+#include <QtCore/qxmlstream.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeCustomParserPropertyPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserProperty
+{
+public:
+    QDeclarativeCustomParserProperty();
+    QDeclarativeCustomParserProperty(const QDeclarativeCustomParserProperty &);
+    QDeclarativeCustomParserProperty &operator=(const QDeclarativeCustomParserProperty &);
+    ~QDeclarativeCustomParserProperty();
+
+    QByteArray name() const;
+    QDeclarativeParser::Location location() const;
+
+    bool isList() const;
+    // Will be one of QDeclarativeParser::Variant, QDeclarativeCustomParserProperty or 
+    // QDeclarativeCustomParserNode
+    QList<QVariant> assignedValues() const;
+
+private:
+    friend class QDeclarativeCustomParserNodePrivate;
+    friend class QDeclarativeCustomParserPropertyPrivate;
+    QDeclarativeCustomParserPropertyPrivate *d;
+};
+
+class QDeclarativeCustomParserNodePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserNode
+{
+public:
+    QDeclarativeCustomParserNode();
+    QDeclarativeCustomParserNode(const QDeclarativeCustomParserNode &);
+    QDeclarativeCustomParserNode &operator=(const QDeclarativeCustomParserNode &);
+    ~QDeclarativeCustomParserNode();
+
+    QByteArray name() const;
+    QDeclarativeParser::Location location() const;
+
+    QList<QDeclarativeCustomParserProperty> properties() const;
+
+private:
+    friend class QDeclarativeCustomParserNodePrivate;
+    QDeclarativeCustomParserNodePrivate *d;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeCustomParser
+{
+public:
+    virtual ~QDeclarativeCustomParser() {}
+
+    void clearErrors();
+
+    virtual QByteArray compile(const QList<QDeclarativeCustomParserProperty> &)=0;
+    virtual void setCustomData(QObject *, const QByteArray &)=0;
+
+    QList<QDeclarativeError> errors() const { return exceptions; }
+
+protected:
+    void error(const QDeclarativeCustomParserProperty&, const QString& description);
+    void error(const QDeclarativeCustomParserNode&, const QString& description);
+
+private:
+    QList<QDeclarativeError> exceptions;
+};
+
+#define QML_REGISTER_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, CUSTOMTYPE) \
+            qmlRegisterCustomType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE, new CUSTOMTYPE)
+
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDeclarativeCustomParserProperty)
+Q_DECLARE_METATYPE(QDeclarativeCustomParserNode)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/qml/qdeclarativecustomparser_p_p.h b/src/declarative/qml/qdeclarativecustomparser_p_p.h
new file mode 100644
index 0000000..b580db6
--- /dev/null
+++ b/src/declarative/qml/qdeclarativecustomparser_p_p.h
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECUSTOMPARSER_P_H
+#define QDECLARATIVECUSTOMPARSER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativecustomparser_p.h"
+
+#include "qdeclarativeparser_p.h"
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeCustomParserNodePrivate
+{
+public:
+    QByteArray name;
+    QList<QDeclarativeCustomParserProperty> properties;
+    QDeclarativeParser::Location location;
+
+    static QDeclarativeCustomParserNode fromObject(QDeclarativeParser::Object *);
+    static QDeclarativeCustomParserProperty fromProperty(QDeclarativeParser::Property *);
+};
+
+class QDeclarativeCustomParserPropertyPrivate
+{
+public:
+    QDeclarativeCustomParserPropertyPrivate()
+        : isList(false) {}
+
+    QByteArray name;
+    bool isList;
+    QDeclarativeParser::Location location;
+    QList<QVariant> values;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVECUSTOMPARSER_P_H
diff --git a/src/declarative/qml/qdeclarativedeclarativedata_p.h b/src/declarative/qml/qdeclarativedeclarativedata_p.h
new file mode 100644
index 0000000..2c92419
--- /dev/null
+++ b/src/declarative/qml/qdeclarativedeclarativedata_p.h
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEDECLARATIVEDATA_P_H
+#define QDECLARATIVEDECLARATIVEDATA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtScript/qscriptvalue.h>
+#include <private/qobject_p.h>
+#include "qdeclarativeguard_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeCompiledData;
+class QDeclarativeAbstractBinding;
+class QDeclarativeContext;
+class QDeclarativePropertyCache;
+class Q_AUTOTEST_EXPORT QDeclarativeDeclarativeData : public QDeclarativeData
+{
+public:
+    QDeclarativeDeclarativeData(QDeclarativeContext *ctxt = 0)
+        : context(ctxt), bindings(0), nextContextObject(0), prevContextObject(0),
+          bindingBitsSize(0), bindingBits(0), outerContext(0), lineNumber(0), 
+          columnNumber(0), deferredComponent(0), deferredIdx(0), attachedProperties(0), 
+          propertyCache(0), guards(0) {}
+
+    virtual void destroyed(QObject *);
+
+    QDeclarativeContext *context;
+    QDeclarativeAbstractBinding *bindings;
+
+    // Linked list for QDeclarativeContext::contextObjects
+    QDeclarativeDeclarativeData *nextContextObject;
+    QDeclarativeDeclarativeData**prevContextObject;
+
+    int bindingBitsSize;
+    quint32 *bindingBits; 
+    bool hasBindingBit(int) const;
+    void clearBindingBit(int);
+    void setBindingBit(QObject *obj, int);
+
+    QDeclarativeContext *outerContext; // Can't this be found from context?
+    ushort lineNumber;
+    ushort columnNumber;
+
+    QDeclarativeCompiledData *deferredComponent; // Can't this be found from the context?
+    unsigned int deferredIdx;
+
+    QHash<int, QObject *> *attachedProperties;
+
+    QScriptValue scriptValue;
+    QDeclarativePropertyCache *propertyCache;
+
+    QDeclarativeGuard<QObject> *guards;
+
+    static QDeclarativeDeclarativeData *get(const QObject *object, bool create = false) {
+        QObjectPrivate *priv = QObjectPrivate::get(const_cast<QObject *>(object));
+        if (priv->declarativeData) {
+            return static_cast<QDeclarativeDeclarativeData *>(priv->declarativeData);
+        } else if (create) {
+            priv->declarativeData = new QDeclarativeDeclarativeData;
+            return static_cast<QDeclarativeDeclarativeData *>(priv->declarativeData);
+        } else {
+            return 0;
+        }
+    }
+};
+
+template<class T>
+void QDeclarativeGuard<T>::addGuard()
+{
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(o, true);
+    next = data->guards;
+    if (next) reinterpret_cast<QDeclarativeGuard<T> *>(next)->prev = &next;
+    data->guards = reinterpret_cast<QDeclarativeGuard<QObject> *>(this);
+    prev = &data->guards;
+}
+
+template<class T>
+void QDeclarativeGuard<T>::remGuard()
+{
+    if (next) reinterpret_cast<QDeclarativeGuard<T> *>(next)->prev = prev;
+    *prev = next;
+    next = 0;
+    prev = 0;
+}
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEDECLARATIVEDATA_P_H
diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp
new file mode 100644
index 0000000..e730b92
--- /dev/null
+++ b/src/declarative/qml/qdeclarativedirparser.cpp
@@ -0,0 +1,220 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativedirparser_p.h"
+#include "qdeclarativeerror.h"
+
+#include <QtCore/QTextStream>
+#include <QtCore/QtDebug>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeDirParser::QDeclarativeDirParser()
+    : _isParsed(false)
+{
+}
+
+QDeclarativeDirParser::~QDeclarativeDirParser()
+{
+}
+
+QUrl QDeclarativeDirParser::url() const
+{
+    return _url;
+}
+
+void QDeclarativeDirParser::setUrl(const QUrl &url)
+{
+    _url = url;
+}
+
+QString QDeclarativeDirParser::source() const
+{
+    return _source;
+}
+
+void QDeclarativeDirParser::setSource(const QString &source)
+{
+    _isParsed = false;
+    _source = source;
+}
+
+bool QDeclarativeDirParser::isParsed() const
+{
+    return _isParsed;
+}
+
+bool QDeclarativeDirParser::parse()
+{
+    if (_isParsed)
+        return true;
+
+    _isParsed = true;
+    _errors.clear();
+    _plugins.clear();
+    _components.clear();
+
+    QTextStream stream(&_source);
+    int lineNumber = 0;
+
+    forever {
+        ++lineNumber;
+
+        const QString line = stream.readLine();
+        if (line.isNull())
+            break;
+
+        QString sections[3];
+        int sectionCount = 0;
+
+        int index = 0;
+        const int length = line.length();
+
+        while (index != length) {
+            const QChar ch = line.at(index);
+
+            if (ch.isSpace()) {
+                do { ++index; }
+                while (index != length && line.at(index).isSpace());
+
+            } else if (ch == QLatin1Char('#')) {
+                // recognized a comment
+                break;
+
+            } else {
+                const int start = index;
+
+                do { ++index; }
+                while (index != length && !line.at(index).isSpace());
+
+                const QString lexeme = line.mid(start, index - start);
+
+                if (sectionCount >= 3) {
+                    reportError(lineNumber, start, QLatin1String("unexpected token"));
+
+                } else {
+                    sections[sectionCount++] = lexeme;
+                }
+            }
+        }
+
+        if (sectionCount == 0) {
+            continue; // no sections, no party.
+
+        } else if (sections[0] == QLatin1String("plugin")) {
+            if (sectionCount < 2) {
+                reportError(lineNumber, -1,
+                            QString::fromUtf8("plugin directive requires 2 arguments, but %1 were provided").arg(sectionCount + 1));
+
+                continue;
+            }
+
+            const Plugin entry(sections[1], sections[2]);
+
+            _plugins.append(entry);
+
+        } else if (sectionCount == 3) {
+            const QString &version = sections[1];
+            const int dotIndex = version.indexOf(QLatin1Char('.'));
+
+            if (dotIndex == -1) {
+                qWarning() << "expected '.'"; // ### use reportError
+
+            } else if (version.indexOf(QLatin1Char('.'), dotIndex + 1) != -1) {
+                qWarning() << "unexpected '.'"; // ### use reportError
+
+            } else {
+                bool validVersionNumber = false;
+                const int majorVersion = version.left(dotIndex).toInt(&validVersionNumber);
+
+                if (validVersionNumber) {
+                    const int minorVersion = version.mid(dotIndex + 1).toInt(&validVersionNumber);
+
+                    if (validVersionNumber) {
+                        const Component entry(sections[0], sections[2], majorVersion, minorVersion);
+
+                        _components.append(entry);
+                    }
+                }
+            }
+        } else {
+             // ### use reportError
+            qWarning() << "a component declaration requires 3 arguments, but" << (sectionCount + 1) << "were provided";
+        }
+    }
+
+    return hasError();
+}
+
+void QDeclarativeDirParser::reportError(int line, int column, const QString &description)
+{
+    QDeclarativeError error;
+    error.setUrl(_url);
+    error.setLine(line);
+    error.setColumn(column);
+    error.setDescription(description);
+    _errors.append(error);
+}
+
+bool QDeclarativeDirParser::hasError() const
+{
+    if (! _errors.isEmpty())
+        return true;
+
+    return false;
+}
+
+QList<QDeclarativeError> QDeclarativeDirParser::errors() const
+{
+    return _errors;
+}
+
+QList<QDeclarativeDirParser::Plugin> QDeclarativeDirParser::plugins() const
+{
+    return _plugins;
+}
+
+QList<QDeclarativeDirParser::Component> QDeclarativeDirParser::components() const
+{
+    return _components;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativedirparser_p.h b/src/declarative/qml/qdeclarativedirparser_p.h
new file mode 100644
index 0000000..5df7117
--- /dev/null
+++ b/src/declarative/qml/qdeclarativedirparser_p.h
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEDIRPARSER_P_H
+#define QDECLARATIVEDIRPARSER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/QUrl>
+#include <QtCore/QHash>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeError;
+
+class QDeclarativeDirParser
+{
+    Q_DISABLE_COPY(QDeclarativeDirParser)
+
+public:
+    QDeclarativeDirParser();
+    ~QDeclarativeDirParser();
+
+    QUrl url() const;
+    void setUrl(const QUrl &url);
+
+    QString source() const;
+    void setSource(const QString &source);
+
+    bool isParsed() const;
+    bool parse();
+
+    bool hasError() const;
+    QList<QDeclarativeError> errors() const;
+
+    struct Plugin
+    {
+        Plugin() {}
+
+        Plugin(const QString &name, const QString &path)
+            : name(name), path(path) {}
+
+        QString name;
+        QString path;
+    };
+
+    struct Component
+    {
+        Component()
+            : majorVersion(0), minorVersion(0) {}
+
+        Component(const QString &typeName, const QString &fileName, int majorVersion, int minorVersion)
+            : typeName(typeName), fileName(fileName), majorVersion(majorVersion), minorVersion(minorVersion) {}
+
+        QString typeName;
+        QString fileName;
+        int majorVersion;
+        int minorVersion;
+    };
+
+    QList<Component> components() const;
+    QList<Plugin> plugins() const;
+
+private:
+    void reportError(int line, int column, const QString &message);
+
+private:
+    QList<QDeclarativeError> _errors;
+    QUrl _url;
+    QString _source;
+    QList<Component> _components;
+    QList<Plugin> _plugins;
+    unsigned _isParsed: 1;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEDIRPARSER_P_H
diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp
new file mode 100644
index 0000000..6c81f34
--- /dev/null
+++ b/src/declarative/qml/qdeclarativedom.cpp
@@ -0,0 +1,1836 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativedom_p.h"
+#include "qdeclarativedom_p_p.h"
+
+#include "qdeclarativecompositetypedata_p.h"
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativescriptparser_p.h"
+#include "qdeclarativeglobal_p.h"
+
+#include <QtCore/QByteArray>
+#include <QtCore/QDebug>
+#include <QtCore/QString>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeDomDocumentPrivate::QDeclarativeDomDocumentPrivate()
+: root(0)
+{
+}
+
+QDeclarativeDomDocumentPrivate::~QDeclarativeDomDocumentPrivate()
+{
+    if (root) root->release();
+}
+
+/*!
+    \class QDeclarativeDomDocument
+    \internal
+    \brief The QDeclarativeDomDocument class represents the root of a QML document
+
+    A QML document is a self-contained snippet of QML, usually contained in a
+    single file. Each document has a root object, accessible through
+    QDeclarativeDomDocument::rootObject().
+
+    The QDeclarativeDomDocument class allows the programmer to inspect a QML document by
+    calling QDeclarativeDomDocument::load().
+
+    The following example loads a QML file from disk, and prints out its root
+    object type and the properties assigned in the root object.
+    \code
+    QFile file(inputFileName);
+    file.open(QIODevice::ReadOnly);
+    QByteArray xmlData = file.readAll();
+
+    QDeclarativeDomDocument document;
+    document.load(qmlengine, xmlData);
+
+    QDeclarativeDomObject rootObject = document.rootObject();
+    qDebug() << rootObject.objectType();
+    foreach(QDeclarativeDomProperty property, rootObject.properties())
+        qDebug() << property.propertyName();
+    \endcode
+*/
+
+/*!
+    Construct an empty QDeclarativeDomDocument.
+*/
+QDeclarativeDomDocument::QDeclarativeDomDocument()
+: d(new QDeclarativeDomDocumentPrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomDocument.
+*/
+QDeclarativeDomDocument::QDeclarativeDomDocument(const QDeclarativeDomDocument &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomDocument
+*/
+QDeclarativeDomDocument::~QDeclarativeDomDocument()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomDocument.
+*/
+QDeclarativeDomDocument &QDeclarativeDomDocument::operator=(const QDeclarativeDomDocument &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+    Returns all import statements in qml.
+*/
+QList<QDeclarativeDomImport> QDeclarativeDomDocument::imports() const
+{
+    return d->imports;
+}
+
+/*!
+    Loads a QDeclarativeDomDocument from \a data.  \a data should be valid QML
+    data.  On success, true is returned.  If the \a data is malformed, false
+    is returned and QDeclarativeDomDocument::errors() contains an error description.
+
+    \sa QDeclarativeDomDocument::loadError()
+*/
+bool QDeclarativeDomDocument::load(QDeclarativeEngine *engine, const QByteArray &data, const QUrl &url)
+{
+    d->errors.clear();
+    d->imports.clear();
+
+    QDeclarativeCompiledData *component = new QDeclarativeCompiledData(engine);
+    QDeclarativeCompiler compiler;
+
+    QDeclarativeCompositeTypeData *td = ((QDeclarativeEnginePrivate *)QDeclarativeEnginePrivate::get(engine))->typeManager.getImmediate(data, url);
+
+    if(td->status == QDeclarativeCompositeTypeData::Error) {
+        d->errors = td->errors;
+        td->release();
+        component->release();
+        return false;
+    } else if(td->status == QDeclarativeCompositeTypeData::Waiting ||
+              td->status == QDeclarativeCompositeTypeData::WaitingResources) {
+        QDeclarativeError error;
+        error.setDescription(QLatin1String("QDeclarativeDomDocument supports local types only"));
+        d->errors << error;
+        td->release();
+        component->release();
+        return false;
+    }
+
+    compiler.compile(engine, td, component);
+
+    if (compiler.isError()) {
+        d->errors = compiler.errors();
+        td->release();
+        component->release();
+        return false;
+    }
+
+    for (int i = 0; i < td->data.imports().size(); ++i) {
+        QDeclarativeScriptParser::Import parserImport = td->data.imports().at(i);
+        QDeclarativeDomImport domImport;
+        domImport.d->type = static_cast<QDeclarativeDomImportPrivate::Type>(parserImport.type);
+        domImport.d->uri = parserImport.uri;
+        domImport.d->qualifier = parserImport.qualifier;
+        domImport.d->version = parserImport.version;
+        d->imports += domImport;
+    }
+
+    if (td->data.tree()) {
+        d->root = td->data.tree();
+        d->root->addref();
+    }
+
+    component->release();
+    return true;
+}
+
+/*!
+    Returns the last load errors.  The load errors will be reset after a
+    successful call to load().
+
+    \sa load()
+*/
+QList<QDeclarativeError> QDeclarativeDomDocument::errors() const
+{
+    return d->errors;
+}
+
+/*!
+    Returns the document's root object, or an invalid QDeclarativeDomObject if the
+    document has no root.
+
+    In the sample QML below, the root object will be the QDeclarativeItem type.
+    \qml
+Item {
+    Text {
+        text: "Hello World"
+    }
+}
+    \endqml
+*/
+QDeclarativeDomObject QDeclarativeDomDocument::rootObject() const
+{
+    QDeclarativeDomObject rv;
+    rv.d->object = d->root;
+    if (rv.d->object) rv.d->object->addref();
+    return rv;
+}
+
+QDeclarativeDomPropertyPrivate::QDeclarativeDomPropertyPrivate()
+: property(0)
+{
+}
+
+QDeclarativeDomPropertyPrivate::~QDeclarativeDomPropertyPrivate()
+{
+    if (property) property->release();
+}
+
+QDeclarativeDomDynamicPropertyPrivate::QDeclarativeDomDynamicPropertyPrivate():
+        valid(false)
+{
+}
+
+QDeclarativeDomDynamicPropertyPrivate::~QDeclarativeDomDynamicPropertyPrivate()
+{
+    if (valid && property.defaultValue) property.defaultValue->release();
+}
+
+/*!
+    \class QDeclarativeDomProperty
+    \internal
+    \brief The QDeclarativeDomProperty class represents one property assignment in the
+    QML DOM tree
+
+    Properties in QML can be assigned QML \l {QDeclarativeDomValue}{values}.
+
+    \sa QDeclarativeDomObject
+*/
+
+/*!
+    Construct an invalid QDeclarativeDomProperty.
+*/
+QDeclarativeDomProperty::QDeclarativeDomProperty()
+: d(new QDeclarativeDomPropertyPrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomProperty.
+*/
+QDeclarativeDomProperty::QDeclarativeDomProperty(const QDeclarativeDomProperty &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomProperty.
+*/
+QDeclarativeDomProperty::~QDeclarativeDomProperty()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomProperty.
+*/
+QDeclarativeDomProperty &QDeclarativeDomProperty::operator=(const QDeclarativeDomProperty &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+    Returns true if this is a valid QDeclarativeDomProperty, false otherwise.
+*/
+bool QDeclarativeDomProperty::isValid() const
+{
+    return d->property != 0;
+}
+
+
+/*!
+    Return the name of this property.
+
+    \qml
+Text {
+    x: 10
+    y: 10
+    font.bold: true
+}
+    \endqml
+
+    As illustrated above, a property name can be a simple string, such as "x" or
+    "y", or a more complex "dot property", such as "font.bold".  In both cases
+    the full name is returned ("x", "y" and "font.bold") by this method.
+
+    For dot properties, a split version of the name can be accessed by calling
+    QDeclarativeDomProperty::propertyNameParts().
+
+    \sa QDeclarativeDomProperty::propertyNameParts()
+*/
+QByteArray QDeclarativeDomProperty::propertyName() const
+{
+    return d->propertyName;
+}
+
+/*!
+    Return the name of this property, split into multiple parts in the case
+    of dot properties.
+
+    \qml
+Text {
+    x: 10
+    y: 10
+    font.bold: true
+}
+    \endqml
+
+    For each of the properties shown above, this method would return ("x"),
+    ("y") and ("font", "bold").
+
+    \sa QDeclarativeDomProperty::propertyName()
+*/
+QList<QByteArray> QDeclarativeDomProperty::propertyNameParts() const
+{
+    if (d->propertyName.isEmpty()) return QList<QByteArray>();
+    else return d->propertyName.split('.');
+}
+
+/*!
+    Return true if this property is used as a default property in the QML
+    document.
+
+    \qml
+<Text text="hello"/>
+<Text>hello</Text>
+    \endqml
+
+    The above two examples return the same DOM tree, except that the second has
+    the default property flag set on the text property.  Observe that whether
+    or not a property has isDefaultProperty set is determined by how the
+    property is used, and not only by whether the property is the types default
+    property.
+*/
+bool QDeclarativeDomProperty::isDefaultProperty() const
+{
+    return d->property && d->property->isDefault;
+}
+
+/*!
+    Returns the QDeclarativeDomValue that is assigned to this property, or an invalid
+    QDeclarativeDomValue if no value is assigned.
+*/
+QDeclarativeDomValue QDeclarativeDomProperty::value() const
+{
+    QDeclarativeDomValue rv;
+    if (d->property) {
+        rv.d->property = d->property;
+        rv.d->value = d->property->values.at(0);
+        rv.d->property->addref();
+        rv.d->value->addref();
+    }
+    return rv;
+}
+
+/*!
+    Returns the position in the input data where the property ID startd, or -1 if
+ the property is invalid.
+*/
+int QDeclarativeDomProperty::position() const
+{
+    if (d && d->property) {
+        return d->property->location.range.offset;
+    } else
+        return -1;
+}
+
+/*!
+    Returns the length in the input data from where the property ID started upto
+ the end of it, or -1 if the property is invalid.
+*/
+int QDeclarativeDomProperty::length() const
+{
+    if (d && d->property)
+        return d->property->location.range.length;
+    else
+        return -1;
+}
+
+/*!
+    Construct an invalid QDeclarativeDomDynamicProperty.
+*/
+QDeclarativeDomDynamicProperty::QDeclarativeDomDynamicProperty():
+        d(new QDeclarativeDomDynamicPropertyPrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomDynamicProperty.
+*/
+QDeclarativeDomDynamicProperty::QDeclarativeDomDynamicProperty(const QDeclarativeDomDynamicProperty &other):
+        d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomDynamicProperty.
+*/
+QDeclarativeDomDynamicProperty::~QDeclarativeDomDynamicProperty()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomDynamicProperty.
+*/
+QDeclarativeDomDynamicProperty &QDeclarativeDomDynamicProperty::operator=(const QDeclarativeDomDynamicProperty &other)
+{
+    d = other.d;
+    return *this;
+}
+
+bool QDeclarativeDomDynamicProperty::isValid() const
+{
+    return d && d->valid;
+}
+
+/*!
+    Return the name of this dynamic property.
+
+    \qml
+Item {
+    property int count: 10;
+}
+    \endqml
+
+    As illustrated above, a dynamic property name can have a name and a
+    default value ("10").
+*/
+QByteArray QDeclarativeDomDynamicProperty::propertyName() const
+{
+    if (isValid())
+        return d->property.name;
+    else
+        return QByteArray();
+}
+
+/*!
+   Returns the type of the dynamic property. Note that when the property is an
+   alias property, this will return -1. Use QDeclarativeDomProperty::isAlias() to check
+   if the property is an alias.
+*/
+int QDeclarativeDomDynamicProperty::propertyType() const
+{
+    if (isValid()) {
+        switch (d->property.type) {
+            case QDeclarativeParser::Object::DynamicProperty::Bool:
+                return QMetaType::type("bool");
+
+            case QDeclarativeParser::Object::DynamicProperty::Color:
+                return QMetaType::type("QColor");
+
+            case QDeclarativeParser::Object::DynamicProperty::Date:
+                return QMetaType::type("QDate");
+
+            case QDeclarativeParser::Object::DynamicProperty::Int:
+                return QMetaType::type("int");
+
+            case QDeclarativeParser::Object::DynamicProperty::Real:
+                return QMetaType::type("double");
+
+            case QDeclarativeParser::Object::DynamicProperty::String:
+                return QMetaType::type("QString");
+
+            case QDeclarativeParser::Object::DynamicProperty::Url:
+                return QMetaType::type("QUrl");
+
+            case QDeclarativeParser::Object::DynamicProperty::Variant:
+                return QMetaType::type("QVariant");
+
+            default:
+                break;
+        }
+    }
+
+    return -1;
+}
+
+QByteArray QDeclarativeDomDynamicProperty::propertyTypeName() const
+{
+    if (isValid()) 
+        return d->property.customType;
+
+    return QByteArray();
+}
+
+/*!
+    Return true if this property is used as a default property in the QML
+    document.
+
+    \qml
+<Text text="hello"/>
+<Text>hello</Text>
+    \endqml
+
+    The above two examples return the same DOM tree, except that the second has
+    the default property flag set on the text property.  Observe that whether
+    or not a property has isDefaultProperty set is determined by how the
+    property is used, and not only by whether the property is the types default
+    property.
+*/
+bool QDeclarativeDomDynamicProperty::isDefaultProperty() const
+{
+    if (isValid())
+        return d->property.isDefaultProperty;
+    else
+        return false;
+}
+
+/*!
+    Returns the default value as a QDeclarativeDomProperty.
+*/
+QDeclarativeDomProperty QDeclarativeDomDynamicProperty::defaultValue() const
+{
+    QDeclarativeDomProperty rp;
+
+    if (isValid() && d->property.defaultValue) {
+        rp.d->property = d->property.defaultValue;
+        rp.d->propertyName = propertyName();
+        rp.d->property->addref();
+    }
+
+    return rp;
+}
+
+/*!
+    Returns true if this dynamic property is an alias for another property,
+    false otherwise.
+*/
+bool QDeclarativeDomDynamicProperty::isAlias() const
+{
+    if (isValid())
+        return d->property.type == QDeclarativeParser::Object::DynamicProperty::Alias;
+    else
+        return false;
+}
+
+/*!
+    Returns the position in the input data where the property ID startd, or 0 if
+ the property is invalid.
+*/
+int QDeclarativeDomDynamicProperty::position() const
+{
+    if (isValid()) {
+        return d->property.location.range.offset;
+    } else
+        return -1;
+}
+
+/*!
+    Returns the length in the input data from where the property ID started upto
+ the end of it, or 0 if the property is invalid.
+*/
+int QDeclarativeDomDynamicProperty::length() const
+{
+    if (isValid())
+        return d->property.location.range.length;
+    else
+        return -1;
+}
+
+QDeclarativeDomObjectPrivate::QDeclarativeDomObjectPrivate()
+: object(0)
+{
+}
+
+QDeclarativeDomObjectPrivate::~QDeclarativeDomObjectPrivate()
+{
+    if (object) object->release();
+}
+
+QDeclarativeDomObjectPrivate::Properties
+QDeclarativeDomObjectPrivate::properties() const
+{
+    Properties rv;
+
+    for (QHash<QByteArray, QDeclarativeParser::Property *>::ConstIterator iter =
+            object->properties.begin();
+            iter != object->properties.end();
+            ++iter) {
+
+        rv << properties(*iter);
+
+    }
+    return rv;
+}
+
+QDeclarativeDomObjectPrivate::Properties
+QDeclarativeDomObjectPrivate::properties(QDeclarativeParser::Property *property) const
+{
+    Properties rv;
+
+    if (property->value) {
+
+        for (QHash<QByteArray, QDeclarativeParser::Property *>::ConstIterator iter =
+                property->value->properties.begin();
+                iter != property->value->properties.end();
+                ++iter) {
+
+            rv << properties(*iter);
+
+        }
+
+        QByteArray name(property->name + '.');
+        for (Properties::Iterator iter = rv.begin(); iter != rv.end(); ++iter)
+            iter->second.prepend(name);
+
+    } else {
+        rv << qMakePair(property, property->name);
+    }
+
+    return rv;
+}
+
+/*!
+    \class QDeclarativeDomObject
+    \internal
+    \brief The QDeclarativeDomObject class represents an object instantiation.
+
+    Each object instantiated in a QML file has a corresponding QDeclarativeDomObject
+    node in the QML DOM.
+
+    In addition to the type information that determines the object to
+    instantiate, QDeclarativeDomObject's also have a set of associated QDeclarativeDomProperty's.
+    Each QDeclarativeDomProperty represents a QML property assignment on the instantiated
+    object.  For example,
+
+    \qml
+QGraphicsWidget {
+    opacity: 0.5
+    size: "100x100"
+}
+    \endqml
+
+    describes a single QDeclarativeDomObject - "QGraphicsWidget" - with two properties,
+    "opacity" and "size".  Obviously QGraphicsWidget has many more properties than just
+    these two, but the QML DOM representation only contains those assigned
+    values (or bindings) in the QML file.
+*/
+
+/*!
+    Construct an invalid QDeclarativeDomObject.
+*/
+QDeclarativeDomObject::QDeclarativeDomObject()
+: d(new QDeclarativeDomObjectPrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomObject.
+*/
+QDeclarativeDomObject::QDeclarativeDomObject(const QDeclarativeDomObject &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomObject.
+*/
+QDeclarativeDomObject::~QDeclarativeDomObject()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomObject.
+*/
+QDeclarativeDomObject &QDeclarativeDomObject::operator=(const QDeclarativeDomObject &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+    Returns true if this is a valid QDeclarativeDomObject, false otherwise.
+*/
+bool QDeclarativeDomObject::isValid() const
+{
+    return d->object != 0;
+}
+
+/*!
+    Returns the fully-qualified type name of this object.
+
+    For example, the type of this object would be "Qt/4.6/Rectangle".
+    \qml
+Rectangle { }
+    \endqml
+*/
+QByteArray QDeclarativeDomObject::objectType() const
+{
+    if (d->object) return d->object->typeName;
+    else return QByteArray();
+}
+
+/*!
+    Returns the type name as referenced in the qml file.
+
+    For example, the type of this object would be "Rectangle".
+    \qml
+Rectangle { }
+    \endqml
+*/
+QByteArray QDeclarativeDomObject::objectClassName() const
+{
+    if (d->object)
+        return d->object->className;
+    else
+        return QByteArray();
+}
+
+int QDeclarativeDomObject::objectTypeMajorVersion() const
+{
+    if (d->object)
+        return d->object->majorVersion;
+    else
+        return -1;
+}
+
+int QDeclarativeDomObject::objectTypeMinorVersion() const
+{
+    if (d->object)
+        return d->object->minorVersion;
+    else
+        return -1;
+}
+
+/*!
+    Returns the QML id assigned to this object, or an empty QByteArray if no id
+    has been assigned.
+
+    For example, the object id of this object would be "MyText".
+    \qml
+Text { id: myText }
+    \endqml
+*/
+QString QDeclarativeDomObject::objectId() const
+{
+    if (d->object) {
+        return d->object->id;
+    } else {
+        return QString();
+    }
+}
+
+/*!
+    Returns the list of assigned properties on this object.
+
+    In the following example, "text" and "x" properties would be returned.
+    \qml
+Text {
+    text: "Hello world!"
+    x: 100
+}
+    \endqml
+*/
+QList<QDeclarativeDomProperty> QDeclarativeDomObject::properties() const
+{
+    QList<QDeclarativeDomProperty> rv;
+
+    if (!d->object || isComponent())
+        return rv;
+
+    QDeclarativeDomObjectPrivate::Properties properties = d->properties();
+    for (int ii = 0; ii < properties.count(); ++ii) {
+
+        QDeclarativeDomProperty domProperty;
+        domProperty.d->property = properties.at(ii).first;
+        domProperty.d->property->addref();
+        domProperty.d->propertyName = properties.at(ii).second;
+        rv << domProperty;
+
+    }
+
+    if (d->object->defaultProperty) {
+        QDeclarativeDomProperty domProperty;
+        domProperty.d->property = d->object->defaultProperty;
+        domProperty.d->property->addref();
+        domProperty.d->propertyName = d->object->defaultProperty->name;
+        rv << domProperty;
+    }
+
+    return rv;
+}
+
+/*!
+    Returns the object's \a name property if a value has been assigned to
+    it, or an invalid QDeclarativeDomProperty otherwise.
+
+    In the example below, \c {object.property("source")} would return a valid
+    QDeclarativeDomProperty, and \c {object.property("tile")} an invalid QDeclarativeDomProperty.
+
+    \qml
+Image { source: "sample.jpg" }
+    \endqml
+*/
+QDeclarativeDomProperty QDeclarativeDomObject::property(const QByteArray &name) const
+{
+    QList<QDeclarativeDomProperty> props = properties();
+    for (int ii = 0; ii < props.count(); ++ii)
+        if (props.at(ii).propertyName() == name)
+            return props.at(ii);
+    return QDeclarativeDomProperty();
+}
+
+QList<QDeclarativeDomDynamicProperty> QDeclarativeDomObject::dynamicProperties() const
+{
+    QList<QDeclarativeDomDynamicProperty> properties;
+
+    for (int i = 0; i < d->object->dynamicProperties.size(); ++i) {
+        QDeclarativeDomDynamicProperty p;
+        p.d = new QDeclarativeDomDynamicPropertyPrivate;
+        p.d->property = d->object->dynamicProperties.at(i);
+        p.d->valid = true;
+
+        if (p.d->property.defaultValue)
+            p.d->property.defaultValue->addref();
+
+        properties.append(p);
+    }
+
+    return properties;
+}
+
+QDeclarativeDomDynamicProperty QDeclarativeDomObject::dynamicProperty(const QByteArray &name) const
+{
+    QDeclarativeDomDynamicProperty p;
+
+    if (!isValid())
+        return p;
+
+    for (int i = 0; i < d->object->dynamicProperties.size(); ++i) {
+        if (d->object->dynamicProperties.at(i).name == name) {
+            p.d = new QDeclarativeDomDynamicPropertyPrivate;
+            p.d->property = d->object->dynamicProperties.at(i);
+            if (p.d->property.defaultValue) p.d->property.defaultValue->addref();
+            p.d->valid = true;
+        }
+    }
+
+    return p;
+}
+
+/*!
+    Returns true if this object is a custom type.  Custom types are special
+    types that allow embeddeding non-QML data, such as SVG or HTML data,
+    directly into QML files.
+
+    \note Currently this method will always return false, and is a placekeeper
+    for future functionality.
+
+    \sa QDeclarativeDomObject::customTypeData()
+*/
+bool QDeclarativeDomObject::isCustomType() const
+{
+    return false;
+}
+
+/*!
+    If this object represents a custom type, returns the data associated with
+    the custom type, otherwise returns an empty QByteArray().
+    QDeclarativeDomObject::isCustomType() can be used to check if this object represents
+    a custom type.
+*/
+QByteArray QDeclarativeDomObject::customTypeData() const
+{
+    return QByteArray();
+}
+
+/*!
+    Returns true if this object is a sub-component object.  Sub-component
+    objects can be converted into QDeclarativeDomComponent instances by calling
+    QDeclarativeDomObject::toComponent().
+
+    \sa QDeclarativeDomObject::toComponent()
+*/
+bool QDeclarativeDomObject::isComponent() const
+{
+    return (d->object && d->object->typeName == "Qt/Component");
+}
+
+/*!
+    Returns a QDeclarativeDomComponent for this object if it is a sub-component, or
+    an invalid QDeclarativeDomComponent if not.  QDeclarativeDomObject::isComponent() can be used
+    to check if this object represents a sub-component.
+
+    \sa QDeclarativeDomObject::isComponent()
+*/
+QDeclarativeDomComponent QDeclarativeDomObject::toComponent() const
+{
+    QDeclarativeDomComponent rv;
+    if (isComponent())
+        rv.d = d;
+    return rv;
+}
+
+/*!
+    Returns the position in the input data where the property assignment started
+, or -1 if the property is invalid.
+*/
+int QDeclarativeDomObject::position() const
+{
+    if (d && d->object)
+        return d->object->location.range.offset;
+    else
+        return -1;
+}
+
+/*!
+    Returns the length in the input data from where the property assignment star
+ted upto the end of it, or -1 if the property is invalid.
+*/
+int QDeclarativeDomObject::length() const
+{
+    if (d && d->object)
+        return d->object->location.range.length;
+    else
+        return -1;
+}
+
+// Returns the URL of the type, if it is an external type, or an empty URL if
+// not
+QUrl QDeclarativeDomObject::url() const
+{
+    if (d && d->object)
+        return d->object->url;
+    else
+        return QUrl();
+}
+
+QDeclarativeDomBasicValuePrivate::QDeclarativeDomBasicValuePrivate()
+: value(0)
+{
+}
+
+QDeclarativeDomBasicValuePrivate::~QDeclarativeDomBasicValuePrivate()
+{
+    if (value) value->release();
+}
+
+/*!
+    \class QDeclarativeDomValueLiteral
+    \internal
+    \brief The QDeclarativeDomValueLiteral class represents a literal value.
+
+    A literal value is a simple value, written inline with the QML.  In the
+    example below, the "x", "y" and "color" properties are being assigned
+    literal values.
+
+    \qml
+Rectangle {
+    x: 10
+    y: 10
+    color: "red"
+}
+    \endqml
+*/
+
+/*!
+    Construct an empty QDeclarativeDomValueLiteral.
+*/
+QDeclarativeDomValueLiteral::QDeclarativeDomValueLiteral():
+    d(new QDeclarativeDomBasicValuePrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomValueLiteral.
+*/
+QDeclarativeDomValueLiteral::QDeclarativeDomValueLiteral(const QDeclarativeDomValueLiteral &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomValueLiteral.
+*/
+QDeclarativeDomValueLiteral::~QDeclarativeDomValueLiteral()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomValueLiteral.
+*/
+QDeclarativeDomValueLiteral &QDeclarativeDomValueLiteral::operator=(const QDeclarativeDomValueLiteral &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+    Return the literal value.
+
+    In the example below, the literal value will be the string "10".
+    \qml
+Rectangle { x: 10 }
+    \endqml
+*/
+QString QDeclarativeDomValueLiteral::literal() const
+{
+    if (d->value) return d->value->primitive();
+    else return QString();
+}
+
+/*!
+    \class QDeclarativeDomValueBinding
+    \internal
+    \brief The QDeclarativeDomValueBinding class represents a property binding.
+
+    A property binding is an ECMAScript expression assigned to a property.  In
+    the example below, the "x" property is being assigned a property binding.
+
+    \qml
+Rectangle { x: Other.x }
+    \endqml
+*/
+
+/*!
+    Construct an empty QDeclarativeDomValueBinding.
+*/
+QDeclarativeDomValueBinding::QDeclarativeDomValueBinding():
+        d(new QDeclarativeDomBasicValuePrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomValueBinding.
+*/
+QDeclarativeDomValueBinding::QDeclarativeDomValueBinding(const QDeclarativeDomValueBinding &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomValueBinding.
+*/
+QDeclarativeDomValueBinding::~QDeclarativeDomValueBinding()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomValueBinding.
+*/
+QDeclarativeDomValueBinding &QDeclarativeDomValueBinding::operator=(const QDeclarativeDomValueBinding &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+    Return the binding expression.
+
+    In the example below, the string "Other.x" will be returned.
+    \qml
+Rectangle { x: Other.x }
+    \endqml
+*/
+QString QDeclarativeDomValueBinding::binding() const
+{
+    if (d->value)
+        return d->value->value.asScript();
+    else
+        return QString();
+}
+
+/*!
+    \class QDeclarativeDomValueValueSource
+    \internal
+    \brief The QDeclarativeDomValueValueSource class represents a value source assignment value.
+
+    In QML, value sources are special value generating types that may be
+    assigned to properties.  Value sources inherit the QDeclarativePropertyValueSource
+    class.  In the example below, the "x" property is being assigned the
+    NumberAnimation value source.
+
+    \qml
+Rectangle {
+    x: NumberAnimation {
+        from: 0
+        to: 100
+        repeat: true
+        running: true
+    }
+}
+    \endqml
+*/
+
+/*!
+    Construct an empty QDeclarativeDomValueValueSource.
+*/
+QDeclarativeDomValueValueSource::QDeclarativeDomValueValueSource():
+        d(new QDeclarativeDomBasicValuePrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomValueValueSource.
+*/
+QDeclarativeDomValueValueSource::QDeclarativeDomValueValueSource(const QDeclarativeDomValueValueSource &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomValueValueSource.
+*/
+QDeclarativeDomValueValueSource::~QDeclarativeDomValueValueSource()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomValueValueSource.
+*/
+QDeclarativeDomValueValueSource &QDeclarativeDomValueValueSource::operator=(const QDeclarativeDomValueValueSource &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+    Return the value source object.
+
+    In the example below, an object representing the NumberAnimation will be
+    returned.
+    \qml
+Rectangle {
+    x: NumberAnimation {
+        from: 0
+        to: 100
+        repeat: true
+        running: true
+    }
+}
+    \endqml
+*/
+QDeclarativeDomObject QDeclarativeDomValueValueSource::object() const
+{
+    QDeclarativeDomObject rv;
+    if (d->value) {
+        rv.d->object = d->value->object;
+        rv.d->object->addref();
+    }
+    return rv;
+}
+
+/*!
+    \class QDeclarativeDomValueValueInterceptor
+    \internal
+    \brief The QDeclarativeDomValueValueInterceptor class represents a value interceptor assignment value.
+
+    In QML, value interceptor are special write-intercepting types that may be
+    assigned to properties.  Value interceptor inherit the QDeclarativePropertyValueInterceptor
+    class.  In the example below, the "x" property is being assigned the
+    Behavior value interceptor.
+
+    \qml
+Rectangle {
+    x: Behavior { NumberAnimation { duration: 500 } }
+}
+    \endqml
+*/
+
+/*!
+    Construct an empty QDeclarativeDomValueValueInterceptor.
+*/
+QDeclarativeDomValueValueInterceptor::QDeclarativeDomValueValueInterceptor():
+        d(new QDeclarativeDomBasicValuePrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomValueValueInterceptor.
+*/
+QDeclarativeDomValueValueInterceptor::QDeclarativeDomValueValueInterceptor(const QDeclarativeDomValueValueInterceptor &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomValueValueInterceptor.
+*/
+QDeclarativeDomValueValueInterceptor::~QDeclarativeDomValueValueInterceptor()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomValueValueInterceptor.
+*/
+QDeclarativeDomValueValueInterceptor &QDeclarativeDomValueValueInterceptor::operator=(const QDeclarativeDomValueValueInterceptor &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+    Return the value interceptor object.
+
+    In the example below, an object representing the Behavior will be
+    returned.
+    \qml
+Rectangle {
+    x: Behavior { NumberAnimation { duration: 500 } }
+}
+    \endqml
+*/
+QDeclarativeDomObject QDeclarativeDomValueValueInterceptor::object() const
+{
+    QDeclarativeDomObject rv;
+    if (d->value) {
+        rv.d->object = d->value->object;
+        rv.d->object->addref();
+    }
+    return rv;
+}
+
+QDeclarativeDomValuePrivate::QDeclarativeDomValuePrivate()
+: property(0), value(0)
+{
+}
+
+QDeclarativeDomValuePrivate::~QDeclarativeDomValuePrivate()
+{
+    if (property) property->release();
+    if (value) value->release();
+}
+
+/*!
+    \class QDeclarativeDomValue
+    \internal
+    \brief The QDeclarativeDomValue class represents a generic Qml value.
+
+    QDeclarativeDomValue's can be assigned to QML \l {QDeclarativeDomProperty}{properties}.  In
+    QML, properties can be assigned various different values, including basic
+    literals, property bindings, property value sources, objects and lists of
+    values.  The QDeclarativeDomValue class allows a programmer to determine the specific
+    value type being assigned and access more detailed information through a
+    corresponding value type class.
+
+    For example, in the following example,
+
+    \qml
+Text {
+    text: "Hello World!"
+    y: Other.y
+}
+    \endqml
+
+    The text property is being assigned a literal, and the y property a property
+    binding.  To output the values assigned to the text and y properties in the
+    above example from C++,
+
+    \code
+    QDeclarativeDomDocument document;
+    QDeclarativeDomObject root = document.rootObject();
+
+    QDeclarativeDomProperty text = root.property("text");
+    if (text.value().isLiteral()) {
+        QDeclarativeDomValueLiteral literal = text.value().toLiteral();
+        qDebug() << literal.literal();
+    }
+
+    QDeclarativeDomProperty y = root.property("y");
+    if (y.value().isBinding()) {
+        QDeclarativeDomValueBinding binding = y.value().toBinding();
+        qDebug() << binding.binding();
+    }
+    \endcode
+*/
+
+/*!
+    Construct an invalid QDeclarativeDomValue.
+*/
+QDeclarativeDomValue::QDeclarativeDomValue()
+: d(new QDeclarativeDomValuePrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomValue.
+*/
+QDeclarativeDomValue::QDeclarativeDomValue(const QDeclarativeDomValue &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomValue
+*/
+QDeclarativeDomValue::~QDeclarativeDomValue()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomValue.
+*/
+QDeclarativeDomValue &QDeclarativeDomValue::operator=(const QDeclarativeDomValue &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+    \enum QDeclarativeDomValue::Type
+
+    The type of the QDeclarativeDomValue node.
+
+    \value Invalid The QDeclarativeDomValue is invalid.
+    \value Literal The QDeclarativeDomValue is a literal value assignment.  Use QDeclarativeDomValue::toLiteral() to access the type instance.
+    \value PropertyBinding The QDeclarativeDomValue is a property binding.  Use QDeclarativeDomValue::toBinding() to access the type instance.
+    \value ValueSource The QDeclarativeDomValue is a property value source.  Use QDeclarativeDomValue::toValueSource() to access the type instance.
+    \value ValueInterceptor The QDeclarativeDomValue is a property value interceptor.  Use QDeclarativeDomValue::toValueInterceptor() to access the type instance.
+    \value Object The QDeclarativeDomValue is an object assignment.  Use QDeclarativeDomValue::toObject() to access the type instnace.
+    \value List The QDeclarativeDomValue is a list of other values.  Use QDeclarativeDomValue::toList() to access the type instance.
+*/
+
+/*!
+    Returns the type of this QDeclarativeDomValue.
+*/
+QDeclarativeDomValue::Type QDeclarativeDomValue::type() const
+{
+    if (d->property)
+        if (QDeclarativeMetaType::isList(d->property->type) ||
+           (d->property && d->property->values.count() > 1))
+            return List;
+
+    QDeclarativeParser::Value *value = d->value;
+    if (!value && !d->property)
+        return Invalid;
+
+    switch(value->type) {
+    case QDeclarativeParser::Value::Unknown:
+        return Invalid;
+    case QDeclarativeParser::Value::Literal:
+        return Literal;
+    case QDeclarativeParser::Value::PropertyBinding:
+        return PropertyBinding;
+    case QDeclarativeParser::Value::ValueSource:
+        return ValueSource;
+    case QDeclarativeParser::Value::ValueInterceptor:
+        return ValueInterceptor;
+    case QDeclarativeParser::Value::CreatedObject:
+        return Object;
+    case QDeclarativeParser::Value::SignalObject:
+        return Invalid;
+    case QDeclarativeParser::Value::SignalExpression:
+        return Literal;
+    case QDeclarativeParser::Value::Id:
+        return Literal;
+    }
+    return Invalid;
+}
+
+/*!
+    Returns true if this is an invalid value, otherwise false.
+*/
+bool QDeclarativeDomValue::isInvalid() const
+{
+    return type() == Invalid;
+}
+
+/*!
+    Returns true if this is a literal value, otherwise false.
+*/
+bool QDeclarativeDomValue::isLiteral() const
+{
+    return type() == Literal;
+}
+
+/*!
+    Returns true if this is a property binding value, otherwise false.
+*/
+bool QDeclarativeDomValue::isBinding() const
+{
+    return type() == PropertyBinding;
+}
+
+/*!
+    Returns true if this is a value source value, otherwise false.
+*/
+bool QDeclarativeDomValue::isValueSource() const
+{
+    return type() == ValueSource;
+}
+
+/*!
+    Returns true if this is a value interceptor value, otherwise false.
+*/
+bool QDeclarativeDomValue::isValueInterceptor() const
+{
+    return type() == ValueInterceptor;
+}
+
+/*!
+    Returns true if this is an object value, otherwise false.
+*/
+bool QDeclarativeDomValue::isObject() const
+{
+    return type() == Object;
+}
+
+/*!
+    Returns true if this is a list value, otherwise false.
+*/
+bool QDeclarativeDomValue::isList() const
+{
+    return type() == List;
+}
+
+/*!
+    Returns a QDeclarativeDomValueLiteral if this value is a literal type, otherwise
+    returns an invalid QDeclarativeDomValueLiteral.
+
+    \sa QDeclarativeDomValue::type()
+*/
+QDeclarativeDomValueLiteral QDeclarativeDomValue::toLiteral() const
+{
+    QDeclarativeDomValueLiteral rv;
+    if (type() == Literal) {
+        rv.d->value = d->value;
+        rv.d->value->addref();
+    }
+    return rv;
+}
+
+/*!
+    Returns a QDeclarativeDomValueBinding if this value is a property binding type,
+    otherwise returns an invalid QDeclarativeDomValueBinding.
+
+    \sa QDeclarativeDomValue::type()
+*/
+QDeclarativeDomValueBinding QDeclarativeDomValue::toBinding() const
+{
+    QDeclarativeDomValueBinding rv;
+    if (type() == PropertyBinding) {
+        rv.d->value = d->value;
+        rv.d->value->addref();
+    }
+    return rv;
+}
+
+/*!
+    Returns a QDeclarativeDomValueValueSource if this value is a property value source
+    type, otherwise returns an invalid QDeclarativeDomValueValueSource.
+
+    \sa QDeclarativeDomValue::type()
+*/
+QDeclarativeDomValueValueSource QDeclarativeDomValue::toValueSource() const
+{
+    QDeclarativeDomValueValueSource rv;
+    if (type() == ValueSource) {
+        rv.d->value = d->value;
+        rv.d->value->addref();
+    }
+    return rv;
+}
+
+/*!
+    Returns a QDeclarativeDomValueValueInterceptor if this value is a property value interceptor
+    type, otherwise returns an invalid QDeclarativeDomValueValueInterceptor.
+
+    \sa QDeclarativeDomValue::type()
+*/
+QDeclarativeDomValueValueInterceptor QDeclarativeDomValue::toValueInterceptor() const
+{
+    QDeclarativeDomValueValueInterceptor rv;
+    if (type() == ValueInterceptor) {
+        rv.d->value = d->value;
+        rv.d->value->addref();
+    }
+    return rv;
+}
+
+/*!
+    Returns a QDeclarativeDomObject if this value is an object assignment type, otherwise
+    returns an invalid QDeclarativeDomObject.
+
+    \sa QDeclarativeDomValue::type()
+*/
+QDeclarativeDomObject QDeclarativeDomValue::toObject() const
+{
+    QDeclarativeDomObject rv;
+    if (type() == Object) {
+        rv.d->object = d->value->object;
+        rv.d->object->addref();
+    }
+    return rv;
+}
+
+/*!
+    Returns a QDeclarativeDomList if this value is a list type, otherwise returns an
+    invalid QDeclarativeDomList.
+
+    \sa QDeclarativeDomValue::type()
+*/
+QDeclarativeDomList QDeclarativeDomValue::toList() const
+{
+    QDeclarativeDomList rv;
+    if (type() == List) {
+        rv.d = d;
+    }
+    return rv;
+}
+
+/*!
+    Returns the position in the input data where the property value startd, or -1
+ if the value is invalid.
+*/
+int QDeclarativeDomValue::position() const
+{
+    if (type() == Invalid)
+        return -1;
+    else
+        return d->value->location.range.offset;
+}
+
+/*!
+    Returns the length in the input data from where the property value started u
+pto the end of it, or -1 if the value is invalid.
+*/
+int QDeclarativeDomValue::length() const
+{
+    if (type() == Invalid)
+        return -1;
+    else
+        return d->value->location.range.length;
+}
+
+/*!
+    \class QDeclarativeDomList
+    \internal
+    \brief The QDeclarativeDomList class represents a list of values assigned to a QML property.
+
+    Lists of values can be assigned to properties.  For example, the following
+    example assigns multiple objects to Item's "children" property
+    \qml
+Item {
+    children: [
+        Text { },
+        Rectangle { }
+    ]
+}
+    \endqml
+
+    Lists can also be implicitly created by assigning multiple
+    \l {QDeclarativeDomValueValueSource}{value sources} or constants to a property.
+    \qml
+Item {
+    x: 10
+    x: NumberAnimation {
+        running: false
+        from: 0
+        to: 100
+    }
+}
+    \endqml
+*/
+
+/*!
+    Construct an empty QDeclarativeDomList.
+*/
+QDeclarativeDomList::QDeclarativeDomList()
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomList.
+*/
+QDeclarativeDomList::QDeclarativeDomList(const QDeclarativeDomList &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomList.
+*/
+QDeclarativeDomList::~QDeclarativeDomList()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomList.
+*/
+QDeclarativeDomList &QDeclarativeDomList::operator=(const QDeclarativeDomList &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+    Returns the list of QDeclarativeDomValue's.
+*/
+QList<QDeclarativeDomValue> QDeclarativeDomList::values() const
+{
+    QList<QDeclarativeDomValue> rv;
+    if (!d->property)
+        return rv;
+
+    for (int ii = 0; ii < d->property->values.count(); ++ii) {
+        QDeclarativeDomValue v;
+        v.d->value = d->property->values.at(ii);
+        v.d->value->addref();
+        rv << v;
+    }
+
+    return rv;
+}
+
+/*!
+    Returns the position in the input data where the list started, or -1 if
+ the property is invalid.
+*/
+int QDeclarativeDomList::position() const
+{
+    if (d && d->property) {
+        return d->property->listValueRange.offset;
+    } else
+        return -1;
+}
+
+/*!
+    Returns the length in the input data from where the list started upto
+ the end of it, or 0 if the property is invalid.
+*/
+int QDeclarativeDomList::length() const
+{
+    if (d && d->property)
+        return d->property->listValueRange.length;
+    else
+        return -1;
+}
+
+/*!
+  Returns a list of positions of the commas in the QML file.
+*/
+QList<int> QDeclarativeDomList:: commaPositions() const
+{
+    if (d && d->property)
+        return d->property->listCommaPositions;
+    else
+        return QList<int>();
+}
+
+/*!
+    \class QDeclarativeDomComponent
+    \internal
+    \brief The QDeclarativeDomComponent class represents sub-component within a QML document.
+
+    Sub-components are QDeclarativeComponents defined within a QML document.  The
+    following example shows the definition of a sub-component with the id
+    "listDelegate".
+
+    \qml
+Item {
+    Component {
+        id: listDelegate
+        Text {
+            text: modelData.text
+        }
+    }
+}
+    \endqml
+
+    Like QDeclarativeDomDocument's, components contain a single root object.
+*/
+
+/*!
+    Construct an empty QDeclarativeDomComponent.
+*/
+QDeclarativeDomComponent::QDeclarativeDomComponent()
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomComponent.
+*/
+QDeclarativeDomComponent::QDeclarativeDomComponent(const QDeclarativeDomComponent &other)
+: QDeclarativeDomObject(other)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomComponent.
+*/
+QDeclarativeDomComponent::~QDeclarativeDomComponent()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomComponent.
+*/
+QDeclarativeDomComponent &QDeclarativeDomComponent::operator=(const QDeclarativeDomComponent &other)
+{
+    static_cast<QDeclarativeDomObject &>(*this) = other;
+    return *this;
+}
+
+/*!
+    Returns the component's root object.
+
+    In the example below, the root object is the "Text" object.
+    \qml
+Item {
+    Component {
+        id: listDelegate
+        Text {
+            text: modelData.text
+        }
+    }
+}
+    \endqml
+*/
+QDeclarativeDomObject QDeclarativeDomComponent::componentRoot() const
+{
+    QDeclarativeDomObject rv;
+    if (d->object) {
+        QDeclarativeParser::Object *obj = 0;
+        if (d->object->defaultProperty &&
+           d->object->defaultProperty->values.count() == 1 &&
+           d->object->defaultProperty->values.at(0)->object)
+            obj = d->object->defaultProperty->values.at(0)->object;
+
+        if (obj) {
+            rv.d->object = obj;
+            rv.d->object->addref();
+        }
+    }
+
+    return rv;
+}
+
+QDeclarativeDomImportPrivate::QDeclarativeDomImportPrivate()
+: type(File)
+{
+}
+
+QDeclarativeDomImportPrivate::~QDeclarativeDomImportPrivate()
+{
+}
+
+/*!
+    \class QDeclarativeDomImport
+    \internal
+    \brief The QDeclarativeDomImport class represents an import statement.
+*/
+
+/*!
+    Construct an empty QDeclarativeDomImport.
+*/
+QDeclarativeDomImport::QDeclarativeDomImport()
+: d(new QDeclarativeDomImportPrivate)
+{
+}
+
+/*!
+    Create a copy of \a other QDeclarativeDomImport.
+*/
+QDeclarativeDomImport::QDeclarativeDomImport(const QDeclarativeDomImport &other)
+: d(other.d)
+{
+}
+
+/*!
+    Destroy the QDeclarativeDomImport.
+*/
+QDeclarativeDomImport::~QDeclarativeDomImport()
+{
+}
+
+/*!
+    Assign \a other to this QDeclarativeDomImport.
+*/
+QDeclarativeDomImport &QDeclarativeDomImport::operator=(const QDeclarativeDomImport &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+  Returns the type of the import.
+  */
+QDeclarativeDomImport::Type QDeclarativeDomImport::type() const
+{
+    return static_cast<QDeclarativeDomImport::Type>(d->type);
+}
+
+/*!
+  Returns the URI of the import (e.g. 'subdir' or 'com.nokia.Qt')
+  */
+QString QDeclarativeDomImport::uri() const
+{
+    return d->uri;
+}
+
+/*!
+  Returns the version specified by the import. An empty string if no version was specified.
+  */
+QString QDeclarativeDomImport::version() const
+{
+    return d->version;
+}
+
+/*!
+  Returns the (optional) qualifier string (the token following the 'as' keyword) of the import.
+  */
+QString QDeclarativeDomImport::qualifier() const
+{
+    return d->qualifier;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativedom_p.h b/src/declarative/qml/qdeclarativedom_p.h
new file mode 100644
index 0000000..6043ead
--- /dev/null
+++ b/src/declarative/qml/qdeclarativedom_p.h
@@ -0,0 +1,360 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEDOM_P_H
+#define QDECLARATIVEDOM_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeerror.h"
+
+#include <QtCore/qlist.h>
+#include <QtCore/qshareddata.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QString;
+class QByteArray;
+class QDeclarativeDomObject;
+class QDeclarativeDomList;
+class QDeclarativeDomValue;
+class QDeclarativeEngine;
+class QDeclarativeDomComponent;
+class QDeclarativeDomImport;
+class QIODevice;
+
+class QDeclarativeDomDocumentPrivate;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDomDocument
+{
+public:
+    QDeclarativeDomDocument();
+    QDeclarativeDomDocument(const QDeclarativeDomDocument &);
+    ~QDeclarativeDomDocument();
+    QDeclarativeDomDocument &operator=(const QDeclarativeDomDocument &);
+
+    QList<QDeclarativeDomImport> imports() const;
+
+    QList<QDeclarativeError> errors() const;
+    bool load(QDeclarativeEngine *, const QByteArray &, const QUrl & = QUrl());
+
+    QDeclarativeDomObject rootObject() const;
+
+private:
+    QSharedDataPointer<QDeclarativeDomDocumentPrivate> d;
+};
+
+class QDeclarativeDomPropertyPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDomProperty
+{
+public:
+    QDeclarativeDomProperty();
+    QDeclarativeDomProperty(const QDeclarativeDomProperty &);
+    ~QDeclarativeDomProperty();
+    QDeclarativeDomProperty &operator=(const QDeclarativeDomProperty &);
+
+    bool isValid() const;
+
+    QByteArray propertyName() const;
+    QList<QByteArray> propertyNameParts() const;
+
+    bool isDefaultProperty() const;
+
+    QDeclarativeDomValue value() const;
+
+    int position() const;
+    int length() const;
+
+private:
+    friend class QDeclarativeDomObject;
+    friend class QDeclarativeDomDynamicProperty;
+    QSharedDataPointer<QDeclarativeDomPropertyPrivate> d;
+};
+
+class QDeclarativeDomDynamicPropertyPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDomDynamicProperty
+{
+public:
+    QDeclarativeDomDynamicProperty();
+    QDeclarativeDomDynamicProperty(const QDeclarativeDomDynamicProperty &);
+    ~QDeclarativeDomDynamicProperty();
+    QDeclarativeDomDynamicProperty &operator=(const QDeclarativeDomDynamicProperty &);
+
+    bool isValid() const;
+
+    QByteArray propertyName() const;
+    int propertyType() const;
+    QByteArray propertyTypeName() const;
+
+    bool isDefaultProperty() const;
+    QDeclarativeDomProperty defaultValue() const;
+
+    bool isAlias() const;
+
+    int position() const;
+    int length() const;
+
+private:
+    friend class QDeclarativeDomObject;
+    QSharedDataPointer<QDeclarativeDomDynamicPropertyPrivate> d;
+};
+
+class QDeclarativeDomObjectPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDomObject
+{
+public:
+    QDeclarativeDomObject();
+    QDeclarativeDomObject(const QDeclarativeDomObject &);
+    ~QDeclarativeDomObject();
+    QDeclarativeDomObject &operator=(const QDeclarativeDomObject &);
+
+    bool isValid() const;
+
+    QByteArray objectType() const;
+    QByteArray objectClassName() const;
+
+    int objectTypeMajorVersion() const;
+    int objectTypeMinorVersion() const;
+
+    QString objectId() const;
+
+    QList<QDeclarativeDomProperty> properties() const;
+    QDeclarativeDomProperty property(const QByteArray &) const;
+
+    QList<QDeclarativeDomDynamicProperty> dynamicProperties() const;
+    QDeclarativeDomDynamicProperty dynamicProperty(const QByteArray &) const;
+
+    bool isCustomType() const;
+    QByteArray customTypeData() const;
+
+    bool isComponent() const;
+    QDeclarativeDomComponent toComponent() const;
+
+    int position() const;
+    int length() const;
+
+    QUrl url() const;
+private:
+    friend class QDeclarativeDomDocument;
+    friend class QDeclarativeDomComponent;
+    friend class QDeclarativeDomValue;
+    friend class QDeclarativeDomValueValueSource;
+    friend class QDeclarativeDomValueValueInterceptor;
+    QSharedDataPointer<QDeclarativeDomObjectPrivate> d;
+};
+
+class QDeclarativeDomValuePrivate;
+class QDeclarativeDomBasicValuePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDomValueLiteral
+{
+public:
+    QDeclarativeDomValueLiteral();
+    QDeclarativeDomValueLiteral(const QDeclarativeDomValueLiteral &);
+    ~QDeclarativeDomValueLiteral();
+    QDeclarativeDomValueLiteral &operator=(const QDeclarativeDomValueLiteral &);
+
+    QString literal() const;
+
+private:
+    friend class QDeclarativeDomValue;
+    QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDomValueBinding
+{
+public:
+    QDeclarativeDomValueBinding();
+    QDeclarativeDomValueBinding(const QDeclarativeDomValueBinding &);
+    ~QDeclarativeDomValueBinding();
+    QDeclarativeDomValueBinding &operator=(const QDeclarativeDomValueBinding &);
+
+    QString binding() const;
+
+private:
+    friend class QDeclarativeDomValue;
+    QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDomValueValueSource
+{
+public:
+    QDeclarativeDomValueValueSource();
+    QDeclarativeDomValueValueSource(const QDeclarativeDomValueValueSource &);
+    ~QDeclarativeDomValueValueSource();
+    QDeclarativeDomValueValueSource &operator=(const QDeclarativeDomValueValueSource &);
+
+    QDeclarativeDomObject object() const;
+
+private:
+    friend class QDeclarativeDomValue;
+    QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDomValueValueInterceptor
+{
+public:
+    QDeclarativeDomValueValueInterceptor();
+    QDeclarativeDomValueValueInterceptor(const QDeclarativeDomValueValueInterceptor &);
+    ~QDeclarativeDomValueValueInterceptor();
+    QDeclarativeDomValueValueInterceptor &operator=(const QDeclarativeDomValueValueInterceptor &);
+
+    QDeclarativeDomObject object() const;
+
+private:
+    friend class QDeclarativeDomValue;
+    QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d;
+};
+
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDomComponent : public QDeclarativeDomObject
+{
+public:
+    QDeclarativeDomComponent();
+    QDeclarativeDomComponent(const QDeclarativeDomComponent &);
+    ~QDeclarativeDomComponent();
+    QDeclarativeDomComponent &operator=(const QDeclarativeDomComponent &);
+
+    QDeclarativeDomObject componentRoot() const;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDomValue
+{
+public:
+    enum Type { 
+        Invalid,
+        Literal, 
+        PropertyBinding, 
+        ValueSource,
+        ValueInterceptor,
+        Object,
+        List 
+    };
+
+    QDeclarativeDomValue();
+    QDeclarativeDomValue(const QDeclarativeDomValue &);
+    ~QDeclarativeDomValue();
+    QDeclarativeDomValue &operator=(const QDeclarativeDomValue &);
+
+    Type type() const;
+
+    bool isInvalid() const;
+    bool isLiteral() const;
+    bool isBinding() const;
+    bool isValueSource() const;
+    bool isValueInterceptor() const;
+    bool isObject() const;
+    bool isList() const;
+
+    QDeclarativeDomValueLiteral toLiteral() const;
+    QDeclarativeDomValueBinding toBinding() const;
+    QDeclarativeDomValueValueSource toValueSource() const;
+    QDeclarativeDomValueValueInterceptor toValueInterceptor() const;
+    QDeclarativeDomObject toObject() const;
+    QDeclarativeDomList toList() const;
+
+    int position() const;
+    int length() const;
+
+private:
+    friend class QDeclarativeDomProperty;
+    friend class QDeclarativeDomList;
+    QSharedDataPointer<QDeclarativeDomValuePrivate> d;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeDomList
+{
+public:
+    QDeclarativeDomList();
+    QDeclarativeDomList(const QDeclarativeDomList &);
+    ~QDeclarativeDomList();
+    QDeclarativeDomList &operator=(const QDeclarativeDomList &);
+
+    QList<QDeclarativeDomValue> values() const;
+
+    int position() const;
+    int length() const;
+
+    QList<int> commaPositions() const;
+
+private:
+    friend class QDeclarativeDomValue;
+    QSharedDataPointer<QDeclarativeDomValuePrivate> d;
+};
+
+class QDeclarativeDomImportPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDomImport
+{
+public:
+    enum Type { Library, File };
+
+    QDeclarativeDomImport();
+    QDeclarativeDomImport(const QDeclarativeDomImport &);
+    ~QDeclarativeDomImport();
+    QDeclarativeDomImport &operator=(const QDeclarativeDomImport &);
+
+    Type type() const;
+    QString uri() const;
+    QString version() const;
+    QString qualifier() const;
+
+private:
+    friend class QDeclarativeDomDocument;
+    QSharedDataPointer<QDeclarativeDomImportPrivate> d;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEDOM_P_H
diff --git a/src/declarative/qml/qdeclarativedom_p_p.h b/src/declarative/qml/qdeclarativedom_p_p.h
new file mode 100644
index 0000000..a065282
--- /dev/null
+++ b/src/declarative/qml/qdeclarativedom_p_p.h
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEDOM_P_P_H
+#define QDECLARATIVEDOM_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeparser_p.h"
+
+#include <QtCore/QtGlobal>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeDomDocumentPrivate : public QSharedData
+{
+public:
+    QDeclarativeDomDocumentPrivate();
+    QDeclarativeDomDocumentPrivate(const QDeclarativeDomDocumentPrivate &o)
+    : QSharedData(o) { qFatal("Not impl"); }
+    ~QDeclarativeDomDocumentPrivate();
+
+    QList<QDeclarativeError> errors;
+    QList<QDeclarativeDomImport> imports;
+    QDeclarativeParser::Object *root;
+    QList<int> automaticSemicolonOffsets;
+};
+
+class QDeclarativeDomObjectPrivate : public QSharedData
+{
+public:
+    QDeclarativeDomObjectPrivate();
+    QDeclarativeDomObjectPrivate(const QDeclarativeDomObjectPrivate &o)
+    : QSharedData(o) { qFatal("Not impl"); }
+    ~QDeclarativeDomObjectPrivate();
+
+    typedef QList<QPair<QDeclarativeParser::Property *, QByteArray> > Properties;
+    Properties properties() const;
+    Properties properties(QDeclarativeParser::Property *) const;
+
+    QDeclarativeParser::Object *object;
+};
+
+class QDeclarativeDomPropertyPrivate : public QSharedData
+{
+public:
+    QDeclarativeDomPropertyPrivate();
+    QDeclarativeDomPropertyPrivate(const QDeclarativeDomPropertyPrivate &o)
+    : QSharedData(o) { qFatal("Not impl"); }
+    ~QDeclarativeDomPropertyPrivate();
+
+    QByteArray propertyName;
+    QDeclarativeParser::Property *property;
+};
+
+class QDeclarativeDomDynamicPropertyPrivate : public QSharedData
+{
+public:
+    QDeclarativeDomDynamicPropertyPrivate();
+    QDeclarativeDomDynamicPropertyPrivate(const QDeclarativeDomDynamicPropertyPrivate &o)
+    : QSharedData(o) { qFatal("Not impl"); }
+    ~QDeclarativeDomDynamicPropertyPrivate();
+
+    bool valid;
+    QDeclarativeParser::Object::DynamicProperty property;
+};
+
+class QDeclarativeDomValuePrivate : public QSharedData
+{
+public:
+    QDeclarativeDomValuePrivate();
+    QDeclarativeDomValuePrivate(const QDeclarativeDomValuePrivate &o)
+    : QSharedData(o) { qFatal("Not impl"); }
+    ~QDeclarativeDomValuePrivate();
+
+    QDeclarativeParser::Property *property;
+    QDeclarativeParser::Value *value;
+};
+
+class QDeclarativeDomBasicValuePrivate : public QSharedData
+{
+public:
+    QDeclarativeDomBasicValuePrivate();
+    QDeclarativeDomBasicValuePrivate(const QDeclarativeDomBasicValuePrivate &o) 
+    : QSharedData(o) { qFatal("Not impl"); }
+    ~QDeclarativeDomBasicValuePrivate();
+
+    QDeclarativeParser::Value *value;
+};
+
+class QDeclarativeDomImportPrivate : public QSharedData
+{
+public:
+    QDeclarativeDomImportPrivate();
+    QDeclarativeDomImportPrivate(const QDeclarativeDomImportPrivate &o) 
+    : QSharedData(o) { qFatal("Not impl"); }
+    ~QDeclarativeDomImportPrivate();
+
+    enum Type { Library, File };
+
+    Type type;
+    QString uri;
+    QString version;
+    QString qualifier;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEDOM_P_P_H
+
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
new file mode 100644
index 0000000..4575536
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -0,0 +1,1901 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeengine.h"
+
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativeglobalscriptclass_p.h"
+#include "qdeclarative.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativeexpression.h"
+#include "qdeclarativecomponent.h"
+#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativebinding_p_p.h"
+#include "qdeclarativevme_p.h"
+#include "qdeclarativeenginedebug_p.h"
+#include "qdeclarativestringconverters_p.h"
+#include "qdeclarativexmlhttprequest_p.h"
+#include "qdeclarativesqldatabase_p.h"
+#include "qdeclarativetypenamescriptclass_p.h"
+#include "qdeclarativelistscriptclass_p.h"
+#include "qdeclarativescriptstring.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativeworkerscript_p.h"
+#include "qdeclarativecomponent_p.h"
+#include "qdeclarativescriptclass_p.h"
+#include "qdeclarativenetworkaccessmanagerfactory.h"
+#include "qdeclarativeimageprovider.h"
+#include "qdeclarativedirparser_p.h"
+#include "qdeclarativeextensioninterface.h"
+#include "qdeclarativelist_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QtCore/qmetaobject.h>
+#include <QScriptClass>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QNetworkAccessManager>
+#include <QDesktopServices>
+#include <QTimer>
+#include <QList>
+#include <QPair>
+#include <QDebug>
+#include <QMetaObject>
+#include <QStack>
+#include <QPluginLoader>
+#include <QtCore/qlibraryinfo.h>
+#include <QtCore/qthreadstorage.h>
+#include <QtCore/qthread.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qmutex.h>
+#include <QtGui/qcolor.h>
+#include <QtGui/qvector3d.h>
+#include <QtGui/qsound.h>
+#include <QGraphicsObject>
+#include <QtCore/qcryptographichash.h>
+
+#include <private/qobject_p.h>
+#include <private/qscriptdeclarativeclass_p.h>
+
+#include <private/qdeclarativeitemsmodule_p.h>
+#include <private/qdeclarativeutilmodule_p.h>
+
+#ifdef Q_OS_WIN // for %APPDATA%
+#include <qt_windows.h>
+#include <qlibrary.h>
+
+#define CSIDL_APPDATA		0x001a	// <username>\Application Data
+#endif
+
+Q_DECLARE_METATYPE(QDeclarativeMetaProperty)
+
+QT_BEGIN_NAMESPACE
+
+DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE)
+
+/*!
+    \qmlclass QtObject QObject
+  \since 4.7
+    \brief The QtObject element is the most basic element in QML
+
+    The QtObject element is a non-visual element which contains only
+    the objectName property. It is useful for when you need an extremely
+    lightweight element to place your own custom properties in.
+
+    It can also be useful for C++ integration, as it is just a plain QObject. See
+    the QObject documentation for further details.
+*/
+/*!
+  \qmlproperty string QtObject::objectName
+  This property allows you to give a name to this specific object instance.
+
+  See \l{scripting.html#accessing-child-qobjects}{Accessing Child QObjects}
+  in the scripting documentation for details how objectName can be used from
+  scripts.
+*/
+
+struct StaticQtMetaObject : public QObject
+{
+    static const QMetaObject *get()
+        { return &static_cast<StaticQtMetaObject*> (0)->staticQtMetaObject; }
+};
+
+static bool qt_QmlQtModule_registered = false;
+
+void QDeclarativeEnginePrivate::defineModule()
+{
+    QML_REGISTER_TYPE(Qt,4,6,Component,QDeclarativeComponent);
+    QML_REGISTER_TYPE(Qt,4,6,QtObject,QObject);
+    QML_REGISTER_TYPE(Qt,4,6,WorkerScript,QDeclarativeWorkerScript);
+    QML_REGISTER_TYPE(Qt,4,6,WorkerListModel,QDeclarativeWorkerListModel);
+
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeBinding);
+}
+
+QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e)
+: captureProperties(false), rootContext(0), currentExpression(0), isDebugging(false), 
+  contextClass(0), sharedContext(0), sharedScope(0), objectClass(0), valueTypeClass(0), 
+  globalClass(0), cleanup(0), erroredBindings(0), inProgressCreations(0), 
+  scriptEngine(this), workerScriptEngine(0), componentAttacheds(0), inBeginCreate(false), 
+  networkAccessManager(0), networkAccessManagerFactory(0),
+  typeManager(e), uniqueId(1)
+{
+    if (!qt_QmlQtModule_registered) {
+        qt_QmlQtModule_registered = true;
+        QDeclarativeItemModule::defineModule();
+        QDeclarativeUtilModule::defineModule();
+        QDeclarativeEnginePrivate::defineModule();
+    }
+    globalClass = new QDeclarativeGlobalScriptClass(&scriptEngine);
+    fileImportPath.append(QLibraryInfo::location(QLibraryInfo::DataPath)+QDir::separator()+QLatin1String("qml"));
+
+    // env import paths
+    QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
+    if (!envImportPath.isEmpty()) {
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+        QLatin1Char pathSep(';');
+#else
+        QLatin1Char pathSep(':');
+#endif
+        foreach (const QString &path, QString::fromLatin1(envImportPath).split(pathSep, QString::SkipEmptyParts)) {
+            QString canonicalPath = QDir(path).canonicalPath();
+            if (!canonicalPath.isEmpty() && !environmentImportPath.contains(canonicalPath))
+                environmentImportPath.append(canonicalPath);
+        }
+    }
+}
+
+QUrl QDeclarativeScriptEngine::resolvedUrl(QScriptContext *context, const QUrl& url)
+{
+    if (p) {
+        QDeclarativeContext *ctxt = QDeclarativeEnginePrivate::get(this)->getContext(context);
+        Q_ASSERT(ctxt);
+        return ctxt->resolvedUrl(url);
+    }
+    return baseUrl.resolved(url);
+}
+
+QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *priv)
+: p(priv), sqlQueryClass(0), namedNodeMapClass(0), nodeListClass(0)
+{
+    // Note that all documentation for stuff put on the global object goes in
+    // doc/src/declarative/globalobject.qdoc
+
+    bool mainthread = priv != 0;
+
+    QScriptValue qtObject =
+        newQMetaObject(StaticQtMetaObject::get());
+    globalObject().setProperty(QLatin1String("Qt"), qtObject);
+
+    offlineStoragePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation).replace(QLatin1Char('/'), QDir::separator())
+        + QDir::separator() + QLatin1String("QML")
+        + QDir::separator() + QLatin1String("OfflineStorage");
+
+
+    qt_add_qmlxmlhttprequest(this);
+    qt_add_qmlsqldatabase(this);
+    // XXX A Multimedia "Qt.Sound" class also needs to be made available,
+    // XXX but we don't want a dependency in that cirection.
+    // XXX When the above a done some better way, that way should also be
+    // XXX used to add Qt.Sound class.
+
+
+    //types
+    qtObject.setProperty(QLatin1String("rgba"), newFunction(QDeclarativeEnginePrivate::rgba, 4));
+    qtObject.setProperty(QLatin1String("hsla"), newFunction(QDeclarativeEnginePrivate::hsla, 4));
+    qtObject.setProperty(QLatin1String("rect"), newFunction(QDeclarativeEnginePrivate::rect, 4));
+    qtObject.setProperty(QLatin1String("point"), newFunction(QDeclarativeEnginePrivate::point, 2));
+    qtObject.setProperty(QLatin1String("size"), newFunction(QDeclarativeEnginePrivate::size, 2));
+    qtObject.setProperty(QLatin1String("vector3d"), newFunction(QDeclarativeEnginePrivate::vector, 3));
+
+    if (mainthread) {
+        //color helpers
+        qtObject.setProperty(QLatin1String("lighter"), newFunction(QDeclarativeEnginePrivate::lighter, 1));
+        qtObject.setProperty(QLatin1String("darker"), newFunction(QDeclarativeEnginePrivate::darker, 1));
+        qtObject.setProperty(QLatin1String("tint"), newFunction(QDeclarativeEnginePrivate::tint, 2));
+    }
+
+    //misc methods
+    qtObject.setProperty(QLatin1String("closestAngle"), newFunction(QDeclarativeEnginePrivate::closestAngle, 2));
+    qtObject.setProperty(QLatin1String("playSound"), newFunction(QDeclarativeEnginePrivate::playSound, 1));
+    qtObject.setProperty(QLatin1String("openUrlExternally"),newFunction(QDeclarativeEnginePrivate::desktopOpenUrl, 1));
+    qtObject.setProperty(QLatin1String("md5"),newFunction(QDeclarativeEnginePrivate::md5, 1));
+    qtObject.setProperty(QLatin1String("btoa"),newFunction(QDeclarativeEnginePrivate::btoa, 1));
+    qtObject.setProperty(QLatin1String("atob"),newFunction(QDeclarativeEnginePrivate::atob, 1));
+    qtObject.setProperty(QLatin1String("quit"), newFunction(QDeclarativeEnginePrivate::quit, 0));
+    qtObject.setProperty(QLatin1String("resolvedUrl"),newFunction(QDeclarativeScriptEngine::resolvedUrl, 1));
+
+    //firebug/webkit compat
+    QScriptValue consoleObject = newObject();
+    consoleObject.setProperty(QLatin1String("log"),newFunction(QDeclarativeEnginePrivate::consoleLog, 1));
+    consoleObject.setProperty(QLatin1String("debug"),newFunction(QDeclarativeEnginePrivate::consoleLog, 1));
+    globalObject().setProperty(QLatin1String("console"), consoleObject);
+
+    if (mainthread) {
+        globalObject().setProperty(QLatin1String("createQmlObject"),
+                newFunction(QDeclarativeEnginePrivate::createQmlObject, 1));
+        globalObject().setProperty(QLatin1String("createComponent"),
+                newFunction(QDeclarativeEnginePrivate::createComponent, 1));
+    }
+
+    // translation functions need to be installed
+    // before the global script class is constructed (QTBUG-6437)
+    installTranslatorFunctions();
+}
+
+QDeclarativeScriptEngine::~QDeclarativeScriptEngine()
+{
+    delete sqlQueryClass;
+    delete nodeListClass;
+    delete namedNodeMapClass;
+}
+
+QScriptValue QDeclarativeScriptEngine::resolvedUrl(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    QString arg = ctxt->argument(0).toString();
+    QUrl r = QDeclarativeScriptEngine::get(engine)->resolvedUrl(ctxt,QUrl(arg));
+    return QScriptValue(r.toString());
+}
+
+QNetworkAccessManager *QDeclarativeScriptEngine::networkAccessManager()
+{
+    return p->getNetworkAccessManager();
+}
+
+QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate()
+{
+    while (cleanup) {
+        QDeclarativeCleanup *c = cleanup;
+        cleanup = c->next;
+        if (cleanup) cleanup->prev = &cleanup;
+        c->next = 0;
+        c->prev = 0;
+        c->clear();
+    }
+
+    delete rootContext;
+    rootContext = 0;
+    delete contextClass;
+    contextClass = 0;
+    delete objectClass;
+    objectClass = 0;
+    delete valueTypeClass;
+    valueTypeClass = 0;
+    delete typeNameClass;
+    typeNameClass = 0;
+    delete listClass;
+    listClass = 0;
+    delete globalClass;
+    globalClass = 0;
+
+    for(int ii = 0; ii < bindValues.count(); ++ii)
+        clear(bindValues[ii]);
+    for(int ii = 0; ii < parserStatus.count(); ++ii)
+        clear(parserStatus[ii]);
+    for(QHash<int, QDeclarativeCompiledData*>::ConstIterator iter = m_compositeTypes.constBegin(); iter != m_compositeTypes.constEnd(); ++iter)
+        (*iter)->release();
+    for(QHash<const QMetaObject *, QDeclarativePropertyCache *>::Iterator iter = propertyCache.begin(); iter != propertyCache.end(); ++iter)
+        (*iter)->release();
+
+}
+
+void QDeclarativeEnginePrivate::clear(SimpleList<QDeclarativeAbstractBinding> &bvs)
+{
+    bvs.clear();
+}
+
+void QDeclarativeEnginePrivate::clear(SimpleList<QDeclarativeParserStatus> &pss)
+{
+    for (int ii = 0; ii < pss.count; ++ii) {
+        QDeclarativeParserStatus *ps = pss.at(ii);
+        if(ps)
+            ps->d = 0;
+    }
+    pss.clear();
+}
+
+Q_GLOBAL_STATIC(QDeclarativeEngineDebugServer, qmlEngineDebugServer);
+
+void QDeclarativeEnginePrivate::init()
+{
+    Q_Q(QDeclarativeEngine);
+    qRegisterMetaType<QVariant>("QVariant");
+    qRegisterMetaType<QDeclarativeScriptString>("QDeclarativeScriptString");
+    qRegisterMetaType<QScriptValue>("QScriptValue");
+
+    contextClass = new QDeclarativeContextScriptClass(q);
+    objectClass = new QDeclarativeObjectScriptClass(q);
+    valueTypeClass = new QDeclarativeValueTypeScriptClass(q);
+    typeNameClass = new QDeclarativeTypeNameScriptClass(q);
+    listClass = new QDeclarativeListScriptClass(q);
+    rootContext = new QDeclarativeContext(q,true);
+
+    if (QCoreApplication::instance()->thread() == q->thread() &&
+        QDeclarativeEngineDebugServer::isDebuggingEnabled()) {
+        qmlEngineDebugServer();
+        isDebugging = true;
+        QDeclarativeEngineDebugServer::addEngine(q);
+
+        qmlEngineDebugServer()->waitForClients();
+    }
+}
+
+QDeclarativeWorkerScriptEngine *QDeclarativeEnginePrivate::getWorkerScriptEngine()
+{
+    Q_Q(QDeclarativeEngine);
+    if (!workerScriptEngine) 
+        workerScriptEngine = new QDeclarativeWorkerScriptEngine(q);
+    return workerScriptEngine;
+}
+
+/*!
+    \class QDeclarativeEngine
+  \since 4.7
+    \brief The QDeclarativeEngine class provides an environment for instantiating QML components.
+    \mainclass
+
+    Each QML component is instantiated in a QDeclarativeContext.  QDeclarativeContext's are
+    essential for passing data to QML components.  In QML, contexts are arranged
+    hierarchically and this hierarchy is managed by the QDeclarativeEngine.
+
+    Prior to creating any QML components, an application must have created a
+    QDeclarativeEngine to gain access to a QML context.  The following example shows how
+    to create a simple Text item.
+
+    \code
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6\nText { text: \"Hello world!\" }", QUrl());
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(component.create());
+
+    //add item to view, etc
+    ...
+    \endcode
+
+    In this case, the Text item will be created in the engine's
+    \l {QDeclarativeEngine::rootContext()}{root context}.
+
+    \sa QDeclarativeComponent QDeclarativeContext
+*/
+
+/*!
+    Create a new QDeclarativeEngine with the given \a parent.
+*/
+QDeclarativeEngine::QDeclarativeEngine(QObject *parent)
+: QObject(*new QDeclarativeEnginePrivate(this), parent)
+{
+    Q_D(QDeclarativeEngine);
+    d->init();
+}
+
+/*!
+    Destroys the QDeclarativeEngine.
+
+    Any QDeclarativeContext's created on this engine will be invalidated, but not
+    destroyed (unless they are parented to the QDeclarativeEngine object).
+*/
+QDeclarativeEngine::~QDeclarativeEngine()
+{
+    Q_D(QDeclarativeEngine);
+    if (d->isDebugging)
+        QDeclarativeEngineDebugServer::remEngine(this);
+}
+
+/*! \fn void QDeclarativeEngine::quit()
+  This signal is emitted when the QDeclarativeEngine quits.
+ */
+
+/*!
+  Clears the engine's internal component cache.
+
+  Normally the QDeclarativeEngine caches components loaded from qml files.  This method
+  clears this cache and forces the component to be reloaded.
+ */
+void QDeclarativeEngine::clearComponentCache()
+{
+    Q_D(QDeclarativeEngine);
+    d->typeManager.clearCache();
+}
+
+/*!
+    Returns the engine's root context.
+
+    The root context is automatically created by the QDeclarativeEngine.  Data that
+    should be available to all QML component instances instantiated by the
+    engine should be put in the root context.
+
+    Additional data that should only be available to a subset of component
+    instances should be added to sub-contexts parented to the root context.
+*/
+QDeclarativeContext *QDeclarativeEngine::rootContext()
+{
+    Q_D(QDeclarativeEngine);
+    return d->rootContext;
+}
+
+/*!
+    Sets the \a factory to use for creating QNetworkAccessManager(s).
+
+    QNetworkAccessManager is used for all network access by QML.
+    By implementing a factory it is possible to create custom
+    QNetworkAccessManager with specialized caching, proxy and
+    cookie support.
+
+    The factory must be set before exceuting the engine.
+*/
+void QDeclarativeEngine::setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory *factory)
+{
+    Q_D(QDeclarativeEngine);
+    QMutexLocker locker(&d->mutex);
+    d->networkAccessManagerFactory = factory;
+}
+
+/*!
+    Returns the current QDeclarativeNetworkAccessManagerFactory.
+
+    \sa setNetworkAccessManagerFactory()
+*/
+QDeclarativeNetworkAccessManagerFactory *QDeclarativeEngine::networkAccessManagerFactory() const
+{
+    Q_D(const QDeclarativeEngine);
+    return d->networkAccessManagerFactory;
+}
+
+QNetworkAccessManager *QDeclarativeEnginePrivate::createNetworkAccessManager(QObject *parent) const
+{
+    QMutexLocker locker(&mutex);
+    QNetworkAccessManager *nam;
+    if (networkAccessManagerFactory) {
+        nam = networkAccessManagerFactory->create(parent);
+    } else {
+        nam = new QNetworkAccessManager(parent);
+    }
+
+    return nam;
+}
+
+QNetworkAccessManager *QDeclarativeEnginePrivate::getNetworkAccessManager() const
+{
+    Q_Q(const QDeclarativeEngine);
+    if (!networkAccessManager)
+        networkAccessManager = createNetworkAccessManager(const_cast<QDeclarativeEngine*>(q));
+    return networkAccessManager;
+}
+
+/*!
+    Returns a common QNetworkAccessManager which can be used by any QML element
+    instantiated by this engine.
+
+    If a QDeclarativeNetworkAccessManagerFactory has been set and a QNetworkAccessManager
+    has not yet been created, the QDeclarativeNetworkAccessManagerFactory will be used
+    to create the QNetworkAccessManager; otherwise the returned QNetworkAccessManager
+    will have no proxy or cache set.
+
+    \sa setNetworkAccessManagerFactory()
+*/
+QNetworkAccessManager *QDeclarativeEngine::networkAccessManager() const
+{
+    Q_D(const QDeclarativeEngine);
+    return d->getNetworkAccessManager();
+}
+
+/*!
+    Sets the \a provider to use for images requested via the \e image: url
+    scheme, with host \a providerId.
+
+    QDeclarativeImageProvider allows images to be provided to QML asynchronously.
+    The image request will be run in a low priority thread.  This allows
+    potentially costly image loading to be done in the background, without
+    affecting the performance of the UI.
+
+    Note that images loaded from a QDeclarativeImageProvider are cached by
+    QPixmapCache, similar to any image loaded by QML.
+
+    The QDeclarativeEngine assumes ownership of the provider.
+
+    This example creates a provider with id \e colors:
+
+    \snippet examples/declarative/imageprovider/main.cpp 0
+
+    \snippet examples/declarative/imageprovider/view.qml 0
+
+    \sa removeImageProvider()
+*/
+void QDeclarativeEngine::addImageProvider(const QString &providerId, QDeclarativeImageProvider *provider)
+{
+    Q_D(QDeclarativeEngine);
+    QMutexLocker locker(&d->mutex);
+    d->imageProviders.insert(providerId, provider);
+}
+
+/*!
+    Returns the QDeclarativeImageProvider set for \a providerId.
+*/
+QDeclarativeImageProvider *QDeclarativeEngine::imageProvider(const QString &providerId) const
+{
+    Q_D(const QDeclarativeEngine);
+    QMutexLocker locker(&d->mutex);
+    return d->imageProviders.value(providerId);
+}
+
+/*!
+    Removes the QDeclarativeImageProvider for \a providerId.
+
+    Returns the provider if it was found; otherwise returns 0.
+
+    \sa addImageProvider()
+*/
+void QDeclarativeEngine::removeImageProvider(const QString &providerId)
+{
+    Q_D(QDeclarativeEngine);
+    QMutexLocker locker(&d->mutex);
+    delete d->imageProviders.take(providerId);
+}
+
+QImage QDeclarativeEnginePrivate::getImageFromProvider(const QUrl &url)
+{
+    QMutexLocker locker(&mutex);
+    QImage image;
+    QDeclarativeImageProvider *provider = imageProviders.value(url.host());
+    if (provider)
+        image = provider->request(url.path().mid(1));
+    return image;
+}
+
+/*!
+    Return the base URL for this engine.  The base URL is only used to resolve
+    components when a relative URL is passed to the QDeclarativeComponent constructor.
+
+    If a base URL has not been explicitly set, this method returns the
+    application's current working directory.
+
+    \sa setBaseUrl()
+*/
+QUrl QDeclarativeEngine::baseUrl() const
+{
+    Q_D(const QDeclarativeEngine);
+    if (d->baseUrl.isEmpty()) {
+        return QUrl::fromLocalFile(QDir::currentPath() + QDir::separator());
+    } else {
+        return d->baseUrl;
+    }
+}
+
+/*!
+    Set the  base URL for this engine to \a url.
+
+    \sa baseUrl()
+*/
+void QDeclarativeEngine::setBaseUrl(const QUrl &url)
+{
+    Q_D(QDeclarativeEngine);
+    d->baseUrl = url;
+}
+
+/*!
+  Returns the QDeclarativeContext for the \a object, or 0 if no context has been set.
+
+  When the QDeclarativeEngine instantiates a QObject, the context is set automatically.
+  */
+QDeclarativeContext *QDeclarativeEngine::contextForObject(const QObject *object)
+{
+    if(!object)
+        return 0;
+
+    QObjectPrivate *priv = QObjectPrivate::get(const_cast<QObject *>(object));
+
+    QDeclarativeDeclarativeData *data =
+        static_cast<QDeclarativeDeclarativeData *>(priv->declarativeData);
+
+    if (!data)
+        return 0;
+    else if (data->outerContext)
+        return data->outerContext;
+    else
+        return data->context;
+}
+
+/*!
+  Sets the QDeclarativeContext for the \a object to \a context.
+  If the \a object already has a context, a warning is
+  output, but the context is not changed.
+
+  When the QDeclarativeEngine instantiates a QObject, the context is set automatically.
+ */
+void QDeclarativeEngine::setContextForObject(QObject *object, QDeclarativeContext *context)
+{
+    if (!object || !context)
+        return;
+
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object, true);
+    if (data->context) {
+        qWarning("QDeclarativeEngine::setContextForObject(): Object already has a QDeclarativeContext");
+        return;
+    }
+
+    data->context = context;
+    data->nextContextObject = context->d_func()->contextObjects;
+    if (data->nextContextObject) 
+        data->nextContextObject->prevContextObject = &data->nextContextObject;
+    data->prevContextObject = &context->d_func()->contextObjects;
+    context->d_func()->contextObjects = data;
+}
+
+void qmlExecuteDeferred(QObject *object)
+{
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object);
+
+    if (data && data->deferredComponent) {
+
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(data->context->engine());
+
+        QDeclarativeComponentPrivate::ConstructionState state;
+        QDeclarativeComponentPrivate::beginDeferred(data->context, ep, object, &state);
+
+        data->deferredComponent->release();
+        data->deferredComponent = 0;
+
+        QDeclarativeComponentPrivate::complete(ep, &state);
+
+        if (!state.errors.isEmpty())
+            qWarning() << state.errors;
+
+    }
+}
+
+QDeclarativeContext *qmlContext(const QObject *obj)
+{
+    return QDeclarativeEngine::contextForObject(obj);
+}
+
+QDeclarativeEngine *qmlEngine(const QObject *obj)
+{
+    QDeclarativeContext *context = QDeclarativeEngine::contextForObject(obj);
+    return context?context->engine():0;
+}
+
+QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool create)
+{
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object);
+    if (!data)
+        return 0; // Attached properties are only on objects created by QML
+
+    QObject *rv = data->attachedProperties?data->attachedProperties->value(id):0;
+    if (rv || !create)
+        return rv;
+
+    QDeclarativeAttachedPropertiesFunc pf = QDeclarativeMetaType::attachedPropertiesFuncById(id);
+    if (!pf)
+        return 0;
+
+    rv = pf(const_cast<QObject *>(object));
+
+    if (rv) {
+        if (!data->attachedProperties)
+            data->attachedProperties = new QHash<int, QObject *>();
+        data->attachedProperties->insert(id, rv);
+    }
+
+    return rv;
+}
+
+void QDeclarativeDeclarativeData::destroyed(QObject *object)
+{
+    if (deferredComponent)
+        deferredComponent->release();
+    if (attachedProperties)
+        delete attachedProperties;
+
+    if (nextContextObject) 
+        nextContextObject->prevContextObject = prevContextObject;
+    if (prevContextObject)
+        *prevContextObject = nextContextObject;
+
+    QDeclarativeAbstractBinding *binding = bindings;
+    while (binding) {
+        QDeclarativeAbstractBinding *next = binding->m_nextBinding;
+        binding->m_prevBinding = 0;
+        binding->m_nextBinding = 0;
+        binding->destroy();
+        binding = next;
+    }
+
+    if (bindingBits)
+        free(bindingBits);
+
+    if (propertyCache)
+        propertyCache->release();
+
+    QDeclarativeGuard<QObject> *guard = guards;
+    while (guard) {
+        QDeclarativeGuard<QObject> *g = guard;
+        guard = guard->next;
+        g->o = 0;
+        g->prev = 0;
+        g->next = 0;
+        g->objectDestroyed(object);
+    }
+
+    delete this;
+}
+
+bool QDeclarativeDeclarativeData::hasBindingBit(int bit) const
+{
+    if (bindingBitsSize > bit) 
+        return bindingBits[bit / 32] & (1 << (bit % 32));
+    else
+        return false;
+}
+
+void QDeclarativeDeclarativeData::clearBindingBit(int bit)
+{
+    if (bindingBitsSize > bit) 
+        bindingBits[bit / 32] &= ~(1 << (bit % 32));
+}
+
+void QDeclarativeDeclarativeData::setBindingBit(QObject *obj, int bit)
+{
+    if (bindingBitsSize <= bit) {
+        int props = obj->metaObject()->propertyCount();
+        Q_ASSERT(bit < props);
+
+        int arraySize = (props + 31) / 32;
+        int oldArraySize = bindingBitsSize / 32;
+
+        bindingBits = (quint32 *)realloc(bindingBits, 
+                                         arraySize * sizeof(quint32));
+
+        memset(bindingBits + oldArraySize, 
+               0x00,
+               sizeof(quint32) * (arraySize - oldArraySize));
+
+        bindingBitsSize = arraySize * 32;
+    }
+
+    bindingBits[bit / 32] |= (1 << (bit % 32));
+}
+
+/*!
+    Creates a QScriptValue allowing you to use \a object in QML script.
+    \a engine is the QDeclarativeEngine it is to be created in.
+
+    The QScriptValue returned is a QtScript Object, not a QtScript QObject, due
+    to the special needs of QML requiring more functionality than a standard
+    QtScript QObject.
+*/
+QScriptValue QDeclarativeEnginePrivate::qmlScriptObject(QObject* object,
+                                               QDeclarativeEngine* engine)
+{
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+    return enginePriv->objectClass->newQObject(object);
+}
+
+/*!
+    Returns the QDeclarativeContext for the executing QScript \a ctxt.
+*/
+QDeclarativeContext *QDeclarativeEnginePrivate::getContext(QScriptContext *ctxt)
+{
+    QScriptValue scopeNode = QScriptDeclarativeClass::scopeChainValue(ctxt, -3);
+    Q_ASSERT(scopeNode.isValid());
+    Q_ASSERT(QScriptDeclarativeClass::scriptClass(scopeNode) == contextClass);
+    return contextClass->contextFromValue(scopeNode);
+}
+
+QScriptValue QDeclarativeEnginePrivate::createComponent(QScriptContext *ctxt,
+                                               QScriptEngine *engine)
+{
+    QDeclarativeEnginePrivate *activeEnginePriv =
+        static_cast<QDeclarativeScriptEngine*>(engine)->p;
+    QDeclarativeEngine* activeEngine = activeEnginePriv->q_func();
+
+    QDeclarativeContext* context = activeEnginePriv->getContext(ctxt);
+    Q_ASSERT(context);
+    if(ctxt->argumentCount() != 1) {
+        return engine->nullValue();
+    }else{
+        QString arg = ctxt->argument(0).toString();
+        if (arg.isEmpty())
+            return engine->nullValue();
+        QUrl url = QUrl(context->resolvedUrl(QUrl(arg)));
+        QDeclarativeComponent *c = new QDeclarativeComponent(activeEngine, url, activeEngine);
+        c->setCreationContext(context);
+        return activeEnginePriv->objectClass->newQObject(c, qMetaTypeId<QDeclarativeComponent*>());
+    }
+}
+
+QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    QDeclarativeEnginePrivate *activeEnginePriv =
+        static_cast<QDeclarativeScriptEngine*>(engine)->p;
+    QDeclarativeEngine* activeEngine = activeEnginePriv->q_func();
+
+    if(ctxt->argumentCount() < 2 || ctxt->argumentCount() > 3)
+        return engine->nullValue();
+
+    QDeclarativeContext* context = activeEnginePriv->getContext(ctxt);
+    Q_ASSERT(context);
+
+    QString qml = ctxt->argument(0).toString();
+    if (qml.isEmpty())
+        return engine->nullValue();
+
+    QUrl url;
+    if(ctxt->argumentCount() > 2)
+        url = QUrl(ctxt->argument(2).toString());
+    else
+        url = QUrl(QLatin1String("inline"));
+
+    if (url.isValid() && url.isRelative())
+        url = context->resolvedUrl(url);
+
+    QObject *parentArg = activeEnginePriv->objectClass->toQObject(ctxt->argument(1));
+    if(!parentArg) 
+        return engine->nullValue();
+
+    QDeclarativeComponent component(activeEngine);
+    component.setData(qml.toUtf8(), url);
+
+    if(component.isError()) {
+        QList<QDeclarativeError> errors = component.errors();
+        qWarning().nospace() << "QDeclarativeEngine::createQmlObject():";
+        foreach (const QDeclarativeError &error, errors)
+            qWarning().nospace() << "    " << error;
+
+        return engine->nullValue();
+    }
+
+    if (!component.isReady()) {
+        qWarning().nospace() << "QDeclarativeEngine::createQmlObject(): Component is not ready";
+
+        return engine->nullValue();
+    }
+
+    QObject *obj = component.create(context);
+
+    if(component.isError()) {
+        QList<QDeclarativeError> errors = component.errors();
+        qWarning().nospace() << "QDeclarativeEngine::createQmlObject():";
+        foreach (const QDeclarativeError &error, errors)
+            qWarning().nospace() << "    " << error;
+
+        return engine->nullValue();
+    }
+
+    Q_ASSERT(obj);
+
+    obj->setParent(parentArg);
+    QGraphicsObject* gobj = qobject_cast<QGraphicsObject*>(obj);
+    QGraphicsObject* gparent = qobject_cast<QGraphicsObject*>(parentArg);
+    if(gobj && gparent)
+        gobj->setParentItem(gparent);
+
+    return qmlScriptObject(obj, activeEngine);
+}
+
+QScriptValue QDeclarativeEnginePrivate::vector(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if(ctxt->argumentCount() != 3)
+        return engine->nullValue();
+    qsreal x = ctxt->argument(0).toNumber();
+    qsreal y = ctxt->argument(1).toNumber();
+    qsreal z = ctxt->argument(2).toNumber();
+    return engine->newVariant(qVariantFromValue(QVector3D(x, y, z)));
+}
+
+QScriptValue QDeclarativeEnginePrivate::rgba(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    int argCount = ctxt->argumentCount();
+    if(argCount < 3 || argCount > 4)
+        return engine->nullValue();
+    qsreal r = ctxt->argument(0).toNumber();
+    qsreal g = ctxt->argument(1).toNumber();
+    qsreal b = ctxt->argument(2).toNumber();
+    qsreal a = (argCount == 4) ? ctxt->argument(3).toNumber() : 1;
+
+    if (r < 0 || r > 1 || g < 0 || g > 1 || b < 0 || b > 1 || a < 0 || a > 1)
+        return engine->nullValue();
+
+    return qScriptValueFromValue(engine, qVariantFromValue(QColor::fromRgbF(r, g, b, a)));
+}
+
+QScriptValue QDeclarativeEnginePrivate::hsla(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    int argCount = ctxt->argumentCount();
+    if(argCount < 3 || argCount > 4)
+        return engine->nullValue();
+    qsreal h = ctxt->argument(0).toNumber();
+    qsreal s = ctxt->argument(1).toNumber();
+    qsreal l = ctxt->argument(2).toNumber();
+    qsreal a = (argCount == 4) ? ctxt->argument(3).toNumber() : 1;
+
+    if (h < 0 || h > 1 || s < 0 || s > 1 || l < 0 || l > 1 || a < 0 || a > 1)
+        return engine->nullValue();
+
+    return qScriptValueFromValue(engine, qVariantFromValue(QColor::fromHslF(h, s, l, a)));
+}
+
+QScriptValue QDeclarativeEnginePrivate::rect(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if(ctxt->argumentCount() != 4)
+        return engine->nullValue();
+
+    qsreal x = ctxt->argument(0).toNumber();
+    qsreal y = ctxt->argument(1).toNumber();
+    qsreal w = ctxt->argument(2).toNumber();
+    qsreal h = ctxt->argument(3).toNumber();
+
+    if (w < 0 || h < 0)
+        return engine->nullValue();
+
+    return qScriptValueFromValue(engine, qVariantFromValue(QRectF(x, y, w, h)));
+}
+
+QScriptValue QDeclarativeEnginePrivate::point(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if(ctxt->argumentCount() != 2)
+        return engine->nullValue();
+    qsreal x = ctxt->argument(0).toNumber();
+    qsreal y = ctxt->argument(1).toNumber();
+    return qScriptValueFromValue(engine, qVariantFromValue(QPointF(x, y)));
+}
+
+QScriptValue QDeclarativeEnginePrivate::size(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if(ctxt->argumentCount() != 2)
+        return engine->nullValue();
+    qsreal w = ctxt->argument(0).toNumber();
+    qsreal h = ctxt->argument(1).toNumber();
+    return qScriptValueFromValue(engine, qVariantFromValue(QSizeF(w, h)));
+}
+
+QScriptValue QDeclarativeEnginePrivate::lighter(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if(ctxt->argumentCount() != 1)
+        return engine->nullValue();
+    QVariant v = ctxt->argument(0).toVariant();
+    QColor color;
+    if (v.userType() == QVariant::Color)
+        color = v.value<QColor>();
+    else if (v.userType() == QVariant::String) {
+        bool ok;
+        color = QDeclarativeStringConverters::colorFromString(v.toString(), &ok);
+        if (!ok)
+            return engine->nullValue();
+    } else
+        return engine->nullValue();
+    color = color.lighter();
+    return qScriptValueFromValue(engine, qVariantFromValue(color));
+}
+
+QScriptValue QDeclarativeEnginePrivate::darker(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if(ctxt->argumentCount() != 1)
+        return engine->nullValue();
+    QVariant v = ctxt->argument(0).toVariant();
+    QColor color;
+    if (v.userType() == QVariant::Color)
+        color = v.value<QColor>();
+    else if (v.userType() == QVariant::String) {
+        bool ok;
+        color = QDeclarativeStringConverters::colorFromString(v.toString(), &ok);
+        if (!ok)
+            return engine->nullValue();
+    } else
+        return engine->nullValue();
+    color = color.darker();
+    return qScriptValueFromValue(engine, qVariantFromValue(color));
+}
+
+QScriptValue QDeclarativeEnginePrivate::playSound(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if (ctxt->argumentCount() != 1)
+        return engine->undefinedValue();
+
+    QUrl url(ctxt->argument(0).toString());
+
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+    if (url.isRelative()) {
+        QDeclarativeContext *context = enginePriv->getContext(ctxt);
+        if (!context)
+            return engine->undefinedValue();
+
+        url = context->resolvedUrl(url);
+    }
+
+    if (url.scheme() == QLatin1String("file")) {
+
+        QSound::play(url.toLocalFile());
+
+    }
+    return engine->undefinedValue();
+}
+
+QScriptValue QDeclarativeEnginePrivate::desktopOpenUrl(QScriptContext *ctxt, QScriptEngine *e)
+{
+    if(ctxt->argumentCount() < 1)
+        return e->newVariant(QVariant(false));
+    bool ret = QDesktopServices::openUrl(QUrl(ctxt->argument(0).toString()));
+    return e->newVariant(QVariant(ret));
+}
+
+QScriptValue QDeclarativeEnginePrivate::md5(QScriptContext *ctxt, QScriptEngine *)
+{
+    QByteArray data;
+
+    if (ctxt->argumentCount() >= 1)
+        data = ctxt->argument(0).toString().toUtf8();
+
+    QByteArray result = QCryptographicHash::hash(data, QCryptographicHash::Md5);
+
+    return QScriptValue(QLatin1String(result.toHex()));
+}
+
+QScriptValue QDeclarativeEnginePrivate::btoa(QScriptContext *ctxt, QScriptEngine *)
+{
+    QByteArray data;
+
+    if (ctxt->argumentCount() >= 1)
+        data = ctxt->argument(0).toString().toUtf8();
+
+    return QScriptValue(QLatin1String(data.toBase64()));
+}
+
+QScriptValue QDeclarativeEnginePrivate::atob(QScriptContext *ctxt, QScriptEngine *)
+{
+    QByteArray data;
+
+    if (ctxt->argumentCount() >= 1)
+        data = ctxt->argument(0).toString().toUtf8();
+
+    return QScriptValue(QLatin1String(QByteArray::fromBase64(data)));
+}
+
+QScriptValue QDeclarativeEnginePrivate::consoleLog(QScriptContext *ctxt, QScriptEngine *e)
+{
+    if(ctxt->argumentCount() < 1)
+        return e->newVariant(QVariant(false));
+
+    QByteArray msg;
+
+    for (int i=0; i<ctxt->argumentCount(); ++i) {
+        if (!msg.isEmpty()) msg += ' ';
+        msg += ctxt->argument(i).toString().toLocal8Bit();
+        // does not support firebug "%[a-z]" formatting, since firebug really
+        // does just ignore the format letter, which makes it pointless.
+    }
+
+    qDebug("%s",msg.constData());
+
+    return e->newVariant(QVariant(true));
+}
+
+void QDeclarativeEnginePrivate::sendQuit ()
+{
+    Q_Q(QDeclarativeEngine);
+    emit q->quit();
+}
+
+QScriptValue QDeclarativeEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptEngine *e)
+{
+    QDeclarativeEnginePrivate *qe = get (e);
+    qe->sendQuit ();
+    return QScriptValue();
+}
+
+QScriptValue QDeclarativeEnginePrivate::closestAngle(QScriptContext *ctxt, QScriptEngine *e)
+{
+    if(ctxt->argumentCount() < 2)
+        return e->newVariant(QVariant(0.0));
+    qreal a = ctxt->argument(0).toNumber();
+    qreal b = ctxt->argument(1).toNumber();
+    qreal ret = b;
+    qreal diff = b-a;
+    while(diff > 180.0){
+        ret -= 360.0;
+        diff -= 360.0;
+    }
+    while(diff < -180.0){
+        ret += 360.0;
+        diff += 360.0;
+    }
+    return e->newVariant(QVariant(ret));
+}
+
+QScriptValue QDeclarativeEnginePrivate::tint(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if(ctxt->argumentCount() != 2)
+        return engine->nullValue();
+    //get color
+    QVariant v = ctxt->argument(0).toVariant();
+    QColor color;
+    if (v.userType() == QVariant::Color)
+        color = v.value<QColor>();
+    else if (v.userType() == QVariant::String) {
+        bool ok;
+        color = QDeclarativeStringConverters::colorFromString(v.toString(), &ok);
+        if (!ok)
+            return engine->nullValue();
+    } else
+        return engine->nullValue();
+
+    //get tint color
+    v = ctxt->argument(1).toVariant();
+    QColor tintColor;
+    if (v.userType() == QVariant::Color)
+        tintColor = v.value<QColor>();
+    else if (v.userType() == QVariant::String) {
+        bool ok;
+        tintColor = QDeclarativeStringConverters::colorFromString(v.toString(), &ok);
+        if (!ok)
+            return engine->nullValue();
+    } else
+        return engine->nullValue();
+
+    //tint
+    QColor finalColor;
+    int a = tintColor.alpha();
+    if (a == 0xFF)
+        finalColor = tintColor;
+    else if (a == 0x00)
+        finalColor = color;
+    else {
+        uint src = tintColor.rgba();
+        uint dest = color.rgba();
+
+        uint res = (((a * (src & 0xFF00FF)) +
+                    ((0xFF - a) * (dest & 0xFF00FF))) >> 8) & 0xFF00FF;
+        res |= (((a * ((src >> 8) & 0xFF00FF)) +
+                ((0xFF - a) * ((dest >> 8) & 0xFF00FF)))) & 0xFF00FF00;
+        if ((src & 0xFF000000) == 0xFF000000)
+            res |= 0xFF000000;
+
+        finalColor = QColor::fromRgba(res);
+    }
+
+    return qScriptValueFromValue(engine, qVariantFromValue(finalColor));
+}
+
+
+QScriptValue QDeclarativeEnginePrivate::scriptValueFromVariant(const QVariant &val)
+{
+    if (val.userType() == qMetaTypeId<QDeclarativeListReference>()) {
+        QDeclarativeListReferencePrivate *p = QDeclarativeListReferencePrivate::get((QDeclarativeListReference*)val.constData());
+        if (p->object) {
+            return listClass->newList(p->property, p->propertyType);
+        } else {
+            return scriptEngine.nullValue();
+        }
+    }
+
+    bool objOk;
+    QObject *obj = QDeclarativeMetaType::toQObject(val, &objOk);
+    if (objOk) {
+        return objectClass->newQObject(obj);
+    } else {
+        return qScriptValueFromValue(&scriptEngine, val);
+    }
+}
+
+QVariant QDeclarativeEnginePrivate::scriptValueToVariant(const QScriptValue &val)
+{
+    QScriptDeclarativeClass *dc = QScriptDeclarativeClass::scriptClass(val);
+    if (dc == objectClass)
+        return QVariant::fromValue(objectClass->toQObject(val));
+    else if (dc == contextClass)
+        return QVariant();
+
+    QScriptDeclarativeClass *sc = QScriptDeclarativeClass::scriptClass(val);
+    if (!sc) {
+        return val.toVariant();
+    } else if (sc == valueTypeClass) {
+        return valueTypeClass->toVariant(val);
+    } else {
+        return QVariant();
+    }
+}
+
+QDeclarativeScriptClass::QDeclarativeScriptClass(QScriptEngine *engine)
+: QScriptDeclarativeClass(engine)
+{
+}
+
+QVariant QDeclarativeScriptClass::toVariant(QDeclarativeEngine *engine, const QScriptValue &val)
+{
+    QDeclarativeEnginePrivate *ep =
+        static_cast<QDeclarativeEnginePrivate *>(QObjectPrivate::get(engine));
+
+    return ep->scriptValueToVariant(val);
+}
+
+// XXX this beyonds in QUrl::toLocalFile()
+static QString toLocalFileOrQrc(const QUrl& url)
+{
+    QString r = url.toLocalFile();
+    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
+        r = QLatin1Char(':') + url.path();
+    return r;
+}
+
+/////////////////////////////////////////////////////////////
+struct QDeclarativeEnginePrivate::ImportedNamespace {
+    QStringList uris;
+    QStringList urls;
+    QList<int> majversions;
+    QList<int> minversions;
+    QList<bool> isLibrary;
+    QList<QString> qmlDirContent;
+
+    bool find(const QByteArray& type, int *vmajor, int *vminor, QDeclarativeType** type_return, QUrl* url_return) const
+    {
+        for (int i=0; i<urls.count(); ++i) {
+            int vmaj = majversions.at(i);
+            int vmin = minversions.at(i);
+
+            QByteArray qt = uris.at(i).toUtf8();
+            qt += '/';
+            qt += type;
+
+            if (qmlImportTrace())
+                qDebug() << "Look in" << qt;
+            QDeclarativeType *t = QDeclarativeMetaType::qmlType(qt,vmaj,vmin);
+            if (t) {
+                if (vmajor) *vmajor = vmaj;
+                if (vminor) *vminor = vmin;
+                if (qmlImportTrace())
+                    qDebug() << "Found" << qt;
+                if (type_return)
+                    *type_return = t;
+                return true;
+            }
+
+            QUrl url = QUrl(urls.at(i) + QLatin1Char('/') + QString::fromUtf8(type) + QLatin1String(".qml"));
+            QString qmldircontent = qmlDirContent.at(i);
+            if (vmaj>=0 || !qmldircontent.isEmpty()) {
+                // Check version file - XXX cache these in QDeclarativeEngine!
+                if (qmldircontent.isEmpty()) {
+                    QFile qmldir(toLocalFileOrQrc(QUrl(urls.at(i)+QLatin1String("/qmldir"))));
+                    if (qmldir.open(QIODevice::ReadOnly)) {
+                        qmldircontent = QString::fromUtf8(qmldir.readAll());
+                    }
+                }
+
+                const QString typeName = QString::fromUtf8(type);
+
+                QDeclarativeDirParser qmldirParser;
+                qmldirParser.setUrl(url);
+                qmldirParser.setSource(qmldircontent);
+                qmldirParser.parse();
+
+                foreach (const QDeclarativeDirParser::Component &c, qmldirParser.components()) { // ### TODO: cache the components
+                    if (c.majorVersion < vmaj || (c.majorVersion == vmaj && vmin >= c.minorVersion)) {
+                        if (c.typeName == typeName) {
+                            if (url_return)
+                                *url_return = url.resolved(QUrl(c.fileName));
+
+                            return true;
+                        }
+                    }
+                }
+
+            } else {
+                // XXX search non-files too! (eg. zip files, see QT-524)
+                QFileInfo f(toLocalFileOrQrc(url));
+                if (f.exists()) {
+                    if (url_return)
+                        *url_return = url;
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+};
+
+class QDeclarativeImportsPrivate {
+public:
+    QDeclarativeImportsPrivate() : ref(1)
+    {
+    }
+
+    ~QDeclarativeImportsPrivate()
+    {
+        foreach (QDeclarativeEnginePrivate::ImportedNamespace* s, set.values())
+            delete s;
+    }
+
+    QSet<QString> qmlDirFilesForWhichPluginsHaveBeenLoaded;
+
+    bool add(const QUrl& base, const QString& qmldircontent, const QString& uri, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType, const QStringList& importPath, QDeclarativeEngine *engine)
+    {
+        QDeclarativeEnginePrivate::ImportedNamespace *s;
+        if (prefix.isEmpty()) {
+            s = &unqualifiedset;
+        } else {
+            s = set.value(prefix);
+            if (!s)
+                set.insert(prefix,(s=new QDeclarativeEnginePrivate::ImportedNamespace));
+        }
+        QString url = uri;
+        if (importType == QDeclarativeScriptParser::Import::Library) {
+            url.replace(QLatin1Char('.'), QLatin1Char('/'));
+            bool found = false;
+            QString content;
+            QString dir;            
+
+            // user import paths
+            QStringList paths;
+
+            // base..
+            paths += QFileInfo(base.toLocalFile()).path();
+            paths += importPath;
+            paths += QDeclarativeEnginePrivate::get(engine)->environmentImportPath;
+
+            foreach (const QString &p, paths) {
+                dir = p+QLatin1Char('/')+url;
+                QFileInfo fi(dir+QLatin1String("/qmldir"));
+                const QString absoluteFilePath = fi.absoluteFilePath();
+
+                if (fi.isFile()) {
+                    found = true;
+
+                    url = QUrl::fromLocalFile(fi.absolutePath()).toString();
+
+                    QFile file(absoluteFilePath);
+                    if (file.open(QFile::ReadOnly))
+                        content = QString::fromUtf8(file.readAll());
+
+                    if (! qmlDirFilesForWhichPluginsHaveBeenLoaded.contains(absoluteFilePath)) {
+                        qmlDirFilesForWhichPluginsHaveBeenLoaded.insert(absoluteFilePath);
+
+                        QDeclarativeDirParser qmldirParser;
+                        qmldirParser.setSource(content);
+                        qmldirParser.parse();
+
+                        foreach (const QDeclarativeDirParser::Plugin &plugin, qmldirParser.plugins()) {
+                            QString resolvedFilePath = QDeclarativeEnginePrivate::get(engine)->resolvePlugin(dir + QDir::separator() + plugin.path,
+                                                                                                    plugin.name);
+
+                            if (!resolvedFilePath.isEmpty())
+                                engine->importExtension(resolvedFilePath, uri);
+                        }
+                    }
+
+                    break;
+                }
+            }
+
+        } else {
+            url = base.resolved(QUrl(url)).toString();
+        }
+
+        s->uris.prepend(uri);
+        s->urls.prepend(url);
+        s->majversions.prepend(vmaj);
+        s->minversions.prepend(vmin);
+        s->isLibrary.prepend(importType == QDeclarativeScriptParser::Import::Library);
+        s->qmlDirContent.prepend(qmldircontent);
+        return true;
+    }
+
+    bool find(const QByteArray& type, int *vmajor, int *vminor, QDeclarativeType** type_return, QUrl* url_return)
+    {
+        QDeclarativeEnginePrivate::ImportedNamespace *s = 0;
+        int slash = type.indexOf('/');
+        if (slash >= 0) {
+            s = set.value(QString::fromUtf8(type.left(slash)));
+            if (!s)
+                return false; // qualifier must be a namespace
+            int nslash = type.indexOf('/',slash+1);
+            if (nslash > 0)
+                return false; // only single qualification allowed
+        } else {
+            s = &unqualifiedset;
+        }
+        QByteArray unqualifiedtype = slash < 0 ? type : type.mid(slash+1); // common-case opt (QString::mid works fine, but slower)
+        if (s) {
+            if (s->find(unqualifiedtype,vmajor,vminor,type_return,url_return))
+                return true;
+            if (s->urls.count() == 1 && !s->isLibrary[0] && url_return) {
+                *url_return = QUrl(s->urls[0]+QLatin1Char('/')).resolved(QUrl(QString::fromUtf8(unqualifiedtype) + QLatin1String(".qml")));
+                return true;
+            }
+
+        }
+        if (url_return) {
+            *url_return = base.resolved(QUrl(QString::fromUtf8(type + ".qml")));
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    QDeclarativeEnginePrivate::ImportedNamespace *findNamespace(const QString& type)
+    {
+        return set.value(type);
+    }
+
+    QUrl base;
+    int ref;
+
+private:
+    friend struct QDeclarativeEnginePrivate::Imports;
+    QDeclarativeEnginePrivate::ImportedNamespace unqualifiedset;
+    QHash<QString,QDeclarativeEnginePrivate::ImportedNamespace* > set;
+};
+
+QDeclarativeEnginePrivate::Imports::Imports(const Imports &copy) :
+    d(copy.d)
+{
+    ++d->ref;
+}
+
+QDeclarativeEnginePrivate::Imports &QDeclarativeEnginePrivate::Imports::operator =(const Imports &copy)
+{
+    ++copy.d->ref;
+    if (--d->ref == 0)
+        delete d;
+    d = copy.d;
+    return *this;
+}
+
+QDeclarativeEnginePrivate::Imports::Imports() :
+    d(new QDeclarativeImportsPrivate)
+{
+}
+
+QDeclarativeEnginePrivate::Imports::~Imports()
+{
+    if (--d->ref == 0)
+        delete d;
+}
+
+#include "qdeclarativemetatype.h"
+#include "qdeclarativetypenamecache_p.h"
+
+static QDeclarativeTypeNameCache *cacheForNamespace(QDeclarativeEngine *engine, const QDeclarativeEnginePrivate::ImportedNamespace &set, QDeclarativeTypeNameCache *cache)
+{
+    if (!cache)
+        cache = new QDeclarativeTypeNameCache(engine);
+
+    QList<QDeclarativeType *> types = QDeclarativeMetaType::qmlTypes();
+
+    for (int ii = 0; ii < set.uris.count(); ++ii) {
+        QByteArray base = set.uris.at(ii).toUtf8() + '/';
+        int major = set.majversions.at(ii);
+        int minor = set.minversions.at(ii);
+
+        foreach (QDeclarativeType *type, types) {
+            if (type->qmlTypeName().startsWith(base) && 
+                type->qmlTypeName().lastIndexOf('/') == (base.length() - 1) && 
+                type->availableInVersion(major,minor))
+            {
+                QString name = QString::fromUtf8(type->qmlTypeName().mid(base.length()));
+
+                cache->add(name, type);
+            }
+        }
+    }
+
+    return cache;
+}
+
+QDeclarativeTypeNameCache *QDeclarativeEnginePrivate::Imports::cache(QDeclarativeEngine *engine) const
+{
+    const QDeclarativeEnginePrivate::ImportedNamespace &set = d->unqualifiedset;
+
+    QDeclarativeTypeNameCache *cache = new QDeclarativeTypeNameCache(engine);
+
+    for (QHash<QString,QDeclarativeEnginePrivate::ImportedNamespace* >::ConstIterator iter = d->set.begin();
+         iter != d->set.end(); ++iter) {
+
+        QDeclarativeTypeNameCache::Data *d = cache->data(iter.key());
+        if (d) {
+            if (!d->typeNamespace)
+                cacheForNamespace(engine, *(*iter), d->typeNamespace);
+        } else {
+            QDeclarativeTypeNameCache *nc = cacheForNamespace(engine, *(*iter), 0);
+            cache->add(iter.key(), nc);
+            nc->release();
+        }
+    }
+
+    cacheForNamespace(engine, set, cache);
+
+    return cache;
+}
+
+/*
+QStringList QDeclarativeEnginePrivate::Imports::unqualifiedSet() const
+{
+    QStringList rv;
+
+    const QDeclarativeEnginePrivate::ImportedNamespace &set = d->unqualifiedset;
+
+    for (int ii = 0; ii < set.urls.count(); ++ii) {
+        if (set.isBuiltin.at(ii))
+            rv << set.urls.at(ii);
+    }
+
+    return rv;
+}
+*/
+
+/*!
+  Sets the base URL to be used for all relative file imports added.
+*/
+void QDeclarativeEnginePrivate::Imports::setBaseUrl(const QUrl& url)
+{
+    d->base = url;
+}
+
+/*!
+  Returns the base URL to be used for all relative file imports added.
+*/
+QUrl QDeclarativeEnginePrivate::Imports::baseUrl() const
+{
+    return d->base;
+}
+
+/*!
+  Adds \a path as a directory where installed QML components are
+  defined in a URL-based directory structure.
+
+  For example, if you add \c /opt/MyApp/lib/qml and then load QML
+  that imports \c com.mycompany.Feature, then QDeclarativeEngine will look
+  in \c /opt/MyApp/lib/qml/com/mycompany/Feature/ for the components
+  provided by that module (and in the case of versioned imports,
+  for the \c qmldir file definiting the type version mapping.
+
+  By default, only the "qml" subdirectory of QLibraryInfo::location(QLibraryInfo::DataPath)
+  is included on the import path.
+*/
+void QDeclarativeEngine::addImportPath(const QString& path)
+{
+    if (qmlImportTrace())
+        qDebug() << "QDeclarativeEngine::addImportPath" << path;
+    Q_D(QDeclarativeEngine);
+    d->fileImportPath.prepend(path);
+}
+
+/*!
+  Imports the given \a extension into this QDeclarativeEngine.  Returns
+  true if the extension was successfully imported.
+
+  \sa QDeclarativeExtensionInterface
+*/
+bool QDeclarativeEngine::importExtension(const QString &fileName, const QString &uri)
+{
+    QPluginLoader loader(fileName);
+
+    if (QDeclarativeExtensionInterface *iface = qobject_cast<QDeclarativeExtensionInterface *>(loader.instance())) {
+        iface->initialize(this, uri.toUtf8().constData());
+        return true;
+    }
+
+    return false;
+}
+
+/*!
+  \property QDeclarativeEngine::offlineStoragePath
+  \brief the directory for storing offline user data
+
+  Returns the directory where SQL and other offline
+  storage is placed.
+
+  QDeclarativeWebView and the SQL databases created with openDatabase()
+  are stored here.
+
+  The default is QML/OfflineStorage in the platform-standard
+  user application data directory.
+
+  Note that the path may not currently exist on the filesystem, so
+  callers wanting to \e create new files at this location should create
+  it first - see QDir::mkpath().
+*/
+void QDeclarativeEngine::setOfflineStoragePath(const QString& dir)
+{
+    Q_D(QDeclarativeEngine);
+    d->scriptEngine.offlineStoragePath = dir;
+}
+
+QString QDeclarativeEngine::offlineStoragePath() const
+{
+    Q_D(const QDeclarativeEngine);
+    return d->scriptEngine.offlineStoragePath;
+}
+
+/*!
+  \internal
+
+  Returns the result of the merge of \a baseName with \a dir, \a suffixes, and \a prefix.
+ */
+QString QDeclarativeEnginePrivate::resolvePlugin(const QDir &dir, const QString &baseName,
+                                        const QStringList &suffixes,
+                                        const QString &prefix)
+{
+    foreach (const QString &suffix, suffixes) {
+        QString pluginFileName = prefix;
+
+        pluginFileName += baseName;
+        pluginFileName += QLatin1Char('.');
+        pluginFileName += suffix;
+
+        QFileInfo fileInfo(dir, pluginFileName);
+
+        if (fileInfo.exists())
+            return fileInfo.absoluteFilePath();
+    }
+
+    return QString();
+}
+
+/*!
+  \internal
+
+  Returns the result of the merge of \a baseName with \a dir and the platform suffix.
+
+  \table
+  \header \i Platform \i Valid suffixes
+  \row \i Windows     \i \c .dll
+  \row \i Unix/Linux  \i \c .so
+  \row \i AIX  \i \c .a
+  \row \i HP-UX       \i \c .sl, \c .so (HP-UXi)
+  \row \i Mac OS X    \i \c .dylib, \c .bundle, \c .so
+  \row \i Symbian     \i \c .dll
+  \endtable
+
+  Version number on unix are ignored.
+*/
+QString QDeclarativeEnginePrivate::resolvePlugin(const QDir &dir, const QString &baseName)
+{
+#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+    return resolvePlugin(dir, baseName, QStringList(QLatin1String("dll")));
+#elif defined(Q_OS_SYMBIAN)
+    return resolvePlugin(dir, baseName, QStringList() << QLatin1String("dll") << QLatin1String("qtplugin"));
+#else
+
+# if defined(Q_OS_DARWIN)
+
+    return resolvePlugin(dir, baseName, QStringList() << QLatin1String("dylib") << QLatin1String("so") << QLatin1String("bundle"),
+                         QLatin1String("lib"));
+# else  // Generic Unix
+    QStringList validSuffixList;
+
+#  if defined(Q_OS_HPUX)
+/*
+    See "HP-UX Linker and Libraries User's Guide", section "Link-time Differences between PA-RISC and IPF":
+    "In PA-RISC (PA-32 and PA-64) shared libraries are suffixed with .sl. In IPF (32-bit and 64-bit),
+    the shared libraries are suffixed with .so. For compatibility, the IPF linker also supports the .sl suffix."
+ */
+    validSuffixList << QLatin1String("sl");
+#   if defined __ia64
+    validSuffixList << QLatin1String("so");
+#   endif
+#  elif defined(Q_OS_AIX)
+    validSuffixList << QLatin1String("a") << QLatin1String("so");
+#  elif defined(Q_OS_UNIX)
+    validSuffixList << QLatin1String("so");
+#  endif
+
+    // Examples of valid library names:
+    //  libfoo.so
+
+    return resolvePlugin(dir, baseName, validSuffixList, QLatin1String("lib"));
+# endif
+
+#endif
+}
+
+/*!
+  \internal
+
+  Adds information to \a imports such that subsequent calls to resolveType()
+  will resolve types qualified by \a prefix by considering types found at the given \a uri.
+
+  The uri is either a directory (if importType is FileImport), or a URI resolved using paths
+  added via addImportPath() (if importType is LibraryImport).
+
+  The \a prefix may be empty, in which case the import location is considered for
+  unqualified types.
+
+  The base URL must already have been set with Import::setBaseUrl().
+*/
+bool QDeclarativeEnginePrivate::addToImport(Imports* imports, const QString& qmldircontent, const QString& uri, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType) const
+{
+    QDeclarativeEngine *engine = QDeclarativeEnginePrivate::get(const_cast<QDeclarativeEnginePrivate *>(this));
+    bool ok = imports->d->add(imports->d->base,qmldircontent,uri,prefix,vmaj,vmin,importType,fileImportPath, engine);
+    if (qmlImportTrace())
+        qDebug() << "QDeclarativeEngine::addToImport(" << imports << uri << prefix << vmaj << '.' << vmin << (importType==QDeclarativeScriptParser::Import::Library? "Library" : "File") << ": " << ok;
+    return ok;
+}
+
+/*!
+  \internal
+
+  Using the given \a imports, the given (namespace qualified) \a type is resolved to either
+  an ImportedNamespace stored at \a ns_return,
+  a QDeclarativeType stored at \a type_return, or
+  a component located at \a url_return.
+
+  If any return pointer is 0, the corresponding search is not done.
+
+  \sa addToImport()
+*/
+bool QDeclarativeEnginePrivate::resolveType(const Imports& imports, const QByteArray& type, QDeclarativeType** type_return, QUrl* url_return, int *vmaj, int *vmin, ImportedNamespace** ns_return) const
+{
+    ImportedNamespace* ns = imports.d->findNamespace(QString::fromUtf8(type));
+    if (ns) {
+        if (qmlImportTrace())
+            qDebug() << "QDeclarativeEngine::resolveType" << type << "is namespace for" << ns->urls;
+        if (ns_return)
+            *ns_return = ns;
+        return true;
+    }
+    if (type_return || url_return) {
+        if (imports.d->find(type,vmaj,vmin,type_return,url_return)) {
+            if (qmlImportTrace()) {
+                if (type_return && *type_return)
+                    qDebug() << "QDeclarativeEngine::resolveType" << type << '=' << (*type_return)->typeName();
+                if (url_return)
+                    qDebug() << "QDeclarativeEngine::resolveType" << type << '=' << *url_return;
+            }
+            return true;
+        }
+        if (qmlImportTrace())
+            qDebug() << "QDeclarativeEngine::resolveType" << type << "not found";
+    }
+    return false;
+}
+
+/*!
+  \internal
+
+  Searching \e only in the namespace \a ns (previously returned in a call to
+  resolveType(), \a type is found and returned to either
+  a QDeclarativeType stored at \a type_return, or
+  a component located at \a url_return.
+
+  If either return pointer is 0, the corresponding search is not done.
+*/
+void QDeclarativeEnginePrivate::resolveTypeInNamespace(ImportedNamespace* ns, const QByteArray& type, QDeclarativeType** type_return, QUrl* url_return, int *vmaj, int *vmin ) const
+{
+    ns->find(type,vmaj,vmin,type_return,url_return);
+}
+
+static void voidptr_destructor(void *v)
+{
+    void **ptr = (void **)v;
+    delete ptr;
+}
+
+static void *voidptr_constructor(const void *v)
+{
+    if (!v) {
+        return new void*;
+    } else {
+        return new void*(*(void **)v);
+    }
+}
+
+void QDeclarativeEnginePrivate::registerCompositeType(QDeclarativeCompiledData *data)
+{
+    QByteArray name = data->root->className();
+
+    QByteArray ptr = name + '*';
+    QByteArray lst = "QDeclarativeListProperty<" + name + ">";
+
+    int ptr_type = QMetaType::registerType(ptr.constData(), voidptr_destructor,
+                                           voidptr_constructor);
+    int lst_type = QMetaType::registerType(lst.constData(), voidptr_destructor,
+                                           voidptr_constructor);
+
+    m_qmlLists.insert(lst_type, ptr_type);
+    m_compositeTypes.insert(ptr_type, data);
+    data->addref();
+}
+
+bool QDeclarativeEnginePrivate::isList(int t) const
+{
+    return m_qmlLists.contains(t) || QDeclarativeMetaType::isList(t);
+}
+
+int QDeclarativeEnginePrivate::listType(int t) const
+{
+    QHash<int, int>::ConstIterator iter = m_qmlLists.find(t);
+    if (iter != m_qmlLists.end())
+        return *iter;
+    else
+        return QDeclarativeMetaType::listType(t);
+}
+
+bool QDeclarativeEnginePrivate::isQObject(int t)
+{
+    return m_compositeTypes.contains(t) || QDeclarativeMetaType::isQObject(t);
+}
+
+QObject *QDeclarativeEnginePrivate::toQObject(const QVariant &v, bool *ok) const
+{
+    int t = v.userType();
+    if (m_compositeTypes.contains(t)) {
+        if (ok) *ok = true;
+        return *(QObject **)(v.constData());
+    } else {
+        return QDeclarativeMetaType::toQObject(v, ok);
+    }
+}
+
+QDeclarativeMetaType::TypeCategory QDeclarativeEnginePrivate::typeCategory(int t) const
+{
+    if (m_compositeTypes.contains(t))
+        return QDeclarativeMetaType::Object;
+    else if (m_qmlLists.contains(t))
+        return QDeclarativeMetaType::List;
+    else
+        return QDeclarativeMetaType::typeCategory(t);
+}
+
+const QMetaObject *QDeclarativeEnginePrivate::rawMetaObjectForType(int t) const
+{
+    QHash<int, QDeclarativeCompiledData*>::ConstIterator iter = m_compositeTypes.find(t);
+    if (iter != m_compositeTypes.end()) {
+        return (*iter)->root;
+    } else {
+        QDeclarativeType *type = QDeclarativeMetaType::qmlType(t);
+        return type?type->baseMetaObject():0;
+    }
+}
+
+const QMetaObject *QDeclarativeEnginePrivate::metaObjectForType(int t) const
+{
+    QHash<int, QDeclarativeCompiledData*>::ConstIterator iter = m_compositeTypes.find(t);
+    if (iter != m_compositeTypes.end()) {
+        return (*iter)->root;
+    } else {
+        QDeclarativeType *type = QDeclarativeMetaType::qmlType(t);
+        return type?type->metaObject():0;
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h
new file mode 100644
index 0000000..fd66358
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeengine.h
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEENGINE_H
+#define QDECLARATIVEENGINE_H
+
+#include <QtCore/qurl.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qmap.h>
+#include <QtScript/qscriptvalue.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeComponent;
+class QDeclarativeEnginePrivate;
+class QDeclarativeImportsPrivate;
+class QDeclarativeExpression;
+class QDeclarativeContext;
+class QDeclarativeType;
+class QUrl;
+class QScriptEngine;
+class QScriptContext;
+class QDeclarativeImageProvider;
+class QNetworkAccessManager;
+class QDeclarativeNetworkAccessManagerFactory;
+class Q_DECLARATIVE_EXPORT QDeclarativeEngine : public QObject
+{
+    Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath)
+    Q_OBJECT
+public:
+    QDeclarativeEngine(QObject *p = 0);
+    virtual ~QDeclarativeEngine();
+
+    QDeclarativeContext *rootContext();
+
+    void clearComponentCache();
+
+    void addImportPath(const QString& dir);
+    bool importExtension(const QString &fileName, const QString &uri);
+
+    void setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory *);
+    QDeclarativeNetworkAccessManagerFactory *networkAccessManagerFactory() const;
+
+    QNetworkAccessManager *networkAccessManager() const;
+
+    void addImageProvider(const QString &id, QDeclarativeImageProvider *);
+    QDeclarativeImageProvider *imageProvider(const QString &id) const;
+    void removeImageProvider(const QString &id);
+
+    void setOfflineStoragePath(const QString& dir);
+    QString offlineStoragePath() const;
+
+    QUrl baseUrl() const;
+    void setBaseUrl(const QUrl &);
+
+    static QDeclarativeContext *contextForObject(const QObject *);
+    static void setContextForObject(QObject *, QDeclarativeContext *);
+
+Q_SIGNALS:
+    void quit ();
+
+private:
+    Q_DECLARE_PRIVATE(QDeclarativeEngine)
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEENGINE_H
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
new file mode 100644
index 0000000..7c9d833
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -0,0 +1,340 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEENGINE_P_H
+#define QDECLARATIVEENGINE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeengine.h"
+
+#include "qdeclarativeclassfactory_p.h"
+#include "qdeclarativecompositetypemanager_p.h"
+#include "qpodvector_p.h"
+#include "qdeclarative.h"
+#include "qdeclarativevaluetype_p.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativeexpression.h"
+#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativeobjectscriptclass_p.h"
+#include "qdeclarativecontextscriptclass_p.h"
+#include "qdeclarativevaluetypescriptclass_p.h"
+
+#include <QtScript/QScriptClass>
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptString>
+#include <QtCore/qstring.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qstack.h>
+#include <QtCore/qmutex.h>
+#include <QtScript/qscriptengine.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeContext;
+class QDeclarativeEngine;
+class QDeclarativeContextPrivate;
+class QDeclarativeExpression;
+class QDeclarativeContextScriptClass;
+class QDeclarativeObjectScriptClass;
+class QDeclarativeTypeNameScriptClass;
+class QDeclarativeValueTypeScriptClass;
+class QScriptEngineDebugger;
+class QNetworkReply;
+class QNetworkAccessManager;
+class QDeclarativeNetworkAccessManagerFactory;
+class QDeclarativeAbstractBinding;
+class QScriptDeclarativeClass;
+class QDeclarativeTypeNameScriptClass;
+class QDeclarativeTypeNameCache;
+class QDeclarativeComponentAttached;
+class QDeclarativeListScriptClass;
+class QDeclarativeCleanup;
+class QDeclarativeDelayedError;
+class QDeclarativeWorkerScriptEngine;
+class QDeclarativeGlobalScriptClass;
+class QDir;
+
+class QDeclarativeScriptEngine : public QScriptEngine
+{
+public:
+    QDeclarativeScriptEngine(QDeclarativeEnginePrivate *priv);
+    virtual ~QDeclarativeScriptEngine();
+
+    QUrl resolvedUrl(QScriptContext *context, const QUrl& url); // resolved against p's context, or baseUrl if no p
+    static QScriptValue resolvedUrl(QScriptContext *ctxt, QScriptEngine *engine);
+
+    static QDeclarativeScriptEngine *get(QScriptEngine* e) { return static_cast<QDeclarativeScriptEngine*>(e); }
+
+    QDeclarativeEnginePrivate *p;
+
+    // User by SQL API
+    QScriptClass *sqlQueryClass;
+    QString offlineStoragePath;
+
+    // Used by DOM Core 3 API
+    QScriptClass *namedNodeMapClass;
+    QScriptClass *nodeListClass;
+
+    QUrl baseUrl;
+
+    virtual QNetworkAccessManager *networkAccessManager();
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeEnginePrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeEngine)
+public:
+    QDeclarativeEnginePrivate(QDeclarativeEngine *);
+    ~QDeclarativeEnginePrivate();
+
+    void init();
+
+    struct CapturedProperty {
+        CapturedProperty(QObject *o, int c, int n)
+            : object(o), coreIndex(c), notifyIndex(n) {}
+
+        QObject *object;
+        int coreIndex;
+        int notifyIndex;
+    };
+    bool captureProperties;
+    QPODVector<CapturedProperty> capturedProperties;
+
+    QDeclarativeContext *rootContext;
+    QDeclarativeExpression *currentExpression;
+    bool isDebugging;
+
+    struct ImportedNamespace;
+    QDeclarativeContextScriptClass *contextClass;
+    QDeclarativeContext *sharedContext;
+    QObject *sharedScope;
+    QDeclarativeObjectScriptClass *objectClass;
+    QDeclarativeValueTypeScriptClass *valueTypeClass;
+    QDeclarativeTypeNameScriptClass *typeNameClass;
+    QDeclarativeListScriptClass *listClass;
+    // Global script class
+    QDeclarativeGlobalScriptClass *globalClass;
+
+    // Registered cleanup handlers
+    QDeclarativeCleanup *cleanup;
+
+    // Bindings that have had errors during startup
+    QDeclarativeDelayedError *erroredBindings;
+    int inProgressCreations;
+
+    QDeclarativeScriptEngine scriptEngine;
+
+    QDeclarativeWorkerScriptEngine *getWorkerScriptEngine();
+    QDeclarativeWorkerScriptEngine *workerScriptEngine;
+
+    QUrl baseUrl;
+
+    template<class T>
+    struct SimpleList {
+        SimpleList()
+            : count(0), values(0) {}
+        SimpleList(int r)
+            : count(0), values(new T*[r]) {}
+
+        int count;
+        T **values;
+
+        void append(T *v) {
+            values[count++] = v;
+        }
+
+        T *at(int idx) const {
+            return values[idx];
+        }
+
+        void clear() {
+            delete [] values;
+        }
+    };
+
+    static void clear(SimpleList<QDeclarativeAbstractBinding> &);
+    static void clear(SimpleList<QDeclarativeParserStatus> &);
+
+    QList<SimpleList<QDeclarativeAbstractBinding> > bindValues;
+    QList<SimpleList<QDeclarativeParserStatus> > parserStatus;
+    QDeclarativeComponentAttached *componentAttacheds;
+
+    bool inBeginCreate;
+
+    QNetworkAccessManager *createNetworkAccessManager(QObject *parent) const;
+    QNetworkAccessManager *getNetworkAccessManager() const;
+    mutable QNetworkAccessManager *networkAccessManager;
+    mutable QDeclarativeNetworkAccessManagerFactory *networkAccessManagerFactory;
+
+    QHash<QString,QDeclarativeImageProvider*> imageProviders;
+    QImage getImageFromProvider(const QUrl &url);
+
+    mutable QMutex mutex;
+
+    QDeclarativeCompositeTypeManager typeManager;
+    QStringList fileImportPath;
+    QString offlineStoragePath;
+
+    mutable quint32 uniqueId;
+    quint32 getUniqueId() const {
+        return uniqueId++;
+    }
+
+    QDeclarativeValueTypeFactory valueTypes;
+
+    QHash<const QMetaObject *, QDeclarativePropertyCache *> propertyCache;
+    QDeclarativePropertyCache *cache(QObject *obj) { 
+        Q_Q(QDeclarativeEngine);
+        if (!obj || QObjectPrivate::get(obj)->metaObject) return 0;
+        const QMetaObject *mo = obj->metaObject();
+        QDeclarativePropertyCache *rv = propertyCache.value(mo);
+        if (!rv) {
+            rv = QDeclarativePropertyCache::create(q, mo);
+            propertyCache.insert(mo, rv);
+        }
+        return rv;
+    }
+
+    // ### This whole class is embarrassing
+    struct Imports {
+        Imports();
+        ~Imports();
+        Imports(const Imports &copy);
+        Imports &operator =(const Imports &copy);
+
+        void setBaseUrl(const QUrl& url);
+        QUrl baseUrl() const;
+
+        QDeclarativeTypeNameCache *cache(QDeclarativeEngine *) const;
+
+    private:
+        friend class QDeclarativeEnginePrivate;
+        QDeclarativeImportsPrivate *d;
+    };
+
+
+    QStringList environmentImportPath;
+
+    QString resolvePlugin(const QDir &dir, const QString &baseName,
+                          const QStringList &suffixes,
+                          const QString &prefix = QString());
+    QString resolvePlugin(const QDir &dir, const QString &baseName);
+
+
+    bool addToImport(Imports*, const QString& qmlDirContent,const QString& uri, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType) const;
+    bool resolveType(const Imports&, const QByteArray& type,
+                     QDeclarativeType** type_return, QUrl* url_return,
+                     int *version_major, int *version_minor,
+                     ImportedNamespace** ns_return) const;
+    void resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type,
+                                QDeclarativeType** type_return, QUrl* url_return,
+                                int *version_major, int *version_minor ) const;
+
+
+    void registerCompositeType(QDeclarativeCompiledData *);
+
+    bool isQObject(int);
+    QObject *toQObject(const QVariant &, bool *ok = 0) const;
+    QDeclarativeMetaType::TypeCategory typeCategory(int) const;
+    bool isList(int) const;
+    int listType(int) const;
+    const QMetaObject *rawMetaObjectForType(int) const;
+    const QMetaObject *metaObjectForType(int) const;
+    QHash<int, int> m_qmlLists;
+    QHash<int, QDeclarativeCompiledData *> m_compositeTypes;
+
+    QScriptValue scriptValueFromVariant(const QVariant &);
+    QVariant scriptValueToVariant(const QScriptValue &);
+
+    void sendQuit ();
+
+    static QScriptValue qmlScriptObject(QObject*, QDeclarativeEngine*);
+
+    static QScriptValue createComponent(QScriptContext*, QScriptEngine*);
+    static QScriptValue createQmlObject(QScriptContext*, QScriptEngine*);
+    static QScriptValue vector(QScriptContext*, QScriptEngine*);
+    static QScriptValue rgba(QScriptContext*, QScriptEngine*);
+    static QScriptValue hsla(QScriptContext*, QScriptEngine*);
+    static QScriptValue point(QScriptContext*, QScriptEngine*);
+    static QScriptValue size(QScriptContext*, QScriptEngine*);
+    static QScriptValue rect(QScriptContext*, QScriptEngine*);
+
+    static QScriptValue lighter(QScriptContext*, QScriptEngine*);
+    static QScriptValue darker(QScriptContext*, QScriptEngine*);
+    static QScriptValue tint(QScriptContext*, QScriptEngine*);
+
+    static QScriptValue closestAngle(QScriptContext*, QScriptEngine*);
+    static QScriptValue playSound(QScriptContext*, QScriptEngine*);
+    static QScriptValue desktopOpenUrl(QScriptContext*, QScriptEngine*);
+    static QScriptValue md5(QScriptContext*, QScriptEngine*);
+    static QScriptValue btoa(QScriptContext*, QScriptEngine*);
+    static QScriptValue atob(QScriptContext*, QScriptEngine*);
+    static QScriptValue consoleLog(QScriptContext*, QScriptEngine*);
+    static QScriptValue quit(QScriptContext*, QScriptEngine*);
+
+    static QScriptEngine *getScriptEngine(QDeclarativeEngine *e) { return &e->d_func()->scriptEngine; }
+    static QDeclarativeEngine *getEngine(QScriptEngine *e) { return static_cast<QDeclarativeScriptEngine*>(e)->p->q_func(); }
+    static QDeclarativeEnginePrivate *get(QDeclarativeEngine *e) { return e->d_func(); }
+    static QDeclarativeEnginePrivate *get(QDeclarativeContext *c) { return (c && c->engine()) ? QDeclarativeEnginePrivate::get(c->engine()) : 0; }
+    static QDeclarativeEnginePrivate *get(QScriptEngine *e) { return static_cast<QDeclarativeScriptEngine*>(e)->p; }
+    static QDeclarativeEngine *get(QDeclarativeEnginePrivate *p) { return p->q_func(); }
+    QDeclarativeContext *getContext(QScriptContext *);
+
+    static void defineModule();
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEENGINE_P_H
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
new file mode 100644
index 0000000..e4579a6
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -0,0 +1,456 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeenginedebug_p.h"
+
+#include "qdeclarativeboundsignal_p.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativemetatype.h"
+#include "qdeclarativemetaproperty.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativewatcher_p.h"
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qmetaobject.h>
+
+QT_BEGIN_NAMESPACE
+
+QList<QDeclarativeEngine *> QDeclarativeEngineDebugServer::m_engines;
+QDeclarativeEngineDebugServer::QDeclarativeEngineDebugServer(QObject *parent)
+: QDeclarativeDebugService(QLatin1String("QDeclarativeEngine"), parent),
+  m_watch(new QDeclarativeWatcher(this))
+{
+    QObject::connect(m_watch, SIGNAL(propertyChanged(int,int,QMetaProperty,QVariant)),
+                     this, SLOT(propertyChanged(int,int,QMetaProperty,QVariant)));
+}
+
+QDataStream &operator<<(QDataStream &ds, 
+                        const QDeclarativeEngineDebugServer::QDeclarativeObjectData &data)
+{
+    ds << data.url << data.lineNumber << data.columnNumber << data.objectName
+       << data.objectType << data.objectId << data.contextId;
+    return ds;
+}
+
+QDataStream &operator>>(QDataStream &ds, 
+                        QDeclarativeEngineDebugServer::QDeclarativeObjectData &data)
+{
+    ds >> data.url >> data.lineNumber >> data.columnNumber >> data.objectName
+       >> data.objectType >> data.objectId >> data.contextId;
+    return ds;
+}
+
+QDataStream &operator<<(QDataStream &ds, 
+                        const QDeclarativeEngineDebugServer::QDeclarativeObjectProperty &data)
+{
+    ds << (int)data.type << data.name << data.value << data.valueTypeName
+       << data.binding << data.hasNotifySignal;
+    return ds;
+}
+
+QDataStream &operator>>(QDataStream &ds,  
+                        QDeclarativeEngineDebugServer::QDeclarativeObjectProperty &data)
+{
+    int type;
+    ds >> type >> data.name >> data.value >> data.valueTypeName
+       >> data.binding >> data.hasNotifySignal;
+    data.type = (QDeclarativeEngineDebugServer::QDeclarativeObjectProperty::Type)type;
+    return ds;
+}
+
+QDeclarativeEngineDebugServer::QDeclarativeObjectProperty 
+QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx)
+{
+    QDeclarativeObjectProperty rv;
+
+    QMetaProperty prop = obj->metaObject()->property(propIdx);
+
+    rv.type = QDeclarativeObjectProperty::Unknown;
+    rv.valueTypeName = QString::fromUtf8(prop.typeName());
+    rv.name = QString::fromUtf8(prop.name());
+    rv.hasNotifySignal = prop.hasNotifySignal();
+    QDeclarativeAbstractBinding *binding = QDeclarativeMetaProperty(obj, rv.name).binding();
+    if (binding)
+        rv.binding = binding->expression();
+
+    QVariant value = prop.read(obj);
+    rv.value = valueContents(value);
+
+    if (QVariant::Type(prop.userType()) < QVariant::UserType) {
+        rv.type = QDeclarativeObjectProperty::Basic;
+    } else if (QDeclarativeMetaType::isQObject(prop.userType()))  {
+        rv.type = QDeclarativeObjectProperty::Object;
+    } else if (QDeclarativeMetaType::isList(prop.userType())) {
+        rv.type = QDeclarativeObjectProperty::List;
+    }
+
+    return rv;
+}
+
+QVariant QDeclarativeEngineDebugServer::valueContents(const QVariant &value) const
+{
+    int userType = value.userType();
+    if (QVariant::Type(userType) < QVariant::UserType)
+        return value;
+
+    /*
+    if (QDeclarativeMetaType::isList(userType)) {
+        int count = QDeclarativeMetaType::listCount(value);
+        QVariantList contents;
+        for (int i=0; i<count; i++)
+            contents << valueContents(QDeclarativeMetaType::listAt(value, i));
+        return contents;
+    } else */
+    if (QDeclarativeMetaType::isQObject(userType)) {
+        QObject *o = QDeclarativeMetaType::toQObject(value);
+        if (o) {
+            QString name = o->objectName();
+            if (name.isEmpty())
+                name = QLatin1String("<unnamed object>");
+            return name;
+        }
+    }
+
+    return QLatin1String("<unknown value>");
+}
+
+void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message, 
+                                           QObject *object, bool recur)
+{
+    message << objectData(object);
+
+    // Some children aren't added to an object until particular properties are read
+    // - e.g. child state objects aren't added until the 'states' property is read -
+    // but this should only affect internal objects that aren't shown by the
+    // debugger anyway.
+
+    QObjectList children = object->children();
+    
+    int childrenCount = children.count();
+    for (int ii = 0; ii < children.count(); ++ii) {
+        if (qobject_cast<QDeclarativeContext*>(children[ii]) || QDeclarativeBoundSignal::cast(children[ii]))
+            --childrenCount;
+    }
+
+    message << childrenCount << recur;
+
+    QList<QDeclarativeObjectProperty> fakeProperties;
+
+    for (int ii = 0; ii < children.count(); ++ii) {
+        QObject *child = children.at(ii);
+        if (qobject_cast<QDeclarativeContext*>(child))
+            continue;
+        QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
+        if (signal) {
+            QDeclarativeObjectProperty prop;
+            prop.type = QDeclarativeObjectProperty::SignalProperty;
+            prop.hasNotifySignal = false;
+            QDeclarativeExpression *expr = signal->expression();
+            if (expr) {
+                prop.value = expr->expression();
+                QObject *scope = expr->scopeObject();
+                if (scope) {
+                    QString sig = QLatin1String(scope->metaObject()->method(signal->index()).signature());
+                    int lparen = sig.indexOf(QLatin1Char('('));
+                    if (lparen >= 0) {
+                        QString methodName = sig.mid(0, lparen);
+                        prop.name = QLatin1String("on") + methodName[0].toUpper()
+                                + methodName.mid(1);
+                    }
+                }
+            }
+            fakeProperties << prop;
+        } else {
+            if (recur)
+                buildObjectDump(message, child, recur);
+            else
+                message << objectData(child);
+        }
+    }
+
+    message << (object->metaObject()->propertyCount() + fakeProperties.count());
+
+    for (int ii = 0; ii < object->metaObject()->propertyCount(); ++ii) 
+        message << propertyData(object, ii);
+
+    for (int ii = 0; ii < fakeProperties.count(); ++ii)
+        message << fakeProperties[ii];
+}
+
+void QDeclarativeEngineDebugServer::buildObjectList(QDataStream &message, 
+                                           QDeclarativeContext *ctxt)
+{
+    QDeclarativeContextPrivate *p = (QDeclarativeContextPrivate *)QObjectPrivate::get(ctxt);
+
+    QString ctxtName = ctxt->objectName();
+    int ctxtId = QDeclarativeDebugService::idForObject(ctxt);
+
+    message << ctxtName << ctxtId; 
+
+    int count = 0;
+
+    for (QSet<QDeclarativeContext *>::ConstIterator iter = p->childContexts.begin();
+            iter != p->childContexts.end(); ++iter) {
+        QDeclarativeContextPrivate *p = (QDeclarativeContextPrivate *)QObjectPrivate::get(*iter);
+        if (p->isInternal)
+            continue;
+        ++count;
+    }
+
+    message << count;
+
+    for (QSet<QDeclarativeContext *>::ConstIterator iter = p->childContexts.begin();
+            iter != p->childContexts.end(); ++iter) {
+        QDeclarativeContextPrivate *p = (QDeclarativeContextPrivate *)QObjectPrivate::get(*iter);
+        if (p->isInternal)
+            continue;
+        buildObjectList(message, *iter);
+    }
+
+    // Clean deleted objects
+    for (int ii = 0; ii < p->instances.count(); ++ii) {
+        if (!p->instances.at(ii)) {
+            p->instances.removeAt(ii);
+            --ii;
+        }
+    }
+
+    message << p->instances.count();
+    for (int ii = 0; ii < p->instances.count(); ++ii) {
+        message << objectData(p->instances.at(ii));
+    }
+}
+
+QDeclarativeEngineDebugServer::QDeclarativeObjectData 
+QDeclarativeEngineDebugServer::objectData(QObject *object)
+{
+    QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(object);
+    QDeclarativeObjectData rv;
+    if (ddata) {
+        rv.url = ddata->outerContext->baseUrl();
+        rv.lineNumber = ddata->lineNumber;
+        rv.columnNumber = ddata->columnNumber;
+    } else {
+        rv.lineNumber = -1;
+        rv.columnNumber = -1;
+    }
+
+    rv.objectName = object->objectName();
+    rv.objectId = QDeclarativeDebugService::idForObject(object);
+    rv.contextId = QDeclarativeDebugService::idForObject(qmlContext(object));
+
+    QDeclarativeType *type = QDeclarativeMetaType::qmlType(object->metaObject());
+    if (type) {
+        QString typeName = QLatin1String(type->qmlTypeName());
+        int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
+        rv.objectType = lastSlash < 0 ? typeName : typeName.mid(lastSlash+1);
+    } else {
+        rv.objectType = QString::fromUtf8(object->metaObject()->className());
+        int marker = rv.objectType.indexOf(QLatin1String("_QMLTYPE_"));
+        if (marker != -1)
+            rv.objectType = rv.objectType.left(marker);
+    }
+
+    return rv;
+}
+
+void QDeclarativeEngineDebugServer::messageReceived(const QByteArray &message)
+{
+    QDataStream ds(message);
+
+    QByteArray type;
+    ds >> type;
+
+    //qDebug() << "QDeclarativeEngineDebugServer::messageReceived()" << type;
+
+    if (type == "LIST_ENGINES") {
+        int queryId;
+        ds >> queryId;
+
+        QByteArray reply;
+        QDataStream rs(&reply, QIODevice::WriteOnly);
+        rs << QByteArray("LIST_ENGINES_R");
+        rs << queryId << m_engines.count();
+
+        for (int ii = 0; ii < m_engines.count(); ++ii) {
+            QDeclarativeEngine *engine = m_engines.at(ii);
+
+            QString engineName = engine->objectName();
+            int engineId = QDeclarativeDebugService::idForObject(engine);
+
+            rs << engineName << engineId;
+        }
+
+        sendMessage(reply);
+    } else if (type == "LIST_OBJECTS") {
+        int queryId;
+        int engineId = -1;
+        ds >> queryId >> engineId;
+
+        QDeclarativeEngine *engine = 
+            qobject_cast<QDeclarativeEngine *>(QDeclarativeDebugService::objectForId(engineId));
+
+        QByteArray reply;
+        QDataStream rs(&reply, QIODevice::WriteOnly);
+        rs << QByteArray("LIST_OBJECTS_R") << queryId;
+
+        if (engine)
+            buildObjectList(rs, engine->rootContext());
+
+        sendMessage(reply);
+    } else if (type == "FETCH_OBJECT") {
+        int queryId;
+        int objectId;
+        bool recurse;
+
+        ds >> queryId >> objectId >> recurse;
+
+        QObject *object = QDeclarativeDebugService::objectForId(objectId);
+
+        QByteArray reply;
+        QDataStream rs(&reply, QIODevice::WriteOnly);
+        rs << QByteArray("FETCH_OBJECT_R") << queryId;
+
+        if (object) 
+            buildObjectDump(rs, object, recurse);
+
+        sendMessage(reply);
+    } else if (type == "WATCH_OBJECT") {
+        int queryId;
+        int objectId;
+
+        ds >> queryId >> objectId;
+        bool ok = m_watch->addWatch(queryId, objectId);
+
+        QByteArray reply;
+        QDataStream rs(&reply, QIODevice::WriteOnly);
+        rs << QByteArray("WATCH_OBJECT_R") << queryId << ok;
+
+        sendMessage(reply);
+    } else if (type == "WATCH_PROPERTY") {
+        int queryId;
+        int objectId;
+        QByteArray property;
+
+        ds >> queryId >> objectId >> property;
+        bool ok = m_watch->addWatch(queryId, objectId, property);
+
+        QByteArray reply;
+        QDataStream rs(&reply, QIODevice::WriteOnly);
+        rs << QByteArray("WATCH_PROPERTY_R") << queryId << ok;
+
+        sendMessage(reply);
+    } else if (type == "WATCH_EXPR_OBJECT") {
+        int queryId;
+        int debugId;
+        QString expr;
+
+        ds >> queryId >> debugId >> expr;
+        bool ok = m_watch->addWatch(queryId, debugId, expr);
+
+        QByteArray reply;
+        QDataStream rs(&reply, QIODevice::WriteOnly);
+        rs << QByteArray("WATCH_EXPR_OBJECT_R") << queryId << ok;
+
+        sendMessage(reply);
+    } else if (type == "NO_WATCH") {
+        int queryId;
+
+        ds >> queryId;
+        m_watch->removeWatch(queryId);
+    } else if (type == "EVAL_EXPRESSION") {
+        int queryId;
+        int objectId;
+        QString expr;
+
+        ds >> queryId >> objectId >> expr;
+
+        QObject *object = QDeclarativeDebugService::objectForId(objectId);
+        QDeclarativeContext *context = qmlContext(object);
+        QVariant result;
+        if (object && context) {
+            QDeclarativeExpression exprObj(context, expr, object);
+            bool undefined = false;
+            QVariant value = exprObj.value(&undefined);
+            if (undefined)
+                result = QLatin1String("<undefined>");
+            else
+                result = valueContents(value);
+        } else {
+            result = QLatin1String("<unknown context>");
+        }
+
+        QByteArray reply;
+        QDataStream rs(&reply, QIODevice::WriteOnly);
+        rs << QByteArray("EVAL_EXPRESSION_R") << queryId << result;
+
+        sendMessage(reply);
+    }
+}
+
+void QDeclarativeEngineDebugServer::propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value)
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+
+    rs << QByteArray("UPDATE_WATCH") << id << objectId << QByteArray(property.name()) << valueContents(value);
+
+    sendMessage(reply);
+}
+
+void QDeclarativeEngineDebugServer::addEngine(QDeclarativeEngine *engine)
+{
+    Q_ASSERT(engine);
+    Q_ASSERT(!m_engines.contains(engine));
+
+    m_engines.append(engine);
+}
+
+void QDeclarativeEngineDebugServer::remEngine(QDeclarativeEngine *engine)
+{
+    Q_ASSERT(engine);
+    Q_ASSERT(m_engines.contains(engine));
+
+    m_engines.removeAll(engine);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeenginedebug_p.h b/src/declarative/qml/qdeclarativeenginedebug_p.h
new file mode 100644
index 0000000..89da399
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeenginedebug_p.h
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEENGINEDEBUG_P_H
+#define QDECLARATIVEENGINEDEBUG_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "../debugger/qdeclarativedebugservice_p.h"
+
+#include <QtCore/qurl.h>
+#include <QtCore/qvariant.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QDeclarativeContext;
+class QDeclarativeWatcher;
+class QDataStream;
+
+class QDeclarativeEngineDebugServer : public QDeclarativeDebugService
+{
+    Q_OBJECT
+public:
+    QDeclarativeEngineDebugServer(QObject * = 0);
+
+    struct QDeclarativeObjectData {
+        QUrl url;
+        int lineNumber;
+        int columnNumber;
+        QString objectName;
+        QString objectType;
+        int objectId;
+        int contextId;
+    };
+
+    struct QDeclarativeObjectProperty {
+        enum Type { Unknown, Basic, Object, List, SignalProperty };
+        Type type;
+        QString name;
+        QVariant value;
+        QString valueTypeName;
+        QString binding;
+        bool hasNotifySignal;
+    };
+
+    static void addEngine(QDeclarativeEngine *);
+    static void remEngine(QDeclarativeEngine *);
+
+protected:
+    virtual void messageReceived(const QByteArray &);
+
+private Q_SLOTS:
+    void propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value);
+
+private:
+    void buildObjectList(QDataStream &, QDeclarativeContext *);
+    void buildObjectDump(QDataStream &, QObject *, bool);
+    QDeclarativeObjectData objectData(QObject *);
+    QDeclarativeObjectProperty propertyData(QObject *, int);
+    QVariant valueContents(const QVariant &defaultValue) const;
+
+    static QList<QDeclarativeEngine *> m_engines;
+    QDeclarativeWatcher *m_watch;
+};
+Q_DECLARATIVE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugServer::QDeclarativeObjectData &);
+Q_DECLARATIVE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugServer::QDeclarativeObjectData &);
+Q_DECLARATIVE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugServer::QDeclarativeObjectProperty &);
+Q_DECLARATIVE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugServer::QDeclarativeObjectProperty &);
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEENGINEDEBUG_P_H
+
diff --git a/src/declarative/qml/qdeclarativeerror.cpp b/src/declarative/qml/qdeclarativeerror.cpp
new file mode 100644
index 0000000..7e8aac0
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeerror.cpp
@@ -0,0 +1,258 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeerror.h"
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qstringlist.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativeError
+  \since 4.7
+    \brief The QDeclarativeError class encapsulates a QML error
+*/
+class QDeclarativeErrorPrivate
+{
+public:
+    QDeclarativeErrorPrivate();
+
+    QUrl url;
+    QString description;
+    int line;
+    int column;
+};
+
+QDeclarativeErrorPrivate::QDeclarativeErrorPrivate()
+: line(-1), column(-1)
+{
+}
+
+/*!
+    Create an empty error object.
+*/
+QDeclarativeError::QDeclarativeError()
+: d(0)
+{
+}
+
+/*!
+    Create a copy of \a other.
+*/
+QDeclarativeError::QDeclarativeError(const QDeclarativeError &other)
+: d(0)
+{
+    *this = other;
+}
+
+/*!
+    Assign \a other to this error object.
+*/
+QDeclarativeError &QDeclarativeError::operator=(const QDeclarativeError &other)
+{
+    if (!other.d) {
+        delete d;
+        d = 0;
+    } else {
+        if (!d) d = new QDeclarativeErrorPrivate;
+        d->url = other.d->url;
+        d->description = other.d->description;
+        d->line = other.d->line;
+        d->column = other.d->column;
+    }
+    return *this;
+}
+
+/*!
+    \internal 
+*/
+QDeclarativeError::~QDeclarativeError()
+{
+    delete d; d = 0;
+}
+
+/*!
+    Return true if this error is valid, otherwise false.
+*/
+bool QDeclarativeError::isValid() const
+{
+    return d != 0;
+}
+
+/*!
+    Return the url for the file that caused this error.
+*/
+QUrl QDeclarativeError::url() const
+{
+    if (d) return d->url;
+    else return QUrl();
+}
+
+/*!
+    Set the \a url for the file that caused this error.
+*/
+void QDeclarativeError::setUrl(const QUrl &url)
+{
+    if (!d) d = new QDeclarativeErrorPrivate;
+    d->url = url;
+}
+
+/*!
+    Return the error description.
+*/
+QString QDeclarativeError::description() const
+{
+    if (d) return d->description;
+    else return QString();
+}
+
+/*!
+    Set the error \a description.
+*/
+void QDeclarativeError::setDescription(const QString &description)
+{
+    if (!d) d = new QDeclarativeErrorPrivate;
+    d->description = description;
+}
+
+/*!
+    Return the error line number.
+*/
+int QDeclarativeError::line() const
+{
+    if (d) return d->line;
+    else return -1;
+}
+
+/*!
+    Set the error \a line number.
+*/
+void QDeclarativeError::setLine(int line)
+{
+    if (!d) d = new QDeclarativeErrorPrivate;
+    d->line = line;
+}
+
+/*!
+    Return the error column number.
+*/
+int QDeclarativeError::column() const
+{
+    if (d) return d->column;
+    else return -1;
+}
+
+/*!
+    Set the error \a column number.
+*/
+void QDeclarativeError::setColumn(int column)
+{
+    if (!d) d = new QDeclarativeErrorPrivate;
+    d->column = column;
+}
+
+/*!
+    Return the error as a human readable string.
+*/
+QString QDeclarativeError::toString() const
+{
+    QString rv;
+    rv = url().toString() + QLatin1Char(':') + QString::number(line());
+    if(column() != -1) 
+        rv += QLatin1Char(':') + QString::number(column());
+
+    rv += QLatin1String(": ") + description();
+
+    return rv;
+}
+
+/*!
+    \relates QDeclarativeError
+    \fn QDebug operator<<(QDebug debug, const QDeclarativeError &error)
+
+    Output a human readable version of \a error to \a debug.
+*/
+
+QDebug operator<<(QDebug debug, const QDeclarativeError &error)
+{
+    debug << qPrintable(error.toString());
+
+    QUrl url = error.url();
+
+    if (error.line() > 0 && url.scheme() == QLatin1String("file")) {
+        QString file = url.toLocalFile();
+        QFile f(file);
+        if (f.open(QIODevice::ReadOnly)) {
+            QByteArray data = f.readAll();
+            QTextStream stream(data, QIODevice::ReadOnly);
+            stream.setCodec("UTF-8");
+            const QString code = stream.readAll();
+            const QStringList lines = code.split(QLatin1Char('\n'));
+
+            if (lines.count() >= error.line()) {
+                const QString &line = lines.at(error.line() - 1);
+                debug << "\n    " << qPrintable(line);
+
+                if(error.column() > 0) {
+                    int column = qMax(0, error.column() - 1);
+                    column = qMin(column, line.length()); 
+
+                    QByteArray ind;
+                    ind.reserve(column);
+                    for (int i = 0; i < column; ++i) {
+                        const QChar ch = line.at(i);
+                        if (ch.isSpace())
+                            ind.append(ch.unicode());
+                        else
+                            ind.append(' ');
+                    }
+                    ind.append('^');
+                    debug << "\n    " << ind.constData();
+                }
+            }
+        }
+    }
+    return debug;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeerror.h b/src/declarative/qml/qdeclarativeerror.h
new file mode 100644
index 0000000..04d5ff2
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeerror.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEERROR_H
+#define QDECLARATIVEERROR_H
+
+#include <QtCore/qurl.h>
+#include <QtCore/qstring.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDebug;
+class QDeclarativeErrorPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeError
+{
+public:
+    QDeclarativeError();
+    QDeclarativeError(const QDeclarativeError &);
+    QDeclarativeError &operator=(const QDeclarativeError &);
+    ~QDeclarativeError();
+
+    bool isValid() const;
+
+    QUrl url() const;
+    void setUrl(const QUrl &);
+    QString description() const;
+    void setDescription(const QString &);
+    int line() const;
+    void setLine(int);
+    int column() const;
+    void setColumn(int);
+
+    QString toString() const;
+private:
+    QDeclarativeErrorPrivate *d;
+};
+
+QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, const QDeclarativeError &error);
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEERROR_H
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
new file mode 100644
index 0000000..ae1e790
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -0,0 +1,810 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeexpression.h"
+#include "qdeclarativeexpression_p.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativerewrite_p.h"
+#include "qdeclarativecompiler_p.h"
+
+#include <QtCore/qdebug.h>
+#include <QtScript/qscriptprogram.h>
+
+#include <private/qscriptdeclarativeclass_p.h>
+
+QT_BEGIN_NAMESPACE
+
+bool QDeclarativeDelayedError::addError(QDeclarativeEnginePrivate *e)
+{
+    if (!e || prevError) return false;
+
+    if (e->inProgressCreations == 0) return false; // Not in construction
+
+    prevError = &e->erroredBindings;
+    nextError = e->erroredBindings;
+    e->erroredBindings = this;
+    if (nextError) nextError->prevError = &nextError;
+
+    return true;
+}
+
+QDeclarativeExpressionData::QDeclarativeExpressionData()
+: q(0), dataRef(0), expressionFunctionValid(false), expressionRewritten(false), me(0), 
+  trackChange(false), isShared(false), line(-1), guardList(0), guardListLength(0)
+{
+}
+
+QDeclarativeExpressionData::~QDeclarativeExpressionData()
+{
+    if (guardList) { delete [] guardList; guardList = 0; }
+    if (dataRef) dataRef->release();
+}
+
+QDeclarativeExpressionPrivate::QDeclarativeExpressionPrivate()
+: data(new QDeclarativeExpressionData)
+{
+    data->q = this;
+}
+
+QDeclarativeExpressionPrivate::QDeclarativeExpressionPrivate(QDeclarativeExpressionData *d)
+: data(d)
+{
+    data->q = this;
+}
+
+QDeclarativeExpressionPrivate::~QDeclarativeExpressionPrivate()
+{
+    if (data) { data->q = 0; data->release(); data = 0; }
+}
+
+void QDeclarativeExpressionPrivate::init(QDeclarativeContext *ctxt, const QString &expr, 
+                                QObject *me)
+{
+    data->expression = expr;
+
+    data->QDeclarativeAbstractExpression::setContext(ctxt);
+    data->me = me;
+}
+
+void QDeclarativeExpressionPrivate::init(QDeclarativeContext *ctxt, void *expr, QDeclarativeRefCount *rc, 
+                                QObject *me, const QString &url, int lineNumber)
+{
+    data->url = url;
+    data->line = lineNumber;
+
+    if (data->dataRef) data->dataRef->release();
+    data->dataRef = rc;
+    if (data->dataRef) data->dataRef->addref();
+
+    quint32 *exprData = (quint32 *)expr;
+    QDeclarativeCompiledData *dd = (QDeclarativeCompiledData *)rc;
+
+    data->expressionRewritten = true;
+    data->expression = QString::fromRawData((QChar *)(exprData + 2), exprData[1]);
+
+    int progIdx = *(exprData);
+    bool isShared = progIdx & 0x80000000;
+    progIdx &= 0x7FFFFFFF;
+
+    QDeclarativeEngine *engine = ctxt->engine();
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    if (isShared) {
+
+        if (!dd->cachedClosures.at(progIdx)) {
+            QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
+            scriptContext->pushScope(ep->contextClass->newSharedContext());
+            dd->cachedClosures[progIdx] = new QScriptValue(scriptEngine->evaluate(data->expression, data->url, data->line));
+            scriptEngine->popContext();
+        }
+
+        data->expressionFunction = *dd->cachedClosures.at(progIdx);
+        data->isShared = true;
+        data->expressionFunctionValid = true;
+
+    } else {
+
+#if !defined(Q_OS_SYMBIAN) //XXX Why doesn't this work?
+        if (!dd->cachedPrograms.at(progIdx)) {
+            dd->cachedPrograms[progIdx] =
+                new QScriptProgram(data->expression, data->url, data->line);
+        }
+
+        data->expressionFunction = evalInObjectScope(ctxt, me, *dd->cachedPrograms.at(progIdx));
+#else
+        data->expressionFunction = evalInObjectScope(ctxt, me, data->expression);
+#endif
+
+        data->expressionFunctionValid = true;
+    }
+
+    data->QDeclarativeAbstractExpression::setContext(ctxt);
+    data->me = me;
+}
+
+QScriptValue QDeclarativeExpressionPrivate::evalInObjectScope(QDeclarativeContext *context, QObject *object, 
+                                                     const QString &program)
+{
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context->engine());
+    QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(&ep->scriptEngine);
+    scriptContext->pushScope(ep->contextClass->newContext(context, object));
+    QScriptValue rv = ep->scriptEngine.evaluate(program);
+    ep->scriptEngine.popContext();
+    return rv;
+}
+
+QScriptValue QDeclarativeExpressionPrivate::evalInObjectScope(QDeclarativeContext *context, QObject *object, 
+                                                     const QScriptProgram &program)
+{
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context->engine());
+    QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(&ep->scriptEngine);
+    scriptContext->pushScope(ep->contextClass->newContext(context, object));
+    QScriptValue rv = ep->scriptEngine.evaluate(program);
+    ep->scriptEngine.popContext();
+    return rv;
+}
+
+/*!
+    \class QDeclarativeExpression
+  \since 4.7
+    \brief The QDeclarativeExpression class evaluates JavaScript in a QML context.
+*/
+
+/*!
+    Create an invalid QDeclarativeExpression.
+
+    As the expression will not have an associated QDeclarativeContext, this will be a
+    null expression object and its value will always be an invalid QVariant.
+ */
+QDeclarativeExpression::QDeclarativeExpression()
+: QObject(*new QDeclarativeExpressionPrivate, 0)
+{
+}
+
+/*!  \internal */
+QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContext *ctxt, void *expr,
+                             QDeclarativeRefCount *rc, QObject *me, 
+                             const QString &url, int lineNumber,
+                             QDeclarativeExpressionPrivate &dd)
+: QObject(dd, 0)
+{
+    Q_D(QDeclarativeExpression);
+    d->init(ctxt, expr, rc, me, url, lineNumber);
+}
+
+/*!
+    Create a QDeclarativeExpression object.
+
+    The \a expression JavaScript will be executed in the \a ctxt QDeclarativeContext.
+    If specified, the \a scope object's properties will also be in scope during
+    the expression's execution.
+*/
+QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContext *ctxt, const QString &expression,
+                             QObject *scope)
+: QObject(*new QDeclarativeExpressionPrivate, 0)
+{
+    Q_D(QDeclarativeExpression);
+    d->init(ctxt, expression, scope);
+}
+
+/*!  \internal */
+QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContext *ctxt, const QString &expression,
+                             QObject *scope, QDeclarativeExpressionPrivate &dd)
+: QObject(dd, 0)
+{
+    Q_D(QDeclarativeExpression);
+    d->init(ctxt, expression, scope);
+}
+
+/*!
+    Destroy the QDeclarativeExpression instance.
+*/
+QDeclarativeExpression::~QDeclarativeExpression()
+{
+}
+
+/*!
+    Returns the QDeclarativeEngine this expression is associated with, or 0 if there
+    is no association or the QDeclarativeEngine has been destroyed.
+*/
+QDeclarativeEngine *QDeclarativeExpression::engine() const
+{
+    Q_D(const QDeclarativeExpression);
+    return d->data->context()?d->data->context()->engine():0;
+}
+
+/*!
+    Returns the QDeclarativeContext this expression is associated with, or 0 if there
+    is no association or the QDeclarativeContext has been destroyed.
+*/
+QDeclarativeContext *QDeclarativeExpression::context() const
+{
+    Q_D(const QDeclarativeExpression);
+    return d->data->context();
+}
+
+/*!
+    Returns the expression string.
+*/
+QString QDeclarativeExpression::expression() const
+{
+    Q_D(const QDeclarativeExpression);
+    return d->data->expression;
+}
+
+/*!
+    Set the expression to \a expression.
+*/
+void QDeclarativeExpression::setExpression(const QString &expression)
+{
+    Q_D(QDeclarativeExpression);
+
+    d->clearGuards();
+
+    d->data->expression = expression;
+    d->data->expressionFunctionValid = false;
+    d->data->expressionRewritten = false;
+    d->data->expressionFunction = QScriptValue();
+}
+
+void QDeclarativeExpressionPrivate::exceptionToError(QScriptEngine *scriptEngine, 
+                                            QDeclarativeError &error)
+{
+    if (scriptEngine->hasUncaughtException() && 
+        scriptEngine->uncaughtException().isError()) {
+
+        QString fileName;
+        int lineNumber = scriptEngine->uncaughtExceptionLineNumber();
+
+        QScriptValue exception = scriptEngine->uncaughtException();
+        QLatin1String fileNameProp("fileName");
+
+        if (!exception.property(fileNameProp).toString().isEmpty()){
+            fileName = exception.property(fileNameProp).toString();
+        } else {
+            fileName = QLatin1String("<Unknown File>");
+        }
+
+        error.setUrl(QUrl(fileName));
+        error.setLine(lineNumber);
+        error.setColumn(-1);
+        error.setDescription(exception.toString());
+    } else {
+        error = QDeclarativeError();
+    }
+}
+
+QVariant QDeclarativeExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUndefined)
+{
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::BindValueQt> perfqt;
+#endif
+
+    QDeclarativeExpressionData *data = this->data;
+    QDeclarativeContextPrivate *ctxtPriv = data->context()->d_func();
+    QDeclarativeEngine *engine = data->context()->engine();
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+
+    if (secondaryScope)
+       ctxtPriv->defaultObjects.append(secondaryScope);
+
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    if (!data->expressionFunctionValid) {
+
+        QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
+        scriptContext->pushScope(ep->contextClass->newContext(data->context(), data->me));
+
+        if (data->expressionRewritten) {
+            data->expressionFunction = scriptEngine->evaluate(data->expression, 
+                                                              data->url, data->line);
+        } else {
+            QDeclarativeRewrite::RewriteBinding rewriteBinding;
+
+            bool ok = true;
+            const QString code = rewriteBinding(data->expression, &ok);
+            if (!ok) {
+                scriptEngine->popContext();
+                return QVariant();
+            }
+            data->expressionFunction = scriptEngine->evaluate(code, data->url, data->line);
+        }
+
+        scriptEngine->popContext();
+        data->expressionFunctionValid = true;
+    }
+
+    QDeclarativeContext *oldSharedContext = 0;
+    QObject *oldSharedScope = 0;
+    if (data->isShared) {
+        oldSharedContext = ep->sharedContext;
+        oldSharedScope = ep->sharedScope;
+        ep->sharedContext = data->context();
+        ep->sharedScope = data->me;
+    }
+
+    QScriptValue svalue = data->expressionFunction.call();
+
+    if (data->isShared) {
+        ep->sharedContext = oldSharedContext;
+        ep->sharedScope = oldSharedScope;
+    }
+
+    if (isUndefined)
+        *isUndefined = svalue.isUndefined() || scriptEngine->hasUncaughtException();
+
+    // Handle exception
+    if (scriptEngine->hasUncaughtException()) {
+       exceptionToError(scriptEngine, data->error);
+       scriptEngine->clearExceptions();
+       return QVariant();
+    } else {
+        data->error = QDeclarativeError();
+    }
+
+    if (secondaryScope) {
+        QObject *last = ctxtPriv->defaultObjects.takeLast();
+        Q_ASSERT(last == secondaryScope);
+        Q_UNUSED(last);
+    }
+
+    QVariant rv;
+
+    if (svalue.isArray()) {
+        int length = svalue.property(QLatin1String("length")).toInt32();
+        if (length && svalue.property(0).isObject()) {
+            QList<QObject *> list;
+            for (int ii = 0; ii < length; ++ii) {
+                QScriptValue arrayItem = svalue.property(ii);
+                QObject *d = arrayItem.toQObject();
+                list << d;
+            }
+            rv = QVariant::fromValue(list);
+        }
+    } else if (svalue.isObject() &&
+               ep->objectClass->scriptClass(svalue) == ep->objectClass) {
+        QObject *o = svalue.toQObject();
+        int type = QMetaType::QObjectStar;
+        // If the object is null, we extract the predicted type.  While this isn't
+        // 100% reliable, in many cases it gives us better error messages if we
+        // assign this null-object to an incompatible property
+        if (!o) type = ep->objectClass->objectType(svalue);
+
+        return QVariant(type, &o);
+    }
+
+    if (rv.isNull())
+        rv = svalue.toVariant();
+
+    return rv;
+}
+
+QVariant QDeclarativeExpressionPrivate::value(QObject *secondaryScope, bool *isUndefined)
+{
+    Q_Q(QDeclarativeExpression);
+
+    QVariant rv;
+    if (!q->engine()) {
+        qWarning("QDeclarativeExpression: Attempted to evaluate an expression in an invalid context");
+        return rv;
+    }
+
+    if (data->expression.isEmpty())
+        return rv;
+
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::BindValue> perf;
+#endif
+
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(q->engine());
+
+    QDeclarativeExpression *lastCurrentExpression = ep->currentExpression;
+    bool lastCaptureProperties = ep->captureProperties;
+    QPODVector<QDeclarativeEnginePrivate::CapturedProperty> lastCapturedProperties;
+    ep->capturedProperties.copyAndClear(lastCapturedProperties);
+
+    ep->currentExpression = q;
+    ep->captureProperties = data->trackChange;
+
+    // This object might be deleted during the eval
+    QDeclarativeExpressionData *localData = data;
+    localData->addref();
+
+    rv = evalQtScript(secondaryScope, isUndefined);
+
+    ep->currentExpression = lastCurrentExpression;
+    ep->captureProperties = lastCaptureProperties;
+
+    // Check if we were deleted
+    if (localData->q) {
+        if ((!data->trackChange || !ep->capturedProperties.count()) && data->guardList) {
+            clearGuards();
+        } else if(data->trackChange) {
+            updateGuards(ep->capturedProperties);
+        }
+    }
+
+    localData->release();
+
+    lastCapturedProperties.copyAndClear(ep->capturedProperties);
+
+    return rv;
+}
+
+/*!
+    Returns the value of the expression, or an invalid QVariant if the
+    expression is invalid or has an error.
+
+    \a isUndefined is set to true if the expression resulted in an
+    undefined value.
+
+    \sa hasError(), error()
+*/
+QVariant QDeclarativeExpression::value(bool *isUndefined)
+{
+    Q_D(QDeclarativeExpression);
+    return d->value(0, isUndefined);
+}
+
+/*!
+Returns true if the valueChanged() signal is emitted when the expression's evaluated
+value changes.
+*/
+bool QDeclarativeExpression::notifyOnValueChanged() const
+{
+    Q_D(const QDeclarativeExpression);
+    return d->data->trackChange;
+}
+
+/*!
+Sets whether the valueChanged() signal is emitted when the expression's evaluated
+value changes.
+
+If true, the QDeclarativeExpression will monitor properties involved in the expression's 
+evaluation, and emit QDeclarativeExpression::valueChanged() if they have changed.  This allows 
+an application to ensure that any value associated with the result of the expression 
+remains up to date.
+
+If false, the QDeclarativeExpression will not montitor properties involved in the expression's 
+evaluation, and QDeclarativeExpression::valueChanged() will never be emitted.  This is more efficient 
+if an application wants a "one off" evaluation of the expression.
+
+By default, notifyOnChange is false.
+*/
+void QDeclarativeExpression::setNotifyOnValueChanged(bool notifyOnChange)
+{
+    Q_D(QDeclarativeExpression);
+    d->data->trackChange = notifyOnChange;
+}
+
+/*!
+    Returns the source file URL for this expression.  The source location must
+    have been previously set by calling setSourceLocation().
+*/
+QString QDeclarativeExpression::sourceFile() const
+{
+    Q_D(const QDeclarativeExpression);
+    return d->data->url;
+}
+
+/*!
+    Returns the source file line number for this expression.  The source location 
+    must have been previously set by calling setSourceLocation().
+*/
+int QDeclarativeExpression::lineNumber() const
+{
+    Q_D(const QDeclarativeExpression);
+    return d->data->line;
+}
+
+/*!
+    Set the location of this expression to \a line of \a url. This information
+    is used by the script engine.
+*/
+void QDeclarativeExpression::setSourceLocation(const QString &url, int line)
+{
+    Q_D(QDeclarativeExpression);
+    d->data->url = url;
+    d->data->line = line;
+}
+
+/*!
+    Returns the expression's scope object, if provided, otherwise 0.
+
+    In addition to data provided by the expression's QDeclarativeContext, the scope
+    object's properties are also in scope during the expression's evaluation.
+*/
+QObject *QDeclarativeExpression::scopeObject() const
+{
+    Q_D(const QDeclarativeExpression);
+    return d->data->me;
+}
+
+/*!
+    Returns true if the last call to value() resulted in an error, 
+    otherwise false.
+    
+    \sa error(), clearError()
+*/
+bool QDeclarativeExpression::hasError() const
+{
+    Q_D(const QDeclarativeExpression);
+    return d->data->error.isValid();
+}
+
+/*!
+    Clear any expression errors.  Calls to hasError() following this will
+    return false.
+
+    \sa hasError(), error()
+*/
+void QDeclarativeExpression::clearError()
+{
+    Q_D(QDeclarativeExpression);
+    d->data->error = QDeclarativeError();
+}
+
+/*!
+    Return any error from the last call to value().  If there was no error,
+    this returns an invalid QDeclarativeError instance.
+
+    \sa hasError(), clearError()
+*/
+
+QDeclarativeError QDeclarativeExpression::error() const
+{
+    Q_D(const QDeclarativeExpression);
+    return d->data->error;
+}
+
+/*! \internal */
+void QDeclarativeExpression::__q_notify()
+{
+    Q_D(QDeclarativeExpression);
+    d->emitValueChanged();
+}
+
+void QDeclarativeExpressionPrivate::clearGuards()
+{
+    Q_Q(QDeclarativeExpression);
+
+    static int notifyIdx = -1;
+    if (notifyIdx == -1) 
+        notifyIdx = 
+            QDeclarativeExpression::staticMetaObject.indexOfMethod("__q_notify()");
+
+    for (int ii = 0; ii < data->guardListLength; ++ii) {
+        if (data->guardList[ii].data()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
+            QMetaObject::disconnectOne(data->guardList[ii].data(), 
+                                       data->guardList[ii].notifyIndex, 
+                                       q, notifyIdx);
+#else
+            // QTBUG-6781
+            QMetaObject::disconnect(data->guardList[ii].data(), 
+                                    data->guardList[ii].notifyIndex, 
+                                    q, notifyIdx);
+#endif
+        }
+    }
+
+    delete [] data->guardList; data->guardList = 0; 
+    data->guardListLength = 0;
+}
+
+void QDeclarativeExpressionPrivate::updateGuards(const QPODVector<QDeclarativeEnginePrivate::CapturedProperty> &properties)
+{
+    //clearGuards();
+    Q_Q(QDeclarativeExpression);
+
+    static int notifyIdx = -1;
+    if (notifyIdx == -1) 
+        notifyIdx = 
+            QDeclarativeExpression::staticMetaObject.indexOfMethod("__q_notify()");
+
+    QDeclarativeExpressionData::SignalGuard *newGuardList = 0;
+    
+    if (properties.count() != data->guardListLength)
+        newGuardList = new QDeclarativeExpressionData::SignalGuard[properties.count()];
+
+    bool outputWarningHeader = false;
+    int hit = 0;
+    for (int ii = 0; ii < properties.count(); ++ii) {
+        const QDeclarativeEnginePrivate::CapturedProperty &property = properties.at(ii);
+
+        bool needGuard = true;
+        if (ii >= data->guardListLength) {
+            // New guard
+        } else if(data->guardList[ii].data() == property.object && 
+                  data->guardList[ii].notifyIndex == property.notifyIndex) {
+            // Cache hit
+            if (!data->guardList[ii].isDuplicate || 
+                (data->guardList[ii].isDuplicate && hit == ii)) {
+                needGuard = false;
+                ++hit;
+            }
+        } else if(data->guardList[ii].data() && !data->guardList[ii].isDuplicate) {
+            // Cache miss
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
+            QMetaObject::disconnectOne(data->guardList[ii].data(), 
+                                       data->guardList[ii].notifyIndex, 
+                                       q, notifyIdx);
+#else
+            // QTBUG-6781
+            QMetaObject::disconnect(data->guardList[ii].data(), 
+                                    data->guardList[ii].notifyIndex, 
+                                    q, notifyIdx);
+#endif
+        } 
+        /* else {
+            // Cache miss, but nothing to do
+        } */
+
+        if (needGuard) {
+            if (!newGuardList) {
+                newGuardList = new QDeclarativeExpressionData::SignalGuard[properties.count()];
+                for (int jj = 0; jj < ii; ++jj)
+                    newGuardList[jj] = data->guardList[jj];
+            }
+
+            if (property.notifyIndex != -1) {
+                bool existing = false;
+                for (int jj = 0; !existing && jj < ii; ++jj) 
+                    existing = newGuardList[jj].data() == property.object &&
+                        newGuardList[jj].notifyIndex == property.notifyIndex;
+
+                newGuardList[ii] = property.object;
+                newGuardList[ii].notifyIndex = property.notifyIndex;
+                if (existing)
+                    newGuardList[ii].isDuplicate = true;
+                else
+                    QMetaObject::connect(property.object, property.notifyIndex,
+                                         q, notifyIdx);
+            } else {
+                if (!outputWarningHeader) {
+                    outputWarningHeader = true;
+                    qWarning() << "QDeclarativeExpression: Expression" << q->expression()
+                               << "depends on non-NOTIFYable properties:";
+                }
+
+                const QMetaObject *metaObj = property.object->metaObject();
+                QMetaProperty metaProp = metaObj->property(property.coreIndex);
+
+                qWarning().nospace() << "    " << metaObj->className()
+                                     << "::" << metaProp.name();
+            }
+        } else if (newGuardList) {
+            newGuardList[ii] = data->guardList[ii];
+        }
+    }
+
+    for (int ii = properties.count(); ii < data->guardListLength; ++ii) {
+        if (data->guardList[ii].data() && !data->guardList[ii].isDuplicate) {
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
+            QMetaObject::disconnectOne(data->guardList[ii].data(), 
+                                       data->guardList[ii].notifyIndex, 
+                                       q, notifyIdx);
+#else
+            // QTBUG-6781
+            QMetaObject::disconnect(data->guardList[ii].data(), 
+                                    data->guardList[ii].notifyIndex, 
+                                    q, notifyIdx);
+#endif
+        }
+    }
+
+    if (newGuardList) {
+        if (data->guardList) delete [] data->guardList;
+        data->guardList = newGuardList;
+        data->guardListLength = properties.count();
+    }
+}
+
+/*!
+    \fn void QDeclarativeExpression::valueChanged()
+
+    Emitted each time the expression value changes from the last time it was
+    evaluated.  The expression must have been evaluated at least once (by
+    calling QDeclarativeExpression::value()) before this signal will be emitted.
+*/
+
+void QDeclarativeExpressionPrivate::emitValueChanged()
+{
+    Q_Q(QDeclarativeExpression);
+    emit q->valueChanged();
+}
+
+QDeclarativeAbstractExpression::QDeclarativeAbstractExpression()
+: m_context(0), m_prevExpression(0), m_nextExpression(0)
+{
+}
+
+QDeclarativeAbstractExpression::~QDeclarativeAbstractExpression()
+{
+    if (m_prevExpression) {
+        *m_prevExpression = m_nextExpression;
+        if (m_nextExpression) 
+            m_nextExpression->m_prevExpression = m_prevExpression;
+    }
+}
+
+QDeclarativeContext *QDeclarativeAbstractExpression::context() const
+{
+    return m_context;
+}
+
+void QDeclarativeAbstractExpression::setContext(QDeclarativeContext *context)
+{
+    if (m_prevExpression) {
+        *m_prevExpression = m_nextExpression;
+        if (m_nextExpression) 
+            m_nextExpression->m_prevExpression = m_prevExpression;
+        m_prevExpression = 0;
+        m_nextExpression = 0;
+    }
+
+    m_context = context;
+
+    if (m_context) {
+        QDeclarativeContextPrivate *cp = 
+            static_cast<QDeclarativeContextPrivate *>(QObjectPrivate::get(m_context));
+        m_nextExpression = cp->expressions;
+        if (m_nextExpression) 
+            m_nextExpression->m_prevExpression = &m_nextExpression;
+        m_prevExpression = &cp->expressions;
+        cp->expressions = this;
+    }
+}
+
+void QDeclarativeAbstractExpression::refresh()
+{
+}
+
+bool QDeclarativeAbstractExpression::isValid() const
+{
+    return m_context != 0;
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h
new file mode 100644
index 0000000..911d328
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeexpression.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEEXPRESSION_H
+#define QDECLARATIVEEXPRESSION_H
+
+#include "qdeclarativeerror.h"
+
+#include <QtCore/qobject.h>
+#include <QtCore/qvariant.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QString;
+class QDeclarativeRefCount;
+class QDeclarativeEngine;
+class QDeclarativeContext;
+class QDeclarativeExpressionPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeExpression();
+    QDeclarativeExpression(QDeclarativeContext *, const QString &, QObject *);
+    virtual ~QDeclarativeExpression();
+
+    QDeclarativeEngine *engine() const;
+    QDeclarativeContext *context() const;
+
+    QString expression() const;
+    void setExpression(const QString &);
+
+    bool notifyOnValueChanged() const;
+    void setNotifyOnValueChanged(bool);
+
+    QString sourceFile() const;
+    int lineNumber() const;
+    void setSourceLocation(const QString &fileName, int line);
+
+    QObject *scopeObject() const;
+
+    bool hasError() const;
+    void clearError();
+    QDeclarativeError error() const;
+
+    QVariant value(bool *isUndefined = 0);
+
+Q_SIGNALS:
+    void valueChanged();
+
+protected:
+    QDeclarativeExpression(QDeclarativeContext *, const QString &, QObject *, 
+                  QDeclarativeExpressionPrivate &dd);
+    QDeclarativeExpression(QDeclarativeContext *, void *, QDeclarativeRefCount *rc, QObject *me, const QString &,
+                  int, QDeclarativeExpressionPrivate &dd);
+
+private Q_SLOTS:
+    void __q_notify();
+
+private:
+    Q_DECLARE_PRIVATE(QDeclarativeExpression)
+    friend class QDeclarativeDebugger;
+    friend class QDeclarativeContext;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEEXPRESSION_H
+
diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h
new file mode 100644
index 0000000..91ac4c0
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeexpression_p.h
@@ -0,0 +1,189 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEEXPRESSION_P_H
+#define QDECLARATIVEEXPRESSION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeexpression.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeguard_p.h"
+
+#include <QtScript/qscriptvalue.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeAbstractExpression
+{
+public:
+    QDeclarativeAbstractExpression();
+    virtual ~QDeclarativeAbstractExpression();
+
+    bool isValid() const;
+
+    QDeclarativeContext *context() const;
+    void setContext(QDeclarativeContext *);
+
+    virtual void refresh();
+
+private:
+    friend class QDeclarativeContext;
+    friend class QDeclarativeContextPrivate;
+    QDeclarativeContext *m_context;
+    QDeclarativeAbstractExpression **m_prevExpression;
+    QDeclarativeAbstractExpression  *m_nextExpression;
+};
+
+class QDeclarativeDelayedError 
+{
+public:
+    inline QDeclarativeDelayedError() : nextError(0), prevError(0) {}
+    inline ~QDeclarativeDelayedError() { removeError(); }
+
+    QDeclarativeError error;
+
+    bool addError(QDeclarativeEnginePrivate *);
+
+    inline void removeError() {
+        if (!prevError) return;
+        if (nextError) nextError->prevError = prevError;
+        *prevError = nextError;
+        nextError = 0;
+        prevError = 0;
+    }
+
+private:
+    QDeclarativeDelayedError  *nextError;
+    QDeclarativeDelayedError **prevError;
+};
+
+class QDeclarativeExpressionData : public QDeclarativeAbstractExpression, public QDeclarativeDelayedError, public QDeclarativeRefCount
+{
+public:
+    QDeclarativeExpressionData();
+    virtual ~QDeclarativeExpressionData();
+
+    QDeclarativeExpressionPrivate *q;
+
+    QDeclarativeRefCount *dataRef;
+    QString expression;
+    bool expressionFunctionValid:1;
+    bool expressionRewritten:1;
+    QScriptValue expressionFunction;
+
+    QObject *me;
+    bool trackChange;
+
+    bool isShared;
+
+    QString url; // This is a QString for a reason.  QUrls are slooooooow...
+    int line;
+
+    struct SignalGuard : public QDeclarativeGuard<QObject> {
+        SignalGuard() : isDuplicate(false), notifyIndex(-1) {}
+
+        SignalGuard &operator=(QObject *obj) {
+            QDeclarativeGuard<QObject>::operator=(obj);
+            return *this;
+        }
+        SignalGuard &operator=(const SignalGuard &o) {
+            QDeclarativeGuard<QObject>::operator=(o);
+            isDuplicate = o.isDuplicate;
+            notifyIndex = o.notifyIndex;
+            return *this;
+        }
+
+        bool isDuplicate:1;
+        int notifyIndex:31;
+    };
+    SignalGuard *guardList;
+    int guardListLength;
+};
+
+class QDeclarativeExpression;
+class QString;
+class QDeclarativeExpressionPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeExpression)
+public:
+    QDeclarativeExpressionPrivate();
+    QDeclarativeExpressionPrivate(QDeclarativeExpressionData *);
+    ~QDeclarativeExpressionPrivate();
+
+    void init(QDeclarativeContext *, const QString &, QObject *);
+    void init(QDeclarativeContext *, void *, QDeclarativeRefCount *, QObject *, const QString &, int);
+
+    QDeclarativeExpressionData *data;
+
+    QVariant value(QObject *secondaryScope = 0, bool *isUndefined = 0);
+    QVariant evalQtScript(QObject *secondaryScope, bool *isUndefined = 0);
+
+    void updateGuards(const QPODVector<QDeclarativeEnginePrivate::CapturedProperty> &properties);
+    void clearGuards();
+
+    static QDeclarativeExpressionPrivate *get(QDeclarativeExpression *expr) {
+        return static_cast<QDeclarativeExpressionPrivate *>(QObjectPrivate::get(expr));
+    }
+    static QDeclarativeExpression *get(QDeclarativeExpressionPrivate *expr) {
+        return expr->q_func();
+    }
+
+    virtual void emitValueChanged();
+
+    static void exceptionToError(QScriptEngine *, QDeclarativeError &);
+    static QScriptValue evalInObjectScope(QDeclarativeContext *, QObject *, const QString &);
+    static QScriptValue evalInObjectScope(QDeclarativeContext *, QObject *, const QScriptProgram &);
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEEXPRESSION_P_H
diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h
new file mode 100644
index 0000000..a8ae064
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeextensioninterface.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEEXTENSIONINTERFACE_H
+#define QDECLARATIVEEXTENSIONINTERFACE_H
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeEngine;
+
+struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface
+{
+    virtual ~QDeclarativeExtensionInterface() {}
+    virtual void initialize(QDeclarativeEngine *engine, const char *uri) = 0;
+};
+
+Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, "com.trolltech.Qt.QDeclarativeExtensionInterface/1.0")
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEEXTENSIONINTERFACE_H
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.cpp b/src/declarative/qml/qdeclarativeextensionplugin.cpp
new file mode 100644
index 0000000..6af3a6d
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeextensionplugin.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeextensionplugin.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \since 4.7
+    \class QDeclarativeExtensionPlugin
+    \brief The QDeclarativeExtensionPlugin class provides an abstract base for custom QML extension plugins.
+
+    \ingroup plugins
+
+    QDeclarativeExtensionPlugin is a plugin interface that makes it
+    possible to offer extensions that can be loaded dynamically into
+    applications using the QDeclarativeEngine class.
+
+    Writing a QML extension plugin is achieved by subclassing this
+    base class, reimplementing the pure virtual initialize()
+    function, and exporting the class using the Q_EXPORT_PLUGIN2()
+    macro. See \l {How to Create Qt Plugins} for details.
+
+    \sa QDeclarativeEngine::importExtension()
+*/
+
+/*!
+    \fn void QDeclarativeExtensionPlugin::initialize(QDeclarativeEngine *engine)
+
+    Initializes the extension specified in the given \a engine.
+*/
+
+/*!
+    Constructs a QML extension plugin with the given \a parent.
+
+    Note that this constructor is invoked automatically by the
+    Q_EXPORT_PLUGIN2() macro, so there is no need for calling it
+    explicitly.
+*/
+QDeclarativeExtensionPlugin::QDeclarativeExtensionPlugin(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QDeclarativeExtensionPlugin::~QDeclarativeExtensionPlugin()
+{
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h
new file mode 100644
index 0000000..79df52b
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeextensionplugin.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEEXTENSIONPLUGIN_H
+#define QDECLARATIVEEXTENSIONPLUGIN_H
+
+#include <QtCore/qplugin.h>
+
+#include "qdeclarativeextensioninterface.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeEngine;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeExtensionPlugin : public QObject, public QDeclarativeExtensionInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativeExtensionInterface)
+public:
+    explicit QDeclarativeExtensionPlugin(QObject *parent = 0);
+    ~QDeclarativeExtensionPlugin();
+
+    virtual void initialize(QDeclarativeEngine *engine, const char *uri) = 0;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEEXTENSIONPLUGIN_H
diff --git a/src/declarative/qml/qdeclarativeglobal_p.h b/src/declarative/qml/qdeclarativeglobal_p.h
new file mode 100644
index 0000000..bbdc91c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeglobal_p.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEGLOBAL_H
+#define QDECLARATIVEGLOBAL_H
+
+#include <QtCore/qglobal.h>
+#include <QtCore/QObject>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+#define DEFINE_BOOL_CONFIG_OPTION(name, var) \
+    static bool name() \
+    { \
+        static enum { Yes, No, Unknown } status = Unknown; \
+        if (status == Unknown) { \
+            QByteArray v = qgetenv(#var); \
+            bool value = !v.isEmpty() && v != "0" && v != "false"; \
+            if (value) status = Yes; \
+            else status = No; \
+        } \
+        return status == Yes; \
+    }
+
+struct QDeclarativeGraphics_DerivedObject : public QObject
+{
+    void setParent_noEvent(QObject *parent) {
+        bool sce = d_ptr->sendChildEvents;
+        d_ptr->sendChildEvents = false;
+        setParent(parent);
+        d_ptr->sendChildEvents = sce;
+    }
+};
+
+/*!
+    Makes the \a object a child of \a parent.  Note that when using this method,
+    neither \a parent nor the object's previous parent (if it had one) will
+    receive ChildRemoved or ChildAdded events.
+*/
+inline void QDeclarativeGraphics_setParent_noEvent(QObject *object, QObject *parent)
+{
+    static_cast<QDeclarativeGraphics_DerivedObject *>(object)->setParent_noEvent(parent);
+}
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEGLOBAL_H
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
new file mode 100644
index 0000000..5b06b42
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeglobalscriptclass_p.h"
+
+#include <QtScript/qscriptstring.h>
+#include <QtScript/qscriptengine.h>
+#include <QtScript/qscriptvalueiterator.h>
+
+QT_BEGIN_NAMESPACE
+
+/*
+    Used to prevent any writes to the global object.
+*/
+QDeclarativeGlobalScriptClass::QDeclarativeGlobalScriptClass(QScriptEngine *engine)
+: QScriptClass(engine)
+{
+    QScriptValue v = engine->newObject();
+    globalObject = engine->globalObject();
+
+    QScriptValueIterator iter(globalObject);
+    while (iter.hasNext()) {
+        iter.next();
+        v.setProperty(iter.scriptName(), iter.value());
+    }
+
+    v.setScriptClass(this);
+    engine->setGlobalObject(v);
+}
+
+QScriptClass::QueryFlags 
+QDeclarativeGlobalScriptClass::queryProperty(const QScriptValue &object,
+                                    const QScriptString &name,
+                                    QueryFlags flags, uint *id)
+{
+    Q_UNUSED(object);
+    Q_UNUSED(name);
+    Q_UNUSED(flags);
+    Q_UNUSED(id);
+    return HandlesReadAccess | HandlesWriteAccess;
+}
+
+QScriptValue 
+QDeclarativeGlobalScriptClass::property(const QScriptValue &object,
+                               const QScriptString &name, 
+                               uint id)
+{
+    Q_UNUSED(object);
+    Q_UNUSED(name);
+    Q_UNUSED(id);
+    return engine()->undefinedValue();
+}
+
+void QDeclarativeGlobalScriptClass::setProperty(QScriptValue &object, 
+                                       const QScriptString &name,
+                                       uint id, const QScriptValue &value)
+{
+    Q_UNUSED(object);
+    Q_UNUSED(id);
+    Q_UNUSED(value);
+    QString error = QLatin1String("Invalid write to global property \"") + 
+                    name.toString() + QLatin1Char('\"');
+    engine()->currentContext()->throwError(error);
+}
+
+void QDeclarativeGlobalScriptClass::explicitSetProperty(const QString &name, const QScriptValue &value)
+{
+    QScriptValue v = engine()->newObject();
+    globalObject = engine()->globalObject();
+
+    QScriptValueIterator iter(globalObject);
+    while (iter.hasNext()) {
+        iter.next();
+        v.setProperty(iter.scriptName(), iter.value());
+    }
+
+    v.setProperty(name, value);
+    v.setScriptClass(this);
+    engine()->setGlobalObject(v);
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
new file mode 100644
index 0000000..a33cf5e
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEGLOBALSCRIPTCLASS_P_H
+#define QDECLARATIVEGLOBALSCRIPTCLASS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtScript/qscriptclass.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_AUTOTEST_EXPORT QDeclarativeGlobalScriptClass : public QScriptClass
+{
+public:
+    QDeclarativeGlobalScriptClass(QScriptEngine *);
+
+    virtual QueryFlags queryProperty(const QScriptValue &object,
+                                     const QScriptString &name,
+                                     QueryFlags flags, uint *id);
+
+    virtual QScriptValue property(const QScriptValue &object,
+                                  const QScriptString &name, uint id);
+
+    virtual void setProperty(QScriptValue &object, const QScriptString &name,
+                             uint id, const QScriptValue &value);
+
+    void explicitSetProperty(const QString &, const QScriptValue &);
+
+private:
+    QScriptValue globalObject;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEGLOBALSCRIPTCLASS_P_H
diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h
new file mode 100644
index 0000000..9d82d01
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeguard_p.h
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEGUARD_P_H
+#define QDECLARATIVEGUARD_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
+// file may change from version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QObject;
+template<class T>
+class QDeclarativeGuard
+{
+    QObject *o;
+    QDeclarativeGuard<QObject> *next;
+    QDeclarativeGuard<QObject> **prev;
+    friend class QDeclarativeDeclarativeData;
+public:
+    inline QDeclarativeGuard();
+    inline QDeclarativeGuard(T *);
+    inline QDeclarativeGuard(const QDeclarativeGuard<T> &);
+    inline virtual ~QDeclarativeGuard();
+
+    inline QDeclarativeGuard<T> &operator=(const QDeclarativeGuard<T> &o);
+    inline QDeclarativeGuard<T> &operator=(T *);
+    
+    inline bool isNull() const
+        { return !o; }
+
+    inline T* operator->() const
+        { return static_cast<T*>(const_cast<QObject*>(o)); }
+    inline T& operator*() const
+        { return *static_cast<T*>(const_cast<QObject*>(o)); }
+    inline operator T*() const
+        { return static_cast<T*>(const_cast<QObject*>(o)); }
+    inline T* data() const
+        { return static_cast<T*>(const_cast<QObject*>(o)); }
+
+protected:
+    virtual void objectDestroyed(T *) {}
+
+private:
+    inline void addGuard();
+    inline void remGuard();
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDeclarativeGuard<QObject>);
+
+#include "qdeclarativedeclarativedata_p.h"
+
+QT_BEGIN_NAMESPACE
+
+template<class T>
+QDeclarativeGuard<T>::QDeclarativeGuard()
+: o(0), next(0), prev(0)
+{
+}
+
+template<class T>
+QDeclarativeGuard<T>::QDeclarativeGuard(T *g)
+: o(g), next(0), prev(0)
+{
+    if (o) addGuard();
+}
+
+template<class T>
+QDeclarativeGuard<T>::QDeclarativeGuard(const QDeclarativeGuard<T> &g)
+: o(g.o), next(0), prev(0)
+{
+    if (o) addGuard();
+}
+
+template<class T>
+QDeclarativeGuard<T>::~QDeclarativeGuard()
+{
+    if (prev) remGuard();
+    o = 0;
+}
+
+template<class T>
+QDeclarativeGuard<T> &QDeclarativeGuard<T>::operator=(const QDeclarativeGuard<T> &g)
+{
+    if (g.o != o) {
+        if (prev) remGuard();
+        o = g.o;
+        if (o) addGuard();
+    }
+    return *this;
+}
+
+template<class T>
+QDeclarativeGuard<T> &QDeclarativeGuard<T>::operator=(T *g)
+{
+    if (g != o) {
+        if (prev) remGuard();
+        o = g;
+        if (o) addGuard();
+    }
+    return *this;
+}
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEGUARD_P_H
diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp
new file mode 100644
index 0000000..daa2e87
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeimageprovider.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeimageprovider.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativeImageProvider
+    \brief The QDeclarativeImageProvider class provides an interface for threaded image requests.
+
+    Note: the request() method may be called by multiple threads, so ensure the
+    implementation of this method is reentrant.
+
+    \sa QDeclarativeEngine::addImageProvider()
+*/
+QDeclarativeImageProvider::~QDeclarativeImageProvider()
+{
+}
+
+/*!
+    \fn QImage QDeclarativeImageProvider::request(const QString &id)
+
+    Implement this method to return the image with \a id.
+
+    Note: this method may be called by multiple threads, so ensure the
+    implementation of this method is reentrant.
+*/
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h
new file mode 100644
index 0000000..6ee7bcf
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeimageprovider.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEIMAGEPROVIDER_H
+#define QDECLARATIVEIMAGEPROVIDER_H
+
+#include <QtGui/qimage.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_DECLARATIVE_EXPORT QDeclarativeImageProvider
+{
+public:
+    virtual ~QDeclarativeImageProvider();
+    virtual QImage request(const QString &id) = 0;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEIMAGEPROVIDER
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
new file mode 100644
index 0000000..41d09c4
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeinfo.h"
+
+#include "qdeclarativedeclarativedata_p.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativemetatype.h"
+
+#include <QCoreApplication>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \fn QDeclarativeInfo qmlInfo(const QObject *object)
+
+    \brief Prints warnings messages that include the file and line number for QML types.
+
+    When QML types display warning messages, it improves traceability
+    if they include the QML file and line number on which the
+    particular instance was instantiated.
+    
+    To include the file and line number, an object must be passed.  If
+    the file and line number is not available for that instance
+    (either it was not instantiated by the QML engine or location
+    information is disabled), "unknown location" will be used instead.
+
+    For example, 
+
+    \code
+    qmlInfo(object) << tr("component property is a write-once property");
+    \endcode
+
+    prints
+
+    \code
+    QML MyCustomType (unknown location): component property is a write-once property
+    \endcode
+*/
+
+QDeclarativeInfo::QDeclarativeInfo(const QObject *object)
+: QDebug(QtWarningMsg)
+{
+    QString pos = QLatin1String("QML");
+    if (object) {
+        pos += QLatin1Char(' ');
+
+        QString typeName;
+        QDeclarativeType *type = QDeclarativeMetaType::qmlType(object->metaObject());
+        if (type) {
+            typeName = QLatin1String(type->qmlTypeName());
+            int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
+            if (lastSlash != -1)
+                typeName = typeName.mid(lastSlash+1);
+        } else {
+            typeName = QString::fromUtf8(object->metaObject()->className());
+            int marker = typeName.indexOf(QLatin1String("_QMLTYPE_"));
+            if (marker != -1)
+                typeName = typeName.left(marker);
+        }
+
+        pos += typeName;
+    }
+    QDeclarativeDeclarativeData *ddata = object?QDeclarativeDeclarativeData::get(object):0;
+    pos += QLatin1String(" (");
+    if (ddata) {
+        if (ddata->outerContext) {
+            pos += ddata->outerContext->baseUrl().toString();
+            pos += QLatin1Char(':');
+            pos += QString::number(ddata->lineNumber);
+            pos += QLatin1Char(':');
+            pos += QString::number(ddata->columnNumber);
+        } else {
+            pos += QCoreApplication::translate("QDeclarativeInfo","unknown location");
+        }
+    } else {
+        pos += QCoreApplication::translate("QDeclarativeInfo","unknown location");
+    }
+    pos += QLatin1Char(')');
+    *this << pos;
+    nospace();
+}
+
+QDeclarativeInfo::~QDeclarativeInfo()
+{
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h
new file mode 100644
index 0000000..8f69f73
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeinfo.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEINFO_H
+#define QDECLARATIVEINFO_H
+
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug
+{
+public:
+    QDeclarativeInfo(const QObject *);
+    ~QDeclarativeInfo();
+
+    inline QDeclarativeInfo &operator<<(QChar t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(QBool t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(bool t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(char t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(signed short t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(unsigned short t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(signed int t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(unsigned int t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(signed long t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(unsigned long t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(qint64 t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(quint64 t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(float t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(double t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(const char* t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(const QString & t) { QDebug::operator<<(t.toLocal8Bit().constData()); return *this; }
+    inline QDeclarativeInfo &operator<<(const QStringRef & t) { return operator<<(t.toString()); }
+    inline QDeclarativeInfo &operator<<(const QLatin1String &t) { QDebug::operator<<(t.latin1()); return *this; }
+    inline QDeclarativeInfo &operator<<(const QByteArray & t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(const void * t) { QDebug::operator<<(t); return *this; }
+    inline QDeclarativeInfo &operator<<(QTextStreamFunction f) { QDebug::operator<<(f); return *this; }
+    inline QDeclarativeInfo &operator<<(QTextStreamManipulator m) { QDebug::operator<<(m); return *this; }
+};
+
+Q_DECLARATIVE_EXPORT inline QDeclarativeInfo qmlInfo(const QObject *me)
+{
+    return QDeclarativeInfo(me);
+}
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEINFO_H
diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp
new file mode 100644
index 0000000..cf485fe
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeinstruction.cpp
@@ -0,0 +1,210 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeinstruction_p.h"
+
+#include "qdeclarativecompiler_p.h"
+
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+void QDeclarativeCompiledData::dump(QDeclarativeInstruction *instr, int idx)
+{
+    QByteArray lineNumber = QByteArray::number(instr->line);
+    if (instr->line == (unsigned short)-1)
+        lineNumber = "NA";
+    const char *line = lineNumber.constData();
+
+    switch(instr->type) {
+    case QDeclarativeInstruction::Init:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "INIT\t\t\t" << instr->init.bindingsSize << "\t" << instr->init.parserStatusSize << "\t" << instr->init.contextCache << "\t" << instr->init.compiledBinding;
+        break;
+    case QDeclarativeInstruction::CreateObject:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "CREATE\t\t\t" << instr->create.type << "\t\t\t" << types.at(instr->create.type).className;
+        break;
+    case QDeclarativeInstruction::SetId:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "SETID\t\t\t" << instr->setId.value << "\t\t\t" << primitives.at(instr->setId.value);
+        break;
+    case QDeclarativeInstruction::SetDefault:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "SET_DEFAULT";
+        break;
+    case QDeclarativeInstruction::CreateComponent:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "CREATE_COMPONENT\t" << instr->createComponent.count;
+        break;
+    case QDeclarativeInstruction::StoreMetaObject:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_META\t\t" << instr->storeMeta.data;
+        break;
+
+    case QDeclarativeInstruction::StoreFloat:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_FLOAT\t\t" << instr->storeFloat.propertyIndex << "\t" << instr->storeFloat.value;
+        break;
+    case QDeclarativeInstruction::StoreDouble:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_DOUBLE\t\t" << instr->storeDouble.propertyIndex << "\t" << instr->storeDouble.value;
+        break;
+    case QDeclarativeInstruction::StoreInteger:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_INTEGER\t\t" << instr->storeInteger.propertyIndex << "\t" << instr->storeInteger.value;
+        break;
+    case QDeclarativeInstruction::StoreBool:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_BOOL\t\t" << instr->storeBool.propertyIndex << "\t" << instr->storeBool.value;
+        break;
+    case QDeclarativeInstruction::StoreString:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_STRING\t\t" << instr->storeString.propertyIndex << "\t" << instr->storeString.value << "\t\t" << primitives.at(instr->storeString.value);
+        break;
+    case QDeclarativeInstruction::StoreUrl:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_URL\t\t" << instr->storeUrl.propertyIndex << "\t" << instr->storeUrl.value << "\t\t" << primitives.at(instr->storeUrl.value);
+        break;
+    case QDeclarativeInstruction::StoreColor:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_COLOR\t\t" << instr->storeColor.propertyIndex << "\t\t\t" << QString::number(instr->storeColor.value, 16);
+        break;
+    case QDeclarativeInstruction::StoreDate:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_DATE\t\t" << instr->storeDate.propertyIndex << "\t" << instr->storeDate.value;
+        break;
+    case QDeclarativeInstruction::StoreTime:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_TIME\t\t" << instr->storeTime.propertyIndex << "\t" << instr->storeTime.valueIndex;
+        break;
+    case QDeclarativeInstruction::StoreDateTime:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_DATETIME\t\t" << instr->storeDateTime.propertyIndex << "\t" << instr->storeDateTime.valueIndex;
+        break;
+    case QDeclarativeInstruction::StorePoint:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_POINT\t\t" << instr->storeRealPair.propertyIndex << "\t" << instr->storeRealPair.valueIndex;
+        break;
+    case QDeclarativeInstruction::StorePointF:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_POINTF\t\t" << instr->storeRealPair.propertyIndex << "\t" << instr->storeRealPair.valueIndex;
+        break;
+    case QDeclarativeInstruction::StoreSize:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SIZE\t\t" << instr->storeRealPair.propertyIndex << "\t" << instr->storeRealPair.valueIndex;
+        break;
+    case QDeclarativeInstruction::StoreSizeF:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SIZEF\t\t" << instr->storeRealPair.propertyIndex << "\t" << instr->storeRealPair.valueIndex;
+        break;
+    case QDeclarativeInstruction::StoreRect:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_RECT\t\t" << instr->storeRect.propertyIndex << "\t" << instr->storeRect.valueIndex;
+        break;
+    case QDeclarativeInstruction::StoreRectF:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_RECTF\t\t" << instr->storeRect.propertyIndex << "\t" << instr->storeRect.valueIndex;
+        break;
+    case QDeclarativeInstruction::StoreVector3D:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VECTOR3D\t\t" << instr->storeVector3D.propertyIndex << "\t" << instr->storeVector3D.valueIndex;
+        break;
+    case QDeclarativeInstruction::StoreVariant:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VARIANT\t\t" << instr->storeString.propertyIndex << "\t" << instr->storeString.value << "\t\t" << primitives.at(instr->storeString.value);
+        break;
+    case QDeclarativeInstruction::StoreObject:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_OBJECT\t\t" << instr->storeObject.propertyIndex;
+        break;
+    case QDeclarativeInstruction::StoreVariantObject:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VARIANT_OBJECT\t" << instr->storeObject.propertyIndex;
+        break;
+    case QDeclarativeInstruction::StoreInterface:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_INTERFACE\t\t" << instr->storeObject.propertyIndex;
+        break;
+
+    case QDeclarativeInstruction::StoreSignal:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SIGNAL\t\t" << instr->storeSignal.signalIndex << "\t" << instr->storeSignal.value << "\t\t" << primitives.at(instr->storeSignal.value);
+        break;
+    case QDeclarativeInstruction::StoreScript:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SCRIPT\t\t" << instr->storeScript.value;
+        break;
+    case QDeclarativeInstruction::StoreScriptString:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SCRIPT_STRING\t" << instr->storeScriptString.propertyIndex << "\t" << instr->storeScriptString.value << "\t" << instr->storeScriptString.scope;
+        break;
+
+    case QDeclarativeInstruction::AssignSignalObject:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "ASSIGN_SIGNAL_OBJECT\t" << instr->assignSignalObject.signal << "\t\t\t" << datas.at(instr->assignSignalObject.signal);
+        break;
+    case QDeclarativeInstruction::AssignCustomType:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "ASSIGN_CUSTOMTYPE\t" << instr->assignCustomType.propertyIndex << "\t" << instr->assignCustomType.valueIndex;
+        break;
+
+    case QDeclarativeInstruction::StoreBinding:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_BINDING\t" << instr->assignBinding.property << "\t" << instr->assignBinding.value << "\t" << instr->assignBinding.context;
+        break;
+    case QDeclarativeInstruction::StoreCompiledBinding:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_COMPILED_BINDING\t" << instr->assignBinding.property << "\t" << instr->assignBinding.value << "\t" << instr->assignBinding.context;
+        break;
+    case QDeclarativeInstruction::StoreValueSource:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VALUE_SOURCE\t" << instr->assignValueSource.property << "\t" << instr->assignValueSource.castValue;
+        break;
+    case QDeclarativeInstruction::StoreValueInterceptor:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VALUE_INTERCEPTOR\t" << instr->assignValueInterceptor.property << "\t" << instr->assignValueInterceptor.castValue;
+        break;
+
+    case QDeclarativeInstruction::BeginObject:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "BEGIN\t\t\t" << instr->begin.castValue;
+        break;
+    case QDeclarativeInstruction::StoreObjectQList:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_OBJECT_QLIST";
+        break;
+    case QDeclarativeInstruction::AssignObjectList:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "ASSIGN_OBJECT_LIST";
+        break;
+    case QDeclarativeInstruction::FetchAttached:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "FETCH_ATTACHED\t\t" << instr->fetchAttached.id;
+        break;
+    case QDeclarativeInstruction::FetchQList:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "FETCH_QLIST\t\t" << instr->fetch.property;
+        break;
+    case QDeclarativeInstruction::FetchObject:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "FETCH\t\t\t" << instr->fetch.property;
+        break;
+    case QDeclarativeInstruction::FetchValueType:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "FETCH_VALUE\t\t" << instr->fetchValue.property << "\t" << instr->fetchValue.type;
+        break;
+    case QDeclarativeInstruction::PopFetchedObject:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "POP";
+        break;
+    case QDeclarativeInstruction::PopQList:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "POP_QLIST";
+        break;
+    case QDeclarativeInstruction::PopValueType:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "POP_VALUE\t\t" << instr->fetchValue.property << "\t" << instr->fetchValue.type;
+        break;
+    case QDeclarativeInstruction::Defer:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "DEFER" << "\t\t\t" << instr->defer.deferCount;
+        break;
+    default:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKOWN INSTRUCTION" << "\t" << instr->type;
+        break;
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeinstruction_p.h b/src/declarative/qml/qdeclarativeinstruction_p.h
new file mode 100644
index 0000000..d8af6a7
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeinstruction_p.h
@@ -0,0 +1,319 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEINSTRUCTION_P_H
+#define QDECLARATIVEINSTRUCTION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeCompiledData;
+class Q_DECLARATIVE_EXPORT QDeclarativeInstruction
+{
+public:
+    enum Type { 
+        //
+        // Object Creation
+        //
+        //    CreateObject - Create a new object instance and push it on the 
+        //                   object stack
+        //    SetId - Set the id of the object on the top of the object stack
+        //    SetDefault - Sets the instance on the top of the object stack to
+        //                 be the context's default object.
+        //    StoreMetaObject - Assign the dynamic metaobject to object on the
+        //                      top of the stack.
+        Init,                     /* init */
+        CreateObject,             /* create */
+        SetId,                    /* setId */
+        SetDefault,
+        CreateComponent,          /* createComponent */
+        StoreMetaObject,          /* storeMeta */
+
+        //
+        // Precomputed single assignment
+        //
+        //    StoreFloat - Store a float in a core property
+        //    StoreDouble - Store a double in a core property
+        //    StoreInteger - Store a int or uint in a core property
+        //    StoreBool - Store a bool in a core property
+        //    StoreString - Store a QString in a core property
+        //    StoreUrl - Store a QUrl in a core property
+        //    StoreColor - Store a QColor in a core property
+        //    StoreDate - Store a QDate in a core property
+        //    StoreTime - Store a QTime in a core property
+        //    StoreDateTime - Store a QDateTime in a core property
+        //    StoreVariant - Store a QVariant in a core property
+        //    StoreObject - Pop the object on the top of the object stack and
+        //                  store it in a core property
+        StoreFloat,               /* storeFloat */
+        StoreDouble,              /* storeDouble */
+        StoreInteger,             /* storeInteger */
+        StoreBool,                /* storeBool */
+        StoreString,              /* storeString */
+        StoreUrl,                 /* storeUrl */
+        StoreColor,               /* storeColor */
+        StoreDate,                /* storeDate */
+        StoreTime,                /* storeTime */
+        StoreDateTime,            /* storeDateTime */
+        StorePoint,               /* storeRealPair */
+        StorePointF,              /* storeRealPair */
+        StoreSize,                /* storeRealPair */
+        StoreSizeF,               /* storeRealPair */
+        StoreRect,                /* storeRect */
+        StoreRectF,               /* storeRect */
+        StoreVector3D,            /* storeVector3D */
+        StoreVariant,             /* storeString */
+        StoreObject,              /* storeObject */
+        StoreVariantObject,       /* storeObject */
+        StoreInterface,           /* storeObject */
+
+        StoreSignal,              /* storeSignal */
+        StoreScript,              /* storeScript */
+        StoreScriptString,        /* storeScriptString */
+
+        //
+        // Unresolved single assignment
+        //
+        AssignSignalObject,       /* assignSignalObject */
+        AssignCustomType,         /* assignCustomType */
+
+        StoreBinding,             /* assignBinding */
+        StoreCompiledBinding,     /* assignBinding */
+        StoreValueSource,         /* assignValueSource */
+        StoreValueInterceptor,    /* assignValueInterceptor */
+
+        BeginObject,              /* begin */
+
+        StoreObjectQList,         /* NA */
+        AssignObjectList,         /* NA */
+
+        FetchAttached,            /* fetchAttached */
+        FetchQList,               /* fetch */
+        FetchObject,              /* fetch */
+        FetchValueType,           /* fetchValue */
+
+        //
+        // Stack manipulation
+        // 
+        //    PopFetchedObject - Remove an object from the object stack
+        //    PopQList - Remove a list from the list stack
+        PopFetchedObject,
+        PopQList,
+        PopValueType,            /* fetchValue */
+
+        // 
+        // Deferred creation
+        //
+        Defer,                    /* defer */
+    };
+    QDeclarativeInstruction()
+        : line(0) {}
+
+    Type type;
+    unsigned short line;
+    union {
+        struct {
+            int bindingsSize;
+            int parserStatusSize;
+            int contextCache;
+            int compiledBinding;
+        } init;
+        struct {
+            int type;
+            int data;
+            int bindingBits;
+            ushort column;
+        } create;
+        struct {
+            int data;
+            int aliasData;
+            int propertyCache;
+        } storeMeta;
+        struct {
+            int value;
+            int index;
+        } setId;
+        struct {
+            int property;
+            int owner;
+            int castValue;
+        } assignValueSource;
+        struct {
+            int property;
+            int owner;
+            int castValue;
+        } assignValueInterceptor;
+        struct {
+            unsigned int property;
+            int value;
+            short context;
+            short owner;
+        } assignBinding;
+        struct {
+            int property;
+            int id;
+        } assignIdOptBinding;
+        struct {
+            int property;
+            int contextIdx;
+            short context;
+            short notifyIdx;
+        } assignObjPropBinding;
+        struct {
+            int property;
+        } fetch;
+        struct {
+            int property;
+            int type;
+        } fetchValue;
+        struct {
+            int property;
+            int type;
+        } fetchQmlList;
+        struct {
+            int castValue;
+        } begin;
+        struct {
+            int propertyIndex;
+            float value;
+        } storeFloat;
+        struct {
+            int propertyIndex;
+            double value;
+        } storeDouble;
+        struct {
+            int propertyIndex;
+            int value;
+        } storeInteger;
+        struct {
+            int propertyIndex;
+            bool value;
+        } storeBool;
+        struct {
+            int propertyIndex;
+            int value;
+        } storeString;
+        struct {
+            int propertyIndex;
+            int value;
+            int scope;
+        } storeScriptString;
+        struct {
+            int value;
+        } storeScript;
+        struct {
+            int propertyIndex;
+            int value;
+        } storeUrl;
+        struct {
+            int propertyIndex;
+            unsigned int value;
+        } storeColor;
+        struct {
+            int propertyIndex;
+            int value;
+        } storeDate;
+        struct {
+            int propertyIndex;
+            int valueIndex;
+        } storeTime;
+        struct {
+            int propertyIndex;
+            int valueIndex;
+        } storeDateTime;
+        struct {
+            int propertyIndex;
+            int valueIndex;
+        } storeRealPair;
+        struct {
+            int propertyIndex;
+            int valueIndex;
+        } storeRect;
+        struct {
+            int propertyIndex;
+            int valueIndex;
+        } storeVector3D;
+        struct {
+            int propertyIndex;
+        } storeObject;
+        struct {
+            int propertyIndex;
+            int valueIndex;
+        } assignCustomType;
+        struct {
+            int signalIndex;
+            int value;
+        } storeSignal;
+        struct {
+            int signal;
+        } assignSignalObject;
+        struct {
+            int count;
+            ushort column;
+            int endLine;
+            int metaObject;
+        } createComponent;
+        struct {
+            int id;
+        } fetchAttached;
+        struct {
+            int deferCount;
+        } defer;
+    };
+
+    void dump(QDeclarativeCompiledData *);
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEINSTRUCTION_P_H
diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp
new file mode 100644
index 0000000..7fa4b0c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeintegercache.cpp
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeintegercache_p.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativemetatype.h"
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeIntegerCache::QDeclarativeIntegerCache(QDeclarativeEngine *e)
+: QDeclarativeCleanup(e), engine(e)
+{
+}
+
+QDeclarativeIntegerCache::~QDeclarativeIntegerCache()
+{
+    clear();
+}
+
+void QDeclarativeIntegerCache::clear()
+{
+    qDeleteAll(stringCache);
+    stringCache.clear();
+    identifierCache.clear();
+    engine = 0;
+}
+
+void QDeclarativeIntegerCache::add(const QString &id, int value)
+{
+    Q_ASSERT(!stringCache.contains(id));
+
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+
+    // ### use contextClass
+    Data *d = new Data(enginePriv->objectClass->createPersistentIdentifier(id), value);
+
+    stringCache.insert(id, d);
+    identifierCache.insert(d->identifier, d);
+}
+
+int QDeclarativeIntegerCache::value(const QString &id)
+{
+    Data *d = stringCache.value(id);
+    return d?d->value:-1;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeintegercache_p.h b/src/declarative/qml/qdeclarativeintegercache_p.h
new file mode 100644
index 0000000..b57565e
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeintegercache_p.h
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEINTEGERCACHE_P_H
+#define QDECLARATIVEINTEGERCACHE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativerefcount_p.h"
+#include "qdeclarativecleanup_p.h"
+
+#include <QtCore/qhash.h>
+
+#include <private/qscriptdeclarativeclass_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeType;
+class QDeclarativeEngine;
+class QDeclarativeIntegerCache : public QDeclarativeRefCount, public QDeclarativeCleanup
+{
+public:
+    QDeclarativeIntegerCache(QDeclarativeEngine *);
+    virtual ~QDeclarativeIntegerCache();
+
+    inline int count() const;
+    void add(const QString &, int);
+    int value(const QString &);
+    inline int value(const QScriptDeclarativeClass::Identifier &id) const;
+
+protected:
+    virtual void clear();
+
+private:
+    struct Data : public QScriptDeclarativeClass::PersistentIdentifier {
+        Data(const QScriptDeclarativeClass::PersistentIdentifier &i, int v) 
+        : QScriptDeclarativeClass::PersistentIdentifier(i), value(v) {}
+
+        int value;
+    };
+
+    typedef QHash<QString, Data *> StringCache;
+    typedef QHash<QScriptDeclarativeClass::Identifier, Data *> IdentifierCache;
+
+    StringCache stringCache;
+    IdentifierCache identifierCache;
+    QDeclarativeEngine *engine;
+};
+
+int QDeclarativeIntegerCache::value(const QScriptDeclarativeClass::Identifier &id) const
+{
+    Data *d = identifierCache.value(id);
+    return d?d->value:-1;
+}
+
+int QDeclarativeIntegerCache::count() const 
+{
+    return stringCache.count();
+}
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEINTEGERCACHE_P_H
+
diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp
new file mode 100644
index 0000000..4c9586c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativelist.cpp
@@ -0,0 +1,312 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativelist.h"
+#include "qdeclarativelist_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativemetaproperty_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeListReferencePrivate::QDeclarativeListReferencePrivate()
+: propertyType(-1), refCount(1)
+{
+}
+
+QDeclarativeListReference QDeclarativeListReferencePrivate::init(const QDeclarativeListProperty<QObject> &prop, int propType, QDeclarativeEngine *engine)
+{
+    QDeclarativeListReference rv;
+
+    if (!prop.object) return rv;
+
+    QDeclarativeEnginePrivate *p = engine?QDeclarativeEnginePrivate::get(engine):0;
+
+    int listType = p?p->listType(propType):QDeclarativeMetaType::listType(propType);
+    if (listType == -1) return rv;
+
+    rv.d = new QDeclarativeListReferencePrivate;
+    rv.d->object = prop.object;
+    rv.d->elementType = p?p->rawMetaObjectForType(listType):QDeclarativeMetaType::qmlType(listType)->baseMetaObject();
+    rv.d->property = prop;
+    rv.d->propertyType = propType;
+
+    return rv;
+}
+
+void QDeclarativeListReferencePrivate::addref()
+{
+    Q_ASSERT(refCount > 0);
+    ++refCount;
+}
+
+void QDeclarativeListReferencePrivate::release()
+{
+    Q_ASSERT(refCount > 0);
+    --refCount;
+    if (!refCount)
+        delete this;
+}
+
+QDeclarativeListReference::QDeclarativeListReference()
+: d(0)
+{
+}
+
+QDeclarativeListReference::QDeclarativeListReference(QObject *o, const char *property, QDeclarativeEngine *engine)
+: d(0)
+{
+    if (!o || !property) return;
+
+    QDeclarativePropertyCache::Data local;
+    QDeclarativePropertyCache::Data *data = QDeclarativePropertyCache::property(engine, o, QLatin1String(property), local);
+
+    if (!data || !(data->flags & QDeclarativePropertyCache::Data::IsQList)) return;
+
+    QDeclarativeEnginePrivate *p = engine?QDeclarativeEnginePrivate::get(engine):0;
+
+    int listType = p?p->listType(data->propType):QDeclarativeMetaType::listType(data->propType);
+    if (listType == -1) return;
+
+    d = new QDeclarativeListReferencePrivate;
+    d->object = o;
+    d->elementType = p?p->rawMetaObjectForType(listType):QDeclarativeMetaType::qmlType(listType)->baseMetaObject();
+    d->propertyType = data->propType;
+
+    void *args[] = { &d->property, 0 };
+    QMetaObject::metacall(o, QMetaObject::ReadProperty, data->coreIndex, args);
+}
+
+QDeclarativeListReference::QDeclarativeListReference(const QDeclarativeListReference &o)
+: d(o.d)
+{
+    if (d) d->addref();
+}
+
+QDeclarativeListReference &QDeclarativeListReference::operator=(const QDeclarativeListReference &o)
+{
+    if (o.d) o.d->addref();
+    if (d) d->release();
+    d = o.d;
+    return *this;
+}
+
+QDeclarativeListReference::~QDeclarativeListReference()
+{
+    if (d) d->release();
+}
+
+bool QDeclarativeListReference::isValid() const
+{
+    return d && d->object;
+}
+
+QObject *QDeclarativeListReference::object() const
+{
+    if (isValid()) return d->object;
+    else return 0;
+}
+
+const QMetaObject *QDeclarativeListReference::listElementType() const
+{
+    if (isValid()) return d->elementType;
+    else return 0;
+}
+
+bool QDeclarativeListReference::canAppend() const
+{
+    return (isValid() && d->property.append);
+}
+
+bool QDeclarativeListReference::canAt() const
+{
+    return (isValid() && d->property.at);
+}
+
+bool QDeclarativeListReference::canClear() const
+{
+    return (isValid() && d->property.clear);
+}
+
+bool QDeclarativeListReference::canCount() const
+{
+    return (isValid() && d->property.count);
+}
+
+bool QDeclarativeListReference::append(QObject *o) const
+{
+    if (!canAppend()) return false;
+
+    if (o && !QDeclarativeMetaPropertyPrivate::canConvert(o->metaObject(), d->elementType))
+        return false;
+
+    d->property.append(&d->property, o);
+
+    return true;
+}
+
+QObject *QDeclarativeListReference::at(int index) const
+{
+    if (!canAt()) return 0;
+
+    return d->property.at(&d->property, index);
+}
+
+bool QDeclarativeListReference::clear() const
+{
+    if (!canClear()) return false;
+
+    d->property.clear(&d->property);
+
+    return true;
+}
+
+int QDeclarativeListReference::count() const
+{
+    if (!canCount()) return 0;
+
+    return d->property.count(&d->property);
+}
+
+/*!
+\class QDeclarativeListProperty
+\brief The QDeclarativeListProperty class allows applications to explose list-like 
+properties to QML.
+
+QML has many list properties, where more than one object value can be assigned.
+The use of a list property from QML looks like this:
+
+\code
+FruitBasket {
+    fruit: [ 
+             Apple {},
+             Orange{},
+             Banana {}
+           ]
+}
+\endcode
+
+The QDeclarativeListProperty encapsulates a group of function pointers that represet the
+set of actions QML can perform on the list - adding items, retrieving items and
+clearing the list.  In the future, additional operations may be supported.  All 
+list properties must implement the append operation, but the rest are optional.
+
+To provide a list property, a C++ class must implement the operation callbacks, 
+and then return an appropriate QDeclarativeListProperty value from the property getter.
+List properties should have no setter.  In the example above, the Q_PROPERTY()
+declarative will look like this:
+
+\code
+Q_PROPERTY(QDeclarativeListProperty<Fruit> fruit READ fruit);
+\endcode
+
+QML list properties are typesafe - in this case \c {Fruit} is a QObject type that 
+\c {Apple}, \c {Orange} and \c {Banana} all derive from.
+*/
+
+/*!
+\fn QDeclarativeListProperty::QDeclarativeListProperty() 
+\internal
+*/
+
+/*!
+\fn QDeclarativeListProperty::QDeclarativeListProperty(QObject *object, QList<T *> &list)
+
+Convenience constructor for making a QDeclarativeListProperty value from an existing
+QList \a list.  The \a list reference must remain valid for as long as \a object
+exists.  \a object must be provided.
+
+Generally this constructor should not be used in production code, as a 
+writable QList violates QML's memory management rules.  However, this constructor
+can very useful while prototyping.
+*/
+
+/*!
+\fn QDeclarativeListProperty::QDeclarativeListProperty(QObject *object, void *data, AppendFunction append, 
+                                     CountFunction count = 0, AtFunction at = 0, 
+                                     ClearFunction clear = 0)
+
+Construct a QDeclarativeListProperty from a set of operation functions.  An opaque \a data handle
+may be passed which can be accessed from within the operation functions.  The list property 
+remains valid while \a object exists.
+
+The \a append operation is compulsory and must be provided, while the \a count, \a at and
+\a clear methods are optional.
+*/
+
+/*!
+\typedef QDeclarativeListProperty::AppendFunction
+
+Synonym for \c {void (*)(QDeclarativeListProperty<T> *property, T *value)}.
+
+Append the \a value to the list \a property.
+*/
+
+/*!
+\typedef QDeclarativeListProperty::CountFunction
+
+Synonym for \c {int (*)(QDeclarativeListProperty<T> *property)}.
+
+Return the number of elements in the list \a property.
+*/
+
+/*!
+\fn bool QDeclarativeListProperty::operator==(const QDeclarativeListProperty &other) const 
+
+Returns true if this QDeclarativeListProperty is equal to \a other, otherwise false.
+*/
+
+/*!
+\typedef QDeclarativeListProperty::AtFunction
+
+Synonym for \c {T *(*)(QDeclarativeListProperty<T> *property, int index)}.
+
+Return the element at position \a index in the list \a property.
+*/
+
+/*!
+\typedef QDeclarativeListProperty::ClearFunction
+
+Synonym for \c {void (*)(QDeclarativeListProperty<T> *property)}.
+
+Clear the list \a property.
+*/
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h
new file mode 100644
index 0000000..fb877b4
--- /dev/null
+++ b/src/declarative/qml/qdeclarativelist.h
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELIST_H
+#define QDECLARATIVELIST_H
+
+#include "qdeclarativeprivate.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+template<typename T>
+struct QDeclarativeListProperty {
+    typedef void (*AppendFunction)(QDeclarativeListProperty<T> *, T*);
+    typedef int (*CountFunction)(QDeclarativeListProperty<T> *);
+    typedef T *(*AtFunction)(QDeclarativeListProperty<T> *, int);
+    typedef void (*ClearFunction)(QDeclarativeListProperty<T> *);
+
+    QDeclarativeListProperty() 
+        : object(0), data(0), append(0), count(0), at(0), clear(0), dummy1(0), dummy2(0) {}
+    QDeclarativeListProperty(QObject *o, QList<T *> &list)
+        : object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
+          clear(qlist_clear), dummy1(0), dummy2(0) {}
+    QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0, 
+                    ClearFunction r = 0)
+        : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(0), dummy2(0) {}
+
+    bool operator==(const QDeclarativeListProperty &o) const {
+        return object == o.object &&
+               data == o.data &&
+               append == o.append &&
+               count == o.count &&
+               at == o.at &&
+               clear == o.clear;
+    }
+
+    QObject *object;
+    void *data;
+    
+    AppendFunction append;
+
+    CountFunction count;
+    AtFunction at;
+
+    ClearFunction clear;
+
+    void *dummy1;
+    void *dummy2;
+
+private:
+    static void qlist_append(QDeclarativeListProperty *p, T *v) {
+        ((QList<T *> *)p->data)->append(v); 
+    }
+    static int qlist_count(QDeclarativeListProperty *p) {
+        return ((QList<T *> *)p->data)->count();
+    }
+    static T *qlist_at(QDeclarativeListProperty *p, int idx) {
+        return ((QList<T *> *)p->data)->at(idx);
+    }
+    static void qlist_clear(QDeclarativeListProperty *p) {
+        return ((QList<T *> *)p->data)->clear();
+    }
+};
+
+class QDeclarativeEngine;
+class QDeclarativeListReferencePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeListReference
+{
+public:
+    QDeclarativeListReference();
+    QDeclarativeListReference(QObject *, const char *property, QDeclarativeEngine * = 0);
+    QDeclarativeListReference(const QDeclarativeListReference &);
+    QDeclarativeListReference &operator=(const QDeclarativeListReference &);
+    ~QDeclarativeListReference();
+
+    bool isValid() const;
+
+    QObject *object() const;
+    const QMetaObject *listElementType() const;
+
+    bool canAppend() const;
+    bool canAt() const;
+    bool canClear() const;
+    bool canCount() const;
+
+    bool append(QObject *) const;
+    QObject *at(int) const;
+    bool clear() const;
+    int count() const;
+
+private:
+    friend class QDeclarativeListReferencePrivate;
+    QDeclarativeListReferencePrivate* d;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDeclarativeListReference);
+
+QT_END_HEADER
+
+#endif // QDECLARATIVELIST_H
diff --git a/src/declarative/qml/qdeclarativelist_p.h b/src/declarative/qml/qdeclarativelist_p.h
new file mode 100644
index 0000000..45a805a
--- /dev/null
+++ b/src/declarative/qml/qdeclarativelist_p.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELIST_P_H
+#define QDECLARATIVELIST_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativelist.h"
+#include "qdeclarativeguard_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeListReferencePrivate
+{
+public:
+    QDeclarativeListReferencePrivate();
+
+    static QDeclarativeListReference init(const QDeclarativeListProperty<QObject> &, int, QDeclarativeEngine *);
+
+    QDeclarativeGuard<QObject> object;
+    const QMetaObject *elementType;
+    QDeclarativeListProperty<QObject> property;
+    int propertyType;
+
+    void addref();
+    void release();
+    int refCount;
+
+    static inline QDeclarativeListReferencePrivate *get(QDeclarativeListReference *ref) {
+        return ref->d;
+    }
+};
+
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVELIST_P_H
diff --git a/src/declarative/qml/qdeclarativelistscriptclass.cpp b/src/declarative/qml/qdeclarativelistscriptclass.cpp
new file mode 100644
index 0000000..ea04ad9
--- /dev/null
+++ b/src/declarative/qml/qdeclarativelistscriptclass.cpp
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativelistscriptclass_p.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeguard_p.h"
+#include "qdeclarativelist_p.h"
+
+QT_BEGIN_NAMESPACE
+
+struct ListData : public QScriptDeclarativeClass::Object {
+    QDeclarativeGuard<QObject> object;
+    QDeclarativeListProperty<QObject> property;
+    int propertyType;
+};
+
+QDeclarativeListScriptClass::QDeclarativeListScriptClass(QDeclarativeEngine *e)
+: QDeclarativeScriptClass(QDeclarativeEnginePrivate::getScriptEngine(e)), engine(e)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+    Q_UNUSED(scriptEngine);
+
+    m_lengthId = createPersistentIdentifier(QLatin1String("length"));
+}
+
+QDeclarativeListScriptClass::~QDeclarativeListScriptClass()
+{
+}
+
+QScriptValue QDeclarativeListScriptClass::newList(QObject *object, int propId, int propType)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    if (!object || propId == -1)
+        return scriptEngine->nullValue();
+
+    ListData *data = new ListData;
+    data->object = object;
+    data->propertyType = propType;
+    void *args[] = { &data->property, 0 };
+    QMetaObject::metacall(object, QMetaObject::ReadProperty, propId, args);
+
+    return newObject(scriptEngine, this, data);
+}
+
+QScriptValue QDeclarativeListScriptClass::newList(const QDeclarativeListProperty<QObject> &prop, int propType)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    ListData *data = new ListData;
+    data->object = prop.object;
+    data->property = prop;
+    data->propertyType = propType;
+
+    return newObject(scriptEngine, this, data);
+}
+
+QScriptClass::QueryFlags 
+QDeclarativeListScriptClass::queryProperty(Object *object, const Identifier &name, 
+                                  QScriptClass::QueryFlags flags)
+{
+    Q_UNUSED(object);
+    Q_UNUSED(flags);
+    if (name == m_lengthId.identifier)
+        return QScriptClass::HandlesReadAccess;
+
+    bool ok = false;
+    quint32 idx = toArrayIndex(name, &ok);
+
+    if (ok) {
+        lastIndex = idx;
+        return QScriptClass::HandlesReadAccess;
+    } else {
+        return 0;
+    }
+}
+
+QDeclarativeListScriptClass::ScriptValue QDeclarativeListScriptClass::property(Object *obj, const Identifier &name)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+
+    ListData *data = (ListData *)obj;
+    if (!data->object) 
+        return Value();
+
+    quint32 count = data->property.count?data->property.count(&data->property):0;
+
+    if (name == m_lengthId.identifier)
+        return Value(scriptEngine, count);
+    else if (lastIndex < count && data->property.at)
+        return Value(scriptEngine, enginePriv->objectClass->newQObject(data->property.at(&data->property, lastIndex)));
+    else
+        return Value();
+}
+
+QVariant QDeclarativeListScriptClass::toVariant(Object *obj, bool *ok)
+{
+    ListData *data = (ListData *)obj;
+
+    if (!data->object) {
+        if (ok) *ok = false;
+        return QVariant();
+    }
+
+    return QVariant::fromValue(QDeclarativeListReferencePrivate::init(data->property, data->propertyType, engine));
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativelistscriptclass_p.h b/src/declarative/qml/qdeclarativelistscriptclass_p.h
new file mode 100644
index 0000000..68c680d
--- /dev/null
+++ b/src/declarative/qml/qdeclarativelistscriptclass_p.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELISTSCRIPTCLASS_P_H
+#define QDECLARATIVELISTSCRIPTCLASS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qdeclarativescriptclass_p.h>
+#include "qdeclarativelist.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QDeclarativeListScriptClass : public QDeclarativeScriptClass
+{
+public:
+    QDeclarativeListScriptClass(QDeclarativeEngine *);
+    ~QDeclarativeListScriptClass();
+
+    QScriptValue newList(QObject *, int, int);
+    QScriptValue newList(const QDeclarativeListProperty<QObject> &, int);
+
+protected:
+    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
+                                                   QScriptClass::QueryFlags flags);
+    virtual ScriptValue property(Object *, const Identifier &);
+    virtual QVariant toVariant(Object *, bool *ok);
+
+private:
+    PersistentIdentifier m_lengthId;
+    QDeclarativeEngine *engine;
+
+    quint32 lastIndex;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVELISTSCRIPTCLASS_P_H
+
diff --git a/src/declarative/qml/qdeclarativemetaproperty.cpp b/src/declarative/qml/qdeclarativemetaproperty.cpp
new file mode 100644
index 0000000..e94ce8c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativemetaproperty.cpp
@@ -0,0 +1,1238 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativemetaproperty.h"
+#include "qdeclarativemetaproperty_p.h"
+
+#include "qdeclarativecompositetypedata_p.h"
+#include "qdeclarative.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativeboundsignal_p.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativedeclarativedata_p.h"
+#include "qdeclarativestringconverters_p.h"
+#include "qdeclarativelist_p.h"
+
+#include <QStringList>
+#include <QtCore/qdebug.h>
+
+#include <math.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativeMetaProperty
+    \brief The QDeclarativeMetaProperty class abstracts accessing QML properties.
+    \internal
+ */
+
+/*!
+    Create an invalid QDeclarativeMetaProperty.
+*/
+QDeclarativeMetaProperty::QDeclarativeMetaProperty()
+: d(new QDeclarativeMetaPropertyPrivate)
+{
+    d->q = this;
+}
+
+/*!  \internal */
+QDeclarativeMetaProperty::~QDeclarativeMetaProperty()
+{
+    delete d; d = 0;
+}
+
+/*!
+    Creates a QDeclarativeMetaProperty for the default property of \a obj. If there is no
+    default property, an invalid QDeclarativeMetaProperty will be created.
+ */
+QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj)
+: d(new QDeclarativeMetaPropertyPrivate)
+{
+    d->q = this;
+    d->initDefault(obj);
+}
+
+/*!
+    \internal
+    Creates a QDeclarativeMetaProperty for the default property of \a obj. If there is no
+    default property, an invalid QDeclarativeMetaProperty will be created.
+ */
+QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, QDeclarativeContext *ctxt)
+: d(new QDeclarativeMetaPropertyPrivate)
+{
+    d->q = this;
+    d->context = ctxt;
+    d->initDefault(obj);
+}
+
+/*!
+    Initialize from the default property of \a obj
+*/
+void QDeclarativeMetaPropertyPrivate::initDefault(QObject *obj)
+{
+    if (!obj)
+        return;
+
+    QMetaProperty p = QDeclarativeMetaType::defaultProperty(obj);
+    core.load(p);
+    if (core.isValid()) {
+        isDefaultProperty = true;
+        object = obj;
+    }
+}
+
+/*!
+    Creates a QDeclarativeMetaProperty for the property \a name of \a obj.
+ */
+QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, const QString &name)
+: d(new QDeclarativeMetaPropertyPrivate)
+{
+    d->q = this;
+    d->initProperty(obj, name);
+    if (!isValid()) d->object = 0;
+}
+
+/*!
+    \internal
+    Creates a QDeclarativeMetaProperty for the property \a name of \a obj.
+ */
+QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, const QString &name, QDeclarativeContext *ctxt)
+: d(new QDeclarativeMetaPropertyPrivate)
+{
+    d->q = this;
+    d->context = ctxt;
+    d->initProperty(obj, name);
+    if (!isValid()) { d->object = 0; d->context = 0; }
+}
+
+void QDeclarativeMetaPropertyPrivate::initProperty(QObject *obj, const QString &name)
+{
+    QDeclarativeEnginePrivate *enginePrivate = 0;
+    if (context && context->engine())
+        enginePrivate = QDeclarativeEnginePrivate::get(context->engine());
+
+    object = obj;
+
+    if (name.isEmpty() || !obj)
+        return;
+
+    if (enginePrivate && name.at(0).isUpper()) {
+        // Attached property
+        // ### What about qualified types?
+        QDeclarativeTypeNameCache *tnCache = QDeclarativeContextPrivate::get(context)->imports;
+        if (tnCache) {
+            QDeclarativeTypeNameCache::Data *d = tnCache->data(name);
+            if (d && d->type && d->type->attachedPropertiesFunction()) {
+                attachedFunc = d->type->index();
+            }
+        }
+        return;
+
+    } else if (name.count() >= 3 && 
+               name.at(0) == QChar(QLatin1Char('o')) && 
+               name.at(1) == QChar(QLatin1Char('n')) && 
+               name.at(2).isUpper()) {
+        // Signal
+        QString signalName = name.mid(2);
+        signalName[0] = signalName.at(0).toLower();
+
+        QMetaMethod method = findSignal(obj, signalName);
+        if (method.signature()) {
+            core.load(method);
+            return;
+        }
+    } 
+
+    // Property
+    QDeclarativePropertyCache::Data local;
+    QDeclarativePropertyCache::Data *property = 
+        QDeclarativePropertyCache::property(context?context->engine():0, obj, name, local);
+    if (property && !(property->flags & QDeclarativePropertyCache::Data::IsFunction)) 
+        core = *property;
+}
+
+/*!
+    Create a copy of \a other.
+*/
+QDeclarativeMetaProperty::QDeclarativeMetaProperty(const QDeclarativeMetaProperty &other)
+: d(new QDeclarativeMetaPropertyPrivate(*other.d))
+{
+    d->q = this;
+}
+
+/*!
+  \enum QDeclarativeMetaProperty::PropertyCategory
+
+  This enum specifies a category of QML property.
+
+  \value Unknown The category is unknown.  This will never be returned from propertyCategory()
+  \value InvalidProperty The property is invalid.
+  \value Bindable The property is a QDeclarativeBinding.
+  \value List The property is a QList pointer
+  \value Object The property is a QObject derived type pointer
+  \value Normal The property is none of the above.
+ */
+
+/*!
+  \enum QDeclarativeMetaProperty::Type
+
+  This enum specifies a type of QML property.
+
+  \value Invalid The property is invalid.
+  \value Property The property is a regular Qt property.
+  \value SignalProperty The property is a signal property.
+  \value Default The property is the default property.
+  \value Attached The property is an attached property.
+*/
+
+/*!
+    Returns the property category.
+*/
+QDeclarativeMetaProperty::PropertyCategory QDeclarativeMetaProperty::propertyCategory() const
+{
+    return d->propertyCategory();
+}
+
+QDeclarativeMetaProperty::PropertyCategory 
+QDeclarativeMetaPropertyPrivate::propertyCategory() const
+{
+    uint type = q->type();
+
+    if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
+        return QDeclarativeMetaProperty::Normal;
+    } else if (type & QDeclarativeMetaProperty::Attached) {
+        return QDeclarativeMetaProperty::Object;
+    } else if (type & QDeclarativeMetaProperty::Property) {
+        int type = propertyType();
+        if (type == QVariant::Invalid)
+            return QDeclarativeMetaProperty::InvalidProperty;
+        else if ((uint)type < QVariant::UserType)
+            return QDeclarativeMetaProperty::Normal;
+        else if (type == qMetaTypeId<QDeclarativeBinding *>())
+            return QDeclarativeMetaProperty::Bindable;
+        else if (core.flags & QDeclarativePropertyCache::Data::IsQObjectDerived)
+            return QDeclarativeMetaProperty::Object;
+        else if (core.flags & QDeclarativePropertyCache::Data::IsQList)
+            return QDeclarativeMetaProperty::List;
+        else 
+            return QDeclarativeMetaProperty::Normal;
+    } else {
+        return QDeclarativeMetaProperty::InvalidProperty;
+    }
+}
+
+/*!
+    Returns the type name of the property, or 0 if the property has no type
+    name.
+*/
+const char *QDeclarativeMetaProperty::propertyTypeName() const
+{
+    if (type() & ValueTypeProperty) {
+
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(d->context);
+        QDeclarativeValueType *valueType = 0;
+        if (ep) valueType = ep->valueTypes[d->core.propType];
+        else valueType = QDeclarativeValueTypeFactory::valueType(d->core.propType);
+        Q_ASSERT(valueType);
+
+        const char *rv = valueType->metaObject()->property(d->valueType.valueTypeCoreIdx).typeName();
+
+        if (!ep) delete valueType;
+
+        return rv;
+    } else if (d->object && type() & Property && d->core.isValid()) {
+        return d->object->metaObject()->property(d->core.coreIndex).typeName();
+    } else {
+        return 0;
+    }
+}
+
+/*!
+    Returns true if \a other and this QDeclarativeMetaProperty represent the same 
+    property.
+*/
+bool QDeclarativeMetaProperty::operator==(const QDeclarativeMetaProperty &other) const
+{
+    // category is intentially omitted here as it is generated 
+    // from the other members
+    return d->object == other.d->object &&
+           d->core == other.d->core &&
+           d->valueType == other.d->valueType &&
+           d->attachedFunc == other.d->attachedFunc;
+}
+
+/*!
+    Returns the QVariant type of the property, or QVariant::Invalid if the 
+    property has no QVariant type.
+*/
+int QDeclarativeMetaProperty::propertyType() const
+{
+    return d->propertyType();
+}
+
+int QDeclarativeMetaPropertyPrivate::propertyType() const
+{
+    uint type = q->type();
+    if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
+        return valueType.valueTypePropType;
+    } else if (type & QDeclarativeMetaProperty::Attached) {
+        return qMetaTypeId<QObject *>();
+    } else if (type & QDeclarativeMetaProperty::Property) {
+        if (core.propType == (int)QVariant::LastType)
+            return qMetaTypeId<QVariant>();
+        else
+            return core.propType;
+    } else {
+        return QVariant::Invalid;
+    }
+}
+
+/*!
+    Returns the type of the property.
+*/
+QDeclarativeMetaProperty::Type QDeclarativeMetaProperty::type() const
+{
+    if (d->core.flags & QDeclarativePropertyCache::Data::IsFunction)
+        return SignalProperty;
+    else if (d->attachedFunc != -1)
+        return Attached;
+    else if (d->valueType.valueTypeCoreIdx != -1)
+        return (Type)(Property | ValueTypeProperty);
+    else if (d->core.isValid())
+        return (Type)(Property | ((d->isDefaultProperty)?Default:0));
+    else
+        return Invalid;
+}
+
+/*!
+    Returns true if this QDeclarativeMetaProperty represents a regular Qt property.
+*/
+bool QDeclarativeMetaProperty::isProperty() const
+{
+    return type() & Property;
+}
+
+/*!
+    Returns true if this QDeclarativeMetaProperty represents a default property.
+*/
+bool QDeclarativeMetaProperty::isDefault() const
+{
+    return type() & Default;
+}
+
+/*!
+    Returns the QDeclarativeMetaProperty's QObject.
+*/
+QObject *QDeclarativeMetaProperty::object() const
+{
+    return d->object;
+}
+
+/*!
+    Assign \a other to this QDeclarativeMetaProperty.
+*/
+QDeclarativeMetaProperty &QDeclarativeMetaProperty::operator=(const QDeclarativeMetaProperty &other)
+{
+    d->context = other.d->context;
+    d->object = other.d->object;
+
+    d->isDefaultProperty = other.d->isDefaultProperty;
+    d->isNameCached = other.d->isNameCached;
+    d->core = other.d->core;
+    d->nameCache = other.d->nameCache;
+
+    d->valueType = other.d->valueType;
+
+    d->attachedFunc = other.d->attachedFunc;
+    return *this;
+}
+
+/*!
+    Returns true if the property is writable, otherwise false.
+*/
+bool QDeclarativeMetaProperty::isWritable() const
+{
+    QDeclarativeMetaProperty::PropertyCategory category = propertyCategory();
+
+    if (!d->object)
+        return false;
+    if (category == List)
+        return true;
+    else if (type() & SignalProperty)
+        return false;
+    else if (d->core.isValid() && d->object)
+        return d->core.flags & QDeclarativePropertyCache::Data::IsWritable;
+    else
+        return false;
+}
+
+/*!
+    Returns true if the property is designable, otherwise false.
+*/
+bool QDeclarativeMetaProperty::isDesignable() const
+{
+    if (type() & Property && d->core.isValid() && d->object)
+        return d->object->metaObject()->property(d->core.coreIndex).isDesignable();
+    else
+        return false;
+}
+
+/*!
+    Returns true if the property is resettable, otherwise false.
+*/
+bool QDeclarativeMetaProperty::isResettable() const
+{
+    if (type() & Property && d->core.isValid() && d->object)
+        return d->core.flags & QDeclarativePropertyCache::Data::IsResettable;
+    else
+        return false;
+}
+
+/*!
+    Returns true if the QDeclarativeMetaProperty refers to a valid property, otherwise
+    false.
+*/
+bool QDeclarativeMetaProperty::isValid() const
+{
+    return type() != Invalid;
+}
+
+/*!
+    Return the name of this QML property.
+*/
+QString QDeclarativeMetaProperty::name() const
+{
+    if (!d->isNameCached) {
+        // ###
+        if (!d->object) {
+        } else if (type() & ValueTypeProperty) {
+            QString rv = d->core.name(d->object) + QLatin1Char('.');
+
+            QDeclarativeEnginePrivate *ep = d->context?QDeclarativeEnginePrivate::get(d->context->engine()):0;
+            QDeclarativeValueType *valueType = 0;
+            if (ep) valueType = ep->valueTypes[d->core.propType];
+            else valueType = QDeclarativeValueTypeFactory::valueType(d->core.propType);
+            Q_ASSERT(valueType);
+
+            rv += QString::fromUtf8(valueType->metaObject()->property(d->valueType.valueTypeCoreIdx).name());
+
+            if (!ep) delete valueType;
+
+            d->nameCache = rv;
+        } else if (type() & SignalProperty) {
+            QString name = QLatin1String("on") + d->core.name(d->object);
+            name[2] = name.at(2).toUpper();
+            d->nameCache = name;
+        } else {
+            d->nameCache = d->core.name(d->object);
+        }
+        d->isNameCached = true;
+    }
+
+    return d->nameCache;
+}
+
+/*!
+  Returns the \l{QMetaProperty} {Qt property} associated with
+  this QML property.
+ */
+QMetaProperty QDeclarativeMetaProperty::property() const
+{
+    if (type() & Property && d->core.isValid() && d->object)
+        return d->object->metaObject()->property(d->core.coreIndex);
+    else
+        return QMetaProperty();
+}
+
+/*!
+    Return the QMetaMethod for this property if it is a SignalProperty, 
+    otherwise returns an invalid QMetaMethod.
+*/
+QMetaMethod QDeclarativeMetaProperty::method() const
+{
+    if (type() & SignalProperty && d->object)
+        return d->object->metaObject()->method(d->core.coreIndex);
+    else
+        return QMetaMethod();
+}
+
+
+/*!
+    Returns the binding associated with this property, or 0 if no binding 
+    exists.
+*/
+QDeclarativeAbstractBinding *QDeclarativeMetaProperty::binding() const
+{
+    if (!isProperty() || (type() & Attached) || !d->object)
+        return 0;
+
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(d->object);
+    if (!data) 
+        return 0;
+
+    if (!data->hasBindingBit(d->core.coreIndex))
+        return 0;
+
+    QDeclarativeAbstractBinding *binding = data->bindings;
+    while (binding) {
+        // ### This wont work for value types
+        if (binding->propertyIndex() == d->core.coreIndex)
+            return binding; 
+        binding = binding->m_nextBinding;
+    }
+    return 0;
+}
+
+/*!
+    Set the binding associated with this property to \a newBinding.  Returns
+    the existing binding (if any), otherwise 0.
+
+    \a newBinding will be enabled, and the returned binding (if any) will be
+    disabled.
+
+    Ownership of \a newBinding transfers to QML.  Ownership of the return value
+    is assumed by the caller.
+
+    \a flags is passed through to the binding and is used for the initial update (when
+    the binding sets the intial value, it will use these flags for the write).
+*/
+QDeclarativeAbstractBinding *
+QDeclarativeMetaProperty::setBinding(QDeclarativeAbstractBinding *newBinding, QDeclarativeMetaProperty::WriteFlags flags) const
+{
+    if (!isProperty() || (type() & Attached) || !d->object) {
+        if (newBinding)
+            newBinding->destroy();
+        return 0;
+    }
+
+    return d->setBinding(d->object, d->core, newBinding, flags);
+}
+
+QDeclarativeAbstractBinding *
+QDeclarativeMetaPropertyPrivate::setBinding(QObject *object, const QDeclarativePropertyCache::Data &core, 
+                                   QDeclarativeAbstractBinding *newBinding, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object, 0 != newBinding);
+
+    if (data && data->hasBindingBit(core.coreIndex)) {
+        QDeclarativeAbstractBinding *binding = data->bindings;
+        while (binding) {
+            // ### This wont work for value types
+            if (binding->propertyIndex() == core.coreIndex) {
+                binding->setEnabled(false);
+
+                if (newBinding) 
+                    newBinding->setEnabled(true, flags);
+
+                return binding; // ### QDeclarativeAbstractBinding;
+            }
+
+            binding = binding->m_nextBinding;
+        }
+    } 
+
+    if (newBinding)
+        newBinding->setEnabled(true, flags);
+
+    return 0;
+}
+/*!
+    Returns the expression associated with this signal property, or 0 if no 
+    signal expression exists.
+*/
+QDeclarativeExpression *QDeclarativeMetaProperty::signalExpression() const
+{
+    if (!(type() & SignalProperty))
+        return 0;
+
+    const QObjectList &children = d->object->children();
+    
+    for (int ii = 0; ii < children.count(); ++ii) {
+        QObject *child = children.at(ii);
+
+        QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
+        if (signal && signal->index() == coreIndex()) 
+            return signal->expression();
+    }
+
+    return 0;
+}
+
+/*!
+    Set the signal expression associated with this signal property to \a expr.
+    Returns the existing signal expression (if any), otherwise 0.
+
+    Ownership of \a expr transfers to QML.  Ownership of the return value is
+    assumed by the caller.
+*/
+QDeclarativeExpression *QDeclarativeMetaProperty::setSignalExpression(QDeclarativeExpression *expr) const
+{
+    if (!(type() & SignalProperty)) {
+        delete expr;
+        return 0;
+    }
+
+    const QObjectList &children = d->object->children();
+    
+    for (int ii = 0; ii < children.count(); ++ii) {
+        QObject *child = children.at(ii);
+
+        QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
+        if (signal && signal->index() == coreIndex()) 
+            return signal->setExpression(expr);
+    }
+
+    if (expr) {
+        QDeclarativeBoundSignal *signal = new QDeclarativeBoundSignal(d->object, method(), d->object);
+        return signal->setExpression(expr);
+    } else {
+        return 0;
+    }
+}
+
+QMetaMethod QDeclarativeMetaPropertyPrivate::findSignal(QObject *obj, const QString &name)
+{
+    const QMetaObject *mo = obj->metaObject();
+
+    int methods = mo->methodCount();
+    for (int ii = methods - 1; ii >= 0; --ii) {
+        QMetaMethod method = mo->method(ii);
+        QString methodName = QString::fromUtf8(method.signature());
+        int idx = methodName.indexOf(QLatin1Char('('));
+        methodName = methodName.left(idx);
+
+        if (methodName == name) 
+            return method;
+    }
+    return QMetaMethod();
+}
+
+QObject *QDeclarativeMetaPropertyPrivate::attachedObject() const
+{
+    if (attachedFunc == -1)
+        return 0;
+    else
+        return qmlAttachedPropertiesObjectById(attachedFunc, object);
+}
+
+/*!
+    Returns the property value.
+*/
+QVariant QDeclarativeMetaProperty::read() const
+{
+    if (!d->object)
+        return QVariant();
+
+    if (type() & SignalProperty) {
+
+        return QVariant();
+
+    } else if (type() & Property || type() & Attached) {
+
+        return d->readValueProperty();
+
+    }
+    return QVariant();
+}
+
+QVariant QDeclarativeMetaPropertyPrivate::readValueProperty()
+{
+    uint type = q->type();
+    if (type & QDeclarativeMetaProperty::Attached) {
+
+        return QVariant::fromValue(attachedObject());
+
+    } else if(type & QDeclarativeMetaProperty::ValueTypeProperty) {
+
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
+        QDeclarativeValueType *valueType = 0;
+        if (ep) valueType = ep->valueTypes[core.propType];
+        else valueType = QDeclarativeValueTypeFactory::valueType(core.propType);
+        Q_ASSERT(valueType);
+
+        valueType->read(object, core.coreIndex);
+
+        QVariant rv =
+            valueType->metaObject()->property(this->valueType.valueTypeCoreIdx).read(valueType);
+
+        if (!ep) delete valueType;
+        return rv;
+
+    } else if(core.flags & QDeclarativePropertyCache::Data::IsQList) {
+
+        QDeclarativeListProperty<QObject> prop;
+        void *args[] = { &prop, 0 };
+        QMetaObject::metacall(object, QMetaObject::ReadProperty, core.coreIndex, args);
+        return QVariant::fromValue(QDeclarativeListReferencePrivate::init(prop, core.propType, context?context->engine():0));
+
+    } else {
+
+        return object->metaObject()->property(core.coreIndex).read(object.data());
+
+    }
+}
+
+//###
+//writeEnumProperty MIRRORS the relelvant bit of QMetaProperty::write AND MUST BE KEPT IN SYNC!
+//###
+bool QDeclarativeMetaPropertyPrivate::writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags)
+{
+    if (!object || !prop.isWritable())
+        return false;
+
+    QVariant v = value;
+    if (prop.isEnumType()) {
+        QMetaEnum menum = prop.enumerator();
+        if (v.userType() == QVariant::String
+#ifdef QT3_SUPPORT
+            || v.userType() == QVariant::CString
+#endif
+            ) {
+            if (prop.isFlagType())
+                v = QVariant(menum.keysToValue(value.toByteArray()));
+            else
+                v = QVariant(menum.keyToValue(value.toByteArray()));
+        } else if (v.userType() != QVariant::Int && v.userType() != QVariant::UInt) {
+            int enumMetaTypeId = QMetaType::type(QByteArray(menum.scope()) + "::" + menum.name());
+            if ((enumMetaTypeId == 0) || (v.userType() != enumMetaTypeId) || !v.constData())
+                return false;
+            v = QVariant(*reinterpret_cast<const int *>(v.constData()));
+        }
+        v.convert(QVariant::Int);
+    }
+
+    // the status variable is changed by qt_metacall to indicate what it did
+    // this feature is currently only used by QtDBus and should not be depended
+    // upon. Don't change it without looking into QDBusAbstractInterface first
+    // -1 (unchanged): normal qt_metacall, result stored in argv[0]
+    // changed: result stored directly in value, return the value of status
+    int status = -1;
+    void *argv[] = { v.data(), &v, &status, &flags };
+    QMetaObject::metacall(object, QMetaObject::WriteProperty, idx, argv);
+    return status;
+}
+
+bool QDeclarativeMetaPropertyPrivate::writeValueProperty(const QVariant &value,
+                                                QDeclarativeMetaProperty::WriteFlags flags)
+{
+    // Remove any existing bindings on this property
+    if (!(flags & QDeclarativeMetaProperty::DontRemoveBinding)) {
+        QDeclarativeAbstractBinding *binding = q->setBinding(0);
+        if (binding) binding->destroy();
+    }
+
+    bool rv = false;
+    uint type = q->type();
+    if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
+
+        QDeclarativeValueType *writeBack = 0;
+        if (ep) {
+            writeBack = ep->valueTypes[core.propType];
+        } else {
+            writeBack = QDeclarativeValueTypeFactory::valueType(core.propType);
+        }
+
+        writeBack->read(object, core.coreIndex);
+
+        QDeclarativePropertyCache::Data data = core;
+        data.flags = valueType.flags;
+        data.coreIndex = valueType.valueTypeCoreIdx;
+        data.propType = valueType.valueTypePropType;
+        rv = write(writeBack, data, value, context, flags);
+
+        writeBack->write(object, core.coreIndex, flags);
+        if (!ep) delete writeBack;
+
+    } else {
+
+        rv = write(object, core, value, context, flags);
+
+    }
+
+    return rv;
+}
+
+bool QDeclarativeMetaPropertyPrivate::write(QObject *object, const QDeclarativePropertyCache::Data &property, 
+                                   const QVariant &value, QDeclarativeContext *context, 
+                                   QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int coreIdx = property.coreIndex;
+    int status = -1;    //for dbus
+
+    if (property.flags & QDeclarativePropertyCache::Data::IsEnumType) {
+        QMetaProperty prop = object->metaObject()->property(property.coreIndex);
+        QVariant v = value;
+        // Enum values come through the script engine as doubles
+        if (value.userType() == QVariant::Double) { 
+            double integral;
+            double fractional = modf(value.toDouble(), &integral);
+            if (qFuzzyIsNull(fractional))
+                v.convert(QVariant::Int);
+        }
+        return writeEnumProperty(prop, coreIdx, object, v, flags);
+    }
+
+    int propertyType = property.propType;
+    int variantType = value.userType();
+
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(context);
+
+    if (propertyType == QVariant::Url) {
+
+        QUrl u;
+        bool found = false;
+        if (variantType == QVariant::Url) {
+            u = value.toUrl();
+            found = true;
+        } else if (variantType == QVariant::ByteArray) {
+            u = QUrl(QString::fromUtf8(value.toByteArray()));
+            found = true;
+        } else if (variantType == QVariant::String) {
+            u = QUrl(value.toString());
+            found = true;
+        }
+
+        if (!found)
+            return false;
+
+        if (context && u.isRelative() && !u.isEmpty())
+            u = context->resolvedUrl(u);
+        int status = -1;
+        void *argv[] = { &u, 0, &status, &flags };
+        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, argv);
+
+    } else if (variantType == propertyType) {
+
+        void *a[] = { (void *)value.constData(), 0, &status, &flags };
+        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+
+    } else if (qMetaTypeId<QVariant>() == propertyType) {
+
+        void *a[] = { (void *)&value, 0, &status, &flags };
+        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+
+    } else if (property.flags & QDeclarativePropertyCache::Data::IsQObjectDerived) {
+
+        const QMetaObject *valMo = rawMetaObjectForType(enginePriv, value.userType());
+        
+        if (!valMo)
+            return false;
+
+        QObject *o = *(QObject **)value.constData();
+        const QMetaObject *propMo = rawMetaObjectForType(enginePriv, propertyType);
+
+        if (o) valMo = o->metaObject();
+
+        if (canConvert(valMo, propMo)) {
+            void *args[] = { &o, 0, &status, &flags };
+            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, 
+                                  args);
+        } else if (!o && canConvert(propMo, valMo)) {
+            // In the case of a null QObject, we assign the null if there is 
+            // any change that the null variant type could be up or down cast to 
+            // the property type.
+            void *args[] = { &o, 0, &status, &flags };
+            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, 
+                                  args);
+        } else {
+            return false;
+        }
+
+    } else if (property.flags & QDeclarativePropertyCache::Data::IsQList) {
+
+        const QMetaObject *listType = 0;
+        if (enginePriv) {
+            listType = enginePriv->rawMetaObjectForType(enginePriv->listType(property.propType));
+        } else {
+            QDeclarativeType *type = QDeclarativeMetaType::qmlType(QDeclarativeMetaType::listType(property.propType));
+            if (!type) return false;
+            listType = type->baseMetaObject();
+        }
+        if (!listType) return false;
+
+        QDeclarativeListProperty<void> prop;
+        void *args[] = { &prop, 0 };
+        QMetaObject::metacall(object, QMetaObject::ReadProperty, coreIdx, args);
+
+        if (!prop.clear) return false;
+
+        prop.clear(&prop);
+
+        if (value.userType() == qMetaTypeId<QList<QObject *> >()) {
+            const QList<QObject *> &list = qvariant_cast<QList<QObject *> >(value);
+
+            for (int ii = 0; ii < list.count(); ++ii) {
+                QObject *o = list.at(ii);
+                if (!canConvert(o->metaObject(), listType))
+                    o = 0;
+                prop.append(&prop, (void *)o);
+            }
+        } else {
+            QObject *o = enginePriv?enginePriv->toQObject(value):QDeclarativeMetaType::toQObject(value);
+            if (!canConvert(o->metaObject(), listType))
+                o = 0;
+            prop.append(&prop, (void *)o);
+        }
+
+    } else {
+        Q_ASSERT(variantType != propertyType);
+
+        QVariant v = value;
+        if (v.convert((QVariant::Type)propertyType)) {
+            void *a[] = { (void *)v.constData(), 0, &status, &flags};
+            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+        } else if ((uint)propertyType >= QVariant::UserType && variantType == QVariant::String) {
+            QDeclarativeMetaType::StringConverter con = QDeclarativeMetaType::customStringConverter(propertyType);
+            if (!con)
+                return false;
+
+            QVariant v = con(value.toString());
+            if (v.userType() == propertyType) {
+                void *a[] = { (void *)v.constData(), 0, &status, &flags};
+                QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+            }
+        } else if (variantType == QVariant::String) {
+            bool ok = false;
+            QVariant v = QDeclarativeStringConverters::variantFromString(value.toString(), propertyType, &ok);
+            if (!ok)
+                return false;
+
+            void *a[] = { (void *)v.constData(), 0, &status, &flags};
+            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+        } else {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+const QMetaObject *QDeclarativeMetaPropertyPrivate::rawMetaObjectForType(QDeclarativeEnginePrivate *engine, int userType)
+{
+    if (engine) {
+        return engine->rawMetaObjectForType(userType);
+    } else {
+        QDeclarativeType *type = QDeclarativeMetaType::qmlType(userType);
+        return type?type->baseMetaObject():0;
+    }
+}
+
+/*!
+    Set the property value to \a value.
+*/
+bool QDeclarativeMetaProperty::write(const QVariant &value) const
+{
+    return write(value, 0);
+}
+
+/*!
+    Resets the property value.
+*/
+bool QDeclarativeMetaProperty::reset() const
+{
+    if (isResettable()) {
+        void *args[] = { 0 };
+        QMetaObject::metacall(d->object, QMetaObject::ResetProperty, d->core.coreIndex, args);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool QDeclarativeMetaProperty::write(const QVariant &value, QDeclarativeMetaProperty::WriteFlags flags) const
+{
+    if (d->object && type() & Property && d->core.isValid() && isWritable()) 
+        return d->writeValueProperty(value, flags);
+    else 
+        return false;
+}
+
+/*!
+    Returns true if the property has a change notifier signal, otherwise false.
+*/
+bool QDeclarativeMetaProperty::hasChangedNotifier() const
+{
+    if (type() & Property && !(type() & Attached) && d->object) {
+        return d->object->metaObject()->property(d->core.coreIndex).hasNotifySignal();
+    }
+    return false;
+}
+
+/*!
+    Returns true if the property needs a change notifier signal for bindings
+    to remain upto date, false otherwise.
+
+    Some properties, such as attached properties or those whose value never 
+    changes, do not require a change notifier.
+*/
+bool QDeclarativeMetaProperty::needsChangedNotifier() const
+{
+    return type() & Property && !(type() & Attached) && 
+           !property().isConstant();
+}
+
+/*!
+    Connects the property's change notifier signal to the
+    specified \a method of the \a dest object and returns
+    true. Returns false if this metaproperty does not
+    represent a regular Qt property or if it has no
+    change notifier signal, or if the \a dest object does
+    not have the specified \a method.
+*/
+bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, int method) const
+{
+    if (!(type() & Property) || (type() & Attached) || !d->object)
+        return false;
+
+    QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
+    if (prop.hasNotifySignal()) {
+        return QMetaObject::connect(d->object, prop.notifySignalIndex(), dest, method, Qt::DirectConnection);
+    } else {
+        return false;
+    }
+}
+
+/*!
+    Connects the property's change notifier signal to the
+    specified \a slot of the \a dest object and returns
+    true. Returns false if this metaproperty does not
+    represent a regular Qt property or if it has no
+    change notifier signal, or if the \a dest object does
+    not have the specified \a slot.
+*/
+bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, const char *slot) const
+{
+    if (!(type() & Property) || (type() & Attached) || !d->object)
+        return false;
+
+    QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
+    if (prop.hasNotifySignal()) {
+        QByteArray signal(QByteArray("2") + prop.notifySignal().signature());
+        return QObject::connect(d->object, signal.constData(), dest, slot);
+    } else  {
+        return false;
+    }
+}
+
+/*!
+    Return the Qt metaobject index of the property.
+*/
+int QDeclarativeMetaProperty::coreIndex() const
+{
+    return d->core.coreIndex;
+}
+
+/*! \internal */
+int QDeclarativeMetaProperty::valueTypeCoreIndex() const
+{
+    return d->valueType.valueTypeCoreIdx;
+}
+
+Q_GLOBAL_STATIC(QDeclarativeValueTypeFactory, qmlValueTypes);
+
+
+struct SerializedData {
+    QDeclarativeMetaProperty::Type type;
+    QDeclarativePropertyCache::Data core;
+};
+
+struct ValueTypeSerializedData : public SerializedData {
+    QDeclarativePropertyCache::ValueTypeData valueType;
+};
+
+QByteArray QDeclarativeMetaPropertyPrivate::saveValueType(const QMetaObject *metaObject, int index, 
+                                                 const QMetaObject *subObject, int subIndex)
+{
+    QMetaProperty prop = metaObject->property(index);
+    QMetaProperty subProp = subObject->property(subIndex);
+
+    ValueTypeSerializedData sd;
+    sd.type = QDeclarativeMetaProperty::ValueTypeProperty;
+    sd.core.load(metaObject->property(index));
+    sd.valueType.flags = QDeclarativePropertyCache::Data::flagsForProperty(subProp);
+    sd.valueType.valueTypeCoreIdx = subIndex;
+    sd.valueType.valueTypePropType = subProp.userType();
+
+    QByteArray rv((const char *)&sd, sizeof(sd));
+
+    return rv;
+}
+
+QByteArray QDeclarativeMetaPropertyPrivate::saveProperty(const QMetaObject *metaObject, int index)
+{
+    SerializedData sd;
+    sd.type = QDeclarativeMetaProperty::Property;
+    sd.core.load(metaObject->property(index));
+
+    QByteArray rv((const char *)&sd, sizeof(sd));
+    return rv;
+}
+
+QDeclarativeMetaProperty 
+QDeclarativeMetaPropertyPrivate::restore(const QByteArray &data, QObject *object, QDeclarativeContext *ctxt)
+{
+    QDeclarativeMetaProperty prop;
+
+    if (data.isEmpty())
+        return prop;
+
+    prop.d->object = object;
+    prop.d->context = ctxt;
+
+    const SerializedData *sd = (const SerializedData *)data.constData();
+    if (sd->type == QDeclarativeMetaProperty::Property) {
+        prop.d->core = sd->core;
+    } else if(sd->type == QDeclarativeMetaProperty::ValueTypeProperty) {
+        const ValueTypeSerializedData *vt = (const ValueTypeSerializedData *)sd;
+        prop.d->core = vt->core;
+        prop.d->valueType = vt->valueType;
+    }
+
+    return prop;
+}
+
+/*!
+    \internal
+
+    Creates a QDeclarativeMetaProperty for the property \a name of \a obj. Unlike
+    the QDeclarativeMetaProperty(QObject*, QString, QDeclarativeContext*) constructor, this static function
+    will correctly handle dot properties, including value types and attached properties.
+*/
+QDeclarativeMetaProperty QDeclarativeMetaProperty::createProperty(QObject *obj, 
+                                                const QString &name,
+                                                QDeclarativeContext *context)
+{
+    QDeclarativeTypeNameCache *typeNameCache = context?QDeclarativeContextPrivate::get(context)->imports:0;
+
+    QStringList path = name.split(QLatin1Char('.'));
+    QObject *object = obj;
+
+    for (int jj = 0; jj < path.count() - 1; ++jj) {
+        const QString &pathName = path.at(jj);
+
+        if (QDeclarativeTypeNameCache::Data *data = typeNameCache?typeNameCache->data(pathName):0) {
+            if (data->type) {
+                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
+                if (!func) 
+                    return QDeclarativeMetaProperty();
+                object = qmlAttachedPropertiesObjectById(data->type->index(), object);
+                if (!object)
+                    return QDeclarativeMetaProperty();
+                continue;
+            } else {
+                Q_ASSERT(data->typeNamespace);
+                ++jj;
+                data = data->typeNamespace->data(path.at(jj));
+                if (!data || !data->type)
+                    return QDeclarativeMetaProperty();
+                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
+                if (!func) 
+                    return QDeclarativeMetaProperty();
+                object = qmlAttachedPropertiesObjectById(data->type->index(), object);
+                if (!object)
+                    return QDeclarativeMetaProperty();
+                continue;
+            }
+        }
+
+        QDeclarativeMetaProperty prop(object, pathName, context);
+
+        if (jj == path.count() - 2 && prop.propertyType() < (int)QVariant::UserType &&
+            qmlValueTypes()->valueTypes[prop.propertyType()]) {
+            // We're now at a value type property.  We can use a global valuetypes array as we 
+            // never actually use the objects, just look up their properties.
+            QObject *typeObject = 
+                qmlValueTypes()->valueTypes[prop.propertyType()];
+            int idx = typeObject->metaObject()->indexOfProperty(path.last().toUtf8().constData());
+            if (idx == -1)
+                return QDeclarativeMetaProperty();
+            QMetaProperty vtProp = typeObject->metaObject()->property(idx);
+
+            QDeclarativeMetaProperty p = prop;
+            p.d->valueType.valueTypeCoreIdx = idx;
+            p.d->valueType.valueTypePropType = vtProp.userType();
+            return p;
+        }
+
+        QObject *objVal = QDeclarativeMetaType::toQObject(prop.read());
+        if (!objVal)
+            return QDeclarativeMetaProperty();
+        object = objVal;
+    }
+
+    const QString &propName = path.last();
+    QDeclarativeMetaProperty prop(object, propName, context);
+    if (!prop.isValid())
+        return QDeclarativeMetaProperty();
+    else
+        return prop;
+}
+
+/*!
+    Returns true if lhs and rhs refer to the same metaobject data
+*/
+bool QDeclarativeMetaPropertyPrivate::equal(const QMetaObject *lhs, const QMetaObject *rhs)
+{
+    return lhs == rhs || (1 && lhs && rhs && lhs->d.stringdata == rhs->d.stringdata);
+}
+
+/*!
+    Returns true if from inherits to.
+*/
+bool QDeclarativeMetaPropertyPrivate::canConvert(const QMetaObject *from, const QMetaObject *to)
+{
+    if (from && to == &QObject::staticMetaObject)
+        return true;
+
+    while (from) {
+        if (equal(from, to))
+            return true;
+        from = from->superClass();
+    }
+    
+    return false;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativemetaproperty.h b/src/declarative/qml/qdeclarativemetaproperty.h
new file mode 100644
index 0000000..4dd6668
--- /dev/null
+++ b/src/declarative/qml/qdeclarativemetaproperty.h
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEMETAPROPERTY_H
+#define QDECLARATIVEMETAPROPERTY_H
+
+#include <QtCore/qmetaobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QObject;
+class QDeclarativeAbstractBinding;
+class QDeclarativeExpression;
+class QStringList;
+class QVariant;
+struct QMetaObject;
+class QDeclarativeContext;
+class QDeclarativeEngine;
+
+class QDeclarativeMetaPropertyPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeMetaProperty
+{
+public:
+    enum PropertyCategory {
+        Unknown,
+        InvalidProperty,
+        Bindable,
+        List,
+        Object,
+        Normal
+    };
+    QDeclarativeMetaProperty();
+    QDeclarativeMetaProperty(QObject *);
+    QDeclarativeMetaProperty(QObject *, const QString &);
+    QDeclarativeMetaProperty(QObject *, QDeclarativeContext *);
+    QDeclarativeMetaProperty(QObject *, const QString &, QDeclarativeContext *);
+    QDeclarativeMetaProperty(const QDeclarativeMetaProperty &);
+    QDeclarativeMetaProperty &operator=(const QDeclarativeMetaProperty &);
+    ~QDeclarativeMetaProperty();
+
+    QString name() const;
+
+    QVariant read() const;
+    bool write(const QVariant &) const;
+    enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02 };
+    Q_DECLARE_FLAGS(WriteFlags, WriteFlag)
+    bool write(const QVariant &, QDeclarativeMetaProperty::WriteFlags) const;
+    bool reset() const;
+
+    bool hasChangedNotifier() const;
+    bool needsChangedNotifier() const;
+    bool connectNotifier(QObject *dest, const char *slot) const;
+    bool connectNotifier(QObject *dest, int method) const;
+
+    QMetaMethod method() const;
+
+    enum Type { Invalid = 0x00, 
+                Property = 0x01, 
+                SignalProperty = 0x02,
+                Default = 0x08,
+                Attached = 0x10,
+                ValueTypeProperty = 0x20 };
+
+    Type type() const;
+    bool isProperty() const;
+    bool isDefault() const;
+    bool isWritable() const;
+    bool isDesignable() const;
+    bool isResettable() const;
+    bool isValid() const;
+    QObject *object() const;
+
+    PropertyCategory propertyCategory() const;
+
+    int propertyType() const;
+    const char *propertyTypeName() const;
+
+    bool operator==(const QDeclarativeMetaProperty &) const;
+
+    QMetaProperty property() const;
+
+    QDeclarativeAbstractBinding *binding() const;
+    QDeclarativeAbstractBinding *setBinding(QDeclarativeAbstractBinding *,
+                                   QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::DontRemoveBinding) const;
+
+    QDeclarativeExpression *signalExpression() const;
+    QDeclarativeExpression *setSignalExpression(QDeclarativeExpression *) const;
+
+    static QDeclarativeMetaProperty createProperty(QObject *, const QString &, QDeclarativeContext *context=0);
+
+    int coreIndex() const;
+    int valueTypeCoreIndex() const;
+private:
+    friend class QDeclarativeEnginePrivate;
+    friend class QDeclarativeMetaPropertyPrivate;
+    QDeclarativeMetaPropertyPrivate *d;
+};
+typedef QList<QDeclarativeMetaProperty> QDeclarativeMetaProperties;
+ Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeMetaProperty::WriteFlags)
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEMETAPROPERTY_H
diff --git a/src/declarative/qml/qdeclarativemetaproperty_p.h b/src/declarative/qml/qdeclarativemetaproperty_p.h
new file mode 100644
index 0000000..9fd5ed2
--- /dev/null
+++ b/src/declarative/qml/qdeclarativemetaproperty_p.h
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEMETAPROPERTY_P_H
+#define QDECLARATIVEMETAPROPERTY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativemetaproperty.h"
+
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativeguard_p.h"
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeContext;
+class QDeclarativeEnginePrivate;
+class QDeclarativeMetaPropertyPrivate
+{
+public:
+    QDeclarativeMetaPropertyPrivate()
+        : q(0), context(0), object(0), isDefaultProperty(false), isNameCached(false),
+          attachedFunc(-1) {}
+
+    QDeclarativeMetaPropertyPrivate(const QDeclarativeMetaPropertyPrivate &other)
+        : q(0), context(other.context), object(other.object), 
+          isDefaultProperty(other.isDefaultProperty), isNameCached(other.isNameCached),
+          core(other.core), nameCache(other.nameCache),
+          valueType(other.valueType), attachedFunc(other.attachedFunc) {}
+
+    QDeclarativeMetaProperty *q;
+    QDeclarativeContext *context;
+    QDeclarativeGuard<QObject> object;
+
+    bool isDefaultProperty:1;
+    bool isNameCached:1;
+    QDeclarativePropertyCache::Data core;
+    QString nameCache;
+
+    // Describes the "virtual" value-type sub-property.  
+    QDeclarativePropertyCache::ValueTypeData valueType;
+
+    // The attached property accessor
+    int attachedFunc;
+
+    void initProperty(QObject *obj, const QString &name);
+    void initDefault(QObject *obj);
+
+    QObject *attachedObject() const;
+    QMetaMethod findSignal(QObject *, const QString &);
+
+    int propertyType() const;
+    QDeclarativeMetaProperty::PropertyCategory propertyCategory() const;
+
+    QVariant readValueProperty();
+    bool writeValueProperty(const QVariant &, QDeclarativeMetaProperty::WriteFlags);
+
+    static const QMetaObject *rawMetaObjectForType(QDeclarativeEnginePrivate *, int);
+    static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags);
+    static bool write(QObject *, const QDeclarativePropertyCache::Data &, const QVariant &, QDeclarativeContext *,
+                      QDeclarativeMetaProperty::WriteFlags flags = 0);
+    static QDeclarativeAbstractBinding *setBinding(QObject *, const QDeclarativePropertyCache::Data &, QDeclarativeAbstractBinding *,
+                                          QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::DontRemoveBinding);
+
+    static QByteArray saveValueType(const QMetaObject *, int, 
+                                    const QMetaObject *, int);
+    static QByteArray saveProperty(const QMetaObject *, int);
+    static QDeclarativeMetaProperty restore(const QByteArray &, QObject *, QDeclarativeContext * = 0);
+
+    static bool equal(const QMetaObject *, const QMetaObject *);
+    static bool canConvert(const QMetaObject *from, const QMetaObject *to);
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEMETAPROPERTY_P_H
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
new file mode 100644
index 0000000..8f78843
--- /dev/null
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -0,0 +1,1153 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativemetatype.h"
+
+#include "qdeclarativeproxymetaobject_p.h"
+#include "qdeclarativecustomparser_p.h"
+#include "qdeclarativeguard_p.h"
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qbitarray.h>
+#include <QtCore/qreadwritelock.h>
+#include <qmetatype.h>
+#include <qobjectdefs.h>
+#include <qdatetime.h>
+#include <qbytearray.h>
+#include <qreadwritelock.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qvector.h>
+#include <qlocale.h>
+#include <QtCore/qcryptographichash.h>
+#include <QtScript/qscriptvalue.h>
+
+#include <ctype.h>
+
+#ifdef QT_BOOTSTRAPPED
+# ifndef QT_NO_GEOM_VARIANT
+#  define QT_NO_GEOM_VARIANT
+# endif
+#else
+#  include <qbitarray.h>
+#  include <qurl.h>
+#  include <qvariant.h>
+#endif
+
+#ifndef QT_NO_GEOM_VARIANT
+# include <qsize.h>
+# include <qpoint.h>
+# include <qrect.h>
+# include <qline.h>
+# include <qvector3d.h>
+#endif
+#define NS(x) QT_PREPEND_NAMESPACE(x)
+
+QT_BEGIN_NAMESPACE
+
+struct QDeclarativeMetaTypeData
+{
+    ~QDeclarativeMetaTypeData();
+    QList<QDeclarativeType *> types;
+    typedef QHash<int, QDeclarativeType *> Ids;
+    Ids idToType;
+    typedef QHash<QByteArray, QDeclarativeType *> Names;
+    Names nameToType;
+    typedef QHash<const QMetaObject *, QDeclarativeType *> MetaObjects;
+    MetaObjects metaObjectToType;
+    typedef QHash<int, QDeclarativeMetaType::StringConverter> StringConverters;
+    StringConverters stringConverters;
+
+    QBitArray objects;
+    QBitArray interfaces;
+    QBitArray lists;
+};
+Q_GLOBAL_STATIC(QDeclarativeMetaTypeData, metaTypeData)
+Q_GLOBAL_STATIC(QReadWriteLock, metaTypeDataLock)
+
+QDeclarativeMetaTypeData::~QDeclarativeMetaTypeData()
+{
+    for (int i = 0; i < types.count(); ++i)
+        delete types.at(i);
+}
+
+class QDeclarativeTypePrivate
+{
+public:
+    QDeclarativeTypePrivate();
+
+    void init() const;
+
+    bool m_isInterface : 1;
+    const char *m_iid;
+    QByteArray m_name;
+    int m_version_maj;
+    int m_version_min;
+    int m_typeId; int m_listId; 
+    QObject *(*m_newFunc)();
+    const QMetaObject *m_baseMetaObject;
+    QDeclarativeAttachedPropertiesFunc m_attachedPropertiesFunc;
+    const QMetaObject *m_attachedPropertiesType;
+    int m_parserStatusCast;
+    int m_propertyValueSourceCast;
+    int m_propertyValueInterceptorCast;
+    QDeclarativePrivate::CreateFunc m_extFunc;
+    const QMetaObject *m_extMetaObject;
+    int m_index;
+    QDeclarativeCustomParser *m_customParser;
+    mutable volatile bool m_isSetup:1;
+    mutable QList<QDeclarativeProxyMetaObject::ProxyData> m_metaObjects;
+};
+
+QDeclarativeTypePrivate::QDeclarativeTypePrivate()
+: m_isInterface(false), m_iid(0), m_typeId(0), m_listId(0), 
+  m_newFunc(0), m_baseMetaObject(0), m_attachedPropertiesFunc(0), m_attachedPropertiesType(0),
+  m_parserStatusCast(-1), m_propertyValueSourceCast(-1), m_propertyValueInterceptorCast(-1),
+  m_extFunc(0), m_extMetaObject(0), m_index(-1), m_customParser(0), m_isSetup(false)
+{
+}
+
+
+QDeclarativeType::QDeclarativeType(int type, int listType, const char *iid, int index)
+: d(new QDeclarativeTypePrivate)
+{
+    d->m_isInterface = true;
+    d->m_iid = iid;
+    d->m_typeId = type;
+    d->m_listId = listType;
+    d->m_newFunc = 0;
+    d->m_index = index;
+    d->m_isSetup = true;
+    d->m_version_maj = 0;
+    d->m_version_min = 0;
+}
+
+QDeclarativeType::QDeclarativeType(int type, int listType, 
+                 QObject *(*newFunc)(), const char *qmlName,
+                 int version_maj, int version_min,
+                 const QMetaObject *metaObject,
+                 QDeclarativeAttachedPropertiesFunc attachedPropertiesFunc,
+                 const QMetaObject *attachedType,
+                 int parserStatusCast, int propertyValueSourceCast, int propertyValueInterceptorCast,
+                 QDeclarativePrivate::CreateFunc extFunc,
+                 const QMetaObject *extMetaObject, int index,
+                 QDeclarativeCustomParser *customParser)
+: d(new QDeclarativeTypePrivate)
+{
+    d->m_name = qmlName;
+    d->m_version_maj = version_maj;
+    d->m_version_min = version_min;
+    d->m_typeId = type;
+    d->m_listId = listType;
+    d->m_newFunc = newFunc;
+    d->m_baseMetaObject = metaObject;
+    d->m_attachedPropertiesFunc = attachedPropertiesFunc;
+    d->m_attachedPropertiesType = attachedType;
+    d->m_parserStatusCast = parserStatusCast;
+    d->m_propertyValueSourceCast = propertyValueSourceCast;
+    d->m_propertyValueInterceptorCast = propertyValueInterceptorCast;
+    d->m_extFunc = extFunc;
+    d->m_index = index;
+    d->m_customParser = customParser;
+
+    if (extMetaObject)
+        d->m_extMetaObject = extMetaObject;
+}
+
+QDeclarativeType::~QDeclarativeType()
+{
+    delete d->m_customParser;
+    delete d;
+}
+
+int QDeclarativeType::majorVersion() const
+{
+    return d->m_version_maj;
+}
+
+int QDeclarativeType::minorVersion() const
+{
+    return d->m_version_min;
+}
+
+bool QDeclarativeType::availableInVersion(int vmajor, int vminor) const
+{
+    return vmajor > d->m_version_maj || (vmajor == d->m_version_maj && vminor >= d->m_version_min);
+}
+
+void QDeclarativeTypePrivate::init() const
+{
+    if (m_isSetup) return;
+
+    QWriteLocker lock(metaTypeDataLock());
+    if (m_isSetup)
+        return;
+
+    // Setup extended meta object
+    // XXX - very inefficient
+    const QMetaObject *mo = m_baseMetaObject;
+    if (m_extFunc) {
+        QMetaObject *mmo = new QMetaObject;
+        *mmo = *m_extMetaObject;
+        mmo->d.superdata = mo;
+        QDeclarativeProxyMetaObject::ProxyData data = { mmo, m_extFunc, 0, 0 };
+        m_metaObjects << data;
+    }
+
+    mo = mo->d.superdata;
+    while(mo) {
+        QDeclarativeType *t = metaTypeData()->metaObjectToType.value(mo);
+        if (t) {
+            if (t->d->m_extFunc) {
+                QMetaObject *mmo = new QMetaObject;
+                *mmo = *t->d->m_extMetaObject;
+                mmo->d.superdata = m_baseMetaObject;
+                if (!m_metaObjects.isEmpty())
+                    m_metaObjects.last().metaObject->d.superdata = mmo;
+                QDeclarativeProxyMetaObject::ProxyData data = { mmo, t->d->m_extFunc, 0, 0 };
+                m_metaObjects << data;
+            }
+        }
+        mo = mo->d.superdata;
+    }
+
+    for (int ii = 0; ii < m_metaObjects.count(); ++ii) {
+        m_metaObjects[ii].propertyOffset =
+            m_metaObjects.at(ii).metaObject->propertyOffset();
+        m_metaObjects[ii].methodOffset =
+            m_metaObjects.at(ii).metaObject->methodOffset();
+    }
+
+    m_isSetup = true;
+    lock.unlock();
+}
+
+QByteArray QDeclarativeType::typeName() const
+{
+    if (d->m_baseMetaObject)
+        return d->m_baseMetaObject->className();
+    else
+        return QByteArray();
+}
+
+QByteArray QDeclarativeType::qmlTypeName() const
+{
+    return d->m_name;
+}
+
+QObject *QDeclarativeType::create() const
+{
+    d->init();
+
+    QObject *rv = d->m_newFunc();
+    if (rv && !d->m_metaObjects.isEmpty())
+        (void *)new QDeclarativeProxyMetaObject(rv, &d->m_metaObjects);
+
+    return rv;
+}
+
+QDeclarativeCustomParser *QDeclarativeType::customParser() const
+{
+    return d->m_customParser;
+}
+
+bool QDeclarativeType::isInterface() const
+{
+    return d->m_isInterface;
+}
+
+int QDeclarativeType::typeId() const
+{
+    return d->m_typeId;
+}
+
+int QDeclarativeType::qListTypeId() const
+{
+    return d->m_listId;
+}
+
+const QMetaObject *QDeclarativeType::metaObject() const
+{
+    d->init();
+
+    if (d->m_metaObjects.isEmpty())
+        return d->m_baseMetaObject;
+    else
+        return d->m_metaObjects.first().metaObject;
+
+}
+
+const QMetaObject *QDeclarativeType::baseMetaObject() const
+{
+    return d->m_baseMetaObject;
+}
+
+QDeclarativeAttachedPropertiesFunc QDeclarativeType::attachedPropertiesFunction() const
+{
+    return d->m_attachedPropertiesFunc;
+}
+
+const QMetaObject *QDeclarativeType::attachedPropertiesType() const
+{
+    return d->m_attachedPropertiesType;
+}
+
+int QDeclarativeType::parserStatusCast() const
+{
+    return d->m_parserStatusCast;
+}
+
+int QDeclarativeType::propertyValueSourceCast() const
+{
+    return d->m_propertyValueSourceCast;
+}
+
+int QDeclarativeType::propertyValueInterceptorCast() const
+{
+    return d->m_propertyValueInterceptorCast;
+}
+
+const char *QDeclarativeType::interfaceIId() const
+{
+    return d->m_iid;
+}
+
+int QDeclarativeType::index() const
+{
+    return d->m_index;
+}
+
+int QDeclarativeMetaType::registerInterface(const QDeclarativePrivate::MetaTypeIds &id,
+                                    const char *iid)
+{
+    QWriteLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+
+    int index = data->types.count();
+
+    QDeclarativeType *type = new QDeclarativeType(id.typeId, id.listId, iid, index);
+
+    data->types.append(type);
+    data->idToType.insert(type->typeId(), type);
+    data->idToType.insert(type->qListTypeId(), type);
+    // XXX No insertMulti, so no multi-version interfaces?
+    if (!type->qmlTypeName().isEmpty())
+        data->nameToType.insert(type->qmlTypeName(), type);
+
+    if (data->interfaces.size() <= id.typeId)
+        data->interfaces.resize(id.typeId + 16);
+    if (data->lists.size() <= id.listId)
+        data->lists.resize(id.listId + 16);
+    data->interfaces.setBit(id.typeId, true);
+    data->lists.setBit(id.listId, true);
+
+    return index;
+}
+
+int QDeclarativeMetaType::registerType(const QDeclarativePrivate::MetaTypeIds &id, QObject *(*func)(),
+        const char *uri, int version_maj, int version_min, const char *cname,
+        const QMetaObject *mo, QDeclarativeAttachedPropertiesFunc attach, const QMetaObject *attachMo,
+        int pStatus, int object, int valueSource, int valueInterceptor, QDeclarativePrivate::CreateFunc extFunc, const QMetaObject *extmo, QDeclarativeCustomParser *parser)
+{
+    Q_UNUSED(object);
+
+    if (cname) {
+        for (int ii = 0; cname[ii]; ++ii) {
+            if (!isalnum(cname[ii])) {
+                qWarning("QDeclarativeMetaType: Invalid QML name %s", cname);
+                return -1;
+            }
+        }
+    }
+
+    QWriteLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    int index = data->types.count();
+
+    QByteArray name = uri;
+    if (uri)
+        name += '/';
+    name += cname;
+
+    QDeclarativeType *type = new QDeclarativeType(id.typeId, id.listId, 
+                                func, name, version_maj, version_min, mo, attach, attachMo, pStatus,
+                                valueSource, valueInterceptor, extFunc, extmo, index, parser);
+
+    data->types.append(type);
+    data->idToType.insert(type->typeId(), type);
+    data->idToType.insert(type->qListTypeId(), type);
+
+    if (!type->qmlTypeName().isEmpty())
+        data->nameToType.insertMulti(type->qmlTypeName(), type);
+
+    data->metaObjectToType.insert(type->baseMetaObject(), type);
+
+    if (data->objects.size() <= id.typeId)
+        data->objects.resize(id.typeId + 16);
+    if (data->lists.size() <= id.listId)
+        data->lists.resize(id.listId + 16);
+    data->objects.setBit(id.typeId, true);
+    data->lists.setBit(id.listId, true);
+
+    return index;
+}
+
+QObject *QDeclarativeMetaType::toQObject(const QVariant &v, bool *ok)
+{
+    if (!isQObject(v.userType())) {
+        if (ok) *ok = false;
+        return 0;
+    }
+
+    if (ok) *ok = true;
+
+    return *(QObject **)v.constData();
+}
+
+bool QDeclarativeMetaType::isQObject(int userType)
+{
+    if (userType == QMetaType::QObjectStar)
+        return true;
+
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    return userType >= 0 && userType < data->objects.size() && data->objects.testBit(userType);
+}
+
+/*
+    Returns the item type for a list of type \a id.
+ */
+int QDeclarativeMetaType::listType(int id)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    QDeclarativeType *type = data->idToType.value(id);
+    if (type && type->qListTypeId() == id)
+        return type->typeId();
+    else
+        return 0;
+}
+
+int QDeclarativeMetaType::attachedPropertiesFuncId(const QMetaObject *mo)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+
+    QDeclarativeType *type = data->metaObjectToType.value(mo);
+    if (type && type->attachedPropertiesFunction())
+        return type->index();
+    else
+        return -1;
+}
+
+QDeclarativeAttachedPropertiesFunc QDeclarativeMetaType::attachedPropertiesFuncById(int id)
+{
+    if (id < 0)
+        return 0;
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    return data->types.at(id)->attachedPropertiesFunction();
+}
+
+QMetaProperty QDeclarativeMetaType::defaultProperty(const QMetaObject *metaObject)
+{
+    int idx = metaObject->indexOfClassInfo("DefaultProperty");
+    if (-1 == idx)
+        return QMetaProperty();
+
+    QMetaClassInfo info = metaObject->classInfo(idx);
+    if (!info.value())
+        return QMetaProperty();
+
+    idx = metaObject->indexOfProperty(info.value());
+    if (-1 == idx)
+        return QMetaProperty();
+
+    return metaObject->property(idx);
+}
+
+QMetaProperty QDeclarativeMetaType::defaultProperty(QObject *obj)
+{
+    if (!obj)
+        return QMetaProperty();
+
+    const QMetaObject *metaObject = obj->metaObject();
+    return defaultProperty(metaObject);
+}
+
+QMetaMethod QDeclarativeMetaType::defaultMethod(const QMetaObject *metaObject)
+{
+    int idx = metaObject->indexOfClassInfo("DefaultMethod");
+    if (-1 == idx)
+        return QMetaMethod();
+
+    QMetaClassInfo info = metaObject->classInfo(idx);
+    if (!info.value())
+        return QMetaMethod();
+
+    idx = metaObject->indexOfMethod(info.value());
+    if (-1 == idx)
+        return QMetaMethod();
+
+    return metaObject->method(idx);
+}
+
+QMetaMethod QDeclarativeMetaType::defaultMethod(QObject *obj)
+{
+    if (!obj)
+        return QMetaMethod();
+
+    const QMetaObject *metaObject = obj->metaObject();
+    return defaultMethod(metaObject);
+}
+
+QDeclarativeMetaType::TypeCategory QDeclarativeMetaType::typeCategory(int userType)
+{
+    if (userType < 0)
+        return Unknown;
+    if (userType == QMetaType::QObjectStar)
+        return Object;
+
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    if (userType < data->objects.size() && data->objects.testBit(userType))
+        return Object;
+    else if (userType < data->lists.size() && data->lists.testBit(userType))
+        return List;
+    else
+        return Unknown;
+}
+
+bool QDeclarativeMetaType::isInterface(int userType)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    return userType >= 0 && userType < data->interfaces.size() && data->interfaces.testBit(userType);
+}
+
+const char *QDeclarativeMetaType::interfaceIId(int userType)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    QDeclarativeType *type = data->idToType.value(userType);
+    lock.unlock();
+    if (type && type->isInterface() && type->typeId() == userType)
+        return type->interfaceIId();
+    else
+        return 0;
+}
+
+bool QDeclarativeMetaType::isList(int userType)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    return userType >= 0 && userType < data->lists.size() && data->lists.testBit(userType);
+}
+
+/*!
+    A custom string convertor allows you to specify a function pointer that
+    returns a variant of \a type. For example, if you have written your own icon
+    class that you want to support as an object property assignable in QML:
+
+    \code
+    int type = qRegisterMetaType<SuperIcon>("SuperIcon");
+    QML::addCustomStringConvertor(type, &SuperIcon::pixmapFromString);
+    \endcode
+
+    The function pointer must be of the form:
+    \code
+    QVariant (*StringConverter)(const QString &);
+    \endcode
+ */
+void QDeclarativeMetaType::registerCustomStringConverter(int type, StringConverter converter)
+{
+    QWriteLocker lock(metaTypeDataLock());
+
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    if (data->stringConverters.contains(type))
+        return;
+    data->stringConverters.insert(type, converter);
+}
+
+/*!
+    Return the custom string converter for \a type, previously installed through
+    registerCustomStringConverter()
+ */
+QDeclarativeMetaType::StringConverter QDeclarativeMetaType::customStringConverter(int type)
+{
+    QReadLocker lock(metaTypeDataLock());
+
+    QDeclarativeMetaTypeData *data = metaTypeData();
+    return data->stringConverters.value(type);
+}
+
+/*!
+    Returns the type (if any) of URI-qualified named \a name in version specified
+    by \a version_major and \a version_minor.
+*/
+QDeclarativeType *QDeclarativeMetaType::qmlType(const QByteArray &name, int version_major, int version_minor)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+
+    QList<QDeclarativeType*> types = data->nameToType.values(name);
+    foreach (QDeclarativeType *t, types) {
+        // XXX version_major<0 just a kludge for QDeclarativeMetaPropertyPrivate::initProperty
+        if (version_major<0 || t->availableInVersion(version_major,version_minor))
+            return t;
+    }
+    return 0;
+}
+
+/*!
+    Returns the type (if any) that corresponds to the \a metaObject.  Returns null if no
+    type is registered.
+*/
+QDeclarativeType *QDeclarativeMetaType::qmlType(const QMetaObject *metaObject)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+
+    return data->metaObjectToType.value(metaObject);
+}
+
+/*!
+    Returns the type (if any) that corresponds to the QVariant::Type \a userType.  
+    Returns null if no type is registered.
+*/
+QDeclarativeType *QDeclarativeMetaType::qmlType(int userType)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+
+    QDeclarativeType *type = data->idToType.value(userType);
+    if (type && type->typeId() == userType)
+        return type;
+    else
+        return 0;
+}
+
+/*!
+    Returns the list of registered QML type names.
+*/
+QList<QByteArray> QDeclarativeMetaType::qmlTypeNames()
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+
+    return data->nameToType.keys();
+}
+
+/*!
+    Returns the list of registered QML types.
+*/
+QList<QDeclarativeType*> QDeclarativeMetaType::qmlTypes()
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+
+    return data->nameToType.values();
+}
+
+QT_END_NAMESPACE
+
+#include <QtGui/qfont.h>
+#include <QtGui/qpixmap.h>
+#include <QtGui/qbrush.h>
+#include <QtGui/qcolor.h>
+#include <QtGui/qpalette.h>
+#include <QtGui/qicon.h>
+#include <QtGui/qimage.h>
+#include <QtGui/qpolygon.h>
+#include <QtGui/qregion.h>
+#include <QtGui/qbitmap.h>
+#include <QtGui/qcursor.h>
+#include <QtGui/qsizepolicy.h>
+#include <QtGui/qkeysequence.h>
+#include <QtGui/qpen.h>
+
+//#include <QtGui/qtextlength.h>
+#include <QtGui/qtextformat.h>
+#include <QtGui/qmatrix.h>
+#include <QtGui/qtransform.h>
+#include <QtGui/qmatrix4x4.h>
+#include <QtGui/qvector2d.h>
+#include <QtGui/qvector3d.h>
+#include <QtGui/qvector4d.h>
+#include <QtGui/qquaternion.h>
+
+Q_DECLARE_METATYPE(QScriptValue);
+
+QT_BEGIN_NAMESPACE
+/*!
+    Copies \a copy into \a data, assuming they both are of type \a type.  If
+    \a copy is zero, a default type is copied.  Returns true if the copy was
+    successful and false if not.
+
+    \note This should move into QMetaType once complete
+
+*/
+bool QDeclarativeMetaType::copy(int type, void *data, const void *copy)
+{
+    if (copy) {
+        switch(type) {
+        case QMetaType::VoidStar:
+        case QMetaType::QObjectStar:
+        case QMetaType::QWidgetStar:
+            *static_cast<void **>(data) = *static_cast<void* const *>(copy);
+            return true;
+        case QMetaType::Long:
+            *static_cast<long *>(data) = *static_cast<const long*>(copy);
+            return true;
+        case QMetaType::Int:
+            *static_cast<int *>(data) = *static_cast<const int*>(copy);
+            return true;
+        case QMetaType::Short:
+            *static_cast<short *>(data) = *static_cast<const short*>(copy);
+            return true;
+        case QMetaType::Char:
+            *static_cast<char *>(data) = *static_cast<const char*>(copy);
+            return true;
+        case QMetaType::ULong:
+            *static_cast<ulong *>(data) = *static_cast<const ulong*>(copy);
+            return true;
+        case QMetaType::UInt:
+            *static_cast<uint *>(data) = *static_cast<const uint*>(copy);
+            return true;
+        case QMetaType::LongLong:
+            *static_cast<qlonglong *>(data) = *static_cast<const qlonglong*>(copy);
+            return true;
+        case QMetaType::ULongLong:
+            *static_cast<qulonglong *>(data) = *static_cast<const qulonglong*>(copy);
+            return true;
+        case QMetaType::UShort:
+            *static_cast<ushort *>(data) = *static_cast<const ushort*>(copy);
+            return true;
+        case QMetaType::UChar:
+            *static_cast<uchar *>(data) = *static_cast<const uchar*>(copy);
+            return true;
+        case QMetaType::Bool:
+            *static_cast<bool *>(data) = *static_cast<const bool*>(copy);
+            return true;
+        case QMetaType::Float:
+            *static_cast<float *>(data) = *static_cast<const float*>(copy);
+            return true;
+        case QMetaType::Double:
+            *static_cast<double *>(data) = *static_cast<const double*>(copy);
+            return true;
+        case QMetaType::QChar:
+            *static_cast<NS(QChar) *>(data) = *static_cast<const NS(QChar)*>(copy);
+            return true;
+        case QMetaType::QVariantMap:
+            *static_cast<NS(QVariantMap) *>(data) = *static_cast<const NS(QVariantMap)*>(copy);
+            return true;
+        case QMetaType::QVariantHash:
+            *static_cast<NS(QVariantHash) *>(data) = *static_cast<const NS(QVariantHash)*>(copy);
+            return true;
+        case QMetaType::QVariantList:
+            *static_cast<NS(QVariantList) *>(data) = *static_cast<const NS(QVariantList)*>(copy);
+            return true;
+        case QMetaType::QByteArray:
+            *static_cast<NS(QByteArray) *>(data) = *static_cast<const NS(QByteArray)*>(copy);
+            return true;
+        case QMetaType::QString:
+            *static_cast<NS(QString) *>(data) = *static_cast<const NS(QString)*>(copy);
+            return true;
+        case QMetaType::QStringList:
+            *static_cast<NS(QStringList) *>(data) = *static_cast<const NS(QStringList)*>(copy);
+            return true;
+        case QMetaType::QBitArray:
+            *static_cast<NS(QBitArray) *>(data) = *static_cast<const NS(QBitArray)*>(copy);
+            return true;
+        case QMetaType::QDate:
+            *static_cast<NS(QDate) *>(data) = *static_cast<const NS(QDate)*>(copy);
+            return true;
+        case QMetaType::QTime:
+            *static_cast<NS(QTime) *>(data) = *static_cast<const NS(QTime)*>(copy);
+            return true;
+        case QMetaType::QDateTime:
+            *static_cast<NS(QDateTime) *>(data) = *static_cast<const NS(QDateTime)*>(copy);
+            return true;
+        case QMetaType::QUrl:
+            *static_cast<NS(QUrl) *>(data) = *static_cast<const NS(QUrl)*>(copy);
+            return true;
+        case QMetaType::QLocale:
+            *static_cast<NS(QLocale) *>(data) = *static_cast<const NS(QLocale)*>(copy);
+            return true;
+        case QMetaType::QRect:
+            *static_cast<NS(QRect) *>(data) = *static_cast<const NS(QRect)*>(copy);
+            return true;
+        case QMetaType::QRectF:
+            *static_cast<NS(QRectF) *>(data) = *static_cast<const NS(QRectF)*>(copy);
+            return true;
+        case QMetaType::QSize:
+            *static_cast<NS(QSize) *>(data) = *static_cast<const NS(QSize)*>(copy);
+            return true;
+        case QMetaType::QSizeF:
+            *static_cast<NS(QSizeF) *>(data) = *static_cast<const NS(QSizeF)*>(copy);
+            return true;
+        case QMetaType::QLine:
+            *static_cast<NS(QLine) *>(data) = *static_cast<const NS(QLine)*>(copy);
+            return true;
+        case QMetaType::QLineF:
+            *static_cast<NS(QLineF) *>(data) = *static_cast<const NS(QLineF)*>(copy);
+            return true;
+        case QMetaType::QPoint:
+            *static_cast<NS(QPoint) *>(data) = *static_cast<const NS(QPoint)*>(copy);
+            return true;
+        case QMetaType::QPointF:
+            *static_cast<NS(QPointF) *>(data) = *static_cast<const NS(QPointF)*>(copy);
+            return true;
+        case QMetaType::QVector3D:
+            *static_cast<NS(QVector3D) *>(data) = *static_cast<const NS(QVector3D)*>(copy);
+            return true;
+#ifndef QT_NO_REGEXP
+        case QMetaType::QRegExp:
+            *static_cast<NS(QRegExp) *>(data) = *static_cast<const NS(QRegExp)*>(copy);
+            return true;
+#endif
+        case QMetaType::Void:
+            return true;
+
+
+#ifdef QT3_SUPPORT
+        case QMetaType::QColorGroup:
+            *static_cast<NS(QColorGroup) *>(data) = *static_cast<const NS(QColorGroup)*>(copy);
+            return true;
+#endif
+
+        case QMetaType::QFont:
+            *static_cast<NS(QFont) *>(data) = *static_cast<const NS(QFont)*>(copy);
+            return true;
+        case QMetaType::QPixmap:
+            *static_cast<NS(QPixmap) *>(data) = *static_cast<const NS(QPixmap)*>(copy);
+            return true;
+        case QMetaType::QBrush:
+            *static_cast<NS(QBrush) *>(data) = *static_cast<const NS(QBrush)*>(copy);
+            return true;
+        case QMetaType::QColor:
+            *static_cast<NS(QColor) *>(data) = *static_cast<const NS(QColor)*>(copy);
+            return true;
+        case QMetaType::QPalette:
+            *static_cast<NS(QPalette) *>(data) = *static_cast<const NS(QPalette)*>(copy);
+            return true;
+        case QMetaType::QIcon:
+            *static_cast<NS(QIcon) *>(data) = *static_cast<const NS(QIcon)*>(copy);
+            return true;
+        case QMetaType::QImage:
+            *static_cast<NS(QImage) *>(data) = *static_cast<const NS(QImage)*>(copy);
+            return true;
+        case QMetaType::QPolygon:
+            *static_cast<NS(QPolygon) *>(data) = *static_cast<const NS(QPolygon)*>(copy);
+            return true;
+        case QMetaType::QRegion:
+            *static_cast<NS(QRegion) *>(data) = *static_cast<const NS(QRegion)*>(copy);
+            return true;
+        case QMetaType::QBitmap:
+            *static_cast<NS(QBitmap) *>(data) = *static_cast<const NS(QBitmap)*>(copy);
+            return true;
+#ifndef QT_NO_CURSOR
+        case QMetaType::QCursor:
+            *static_cast<NS(QCursor) *>(data) = *static_cast<const NS(QCursor)*>(copy);
+            return true;
+#endif
+        case QMetaType::QSizePolicy:
+            *static_cast<NS(QSizePolicy) *>(data) = *static_cast<const NS(QSizePolicy)*>(copy);
+            return true;
+        case QMetaType::QKeySequence:
+            *static_cast<NS(QKeySequence) *>(data) = *static_cast<const NS(QKeySequence)*>(copy);
+            return true;
+        case QMetaType::QPen:
+            *static_cast<NS(QPen) *>(data) = *static_cast<const NS(QPen)*>(copy);
+            return true;
+        case QMetaType::QTextLength:
+            *static_cast<NS(QTextLength) *>(data) = *static_cast<const NS(QTextLength)*>(copy);
+            return true;
+        case QMetaType::QTextFormat:
+            *static_cast<NS(QTextFormat) *>(data) = *static_cast<const NS(QTextFormat)*>(copy);
+            return true;
+        case QMetaType::QMatrix:
+            *static_cast<NS(QMatrix) *>(data) = *static_cast<const NS(QMatrix)*>(copy);
+            return true;
+        case QMetaType::QTransform:
+            *static_cast<NS(QTransform) *>(data) = *static_cast<const NS(QTransform)*>(copy);
+            return true;
+        case QMetaType::QMatrix4x4:
+            *static_cast<NS(QMatrix4x4) *>(data) = *static_cast<const NS(QMatrix4x4)*>(copy);
+            return true;
+        case QMetaType::QVector2D:
+            *static_cast<NS(QVector2D) *>(data) = *static_cast<const NS(QVector2D)*>(copy);
+            return true;
+        case QMetaType::QVector4D:
+            *static_cast<NS(QVector4D) *>(data) = *static_cast<const NS(QVector4D)*>(copy);
+            return true;
+        case QMetaType::QQuaternion:
+            *static_cast<NS(QQuaternion) *>(data) = *static_cast<const NS(QQuaternion)*>(copy);
+            return true;
+
+        default:
+            if (type == qMetaTypeId<QVariant>()) {
+                *static_cast<NS(QVariant) *>(data) = *static_cast<const NS(QVariant)*>(copy);
+                return true;
+            } else if (type == qMetaTypeId<QScriptValue>()) {
+                *static_cast<NS(QScriptValue) *>(data) = *static_cast<const NS(QScriptValue)*>(copy);
+                return true;
+            } else if (typeCategory(type) != Unknown) {
+                *static_cast<void **>(data) = *static_cast<void* const *>(copy);
+                return true;
+            }
+            break;
+        }
+    } else {
+        switch(type) {
+        case QMetaType::VoidStar:
+        case QMetaType::QObjectStar:
+        case QMetaType::QWidgetStar:
+            *static_cast<void **>(data) = 0;
+            return true;
+        case QMetaType::Long:
+            *static_cast<long *>(data) = long(0);
+            return true;
+        case QMetaType::Int:
+            *static_cast<int *>(data) = int(0);
+            return true;
+        case QMetaType::Short:
+            *static_cast<short *>(data) = short(0);
+            return true;
+        case QMetaType::Char:
+            *static_cast<char *>(data) = char(0);
+            return true;
+        case QMetaType::ULong:
+            *static_cast<ulong *>(data) = ulong(0);
+            return true;
+        case QMetaType::UInt:
+            *static_cast<uint *>(data) = uint(0);
+            return true;
+        case QMetaType::LongLong:
+            *static_cast<qlonglong *>(data) = qlonglong(0);
+            return true;
+        case QMetaType::ULongLong:
+            *static_cast<qulonglong *>(data) = qulonglong(0);
+            return true;
+        case QMetaType::UShort:
+            *static_cast<ushort *>(data) = ushort(0);
+            return true;
+        case QMetaType::UChar:
+            *static_cast<uchar *>(data) = uchar(0);
+            return true;
+        case QMetaType::Bool:
+            *static_cast<bool *>(data) = bool(false);
+            return true;
+        case QMetaType::Float:
+            *static_cast<float *>(data) = float(0);
+            return true;
+        case QMetaType::Double:
+            *static_cast<double *>(data) = double();
+            return true;
+        case QMetaType::QChar:
+            *static_cast<NS(QChar) *>(data) = NS(QChar)();
+            return true;
+        case QMetaType::QVariantMap:
+            *static_cast<NS(QVariantMap) *>(data) = NS(QVariantMap)();
+            return true;
+        case QMetaType::QVariantHash:
+            *static_cast<NS(QVariantHash) *>(data) = NS(QVariantHash)();
+            return true;
+        case QMetaType::QVariantList:
+            *static_cast<NS(QVariantList) *>(data) = NS(QVariantList)();
+            return true;
+        case QMetaType::QByteArray:
+            *static_cast<NS(QByteArray) *>(data) = NS(QByteArray)();
+            return true;
+        case QMetaType::QString:
+            *static_cast<NS(QString) *>(data) = NS(QString)();
+            return true;
+        case QMetaType::QStringList:
+            *static_cast<NS(QStringList) *>(data) = NS(QStringList)();
+            return true;
+        case QMetaType::QBitArray:
+            *static_cast<NS(QBitArray) *>(data) = NS(QBitArray)();
+            return true;
+        case QMetaType::QDate:
+            *static_cast<NS(QDate) *>(data) = NS(QDate)();
+            return true;
+        case QMetaType::QTime:
+            *static_cast<NS(QTime) *>(data) = NS(QTime)();
+            return true;
+        case QMetaType::QDateTime:
+            *static_cast<NS(QDateTime) *>(data) = NS(QDateTime)();
+            return true;
+        case QMetaType::QUrl:
+            *static_cast<NS(QUrl) *>(data) = NS(QUrl)();
+            return true;
+        case QMetaType::QLocale:
+            *static_cast<NS(QLocale) *>(data) = NS(QLocale)();
+            return true;
+        case QMetaType::QRect:
+            *static_cast<NS(QRect) *>(data) = NS(QRect)();
+            return true;
+        case QMetaType::QRectF:
+            *static_cast<NS(QRectF) *>(data) = NS(QRectF)();
+            return true;
+        case QMetaType::QSize:
+            *static_cast<NS(QSize) *>(data) = NS(QSize)();
+            return true;
+        case QMetaType::QSizeF:
+            *static_cast<NS(QSizeF) *>(data) = NS(QSizeF)();
+            return true;
+        case QMetaType::QLine:
+            *static_cast<NS(QLine) *>(data) = NS(QLine)();
+            return true;
+        case QMetaType::QLineF:
+            *static_cast<NS(QLineF) *>(data) = NS(QLineF)();
+            return true;
+        case QMetaType::QPoint:
+            *static_cast<NS(QPoint) *>(data) = NS(QPoint)();
+            return true;
+        case QMetaType::QPointF:
+            *static_cast<NS(QPointF) *>(data) = NS(QPointF)();
+            return true;
+        case QMetaType::QVector3D:
+            *static_cast<NS(QVector3D) *>(data) = NS(QVector3D)();
+            return true;
+#ifndef QT_NO_REGEXP
+        case QMetaType::QRegExp:
+            *static_cast<NS(QRegExp) *>(data) = NS(QRegExp)();
+            return true;
+#endif
+        case QMetaType::Void:
+            return true;
+
+#ifdef QT3_SUPPORT
+        case QMetaType::QColorGroup:
+            *static_cast<NS(QColorGroup) *>(data) = NS(QColorGroup)();
+            return true;
+#endif
+
+        case QMetaType::QFont:
+            *static_cast<NS(QFont) *>(data) = NS(QFont)();
+            return true;
+        case QMetaType::QPixmap:
+            *static_cast<NS(QPixmap) *>(data) = NS(QPixmap)();
+            return true;
+        case QMetaType::QBrush:
+            *static_cast<NS(QBrush) *>(data) = NS(QBrush)();
+            return true;
+        case QMetaType::QColor:
+            *static_cast<NS(QColor) *>(data) = NS(QColor)();
+            return true;
+        case QMetaType::QPalette:
+            *static_cast<NS(QPalette) *>(data) = NS(QPalette)();
+            return true;
+        case QMetaType::QIcon:
+            *static_cast<NS(QIcon) *>(data) = NS(QIcon)();
+            return true;
+        case QMetaType::QImage:
+            *static_cast<NS(QImage) *>(data) = NS(QImage)();
+            return true;
+        case QMetaType::QPolygon:
+            *static_cast<NS(QPolygon) *>(data) = NS(QPolygon)();
+            return true;
+        case QMetaType::QRegion:
+            *static_cast<NS(QRegion) *>(data) = NS(QRegion)();
+            return true;
+        case QMetaType::QBitmap:
+            *static_cast<NS(QBitmap) *>(data) = NS(QBitmap)();
+            return true;
+#ifndef QT_NO_CURSOR
+        case QMetaType::QCursor:
+            *static_cast<NS(QCursor) *>(data) = NS(QCursor)();
+            return true;
+#endif
+        case QMetaType::QSizePolicy:
+            *static_cast<NS(QSizePolicy) *>(data) = NS(QSizePolicy)();
+            return true;
+        case QMetaType::QKeySequence:
+            *static_cast<NS(QKeySequence) *>(data) = NS(QKeySequence)();
+            return true;
+        case QMetaType::QPen:
+            *static_cast<NS(QPen) *>(data) = NS(QPen)();
+            return true;
+        case QMetaType::QTextLength:
+            *static_cast<NS(QTextLength) *>(data) = NS(QTextLength)();
+            return true;
+        case QMetaType::QTextFormat:
+            *static_cast<NS(QTextFormat) *>(data) = NS(QTextFormat)();
+            return true;
+        case QMetaType::QMatrix:
+            *static_cast<NS(QMatrix) *>(data) = NS(QMatrix)();
+            return true;
+        case QMetaType::QTransform:
+            *static_cast<NS(QTransform) *>(data) = NS(QTransform)();
+            return true;
+        case QMetaType::QMatrix4x4:
+            *static_cast<NS(QMatrix4x4) *>(data) = NS(QMatrix4x4)();
+            return true;
+        case QMetaType::QVector2D:
+            *static_cast<NS(QVector2D) *>(data) = NS(QVector2D)();
+            return true;
+        case QMetaType::QVector4D:
+            *static_cast<NS(QVector4D) *>(data) = NS(QVector4D)();
+            return true;
+        case QMetaType::QQuaternion:
+            *static_cast<NS(QQuaternion) *>(data) = NS(QQuaternion)();
+            return true;
+        default:
+            if (type == qMetaTypeId<QVariant>()) {
+                *static_cast<NS(QVariant) *>(data) = NS(QVariant)();
+                return true;
+            } else if (type == qMetaTypeId<QScriptValue>()) {
+                *static_cast<NS(QScriptValue) *>(data) = NS(QScriptValue)();
+                return true;
+            } else if (typeCategory(type) != Unknown) {
+                *static_cast<void **>(data) = 0;
+                return true;
+            }
+            break;
+        }
+    }
+
+    return false;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativemetatype.h b/src/declarative/qml/qdeclarativemetatype.h
new file mode 100644
index 0000000..0634939
--- /dev/null
+++ b/src/declarative/qml/qdeclarativemetatype.h
@@ -0,0 +1,281 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEMETATYPE_H
+#define QDECLARATIVEMETATYPE_H
+
+#include "qdeclarativeprivate.h"
+#include "qdeclarativeparserstatus.h"
+#include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarativepropertyvalueinterceptor.h"
+#include "qdeclarativelist.h"
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qvariant.h>
+#include <QtCore/qbitarray.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeType;
+class QDeclarativeCustomParser;
+class Q_DECLARATIVE_EXPORT QDeclarativeMetaType
+{
+public:
+    static int registerType(const QDeclarativePrivate::MetaTypeIds &, QObject *(*)(), const char *, int vmaj, int vmin, const char *qmlName, const QMetaObject *, QDeclarativeAttachedPropertiesFunc, const QMetaObject *, int pStatus, int object, int valueSource, int valueInterceptor, QDeclarativePrivate::CreateFunc extFunc, const QMetaObject *extmo, QDeclarativeCustomParser *);
+    static int registerInterface(const QDeclarativePrivate::MetaTypeIds &, const char *);
+
+    static bool copy(int type, void *data, const void *copy = 0);
+
+    static QList<QByteArray> qmlTypeNames();
+    static QList<QDeclarativeType*> qmlTypes();
+
+    static QDeclarativeType *qmlType(const QByteArray &, int, int);
+    static QDeclarativeType *qmlType(const QMetaObject *);
+    static QDeclarativeType *qmlType(int);
+
+    static QMetaProperty defaultProperty(const QMetaObject *);
+    static QMetaProperty defaultProperty(QObject *);
+    static QMetaMethod defaultMethod(const QMetaObject *);
+    static QMetaMethod defaultMethod(QObject *);
+
+    static bool isQObject(int);
+    static QObject *toQObject(const QVariant &, bool *ok = 0);
+
+    static int listType(int);
+    static int attachedPropertiesFuncId(const QMetaObject *);
+    static QDeclarativeAttachedPropertiesFunc attachedPropertiesFuncById(int);
+
+    enum TypeCategory { Unknown, Object, List };
+    static TypeCategory typeCategory(int);
+        
+    static bool isInterface(int);
+    static const char *interfaceIId(int);
+    static bool isList(int);
+
+    typedef QVariant (*StringConverter)(const QString &);
+    static void registerCustomStringConverter(int, StringConverter);
+    static StringConverter customStringConverter(int);
+};
+
+class QDeclarativeTypePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeType
+{
+public:
+    QByteArray typeName() const;
+    QByteArray qmlTypeName() const;
+
+    int majorVersion() const;
+    int minorVersion() const;
+    bool availableInVersion(int vmajor, int vminor) const;
+
+    QObject *create() const;
+
+    QDeclarativeCustomParser *customParser() const;
+
+    bool isInterface() const;
+    int typeId() const;
+    int qListTypeId() const;
+
+    const QMetaObject *metaObject() const;
+    const QMetaObject *baseMetaObject() const;
+
+    QDeclarativeAttachedPropertiesFunc attachedPropertiesFunction() const;
+    const QMetaObject *attachedPropertiesType() const;
+
+    int parserStatusCast() const;
+    QVariant fromObject(QObject *) const;
+    const char *interfaceIId() const;
+    int propertyValueSourceCast() const;
+    int propertyValueInterceptorCast() const;
+
+    int index() const;
+private:
+    friend class QDeclarativeMetaType;
+    friend class QDeclarativeTypePrivate;
+    friend struct QDeclarativeMetaTypeData;
+    QDeclarativeType(int, int, const char *, int);
+    QDeclarativeType(int, int, QObject *(*)(), const char *, int, int, const QMetaObject *, QDeclarativeAttachedPropertiesFunc, const QMetaObject *, int, int, int, QDeclarativePrivate::CreateFunc, const QMetaObject *, int, QDeclarativeCustomParser *);
+    ~QDeclarativeType();
+
+    QDeclarativeTypePrivate *d;
+};
+
+template<typename T>
+int qmlRegisterType(const char *typeName)
+{
+    QByteArray name(typeName);
+    QDeclarativePrivate::MetaTypeIds ids = {
+        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
+    };
+
+    return QDeclarativeMetaType::registerType(ids, 0, 0, 0, 0, 0,
+            &T::staticMetaObject,
+            QDeclarativePrivate::attachedPropertiesFunc<T>(),
+            QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+            0, 0, 0);
+}
+
+template<typename T>
+int qmlRegisterType(const char *uri, int version_maj, int version_min, const char *qmlName, const char *typeName)
+{
+    QByteArray name(typeName);
+    QDeclarativePrivate::MetaTypeIds ids = {
+        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
+    };
+
+    return QDeclarativeMetaType::registerType(ids, QDeclarativePrivate::create<T>, 
+            uri, version_maj, version_min, qmlName, 
+            &T::staticMetaObject,
+            QDeclarativePrivate::attachedPropertiesFunc<T>(),
+            QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(), 
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+            0, 0, 0);
+}
+
+template<typename T, typename E>
+int qmlRegisterExtendedType(const char *typeName)
+{
+    QByteArray name(typeName);
+    QDeclarativePrivate::MetaTypeIds ids = {
+        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
+    };
+
+    QDeclarativeAttachedPropertiesFunc attached = 
+        QDeclarativePrivate::attachedPropertiesFunc<E>();
+    const QMetaObject * attachedMo = 
+        QDeclarativePrivate::attachedPropertiesMetaObject<E>();
+    if (!attached) {
+        attached = QDeclarativePrivate::attachedPropertiesFunc<T>();
+        attachedMo = QDeclarativePrivate::attachedPropertiesMetaObject<T>();
+    }
+
+    return QDeclarativeMetaType::registerType(ids, 0, 0, 0, 0, 0,
+            &T::staticMetaObject, attached, attachedMo,
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+            &QDeclarativePrivate::CreateParent<E>::create, &E::staticMetaObject, 0);
+}
+
+template<typename T, typename E>
+int qmlRegisterExtendedType(const char *uri, int version_maj, int version_min, const char *qmlName, const char *typeName)
+{
+    QByteArray name(typeName);
+    QDeclarativePrivate::MetaTypeIds ids = {
+        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
+    };
+
+    QDeclarativeAttachedPropertiesFunc attached = 
+        QDeclarativePrivate::attachedPropertiesFunc<E>();
+    const QMetaObject * attachedMo = 
+        QDeclarativePrivate::attachedPropertiesMetaObject<E>(); 
+    if (!attached) {
+        attached = QDeclarativePrivate::attachedPropertiesFunc<T>();
+        attachedMo = QDeclarativePrivate::attachedPropertiesMetaObject<T>();
+    }
+
+    return QDeclarativeMetaType::registerType(ids, QDeclarativePrivate::create<T>, 
+            uri, version_maj, version_min, qmlName, 
+            &T::staticMetaObject,
+            attached, attachedMo,
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+            &QDeclarativePrivate::CreateParent<E>::create, 
+            &E::staticMetaObject, 0);
+}
+
+template<typename T>
+int qmlRegisterInterface(const char *typeName)
+{
+    QByteArray name(typeName);
+    QDeclarativePrivate::MetaTypeIds ids = {
+        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
+    };
+
+    return QDeclarativeMetaType::registerInterface(ids, qobject_interface_iid<T *>());
+}
+
+template<typename T>
+int qmlRegisterCustomType(const char *uri, int version_maj, int version_min, const char *qmlName, const char *typeName, QDeclarativeCustomParser *parser)
+{
+    QByteArray name(typeName);
+    QDeclarativePrivate::MetaTypeIds ids = {
+        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
+    };
+
+    return QDeclarativeMetaType::registerType(ids, QDeclarativePrivate::create<T>, 
+            uri, version_maj, version_min, qmlName, 
+            &T::staticMetaObject,
+            QDeclarativePrivate::attachedPropertiesFunc<T>(),
+            QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+            0, 0, parser);
+}
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEMETATYPE_H
+
diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp
new file mode 100644
index 0000000..9dd7d39
--- /dev/null
+++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativenetworkaccessmanagerfactory.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativeNetworkAccessManagerFactory
+  \since 4.7
+    \brief The QDeclarativeNetworkAccessManagerFactory class provides a factory for QNetworkAccessManager
+
+    QNetworkAccessManager is used for all network access by QML.
+    By implementing a factory it is possible to create custom
+    QNetworkAccessManager with specialized caching, proxy and
+    cookie support.
+
+    To implement a factory, subclass QDeclarativeNetworkAccessManagerFactory and implement
+    the create() method.
+
+    If the created QNetworkAccessManager becomes invalid, due to a
+    change in proxy settings, for example, call the invalidate() method.
+    This will cause all QNetworkAccessManagers to be recreated.
+
+    Note: the create() method may be called by multiple threads, so ensure the
+    implementation of this method is reentrant.
+*/
+
+/*!
+  The destructor is empty.
+ */
+QDeclarativeNetworkAccessManagerFactory::~QDeclarativeNetworkAccessManagerFactory()
+{
+}
+
+/*!
+    \fn QNetworkAccessManager *QDeclarativeNetworkAccessManagerFactory::create(QObject *parent)
+
+    Implement this method to create a QNetworkAccessManager with \a parent.
+    This allows proxies, caching and cookie support to be setup appropriately.
+
+    Note: this method may be called by multiple threads, so ensure the
+    implementation of this method is reentrant.
+*/
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
new file mode 100644
index 0000000..8c76013
--- /dev/null
+++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVENETWORKACCESSMANAGERFACTORY_H
+#define QDECLARATIVENETWORKACCESSMANAGERFACTORY_H
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QNetworkAccessManager;
+class Q_DECLARATIVE_EXPORT QDeclarativeNetworkAccessManagerFactory
+{
+public:
+    virtual ~QDeclarativeNetworkAccessManagerFactory();
+    virtual QNetworkAccessManager *create(QObject *parent) = 0;
+
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVENETWORKACCESSMANAGERFACTORY_H
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
new file mode 100644
index 0000000..50fe5c0
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -0,0 +1,673 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeobjectscriptclass_p.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativedeclarativedata_p.h"
+#include "qdeclarativetypenamescriptclass_p.h"
+#include "qdeclarativelistscriptclass_p.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativeguard_p.h"
+#include "qdeclarativevmemetaobject_p.h"
+
+#include <QtCore/qtimer.h>
+#include <QtCore/qvarlengtharray.h>
+
+Q_DECLARE_METATYPE(QScriptValue);
+
+QT_BEGIN_NAMESPACE
+
+struct ObjectData : public QScriptDeclarativeClass::Object {
+    ObjectData(QObject *o, int t) : object(o), type(t) {}
+    QDeclarativeGuard<QObject> object;
+    int type;
+};
+
+/*
+    The QDeclarativeObjectScriptClass handles property access for QObjects
+    via QtScript. It is also used to provide a more useful API in
+    QtScript for QML.
+ */
+QDeclarativeObjectScriptClass::QDeclarativeObjectScriptClass(QDeclarativeEngine *bindEngine)
+: QDeclarativeScriptClass(QDeclarativeEnginePrivate::getScriptEngine(bindEngine)), 
+#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
+  methods(bindEngine),
+#endif
+  lastData(0), engine(bindEngine)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    m_destroy = scriptEngine->newFunction(destroy);
+    m_destroyId = createPersistentIdentifier(QLatin1String("destroy"));
+    m_toString = scriptEngine->newFunction(tostring);
+    m_toStringId = createPersistentIdentifier(QLatin1String("toString"));
+}
+
+QDeclarativeObjectScriptClass::~QDeclarativeObjectScriptClass()
+{
+}
+
+QScriptValue QDeclarativeObjectScriptClass::newQObject(QObject *object, int type) 
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    if (!object)
+        return newObject(scriptEngine, this, new ObjectData(object, type));
+
+    QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(object, true);
+
+    if (!ddata->scriptValue.isValid()) {
+        ddata->scriptValue = newObject(scriptEngine, this, new ObjectData(object, type));
+        return ddata->scriptValue;
+    } else if (ddata->scriptValue.engine() == QDeclarativeEnginePrivate::getScriptEngine(engine)) {
+        return ddata->scriptValue;
+    } else {
+        return newObject(scriptEngine, this, new ObjectData(object, type));
+    }
+}
+
+QObject *QDeclarativeObjectScriptClass::toQObject(const QScriptValue &value) const
+{
+    return value.toQObject();
+}
+
+int QDeclarativeObjectScriptClass::objectType(const QScriptValue &value) const
+{
+    if (scriptClass(value) != this)
+        return QVariant::Invalid;
+
+    Object *o = object(value);
+    return ((ObjectData*)(o))->type;
+}
+
+QScriptClass::QueryFlags 
+QDeclarativeObjectScriptClass::queryProperty(Object *object, const Identifier &name, 
+                                    QScriptClass::QueryFlags flags)
+{
+    return queryProperty(toQObject(object), name, flags, 0);
+}
+
+QScriptClass::QueryFlags 
+QDeclarativeObjectScriptClass::queryProperty(QObject *obj, const Identifier &name, 
+                                    QScriptClass::QueryFlags flags, QDeclarativeContext *evalContext,
+                                    QueryHints hints)
+{
+    Q_UNUSED(flags);
+    lastData = 0;
+    lastTNData = 0;
+
+    if (name == m_destroyId.identifier ||
+        name == m_toStringId.identifier)
+        return QScriptClass::HandlesReadAccess;
+
+    if (!obj)
+        return 0;
+
+    QDeclarativeEnginePrivate *enginePrivate = QDeclarativeEnginePrivate::get(engine);
+    lastData = QDeclarativePropertyCache::property(engine, obj, name, local);
+
+    if (lastData)
+        return QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess; 
+
+    if (!(hints & SkipAttachedProperties)) {
+        if (!evalContext && context()) {
+            // Global object, QScriptContext activation object, QDeclarativeContext object
+            QScriptValue scopeNode = scopeChainValue(context(), -3);         
+            if (scopeNode.isValid()) {
+                Q_ASSERT(scriptClass(scopeNode) == enginePrivate->contextClass);
+
+                evalContext = enginePrivate->contextClass->contextFromValue(scopeNode);
+            }
+        }
+
+        if (evalContext) {
+            QDeclarativeContextPrivate *cp = QDeclarativeContextPrivate::get(evalContext);
+
+            if (cp->imports) {
+                QDeclarativeTypeNameCache::Data *data = cp->imports->data(name);
+                if (data) {
+                    lastTNData = data;
+                    return QScriptClass::HandlesReadAccess;
+                }
+            }
+        }
+    }
+
+    if (!(hints & ImplicitObject)) {
+        local.coreIndex = -1;
+        lastData = &local;
+        return QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess;
+    }
+
+    return 0;
+}
+
+QDeclarativeObjectScriptClass::ScriptValue
+QDeclarativeObjectScriptClass::property(Object *object, const Identifier &name)
+{
+    return property(toQObject(object), name);
+}
+
+QDeclarativeObjectScriptClass::ScriptValue
+QDeclarativeObjectScriptClass::property(QObject *obj, const Identifier &name)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    if (name == m_destroyId.identifier)
+        return Value(scriptEngine, m_destroy);
+    else if (name == m_toStringId.identifier)
+        return Value(scriptEngine, m_toString);
+
+    if (lastData && !lastData->isValid())
+        return Value();
+
+    Q_ASSERT(obj);
+
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+
+    if (lastTNData) {
+
+        if (lastTNData->type)
+            return Value(scriptEngine, enginePriv->typeNameClass->newObject(obj, lastTNData->type));
+        else
+            return Value(scriptEngine, enginePriv->typeNameClass->newObject(obj, lastTNData->typeNamespace));
+
+    } else if (lastData->flags & QDeclarativePropertyCache::Data::IsFunction) {
+        if (lastData->flags & QDeclarativePropertyCache::Data::IsVMEFunction) {
+            return Value(scriptEngine, ((QDeclarativeVMEMetaObject *)(obj->metaObject()))->vmeMethod(lastData->coreIndex));
+        } else {
+#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
+            // Uncomment to use QtScript method call logic
+            // QScriptValue sobj = scriptEngine->newQObject(obj);
+            // return Value(scriptEngine, sobj.property(toString(name)));
+            return Value(scriptEngine, methods.newMethod(obj, lastData));
+#else
+            QScriptValue sobj = scriptEngine->newQObject(obj);
+            return Value(scriptEngine, sobj.property(toString(name)));
+#endif
+        }
+    } else {
+        if (enginePriv->captureProperties && !(lastData->flags & QDeclarativePropertyCache::Data::IsConstant)) {
+            enginePriv->capturedProperties << 
+                QDeclarativeEnginePrivate::CapturedProperty(obj, lastData->coreIndex, lastData->notifyIndex);
+        }
+
+        if ((uint)lastData->propType < QVariant::UserType) {
+            QDeclarativeValueType *valueType = enginePriv->valueTypes[lastData->propType];
+            if (valueType)
+                return Value(scriptEngine, enginePriv->valueTypeClass->newObject(obj, lastData->coreIndex, valueType));
+        }
+
+        if (lastData->flags & QDeclarativePropertyCache::Data::IsQList) {
+            return Value(scriptEngine, enginePriv->listClass->newList(obj, lastData->coreIndex, lastData->propType));
+        } else if (lastData->flags & QDeclarativePropertyCache::Data::IsQObjectDerived) {
+            QObject *rv = 0;
+            void *args[] = { &rv, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
+            return Value(scriptEngine, newQObject(rv, lastData->propType));
+        } else if (lastData->flags & QDeclarativePropertyCache::Data::IsQScriptValue) {
+            QScriptValue rv = scriptEngine->nullValue();
+            void *args[] = { &rv, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
+            return Value(scriptEngine, rv);
+        } else if (lastData->propType == QMetaType::QReal) {
+            qreal rv = 0;
+            void *args[] = { &rv, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
+            return Value(scriptEngine, rv);
+        } else if (lastData->propType == QMetaType::Int) {
+            int rv = 0;
+            void *args[] = { &rv, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
+            return Value(scriptEngine, rv);
+        } else if (lastData->propType == QMetaType::Bool) {
+            bool rv = false;
+            void *args[] = { &rv, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
+            return Value(scriptEngine, rv);
+        } else if (lastData->propType == QMetaType::QString) {
+            QString rv;
+            void *args[] = { &rv, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
+            return Value(scriptEngine, rv);
+        } else if (lastData->propType == QMetaType::UInt) {
+            uint rv = 0;
+            void *args[] = { &rv, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
+            return Value(scriptEngine, rv);
+        } else if (lastData->propType == QMetaType::Float) {
+            float rv = 0;
+            void *args[] = { &rv, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
+            return Value(scriptEngine, rv);
+        } else if (lastData->propType == QMetaType::Double) {
+            double rv = 0;
+            void *args[] = { &rv, 0 };
+            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
+            return Value(scriptEngine, rv);
+        } else {
+            QVariant var = obj->metaObject()->property(lastData->coreIndex).read(obj);
+            return Value(scriptEngine, enginePriv->scriptValueFromVariant(var));
+        }
+
+    }
+}
+
+void QDeclarativeObjectScriptClass::setProperty(Object *object, 
+                                       const Identifier &name, 
+                                       const QScriptValue &value)
+{
+    return setProperty(toQObject(object), name, value);
+}
+
+void QDeclarativeObjectScriptClass::setProperty(QObject *obj, 
+                                       const Identifier &name, 
+                                       const QScriptValue &value,
+                                       QDeclarativeContext *evalContext)
+{
+    Q_UNUSED(name);
+
+    Q_ASSERT(obj);
+    Q_ASSERT(lastData);
+
+    if (!lastData->isValid()) {
+        QString error = QLatin1String("Cannot assign to non-existent property \"") +
+                        toString(name) + QLatin1Char('\"');
+        if (context())
+            context()->throwError(error);
+        return;
+    }
+
+    if (!(lastData->flags & QDeclarativePropertyCache::Data::IsWritable)) {
+        QString error = QLatin1String("Cannot assign to read-only property \"") +
+                        toString(name) + QLatin1Char('\"');
+        if (context())
+            context()->throwError(error);
+        return;
+    }
+
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+
+    if (!evalContext && context()) {
+        // Global object, QScriptContext activation object, QDeclarativeContext object
+        QScriptValue scopeNode = scopeChainValue(context(), -3);         
+        if (scopeNode.isValid()) {
+            Q_ASSERT(scriptClass(scopeNode) == enginePriv->contextClass);
+
+            evalContext = enginePriv->contextClass->contextFromValue(scopeNode);
+        }
+    }
+
+    QDeclarativeAbstractBinding *delBinding = QDeclarativeMetaPropertyPrivate::setBinding(obj, *lastData, 0);
+    if (delBinding)
+        delBinding->destroy();
+
+    if (value.isUndefined() && lastData->flags & QDeclarativePropertyCache::Data::IsResettable) {
+        void *a[] = { 0 };
+        QMetaObject::metacall(obj, QMetaObject::ResetProperty, lastData->coreIndex, a);
+    } else {
+        // ### Can well known types be optimized?
+        QVariant v = QDeclarativeScriptClass::toVariant(engine, value);
+        QDeclarativeMetaPropertyPrivate::write(obj, *lastData, v, evalContext);
+    }
+}
+
+bool QDeclarativeObjectScriptClass::isQObject() const
+{
+    return true;
+}
+
+QObject *QDeclarativeObjectScriptClass::toQObject(Object *object, bool *ok)
+{
+    if (ok) *ok = true;
+
+    ObjectData *data = (ObjectData*)object;
+    return data->object.data();
+}
+
+QScriptValue QDeclarativeObjectScriptClass::tostring(QScriptContext *context, QScriptEngine *)
+{
+    QObject* obj = context->thisObject().toQObject();
+
+    QString ret;
+    if(obj){
+        QString objectName = obj->objectName();
+
+        ret += QString::fromUtf8(obj->metaObject()->className());
+        ret += QLatin1String("(0x");
+        ret += QString::number((intptr_t)obj,16);
+
+        if (!objectName.isEmpty()) {
+            ret += QLatin1String(", \"");
+            ret += objectName;
+            ret += QLatin1Char('\"');
+        }
+
+        ret += QLatin1Char(')');
+    }else{
+        ret += QLatin1String("null");
+    }
+    return QScriptValue(ret);
+}
+
+QScriptValue QDeclarativeObjectScriptClass::destroy(QScriptContext *context, QScriptEngine *engine)
+{
+    QObject* obj = context->thisObject().toQObject();
+    if(obj){
+        int delay = 0;
+        if(context->argumentCount() > 0)
+            delay = context->argument(0).toInt32();
+        if (delay > 0)
+            QTimer::singleShot(delay, obj, SLOT(deleteLater()));
+        else
+            obj->deleteLater();
+    }
+    return engine->nullValue();
+}
+
+QStringList QDeclarativeObjectScriptClass::propertyNames(Object *object)
+{
+    QObject *obj = toQObject(object);
+    if (!obj)
+        return QStringList();
+
+    QDeclarativeEnginePrivate *enginePrivate = QDeclarativeEnginePrivate::get(engine);
+
+    QDeclarativePropertyCache *cache = 0;
+    QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(obj);
+    if (ddata)
+        cache = ddata->propertyCache;
+    if (!cache) {
+        cache = enginePrivate->cache(obj);
+        if (cache && ddata) { cache->addref(); ddata->propertyCache = cache; }
+    }
+
+    if (!cache)
+        return QStringList();
+
+    return cache->propertyNames();
+}
+
+#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
+
+struct MethodData : public QScriptDeclarativeClass::Object {
+    MethodData(QObject *o, const QDeclarativePropertyCache::Data &d) : object(o), data(d) {}
+
+    QDeclarativeGuard<QObject> object;
+    QDeclarativePropertyCache::Data data;
+};
+
+QDeclarativeObjectMethodScriptClass::QDeclarativeObjectMethodScriptClass(QDeclarativeEngine *bindEngine)
+: QScriptDeclarativeClass(QDeclarativeEnginePrivate::getScriptEngine(bindEngine)), 
+  engine(bindEngine)
+{
+    setSupportsCall(true);
+}
+
+QDeclarativeObjectMethodScriptClass::~QDeclarativeObjectMethodScriptClass()
+{
+}
+
+QScriptValue QDeclarativeObjectMethodScriptClass::newMethod(QObject *object, const QDeclarativePropertyCache::Data *method)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    return newObject(scriptEngine, this, new MethodData(object, *method));
+}
+
+namespace {
+struct MetaCallArgument {
+    inline MetaCallArgument();
+    inline ~MetaCallArgument();
+    inline void *dataPtr();
+
+    inline void initAsType(int type, QDeclarativeEngine *);
+    void fromScriptValue(int type, QDeclarativeEngine *, const QScriptValue &);
+    inline QScriptDeclarativeClass::Value toValue(QDeclarativeEngine *);
+
+private:
+    MetaCallArgument(const MetaCallArgument &);
+    
+    inline void cleanup();
+
+    char *data[16];
+    int type;
+};
+}
+
+MetaCallArgument::MetaCallArgument()
+: type(QVariant::Invalid)
+{
+}
+
+MetaCallArgument::~MetaCallArgument()
+{
+    cleanup();
+}
+
+void MetaCallArgument::cleanup() 
+{
+    if (type == QMetaType::QString) {
+        ((QString *)data)->~QString();
+    } else if (type == -1 || type == qMetaTypeId<QVariant>()) {
+        ((QVariant *)data)->~QVariant();
+    } else if (type == qMetaTypeId<QScriptValue>()) {
+        ((QScriptValue *)data)->~QScriptValue();
+    }
+}
+
+void *MetaCallArgument::dataPtr()
+{
+    if (type == -1) 
+        return ((QVariant *)data)->data();
+    else
+        return (void *)data;
+}
+
+void MetaCallArgument::initAsType(int callType, QDeclarativeEngine *e)
+{
+    if (type != 0) { cleanup(); type = 0; }
+    if (callType == 0) return;
+
+    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(e);
+    
+    if (callType == qMetaTypeId<QScriptValue>()) {
+        new (data) QScriptValue(engine->undefinedValue());
+        type = callType;
+    } else if (callType == QMetaType::Int ||
+               callType == QMetaType::UInt ||
+               callType == QMetaType::Bool ||
+               callType == QMetaType::Double ||
+               callType == QMetaType::Float) {
+        type = callType;
+    } else if (callType == QMetaType::QObjectStar) {
+        *((QObject **)data) = 0;
+        type = callType;
+    } else if (callType == QMetaType::QString) {
+        new (data) QString();
+        type = callType;
+    } else if (callType == qMetaTypeId<QVariant>()) {
+        type = qMetaTypeId<QVariant>();
+        new (data) QVariant();
+    } else {
+        type = -1;
+        new (data) QVariant(callType, (void *)0);
+    }
+}
+
+void MetaCallArgument::fromScriptValue(int callType, QDeclarativeEngine *engine, const QScriptValue &value)
+{
+    if (type != 0) { cleanup(); type = 0; }
+
+    if (callType == qMetaTypeId<QScriptValue>()) {
+        new (data) QScriptValue(value);
+        type = qMetaTypeId<QScriptValue>();
+    } else if (callType == QMetaType::Int) {
+        *((int *)data) = int(value.toInt32());
+        type = callType;
+    } else if (callType == QMetaType::UInt) {
+        *((uint *)data) = uint(value.toUInt32());
+        type = callType;
+    } else if (callType == QMetaType::Bool) {
+        *((bool *)data) = value.toBool();
+        type = callType;
+    } else if (callType == QMetaType::Double) {
+        *((double *)data) = double(value.toNumber());
+        type = callType;
+    } else if (callType == QMetaType::Float) {
+        *((float *)data) = float(value.toNumber());
+        type = callType;
+    } else if (callType == QMetaType::QString) {
+        if (value.isNull() || value.isUndefined())
+            new (data) QString();
+        else
+            new (data) QString(value.toString());
+        type = callType;
+    } else if (callType == QMetaType::QObjectStar) {
+        *((QObject **)data) = value.toQObject();
+        type = callType;
+    } else if (callType == qMetaTypeId<QVariant>()) {
+        new (data) QVariant(QDeclarativeScriptClass::toVariant(engine, value));
+        type = callType;
+    } else {
+        new (data) QVariant();
+        type = -1;
+
+        QVariant v = QDeclarativeScriptClass::toVariant(engine, value);
+        if (v.userType() == callType) {
+            *((QVariant *)data) = v;
+        } else if (v.canConvert((QVariant::Type)callType)) {
+            *((QVariant *)data) = v;
+            ((QVariant *)data)->convert((QVariant::Type)callType);
+        } else {
+            *((QVariant *)data) = QVariant(callType, (void *)0);
+        }
+    }
+}
+
+QScriptDeclarativeClass::Value MetaCallArgument::toValue(QDeclarativeEngine *e)
+{
+    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(e);
+    
+    if (type == qMetaTypeId<QScriptValue>()) {
+        return QScriptDeclarativeClass::Value(engine, *((QScriptValue *)data));
+    } else if (type == QMetaType::Int) {
+        return QScriptDeclarativeClass::Value(engine, *((int *)data));
+    } else if (type == QMetaType::UInt) {
+        return QScriptDeclarativeClass::Value(engine, *((uint *)data));
+    } else if (type == QMetaType::Bool) {
+        return QScriptDeclarativeClass::Value(engine, *((bool *)data));
+    } else if (type == QMetaType::Double) {
+        return QScriptDeclarativeClass::Value(engine, *((double *)data));
+    } else if (type == QMetaType::Float) {
+        return QScriptDeclarativeClass::Value(engine, *((float *)data));
+    } else if (type == QMetaType::QString) {
+        return QScriptDeclarativeClass::Value(engine, *((QString *)data));
+    } else if (type == QMetaType::QObjectStar) {
+        return QScriptDeclarativeClass::Value(engine, QDeclarativeEnginePrivate::get(e)->objectClass->newQObject(*((QObject **)data)));
+    } else if (type == -1 || type == qMetaTypeId<QVariant>()) {
+        return QScriptDeclarativeClass::Value(engine, QDeclarativeEnginePrivate::get(e)->scriptValueFromVariant(*((QVariant *)data)));
+    } else {
+        return QScriptDeclarativeClass::Value();
+    }
+}
+
+QDeclarativeObjectMethodScriptClass::Value QDeclarativeObjectMethodScriptClass::call(Object *o, QScriptContext *ctxt)
+{
+    MethodData *method = static_cast<MethodData *>(o);
+
+    if (method->data.flags & QDeclarativePropertyCache::Data::HasArguments) {
+
+        QMetaMethod m = method->object->metaObject()->method(method->data.coreIndex);
+        QList<QByteArray> argTypeNames = m.parameterTypes();
+        QVarLengthArray<int, 9> argTypes(argTypeNames.count());
+
+        // ### Cache
+        for (int ii = 0; ii < argTypeNames.count(); ++ii) {
+            argTypes[ii] = QMetaType::type(argTypeNames.at(ii));
+            if (argTypes[ii] == QVariant::Invalid) 
+                return Value(ctxt, ctxt->throwError(QString::fromLatin1("Unknown method parameter type: %1").arg(QLatin1String(argTypeNames.at(ii)))));
+        }
+
+        if (argTypes.count() > ctxt->argumentCount()) 
+            return Value(ctxt, ctxt->throwError(QLatin1String("Insufficient arguments")));
+
+        QVarLengthArray<MetaCallArgument, 9> args(argTypes.count() + 1);
+        args[0].initAsType(method->data.propType, engine);
+
+        for (int ii = 0; ii < argTypes.count(); ++ii) 
+            args[ii + 1].fromScriptValue(argTypes[ii], engine, ctxt->argument(ii));
+
+        QVarLengthArray<void *, 9> argData(args.count());
+        for (int ii = 0; ii < args.count(); ++ii) 
+            argData[ii] = args[ii].dataPtr();
+
+        QMetaObject::metacall(method->object, QMetaObject::InvokeMetaMethod, method->data.coreIndex, argData.data());
+
+        return args[0].toValue(engine);
+
+    } else if (method->data.propType != 0) {
+
+        MetaCallArgument arg;
+        arg.initAsType(method->data.propType, engine);
+
+        void *args[] = { arg.dataPtr() };
+
+        QMetaObject::metacall(method->object, QMetaObject::InvokeMetaMethod, method->data.coreIndex, args);
+
+        return arg.toValue(engine);
+
+    } else {
+
+        void *args[] = { 0 };
+        QMetaObject::metacall(method->object, QMetaObject::InvokeMetaMethod, method->data.coreIndex, args);
+        return Value();
+
+    }
+    return Value();
+}
+
+#endif
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h
new file mode 100644
index 0000000..8023756
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEOBJECTSCRIPTCLASS_P_H
+#define QDECLARATIVEOBJECTSCRIPTCLASS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativetypenamecache_p.h"
+
+#include <private/qdeclarativescriptclass_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QScriptContext;
+class QScriptEngine;
+class QDeclarativeContext;
+
+#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
+class Q_AUTOTEST_EXPORT QDeclarativeObjectMethodScriptClass : public QScriptDeclarativeClass
+{
+public:
+    QDeclarativeObjectMethodScriptClass(QDeclarativeEngine *);
+    ~QDeclarativeObjectMethodScriptClass();
+
+    QScriptValue newMethod(QObject *, const QDeclarativePropertyCache::Data *);
+protected:
+    virtual Value call(Object *, QScriptContext *);
+
+private:
+    QDeclarativeEngine *engine;
+};
+#endif
+
+class Q_AUTOTEST_EXPORT QDeclarativeObjectScriptClass : public QDeclarativeScriptClass
+{
+public:
+    QDeclarativeObjectScriptClass(QDeclarativeEngine *);
+    ~QDeclarativeObjectScriptClass();
+
+    QScriptValue newQObject(QObject *, int type = QMetaType::QObjectStar);
+    QObject *toQObject(const QScriptValue &) const;
+    int objectType(const QScriptValue &) const;
+
+    enum QueryHint {
+        ImplicitObject = 0x01,
+        SkipAttachedProperties = 0x02
+    };
+    Q_DECLARE_FLAGS(QueryHints, QueryHint)
+
+    QScriptClass::QueryFlags queryProperty(QObject *, const Identifier &, 
+                                           QScriptClass::QueryFlags flags, 
+                                           QDeclarativeContext *evalContext,
+                                           QueryHints hints = 0);
+
+    ScriptValue property(QObject *, const Identifier &);
+
+    void setProperty(QObject *, const Identifier &name, const QScriptValue &,
+                     QDeclarativeContext *evalContext = 0);
+    virtual QStringList propertyNames(Object *);
+
+protected:
+    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
+                                                   QScriptClass::QueryFlags flags);
+
+    virtual ScriptValue property(Object *, const Identifier &);
+    virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
+    virtual bool isQObject() const;
+    virtual QObject *toQObject(Object *, bool *ok = 0);
+
+private:
+#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
+    QDeclarativeObjectMethodScriptClass methods;
+#endif
+
+    QDeclarativeTypeNameCache::Data *lastTNData;
+    QDeclarativePropertyCache::Data *lastData;
+    QDeclarativePropertyCache::Data local;
+
+    PersistentIdentifier m_destroyId;
+    PersistentIdentifier m_toStringId;
+    QScriptValue m_destroy;
+    QScriptValue m_toString;
+
+    static QScriptValue tostring(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue destroy(QScriptContext *context, QScriptEngine *engine);
+
+    QDeclarativeEngine *engine;
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeObjectScriptClass::QueryHints);
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEOBJECTSCRIPTCLASS_P_H
+
diff --git a/src/declarative/qml/qdeclarativeparser.cpp b/src/declarative/qml/qdeclarativeparser.cpp
new file mode 100644
index 0000000..5ac49d5
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeparser.cpp
@@ -0,0 +1,387 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeparser_p.h"
+
+#include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarativevme_p.h"
+#include "qdeclarative.h"
+#include "qdeclarativecomponent_p.h"
+#include "qdeclarativecomponent.h"
+#include "qmetaobjectbuilder_p.h"
+#include "qdeclarativevmemetaobject_p.h"
+#include "qdeclarativecompiler_p.h"
+#include "parser/qdeclarativejsast_p.h"
+#include "parser/qdeclarativejsengine_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QStack>
+#include <QColor>
+#include <QPointF>
+#include <QSizeF>
+#include <QRectF>
+#include <QtDebug>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QDeclarativeJS;
+using namespace QDeclarativeParser;
+
+QDeclarativeParser::Object::Object()
+: type(-1), majorVersion(-1), minorVersion(-1), idIndex(-1), metatype(0), defaultProperty(0), parserStatusCast(-1)
+{
+}
+
+QDeclarativeParser::Object::~Object() 
+{ 
+    if (defaultProperty) defaultProperty->release();
+    foreach(Property *prop, properties)
+        prop->release();
+    foreach(Property *prop, valueProperties)
+        prop->release();
+    foreach(Property *prop, signalProperties)
+        prop->release();
+    foreach(Property *prop, attachedProperties)
+        prop->release();
+    foreach(Property *prop, groupedProperties)
+        prop->release();
+    foreach(Property *prop, valueTypeProperties)
+        prop->release();
+    typedef QPair<Property *, int> PropPair;
+    foreach(const PropPair &prop, scriptStringProperties)
+        prop.first->release();
+    foreach(const DynamicProperty &prop, dynamicProperties)
+        if (prop.defaultValue) prop.defaultValue->release();
+    foreach(Object *obj, scriptBlockObjects)
+        obj->release();
+}
+
+void Object::setBindingBit(int b)
+{
+    while (bindingBitmask.size() < 4 * (1 + b / 32))
+        bindingBitmask.append(char(0));
+
+    quint32 *bits = (quint32 *)bindingBitmask.data();
+    bits[b / 32] |= (1 << (b % 32));
+}
+
+const QMetaObject *Object::metaObject() const
+{
+    if (!metadata.isEmpty() && metatype)
+        return &extObject;
+    else
+        return metatype;
+}
+
+QDeclarativeParser::Property *Object::getDefaultProperty()
+{
+    if (!defaultProperty) {
+        defaultProperty = new Property;
+        defaultProperty->parent = this;
+    }
+    return defaultProperty;
+}
+
+void QDeclarativeParser::Object::addValueProperty(Property *p)
+{
+    p->addref();
+    valueProperties << p;
+}
+
+void QDeclarativeParser::Object::addSignalProperty(Property *p)
+{
+    p->addref();
+    signalProperties << p;
+}
+
+void QDeclarativeParser::Object::addAttachedProperty(Property *p)
+{
+    p->addref();
+    attachedProperties << p;
+}
+
+void QDeclarativeParser::Object::addGroupedProperty(Property *p)
+{
+    p->addref();
+    groupedProperties << p;
+}
+
+void QDeclarativeParser::Object::addValueTypeProperty(Property *p)
+{
+    p->addref();
+    valueTypeProperties << p;
+}
+
+void QDeclarativeParser::Object::addScriptStringProperty(Property *p, int stack)
+{
+    p->addref();
+    scriptStringProperties << qMakePair(p, stack);
+}
+
+
+Property *QDeclarativeParser::Object::getProperty(const QByteArray &name, bool create)
+{
+    if (!properties.contains(name)) {
+        if (create) {
+            Property *property = new Property(name);
+            property->parent = this;
+            properties.insert(name, property);
+        } else {
+            return 0;
+        }
+    }
+    return properties[name];
+}
+
+QDeclarativeParser::Object::DynamicProperty::DynamicProperty()
+: isDefaultProperty(false), type(Variant), defaultValue(0)
+{
+}
+
+QDeclarativeParser::Object::DynamicProperty::DynamicProperty(const DynamicProperty &o)
+: isDefaultProperty(o.isDefaultProperty),
+  type(o.type),
+  customType(o.customType),
+  name(o.name),
+  defaultValue(o.defaultValue),
+  location(o.location)
+{
+}
+
+QDeclarativeParser::Object::DynamicSignal::DynamicSignal()
+{
+}
+
+QDeclarativeParser::Object::DynamicSignal::DynamicSignal(const DynamicSignal &o)
+: name(o.name), parameterTypes(o.parameterTypes), 
+  parameterNames(o.parameterNames)
+{
+}
+
+QDeclarativeParser::Object::DynamicSlot::DynamicSlot()
+{
+}
+
+QDeclarativeParser::Object::DynamicSlot::DynamicSlot(const DynamicSlot &o)
+: name(o.name), body(o.body), parameterNames(o.parameterNames)
+{
+}
+
+QDeclarativeParser::Property::Property()
+: parent(0), type(0), index(-1), value(0), isDefault(true), isDeferred(false)
+{
+}
+
+QDeclarativeParser::Property::Property(const QByteArray &n)
+: parent(0), type(0), index(-1), value(0), name(n), isDefault(false), 
+  isDeferred(false)
+{
+}
+
+QDeclarativeParser::Property::~Property() 
+{ 
+    foreach(Value *value, values)
+        value->release();
+    if (value) value->release(); 
+}
+
+Object *QDeclarativeParser::Property::getValue()
+{
+    if (!value) value = new Object;
+    return value;
+}
+
+void QDeclarativeParser::Property::addValue(Value *v)
+{
+    values << v;
+}
+
+bool QDeclarativeParser::Property::isEmpty() const
+{
+    return !value && values.isEmpty();
+}
+
+QDeclarativeParser::Value::Value()
+: type(Unknown), object(0)
+{
+}
+
+QDeclarativeParser::Value::~Value() 
+{ 
+    if (object) object->release();
+}
+
+QDeclarativeParser::Variant::Variant()
+: t(Invalid) {}
+
+QDeclarativeParser::Variant::Variant(const Variant &o)
+: t(o.t), d(o.d), s(o.s)
+{
+}
+
+QDeclarativeParser::Variant::Variant(bool v)
+: t(Boolean), b(v)
+{
+}
+
+QDeclarativeParser::Variant::Variant(double v, const QString &asWritten)
+: t(Number), d(v), s(asWritten)
+{
+}
+
+QDeclarativeParser::Variant::Variant(const QString &v)
+: t(String), s(v)
+{
+}
+
+QDeclarativeParser::Variant::Variant(const QString &v, QDeclarativeJS::AST::Node *n)
+: t(Script), n(n), s(v)
+{
+}
+
+QDeclarativeParser::Variant &QDeclarativeParser::Variant::operator=(const Variant &o)
+{
+    t = o.t;
+    d = o.d;
+    s = o.s;
+    return *this;
+}
+
+QDeclarativeParser::Variant::Type QDeclarativeParser::Variant::type() const
+{
+    return t;
+}
+
+bool QDeclarativeParser::Variant::asBoolean() const
+{
+    return b;
+}
+
+QString QDeclarativeParser::Variant::asString() const
+{
+    return s;
+}
+
+double QDeclarativeParser::Variant::asNumber() const
+{
+    return d;
+}
+
+QString QDeclarativeParser::Variant::asScript() const
+{
+    switch(type()) { 
+    default:
+    case Invalid:
+        return QString();
+    case Boolean:
+        return b?QLatin1String("true"):QLatin1String("false");
+    case Number:
+        if (s.isEmpty())
+            return QString::number(d);
+        else
+            return s;
+    case String:
+    case Script:
+        return s;
+    }
+}
+
+QDeclarativeJS::AST::Node *QDeclarativeParser::Variant::asAST() const
+{
+    if (type() == Script)
+        return n;
+    else
+        return 0;
+}
+
+bool QDeclarativeParser::Variant::isStringList() const
+{
+    if (isString())
+        return true;
+
+    if (type() != Script || !n)
+        return false;
+
+    AST::ArrayLiteral *array = AST::cast<AST::ArrayLiteral *>(n);
+    if (!array)
+        return false;
+
+    AST::ElementList *elements = array->elements;
+
+    while (elements) {
+
+        if (!AST::cast<AST::StringLiteral *>(elements->expression))
+            return false;
+
+        elements = elements->next;
+    }
+
+    return true;
+}
+
+QStringList QDeclarativeParser::Variant::asStringList() const
+{
+    QStringList rv;
+    if (isString()) {
+        rv << asString();
+        return rv;
+    }
+
+    AST::ArrayLiteral *array = AST::cast<AST::ArrayLiteral *>(n);
+    if (!array)
+        return rv;
+
+    AST::ElementList *elements = array->elements;
+    while (elements) {
+
+        AST::StringLiteral *string = AST::cast<AST::StringLiteral *>(elements->expression);
+        if (!string)
+            return QStringList();
+        rv.append(string->value->asString());
+
+        elements = elements->next;
+    }
+
+    return  rv;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h
new file mode 100644
index 0000000..cfd0b87
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeparser_p.h
@@ -0,0 +1,357 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPARSER_P_H
+#define QDECLARATIVEPARSER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarative.h"
+#include "qdeclarativerefcount_p.h"
+
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/qstring.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+namespace QDeclarativeJS { namespace AST { class Node; } }
+
+/*
+    XXX
+
+    These types are created (and owned) by the QDeclarativeXmlParser and consumed by the 
+    QDeclarativeCompiler.  During the compilation phase the compiler will update some of
+    the fields for both its own use and for the use of the upcoming QDeclarativeDom API.
+
+    The types are part of the generic sounding "QDeclarativeParser" namespace for legacy 
+    reasons (there used to be more in this namespace) and will be cleaned up and
+    migrated into a more appropriate location shortly.
+*/
+namespace QDeclarativeParser
+{
+    struct Location 
+    {
+        Location() : line(-1), column(-1) {}
+        int line;
+        int column;
+    };
+
+    struct LocationRange
+    {
+        LocationRange() : offset(0), length(0) {}
+        quint32 offset;
+        quint32 length;
+    };
+
+    struct LocationSpan
+    {
+        Location start;
+        Location end;
+        LocationRange range;
+    };
+
+    class Property;
+    class Object : public QDeclarativeRefCount
+    {
+    public:
+        Object();
+        virtual ~Object(); 
+
+        // Type of the object.  The integer is an index into the 
+        // QDeclarativeCompiledData::types array, or -1 if the object is a property
+        // group.
+        int type;
+        // The url of this object if it is an external type.  Used by the DOM
+        QUrl url;
+
+        // version information if type is defined in library or C++
+        int majorVersion;
+        int minorVersion;
+
+        // The fully-qualified name of this type
+        QByteArray typeName;
+        // The class name
+        QByteArray className;
+        // The id assigned to the object (if any).  Set by the QDeclarativeCompiler
+        QString id;
+        // The id index assigned to the object (if any).  Set by the QDeclarativeCompiler
+        int idIndex;
+        // Custom parsed data
+        QByteArray custom;
+        // Bit mask of the properties assigned bindings
+        QByteArray bindingBitmask; 
+        void setBindingBit(int);
+        // Returns the metaobject for this type, or 0 if not available.  
+        // Internally selectd between the metatype and extObject variables
+        const QMetaObject *metaObject() const;
+
+        // The compile time metaobject for this type
+        const QMetaObject *metatype;
+        // The synthesized metaobject, if QML added signals or properties to
+        // this type.  Otherwise null
+        QAbstractDynamicMetaObject extObject;
+        QByteArray metadata; // Generated by compiler
+        QByteArray synthdata; // Generated by compiler
+
+        Property *getDefaultProperty();
+        Property *getProperty(const QByteArray &name, bool create=true);
+
+        Property *defaultProperty;
+        QHash<QByteArray, Property *> properties;
+
+        QList<Object *> scriptBlockObjects;
+
+        // Output of the compilation phase (these properties continue to exist
+        // in either the defaultProperty or properties members too)
+        void addValueProperty(Property *);
+        void addSignalProperty(Property *);
+        void addAttachedProperty(Property *);
+        void addGroupedProperty(Property *);
+        void addValueTypeProperty(Property *);
+        void addScriptStringProperty(Property *, int = 0);
+        QList<Property *> valueProperties;
+        QList<Property *> signalProperties;
+        QList<Property *> attachedProperties;
+        QList<Property *> groupedProperties;
+        QList<Property *> valueTypeProperties;
+        QList<QPair<Property *, int> > scriptStringProperties;
+
+        // Script blocks that were nested under this object
+        struct ScriptBlock {
+            QStringList codes;
+            QStringList files;
+            QList<int> lineNumbers;
+        };
+        QList<ScriptBlock> scripts;
+
+        // The bytes to cast instances by to get to the QDeclarativeParserStatus 
+        // interface.  -1 indicates the type doesn't support this interface.
+        // Set by the QDeclarativeCompiler.
+        int parserStatusCast;
+
+        LocationSpan location;
+
+        struct DynamicProperty {
+            DynamicProperty();
+            DynamicProperty(const DynamicProperty &);
+
+            enum Type { Variant, Int, Bool, Real, String, Url, Color, Date, Alias, Custom, CustomList };
+
+            bool isDefaultProperty;
+            Type type;
+            QByteArray customType;
+            QByteArray name;
+            QDeclarativeParser::Property *defaultValue;
+            LocationSpan location;
+        };
+        struct DynamicSignal {
+            DynamicSignal();
+            DynamicSignal(const DynamicSignal &);
+
+            QByteArray name;
+            QList<QByteArray> parameterTypes;
+            QList<QByteArray> parameterNames;
+        };
+        struct DynamicSlot {
+            DynamicSlot();
+            DynamicSlot(const DynamicSlot &);
+
+            QByteArray name;
+            QString body;
+            QList<QByteArray> parameterNames;
+        };
+
+        // The list of dynamic properties
+        QList<DynamicProperty> dynamicProperties;
+        // The list of dynamic signals
+        QList<DynamicSignal> dynamicSignals;
+        // The list of dynamic slots
+        QList<DynamicSlot> dynamicSlots;
+    };
+
+    class Variant 
+    {
+    public:
+        enum Type {
+            Invalid,
+            Boolean,
+            Number,
+            String,
+            Script
+        };
+
+        Variant();
+        Variant(const Variant &);
+        Variant(bool);
+        Variant(double, const QString &asWritten=QString());
+        Variant(const QString &);
+        Variant(const QString &, QDeclarativeJS::AST::Node *);
+        Variant &operator=(const Variant &);
+
+        Type type() const;
+
+        bool isBoolean() const { return type() == Boolean; }
+        bool isNumber() const { return type() == Number; }
+        bool isString() const { return type() == String; }
+        bool isScript() const { return type() == Script; }
+        bool isStringList() const;
+
+        bool asBoolean() const;
+        QString asString() const;
+        double asNumber() const;
+        QString asScript() const;
+        QDeclarativeJS::AST::Node *asAST() const;
+        QStringList asStringList() const;
+
+    private:
+        Type t;
+        union {
+            bool b;
+            double d;
+            QDeclarativeJS::AST::Node *n;
+        };
+        QString s;
+    };
+
+    class Value : public QDeclarativeRefCount
+    {
+    public:
+        Value();
+        virtual ~Value();
+
+        enum Type {
+            // The type of this value assignment is not yet known
+            Unknown,
+            // This is used as a literal property assignment
+            Literal,
+            // This is used as a property binding assignment
+            PropertyBinding,
+            // This is used as a QDeclarativePropertyValueSource assignment
+            ValueSource,
+            // This is used as a QDeclarativePropertyValueInterceptor assignment
+            ValueInterceptor,
+            // This is used as a property QObject assignment
+            CreatedObject,
+            // This is used as a signal object assignment
+            SignalObject,
+            // This is used as a signal expression assignment
+            SignalExpression,
+            // This is used as an id assignment only
+            Id
+        };
+        Type type;
+
+        // ### Temporary
+        QString primitive() const { return value.asScript(); }
+
+        // Primitive value
+        Variant value;
+        // Object value
+        Object *object;
+
+        LocationSpan location;
+    };
+
+    class Property : public QDeclarativeRefCount
+    {
+    public:
+        Property();
+        Property(const QByteArray &n);
+        virtual ~Property();
+
+        // The Object to which this property is attached
+        Object *parent;
+
+        Object *getValue();
+        void addValue(Value *v);
+
+        // The QVariant::Type of the property, or 0 (QVariant::Invalid) if 
+        // unknown.
+        int type;
+        // The metaobject index of this property, or -1 if unknown.
+        int index;
+
+        // Returns true if this is an empty property - both value and values
+        // are unset.
+        bool isEmpty() const;
+        // The list of values assigned to this property.  Content in values
+        // and value are mutually exclusive
+        QList<Value *> values;
+        // The accessed property.  This is used to represent dot properties.
+        // Content in value and values are mutually exclusive.
+        Object *value;
+        // The property name
+        QByteArray name;
+        // True if this property was accessed as the default property.  
+        bool isDefault;
+        // True if the setting of this property will be deferred.  Set by the
+        // QDeclarativeCompiler
+        bool isDeferred;
+
+        LocationSpan location;
+        LocationRange listValueRange;
+        QList<int> listCommaPositions;
+    };
+}
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDeclarativeParser::Variant)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPARSER_P_H
diff --git a/src/declarative/qml/qdeclarativeparserstatus.cpp b/src/declarative/qml/qdeclarativeparserstatus.cpp
new file mode 100644
index 0000000..ec6260e
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeparserstatus.cpp
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeparserstatus.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativeParserStatus
+  \since 4.7
+    \brief The QDeclarativeParserStatus class provides updates on the parser state.
+*/
+
+/*! \internal */
+QDeclarativeParserStatus::QDeclarativeParserStatus()
+: d(0)
+{
+}
+
+/*! \internal */
+QDeclarativeParserStatus::~QDeclarativeParserStatus()
+{
+    if(d)
+        (*d) = 0;
+}
+
+/*!
+    Invoked after class creation, but before any properties have been set.
+*/
+void QDeclarativeParserStatus::classBegin()
+{
+}
+
+/*!
+    Invoked after the root component that caused this instantiation has 
+    completed construction.  At this point all static values and binding values
+    have been assigned to the class.
+*/
+void QDeclarativeParserStatus::componentComplete()
+{
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeparserstatus.h b/src/declarative/qml/qdeclarativeparserstatus.h
new file mode 100644
index 0000000..34528c1
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeparserstatus.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPARSERSTATUS_H
+#define QDECLARATIVEPARSERSTATUS_H
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_DECLARATIVE_EXPORT QDeclarativeParserStatus
+{
+public:
+    QDeclarativeParserStatus();
+    virtual ~QDeclarativeParserStatus();
+
+    virtual void classBegin();
+    virtual void componentComplete();
+
+private:
+    friend class QDeclarativeVME;
+    friend class QDeclarativeComponent;
+    friend class QDeclarativeComponentPrivate;
+    friend class QDeclarativeEnginePrivate;
+    QDeclarativeParserStatus **d;
+};
+Q_DECLARE_INTERFACE(QDeclarativeParserStatus, "com.trolltech.qml.QDeclarativeParserStatus")
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPARSERSTATUS_H
diff --git a/src/declarative/qml/qdeclarativeprivate.cpp b/src/declarative/qml/qdeclarativeprivate.cpp
new file mode 100644
index 0000000..444fe56
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeprivate.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeprivate.h"
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativePrivate::InstanceType::InstanceType(int) {}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
new file mode 100644
index 0000000..c8a8c74
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -0,0 +1,211 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPRIVATE_H
+#define QDECLARATIVEPRIVATE_H
+
+#include <QtCore/qglobal.h>
+
+#ifndef Q_OS_WIN
+#include <stdint.h>
+#endif
+#include <QtCore/qvariant.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+typedef QObject *(*QDeclarativeAttachedPropertiesFunc)(QObject *);
+
+//template<typename T>
+//struct qml_hasAttached { static bool const value = false; };
+
+template <typename TYPE>
+class QDeclarativeTypeInfo
+{
+public:
+    enum {
+        hasAttachedProperties = 0
+    };
+};
+
+
+namespace QDeclarativePrivate
+{
+    template<typename T>
+    QObject *create() { return new T; }
+
+    template<class From, class To, int N>
+    struct StaticCastSelectorClass
+    {
+        static inline int cast() { return -1; }
+    };
+
+    template<class From, class To>
+    struct StaticCastSelectorClass<From, To, sizeof(int)>
+    {
+        static inline int cast() { return (int)((intptr_t)static_cast<To *>((From *)0x10000000)) - 0x10000000; }
+    };
+
+    template<class From, class To>
+    struct StaticCastSelector
+    {
+        typedef int yes_type;
+        typedef char no_type;
+
+        static yes_type check(To *);
+        static no_type check(...);
+
+        static inline int cast()
+        {
+            return StaticCastSelectorClass<From, To, sizeof(check((From *)0))>::cast();
+        }
+    };
+
+    template <typename T>
+    struct has_attachedPropertiesMember
+    {
+        static bool const value = QDeclarativeTypeInfo<T>::hasAttachedProperties;
+    };
+
+    template <typename T, bool hasMember>
+    class has_attachedPropertiesMethod 
+    {
+        typedef int yes_type;
+        typedef char no_type;
+
+        template<typename ReturnType>
+        static yes_type check(ReturnType *(*)(QObject *));
+        static no_type check(...);
+
+    public:
+        static bool const value = sizeof(check(&T::qmlAttachedProperties)) == sizeof(yes_type);
+    }; 
+
+    template <typename T>
+    class has_attachedPropertiesMethod<T, false>
+    {
+    public:
+        static bool const value = false;
+    };
+
+    template<typename T, int N>
+    class AttachedPropertySelector
+    {
+    public:
+        static inline QDeclarativeAttachedPropertiesFunc func() { return 0; }
+        static inline const QMetaObject *metaObject() { return 0; }
+    };
+    template<typename T>
+    class AttachedPropertySelector<T, 1>
+    {
+        static inline QObject *attachedProperties(QObject *obj) {
+            return T::qmlAttachedProperties(obj);
+        }
+        template<typename ReturnType>
+        static inline const QMetaObject *attachedPropertiesMetaObject(ReturnType *(*)(QObject *)) {
+            return &ReturnType::staticMetaObject;
+        }
+    public:
+        static inline QDeclarativeAttachedPropertiesFunc func() {
+            return &attachedProperties;
+        }
+        static inline const QMetaObject *metaObject() {
+            return attachedPropertiesMetaObject(&T::qmlAttachedProperties);
+        }
+    };
+
+    template<typename T>
+    inline QDeclarativeAttachedPropertiesFunc attachedPropertiesFunc()
+    {
+        return AttachedPropertySelector<T, has_attachedPropertiesMethod<T, has_attachedPropertiesMember<T>::value>::value>::func();
+    }
+
+    template<typename T>
+    inline const QMetaObject *attachedPropertiesMetaObject()
+    {
+        return AttachedPropertySelector<T, has_attachedPropertiesMethod<T, has_attachedPropertiesMember<T>::value>::value>::metaObject();
+    }
+
+    struct MetaTypeIds {
+        int typeId;
+        int listId;
+    };
+    typedef QObject *(*CreateFunc)(QObject *);
+
+    template<typename T>
+    struct CreateParent {
+        static QObject *create(QObject *other) {
+            return new T(other);
+        }
+    };
+
+    template<typename T>
+    struct CreateNoParent {
+        static QObject *create() {
+            return new T;
+        }
+    };
+
+    struct Q_DECLARATIVE_EXPORT InstanceType {
+       InstanceType(int);
+    };
+
+    template<typename T, int VMAJ, int VMIN>
+    struct Define {
+        static InstanceType instance;
+    };
+  
+    template<typename T>
+    struct ExtCreate {
+        static QObject *create(QObject *other) {
+            return new T(other);
+        }
+    };
+}
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPRIVATE_H
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp
new file mode 100644
index 0000000..08b47b7
--- /dev/null
+++ b/src/declarative/qml/qdeclarativepropertycache.cpp
@@ -0,0 +1,423 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepropertycache_p.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativebinding_p.h"
+#include <QtCore/qdebug.h>
+
+Q_DECLARE_METATYPE(QScriptValue);
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativePropertyCache::Data::Flags QDeclarativePropertyCache::Data::flagsForProperty(const QMetaProperty &p, QDeclarativeEngine *engine) 
+{
+    int propType = p.userType();
+
+    Flags flags;
+
+    if (p.isConstant())
+        flags |= Data::IsConstant;
+    if (p.isWritable())
+        flags |= Data::IsWritable;
+    if (p.isResettable())
+        flags |= Data::IsResettable;
+
+    if (propType == qMetaTypeId<QDeclarativeBinding *>()) {
+        flags |= Data::IsQmlBinding;
+    } else if (propType == qMetaTypeId<QScriptValue>()) {
+        flags |= Data::IsQScriptValue;
+    } else if (p.isEnumType()) {
+        flags |= Data::IsEnumType;
+    } else {
+        QDeclarativeMetaType::TypeCategory cat = engine ? QDeclarativeEnginePrivate::get(engine)->typeCategory(propType)
+                                               : QDeclarativeMetaType::typeCategory(propType);
+        if (cat == QDeclarativeMetaType::Object)
+            flags |= Data::IsQObjectDerived;
+        else if (cat == QDeclarativeMetaType::List)
+            flags |= Data::IsQList;
+    }
+
+    return flags;
+}
+
+void QDeclarativePropertyCache::Data::load(const QMetaProperty &p, QDeclarativeEngine *engine)
+{
+    propType = p.userType();
+    if (QVariant::Type(propType) == QVariant::LastType)
+        propType = qMetaTypeId<QVariant>();
+    coreIndex = p.propertyIndex();
+    notifyIndex = p.notifySignalIndex();
+    flags = flagsForProperty(p, engine);
+}
+
+void QDeclarativePropertyCache::Data::load(const QMetaMethod &m)
+{
+    coreIndex = m.methodIndex();
+    flags |= Data::IsFunction;
+    propType = QVariant::Invalid;
+
+    const char *returnType = m.typeName();
+    if (returnType) 
+        propType = QMetaType::type(returnType);
+
+    QList<QByteArray> params = m.parameterTypes();
+    if (!params.isEmpty())
+        flags |= Data::HasArguments;
+}
+
+
+QDeclarativePropertyCache::QDeclarativePropertyCache(QDeclarativeEngine *e)
+: QDeclarativeCleanup(e), engine(e)
+{
+}
+
+QDeclarativePropertyCache::~QDeclarativePropertyCache()
+{
+    clear();
+}
+
+void QDeclarativePropertyCache::clear()
+{
+    for (int ii = 0; ii < indexCache.count(); ++ii) 
+        indexCache.at(ii)->release();
+
+    for (StringCache::ConstIterator iter = stringCache.begin(); 
+            iter != stringCache.end(); ++iter)
+        (*iter)->release();
+
+    for (IdentifierCache::ConstIterator iter = identifierCache.begin(); 
+            iter != identifierCache.end(); ++iter)
+        (*iter)->release();
+
+    indexCache.clear();
+    stringCache.clear();
+    identifierCache.clear();
+}
+
+QDeclarativePropertyCache::Data QDeclarativePropertyCache::create(const QMetaObject *metaObject, 
+                                                const QString &property)
+{
+    Q_ASSERT(metaObject);
+
+    QDeclarativePropertyCache::Data rv;
+    int idx = metaObject->indexOfProperty(property.toUtf8());
+    if (idx != -1) {
+        rv.load(metaObject->property(idx));
+        return rv;
+    }
+
+    int methodCount = metaObject->methodCount();
+    for (int ii = methodCount - 1; ii >= 0; --ii) {
+        QMetaMethod m = metaObject->method(ii);
+        if (m.access() == QMetaMethod::Private)
+            continue;
+        QString methodName = QString::fromUtf8(m.signature());
+
+        int parenIdx = methodName.indexOf(QLatin1Char('('));
+        Q_ASSERT(parenIdx != -1);
+        methodName = methodName.left(parenIdx);
+
+        if (methodName == property) {
+            rv.load(m);
+            return rv;
+        }
+    }
+
+    return rv;
+}
+
+QDeclarativePropertyCache *QDeclarativePropertyCache::copy() const
+{
+    QDeclarativePropertyCache *cache = new QDeclarativePropertyCache(engine);
+    cache->indexCache = indexCache;
+    cache->stringCache = stringCache;
+    cache->identifierCache = identifierCache;
+
+    for (int ii = 0; ii < indexCache.count(); ++ii)
+        indexCache.at(ii)->addref();
+    for (StringCache::ConstIterator iter = stringCache.begin(); iter != stringCache.end(); ++iter)
+        (*iter)->addref();
+    for (IdentifierCache::ConstIterator iter = identifierCache.begin(); iter != identifierCache.end(); ++iter)
+        (*iter)->addref();
+
+    return cache;
+}
+
+void QDeclarativePropertyCache::append(QDeclarativeEngine *engine, const QMetaObject *metaObject, 
+                              Data::Flag propertyFlags, Data::Flag methodFlags)
+{
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+
+    int propCount = metaObject->propertyCount();
+    int propOffset = metaObject->propertyOffset();
+
+    indexCache.resize(propCount);
+    for (int ii = propOffset; ii < propCount; ++ii) {
+        QMetaProperty p = metaObject->property(ii);
+        QString propName = QString::fromUtf8(p.name());
+
+        RData *data = new RData;
+        data->identifier = enginePriv->objectClass->createPersistentIdentifier(propName);
+
+        data->load(p, engine);
+        data->flags |= propertyFlags;
+
+        indexCache[ii] = data;
+
+        if (stringCache.contains(propName)) {
+            stringCache[propName]->release();
+            identifierCache[data->identifier.identifier]->release();
+        }
+
+        stringCache.insert(propName, data);
+        identifierCache.insert(data->identifier.identifier, data);
+        data->addref();
+        data->addref();
+    }
+
+    int methodCount = metaObject->methodCount();
+    int methodOffset = metaObject->methodOffset();
+    for (int ii = methodOffset; ii < methodCount; ++ii) {
+        QMetaMethod m = metaObject->method(ii);
+        if (m.access() == QMetaMethod::Private)
+            continue;
+        QString methodName = QString::fromUtf8(m.signature());
+
+        int parenIdx = methodName.indexOf(QLatin1Char('('));
+        Q_ASSERT(parenIdx != -1);
+        methodName = methodName.left(parenIdx);
+
+        RData *data = new RData;
+        data->identifier = enginePriv->objectClass->createPersistentIdentifier(methodName);
+
+        if (stringCache.contains(methodName)) {
+            stringCache[methodName]->release();
+            identifierCache[data->identifier.identifier]->release();
+        }
+
+        data->load(m);
+        if (m.methodType() == QMetaMethod::Slot || m.methodType() == QMetaMethod::Method) 
+            data->flags |= methodFlags;
+
+        stringCache.insert(methodName, data);
+        identifierCache.insert(data->identifier.identifier, data);
+        data->addref();
+    }
+}
+
+// ### Optimize - check engine for the parent meta object etc.
+QDeclarativePropertyCache *QDeclarativePropertyCache::create(QDeclarativeEngine *engine, const QMetaObject *metaObject)
+{
+    Q_ASSERT(engine);
+    Q_ASSERT(metaObject);
+
+    QDeclarativePropertyCache *cache = new QDeclarativePropertyCache(engine);
+    cache->update(engine, metaObject);
+    return cache;
+}
+
+void QDeclarativePropertyCache::update(QDeclarativeEngine *engine, const QMetaObject *metaObject)
+{
+    Q_ASSERT(engine);
+    Q_ASSERT(metaObject);
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+
+    clear();
+
+    // ### The properties/methods should probably be spliced on a per-metaobject basis
+    int propCount = metaObject->propertyCount();
+
+    indexCache.resize(propCount);
+    for (int ii = propCount - 1; ii >= 0; --ii) {
+        QMetaProperty p = metaObject->property(ii);
+        QString propName = QString::fromUtf8(p.name());
+
+        RData *data = new RData;
+        data->identifier = enginePriv->objectClass->createPersistentIdentifier(propName);
+
+        data->load(p, engine);
+
+        indexCache[ii] = data;
+
+        if (stringCache.contains(propName))
+            continue;
+
+        stringCache.insert(propName, data);
+        identifierCache.insert(data->identifier.identifier, data);
+        data->addref();
+        data->addref();
+    }
+
+    int methodCount = metaObject->methodCount();
+    for (int ii = methodCount - 1; ii >= 0; --ii) {
+        QMetaMethod m = metaObject->method(ii);
+        if (m.access() == QMetaMethod::Private)
+            continue;
+        QString methodName = QString::fromUtf8(m.signature());
+
+        int parenIdx = methodName.indexOf(QLatin1Char('('));
+        Q_ASSERT(parenIdx != -1);
+        methodName = methodName.left(parenIdx);
+
+        if (stringCache.contains(methodName))
+            continue;
+
+        RData *data = new RData;
+        data->identifier = enginePriv->objectClass->createPersistentIdentifier(methodName);
+
+        data->load(m);
+
+        stringCache.insert(methodName, data);
+        identifierCache.insert(data->identifier.identifier, data);
+        data->addref();
+    }
+}
+
+QDeclarativePropertyCache::Data *
+QDeclarativePropertyCache::property(int index) const
+{
+    if (index < 0 || index >= indexCache.count())
+        return 0;
+
+    return indexCache.at(index);
+}
+
+QDeclarativePropertyCache::Data *
+QDeclarativePropertyCache::property(const QString &str) const
+{
+    return stringCache.value(str);
+}
+
+QString QDeclarativePropertyCache::Data::name(QObject *object)
+{
+    if (!object)
+        return QString();
+
+    return name(object->metaObject());
+}
+
+QString QDeclarativePropertyCache::Data::name(const QMetaObject *metaObject)
+{
+    if (!metaObject || coreIndex == -1)
+        return QString();
+
+    if (flags & IsFunction) {
+        QMetaMethod m = metaObject->method(coreIndex);
+
+        QString name = QString::fromUtf8(m.signature());
+        int parenIdx = name.indexOf(QLatin1Char('('));
+        if (parenIdx != -1)
+            name = name.left(parenIdx);
+        return name;
+    } else {
+        QMetaProperty p = metaObject->property(coreIndex);
+        return QString::fromUtf8(p.name());
+    }
+}
+
+QStringList QDeclarativePropertyCache::propertyNames() const
+{
+    return stringCache.keys();
+}
+
+QDeclarativePropertyCache::Data *QDeclarativePropertyCache::property(QDeclarativeEngine *engine, QObject *obj, 
+                                                   const QScriptDeclarativeClass::Identifier &name, Data &local)
+{
+    QDeclarativePropertyCache::Data *rv = 0;
+
+    QDeclarativeEnginePrivate *enginePrivate = QDeclarativeEnginePrivate::get(engine);
+
+    QDeclarativePropertyCache *cache = 0;
+    QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(obj);
+    if (ddata && ddata->propertyCache && ddata->propertyCache->qmlEngine() == engine)
+        cache = ddata->propertyCache;
+    if (!cache) {
+        cache = enginePrivate->cache(obj);
+        if (cache && ddata && !ddata->propertyCache) { cache->addref(); ddata->propertyCache = cache; }
+    }
+
+    if (cache) {
+        rv = cache->property(name);
+    } else {
+        local = QDeclarativePropertyCache::create(obj->metaObject(), enginePrivate->objectClass->toString(name));
+        if (local.isValid())
+            rv = &local;
+    }
+
+    return rv;
+}
+
+QDeclarativePropertyCache::Data *QDeclarativePropertyCache::property(QDeclarativeEngine *engine, QObject *obj, 
+                                                   const QString &name, Data &local)
+{
+    QDeclarativePropertyCache::Data *rv = 0;
+
+    if (!engine) {
+        local = QDeclarativePropertyCache::create(obj->metaObject(), name);
+        if (local.isValid())
+            rv = &local;
+    } else {
+        QDeclarativeEnginePrivate *enginePrivate = QDeclarativeEnginePrivate::get(engine);
+
+        QDeclarativePropertyCache *cache = 0;
+        QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(obj);
+        if (ddata && ddata->propertyCache && ddata->propertyCache->qmlEngine() == engine)
+            cache = ddata->propertyCache;
+        if (!cache) {
+            cache = enginePrivate->cache(obj);
+            if (cache && ddata && !ddata->propertyCache) { cache->addref(); ddata->propertyCache = cache; }
+        }
+
+        if (cache) {
+            rv = cache->property(name);
+        } else {
+            local = QDeclarativePropertyCache::create(obj->metaObject(), name);
+            if (local.isValid())
+                rv = &local;
+        }
+    }
+
+    return rv;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h
new file mode 100644
index 0000000..7f4b174
--- /dev/null
+++ b/src/declarative/qml/qdeclarativepropertycache_p.h
@@ -0,0 +1,196 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPROPERTYCACHE_P_H
+#define QDECLARATIVEPROPERTYCACHE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativerefcount_p.h"
+#include "qdeclarativecleanup_p.h"
+
+#include <QtCore/qvector.h>
+
+#include <private/qscriptdeclarativeclass_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QMetaProperty;
+class QDeclarativePropertyCache : public QDeclarativeRefCount, public QDeclarativeCleanup
+{
+public:
+    QDeclarativePropertyCache(QDeclarativeEngine *);
+    virtual ~QDeclarativePropertyCache();
+
+    struct Data {
+        inline Data(); 
+        inline bool operator==(const Data &);
+
+        enum Flag { 
+                    NoFlags           = 0x00000000,
+
+                    // Can apply to all properties, except IsFunction
+                    IsConstant        = 0x00000001,
+                    IsWritable        = 0x00000002,
+                    IsResettable      = 0x00000004,
+
+                    // These are mutualy exclusive
+                    IsFunction        = 0x00000008,
+                    IsQObjectDerived  = 0x00000010,
+                    IsEnumType        = 0x00000020,
+                    IsQList           = 0x00000080,
+                    IsQmlBinding      = 0x00000100,
+                    IsQScriptValue    = 0x00000200,
+
+                    // Apply only to IsFunctions
+                    IsVMEFunction     = 0x00000400,
+                    HasArguments      = 0x00000800
+
+        };
+        Q_DECLARE_FLAGS(Flags, Flag)
+                        
+        bool isValid() const { return coreIndex != -1; } 
+
+        Flags flags;
+        int propType;
+        int coreIndex;
+        int notifyIndex;
+
+        static Flags flagsForProperty(const QMetaProperty &, QDeclarativeEngine *engine = 0);
+        void load(const QMetaProperty &, QDeclarativeEngine *engine = 0);
+        void load(const QMetaMethod &);
+        QString name(QObject *);
+        QString name(const QMetaObject *);
+    };
+
+    struct ValueTypeData {
+        inline ValueTypeData();
+        inline bool operator==(const ValueTypeData &);
+        Data::Flags flags;     // flags on the value type wrapper
+        int valueTypeCoreIdx;  // The prop index of the access property on the value type wrapper
+        int valueTypePropType; // The QVariant::Type of access property on the value type wrapper
+    };
+
+    void update(QDeclarativeEngine *, const QMetaObject *);
+
+    QDeclarativePropertyCache *copy() const;
+    void append(QDeclarativeEngine *, const QMetaObject *, Data::Flag propertyFlags = Data::NoFlags,
+                Data::Flag methodFlags = Data::NoFlags);
+
+    static QDeclarativePropertyCache *create(QDeclarativeEngine *, const QMetaObject *);
+    static Data create(const QMetaObject *, const QString &);
+
+    inline Data *property(const QScriptDeclarativeClass::Identifier &id) const;
+    Data *property(const QString &) const;
+    Data *property(int) const;
+    QStringList propertyNames() const;
+
+    inline QDeclarativeEngine *qmlEngine() const;
+    static Data *property(QDeclarativeEngine *, QObject *, const QScriptDeclarativeClass::Identifier &, Data &);
+    static Data *property(QDeclarativeEngine *, QObject *, const QString &, Data &);
+protected:
+    virtual void clear();
+
+private:
+    struct RData : public Data, public QDeclarativeRefCount { 
+        QScriptDeclarativeClass::PersistentIdentifier identifier;
+    };
+
+    typedef QVector<RData *> IndexCache;
+    typedef QHash<QString, RData *> StringCache;
+    typedef QHash<QScriptDeclarativeClass::Identifier, RData *> IdentifierCache;
+
+    QDeclarativeEngine *engine;
+    IndexCache indexCache;
+    StringCache stringCache;
+    IdentifierCache identifierCache;
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativePropertyCache::Data::Flags);
+  
+QDeclarativePropertyCache::Data::Data()
+: flags(0), propType(0), coreIndex(-1), notifyIndex(-1) 
+{
+}
+
+bool QDeclarativePropertyCache::Data::operator==(const QDeclarativePropertyCache::Data &other)
+{
+    return flags == other.flags &&
+           propType == other.propType &&
+           coreIndex == other.coreIndex &&
+           notifyIndex == other.notifyIndex;
+}
+
+QDeclarativePropertyCache::Data *
+QDeclarativePropertyCache::property(const QScriptDeclarativeClass::Identifier &id) const 
+{
+    return identifierCache.value(id);
+}
+
+QDeclarativePropertyCache::ValueTypeData::ValueTypeData()
+: flags(QDeclarativePropertyCache::Data::NoFlags), valueTypeCoreIdx(-1), valueTypePropType(0) 
+{
+}
+
+bool QDeclarativePropertyCache::ValueTypeData::operator==(const ValueTypeData &o) 
+{ 
+    return flags == o.flags &&
+           valueTypeCoreIdx == o.valueTypeCoreIdx &&
+           valueTypePropType == o.valueTypePropType; 
+}
+
+QDeclarativeEngine *QDeclarativePropertyCache::qmlEngine() const
+{
+    return engine;
+}
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEPROPERTYCACHE_P_H
diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
new file mode 100644
index 0000000..7626d56
--- /dev/null
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepropertyvalueinterceptor.h"
+
+#include "qdeclarative.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativePropertyValueInterceptor
+    \brief The QDeclarativePropertyValueInterceptor class is inherited by property interceptors such as Behavior.
+    \internal
+
+    This class intercepts property writes, allowing for custom handling. For example, Behavior uses this
+    interception to provide a default animation for all changes to a property's value.
+ */
+
+/*!
+    Constructs a QDeclarativePropertyValueInterceptor.
+*/
+QDeclarativePropertyValueInterceptor::QDeclarativePropertyValueInterceptor()
+{
+}
+
+QDeclarativePropertyValueInterceptor::~QDeclarativePropertyValueInterceptor()
+{
+}
+
+/*!
+    \fn void QDeclarativePropertyValueInterceptor::setTarget(const QDeclarativeMetaProperty &property)
+    Set the target \a property for the value interceptor.  This method will
+    be called by the QML engine when assigning a value interceptor.
+*/
+
+/*!
+    \fn void QDeclarativePropertyValueInterceptor::write(const QVariant &value)
+    This method will be called when a new \a value is assigned to the property being intercepted.
+*/
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
new file mode 100644
index 0000000..2a29d5b
--- /dev/null
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H
+#define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeMetaProperty;
+class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor
+{
+public:
+    QDeclarativePropertyValueInterceptor();
+    virtual ~QDeclarativePropertyValueInterceptor();
+    virtual void setTarget(const QDeclarativeMetaProperty &property) = 0;
+    virtual void write(const QVariant &value) = 0;
+};
+Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDeclarativePropertyValueInterceptor")
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
new file mode 100644
index 0000000..626e391
--- /dev/null
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepropertyvaluesource.h"
+
+#include "qdeclarative.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativePropertyValueSource
+    \brief The QDeclarativePropertyValueSource class is inherited by property value sources such as animations and bindings.
+    \internal
+ */
+
+/*!
+    Constructs a QDeclarativePropertyValueSource.
+*/
+QDeclarativePropertyValueSource::QDeclarativePropertyValueSource()
+{
+}
+
+QDeclarativePropertyValueSource::~QDeclarativePropertyValueSource()
+{
+}
+
+/*!
+    \fn void QDeclarativePropertyValueSource::setTarget(const QDeclarativeMetaProperty &property)
+    Set the target \a property for the value source.  This method will
+    be called by the QML engine when assigning a value source.
+*/
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h
new file mode 100644
index 0000000..99c80af
--- /dev/null
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPROPERTYVALUESOURCE_H
+#define QDECLARATIVEPROPERTYVALUESOURCE_H
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeMetaProperty;
+class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueSource
+{
+public:
+    QDeclarativePropertyValueSource();
+    virtual ~QDeclarativePropertyValueSource();
+    virtual void setTarget(const QDeclarativeMetaProperty &) = 0;
+};
+Q_DECLARE_INTERFACE(QDeclarativePropertyValueSource, "com.trolltech.qml.QDeclarativePropertyValueSource")
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPROPERTYVALUESOURCE_H
diff --git a/src/declarative/qml/qdeclarativeproxymetaobject.cpp b/src/declarative/qml/qdeclarativeproxymetaobject.cpp
new file mode 100644
index 0000000..1decea1
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeproxymetaobject.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeproxymetaobject_p.h"
+
+#include <QDebug>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeProxyMetaObject::QDeclarativeProxyMetaObject(QObject *obj, QList<ProxyData> *mList)
+: metaObjects(mList), proxies(0), parent(0), object(obj)
+{
+#ifdef QDECLARATIVEPROXYMETAOBJECT_DEBUG
+    qWarning() << "QDeclarativeProxyMetaObject" << obj->metaObject()->className();
+#endif
+
+    *static_cast<QMetaObject *>(this) = *metaObjects->first().metaObject;
+
+    QObjectPrivate *op = QObjectPrivate::get(obj);
+    if (op->metaObject)
+        parent = static_cast<QAbstractDynamicMetaObject*>(op->metaObject);
+
+    op->metaObject = this;
+
+#ifdef QDECLARATIVEPROXYMETAOBJECT_DEBUG
+    const QMetaObject *mo = obj->metaObject();
+    while(mo) {
+        qWarning() << "    " << mo->className();
+        mo = mo->superClass();
+    }
+#endif
+}
+
+QDeclarativeProxyMetaObject::~QDeclarativeProxyMetaObject()
+{
+    if (parent)
+        delete parent;
+    parent = 0;
+
+    if (proxies)
+        delete [] proxies;
+    proxies = 0;
+}
+
+int QDeclarativeProxyMetaObject::metaCall(QMetaObject::Call c, int id, void **a)
+{
+    if ((c == QMetaObject::ReadProperty ||
+        c == QMetaObject::WriteProperty) &&
+            id >= metaObjects->last().propertyOffset) {
+
+        for (int ii = 0; ii < metaObjects->count(); ++ii) {
+            const ProxyData &data = metaObjects->at(ii);
+            if (id >= data.propertyOffset) {
+                if (!proxies) {
+                    proxies = new QObject*[metaObjects->count()];
+                    ::memset(proxies, 0, 
+                             sizeof(QObject *) * metaObjects->count());
+                }
+
+                if (!proxies[ii]) {
+                    QObject *proxy = data.createFunc(object);
+                    const QMetaObject *metaObject = proxy->metaObject();
+                    proxies[ii] = proxy;
+
+                    int localOffset = data.metaObject->methodOffset();
+                    int methodOffset = metaObject->methodOffset();
+                    int methods = metaObject->methodCount() - methodOffset;
+
+                    // ### - Can this be done more optimally?
+                    for (int jj = 0; jj < methods; ++jj) {
+                        QMetaMethod method = 
+                            metaObject->method(jj + methodOffset);
+                        if (method.methodType() == QMetaMethod::Signal)
+                            QMetaObject::connect(proxy, methodOffset + jj,
+                                                 object, localOffset + jj);
+                    }
+                }
+
+                int proxyOffset = proxies[ii]->metaObject()->propertyOffset();
+                int proxyId = id - data.propertyOffset + proxyOffset;
+
+                return proxies[ii]->qt_metacall(c, proxyId, a);
+            }
+        }
+    } else if (c == QMetaObject::InvokeMetaMethod &&
+               id >= metaObjects->last().methodOffset) {
+        QMetaMethod m = object->metaObject()->method(id);
+        if (m.methodType() == QMetaMethod::Signal) {
+            QMetaObject::activate(object, id, a);
+            return -1;
+        }
+    }
+
+    if (parent)
+        return parent->metaCall(c, id, a);
+    else
+        return object->qt_metacall(c, id, a);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeproxymetaobject_p.h b/src/declarative/qml/qdeclarativeproxymetaobject_p.h
new file mode 100644
index 0000000..3f103b6
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeproxymetaobject_p.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPROXYMETAOBJECT_P_H
+#define QDECLARATIVEPROXYMETAOBJECT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qmetaobjectbuilder_p.h"
+#include "qdeclarative.h"
+
+#include <QtCore/QMetaObject>
+#include <QtCore/QObject>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeProxyMetaObject : public QAbstractDynamicMetaObject
+{
+public:
+    struct ProxyData {
+        typedef QObject *(*CreateFunc)(QObject *);
+        QMetaObject *metaObject;
+        CreateFunc createFunc;
+        int propertyOffset;
+        int methodOffset;
+    };
+
+    QDeclarativeProxyMetaObject(QObject *, QList<ProxyData> *);
+    virtual ~QDeclarativeProxyMetaObject();
+
+protected:
+    virtual int metaCall(QMetaObject::Call _c, int _id, void **_a);
+
+private:
+    QList<ProxyData> *metaObjects;
+    QObject **proxies;
+
+    QAbstractDynamicMetaObject *parent;
+    QObject *object;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPROXYMETAOBJECT_P_H
+
diff --git a/src/declarative/qml/qdeclarativerefcount.cpp b/src/declarative/qml/qdeclarativerefcount.cpp
new file mode 100644
index 0000000..943e35c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativerefcount.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativerefcount_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeRefCount::QDeclarativeRefCount()
+: refCount(1)
+{
+}
+
+QDeclarativeRefCount::~QDeclarativeRefCount()
+{
+}
+
+void QDeclarativeRefCount::addref()
+{
+    Q_ASSERT(refCount > 0);
+    ++refCount;
+}
+
+void QDeclarativeRefCount::release()
+{
+    Q_ASSERT(refCount > 0);
+    --refCount;
+    if (refCount == 0)
+        delete this;
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativerefcount_p.h b/src/declarative/qml/qdeclarativerefcount_p.h
new file mode 100644
index 0000000..1170b86
--- /dev/null
+++ b/src/declarative/qml/qdeclarativerefcount_p.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEREFCOUNT_P_H
+#define QDECLARATIVEREFCOUNT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_AUTOTEST_EXPORT QDeclarativeRefCount
+{
+public:
+    QDeclarativeRefCount();
+    virtual ~QDeclarativeRefCount();
+    void addref();
+    void release();
+
+private:
+    int refCount;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEREFCOUNT_P_H
diff --git a/src/declarative/qml/qdeclarativerewrite.cpp b/src/declarative/qml/qdeclarativerewrite.cpp
new file mode 100644
index 0000000..afc6e63
--- /dev/null
+++ b/src/declarative/qml/qdeclarativerewrite.cpp
@@ -0,0 +1,215 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativerewrite_p.h"
+
+#include "qdeclarativeglobal_p.h"
+
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+DEFINE_BOOL_CONFIG_OPTION(rewriteDump, QML_REWRITE_DUMP);
+
+namespace QDeclarativeRewrite {
+
+bool SharedBindingTester::isSharable(const QString &code)
+{
+    Engine engine;
+    NodePool pool(QString(), &engine);
+    Lexer lexer(&engine);
+    Parser parser(&engine);
+    lexer.setCode(code, 0);
+    parser.parseStatement();
+    if (!parser.statement()) 
+        return false;
+
+    _sharable = true;
+    AST::Node::acceptChild(parser.statement(), this);
+    return _sharable;
+}
+
+QString RewriteBinding::operator()(const QString &code, bool *ok)
+{
+    Engine engine;
+    NodePool pool(QString(), &engine);
+    Lexer lexer(&engine);
+    Parser parser(&engine);
+    lexer.setCode(code, 0);
+    parser.parseStatement();
+    if (!parser.statement()) {
+        if (ok) *ok = false;
+        return QString();
+    } else {
+        if (ok) *ok = true;
+    }
+    return rewrite(code, 0, parser.statement());
+}
+
+void RewriteBinding::accept(AST::Node *node)
+{
+    AST::Node::acceptChild(node, this);
+}
+
+QString RewriteBinding::rewrite(QString code, unsigned position,
+                                AST::Statement *node)
+{
+    TextWriter w;
+    _writer = &w;
+    _position = position;
+    _inLoop = 0;
+
+    accept(node);
+
+    unsigned startOfStatement = node->firstSourceLocation().begin() - _position;
+    unsigned endOfStatement = node->lastSourceLocation().end() - _position;
+
+    _writer->replace(startOfStatement, 0, QLatin1String("(function() { "));
+    _writer->replace(endOfStatement, 0, QLatin1String(" })"));
+
+    if (rewriteDump()) {
+        qWarning() << "=============================================================";
+        qWarning() << "Rewrote:";
+        qWarning() << qPrintable(code);
+    }
+
+    w.write(&code);
+
+    if (rewriteDump()) {
+        qWarning() << "To:";
+        qWarning() << qPrintable(code);
+        qWarning() << "=============================================================";
+    }
+
+    return code;
+}
+
+bool RewriteBinding::visit(AST::Block *ast)
+{
+    for (AST::StatementList *it = ast->statements; it; it = it->next) {
+        if (! it->next) {
+            // we need to rewrite only the last statement of a block.
+            accept(it->statement);
+        }
+    }
+
+    return false;
+}
+
+bool RewriteBinding::visit(AST::ExpressionStatement *ast)
+{
+    if (! _inLoop) {
+        unsigned startOfExpressionStatement = ast->firstSourceLocation().begin() - _position;
+        _writer->replace(startOfExpressionStatement, 0, QLatin1String("return "));
+    }
+
+    return false;
+}
+
+bool RewriteBinding::visit(AST::DoWhileStatement *)
+{
+    ++_inLoop;
+    return true;
+}
+
+void RewriteBinding::endVisit(AST::DoWhileStatement *)
+{
+    --_inLoop;
+}
+
+bool RewriteBinding::visit(AST::WhileStatement *)
+{
+    ++_inLoop;
+    return true;
+}
+
+void RewriteBinding::endVisit(AST::WhileStatement *)
+{
+    --_inLoop;
+}
+
+bool RewriteBinding::visit(AST::ForStatement *)
+{
+    ++_inLoop;
+    return true;
+}
+
+void RewriteBinding::endVisit(AST::ForStatement *)
+{
+    --_inLoop;
+}
+
+bool RewriteBinding::visit(AST::LocalForStatement *)
+{
+    ++_inLoop;
+    return true;
+}
+
+void RewriteBinding::endVisit(AST::LocalForStatement *)
+{
+    --_inLoop;
+}
+
+bool RewriteBinding::visit(AST::ForEachStatement *)
+{
+    ++_inLoop;
+    return true;
+}
+
+void RewriteBinding::endVisit(AST::ForEachStatement *)
+{
+    --_inLoop;
+}
+
+bool RewriteBinding::visit(AST::LocalForEachStatement *)
+{
+    ++_inLoop;
+    return true;
+}
+
+void RewriteBinding::endVisit(AST::LocalForEachStatement *)
+{
+    --_inLoop;
+}
+
+} // namespace QDeclarativeRewrite
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativerewrite_p.h b/src/declarative/qml/qdeclarativerewrite_p.h
new file mode 100644
index 0000000..33b168c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativerewrite_p.h
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEREWRITE_P_H
+#define QDECLARATIVEREWRITE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "rewriter/textwriter_p.h"
+#include "parser/qdeclarativejslexer_p.h"
+#include "parser/qdeclarativejsparser_p.h"
+#include "parser/qdeclarativejsnodepool_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace QDeclarativeRewrite {
+using namespace QDeclarativeJS;
+
+class SharedBindingTester : protected AST::Visitor
+{
+    bool _sharable;
+public:
+    bool isSharable(const QString &code);
+    
+    virtual bool visit(AST::FunctionDeclaration *) { _sharable = false; return false; }
+    virtual bool visit(AST::FunctionExpression *) { _sharable = false; return false; }
+    virtual bool visit(AST::CallExpression *) { _sharable = false; return false; }
+};
+
+class RewriteBinding: protected AST::Visitor
+{
+    unsigned _position;
+    TextWriter *_writer;
+
+public:
+    QString operator()(const QString &code, bool *ok = 0);
+
+protected:
+    using AST::Visitor::visit;
+
+    void accept(AST::Node *node);
+    QString rewrite(QString code, unsigned position, AST::Statement *node);
+
+    virtual bool visit(AST::Block *ast);
+    virtual bool visit(AST::ExpressionStatement *ast);
+
+    virtual bool visit(AST::DoWhileStatement *ast);
+    virtual void endVisit(AST::DoWhileStatement *ast);
+
+    virtual bool visit(AST::WhileStatement *ast);
+    virtual void endVisit(AST::WhileStatement *ast);
+
+    virtual bool visit(AST::ForStatement *ast);
+    virtual void endVisit(AST::ForStatement *ast);
+
+    virtual bool visit(AST::LocalForStatement *ast);
+    virtual void endVisit(AST::LocalForStatement *ast);
+
+    virtual bool visit(AST::ForEachStatement *ast);
+    virtual void endVisit(AST::ForEachStatement *ast);
+
+    virtual bool visit(AST::LocalForEachStatement *ast);
+    virtual void endVisit(AST::LocalForEachStatement *ast);
+
+private:
+    int _inLoop;
+};
+
+} // namespace QDeclarativeRewrite
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEREWRITE_P_H
+
diff --git a/src/declarative/qml/qdeclarativescript.cpp b/src/declarative/qml/qdeclarativescript.cpp
new file mode 100644
index 0000000..acfb9e1
--- /dev/null
+++ b/src/declarative/qml/qdeclarativescript.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// This is just a dummy file to include the documentation
+
+/*!
+    \qmlclass Script QDeclarativeScript
+    \brief The Script element provides a way to add JavaScript code snippets in QML.
+    \ingroup group_utility
+
+    The Script element is used to add convenient JavaScript "glue" methods to
+    your Qt Declarative application or component. 
+
+    An example: 
+
+    \qml
+    Script {
+        function debugMyComponent() {
+            console.log(text.text);
+            console.log(otherinterestingitem.property);
+        }
+    }
+    MouseArea { onClicked: debugMyComponent() }
+    \endqml
+
+    \note While it is possible to use any JavaScript code within a Script element,
+    it is recommended that the code be limited to defining functions. The Script
+    element executes JavaScript as soon as it is specified, so
+    when defining a component, this may be done before the execution context is
+    fully specified.  As a result, some properties or items may not be
+    accessible. You can avoid this problem by limiting your JavaScript to
+    defining functions that are only executed later once the context is fully
+    defined.
+
+    \sa {JavaScript Blocks}
+*/
+
+/*!
+    \qmlproperty string Script::script
+    \default
+    The JavaScript code to be executed.
+*/
+
+/*!
+    \qmlproperty url Script::source
+
+    Specifies a source file containing JavaScript code. This can be used instead
+    of providing inline JavaScript code in the Script element.
+*/
diff --git a/src/declarative/qml/qdeclarativescriptclass_p.h b/src/declarative/qml/qdeclarativescriptclass_p.h
new file mode 100644
index 0000000..d8733db
--- /dev/null
+++ b/src/declarative/qml/qdeclarativescriptclass_p.h
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESCRIPTCLASS_P_H
+#define QDECLARATIVESCRIPTCLASS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtScript/qscriptclass.h>
+#include <private/qscriptdeclarativeclass_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QDeclarativeScriptClass : public QScriptDeclarativeClass
+{
+public:
+    QDeclarativeScriptClass(QScriptEngine *);
+
+    static QVariant toVariant(QDeclarativeEngine *, const QScriptValue &);
+
+#if (QT_VERSION <= QT_VERSION_CHECK(4, 6, 2)) && !defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
+    struct Value : public QScriptValue { 
+        Value() : QScriptValue() {}
+        Value(QScriptEngine *engine, int v) : QScriptValue(engine, v) {}
+        Value(QScriptEngine *engine, uint v) : QScriptValue(engine, v) {}
+        Value(QScriptEngine *engine, bool v) : QScriptValue(engine, v) {}
+        Value(QScriptEngine *engine, double v) : QScriptValue(engine, v) {}
+        Value(QScriptEngine *engine, float v) : QScriptValue(engine, v) {}
+        Value(QScriptEngine *engine, const QString &v) : QScriptValue(engine, v) {}
+        Value(QScriptEngine *, const QScriptValue &v) : QScriptValue(v) {}
+    };
+
+    typedef QScriptValue ScriptValue;
+#else
+    typedef Value ScriptValue;
+#endif
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVESCRIPTCLASS_P_H
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
new file mode 100644
index 0000000..9636350
--- /dev/null
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -0,0 +1,952 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativescriptparser_p.h"
+
+#include "qdeclarativeparser_p.h"
+#include "parser/qdeclarativejsengine_p.h"
+#include "parser/qdeclarativejsparser_p.h"
+#include "parser/qdeclarativejslexer_p.h"
+#include "parser/qdeclarativejsnodepool_p.h"
+#include "parser/qdeclarativejsastvisitor_p.h"
+#include "parser/qdeclarativejsast_p.h"
+#include "qdeclarativerewrite_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QStack>
+#include <QCoreApplication>
+#include <QtDebug>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QDeclarativeJS;
+using namespace QDeclarativeParser;
+
+namespace {
+
+class ProcessAST: protected AST::Visitor
+{
+    struct State {
+        State() : object(0), property(0) {}
+        State(Object *o) : object(o), property(0) {}
+        State(Object *o, Property *p) : object(o), property(p) {}
+
+        Object *object;
+        Property *property;
+    };
+
+    struct StateStack : public QStack<State>
+    {
+        void pushObject(Object *obj)
+        {
+            push(State(obj));
+        }
+
+        void pushProperty(const QString &name, const LocationSpan &location)
+        {
+            const State &state = top();
+            if (state.property) {
+                State s(state.property->getValue(),
+                        state.property->getValue()->getProperty(name.toUtf8()));
+                s.property->location = location;
+                push(s);
+            } else {
+                State s(state.object,
+                        state.object->getProperty(name.toUtf8()));
+
+                s.property->location = location;
+                push(s);
+            }
+        }
+    };
+
+public:
+    ProcessAST(QDeclarativeScriptParser *parser);
+    virtual ~ProcessAST();
+
+    void operator()(const QString &code, AST::Node *node);
+
+protected:
+    Object *defineObjectBinding(AST::UiQualifiedId *propertyName,
+                                AST::UiQualifiedId *objectTypeName,
+                                LocationSpan location,
+                                AST::UiObjectInitializer *initializer = 0);
+
+    Object *defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
+                                       const QString &objectType,
+                                       AST::SourceLocation typeLocation,
+                                       LocationSpan location,
+                                       AST::UiObjectInitializer *initializer = 0);
+
+    QDeclarativeParser::Variant getVariant(AST::ExpressionNode *expr);
+
+    LocationSpan location(AST::SourceLocation start, AST::SourceLocation end);
+    LocationSpan location(AST::UiQualifiedId *);
+
+    using AST::Visitor::visit;
+    using AST::Visitor::endVisit;
+
+    virtual bool visit(AST::UiProgram *node);
+    virtual bool visit(AST::UiImport *node);
+    virtual bool visit(AST::UiObjectDefinition *node);
+    virtual bool visit(AST::UiPublicMember *node);
+    virtual bool visit(AST::UiObjectBinding *node);
+
+    virtual bool visit(AST::UiScriptBinding *node);
+    virtual bool visit(AST::UiArrayBinding *node);
+    virtual bool visit(AST::UiSourceElement *node);
+
+    void accept(AST::Node *node);
+
+    QString asString(AST::UiQualifiedId *node) const;
+
+    const State state() const;
+    Object *currentObject() const;
+    Property *currentProperty() const;
+
+    QString qualifiedNameId() const;
+
+    QString textAt(const AST::SourceLocation &loc) const
+    { return _contents.mid(loc.offset, loc.length); }
+
+
+    QString textAt(const AST::SourceLocation &first,
+                   const AST::SourceLocation &last) const
+    { return _contents.mid(first.offset, last.offset + last.length - first.offset); }
+
+    QString asString(AST::ExpressionNode *expr)
+    {
+        if (! expr)
+            return QString();
+
+        return textAt(expr->firstSourceLocation(), expr->lastSourceLocation());
+    }
+
+    QString asString(AST::Statement *stmt)
+    {
+        if (! stmt)
+            return QString();
+
+        QString s = textAt(stmt->firstSourceLocation(), stmt->lastSourceLocation());
+        s += QLatin1Char('\n');
+        return s;
+    }
+
+private:
+    QDeclarativeScriptParser *_parser;
+    StateStack _stateStack;
+    QStringList _scope;
+    QString _contents;
+
+    inline bool isSignalProperty(const QByteArray &propertyName) const {
+        return (propertyName.length() >= 3 && propertyName.startsWith("on") &&
+                ('A' <= propertyName.at(2) && 'Z' >= propertyName.at(2)));
+    }
+
+};
+
+ProcessAST::ProcessAST(QDeclarativeScriptParser *parser)
+    : _parser(parser)
+{
+}
+
+ProcessAST::~ProcessAST()
+{
+}
+
+void ProcessAST::operator()(const QString &code, AST::Node *node)
+{
+    _contents = code;
+    accept(node);
+}
+
+void ProcessAST::accept(AST::Node *node)
+{
+    AST::Node::acceptChild(node, this);
+}
+
+const ProcessAST::State ProcessAST::state() const
+{
+    if (_stateStack.isEmpty())
+        return State();
+
+    return _stateStack.back();
+}
+
+Object *ProcessAST::currentObject() const
+{
+    return state().object;
+}
+
+Property *ProcessAST::currentProperty() const
+{
+    return state().property;
+}
+
+QString ProcessAST::qualifiedNameId() const
+{
+    return _scope.join(QLatin1String("/"));
+}
+
+QString ProcessAST::asString(AST::UiQualifiedId *node) const
+{
+    QString s;
+
+    for (AST::UiQualifiedId *it = node; it; it = it->next) {
+        s.append(it->name->asString());
+
+        if (it->next)
+            s.append(QLatin1Char('.'));
+    }
+
+    return s;
+}
+
+Object *
+ProcessAST::defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
+                                       const QString &objectType,
+                                       AST::SourceLocation typeLocation,
+                                       LocationSpan location,
+                                       AST::UiObjectInitializer *initializer)
+{
+    int lastTypeDot = objectType.lastIndexOf(QLatin1Char('.'));
+    bool isType = !objectType.isEmpty() &&
+                    (objectType.at(0).isUpper() ||
+                        (lastTypeDot >= 0 && objectType.at(lastTypeDot+1).isUpper()));
+
+    int propertyCount = 0;
+    for (; propertyName; propertyName = propertyName->next){
+        ++propertyCount;
+        _stateStack.pushProperty(propertyName->name->asString(),
+                                 this->location(propertyName));
+    }
+
+    if (!isType) {
+
+        if(propertyCount || !currentObject()) {
+            QDeclarativeError error;
+            error.setDescription(QCoreApplication::translate("QDeclarativeParser","Expected type name"));
+            error.setLine(typeLocation.startLine);
+            error.setColumn(typeLocation.startColumn);
+            _parser->_errors << error;
+            return 0;
+        }
+
+        LocationSpan loc = ProcessAST::location(typeLocation, typeLocation);
+        if (propertyName)
+            loc = ProcessAST::location(propertyName);
+
+        _stateStack.pushProperty(objectType, loc);
+       accept(initializer);
+        _stateStack.pop();
+
+        return 0;
+
+    } else {
+        // Class
+
+        QString resolvableObjectType = objectType;
+        if (lastTypeDot >= 0)
+            resolvableObjectType.replace(QLatin1Char('.'),QLatin1Char('/'));
+
+        bool isScript = resolvableObjectType == QLatin1String("Script");
+
+        if (isScript) {
+            if (_stateStack.isEmpty() || _stateStack.top().property) {
+                QDeclarativeError error;
+                error.setDescription(QCoreApplication::translate("QDeclarativeParser","Invalid use of Script block"));
+                error.setLine(typeLocation.startLine);
+                error.setColumn(typeLocation.startColumn);
+                _parser->_errors << error;
+                return 0;
+            }
+        }
+
+        Object *obj = new Object;
+
+        if (!isScript) {
+            QDeclarativeScriptParser::TypeReference *typeRef = _parser->findOrCreateType(resolvableObjectType);
+            obj->type = typeRef->id;
+
+            typeRef->refObjects.append(obj);
+        }
+
+        // XXX this doesn't do anything (_scope never builds up)
+        _scope.append(resolvableObjectType);
+        obj->typeName = qualifiedNameId().toUtf8();
+        _scope.removeLast();
+
+        obj->location = location;
+
+        if (isScript) {
+
+            _stateStack.top().object->scriptBlockObjects.append(obj);
+
+        } else if (propertyCount) {
+
+            Property *prop = currentProperty();
+            Value *v = new Value;
+            v->object = obj;
+            v->location = obj->location;
+            prop->addValue(v);
+
+            while (propertyCount--)
+                _stateStack.pop();
+
+        } else {
+
+            if (! _parser->tree()) {
+                _parser->setTree(obj);
+            } else {
+                const State state = _stateStack.top();
+                Value *v = new Value;
+                v->object = obj;
+                v->location = obj->location;
+                if (state.property) {
+                    state.property->addValue(v);
+                } else {
+                    Property *defaultProp = state.object->getDefaultProperty();
+                    if (defaultProp->location.start.line == -1) {
+                        defaultProp->location = v->location;
+                        defaultProp->location.end = defaultProp->location.start;
+                        defaultProp->location.range.length = 0;
+                    }
+                    defaultProp->addValue(v);
+                }
+            }
+        }
+
+        _stateStack.pushObject(obj);
+        accept(initializer);
+        _stateStack.pop();
+
+        return obj;
+    }
+}
+
+Object *ProcessAST::defineObjectBinding(AST::UiQualifiedId *qualifiedId,
+                                        AST::UiQualifiedId *objectTypeName,
+                                        LocationSpan location,
+                                        AST::UiObjectInitializer *initializer)
+{
+    const QString objectType = asString(objectTypeName);
+    const AST::SourceLocation typeLocation = objectTypeName->identifierToken;
+
+    if (objectType == QLatin1String("Script")) {
+
+        AST::UiObjectMemberList *it = initializer->members;
+        for (; it; it = it->next) {
+            AST::UiScriptBinding *scriptBinding = AST::cast<AST::UiScriptBinding *>(it->member);
+            if (! scriptBinding)
+                continue;
+
+            QString propertyName = asString(scriptBinding->qualifiedId);
+            if (propertyName == QLatin1String("source")) {
+                if (AST::ExpressionStatement *stmt = AST::cast<AST::ExpressionStatement *>(scriptBinding->statement)) {
+                    QDeclarativeParser::Variant string = getVariant(stmt->expression);
+                    if (string.isStringList()) {
+                        QStringList urls = string.asStringList();
+                        // We need to add this as a resource
+                        for (int ii = 0; ii < urls.count(); ++ii) 
+                            _parser->_refUrls << QUrl(urls.at(ii));
+                    }
+                }
+            }
+        }
+
+    }
+
+    return defineObjectBinding_helper(qualifiedId, objectType, typeLocation, location, initializer);
+}
+
+LocationSpan ProcessAST::location(AST::UiQualifiedId *id)
+{
+    return location(id->identifierToken, id->identifierToken);
+}
+
+LocationSpan ProcessAST::location(AST::SourceLocation start, AST::SourceLocation end)
+{
+    LocationSpan rv;
+    rv.start.line = start.startLine;
+    rv.start.column = start.startColumn;
+    rv.end.line = end.startLine;
+    rv.end.column = end.startColumn + end.length - 1;
+    rv.range.offset = start.offset;
+    rv.range.length = end.offset + end.length - start.offset;
+    return rv;
+}
+
+// UiProgram: UiImportListOpt UiObjectMemberList ;
+bool ProcessAST::visit(AST::UiProgram *node)
+{
+    accept(node->imports);
+    accept(node->members->member);
+    return false;
+}
+
+// UiImport: T_IMPORT T_STRING_LITERAL ;
+bool ProcessAST::visit(AST::UiImport *node)
+{
+    QString uri;
+    QDeclarativeScriptParser::Import import;
+
+    if (node->fileName) {
+        import.type = QDeclarativeScriptParser::Import::File;
+        uri = node->fileName->asString();
+    } else {
+        import.type = QDeclarativeScriptParser::Import::Library;
+        uri = asString(node->importUri);
+    }
+
+    AST::SourceLocation startLoc = node->importToken;
+    AST::SourceLocation endLoc = node->semicolonToken;
+
+    if (node->importId) {
+        import.qualifier = node->importId->asString();
+        if (!import.qualifier.at(0).isUpper()) {
+            QDeclarativeError error;
+            error.setDescription(QCoreApplication::translate("QDeclarativeParser","Invalid import qualifier ID"));
+            error.setLine(node->importIdToken.startLine);
+            error.setColumn(node->importIdToken.startColumn);
+            _parser->_errors << error;
+            return false;
+        }
+    }
+    if (node->versionToken.isValid())
+        import.version = textAt(node->versionToken);
+    else if (import.type == QDeclarativeScriptParser::Import::Library) {
+        QDeclarativeError error;
+        error.setDescription(QCoreApplication::translate("QDeclarativeParser","Library import requires a version"));
+        error.setLine(node->importIdToken.startLine);
+        error.setColumn(node->importIdToken.startColumn);
+        _parser->_errors << error;
+        return false;
+    }
+
+    import.location = location(startLoc, endLoc);
+    import.uri = uri;
+
+    _parser->_imports << import;
+
+    return false;
+}
+
+bool ProcessAST::visit(AST::UiPublicMember *node)
+{
+    const struct TypeNameToType {
+        const char *name;
+        Object::DynamicProperty::Type type;
+        const char *qtName;
+    } propTypeNameToTypes[] = {
+        { "int", Object::DynamicProperty::Int, "int" },
+        { "bool", Object::DynamicProperty::Bool, "bool" },
+        { "double", Object::DynamicProperty::Real, "double" },
+        { "real", Object::DynamicProperty::Real, "qreal" },
+        { "string", Object::DynamicProperty::String, "QString" },
+        { "url", Object::DynamicProperty::Url, "QUrl" },
+        { "color", Object::DynamicProperty::Color, "QColor" },
+        { "date", Object::DynamicProperty::Date, "QDate" },
+        { "var", Object::DynamicProperty::Variant, "QVariant" },
+        { "variant", Object::DynamicProperty::Variant, "QVariant" }
+    };
+    const int propTypeNameToTypesCount = sizeof(propTypeNameToTypes) /
+                                         sizeof(propTypeNameToTypes[0]);
+
+    if(node->type == AST::UiPublicMember::Signal) {
+        const QString name = node->name->asString();
+
+        Object::DynamicSignal signal;
+        signal.name = name.toUtf8();
+
+        AST::UiParameterList *p = node->parameters;
+        while (p) {
+            const QString memberType = p->type->asString();
+            const char *qtType = 0;
+            for(int ii = 0; !qtType && ii < propTypeNameToTypesCount; ++ii) {
+                if(QLatin1String(propTypeNameToTypes[ii].name) == memberType)
+                    qtType = propTypeNameToTypes[ii].qtName;
+            }
+
+            if (!qtType) {
+                QDeclarativeError error;
+                error.setDescription(QCoreApplication::translate("QDeclarativeParser","Expected parameter type"));
+                error.setLine(node->typeToken.startLine);
+                error.setColumn(node->typeToken.startColumn);
+                _parser->_errors << error;
+                return false;
+            }
+
+            signal.parameterTypes << qtType;
+            signal.parameterNames << p->name->asString().toUtf8();
+            p = p->finish();
+        }
+
+        _stateStack.top().object->dynamicSignals << signal;
+    } else {
+        const QString memberType = node->memberType->asString();
+        const QString name = node->name->asString();
+
+        bool typeFound = false;
+        Object::DynamicProperty::Type type;
+
+        if (memberType == QLatin1String("alias")) {
+            type = Object::DynamicProperty::Alias;
+            typeFound = true;
+        }
+
+        for(int ii = 0; !typeFound && ii < propTypeNameToTypesCount; ++ii) {
+            if(QLatin1String(propTypeNameToTypes[ii].name) == memberType) {
+                type = propTypeNameToTypes[ii].type;
+                typeFound = true;
+            }
+        }
+
+        if (!typeFound && memberType.at(0).isUpper()) {
+            QString typemodifier;
+            if(node->typeModifier)
+                typemodifier = node->typeModifier->asString();
+            if (typemodifier == QString()) {
+                type = Object::DynamicProperty::Custom;
+            } else if(typemodifier == QLatin1String("list")) {
+                type = Object::DynamicProperty::CustomList;
+            } else {
+                QDeclarativeError error;
+                error.setDescription(QCoreApplication::translate("QDeclarativeParser","Invalid property type modifier"));
+                error.setLine(node->typeModifierToken.startLine);
+                error.setColumn(node->typeModifierToken.startColumn);
+                _parser->_errors << error;
+                return false;
+            }
+            typeFound = true;
+        } else if (node->typeModifier) {
+            QDeclarativeError error;
+            error.setDescription(QCoreApplication::translate("QDeclarativeParser","Unexpected property type modifier"));
+            error.setLine(node->typeModifierToken.startLine);
+            error.setColumn(node->typeModifierToken.startColumn);
+            _parser->_errors << error;
+            return false;
+        }
+
+        if(!typeFound) {
+            QDeclarativeError error;
+            error.setDescription(QCoreApplication::translate("QDeclarativeParser","Expected property type"));
+            error.setLine(node->typeToken.startLine);
+            error.setColumn(node->typeToken.startColumn);
+            _parser->_errors << error;
+            return false;
+        }
+
+        if (node->isReadonlyMember) {
+            QDeclarativeError error;
+            error.setDescription(QCoreApplication::translate("QDeclarativeParser","Readonly not yet supported"));
+            error.setLine(node->readonlyToken.startLine);
+            error.setColumn(node->readonlyToken.startColumn);
+            _parser->_errors << error;
+            return false;
+
+        }
+        Object::DynamicProperty property;
+        property.isDefaultProperty = node->isDefaultMember;
+        property.type = type;
+        if (type >= Object::DynamicProperty::Custom) {
+            QDeclarativeScriptParser::TypeReference *typeRef = 
+                _parser->findOrCreateType(memberType);
+            typeRef->refObjects.append(_stateStack.top().object);
+        }
+        property.customType = memberType.toUtf8();
+        property.name = name.toUtf8();
+        property.location = location(node->firstSourceLocation(),
+                                     node->lastSourceLocation());
+
+        if (node->expression) { // default value
+            property.defaultValue = new Property;
+            property.defaultValue->parent = _stateStack.top().object;
+            property.defaultValue->location =
+                    location(node->expression->firstSourceLocation(),
+                             node->expression->lastSourceLocation());
+            Value *value = new Value;
+            value->location = location(node->expression->firstSourceLocation(),
+                                       node->expression->lastSourceLocation());
+            value->value = getVariant(node->expression);
+            property.defaultValue->values << value;
+        }
+
+        _stateStack.top().object->dynamicProperties << property;
+    }
+
+    return true;
+}
+
+
+// UiObjectMember: UiQualifiedId UiObjectInitializer ;
+bool ProcessAST::visit(AST::UiObjectDefinition *node)
+{
+    LocationSpan l = location(node->firstSourceLocation(),
+                              node->lastSourceLocation());
+
+    defineObjectBinding(/*propertyName = */ 0,
+                        node->qualifiedTypeNameId,
+                        l,
+                        node->initializer);
+
+    return false;
+}
+
+
+// UiObjectMember: UiQualifiedId T_COLON UiQualifiedId UiObjectInitializer ;
+bool ProcessAST::visit(AST::UiObjectBinding *node)
+{
+    LocationSpan l = location(node->qualifiedTypeNameId->identifierToken,
+                              node->initializer->rbraceToken);
+
+    defineObjectBinding(node->qualifiedId,
+                        node->qualifiedTypeNameId,
+                        l,
+                        node->initializer);
+
+    return false;
+}
+
+QDeclarativeParser::Variant ProcessAST::getVariant(AST::ExpressionNode *expr)
+{
+    if (AST::StringLiteral *lit = AST::cast<AST::StringLiteral *>(expr)) {
+        return QDeclarativeParser::Variant(lit->value->asString());
+    } else if (expr->kind == AST::Node::Kind_TrueLiteral) {
+        return QDeclarativeParser::Variant(true);
+    } else if (expr->kind == AST::Node::Kind_FalseLiteral) {
+        return QDeclarativeParser::Variant(false);
+    } else if (AST::NumericLiteral *lit = AST::cast<AST::NumericLiteral *>(expr)) {
+        return QDeclarativeParser::Variant(lit->value, asString(expr));
+    } else {
+
+        if (AST::UnaryMinusExpression *unaryMinus = AST::cast<AST::UnaryMinusExpression *>(expr)) {
+           if (AST::NumericLiteral *lit = AST::cast<AST::NumericLiteral *>(unaryMinus->expression)) {
+               return QDeclarativeParser::Variant(-lit->value, asString(expr));
+           }
+        }
+
+        return  QDeclarativeParser::Variant(asString(expr), expr);
+    }
+}
+
+
+// UiObjectMember: UiQualifiedId T_COLON Statement ;
+bool ProcessAST::visit(AST::UiScriptBinding *node)
+{
+    int propertyCount = 0;
+    AST::UiQualifiedId *propertyName = node->qualifiedId;
+    for (; propertyName; propertyName = propertyName->next){
+        ++propertyCount;
+        _stateStack.pushProperty(propertyName->name->asString(),
+                                 location(propertyName));
+    }
+
+    Property *prop = currentProperty();
+
+    QDeclarativeParser::Variant primitive;
+
+    if (AST::ExpressionStatement *stmt = AST::cast<AST::ExpressionStatement *>(node->statement)) {
+        primitive = getVariant(stmt->expression);
+    } else { // do binding
+        primitive = QDeclarativeParser::Variant(asString(node->statement),
+                                       node->statement);
+    }
+
+    prop->location.range.length = prop->location.range.offset + prop->location.range.length - node->qualifiedId->identifierToken.offset;
+    prop->location.range.offset = node->qualifiedId->identifierToken.offset;
+    Value *v = new Value;
+    v->value = primitive;
+    v->location = location(node->statement->firstSourceLocation(),
+                           node->statement->lastSourceLocation());
+
+    prop->addValue(v);
+
+    while (propertyCount--)
+        _stateStack.pop();
+
+    return true;
+}
+
+static QList<int> collectCommas(AST::UiArrayMemberList *members)
+{
+    QList<int> commas;
+
+    if (members) {
+        for (AST::UiArrayMemberList *it = members->next; it; it = it->next) {
+            commas.append(it->commaToken.offset);
+        }
+    }
+
+    return commas;
+}
+
+// UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
+bool ProcessAST::visit(AST::UiArrayBinding *node)
+{
+    int propertyCount = 0;
+    AST::UiQualifiedId *propertyName = node->qualifiedId;
+    for (; propertyName; propertyName = propertyName->next){
+        ++propertyCount;
+        _stateStack.pushProperty(propertyName->name->asString(),
+                                 location(propertyName));
+    }
+
+    accept(node->members);
+
+    // For the DOM, store the position of the T_LBRACKET upto the T_RBRACKET as the range:
+    Property* prop = currentProperty();
+    prop->listValueRange.offset = node->lbracketToken.offset;
+    prop->listValueRange.length = node->rbracketToken.offset + node->rbracketToken.length - node->lbracketToken.offset;
+
+    // Store the positions of the comma token too, again for the DOM to be able to retreive it.
+    prop->listCommaPositions = collectCommas(node->members);
+
+    while (propertyCount--)
+        _stateStack.pop();
+
+    return false;
+}
+
+bool ProcessAST::visit(AST::UiSourceElement *node)
+{
+    QDeclarativeParser::Object *obj = currentObject();
+
+    bool isScript = (obj && obj->typeName == "Script");
+
+    if (!isScript) {
+
+        if (AST::FunctionDeclaration *funDecl = AST::cast<AST::FunctionDeclaration *>(node->sourceElement)) {
+
+            Object::DynamicSlot slot;
+
+            AST::FormalParameterList *f = funDecl->formals;
+            while (f) {
+                slot.parameterNames << f->name->asString().toUtf8();
+                f = f->finish();
+            }
+
+            QString body = textAt(funDecl->lbraceToken, funDecl->rbraceToken);
+            slot.name = funDecl->name->asString().toUtf8();
+            slot.body = body;
+            obj->dynamicSlots << slot;
+
+        } else {
+            QDeclarativeError error;
+            error.setDescription(QCoreApplication::translate("QDeclarativeParser","QDeclarativeJS declaration outside Script element"));
+            error.setLine(node->firstSourceLocation().startLine);
+            error.setColumn(node->firstSourceLocation().startColumn);
+            _parser->_errors << error;
+        }
+        return false;
+
+    } else {
+        QString source;
+
+        int line = 0;
+        if (AST::FunctionDeclaration *funDecl = AST::cast<AST::FunctionDeclaration *>(node->sourceElement)) {
+            line = funDecl->functionToken.startLine;
+            source = asString(funDecl);
+        } else if (AST::VariableStatement *varStmt = AST::cast<AST::VariableStatement *>(node->sourceElement)) {
+            // ignore variable declarations
+            line = varStmt->declarationKindToken.startLine;
+
+            QDeclarativeError error;
+            error.setDescription(QCoreApplication::translate("QDeclarativeParser", "Variable declarations not allow in inline Script blocks"));
+            error.setLine(node->firstSourceLocation().startLine);
+            error.setColumn(node->firstSourceLocation().startColumn);
+            _parser->_errors << error;
+            return false;
+        }
+
+        Value *value = new Value;
+        value->location = location(node->firstSourceLocation(),
+                                   node->lastSourceLocation());
+        value->value = QDeclarativeParser::Variant(source);
+
+        obj->getDefaultProperty()->addValue(value);
+    }
+
+    return false;
+}
+
+} // end of anonymous namespace
+
+
+QDeclarativeScriptParser::QDeclarativeScriptParser()
+: root(0), data(0)
+{
+
+}
+
+QDeclarativeScriptParser::~QDeclarativeScriptParser()
+{
+    clear();
+}
+
+class QDeclarativeScriptParserJsASTData
+{
+public:
+    QDeclarativeScriptParserJsASTData(const QString &filename)
+        : nodePool(filename, &engine) {}
+
+    Engine engine;
+    NodePool nodePool;
+};
+
+bool QDeclarativeScriptParser::parse(const QByteArray &qmldata, const QUrl &url)
+{
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    QDeclarativePerfTimer<QDeclarativePerf::QDeclarativeParsing> pt;
+#endif
+    clear();
+
+    const QString fileName = url.toString();
+
+    QTextStream stream(qmldata, QIODevice::ReadOnly);
+    stream.setCodec("UTF-8");
+    const QString code = stream.readAll();
+
+    data = new QDeclarativeScriptParserJsASTData(fileName);
+
+    Lexer lexer(&data->engine);
+    lexer.setCode(code, /*line = */ 1);
+
+    Parser parser(&data->engine);
+
+    if (! parser.parse() || !_errors.isEmpty()) {
+
+        // Extract errors from the parser
+        foreach (const DiagnosticMessage &m, parser.diagnosticMessages()) {
+
+            if (m.isWarning())
+                continue;
+
+            QDeclarativeError error;
+            error.setUrl(url);
+            error.setDescription(m.message);
+            error.setLine(m.loc.startLine);
+            error.setColumn(m.loc.startColumn);
+            _errors << error;
+
+        }
+    }
+
+    if (_errors.isEmpty()) {
+        ProcessAST process(this);
+        process(code, parser.ast());
+
+        // Set the url for process errors
+        for(int ii = 0; ii < _errors.count(); ++ii)
+            _errors[ii].setUrl(url);
+    }
+
+    return _errors.isEmpty();
+}
+
+QList<QDeclarativeScriptParser::TypeReference*> QDeclarativeScriptParser::referencedTypes() const
+{
+    return _refTypes;
+}
+
+QList<QUrl> QDeclarativeScriptParser::referencedResources() const
+{
+    return _refUrls;
+}
+
+Object *QDeclarativeScriptParser::tree() const
+{
+    return root;
+}
+
+QList<QDeclarativeScriptParser::Import> QDeclarativeScriptParser::imports() const
+{
+    return _imports;
+}
+
+QList<QDeclarativeError> QDeclarativeScriptParser::errors() const
+{
+    return _errors;
+}
+
+void QDeclarativeScriptParser::clear()
+{
+    if (root) {
+        root->release();
+        root = 0;
+    }
+    _imports.clear();
+    qDeleteAll(_refTypes);
+    _refTypes.clear();
+    _errors.clear();
+
+    if (data) {
+        delete data;
+        data = 0;
+    }
+}
+
+QDeclarativeScriptParser::TypeReference *QDeclarativeScriptParser::findOrCreateType(const QString &name)
+{
+    TypeReference *type = 0;
+    int i = 0;
+    for (; i < _refTypes.size(); ++i) {
+        if (_refTypes.at(i)->name == name) {
+            type = _refTypes.at(i);
+            break;
+        }
+    }
+    if (!type) {
+        type = new TypeReference(i, name);
+        _refTypes.append(type);
+    }
+
+    return type;
+}
+
+void QDeclarativeScriptParser::setTree(Object *tree)
+{
+    Q_ASSERT(! root);
+
+    root = tree;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativescriptparser_p.h b/src/declarative/qml/qdeclarativescriptparser_p.h
new file mode 100644
index 0000000..b8f77d1
--- /dev/null
+++ b/src/declarative/qml/qdeclarativescriptparser_p.h
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QDECLARATIVESCRIPTPARSER_P_H
+#define QDECLARATIVESCRIPTPARSER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeerror.h"
+#include "qdeclarativeparser_p.h"
+
+#include <QtCore/QList>
+#include <QtCore/QUrl>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QByteArray;
+
+class QDeclarativeScriptParserJsASTData;
+class QDeclarativeScriptParser
+{
+public:
+    class Import
+    {
+    public:
+        Import() : type(Library) {}
+
+        enum Type { Library, File };
+        Type type;
+
+        QString uri;
+        QString qualifier;
+        QString version;
+
+        QDeclarativeParser::LocationSpan location;
+    };
+
+    class TypeReference
+    {
+    public:
+        TypeReference(int typeId, const QString &typeName) : id(typeId), name(typeName) {}
+
+        int id;
+        // type as it has been referenced in Qml
+        QString name;
+        // objects in parse tree referencing the type
+        QList<QDeclarativeParser::Object*> refObjects;
+    };
+
+    QDeclarativeScriptParser();
+    ~QDeclarativeScriptParser();
+
+    bool parse(const QByteArray &data, const QUrl &url = QUrl());
+
+    QList<TypeReference*> referencedTypes() const;
+    QList<QUrl> referencedResources() const;
+
+    QDeclarativeParser::Object *tree() const;
+    QList<Import> imports() const;
+
+    void clear();
+
+    QList<QDeclarativeError> errors() const;
+
+// ### private:
+    TypeReference *findOrCreateType(const QString &name);
+    void setTree(QDeclarativeParser::Object *tree);
+
+    void setScriptFile(const QString &filename) {_scriptFile = filename; }
+    QString scriptFile() const { return _scriptFile; }
+
+// ### private:
+    QList<QDeclarativeError> _errors;
+
+    QDeclarativeParser::Object *root;
+    QList<Import> _imports;
+    QList<TypeReference*> _refTypes;
+    QList<QUrl> _refUrls;
+    QString _scriptFile;
+    QDeclarativeScriptParserJsASTData *data;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVESCRIPTPARSER_P_H
diff --git a/src/declarative/qml/qdeclarativescriptstring.cpp b/src/declarative/qml/qdeclarativescriptstring.cpp
new file mode 100644
index 0000000..5b9afe9
--- /dev/null
+++ b/src/declarative/qml/qdeclarativescriptstring.cpp
@@ -0,0 +1,155 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativescriptstring.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeScriptStringPrivate : public QSharedData
+{
+public:
+    QDeclarativeScriptStringPrivate() : context(0), scope(0) {}
+
+    QDeclarativeContext *context;
+    QObject *scope;
+    QString script;
+};
+
+/*!
+\class QDeclarativeScriptString
+  \since 4.7
+\brief The QDeclarativeScriptString class encapsulates a script and its context.
+
+The QDeclarativeScriptString is used by properties that want to accept a script "assignment" from QML.
+
+Normally, the following code would result in a binding being established for the \c script
+property.  If the property had a type of QDeclarativeScriptString, the script - \e {console.log(1921)} - itself
+would be passed to the property and it could choose how to handle it.
+
+\code
+MyType {
+    script: console.log(1921)
+}
+\endcode
+*/
+
+/*!
+Construct an empty instance.
+*/
+QDeclarativeScriptString::QDeclarativeScriptString()
+:  d(new QDeclarativeScriptStringPrivate)
+{
+}
+
+/*!
+Copy \a other.
+*/
+QDeclarativeScriptString::QDeclarativeScriptString(const QDeclarativeScriptString &other)
+: d(other.d)
+{
+}
+
+/*!
+\internal
+*/
+QDeclarativeScriptString::~QDeclarativeScriptString()
+{
+}
+
+/*!
+Assign \a other to this.
+*/
+QDeclarativeScriptString &QDeclarativeScriptString::operator=(const QDeclarativeScriptString &other)
+{
+    d = other.d;
+    return *this;
+}
+
+/*!
+Return the context for the script.
+*/
+QDeclarativeContext *QDeclarativeScriptString::context() const
+{
+    return d->context;
+}
+
+/*!
+Sets the \a context for the script.
+*/
+void QDeclarativeScriptString::setContext(QDeclarativeContext *context)
+{
+    d->context = context;
+}
+
+/*!
+Returns the scope object for the script.
+*/
+QObject *QDeclarativeScriptString::scopeObject() const
+{
+    return d->scope;
+}
+
+/*!
+Sets the scope \a object for the script.
+*/
+void QDeclarativeScriptString::setScopeObject(QObject *object)
+{
+    d->scope = object;
+}
+
+/*!
+Returns the script text.
+*/
+QString QDeclarativeScriptString::script() const
+{
+    return d->script;
+}
+
+/*!
+Sets the \a script text.
+*/
+void QDeclarativeScriptString::setScript(const QString &script)
+{
+    d->script = script;
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h
new file mode 100644
index 0000000..43bef44
--- /dev/null
+++ b/src/declarative/qml/qdeclarativescriptstring.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESCRIPTSTRING_H
+#define QDECLARATIVESCRIPTSTRING_H
+
+#include <QtCore/qstring.h>
+#include <QtCore/qshareddata.h>
+#include <QtCore/qmetatype.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QObject;
+class QDeclarativeContext;
+class QDeclarativeScriptStringPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeScriptString 
+{
+public:
+    QDeclarativeScriptString();
+    QDeclarativeScriptString(const QDeclarativeScriptString &);
+    ~QDeclarativeScriptString();
+
+    QDeclarativeScriptString &operator=(const QDeclarativeScriptString &);
+
+    QDeclarativeContext *context() const;
+    void setContext(QDeclarativeContext *);
+
+    QObject *scopeObject() const;
+    void setScopeObject(QObject *);
+
+    QString script() const;
+    void setScript(const QString &);
+
+private:
+    QSharedDataPointer<QDeclarativeScriptStringPrivate> d;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDeclarativeScriptString);
+
+QT_END_HEADER
+
+#endif // QDECLARATIVESCRIPTSTRING_H
+
diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp
new file mode 100644
index 0000000..855d623
--- /dev/null
+++ b/src/declarative/qml/qdeclarativesqldatabase.cpp
@@ -0,0 +1,428 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativesqldatabase_p.h"
+
+#include "qdeclarativeengine.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativerefcount_p.h"
+#include "qdeclarativeengine_p.h"
+
+#include <QtCore/qobject.h>
+#include <QtScript/qscriptvalue.h>
+#include <QtScript/qscriptvalueiterator.h>
+#include <QtScript/qscriptcontext.h>
+#include <QtScript/qscriptengine.h>
+#include <QtScript/qscriptclasspropertyiterator.h>
+#include <QtSql/qsqldatabase.h>
+#include <QtSql/qsqlquery.h>
+#include <QtSql/qsqlerror.h>
+#include <QtSql/qsqlrecord.h>
+#include <QtCore/qstack.h>
+#include <QtCore/qcryptographichash.h>
+#include <QtCore/qsettings.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qdebug.h>
+
+Q_DECLARE_METATYPE(QSqlDatabase)
+Q_DECLARE_METATYPE(QSqlQuery)
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeSqlQueryScriptClass: public QScriptClass {
+public:
+    QDeclarativeSqlQueryScriptClass(QScriptEngine *engine) : QScriptClass(engine)
+    {
+        str_length = engine->toStringHandle(QLatin1String("length"));
+        str_forwardOnly = engine->toStringHandle(QLatin1String("forwardOnly")); // not in HTML5 (an optimization)
+    }
+
+    QueryFlags queryProperty(const QScriptValue &,
+                             const QScriptString &name,
+                             QueryFlags flags, uint *)
+    {
+        if (flags & HandlesReadAccess) {
+            if (name == str_length) {
+                return HandlesReadAccess;
+            } else if (name == str_forwardOnly) {
+                return flags;
+            }
+        }
+        if (flags & HandlesWriteAccess)
+            if (name == str_forwardOnly)
+                return flags;
+        return 0;
+    }
+
+    QScriptValue property(const QScriptValue &object,
+                          const QScriptString &name, uint)
+    {
+        QSqlQuery query = qscriptvalue_cast<QSqlQuery>(object.data());
+        if (name == str_length) {
+            int s = query.size();
+            if (s<0) {
+                // Inefficient.
+                if (query.last()) {
+                    return query.at()+1;
+                } else {
+                    return 0;
+                }
+            } else {
+                return s;
+            }
+        } else if (name == str_forwardOnly) {
+            return query.isForwardOnly();
+        }
+        return engine()->undefinedValue();
+    }
+
+    void setProperty(QScriptValue &object,
+                      const QScriptString &name, uint, const QScriptValue & value)
+    {
+        if (name == str_forwardOnly) {
+            QSqlQuery query = qscriptvalue_cast<QSqlQuery>(object.data());
+            query.setForwardOnly(value.toBool());
+        }
+    }
+
+    QScriptValue::PropertyFlags propertyFlags(const QScriptValue &/*object*/, const QScriptString &name, uint /*id*/)
+    {
+        if (name == str_length) {
+            return QScriptValue::Undeletable
+                | QScriptValue::SkipInEnumeration;
+        }
+        return QScriptValue::Undeletable;
+    }
+
+private:
+    QScriptString str_length;
+    QScriptString str_forwardOnly;
+};
+
+// If the spec changes to allow iteration, check git history...
+// class QDeclarativeSqlQueryScriptClassPropertyIterator : public QScriptClassPropertyIterator
+
+
+
+enum SqlException {
+    UNKNOWN_ERR,
+    DATABASE_ERR,
+    VERSION_ERR,
+    TOO_LARGE_ERR,
+    QUOTA_ERR,
+    SYNTAX_ERR,
+    CONSTRAINT_ERR,
+    TIMEOUT_ERR
+};
+
+static const char* sqlerror[] = {
+    "UNKNOWN_ERR",
+    "DATABASE_ERR",
+    "VERSION_ERR",
+    "TOO_LARGE_ERR",
+    "QUOTA_ERR",
+    "SYNTAX_ERR",
+    "CONSTRAINT_ERR",
+    "TIMEOUT_ERR",
+    0
+};
+
+#define THROW_SQL(error, desc) \
+{ \
+    QScriptValue errorValue = context->throwError(desc); \
+    errorValue.setProperty(QLatin1String("code"), error); \
+    return errorValue; \
+}
+
+
+static QString databaseFile(const QString& connectionName, QScriptEngine *engine)
+{
+    QDeclarativeScriptEngine *qmlengine = static_cast<QDeclarativeScriptEngine*>(engine);
+    QString basename = qmlengine->offlineStoragePath
+                + QDir::separator() + QLatin1String("Databases") + QDir::separator();
+    basename += connectionName;
+    return basename;
+}
+
+
+
+static QScriptValue qmlsqldatabase_item(QScriptContext *context, QScriptEngine *engine)
+{
+    QSqlQuery query = qscriptvalue_cast<QSqlQuery>(context->thisObject().data());
+    int i = context->argument(0).toNumber();
+    if (query.at() == i || query.seek(i)) { // Qt 4.6 doesn't optimize seek(at())
+        QSqlRecord r = query.record();
+        QScriptValue row = engine->newObject();
+        for (int j=0; j<r.count(); ++j) {
+            row.setProperty(r.fieldName(j), QScriptValue(engine,r.value(j).toString()));
+        }
+        return row;
+    }
+    return engine->undefinedValue();
+}
+
+static QScriptValue qmlsqldatabase_executeSql_outsidetransaction(QScriptContext *context, QScriptEngine * /*engine*/)
+{
+    THROW_SQL(DATABASE_ERR,QDeclarativeEngine::tr("executeSql called outside transaction()"));
+}
+
+static QScriptValue qmlsqldatabase_executeSql(QScriptContext *context, QScriptEngine *engine)
+{
+    QSqlDatabase db = qscriptvalue_cast<QSqlDatabase>(context->thisObject());
+    QString sql = context->argument(0).toString();
+    QSqlQuery query(db);
+    bool err = false;
+
+    QScriptValue result;
+
+    if (query.prepare(sql)) {
+        if (context->argumentCount() > 1) {
+            QScriptValue values = context->argument(1);
+            if (values.isObject()) {
+                for (QScriptValueIterator it(values); it.hasNext();) {
+                    it.next();
+                    query.bindValue(it.name(),it.value().toVariant());
+                }
+            } else {
+                query.bindValue(0,values.toVariant());
+            }
+        }
+        if (query.exec()) {
+            result = engine->newObject();
+            QDeclarativeScriptEngine *qmlengine = static_cast<QDeclarativeScriptEngine*>(engine);
+            if (!qmlengine->sqlQueryClass)
+                qmlengine->sqlQueryClass = new QDeclarativeSqlQueryScriptClass(engine);
+            QScriptValue rows = engine->newObject(qmlengine->sqlQueryClass);
+            rows.setData(engine->newVariant(qVariantFromValue(query)));
+            rows.setProperty(QLatin1String("item"), engine->newFunction(qmlsqldatabase_item,1), QScriptValue::SkipInEnumeration);
+            result.setProperty(QLatin1String("rows"),rows);
+            result.setProperty(QLatin1String("rowsAffected"),query.numRowsAffected());
+            result.setProperty(QLatin1String("insertId"),query.lastInsertId().toString());
+        } else {
+            err = true;
+        }
+    } else {
+        err = true;
+    }
+    if (err)
+        THROW_SQL(DATABASE_ERR,query.lastError().text());
+    return result;
+}
+
+static QScriptValue qmlsqldatabase_executeSql_readonly(QScriptContext *context, QScriptEngine *engine)
+{
+    QString sql = context->argument(0).toString();
+    if (sql.startsWith(QLatin1String("SELECT"),Qt::CaseInsensitive)) {
+        return qmlsqldatabase_executeSql(context,engine);
+    } else {
+        THROW_SQL(SYNTAX_ERR,QDeclarativeEngine::tr("Read-only Transaction"))
+    }
+}
+
+static QScriptValue qmlsqldatabase_change_version(QScriptContext *context, QScriptEngine *engine)
+{
+    if (context->argumentCount() < 2)
+        return engine->undefinedValue();
+
+    QSqlDatabase db = qscriptvalue_cast<QSqlDatabase>(context->thisObject());
+    QString from_version = context->argument(0).toString();
+    QString to_version = context->argument(1).toString();
+    QScriptValue callback = context->argument(2);
+
+    QScriptValue instance = engine->newObject();
+    instance.setProperty(QLatin1String("executeSql"), engine->newFunction(qmlsqldatabase_executeSql,1));
+    QScriptValue tx = engine->newVariant(instance,qVariantFromValue(db));
+
+    QString foundvers = context->thisObject().property(QLatin1String("version")).toString();
+    if (from_version!=foundvers) {
+        THROW_SQL(2,QDeclarativeEngine::tr("Version mismatch: expected %1, found %2").arg(from_version).arg(foundvers));
+        return engine->undefinedValue();
+    }
+
+    bool ok = true;
+    if (callback.isFunction()) {
+        ok = false;
+        db.transaction();
+        callback.call(QScriptValue(), QScriptValueList() << tx);
+        if (engine->hasUncaughtException()) {
+            db.rollback();
+        } else {
+            if (!db.commit()) {
+                db.rollback();
+                THROW_SQL(0,QDeclarativeEngine::tr("SQL transaction failed"));
+            } else {
+                ok = true;
+            }
+        }
+    }
+
+    if (ok) {
+        context->thisObject().setProperty(QLatin1String("version"), to_version, QScriptValue::ReadOnly);
+        QSettings ini(databaseFile(db.connectionName(),engine)+QLatin1String(".ini"),QSettings::IniFormat);
+        ini.setValue(QLatin1String("Version"), to_version);
+    }
+
+    return engine->undefinedValue();
+}
+
+static QScriptValue qmlsqldatabase_transaction_shared(QScriptContext *context, QScriptEngine *engine, bool readOnly)
+{
+    QSqlDatabase db = qscriptvalue_cast<QSqlDatabase>(context->thisObject());
+    QScriptValue callback = context->argument(0);
+    if (!callback.isFunction())
+        THROW_SQL(UNKNOWN_ERR,QDeclarativeEngine::tr("transaction: missing callback"));
+
+    QScriptValue instance = engine->newObject();
+    instance.setProperty(QLatin1String("executeSql"),
+        engine->newFunction(readOnly ? qmlsqldatabase_executeSql_readonly : qmlsqldatabase_executeSql,1));
+    QScriptValue tx = engine->newVariant(instance,qVariantFromValue(db));
+
+    db.transaction();
+    callback.call(QScriptValue(), QScriptValueList() << tx);
+    instance.setProperty(QLatin1String("executeSql"),
+        engine->newFunction(qmlsqldatabase_executeSql_outsidetransaction));
+    if (engine->hasUncaughtException()) {
+        db.rollback();
+    } else {
+        if (!db.commit())
+            db.rollback();
+    }
+    return engine->undefinedValue();
+}
+
+static QScriptValue qmlsqldatabase_transaction(QScriptContext *context, QScriptEngine *engine)
+{
+    return qmlsqldatabase_transaction_shared(context,engine,false);
+}
+static QScriptValue qmlsqldatabase_read_transaction(QScriptContext *context, QScriptEngine *engine)
+{
+    return qmlsqldatabase_transaction_shared(context,engine,true);
+}
+
+/*
+    Currently documented in doc/src/declarastive/globalobject.qdoc
+*/
+static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEngine *engine)
+{
+    QSqlDatabase database;
+
+    QString dbname = context->argument(0).toString();
+    QString dbversion = context->argument(1).toString();
+    QString dbdescription = context->argument(2).toString();
+    int dbestimatedsize = context->argument(3).toNumber();
+    QScriptValue dbcreationCallback = context->argument(4);
+
+    QCryptographicHash md5(QCryptographicHash::Md5);
+    md5.addData(dbname.toUtf8());
+    QString dbid(QLatin1String(md5.result().toHex()));
+
+    QString basename = databaseFile(dbid,engine);
+    bool created = false;
+    QString version = dbversion;
+
+    {
+        QSettings ini(basename+QLatin1String(".ini"),QSettings::IniFormat);
+
+        if (QSqlDatabase::connectionNames().contains(dbid)) {
+            database = QSqlDatabase::database(dbid);
+            version = ini.value(QLatin1String("Version")).toString();
+            if (version != dbversion && !dbversion.isEmpty() && !version.isEmpty())
+                THROW_SQL(VERSION_ERR,QDeclarativeEngine::tr("SQL: database version mismatch"));
+        } else {
+            created = !QFile::exists(basename+QLatin1String(".sqlite"));
+            database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), dbid);
+            QDir().mkpath(basename);
+            if (created) {
+                ini.setValue(QLatin1String("Name"), dbname);
+                if (dbcreationCallback.isFunction())
+                    version = QString();
+                ini.setValue(QLatin1String("Version"), version);
+                ini.setValue(QLatin1String("Description"), dbdescription);
+                ini.setValue(QLatin1String("EstimatedSize"), dbestimatedsize);
+                ini.setValue(QLatin1String("Driver"), QLatin1String("QSQLITE"));
+            } else {
+                if (!dbversion.isEmpty() && ini.value(QLatin1String("Version")) != dbversion) {
+                    // Incompatible
+                    THROW_SQL(VERSION_ERR,QDeclarativeEngine::tr("SQL: database version mismatch"));
+                }
+                version = ini.value(QLatin1String("Version")).toString();
+            }
+            database.setDatabaseName(basename+QLatin1String(".sqlite"));
+        }
+        if (!database.isOpen())
+            database.open();
+    }
+
+    QScriptValue instance = engine->newObject();
+    instance.setProperty(QLatin1String("transaction"), engine->newFunction(qmlsqldatabase_transaction,1));
+    instance.setProperty(QLatin1String("readTransaction"), engine->newFunction(qmlsqldatabase_read_transaction,1));
+    instance.setProperty(QLatin1String("version"), version, QScriptValue::ReadOnly);
+    instance.setProperty(QLatin1String("changeVersion"), engine->newFunction(qmlsqldatabase_change_version,3));
+
+    QScriptValue result = engine->newVariant(instance,qVariantFromValue(database));
+
+    if (created && dbcreationCallback.isFunction()) {
+        dbcreationCallback.call(QScriptValue(), QScriptValueList() << result);
+    }
+
+    return result;
+}
+
+void qt_add_qmlsqldatabase(QScriptEngine *engine)
+{
+    QScriptValue openDatabase = engine->newFunction(qmlsqldatabase_open_sync, 4);
+    engine->globalObject().setProperty(QLatin1String("openDatabaseSync"), openDatabase);
+
+    QScriptValue sqlExceptionPrototype = engine->newObject();
+    for (int i=0; sqlerror[i]; ++i)
+        sqlExceptionPrototype.setProperty(QLatin1String(sqlerror[i]),
+            i,QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+
+    engine->globalObject().setProperty(QLatin1String("SQLException"), sqlExceptionPrototype);
+}
+
+/*
+HTML5 "spec" says "rs.rows[n]", but WebKit only impelments "rs.rows.item(n)". We do both (and property iterator).
+We add a "forwardOnly" property that stops Qt caching results (code promises to only go forward
+through the data.
+*/
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativesqldatabase_p.h b/src/declarative/qml/qdeclarativesqldatabase_p.h
new file mode 100644
index 0000000..d0b6c0b
--- /dev/null
+++ b/src/declarative/qml/qdeclarativesqldatabase_p.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESQLDATABASE_P_H
+#define QDECLARATIVESQLDATABASE_P_H
+
+#include <QtScript/qscriptengine.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QScriptEngine;
+void qt_add_qmlsqldatabase(QScriptEngine *engine);
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVESQLDATABASE_P_H
+
diff --git a/src/declarative/qml/qdeclarativestringconverters.cpp b/src/declarative/qml/qdeclarativestringconverters.cpp
new file mode 100644
index 0000000..f3497e5
--- /dev/null
+++ b/src/declarative/qml/qdeclarativestringconverters.cpp
@@ -0,0 +1,276 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativestringconverters_p.h"
+
+#include <QtGui/qcolor.h>
+#include <QtGui/qvector3d.h>
+#include <QtCore/qpoint.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qsize.h>
+#include <QtCore/qvariant.h>
+#include <QtCore/qdatetime.h>
+
+QT_BEGIN_NAMESPACE
+
+static uchar fromHex(const uchar c, const uchar c2)
+{
+    uchar rv = 0;
+    if (c >= '0' && c <= '9')
+        rv += (c - '0') * 16;
+    else if (c >= 'A' && c <= 'F')
+        rv += (c - 'A' + 10) * 16;
+    else if (c >= 'a' && c <= 'f')
+        rv += (c - 'a' + 10) * 16;
+
+    if (c2 >= '0' && c2 <= '9')
+        rv += (c2 - '0');
+    else if (c2 >= 'A' && c2 <= 'F')
+        rv += (c2 - 'A' + 10);
+    else if (c2 >= 'a' && c2 <= 'f')
+        rv += (c2 - 'a' + 10);
+
+    return rv;
+}
+
+static uchar fromHex(const QString &s, int idx)
+{
+    uchar c = s.at(idx).toAscii();
+    uchar c2 = s.at(idx + 1).toAscii();
+    return fromHex(c, c2);
+}
+
+QVariant QDeclarativeStringConverters::variantFromString(const QString &s)
+{
+    if (s.isEmpty())
+        return QVariant(s);
+    if (s.startsWith(QLatin1Char('\'')) && s.endsWith(QLatin1Char('\''))) {
+        QString data = s.mid(1, s.length() - 2);
+        return QVariant(data);
+    } 
+    bool ok = false;
+    QRectF r = rectFFromString(s, &ok);
+    if (ok) return QVariant(r);
+    QColor c = colorFromString(s, &ok);
+    if (ok) return QVariant(c);
+    QPointF p = pointFFromString(s, &ok);
+    if (ok) return QVariant(p);
+    QSizeF sz = sizeFFromString(s, &ok);
+    if (ok) return QVariant(sz);
+    QVector3D v = vector3DFromString(s, &ok);
+    if (ok) return qVariantFromValue(v);
+
+    return QVariant(s);
+}
+
+QVariant QDeclarativeStringConverters::variantFromString(const QString &s, int preferredType, bool *ok)
+{
+    switch (preferredType) {
+    case QMetaType::QColor:
+        return QVariant::fromValue(colorFromString(s, ok));
+    case QMetaType::QDate:
+        return QVariant::fromValue(dateFromString(s, ok));
+    case QMetaType::QTime:
+        return QVariant::fromValue(timeFromString(s, ok));
+    case QMetaType::QDateTime:
+        return QVariant::fromValue(dateTimeFromString(s, ok));
+    case QMetaType::QPointF:
+        return QVariant::fromValue(pointFFromString(s, ok));
+    case QMetaType::QPoint:
+        return QVariant::fromValue(pointFFromString(s, ok).toPoint());
+    case QMetaType::QSizeF:
+        return QVariant::fromValue(sizeFFromString(s, ok));
+    case QMetaType::QSize:
+        return QVariant::fromValue(sizeFFromString(s, ok).toSize());
+    case QMetaType::QRectF:
+        return QVariant::fromValue(rectFFromString(s, ok));
+    case QMetaType::QRect:
+        return QVariant::fromValue(rectFFromString(s, ok).toRect());
+    case QMetaType::QVector3D:
+        return QVariant::fromValue(vector3DFromString(s, ok));
+    default:
+        if (ok) *ok = false;
+        return QVariant();
+    }
+}
+
+QColor QDeclarativeStringConverters::colorFromString(const QString &s, bool *ok)
+{
+    if (s.startsWith(QLatin1Char('#')) && s.length() == 9) {
+        uchar a = fromHex(s, 1);
+        uchar r = fromHex(s, 3);
+        uchar g = fromHex(s, 5);
+        uchar b = fromHex(s, 7);
+        if (ok) *ok = true;
+        return QColor(r, g, b, a);
+    } else {
+        QColor rv;
+        if (s.startsWith(QLatin1Char('#')) || QColor::colorNames().contains(s.toLower()))
+            rv = QColor(s);
+        if (ok) *ok = rv.isValid();
+        return rv;
+    }
+}
+
+QDate QDeclarativeStringConverters::dateFromString(const QString &s, bool *ok)
+{
+    QDate d = QDate::fromString(s, Qt::ISODate);
+    if (ok) *ok =  d.isValid();
+    return d;
+}
+
+QTime QDeclarativeStringConverters::timeFromString(const QString &s, bool *ok)
+{
+    QTime t = QTime::fromString(s, Qt::ISODate);
+    if (ok) *ok = t.isValid();
+    return t;
+}
+
+QDateTime QDeclarativeStringConverters::dateTimeFromString(const QString &s, bool *ok)
+{
+    QDateTime d = QDateTime::fromString(s, Qt::ISODate);
+    if (ok) *ok =  d.isValid();
+    return d;
+}
+
+//expects input of "x,y"
+QPointF QDeclarativeStringConverters::pointFFromString(const QString &s, bool *ok)
+{
+    if (s.count(QLatin1Char(',')) != 1) {
+        if (ok)
+            *ok = false;
+        return QPointF();
+    }
+
+    bool xGood, yGood;
+    int index = s.indexOf(QLatin1Char(','));
+    qreal xCoord = s.left(index).toDouble(&xGood);
+    qreal yCoord = s.mid(index+1).toDouble(&yGood);
+    if (!xGood || !yGood) {
+        if (ok)
+            *ok = false;
+        return QPointF();
+    }
+
+    if (ok)
+        *ok = true;
+    return QPointF(xCoord, yCoord);
+}
+
+//expects input of "widthxheight"
+QSizeF QDeclarativeStringConverters::sizeFFromString(const QString &s, bool *ok)
+{
+    if (s.count(QLatin1Char('x')) != 1) {
+        if (ok)
+            *ok = false;
+        return QSizeF();
+    }
+
+    bool wGood, hGood;
+    int index = s.indexOf(QLatin1Char('x'));
+    qreal width = s.left(index).toDouble(&wGood);
+    qreal height = s.mid(index+1).toDouble(&hGood);
+    if (!wGood || !hGood) {
+        if (ok)
+            *ok = false;
+        return QSizeF();
+    }
+
+    if (ok)
+        *ok = true;
+    return QSizeF(width, height);
+}
+
+//expects input of "x,y,widthxheight" //### use space instead of second comma?
+QRectF QDeclarativeStringConverters::rectFFromString(const QString &s, bool *ok)
+{
+    if (s.count(QLatin1Char(',')) != 2 || s.count(QLatin1Char('x')) != 1) {
+        if (ok)
+            *ok = false;
+        return QRectF();
+    }
+
+    bool xGood, yGood, wGood, hGood;
+    int index = s.indexOf(QLatin1Char(','));
+    qreal x = s.left(index).toDouble(&xGood);
+    int index2 = s.indexOf(QLatin1Char(','), index+1);
+    qreal y = s.mid(index+1, index2-index-1).toDouble(&yGood);
+    index = s.indexOf(QLatin1Char('x'), index2+1);
+    qreal width = s.mid(index2+1, index-index2-1).toDouble(&wGood);
+    qreal height = s.mid(index+1).toDouble(&hGood);
+    if (!xGood || !yGood || !wGood || !hGood) {
+        if (ok)
+            *ok = false;
+        return QRectF();
+    }
+
+    if (ok)
+        *ok = true;
+    return QRectF(x, y, width, height);
+}
+
+//expects input of "x,y,z"
+QVector3D QDeclarativeStringConverters::vector3DFromString(const QString &s, bool *ok)
+{
+    if (s.count(QLatin1Char(',')) != 2) {
+        if (ok)
+            *ok = false;
+        return QVector3D();
+    }
+
+    bool xGood, yGood, zGood;
+    int index = s.indexOf(QLatin1Char(','));
+    int index2 = s.indexOf(QLatin1Char(','), index+1);
+    qreal xCoord = s.left(index).toDouble(&xGood);
+    qreal yCoord = s.mid(index+1, index2-index-1).toDouble(&yGood);
+    qreal zCoord = s.mid(index2+1).toDouble(&zGood);
+    if (!xGood || !yGood || !zGood) {
+        if (ok)
+            *ok = false;
+        return QVector3D();
+    }
+
+    if (ok)
+        *ok = true;
+    return QVector3D(xCoord, yCoord, zCoord);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativestringconverters_p.h b/src/declarative/qml/qdeclarativestringconverters_p.h
new file mode 100644
index 0000000..7afdfd3
--- /dev/null
+++ b/src/declarative/qml/qdeclarativestringconverters_p.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESTRINGCONVERTERS_P_H
+#define QDECLARATIVESTRINGCONVERTERS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qvariant.h>
+
+QT_BEGIN_NAMESPACE
+
+class QColor;
+class QPointF;
+class QSizeF;
+class QRectF;
+class QString;
+class QByteArray;
+class QVector3D;
+
+// XXX - Bauhaus currently uses these methods which is why they're exported
+namespace QDeclarativeStringConverters
+{
+    QVariant Q_DECLARATIVE_EXPORT variantFromString(const QString &);
+    QVariant Q_DECLARATIVE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0);
+
+    QColor Q_DECLARATIVE_EXPORT colorFromString(const QString &, bool *ok = 0);
+    QDate Q_DECLARATIVE_EXPORT dateFromString(const QString &, bool *ok = 0); 
+    QTime Q_DECLARATIVE_EXPORT timeFromString(const QString &, bool *ok = 0);
+    QDateTime Q_DECLARATIVE_EXPORT dateTimeFromString(const QString &, bool *ok = 0);
+    QPointF Q_DECLARATIVE_EXPORT pointFFromString(const QString &, bool *ok = 0);
+    QSizeF Q_DECLARATIVE_EXPORT sizeFFromString(const QString &, bool *ok = 0);
+    QRectF Q_DECLARATIVE_EXPORT rectFFromString(const QString &, bool *ok = 0);
+    QVector3D Q_DECLARATIVE_EXPORT vector3DFromString(const QString &, bool *ok = 0);
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVESTRINGCONVERTERS_P_H
diff --git a/src/declarative/qml/qdeclarativetypenamecache.cpp b/src/declarative/qml/qdeclarativetypenamecache.cpp
new file mode 100644
index 0000000..f94f944
--- /dev/null
+++ b/src/declarative/qml/qdeclarativetypenamecache.cpp
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetypenamecache_p.h"
+
+#include "qdeclarativeengine_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeTypeNameCache::QDeclarativeTypeNameCache(QDeclarativeEngine *e)
+: QDeclarativeCleanup(e), engine(e)
+{
+}
+
+QDeclarativeTypeNameCache::~QDeclarativeTypeNameCache()
+{
+    clear();
+}
+
+void QDeclarativeTypeNameCache::clear()
+{
+    qDeleteAll(stringCache);
+    stringCache.clear();
+    identifierCache.clear();
+    engine = 0;
+}
+
+void QDeclarativeTypeNameCache::add(const QString &name, QDeclarativeType *type)
+{
+    if (stringCache.contains(name))
+        return;
+
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+
+    RData *data = new RData;
+    // ### Use typename class
+    data->identifier = ep->objectClass->createPersistentIdentifier(name);
+    data->type = type;
+    stringCache.insert(name, data);
+    identifierCache.insert(data->identifier.identifier, data);
+}
+
+void QDeclarativeTypeNameCache::add(const QString &name, QDeclarativeTypeNameCache *typeNamespace)
+{
+    if (stringCache.contains(name))
+        return;
+
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+
+    RData *data = new RData;
+    // ### Use typename class
+    data->identifier = ep->objectClass->createPersistentIdentifier(name);
+    data->typeNamespace = typeNamespace;
+    stringCache.insert(name, data);
+    identifierCache.insert(data->identifier.identifier, data);
+    typeNamespace->addref();
+}
+
+QDeclarativeTypeNameCache::Data *QDeclarativeTypeNameCache::data(const QString &id) const
+{
+    return stringCache.value(id);
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativetypenamecache_p.h b/src/declarative/qml/qdeclarativetypenamecache_p.h
new file mode 100644
index 0000000..eee5b77
--- /dev/null
+++ b/src/declarative/qml/qdeclarativetypenamecache_p.h
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETYPENAMECACHE_P_H
+#define QDECLARATIVETYPENAMECACHE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativerefcount_p.h"
+#include "qdeclarativecleanup_p.h"
+
+#include <private/qscriptdeclarativeclass_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeType;
+class QDeclarativeEngine;
+class QDeclarativeTypeNameCache : public QDeclarativeRefCount, public QDeclarativeCleanup
+{
+public:
+    QDeclarativeTypeNameCache(QDeclarativeEngine *);
+    virtual ~QDeclarativeTypeNameCache();
+
+    struct Data {
+        inline Data();
+        inline ~Data();
+        QDeclarativeType *type;
+        QDeclarativeTypeNameCache *typeNamespace;
+    };
+
+    void add(const QString &, QDeclarativeType *);
+    void add(const QString &, QDeclarativeTypeNameCache *);
+
+    Data *data(const QString &) const;
+    inline Data *data(const QScriptDeclarativeClass::Identifier &id) const;
+
+protected:
+    virtual void clear();
+
+private:
+    struct RData : public Data { 
+        QScriptDeclarativeClass::PersistentIdentifier identifier;
+    };
+    typedef QHash<QString, RData *> StringCache;
+    typedef QHash<QScriptDeclarativeClass::Identifier, RData *> IdentifierCache;
+
+    StringCache stringCache;
+    IdentifierCache identifierCache;
+    QDeclarativeEngine *engine;
+};
+
+QDeclarativeTypeNameCache::Data::Data()
+: type(0), typeNamespace(0)
+{
+}
+
+QDeclarativeTypeNameCache::Data::~Data()
+{
+    if (typeNamespace) typeNamespace->release();
+}
+
+QDeclarativeTypeNameCache::Data *QDeclarativeTypeNameCache::data(const QScriptDeclarativeClass::Identifier &id) const
+{
+    return identifierCache.value(id);
+}
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVETYPENAMECACHE_P_H
+
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
new file mode 100644
index 0000000..02370e0
--- /dev/null
+++ b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
@@ -0,0 +1,166 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetypenamescriptclass_p.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativetypenamecache_p.h"
+
+QT_BEGIN_NAMESPACE
+
+struct TypeNameData : public QScriptDeclarativeClass::Object {
+    TypeNameData(QObject *o, QDeclarativeType *t, QDeclarativeTypeNameScriptClass::TypeNameMode m) : object(o), type(t), typeNamespace(0), mode(m) {}
+    TypeNameData(QObject *o, QDeclarativeTypeNameCache *n, QDeclarativeTypeNameScriptClass::TypeNameMode m) : object(o), type(0), typeNamespace(n), mode(m) {
+        if (typeNamespace) typeNamespace->addref();
+    }
+    ~TypeNameData() {
+        if (typeNamespace) typeNamespace->release();
+    }
+
+    QObject *object;
+    QDeclarativeType *type;
+    QDeclarativeTypeNameCache *typeNamespace;
+    QDeclarativeTypeNameScriptClass::TypeNameMode mode;
+};
+
+QDeclarativeTypeNameScriptClass::QDeclarativeTypeNameScriptClass(QDeclarativeEngine *bindEngine)
+: QDeclarativeScriptClass(QDeclarativeEnginePrivate::getScriptEngine(bindEngine)), 
+  engine(bindEngine), object(0), type(0)
+{
+}
+
+QDeclarativeTypeNameScriptClass::~QDeclarativeTypeNameScriptClass()
+{
+}
+
+QScriptValue QDeclarativeTypeNameScriptClass::newObject(QObject *object, QDeclarativeType *type, TypeNameMode mode)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    return QScriptDeclarativeClass::newObject(scriptEngine, this, new TypeNameData(object, type, mode));
+}
+
+QScriptValue QDeclarativeTypeNameScriptClass::newObject(QObject *object, QDeclarativeTypeNameCache *ns, TypeNameMode mode)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    return QScriptDeclarativeClass::newObject(scriptEngine, this, new TypeNameData(object, ns, mode));
+}
+
+QScriptClass::QueryFlags 
+QDeclarativeTypeNameScriptClass::queryProperty(Object *obj, const Identifier &name, 
+                                      QScriptClass::QueryFlags flags)
+{
+    Q_UNUSED(flags);
+
+    TypeNameData *data = (TypeNameData *)obj;
+
+    object = 0;
+    type = 0;
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+
+    if (data->typeNamespace) {
+
+        QDeclarativeTypeNameCache::Data *d = data->typeNamespace->data(name);
+        if (d && d->type) {
+            type = d->type;
+            return QScriptClass::HandlesReadAccess;
+        } else {
+            return 0;
+        }
+
+    } else {
+        Q_ASSERT(data->type);
+
+        QString strName = toString(name);
+
+        if (strName.at(0).isUpper()) {
+            // Must be an enum
+            if (data->mode == IncludeEnums) {
+                // ### Optimize
+                QByteArray enumName = strName.toUtf8();
+                const QMetaObject *metaObject = data->type->baseMetaObject();
+                for (int ii = metaObject->enumeratorCount() - 1; ii >= 0; --ii) {
+                    QMetaEnum e = metaObject->enumerator(ii);
+                    int value = e.keyToValue(enumName.constData());
+                    if (value != -1) {
+                        enumValue = value;
+                        return QScriptClass::HandlesReadAccess;
+                    }
+                }
+            }
+            return 0;
+        } else if (data->object) {
+            // Must be an attached property
+            object = qmlAttachedPropertiesObjectById(data->type->index(), data->object);
+            if (!object) return 0;
+            return ep->objectClass->queryProperty(object, name, flags, 0);
+        }
+    }
+
+    return 0;
+}
+
+QDeclarativeTypeNameScriptClass::ScriptValue 
+QDeclarativeTypeNameScriptClass::property(Object *obj, const Identifier &name)
+{
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+    if (type) {
+        return Value(scriptEngine, newObject(((TypeNameData *)obj)->object, type, ((TypeNameData *)obj)->mode));
+    } else if (object) {
+        return ep->objectClass->property(object, name);
+    } else {
+        return Value(scriptEngine, enumValue);
+    }
+}
+
+void QDeclarativeTypeNameScriptClass::setProperty(Object *o, const Identifier &n, const QScriptValue &v)
+{
+    Q_ASSERT(object);
+    Q_ASSERT(!type);
+
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+    ep->objectClass->setProperty(((TypeNameData *)o)->object, n, v);
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass_p.h b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h
new file mode 100644
index 0000000..b6e3f51
--- /dev/null
+++ b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETYPENAMESCRIPTCLASS_P_H
+#define QDECLARATIVETYPENAMESCRIPTCLASS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+#include "qdeclarativeengine_p.h"
+
+#include <QtScript/qscriptclass.h>
+
+#include <private/qdeclarativescriptclass_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QDeclarativeType;
+class QDeclarativeTypeNameCache;
+class QDeclarativeTypeNameScriptClass : public QDeclarativeScriptClass
+{
+public:
+    QDeclarativeTypeNameScriptClass(QDeclarativeEngine *);
+    ~QDeclarativeTypeNameScriptClass();
+
+    enum TypeNameMode { IncludeEnums, ExcludeEnums };
+    QScriptValue newObject(QObject *, QDeclarativeType *, TypeNameMode = IncludeEnums);
+    QScriptValue newObject(QObject *, QDeclarativeTypeNameCache *, TypeNameMode = IncludeEnums);
+
+protected:
+    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
+                                                   QScriptClass::QueryFlags flags);
+
+    virtual ScriptValue property(Object *, const Identifier &);
+    virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
+
+private:
+    QDeclarativeEngine *engine;
+    QObject *object;
+    QDeclarativeType *type;
+    quint32 enumValue;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVETYPENAMESCRIPTCLASS_P_H
+
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
new file mode 100644
index 0000000..df83fa4
--- /dev/null
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -0,0 +1,706 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativevaluetype_p.h"
+
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeValueTypeFactory::QDeclarativeValueTypeFactory()
+{
+    // ### Optimize
+    for (unsigned int ii = 0; ii < (QVariant::UserType - 1); ++ii)
+        valueTypes[ii] = valueType(ii);
+}
+
+QDeclarativeValueTypeFactory::~QDeclarativeValueTypeFactory()
+{
+    for (unsigned int ii = 0; ii < (QVariant::UserType - 1); ++ii)
+        delete valueTypes[ii];
+}
+
+QDeclarativeValueType *QDeclarativeValueTypeFactory::valueType(int t)
+{
+    switch (t) {
+    case QVariant::Point:
+        return new QDeclarativePointValueType;
+    case QVariant::PointF:
+        return new QDeclarativePointFValueType;
+    case QVariant::Size:
+        return new QDeclarativeSizeValueType;
+    case QVariant::SizeF:
+        return new QDeclarativeSizeFValueType;
+    case QVariant::Rect:
+        return new QDeclarativeRectValueType;
+    case QVariant::RectF:
+        return new QDeclarativeRectFValueType;
+    case QVariant::Vector3D:
+        return new QDeclarativeVector3DValueType;
+    case QVariant::EasingCurve:
+        return new QDeclarativeEasingValueType;
+    case QVariant::Font:
+        return new QDeclarativeFontValueType;
+    default:
+        return 0;
+    }
+}
+
+QDeclarativeValueType::QDeclarativeValueType(QObject *parent)
+: QObject(parent)
+{
+}
+
+QDeclarativePointFValueType::QDeclarativePointFValueType(QObject *parent)
+: QDeclarativeValueType(parent)
+{
+}
+
+void QDeclarativePointFValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &point, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QDeclarativePointFValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &point, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant QDeclarativePointFValueType::value()
+{
+    return QVariant(point);
+}
+
+void QDeclarativePointFValueType::setValue(QVariant value)
+{
+    point = qvariant_cast<QPointF>(value);
+}
+
+qreal QDeclarativePointFValueType::x() const
+{
+    return point.x();
+}
+
+qreal QDeclarativePointFValueType::y() const
+{
+    return point.y();
+}
+
+void QDeclarativePointFValueType::setX(qreal x)
+{
+    point.setX(x);
+}
+
+void QDeclarativePointFValueType::setY(qreal y)
+{
+    point.setY(y);
+}
+
+QDeclarativePointValueType::QDeclarativePointValueType(QObject *parent)
+: QDeclarativeValueType(parent)
+{
+}
+
+void QDeclarativePointValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &point, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QDeclarativePointValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &point, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant QDeclarativePointValueType::value()
+{
+    return QVariant(point);
+}
+
+void QDeclarativePointValueType::setValue(QVariant value)
+{
+    point = qvariant_cast<QPoint>(value);
+}
+
+int QDeclarativePointValueType::x() const
+{
+    return point.x();
+}
+
+int QDeclarativePointValueType::y() const
+{
+    return point.y();
+}
+
+void QDeclarativePointValueType::setX(int x)
+{
+    point.setX(x);
+}
+
+void QDeclarativePointValueType::setY(int y)
+{
+    point.setY(y);
+}
+
+QDeclarativeSizeFValueType::QDeclarativeSizeFValueType(QObject *parent)
+: QDeclarativeValueType(parent)
+{
+}
+
+void QDeclarativeSizeFValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &size, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QDeclarativeSizeFValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &size, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant QDeclarativeSizeFValueType::value()
+{
+    return QVariant(size);
+}
+
+void QDeclarativeSizeFValueType::setValue(QVariant value)
+{
+    size = qvariant_cast<QSizeF>(value);
+}
+
+qreal QDeclarativeSizeFValueType::width() const
+{
+    return size.width();
+}
+
+qreal QDeclarativeSizeFValueType::height() const
+{
+    return size.height();
+}
+
+void QDeclarativeSizeFValueType::setWidth(qreal w)
+{
+    size.setWidth(w);
+}
+
+void QDeclarativeSizeFValueType::setHeight(qreal h)
+{
+    size.setHeight(h);
+}
+
+QDeclarativeSizeValueType::QDeclarativeSizeValueType(QObject *parent)
+: QDeclarativeValueType(parent)
+{
+}
+
+void QDeclarativeSizeValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &size, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QDeclarativeSizeValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &size, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant QDeclarativeSizeValueType::value()
+{
+    return QVariant(size);
+}
+
+void QDeclarativeSizeValueType::setValue(QVariant value)
+{
+    size = qvariant_cast<QSize>(value);
+}
+
+int QDeclarativeSizeValueType::width() const
+{
+    return size.width();
+}
+
+int QDeclarativeSizeValueType::height() const
+{
+    return size.height();
+}
+
+void QDeclarativeSizeValueType::setWidth(int w)
+{
+    size.setWidth(w);
+}
+
+void QDeclarativeSizeValueType::setHeight(int h)
+{
+    size.setHeight(h);
+}
+
+QDeclarativeRectFValueType::QDeclarativeRectFValueType(QObject *parent)
+: QDeclarativeValueType(parent)
+{
+}
+
+void QDeclarativeRectFValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &rect, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QDeclarativeRectFValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &rect, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant QDeclarativeRectFValueType::value()
+{
+    return QVariant(rect);
+}
+
+void QDeclarativeRectFValueType::setValue(QVariant value)
+{
+    rect = qvariant_cast<QRectF>(value);
+}
+
+qreal QDeclarativeRectFValueType::x() const
+{
+    return rect.x();
+}
+
+qreal QDeclarativeRectFValueType::y() const
+{
+    return rect.y();
+}
+
+void QDeclarativeRectFValueType::setX(qreal x)
+{
+    rect.moveLeft(x);
+}
+
+void QDeclarativeRectFValueType::setY(qreal y)
+{
+    rect.moveTop(y);
+}
+
+qreal QDeclarativeRectFValueType::width() const
+{
+    return rect.width();
+}
+
+qreal QDeclarativeRectFValueType::height() const
+{
+    return rect.height();
+}
+
+void QDeclarativeRectFValueType::setWidth(qreal w)
+{
+    rect.setWidth(w);
+}
+
+void QDeclarativeRectFValueType::setHeight(qreal h)
+{
+    rect.setHeight(h);
+}
+
+QDeclarativeRectValueType::QDeclarativeRectValueType(QObject *parent)
+: QDeclarativeValueType(parent)
+{
+}
+
+void QDeclarativeRectValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &rect, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QDeclarativeRectValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &rect, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant QDeclarativeRectValueType::value()
+{
+    return QVariant(rect);
+}
+
+void QDeclarativeRectValueType::setValue(QVariant value)
+{
+    rect = qvariant_cast<QRect>(value);
+}
+
+int QDeclarativeRectValueType::x() const
+{
+    return rect.x();
+}
+
+int QDeclarativeRectValueType::y() const
+{
+    return rect.y();
+}
+
+void QDeclarativeRectValueType::setX(int x)
+{
+    rect.moveLeft(x);
+}
+
+void QDeclarativeRectValueType::setY(int y)
+{
+    rect.moveTop(y);
+}
+
+int QDeclarativeRectValueType::width() const
+{
+    return rect.width();
+}
+
+int QDeclarativeRectValueType::height() const
+{
+    return rect.height();
+}
+
+void QDeclarativeRectValueType::setWidth(int w)
+{
+    rect.setWidth(w);
+}
+
+void QDeclarativeRectValueType::setHeight(int h)
+{
+    rect.setHeight(h);
+}
+
+QDeclarativeVector3DValueType::QDeclarativeVector3DValueType(QObject *parent)
+: QDeclarativeValueType(parent)
+{
+}
+
+void QDeclarativeVector3DValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &vector, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QDeclarativeVector3DValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &vector, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant  QDeclarativeVector3DValueType::value()
+{
+    return QVariant(vector);
+}
+
+void QDeclarativeVector3DValueType::setValue(QVariant value)
+{
+    vector = qvariant_cast<QVector3D>(value);
+}
+
+qreal QDeclarativeVector3DValueType::x() const
+{
+    return vector.x();
+}
+
+qreal QDeclarativeVector3DValueType::y() const
+{
+    return vector.y();
+}
+
+qreal QDeclarativeVector3DValueType::z() const
+{
+    return vector.z();
+}
+
+void QDeclarativeVector3DValueType::setX(qreal x)
+{
+    vector.setX(x);
+}
+
+void QDeclarativeVector3DValueType::setY(qreal y)
+{
+    vector.setY(y);
+}
+
+void QDeclarativeVector3DValueType::setZ(qreal z)
+{
+    vector.setZ(z);
+}
+
+QDeclarativeEasingValueType::QDeclarativeEasingValueType(QObject *parent)
+: QDeclarativeValueType(parent)
+{
+}
+
+void QDeclarativeEasingValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &easing, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QDeclarativeEasingValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &easing, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant QDeclarativeEasingValueType::value()
+{
+    return QVariant(easing);
+}
+
+void QDeclarativeEasingValueType::setValue(QVariant value)
+{
+    easing = qvariant_cast<QEasingCurve>(value);
+}
+
+QDeclarativeEasingValueType::Type QDeclarativeEasingValueType::type() const
+{
+    return (QDeclarativeEasingValueType::Type)easing.type();
+}
+
+qreal QDeclarativeEasingValueType::amplitude() const
+{
+    return easing.amplitude();
+}
+
+qreal QDeclarativeEasingValueType::overshoot() const
+{
+    return easing.overshoot();
+}
+
+qreal QDeclarativeEasingValueType::period() const
+{
+    return easing.period();
+}
+
+void QDeclarativeEasingValueType::setType(QDeclarativeEasingValueType::Type type)
+{
+    easing.setType((QEasingCurve::Type)type);
+}
+
+void QDeclarativeEasingValueType::setAmplitude(qreal amplitude)
+{
+    easing.setAmplitude(amplitude);
+}
+
+void QDeclarativeEasingValueType::setOvershoot(qreal overshoot)
+{
+    easing.setOvershoot(overshoot);
+}
+
+void QDeclarativeEasingValueType::setPeriod(qreal period)
+{
+    easing.setPeriod(period);
+}
+
+QDeclarativeFontValueType::QDeclarativeFontValueType(QObject *parent)
+: QDeclarativeValueType(parent), hasPixelSize(false)
+{
+}
+
+void QDeclarativeFontValueType::read(QObject *obj, int idx)
+{
+    void *a[] = { &font, 0 };
+    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
+}
+
+void QDeclarativeFontValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+{
+    int status = -1;
+    void *a[] = { &font, 0, &status, &flags };
+    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
+}
+
+QVariant  QDeclarativeFontValueType::value()
+{
+    return QVariant(font);
+}
+
+void QDeclarativeFontValueType::setValue(QVariant value)
+{
+    font = qvariant_cast<QFont>(value);
+}
+
+
+QString QDeclarativeFontValueType::family() const
+{
+    return font.family();
+}
+
+void QDeclarativeFontValueType::setFamily(const QString &family)
+{
+    font.setFamily(family);
+}
+
+bool QDeclarativeFontValueType::bold() const
+{
+    return font.bold();
+}
+
+void QDeclarativeFontValueType::setBold(bool b)
+{
+    font.setBold(b);
+}
+
+QDeclarativeFontValueType::FontWeight QDeclarativeFontValueType::weight() const
+{
+    return (QDeclarativeFontValueType::FontWeight)font.weight();
+}
+
+void QDeclarativeFontValueType::setWeight(QDeclarativeFontValueType::FontWeight w)
+{
+    font.setWeight((QFont::Weight)w);
+}
+
+bool QDeclarativeFontValueType::italic() const
+{
+    return font.italic();
+}
+
+void QDeclarativeFontValueType::setItalic(bool b)
+{
+    font.setItalic(b);
+}
+
+bool QDeclarativeFontValueType::underline() const
+{
+    return font.underline();
+}
+
+void QDeclarativeFontValueType::setUnderline(bool b)
+{
+    font.setUnderline(b);
+}
+
+bool QDeclarativeFontValueType::overline() const
+{
+    return font.overline();
+}
+
+void QDeclarativeFontValueType::setOverline(bool b)
+{
+    font.setOverline(b);
+}
+
+bool QDeclarativeFontValueType::strikeout() const
+{
+    return font.strikeOut();
+}
+
+void QDeclarativeFontValueType::setStrikeout(bool b)
+{
+    font.setStrikeOut(b);
+}
+
+qreal QDeclarativeFontValueType::pointSize() const
+{
+    return font.pointSizeF();
+}
+
+void QDeclarativeFontValueType::setPointSize(qreal size)
+{
+    if (hasPixelSize) {
+        qWarning() << "Both point size and pixel size set. Using pixel size.";
+        return;
+    }
+
+    if (size >= 0.0)
+        font.setPointSizeF(size);
+}
+
+int QDeclarativeFontValueType::pixelSize() const
+{
+    return font.pixelSize();
+}
+
+void QDeclarativeFontValueType::setPixelSize(int size)
+{
+    if (size >=0) {
+        font.setPixelSize(size);
+        hasPixelSize = true;
+    } else {
+        hasPixelSize = false;
+    }
+}
+
+QDeclarativeFontValueType::Capitalization QDeclarativeFontValueType::capitalization() const
+{
+    return (QDeclarativeFontValueType::Capitalization)font.capitalization();
+}
+
+void QDeclarativeFontValueType::setCapitalization(QDeclarativeFontValueType::Capitalization c)
+{
+    font.setCapitalization((QFont::Capitalization)c);
+}
+
+qreal QDeclarativeFontValueType::letterSpacing() const
+{
+    return font.letterSpacing();
+}
+
+void QDeclarativeFontValueType::setLetterSpacing(qreal size)
+{
+    font.setLetterSpacing(QFont::PercentageSpacing, size);
+}
+
+qreal QDeclarativeFontValueType::wordSpacing() const
+{
+    return font.wordSpacing();
+}
+
+void QDeclarativeFontValueType::setWordSpacing(qreal size)
+{
+    font.setWordSpacing(size);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
new file mode 100644
index 0000000..995433b
--- /dev/null
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -0,0 +1,397 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEVALUETYPE_P_H
+#define QDECLARATIVEVALUETYPE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativemetaproperty.h"
+
+#include <QtCore/qobject.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qeasingcurve.h>
+#include <QtCore/qvariant.h>
+#include <QtGui/qvector3d.h>
+#include <QtGui/qfont.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_DECLARATIVE_EXPORT QDeclarativeValueType : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeValueType(QObject *parent = 0);
+    virtual void read(QObject *, int) = 0;
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags flags) = 0;
+    virtual QVariant value() = 0;
+    virtual void setValue(QVariant) = 0;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeValueTypeFactory
+{
+public:
+    QDeclarativeValueTypeFactory();
+    ~QDeclarativeValueTypeFactory();
+    static QDeclarativeValueType *valueType(int);
+
+    QDeclarativeValueType *valueTypes[QVariant::UserType - 1]; 
+    QDeclarativeValueType *operator[](int idx) const { return valueTypes[idx]; }
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativePointFValueType : public QDeclarativeValueType
+{
+    Q_PROPERTY(qreal x READ x WRITE setX)
+    Q_PROPERTY(qreal y READ y WRITE setY)
+    Q_OBJECT
+public:
+    QDeclarativePointFValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    qreal x() const;
+    qreal y() const;
+    void setX(qreal);
+    void setY(qreal);
+
+private:
+    QPointF point;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativePointValueType : public QDeclarativeValueType
+{
+    Q_PROPERTY(int x READ x WRITE setX)
+    Q_PROPERTY(int y READ y WRITE setY)
+    Q_OBJECT
+public:
+    QDeclarativePointValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    int x() const;
+    int y() const;
+    void setX(int);
+    void setY(int);
+
+private:
+    QPoint point;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeSizeFValueType : public QDeclarativeValueType
+{
+    Q_PROPERTY(qreal width READ width WRITE setWidth)
+    Q_PROPERTY(qreal height READ height WRITE setHeight)
+    Q_OBJECT
+public:
+    QDeclarativeSizeFValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    qreal width() const;
+    qreal height() const;
+    void setWidth(qreal);
+    void setHeight(qreal);
+
+private:
+    QSizeF size;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeSizeValueType : public QDeclarativeValueType
+{
+    Q_PROPERTY(int width READ width WRITE setWidth)
+    Q_PROPERTY(int height READ height WRITE setHeight)
+    Q_OBJECT
+public:
+    QDeclarativeSizeValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    int width() const;
+    int height() const;
+    void setWidth(int);
+    void setHeight(int);
+
+private:
+    QSize size;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeRectFValueType : public QDeclarativeValueType
+{
+    Q_PROPERTY(qreal x READ x WRITE setX)
+    Q_PROPERTY(qreal y READ y WRITE setY)
+    Q_PROPERTY(qreal width READ width WRITE setWidth)
+    Q_PROPERTY(qreal height READ height WRITE setHeight)
+    Q_OBJECT
+public:
+    QDeclarativeRectFValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    qreal x() const;
+    qreal y() const;
+    void setX(qreal);
+    void setY(qreal);
+    
+    qreal width() const;
+    qreal height() const;
+    void setWidth(qreal);
+    void setHeight(qreal);
+
+private:
+    QRectF rect;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeRectValueType : public QDeclarativeValueType
+{
+    Q_PROPERTY(int x READ x WRITE setX)
+    Q_PROPERTY(int y READ y WRITE setY)
+    Q_PROPERTY(int width READ width WRITE setWidth)
+    Q_PROPERTY(int height READ height WRITE setHeight)
+    Q_OBJECT
+public:
+    QDeclarativeRectValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    int x() const;
+    int y() const;
+    void setX(int);
+    void setY(int);
+    
+    int width() const;
+    int height() const;
+    void setWidth(int);
+    void setHeight(int);
+
+private:
+    QRect rect;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeVector3DValueType : public QDeclarativeValueType
+{
+    Q_PROPERTY(qreal x READ x WRITE setX)
+    Q_PROPERTY(qreal y READ y WRITE setY)
+    Q_PROPERTY(qreal z READ z WRITE setZ)
+    Q_OBJECT
+public:
+    QDeclarativeVector3DValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    qreal x() const;
+    qreal y() const;
+    qreal z() const;
+    void setX(qreal);
+    void setY(qreal);
+    void setZ(qreal);
+
+private:
+    QVector3D vector;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeEasingValueType : public QDeclarativeValueType
+{
+    Q_OBJECT
+    Q_ENUMS(Type)
+
+    Q_PROPERTY(QDeclarativeEasingValueType::Type type READ type WRITE setType)
+    Q_PROPERTY(qreal amplitude READ amplitude WRITE setAmplitude)
+    Q_PROPERTY(qreal overshoot READ overshoot WRITE setOvershoot)
+    Q_PROPERTY(qreal period READ period WRITE setPeriod)
+public:
+    enum Type {
+        Linear = QEasingCurve::Linear,
+        InQuad = QEasingCurve::InQuad, OutQuad = QEasingCurve::OutQuad,
+        InOutQuad = QEasingCurve::InOutQuad, OutInQuad = QEasingCurve::OutInQuad,
+        InCubic = QEasingCurve::InCubic, OutCubic = QEasingCurve::OutCubic,
+        InOutCubic = QEasingCurve::InOutCubic, OutInCubic = QEasingCurve::OutInCubic,
+        InQuart = QEasingCurve::InQuart, OutQuart = QEasingCurve::OutQuart,
+        InOutQuart = QEasingCurve::InOutQuart, OutInQuart = QEasingCurve::OutInQuart,
+        InQuint = QEasingCurve::InQuint, OutQuint = QEasingCurve::OutQuint,
+        InOutQuint = QEasingCurve::InOutQuint, OutInQuint = QEasingCurve::OutInQuint,
+        InSine = QEasingCurve::InSine, OutSine = QEasingCurve::OutSine,
+        InOutSine = QEasingCurve::InOutSine, OutInSine = QEasingCurve::OutInSine,
+        InExpo = QEasingCurve::InExpo, OutExpo = QEasingCurve::OutExpo,
+        InOutExpo = QEasingCurve::InOutExpo, OutInExpo = QEasingCurve::OutInExpo,
+        InCirc = QEasingCurve::InCirc, OutCirc = QEasingCurve::OutCirc,
+        InOutCirc = QEasingCurve::InOutCirc, OutInCirc = QEasingCurve::OutInCirc,
+        InElastic = QEasingCurve::InElastic, OutElastic = QEasingCurve::OutElastic,
+        InOutElastic = QEasingCurve::InOutElastic, OutInElastic = QEasingCurve::OutInElastic,
+        InBack = QEasingCurve::InBack, OutBack = QEasingCurve::OutBack,
+        InOutBack = QEasingCurve::InOutBack, OutInBack = QEasingCurve::OutInBack,
+        InBounce = QEasingCurve::InBounce, OutBounce = QEasingCurve::OutBounce,
+        InOutBounce = QEasingCurve::InOutBounce, OutInBounce = QEasingCurve::OutInBounce,
+        InCurve = QEasingCurve::InCurve, OutCurve = QEasingCurve::OutCurve,
+        SineCurve = QEasingCurve::SineCurve, CosineCurve = QEasingCurve::CosineCurve,
+    };
+
+    QDeclarativeEasingValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    Type type() const;
+    qreal amplitude() const;
+    qreal overshoot() const;
+    qreal period() const;
+    void setType(Type);
+    void setAmplitude(qreal);
+    void setOvershoot(qreal);
+    void setPeriod(qreal);
+
+private:
+    QEasingCurve easing;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeFontValueType : public QDeclarativeValueType
+{
+    Q_OBJECT
+    Q_ENUMS(FontWeight)
+    Q_ENUMS(Capitalization)
+
+    Q_PROPERTY(QString family READ family WRITE setFamily)
+    Q_PROPERTY(bool bold READ bold WRITE setBold)
+    Q_PROPERTY(FontWeight weight READ weight WRITE setWeight)
+    Q_PROPERTY(bool italic READ italic WRITE setItalic)
+    Q_PROPERTY(bool underline READ underline WRITE setUnderline)
+    Q_PROPERTY(bool overline READ overline WRITE setOverline)
+    Q_PROPERTY(bool strikeout READ strikeout WRITE setStrikeout)
+    Q_PROPERTY(qreal pointSize READ pointSize WRITE setPointSize)
+    Q_PROPERTY(int pixelSize READ pixelSize WRITE setPixelSize)
+    Q_PROPERTY(Capitalization capitalization READ capitalization WRITE setCapitalization)
+    Q_PROPERTY(qreal letterSpacing READ letterSpacing WRITE setLetterSpacing)
+    Q_PROPERTY(qreal wordSpacing READ wordSpacing WRITE setWordSpacing)
+
+public:
+    enum FontWeight { Light = QFont::Light,
+                       Normal = QFont::Normal,
+                       DemiBold = QFont::DemiBold,
+                       Bold = QFont::Bold,
+                       Black = QFont::Black };
+    enum Capitalization { MixedCase = QFont::MixedCase,
+                           AllUppercase = QFont::AllUppercase,
+                           AllLowercase = QFont::AllLowercase,
+                           SmallCaps = QFont::SmallCaps,
+                           Capitalize = QFont::Capitalize };
+
+    QDeclarativeFontValueType(QObject *parent = 0);
+
+    virtual void read(QObject *, int);
+    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual QVariant value();
+    virtual void setValue(QVariant value);
+
+    QString family() const;
+    void setFamily(const QString &);
+
+    bool bold() const;
+    void setBold(bool b);
+
+    FontWeight weight() const;
+    void setWeight(FontWeight);
+
+    bool italic() const;
+    void setItalic(bool b);
+
+    bool underline() const;
+    void setUnderline(bool b);
+
+    bool overline() const;
+    void setOverline(bool b);
+
+    bool strikeout() const;
+    void setStrikeout(bool b);
+
+    qreal pointSize() const;
+    void setPointSize(qreal size);
+
+    int pixelSize() const;
+    void setPixelSize(int size);
+
+    Capitalization capitalization() const;
+    void setCapitalization(Capitalization);
+
+    qreal letterSpacing() const;
+    void setLetterSpacing(qreal spacing);
+
+    qreal wordSpacing() const;
+    void setWordSpacing(qreal spacing);
+
+private:
+    QFont font;
+    bool hasPixelSize;
+};
+
+QT_END_NAMESPACE
+
+#endif  // QDECLARATIVEVALUETYPE_P_H
diff --git a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
new file mode 100644
index 0000000..9cb65f8
--- /dev/null
+++ b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
@@ -0,0 +1,148 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativevaluetypescriptclass_p.h"
+
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeguard_p.h"
+
+QT_BEGIN_NAMESPACE
+
+struct QDeclarativeValueTypeReference : public QScriptDeclarativeClass::Object {
+    QDeclarativeValueType *type;
+    QDeclarativeGuard<QObject> object;
+    int property;
+};
+
+QDeclarativeValueTypeScriptClass::QDeclarativeValueTypeScriptClass(QDeclarativeEngine *bindEngine)
+: QDeclarativeScriptClass(QDeclarativeEnginePrivate::getScriptEngine(bindEngine)), engine(bindEngine)
+{
+}
+
+QDeclarativeValueTypeScriptClass::~QDeclarativeValueTypeScriptClass()
+{
+}
+
+QScriptValue QDeclarativeValueTypeScriptClass::newObject(QObject *object, int coreIndex, QDeclarativeValueType *type)
+{
+    QDeclarativeValueTypeReference *ref = new QDeclarativeValueTypeReference;
+    ref->type = type;
+    ref->object = object;
+    ref->property = coreIndex;
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+    return QScriptDeclarativeClass::newObject(scriptEngine, this, ref);
+}
+
+QScriptClass::QueryFlags 
+QDeclarativeValueTypeScriptClass::queryProperty(Object *obj, const Identifier &name, 
+                                       QScriptClass::QueryFlags)
+{
+    QDeclarativeValueTypeReference *ref = static_cast<QDeclarativeValueTypeReference *>(obj);
+
+    m_lastIndex = -1;
+
+    if (!ref->object)
+        return 0;
+
+    QByteArray propName = toString(name).toUtf8();
+
+    m_lastIndex = ref->type->metaObject()->indexOfProperty(propName.constData());
+    if (m_lastIndex == -1)
+        return 0;
+
+    QMetaProperty prop = ref->object->metaObject()->property(m_lastIndex);
+
+    QScriptClass::QueryFlags rv =
+        QScriptClass::HandlesReadAccess;
+    if (prop.isWritable())
+        rv |= QScriptClass::HandlesWriteAccess;
+
+    return rv;
+}
+
+QDeclarativeValueTypeScriptClass::ScriptValue QDeclarativeValueTypeScriptClass::property(Object *obj, const Identifier &)
+{
+    QDeclarativeValueTypeReference *ref = static_cast<QDeclarativeValueTypeReference *>(obj);
+
+    QMetaProperty p = ref->type->metaObject()->property(m_lastIndex);
+    ref->type->read(ref->object, ref->property);
+    QVariant rv = p.read(ref->type);
+
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+    return Value(scriptEngine, static_cast<QDeclarativeEnginePrivate *>(QObjectPrivate::get(engine))->scriptValueFromVariant(rv));
+}
+
+void QDeclarativeValueTypeScriptClass::setProperty(Object *obj, const Identifier &, 
+                                          const QScriptValue &value)
+{
+    QDeclarativeValueTypeReference *ref = static_cast<QDeclarativeValueTypeReference *>(obj);
+
+    QVariant v = QDeclarativeScriptClass::toVariant(engine, value);
+
+    ref->type->read(ref->object, ref->property);
+    QMetaProperty p = ref->type->metaObject()->property(m_lastIndex);
+    p.write(ref->type, v);
+    ref->type->write(ref->object, ref->property, 0);
+}
+
+QVariant QDeclarativeValueTypeScriptClass::toVariant(Object *obj, bool *ok)
+{
+    QDeclarativeValueTypeReference *ref = static_cast<QDeclarativeValueTypeReference *>(obj);
+
+    if (ok) *ok = true;
+
+    if (ref->object) {
+        ref->type->read(ref->object, ref->property);
+        return ref->type->value();
+    } else {
+        return QVariant();
+    }
+}
+
+QVariant QDeclarativeValueTypeScriptClass::toVariant(const QScriptValue &value)
+{
+    Q_ASSERT(scriptClass(value) == this);
+
+    return toVariant(object(value), 0);
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h b/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h
new file mode 100644
index 0000000..31bd415
--- /dev/null
+++ b/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEVALUETYPESCRIPTCLASS_P_H
+#define QDECLARATIVEVALUETYPESCRIPTCLASS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+
+#include <private/qdeclarativescriptclass_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QDeclarativeValueType;
+class QDeclarativeValueTypeScriptClass : public QDeclarativeScriptClass
+{
+public:
+    QDeclarativeValueTypeScriptClass(QDeclarativeEngine *);
+    ~QDeclarativeValueTypeScriptClass();
+
+    QScriptValue newObject(QObject *object, int coreIndex, QDeclarativeValueType *);
+
+    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
+                                                   QScriptClass::QueryFlags flags);
+    virtual ScriptValue property(Object *, const Identifier &);
+    virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
+
+    virtual QVariant toVariant(Object *, bool *ok = 0);
+    QVariant toVariant(const QScriptValue &);
+private:
+    QDeclarativeEngine *engine;
+    int m_lastIndex;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEVALUETYPESCRIPTCLASS_P_H
+
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
new file mode 100644
index 0000000..d1140a6
--- /dev/null
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -0,0 +1,851 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativevme_p.h"
+
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativeboundsignal_p.h"
+#include "qdeclarativestringconverters_p.h"
+#include "qmetaobjectbuilder_p.h"
+#include "qdeclarativedeclarativedata_p.h"
+#include "qdeclarative.h"
+#include "qdeclarativecustomparser_p.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativecomponent.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativecomponent_p.h"
+#include "qdeclarativevmemetaobject_p.h"
+#include "qdeclarativebinding_p_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativecompiledbindings_p.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativescriptstring.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QStack>
+#include <QWidget>
+#include <QColor>
+#include <QPointF>
+#include <QSizeF>
+#include <QRectF>
+#include <QtCore/qdebug.h>
+#include <QtCore/qvarlengtharray.h>
+#include <QtCore/qcoreapplication.h>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeVME::QDeclarativeVME()
+{
+}
+
+#define VME_EXCEPTION(desc) \
+    { \
+        QDeclarativeError error; \
+        error.setDescription(desc.trimmed()); \
+        error.setLine(instr.line); \
+        error.setUrl(comp->url); \
+        vmeErrors << error; \
+        break; \
+    }
+
+struct ListInstance
+{
+    ListInstance() 
+        : type(0) {}
+    ListInstance(int t) 
+        : type(t) {}
+
+    int type;
+    QDeclarativeListProperty<void> qListProperty;
+};
+
+QObject *QDeclarativeVME::run(QDeclarativeContext *ctxt, QDeclarativeCompiledData *comp, 
+                     int start, int count, 
+                     const QBitField &bindingSkipList)
+{
+    QDeclarativeVMEStack<QObject *> stack;
+
+    if (start == -1) start = 0;
+    if (count == -1) count = comp->bytecode.count();
+
+    return run(stack, ctxt, comp, start, count, bindingSkipList);
+}
+
+void QDeclarativeVME::runDeferred(QObject *object)
+{
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object);
+
+    if (!data || !data->context || !data->deferredComponent)
+        return;
+
+    QDeclarativeContext *ctxt = data->context;
+    QDeclarativeCompiledData *comp = data->deferredComponent;
+    int start = data->deferredIdx + 1;
+    int count = data->deferredComponent->bytecode.at(data->deferredIdx).defer.deferCount;
+    QDeclarativeVMEStack<QObject *> stack;
+    stack.push(object);
+
+    run(stack, ctxt, comp, start, count, QBitField());
+}
+
+QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarativeContext *ctxt, 
+                     QDeclarativeCompiledData *comp, 
+                     int start, int count, 
+                     const QBitField &bindingSkipList)
+{
+    Q_ASSERT(comp);
+    Q_ASSERT(ctxt);
+    const QList<QDeclarativeCompiledData::TypeReference> &types = comp->types;
+    const QList<QString> &primitives = comp->primitives;
+    const QList<QByteArray> &datas = comp->datas;
+    const QList<QDeclarativeCompiledData::CustomTypeData> &customTypeData = comp->customTypeData;
+    const QList<int> &intData = comp->intData;
+    const QList<float> &floatData = comp->floatData;
+    const QList<QDeclarativePropertyCache *> &propertyCaches = comp->propertyCaches;
+    const QList<QDeclarativeParser::Object::ScriptBlock> &scripts = comp->scripts;
+    const QList<QUrl> &urls = comp->urls;
+
+    QDeclarativeEnginePrivate::SimpleList<QDeclarativeAbstractBinding> bindValues;
+    QDeclarativeEnginePrivate::SimpleList<QDeclarativeParserStatus> parserStatus;
+
+    QDeclarativeVMEStack<ListInstance> qliststack;
+
+    vmeErrors.clear();
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(ctxt->engine());
+    QDeclarativeContextPrivate *cp = (QDeclarativeContextPrivate *)QObjectPrivate::get(ctxt);
+
+    int status = -1;    //for dbus
+    QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::BypassInterceptor;
+
+    for (int ii = start; !isError() && ii < (start + count); ++ii) {
+        const QDeclarativeInstruction &instr = comp->bytecode.at(ii);
+
+        switch(instr.type) {
+        case QDeclarativeInstruction::Init:
+            {
+                if (instr.init.bindingsSize) 
+                    bindValues = QDeclarativeEnginePrivate::SimpleList<QDeclarativeAbstractBinding>(instr.init.bindingsSize);
+                if (instr.init.parserStatusSize)
+                    parserStatus = QDeclarativeEnginePrivate::SimpleList<QDeclarativeParserStatus>(instr.init.parserStatusSize);
+                if (instr.init.contextCache != -1) 
+                    cp->setIdPropertyData(comp->contextCaches.at(instr.init.contextCache));
+                if (instr.init.compiledBinding != -1) 
+                    cp->optimizedBindings = new QDeclarativeCompiledBindings(datas.at(instr.init.compiledBinding).constData(), ctxt);
+            }
+            break;
+
+        case QDeclarativeInstruction::CreateObject:
+            {
+                QBitField bindings;
+                if (instr.create.bindingBits != -1) {
+                    const QByteArray &bits = datas.at(instr.create.bindingBits);
+                    bindings = QBitField((const quint32*)bits.constData(),
+                                         bits.size() * 8);
+                }
+                if (stack.isEmpty())
+                    bindings = bindings.united(bindingSkipList);
+
+                QObject *o = 
+                    types.at(instr.create.type).createInstance(ctxt, bindings);
+                if (!o) {
+                    if(types.at(instr.create.type).component)
+                        vmeErrors << types.at(instr.create.type).component->errors();
+
+                    VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Unable to create object of type %1").arg(QString::fromLatin1(types.at(instr.create.type).className)));
+                }
+
+                QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(o);
+                Q_ASSERT(ddata);
+                ddata->outerContext = ctxt;
+                ddata->lineNumber = instr.line;
+                ddata->columnNumber = instr.create.column;
+
+                if (instr.create.data != -1) {
+                    QDeclarativeCustomParser *customParser =
+                        types.at(instr.create.type).type->customParser();
+                    customParser->setCustomData(o, datas.at(instr.create.data));
+                }
+                if (!stack.isEmpty()) {
+                    QObject *parent = stack.top();
+                    if (o->isWidgetType()) { 
+                        QWidget *widget = static_cast<QWidget*>(o); 
+                        if (parent->isWidgetType()) { 
+                            QWidget *parentWidget = static_cast<QWidget*>(parent); 
+                            widget->setParent(parentWidget); 
+                        } else { 
+                            // TODO: parent might be a layout 
+                        } 
+                    } else { 
+			    QDeclarativeGraphics_setParent_noEvent(o, parent);
+       //                 o->setParent(parent); 
+                    } 
+                }
+                stack.push(o);
+            }
+            break;
+
+        case QDeclarativeInstruction::SetId:
+            {
+                QObject *target = stack.top();
+                cp->setIdProperty(instr.setId.index, target);
+            }
+            break;
+
+
+        case QDeclarativeInstruction::SetDefault:
+            {
+                QObject *target = stack.top();
+                ctxt->addDefaultObject(target);
+            }
+            break;
+
+        case QDeclarativeInstruction::CreateComponent:
+            {
+                QObject *qcomp = new QDeclarativeComponent(ctxt->engine(), comp, ii + 1, instr.createComponent.count, stack.isEmpty() ? 0 : stack.top());
+
+                QDeclarativeEngine::setContextForObject(qcomp, ctxt);
+                QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(qcomp);
+                Q_ASSERT(ddata);
+                ddata->outerContext = ctxt;
+                ddata->lineNumber = instr.line;
+                ddata->columnNumber = instr.create.column;
+
+                stack.push(qcomp);
+                ii += instr.createComponent.count;
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreMetaObject:
+            {
+                QObject *target = stack.top();
+
+                QMetaObject mo;
+                const QByteArray &metadata = datas.at(instr.storeMeta.data);
+                QMetaObjectBuilder::fromRelocatableData(&mo, 0, metadata);
+
+                const QDeclarativeVMEMetaData *data = 
+                    (const QDeclarativeVMEMetaData *)datas.at(instr.storeMeta.aliasData).constData();
+
+                (void)new QDeclarativeVMEMetaObject(target, &mo, data, comp);
+
+                QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(target, true);
+                if (ddata->propertyCache) ddata->propertyCache->release();
+                ddata->propertyCache = propertyCaches.at(instr.storeMeta.propertyCache);
+                ddata->propertyCache->addref();
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreVariant:
+            {
+                QObject *target = stack.top();
+                // XXX - can be more efficient
+                QVariant v = QDeclarativeStringConverters::variantFromString(primitives.at(instr.storeString.value));
+                void *a[] = { &v, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeString.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreString:
+            {
+                QObject *target = stack.top();
+                void *a[] = { (void *)&primitives.at(instr.storeString.value), 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeString.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreUrl:
+            {
+                QObject *target = stack.top();
+                void *a[] = { (void *)&urls.at(instr.storeUrl.value), 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeUrl.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreFloat:
+            {
+                QObject *target = stack.top();
+                float f = instr.storeFloat.value;
+                void *a[] = { &f, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty,
+                                      instr.storeFloat.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreDouble:
+            {
+                QObject *target = stack.top();
+                double d = instr.storeDouble.value;
+                void *a[] = { &d, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty,
+                                      instr.storeDouble.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreBool:
+            {
+                QObject *target = stack.top();
+                void *a[] = { (void *)&instr.storeBool.value, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeBool.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreInteger:
+            {
+                QObject *target = stack.top();
+                void *a[] = { (void *)&instr.storeInteger.value, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeInteger.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreColor:
+            {
+                QObject *target = stack.top();
+                QColor c = QColor::fromRgba(instr.storeColor.value);
+                void *a[] = { &c, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeColor.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreDate:
+            {
+                QObject *target = stack.top();
+                QDate d = QDate::fromJulianDay(instr.storeDate.value);
+                void *a[] = { &d, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeDate.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreTime:
+            {
+                QObject *target = stack.top();
+                QTime t;
+                t.setHMS(intData.at(instr.storeTime.valueIndex),
+                         intData.at(instr.storeTime.valueIndex+1),
+                         intData.at(instr.storeTime.valueIndex+2),
+                         intData.at(instr.storeTime.valueIndex+3));
+                void *a[] = { &t, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeTime.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreDateTime:
+            {
+                QObject *target = stack.top();
+                QTime t;
+                t.setHMS(intData.at(instr.storeDateTime.valueIndex+1),
+                         intData.at(instr.storeDateTime.valueIndex+2),
+                         intData.at(instr.storeDateTime.valueIndex+3),
+                         intData.at(instr.storeDateTime.valueIndex+4));
+                QDateTime dt(QDate::fromJulianDay(intData.at(instr.storeDateTime.valueIndex)), t);
+                void *a[] = { &dt, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty,
+                                      instr.storeDateTime.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StorePoint:
+            {
+                QObject *target = stack.top();
+                QPoint p = QPointF(floatData.at(instr.storeRealPair.valueIndex),
+                                   floatData.at(instr.storeRealPair.valueIndex+1)).toPoint();
+                void *a[] = { &p, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeRealPair.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StorePointF:
+            {
+                QObject *target = stack.top();
+                QPointF p(floatData.at(instr.storeRealPair.valueIndex),
+                          floatData.at(instr.storeRealPair.valueIndex+1));
+                void *a[] = { &p, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeRealPair.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreSize:
+            {
+                QObject *target = stack.top();
+                QSize p = QSizeF(floatData.at(instr.storeRealPair.valueIndex),
+                                 floatData.at(instr.storeRealPair.valueIndex+1)).toSize();
+                void *a[] = { &p, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeRealPair.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreSizeF:
+            {
+                QObject *target = stack.top();
+                QSizeF s(floatData.at(instr.storeRealPair.valueIndex),
+                         floatData.at(instr.storeRealPair.valueIndex+1));
+                void *a[] = { &s, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeRealPair.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreRect:
+            {
+                QObject *target = stack.top();
+                QRect r = QRectF(floatData.at(instr.storeRect.valueIndex),
+                                 floatData.at(instr.storeRect.valueIndex+1),
+                                 floatData.at(instr.storeRect.valueIndex+2),
+                                 floatData.at(instr.storeRect.valueIndex+3)).toRect();
+                void *a[] = { &r, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeRect.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreRectF:
+            {
+                QObject *target = stack.top();
+                QRectF r(floatData.at(instr.storeRect.valueIndex),
+                         floatData.at(instr.storeRect.valueIndex+1),
+                         floatData.at(instr.storeRect.valueIndex+2),
+                         floatData.at(instr.storeRect.valueIndex+3));
+                void *a[] = { &r, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeRect.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreVector3D:
+            {
+                QObject *target = stack.top();
+                QVector3D p(floatData.at(instr.storeVector3D.valueIndex),
+                            floatData.at(instr.storeVector3D.valueIndex+1),
+                            floatData.at(instr.storeVector3D.valueIndex+2));
+                void *a[] = { &p, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeVector3D.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreObject:
+            {
+                QObject *assignObj = stack.pop();
+                QObject *target = stack.top();
+
+                void *a[] = { (void *)&assignObj, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeObject.propertyIndex, a);
+            }
+            break;
+
+
+        case QDeclarativeInstruction::AssignCustomType:
+            {
+                QObject *target = stack.top();
+                QDeclarativeCompiledData::CustomTypeData data = customTypeData.at(instr.assignCustomType.valueIndex);
+                const QString &primitive = primitives.at(data.index);
+                QDeclarativeMetaType::StringConverter converter = 
+                    QDeclarativeMetaType::customStringConverter(data.type);
+                QVariant v = (*converter)(primitive);
+
+                QMetaProperty prop = 
+                        target->metaObject()->property(instr.assignCustomType.propertyIndex);
+                if (v.isNull() || ((int)prop.type() != data.type && prop.userType() != data.type)) 
+                    VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Cannot assign value %1 to property %2").arg(primitive).arg(QString::fromUtf8(prop.name())));
+
+                void *a[] = { (void *)v.data(), 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.assignCustomType.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::AssignSignalObject:
+            {
+                // XXX optimize
+
+                QObject *assign = stack.pop();
+                QObject *target = stack.top();
+                int sigIdx = instr.assignSignalObject.signal;
+                const QByteArray &pr = datas.at(sigIdx);
+
+                QDeclarativeMetaProperty prop(target, QString::fromUtf8(pr));
+                if (prop.type() & QDeclarativeMetaProperty::SignalProperty) {
+
+                    QMetaMethod method = QDeclarativeMetaType::defaultMethod(assign);
+                    if (method.signature() == 0)
+                        VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Cannot assign object type %1 with no default method").arg(QString::fromLatin1(assign->metaObject()->className())));
+
+                    if (!QMetaObject::checkConnectArgs(prop.method().signature(), method.signature()))
+                        VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Cannot connect mismatched signal/slot %1 %vs. %2").arg(QString::fromLatin1(method.signature())).arg(QString::fromLatin1(prop.method().signature())));
+
+                    QMetaObject::connect(target, prop.coreIndex(), assign, method.methodIndex());
+
+                } else {
+                    VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Cannot assign an object to signal property %1").arg(QString::fromUtf8(pr)));
+                }
+
+
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreSignal:
+            {
+                QObject *target = stack.top();
+                // XXX scope
+                QMetaMethod signal = 
+                    target->metaObject()->method(instr.storeSignal.signalIndex);
+
+                QDeclarativeBoundSignal *bs = new QDeclarativeBoundSignal(target, signal, target);
+                QDeclarativeExpression *expr = 
+                    new QDeclarativeExpression(ctxt, primitives.at(instr.storeSignal.value), target);
+                expr->setSourceLocation(comp->name, instr.line);
+                bs->setExpression(expr);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreScript:
+            {
+                QObject *target = stack.top();
+                cp->addScript(scripts.at(instr.storeScript.value), target);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreScriptString:
+            {
+                QObject *target = stack.top();
+                QObject *scope = stack.at(stack.count() - 1 - instr.storeScriptString.scope);
+                QDeclarativeScriptString ss;
+                ss.setContext(ctxt);
+                ss.setScopeObject(scope);
+                ss.setScript(primitives.at(instr.storeScriptString.value));
+
+                void *a[] = { &ss, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeScriptString.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::BeginObject:
+            {
+                QObject *target = stack.top();
+                QDeclarativeParserStatus *status = reinterpret_cast<QDeclarativeParserStatus *>(reinterpret_cast<char *>(target) + instr.begin.castValue);
+                parserStatus.append(status);
+                status->d = &parserStatus.values[parserStatus.count - 1];
+
+                status->classBegin();
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreBinding:
+            {
+                QObject *target = 
+                    stack.at(stack.count() - 1 - instr.assignBinding.owner);
+                QObject *context = 
+                    stack.at(stack.count() - 1 - instr.assignBinding.context);
+
+                QDeclarativeMetaProperty mp = 
+                    QDeclarativeMetaPropertyPrivate::restore(datas.at(instr.assignBinding.property), target, ctxt);
+
+                int coreIndex = mp.coreIndex();
+
+                if (stack.count() == 1 && bindingSkipList.testBit(coreIndex))  
+                    break;
+
+                QDeclarativeBinding *bind = new QDeclarativeBinding((void *)datas.at(instr.assignBinding.value).constData(), comp, context, ctxt, comp->name, instr.line, 0);
+                bindValues.append(bind);
+                bind->m_mePtr = &bindValues.values[bindValues.count - 1];
+                bind->setTarget(mp);
+                bind->addToObject(target);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreCompiledBinding:
+            {
+                QObject *target = 
+                    stack.at(stack.count() - 1 - instr.assignBinding.owner);
+                QObject *scope = 
+                    stack.at(stack.count() - 1 - instr.assignBinding.context);
+
+                int property = instr.assignBinding.property;
+                if (stack.count() == 1 && bindingSkipList.testBit(property & 0xFFFF))  
+                    break;
+
+                QDeclarativeAbstractBinding *binding = 
+                    cp->optimizedBindings->configBinding(instr.assignBinding.value, target, scope, property);
+                bindValues.append(binding);
+                binding->m_mePtr = &bindValues.values[bindValues.count - 1];
+                binding->addToObject(target);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreValueSource:
+            {
+                QObject *obj = stack.pop();
+                QDeclarativePropertyValueSource *vs = reinterpret_cast<QDeclarativePropertyValueSource *>(reinterpret_cast<char *>(obj) + instr.assignValueSource.castValue);
+                QObject *target = stack.at(stack.count() - 1 - instr.assignValueSource.owner);
+
+                QDeclarativeMetaProperty prop = 
+                    QDeclarativeMetaPropertyPrivate::restore(datas.at(instr.assignValueSource.property), target, ctxt);
+                obj->setParent(target);
+                vs->setTarget(prop);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreValueInterceptor:
+            {
+                QObject *obj = stack.pop();
+                QDeclarativePropertyValueInterceptor *vi = reinterpret_cast<QDeclarativePropertyValueInterceptor *>(reinterpret_cast<char *>(obj) + instr.assignValueInterceptor.castValue);
+                QObject *target = stack.at(stack.count() - 1 - instr.assignValueInterceptor.owner);
+                QDeclarativeMetaProperty prop = 
+                    QDeclarativeMetaPropertyPrivate::restore(datas.at(instr.assignValueInterceptor.property), target, ctxt);
+                obj->setParent(target);
+                vi->setTarget(prop);
+                QDeclarativeVMEMetaObject *mo = static_cast<QDeclarativeVMEMetaObject *>((QMetaObject*)target->metaObject());
+                mo->registerInterceptor(prop.coreIndex(), prop.valueTypeCoreIndex(), vi);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreObjectQList:
+            {
+                QObject *assign = stack.pop();
+
+                const ListInstance &list = qliststack.top();
+                list.qListProperty.append((QDeclarativeListProperty<void>*)&list.qListProperty, assign);
+            }
+            break;
+
+        case QDeclarativeInstruction::AssignObjectList:
+            {
+                // This is only used for assigning interfaces
+                QObject *assign = stack.pop();
+                const ListInstance &list = qliststack.top();
+
+                int type = list.type;
+
+                void *ptr = 0;
+
+                const char *iid = QDeclarativeMetaType::interfaceIId(type);
+                if (iid) 
+                    ptr = assign->qt_metacast(iid);
+                if (!ptr) 
+                    VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Cannot assign object to list"));
+
+
+                list.qListProperty.append((QDeclarativeListProperty<void>*)&list.qListProperty, ptr);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreVariantObject:
+            {
+                QObject *assign = stack.pop();
+                QObject *target = stack.top();
+
+                QVariant v = QVariant::fromValue(assign);
+                void *a[] = { &v, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeObject.propertyIndex, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::StoreInterface:
+            {
+                QObject *assign = stack.pop();
+                QObject *target = stack.top();
+
+                int coreIdx = instr.storeObject.propertyIndex;
+                QMetaProperty prop = target->metaObject()->property(coreIdx);
+                int t = prop.userType();
+                const char *iid = QDeclarativeMetaType::interfaceIId(t);
+                bool ok = false;
+                if (iid) {
+                    void *ptr = assign->qt_metacast(iid);
+                    if (ptr) {
+                        void *a[] = { &ptr, 0, &status, &flags };
+                        QMetaObject::metacall(target, 
+                                              QMetaObject::WriteProperty,
+                                              coreIdx, a);
+                        ok = true;
+                    }
+                } 
+
+                if (!ok) 
+                    VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Cannot assign object to interface property"));
+            }
+            break;
+            
+        case QDeclarativeInstruction::FetchAttached:
+            {
+                QObject *target = stack.top();
+
+                QObject *qmlObject = qmlAttachedPropertiesObjectById(instr.fetchAttached.id, target);
+
+                if (!qmlObject)
+                    VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Unable to create attached object"));
+
+                stack.push(qmlObject);
+            }
+            break;
+
+        case QDeclarativeInstruction::FetchQList:
+            {
+                QObject *target = stack.top();
+
+                qliststack.push(ListInstance(instr.fetchQmlList.type));
+
+                void *a[1];
+                a[0] = (void *)&(qliststack.top().qListProperty);
+                QMetaObject::metacall(target, QMetaObject::ReadProperty, 
+                                      instr.fetchQmlList.property, a);
+            }
+            break;
+
+        case QDeclarativeInstruction::FetchObject:
+            {
+                QObject *target = stack.top();
+
+                QObject *obj = 0;
+                // NOTE: This assumes a cast to QObject does not alter the 
+                // object pointer
+                void *a[1];
+                a[0] = &obj;
+                QMetaObject::metacall(target, QMetaObject::ReadProperty, 
+                                      instr.fetch.property, a);
+
+                if (!obj)
+                    VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Cannot set properties on %1 as it is null").arg(QString::fromUtf8(target->metaObject()->property(instr.fetch.property).name())));
+
+                stack.push(obj);
+            }
+            break;
+
+        case QDeclarativeInstruction::PopQList:
+            {
+                qliststack.pop();
+            }
+            break;
+
+        case QDeclarativeInstruction::Defer:
+            {
+                if (instr.defer.deferCount) {
+                    QObject *target = stack.top();
+                    QDeclarativeDeclarativeData *data = 
+                        QDeclarativeDeclarativeData::get(target, true);
+                    comp->addref();
+                    data->deferredComponent = comp;
+                    data->deferredIdx = ii;
+                    ii += instr.defer.deferCount;
+                }
+            }
+            break;
+
+        case QDeclarativeInstruction::PopFetchedObject:
+            {
+                stack.pop();
+            }
+            break;
+
+        case QDeclarativeInstruction::FetchValueType:
+            {
+                QObject *target = stack.top();
+                QDeclarativeValueType *valueHandler = 
+                    ep->valueTypes[instr.fetchValue.type];
+                valueHandler->read(target, instr.fetchValue.property);
+                stack.push(valueHandler);
+            }
+            break;
+
+        case QDeclarativeInstruction::PopValueType:
+            {
+                QDeclarativeValueType *valueHandler = 
+                    static_cast<QDeclarativeValueType *>(stack.pop());
+                QObject *target = stack.top();
+                valueHandler->write(target, instr.fetchValue.property, QDeclarativeMetaProperty::BypassInterceptor);
+            }
+            break;
+
+        default:
+            qFatal("QDeclarativeCompiledData: Internal error - unknown instruction %d", instr.type);
+            break;
+        }
+    }
+
+    if (isError()) {
+        if (!stack.isEmpty()) {
+            delete stack.at(0);
+        }
+
+        QDeclarativeEnginePrivate::clear(bindValues);
+        QDeclarativeEnginePrivate::clear(parserStatus);
+        return 0;
+    }
+
+    if (bindValues.count)
+        ep->bindValues << bindValues;
+    if (parserStatus.count)
+        ep->parserStatus << parserStatus;
+
+    if (stack.isEmpty())
+        return 0;
+    else
+        return stack.top();
+    return 0;
+}
+
+bool QDeclarativeVME::isError() const
+{
+    return !vmeErrors.isEmpty();
+}
+
+QList<QDeclarativeError> QDeclarativeVME::errors() const
+{
+    return vmeErrors;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h
new file mode 100644
index 0000000..951f6a7
--- /dev/null
+++ b/src/declarative/qml/qdeclarativevme_p.h
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEVME_P_H
+#define QDECLARATIVEVME_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeerror.h"
+#include "qbitfield_p.h"
+
+#include <QtCore/QString>
+#include <QtCore/QStack>
+
+QT_BEGIN_NAMESPACE
+
+class QObject;
+class QDeclarativeInstruction;
+class QDeclarativeCompiledData;
+class QDeclarativeCompiledData;
+class QDeclarativeContext;
+
+template<typename T, int N = 128>
+class QDeclarativeVMEStack {
+public:
+    QDeclarativeVMEStack() : index(-1), maxSize(N), data(fixedData) {}
+    ~QDeclarativeVMEStack() { if (data != fixedData) qFree(fixedData); }
+
+    bool isEmpty() const { return index == -1; }
+    const T &top() const { return data[index]; }
+    void push(const T &i) { ++index; if (index == maxSize) realloc(); data[index] = i; }
+    const T &pop() { --index; return data[index + 1]; }
+    int count() const { return index + 1; }
+    const T &at(int idx) { return data[idx]; }
+
+private:
+    void realloc() {
+        maxSize += N;
+        if (data != fixedData) {
+            data = (T*)qRealloc(data, maxSize * sizeof(T));
+        } else {
+            data = (T*)qMalloc(maxSize * sizeof(T));
+        }
+    }
+    int index;
+    int maxSize;
+    T *data;
+    T fixedData[N];
+};
+
+class QDeclarativeVME
+{
+public:
+    QDeclarativeVME();
+
+    QObject *run(QDeclarativeContext *, QDeclarativeCompiledData *, 
+                 int start = -1, int count = -1, 
+                 const QBitField & = QBitField());
+    void runDeferred(QObject *);
+
+    bool isError() const;
+    QList<QDeclarativeError> errors() const;
+
+private:
+    QObject *run(QDeclarativeVMEStack<QObject *> &, QDeclarativeContext *, QDeclarativeCompiledData *, 
+                 int start, int count, const QBitField &);
+    QList<QDeclarativeError> vmeErrors;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEVME_P_H
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
new file mode 100644
index 0000000..6811e13
--- /dev/null
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -0,0 +1,366 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativevmemetaobject_p.h"
+
+#include "qdeclarative.h"
+#include "qdeclarativerefcount_p.h"
+#include "qdeclarativeexpression.h"
+#include "qdeclarativeexpression_p.h"
+#include "qdeclarativecontext_p.h"
+
+#include <QColor>
+#include <QDate>
+#include <QtCore/qlist.h>
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeVMEMetaObject::QDeclarativeVMEMetaObject(QObject *obj,
+                                   const QMetaObject *other, 
+                                   const QDeclarativeVMEMetaData *meta,
+                                   QDeclarativeCompiledData *cdata)
+: object(obj), compiledData(cdata), ctxt(qmlContext(obj)), metaData(meta), methods(0),
+  parent(0)
+{
+    compiledData->addref();
+
+    *static_cast<QMetaObject *>(this) = *other;
+    this->d.superdata = obj->metaObject();
+
+    QObjectPrivate *op = QObjectPrivate::get(obj);
+    if (op->metaObject)
+        parent = static_cast<QAbstractDynamicMetaObject*>(op->metaObject);
+    op->metaObject = this;
+
+    propOffset = QAbstractDynamicMetaObject::propertyOffset();
+    methodOffset = QAbstractDynamicMetaObject::methodOffset();
+
+    data = new QVariant[metaData->propertyCount];
+    aConnected.resize(metaData->aliasCount);
+
+    int list_type = qMetaTypeId<QDeclarativeListProperty<QObject> >();
+    // ### Optimize
+    for (int ii = 0; ii < metaData->propertyCount; ++ii) {
+        int t = (metaData->propertyData() + ii)->propertyType;
+        if (t == list_type) {
+            listProperties.append(new List(methodOffset + ii));
+            data[ii] = QVariant::fromValue(QDeclarativeListProperty<QObject>(obj, listProperties.last(), list_append,
+                                                                    list_count, list_at, list_clear));
+        } else if (t != -1) {
+            data[ii] = QVariant((QVariant::Type)t);
+        }
+    }
+}
+
+QDeclarativeVMEMetaObject::~QDeclarativeVMEMetaObject()
+{
+    compiledData->release();
+    delete parent;
+    qDeleteAll(listProperties);
+    delete [] data;
+    delete [] methods;
+}
+
+int QDeclarativeVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a)
+{
+    int id = _id;
+    if(c == QMetaObject::WriteProperty) {
+        int flags = *reinterpret_cast<int*>(a[3]);
+        if (!(flags & QDeclarativeMetaProperty::BypassInterceptor)
+            && !aInterceptors.isEmpty()
+            && aInterceptors.testBit(id)) {
+            QPair<int, QDeclarativePropertyValueInterceptor*> pair = interceptors.value(id);
+            int valueIndex = pair.first;
+            QDeclarativePropertyValueInterceptor *vi = pair.second;
+            int type = property(id).userType();
+
+            if (type != QVariant::Invalid) {
+                if (valueIndex != -1) {
+                    QDeclarativeEnginePrivate *ep = ctxt?QDeclarativeEnginePrivate::get(ctxt->engine()):0;
+                    QDeclarativeValueType *valueType = 0;
+                    if (ep) valueType = ep->valueTypes[type];
+                    else valueType = QDeclarativeValueTypeFactory::valueType(type);
+                    Q_ASSERT(valueType);
+
+                    valueType->setValue(QVariant(type, a[0]));
+                    QMetaProperty valueProp = valueType->metaObject()->property(valueIndex);
+                    vi->write(valueProp.read(valueType));
+
+                    if (!ep) delete valueType;
+                    return -1;
+                } else {
+                    vi->write(QVariant(type, a[0]));
+                    return -1;
+                }
+            }
+        }
+    }
+    if(c == QMetaObject::ReadProperty || c == QMetaObject::WriteProperty) {
+        if (id >= propOffset) {
+            id -= propOffset;
+
+            if (id < metaData->propertyCount) {
+                int t = (metaData->propertyData() + id)->propertyType;
+                bool needActivate = false;
+
+                if (t == -1) {
+
+                    if (c == QMetaObject::ReadProperty) {
+                        *reinterpret_cast<QVariant *>(a[0]) = data[id];
+                    } else if (c == QMetaObject::WriteProperty) {
+                        needActivate = 
+                            (data[id] != *reinterpret_cast<QVariant *>(a[0]));
+                        data[id] = *reinterpret_cast<QVariant *>(a[0]);
+                    }
+
+                } else {
+
+                    if (c == QMetaObject::ReadProperty) {
+                        switch(t) {
+                        case QVariant::Int:
+                            *reinterpret_cast<int *>(a[0]) = data[id].toInt();
+                            break;
+                        case QVariant::Bool:
+                            *reinterpret_cast<bool *>(a[0]) = data[id].toBool();
+                            break;
+                        case QVariant::Double:
+                            *reinterpret_cast<double *>(a[0]) = data[id].toDouble();
+                            break;
+                        case QVariant::String:
+                            *reinterpret_cast<QString *>(a[0]) = data[id].toString();
+                            break;
+                        case QVariant::Url:
+                            *reinterpret_cast<QUrl *>(a[0]) = data[id].toUrl();
+                            break;
+                        case QVariant::Color:
+                            *reinterpret_cast<QColor *>(a[0]) = data[id].value<QColor>();
+                            break;
+                        case QVariant::Date:
+                            *reinterpret_cast<QDate *>(a[0]) = data[id].toDate();
+                            break;
+                        case QMetaType::QObjectStar:
+                            *reinterpret_cast<QObject **>(a[0]) = data[id].value<QObject*>();
+                            break;
+                        default:
+                            break;
+                        }
+                        if (t == qMetaTypeId<QDeclarativeListProperty<QObject> >()) {
+                            *reinterpret_cast<QDeclarativeListProperty<QObject> *>(a[0]) = 
+                                data[id].value<QDeclarativeListProperty<QObject> >();
+                        }
+
+                    } else if (c == QMetaObject::WriteProperty) {
+
+                        QVariant value = QVariant((QVariant::Type)data[id].type(), a[0]); 
+                        needActivate = (data[id] != value);
+                        data[id] = value;
+                    }
+
+                }
+
+                if (c == QMetaObject::WriteProperty && needActivate) {
+                    activate(object, methodOffset + id, 0);
+                }
+
+                return -1;
+            }
+
+            id -= metaData->propertyCount;
+
+            if (id < metaData->aliasCount) {
+
+                QDeclarativeVMEMetaData::AliasData *d = metaData->aliasData() + id;
+
+                if (d->flags & QML_ALIAS_FLAG_PTR && c == QMetaObject::ReadProperty) 
+                        *reinterpret_cast<void **>(a[0]) = 0;
+
+                if (!ctxt) return -1;
+                QDeclarativeContextPrivate *ctxtPriv = 
+                    (QDeclarativeContextPrivate *)QObjectPrivate::get(ctxt);
+
+                QObject *target = ctxtPriv->idValues[d->contextIdx].data();
+                if (!target) 
+                    return -1;
+
+                if (c == QMetaObject::ReadProperty && !aConnected.testBit(id)) {
+                    int sigIdx = methodOffset + id + metaData->propertyCount;
+                    QMetaObject::connect(ctxt, d->contextIdx + ctxtPriv->notifyIndex, object, sigIdx);
+
+                    if (d->propertyIdx != -1) {
+                        QMetaProperty prop = 
+                            target->metaObject()->property(d->propertyIdx);
+                        if (prop.hasNotifySignal())
+                            QMetaObject::connect(target, prop.notifySignalIndex(), 
+                                                 object, sigIdx);
+                    }
+                    aConnected.setBit(id);
+                }
+
+                if (d->propertyIdx == -1) {
+                    *reinterpret_cast<QObject **>(a[0]) = target;
+                    return -1;
+                } else {
+                    return QMetaObject::metacall(target, c, d->propertyIdx, a);
+                }
+
+            }
+            return -1;
+
+        }
+
+    } else if(c == QMetaObject::InvokeMetaMethod) {
+
+        if (id >= methodOffset) {
+
+            id -= methodOffset;
+            int plainSignals = metaData->signalCount + metaData->propertyCount +
+                               metaData->aliasCount;
+            if (id < plainSignals) {
+                QMetaObject::activate(object, _id, a);
+                return -1;
+            }
+
+            id -= plainSignals;
+
+            if (id < metaData->methodCount) {
+                if (!ctxt->engine())
+                    return -1; // We can't run the method
+
+                QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(ctxt->engine());
+
+                QScriptValue function = method(id);
+
+                QScriptValueList args;
+                QDeclarativeVMEMetaData::MethodData *data = metaData->methodData() + id;
+                if (data->parameterCount) {
+                    for (int ii = 0; ii < data->parameterCount; ++ii) {
+                        args << ep->scriptValueFromVariant(*(QVariant *)a[ii + 1]);
+                    }
+                }
+                QScriptValue rv = function.call(ep->objectClass->newQObject(object), args);
+
+                if (a[0]) *reinterpret_cast<QVariant *>(a[0]) = ep->scriptValueToVariant(rv);
+
+                return -1;
+            }
+            return -1;
+        }
+    }
+
+    if (parent)
+        return parent->metaCall(c, _id, a);
+    else
+        return object->qt_metacall(c, _id, a);
+}
+
+QScriptValue QDeclarativeVMEMetaObject::method(int index)
+{
+    if (!methods) 
+        methods = new QScriptValue[metaData->methodCount];
+
+    if (!methods[index].isValid()) {
+        QDeclarativeVMEMetaData::MethodData *data = metaData->methodData() + index;
+
+        const QChar *body = 
+            (const QChar *)(((const char*)metaData) + data->bodyOffset);
+
+        QString code = QString::fromRawData(body, data->bodyLength);
+
+        // XXX Use QScriptProgram
+        // XXX We should evaluate all methods in a single big script block to 
+        // improve the call time between dynamic methods defined on the same
+        // object
+        methods[index] = QDeclarativeExpressionPrivate::evalInObjectScope(ctxt, object, code);
+    }
+
+    return methods[index];
+}
+
+void QDeclarativeVMEMetaObject::listChanged(int id)
+{
+    activate(object, methodOffset + id, 0);
+}
+
+void QDeclarativeVMEMetaObject::list_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+{
+    List *list = static_cast<List *>(prop->data);
+    list->append(o);
+    QMetaObject::activate(prop->object, list->notifyIndex, 0);
+}
+
+int QDeclarativeVMEMetaObject::list_count(QDeclarativeListProperty<QObject> *prop)
+{
+    return static_cast<List *>(prop->data)->count();
+}
+
+QObject *QDeclarativeVMEMetaObject::list_at(QDeclarativeListProperty<QObject> *prop, int index)
+{
+    return static_cast<List *>(prop->data)->at(index);
+}
+
+void QDeclarativeVMEMetaObject::list_clear(QDeclarativeListProperty<QObject> *prop)
+{
+    List *list = static_cast<List *>(prop->data);
+    list->clear();
+    QMetaObject::activate(prop->object, list->notifyIndex, 0);
+}
+
+void QDeclarativeVMEMetaObject::registerInterceptor(int index, int valueIndex, QDeclarativePropertyValueInterceptor *interceptor)
+{
+    if (aInterceptors.isEmpty())
+        aInterceptors.resize(propertyCount() + metaData->propertyCount);
+    aInterceptors.setBit(index);
+    interceptors.insert(index, qMakePair(valueIndex, interceptor));
+}
+
+QScriptValue QDeclarativeVMEMetaObject::vmeMethod(int index)
+{
+    if (index < methodOffset) {
+        Q_ASSERT(parent);
+        return static_cast<QDeclarativeVMEMetaObject *>(parent)->vmeMethod(index);
+    }
+    int plainSignals = metaData->signalCount + metaData->propertyCount + metaData->aliasCount;
+    Q_ASSERT(index >= (methodOffset + plainSignals) && index < (methodOffset + plainSignals + metaData->methodCount));
+    return method(index - methodOffset - plainSignals);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h
new file mode 100644
index 0000000..37c0b7a
--- /dev/null
+++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEVMEMETAOBJECT_P_H
+#define QDECLARATIVEVMEMETAOBJECT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarative.h"
+
+#include <QtCore/QMetaObject>
+#include <QtCore/QBitArray>
+#include <QtCore/QPair>
+
+#include <private/qobject_p.h>
+
+#include "qdeclarativeguard_p.h"
+#include "qdeclarativecompiler_p.h"
+
+QT_BEGIN_NAMESPACE
+
+#define QML_ALIAS_FLAG_PTR 0x00000001
+
+struct QDeclarativeVMEMetaData
+{
+    short propertyCount;
+    short aliasCount;
+    short signalCount;
+    short methodCount;
+
+    struct AliasData {
+        int contextIdx;
+        int propertyIdx;
+        int flags;
+    };
+    
+    struct PropertyData {
+        int propertyType;
+    };
+
+    struct MethodData {
+        int parameterCount;
+        int bodyOffset;
+        int bodyLength;
+        int scriptProgram;
+    };
+
+    PropertyData *propertyData() const {
+        return (PropertyData *)(((const char *)this) + sizeof(QDeclarativeVMEMetaData));
+    }
+
+    AliasData *aliasData() const {
+        return (AliasData *)(propertyData() + propertyCount);
+    }
+
+    MethodData *methodData() const {
+        return (MethodData *)(aliasData() + aliasCount);
+    }
+};
+
+class QDeclarativeRefCount;
+class QDeclarativeVMEMetaObject : public QAbstractDynamicMetaObject
+{
+public:
+    QDeclarativeVMEMetaObject(QObject *obj, const QMetaObject *other, const QDeclarativeVMEMetaData *data,
+                     QDeclarativeCompiledData *compiledData);
+    ~QDeclarativeVMEMetaObject();
+
+    void registerInterceptor(int index, int valueIndex, QDeclarativePropertyValueInterceptor *interceptor);
+    QScriptValue vmeMethod(int index);
+protected:
+    virtual int metaCall(QMetaObject::Call _c, int _id, void **_a);
+
+private:
+    QObject *object;
+    QDeclarativeCompiledData *compiledData;
+    QDeclarativeGuard<QDeclarativeContext> ctxt;
+
+    const QDeclarativeVMEMetaData *metaData;
+    int propOffset;
+    int methodOffset;
+
+    QVariant *data;
+    QBitArray aConnected;
+    QBitArray aInterceptors;
+    QHash<int, QPair<int, QDeclarativePropertyValueInterceptor*> > interceptors;
+
+    QScriptValue *methods;
+    QScriptValue method(int);
+
+    QAbstractDynamicMetaObject *parent;
+
+    void listChanged(int);
+    class List : public QList<QObject*>
+    {
+    public:
+        List(int lpi) : notifyIndex(lpi) {}
+        int notifyIndex;
+    };
+    QList<List *> listProperties;
+
+    static void list_append(QDeclarativeListProperty<QObject> *, QObject *);
+    static int list_count(QDeclarativeListProperty<QObject> *);
+    static QObject *list_at(QDeclarativeListProperty<QObject> *, int);
+    static void list_clear(QDeclarativeListProperty<QObject> *);
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEVMEMETAOBJECT_P_H
diff --git a/src/declarative/qml/qdeclarativewatcher.cpp b/src/declarative/qml/qdeclarativewatcher.cpp
new file mode 100644
index 0000000..2f61195
--- /dev/null
+++ b/src/declarative/qml/qdeclarativewatcher.cpp
@@ -0,0 +1,186 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativewatcher_p.h"
+
+#include "qdeclarativeexpression.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarative.h"
+
+#include <qdeclarativedebugservice_p.h>
+
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+
+class QDeclarativeWatchProxy : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeWatchProxy(int id,
+                  QObject *object,
+                  int debugId,
+                  const QMetaProperty &prop,
+                  QDeclarativeWatcher *parent = 0);
+
+    QDeclarativeWatchProxy(int id,
+                  QDeclarativeExpression *exp,
+                  int debugId,
+                  QDeclarativeWatcher *parent = 0);
+
+public slots:
+    void notifyValueChanged();
+
+private:
+    friend class QDeclarativeWatcher;
+    int m_id;
+    QDeclarativeWatcher *m_watch;
+    QObject *m_object;
+    int m_debugId;
+    QMetaProperty m_property;
+
+    QDeclarativeExpression *m_expr;
+};
+
+QDeclarativeWatchProxy::QDeclarativeWatchProxy(int id,
+                             QDeclarativeExpression *exp,
+                             int debugId,
+                             QDeclarativeWatcher *parent)
+: QObject(parent), m_id(id), m_watch(parent), m_object(0), m_debugId(debugId), m_expr(exp)
+{
+    QObject::connect(m_expr, SIGNAL(valueChanged()), this, SLOT(notifyValueChanged()));
+}
+
+QDeclarativeWatchProxy::QDeclarativeWatchProxy(int id,
+                             QObject *object,
+                             int debugId,
+                             const QMetaProperty &prop,
+                             QDeclarativeWatcher *parent)
+: QObject(parent), m_id(id), m_watch(parent), m_object(object), m_debugId(debugId), m_property(prop), m_expr(0)
+{
+    static int refreshIdx = -1;
+    if(refreshIdx == -1)
+        refreshIdx = QDeclarativeWatchProxy::staticMetaObject.indexOfMethod("notifyValueChanged()");
+
+    if (prop.hasNotifySignal())
+        QMetaObject::connect(m_object, prop.notifySignalIndex(), this, refreshIdx);
+}
+
+void QDeclarativeWatchProxy::notifyValueChanged()
+{
+    QVariant v;
+    if (m_expr)
+        v = m_expr->value();
+    else
+        v = m_property.read(m_object);
+
+    emit m_watch->propertyChanged(m_id, m_debugId, m_property, v);
+}
+
+
+QDeclarativeWatcher::QDeclarativeWatcher(QObject *parent)
+    : QObject(parent)
+{
+}
+
+bool QDeclarativeWatcher::addWatch(int id, quint32 debugId)
+{
+    QObject *object = QDeclarativeDebugService::objectForId(debugId);
+    if (object) {
+        int propCount = object->metaObject()->propertyCount();
+        for (int ii=0; ii<propCount; ii++)
+            addPropertyWatch(id, object, debugId, object->metaObject()->property(ii));
+        return true;
+    }
+    return false;
+}
+
+bool QDeclarativeWatcher::addWatch(int id, quint32 debugId, const QByteArray &property)
+{
+    QObject *object = QDeclarativeDebugService::objectForId(debugId);
+    if (object) {
+        int index = object->metaObject()->indexOfProperty(property.constData());
+        if (index >= 0) {
+            addPropertyWatch(id, object, debugId, object->metaObject()->property(index));
+            return true;
+        }
+    }
+    return false;
+}
+
+bool QDeclarativeWatcher::addWatch(int id, quint32 objectId, const QString &expr)
+{
+    QObject *object = QDeclarativeDebugService::objectForId(objectId);
+    QDeclarativeContext *context = qmlContext(object);
+    if (context) {
+        QDeclarativeExpression *exprObj = new QDeclarativeExpression(context, expr, object);
+        exprObj->setNotifyOnValueChanged(true);
+        QDeclarativeWatchProxy *proxy = new QDeclarativeWatchProxy(id, exprObj, objectId, this);
+        exprObj->setParent(proxy);
+        m_proxies[id].append(proxy);
+        proxy->notifyValueChanged();
+        return true;
+    }
+    return false;
+}
+
+void QDeclarativeWatcher::removeWatch(int id)
+{
+    if (!m_proxies.contains(id))
+        return;
+
+    QList<QPointer<QDeclarativeWatchProxy> > proxies = m_proxies.take(id);
+    qDeleteAll(proxies);
+}
+
+void QDeclarativeWatcher::addPropertyWatch(int id, QObject *object, quint32 debugId, const QMetaProperty &property)
+{
+    QDeclarativeWatchProxy *proxy = new QDeclarativeWatchProxy(id, object, debugId, property, this);
+    m_proxies[id].append(proxy);
+
+    proxy->notifyValueChanged();
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativewatcher.moc>
diff --git a/src/declarative/qml/qdeclarativewatcher_p.h b/src/declarative/qml/qdeclarativewatcher_p.h
new file mode 100644
index 0000000..4e3352f
--- /dev/null
+++ b/src/declarative/qml/qdeclarativewatcher_p.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEWATCHER_P_H
+#define QDECLARATIVEWATCHER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qobject.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qset.h>
+#include <QtCore/qpointer.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeWatchProxy;
+class QDeclarativeExpression;
+class QDeclarativeContext;
+class QMetaProperty;
+
+class QDeclarativeWatcher : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeWatcher(QObject * = 0);
+
+    bool addWatch(int id, quint32 objectId);
+    bool addWatch(int id, quint32 objectId, const QByteArray &property);
+    bool addWatch(int id, quint32 objectId, const QString &expr);
+
+    void removeWatch(int id);
+
+Q_SIGNALS:
+    void propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value);
+
+private:
+    friend class QDeclarativeWatchProxy;
+    void addPropertyWatch(int id, QObject *object, quint32 objectId, const QMetaProperty &property);
+
+    QHash<int, QList<QPointer<QDeclarativeWatchProxy> > > m_proxies;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEWATCHER_P_H
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
new file mode 100644
index 0000000..03151e4
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -0,0 +1,1041 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeworkerscript_p.h"
+
+#include "qdeclarativeengine_p.h"
+
+#include <QtCore/qcoreevent.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdebug.h>
+#include <QtScript/qscriptengine.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qwaitcondition.h>
+#include <QtScript/qscriptvalueiterator.h>
+#include <QtCore/qfile.h>
+#include <QtNetwork/qnetworkaccessmanager.h>
+#include <QtDeclarative/qdeclarativeinfo.h>
+#include "qdeclarativenetworkaccessmanagerfactory.h"
+
+
+QT_BEGIN_NAMESPACE
+
+class WorkerDataEvent : public QEvent
+{
+public:
+    enum Type { WorkerData = QEvent::User };
+
+    WorkerDataEvent(int workerId, const QVariant &data);
+    virtual ~WorkerDataEvent();
+
+    int workerId() const;
+    QVariant data() const;
+
+private:
+    int m_id;
+    QVariant m_data;
+};
+
+class WorkerLoadEvent : public QEvent
+{
+public:
+    enum Type { WorkerLoad = WorkerDataEvent::WorkerData + 1 };
+
+    WorkerLoadEvent(int workerId, const QUrl &url);
+
+    int workerId() const;
+    QUrl url() const;
+
+private:
+    int m_id;
+    QUrl m_url;
+};
+
+class WorkerRemoveEvent : public QEvent
+{
+public:
+    enum Type { WorkerRemove = WorkerLoadEvent::WorkerLoad + 1 };
+
+    WorkerRemoveEvent(int workerId);
+
+    int workerId() const;
+
+private:
+    int m_id;
+};
+
+class QDeclarativeWorkerScriptEnginePrivate : public QObject
+{
+public:
+    QDeclarativeWorkerScriptEnginePrivate(QDeclarativeEngine *eng);
+
+    struct ScriptEngine : public QDeclarativeScriptEngine 
+    {
+        ScriptEngine(QDeclarativeWorkerScriptEnginePrivate *parent) : QDeclarativeScriptEngine(0), p(parent), accessManager(0) {}
+        ~ScriptEngine() { delete accessManager; }
+        QDeclarativeWorkerScriptEnginePrivate *p;
+        QNetworkAccessManager *accessManager;
+
+        virtual QNetworkAccessManager *networkAccessManager() { 
+            if (!accessManager) {
+                if (p->qmlengine && p->qmlengine->networkAccessManagerFactory()) {
+                    accessManager = p->qmlengine->networkAccessManagerFactory()->create(this);
+                } else {
+                    accessManager = new QNetworkAccessManager(this);
+                }
+            }
+            return accessManager;
+        }
+    };
+    ScriptEngine *workerEngine;
+    static QDeclarativeWorkerScriptEnginePrivate *get(QScriptEngine *e) {
+        return static_cast<ScriptEngine *>(e)->p;
+    }
+
+    QDeclarativeEngine *qmlengine;
+
+    QMutex m_lock;
+    QWaitCondition m_wait;
+
+    struct WorkerScript {
+        WorkerScript();
+
+        int id;
+        bool initialized;
+        QDeclarativeWorkerScript *owner;
+        QScriptValue object;
+
+        QScriptValue callback;
+    };
+
+    QHash<int, WorkerScript *> workers;
+    QScriptValue getWorker(int);
+
+    int m_nextId;
+
+    static QVariant scriptValueToVariant(const QScriptValue &);
+    static QScriptValue variantToScriptValue(const QVariant &, QScriptEngine *);
+
+    static QScriptValue onMessage(QScriptContext *ctxt, QScriptEngine *engine);
+    static QScriptValue sendMessage(QScriptContext *ctxt, QScriptEngine *engine);
+
+protected:
+    virtual bool event(QEvent *);
+
+private:
+    void processMessage(int, const QVariant &);
+    void processLoad(int, const QUrl &);
+};
+
+// Currently this will leak as no-one releases it in the worker thread 
+class QDeclarativeWorkerListModelAgent : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ count)
+
+public:
+    QDeclarativeWorkerListModelAgent(QDeclarativeWorkerListModel *);
+    ~QDeclarativeWorkerListModelAgent();
+
+    void addref();
+    void release();
+
+    int count() const;
+
+    Q_INVOKABLE void clear();
+    Q_INVOKABLE void remove(int index);
+    Q_INVOKABLE void append(const QScriptValue &);
+    Q_INVOKABLE void insert(int index, const QScriptValue&);
+    Q_INVOKABLE QScriptValue get(int index) const;
+    Q_INVOKABLE void set(int index, const QScriptValue &);
+    Q_INVOKABLE void sync();
+
+    struct VariantRef
+    {
+        VariantRef() : a(0) {}
+        VariantRef(const VariantRef &r) : a(r.a) { if (a) a->addref(); }
+        VariantRef(QDeclarativeWorkerListModelAgent *_a) : a(_a) { if (a) a->addref(); }
+        ~VariantRef() { if (a) a->release(); }
+
+        VariantRef &operator=(const VariantRef &o) { 
+            if (o.a) o.a->addref(); 
+            if (a) a->release(); a = o.a; 
+            return *this; 
+        }
+
+        QDeclarativeWorkerListModelAgent *a;
+    };
+protected:
+    virtual bool event(QEvent *);
+
+private:
+    friend class QDeclarativeWorkerScriptEnginePrivate;
+    friend class QDeclarativeWorkerListModel;
+    QScriptEngine *m_engine;
+
+    struct Change {
+        enum { Inserted, Removed, Moved, Changed } type;
+        int index; // Inserted/Removed/Moved/Changed
+        int count; // Inserted/Removed/Moved/Changed
+        int to;    // Moved
+    };
+
+    struct Data {
+        QHash<int, QString> roles;
+        QHash<QString, int> strings;
+        QList<QHash<int, QVariant> > values;
+        QList<Change> changes;
+
+        void clearChange();
+        void insertChange(int index, int count);
+        void removeChange(int index, int count);
+        void changedChange(int index, int count);
+    };
+    Data data;
+
+    struct Sync : public QEvent {
+        Sync() : QEvent(QEvent::User) {}
+        Data data;
+    };
+
+    QAtomicInt m_ref;
+    QDeclarativeWorkerListModel *m_model;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDeclarativeWorkerListModelAgent::VariantRef);
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeWorkerScriptEnginePrivate::QDeclarativeWorkerScriptEnginePrivate(QDeclarativeEngine *engine)
+: workerEngine(0), qmlengine(engine), m_nextId(0)
+{
+}
+
+QScriptValue QDeclarativeWorkerScriptEnginePrivate::onMessage(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    QDeclarativeWorkerScriptEnginePrivate *p = QDeclarativeWorkerScriptEnginePrivate::get(engine);
+
+    int id = ctxt->thisObject().data().toVariant().toInt();
+
+    WorkerScript *script = p->workers.value(id);
+    if (!script)
+        return engine->undefinedValue();
+
+    if (ctxt->argumentCount() >= 1) 
+        script->callback = ctxt->argument(0);
+
+    return script->callback;
+}
+
+QScriptValue QDeclarativeWorkerScriptEnginePrivate::sendMessage(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if (!ctxt->argumentCount())
+        return engine->undefinedValue();
+
+    QDeclarativeWorkerScriptEnginePrivate *p = QDeclarativeWorkerScriptEnginePrivate::get(engine);
+
+    int id = ctxt->thisObject().data().toVariant().toInt();
+
+    WorkerScript *script = p->workers.value(id);
+    if (!script) 
+        return engine->undefinedValue();
+
+    p->m_lock.lock();
+    if (script->owner) 
+        QCoreApplication::postEvent(script->owner, 
+                                    new WorkerDataEvent(0, scriptValueToVariant(ctxt->argument(0))));
+    p->m_lock.unlock();
+
+    return engine->undefinedValue();
+}
+
+QScriptValue QDeclarativeWorkerScriptEnginePrivate::getWorker(int id)
+{
+    QHash<int, WorkerScript *>::ConstIterator iter = workers.find(id);
+
+    if (iter == workers.end())
+        return workerEngine->nullValue();
+
+    WorkerScript *script = *iter;
+    if (!script->initialized) {
+
+        script->initialized = true;
+        script->object = workerEngine->newObject();
+
+        QScriptValue api = workerEngine->newObject();
+        api.setData(script->id);
+
+        api.setProperty(QLatin1String("onMessage"), workerEngine->newFunction(onMessage), 
+                        QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
+        api.setProperty(QLatin1String("sendMessage"), workerEngine->newFunction(sendMessage));
+
+        script->object.setProperty(QLatin1String("WorkerScript"), api);
+    }
+
+    return script->object;
+}
+
+bool QDeclarativeWorkerScriptEnginePrivate::event(QEvent *event)
+{
+    if (event->type() == (QEvent::Type)WorkerDataEvent::WorkerData) {
+        WorkerDataEvent *workerEvent = static_cast<WorkerDataEvent *>(event);
+        processMessage(workerEvent->workerId(), workerEvent->data());
+        return true;
+    } else if (event->type() == (QEvent::Type)WorkerLoadEvent::WorkerLoad) {
+        WorkerLoadEvent *workerEvent = static_cast<WorkerLoadEvent *>(event);
+        processLoad(workerEvent->workerId(), workerEvent->url());
+        return true;
+    } else {
+        return QObject::event(event);
+    }
+}
+
+void QDeclarativeWorkerScriptEnginePrivate::processMessage(int id, const QVariant &data)
+{
+    WorkerScript *script = workers.value(id);
+    if (!script)
+        return;
+
+    if (script->callback.isFunction()) {
+        QScriptValue args = workerEngine->newArray(1);
+        args.setProperty(0, variantToScriptValue(data, workerEngine));
+
+        script->callback.call(script->object, args);
+    }
+}
+
+void QDeclarativeWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
+{
+    if (url.isRelative() || url.scheme() != QLatin1String("file"))
+        return;
+
+    QString fileName = url.toLocalFile();
+
+    QFile f(fileName);
+    if (f.open(QIODevice::ReadOnly)) {
+        QByteArray data = f.readAll();
+        QString script = QString::fromUtf8(data);
+
+        QScriptValue activation = getWorker(id);
+
+        QScriptContext *ctxt = workerEngine->pushContext();
+        ctxt->setActivationObject(activation);
+
+        workerEngine->baseUrl = url;
+        workerEngine->evaluate(script);
+
+        workerEngine->popContext();
+    }
+}
+
+QVariant QDeclarativeWorkerScriptEnginePrivate::scriptValueToVariant(const QScriptValue &value)
+{
+    if (value.isBool()) {
+        return QVariant(value.toBool());
+    } else if (value.isString()) {
+        return QVariant(value.toString());
+    } else if (value.isNumber()) {
+        return QVariant((qreal)value.toNumber());
+    } else if (value.isArray()) {
+        QVariantList list;
+
+        quint32 length = (quint32)value.property(QLatin1String("length")).toNumber();
+
+        for (quint32 ii = 0; ii < length; ++ii) {
+            QVariant v = scriptValueToVariant(ii);
+            list << v;
+        }
+
+        return QVariant(list);
+    } else if (value.isQObject()) {
+        QDeclarativeWorkerListModel *lm = qobject_cast<QDeclarativeWorkerListModel *>(value.toQObject());
+        if (lm) {
+            QDeclarativeWorkerListModelAgent::VariantRef v(lm->agent());
+            return qVariantFromValue(v);
+        } else {
+            // No other QObject's are allowed to be sent
+            return QVariant();
+        }
+    } else if (value.isObject()) {
+        QVariantHash hash;
+
+        QScriptValueIterator iter(value);
+
+        while (iter.hasNext()) {
+            iter.next();
+            hash.insert(iter.name(), scriptValueToVariant(iter.value()));
+        }
+
+        return QVariant(hash);
+    }
+
+    return QVariant();
+
+}
+
+QScriptValue QDeclarativeWorkerScriptEnginePrivate::variantToScriptValue(const QVariant &value, QScriptEngine *engine)
+{
+    if (value.userType() == QVariant::Bool) {
+        return QScriptValue(value.toBool());
+    } else if (value.userType() == QVariant::String) {
+        return QScriptValue(value.toString());
+    } else if (value.userType() == QMetaType::QReal) {
+        return QScriptValue(value.toReal());
+    } else if (value.userType() == qMetaTypeId<QDeclarativeWorkerListModelAgent::VariantRef>()) {
+        QDeclarativeWorkerListModelAgent::VariantRef vr = qvariant_cast<QDeclarativeWorkerListModelAgent::VariantRef>(value);
+        if (vr.a->m_engine == 0)
+            vr.a->m_engine = engine;
+        else if (vr.a->m_engine != engine)
+            return engine->nullValue();
+        QScriptValue o = engine->newQObject(vr.a);
+        o.setData(engine->newVariant(value)); // Keeps the agent ref so that it is cleaned up on gc
+        return o;
+    } else if (value.userType() == QMetaType::QVariantList) {
+        QVariantList list = qvariant_cast<QVariantList>(value);
+        QScriptValue rv = engine->newArray(list.count());
+
+        for (quint32 ii = 0; ii < quint32(list.count()); ++ii) 
+            rv.setProperty(ii, variantToScriptValue(list.at(ii), engine));
+
+        return rv;
+    } else if (value.userType() == QMetaType::QVariantHash) {
+
+        QVariantHash hash = qvariant_cast<QVariantHash>(value);
+
+        QScriptValue rv = engine->newObject();
+
+        for (QVariantHash::ConstIterator iter = hash.begin(); iter != hash.end(); ++iter) 
+            rv.setProperty(iter.key(), variantToScriptValue(iter.value(), engine));
+
+        return rv;
+    } else {
+        return engine->nullValue();
+    }
+}
+
+WorkerDataEvent::WorkerDataEvent(int workerId, const QVariant &data)
+: QEvent((QEvent::Type)WorkerData), m_id(workerId), m_data(data)
+{
+}
+
+WorkerDataEvent::~WorkerDataEvent()
+{
+}
+
+int WorkerDataEvent::workerId() const
+{
+    return m_id;
+}
+
+QVariant WorkerDataEvent::data() const
+{
+    return m_data;
+}
+
+WorkerLoadEvent::WorkerLoadEvent(int workerId, const QUrl &url)
+: QEvent((QEvent::Type)WorkerLoad), m_id(workerId), m_url(url)
+{
+}
+
+int WorkerLoadEvent::workerId() const
+{
+    return m_id;
+}
+
+QUrl WorkerLoadEvent::url() const
+{
+    return m_url;
+}
+
+WorkerRemoveEvent::WorkerRemoveEvent(int workerId)
+: QEvent((QEvent::Type)WorkerRemove), m_id(workerId)
+{
+}
+
+int WorkerRemoveEvent::workerId() const
+{
+    return m_id;
+}
+
+QDeclarativeWorkerScriptEngine::QDeclarativeWorkerScriptEngine(QDeclarativeEngine *parent)
+: QThread(parent), d(new QDeclarativeWorkerScriptEnginePrivate(parent))
+{
+    d->m_lock.lock();
+    start(QThread::LowPriority);
+    d->m_wait.wait(&d->m_lock);
+    d->moveToThread(this);
+    d->m_lock.unlock();
+}
+
+QDeclarativeWorkerScriptEngine::~QDeclarativeWorkerScriptEngine()
+{
+    qDeleteAll(d->workers);
+    delete d; d = 0;
+}
+
+QDeclarativeWorkerScriptEnginePrivate::WorkerScript::WorkerScript()
+: id(-1), initialized(false), owner(0)
+{
+}
+
+int QDeclarativeWorkerScriptEngine::registerWorkerScript(QDeclarativeWorkerScript *owner)
+{
+    QDeclarativeWorkerScriptEnginePrivate::WorkerScript *script = new QDeclarativeWorkerScriptEnginePrivate::WorkerScript;
+    script->id = d->m_nextId++;
+    script->owner = owner;
+
+    d->m_lock.lock();
+    d->workers.insert(script->id, script);
+    d->m_lock.unlock();
+
+    return script->id;
+}
+
+void QDeclarativeWorkerScriptEngine::removeWorkerScript(int id)
+{
+    QCoreApplication::postEvent(d, new WorkerRemoveEvent(id));
+}
+
+void QDeclarativeWorkerScriptEngine::executeUrl(int id, const QUrl &url)
+{
+    QCoreApplication::postEvent(d, new WorkerLoadEvent(id, url));
+}
+
+void QDeclarativeWorkerScriptEngine::sendMessage(int id, const QVariant &data)
+{
+    QCoreApplication::postEvent(d, new WorkerDataEvent(id, data));
+}
+
+void QDeclarativeWorkerScriptEngine::run()
+{
+    d->m_lock.lock();
+
+    d->workerEngine = new QDeclarativeWorkerScriptEnginePrivate::ScriptEngine(d);
+
+    d->m_wait.wakeAll();
+
+    d->m_lock.unlock();
+
+    exec();
+
+    delete d->workerEngine; d->workerEngine = 0;
+}
+
+QDeclarativeWorkerScript::QDeclarativeWorkerScript(QObject *parent)
+: QObject(parent), m_engine(0), m_scriptId(-1)
+{
+}
+
+QDeclarativeWorkerScript::~QDeclarativeWorkerScript()
+{
+    if (m_scriptId != -1) m_engine->removeWorkerScript(m_scriptId);
+}
+
+QUrl QDeclarativeWorkerScript::source() const
+{
+    return m_source;
+}
+
+void QDeclarativeWorkerScript::setSource(const QUrl &source)
+{
+    if (m_source == source)
+        return;
+
+    m_source = source;
+
+    if (m_engine) 
+        m_engine->executeUrl(m_scriptId, m_source);
+
+    emit sourceChanged();
+}
+
+void QDeclarativeWorkerScript::sendMessage(const QScriptValue &message)
+{
+    if (!m_engine) {
+        qWarning("QDeclarativeWorkerScript: Attempt to send message before WorkerScript establishment");
+        return;
+    }
+
+    m_engine->sendMessage(m_scriptId, QDeclarativeWorkerScriptEnginePrivate::scriptValueToVariant(message));
+}
+
+void QDeclarativeWorkerScript::componentComplete()
+{
+    if (!m_engine) {
+        QDeclarativeEngine *engine = qmlEngine(this);
+        if (!engine) {
+            qWarning("QDeclarativeWorkerScript: componentComplete() called without qmlEngine() set");
+            return;
+        }
+
+        m_engine = QDeclarativeEnginePrivate::get(engine)->getWorkerScriptEngine();
+        m_scriptId = m_engine->registerWorkerScript(this);
+
+        if (m_source.isValid())
+            m_engine->executeUrl(m_scriptId, m_source);
+    }
+}
+
+bool QDeclarativeWorkerScript::event(QEvent *event)
+{
+    if (event->type() == (QEvent::Type)WorkerDataEvent::WorkerData) {
+        QDeclarativeEngine *engine = qmlEngine(this);
+        if (engine) {
+            QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+            WorkerDataEvent *workerEvent = static_cast<WorkerDataEvent *>(event);
+            QScriptValue value = 
+                QDeclarativeWorkerScriptEnginePrivate::variantToScriptValue(workerEvent->data(), scriptEngine);
+            emit message(value);
+        }
+        return true;
+    } else {
+        return QObject::event(event);
+    }
+}
+
+void QDeclarativeWorkerListModelAgent::Data::clearChange() 
+{ 
+    changes.clear(); 
+}
+
+void QDeclarativeWorkerListModelAgent::Data::insertChange(int index, int count) 
+{
+    Change c = { Change::Inserted, index, count, 0 };
+    changes << c;
+}
+
+void QDeclarativeWorkerListModelAgent::Data::removeChange(int index, int count) 
+{
+    Change c = { Change::Removed, index, count, 0 };
+    changes << c;
+}
+
+void QDeclarativeWorkerListModelAgent::Data::changedChange(int index, int count)
+{
+    Change c = { Change::Changed, index, count, 0 };
+    changes << c;
+}
+
+QDeclarativeWorkerListModelAgent::QDeclarativeWorkerListModelAgent(QDeclarativeWorkerListModel *m)
+: m_engine(0), m_ref(1), m_model(m)
+{
+    data.roles = m_model->m_roles;
+    data.strings = m_model->m_strings;
+    data.values = m_model->m_values;
+}
+
+QDeclarativeWorkerListModelAgent::~QDeclarativeWorkerListModelAgent()
+{
+}
+
+void QDeclarativeWorkerListModelAgent::addref()
+{
+    m_ref.ref();
+}
+
+void QDeclarativeWorkerListModelAgent::release()
+{
+    bool del = !m_ref.deref();
+
+    if (del)
+        delete this;
+}
+
+int QDeclarativeWorkerListModelAgent::count() const
+{
+    return data.values.count();
+}
+
+void QDeclarativeWorkerListModelAgent::clear()
+{
+    data.clearChange();
+    data.removeChange(0, data.values.count());
+    data.values.clear();
+}
+
+void QDeclarativeWorkerListModelAgent::remove(int index)
+{
+    if (data.values.count() <= index)
+        return;
+
+    data.values.removeAt(index);
+    data.removeChange(index, 1);
+}
+
+void QDeclarativeWorkerListModelAgent::append(const QScriptValue &value)
+{
+    QHash<int, QVariant> row;
+
+    QScriptValueIterator it(value);
+    while (it.hasNext()) {
+        it.next();
+        QString name = it.name();
+        QVariant v = it.value().toVariant();
+
+        QHash<QString, int>::Iterator iter = data.strings.find(name);
+        if (iter == data.strings.end()) {
+            int role = data.roles.count();
+            data.roles.insert(role, name);
+            iter = data.strings.insert(name, role);
+        }
+        row.insert(*iter, v);
+    }
+
+    data.values.append(row);
+    data.insertChange(data.values.count() - 1, 1);
+}
+
+void QDeclarativeWorkerListModelAgent::insert(int index, const QScriptValue &value)
+{
+    if (index > data.values.count())
+        return;
+
+    QHash<int, QVariant> row;
+
+    QScriptValueIterator it(value);
+    while (it.hasNext()) {
+        it.next();
+        QString name = it.name();
+        QVariant v = it.value().toVariant();
+
+        QHash<QString, int>::Iterator iter = data.strings.find(name);
+        if (iter == data.strings.end()) {
+            int role = data.roles.count();
+            data.roles.insert(role, name);
+            iter = data.strings.insert(name, role);
+        }
+        row.insert(*iter, v);
+    }
+
+    data.values.insert(index, row);
+    data.insertChange(index, 1);
+}
+
+void QDeclarativeWorkerListModelAgent::set(int index, const QScriptValue &value)
+{
+    if (data.values.count() <= index)
+        return;
+
+    QHash<int, QVariant> row;
+
+    QScriptValueIterator it(value);
+    while (it.hasNext()) {
+        it.next();
+        QString name = it.name();
+        QVariant v = it.value().toVariant();
+
+        QHash<QString, int>::Iterator iter = data.strings.find(name);
+        if (iter == data.strings.end()) {
+            int role = data.roles.count();
+            data.roles.insert(role, name);
+            iter = data.strings.insert(name, role);
+        }
+        row.insert(*iter, v);
+    }
+
+    if (data.values.at(index) != row) {
+        data.values[index] = row;
+        data.changedChange(index, 1);
+    }
+}
+
+QScriptValue QDeclarativeWorkerListModelAgent::get(int index) const
+{
+    if (data.values.count() <= index)
+        return m_engine->undefinedValue();
+
+    QScriptValue rv = m_engine->newObject();
+
+    QHash<int, QVariant> row = data.values.at(index);
+    for (QHash<int, QVariant>::ConstIterator iter = row.begin(); iter != row.end(); ++iter) 
+        rv.setProperty(data.roles.value(iter.key()), qScriptValueFromValue(m_engine, iter.value()));
+
+    return rv;
+}
+
+void QDeclarativeWorkerListModelAgent::sync()
+{
+    Sync *s = new Sync;
+    s->data = data;
+    data.changes.clear();
+    QCoreApplication::postEvent(this, s);
+}
+
+bool QDeclarativeWorkerListModelAgent::event(QEvent *e)
+{
+    if (e->type() == QEvent::User) {
+        Sync *s = static_cast<Sync *>(e);
+
+        const QList<Change> &changes = s->data.changes;
+
+        if (m_model) {
+            bool cc = m_model->m_values.count() != s->data.values.count();
+
+            m_model->m_roles = s->data.roles;
+            m_model->m_strings = s->data.strings;
+            m_model->m_values = s->data.values;
+
+            for (int ii = 0; ii < changes.count(); ++ii) {
+                const Change &change = changes.at(ii);
+                switch (change.type) {
+                case Change::Inserted:
+                    emit m_model->itemsInserted(change.index, change.count);
+                    break;
+                case Change::Removed:
+                    emit m_model->itemsRemoved(change.index, change.count);
+                    break;
+                case Change::Moved:
+                    emit m_model->itemsMoved(change.index, change.to, change.count);
+                    break;
+                case Change::Changed:
+                    emit m_model->itemsMoved(change.index, change.to, change.count);
+                    break;
+                }
+            }
+
+            if (cc)
+                emit m_model->countChanged();
+        }
+    }
+
+    return QObject::event(e);
+}
+
+QDeclarativeWorkerListModel::QDeclarativeWorkerListModel(QObject *parent)
+: QListModelInterface(parent), m_agent(0)
+{
+}
+
+QDeclarativeWorkerListModel::~QDeclarativeWorkerListModel()
+{
+    if (m_agent) {
+        m_agent->m_model = 0;
+        m_agent->release();
+    }
+}
+
+void QDeclarativeWorkerListModel::clear()
+{
+    if (m_agent) {
+        qmlInfo(this) << "List can only be modified from a WorkerScript";
+        return;
+    }
+
+    int count = m_values.count();
+    m_values.clear();
+    if (count) {
+        emit itemsRemoved(0, count);
+        emit countChanged();
+    }
+}
+
+void QDeclarativeWorkerListModel::remove(int index)
+{
+    if (m_agent) {
+        qmlInfo(this) << "List can only be modified from a WorkerScript";
+        return;
+    }
+
+    if (m_values.count() <= index)
+        return;
+
+    m_values.removeAt(index);
+    emit itemsRemoved(index, 1);
+    emit countChanged();
+}
+
+void QDeclarativeWorkerListModel::append(const QScriptValue &value)
+{
+    if (m_agent) {
+        qmlInfo(this) << "List can only be modified from a WorkerScript";
+        return;
+    }
+
+    QHash<int, QVariant> data;
+
+    QScriptValueIterator it(value);
+    while (it.hasNext()) {
+        it.next();
+        QString name = it.name();
+        QVariant v = it.value().toVariant();
+
+        QHash<QString, int>::Iterator iter = m_strings.find(name);
+        if (iter == m_strings.end()) {
+            int role = m_roles.count();
+            m_roles.insert(role, name);
+            iter = m_strings.insert(name, role);
+        }
+        data.insert(*iter, v);
+    }
+
+    m_values.append(data);
+
+    emit itemsInserted(m_values.count() - 1, 1);
+    emit countChanged();
+}
+
+void QDeclarativeWorkerListModel::insert(int index, const QScriptValue &value)
+{
+    if (m_agent) {
+        qmlInfo(this) << "List can only be modified from a WorkerScript";
+        return;
+    }
+
+    if (index > m_values.count())
+        return;
+
+    QHash<int, QVariant> data;
+
+    QScriptValueIterator it(value);
+    while (it.hasNext()) {
+        it.next();
+        QString name = it.name();
+        QVariant v = it.value().toVariant();
+
+        QHash<QString, int>::Iterator iter = m_strings.find(name);
+        if (iter == m_strings.end()) {
+            int role = m_roles.count();
+            m_roles.insert(role, name);
+            iter = m_strings.insert(name, role);
+        }
+        data.insert(*iter, v);
+    }
+
+    m_values.insert(index, data);
+    emit itemsInserted(index, 1);
+    emit countChanged();
+}
+
+QScriptValue QDeclarativeWorkerListModel::get(int index) const
+{
+    QDeclarativeEngine *engine = qmlEngine(this);
+    if (!engine || m_values.count() <= index)
+        return QScriptValue();
+
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+    QScriptValue rv = scriptEngine->newObject();
+
+    QHash<int, QVariant> data = m_values.at(index);
+    for (QHash<int, QVariant>::ConstIterator iter = data.begin(); iter != data.end(); ++iter) 
+        rv.setProperty(m_roles.value(iter.key()), qScriptValueFromValue(scriptEngine, iter.value()));
+
+    return rv;
+}
+
+void QDeclarativeWorkerListModel::set(int index, const QScriptValue &value)
+{
+    if (m_agent) {
+        qmlInfo(this) << "List can only be modified from a WorkerScript";
+        return;
+    }
+
+    if (m_values.count() <= index)
+        return;
+
+    QHash<int, QVariant> data;
+
+    QScriptValueIterator it(value);
+    while (it.hasNext()) {
+        it.next();
+        QString name = it.name();
+        QVariant v = it.value().toVariant();
+
+        QHash<QString, int>::Iterator iter = m_strings.find(name);
+        if (iter == m_strings.end()) {
+            int role = m_roles.count();
+            m_roles.insert(role, name);
+            iter = m_strings.insert(name, role);
+        }
+        data.insert(*iter, v);
+    }
+
+    if (m_values.at(index) != data) {
+        m_values[index] = data;
+        emit itemsChanged(index, 1, m_roles.keys());
+    }
+}
+
+QDeclarativeWorkerListModelAgent *QDeclarativeWorkerListModel::agent()
+{
+    if (!m_agent) 
+        m_agent = new QDeclarativeWorkerListModelAgent(this);
+
+    return m_agent;
+}
+
+QList<int> QDeclarativeWorkerListModel::roles() const
+{
+    return m_roles.keys();
+}
+
+QString QDeclarativeWorkerListModel::toString(int role) const
+{
+    return m_roles.value(role);
+}
+
+int QDeclarativeWorkerListModel::count() const
+{
+    return m_values.count();
+}
+
+QHash<int,QVariant> QDeclarativeWorkerListModel::data(int index, const QList<int> &) const
+{
+    if (m_values.count() <= index)
+        return QHash<int, QVariant>();
+    else
+        return m_values.at(index);
+}
+
+QVariant QDeclarativeWorkerListModel::data(int index, int role) const
+{
+    if (m_values.count() <= index)
+        return QVariant();
+    else
+        return m_values.at(index).value(role);
+}
+
+QT_END_NAMESPACE
+
+#include "qdeclarativeworkerscript.moc"
+
+
diff --git a/src/declarative/qml/qdeclarativeworkerscript_p.h b/src/declarative/qml/qdeclarativeworkerscript_p.h
new file mode 100644
index 0000000..8ebd2c1
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeworkerscript_p.h
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEWORKERSCRIPT_P_H
+#define QDECLARATIVEWORKERSCRIPT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarative.h"
+#include "qdeclarativeparserstatus.h"
+#include <private/qlistmodelinterface_p.h>
+
+#include <QtCore/qthread.h>
+#include <QtScript/qscriptvalue.h>
+#include <QtCore/qurl.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeWorkerScript;
+class QDeclarativeWorkerScriptEnginePrivate;
+class QDeclarativeWorkerScriptEngine : public QThread
+{
+Q_OBJECT
+public:
+    QDeclarativeWorkerScriptEngine(QDeclarativeEngine *parent = 0);
+    virtual ~QDeclarativeWorkerScriptEngine();
+
+    int registerWorkerScript(QDeclarativeWorkerScript *);
+    void removeWorkerScript(int);
+    void executeUrl(int, const QUrl &);
+    void sendMessage(int, const QVariant &);
+
+protected:
+    virtual void run();
+
+private:
+    QDeclarativeWorkerScriptEnginePrivate *d;
+};
+
+class QDeclarativeWorkerScript : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+
+    Q_INTERFACES(QDeclarativeParserStatus)
+public:
+    QDeclarativeWorkerScript(QObject *parent = 0);
+    virtual ~QDeclarativeWorkerScript();
+
+    QUrl source() const;
+    void setSource(const QUrl &);
+
+public slots:
+    void sendMessage(const QScriptValue &);
+
+signals:
+    void sourceChanged();
+    void message(const QScriptValue &messageObject);
+
+protected:
+    virtual void componentComplete();
+    virtual bool event(QEvent *);
+
+private:
+    QDeclarativeWorkerScriptEngine *m_engine;
+    int m_scriptId;
+    QUrl m_source;
+};
+
+class QDeclarativeWorkerListModelAgent;
+class QDeclarativeWorkerListModel : public QListModelInterface
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+
+public:
+    QDeclarativeWorkerListModel(QObject * = 0);
+    virtual ~QDeclarativeWorkerListModel();
+
+    Q_INVOKABLE void clear();
+    Q_INVOKABLE void remove(int index);
+    Q_INVOKABLE void append(const QScriptValue &);
+    Q_INVOKABLE void insert(int index, const QScriptValue&);
+    Q_INVOKABLE QScriptValue get(int index) const;
+    Q_INVOKABLE void set(int index, const QScriptValue &);
+
+    QDeclarativeWorkerListModelAgent *agent();
+
+    virtual QList<int> roles() const;
+    virtual QString toString(int role) const;
+    virtual int count() const;
+    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
+    virtual QVariant data(int index, int role) const;
+
+Q_SIGNALS:
+    void countChanged();
+
+private:
+    friend class QDeclarativeWorkerListModelAgent;
+
+    QHash<int, QString> m_roles;
+    QHash<QString, int> m_strings;
+    QList<QHash<int, QVariant> > m_values;
+
+    QDeclarativeWorkerListModelAgent *m_agent;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeWorkerScript);
+QML_DECLARE_TYPE(QDeclarativeWorkerListModel);
+
+#endif // QDECLARATIVEWORKERSCRIPT_P_H
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
new file mode 100644
index 0000000..3ba53f0
--- /dev/null
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -0,0 +1,1631 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativexmlhttprequest_p.h"
+
+#include "qdeclarativeengine.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativerefcount_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeexpression_p.h"
+
+#include <QtCore/qobject.h>
+#include <QtScript/qscriptvalue.h>
+#include <QtScript/qscriptcontext.h>
+#include <QtScript/qscriptengine.h>
+#include <QtNetwork/qnetworkreply.h>
+#include <QtCore/qxmlstream.h>
+#include <QtCore/qstack.h>
+#include <QtCore/qdebug.h>
+
+// From DOM-Level-3-Core spec
+// http://www.w3.org/TR/DOM-Level-3-Core/core.html
+#define INDEX_SIZE_ERR 1
+#define DOMSTRING_SIZE_ERR 2
+#define HIERARCHY_REQUEST_ERR 3
+#define WRONG_DOCUMENT_ERR 4
+#define INVALID_CHARACTER_ERR 5
+#define NO_DATA_ALLOWED_ERR 6
+#define NO_MODIFICATION_ALLOWED_ERR 7
+#define NOT_FOUND_ERR 8
+#define NOT_SUPPORTED_ERR 9
+#define INUSE_ATTRIBUTE_ERR 10
+#define INVALID_STATE_ERR 11
+#define SYNTAX_ERR 12
+#define INVALID_MODIFICATION_ERR 13
+#define NAMESPACE_ERR 14
+#define INVALID_ACCESS_ERR 15
+#define VALIDATION_ERR 16
+#define TYPE_MISMATCH_ERR 17
+
+#define THROW_DOM(error, desc) \
+{ \
+    QScriptValue errorValue = context->throwError(QLatin1String(desc)); \
+    errorValue.setProperty(QLatin1String("code"), error); \
+    return errorValue; \
+} 
+
+#define THROW_SYNTAX(desc) \
+    return context->throwError(QScriptContext::SyntaxError, QLatin1String(desc));
+#define THROW_REFERENCE(desc) \
+    return context->throwError(QScriptContext::ReferenceError, QLatin1String(desc));
+
+#define D(arg) (arg)->release()
+#define A(arg) (arg)->addref()
+
+QT_BEGIN_NAMESPACE
+
+class DocumentImpl;
+class NodeImpl 
+{
+public:
+    NodeImpl() : type(Element), document(0), parent(0) {}
+    virtual ~NodeImpl() { 
+        for (int ii = 0; ii < children.count(); ++ii)
+            delete children.at(ii);
+        for (int ii = 0; ii < attributes.count(); ++ii)
+            delete attributes.at(ii);
+    }
+
+    // These numbers are copied from the Node IDL definition
+    enum Type { 
+        Attr = 2, 
+        CDATA = 4, 
+        Comment = 8, 
+        Document = 9, 
+        DocumentFragment = 11, 
+        DocumentType = 10,
+        Element = 1, 
+        Entity = 6, 
+        EntityReference = 5,
+        Notation = 12, 
+        ProcessingInstruction = 7, 
+        Text = 3
+    };
+    Type type;
+
+    QString namespaceUri;
+    QString name;
+
+    QString data;
+
+    void addref();
+    void release();
+
+    DocumentImpl *document;
+    NodeImpl *parent;
+
+    QList<NodeImpl *> children;
+    QList<NodeImpl *> attributes;
+};
+
+class DocumentImpl : public QDeclarativeRefCount, public NodeImpl
+{
+public:
+    DocumentImpl() : root(0) { type = Document; }
+    virtual ~DocumentImpl() {
+        if (root) delete root;
+    }
+
+    QString version;
+    QString encoding;
+    bool isStandalone;
+
+    NodeImpl *root;
+
+    void addref() { QDeclarativeRefCount::addref(); }
+    void release() { QDeclarativeRefCount::release(); }
+};
+
+class NamedNodeMap
+{
+public:
+    // JS API
+    static QScriptValue length(QScriptContext *context, QScriptEngine *engine);
+
+    // C++ API
+    static QScriptValue prototype(QScriptEngine *);
+    static QScriptValue create(QScriptEngine *, NodeImpl *, QList<NodeImpl *> *);
+
+    NamedNodeMap();
+    NamedNodeMap(const NamedNodeMap &);
+    ~NamedNodeMap();
+    bool isNull();
+
+    NodeImpl *d;
+    QList<NodeImpl *> *list;
+private:
+    NamedNodeMap &operator=(const NamedNodeMap &);
+};
+
+class NamedNodeMapClass : public QScriptClass
+{
+public:
+    NamedNodeMapClass(QScriptEngine *engine) : QScriptClass(engine) {}
+
+    virtual QueryFlags queryProperty(const QScriptValue &object, const QScriptString &name, QueryFlags flags, uint *id);
+    virtual QScriptValue property(const QScriptValue &object, const QScriptString &name, uint id);
+};
+
+class NodeList 
+{
+public:
+    // JS API
+    static QScriptValue length(QScriptContext *context, QScriptEngine *engine);
+
+    // C++ API
+    static QScriptValue prototype(QScriptEngine *);
+    static QScriptValue create(QScriptEngine *, NodeImpl *);
+
+    NodeList();
+    NodeList(const NodeList &);
+    ~NodeList();
+    bool isNull();
+
+    NodeImpl *d;
+private:
+    NodeList &operator=(const NodeList &);
+};
+
+class NodeListClass : public QScriptClass
+{
+public:
+    NodeListClass(QScriptEngine *engine) : QScriptClass(engine) {}
+    virtual QueryFlags queryProperty(const QScriptValue &object, const QScriptString &name, QueryFlags flags, uint *id);
+    virtual QScriptValue property(const QScriptValue &object, const QScriptString &name, uint id);
+};
+
+class Node
+{
+public:
+    // JS API
+    static QScriptValue nodeName(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue nodeValue(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue nodeType(QScriptContext *context, QScriptEngine *engine);
+
+    static QScriptValue parentNode(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue childNodes(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue firstChild(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue lastChild(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue previousSibling(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue nextSibling(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue attributes(QScriptContext *context, QScriptEngine *engine);
+
+    //static QScriptValue ownerDocument(QScriptContext *context, QScriptEngine *engine);
+    //static QScriptValue namespaceURI(QScriptContext *context, QScriptEngine *engine);
+    //static QScriptValue prefix(QScriptContext *context, QScriptEngine *engine);
+    //static QScriptValue localName(QScriptContext *context, QScriptEngine *engine);
+    //static QScriptValue baseURI(QScriptContext *context, QScriptEngine *engine);
+    //static QScriptValue textContent(QScriptContext *context, QScriptEngine *engine);
+
+    // C++ API
+    static QScriptValue prototype(QScriptEngine *);
+    static QScriptValue create(QScriptEngine *, NodeImpl *);
+
+    Node();
+    Node(const Node &o);
+    ~Node();
+    bool isNull() const;
+
+    NodeImpl *d;
+
+private:
+    Node &operator=(const Node &);
+};
+
+class Element : public Node
+{
+public:
+    // C++ API
+    static QScriptValue prototype(QScriptEngine *);
+};
+
+class Attr : public Node
+{
+public:
+    // JS API
+    static QScriptValue name(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue specified(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue value(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue ownerElement(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue schemaTypeInfo(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue isId(QScriptContext *context, QScriptEngine *engine);
+
+    // C++ API
+    static QScriptValue prototype(QScriptEngine *);
+};
+
+class CharacterData : public Node
+{
+public:
+    // JS API
+    static QScriptValue length(QScriptContext *context, QScriptEngine *engine);
+
+    // C++ API
+    static QScriptValue prototype(QScriptEngine *);
+};
+
+class Text : public CharacterData
+{
+public:
+    // JS API
+    static QScriptValue isElementContentWhitespace(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue wholeText(QScriptContext *context, QScriptEngine *engine);
+
+    // C++ API
+    static QScriptValue prototype(QScriptEngine *);
+};
+
+class CDATA : public Text
+{
+public:
+    // C++ API
+    static QScriptValue prototype(QScriptEngine *);
+};
+
+class Document : public Node
+{
+public:
+    // JS API
+    static QScriptValue xmlVersion(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue xmlEncoding(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue xmlStandalone(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue documentElement(QScriptContext *context, QScriptEngine *engine);
+
+    // C++ API
+    static QScriptValue prototype(QScriptEngine *);
+    static QScriptValue load(QScriptEngine *engine, const QString &data);
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(Node);
+Q_DECLARE_METATYPE(NodeList);
+Q_DECLARE_METATYPE(NamedNodeMap);
+
+QT_BEGIN_NAMESPACE
+
+void NodeImpl::addref() 
+{
+    A(document);
+}
+
+void NodeImpl::release()
+{
+    D(document);
+}
+
+QScriptValue Node::nodeName(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    switch (node.d->type) {
+    case NodeImpl::Document:
+        return QScriptValue(QLatin1String("#document"));
+    case NodeImpl::CDATA:
+        return QScriptValue(QLatin1String("#cdata-section"));
+    case NodeImpl::Text:
+        return QScriptValue(QLatin1String("#text"));
+    default:
+        return QScriptValue(node.d->name);
+    }
+}
+
+QScriptValue Node::nodeValue(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    if (node.d->type == NodeImpl::Document ||
+        node.d->type == NodeImpl::DocumentFragment ||
+        node.d->type == NodeImpl::DocumentType ||
+        node.d->type == NodeImpl::Element ||
+        node.d->type == NodeImpl::Entity ||
+        node.d->type == NodeImpl::EntityReference ||
+        node.d->type == NodeImpl::Notation)
+        return engine->nullValue();
+
+    return QScriptValue(node.d->data);
+}
+
+QScriptValue Node::nodeType(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+    return QScriptValue(node.d->type);
+}
+
+QScriptValue Node::parentNode(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    if (node.d->parent) return Node::create(engine, node.d->parent);
+    else return engine->nullValue();
+}
+
+QScriptValue Node::childNodes(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    return NodeList::create(engine, node.d);
+}
+
+QScriptValue Node::firstChild(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    if (node.d->children.isEmpty()) return engine->nullValue();
+    else return Node::create(engine, node.d->children.first());
+}
+
+QScriptValue Node::lastChild(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    if (node.d->children.isEmpty()) return engine->nullValue();
+    else return Node::create(engine, node.d->children.last());
+}
+
+QScriptValue Node::previousSibling(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    if (!node.d->parent) return engine->nullValue();
+
+    for (int ii = 0; ii < node.d->parent->children.count(); ++ii) {
+        if (node.d->parent->children.at(ii) == node.d) {
+            if (ii == 0) return engine->nullValue();
+            else return Node::create(engine, node.d->parent->children.at(ii - 1));
+        }
+    }
+
+    return engine->nullValue();
+}
+
+QScriptValue Node::nextSibling(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    if (!node.d->parent) return engine->nullValue();
+
+    for (int ii = 0; ii < node.d->parent->children.count(); ++ii) {
+        if (node.d->parent->children.at(ii) == node.d) {
+            if ((ii + 1) == node.d->parent->children.count()) return engine->nullValue();
+            else return Node::create(engine, node.d->parent->children.at(ii + 1)); 
+        }
+    }
+
+    return engine->nullValue();
+}
+
+QScriptValue Node::attributes(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    if (node.d->type != NodeImpl::Element)
+        return engine->nullValue();
+    else
+        return NamedNodeMap::create(engine, node.d, &node.d->attributes);
+}
+
+QScriptValue Node::prototype(QScriptEngine *engine)
+{
+    QScriptValue proto = engine->newObject();
+
+    proto.setProperty(QLatin1String("nodeName"), engine->newFunction(nodeName), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("nodeValue"), engine->newFunction(nodeValue), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
+    proto.setProperty(QLatin1String("nodeType"), engine->newFunction(nodeType), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("parentNode"), engine->newFunction(parentNode), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("childNodes"), engine->newFunction(childNodes), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("firstChild"), engine->newFunction(firstChild), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("lastChild"), engine->newFunction(lastChild), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("previousSibling"), engine->newFunction(previousSibling), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("nextSibling"), engine->newFunction(nextSibling), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("attributes"), engine->newFunction(attributes), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+
+    return proto;
+}
+
+QScriptValue Node::create(QScriptEngine *engine, NodeImpl *data)
+{
+    QScriptValue instance = engine->newObject();
+
+    switch (data->type) {
+    case NodeImpl::Attr:
+        instance.setPrototype(Attr::prototype(engine));
+        break;
+    case NodeImpl::Comment:
+    case NodeImpl::Document:
+    case NodeImpl::DocumentFragment:
+    case NodeImpl::DocumentType:
+    case NodeImpl::Entity:
+    case NodeImpl::EntityReference:
+    case NodeImpl::Notation:
+    case NodeImpl::ProcessingInstruction:
+        return QScriptValue();
+    case NodeImpl::CDATA:
+        instance.setPrototype(CDATA::prototype(engine));
+        break;
+    case NodeImpl::Text:
+        instance.setPrototype(Text::prototype(engine));
+        break;
+    case NodeImpl::Element:
+        instance.setPrototype(Element::prototype(engine));
+        break;
+    }
+
+    Node node;
+    node.d = data;
+    if (data) A(data);
+
+    return engine->newVariant(instance, qVariantFromValue(node));
+}
+
+QScriptValue Element::prototype(QScriptEngine *engine)
+{
+    QScriptValue proto = engine->newObject();
+    proto.setPrototype(Node::prototype(engine));
+
+    proto.setProperty(QLatin1String("tagName"), engine->newFunction(nodeName), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+
+    return proto;
+}
+
+QScriptValue Attr::prototype(QScriptEngine *engine)
+{
+    QScriptValue proto = engine->newObject();
+    proto.setPrototype(Node::prototype(engine));
+
+    proto.setProperty(QLatin1String("name"), engine->newFunction(name), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("value"), engine->newFunction(value), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("ownerElement"), engine->newFunction(ownerElement), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+
+    return proto;
+}
+
+QScriptValue Attr::name(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    return QScriptValue(node.d->name);
+}
+
+QScriptValue Attr::value(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    return QScriptValue(node.d->data);
+}
+
+QScriptValue Attr::ownerElement(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    return Node::create(engine, node.d->parent);
+}
+
+QScriptValue CharacterData::length(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    return QScriptValue(node.d->data.length());
+}
+
+QScriptValue CharacterData::prototype(QScriptEngine *engine)
+{
+    QScriptValue proto = engine->newObject();
+    proto.setPrototype(Node::prototype(engine));
+
+    proto.setProperty(QLatin1String("data"), engine->newFunction(nodeValue), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
+    proto.setProperty(QLatin1String("length"), engine->newFunction(length), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+
+    return proto;
+}
+
+QScriptValue Text::isElementContentWhitespace(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    return node.d->data.trimmed().isEmpty();
+}
+
+QScriptValue Text::wholeText(QScriptContext *context, QScriptEngine *engine)
+{
+    Node node = qscriptvalue_cast<Node>(context->thisObject());
+    if (node.isNull()) return engine->undefinedValue();
+
+    return node.d->data;
+}
+
+QScriptValue Text::prototype(QScriptEngine *engine)
+{
+    QScriptValue proto = engine->newObject();
+    proto.setPrototype(CharacterData::prototype(engine));
+
+    proto.setProperty(QLatin1String("isElementContentWhitespace"), engine->newFunction(isElementContentWhitespace), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    proto.setProperty(QLatin1String("wholeText"), engine->newFunction(wholeText), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+
+    return proto;
+}
+
+QScriptValue CDATA::prototype(QScriptEngine *engine)
+{
+    QScriptValue proto = engine->newObject();
+    proto.setPrototype(Text::prototype(engine));
+    return proto;
+}
+
+QScriptValue Document::prototype(QScriptEngine *engine)
+{
+    QScriptValue proto = engine->newObject();
+    proto.setPrototype(Node::prototype(engine));
+
+    proto.setProperty(QLatin1String("xmlVersion"), engine->newFunction(xmlVersion), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
+    proto.setProperty(QLatin1String("xmlEncoding"), engine->newFunction(xmlEncoding), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
+    proto.setProperty(QLatin1String("xmlStandalone"), engine->newFunction(xmlStandalone), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
+    proto.setProperty(QLatin1String("documentElement"), engine->newFunction(documentElement), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+
+    return proto;
+}
+
+QScriptValue Document::load(QScriptEngine *engine, const QString &data)
+{
+    Q_ASSERT(engine);
+
+    DocumentImpl *document = 0;
+    QStack<NodeImpl *> nodeStack;
+
+    QXmlStreamReader reader(data);
+
+    while (!reader.atEnd()) {
+        switch (reader.readNext()) {
+        case QXmlStreamReader::NoToken:
+            break;
+        case QXmlStreamReader::Invalid:
+            break;
+        case QXmlStreamReader::StartDocument:
+            Q_ASSERT(!document);
+            document = new DocumentImpl;
+            document->document = document;
+            document->version = reader.documentVersion().toString();
+            document->encoding = reader.documentEncoding().toString();
+            document->isStandalone = reader.isStandaloneDocument();
+            break;
+        case QXmlStreamReader::EndDocument:
+            break;
+        case QXmlStreamReader::StartElement: 
+        {
+            Q_ASSERT(document);
+            NodeImpl *node = new NodeImpl;
+            node->document = document;
+            node->namespaceUri = reader.namespaceUri().toString();
+            node->name = reader.name().toString();
+            if (nodeStack.isEmpty()) {
+                document->root = node;
+            } else {
+                node->parent = nodeStack.top();
+                node->parent->children.append(node);
+            }
+            nodeStack.append(node);
+
+            foreach (const QXmlStreamAttribute &a, reader.attributes()) {
+                NodeImpl *attr = new NodeImpl;
+                attr->document = document;
+                attr->type = NodeImpl::Attr;
+                attr->namespaceUri = a.namespaceUri().toString();
+                attr->name = a.name().toString();
+                attr->data = a.value().toString();
+                attr->parent = node;
+                node->attributes.append(attr);
+            }
+        } 
+            break;
+        case QXmlStreamReader::EndElement:
+            nodeStack.pop();
+            break;
+        case QXmlStreamReader::Characters:
+        {
+            NodeImpl *node = new NodeImpl;
+            node->document = document;
+            node->type = reader.isCDATA()?NodeImpl::CDATA:NodeImpl::Text;
+            node->parent = nodeStack.top();
+            node->parent->children.append(node);
+            node->data = reader.text().toString();
+        }
+            break;
+        case QXmlStreamReader::Comment:
+            break;
+        case QXmlStreamReader::DTD:
+            break;
+        case QXmlStreamReader::EntityReference:
+            break;
+        case QXmlStreamReader::ProcessingInstruction:
+            break;
+        }
+    }
+
+    if (!document || reader.hasError()) {
+        if (document) D(document);
+        return engine->nullValue();
+    }
+
+    QScriptValue instance = engine->newObject();
+    instance.setPrototype(Document::prototype(engine));
+    Node documentNode;
+    documentNode.d = document;
+    return engine->newVariant(instance, qVariantFromValue(documentNode));
+}
+
+Node::Node()
+: d(0)
+{
+}
+
+Node::Node(const Node &o)
+: d(o.d)
+{
+    if (d) A(d);
+}
+
+Node::~Node()
+{
+    if (d) D(d);
+}
+
+bool Node::isNull() const
+{
+    return d == 0;
+}
+
+QScriptValue NamedNodeMap::length(QScriptContext *context, QScriptEngine *engine)
+{
+    NamedNodeMap map = qscriptvalue_cast<NamedNodeMap>(context->thisObject().data());
+    if (map.isNull()) return engine->undefinedValue();
+
+    return QScriptValue(map.list->count());
+}
+
+QScriptValue NamedNodeMap::prototype(QScriptEngine *engine)
+{
+    QScriptValue proto = engine->newObject();
+
+    proto.setProperty(QLatin1String("length"), engine->newFunction(length), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+
+    return proto;
+}
+
+QScriptValue NamedNodeMap::create(QScriptEngine *engine, NodeImpl *data, QList<NodeImpl *> *list)
+{
+    QScriptValue instance = engine->newObject();
+    instance.setPrototype(NamedNodeMap::prototype(engine));
+
+    NamedNodeMap map;
+    map.d = data;
+    map.list = list;
+    if (data) A(data);
+
+    instance.setData(engine->newVariant(qVariantFromValue(map)));
+
+    if (!QDeclarativeScriptEngine::get(engine)->namedNodeMapClass)
+        QDeclarativeScriptEngine::get(engine)->namedNodeMapClass= new NamedNodeMapClass(engine);
+
+    instance.setScriptClass(QDeclarativeScriptEngine::get(engine)->namedNodeMapClass);
+
+    return instance;
+}
+
+NamedNodeMap::NamedNodeMap()
+: d(0), list(0)
+{
+}
+
+NamedNodeMap::NamedNodeMap(const NamedNodeMap &o)
+: d(o.d), list(o.list)
+{
+    if (d) A(d);
+}
+
+NamedNodeMap::~NamedNodeMap()
+{
+    if (d) D(d);
+}
+
+bool NamedNodeMap::isNull()
+{
+    return d == 0;
+}
+
+QScriptValue NodeList::length(QScriptContext *context, QScriptEngine *engine)
+{
+    NodeList list = qscriptvalue_cast<NodeList>(context->thisObject().data());
+    if (list.isNull()) return engine->undefinedValue();
+
+    return QScriptValue(list.d->children.count());
+}
+
+QScriptValue NodeList::prototype(QScriptEngine *engine)
+{
+    QScriptValue proto = engine->newObject();
+
+    proto.setProperty(QLatin1String("length"), engine->newFunction(length), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+
+    return proto;
+}
+
+QScriptValue NodeList::create(QScriptEngine *engine, NodeImpl *data)
+{
+    QScriptValue instance = engine->newObject();
+    instance.setPrototype(NodeList::prototype(engine));
+
+    NodeList list;
+    list.d = data;
+    if (data) A(data);
+
+    instance.setData(engine->newVariant(qVariantFromValue(list)));
+
+    if (!QDeclarativeScriptEngine::get(engine)->nodeListClass)
+        QDeclarativeScriptEngine::get(engine)->nodeListClass= new NodeListClass(engine);
+
+    instance.setScriptClass(QDeclarativeScriptEngine::get(engine)->nodeListClass);
+
+    return instance;
+}
+
+NodeList::NodeList()
+: d(0)
+{
+}
+
+NodeList::NodeList(const NodeList &o)
+: d(o.d)
+{
+    if (d) A(d);
+}
+
+NodeList::~NodeList()
+{
+    if (d) D(d);
+}
+
+bool NodeList::isNull()
+{
+    return d == 0;
+}
+
+NamedNodeMapClass::QueryFlags NamedNodeMapClass::queryProperty(const QScriptValue &object, const QScriptString &name, QueryFlags flags, uint *id)
+{
+    if (!(flags & HandlesReadAccess))
+        return 0;
+
+    NamedNodeMap map = qscriptvalue_cast<NamedNodeMap>(object.data());
+    Q_ASSERT(!map.isNull());
+
+    bool ok = false;
+    QString nameString = name.toString();
+    uint index = nameString.toUInt(&ok);
+    if (ok) {
+        if ((uint)map.list->count() <= index)
+            return 0;
+
+        *id = index;
+        return HandlesReadAccess;
+    } else {
+        for (int ii = 0; ii < map.list->count(); ++ii) {
+            if (map.list->at(ii) && map.list->at(ii)->name == nameString) {
+                *id = ii;
+                return HandlesReadAccess;
+            }
+        }
+    }
+
+    return 0;
+}
+
+QScriptValue NamedNodeMapClass::property(const QScriptValue &object, const QScriptString &, uint id)
+{
+    NamedNodeMap map = qscriptvalue_cast<NamedNodeMap>(object.data());
+    return Node::create(engine(), map.list->at(id));
+}
+
+NodeListClass::QueryFlags NodeListClass::queryProperty(const QScriptValue &object, const QScriptString &name, QueryFlags flags, uint *id)
+{
+    if (!(flags & HandlesReadAccess))
+        return 0;
+
+    bool ok = false;
+    uint index = name.toString().toUInt(&ok);
+    if (!ok)
+        return 0;
+
+    NodeList list = qscriptvalue_cast<NodeList>(object.data());
+    if (list.isNull() || (uint)list.d->children.count() <= index)
+        return 0; // ### I think we're meant to raise an exception
+
+    *id = index;
+    return HandlesReadAccess;
+}
+
+QScriptValue NodeListClass::property(const QScriptValue &object, const QScriptString &, uint id)
+{
+    NodeList list = qscriptvalue_cast<NodeList>(object.data());
+    return Node::create(engine(), list.d->children.at(id));
+}
+
+QScriptValue Document::documentElement(QScriptContext *context, QScriptEngine *engine)
+{
+    Node document = qscriptvalue_cast<Node>(context->thisObject());
+    if (document.isNull() || document.d->type != NodeImpl::Document) return engine->undefinedValue();
+
+    return Node::create(engine, static_cast<DocumentImpl *>(document.d)->root);
+}
+
+QScriptValue Document::xmlStandalone(QScriptContext *context, QScriptEngine *engine)
+{
+    Node document = qscriptvalue_cast<Node>(context->thisObject());
+    if (document.isNull() || document.d->type != NodeImpl::Document) return engine->undefinedValue();
+
+    return QScriptValue(static_cast<DocumentImpl *>(document.d)->isStandalone);
+}
+
+QScriptValue Document::xmlVersion(QScriptContext *context, QScriptEngine *engine)
+{
+    Node document = qscriptvalue_cast<Node>(context->thisObject());
+    if (document.isNull() || document.d->type != NodeImpl::Document) return engine->undefinedValue();
+
+    return QScriptValue(static_cast<DocumentImpl *>(document.d)->version);
+}
+
+QScriptValue Document::xmlEncoding(QScriptContext *context, QScriptEngine *engine)
+{
+    Node document = qscriptvalue_cast<Node>(context->thisObject());
+    if (document.isNull() || document.d->type != NodeImpl::Document) return engine->undefinedValue();
+
+    return QScriptValue(static_cast<DocumentImpl *>(document.d)->encoding);
+}
+
+class QDeclarativeXMLHttpRequest : public QObject
+{
+Q_OBJECT
+public:
+    enum State { Unsent = 0, 
+                 Opened = 1, HeadersReceived = 2,
+                 Loading = 3, Done = 4 };
+
+    QDeclarativeXMLHttpRequest(QNetworkAccessManager *manager);
+    virtual ~QDeclarativeXMLHttpRequest();
+
+    bool sendFlag() const;
+    bool errorFlag() const;
+    quint32 readyState() const;
+    int replyStatus() const;
+    QString replyStatusText() const;
+
+    QScriptValue open(QScriptValue *me, const QString &, const QUrl &);
+
+    void addHeader(const QString &, const QString &);
+    QString header(const QString &name);
+    QString headers();
+    QScriptValue send(QScriptValue *me, const QByteArray &);
+    QScriptValue abort(QScriptValue *me);
+
+    QString responseBody() const;
+private slots:
+    void downloadProgress(qint64);
+    void error(QNetworkReply::NetworkError);
+    void finished();
+
+private:
+    void requestFromUrl(const QUrl &url);
+
+    State m_state;
+    bool m_errorFlag;
+    bool m_sendFlag;
+    QString m_method;
+    QUrl m_url;
+    QByteArray m_responseEntityBody;
+    QByteArray m_data;
+    int m_redirectCount;
+
+    typedef QPair<QByteArray, QByteArray> HeaderPair;
+    typedef QList<HeaderPair> HeadersList;
+    HeadersList m_headersList;
+    void fillHeadersList();
+
+    QScriptValue m_me; // Set to the data object while a send() is ongoing (to access the callback)
+
+    QScriptValue dispatchCallback(QScriptValue *me);
+    void printError(const QScriptValue&);
+
+    int m_status;
+    QString m_statusText;
+    QNetworkRequest m_request;
+    QNetworkReply *m_network;
+    void destroyNetwork();
+
+    QNetworkAccessManager *m_nam;
+    QNetworkAccessManager *networkAccessManager() { return m_nam; }
+};
+
+QDeclarativeXMLHttpRequest::QDeclarativeXMLHttpRequest(QNetworkAccessManager *manager)
+: m_state(Unsent), m_errorFlag(false), m_sendFlag(false),
+  m_redirectCount(0), m_network(0), m_nam(manager)
+{
+}
+
+QDeclarativeXMLHttpRequest::~QDeclarativeXMLHttpRequest()
+{
+    destroyNetwork();
+}
+
+bool QDeclarativeXMLHttpRequest::sendFlag() const
+{
+    return m_sendFlag;
+}
+
+bool QDeclarativeXMLHttpRequest::errorFlag() const
+{
+    return m_errorFlag;
+}
+
+quint32 QDeclarativeXMLHttpRequest::readyState() const
+{
+    return m_state;
+}
+
+int QDeclarativeXMLHttpRequest::replyStatus() const
+{
+    return m_status;
+}
+
+QString QDeclarativeXMLHttpRequest::replyStatusText() const
+{
+    return m_statusText;
+}
+
+QScriptValue QDeclarativeXMLHttpRequest::open(QScriptValue *me, const QString &method, const QUrl &url)
+{
+    destroyNetwork();
+    m_sendFlag = false;
+    m_errorFlag = false;
+    m_responseEntityBody = QByteArray();
+    m_method = method;
+    m_url = url;
+    m_state = Opened;
+    return dispatchCallback(me);
+}
+
+void QDeclarativeXMLHttpRequest::addHeader(const QString &name, const QString &value)
+{
+    QByteArray utfname = name.toUtf8();
+
+    if (m_request.hasRawHeader(utfname)) {
+        m_request.setRawHeader(utfname, m_request.rawHeader(utfname) + ',' + value.toUtf8());
+    } else {
+        m_request.setRawHeader(utfname, value.toUtf8());
+    }
+}
+
+QString QDeclarativeXMLHttpRequest::header(const QString &name)
+{
+    QByteArray utfname = name.toLower().toUtf8();
+
+    foreach (const HeaderPair &header, m_headersList) {
+        if (header.first == utfname)
+            return QString::fromUtf8(header.second);
+    }
+    return QString();
+}
+
+QString QDeclarativeXMLHttpRequest::headers()
+{
+    QString ret;
+
+    foreach (const HeaderPair &header, m_headersList) {
+        if (ret.length())
+            ret.append(QString::fromUtf8("\r\n"));
+        ret.append(QString::fromUtf8(header.first));
+        ret.append(QString::fromUtf8(": "));
+        ret.append(QString::fromUtf8(header.second));
+    }
+    return ret;
+}
+
+void QDeclarativeXMLHttpRequest::fillHeadersList()
+{
+    QList<QByteArray> headerList = m_network->rawHeaderList();
+
+    m_headersList.clear();
+    foreach (const QByteArray &header, headerList) {
+        HeaderPair pair (header.toLower(), m_network->rawHeader(header));
+	if (pair.first == "set-cookie" ||
+	    pair.first == "set-cookie2") 
+	    continue;
+
+        m_headersList << pair;
+    }
+}
+
+void QDeclarativeXMLHttpRequest::requestFromUrl(const QUrl &url)
+{
+    QNetworkRequest request = m_request;
+    request.setUrl(url);
+    if(m_method == QLatin1String("POST") ||
+       m_method == QLatin1String("PUT")) {
+        QVariant var = request.header(QNetworkRequest::ContentTypeHeader);
+        if (var.isValid()) {
+            QString str = var.toString();
+            int charsetIdx = str.indexOf(QLatin1String("charset="));
+            if (charsetIdx == -1) {
+                // No charset - append
+                if (!str.isEmpty()) str.append(QLatin1Char(';'));
+                str.append(QLatin1String("charset=UTF-8"));
+            } else {
+                charsetIdx += 8;
+                int n = 0;
+                int semiColon = str.indexOf(QLatin1Char(';'), charsetIdx);
+                if (semiColon == -1) {
+                    n = str.length() - charsetIdx;
+                } else {
+                    n = semiColon - charsetIdx;
+                }
+
+                str.replace(charsetIdx, n, QLatin1String("UTF-8"));
+            }
+            request.setHeader(QNetworkRequest::ContentTypeHeader, str);
+        } else {
+            request.setHeader(QNetworkRequest::ContentTypeHeader, 
+                              QLatin1String("text/plain;charset=UTF-8"));
+        }
+    }
+
+    if (m_method == QLatin1String("GET"))
+        m_network = networkAccessManager()->get(request);
+    else if (m_method == QLatin1String("HEAD"))
+        m_network = networkAccessManager()->head(request);
+    else if(m_method == QLatin1String("POST"))
+        m_network = networkAccessManager()->post(request, m_data);
+    else if(m_method == QLatin1String("PUT"))
+        m_network = networkAccessManager()->put(request, m_data);
+
+    QObject::connect(m_network, SIGNAL(downloadProgress(qint64,qint64)), 
+                     this, SLOT(downloadProgress(qint64)));
+    QObject::connect(m_network, SIGNAL(error(QNetworkReply::NetworkError)),
+                     this, SLOT(error(QNetworkReply::NetworkError)));
+    QObject::connect(m_network, SIGNAL(finished()),
+                     this, SLOT(finished()));
+}
+
+QScriptValue QDeclarativeXMLHttpRequest::send(QScriptValue *me, const QByteArray &data)
+{
+    m_errorFlag = false;
+    m_sendFlag = true;
+    m_redirectCount = 0;
+    m_data = data;
+    m_me = *me;
+
+    requestFromUrl(m_url);
+
+    return QScriptValue();
+}
+
+QScriptValue QDeclarativeXMLHttpRequest::abort(QScriptValue *me)
+{
+    destroyNetwork();
+    m_responseEntityBody = QByteArray();
+    m_errorFlag = true;
+    m_request = QNetworkRequest();
+
+    if (!(m_state == Unsent || 
+          (m_state == Opened && !m_sendFlag) ||
+          m_state == Done)) {
+
+        m_state = Done;
+        m_sendFlag = false;
+        QScriptValue cbv = dispatchCallback(me);
+        if (cbv.isError()) return cbv;
+    }
+
+    m_state = Unsent;
+    return QScriptValue();
+}
+
+void QDeclarativeXMLHttpRequest::downloadProgress(qint64 bytes)
+{
+    Q_UNUSED(bytes)
+    m_status = 
+        m_network->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    m_statusText =
+        QString::fromUtf8(m_network->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray());
+
+    // ### We assume if this is called the headers are now available
+    if (m_state < HeadersReceived) {
+        m_state = HeadersReceived;
+        fillHeadersList ();
+        QScriptValue cbv = dispatchCallback(&m_me);
+        if (cbv.isError()) printError(cbv);
+    }
+
+    bool wasEmpty = m_responseEntityBody.isEmpty();
+    m_responseEntityBody.append(m_network->readAll());
+    if (wasEmpty && !m_responseEntityBody.isEmpty()) {
+        m_state = Loading;
+        QScriptValue cbv = dispatchCallback(&m_me);
+        if (cbv.isError()) printError(cbv);
+    }
+}
+
+void QDeclarativeXMLHttpRequest::error(QNetworkReply::NetworkError error)
+{
+    Q_UNUSED(error)
+    m_status =
+        m_network->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    m_statusText =
+        QString::fromUtf8(m_network->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray());
+
+    m_responseEntityBody = QByteArray();
+
+    m_request = QNetworkRequest();
+    m_data.clear();
+    destroyNetwork();
+
+    if (error == QNetworkReply::ContentAccessDenied ||
+        error == QNetworkReply::ContentOperationNotPermittedError ||
+        error == QNetworkReply::ContentNotFoundError ||
+        error == QNetworkReply::AuthenticationRequiredError ||
+        error == QNetworkReply::ContentReSendError) {
+        m_state = Loading;
+        QScriptValue cbv = dispatchCallback(&m_me);
+        if (cbv.isError()) printError(cbv);
+    } else {
+        m_errorFlag = true;
+    } 
+
+    m_state = Done;
+    QScriptValue cbv = dispatchCallback(&m_me);
+    if (cbv.isError()) printError(cbv);
+}
+
+#define XMLHTTPREQUEST_MAXIMUM_REDIRECT_RECURSION 15
+void QDeclarativeXMLHttpRequest::finished()
+{
+    m_redirectCount++;
+    if (m_redirectCount < XMLHTTPREQUEST_MAXIMUM_REDIRECT_RECURSION) {
+        QVariant redirect = m_network->attribute(QNetworkRequest::RedirectionTargetAttribute);
+        if (redirect.isValid()) {
+            QUrl url = redirect.toUrl();
+            destroyNetwork();
+            requestFromUrl(url);
+            return;
+        }
+    }
+
+    m_status =
+        m_network->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    m_statusText =
+        QString::fromUtf8(m_network->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray());
+
+    if (m_state < HeadersReceived) {
+        m_state = HeadersReceived;
+        fillHeadersList ();
+        QScriptValue cbv = dispatchCallback(&m_me);
+        if (cbv.isError()) printError(cbv);
+    }
+    m_responseEntityBody.append(m_network->readAll());
+    m_data.clear();
+    destroyNetwork();
+    if (m_state < Loading) {
+        m_state = Loading;
+        QScriptValue cbv = dispatchCallback(&m_me);
+        if (cbv.isError()) printError(cbv);
+    }
+    m_state = Done;
+    QScriptValue cbv = dispatchCallback(&m_me);
+    if (cbv.isError()) printError(cbv);
+
+    m_me = QScriptValue();
+}
+
+
+QString QDeclarativeXMLHttpRequest::responseBody() const
+{
+    return QString::fromUtf8(m_responseEntityBody);
+}
+
+QScriptValue QDeclarativeXMLHttpRequest::dispatchCallback(QScriptValue *me)
+{
+    QScriptValue v = me->property(QLatin1String("callback"));
+    return v.call();
+}
+
+void QDeclarativeXMLHttpRequest::printError(const QScriptValue& sv)
+{
+    QDeclarativeError error;
+    QDeclarativeExpressionPrivate::exceptionToError(sv.engine(), error);
+    qWarning().nospace() << qPrintable(error.toString());
+}
+
+void QDeclarativeXMLHttpRequest::destroyNetwork()
+{
+    if (m_network) {
+        m_network->disconnect();
+        m_network->deleteLater();
+        m_network = 0;
+    }
+}
+
+// XMLHttpRequest methods
+static QScriptValue qmlxmlhttprequest_open(QScriptContext *context, QScriptEngine *engine)
+{
+    QScriptValue dataObject = context->thisObject().data();
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(dataObject.toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (context->argumentCount() < 2 || context->argumentCount() > 5)
+        THROW_DOM(SYNTAX_ERR, "Incorrect argument count");
+
+    // Argument 0 - Method
+    QString method = context->argument(0).toString().toUpper();
+    if (method != QLatin1String("GET") && 
+        method != QLatin1String("PUT") &&
+        method != QLatin1String("HEAD") &&
+        method != QLatin1String("POST"))
+        THROW_DOM(SYNTAX_ERR, "Unsupported HTTP method type");
+
+
+    // Argument 1 - URL
+    QUrl url = QUrl::fromEncoded(context->argument(1).toString().toUtf8());
+
+    if (url.isRelative()) {
+        url = QDeclarativeScriptEngine::get(engine)->resolvedUrl(context,url);
+    }
+
+    // Argument 2 - async (optional)
+    if (context->argumentCount() > 2 && !context->argument(2).toBoolean())
+        THROW_DOM(NOT_SUPPORTED_ERR, "Synchronous XMLHttpRequest calls are not supported");
+
+
+    // Argument 3/4 - user/pass (optional)
+    QString username, password;
+    if (context->argumentCount() > 3)
+        username = context->argument(3).toString();
+    if (context->argumentCount() > 4)
+        password = context->argument(4).toString();
+
+
+    // Clear the fragment (if any)
+    url.setFragment(QString());
+    // Set username/password
+    if (!username.isNull()) url.setUserName(username);
+    if (!password.isNull()) url.setPassword(password);
+
+    return request->open(&dataObject, method, url);
+}
+
+static QScriptValue qmlxmlhttprequest_setRequestHeader(QScriptContext *context, QScriptEngine *engine)
+{
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(context->thisObject().data().toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (context->argumentCount() != 2)
+        THROW_DOM(SYNTAX_ERR, "Incorrect argument count");
+
+
+    if (request->readyState() != QDeclarativeXMLHttpRequest::Opened ||
+        request->sendFlag())
+        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
+
+
+    QString name = context->argument(0).toString();
+    QString value = context->argument(1).toString();
+
+    // ### Check that name and value are well formed
+
+    QString nameUpper = name.toUpper();
+    if (nameUpper == QLatin1String("ACCEPT-CHARSET") ||
+        nameUpper == QLatin1String("ACCEPT-ENCODING") ||
+        nameUpper == QLatin1String("CONNECTION") ||
+        nameUpper == QLatin1String("CONTENT-LENGTH") ||
+        nameUpper == QLatin1String("COOKIE") ||
+        nameUpper == QLatin1String("COOKIE2") ||
+        nameUpper == QLatin1String("CONTENT-TRANSFER-ENCODING") ||
+        nameUpper == QLatin1String("DATE") ||
+        nameUpper == QLatin1String("EXPECT") ||
+        nameUpper == QLatin1String("HOST") ||
+        nameUpper == QLatin1String("KEEP-ALIVE") ||
+        nameUpper == QLatin1String("REFERER") ||
+        nameUpper == QLatin1String("TE") ||
+        nameUpper == QLatin1String("TRAILER") ||
+        nameUpper == QLatin1String("TRANSFER-ENCODING") ||
+        nameUpper == QLatin1String("UPGRADE") ||
+        nameUpper == QLatin1String("USER-AGENT") ||
+        nameUpper == QLatin1String("VIA") ||
+        nameUpper.startsWith(QLatin1String("PROXY-")) ||
+        nameUpper.startsWith(QLatin1String("SEC-"))) 
+        return engine->undefinedValue();
+
+    request->addHeader(nameUpper, value);
+
+    return engine->undefinedValue();
+}
+
+static QScriptValue qmlxmlhttprequest_send(QScriptContext *context, QScriptEngine *)
+{
+    QScriptValue dataObject = context->thisObject().data();
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(dataObject.toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (request->readyState() != QDeclarativeXMLHttpRequest::Opened)
+        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
+
+    if (request->sendFlag())
+        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
+
+    QByteArray data;
+    if (context->argumentCount() > 0)
+        data = context->argument(0).toString().toUtf8();
+
+    return request->send(&dataObject, data);
+}
+
+static QScriptValue qmlxmlhttprequest_abort(QScriptContext *context, QScriptEngine *)
+{
+    QScriptValue dataObject = context->thisObject().data();
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(dataObject.toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    return request->abort(&dataObject);
+}
+
+static QScriptValue qmlxmlhttprequest_getResponseHeader(QScriptContext *context, QScriptEngine *engine)
+{
+    Q_UNUSED(engine)
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(context->thisObject().data().toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (context->argumentCount() != 1)
+        THROW_DOM(SYNTAX_ERR, "Incorrect argument count");
+
+    if (request->readyState() != QDeclarativeXMLHttpRequest::Loading &&
+        request->readyState() != QDeclarativeXMLHttpRequest::Done &&
+        request->readyState() != QDeclarativeXMLHttpRequest::HeadersReceived)
+        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
+
+    QString headerName = context->argument(0).toString();
+
+    return QScriptValue(request->header(headerName));
+}
+
+static QScriptValue qmlxmlhttprequest_getAllResponseHeaders(QScriptContext *context, QScriptEngine *engine)
+{
+    Q_UNUSED(engine)
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(context->thisObject().data().toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (context->argumentCount() != 0)
+        THROW_DOM(SYNTAX_ERR, "Incorrect argument count");
+
+    if (request->readyState() != QDeclarativeXMLHttpRequest::Loading &&
+        request->readyState() != QDeclarativeXMLHttpRequest::Done &&
+        request->readyState() != QDeclarativeXMLHttpRequest::HeadersReceived)
+        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
+
+    return QScriptValue(request->headers());
+}
+
+// XMLHttpRequest properties
+static QScriptValue qmlxmlhttprequest_readyState(QScriptContext *context, QScriptEngine *engine)
+{
+    Q_UNUSED(engine)
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(context->thisObject().data().toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    return QScriptValue(request->readyState());
+}
+
+static QScriptValue qmlxmlhttprequest_status(QScriptContext *context, QScriptEngine *engine)
+{
+    Q_UNUSED(engine)
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(context->thisObject().data().toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (request->readyState() == QDeclarativeXMLHttpRequest::Unsent ||
+        request->readyState() == QDeclarativeXMLHttpRequest::Opened)
+        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
+
+    if (request->errorFlag())
+        return QScriptValue(0);
+    else
+        return QScriptValue(request->replyStatus());
+}
+
+static QScriptValue qmlxmlhttprequest_statusText(QScriptContext *context, QScriptEngine *engine)
+{
+    Q_UNUSED(engine)
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(context->thisObject().data().toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (request->readyState() == QDeclarativeXMLHttpRequest::Unsent ||
+        request->readyState() == QDeclarativeXMLHttpRequest::Opened)
+        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
+
+    if (request->errorFlag())
+        return QScriptValue(0);
+    else
+        return QScriptValue(request->replyStatusText());
+}
+
+static QScriptValue qmlxmlhttprequest_responseText(QScriptContext *context, QScriptEngine *engine)
+{
+    Q_UNUSED(engine)
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(context->thisObject().data().toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (request->readyState() != QDeclarativeXMLHttpRequest::Loading &&
+        request->readyState() != QDeclarativeXMLHttpRequest::Done)
+        return QScriptValue(QString());
+    else 
+        return QScriptValue(request->responseBody());
+}
+
+static QScriptValue qmlxmlhttprequest_responseXML(QScriptContext *context, QScriptEngine *engine)
+{
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(context->thisObject().data().toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (request->readyState() != QDeclarativeXMLHttpRequest::Loading &&
+        request->readyState() != QDeclarativeXMLHttpRequest::Done)
+        return engine->nullValue();
+    else  
+        return Document::load(engine, request->responseBody());
+}
+
+static QScriptValue qmlxmlhttprequest_onreadystatechange(QScriptContext *context, QScriptEngine *engine)
+{
+    Q_UNUSED(engine);
+    QScriptValue dataObject = context->thisObject().data();
+    QDeclarativeXMLHttpRequest *request = qobject_cast<QDeclarativeXMLHttpRequest *>(dataObject.toQObject());
+    if (!request) 
+        THROW_REFERENCE("Not an XMLHttpRequest object");
+
+    if (context->argumentCount()) {
+        QScriptValue v = context->argument(0);
+        dataObject.setProperty(QLatin1String("callback"), v);
+        return v;
+    } else {
+        return dataObject.property(QLatin1String("callback"));
+    }
+}
+
+// Constructor
+static QScriptValue qmlxmlhttprequest_new(QScriptContext *context, QScriptEngine *engine)
+{
+    if (context->isCalledAsConstructor()) {
+        context->thisObject().setData(engine->newQObject(new QDeclarativeXMLHttpRequest(QDeclarativeScriptEngine::get(engine)->networkAccessManager()), QScriptEngine::ScriptOwnership));
+    }
+    return engine->undefinedValue();
+}
+
+void qt_add_qmlxmlhttprequest(QScriptEngine *engine)
+{
+    QScriptValue prototype = engine->newObject();
+
+    // Methods
+    prototype.setProperty(QLatin1String("open"), engine->newFunction(qmlxmlhttprequest_open, 2));
+    prototype.setProperty(QLatin1String("setRequestHeader"), engine->newFunction(qmlxmlhttprequest_setRequestHeader, 2));
+    prototype.setProperty(QLatin1String("send"), engine->newFunction(qmlxmlhttprequest_send));
+    prototype.setProperty(QLatin1String("abort"), engine->newFunction(qmlxmlhttprequest_abort));
+    prototype.setProperty(QLatin1String("getResponseHeader"), engine->newFunction(qmlxmlhttprequest_getResponseHeader, 1));
+    prototype.setProperty(QLatin1String("getAllResponseHeaders"), engine->newFunction(qmlxmlhttprequest_getAllResponseHeaders));
+
+    // Read-only properties
+    prototype.setProperty(QLatin1String("readyState"), engine->newFunction(qmlxmlhttprequest_readyState), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    prototype.setProperty(QLatin1String("status"), engine->newFunction(qmlxmlhttprequest_status), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    prototype.setProperty(QLatin1String("statusText"), engine->newFunction(qmlxmlhttprequest_statusText), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    prototype.setProperty(QLatin1String("responseText"), engine->newFunction(qmlxmlhttprequest_responseText), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    prototype.setProperty(QLatin1String("responseXML"), engine->newFunction(qmlxmlhttprequest_responseXML), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
+    prototype.setProperty(QLatin1String("onreadystatechange"), engine->newFunction(qmlxmlhttprequest_onreadystatechange), QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
+
+    // State values
+    prototype.setProperty(QLatin1String("UNSENT"), 0, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    prototype.setProperty(QLatin1String("OPENED"), 1, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    prototype.setProperty(QLatin1String("HEADERS_RECEIVED"), 2, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    prototype.setProperty(QLatin1String("LOADING"), 3, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    prototype.setProperty(QLatin1String("DONE"), 4, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+
+    // Constructor
+    QScriptValue constructor = engine->newFunction(qmlxmlhttprequest_new, prototype);
+    constructor.setProperty(QLatin1String("UNSENT"), 0, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    constructor.setProperty(QLatin1String("OPENED"), 1, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    constructor.setProperty(QLatin1String("HEADERS_RECEIVED"), 2, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    constructor.setProperty(QLatin1String("LOADING"), 3, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    constructor.setProperty(QLatin1String("DONE"), 4, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    engine->globalObject().setProperty(QLatin1String("XMLHttpRequest"), constructor);
+
+    // DOM Exception
+    QScriptValue domExceptionPrototype = engine->newObject();
+    domExceptionPrototype.setProperty(QLatin1String("INDEX_SIZE_ERR"), INDEX_SIZE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("DOMSTRING_SIZE_ERR"), DOMSTRING_SIZE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("HIERARCHY_REQUEST_ERR"), HIERARCHY_REQUEST_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("WRONG_DOCUMENT_ERR"), WRONG_DOCUMENT_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("INVALID_CHARACTER_ERR"), INVALID_CHARACTER_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("NO_DATA_ALLOWED_ERR"), NO_DATA_ALLOWED_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("NO_MODIFICATION_ALLOWED_ERR"), NO_MODIFICATION_ALLOWED_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("NOT_FOUND_ERR"), NOT_FOUND_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("NOT_SUPPORTED_ERR"), NOT_SUPPORTED_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("INUSE_ATTRIBUTE_ERR"), INUSE_ATTRIBUTE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("INVALID_STATE_ERR"), INVALID_STATE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("SYNTAX_ERR"), SYNTAX_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("INVALID_MODIFICATION_ERR"), INVALID_MODIFICATION_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("NAMESPACE_ERR"), NAMESPACE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("INVALID_ACCESS_ERR"), INVALID_ACCESS_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("VALIDATION_ERR"), VALIDATION_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    domExceptionPrototype.setProperty(QLatin1String("TYPE_MISMATCH_ERR"), TYPE_MISMATCH_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+
+    engine->globalObject().setProperty(QLatin1String("DOMException"), domExceptionPrototype);
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativexmlhttprequest.moc>
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest_p.h b/src/declarative/qml/qdeclarativexmlhttprequest_p.h
new file mode 100644
index 0000000..068cd0f
--- /dev/null
+++ b/src/declarative/qml/qdeclarativexmlhttprequest_p.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEXMLHTTPREQUEST_P_H
+#define QDECLARATIVEXMLHTTPREQUEST_P_H
+
+#include <QtScript/qscriptengine.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QScriptEngine;
+void qt_add_qmlxmlhttprequest(QScriptEngine *engine);
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEXMLHTTPREQUEST_P_H
+
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
deleted file mode 100644
index 7cde731..0000000
--- a/src/declarative/qml/qml.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QML_H
-#define QML_H
-
-#include "qmlmetatype.h"
-#include "qmlmetaproperty.h"
-#include "qmlparserstatus.h"
-#include "qmlpropertyvaluesource.h"
-#include "qmllist.h"
-
-#include <QtCore/qbytearray.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qmetaobject.h>
-
-QT_BEGIN_HEADER
-
-#define QML_DECLARE_TYPE(TYPE) \
-    Q_DECLARE_METATYPE(TYPE *) \
-    Q_DECLARE_METATYPE(QmlListProperty<TYPE>) 
-
-#define QML_DECLARE_TYPE_HASMETATYPE(TYPE) \
-    Q_DECLARE_METATYPE(QmlListProperty<TYPE>) 
-
-#define QML_DECLARE_INTERFACE(INTERFACE) \
-    QML_DECLARE_TYPE(INTERFACE)
-
-#define QML_DECLARE_INTERFACE_HASMETATYPE(INTERFACE) \
-    QML_DECLARE_TYPE_HASMETATYPE(INTERFACE)
-
-enum { /* TYPEINFO flags */
-    QML_HAS_ATTACHED_PROPERTIES = 0x01,
-};
-
-#define QML_DECLARE_TYPEINFO(TYPE, FLAGS) \
-QT_BEGIN_NAMESPACE \
-template <> \
-class QmlTypeInfo<TYPE > \
-{ \
-public: \
-    enum { \
-        hasAttachedProperties = (((FLAGS) & QML_HAS_ATTACHED_PROPERTIES) == QML_HAS_ATTACHED_PROPERTIES) \
-    }; \
-}; \
-QT_END_NAMESPACE
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-#define QML_REGISTER_INTERFACE(INTERFACE) \
-    qmlRegisterInterface<INTERFACE>(#INTERFACE)
-
-#define QML_REGISTER_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \
-    qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE)
-
-#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,TYPE,CLASS) \
-    qmlRegisterType<CLASS>(#URI, VMAJ, VMIN, #TYPE, #CLASS)
-
-#define QML_REGISTER_NOCREATE_TYPE(CLASS) \
-    qmlRegisterType<CLASS>(#CLASS)
-
-class QmlContext;
-class QmlEngine;
-Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *);
-Q_DECLARATIVE_EXPORT QmlContext *qmlContext(const QObject *);
-Q_DECLARATIVE_EXPORT QmlEngine *qmlEngine(const QObject *);
-Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
-
-template<typename T>
-QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true)
-{
-    // ### is this threadsafe?
-    static int idx = -1;
-
-    if (idx == -1)
-        idx = QmlMetaType::attachedPropertiesFuncId(&T::staticMetaObject);
-
-    if (idx == -1 || !obj)
-        return 0;
-
-    return qmlAttachedPropertiesObjectById(idx, obj, create);
-}
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QObject)
-Q_DECLARE_METATYPE(QVariant)
-
-QT_END_HEADER
-
-#endif // QML_H
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 1e4e234..0d5fcb0 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -1,131 +1,131 @@
 INCLUDEPATH += $$PWD
 SOURCES += \
-    $$PWD/qmlparser.cpp \
-    $$PWD/qmlinstruction.cpp \
-    $$PWD/qmlvmemetaobject.cpp \
-    $$PWD/qmlengine.cpp \
-    $$PWD/qmlexpression.cpp \
-    $$PWD/qmlbinding.cpp \
-    $$PWD/qmlmetaproperty.cpp \
-    $$PWD/qmlcomponent.cpp \
-    $$PWD/qmlcontext.cpp \
-    $$PWD/qmlcustomparser.cpp \
-    $$PWD/qmlpropertyvaluesource.cpp \
-    $$PWD/qmlpropertyvalueinterceptor.cpp \
-    $$PWD/qmlproxymetaobject.cpp \
-    $$PWD/qmlvme.cpp \
-    $$PWD/qmlcompiler.cpp \
-    $$PWD/qmlcompileddata.cpp \
-    $$PWD/qmlboundsignal.cpp \
-    $$PWD/qmldom.cpp \
-    $$PWD/qmlrefcount.cpp \
-    $$PWD/qmlprivate.cpp \
-    $$PWD/qmlmetatype.cpp \
-    $$PWD/qmlstringconverters.cpp \
-    $$PWD/qmlclassfactory.cpp \
-    $$PWD/qmlparserstatus.cpp \
-    $$PWD/qmlcompositetypemanager.cpp \
-    $$PWD/qmlinfo.cpp \
-    $$PWD/qmlerror.cpp \
-    $$PWD/qmlscriptparser.cpp \
-    $$PWD/qmlenginedebug.cpp \
-    $$PWD/qmlrewrite.cpp \
-    $$PWD/qmlvaluetype.cpp \
-    $$PWD/qmlcompiledbindings.cpp \
-    $$PWD/qmlxmlhttprequest.cpp \
-    $$PWD/qmlsqldatabase.cpp \
+    $$PWD/qdeclarativeparser.cpp \
+    $$PWD/qdeclarativeinstruction.cpp \
+    $$PWD/qdeclarativevmemetaobject.cpp \
+    $$PWD/qdeclarativeengine.cpp \
+    $$PWD/qdeclarativeexpression.cpp \
+    $$PWD/qdeclarativebinding.cpp \
+    $$PWD/qdeclarativemetaproperty.cpp \
+    $$PWD/qdeclarativecomponent.cpp \
+    $$PWD/qdeclarativecontext.cpp \
+    $$PWD/qdeclarativecustomparser.cpp \
+    $$PWD/qdeclarativepropertyvaluesource.cpp \
+    $$PWD/qdeclarativepropertyvalueinterceptor.cpp \
+    $$PWD/qdeclarativeproxymetaobject.cpp \
+    $$PWD/qdeclarativevme.cpp \
+    $$PWD/qdeclarativecompiler.cpp \
+    $$PWD/qdeclarativecompileddata.cpp \
+    $$PWD/qdeclarativeboundsignal.cpp \
+    $$PWD/qdeclarativedom.cpp \
+    $$PWD/qdeclarativerefcount.cpp \
+    $$PWD/qdeclarativeprivate.cpp \
+    $$PWD/qdeclarativemetatype.cpp \
+    $$PWD/qdeclarativestringconverters.cpp \
+    $$PWD/qdeclarativeclassfactory.cpp \
+    $$PWD/qdeclarativeparserstatus.cpp \
+    $$PWD/qdeclarativecompositetypemanager.cpp \
+    $$PWD/qdeclarativeinfo.cpp \
+    $$PWD/qdeclarativeerror.cpp \
+    $$PWD/qdeclarativescriptparser.cpp \
+    $$PWD/qdeclarativeenginedebug.cpp \
+    $$PWD/qdeclarativerewrite.cpp \
+    $$PWD/qdeclarativevaluetype.cpp \
+    $$PWD/qdeclarativecompiledbindings.cpp \
+    $$PWD/qdeclarativexmlhttprequest.cpp \
+    $$PWD/qdeclarativesqldatabase.cpp \
     $$PWD/qmetaobjectbuilder.cpp \
-    $$PWD/qmlwatcher.cpp \
-    $$PWD/qmlscript.cpp \
-    $$PWD/qmlcleanup.cpp \
-    $$PWD/qmlpropertycache.cpp \
-    $$PWD/qmlintegercache.cpp \
-    $$PWD/qmltypenamecache.cpp \
-    $$PWD/qmlscriptstring.cpp \
-    $$PWD/qmlobjectscriptclass.cpp \
-    $$PWD/qmlcontextscriptclass.cpp \
-    $$PWD/qmlglobalscriptclass.cpp \
-    $$PWD/qmlvaluetypescriptclass.cpp \
-    $$PWD/qmltypenamescriptclass.cpp \
-    $$PWD/qmllistscriptclass.cpp \
-    $$PWD/qmlworkerscript.cpp \
-    $$PWD/qmlimageprovider.cpp \
-    $$PWD/qmlnetworkaccessmanagerfactory.cpp \
-    $$PWD/qmldirparser.cpp \
-    $$PWD/qmlextensionplugin.cpp \
-    $$PWD/qmllist.cpp 
+    $$PWD/qdeclarativewatcher.cpp \
+    $$PWD/qdeclarativescript.cpp \
+    $$PWD/qdeclarativecleanup.cpp \
+    $$PWD/qdeclarativepropertycache.cpp \
+    $$PWD/qdeclarativeintegercache.cpp \
+    $$PWD/qdeclarativetypenamecache.cpp \
+    $$PWD/qdeclarativescriptstring.cpp \
+    $$PWD/qdeclarativeobjectscriptclass.cpp \
+    $$PWD/qdeclarativecontextscriptclass.cpp \
+    $$PWD/qdeclarativeglobalscriptclass.cpp \
+    $$PWD/qdeclarativevaluetypescriptclass.cpp \
+    $$PWD/qdeclarativetypenamescriptclass.cpp \
+    $$PWD/qdeclarativelistscriptclass.cpp \
+    $$PWD/qdeclarativeworkerscript.cpp \
+    $$PWD/qdeclarativeimageprovider.cpp \
+    $$PWD/qdeclarativenetworkaccessmanagerfactory.cpp \
+    $$PWD/qdeclarativedirparser.cpp \
+    $$PWD/qdeclarativeextensionplugin.cpp \
+    $$PWD/qdeclarativelist.cpp 
 
 HEADERS += \
-    $$PWD/qmlparser_p.h \
-    $$PWD/qmlglobal_p.h \
-    $$PWD/qmlinstruction_p.h \
-    $$PWD/qmlvmemetaobject_p.h \
-    $$PWD/qml.h \
-    $$PWD/qmlbinding_p.h \
-    $$PWD/qmlbinding_p_p.h \
-    $$PWD/qmlmetaproperty.h \
-    $$PWD/qmlcomponent.h \
-    $$PWD/qmlcomponent_p.h \
-    $$PWD/qmlcustomparser_p.h \
-    $$PWD/qmlcustomparser_p_p.h \
-    $$PWD/qmlpropertyvaluesource.h \
-    $$PWD/qmlpropertyvalueinterceptor.h \
-    $$PWD/qmlboundsignal_p.h \
-    $$PWD/qmlparserstatus.h \
-    $$PWD/qmlproxymetaobject_p.h \
-    $$PWD/qmlvme_p.h \
-    $$PWD/qmlcompiler_p.h \
-    $$PWD/qmlengine_p.h \
-    $$PWD/qmlexpression_p.h \
-    $$PWD/qmlprivate.h \
-    $$PWD/qmldom_p.h \
-    $$PWD/qmldom_p_p.h \
-    $$PWD/qmlrefcount_p.h \
-    $$PWD/qmlmetatype.h \
-    $$PWD/qmlengine.h \
-    $$PWD/qmlcontext.h \
-    $$PWD/qmlexpression.h \
-    $$PWD/qmlstringconverters_p.h \
-    $$PWD/qmlclassfactory_p.h \
-    $$PWD/qmlinfo.h \
-    $$PWD/qmlmetaproperty_p.h \
-    $$PWD/qmlcontext_p.h \
-    $$PWD/qmlcompositetypedata_p.h \
-    $$PWD/qmlcompositetypemanager_p.h \
-    $$PWD/qmllist.h \
-    $$PWD/qmllist_p.h \
-    $$PWD/qmldeclarativedata_p.h \
-    $$PWD/qmlerror.h \
-    $$PWD/qmlscriptparser_p.h \
-    $$PWD/qmlenginedebug_p.h \
-    $$PWD/qmlrewrite_p.h \
+    $$PWD/qdeclarativeparser_p.h \
+    $$PWD/qdeclarativeglobal_p.h \
+    $$PWD/qdeclarativeinstruction_p.h \
+    $$PWD/qdeclarativevmemetaobject_p.h \
+    $$PWD/qdeclarative.h \
+    $$PWD/qdeclarativebinding_p.h \
+    $$PWD/qdeclarativebinding_p_p.h \
+    $$PWD/qdeclarativemetaproperty.h \
+    $$PWD/qdeclarativecomponent.h \
+    $$PWD/qdeclarativecomponent_p.h \
+    $$PWD/qdeclarativecustomparser_p.h \
+    $$PWD/qdeclarativecustomparser_p_p.h \
+    $$PWD/qdeclarativepropertyvaluesource.h \
+    $$PWD/qdeclarativepropertyvalueinterceptor.h \
+    $$PWD/qdeclarativeboundsignal_p.h \
+    $$PWD/qdeclarativeparserstatus.h \
+    $$PWD/qdeclarativeproxymetaobject_p.h \
+    $$PWD/qdeclarativevme_p.h \
+    $$PWD/qdeclarativecompiler_p.h \
+    $$PWD/qdeclarativeengine_p.h \
+    $$PWD/qdeclarativeexpression_p.h \
+    $$PWD/qdeclarativeprivate.h \
+    $$PWD/qdeclarativedom_p.h \
+    $$PWD/qdeclarativedom_p_p.h \
+    $$PWD/qdeclarativerefcount_p.h \
+    $$PWD/qdeclarativemetatype.h \
+    $$PWD/qdeclarativeengine.h \
+    $$PWD/qdeclarativecontext.h \
+    $$PWD/qdeclarativeexpression.h \
+    $$PWD/qdeclarativestringconverters_p.h \
+    $$PWD/qdeclarativeclassfactory_p.h \
+    $$PWD/qdeclarativeinfo.h \
+    $$PWD/qdeclarativemetaproperty_p.h \
+    $$PWD/qdeclarativecontext_p.h \
+    $$PWD/qdeclarativecompositetypedata_p.h \
+    $$PWD/qdeclarativecompositetypemanager_p.h \
+    $$PWD/qdeclarativelist.h \
+    $$PWD/qdeclarativelist_p.h \
+    $$PWD/qdeclarativedeclarativedata_p.h \
+    $$PWD/qdeclarativeerror.h \
+    $$PWD/qdeclarativescriptparser_p.h \
+    $$PWD/qdeclarativeenginedebug_p.h \
+    $$PWD/qdeclarativerewrite_p.h \
     $$PWD/qpodvector_p.h \
     $$PWD/qbitfield_p.h \
-    $$PWD/qmlvaluetype_p.h \
-    $$PWD/qmlcompiledbindings_p.h \
-    $$PWD/qmlxmlhttprequest_p.h \
-    $$PWD/qmlsqldatabase_p.h \
+    $$PWD/qdeclarativevaluetype_p.h \
+    $$PWD/qdeclarativecompiledbindings_p.h \
+    $$PWD/qdeclarativexmlhttprequest_p.h \
+    $$PWD/qdeclarativesqldatabase_p.h \
     $$PWD/qmetaobjectbuilder_p.h \
-    $$PWD/qmlwatcher_p.h \
-    $$PWD/qmlcleanup_p.h \
-    $$PWD/qmlpropertycache_p.h \
-    $$PWD/qmlintegercache_p.h \
-    $$PWD/qmltypenamecache_p.h \
-    $$PWD/qmlscriptstring.h \
-    $$PWD/qmlobjectscriptclass_p.h \
-    $$PWD/qmlcontextscriptclass_p.h \
-    $$PWD/qmlglobalscriptclass_p.h \
-    $$PWD/qmlvaluetypescriptclass_p.h \
-    $$PWD/qmltypenamescriptclass_p.h \
-    $$PWD/qmllistscriptclass_p.h \
-    $$PWD/qmlworkerscript_p.h \
-    $$PWD/qmlscriptclass_p.h \
-    $$PWD/qmlguard_p.h \
-    $$PWD/qmlimageprovider.h \
-    $$PWD/qmlnetworkaccessmanagerfactory.h \
-    $$PWD/qmldirparser_p.h \
-    $$PWD/qmlextensioninterface.h \
-    $$PWD/qmlextensionplugin.h
+    $$PWD/qdeclarativewatcher_p.h \
+    $$PWD/qdeclarativecleanup_p.h \
+    $$PWD/qdeclarativepropertycache_p.h \
+    $$PWD/qdeclarativeintegercache_p.h \
+    $$PWD/qdeclarativetypenamecache_p.h \
+    $$PWD/qdeclarativescriptstring.h \
+    $$PWD/qdeclarativeobjectscriptclass_p.h \
+    $$PWD/qdeclarativecontextscriptclass_p.h \
+    $$PWD/qdeclarativeglobalscriptclass_p.h \
+    $$PWD/qdeclarativevaluetypescriptclass_p.h \
+    $$PWD/qdeclarativetypenamescriptclass_p.h \
+    $$PWD/qdeclarativelistscriptclass_p.h \
+    $$PWD/qdeclarativeworkerscript_p.h \
+    $$PWD/qdeclarativescriptclass_p.h \
+    $$PWD/qdeclarativeguard_p.h \
+    $$PWD/qdeclarativeimageprovider.h \
+    $$PWD/qdeclarativenetworkaccessmanagerfactory.h \
+    $$PWD/qdeclarativedirparser_p.h \
+    $$PWD/qdeclarativeextensioninterface.h \
+    $$PWD/qdeclarativeextensionplugin.h
 
 QT += sql
 include(parser/parser.pri)
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
deleted file mode 100644
index 04801df..0000000
--- a/src/declarative/qml/qmlbinding.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlbinding_p.h"
-#include "qmlbinding_p_p.h"
-
-#include "qml.h"
-#include "qmlcontext.h"
-#include "qmlinfo.h"
-#include "qmlcontext_p.h"
-#include "qmldeclarativedata_p.h"
-#include "qmlstringconverters_p.h"
-
-#include <qfxperf_p_p.h>
-
-#include <QVariant>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-QmlBindingData::QmlBindingData()
-: updating(false), enabled(false)
-{
-}
-
-QmlBindingData::~QmlBindingData()
-{
-    removeError();
-}
-
-void QmlBindingData::refresh()
-{
-    if (enabled && !updating && q) {
-        QmlBinding *b = static_cast<QmlBinding *>(QmlExpressionPrivate::get(q));
-        b->update();
-    }
-}
-
-QmlBindingPrivate::QmlBindingPrivate()
-: QmlExpressionPrivate(new QmlBindingData)
-{
-}
-
-QmlBinding::QmlBinding(void *data, QmlRefCount *rc, QObject *obj, QmlContext *ctxt, const QString &url, int lineNumber, QObject *parent)
-: QmlExpression(ctxt, data, rc, obj, url, lineNumber, *new QmlBindingPrivate)
-{
-    setParent(parent);
-    setNotifyOnValueChanged(true);
-}
-
-QmlBinding::QmlBinding(const QString &str, QObject *obj, QmlContext *ctxt, QObject *parent)
-: QmlExpression(ctxt, str, obj, *new QmlBindingPrivate)
-{
-    setParent(parent);
-    setNotifyOnValueChanged(true);
-}
-
-QmlBinding::~QmlBinding()
-{
-}
-
-void QmlBinding::setTarget(const QmlMetaProperty &prop)
-{
-    Q_D(QmlBinding);
-    d->bindingData()->property = prop;
-
-    update();
-}
-
-QmlMetaProperty QmlBinding::property() const 
-{
-   Q_D(const QmlBinding);
-   return d->bindingData()->property; 
-}
-
-void QmlBinding::update(QmlMetaProperty::WriteFlags flags)
-{
-    Q_D(QmlBinding);
-
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::BindableValueUpdate> bu;
-#endif
-    QmlBindingData *data = d->bindingData();
-
-    if (!data->enabled)
-        return;
-
-    data->addref();
-
-    if (!data->updating) {
-        data->updating = true;
-
-        if (data->property.propertyCategory() == QmlMetaProperty::Bindable) {
-
-            int idx = data->property.coreIndex();
-            Q_ASSERT(idx != -1);
-
-
-            QmlBinding *t = this;
-            int status = -1;
-            void *a[] = { &t, 0, &status, &flags };
-            QMetaObject::metacall(data->property.object(),
-                                  QMetaObject::WriteProperty,
-                                  idx, a);
-
-        } else {
-            bool isUndefined = false;
-            QVariant value = this->value(&isUndefined);
-
-            if (isUndefined && !data->error.isValid() && data->property.isResettable()) {
-
-                data->property.reset();
-
-            } else if (isUndefined && !data->error.isValid()) {
-
-                QUrl url = QUrl(data->url);
-                int line = data->line;
-                if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
-
-                data->error.setUrl(url);
-                data->error.setLine(line);
-                data->error.setColumn(-1);
-                data->error.setDescription(QLatin1String("Unable to assign [undefined] to ") + QLatin1String(QMetaType::typeName(data->property.propertyType())));
-
-            } else if (!isUndefined && data->property.object() && 
-                       !data->property.write(value, flags)) {
-
-                QUrl url = QUrl(data->url);
-                int line = data->line;
-                if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
-
-                const char *valueType = 0;
-                if (value.userType() == QVariant::Invalid) valueType = "null";
-                else valueType = QMetaType::typeName(value.userType());
-
-                data->error.setUrl(url);
-                data->error.setLine(line);
-                data->error.setColumn(-1);
-                data->error.setDescription(QLatin1String("Unable to assign ") +
-                                           QLatin1String(valueType) +
-                                           QLatin1String(" to ") +
-                                           QLatin1String(QMetaType::typeName(data->property.propertyType())));
-            }
-
-            if (data->error.isValid()) {
-                QmlEnginePrivate *p = (data->context() && data->context()->engine())?
-                    QmlEnginePrivate::get(data->context()->engine()):0;
-               if (!data->addError(p)) 
-                   qWarning().nospace() << qPrintable(this->error().toString());
-            } else {
-                data->removeError();
-            }
-        }
-
-        data->updating = false;
-    } else {
-        qmlInfo(data->property.object()) << tr("Binding loop detected for property \"%1\"").arg(data->property.name());
-    }
-
-    data->release();
-}
-
-void QmlBindingPrivate::emitValueChanged()
-{
-    Q_Q(QmlBinding);
-    q->update();
-}
-
-void QmlBinding::setEnabled(bool e, QmlMetaProperty::WriteFlags flags)
-{
-    Q_D(QmlBinding);
-    d->bindingData()->enabled = e;
-    setNotifyOnValueChanged(e);
-
-    QmlAbstractBinding::setEnabled(e, flags);
-
-    if (e) {
-        addToObject(d->bindingData()->property.object());
-        update(flags);
-    } else {
-        removeFromObject();
-    }
-}
-
-int QmlBinding::propertyIndex()
-{
-    Q_D(QmlBinding);
-    return d->bindingData()->property.coreIndex();
-}
-
-bool QmlBinding::enabled() const
-{
-    Q_D(const QmlBinding);
-
-    return d->bindingData()->enabled;
-}
-
-QString QmlBinding::expression() const
-{
-    return QmlExpression::expression();
-}
-
-QmlAbstractBinding::QmlAbstractBinding()
-: m_object(0), m_mePtr(0), m_prevBinding(0), m_nextBinding(0)
-{
-}
-
-QmlAbstractBinding::~QmlAbstractBinding()
-{
-    removeFromObject();
-    if (m_mePtr)
-        *m_mePtr = 0;
-}
-
-void QmlAbstractBinding::destroy()
-{
-    delete this;
-}
-
-void QmlAbstractBinding::addToObject(QObject *object)
-{
-    Q_ASSERT(object);
-
-    removeFromObject();
-
-    Q_ASSERT(!m_prevBinding);
-
-    QmlDeclarativeData *data = QmlDeclarativeData::get(object, true);
-    m_nextBinding = data->bindings;
-    if (m_nextBinding) m_nextBinding->m_prevBinding = &m_nextBinding;
-    m_prevBinding = &data->bindings;
-    data->bindings = this;
-    m_object = object;
-
-    data->setBindingBit(m_object, propertyIndex());
-}
-
-void QmlAbstractBinding::removeFromObject()
-{
-    if (m_prevBinding) {
-        Q_ASSERT(m_object);
-
-        *m_prevBinding = m_nextBinding;
-        if (m_nextBinding) m_nextBinding->m_prevBinding = m_prevBinding;
-        m_prevBinding = 0;
-        m_nextBinding = 0;
-
-        QmlDeclarativeData *data = QmlDeclarativeData::get(m_object, false);
-        if (data) data->clearBindingBit(propertyIndex());
-        m_object = 0;
-    }
-}
-
-void QmlAbstractBinding::clear()
-{
-    if (m_mePtr)
-        *m_mePtr = 0;
-}
-
-QString QmlAbstractBinding::expression() const
-{
-    return QLatin1String("<Unknown>");
-}
-
-void QmlAbstractBinding::setEnabled(bool e, QmlMetaProperty::WriteFlags)
-{
-    if (e) m_mePtr = 0;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlbinding_p.h b/src/declarative/qml/qmlbinding_p.h
deleted file mode 100644
index 4594476..0000000
--- a/src/declarative/qml/qmlbinding_p.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLBINDING_P_H
-#define QMLBINDING_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qml.h"
-#include "qmlpropertyvaluesource.h"
-#include "qmlexpression.h"
-
-#include <QtCore/QObject>
-#include <QtCore/QMetaProperty>
-
-QT_BEGIN_NAMESPACE
-
-class Q_AUTOTEST_EXPORT QmlAbstractBinding
-{
-public:
-    QmlAbstractBinding();
-    virtual ~QmlAbstractBinding();
-
-    virtual void destroy();
-
-    virtual QString expression() const;
-
-    void setEnabled(bool e) { setEnabled(e, QmlMetaProperty::DontRemoveBinding); }
-    virtual void setEnabled(bool, QmlMetaProperty::WriteFlags) = 0;
-    virtual int propertyIndex() = 0;
-
-    void update() { update(QmlMetaProperty::DontRemoveBinding); }
-    virtual void update(QmlMetaProperty::WriteFlags) = 0;
-
-    void addToObject(QObject *);
-    void removeFromObject();
-
-protected:
-    void clear();
-
-private:
-    friend class QmlDeclarativeData;
-    friend class QmlMetaProperty;
-    friend class QmlMetaPropertyPrivate;
-    friend class QmlVME;
-
-    QObject *m_object;
-    QmlAbstractBinding **m_mePtr;
-    QmlAbstractBinding **m_prevBinding;
-    QmlAbstractBinding  *m_nextBinding;
-};
-
-class QmlContext;
-class QmlBindingPrivate;
-class Q_AUTOTEST_EXPORT QmlBinding : public QmlExpression, public QmlAbstractBinding
-{
-Q_OBJECT
-public:
-    QmlBinding(const QString &, QObject *, QmlContext *, QObject *parent=0);
-    QmlBinding(void *, QmlRefCount *, QObject *, QmlContext *, const QString &, int, 
-               QObject *parent);
-    ~QmlBinding();
-
-    void setTarget(const QmlMetaProperty &);
-    QmlMetaProperty property() const;
-
-    bool enabled() const;
-
-    // Inherited from  QmlAbstractBinding
-    virtual void setEnabled(bool, QmlMetaProperty::WriteFlags flags);
-    virtual int propertyIndex();
-    virtual void update(QmlMetaProperty::WriteFlags flags);
-    virtual QString expression() const;
-
-public Q_SLOTS:
-    void update() { update(QmlMetaProperty::DontRemoveBinding); }
-
-protected:
-    void emitValueChanged();
-
-private:
-    Q_DECLARE_PRIVATE(QmlBinding)
-};
-Q_DECLARE_METATYPE(QmlBinding*);
-
-QT_END_NAMESPACE
-
-#endif // QMLBINDING_P_H
diff --git a/src/declarative/qml/qmlbinding_p_p.h b/src/declarative/qml/qmlbinding_p_p.h
deleted file mode 100644
index 131bacc..0000000
--- a/src/declarative/qml/qmlbinding_p_p.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLBINDING_P_P_H
-#define QMLBINDING_P_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlbinding_p.h"
-
-#include "qmlmetaproperty.h"
-#include "qmlexpression_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlBindingData : public QmlExpressionData
-{
-public:
-    QmlBindingData();
-    virtual ~QmlBindingData();
-
-    bool updating:1;
-    bool enabled:1;
-
-    QmlMetaProperty property;
-
-    virtual void refresh();
-};
-
-class QmlBindingPrivate : public QmlExpressionPrivate
-{
-    Q_DECLARE_PUBLIC(QmlBinding)
-public:
-    QmlBindingPrivate();
-
-    QmlBindingData *bindingData() { return static_cast<QmlBindingData *>(data); }
-    const QmlBindingData *bindingData() const { return static_cast<const QmlBindingData *>(data); }
-
-    virtual void emitValueChanged();
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLBINDING_P_P_H
diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp
deleted file mode 100644
index db5fd61..0000000
--- a/src/declarative/qml/qmlboundsignal.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlboundsignal_p.h"
-
-#include "qmetaobjectbuilder_p.h"
-#include "qmlengine_p.h"
-#include "qmlexpression_p.h"
-#include "qmlcontext_p.h"
-#include "qmlmetatype.h"
-#include "qml.h"
-#include "qmlcontext.h"
-#include "qmlglobal_p.h"
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlBoundSignalParameters : public QObject
-{
-Q_OBJECT
-public:
-    QmlBoundSignalParameters(const QMetaMethod &, QObject * = 0);
-    ~QmlBoundSignalParameters();
-
-    void setValues(void **);
-    void clearValues();
-
-private:
-    friend class MetaObject;
-    int metaCall(QMetaObject::Call, int _id, void **);
-    struct MetaObject : public QAbstractDynamicMetaObject {
-        MetaObject(QmlBoundSignalParameters *b)
-            : parent(b) {}
-
-        int metaCall(QMetaObject::Call c, int id, void **a) { 
-            return parent->metaCall(c, id, a);
-        }
-        QmlBoundSignalParameters *parent;
-    };
-
-    int *types;
-    void **values;
-    QMetaObject *myMetaObject;
-};
-
-static int evaluateIdx = -1;
-
-QmlAbstractBoundSignal::QmlAbstractBoundSignal(QObject *parent)
-: QObject(parent)
-{
-}
-
-QmlAbstractBoundSignal::~QmlAbstractBoundSignal()
-{
-}
-
-QmlBoundSignal::QmlBoundSignal(QObject *scope, const QMetaMethod &signal, 
-                               QObject *parent)
-: m_expression(0), m_signal(signal), m_paramsValid(false), m_params(0)
-{
-    // A cached evaluation of the QmlExpression::value() slot index.
-    //
-    // This is thread safe.  Although it may be updated by two threads, they
-    // will both set it to the same value - so the worst thing that can happen
-    // is that they both do the work to figure it out.  Boo hoo.
-    if (evaluateIdx == -1) evaluateIdx = metaObject()->methodCount();
-
-    QmlGraphics_setParent_noEvent(this, parent);
-    QMetaObject::connect(scope, m_signal.methodIndex(), this, evaluateIdx);
-}
-
-QmlBoundSignal::QmlBoundSignal(QmlContext *ctxt, const QString &val, 
-                               QObject *scope, const QMetaMethod &signal,
-                               QObject *parent)
-: m_expression(0), m_signal(signal), m_paramsValid(false), m_params(0)
-{
-    // A cached evaluation of the QmlExpression::value() slot index.
-    //
-    // This is thread safe.  Although it may be updated by two threads, they
-    // will both set it to the same value - so the worst thing that can happen
-    // is that they both do the work to figure it out.  Boo hoo.
-    if (evaluateIdx == -1) evaluateIdx = metaObject()->methodCount();
-
-    QmlGraphics_setParent_noEvent(this, parent);
-    QMetaObject::connect(scope, m_signal.methodIndex(), this, evaluateIdx);
-
-    m_expression = new QmlExpression(ctxt, val, scope);
-}
-
-QmlBoundSignal::~QmlBoundSignal()
-{
-    delete m_expression;
-    m_expression = 0;
-}
-
-int QmlBoundSignal::index() const 
-{ 
-    return m_signal.methodIndex();
-}
-
-/*!
-    Returns the signal expression.
-*/
-QmlExpression *QmlBoundSignal::expression() const
-{
-    return m_expression;
-}
-
-/*!
-    Sets the signal expression to \a e.  Returns the current signal expression,
-    or null if there is no signal expression.
-
-    The QmlBoundSignal instance takes ownership of \a e.  The caller is 
-    assumes ownership of the returned QmlExpression.
-*/
-QmlExpression *QmlBoundSignal::setExpression(QmlExpression *e)
-{
-    QmlExpression *rv = m_expression;
-    m_expression = e;
-    if (m_expression) m_expression->setNotifyOnValueChanged(false);
-    return rv;
-}
-
-QmlBoundSignal *QmlBoundSignal::cast(QObject *o)
-{
-    QmlAbstractBoundSignal *s = qobject_cast<QmlAbstractBoundSignal*>(o);
-    return static_cast<QmlBoundSignal *>(s);
-}
-
-int QmlBoundSignal::qt_metacall(QMetaObject::Call c, int id, void **a)
-{
-    if (c == QMetaObject::InvokeMetaMethod && id == evaluateIdx) {
-        if (!m_paramsValid) {
-            if (!m_signal.parameterTypes().isEmpty())
-                m_params = new QmlBoundSignalParameters(m_signal, this);
-            m_paramsValid = true;
-        }
-
-        if (m_params) m_params->setValues(a);
-        if (m_expression) {
-            QmlExpressionPrivate::get(m_expression)->value(m_params);
-            if (m_expression && m_expression->hasError())
-                qWarning().nospace() << qPrintable(m_expression->error().toString());
-        }
-        if (m_params) m_params->clearValues();
-        return -1;
-    } else {
-        return QObject::qt_metacall(c, id, a);
-    }
-}
-
-QmlBoundSignalParameters::QmlBoundSignalParameters(const QMetaMethod &method, 
-                                                   QObject *parent)
-: QObject(parent), types(0), values(0)
-{
-    MetaObject *mo = new MetaObject(this);
-
-    // ### Optimize!
-    // ### Ensure only supported types are allowed, otherwise it might crash
-    QMetaObjectBuilder mob;
-    mob.setSuperClass(&QmlBoundSignalParameters::staticMetaObject);
-    mob.setClassName("QmlBoundSignalParameters");
-
-    QList<QByteArray> paramTypes = method.parameterTypes();
-    QList<QByteArray> paramNames = method.parameterNames();
-    types = new int[paramTypes.count()];
-    for (int ii = 0; ii < paramTypes.count(); ++ii) {
-        const QByteArray &type = paramTypes.at(ii);
-        const QByteArray &name = paramNames.at(ii);
-
-        if (name.isEmpty() || type.isEmpty()) {
-            types[ii] = 0;
-            continue;
-        }
-
-        QVariant::Type t = (QVariant::Type)QMetaType::type(type.constData());
-        if (QmlMetaType::isQObject(t)) {
-            types[ii] = QMetaType::QObjectStar;
-            QMetaPropertyBuilder prop = mob.addProperty(name, "QObject*");
-            prop.setWritable(false);
-        } else {
-            types[ii] = t;
-            QMetaPropertyBuilder prop = mob.addProperty(name, type);
-            prop.setWritable(false);
-        }
-    }
-    myMetaObject = mob.toMetaObject();
-    *static_cast<QMetaObject *>(mo) = *myMetaObject;
-
-    d_ptr->metaObject = mo;
-}
-
-QmlBoundSignalParameters::~QmlBoundSignalParameters()
-{
-    delete [] types;
-    qFree(myMetaObject);
-}
-
-void QmlBoundSignalParameters::setValues(void **v)
-{
-    values = v;
-}
-
-void QmlBoundSignalParameters::clearValues()
-{
-    values = 0;
-}
-
-int QmlBoundSignalParameters::metaCall(QMetaObject::Call c, int id, void **a)
-{
-    if (!values)
-        return -1;
-
-    if (c == QMetaObject::ReadProperty && id >= 1) {
-        QmlMetaType::copy(types[id - 1], a[0], values[id]);
-        return -1;
-    } else {
-        return qt_metacall(c, id, a);
-    }
-}
-
-QT_END_NAMESPACE
-
-#include <qmlboundsignal.moc>
diff --git a/src/declarative/qml/qmlboundsignal_p.h b/src/declarative/qml/qmlboundsignal_p.h
deleted file mode 100644
index 51d21d7..0000000
--- a/src/declarative/qml/qmlboundsignal_p.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLBOUNDSIGNAL_P_H
-#define QMLBOUNDSIGNAL_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlexpression.h"
-
-#include <QtCore/qmetaobject.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlAbstractBoundSignal : public QObject
-{
-    Q_OBJECT
-public:
-    QmlAbstractBoundSignal(QObject *parent = 0);
-    virtual ~QmlAbstractBoundSignal() = 0;
-};
-
-class QmlBoundSignalParameters;
-class QmlBoundSignal : public QmlAbstractBoundSignal
-{
-public:
-    QmlBoundSignal(QObject *scope, const QMetaMethod &signal, QObject *parent);
-    QmlBoundSignal(QmlContext *ctxt, const QString &val, QObject *scope, 
-                   const QMetaMethod &signal, QObject *parent);
-    virtual ~QmlBoundSignal();
-
-    int index() const;
-
-    QmlExpression *expression() const;
-    QmlExpression *setExpression(QmlExpression *);
-
-    static QmlBoundSignal *cast(QObject *);
-
-protected:
-    virtual int qt_metacall(QMetaObject::Call c, int id, void **a);
-
-private:
-    QmlExpression *m_expression;
-    QMetaMethod m_signal;
-    bool m_paramsValid;
-    QmlBoundSignalParameters *m_params;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLBOUNDSIGNAL_P_H
diff --git a/src/declarative/qml/qmlclassfactory.cpp b/src/declarative/qml/qmlclassfactory.cpp
deleted file mode 100644
index 2adff09..0000000
--- a/src/declarative/qml/qmlclassfactory.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlclassfactory_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QmlClassFactory::~QmlClassFactory()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlclassfactory_p.h b/src/declarative/qml/qmlclassfactory_p.h
deleted file mode 100644
index 2ddadcf..0000000
--- a/src/declarative/qml/qmlclassfactory_p.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCLASSFACTORY_P_H
-#define QMLCLASSFACTORY_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QByteArray;
-class QUrl;
-class QmlComponent;
-
-class QmlClassFactory 
-{
-public:
-    virtual ~QmlClassFactory();
-    virtual QmlComponent *create(const QByteArray &, const QUrl& baseUrl, QmlEngine*) = 0;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLCLASSFACTORY_P_H
diff --git a/src/declarative/qml/qmlcleanup.cpp b/src/declarative/qml/qmlcleanup.cpp
deleted file mode 100644
index 581d4a3..0000000
--- a/src/declarative/qml/qmlcleanup.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlcleanup_p.h"
-
-#include "qmlengine_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-\internal
-\class QmlCleanup
-\brief The QmlCleanup provides a callback when a QmlEngine is deleted. 
-
-Any object that needs cleanup to occur before the QmlEngine's QScriptEngine is
-destroyed should inherit from QmlCleanup.  The clear() virtual method will be
-called by QmlEngine just before it deletes the QScriptEngine.
-*/
-
-/*!
-\internal
-
-Create a QmlCleanup for \a engine
-*/
-QmlCleanup::QmlCleanup(QmlEngine *engine)
-: prev(0), next(0)
-{
-    if (!engine)
-        return;
-
-    QmlEnginePrivate *p = QmlEnginePrivate::get(engine);
-
-    if (p->cleanup) next = p->cleanup;
-    p->cleanup = this;
-    prev = &p->cleanup;
-    if (next) next->prev = &next;
-}
-
-/*!
-\internal
-*/
-QmlCleanup::~QmlCleanup()
-{
-    if (prev) *prev = next;
-    if (next) next->prev = prev;
-    prev = 0; 
-    next = 0;
-}
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcleanup_p.h b/src/declarative/qml/qmlcleanup_p.h
deleted file mode 100644
index 50803f3..0000000
--- a/src/declarative/qml/qmlcleanup_p.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCLEANUP_P_H
-#define QMLCLEANUP_P_H
-
-#include <QtCore/qglobal.h>
-
-// 
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QmlCleanup
-{
-public:
-    QmlCleanup(QmlEngine *);
-    virtual ~QmlCleanup();
-
-protected:
-    virtual void clear() = 0;
-
-private:
-    friend class QmlEnginePrivate;
-    QmlCleanup **prev;
-    QmlCleanup  *next;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLCLEANUP_P_H
-
diff --git a/src/declarative/qml/qmlcompiledbindings.cpp b/src/declarative/qml/qmlcompiledbindings.cpp
deleted file mode 100644
index 7a8cf0e..0000000
--- a/src/declarative/qml/qmlcompiledbindings.cpp
+++ /dev/null
@@ -1,2738 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// #define COMPILEDBINDINGS_DEBUG
-
-#include "qmlcompiledbindings_p.h"
-
-#include <QtDeclarative/qmlinfo.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmljsast_p.h>
-#include <private/qmljsengine_p.h>
-#include <private/qmlexpression_p.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qnumeric.h>
-#include <private/qmlgraphicsanchors_p_p.h>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QmlJS;
-
-namespace {
-// Supported types: int, qreal, QString (needs constr/destr), QObject*, bool
-struct Register {
-    void setUndefined() { type = 0; }
-    void setUnknownButDefined() { type = -1; }
-    void setNaN() { setqreal(qSNaN()); }
-    bool isUndefined() const { return type == 0; }
-
-    void setQObject(QObject *o) { *((QObject **)data) = o; type = QMetaType::QObjectStar; }
-    QObject *getQObject() const { return *((QObject **)data); }
-
-    void setqreal(qreal v) { *((qreal *)data) = v; type = QMetaType::QReal; }
-    qreal getqreal() const { return *((qreal *)data); }
-
-    void setint(int v) { *((int *)data) = v; type = QMetaType::Int; }
-    int getint() const { return *((int *)data); }
-
-    void setbool(bool v) { *((bool *)data) = v; type = QMetaType::Bool; }
-    bool getbool() const { return *((bool *)data); }
-
-    QVariant *getvariantptr() { return (QVariant *)typeDataPtr(); }
-    QString *getstringptr() { return (QString *)typeDataPtr(); }
-    QUrl *geturlptr() { return (QUrl *)typeDataPtr(); }
-    const QVariant *getvariantptr() const { return (QVariant *)typeDataPtr(); }
-    const QString *getstringptr() const { return (QString *)typeDataPtr(); }
-    const QUrl *geturlptr() const { return (QUrl *)typeDataPtr(); }
-
-    void *typeDataPtr() { return (void *)&data; }
-    void *typeMemory() { return (void *)data; }
-    const void *typeDataPtr() const { return (void *)&data; }
-    const void *typeMemory() const { return (void *)data; }
-
-    int gettype() const { return type; }
-    void settype(int t) { type = t; }
-
-    int type;          // Optional type
-    void *data[2];     // Object stored here
-};
-}
-
-class QmlCompiledBindingsPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlCompiledBindings)
-
-public:
-    QmlCompiledBindingsPrivate();
-    virtual ~QmlCompiledBindingsPrivate();
-
-    struct Binding : public QmlAbstractBinding, public QmlDelayedError {
-        Binding() : enabled(false), updating(0), property(0),
-                    scope(0), target(0), parent(0) {}
-
-        // Inherited from QmlAbstractBinding
-        virtual void setEnabled(bool, QmlMetaProperty::WriteFlags flags);
-        virtual int propertyIndex();
-        virtual void update(QmlMetaProperty::WriteFlags flags);
-        virtual void destroy();
-
-        int index:30;
-        bool enabled:1;
-        bool updating:1;
-        int property;
-        QObject *scope;
-        QObject *target;
-
-        QmlCompiledBindingsPrivate *parent;
-    };
-
-    struct Subscription {
-        struct Signal {
-            QmlGuard<QObject> source;
-            int notifyIndex;
-        };
-
-        enum { InvalidType, SignalType, IdType } type;
-        inline Subscription();
-        inline ~Subscription();
-        bool isSignal() const { return type == SignalType; }
-        bool isId() const { return type == IdType; }
-        inline Signal *signal();
-        inline QmlContextPrivate::IdNotifier *id();
-        union {
-            char signalData[sizeof(Signal)];
-            char idData[sizeof(QmlContextPrivate::IdNotifier)];
-        };
-    };
-    Subscription *subscriptions;
-    QScriptDeclarativeClass::PersistentIdentifier *identifiers;
-
-    void run(Binding *);
-
-    const char *programData;
-    Binding *m_bindings;
-    quint32 *m_signalTable;
-
-    static int methodCount;
-
-    void init();
-    void run(int instr, QmlContextPrivate *context, 
-             QmlDelayedError *error, QObject *scope, QObject *output);
-
-
-    inline void unsubscribe(int subIndex);
-    inline void subscribeId(QmlContextPrivate *p, int idIndex, int subIndex);
-    inline void subscribe(QObject *o, int notifyIndex, int subIndex);
-
-    QmlPropertyCache::Data *findproperty(QObject *obj, 
-                                         const QScriptDeclarativeClass::Identifier &name,
-                                         QmlEnginePrivate *enginePriv, 
-                                         QmlPropertyCache::Data &local);
-    bool findproperty(QObject *obj, 
-                      Register *output, 
-                      QmlEnginePrivate *enginePriv,
-                      int subIdx, 
-                      const QScriptDeclarativeClass::Identifier &name,
-                      bool isTerminal);
-    void findgeneric(Register *output,                                 // value output
-                     int subIdx,                                       // Subscription index in config
-                     QmlContextPrivate *context,                       // Context to search in
-                     const QScriptDeclarativeClass::Identifier &name, 
-                     bool isTerminal);
-};
-
-QmlCompiledBindingsPrivate::QmlCompiledBindingsPrivate()
-: subscriptions(0), identifiers(0)
-{
-}
-
-QmlCompiledBindingsPrivate::~QmlCompiledBindingsPrivate()
-{
-    delete [] subscriptions; subscriptions = 0;
-    delete [] identifiers; identifiers = 0;
-}
-
-QmlCompiledBindingsPrivate::Subscription::Subscription()
-: type(InvalidType)
-{
-}
-
-QmlCompiledBindingsPrivate::Subscription::~Subscription()
-{
-    if (type == SignalType) ((Signal *)signalData)->~Signal();
-    else if (type == IdType) ((QmlContextPrivate::IdNotifier *)idData)->~IdNotifier();
-}
-
-
-int QmlCompiledBindingsPrivate::methodCount = -1;
-
-QmlCompiledBindings::QmlCompiledBindings(const char *program, QmlContext *context)
-: QObject(*(new QmlCompiledBindingsPrivate))
-{
-    Q_D(QmlCompiledBindings);
-
-    if (d->methodCount == -1)
-        d->methodCount = QmlCompiledBindings::staticMetaObject.methodCount();
-
-    d->programData = program;
-
-    d->init();
-
-    QmlAbstractExpression::setContext(context);
-}
-
-QmlCompiledBindings::~QmlCompiledBindings()
-{
-    Q_D(QmlCompiledBindings);
-
-    delete [] d->m_bindings;
-}
-
-QmlAbstractBinding *QmlCompiledBindings::configBinding(int index, QObject *target, 
-                                                        QObject *scope, int property)
-{
-    Q_D(QmlCompiledBindings);
-
-    QmlCompiledBindingsPrivate::Binding *rv = d->m_bindings + index;
-
-    rv->index = index;
-    rv->property = property;
-    rv->target = target;
-    rv->scope = scope;
-    rv->parent = d;
-
-    addref(); // This is decremented in Binding::destroy()
-
-    return rv;
-}
-
-void QmlCompiledBindingsPrivate::Binding::setEnabled(bool e, QmlMetaProperty::WriteFlags flags)
-{
-    if (e) {
-        addToObject(target);
-        update(flags);
-    } else {
-        removeFromObject();
-    }
-
-    QmlAbstractBinding::setEnabled(e, flags);
-
-    if (enabled != e) {
-        enabled = e;
-
-        if (e) update(flags);
-    }
-}
-
-int QmlCompiledBindingsPrivate::Binding::propertyIndex()
-{
-    return property & 0xFFFF;
-}
-
-void QmlCompiledBindingsPrivate::Binding::update(QmlMetaProperty::WriteFlags)
-{
-    parent->run(this);
-}
-
-void QmlCompiledBindingsPrivate::Binding::destroy()
-{
-    enabled = false;
-    removeFromObject();
-    parent->q_func()->release();
-    clear();
-}
-
-int QmlCompiledBindings::qt_metacall(QMetaObject::Call c, int id, void **)
-{
-    Q_D(QmlCompiledBindings);
-
-    if (c == QMetaObject::InvokeMetaMethod && id >= d->methodCount) {
-        id -= d->methodCount;
-
-        quint32 *reeval = d->m_signalTable + d->m_signalTable[id];
-        quint32 count = *reeval;
-        ++reeval;
-        for (quint32 ii = 0; ii < count; ++ii) {
-            d->run(d->m_bindings + reeval[ii]);
-        }
-    }
-    return -1;
-}
-
-void QmlCompiledBindingsPrivate::run(Binding *binding)
-{
-    Q_Q(QmlCompiledBindings);
-
-    if (!binding->enabled)
-        return;
-    if (binding->updating)
-        qWarning("ERROR: Circular binding");
-
-    QmlContext *context = q->QmlAbstractExpression::context();
-    if (!context) {
-        qWarning("QmlCompiledBindings: Attempted to evaluate an expression in an invalid context");
-        return;
-    }
-    QmlContextPrivate *cp = QmlContextPrivate::get(context);
-
-    if (binding->property & 0xFFFF0000) {
-        QmlEnginePrivate *ep = QmlEnginePrivate::get(cp->engine);
-
-        QmlValueType *vt = ep->valueTypes[(binding->property >> 16) & 0xFF];
-        Q_ASSERT(vt);
-        vt->read(binding->target, binding->property & 0xFFFF);
-
-        QObject *target = vt;
-        run(binding->index, cp, binding, binding->scope, target);
-
-        vt->write(binding->target, binding->property & 0xFFFF, 
-                  QmlMetaProperty::DontRemoveBinding);
-    } else {
-        run(binding->index, cp, binding, binding->scope, binding->target);
-    }
-}
-
-QmlCompiledBindingsPrivate::Subscription::Signal *QmlCompiledBindingsPrivate::Subscription::signal() 
-{
-    if (type == IdType) ((QmlContextPrivate::IdNotifier *)idData)->~IdNotifier();
-    if (type != SignalType) new (signalData) Signal;
-    type = SignalType;
-    return (Signal *)signalData;
-}
-
-QmlContextPrivate::IdNotifier *QmlCompiledBindingsPrivate::Subscription::id()
-{
-    if (type == SignalType) ((Signal *)signalData)->~Signal();
-    if (type != IdType) new (idData) QmlContextPrivate::IdNotifier;
-    type = IdType;
-    return (QmlContextPrivate::IdNotifier *)idData;
-}
-
-namespace {
-// This structure is exactly 8-bytes in size
-struct Instr {
-    enum {
-        Noop,
-
-        Subscribe,               // subscribe
-        SubscribeId,             // subscribe
-
-        LoadId,                  // load
-        LoadScope,               // load
-        LoadRoot,                // load
-        LoadAttached,            // attached
-
-        ConvertIntToReal,        // unaryop
-        ConvertRealToInt,        // unaryop
-
-        Real,                    // real_value
-        Int,                     // int_value
-        Bool,                    // bool_value
-        String,                  // string_value
-
-        AddReal,                 // binaryop
-        AddInt,                  // binaryop
-        AddString,               // binaryop
-
-        MinusReal,               // binaryop
-        MinusInt,                // binaryop
-
-        CompareReal,             // binaryop
-        CompareString,           // binaryop
-
-        NotCompareReal,          // binaryop
-        NotCompareString,        // binaryop
-        
-        GreaterThanReal,         // binaryop
-        MaxReal,                 // binaryop 
-        MinReal,                 // binaryop
-
-        NewString,               // construct
-        NewUrl,                  // construct
-
-        CleanupUrl,              // cleanup
-        CleanupString,           // cleanup
-
-        Copy,                    // copy
-        Fetch,                   // fetch
-        Store,                   // store
-
-        Skip,                    // skip
-
-        Done,
-
-        // Speculative property resolution
-        InitString,              // initstring
-        FindGeneric,             // find 
-        FindGenericTerminal,     // find 
-        FindProperty,            // find 
-        FindPropertyTerminal,    // find 
-        CleanupGeneric,          // cleanup
-        ConvertGenericToReal,    // unaryop
-        ConvertGenericToBool,    // unaryop
-        ConvertGenericToString,  // unaryop
-        ConvertGenericToUrl,     // unaryop
-    };
-
-    union {
-        struct {
-            quint8 type;
-            quint8 packing[7];
-        } common;
-        struct {
-            quint8 type;
-            quint8 packing[3];
-            quint16 subscriptions;
-            quint16 identifiers;
-        } init;
-        struct {
-            quint8 type;
-            qint8 reg;
-            quint16 offset;
-            quint32 index;
-        } subscribe;
-        struct {
-            quint8 type;
-            qint8 reg;
-            quint8 packing[2];
-            quint32 index;
-        } load;
-        struct {
-            quint8 type;
-            qint8 output;
-            qint8 reg;
-            quint8 exceptionId;
-            quint32 index;
-        } attached;
-        struct {
-            quint8 type;
-            qint8 output;
-            qint8 reg;
-            quint8 exceptionId;
-            quint32 index;
-        } store;
-        struct {
-            quint8 type;
-            qint8 output;
-            qint8 objectReg;
-            quint8 exceptionId;
-            quint32 index;
-        } fetch;
-        struct {
-            quint8 type;
-            qint8 reg;
-            qint8 src;
-            quint8 packing[5];
-        } copy;
-        struct {
-            quint8 type;
-            qint8 reg;
-            quint8 packing[6];
-        } construct;
-        struct {
-            quint8 type;
-            qint8 reg;
-            quint8 packing[2];
-            float value;
-        } real_value;
-        struct {
-            quint8 type;
-            qint8 reg;
-            quint8 packing[2];
-            int value;
-        } int_value;
-        struct {
-            quint8 type;
-            qint8 reg;
-            bool value;
-            quint8 packing[5];
-        } bool_value;
-        struct {
-            quint8 type;
-            qint8 reg;
-            quint16 length;
-            quint32 offset;
-        } string_value;
-        struct {
-            quint8 type;
-            qint8 output;
-            qint8 src1;
-            qint8 src2;
-            quint8 packing[4];
-        } binaryop;
-        struct {
-            quint8 type;
-            qint8 output;
-            qint8 src;
-            quint8 packing[5];
-        } unaryop;
-        struct {
-            quint8 type;
-            qint8 reg;
-            quint8 packing[2];
-            quint32 count;
-        } skip;
-        struct {
-            quint8 type;
-            qint8 reg;
-            qint8 src;
-            quint8 exceptionId;
-            quint16 name; 
-            quint16 subscribeIndex;
-        } find;
-        struct {
-            quint8 type;
-            qint8 reg;
-            quint8 packing[6];
-        } cleanup;
-        struct {
-            quint8 type;
-            quint8 packing[1];
-            quint16 offset;
-            quint32 dataIdx;
-        } initstring;
-    };
-};
-
-struct Program {
-    quint32 bindings;
-    quint32 dataLength;
-    quint32 signalTableOffset;
-    quint32 exceptionDataOffset;
-    quint16 subscriptions;
-    quint16 identifiers;
-    quint16 instructionCount;
-    quint16 dummy;
-
-    const char *data() const { return ((const char *)this) + sizeof(Program); }
-    const Instr *instructions() const { return (const Instr *)(data() + dataLength); }
-};
-}
-
-struct QmlBindingCompilerPrivate
-{
-    struct Result {
-        Result() : unknownType(false), metaObject(0), type(-1), reg(-1) {}
-        bool operator==(const Result &o) const { 
-            return unknownType == o.unknownType &&
-                   metaObject == o.metaObject && 
-                   type == o.type &&
-                   reg == o.reg; 
-        }
-        bool operator!=(const Result &o) const { 
-            return !(*this == o);
-        }
-        bool unknownType;
-        const QMetaObject *metaObject;
-        int type;
-        int reg;
-
-        QSet<QString> subscriptionSet;
-    };
-
-    QmlBindingCompilerPrivate() : registers(0) {}
-
-    void resetInstanceState();
-    int commitCompile();
-
-    QmlParser::Object *context;
-    QmlParser::Object *component;
-    QmlParser::Property *destination;
-    QHash<QString, QmlParser::Object *> ids;
-    QmlEnginePrivate::Imports imports;
-    QmlEnginePrivate *engine;
-
-    QString contextName() const { return QLatin1String("$$$SCOPE_") + QString::number((intptr_t)context, 16); }
-
-    bool compile(QmlJS::AST::Node *);
-
-    bool parseExpression(QmlJS::AST::Node *, Result &);
-
-    bool tryName(QmlJS::AST::Node *);
-    bool parseName(QmlJS::AST::Node *, Result &);
-
-    bool tryArith(QmlJS::AST::Node *);
-    bool parseArith(QmlJS::AST::Node *, Result &);
-    bool numberArith(Result &, const Result &, const Result &, QSOperator::Op op);
-    bool stringArith(Result &, const Result &, const Result &, QSOperator::Op op);
-
-    bool tryLogic(QmlJS::AST::Node *);
-    bool parseLogic(QmlJS::AST::Node *, Result &);
-
-    bool tryConditional(QmlJS::AST::Node *);
-    bool parseConditional(QmlJS::AST::Node *, Result &);
-
-    bool tryConstant(QmlJS::AST::Node *);
-    bool parseConstant(QmlJS::AST::Node *, Result &);
-
-    bool tryMethod(QmlJS::AST::Node *);
-    bool parseMethod(QmlJS::AST::Node *, Result &);
-
-    bool buildName(QStringList &, QmlJS::AST::Node *, QList<QmlJS::AST::ExpressionNode *> *nodes = 0);
-    bool fetch(Result &type, const QMetaObject *, int reg, int idx, const QStringList &, QmlJS::AST::ExpressionNode *);
-
-    quint32 registers;
-    QHash<int, QPair<int, int> > registerCleanups;
-    int acquireReg(int cleanup = Instr::Noop, int cleanupType = 0);
-    void registerCleanup(int reg, int cleanup, int cleanupType = 0);
-    void releaseReg(int);
-
-    int registerLiteralString(const QString &);
-    int registerString(const QString &);
-    QHash<QString, QPair<int, int> > registeredStrings;
-    QByteArray data;
-
-    bool subscription(const QStringList &, Result *);
-    int subscriptionIndex(const QStringList &);
-    bool subscriptionNeutral(const QSet<QString> &base, const QSet<QString> &lhs, const QSet<QString> &rhs);
-
-    quint8 exceptionId(QmlJS::AST::ExpressionNode *);
-    QVector<quint64> exceptions;
-
-    QSet<int> usedSubscriptionIds;
-    QSet<QString> subscriptionSet;
-    QHash<QString, int> subscriptionIds;
-    QVector<Instr> bytecode;
-
-    // Committed binding data
-    struct {
-        QList<int> offsets;
-        QList<QSet<int> > dependencies;
-
-        QVector<Instr> bytecode;
-        QByteArray data;
-        QHash<QString, int> subscriptionIds;
-        QVector<quint64> exceptions;
-
-        QHash<QString, QPair<int, int> > registeredStrings;
-
-        int count() const { return offsets.count(); }
-    } committed;
-
-    QByteArray buildSignalTable() const;
-    QByteArray buildExceptionData() const;
-};
-
-void QmlCompiledBindingsPrivate::unsubscribe(int subIndex)
-{
-    Q_Q(QmlCompiledBindings);
-
-    QmlCompiledBindingsPrivate::Subscription *sub = (subscriptions + subIndex);
-    if (sub->isSignal()) {
-        QmlCompiledBindingsPrivate::Subscription::Signal *s = sub->signal();
-        if (s->source)
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
-            QMetaObject::disconnectOne(s->source, s->notifyIndex, 
-                                       q, methodCount + subIndex);
-#else
-            // QTBUG-6781
-            QMetaObject::disconnect(s->source, s->notifyIndex, 
-                                    q, methodCount + subIndex);
-#endif
-    } else if (sub->isId()) {
-        sub->id()->clear();
-    }
-}
-
-void QmlCompiledBindingsPrivate::subscribeId(QmlContextPrivate *p, int idIndex, int subIndex)
-{
-    Q_Q(QmlCompiledBindings);
-
-    unsubscribe(subIndex);
-
-    if (p->idValues[idIndex]) {
-        QmlCompiledBindingsPrivate::Subscription *sub = (subscriptions + subIndex);
-        QmlContextPrivate::IdNotifier *i = sub->id();
-
-        i->next = p->idValues[idIndex].bindings;
-        i->prev = &p->idValues[idIndex].bindings;
-        p->idValues[idIndex].bindings = i;
-        if (i->next) i->next->prev = &i->next;
-
-        i->target = q;
-        i->methodIndex = methodCount + subIndex;
-    }
-}
- 
-void QmlCompiledBindingsPrivate::subscribe(QObject *o, int notifyIndex, int subIndex)
-{
-    Q_Q(QmlCompiledBindings);
-
-    QmlCompiledBindingsPrivate::Subscription *sub = (subscriptions + subIndex);
-    
-    if (sub->isId())
-        unsubscribe(subIndex);
-
-    QmlCompiledBindingsPrivate::Subscription::Signal *s = sub->signal();
-    if (o != s->source || notifyIndex != s->notifyIndex)  {
-        if (s->source)
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
-            QMetaObject::disconnectOne(s->source, s->notifyIndex, 
-                                       q, methodCount + subIndex);
-#else
-            // QTBUG-6781
-            QMetaObject::disconnect(s->source, s->notifyIndex, 
-                                    q, methodCount + subIndex);
-#endif
-        s->source = o;
-        s->notifyIndex = notifyIndex;
-        if (s->source && s->notifyIndex != -1) 
-            QMetaObject::connect(s->source, s->notifyIndex, q,
-                                 methodCount + subIndex, Qt::DirectConnection);
-    } 
-}
-
-// Conversion functions - these MUST match the QtScript expression path
-inline static qreal toReal(Register *reg, int type, bool *ok = 0)
-{
-    if (ok) *ok = true;
-
-    if (type == QMetaType::QReal) {
-        return reg->getqreal();
-    } else if (type == qMetaTypeId<QVariant>()) {
-        return reg->getvariantptr()->toReal();
-    } else {
-        if (ok) *ok = false;
-        return 0;
-    }
-}
-
-inline static QString toString(Register *reg, int type, bool *ok = 0)
-{
-    if (ok) *ok = true;
-
-    if (type == QMetaType::QReal) {
-        return QString::number(reg->getqreal());
-    } else if (type == QMetaType::Int) {
-        return QString::number(reg->getint());
-    } else if (type == qMetaTypeId<QVariant>()) {
-        return reg->getvariantptr()->toString();
-    } else if (type == QMetaType::QString) {
-        return *reg->getstringptr();
-    } else {
-        if (ok) *ok = false;
-        return QString();
-    }
-}
-
-inline static bool toBool(Register *reg, int type, bool *ok = 0)
-{
-    if (ok) *ok = true;
-
-    if (type == QMetaType::Bool) {
-        return reg->getbool();
-    } else if (type == qMetaTypeId<QVariant>()) {
-        return reg->getvariantptr()->toBool();
-    } else {
-        if (ok) *ok = false;
-        return false;
-    }
-}
-
-inline static QUrl toUrl(Register *reg, int type, QmlContextPrivate *context, bool *ok = 0)
-{
-    if (ok) *ok = true;
-
-    QUrl base;
-    if (type == qMetaTypeId<QVariant>()) {
-        QVariant *var = reg->getvariantptr();
-        int vt = var->type();
-        if (vt == QVariant::Url) {
-            base = var->toUrl();
-        } else if (vt == QVariant::ByteArray) {
-            base = QUrl(QString::fromUtf8(var->toByteArray()));
-        } else if (vt == QVariant::String) {
-            base = QUrl(var->toString());
-        } else {
-            if (ok) *ok = false;
-            return QUrl();
-        }
-    } else if (type == QMetaType::QString) {
-        base = QUrl(*reg->getstringptr());
-    } else {
-        if (ok) *ok = false;
-        return QUrl();
-    }
-
-    if (!base.isEmpty() && base.isRelative())
-        return context->url.resolved(base);
-    else
-        return base;
-}
-
-static QObject *variantToQObject(const QVariant &value, bool *ok)
-{
-    if (ok) *ok = true;
-
-    if (value.userType() == QMetaType::QObjectStar) {
-        return qvariant_cast<QObject*>(value);
-    } else {
-        if (ok) *ok = false;
-        return 0;
-    }
-}
-
-bool QmlCompiledBindingsPrivate::findproperty(QObject *obj, Register *output, 
-                                              QmlEnginePrivate *enginePriv,
-                                              int subIdx, const QScriptDeclarativeClass::Identifier &name,
-                                              bool isTerminal)
-{
-    if (!obj) {
-        output->setUndefined();
-        return false;
-    }
-
-    QmlPropertyCache::Data local;
-    QmlPropertyCache::Data *property = 
-        QmlPropertyCache::property(QmlEnginePrivate::get(enginePriv), obj, name, local);
-
-    if (property) {
-        if (subIdx != -1)
-            subscribe(obj, property->notifyIndex, subIdx);
-
-        if (property->flags & QmlPropertyCache::Data::IsQObjectDerived) {
-            void *args[] = { output->typeDataPtr(), 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
-            output->settype(QMetaType::QObjectStar);
-        } else if (property->propType == qMetaTypeId<QVariant>()) {
-            QVariant v;
-            void *args[] = { &v, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
-
-            if (isTerminal) {
-                new (output->typeDataPtr()) QVariant(v);
-                output->settype(qMetaTypeId<QVariant>());
-            } else {
-                bool ok;
-                output->setQObject(variantToQObject(v, &ok));
-                if (!ok) 
-                    output->setUndefined();
-                else
-                    output->settype(QMetaType::QObjectStar);
-            }
-
-        } else {
-            if (!isTerminal) {
-                output->setUndefined();
-            } else if (property->propType == QMetaType::QReal) {
-                void *args[] = { output->typeDataPtr(), 0 };
-                QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
-                output->settype(QMetaType::QReal);
-            } else if (property->propType == QMetaType::Int) {
-                void *args[] = { output->typeDataPtr(), 0 };
-                QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
-                output->settype(QMetaType::Int);
-            } else if (property->propType == QMetaType::Bool) {
-                void *args[] = { output->typeDataPtr(), 0 };
-                QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
-                output->settype(QMetaType::Bool);
-            } else if (property->propType == QMetaType::QString) {
-                new (output->typeDataPtr()) QString();
-                void *args[] = { output->typeDataPtr(), 0 };
-                QMetaObject::metacall(obj, QMetaObject::ReadProperty, property->coreIndex, args);
-                output->settype(QMetaType::QString);
-            } else {
-                new (output->typeDataPtr()) 
-                    QVariant(obj->metaObject()->property(property->coreIndex).read(obj));
-                output->settype(qMetaTypeId<QVariant>());
-            }
-        }
-
-        return true;
-    } else {
-        output->setUndefined();
-        return false;
-    }
-}
-
-void QmlCompiledBindingsPrivate::findgeneric(Register *output, 
-                                             int subIdx,      
-                                             QmlContextPrivate *context,
-                                             const QScriptDeclarativeClass::Identifier &name, 
-                                             bool isTerminal)
-{
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(context->engine);
-
-    while (context) {
-
-        int contextPropertyIndex = context->propertyNames?context->propertyNames->value(name):-1;
-
-
-        if (contextPropertyIndex != -1) {
-
-            if (subIdx != -1) 
-                subscribe(QmlContextPrivate::get(context), contextPropertyIndex + context->notifyIndex, subIdx);
-
-            if (contextPropertyIndex < context->idValueCount) {
-                output->setQObject(context->idValues[contextPropertyIndex]);
-                output->settype(QMetaType::QObjectStar);
-            } else {
-                const QVariant &value = context->propertyValues.at(contextPropertyIndex);
-                if (isTerminal) {
-                    new (output->typeDataPtr()) QVariant(value);
-                    output->settype(qMetaTypeId<QVariant>());
-                } else {
-                    bool ok;
-                    output->setQObject(variantToQObject(value, &ok));
-                    if (!ok) { output->setUndefined(); }
-                    else { output->settype(QMetaType::QObjectStar); }
-                    return;
-                }
-            }
-
-            return;
-        }
-
-        for (int ii = 0; ii < context->scripts.count(); ++ii) {
-            QScriptValue function = QScriptDeclarativeClass::function(context->scripts.at(ii), name);
-            if (function.isValid()) {
-                qFatal("Binding optimizer resolved name to QScript method");
-            }
-        }
-
-        if (QObject *root = context->defaultObjects.isEmpty()?0:context->defaultObjects.first()) {
-
-            if (findproperty(root, output, enginePriv, subIdx, name, isTerminal))
-                return;
-
-        }
-
-        if (context->parent) {
-            context = QmlContextPrivate::get(context->parent);
-        } else {
-            context = 0;
-        }
-    }
-
-    output->setUndefined();
-}
-
-void QmlCompiledBindingsPrivate::init()
-{
-    Program *program = (Program *)programData;
-    if (program->subscriptions)
-        subscriptions = new QmlCompiledBindingsPrivate::Subscription[program->subscriptions];
-    if (program->identifiers)
-        identifiers = new QScriptDeclarativeClass::PersistentIdentifier[program->identifiers];
-
-    m_signalTable = (quint32 *)(program->data() + program->signalTableOffset);
-    m_bindings = new QmlCompiledBindingsPrivate::Binding[program->bindings];
-}
-
-static void throwException(int id, QmlDelayedError *error, 
-                           Program *program, QmlContextPrivate *context,
-                           const QString &description = QString())
-{
-    error->error.setUrl(context->url);
-    if (description.isEmpty())
-        error->error.setDescription(QLatin1String("TypeError: Result of expression is not an object"));
-    else
-        error->error.setDescription(description);
-    if (id != 0xFF) {
-        quint64 e = *((quint64 *)(program->data() + program->exceptionDataOffset) + id); 
-        error->error.setLine((e >> 32) & 0xFFFFFFFF);
-        error->error.setColumn(e & 0xFFFFFFFF); 
-    } else {
-        error->error.setLine(-1);
-        error->error.setColumn(-1);
-    }
-    if (!context->engine || !error->addError(QmlEnginePrivate::get(context->engine)))
-        qWarning() << error->error;
-}
-
-static void dumpInstruction(const Instr *instr)
-{
-    switch (instr->common.type) {
-    case Instr::Noop:
-        qWarning().nospace() << "Noop";
-        break;
-    case Instr::Subscribe:
-        qWarning().nospace() << "Subscribe" << "\t\t" << instr->subscribe.offset << "\t" << instr->subscribe.reg << "\t" << instr->subscribe.index;
-        break;
-    case Instr::SubscribeId:
-        qWarning().nospace() << "SubscribeId" << "\t\t" << instr->subscribe.offset << "\t" << instr->subscribe.reg << "\t" << instr->subscribe.index;
-        break;
-    case Instr::LoadId:
-        qWarning().nospace() << "LoadId" << "\t\t\t" << instr->load.index << "\t" << instr->load.reg;
-        break;
-    case Instr::LoadScope:
-        qWarning().nospace() << "LoadScope" << "\t\t" << instr->load.index << "\t" << instr->load.reg;
-        break;
-    case Instr::LoadRoot:
-        qWarning().nospace() << "LoadRoot" << "\t\t" << instr->load.index << "\t" << instr->load.reg;
-        break;
-    case Instr::LoadAttached:
-        qWarning().nospace() << "LoadAttached" << "\t\t" << instr->attached.output << "\t" << instr->attached.reg << "\t" << instr->attached.index;
-        break;
-    case Instr::ConvertIntToReal:
-        qWarning().nospace() << "ConvertIntToReal" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
-        break;
-    case Instr::ConvertRealToInt:
-        qWarning().nospace() << "ConvertRealToInt" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
-        break;
-    case Instr::Real:
-        qWarning().nospace() << "Real" << "\t\t\t" << instr->real_value.reg << "\t" << instr->real_value.value;
-        break;
-    case Instr::Int:
-        qWarning().nospace() << "Int" << "\t\t\t" << instr->int_value.reg << "\t" << instr->int_value.value;
-        break;
-    case Instr::Bool:
-        qWarning().nospace() << "Bool" << "\t\t\t" << instr->bool_value.reg << "\t" << instr->bool_value.value;
-        break;
-    case Instr::String:
-        qWarning().nospace() << "String" << "\t\t\t" << instr->string_value.reg << "\t" << instr->string_value.offset << "\t" << instr->string_value.length;
-        break;
-    case Instr::AddReal:
-        qWarning().nospace() << "AddReal" << "\t\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::AddInt:
-        qWarning().nospace() << "AddInt" << "\t\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::AddString:
-        qWarning().nospace() << "AddString" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::MinusReal:
-        qWarning().nospace() << "MinusReal" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::MinusInt:
-        qWarning().nospace() << "MinusInt" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::CompareReal:
-        qWarning().nospace() << "CompareReal" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::CompareString:
-        qWarning().nospace() << "CompareString" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::NotCompareReal:
-        qWarning().nospace() << "NotCompareReal" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::NotCompareString:
-        qWarning().nospace() << "NotCompareString" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::GreaterThanReal:
-        qWarning().nospace() << "GreaterThanReal" << "\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::MaxReal:
-        qWarning().nospace() << "MaxReal" << "\t\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::MinReal:
-        qWarning().nospace() << "MinReal" << "\t\t\t" << instr->binaryop.output << "\t" << instr->binaryop.src1 << "\t" << instr->binaryop.src2;
-        break;
-    case Instr::NewString:
-        qWarning().nospace() << "NewString" << "\t\t" << instr->construct.reg;
-        break;
-    case Instr::NewUrl:
-        qWarning().nospace() << "NewUrl" << "\t\t\t" << instr->construct.reg;
-        break;
-    case Instr::CleanupString:
-        qWarning().nospace() << "CleanupString" << "\t\t" << instr->cleanup.reg;
-        break;
-    case Instr::CleanupUrl:
-        qWarning().nospace() << "CleanupUrl" << "\t\t" << instr->cleanup.reg;
-        break;
-    case Instr::Fetch:
-        qWarning().nospace() << "Fetch" << "\t\t\t" << instr->fetch.output << "\t" << instr->fetch.index << "\t" << instr->fetch.objectReg;
-        break;
-    case Instr::Store:
-        qWarning().nospace() << "Store" << "\t\t\t" << instr->store.output << "\t" << instr->store.index << "\t" << instr->store.reg;
-        break;
-    case Instr::Copy:
-        qWarning().nospace() << "Copy" << "\t\t\t" << instr->copy.reg << "\t" << instr->copy.src;
-        break;
-    case Instr::Skip:
-        qWarning().nospace() << "Skip" << "\t\t\t" << instr->skip.reg << "\t" << instr->skip.count;
-        break;
-    case Instr::Done:
-        qWarning().nospace() << "Done";
-        break;
-    case Instr::InitString:
-        qWarning().nospace() << "InitString" << "\t\t" << instr->initstring.offset << "\t" << instr->initstring.dataIdx;
-        break;
-    case Instr::FindGeneric:
-        qWarning().nospace() << "FindGeneric" << "\t\t" << instr->find.reg << "\t" << instr->find.name;
-        break;
-    case Instr::FindGenericTerminal:
-        qWarning().nospace() << "FindGenericTerminal" << "\t" << instr->find.reg << "\t" <<  instr->find.name;
-        break;
-    case Instr::FindProperty:
-        qWarning().nospace() << "FindProperty" << "\t\t" << instr->find.reg << "\t" << instr->find.src << "\t" << instr->find.name;
-        break;
-    case Instr::FindPropertyTerminal:
-        qWarning().nospace() << "FindPropertyTerminal" << "\t" << instr->find.reg << "\t" << instr->find.src << "\t" << instr->find.name;
-        break;
-    case Instr::CleanupGeneric:
-        qWarning().nospace() << "CleanupGeneric" << "\t\t" << instr->cleanup.reg;
-        break;
-    case Instr::ConvertGenericToReal:
-        qWarning().nospace() << "ConvertGenericToReal" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
-        break;
-    case Instr::ConvertGenericToBool:
-        qWarning().nospace() << "ConvertGenericToBool" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
-        break;
-    case Instr::ConvertGenericToString:
-        qWarning().nospace() << "ConvertGenericToString" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
-        break;
-    case Instr::ConvertGenericToUrl:
-        qWarning().nospace() << "ConvertGenericToUrl" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
-        break;
-    default:
-        qWarning().nospace() << "Unknown";
-        break;
-    }
-}
-
-void QmlCompiledBindingsPrivate::run(int instrIndex,
-                                     QmlContextPrivate *context, QmlDelayedError *error,
-                                     QObject *scope, QObject *output)
-{
-    error->removeError();
-
-    Register registers[32];
-    int storeFlags = 0;
-
-    QmlEnginePrivate *engine = QmlEnginePrivate::get(context->engine);
-    Program *program = (Program *)programData;
-    const Instr *instr = program->instructions();
-    instr += instrIndex;
-    const char *data = program->data();
-
-#ifdef COMPILEDBINDINGS_DEBUG
-    qWarning().nospace() << "Begin binding run";
-#endif
-
-    while (instr) {
-#ifdef COMPILEDBINDINGS_DEBUG
-        dumpInstruction(instr);
-#endif
-
-    switch (instr->common.type) {
-    case Instr::Noop:
-        break;
-
-    case Instr::SubscribeId:
-        subscribeId(context, instr->subscribe.index, instr->subscribe.offset);
-        break;
-
-    case Instr::Subscribe:
-    {
-        QObject *o = 0;
-        const Register &object = registers[instr->subscribe.reg];
-        if (!object.isUndefined()) o = object.getQObject();
-        subscribe(o, instr->subscribe.index, instr->subscribe.offset);
-    }
-        break;
-
-    case Instr::LoadId:
-        registers[instr->load.reg].setQObject(context->idValues[instr->load.index].data());
-        break;
-
-    case Instr::LoadScope:
-        registers[instr->load.reg].setQObject(scope);
-        break;
-
-    case Instr::LoadRoot:
-        registers[instr->load.reg].setQObject(context->defaultObjects.at(0));
-        break;
-
-    case Instr::LoadAttached:
-    {
-        const Register &input = registers[instr->attached.reg];
-        Register &output = registers[instr->attached.output];
-        if (input.isUndefined()) {
-            throwException(instr->attached.exceptionId, error, program, context);
-            return;
-        }
-
-        QObject *object = registers[instr->attached.reg].getQObject();
-        if (!object) {
-            output.setUndefined();
-        } else {
-            QObject *attached = 
-                qmlAttachedPropertiesObjectById(instr->attached.index, 
-                                                registers[instr->attached.reg].getQObject(), 
-                                                true);
-            Q_ASSERT(attached);
-            output.setQObject(attached);
-        }
-    }
-        break;
-
-    case Instr::ConvertIntToReal:
-    {
-        const Register &input = registers[instr->unaryop.src];
-        Register &output = registers[instr->unaryop.output];
-        if (input.isUndefined()) output.setUndefined();
-        else output.setqreal(qreal(input.getint()));
-    }
-        break;
-
-    case Instr::ConvertRealToInt:
-    {
-        const Register &input = registers[instr->unaryop.src];
-        Register &output = registers[instr->unaryop.output];
-        if (input.isUndefined()) output.setUndefined();
-        else output.setint(int(input.getqreal()));
-    }
-        break;
-
-    case Instr::Real:
-        registers[instr->real_value.reg].setqreal(instr->real_value.value);
-        break;
-
-    case Instr::Int:
-        registers[instr->int_value.reg].setint(instr->int_value.value);
-        break;
-        
-    case Instr::Bool:
-        registers[instr->bool_value.reg].setbool(instr->bool_value.value);
-        break;
-
-    case Instr::String:
-    {
-        Register &output = registers[instr->string_value.reg];
-        new (output.getstringptr()) 
-            QString((QChar *)(data + instr->string_value.offset), instr->string_value.length);
-        output.settype(QMetaType::QString);
-    }
-        break;
-
-    case Instr::AddReal:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
-        else output.setqreal(lhs.getqreal() + rhs.getqreal());
-    }
-        break;
-
-    case Instr::AddInt:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
-        else output.setint(lhs.getint() + rhs.getint());
-    }
-        break;
-        
-    case Instr::AddString:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() && rhs.isUndefined()) { output.setNaN(); }
-        else {
-            if (lhs.isUndefined())
-                new (output.getstringptr())
-                    QString(QLatin1String("undefined") + *registers[instr->binaryop.src2].getstringptr());
-            else if (rhs.isUndefined())
-                new (output.getstringptr())
-                    QString(*registers[instr->binaryop.src1].getstringptr() + QLatin1String("undefined"));
-            else
-                new (output.getstringptr()) 
-                    QString(*registers[instr->binaryop.src1].getstringptr() + 
-                            *registers[instr->binaryop.src2].getstringptr());
-            output.settype(QMetaType::QString);
-        }
-    }
-        break;
-
-    case Instr::MinusReal:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
-        else output.setqreal(lhs.getqreal() - rhs.getqreal());
-    }
-        break;
-
-    case Instr::MinusInt:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
-        else output.setint(lhs.getint() - rhs.getint());
-    }
-        break;
-
-    case Instr::CompareReal:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(lhs.isUndefined() == rhs.isUndefined());
-        else output.setbool(lhs.getqreal() == rhs.getqreal());
-    }
-        break;
-
-    case Instr::CompareString:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(lhs.isUndefined() == rhs.isUndefined());
-        else output.setbool(*lhs.getstringptr() == *rhs.getstringptr());
-    }
-        break;
-
-    case Instr::NotCompareReal:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(lhs.isUndefined() != rhs.isUndefined());
-        else output.setbool(lhs.getqreal() != rhs.getqreal());
-    }
-        break;
-
-    case Instr::NotCompareString:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(lhs.isUndefined() != rhs.isUndefined());
-        else output.setbool(*lhs.getstringptr() != *rhs.getstringptr());
-    }
-        break;
-
-    case Instr::GreaterThanReal:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setbool(false);
-        else output.setbool(lhs.getqreal() > rhs.getqreal());
-    }
-        break;
-
-    case Instr::MaxReal:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
-        else output.setqreal(qMax(lhs.getqreal(), rhs.getqreal()));
-    }
-        break;
-
-    case Instr::MinReal:
-    {
-        const Register &lhs = registers[instr->binaryop.src1];
-        const Register &rhs = registers[instr->binaryop.src2];
-        Register &output = registers[instr->binaryop.output];
-        if (lhs.isUndefined() || rhs.isUndefined()) output.setNaN();
-        else output.setqreal(qMin(lhs.getqreal(), rhs.getqreal()));
-    }
-        break;
-
-    case Instr::NewString:
-    {
-        Register &output = registers[instr->construct.reg];
-        new (output.getstringptr()) QString;
-        output.settype(QMetaType::QString);
-    }
-        break;
-
-    case Instr::NewUrl:
-    {
-        Register &output = registers[instr->construct.reg];
-        new (output.geturlptr()) QUrl;
-        output.settype(QMetaType::QUrl);
-    }
-        break;
-
-    case Instr::CleanupString:
-        registers[instr->cleanup.reg].getstringptr()->~QString();
-        break;
-
-    case Instr::CleanupUrl:
-        registers[instr->cleanup.reg].geturlptr()->~QUrl();
-        break;
-
-    case Instr::Fetch:
-    {
-        const Register &input = registers[instr->fetch.objectReg];
-        Register &output = registers[instr->fetch.output];
-
-        if (input.isUndefined()) {
-            throwException(instr->fetch.exceptionId, error, program, context);
-            return;
-        }
-
-        QObject *object = input.getQObject();
-        if (!object) {
-            output.setUndefined();
-        } else {
-            void *argv[] = { output.typeDataPtr(), 0 };
-            QMetaObject::metacall(object, QMetaObject::ReadProperty, instr->fetch.index, argv);
-        }
-    }
-        break;
-
-    case Instr::Store:
-    {
-        Register &data = registers[instr->store.reg];
-        if (data.isUndefined()) {
-            throwException(instr->store.exceptionId, error, program, context,
-                           QLatin1String("Unable to assign undefined value"));
-            return;
-        }
-
-        int status = -1;
-        void *argv[] = { data.typeDataPtr(), 0, &status, &storeFlags };
-        QMetaObject::metacall(output, QMetaObject::WriteProperty, 
-                              instr->store.index, argv);
-    }
-        break;
-
-    case Instr::Copy:
-        registers[instr->copy.reg] = registers[instr->copy.src];
-        break;
-
-    case Instr::Skip:
-        if (instr->skip.reg == -1 || !registers[instr->skip.reg].getbool()) 
-            instr += instr->skip.count;
-        break;
-
-    case Instr::Done:
-        return;
-
-    case Instr::InitString:
-        if (!identifiers[instr->initstring.offset].identifier) {
-            quint32 len = *(quint32 *)(data + instr->initstring.dataIdx);
-            QChar *strdata = (QChar *)(data + instr->initstring.dataIdx + sizeof(quint32)); 
-
-            QString str = QString::fromRawData(strdata, len);
-
-            identifiers[instr->initstring.offset] = engine->objectClass->createPersistentIdentifier(str);
-        }
-        break;
-
-    case Instr::FindGenericTerminal:
-    case Instr::FindGeneric:
-        // We start the search in the parent context, as we know that the 
-        // name is not present in the current context or it would have been
-        // found during the static compile
-        findgeneric(registers + instr->find.reg, instr->find.subscribeIndex, 
-                    QmlContextPrivate::get(context->parent),
-                    identifiers[instr->find.name].identifier, 
-                    instr->common.type == Instr::FindGenericTerminal);
-        break;
-
-    case Instr::FindPropertyTerminal:
-    case Instr::FindProperty:
-    {
-        const Register &object = registers[instr->find.src];
-        if (object.isUndefined()) {
-            throwException(instr->find.exceptionId, error, program, context);
-            return;
-        }
-
-        findproperty(object.getQObject(), registers + instr->find.reg, 
-                     QmlEnginePrivate::get(context->engine), 
-                     instr->find.subscribeIndex, identifiers[instr->find.name].identifier, 
-                     instr->common.type == Instr::FindPropertyTerminal);
-    }
-        break;
-
-    case Instr::CleanupGeneric:
-    {
-        int type = registers[instr->cleanup.reg].gettype();
-        if (type == qMetaTypeId<QVariant>()) {
-            registers[instr->cleanup.reg].getvariantptr()->~QVariant();
-        } else if (type == QMetaType::QString) {
-            registers[instr->cleanup.reg].getstringptr()->~QString();
-        } else if (type == QMetaType::QUrl) {
-            registers[instr->cleanup.reg].geturlptr()->~QUrl();
-        }
-    }
-        break;
-
-    case Instr::ConvertGenericToReal:
-    {
-        Register &output = registers[instr->unaryop.output];
-        Register &input = registers[instr->unaryop.src];
-        bool ok = true;
-        output.setqreal(toReal(&input, input.gettype(), &ok));
-        if (!ok) output.setUndefined();
-    }
-        break;
-
-    case Instr::ConvertGenericToBool:
-    {
-        Register &output = registers[instr->unaryop.output];
-        Register &input = registers[instr->unaryop.src];
-        bool ok = true;
-        output.setbool(toBool(&input, input.gettype(), &ok));
-        if (!ok) output.setUndefined();
-    }
-        break;
-
-    case Instr::ConvertGenericToString:
-    {
-        Register &output = registers[instr->unaryop.output];
-        Register &input = registers[instr->unaryop.src];
-        bool ok = true;
-        QString str = toString(&input, input.gettype(), &ok);
-        if (ok) { new (output.getstringptr()) QString(str); output.settype(QMetaType::QString); }
-        else { output.setUndefined(); }
-    }
-        break;
-
-    case Instr::ConvertGenericToUrl:
-    {
-        Register &output = registers[instr->unaryop.output];
-        Register &input = registers[instr->unaryop.src];
-        bool ok = true;
-        QUrl url = toUrl(&input, input.gettype(), context, &ok);
-        if (ok) { new (output.geturlptr()) QUrl(url); output.settype(QMetaType::QUrl); }
-        else { output.setUndefined(); }
-    }
-        break;
-
-    default:
-        qFatal("EEK");
-        break;
-    }
-
-    instr++;
-    }
-}
-
-void QmlBindingCompiler::dump(const QByteArray &programData)
-{
-    const Program *program = (const Program *)programData.constData();
-
-    qWarning() << "Program.bindings:" << program->bindings;
-    qWarning() << "Program.dataLength:" << program->dataLength;
-    qWarning() << "Program.subscriptions:" << program->subscriptions;
-    qWarning() << "Program.indentifiers:" << program->identifiers;
-
-    int count = program->instructionCount;
-    const Instr *instr = program->instructions();
-
-    while (count--) {
-
-        dumpInstruction(instr);
-        ++instr;
-    }
-}
-
-/*!
-Clear the state associated with attempting to compile a specific binding.
-This does not clear the global "commited binding" states.
-*/
-void QmlBindingCompilerPrivate::resetInstanceState()
-{
-    registers = 0;
-    registerCleanups.clear();
-    data = committed.data;
-    exceptions = committed.exceptions;
-    usedSubscriptionIds.clear();
-    subscriptionSet.clear();
-    subscriptionIds = committed.subscriptionIds;
-    registeredStrings = committed.registeredStrings;
-    bytecode.clear();
-}
-
-/*!
-Mark the last compile as successful, and add it to the "committed data"
-section.
-
-Returns the index for the committed binding.
-*/
-int QmlBindingCompilerPrivate::commitCompile()
-{
-    int rv = committed.count();
-    committed.offsets << committed.bytecode.count();
-    committed.dependencies << usedSubscriptionIds;
-    committed.bytecode << bytecode;
-    committed.data = data;
-    committed.exceptions = exceptions;
-    committed.subscriptionIds = subscriptionIds;
-    committed.registeredStrings = registeredStrings;
-    return rv;
-}
-
-bool QmlBindingCompilerPrivate::compile(QmlJS::AST::Node *node)
-{
-    resetInstanceState();
-
-    if (destination->type == -1)
-        return false;
-
-    Result type;
-
-    if (!parseExpression(node, type)) 
-        return false;
-
-    if (subscriptionSet.count() > 0xFFFF ||
-            registeredStrings.count() > 0xFFFF)
-        return false;
-
-    if (type.unknownType) {
-        if (destination->type != QMetaType::QReal &&
-            destination->type != QVariant::String &&
-            destination->type != QMetaType::Bool &&
-            destination->type != QVariant::Url)
-            return false;
-
-        int convertReg = acquireReg();
-
-        if (destination->type == QMetaType::QReal) {
-            Instr convert;
-            convert.common.type = Instr::ConvertGenericToReal;
-            convert.unaryop.output = convertReg;
-            convert.unaryop.src = type.reg;
-            bytecode << convert;
-        } else if (destination->type == QVariant::String) {
-            Instr convert;
-            convert.common.type = Instr::ConvertGenericToString;
-            convert.unaryop.output = convertReg;
-            convert.unaryop.src = type.reg;
-            bytecode << convert;
-        } else if (destination->type == QMetaType::Bool) {
-            Instr convert;
-            convert.common.type = Instr::ConvertGenericToBool;
-            convert.unaryop.output = convertReg;
-            convert.unaryop.src = type.reg;
-            bytecode << convert;
-        } else if (destination->type == QVariant::Url) {
-            Instr convert;
-            convert.common.type = Instr::ConvertGenericToUrl;
-            convert.unaryop.output = convertReg;
-            convert.unaryop.src = type.reg;
-            bytecode << convert;
-        }
-
-        Instr cleanup;
-        cleanup.common.type = Instr::CleanupGeneric;
-        cleanup.cleanup.reg = type.reg;
-        bytecode << cleanup;
-
-        Instr instr;
-        instr.common.type = Instr::Store;
-        instr.store.output = 0;
-        instr.store.index = destination->index;
-        instr.store.reg = convertReg;
-        instr.store.exceptionId = exceptionId(node->expressionCast());
-        bytecode << instr;
-
-        if (destination->type == QVariant::String) {
-            Instr cleanup;
-            cleanup.common.type = Instr::CleanupString;
-            cleanup.cleanup.reg = convertReg;
-            bytecode << cleanup;
-        } else if (destination->type == QVariant::Url) {
-            Instr cleanup;
-            cleanup.common.type = Instr::CleanupUrl;
-            cleanup.cleanup.reg = convertReg;
-            bytecode << cleanup;
-        }
-
-        releaseReg(convertReg);
-
-        Instr done;
-        done.common.type = Instr::Done;
-        bytecode << done;
-
-        return true;
-    } else {
-        // Can we store the final value?
-        if (type.type == QVariant::Int &&
-            destination->type == QMetaType::QReal) {
-            Instr instr;
-            instr.common.type = Instr::ConvertIntToReal;
-            instr.unaryop.output = type.reg;
-            instr.unaryop.src = type.reg;
-            bytecode << instr;
-            type.type = QMetaType::QReal;
-        } else if (type.type == QMetaType::QReal &&
-                   destination->type == QVariant::Int) {
-            Instr instr;
-            instr.common.type = Instr::ConvertRealToInt;
-            instr.unaryop.output = type.reg;
-            instr.unaryop.src = type.reg;
-            bytecode << instr;
-            type.type = QVariant::Int;
-        } else if (type.type == destination->type) {
-        } else {
-            const QMetaObject *from = type.metaObject;
-            const QMetaObject *to = engine->rawMetaObjectForType(destination->type);
-
-            if (QmlMetaPropertyPrivate::canConvert(from, to))
-                type.type = destination->type;
-        }
-
-        if (type.type == destination->type) {
-            Instr instr;
-            instr.common.type = Instr::Store;
-            instr.store.output = 0;
-            instr.store.index = destination->index;
-            instr.store.reg = type.reg;
-            instr.store.exceptionId = exceptionId(node->expressionCast());
-            bytecode << instr;
-
-            releaseReg(type.reg);
-
-            Instr done;
-            done.common.type = Instr::Done;
-            bytecode << done;
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
-
-bool QmlBindingCompilerPrivate::parseExpression(QmlJS::AST::Node *node, Result &type)
-{
-    while (node->kind == AST::Node::Kind_NestedExpression)
-        node = static_cast<AST::NestedExpression *>(node)->expression;
-
-    if (tryArith(node)) {
-        if (!parseArith(node, type)) return false;
-    } else if (tryLogic(node)) {
-        if (!parseLogic(node, type)) return false;
-    } else if (tryConditional(node)) {
-        if (!parseConditional(node, type)) return false;
-    } else if (tryName(node)) {
-        if (!parseName(node, type)) return false;
-    } else if (tryConstant(node)) {
-        if (!parseConstant(node, type)) return false;
-    } else if (tryMethod(node)) {
-        if (!parseMethod(node, type)) return false;
-    } else {
-        return false;
-    }
-    return true;
-}
-
-bool QmlBindingCompilerPrivate::tryName(QmlJS::AST::Node *node)
-{
-    return node->kind == AST::Node::Kind_IdentifierExpression ||
-           node->kind == AST::Node::Kind_FieldMemberExpression;
-}
-
-bool QmlBindingCompilerPrivate::parseName(AST::Node *node, Result &type)
-{
-    QStringList nameParts;
-    QList<AST::ExpressionNode *> nameNodes;
-    if (!buildName(nameParts, node, &nameNodes))
-        return false;
-
-    int reg = acquireReg();
-    if (reg == -1)
-        return false;
-    type.reg = reg;
-
-    QmlParser::Object *absType = 0;
-
-    QStringList subscribeName;
-
-    bool wasAttachedObject = false;
-
-    for (int ii = 0; ii < nameParts.count(); ++ii) {
-        const QString &name = nameParts.at(ii);
-
-        // We don't handle signal properties or attached properties
-        if (name.length() > 2 && name.startsWith(QLatin1String("on")) &&
-            name.at(2).isUpper())
-            return false;
-
-        QmlType *attachType = 0;
-        if (name.at(0).isUpper()) {
-            // Could be an attached property
-            if (ii == nameParts.count() - 1)
-                return false;
-            if (nameParts.at(ii + 1).at(0).isUpper())
-                return false;
-
-            QmlEnginePrivate::ImportedNamespace *ns = 0;
-            if (!engine->resolveType(imports, name.toUtf8(), &attachType, 0, 0, 0, &ns))
-                return false;
-            if (ns || !attachType || !attachType->attachedPropertiesType())
-                return false;
-
-            wasAttachedObject = true;
-        } 
-
-        if (ii == 0) {
-
-            if (attachType) {
-                Instr instr;
-                instr.common.type = Instr::LoadScope;
-                instr.load.index = 0;
-                instr.load.reg = reg;
-                bytecode << instr;
-
-                Instr attach;
-                attach.common.type = Instr::LoadAttached;
-                attach.attached.output = reg;
-                attach.attached.reg = reg;
-                attach.attached.index = attachType->index();
-                attach.attached.exceptionId = exceptionId(nameNodes.at(ii));
-                bytecode << attach;
-
-                subscribeName << contextName();
-                subscribeName << QLatin1String("$$$ATTACH_") + name;
-
-                absType = 0;
-                type.metaObject = attachType->attachedPropertiesType();
-
-                continue;
-            } else if (ids.contains(name)) {
-                QmlParser::Object *idObject = ids.value(name);
-                absType = idObject;
-                type.metaObject = absType->metaObject();
-
-                // We check if the id object is the root or 
-                // scope object to avoid a subscription
-                if (idObject == component) {
-                    Instr instr;
-                    instr.common.type = Instr::LoadRoot;
-                    instr.load.index = 0;
-                    instr.load.reg = reg;
-                    bytecode << instr;
-                } else if (idObject == context) {
-                    Instr instr;
-                    instr.common.type = Instr::LoadScope;
-                    instr.load.index = 0;
-                    instr.load.reg = reg;
-                    bytecode << instr;
-                } else {
-                    Instr instr;
-                    instr.common.type = Instr::LoadId;
-                    instr.load.index = idObject->idIndex;
-                    instr.load.reg = reg;
-                    bytecode << instr;
-
-                    subscribeName << QLatin1String("$$$ID_") + name;
-
-                    if (subscription(subscribeName, &type)) {
-                        Instr sub;
-                        sub.common.type = Instr::SubscribeId;
-                        sub.subscribe.offset = subscriptionIndex(subscribeName);
-                        sub.subscribe.reg = reg;
-                        sub.subscribe.index = instr.load.index;
-                        bytecode << sub;
-                    }
-                }
-
-            } else {
-
-                QByteArray utf8Name = name.toUtf8();
-                const char *cname = utf8Name.constData();
-
-                int d0Idx = (context == component)?-1:context->metaObject()->indexOfProperty(cname);
-                int d1Idx = -1;
-                if (d0Idx == -1)
-                    d1Idx = component->metaObject()->indexOfProperty(cname);
-
-                if (d0Idx != -1) {
-                    Instr instr;
-                    instr.common.type = Instr::LoadScope;
-                    instr.load.index = 0;
-                    instr.load.reg = reg;
-                    bytecode << instr;
-
-                    subscribeName << contextName();
-                    subscribeName << name;
-
-                    if (!fetch(type, context->metaObject(), reg, d0Idx, subscribeName, nameNodes.at(ii)))
-                        return false;
-                } else if(d1Idx != -1) {
-                    Instr instr;
-                    instr.common.type = Instr::LoadRoot;
-                    instr.load.index = 0;
-                    instr.load.reg = reg;
-                    bytecode << instr;
-
-                    subscribeName << QLatin1String("$$$ROOT");
-                    subscribeName << name;
-
-                    if (!fetch(type, component->metaObject(), reg, d1Idx, subscribeName, nameNodes.at(ii)))
-                        return false;
-                } else {
-                    Instr find;
-                    if (nameParts.count() == 1)
-                        find.common.type = Instr::FindGenericTerminal;
-                    else
-                        find.common.type = Instr::FindGeneric;
-
-                    find.find.reg = reg;
-                    find.find.src = -1;
-                    find.find.name = registerString(name);
-                    find.find.exceptionId = exceptionId(nameNodes.at(ii));
-
-                    subscribeName << QString(QLatin1String("$$$Generic_") + name);
-                    if (subscription(subscribeName, &type)) 
-                        find.find.subscribeIndex = subscriptionIndex(subscribeName);
-                    else
-                        find.find.subscribeIndex = -1;
-
-                    bytecode << find;
-                    type.unknownType = true;
-                } 
-
-                if (!type.unknownType && type.type == -1)
-                    return false; // Couldn't fetch that type
-            } 
-
-        } else {
-
-            if (attachType) {
-                Instr attach;
-                attach.common.type = Instr::LoadAttached;
-                attach.attached.output = reg;
-                attach.attached.reg = reg;
-                attach.attached.index = attachType->index();
-                bytecode << attach;
-
-                absType = 0;
-                type.metaObject = attachType->attachedPropertiesType();
-
-                subscribeName << QLatin1String("$$$ATTACH_") + name;
-                continue;
-            }
-
-            const QMetaObject *mo = 0;
-            if (absType)
-                mo = absType->metaObject();
-            else if (type.metaObject)
-                mo = type.metaObject;
-
-            QByteArray utf8Name = name.toUtf8();
-            const char *cname = utf8Name.constData();
-            int idx = mo?mo->indexOfProperty(cname):-1;
-            if (absType && idx == -1)
-                return false;
-
-            subscribeName << name;
-
-            if (absType || (wasAttachedObject && idx != -1) || (mo && mo->property(idx).isFinal())) {
-                absType = 0; 
-                if (!fetch(type, mo, reg, idx, subscribeName, nameNodes.at(ii)))
-                    return false;
-            } else {
-
-                Instr prop;
-                if (ii == nameParts.count() -1 ) 
-                    prop.common.type = Instr::FindPropertyTerminal;
-                else
-                    prop.common.type = Instr::FindProperty;
-
-                prop.find.reg = reg;
-                prop.find.src = reg;
-                prop.find.name = registerString(name);
-                prop.find.exceptionId = exceptionId(nameNodes.at(ii));
-
-                if (subscription(subscribeName, &type))
-                    prop.find.subscribeIndex = subscriptionIndex(subscribeName);
-                else
-                    prop.find.subscribeIndex = -1;
-
-                type.unknownType = true;
-                type.metaObject = 0;
-                type.type = -1;
-                type.reg = reg;
-                bytecode << prop;
-            }
-        }
-
-        wasAttachedObject = false;
-    }
-
-    return true;
-}
-
-bool QmlBindingCompilerPrivate::tryArith(QmlJS::AST::Node *node)
-{
-    if (node->kind != AST::Node::Kind_BinaryExpression)
-        return false;
-
-    AST::BinaryExpression *expression = static_cast<AST::BinaryExpression *>(node);
-    if (expression->op == QSOperator::Add ||
-        expression->op == QSOperator::Sub)
-        return true;
-    else
-        return false;
-}
-
-bool QmlBindingCompilerPrivate::parseArith(QmlJS::AST::Node *node, Result &type)
-{
-    AST::BinaryExpression *expression = static_cast<AST::BinaryExpression *>(node);
-
-    type.reg = acquireReg();
-
-    Result lhs;
-    Result rhs;
-
-    if (!parseExpression(expression->left, lhs)) return false;
-    if (!parseExpression(expression->right, rhs)) return false;
-
-    if ((lhs.type == QVariant::Int || lhs.type == QMetaType::QReal) &&
-        (rhs.type == QVariant::Int || rhs.type == QMetaType::QReal))
-        return numberArith(type, lhs, rhs, (QSOperator::Op)expression->op);
-    else if(expression->op == QSOperator::Sub)
-        return numberArith(type, lhs, rhs, (QSOperator::Op)expression->op);
-    else if ((lhs.type == QMetaType::QString || lhs.unknownType) && 
-             (rhs.type == QMetaType::QString || rhs.unknownType) && 
-             (lhs.type == QMetaType::QString || rhs.type == QMetaType::QString))
-        return stringArith(type, lhs, rhs, (QSOperator::Op)expression->op);
-    else
-        return false;
-}
-
-bool QmlBindingCompilerPrivate::numberArith(Result &type, const Result &lhs, const Result &rhs, QSOperator::Op op)
-{
-    bool nativeReal = rhs.type == QMetaType::QReal ||
-                      lhs.type == QMetaType::QReal ||
-                      lhs.unknownType ||
-                      rhs.unknownType;
-
-    if (nativeReal && lhs.type == QMetaType::Int) {
-        Instr convert;
-        convert.common.type = Instr::ConvertIntToReal;
-        convert.unaryop.output = lhs.reg;
-        convert.unaryop.src = lhs.reg;
-        bytecode << convert;
-    }
-
-    if (nativeReal && rhs.type == QMetaType::Int) {
-        Instr convert;
-        convert.common.type = Instr::ConvertIntToReal;
-        convert.unaryop.output = rhs.reg;
-        convert.unaryop.src = rhs.reg;
-        bytecode << convert;
-    }
-
-    int lhsTmp = -1;
-    int rhsTmp = -1;
-    if (lhs.unknownType) {
-        lhsTmp = acquireReg();
-
-        Instr conv;
-        conv.common.type = Instr::ConvertGenericToReal;
-        conv.unaryop.output = lhsTmp;
-        conv.unaryop.src = lhs.reg;
-        bytecode << conv;
-    }
-
-    if (rhs.unknownType) {
-        rhsTmp = acquireReg();
-
-        Instr conv;
-        conv.common.type = Instr::ConvertGenericToReal;
-        conv.unaryop.output = rhsTmp;
-        conv.unaryop.src = rhs.reg;
-        bytecode << conv;
-    }
-
-    Instr arith;
-    if (op == QSOperator::Add) {
-        arith.common.type = nativeReal?Instr::AddReal:Instr::AddInt;
-    } else if (op == QSOperator::Sub) {
-        arith.common.type = nativeReal?Instr::MinusReal:Instr::MinusInt;
-    } else {
-        qFatal("Unsupported arithmetic operator");
-    }
-
-    arith.binaryop.output = type.reg;
-    arith.binaryop.src1 = (lhsTmp == -1)?lhs.reg:lhsTmp;
-    arith.binaryop.src2 = (rhsTmp == -1)?rhs.reg:rhsTmp;
-    bytecode << arith;
-
-    type.metaObject = 0;
-    type.type = nativeReal?QMetaType::QReal:QMetaType::Int;
-    type.subscriptionSet.unite(lhs.subscriptionSet);
-    type.subscriptionSet.unite(rhs.subscriptionSet);
-
-    if (lhsTmp != -1) releaseReg(lhsTmp);
-    if (rhsTmp != -1) releaseReg(rhsTmp);
-    releaseReg(lhs.reg);
-    releaseReg(rhs.reg);
-
-    return true;
-}
-
-bool QmlBindingCompilerPrivate::stringArith(Result &type, const Result &lhs, const Result &rhs, QSOperator::Op op)
-{
-    if (op != QSOperator::Add)
-        return false;
-
-    int lhsTmp = -1;
-    int rhsTmp = -1;
-
-    if (lhs.unknownType) {
-        lhsTmp = acquireReg(Instr::CleanupString);
-
-        Instr convert;
-        convert.common.type = Instr::ConvertGenericToString;
-        convert.unaryop.output = lhsTmp;
-        convert.unaryop.src = lhs.reg;
-        bytecode << convert;
-    }
-
-    if (rhs.unknownType) {
-        rhsTmp = acquireReg(Instr::CleanupString);
-
-        Instr convert;
-        convert.common.type = Instr::ConvertGenericToString;
-        convert.unaryop.output = rhsTmp;
-        convert.unaryop.src = rhs.reg;
-        bytecode << convert;
-    }
-
-    type.reg = acquireReg(Instr::CleanupString);
-    type.type = QMetaType::QString;
-
-    Instr add;
-    add.common.type = Instr::AddString;
-    add.binaryop.output = type.reg;
-    add.binaryop.src1 = (lhsTmp == -1)?lhs.reg:lhsTmp;
-    add.binaryop.src2 = (rhsTmp == -1)?rhs.reg:rhsTmp;
-    bytecode << add;
-
-    if (lhsTmp != -1) releaseReg(lhsTmp);
-    if (rhsTmp != -1) releaseReg(rhsTmp);
-
-    return true;
-}
-
-bool QmlBindingCompilerPrivate::tryLogic(QmlJS::AST::Node *node)
-{
-    if (node->kind != AST::Node::Kind_BinaryExpression)
-        return false;
-
-    AST::BinaryExpression *expression = static_cast<AST::BinaryExpression *>(node);
-    if (expression->op == QSOperator::Gt ||
-        expression->op == QSOperator::Equal ||
-        expression->op == QSOperator::NotEqual)
-        return true;
-    else
-        return false;
-}
-
-bool QmlBindingCompilerPrivate::parseLogic(QmlJS::AST::Node *node, Result &type)
-{
-    AST::BinaryExpression *expression = static_cast<AST::BinaryExpression *>(node);
-
-    Result lhs;
-    Result rhs;
-
-    if (!parseExpression(expression->left, lhs)) return false;
-    if (!parseExpression(expression->right, rhs)) return false;
-
-    type.reg = acquireReg();
-    type.metaObject = 0;
-    type.type = QVariant::Bool;
-
-    if (lhs.type == QMetaType::QReal && rhs.type == QMetaType::QReal) {
-
-        Instr op;
-        if (expression->op == QSOperator::Gt)
-            op.common.type = Instr::GreaterThanReal;
-        else if (expression->op == QSOperator::Equal)
-            op.common.type = Instr::CompareReal;
-        else if (expression->op == QSOperator::NotEqual)
-            op.common.type = Instr::NotCompareReal;
-        else
-            return false;
-        op.binaryop.output = type.reg;
-        op.binaryop.src1 = lhs.reg;
-        op.binaryop.src2 = rhs.reg;
-        bytecode << op;
-
-
-    } else if (lhs.type == QMetaType::QString && rhs.type == QMetaType::QString) {
-
-        Instr op;
-        if (expression->op == QSOperator::Equal)
-            op.common.type = Instr::CompareString;
-        else if (expression->op == QSOperator::NotEqual)
-            op.common.type = Instr::NotCompareString;
-        else
-            return false;
-        op.binaryop.output = type.reg;
-        op.binaryop.src1 = lhs.reg;
-        op.binaryop.src2 = rhs.reg;
-        bytecode << op;
-
-    } else {
-        return false;
-    }
-
-    releaseReg(lhs.reg);
-    releaseReg(rhs.reg);
-
-    return true;
-}
-
-bool QmlBindingCompilerPrivate::tryConditional(QmlJS::AST::Node *node)
-{
-    return (node->kind == AST::Node::Kind_ConditionalExpression);
-}
-
-bool QmlBindingCompilerPrivate::parseConditional(QmlJS::AST::Node *node, Result &type)
-{
-    AST::ConditionalExpression *expression = static_cast<AST::ConditionalExpression *>(node);
-
-    AST::Node *test = expression->expression;
-    if (test->kind == AST::Node::Kind_NestedExpression)
-        test = static_cast<AST::NestedExpression*>(test)->expression;
-
-    Result etype;
-    if (!parseExpression(test, etype)) return false;
-
-    if (etype.type != QVariant::Bool) 
-        return false;
-
-    Instr skip;
-    skip.common.type = Instr::Skip;
-    skip.skip.reg = etype.reg;
-    skip.skip.count = 0;
-    int skipIdx = bytecode.count();
-    bytecode << skip;
-
-    // Release to allow reuse of reg
-    releaseReg(etype.reg);
-
-    QSet<QString> preSubSet = subscriptionSet;
-
-    // int preConditionalSubscriptions = subscriptionSet.count();
-
-    Result ok;
-    if (!parseExpression(expression->ok, ok)) return false;
-    if (ok.unknownType) return false;
-
-    int skipIdx2 = bytecode.count();
-    skip.skip.reg = -1;
-    bytecode << skip;
-
-    // Release to allow reuse of reg
-    releaseReg(ok.reg);
-    bytecode[skipIdx].skip.count = bytecode.count() - skipIdx - 1;
-
-    subscriptionSet = preSubSet;
-
-    Result ko;
-    if (!parseExpression(expression->ko, ko)) return false;
-    if (ko.unknownType) return false;
-
-    // Release to allow reuse of reg
-    releaseReg(ko.reg);
-    bytecode[skipIdx2].skip.count = bytecode.count() - skipIdx2 - 1;
-
-    if (ok != ko)
-        return false; // Must be same type and in same register
-
-    subscriptionSet = preSubSet;
-
-    if (!subscriptionNeutral(subscriptionSet, ok.subscriptionSet, ko.subscriptionSet))
-        return false; // Conditionals cannot introduce new subscriptions
-
-    type = ok;
-
-    return true;
-}
-
-bool QmlBindingCompilerPrivate::tryConstant(QmlJS::AST::Node *node)
-{
-    return node->kind == AST::Node::Kind_TrueLiteral ||
-           node->kind == AST::Node::Kind_FalseLiteral ||
-           node->kind == AST::Node::Kind_NumericLiteral ||
-           node->kind == AST::Node::Kind_StringLiteral;
-}
-
-bool QmlBindingCompilerPrivate::parseConstant(QmlJS::AST::Node *node, Result &type)
-{
-    type.metaObject = 0;
-    type.type = -1;
-    type.reg = acquireReg();
-
-    if (node->kind == AST::Node::Kind_TrueLiteral) {
-        type.type = QVariant::Bool;
-        Instr instr;
-        instr.common.type = Instr::Bool;
-        instr.bool_value.reg = type.reg;
-        instr.bool_value.value = true;
-        bytecode << instr;
-        return true;
-    } else if (node->kind == AST::Node::Kind_FalseLiteral) {
-        type.type = QVariant::Bool;
-        Instr instr;
-        instr.common.type = Instr::Bool;
-        instr.bool_value.reg = type.reg;
-        instr.bool_value.value = false;
-        bytecode << instr;
-        return true;
-    } else if (node->kind == AST::Node::Kind_NumericLiteral) {
-        qreal value = qreal(static_cast<AST::NumericLiteral *>(node)->value);
-
-        if (qreal(float(value)) != value)
-            return false;
-
-        type.type = QMetaType::QReal;
-        Instr instr;
-        instr.common.type = Instr::Real;
-        instr.real_value.reg = type.reg;
-        instr.real_value.value = float(value);
-        bytecode << instr;
-        return true;
-    } else if (node->kind == AST::Node::Kind_StringLiteral) {
-        QString str = static_cast<AST::StringLiteral *>(node)->value->asString();
-        type.type = QMetaType::QString;
-        type.reg = registerLiteralString(str);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-bool QmlBindingCompilerPrivate::tryMethod(QmlJS::AST::Node *node)
-{
-    return node->kind == AST::Node::Kind_CallExpression; 
-}
-
-bool QmlBindingCompilerPrivate::parseMethod(QmlJS::AST::Node *node, Result &result)
-{
-    AST::CallExpression *expr = static_cast<AST::CallExpression *>(node);
-
-    QStringList name;
-    if (!buildName(name, expr->base))
-        return false;
-
-    if (name.count() != 2 || name.at(0) != QLatin1String("Math"))
-        return false;
-
-    QString method = name.at(1);
-
-    AST::ArgumentList *args = expr->arguments;
-    if (!args) return false;
-    AST::ExpressionNode *arg0 = args->expression;
-    args = args->next;
-    if (!args) return false;
-    AST::ExpressionNode *arg1 = args->expression;
-    if (args->next != 0) return false;
-    if (!arg0 || !arg1) return false;
-
-    Result r0;
-    if (!parseExpression(arg0, r0)) return false;
-    Result r1;
-    if (!parseExpression(arg1, r1)) return false;
-
-    if (r0.type != QMetaType::QReal || r1.type != QMetaType::QReal)
-        return false;
-
-    Instr op;
-    if (method == QLatin1String("max")) {
-        op.common.type = Instr::MaxReal;
-    } else if (method == QLatin1String("min")) {
-        op.common.type = Instr::MinReal;
-    } else {
-        return false;
-    }
-    // We release early to reuse registers
-    releaseReg(r0.reg);
-    releaseReg(r1.reg);
-
-    op.binaryop.output = acquireReg();
-    op.binaryop.src1 = r0.reg;
-    op.binaryop.src2 = r1.reg;
-    bytecode << op;
-
-    result.type = QMetaType::QReal;
-    result.reg = op.binaryop.output;
-
-    return true;
-}
-
-bool QmlBindingCompilerPrivate::buildName(QStringList &name,
-                                       QmlJS::AST::Node *node,
-                                       QList<QmlJS::AST::ExpressionNode *> *nodes)
-{
-    if (node->kind == AST::Node::Kind_IdentifierExpression) {
-        name << static_cast<AST::IdentifierExpression*>(node)->name->asString();
-        if (nodes) *nodes << static_cast<AST::IdentifierExpression*>(node);
-    } else if (node->kind == AST::Node::Kind_FieldMemberExpression) {
-        AST::FieldMemberExpression *expr =
-            static_cast<AST::FieldMemberExpression *>(node);
-
-        if (!buildName(name, expr->base, nodes))
-            return false;
-
-        name << expr->name->asString();
-        if (nodes) *nodes << expr;
-    } else {
-        return false;
-    }
-
-    return true;
-}
-
-
-bool QmlBindingCompilerPrivate::fetch(Result &rv, const QMetaObject *mo, int reg, 
-                                      int idx, const QStringList &subName, QmlJS::AST::ExpressionNode *node)
-{
-    QMetaProperty prop = mo->property(idx);
-    rv.metaObject = 0;
-    rv.type = 0;
-
-    if (subscription(subName, &rv) && prop.hasNotifySignal() && prop.notifySignalIndex() != -1) {
-        Instr sub;
-        sub.common.type = Instr::Subscribe;
-        sub.subscribe.offset = subscriptionIndex(subName);
-        sub.subscribe.reg = reg;
-        sub.subscribe.index = prop.notifySignalIndex();
-        bytecode << sub;
-    }
-
-    Instr fetch;
-    fetch.common.type = Instr::Fetch;
-    fetch.fetch.objectReg = reg;
-    fetch.fetch.index = idx;
-    fetch.fetch.output = reg;
-    fetch.fetch.exceptionId = exceptionId(node);
-
-    rv.type = prop.userType();
-    rv.metaObject = engine->metaObjectForType(rv.type);
-    rv.reg = reg;
-
-    if (rv.type == QMetaType::QString) {
-        int tmp = acquireReg();
-        Instr copy;
-        copy.common.type = Instr::Copy;
-        copy.copy.reg = tmp;
-        copy.copy.src = reg;
-        bytecode << copy;
-        releaseReg(tmp);
-        fetch.fetch.objectReg = tmp;
-
-        Instr setup;
-        setup.common.type = Instr::NewString;
-        setup.construct.reg = reg;
-        bytecode << setup;
-        registerCleanup(reg, Instr::CleanupString);
-    }
-
-    bytecode << fetch;
-
-    if (!rv.metaObject &&
-        rv.type != QMetaType::QReal &&
-        rv.type != QMetaType::Int &&
-        rv.type != QMetaType::Bool &&
-        rv.type != qMetaTypeId<QmlGraphicsAnchorLine>() &&
-        rv.type != QMetaType::QString) {
-        rv.metaObject = 0;
-        rv.type = 0;
-        return false; // Unsupported type (string not supported yet);
-    }
-
-    return true;
-}
-
-void QmlBindingCompilerPrivate::registerCleanup(int reg, int cleanup, int cleanupType)
-{
-    registerCleanups.insert(reg, qMakePair(cleanup, cleanupType));
-}
-
-int QmlBindingCompilerPrivate::acquireReg(int cleanup, int cleanupType)
-{
-    for (int ii = 0; ii < 32; ++ii) {
-        if (!(registers & (1 << ii))) {
-            registers |= (1 << ii);
-
-            if (cleanup != Instr::Noop)
-                registerCleanup(ii, cleanup, cleanupType);
-
-            return ii;
-        }
-    }
-    return -1;
-}
-
-void QmlBindingCompilerPrivate::releaseReg(int reg)
-{
-    Q_ASSERT(reg >= 0 && reg <= 31);
-
-    if (registerCleanups.contains(reg)) {
-        QPair<int, int> c = registerCleanups[reg];
-        registerCleanups.remove(reg);
-        Instr cleanup;
-        cleanup.common.type = (quint8)c.first;
-        cleanup.cleanup.reg = reg;
-        bytecode << cleanup;
-    }
-
-    quint32 mask = 1 << reg;
-    registers &= ~mask;
-}
-
-// Returns a reg
-int QmlBindingCompilerPrivate::registerLiteralString(const QString &str)
-{
-    QByteArray strdata((const char *)str.constData(), str.length() * sizeof(QChar));
-    int offset = data.count();
-    data += strdata;
-
-    int reg = acquireReg(Instr::CleanupString);
-
-    Instr string;
-    string.common.type = Instr::String;
-    string.string_value.reg = reg;
-    string.string_value.offset = offset;
-    string.string_value.length = str.length();
-    bytecode << string;
-
-    return reg;
-}
-
-// Returns an identifier offset
-int QmlBindingCompilerPrivate::registerString(const QString &string)
-{
-    Q_ASSERT(!string.isEmpty());
-
-    QHash<QString, QPair<int, int> >::ConstIterator iter = registeredStrings.find(string);
-
-    if (iter == registeredStrings.end()) {
-        quint32 len = string.length();
-        QByteArray lendata((const char *)&len, sizeof(quint32));
-        QByteArray strdata((const char *)string.constData(), string.length() * sizeof(QChar));
-        strdata.prepend(lendata);
-        int rv = data.count();
-        data += strdata;
-
-        iter = registeredStrings.insert(string, qMakePair(registeredStrings.count(), rv));
-    } 
-
-    Instr reg;
-    reg.common.type = Instr::InitString;
-    reg.initstring.offset = iter->first;
-    reg.initstring.dataIdx = iter->second;
-    bytecode << reg;
-    return reg.initstring.offset;
-}
-
-bool QmlBindingCompilerPrivate::subscription(const QStringList &sub, Result *result)
-{
-    QString str = sub.join(QLatin1String("."));
-    result->subscriptionSet.insert(str);
-
-    if (subscriptionSet.contains(str)) {
-        return false;
-    } else {
-        subscriptionSet.insert(str);
-        return true;
-    }
-}
-
-int QmlBindingCompilerPrivate::subscriptionIndex(const QStringList &sub)
-{
-    QString str = sub.join(QLatin1String("."));
-    QHash<QString, int>::ConstIterator iter = subscriptionIds.find(str);
-    if (iter == subscriptionIds.end()) 
-        iter = subscriptionIds.insert(str, subscriptionIds.count());
-    usedSubscriptionIds.insert(*iter);
-    return *iter;
-}
-
-/*
-    Returns true if lhs contains no subscriptions that aren't also in base or rhs AND
-    rhs contains no subscriptions that aren't also in base or lhs.
-*/ 
-bool QmlBindingCompilerPrivate::subscriptionNeutral(const QSet<QString> &base, 
-                                             const QSet<QString> &lhs, 
-                                             const QSet<QString> &rhs)
-{
-    QSet<QString> difflhs = lhs;
-    difflhs.subtract(rhs);
-    QSet<QString> diffrhs = rhs;
-    diffrhs.subtract(lhs);
-
-    difflhs.unite(diffrhs);
-    difflhs.subtract(base);
-
-    return difflhs.isEmpty();
-}
-
-quint8 QmlBindingCompilerPrivate::exceptionId(QmlJS::AST::ExpressionNode *n)
-{
-    quint8 rv = 0xFF;
-    if (n && exceptions.count() < 0xFF) {
-        rv = (quint8)exceptions.count();
-        QmlJS::AST::SourceLocation l = n->firstSourceLocation();
-        quint64 e = l.startLine;
-        e <<= 32;
-        e |= l.startColumn;
-        exceptions.append(e);
-    }
-    return rv;
-}
-
-QmlBindingCompiler::QmlBindingCompiler()
-: d(new QmlBindingCompilerPrivate)
-{
-}
-
-QmlBindingCompiler::~QmlBindingCompiler()
-{
-    delete d; d = 0;
-}
-
-/* 
-Returns true if any bindings were compiled.
-*/
-bool QmlBindingCompiler::isValid() const
-{
-    return !d->committed.bytecode.isEmpty();
-}
-
-/* 
--1 on failure, otherwise the binding index to use.
-*/
-int QmlBindingCompiler::compile(const Expression &expression, QmlEnginePrivate *engine)
-{
-    if (!expression.expression.asAST()) return false;
-
-    d->context = expression.context;
-    d->component = expression.component;
-    d->destination = expression.property;
-    d->ids = expression.ids;
-    d->imports = expression.imports;
-    d->engine = engine;
-
-    if (d->compile(expression.expression.asAST())) {
-        return d->commitCompile();
-    } else {
-        return -1;
-    }
-}
-
-
-QByteArray QmlBindingCompilerPrivate::buildSignalTable() const
-{
-    QHash<int, QList<int> > table;
-
-    for (int ii = 0; ii < committed.count(); ++ii) {
-        const QSet<int> &deps = committed.dependencies.at(ii);
-        for (QSet<int>::ConstIterator iter = deps.begin(); iter != deps.end(); ++iter) 
-            table[*iter].append(ii);
-    }
-
-    QVector<quint32> header;
-    QVector<quint32> data;
-    for (int ii = 0; ii < committed.subscriptionIds.count(); ++ii) {
-        header.append(committed.subscriptionIds.count() + data.count());
-        const QList<int> &bindings = table[ii];
-        data.append(bindings.count());
-        for (int jj = 0; jj < bindings.count(); ++jj)
-            data.append(bindings.at(jj));
-    }
-    header << data;
-
-    return QByteArray((const char *)header.constData(), header.count() * sizeof(quint32));
-}
-
-QByteArray QmlBindingCompilerPrivate::buildExceptionData() const
-{
-    QByteArray rv;
-    rv.resize(committed.exceptions.count() * sizeof(quint64));
-    ::memcpy(rv.data(), committed.exceptions.constData(), rv.size());
-    return rv;
-}
-
-/* 
-Returns the compiled program.
-*/
-QByteArray QmlBindingCompiler::program() const
-{
-    QByteArray programData;
-
-    if (isValid()) {
-        Program prog;
-        prog.bindings = d->committed.count();
-
-        QVector<Instr> bytecode;
-        Instr skip;
-        skip.common.type = Instr::Skip;
-        skip.skip.reg = -1;
-        for (int ii = 0; ii < d->committed.count(); ++ii) {
-            skip.skip.count = d->committed.count() - ii - 1;
-            skip.skip.count+= d->committed.offsets.at(ii);
-            bytecode << skip;
-        }
-        bytecode << d->committed.bytecode;
-
-        QByteArray data = d->committed.data;
-        while (data.count() % 4) data.append('\0');
-        prog.signalTableOffset = data.count();
-        data += d->buildSignalTable();
-        while (data.count() % 4) data.append('\0');
-        prog.exceptionDataOffset = data.count();
-        data += d->buildExceptionData();
-
-        prog.dataLength = 4 * ((data.size() + 3) / 4);
-        prog.subscriptions = d->committed.subscriptionIds.count();
-        prog.identifiers = d->committed.registeredStrings.count();
-        prog.instructionCount = bytecode.count();
-        int size = sizeof(Program) + bytecode.count() * sizeof(Instr);
-        size += prog.dataLength;
-
-        programData.resize(size);
-        memcpy(programData.data(), &prog, sizeof(Program));
-        if (prog.dataLength)
-            memcpy((char *)((Program *)programData.data())->data(), data.constData(), 
-                   data.size());
-        memcpy((char *)((Program *)programData.data())->instructions(), bytecode.constData(), 
-               bytecode.count() * sizeof(Instr));
-    } 
-
-    return programData;
-}
-
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcompiledbindings_p.h b/src/declarative/qml/qmlcompiledbindings_p.h
deleted file mode 100644
index 056cc21..0000000
--- a/src/declarative/qml/qmlcompiledbindings_p.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLBINDINGOPTIMIZATIONS_P_H
-#define QMLBINDINGOPTIMIZATIONS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlexpression_p.h"
-#include "qmlbinding_p.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QmlBindingCompilerPrivate;
-class QmlBindingCompiler
-{
-public:
-    QmlBindingCompiler();
-    ~QmlBindingCompiler();
-
-    // Returns true if bindings were compiled
-    bool isValid() const;
-
-    struct Expression
-    {
-        QmlParser::Object *component;
-        QmlParser::Object *context;
-        QmlParser::Property *property;
-        QmlParser::Variant expression;
-        QHash<QString, QmlParser::Object *> ids;
-        QmlEnginePrivate::Imports imports;
-    };
-
-    // -1 on failure, otherwise the binding index to use
-    int compile(const Expression &, QmlEnginePrivate *);
-
-    // Returns the compiled program
-    QByteArray program() const;
-
-    static void dump(const QByteArray &);
-private:
-    QmlBindingCompilerPrivate *d;
-};
-
-class QmlCompiledBindingsPrivate;
-class QmlCompiledBindings : public QObject, public QmlAbstractExpression, public QmlRefCount
-{
-public:
-    QmlCompiledBindings(const char *program, QmlContext *context);
-    virtual ~QmlCompiledBindings();
-
-    QmlAbstractBinding *configBinding(int index, QObject *target, QObject *scope, int property);
-
-protected:
-    int qt_metacall(QMetaObject::Call, int, void **);
-
-private:
-    Q_DISABLE_COPY(QmlCompiledBindings);
-    Q_DECLARE_PRIVATE(QmlCompiledBindings);
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLBINDINGOPTIMIZATIONS_P_H
-
diff --git a/src/declarative/qml/qmlcompileddata.cpp b/src/declarative/qml/qmlcompileddata.cpp
deleted file mode 100644
index 0120f56..0000000
--- a/src/declarative/qml/qmlcompileddata.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlcompiler_p.h"
-#include "qmlengine.h"
-#include "qmlcomponent.h"
-#include "qmlcomponent_p.h"
-#include "qmlcontext.h"
-#include "qmlcontext_p.h"
-
-#include <QtCore/qdebug.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-int QmlCompiledData::pack(const char *data, size_t size)
-{
-    const char *p = packData.constData();
-    unsigned int ps = packData.size();
-
-    for (unsigned int ii = 0; (ii + size) <= ps; ii += sizeof(int)) {
-        if (0 == ::memcmp(p + ii, data, size))
-            return ii;
-    }
-
-    int rv = packData.size();
-    packData.append(data, size);
-    return rv;
-}
-
-int QmlCompiledData::indexForString(const QString &data)
-{
-    int idx = primitives.indexOf(data);
-    if (idx == -1) {
-        idx = primitives.count();
-        primitives << data;
-    }
-    return idx;
-}
-
-int QmlCompiledData::indexForByteArray(const QByteArray &data)
-{
-    int idx = datas.indexOf(data);
-    if (idx == -1) {
-        idx = datas.count();
-        datas << data;
-    }
-    return idx;
-}
-
-int QmlCompiledData::indexForUrl(const QUrl &data)
-{
-    int idx = urls.indexOf(data);
-    if (idx == -1) {
-        idx = urls.count();
-        urls << data;
-    }
-    return idx;
-}
-
-int QmlCompiledData::indexForFloat(float *data, int count)
-{
-    Q_ASSERT(count > 0);
-
-    for (int ii = 0; ii <= floatData.count() - count; ++ii) {
-        bool found = true;
-        for (int jj = 0; jj < count; ++jj) {
-            if (floatData.at(ii + jj) != data[jj]) {
-                found = false;
-                break;
-            }
-        }
-
-        if (found)
-            return ii;
-    }
-
-    int idx = floatData.count();
-    for (int ii = 0; ii < count; ++ii)
-        floatData << data[ii];
-
-    return idx;
-}
-
-int QmlCompiledData::indexForInt(int *data, int count)
-{
-    Q_ASSERT(count > 0);
-
-    for (int ii = 0; ii <= intData.count() - count; ++ii) {
-        bool found = true;
-        for (int jj = 0; jj < count; ++jj) {
-            if (intData.at(ii + jj) != data[jj]) {
-                found = false;
-                break;
-            }
-        }
-
-        if (found)
-            return ii;
-    }
-
-    int idx = intData.count();
-    for (int ii = 0; ii < count; ++ii)
-        intData << data[ii];
-
-    return idx;
-}
-
-int QmlCompiledData::indexForLocation(const QmlParser::Location &l)
-{
-    // ### FIXME
-    int rv = locations.count();
-    locations << l;
-    return rv;
-}
-
-int QmlCompiledData::indexForLocation(const QmlParser::LocationSpan &l)
-{
-    // ### FIXME
-    int rv = locations.count();
-    locations << l.start << l.end;
-    return rv;
-}
-
-QmlCompiledData::QmlCompiledData(QmlEngine *engine)
-: QmlCleanup(engine), importCache(0), root(0), rootPropertyCache(0)
-{
-}
-
-QmlCompiledData::~QmlCompiledData()
-{
-    for (int ii = 0; ii < types.count(); ++ii) {
-        if (types.at(ii).ref)
-            types.at(ii).ref->release();
-    }
-
-    for (int ii = 0; ii < propertyCaches.count(); ++ii) 
-        propertyCaches.at(ii)->release();
-
-    for (int ii = 0; ii < contextCaches.count(); ++ii)
-        contextCaches.at(ii)->release();
-
-    if (importCache)
-        importCache->release();
-
-    if (rootPropertyCache)
-        rootPropertyCache->release();
-
-    qDeleteAll(cachedPrograms);
-    qDeleteAll(cachedClosures);
-}
-
-void QmlCompiledData::clear()
-{
-    qDeleteAll(cachedPrograms);
-    qDeleteAll(cachedClosures);
-    for (int ii = 0; ii < cachedClosures.count(); ++ii)
-        cachedClosures[ii] = 0;
-    for (int ii = 0; ii < cachedPrograms.count(); ++ii)
-        cachedPrograms[ii] = 0;
-}
-
-
-QObject *QmlCompiledData::TypeReference::createInstance(QmlContext *ctxt, const QBitField &bindings) const
-{
-    if (type) {
-        QObject *rv = type->create();
-        if (rv)
-            QmlEngine::setContextForObject(rv, ctxt);
-        return rv;
-    } else {
-        Q_ASSERT(component);
-        return QmlComponentPrivate::get(component)->create(ctxt, bindings);
-    } 
-}
-
-const QMetaObject *QmlCompiledData::TypeReference::metaObject() const
-{
-    if (type) {
-        return type->metaObject();
-    } else {
-        Q_ASSERT(component);
-        return static_cast<QmlComponentPrivate *>(QObjectPrivate::get(component))->cc->root;
-    }
-}
-
-void QmlCompiledData::dumpInstructions()
-{
-    if (!name.isEmpty())
-        qWarning() << name;
-    qWarning().nospace() << "Index\tLine\tOperation\t\tData1\tData2\tData3\tComments";
-    qWarning().nospace() << "-------------------------------------------------------------------------------";
-    for (int ii = 0; ii < bytecode.count(); ++ii) {
-        dump(&bytecode[ii], ii);
-    }
-    qWarning().nospace() << "-------------------------------------------------------------------------------";
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
deleted file mode 100644
index 3702d0b..0000000
--- a/src/declarative/qml/qmlcompiler.cpp
+++ /dev/null
@@ -1,2779 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlcompiler_p.h"
-
-#include "qmlcompositetypedata_p.h"
-#include "qmlparser_p.h"
-#include "qmlscriptparser_p.h"
-#include "qmlpropertyvaluesource.h"
-#include "qmlcomponent.h"
-#include "qmetaobjectbuilder_p.h"
-#include "qmlstringconverters_p.h"
-#include "qmlengine_p.h"
-#include "qmlengine.h"
-#include "qmlcontext.h"
-#include "qmlmetatype.h"
-#include "qmlcustomparser_p_p.h"
-#include "qmlcontext_p.h"
-#include "qmlcomponent_p.h"
-#include "parser/qmljsast_p.h"
-#include "qmlvmemetaobject_p.h"
-#include "qmlexpression_p.h"
-#include "qmlmetaproperty_p.h"
-#include "qmlrewrite_p.h"
-#include "qmlscriptstring.h"
-#include "qmlglobal_p.h"
-#include "qmlscriptparser_p.h"
-#include "qmlbinding_p.h"
-#include "qmlcompiledbindings_p.h"
-
-#include <qfxperf_p_p.h>
-
-#include <QCoreApplication>
-#include <QColor>
-#include <QDebug>
-#include <QPointF>
-#include <QSizeF>
-#include <QRectF>
-#include <QAtomicInt>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-DEFINE_BOOL_CONFIG_OPTION(compilerDump, QML_COMPILER_DUMP);
-DEFINE_BOOL_CONFIG_OPTION(compilerStatDump, QML_COMPILER_STATISTICS_DUMP);
-DEFINE_BOOL_CONFIG_OPTION(qmlExperimental, QML_EXPERIMENTAL);
-
-using namespace QmlParser;
-
-/*!
-    Instantiate a new QmlCompiler.
-*/
-QmlCompiler::QmlCompiler()
-: output(0), engine(0), unitRoot(0), unit(0)
-{
-}
-
-/*!
-    Returns true if the last call to compile() caused errors.
-
-    \sa errors()
-*/
-bool QmlCompiler::isError() const
-{
-    return !exceptions.isEmpty();
-}
-
-/*!
-    Return the list of errors from the last call to compile(), or an empty list
-    if there were no errors.
-*/
-QList<QmlError> QmlCompiler::errors() const
-{
-    return exceptions;
-}
-
-/*!
-    Returns true if \a val is a legal object id, false otherwise.
-
-    Legal ids must start with a lower-case letter or underscore, and contain only
-    letters, numbers and underscores.
-*/
-bool QmlCompiler::isValidId(const QString &val)
-{
-    if (val.isEmpty())
-        return false;
-
-    if (val.at(0).isLetter() && !val.at(0).isLower()) {
-        qWarning().nospace() << "id " << val << " is invalid: ids cannot start with uppercase letters";
-        return false;
-    }
-
-    QChar u(QLatin1Char('_'));
-    for (int ii = 0; ii < val.count(); ++ii)
-        if (val.at(ii) != u &&
-           ((ii == 0 && !val.at(ii).isLetter()) ||
-           (ii != 0 && !val.at(ii).isLetterOrNumber())) )
-            return false;
-
-    return true;
-}
-
-/*!
-    Returns true if \a name refers to an attached property, false otherwise.
-
-    Attached property names are those that start with a capital letter.
-*/
-bool QmlCompiler::isAttachedPropertyName(const QByteArray &name)
-{
-    return !name.isEmpty() && name.at(0) >= 'A' && name.at(0) <= 'Z';
-}
-
-/*!
-    Returns true if \a name refers to a signal property, false otherwise.
-
-    Signal property names are those that start with "on", followed by a capital
-    letter.
-*/
-bool QmlCompiler::isSignalPropertyName(const QByteArray &name)
-{
-    return name.length() >= 3 && name.startsWith("on") &&
-           'A' <= name.at(2) && 'Z' >= name.at(2);
-}
-
-/*!
-    \macro COMPILE_EXCEPTION
-    \internal
-    Inserts an error into the QmlCompiler error list, and returns false
-    (failure).
-
-    \a token is used to source the error line and column, and \a desc is the
-    error itself.  \a desc can be an expression that can be piped into QDebug.
-
-    For example:
-
-    \code
-    COMPILE_EXCEPTION(property, QCoreApplication::translate("QmlCompiler","Error for property \"%1\"").arg(QString::fromUtf8(property->name)));
-    \endcode
-*/
-#define COMPILE_EXCEPTION(token, desc) \
-    {  \
-        QString exceptionDescription; \
-        QmlError error; \
-        error.setUrl(output->url); \
-        error.setLine((token)->location.start.line); \
-        error.setColumn((token)->location.start.column); \
-        error.setDescription(desc.trimmed()); \
-        exceptions << error; \
-        return false; \
-    }
-
-/*!
-    \macro COMPILE_CHECK
-    \internal
-    Returns false if \a is false, otherwise does nothing.
-*/
-#define COMPILE_CHECK(a) \
-    { \
-        if (!a) return false; \
-    }
-
-/*!
-    Returns true if literal \a v can be assigned to property \a prop, otherwise
-    false.
-
-    This test corresponds to action taken by genLiteralAssignment().  Any change
-    made here, must have a corresponding action in genLiteralAssigment().
-*/
-bool QmlCompiler::testLiteralAssignment(const QMetaProperty &prop,
-                                        QmlParser::Value *v)
-{
-    QString string = v->value.asScript();
-
-    if (!prop.isWritable())
-        COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop.name())));
-
-    if (prop.isEnumType()) {
-        int value;
-        if (prop.isFlagType()) {
-            value = prop.enumerator().keysToValue(string.toUtf8().constData());
-        } else
-            value = prop.enumerator().keyToValue(string.toUtf8().constData());
-        if (value == -1)
-            COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: unknown enumeration"));
-        return true;
-    }
-    int type = prop.userType();
-    switch(type) {
-        case -1:
-            break;
-        case QVariant::String:
-            if (!v->value.isString()) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: string expected"));
-            break;
-        case QVariant::Url:
-            if (!v->value.isString()) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: url expected"));
-            break;
-        case QVariant::UInt:
-            {
-            bool ok;
-            string.toUInt(&ok);
-            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: unsigned int expected"));
-            }
-            break;
-        case QVariant::Int:
-            {
-            bool ok;
-            string.toInt(&ok);
-            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: int expected"));
-            }
-            break;
-        case QMetaType::Float:
-            {
-            bool ok;
-            string.toFloat(&ok);
-            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: float expected"));
-            }
-            break;
-        case QVariant::Double:
-            {
-            bool ok;
-            string.toDouble(&ok);
-            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: double expected"));
-            }
-            break;
-        case QVariant::Color:
-            {
-            bool ok;
-            QmlStringConverters::colorFromString(string, &ok);
-            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: color expected"));
-            }
-            break;
-        case QVariant::Date:
-            {
-            bool ok;
-            QmlStringConverters::dateFromString(string, &ok);
-            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: date expected"));
-            }
-            break;
-        case QVariant::Time:
-            {
-            bool ok;
-            QmlStringConverters::timeFromString(string, &ok);
-            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: time expected"));
-            }
-            break;
-        case QVariant::DateTime:
-            {
-            bool ok;
-            QmlStringConverters::dateTimeFromString(string, &ok);
-            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: datetime expected"));
-            }
-            break;
-        case QVariant::Point:
-        case QVariant::PointF:
-            {
-            bool ok;
-            QPointF point = QmlStringConverters::pointFFromString(string, &ok);
-            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: point expected"));
-            }
-            break;
-        case QVariant::Size:
-        case QVariant::SizeF:
-            {
-            bool ok;
-            QSizeF size = QmlStringConverters::sizeFFromString(string, &ok);
-            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: size expected"));
-            }
-            break;
-        case QVariant::Rect:
-        case QVariant::RectF:
-            {
-            bool ok;
-            QRectF rect = QmlStringConverters::rectFFromString(string, &ok);
-            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: rect expected"));
-            }
-            break;
-        case QVariant::Bool:
-            {
-            if (!v->value.isBoolean()) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: boolean expected"));
-            }
-            break;
-        case QVariant::Vector3D:
-            {
-            bool ok;
-            QmlStringConverters::vector3DFromString(string, &ok);
-            if (!ok) COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: 3D vector expected"));
-            }
-            break;
-        default:
-            {
-            int t = prop.userType();
-            QmlMetaType::StringConverter converter =
-                QmlMetaType::customStringConverter(t);
-            if (!converter)
-                COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: unsupported type \"%1\"").arg(QString::fromLatin1(QVariant::typeToName(prop.type()))));
-            }
-            break;
-    }
-    return true;
-}
-
-/*!
-    Generate a store instruction for assigning literal \a v to property \a prop.
-
-    Any literal assignment that is approved in testLiteralAssignment() must have
-    a corresponding action in this method.
-*/
-void QmlCompiler::genLiteralAssignment(const QMetaProperty &prop,
-                                       QmlParser::Value *v)
-{
-    QString string = v->value.asScript();
-
-    QmlInstruction instr;
-    instr.line = v->location.start.line;
-    if (prop.isEnumType()) {
-        int value;
-        if (prop.isFlagType()) {
-            value = prop.enumerator().keysToValue(string.toUtf8().constData());
-        } else
-            value = prop.enumerator().keyToValue(string.toUtf8().constData());
-
-        instr.type = QmlInstruction::StoreInteger;
-        instr.storeInteger.propertyIndex = prop.propertyIndex();
-        instr.storeInteger.value = value;
-        output->bytecode << instr;
-        return;
-    }
-
-    int type = prop.userType();
-    switch(type) {
-        case -1:
-            {
-            instr.type = QmlInstruction::StoreVariant;
-            instr.storeString.propertyIndex = prop.propertyIndex();
-            instr.storeString.value = output->indexForString(string);
-            }
-            break;
-        case QVariant::String:
-            {
-            instr.type = QmlInstruction::StoreString;
-            instr.storeString.propertyIndex = prop.propertyIndex();
-            instr.storeString.value = output->indexForString(string);
-            }
-            break;
-        case QVariant::Url:
-            {
-            instr.type = QmlInstruction::StoreUrl;
-            QUrl u = string.isEmpty() ? QUrl() : output->url.resolved(QUrl(string));
-            instr.storeUrl.propertyIndex = prop.propertyIndex();
-            instr.storeUrl.value = output->indexForUrl(u);
-            }
-            break;
-        case QVariant::UInt:
-            {
-            instr.type = QmlInstruction::StoreInteger;
-            instr.storeInteger.propertyIndex = prop.propertyIndex();
-            instr.storeInteger.value = string.toUInt();
-            }
-            break;
-        case QVariant::Int:
-            {
-            instr.type = QmlInstruction::StoreInteger;
-            instr.storeInteger.propertyIndex = prop.propertyIndex();
-            instr.storeInteger.value = string.toInt();
-            }
-            break;
-        case QMetaType::Float:
-            {
-            instr.type = QmlInstruction::StoreFloat;
-            instr.storeFloat.propertyIndex = prop.propertyIndex();
-            instr.storeFloat.value = string.toFloat();
-            }
-            break;
-        case QVariant::Double:
-            {
-            instr.type = QmlInstruction::StoreDouble;
-            instr.storeDouble.propertyIndex = prop.propertyIndex();
-            instr.storeDouble.value = string.toDouble();
-            }
-            break;
-        case QVariant::Color:
-            {
-            QColor c = QmlStringConverters::colorFromString(string);
-            instr.type = QmlInstruction::StoreColor;
-            instr.storeColor.propertyIndex = prop.propertyIndex();
-            instr.storeColor.value = c.rgba();
-            }
-            break;
-        case QVariant::Date:
-            {
-            QDate d = QmlStringConverters::dateFromString(string);
-            instr.type = QmlInstruction::StoreDate;
-            instr.storeDate.propertyIndex = prop.propertyIndex();
-            instr.storeDate.value = d.toJulianDay();
-            }
-            break;
-        case QVariant::Time:
-            {
-            QTime time = QmlStringConverters::timeFromString(string);
-            int data[] = { time.hour(), time.minute(),
-                           time.second(), time.msec() };
-            int index = output->indexForInt(data, 4);
-            instr.type = QmlInstruction::StoreTime;
-            instr.storeTime.propertyIndex = prop.propertyIndex();
-            instr.storeTime.valueIndex = index;
-            }
-            break;
-        case QVariant::DateTime:
-            {
-            QDateTime dateTime = QmlStringConverters::dateTimeFromString(string);
-            int data[] = { dateTime.date().toJulianDay(),
-                           dateTime.time().hour(),
-                           dateTime.time().minute(),
-                           dateTime.time().second(),
-                           dateTime.time().msec() };
-            int index = output->indexForInt(data, 5);
-            instr.type = QmlInstruction::StoreDateTime;
-            instr.storeDateTime.propertyIndex = prop.propertyIndex();
-            instr.storeDateTime.valueIndex = index;
-            }
-            break;
-        case QVariant::Point:
-        case QVariant::PointF:
-            {
-            bool ok;
-            QPointF point =
-                QmlStringConverters::pointFFromString(string, &ok);
-            float data[] = { point.x(), point.y() };
-            int index = output->indexForFloat(data, 2);
-            if (type == QVariant::PointF)
-                instr.type = QmlInstruction::StorePointF;
-            else
-                instr.type = QmlInstruction::StorePoint;
-            instr.storeRealPair.propertyIndex = prop.propertyIndex();
-            instr.storeRealPair.valueIndex = index;
-            }
-            break;
-        case QVariant::Size:
-        case QVariant::SizeF:
-            {
-            bool ok;
-            QSizeF size = QmlStringConverters::sizeFFromString(string, &ok);
-            float data[] = { size.width(), size.height() };
-            int index = output->indexForFloat(data, 2);
-            if (type == QVariant::SizeF)
-                instr.type = QmlInstruction::StoreSizeF;
-            else
-                instr.type = QmlInstruction::StoreSize;
-            instr.storeRealPair.propertyIndex = prop.propertyIndex();
-            instr.storeRealPair.valueIndex = index;
-            }
-            break;
-        case QVariant::Rect:
-        case QVariant::RectF:
-            {
-            bool ok;
-            QRectF rect = QmlStringConverters::rectFFromString(string, &ok);
-            float data[] = { rect.x(), rect.y(),
-                             rect.width(), rect.height() };
-            int index = output->indexForFloat(data, 4);
-            if (type == QVariant::RectF)
-                instr.type = QmlInstruction::StoreRectF;
-            else
-                instr.type = QmlInstruction::StoreRect;
-            instr.storeRect.propertyIndex = prop.propertyIndex();
-            instr.storeRect.valueIndex = index;
-            }
-            break;
-        case QVariant::Bool:
-            {
-            bool b = v->value.asBoolean();
-            instr.type = QmlInstruction::StoreBool;
-            instr.storeBool.propertyIndex = prop.propertyIndex();
-            instr.storeBool.value = b;
-            }
-            break;
-        case QVariant::Vector3D:
-            {
-            bool ok;
-            QVector3D vector =
-                QmlStringConverters::vector3DFromString(string, &ok);
-            float data[] = { vector.x(), vector.y(), vector.z() };
-            int index = output->indexForFloat(data, 3);
-            instr.type = QmlInstruction::StoreVector3D;
-            instr.storeRealPair.propertyIndex = prop.propertyIndex();
-            instr.storeRealPair.valueIndex = index;
-            }
-            break;
-        default:
-            {
-            int t = prop.userType();
-            int index = output->customTypeData.count();
-            instr.type = QmlInstruction::AssignCustomType;
-            instr.assignCustomType.propertyIndex = prop.propertyIndex();
-            instr.assignCustomType.valueIndex = index;
-
-            QmlCompiledData::CustomTypeData data;
-            data.index = output->indexForString(string);
-            data.type = t;
-            output->customTypeData << data;
-            }
-            break;
-    }
-    output->bytecode << instr;
-}
-
-/*!
-    Resets data by clearing the lists that the QmlCompiler modifies.
-*/
-void QmlCompiler::reset(QmlCompiledData *data)
-{
-    data->types.clear();
-    data->primitives.clear();
-    data->floatData.clear();
-    data->intData.clear();
-    data->customTypeData.clear();
-    data->datas.clear();
-    data->bytecode.clear();
-}
-
-/*!
-    Compile \a unit, and store the output in \a out.  \a engine is the QmlEngine
-    with which the QmlCompiledData will be associated.
-
-    Returns true on success, false on failure.  On failure, the compile errors
-    are available from errors().
-
-    If the environment variant QML_COMPILER_DUMP is set
-    (eg. QML_COMPILER_DUMP=1) the compiled instructions will be dumped to stderr
-    on a successful compiler.
-*/
-bool QmlCompiler::compile(QmlEngine *engine,
-                          QmlCompositeTypeData *unit,
-                          QmlCompiledData *out)
-{
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::Compilation> pc;
-#endif
-    exceptions.clear();
-
-    Q_ASSERT(out);
-    reset(out);
-
-    output = out;
-
-    // Compile types
-    for (int ii = 0; ii < unit->types.count(); ++ii) {
-        QmlCompositeTypeData::TypeReference &tref = unit->types[ii];
-        QmlCompiledData::TypeReference ref;
-        QmlScriptParser::TypeReference *parserRef = unit->data.referencedTypes().at(ii);
-        if (tref.type)
-            ref.type = tref.type;
-        else if (tref.unit) {
-            ref.component = tref.unit->toComponent(engine);
-
-            if (ref.component->isError()) {
-                QmlError error;
-                error.setUrl(output->url);
-                error.setDescription(QLatin1String("Unable to create type ") +
-                                     parserRef->name);
-                if (!parserRef->refObjects.isEmpty()) {
-                    QmlParser::Object *parserObject = parserRef->refObjects.first();
-                    error.setLine(parserObject->location.start.line);
-                    error.setColumn(parserObject->location.start.column);
-                }
-
-                exceptions << error;
-                exceptions << ref.component->errors();
-                reset(out);
-                return false;
-            }
-            ref.ref = tref.unit;
-            ref.ref->addref();
-        }
-        ref.className = parserRef->name.toUtf8();
-        out->types << ref;
-    }
-
-    Object *root = unit->data.tree();
-    Q_ASSERT(root);
-
-    this->engine = engine;
-    this->unit = unit;
-    this->unitRoot = root;
-    compileTree(root);
-
-    if (!isError()) {
-        if (compilerDump())
-            out->dumpInstructions();
-        if (compilerStatDump())
-            dumpStats();
-    } else {
-        reset(out);
-    }
-
-    compileState = ComponentCompileState();
-    savedCompileStates.clear();
-    output = 0;
-    this->engine = 0;
-    this->unit = 0;
-    this->unitRoot = 0;
-
-    return !isError();
-}
-
-void QmlCompiler::compileTree(Object *tree)
-{
-    compileState.root = tree;
-
-    if (!buildObject(tree, BindingContext()) || !completeComponentBuild())
-        return;
-
-    QmlInstruction init;
-    init.type = QmlInstruction::Init;
-    init.line = 0;
-    init.init.bindingsSize = compileState.bindings.count();
-    init.init.parserStatusSize = compileState.parserStatusCount;
-    init.init.contextCache = genContextCache();
-    if (compileState.compiledBindingData.isEmpty())
-        init.init.compiledBinding = -1;
-    else
-        init.init.compiledBinding = output->indexForByteArray(compileState.compiledBindingData);
-    output->bytecode << init;
-
-    genObject(tree);
-
-    QmlInstruction def;
-    init.line = 0;
-    def.type = QmlInstruction::SetDefault;
-    output->bytecode << def;
-
-    output->imports = unit->imports;
-    output->importCache = output->imports.cache(engine);
-
-    Q_ASSERT(tree->metatype);
-
-    if (tree->metadata.isEmpty()) {
-        output->root = tree->metatype;
-    } else {
-        static_cast<QMetaObject &>(output->rootData) = *tree->metaObject();
-        output->root = &output->rootData;
-    }
-    if (!tree->metadata.isEmpty()) 
-        QmlEnginePrivate::get(engine)->registerCompositeType(output);
-}
-
-static bool ValuePtrLessThan(const Value *t1, const Value *t2) 
-{
-    return t1->location.start.line < t2->location.start.line ||
-           (t1->location.start.line == t2->location.start.line &&
-            t1->location.start.column < t2->location.start.column);
-}
-
-bool QmlCompiler::buildObject(Object *obj, const BindingContext &ctxt)
-{
-    componentStat.objects++;
-
-    Q_ASSERT (obj->type != -1);
-    const QmlCompiledData::TypeReference &tr =
-        output->types.at(obj->type);
-    obj->metatype = tr.metaObject();
-
-    if (tr.component)
-        obj->url = tr.component->url();
-    if (tr.type)
-        obj->typeName = tr.type->qmlTypeName();
-    obj->className = tr.className;
-
-    // This object is a "Component" element
-    if (tr.type && obj->metatype == &QmlComponent::staticMetaObject) {
-        COMPILE_CHECK(buildComponent(obj, ctxt));
-        return true;
-    } 
-
-    // Build any script blocks for this type
-    for (int ii = 0; ii < obj->scriptBlockObjects.count(); ++ii)
-        COMPILE_CHECK(buildScript(obj, obj->scriptBlockObjects.at(ii)));
-
-    // Object instantiations reset the binding context
-    BindingContext objCtxt(obj);
-
-    // Create the synthesized meta object, ignoring aliases
-    COMPILE_CHECK(mergeDynamicMetaProperties(obj));
-    COMPILE_CHECK(buildDynamicMeta(obj, IgnoreAliases));
-
-    // Find the native type and check for the QmlParserStatus interface
-    QmlType *type = toQmlType(obj);
-    Q_ASSERT(type);
-    obj->parserStatusCast = type->parserStatusCast();
-    if (obj->parserStatusCast != -1)
-        compileState.parserStatusCount++;
-
-    // Check if this is a custom parser type.  Custom parser types allow
-    // assignments to non-existent properties.  These assignments are then
-    // compiled by the type.
-    bool isCustomParser = output->types.at(obj->type).type &&
-                          output->types.at(obj->type).type->customParser() != 0;
-    QList<QmlCustomParserProperty> customProps;
-
-    // Fetch the list of deferred properties
-    QStringList deferredList = deferredProperties(obj);
-
-    // Must do id property first.  This is to ensure that the id given to any
-    // id reference created matches the order in which the objects are
-    // instantiated
-    foreach(Property *prop, obj->properties) {
-        if (prop->name == "id") {
-            COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
-            break;
-        }
-    }
-
-    // Merge 
-    Property *defaultProperty = 0;
-    Property *skipProperty = 0;
-    if (obj->defaultProperty) {
-        const QMetaObject *metaObject = obj->metaObject();
-        Q_ASSERT(metaObject);
-        QMetaProperty p = QmlMetaType::defaultProperty(metaObject);
-        if (p.name()) {
-            Property *explicitProperty = obj->getProperty(p.name(), false);
-            if (explicitProperty && !explicitProperty->value) {
-                skipProperty = explicitProperty;
-
-                defaultProperty = new Property;
-                defaultProperty->parent = obj;
-                defaultProperty->isDefault = true;
-                defaultProperty->location = obj->defaultProperty->location;
-                defaultProperty->listValueRange = obj->defaultProperty->listValueRange;
-                defaultProperty->listCommaPositions = obj->defaultProperty->listCommaPositions;
-
-                defaultProperty->values  = obj->defaultProperty->values;
-                defaultProperty->values += explicitProperty->values;
-                foreach(Value *value, defaultProperty->values)
-                    value->addref();
-                qSort(defaultProperty->values.begin(), defaultProperty->values.end(), ValuePtrLessThan);
-
-            } else {
-                defaultProperty = obj->defaultProperty;
-                defaultProperty->addref();
-            }
-        } else {
-            defaultProperty = obj->defaultProperty;
-            defaultProperty->addref();
-        }
-    }
-
-    // Build all explicit properties specified
-    foreach(Property *prop, obj->properties) {
-
-        if (prop == skipProperty)
-            continue;
-        if (prop->name == "id")
-            continue;
-
-        bool canDefer = false;
-        if (isCustomParser) {
-            if (doesPropertyExist(prop, obj)) {
-                int ids = compileState.ids.count();
-                COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
-                canDefer = ids == compileState.ids.count();
-            } else {
-                customProps << QmlCustomParserNodePrivate::fromProperty(prop);
-            }
-        } else {
-            if (isSignalPropertyName(prop->name)) {
-                COMPILE_CHECK(buildSignal(prop,obj,objCtxt));
-            } else {
-                int ids = compileState.ids.count();
-                COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
-                canDefer = ids == compileState.ids.count();
-            }
-        }
-
-        if (canDefer && !deferredList.isEmpty() &&
-            deferredList.contains(QString::fromUtf8(prop->name)))
-            prop->isDeferred = true;
-
-    }
-
-    // Build the default property
-    if (defaultProperty)  {
-        Property *prop = defaultProperty;
-
-        bool canDefer = false;
-        if (isCustomParser) {
-            if (doesPropertyExist(prop, obj)) {
-                int ids = compileState.ids.count();
-                COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
-                canDefer = ids == compileState.ids.count();
-            } else {
-                customProps << QmlCustomParserNodePrivate::fromProperty(prop);
-            }
-        } else {
-            int ids = compileState.ids.count();
-            COMPILE_CHECK(buildProperty(prop, obj, objCtxt));
-            canDefer = ids == compileState.ids.count();
-        }
-
-        if (canDefer && !deferredList.isEmpty() &&
-            deferredList.contains(QString::fromUtf8(prop->name)))
-            prop->isDeferred = true;
-    }
-
-    if (defaultProperty) 
-        defaultProperty->release();
-
-    // Compile custom parser parts
-    if (isCustomParser && !customProps.isEmpty()) {
-        QmlCustomParser *cp = output->types.at(obj->type).type->customParser();
-        cp->clearErrors();
-        obj->custom = cp->compile(customProps);
-        foreach (QmlError err, cp->errors()) {
-            err.setUrl(output->url);
-            exceptions << err;
-        }
-    }
-
-    return true;
-}
-
-void QmlCompiler::genObject(QmlParser::Object *obj)
-{
-    const QmlCompiledData::TypeReference &tr =
-        output->types.at(obj->type);
-    if (tr.type && obj->metatype == &QmlComponent::staticMetaObject) {
-        genComponent(obj);
-        return;
-    }
-
-    // Create the object
-    QmlInstruction create;
-    create.type = QmlInstruction::CreateObject;
-    create.line = obj->location.start.line;
-    create.create.column = obj->location.start.column;
-    create.create.data = -1;
-    if (!obj->custom.isEmpty())
-        create.create.data = output->indexForByteArray(obj->custom);
-    create.create.type = obj->type;
-    if (!output->types.at(create.create.type).type && 
-        !obj->bindingBitmask.isEmpty()) {
-        Q_ASSERT(obj->bindingBitmask.size() % 4 == 0);
-        create.create.bindingBits = 
-            output->indexForByteArray(obj->bindingBitmask);
-    } else {
-        create.create.bindingBits = -1;
-    }
-    output->bytecode << create;
-
-    // Setup the synthesized meta object if necessary
-    if (!obj->metadata.isEmpty()) {
-        QmlInstruction meta;
-        meta.type = QmlInstruction::StoreMetaObject;
-        meta.line = 0;
-        meta.storeMeta.data = output->indexForByteArray(obj->metadata);
-        meta.storeMeta.aliasData = output->indexForByteArray(obj->synthdata);
-        meta.storeMeta.propertyCache = output->propertyCaches.count();
-        // ### Surely the creation of this property cache could be more efficient
-        QmlPropertyCache *propertyCache = 0;
-        if (tr.component && QmlComponentPrivate::get(tr.component)->cc->rootPropertyCache) {
-            propertyCache = QmlComponentPrivate::get(tr.component)->cc->rootPropertyCache->copy();
-        } else {
-            propertyCache = QmlPropertyCache::create(engine, obj->metaObject()->superClass());
-        }
-        propertyCache->append(engine, obj->metaObject(), QmlPropertyCache::Data::NoFlags,
-                              QmlPropertyCache::Data::IsVMEFunction);
-        if (obj == unitRoot) {
-            propertyCache->addref();
-            output->rootPropertyCache = propertyCache;
-        }
-        output->propertyCaches << propertyCache;
-        output->bytecode << meta;
-    }
-
-    // Set the object id
-    if (!obj->id.isEmpty()) {
-        QmlInstruction id;
-        id.type = QmlInstruction::SetId;
-        id.line = 0;
-        id.setId.value = output->indexForString(obj->id);
-        id.setId.index = obj->idIndex;
-        output->bytecode << id;
-    }
-
-    // Set any script blocks
-    for (int ii = 0; ii < obj->scripts.count(); ++ii) {
-        QmlInstruction script;
-        script.type = QmlInstruction::StoreScript;
-        script.line = 0; // ###
-        int idx = output->scripts.count();
-        output->scripts << obj->scripts.at(ii);
-        script.storeScript.value = idx;
-        output->bytecode << script;
-    }
-
-    // Begin the class
-    if (obj->parserStatusCast != -1) {
-        QmlInstruction begin;
-        begin.type = QmlInstruction::BeginObject;
-        begin.begin.castValue = obj->parserStatusCast;
-        begin.line = obj->location.start.line;
-        output->bytecode << begin;
-    }
-
-    genObjectBody(obj);
-}
-
-void QmlCompiler::genObjectBody(QmlParser::Object *obj)
-{
-    typedef QPair<Property *, int> PropPair;
-    foreach(const PropPair &prop, obj->scriptStringProperties) {
-        QmlInstruction ss;
-        ss.type = QmlInstruction::StoreScriptString;
-        ss.storeScriptString.propertyIndex = prop.first->index;
-        ss.storeScriptString.value = 
-            output->indexForString(prop.first->values.at(0)->value.asScript());
-        ss.storeScriptString.scope = prop.second;
-        output->bytecode << ss;
-    }
-
-    bool seenDefer = false;
-    foreach(Property *prop, obj->valueProperties) {
-        if (prop->isDeferred) {
-            seenDefer = true;
-            continue;
-        }
-        genValueProperty(prop, obj);
-    }
-    if (seenDefer) {
-        QmlInstruction defer;
-        defer.type = QmlInstruction::Defer;
-        defer.line = 0;
-        defer.defer.deferCount = 0;
-        int deferIdx = output->bytecode.count();
-        output->bytecode << defer;
-
-        QmlInstruction init;
-        init.type = QmlInstruction::Init;
-        init.init.bindingsSize = compileState.bindings.count(); // XXX - bigger than necessary
-        init.init.parserStatusSize = compileState.parserStatusCount; // XXX - bigger than necessary
-        init.init.contextCache = -1;
-        init.init.compiledBinding = -1;
-        output->bytecode << init;
-
-        foreach(Property *prop, obj->valueProperties) {
-            if (!prop->isDeferred)
-                continue;
-            genValueProperty(prop, obj);
-        }
-
-        output->bytecode[deferIdx].defer.deferCount =
-            output->bytecode.count() - deferIdx - 1;
-    }
-
-    foreach(Property *prop, obj->signalProperties) {
-
-        QmlParser::Value *v = prop->values.at(0);
-
-        if (v->type == Value::SignalObject) {
-
-            genObject(v->object);
-
-            QmlInstruction assign;
-            assign.type = QmlInstruction::AssignSignalObject;
-            assign.line = v->location.start.line;
-            assign.assignSignalObject.signal =
-                output->indexForByteArray(prop->name);
-            output->bytecode << assign;
-
-        } else if (v->type == Value::SignalExpression) {
-
-            QmlInstruction store;
-            store.type = QmlInstruction::StoreSignal;
-            store.line = v->location.start.line;
-            store.storeSignal.signalIndex = prop->index;
-            store.storeSignal.value =
-                output->indexForString(v->value.asScript().trimmed());
-            output->bytecode << store;
-
-        }
-
-    }
-
-    foreach(Property *prop, obj->attachedProperties) {
-        QmlInstruction fetch;
-        fetch.type = QmlInstruction::FetchAttached;
-        fetch.line = prop->location.start.line;
-        fetch.fetchAttached.id = prop->index;
-        output->bytecode << fetch;
-
-        genObjectBody(prop->value);
-
-        QmlInstruction pop;
-        pop.type = QmlInstruction::PopFetchedObject;
-        pop.line = prop->location.start.line;
-        output->bytecode << pop;
-    }
-
-    foreach(Property *prop, obj->groupedProperties) {
-        QmlInstruction fetch;
-        fetch.type = QmlInstruction::FetchObject;
-        fetch.fetch.property = prop->index;
-        fetch.line = prop->location.start.line;
-        output->bytecode << fetch;
-
-        genObjectBody(prop->value);
-
-        QmlInstruction pop;
-        pop.type = QmlInstruction::PopFetchedObject;
-        pop.line = prop->location.start.line;
-        output->bytecode << pop;
-    }
-
-    foreach(Property *prop, obj->valueTypeProperties) {
-        QmlInstruction fetch;
-        fetch.type = QmlInstruction::FetchValueType;
-        fetch.fetchValue.property = prop->index;
-        fetch.fetchValue.type = prop->type;
-        fetch.line = prop->location.start.line;
-
-        output->bytecode << fetch;
-
-        foreach(Property *vprop, prop->value->valueProperties) {
-            genPropertyAssignment(vprop, prop->value, prop);
-        }
-
-        QmlInstruction pop;
-        pop.type = QmlInstruction::PopValueType;
-        pop.fetchValue.property = prop->index;
-        pop.fetchValue.type = prop->type;
-        pop.line = prop->location.start.line;
-        output->bytecode << pop;
-    }
-}
-
-void QmlCompiler::genComponent(QmlParser::Object *obj)
-{
-    QmlParser::Object *root = obj->defaultProperty->values.at(0)->object;
-    Q_ASSERT(root);
-
-    QmlInstruction create;
-    create.type = QmlInstruction::CreateComponent;
-    create.line = root->location.start.line;
-    create.createComponent.column = root->location.start.column;
-    create.createComponent.endLine = root->location.end.line;
-    output->bytecode << create;
-    int count = output->bytecode.count();
-
-    ComponentCompileState oldCompileState = compileState;
-    compileState = componentState(root);
-
-    QmlInstruction init;
-    init.type = QmlInstruction::Init;
-    init.init.bindingsSize = compileState.bindings.count();
-    init.init.parserStatusSize = compileState.parserStatusCount;
-    init.init.contextCache = genContextCache();
-    if (compileState.compiledBindingData.isEmpty())
-        init.init.compiledBinding = -1;
-    else
-        init.init.compiledBinding = output->indexForByteArray(compileState.compiledBindingData);
-    init.line = obj->location.start.line;
-    output->bytecode << init;
-
-    genObject(root);
-
-    QmlInstruction def;
-    init.line = 0;
-    def.type = QmlInstruction::SetDefault;
-    output->bytecode << def;
-
-    output->bytecode[count - 1].createComponent.count =
-        output->bytecode.count() - count;
-
-    compileState = oldCompileState;
-
-    if (!obj->id.isEmpty()) {
-        QmlInstruction id;
-        id.type = QmlInstruction::SetId;
-        id.line = 0;
-        id.setId.value = output->indexForString(obj->id);
-        id.setId.index = obj->idIndex;
-        output->bytecode << id;
-    }
-}
-
-bool QmlCompiler::buildComponent(QmlParser::Object *obj,
-                                 const BindingContext &ctxt)
-{
-    // The special "Component" element can only have the id property and a
-    // default property, that actually defines the component's tree
-
-    // Find, check and set the "id" property (if any)
-    Property *idProp = 0;
-    if (obj->properties.count() > 1 ||
-       (obj->properties.count() == 1 && obj->properties.begin().key() != "id"))
-        COMPILE_EXCEPTION(*obj->properties.begin(), QCoreApplication::translate("QmlCompiler","Component elements may not contain properties other than id"));
-       
-    if (!obj->scriptBlockObjects.isEmpty())
-        COMPILE_EXCEPTION(obj->scriptBlockObjects.first(), QCoreApplication::translate("QmlCompiler","Component elements may not contain script blocks"));
-
-    if (obj->properties.count())
-        idProp = *obj->properties.begin();
-
-    if (idProp && (idProp->value || idProp->values.count() > 1 || !isValidId(idProp->values.first()->primitive())))
-        COMPILE_EXCEPTION(idProp, QCoreApplication::translate("QmlCompiler","Invalid component id specification"));
-
-    if (idProp) {
-        QString idVal = idProp->values.first()->primitive();
-
-        if (compileState.ids.contains(idVal))
-            COMPILE_EXCEPTION(idProp, QCoreApplication::translate("QmlCompiler","id is not unique"));
-
-        obj->id = idVal;
-        addId(idVal, obj);
-    }
-
-    // Check the Component tree is well formed
-    if (obj->defaultProperty &&
-       (obj->defaultProperty->value || obj->defaultProperty->values.count() > 1 ||
-        (obj->defaultProperty->values.count() == 1 && !obj->defaultProperty->values.first()->object)))
-        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QmlCompiler","Invalid component body specification"));
-
-    Object *root = 0;
-    if (obj->defaultProperty && obj->defaultProperty->values.count())
-        root = obj->defaultProperty->values.first()->object;
-
-    if (!root)
-        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QmlCompiler","Cannot create empty component specification"));
-
-    // Build the component tree
-    COMPILE_CHECK(buildComponentFromRoot(root, ctxt));
-
-    return true;
-}
-
-bool QmlCompiler::buildScript(QmlParser::Object *obj, QmlParser::Object *script)
-{
-    Object::ScriptBlock scriptBlock;
-
-    if (script->properties.count() == 1 && 
-        script->properties.begin().key() == QByteArray("source")) {
-
-        Property *source = *script->properties.begin();
-        if (script->defaultProperty)
-            COMPILE_EXCEPTION(source, QCoreApplication::translate("QmlCompiler","Invalid Script block.  Specify either the source property or inline script"));
-
-        if (source->value || source->values.count() != 1 ||
-            source->values.at(0)->object || !source->values.at(0)->value.isStringList())
-            COMPILE_EXCEPTION(source, QCoreApplication::translate("QmlCompiler","Invalid Script source value"));
-
-        QStringList sources = source->values.at(0)->value.asStringList();
-
-        for (int jj = 0; jj < sources.count(); ++jj) {
-            QString sourceUrl = output->url.resolved(QUrl(sources.at(jj))).toString();
-            QString scriptCode;
-            int lineNumber = 1;
-
-            for (int ii = 0; ii < unit->resources.count(); ++ii) {
-                if (unit->resources.at(ii)->url == sourceUrl) {
-                    scriptCode = QString::fromUtf8(unit->resources.at(ii)->data);
-                    break;
-                }
-            }
-
-            if (!scriptCode.isEmpty()) {
-                scriptBlock.codes.append(scriptCode);
-                scriptBlock.files.append(sourceUrl);
-                scriptBlock.lineNumbers.append(lineNumber);
-            }
-        }
-
-    } else if (!script->properties.isEmpty()) {
-        COMPILE_EXCEPTION(*script->properties.begin(), QCoreApplication::translate("QmlCompiler","Properties cannot be set on Script block"));
-    } else if (script->defaultProperty) {
-
-        QString scriptCode;
-        int lineNumber = 1;
-        QString sourceUrl = output->url.toString();
-
-        QmlParser::Location currentLocation;
-
-        for (int ii = 0; ii < script->defaultProperty->values.count(); ++ii) {
-            Value *v = script->defaultProperty->values.at(ii);
-            if (lineNumber == 1)
-                lineNumber = v->location.start.line;
-            if (v->object || !v->value.isString())
-                COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid Script block"));
-
-            if (ii == 0) {
-                currentLocation = v->location.start;
-                scriptCode.append(QString(currentLocation.column, QLatin1Char(' ')));
-            }
-
-            while (currentLocation.line < v->location.start.line) {
-                scriptCode.append(QLatin1Char('\n'));
-                currentLocation.line++;
-                currentLocation.column = 0;
-            }
-
-            scriptCode.append(QString(v->location.start.column - currentLocation.column, QLatin1Char(' ')));
-
-            scriptCode += v->value.asString();
-            currentLocation = v->location.end;
-            currentLocation.column++;
-        }
-
-        if (!scriptCode.isEmpty()) {
-            scriptBlock.codes.append(scriptCode);
-            scriptBlock.files.append(sourceUrl);
-            scriptBlock.lineNumbers.append(lineNumber);
-        }
-    }
-
-    if (!scriptBlock.codes.isEmpty())
-        obj->scripts << scriptBlock;
-
-    return true;
-}
-
-bool QmlCompiler::buildComponentFromRoot(QmlParser::Object *obj,
-                                         const BindingContext &ctxt)
-{
-    ComponentCompileState oldComponentCompileState = compileState;
-    ComponentStat oldComponentStat = componentStat;
-
-    compileState = ComponentCompileState();
-    compileState.root = obj;
-
-    componentStat = ComponentStat();
-    componentStat.lineNumber = obj->location.start.line;
-
-    if (obj)
-        COMPILE_CHECK(buildObject(obj, ctxt));
-
-    COMPILE_CHECK(completeComponentBuild());
-
-    compileState = oldComponentCompileState;
-    componentStat = oldComponentStat;
-
-    return true;
-}
-
-
-// Build a sub-object.  A sub-object is one that was not created directly by
-// QML - such as a grouped property object, or an attached object.  Sub-object's
-// can't have an id, involve a custom parser, have attached properties etc.
-bool QmlCompiler::buildSubObject(Object *obj, const BindingContext &ctxt)
-{
-    Q_ASSERT(obj->metatype);
-    Q_ASSERT(!obj->defaultProperty);
-    Q_ASSERT(ctxt.isSubContext()); // sub-objects must always be in a binding
-                                   // sub-context
-
-    foreach(Property *prop, obj->properties) {
-        if (isSignalPropertyName(prop->name)) {
-            COMPILE_CHECK(buildSignal(prop, obj, ctxt));
-        } else {
-            COMPILE_CHECK(buildProperty(prop, obj, ctxt));
-        }
-    }
-
-    return true;
-}
-
-int QmlCompiler::componentTypeRef()
-{
-    QmlType *t = QmlMetaType::qmlType("Qt/Component",4,6);
-    for (int ii = output->types.count() - 1; ii >= 0; --ii) {
-        if (output->types.at(ii).type == t)
-            return ii;
-    }
-    QmlCompiledData::TypeReference ref;
-    ref.className = "Component";
-    ref.type = t;
-    output->types << ref;
-    return output->types.count() - 1;
-}
-
-int QmlCompiler::findSignalByName(const QMetaObject *mo, const QByteArray &name)
-{
-    int methods = mo->methodCount();
-    for (int ii = methods - 1; ii >= 0; --ii) {
-        QMetaMethod method = mo->method(ii);
-        QByteArray methodName = method.signature();
-        int idx = methodName.indexOf('(');
-        methodName = methodName.left(idx);
-
-        if (methodName == name)
-            return ii;
-    }
-    return -1;
-}
-
-bool QmlCompiler::buildSignal(QmlParser::Property *prop, QmlParser::Object *obj,
-                              const BindingContext &ctxt)
-{
-    Q_ASSERT(obj->metaObject());
-    Q_ASSERT(!prop->isEmpty());
-
-    QByteArray name = prop->name;
-    Q_ASSERT(name.startsWith("on"));
-    name = name.mid(2);
-    if(name[0] >= 'A' && name[0] <= 'Z')
-        name[0] = name[0] - 'A' + 'a';
-
-    int sigIdx = findSignalByName(obj->metaObject(), name);
-
-    if (sigIdx == -1) {
-
-        // If the "on<Signal>" name doesn't resolve into a signal, try it as a
-        // property.
-        COMPILE_CHECK(buildProperty(prop, obj, ctxt));
-
-    }  else {
-
-        if (prop->value || prop->values.count() > 1)
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Incorrectly specified signal"));
-
-        prop->index = sigIdx;
-        obj->addSignalProperty(prop);
-
-        if (prop->values.at(0)->object) {
-            COMPILE_CHECK(buildObject(prop->values.at(0)->object, ctxt));
-            prop->values.at(0)->type = Value::SignalObject;
-        } else {
-            prop->values.at(0)->type = Value::SignalExpression;
-
-            QString script = prop->values.at(0)->value.asScript().trimmed();
-            if (script.isEmpty())
-                COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Empty signal assignment"));
-        }
-    }
-
-    return true;
-}
-
-
-/*!
-    Returns true if (value) property \a prop exists on obj, false otherwise.
-*/
-bool QmlCompiler::doesPropertyExist(QmlParser::Property *prop,
-                                    QmlParser::Object *obj)
-{
-    if(isAttachedPropertyName(prop->name) || prop->name == "id")
-        return true;
-
-    const QMetaObject *mo = obj->metaObject();
-    if (mo) {
-        if (prop->isDefault) {
-            QMetaProperty p = QmlMetaType::defaultProperty(mo);
-            return p.name() != 0;
-        } else {
-            int idx = mo->indexOfProperty(prop->name.constData());
-            return idx != -1;
-        }
-    }
-
-    return false;
-}
-
-bool QmlCompiler::buildProperty(QmlParser::Property *prop,
-                                QmlParser::Object *obj,
-                                const BindingContext &ctxt)
-{
-    if (prop->isEmpty())
-        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Empty property assignment"));
-
-    const QMetaObject *metaObject = obj->metaObject();
-    Q_ASSERT(metaObject);
-
-    if (isAttachedPropertyName(prop->name)) {
-        // Setup attached property data
-
-        if (ctxt.isSubContext()) {
-            // Attached properties cannot be used on sub-objects.  Sub-objects
-            // always exist in a binding sub-context, which is what we test
-            // for here.
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Attached properties cannot be used here"));
-        }
-
-        QmlType *type = 0;
-        QmlEnginePrivate::ImportedNamespace *typeNamespace = 0;
-        QmlEnginePrivate::get(engine)->resolveType(unit->imports, prop->name, 
-                                                   &type, 0, 0, 0, &typeNamespace);
-
-        if (typeNamespace) {
-            // ### We might need to indicate that this property is a namespace 
-            // for the DOM API
-            COMPILE_CHECK(buildPropertyInNamespace(typeNamespace, prop, obj, 
-                                                   ctxt));
-            return true;
-        } else if (!type || !type->attachedPropertiesType())  {
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Non-existent attached object"));
-        }
-
-        if (!prop->value)
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Invalid attached object assignment"));
-
-        Q_ASSERT(type->attachedPropertiesFunction());
-        prop->index = type->index();
-        prop->value->metatype = type->attachedPropertiesType();
-    } else {
-        // Setup regular property data
-        QMetaProperty p;
-
-        if (prop->isDefault) {
-            p = QmlMetaType::defaultProperty(metaObject);
-
-            if (p.name()) {
-                prop->index = p.propertyIndex();
-                prop->name = p.name();
-            }
-
-        } else {
-            prop->index = metaObject->indexOfProperty(prop->name.constData());
-
-            if (prop->index != -1) {
-                p = metaObject->property(prop->index);
-                Q_ASSERT(p.name());
-            }
-        }
-
-        // We can't error here as the "id" property does not require a
-        // successful index resolution
-        if (p.name()) {
-            prop->type = p.userType();
-        }
-    }
-
-    if (prop->index != -1) 
-        prop->parent->setBindingBit(prop->index);
-
-    if (!prop->isDefault && prop->name == "id" && !ctxt.isSubContext()) {
-
-        // The magic "id" behavior doesn't apply when "id" is resolved as a
-        // default property or to sub-objects (which are always in binding
-        // sub-contexts)
-        COMPILE_CHECK(buildIdProperty(prop, obj));
-        if (prop->type == QVariant::String &&
-            prop->values.at(0)->value.isString())
-            COMPILE_CHECK(buildPropertyAssignment(prop, obj, ctxt));
-
-    } else if (isAttachedPropertyName(prop->name)) {
-
-        COMPILE_CHECK(buildAttachedProperty(prop, obj, ctxt));
-
-    } else if (prop->index == -1) {
-
-        if (prop->isDefault) {
-            COMPILE_EXCEPTION(prop->values.first(), QCoreApplication::translate("QmlCompiler","Cannot assign to non-existent default property"));
-        } else {
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(prop->name)));
-        }
-
-    } else if (prop->value) {
-
-        COMPILE_CHECK(buildGroupedProperty(prop, obj, ctxt));
-
-    } else if (QmlEnginePrivate::get(engine)->isList(prop->type)) {
-
-        COMPILE_CHECK(buildListProperty(prop, obj, ctxt));
-
-    } else if (prop->type == qMetaTypeId<QmlScriptString>()) {
-
-        COMPILE_CHECK(buildScriptStringProperty(prop, obj, ctxt));
-
-    } else {
-
-        COMPILE_CHECK(buildPropertyAssignment(prop, obj, ctxt));
-
-    }
-
-    return true;
-}
-
-bool 
-QmlCompiler::buildPropertyInNamespace(QmlEnginePrivate::ImportedNamespace *ns,
-                                      QmlParser::Property *nsProp, 
-                                      QmlParser::Object *obj, 
-                                      const BindingContext &ctxt)
-{
-    if (!nsProp->value)
-        COMPILE_EXCEPTION(nsProp, QCoreApplication::translate("QmlCompiler","Invalid use of namespace"));
-
-    foreach (Property *prop, nsProp->value->properties) {
-
-        if (!isAttachedPropertyName(prop->name))
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Not an attached property name"));
-
-        // Setup attached property data
-
-        QmlType *type = 0;
-        QmlEnginePrivate::get(engine)->resolveTypeInNamespace(ns, prop->name,
-                                                              &type, 0, 0, 0);
-
-        if (!type || !type->attachedPropertiesType()) 
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Non-existent attached object"));
-
-        if (!prop->value)
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Invalid attached object assignment"));
-
-        Q_ASSERT(type->attachedPropertiesFunction());
-        prop->index = type->index();
-        prop->value->metatype = type->attachedPropertiesType();
-
-        COMPILE_CHECK(buildAttachedProperty(prop, obj, ctxt));
-    }
-
-    return true;
-}
-
-void QmlCompiler::genValueProperty(QmlParser::Property *prop,
-                                   QmlParser::Object *obj)
-{
-    if (QmlEnginePrivate::get(engine)->isList(prop->type)) {
-        genListProperty(prop, obj);
-    } else {
-        genPropertyAssignment(prop, obj);
-    }
-}
-
-void QmlCompiler::genListProperty(QmlParser::Property *prop,
-                                  QmlParser::Object *obj)
-{
-    int listType = QmlEnginePrivate::get(engine)->listType(prop->type);
-
-    QmlInstruction fetch;
-    fetch.type = QmlInstruction::FetchQList;
-    fetch.line = prop->location.start.line;
-    fetch.fetchQmlList.property = prop->index;
-    bool listTypeIsInterface = QmlMetaType::isInterface(listType);
-    fetch.fetchQmlList.type = listType;
-    output->bytecode << fetch;
-
-    for (int ii = 0; ii < prop->values.count(); ++ii) {
-        Value *v = prop->values.at(ii);
-
-        if (v->type == Value::CreatedObject) {
-
-            genObject(v->object);
-            if (listTypeIsInterface) {
-                QmlInstruction assign;
-                assign.type = QmlInstruction::AssignObjectList;
-                assign.line = prop->location.start.line;
-                output->bytecode << assign;
-            } else {
-                QmlInstruction store;
-                store.type = QmlInstruction::StoreObjectQList;
-                store.line = prop->location.start.line;
-                output->bytecode << store;
-            }
-
-        } else if (v->type == Value::PropertyBinding) {
-
-            genBindingAssignment(v, prop, obj);
-
-        }
-
-    }
-
-    QmlInstruction pop;
-    pop.type = QmlInstruction::PopQList;
-    pop.line = prop->location.start.line;
-    output->bytecode << pop;
-}
-
-void QmlCompiler::genPropertyAssignment(QmlParser::Property *prop,
-                                        QmlParser::Object *obj,
-                                        QmlParser::Property *valueTypeProperty)
-{
-    for (int ii = 0; ii < prop->values.count(); ++ii) {
-        QmlParser::Value *v = prop->values.at(ii);
-
-        if (v->type == Value::CreatedObject) {
-
-            genObject(v->object);
-
-            if (QmlMetaType::isInterface(prop->type)) {
-
-                QmlInstruction store;
-                store.type = QmlInstruction::StoreInterface;
-                store.line = v->object->location.start.line;
-                store.storeObject.propertyIndex = prop->index;
-                output->bytecode << store;
-
-            } else if (prop->type == -1) {
-
-                QmlInstruction store;
-                store.type = QmlInstruction::StoreVariantObject;
-                store.line = v->object->location.start.line;
-                store.storeObject.propertyIndex = prop->index;
-                output->bytecode << store;
-
-            } else {
-
-                QmlInstruction store;
-                store.type = QmlInstruction::StoreObject;
-                store.line = v->object->location.start.line;
-                store.storeObject.propertyIndex = prop->index;
-                output->bytecode << store;
-
-            }
-        } else if (v->type == Value::ValueSource) {
-            genObject(v->object);
-
-            QmlInstruction store;
-            store.type = QmlInstruction::StoreValueSource;
-            store.line = v->object->location.start.line;
-            if (valueTypeProperty) {
-                store.assignValueSource.property = genValueTypeData(prop, valueTypeProperty);
-                store.assignValueSource.owner = 1;
-            } else {
-                store.assignValueSource.property = genPropertyData(prop);
-                store.assignValueSource.owner = 0;
-            }
-            QmlType *valueType = toQmlType(v->object);
-            store.assignValueSource.castValue = valueType->propertyValueSourceCast();
-            output->bytecode << store;
-
-        } else if (v->type == Value::ValueInterceptor) {
-            genObject(v->object);
-
-            QmlInstruction store;
-            store.type = QmlInstruction::StoreValueInterceptor;
-            store.line = v->object->location.start.line;
-            if (valueTypeProperty) {
-                store.assignValueInterceptor.property = genValueTypeData(prop, valueTypeProperty);
-                store.assignValueInterceptor.owner = 1;
-            } else {
-                store.assignValueInterceptor.property = genPropertyData(prop);
-                store.assignValueInterceptor.owner = 0;
-            }
-            QmlType *valueType = toQmlType(v->object);
-            store.assignValueInterceptor.castValue = valueType->propertyValueInterceptorCast();
-            output->bytecode << store;
-
-        } else if (v->type == Value::PropertyBinding) {
-
-            genBindingAssignment(v, prop, obj, valueTypeProperty);
-
-        } else if (v->type == Value::Literal) {
-
-            QMetaProperty mp = obj->metaObject()->property(prop->index);
-            genLiteralAssignment(mp, v);
-
-        }
-
-    }
-}
-
-bool QmlCompiler::buildIdProperty(QmlParser::Property *prop,
-                                  QmlParser::Object *obj)
-{
-    if (prop->value ||
-        prop->values.count() > 1 ||
-        prop->values.at(0)->object)
-        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Invalid use of id property"));
-
-    QmlParser::Value *idValue = prop->values.at(0);
-    QString val = idValue->primitive();
-
-    if (!isValidId(val))
-        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","\"%1\" is not a valid object id").arg(val));
-
-    // We disallow id's that conflict with import prefixes and types
-    QmlEnginePrivate::ImportedNamespace *ns = 0;
-    QmlType *type = 0;
-    QmlEnginePrivate::get(engine)->resolveType(unit->imports, val.toUtf8(), 
-                                               &type, 0, 0, 0, &ns);
-    if (type)
-        COMPILE_EXCEPTION(idValue, QCoreApplication::translate("QmlCompiler","id conflicts with type name"));
-    if (ns)
-        COMPILE_EXCEPTION(idValue, QCoreApplication::translate("QmlCompiler","id conflicts with namespace prefix"));
-
-    if (compileState.ids.contains(val))
-        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","id is not unique"));
-
-    prop->values.at(0)->type = Value::Id;
-
-    obj->id = val;
-    addId(val, obj);
-
-    return true;
-}
-
-void QmlCompiler::addId(const QString &id, QmlParser::Object *obj)
-{
-    Q_ASSERT(!compileState.ids.contains(id));
-    Q_ASSERT(obj->id == id);
-    obj->idIndex = compileState.ids.count();
-    compileState.ids.insert(id, obj);
-    compileState.idIndexes.insert(obj->idIndex, obj);
-}
-
-void QmlCompiler::addBindingReference(const BindingReference &ref)
-{
-    Q_ASSERT(ref.value && !compileState.bindings.contains(ref.value));
-    compileState.bindings.insert(ref.value, ref);
-}
-
-void QmlCompiler::saveComponentState()
-{
-    Q_ASSERT(compileState.root);
-    Q_ASSERT(!savedCompileStates.contains(compileState.root));
-
-    savedCompileStates.insert(compileState.root, compileState);
-    savedComponentStats.append(componentStat);
-}
-
-QmlCompiler::ComponentCompileState
-QmlCompiler::componentState(QmlParser::Object *obj)
-{
-    Q_ASSERT(savedCompileStates.contains(obj));
-    return savedCompileStates.value(obj);
-}
-
-// Build attached property object.  In this example,
-// Text {
-//    GridView.row: 10
-// }
-// GridView is an attached property object.
-bool QmlCompiler::buildAttachedProperty(QmlParser::Property *prop,
-                                        QmlParser::Object *obj,
-                                        const BindingContext &ctxt)
-{
-    Q_ASSERT(prop->value);
-    Q_ASSERT(prop->index != -1); // This is set in buildProperty()
-
-    obj->addAttachedProperty(prop);
-
-    COMPILE_CHECK(buildSubObject(prop->value, ctxt.incr()));
-
-    return true;
-}
-
-
-// Build "grouped" properties. In this example:
-// Text {
-//     font.pointSize: 12
-//     font.family: "Helvetica"
-// }
-// font is a nested property.  pointSize and family are not.
-bool QmlCompiler::buildGroupedProperty(QmlParser::Property *prop,
-                                       QmlParser::Object *obj,
-                                       const BindingContext &ctxt)
-{
-    Q_ASSERT(prop->type != 0);
-    Q_ASSERT(prop->index != -1);
-
-    if (prop->values.count())
-        COMPILE_EXCEPTION(prop->values.first(), QCoreApplication::translate("QmlCompiler", "Invalid value in grouped property"));
-
-    if (prop->type < (int)QVariant::UserType) {
-        QmlEnginePrivate *ep =
-            static_cast<QmlEnginePrivate *>(QObjectPrivate::get(engine));
-        if (prop->type >= 0 /* QVariant == -1 */ && ep->valueTypes[prop->type]) {
-            COMPILE_CHECK(buildValueTypeProperty(ep->valueTypes[prop->type],
-                                                 prop->value, obj, ctxt.incr()));
-            obj->addValueTypeProperty(prop);
-        } else {
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Invalid grouped property access"));
-        }
-
-    } else {
-        // Load the nested property's meta type
-        prop->value->metatype = 
-            QmlEnginePrivate::get(engine)->metaObjectForType(prop->type);
-        if (!prop->value->metatype)
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Invalid grouped property access"));
-
-        obj->addGroupedProperty(prop);
-
-        COMPILE_CHECK(buildSubObject(prop->value, ctxt.incr()));
-    }
-
-    return true;
-}
-
-bool QmlCompiler::buildValueTypeProperty(QObject *type,
-                                         QmlParser::Object *obj,
-                                         QmlParser::Object *baseObj,
-                                         const BindingContext &ctxt)
-{
-    if (obj->defaultProperty)
-        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QmlCompiler","Invalid property use"));
-    obj->metatype = type->metaObject();
-
-    foreach (Property *prop, obj->properties) {
-        int idx = type->metaObject()->indexOfProperty(prop->name.constData());
-        if (idx == -1)
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(prop->name)));
-        QMetaProperty p = type->metaObject()->property(idx);
-        prop->index = idx;
-        prop->type = p.userType();
-
-        if (prop->value)
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Property assignment expected"));
-
-        if (prop->values.count() != 1)
-            COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Single property assignment expected"));
-
-        Value *value = prop->values.at(0);
-
-        if (value->object) {
-            bool isPropertyValue = output->types.at(value->object->type).type->propertyValueSourceCast() != -1;
-            bool isPropertyInterceptor = output->types.at(value->object->type).type->propertyValueInterceptorCast() != -1;
-            if (!isPropertyValue && !isPropertyInterceptor) {
-                COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Unexpected object assignment"));
-            } else {
-                COMPILE_CHECK(buildObject(value->object, ctxt));
-
-                if (isPropertyInterceptor && baseObj->synthdata.isEmpty())
-                    buildDynamicMeta(baseObj, ForceCreation);
-                value->type = isPropertyValue ? Value::ValueSource : Value::ValueInterceptor;
-            }
-        } else if (value->value.isScript()) {
-            // ### Check for writability
-            BindingReference reference;
-            reference.expression = value->value;
-            reference.property = prop;
-            reference.value = value;
-            reference.bindingContext = ctxt;
-            reference.bindingContext.owner++;
-            addBindingReference(reference);
-            value->type = Value::PropertyBinding;
-        } else  {
-            COMPILE_CHECK(testLiteralAssignment(p, value));
-            value->type = Value::Literal;
-        }
-        obj->addValueProperty(prop);
-    }
-
-    return true;
-}
-
-// Build assignments to QML lists.  QML lists are properties of type
-// QList<T *> * and QmlList<T *> *.
-//
-// QList<T *> * types can accept a list of objects, or a single binding
-// QmlList<T *> * types can accept a list of objects
-bool QmlCompiler::buildListProperty(QmlParser::Property *prop,
-                                    QmlParser::Object *obj,
-                                    const BindingContext &ctxt)
-{
-    Q_ASSERT(QmlEnginePrivate::get(engine)->isList(prop->type));
-
-    int t = prop->type;
-
-    obj->addValueProperty(prop);
-
-    int listType = QmlEnginePrivate::get(engine)->listType(t);
-    bool listTypeIsInterface = QmlMetaType::isInterface(listType);
-
-    bool assignedBinding = false;
-    for (int ii = 0; ii < prop->values.count(); ++ii) {
-        Value *v = prop->values.at(ii);
-        if (v->object) {
-            v->type = Value::CreatedObject;
-            COMPILE_CHECK(buildObject(v->object, ctxt));
-
-            // We check object coercian here.  We check interface assignment
-            // at runtime.
-            if (!listTypeIsInterface) {
-                if (!canCoerce(listType, v->object)) {
-                    COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Cannot assign object to list"));
-                }
-            }
-
-        } else if (v->value.isScript()) {
-            if (assignedBinding)
-                COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Can only assign one binding to lists"));
-
-            assignedBinding = true;
-            COMPILE_CHECK(buildBinding(v, prop, ctxt));
-            v->type = Value::PropertyBinding;
-        } else {
-            COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Cannot assign primitives to lists"));
-        }
-    }
-
-    return true;
-}
-
-// Compiles an assignment to a QmlScriptString property
-bool QmlCompiler::buildScriptStringProperty(QmlParser::Property *prop,
-                                            QmlParser::Object *obj,
-                                            const BindingContext &ctxt)
-{
-    if (prop->values.count() > 1) 
-        COMPILE_EXCEPTION(prop->values.at(1), QCoreApplication::translate("QmlCompiler", "Cannot assign multiple values to a script property"));
-
-    if (prop->values.at(0)->object || !prop->values.at(0)->value.isScript())
-        COMPILE_EXCEPTION(prop->values.at(0), QCoreApplication::translate("QmlCompiler", "Invalid property assignment: script expected"));
-
-    obj->addScriptStringProperty(prop, ctxt.stack);
-
-    return true;
-}
-
-// Compile regular property assignments of the form "property: <value>"
-//
-// ### The following problems exist
-//
-// There is no distinction between how "lists" of values are specified.  This
-//    Item {
-//        children: Item {}
-//        children: Item {}
-//    }
-// is identical to
-//    Item {
-//        children: [ Item {}, Item {} ]
-//    }
-//
-// We allow assignming multiple values to single value properties
-bool QmlCompiler::buildPropertyAssignment(QmlParser::Property *prop,
-                                          QmlParser::Object *obj,
-                                          const BindingContext &ctxt)
-{
-    obj->addValueProperty(prop);
-
-    for (int ii = 0; ii < prop->values.count(); ++ii) {
-        Value *v = prop->values.at(ii);
-        if (v->object) {
-
-            COMPILE_CHECK(buildPropertyObjectAssignment(prop, obj, v, ctxt));
-
-        } else {
-
-            COMPILE_CHECK(buildPropertyLiteralAssignment(prop, obj, v, ctxt));
-
-        }
-    }
-
-    return true;
-}
-
-// Compile assigning a single object instance to a regular property
-bool QmlCompiler::buildPropertyObjectAssignment(QmlParser::Property *prop,
-                                                QmlParser::Object *obj,
-                                                QmlParser::Value *v,
-                                                const BindingContext &ctxt)
-{
-    Q_ASSERT(prop->index != -1);
-    Q_ASSERT(v->object->type != -1);
-
-    if (!obj->metaObject()->property(prop->index).isWritable())
-        COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop->name)));
-
-    if (QmlMetaType::isInterface(prop->type)) {
-
-        // Assigning an object to an interface ptr property
-        COMPILE_CHECK(buildObject(v->object, ctxt));
-
-        v->type = Value::CreatedObject;
-
-    } else if (prop->type == -1) {
-
-        // Assigning an object to a QVariant
-        COMPILE_CHECK(buildObject(v->object, ctxt));
-
-        v->type = Value::CreatedObject;
-    } else {
-        // Normally buildObject() will set this up, but we need the static
-        // meta object earlier to test for assignability.  It doesn't matter
-        // that there may still be outstanding synthesized meta object changes
-        // on this type, as they are not relevant for assignability testing
-        v->object->metatype = output->types.at(v->object->type).metaObject();
-        Q_ASSERT(v->object->metaObject());
-
-        // Will be true if the assigned type inherits QmlPropertyValueSource
-        bool isPropertyValue = false;
-        // Will be true if the assigned type inherits QmlPropertyValueInterceptor
-        bool isPropertyInterceptor = false;
-        if (QmlType *valueType = toQmlType(v->object)) {
-            isPropertyValue = valueType->propertyValueSourceCast() != -1;
-            isPropertyInterceptor = valueType->propertyValueInterceptorCast() != -1;
-        }
-
-        // We want to raw metaObject here as the raw metaobject is the
-        // actual property type before we applied any extensions that might
-        // effect the properties on the type, but don't effect assignability
-        const QMetaObject *propertyMetaObject =
-            QmlEnginePrivate::get(engine)->rawMetaObjectForType(prop->type);
-
-        // Will be true if the assgned type inherits propertyMetaObject
-        bool isAssignable = false;
-        // Determine isAssignable value
-        if (propertyMetaObject) {
-            const QMetaObject *c = v->object->metatype;
-            while(c) {
-                isAssignable |= (QmlMetaPropertyPrivate::equal(c, propertyMetaObject));
-                c = c->superClass();
-            }
-        }
-
-        if (isAssignable) {
-            // Simple assignment
-            COMPILE_CHECK(buildObject(v->object, ctxt));
-
-            v->type = Value::CreatedObject;
-        } else if (propertyMetaObject == &QmlComponent::staticMetaObject) {
-            // Automatic "Component" insertion
-            QmlParser::Object *root = v->object;
-            QmlParser::Object *component = new QmlParser::Object;
-            component->type = componentTypeRef();
-            component->typeName = "Qt/Component";
-            component->metatype = &QmlComponent::staticMetaObject;
-            component->location = root->location;
-            QmlParser::Value *componentValue = new QmlParser::Value;
-            componentValue->object = root;
-            component->getDefaultProperty()->addValue(componentValue);
-            v->object = component;
-            COMPILE_CHECK(buildPropertyObjectAssignment(prop, obj, v, ctxt));
-        } else if (isPropertyValue || isPropertyInterceptor) {
-            // Assign as a property value source
-            COMPILE_CHECK(buildObject(v->object, ctxt));
-
-            if (isPropertyInterceptor && prop->parent->synthdata.isEmpty())
-                   buildDynamicMeta(prop->parent, ForceCreation);
-            v->type = isPropertyValue ? Value::ValueSource : Value::ValueInterceptor;
-        } else {
-            COMPILE_EXCEPTION(v->object, QCoreApplication::translate("QmlCompiler","Cannot assign object to property"));
-        }
-    }
-
-    return true;
-}
-
-// Compile assigning a literal or binding to a regular property
-bool QmlCompiler::buildPropertyLiteralAssignment(QmlParser::Property *prop,
-                                                 QmlParser::Object *obj,
-                                                 QmlParser::Value *v,
-                                                 const BindingContext &ctxt)
-{
-    Q_ASSERT(prop->index != -1);
-
-    if (v->value.isScript()) {
-
-        //optimization for <Type>.<EnumValue> enum assignments
-        bool isEnumAssignment = false;
-        COMPILE_CHECK(testQualifiedEnumAssignment(obj->metaObject()->property(prop->index), obj, v, &isEnumAssignment));
-        if (isEnumAssignment) {
-            v->type = Value::Literal;
-            return true;
-        }
-
-        COMPILE_CHECK(buildBinding(v, prop, ctxt));
-
-        v->type = Value::PropertyBinding;
-
-    } else {
-
-        COMPILE_CHECK(testLiteralAssignment(obj->metaObject()->property(prop->index), v));
-
-        v->type = Value::Literal;
-    }
-
-    return true;
-}
-
-bool QmlCompiler::testQualifiedEnumAssignment(const QMetaProperty &prop,
-                                              QmlParser::Object *obj,
-                                              QmlParser::Value *v,
-                                              bool *isAssignment)
-{
-    *isAssignment = false;
-    if (!prop.isEnumType())
-        return true;
-
-    if (!prop.isWritable())
-        COMPILE_EXCEPTION(v, QCoreApplication::translate("QmlCompiler","Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop.name())));
-
-    QString string = v->value.asString();
-    if (!string.at(0).isUpper())
-        return true;
-
-    QStringList parts = string.split(QLatin1Char('.'));
-    if (parts.count() != 2)
-        return true;
-
-    QString typeName = parts.at(0);
-    QmlType *type = 0;
-    QmlEnginePrivate::get(engine)->resolveType(unit->imports, typeName.toUtf8(),
-                                               &type, 0, 0, 0, 0);
-
-    if (!type || obj->typeName != type->qmlTypeName())
-        return true;
-
-    QString enumValue = parts.at(1);
-    int value;
-    if (prop.isFlagType()) {
-        value = prop.enumerator().keysToValue(enumValue.toUtf8().constData());
-    } else
-        value = prop.enumerator().keyToValue(enumValue.toUtf8().constData());
-    if (value == -1)
-        return true;
-
-    v->type = Value::Literal;
-    v->value = QmlParser::Variant(enumValue);
-    *isAssignment = true;
-
-    return true;
-}
-
-// Ensures that the dynamic meta specification on obj is valid
-bool QmlCompiler::checkDynamicMeta(QmlParser::Object *obj)
-{
-    QSet<QByteArray> propNames;
-    QSet<QByteArray> methodNames;
-    bool seenDefaultProperty = false;
-
-    // Check properties
-    for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
-        const QmlParser::Object::DynamicProperty &prop =
-            obj->dynamicProperties.at(ii);
-
-        if (prop.isDefaultProperty) {
-            if (seenDefaultProperty)
-                COMPILE_EXCEPTION(&prop, QCoreApplication::translate("QmlCompiler","Duplicate default property"));
-            seenDefaultProperty = true;
-        }
-
-        if (propNames.contains(prop.name))
-            COMPILE_EXCEPTION(&prop, QCoreApplication::translate("QmlCompiler","Duplicate property name"));
-
-        propNames.insert(prop.name);
-    }
-
-    for (int ii = 0; ii < obj->dynamicSignals.count(); ++ii) {
-        QByteArray name = obj->dynamicSignals.at(ii).name;
-        if (methodNames.contains(name))
-            COMPILE_EXCEPTION(obj, QCoreApplication::translate("QmlCompiler","Duplicate signal name"));
-        methodNames.insert(name);
-    }
-    for (int ii = 0; ii < obj->dynamicSlots.count(); ++ii) {
-        QByteArray name = obj->dynamicSlots.at(ii).name;
-        if (methodNames.contains(name))
-            COMPILE_EXCEPTION(obj, QCoreApplication::translate("QmlCompiler","Duplicate method name"));
-        methodNames.insert(name);
-    }
-
-    return true;
-}
-
-bool QmlCompiler::mergeDynamicMetaProperties(QmlParser::Object *obj)
-{
-    for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
-        const Object::DynamicProperty &p = obj->dynamicProperties.at(ii);
-
-        if (!p.defaultValue || p.type == Object::DynamicProperty::Alias)
-            continue;
-
-        Property *property = 0;
-        if (p.isDefaultProperty)
-            property = obj->getDefaultProperty();
-        else
-            property = obj->getProperty(p.name);
-
-        if (property->value)
-            COMPILE_EXCEPTION(property, QCoreApplication::translate("QmlCompiler","Invalid property nesting"));
-
-        for (int ii = 0; ii < p.defaultValue->values.count(); ++ii) {
-            Value *v = p.defaultValue->values.at(ii);
-            v->addref();
-            property->values.append(v);
-        }
-    }
-    return true;
-}
-
-Q_GLOBAL_STATIC(QAtomicInt, classIndexCounter)
-
-bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode)
-{
-    Q_ASSERT(obj);
-    Q_ASSERT(obj->metatype);
-
-    if (mode != ForceCreation &&
-        obj->dynamicProperties.isEmpty() &&
-        obj->dynamicSignals.isEmpty() &&
-        obj->dynamicSlots.isEmpty())
-        return true;
-
-    COMPILE_CHECK(checkDynamicMeta(obj));
-
-    QByteArray dynamicData(sizeof(QmlVMEMetaData), (char)0);
-
-    QByteArray newClassName = obj->metatype->className();
-    newClassName.append("_QML_");
-    int idx = classIndexCounter()->fetchAndAddRelaxed(1);
-    newClassName.append(QByteArray::number(idx));
-    if (compileState.root == obj) {
-        QString path = output->url.path();
-        int lastSlash = path.lastIndexOf(QLatin1Char('/'));
-        if (lastSlash > -1) {
-            QString nameBase = path.mid(lastSlash + 1, path.length()-lastSlash-5);
-            if (!nameBase.isEmpty() && nameBase.at(0).isUpper())
-                newClassName = nameBase.toUtf8() + "_QMLTYPE_" + QByteArray::number(idx);
-        }
-    }
-
-    QMetaObjectBuilder builder;
-    builder.setClassName(newClassName);
-    builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
-
-    bool hasAlias = false;
-    for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
-        const Object::DynamicProperty &p = obj->dynamicProperties.at(ii);
-
-        int propIdx =
-            obj->metaObject()->indexOfProperty(p.name.constData());
-        if (-1 != propIdx) {
-            QMetaProperty prop = obj->metaObject()->property(propIdx);
-            if (prop.isFinal())
-                COMPILE_EXCEPTION(&p, QCoreApplication::translate("QmlCompiler","Cannot override FINAL property"));
-        }
-
-        if (p.isDefaultProperty &&
-            (p.type != Object::DynamicProperty::Alias ||
-             mode == ResolveAliases))
-            builder.addClassInfo("DefaultProperty", p.name);
-
-        QByteArray type;
-        int propertyType = 0;
-        bool readonly = false;
-        switch(p.type) {
-        case Object::DynamicProperty::Alias:
-            hasAlias = true;
-            continue;
-            break;
-        case Object::DynamicProperty::CustomList:
-        case Object::DynamicProperty::Custom:
-            {
-                QByteArray customTypeName;
-                QmlType *qmltype = 0;
-                QUrl url;
-                QmlEnginePrivate *priv = QmlEnginePrivate::get(engine);
-                if (!priv->resolveType(unit->imports, p.customType, &qmltype, 
-                                       &url, 0, 0, 0)) 
-                    COMPILE_EXCEPTION(&p, QCoreApplication::translate("QmlCompiler","Invalid property type"));
-
-                if (!qmltype) {
-                    QmlCompositeTypeData *tdata = priv->typeManager.get(url);
-                    Q_ASSERT(tdata);
-                    Q_ASSERT(tdata->status == QmlCompositeTypeData::Complete);
-
-                    QmlCompiledData *data = tdata->toCompiledComponent(engine);
-                    customTypeName = data->root->className();
-                } else {
-                    customTypeName = qmltype->typeName();
-                }
-
-                if (p.type == Object::DynamicProperty::Custom) {
-                    type = customTypeName + '*';
-                    propertyType = QMetaType::QObjectStar;
-                } else {
-                    readonly = true;
-                    type = "QmlListProperty<";
-                    type.append(customTypeName);
-                    type.append(">");
-                    propertyType = qMetaTypeId<QmlListProperty<QObject> >();
-                }
-            }
-            break;
-        case Object::DynamicProperty::Variant:
-            propertyType = -1;
-            type = "QVariant";
-            break;
-        case Object::DynamicProperty::Int:
-            propertyType = QVariant::Int;
-            type = "int";
-            break;
-        case Object::DynamicProperty::Bool:
-            propertyType = QVariant::Bool;
-            type = "bool";
-            break;
-        case Object::DynamicProperty::Real:
-            propertyType = QVariant::Double;
-            type = "double";
-            break;
-        case Object::DynamicProperty::String:
-            propertyType = QVariant::String;
-            type = "QString";
-            break;
-        case Object::DynamicProperty::Url:
-            propertyType = QVariant::Url;
-            type = "QUrl";
-            break;
-        case Object::DynamicProperty::Color:
-            propertyType = QVariant::Color;
-            type = "QColor";
-            break;
-        case Object::DynamicProperty::Date:
-            propertyType = QVariant::Date;
-            type = "QDate";
-            break;
-        }
-
-        ((QmlVMEMetaData *)dynamicData.data())->propertyCount++;
-        QmlVMEMetaData::PropertyData propertyData = { propertyType };
-        dynamicData.append((char *)&propertyData, sizeof(propertyData));
-
-        builder.addSignal(p.name + "Changed()");
-        QMetaPropertyBuilder propBuilder = 
-            builder.addProperty(p.name, type, builder.methodCount() - 1);
-        propBuilder.setScriptable(true);
-        propBuilder.setWritable(!readonly);
-    }
-
-    if (mode == ResolveAliases) {
-        for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
-            const Object::DynamicProperty &p = obj->dynamicProperties.at(ii);
-
-            if (p.type == Object::DynamicProperty::Alias) {
-                ((QmlVMEMetaData *)dynamicData.data())->aliasCount++;
-                compileAlias(builder, dynamicData, obj, p);
-            }
-        }
-    }
-
-    for (int ii = 0; ii < obj->dynamicSignals.count(); ++ii) {
-        const Object::DynamicSignal &s = obj->dynamicSignals.at(ii);
-        QByteArray sig(s.name + '(');
-        for (int jj = 0; jj < s.parameterTypes.count(); ++jj) {
-            if (jj) sig.append(',');
-            sig.append(s.parameterTypes.at(jj));
-        }
-        sig.append(')');
-        QMetaMethodBuilder b = builder.addSignal(sig);
-        b.setParameterNames(s.parameterNames);
-        ((QmlVMEMetaData *)dynamicData.data())->signalCount++;
-    }
-
-    QStringList funcScripts;
-
-    for (int ii = 0; ii < obj->dynamicSlots.count(); ++ii) {
-        Object::DynamicSlot &s = obj->dynamicSlots[ii];
-        QByteArray sig(s.name + '(');
-        QString funcScript(QLatin1String("(function("));
-
-        for (int jj = 0; jj < s.parameterNames.count(); ++jj) {
-            if (jj) { 
-                sig.append(',');
-                funcScript.append(QLatin1Char(','));
-            }
-            funcScript.append(QLatin1String(s.parameterNames.at(jj)));
-            sig.append("QVariant");
-        }
-        sig.append(')');
-        funcScript.append(QLatin1Char(')'));
-        funcScript.append(s.body);
-        funcScript.append(QLatin1Char(')'));
-        funcScripts << funcScript;
-
-        QMetaMethodBuilder b = builder.addSlot(sig);
-        b.setReturnType("QVariant");
-        b.setParameterNames(s.parameterNames);
-
-        ((QmlVMEMetaData *)dynamicData.data())->methodCount++;
-        QmlVMEMetaData::MethodData methodData =
-             { s.parameterNames.count(), 0, funcScript.length(), 0 };
-
-        dynamicData.append((char *)&methodData, sizeof(methodData));
-    }
-
-    for (int ii = 0; ii < obj->dynamicSlots.count(); ++ii) {
-        const QString &funcScript = funcScripts.at(ii);
-        QmlVMEMetaData::MethodData *data =
-            ((QmlVMEMetaData *)dynamicData.data())->methodData() + ii;
-
-        data->bodyOffset = dynamicData.size();
-
-        dynamicData.append((const char *)funcScript.constData(),
-                           (funcScript.length() * sizeof(QChar)));
-    }
-
-    obj->metadata = builder.toRelocatableData();
-    builder.fromRelocatableData(&obj->extObject, obj->metatype, obj->metadata);
-
-    if (mode == IgnoreAliases && hasAlias)
-        compileState.aliasingObjects << obj;
-
-    obj->synthdata = dynamicData;
-
-    return true;
-}
-
-#include <qmljsparser_p.h>
-
-static QStringList astNodeToStringList(QmlJS::AST::Node *node)
-{
-    if (node->kind == QmlJS::AST::Node::Kind_IdentifierExpression) {
-        QString name =
-            static_cast<QmlJS::AST::IdentifierExpression *>(node)->name->asString();
-        return QStringList() << name;
-    } else if (node->kind == QmlJS::AST::Node::Kind_FieldMemberExpression) {
-        QmlJS::AST::FieldMemberExpression *expr = static_cast<QmlJS::AST::FieldMemberExpression *>(node);
-
-        QStringList rv = astNodeToStringList(expr->base);
-        if (rv.isEmpty())
-            return rv;
-        rv.append(expr->name->asString());
-        return rv;
-    }
-    return QStringList();
-}
-
-bool QmlCompiler::compileAlias(QMetaObjectBuilder &builder,
-                               QByteArray &data,
-                               Object *obj,
-                               const Object::DynamicProperty &prop)
-{
-    if (!prop.defaultValue)
-        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QmlCompiler","No property alias location"));
-
-    if (prop.defaultValue->values.count() != 1 ||
-        prop.defaultValue->values.at(0)->object ||
-        !prop.defaultValue->values.at(0)->value.isScript())
-        COMPILE_EXCEPTION(prop.defaultValue, QCoreApplication::translate("QmlCompiler","Invalid alias location"));
-
-    QmlJS::AST::Node *node = prop.defaultValue->values.at(0)->value.asAST();
-    if (!node)
-        COMPILE_EXCEPTION(obj, QCoreApplication::translate("QmlCompiler","No property alias location")); // ### Can this happen?
-
-    QStringList alias = astNodeToStringList(node);
-
-    if (alias.count() != 1 && alias.count() != 2)
-        COMPILE_EXCEPTION(prop.defaultValue, QCoreApplication::translate("QmlCompiler","Invalid alias reference. An alias reference must be specified as <id> or <id>.<property>"));
-
-    if (!compileState.ids.contains(alias.at(0)))
-        COMPILE_EXCEPTION(prop.defaultValue, QCoreApplication::translate("QmlCompiler","Invalid alias reference. Unable to find id \"%1\"").arg(alias.at(0)));
-
-    Object *idObject = compileState.ids[alias.at(0)];
-
-    QByteArray typeName;
-
-    int propIdx = -1;
-    int flags = 0;
-    bool writable = false;
-    if (alias.count() == 2) {
-        propIdx = idObject->metaObject()->indexOfProperty(alias.at(1).toUtf8().constData());
-
-        if (-1 == propIdx)
-            COMPILE_EXCEPTION(prop.defaultValue, QCoreApplication::translate("QmlCompiler","Invalid alias location"));
-
-        QMetaProperty aliasProperty = idObject->metaObject()->property(propIdx);
-        writable = aliasProperty.isWritable();
-
-        if (aliasProperty.isEnumType()) 
-            typeName = "int";  // Avoid introducing a dependency on the aliased metaobject
-        else
-            typeName = aliasProperty.typeName();
-    } else {
-        typeName = idObject->metaObject()->className();
-
-        //use the base type since it has been registered with metatype system
-        int index = typeName.indexOf("_QML_");
-        if (index != -1) {
-            typeName = typeName.left(index);
-        } else {
-            index = typeName.indexOf("_QMLTYPE_");
-            const QMetaObject *mo = idObject->metaObject();
-            while (index != -1 && mo) {
-                typeName = mo->superClass()->className();
-                index = typeName.indexOf("_QMLTYPE_");
-                mo = mo->superClass();
-            }
-        }
-
-        typeName += '*';
-    }
-
-    if (typeName.endsWith('*'))
-        flags |= QML_ALIAS_FLAG_PTR;
-
-    data.append((const char *)&idObject->idIndex, sizeof(idObject->idIndex));
-    data.append((const char *)&propIdx, sizeof(propIdx));
-    data.append((const char *)&flags, sizeof(flags));
-
-    builder.addSignal(prop.name + "Changed()");
-    QMetaPropertyBuilder propBuilder = 
-        builder.addProperty(prop.name, typeName.constData(), builder.methodCount() - 1);
-    propBuilder.setScriptable(true);
-    propBuilder.setWritable(writable);
-    return true;
-}
-
-bool QmlCompiler::buildBinding(QmlParser::Value *value,
-                               QmlParser::Property *prop,
-                               const BindingContext &ctxt)
-{
-    Q_ASSERT(prop->index != -1);
-    Q_ASSERT(prop->parent);
-    Q_ASSERT(prop->parent->metaObject());
-
-    QMetaProperty mp = prop->parent->metaObject()->property(prop->index);
-    if (!mp.isWritable() && !QmlMetaType::isList(prop->type))
-        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QmlCompiler","Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop->name)));
-
-    BindingReference reference;
-    reference.expression = value->value;
-    reference.property = prop;
-    reference.value = value;
-    reference.bindingContext = ctxt;
-    addBindingReference(reference);
-
-    return true;
-}
-
-void QmlCompiler::genBindingAssignment(QmlParser::Value *binding,
-                                       QmlParser::Property *prop,
-                                       QmlParser::Object *obj,
-                                       QmlParser::Property *valueTypeProperty)
-{
-    Q_UNUSED(obj);
-    Q_ASSERT(compileState.bindings.contains(binding));
-
-    const BindingReference &ref = compileState.bindings.value(binding);
-    if (ref.dataType == BindingReference::Experimental) {
-        QmlInstruction store;
-        store.type = QmlInstruction::StoreCompiledBinding;
-        store.assignBinding.value = ref.compiledIndex;
-        store.assignBinding.context = ref.bindingContext.stack;
-        store.assignBinding.owner = ref.bindingContext.owner;
-        if (valueTypeProperty) 
-            store.assignBinding.property = (valueTypeProperty->index & 0xFFFF) |
-                                           ((valueTypeProperty->type & 0xFF)) << 16 |
-                                           ((prop->index & 0xFF) << 24);
-        else 
-            store.assignBinding.property = prop->index;
-        store.line = binding->location.start.line;
-        output->bytecode << store;
-        return;
-    }
-
-    QmlInstruction store;
-    store.type = QmlInstruction::StoreBinding;
-    store.assignBinding.value = output->indexForByteArray(ref.compiledData);
-    store.assignBinding.context = ref.bindingContext.stack;
-    store.assignBinding.owner = ref.bindingContext.owner;
-    store.line = binding->location.start.line;
-
-    Q_ASSERT(ref.bindingContext.owner == 0 ||
-             (ref.bindingContext.owner != 0 && valueTypeProperty));
-    if (ref.bindingContext.owner) {
-        store.assignBinding.property = genValueTypeData(prop, valueTypeProperty);
-    } else {
-        store.assignBinding.property = genPropertyData(prop);
-    }
-
-    output->bytecode << store;
-}
-
-int QmlCompiler::genContextCache()
-{
-    if (compileState.ids.count() == 0)
-        return -1;
-
-    QmlIntegerCache *cache = new QmlIntegerCache(engine);
-
-    for (QHash<QString, QmlParser::Object *>::ConstIterator iter = compileState.ids.begin();
-         iter != compileState.ids.end();
-         ++iter) 
-        cache->add(iter.key(), (*iter)->idIndex);
-
-    output->contextCaches.append(cache);
-    return output->contextCaches.count() - 1;
-}
-
-int QmlCompiler::genValueTypeData(QmlParser::Property *valueTypeProp, 
-                                  QmlParser::Property *prop)
-{
-    QByteArray data =
-        QmlMetaPropertyPrivate::saveValueType(prop->parent->metaObject(), prop->index, 
-                                              QmlEnginePrivate::get(engine)->valueTypes[prop->type]->metaObject(), 
-                                              valueTypeProp->index);
-//                valueTypeProp->index, valueTypeProp->type);
-
-    return output->indexForByteArray(data);
-}
-
-int QmlCompiler::genPropertyData(QmlParser::Property *prop)
-{
-    return output->indexForByteArray(QmlMetaPropertyPrivate::saveProperty(prop->parent->metaObject(), prop->index));
-}
-
-bool QmlCompiler::completeComponentBuild()
-{
-    componentStat.ids = compileState.ids.count();
-
-    for (int ii = 0; ii < compileState.aliasingObjects.count(); ++ii) {
-        Object *aliasObject = compileState.aliasingObjects.at(ii);
-        COMPILE_CHECK(buildDynamicMeta(aliasObject, ResolveAliases));
-    }
-
-    QmlBindingCompiler::Expression expr;
-    expr.component = compileState.root;
-    expr.ids = compileState.ids;
-
-    QmlBindingCompiler bindingCompiler;
-
-    for (QHash<QmlParser::Value*,BindingReference>::Iterator iter = compileState.bindings.begin(); iter != compileState.bindings.end(); ++iter) {
-        BindingReference &binding = *iter;
-
-        expr.context = binding.bindingContext.object;
-        expr.property = binding.property;
-        expr.expression = binding.expression;
-        expr.imports = unit->imports;
-
-        if (qmlExperimental()) {
-            int index = bindingCompiler.compile(expr, QmlEnginePrivate::get(engine));
-            if (index != -1) {
-                qWarning() << "Accepted for optimization:" << qPrintable(expr.expression.asScript());
-                binding.dataType = BindingReference::Experimental;
-                binding.compiledIndex = index;
-                componentStat.optimizedBindings++;
-                continue;
-            } else {
-                qWarning() << "Rejected for optimization:" << qPrintable(expr.expression.asScript());
-            }
-        }
-
-        binding.dataType = BindingReference::QtScript;
-
-        // Pre-rewrite the expression
-        QString expression = binding.expression.asScript();
-
-        // ### Optimize
-        QmlRewrite::SharedBindingTester sharableTest;
-        bool isSharable = sharableTest.isSharable(expression);
-        
-        QmlRewrite::RewriteBinding rewriteBinding;
-        expression = rewriteBinding(expression);
-
-        quint32 length = expression.length();
-        quint32 pc; 
-        
-        if (isSharable) {
-            pc = output->cachedClosures.count();
-            pc |= 0x80000000;
-            output->cachedClosures.append(0);
-        } else {
-            pc = output->cachedPrograms.length();
-            output->cachedPrograms.append(0);
-        }
-
-        binding.compiledData =
-            QByteArray((const char *)&pc, sizeof(quint32)) +
-            QByteArray((const char *)&length, sizeof(quint32)) +
-            QByteArray((const char *)expression.constData(), 
-                       expression.length() * sizeof(QChar));
-
-        componentStat.scriptBindings++;
-    }
-
-    if (bindingCompiler.isValid()) {
-        compileState.compiledBindingData = bindingCompiler.program();
-        QmlBindingCompiler::dump(compileState.compiledBindingData);
-    }
-
-    saveComponentState();
-
-    return true;
-}
-
-void QmlCompiler::dumpStats()
-{
-    qWarning().nospace() << "QML Document: " << output->url.toString();
-    for (int ii = 0; ii < savedComponentStats.count(); ++ii) {
-        const ComponentStat &stat = savedComponentStats.at(ii);
-        qWarning().nospace() << "    Component Line " << stat.lineNumber;
-        qWarning().nospace() << "        Total Objects:      " << stat.objects;
-        qWarning().nospace() << "        IDs Used:           " << stat.ids;
-        qWarning().nospace() << "        Optimized Bindings: " << stat.optimizedBindings;
-        qWarning().nospace() << "        QScript Bindings:   " << stat.scriptBindings;
-    }
-}
-
-/*!
-    Returns true if from can be assigned to a (QObject) property of type
-    to.
-*/
-bool QmlCompiler::canCoerce(int to, QmlParser::Object *from)
-{
-    const QMetaObject *toMo = 
-        QmlEnginePrivate::get(engine)->rawMetaObjectForType(to);
-    const QMetaObject *fromMo = from->metaObject();
-
-    while (fromMo) {
-        if (QmlMetaPropertyPrivate::equal(fromMo, toMo))
-            return true;
-        fromMo = fromMo->superClass();
-    }
-    return false;
-}
-
-/*!
-    Returns true if from can be assigned to a (QObject) property of type
-    to.
-*/
-bool QmlCompiler::canCoerce(int to, int from)
-{
-    const QMetaObject *toMo = 
-        QmlEnginePrivate::get(engine)->rawMetaObjectForType(to);
-    const QMetaObject *fromMo = 
-        QmlEnginePrivate::get(engine)->rawMetaObjectForType(from);
-
-    while (fromMo) {
-        if (QmlMetaPropertyPrivate::equal(fromMo, toMo))
-            return true;
-        fromMo = fromMo->superClass();
-    }
-    return false;
-}
-
-QmlType *QmlCompiler::toQmlType(QmlParser::Object *from)
-{
-    // ### Optimize
-    const QMetaObject *mo = from->metatype;
-    QmlType *type = 0;
-    while (!type && mo) {
-        type = QmlMetaType::qmlType(mo);
-        mo = mo->superClass();
-    }
-   return type;
-}
-
-QStringList QmlCompiler::deferredProperties(QmlParser::Object *obj)
-{
-    const QMetaObject *mo = obj->metatype;
-
-    int idx = mo->indexOfClassInfo("DeferredPropertyNames");
-    if (idx == -1)
-        return QStringList();
-
-    QMetaClassInfo classInfo = mo->classInfo(idx);
-    QStringList rv = QString::fromUtf8(classInfo.value()).split(QLatin1Char(','));
-    return rv;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h
deleted file mode 100644
index 744d397..0000000
--- a/src/declarative/qml/qmlcompiler_p.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCOMPILER_P_H
-#define QMLCOMPILER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qml.h"
-#include "qmlerror.h"
-#include "qmlinstruction_p.h"
-#include "qmlcompositetypemanager_p.h"
-#include "qmlparser_p.h"
-#include "qmlengine_p.h"
-#include "qbitfield_p.h"
-#include "qmlpropertycache_p.h"
-#include "qmlintegercache_p.h"
-#include "qmltypenamecache_p.h"
-
-#include <QtCore/qbytearray.h>
-#include <QtCore/qset.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QmlComponent;
-class QmlContext;
-
-class QScriptProgram;
-class Q_AUTOTEST_EXPORT QmlCompiledData : public QmlRefCount, public QmlCleanup
-{
-public:
-    QmlCompiledData(QmlEngine *engine);
-    virtual ~QmlCompiledData();
-
-    QString name;
-    QUrl url;
-    QmlEnginePrivate::Imports imports;
-    QmlTypeNameCache *importCache;
-
-    struct TypeReference 
-    {
-        TypeReference()
-        : type(0), component(0), ref(0) {}
-
-        QByteArray className;
-        QmlType *type;
-        QmlComponent *component;
-
-        QmlRefCount *ref;
-        QObject *createInstance(QmlContext *, const QBitField &) const;
-        const QMetaObject *metaObject() const;
-    };
-    QList<TypeReference> types;
-    struct CustomTypeData
-    {
-        int index;
-        int type;
-    };
-
-    const QMetaObject *root;
-    QAbstractDynamicMetaObject rootData;
-    QmlPropertyCache *rootPropertyCache;
-    QList<QString> primitives;
-    QList<float> floatData;
-    QList<int> intData;
-    QList<CustomTypeData> customTypeData;
-    QList<QByteArray> datas;
-    QList<QmlParser::Location> locations;
-    QList<QmlInstruction> bytecode;
-    QList<QScriptProgram *> cachedPrograms;
-    QList<QScriptValue *> cachedClosures;
-    QList<QmlPropertyCache *> propertyCaches;
-    QList<QmlIntegerCache *> contextCaches;
-    QList<QmlParser::Object::ScriptBlock> scripts;
-    QList<QUrl> urls;
-
-    void dumpInstructions();
-
-protected:
-    virtual void clear(); // From QmlCleanup
-
-private:
-    void dump(QmlInstruction *, int idx = -1);
-    QmlCompiledData(const QmlCompiledData &other);
-    QmlCompiledData &operator=(const QmlCompiledData &other);
-    QByteArray packData;
-    friend class QmlCompiler;
-    int pack(const char *, size_t);
-
-    int indexForString(const QString &);
-    int indexForByteArray(const QByteArray &);
-    int indexForFloat(float *, int);
-    int indexForInt(int *, int);
-    int indexForLocation(const QmlParser::Location &);
-    int indexForLocation(const QmlParser::LocationSpan &);
-    int indexForUrl(const QUrl &);
-};
-
-class QMetaObjectBuilder;
-class Q_DECLARATIVE_EXPORT QmlCompiler
-{
-public:
-    QmlCompiler();
-
-    bool compile(QmlEngine *, QmlCompositeTypeData *, QmlCompiledData *);
-
-    bool isError() const;
-    QList<QmlError> errors() const;
-
-    static bool isValidId(const QString &);
-    static bool isAttachedPropertyName(const QByteArray &);
-    static bool isSignalPropertyName(const QByteArray &);
-
-private:
-    static void reset(QmlCompiledData *);
-
-    struct BindingContext {
-        BindingContext()
-            : stack(0), owner(0), object(0) {}
-        BindingContext(QmlParser::Object *o)
-            : stack(0), owner(0), object(o) {}
-        BindingContext incr() const {
-            BindingContext rv(object);
-            rv.stack = stack + 1;
-            return rv;
-        }
-        bool isSubContext() const { return stack != 0; }
-        int stack;
-        int owner;
-        QmlParser::Object *object;
-    };
-
-    void compileTree(QmlParser::Object *tree);
-
-
-    bool buildObject(QmlParser::Object *obj, const BindingContext &);
-    bool buildScript(QmlParser::Object *obj, QmlParser::Object *script);
-    bool buildComponent(QmlParser::Object *obj, const BindingContext &);
-    bool buildSubObject(QmlParser::Object *obj, const BindingContext &);
-    bool buildSignal(QmlParser::Property *prop, QmlParser::Object *obj, 
-                     const BindingContext &);
-    bool buildProperty(QmlParser::Property *prop, QmlParser::Object *obj, 
-                       const BindingContext &);
-    bool buildPropertyInNamespace(QmlEnginePrivate::ImportedNamespace *ns,
-                                  QmlParser::Property *prop, 
-                                  QmlParser::Object *obj, 
-                                  const BindingContext &);
-    bool buildIdProperty(QmlParser::Property *prop, QmlParser::Object *obj);
-    bool buildAttachedProperty(QmlParser::Property *prop, 
-                               QmlParser::Object *obj,
-                               const BindingContext &ctxt);
-    bool buildGroupedProperty(QmlParser::Property *prop,
-                              QmlParser::Object *obj,
-                              const BindingContext &ctxt);
-    bool buildValueTypeProperty(QObject *type, 
-                                QmlParser::Object *obj, 
-                                QmlParser::Object *baseObj,
-                                const BindingContext &ctxt);
-    bool buildListProperty(QmlParser::Property *prop,
-                           QmlParser::Object *obj,
-                           const BindingContext &ctxt);
-    bool buildScriptStringProperty(QmlParser::Property *prop,
-                                   QmlParser::Object *obj,
-                                   const BindingContext &ctxt);
-    bool buildPropertyAssignment(QmlParser::Property *prop,
-                                 QmlParser::Object *obj,
-                                 const BindingContext &ctxt);
-    bool buildPropertyObjectAssignment(QmlParser::Property *prop,
-                                       QmlParser::Object *obj,
-                                       QmlParser::Value *value,
-                                       const BindingContext &ctxt);
-    bool buildPropertyLiteralAssignment(QmlParser::Property *prop,
-                                        QmlParser::Object *obj,
-                                        QmlParser::Value *value,
-                                        const BindingContext &ctxt);
-    bool doesPropertyExist(QmlParser::Property *prop, QmlParser::Object *obj);
-    bool testLiteralAssignment(const QMetaProperty &prop, 
-                               QmlParser::Value *value);
-    bool testQualifiedEnumAssignment(const QMetaProperty &prop,
-                                     QmlParser::Object *obj,
-                                     QmlParser::Value *value,
-                                     bool *isAssignment);
-    enum DynamicMetaMode { IgnoreAliases, ResolveAliases, ForceCreation };
-    bool mergeDynamicMetaProperties(QmlParser::Object *obj);
-    bool buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode);
-    bool checkDynamicMeta(QmlParser::Object *obj);
-    bool buildBinding(QmlParser::Value *, QmlParser::Property *prop,
-                      const BindingContext &ctxt);
-    bool buildComponentFromRoot(QmlParser::Object *obj, const BindingContext &);
-    bool compileAlias(QMetaObjectBuilder &, 
-                      QByteArray &data,
-                      QmlParser::Object *obj, 
-                      const QmlParser::Object::DynamicProperty &);
-    bool completeComponentBuild();
-
-
-    void genObject(QmlParser::Object *obj);
-    void genObjectBody(QmlParser::Object *obj);
-    void genComponent(QmlParser::Object *obj);
-    void genValueProperty(QmlParser::Property *prop, QmlParser::Object *obj);
-    void genListProperty(QmlParser::Property *prop, QmlParser::Object *obj);
-    void genPropertyAssignment(QmlParser::Property *prop, 
-                               QmlParser::Object *obj,
-                               QmlParser::Property *valueTypeProperty = 0);
-    void genLiteralAssignment(const QMetaProperty &prop, 
-                              QmlParser::Value *value);
-    void genBindingAssignment(QmlParser::Value *binding, 
-                              QmlParser::Property *prop, 
-                              QmlParser::Object *obj,
-                              QmlParser::Property *valueTypeProperty = 0);
-    int genContextCache();
-
-    int genValueTypeData(QmlParser::Property *prop, QmlParser::Property *valueTypeProp);
-    int genPropertyData(QmlParser::Property *prop);
-
-    int componentTypeRef();
-
-    static int findSignalByName(const QMetaObject *, const QByteArray &name);
-    static QmlType *toQmlType(QmlParser::Object *from);
-    bool canCoerce(int to, QmlParser::Object *from);
-    bool canCoerce(int to, int from);
-
-    QStringList deferredProperties(QmlParser::Object *);
-
-    void addId(const QString &, QmlParser::Object *);
-
-    void dumpStats();
-
-    struct BindingReference {
-        QmlParser::Variant expression;
-        QmlParser::Property *property;
-        QmlParser::Value *value;
-
-        enum DataType { QtScript, Experimental };
-        DataType dataType;
-
-        int compiledIndex;
-
-        QByteArray compiledData;
-        BindingContext bindingContext;
-    };
-    void addBindingReference(const BindingReference &);
-
-    struct ComponentCompileState
-    {
-        ComponentCompileState() 
-            : parserStatusCount(0), pushedProperties(0), root(0) {}
-        QHash<QString, QmlParser::Object *> ids;
-        QHash<int, QmlParser::Object *> idIndexes;
-        int parserStatusCount;
-        int pushedProperties;
-
-        QByteArray compiledBindingData;
-
-        QHash<QmlParser::Value *, BindingReference> bindings;
-        QList<QmlParser::Object *> aliasingObjects;
-        QmlParser::Object *root;
-    };
-    ComponentCompileState compileState;
-
-    struct ComponentStat
-    {
-        ComponentStat() 
-            : ids(0), scriptBindings(0), optimizedBindings(0), objects(0) {}
-
-        int lineNumber;
-
-        int ids;
-        int scriptBindings;
-        int optimizedBindings;
-        int objects;
-    };
-    ComponentStat componentStat;
-
-    void saveComponentState();
-
-    ComponentCompileState componentState(QmlParser::Object *);
-    QHash<QmlParser::Object *, ComponentCompileState> savedCompileStates;
-    QList<ComponentStat> savedComponentStats;
-
-    QList<QmlError> exceptions;
-    QmlCompiledData *output;
-    QmlEngine *engine;
-    QmlParser::Object *unitRoot;
-    QmlCompositeTypeData *unit;
-};
-QT_END_NAMESPACE
-
-#endif // QMLCOMPILER_P_H
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
deleted file mode 100644
index cda281f..0000000
--- a/src/declarative/qml/qmlcomponent.cpp
+++ /dev/null
@@ -1,798 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlcomponent.h"
-#include "qmlcomponent_p.h"
-
-#include "qmlcompiler_p.h"
-#include "qmlcontext_p.h"
-#include "qmlcompositetypedata_p.h"
-#include "qmlengine_p.h"
-#include "qmlvme_p.h"
-#include "qml.h"
-#include "qmlengine.h"
-#include "qmlbinding_p.h"
-#include "qmlbinding_p_p.h"
-#include "qmlglobal_p.h"
-#include "qmlscriptparser_p.h"
-
-#include <qfxperf_p_p.h>
-
-#include <QStack>
-#include <QStringList>
-#include <QFileInfo>
-#include <QtCore/qdebug.h>
-#include <QApplication>
-
-QT_BEGIN_NAMESPACE
-
-class QByteArray;
-int statusId = qRegisterMetaType<QmlComponent::Status>("QmlComponent::Status");
-
-/*!
-    \class QmlComponent
-  \since 4.7
-    \brief The QmlComponent class encapsulates a QML component description.
-    \mainclass
-*/
-
-/*!
-    \qmlclass Component QmlComponent
-  \since 4.7
-    \brief The Component element encapsulates a QML component description.
-
-    Components are reusable, encapsulated Qml element with a well-defined interface.
-    They are often defined in \l {qmldocuments.html}{Component Files}.
-
-    The \e Component element allows defining components within a QML file.
-    This can be useful for reusing a small component within a single QML
-    file, or for defining a component that logically belongs with the
-    file containing it.
-
-    \qml
-Item {
-    Component {
-        id: redSquare
-        Rectangle {
-            color: "red"
-            width: 10
-            height: 10
-        }
-    }
-    Loader { sourceComponent: redSquare }
-    Loader { sourceComponent: redSquare; x: 20 }
-}
-    \endqml
-
-    \section1 Attached Properties
-
-    \e onCompleted
-
-    Emitted after component "startup" has completed.  This can be used to
-    execute script code at startup, once the full QML environment has been 
-    established.
-
-    The \c {Component::onCompleted} attached property can be applied to
-    any element.  The order of running the \c onCompleted scripts is
-    undefined.
-
-    \qml
-    Rectangle {
-        Component.onCompleted: console.log("Completed Running!")
-        Rectangle {
-            Component.onCompleted: console.log("Nested Completed Running!")
-        }
-    }
-    \endqml
-*/
-
-/*!
-    \enum QmlComponent::Status
-    
-    Specifies the loading status of the QmlComponent.
-
-    \value Null This QmlComponent has no data.  Call loadUrl() or setData() to add QML content.
-    \value Ready This QmlComponent is ready and create() may be called.
-    \value Loading This QmlComponent is loading network data.
-    \value Error An error has occured.  Calling errorDescription() to retrieve a description.
-*/
-
-void QmlComponentPrivate::typeDataReady()
-{
-    Q_Q(QmlComponent);
-
-    Q_ASSERT(typeData);
-
-    fromTypeData(typeData);
-    typeData = 0;
-
-    emit q->statusChanged(q->status());
-}
-
-void QmlComponentPrivate::updateProgress(qreal p)
-{
-    Q_Q(QmlComponent);
-
-    progress = p;
-    emit q->progressChanged(p);
-}
-
-void QmlComponentPrivate::fromTypeData(QmlCompositeTypeData *data)
-{
-    url = data->imports.baseUrl();
-    QmlCompiledData *c = data->toCompiledComponent(engine);
-
-    if (!c) {
-        Q_ASSERT(data->status == QmlCompositeTypeData::Error);
-
-        state.errors = data->errors;
-
-    } else {
-
-        cc = c;
-
-    }
-
-    data->release();
-}
-
-void QmlComponentPrivate::clear()
-{
-    if (typeData) {
-        typeData->remWaiter(this);
-        typeData->release();
-        typeData = 0;
-    }
-        
-    if (cc) { 
-        cc->release();
-        cc = 0;
-    }
-}
-
-/*!
-    \internal
-*/
-QmlComponent::QmlComponent(QObject *parent)
-    : QObject(*(new QmlComponentPrivate), parent)
-{
-}
-
-/*!
-    Destruct the QmlComponent.
-*/
-QmlComponent::~QmlComponent()
-{
-    Q_D(QmlComponent);
-
-    if (d->state.completePending) {
-        qWarning("QmlComponent: Component destroyed while completion pending");
-        d->completeCreate();
-    }
-
-    if (d->typeData) {
-        d->typeData->remWaiter(d);
-        d->typeData->release();
-    }
-    if (d->cc)
-        d->cc->release();
-}
-
-/*!
-    \property QmlComponent::status
-    The component's current \l{QmlComponent::Status} {status}.
- */
-QmlComponent::Status QmlComponent::status() const
-{
-    Q_D(const QmlComponent);
-
-    if (d->typeData)
-        return Loading;
-    else if (!d->state.errors.isEmpty())
-        return Error;
-    else if (d->engine && d->cc)
-        return Ready;
-    else
-        return Null;
-}
-
-/*!
-    \property QmlComponent::isNull
-
-    Is true if the component is in the Null state, false otherwise.
-
-    Equivalent to status() == QmlComponent::Null.
-*/
-bool QmlComponent::isNull() const
-{
-    return status() == Null;
-}
-
-/*!
-    \property QmlComponent::isReady
-
-    Is true if the component is in the Ready state, false otherwise.
-
-    Equivalent to status() == QmlComponent::Ready.
-*/
-bool QmlComponent::isReady() const
-{
-    return status() == Ready;
-}
-
-/*!
-    \property QmlComponent::isError
-
-    Is true if the component is in the Error state, false otherwise.
-
-    Equivalent to status() == QmlComponent::Error.
-*/
-bool QmlComponent::isError() const
-{
-    return status() == Error;
-}
-
-/*!
-    \property QmlComponent::isLoading
-
-    Is true if the component is in the Loading state, false otherwise.
-
-    Equivalent to status() == QmlComponent::Loading.
-*/
-bool QmlComponent::isLoading() const
-{
-    return status() == Loading;
-}
-
-/*!
-    \property QmlComponent::progress
-    The progress of loading the component, from 0.0 (nothing loaded)
-    to 1.0 (finished).
-*/
-qreal QmlComponent::progress() const
-{
-    Q_D(const QmlComponent);
-    return d->progress;
-}
-
-/*!
-    \fn void QmlComponent::progressChanged(qreal progress)
-
-    Emitted whenever the component's loading progress changes.  \a progress will be the
-    current progress between 0.0 (nothing loaded) and 1.0 (finished).
-*/
-
-/*!
-    \fn void QmlComponent::statusChanged(QmlComponent::Status status)
-
-    Emitted whenever the component's status changes.  \a status will be the
-    new status.
-*/
-
-/*!
-    Create a QmlComponent with no data and give it the specified
-    \a engine and \a parent. Set the data with setData().
-*/
-QmlComponent::QmlComponent(QmlEngine *engine, QObject *parent)
-    : QObject(*(new QmlComponentPrivate), parent)
-{
-    Q_D(QmlComponent);
-    d->engine = engine;
-}
-
-/*!
-    Create a QmlComponent from the given \a url and give it the
-    specified \a parent and \a engine.
-
-    \sa loadUrl()
-*/
-QmlComponent::QmlComponent(QmlEngine *engine, const QUrl &url, QObject *parent)
-: QObject(*(new QmlComponentPrivate), parent)
-{
-    Q_D(QmlComponent);
-    d->engine = engine;
-    loadUrl(url);
-}
-
-/*!
-    Create a QmlComponent from the given \a fileName and give it the specified 
-    \a parent and \a engine.
-
-    \sa loadUrl()
-*/
-QmlComponent::QmlComponent(QmlEngine *engine, const QString &fileName, 
-                           QObject *parent)
-: QObject(*(new QmlComponentPrivate), parent)
-{
-    Q_D(QmlComponent);
-    d->engine = engine;
-    loadUrl(QUrl::fromLocalFile(fileName));
-}
-
-/*!
-    \internal
-*/
-QmlComponent::QmlComponent(QmlEngine *engine, QmlCompiledData *cc, int start, int count, QObject *parent)
-    : QObject(*(new QmlComponentPrivate), parent)
-{
-    Q_D(QmlComponent);
-    d->engine = engine;
-    d->cc = cc;
-    cc->addref();
-    d->start = start;
-    d->count = count;
-    d->url = cc->url;
-    d->progress = 1.0;
-}
-
-/*!
-    Sets the QmlComponent to use the given QML \a data.  If \a url
-    is provided, it is used to set the component name and to provide
-    a base path for items resolved by this component.
-*/
-void QmlComponent::setData(const QByteArray &data, const QUrl &url)
-{
-    Q_D(QmlComponent);
-
-    d->clear();
-
-    d->url = url;
-
-    QmlCompositeTypeData *typeData = 
-        QmlEnginePrivate::get(d->engine)->typeManager.getImmediate(data, url);
-    
-    if (typeData->status == QmlCompositeTypeData::Waiting
-     || typeData->status == QmlCompositeTypeData::WaitingResources)
-    {
-        d->typeData = typeData;
-        d->typeData->addWaiter(d);
-
-    } else {
-
-        d->fromTypeData(typeData);
-
-    }
-
-    d->progress = 1.0;
-    emit statusChanged(status());
-    emit progressChanged(d->progress);
-}
-
-/*!
-Returns the QmlContext the component was created in.  This is only
-valid for components created directly from QML.
-*/
-QmlContext *QmlComponent::creationContext() const
-{
-    Q_D(const QmlComponent);
-    if(d->creationContext)
-        return d->creationContext;
-    QmlDeclarativeData *ddata = QmlDeclarativeData::get(this);
-    if (ddata)
-        return ddata->context;
-    else
-        return 0;
-}
-
-/*!
-  \internal
-  Sets the QmlContext the component was created in. This is only
-  desirable for components created in QML script.
-*/
-void QmlComponent::setCreationContext(QmlContext* c)
-{
-    Q_D(QmlComponent);
-    d->creationContext = c;
-}
-
-/*!
-    Load the QmlComponent from the provided \a url.
-*/
-void QmlComponent::loadUrl(const QUrl &url)
-{
-    Q_D(QmlComponent);
-
-    d->clear();
-
-    if (url.isRelative() && !url.isEmpty())
-        d->url = d->engine->baseUrl().resolved(url);
-    else
-        d->url = url;
-
-    QmlCompositeTypeData *data = 
-        QmlEnginePrivate::get(d->engine)->typeManager.get(d->url);
-
-    if (data->status == QmlCompositeTypeData::Waiting
-     || data->status == QmlCompositeTypeData::WaitingResources)
-    {
-        d->typeData = data;
-        d->typeData->addWaiter(d);
-        d->progress = data->progress;
-    } else {
-        d->fromTypeData(data);
-        d->progress = 1.0;
-    }
-
-    emit statusChanged(status());
-    emit progressChanged(d->progress);
-}
-
-/*!
-    Return the list of errors that occured during the last compile or create
-    operation.  An empty list is returned if isError() is not set.
-*/
-QList<QmlError> QmlComponent::errors() const
-{
-    Q_D(const QmlComponent);
-    if (isError())
-        return d->state.errors;
-    else
-        return QList<QmlError>();
-}
-
-/*!
-    \internal
-    errorsString is only meant as a way to get the errors in script
-*/
-QString QmlComponent::errorsString() const
-{
-    Q_D(const QmlComponent);
-    QString ret;
-    if(!isError())
-        return ret;
-    foreach(const QmlError &e, d->state.errors) {
-        ret += e.url().toString() + QLatin1Char(':') +
-               QString::number(e.line()) + QLatin1Char(' ') +
-               e.description() + QLatin1Char('\n');
-    }
-    return ret;
-}
-
-/*!
-    \property QmlComponent::url
-    The component URL.  This is the URL passed to either the constructor,
-    or the loadUrl() or setData() methods.
-*/
-QUrl QmlComponent::url() const
-{
-    Q_D(const QmlComponent);
-    return d->url;
-}
-
-/*!
-    \internal
-*/
-QmlComponent::QmlComponent(QmlComponentPrivate &dd, QObject *parent)
-    : QObject(dd, parent)
-{
-}
-
-
-/*!
-    \internal
-    A version of create which returns a scriptObject, for use in script
-*/
-QScriptValue QmlComponent::createObject()
-{
-    Q_D(QmlComponent);
-    QmlContext* ctxt = creationContext();
-    if(!ctxt){
-        qWarning() << QLatin1String("createObject can only be used in QML");
-        return QScriptValue();
-    }
-    QObject* ret = create(ctxt);
-    return QmlEnginePrivate::qmlScriptObject(ret, d->engine);
-}
-
-/*!
-    Create an object instance from this component.  Returns 0 if creation
-    failed.  \a context specifies the context within which to create the object
-    instance.  
-
-    If \a context is 0 (the default), it will create the instance in the
-    engine' s \l {QmlEngine::rootContext()}{root context}.
-*/
-QObject *QmlComponent::create(QmlContext *context)
-{
-    Q_D(QmlComponent);
-
-    return d->create(context, QBitField());
-}
-
-QObject *QmlComponentPrivate::create(QmlContext *context, 
-                                     const QBitField &bindings)
-{
-    if (!context)
-        context = engine->rootContext();
-
-    if (context->engine() != engine) {
-        qWarning("QmlComponent::create(): Must create component in context from the same QmlEngine");
-        return 0;
-    }
-
-    QObject *rv = beginCreate(context, bindings);
-    completeCreate();
-    return rv;
-}
-
-/*!
-    This method provides more advanced control over component instance creation.
-    In general, programmers should use QmlComponent::create() to create a 
-    component.
-
-    Create an object instance from this component.  Returns 0 if creation
-    failed.  \a context specifies the context within which to create the object
-    instance.  
-
-    When QmlComponent constructs an instance, it occurs in three steps:
-    \list 1
-    \i The object hierarchy is created, and constant values are assigned.
-    \i Property bindings are evaluated for the the first time.
-    \i If applicable, QmlParserStatus::componentComplete() is called on objects.
-    \endlist 
-    QmlComponent::beginCreate() differs from QmlComponent::create() in that it
-    only performs step 1.  QmlComponent::completeCreate() must be called to 
-    complete steps 2 and 3.
-
-    This breaking point is sometimes useful when using attached properties to
-    communicate information to an instantiated component, as it allows their
-    initial values to be configured before property bindings take effect.
-*/
-QObject *QmlComponent::beginCreate(QmlContext *context)
-{
-    Q_D(QmlComponent);
-    return d->beginCreate(context, QBitField());
-}
-
-QObject *
-QmlComponentPrivate::beginCreate(QmlContext *context, const QBitField &bindings)
-{
-    Q_Q(QmlComponent);
-    if (!context) {
-        qWarning("QmlComponent::beginCreate(): Cannot create a component in a null context");
-        return 0;
-    }
-
-    if (context->engine() != engine) {
-        qWarning("QmlComponent::beginCreate(): Must create component in context from the same QmlEngine");
-        return 0;
-    }
-
-    if (state.completePending) {
-        qWarning("QmlComponent: Cannot create new component instance before completing the previous");
-        return 0;
-    }
-
-    if (!q->isReady()) {
-        qWarning("QmlComponent: Component is not ready");
-        return 0;
-    }
-
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-
-    QmlContextPrivate *contextPriv = 
-        static_cast<QmlContextPrivate *>(QObjectPrivate::get(context));
-    QmlContext *ctxt = new QmlContext(context, 0, true);
-    static_cast<QmlContextPrivate*>(ctxt->d_func())->url = cc->url;
-    static_cast<QmlContextPrivate*>(ctxt->d_func())->imports = cc->importCache;
-    cc->importCache->addref();
-
-    QObject *rv = begin(ctxt, ep, cc, start, count, &state, bindings);
-
-    if (rv) {
-        QmlGraphics_setParent_noEvent(ctxt, rv);
-    } else {
-        delete ctxt;
-    }
-
-    if (rv && !contextPriv->isInternal && ep->isDebugging)
-        contextPriv->instances.append(rv);
-    return rv;
-}
-
-QObject * QmlComponentPrivate::begin(QmlContext *ctxt, QmlEnginePrivate *enginePriv,
-                                     QmlCompiledData *component, int start, int count,
-                                     ConstructionState *state, const QBitField &bindings)
-{
-    bool isRoot = !enginePriv->inBeginCreate;
-    enginePriv->inBeginCreate = true;
-
-    QmlVME vme;
-    QObject *rv = vme.run(ctxt, component, start, count, bindings);
-
-    if (vme.isError()) 
-        state->errors = vme.errors();
-
-    if (isRoot) {
-        enginePriv->inBeginCreate = false;
-
-        state->bindValues = enginePriv->bindValues;
-        state->parserStatus = enginePriv->parserStatus;
-        state->componentAttacheds = enginePriv->componentAttacheds;
-        if (state->componentAttacheds)
-            state->componentAttacheds->prev = &state->componentAttacheds;
-
-        enginePriv->componentAttacheds = 0;
-        enginePriv->bindValues.clear();
-        enginePriv->parserStatus.clear();
-        state->completePending = true;
-        enginePriv->inProgressCreations++;
-    }
-
-    return rv;
-}
-
-void QmlComponentPrivate::beginDeferred(QmlContext *, QmlEnginePrivate *enginePriv,
-                                        QObject *object, ConstructionState *state)
-{
-    bool isRoot = !enginePriv->inBeginCreate;
-    enginePriv->inBeginCreate = true;
-
-    QmlVME vme;
-    vme.runDeferred(object);
-
-    if (vme.isError()) 
-        state->errors = vme.errors();
-
-    if (isRoot) {
-        enginePriv->inBeginCreate = false;
-
-        state->bindValues = enginePriv->bindValues;
-        state->parserStatus = enginePriv->parserStatus;
-        state->componentAttacheds = enginePriv->componentAttacheds;
-        if (state->componentAttacheds)
-            state->componentAttacheds->prev = &state->componentAttacheds;
-
-        enginePriv->componentAttacheds = 0;
-        enginePriv->bindValues.clear();
-        enginePriv->parserStatus.clear();
-        state->completePending = true;
-        enginePriv->inProgressCreations++;
-    }
-}
-
-void QmlComponentPrivate::complete(QmlEnginePrivate *enginePriv, ConstructionState *state)
-{
-    if (state->completePending) {
-
-        for (int ii = 0; ii < state->bindValues.count(); ++ii) {
-            QmlEnginePrivate::SimpleList<QmlAbstractBinding> bv = 
-                state->bindValues.at(ii);
-            for (int jj = 0; jj < bv.count; ++jj) {
-                if(bv.at(jj)) 
-                    bv.at(jj)->setEnabled(true, QmlMetaProperty::BypassInterceptor | 
-                                                QmlMetaProperty::DontRemoveBinding);
-            }
-            QmlEnginePrivate::clear(bv);
-        }
-
-        for (int ii = 0; ii < state->parserStatus.count(); ++ii) {
-            QmlEnginePrivate::SimpleList<QmlParserStatus> ps = 
-                state->parserStatus.at(ii);
-
-            for (int jj = ps.count - 1; jj >= 0; --jj) {
-                QmlParserStatus *status = ps.at(jj);
-                if (status && status->d) {
-                    status->d = 0;
-                    status->componentComplete();
-                }
-            }
-            QmlEnginePrivate::clear(ps);
-        }
-
-        while (state->componentAttacheds) {
-            QmlComponentAttached *a = state->componentAttacheds;
-            if (a->next) a->next->prev = &state->componentAttacheds;
-            state->componentAttacheds = a->next;
-            a->prev = 0; a->next = 0;
-            emit a->completed();
-        }
-
-        state->bindValues.clear();
-        state->parserStatus.clear();
-        state->completePending = false;
-
-        enginePriv->inProgressCreations--;
-        if (0 == enginePriv->inProgressCreations) {
-            while (enginePriv->erroredBindings) {
-                qWarning().nospace() << qPrintable(enginePriv->erroredBindings->error.toString());
-                enginePriv->erroredBindings->removeError();
-            }
-        }
-    }
-}
-
-/*!
-    This method provides more advanced control over component instance creation.
-    In general, programmers should use QmlComponent::create() to create a 
-    component.
-
-    Complete a component creation begin with QmlComponent::beginCreate().
-*/
-void QmlComponent::completeCreate()
-{
-    Q_D(QmlComponent);
-    d->completeCreate();
-}
-
-void QmlComponentPrivate::completeCreate()
-{
-    if (state.completePending) {
-        QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-        complete(ep, &state);
-    }
-}
-
-QmlComponentAttached::QmlComponentAttached(QObject *parent)
-: QObject(parent), prev(0), next(0)
-{
-}
-
-QmlComponentAttached::~QmlComponentAttached()
-{
-    if (prev) *prev = next;
-    if (next) next->prev = prev;
-    prev = 0;
-    next = 0;
-}
-
-/*!
-    \internal
-*/
-QmlComponentAttached *QmlComponent::qmlAttachedProperties(QObject *obj)
-{
-    QmlComponentAttached *a = new QmlComponentAttached(obj);
-
-    QmlEngine *engine = qmlEngine(obj);
-    if (!engine || !QmlEnginePrivate::get(engine)->inBeginCreate)
-        return a;
-
-    QmlEnginePrivate *p = QmlEnginePrivate::get(engine);
-
-    a->next = p->componentAttacheds;
-    a->prev = &p->componentAttacheds;
-    if (a->next) a->next->prev = &a->next;
-    p->componentAttacheds = a;
-
-    return a;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
deleted file mode 100644
index 8996481..0000000
--- a/src/declarative/qml/qmlcomponent.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCOMPONENT_H
-#define QMLCOMPONENT_H
-
-#include "qml.h"
-#include "qmlerror.h"
-
-#include <QtCore/qobject.h>
-#include <QtCore/qstring.h>
-#include <QtScript/qscriptvalue.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlCompiledData;
-class QByteArray;
-class QmlComponentPrivate;
-class QmlEngine;
-class QmlComponentAttached;
-class Q_DECLARATIVE_EXPORT QmlComponent : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlComponent)
-    Q_PROPERTY(bool isNull READ isNull NOTIFY statusChanged)
-    Q_PROPERTY(bool isReady READ isReady NOTIFY statusChanged)
-    Q_PROPERTY(bool isError READ isError NOTIFY statusChanged)
-    Q_PROPERTY(bool isLoading READ isLoading NOTIFY statusChanged)
-    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-    Q_PROPERTY(QUrl url READ url CONSTANT)
-
-public:
-    QmlComponent(QObject *parent = 0);
-    QmlComponent(QmlEngine *, QObject *parent=0);
-    QmlComponent(QmlEngine *, const QString &fileName, QObject *parent = 0);
-    QmlComponent(QmlEngine *, const QUrl &url, QObject *parent = 0);
-    virtual ~QmlComponent();
-
-    Q_ENUMS(Status)
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
-
-    bool isNull() const;
-    bool isReady() const;
-    bool isError() const;
-    bool isLoading() const;
-
-    QList<QmlError> errors() const;
-    Q_INVOKABLE QString errorsString() const;
-
-    qreal progress() const;
-
-    QUrl url() const;
-
-    virtual QObject *create(QmlContext *context = 0);
-    virtual QObject *beginCreate(QmlContext *);
-    virtual void completeCreate();
-
-    Q_INVOKABLE QScriptValue createObject();
-
-    void loadUrl(const QUrl &url);
-    void setData(const QByteArray &, const QUrl &baseUrl);
-
-    void setCreationContext(QmlContext*);
-    QmlContext *creationContext() const;
-
-    static QmlComponentAttached *qmlAttachedProperties(QObject *);
-
-Q_SIGNALS:
-    void statusChanged(QmlComponent::Status);
-    void progressChanged(qreal);
-
-protected:
-    QmlComponent(QmlComponentPrivate &dd, QObject* parent);
-
-private:
-    QmlComponent(QmlEngine *, QmlCompiledData *, int, int, QObject *parent);
-
-    friend class QmlVME;
-    friend class QmlCompositeTypeData;
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QmlComponent::Status)
-QML_DECLARE_TYPE(QmlComponent)
-QML_DECLARE_TYPEINFO(QmlComponent, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif // QMLCOMPONENT_H
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
deleted file mode 100644
index b7a3038..0000000
--- a/src/declarative/qml/qmlcomponent_p.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCOMPONENT_P_H
-#define QMLCOMPONENT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlcomponent.h"
-
-#include "qmlengine_p.h"
-#include "qmlcompositetypemanager_p.h"
-#include "qbitfield_p.h"
-#include "qmlerror.h"
-#include "qml.h"
-
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QList>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlComponent;
-class QmlEngine;
-class QmlCompiledData;
-
-class QmlComponentAttached;
-class QmlComponentPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlComponent)
-        
-public:
-    QmlComponentPrivate() : typeData(0), progress(0.), start(-1), count(-1), cc(0), engine(0), creationContext(0) {}
-
-    QObject *create(QmlContext *context, const QBitField &);
-    QObject *beginCreate(QmlContext *, const QBitField &);
-    void completeCreate();
-
-    QmlCompositeTypeData *typeData;
-    void typeDataReady();
-    void updateProgress(qreal);
-    
-    void fromTypeData(QmlCompositeTypeData *data);
-
-    QUrl url;
-    qreal progress;
-
-    int start;
-    int count;
-    QmlCompiledData *cc;
-
-    struct ConstructionState {
-        ConstructionState() : componentAttacheds(0), completePending(false) {}
-        QList<QmlEnginePrivate::SimpleList<QmlAbstractBinding> > bindValues;
-        QList<QmlEnginePrivate::SimpleList<QmlParserStatus> > parserStatus;
-        QmlComponentAttached *componentAttacheds;
-        QList<QmlError> errors;
-        bool completePending;
-    };
-    ConstructionState state;
-
-    static QObject *begin(QmlContext *ctxt, QmlEnginePrivate *enginePriv,
-                          QmlCompiledData *component, int start, int count,
-                          ConstructionState *state, const QBitField &bindings = QBitField());
-    static void beginDeferred(QmlContext *ctxt, QmlEnginePrivate *enginePriv,
-                              QObject *object, ConstructionState *state);
-    static void complete(QmlEnginePrivate *enginePriv, ConstructionState *state);
-
-    QmlEngine *engine;
-    QmlContext *creationContext;
-
-    void clear();
-
-    static QmlComponentPrivate *get(QmlComponent *c) {
-        return static_cast<QmlComponentPrivate *>(QObjectPrivate::get(c));
-    }
-};
-
-class QmlComponentAttached : public QObject
-{
-    Q_OBJECT
-public:
-    QmlComponentAttached(QObject *parent = 0);
-    ~QmlComponentAttached();
-
-    QmlComponentAttached **prev;
-    QmlComponentAttached *next;
-
-Q_SIGNALS:
-    void completed();
-
-private:
-    friend class QmlComponentPrivate;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLCOMPONENT_P_H
diff --git a/src/declarative/qml/qmlcompositetypedata_p.h b/src/declarative/qml/qmlcompositetypedata_p.h
deleted file mode 100644
index 342c88a..0000000
--- a/src/declarative/qml/qmlcompositetypedata_p.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCOMPOSITETYPEDATA_P_H
-#define QMLCOMPOSITETYPEDATA_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlengine_p.h"
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlCompositeTypeResource;
-class QmlCompositeTypeData : public QmlRefCount
-{
-public:
-    QmlCompositeTypeData();
-    virtual ~QmlCompositeTypeData();
-
-    enum Status {
-        Invalid,
-        Complete,
-        Error,
-        Waiting,
-        WaitingResources
-    };
-    Status status;
-    enum ErrorType {
-        NoError,
-        AccessError,
-        GeneralError
-    };
-    ErrorType errorType;
-
-    QList<QmlError> errors;
-
-    QmlEnginePrivate::Imports imports;
-
-    QList<QmlCompositeTypeData *> dependants;
-
-    // Return a QmlComponent if the QmlCompositeTypeData is not in the Waiting
-    // state.  The QmlComponent is owned by the QmlCompositeTypeData, so a
-    // reference should be kept to keep the QmlComponent alive.
-    QmlComponent *toComponent(QmlEngine *);
-    // Return a QmlCompiledData if possible, or 0 if an error
-    // occurs
-    QmlCompiledData *toCompiledComponent(QmlEngine *);
-
-    struct TypeReference
-    {
-        TypeReference();
-
-        QmlType *type;
-        QmlCompositeTypeData *unit;
-    };
-
-    QList<TypeReference> types;
-    QList<QmlCompositeTypeResource *> resources;
-
-    // Add or remove p as a waiter.  When the QmlCompositeTypeData becomes
-    // ready, the QmlComponentPrivate::typeDataReady() method will be invoked on
-    // p.  The waiter is automatically removed when the typeDataReady() method
-    // is invoked, so there is no need to call remWaiter() in this case.
-    void addWaiter(QmlComponentPrivate *p);
-    void remWaiter(QmlComponentPrivate *p);
-
-    qreal progress;
-
-private:
-    friend class QmlCompositeTypeManager;
-    friend class QmlCompiler;
-    friend class QmlDomDocument;
-
-    QmlScriptParser data;
-    QList<QmlComponentPrivate *> waiters;
-    QmlComponent *component;
-    QmlCompiledData *compiledComponent;
-};
-
-class QmlCompositeTypeResource : public QmlRefCount
-{
-public:
-    QmlCompositeTypeResource();
-    virtual ~QmlCompositeTypeResource();
-
-    enum Status {
-        Invalid,
-        Complete,
-        Error,
-        Waiting
-    };
-    Status status;
-
-    QList<QmlCompositeTypeData *> dependants;
-
-    QString url;
-    QByteArray data;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLCOMPOSITETYPEDATA_P_H
-
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
deleted file mode 100644
index 71d6f16..0000000
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ /dev/null
@@ -1,670 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlcompositetypemanager_p.h"
-
-#include "qmlcompositetypedata_p.h"
-#include "qmlscriptparser_p.h"
-#include "qmlengine.h"
-#include "qmlengine_p.h"
-#include "qmlcomponent.h"
-#include "qmlcomponent_p.h"
-#include "qmlcompiler_p.h"
-
-#include <QtNetwork/qnetworkreply.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qfile.h>
-
-QT_BEGIN_NAMESPACE
-
-#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0))
-inline uint qHash(const QUrl &uri)
-{
-    return qHash(uri.toEncoded(QUrl::FormattingOption(0x100)));
-}
-#endif
-
-QmlCompositeTypeData::QmlCompositeTypeData()
-: status(Invalid), errorType(NoError), component(0), compiledComponent(0)
-{
-}
-
-QmlCompositeTypeData::~QmlCompositeTypeData()
-{
-    for (int ii = 0; ii < dependants.count(); ++ii)
-        dependants.at(ii)->release();
-
-    for (int ii = 0; ii < resources.count(); ++ii)
-        resources.at(ii)->release();
-
-    if (compiledComponent)
-        compiledComponent->release();
-
-    if (component) 
-        delete component;
-}
-
-QmlCompositeTypeResource::QmlCompositeTypeResource()
-{
-}
-
-QmlCompositeTypeResource::~QmlCompositeTypeResource()
-{
-    for (int ii = 0; ii < dependants.count(); ++ii)
-        dependants.at(ii)->release();
-}
-
-void QmlCompositeTypeData::addWaiter(QmlComponentPrivate *p)
-{
-    waiters << p;
-}
-
-void QmlCompositeTypeData::remWaiter(QmlComponentPrivate *p)
-{
-    waiters.removeAll(p);
-}
-
-QmlComponent *QmlCompositeTypeData::toComponent(QmlEngine *engine)
-{
-    if (!component) {
-
-        QmlCompiledData *cc = toCompiledComponent(engine);
-        if (cc) {
-            component = new QmlComponent(engine, cc, -1, -1, 0);
-            cc->release();
-        } else {
-            component = new QmlComponent(engine, 0);
-            component->d_func()->url = imports.baseUrl();
-            component->d_func()->state.errors = errors;
-        }
-
-    }
-
-    return component;
-}
-
-QmlCompiledData *
-QmlCompositeTypeData::toCompiledComponent(QmlEngine *engine)
-{
-    if (status == Complete && !compiledComponent) {
-
-        compiledComponent = new QmlCompiledData(engine);
-        compiledComponent->url = imports.baseUrl();
-        compiledComponent->name = compiledComponent->url.toString();
-
-        QmlCompiler compiler;
-        if (!compiler.compile(engine, this, compiledComponent)) {
-            status = Error;
-            errors = compiler.errors();
-            compiledComponent->release();
-            compiledComponent = 0;
-        }
-
-        // Data is no longer needed once we have a compiled component
-        data.clear();
-    }
-
-    if (compiledComponent)
-        compiledComponent->addref();
-
-    return compiledComponent;
-}
-
-QmlCompositeTypeData::TypeReference::TypeReference()
-: type(0), unit(0)
-{
-}
-
-QmlCompositeTypeManager::QmlCompositeTypeManager(QmlEngine *e)
-: engine(e)
-{
-}
-
-QmlCompositeTypeManager::~QmlCompositeTypeManager()
-{
-    for (Components::Iterator iter = components.begin(); iter != components.end();) {
-        (*iter)->release();
-        iter = components.erase(iter);
-    }
-    for (Resources::Iterator iter = resources.begin(); iter != resources.end();) {
-        (*iter)->release();
-        iter = resources.erase(iter);
-    }
-}
-
-QmlCompositeTypeData *QmlCompositeTypeManager::get(const QUrl &url)
-{
-    QmlCompositeTypeData *unit = components.value(url);
-
-    if (!unit) {
-        unit = new QmlCompositeTypeData;
-        unit->status = QmlCompositeTypeData::Waiting;
-        unit->progress = 0.0;
-        unit->imports.setBaseUrl(url);
-        components.insert(url, unit);
-
-        loadSource(unit);
-    }
-
-    unit->addref();
-    return unit;
-}
-
-QmlCompositeTypeData *
-QmlCompositeTypeManager::getImmediate(const QByteArray &data, const QUrl &url)
-{
-    QmlCompositeTypeData *unit = new QmlCompositeTypeData;
-    unit->status = QmlCompositeTypeData::Waiting;
-    unit->imports.setBaseUrl(url);
-    setData(unit, data, url);
-    return unit;
-}
-
-void QmlCompositeTypeManager::clearCache()
-{
-    for (Components::Iterator iter = components.begin(); iter != components.end();) {
-        if ((*iter)->status != QmlCompositeTypeData::Waiting) {
-            (*iter)->release();
-            iter = components.erase(iter);
-        } else {
-            ++iter;
-        }
-    }
-
-    for (Resources::Iterator iter = resources.begin(); iter != resources.end();) {
-        if ((*iter)->status != QmlCompositeTypeResource::Waiting) {
-            (*iter)->release();
-            iter = resources.erase(iter);
-        } else {
-            ++iter;
-        }
-    }
-}
-
-void QmlCompositeTypeManager::replyFinished()
-{
-    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
-
-    QmlCompositeTypeData *unit = components.value(reply->url());
-    Q_ASSERT(unit);
-
-    if (reply->error() != QNetworkReply::NoError) {
-        QString errorDescription;
-        // ### - Fill in error
-        errorDescription = QLatin1String("Network error for URL ") + 
-                      reply->url().toString();
-
-        unit->status = QmlCompositeTypeData::Error;
-        // ### FIXME
-        QmlError error;
-        error.setDescription(errorDescription);
-        unit->errorType = QmlCompositeTypeData::AccessError;
-        unit->errors << error;
-        doComplete(unit);
-
-    } else {
-        QByteArray data = reply->readAll();
-
-        setData(unit, data, reply->url());
-    }
-
-    reply->deleteLater();
-}
-
-void QmlCompositeTypeManager::resourceReplyFinished()
-{
-    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
-
-    QmlCompositeTypeResource *resource = resources.value(reply->url());
-    Q_ASSERT(resource);
-
-    if (reply->error() != QNetworkReply::NoError) {
-
-        resource->status = QmlCompositeTypeResource::Error;
-
-    } else {
-
-        resource->status = QmlCompositeTypeResource::Complete;
-        resource->data = reply->readAll();
-
-    }
-
-    doComplete(resource);
-    reply->deleteLater();
-}
-
-static QString toLocalFileOrQrc(const QUrl& url)
-{
-    QString r = url.toLocalFile();
-    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
-        r = QLatin1Char(':') + url.path();
-    return r;
-}
-
-void QmlCompositeTypeManager::loadResource(QmlCompositeTypeResource *resource)
-{
-    QUrl url(resource->url);
-
-    QString lf = toLocalFileOrQrc(url);
-    if (!lf.isEmpty()) {
-
-        QFile file(lf);
-        if (file.open(QFile::ReadOnly)) {
-            resource->data = file.readAll();
-            resource->status = QmlCompositeTypeResource::Complete;
-        } else {
-            resource->status = QmlCompositeTypeResource::Error;
-        }
-
-    } else {
-
-        QNetworkReply *reply = 
-            engine->networkAccessManager()->get(QNetworkRequest(url));
-        QObject::connect(reply, SIGNAL(finished()),
-                         this, SLOT(resourceReplyFinished()));
-
-    }
-}
-
-void QmlCompositeTypeManager::loadSource(QmlCompositeTypeData *unit)
-{
-    QUrl url(unit->imports.baseUrl());
-
-    QString lf = toLocalFileOrQrc(url);
-    if (!lf.isEmpty()) {
-
-        QFile file(lf);
-        if (file.open(QFile::ReadOnly)) {
-            QByteArray data = file.readAll();
-            setData(unit, data, url);
-        } else {
-            QString errorDescription;
-            // ### - Fill in error
-            errorDescription = QLatin1String("File error for URL ") + url.toString();
-            unit->status = QmlCompositeTypeData::Error;
-            // ### FIXME
-            QmlError error;
-            error.setDescription(errorDescription);
-            unit->errorType = QmlCompositeTypeData::AccessError;
-            unit->errors << error;
-            doComplete(unit);
-        }
-
-    } else {
-        QNetworkReply *reply = 
-            engine->networkAccessManager()->get(QNetworkRequest(url));
-        QObject::connect(reply, SIGNAL(finished()),
-                         this, SLOT(replyFinished()));
-        QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
-                         this, SLOT(requestProgress(qint64,qint64)));
-    }
-}
-
-void QmlCompositeTypeManager::requestProgress(qint64 received, qint64 total)
-{
-    if (total <= 0)
-        return;
-    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
-
-    QmlCompositeTypeData *unit = components.value(reply->url());
-    Q_ASSERT(unit);
-
-    unit->progress = qreal(received)/total;
-
-    foreach (QmlComponentPrivate *comp, unit->waiters)
-        comp->updateProgress(unit->progress);
-}
-
-void QmlCompositeTypeManager::setData(QmlCompositeTypeData *unit, 
-                                     const QByteArray &data,
-                                     const QUrl &url)
-{
-    bool ok = true;
-    if (!unit->data.parse(data, url)) {
-        ok = false;
-        unit->errors << unit->data.errors();
-    }
-
-    if (ok) {
-        compile(unit);
-    } else {
-        unit->status = QmlCompositeTypeData::Error;
-        unit->errorType = QmlCompositeTypeData::GeneralError;
-        doComplete(unit);
-    }
-}
-
-void QmlCompositeTypeManager::doComplete(QmlCompositeTypeData *unit)
-{
-    for (int ii = 0; ii < unit->dependants.count(); ++ii) {
-        checkComplete(unit->dependants.at(ii));
-        unit->dependants.at(ii)->release();
-    }
-    unit->dependants.clear();
-
-    while(!unit->waiters.isEmpty()) {
-        QmlComponentPrivate *p = unit->waiters.takeFirst();
-        p->typeDataReady();
-    }
-}
-
-void QmlCompositeTypeManager::doComplete(QmlCompositeTypeResource *resource)
-{
-    for (int ii = 0; ii < resource->dependants.count(); ++ii) {
-        checkComplete(resource->dependants.at(ii));
-        resource->dependants.at(ii)->release();
-    }
-    resource->dependants.clear();
-}
-
-void QmlCompositeTypeManager::checkComplete(QmlCompositeTypeData *unit)
-{
-    if (unit->status != QmlCompositeTypeData::Waiting
-     && unit->status != QmlCompositeTypeData::WaitingResources)
-        return;
-
-    int waiting = 0;
-    for (int ii = 0; ii < unit->resources.count(); ++ii) {
-        QmlCompositeTypeResource *r = unit->resources.at(ii);
-
-        if (!r)
-            continue;
-
-        if (r->status == QmlCompositeTypeResource::Error) {
-            unit->status = QmlCompositeTypeData::Error;
-            QmlError error;
-            error.setUrl(unit->imports.baseUrl());
-            error.setDescription(tr("Resource %1 unavailable").arg(r->url));
-            unit->errors << error;
-            doComplete(unit);
-            return;
-        } else if (r->status == QmlCompositeTypeResource::Waiting) {
-            waiting++;
-        }
-    }
-
-    if (waiting == 0) {
-        if (unit->status == QmlCompositeTypeData::WaitingResources) {
-            waiting += resolveTypes(unit);
-            if (unit->status != QmlCompositeTypeData::Error) {
-                if (waiting)
-                    unit->status = QmlCompositeTypeData::Waiting;
-            } else {
-                return;
-            }
-        } else {
-            for (int ii = 0; ii < unit->types.count(); ++ii) {
-                QmlCompositeTypeData *u = unit->types.at(ii).unit;
-
-                if (!u)
-                    continue;
-
-                if (u->status == QmlCompositeTypeData::Error) {
-                    unit->status = QmlCompositeTypeData::Error;
-                    unit->errors = u->errors;
-                    doComplete(unit);
-                    return;
-                } else if (u->status == QmlCompositeTypeData::Waiting) {
-                    waiting++;
-                }
-            }
-        }
-    }
-
-    if (!waiting) {
-        unit->status = QmlCompositeTypeData::Complete;
-        doComplete(unit);
-    }
-}
-
-int QmlCompositeTypeManager::resolveTypes(QmlCompositeTypeData *unit)
-{
-    // not called until all resources are loaded (they include import URLs)
-
-    int waiting = 0;
-
-    foreach (QmlScriptParser::Import imp, unit->data.imports()) {
-        QString qmldir;
-        if (imp.type == QmlScriptParser::Import::File && imp.qualifier.isEmpty()) {
-            QString importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir"))).toString();
-            for (int ii = 0; ii < unit->resources.count(); ++ii) {
-                if (unit->resources.at(ii)->url == importUrl) {
-                    qmldir = QString::fromUtf8(unit->resources.at(ii)->data);
-                    break;
-                }
-            }
-        }
-
-        int vmaj = -1;
-        int vmin = -1;
-        if (!imp.version.isEmpty()) {
-            int dot = imp.version.indexOf(QLatin1Char('.'));
-            if (dot < 0) {
-                vmaj = imp.version.toInt();
-                vmin = 0;
-            } else {
-                vmaj = imp.version.left(dot).toInt();
-                vmin = imp.version.mid(dot+1).toInt();
-            }
-        }
-
-        if (!QmlEnginePrivate::get(engine)->
-                addToImport(&unit->imports, qmldir, imp.uri, imp.qualifier, vmaj, vmin, imp.type))
-        {
-            QmlError error;
-            error.setUrl(unit->imports.baseUrl());
-            error.setDescription(tr("Import %1 unavailable").arg(imp.uri));
-            unit->status = QmlCompositeTypeData::Error;
-            unit->errorType = QmlCompositeTypeData::GeneralError;
-            unit->errors << error;
-            doComplete(unit);
-            return 0;
-        }
-    }
-
-    QList<QmlScriptParser::TypeReference*> types = unit->data.referencedTypes();
-
-    for (int ii = 0; ii < types.count(); ++ii) {
-        QmlScriptParser::TypeReference *parserRef = types.at(ii);
-        QByteArray typeName = parserRef->name.toUtf8();
-
-        QmlCompositeTypeData::TypeReference ref;
-
-        QUrl url;
-        int majorVersion;
-        int minorVersion;
-        QmlEnginePrivate::ImportedNamespace *typeNamespace = 0;
-        if (!QmlEnginePrivate::get(engine)->resolveType(unit->imports, typeName, &ref.type, &url, &majorVersion, &minorVersion, &typeNamespace)
-                || typeNamespace)
-        {
-            // Known to not be a type:
-            //  - known to be a namespace (Namespace {})
-            //  - type with unknown namespace (UnknownNamespace.SomeType {})
-            QmlError error;
-            error.setUrl(unit->imports.baseUrl());
-            if (typeNamespace)
-                error.setDescription(tr("Namespace %1 cannot be used as a type").arg(QString::fromUtf8(typeName)));
-            else
-                error.setDescription(tr("%1 is not a type").arg(QString::fromUtf8(typeName)));
-            if (!parserRef->refObjects.isEmpty()) {
-                QmlParser::Object *obj = parserRef->refObjects.first();
-                error.setLine(obj->location.start.line);
-                error.setColumn(obj->location.start.column);
-            }
-            unit->status = QmlCompositeTypeData::Error;
-            unit->errorType = QmlCompositeTypeData::GeneralError;
-            unit->errors << error;
-            doComplete(unit);
-            return 0;
-        }
-
-        if (ref.type) {
-            foreach (QmlParser::Object *obj, parserRef->refObjects) {
-               // store namespace for DOM
-               obj->majorVersion = majorVersion;
-               obj->minorVersion = minorVersion;
-            }
-            unit->types << ref;
-            continue;
-        }
-
-        QmlCompositeTypeData *urlUnit = components.value(url);
-
-        if (!urlUnit) {
-            urlUnit = new QmlCompositeTypeData;
-            urlUnit->status = QmlCompositeTypeData::Waiting;
-            urlUnit->imports.setBaseUrl(url);
-            components.insert(url, urlUnit);
-
-            loadSource(urlUnit);
-        }
-
-        ref.unit = urlUnit;
-        switch(urlUnit->status) {
-        case QmlCompositeTypeData::Invalid:
-        case QmlCompositeTypeData::Error:
-            unit->status = QmlCompositeTypeData::Error;
-            {
-                QmlError error;
-                error.setUrl(unit->imports.baseUrl());
-                error.setDescription(tr("Type %1 unavailable").arg(QString::fromUtf8(typeName)));
-                if (!parserRef->refObjects.isEmpty()) {
-                    QmlParser::Object *obj = parserRef->refObjects.first();
-                    error.setLine(obj->location.start.line);
-                    error.setColumn(obj->location.start.column);
-                }
-                unit->errors << error;
-            }
-            if (urlUnit->errorType != QmlCompositeTypeData::AccessError) 
-                unit->errors << urlUnit->errors;
-            doComplete(unit);
-            return 0;
-
-        case QmlCompositeTypeData::Complete:
-            break;
-
-        case QmlCompositeTypeData::Waiting:
-        case QmlCompositeTypeData::WaitingResources:
-            unit->addref();
-            ref.unit->dependants << unit;
-            waiting++;
-            break;
-        }
-
-        unit->types << ref;
-    }
-    return waiting;
-}
-
-// ### Check ref counting in here
-void QmlCompositeTypeManager::compile(QmlCompositeTypeData *unit)
-{
-    int waiting = 0;
-
-    QList<QUrl> resourceList = unit->data.referencedResources();
-
-    foreach (QmlScriptParser::Import imp, unit->data.imports()) {
-        if (imp.type == QmlScriptParser::Import::File && imp.qualifier.isEmpty()) {
-            QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir")));
-            if (toLocalFileOrQrc(importUrl).isEmpty()) {
-                // Import requires remote qmldir
-                resourceList.prepend(importUrl);
-            }
-        }
-    }
-
-    for (int ii = 0; ii < resourceList.count(); ++ii) {
-        QUrl url = unit->imports.baseUrl().resolved(resourceList.at(ii));
-
-        QmlCompositeTypeResource *resource = resources.value(url);
-
-        if (!resource) {
-            resource = new QmlCompositeTypeResource;
-            resource->status = QmlCompositeTypeResource::Waiting;
-            resource->url = url.toString();
-            resources.insert(url, resource);
-
-            loadResource(resource);
-        }
-
-        switch(resource->status) {
-        case QmlCompositeTypeResource::Invalid:
-        case QmlCompositeTypeResource::Error:
-            unit->status = QmlCompositeTypeData::Error;
-            {
-                QmlError error;
-                error.setUrl(unit->imports.baseUrl());
-                error.setDescription(tr("Resource %1 unavailable").arg(resource->url));
-                unit->errors << error;
-            }
-            doComplete(unit);
-            return;
-
-        case QmlCompositeTypeData::Complete:
-            break;
-
-        case QmlCompositeTypeData::Waiting:
-            unit->addref();
-            resource->dependants << unit;
-            waiting++;
-            break;
-        }
-
-        resource->addref();
-        unit->resources << resource;
-    }
-
-    if (waiting == 0) {
-        waiting += resolveTypes(unit);
-        if (unit->status != QmlCompositeTypeData::Error) {
-            if (!waiting) {
-                unit->status = QmlCompositeTypeData::Complete;
-                doComplete(unit);
-            } else {
-                unit->status = QmlCompositeTypeData::Waiting;
-            }
-        }
-    } else {
-        unit->status = QmlCompositeTypeData::WaitingResources;
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h
deleted file mode 100644
index 2da5d34..0000000
--- a/src/declarative/qml/qmlcompositetypemanager_p.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCOMPOSITETYPEMANAGER_P_H
-#define QMLCOMPOSITETYPEMANAGER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlscriptparser_p.h"
-#include "qmlrefcount_p.h"
-#include "qmlerror.h"
-#include "qmlengine.h"
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlCompiledData;
-class QmlComponentPrivate;
-class QmlComponent;
-class QmlDomDocument;
-
-class QmlCompositeTypeData;
-class QmlCompositeTypeResource;
-
-class QmlCompositeTypeManager : public QObject
-{
-    Q_OBJECT
-public:
-    QmlCompositeTypeManager(QmlEngine *);
-    ~QmlCompositeTypeManager();
-
-    // Return a QmlCompositeTypeData for url.  The QmlCompositeTypeData may be 
-    // cached.
-    QmlCompositeTypeData *get(const QUrl &url);
-    // Return a QmlCompositeTypeData for data, with the provided base url.  The
-   //  QmlCompositeTypeData will not be cached.
-    QmlCompositeTypeData *getImmediate(const QByteArray &data, const QUrl &url);
-
-    // Clear cached types.  Only types that aren't in the Waiting state will
-    // be cleared.
-    void clearCache();
-
-private Q_SLOTS:
-    void replyFinished();
-    void resourceReplyFinished();
-    void requestProgress(qint64 received, qint64 total);
-
-private:
-    void loadSource(QmlCompositeTypeData *);
-    void loadResource(QmlCompositeTypeResource *);
-    void compile(QmlCompositeTypeData *);
-    void setData(QmlCompositeTypeData *, const QByteArray &, const QUrl &);
-
-    void doComplete(QmlCompositeTypeData *);
-    void doComplete(QmlCompositeTypeResource *);
-    void checkComplete(QmlCompositeTypeData *);
-    int resolveTypes(QmlCompositeTypeData *);
-
-    QmlEngine *engine;
-    typedef QHash<QUrl, QmlCompositeTypeData *> Components;
-    Components components;
-    typedef QHash<QUrl, QmlCompositeTypeResource *> Resources;
-    Resources resources;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLCOMPOSITETYPEMANAGER_P_H
-
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
deleted file mode 100644
index 1718387..0000000
--- a/src/declarative/qml/qmlcontext.cpp
+++ /dev/null
@@ -1,574 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlcontext.h"
-#include "qmlcontext_p.h"
-
-#include "qmlexpression_p.h"
-#include "qmlengine_p.h"
-#include "qmlengine.h"
-#include "qmlcompiledbindings_p.h"
-#include "qmlinfo.h"
-
-#include <qscriptengine.h>
-#include <QtCore/qvarlengtharray.h>
-#include <QtCore/qdebug.h>
-
-#include <private/qscriptdeclarativeclass_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QmlContextPrivate::QmlContextPrivate()
-: parent(0), engine(0), isInternal(false), propertyNames(0), 
-  notifyIndex(-1), highPriorityCount(0), imports(0), expressions(0), contextObjects(0),
-  idValues(0), idValueCount(0), optimizedBindings(0)
-{
-}
-
-void QmlContextPrivate::addScript(const QmlParser::Object::ScriptBlock &script, QObject *scopeObject)
-{
-    Q_Q(QmlContext);
-
-    if (!engine) 
-        return;
-
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
-    scriptContext->pushScope(enginePriv->contextClass->newContext(q, scopeObject));
-    
-    QScriptValue scope = scriptEngine->newObject();
-    scriptContext->setActivationObject(scope);
-
-    for (int ii = 0; ii < script.codes.count(); ++ii) {
-        scriptEngine->evaluate(script.codes.at(ii), script.files.at(ii), script.lineNumbers.at(ii));
-
-        if (scriptEngine->hasUncaughtException()) {
-            QmlError error;
-            QmlExpressionPrivate::exceptionToError(scriptEngine, error);
-            qWarning().nospace() << qPrintable(error.toString());
-        }
-    }
-
-    scriptEngine->popContext();
-
-    scripts.append(scope);
-}
-
-void QmlContextPrivate::destroyed(ContextGuard *guard)
-{
-    Q_Q(QmlContext);
-
-    // process of being deleted (which is *probably* why obj has been destroyed
-    // anyway), as we're about to get deleted which will invalidate all the
-    // expressions that could depend on us
-    QObject *parent = q->parent();
-    if (parent && QObjectPrivate::get(parent)->wasDeleted) 
-        return;
-
-    while(guard->bindings) {
-        QObject *o = guard->bindings->target;
-        int mi = guard->bindings->methodIndex;
-        guard->bindings->clear();
-        if (o) o->qt_metacall(QMetaObject::InvokeMetaMethod, mi, 0);
-    }
-
-    for (int ii = 0; ii < idValueCount; ++ii) {
-        if (&idValues[ii] == guard) {
-            QMetaObject::activate(q, ii + notifyIndex, 0);
-            return;
-        }
-    }
-}
-
-void QmlContextPrivate::init()
-{
-    Q_Q(QmlContext);
-
-    if (parent) 
-        parent->d_func()->childContexts.insert(q);
-}
-
-/*!
-    \class QmlContext
-  \since 4.7
-    \brief The QmlContext class defines a context within a QML engine.
-    \mainclass
-
-    Contexts allow data to be exposed to the QML components instantiated by the
-    QML engine.
-
-    Each QmlContext contains a set of properties, distinct from
-    its QObject properties, that allow data to be
-    explicitly bound to a context by name.  The context properties are defined or
-    updated by calling QmlContext::setContextProperty().  The following example shows
-    a Qt model being bound to a context and then accessed from a QML file.
-
-    \code
-    QmlEngine engine;
-    QmlContext context(engine.rootContext());
-    context.setContextProperty("myModel", modelData);
-
-    QmlComponent component(&engine, "ListView { model=myModel }");
-    component.create(&context);
-    \endcode
-
-    To simplify binding and maintaining larger data sets, QObject's can be
-    added to a QmlContext.  These objects are known as the context's default
-    objects.  In this case all the properties of the QObject are
-    made available by name in the context, as though they were all individually
-    added by calling QmlContext::setContextProperty().  Changes to the property's
-    values are detected through the property's notify signal.  This method is
-    also slightly more faster than manually adding property values.
-
-    The following example has the same effect as the one above, but it is
-    achieved using a default object.
-
-    \code
-    class MyDataSet : ... {
-        ...
-        Q_PROPERTY(QAbstractItemModel *myModel READ model NOTIFY modelChanged)
-        ...
-    };
-
-    MyDataSet myDataSet;
-    QmlEngine engine;
-    QmlContext context(engine.rootContext());
-    context.addDefaultObject(&myDataSet);
-
-    QmlComponent component(&engine, "ListView { model=myModel }");
-    component.create(&context);
-    \endcode
-
-    Default objects added first take precedence over those added later.  All properties 
-    added explicitly by QmlContext::setContextProperty() take precedence over default 
-    object properties.
-
-    Contexts are hierarchal, with the \l {QmlEngine::rootContext()}{root context}
-    being created by the QmlEngine.  A component instantiated in a given context
-    has access to that context's data, as well as the data defined by its
-    ancestor contexts.  Data values (including those added implicitly by the
-    default objects) in a context override those in ancestor contexts.  Data
-    that should be available to all components instantiated by the QmlEngine
-    should be added to the \l {QmlEngine::rootContext()}{root context}.
-
-    In the following example,
-
-    \code
-    QmlEngine engine;
-    QmlContext context1(engine.rootContext());
-    QmlContext context2(&context1);
-    QmlContext context3(&context2);
-
-    context1.setContextProperty("a", 12);
-    context2.setContextProperty("b", 13);
-    context3.setContextProperty("a", 14);
-    context3.setContextProperty("c", 14);
-    \endcode
-
-    a QML component instantiated in context1 would have access to the "a" data,
-    a QML component instantiated in context2 would have access to the "a" and
-    "b" data, and a QML component instantiated in context3 would have access to
-    the "a", "b" and "c" data - although its "a" data would return 14, unlike
-    that in context1 or context2.
-*/
-
-/*! \internal */
-QmlContext::QmlContext(QmlEngine *e, bool)
-: QObject(*(new QmlContextPrivate))
-{
-    Q_D(QmlContext);
-    d->engine = e;
-    d->init();
-}
-
-/*!
-    Create a new QmlContext as a child of \a engine's root context, and the
-    QObject \a parent.
-*/
-QmlContext::QmlContext(QmlEngine *engine, QObject *parent)
-: QObject(*(new QmlContextPrivate), parent)
-{
-    Q_D(QmlContext);
-    QmlContext *parentContext = engine?engine->rootContext():0;
-    d->parent = parentContext;
-    d->engine = parentContext->engine();
-    d->init();
-}
-
-/*!
-    Create a new QmlContext with the given \a parentContext, and the
-    QObject \a parent.
-*/
-QmlContext::QmlContext(QmlContext *parentContext, QObject *parent)
-: QObject(*(new QmlContextPrivate), parent)
-{
-    Q_D(QmlContext);
-    d->parent = parentContext;
-    d->engine = parentContext->engine();
-    d->init();
-}
-
-/*!
-    \internal
-*/
-QmlContext::QmlContext(QmlContext *parentContext, QObject *parent, bool)
-: QObject(*(new QmlContextPrivate), parent)
-{
-    Q_D(QmlContext);
-    d->parent = parentContext;
-    d->engine = parentContext->engine();
-    d->isInternal = true;
-    d->init();
-}
-
-/*!
-    Destroys the QmlContext.
-
-    Any expressions, or sub-contexts dependent on this context will be
-    invalidated, but not destroyed (unless they are parented to the QmlContext
-    object).
- */
-QmlContext::~QmlContext()
-{
-    Q_D(QmlContext);
-    if (d->parent) 
-        d->parent->d_func()->childContexts.remove(this);
-
-    for (QSet<QmlContext *>::ConstIterator iter = d->childContexts.begin();
-            iter != d->childContexts.end();
-            ++iter) {
-        (*iter)->d_func()->invalidateEngines();
-        (*iter)->d_func()->parent = 0;
-    }
-
-    QmlAbstractExpression *expression = d->expressions;
-    while (expression) {
-        QmlAbstractExpression *nextExpression = expression->m_nextExpression;
-
-        expression->m_context = 0;
-        expression->m_prevExpression = 0;
-        expression->m_nextExpression = 0;
-
-        expression = nextExpression;
-    }
-
-    while (d->contextObjects) {
-        QmlDeclarativeData *co = d->contextObjects;
-        d->contextObjects = d->contextObjects->nextContextObject;
-
-        co->context = 0;
-        co->nextContextObject = 0;
-        co->prevContextObject = 0;
-    }
-
-    if (d->propertyNames)
-        d->propertyNames->release();
-
-    if (d->imports)
-        d->imports->release();
-
-    if (d->optimizedBindings)
-        d->optimizedBindings->release();
-
-    delete [] d->idValues;
-}
-
-void QmlContextPrivate::invalidateEngines()
-{
-    if (!engine)
-        return;
-    engine = 0;
-    for (QSet<QmlContext *>::ConstIterator iter = childContexts.begin();
-            iter != childContexts.end();
-            ++iter) {
-        (*iter)->d_func()->invalidateEngines();
-    }
-}
-
-/* 
-Refreshes all expressions that could possibly depend on this context.
-Refreshing flushes all context-tree dependent caches in the expressions, and should occur every
-time the context tree *structure* (not values) changes.
-*/
-void QmlContextPrivate::refreshExpressions()
-{
-    for (QSet<QmlContext *>::ConstIterator iter = childContexts.begin();
-            iter != childContexts.end();
-            ++iter) {
-        (*iter)->d_func()->refreshExpressions();
-    }
-
-    QmlAbstractExpression *expression = expressions;
-    while (expression) {
-        expression->refresh();
-        expression = expression->m_nextExpression;
-    }
-}
-
-/*!
-    Return the context's QmlEngine, or 0 if the context has no QmlEngine or the
-    QmlEngine was destroyed.
-*/
-QmlEngine *QmlContext::engine() const
-{
-    Q_D(const QmlContext);
-    return d->engine;
-}
-
-/*!
-    Return the context's parent QmlContext, or 0 if this context has no
-    parent or if the parent has been destroyed.
-*/
-QmlContext *QmlContext::parentContext() const
-{
-    Q_D(const QmlContext);
-    return d->parent;
-}
-
-/*!
-    Add \a defaultObject to this context.  The object will be added after
-    any existing default objects.
-*/
-void QmlContext::addDefaultObject(QObject *defaultObject)
-{
-    Q_D(QmlContext);
-    d->defaultObjects.prepend(defaultObject);
-}
-
-/*!
-    Set a the \a value of the \a name property on this context.
-*/
-void QmlContext::setContextProperty(const QString &name, const QVariant &value)
-{
-    Q_D(QmlContext);
-    if (d->notifyIndex == -1)
-        d->notifyIndex = this->metaObject()->methodCount();
-
-    if (d->engine) {
-        bool ok;
-        QObject *o = QmlEnginePrivate::get(d->engine)->toQObject(value, &ok);
-        if (ok) {
-            setContextProperty(name, o);
-            return;
-        }
-    }
-
-    if (!d->propertyNames) d->propertyNames = new QmlIntegerCache(d->engine);
-
-    int idx = d->propertyNames->value(name);
-    if (idx == -1) {
-        d->propertyNames->add(name, d->idValueCount + d->propertyValues.count());
-        d->propertyValues.append(value);
-
-        d->refreshExpressions();
-    } else {
-        d->propertyValues[idx] = value;
-        QMetaObject::activate(this, idx + d->notifyIndex, 0);
-    }
-}
-
-void QmlContextPrivate::setIdProperty(int idx, QObject *obj)
-{
-    if (notifyIndex == -1) {
-        Q_Q(QmlContext);
-        notifyIndex = q->metaObject()->methodCount();
-    }
-
-    idValues[idx].priv = this;
-    idValues[idx] = obj;
-}
-
-void QmlContextPrivate::setIdPropertyData(QmlIntegerCache *data)
-{
-    Q_ASSERT(!propertyNames);
-    propertyNames = data;
-    propertyNames->addref();
-
-    idValueCount = data->count();
-    idValues = new ContextGuard[idValueCount];
-}
-
-/*!
-    Set the \a value of the \a name property on this context.
-
-    QmlContext does \bold not take ownership of \a value.
-*/
-void QmlContext::setContextProperty(const QString &name, QObject *value)
-{
-    Q_D(QmlContext);
-    if (d->notifyIndex == -1)
-        d->notifyIndex = this->metaObject()->methodCount();
-
-    if (!d->propertyNames) d->propertyNames = new QmlIntegerCache(d->engine);
-    int idx = d->propertyNames->value(name);
-
-    if (idx == -1) {
-        d->propertyNames->add(name, d->idValueCount  + d->propertyValues.count());
-        d->propertyValues.append(QVariant::fromValue(value));
-
-        d->refreshExpressions();
-    } else {
-        d->propertyValues[idx] = QVariant::fromValue(value);
-        QMetaObject::activate(this, idx + d->notifyIndex, 0);
-    }
-}
-
-/*!
-  Returns the value of the \a name property for this context
-  as a QVariant.
- */
-QVariant QmlContext::contextProperty(const QString &name) const
-{
-    Q_D(const QmlContext);
-    QVariant value;
-    int idx = -1;
-    if (d->propertyNames)
-        idx = d->propertyNames->value(name);
-
-    if (idx == -1) {
-        QByteArray utf8Name = name.toUtf8();
-        for (int ii = d->defaultObjects.count() - 1; ii >= 0; --ii) {
-            QObject *obj = d->defaultObjects.at(ii);
-            QmlPropertyCache::Data local;
-            QmlPropertyCache::Data *property = QmlPropertyCache::property(d->engine, obj, name, local);
-
-            if (property) {
-                value = obj->metaObject()->property(property->coreIndex).read(obj);
-                break;
-            }
-        }
-        if (!value.isValid() && parentContext())
-            value = parentContext()->contextProperty(name);
-    } else {
-        value = d->propertyValues[idx];
-    }
-
-    return value;
-}
-
-/*!
-    Resolves the URL \a src relative to the URL of the
-    containing component.
-
-    \sa QmlEngine::baseUrl(), setBaseUrl()
-*/
-QUrl QmlContext::resolvedUrl(const QUrl &src)
-{
-    Q_D(QmlContext);
-    QmlContext *ctxt = this;
-    if (src.isRelative() && !src.isEmpty()) {
-        if (ctxt) {
-            while(ctxt) {
-                if(ctxt->d_func()->url.isValid())
-                    break;
-                else
-                    ctxt = ctxt->parentContext();
-            }
-
-            if (ctxt)
-                return ctxt->d_func()->url.resolved(src);
-            else if (d->engine)
-                return d->engine->baseUrl().resolved(src);
-        }
-        return QUrl();
-    } else {
-        return src;
-    }
-}
-
-/*!
-    Explicitly sets the url resolvedUrl() will use for relative references to \a baseUrl.
-
-    Calling this function will override the url of the containing
-    component used by default.
-
-    \sa resolvedUrl()
-*/
-void QmlContext::setBaseUrl(const QUrl &baseUrl)
-{
-    d_func()->url = baseUrl;
-}
-
-/*!
-    Returns the base url of the component, or the containing component
-    if none is set.
-*/
-QUrl QmlContext::baseUrl() const
-{
-    const QmlContext* p = this;
-    while (p && p->d_func()->url.isEmpty()) {
-        p = p->parentContext();
-    }
-    if (p)
-        return p->d_func()->url;
-    else
-        return QUrl();
-}
-
-int QmlContextPrivate::context_count(QmlListProperty<QObject> *prop)
-{
-    QmlContext *context = static_cast<QmlContext*>(prop->object);
-    QmlContextPrivate *d = QmlContextPrivate::get(context);
-    int contextProperty = (int)(intptr_t)prop->data;
-
-    if (d->propertyValues.at(contextProperty).userType() != qMetaTypeId<QList<QObject*> >()) {
-        return 0;
-    } else {
-        return ((const QList<QObject> *)d->propertyValues.at(contextProperty).constData())->count();
-    }
-}
-
-QObject *QmlContextPrivate::context_at(QmlListProperty<QObject> *prop, int index)
-{
-    QmlContext *context = static_cast<QmlContext*>(prop->object);
-    QmlContextPrivate *d = QmlContextPrivate::get(context);
-    int contextProperty = (int)(intptr_t)prop->data;
-
-    if (d->propertyValues.at(contextProperty).userType() != qMetaTypeId<QList<QObject*> >()) {
-        return 0;
-    } else {
-        return ((const QList<QObject*> *)d->propertyValues.at(contextProperty).constData())->at(index);
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcontext.h b/src/declarative/qml/qmlcontext.h
deleted file mode 100644
index e96ed84..0000000
--- a/src/declarative/qml/qmlcontext.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCONTEXT_H
-#define QMLCONTEXT_H
-
-#include <QtCore/qurl.h>
-#include <QtCore/qobject.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtCore/qmetatype.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QString;
-class QmlEngine;
-class QmlRefCount;
-class QmlContextPrivate;
-class QmlCompositeTypeData;
-
-class Q_DECLARATIVE_EXPORT QmlContext : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlContext)
-
-public:
-    QmlContext(QmlEngine *parent, QObject *objParent=0);
-    QmlContext(QmlContext *parent, QObject *objParent=0);
-    virtual ~QmlContext();
-
-    QmlEngine *engine() const;
-    QmlContext *parentContext() const;
-
-    void addDefaultObject(QObject *);
-    void setContextProperty(const QString &, QObject *);
-    void setContextProperty(const QString &, const QVariant &);
-
-    QVariant contextProperty(const QString &) const;
-
-    QUrl resolvedUrl(const QUrl &);
-
-    void setBaseUrl(const QUrl &);
-    QUrl baseUrl() const;
-
-private:
-    friend class QmlVME;
-    friend class QmlEngine;
-    friend class QmlEnginePrivate;
-    friend class QmlExpression;
-    friend class QmlExpressionPrivate;
-    friend class QmlContextScriptClass;
-    friend class QmlObjectScriptClass;
-    friend class QmlComponent;
-    friend class QmlComponentPrivate;
-    friend class QmlScriptPrivate;
-    friend class QmlBoundSignalProxy;
-    QmlContext(QmlContext *parent, QObject *objParent, bool);
-    QmlContext(QmlEngine *, bool);
-};
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QList<QObject*>);
-
-QT_END_HEADER
-
-#endif // QMLCONTEXT_H
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
deleted file mode 100644
index 965eeed..0000000
--- a/src/declarative/qml/qmlcontext_p.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCONTEXT_P_H
-#define QMLCONTEXT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlcontext.h"
-
-#include "qmldeclarativedata_p.h"
-#include "qmlengine_p.h"
-#include "qmlintegercache_p.h"
-#include "qmltypenamecache_p.h"
-
-#include <QtCore/qhash.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtCore/qset.h>
-
-#include <private/qobject_p.h>
-#include "qmlguard_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlContext;
-class QmlExpression;
-class QmlEngine;
-class QmlExpression;
-class QmlExpressionPrivate;
-class QmlAbstractExpression;
-class QmlBinding_Id;
-class QmlCompiledBindings;
-
-class Q_DECLARATIVE_EXPORT QmlContextPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlContext)
-public:
-    QmlContextPrivate();
-
-    QmlContext *parent;
-    QmlEngine *engine;
-
-    bool isInternal;
-
-    QmlIntegerCache *propertyNames;
-    QList<QVariant> propertyValues;
-    int notifyIndex;
-
-    QObjectList defaultObjects;
-    int highPriorityCount;
-
-    QList<QScriptValue> scripts;
-    void addScript(const QmlParser::Object::ScriptBlock &, QObject *);
-
-    QUrl url;
-
-    QmlTypeNameCache *imports;
-
-    void init();
-
-    void invalidateEngines();
-    void refreshExpressions();
-    QSet<QmlContext *> childContexts;
-
-    QmlAbstractExpression *expressions;
-
-    QmlDeclarativeData *contextObjects;
-
-    struct IdNotifier 
-    {
-        inline IdNotifier();
-        inline ~IdNotifier();
-        
-        inline void clear();
-
-        IdNotifier *next;
-        IdNotifier**prev;
-        QObject *target;
-        int methodIndex;
-    };
-
-    struct ContextGuard : public QmlGuard<QObject>
-    {
-        inline ContextGuard();
-        inline ContextGuard &operator=(QObject *obj);
-        inline virtual void objectDestroyed(QObject *);
-
-        QmlContextPrivate *priv;
-        IdNotifier *bindings;
-    };
-    ContextGuard *idValues;
-    int idValueCount;
-    void setIdProperty(int, QObject *);
-    void setIdPropertyData(QmlIntegerCache *);
-    void destroyed(ContextGuard *);
-
-    static QmlContextPrivate *get(QmlContext *context) {
-        return static_cast<QmlContextPrivate *>(QObjectPrivate::get(context));
-    }
-    static QmlContext *get(QmlContextPrivate *context) {
-        return static_cast<QmlContext *>(context->q_func());
-    }
-
-    QmlCompiledBindings *optimizedBindings;
-
-    // Only used for debugging
-    QList<QPointer<QObject> > instances;
-
-    static int context_count(QmlListProperty<QObject> *);
-    static QObject *context_at(QmlListProperty<QObject> *, int);
-};
-
-QmlContextPrivate::IdNotifier::IdNotifier()
-: next(0), prev(0), target(0), methodIndex(-1)
-{
-}
-
-QmlContextPrivate::IdNotifier::~IdNotifier()
-{
-    clear();
-}
-
-void QmlContextPrivate::IdNotifier::clear()
-{
-    if (next) next->prev = prev;
-    if (prev) *prev = next;
-    next = 0; prev = 0; target = 0;
-    methodIndex = -1;
-}
-
-QmlContextPrivate::ContextGuard::ContextGuard() 
-: priv(0), bindings(0) 
-{
-}
-
-QmlContextPrivate::ContextGuard &QmlContextPrivate::ContextGuard::operator=(QObject *obj) 
-{
-    (QmlGuard<QObject>&)*this = obj; return *this;
-}
-
-void QmlContextPrivate::ContextGuard::objectDestroyed(QObject *) 
-{ 
-    priv->destroyed(this); 
-}
-
-QT_END_NAMESPACE
-
-#endif // QMLCONTEXT_P_H
diff --git a/src/declarative/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp
deleted file mode 100644
index 4c71903..0000000
--- a/src/declarative/qml/qmlcontextscriptclass.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlcontextscriptclass_p.h"
-
-#include "qmlengine_p.h"
-#include "qmlcontext_p.h"
-#include "qmltypenamescriptclass_p.h"
-#include "qmllistscriptclass_p.h"
-#include "qmlguard_p.h"
-
-QT_BEGIN_NAMESPACE
-
-struct ContextData : public QScriptDeclarativeClass::Object {
-    ContextData() : isSharedContext(true) {}
-    ContextData(QmlContext *c, QObject *o) : context(c), scopeObject(o), isSharedContext(false) {}
-    QmlGuard<QmlContext> context;
-    QmlGuard<QObject> scopeObject;
-    bool isSharedContext;
-
-    QmlContext *getContext(QmlEngine *engine) {
-        if (isSharedContext) {
-            return QmlEnginePrivate::get(engine)->sharedContext;
-        } else {
-            return context.data();
-        }
-    }
-
-    QObject *getScope(QmlEngine *engine) {
-        if (isSharedContext) {
-            return QmlEnginePrivate::get(engine)->sharedScope;
-        } else {
-            return scopeObject.data();
-        }
-    }
-};
-
-/*
-    The QmlContextScriptClass handles property access for a QmlContext
-    via QtScript.
- */
-QmlContextScriptClass::QmlContextScriptClass(QmlEngine *bindEngine)
-: QmlScriptClass(QmlEnginePrivate::getScriptEngine(bindEngine)), engine(bindEngine),
-  lastScopeObject(0), lastContext(0), lastData(0), lastPropertyIndex(-1), lastDefaultObject(-1)
-{
-}
-
-QmlContextScriptClass::~QmlContextScriptClass()
-{
-}
-
-QScriptValue QmlContextScriptClass::newContext(QmlContext *context, QObject *scopeObject)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    return newObject(scriptEngine, this, new ContextData(context, scopeObject));
-}
-
-QScriptValue QmlContextScriptClass::newSharedContext()
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    return newObject(scriptEngine, this, new ContextData());
-}
-
-QmlContext *QmlContextScriptClass::contextFromValue(const QScriptValue &v)
-{
-    if (scriptClass(v) != this)
-        return 0;
-
-    ContextData *data = (ContextData *)object(v);
-    return data->getContext(engine);
-}
-
-QScriptClass::QueryFlags 
-QmlContextScriptClass::queryProperty(Object *object, const Identifier &name, 
-                                     QScriptClass::QueryFlags flags)
-{
-    Q_UNUSED(flags);
-    
-    lastScopeObject = 0;
-    lastContext = 0;
-    lastData = 0;
-    lastPropertyIndex = -1;
-    lastDefaultObject = -1;
-
-    QmlContext *bindContext = ((ContextData *)object)->getContext(engine);
-    QObject *scopeObject = ((ContextData *)object)->getScope(engine);
-    if (!bindContext)
-        return 0;
-
-    bool includeTypes = true;
-    while (bindContext) {
-        QScriptClass::QueryFlags rv = 
-            queryProperty(bindContext, scopeObject, name, flags, includeTypes);
-        scopeObject = 0; // Only applies to the first context
-        includeTypes = false; // Only applies to the first context
-        if (rv) return rv;
-        bindContext = bindContext->parentContext();
-    }
-
-    return 0;
-}
-
-QScriptClass::QueryFlags 
-QmlContextScriptClass::queryProperty(QmlContext *bindContext, QObject *scopeObject,
-                                     const Identifier &name,
-                                     QScriptClass::QueryFlags flags, 
-                                     bool includeTypes)
-{
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-    QmlContextPrivate *cp = QmlContextPrivate::get(bindContext);
-
-    lastPropertyIndex = cp->propertyNames?cp->propertyNames->value(name):-1;
-    if (lastPropertyIndex != -1) {
-        lastContext = bindContext;
-        return QScriptClass::HandlesReadAccess;
-    }
-
-    if (includeTypes && cp->imports) { 
-        QmlTypeNameCache::Data *data = cp->imports->data(name);
-
-        if (data)  {
-            lastData = data;
-            lastContext = bindContext;
-            return QScriptClass::HandlesReadAccess;
-        }
-    }
-
-    for (int ii = 0; ii < cp->scripts.count(); ++ii) {
-        lastFunction = QScriptDeclarativeClass::function(cp->scripts.at(ii), name);
-        if (lastFunction.isValid()) {
-            lastContext = bindContext;
-            return QScriptClass::HandlesReadAccess;
-        }
-    }
-
-    if (scopeObject) {
-        QScriptClass::QueryFlags rv = 
-            ep->objectClass->queryProperty(scopeObject, name, flags, bindContext, 
-                                           QmlObjectScriptClass::ImplicitObject | QmlObjectScriptClass::SkipAttachedProperties);
-        if (rv) {
-            lastScopeObject = scopeObject;
-            lastContext = bindContext;
-            return rv;
-        }
-    }
-
-    for (int ii = cp->defaultObjects.count() - 1; ii >= 0; --ii) {
-        QScriptClass::QueryFlags rv = 
-            ep->objectClass->queryProperty(cp->defaultObjects.at(ii), name, flags, bindContext, 
-                                           QmlObjectScriptClass::ImplicitObject | QmlObjectScriptClass::SkipAttachedProperties);
-
-        if (rv) {
-            lastDefaultObject = ii;
-            lastContext = bindContext;
-            return rv;
-        }
-    }
-
-    return 0;
-}
-
-QmlContextScriptClass::ScriptValue
-QmlContextScriptClass::property(Object *object, const Identifier &name)
-{
-    Q_UNUSED(object);
-
-    QmlContext *bindContext = lastContext;
-    Q_ASSERT(bindContext);
-
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-    QmlContextPrivate *cp = QmlContextPrivate::get(bindContext);
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    if (lastScopeObject) {
-
-        return ep->objectClass->property(lastScopeObject, name);
-
-    } else if (lastData) {
-
-        if (lastData->type)
-            return Value(scriptEngine, ep->typeNameClass->newObject(cp->defaultObjects.at(0), lastData->type));
-        else
-            return Value(scriptEngine, ep->typeNameClass->newObject(cp->defaultObjects.at(0), lastData->typeNamespace));
-
-    } else if (lastPropertyIndex != -1) {
-
-        QScriptValue rv;
-        if (lastPropertyIndex < cp->idValueCount) {
-            rv =  ep->objectClass->newQObject(cp->idValues[lastPropertyIndex].data());
-        } else {
-            const QVariant &value = cp->propertyValues.at(lastPropertyIndex);
-            if (value.userType() == qMetaTypeId<QList<QObject*> >()) {
-                rv = ep->listClass->newList(QmlListProperty<QObject>(bindContext, (void*)lastPropertyIndex, 0, QmlContextPrivate::context_count, QmlContextPrivate::context_at), qMetaTypeId<QmlListProperty<QObject> >());
-            } else {
-                rv = ep->scriptValueFromVariant(value);
-            }
-        }
-
-        ep->capturedProperties << 
-            QmlEnginePrivate::CapturedProperty(bindContext, -1, lastPropertyIndex + cp->notifyIndex);
-
-        return Value(scriptEngine, rv);
-    } else if(lastDefaultObject != -1) {
-
-        // Default object property
-        return ep->objectClass->property(cp->defaultObjects.at(lastDefaultObject), name);
-
-    } else {
-
-        return Value(scriptEngine, lastFunction);
-
-    }
-}
-
-void QmlContextScriptClass::setProperty(Object *object, const Identifier &name, 
-                                        const QScriptValue &value)
-{
-    Q_UNUSED(object);
-    Q_ASSERT(lastScopeObject || lastDefaultObject != -1);
-
-    QmlContext *bindContext = lastContext;
-    Q_ASSERT(bindContext);
-
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-    QmlContextPrivate *cp = QmlContextPrivate::get(bindContext);
-
-    if (lastScopeObject) {
-        ep->objectClass->setProperty(lastScopeObject, name, value, bindContext);
-    } else {
-        ep->objectClass->setProperty(cp->defaultObjects.at(lastDefaultObject), name, value,
-                                     bindContext);
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcontextscriptclass_p.h b/src/declarative/qml/qmlcontextscriptclass_p.h
deleted file mode 100644
index c878f3c..0000000
--- a/src/declarative/qml/qmlcontextscriptclass_p.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCONTEXTSCRIPTCLASS_P_H
-#define QMLCONTEXTSCRIPTCLASS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmltypenamecache_p.h"
-#include "qmlscriptclass_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QmlContext;
-class QmlContextScriptClass : public QmlScriptClass
-{
-public:
-    QmlContextScriptClass(QmlEngine *);
-    ~QmlContextScriptClass();
-
-    QScriptValue newContext(QmlContext *, QObject * = 0);
-    QScriptValue newSharedContext();
-
-    QmlContext *contextFromValue(const QScriptValue &);
-
-protected:
-    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
-                                                   QScriptClass::QueryFlags flags);
-    virtual ScriptValue property(Object *, const Identifier &);
-    virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
-
-private:
-    QScriptClass::QueryFlags queryProperty(QmlContext *, QObject *scopeObject, 
-                                           const Identifier &,
-                                           QScriptClass::QueryFlags flags,
-                                           bool includeTypes);
-
-    QmlEngine *engine;
-
-    QObject *lastScopeObject;
-    QmlContext *lastContext;
-    QmlTypeNameCache::Data *lastData;
-    int lastPropertyIndex;
-    int lastDefaultObject;
-    QScriptValue lastFunction;
-
-    uint m_id;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLCONTEXTSCRIPTCLASS_P_H
-
diff --git a/src/declarative/qml/qmlcustomparser.cpp b/src/declarative/qml/qmlcustomparser.cpp
deleted file mode 100644
index 8e52b72..0000000
--- a/src/declarative/qml/qmlcustomparser.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlcustomparser_p.h"
-#include "qmlcustomparser_p_p.h"
-
-#include "qmlparser_p.h"
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QmlParser;
-
-/*!
-    \class QmlCustomParser
-    \brief The QmlCustomParser class allows you to add new arbitrary types to QML.
-    \internal
-
-    By subclassing QmlCustomParser, you can add a parser for
-    building a particular type.
-
-    The subclass must implement compile() and setCustomData(), and register
-    itself in the meta type system by calling the macro:
-
-    \code
-    QML_REGISTER_CUSTOM_TYPE(Module, MajorVersion, MinorVersion, Name, TypeClass, ParserClass)
-    \endcode
-*/
-
-/*
-    \fn QByteArray QmlCustomParser::compile(const QList<QmlCustomParserProperty> & properties)
-
-    The custom parser processes \a properties, and returns
-    a QByteArray containing data meaningful only to the
-    custom parser; the type engine will pass this same data to
-    setCustomData() when making an instance of the data.
-
-    Errors must be reported via the error() functions.
-
-    The QByteArray may be cached between executions of the system, so
-    it must contain correctly-serialized data (not, for example,
-    pointers to stack objects).
-*/
-
-/*
-    \fn void QmlCustomParser::setCustomData(QObject *object, const QByteArray &data)
-
-    This function sets \a object to have the properties defined
-    by \a data, which is a block of data previously returned by a call
-    to compile().
-
-    The \a object will be an instance of the TypeClass specified by QML_REGISTER_CUSTOM_TYPE.
-*/
-
-QmlCustomParserNode 
-QmlCustomParserNodePrivate::fromObject(QmlParser::Object *root)
-{
-    QmlCustomParserNode rootNode;
-    rootNode.d->name = root->typeName;
-    rootNode.d->location = root->location.start;
-
-    for(QHash<QByteArray, Property *>::Iterator iter = root->properties.begin();
-        iter != root->properties.end();
-        ++iter) {
-
-        Property *p = *iter;
-
-        rootNode.d->properties << fromProperty(p);
-    }
-
-    return rootNode;
-}
-
-QmlCustomParserProperty 
-QmlCustomParserNodePrivate::fromProperty(QmlParser::Property *p)
-{
-    QmlCustomParserProperty prop;
-    prop.d->name = p->name;
-    prop.d->isList = (p->values.count() > 1);
-    prop.d->location = p->location.start;
-
-    if (p->value) {
-        QmlCustomParserNode node = fromObject(p->value);
-        QList<QmlCustomParserProperty> props = node.properties();
-        for (int ii = 0; ii < props.count(); ++ii)
-            prop.d->values << QVariant::fromValue(props.at(ii));
-    } else {
-        for(int ii = 0; ii < p->values.count(); ++ii) {
-            Value *v = p->values.at(ii);
-            v->type = QmlParser::Value::Literal;
-
-            if(v->object) {
-                QmlCustomParserNode node = fromObject(v->object);
-                prop.d->values << QVariant::fromValue(node);
-            } else {
-                prop.d->values << QVariant::fromValue(v->value);
-            }
-
-        }
-    }
-
-    return prop;
-}
-
-QmlCustomParserNode::QmlCustomParserNode()
-: d(new QmlCustomParserNodePrivate)
-{
-}
-
-QmlCustomParserNode::QmlCustomParserNode(const QmlCustomParserNode &other)
-: d(new QmlCustomParserNodePrivate)
-{
-    *this = other;
-}
-
-QmlCustomParserNode &QmlCustomParserNode::operator=(const QmlCustomParserNode &other)
-{
-    d->name = other.d->name;
-    d->properties = other.d->properties;
-    d->location = other.d->location;
-    return *this;
-}
-
-QmlCustomParserNode::~QmlCustomParserNode()
-{
-    delete d; d = 0;
-}
-
-QByteArray QmlCustomParserNode::name() const
-{
-    return d->name;
-}
-
-QList<QmlCustomParserProperty> QmlCustomParserNode::properties() const
-{
-    return d->properties;
-}
-
-QmlParser::Location QmlCustomParserNode::location() const
-{
-    return d->location;
-}
-
-QmlCustomParserProperty::QmlCustomParserProperty()
-: d(new QmlCustomParserPropertyPrivate)
-{
-}
-
-QmlCustomParserProperty::QmlCustomParserProperty(const QmlCustomParserProperty &other)
-: d(new QmlCustomParserPropertyPrivate)
-{
-    *this = other;
-}
-
-QmlCustomParserProperty &QmlCustomParserProperty::operator=(const QmlCustomParserProperty &other)
-{
-    d->name = other.d->name;
-    d->isList = other.d->isList;
-    d->values = other.d->values;
-    d->location = other.d->location;
-    return *this;
-}
-
-QmlCustomParserProperty::~QmlCustomParserProperty()
-{
-    delete d; d = 0;
-}
-
-QByteArray QmlCustomParserProperty::name() const
-{
-    return d->name;
-}
-
-bool QmlCustomParserProperty::isList() const
-{
-    return d->isList;
-}
-
-QmlParser::Location QmlCustomParserProperty::location() const
-{
-    return d->location;
-}
-
-QList<QVariant> QmlCustomParserProperty::assignedValues() const
-{
-    return d->values;
-}
-
-void QmlCustomParser::clearErrors()
-{
-    exceptions.clear();
-}
-
-/*!
-    Reports an error in parsing \a prop, with the given \a description.
-
-    An error is generated referring to the position of \a node in the source file.
-*/
-void QmlCustomParser::error(const QmlCustomParserProperty& prop, const QString& description)
-{
-    QmlError error;
-    QString exceptionDescription;
-    error.setLine(prop.location().line);
-    error.setColumn(prop.location().column);
-    error.setDescription(description);
-    exceptions << error;
-}
-
-/*!
-    Reports an error in parsing \a node, with the given \a description.
-
-    An error is generated referring to the position of \a node in the source file.
-*/
-void QmlCustomParser::error(const QmlCustomParserNode& node, const QString& description)
-{
-    QmlError error;
-    QString exceptionDescription;
-    error.setLine(node.location().line);
-    error.setColumn(node.location().column);
-    error.setDescription(description);
-    exceptions << error;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
deleted file mode 100644
index e198712..0000000
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCUSTOMPARSER_H
-#define QMLCUSTOMPARSER_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlmetatype.h"
-#include "qmlerror.h"
-#include "qmlparser_p.h"
-
-#include <QtCore/qbytearray.h>
-#include <QtCore/qxmlstream.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlCustomParserPropertyPrivate;
-class Q_DECLARATIVE_EXPORT QmlCustomParserProperty
-{
-public:
-    QmlCustomParserProperty();
-    QmlCustomParserProperty(const QmlCustomParserProperty &);
-    QmlCustomParserProperty &operator=(const QmlCustomParserProperty &);
-    ~QmlCustomParserProperty();
-
-    QByteArray name() const;
-    QmlParser::Location location() const;
-
-    bool isList() const;
-    // Will be one of QmlParser::Variant, QmlCustomParserProperty or 
-    // QmlCustomParserNode
-    QList<QVariant> assignedValues() const;
-
-private:
-    friend class QmlCustomParserNodePrivate;
-    friend class QmlCustomParserPropertyPrivate;
-    QmlCustomParserPropertyPrivate *d;
-};
-
-class QmlCustomParserNodePrivate;
-class Q_DECLARATIVE_EXPORT QmlCustomParserNode
-{
-public:
-    QmlCustomParserNode();
-    QmlCustomParserNode(const QmlCustomParserNode &);
-    QmlCustomParserNode &operator=(const QmlCustomParserNode &);
-    ~QmlCustomParserNode();
-
-    QByteArray name() const;
-    QmlParser::Location location() const;
-
-    QList<QmlCustomParserProperty> properties() const;
-
-private:
-    friend class QmlCustomParserNodePrivate;
-    QmlCustomParserNodePrivate *d;
-};
-
-class Q_DECLARATIVE_EXPORT QmlCustomParser
-{
-public:
-    virtual ~QmlCustomParser() {}
-
-    void clearErrors();
-
-    virtual QByteArray compile(const QList<QmlCustomParserProperty> &)=0;
-    virtual void setCustomData(QObject *, const QByteArray &)=0;
-
-    QList<QmlError> errors() const { return exceptions; }
-
-protected:
-    void error(const QmlCustomParserProperty&, const QString& description);
-    void error(const QmlCustomParserNode&, const QString& description);
-
-private:
-    QList<QmlError> exceptions;
-};
-
-#define QML_REGISTER_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, CUSTOMTYPE) \
-            qmlRegisterCustomType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE, new CUSTOMTYPE)
-
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QmlCustomParserProperty)
-Q_DECLARE_METATYPE(QmlCustomParserNode)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/qml/qmlcustomparser_p_p.h b/src/declarative/qml/qmlcustomparser_p_p.h
deleted file mode 100644
index 52e7b4f..0000000
--- a/src/declarative/qml/qmlcustomparser_p_p.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCUSTOMPARSER_P_H
-#define QMLCUSTOMPARSER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlcustomparser_p.h"
-
-#include "qmlparser_p.h"
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlCustomParserNodePrivate
-{
-public:
-    QByteArray name;
-    QList<QmlCustomParserProperty> properties;
-    QmlParser::Location location;
-
-    static QmlCustomParserNode fromObject(QmlParser::Object *);
-    static QmlCustomParserProperty fromProperty(QmlParser::Property *);
-};
-
-class QmlCustomParserPropertyPrivate
-{
-public:
-    QmlCustomParserPropertyPrivate()
-        : isList(false) {}
-
-    QByteArray name;
-    bool isList;
-    QmlParser::Location location;
-    QList<QVariant> values;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLCUSTOMPARSER_P_H
diff --git a/src/declarative/qml/qmldeclarativedata_p.h b/src/declarative/qml/qmldeclarativedata_p.h
deleted file mode 100644
index efdc5fd..0000000
--- a/src/declarative/qml/qmldeclarativedata_p.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLDECLARATIVEDATA_P_H
-#define QMLDECLARATIVEDATA_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtScript/qscriptvalue.h>
-#include <private/qobject_p.h>
-#include "qmlguard_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlCompiledData;
-class QmlAbstractBinding;
-class QmlContext;
-class QmlPropertyCache;
-class Q_AUTOTEST_EXPORT QmlDeclarativeData : public QDeclarativeData
-{
-public:
-    QmlDeclarativeData(QmlContext *ctxt = 0)
-        : context(ctxt), bindings(0), nextContextObject(0), prevContextObject(0),
-          bindingBitsSize(0), bindingBits(0), outerContext(0), lineNumber(0), 
-          columnNumber(0), deferredComponent(0), deferredIdx(0), attachedProperties(0), 
-          propertyCache(0), guards(0) {}
-
-    virtual void destroyed(QObject *);
-
-    QmlContext *context;
-    QmlAbstractBinding *bindings;
-
-    // Linked list for QmlContext::contextObjects
-    QmlDeclarativeData *nextContextObject;
-    QmlDeclarativeData**prevContextObject;
-
-    int bindingBitsSize;
-    quint32 *bindingBits; 
-    bool hasBindingBit(int) const;
-    void clearBindingBit(int);
-    void setBindingBit(QObject *obj, int);
-
-    QmlContext *outerContext; // Can't this be found from context?
-    ushort lineNumber;
-    ushort columnNumber;
-
-    QmlCompiledData *deferredComponent; // Can't this be found from the context?
-    unsigned int deferredIdx;
-
-    QHash<int, QObject *> *attachedProperties;
-
-    QScriptValue scriptValue;
-    QmlPropertyCache *propertyCache;
-
-    QmlGuard<QObject> *guards;
-
-    static QmlDeclarativeData *get(const QObject *object, bool create = false) {
-        QObjectPrivate *priv = QObjectPrivate::get(const_cast<QObject *>(object));
-        if (priv->declarativeData) {
-            return static_cast<QmlDeclarativeData *>(priv->declarativeData);
-        } else if (create) {
-            priv->declarativeData = new QmlDeclarativeData;
-            return static_cast<QmlDeclarativeData *>(priv->declarativeData);
-        } else {
-            return 0;
-        }
-    }
-};
-
-template<class T>
-void QmlGuard<T>::addGuard()
-{
-    QmlDeclarativeData *data = QmlDeclarativeData::get(o, true);
-    next = data->guards;
-    if (next) reinterpret_cast<QmlGuard<T> *>(next)->prev = &next;
-    data->guards = reinterpret_cast<QmlGuard<QObject> *>(this);
-    prev = &data->guards;
-}
-
-template<class T>
-void QmlGuard<T>::remGuard()
-{
-    if (next) reinterpret_cast<QmlGuard<T> *>(next)->prev = prev;
-    *prev = next;
-    next = 0;
-    prev = 0;
-}
-
-QT_END_NAMESPACE
-
-#endif // QMLDECLARATIVEDATA_P_H
diff --git a/src/declarative/qml/qmldirparser.cpp b/src/declarative/qml/qmldirparser.cpp
deleted file mode 100644
index 60beb72..0000000
--- a/src/declarative/qml/qmldirparser.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmldirparser_p.h"
-#include "qmlerror.h"
-
-#include <QtCore/QTextStream>
-#include <QtCore/QtDebug>
-
-QT_BEGIN_NAMESPACE
-
-QmlDirParser::QmlDirParser()
-    : _isParsed(false)
-{
-}
-
-QmlDirParser::~QmlDirParser()
-{
-}
-
-QUrl QmlDirParser::url() const
-{
-    return _url;
-}
-
-void QmlDirParser::setUrl(const QUrl &url)
-{
-    _url = url;
-}
-
-QString QmlDirParser::source() const
-{
-    return _source;
-}
-
-void QmlDirParser::setSource(const QString &source)
-{
-    _isParsed = false;
-    _source = source;
-}
-
-bool QmlDirParser::isParsed() const
-{
-    return _isParsed;
-}
-
-bool QmlDirParser::parse()
-{
-    if (_isParsed)
-        return true;
-
-    _isParsed = true;
-    _errors.clear();
-    _plugins.clear();
-    _components.clear();
-
-    QTextStream stream(&_source);
-    int lineNumber = 0;
-
-    forever {
-        ++lineNumber;
-
-        const QString line = stream.readLine();
-        if (line.isNull())
-            break;
-
-        QString sections[3];
-        int sectionCount = 0;
-
-        int index = 0;
-        const int length = line.length();
-
-        while (index != length) {
-            const QChar ch = line.at(index);
-
-            if (ch.isSpace()) {
-                do { ++index; }
-                while (index != length && line.at(index).isSpace());
-
-            } else if (ch == QLatin1Char('#')) {
-                // recognized a comment
-                break;
-
-            } else {
-                const int start = index;
-
-                do { ++index; }
-                while (index != length && !line.at(index).isSpace());
-
-                const QString lexeme = line.mid(start, index - start);
-
-                if (sectionCount >= 3) {
-                    reportError(lineNumber, start, QLatin1String("unexpected token"));
-
-                } else {
-                    sections[sectionCount++] = lexeme;
-                }
-            }
-        }
-
-        if (sectionCount == 0) {
-            continue; // no sections, no party.
-
-        } else if (sections[0] == QLatin1String("plugin")) {
-            if (sectionCount < 2) {
-                reportError(lineNumber, -1,
-                            QString::fromUtf8("plugin directive requires 2 arguments, but %1 were provided").arg(sectionCount + 1));
-
-                continue;
-            }
-
-            const Plugin entry(sections[1], sections[2]);
-
-            _plugins.append(entry);
-
-        } else if (sectionCount == 3) {
-            const QString &version = sections[1];
-            const int dotIndex = version.indexOf(QLatin1Char('.'));
-
-            if (dotIndex == -1) {
-                qWarning() << "expected '.'"; // ### use reportError
-
-            } else if (version.indexOf(QLatin1Char('.'), dotIndex + 1) != -1) {
-                qWarning() << "unexpected '.'"; // ### use reportError
-
-            } else {
-                bool validVersionNumber = false;
-                const int majorVersion = version.left(dotIndex).toInt(&validVersionNumber);
-
-                if (validVersionNumber) {
-                    const int minorVersion = version.mid(dotIndex + 1).toInt(&validVersionNumber);
-
-                    if (validVersionNumber) {
-                        const Component entry(sections[0], sections[2], majorVersion, minorVersion);
-
-                        _components.append(entry);
-                    }
-                }
-            }
-        } else {
-             // ### use reportError
-            qWarning() << "a component declaration requires 3 arguments, but" << (sectionCount + 1) << "were provided";
-        }
-    }
-
-    return hasError();
-}
-
-void QmlDirParser::reportError(int line, int column, const QString &description)
-{
-    QmlError error;
-    error.setUrl(_url);
-    error.setLine(line);
-    error.setColumn(column);
-    error.setDescription(description);
-    _errors.append(error);
-}
-
-bool QmlDirParser::hasError() const
-{
-    if (! _errors.isEmpty())
-        return true;
-
-    return false;
-}
-
-QList<QmlError> QmlDirParser::errors() const
-{
-    return _errors;
-}
-
-QList<QmlDirParser::Plugin> QmlDirParser::plugins() const
-{
-    return _plugins;
-}
-
-QList<QmlDirParser::Component> QmlDirParser::components() const
-{
-    return _components;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmldirparser_p.h b/src/declarative/qml/qmldirparser_p.h
deleted file mode 100644
index c58c03f..0000000
--- a/src/declarative/qml/qmldirparser_p.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLDIRPARSER_P_H
-#define QMLDIRPARSER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/QUrl>
-#include <QtCore/QHash>
-
-QT_BEGIN_NAMESPACE
-
-class QmlError;
-
-class QmlDirParser
-{
-    Q_DISABLE_COPY(QmlDirParser)
-
-public:
-    QmlDirParser();
-    ~QmlDirParser();
-
-    QUrl url() const;
-    void setUrl(const QUrl &url);
-
-    QString source() const;
-    void setSource(const QString &source);
-
-    bool isParsed() const;
-    bool parse();
-
-    bool hasError() const;
-    QList<QmlError> errors() const;
-
-    struct Plugin
-    {
-        Plugin() {}
-
-        Plugin(const QString &name, const QString &path)
-            : name(name), path(path) {}
-
-        QString name;
-        QString path;
-    };
-
-    struct Component
-    {
-        Component()
-            : majorVersion(0), minorVersion(0) {}
-
-        Component(const QString &typeName, const QString &fileName, int majorVersion, int minorVersion)
-            : typeName(typeName), fileName(fileName), majorVersion(majorVersion), minorVersion(minorVersion) {}
-
-        QString typeName;
-        QString fileName;
-        int majorVersion;
-        int minorVersion;
-    };
-
-    QList<Component> components() const;
-    QList<Plugin> plugins() const;
-
-private:
-    void reportError(int line, int column, const QString &message);
-
-private:
-    QList<QmlError> _errors;
-    QUrl _url;
-    QString _source;
-    QList<Component> _components;
-    QList<Plugin> _plugins;
-    unsigned _isParsed: 1;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLDIRPARSER_P_H
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
deleted file mode 100644
index c75a299..0000000
--- a/src/declarative/qml/qmldom.cpp
+++ /dev/null
@@ -1,1836 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmldom_p.h"
-#include "qmldom_p_p.h"
-
-#include "qmlcompositetypedata_p.h"
-#include "qmlcompiler_p.h"
-#include "qmlengine_p.h"
-#include "qmlscriptparser_p.h"
-#include "qmlglobal_p.h"
-
-#include <QtCore/QByteArray>
-#include <QtCore/QDebug>
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-
-QmlDomDocumentPrivate::QmlDomDocumentPrivate()
-: root(0)
-{
-}
-
-QmlDomDocumentPrivate::~QmlDomDocumentPrivate()
-{
-    if (root) root->release();
-}
-
-/*!
-    \class QmlDomDocument
-    \internal
-    \brief The QmlDomDocument class represents the root of a QML document
-
-    A QML document is a self-contained snippet of QML, usually contained in a
-    single file. Each document has a root object, accessible through
-    QmlDomDocument::rootObject().
-
-    The QmlDomDocument class allows the programmer to inspect a QML document by
-    calling QmlDomDocument::load().
-
-    The following example loads a QML file from disk, and prints out its root
-    object type and the properties assigned in the root object.
-    \code
-    QFile file(inputFileName);
-    file.open(QIODevice::ReadOnly);
-    QByteArray xmlData = file.readAll();
-
-    QmlDomDocument document;
-    document.load(qmlengine, xmlData);
-
-    QmlDomObject rootObject = document.rootObject();
-    qDebug() << rootObject.objectType();
-    foreach(QmlDomProperty property, rootObject.properties())
-        qDebug() << property.propertyName();
-    \endcode
-*/
-
-/*!
-    Construct an empty QmlDomDocument.
-*/
-QmlDomDocument::QmlDomDocument()
-: d(new QmlDomDocumentPrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomDocument.
-*/
-QmlDomDocument::QmlDomDocument(const QmlDomDocument &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomDocument
-*/
-QmlDomDocument::~QmlDomDocument()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomDocument.
-*/
-QmlDomDocument &QmlDomDocument::operator=(const QmlDomDocument &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    Returns all import statements in qml.
-*/
-QList<QmlDomImport> QmlDomDocument::imports() const
-{
-    return d->imports;
-}
-
-/*!
-    Loads a QmlDomDocument from \a data.  \a data should be valid QML
-    data.  On success, true is returned.  If the \a data is malformed, false
-    is returned and QmlDomDocument::errors() contains an error description.
-
-    \sa QmlDomDocument::loadError()
-*/
-bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl &url)
-{
-    d->errors.clear();
-    d->imports.clear();
-
-    QmlCompiledData *component = new QmlCompiledData(engine);
-    QmlCompiler compiler;
-
-    QmlCompositeTypeData *td = ((QmlEnginePrivate *)QmlEnginePrivate::get(engine))->typeManager.getImmediate(data, url);
-
-    if(td->status == QmlCompositeTypeData::Error) {
-        d->errors = td->errors;
-        td->release();
-        component->release();
-        return false;
-    } else if(td->status == QmlCompositeTypeData::Waiting ||
-              td->status == QmlCompositeTypeData::WaitingResources) {
-        QmlError error;
-        error.setDescription(QLatin1String("QmlDomDocument supports local types only"));
-        d->errors << error;
-        td->release();
-        component->release();
-        return false;
-    }
-
-    compiler.compile(engine, td, component);
-
-    if (compiler.isError()) {
-        d->errors = compiler.errors();
-        td->release();
-        component->release();
-        return false;
-    }
-
-    for (int i = 0; i < td->data.imports().size(); ++i) {
-        QmlScriptParser::Import parserImport = td->data.imports().at(i);
-        QmlDomImport domImport;
-        domImport.d->type = static_cast<QmlDomImportPrivate::Type>(parserImport.type);
-        domImport.d->uri = parserImport.uri;
-        domImport.d->qualifier = parserImport.qualifier;
-        domImport.d->version = parserImport.version;
-        d->imports += domImport;
-    }
-
-    if (td->data.tree()) {
-        d->root = td->data.tree();
-        d->root->addref();
-    }
-
-    component->release();
-    return true;
-}
-
-/*!
-    Returns the last load errors.  The load errors will be reset after a
-    successful call to load().
-
-    \sa load()
-*/
-QList<QmlError> QmlDomDocument::errors() const
-{
-    return d->errors;
-}
-
-/*!
-    Returns the document's root object, or an invalid QmlDomObject if the
-    document has no root.
-
-    In the sample QML below, the root object will be the QmlGraphicsItem type.
-    \qml
-Item {
-    Text {
-        text: "Hello World"
-    }
-}
-    \endqml
-*/
-QmlDomObject QmlDomDocument::rootObject() const
-{
-    QmlDomObject rv;
-    rv.d->object = d->root;
-    if (rv.d->object) rv.d->object->addref();
-    return rv;
-}
-
-QmlDomPropertyPrivate::QmlDomPropertyPrivate()
-: property(0)
-{
-}
-
-QmlDomPropertyPrivate::~QmlDomPropertyPrivate()
-{
-    if (property) property->release();
-}
-
-QmlDomDynamicPropertyPrivate::QmlDomDynamicPropertyPrivate():
-        valid(false)
-{
-}
-
-QmlDomDynamicPropertyPrivate::~QmlDomDynamicPropertyPrivate()
-{
-    if (valid && property.defaultValue) property.defaultValue->release();
-}
-
-/*!
-    \class QmlDomProperty
-    \internal
-    \brief The QmlDomProperty class represents one property assignment in the
-    QML DOM tree
-
-    Properties in QML can be assigned QML \l {QmlDomValue}{values}.
-
-    \sa QmlDomObject
-*/
-
-/*!
-    Construct an invalid QmlDomProperty.
-*/
-QmlDomProperty::QmlDomProperty()
-: d(new QmlDomPropertyPrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomProperty.
-*/
-QmlDomProperty::QmlDomProperty(const QmlDomProperty &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomProperty.
-*/
-QmlDomProperty::~QmlDomProperty()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomProperty.
-*/
-QmlDomProperty &QmlDomProperty::operator=(const QmlDomProperty &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    Returns true if this is a valid QmlDomProperty, false otherwise.
-*/
-bool QmlDomProperty::isValid() const
-{
-    return d->property != 0;
-}
-
-
-/*!
-    Return the name of this property.
-
-    \qml
-Text {
-    x: 10
-    y: 10
-    font.bold: true
-}
-    \endqml
-
-    As illustrated above, a property name can be a simple string, such as "x" or
-    "y", or a more complex "dot property", such as "font.bold".  In both cases
-    the full name is returned ("x", "y" and "font.bold") by this method.
-
-    For dot properties, a split version of the name can be accessed by calling
-    QmlDomProperty::propertyNameParts().
-
-    \sa QmlDomProperty::propertyNameParts()
-*/
-QByteArray QmlDomProperty::propertyName() const
-{
-    return d->propertyName;
-}
-
-/*!
-    Return the name of this property, split into multiple parts in the case
-    of dot properties.
-
-    \qml
-Text {
-    x: 10
-    y: 10
-    font.bold: true
-}
-    \endqml
-
-    For each of the properties shown above, this method would return ("x"),
-    ("y") and ("font", "bold").
-
-    \sa QmlDomProperty::propertyName()
-*/
-QList<QByteArray> QmlDomProperty::propertyNameParts() const
-{
-    if (d->propertyName.isEmpty()) return QList<QByteArray>();
-    else return d->propertyName.split('.');
-}
-
-/*!
-    Return true if this property is used as a default property in the QML
-    document.
-
-    \qml
-<Text text="hello"/>
-<Text>hello</Text>
-    \endqml
-
-    The above two examples return the same DOM tree, except that the second has
-    the default property flag set on the text property.  Observe that whether
-    or not a property has isDefaultProperty set is determined by how the
-    property is used, and not only by whether the property is the types default
-    property.
-*/
-bool QmlDomProperty::isDefaultProperty() const
-{
-    return d->property && d->property->isDefault;
-}
-
-/*!
-    Returns the QmlDomValue that is assigned to this property, or an invalid
-    QmlDomValue if no value is assigned.
-*/
-QmlDomValue QmlDomProperty::value() const
-{
-    QmlDomValue rv;
-    if (d->property) {
-        rv.d->property = d->property;
-        rv.d->value = d->property->values.at(0);
-        rv.d->property->addref();
-        rv.d->value->addref();
-    }
-    return rv;
-}
-
-/*!
-    Returns the position in the input data where the property ID startd, or -1 if
- the property is invalid.
-*/
-int QmlDomProperty::position() const
-{
-    if (d && d->property) {
-        return d->property->location.range.offset;
-    } else
-        return -1;
-}
-
-/*!
-    Returns the length in the input data from where the property ID started upto
- the end of it, or -1 if the property is invalid.
-*/
-int QmlDomProperty::length() const
-{
-    if (d && d->property)
-        return d->property->location.range.length;
-    else
-        return -1;
-}
-
-/*!
-    Construct an invalid QmlDomDynamicProperty.
-*/
-QmlDomDynamicProperty::QmlDomDynamicProperty():
-        d(new QmlDomDynamicPropertyPrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomDynamicProperty.
-*/
-QmlDomDynamicProperty::QmlDomDynamicProperty(const QmlDomDynamicProperty &other):
-        d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomDynamicProperty.
-*/
-QmlDomDynamicProperty::~QmlDomDynamicProperty()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomDynamicProperty.
-*/
-QmlDomDynamicProperty &QmlDomDynamicProperty::operator=(const QmlDomDynamicProperty &other)
-{
-    d = other.d;
-    return *this;
-}
-
-bool QmlDomDynamicProperty::isValid() const
-{
-    return d && d->valid;
-}
-
-/*!
-    Return the name of this dynamic property.
-
-    \qml
-Item {
-    property int count: 10;
-}
-    \endqml
-
-    As illustrated above, a dynamic property name can have a name and a
-    default value ("10").
-*/
-QByteArray QmlDomDynamicProperty::propertyName() const
-{
-    if (isValid())
-        return d->property.name;
-    else
-        return QByteArray();
-}
-
-/*!
-   Returns the type of the dynamic property. Note that when the property is an
-   alias property, this will return -1. Use QmlDomProperty::isAlias() to check
-   if the property is an alias.
-*/
-int QmlDomDynamicProperty::propertyType() const
-{
-    if (isValid()) {
-        switch (d->property.type) {
-            case QmlParser::Object::DynamicProperty::Bool:
-                return QMetaType::type("bool");
-
-            case QmlParser::Object::DynamicProperty::Color:
-                return QMetaType::type("QColor");
-
-            case QmlParser::Object::DynamicProperty::Date:
-                return QMetaType::type("QDate");
-
-            case QmlParser::Object::DynamicProperty::Int:
-                return QMetaType::type("int");
-
-            case QmlParser::Object::DynamicProperty::Real:
-                return QMetaType::type("double");
-
-            case QmlParser::Object::DynamicProperty::String:
-                return QMetaType::type("QString");
-
-            case QmlParser::Object::DynamicProperty::Url:
-                return QMetaType::type("QUrl");
-
-            case QmlParser::Object::DynamicProperty::Variant:
-                return QMetaType::type("QVariant");
-
-            default:
-                break;
-        }
-    }
-
-    return -1;
-}
-
-QByteArray QmlDomDynamicProperty::propertyTypeName() const
-{
-    if (isValid()) 
-        return d->property.customType;
-
-    return QByteArray();
-}
-
-/*!
-    Return true if this property is used as a default property in the QML
-    document.
-
-    \qml
-<Text text="hello"/>
-<Text>hello</Text>
-    \endqml
-
-    The above two examples return the same DOM tree, except that the second has
-    the default property flag set on the text property.  Observe that whether
-    or not a property has isDefaultProperty set is determined by how the
-    property is used, and not only by whether the property is the types default
-    property.
-*/
-bool QmlDomDynamicProperty::isDefaultProperty() const
-{
-    if (isValid())
-        return d->property.isDefaultProperty;
-    else
-        return false;
-}
-
-/*!
-    Returns the default value as a QmlDomProperty.
-*/
-QmlDomProperty QmlDomDynamicProperty::defaultValue() const
-{
-    QmlDomProperty rp;
-
-    if (isValid() && d->property.defaultValue) {
-        rp.d->property = d->property.defaultValue;
-        rp.d->propertyName = propertyName();
-        rp.d->property->addref();
-    }
-
-    return rp;
-}
-
-/*!
-    Returns true if this dynamic property is an alias for another property,
-    false otherwise.
-*/
-bool QmlDomDynamicProperty::isAlias() const
-{
-    if (isValid())
-        return d->property.type == QmlParser::Object::DynamicProperty::Alias;
-    else
-        return false;
-}
-
-/*!
-    Returns the position in the input data where the property ID startd, or 0 if
- the property is invalid.
-*/
-int QmlDomDynamicProperty::position() const
-{
-    if (isValid()) {
-        return d->property.location.range.offset;
-    } else
-        return -1;
-}
-
-/*!
-    Returns the length in the input data from where the property ID started upto
- the end of it, or 0 if the property is invalid.
-*/
-int QmlDomDynamicProperty::length() const
-{
-    if (isValid())
-        return d->property.location.range.length;
-    else
-        return -1;
-}
-
-QmlDomObjectPrivate::QmlDomObjectPrivate()
-: object(0)
-{
-}
-
-QmlDomObjectPrivate::~QmlDomObjectPrivate()
-{
-    if (object) object->release();
-}
-
-QmlDomObjectPrivate::Properties
-QmlDomObjectPrivate::properties() const
-{
-    Properties rv;
-
-    for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter =
-            object->properties.begin();
-            iter != object->properties.end();
-            ++iter) {
-
-        rv << properties(*iter);
-
-    }
-    return rv;
-}
-
-QmlDomObjectPrivate::Properties
-QmlDomObjectPrivate::properties(QmlParser::Property *property) const
-{
-    Properties rv;
-
-    if (property->value) {
-
-        for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter =
-                property->value->properties.begin();
-                iter != property->value->properties.end();
-                ++iter) {
-
-            rv << properties(*iter);
-
-        }
-
-        QByteArray name(property->name + '.');
-        for (Properties::Iterator iter = rv.begin(); iter != rv.end(); ++iter)
-            iter->second.prepend(name);
-
-    } else {
-        rv << qMakePair(property, property->name);
-    }
-
-    return rv;
-}
-
-/*!
-    \class QmlDomObject
-    \internal
-    \brief The QmlDomObject class represents an object instantiation.
-
-    Each object instantiated in a QML file has a corresponding QmlDomObject
-    node in the QML DOM.
-
-    In addition to the type information that determines the object to
-    instantiate, QmlDomObject's also have a set of associated QmlDomProperty's.
-    Each QmlDomProperty represents a QML property assignment on the instantiated
-    object.  For example,
-
-    \qml
-QGraphicsWidget {
-    opacity: 0.5
-    size: "100x100"
-}
-    \endqml
-
-    describes a single QmlDomObject - "QGraphicsWidget" - with two properties,
-    "opacity" and "size".  Obviously QGraphicsWidget has many more properties than just
-    these two, but the QML DOM representation only contains those assigned
-    values (or bindings) in the QML file.
-*/
-
-/*!
-    Construct an invalid QmlDomObject.
-*/
-QmlDomObject::QmlDomObject()
-: d(new QmlDomObjectPrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomObject.
-*/
-QmlDomObject::QmlDomObject(const QmlDomObject &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomObject.
-*/
-QmlDomObject::~QmlDomObject()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomObject.
-*/
-QmlDomObject &QmlDomObject::operator=(const QmlDomObject &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    Returns true if this is a valid QmlDomObject, false otherwise.
-*/
-bool QmlDomObject::isValid() const
-{
-    return d->object != 0;
-}
-
-/*!
-    Returns the fully-qualified type name of this object.
-
-    For example, the type of this object would be "Qt/4.6/Rectangle".
-    \qml
-Rectangle { }
-    \endqml
-*/
-QByteArray QmlDomObject::objectType() const
-{
-    if (d->object) return d->object->typeName;
-    else return QByteArray();
-}
-
-/*!
-    Returns the type name as referenced in the qml file.
-
-    For example, the type of this object would be "Rectangle".
-    \qml
-Rectangle { }
-    \endqml
-*/
-QByteArray QmlDomObject::objectClassName() const
-{
-    if (d->object)
-        return d->object->className;
-    else
-        return QByteArray();
-}
-
-int QmlDomObject::objectTypeMajorVersion() const
-{
-    if (d->object)
-        return d->object->majorVersion;
-    else
-        return -1;
-}
-
-int QmlDomObject::objectTypeMinorVersion() const
-{
-    if (d->object)
-        return d->object->minorVersion;
-    else
-        return -1;
-}
-
-/*!
-    Returns the QML id assigned to this object, or an empty QByteArray if no id
-    has been assigned.
-
-    For example, the object id of this object would be "MyText".
-    \qml
-Text { id: myText }
-    \endqml
-*/
-QString QmlDomObject::objectId() const
-{
-    if (d->object) {
-        return d->object->id;
-    } else {
-        return QString();
-    }
-}
-
-/*!
-    Returns the list of assigned properties on this object.
-
-    In the following example, "text" and "x" properties would be returned.
-    \qml
-Text {
-    text: "Hello world!"
-    x: 100
-}
-    \endqml
-*/
-QList<QmlDomProperty> QmlDomObject::properties() const
-{
-    QList<QmlDomProperty> rv;
-
-    if (!d->object || isComponent())
-        return rv;
-
-    QmlDomObjectPrivate::Properties properties = d->properties();
-    for (int ii = 0; ii < properties.count(); ++ii) {
-
-        QmlDomProperty domProperty;
-        domProperty.d->property = properties.at(ii).first;
-        domProperty.d->property->addref();
-        domProperty.d->propertyName = properties.at(ii).second;
-        rv << domProperty;
-
-    }
-
-    if (d->object->defaultProperty) {
-        QmlDomProperty domProperty;
-        domProperty.d->property = d->object->defaultProperty;
-        domProperty.d->property->addref();
-        domProperty.d->propertyName = d->object->defaultProperty->name;
-        rv << domProperty;
-    }
-
-    return rv;
-}
-
-/*!
-    Returns the object's \a name property if a value has been assigned to
-    it, or an invalid QmlDomProperty otherwise.
-
-    In the example below, \c {object.property("source")} would return a valid
-    QmlDomProperty, and \c {object.property("tile")} an invalid QmlDomProperty.
-
-    \qml
-Image { source: "sample.jpg" }
-    \endqml
-*/
-QmlDomProperty QmlDomObject::property(const QByteArray &name) const
-{
-    QList<QmlDomProperty> props = properties();
-    for (int ii = 0; ii < props.count(); ++ii)
-        if (props.at(ii).propertyName() == name)
-            return props.at(ii);
-    return QmlDomProperty();
-}
-
-QList<QmlDomDynamicProperty> QmlDomObject::dynamicProperties() const
-{
-    QList<QmlDomDynamicProperty> properties;
-
-    for (int i = 0; i < d->object->dynamicProperties.size(); ++i) {
-        QmlDomDynamicProperty p;
-        p.d = new QmlDomDynamicPropertyPrivate;
-        p.d->property = d->object->dynamicProperties.at(i);
-        p.d->valid = true;
-
-        if (p.d->property.defaultValue)
-            p.d->property.defaultValue->addref();
-
-        properties.append(p);
-    }
-
-    return properties;
-}
-
-QmlDomDynamicProperty QmlDomObject::dynamicProperty(const QByteArray &name) const
-{
-    QmlDomDynamicProperty p;
-
-    if (!isValid())
-        return p;
-
-    for (int i = 0; i < d->object->dynamicProperties.size(); ++i) {
-        if (d->object->dynamicProperties.at(i).name == name) {
-            p.d = new QmlDomDynamicPropertyPrivate;
-            p.d->property = d->object->dynamicProperties.at(i);
-            if (p.d->property.defaultValue) p.d->property.defaultValue->addref();
-            p.d->valid = true;
-        }
-    }
-
-    return p;
-}
-
-/*!
-    Returns true if this object is a custom type.  Custom types are special
-    types that allow embeddeding non-QML data, such as SVG or HTML data,
-    directly into QML files.
-
-    \note Currently this method will always return false, and is a placekeeper
-    for future functionality.
-
-    \sa QmlDomObject::customTypeData()
-*/
-bool QmlDomObject::isCustomType() const
-{
-    return false;
-}
-
-/*!
-    If this object represents a custom type, returns the data associated with
-    the custom type, otherwise returns an empty QByteArray().
-    QmlDomObject::isCustomType() can be used to check if this object represents
-    a custom type.
-*/
-QByteArray QmlDomObject::customTypeData() const
-{
-    return QByteArray();
-}
-
-/*!
-    Returns true if this object is a sub-component object.  Sub-component
-    objects can be converted into QmlDomComponent instances by calling
-    QmlDomObject::toComponent().
-
-    \sa QmlDomObject::toComponent()
-*/
-bool QmlDomObject::isComponent() const
-{
-    return (d->object && d->object->typeName == "Qt/Component");
-}
-
-/*!
-    Returns a QmlDomComponent for this object if it is a sub-component, or
-    an invalid QmlDomComponent if not.  QmlDomObject::isComponent() can be used
-    to check if this object represents a sub-component.
-
-    \sa QmlDomObject::isComponent()
-*/
-QmlDomComponent QmlDomObject::toComponent() const
-{
-    QmlDomComponent rv;
-    if (isComponent())
-        rv.d = d;
-    return rv;
-}
-
-/*!
-    Returns the position in the input data where the property assignment started
-, or -1 if the property is invalid.
-*/
-int QmlDomObject::position() const
-{
-    if (d && d->object)
-        return d->object->location.range.offset;
-    else
-        return -1;
-}
-
-/*!
-    Returns the length in the input data from where the property assignment star
-ted upto the end of it, or -1 if the property is invalid.
-*/
-int QmlDomObject::length() const
-{
-    if (d && d->object)
-        return d->object->location.range.length;
-    else
-        return -1;
-}
-
-// Returns the URL of the type, if it is an external type, or an empty URL if
-// not
-QUrl QmlDomObject::url() const
-{
-    if (d && d->object)
-        return d->object->url;
-    else
-        return QUrl();
-}
-
-QmlDomBasicValuePrivate::QmlDomBasicValuePrivate()
-: value(0)
-{
-}
-
-QmlDomBasicValuePrivate::~QmlDomBasicValuePrivate()
-{
-    if (value) value->release();
-}
-
-/*!
-    \class QmlDomValueLiteral
-    \internal
-    \brief The QmlDomValueLiteral class represents a literal value.
-
-    A literal value is a simple value, written inline with the QML.  In the
-    example below, the "x", "y" and "color" properties are being assigned
-    literal values.
-
-    \qml
-Rectangle {
-    x: 10
-    y: 10
-    color: "red"
-}
-    \endqml
-*/
-
-/*!
-    Construct an empty QmlDomValueLiteral.
-*/
-QmlDomValueLiteral::QmlDomValueLiteral():
-    d(new QmlDomBasicValuePrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomValueLiteral.
-*/
-QmlDomValueLiteral::QmlDomValueLiteral(const QmlDomValueLiteral &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomValueLiteral.
-*/
-QmlDomValueLiteral::~QmlDomValueLiteral()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomValueLiteral.
-*/
-QmlDomValueLiteral &QmlDomValueLiteral::operator=(const QmlDomValueLiteral &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    Return the literal value.
-
-    In the example below, the literal value will be the string "10".
-    \qml
-Rectangle { x: 10 }
-    \endqml
-*/
-QString QmlDomValueLiteral::literal() const
-{
-    if (d->value) return d->value->primitive();
-    else return QString();
-}
-
-/*!
-    \class QmlDomValueBinding
-    \internal
-    \brief The QmlDomValueBinding class represents a property binding.
-
-    A property binding is an ECMAScript expression assigned to a property.  In
-    the example below, the "x" property is being assigned a property binding.
-
-    \qml
-Rectangle { x: Other.x }
-    \endqml
-*/
-
-/*!
-    Construct an empty QmlDomValueBinding.
-*/
-QmlDomValueBinding::QmlDomValueBinding():
-        d(new QmlDomBasicValuePrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomValueBinding.
-*/
-QmlDomValueBinding::QmlDomValueBinding(const QmlDomValueBinding &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomValueBinding.
-*/
-QmlDomValueBinding::~QmlDomValueBinding()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomValueBinding.
-*/
-QmlDomValueBinding &QmlDomValueBinding::operator=(const QmlDomValueBinding &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    Return the binding expression.
-
-    In the example below, the string "Other.x" will be returned.
-    \qml
-Rectangle { x: Other.x }
-    \endqml
-*/
-QString QmlDomValueBinding::binding() const
-{
-    if (d->value)
-        return d->value->value.asScript();
-    else
-        return QString();
-}
-
-/*!
-    \class QmlDomValueValueSource
-    \internal
-    \brief The QmlDomValueValueSource class represents a value source assignment value.
-
-    In QML, value sources are special value generating types that may be
-    assigned to properties.  Value sources inherit the QmlPropertyValueSource
-    class.  In the example below, the "x" property is being assigned the
-    NumberAnimation value source.
-
-    \qml
-Rectangle {
-    x: NumberAnimation {
-        from: 0
-        to: 100
-        repeat: true
-        running: true
-    }
-}
-    \endqml
-*/
-
-/*!
-    Construct an empty QmlDomValueValueSource.
-*/
-QmlDomValueValueSource::QmlDomValueValueSource():
-        d(new QmlDomBasicValuePrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomValueValueSource.
-*/
-QmlDomValueValueSource::QmlDomValueValueSource(const QmlDomValueValueSource &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomValueValueSource.
-*/
-QmlDomValueValueSource::~QmlDomValueValueSource()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomValueValueSource.
-*/
-QmlDomValueValueSource &QmlDomValueValueSource::operator=(const QmlDomValueValueSource &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    Return the value source object.
-
-    In the example below, an object representing the NumberAnimation will be
-    returned.
-    \qml
-Rectangle {
-    x: NumberAnimation {
-        from: 0
-        to: 100
-        repeat: true
-        running: true
-    }
-}
-    \endqml
-*/
-QmlDomObject QmlDomValueValueSource::object() const
-{
-    QmlDomObject rv;
-    if (d->value) {
-        rv.d->object = d->value->object;
-        rv.d->object->addref();
-    }
-    return rv;
-}
-
-/*!
-    \class QmlDomValueValueInterceptor
-    \internal
-    \brief The QmlDomValueValueInterceptor class represents a value interceptor assignment value.
-
-    In QML, value interceptor are special write-intercepting types that may be
-    assigned to properties.  Value interceptor inherit the QmlPropertyValueInterceptor
-    class.  In the example below, the "x" property is being assigned the
-    Behavior value interceptor.
-
-    \qml
-Rectangle {
-    x: Behavior { NumberAnimation { duration: 500 } }
-}
-    \endqml
-*/
-
-/*!
-    Construct an empty QmlDomValueValueInterceptor.
-*/
-QmlDomValueValueInterceptor::QmlDomValueValueInterceptor():
-        d(new QmlDomBasicValuePrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomValueValueInterceptor.
-*/
-QmlDomValueValueInterceptor::QmlDomValueValueInterceptor(const QmlDomValueValueInterceptor &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomValueValueInterceptor.
-*/
-QmlDomValueValueInterceptor::~QmlDomValueValueInterceptor()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomValueValueInterceptor.
-*/
-QmlDomValueValueInterceptor &QmlDomValueValueInterceptor::operator=(const QmlDomValueValueInterceptor &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    Return the value interceptor object.
-
-    In the example below, an object representing the Behavior will be
-    returned.
-    \qml
-Rectangle {
-    x: Behavior { NumberAnimation { duration: 500 } }
-}
-    \endqml
-*/
-QmlDomObject QmlDomValueValueInterceptor::object() const
-{
-    QmlDomObject rv;
-    if (d->value) {
-        rv.d->object = d->value->object;
-        rv.d->object->addref();
-    }
-    return rv;
-}
-
-QmlDomValuePrivate::QmlDomValuePrivate()
-: property(0), value(0)
-{
-}
-
-QmlDomValuePrivate::~QmlDomValuePrivate()
-{
-    if (property) property->release();
-    if (value) value->release();
-}
-
-/*!
-    \class QmlDomValue
-    \internal
-    \brief The QmlDomValue class represents a generic Qml value.
-
-    QmlDomValue's can be assigned to QML \l {QmlDomProperty}{properties}.  In
-    QML, properties can be assigned various different values, including basic
-    literals, property bindings, property value sources, objects and lists of
-    values.  The QmlDomValue class allows a programmer to determine the specific
-    value type being assigned and access more detailed information through a
-    corresponding value type class.
-
-    For example, in the following example,
-
-    \qml
-Text {
-    text: "Hello World!"
-    y: Other.y
-}
-    \endqml
-
-    The text property is being assigned a literal, and the y property a property
-    binding.  To output the values assigned to the text and y properties in the
-    above example from C++,
-
-    \code
-    QmlDomDocument document;
-    QmlDomObject root = document.rootObject();
-
-    QmlDomProperty text = root.property("text");
-    if (text.value().isLiteral()) {
-        QmlDomValueLiteral literal = text.value().toLiteral();
-        qDebug() << literal.literal();
-    }
-
-    QmlDomProperty y = root.property("y");
-    if (y.value().isBinding()) {
-        QmlDomValueBinding binding = y.value().toBinding();
-        qDebug() << binding.binding();
-    }
-    \endcode
-*/
-
-/*!
-    Construct an invalid QmlDomValue.
-*/
-QmlDomValue::QmlDomValue()
-: d(new QmlDomValuePrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomValue.
-*/
-QmlDomValue::QmlDomValue(const QmlDomValue &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomValue
-*/
-QmlDomValue::~QmlDomValue()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomValue.
-*/
-QmlDomValue &QmlDomValue::operator=(const QmlDomValue &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    \enum QmlDomValue::Type
-
-    The type of the QmlDomValue node.
-
-    \value Invalid The QmlDomValue is invalid.
-    \value Literal The QmlDomValue is a literal value assignment.  Use QmlDomValue::toLiteral() to access the type instance.
-    \value PropertyBinding The QmlDomValue is a property binding.  Use QmlDomValue::toBinding() to access the type instance.
-    \value ValueSource The QmlDomValue is a property value source.  Use QmlDomValue::toValueSource() to access the type instance.
-    \value ValueInterceptor The QmlDomValue is a property value interceptor.  Use QmlDomValue::toValueInterceptor() to access the type instance.
-    \value Object The QmlDomValue is an object assignment.  Use QmlDomValue::toObject() to access the type instnace.
-    \value List The QmlDomValue is a list of other values.  Use QmlDomValue::toList() to access the type instance.
-*/
-
-/*!
-    Returns the type of this QmlDomValue.
-*/
-QmlDomValue::Type QmlDomValue::type() const
-{
-    if (d->property)
-        if (QmlMetaType::isList(d->property->type) ||
-           (d->property && d->property->values.count() > 1))
-            return List;
-
-    QmlParser::Value *value = d->value;
-    if (!value && !d->property)
-        return Invalid;
-
-    switch(value->type) {
-    case QmlParser::Value::Unknown:
-        return Invalid;
-    case QmlParser::Value::Literal:
-        return Literal;
-    case QmlParser::Value::PropertyBinding:
-        return PropertyBinding;
-    case QmlParser::Value::ValueSource:
-        return ValueSource;
-    case QmlParser::Value::ValueInterceptor:
-        return ValueInterceptor;
-    case QmlParser::Value::CreatedObject:
-        return Object;
-    case QmlParser::Value::SignalObject:
-        return Invalid;
-    case QmlParser::Value::SignalExpression:
-        return Literal;
-    case QmlParser::Value::Id:
-        return Literal;
-    }
-    return Invalid;
-}
-
-/*!
-    Returns true if this is an invalid value, otherwise false.
-*/
-bool QmlDomValue::isInvalid() const
-{
-    return type() == Invalid;
-}
-
-/*!
-    Returns true if this is a literal value, otherwise false.
-*/
-bool QmlDomValue::isLiteral() const
-{
-    return type() == Literal;
-}
-
-/*!
-    Returns true if this is a property binding value, otherwise false.
-*/
-bool QmlDomValue::isBinding() const
-{
-    return type() == PropertyBinding;
-}
-
-/*!
-    Returns true if this is a value source value, otherwise false.
-*/
-bool QmlDomValue::isValueSource() const
-{
-    return type() == ValueSource;
-}
-
-/*!
-    Returns true if this is a value interceptor value, otherwise false.
-*/
-bool QmlDomValue::isValueInterceptor() const
-{
-    return type() == ValueInterceptor;
-}
-
-/*!
-    Returns true if this is an object value, otherwise false.
-*/
-bool QmlDomValue::isObject() const
-{
-    return type() == Object;
-}
-
-/*!
-    Returns true if this is a list value, otherwise false.
-*/
-bool QmlDomValue::isList() const
-{
-    return type() == List;
-}
-
-/*!
-    Returns a QmlDomValueLiteral if this value is a literal type, otherwise
-    returns an invalid QmlDomValueLiteral.
-
-    \sa QmlDomValue::type()
-*/
-QmlDomValueLiteral QmlDomValue::toLiteral() const
-{
-    QmlDomValueLiteral rv;
-    if (type() == Literal) {
-        rv.d->value = d->value;
-        rv.d->value->addref();
-    }
-    return rv;
-}
-
-/*!
-    Returns a QmlDomValueBinding if this value is a property binding type,
-    otherwise returns an invalid QmlDomValueBinding.
-
-    \sa QmlDomValue::type()
-*/
-QmlDomValueBinding QmlDomValue::toBinding() const
-{
-    QmlDomValueBinding rv;
-    if (type() == PropertyBinding) {
-        rv.d->value = d->value;
-        rv.d->value->addref();
-    }
-    return rv;
-}
-
-/*!
-    Returns a QmlDomValueValueSource if this value is a property value source
-    type, otherwise returns an invalid QmlDomValueValueSource.
-
-    \sa QmlDomValue::type()
-*/
-QmlDomValueValueSource QmlDomValue::toValueSource() const
-{
-    QmlDomValueValueSource rv;
-    if (type() == ValueSource) {
-        rv.d->value = d->value;
-        rv.d->value->addref();
-    }
-    return rv;
-}
-
-/*!
-    Returns a QmlDomValueValueInterceptor if this value is a property value interceptor
-    type, otherwise returns an invalid QmlDomValueValueInterceptor.
-
-    \sa QmlDomValue::type()
-*/
-QmlDomValueValueInterceptor QmlDomValue::toValueInterceptor() const
-{
-    QmlDomValueValueInterceptor rv;
-    if (type() == ValueInterceptor) {
-        rv.d->value = d->value;
-        rv.d->value->addref();
-    }
-    return rv;
-}
-
-/*!
-    Returns a QmlDomObject if this value is an object assignment type, otherwise
-    returns an invalid QmlDomObject.
-
-    \sa QmlDomValue::type()
-*/
-QmlDomObject QmlDomValue::toObject() const
-{
-    QmlDomObject rv;
-    if (type() == Object) {
-        rv.d->object = d->value->object;
-        rv.d->object->addref();
-    }
-    return rv;
-}
-
-/*!
-    Returns a QmlDomList if this value is a list type, otherwise returns an
-    invalid QmlDomList.
-
-    \sa QmlDomValue::type()
-*/
-QmlDomList QmlDomValue::toList() const
-{
-    QmlDomList rv;
-    if (type() == List) {
-        rv.d = d;
-    }
-    return rv;
-}
-
-/*!
-    Returns the position in the input data where the property value startd, or -1
- if the value is invalid.
-*/
-int QmlDomValue::position() const
-{
-    if (type() == Invalid)
-        return -1;
-    else
-        return d->value->location.range.offset;
-}
-
-/*!
-    Returns the length in the input data from where the property value started u
-pto the end of it, or -1 if the value is invalid.
-*/
-int QmlDomValue::length() const
-{
-    if (type() == Invalid)
-        return -1;
-    else
-        return d->value->location.range.length;
-}
-
-/*!
-    \class QmlDomList
-    \internal
-    \brief The QmlDomList class represents a list of values assigned to a QML property.
-
-    Lists of values can be assigned to properties.  For example, the following
-    example assigns multiple objects to Item's "children" property
-    \qml
-Item {
-    children: [
-        Text { },
-        Rectangle { }
-    ]
-}
-    \endqml
-
-    Lists can also be implicitly created by assigning multiple
-    \l {QmlDomValueValueSource}{value sources} or constants to a property.
-    \qml
-Item {
-    x: 10
-    x: NumberAnimation {
-        running: false
-        from: 0
-        to: 100
-    }
-}
-    \endqml
-*/
-
-/*!
-    Construct an empty QmlDomList.
-*/
-QmlDomList::QmlDomList()
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomList.
-*/
-QmlDomList::QmlDomList(const QmlDomList &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomList.
-*/
-QmlDomList::~QmlDomList()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomList.
-*/
-QmlDomList &QmlDomList::operator=(const QmlDomList &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-    Returns the list of QmlDomValue's.
-*/
-QList<QmlDomValue> QmlDomList::values() const
-{
-    QList<QmlDomValue> rv;
-    if (!d->property)
-        return rv;
-
-    for (int ii = 0; ii < d->property->values.count(); ++ii) {
-        QmlDomValue v;
-        v.d->value = d->property->values.at(ii);
-        v.d->value->addref();
-        rv << v;
-    }
-
-    return rv;
-}
-
-/*!
-    Returns the position in the input data where the list started, or -1 if
- the property is invalid.
-*/
-int QmlDomList::position() const
-{
-    if (d && d->property) {
-        return d->property->listValueRange.offset;
-    } else
-        return -1;
-}
-
-/*!
-    Returns the length in the input data from where the list started upto
- the end of it, or 0 if the property is invalid.
-*/
-int QmlDomList::length() const
-{
-    if (d && d->property)
-        return d->property->listValueRange.length;
-    else
-        return -1;
-}
-
-/*!
-  Returns a list of positions of the commas in the QML file.
-*/
-QList<int> QmlDomList:: commaPositions() const
-{
-    if (d && d->property)
-        return d->property->listCommaPositions;
-    else
-        return QList<int>();
-}
-
-/*!
-    \class QmlDomComponent
-    \internal
-    \brief The QmlDomComponent class represents sub-component within a QML document.
-
-    Sub-components are QmlComponents defined within a QML document.  The
-    following example shows the definition of a sub-component with the id
-    "listDelegate".
-
-    \qml
-Item {
-    Component {
-        id: listDelegate
-        Text {
-            text: modelData.text
-        }
-    }
-}
-    \endqml
-
-    Like QmlDomDocument's, components contain a single root object.
-*/
-
-/*!
-    Construct an empty QmlDomComponent.
-*/
-QmlDomComponent::QmlDomComponent()
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomComponent.
-*/
-QmlDomComponent::QmlDomComponent(const QmlDomComponent &other)
-: QmlDomObject(other)
-{
-}
-
-/*!
-    Destroy the QmlDomComponent.
-*/
-QmlDomComponent::~QmlDomComponent()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomComponent.
-*/
-QmlDomComponent &QmlDomComponent::operator=(const QmlDomComponent &other)
-{
-    static_cast<QmlDomObject &>(*this) = other;
-    return *this;
-}
-
-/*!
-    Returns the component's root object.
-
-    In the example below, the root object is the "Text" object.
-    \qml
-Item {
-    Component {
-        id: listDelegate
-        Text {
-            text: modelData.text
-        }
-    }
-}
-    \endqml
-*/
-QmlDomObject QmlDomComponent::componentRoot() const
-{
-    QmlDomObject rv;
-    if (d->object) {
-        QmlParser::Object *obj = 0;
-        if (d->object->defaultProperty &&
-           d->object->defaultProperty->values.count() == 1 &&
-           d->object->defaultProperty->values.at(0)->object)
-            obj = d->object->defaultProperty->values.at(0)->object;
-
-        if (obj) {
-            rv.d->object = obj;
-            rv.d->object->addref();
-        }
-    }
-
-    return rv;
-}
-
-QmlDomImportPrivate::QmlDomImportPrivate()
-: type(File)
-{
-}
-
-QmlDomImportPrivate::~QmlDomImportPrivate()
-{
-}
-
-/*!
-    \class QmlDomImport
-    \internal
-    \brief The QmlDomImport class represents an import statement.
-*/
-
-/*!
-    Construct an empty QmlDomImport.
-*/
-QmlDomImport::QmlDomImport()
-: d(new QmlDomImportPrivate)
-{
-}
-
-/*!
-    Create a copy of \a other QmlDomImport.
-*/
-QmlDomImport::QmlDomImport(const QmlDomImport &other)
-: d(other.d)
-{
-}
-
-/*!
-    Destroy the QmlDomImport.
-*/
-QmlDomImport::~QmlDomImport()
-{
-}
-
-/*!
-    Assign \a other to this QmlDomImport.
-*/
-QmlDomImport &QmlDomImport::operator=(const QmlDomImport &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-  Returns the type of the import.
-  */
-QmlDomImport::Type QmlDomImport::type() const
-{
-    return static_cast<QmlDomImport::Type>(d->type);
-}
-
-/*!
-  Returns the URI of the import (e.g. 'subdir' or 'com.nokia.Qt')
-  */
-QString QmlDomImport::uri() const
-{
-    return d->uri;
-}
-
-/*!
-  Returns the version specified by the import. An empty string if no version was specified.
-  */
-QString QmlDomImport::version() const
-{
-    return d->version;
-}
-
-/*!
-  Returns the (optional) qualifier string (the token following the 'as' keyword) of the import.
-  */
-QString QmlDomImport::qualifier() const
-{
-    return d->qualifier;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmldom_p.h b/src/declarative/qml/qmldom_p.h
deleted file mode 100644
index 8c7288e..0000000
--- a/src/declarative/qml/qmldom_p.h
+++ /dev/null
@@ -1,360 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLDOM_P_H
-#define QMLDOM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlerror.h"
-
-#include <QtCore/qlist.h>
-#include <QtCore/qshareddata.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QString;
-class QByteArray;
-class QmlDomObject;
-class QmlDomList;
-class QmlDomValue;
-class QmlEngine;
-class QmlDomComponent;
-class QmlDomImport;
-class QIODevice;
-
-class QmlDomDocumentPrivate;
-
-class Q_DECLARATIVE_EXPORT QmlDomDocument
-{
-public:
-    QmlDomDocument();
-    QmlDomDocument(const QmlDomDocument &);
-    ~QmlDomDocument();
-    QmlDomDocument &operator=(const QmlDomDocument &);
-
-    QList<QmlDomImport> imports() const;
-
-    QList<QmlError> errors() const;
-    bool load(QmlEngine *, const QByteArray &, const QUrl & = QUrl());
-
-    QmlDomObject rootObject() const;
-
-private:
-    QSharedDataPointer<QmlDomDocumentPrivate> d;
-};
-
-class QmlDomPropertyPrivate;
-class Q_DECLARATIVE_EXPORT QmlDomProperty
-{
-public:
-    QmlDomProperty();
-    QmlDomProperty(const QmlDomProperty &);
-    ~QmlDomProperty();
-    QmlDomProperty &operator=(const QmlDomProperty &);
-
-    bool isValid() const;
-
-    QByteArray propertyName() const;
-    QList<QByteArray> propertyNameParts() const;
-
-    bool isDefaultProperty() const;
-
-    QmlDomValue value() const;
-
-    int position() const;
-    int length() const;
-
-private:
-    friend class QmlDomObject;
-    friend class QmlDomDynamicProperty;
-    QSharedDataPointer<QmlDomPropertyPrivate> d;
-};
-
-class QmlDomDynamicPropertyPrivate;
-class Q_DECLARATIVE_EXPORT QmlDomDynamicProperty
-{
-public:
-    QmlDomDynamicProperty();
-    QmlDomDynamicProperty(const QmlDomDynamicProperty &);
-    ~QmlDomDynamicProperty();
-    QmlDomDynamicProperty &operator=(const QmlDomDynamicProperty &);
-
-    bool isValid() const;
-
-    QByteArray propertyName() const;
-    int propertyType() const;
-    QByteArray propertyTypeName() const;
-
-    bool isDefaultProperty() const;
-    QmlDomProperty defaultValue() const;
-
-    bool isAlias() const;
-
-    int position() const;
-    int length() const;
-
-private:
-    friend class QmlDomObject;
-    QSharedDataPointer<QmlDomDynamicPropertyPrivate> d;
-};
-
-class QmlDomObjectPrivate;
-class Q_DECLARATIVE_EXPORT QmlDomObject
-{
-public:
-    QmlDomObject();
-    QmlDomObject(const QmlDomObject &);
-    ~QmlDomObject();
-    QmlDomObject &operator=(const QmlDomObject &);
-
-    bool isValid() const;
-
-    QByteArray objectType() const;
-    QByteArray objectClassName() const;
-
-    int objectTypeMajorVersion() const;
-    int objectTypeMinorVersion() const;
-
-    QString objectId() const;
-
-    QList<QmlDomProperty> properties() const;
-    QmlDomProperty property(const QByteArray &) const;
-
-    QList<QmlDomDynamicProperty> dynamicProperties() const;
-    QmlDomDynamicProperty dynamicProperty(const QByteArray &) const;
-
-    bool isCustomType() const;
-    QByteArray customTypeData() const;
-
-    bool isComponent() const;
-    QmlDomComponent toComponent() const;
-
-    int position() const;
-    int length() const;
-
-    QUrl url() const;
-private:
-    friend class QmlDomDocument;
-    friend class QmlDomComponent;
-    friend class QmlDomValue;
-    friend class QmlDomValueValueSource;
-    friend class QmlDomValueValueInterceptor;
-    QSharedDataPointer<QmlDomObjectPrivate> d;
-};
-
-class QmlDomValuePrivate;
-class QmlDomBasicValuePrivate;
-class Q_DECLARATIVE_EXPORT QmlDomValueLiteral
-{
-public:
-    QmlDomValueLiteral();
-    QmlDomValueLiteral(const QmlDomValueLiteral &);
-    ~QmlDomValueLiteral();
-    QmlDomValueLiteral &operator=(const QmlDomValueLiteral &);
-
-    QString literal() const;
-
-private:
-    friend class QmlDomValue;
-    QSharedDataPointer<QmlDomBasicValuePrivate> d;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDomValueBinding
-{
-public:
-    QmlDomValueBinding();
-    QmlDomValueBinding(const QmlDomValueBinding &);
-    ~QmlDomValueBinding();
-    QmlDomValueBinding &operator=(const QmlDomValueBinding &);
-
-    QString binding() const;
-
-private:
-    friend class QmlDomValue;
-    QSharedDataPointer<QmlDomBasicValuePrivate> d;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDomValueValueSource
-{
-public:
-    QmlDomValueValueSource();
-    QmlDomValueValueSource(const QmlDomValueValueSource &);
-    ~QmlDomValueValueSource();
-    QmlDomValueValueSource &operator=(const QmlDomValueValueSource &);
-
-    QmlDomObject object() const;
-
-private:
-    friend class QmlDomValue;
-    QSharedDataPointer<QmlDomBasicValuePrivate> d;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDomValueValueInterceptor
-{
-public:
-    QmlDomValueValueInterceptor();
-    QmlDomValueValueInterceptor(const QmlDomValueValueInterceptor &);
-    ~QmlDomValueValueInterceptor();
-    QmlDomValueValueInterceptor &operator=(const QmlDomValueValueInterceptor &);
-
-    QmlDomObject object() const;
-
-private:
-    friend class QmlDomValue;
-    QSharedDataPointer<QmlDomBasicValuePrivate> d;
-};
-
-
-class Q_DECLARATIVE_EXPORT QmlDomComponent : public QmlDomObject
-{
-public:
-    QmlDomComponent();
-    QmlDomComponent(const QmlDomComponent &);
-    ~QmlDomComponent();
-    QmlDomComponent &operator=(const QmlDomComponent &);
-
-    QmlDomObject componentRoot() const;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDomValue
-{
-public:
-    enum Type { 
-        Invalid,
-        Literal, 
-        PropertyBinding, 
-        ValueSource,
-        ValueInterceptor,
-        Object,
-        List 
-    };
-
-    QmlDomValue();
-    QmlDomValue(const QmlDomValue &);
-    ~QmlDomValue();
-    QmlDomValue &operator=(const QmlDomValue &);
-
-    Type type() const;
-
-    bool isInvalid() const;
-    bool isLiteral() const;
-    bool isBinding() const;
-    bool isValueSource() const;
-    bool isValueInterceptor() const;
-    bool isObject() const;
-    bool isList() const;
-
-    QmlDomValueLiteral toLiteral() const;
-    QmlDomValueBinding toBinding() const;
-    QmlDomValueValueSource toValueSource() const;
-    QmlDomValueValueInterceptor toValueInterceptor() const;
-    QmlDomObject toObject() const;
-    QmlDomList toList() const;
-
-    int position() const;
-    int length() const;
-
-private:
-    friend class QmlDomProperty;
-    friend class QmlDomList;
-    QSharedDataPointer<QmlDomValuePrivate> d;
-};
-
-class Q_DECLARATIVE_EXPORT QmlDomList
-{
-public:
-    QmlDomList();
-    QmlDomList(const QmlDomList &);
-    ~QmlDomList();
-    QmlDomList &operator=(const QmlDomList &);
-
-    QList<QmlDomValue> values() const;
-
-    int position() const;
-    int length() const;
-
-    QList<int> commaPositions() const;
-
-private:
-    friend class QmlDomValue;
-    QSharedDataPointer<QmlDomValuePrivate> d;
-};
-
-class QmlDomImportPrivate;
-class Q_DECLARATIVE_EXPORT QmlDomImport
-{
-public:
-    enum Type { Library, File };
-
-    QmlDomImport();
-    QmlDomImport(const QmlDomImport &);
-    ~QmlDomImport();
-    QmlDomImport &operator=(const QmlDomImport &);
-
-    Type type() const;
-    QString uri() const;
-    QString version() const;
-    QString qualifier() const;
-
-private:
-    friend class QmlDomDocument;
-    QSharedDataPointer<QmlDomImportPrivate> d;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLDOM_P_H
diff --git a/src/declarative/qml/qmldom_p_p.h b/src/declarative/qml/qmldom_p_p.h
deleted file mode 100644
index 9d955b0..0000000
--- a/src/declarative/qml/qmldom_p_p.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLDOM_P_P_H
-#define QMLDOM_P_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlparser_p.h"
-
-#include <QtCore/QtGlobal>
-
-QT_BEGIN_NAMESPACE
-
-class QmlDomDocumentPrivate : public QSharedData
-{
-public:
-    QmlDomDocumentPrivate();
-    QmlDomDocumentPrivate(const QmlDomDocumentPrivate &o)
-    : QSharedData(o) { qFatal("Not impl"); }
-    ~QmlDomDocumentPrivate();
-
-    QList<QmlError> errors;
-    QList<QmlDomImport> imports;
-    QmlParser::Object *root;
-    QList<int> automaticSemicolonOffsets;
-};
-
-class QmlDomObjectPrivate : public QSharedData
-{
-public:
-    QmlDomObjectPrivate();
-    QmlDomObjectPrivate(const QmlDomObjectPrivate &o)
-    : QSharedData(o) { qFatal("Not impl"); }
-    ~QmlDomObjectPrivate();
-
-    typedef QList<QPair<QmlParser::Property *, QByteArray> > Properties;
-    Properties properties() const;
-    Properties properties(QmlParser::Property *) const;
-
-    QmlParser::Object *object;
-};
-
-class QmlDomPropertyPrivate : public QSharedData
-{
-public:
-    QmlDomPropertyPrivate();
-    QmlDomPropertyPrivate(const QmlDomPropertyPrivate &o)
-    : QSharedData(o) { qFatal("Not impl"); }
-    ~QmlDomPropertyPrivate();
-
-    QByteArray propertyName;
-    QmlParser::Property *property;
-};
-
-class QmlDomDynamicPropertyPrivate : public QSharedData
-{
-public:
-    QmlDomDynamicPropertyPrivate();
-    QmlDomDynamicPropertyPrivate(const QmlDomDynamicPropertyPrivate &o)
-    : QSharedData(o) { qFatal("Not impl"); }
-    ~QmlDomDynamicPropertyPrivate();
-
-    bool valid;
-    QmlParser::Object::DynamicProperty property;
-};
-
-class QmlDomValuePrivate : public QSharedData
-{
-public:
-    QmlDomValuePrivate();
-    QmlDomValuePrivate(const QmlDomValuePrivate &o)
-    : QSharedData(o) { qFatal("Not impl"); }
-    ~QmlDomValuePrivate();
-
-    QmlParser::Property *property;
-    QmlParser::Value *value;
-};
-
-class QmlDomBasicValuePrivate : public QSharedData
-{
-public:
-    QmlDomBasicValuePrivate();
-    QmlDomBasicValuePrivate(const QmlDomBasicValuePrivate &o) 
-    : QSharedData(o) { qFatal("Not impl"); }
-    ~QmlDomBasicValuePrivate();
-
-    QmlParser::Value *value;
-};
-
-class QmlDomImportPrivate : public QSharedData
-{
-public:
-    QmlDomImportPrivate();
-    QmlDomImportPrivate(const QmlDomImportPrivate &o) 
-    : QSharedData(o) { qFatal("Not impl"); }
-    ~QmlDomImportPrivate();
-
-    enum Type { Library, File };
-
-    Type type;
-    QString uri;
-    QString version;
-    QString qualifier;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLDOM_P_P_H
-
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
deleted file mode 100644
index 2d904d1..0000000
--- a/src/declarative/qml/qmlengine.cpp
+++ /dev/null
@@ -1,1901 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlengine_p.h"
-#include "qmlengine.h"
-
-#include "qmlcontext_p.h"
-#include "qmlcompiler_p.h"
-#include "qmlglobalscriptclass_p.h"
-#include "qml.h"
-#include "qmlcontext.h"
-#include "qmlexpression.h"
-#include "qmlcomponent.h"
-#include "qmlmetaproperty_p.h"
-#include "qmlbinding_p_p.h"
-#include "qmlvme_p.h"
-#include "qmlenginedebug_p.h"
-#include "qmlstringconverters_p.h"
-#include "qmlxmlhttprequest_p.h"
-#include "qmlsqldatabase_p.h"
-#include "qmltypenamescriptclass_p.h"
-#include "qmllistscriptclass_p.h"
-#include "qmlscriptstring.h"
-#include "qmlglobal_p.h"
-#include "qmlworkerscript_p.h"
-#include "qmlcomponent_p.h"
-#include "qmlscriptclass_p.h"
-#include "qmlnetworkaccessmanagerfactory.h"
-#include "qmlimageprovider.h"
-#include "qmldirparser_p.h"
-#include "qmlextensioninterface.h"
-#include "qmllist_p.h"
-
-#include <qfxperf_p_p.h>
-
-#include <QtCore/qmetaobject.h>
-#include <QScriptClass>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QNetworkAccessManager>
-#include <QDesktopServices>
-#include <QTimer>
-#include <QList>
-#include <QPair>
-#include <QDebug>
-#include <QMetaObject>
-#include <QStack>
-#include <QPluginLoader>
-#include <QtCore/qlibraryinfo.h>
-#include <QtCore/qthreadstorage.h>
-#include <QtCore/qthread.h>
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qmutex.h>
-#include <QtGui/qcolor.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qsound.h>
-#include <QGraphicsObject>
-#include <QtCore/qcryptographichash.h>
-
-#include <private/qobject_p.h>
-#include <private/qscriptdeclarativeclass_p.h>
-
-#include <private/qmlgraphicsitemsmodule_p.h>
-#include <private/qmlgraphicsutilmodule_p.h>
-
-#ifdef Q_OS_WIN // for %APPDATA%
-#include <qt_windows.h>
-#include <qlibrary.h>
-
-#define CSIDL_APPDATA		0x001a	// <username>\Application Data
-#endif
-
-Q_DECLARE_METATYPE(QmlMetaProperty)
-
-QT_BEGIN_NAMESPACE
-
-DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE)
-
-/*!
-    \qmlclass QtObject QObject
-  \since 4.7
-    \brief The QtObject element is the most basic element in QML
-
-    The QtObject element is a non-visual element which contains only
-    the objectName property. It is useful for when you need an extremely
-    lightweight element to place your own custom properties in.
-
-    It can also be useful for C++ integration, as it is just a plain QObject. See
-    the QObject documentation for further details.
-*/
-/*!
-  \qmlproperty string QtObject::objectName
-  This property allows you to give a name to this specific object instance.
-
-  See \l{scripting.html#accessing-child-qobjects}{Accessing Child QObjects}
-  in the scripting documentation for details how objectName can be used from
-  scripts.
-*/
-
-struct StaticQtMetaObject : public QObject
-{
-    static const QMetaObject *get()
-        { return &static_cast<StaticQtMetaObject*> (0)->staticQtMetaObject; }
-};
-
-static bool qt_QmlQtModule_registered = false;
-
-void QmlEnginePrivate::defineModule()
-{
-    QML_REGISTER_TYPE(Qt,4,6,Component,QmlComponent);
-    QML_REGISTER_TYPE(Qt,4,6,QtObject,QObject);
-    QML_REGISTER_TYPE(Qt,4,6,WorkerScript,QmlWorkerScript);
-    QML_REGISTER_TYPE(Qt,4,6,WorkerListModel,QmlWorkerListModel);
-
-    QML_REGISTER_NOCREATE_TYPE(QmlBinding);
-}
-
-QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
-: captureProperties(false), rootContext(0), currentExpression(0), isDebugging(false), 
-  contextClass(0), sharedContext(0), sharedScope(0), objectClass(0), valueTypeClass(0), 
-  globalClass(0), cleanup(0), erroredBindings(0), inProgressCreations(0), 
-  scriptEngine(this), workerScriptEngine(0), componentAttacheds(0), inBeginCreate(false), 
-  networkAccessManager(0), networkAccessManagerFactory(0),
-  typeManager(e), uniqueId(1)
-{
-    if (!qt_QmlQtModule_registered) {
-        qt_QmlQtModule_registered = true;
-        QmlGraphicsItemModule::defineModule();
-        QmlGraphicsUtilModule::defineModule();
-        QmlEnginePrivate::defineModule();
-    }
-    globalClass = new QmlGlobalScriptClass(&scriptEngine);
-    fileImportPath.append(QLibraryInfo::location(QLibraryInfo::DataPath)+QDir::separator()+QLatin1String("qml"));
-
-    // env import paths
-    QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
-    if (!envImportPath.isEmpty()) {
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
-        QLatin1Char pathSep(';');
-#else
-        QLatin1Char pathSep(':');
-#endif
-        foreach (const QString &path, QString::fromLatin1(envImportPath).split(pathSep, QString::SkipEmptyParts)) {
-            QString canonicalPath = QDir(path).canonicalPath();
-            if (!canonicalPath.isEmpty() && !environmentImportPath.contains(canonicalPath))
-                environmentImportPath.append(canonicalPath);
-        }
-    }
-}
-
-QUrl QmlScriptEngine::resolvedUrl(QScriptContext *context, const QUrl& url)
-{
-    if (p) {
-        QmlContext *ctxt = QmlEnginePrivate::get(this)->getContext(context);
-        Q_ASSERT(ctxt);
-        return ctxt->resolvedUrl(url);
-    }
-    return baseUrl.resolved(url);
-}
-
-QmlScriptEngine::QmlScriptEngine(QmlEnginePrivate *priv)
-: p(priv), sqlQueryClass(0), namedNodeMapClass(0), nodeListClass(0)
-{
-    // Note that all documentation for stuff put on the global object goes in
-    // doc/src/declarative/globalobject.qdoc
-
-    bool mainthread = priv != 0;
-
-    QScriptValue qtObject =
-        newQMetaObject(StaticQtMetaObject::get());
-    globalObject().setProperty(QLatin1String("Qt"), qtObject);
-
-    offlineStoragePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation).replace(QLatin1Char('/'), QDir::separator())
-        + QDir::separator() + QLatin1String("QML")
-        + QDir::separator() + QLatin1String("OfflineStorage");
-
-
-    qt_add_qmlxmlhttprequest(this);
-    qt_add_qmlsqldatabase(this);
-    // XXX A Multimedia "Qt.Sound" class also needs to be made available,
-    // XXX but we don't want a dependency in that cirection.
-    // XXX When the above a done some better way, that way should also be
-    // XXX used to add Qt.Sound class.
-
-
-    //types
-    qtObject.setProperty(QLatin1String("rgba"), newFunction(QmlEnginePrivate::rgba, 4));
-    qtObject.setProperty(QLatin1String("hsla"), newFunction(QmlEnginePrivate::hsla, 4));
-    qtObject.setProperty(QLatin1String("rect"), newFunction(QmlEnginePrivate::rect, 4));
-    qtObject.setProperty(QLatin1String("point"), newFunction(QmlEnginePrivate::point, 2));
-    qtObject.setProperty(QLatin1String("size"), newFunction(QmlEnginePrivate::size, 2));
-    qtObject.setProperty(QLatin1String("vector3d"), newFunction(QmlEnginePrivate::vector, 3));
-
-    if (mainthread) {
-        //color helpers
-        qtObject.setProperty(QLatin1String("lighter"), newFunction(QmlEnginePrivate::lighter, 1));
-        qtObject.setProperty(QLatin1String("darker"), newFunction(QmlEnginePrivate::darker, 1));
-        qtObject.setProperty(QLatin1String("tint"), newFunction(QmlEnginePrivate::tint, 2));
-    }
-
-    //misc methods
-    qtObject.setProperty(QLatin1String("closestAngle"), newFunction(QmlEnginePrivate::closestAngle, 2));
-    qtObject.setProperty(QLatin1String("playSound"), newFunction(QmlEnginePrivate::playSound, 1));
-    qtObject.setProperty(QLatin1String("openUrlExternally"),newFunction(QmlEnginePrivate::desktopOpenUrl, 1));
-    qtObject.setProperty(QLatin1String("md5"),newFunction(QmlEnginePrivate::md5, 1));
-    qtObject.setProperty(QLatin1String("btoa"),newFunction(QmlEnginePrivate::btoa, 1));
-    qtObject.setProperty(QLatin1String("atob"),newFunction(QmlEnginePrivate::atob, 1));
-    qtObject.setProperty(QLatin1String("quit"), newFunction(QmlEnginePrivate::quit, 0));
-    qtObject.setProperty(QLatin1String("resolvedUrl"),newFunction(QmlScriptEngine::resolvedUrl, 1));
-
-    //firebug/webkit compat
-    QScriptValue consoleObject = newObject();
-    consoleObject.setProperty(QLatin1String("log"),newFunction(QmlEnginePrivate::consoleLog, 1));
-    consoleObject.setProperty(QLatin1String("debug"),newFunction(QmlEnginePrivate::consoleLog, 1));
-    globalObject().setProperty(QLatin1String("console"), consoleObject);
-
-    if (mainthread) {
-        globalObject().setProperty(QLatin1String("createQmlObject"),
-                newFunction(QmlEnginePrivate::createQmlObject, 1));
-        globalObject().setProperty(QLatin1String("createComponent"),
-                newFunction(QmlEnginePrivate::createComponent, 1));
-    }
-
-    // translation functions need to be installed
-    // before the global script class is constructed (QTBUG-6437)
-    installTranslatorFunctions();
-}
-
-QmlScriptEngine::~QmlScriptEngine()
-{
-    delete sqlQueryClass;
-    delete nodeListClass;
-    delete namedNodeMapClass;
-}
-
-QScriptValue QmlScriptEngine::resolvedUrl(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    QString arg = ctxt->argument(0).toString();
-    QUrl r = QmlScriptEngine::get(engine)->resolvedUrl(ctxt,QUrl(arg));
-    return QScriptValue(r.toString());
-}
-
-QNetworkAccessManager *QmlScriptEngine::networkAccessManager()
-{
-    return p->getNetworkAccessManager();
-}
-
-QmlEnginePrivate::~QmlEnginePrivate()
-{
-    while (cleanup) {
-        QmlCleanup *c = cleanup;
-        cleanup = c->next;
-        if (cleanup) cleanup->prev = &cleanup;
-        c->next = 0;
-        c->prev = 0;
-        c->clear();
-    }
-
-    delete rootContext;
-    rootContext = 0;
-    delete contextClass;
-    contextClass = 0;
-    delete objectClass;
-    objectClass = 0;
-    delete valueTypeClass;
-    valueTypeClass = 0;
-    delete typeNameClass;
-    typeNameClass = 0;
-    delete listClass;
-    listClass = 0;
-    delete globalClass;
-    globalClass = 0;
-
-    for(int ii = 0; ii < bindValues.count(); ++ii)
-        clear(bindValues[ii]);
-    for(int ii = 0; ii < parserStatus.count(); ++ii)
-        clear(parserStatus[ii]);
-    for(QHash<int, QmlCompiledData*>::ConstIterator iter = m_compositeTypes.constBegin(); iter != m_compositeTypes.constEnd(); ++iter)
-        (*iter)->release();
-    for(QHash<const QMetaObject *, QmlPropertyCache *>::Iterator iter = propertyCache.begin(); iter != propertyCache.end(); ++iter)
-        (*iter)->release();
-
-}
-
-void QmlEnginePrivate::clear(SimpleList<QmlAbstractBinding> &bvs)
-{
-    bvs.clear();
-}
-
-void QmlEnginePrivate::clear(SimpleList<QmlParserStatus> &pss)
-{
-    for (int ii = 0; ii < pss.count; ++ii) {
-        QmlParserStatus *ps = pss.at(ii);
-        if(ps)
-            ps->d = 0;
-    }
-    pss.clear();
-}
-
-Q_GLOBAL_STATIC(QmlEngineDebugServer, qmlEngineDebugServer);
-
-void QmlEnginePrivate::init()
-{
-    Q_Q(QmlEngine);
-    qRegisterMetaType<QVariant>("QVariant");
-    qRegisterMetaType<QmlScriptString>("QmlScriptString");
-    qRegisterMetaType<QScriptValue>("QScriptValue");
-
-    contextClass = new QmlContextScriptClass(q);
-    objectClass = new QmlObjectScriptClass(q);
-    valueTypeClass = new QmlValueTypeScriptClass(q);
-    typeNameClass = new QmlTypeNameScriptClass(q);
-    listClass = new QmlListScriptClass(q);
-    rootContext = new QmlContext(q,true);
-
-    if (QCoreApplication::instance()->thread() == q->thread() &&
-        QmlEngineDebugServer::isDebuggingEnabled()) {
-        qmlEngineDebugServer();
-        isDebugging = true;
-        QmlEngineDebugServer::addEngine(q);
-
-        qmlEngineDebugServer()->waitForClients();
-    }
-}
-
-QmlWorkerScriptEngine *QmlEnginePrivate::getWorkerScriptEngine()
-{
-    Q_Q(QmlEngine);
-    if (!workerScriptEngine) 
-        workerScriptEngine = new QmlWorkerScriptEngine(q);
-    return workerScriptEngine;
-}
-
-/*!
-    \class QmlEngine
-  \since 4.7
-    \brief The QmlEngine class provides an environment for instantiating QML components.
-    \mainclass
-
-    Each QML component is instantiated in a QmlContext.  QmlContext's are
-    essential for passing data to QML components.  In QML, contexts are arranged
-    hierarchically and this hierarchy is managed by the QmlEngine.
-
-    Prior to creating any QML components, an application must have created a
-    QmlEngine to gain access to a QML context.  The following example shows how
-    to create a simple Text item.
-
-    \code
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6\nText { text: \"Hello world!\" }", QUrl());
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(component.create());
-
-    //add item to view, etc
-    ...
-    \endcode
-
-    In this case, the Text item will be created in the engine's
-    \l {QmlEngine::rootContext()}{root context}.
-
-    \sa QmlComponent QmlContext
-*/
-
-/*!
-    Create a new QmlEngine with the given \a parent.
-*/
-QmlEngine::QmlEngine(QObject *parent)
-: QObject(*new QmlEnginePrivate(this), parent)
-{
-    Q_D(QmlEngine);
-    d->init();
-}
-
-/*!
-    Destroys the QmlEngine.
-
-    Any QmlContext's created on this engine will be invalidated, but not
-    destroyed (unless they are parented to the QmlEngine object).
-*/
-QmlEngine::~QmlEngine()
-{
-    Q_D(QmlEngine);
-    if (d->isDebugging)
-        QmlEngineDebugServer::remEngine(this);
-}
-
-/*! \fn void QmlEngine::quit()
-  This signal is emitted when the QmlEngine quits.
- */
-
-/*!
-  Clears the engine's internal component cache.
-
-  Normally the QmlEngine caches components loaded from qml files.  This method
-  clears this cache and forces the component to be reloaded.
- */
-void QmlEngine::clearComponentCache()
-{
-    Q_D(QmlEngine);
-    d->typeManager.clearCache();
-}
-
-/*!
-    Returns the engine's root context.
-
-    The root context is automatically created by the QmlEngine.  Data that
-    should be available to all QML component instances instantiated by the
-    engine should be put in the root context.
-
-    Additional data that should only be available to a subset of component
-    instances should be added to sub-contexts parented to the root context.
-*/
-QmlContext *QmlEngine::rootContext()
-{
-    Q_D(QmlEngine);
-    return d->rootContext;
-}
-
-/*!
-    Sets the \a factory to use for creating QNetworkAccessManager(s).
-
-    QNetworkAccessManager is used for all network access by QML.
-    By implementing a factory it is possible to create custom
-    QNetworkAccessManager with specialized caching, proxy and
-    cookie support.
-
-    The factory must be set before exceuting the engine.
-*/
-void QmlEngine::setNetworkAccessManagerFactory(QmlNetworkAccessManagerFactory *factory)
-{
-    Q_D(QmlEngine);
-    QMutexLocker locker(&d->mutex);
-    d->networkAccessManagerFactory = factory;
-}
-
-/*!
-    Returns the current QmlNetworkAccessManagerFactory.
-
-    \sa setNetworkAccessManagerFactory()
-*/
-QmlNetworkAccessManagerFactory *QmlEngine::networkAccessManagerFactory() const
-{
-    Q_D(const QmlEngine);
-    return d->networkAccessManagerFactory;
-}
-
-QNetworkAccessManager *QmlEnginePrivate::createNetworkAccessManager(QObject *parent) const
-{
-    QMutexLocker locker(&mutex);
-    QNetworkAccessManager *nam;
-    if (networkAccessManagerFactory) {
-        nam = networkAccessManagerFactory->create(parent);
-    } else {
-        nam = new QNetworkAccessManager(parent);
-    }
-
-    return nam;
-}
-
-QNetworkAccessManager *QmlEnginePrivate::getNetworkAccessManager() const
-{
-    Q_Q(const QmlEngine);
-    if (!networkAccessManager)
-        networkAccessManager = createNetworkAccessManager(const_cast<QmlEngine*>(q));
-    return networkAccessManager;
-}
-
-/*!
-    Returns a common QNetworkAccessManager which can be used by any QML element
-    instantiated by this engine.
-
-    If a QmlNetworkAccessManagerFactory has been set and a QNetworkAccessManager
-    has not yet been created, the QmlNetworkAccessManagerFactory will be used
-    to create the QNetworkAccessManager; otherwise the returned QNetworkAccessManager
-    will have no proxy or cache set.
-
-    \sa setNetworkAccessManagerFactory()
-*/
-QNetworkAccessManager *QmlEngine::networkAccessManager() const
-{
-    Q_D(const QmlEngine);
-    return d->getNetworkAccessManager();
-}
-
-/*!
-    Sets the \a provider to use for images requested via the \e image: url
-    scheme, with host \a providerId.
-
-    QmlImageProvider allows images to be provided to QML asynchronously.
-    The image request will be run in a low priority thread.  This allows
-    potentially costly image loading to be done in the background, without
-    affecting the performance of the UI.
-
-    Note that images loaded from a QmlImageProvider are cached by
-    QPixmapCache, similar to any image loaded by QML.
-
-    The QmlEngine assumes ownership of the provider.
-
-    This example creates a provider with id \e colors:
-
-    \snippet examples/declarative/imageprovider/main.cpp 0
-
-    \snippet examples/declarative/imageprovider/view.qml 0
-
-    \sa removeImageProvider()
-*/
-void QmlEngine::addImageProvider(const QString &providerId, QmlImageProvider *provider)
-{
-    Q_D(QmlEngine);
-    QMutexLocker locker(&d->mutex);
-    d->imageProviders.insert(providerId, provider);
-}
-
-/*!
-    Returns the QmlImageProvider set for \a providerId.
-*/
-QmlImageProvider *QmlEngine::imageProvider(const QString &providerId) const
-{
-    Q_D(const QmlEngine);
-    QMutexLocker locker(&d->mutex);
-    return d->imageProviders.value(providerId);
-}
-
-/*!
-    Removes the QmlImageProvider for \a providerId.
-
-    Returns the provider if it was found; otherwise returns 0.
-
-    \sa addImageProvider()
-*/
-void QmlEngine::removeImageProvider(const QString &providerId)
-{
-    Q_D(QmlEngine);
-    QMutexLocker locker(&d->mutex);
-    delete d->imageProviders.take(providerId);
-}
-
-QImage QmlEnginePrivate::getImageFromProvider(const QUrl &url)
-{
-    QMutexLocker locker(&mutex);
-    QImage image;
-    QmlImageProvider *provider = imageProviders.value(url.host());
-    if (provider)
-        image = provider->request(url.path().mid(1));
-    return image;
-}
-
-/*!
-    Return the base URL for this engine.  The base URL is only used to resolve
-    components when a relative URL is passed to the QmlComponent constructor.
-
-    If a base URL has not been explicitly set, this method returns the
-    application's current working directory.
-
-    \sa setBaseUrl()
-*/
-QUrl QmlEngine::baseUrl() const
-{
-    Q_D(const QmlEngine);
-    if (d->baseUrl.isEmpty()) {
-        return QUrl::fromLocalFile(QDir::currentPath() + QDir::separator());
-    } else {
-        return d->baseUrl;
-    }
-}
-
-/*!
-    Set the  base URL for this engine to \a url.
-
-    \sa baseUrl()
-*/
-void QmlEngine::setBaseUrl(const QUrl &url)
-{
-    Q_D(QmlEngine);
-    d->baseUrl = url;
-}
-
-/*!
-  Returns the QmlContext for the \a object, or 0 if no context has been set.
-
-  When the QmlEngine instantiates a QObject, the context is set automatically.
-  */
-QmlContext *QmlEngine::contextForObject(const QObject *object)
-{
-    if(!object)
-        return 0;
-
-    QObjectPrivate *priv = QObjectPrivate::get(const_cast<QObject *>(object));
-
-    QmlDeclarativeData *data =
-        static_cast<QmlDeclarativeData *>(priv->declarativeData);
-
-    if (!data)
-        return 0;
-    else if (data->outerContext)
-        return data->outerContext;
-    else
-        return data->context;
-}
-
-/*!
-  Sets the QmlContext for the \a object to \a context.
-  If the \a object already has a context, a warning is
-  output, but the context is not changed.
-
-  When the QmlEngine instantiates a QObject, the context is set automatically.
- */
-void QmlEngine::setContextForObject(QObject *object, QmlContext *context)
-{
-    if (!object || !context)
-        return;
-
-    QmlDeclarativeData *data = QmlDeclarativeData::get(object, true);
-    if (data->context) {
-        qWarning("QmlEngine::setContextForObject(): Object already has a QmlContext");
-        return;
-    }
-
-    data->context = context;
-    data->nextContextObject = context->d_func()->contextObjects;
-    if (data->nextContextObject) 
-        data->nextContextObject->prevContextObject = &data->nextContextObject;
-    data->prevContextObject = &context->d_func()->contextObjects;
-    context->d_func()->contextObjects = data;
-}
-
-void qmlExecuteDeferred(QObject *object)
-{
-    QmlDeclarativeData *data = QmlDeclarativeData::get(object);
-
-    if (data && data->deferredComponent) {
-
-        QmlEnginePrivate *ep = QmlEnginePrivate::get(data->context->engine());
-
-        QmlComponentPrivate::ConstructionState state;
-        QmlComponentPrivate::beginDeferred(data->context, ep, object, &state);
-
-        data->deferredComponent->release();
-        data->deferredComponent = 0;
-
-        QmlComponentPrivate::complete(ep, &state);
-
-        if (!state.errors.isEmpty())
-            qWarning() << state.errors;
-
-    }
-}
-
-QmlContext *qmlContext(const QObject *obj)
-{
-    return QmlEngine::contextForObject(obj);
-}
-
-QmlEngine *qmlEngine(const QObject *obj)
-{
-    QmlContext *context = QmlEngine::contextForObject(obj);
-    return context?context->engine():0;
-}
-
-QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool create)
-{
-    QmlDeclarativeData *data = QmlDeclarativeData::get(object);
-    if (!data)
-        return 0; // Attached properties are only on objects created by QML
-
-    QObject *rv = data->attachedProperties?data->attachedProperties->value(id):0;
-    if (rv || !create)
-        return rv;
-
-    QmlAttachedPropertiesFunc pf = QmlMetaType::attachedPropertiesFuncById(id);
-    if (!pf)
-        return 0;
-
-    rv = pf(const_cast<QObject *>(object));
-
-    if (rv) {
-        if (!data->attachedProperties)
-            data->attachedProperties = new QHash<int, QObject *>();
-        data->attachedProperties->insert(id, rv);
-    }
-
-    return rv;
-}
-
-void QmlDeclarativeData::destroyed(QObject *object)
-{
-    if (deferredComponent)
-        deferredComponent->release();
-    if (attachedProperties)
-        delete attachedProperties;
-
-    if (nextContextObject) 
-        nextContextObject->prevContextObject = prevContextObject;
-    if (prevContextObject)
-        *prevContextObject = nextContextObject;
-
-    QmlAbstractBinding *binding = bindings;
-    while (binding) {
-        QmlAbstractBinding *next = binding->m_nextBinding;
-        binding->m_prevBinding = 0;
-        binding->m_nextBinding = 0;
-        binding->destroy();
-        binding = next;
-    }
-
-    if (bindingBits)
-        free(bindingBits);
-
-    if (propertyCache)
-        propertyCache->release();
-
-    QmlGuard<QObject> *guard = guards;
-    while (guard) {
-        QmlGuard<QObject> *g = guard;
-        guard = guard->next;
-        g->o = 0;
-        g->prev = 0;
-        g->next = 0;
-        g->objectDestroyed(object);
-    }
-
-    delete this;
-}
-
-bool QmlDeclarativeData::hasBindingBit(int bit) const
-{
-    if (bindingBitsSize > bit) 
-        return bindingBits[bit / 32] & (1 << (bit % 32));
-    else
-        return false;
-}
-
-void QmlDeclarativeData::clearBindingBit(int bit)
-{
-    if (bindingBitsSize > bit) 
-        bindingBits[bit / 32] &= ~(1 << (bit % 32));
-}
-
-void QmlDeclarativeData::setBindingBit(QObject *obj, int bit)
-{
-    if (bindingBitsSize <= bit) {
-        int props = obj->metaObject()->propertyCount();
-        Q_ASSERT(bit < props);
-
-        int arraySize = (props + 31) / 32;
-        int oldArraySize = bindingBitsSize / 32;
-
-        bindingBits = (quint32 *)realloc(bindingBits, 
-                                         arraySize * sizeof(quint32));
-
-        memset(bindingBits + oldArraySize, 
-               0x00,
-               sizeof(quint32) * (arraySize - oldArraySize));
-
-        bindingBitsSize = arraySize * 32;
-    }
-
-    bindingBits[bit / 32] |= (1 << (bit % 32));
-}
-
-/*!
-    Creates a QScriptValue allowing you to use \a object in QML script.
-    \a engine is the QmlEngine it is to be created in.
-
-    The QScriptValue returned is a QtScript Object, not a QtScript QObject, due
-    to the special needs of QML requiring more functionality than a standard
-    QtScript QObject.
-*/
-QScriptValue QmlEnginePrivate::qmlScriptObject(QObject* object,
-                                               QmlEngine* engine)
-{
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);
-    return enginePriv->objectClass->newQObject(object);
-}
-
-/*!
-    Returns the QmlContext for the executing QScript \a ctxt.
-*/
-QmlContext *QmlEnginePrivate::getContext(QScriptContext *ctxt)
-{
-    QScriptValue scopeNode = QScriptDeclarativeClass::scopeChainValue(ctxt, -3);
-    Q_ASSERT(scopeNode.isValid());
-    Q_ASSERT(QScriptDeclarativeClass::scriptClass(scopeNode) == contextClass);
-    return contextClass->contextFromValue(scopeNode);
-}
-
-QScriptValue QmlEnginePrivate::createComponent(QScriptContext *ctxt,
-                                               QScriptEngine *engine)
-{
-    QmlEnginePrivate *activeEnginePriv =
-        static_cast<QmlScriptEngine*>(engine)->p;
-    QmlEngine* activeEngine = activeEnginePriv->q_func();
-
-    QmlContext* context = activeEnginePriv->getContext(ctxt);
-    Q_ASSERT(context);
-    if(ctxt->argumentCount() != 1) {
-        return engine->nullValue();
-    }else{
-        QString arg = ctxt->argument(0).toString();
-        if (arg.isEmpty())
-            return engine->nullValue();
-        QUrl url = QUrl(context->resolvedUrl(QUrl(arg)));
-        QmlComponent *c = new QmlComponent(activeEngine, url, activeEngine);
-        c->setCreationContext(context);
-        return activeEnginePriv->objectClass->newQObject(c, qMetaTypeId<QmlComponent*>());
-    }
-}
-
-QScriptValue QmlEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    QmlEnginePrivate *activeEnginePriv =
-        static_cast<QmlScriptEngine*>(engine)->p;
-    QmlEngine* activeEngine = activeEnginePriv->q_func();
-
-    if(ctxt->argumentCount() < 2 || ctxt->argumentCount() > 3)
-        return engine->nullValue();
-
-    QmlContext* context = activeEnginePriv->getContext(ctxt);
-    Q_ASSERT(context);
-
-    QString qml = ctxt->argument(0).toString();
-    if (qml.isEmpty())
-        return engine->nullValue();
-
-    QUrl url;
-    if(ctxt->argumentCount() > 2)
-        url = QUrl(ctxt->argument(2).toString());
-    else
-        url = QUrl(QLatin1String("inline"));
-
-    if (url.isValid() && url.isRelative())
-        url = context->resolvedUrl(url);
-
-    QObject *parentArg = activeEnginePriv->objectClass->toQObject(ctxt->argument(1));
-    if(!parentArg) 
-        return engine->nullValue();
-
-    QmlComponent component(activeEngine);
-    component.setData(qml.toUtf8(), url);
-
-    if(component.isError()) {
-        QList<QmlError> errors = component.errors();
-        qWarning().nospace() << "QmlEngine::createQmlObject():";
-        foreach (const QmlError &error, errors)
-            qWarning().nospace() << "    " << error;
-
-        return engine->nullValue();
-    }
-
-    if (!component.isReady()) {
-        qWarning().nospace() << "QmlEngine::createQmlObject(): Component is not ready";
-
-        return engine->nullValue();
-    }
-
-    QObject *obj = component.create(context);
-
-    if(component.isError()) {
-        QList<QmlError> errors = component.errors();
-        qWarning().nospace() << "QmlEngine::createQmlObject():";
-        foreach (const QmlError &error, errors)
-            qWarning().nospace() << "    " << error;
-
-        return engine->nullValue();
-    }
-
-    Q_ASSERT(obj);
-
-    obj->setParent(parentArg);
-    QGraphicsObject* gobj = qobject_cast<QGraphicsObject*>(obj);
-    QGraphicsObject* gparent = qobject_cast<QGraphicsObject*>(parentArg);
-    if(gobj && gparent)
-        gobj->setParentItem(gparent);
-
-    return qmlScriptObject(obj, activeEngine);
-}
-
-QScriptValue QmlEnginePrivate::vector(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    if(ctxt->argumentCount() != 3)
-        return engine->nullValue();
-    qsreal x = ctxt->argument(0).toNumber();
-    qsreal y = ctxt->argument(1).toNumber();
-    qsreal z = ctxt->argument(2).toNumber();
-    return engine->newVariant(qVariantFromValue(QVector3D(x, y, z)));
-}
-
-QScriptValue QmlEnginePrivate::rgba(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    int argCount = ctxt->argumentCount();
-    if(argCount < 3 || argCount > 4)
-        return engine->nullValue();
-    qsreal r = ctxt->argument(0).toNumber();
-    qsreal g = ctxt->argument(1).toNumber();
-    qsreal b = ctxt->argument(2).toNumber();
-    qsreal a = (argCount == 4) ? ctxt->argument(3).toNumber() : 1;
-
-    if (r < 0 || r > 1 || g < 0 || g > 1 || b < 0 || b > 1 || a < 0 || a > 1)
-        return engine->nullValue();
-
-    return qScriptValueFromValue(engine, qVariantFromValue(QColor::fromRgbF(r, g, b, a)));
-}
-
-QScriptValue QmlEnginePrivate::hsla(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    int argCount = ctxt->argumentCount();
-    if(argCount < 3 || argCount > 4)
-        return engine->nullValue();
-    qsreal h = ctxt->argument(0).toNumber();
-    qsreal s = ctxt->argument(1).toNumber();
-    qsreal l = ctxt->argument(2).toNumber();
-    qsreal a = (argCount == 4) ? ctxt->argument(3).toNumber() : 1;
-
-    if (h < 0 || h > 1 || s < 0 || s > 1 || l < 0 || l > 1 || a < 0 || a > 1)
-        return engine->nullValue();
-
-    return qScriptValueFromValue(engine, qVariantFromValue(QColor::fromHslF(h, s, l, a)));
-}
-
-QScriptValue QmlEnginePrivate::rect(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    if(ctxt->argumentCount() != 4)
-        return engine->nullValue();
-
-    qsreal x = ctxt->argument(0).toNumber();
-    qsreal y = ctxt->argument(1).toNumber();
-    qsreal w = ctxt->argument(2).toNumber();
-    qsreal h = ctxt->argument(3).toNumber();
-
-    if (w < 0 || h < 0)
-        return engine->nullValue();
-
-    return qScriptValueFromValue(engine, qVariantFromValue(QRectF(x, y, w, h)));
-}
-
-QScriptValue QmlEnginePrivate::point(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    if(ctxt->argumentCount() != 2)
-        return engine->nullValue();
-    qsreal x = ctxt->argument(0).toNumber();
-    qsreal y = ctxt->argument(1).toNumber();
-    return qScriptValueFromValue(engine, qVariantFromValue(QPointF(x, y)));
-}
-
-QScriptValue QmlEnginePrivate::size(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    if(ctxt->argumentCount() != 2)
-        return engine->nullValue();
-    qsreal w = ctxt->argument(0).toNumber();
-    qsreal h = ctxt->argument(1).toNumber();
-    return qScriptValueFromValue(engine, qVariantFromValue(QSizeF(w, h)));
-}
-
-QScriptValue QmlEnginePrivate::lighter(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    if(ctxt->argumentCount() != 1)
-        return engine->nullValue();
-    QVariant v = ctxt->argument(0).toVariant();
-    QColor color;
-    if (v.userType() == QVariant::Color)
-        color = v.value<QColor>();
-    else if (v.userType() == QVariant::String) {
-        bool ok;
-        color = QmlStringConverters::colorFromString(v.toString(), &ok);
-        if (!ok)
-            return engine->nullValue();
-    } else
-        return engine->nullValue();
-    color = color.lighter();
-    return qScriptValueFromValue(engine, qVariantFromValue(color));
-}
-
-QScriptValue QmlEnginePrivate::darker(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    if(ctxt->argumentCount() != 1)
-        return engine->nullValue();
-    QVariant v = ctxt->argument(0).toVariant();
-    QColor color;
-    if (v.userType() == QVariant::Color)
-        color = v.value<QColor>();
-    else if (v.userType() == QVariant::String) {
-        bool ok;
-        color = QmlStringConverters::colorFromString(v.toString(), &ok);
-        if (!ok)
-            return engine->nullValue();
-    } else
-        return engine->nullValue();
-    color = color.darker();
-    return qScriptValueFromValue(engine, qVariantFromValue(color));
-}
-
-QScriptValue QmlEnginePrivate::playSound(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    if (ctxt->argumentCount() != 1)
-        return engine->undefinedValue();
-
-    QUrl url(ctxt->argument(0).toString());
-
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);
-    if (url.isRelative()) {
-        QmlContext *context = enginePriv->getContext(ctxt);
-        if (!context)
-            return engine->undefinedValue();
-
-        url = context->resolvedUrl(url);
-    }
-
-    if (url.scheme() == QLatin1String("file")) {
-
-        QSound::play(url.toLocalFile());
-
-    }
-    return engine->undefinedValue();
-}
-
-QScriptValue QmlEnginePrivate::desktopOpenUrl(QScriptContext *ctxt, QScriptEngine *e)
-{
-    if(ctxt->argumentCount() < 1)
-        return e->newVariant(QVariant(false));
-    bool ret = QDesktopServices::openUrl(QUrl(ctxt->argument(0).toString()));
-    return e->newVariant(QVariant(ret));
-}
-
-QScriptValue QmlEnginePrivate::md5(QScriptContext *ctxt, QScriptEngine *)
-{
-    QByteArray data;
-
-    if (ctxt->argumentCount() >= 1)
-        data = ctxt->argument(0).toString().toUtf8();
-
-    QByteArray result = QCryptographicHash::hash(data, QCryptographicHash::Md5);
-
-    return QScriptValue(QLatin1String(result.toHex()));
-}
-
-QScriptValue QmlEnginePrivate::btoa(QScriptContext *ctxt, QScriptEngine *)
-{
-    QByteArray data;
-
-    if (ctxt->argumentCount() >= 1)
-        data = ctxt->argument(0).toString().toUtf8();
-
-    return QScriptValue(QLatin1String(data.toBase64()));
-}
-
-QScriptValue QmlEnginePrivate::atob(QScriptContext *ctxt, QScriptEngine *)
-{
-    QByteArray data;
-
-    if (ctxt->argumentCount() >= 1)
-        data = ctxt->argument(0).toString().toUtf8();
-
-    return QScriptValue(QLatin1String(QByteArray::fromBase64(data)));
-}
-
-QScriptValue QmlEnginePrivate::consoleLog(QScriptContext *ctxt, QScriptEngine *e)
-{
-    if(ctxt->argumentCount() < 1)
-        return e->newVariant(QVariant(false));
-
-    QByteArray msg;
-
-    for (int i=0; i<ctxt->argumentCount(); ++i) {
-        if (!msg.isEmpty()) msg += ' ';
-        msg += ctxt->argument(i).toString().toLocal8Bit();
-        // does not support firebug "%[a-z]" formatting, since firebug really
-        // does just ignore the format letter, which makes it pointless.
-    }
-
-    qDebug("%s",msg.constData());
-
-    return e->newVariant(QVariant(true));
-}
-
-void QmlEnginePrivate::sendQuit ()
-{
-    Q_Q(QmlEngine);
-    emit q->quit();
-}
-
-QScriptValue QmlEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptEngine *e)
-{
-    QmlEnginePrivate *qe = get (e);
-    qe->sendQuit ();
-    return QScriptValue();
-}
-
-QScriptValue QmlEnginePrivate::closestAngle(QScriptContext *ctxt, QScriptEngine *e)
-{
-    if(ctxt->argumentCount() < 2)
-        return e->newVariant(QVariant(0.0));
-    qreal a = ctxt->argument(0).toNumber();
-    qreal b = ctxt->argument(1).toNumber();
-    qreal ret = b;
-    qreal diff = b-a;
-    while(diff > 180.0){
-        ret -= 360.0;
-        diff -= 360.0;
-    }
-    while(diff < -180.0){
-        ret += 360.0;
-        diff += 360.0;
-    }
-    return e->newVariant(QVariant(ret));
-}
-
-QScriptValue QmlEnginePrivate::tint(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    if(ctxt->argumentCount() != 2)
-        return engine->nullValue();
-    //get color
-    QVariant v = ctxt->argument(0).toVariant();
-    QColor color;
-    if (v.userType() == QVariant::Color)
-        color = v.value<QColor>();
-    else if (v.userType() == QVariant::String) {
-        bool ok;
-        color = QmlStringConverters::colorFromString(v.toString(), &ok);
-        if (!ok)
-            return engine->nullValue();
-    } else
-        return engine->nullValue();
-
-    //get tint color
-    v = ctxt->argument(1).toVariant();
-    QColor tintColor;
-    if (v.userType() == QVariant::Color)
-        tintColor = v.value<QColor>();
-    else if (v.userType() == QVariant::String) {
-        bool ok;
-        tintColor = QmlStringConverters::colorFromString(v.toString(), &ok);
-        if (!ok)
-            return engine->nullValue();
-    } else
-        return engine->nullValue();
-
-    //tint
-    QColor finalColor;
-    int a = tintColor.alpha();
-    if (a == 0xFF)
-        finalColor = tintColor;
-    else if (a == 0x00)
-        finalColor = color;
-    else {
-        uint src = tintColor.rgba();
-        uint dest = color.rgba();
-
-        uint res = (((a * (src & 0xFF00FF)) +
-                    ((0xFF - a) * (dest & 0xFF00FF))) >> 8) & 0xFF00FF;
-        res |= (((a * ((src >> 8) & 0xFF00FF)) +
-                ((0xFF - a) * ((dest >> 8) & 0xFF00FF)))) & 0xFF00FF00;
-        if ((src & 0xFF000000) == 0xFF000000)
-            res |= 0xFF000000;
-
-        finalColor = QColor::fromRgba(res);
-    }
-
-    return qScriptValueFromValue(engine, qVariantFromValue(finalColor));
-}
-
-
-QScriptValue QmlEnginePrivate::scriptValueFromVariant(const QVariant &val)
-{
-    if (val.userType() == qMetaTypeId<QmlListReference>()) {
-        QmlListReferencePrivate *p = QmlListReferencePrivate::get((QmlListReference*)val.constData());
-        if (p->object) {
-            return listClass->newList(p->property, p->propertyType);
-        } else {
-            return scriptEngine.nullValue();
-        }
-    }
-
-    bool objOk;
-    QObject *obj = QmlMetaType::toQObject(val, &objOk);
-    if (objOk) {
-        return objectClass->newQObject(obj);
-    } else {
-        return qScriptValueFromValue(&scriptEngine, val);
-    }
-}
-
-QVariant QmlEnginePrivate::scriptValueToVariant(const QScriptValue &val)
-{
-    QScriptDeclarativeClass *dc = QScriptDeclarativeClass::scriptClass(val);
-    if (dc == objectClass)
-        return QVariant::fromValue(objectClass->toQObject(val));
-    else if (dc == contextClass)
-        return QVariant();
-
-    QScriptDeclarativeClass *sc = QScriptDeclarativeClass::scriptClass(val);
-    if (!sc) {
-        return val.toVariant();
-    } else if (sc == valueTypeClass) {
-        return valueTypeClass->toVariant(val);
-    } else {
-        return QVariant();
-    }
-}
-
-QmlScriptClass::QmlScriptClass(QScriptEngine *engine)
-: QScriptDeclarativeClass(engine)
-{
-}
-
-QVariant QmlScriptClass::toVariant(QmlEngine *engine, const QScriptValue &val)
-{
-    QmlEnginePrivate *ep =
-        static_cast<QmlEnginePrivate *>(QObjectPrivate::get(engine));
-
-    return ep->scriptValueToVariant(val);
-}
-
-// XXX this beyonds in QUrl::toLocalFile()
-static QString toLocalFileOrQrc(const QUrl& url)
-{
-    QString r = url.toLocalFile();
-    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
-        r = QLatin1Char(':') + url.path();
-    return r;
-}
-
-/////////////////////////////////////////////////////////////
-struct QmlEnginePrivate::ImportedNamespace {
-    QStringList uris;
-    QStringList urls;
-    QList<int> majversions;
-    QList<int> minversions;
-    QList<bool> isLibrary;
-    QList<QString> qmlDirContent;
-
-    bool find(const QByteArray& type, int *vmajor, int *vminor, QmlType** type_return, QUrl* url_return) const
-    {
-        for (int i=0; i<urls.count(); ++i) {
-            int vmaj = majversions.at(i);
-            int vmin = minversions.at(i);
-
-            QByteArray qt = uris.at(i).toUtf8();
-            qt += '/';
-            qt += type;
-
-            if (qmlImportTrace())
-                qDebug() << "Look in" << qt;
-            QmlType *t = QmlMetaType::qmlType(qt,vmaj,vmin);
-            if (t) {
-                if (vmajor) *vmajor = vmaj;
-                if (vminor) *vminor = vmin;
-                if (qmlImportTrace())
-                    qDebug() << "Found" << qt;
-                if (type_return)
-                    *type_return = t;
-                return true;
-            }
-
-            QUrl url = QUrl(urls.at(i) + QLatin1Char('/') + QString::fromUtf8(type) + QLatin1String(".qml"));
-            QString qmldircontent = qmlDirContent.at(i);
-            if (vmaj>=0 || !qmldircontent.isEmpty()) {
-                // Check version file - XXX cache these in QmlEngine!
-                if (qmldircontent.isEmpty()) {
-                    QFile qmldir(toLocalFileOrQrc(QUrl(urls.at(i)+QLatin1String("/qmldir"))));
-                    if (qmldir.open(QIODevice::ReadOnly)) {
-                        qmldircontent = QString::fromUtf8(qmldir.readAll());
-                    }
-                }
-
-                const QString typeName = QString::fromUtf8(type);
-
-                QmlDirParser qmldirParser;
-                qmldirParser.setUrl(url);
-                qmldirParser.setSource(qmldircontent);
-                qmldirParser.parse();
-
-                foreach (const QmlDirParser::Component &c, qmldirParser.components()) { // ### TODO: cache the components
-                    if (c.majorVersion < vmaj || (c.majorVersion == vmaj && vmin >= c.minorVersion)) {
-                        if (c.typeName == typeName) {
-                            if (url_return)
-                                *url_return = url.resolved(QUrl(c.fileName));
-
-                            return true;
-                        }
-                    }
-                }
-
-            } else {
-                // XXX search non-files too! (eg. zip files, see QT-524)
-                QFileInfo f(toLocalFileOrQrc(url));
-                if (f.exists()) {
-                    if (url_return)
-                        *url_return = url;
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-};
-
-class QmlImportsPrivate {
-public:
-    QmlImportsPrivate() : ref(1)
-    {
-    }
-
-    ~QmlImportsPrivate()
-    {
-        foreach (QmlEnginePrivate::ImportedNamespace* s, set.values())
-            delete s;
-    }
-
-    QSet<QString> qmlDirFilesForWhichPluginsHaveBeenLoaded;
-
-    bool add(const QUrl& base, const QString& qmldircontent, const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType, const QStringList& importPath, QmlEngine *engine)
-    {
-        QmlEnginePrivate::ImportedNamespace *s;
-        if (prefix.isEmpty()) {
-            s = &unqualifiedset;
-        } else {
-            s = set.value(prefix);
-            if (!s)
-                set.insert(prefix,(s=new QmlEnginePrivate::ImportedNamespace));
-        }
-        QString url = uri;
-        if (importType == QmlScriptParser::Import::Library) {
-            url.replace(QLatin1Char('.'), QLatin1Char('/'));
-            bool found = false;
-            QString content;
-            QString dir;            
-
-            // user import paths
-            QStringList paths;
-
-            // base..
-            paths += QFileInfo(base.toLocalFile()).path();
-            paths += importPath;
-            paths += QmlEnginePrivate::get(engine)->environmentImportPath;
-
-            foreach (const QString &p, paths) {
-                dir = p+QLatin1Char('/')+url;
-                QFileInfo fi(dir+QLatin1String("/qmldir"));
-                const QString absoluteFilePath = fi.absoluteFilePath();
-
-                if (fi.isFile()) {
-                    found = true;
-
-                    url = QUrl::fromLocalFile(fi.absolutePath()).toString();
-
-                    QFile file(absoluteFilePath);
-                    if (file.open(QFile::ReadOnly))
-                        content = QString::fromUtf8(file.readAll());
-
-                    if (! qmlDirFilesForWhichPluginsHaveBeenLoaded.contains(absoluteFilePath)) {
-                        qmlDirFilesForWhichPluginsHaveBeenLoaded.insert(absoluteFilePath);
-
-                        QmlDirParser qmldirParser;
-                        qmldirParser.setSource(content);
-                        qmldirParser.parse();
-
-                        foreach (const QmlDirParser::Plugin &plugin, qmldirParser.plugins()) {
-                            QString resolvedFilePath = QmlEnginePrivate::get(engine)->resolvePlugin(dir + QDir::separator() + plugin.path,
-                                                                                                    plugin.name);
-
-                            if (!resolvedFilePath.isEmpty())
-                                engine->importExtension(resolvedFilePath, uri);
-                        }
-                    }
-
-                    break;
-                }
-            }
-
-        } else {
-            url = base.resolved(QUrl(url)).toString();
-        }
-
-        s->uris.prepend(uri);
-        s->urls.prepend(url);
-        s->majversions.prepend(vmaj);
-        s->minversions.prepend(vmin);
-        s->isLibrary.prepend(importType == QmlScriptParser::Import::Library);
-        s->qmlDirContent.prepend(qmldircontent);
-        return true;
-    }
-
-    bool find(const QByteArray& type, int *vmajor, int *vminor, QmlType** type_return, QUrl* url_return)
-    {
-        QmlEnginePrivate::ImportedNamespace *s = 0;
-        int slash = type.indexOf('/');
-        if (slash >= 0) {
-            s = set.value(QString::fromUtf8(type.left(slash)));
-            if (!s)
-                return false; // qualifier must be a namespace
-            int nslash = type.indexOf('/',slash+1);
-            if (nslash > 0)
-                return false; // only single qualification allowed
-        } else {
-            s = &unqualifiedset;
-        }
-        QByteArray unqualifiedtype = slash < 0 ? type : type.mid(slash+1); // common-case opt (QString::mid works fine, but slower)
-        if (s) {
-            if (s->find(unqualifiedtype,vmajor,vminor,type_return,url_return))
-                return true;
-            if (s->urls.count() == 1 && !s->isLibrary[0] && url_return) {
-                *url_return = QUrl(s->urls[0]+QLatin1Char('/')).resolved(QUrl(QString::fromUtf8(unqualifiedtype) + QLatin1String(".qml")));
-                return true;
-            }
-
-        }
-        if (url_return) {
-            *url_return = base.resolved(QUrl(QString::fromUtf8(type + ".qml")));
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    QmlEnginePrivate::ImportedNamespace *findNamespace(const QString& type)
-    {
-        return set.value(type);
-    }
-
-    QUrl base;
-    int ref;
-
-private:
-    friend struct QmlEnginePrivate::Imports;
-    QmlEnginePrivate::ImportedNamespace unqualifiedset;
-    QHash<QString,QmlEnginePrivate::ImportedNamespace* > set;
-};
-
-QmlEnginePrivate::Imports::Imports(const Imports &copy) :
-    d(copy.d)
-{
-    ++d->ref;
-}
-
-QmlEnginePrivate::Imports &QmlEnginePrivate::Imports::operator =(const Imports &copy)
-{
-    ++copy.d->ref;
-    if (--d->ref == 0)
-        delete d;
-    d = copy.d;
-    return *this;
-}
-
-QmlEnginePrivate::Imports::Imports() :
-    d(new QmlImportsPrivate)
-{
-}
-
-QmlEnginePrivate::Imports::~Imports()
-{
-    if (--d->ref == 0)
-        delete d;
-}
-
-#include "qmlmetatype.h"
-#include "qmltypenamecache_p.h"
-
-static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePrivate::ImportedNamespace &set, QmlTypeNameCache *cache)
-{
-    if (!cache)
-        cache = new QmlTypeNameCache(engine);
-
-    QList<QmlType *> types = QmlMetaType::qmlTypes();
-
-    for (int ii = 0; ii < set.uris.count(); ++ii) {
-        QByteArray base = set.uris.at(ii).toUtf8() + '/';
-        int major = set.majversions.at(ii);
-        int minor = set.minversions.at(ii);
-
-        foreach (QmlType *type, types) {
-            if (type->qmlTypeName().startsWith(base) && 
-                type->qmlTypeName().lastIndexOf('/') == (base.length() - 1) && 
-                type->availableInVersion(major,minor))
-            {
-                QString name = QString::fromUtf8(type->qmlTypeName().mid(base.length()));
-
-                cache->add(name, type);
-            }
-        }
-    }
-
-    return cache;
-}
-
-QmlTypeNameCache *QmlEnginePrivate::Imports::cache(QmlEngine *engine) const
-{
-    const QmlEnginePrivate::ImportedNamespace &set = d->unqualifiedset;
-
-    QmlTypeNameCache *cache = new QmlTypeNameCache(engine);
-
-    for (QHash<QString,QmlEnginePrivate::ImportedNamespace* >::ConstIterator iter = d->set.begin();
-         iter != d->set.end(); ++iter) {
-
-        QmlTypeNameCache::Data *d = cache->data(iter.key());
-        if (d) {
-            if (!d->typeNamespace)
-                cacheForNamespace(engine, *(*iter), d->typeNamespace);
-        } else {
-            QmlTypeNameCache *nc = cacheForNamespace(engine, *(*iter), 0);
-            cache->add(iter.key(), nc);
-            nc->release();
-        }
-    }
-
-    cacheForNamespace(engine, set, cache);
-
-    return cache;
-}
-
-/*
-QStringList QmlEnginePrivate::Imports::unqualifiedSet() const
-{
-    QStringList rv;
-
-    const QmlEnginePrivate::ImportedNamespace &set = d->unqualifiedset;
-
-    for (int ii = 0; ii < set.urls.count(); ++ii) {
-        if (set.isBuiltin.at(ii))
-            rv << set.urls.at(ii);
-    }
-
-    return rv;
-}
-*/
-
-/*!
-  Sets the base URL to be used for all relative file imports added.
-*/
-void QmlEnginePrivate::Imports::setBaseUrl(const QUrl& url)
-{
-    d->base = url;
-}
-
-/*!
-  Returns the base URL to be used for all relative file imports added.
-*/
-QUrl QmlEnginePrivate::Imports::baseUrl() const
-{
-    return d->base;
-}
-
-/*!
-  Adds \a path as a directory where installed QML components are
-  defined in a URL-based directory structure.
-
-  For example, if you add \c /opt/MyApp/lib/qml and then load QML
-  that imports \c com.mycompany.Feature, then QmlEngine will look
-  in \c /opt/MyApp/lib/qml/com/mycompany/Feature/ for the components
-  provided by that module (and in the case of versioned imports,
-  for the \c qmldir file definiting the type version mapping.
-
-  By default, only the "qml" subdirectory of QLibraryInfo::location(QLibraryInfo::DataPath)
-  is included on the import path.
-*/
-void QmlEngine::addImportPath(const QString& path)
-{
-    if (qmlImportTrace())
-        qDebug() << "QmlEngine::addImportPath" << path;
-    Q_D(QmlEngine);
-    d->fileImportPath.prepend(path);
-}
-
-/*!
-  Imports the given \a extension into this QmlEngine.  Returns
-  true if the extension was successfully imported.
-
-  \sa QmlExtensionInterface
-*/
-bool QmlEngine::importExtension(const QString &fileName, const QString &uri)
-{
-    QPluginLoader loader(fileName);
-
-    if (QmlExtensionInterface *iface = qobject_cast<QmlExtensionInterface *>(loader.instance())) {
-        iface->initialize(this, uri.toUtf8().constData());
-        return true;
-    }
-
-    return false;
-}
-
-/*!
-  \property QmlEngine::offlineStoragePath
-  \brief the directory for storing offline user data
-
-  Returns the directory where SQL and other offline
-  storage is placed.
-
-  QmlGraphicsWebView and the SQL databases created with openDatabase()
-  are stored here.
-
-  The default is QML/OfflineStorage in the platform-standard
-  user application data directory.
-
-  Note that the path may not currently exist on the filesystem, so
-  callers wanting to \e create new files at this location should create
-  it first - see QDir::mkpath().
-*/
-void QmlEngine::setOfflineStoragePath(const QString& dir)
-{
-    Q_D(QmlEngine);
-    d->scriptEngine.offlineStoragePath = dir;
-}
-
-QString QmlEngine::offlineStoragePath() const
-{
-    Q_D(const QmlEngine);
-    return d->scriptEngine.offlineStoragePath;
-}
-
-/*!
-  \internal
-
-  Returns the result of the merge of \a baseName with \a dir, \a suffixes, and \a prefix.
- */
-QString QmlEnginePrivate::resolvePlugin(const QDir &dir, const QString &baseName,
-                                        const QStringList &suffixes,
-                                        const QString &prefix)
-{
-    foreach (const QString &suffix, suffixes) {
-        QString pluginFileName = prefix;
-
-        pluginFileName += baseName;
-        pluginFileName += QLatin1Char('.');
-        pluginFileName += suffix;
-
-        QFileInfo fileInfo(dir, pluginFileName);
-
-        if (fileInfo.exists())
-            return fileInfo.absoluteFilePath();
-    }
-
-    return QString();
-}
-
-/*!
-  \internal
-
-  Returns the result of the merge of \a baseName with \a dir and the platform suffix.
-
-  \table
-  \header \i Platform \i Valid suffixes
-  \row \i Windows     \i \c .dll
-  \row \i Unix/Linux  \i \c .so
-  \row \i AIX  \i \c .a
-  \row \i HP-UX       \i \c .sl, \c .so (HP-UXi)
-  \row \i Mac OS X    \i \c .dylib, \c .bundle, \c .so
-  \row \i Symbian     \i \c .dll
-  \endtable
-
-  Version number on unix are ignored.
-*/
-QString QmlEnginePrivate::resolvePlugin(const QDir &dir, const QString &baseName)
-{
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
-    return resolvePlugin(dir, baseName, QStringList(QLatin1String("dll")));
-#elif defined(Q_OS_SYMBIAN)
-    return resolvePlugin(dir, baseName, QStringList() << QLatin1String("dll") << QLatin1String("qtplugin"));
-#else
-
-# if defined(Q_OS_DARWIN)
-
-    return resolvePlugin(dir, baseName, QStringList() << QLatin1String("dylib") << QLatin1String("so") << QLatin1String("bundle"),
-                         QLatin1String("lib"));
-# else  // Generic Unix
-    QStringList validSuffixList;
-
-#  if defined(Q_OS_HPUX)
-/*
-    See "HP-UX Linker and Libraries User's Guide", section "Link-time Differences between PA-RISC and IPF":
-    "In PA-RISC (PA-32 and PA-64) shared libraries are suffixed with .sl. In IPF (32-bit and 64-bit),
-    the shared libraries are suffixed with .so. For compatibility, the IPF linker also supports the .sl suffix."
- */
-    validSuffixList << QLatin1String("sl");
-#   if defined __ia64
-    validSuffixList << QLatin1String("so");
-#   endif
-#  elif defined(Q_OS_AIX)
-    validSuffixList << QLatin1String("a") << QLatin1String("so");
-#  elif defined(Q_OS_UNIX)
-    validSuffixList << QLatin1String("so");
-#  endif
-
-    // Examples of valid library names:
-    //  libfoo.so
-
-    return resolvePlugin(dir, baseName, validSuffixList, QLatin1String("lib"));
-# endif
-
-#endif
-}
-
-/*!
-  \internal
-
-  Adds information to \a imports such that subsequent calls to resolveType()
-  will resolve types qualified by \a prefix by considering types found at the given \a uri.
-
-  The uri is either a directory (if importType is FileImport), or a URI resolved using paths
-  added via addImportPath() (if importType is LibraryImport).
-
-  The \a prefix may be empty, in which case the import location is considered for
-  unqualified types.
-
-  The base URL must already have been set with Import::setBaseUrl().
-*/
-bool QmlEnginePrivate::addToImport(Imports* imports, const QString& qmldircontent, const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType) const
-{
-    QmlEngine *engine = QmlEnginePrivate::get(const_cast<QmlEnginePrivate *>(this));
-    bool ok = imports->d->add(imports->d->base,qmldircontent,uri,prefix,vmaj,vmin,importType,fileImportPath, engine);
-    if (qmlImportTrace())
-        qDebug() << "QmlEngine::addToImport(" << imports << uri << prefix << vmaj << '.' << vmin << (importType==QmlScriptParser::Import::Library? "Library" : "File") << ": " << ok;
-    return ok;
-}
-
-/*!
-  \internal
-
-  Using the given \a imports, the given (namespace qualified) \a type is resolved to either
-  an ImportedNamespace stored at \a ns_return,
-  a QmlType stored at \a type_return, or
-  a component located at \a url_return.
-
-  If any return pointer is 0, the corresponding search is not done.
-
-  \sa addToImport()
-*/
-bool QmlEnginePrivate::resolveType(const Imports& imports, const QByteArray& type, QmlType** type_return, QUrl* url_return, int *vmaj, int *vmin, ImportedNamespace** ns_return) const
-{
-    ImportedNamespace* ns = imports.d->findNamespace(QString::fromUtf8(type));
-    if (ns) {
-        if (qmlImportTrace())
-            qDebug() << "QmlEngine::resolveType" << type << "is namespace for" << ns->urls;
-        if (ns_return)
-            *ns_return = ns;
-        return true;
-    }
-    if (type_return || url_return) {
-        if (imports.d->find(type,vmaj,vmin,type_return,url_return)) {
-            if (qmlImportTrace()) {
-                if (type_return && *type_return)
-                    qDebug() << "QmlEngine::resolveType" << type << '=' << (*type_return)->typeName();
-                if (url_return)
-                    qDebug() << "QmlEngine::resolveType" << type << '=' << *url_return;
-            }
-            return true;
-        }
-        if (qmlImportTrace())
-            qDebug() << "QmlEngine::resolveType" << type << "not found";
-    }
-    return false;
-}
-
-/*!
-  \internal
-
-  Searching \e only in the namespace \a ns (previously returned in a call to
-  resolveType(), \a type is found and returned to either
-  a QmlType stored at \a type_return, or
-  a component located at \a url_return.
-
-  If either return pointer is 0, the corresponding search is not done.
-*/
-void QmlEnginePrivate::resolveTypeInNamespace(ImportedNamespace* ns, const QByteArray& type, QmlType** type_return, QUrl* url_return, int *vmaj, int *vmin ) const
-{
-    ns->find(type,vmaj,vmin,type_return,url_return);
-}
-
-static void voidptr_destructor(void *v)
-{
-    void **ptr = (void **)v;
-    delete ptr;
-}
-
-static void *voidptr_constructor(const void *v)
-{
-    if (!v) {
-        return new void*;
-    } else {
-        return new void*(*(void **)v);
-    }
-}
-
-void QmlEnginePrivate::registerCompositeType(QmlCompiledData *data)
-{
-    QByteArray name = data->root->className();
-
-    QByteArray ptr = name + '*';
-    QByteArray lst = "QmlListProperty<" + name + ">";
-
-    int ptr_type = QMetaType::registerType(ptr.constData(), voidptr_destructor,
-                                           voidptr_constructor);
-    int lst_type = QMetaType::registerType(lst.constData(), voidptr_destructor,
-                                           voidptr_constructor);
-
-    m_qmlLists.insert(lst_type, ptr_type);
-    m_compositeTypes.insert(ptr_type, data);
-    data->addref();
-}
-
-bool QmlEnginePrivate::isList(int t) const
-{
-    return m_qmlLists.contains(t) || QmlMetaType::isList(t);
-}
-
-int QmlEnginePrivate::listType(int t) const
-{
-    QHash<int, int>::ConstIterator iter = m_qmlLists.find(t);
-    if (iter != m_qmlLists.end())
-        return *iter;
-    else
-        return QmlMetaType::listType(t);
-}
-
-bool QmlEnginePrivate::isQObject(int t)
-{
-    return m_compositeTypes.contains(t) || QmlMetaType::isQObject(t);
-}
-
-QObject *QmlEnginePrivate::toQObject(const QVariant &v, bool *ok) const
-{
-    int t = v.userType();
-    if (m_compositeTypes.contains(t)) {
-        if (ok) *ok = true;
-        return *(QObject **)(v.constData());
-    } else {
-        return QmlMetaType::toQObject(v, ok);
-    }
-}
-
-QmlMetaType::TypeCategory QmlEnginePrivate::typeCategory(int t) const
-{
-    if (m_compositeTypes.contains(t))
-        return QmlMetaType::Object;
-    else if (m_qmlLists.contains(t))
-        return QmlMetaType::List;
-    else
-        return QmlMetaType::typeCategory(t);
-}
-
-const QMetaObject *QmlEnginePrivate::rawMetaObjectForType(int t) const
-{
-    QHash<int, QmlCompiledData*>::ConstIterator iter = m_compositeTypes.find(t);
-    if (iter != m_compositeTypes.end()) {
-        return (*iter)->root;
-    } else {
-        QmlType *type = QmlMetaType::qmlType(t);
-        return type?type->baseMetaObject():0;
-    }
-}
-
-const QMetaObject *QmlEnginePrivate::metaObjectForType(int t) const
-{
-    QHash<int, QmlCompiledData*>::ConstIterator iter = m_compositeTypes.find(t);
-    if (iter != m_compositeTypes.end()) {
-        return (*iter)->root;
-    } else {
-        QmlType *type = QmlMetaType::qmlType(t);
-        return type?type->metaObject():0;
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
deleted file mode 100644
index dd2012a..0000000
--- a/src/declarative/qml/qmlengine.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLENGINE_H
-#define QMLENGINE_H
-
-#include <QtCore/qurl.h>
-#include <QtCore/qobject.h>
-#include <QtCore/qmap.h>
-#include <QtScript/qscriptvalue.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlComponent;
-class QmlEnginePrivate;
-class QmlImportsPrivate;
-class QmlExpression;
-class QmlContext;
-class QmlType;
-class QUrl;
-class QScriptEngine;
-class QScriptContext;
-class QmlImageProvider;
-class QNetworkAccessManager;
-class QmlNetworkAccessManagerFactory;
-class Q_DECLARATIVE_EXPORT QmlEngine : public QObject
-{
-    Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath)
-    Q_OBJECT
-public:
-    QmlEngine(QObject *p = 0);
-    virtual ~QmlEngine();
-
-    QmlContext *rootContext();
-
-    void clearComponentCache();
-
-    void addImportPath(const QString& dir);
-    bool importExtension(const QString &fileName, const QString &uri);
-
-    void setNetworkAccessManagerFactory(QmlNetworkAccessManagerFactory *);
-    QmlNetworkAccessManagerFactory *networkAccessManagerFactory() const;
-
-    QNetworkAccessManager *networkAccessManager() const;
-
-    void addImageProvider(const QString &id, QmlImageProvider *);
-    QmlImageProvider *imageProvider(const QString &id) const;
-    void removeImageProvider(const QString &id);
-
-    void setOfflineStoragePath(const QString& dir);
-    QString offlineStoragePath() const;
-
-    QUrl baseUrl() const;
-    void setBaseUrl(const QUrl &);
-
-    static QmlContext *contextForObject(const QObject *);
-    static void setContextForObject(QObject *, QmlContext *);
-
-Q_SIGNALS:
-    void quit ();
-
-private:
-    Q_DECLARE_PRIVATE(QmlEngine)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLENGINE_H
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
deleted file mode 100644
index b18ab24..0000000
--- a/src/declarative/qml/qmlengine_p.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLENGINE_P_H
-#define QMLENGINE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlengine.h"
-
-#include "qmlclassfactory_p.h"
-#include "qmlcompositetypemanager_p.h"
-#include "qpodvector_p.h"
-#include "qml.h"
-#include "qmlvaluetype_p.h"
-#include "qmlcontext.h"
-#include "qmlexpression.h"
-#include "qmlmetaproperty_p.h"
-#include "qmlpropertycache_p.h"
-#include "qmlobjectscriptclass_p.h"
-#include "qmlcontextscriptclass_p.h"
-#include "qmlvaluetypescriptclass_p.h"
-
-#include <QtScript/QScriptClass>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptString>
-#include <QtCore/qstring.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qpair.h>
-#include <QtCore/qstack.h>
-#include <QtCore/qmutex.h>
-#include <QtScript/qscriptengine.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlContext;
-class QmlEngine;
-class QmlContextPrivate;
-class QmlExpression;
-class QmlContextScriptClass;
-class QmlObjectScriptClass;
-class QmlTypeNameScriptClass;
-class QmlValueTypeScriptClass;
-class QScriptEngineDebugger;
-class QNetworkReply;
-class QNetworkAccessManager;
-class QmlNetworkAccessManagerFactory;
-class QmlAbstractBinding;
-class QScriptDeclarativeClass;
-class QmlTypeNameScriptClass;
-class QmlTypeNameCache;
-class QmlComponentAttached;
-class QmlListScriptClass;
-class QmlCleanup;
-class QmlDelayedError;
-class QmlWorkerScriptEngine;
-class QmlGlobalScriptClass;
-class QDir;
-
-class QmlScriptEngine : public QScriptEngine
-{
-public:
-    QmlScriptEngine(QmlEnginePrivate *priv);
-    virtual ~QmlScriptEngine();
-
-    QUrl resolvedUrl(QScriptContext *context, const QUrl& url); // resolved against p's context, or baseUrl if no p
-    static QScriptValue resolvedUrl(QScriptContext *ctxt, QScriptEngine *engine);
-
-    static QmlScriptEngine *get(QScriptEngine* e) { return static_cast<QmlScriptEngine*>(e); }
-
-    QmlEnginePrivate *p;
-
-    // User by SQL API
-    QScriptClass *sqlQueryClass;
-    QString offlineStoragePath;
-
-    // Used by DOM Core 3 API
-    QScriptClass *namedNodeMapClass;
-    QScriptClass *nodeListClass;
-
-    QUrl baseUrl;
-
-    virtual QNetworkAccessManager *networkAccessManager();
-};
-
-class Q_AUTOTEST_EXPORT QmlEnginePrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlEngine)
-public:
-    QmlEnginePrivate(QmlEngine *);
-    ~QmlEnginePrivate();
-
-    void init();
-
-    struct CapturedProperty {
-        CapturedProperty(QObject *o, int c, int n)
-            : object(o), coreIndex(c), notifyIndex(n) {}
-
-        QObject *object;
-        int coreIndex;
-        int notifyIndex;
-    };
-    bool captureProperties;
-    QPODVector<CapturedProperty> capturedProperties;
-
-    QmlContext *rootContext;
-    QmlExpression *currentExpression;
-    bool isDebugging;
-
-    struct ImportedNamespace;
-    QmlContextScriptClass *contextClass;
-    QmlContext *sharedContext;
-    QObject *sharedScope;
-    QmlObjectScriptClass *objectClass;
-    QmlValueTypeScriptClass *valueTypeClass;
-    QmlTypeNameScriptClass *typeNameClass;
-    QmlListScriptClass *listClass;
-    // Global script class
-    QmlGlobalScriptClass *globalClass;
-
-    // Registered cleanup handlers
-    QmlCleanup *cleanup;
-
-    // Bindings that have had errors during startup
-    QmlDelayedError *erroredBindings;
-    int inProgressCreations;
-
-    QmlScriptEngine scriptEngine;
-
-    QmlWorkerScriptEngine *getWorkerScriptEngine();
-    QmlWorkerScriptEngine *workerScriptEngine;
-
-    QUrl baseUrl;
-
-    template<class T>
-    struct SimpleList {
-        SimpleList()
-            : count(0), values(0) {}
-        SimpleList(int r)
-            : count(0), values(new T*[r]) {}
-
-        int count;
-        T **values;
-
-        void append(T *v) {
-            values[count++] = v;
-        }
-
-        T *at(int idx) const {
-            return values[idx];
-        }
-
-        void clear() {
-            delete [] values;
-        }
-    };
-
-    static void clear(SimpleList<QmlAbstractBinding> &);
-    static void clear(SimpleList<QmlParserStatus> &);
-
-    QList<SimpleList<QmlAbstractBinding> > bindValues;
-    QList<SimpleList<QmlParserStatus> > parserStatus;
-    QmlComponentAttached *componentAttacheds;
-
-    bool inBeginCreate;
-
-    QNetworkAccessManager *createNetworkAccessManager(QObject *parent) const;
-    QNetworkAccessManager *getNetworkAccessManager() const;
-    mutable QNetworkAccessManager *networkAccessManager;
-    mutable QmlNetworkAccessManagerFactory *networkAccessManagerFactory;
-
-    QHash<QString,QmlImageProvider*> imageProviders;
-    QImage getImageFromProvider(const QUrl &url);
-
-    mutable QMutex mutex;
-
-    QmlCompositeTypeManager typeManager;
-    QStringList fileImportPath;
-    QString offlineStoragePath;
-
-    mutable quint32 uniqueId;
-    quint32 getUniqueId() const {
-        return uniqueId++;
-    }
-
-    QmlValueTypeFactory valueTypes;
-
-    QHash<const QMetaObject *, QmlPropertyCache *> propertyCache;
-    QmlPropertyCache *cache(QObject *obj) { 
-        Q_Q(QmlEngine);
-        if (!obj || QObjectPrivate::get(obj)->metaObject) return 0;
-        const QMetaObject *mo = obj->metaObject();
-        QmlPropertyCache *rv = propertyCache.value(mo);
-        if (!rv) {
-            rv = QmlPropertyCache::create(q, mo);
-            propertyCache.insert(mo, rv);
-        }
-        return rv;
-    }
-
-    // ### This whole class is embarrassing
-    struct Imports {
-        Imports();
-        ~Imports();
-        Imports(const Imports &copy);
-        Imports &operator =(const Imports &copy);
-
-        void setBaseUrl(const QUrl& url);
-        QUrl baseUrl() const;
-
-        QmlTypeNameCache *cache(QmlEngine *) const;
-
-    private:
-        friend class QmlEnginePrivate;
-        QmlImportsPrivate *d;
-    };
-
-
-    QStringList environmentImportPath;
-
-    QString resolvePlugin(const QDir &dir, const QString &baseName,
-                          const QStringList &suffixes,
-                          const QString &prefix = QString());
-    QString resolvePlugin(const QDir &dir, const QString &baseName);
-
-
-    bool addToImport(Imports*, const QString& qmlDirContent,const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType) const;
-    bool resolveType(const Imports&, const QByteArray& type,
-                     QmlType** type_return, QUrl* url_return,
-                     int *version_major, int *version_minor,
-                     ImportedNamespace** ns_return) const;
-    void resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type,
-                                QmlType** type_return, QUrl* url_return,
-                                int *version_major, int *version_minor ) const;
-
-
-    void registerCompositeType(QmlCompiledData *);
-
-    bool isQObject(int);
-    QObject *toQObject(const QVariant &, bool *ok = 0) const;
-    QmlMetaType::TypeCategory typeCategory(int) const;
-    bool isList(int) const;
-    int listType(int) const;
-    const QMetaObject *rawMetaObjectForType(int) const;
-    const QMetaObject *metaObjectForType(int) const;
-    QHash<int, int> m_qmlLists;
-    QHash<int, QmlCompiledData *> m_compositeTypes;
-
-    QScriptValue scriptValueFromVariant(const QVariant &);
-    QVariant scriptValueToVariant(const QScriptValue &);
-
-    void sendQuit ();
-
-    static QScriptValue qmlScriptObject(QObject*, QmlEngine*);
-
-    static QScriptValue createComponent(QScriptContext*, QScriptEngine*);
-    static QScriptValue createQmlObject(QScriptContext*, QScriptEngine*);
-    static QScriptValue vector(QScriptContext*, QScriptEngine*);
-    static QScriptValue rgba(QScriptContext*, QScriptEngine*);
-    static QScriptValue hsla(QScriptContext*, QScriptEngine*);
-    static QScriptValue point(QScriptContext*, QScriptEngine*);
-    static QScriptValue size(QScriptContext*, QScriptEngine*);
-    static QScriptValue rect(QScriptContext*, QScriptEngine*);
-
-    static QScriptValue lighter(QScriptContext*, QScriptEngine*);
-    static QScriptValue darker(QScriptContext*, QScriptEngine*);
-    static QScriptValue tint(QScriptContext*, QScriptEngine*);
-
-    static QScriptValue closestAngle(QScriptContext*, QScriptEngine*);
-    static QScriptValue playSound(QScriptContext*, QScriptEngine*);
-    static QScriptValue desktopOpenUrl(QScriptContext*, QScriptEngine*);
-    static QScriptValue md5(QScriptContext*, QScriptEngine*);
-    static QScriptValue btoa(QScriptContext*, QScriptEngine*);
-    static QScriptValue atob(QScriptContext*, QScriptEngine*);
-    static QScriptValue consoleLog(QScriptContext*, QScriptEngine*);
-    static QScriptValue quit(QScriptContext*, QScriptEngine*);
-
-    static QScriptEngine *getScriptEngine(QmlEngine *e) { return &e->d_func()->scriptEngine; }
-    static QmlEngine *getEngine(QScriptEngine *e) { return static_cast<QmlScriptEngine*>(e)->p->q_func(); }
-    static QmlEnginePrivate *get(QmlEngine *e) { return e->d_func(); }
-    static QmlEnginePrivate *get(QmlContext *c) { return (c && c->engine()) ? QmlEnginePrivate::get(c->engine()) : 0; }
-    static QmlEnginePrivate *get(QScriptEngine *e) { return static_cast<QmlScriptEngine*>(e)->p; }
-    static QmlEngine *get(QmlEnginePrivate *p) { return p->q_func(); }
-    QmlContext *getContext(QScriptContext *);
-
-    static void defineModule();
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLENGINE_P_H
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
deleted file mode 100644
index 973e5e5..0000000
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ /dev/null
@@ -1,456 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlenginedebug_p.h"
-
-#include "qmlboundsignal_p.h"
-#include "qmlengine.h"
-#include "qmlmetatype.h"
-#include "qmlmetaproperty.h"
-#include "qmlbinding_p.h"
-#include "qmlcontext_p.h"
-#include "qmlwatcher_p.h"
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qmetaobject.h>
-
-QT_BEGIN_NAMESPACE
-
-QList<QmlEngine *> QmlEngineDebugServer::m_engines;
-QmlEngineDebugServer::QmlEngineDebugServer(QObject *parent)
-: QmlDebugService(QLatin1String("QmlEngine"), parent),
-  m_watch(new QmlWatcher(this))
-{
-    QObject::connect(m_watch, SIGNAL(propertyChanged(int,int,QMetaProperty,QVariant)),
-                     this, SLOT(propertyChanged(int,int,QMetaProperty,QVariant)));
-}
-
-QDataStream &operator<<(QDataStream &ds, 
-                        const QmlEngineDebugServer::QmlObjectData &data)
-{
-    ds << data.url << data.lineNumber << data.columnNumber << data.objectName
-       << data.objectType << data.objectId << data.contextId;
-    return ds;
-}
-
-QDataStream &operator>>(QDataStream &ds, 
-                        QmlEngineDebugServer::QmlObjectData &data)
-{
-    ds >> data.url >> data.lineNumber >> data.columnNumber >> data.objectName
-       >> data.objectType >> data.objectId >> data.contextId;
-    return ds;
-}
-
-QDataStream &operator<<(QDataStream &ds, 
-                        const QmlEngineDebugServer::QmlObjectProperty &data)
-{
-    ds << (int)data.type << data.name << data.value << data.valueTypeName
-       << data.binding << data.hasNotifySignal;
-    return ds;
-}
-
-QDataStream &operator>>(QDataStream &ds,  
-                        QmlEngineDebugServer::QmlObjectProperty &data)
-{
-    int type;
-    ds >> type >> data.name >> data.value >> data.valueTypeName
-       >> data.binding >> data.hasNotifySignal;
-    data.type = (QmlEngineDebugServer::QmlObjectProperty::Type)type;
-    return ds;
-}
-
-QmlEngineDebugServer::QmlObjectProperty 
-QmlEngineDebugServer::propertyData(QObject *obj, int propIdx)
-{
-    QmlObjectProperty rv;
-
-    QMetaProperty prop = obj->metaObject()->property(propIdx);
-
-    rv.type = QmlObjectProperty::Unknown;
-    rv.valueTypeName = QString::fromUtf8(prop.typeName());
-    rv.name = QString::fromUtf8(prop.name());
-    rv.hasNotifySignal = prop.hasNotifySignal();
-    QmlAbstractBinding *binding = QmlMetaProperty(obj, rv.name).binding();
-    if (binding)
-        rv.binding = binding->expression();
-
-    QVariant value = prop.read(obj);
-    rv.value = valueContents(value);
-
-    if (QVariant::Type(prop.userType()) < QVariant::UserType) {
-        rv.type = QmlObjectProperty::Basic;
-    } else if (QmlMetaType::isQObject(prop.userType()))  {
-        rv.type = QmlObjectProperty::Object;
-    } else if (QmlMetaType::isList(prop.userType())) {
-        rv.type = QmlObjectProperty::List;
-    }
-
-    return rv;
-}
-
-QVariant QmlEngineDebugServer::valueContents(const QVariant &value) const
-{
-    int userType = value.userType();
-    if (QVariant::Type(userType) < QVariant::UserType)
-        return value;
-
-    /*
-    if (QmlMetaType::isList(userType)) {
-        int count = QmlMetaType::listCount(value);
-        QVariantList contents;
-        for (int i=0; i<count; i++)
-            contents << valueContents(QmlMetaType::listAt(value, i));
-        return contents;
-    } else */
-    if (QmlMetaType::isQObject(userType)) {
-        QObject *o = QmlMetaType::toQObject(value);
-        if (o) {
-            QString name = o->objectName();
-            if (name.isEmpty())
-                name = QLatin1String("<unnamed object>");
-            return name;
-        }
-    }
-
-    return QLatin1String("<unknown value>");
-}
-
-void QmlEngineDebugServer::buildObjectDump(QDataStream &message, 
-                                           QObject *object, bool recur)
-{
-    message << objectData(object);
-
-    // Some children aren't added to an object until particular properties are read
-    // - e.g. child state objects aren't added until the 'states' property is read -
-    // but this should only affect internal objects that aren't shown by the
-    // debugger anyway.
-
-    QObjectList children = object->children();
-    
-    int childrenCount = children.count();
-    for (int ii = 0; ii < children.count(); ++ii) {
-        if (qobject_cast<QmlContext*>(children[ii]) || QmlBoundSignal::cast(children[ii]))
-            --childrenCount;
-    }
-
-    message << childrenCount << recur;
-
-    QList<QmlObjectProperty> fakeProperties;
-
-    for (int ii = 0; ii < children.count(); ++ii) {
-        QObject *child = children.at(ii);
-        if (qobject_cast<QmlContext*>(child))
-            continue;
-        QmlBoundSignal *signal = QmlBoundSignal::cast(child);
-        if (signal) {
-            QmlObjectProperty prop;
-            prop.type = QmlObjectProperty::SignalProperty;
-            prop.hasNotifySignal = false;
-            QmlExpression *expr = signal->expression();
-            if (expr) {
-                prop.value = expr->expression();
-                QObject *scope = expr->scopeObject();
-                if (scope) {
-                    QString sig = QLatin1String(scope->metaObject()->method(signal->index()).signature());
-                    int lparen = sig.indexOf(QLatin1Char('('));
-                    if (lparen >= 0) {
-                        QString methodName = sig.mid(0, lparen);
-                        prop.name = QLatin1String("on") + methodName[0].toUpper()
-                                + methodName.mid(1);
-                    }
-                }
-            }
-            fakeProperties << prop;
-        } else {
-            if (recur)
-                buildObjectDump(message, child, recur);
-            else
-                message << objectData(child);
-        }
-    }
-
-    message << (object->metaObject()->propertyCount() + fakeProperties.count());
-
-    for (int ii = 0; ii < object->metaObject()->propertyCount(); ++ii) 
-        message << propertyData(object, ii);
-
-    for (int ii = 0; ii < fakeProperties.count(); ++ii)
-        message << fakeProperties[ii];
-}
-
-void QmlEngineDebugServer::buildObjectList(QDataStream &message, 
-                                           QmlContext *ctxt)
-{
-    QmlContextPrivate *p = (QmlContextPrivate *)QObjectPrivate::get(ctxt);
-
-    QString ctxtName = ctxt->objectName();
-    int ctxtId = QmlDebugService::idForObject(ctxt);
-
-    message << ctxtName << ctxtId; 
-
-    int count = 0;
-
-    for (QSet<QmlContext *>::ConstIterator iter = p->childContexts.begin();
-            iter != p->childContexts.end(); ++iter) {
-        QmlContextPrivate *p = (QmlContextPrivate *)QObjectPrivate::get(*iter);
-        if (p->isInternal)
-            continue;
-        ++count;
-    }
-
-    message << count;
-
-    for (QSet<QmlContext *>::ConstIterator iter = p->childContexts.begin();
-            iter != p->childContexts.end(); ++iter) {
-        QmlContextPrivate *p = (QmlContextPrivate *)QObjectPrivate::get(*iter);
-        if (p->isInternal)
-            continue;
-        buildObjectList(message, *iter);
-    }
-
-    // Clean deleted objects
-    for (int ii = 0; ii < p->instances.count(); ++ii) {
-        if (!p->instances.at(ii)) {
-            p->instances.removeAt(ii);
-            --ii;
-        }
-    }
-
-    message << p->instances.count();
-    for (int ii = 0; ii < p->instances.count(); ++ii) {
-        message << objectData(p->instances.at(ii));
-    }
-}
-
-QmlEngineDebugServer::QmlObjectData 
-QmlEngineDebugServer::objectData(QObject *object)
-{
-    QmlDeclarativeData *ddata = QmlDeclarativeData::get(object);
-    QmlObjectData rv;
-    if (ddata) {
-        rv.url = ddata->outerContext->baseUrl();
-        rv.lineNumber = ddata->lineNumber;
-        rv.columnNumber = ddata->columnNumber;
-    } else {
-        rv.lineNumber = -1;
-        rv.columnNumber = -1;
-    }
-
-    rv.objectName = object->objectName();
-    rv.objectId = QmlDebugService::idForObject(object);
-    rv.contextId = QmlDebugService::idForObject(qmlContext(object));
-
-    QmlType *type = QmlMetaType::qmlType(object->metaObject());
-    if (type) {
-        QString typeName = QLatin1String(type->qmlTypeName());
-        int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
-        rv.objectType = lastSlash < 0 ? typeName : typeName.mid(lastSlash+1);
-    } else {
-        rv.objectType = QString::fromUtf8(object->metaObject()->className());
-        int marker = rv.objectType.indexOf(QLatin1String("_QMLTYPE_"));
-        if (marker != -1)
-            rv.objectType = rv.objectType.left(marker);
-    }
-
-    return rv;
-}
-
-void QmlEngineDebugServer::messageReceived(const QByteArray &message)
-{
-    QDataStream ds(message);
-
-    QByteArray type;
-    ds >> type;
-
-    //qDebug() << "QmlEngineDebugServer::messageReceived()" << type;
-
-    if (type == "LIST_ENGINES") {
-        int queryId;
-        ds >> queryId;
-
-        QByteArray reply;
-        QDataStream rs(&reply, QIODevice::WriteOnly);
-        rs << QByteArray("LIST_ENGINES_R");
-        rs << queryId << m_engines.count();
-
-        for (int ii = 0; ii < m_engines.count(); ++ii) {
-            QmlEngine *engine = m_engines.at(ii);
-
-            QString engineName = engine->objectName();
-            int engineId = QmlDebugService::idForObject(engine);
-
-            rs << engineName << engineId;
-        }
-
-        sendMessage(reply);
-    } else if (type == "LIST_OBJECTS") {
-        int queryId;
-        int engineId = -1;
-        ds >> queryId >> engineId;
-
-        QmlEngine *engine = 
-            qobject_cast<QmlEngine *>(QmlDebugService::objectForId(engineId));
-
-        QByteArray reply;
-        QDataStream rs(&reply, QIODevice::WriteOnly);
-        rs << QByteArray("LIST_OBJECTS_R") << queryId;
-
-        if (engine)
-            buildObjectList(rs, engine->rootContext());
-
-        sendMessage(reply);
-    } else if (type == "FETCH_OBJECT") {
-        int queryId;
-        int objectId;
-        bool recurse;
-
-        ds >> queryId >> objectId >> recurse;
-
-        QObject *object = QmlDebugService::objectForId(objectId);
-
-        QByteArray reply;
-        QDataStream rs(&reply, QIODevice::WriteOnly);
-        rs << QByteArray("FETCH_OBJECT_R") << queryId;
-
-        if (object) 
-            buildObjectDump(rs, object, recurse);
-
-        sendMessage(reply);
-    } else if (type == "WATCH_OBJECT") {
-        int queryId;
-        int objectId;
-
-        ds >> queryId >> objectId;
-        bool ok = m_watch->addWatch(queryId, objectId);
-
-        QByteArray reply;
-        QDataStream rs(&reply, QIODevice::WriteOnly);
-        rs << QByteArray("WATCH_OBJECT_R") << queryId << ok;
-
-        sendMessage(reply);
-    } else if (type == "WATCH_PROPERTY") {
-        int queryId;
-        int objectId;
-        QByteArray property;
-
-        ds >> queryId >> objectId >> property;
-        bool ok = m_watch->addWatch(queryId, objectId, property);
-
-        QByteArray reply;
-        QDataStream rs(&reply, QIODevice::WriteOnly);
-        rs << QByteArray("WATCH_PROPERTY_R") << queryId << ok;
-
-        sendMessage(reply);
-    } else if (type == "WATCH_EXPR_OBJECT") {
-        int queryId;
-        int debugId;
-        QString expr;
-
-        ds >> queryId >> debugId >> expr;
-        bool ok = m_watch->addWatch(queryId, debugId, expr);
-
-        QByteArray reply;
-        QDataStream rs(&reply, QIODevice::WriteOnly);
-        rs << QByteArray("WATCH_EXPR_OBJECT_R") << queryId << ok;
-
-        sendMessage(reply);
-    } else if (type == "NO_WATCH") {
-        int queryId;
-
-        ds >> queryId;
-        m_watch->removeWatch(queryId);
-    } else if (type == "EVAL_EXPRESSION") {
-        int queryId;
-        int objectId;
-        QString expr;
-
-        ds >> queryId >> objectId >> expr;
-
-        QObject *object = QmlDebugService::objectForId(objectId);
-        QmlContext *context = qmlContext(object);
-        QVariant result;
-        if (object && context) {
-            QmlExpression exprObj(context, expr, object);
-            bool undefined = false;
-            QVariant value = exprObj.value(&undefined);
-            if (undefined)
-                result = QLatin1String("<undefined>");
-            else
-                result = valueContents(value);
-        } else {
-            result = QLatin1String("<unknown context>");
-        }
-
-        QByteArray reply;
-        QDataStream rs(&reply, QIODevice::WriteOnly);
-        rs << QByteArray("EVAL_EXPRESSION_R") << queryId << result;
-
-        sendMessage(reply);
-    }
-}
-
-void QmlEngineDebugServer::propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value)
-{
-    QByteArray reply;
-    QDataStream rs(&reply, QIODevice::WriteOnly);
-
-    rs << QByteArray("UPDATE_WATCH") << id << objectId << QByteArray(property.name()) << valueContents(value);
-
-    sendMessage(reply);
-}
-
-void QmlEngineDebugServer::addEngine(QmlEngine *engine)
-{
-    Q_ASSERT(engine);
-    Q_ASSERT(!m_engines.contains(engine));
-
-    m_engines.append(engine);
-}
-
-void QmlEngineDebugServer::remEngine(QmlEngine *engine)
-{
-    Q_ASSERT(engine);
-    Q_ASSERT(m_engines.contains(engine));
-
-    m_engines.removeAll(engine);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h
deleted file mode 100644
index a6f296a..0000000
--- a/src/declarative/qml/qmlenginedebug_p.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLENGINEDEBUG_P_H
-#define QMLENGINEDEBUG_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "../debugger/qmldebugservice_p.h"
-
-#include <QtCore/qurl.h>
-#include <QtCore/qvariant.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QmlContext;
-class QmlWatcher;
-class QDataStream;
-
-class QmlEngineDebugServer : public QmlDebugService
-{
-    Q_OBJECT
-public:
-    QmlEngineDebugServer(QObject * = 0);
-
-    struct QmlObjectData {
-        QUrl url;
-        int lineNumber;
-        int columnNumber;
-        QString objectName;
-        QString objectType;
-        int objectId;
-        int contextId;
-    };
-
-    struct QmlObjectProperty {
-        enum Type { Unknown, Basic, Object, List, SignalProperty };
-        Type type;
-        QString name;
-        QVariant value;
-        QString valueTypeName;
-        QString binding;
-        bool hasNotifySignal;
-    };
-
-    static void addEngine(QmlEngine *);
-    static void remEngine(QmlEngine *);
-
-protected:
-    virtual void messageReceived(const QByteArray &);
-
-private Q_SLOTS:
-    void propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value);
-
-private:
-    void buildObjectList(QDataStream &, QmlContext *);
-    void buildObjectDump(QDataStream &, QObject *, bool);
-    QmlObjectData objectData(QObject *);
-    QmlObjectProperty propertyData(QObject *, int);
-    QVariant valueContents(const QVariant &defaultValue) const;
-
-    static QList<QmlEngine *> m_engines;
-    QmlWatcher *m_watch;
-};
-Q_DECLARATIVE_EXPORT QDataStream &operator<<(QDataStream &, const QmlEngineDebugServer::QmlObjectData &);
-Q_DECLARATIVE_EXPORT QDataStream &operator>>(QDataStream &, QmlEngineDebugServer::QmlObjectData &);
-Q_DECLARATIVE_EXPORT QDataStream &operator<<(QDataStream &, const QmlEngineDebugServer::QmlObjectProperty &);
-Q_DECLARATIVE_EXPORT QDataStream &operator>>(QDataStream &, QmlEngineDebugServer::QmlObjectProperty &);
-
-QT_END_NAMESPACE
-
-#endif // QMLENGINEDEBUG_P_H
-
diff --git a/src/declarative/qml/qmlerror.cpp b/src/declarative/qml/qmlerror.cpp
deleted file mode 100644
index fc4bcd5..0000000
--- a/src/declarative/qml/qmlerror.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlerror.h"
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qfile.h>
-#include <QtCore/qstringlist.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlError
-  \since 4.7
-    \brief The QmlError class encapsulates a QML error
-*/
-class QmlErrorPrivate
-{
-public:
-    QmlErrorPrivate();
-
-    QUrl url;
-    QString description;
-    int line;
-    int column;
-};
-
-QmlErrorPrivate::QmlErrorPrivate()
-: line(-1), column(-1)
-{
-}
-
-/*!
-    Create an empty error object.
-*/
-QmlError::QmlError()
-: d(0)
-{
-}
-
-/*!
-    Create a copy of \a other.
-*/
-QmlError::QmlError(const QmlError &other)
-: d(0)
-{
-    *this = other;
-}
-
-/*!
-    Assign \a other to this error object.
-*/
-QmlError &QmlError::operator=(const QmlError &other)
-{
-    if (!other.d) {
-        delete d;
-        d = 0;
-    } else {
-        if (!d) d = new QmlErrorPrivate;
-        d->url = other.d->url;
-        d->description = other.d->description;
-        d->line = other.d->line;
-        d->column = other.d->column;
-    }
-    return *this;
-}
-
-/*!
-    \internal 
-*/
-QmlError::~QmlError()
-{
-    delete d; d = 0;
-}
-
-/*!
-    Return true if this error is valid, otherwise false.
-*/
-bool QmlError::isValid() const
-{
-    return d != 0;
-}
-
-/*!
-    Return the url for the file that caused this error.
-*/
-QUrl QmlError::url() const
-{
-    if (d) return d->url;
-    else return QUrl();
-}
-
-/*!
-    Set the \a url for the file that caused this error.
-*/
-void QmlError::setUrl(const QUrl &url)
-{
-    if (!d) d = new QmlErrorPrivate;
-    d->url = url;
-}
-
-/*!
-    Return the error description.
-*/
-QString QmlError::description() const
-{
-    if (d) return d->description;
-    else return QString();
-}
-
-/*!
-    Set the error \a description.
-*/
-void QmlError::setDescription(const QString &description)
-{
-    if (!d) d = new QmlErrorPrivate;
-    d->description = description;
-}
-
-/*!
-    Return the error line number.
-*/
-int QmlError::line() const
-{
-    if (d) return d->line;
-    else return -1;
-}
-
-/*!
-    Set the error \a line number.
-*/
-void QmlError::setLine(int line)
-{
-    if (!d) d = new QmlErrorPrivate;
-    d->line = line;
-}
-
-/*!
-    Return the error column number.
-*/
-int QmlError::column() const
-{
-    if (d) return d->column;
-    else return -1;
-}
-
-/*!
-    Set the error \a column number.
-*/
-void QmlError::setColumn(int column)
-{
-    if (!d) d = new QmlErrorPrivate;
-    d->column = column;
-}
-
-/*!
-    Return the error as a human readable string.
-*/
-QString QmlError::toString() const
-{
-    QString rv;
-    rv = url().toString() + QLatin1Char(':') + QString::number(line());
-    if(column() != -1) 
-        rv += QLatin1Char(':') + QString::number(column());
-
-    rv += QLatin1String(": ") + description();
-
-    return rv;
-}
-
-/*!
-    \relates QmlError
-    \fn QDebug operator<<(QDebug debug, const QmlError &error)
-
-    Output a human readable version of \a error to \a debug.
-*/
-
-QDebug operator<<(QDebug debug, const QmlError &error)
-{
-    debug << qPrintable(error.toString());
-
-    QUrl url = error.url();
-
-    if (error.line() > 0 && url.scheme() == QLatin1String("file")) {
-        QString file = url.toLocalFile();
-        QFile f(file);
-        if (f.open(QIODevice::ReadOnly)) {
-            QByteArray data = f.readAll();
-            QTextStream stream(data, QIODevice::ReadOnly);
-            stream.setCodec("UTF-8");
-            const QString code = stream.readAll();
-            const QStringList lines = code.split(QLatin1Char('\n'));
-
-            if (lines.count() >= error.line()) {
-                const QString &line = lines.at(error.line() - 1);
-                debug << "\n    " << qPrintable(line);
-
-                if(error.column() > 0) {
-                    int column = qMax(0, error.column() - 1);
-                    column = qMin(column, line.length()); 
-
-                    QByteArray ind;
-                    ind.reserve(column);
-                    for (int i = 0; i < column; ++i) {
-                        const QChar ch = line.at(i);
-                        if (ch.isSpace())
-                            ind.append(ch.unicode());
-                        else
-                            ind.append(' ');
-                    }
-                    ind.append('^');
-                    debug << "\n    " << ind.constData();
-                }
-            }
-        }
-    }
-    return debug;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlerror.h b/src/declarative/qml/qmlerror.h
deleted file mode 100644
index 8c4d785..0000000
--- a/src/declarative/qml/qmlerror.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLERROR_H
-#define QMLERROR_H
-
-#include <QtCore/qurl.h>
-#include <QtCore/qstring.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QDebug;
-class QmlErrorPrivate;
-class Q_DECLARATIVE_EXPORT QmlError
-{
-public:
-    QmlError();
-    QmlError(const QmlError &);
-    QmlError &operator=(const QmlError &);
-    ~QmlError();
-
-    bool isValid() const;
-
-    QUrl url() const;
-    void setUrl(const QUrl &);
-    QString description() const;
-    void setDescription(const QString &);
-    int line() const;
-    void setLine(int);
-    int column() const;
-    void setColumn(int);
-
-    QString toString() const;
-private:
-    QmlErrorPrivate *d;
-};
-
-QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, const QmlError &error);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLERROR_H
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
deleted file mode 100644
index 217f002..0000000
--- a/src/declarative/qml/qmlexpression.cpp
+++ /dev/null
@@ -1,810 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlexpression.h"
-#include "qmlexpression_p.h"
-
-#include "qmlengine_p.h"
-#include "qmlcontext_p.h"
-#include "qmlrewrite_p.h"
-#include "qmlcompiler_p.h"
-
-#include <QtCore/qdebug.h>
-#include <QtScript/qscriptprogram.h>
-
-#include <private/qscriptdeclarativeclass_p.h>
-
-QT_BEGIN_NAMESPACE
-
-bool QmlDelayedError::addError(QmlEnginePrivate *e)
-{
-    if (!e || prevError) return false;
-
-    if (e->inProgressCreations == 0) return false; // Not in construction
-
-    prevError = &e->erroredBindings;
-    nextError = e->erroredBindings;
-    e->erroredBindings = this;
-    if (nextError) nextError->prevError = &nextError;
-
-    return true;
-}
-
-QmlExpressionData::QmlExpressionData()
-: q(0), dataRef(0), expressionFunctionValid(false), expressionRewritten(false), me(0), 
-  trackChange(false), isShared(false), line(-1), guardList(0), guardListLength(0)
-{
-}
-
-QmlExpressionData::~QmlExpressionData()
-{
-    if (guardList) { delete [] guardList; guardList = 0; }
-    if (dataRef) dataRef->release();
-}
-
-QmlExpressionPrivate::QmlExpressionPrivate()
-: data(new QmlExpressionData)
-{
-    data->q = this;
-}
-
-QmlExpressionPrivate::QmlExpressionPrivate(QmlExpressionData *d)
-: data(d)
-{
-    data->q = this;
-}
-
-QmlExpressionPrivate::~QmlExpressionPrivate()
-{
-    if (data) { data->q = 0; data->release(); data = 0; }
-}
-
-void QmlExpressionPrivate::init(QmlContext *ctxt, const QString &expr, 
-                                QObject *me)
-{
-    data->expression = expr;
-
-    data->QmlAbstractExpression::setContext(ctxt);
-    data->me = me;
-}
-
-void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc, 
-                                QObject *me, const QString &url, int lineNumber)
-{
-    data->url = url;
-    data->line = lineNumber;
-
-    if (data->dataRef) data->dataRef->release();
-    data->dataRef = rc;
-    if (data->dataRef) data->dataRef->addref();
-
-    quint32 *exprData = (quint32 *)expr;
-    QmlCompiledData *dd = (QmlCompiledData *)rc;
-
-    data->expressionRewritten = true;
-    data->expression = QString::fromRawData((QChar *)(exprData + 2), exprData[1]);
-
-    int progIdx = *(exprData);
-    bool isShared = progIdx & 0x80000000;
-    progIdx &= 0x7FFFFFFF;
-
-    QmlEngine *engine = ctxt->engine();
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    if (isShared) {
-
-        if (!dd->cachedClosures.at(progIdx)) {
-            QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
-            scriptContext->pushScope(ep->contextClass->newSharedContext());
-            dd->cachedClosures[progIdx] = new QScriptValue(scriptEngine->evaluate(data->expression, data->url, data->line));
-            scriptEngine->popContext();
-        }
-
-        data->expressionFunction = *dd->cachedClosures.at(progIdx);
-        data->isShared = true;
-        data->expressionFunctionValid = true;
-
-    } else {
-
-#if !defined(Q_OS_SYMBIAN) //XXX Why doesn't this work?
-        if (!dd->cachedPrograms.at(progIdx)) {
-            dd->cachedPrograms[progIdx] =
-                new QScriptProgram(data->expression, data->url, data->line);
-        }
-
-        data->expressionFunction = evalInObjectScope(ctxt, me, *dd->cachedPrograms.at(progIdx));
-#else
-        data->expressionFunction = evalInObjectScope(ctxt, me, data->expression);
-#endif
-
-        data->expressionFunctionValid = true;
-    }
-
-    data->QmlAbstractExpression::setContext(ctxt);
-    data->me = me;
-}
-
-QScriptValue QmlExpressionPrivate::evalInObjectScope(QmlContext *context, QObject *object, 
-                                                     const QString &program)
-{
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(context->engine());
-    QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(&ep->scriptEngine);
-    scriptContext->pushScope(ep->contextClass->newContext(context, object));
-    QScriptValue rv = ep->scriptEngine.evaluate(program);
-    ep->scriptEngine.popContext();
-    return rv;
-}
-
-QScriptValue QmlExpressionPrivate::evalInObjectScope(QmlContext *context, QObject *object, 
-                                                     const QScriptProgram &program)
-{
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(context->engine());
-    QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(&ep->scriptEngine);
-    scriptContext->pushScope(ep->contextClass->newContext(context, object));
-    QScriptValue rv = ep->scriptEngine.evaluate(program);
-    ep->scriptEngine.popContext();
-    return rv;
-}
-
-/*!
-    \class QmlExpression
-  \since 4.7
-    \brief The QmlExpression class evaluates JavaScript in a QML context.
-*/
-
-/*!
-    Create an invalid QmlExpression.
-
-    As the expression will not have an associated QmlContext, this will be a
-    null expression object and its value will always be an invalid QVariant.
- */
-QmlExpression::QmlExpression()
-: QObject(*new QmlExpressionPrivate, 0)
-{
-}
-
-/*!  \internal */
-QmlExpression::QmlExpression(QmlContext *ctxt, void *expr,
-                             QmlRefCount *rc, QObject *me, 
-                             const QString &url, int lineNumber,
-                             QmlExpressionPrivate &dd)
-: QObject(dd, 0)
-{
-    Q_D(QmlExpression);
-    d->init(ctxt, expr, rc, me, url, lineNumber);
-}
-
-/*!
-    Create a QmlExpression object.
-
-    The \a expression JavaScript will be executed in the \a ctxt QmlContext.
-    If specified, the \a scope object's properties will also be in scope during
-    the expression's execution.
-*/
-QmlExpression::QmlExpression(QmlContext *ctxt, const QString &expression,
-                             QObject *scope)
-: QObject(*new QmlExpressionPrivate, 0)
-{
-    Q_D(QmlExpression);
-    d->init(ctxt, expression, scope);
-}
-
-/*!  \internal */
-QmlExpression::QmlExpression(QmlContext *ctxt, const QString &expression,
-                             QObject *scope, QmlExpressionPrivate &dd)
-: QObject(dd, 0)
-{
-    Q_D(QmlExpression);
-    d->init(ctxt, expression, scope);
-}
-
-/*!
-    Destroy the QmlExpression instance.
-*/
-QmlExpression::~QmlExpression()
-{
-}
-
-/*!
-    Returns the QmlEngine this expression is associated with, or 0 if there
-    is no association or the QmlEngine has been destroyed.
-*/
-QmlEngine *QmlExpression::engine() const
-{
-    Q_D(const QmlExpression);
-    return d->data->context()?d->data->context()->engine():0;
-}
-
-/*!
-    Returns the QmlContext this expression is associated with, or 0 if there
-    is no association or the QmlContext has been destroyed.
-*/
-QmlContext *QmlExpression::context() const
-{
-    Q_D(const QmlExpression);
-    return d->data->context();
-}
-
-/*!
-    Returns the expression string.
-*/
-QString QmlExpression::expression() const
-{
-    Q_D(const QmlExpression);
-    return d->data->expression;
-}
-
-/*!
-    Set the expression to \a expression.
-*/
-void QmlExpression::setExpression(const QString &expression)
-{
-    Q_D(QmlExpression);
-
-    d->clearGuards();
-
-    d->data->expression = expression;
-    d->data->expressionFunctionValid = false;
-    d->data->expressionRewritten = false;
-    d->data->expressionFunction = QScriptValue();
-}
-
-void QmlExpressionPrivate::exceptionToError(QScriptEngine *scriptEngine, 
-                                            QmlError &error)
-{
-    if (scriptEngine->hasUncaughtException() && 
-        scriptEngine->uncaughtException().isError()) {
-
-        QString fileName;
-        int lineNumber = scriptEngine->uncaughtExceptionLineNumber();
-
-        QScriptValue exception = scriptEngine->uncaughtException();
-        QLatin1String fileNameProp("fileName");
-
-        if (!exception.property(fileNameProp).toString().isEmpty()){
-            fileName = exception.property(fileNameProp).toString();
-        } else {
-            fileName = QLatin1String("<Unknown File>");
-        }
-
-        error.setUrl(QUrl(fileName));
-        error.setLine(lineNumber);
-        error.setColumn(-1);
-        error.setDescription(exception.toString());
-    } else {
-        error = QmlError();
-    }
-}
-
-QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUndefined)
-{
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::BindValueQt> perfqt;
-#endif
-
-    QmlExpressionData *data = this->data;
-    QmlContextPrivate *ctxtPriv = data->context()->d_func();
-    QmlEngine *engine = data->context()->engine();
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-
-    if (secondaryScope)
-       ctxtPriv->defaultObjects.append(secondaryScope);
-
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    if (!data->expressionFunctionValid) {
-
-        QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
-        scriptContext->pushScope(ep->contextClass->newContext(data->context(), data->me));
-
-        if (data->expressionRewritten) {
-            data->expressionFunction = scriptEngine->evaluate(data->expression, 
-                                                              data->url, data->line);
-        } else {
-            QmlRewrite::RewriteBinding rewriteBinding;
-
-            bool ok = true;
-            const QString code = rewriteBinding(data->expression, &ok);
-            if (!ok) {
-                scriptEngine->popContext();
-                return QVariant();
-            }
-            data->expressionFunction = scriptEngine->evaluate(code, data->url, data->line);
-        }
-
-        scriptEngine->popContext();
-        data->expressionFunctionValid = true;
-    }
-
-    QmlContext *oldSharedContext = 0;
-    QObject *oldSharedScope = 0;
-    if (data->isShared) {
-        oldSharedContext = ep->sharedContext;
-        oldSharedScope = ep->sharedScope;
-        ep->sharedContext = data->context();
-        ep->sharedScope = data->me;
-    }
-
-    QScriptValue svalue = data->expressionFunction.call();
-
-    if (data->isShared) {
-        ep->sharedContext = oldSharedContext;
-        ep->sharedScope = oldSharedScope;
-    }
-
-    if (isUndefined)
-        *isUndefined = svalue.isUndefined() || scriptEngine->hasUncaughtException();
-
-    // Handle exception
-    if (scriptEngine->hasUncaughtException()) {
-       exceptionToError(scriptEngine, data->error);
-       scriptEngine->clearExceptions();
-       return QVariant();
-    } else {
-        data->error = QmlError();
-    }
-
-    if (secondaryScope) {
-        QObject *last = ctxtPriv->defaultObjects.takeLast();
-        Q_ASSERT(last == secondaryScope);
-        Q_UNUSED(last);
-    }
-
-    QVariant rv;
-
-    if (svalue.isArray()) {
-        int length = svalue.property(QLatin1String("length")).toInt32();
-        if (length && svalue.property(0).isObject()) {
-            QList<QObject *> list;
-            for (int ii = 0; ii < length; ++ii) {
-                QScriptValue arrayItem = svalue.property(ii);
-                QObject *d = arrayItem.toQObject();
-                list << d;
-            }
-            rv = QVariant::fromValue(list);
-        }
-    } else if (svalue.isObject() &&
-               ep->objectClass->scriptClass(svalue) == ep->objectClass) {
-        QObject *o = svalue.toQObject();
-        int type = QMetaType::QObjectStar;
-        // If the object is null, we extract the predicted type.  While this isn't
-        // 100% reliable, in many cases it gives us better error messages if we
-        // assign this null-object to an incompatible property
-        if (!o) type = ep->objectClass->objectType(svalue);
-
-        return QVariant(type, &o);
-    }
-
-    if (rv.isNull())
-        rv = svalue.toVariant();
-
-    return rv;
-}
-
-QVariant QmlExpressionPrivate::value(QObject *secondaryScope, bool *isUndefined)
-{
-    Q_Q(QmlExpression);
-
-    QVariant rv;
-    if (!q->engine()) {
-        qWarning("QmlExpression: Attempted to evaluate an expression in an invalid context");
-        return rv;
-    }
-
-    if (data->expression.isEmpty())
-        return rv;
-
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::BindValue> perf;
-#endif
-
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(q->engine());
-
-    QmlExpression *lastCurrentExpression = ep->currentExpression;
-    bool lastCaptureProperties = ep->captureProperties;
-    QPODVector<QmlEnginePrivate::CapturedProperty> lastCapturedProperties;
-    ep->capturedProperties.copyAndClear(lastCapturedProperties);
-
-    ep->currentExpression = q;
-    ep->captureProperties = data->trackChange;
-
-    // This object might be deleted during the eval
-    QmlExpressionData *localData = data;
-    localData->addref();
-
-    rv = evalQtScript(secondaryScope, isUndefined);
-
-    ep->currentExpression = lastCurrentExpression;
-    ep->captureProperties = lastCaptureProperties;
-
-    // Check if we were deleted
-    if (localData->q) {
-        if ((!data->trackChange || !ep->capturedProperties.count()) && data->guardList) {
-            clearGuards();
-        } else if(data->trackChange) {
-            updateGuards(ep->capturedProperties);
-        }
-    }
-
-    localData->release();
-
-    lastCapturedProperties.copyAndClear(ep->capturedProperties);
-
-    return rv;
-}
-
-/*!
-    Returns the value of the expression, or an invalid QVariant if the
-    expression is invalid or has an error.
-
-    \a isUndefined is set to true if the expression resulted in an
-    undefined value.
-
-    \sa hasError(), error()
-*/
-QVariant QmlExpression::value(bool *isUndefined)
-{
-    Q_D(QmlExpression);
-    return d->value(0, isUndefined);
-}
-
-/*!
-Returns true if the valueChanged() signal is emitted when the expression's evaluated
-value changes.
-*/
-bool QmlExpression::notifyOnValueChanged() const
-{
-    Q_D(const QmlExpression);
-    return d->data->trackChange;
-}
-
-/*!
-Sets whether the valueChanged() signal is emitted when the expression's evaluated
-value changes.
-
-If true, the QmlExpression will monitor properties involved in the expression's 
-evaluation, and emit QmlExpression::valueChanged() if they have changed.  This allows 
-an application to ensure that any value associated with the result of the expression 
-remains up to date.
-
-If false, the QmlExpression will not montitor properties involved in the expression's 
-evaluation, and QmlExpression::valueChanged() will never be emitted.  This is more efficient 
-if an application wants a "one off" evaluation of the expression.
-
-By default, notifyOnChange is false.
-*/
-void QmlExpression::setNotifyOnValueChanged(bool notifyOnChange)
-{
-    Q_D(QmlExpression);
-    d->data->trackChange = notifyOnChange;
-}
-
-/*!
-    Returns the source file URL for this expression.  The source location must
-    have been previously set by calling setSourceLocation().
-*/
-QString QmlExpression::sourceFile() const
-{
-    Q_D(const QmlExpression);
-    return d->data->url;
-}
-
-/*!
-    Returns the source file line number for this expression.  The source location 
-    must have been previously set by calling setSourceLocation().
-*/
-int QmlExpression::lineNumber() const
-{
-    Q_D(const QmlExpression);
-    return d->data->line;
-}
-
-/*!
-    Set the location of this expression to \a line of \a url. This information
-    is used by the script engine.
-*/
-void QmlExpression::setSourceLocation(const QString &url, int line)
-{
-    Q_D(QmlExpression);
-    d->data->url = url;
-    d->data->line = line;
-}
-
-/*!
-    Returns the expression's scope object, if provided, otherwise 0.
-
-    In addition to data provided by the expression's QmlContext, the scope
-    object's properties are also in scope during the expression's evaluation.
-*/
-QObject *QmlExpression::scopeObject() const
-{
-    Q_D(const QmlExpression);
-    return d->data->me;
-}
-
-/*!
-    Returns true if the last call to value() resulted in an error, 
-    otherwise false.
-    
-    \sa error(), clearError()
-*/
-bool QmlExpression::hasError() const
-{
-    Q_D(const QmlExpression);
-    return d->data->error.isValid();
-}
-
-/*!
-    Clear any expression errors.  Calls to hasError() following this will
-    return false.
-
-    \sa hasError(), error()
-*/
-void QmlExpression::clearError()
-{
-    Q_D(QmlExpression);
-    d->data->error = QmlError();
-}
-
-/*!
-    Return any error from the last call to value().  If there was no error,
-    this returns an invalid QmlError instance.
-
-    \sa hasError(), clearError()
-*/
-
-QmlError QmlExpression::error() const
-{
-    Q_D(const QmlExpression);
-    return d->data->error;
-}
-
-/*! \internal */
-void QmlExpression::__q_notify()
-{
-    Q_D(QmlExpression);
-    d->emitValueChanged();
-}
-
-void QmlExpressionPrivate::clearGuards()
-{
-    Q_Q(QmlExpression);
-
-    static int notifyIdx = -1;
-    if (notifyIdx == -1) 
-        notifyIdx = 
-            QmlExpression::staticMetaObject.indexOfMethod("__q_notify()");
-
-    for (int ii = 0; ii < data->guardListLength; ++ii) {
-        if (data->guardList[ii].data()) {
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
-            QMetaObject::disconnectOne(data->guardList[ii].data(), 
-                                       data->guardList[ii].notifyIndex, 
-                                       q, notifyIdx);
-#else
-            // QTBUG-6781
-            QMetaObject::disconnect(data->guardList[ii].data(), 
-                                    data->guardList[ii].notifyIndex, 
-                                    q, notifyIdx);
-#endif
-        }
-    }
-
-    delete [] data->guardList; data->guardList = 0; 
-    data->guardListLength = 0;
-}
-
-void QmlExpressionPrivate::updateGuards(const QPODVector<QmlEnginePrivate::CapturedProperty> &properties)
-{
-    //clearGuards();
-    Q_Q(QmlExpression);
-
-    static int notifyIdx = -1;
-    if (notifyIdx == -1) 
-        notifyIdx = 
-            QmlExpression::staticMetaObject.indexOfMethod("__q_notify()");
-
-    QmlExpressionData::SignalGuard *newGuardList = 0;
-    
-    if (properties.count() != data->guardListLength)
-        newGuardList = new QmlExpressionData::SignalGuard[properties.count()];
-
-    bool outputWarningHeader = false;
-    int hit = 0;
-    for (int ii = 0; ii < properties.count(); ++ii) {
-        const QmlEnginePrivate::CapturedProperty &property = properties.at(ii);
-
-        bool needGuard = true;
-        if (ii >= data->guardListLength) {
-            // New guard
-        } else if(data->guardList[ii].data() == property.object && 
-                  data->guardList[ii].notifyIndex == property.notifyIndex) {
-            // Cache hit
-            if (!data->guardList[ii].isDuplicate || 
-                (data->guardList[ii].isDuplicate && hit == ii)) {
-                needGuard = false;
-                ++hit;
-            }
-        } else if(data->guardList[ii].data() && !data->guardList[ii].isDuplicate) {
-            // Cache miss
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
-            QMetaObject::disconnectOne(data->guardList[ii].data(), 
-                                       data->guardList[ii].notifyIndex, 
-                                       q, notifyIdx);
-#else
-            // QTBUG-6781
-            QMetaObject::disconnect(data->guardList[ii].data(), 
-                                    data->guardList[ii].notifyIndex, 
-                                    q, notifyIdx);
-#endif
-        } 
-        /* else {
-            // Cache miss, but nothing to do
-        } */
-
-        if (needGuard) {
-            if (!newGuardList) {
-                newGuardList = new QmlExpressionData::SignalGuard[properties.count()];
-                for (int jj = 0; jj < ii; ++jj)
-                    newGuardList[jj] = data->guardList[jj];
-            }
-
-            if (property.notifyIndex != -1) {
-                bool existing = false;
-                for (int jj = 0; !existing && jj < ii; ++jj) 
-                    existing = newGuardList[jj].data() == property.object &&
-                        newGuardList[jj].notifyIndex == property.notifyIndex;
-
-                newGuardList[ii] = property.object;
-                newGuardList[ii].notifyIndex = property.notifyIndex;
-                if (existing)
-                    newGuardList[ii].isDuplicate = true;
-                else
-                    QMetaObject::connect(property.object, property.notifyIndex,
-                                         q, notifyIdx);
-            } else {
-                if (!outputWarningHeader) {
-                    outputWarningHeader = true;
-                    qWarning() << "QmlExpression: Expression" << q->expression()
-                               << "depends on non-NOTIFYable properties:";
-                }
-
-                const QMetaObject *metaObj = property.object->metaObject();
-                QMetaProperty metaProp = metaObj->property(property.coreIndex);
-
-                qWarning().nospace() << "    " << metaObj->className()
-                                     << "::" << metaProp.name();
-            }
-        } else if (newGuardList) {
-            newGuardList[ii] = data->guardList[ii];
-        }
-    }
-
-    for (int ii = properties.count(); ii < data->guardListLength; ++ii) {
-        if (data->guardList[ii].data() && !data->guardList[ii].isDuplicate) {
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 2))
-            QMetaObject::disconnectOne(data->guardList[ii].data(), 
-                                       data->guardList[ii].notifyIndex, 
-                                       q, notifyIdx);
-#else
-            // QTBUG-6781
-            QMetaObject::disconnect(data->guardList[ii].data(), 
-                                    data->guardList[ii].notifyIndex, 
-                                    q, notifyIdx);
-#endif
-        }
-    }
-
-    if (newGuardList) {
-        if (data->guardList) delete [] data->guardList;
-        data->guardList = newGuardList;
-        data->guardListLength = properties.count();
-    }
-}
-
-/*!
-    \fn void QmlExpression::valueChanged()
-
-    Emitted each time the expression value changes from the last time it was
-    evaluated.  The expression must have been evaluated at least once (by
-    calling QmlExpression::value()) before this signal will be emitted.
-*/
-
-void QmlExpressionPrivate::emitValueChanged()
-{
-    Q_Q(QmlExpression);
-    emit q->valueChanged();
-}
-
-QmlAbstractExpression::QmlAbstractExpression()
-: m_context(0), m_prevExpression(0), m_nextExpression(0)
-{
-}
-
-QmlAbstractExpression::~QmlAbstractExpression()
-{
-    if (m_prevExpression) {
-        *m_prevExpression = m_nextExpression;
-        if (m_nextExpression) 
-            m_nextExpression->m_prevExpression = m_prevExpression;
-    }
-}
-
-QmlContext *QmlAbstractExpression::context() const
-{
-    return m_context;
-}
-
-void QmlAbstractExpression::setContext(QmlContext *context)
-{
-    if (m_prevExpression) {
-        *m_prevExpression = m_nextExpression;
-        if (m_nextExpression) 
-            m_nextExpression->m_prevExpression = m_prevExpression;
-        m_prevExpression = 0;
-        m_nextExpression = 0;
-    }
-
-    m_context = context;
-
-    if (m_context) {
-        QmlContextPrivate *cp = 
-            static_cast<QmlContextPrivate *>(QObjectPrivate::get(m_context));
-        m_nextExpression = cp->expressions;
-        if (m_nextExpression) 
-            m_nextExpression->m_prevExpression = &m_nextExpression;
-        m_prevExpression = &cp->expressions;
-        cp->expressions = this;
-    }
-}
-
-void QmlAbstractExpression::refresh()
-{
-}
-
-bool QmlAbstractExpression::isValid() const
-{
-    return m_context != 0;
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h
deleted file mode 100644
index 61374f2..0000000
--- a/src/declarative/qml/qmlexpression.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLEXPRESSION_H
-#define QMLEXPRESSION_H
-
-#include "qmlerror.h"
-
-#include <QtCore/qobject.h>
-#include <QtCore/qvariant.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QString;
-class QmlRefCount;
-class QmlEngine;
-class QmlContext;
-class QmlExpressionPrivate;
-class Q_DECLARATIVE_EXPORT QmlExpression : public QObject
-{
-    Q_OBJECT
-public:
-    QmlExpression();
-    QmlExpression(QmlContext *, const QString &, QObject *);
-    virtual ~QmlExpression();
-
-    QmlEngine *engine() const;
-    QmlContext *context() const;
-
-    QString expression() const;
-    void setExpression(const QString &);
-
-    bool notifyOnValueChanged() const;
-    void setNotifyOnValueChanged(bool);
-
-    QString sourceFile() const;
-    int lineNumber() const;
-    void setSourceLocation(const QString &fileName, int line);
-
-    QObject *scopeObject() const;
-
-    bool hasError() const;
-    void clearError();
-    QmlError error() const;
-
-    QVariant value(bool *isUndefined = 0);
-
-Q_SIGNALS:
-    void valueChanged();
-
-protected:
-    QmlExpression(QmlContext *, const QString &, QObject *, 
-                  QmlExpressionPrivate &dd);
-    QmlExpression(QmlContext *, void *, QmlRefCount *rc, QObject *me, const QString &,
-                  int, QmlExpressionPrivate &dd);
-
-private Q_SLOTS:
-    void __q_notify();
-
-private:
-    Q_DECLARE_PRIVATE(QmlExpression)
-    friend class QmlDebugger;
-    friend class QmlContext;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLEXPRESSION_H
-
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
deleted file mode 100644
index e4bed05..0000000
--- a/src/declarative/qml/qmlexpression_p.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLEXPRESSION_P_H
-#define QMLEXPRESSION_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlexpression.h"
-
-#include "qmlengine_p.h"
-#include "qmlguard_p.h"
-
-#include <QtScript/qscriptvalue.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlAbstractExpression
-{
-public:
-    QmlAbstractExpression();
-    virtual ~QmlAbstractExpression();
-
-    bool isValid() const;
-
-    QmlContext *context() const;
-    void setContext(QmlContext *);
-
-    virtual void refresh();
-
-private:
-    friend class QmlContext;
-    friend class QmlContextPrivate;
-    QmlContext *m_context;
-    QmlAbstractExpression **m_prevExpression;
-    QmlAbstractExpression  *m_nextExpression;
-};
-
-class QmlDelayedError 
-{
-public:
-    inline QmlDelayedError() : nextError(0), prevError(0) {}
-    inline ~QmlDelayedError() { removeError(); }
-
-    QmlError error;
-
-    bool addError(QmlEnginePrivate *);
-
-    inline void removeError() {
-        if (!prevError) return;
-        if (nextError) nextError->prevError = prevError;
-        *prevError = nextError;
-        nextError = 0;
-        prevError = 0;
-    }
-
-private:
-    QmlDelayedError  *nextError;
-    QmlDelayedError **prevError;
-};
-
-class QmlExpressionData : public QmlAbstractExpression, public QmlDelayedError, public QmlRefCount
-{
-public:
-    QmlExpressionData();
-    virtual ~QmlExpressionData();
-
-    QmlExpressionPrivate *q;
-
-    QmlRefCount *dataRef;
-    QString expression;
-    bool expressionFunctionValid:1;
-    bool expressionRewritten:1;
-    QScriptValue expressionFunction;
-
-    QObject *me;
-    bool trackChange;
-
-    bool isShared;
-
-    QString url; // This is a QString for a reason.  QUrls are slooooooow...
-    int line;
-
-    struct SignalGuard : public QmlGuard<QObject> {
-        SignalGuard() : isDuplicate(false), notifyIndex(-1) {}
-
-        SignalGuard &operator=(QObject *obj) {
-            QmlGuard<QObject>::operator=(obj);
-            return *this;
-        }
-        SignalGuard &operator=(const SignalGuard &o) {
-            QmlGuard<QObject>::operator=(o);
-            isDuplicate = o.isDuplicate;
-            notifyIndex = o.notifyIndex;
-            return *this;
-        }
-
-        bool isDuplicate:1;
-        int notifyIndex:31;
-    };
-    SignalGuard *guardList;
-    int guardListLength;
-};
-
-class QmlExpression;
-class QString;
-class QmlExpressionPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlExpression)
-public:
-    QmlExpressionPrivate();
-    QmlExpressionPrivate(QmlExpressionData *);
-    ~QmlExpressionPrivate();
-
-    void init(QmlContext *, const QString &, QObject *);
-    void init(QmlContext *, void *, QmlRefCount *, QObject *, const QString &, int);
-
-    QmlExpressionData *data;
-
-    QVariant value(QObject *secondaryScope = 0, bool *isUndefined = 0);
-    QVariant evalQtScript(QObject *secondaryScope, bool *isUndefined = 0);
-
-    void updateGuards(const QPODVector<QmlEnginePrivate::CapturedProperty> &properties);
-    void clearGuards();
-
-    static QmlExpressionPrivate *get(QmlExpression *expr) {
-        return static_cast<QmlExpressionPrivate *>(QObjectPrivate::get(expr));
-    }
-    static QmlExpression *get(QmlExpressionPrivate *expr) {
-        return expr->q_func();
-    }
-
-    virtual void emitValueChanged();
-
-    static void exceptionToError(QScriptEngine *, QmlError &);
-    static QScriptValue evalInObjectScope(QmlContext *, QObject *, const QString &);
-    static QScriptValue evalInObjectScope(QmlContext *, QObject *, const QScriptProgram &);
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLEXPRESSION_P_H
diff --git a/src/declarative/qml/qmlextensioninterface.h b/src/declarative/qml/qmlextensioninterface.h
deleted file mode 100644
index 644ef1e..0000000
--- a/src/declarative/qml/qmlextensioninterface.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLEXTENSIONINTERFACE_H
-#define QMLEXTENSIONINTERFACE_H
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlEngine;
-
-struct Q_DECLARATIVE_EXPORT QmlExtensionInterface
-{
-    virtual ~QmlExtensionInterface() {}
-    virtual void initialize(QmlEngine *engine, const char *uri) = 0;
-};
-
-Q_DECLARE_INTERFACE(QmlExtensionInterface, "com.trolltech.Qt.QmlExtensionInterface/1.0")
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLEXTENSIONINTERFACE_H
diff --git a/src/declarative/qml/qmlextensionplugin.cpp b/src/declarative/qml/qmlextensionplugin.cpp
deleted file mode 100644
index c1195d2..0000000
--- a/src/declarative/qml/qmlextensionplugin.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlextensionplugin.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \since 4.7
-    \class QmlExtensionPlugin
-    \brief The QmlExtensionPlugin class provides an abstract base for custom QML extension plugins.
-
-    \ingroup plugins
-
-    QmlExtensionPlugin is a plugin interface that makes it
-    possible to offer extensions that can be loaded dynamically into
-    applications using the QmlEngine class.
-
-    Writing a QML extension plugin is achieved by subclassing this
-    base class, reimplementing the pure virtual initialize()
-    function, and exporting the class using the Q_EXPORT_PLUGIN2()
-    macro. See \l {How to Create Qt Plugins} for details.
-
-    \sa QmlEngine::importExtension()
-*/
-
-/*!
-    \fn void QmlExtensionPlugin::initialize(QmlEngine *engine)
-
-    Initializes the extension specified in the given \a engine.
-*/
-
-/*!
-    Constructs a QML extension plugin with the given \a parent.
-
-    Note that this constructor is invoked automatically by the
-    Q_EXPORT_PLUGIN2() macro, so there is no need for calling it
-    explicitly.
-*/
-QmlExtensionPlugin::QmlExtensionPlugin(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QmlExtensionPlugin::~QmlExtensionPlugin()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlextensionplugin.h b/src/declarative/qml/qmlextensionplugin.h
deleted file mode 100644
index 8cc64ad..0000000
--- a/src/declarative/qml/qmlextensionplugin.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLEXTENSIONPLUGIN_H
-#define QMLEXTENSIONPLUGIN_H
-
-#include <QtCore/qplugin.h>
-
-#include "qmlextensioninterface.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlEngine;
-
-class Q_DECLARATIVE_EXPORT QmlExtensionPlugin : public QObject, public QmlExtensionInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlExtensionInterface)
-public:
-    explicit QmlExtensionPlugin(QObject *parent = 0);
-    ~QmlExtensionPlugin();
-
-    virtual void initialize(QmlEngine *engine, const char *uri) = 0;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLEXTENSIONPLUGIN_H
diff --git a/src/declarative/qml/qmlglobal_p.h b/src/declarative/qml/qmlglobal_p.h
deleted file mode 100644
index 06ae6e6..0000000
--- a/src/declarative/qml/qmlglobal_p.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGLOBAL_H
-#define QMLGLOBAL_H
-
-#include <QtCore/qglobal.h>
-#include <QtCore/QObject>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-#define DEFINE_BOOL_CONFIG_OPTION(name, var) \
-    static bool name() \
-    { \
-        static enum { Yes, No, Unknown } status = Unknown; \
-        if (status == Unknown) { \
-            QByteArray v = qgetenv(#var); \
-            bool value = !v.isEmpty() && v != "0" && v != "false"; \
-            if (value) status = Yes; \
-            else status = No; \
-        } \
-        return status == Yes; \
-    }
-
-struct QmlGraphics_DerivedObject : public QObject
-{
-    void setParent_noEvent(QObject *parent) {
-        bool sce = d_ptr->sendChildEvents;
-        d_ptr->sendChildEvents = false;
-        setParent(parent);
-        d_ptr->sendChildEvents = sce;
-    }
-};
-
-/*!
-    Makes the \a object a child of \a parent.  Note that when using this method,
-    neither \a parent nor the object's previous parent (if it had one) will
-    receive ChildRemoved or ChildAdded events.
-*/
-inline void QmlGraphics_setParent_noEvent(QObject *object, QObject *parent)
-{
-    static_cast<QmlGraphics_DerivedObject *>(object)->setParent_noEvent(parent);
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLGLOBAL_H
diff --git a/src/declarative/qml/qmlglobalscriptclass.cpp b/src/declarative/qml/qmlglobalscriptclass.cpp
deleted file mode 100644
index d2198b6..0000000
--- a/src/declarative/qml/qmlglobalscriptclass.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlglobalscriptclass_p.h"
-
-#include <QtScript/qscriptstring.h>
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalueiterator.h>
-
-QT_BEGIN_NAMESPACE
-
-/*
-    Used to prevent any writes to the global object.
-*/
-QmlGlobalScriptClass::QmlGlobalScriptClass(QScriptEngine *engine)
-: QScriptClass(engine)
-{
-    QScriptValue v = engine->newObject();
-    globalObject = engine->globalObject();
-
-    QScriptValueIterator iter(globalObject);
-    while (iter.hasNext()) {
-        iter.next();
-        v.setProperty(iter.scriptName(), iter.value());
-    }
-
-    v.setScriptClass(this);
-    engine->setGlobalObject(v);
-}
-
-QScriptClass::QueryFlags 
-QmlGlobalScriptClass::queryProperty(const QScriptValue &object,
-                                    const QScriptString &name,
-                                    QueryFlags flags, uint *id)
-{
-    Q_UNUSED(object);
-    Q_UNUSED(name);
-    Q_UNUSED(flags);
-    Q_UNUSED(id);
-    return HandlesReadAccess | HandlesWriteAccess;
-}
-
-QScriptValue 
-QmlGlobalScriptClass::property(const QScriptValue &object,
-                               const QScriptString &name, 
-                               uint id)
-{
-    Q_UNUSED(object);
-    Q_UNUSED(name);
-    Q_UNUSED(id);
-    return engine()->undefinedValue();
-}
-
-void QmlGlobalScriptClass::setProperty(QScriptValue &object, 
-                                       const QScriptString &name,
-                                       uint id, const QScriptValue &value)
-{
-    Q_UNUSED(object);
-    Q_UNUSED(id);
-    Q_UNUSED(value);
-    QString error = QLatin1String("Invalid write to global property \"") + 
-                    name.toString() + QLatin1Char('\"');
-    engine()->currentContext()->throwError(error);
-}
-
-void QmlGlobalScriptClass::explicitSetProperty(const QString &name, const QScriptValue &value)
-{
-    QScriptValue v = engine()->newObject();
-    globalObject = engine()->globalObject();
-
-    QScriptValueIterator iter(globalObject);
-    while (iter.hasNext()) {
-        iter.next();
-        v.setProperty(iter.scriptName(), iter.value());
-    }
-
-    v.setProperty(name, value);
-    v.setScriptClass(this);
-    engine()->setGlobalObject(v);
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/qml/qmlglobalscriptclass_p.h b/src/declarative/qml/qmlglobalscriptclass_p.h
deleted file mode 100644
index d002da6..0000000
--- a/src/declarative/qml/qmlglobalscriptclass_p.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGLOBALSCRIPTCLASS_P_H
-#define QMLGLOBALSCRIPTCLASS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtScript/qscriptclass.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_AUTOTEST_EXPORT QmlGlobalScriptClass : public QScriptClass
-{
-public:
-    QmlGlobalScriptClass(QScriptEngine *);
-
-    virtual QueryFlags queryProperty(const QScriptValue &object,
-                                     const QScriptString &name,
-                                     QueryFlags flags, uint *id);
-
-    virtual QScriptValue property(const QScriptValue &object,
-                                  const QScriptString &name, uint id);
-
-    virtual void setProperty(QScriptValue &object, const QScriptString &name,
-                             uint id, const QScriptValue &value);
-
-    void explicitSetProperty(const QString &, const QScriptValue &);
-
-private:
-    QScriptValue globalObject;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLGLOBALSCRIPTCLASS_P_H
diff --git a/src/declarative/qml/qmlguard_p.h b/src/declarative/qml/qmlguard_p.h
deleted file mode 100644
index 0e90f79..0000000
--- a/src/declarative/qml/qmlguard_p.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGUARD_P_H
-#define QMLGUARD_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
-// file may change from version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QObject;
-template<class T>
-class QmlGuard
-{
-    QObject *o;
-    QmlGuard<QObject> *next;
-    QmlGuard<QObject> **prev;
-    friend class QmlDeclarativeData;
-public:
-    inline QmlGuard();
-    inline QmlGuard(T *);
-    inline QmlGuard(const QmlGuard<T> &);
-    inline virtual ~QmlGuard();
-
-    inline QmlGuard<T> &operator=(const QmlGuard<T> &o);
-    inline QmlGuard<T> &operator=(T *);
-    
-    inline bool isNull() const
-        { return !o; }
-
-    inline T* operator->() const
-        { return static_cast<T*>(const_cast<QObject*>(o)); }
-    inline T& operator*() const
-        { return *static_cast<T*>(const_cast<QObject*>(o)); }
-    inline operator T*() const
-        { return static_cast<T*>(const_cast<QObject*>(o)); }
-    inline T* data() const
-        { return static_cast<T*>(const_cast<QObject*>(o)); }
-
-protected:
-    virtual void objectDestroyed(T *) {}
-
-private:
-    inline void addGuard();
-    inline void remGuard();
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QmlGuard<QObject>);
-
-#include "qmldeclarativedata_p.h"
-
-QT_BEGIN_NAMESPACE
-
-template<class T>
-QmlGuard<T>::QmlGuard()
-: o(0), next(0), prev(0)
-{
-}
-
-template<class T>
-QmlGuard<T>::QmlGuard(T *g)
-: o(g), next(0), prev(0)
-{
-    if (o) addGuard();
-}
-
-template<class T>
-QmlGuard<T>::QmlGuard(const QmlGuard<T> &g)
-: o(g.o), next(0), prev(0)
-{
-    if (o) addGuard();
-}
-
-template<class T>
-QmlGuard<T>::~QmlGuard()
-{
-    if (prev) remGuard();
-    o = 0;
-}
-
-template<class T>
-QmlGuard<T> &QmlGuard<T>::operator=(const QmlGuard<T> &g)
-{
-    if (g.o != o) {
-        if (prev) remGuard();
-        o = g.o;
-        if (o) addGuard();
-    }
-    return *this;
-}
-
-template<class T>
-QmlGuard<T> &QmlGuard<T>::operator=(T *g)
-{
-    if (g != o) {
-        if (prev) remGuard();
-        o = g;
-        if (o) addGuard();
-    }
-    return *this;
-}
-
-QT_END_NAMESPACE
-
-#endif // QMLGUARD_P_H
diff --git a/src/declarative/qml/qmlimageprovider.cpp b/src/declarative/qml/qmlimageprovider.cpp
deleted file mode 100644
index 7f15d08..0000000
--- a/src/declarative/qml/qmlimageprovider.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlimageprovider.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlImageProvider
-    \brief The QmlImageProvider class provides an interface for threaded image requests.
-
-    Note: the request() method may be called by multiple threads, so ensure the
-    implementation of this method is reentrant.
-
-    \sa QmlEngine::addImageProvider()
-*/
-QmlImageProvider::~QmlImageProvider()
-{
-}
-
-/*!
-    \fn QImage QmlImageProvider::request(const QString &id)
-
-    Implement this method to return the image with \a id.
-
-    Note: this method may be called by multiple threads, so ensure the
-    implementation of this method is reentrant.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlimageprovider.h b/src/declarative/qml/qmlimageprovider.h
deleted file mode 100644
index 52fe066..0000000
--- a/src/declarative/qml/qmlimageprovider.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLIMAGEPROVIDER_H
-#define QMLIMAGEPROVIDER_H
-
-#include <QtGui/qimage.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QmlImageProvider
-{
-public:
-    virtual ~QmlImageProvider();
-    virtual QImage request(const QString &id) = 0;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLIMAGEPROVIDER
diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
deleted file mode 100644
index 1f3d434..0000000
--- a/src/declarative/qml/qmlinfo.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlinfo.h"
-
-#include "qmldeclarativedata_p.h"
-#include "qmlcontext.h"
-#include "qmlmetatype.h"
-
-#include <QCoreApplication>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \fn QmlInfo qmlInfo(const QObject *object)
-
-    \brief Prints warnings messages that include the file and line number for QML types.
-
-    When QML types display warning messages, it improves traceability
-    if they include the QML file and line number on which the
-    particular instance was instantiated.
-    
-    To include the file and line number, an object must be passed.  If
-    the file and line number is not available for that instance
-    (either it was not instantiated by the QML engine or location
-    information is disabled), "unknown location" will be used instead.
-
-    For example, 
-
-    \code
-    qmlInfo(object) << tr("component property is a write-once property");
-    \endcode
-
-    prints
-
-    \code
-    QML MyCustomType (unknown location): component property is a write-once property
-    \endcode
-*/
-
-QmlInfo::QmlInfo(const QObject *object)
-: QDebug(QtWarningMsg)
-{
-    QString pos = QLatin1String("QML");
-    if (object) {
-        pos += QLatin1Char(' ');
-
-        QString typeName;
-        QmlType *type = QmlMetaType::qmlType(object->metaObject());
-        if (type) {
-            typeName = QLatin1String(type->qmlTypeName());
-            int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
-            if (lastSlash != -1)
-                typeName = typeName.mid(lastSlash+1);
-        } else {
-            typeName = QString::fromUtf8(object->metaObject()->className());
-            int marker = typeName.indexOf(QLatin1String("_QMLTYPE_"));
-            if (marker != -1)
-                typeName = typeName.left(marker);
-        }
-
-        pos += typeName;
-    }
-    QmlDeclarativeData *ddata = object?QmlDeclarativeData::get(object):0;
-    pos += QLatin1String(" (");
-    if (ddata) {
-        if (ddata->outerContext) {
-            pos += ddata->outerContext->baseUrl().toString();
-            pos += QLatin1Char(':');
-            pos += QString::number(ddata->lineNumber);
-            pos += QLatin1Char(':');
-            pos += QString::number(ddata->columnNumber);
-        } else {
-            pos += QCoreApplication::translate("QmlInfo","unknown location");
-        }
-    } else {
-        pos += QCoreApplication::translate("QmlInfo","unknown location");
-    }
-    pos += QLatin1Char(')');
-    *this << pos;
-    nospace();
-}
-
-QmlInfo::~QmlInfo()
-{
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlinfo.h b/src/declarative/qml/qmlinfo.h
deleted file mode 100644
index 379f211..0000000
--- a/src/declarative/qml/qmlinfo.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLINFO_H
-#define QMLINFO_H
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QmlInfo : public QDebug
-{
-public:
-    QmlInfo(const QObject *);
-    ~QmlInfo();
-
-    inline QmlInfo &operator<<(QChar t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(QBool t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(bool t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(char t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(signed short t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(unsigned short t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(signed int t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(unsigned int t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(signed long t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(unsigned long t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(qint64 t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(quint64 t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(float t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(double t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(const char* t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(const QString & t) { QDebug::operator<<(t.toLocal8Bit().constData()); return *this; }
-    inline QmlInfo &operator<<(const QStringRef & t) { return operator<<(t.toString()); }
-    inline QmlInfo &operator<<(const QLatin1String &t) { QDebug::operator<<(t.latin1()); return *this; }
-    inline QmlInfo &operator<<(const QByteArray & t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(const void * t) { QDebug::operator<<(t); return *this; }
-    inline QmlInfo &operator<<(QTextStreamFunction f) { QDebug::operator<<(f); return *this; }
-    inline QmlInfo &operator<<(QTextStreamManipulator m) { QDebug::operator<<(m); return *this; }
-};
-
-Q_DECLARATIVE_EXPORT inline QmlInfo qmlInfo(const QObject *me)
-{
-    return QmlInfo(me);
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLINFO_H
diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp
deleted file mode 100644
index e37ade7..0000000
--- a/src/declarative/qml/qmlinstruction.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlinstruction_p.h"
-
-#include "qmlcompiler_p.h"
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-void QmlCompiledData::dump(QmlInstruction *instr, int idx)
-{
-    QByteArray lineNumber = QByteArray::number(instr->line);
-    if (instr->line == (unsigned short)-1)
-        lineNumber = "NA";
-    const char *line = lineNumber.constData();
-
-    switch(instr->type) {
-    case QmlInstruction::Init:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "INIT\t\t\t" << instr->init.bindingsSize << "\t" << instr->init.parserStatusSize << "\t" << instr->init.contextCache << "\t" << instr->init.compiledBinding;
-        break;
-    case QmlInstruction::CreateObject:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "CREATE\t\t\t" << instr->create.type << "\t\t\t" << types.at(instr->create.type).className;
-        break;
-    case QmlInstruction::SetId:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "SETID\t\t\t" << instr->setId.value << "\t\t\t" << primitives.at(instr->setId.value);
-        break;
-    case QmlInstruction::SetDefault:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "SET_DEFAULT";
-        break;
-    case QmlInstruction::CreateComponent:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "CREATE_COMPONENT\t" << instr->createComponent.count;
-        break;
-    case QmlInstruction::StoreMetaObject:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_META\t\t" << instr->storeMeta.data;
-        break;
-
-    case QmlInstruction::StoreFloat:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_FLOAT\t\t" << instr->storeFloat.propertyIndex << "\t" << instr->storeFloat.value;
-        break;
-    case QmlInstruction::StoreDouble:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_DOUBLE\t\t" << instr->storeDouble.propertyIndex << "\t" << instr->storeDouble.value;
-        break;
-    case QmlInstruction::StoreInteger:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_INTEGER\t\t" << instr->storeInteger.propertyIndex << "\t" << instr->storeInteger.value;
-        break;
-    case QmlInstruction::StoreBool:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_BOOL\t\t" << instr->storeBool.propertyIndex << "\t" << instr->storeBool.value;
-        break;
-    case QmlInstruction::StoreString:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_STRING\t\t" << instr->storeString.propertyIndex << "\t" << instr->storeString.value << "\t\t" << primitives.at(instr->storeString.value);
-        break;
-    case QmlInstruction::StoreUrl:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_URL\t\t" << instr->storeUrl.propertyIndex << "\t" << instr->storeUrl.value << "\t\t" << primitives.at(instr->storeUrl.value);
-        break;
-    case QmlInstruction::StoreColor:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_COLOR\t\t" << instr->storeColor.propertyIndex << "\t\t\t" << QString::number(instr->storeColor.value, 16);
-        break;
-    case QmlInstruction::StoreDate:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_DATE\t\t" << instr->storeDate.propertyIndex << "\t" << instr->storeDate.value;
-        break;
-    case QmlInstruction::StoreTime:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_TIME\t\t" << instr->storeTime.propertyIndex << "\t" << instr->storeTime.valueIndex;
-        break;
-    case QmlInstruction::StoreDateTime:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_DATETIME\t\t" << instr->storeDateTime.propertyIndex << "\t" << instr->storeDateTime.valueIndex;
-        break;
-    case QmlInstruction::StorePoint:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_POINT\t\t" << instr->storeRealPair.propertyIndex << "\t" << instr->storeRealPair.valueIndex;
-        break;
-    case QmlInstruction::StorePointF:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_POINTF\t\t" << instr->storeRealPair.propertyIndex << "\t" << instr->storeRealPair.valueIndex;
-        break;
-    case QmlInstruction::StoreSize:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SIZE\t\t" << instr->storeRealPair.propertyIndex << "\t" << instr->storeRealPair.valueIndex;
-        break;
-    case QmlInstruction::StoreSizeF:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SIZEF\t\t" << instr->storeRealPair.propertyIndex << "\t" << instr->storeRealPair.valueIndex;
-        break;
-    case QmlInstruction::StoreRect:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_RECT\t\t" << instr->storeRect.propertyIndex << "\t" << instr->storeRect.valueIndex;
-        break;
-    case QmlInstruction::StoreRectF:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_RECTF\t\t" << instr->storeRect.propertyIndex << "\t" << instr->storeRect.valueIndex;
-        break;
-    case QmlInstruction::StoreVector3D:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VECTOR3D\t\t" << instr->storeVector3D.propertyIndex << "\t" << instr->storeVector3D.valueIndex;
-        break;
-    case QmlInstruction::StoreVariant:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VARIANT\t\t" << instr->storeString.propertyIndex << "\t" << instr->storeString.value << "\t\t" << primitives.at(instr->storeString.value);
-        break;
-    case QmlInstruction::StoreObject:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_OBJECT\t\t" << instr->storeObject.propertyIndex;
-        break;
-    case QmlInstruction::StoreVariantObject:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VARIANT_OBJECT\t" << instr->storeObject.propertyIndex;
-        break;
-    case QmlInstruction::StoreInterface:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_INTERFACE\t\t" << instr->storeObject.propertyIndex;
-        break;
-
-    case QmlInstruction::StoreSignal:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SIGNAL\t\t" << instr->storeSignal.signalIndex << "\t" << instr->storeSignal.value << "\t\t" << primitives.at(instr->storeSignal.value);
-        break;
-    case QmlInstruction::StoreScript:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SCRIPT\t\t" << instr->storeScript.value;
-        break;
-    case QmlInstruction::StoreScriptString:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_SCRIPT_STRING\t" << instr->storeScriptString.propertyIndex << "\t" << instr->storeScriptString.value << "\t" << instr->storeScriptString.scope;
-        break;
-
-    case QmlInstruction::AssignSignalObject:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "ASSIGN_SIGNAL_OBJECT\t" << instr->assignSignalObject.signal << "\t\t\t" << datas.at(instr->assignSignalObject.signal);
-        break;
-    case QmlInstruction::AssignCustomType:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "ASSIGN_CUSTOMTYPE\t" << instr->assignCustomType.propertyIndex << "\t" << instr->assignCustomType.valueIndex;
-        break;
-
-    case QmlInstruction::StoreBinding:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_BINDING\t" << instr->assignBinding.property << "\t" << instr->assignBinding.value << "\t" << instr->assignBinding.context;
-        break;
-    case QmlInstruction::StoreCompiledBinding:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_COMPILED_BINDING\t" << instr->assignBinding.property << "\t" << instr->assignBinding.value << "\t" << instr->assignBinding.context;
-        break;
-    case QmlInstruction::StoreValueSource:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VALUE_SOURCE\t" << instr->assignValueSource.property << "\t" << instr->assignValueSource.castValue;
-        break;
-    case QmlInstruction::StoreValueInterceptor:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VALUE_INTERCEPTOR\t" << instr->assignValueInterceptor.property << "\t" << instr->assignValueInterceptor.castValue;
-        break;
-
-    case QmlInstruction::BeginObject:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "BEGIN\t\t\t" << instr->begin.castValue;
-        break;
-    case QmlInstruction::StoreObjectQList:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_OBJECT_QLIST";
-        break;
-    case QmlInstruction::AssignObjectList:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "ASSIGN_OBJECT_LIST";
-        break;
-    case QmlInstruction::FetchAttached:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "FETCH_ATTACHED\t\t" << instr->fetchAttached.id;
-        break;
-    case QmlInstruction::FetchQList:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "FETCH_QLIST\t\t" << instr->fetch.property;
-        break;
-    case QmlInstruction::FetchObject:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "FETCH\t\t\t" << instr->fetch.property;
-        break;
-    case QmlInstruction::FetchValueType:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "FETCH_VALUE\t\t" << instr->fetchValue.property << "\t" << instr->fetchValue.type;
-        break;
-    case QmlInstruction::PopFetchedObject:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "POP";
-        break;
-    case QmlInstruction::PopQList:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "POP_QLIST";
-        break;
-    case QmlInstruction::PopValueType:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "POP_VALUE\t\t" << instr->fetchValue.property << "\t" << instr->fetchValue.type;
-        break;
-    case QmlInstruction::Defer:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "DEFER" << "\t\t\t" << instr->defer.deferCount;
-        break;
-    default:
-        qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKOWN INSTRUCTION" << "\t" << instr->type;
-        break;
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h
deleted file mode 100644
index ea785b6..0000000
--- a/src/declarative/qml/qmlinstruction_p.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLINSTRUCTION_P_H
-#define QMLINSTRUCTION_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlCompiledData;
-class Q_DECLARATIVE_EXPORT QmlInstruction
-{
-public:
-    enum Type { 
-        //
-        // Object Creation
-        //
-        //    CreateObject - Create a new object instance and push it on the 
-        //                   object stack
-        //    SetId - Set the id of the object on the top of the object stack
-        //    SetDefault - Sets the instance on the top of the object stack to
-        //                 be the context's default object.
-        //    StoreMetaObject - Assign the dynamic metaobject to object on the
-        //                      top of the stack.
-        Init,                     /* init */
-        CreateObject,             /* create */
-        SetId,                    /* setId */
-        SetDefault,
-        CreateComponent,          /* createComponent */
-        StoreMetaObject,          /* storeMeta */
-
-        //
-        // Precomputed single assignment
-        //
-        //    StoreFloat - Store a float in a core property
-        //    StoreDouble - Store a double in a core property
-        //    StoreInteger - Store a int or uint in a core property
-        //    StoreBool - Store a bool in a core property
-        //    StoreString - Store a QString in a core property
-        //    StoreUrl - Store a QUrl in a core property
-        //    StoreColor - Store a QColor in a core property
-        //    StoreDate - Store a QDate in a core property
-        //    StoreTime - Store a QTime in a core property
-        //    StoreDateTime - Store a QDateTime in a core property
-        //    StoreVariant - Store a QVariant in a core property
-        //    StoreObject - Pop the object on the top of the object stack and
-        //                  store it in a core property
-        StoreFloat,               /* storeFloat */
-        StoreDouble,              /* storeDouble */
-        StoreInteger,             /* storeInteger */
-        StoreBool,                /* storeBool */
-        StoreString,              /* storeString */
-        StoreUrl,                 /* storeUrl */
-        StoreColor,               /* storeColor */
-        StoreDate,                /* storeDate */
-        StoreTime,                /* storeTime */
-        StoreDateTime,            /* storeDateTime */
-        StorePoint,               /* storeRealPair */
-        StorePointF,              /* storeRealPair */
-        StoreSize,                /* storeRealPair */
-        StoreSizeF,               /* storeRealPair */
-        StoreRect,                /* storeRect */
-        StoreRectF,               /* storeRect */
-        StoreVector3D,            /* storeVector3D */
-        StoreVariant,             /* storeString */
-        StoreObject,              /* storeObject */
-        StoreVariantObject,       /* storeObject */
-        StoreInterface,           /* storeObject */
-
-        StoreSignal,              /* storeSignal */
-        StoreScript,              /* storeScript */
-        StoreScriptString,        /* storeScriptString */
-
-        //
-        // Unresolved single assignment
-        //
-        AssignSignalObject,       /* assignSignalObject */
-        AssignCustomType,         /* assignCustomType */
-
-        StoreBinding,             /* assignBinding */
-        StoreCompiledBinding,     /* assignBinding */
-        StoreValueSource,         /* assignValueSource */
-        StoreValueInterceptor,    /* assignValueInterceptor */
-
-        BeginObject,              /* begin */
-
-        StoreObjectQList,         /* NA */
-        AssignObjectList,         /* NA */
-
-        FetchAttached,            /* fetchAttached */
-        FetchQList,               /* fetch */
-        FetchObject,              /* fetch */
-        FetchValueType,           /* fetchValue */
-
-        //
-        // Stack manipulation
-        // 
-        //    PopFetchedObject - Remove an object from the object stack
-        //    PopQList - Remove a list from the list stack
-        PopFetchedObject,
-        PopQList,
-        PopValueType,            /* fetchValue */
-
-        // 
-        // Deferred creation
-        //
-        Defer,                    /* defer */
-    };
-    QmlInstruction()
-        : line(0) {}
-
-    Type type;
-    unsigned short line;
-    union {
-        struct {
-            int bindingsSize;
-            int parserStatusSize;
-            int contextCache;
-            int compiledBinding;
-        } init;
-        struct {
-            int type;
-            int data;
-            int bindingBits;
-            ushort column;
-        } create;
-        struct {
-            int data;
-            int aliasData;
-            int propertyCache;
-        } storeMeta;
-        struct {
-            int value;
-            int index;
-        } setId;
-        struct {
-            int property;
-            int owner;
-            int castValue;
-        } assignValueSource;
-        struct {
-            int property;
-            int owner;
-            int castValue;
-        } assignValueInterceptor;
-        struct {
-            unsigned int property;
-            int value;
-            short context;
-            short owner;
-        } assignBinding;
-        struct {
-            int property;
-            int id;
-        } assignIdOptBinding;
-        struct {
-            int property;
-            int contextIdx;
-            short context;
-            short notifyIdx;
-        } assignObjPropBinding;
-        struct {
-            int property;
-        } fetch;
-        struct {
-            int property;
-            int type;
-        } fetchValue;
-        struct {
-            int property;
-            int type;
-        } fetchQmlList;
-        struct {
-            int castValue;
-        } begin;
-        struct {
-            int propertyIndex;
-            float value;
-        } storeFloat;
-        struct {
-            int propertyIndex;
-            double value;
-        } storeDouble;
-        struct {
-            int propertyIndex;
-            int value;
-        } storeInteger;
-        struct {
-            int propertyIndex;
-            bool value;
-        } storeBool;
-        struct {
-            int propertyIndex;
-            int value;
-        } storeString;
-        struct {
-            int propertyIndex;
-            int value;
-            int scope;
-        } storeScriptString;
-        struct {
-            int value;
-        } storeScript;
-        struct {
-            int propertyIndex;
-            int value;
-        } storeUrl;
-        struct {
-            int propertyIndex;
-            unsigned int value;
-        } storeColor;
-        struct {
-            int propertyIndex;
-            int value;
-        } storeDate;
-        struct {
-            int propertyIndex;
-            int valueIndex;
-        } storeTime;
-        struct {
-            int propertyIndex;
-            int valueIndex;
-        } storeDateTime;
-        struct {
-            int propertyIndex;
-            int valueIndex;
-        } storeRealPair;
-        struct {
-            int propertyIndex;
-            int valueIndex;
-        } storeRect;
-        struct {
-            int propertyIndex;
-            int valueIndex;
-        } storeVector3D;
-        struct {
-            int propertyIndex;
-        } storeObject;
-        struct {
-            int propertyIndex;
-            int valueIndex;
-        } assignCustomType;
-        struct {
-            int signalIndex;
-            int value;
-        } storeSignal;
-        struct {
-            int signal;
-        } assignSignalObject;
-        struct {
-            int count;
-            ushort column;
-            int endLine;
-            int metaObject;
-        } createComponent;
-        struct {
-            int id;
-        } fetchAttached;
-        struct {
-            int deferCount;
-        } defer;
-    };
-
-    void dump(QmlCompiledData *);
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLINSTRUCTION_P_H
diff --git a/src/declarative/qml/qmlintegercache.cpp b/src/declarative/qml/qmlintegercache.cpp
deleted file mode 100644
index 2c2d494..0000000
--- a/src/declarative/qml/qmlintegercache.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlintegercache_p.h"
-
-#include "qmlengine_p.h"
-#include "qmlmetatype.h"
-
-QT_BEGIN_NAMESPACE
-
-QmlIntegerCache::QmlIntegerCache(QmlEngine *e)
-: QmlCleanup(e), engine(e)
-{
-}
-
-QmlIntegerCache::~QmlIntegerCache()
-{
-    clear();
-}
-
-void QmlIntegerCache::clear()
-{
-    qDeleteAll(stringCache);
-    stringCache.clear();
-    identifierCache.clear();
-    engine = 0;
-}
-
-void QmlIntegerCache::add(const QString &id, int value)
-{
-    Q_ASSERT(!stringCache.contains(id));
-
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);
-
-    // ### use contextClass
-    Data *d = new Data(enginePriv->objectClass->createPersistentIdentifier(id), value);
-
-    stringCache.insert(id, d);
-    identifierCache.insert(d->identifier, d);
-}
-
-int QmlIntegerCache::value(const QString &id)
-{
-    Data *d = stringCache.value(id);
-    return d?d->value:-1;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlintegercache_p.h b/src/declarative/qml/qmlintegercache_p.h
deleted file mode 100644
index f38138f..0000000
--- a/src/declarative/qml/qmlintegercache_p.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLINTEGERCACHE_P_H
-#define QMLINTEGERCACHE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlrefcount_p.h"
-#include "qmlcleanup_p.h"
-
-#include <QtCore/qhash.h>
-
-#include <private/qscriptdeclarativeclass_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlType;
-class QmlEngine;
-class QmlIntegerCache : public QmlRefCount, public QmlCleanup
-{
-public:
-    QmlIntegerCache(QmlEngine *);
-    virtual ~QmlIntegerCache();
-
-    inline int count() const;
-    void add(const QString &, int);
-    int value(const QString &);
-    inline int value(const QScriptDeclarativeClass::Identifier &id) const;
-
-protected:
-    virtual void clear();
-
-private:
-    struct Data : public QScriptDeclarativeClass::PersistentIdentifier {
-        Data(const QScriptDeclarativeClass::PersistentIdentifier &i, int v) 
-        : QScriptDeclarativeClass::PersistentIdentifier(i), value(v) {}
-
-        int value;
-    };
-
-    typedef QHash<QString, Data *> StringCache;
-    typedef QHash<QScriptDeclarativeClass::Identifier, Data *> IdentifierCache;
-
-    StringCache stringCache;
-    IdentifierCache identifierCache;
-    QmlEngine *engine;
-};
-
-int QmlIntegerCache::value(const QScriptDeclarativeClass::Identifier &id) const
-{
-    Data *d = identifierCache.value(id);
-    return d?d->value:-1;
-}
-
-int QmlIntegerCache::count() const 
-{
-    return stringCache.count();
-}
-
-QT_END_NAMESPACE
-
-#endif // QMLINTEGERCACHE_P_H
-
diff --git a/src/declarative/qml/qmllist.cpp b/src/declarative/qml/qmllist.cpp
deleted file mode 100644
index 4cd2120..0000000
--- a/src/declarative/qml/qmllist.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmllist.h"
-#include "qmllist_p.h"
-#include "qmlengine_p.h"
-#include "qmlmetaproperty_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QmlListReferencePrivate::QmlListReferencePrivate()
-: propertyType(-1), refCount(1)
-{
-}
-
-QmlListReference QmlListReferencePrivate::init(const QmlListProperty<QObject> &prop, int propType, QmlEngine *engine)
-{
-    QmlListReference rv;
-
-    if (!prop.object) return rv;
-
-    QmlEnginePrivate *p = engine?QmlEnginePrivate::get(engine):0;
-
-    int listType = p?p->listType(propType):QmlMetaType::listType(propType);
-    if (listType == -1) return rv;
-
-    rv.d = new QmlListReferencePrivate;
-    rv.d->object = prop.object;
-    rv.d->elementType = p?p->rawMetaObjectForType(listType):QmlMetaType::qmlType(listType)->baseMetaObject();
-    rv.d->property = prop;
-    rv.d->propertyType = propType;
-
-    return rv;
-}
-
-void QmlListReferencePrivate::addref()
-{
-    Q_ASSERT(refCount > 0);
-    ++refCount;
-}
-
-void QmlListReferencePrivate::release()
-{
-    Q_ASSERT(refCount > 0);
-    --refCount;
-    if (!refCount)
-        delete this;
-}
-
-QmlListReference::QmlListReference()
-: d(0)
-{
-}
-
-QmlListReference::QmlListReference(QObject *o, const char *property, QmlEngine *engine)
-: d(0)
-{
-    if (!o || !property) return;
-
-    QmlPropertyCache::Data local;
-    QmlPropertyCache::Data *data = QmlPropertyCache::property(engine, o, QLatin1String(property), local);
-
-    if (!data || !(data->flags & QmlPropertyCache::Data::IsQList)) return;
-
-    QmlEnginePrivate *p = engine?QmlEnginePrivate::get(engine):0;
-
-    int listType = p?p->listType(data->propType):QmlMetaType::listType(data->propType);
-    if (listType == -1) return;
-
-    d = new QmlListReferencePrivate;
-    d->object = o;
-    d->elementType = p?p->rawMetaObjectForType(listType):QmlMetaType::qmlType(listType)->baseMetaObject();
-    d->propertyType = data->propType;
-
-    void *args[] = { &d->property, 0 };
-    QMetaObject::metacall(o, QMetaObject::ReadProperty, data->coreIndex, args);
-}
-
-QmlListReference::QmlListReference(const QmlListReference &o)
-: d(o.d)
-{
-    if (d) d->addref();
-}
-
-QmlListReference &QmlListReference::operator=(const QmlListReference &o)
-{
-    if (o.d) o.d->addref();
-    if (d) d->release();
-    d = o.d;
-    return *this;
-}
-
-QmlListReference::~QmlListReference()
-{
-    if (d) d->release();
-}
-
-bool QmlListReference::isValid() const
-{
-    return d && d->object;
-}
-
-QObject *QmlListReference::object() const
-{
-    if (isValid()) return d->object;
-    else return 0;
-}
-
-const QMetaObject *QmlListReference::listElementType() const
-{
-    if (isValid()) return d->elementType;
-    else return 0;
-}
-
-bool QmlListReference::canAppend() const
-{
-    return (isValid() && d->property.append);
-}
-
-bool QmlListReference::canAt() const
-{
-    return (isValid() && d->property.at);
-}
-
-bool QmlListReference::canClear() const
-{
-    return (isValid() && d->property.clear);
-}
-
-bool QmlListReference::canCount() const
-{
-    return (isValid() && d->property.count);
-}
-
-bool QmlListReference::append(QObject *o) const
-{
-    if (!canAppend()) return false;
-
-    if (o && !QmlMetaPropertyPrivate::canConvert(o->metaObject(), d->elementType))
-        return false;
-
-    d->property.append(&d->property, o);
-
-    return true;
-}
-
-QObject *QmlListReference::at(int index) const
-{
-    if (!canAt()) return 0;
-
-    return d->property.at(&d->property, index);
-}
-
-bool QmlListReference::clear() const
-{
-    if (!canClear()) return false;
-
-    d->property.clear(&d->property);
-
-    return true;
-}
-
-int QmlListReference::count() const
-{
-    if (!canCount()) return 0;
-
-    return d->property.count(&d->property);
-}
-
-/*!
-\class QmlListProperty
-\brief The QmlListProperty class allows applications to explose list-like 
-properties to QML.
-
-QML has many list properties, where more than one object value can be assigned.
-The use of a list property from QML looks like this:
-
-\code
-FruitBasket {
-    fruit: [ 
-             Apple {},
-             Orange{},
-             Banana {}
-           ]
-}
-\endcode
-
-The QmlListProperty encapsulates a group of function pointers that represet the
-set of actions QML can perform on the list - adding items, retrieving items and
-clearing the list.  In the future, additional operations may be supported.  All 
-list properties must implement the append operation, but the rest are optional.
-
-To provide a list property, a C++ class must implement the operation callbacks, 
-and then return an appropriate QmlListProperty value from the property getter.
-List properties should have no setter.  In the example above, the Q_PROPERTY()
-declarative will look like this:
-
-\code
-Q_PROPERTY(QmlListProperty<Fruit> fruit READ fruit);
-\endcode
-
-QML list properties are typesafe - in this case \c {Fruit} is a QObject type that 
-\c {Apple}, \c {Orange} and \c {Banana} all derive from.
-*/
-
-/*!
-\fn QmlListProperty::QmlListProperty() 
-\internal
-*/
-
-/*!
-\fn QmlListProperty::QmlListProperty(QObject *object, QList<T *> &list)
-
-Convenience constructor for making a QmlListProperty value from an existing
-QList \a list.  The \a list reference must remain valid for as long as \a object
-exists.  \a object must be provided.
-
-Generally this constructor should not be used in production code, as a 
-writable QList violates QML's memory management rules.  However, this constructor
-can very useful while prototyping.
-*/
-
-/*!
-\fn QmlListProperty::QmlListProperty(QObject *object, void *data, AppendFunction append, 
-                                     CountFunction count = 0, AtFunction at = 0, 
-                                     ClearFunction clear = 0)
-
-Construct a QmlListProperty from a set of operation functions.  An opaque \a data handle
-may be passed which can be accessed from within the operation functions.  The list property 
-remains valid while \a object exists.
-
-The \a append operation is compulsory and must be provided, while the \a count, \a at and
-\a clear methods are optional.
-*/
-
-/*!
-\typedef QmlListProperty::AppendFunction
-
-Synonym for \c {void (*)(QmlListProperty<T> *property, T *value)}.
-
-Append the \a value to the list \a property.
-*/
-
-/*!
-\typedef QmlListProperty::CountFunction
-
-Synonym for \c {int (*)(QmlListProperty<T> *property)}.
-
-Return the number of elements in the list \a property.
-*/
-
-/*!
-\fn bool QmlListProperty::operator==(const QmlListProperty &other) const 
-
-Returns true if this QmlListProperty is equal to \a other, otherwise false.
-*/
-
-/*!
-\typedef QmlListProperty::AtFunction
-
-Synonym for \c {T *(*)(QmlListProperty<T> *property, int index)}.
-
-Return the element at position \a index in the list \a property.
-*/
-
-/*!
-\typedef QmlListProperty::ClearFunction
-
-Synonym for \c {void (*)(QmlListProperty<T> *property)}.
-
-Clear the list \a property.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h
deleted file mode 100644
index 5528d8d..0000000
--- a/src/declarative/qml/qmllist.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLLIST_H
-#define QMLLIST_H
-
-#include "qmlprivate.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-template<typename T>
-struct QmlListProperty {
-    typedef void (*AppendFunction)(QmlListProperty<T> *, T*);
-    typedef int (*CountFunction)(QmlListProperty<T> *);
-    typedef T *(*AtFunction)(QmlListProperty<T> *, int);
-    typedef void (*ClearFunction)(QmlListProperty<T> *);
-
-    QmlListProperty() 
-        : object(0), data(0), append(0), count(0), at(0), clear(0), dummy1(0), dummy2(0) {}
-    QmlListProperty(QObject *o, QList<T *> &list)
-        : object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
-          clear(qlist_clear), dummy1(0), dummy2(0) {}
-    QmlListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0, 
-                    ClearFunction r = 0)
-        : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(0), dummy2(0) {}
-
-    bool operator==(const QmlListProperty &o) const {
-        return object == o.object &&
-               data == o.data &&
-               append == o.append &&
-               count == o.count &&
-               at == o.at &&
-               clear == o.clear;
-    }
-
-    QObject *object;
-    void *data;
-    
-    AppendFunction append;
-
-    CountFunction count;
-    AtFunction at;
-
-    ClearFunction clear;
-
-    void *dummy1;
-    void *dummy2;
-
-private:
-    static void qlist_append(QmlListProperty *p, T *v) {
-        ((QList<T *> *)p->data)->append(v); 
-    }
-    static int qlist_count(QmlListProperty *p) {
-        return ((QList<T *> *)p->data)->count();
-    }
-    static T *qlist_at(QmlListProperty *p, int idx) {
-        return ((QList<T *> *)p->data)->at(idx);
-    }
-    static void qlist_clear(QmlListProperty *p) {
-        return ((QList<T *> *)p->data)->clear();
-    }
-};
-
-class QmlEngine;
-class QmlListReferencePrivate;
-class Q_DECLARATIVE_EXPORT QmlListReference
-{
-public:
-    QmlListReference();
-    QmlListReference(QObject *, const char *property, QmlEngine * = 0);
-    QmlListReference(const QmlListReference &);
-    QmlListReference &operator=(const QmlListReference &);
-    ~QmlListReference();
-
-    bool isValid() const;
-
-    QObject *object() const;
-    const QMetaObject *listElementType() const;
-
-    bool canAppend() const;
-    bool canAt() const;
-    bool canClear() const;
-    bool canCount() const;
-
-    bool append(QObject *) const;
-    QObject *at(int) const;
-    bool clear() const;
-    int count() const;
-
-private:
-    friend class QmlListReferencePrivate;
-    QmlListReferencePrivate* d;
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QmlListReference);
-
-QT_END_HEADER
-
-#endif // QMLLIST_H
diff --git a/src/declarative/qml/qmllist_p.h b/src/declarative/qml/qmllist_p.h
deleted file mode 100644
index 4660e47..0000000
--- a/src/declarative/qml/qmllist_p.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLLIST_P_H
-#define QMLLIST_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmllist.h"
-#include "qmlguard_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlListReferencePrivate
-{
-public:
-    QmlListReferencePrivate();
-
-    static QmlListReference init(const QmlListProperty<QObject> &, int, QmlEngine *);
-
-    QmlGuard<QObject> object;
-    const QMetaObject *elementType;
-    QmlListProperty<QObject> property;
-    int propertyType;
-
-    void addref();
-    void release();
-    int refCount;
-
-    static inline QmlListReferencePrivate *get(QmlListReference *ref) {
-        return ref->d;
-    }
-};
-
-
-QT_END_NAMESPACE
-
-#endif // QMLLIST_P_H
diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp
deleted file mode 100644
index bb29763..0000000
--- a/src/declarative/qml/qmllistscriptclass.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmllistscriptclass_p.h"
-
-#include "qmlengine_p.h"
-#include "qmlguard_p.h"
-#include "qmllist_p.h"
-
-QT_BEGIN_NAMESPACE
-
-struct ListData : public QScriptDeclarativeClass::Object {
-    QmlGuard<QObject> object;
-    QmlListProperty<QObject> property;
-    int propertyType;
-};
-
-QmlListScriptClass::QmlListScriptClass(QmlEngine *e)
-: QmlScriptClass(QmlEnginePrivate::getScriptEngine(e)), engine(e)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-    Q_UNUSED(scriptEngine);
-
-    m_lengthId = createPersistentIdentifier(QLatin1String("length"));
-}
-
-QmlListScriptClass::~QmlListScriptClass()
-{
-}
-
-QScriptValue QmlListScriptClass::newList(QObject *object, int propId, int propType)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    if (!object || propId == -1)
-        return scriptEngine->nullValue();
-
-    ListData *data = new ListData;
-    data->object = object;
-    data->propertyType = propType;
-    void *args[] = { &data->property, 0 };
-    QMetaObject::metacall(object, QMetaObject::ReadProperty, propId, args);
-
-    return newObject(scriptEngine, this, data);
-}
-
-QScriptValue QmlListScriptClass::newList(const QmlListProperty<QObject> &prop, int propType)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    ListData *data = new ListData;
-    data->object = prop.object;
-    data->property = prop;
-    data->propertyType = propType;
-
-    return newObject(scriptEngine, this, data);
-}
-
-QScriptClass::QueryFlags 
-QmlListScriptClass::queryProperty(Object *object, const Identifier &name, 
-                                  QScriptClass::QueryFlags flags)
-{
-    Q_UNUSED(object);
-    Q_UNUSED(flags);
-    if (name == m_lengthId.identifier)
-        return QScriptClass::HandlesReadAccess;
-
-    bool ok = false;
-    quint32 idx = toArrayIndex(name, &ok);
-
-    if (ok) {
-        lastIndex = idx;
-        return QScriptClass::HandlesReadAccess;
-    } else {
-        return 0;
-    }
-}
-
-QmlListScriptClass::ScriptValue QmlListScriptClass::property(Object *obj, const Identifier &name)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);
-
-    ListData *data = (ListData *)obj;
-    if (!data->object) 
-        return Value();
-
-    quint32 count = data->property.count?data->property.count(&data->property):0;
-
-    if (name == m_lengthId.identifier)
-        return Value(scriptEngine, count);
-    else if (lastIndex < count && data->property.at)
-        return Value(scriptEngine, enginePriv->objectClass->newQObject(data->property.at(&data->property, lastIndex)));
-    else
-        return Value();
-}
-
-QVariant QmlListScriptClass::toVariant(Object *obj, bool *ok)
-{
-    ListData *data = (ListData *)obj;
-
-    if (!data->object) {
-        if (ok) *ok = false;
-        return QVariant();
-    }
-
-    return QVariant::fromValue(QmlListReferencePrivate::init(data->property, data->propertyType, engine));
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/qml/qmllistscriptclass_p.h b/src/declarative/qml/qmllistscriptclass_p.h
deleted file mode 100644
index 07b09c3..0000000
--- a/src/declarative/qml/qmllistscriptclass_p.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLLISTSCRIPTCLASS_P_H
-#define QMLLISTSCRIPTCLASS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qmlscriptclass_p.h>
-#include "qmllist.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QmlListScriptClass : public QmlScriptClass
-{
-public:
-    QmlListScriptClass(QmlEngine *);
-    ~QmlListScriptClass();
-
-    QScriptValue newList(QObject *, int, int);
-    QScriptValue newList(const QmlListProperty<QObject> &, int);
-
-protected:
-    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
-                                                   QScriptClass::QueryFlags flags);
-    virtual ScriptValue property(Object *, const Identifier &);
-    virtual QVariant toVariant(Object *, bool *ok);
-
-private:
-    PersistentIdentifier m_lengthId;
-    QmlEngine *engine;
-
-    quint32 lastIndex;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLLISTSCRIPTCLASS_P_H
-
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
deleted file mode 100644
index d731393..0000000
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ /dev/null
@@ -1,1238 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlmetaproperty.h"
-#include "qmlmetaproperty_p.h"
-
-#include "qmlcompositetypedata_p.h"
-#include "qml.h"
-#include "qmlbinding_p.h"
-#include "qmlcontext.h"
-#include "qmlcontext_p.h"
-#include "qmlboundsignal_p.h"
-#include "qmlengine.h"
-#include "qmlengine_p.h"
-#include "qmldeclarativedata_p.h"
-#include "qmlstringconverters_p.h"
-#include "qmllist_p.h"
-
-#include <QStringList>
-#include <QtCore/qdebug.h>
-
-#include <math.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlMetaProperty
-    \brief The QmlMetaProperty class abstracts accessing QML properties.
-    \internal
- */
-
-/*!
-    Create an invalid QmlMetaProperty.
-*/
-QmlMetaProperty::QmlMetaProperty()
-: d(new QmlMetaPropertyPrivate)
-{
-    d->q = this;
-}
-
-/*!  \internal */
-QmlMetaProperty::~QmlMetaProperty()
-{
-    delete d; d = 0;
-}
-
-/*!
-    Creates a QmlMetaProperty for the default property of \a obj. If there is no
-    default property, an invalid QmlMetaProperty will be created.
- */
-QmlMetaProperty::QmlMetaProperty(QObject *obj)
-: d(new QmlMetaPropertyPrivate)
-{
-    d->q = this;
-    d->initDefault(obj);
-}
-
-/*!
-    \internal
-    Creates a QmlMetaProperty for the default property of \a obj. If there is no
-    default property, an invalid QmlMetaProperty will be created.
- */
-QmlMetaProperty::QmlMetaProperty(QObject *obj, QmlContext *ctxt)
-: d(new QmlMetaPropertyPrivate)
-{
-    d->q = this;
-    d->context = ctxt;
-    d->initDefault(obj);
-}
-
-/*!
-    Initialize from the default property of \a obj
-*/
-void QmlMetaPropertyPrivate::initDefault(QObject *obj)
-{
-    if (!obj)
-        return;
-
-    QMetaProperty p = QmlMetaType::defaultProperty(obj);
-    core.load(p);
-    if (core.isValid()) {
-        isDefaultProperty = true;
-        object = obj;
-    }
-}
-
-/*!
-    Creates a QmlMetaProperty for the property \a name of \a obj.
- */
-QmlMetaProperty::QmlMetaProperty(QObject *obj, const QString &name)
-: d(new QmlMetaPropertyPrivate)
-{
-    d->q = this;
-    d->initProperty(obj, name);
-    if (!isValid()) d->object = 0;
-}
-
-/*!
-    \internal
-    Creates a QmlMetaProperty for the property \a name of \a obj.
- */
-QmlMetaProperty::QmlMetaProperty(QObject *obj, const QString &name, QmlContext *ctxt)
-: d(new QmlMetaPropertyPrivate)
-{
-    d->q = this;
-    d->context = ctxt;
-    d->initProperty(obj, name);
-    if (!isValid()) { d->object = 0; d->context = 0; }
-}
-
-void QmlMetaPropertyPrivate::initProperty(QObject *obj, const QString &name)
-{
-    QmlEnginePrivate *enginePrivate = 0;
-    if (context && context->engine())
-        enginePrivate = QmlEnginePrivate::get(context->engine());
-
-    object = obj;
-
-    if (name.isEmpty() || !obj)
-        return;
-
-    if (enginePrivate && name.at(0).isUpper()) {
-        // Attached property
-        // ### What about qualified types?
-        QmlTypeNameCache *tnCache = QmlContextPrivate::get(context)->imports;
-        if (tnCache) {
-            QmlTypeNameCache::Data *d = tnCache->data(name);
-            if (d && d->type && d->type->attachedPropertiesFunction()) {
-                attachedFunc = d->type->index();
-            }
-        }
-        return;
-
-    } else if (name.count() >= 3 && 
-               name.at(0) == QChar(QLatin1Char('o')) && 
-               name.at(1) == QChar(QLatin1Char('n')) && 
-               name.at(2).isUpper()) {
-        // Signal
-        QString signalName = name.mid(2);
-        signalName[0] = signalName.at(0).toLower();
-
-        QMetaMethod method = findSignal(obj, signalName);
-        if (method.signature()) {
-            core.load(method);
-            return;
-        }
-    } 
-
-    // Property
-    QmlPropertyCache::Data local;
-    QmlPropertyCache::Data *property = 
-        QmlPropertyCache::property(context?context->engine():0, obj, name, local);
-    if (property && !(property->flags & QmlPropertyCache::Data::IsFunction)) 
-        core = *property;
-}
-
-/*!
-    Create a copy of \a other.
-*/
-QmlMetaProperty::QmlMetaProperty(const QmlMetaProperty &other)
-: d(new QmlMetaPropertyPrivate(*other.d))
-{
-    d->q = this;
-}
-
-/*!
-  \enum QmlMetaProperty::PropertyCategory
-
-  This enum specifies a category of QML property.
-
-  \value Unknown The category is unknown.  This will never be returned from propertyCategory()
-  \value InvalidProperty The property is invalid.
-  \value Bindable The property is a QmlBinding.
-  \value List The property is a QList pointer
-  \value Object The property is a QObject derived type pointer
-  \value Normal The property is none of the above.
- */
-
-/*!
-  \enum QmlMetaProperty::Type
-
-  This enum specifies a type of QML property.
-
-  \value Invalid The property is invalid.
-  \value Property The property is a regular Qt property.
-  \value SignalProperty The property is a signal property.
-  \value Default The property is the default property.
-  \value Attached The property is an attached property.
-*/
-
-/*!
-    Returns the property category.
-*/
-QmlMetaProperty::PropertyCategory QmlMetaProperty::propertyCategory() const
-{
-    return d->propertyCategory();
-}
-
-QmlMetaProperty::PropertyCategory 
-QmlMetaPropertyPrivate::propertyCategory() const
-{
-    uint type = q->type();
-
-    if (type & QmlMetaProperty::ValueTypeProperty) {
-        return QmlMetaProperty::Normal;
-    } else if (type & QmlMetaProperty::Attached) {
-        return QmlMetaProperty::Object;
-    } else if (type & QmlMetaProperty::Property) {
-        int type = propertyType();
-        if (type == QVariant::Invalid)
-            return QmlMetaProperty::InvalidProperty;
-        else if ((uint)type < QVariant::UserType)
-            return QmlMetaProperty::Normal;
-        else if (type == qMetaTypeId<QmlBinding *>())
-            return QmlMetaProperty::Bindable;
-        else if (core.flags & QmlPropertyCache::Data::IsQObjectDerived)
-            return QmlMetaProperty::Object;
-        else if (core.flags & QmlPropertyCache::Data::IsQList)
-            return QmlMetaProperty::List;
-        else 
-            return QmlMetaProperty::Normal;
-    } else {
-        return QmlMetaProperty::InvalidProperty;
-    }
-}
-
-/*!
-    Returns the type name of the property, or 0 if the property has no type
-    name.
-*/
-const char *QmlMetaProperty::propertyTypeName() const
-{
-    if (type() & ValueTypeProperty) {
-
-        QmlEnginePrivate *ep = QmlEnginePrivate::get(d->context);
-        QmlValueType *valueType = 0;
-        if (ep) valueType = ep->valueTypes[d->core.propType];
-        else valueType = QmlValueTypeFactory::valueType(d->core.propType);
-        Q_ASSERT(valueType);
-
-        const char *rv = valueType->metaObject()->property(d->valueType.valueTypeCoreIdx).typeName();
-
-        if (!ep) delete valueType;
-
-        return rv;
-    } else if (d->object && type() & Property && d->core.isValid()) {
-        return d->object->metaObject()->property(d->core.coreIndex).typeName();
-    } else {
-        return 0;
-    }
-}
-
-/*!
-    Returns true if \a other and this QmlMetaProperty represent the same 
-    property.
-*/
-bool QmlMetaProperty::operator==(const QmlMetaProperty &other) const
-{
-    // category is intentially omitted here as it is generated 
-    // from the other members
-    return d->object == other.d->object &&
-           d->core == other.d->core &&
-           d->valueType == other.d->valueType &&
-           d->attachedFunc == other.d->attachedFunc;
-}
-
-/*!
-    Returns the QVariant type of the property, or QVariant::Invalid if the 
-    property has no QVariant type.
-*/
-int QmlMetaProperty::propertyType() const
-{
-    return d->propertyType();
-}
-
-int QmlMetaPropertyPrivate::propertyType() const
-{
-    uint type = q->type();
-    if (type & QmlMetaProperty::ValueTypeProperty) {
-        return valueType.valueTypePropType;
-    } else if (type & QmlMetaProperty::Attached) {
-        return qMetaTypeId<QObject *>();
-    } else if (type & QmlMetaProperty::Property) {
-        if (core.propType == (int)QVariant::LastType)
-            return qMetaTypeId<QVariant>();
-        else
-            return core.propType;
-    } else {
-        return QVariant::Invalid;
-    }
-}
-
-/*!
-    Returns the type of the property.
-*/
-QmlMetaProperty::Type QmlMetaProperty::type() const
-{
-    if (d->core.flags & QmlPropertyCache::Data::IsFunction)
-        return SignalProperty;
-    else if (d->attachedFunc != -1)
-        return Attached;
-    else if (d->valueType.valueTypeCoreIdx != -1)
-        return (Type)(Property | ValueTypeProperty);
-    else if (d->core.isValid())
-        return (Type)(Property | ((d->isDefaultProperty)?Default:0));
-    else
-        return Invalid;
-}
-
-/*!
-    Returns true if this QmlMetaProperty represents a regular Qt property.
-*/
-bool QmlMetaProperty::isProperty() const
-{
-    return type() & Property;
-}
-
-/*!
-    Returns true if this QmlMetaProperty represents a default property.
-*/
-bool QmlMetaProperty::isDefault() const
-{
-    return type() & Default;
-}
-
-/*!
-    Returns the QmlMetaProperty's QObject.
-*/
-QObject *QmlMetaProperty::object() const
-{
-    return d->object;
-}
-
-/*!
-    Assign \a other to this QmlMetaProperty.
-*/
-QmlMetaProperty &QmlMetaProperty::operator=(const QmlMetaProperty &other)
-{
-    d->context = other.d->context;
-    d->object = other.d->object;
-
-    d->isDefaultProperty = other.d->isDefaultProperty;
-    d->isNameCached = other.d->isNameCached;
-    d->core = other.d->core;
-    d->nameCache = other.d->nameCache;
-
-    d->valueType = other.d->valueType;
-
-    d->attachedFunc = other.d->attachedFunc;
-    return *this;
-}
-
-/*!
-    Returns true if the property is writable, otherwise false.
-*/
-bool QmlMetaProperty::isWritable() const
-{
-    QmlMetaProperty::PropertyCategory category = propertyCategory();
-
-    if (!d->object)
-        return false;
-    if (category == List)
-        return true;
-    else if (type() & SignalProperty)
-        return false;
-    else if (d->core.isValid() && d->object)
-        return d->core.flags & QmlPropertyCache::Data::IsWritable;
-    else
-        return false;
-}
-
-/*!
-    Returns true if the property is designable, otherwise false.
-*/
-bool QmlMetaProperty::isDesignable() const
-{
-    if (type() & Property && d->core.isValid() && d->object)
-        return d->object->metaObject()->property(d->core.coreIndex).isDesignable();
-    else
-        return false;
-}
-
-/*!
-    Returns true if the property is resettable, otherwise false.
-*/
-bool QmlMetaProperty::isResettable() const
-{
-    if (type() & Property && d->core.isValid() && d->object)
-        return d->core.flags & QmlPropertyCache::Data::IsResettable;
-    else
-        return false;
-}
-
-/*!
-    Returns true if the QmlMetaProperty refers to a valid property, otherwise
-    false.
-*/
-bool QmlMetaProperty::isValid() const
-{
-    return type() != Invalid;
-}
-
-/*!
-    Return the name of this QML property.
-*/
-QString QmlMetaProperty::name() const
-{
-    if (!d->isNameCached) {
-        // ###
-        if (!d->object) {
-        } else if (type() & ValueTypeProperty) {
-            QString rv = d->core.name(d->object) + QLatin1Char('.');
-
-            QmlEnginePrivate *ep = d->context?QmlEnginePrivate::get(d->context->engine()):0;
-            QmlValueType *valueType = 0;
-            if (ep) valueType = ep->valueTypes[d->core.propType];
-            else valueType = QmlValueTypeFactory::valueType(d->core.propType);
-            Q_ASSERT(valueType);
-
-            rv += QString::fromUtf8(valueType->metaObject()->property(d->valueType.valueTypeCoreIdx).name());
-
-            if (!ep) delete valueType;
-
-            d->nameCache = rv;
-        } else if (type() & SignalProperty) {
-            QString name = QLatin1String("on") + d->core.name(d->object);
-            name[2] = name.at(2).toUpper();
-            d->nameCache = name;
-        } else {
-            d->nameCache = d->core.name(d->object);
-        }
-        d->isNameCached = true;
-    }
-
-    return d->nameCache;
-}
-
-/*!
-  Returns the \l{QMetaProperty} {Qt property} associated with
-  this QML property.
- */
-QMetaProperty QmlMetaProperty::property() const
-{
-    if (type() & Property && d->core.isValid() && d->object)
-        return d->object->metaObject()->property(d->core.coreIndex);
-    else
-        return QMetaProperty();
-}
-
-/*!
-    Return the QMetaMethod for this property if it is a SignalProperty, 
-    otherwise returns an invalid QMetaMethod.
-*/
-QMetaMethod QmlMetaProperty::method() const
-{
-    if (type() & SignalProperty && d->object)
-        return d->object->metaObject()->method(d->core.coreIndex);
-    else
-        return QMetaMethod();
-}
-
-
-/*!
-    Returns the binding associated with this property, or 0 if no binding 
-    exists.
-*/
-QmlAbstractBinding *QmlMetaProperty::binding() const
-{
-    if (!isProperty() || (type() & Attached) || !d->object)
-        return 0;
-
-    QmlDeclarativeData *data = QmlDeclarativeData::get(d->object);
-    if (!data) 
-        return 0;
-
-    if (!data->hasBindingBit(d->core.coreIndex))
-        return 0;
-
-    QmlAbstractBinding *binding = data->bindings;
-    while (binding) {
-        // ### This wont work for value types
-        if (binding->propertyIndex() == d->core.coreIndex)
-            return binding; 
-        binding = binding->m_nextBinding;
-    }
-    return 0;
-}
-
-/*!
-    Set the binding associated with this property to \a newBinding.  Returns
-    the existing binding (if any), otherwise 0.
-
-    \a newBinding will be enabled, and the returned binding (if any) will be
-    disabled.
-
-    Ownership of \a newBinding transfers to QML.  Ownership of the return value
-    is assumed by the caller.
-
-    \a flags is passed through to the binding and is used for the initial update (when
-    the binding sets the intial value, it will use these flags for the write).
-*/
-QmlAbstractBinding *
-QmlMetaProperty::setBinding(QmlAbstractBinding *newBinding, QmlMetaProperty::WriteFlags flags) const
-{
-    if (!isProperty() || (type() & Attached) || !d->object) {
-        if (newBinding)
-            newBinding->destroy();
-        return 0;
-    }
-
-    return d->setBinding(d->object, d->core, newBinding, flags);
-}
-
-QmlAbstractBinding *
-QmlMetaPropertyPrivate::setBinding(QObject *object, const QmlPropertyCache::Data &core, 
-                                   QmlAbstractBinding *newBinding, QmlMetaProperty::WriteFlags flags)
-{
-    QmlDeclarativeData *data = QmlDeclarativeData::get(object, 0 != newBinding);
-
-    if (data && data->hasBindingBit(core.coreIndex)) {
-        QmlAbstractBinding *binding = data->bindings;
-        while (binding) {
-            // ### This wont work for value types
-            if (binding->propertyIndex() == core.coreIndex) {
-                binding->setEnabled(false);
-
-                if (newBinding) 
-                    newBinding->setEnabled(true, flags);
-
-                return binding; // ### QmlAbstractBinding;
-            }
-
-            binding = binding->m_nextBinding;
-        }
-    } 
-
-    if (newBinding)
-        newBinding->setEnabled(true, flags);
-
-    return 0;
-}
-/*!
-    Returns the expression associated with this signal property, or 0 if no 
-    signal expression exists.
-*/
-QmlExpression *QmlMetaProperty::signalExpression() const
-{
-    if (!(type() & SignalProperty))
-        return 0;
-
-    const QObjectList &children = d->object->children();
-    
-    for (int ii = 0; ii < children.count(); ++ii) {
-        QObject *child = children.at(ii);
-
-        QmlBoundSignal *signal = QmlBoundSignal::cast(child);
-        if (signal && signal->index() == coreIndex()) 
-            return signal->expression();
-    }
-
-    return 0;
-}
-
-/*!
-    Set the signal expression associated with this signal property to \a expr.
-    Returns the existing signal expression (if any), otherwise 0.
-
-    Ownership of \a expr transfers to QML.  Ownership of the return value is
-    assumed by the caller.
-*/
-QmlExpression *QmlMetaProperty::setSignalExpression(QmlExpression *expr) const
-{
-    if (!(type() & SignalProperty)) {
-        delete expr;
-        return 0;
-    }
-
-    const QObjectList &children = d->object->children();
-    
-    for (int ii = 0; ii < children.count(); ++ii) {
-        QObject *child = children.at(ii);
-
-        QmlBoundSignal *signal = QmlBoundSignal::cast(child);
-        if (signal && signal->index() == coreIndex()) 
-            return signal->setExpression(expr);
-    }
-
-    if (expr) {
-        QmlBoundSignal *signal = new QmlBoundSignal(d->object, method(), d->object);
-        return signal->setExpression(expr);
-    } else {
-        return 0;
-    }
-}
-
-QMetaMethod QmlMetaPropertyPrivate::findSignal(QObject *obj, const QString &name)
-{
-    const QMetaObject *mo = obj->metaObject();
-
-    int methods = mo->methodCount();
-    for (int ii = methods - 1; ii >= 0; --ii) {
-        QMetaMethod method = mo->method(ii);
-        QString methodName = QString::fromUtf8(method.signature());
-        int idx = methodName.indexOf(QLatin1Char('('));
-        methodName = methodName.left(idx);
-
-        if (methodName == name) 
-            return method;
-    }
-    return QMetaMethod();
-}
-
-QObject *QmlMetaPropertyPrivate::attachedObject() const
-{
-    if (attachedFunc == -1)
-        return 0;
-    else
-        return qmlAttachedPropertiesObjectById(attachedFunc, object);
-}
-
-/*!
-    Returns the property value.
-*/
-QVariant QmlMetaProperty::read() const
-{
-    if (!d->object)
-        return QVariant();
-
-    if (type() & SignalProperty) {
-
-        return QVariant();
-
-    } else if (type() & Property || type() & Attached) {
-
-        return d->readValueProperty();
-
-    }
-    return QVariant();
-}
-
-QVariant QmlMetaPropertyPrivate::readValueProperty()
-{
-    uint type = q->type();
-    if (type & QmlMetaProperty::Attached) {
-
-        return QVariant::fromValue(attachedObject());
-
-    } else if(type & QmlMetaProperty::ValueTypeProperty) {
-
-        QmlEnginePrivate *ep = QmlEnginePrivate::get(context);
-        QmlValueType *valueType = 0;
-        if (ep) valueType = ep->valueTypes[core.propType];
-        else valueType = QmlValueTypeFactory::valueType(core.propType);
-        Q_ASSERT(valueType);
-
-        valueType->read(object, core.coreIndex);
-
-        QVariant rv =
-            valueType->metaObject()->property(this->valueType.valueTypeCoreIdx).read(valueType);
-
-        if (!ep) delete valueType;
-        return rv;
-
-    } else if(core.flags & QmlPropertyCache::Data::IsQList) {
-
-        QmlListProperty<QObject> prop;
-        void *args[] = { &prop, 0 };
-        QMetaObject::metacall(object, QMetaObject::ReadProperty, core.coreIndex, args);
-        return QVariant::fromValue(QmlListReferencePrivate::init(prop, core.propType, context?context->engine():0));
-
-    } else {
-
-        return object->metaObject()->property(core.coreIndex).read(object.data());
-
-    }
-}
-
-//###
-//writeEnumProperty MIRRORS the relelvant bit of QMetaProperty::write AND MUST BE KEPT IN SYNC!
-//###
-bool QmlMetaPropertyPrivate::writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags)
-{
-    if (!object || !prop.isWritable())
-        return false;
-
-    QVariant v = value;
-    if (prop.isEnumType()) {
-        QMetaEnum menum = prop.enumerator();
-        if (v.userType() == QVariant::String
-#ifdef QT3_SUPPORT
-            || v.userType() == QVariant::CString
-#endif
-            ) {
-            if (prop.isFlagType())
-                v = QVariant(menum.keysToValue(value.toByteArray()));
-            else
-                v = QVariant(menum.keyToValue(value.toByteArray()));
-        } else if (v.userType() != QVariant::Int && v.userType() != QVariant::UInt) {
-            int enumMetaTypeId = QMetaType::type(QByteArray(menum.scope()) + "::" + menum.name());
-            if ((enumMetaTypeId == 0) || (v.userType() != enumMetaTypeId) || !v.constData())
-                return false;
-            v = QVariant(*reinterpret_cast<const int *>(v.constData()));
-        }
-        v.convert(QVariant::Int);
-    }
-
-    // the status variable is changed by qt_metacall to indicate what it did
-    // this feature is currently only used by QtDBus and should not be depended
-    // upon. Don't change it without looking into QDBusAbstractInterface first
-    // -1 (unchanged): normal qt_metacall, result stored in argv[0]
-    // changed: result stored directly in value, return the value of status
-    int status = -1;
-    void *argv[] = { v.data(), &v, &status, &flags };
-    QMetaObject::metacall(object, QMetaObject::WriteProperty, idx, argv);
-    return status;
-}
-
-bool QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value,
-                                                QmlMetaProperty::WriteFlags flags)
-{
-    // Remove any existing bindings on this property
-    if (!(flags & QmlMetaProperty::DontRemoveBinding)) {
-        QmlAbstractBinding *binding = q->setBinding(0);
-        if (binding) binding->destroy();
-    }
-
-    bool rv = false;
-    uint type = q->type();
-    if (type & QmlMetaProperty::ValueTypeProperty) {
-        QmlEnginePrivate *ep = QmlEnginePrivate::get(context);
-
-        QmlValueType *writeBack = 0;
-        if (ep) {
-            writeBack = ep->valueTypes[core.propType];
-        } else {
-            writeBack = QmlValueTypeFactory::valueType(core.propType);
-        }
-
-        writeBack->read(object, core.coreIndex);
-
-        QmlPropertyCache::Data data = core;
-        data.flags = valueType.flags;
-        data.coreIndex = valueType.valueTypeCoreIdx;
-        data.propType = valueType.valueTypePropType;
-        rv = write(writeBack, data, value, context, flags);
-
-        writeBack->write(object, core.coreIndex, flags);
-        if (!ep) delete writeBack;
-
-    } else {
-
-        rv = write(object, core, value, context, flags);
-
-    }
-
-    return rv;
-}
-
-bool QmlMetaPropertyPrivate::write(QObject *object, const QmlPropertyCache::Data &property, 
-                                   const QVariant &value, QmlContext *context, 
-                                   QmlMetaProperty::WriteFlags flags)
-{
-    int coreIdx = property.coreIndex;
-    int status = -1;    //for dbus
-
-    if (property.flags & QmlPropertyCache::Data::IsEnumType) {
-        QMetaProperty prop = object->metaObject()->property(property.coreIndex);
-        QVariant v = value;
-        // Enum values come through the script engine as doubles
-        if (value.userType() == QVariant::Double) { 
-            double integral;
-            double fractional = modf(value.toDouble(), &integral);
-            if (qFuzzyIsNull(fractional))
-                v.convert(QVariant::Int);
-        }
-        return writeEnumProperty(prop, coreIdx, object, v, flags);
-    }
-
-    int propertyType = property.propType;
-    int variantType = value.userType();
-
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(context);
-
-    if (propertyType == QVariant::Url) {
-
-        QUrl u;
-        bool found = false;
-        if (variantType == QVariant::Url) {
-            u = value.toUrl();
-            found = true;
-        } else if (variantType == QVariant::ByteArray) {
-            u = QUrl(QString::fromUtf8(value.toByteArray()));
-            found = true;
-        } else if (variantType == QVariant::String) {
-            u = QUrl(value.toString());
-            found = true;
-        }
-
-        if (!found)
-            return false;
-
-        if (context && u.isRelative() && !u.isEmpty())
-            u = context->resolvedUrl(u);
-        int status = -1;
-        void *argv[] = { &u, 0, &status, &flags };
-        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, argv);
-
-    } else if (variantType == propertyType) {
-
-        void *a[] = { (void *)value.constData(), 0, &status, &flags };
-        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-
-    } else if (qMetaTypeId<QVariant>() == propertyType) {
-
-        void *a[] = { (void *)&value, 0, &status, &flags };
-        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-
-    } else if (property.flags & QmlPropertyCache::Data::IsQObjectDerived) {
-
-        const QMetaObject *valMo = rawMetaObjectForType(enginePriv, value.userType());
-        
-        if (!valMo)
-            return false;
-
-        QObject *o = *(QObject **)value.constData();
-        const QMetaObject *propMo = rawMetaObjectForType(enginePriv, propertyType);
-
-        if (o) valMo = o->metaObject();
-
-        if (canConvert(valMo, propMo)) {
-            void *args[] = { &o, 0, &status, &flags };
-            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, 
-                                  args);
-        } else if (!o && canConvert(propMo, valMo)) {
-            // In the case of a null QObject, we assign the null if there is 
-            // any change that the null variant type could be up or down cast to 
-            // the property type.
-            void *args[] = { &o, 0, &status, &flags };
-            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, 
-                                  args);
-        } else {
-            return false;
-        }
-
-    } else if (property.flags & QmlPropertyCache::Data::IsQList) {
-
-        const QMetaObject *listType = 0;
-        if (enginePriv) {
-            listType = enginePriv->rawMetaObjectForType(enginePriv->listType(property.propType));
-        } else {
-            QmlType *type = QmlMetaType::qmlType(QmlMetaType::listType(property.propType));
-            if (!type) return false;
-            listType = type->baseMetaObject();
-        }
-        if (!listType) return false;
-
-        QmlListProperty<void> prop;
-        void *args[] = { &prop, 0 };
-        QMetaObject::metacall(object, QMetaObject::ReadProperty, coreIdx, args);
-
-        if (!prop.clear) return false;
-
-        prop.clear(&prop);
-
-        if (value.userType() == qMetaTypeId<QList<QObject *> >()) {
-            const QList<QObject *> &list = qvariant_cast<QList<QObject *> >(value);
-
-            for (int ii = 0; ii < list.count(); ++ii) {
-                QObject *o = list.at(ii);
-                if (!canConvert(o->metaObject(), listType))
-                    o = 0;
-                prop.append(&prop, (void *)o);
-            }
-        } else {
-            QObject *o = enginePriv?enginePriv->toQObject(value):QmlMetaType::toQObject(value);
-            if (!canConvert(o->metaObject(), listType))
-                o = 0;
-            prop.append(&prop, (void *)o);
-        }
-
-    } else {
-        Q_ASSERT(variantType != propertyType);
-
-        QVariant v = value;
-        if (v.convert((QVariant::Type)propertyType)) {
-            void *a[] = { (void *)v.constData(), 0, &status, &flags};
-            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-        } else if ((uint)propertyType >= QVariant::UserType && variantType == QVariant::String) {
-            QmlMetaType::StringConverter con = QmlMetaType::customStringConverter(propertyType);
-            if (!con)
-                return false;
-
-            QVariant v = con(value.toString());
-            if (v.userType() == propertyType) {
-                void *a[] = { (void *)v.constData(), 0, &status, &flags};
-                QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-            }
-        } else if (variantType == QVariant::String) {
-            bool ok = false;
-            QVariant v = QmlStringConverters::variantFromString(value.toString(), propertyType, &ok);
-            if (!ok)
-                return false;
-
-            void *a[] = { (void *)v.constData(), 0, &status, &flags};
-            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-        } else {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-const QMetaObject *QmlMetaPropertyPrivate::rawMetaObjectForType(QmlEnginePrivate *engine, int userType)
-{
-    if (engine) {
-        return engine->rawMetaObjectForType(userType);
-    } else {
-        QmlType *type = QmlMetaType::qmlType(userType);
-        return type?type->baseMetaObject():0;
-    }
-}
-
-/*!
-    Set the property value to \a value.
-*/
-bool QmlMetaProperty::write(const QVariant &value) const
-{
-    return write(value, 0);
-}
-
-/*!
-    Resets the property value.
-*/
-bool QmlMetaProperty::reset() const
-{
-    if (isResettable()) {
-        void *args[] = { 0 };
-        QMetaObject::metacall(d->object, QMetaObject::ResetProperty, d->core.coreIndex, args);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-bool QmlMetaProperty::write(const QVariant &value, QmlMetaProperty::WriteFlags flags) const
-{
-    if (d->object && type() & Property && d->core.isValid() && isWritable()) 
-        return d->writeValueProperty(value, flags);
-    else 
-        return false;
-}
-
-/*!
-    Returns true if the property has a change notifier signal, otherwise false.
-*/
-bool QmlMetaProperty::hasChangedNotifier() const
-{
-    if (type() & Property && !(type() & Attached) && d->object) {
-        return d->object->metaObject()->property(d->core.coreIndex).hasNotifySignal();
-    }
-    return false;
-}
-
-/*!
-    Returns true if the property needs a change notifier signal for bindings
-    to remain upto date, false otherwise.
-
-    Some properties, such as attached properties or those whose value never 
-    changes, do not require a change notifier.
-*/
-bool QmlMetaProperty::needsChangedNotifier() const
-{
-    return type() & Property && !(type() & Attached) && 
-           !property().isConstant();
-}
-
-/*!
-    Connects the property's change notifier signal to the
-    specified \a method of the \a dest object and returns
-    true. Returns false if this metaproperty does not
-    represent a regular Qt property or if it has no
-    change notifier signal, or if the \a dest object does
-    not have the specified \a method.
-*/
-bool QmlMetaProperty::connectNotifier(QObject *dest, int method) const
-{
-    if (!(type() & Property) || (type() & Attached) || !d->object)
-        return false;
-
-    QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
-    if (prop.hasNotifySignal()) {
-        return QMetaObject::connect(d->object, prop.notifySignalIndex(), dest, method, Qt::DirectConnection);
-    } else {
-        return false;
-    }
-}
-
-/*!
-    Connects the property's change notifier signal to the
-    specified \a slot of the \a dest object and returns
-    true. Returns false if this metaproperty does not
-    represent a regular Qt property or if it has no
-    change notifier signal, or if the \a dest object does
-    not have the specified \a slot.
-*/
-bool QmlMetaProperty::connectNotifier(QObject *dest, const char *slot) const
-{
-    if (!(type() & Property) || (type() & Attached) || !d->object)
-        return false;
-
-    QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
-    if (prop.hasNotifySignal()) {
-        QByteArray signal(QByteArray("2") + prop.notifySignal().signature());
-        return QObject::connect(d->object, signal.constData(), dest, slot);
-    } else  {
-        return false;
-    }
-}
-
-/*!
-    Return the Qt metaobject index of the property.
-*/
-int QmlMetaProperty::coreIndex() const
-{
-    return d->core.coreIndex;
-}
-
-/*! \internal */
-int QmlMetaProperty::valueTypeCoreIndex() const
-{
-    return d->valueType.valueTypeCoreIdx;
-}
-
-Q_GLOBAL_STATIC(QmlValueTypeFactory, qmlValueTypes);
-
-
-struct SerializedData {
-    QmlMetaProperty::Type type;
-    QmlPropertyCache::Data core;
-};
-
-struct ValueTypeSerializedData : public SerializedData {
-    QmlPropertyCache::ValueTypeData valueType;
-};
-
-QByteArray QmlMetaPropertyPrivate::saveValueType(const QMetaObject *metaObject, int index, 
-                                                 const QMetaObject *subObject, int subIndex)
-{
-    QMetaProperty prop = metaObject->property(index);
-    QMetaProperty subProp = subObject->property(subIndex);
-
-    ValueTypeSerializedData sd;
-    sd.type = QmlMetaProperty::ValueTypeProperty;
-    sd.core.load(metaObject->property(index));
-    sd.valueType.flags = QmlPropertyCache::Data::flagsForProperty(subProp);
-    sd.valueType.valueTypeCoreIdx = subIndex;
-    sd.valueType.valueTypePropType = subProp.userType();
-
-    QByteArray rv((const char *)&sd, sizeof(sd));
-
-    return rv;
-}
-
-QByteArray QmlMetaPropertyPrivate::saveProperty(const QMetaObject *metaObject, int index)
-{
-    SerializedData sd;
-    sd.type = QmlMetaProperty::Property;
-    sd.core.load(metaObject->property(index));
-
-    QByteArray rv((const char *)&sd, sizeof(sd));
-    return rv;
-}
-
-QmlMetaProperty 
-QmlMetaPropertyPrivate::restore(const QByteArray &data, QObject *object, QmlContext *ctxt)
-{
-    QmlMetaProperty prop;
-
-    if (data.isEmpty())
-        return prop;
-
-    prop.d->object = object;
-    prop.d->context = ctxt;
-
-    const SerializedData *sd = (const SerializedData *)data.constData();
-    if (sd->type == QmlMetaProperty::Property) {
-        prop.d->core = sd->core;
-    } else if(sd->type == QmlMetaProperty::ValueTypeProperty) {
-        const ValueTypeSerializedData *vt = (const ValueTypeSerializedData *)sd;
-        prop.d->core = vt->core;
-        prop.d->valueType = vt->valueType;
-    }
-
-    return prop;
-}
-
-/*!
-    \internal
-
-    Creates a QmlMetaProperty for the property \a name of \a obj. Unlike
-    the QmlMetaProperty(QObject*, QString, QmlContext*) constructor, this static function
-    will correctly handle dot properties, including value types and attached properties.
-*/
-QmlMetaProperty QmlMetaProperty::createProperty(QObject *obj, 
-                                                const QString &name,
-                                                QmlContext *context)
-{
-    QmlTypeNameCache *typeNameCache = context?QmlContextPrivate::get(context)->imports:0;
-
-    QStringList path = name.split(QLatin1Char('.'));
-    QObject *object = obj;
-
-    for (int jj = 0; jj < path.count() - 1; ++jj) {
-        const QString &pathName = path.at(jj);
-
-        if (QmlTypeNameCache::Data *data = typeNameCache?typeNameCache->data(pathName):0) {
-            if (data->type) {
-                QmlAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
-                if (!func) 
-                    return QmlMetaProperty();
-                object = qmlAttachedPropertiesObjectById(data->type->index(), object);
-                if (!object)
-                    return QmlMetaProperty();
-                continue;
-            } else {
-                Q_ASSERT(data->typeNamespace);
-                ++jj;
-                data = data->typeNamespace->data(path.at(jj));
-                if (!data || !data->type)
-                    return QmlMetaProperty();
-                QmlAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
-                if (!func) 
-                    return QmlMetaProperty();
-                object = qmlAttachedPropertiesObjectById(data->type->index(), object);
-                if (!object)
-                    return QmlMetaProperty();
-                continue;
-            }
-        }
-
-        QmlMetaProperty prop(object, pathName, context);
-
-        if (jj == path.count() - 2 && prop.propertyType() < (int)QVariant::UserType &&
-            qmlValueTypes()->valueTypes[prop.propertyType()]) {
-            // We're now at a value type property.  We can use a global valuetypes array as we 
-            // never actually use the objects, just look up their properties.
-            QObject *typeObject = 
-                qmlValueTypes()->valueTypes[prop.propertyType()];
-            int idx = typeObject->metaObject()->indexOfProperty(path.last().toUtf8().constData());
-            if (idx == -1)
-                return QmlMetaProperty();
-            QMetaProperty vtProp = typeObject->metaObject()->property(idx);
-
-            QmlMetaProperty p = prop;
-            p.d->valueType.valueTypeCoreIdx = idx;
-            p.d->valueType.valueTypePropType = vtProp.userType();
-            return p;
-        }
-
-        QObject *objVal = QmlMetaType::toQObject(prop.read());
-        if (!objVal)
-            return QmlMetaProperty();
-        object = objVal;
-    }
-
-    const QString &propName = path.last();
-    QmlMetaProperty prop(object, propName, context);
-    if (!prop.isValid())
-        return QmlMetaProperty();
-    else
-        return prop;
-}
-
-/*!
-    Returns true if lhs and rhs refer to the same metaobject data
-*/
-bool QmlMetaPropertyPrivate::equal(const QMetaObject *lhs, const QMetaObject *rhs)
-{
-    return lhs == rhs || (1 && lhs && rhs && lhs->d.stringdata == rhs->d.stringdata);
-}
-
-/*!
-    Returns true if from inherits to.
-*/
-bool QmlMetaPropertyPrivate::canConvert(const QMetaObject *from, const QMetaObject *to)
-{
-    if (from && to == &QObject::staticMetaObject)
-        return true;
-
-    while (from) {
-        if (equal(from, to))
-            return true;
-        from = from->superClass();
-    }
-    
-    return false;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h
deleted file mode 100644
index 82266c8..0000000
--- a/src/declarative/qml/qmlmetaproperty.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLMETAPROPERTY_H
-#define QMLMETAPROPERTY_H
-
-#include <QtCore/qmetaobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QObject;
-class QmlAbstractBinding;
-class QmlExpression;
-class QStringList;
-class QVariant;
-struct QMetaObject;
-class QmlContext;
-class QmlEngine;
-
-class QmlMetaPropertyPrivate;
-class Q_DECLARATIVE_EXPORT QmlMetaProperty
-{
-public:
-    enum PropertyCategory {
-        Unknown,
-        InvalidProperty,
-        Bindable,
-        List,
-        Object,
-        Normal
-    };
-    QmlMetaProperty();
-    QmlMetaProperty(QObject *);
-    QmlMetaProperty(QObject *, const QString &);
-    QmlMetaProperty(QObject *, QmlContext *);
-    QmlMetaProperty(QObject *, const QString &, QmlContext *);
-    QmlMetaProperty(const QmlMetaProperty &);
-    QmlMetaProperty &operator=(const QmlMetaProperty &);
-    ~QmlMetaProperty();
-
-    QString name() const;
-
-    QVariant read() const;
-    bool write(const QVariant &) const;
-    enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02 };
-    Q_DECLARE_FLAGS(WriteFlags, WriteFlag)
-    bool write(const QVariant &, QmlMetaProperty::WriteFlags) const;
-    bool reset() const;
-
-    bool hasChangedNotifier() const;
-    bool needsChangedNotifier() const;
-    bool connectNotifier(QObject *dest, const char *slot) const;
-    bool connectNotifier(QObject *dest, int method) const;
-
-    QMetaMethod method() const;
-
-    enum Type { Invalid = 0x00, 
-                Property = 0x01, 
-                SignalProperty = 0x02,
-                Default = 0x08,
-                Attached = 0x10,
-                ValueTypeProperty = 0x20 };
-
-    Type type() const;
-    bool isProperty() const;
-    bool isDefault() const;
-    bool isWritable() const;
-    bool isDesignable() const;
-    bool isResettable() const;
-    bool isValid() const;
-    QObject *object() const;
-
-    PropertyCategory propertyCategory() const;
-
-    int propertyType() const;
-    const char *propertyTypeName() const;
-
-    bool operator==(const QmlMetaProperty &) const;
-
-    QMetaProperty property() const;
-
-    QmlAbstractBinding *binding() const;
-    QmlAbstractBinding *setBinding(QmlAbstractBinding *,
-                                   QmlMetaProperty::WriteFlags flags = QmlMetaProperty::DontRemoveBinding) const;
-
-    QmlExpression *signalExpression() const;
-    QmlExpression *setSignalExpression(QmlExpression *) const;
-
-    static QmlMetaProperty createProperty(QObject *, const QString &, QmlContext *context=0);
-
-    int coreIndex() const;
-    int valueTypeCoreIndex() const;
-private:
-    friend class QmlEnginePrivate;
-    friend class QmlMetaPropertyPrivate;
-    QmlMetaPropertyPrivate *d;
-};
-typedef QList<QmlMetaProperty> QmlMetaProperties;
- Q_DECLARE_OPERATORS_FOR_FLAGS(QmlMetaProperty::WriteFlags)
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLMETAPROPERTY_H
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
deleted file mode 100644
index 9236bd3..0000000
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLMETAPROPERTY_P_H
-#define QMLMETAPROPERTY_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlmetaproperty.h"
-
-#include "qmlpropertycache_p.h"
-#include "qmlguard_p.h"
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlContext;
-class QmlEnginePrivate;
-class QmlMetaPropertyPrivate
-{
-public:
-    QmlMetaPropertyPrivate()
-        : q(0), context(0), object(0), isDefaultProperty(false), isNameCached(false),
-          attachedFunc(-1) {}
-
-    QmlMetaPropertyPrivate(const QmlMetaPropertyPrivate &other)
-        : q(0), context(other.context), object(other.object), 
-          isDefaultProperty(other.isDefaultProperty), isNameCached(other.isNameCached),
-          core(other.core), nameCache(other.nameCache),
-          valueType(other.valueType), attachedFunc(other.attachedFunc) {}
-
-    QmlMetaProperty *q;
-    QmlContext *context;
-    QmlGuard<QObject> object;
-
-    bool isDefaultProperty:1;
-    bool isNameCached:1;
-    QmlPropertyCache::Data core;
-    QString nameCache;
-
-    // Describes the "virtual" value-type sub-property.  
-    QmlPropertyCache::ValueTypeData valueType;
-
-    // The attached property accessor
-    int attachedFunc;
-
-    void initProperty(QObject *obj, const QString &name);
-    void initDefault(QObject *obj);
-
-    QObject *attachedObject() const;
-    QMetaMethod findSignal(QObject *, const QString &);
-
-    int propertyType() const;
-    QmlMetaProperty::PropertyCategory propertyCategory() const;
-
-    QVariant readValueProperty();
-    bool writeValueProperty(const QVariant &, QmlMetaProperty::WriteFlags);
-
-    static const QMetaObject *rawMetaObjectForType(QmlEnginePrivate *, int);
-    static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags);
-    static bool write(QObject *, const QmlPropertyCache::Data &, const QVariant &, QmlContext *,
-                      QmlMetaProperty::WriteFlags flags = 0);
-    static QmlAbstractBinding *setBinding(QObject *, const QmlPropertyCache::Data &, QmlAbstractBinding *,
-                                          QmlMetaProperty::WriteFlags flags = QmlMetaProperty::DontRemoveBinding);
-
-    static QByteArray saveValueType(const QMetaObject *, int, 
-                                    const QMetaObject *, int);
-    static QByteArray saveProperty(const QMetaObject *, int);
-    static QmlMetaProperty restore(const QByteArray &, QObject *, QmlContext * = 0);
-
-    static bool equal(const QMetaObject *, const QMetaObject *);
-    static bool canConvert(const QMetaObject *from, const QMetaObject *to);
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLMETAPROPERTY_P_H
diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
deleted file mode 100644
index 6db70d4..0000000
--- a/src/declarative/qml/qmlmetatype.cpp
+++ /dev/null
@@ -1,1153 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlmetatype.h"
-
-#include "qmlproxymetaobject_p.h"
-#include "qmlcustomparser_p.h"
-#include "qmlguard_p.h"
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qbitarray.h>
-#include <QtCore/qreadwritelock.h>
-#include <qmetatype.h>
-#include <qobjectdefs.h>
-#include <qdatetime.h>
-#include <qbytearray.h>
-#include <qreadwritelock.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvector.h>
-#include <qlocale.h>
-#include <QtCore/qcryptographichash.h>
-#include <QtScript/qscriptvalue.h>
-
-#include <ctype.h>
-
-#ifdef QT_BOOTSTRAPPED
-# ifndef QT_NO_GEOM_VARIANT
-#  define QT_NO_GEOM_VARIANT
-# endif
-#else
-#  include <qbitarray.h>
-#  include <qurl.h>
-#  include <qvariant.h>
-#endif
-
-#ifndef QT_NO_GEOM_VARIANT
-# include <qsize.h>
-# include <qpoint.h>
-# include <qrect.h>
-# include <qline.h>
-# include <qvector3d.h>
-#endif
-#define NS(x) QT_PREPEND_NAMESPACE(x)
-
-QT_BEGIN_NAMESPACE
-
-struct QmlMetaTypeData
-{
-    ~QmlMetaTypeData();
-    QList<QmlType *> types;
-    typedef QHash<int, QmlType *> Ids;
-    Ids idToType;
-    typedef QHash<QByteArray, QmlType *> Names;
-    Names nameToType;
-    typedef QHash<const QMetaObject *, QmlType *> MetaObjects;
-    MetaObjects metaObjectToType;
-    typedef QHash<int, QmlMetaType::StringConverter> StringConverters;
-    StringConverters stringConverters;
-
-    QBitArray objects;
-    QBitArray interfaces;
-    QBitArray lists;
-};
-Q_GLOBAL_STATIC(QmlMetaTypeData, metaTypeData)
-Q_GLOBAL_STATIC(QReadWriteLock, metaTypeDataLock)
-
-QmlMetaTypeData::~QmlMetaTypeData()
-{
-    for (int i = 0; i < types.count(); ++i)
-        delete types.at(i);
-}
-
-class QmlTypePrivate
-{
-public:
-    QmlTypePrivate();
-
-    void init() const;
-
-    bool m_isInterface : 1;
-    const char *m_iid;
-    QByteArray m_name;
-    int m_version_maj;
-    int m_version_min;
-    int m_typeId; int m_listId; 
-    QObject *(*m_newFunc)();
-    const QMetaObject *m_baseMetaObject;
-    QmlAttachedPropertiesFunc m_attachedPropertiesFunc;
-    const QMetaObject *m_attachedPropertiesType;
-    int m_parserStatusCast;
-    int m_propertyValueSourceCast;
-    int m_propertyValueInterceptorCast;
-    QmlPrivate::CreateFunc m_extFunc;
-    const QMetaObject *m_extMetaObject;
-    int m_index;
-    QmlCustomParser *m_customParser;
-    mutable volatile bool m_isSetup:1;
-    mutable QList<QmlProxyMetaObject::ProxyData> m_metaObjects;
-};
-
-QmlTypePrivate::QmlTypePrivate()
-: m_isInterface(false), m_iid(0), m_typeId(0), m_listId(0), 
-  m_newFunc(0), m_baseMetaObject(0), m_attachedPropertiesFunc(0), m_attachedPropertiesType(0),
-  m_parserStatusCast(-1), m_propertyValueSourceCast(-1), m_propertyValueInterceptorCast(-1),
-  m_extFunc(0), m_extMetaObject(0), m_index(-1), m_customParser(0), m_isSetup(false)
-{
-}
-
-
-QmlType::QmlType(int type, int listType, const char *iid, int index)
-: d(new QmlTypePrivate)
-{
-    d->m_isInterface = true;
-    d->m_iid = iid;
-    d->m_typeId = type;
-    d->m_listId = listType;
-    d->m_newFunc = 0;
-    d->m_index = index;
-    d->m_isSetup = true;
-    d->m_version_maj = 0;
-    d->m_version_min = 0;
-}
-
-QmlType::QmlType(int type, int listType, 
-                 QObject *(*newFunc)(), const char *qmlName,
-                 int version_maj, int version_min,
-                 const QMetaObject *metaObject,
-                 QmlAttachedPropertiesFunc attachedPropertiesFunc,
-                 const QMetaObject *attachedType,
-                 int parserStatusCast, int propertyValueSourceCast, int propertyValueInterceptorCast,
-                 QmlPrivate::CreateFunc extFunc,
-                 const QMetaObject *extMetaObject, int index,
-                 QmlCustomParser *customParser)
-: d(new QmlTypePrivate)
-{
-    d->m_name = qmlName;
-    d->m_version_maj = version_maj;
-    d->m_version_min = version_min;
-    d->m_typeId = type;
-    d->m_listId = listType;
-    d->m_newFunc = newFunc;
-    d->m_baseMetaObject = metaObject;
-    d->m_attachedPropertiesFunc = attachedPropertiesFunc;
-    d->m_attachedPropertiesType = attachedType;
-    d->m_parserStatusCast = parserStatusCast;
-    d->m_propertyValueSourceCast = propertyValueSourceCast;
-    d->m_propertyValueInterceptorCast = propertyValueInterceptorCast;
-    d->m_extFunc = extFunc;
-    d->m_index = index;
-    d->m_customParser = customParser;
-
-    if (extMetaObject)
-        d->m_extMetaObject = extMetaObject;
-}
-
-QmlType::~QmlType()
-{
-    delete d->m_customParser;
-    delete d;
-}
-
-int QmlType::majorVersion() const
-{
-    return d->m_version_maj;
-}
-
-int QmlType::minorVersion() const
-{
-    return d->m_version_min;
-}
-
-bool QmlType::availableInVersion(int vmajor, int vminor) const
-{
-    return vmajor > d->m_version_maj || (vmajor == d->m_version_maj && vminor >= d->m_version_min);
-}
-
-void QmlTypePrivate::init() const
-{
-    if (m_isSetup) return;
-
-    QWriteLocker lock(metaTypeDataLock());
-    if (m_isSetup)
-        return;
-
-    // Setup extended meta object
-    // XXX - very inefficient
-    const QMetaObject *mo = m_baseMetaObject;
-    if (m_extFunc) {
-        QMetaObject *mmo = new QMetaObject;
-        *mmo = *m_extMetaObject;
-        mmo->d.superdata = mo;
-        QmlProxyMetaObject::ProxyData data = { mmo, m_extFunc, 0, 0 };
-        m_metaObjects << data;
-    }
-
-    mo = mo->d.superdata;
-    while(mo) {
-        QmlType *t = metaTypeData()->metaObjectToType.value(mo);
-        if (t) {
-            if (t->d->m_extFunc) {
-                QMetaObject *mmo = new QMetaObject;
-                *mmo = *t->d->m_extMetaObject;
-                mmo->d.superdata = m_baseMetaObject;
-                if (!m_metaObjects.isEmpty())
-                    m_metaObjects.last().metaObject->d.superdata = mmo;
-                QmlProxyMetaObject::ProxyData data = { mmo, t->d->m_extFunc, 0, 0 };
-                m_metaObjects << data;
-            }
-        }
-        mo = mo->d.superdata;
-    }
-
-    for (int ii = 0; ii < m_metaObjects.count(); ++ii) {
-        m_metaObjects[ii].propertyOffset =
-            m_metaObjects.at(ii).metaObject->propertyOffset();
-        m_metaObjects[ii].methodOffset =
-            m_metaObjects.at(ii).metaObject->methodOffset();
-    }
-
-    m_isSetup = true;
-    lock.unlock();
-}
-
-QByteArray QmlType::typeName() const
-{
-    if (d->m_baseMetaObject)
-        return d->m_baseMetaObject->className();
-    else
-        return QByteArray();
-}
-
-QByteArray QmlType::qmlTypeName() const
-{
-    return d->m_name;
-}
-
-QObject *QmlType::create() const
-{
-    d->init();
-
-    QObject *rv = d->m_newFunc();
-    if (rv && !d->m_metaObjects.isEmpty())
-        (void *)new QmlProxyMetaObject(rv, &d->m_metaObjects);
-
-    return rv;
-}
-
-QmlCustomParser *QmlType::customParser() const
-{
-    return d->m_customParser;
-}
-
-bool QmlType::isInterface() const
-{
-    return d->m_isInterface;
-}
-
-int QmlType::typeId() const
-{
-    return d->m_typeId;
-}
-
-int QmlType::qListTypeId() const
-{
-    return d->m_listId;
-}
-
-const QMetaObject *QmlType::metaObject() const
-{
-    d->init();
-
-    if (d->m_metaObjects.isEmpty())
-        return d->m_baseMetaObject;
-    else
-        return d->m_metaObjects.first().metaObject;
-
-}
-
-const QMetaObject *QmlType::baseMetaObject() const
-{
-    return d->m_baseMetaObject;
-}
-
-QmlAttachedPropertiesFunc QmlType::attachedPropertiesFunction() const
-{
-    return d->m_attachedPropertiesFunc;
-}
-
-const QMetaObject *QmlType::attachedPropertiesType() const
-{
-    return d->m_attachedPropertiesType;
-}
-
-int QmlType::parserStatusCast() const
-{
-    return d->m_parserStatusCast;
-}
-
-int QmlType::propertyValueSourceCast() const
-{
-    return d->m_propertyValueSourceCast;
-}
-
-int QmlType::propertyValueInterceptorCast() const
-{
-    return d->m_propertyValueInterceptorCast;
-}
-
-const char *QmlType::interfaceIId() const
-{
-    return d->m_iid;
-}
-
-int QmlType::index() const
-{
-    return d->m_index;
-}
-
-int QmlMetaType::registerInterface(const QmlPrivate::MetaTypeIds &id,
-                                    const char *iid)
-{
-    QWriteLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-
-    int index = data->types.count();
-
-    QmlType *type = new QmlType(id.typeId, id.listId, iid, index);
-
-    data->types.append(type);
-    data->idToType.insert(type->typeId(), type);
-    data->idToType.insert(type->qListTypeId(), type);
-    // XXX No insertMulti, so no multi-version interfaces?
-    if (!type->qmlTypeName().isEmpty())
-        data->nameToType.insert(type->qmlTypeName(), type);
-
-    if (data->interfaces.size() <= id.typeId)
-        data->interfaces.resize(id.typeId + 16);
-    if (data->lists.size() <= id.listId)
-        data->lists.resize(id.listId + 16);
-    data->interfaces.setBit(id.typeId, true);
-    data->lists.setBit(id.listId, true);
-
-    return index;
-}
-
-int QmlMetaType::registerType(const QmlPrivate::MetaTypeIds &id, QObject *(*func)(),
-        const char *uri, int version_maj, int version_min, const char *cname,
-        const QMetaObject *mo, QmlAttachedPropertiesFunc attach, const QMetaObject *attachMo,
-        int pStatus, int object, int valueSource, int valueInterceptor, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *parser)
-{
-    Q_UNUSED(object);
-
-    if (cname) {
-        for (int ii = 0; cname[ii]; ++ii) {
-            if (!isalnum(cname[ii])) {
-                qWarning("QmlMetaType: Invalid QML name %s", cname);
-                return -1;
-            }
-        }
-    }
-
-    QWriteLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-    int index = data->types.count();
-
-    QByteArray name = uri;
-    if (uri)
-        name += '/';
-    name += cname;
-
-    QmlType *type = new QmlType(id.typeId, id.listId, 
-                                func, name, version_maj, version_min, mo, attach, attachMo, pStatus,
-                                valueSource, valueInterceptor, extFunc, extmo, index, parser);
-
-    data->types.append(type);
-    data->idToType.insert(type->typeId(), type);
-    data->idToType.insert(type->qListTypeId(), type);
-
-    if (!type->qmlTypeName().isEmpty())
-        data->nameToType.insertMulti(type->qmlTypeName(), type);
-
-    data->metaObjectToType.insert(type->baseMetaObject(), type);
-
-    if (data->objects.size() <= id.typeId)
-        data->objects.resize(id.typeId + 16);
-    if (data->lists.size() <= id.listId)
-        data->lists.resize(id.listId + 16);
-    data->objects.setBit(id.typeId, true);
-    data->lists.setBit(id.listId, true);
-
-    return index;
-}
-
-QObject *QmlMetaType::toQObject(const QVariant &v, bool *ok)
-{
-    if (!isQObject(v.userType())) {
-        if (ok) *ok = false;
-        return 0;
-    }
-
-    if (ok) *ok = true;
-
-    return *(QObject **)v.constData();
-}
-
-bool QmlMetaType::isQObject(int userType)
-{
-    if (userType == QMetaType::QObjectStar)
-        return true;
-
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-    return userType >= 0 && userType < data->objects.size() && data->objects.testBit(userType);
-}
-
-/*
-    Returns the item type for a list of type \a id.
- */
-int QmlMetaType::listType(int id)
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-    QmlType *type = data->idToType.value(id);
-    if (type && type->qListTypeId() == id)
-        return type->typeId();
-    else
-        return 0;
-}
-
-int QmlMetaType::attachedPropertiesFuncId(const QMetaObject *mo)
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-
-    QmlType *type = data->metaObjectToType.value(mo);
-    if (type && type->attachedPropertiesFunction())
-        return type->index();
-    else
-        return -1;
-}
-
-QmlAttachedPropertiesFunc QmlMetaType::attachedPropertiesFuncById(int id)
-{
-    if (id < 0)
-        return 0;
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-    return data->types.at(id)->attachedPropertiesFunction();
-}
-
-QMetaProperty QmlMetaType::defaultProperty(const QMetaObject *metaObject)
-{
-    int idx = metaObject->indexOfClassInfo("DefaultProperty");
-    if (-1 == idx)
-        return QMetaProperty();
-
-    QMetaClassInfo info = metaObject->classInfo(idx);
-    if (!info.value())
-        return QMetaProperty();
-
-    idx = metaObject->indexOfProperty(info.value());
-    if (-1 == idx)
-        return QMetaProperty();
-
-    return metaObject->property(idx);
-}
-
-QMetaProperty QmlMetaType::defaultProperty(QObject *obj)
-{
-    if (!obj)
-        return QMetaProperty();
-
-    const QMetaObject *metaObject = obj->metaObject();
-    return defaultProperty(metaObject);
-}
-
-QMetaMethod QmlMetaType::defaultMethod(const QMetaObject *metaObject)
-{
-    int idx = metaObject->indexOfClassInfo("DefaultMethod");
-    if (-1 == idx)
-        return QMetaMethod();
-
-    QMetaClassInfo info = metaObject->classInfo(idx);
-    if (!info.value())
-        return QMetaMethod();
-
-    idx = metaObject->indexOfMethod(info.value());
-    if (-1 == idx)
-        return QMetaMethod();
-
-    return metaObject->method(idx);
-}
-
-QMetaMethod QmlMetaType::defaultMethod(QObject *obj)
-{
-    if (!obj)
-        return QMetaMethod();
-
-    const QMetaObject *metaObject = obj->metaObject();
-    return defaultMethod(metaObject);
-}
-
-QmlMetaType::TypeCategory QmlMetaType::typeCategory(int userType)
-{
-    if (userType < 0)
-        return Unknown;
-    if (userType == QMetaType::QObjectStar)
-        return Object;
-
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-    if (userType < data->objects.size() && data->objects.testBit(userType))
-        return Object;
-    else if (userType < data->lists.size() && data->lists.testBit(userType))
-        return List;
-    else
-        return Unknown;
-}
-
-bool QmlMetaType::isInterface(int userType)
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-    return userType >= 0 && userType < data->interfaces.size() && data->interfaces.testBit(userType);
-}
-
-const char *QmlMetaType::interfaceIId(int userType)
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-    QmlType *type = data->idToType.value(userType);
-    lock.unlock();
-    if (type && type->isInterface() && type->typeId() == userType)
-        return type->interfaceIId();
-    else
-        return 0;
-}
-
-bool QmlMetaType::isList(int userType)
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-    return userType >= 0 && userType < data->lists.size() && data->lists.testBit(userType);
-}
-
-/*!
-    A custom string convertor allows you to specify a function pointer that
-    returns a variant of \a type. For example, if you have written your own icon
-    class that you want to support as an object property assignable in QML:
-
-    \code
-    int type = qRegisterMetaType<SuperIcon>("SuperIcon");
-    QML::addCustomStringConvertor(type, &SuperIcon::pixmapFromString);
-    \endcode
-
-    The function pointer must be of the form:
-    \code
-    QVariant (*StringConverter)(const QString &);
-    \endcode
- */
-void QmlMetaType::registerCustomStringConverter(int type, StringConverter converter)
-{
-    QWriteLocker lock(metaTypeDataLock());
-
-    QmlMetaTypeData *data = metaTypeData();
-    if (data->stringConverters.contains(type))
-        return;
-    data->stringConverters.insert(type, converter);
-}
-
-/*!
-    Return the custom string converter for \a type, previously installed through
-    registerCustomStringConverter()
- */
-QmlMetaType::StringConverter QmlMetaType::customStringConverter(int type)
-{
-    QReadLocker lock(metaTypeDataLock());
-
-    QmlMetaTypeData *data = metaTypeData();
-    return data->stringConverters.value(type);
-}
-
-/*!
-    Returns the type (if any) of URI-qualified named \a name in version specified
-    by \a version_major and \a version_minor.
-*/
-QmlType *QmlMetaType::qmlType(const QByteArray &name, int version_major, int version_minor)
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-
-    QList<QmlType*> types = data->nameToType.values(name);
-    foreach (QmlType *t, types) {
-        // XXX version_major<0 just a kludge for QmlMetaPropertyPrivate::initProperty
-        if (version_major<0 || t->availableInVersion(version_major,version_minor))
-            return t;
-    }
-    return 0;
-}
-
-/*!
-    Returns the type (if any) that corresponds to the \a metaObject.  Returns null if no
-    type is registered.
-*/
-QmlType *QmlMetaType::qmlType(const QMetaObject *metaObject)
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-
-    return data->metaObjectToType.value(metaObject);
-}
-
-/*!
-    Returns the type (if any) that corresponds to the QVariant::Type \a userType.  
-    Returns null if no type is registered.
-*/
-QmlType *QmlMetaType::qmlType(int userType)
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-
-    QmlType *type = data->idToType.value(userType);
-    if (type && type->typeId() == userType)
-        return type;
-    else
-        return 0;
-}
-
-/*!
-    Returns the list of registered QML type names.
-*/
-QList<QByteArray> QmlMetaType::qmlTypeNames()
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-
-    return data->nameToType.keys();
-}
-
-/*!
-    Returns the list of registered QML types.
-*/
-QList<QmlType*> QmlMetaType::qmlTypes()
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-
-    return data->nameToType.values();
-}
-
-QT_END_NAMESPACE
-
-#include <QtGui/qfont.h>
-#include <QtGui/qpixmap.h>
-#include <QtGui/qbrush.h>
-#include <QtGui/qcolor.h>
-#include <QtGui/qpalette.h>
-#include <QtGui/qicon.h>
-#include <QtGui/qimage.h>
-#include <QtGui/qpolygon.h>
-#include <QtGui/qregion.h>
-#include <QtGui/qbitmap.h>
-#include <QtGui/qcursor.h>
-#include <QtGui/qsizepolicy.h>
-#include <QtGui/qkeysequence.h>
-#include <QtGui/qpen.h>
-
-//#include <QtGui/qtextlength.h>
-#include <QtGui/qtextformat.h>
-#include <QtGui/qmatrix.h>
-#include <QtGui/qtransform.h>
-#include <QtGui/qmatrix4x4.h>
-#include <QtGui/qvector2d.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector4d.h>
-#include <QtGui/qquaternion.h>
-
-Q_DECLARE_METATYPE(QScriptValue);
-
-QT_BEGIN_NAMESPACE
-/*!
-    Copies \a copy into \a data, assuming they both are of type \a type.  If
-    \a copy is zero, a default type is copied.  Returns true if the copy was
-    successful and false if not.
-
-    \note This should move into QMetaType once complete
-
-*/
-bool QmlMetaType::copy(int type, void *data, const void *copy)
-{
-    if (copy) {
-        switch(type) {
-        case QMetaType::VoidStar:
-        case QMetaType::QObjectStar:
-        case QMetaType::QWidgetStar:
-            *static_cast<void **>(data) = *static_cast<void* const *>(copy);
-            return true;
-        case QMetaType::Long:
-            *static_cast<long *>(data) = *static_cast<const long*>(copy);
-            return true;
-        case QMetaType::Int:
-            *static_cast<int *>(data) = *static_cast<const int*>(copy);
-            return true;
-        case QMetaType::Short:
-            *static_cast<short *>(data) = *static_cast<const short*>(copy);
-            return true;
-        case QMetaType::Char:
-            *static_cast<char *>(data) = *static_cast<const char*>(copy);
-            return true;
-        case QMetaType::ULong:
-            *static_cast<ulong *>(data) = *static_cast<const ulong*>(copy);
-            return true;
-        case QMetaType::UInt:
-            *static_cast<uint *>(data) = *static_cast<const uint*>(copy);
-            return true;
-        case QMetaType::LongLong:
-            *static_cast<qlonglong *>(data) = *static_cast<const qlonglong*>(copy);
-            return true;
-        case QMetaType::ULongLong:
-            *static_cast<qulonglong *>(data) = *static_cast<const qulonglong*>(copy);
-            return true;
-        case QMetaType::UShort:
-            *static_cast<ushort *>(data) = *static_cast<const ushort*>(copy);
-            return true;
-        case QMetaType::UChar:
-            *static_cast<uchar *>(data) = *static_cast<const uchar*>(copy);
-            return true;
-        case QMetaType::Bool:
-            *static_cast<bool *>(data) = *static_cast<const bool*>(copy);
-            return true;
-        case QMetaType::Float:
-            *static_cast<float *>(data) = *static_cast<const float*>(copy);
-            return true;
-        case QMetaType::Double:
-            *static_cast<double *>(data) = *static_cast<const double*>(copy);
-            return true;
-        case QMetaType::QChar:
-            *static_cast<NS(QChar) *>(data) = *static_cast<const NS(QChar)*>(copy);
-            return true;
-        case QMetaType::QVariantMap:
-            *static_cast<NS(QVariantMap) *>(data) = *static_cast<const NS(QVariantMap)*>(copy);
-            return true;
-        case QMetaType::QVariantHash:
-            *static_cast<NS(QVariantHash) *>(data) = *static_cast<const NS(QVariantHash)*>(copy);
-            return true;
-        case QMetaType::QVariantList:
-            *static_cast<NS(QVariantList) *>(data) = *static_cast<const NS(QVariantList)*>(copy);
-            return true;
-        case QMetaType::QByteArray:
-            *static_cast<NS(QByteArray) *>(data) = *static_cast<const NS(QByteArray)*>(copy);
-            return true;
-        case QMetaType::QString:
-            *static_cast<NS(QString) *>(data) = *static_cast<const NS(QString)*>(copy);
-            return true;
-        case QMetaType::QStringList:
-            *static_cast<NS(QStringList) *>(data) = *static_cast<const NS(QStringList)*>(copy);
-            return true;
-        case QMetaType::QBitArray:
-            *static_cast<NS(QBitArray) *>(data) = *static_cast<const NS(QBitArray)*>(copy);
-            return true;
-        case QMetaType::QDate:
-            *static_cast<NS(QDate) *>(data) = *static_cast<const NS(QDate)*>(copy);
-            return true;
-        case QMetaType::QTime:
-            *static_cast<NS(QTime) *>(data) = *static_cast<const NS(QTime)*>(copy);
-            return true;
-        case QMetaType::QDateTime:
-            *static_cast<NS(QDateTime) *>(data) = *static_cast<const NS(QDateTime)*>(copy);
-            return true;
-        case QMetaType::QUrl:
-            *static_cast<NS(QUrl) *>(data) = *static_cast<const NS(QUrl)*>(copy);
-            return true;
-        case QMetaType::QLocale:
-            *static_cast<NS(QLocale) *>(data) = *static_cast<const NS(QLocale)*>(copy);
-            return true;
-        case QMetaType::QRect:
-            *static_cast<NS(QRect) *>(data) = *static_cast<const NS(QRect)*>(copy);
-            return true;
-        case QMetaType::QRectF:
-            *static_cast<NS(QRectF) *>(data) = *static_cast<const NS(QRectF)*>(copy);
-            return true;
-        case QMetaType::QSize:
-            *static_cast<NS(QSize) *>(data) = *static_cast<const NS(QSize)*>(copy);
-            return true;
-        case QMetaType::QSizeF:
-            *static_cast<NS(QSizeF) *>(data) = *static_cast<const NS(QSizeF)*>(copy);
-            return true;
-        case QMetaType::QLine:
-            *static_cast<NS(QLine) *>(data) = *static_cast<const NS(QLine)*>(copy);
-            return true;
-        case QMetaType::QLineF:
-            *static_cast<NS(QLineF) *>(data) = *static_cast<const NS(QLineF)*>(copy);
-            return true;
-        case QMetaType::QPoint:
-            *static_cast<NS(QPoint) *>(data) = *static_cast<const NS(QPoint)*>(copy);
-            return true;
-        case QMetaType::QPointF:
-            *static_cast<NS(QPointF) *>(data) = *static_cast<const NS(QPointF)*>(copy);
-            return true;
-        case QMetaType::QVector3D:
-            *static_cast<NS(QVector3D) *>(data) = *static_cast<const NS(QVector3D)*>(copy);
-            return true;
-#ifndef QT_NO_REGEXP
-        case QMetaType::QRegExp:
-            *static_cast<NS(QRegExp) *>(data) = *static_cast<const NS(QRegExp)*>(copy);
-            return true;
-#endif
-        case QMetaType::Void:
-            return true;
-
-
-#ifdef QT3_SUPPORT
-        case QMetaType::QColorGroup:
-            *static_cast<NS(QColorGroup) *>(data) = *static_cast<const NS(QColorGroup)*>(copy);
-            return true;
-#endif
-
-        case QMetaType::QFont:
-            *static_cast<NS(QFont) *>(data) = *static_cast<const NS(QFont)*>(copy);
-            return true;
-        case QMetaType::QPixmap:
-            *static_cast<NS(QPixmap) *>(data) = *static_cast<const NS(QPixmap)*>(copy);
-            return true;
-        case QMetaType::QBrush:
-            *static_cast<NS(QBrush) *>(data) = *static_cast<const NS(QBrush)*>(copy);
-            return true;
-        case QMetaType::QColor:
-            *static_cast<NS(QColor) *>(data) = *static_cast<const NS(QColor)*>(copy);
-            return true;
-        case QMetaType::QPalette:
-            *static_cast<NS(QPalette) *>(data) = *static_cast<const NS(QPalette)*>(copy);
-            return true;
-        case QMetaType::QIcon:
-            *static_cast<NS(QIcon) *>(data) = *static_cast<const NS(QIcon)*>(copy);
-            return true;
-        case QMetaType::QImage:
-            *static_cast<NS(QImage) *>(data) = *static_cast<const NS(QImage)*>(copy);
-            return true;
-        case QMetaType::QPolygon:
-            *static_cast<NS(QPolygon) *>(data) = *static_cast<const NS(QPolygon)*>(copy);
-            return true;
-        case QMetaType::QRegion:
-            *static_cast<NS(QRegion) *>(data) = *static_cast<const NS(QRegion)*>(copy);
-            return true;
-        case QMetaType::QBitmap:
-            *static_cast<NS(QBitmap) *>(data) = *static_cast<const NS(QBitmap)*>(copy);
-            return true;
-#ifndef QT_NO_CURSOR
-        case QMetaType::QCursor:
-            *static_cast<NS(QCursor) *>(data) = *static_cast<const NS(QCursor)*>(copy);
-            return true;
-#endif
-        case QMetaType::QSizePolicy:
-            *static_cast<NS(QSizePolicy) *>(data) = *static_cast<const NS(QSizePolicy)*>(copy);
-            return true;
-        case QMetaType::QKeySequence:
-            *static_cast<NS(QKeySequence) *>(data) = *static_cast<const NS(QKeySequence)*>(copy);
-            return true;
-        case QMetaType::QPen:
-            *static_cast<NS(QPen) *>(data) = *static_cast<const NS(QPen)*>(copy);
-            return true;
-        case QMetaType::QTextLength:
-            *static_cast<NS(QTextLength) *>(data) = *static_cast<const NS(QTextLength)*>(copy);
-            return true;
-        case QMetaType::QTextFormat:
-            *static_cast<NS(QTextFormat) *>(data) = *static_cast<const NS(QTextFormat)*>(copy);
-            return true;
-        case QMetaType::QMatrix:
-            *static_cast<NS(QMatrix) *>(data) = *static_cast<const NS(QMatrix)*>(copy);
-            return true;
-        case QMetaType::QTransform:
-            *static_cast<NS(QTransform) *>(data) = *static_cast<const NS(QTransform)*>(copy);
-            return true;
-        case QMetaType::QMatrix4x4:
-            *static_cast<NS(QMatrix4x4) *>(data) = *static_cast<const NS(QMatrix4x4)*>(copy);
-            return true;
-        case QMetaType::QVector2D:
-            *static_cast<NS(QVector2D) *>(data) = *static_cast<const NS(QVector2D)*>(copy);
-            return true;
-        case QMetaType::QVector4D:
-            *static_cast<NS(QVector4D) *>(data) = *static_cast<const NS(QVector4D)*>(copy);
-            return true;
-        case QMetaType::QQuaternion:
-            *static_cast<NS(QQuaternion) *>(data) = *static_cast<const NS(QQuaternion)*>(copy);
-            return true;
-
-        default:
-            if (type == qMetaTypeId<QVariant>()) {
-                *static_cast<NS(QVariant) *>(data) = *static_cast<const NS(QVariant)*>(copy);
-                return true;
-            } else if (type == qMetaTypeId<QScriptValue>()) {
-                *static_cast<NS(QScriptValue) *>(data) = *static_cast<const NS(QScriptValue)*>(copy);
-                return true;
-            } else if (typeCategory(type) != Unknown) {
-                *static_cast<void **>(data) = *static_cast<void* const *>(copy);
-                return true;
-            }
-            break;
-        }
-    } else {
-        switch(type) {
-        case QMetaType::VoidStar:
-        case QMetaType::QObjectStar:
-        case QMetaType::QWidgetStar:
-            *static_cast<void **>(data) = 0;
-            return true;
-        case QMetaType::Long:
-            *static_cast<long *>(data) = long(0);
-            return true;
-        case QMetaType::Int:
-            *static_cast<int *>(data) = int(0);
-            return true;
-        case QMetaType::Short:
-            *static_cast<short *>(data) = short(0);
-            return true;
-        case QMetaType::Char:
-            *static_cast<char *>(data) = char(0);
-            return true;
-        case QMetaType::ULong:
-            *static_cast<ulong *>(data) = ulong(0);
-            return true;
-        case QMetaType::UInt:
-            *static_cast<uint *>(data) = uint(0);
-            return true;
-        case QMetaType::LongLong:
-            *static_cast<qlonglong *>(data) = qlonglong(0);
-            return true;
-        case QMetaType::ULongLong:
-            *static_cast<qulonglong *>(data) = qulonglong(0);
-            return true;
-        case QMetaType::UShort:
-            *static_cast<ushort *>(data) = ushort(0);
-            return true;
-        case QMetaType::UChar:
-            *static_cast<uchar *>(data) = uchar(0);
-            return true;
-        case QMetaType::Bool:
-            *static_cast<bool *>(data) = bool(false);
-            return true;
-        case QMetaType::Float:
-            *static_cast<float *>(data) = float(0);
-            return true;
-        case QMetaType::Double:
-            *static_cast<double *>(data) = double();
-            return true;
-        case QMetaType::QChar:
-            *static_cast<NS(QChar) *>(data) = NS(QChar)();
-            return true;
-        case QMetaType::QVariantMap:
-            *static_cast<NS(QVariantMap) *>(data) = NS(QVariantMap)();
-            return true;
-        case QMetaType::QVariantHash:
-            *static_cast<NS(QVariantHash) *>(data) = NS(QVariantHash)();
-            return true;
-        case QMetaType::QVariantList:
-            *static_cast<NS(QVariantList) *>(data) = NS(QVariantList)();
-            return true;
-        case QMetaType::QByteArray:
-            *static_cast<NS(QByteArray) *>(data) = NS(QByteArray)();
-            return true;
-        case QMetaType::QString:
-            *static_cast<NS(QString) *>(data) = NS(QString)();
-            return true;
-        case QMetaType::QStringList:
-            *static_cast<NS(QStringList) *>(data) = NS(QStringList)();
-            return true;
-        case QMetaType::QBitArray:
-            *static_cast<NS(QBitArray) *>(data) = NS(QBitArray)();
-            return true;
-        case QMetaType::QDate:
-            *static_cast<NS(QDate) *>(data) = NS(QDate)();
-            return true;
-        case QMetaType::QTime:
-            *static_cast<NS(QTime) *>(data) = NS(QTime)();
-            return true;
-        case QMetaType::QDateTime:
-            *static_cast<NS(QDateTime) *>(data) = NS(QDateTime)();
-            return true;
-        case QMetaType::QUrl:
-            *static_cast<NS(QUrl) *>(data) = NS(QUrl)();
-            return true;
-        case QMetaType::QLocale:
-            *static_cast<NS(QLocale) *>(data) = NS(QLocale)();
-            return true;
-        case QMetaType::QRect:
-            *static_cast<NS(QRect) *>(data) = NS(QRect)();
-            return true;
-        case QMetaType::QRectF:
-            *static_cast<NS(QRectF) *>(data) = NS(QRectF)();
-            return true;
-        case QMetaType::QSize:
-            *static_cast<NS(QSize) *>(data) = NS(QSize)();
-            return true;
-        case QMetaType::QSizeF:
-            *static_cast<NS(QSizeF) *>(data) = NS(QSizeF)();
-            return true;
-        case QMetaType::QLine:
-            *static_cast<NS(QLine) *>(data) = NS(QLine)();
-            return true;
-        case QMetaType::QLineF:
-            *static_cast<NS(QLineF) *>(data) = NS(QLineF)();
-            return true;
-        case QMetaType::QPoint:
-            *static_cast<NS(QPoint) *>(data) = NS(QPoint)();
-            return true;
-        case QMetaType::QPointF:
-            *static_cast<NS(QPointF) *>(data) = NS(QPointF)();
-            return true;
-        case QMetaType::QVector3D:
-            *static_cast<NS(QVector3D) *>(data) = NS(QVector3D)();
-            return true;
-#ifndef QT_NO_REGEXP
-        case QMetaType::QRegExp:
-            *static_cast<NS(QRegExp) *>(data) = NS(QRegExp)();
-            return true;
-#endif
-        case QMetaType::Void:
-            return true;
-
-#ifdef QT3_SUPPORT
-        case QMetaType::QColorGroup:
-            *static_cast<NS(QColorGroup) *>(data) = NS(QColorGroup)();
-            return true;
-#endif
-
-        case QMetaType::QFont:
-            *static_cast<NS(QFont) *>(data) = NS(QFont)();
-            return true;
-        case QMetaType::QPixmap:
-            *static_cast<NS(QPixmap) *>(data) = NS(QPixmap)();
-            return true;
-        case QMetaType::QBrush:
-            *static_cast<NS(QBrush) *>(data) = NS(QBrush)();
-            return true;
-        case QMetaType::QColor:
-            *static_cast<NS(QColor) *>(data) = NS(QColor)();
-            return true;
-        case QMetaType::QPalette:
-            *static_cast<NS(QPalette) *>(data) = NS(QPalette)();
-            return true;
-        case QMetaType::QIcon:
-            *static_cast<NS(QIcon) *>(data) = NS(QIcon)();
-            return true;
-        case QMetaType::QImage:
-            *static_cast<NS(QImage) *>(data) = NS(QImage)();
-            return true;
-        case QMetaType::QPolygon:
-            *static_cast<NS(QPolygon) *>(data) = NS(QPolygon)();
-            return true;
-        case QMetaType::QRegion:
-            *static_cast<NS(QRegion) *>(data) = NS(QRegion)();
-            return true;
-        case QMetaType::QBitmap:
-            *static_cast<NS(QBitmap) *>(data) = NS(QBitmap)();
-            return true;
-#ifndef QT_NO_CURSOR
-        case QMetaType::QCursor:
-            *static_cast<NS(QCursor) *>(data) = NS(QCursor)();
-            return true;
-#endif
-        case QMetaType::QSizePolicy:
-            *static_cast<NS(QSizePolicy) *>(data) = NS(QSizePolicy)();
-            return true;
-        case QMetaType::QKeySequence:
-            *static_cast<NS(QKeySequence) *>(data) = NS(QKeySequence)();
-            return true;
-        case QMetaType::QPen:
-            *static_cast<NS(QPen) *>(data) = NS(QPen)();
-            return true;
-        case QMetaType::QTextLength:
-            *static_cast<NS(QTextLength) *>(data) = NS(QTextLength)();
-            return true;
-        case QMetaType::QTextFormat:
-            *static_cast<NS(QTextFormat) *>(data) = NS(QTextFormat)();
-            return true;
-        case QMetaType::QMatrix:
-            *static_cast<NS(QMatrix) *>(data) = NS(QMatrix)();
-            return true;
-        case QMetaType::QTransform:
-            *static_cast<NS(QTransform) *>(data) = NS(QTransform)();
-            return true;
-        case QMetaType::QMatrix4x4:
-            *static_cast<NS(QMatrix4x4) *>(data) = NS(QMatrix4x4)();
-            return true;
-        case QMetaType::QVector2D:
-            *static_cast<NS(QVector2D) *>(data) = NS(QVector2D)();
-            return true;
-        case QMetaType::QVector4D:
-            *static_cast<NS(QVector4D) *>(data) = NS(QVector4D)();
-            return true;
-        case QMetaType::QQuaternion:
-            *static_cast<NS(QQuaternion) *>(data) = NS(QQuaternion)();
-            return true;
-        default:
-            if (type == qMetaTypeId<QVariant>()) {
-                *static_cast<NS(QVariant) *>(data) = NS(QVariant)();
-                return true;
-            } else if (type == qMetaTypeId<QScriptValue>()) {
-                *static_cast<NS(QScriptValue) *>(data) = NS(QScriptValue)();
-                return true;
-            } else if (typeCategory(type) != Unknown) {
-                *static_cast<void **>(data) = 0;
-                return true;
-            }
-            break;
-        }
-    }
-
-    return false;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
deleted file mode 100644
index 98d04c1..0000000
--- a/src/declarative/qml/qmlmetatype.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLMETATYPE_H
-#define QMLMETATYPE_H
-
-#include "qmlprivate.h"
-#include "qmlparserstatus.h"
-#include "qmlpropertyvaluesource.h"
-#include "qmlpropertyvalueinterceptor.h"
-#include "qmllist.h"
-
-#include <QtCore/qglobal.h>
-#include <QtCore/qvariant.h>
-#include <QtCore/qbitarray.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlType;
-class QmlCustomParser;
-class Q_DECLARATIVE_EXPORT QmlMetaType
-{
-public:
-    static int registerType(const QmlPrivate::MetaTypeIds &, QObject *(*)(), const char *, int vmaj, int vmin, const char *qmlName, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int pStatus, int object, int valueSource, int valueInterceptor, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *);
-    static int registerInterface(const QmlPrivate::MetaTypeIds &, const char *);
-
-    static bool copy(int type, void *data, const void *copy = 0);
-
-    static QList<QByteArray> qmlTypeNames();
-    static QList<QmlType*> qmlTypes();
-
-    static QmlType *qmlType(const QByteArray &, int, int);
-    static QmlType *qmlType(const QMetaObject *);
-    static QmlType *qmlType(int);
-
-    static QMetaProperty defaultProperty(const QMetaObject *);
-    static QMetaProperty defaultProperty(QObject *);
-    static QMetaMethod defaultMethod(const QMetaObject *);
-    static QMetaMethod defaultMethod(QObject *);
-
-    static bool isQObject(int);
-    static QObject *toQObject(const QVariant &, bool *ok = 0);
-
-    static int listType(int);
-    static int attachedPropertiesFuncId(const QMetaObject *);
-    static QmlAttachedPropertiesFunc attachedPropertiesFuncById(int);
-
-    enum TypeCategory { Unknown, Object, List };
-    static TypeCategory typeCategory(int);
-        
-    static bool isInterface(int);
-    static const char *interfaceIId(int);
-    static bool isList(int);
-
-    typedef QVariant (*StringConverter)(const QString &);
-    static void registerCustomStringConverter(int, StringConverter);
-    static StringConverter customStringConverter(int);
-};
-
-class QmlTypePrivate;
-class Q_DECLARATIVE_EXPORT QmlType
-{
-public:
-    QByteArray typeName() const;
-    QByteArray qmlTypeName() const;
-
-    int majorVersion() const;
-    int minorVersion() const;
-    bool availableInVersion(int vmajor, int vminor) const;
-
-    QObject *create() const;
-
-    QmlCustomParser *customParser() const;
-
-    bool isInterface() const;
-    int typeId() const;
-    int qListTypeId() const;
-
-    const QMetaObject *metaObject() const;
-    const QMetaObject *baseMetaObject() const;
-
-    QmlAttachedPropertiesFunc attachedPropertiesFunction() const;
-    const QMetaObject *attachedPropertiesType() const;
-
-    int parserStatusCast() const;
-    QVariant fromObject(QObject *) const;
-    const char *interfaceIId() const;
-    int propertyValueSourceCast() const;
-    int propertyValueInterceptorCast() const;
-
-    int index() const;
-private:
-    friend class QmlMetaType;
-    friend class QmlTypePrivate;
-    friend struct QmlMetaTypeData;
-    QmlType(int, int, const char *, int);
-    QmlType(int, int, QObject *(*)(), const char *, int, int, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int, int, int, QmlPrivate::CreateFunc, const QMetaObject *, int, QmlCustomParser *);
-    ~QmlType();
-
-    QmlTypePrivate *d;
-};
-
-template<typename T>
-int qmlRegisterType(const char *typeName)
-{
-    QByteArray name(typeName);
-    QmlPrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
-    };
-
-    return QmlMetaType::registerType(ids, 0, 0, 0, 0, 0,
-            &T::staticMetaObject,
-            QmlPrivate::attachedPropertiesFunc<T>(),
-            QmlPrivate::attachedPropertiesMetaObject<T>(),
-            QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), 
-            QmlPrivate::StaticCastSelector<T,QObject>::cast(),
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueSource>::cast(),
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueInterceptor>::cast(),
-            0, 0, 0);
-}
-
-template<typename T>
-int qmlRegisterType(const char *uri, int version_maj, int version_min, const char *qmlName, const char *typeName)
-{
-    QByteArray name(typeName);
-    QmlPrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
-    };
-
-    return QmlMetaType::registerType(ids, QmlPrivate::create<T>, 
-            uri, version_maj, version_min, qmlName, 
-            &T::staticMetaObject,
-            QmlPrivate::attachedPropertiesFunc<T>(),
-            QmlPrivate::attachedPropertiesMetaObject<T>(),
-            QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), 
-            QmlPrivate::StaticCastSelector<T,QObject>::cast(), 
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueSource>::cast(),
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueInterceptor>::cast(),
-            0, 0, 0);
-}
-
-template<typename T, typename E>
-int qmlRegisterExtendedType(const char *typeName)
-{
-    QByteArray name(typeName);
-    QmlPrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
-    };
-
-    QmlAttachedPropertiesFunc attached = 
-        QmlPrivate::attachedPropertiesFunc<E>();
-    const QMetaObject * attachedMo = 
-        QmlPrivate::attachedPropertiesMetaObject<E>();
-    if (!attached) {
-        attached = QmlPrivate::attachedPropertiesFunc<T>();
-        attachedMo = QmlPrivate::attachedPropertiesMetaObject<T>();
-    }
-
-    return QmlMetaType::registerType(ids, 0, 0, 0, 0, 0,
-            &T::staticMetaObject, attached, attachedMo,
-            QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), 
-            QmlPrivate::StaticCastSelector<T,QObject>::cast(),
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueSource>::cast(),
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueInterceptor>::cast(),
-            &QmlPrivate::CreateParent<E>::create, &E::staticMetaObject, 0);
-}
-
-template<typename T, typename E>
-int qmlRegisterExtendedType(const char *uri, int version_maj, int version_min, const char *qmlName, const char *typeName)
-{
-    QByteArray name(typeName);
-    QmlPrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
-    };
-
-    QmlAttachedPropertiesFunc attached = 
-        QmlPrivate::attachedPropertiesFunc<E>();
-    const QMetaObject * attachedMo = 
-        QmlPrivate::attachedPropertiesMetaObject<E>(); 
-    if (!attached) {
-        attached = QmlPrivate::attachedPropertiesFunc<T>();
-        attachedMo = QmlPrivate::attachedPropertiesMetaObject<T>();
-    }
-
-    return QmlMetaType::registerType(ids, QmlPrivate::create<T>, 
-            uri, version_maj, version_min, qmlName, 
-            &T::staticMetaObject,
-            attached, attachedMo,
-            QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), 
-            QmlPrivate::StaticCastSelector<T,QObject>::cast(),
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueSource>::cast(),
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueInterceptor>::cast(),
-            &QmlPrivate::CreateParent<E>::create, 
-            &E::staticMetaObject, 0);
-}
-
-template<typename T>
-int qmlRegisterInterface(const char *typeName)
-{
-    QByteArray name(typeName);
-    QmlPrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
-    };
-
-    return QmlMetaType::registerInterface(ids, qobject_interface_iid<T *>());
-}
-
-template<typename T>
-int qmlRegisterCustomType(const char *uri, int version_maj, int version_min, const char *qmlName, const char *typeName, QmlCustomParser *parser)
-{
-    QByteArray name(typeName);
-    QmlPrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
-    };
-
-    return QmlMetaType::registerType(ids, QmlPrivate::create<T>, 
-            uri, version_maj, version_min, qmlName, 
-            &T::staticMetaObject,
-            QmlPrivate::attachedPropertiesFunc<T>(),
-            QmlPrivate::attachedPropertiesMetaObject<T>(),
-            QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), 
-            QmlPrivate::StaticCastSelector<T,QObject>::cast(),
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueSource>::cast(),
-            QmlPrivate::StaticCastSelector<T,QmlPropertyValueInterceptor>::cast(),
-            0, 0, parser);
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLMETATYPE_H
-
diff --git a/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp b/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp
deleted file mode 100644
index 455d09e..0000000
--- a/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlnetworkaccessmanagerfactory.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlNetworkAccessManagerFactory
-  \since 4.7
-    \brief The QmlNetworkAccessManagerFactory class provides a factory for QNetworkAccessManager
-
-    QNetworkAccessManager is used for all network access by QML.
-    By implementing a factory it is possible to create custom
-    QNetworkAccessManager with specialized caching, proxy and
-    cookie support.
-
-    To implement a factory, subclass QmlNetworkAccessManagerFactory and implement
-    the create() method.
-
-    If the created QNetworkAccessManager becomes invalid, due to a
-    change in proxy settings, for example, call the invalidate() method.
-    This will cause all QNetworkAccessManagers to be recreated.
-
-    Note: the create() method may be called by multiple threads, so ensure the
-    implementation of this method is reentrant.
-*/
-
-/*!
-  The destructor is empty.
- */
-QmlNetworkAccessManagerFactory::~QmlNetworkAccessManagerFactory()
-{
-}
-
-/*!
-    \fn QNetworkAccessManager *QmlNetworkAccessManagerFactory::create(QObject *parent)
-
-    Implement this method to create a QNetworkAccessManager with \a parent.
-    This allows proxies, caching and cookie support to be setup appropriately.
-
-    Note: this method may be called by multiple threads, so ensure the
-    implementation of this method is reentrant.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlnetworkaccessmanagerfactory.h b/src/declarative/qml/qmlnetworkaccessmanagerfactory.h
deleted file mode 100644
index 1660929..0000000
--- a/src/declarative/qml/qmlnetworkaccessmanagerfactory.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLNETWORKACCESSMANAGERFACTORY_H
-#define QMLNETWORKACCESSMANAGERFACTORY_H
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QNetworkAccessManager;
-class Q_DECLARATIVE_EXPORT QmlNetworkAccessManagerFactory
-{
-public:
-    virtual ~QmlNetworkAccessManagerFactory();
-    virtual QNetworkAccessManager *create(QObject *parent) = 0;
-
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLNETWORKACCESSMANAGERFACTORY_H
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
deleted file mode 100644
index 155a7d6..0000000
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ /dev/null
@@ -1,673 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlobjectscriptclass_p.h"
-
-#include "qmlengine_p.h"
-#include "qmlcontext_p.h"
-#include "qmldeclarativedata_p.h"
-#include "qmltypenamescriptclass_p.h"
-#include "qmllistscriptclass_p.h"
-#include "qmlbinding_p.h"
-#include "qmlguard_p.h"
-#include "qmlvmemetaobject_p.h"
-
-#include <QtCore/qtimer.h>
-#include <QtCore/qvarlengtharray.h>
-
-Q_DECLARE_METATYPE(QScriptValue);
-
-QT_BEGIN_NAMESPACE
-
-struct ObjectData : public QScriptDeclarativeClass::Object {
-    ObjectData(QObject *o, int t) : object(o), type(t) {}
-    QmlGuard<QObject> object;
-    int type;
-};
-
-/*
-    The QmlObjectScriptClass handles property access for QObjects
-    via QtScript. It is also used to provide a more useful API in
-    QtScript for QML.
- */
-QmlObjectScriptClass::QmlObjectScriptClass(QmlEngine *bindEngine)
-: QmlScriptClass(QmlEnginePrivate::getScriptEngine(bindEngine)), 
-#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
-  methods(bindEngine),
-#endif
-  lastData(0), engine(bindEngine)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    m_destroy = scriptEngine->newFunction(destroy);
-    m_destroyId = createPersistentIdentifier(QLatin1String("destroy"));
-    m_toString = scriptEngine->newFunction(tostring);
-    m_toStringId = createPersistentIdentifier(QLatin1String("toString"));
-}
-
-QmlObjectScriptClass::~QmlObjectScriptClass()
-{
-}
-
-QScriptValue QmlObjectScriptClass::newQObject(QObject *object, int type) 
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    if (!object)
-        return newObject(scriptEngine, this, new ObjectData(object, type));
-
-    QmlDeclarativeData *ddata = QmlDeclarativeData::get(object, true);
-
-    if (!ddata->scriptValue.isValid()) {
-        ddata->scriptValue = newObject(scriptEngine, this, new ObjectData(object, type));
-        return ddata->scriptValue;
-    } else if (ddata->scriptValue.engine() == QmlEnginePrivate::getScriptEngine(engine)) {
-        return ddata->scriptValue;
-    } else {
-        return newObject(scriptEngine, this, new ObjectData(object, type));
-    }
-}
-
-QObject *QmlObjectScriptClass::toQObject(const QScriptValue &value) const
-{
-    return value.toQObject();
-}
-
-int QmlObjectScriptClass::objectType(const QScriptValue &value) const
-{
-    if (scriptClass(value) != this)
-        return QVariant::Invalid;
-
-    Object *o = object(value);
-    return ((ObjectData*)(o))->type;
-}
-
-QScriptClass::QueryFlags 
-QmlObjectScriptClass::queryProperty(Object *object, const Identifier &name, 
-                                    QScriptClass::QueryFlags flags)
-{
-    return queryProperty(toQObject(object), name, flags, 0);
-}
-
-QScriptClass::QueryFlags 
-QmlObjectScriptClass::queryProperty(QObject *obj, const Identifier &name, 
-                                    QScriptClass::QueryFlags flags, QmlContext *evalContext,
-                                    QueryHints hints)
-{
-    Q_UNUSED(flags);
-    lastData = 0;
-    lastTNData = 0;
-
-    if (name == m_destroyId.identifier ||
-        name == m_toStringId.identifier)
-        return QScriptClass::HandlesReadAccess;
-
-    if (!obj)
-        return 0;
-
-    QmlEnginePrivate *enginePrivate = QmlEnginePrivate::get(engine);
-    lastData = QmlPropertyCache::property(engine, obj, name, local);
-
-    if (lastData)
-        return QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess; 
-
-    if (!(hints & SkipAttachedProperties)) {
-        if (!evalContext && context()) {
-            // Global object, QScriptContext activation object, QmlContext object
-            QScriptValue scopeNode = scopeChainValue(context(), -3);         
-            if (scopeNode.isValid()) {
-                Q_ASSERT(scriptClass(scopeNode) == enginePrivate->contextClass);
-
-                evalContext = enginePrivate->contextClass->contextFromValue(scopeNode);
-            }
-        }
-
-        if (evalContext) {
-            QmlContextPrivate *cp = QmlContextPrivate::get(evalContext);
-
-            if (cp->imports) {
-                QmlTypeNameCache::Data *data = cp->imports->data(name);
-                if (data) {
-                    lastTNData = data;
-                    return QScriptClass::HandlesReadAccess;
-                }
-            }
-        }
-    }
-
-    if (!(hints & ImplicitObject)) {
-        local.coreIndex = -1;
-        lastData = &local;
-        return QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess;
-    }
-
-    return 0;
-}
-
-QmlObjectScriptClass::ScriptValue
-QmlObjectScriptClass::property(Object *object, const Identifier &name)
-{
-    return property(toQObject(object), name);
-}
-
-QmlObjectScriptClass::ScriptValue
-QmlObjectScriptClass::property(QObject *obj, const Identifier &name)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    if (name == m_destroyId.identifier)
-        return Value(scriptEngine, m_destroy);
-    else if (name == m_toStringId.identifier)
-        return Value(scriptEngine, m_toString);
-
-    if (lastData && !lastData->isValid())
-        return Value();
-
-    Q_ASSERT(obj);
-
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);
-
-    if (lastTNData) {
-
-        if (lastTNData->type)
-            return Value(scriptEngine, enginePriv->typeNameClass->newObject(obj, lastTNData->type));
-        else
-            return Value(scriptEngine, enginePriv->typeNameClass->newObject(obj, lastTNData->typeNamespace));
-
-    } else if (lastData->flags & QmlPropertyCache::Data::IsFunction) {
-        if (lastData->flags & QmlPropertyCache::Data::IsVMEFunction) {
-            return Value(scriptEngine, ((QmlVMEMetaObject *)(obj->metaObject()))->vmeMethod(lastData->coreIndex));
-        } else {
-#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
-            // Uncomment to use QtScript method call logic
-            // QScriptValue sobj = scriptEngine->newQObject(obj);
-            // return Value(scriptEngine, sobj.property(toString(name)));
-            return Value(scriptEngine, methods.newMethod(obj, lastData));
-#else
-            QScriptValue sobj = scriptEngine->newQObject(obj);
-            return Value(scriptEngine, sobj.property(toString(name)));
-#endif
-        }
-    } else {
-        if (enginePriv->captureProperties && !(lastData->flags & QmlPropertyCache::Data::IsConstant)) {
-            enginePriv->capturedProperties << 
-                QmlEnginePrivate::CapturedProperty(obj, lastData->coreIndex, lastData->notifyIndex);
-        }
-
-        if ((uint)lastData->propType < QVariant::UserType) {
-            QmlValueType *valueType = enginePriv->valueTypes[lastData->propType];
-            if (valueType)
-                return Value(scriptEngine, enginePriv->valueTypeClass->newObject(obj, lastData->coreIndex, valueType));
-        }
-
-        if (lastData->flags & QmlPropertyCache::Data::IsQList) {
-            return Value(scriptEngine, enginePriv->listClass->newList(obj, lastData->coreIndex, lastData->propType));
-        } else if (lastData->flags & QmlPropertyCache::Data::IsQObjectDerived) {
-            QObject *rv = 0;
-            void *args[] = { &rv, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
-            return Value(scriptEngine, newQObject(rv, lastData->propType));
-        } else if (lastData->flags & QmlPropertyCache::Data::IsQScriptValue) {
-            QScriptValue rv = scriptEngine->nullValue();
-            void *args[] = { &rv, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
-            return Value(scriptEngine, rv);
-        } else if (lastData->propType == QMetaType::QReal) {
-            qreal rv = 0;
-            void *args[] = { &rv, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
-            return Value(scriptEngine, rv);
-        } else if (lastData->propType == QMetaType::Int) {
-            int rv = 0;
-            void *args[] = { &rv, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
-            return Value(scriptEngine, rv);
-        } else if (lastData->propType == QMetaType::Bool) {
-            bool rv = false;
-            void *args[] = { &rv, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
-            return Value(scriptEngine, rv);
-        } else if (lastData->propType == QMetaType::QString) {
-            QString rv;
-            void *args[] = { &rv, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
-            return Value(scriptEngine, rv);
-        } else if (lastData->propType == QMetaType::UInt) {
-            uint rv = 0;
-            void *args[] = { &rv, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
-            return Value(scriptEngine, rv);
-        } else if (lastData->propType == QMetaType::Float) {
-            float rv = 0;
-            void *args[] = { &rv, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
-            return Value(scriptEngine, rv);
-        } else if (lastData->propType == QMetaType::Double) {
-            double rv = 0;
-            void *args[] = { &rv, 0 };
-            QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
-            return Value(scriptEngine, rv);
-        } else {
-            QVariant var = obj->metaObject()->property(lastData->coreIndex).read(obj);
-            return Value(scriptEngine, enginePriv->scriptValueFromVariant(var));
-        }
-
-    }
-}
-
-void QmlObjectScriptClass::setProperty(Object *object, 
-                                       const Identifier &name, 
-                                       const QScriptValue &value)
-{
-    return setProperty(toQObject(object), name, value);
-}
-
-void QmlObjectScriptClass::setProperty(QObject *obj, 
-                                       const Identifier &name, 
-                                       const QScriptValue &value,
-                                       QmlContext *evalContext)
-{
-    Q_UNUSED(name);
-
-    Q_ASSERT(obj);
-    Q_ASSERT(lastData);
-
-    if (!lastData->isValid()) {
-        QString error = QLatin1String("Cannot assign to non-existent property \"") +
-                        toString(name) + QLatin1Char('\"');
-        if (context())
-            context()->throwError(error);
-        return;
-    }
-
-    if (!(lastData->flags & QmlPropertyCache::Data::IsWritable)) {
-        QString error = QLatin1String("Cannot assign to read-only property \"") +
-                        toString(name) + QLatin1Char('\"');
-        if (context())
-            context()->throwError(error);
-        return;
-    }
-
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);
-
-    if (!evalContext && context()) {
-        // Global object, QScriptContext activation object, QmlContext object
-        QScriptValue scopeNode = scopeChainValue(context(), -3);         
-        if (scopeNode.isValid()) {
-            Q_ASSERT(scriptClass(scopeNode) == enginePriv->contextClass);
-
-            evalContext = enginePriv->contextClass->contextFromValue(scopeNode);
-        }
-    }
-
-    QmlAbstractBinding *delBinding = QmlMetaPropertyPrivate::setBinding(obj, *lastData, 0);
-    if (delBinding)
-        delBinding->destroy();
-
-    if (value.isUndefined() && lastData->flags & QmlPropertyCache::Data::IsResettable) {
-        void *a[] = { 0 };
-        QMetaObject::metacall(obj, QMetaObject::ResetProperty, lastData->coreIndex, a);
-    } else {
-        // ### Can well known types be optimized?
-        QVariant v = QmlScriptClass::toVariant(engine, value);
-        QmlMetaPropertyPrivate::write(obj, *lastData, v, evalContext);
-    }
-}
-
-bool QmlObjectScriptClass::isQObject() const
-{
-    return true;
-}
-
-QObject *QmlObjectScriptClass::toQObject(Object *object, bool *ok)
-{
-    if (ok) *ok = true;
-
-    ObjectData *data = (ObjectData*)object;
-    return data->object.data();
-}
-
-QScriptValue QmlObjectScriptClass::tostring(QScriptContext *context, QScriptEngine *)
-{
-    QObject* obj = context->thisObject().toQObject();
-
-    QString ret;
-    if(obj){
-        QString objectName = obj->objectName();
-
-        ret += QString::fromUtf8(obj->metaObject()->className());
-        ret += QLatin1String("(0x");
-        ret += QString::number((intptr_t)obj,16);
-
-        if (!objectName.isEmpty()) {
-            ret += QLatin1String(", \"");
-            ret += objectName;
-            ret += QLatin1Char('\"');
-        }
-
-        ret += QLatin1Char(')');
-    }else{
-        ret += QLatin1String("null");
-    }
-    return QScriptValue(ret);
-}
-
-QScriptValue QmlObjectScriptClass::destroy(QScriptContext *context, QScriptEngine *engine)
-{
-    QObject* obj = context->thisObject().toQObject();
-    if(obj){
-        int delay = 0;
-        if(context->argumentCount() > 0)
-            delay = context->argument(0).toInt32();
-        if (delay > 0)
-            QTimer::singleShot(delay, obj, SLOT(deleteLater()));
-        else
-            obj->deleteLater();
-    }
-    return engine->nullValue();
-}
-
-QStringList QmlObjectScriptClass::propertyNames(Object *object)
-{
-    QObject *obj = toQObject(object);
-    if (!obj)
-        return QStringList();
-
-    QmlEnginePrivate *enginePrivate = QmlEnginePrivate::get(engine);
-
-    QmlPropertyCache *cache = 0;
-    QmlDeclarativeData *ddata = QmlDeclarativeData::get(obj);
-    if (ddata)
-        cache = ddata->propertyCache;
-    if (!cache) {
-        cache = enginePrivate->cache(obj);
-        if (cache && ddata) { cache->addref(); ddata->propertyCache = cache; }
-    }
-
-    if (!cache)
-        return QStringList();
-
-    return cache->propertyNames();
-}
-
-#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
-
-struct MethodData : public QScriptDeclarativeClass::Object {
-    MethodData(QObject *o, const QmlPropertyCache::Data &d) : object(o), data(d) {}
-
-    QmlGuard<QObject> object;
-    QmlPropertyCache::Data data;
-};
-
-QmlObjectMethodScriptClass::QmlObjectMethodScriptClass(QmlEngine *bindEngine)
-: QScriptDeclarativeClass(QmlEnginePrivate::getScriptEngine(bindEngine)), 
-  engine(bindEngine)
-{
-    setSupportsCall(true);
-}
-
-QmlObjectMethodScriptClass::~QmlObjectMethodScriptClass()
-{
-}
-
-QScriptValue QmlObjectMethodScriptClass::newMethod(QObject *object, const QmlPropertyCache::Data *method)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    return newObject(scriptEngine, this, new MethodData(object, *method));
-}
-
-namespace {
-struct MetaCallArgument {
-    inline MetaCallArgument();
-    inline ~MetaCallArgument();
-    inline void *dataPtr();
-
-    inline void initAsType(int type, QmlEngine *);
-    void fromScriptValue(int type, QmlEngine *, const QScriptValue &);
-    inline QScriptDeclarativeClass::Value toValue(QmlEngine *);
-
-private:
-    MetaCallArgument(const MetaCallArgument &);
-    
-    inline void cleanup();
-
-    char *data[16];
-    int type;
-};
-}
-
-MetaCallArgument::MetaCallArgument()
-: type(QVariant::Invalid)
-{
-}
-
-MetaCallArgument::~MetaCallArgument()
-{
-    cleanup();
-}
-
-void MetaCallArgument::cleanup() 
-{
-    if (type == QMetaType::QString) {
-        ((QString *)data)->~QString();
-    } else if (type == -1 || type == qMetaTypeId<QVariant>()) {
-        ((QVariant *)data)->~QVariant();
-    } else if (type == qMetaTypeId<QScriptValue>()) {
-        ((QScriptValue *)data)->~QScriptValue();
-    }
-}
-
-void *MetaCallArgument::dataPtr()
-{
-    if (type == -1) 
-        return ((QVariant *)data)->data();
-    else
-        return (void *)data;
-}
-
-void MetaCallArgument::initAsType(int callType, QmlEngine *e)
-{
-    if (type != 0) { cleanup(); type = 0; }
-    if (callType == 0) return;
-
-    QScriptEngine *engine = QmlEnginePrivate::getScriptEngine(e);
-    
-    if (callType == qMetaTypeId<QScriptValue>()) {
-        new (data) QScriptValue(engine->undefinedValue());
-        type = callType;
-    } else if (callType == QMetaType::Int ||
-               callType == QMetaType::UInt ||
-               callType == QMetaType::Bool ||
-               callType == QMetaType::Double ||
-               callType == QMetaType::Float) {
-        type = callType;
-    } else if (callType == QMetaType::QObjectStar) {
-        *((QObject **)data) = 0;
-        type = callType;
-    } else if (callType == QMetaType::QString) {
-        new (data) QString();
-        type = callType;
-    } else if (callType == qMetaTypeId<QVariant>()) {
-        type = qMetaTypeId<QVariant>();
-        new (data) QVariant();
-    } else {
-        type = -1;
-        new (data) QVariant(callType, (void *)0);
-    }
-}
-
-void MetaCallArgument::fromScriptValue(int callType, QmlEngine *engine, const QScriptValue &value)
-{
-    if (type != 0) { cleanup(); type = 0; }
-
-    if (callType == qMetaTypeId<QScriptValue>()) {
-        new (data) QScriptValue(value);
-        type = qMetaTypeId<QScriptValue>();
-    } else if (callType == QMetaType::Int) {
-        *((int *)data) = int(value.toInt32());
-        type = callType;
-    } else if (callType == QMetaType::UInt) {
-        *((uint *)data) = uint(value.toUInt32());
-        type = callType;
-    } else if (callType == QMetaType::Bool) {
-        *((bool *)data) = value.toBool();
-        type = callType;
-    } else if (callType == QMetaType::Double) {
-        *((double *)data) = double(value.toNumber());
-        type = callType;
-    } else if (callType == QMetaType::Float) {
-        *((float *)data) = float(value.toNumber());
-        type = callType;
-    } else if (callType == QMetaType::QString) {
-        if (value.isNull() || value.isUndefined())
-            new (data) QString();
-        else
-            new (data) QString(value.toString());
-        type = callType;
-    } else if (callType == QMetaType::QObjectStar) {
-        *((QObject **)data) = value.toQObject();
-        type = callType;
-    } else if (callType == qMetaTypeId<QVariant>()) {
-        new (data) QVariant(QmlScriptClass::toVariant(engine, value));
-        type = callType;
-    } else {
-        new (data) QVariant();
-        type = -1;
-
-        QVariant v = QmlScriptClass::toVariant(engine, value);
-        if (v.userType() == callType) {
-            *((QVariant *)data) = v;
-        } else if (v.canConvert((QVariant::Type)callType)) {
-            *((QVariant *)data) = v;
-            ((QVariant *)data)->convert((QVariant::Type)callType);
-        } else {
-            *((QVariant *)data) = QVariant(callType, (void *)0);
-        }
-    }
-}
-
-QScriptDeclarativeClass::Value MetaCallArgument::toValue(QmlEngine *e)
-{
-    QScriptEngine *engine = QmlEnginePrivate::getScriptEngine(e);
-    
-    if (type == qMetaTypeId<QScriptValue>()) {
-        return QScriptDeclarativeClass::Value(engine, *((QScriptValue *)data));
-    } else if (type == QMetaType::Int) {
-        return QScriptDeclarativeClass::Value(engine, *((int *)data));
-    } else if (type == QMetaType::UInt) {
-        return QScriptDeclarativeClass::Value(engine, *((uint *)data));
-    } else if (type == QMetaType::Bool) {
-        return QScriptDeclarativeClass::Value(engine, *((bool *)data));
-    } else if (type == QMetaType::Double) {
-        return QScriptDeclarativeClass::Value(engine, *((double *)data));
-    } else if (type == QMetaType::Float) {
-        return QScriptDeclarativeClass::Value(engine, *((float *)data));
-    } else if (type == QMetaType::QString) {
-        return QScriptDeclarativeClass::Value(engine, *((QString *)data));
-    } else if (type == QMetaType::QObjectStar) {
-        return QScriptDeclarativeClass::Value(engine, QmlEnginePrivate::get(e)->objectClass->newQObject(*((QObject **)data)));
-    } else if (type == -1 || type == qMetaTypeId<QVariant>()) {
-        return QScriptDeclarativeClass::Value(engine, QmlEnginePrivate::get(e)->scriptValueFromVariant(*((QVariant *)data)));
-    } else {
-        return QScriptDeclarativeClass::Value();
-    }
-}
-
-QmlObjectMethodScriptClass::Value QmlObjectMethodScriptClass::call(Object *o, QScriptContext *ctxt)
-{
-    MethodData *method = static_cast<MethodData *>(o);
-
-    if (method->data.flags & QmlPropertyCache::Data::HasArguments) {
-
-        QMetaMethod m = method->object->metaObject()->method(method->data.coreIndex);
-        QList<QByteArray> argTypeNames = m.parameterTypes();
-        QVarLengthArray<int, 9> argTypes(argTypeNames.count());
-
-        // ### Cache
-        for (int ii = 0; ii < argTypeNames.count(); ++ii) {
-            argTypes[ii] = QMetaType::type(argTypeNames.at(ii));
-            if (argTypes[ii] == QVariant::Invalid) 
-                return Value(ctxt, ctxt->throwError(QString::fromLatin1("Unknown method parameter type: %1").arg(QLatin1String(argTypeNames.at(ii)))));
-        }
-
-        if (argTypes.count() > ctxt->argumentCount()) 
-            return Value(ctxt, ctxt->throwError(QLatin1String("Insufficient arguments")));
-
-        QVarLengthArray<MetaCallArgument, 9> args(argTypes.count() + 1);
-        args[0].initAsType(method->data.propType, engine);
-
-        for (int ii = 0; ii < argTypes.count(); ++ii) 
-            args[ii + 1].fromScriptValue(argTypes[ii], engine, ctxt->argument(ii));
-
-        QVarLengthArray<void *, 9> argData(args.count());
-        for (int ii = 0; ii < args.count(); ++ii) 
-            argData[ii] = args[ii].dataPtr();
-
-        QMetaObject::metacall(method->object, QMetaObject::InvokeMetaMethod, method->data.coreIndex, argData.data());
-
-        return args[0].toValue(engine);
-
-    } else if (method->data.propType != 0) {
-
-        MetaCallArgument arg;
-        arg.initAsType(method->data.propType, engine);
-
-        void *args[] = { arg.dataPtr() };
-
-        QMetaObject::metacall(method->object, QMetaObject::InvokeMetaMethod, method->data.coreIndex, args);
-
-        return arg.toValue(engine);
-
-    } else {
-
-        void *args[] = { 0 };
-        QMetaObject::metacall(method->object, QMetaObject::InvokeMetaMethod, method->data.coreIndex, args);
-        return Value();
-
-    }
-    return Value();
-}
-
-#endif
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h
deleted file mode 100644
index 729f34f..0000000
--- a/src/declarative/qml/qmlobjectscriptclass_p.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLOBJECTSCRIPTCLASS_P_H
-#define QMLOBJECTSCRIPTCLASS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlpropertycache_p.h"
-#include "qmltypenamecache_p.h"
-
-#include <private/qmlscriptclass_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QScriptContext;
-class QScriptEngine;
-class QmlContext;
-
-#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
-class Q_AUTOTEST_EXPORT QmlObjectMethodScriptClass : public QScriptDeclarativeClass
-{
-public:
-    QmlObjectMethodScriptClass(QmlEngine *);
-    ~QmlObjectMethodScriptClass();
-
-    QScriptValue newMethod(QObject *, const QmlPropertyCache::Data *);
-protected:
-    virtual Value call(Object *, QScriptContext *);
-
-private:
-    QmlEngine *engine;
-};
-#endif
-
-class Q_AUTOTEST_EXPORT QmlObjectScriptClass : public QmlScriptClass
-{
-public:
-    QmlObjectScriptClass(QmlEngine *);
-    ~QmlObjectScriptClass();
-
-    QScriptValue newQObject(QObject *, int type = QMetaType::QObjectStar);
-    QObject *toQObject(const QScriptValue &) const;
-    int objectType(const QScriptValue &) const;
-
-    enum QueryHint {
-        ImplicitObject = 0x01,
-        SkipAttachedProperties = 0x02
-    };
-    Q_DECLARE_FLAGS(QueryHints, QueryHint)
-
-    QScriptClass::QueryFlags queryProperty(QObject *, const Identifier &, 
-                                           QScriptClass::QueryFlags flags, 
-                                           QmlContext *evalContext,
-                                           QueryHints hints = 0);
-
-    ScriptValue property(QObject *, const Identifier &);
-
-    void setProperty(QObject *, const Identifier &name, const QScriptValue &,
-                     QmlContext *evalContext = 0);
-    virtual QStringList propertyNames(Object *);
-
-protected:
-    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
-                                                   QScriptClass::QueryFlags flags);
-
-    virtual ScriptValue property(Object *, const Identifier &);
-    virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
-    virtual bool isQObject() const;
-    virtual QObject *toQObject(Object *, bool *ok = 0);
-
-private:
-#if (QT_VERSION > QT_VERSION_CHECK(4, 6, 2)) || defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
-    QmlObjectMethodScriptClass methods;
-#endif
-
-    QmlTypeNameCache::Data *lastTNData;
-    QmlPropertyCache::Data *lastData;
-    QmlPropertyCache::Data local;
-
-    PersistentIdentifier m_destroyId;
-    PersistentIdentifier m_toStringId;
-    QScriptValue m_destroy;
-    QScriptValue m_toString;
-
-    static QScriptValue tostring(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue destroy(QScriptContext *context, QScriptEngine *engine);
-
-    QmlEngine *engine;
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QmlObjectScriptClass::QueryHints);
-
-QT_END_NAMESPACE
-
-#endif // QMLOBJECTSCRIPTCLASS_P_H
-
diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp
deleted file mode 100644
index f2690e2..0000000
--- a/src/declarative/qml/qmlparser.cpp
+++ /dev/null
@@ -1,387 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlparser_p.h"
-
-#include "qmlpropertyvaluesource.h"
-#include "qmlvme_p.h"
-#include "qml.h"
-#include "qmlcomponent_p.h"
-#include "qmlcomponent.h"
-#include "qmetaobjectbuilder_p.h"
-#include "qmlvmemetaobject_p.h"
-#include "qmlcompiler_p.h"
-#include "parser/qmljsast_p.h"
-#include "parser/qmljsengine_p.h"
-
-#include <qfxperf_p_p.h>
-
-#include <QStack>
-#include <QColor>
-#include <QPointF>
-#include <QSizeF>
-#include <QRectF>
-#include <QtDebug>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QmlJS;
-using namespace QmlParser;
-
-QmlParser::Object::Object()
-: type(-1), majorVersion(-1), minorVersion(-1), idIndex(-1), metatype(0), defaultProperty(0), parserStatusCast(-1)
-{
-}
-
-QmlParser::Object::~Object() 
-{ 
-    if (defaultProperty) defaultProperty->release();
-    foreach(Property *prop, properties)
-        prop->release();
-    foreach(Property *prop, valueProperties)
-        prop->release();
-    foreach(Property *prop, signalProperties)
-        prop->release();
-    foreach(Property *prop, attachedProperties)
-        prop->release();
-    foreach(Property *prop, groupedProperties)
-        prop->release();
-    foreach(Property *prop, valueTypeProperties)
-        prop->release();
-    typedef QPair<Property *, int> PropPair;
-    foreach(const PropPair &prop, scriptStringProperties)
-        prop.first->release();
-    foreach(const DynamicProperty &prop, dynamicProperties)
-        if (prop.defaultValue) prop.defaultValue->release();
-    foreach(Object *obj, scriptBlockObjects)
-        obj->release();
-}
-
-void Object::setBindingBit(int b)
-{
-    while (bindingBitmask.size() < 4 * (1 + b / 32))
-        bindingBitmask.append(char(0));
-
-    quint32 *bits = (quint32 *)bindingBitmask.data();
-    bits[b / 32] |= (1 << (b % 32));
-}
-
-const QMetaObject *Object::metaObject() const
-{
-    if (!metadata.isEmpty() && metatype)
-        return &extObject;
-    else
-        return metatype;
-}
-
-QmlParser::Property *Object::getDefaultProperty()
-{
-    if (!defaultProperty) {
-        defaultProperty = new Property;
-        defaultProperty->parent = this;
-    }
-    return defaultProperty;
-}
-
-void QmlParser::Object::addValueProperty(Property *p)
-{
-    p->addref();
-    valueProperties << p;
-}
-
-void QmlParser::Object::addSignalProperty(Property *p)
-{
-    p->addref();
-    signalProperties << p;
-}
-
-void QmlParser::Object::addAttachedProperty(Property *p)
-{
-    p->addref();
-    attachedProperties << p;
-}
-
-void QmlParser::Object::addGroupedProperty(Property *p)
-{
-    p->addref();
-    groupedProperties << p;
-}
-
-void QmlParser::Object::addValueTypeProperty(Property *p)
-{
-    p->addref();
-    valueTypeProperties << p;
-}
-
-void QmlParser::Object::addScriptStringProperty(Property *p, int stack)
-{
-    p->addref();
-    scriptStringProperties << qMakePair(p, stack);
-}
-
-
-Property *QmlParser::Object::getProperty(const QByteArray &name, bool create)
-{
-    if (!properties.contains(name)) {
-        if (create) {
-            Property *property = new Property(name);
-            property->parent = this;
-            properties.insert(name, property);
-        } else {
-            return 0;
-        }
-    }
-    return properties[name];
-}
-
-QmlParser::Object::DynamicProperty::DynamicProperty()
-: isDefaultProperty(false), type(Variant), defaultValue(0)
-{
-}
-
-QmlParser::Object::DynamicProperty::DynamicProperty(const DynamicProperty &o)
-: isDefaultProperty(o.isDefaultProperty),
-  type(o.type),
-  customType(o.customType),
-  name(o.name),
-  defaultValue(o.defaultValue),
-  location(o.location)
-{
-}
-
-QmlParser::Object::DynamicSignal::DynamicSignal()
-{
-}
-
-QmlParser::Object::DynamicSignal::DynamicSignal(const DynamicSignal &o)
-: name(o.name), parameterTypes(o.parameterTypes), 
-  parameterNames(o.parameterNames)
-{
-}
-
-QmlParser::Object::DynamicSlot::DynamicSlot()
-{
-}
-
-QmlParser::Object::DynamicSlot::DynamicSlot(const DynamicSlot &o)
-: name(o.name), body(o.body), parameterNames(o.parameterNames)
-{
-}
-
-QmlParser::Property::Property()
-: parent(0), type(0), index(-1), value(0), isDefault(true), isDeferred(false)
-{
-}
-
-QmlParser::Property::Property(const QByteArray &n)
-: parent(0), type(0), index(-1), value(0), name(n), isDefault(false), 
-  isDeferred(false)
-{
-}
-
-QmlParser::Property::~Property() 
-{ 
-    foreach(Value *value, values)
-        value->release();
-    if (value) value->release(); 
-}
-
-Object *QmlParser::Property::getValue()
-{
-    if (!value) value = new Object;
-    return value;
-}
-
-void QmlParser::Property::addValue(Value *v)
-{
-    values << v;
-}
-
-bool QmlParser::Property::isEmpty() const
-{
-    return !value && values.isEmpty();
-}
-
-QmlParser::Value::Value()
-: type(Unknown), object(0)
-{
-}
-
-QmlParser::Value::~Value() 
-{ 
-    if (object) object->release();
-}
-
-QmlParser::Variant::Variant()
-: t(Invalid) {}
-
-QmlParser::Variant::Variant(const Variant &o)
-: t(o.t), d(o.d), s(o.s)
-{
-}
-
-QmlParser::Variant::Variant(bool v)
-: t(Boolean), b(v)
-{
-}
-
-QmlParser::Variant::Variant(double v, const QString &asWritten)
-: t(Number), d(v), s(asWritten)
-{
-}
-
-QmlParser::Variant::Variant(const QString &v)
-: t(String), s(v)
-{
-}
-
-QmlParser::Variant::Variant(const QString &v, QmlJS::AST::Node *n)
-: t(Script), n(n), s(v)
-{
-}
-
-QmlParser::Variant &QmlParser::Variant::operator=(const Variant &o)
-{
-    t = o.t;
-    d = o.d;
-    s = o.s;
-    return *this;
-}
-
-QmlParser::Variant::Type QmlParser::Variant::type() const
-{
-    return t;
-}
-
-bool QmlParser::Variant::asBoolean() const
-{
-    return b;
-}
-
-QString QmlParser::Variant::asString() const
-{
-    return s;
-}
-
-double QmlParser::Variant::asNumber() const
-{
-    return d;
-}
-
-QString QmlParser::Variant::asScript() const
-{
-    switch(type()) { 
-    default:
-    case Invalid:
-        return QString();
-    case Boolean:
-        return b?QLatin1String("true"):QLatin1String("false");
-    case Number:
-        if (s.isEmpty())
-            return QString::number(d);
-        else
-            return s;
-    case String:
-    case Script:
-        return s;
-    }
-}
-
-QmlJS::AST::Node *QmlParser::Variant::asAST() const
-{
-    if (type() == Script)
-        return n;
-    else
-        return 0;
-}
-
-bool QmlParser::Variant::isStringList() const
-{
-    if (isString())
-        return true;
-
-    if (type() != Script || !n)
-        return false;
-
-    AST::ArrayLiteral *array = AST::cast<AST::ArrayLiteral *>(n);
-    if (!array)
-        return false;
-
-    AST::ElementList *elements = array->elements;
-
-    while (elements) {
-
-        if (!AST::cast<AST::StringLiteral *>(elements->expression))
-            return false;
-
-        elements = elements->next;
-    }
-
-    return true;
-}
-
-QStringList QmlParser::Variant::asStringList() const
-{
-    QStringList rv;
-    if (isString()) {
-        rv << asString();
-        return rv;
-    }
-
-    AST::ArrayLiteral *array = AST::cast<AST::ArrayLiteral *>(n);
-    if (!array)
-        return rv;
-
-    AST::ElementList *elements = array->elements;
-    while (elements) {
-
-        AST::StringLiteral *string = AST::cast<AST::StringLiteral *>(elements->expression);
-        if (!string)
-            return QStringList();
-        rv.append(string->value->asString());
-
-        elements = elements->next;
-    }
-
-    return  rv;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
deleted file mode 100644
index 222229b..0000000
--- a/src/declarative/qml/qmlparser_p.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPARSER_P_H
-#define QMLPARSER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qml.h"
-#include "qmlrefcount_p.h"
-
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/qstring.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-namespace QmlJS { namespace AST { class Node; } }
-
-/*
-    XXX
-
-    These types are created (and owned) by the QmlXmlParser and consumed by the 
-    QmlCompiler.  During the compilation phase the compiler will update some of
-    the fields for both its own use and for the use of the upcoming QmlDom API.
-
-    The types are part of the generic sounding "QmlParser" namespace for legacy 
-    reasons (there used to be more in this namespace) and will be cleaned up and
-    migrated into a more appropriate location shortly.
-*/
-namespace QmlParser
-{
-    struct Location 
-    {
-        Location() : line(-1), column(-1) {}
-        int line;
-        int column;
-    };
-
-    struct LocationRange
-    {
-        LocationRange() : offset(0), length(0) {}
-        quint32 offset;
-        quint32 length;
-    };
-
-    struct LocationSpan
-    {
-        Location start;
-        Location end;
-        LocationRange range;
-    };
-
-    class Property;
-    class Object : public QmlRefCount
-    {
-    public:
-        Object();
-        virtual ~Object(); 
-
-        // Type of the object.  The integer is an index into the 
-        // QmlCompiledData::types array, or -1 if the object is a property
-        // group.
-        int type;
-        // The url of this object if it is an external type.  Used by the DOM
-        QUrl url;
-
-        // version information if type is defined in library or C++
-        int majorVersion;
-        int minorVersion;
-
-        // The fully-qualified name of this type
-        QByteArray typeName;
-        // The class name
-        QByteArray className;
-        // The id assigned to the object (if any).  Set by the QmlCompiler
-        QString id;
-        // The id index assigned to the object (if any).  Set by the QmlCompiler
-        int idIndex;
-        // Custom parsed data
-        QByteArray custom;
-        // Bit mask of the properties assigned bindings
-        QByteArray bindingBitmask; 
-        void setBindingBit(int);
-        // Returns the metaobject for this type, or 0 if not available.  
-        // Internally selectd between the metatype and extObject variables
-        const QMetaObject *metaObject() const;
-
-        // The compile time metaobject for this type
-        const QMetaObject *metatype;
-        // The synthesized metaobject, if QML added signals or properties to
-        // this type.  Otherwise null
-        QAbstractDynamicMetaObject extObject;
-        QByteArray metadata; // Generated by compiler
-        QByteArray synthdata; // Generated by compiler
-
-        Property *getDefaultProperty();
-        Property *getProperty(const QByteArray &name, bool create=true);
-
-        Property *defaultProperty;
-        QHash<QByteArray, Property *> properties;
-
-        QList<Object *> scriptBlockObjects;
-
-        // Output of the compilation phase (these properties continue to exist
-        // in either the defaultProperty or properties members too)
-        void addValueProperty(Property *);
-        void addSignalProperty(Property *);
-        void addAttachedProperty(Property *);
-        void addGroupedProperty(Property *);
-        void addValueTypeProperty(Property *);
-        void addScriptStringProperty(Property *, int = 0);
-        QList<Property *> valueProperties;
-        QList<Property *> signalProperties;
-        QList<Property *> attachedProperties;
-        QList<Property *> groupedProperties;
-        QList<Property *> valueTypeProperties;
-        QList<QPair<Property *, int> > scriptStringProperties;
-
-        // Script blocks that were nested under this object
-        struct ScriptBlock {
-            QStringList codes;
-            QStringList files;
-            QList<int> lineNumbers;
-        };
-        QList<ScriptBlock> scripts;
-
-        // The bytes to cast instances by to get to the QmlParserStatus 
-        // interface.  -1 indicates the type doesn't support this interface.
-        // Set by the QmlCompiler.
-        int parserStatusCast;
-
-        LocationSpan location;
-
-        struct DynamicProperty {
-            DynamicProperty();
-            DynamicProperty(const DynamicProperty &);
-
-            enum Type { Variant, Int, Bool, Real, String, Url, Color, Date, Alias, Custom, CustomList };
-
-            bool isDefaultProperty;
-            Type type;
-            QByteArray customType;
-            QByteArray name;
-            QmlParser::Property *defaultValue;
-            LocationSpan location;
-        };
-        struct DynamicSignal {
-            DynamicSignal();
-            DynamicSignal(const DynamicSignal &);
-
-            QByteArray name;
-            QList<QByteArray> parameterTypes;
-            QList<QByteArray> parameterNames;
-        };
-        struct DynamicSlot {
-            DynamicSlot();
-            DynamicSlot(const DynamicSlot &);
-
-            QByteArray name;
-            QString body;
-            QList<QByteArray> parameterNames;
-        };
-
-        // The list of dynamic properties
-        QList<DynamicProperty> dynamicProperties;
-        // The list of dynamic signals
-        QList<DynamicSignal> dynamicSignals;
-        // The list of dynamic slots
-        QList<DynamicSlot> dynamicSlots;
-    };
-
-    class Variant 
-    {
-    public:
-        enum Type {
-            Invalid,
-            Boolean,
-            Number,
-            String,
-            Script
-        };
-
-        Variant();
-        Variant(const Variant &);
-        Variant(bool);
-        Variant(double, const QString &asWritten=QString());
-        Variant(const QString &);
-        Variant(const QString &, QmlJS::AST::Node *);
-        Variant &operator=(const Variant &);
-
-        Type type() const;
-
-        bool isBoolean() const { return type() == Boolean; }
-        bool isNumber() const { return type() == Number; }
-        bool isString() const { return type() == String; }
-        bool isScript() const { return type() == Script; }
-        bool isStringList() const;
-
-        bool asBoolean() const;
-        QString asString() const;
-        double asNumber() const;
-        QString asScript() const;
-        QmlJS::AST::Node *asAST() const;
-        QStringList asStringList() const;
-
-    private:
-        Type t;
-        union {
-            bool b;
-            double d;
-            QmlJS::AST::Node *n;
-        };
-        QString s;
-    };
-
-    class Value : public QmlRefCount
-    {
-    public:
-        Value();
-        virtual ~Value();
-
-        enum Type {
-            // The type of this value assignment is not yet known
-            Unknown,
-            // This is used as a literal property assignment
-            Literal,
-            // This is used as a property binding assignment
-            PropertyBinding,
-            // This is used as a QmlPropertyValueSource assignment
-            ValueSource,
-            // This is used as a QmlPropertyValueInterceptor assignment
-            ValueInterceptor,
-            // This is used as a property QObject assignment
-            CreatedObject,
-            // This is used as a signal object assignment
-            SignalObject,
-            // This is used as a signal expression assignment
-            SignalExpression,
-            // This is used as an id assignment only
-            Id
-        };
-        Type type;
-
-        // ### Temporary
-        QString primitive() const { return value.asScript(); }
-
-        // Primitive value
-        Variant value;
-        // Object value
-        Object *object;
-
-        LocationSpan location;
-    };
-
-    class Property : public QmlRefCount
-    {
-    public:
-        Property();
-        Property(const QByteArray &n);
-        virtual ~Property();
-
-        // The Object to which this property is attached
-        Object *parent;
-
-        Object *getValue();
-        void addValue(Value *v);
-
-        // The QVariant::Type of the property, or 0 (QVariant::Invalid) if 
-        // unknown.
-        int type;
-        // The metaobject index of this property, or -1 if unknown.
-        int index;
-
-        // Returns true if this is an empty property - both value and values
-        // are unset.
-        bool isEmpty() const;
-        // The list of values assigned to this property.  Content in values
-        // and value are mutually exclusive
-        QList<Value *> values;
-        // The accessed property.  This is used to represent dot properties.
-        // Content in value and values are mutually exclusive.
-        Object *value;
-        // The property name
-        QByteArray name;
-        // True if this property was accessed as the default property.  
-        bool isDefault;
-        // True if the setting of this property will be deferred.  Set by the
-        // QmlCompiler
-        bool isDeferred;
-
-        LocationSpan location;
-        LocationRange listValueRange;
-        QList<int> listCommaPositions;
-    };
-}
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QmlParser::Variant)
-
-QT_END_HEADER
-
-#endif // QMLPARSER_P_H
diff --git a/src/declarative/qml/qmlparserstatus.cpp b/src/declarative/qml/qmlparserstatus.cpp
deleted file mode 100644
index 315bc75..0000000
--- a/src/declarative/qml/qmlparserstatus.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlparserstatus.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlParserStatus
-  \since 4.7
-    \brief The QmlParserStatus class provides updates on the parser state.
-*/
-
-/*! \internal */
-QmlParserStatus::QmlParserStatus()
-: d(0)
-{
-}
-
-/*! \internal */
-QmlParserStatus::~QmlParserStatus()
-{
-    if(d)
-        (*d) = 0;
-}
-
-/*!
-    Invoked after class creation, but before any properties have been set.
-*/
-void QmlParserStatus::classBegin()
-{
-}
-
-/*!
-    Invoked after the root component that caused this instantiation has 
-    completed construction.  At this point all static values and binding values
-    have been assigned to the class.
-*/
-void QmlParserStatus::componentComplete()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlparserstatus.h b/src/declarative/qml/qmlparserstatus.h
deleted file mode 100644
index e4cfe8b..0000000
--- a/src/declarative/qml/qmlparserstatus.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPARSERSTATUS_H
-#define QMLPARSERSTATUS_H
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QmlParserStatus
-{
-public:
-    QmlParserStatus();
-    virtual ~QmlParserStatus();
-
-    virtual void classBegin();
-    virtual void componentComplete();
-
-private:
-    friend class QmlVME;
-    friend class QmlComponent;
-    friend class QmlComponentPrivate;
-    friend class QmlEnginePrivate;
-    QmlParserStatus **d;
-};
-Q_DECLARE_INTERFACE(QmlParserStatus, "com.trolltech.qml.QmlParserStatus")
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLPARSERSTATUS_H
diff --git a/src/declarative/qml/qmlprivate.cpp b/src/declarative/qml/qmlprivate.cpp
deleted file mode 100644
index f85e280..0000000
--- a/src/declarative/qml/qmlprivate.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlprivate.h"
-
-QT_BEGIN_NAMESPACE
-
-QmlPrivate::InstanceType::InstanceType(int) {}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlprivate.h b/src/declarative/qml/qmlprivate.h
deleted file mode 100644
index e5ea07f..0000000
--- a/src/declarative/qml/qmlprivate.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPRIVATE_H
-#define QMLPRIVATE_H
-
-#include <QtCore/qglobal.h>
-
-#ifndef Q_OS_WIN
-#include <stdint.h>
-#endif
-#include <QtCore/qvariant.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-typedef QObject *(*QmlAttachedPropertiesFunc)(QObject *);
-
-//template<typename T>
-//struct qml_hasAttached { static bool const value = false; };
-
-template <typename TYPE>
-class QmlTypeInfo
-{
-public:
-    enum {
-        hasAttachedProperties = 0
-    };
-};
-
-
-namespace QmlPrivate
-{
-    template<typename T>
-    QObject *create() { return new T; }
-
-    template<class From, class To, int N>
-    struct StaticCastSelectorClass
-    {
-        static inline int cast() { return -1; }
-    };
-
-    template<class From, class To>
-    struct StaticCastSelectorClass<From, To, sizeof(int)>
-    {
-        static inline int cast() { return (int)((intptr_t)static_cast<To *>((From *)0x10000000)) - 0x10000000; }
-    };
-
-    template<class From, class To>
-    struct StaticCastSelector
-    {
-        typedef int yes_type;
-        typedef char no_type;
-
-        static yes_type check(To *);
-        static no_type check(...);
-
-        static inline int cast()
-        {
-            return StaticCastSelectorClass<From, To, sizeof(check((From *)0))>::cast();
-        }
-    };
-
-    template <typename T>
-    struct has_attachedPropertiesMember
-    {
-        static bool const value = QmlTypeInfo<T>::hasAttachedProperties;
-    };
-
-    template <typename T, bool hasMember>
-    class has_attachedPropertiesMethod 
-    {
-        typedef int yes_type;
-        typedef char no_type;
-
-        template<typename ReturnType>
-        static yes_type check(ReturnType *(*)(QObject *));
-        static no_type check(...);
-
-    public:
-        static bool const value = sizeof(check(&T::qmlAttachedProperties)) == sizeof(yes_type);
-    }; 
-
-    template <typename T>
-    class has_attachedPropertiesMethod<T, false>
-    {
-    public:
-        static bool const value = false;
-    };
-
-    template<typename T, int N>
-    class AttachedPropertySelector
-    {
-    public:
-        static inline QmlAttachedPropertiesFunc func() { return 0; }
-        static inline const QMetaObject *metaObject() { return 0; }
-    };
-    template<typename T>
-    class AttachedPropertySelector<T, 1>
-    {
-        static inline QObject *attachedProperties(QObject *obj) {
-            return T::qmlAttachedProperties(obj);
-        }
-        template<typename ReturnType>
-        static inline const QMetaObject *attachedPropertiesMetaObject(ReturnType *(*)(QObject *)) {
-            return &ReturnType::staticMetaObject;
-        }
-    public:
-        static inline QmlAttachedPropertiesFunc func() {
-            return &attachedProperties;
-        }
-        static inline const QMetaObject *metaObject() {
-            return attachedPropertiesMetaObject(&T::qmlAttachedProperties);
-        }
-    };
-
-    template<typename T>
-    inline QmlAttachedPropertiesFunc attachedPropertiesFunc()
-    {
-        return AttachedPropertySelector<T, has_attachedPropertiesMethod<T, has_attachedPropertiesMember<T>::value>::value>::func();
-    }
-
-    template<typename T>
-    inline const QMetaObject *attachedPropertiesMetaObject()
-    {
-        return AttachedPropertySelector<T, has_attachedPropertiesMethod<T, has_attachedPropertiesMember<T>::value>::value>::metaObject();
-    }
-
-    struct MetaTypeIds {
-        int typeId;
-        int listId;
-    };
-    typedef QObject *(*CreateFunc)(QObject *);
-
-    template<typename T>
-    struct CreateParent {
-        static QObject *create(QObject *other) {
-            return new T(other);
-        }
-    };
-
-    template<typename T>
-    struct CreateNoParent {
-        static QObject *create() {
-            return new T;
-        }
-    };
-
-    struct Q_DECLARATIVE_EXPORT InstanceType {
-       InstanceType(int);
-    };
-
-    template<typename T, int VMAJ, int VMIN>
-    struct Define {
-        static InstanceType instance;
-    };
-  
-    template<typename T>
-    struct ExtCreate {
-        static QObject *create(QObject *other) {
-            return new T(other);
-        }
-    };
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLPRIVATE_H
diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
deleted file mode 100644
index 81f8e51..0000000
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ /dev/null
@@ -1,423 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlpropertycache_p.h"
-
-#include "qmlengine_p.h"
-#include "qmlbinding_p.h"
-#include <QtCore/qdebug.h>
-
-Q_DECLARE_METATYPE(QScriptValue);
-
-QT_BEGIN_NAMESPACE
-
-QmlPropertyCache::Data::Flags QmlPropertyCache::Data::flagsForProperty(const QMetaProperty &p, QmlEngine *engine) 
-{
-    int propType = p.userType();
-
-    Flags flags;
-
-    if (p.isConstant())
-        flags |= Data::IsConstant;
-    if (p.isWritable())
-        flags |= Data::IsWritable;
-    if (p.isResettable())
-        flags |= Data::IsResettable;
-
-    if (propType == qMetaTypeId<QmlBinding *>()) {
-        flags |= Data::IsQmlBinding;
-    } else if (propType == qMetaTypeId<QScriptValue>()) {
-        flags |= Data::IsQScriptValue;
-    } else if (p.isEnumType()) {
-        flags |= Data::IsEnumType;
-    } else {
-        QmlMetaType::TypeCategory cat = engine ? QmlEnginePrivate::get(engine)->typeCategory(propType)
-                                               : QmlMetaType::typeCategory(propType);
-        if (cat == QmlMetaType::Object)
-            flags |= Data::IsQObjectDerived;
-        else if (cat == QmlMetaType::List)
-            flags |= Data::IsQList;
-    }
-
-    return flags;
-}
-
-void QmlPropertyCache::Data::load(const QMetaProperty &p, QmlEngine *engine)
-{
-    propType = p.userType();
-    if (QVariant::Type(propType) == QVariant::LastType)
-        propType = qMetaTypeId<QVariant>();
-    coreIndex = p.propertyIndex();
-    notifyIndex = p.notifySignalIndex();
-    flags = flagsForProperty(p, engine);
-}
-
-void QmlPropertyCache::Data::load(const QMetaMethod &m)
-{
-    coreIndex = m.methodIndex();
-    flags |= Data::IsFunction;
-    propType = QVariant::Invalid;
-
-    const char *returnType = m.typeName();
-    if (returnType) 
-        propType = QMetaType::type(returnType);
-
-    QList<QByteArray> params = m.parameterTypes();
-    if (!params.isEmpty())
-        flags |= Data::HasArguments;
-}
-
-
-QmlPropertyCache::QmlPropertyCache(QmlEngine *e)
-: QmlCleanup(e), engine(e)
-{
-}
-
-QmlPropertyCache::~QmlPropertyCache()
-{
-    clear();
-}
-
-void QmlPropertyCache::clear()
-{
-    for (int ii = 0; ii < indexCache.count(); ++ii) 
-        indexCache.at(ii)->release();
-
-    for (StringCache::ConstIterator iter = stringCache.begin(); 
-            iter != stringCache.end(); ++iter)
-        (*iter)->release();
-
-    for (IdentifierCache::ConstIterator iter = identifierCache.begin(); 
-            iter != identifierCache.end(); ++iter)
-        (*iter)->release();
-
-    indexCache.clear();
-    stringCache.clear();
-    identifierCache.clear();
-}
-
-QmlPropertyCache::Data QmlPropertyCache::create(const QMetaObject *metaObject, 
-                                                const QString &property)
-{
-    Q_ASSERT(metaObject);
-
-    QmlPropertyCache::Data rv;
-    int idx = metaObject->indexOfProperty(property.toUtf8());
-    if (idx != -1) {
-        rv.load(metaObject->property(idx));
-        return rv;
-    }
-
-    int methodCount = metaObject->methodCount();
-    for (int ii = methodCount - 1; ii >= 0; --ii) {
-        QMetaMethod m = metaObject->method(ii);
-        if (m.access() == QMetaMethod::Private)
-            continue;
-        QString methodName = QString::fromUtf8(m.signature());
-
-        int parenIdx = methodName.indexOf(QLatin1Char('('));
-        Q_ASSERT(parenIdx != -1);
-        methodName = methodName.left(parenIdx);
-
-        if (methodName == property) {
-            rv.load(m);
-            return rv;
-        }
-    }
-
-    return rv;
-}
-
-QmlPropertyCache *QmlPropertyCache::copy() const
-{
-    QmlPropertyCache *cache = new QmlPropertyCache(engine);
-    cache->indexCache = indexCache;
-    cache->stringCache = stringCache;
-    cache->identifierCache = identifierCache;
-
-    for (int ii = 0; ii < indexCache.count(); ++ii)
-        indexCache.at(ii)->addref();
-    for (StringCache::ConstIterator iter = stringCache.begin(); iter != stringCache.end(); ++iter)
-        (*iter)->addref();
-    for (IdentifierCache::ConstIterator iter = identifierCache.begin(); iter != identifierCache.end(); ++iter)
-        (*iter)->addref();
-
-    return cache;
-}
-
-void QmlPropertyCache::append(QmlEngine *engine, const QMetaObject *metaObject, 
-                              Data::Flag propertyFlags, Data::Flag methodFlags)
-{
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);
-
-    int propCount = metaObject->propertyCount();
-    int propOffset = metaObject->propertyOffset();
-
-    indexCache.resize(propCount);
-    for (int ii = propOffset; ii < propCount; ++ii) {
-        QMetaProperty p = metaObject->property(ii);
-        QString propName = QString::fromUtf8(p.name());
-
-        RData *data = new RData;
-        data->identifier = enginePriv->objectClass->createPersistentIdentifier(propName);
-
-        data->load(p, engine);
-        data->flags |= propertyFlags;
-
-        indexCache[ii] = data;
-
-        if (stringCache.contains(propName)) {
-            stringCache[propName]->release();
-            identifierCache[data->identifier.identifier]->release();
-        }
-
-        stringCache.insert(propName, data);
-        identifierCache.insert(data->identifier.identifier, data);
-        data->addref();
-        data->addref();
-    }
-
-    int methodCount = metaObject->methodCount();
-    int methodOffset = metaObject->methodOffset();
-    for (int ii = methodOffset; ii < methodCount; ++ii) {
-        QMetaMethod m = metaObject->method(ii);
-        if (m.access() == QMetaMethod::Private)
-            continue;
-        QString methodName = QString::fromUtf8(m.signature());
-
-        int parenIdx = methodName.indexOf(QLatin1Char('('));
-        Q_ASSERT(parenIdx != -1);
-        methodName = methodName.left(parenIdx);
-
-        RData *data = new RData;
-        data->identifier = enginePriv->objectClass->createPersistentIdentifier(methodName);
-
-        if (stringCache.contains(methodName)) {
-            stringCache[methodName]->release();
-            identifierCache[data->identifier.identifier]->release();
-        }
-
-        data->load(m);
-        if (m.methodType() == QMetaMethod::Slot || m.methodType() == QMetaMethod::Method) 
-            data->flags |= methodFlags;
-
-        stringCache.insert(methodName, data);
-        identifierCache.insert(data->identifier.identifier, data);
-        data->addref();
-    }
-}
-
-// ### Optimize - check engine for the parent meta object etc.
-QmlPropertyCache *QmlPropertyCache::create(QmlEngine *engine, const QMetaObject *metaObject)
-{
-    Q_ASSERT(engine);
-    Q_ASSERT(metaObject);
-
-    QmlPropertyCache *cache = new QmlPropertyCache(engine);
-    cache->update(engine, metaObject);
-    return cache;
-}
-
-void QmlPropertyCache::update(QmlEngine *engine, const QMetaObject *metaObject)
-{
-    Q_ASSERT(engine);
-    Q_ASSERT(metaObject);
-    QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);
-
-    clear();
-
-    // ### The properties/methods should probably be spliced on a per-metaobject basis
-    int propCount = metaObject->propertyCount();
-
-    indexCache.resize(propCount);
-    for (int ii = propCount - 1; ii >= 0; --ii) {
-        QMetaProperty p = metaObject->property(ii);
-        QString propName = QString::fromUtf8(p.name());
-
-        RData *data = new RData;
-        data->identifier = enginePriv->objectClass->createPersistentIdentifier(propName);
-
-        data->load(p, engine);
-
-        indexCache[ii] = data;
-
-        if (stringCache.contains(propName))
-            continue;
-
-        stringCache.insert(propName, data);
-        identifierCache.insert(data->identifier.identifier, data);
-        data->addref();
-        data->addref();
-    }
-
-    int methodCount = metaObject->methodCount();
-    for (int ii = methodCount - 1; ii >= 0; --ii) {
-        QMetaMethod m = metaObject->method(ii);
-        if (m.access() == QMetaMethod::Private)
-            continue;
-        QString methodName = QString::fromUtf8(m.signature());
-
-        int parenIdx = methodName.indexOf(QLatin1Char('('));
-        Q_ASSERT(parenIdx != -1);
-        methodName = methodName.left(parenIdx);
-
-        if (stringCache.contains(methodName))
-            continue;
-
-        RData *data = new RData;
-        data->identifier = enginePriv->objectClass->createPersistentIdentifier(methodName);
-
-        data->load(m);
-
-        stringCache.insert(methodName, data);
-        identifierCache.insert(data->identifier.identifier, data);
-        data->addref();
-    }
-}
-
-QmlPropertyCache::Data *
-QmlPropertyCache::property(int index) const
-{
-    if (index < 0 || index >= indexCache.count())
-        return 0;
-
-    return indexCache.at(index);
-}
-
-QmlPropertyCache::Data *
-QmlPropertyCache::property(const QString &str) const
-{
-    return stringCache.value(str);
-}
-
-QString QmlPropertyCache::Data::name(QObject *object)
-{
-    if (!object)
-        return QString();
-
-    return name(object->metaObject());
-}
-
-QString QmlPropertyCache::Data::name(const QMetaObject *metaObject)
-{
-    if (!metaObject || coreIndex == -1)
-        return QString();
-
-    if (flags & IsFunction) {
-        QMetaMethod m = metaObject->method(coreIndex);
-
-        QString name = QString::fromUtf8(m.signature());
-        int parenIdx = name.indexOf(QLatin1Char('('));
-        if (parenIdx != -1)
-            name = name.left(parenIdx);
-        return name;
-    } else {
-        QMetaProperty p = metaObject->property(coreIndex);
-        return QString::fromUtf8(p.name());
-    }
-}
-
-QStringList QmlPropertyCache::propertyNames() const
-{
-    return stringCache.keys();
-}
-
-QmlPropertyCache::Data *QmlPropertyCache::property(QmlEngine *engine, QObject *obj, 
-                                                   const QScriptDeclarativeClass::Identifier &name, Data &local)
-{
-    QmlPropertyCache::Data *rv = 0;
-
-    QmlEnginePrivate *enginePrivate = QmlEnginePrivate::get(engine);
-
-    QmlPropertyCache *cache = 0;
-    QmlDeclarativeData *ddata = QmlDeclarativeData::get(obj);
-    if (ddata && ddata->propertyCache && ddata->propertyCache->qmlEngine() == engine)
-        cache = ddata->propertyCache;
-    if (!cache) {
-        cache = enginePrivate->cache(obj);
-        if (cache && ddata && !ddata->propertyCache) { cache->addref(); ddata->propertyCache = cache; }
-    }
-
-    if (cache) {
-        rv = cache->property(name);
-    } else {
-        local = QmlPropertyCache::create(obj->metaObject(), enginePrivate->objectClass->toString(name));
-        if (local.isValid())
-            rv = &local;
-    }
-
-    return rv;
-}
-
-QmlPropertyCache::Data *QmlPropertyCache::property(QmlEngine *engine, QObject *obj, 
-                                                   const QString &name, Data &local)
-{
-    QmlPropertyCache::Data *rv = 0;
-
-    if (!engine) {
-        local = QmlPropertyCache::create(obj->metaObject(), name);
-        if (local.isValid())
-            rv = &local;
-    } else {
-        QmlEnginePrivate *enginePrivate = QmlEnginePrivate::get(engine);
-
-        QmlPropertyCache *cache = 0;
-        QmlDeclarativeData *ddata = QmlDeclarativeData::get(obj);
-        if (ddata && ddata->propertyCache && ddata->propertyCache->qmlEngine() == engine)
-            cache = ddata->propertyCache;
-        if (!cache) {
-            cache = enginePrivate->cache(obj);
-            if (cache && ddata && !ddata->propertyCache) { cache->addref(); ddata->propertyCache = cache; }
-        }
-
-        if (cache) {
-            rv = cache->property(name);
-        } else {
-            local = QmlPropertyCache::create(obj->metaObject(), name);
-            if (local.isValid())
-                rv = &local;
-        }
-    }
-
-    return rv;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlpropertycache_p.h b/src/declarative/qml/qmlpropertycache_p.h
deleted file mode 100644
index 4a98b88..0000000
--- a/src/declarative/qml/qmlpropertycache_p.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPROPERTYCACHE_P_H
-#define QMLPROPERTYCACHE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlrefcount_p.h"
-#include "qmlcleanup_p.h"
-
-#include <QtCore/qvector.h>
-
-#include <private/qscriptdeclarativeclass_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QMetaProperty;
-class QmlPropertyCache : public QmlRefCount, public QmlCleanup
-{
-public:
-    QmlPropertyCache(QmlEngine *);
-    virtual ~QmlPropertyCache();
-
-    struct Data {
-        inline Data(); 
-        inline bool operator==(const Data &);
-
-        enum Flag { 
-                    NoFlags           = 0x00000000,
-
-                    // Can apply to all properties, except IsFunction
-                    IsConstant        = 0x00000001,
-                    IsWritable        = 0x00000002,
-                    IsResettable      = 0x00000004,
-
-                    // These are mutualy exclusive
-                    IsFunction        = 0x00000008,
-                    IsQObjectDerived  = 0x00000010,
-                    IsEnumType        = 0x00000020,
-                    IsQList           = 0x00000080,
-                    IsQmlBinding      = 0x00000100,
-                    IsQScriptValue    = 0x00000200,
-
-                    // Apply only to IsFunctions
-                    IsVMEFunction     = 0x00000400,
-                    HasArguments      = 0x00000800
-
-        };
-        Q_DECLARE_FLAGS(Flags, Flag)
-                        
-        bool isValid() const { return coreIndex != -1; } 
-
-        Flags flags;
-        int propType;
-        int coreIndex;
-        int notifyIndex;
-
-        static Flags flagsForProperty(const QMetaProperty &, QmlEngine *engine = 0);
-        void load(const QMetaProperty &, QmlEngine *engine = 0);
-        void load(const QMetaMethod &);
-        QString name(QObject *);
-        QString name(const QMetaObject *);
-    };
-
-    struct ValueTypeData {
-        inline ValueTypeData();
-        inline bool operator==(const ValueTypeData &);
-        Data::Flags flags;     // flags on the value type wrapper
-        int valueTypeCoreIdx;  // The prop index of the access property on the value type wrapper
-        int valueTypePropType; // The QVariant::Type of access property on the value type wrapper
-    };
-
-    void update(QmlEngine *, const QMetaObject *);
-
-    QmlPropertyCache *copy() const;
-    void append(QmlEngine *, const QMetaObject *, Data::Flag propertyFlags = Data::NoFlags,
-                Data::Flag methodFlags = Data::NoFlags);
-
-    static QmlPropertyCache *create(QmlEngine *, const QMetaObject *);
-    static Data create(const QMetaObject *, const QString &);
-
-    inline Data *property(const QScriptDeclarativeClass::Identifier &id) const;
-    Data *property(const QString &) const;
-    Data *property(int) const;
-    QStringList propertyNames() const;
-
-    inline QmlEngine *qmlEngine() const;
-    static Data *property(QmlEngine *, QObject *, const QScriptDeclarativeClass::Identifier &, Data &);
-    static Data *property(QmlEngine *, QObject *, const QString &, Data &);
-protected:
-    virtual void clear();
-
-private:
-    struct RData : public Data, public QmlRefCount { 
-        QScriptDeclarativeClass::PersistentIdentifier identifier;
-    };
-
-    typedef QVector<RData *> IndexCache;
-    typedef QHash<QString, RData *> StringCache;
-    typedef QHash<QScriptDeclarativeClass::Identifier, RData *> IdentifierCache;
-
-    QmlEngine *engine;
-    IndexCache indexCache;
-    StringCache stringCache;
-    IdentifierCache identifierCache;
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QmlPropertyCache::Data::Flags);
-  
-QmlPropertyCache::Data::Data()
-: flags(0), propType(0), coreIndex(-1), notifyIndex(-1) 
-{
-}
-
-bool QmlPropertyCache::Data::operator==(const QmlPropertyCache::Data &other)
-{
-    return flags == other.flags &&
-           propType == other.propType &&
-           coreIndex == other.coreIndex &&
-           notifyIndex == other.notifyIndex;
-}
-
-QmlPropertyCache::Data *
-QmlPropertyCache::property(const QScriptDeclarativeClass::Identifier &id) const 
-{
-    return identifierCache.value(id);
-}
-
-QmlPropertyCache::ValueTypeData::ValueTypeData()
-: flags(QmlPropertyCache::Data::NoFlags), valueTypeCoreIdx(-1), valueTypePropType(0) 
-{
-}
-
-bool QmlPropertyCache::ValueTypeData::operator==(const ValueTypeData &o) 
-{ 
-    return flags == o.flags &&
-           valueTypeCoreIdx == o.valueTypeCoreIdx &&
-           valueTypePropType == o.valueTypePropType; 
-}
-
-QmlEngine *QmlPropertyCache::qmlEngine() const
-{
-    return engine;
-}
-
-QT_END_NAMESPACE
-
-#endif // QMLPROPERTYCACHE_P_H
diff --git a/src/declarative/qml/qmlpropertyvalueinterceptor.cpp b/src/declarative/qml/qmlpropertyvalueinterceptor.cpp
deleted file mode 100644
index ea53e16..0000000
--- a/src/declarative/qml/qmlpropertyvalueinterceptor.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlpropertyvalueinterceptor.h"
-
-#include "qml.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlPropertyValueInterceptor
-    \brief The QmlPropertyValueInterceptor class is inherited by property interceptors such as Behavior.
-    \internal
-
-    This class intercepts property writes, allowing for custom handling. For example, Behavior uses this
-    interception to provide a default animation for all changes to a property's value.
- */
-
-/*!
-    Constructs a QmlPropertyValueInterceptor.
-*/
-QmlPropertyValueInterceptor::QmlPropertyValueInterceptor()
-{
-}
-
-QmlPropertyValueInterceptor::~QmlPropertyValueInterceptor()
-{
-}
-
-/*!
-    \fn void QmlPropertyValueInterceptor::setTarget(const QmlMetaProperty &property)
-    Set the target \a property for the value interceptor.  This method will
-    be called by the QML engine when assigning a value interceptor.
-*/
-
-/*!
-    \fn void QmlPropertyValueInterceptor::write(const QVariant &value)
-    This method will be called when a new \a value is assigned to the property being intercepted.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlpropertyvalueinterceptor.h b/src/declarative/qml/qmlpropertyvalueinterceptor.h
deleted file mode 100644
index 74cd5fa..0000000
--- a/src/declarative/qml/qmlpropertyvalueinterceptor.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPROPERTYVALUEINTERCEPTOR_H
-#define QMLPROPERTYVALUEINTERCEPTOR_H
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlMetaProperty;
-class Q_DECLARATIVE_EXPORT QmlPropertyValueInterceptor
-{
-public:
-    QmlPropertyValueInterceptor();
-    virtual ~QmlPropertyValueInterceptor();
-    virtual void setTarget(const QmlMetaProperty &property) = 0;
-    virtual void write(const QVariant &value) = 0;
-};
-Q_DECLARE_INTERFACE(QmlPropertyValueInterceptor, "com.trolltech.qml.QmlPropertyValueInterceptor")
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLPROPERTYVALUEINTERCEPTOR_H
diff --git a/src/declarative/qml/qmlpropertyvaluesource.cpp b/src/declarative/qml/qmlpropertyvaluesource.cpp
deleted file mode 100644
index bccdfb7..0000000
--- a/src/declarative/qml/qmlpropertyvaluesource.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlpropertyvaluesource.h"
-
-#include "qml.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QmlPropertyValueSource
-    \brief The QmlPropertyValueSource class is inherited by property value sources such as animations and bindings.
-    \internal
- */
-
-/*!
-    Constructs a QmlPropertyValueSource.
-*/
-QmlPropertyValueSource::QmlPropertyValueSource()
-{
-}
-
-QmlPropertyValueSource::~QmlPropertyValueSource()
-{
-}
-
-/*!
-    \fn void QmlPropertyValueSource::setTarget(const QmlMetaProperty &property)
-    Set the target \a property for the value source.  This method will
-    be called by the QML engine when assigning a value source.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlpropertyvaluesource.h b/src/declarative/qml/qmlpropertyvaluesource.h
deleted file mode 100644
index fc53b8a..0000000
--- a/src/declarative/qml/qmlpropertyvaluesource.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPROPERTYVALUESOURCE_H
-#define QMLPROPERTYVALUESOURCE_H
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlMetaProperty;
-class Q_DECLARATIVE_EXPORT QmlPropertyValueSource
-{
-public:
-    QmlPropertyValueSource();
-    virtual ~QmlPropertyValueSource();
-    virtual void setTarget(const QmlMetaProperty &) = 0;
-};
-Q_DECLARE_INTERFACE(QmlPropertyValueSource, "com.trolltech.qml.QmlPropertyValueSource")
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLPROPERTYVALUESOURCE_H
diff --git a/src/declarative/qml/qmlproxymetaobject.cpp b/src/declarative/qml/qmlproxymetaobject.cpp
deleted file mode 100644
index 29aad34..0000000
--- a/src/declarative/qml/qmlproxymetaobject.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlproxymetaobject_p.h"
-
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-
-QmlProxyMetaObject::QmlProxyMetaObject(QObject *obj, QList<ProxyData> *mList)
-: metaObjects(mList), proxies(0), parent(0), object(obj)
-{
-#ifdef QMLPROXYMETAOBJECT_DEBUG
-    qWarning() << "QmlProxyMetaObject" << obj->metaObject()->className();
-#endif
-
-    *static_cast<QMetaObject *>(this) = *metaObjects->first().metaObject;
-
-    QObjectPrivate *op = QObjectPrivate::get(obj);
-    if (op->metaObject)
-        parent = static_cast<QAbstractDynamicMetaObject*>(op->metaObject);
-
-    op->metaObject = this;
-
-#ifdef QMLPROXYMETAOBJECT_DEBUG
-    const QMetaObject *mo = obj->metaObject();
-    while(mo) {
-        qWarning() << "    " << mo->className();
-        mo = mo->superClass();
-    }
-#endif
-}
-
-QmlProxyMetaObject::~QmlProxyMetaObject()
-{
-    if (parent)
-        delete parent;
-    parent = 0;
-
-    if (proxies)
-        delete [] proxies;
-    proxies = 0;
-}
-
-int QmlProxyMetaObject::metaCall(QMetaObject::Call c, int id, void **a)
-{
-    if ((c == QMetaObject::ReadProperty ||
-        c == QMetaObject::WriteProperty) &&
-            id >= metaObjects->last().propertyOffset) {
-
-        for (int ii = 0; ii < metaObjects->count(); ++ii) {
-            const ProxyData &data = metaObjects->at(ii);
-            if (id >= data.propertyOffset) {
-                if (!proxies) {
-                    proxies = new QObject*[metaObjects->count()];
-                    ::memset(proxies, 0, 
-                             sizeof(QObject *) * metaObjects->count());
-                }
-
-                if (!proxies[ii]) {
-                    QObject *proxy = data.createFunc(object);
-                    const QMetaObject *metaObject = proxy->metaObject();
-                    proxies[ii] = proxy;
-
-                    int localOffset = data.metaObject->methodOffset();
-                    int methodOffset = metaObject->methodOffset();
-                    int methods = metaObject->methodCount() - methodOffset;
-
-                    // ### - Can this be done more optimally?
-                    for (int jj = 0; jj < methods; ++jj) {
-                        QMetaMethod method = 
-                            metaObject->method(jj + methodOffset);
-                        if (method.methodType() == QMetaMethod::Signal)
-                            QMetaObject::connect(proxy, methodOffset + jj,
-                                                 object, localOffset + jj);
-                    }
-                }
-
-                int proxyOffset = proxies[ii]->metaObject()->propertyOffset();
-                int proxyId = id - data.propertyOffset + proxyOffset;
-
-                return proxies[ii]->qt_metacall(c, proxyId, a);
-            }
-        }
-    } else if (c == QMetaObject::InvokeMetaMethod &&
-               id >= metaObjects->last().methodOffset) {
-        QMetaMethod m = object->metaObject()->method(id);
-        if (m.methodType() == QMetaMethod::Signal) {
-            QMetaObject::activate(object, id, a);
-            return -1;
-        }
-    }
-
-    if (parent)
-        return parent->metaCall(c, id, a);
-    else
-        return object->qt_metacall(c, id, a);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h
deleted file mode 100644
index 96cfbf5..0000000
--- a/src/declarative/qml/qmlproxymetaobject_p.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPROXYMETAOBJECT_P_H
-#define QMLPROXYMETAOBJECT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmetaobjectbuilder_p.h"
-#include "qml.h"
-
-#include <QtCore/QMetaObject>
-#include <QtCore/QObject>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlProxyMetaObject : public QAbstractDynamicMetaObject
-{
-public:
-    struct ProxyData {
-        typedef QObject *(*CreateFunc)(QObject *);
-        QMetaObject *metaObject;
-        CreateFunc createFunc;
-        int propertyOffset;
-        int methodOffset;
-    };
-
-    QmlProxyMetaObject(QObject *, QList<ProxyData> *);
-    virtual ~QmlProxyMetaObject();
-
-protected:
-    virtual int metaCall(QMetaObject::Call _c, int _id, void **_a);
-
-private:
-    QList<ProxyData> *metaObjects;
-    QObject **proxies;
-
-    QAbstractDynamicMetaObject *parent;
-    QObject *object;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLPROXYMETAOBJECT_P_H
-
diff --git a/src/declarative/qml/qmlrefcount.cpp b/src/declarative/qml/qmlrefcount.cpp
deleted file mode 100644
index 76a6ab6..0000000
--- a/src/declarative/qml/qmlrefcount.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlrefcount_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QmlRefCount::QmlRefCount()
-: refCount(1)
-{
-}
-
-QmlRefCount::~QmlRefCount()
-{
-}
-
-void QmlRefCount::addref()
-{
-    Q_ASSERT(refCount > 0);
-    ++refCount;
-}
-
-void QmlRefCount::release()
-{
-    Q_ASSERT(refCount > 0);
-    --refCount;
-    if (refCount == 0)
-        delete this;
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/qml/qmlrefcount_p.h b/src/declarative/qml/qmlrefcount_p.h
deleted file mode 100644
index 9b2f52b..0000000
--- a/src/declarative/qml/qmlrefcount_p.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLREFCOUNT_P_H
-#define QMLREFCOUNT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class Q_AUTOTEST_EXPORT QmlRefCount
-{
-public:
-    QmlRefCount();
-    virtual ~QmlRefCount();
-    void addref();
-    void release();
-
-private:
-    int refCount;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLREFCOUNT_P_H
diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp
deleted file mode 100644
index d8a9350..0000000
--- a/src/declarative/qml/qmlrewrite.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlrewrite_p.h"
-
-#include "qmlglobal_p.h"
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-DEFINE_BOOL_CONFIG_OPTION(rewriteDump, QML_REWRITE_DUMP);
-
-namespace QmlRewrite {
-
-bool SharedBindingTester::isSharable(const QString &code)
-{
-    Engine engine;
-    NodePool pool(QString(), &engine);
-    Lexer lexer(&engine);
-    Parser parser(&engine);
-    lexer.setCode(code, 0);
-    parser.parseStatement();
-    if (!parser.statement()) 
-        return false;
-
-    _sharable = true;
-    AST::Node::acceptChild(parser.statement(), this);
-    return _sharable;
-}
-
-QString RewriteBinding::operator()(const QString &code, bool *ok)
-{
-    Engine engine;
-    NodePool pool(QString(), &engine);
-    Lexer lexer(&engine);
-    Parser parser(&engine);
-    lexer.setCode(code, 0);
-    parser.parseStatement();
-    if (!parser.statement()) {
-        if (ok) *ok = false;
-        return QString();
-    } else {
-        if (ok) *ok = true;
-    }
-    return rewrite(code, 0, parser.statement());
-}
-
-void RewriteBinding::accept(AST::Node *node)
-{
-    AST::Node::acceptChild(node, this);
-}
-
-QString RewriteBinding::rewrite(QString code, unsigned position,
-                                AST::Statement *node)
-{
-    TextWriter w;
-    _writer = &w;
-    _position = position;
-    _inLoop = 0;
-
-    accept(node);
-
-    unsigned startOfStatement = node->firstSourceLocation().begin() - _position;
-    unsigned endOfStatement = node->lastSourceLocation().end() - _position;
-
-    _writer->replace(startOfStatement, 0, QLatin1String("(function() { "));
-    _writer->replace(endOfStatement, 0, QLatin1String(" })"));
-
-    if (rewriteDump()) {
-        qWarning() << "=============================================================";
-        qWarning() << "Rewrote:";
-        qWarning() << qPrintable(code);
-    }
-
-    w.write(&code);
-
-    if (rewriteDump()) {
-        qWarning() << "To:";
-        qWarning() << qPrintable(code);
-        qWarning() << "=============================================================";
-    }
-
-    return code;
-}
-
-bool RewriteBinding::visit(AST::Block *ast)
-{
-    for (AST::StatementList *it = ast->statements; it; it = it->next) {
-        if (! it->next) {
-            // we need to rewrite only the last statement of a block.
-            accept(it->statement);
-        }
-    }
-
-    return false;
-}
-
-bool RewriteBinding::visit(AST::ExpressionStatement *ast)
-{
-    if (! _inLoop) {
-        unsigned startOfExpressionStatement = ast->firstSourceLocation().begin() - _position;
-        _writer->replace(startOfExpressionStatement, 0, QLatin1String("return "));
-    }
-
-    return false;
-}
-
-bool RewriteBinding::visit(AST::DoWhileStatement *)
-{
-    ++_inLoop;
-    return true;
-}
-
-void RewriteBinding::endVisit(AST::DoWhileStatement *)
-{
-    --_inLoop;
-}
-
-bool RewriteBinding::visit(AST::WhileStatement *)
-{
-    ++_inLoop;
-    return true;
-}
-
-void RewriteBinding::endVisit(AST::WhileStatement *)
-{
-    --_inLoop;
-}
-
-bool RewriteBinding::visit(AST::ForStatement *)
-{
-    ++_inLoop;
-    return true;
-}
-
-void RewriteBinding::endVisit(AST::ForStatement *)
-{
-    --_inLoop;
-}
-
-bool RewriteBinding::visit(AST::LocalForStatement *)
-{
-    ++_inLoop;
-    return true;
-}
-
-void RewriteBinding::endVisit(AST::LocalForStatement *)
-{
-    --_inLoop;
-}
-
-bool RewriteBinding::visit(AST::ForEachStatement *)
-{
-    ++_inLoop;
-    return true;
-}
-
-void RewriteBinding::endVisit(AST::ForEachStatement *)
-{
-    --_inLoop;
-}
-
-bool RewriteBinding::visit(AST::LocalForEachStatement *)
-{
-    ++_inLoop;
-    return true;
-}
-
-void RewriteBinding::endVisit(AST::LocalForEachStatement *)
-{
-    --_inLoop;
-}
-
-} // namespace QmlRewrite
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlrewrite_p.h b/src/declarative/qml/qmlrewrite_p.h
deleted file mode 100644
index 27140ba..0000000
--- a/src/declarative/qml/qmlrewrite_p.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLREWRITE_P_H
-#define QMLREWRITE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "rewriter/textwriter_p.h"
-#include "parser/qmljslexer_p.h"
-#include "parser/qmljsparser_p.h"
-#include "parser/qmljsnodepool_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace QmlRewrite {
-using namespace QmlJS;
-
-class SharedBindingTester : protected AST::Visitor
-{
-    bool _sharable;
-public:
-    bool isSharable(const QString &code);
-    
-    virtual bool visit(AST::FunctionDeclaration *) { _sharable = false; return false; }
-    virtual bool visit(AST::FunctionExpression *) { _sharable = false; return false; }
-    virtual bool visit(AST::CallExpression *) { _sharable = false; return false; }
-};
-
-class RewriteBinding: protected AST::Visitor
-{
-    unsigned _position;
-    TextWriter *_writer;
-
-public:
-    QString operator()(const QString &code, bool *ok = 0);
-
-protected:
-    using AST::Visitor::visit;
-
-    void accept(AST::Node *node);
-    QString rewrite(QString code, unsigned position, AST::Statement *node);
-
-    virtual bool visit(AST::Block *ast);
-    virtual bool visit(AST::ExpressionStatement *ast);
-
-    virtual bool visit(AST::DoWhileStatement *ast);
-    virtual void endVisit(AST::DoWhileStatement *ast);
-
-    virtual bool visit(AST::WhileStatement *ast);
-    virtual void endVisit(AST::WhileStatement *ast);
-
-    virtual bool visit(AST::ForStatement *ast);
-    virtual void endVisit(AST::ForStatement *ast);
-
-    virtual bool visit(AST::LocalForStatement *ast);
-    virtual void endVisit(AST::LocalForStatement *ast);
-
-    virtual bool visit(AST::ForEachStatement *ast);
-    virtual void endVisit(AST::ForEachStatement *ast);
-
-    virtual bool visit(AST::LocalForEachStatement *ast);
-    virtual void endVisit(AST::LocalForEachStatement *ast);
-
-private:
-    int _inLoop;
-};
-
-} // namespace QmlRewrite
-
-QT_END_NAMESPACE
-
-#endif // QMLREWRITE_P_H
-
diff --git a/src/declarative/qml/qmlscript.cpp b/src/declarative/qml/qmlscript.cpp
deleted file mode 100644
index ef142a5..0000000
--- a/src/declarative/qml/qmlscript.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// This is just a dummy file to include the documentation
-
-/*!
-    \qmlclass Script QmlScript
-    \brief The Script element provides a way to add JavaScript code snippets in QML.
-    \ingroup group_utility
-
-    The Script element is used to add convenient JavaScript "glue" methods to
-    your Qt Declarative application or component. 
-
-    An example: 
-
-    \qml
-    Script {
-        function debugMyComponent() {
-            console.log(text.text);
-            console.log(otherinterestingitem.property);
-        }
-    }
-    MouseArea { onClicked: debugMyComponent() }
-    \endqml
-
-    \note While it is possible to use any JavaScript code within a Script element,
-    it is recommended that the code be limited to defining functions. The Script
-    element executes JavaScript as soon as it is specified, so
-    when defining a component, this may be done before the execution context is
-    fully specified.  As a result, some properties or items may not be
-    accessible. You can avoid this problem by limiting your JavaScript to
-    defining functions that are only executed later once the context is fully
-    defined.
-
-    \sa {JavaScript Blocks}
-*/
-
-/*!
-    \qmlproperty string Script::script
-    \default
-    The JavaScript code to be executed.
-*/
-
-/*!
-    \qmlproperty url Script::source
-
-    Specifies a source file containing JavaScript code. This can be used instead
-    of providing inline JavaScript code in the Script element.
-*/
diff --git a/src/declarative/qml/qmlscriptclass_p.h b/src/declarative/qml/qmlscriptclass_p.h
deleted file mode 100644
index e7ccc13..0000000
--- a/src/declarative/qml/qmlscriptclass_p.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSCRIPTCLASS_P_H
-#define QMLSCRIPTCLASS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtScript/qscriptclass.h>
-#include <private/qscriptdeclarativeclass_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QmlScriptClass : public QScriptDeclarativeClass
-{
-public:
-    QmlScriptClass(QScriptEngine *);
-
-    static QVariant toVariant(QmlEngine *, const QScriptValue &);
-
-#if (QT_VERSION <= QT_VERSION_CHECK(4, 6, 2)) && !defined(QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE)
-    struct Value : public QScriptValue { 
-        Value() : QScriptValue() {}
-        Value(QScriptEngine *engine, int v) : QScriptValue(engine, v) {}
-        Value(QScriptEngine *engine, uint v) : QScriptValue(engine, v) {}
-        Value(QScriptEngine *engine, bool v) : QScriptValue(engine, v) {}
-        Value(QScriptEngine *engine, double v) : QScriptValue(engine, v) {}
-        Value(QScriptEngine *engine, float v) : QScriptValue(engine, v) {}
-        Value(QScriptEngine *engine, const QString &v) : QScriptValue(engine, v) {}
-        Value(QScriptEngine *, const QScriptValue &v) : QScriptValue(v) {}
-    };
-
-    typedef QScriptValue ScriptValue;
-#else
-    typedef Value ScriptValue;
-#endif
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLSCRIPTCLASS_P_H
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
deleted file mode 100644
index c0d5cf9..0000000
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ /dev/null
@@ -1,952 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlscriptparser_p.h"
-
-#include "qmlparser_p.h"
-#include "parser/qmljsengine_p.h"
-#include "parser/qmljsparser_p.h"
-#include "parser/qmljslexer_p.h"
-#include "parser/qmljsnodepool_p.h"
-#include "parser/qmljsastvisitor_p.h"
-#include "parser/qmljsast_p.h"
-#include "qmlrewrite_p.h"
-
-#include <qfxperf_p_p.h>
-
-#include <QStack>
-#include <QCoreApplication>
-#include <QtDebug>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QmlJS;
-using namespace QmlParser;
-
-namespace {
-
-class ProcessAST: protected AST::Visitor
-{
-    struct State {
-        State() : object(0), property(0) {}
-        State(Object *o) : object(o), property(0) {}
-        State(Object *o, Property *p) : object(o), property(p) {}
-
-        Object *object;
-        Property *property;
-    };
-
-    struct StateStack : public QStack<State>
-    {
-        void pushObject(Object *obj)
-        {
-            push(State(obj));
-        }
-
-        void pushProperty(const QString &name, const LocationSpan &location)
-        {
-            const State &state = top();
-            if (state.property) {
-                State s(state.property->getValue(),
-                        state.property->getValue()->getProperty(name.toUtf8()));
-                s.property->location = location;
-                push(s);
-            } else {
-                State s(state.object,
-                        state.object->getProperty(name.toUtf8()));
-
-                s.property->location = location;
-                push(s);
-            }
-        }
-    };
-
-public:
-    ProcessAST(QmlScriptParser *parser);
-    virtual ~ProcessAST();
-
-    void operator()(const QString &code, AST::Node *node);
-
-protected:
-    Object *defineObjectBinding(AST::UiQualifiedId *propertyName,
-                                AST::UiQualifiedId *objectTypeName,
-                                LocationSpan location,
-                                AST::UiObjectInitializer *initializer = 0);
-
-    Object *defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
-                                       const QString &objectType,
-                                       AST::SourceLocation typeLocation,
-                                       LocationSpan location,
-                                       AST::UiObjectInitializer *initializer = 0);
-
-    QmlParser::Variant getVariant(AST::ExpressionNode *expr);
-
-    LocationSpan location(AST::SourceLocation start, AST::SourceLocation end);
-    LocationSpan location(AST::UiQualifiedId *);
-
-    using AST::Visitor::visit;
-    using AST::Visitor::endVisit;
-
-    virtual bool visit(AST::UiProgram *node);
-    virtual bool visit(AST::UiImport *node);
-    virtual bool visit(AST::UiObjectDefinition *node);
-    virtual bool visit(AST::UiPublicMember *node);
-    virtual bool visit(AST::UiObjectBinding *node);
-
-    virtual bool visit(AST::UiScriptBinding *node);
-    virtual bool visit(AST::UiArrayBinding *node);
-    virtual bool visit(AST::UiSourceElement *node);
-
-    void accept(AST::Node *node);
-
-    QString asString(AST::UiQualifiedId *node) const;
-
-    const State state() const;
-    Object *currentObject() const;
-    Property *currentProperty() const;
-
-    QString qualifiedNameId() const;
-
-    QString textAt(const AST::SourceLocation &loc) const
-    { return _contents.mid(loc.offset, loc.length); }
-
-
-    QString textAt(const AST::SourceLocation &first,
-                   const AST::SourceLocation &last) const
-    { return _contents.mid(first.offset, last.offset + last.length - first.offset); }
-
-    QString asString(AST::ExpressionNode *expr)
-    {
-        if (! expr)
-            return QString();
-
-        return textAt(expr->firstSourceLocation(), expr->lastSourceLocation());
-    }
-
-    QString asString(AST::Statement *stmt)
-    {
-        if (! stmt)
-            return QString();
-
-        QString s = textAt(stmt->firstSourceLocation(), stmt->lastSourceLocation());
-        s += QLatin1Char('\n');
-        return s;
-    }
-
-private:
-    QmlScriptParser *_parser;
-    StateStack _stateStack;
-    QStringList _scope;
-    QString _contents;
-
-    inline bool isSignalProperty(const QByteArray &propertyName) const {
-        return (propertyName.length() >= 3 && propertyName.startsWith("on") &&
-                ('A' <= propertyName.at(2) && 'Z' >= propertyName.at(2)));
-    }
-
-};
-
-ProcessAST::ProcessAST(QmlScriptParser *parser)
-    : _parser(parser)
-{
-}
-
-ProcessAST::~ProcessAST()
-{
-}
-
-void ProcessAST::operator()(const QString &code, AST::Node *node)
-{
-    _contents = code;
-    accept(node);
-}
-
-void ProcessAST::accept(AST::Node *node)
-{
-    AST::Node::acceptChild(node, this);
-}
-
-const ProcessAST::State ProcessAST::state() const
-{
-    if (_stateStack.isEmpty())
-        return State();
-
-    return _stateStack.back();
-}
-
-Object *ProcessAST::currentObject() const
-{
-    return state().object;
-}
-
-Property *ProcessAST::currentProperty() const
-{
-    return state().property;
-}
-
-QString ProcessAST::qualifiedNameId() const
-{
-    return _scope.join(QLatin1String("/"));
-}
-
-QString ProcessAST::asString(AST::UiQualifiedId *node) const
-{
-    QString s;
-
-    for (AST::UiQualifiedId *it = node; it; it = it->next) {
-        s.append(it->name->asString());
-
-        if (it->next)
-            s.append(QLatin1Char('.'));
-    }
-
-    return s;
-}
-
-Object *
-ProcessAST::defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
-                                       const QString &objectType,
-                                       AST::SourceLocation typeLocation,
-                                       LocationSpan location,
-                                       AST::UiObjectInitializer *initializer)
-{
-    int lastTypeDot = objectType.lastIndexOf(QLatin1Char('.'));
-    bool isType = !objectType.isEmpty() &&
-                    (objectType.at(0).isUpper() ||
-                        (lastTypeDot >= 0 && objectType.at(lastTypeDot+1).isUpper()));
-
-    int propertyCount = 0;
-    for (; propertyName; propertyName = propertyName->next){
-        ++propertyCount;
-        _stateStack.pushProperty(propertyName->name->asString(),
-                                 this->location(propertyName));
-    }
-
-    if (!isType) {
-
-        if(propertyCount || !currentObject()) {
-            QmlError error;
-            error.setDescription(QCoreApplication::translate("QmlParser","Expected type name"));
-            error.setLine(typeLocation.startLine);
-            error.setColumn(typeLocation.startColumn);
-            _parser->_errors << error;
-            return 0;
-        }
-
-        LocationSpan loc = ProcessAST::location(typeLocation, typeLocation);
-        if (propertyName)
-            loc = ProcessAST::location(propertyName);
-
-        _stateStack.pushProperty(objectType, loc);
-       accept(initializer);
-        _stateStack.pop();
-
-        return 0;
-
-    } else {
-        // Class
-
-        QString resolvableObjectType = objectType;
-        if (lastTypeDot >= 0)
-            resolvableObjectType.replace(QLatin1Char('.'),QLatin1Char('/'));
-
-        bool isScript = resolvableObjectType == QLatin1String("Script");
-
-        if (isScript) {
-            if (_stateStack.isEmpty() || _stateStack.top().property) {
-                QmlError error;
-                error.setDescription(QCoreApplication::translate("QmlParser","Invalid use of Script block"));
-                error.setLine(typeLocation.startLine);
-                error.setColumn(typeLocation.startColumn);
-                _parser->_errors << error;
-                return 0;
-            }
-        }
-
-        Object *obj = new Object;
-
-        if (!isScript) {
-            QmlScriptParser::TypeReference *typeRef = _parser->findOrCreateType(resolvableObjectType);
-            obj->type = typeRef->id;
-
-            typeRef->refObjects.append(obj);
-        }
-
-        // XXX this doesn't do anything (_scope never builds up)
-        _scope.append(resolvableObjectType);
-        obj->typeName = qualifiedNameId().toUtf8();
-        _scope.removeLast();
-
-        obj->location = location;
-
-        if (isScript) {
-
-            _stateStack.top().object->scriptBlockObjects.append(obj);
-
-        } else if (propertyCount) {
-
-            Property *prop = currentProperty();
-            Value *v = new Value;
-            v->object = obj;
-            v->location = obj->location;
-            prop->addValue(v);
-
-            while (propertyCount--)
-                _stateStack.pop();
-
-        } else {
-
-            if (! _parser->tree()) {
-                _parser->setTree(obj);
-            } else {
-                const State state = _stateStack.top();
-                Value *v = new Value;
-                v->object = obj;
-                v->location = obj->location;
-                if (state.property) {
-                    state.property->addValue(v);
-                } else {
-                    Property *defaultProp = state.object->getDefaultProperty();
-                    if (defaultProp->location.start.line == -1) {
-                        defaultProp->location = v->location;
-                        defaultProp->location.end = defaultProp->location.start;
-                        defaultProp->location.range.length = 0;
-                    }
-                    defaultProp->addValue(v);
-                }
-            }
-        }
-
-        _stateStack.pushObject(obj);
-        accept(initializer);
-        _stateStack.pop();
-
-        return obj;
-    }
-}
-
-Object *ProcessAST::defineObjectBinding(AST::UiQualifiedId *qualifiedId,
-                                        AST::UiQualifiedId *objectTypeName,
-                                        LocationSpan location,
-                                        AST::UiObjectInitializer *initializer)
-{
-    const QString objectType = asString(objectTypeName);
-    const AST::SourceLocation typeLocation = objectTypeName->identifierToken;
-
-    if (objectType == QLatin1String("Script")) {
-
-        AST::UiObjectMemberList *it = initializer->members;
-        for (; it; it = it->next) {
-            AST::UiScriptBinding *scriptBinding = AST::cast<AST::UiScriptBinding *>(it->member);
-            if (! scriptBinding)
-                continue;
-
-            QString propertyName = asString(scriptBinding->qualifiedId);
-            if (propertyName == QLatin1String("source")) {
-                if (AST::ExpressionStatement *stmt = AST::cast<AST::ExpressionStatement *>(scriptBinding->statement)) {
-                    QmlParser::Variant string = getVariant(stmt->expression);
-                    if (string.isStringList()) {
-                        QStringList urls = string.asStringList();
-                        // We need to add this as a resource
-                        for (int ii = 0; ii < urls.count(); ++ii) 
-                            _parser->_refUrls << QUrl(urls.at(ii));
-                    }
-                }
-            }
-        }
-
-    }
-
-    return defineObjectBinding_helper(qualifiedId, objectType, typeLocation, location, initializer);
-}
-
-LocationSpan ProcessAST::location(AST::UiQualifiedId *id)
-{
-    return location(id->identifierToken, id->identifierToken);
-}
-
-LocationSpan ProcessAST::location(AST::SourceLocation start, AST::SourceLocation end)
-{
-    LocationSpan rv;
-    rv.start.line = start.startLine;
-    rv.start.column = start.startColumn;
-    rv.end.line = end.startLine;
-    rv.end.column = end.startColumn + end.length - 1;
-    rv.range.offset = start.offset;
-    rv.range.length = end.offset + end.length - start.offset;
-    return rv;
-}
-
-// UiProgram: UiImportListOpt UiObjectMemberList ;
-bool ProcessAST::visit(AST::UiProgram *node)
-{
-    accept(node->imports);
-    accept(node->members->member);
-    return false;
-}
-
-// UiImport: T_IMPORT T_STRING_LITERAL ;
-bool ProcessAST::visit(AST::UiImport *node)
-{
-    QString uri;
-    QmlScriptParser::Import import;
-
-    if (node->fileName) {
-        import.type = QmlScriptParser::Import::File;
-        uri = node->fileName->asString();
-    } else {
-        import.type = QmlScriptParser::Import::Library;
-        uri = asString(node->importUri);
-    }
-
-    AST::SourceLocation startLoc = node->importToken;
-    AST::SourceLocation endLoc = node->semicolonToken;
-
-    if (node->importId) {
-        import.qualifier = node->importId->asString();
-        if (!import.qualifier.at(0).isUpper()) {
-            QmlError error;
-            error.setDescription(QCoreApplication::translate("QmlParser","Invalid import qualifier ID"));
-            error.setLine(node->importIdToken.startLine);
-            error.setColumn(node->importIdToken.startColumn);
-            _parser->_errors << error;
-            return false;
-        }
-    }
-    if (node->versionToken.isValid())
-        import.version = textAt(node->versionToken);
-    else if (import.type == QmlScriptParser::Import::Library) {
-        QmlError error;
-        error.setDescription(QCoreApplication::translate("QmlParser","Library import requires a version"));
-        error.setLine(node->importIdToken.startLine);
-        error.setColumn(node->importIdToken.startColumn);
-        _parser->_errors << error;
-        return false;
-    }
-
-    import.location = location(startLoc, endLoc);
-    import.uri = uri;
-
-    _parser->_imports << import;
-
-    return false;
-}
-
-bool ProcessAST::visit(AST::UiPublicMember *node)
-{
-    const struct TypeNameToType {
-        const char *name;
-        Object::DynamicProperty::Type type;
-        const char *qtName;
-    } propTypeNameToTypes[] = {
-        { "int", Object::DynamicProperty::Int, "int" },
-        { "bool", Object::DynamicProperty::Bool, "bool" },
-        { "double", Object::DynamicProperty::Real, "double" },
-        { "real", Object::DynamicProperty::Real, "qreal" },
-        { "string", Object::DynamicProperty::String, "QString" },
-        { "url", Object::DynamicProperty::Url, "QUrl" },
-        { "color", Object::DynamicProperty::Color, "QColor" },
-        { "date", Object::DynamicProperty::Date, "QDate" },
-        { "var", Object::DynamicProperty::Variant, "QVariant" },
-        { "variant", Object::DynamicProperty::Variant, "QVariant" }
-    };
-    const int propTypeNameToTypesCount = sizeof(propTypeNameToTypes) /
-                                         sizeof(propTypeNameToTypes[0]);
-
-    if(node->type == AST::UiPublicMember::Signal) {
-        const QString name = node->name->asString();
-
-        Object::DynamicSignal signal;
-        signal.name = name.toUtf8();
-
-        AST::UiParameterList *p = node->parameters;
-        while (p) {
-            const QString memberType = p->type->asString();
-            const char *qtType = 0;
-            for(int ii = 0; !qtType && ii < propTypeNameToTypesCount; ++ii) {
-                if(QLatin1String(propTypeNameToTypes[ii].name) == memberType)
-                    qtType = propTypeNameToTypes[ii].qtName;
-            }
-
-            if (!qtType) {
-                QmlError error;
-                error.setDescription(QCoreApplication::translate("QmlParser","Expected parameter type"));
-                error.setLine(node->typeToken.startLine);
-                error.setColumn(node->typeToken.startColumn);
-                _parser->_errors << error;
-                return false;
-            }
-
-            signal.parameterTypes << qtType;
-            signal.parameterNames << p->name->asString().toUtf8();
-            p = p->finish();
-        }
-
-        _stateStack.top().object->dynamicSignals << signal;
-    } else {
-        const QString memberType = node->memberType->asString();
-        const QString name = node->name->asString();
-
-        bool typeFound = false;
-        Object::DynamicProperty::Type type;
-
-        if (memberType == QLatin1String("alias")) {
-            type = Object::DynamicProperty::Alias;
-            typeFound = true;
-        }
-
-        for(int ii = 0; !typeFound && ii < propTypeNameToTypesCount; ++ii) {
-            if(QLatin1String(propTypeNameToTypes[ii].name) == memberType) {
-                type = propTypeNameToTypes[ii].type;
-                typeFound = true;
-            }
-        }
-
-        if (!typeFound && memberType.at(0).isUpper()) {
-            QString typemodifier;
-            if(node->typeModifier)
-                typemodifier = node->typeModifier->asString();
-            if (typemodifier == QString()) {
-                type = Object::DynamicProperty::Custom;
-            } else if(typemodifier == QLatin1String("list")) {
-                type = Object::DynamicProperty::CustomList;
-            } else {
-                QmlError error;
-                error.setDescription(QCoreApplication::translate("QmlParser","Invalid property type modifier"));
-                error.setLine(node->typeModifierToken.startLine);
-                error.setColumn(node->typeModifierToken.startColumn);
-                _parser->_errors << error;
-                return false;
-            }
-            typeFound = true;
-        } else if (node->typeModifier) {
-            QmlError error;
-            error.setDescription(QCoreApplication::translate("QmlParser","Unexpected property type modifier"));
-            error.setLine(node->typeModifierToken.startLine);
-            error.setColumn(node->typeModifierToken.startColumn);
-            _parser->_errors << error;
-            return false;
-        }
-
-        if(!typeFound) {
-            QmlError error;
-            error.setDescription(QCoreApplication::translate("QmlParser","Expected property type"));
-            error.setLine(node->typeToken.startLine);
-            error.setColumn(node->typeToken.startColumn);
-            _parser->_errors << error;
-            return false;
-        }
-
-        if (node->isReadonlyMember) {
-            QmlError error;
-            error.setDescription(QCoreApplication::translate("QmlParser","Readonly not yet supported"));
-            error.setLine(node->readonlyToken.startLine);
-            error.setColumn(node->readonlyToken.startColumn);
-            _parser->_errors << error;
-            return false;
-
-        }
-        Object::DynamicProperty property;
-        property.isDefaultProperty = node->isDefaultMember;
-        property.type = type;
-        if (type >= Object::DynamicProperty::Custom) {
-            QmlScriptParser::TypeReference *typeRef = 
-                _parser->findOrCreateType(memberType);
-            typeRef->refObjects.append(_stateStack.top().object);
-        }
-        property.customType = memberType.toUtf8();
-        property.name = name.toUtf8();
-        property.location = location(node->firstSourceLocation(),
-                                     node->lastSourceLocation());
-
-        if (node->expression) { // default value
-            property.defaultValue = new Property;
-            property.defaultValue->parent = _stateStack.top().object;
-            property.defaultValue->location =
-                    location(node->expression->firstSourceLocation(),
-                             node->expression->lastSourceLocation());
-            Value *value = new Value;
-            value->location = location(node->expression->firstSourceLocation(),
-                                       node->expression->lastSourceLocation());
-            value->value = getVariant(node->expression);
-            property.defaultValue->values << value;
-        }
-
-        _stateStack.top().object->dynamicProperties << property;
-    }
-
-    return true;
-}
-
-
-// UiObjectMember: UiQualifiedId UiObjectInitializer ;
-bool ProcessAST::visit(AST::UiObjectDefinition *node)
-{
-    LocationSpan l = location(node->firstSourceLocation(),
-                              node->lastSourceLocation());
-
-    defineObjectBinding(/*propertyName = */ 0,
-                        node->qualifiedTypeNameId,
-                        l,
-                        node->initializer);
-
-    return false;
-}
-
-
-// UiObjectMember: UiQualifiedId T_COLON UiQualifiedId UiObjectInitializer ;
-bool ProcessAST::visit(AST::UiObjectBinding *node)
-{
-    LocationSpan l = location(node->qualifiedTypeNameId->identifierToken,
-                              node->initializer->rbraceToken);
-
-    defineObjectBinding(node->qualifiedId,
-                        node->qualifiedTypeNameId,
-                        l,
-                        node->initializer);
-
-    return false;
-}
-
-QmlParser::Variant ProcessAST::getVariant(AST::ExpressionNode *expr)
-{
-    if (AST::StringLiteral *lit = AST::cast<AST::StringLiteral *>(expr)) {
-        return QmlParser::Variant(lit->value->asString());
-    } else if (expr->kind == AST::Node::Kind_TrueLiteral) {
-        return QmlParser::Variant(true);
-    } else if (expr->kind == AST::Node::Kind_FalseLiteral) {
-        return QmlParser::Variant(false);
-    } else if (AST::NumericLiteral *lit = AST::cast<AST::NumericLiteral *>(expr)) {
-        return QmlParser::Variant(lit->value, asString(expr));
-    } else {
-
-        if (AST::UnaryMinusExpression *unaryMinus = AST::cast<AST::UnaryMinusExpression *>(expr)) {
-           if (AST::NumericLiteral *lit = AST::cast<AST::NumericLiteral *>(unaryMinus->expression)) {
-               return QmlParser::Variant(-lit->value, asString(expr));
-           }
-        }
-
-        return  QmlParser::Variant(asString(expr), expr);
-    }
-}
-
-
-// UiObjectMember: UiQualifiedId T_COLON Statement ;
-bool ProcessAST::visit(AST::UiScriptBinding *node)
-{
-    int propertyCount = 0;
-    AST::UiQualifiedId *propertyName = node->qualifiedId;
-    for (; propertyName; propertyName = propertyName->next){
-        ++propertyCount;
-        _stateStack.pushProperty(propertyName->name->asString(),
-                                 location(propertyName));
-    }
-
-    Property *prop = currentProperty();
-
-    QmlParser::Variant primitive;
-
-    if (AST::ExpressionStatement *stmt = AST::cast<AST::ExpressionStatement *>(node->statement)) {
-        primitive = getVariant(stmt->expression);
-    } else { // do binding
-        primitive = QmlParser::Variant(asString(node->statement),
-                                       node->statement);
-    }
-
-    prop->location.range.length = prop->location.range.offset + prop->location.range.length - node->qualifiedId->identifierToken.offset;
-    prop->location.range.offset = node->qualifiedId->identifierToken.offset;
-    Value *v = new Value;
-    v->value = primitive;
-    v->location = location(node->statement->firstSourceLocation(),
-                           node->statement->lastSourceLocation());
-
-    prop->addValue(v);
-
-    while (propertyCount--)
-        _stateStack.pop();
-
-    return true;
-}
-
-static QList<int> collectCommas(AST::UiArrayMemberList *members)
-{
-    QList<int> commas;
-
-    if (members) {
-        for (AST::UiArrayMemberList *it = members->next; it; it = it->next) {
-            commas.append(it->commaToken.offset);
-        }
-    }
-
-    return commas;
-}
-
-// UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
-bool ProcessAST::visit(AST::UiArrayBinding *node)
-{
-    int propertyCount = 0;
-    AST::UiQualifiedId *propertyName = node->qualifiedId;
-    for (; propertyName; propertyName = propertyName->next){
-        ++propertyCount;
-        _stateStack.pushProperty(propertyName->name->asString(),
-                                 location(propertyName));
-    }
-
-    accept(node->members);
-
-    // For the DOM, store the position of the T_LBRACKET upto the T_RBRACKET as the range:
-    Property* prop = currentProperty();
-    prop->listValueRange.offset = node->lbracketToken.offset;
-    prop->listValueRange.length = node->rbracketToken.offset + node->rbracketToken.length - node->lbracketToken.offset;
-
-    // Store the positions of the comma token too, again for the DOM to be able to retreive it.
-    prop->listCommaPositions = collectCommas(node->members);
-
-    while (propertyCount--)
-        _stateStack.pop();
-
-    return false;
-}
-
-bool ProcessAST::visit(AST::UiSourceElement *node)
-{
-    QmlParser::Object *obj = currentObject();
-
-    bool isScript = (obj && obj->typeName == "Script");
-
-    if (!isScript) {
-
-        if (AST::FunctionDeclaration *funDecl = AST::cast<AST::FunctionDeclaration *>(node->sourceElement)) {
-
-            Object::DynamicSlot slot;
-
-            AST::FormalParameterList *f = funDecl->formals;
-            while (f) {
-                slot.parameterNames << f->name->asString().toUtf8();
-                f = f->finish();
-            }
-
-            QString body = textAt(funDecl->lbraceToken, funDecl->rbraceToken);
-            slot.name = funDecl->name->asString().toUtf8();
-            slot.body = body;
-            obj->dynamicSlots << slot;
-
-        } else {
-            QmlError error;
-            error.setDescription(QCoreApplication::translate("QmlParser","QmlJS declaration outside Script element"));
-            error.setLine(node->firstSourceLocation().startLine);
-            error.setColumn(node->firstSourceLocation().startColumn);
-            _parser->_errors << error;
-        }
-        return false;
-
-    } else {
-        QString source;
-
-        int line = 0;
-        if (AST::FunctionDeclaration *funDecl = AST::cast<AST::FunctionDeclaration *>(node->sourceElement)) {
-            line = funDecl->functionToken.startLine;
-            source = asString(funDecl);
-        } else if (AST::VariableStatement *varStmt = AST::cast<AST::VariableStatement *>(node->sourceElement)) {
-            // ignore variable declarations
-            line = varStmt->declarationKindToken.startLine;
-
-            QmlError error;
-            error.setDescription(QCoreApplication::translate("QmlParser", "Variable declarations not allow in inline Script blocks"));
-            error.setLine(node->firstSourceLocation().startLine);
-            error.setColumn(node->firstSourceLocation().startColumn);
-            _parser->_errors << error;
-            return false;
-        }
-
-        Value *value = new Value;
-        value->location = location(node->firstSourceLocation(),
-                                   node->lastSourceLocation());
-        value->value = QmlParser::Variant(source);
-
-        obj->getDefaultProperty()->addValue(value);
-    }
-
-    return false;
-}
-
-} // end of anonymous namespace
-
-
-QmlScriptParser::QmlScriptParser()
-: root(0), data(0)
-{
-
-}
-
-QmlScriptParser::~QmlScriptParser()
-{
-    clear();
-}
-
-class QmlScriptParserJsASTData
-{
-public:
-    QmlScriptParserJsASTData(const QString &filename)
-        : nodePool(filename, &engine) {}
-
-    Engine engine;
-    NodePool nodePool;
-};
-
-bool QmlScriptParser::parse(const QByteArray &qmldata, const QUrl &url)
-{
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QmlPerfTimer<QmlPerf::QmlParsing> pt;
-#endif
-    clear();
-
-    const QString fileName = url.toString();
-
-    QTextStream stream(qmldata, QIODevice::ReadOnly);
-    stream.setCodec("UTF-8");
-    const QString code = stream.readAll();
-
-    data = new QmlScriptParserJsASTData(fileName);
-
-    Lexer lexer(&data->engine);
-    lexer.setCode(code, /*line = */ 1);
-
-    Parser parser(&data->engine);
-
-    if (! parser.parse() || !_errors.isEmpty()) {
-
-        // Extract errors from the parser
-        foreach (const DiagnosticMessage &m, parser.diagnosticMessages()) {
-
-            if (m.isWarning())
-                continue;
-
-            QmlError error;
-            error.setUrl(url);
-            error.setDescription(m.message);
-            error.setLine(m.loc.startLine);
-            error.setColumn(m.loc.startColumn);
-            _errors << error;
-
-        }
-    }
-
-    if (_errors.isEmpty()) {
-        ProcessAST process(this);
-        process(code, parser.ast());
-
-        // Set the url for process errors
-        for(int ii = 0; ii < _errors.count(); ++ii)
-            _errors[ii].setUrl(url);
-    }
-
-    return _errors.isEmpty();
-}
-
-QList<QmlScriptParser::TypeReference*> QmlScriptParser::referencedTypes() const
-{
-    return _refTypes;
-}
-
-QList<QUrl> QmlScriptParser::referencedResources() const
-{
-    return _refUrls;
-}
-
-Object *QmlScriptParser::tree() const
-{
-    return root;
-}
-
-QList<QmlScriptParser::Import> QmlScriptParser::imports() const
-{
-    return _imports;
-}
-
-QList<QmlError> QmlScriptParser::errors() const
-{
-    return _errors;
-}
-
-void QmlScriptParser::clear()
-{
-    if (root) {
-        root->release();
-        root = 0;
-    }
-    _imports.clear();
-    qDeleteAll(_refTypes);
-    _refTypes.clear();
-    _errors.clear();
-
-    if (data) {
-        delete data;
-        data = 0;
-    }
-}
-
-QmlScriptParser::TypeReference *QmlScriptParser::findOrCreateType(const QString &name)
-{
-    TypeReference *type = 0;
-    int i = 0;
-    for (; i < _refTypes.size(); ++i) {
-        if (_refTypes.at(i)->name == name) {
-            type = _refTypes.at(i);
-            break;
-        }
-    }
-    if (!type) {
-        type = new TypeReference(i, name);
-        _refTypes.append(type);
-    }
-
-    return type;
-}
-
-void QmlScriptParser::setTree(Object *tree)
-{
-    Q_ASSERT(! root);
-
-    root = tree;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
deleted file mode 100644
index b420b9a..0000000
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef QMLSCRIPTPARSER_P_H
-#define QMLSCRIPTPARSER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlerror.h"
-#include "qmlparser_p.h"
-
-#include <QtCore/QList>
-#include <QtCore/QUrl>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QByteArray;
-
-class QmlScriptParserJsASTData;
-class QmlScriptParser
-{
-public:
-    class Import
-    {
-    public:
-        Import() : type(Library) {}
-
-        enum Type { Library, File };
-        Type type;
-
-        QString uri;
-        QString qualifier;
-        QString version;
-
-        QmlParser::LocationSpan location;
-    };
-
-    class TypeReference
-    {
-    public:
-        TypeReference(int typeId, const QString &typeName) : id(typeId), name(typeName) {}
-
-        int id;
-        // type as it has been referenced in Qml
-        QString name;
-        // objects in parse tree referencing the type
-        QList<QmlParser::Object*> refObjects;
-    };
-
-    QmlScriptParser();
-    ~QmlScriptParser();
-
-    bool parse(const QByteArray &data, const QUrl &url = QUrl());
-
-    QList<TypeReference*> referencedTypes() const;
-    QList<QUrl> referencedResources() const;
-
-    QmlParser::Object *tree() const;
-    QList<Import> imports() const;
-
-    void clear();
-
-    QList<QmlError> errors() const;
-
-// ### private:
-    TypeReference *findOrCreateType(const QString &name);
-    void setTree(QmlParser::Object *tree);
-
-    void setScriptFile(const QString &filename) {_scriptFile = filename; }
-    QString scriptFile() const { return _scriptFile; }
-
-// ### private:
-    QList<QmlError> _errors;
-
-    QmlParser::Object *root;
-    QList<Import> _imports;
-    QList<TypeReference*> _refTypes;
-    QList<QUrl> _refUrls;
-    QString _scriptFile;
-    QmlScriptParserJsASTData *data;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLSCRIPTPARSER_P_H
diff --git a/src/declarative/qml/qmlscriptstring.cpp b/src/declarative/qml/qmlscriptstring.cpp
deleted file mode 100644
index a80f66b..0000000
--- a/src/declarative/qml/qmlscriptstring.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlscriptstring.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlScriptStringPrivate : public QSharedData
-{
-public:
-    QmlScriptStringPrivate() : context(0), scope(0) {}
-
-    QmlContext *context;
-    QObject *scope;
-    QString script;
-};
-
-/*!
-\class QmlScriptString
-  \since 4.7
-\brief The QmlScriptString class encapsulates a script and its context.
-
-The QmlScriptString is used by properties that want to accept a script "assignment" from QML.
-
-Normally, the following code would result in a binding being established for the \c script
-property.  If the property had a type of QmlScriptString, the script - \e {console.log(1921)} - itself
-would be passed to the property and it could choose how to handle it.
-
-\code
-MyType {
-    script: console.log(1921)
-}
-\endcode
-*/
-
-/*!
-Construct an empty instance.
-*/
-QmlScriptString::QmlScriptString()
-:  d(new QmlScriptStringPrivate)
-{
-}
-
-/*!
-Copy \a other.
-*/
-QmlScriptString::QmlScriptString(const QmlScriptString &other)
-: d(other.d)
-{
-}
-
-/*!
-\internal
-*/
-QmlScriptString::~QmlScriptString()
-{
-}
-
-/*!
-Assign \a other to this.
-*/
-QmlScriptString &QmlScriptString::operator=(const QmlScriptString &other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
-Return the context for the script.
-*/
-QmlContext *QmlScriptString::context() const
-{
-    return d->context;
-}
-
-/*!
-Sets the \a context for the script.
-*/
-void QmlScriptString::setContext(QmlContext *context)
-{
-    d->context = context;
-}
-
-/*!
-Returns the scope object for the script.
-*/
-QObject *QmlScriptString::scopeObject() const
-{
-    return d->scope;
-}
-
-/*!
-Sets the scope \a object for the script.
-*/
-void QmlScriptString::setScopeObject(QObject *object)
-{
-    d->scope = object;
-}
-
-/*!
-Returns the script text.
-*/
-QString QmlScriptString::script() const
-{
-    return d->script;
-}
-
-/*!
-Sets the \a script text.
-*/
-void QmlScriptString::setScript(const QString &script)
-{
-    d->script = script;
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/qml/qmlscriptstring.h b/src/declarative/qml/qmlscriptstring.h
deleted file mode 100644
index 1789eb5..0000000
--- a/src/declarative/qml/qmlscriptstring.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSCRIPTSTRING_H
-#define QMLSCRIPTSTRING_H
-
-#include <QtCore/qstring.h>
-#include <QtCore/qshareddata.h>
-#include <QtCore/qmetatype.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QObject;
-class QmlContext;
-class QmlScriptStringPrivate;
-class Q_DECLARATIVE_EXPORT QmlScriptString 
-{
-public:
-    QmlScriptString();
-    QmlScriptString(const QmlScriptString &);
-    ~QmlScriptString();
-
-    QmlScriptString &operator=(const QmlScriptString &);
-
-    QmlContext *context() const;
-    void setContext(QmlContext *);
-
-    QObject *scopeObject() const;
-    void setScopeObject(QObject *);
-
-    QString script() const;
-    void setScript(const QString &);
-
-private:
-    QSharedDataPointer<QmlScriptStringPrivate> d;
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QmlScriptString);
-
-QT_END_HEADER
-
-#endif // QMLSCRIPTSTRING_H
-
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
deleted file mode 100644
index 4e0e0fb..0000000
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlsqldatabase_p.h"
-
-#include "qmlengine.h"
-#include "qmlengine_p.h"
-#include "qmlrefcount_p.h"
-#include "qmlengine_p.h"
-
-#include <QtCore/qobject.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtScript/qscriptvalueiterator.h>
-#include <QtScript/qscriptcontext.h>
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptclasspropertyiterator.h>
-#include <QtSql/qsqldatabase.h>
-#include <QtSql/qsqlquery.h>
-#include <QtSql/qsqlerror.h>
-#include <QtSql/qsqlrecord.h>
-#include <QtCore/qstack.h>
-#include <QtCore/qcryptographichash.h>
-#include <QtCore/qsettings.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qdebug.h>
-
-Q_DECLARE_METATYPE(QSqlDatabase)
-Q_DECLARE_METATYPE(QSqlQuery)
-
-QT_BEGIN_NAMESPACE
-
-class QmlSqlQueryScriptClass: public QScriptClass {
-public:
-    QmlSqlQueryScriptClass(QScriptEngine *engine) : QScriptClass(engine)
-    {
-        str_length = engine->toStringHandle(QLatin1String("length"));
-        str_forwardOnly = engine->toStringHandle(QLatin1String("forwardOnly")); // not in HTML5 (an optimization)
-    }
-
-    QueryFlags queryProperty(const QScriptValue &,
-                             const QScriptString &name,
-                             QueryFlags flags, uint *)
-    {
-        if (flags & HandlesReadAccess) {
-            if (name == str_length) {
-                return HandlesReadAccess;
-            } else if (name == str_forwardOnly) {
-                return flags;
-            }
-        }
-        if (flags & HandlesWriteAccess)
-            if (name == str_forwardOnly)
-                return flags;
-        return 0;
-    }
-
-    QScriptValue property(const QScriptValue &object,
-                          const QScriptString &name, uint)
-    {
-        QSqlQuery query = qscriptvalue_cast<QSqlQuery>(object.data());
-        if (name == str_length) {
-            int s = query.size();
-            if (s<0) {
-                // Inefficient.
-                if (query.last()) {
-                    return query.at()+1;
-                } else {
-                    return 0;
-                }
-            } else {
-                return s;
-            }
-        } else if (name == str_forwardOnly) {
-            return query.isForwardOnly();
-        }
-        return engine()->undefinedValue();
-    }
-
-    void setProperty(QScriptValue &object,
-                      const QScriptString &name, uint, const QScriptValue & value)
-    {
-        if (name == str_forwardOnly) {
-            QSqlQuery query = qscriptvalue_cast<QSqlQuery>(object.data());
-            query.setForwardOnly(value.toBool());
-        }
-    }
-
-    QScriptValue::PropertyFlags propertyFlags(const QScriptValue &/*object*/, const QScriptString &name, uint /*id*/)
-    {
-        if (name == str_length) {
-            return QScriptValue::Undeletable
-                | QScriptValue::SkipInEnumeration;
-        }
-        return QScriptValue::Undeletable;
-    }
-
-private:
-    QScriptString str_length;
-    QScriptString str_forwardOnly;
-};
-
-// If the spec changes to allow iteration, check git history...
-// class QmlSqlQueryScriptClassPropertyIterator : public QScriptClassPropertyIterator
-
-
-
-enum SqlException {
-    UNKNOWN_ERR,
-    DATABASE_ERR,
-    VERSION_ERR,
-    TOO_LARGE_ERR,
-    QUOTA_ERR,
-    SYNTAX_ERR,
-    CONSTRAINT_ERR,
-    TIMEOUT_ERR
-};
-
-static const char* sqlerror[] = {
-    "UNKNOWN_ERR",
-    "DATABASE_ERR",
-    "VERSION_ERR",
-    "TOO_LARGE_ERR",
-    "QUOTA_ERR",
-    "SYNTAX_ERR",
-    "CONSTRAINT_ERR",
-    "TIMEOUT_ERR",
-    0
-};
-
-#define THROW_SQL(error, desc) \
-{ \
-    QScriptValue errorValue = context->throwError(desc); \
-    errorValue.setProperty(QLatin1String("code"), error); \
-    return errorValue; \
-}
-
-
-static QString databaseFile(const QString& connectionName, QScriptEngine *engine)
-{
-    QmlScriptEngine *qmlengine = static_cast<QmlScriptEngine*>(engine);
-    QString basename = qmlengine->offlineStoragePath
-                + QDir::separator() + QLatin1String("Databases") + QDir::separator();
-    basename += connectionName;
-    return basename;
-}
-
-
-
-static QScriptValue qmlsqldatabase_item(QScriptContext *context, QScriptEngine *engine)
-{
-    QSqlQuery query = qscriptvalue_cast<QSqlQuery>(context->thisObject().data());
-    int i = context->argument(0).toNumber();
-    if (query.at() == i || query.seek(i)) { // Qt 4.6 doesn't optimize seek(at())
-        QSqlRecord r = query.record();
-        QScriptValue row = engine->newObject();
-        for (int j=0; j<r.count(); ++j) {
-            row.setProperty(r.fieldName(j), QScriptValue(engine,r.value(j).toString()));
-        }
-        return row;
-    }
-    return engine->undefinedValue();
-}
-
-static QScriptValue qmlsqldatabase_executeSql_outsidetransaction(QScriptContext *context, QScriptEngine * /*engine*/)
-{
-    THROW_SQL(DATABASE_ERR,QmlEngine::tr("executeSql called outside transaction()"));
-}
-
-static QScriptValue qmlsqldatabase_executeSql(QScriptContext *context, QScriptEngine *engine)
-{
-    QSqlDatabase db = qscriptvalue_cast<QSqlDatabase>(context->thisObject());
-    QString sql = context->argument(0).toString();
-    QSqlQuery query(db);
-    bool err = false;
-
-    QScriptValue result;
-
-    if (query.prepare(sql)) {
-        if (context->argumentCount() > 1) {
-            QScriptValue values = context->argument(1);
-            if (values.isObject()) {
-                for (QScriptValueIterator it(values); it.hasNext();) {
-                    it.next();
-                    query.bindValue(it.name(),it.value().toVariant());
-                }
-            } else {
-                query.bindValue(0,values.toVariant());
-            }
-        }
-        if (query.exec()) {
-            result = engine->newObject();
-            QmlScriptEngine *qmlengine = static_cast<QmlScriptEngine*>(engine);
-            if (!qmlengine->sqlQueryClass)
-                qmlengine->sqlQueryClass = new QmlSqlQueryScriptClass(engine);
-            QScriptValue rows = engine->newObject(qmlengine->sqlQueryClass);
-            rows.setData(engine->newVariant(qVariantFromValue(query)));
-            rows.setProperty(QLatin1String("item"), engine->newFunction(qmlsqldatabase_item,1), QScriptValue::SkipInEnumeration);
-            result.setProperty(QLatin1String("rows"),rows);
-            result.setProperty(QLatin1String("rowsAffected"),query.numRowsAffected());
-            result.setProperty(QLatin1String("insertId"),query.lastInsertId().toString());
-        } else {
-            err = true;
-        }
-    } else {
-        err = true;
-    }
-    if (err)
-        THROW_SQL(DATABASE_ERR,query.lastError().text());
-    return result;
-}
-
-static QScriptValue qmlsqldatabase_executeSql_readonly(QScriptContext *context, QScriptEngine *engine)
-{
-    QString sql = context->argument(0).toString();
-    if (sql.startsWith(QLatin1String("SELECT"),Qt::CaseInsensitive)) {
-        return qmlsqldatabase_executeSql(context,engine);
-    } else {
-        THROW_SQL(SYNTAX_ERR,QmlEngine::tr("Read-only Transaction"))
-    }
-}
-
-static QScriptValue qmlsqldatabase_change_version(QScriptContext *context, QScriptEngine *engine)
-{
-    if (context->argumentCount() < 2)
-        return engine->undefinedValue();
-
-    QSqlDatabase db = qscriptvalue_cast<QSqlDatabase>(context->thisObject());
-    QString from_version = context->argument(0).toString();
-    QString to_version = context->argument(1).toString();
-    QScriptValue callback = context->argument(2);
-
-    QScriptValue instance = engine->newObject();
-    instance.setProperty(QLatin1String("executeSql"), engine->newFunction(qmlsqldatabase_executeSql,1));
-    QScriptValue tx = engine->newVariant(instance,qVariantFromValue(db));
-
-    QString foundvers = context->thisObject().property(QLatin1String("version")).toString();
-    if (from_version!=foundvers) {
-        THROW_SQL(2,QmlEngine::tr("Version mismatch: expected %1, found %2").arg(from_version).arg(foundvers));
-        return engine->undefinedValue();
-    }
-
-    bool ok = true;
-    if (callback.isFunction()) {
-        ok = false;
-        db.transaction();
-        callback.call(QScriptValue(), QScriptValueList() << tx);
-        if (engine->hasUncaughtException()) {
-            db.rollback();
-        } else {
-            if (!db.commit()) {
-                db.rollback();
-                THROW_SQL(0,QmlEngine::tr("SQL transaction failed"));
-            } else {
-                ok = true;
-            }
-        }
-    }
-
-    if (ok) {
-        context->thisObject().setProperty(QLatin1String("version"), to_version, QScriptValue::ReadOnly);
-        QSettings ini(databaseFile(db.connectionName(),engine)+QLatin1String(".ini"),QSettings::IniFormat);
-        ini.setValue(QLatin1String("Version"), to_version);
-    }
-
-    return engine->undefinedValue();
-}
-
-static QScriptValue qmlsqldatabase_transaction_shared(QScriptContext *context, QScriptEngine *engine, bool readOnly)
-{
-    QSqlDatabase db = qscriptvalue_cast<QSqlDatabase>(context->thisObject());
-    QScriptValue callback = context->argument(0);
-    if (!callback.isFunction())
-        THROW_SQL(UNKNOWN_ERR,QmlEngine::tr("transaction: missing callback"));
-
-    QScriptValue instance = engine->newObject();
-    instance.setProperty(QLatin1String("executeSql"),
-        engine->newFunction(readOnly ? qmlsqldatabase_executeSql_readonly : qmlsqldatabase_executeSql,1));
-    QScriptValue tx = engine->newVariant(instance,qVariantFromValue(db));
-
-    db.transaction();
-    callback.call(QScriptValue(), QScriptValueList() << tx);
-    instance.setProperty(QLatin1String("executeSql"),
-        engine->newFunction(qmlsqldatabase_executeSql_outsidetransaction));
-    if (engine->hasUncaughtException()) {
-        db.rollback();
-    } else {
-        if (!db.commit())
-            db.rollback();
-    }
-    return engine->undefinedValue();
-}
-
-static QScriptValue qmlsqldatabase_transaction(QScriptContext *context, QScriptEngine *engine)
-{
-    return qmlsqldatabase_transaction_shared(context,engine,false);
-}
-static QScriptValue qmlsqldatabase_read_transaction(QScriptContext *context, QScriptEngine *engine)
-{
-    return qmlsqldatabase_transaction_shared(context,engine,true);
-}
-
-/*
-    Currently documented in doc/src/declarastive/globalobject.qdoc
-*/
-static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEngine *engine)
-{
-    QSqlDatabase database;
-
-    QString dbname = context->argument(0).toString();
-    QString dbversion = context->argument(1).toString();
-    QString dbdescription = context->argument(2).toString();
-    int dbestimatedsize = context->argument(3).toNumber();
-    QScriptValue dbcreationCallback = context->argument(4);
-
-    QCryptographicHash md5(QCryptographicHash::Md5);
-    md5.addData(dbname.toUtf8());
-    QString dbid(QLatin1String(md5.result().toHex()));
-
-    QString basename = databaseFile(dbid,engine);
-    bool created = false;
-    QString version = dbversion;
-
-    {
-        QSettings ini(basename+QLatin1String(".ini"),QSettings::IniFormat);
-
-        if (QSqlDatabase::connectionNames().contains(dbid)) {
-            database = QSqlDatabase::database(dbid);
-            version = ini.value(QLatin1String("Version")).toString();
-            if (version != dbversion && !dbversion.isEmpty() && !version.isEmpty())
-                THROW_SQL(VERSION_ERR,QmlEngine::tr("SQL: database version mismatch"));
-        } else {
-            created = !QFile::exists(basename+QLatin1String(".sqlite"));
-            database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), dbid);
-            QDir().mkpath(basename);
-            if (created) {
-                ini.setValue(QLatin1String("Name"), dbname);
-                if (dbcreationCallback.isFunction())
-                    version = QString();
-                ini.setValue(QLatin1String("Version"), version);
-                ini.setValue(QLatin1String("Description"), dbdescription);
-                ini.setValue(QLatin1String("EstimatedSize"), dbestimatedsize);
-                ini.setValue(QLatin1String("Driver"), QLatin1String("QSQLITE"));
-            } else {
-                if (!dbversion.isEmpty() && ini.value(QLatin1String("Version")) != dbversion) {
-                    // Incompatible
-                    THROW_SQL(VERSION_ERR,QmlEngine::tr("SQL: database version mismatch"));
-                }
-                version = ini.value(QLatin1String("Version")).toString();
-            }
-            database.setDatabaseName(basename+QLatin1String(".sqlite"));
-        }
-        if (!database.isOpen())
-            database.open();
-    }
-
-    QScriptValue instance = engine->newObject();
-    instance.setProperty(QLatin1String("transaction"), engine->newFunction(qmlsqldatabase_transaction,1));
-    instance.setProperty(QLatin1String("readTransaction"), engine->newFunction(qmlsqldatabase_read_transaction,1));
-    instance.setProperty(QLatin1String("version"), version, QScriptValue::ReadOnly);
-    instance.setProperty(QLatin1String("changeVersion"), engine->newFunction(qmlsqldatabase_change_version,3));
-
-    QScriptValue result = engine->newVariant(instance,qVariantFromValue(database));
-
-    if (created && dbcreationCallback.isFunction()) {
-        dbcreationCallback.call(QScriptValue(), QScriptValueList() << result);
-    }
-
-    return result;
-}
-
-void qt_add_qmlsqldatabase(QScriptEngine *engine)
-{
-    QScriptValue openDatabase = engine->newFunction(qmlsqldatabase_open_sync, 4);
-    engine->globalObject().setProperty(QLatin1String("openDatabaseSync"), openDatabase);
-
-    QScriptValue sqlExceptionPrototype = engine->newObject();
-    for (int i=0; sqlerror[i]; ++i)
-        sqlExceptionPrototype.setProperty(QLatin1String(sqlerror[i]),
-            i,QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-
-    engine->globalObject().setProperty(QLatin1String("SQLException"), sqlExceptionPrototype);
-}
-
-/*
-HTML5 "spec" says "rs.rows[n]", but WebKit only impelments "rs.rows.item(n)". We do both (and property iterator).
-We add a "forwardOnly" property that stops Qt caching results (code promises to only go forward
-through the data.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlsqldatabase_p.h b/src/declarative/qml/qmlsqldatabase_p.h
deleted file mode 100644
index 0fd275b..0000000
--- a/src/declarative/qml/qmlsqldatabase_p.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSQLDATABASE_P_H
-#define QMLSQLDATABASE_P_H
-
-#include <QtScript/qscriptengine.h>
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QScriptEngine;
-void qt_add_qmlsqldatabase(QScriptEngine *engine);
-
-QT_END_NAMESPACE
-
-#endif // QMLSQLDATABASE_P_H
-
diff --git a/src/declarative/qml/qmlstringconverters.cpp b/src/declarative/qml/qmlstringconverters.cpp
deleted file mode 100644
index 6ba70d3..0000000
--- a/src/declarative/qml/qmlstringconverters.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlstringconverters_p.h"
-
-#include <QtGui/qcolor.h>
-#include <QtGui/qvector3d.h>
-#include <QtCore/qpoint.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qsize.h>
-#include <QtCore/qvariant.h>
-#include <QtCore/qdatetime.h>
-
-QT_BEGIN_NAMESPACE
-
-static uchar fromHex(const uchar c, const uchar c2)
-{
-    uchar rv = 0;
-    if (c >= '0' && c <= '9')
-        rv += (c - '0') * 16;
-    else if (c >= 'A' && c <= 'F')
-        rv += (c - 'A' + 10) * 16;
-    else if (c >= 'a' && c <= 'f')
-        rv += (c - 'a' + 10) * 16;
-
-    if (c2 >= '0' && c2 <= '9')
-        rv += (c2 - '0');
-    else if (c2 >= 'A' && c2 <= 'F')
-        rv += (c2 - 'A' + 10);
-    else if (c2 >= 'a' && c2 <= 'f')
-        rv += (c2 - 'a' + 10);
-
-    return rv;
-}
-
-static uchar fromHex(const QString &s, int idx)
-{
-    uchar c = s.at(idx).toAscii();
-    uchar c2 = s.at(idx + 1).toAscii();
-    return fromHex(c, c2);
-}
-
-QVariant QmlStringConverters::variantFromString(const QString &s)
-{
-    if (s.isEmpty())
-        return QVariant(s);
-    if (s.startsWith(QLatin1Char('\'')) && s.endsWith(QLatin1Char('\''))) {
-        QString data = s.mid(1, s.length() - 2);
-        return QVariant(data);
-    } 
-    bool ok = false;
-    QRectF r = rectFFromString(s, &ok);
-    if (ok) return QVariant(r);
-    QColor c = colorFromString(s, &ok);
-    if (ok) return QVariant(c);
-    QPointF p = pointFFromString(s, &ok);
-    if (ok) return QVariant(p);
-    QSizeF sz = sizeFFromString(s, &ok);
-    if (ok) return QVariant(sz);
-    QVector3D v = vector3DFromString(s, &ok);
-    if (ok) return qVariantFromValue(v);
-
-    return QVariant(s);
-}
-
-QVariant QmlStringConverters::variantFromString(const QString &s, int preferredType, bool *ok)
-{
-    switch (preferredType) {
-    case QMetaType::QColor:
-        return QVariant::fromValue(colorFromString(s, ok));
-    case QMetaType::QDate:
-        return QVariant::fromValue(dateFromString(s, ok));
-    case QMetaType::QTime:
-        return QVariant::fromValue(timeFromString(s, ok));
-    case QMetaType::QDateTime:
-        return QVariant::fromValue(dateTimeFromString(s, ok));
-    case QMetaType::QPointF:
-        return QVariant::fromValue(pointFFromString(s, ok));
-    case QMetaType::QPoint:
-        return QVariant::fromValue(pointFFromString(s, ok).toPoint());
-    case QMetaType::QSizeF:
-        return QVariant::fromValue(sizeFFromString(s, ok));
-    case QMetaType::QSize:
-        return QVariant::fromValue(sizeFFromString(s, ok).toSize());
-    case QMetaType::QRectF:
-        return QVariant::fromValue(rectFFromString(s, ok));
-    case QMetaType::QRect:
-        return QVariant::fromValue(rectFFromString(s, ok).toRect());
-    case QMetaType::QVector3D:
-        return QVariant::fromValue(vector3DFromString(s, ok));
-    default:
-        if (ok) *ok = false;
-        return QVariant();
-    }
-}
-
-QColor QmlStringConverters::colorFromString(const QString &s, bool *ok)
-{
-    if (s.startsWith(QLatin1Char('#')) && s.length() == 9) {
-        uchar a = fromHex(s, 1);
-        uchar r = fromHex(s, 3);
-        uchar g = fromHex(s, 5);
-        uchar b = fromHex(s, 7);
-        if (ok) *ok = true;
-        return QColor(r, g, b, a);
-    } else {
-        QColor rv;
-        if (s.startsWith(QLatin1Char('#')) || QColor::colorNames().contains(s.toLower()))
-            rv = QColor(s);
-        if (ok) *ok = rv.isValid();
-        return rv;
-    }
-}
-
-QDate QmlStringConverters::dateFromString(const QString &s, bool *ok)
-{
-    QDate d = QDate::fromString(s, Qt::ISODate);
-    if (ok) *ok =  d.isValid();
-    return d;
-}
-
-QTime QmlStringConverters::timeFromString(const QString &s, bool *ok)
-{
-    QTime t = QTime::fromString(s, Qt::ISODate);
-    if (ok) *ok = t.isValid();
-    return t;
-}
-
-QDateTime QmlStringConverters::dateTimeFromString(const QString &s, bool *ok)
-{
-    QDateTime d = QDateTime::fromString(s, Qt::ISODate);
-    if (ok) *ok =  d.isValid();
-    return d;
-}
-
-//expects input of "x,y"
-QPointF QmlStringConverters::pointFFromString(const QString &s, bool *ok)
-{
-    if (s.count(QLatin1Char(',')) != 1) {
-        if (ok)
-            *ok = false;
-        return QPointF();
-    }
-
-    bool xGood, yGood;
-    int index = s.indexOf(QLatin1Char(','));
-    qreal xCoord = s.left(index).toDouble(&xGood);
-    qreal yCoord = s.mid(index+1).toDouble(&yGood);
-    if (!xGood || !yGood) {
-        if (ok)
-            *ok = false;
-        return QPointF();
-    }
-
-    if (ok)
-        *ok = true;
-    return QPointF(xCoord, yCoord);
-}
-
-//expects input of "widthxheight"
-QSizeF QmlStringConverters::sizeFFromString(const QString &s, bool *ok)
-{
-    if (s.count(QLatin1Char('x')) != 1) {
-        if (ok)
-            *ok = false;
-        return QSizeF();
-    }
-
-    bool wGood, hGood;
-    int index = s.indexOf(QLatin1Char('x'));
-    qreal width = s.left(index).toDouble(&wGood);
-    qreal height = s.mid(index+1).toDouble(&hGood);
-    if (!wGood || !hGood) {
-        if (ok)
-            *ok = false;
-        return QSizeF();
-    }
-
-    if (ok)
-        *ok = true;
-    return QSizeF(width, height);
-}
-
-//expects input of "x,y,widthxheight" //### use space instead of second comma?
-QRectF QmlStringConverters::rectFFromString(const QString &s, bool *ok)
-{
-    if (s.count(QLatin1Char(',')) != 2 || s.count(QLatin1Char('x')) != 1) {
-        if (ok)
-            *ok = false;
-        return QRectF();
-    }
-
-    bool xGood, yGood, wGood, hGood;
-    int index = s.indexOf(QLatin1Char(','));
-    qreal x = s.left(index).toDouble(&xGood);
-    int index2 = s.indexOf(QLatin1Char(','), index+1);
-    qreal y = s.mid(index+1, index2-index-1).toDouble(&yGood);
-    index = s.indexOf(QLatin1Char('x'), index2+1);
-    qreal width = s.mid(index2+1, index-index2-1).toDouble(&wGood);
-    qreal height = s.mid(index+1).toDouble(&hGood);
-    if (!xGood || !yGood || !wGood || !hGood) {
-        if (ok)
-            *ok = false;
-        return QRectF();
-    }
-
-    if (ok)
-        *ok = true;
-    return QRectF(x, y, width, height);
-}
-
-//expects input of "x,y,z"
-QVector3D QmlStringConverters::vector3DFromString(const QString &s, bool *ok)
-{
-    if (s.count(QLatin1Char(',')) != 2) {
-        if (ok)
-            *ok = false;
-        return QVector3D();
-    }
-
-    bool xGood, yGood, zGood;
-    int index = s.indexOf(QLatin1Char(','));
-    int index2 = s.indexOf(QLatin1Char(','), index+1);
-    qreal xCoord = s.left(index).toDouble(&xGood);
-    qreal yCoord = s.mid(index+1, index2-index-1).toDouble(&yGood);
-    qreal zCoord = s.mid(index2+1).toDouble(&zGood);
-    if (!xGood || !yGood || !zGood) {
-        if (ok)
-            *ok = false;
-        return QVector3D();
-    }
-
-    if (ok)
-        *ok = true;
-    return QVector3D(xCoord, yCoord, zCoord);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlstringconverters_p.h b/src/declarative/qml/qmlstringconverters_p.h
deleted file mode 100644
index c83a1de..0000000
--- a/src/declarative/qml/qmlstringconverters_p.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSTRINGCONVERTERS_P_H
-#define QMLSTRINGCONVERTERS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-#include <QtCore/qvariant.h>
-
-QT_BEGIN_NAMESPACE
-
-class QColor;
-class QPointF;
-class QSizeF;
-class QRectF;
-class QString;
-class QByteArray;
-class QVector3D;
-
-// XXX - Bauhaus currently uses these methods which is why they're exported
-namespace QmlStringConverters
-{
-    QVariant Q_DECLARATIVE_EXPORT variantFromString(const QString &);
-    QVariant Q_DECLARATIVE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0);
-
-    QColor Q_DECLARATIVE_EXPORT colorFromString(const QString &, bool *ok = 0);
-    QDate Q_DECLARATIVE_EXPORT dateFromString(const QString &, bool *ok = 0); 
-    QTime Q_DECLARATIVE_EXPORT timeFromString(const QString &, bool *ok = 0);
-    QDateTime Q_DECLARATIVE_EXPORT dateTimeFromString(const QString &, bool *ok = 0);
-    QPointF Q_DECLARATIVE_EXPORT pointFFromString(const QString &, bool *ok = 0);
-    QSizeF Q_DECLARATIVE_EXPORT sizeFFromString(const QString &, bool *ok = 0);
-    QRectF Q_DECLARATIVE_EXPORT rectFFromString(const QString &, bool *ok = 0);
-    QVector3D Q_DECLARATIVE_EXPORT vector3DFromString(const QString &, bool *ok = 0);
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLSTRINGCONVERTERS_P_H
diff --git a/src/declarative/qml/qmltypenamecache.cpp b/src/declarative/qml/qmltypenamecache.cpp
deleted file mode 100644
index eef3bae..0000000
--- a/src/declarative/qml/qmltypenamecache.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmltypenamecache_p.h"
-
-#include "qmlengine_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QmlTypeNameCache::QmlTypeNameCache(QmlEngine *e)
-: QmlCleanup(e), engine(e)
-{
-}
-
-QmlTypeNameCache::~QmlTypeNameCache()
-{
-    clear();
-}
-
-void QmlTypeNameCache::clear()
-{
-    qDeleteAll(stringCache);
-    stringCache.clear();
-    identifierCache.clear();
-    engine = 0;
-}
-
-void QmlTypeNameCache::add(const QString &name, QmlType *type)
-{
-    if (stringCache.contains(name))
-        return;
-
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-
-    RData *data = new RData;
-    // ### Use typename class
-    data->identifier = ep->objectClass->createPersistentIdentifier(name);
-    data->type = type;
-    stringCache.insert(name, data);
-    identifierCache.insert(data->identifier.identifier, data);
-}
-
-void QmlTypeNameCache::add(const QString &name, QmlTypeNameCache *typeNamespace)
-{
-    if (stringCache.contains(name))
-        return;
-
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-
-    RData *data = new RData;
-    // ### Use typename class
-    data->identifier = ep->objectClass->createPersistentIdentifier(name);
-    data->typeNamespace = typeNamespace;
-    stringCache.insert(name, data);
-    identifierCache.insert(data->identifier.identifier, data);
-    typeNamespace->addref();
-}
-
-QmlTypeNameCache::Data *QmlTypeNameCache::data(const QString &id) const
-{
-    return stringCache.value(id);
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/qml/qmltypenamecache_p.h b/src/declarative/qml/qmltypenamecache_p.h
deleted file mode 100644
index e578277..0000000
--- a/src/declarative/qml/qmltypenamecache_p.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLTYPENAMECACHE_P_H
-#define QMLTYPENAMECACHE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlrefcount_p.h"
-#include "qmlcleanup_p.h"
-
-#include <private/qscriptdeclarativeclass_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlType;
-class QmlEngine;
-class QmlTypeNameCache : public QmlRefCount, public QmlCleanup
-{
-public:
-    QmlTypeNameCache(QmlEngine *);
-    virtual ~QmlTypeNameCache();
-
-    struct Data {
-        inline Data();
-        inline ~Data();
-        QmlType *type;
-        QmlTypeNameCache *typeNamespace;
-    };
-
-    void add(const QString &, QmlType *);
-    void add(const QString &, QmlTypeNameCache *);
-
-    Data *data(const QString &) const;
-    inline Data *data(const QScriptDeclarativeClass::Identifier &id) const;
-
-protected:
-    virtual void clear();
-
-private:
-    struct RData : public Data { 
-        QScriptDeclarativeClass::PersistentIdentifier identifier;
-    };
-    typedef QHash<QString, RData *> StringCache;
-    typedef QHash<QScriptDeclarativeClass::Identifier, RData *> IdentifierCache;
-
-    StringCache stringCache;
-    IdentifierCache identifierCache;
-    QmlEngine *engine;
-};
-
-QmlTypeNameCache::Data::Data()
-: type(0), typeNamespace(0)
-{
-}
-
-QmlTypeNameCache::Data::~Data()
-{
-    if (typeNamespace) typeNamespace->release();
-}
-
-QmlTypeNameCache::Data *QmlTypeNameCache::data(const QScriptDeclarativeClass::Identifier &id) const
-{
-    return identifierCache.value(id);
-}
-
-QT_END_NAMESPACE
-
-#endif // QMLTYPENAMECACHE_P_H
-
diff --git a/src/declarative/qml/qmltypenamescriptclass.cpp b/src/declarative/qml/qmltypenamescriptclass.cpp
deleted file mode 100644
index 32a7a25..0000000
--- a/src/declarative/qml/qmltypenamescriptclass.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmltypenamescriptclass_p.h"
-
-#include "qmlengine_p.h"
-#include "qmltypenamecache_p.h"
-
-QT_BEGIN_NAMESPACE
-
-struct TypeNameData : public QScriptDeclarativeClass::Object {
-    TypeNameData(QObject *o, QmlType *t, QmlTypeNameScriptClass::TypeNameMode m) : object(o), type(t), typeNamespace(0), mode(m) {}
-    TypeNameData(QObject *o, QmlTypeNameCache *n, QmlTypeNameScriptClass::TypeNameMode m) : object(o), type(0), typeNamespace(n), mode(m) {
-        if (typeNamespace) typeNamespace->addref();
-    }
-    ~TypeNameData() {
-        if (typeNamespace) typeNamespace->release();
-    }
-
-    QObject *object;
-    QmlType *type;
-    QmlTypeNameCache *typeNamespace;
-    QmlTypeNameScriptClass::TypeNameMode mode;
-};
-
-QmlTypeNameScriptClass::QmlTypeNameScriptClass(QmlEngine *bindEngine)
-: QmlScriptClass(QmlEnginePrivate::getScriptEngine(bindEngine)), 
-  engine(bindEngine), object(0), type(0)
-{
-}
-
-QmlTypeNameScriptClass::~QmlTypeNameScriptClass()
-{
-}
-
-QScriptValue QmlTypeNameScriptClass::newObject(QObject *object, QmlType *type, TypeNameMode mode)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    return QScriptDeclarativeClass::newObject(scriptEngine, this, new TypeNameData(object, type, mode));
-}
-
-QScriptValue QmlTypeNameScriptClass::newObject(QObject *object, QmlTypeNameCache *ns, TypeNameMode mode)
-{
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-
-    return QScriptDeclarativeClass::newObject(scriptEngine, this, new TypeNameData(object, ns, mode));
-}
-
-QScriptClass::QueryFlags 
-QmlTypeNameScriptClass::queryProperty(Object *obj, const Identifier &name, 
-                                      QScriptClass::QueryFlags flags)
-{
-    Q_UNUSED(flags);
-
-    TypeNameData *data = (TypeNameData *)obj;
-
-    object = 0;
-    type = 0;
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-
-    if (data->typeNamespace) {
-
-        QmlTypeNameCache::Data *d = data->typeNamespace->data(name);
-        if (d && d->type) {
-            type = d->type;
-            return QScriptClass::HandlesReadAccess;
-        } else {
-            return 0;
-        }
-
-    } else {
-        Q_ASSERT(data->type);
-
-        QString strName = toString(name);
-
-        if (strName.at(0).isUpper()) {
-            // Must be an enum
-            if (data->mode == IncludeEnums) {
-                // ### Optimize
-                QByteArray enumName = strName.toUtf8();
-                const QMetaObject *metaObject = data->type->baseMetaObject();
-                for (int ii = metaObject->enumeratorCount() - 1; ii >= 0; --ii) {
-                    QMetaEnum e = metaObject->enumerator(ii);
-                    int value = e.keyToValue(enumName.constData());
-                    if (value != -1) {
-                        enumValue = value;
-                        return QScriptClass::HandlesReadAccess;
-                    }
-                }
-            }
-            return 0;
-        } else if (data->object) {
-            // Must be an attached property
-            object = qmlAttachedPropertiesObjectById(data->type->index(), data->object);
-            if (!object) return 0;
-            return ep->objectClass->queryProperty(object, name, flags, 0);
-        }
-    }
-
-    return 0;
-}
-
-QmlTypeNameScriptClass::ScriptValue 
-QmlTypeNameScriptClass::property(Object *obj, const Identifier &name)
-{
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-    if (type) {
-        return Value(scriptEngine, newObject(((TypeNameData *)obj)->object, type, ((TypeNameData *)obj)->mode));
-    } else if (object) {
-        return ep->objectClass->property(object, name);
-    } else {
-        return Value(scriptEngine, enumValue);
-    }
-}
-
-void QmlTypeNameScriptClass::setProperty(Object *o, const Identifier &n, const QScriptValue &v)
-{
-    Q_ASSERT(object);
-    Q_ASSERT(!type);
-
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-    ep->objectClass->setProperty(((TypeNameData *)o)->object, n, v);
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/qml/qmltypenamescriptclass_p.h b/src/declarative/qml/qmltypenamescriptclass_p.h
deleted file mode 100644
index fd5752d..0000000
--- a/src/declarative/qml/qmltypenamescriptclass_p.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLTYPENAMESCRIPTCLASS_P_H
-#define QMLTYPENAMESCRIPTCLASS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-#include "qmlengine_p.h"
-
-#include <QtScript/qscriptclass.h>
-
-#include <private/qmlscriptclass_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QmlType;
-class QmlTypeNameCache;
-class QmlTypeNameScriptClass : public QmlScriptClass
-{
-public:
-    QmlTypeNameScriptClass(QmlEngine *);
-    ~QmlTypeNameScriptClass();
-
-    enum TypeNameMode { IncludeEnums, ExcludeEnums };
-    QScriptValue newObject(QObject *, QmlType *, TypeNameMode = IncludeEnums);
-    QScriptValue newObject(QObject *, QmlTypeNameCache *, TypeNameMode = IncludeEnums);
-
-protected:
-    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
-                                                   QScriptClass::QueryFlags flags);
-
-    virtual ScriptValue property(Object *, const Identifier &);
-    virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
-
-private:
-    QmlEngine *engine;
-    QObject *object;
-    QmlType *type;
-    quint32 enumValue;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLTYPENAMESCRIPTCLASS_P_H
-
diff --git a/src/declarative/qml/qmlvaluetype.cpp b/src/declarative/qml/qmlvaluetype.cpp
deleted file mode 100644
index e3b4219..0000000
--- a/src/declarative/qml/qmlvaluetype.cpp
+++ /dev/null
@@ -1,706 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlvaluetype_p.h"
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-QmlValueTypeFactory::QmlValueTypeFactory()
-{
-    // ### Optimize
-    for (unsigned int ii = 0; ii < (QVariant::UserType - 1); ++ii)
-        valueTypes[ii] = valueType(ii);
-}
-
-QmlValueTypeFactory::~QmlValueTypeFactory()
-{
-    for (unsigned int ii = 0; ii < (QVariant::UserType - 1); ++ii)
-        delete valueTypes[ii];
-}
-
-QmlValueType *QmlValueTypeFactory::valueType(int t)
-{
-    switch (t) {
-    case QVariant::Point:
-        return new QmlPointValueType;
-    case QVariant::PointF:
-        return new QmlPointFValueType;
-    case QVariant::Size:
-        return new QmlSizeValueType;
-    case QVariant::SizeF:
-        return new QmlSizeFValueType;
-    case QVariant::Rect:
-        return new QmlRectValueType;
-    case QVariant::RectF:
-        return new QmlRectFValueType;
-    case QVariant::Vector3D:
-        return new QmlVector3DValueType;
-    case QVariant::EasingCurve:
-        return new QmlEasingValueType;
-    case QVariant::Font:
-        return new QmlFontValueType;
-    default:
-        return 0;
-    }
-}
-
-QmlValueType::QmlValueType(QObject *parent)
-: QObject(parent)
-{
-}
-
-QmlPointFValueType::QmlPointFValueType(QObject *parent)
-: QmlValueType(parent)
-{
-}
-
-void QmlPointFValueType::read(QObject *obj, int idx)
-{
-    void *a[] = { &point, 0 };
-    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
-}
-
-void QmlPointFValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
-{
-    int status = -1;
-    void *a[] = { &point, 0, &status, &flags };
-    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
-}
-
-QVariant QmlPointFValueType::value()
-{
-    return QVariant(point);
-}
-
-void QmlPointFValueType::setValue(QVariant value)
-{
-    point = qvariant_cast<QPointF>(value);
-}
-
-qreal QmlPointFValueType::x() const
-{
-    return point.x();
-}
-
-qreal QmlPointFValueType::y() const
-{
-    return point.y();
-}
-
-void QmlPointFValueType::setX(qreal x)
-{
-    point.setX(x);
-}
-
-void QmlPointFValueType::setY(qreal y)
-{
-    point.setY(y);
-}
-
-QmlPointValueType::QmlPointValueType(QObject *parent)
-: QmlValueType(parent)
-{
-}
-
-void QmlPointValueType::read(QObject *obj, int idx)
-{
-    void *a[] = { &point, 0 };
-    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
-}
-
-void QmlPointValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
-{
-    int status = -1;
-    void *a[] = { &point, 0, &status, &flags };
-    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
-}
-
-QVariant QmlPointValueType::value()
-{
-    return QVariant(point);
-}
-
-void QmlPointValueType::setValue(QVariant value)
-{
-    point = qvariant_cast<QPoint>(value);
-}
-
-int QmlPointValueType::x() const
-{
-    return point.x();
-}
-
-int QmlPointValueType::y() const
-{
-    return point.y();
-}
-
-void QmlPointValueType::setX(int x)
-{
-    point.setX(x);
-}
-
-void QmlPointValueType::setY(int y)
-{
-    point.setY(y);
-}
-
-QmlSizeFValueType::QmlSizeFValueType(QObject *parent)
-: QmlValueType(parent)
-{
-}
-
-void QmlSizeFValueType::read(QObject *obj, int idx)
-{
-    void *a[] = { &size, 0 };
-    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
-}
-
-void QmlSizeFValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
-{
-    int status = -1;
-    void *a[] = { &size, 0, &status, &flags };
-    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
-}
-
-QVariant QmlSizeFValueType::value()
-{
-    return QVariant(size);
-}
-
-void QmlSizeFValueType::setValue(QVariant value)
-{
-    size = qvariant_cast<QSizeF>(value);
-}
-
-qreal QmlSizeFValueType::width() const
-{
-    return size.width();
-}
-
-qreal QmlSizeFValueType::height() const
-{
-    return size.height();
-}
-
-void QmlSizeFValueType::setWidth(qreal w)
-{
-    size.setWidth(w);
-}
-
-void QmlSizeFValueType::setHeight(qreal h)
-{
-    size.setHeight(h);
-}
-
-QmlSizeValueType::QmlSizeValueType(QObject *parent)
-: QmlValueType(parent)
-{
-}
-
-void QmlSizeValueType::read(QObject *obj, int idx)
-{
-    void *a[] = { &size, 0 };
-    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
-}
-
-void QmlSizeValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
-{
-    int status = -1;
-    void *a[] = { &size, 0, &status, &flags };
-    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
-}
-
-QVariant QmlSizeValueType::value()
-{
-    return QVariant(size);
-}
-
-void QmlSizeValueType::setValue(QVariant value)
-{
-    size = qvariant_cast<QSize>(value);
-}
-
-int QmlSizeValueType::width() const
-{
-    return size.width();
-}
-
-int QmlSizeValueType::height() const
-{
-    return size.height();
-}
-
-void QmlSizeValueType::setWidth(int w)
-{
-    size.setWidth(w);
-}
-
-void QmlSizeValueType::setHeight(int h)
-{
-    size.setHeight(h);
-}
-
-QmlRectFValueType::QmlRectFValueType(QObject *parent)
-: QmlValueType(parent)
-{
-}
-
-void QmlRectFValueType::read(QObject *obj, int idx)
-{
-    void *a[] = { &rect, 0 };
-    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
-}
-
-void QmlRectFValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
-{
-    int status = -1;
-    void *a[] = { &rect, 0, &status, &flags };
-    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
-}
-
-QVariant QmlRectFValueType::value()
-{
-    return QVariant(rect);
-}
-
-void QmlRectFValueType::setValue(QVariant value)
-{
-    rect = qvariant_cast<QRectF>(value);
-}
-
-qreal QmlRectFValueType::x() const
-{
-    return rect.x();
-}
-
-qreal QmlRectFValueType::y() const
-{
-    return rect.y();
-}
-
-void QmlRectFValueType::setX(qreal x)
-{
-    rect.moveLeft(x);
-}
-
-void QmlRectFValueType::setY(qreal y)
-{
-    rect.moveTop(y);
-}
-
-qreal QmlRectFValueType::width() const
-{
-    return rect.width();
-}
-
-qreal QmlRectFValueType::height() const
-{
-    return rect.height();
-}
-
-void QmlRectFValueType::setWidth(qreal w)
-{
-    rect.setWidth(w);
-}
-
-void QmlRectFValueType::setHeight(qreal h)
-{
-    rect.setHeight(h);
-}
-
-QmlRectValueType::QmlRectValueType(QObject *parent)
-: QmlValueType(parent)
-{
-}
-
-void QmlRectValueType::read(QObject *obj, int idx)
-{
-    void *a[] = { &rect, 0 };
-    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
-}
-
-void QmlRectValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
-{
-    int status = -1;
-    void *a[] = { &rect, 0, &status, &flags };
-    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
-}
-
-QVariant QmlRectValueType::value()
-{
-    return QVariant(rect);
-}
-
-void QmlRectValueType::setValue(QVariant value)
-{
-    rect = qvariant_cast<QRect>(value);
-}
-
-int QmlRectValueType::x() const
-{
-    return rect.x();
-}
-
-int QmlRectValueType::y() const
-{
-    return rect.y();
-}
-
-void QmlRectValueType::setX(int x)
-{
-    rect.moveLeft(x);
-}
-
-void QmlRectValueType::setY(int y)
-{
-    rect.moveTop(y);
-}
-
-int QmlRectValueType::width() const
-{
-    return rect.width();
-}
-
-int QmlRectValueType::height() const
-{
-    return rect.height();
-}
-
-void QmlRectValueType::setWidth(int w)
-{
-    rect.setWidth(w);
-}
-
-void QmlRectValueType::setHeight(int h)
-{
-    rect.setHeight(h);
-}
-
-QmlVector3DValueType::QmlVector3DValueType(QObject *parent)
-: QmlValueType(parent)
-{
-}
-
-void QmlVector3DValueType::read(QObject *obj, int idx)
-{
-    void *a[] = { &vector, 0 };
-    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
-}
-
-void QmlVector3DValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
-{
-    int status = -1;
-    void *a[] = { &vector, 0, &status, &flags };
-    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
-}
-
-QVariant  QmlVector3DValueType::value()
-{
-    return QVariant(vector);
-}
-
-void QmlVector3DValueType::setValue(QVariant value)
-{
-    vector = qvariant_cast<QVector3D>(value);
-}
-
-qreal QmlVector3DValueType::x() const
-{
-    return vector.x();
-}
-
-qreal QmlVector3DValueType::y() const
-{
-    return vector.y();
-}
-
-qreal QmlVector3DValueType::z() const
-{
-    return vector.z();
-}
-
-void QmlVector3DValueType::setX(qreal x)
-{
-    vector.setX(x);
-}
-
-void QmlVector3DValueType::setY(qreal y)
-{
-    vector.setY(y);
-}
-
-void QmlVector3DValueType::setZ(qreal z)
-{
-    vector.setZ(z);
-}
-
-QmlEasingValueType::QmlEasingValueType(QObject *parent)
-: QmlValueType(parent)
-{
-}
-
-void QmlEasingValueType::read(QObject *obj, int idx)
-{
-    void *a[] = { &easing, 0 };
-    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
-}
-
-void QmlEasingValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
-{
-    int status = -1;
-    void *a[] = { &easing, 0, &status, &flags };
-    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
-}
-
-QVariant QmlEasingValueType::value()
-{
-    return QVariant(easing);
-}
-
-void QmlEasingValueType::setValue(QVariant value)
-{
-    easing = qvariant_cast<QEasingCurve>(value);
-}
-
-QmlEasingValueType::Type QmlEasingValueType::type() const
-{
-    return (QmlEasingValueType::Type)easing.type();
-}
-
-qreal QmlEasingValueType::amplitude() const
-{
-    return easing.amplitude();
-}
-
-qreal QmlEasingValueType::overshoot() const
-{
-    return easing.overshoot();
-}
-
-qreal QmlEasingValueType::period() const
-{
-    return easing.period();
-}
-
-void QmlEasingValueType::setType(QmlEasingValueType::Type type)
-{
-    easing.setType((QEasingCurve::Type)type);
-}
-
-void QmlEasingValueType::setAmplitude(qreal amplitude)
-{
-    easing.setAmplitude(amplitude);
-}
-
-void QmlEasingValueType::setOvershoot(qreal overshoot)
-{
-    easing.setOvershoot(overshoot);
-}
-
-void QmlEasingValueType::setPeriod(qreal period)
-{
-    easing.setPeriod(period);
-}
-
-QmlFontValueType::QmlFontValueType(QObject *parent)
-: QmlValueType(parent), hasPixelSize(false)
-{
-}
-
-void QmlFontValueType::read(QObject *obj, int idx)
-{
-    void *a[] = { &font, 0 };
-    QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
-}
-
-void QmlFontValueType::write(QObject *obj, int idx, QmlMetaProperty::WriteFlags flags)
-{
-    int status = -1;
-    void *a[] = { &font, 0, &status, &flags };
-    QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a);
-}
-
-QVariant  QmlFontValueType::value()
-{
-    return QVariant(font);
-}
-
-void QmlFontValueType::setValue(QVariant value)
-{
-    font = qvariant_cast<QFont>(value);
-}
-
-
-QString QmlFontValueType::family() const
-{
-    return font.family();
-}
-
-void QmlFontValueType::setFamily(const QString &family)
-{
-    font.setFamily(family);
-}
-
-bool QmlFontValueType::bold() const
-{
-    return font.bold();
-}
-
-void QmlFontValueType::setBold(bool b)
-{
-    font.setBold(b);
-}
-
-QmlFontValueType::FontWeight QmlFontValueType::weight() const
-{
-    return (QmlFontValueType::FontWeight)font.weight();
-}
-
-void QmlFontValueType::setWeight(QmlFontValueType::FontWeight w)
-{
-    font.setWeight((QFont::Weight)w);
-}
-
-bool QmlFontValueType::italic() const
-{
-    return font.italic();
-}
-
-void QmlFontValueType::setItalic(bool b)
-{
-    font.setItalic(b);
-}
-
-bool QmlFontValueType::underline() const
-{
-    return font.underline();
-}
-
-void QmlFontValueType::setUnderline(bool b)
-{
-    font.setUnderline(b);
-}
-
-bool QmlFontValueType::overline() const
-{
-    return font.overline();
-}
-
-void QmlFontValueType::setOverline(bool b)
-{
-    font.setOverline(b);
-}
-
-bool QmlFontValueType::strikeout() const
-{
-    return font.strikeOut();
-}
-
-void QmlFontValueType::setStrikeout(bool b)
-{
-    font.setStrikeOut(b);
-}
-
-qreal QmlFontValueType::pointSize() const
-{
-    return font.pointSizeF();
-}
-
-void QmlFontValueType::setPointSize(qreal size)
-{
-    if (hasPixelSize) {
-        qWarning() << "Both point size and pixel size set. Using pixel size.";
-        return;
-    }
-
-    if (size >= 0.0)
-        font.setPointSizeF(size);
-}
-
-int QmlFontValueType::pixelSize() const
-{
-    return font.pixelSize();
-}
-
-void QmlFontValueType::setPixelSize(int size)
-{
-    if (size >=0) {
-        font.setPixelSize(size);
-        hasPixelSize = true;
-    } else {
-        hasPixelSize = false;
-    }
-}
-
-QmlFontValueType::Capitalization QmlFontValueType::capitalization() const
-{
-    return (QmlFontValueType::Capitalization)font.capitalization();
-}
-
-void QmlFontValueType::setCapitalization(QmlFontValueType::Capitalization c)
-{
-    font.setCapitalization((QFont::Capitalization)c);
-}
-
-qreal QmlFontValueType::letterSpacing() const
-{
-    return font.letterSpacing();
-}
-
-void QmlFontValueType::setLetterSpacing(qreal size)
-{
-    font.setLetterSpacing(QFont::PercentageSpacing, size);
-}
-
-qreal QmlFontValueType::wordSpacing() const
-{
-    return font.wordSpacing();
-}
-
-void QmlFontValueType::setWordSpacing(qreal size)
-{
-    font.setWordSpacing(size);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h
deleted file mode 100644
index 6dd3703..0000000
--- a/src/declarative/qml/qmlvaluetype_p.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLVALUETYPE_P_H
-#define QMLVALUETYPE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlmetaproperty.h"
-
-#include <QtCore/qobject.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qeasingcurve.h>
-#include <QtCore/qvariant.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qfont.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_DECLARATIVE_EXPORT QmlValueType : public QObject
-{
-    Q_OBJECT
-public:
-    QmlValueType(QObject *parent = 0);
-    virtual void read(QObject *, int) = 0;
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags flags) = 0;
-    virtual QVariant value() = 0;
-    virtual void setValue(QVariant) = 0;
-};
-
-class Q_DECLARATIVE_EXPORT QmlValueTypeFactory
-{
-public:
-    QmlValueTypeFactory();
-    ~QmlValueTypeFactory();
-    static QmlValueType *valueType(int);
-
-    QmlValueType *valueTypes[QVariant::UserType - 1]; 
-    QmlValueType *operator[](int idx) const { return valueTypes[idx]; }
-};
-
-class Q_AUTOTEST_EXPORT QmlPointFValueType : public QmlValueType
-{
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_OBJECT
-public:
-    QmlPointFValueType(QObject *parent = 0);
-
-    virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
-    virtual QVariant value();
-    virtual void setValue(QVariant value);
-
-    qreal x() const;
-    qreal y() const;
-    void setX(qreal);
-    void setY(qreal);
-
-private:
-    QPointF point;
-};
-
-class Q_AUTOTEST_EXPORT QmlPointValueType : public QmlValueType
-{
-    Q_PROPERTY(int x READ x WRITE setX)
-    Q_PROPERTY(int y READ y WRITE setY)
-    Q_OBJECT
-public:
-    QmlPointValueType(QObject *parent = 0);
-
-    virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
-    virtual QVariant value();
-    virtual void setValue(QVariant value);
-
-    int x() const;
-    int y() const;
-    void setX(int);
-    void setY(int);
-
-private:
-    QPoint point;
-};
-
-class Q_AUTOTEST_EXPORT QmlSizeFValueType : public QmlValueType
-{
-    Q_PROPERTY(qreal width READ width WRITE setWidth)
-    Q_PROPERTY(qreal height READ height WRITE setHeight)
-    Q_OBJECT
-public:
-    QmlSizeFValueType(QObject *parent = 0);
-
-    virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
-    virtual QVariant value();
-    virtual void setValue(QVariant value);
-
-    qreal width() const;
-    qreal height() const;
-    void setWidth(qreal);
-    void setHeight(qreal);
-
-private:
-    QSizeF size;
-};
-
-class Q_AUTOTEST_EXPORT QmlSizeValueType : public QmlValueType
-{
-    Q_PROPERTY(int width READ width WRITE setWidth)
-    Q_PROPERTY(int height READ height WRITE setHeight)
-    Q_OBJECT
-public:
-    QmlSizeValueType(QObject *parent = 0);
-
-    virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
-    virtual QVariant value();
-    virtual void setValue(QVariant value);
-
-    int width() const;
-    int height() const;
-    void setWidth(int);
-    void setHeight(int);
-
-private:
-    QSize size;
-};
-
-class Q_AUTOTEST_EXPORT QmlRectFValueType : public QmlValueType
-{
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_PROPERTY(qreal width READ width WRITE setWidth)
-    Q_PROPERTY(qreal height READ height WRITE setHeight)
-    Q_OBJECT
-public:
-    QmlRectFValueType(QObject *parent = 0);
-
-    virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
-    virtual QVariant value();
-    virtual void setValue(QVariant value);
-
-    qreal x() const;
-    qreal y() const;
-    void setX(qreal);
-    void setY(qreal);
-    
-    qreal width() const;
-    qreal height() const;
-    void setWidth(qreal);
-    void setHeight(qreal);
-
-private:
-    QRectF rect;
-};
-
-class Q_AUTOTEST_EXPORT QmlRectValueType : public QmlValueType
-{
-    Q_PROPERTY(int x READ x WRITE setX)
-    Q_PROPERTY(int y READ y WRITE setY)
-    Q_PROPERTY(int width READ width WRITE setWidth)
-    Q_PROPERTY(int height READ height WRITE setHeight)
-    Q_OBJECT
-public:
-    QmlRectValueType(QObject *parent = 0);
-
-    virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
-    virtual QVariant value();
-    virtual void setValue(QVariant value);
-
-    int x() const;
-    int y() const;
-    void setX(int);
-    void setY(int);
-    
-    int width() const;
-    int height() const;
-    void setWidth(int);
-    void setHeight(int);
-
-private:
-    QRect rect;
-};
-
-class Q_AUTOTEST_EXPORT QmlVector3DValueType : public QmlValueType
-{
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_PROPERTY(qreal z READ z WRITE setZ)
-    Q_OBJECT
-public:
-    QmlVector3DValueType(QObject *parent = 0);
-
-    virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
-    virtual QVariant value();
-    virtual void setValue(QVariant value);
-
-    qreal x() const;
-    qreal y() const;
-    qreal z() const;
-    void setX(qreal);
-    void setY(qreal);
-    void setZ(qreal);
-
-private:
-    QVector3D vector;
-};
-
-class Q_AUTOTEST_EXPORT QmlEasingValueType : public QmlValueType
-{
-    Q_OBJECT
-    Q_ENUMS(Type)
-
-    Q_PROPERTY(QmlEasingValueType::Type type READ type WRITE setType)
-    Q_PROPERTY(qreal amplitude READ amplitude WRITE setAmplitude)
-    Q_PROPERTY(qreal overshoot READ overshoot WRITE setOvershoot)
-    Q_PROPERTY(qreal period READ period WRITE setPeriod)
-public:
-    enum Type {
-        Linear = QEasingCurve::Linear,
-        InQuad = QEasingCurve::InQuad, OutQuad = QEasingCurve::OutQuad,
-        InOutQuad = QEasingCurve::InOutQuad, OutInQuad = QEasingCurve::OutInQuad,
-        InCubic = QEasingCurve::InCubic, OutCubic = QEasingCurve::OutCubic,
-        InOutCubic = QEasingCurve::InOutCubic, OutInCubic = QEasingCurve::OutInCubic,
-        InQuart = QEasingCurve::InQuart, OutQuart = QEasingCurve::OutQuart,
-        InOutQuart = QEasingCurve::InOutQuart, OutInQuart = QEasingCurve::OutInQuart,
-        InQuint = QEasingCurve::InQuint, OutQuint = QEasingCurve::OutQuint,
-        InOutQuint = QEasingCurve::InOutQuint, OutInQuint = QEasingCurve::OutInQuint,
-        InSine = QEasingCurve::InSine, OutSine = QEasingCurve::OutSine,
-        InOutSine = QEasingCurve::InOutSine, OutInSine = QEasingCurve::OutInSine,
-        InExpo = QEasingCurve::InExpo, OutExpo = QEasingCurve::OutExpo,
-        InOutExpo = QEasingCurve::InOutExpo, OutInExpo = QEasingCurve::OutInExpo,
-        InCirc = QEasingCurve::InCirc, OutCirc = QEasingCurve::OutCirc,
-        InOutCirc = QEasingCurve::InOutCirc, OutInCirc = QEasingCurve::OutInCirc,
-        InElastic = QEasingCurve::InElastic, OutElastic = QEasingCurve::OutElastic,
-        InOutElastic = QEasingCurve::InOutElastic, OutInElastic = QEasingCurve::OutInElastic,
-        InBack = QEasingCurve::InBack, OutBack = QEasingCurve::OutBack,
-        InOutBack = QEasingCurve::InOutBack, OutInBack = QEasingCurve::OutInBack,
-        InBounce = QEasingCurve::InBounce, OutBounce = QEasingCurve::OutBounce,
-        InOutBounce = QEasingCurve::InOutBounce, OutInBounce = QEasingCurve::OutInBounce,
-        InCurve = QEasingCurve::InCurve, OutCurve = QEasingCurve::OutCurve,
-        SineCurve = QEasingCurve::SineCurve, CosineCurve = QEasingCurve::CosineCurve,
-    };
-
-    QmlEasingValueType(QObject *parent = 0);
-
-    virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
-    virtual QVariant value();
-    virtual void setValue(QVariant value);
-
-    Type type() const;
-    qreal amplitude() const;
-    qreal overshoot() const;
-    qreal period() const;
-    void setType(Type);
-    void setAmplitude(qreal);
-    void setOvershoot(qreal);
-    void setPeriod(qreal);
-
-private:
-    QEasingCurve easing;
-};
-
-class Q_AUTOTEST_EXPORT QmlFontValueType : public QmlValueType
-{
-    Q_OBJECT
-    Q_ENUMS(FontWeight)
-    Q_ENUMS(Capitalization)
-
-    Q_PROPERTY(QString family READ family WRITE setFamily)
-    Q_PROPERTY(bool bold READ bold WRITE setBold)
-    Q_PROPERTY(FontWeight weight READ weight WRITE setWeight)
-    Q_PROPERTY(bool italic READ italic WRITE setItalic)
-    Q_PROPERTY(bool underline READ underline WRITE setUnderline)
-    Q_PROPERTY(bool overline READ overline WRITE setOverline)
-    Q_PROPERTY(bool strikeout READ strikeout WRITE setStrikeout)
-    Q_PROPERTY(qreal pointSize READ pointSize WRITE setPointSize)
-    Q_PROPERTY(int pixelSize READ pixelSize WRITE setPixelSize)
-    Q_PROPERTY(Capitalization capitalization READ capitalization WRITE setCapitalization)
-    Q_PROPERTY(qreal letterSpacing READ letterSpacing WRITE setLetterSpacing)
-    Q_PROPERTY(qreal wordSpacing READ wordSpacing WRITE setWordSpacing)
-
-public:
-    enum FontWeight { Light = QFont::Light,
-                       Normal = QFont::Normal,
-                       DemiBold = QFont::DemiBold,
-                       Bold = QFont::Bold,
-                       Black = QFont::Black };
-    enum Capitalization { MixedCase = QFont::MixedCase,
-                           AllUppercase = QFont::AllUppercase,
-                           AllLowercase = QFont::AllLowercase,
-                           SmallCaps = QFont::SmallCaps,
-                           Capitalize = QFont::Capitalize };
-
-    QmlFontValueType(QObject *parent = 0);
-
-    virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QmlMetaProperty::WriteFlags);
-    virtual QVariant value();
-    virtual void setValue(QVariant value);
-
-    QString family() const;
-    void setFamily(const QString &);
-
-    bool bold() const;
-    void setBold(bool b);
-
-    FontWeight weight() const;
-    void setWeight(FontWeight);
-
-    bool italic() const;
-    void setItalic(bool b);
-
-    bool underline() const;
-    void setUnderline(bool b);
-
-    bool overline() const;
-    void setOverline(bool b);
-
-    bool strikeout() const;
-    void setStrikeout(bool b);
-
-    qreal pointSize() const;
-    void setPointSize(qreal size);
-
-    int pixelSize() const;
-    void setPixelSize(int size);
-
-    Capitalization capitalization() const;
-    void setCapitalization(Capitalization);
-
-    qreal letterSpacing() const;
-    void setLetterSpacing(qreal spacing);
-
-    qreal wordSpacing() const;
-    void setWordSpacing(qreal spacing);
-
-private:
-    QFont font;
-    bool hasPixelSize;
-};
-
-QT_END_NAMESPACE
-
-#endif  // QMLVALUETYPE_P_H
diff --git a/src/declarative/qml/qmlvaluetypescriptclass.cpp b/src/declarative/qml/qmlvaluetypescriptclass.cpp
deleted file mode 100644
index 0a92014..0000000
--- a/src/declarative/qml/qmlvaluetypescriptclass.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlvaluetypescriptclass_p.h"
-
-#include "qmlengine_p.h"
-#include "qmlguard_p.h"
-
-QT_BEGIN_NAMESPACE
-
-struct QmlValueTypeReference : public QScriptDeclarativeClass::Object {
-    QmlValueType *type;
-    QmlGuard<QObject> object;
-    int property;
-};
-
-QmlValueTypeScriptClass::QmlValueTypeScriptClass(QmlEngine *bindEngine)
-: QmlScriptClass(QmlEnginePrivate::getScriptEngine(bindEngine)), engine(bindEngine)
-{
-}
-
-QmlValueTypeScriptClass::~QmlValueTypeScriptClass()
-{
-}
-
-QScriptValue QmlValueTypeScriptClass::newObject(QObject *object, int coreIndex, QmlValueType *type)
-{
-    QmlValueTypeReference *ref = new QmlValueTypeReference;
-    ref->type = type;
-    ref->object = object;
-    ref->property = coreIndex;
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-    return QScriptDeclarativeClass::newObject(scriptEngine, this, ref);
-}
-
-QScriptClass::QueryFlags 
-QmlValueTypeScriptClass::queryProperty(Object *obj, const Identifier &name, 
-                                       QScriptClass::QueryFlags)
-{
-    QmlValueTypeReference *ref = static_cast<QmlValueTypeReference *>(obj);
-
-    m_lastIndex = -1;
-
-    if (!ref->object)
-        return 0;
-
-    QByteArray propName = toString(name).toUtf8();
-
-    m_lastIndex = ref->type->metaObject()->indexOfProperty(propName.constData());
-    if (m_lastIndex == -1)
-        return 0;
-
-    QMetaProperty prop = ref->object->metaObject()->property(m_lastIndex);
-
-    QScriptClass::QueryFlags rv =
-        QScriptClass::HandlesReadAccess;
-    if (prop.isWritable())
-        rv |= QScriptClass::HandlesWriteAccess;
-
-    return rv;
-}
-
-QmlValueTypeScriptClass::ScriptValue QmlValueTypeScriptClass::property(Object *obj, const Identifier &)
-{
-    QmlValueTypeReference *ref = static_cast<QmlValueTypeReference *>(obj);
-
-    QMetaProperty p = ref->type->metaObject()->property(m_lastIndex);
-    ref->type->read(ref->object, ref->property);
-    QVariant rv = p.read(ref->type);
-
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-    return Value(scriptEngine, static_cast<QmlEnginePrivate *>(QObjectPrivate::get(engine))->scriptValueFromVariant(rv));
-}
-
-void QmlValueTypeScriptClass::setProperty(Object *obj, const Identifier &, 
-                                          const QScriptValue &value)
-{
-    QmlValueTypeReference *ref = static_cast<QmlValueTypeReference *>(obj);
-
-    QVariant v = QmlScriptClass::toVariant(engine, value);
-
-    ref->type->read(ref->object, ref->property);
-    QMetaProperty p = ref->type->metaObject()->property(m_lastIndex);
-    p.write(ref->type, v);
-    ref->type->write(ref->object, ref->property, 0);
-}
-
-QVariant QmlValueTypeScriptClass::toVariant(Object *obj, bool *ok)
-{
-    QmlValueTypeReference *ref = static_cast<QmlValueTypeReference *>(obj);
-
-    if (ok) *ok = true;
-
-    if (ref->object) {
-        ref->type->read(ref->object, ref->property);
-        return ref->type->value();
-    } else {
-        return QVariant();
-    }
-}
-
-QVariant QmlValueTypeScriptClass::toVariant(const QScriptValue &value)
-{
-    Q_ASSERT(scriptClass(value) == this);
-
-    return toVariant(object(value), 0);
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/qml/qmlvaluetypescriptclass_p.h b/src/declarative/qml/qmlvaluetypescriptclass_p.h
deleted file mode 100644
index 12aef49..0000000
--- a/src/declarative/qml/qmlvaluetypescriptclass_p.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLVALUETYPESCRIPTCLASS_P_H
-#define QMLVALUETYPESCRIPTCLASS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-
-#include <private/qmlscriptclass_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-class QmlValueType;
-class QmlValueTypeScriptClass : public QmlScriptClass
-{
-public:
-    QmlValueTypeScriptClass(QmlEngine *);
-    ~QmlValueTypeScriptClass();
-
-    QScriptValue newObject(QObject *object, int coreIndex, QmlValueType *);
-
-    virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
-                                                   QScriptClass::QueryFlags flags);
-    virtual ScriptValue property(Object *, const Identifier &);
-    virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
-
-    virtual QVariant toVariant(Object *, bool *ok = 0);
-    QVariant toVariant(const QScriptValue &);
-private:
-    QmlEngine *engine;
-    int m_lastIndex;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLVALUETYPESCRIPTCLASS_P_H
-
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
deleted file mode 100644
index f8f1ff0..0000000
--- a/src/declarative/qml/qmlvme.cpp
+++ /dev/null
@@ -1,851 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlvme_p.h"
-
-#include "qmlcompiler_p.h"
-#include "qmlboundsignal_p.h"
-#include "qmlstringconverters_p.h"
-#include "qmetaobjectbuilder_p.h"
-#include "qmldeclarativedata_p.h"
-#include "qml.h"
-#include "qmlcustomparser_p.h"
-#include "qmlengine.h"
-#include "qmlcontext.h"
-#include "qmlcomponent.h"
-#include "qmlbinding_p.h"
-#include "qmlengine_p.h"
-#include "qmlcomponent_p.h"
-#include "qmlvmemetaobject_p.h"
-#include "qmlbinding_p_p.h"
-#include "qmlcontext_p.h"
-#include "qmlcompiledbindings_p.h"
-#include "qmlglobal_p.h"
-#include "qmlscriptstring.h"
-
-#include <qfxperf_p_p.h>
-
-#include <QStack>
-#include <QWidget>
-#include <QColor>
-#include <QPointF>
-#include <QSizeF>
-#include <QRectF>
-#include <QtCore/qdebug.h>
-#include <QtCore/qvarlengtharray.h>
-#include <QtCore/qcoreapplication.h>
-
-QT_BEGIN_NAMESPACE
-
-QmlVME::QmlVME()
-{
-}
-
-#define VME_EXCEPTION(desc) \
-    { \
-        QmlError error; \
-        error.setDescription(desc.trimmed()); \
-        error.setLine(instr.line); \
-        error.setUrl(comp->url); \
-        vmeErrors << error; \
-        break; \
-    }
-
-struct ListInstance
-{
-    ListInstance() 
-        : type(0) {}
-    ListInstance(int t) 
-        : type(t) {}
-
-    int type;
-    QmlListProperty<void> qListProperty;
-};
-
-QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledData *comp, 
-                     int start, int count, 
-                     const QBitField &bindingSkipList)
-{
-    QmlVMEStack<QObject *> stack;
-
-    if (start == -1) start = 0;
-    if (count == -1) count = comp->bytecode.count();
-
-    return run(stack, ctxt, comp, start, count, bindingSkipList);
-}
-
-void QmlVME::runDeferred(QObject *object)
-{
-    QmlDeclarativeData *data = QmlDeclarativeData::get(object);
-
-    if (!data || !data->context || !data->deferredComponent)
-        return;
-
-    QmlContext *ctxt = data->context;
-    QmlCompiledData *comp = data->deferredComponent;
-    int start = data->deferredIdx + 1;
-    int count = data->deferredComponent->bytecode.at(data->deferredIdx).defer.deferCount;
-    QmlVMEStack<QObject *> stack;
-    stack.push(object);
-
-    run(stack, ctxt, comp, start, count, QBitField());
-}
-
-QObject *QmlVME::run(QmlVMEStack<QObject *> &stack, QmlContext *ctxt, 
-                     QmlCompiledData *comp, 
-                     int start, int count, 
-                     const QBitField &bindingSkipList)
-{
-    Q_ASSERT(comp);
-    Q_ASSERT(ctxt);
-    const QList<QmlCompiledData::TypeReference> &types = comp->types;
-    const QList<QString> &primitives = comp->primitives;
-    const QList<QByteArray> &datas = comp->datas;
-    const QList<QmlCompiledData::CustomTypeData> &customTypeData = comp->customTypeData;
-    const QList<int> &intData = comp->intData;
-    const QList<float> &floatData = comp->floatData;
-    const QList<QmlPropertyCache *> &propertyCaches = comp->propertyCaches;
-    const QList<QmlParser::Object::ScriptBlock> &scripts = comp->scripts;
-    const QList<QUrl> &urls = comp->urls;
-
-    QmlEnginePrivate::SimpleList<QmlAbstractBinding> bindValues;
-    QmlEnginePrivate::SimpleList<QmlParserStatus> parserStatus;
-
-    QmlVMEStack<ListInstance> qliststack;
-
-    vmeErrors.clear();
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(ctxt->engine());
-    QmlContextPrivate *cp = (QmlContextPrivate *)QObjectPrivate::get(ctxt);
-
-    int status = -1;    //for dbus
-    QmlMetaProperty::WriteFlags flags = QmlMetaProperty::BypassInterceptor;
-
-    for (int ii = start; !isError() && ii < (start + count); ++ii) {
-        const QmlInstruction &instr = comp->bytecode.at(ii);
-
-        switch(instr.type) {
-        case QmlInstruction::Init:
-            {
-                if (instr.init.bindingsSize) 
-                    bindValues = QmlEnginePrivate::SimpleList<QmlAbstractBinding>(instr.init.bindingsSize);
-                if (instr.init.parserStatusSize)
-                    parserStatus = QmlEnginePrivate::SimpleList<QmlParserStatus>(instr.init.parserStatusSize);
-                if (instr.init.contextCache != -1) 
-                    cp->setIdPropertyData(comp->contextCaches.at(instr.init.contextCache));
-                if (instr.init.compiledBinding != -1) 
-                    cp->optimizedBindings = new QmlCompiledBindings(datas.at(instr.init.compiledBinding).constData(), ctxt);
-            }
-            break;
-
-        case QmlInstruction::CreateObject:
-            {
-                QBitField bindings;
-                if (instr.create.bindingBits != -1) {
-                    const QByteArray &bits = datas.at(instr.create.bindingBits);
-                    bindings = QBitField((const quint32*)bits.constData(),
-                                         bits.size() * 8);
-                }
-                if (stack.isEmpty())
-                    bindings = bindings.united(bindingSkipList);
-
-                QObject *o = 
-                    types.at(instr.create.type).createInstance(ctxt, bindings);
-                if (!o) {
-                    if(types.at(instr.create.type).component)
-                        vmeErrors << types.at(instr.create.type).component->errors();
-
-                    VME_EXCEPTION(QCoreApplication::translate("QmlVME","Unable to create object of type %1").arg(QString::fromLatin1(types.at(instr.create.type).className)));
-                }
-
-                QmlDeclarativeData *ddata = QmlDeclarativeData::get(o);
-                Q_ASSERT(ddata);
-                ddata->outerContext = ctxt;
-                ddata->lineNumber = instr.line;
-                ddata->columnNumber = instr.create.column;
-
-                if (instr.create.data != -1) {
-                    QmlCustomParser *customParser =
-                        types.at(instr.create.type).type->customParser();
-                    customParser->setCustomData(o, datas.at(instr.create.data));
-                }
-                if (!stack.isEmpty()) {
-                    QObject *parent = stack.top();
-                    if (o->isWidgetType()) { 
-                        QWidget *widget = static_cast<QWidget*>(o); 
-                        if (parent->isWidgetType()) { 
-                            QWidget *parentWidget = static_cast<QWidget*>(parent); 
-                            widget->setParent(parentWidget); 
-                        } else { 
-                            // TODO: parent might be a layout 
-                        } 
-                    } else { 
-			    QmlGraphics_setParent_noEvent(o, parent);
-       //                 o->setParent(parent); 
-                    } 
-                }
-                stack.push(o);
-            }
-            break;
-
-        case QmlInstruction::SetId:
-            {
-                QObject *target = stack.top();
-                cp->setIdProperty(instr.setId.index, target);
-            }
-            break;
-
-
-        case QmlInstruction::SetDefault:
-            {
-                QObject *target = stack.top();
-                ctxt->addDefaultObject(target);
-            }
-            break;
-
-        case QmlInstruction::CreateComponent:
-            {
-                QObject *qcomp = new QmlComponent(ctxt->engine(), comp, ii + 1, instr.createComponent.count, stack.isEmpty() ? 0 : stack.top());
-
-                QmlEngine::setContextForObject(qcomp, ctxt);
-                QmlDeclarativeData *ddata = QmlDeclarativeData::get(qcomp);
-                Q_ASSERT(ddata);
-                ddata->outerContext = ctxt;
-                ddata->lineNumber = instr.line;
-                ddata->columnNumber = instr.create.column;
-
-                stack.push(qcomp);
-                ii += instr.createComponent.count;
-            }
-            break;
-
-        case QmlInstruction::StoreMetaObject:
-            {
-                QObject *target = stack.top();
-
-                QMetaObject mo;
-                const QByteArray &metadata = datas.at(instr.storeMeta.data);
-                QMetaObjectBuilder::fromRelocatableData(&mo, 0, metadata);
-
-                const QmlVMEMetaData *data = 
-                    (const QmlVMEMetaData *)datas.at(instr.storeMeta.aliasData).constData();
-
-                (void)new QmlVMEMetaObject(target, &mo, data, comp);
-
-                QmlDeclarativeData *ddata = QmlDeclarativeData::get(target, true);
-                if (ddata->propertyCache) ddata->propertyCache->release();
-                ddata->propertyCache = propertyCaches.at(instr.storeMeta.propertyCache);
-                ddata->propertyCache->addref();
-            }
-            break;
-
-        case QmlInstruction::StoreVariant:
-            {
-                QObject *target = stack.top();
-                // XXX - can be more efficient
-                QVariant v = QmlStringConverters::variantFromString(primitives.at(instr.storeString.value));
-                void *a[] = { &v, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeString.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreString:
-            {
-                QObject *target = stack.top();
-                void *a[] = { (void *)&primitives.at(instr.storeString.value), 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeString.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreUrl:
-            {
-                QObject *target = stack.top();
-                void *a[] = { (void *)&urls.at(instr.storeUrl.value), 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeUrl.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreFloat:
-            {
-                QObject *target = stack.top();
-                float f = instr.storeFloat.value;
-                void *a[] = { &f, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty,
-                                      instr.storeFloat.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreDouble:
-            {
-                QObject *target = stack.top();
-                double d = instr.storeDouble.value;
-                void *a[] = { &d, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty,
-                                      instr.storeDouble.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreBool:
-            {
-                QObject *target = stack.top();
-                void *a[] = { (void *)&instr.storeBool.value, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeBool.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreInteger:
-            {
-                QObject *target = stack.top();
-                void *a[] = { (void *)&instr.storeInteger.value, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeInteger.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreColor:
-            {
-                QObject *target = stack.top();
-                QColor c = QColor::fromRgba(instr.storeColor.value);
-                void *a[] = { &c, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeColor.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreDate:
-            {
-                QObject *target = stack.top();
-                QDate d = QDate::fromJulianDay(instr.storeDate.value);
-                void *a[] = { &d, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeDate.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreTime:
-            {
-                QObject *target = stack.top();
-                QTime t;
-                t.setHMS(intData.at(instr.storeTime.valueIndex),
-                         intData.at(instr.storeTime.valueIndex+1),
-                         intData.at(instr.storeTime.valueIndex+2),
-                         intData.at(instr.storeTime.valueIndex+3));
-                void *a[] = { &t, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeTime.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreDateTime:
-            {
-                QObject *target = stack.top();
-                QTime t;
-                t.setHMS(intData.at(instr.storeDateTime.valueIndex+1),
-                         intData.at(instr.storeDateTime.valueIndex+2),
-                         intData.at(instr.storeDateTime.valueIndex+3),
-                         intData.at(instr.storeDateTime.valueIndex+4));
-                QDateTime dt(QDate::fromJulianDay(intData.at(instr.storeDateTime.valueIndex)), t);
-                void *a[] = { &dt, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty,
-                                      instr.storeDateTime.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StorePoint:
-            {
-                QObject *target = stack.top();
-                QPoint p = QPointF(floatData.at(instr.storeRealPair.valueIndex),
-                                   floatData.at(instr.storeRealPair.valueIndex+1)).toPoint();
-                void *a[] = { &p, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeRealPair.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StorePointF:
-            {
-                QObject *target = stack.top();
-                QPointF p(floatData.at(instr.storeRealPair.valueIndex),
-                          floatData.at(instr.storeRealPair.valueIndex+1));
-                void *a[] = { &p, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeRealPair.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreSize:
-            {
-                QObject *target = stack.top();
-                QSize p = QSizeF(floatData.at(instr.storeRealPair.valueIndex),
-                                 floatData.at(instr.storeRealPair.valueIndex+1)).toSize();
-                void *a[] = { &p, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeRealPair.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreSizeF:
-            {
-                QObject *target = stack.top();
-                QSizeF s(floatData.at(instr.storeRealPair.valueIndex),
-                         floatData.at(instr.storeRealPair.valueIndex+1));
-                void *a[] = { &s, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeRealPair.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreRect:
-            {
-                QObject *target = stack.top();
-                QRect r = QRectF(floatData.at(instr.storeRect.valueIndex),
-                                 floatData.at(instr.storeRect.valueIndex+1),
-                                 floatData.at(instr.storeRect.valueIndex+2),
-                                 floatData.at(instr.storeRect.valueIndex+3)).toRect();
-                void *a[] = { &r, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeRect.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreRectF:
-            {
-                QObject *target = stack.top();
-                QRectF r(floatData.at(instr.storeRect.valueIndex),
-                         floatData.at(instr.storeRect.valueIndex+1),
-                         floatData.at(instr.storeRect.valueIndex+2),
-                         floatData.at(instr.storeRect.valueIndex+3));
-                void *a[] = { &r, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeRect.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreVector3D:
-            {
-                QObject *target = stack.top();
-                QVector3D p(floatData.at(instr.storeVector3D.valueIndex),
-                            floatData.at(instr.storeVector3D.valueIndex+1),
-                            floatData.at(instr.storeVector3D.valueIndex+2));
-                void *a[] = { &p, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeVector3D.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreObject:
-            {
-                QObject *assignObj = stack.pop();
-                QObject *target = stack.top();
-
-                void *a[] = { (void *)&assignObj, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeObject.propertyIndex, a);
-            }
-            break;
-
-
-        case QmlInstruction::AssignCustomType:
-            {
-                QObject *target = stack.top();
-                QmlCompiledData::CustomTypeData data = customTypeData.at(instr.assignCustomType.valueIndex);
-                const QString &primitive = primitives.at(data.index);
-                QmlMetaType::StringConverter converter = 
-                    QmlMetaType::customStringConverter(data.type);
-                QVariant v = (*converter)(primitive);
-
-                QMetaProperty prop = 
-                        target->metaObject()->property(instr.assignCustomType.propertyIndex);
-                if (v.isNull() || ((int)prop.type() != data.type && prop.userType() != data.type)) 
-                    VME_EXCEPTION(QCoreApplication::translate("QmlVME","Cannot assign value %1 to property %2").arg(primitive).arg(QString::fromUtf8(prop.name())));
-
-                void *a[] = { (void *)v.data(), 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.assignCustomType.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::AssignSignalObject:
-            {
-                // XXX optimize
-
-                QObject *assign = stack.pop();
-                QObject *target = stack.top();
-                int sigIdx = instr.assignSignalObject.signal;
-                const QByteArray &pr = datas.at(sigIdx);
-
-                QmlMetaProperty prop(target, QString::fromUtf8(pr));
-                if (prop.type() & QmlMetaProperty::SignalProperty) {
-
-                    QMetaMethod method = QmlMetaType::defaultMethod(assign);
-                    if (method.signature() == 0)
-                        VME_EXCEPTION(QCoreApplication::translate("QmlVME","Cannot assign object type %1 with no default method").arg(QString::fromLatin1(assign->metaObject()->className())));
-
-                    if (!QMetaObject::checkConnectArgs(prop.method().signature(), method.signature()))
-                        VME_EXCEPTION(QCoreApplication::translate("QmlVME","Cannot connect mismatched signal/slot %1 %vs. %2").arg(QString::fromLatin1(method.signature())).arg(QString::fromLatin1(prop.method().signature())));
-
-                    QMetaObject::connect(target, prop.coreIndex(), assign, method.methodIndex());
-
-                } else {
-                    VME_EXCEPTION(QCoreApplication::translate("QmlVME","Cannot assign an object to signal property %1").arg(QString::fromUtf8(pr)));
-                }
-
-
-            }
-            break;
-
-        case QmlInstruction::StoreSignal:
-            {
-                QObject *target = stack.top();
-                // XXX scope
-                QMetaMethod signal = 
-                    target->metaObject()->method(instr.storeSignal.signalIndex);
-
-                QmlBoundSignal *bs = new QmlBoundSignal(target, signal, target);
-                QmlExpression *expr = 
-                    new QmlExpression(ctxt, primitives.at(instr.storeSignal.value), target);
-                expr->setSourceLocation(comp->name, instr.line);
-                bs->setExpression(expr);
-            }
-            break;
-
-        case QmlInstruction::StoreScript:
-            {
-                QObject *target = stack.top();
-                cp->addScript(scripts.at(instr.storeScript.value), target);
-            }
-            break;
-
-        case QmlInstruction::StoreScriptString:
-            {
-                QObject *target = stack.top();
-                QObject *scope = stack.at(stack.count() - 1 - instr.storeScriptString.scope);
-                QmlScriptString ss;
-                ss.setContext(ctxt);
-                ss.setScopeObject(scope);
-                ss.setScript(primitives.at(instr.storeScriptString.value));
-
-                void *a[] = { &ss, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeScriptString.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::BeginObject:
-            {
-                QObject *target = stack.top();
-                QmlParserStatus *status = reinterpret_cast<QmlParserStatus *>(reinterpret_cast<char *>(target) + instr.begin.castValue);
-                parserStatus.append(status);
-                status->d = &parserStatus.values[parserStatus.count - 1];
-
-                status->classBegin();
-            }
-            break;
-
-        case QmlInstruction::StoreBinding:
-            {
-                QObject *target = 
-                    stack.at(stack.count() - 1 - instr.assignBinding.owner);
-                QObject *context = 
-                    stack.at(stack.count() - 1 - instr.assignBinding.context);
-
-                QmlMetaProperty mp = 
-                    QmlMetaPropertyPrivate::restore(datas.at(instr.assignBinding.property), target, ctxt);
-
-                int coreIndex = mp.coreIndex();
-
-                if (stack.count() == 1 && bindingSkipList.testBit(coreIndex))  
-                    break;
-
-                QmlBinding *bind = new QmlBinding((void *)datas.at(instr.assignBinding.value).constData(), comp, context, ctxt, comp->name, instr.line, 0);
-                bindValues.append(bind);
-                bind->m_mePtr = &bindValues.values[bindValues.count - 1];
-                bind->setTarget(mp);
-                bind->addToObject(target);
-            }
-            break;
-
-        case QmlInstruction::StoreCompiledBinding:
-            {
-                QObject *target = 
-                    stack.at(stack.count() - 1 - instr.assignBinding.owner);
-                QObject *scope = 
-                    stack.at(stack.count() - 1 - instr.assignBinding.context);
-
-                int property = instr.assignBinding.property;
-                if (stack.count() == 1 && bindingSkipList.testBit(property & 0xFFFF))  
-                    break;
-
-                QmlAbstractBinding *binding = 
-                    cp->optimizedBindings->configBinding(instr.assignBinding.value, target, scope, property);
-                bindValues.append(binding);
-                binding->m_mePtr = &bindValues.values[bindValues.count - 1];
-                binding->addToObject(target);
-            }
-            break;
-
-        case QmlInstruction::StoreValueSource:
-            {
-                QObject *obj = stack.pop();
-                QmlPropertyValueSource *vs = reinterpret_cast<QmlPropertyValueSource *>(reinterpret_cast<char *>(obj) + instr.assignValueSource.castValue);
-                QObject *target = stack.at(stack.count() - 1 - instr.assignValueSource.owner);
-
-                QmlMetaProperty prop = 
-                    QmlMetaPropertyPrivate::restore(datas.at(instr.assignValueSource.property), target, ctxt);
-                obj->setParent(target);
-                vs->setTarget(prop);
-            }
-            break;
-
-        case QmlInstruction::StoreValueInterceptor:
-            {
-                QObject *obj = stack.pop();
-                QmlPropertyValueInterceptor *vi = reinterpret_cast<QmlPropertyValueInterceptor *>(reinterpret_cast<char *>(obj) + instr.assignValueInterceptor.castValue);
-                QObject *target = stack.at(stack.count() - 1 - instr.assignValueInterceptor.owner);
-                QmlMetaProperty prop = 
-                    QmlMetaPropertyPrivate::restore(datas.at(instr.assignValueInterceptor.property), target, ctxt);
-                obj->setParent(target);
-                vi->setTarget(prop);
-                QmlVMEMetaObject *mo = static_cast<QmlVMEMetaObject *>((QMetaObject*)target->metaObject());
-                mo->registerInterceptor(prop.coreIndex(), prop.valueTypeCoreIndex(), vi);
-            }
-            break;
-
-        case QmlInstruction::StoreObjectQList:
-            {
-                QObject *assign = stack.pop();
-
-                const ListInstance &list = qliststack.top();
-                list.qListProperty.append((QmlListProperty<void>*)&list.qListProperty, assign);
-            }
-            break;
-
-        case QmlInstruction::AssignObjectList:
-            {
-                // This is only used for assigning interfaces
-                QObject *assign = stack.pop();
-                const ListInstance &list = qliststack.top();
-
-                int type = list.type;
-
-                void *ptr = 0;
-
-                const char *iid = QmlMetaType::interfaceIId(type);
-                if (iid) 
-                    ptr = assign->qt_metacast(iid);
-                if (!ptr) 
-                    VME_EXCEPTION(QCoreApplication::translate("QmlVME","Cannot assign object to list"));
-
-
-                list.qListProperty.append((QmlListProperty<void>*)&list.qListProperty, ptr);
-            }
-            break;
-
-        case QmlInstruction::StoreVariantObject:
-            {
-                QObject *assign = stack.pop();
-                QObject *target = stack.top();
-
-                QVariant v = QVariant::fromValue(assign);
-                void *a[] = { &v, 0, &status, &flags };
-                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
-                                      instr.storeObject.propertyIndex, a);
-            }
-            break;
-
-        case QmlInstruction::StoreInterface:
-            {
-                QObject *assign = stack.pop();
-                QObject *target = stack.top();
-
-                int coreIdx = instr.storeObject.propertyIndex;
-                QMetaProperty prop = target->metaObject()->property(coreIdx);
-                int t = prop.userType();
-                const char *iid = QmlMetaType::interfaceIId(t);
-                bool ok = false;
-                if (iid) {
-                    void *ptr = assign->qt_metacast(iid);
-                    if (ptr) {
-                        void *a[] = { &ptr, 0, &status, &flags };
-                        QMetaObject::metacall(target, 
-                                              QMetaObject::WriteProperty,
-                                              coreIdx, a);
-                        ok = true;
-                    }
-                } 
-
-                if (!ok) 
-                    VME_EXCEPTION(QCoreApplication::translate("QmlVME","Cannot assign object to interface property"));
-            }
-            break;
-            
-        case QmlInstruction::FetchAttached:
-            {
-                QObject *target = stack.top();
-
-                QObject *qmlObject = qmlAttachedPropertiesObjectById(instr.fetchAttached.id, target);
-
-                if (!qmlObject)
-                    VME_EXCEPTION(QCoreApplication::translate("QmlVME","Unable to create attached object"));
-
-                stack.push(qmlObject);
-            }
-            break;
-
-        case QmlInstruction::FetchQList:
-            {
-                QObject *target = stack.top();
-
-                qliststack.push(ListInstance(instr.fetchQmlList.type));
-
-                void *a[1];
-                a[0] = (void *)&(qliststack.top().qListProperty);
-                QMetaObject::metacall(target, QMetaObject::ReadProperty, 
-                                      instr.fetchQmlList.property, a);
-            }
-            break;
-
-        case QmlInstruction::FetchObject:
-            {
-                QObject *target = stack.top();
-
-                QObject *obj = 0;
-                // NOTE: This assumes a cast to QObject does not alter the 
-                // object pointer
-                void *a[1];
-                a[0] = &obj;
-                QMetaObject::metacall(target, QMetaObject::ReadProperty, 
-                                      instr.fetch.property, a);
-
-                if (!obj)
-                    VME_EXCEPTION(QCoreApplication::translate("QmlVME","Cannot set properties on %1 as it is null").arg(QString::fromUtf8(target->metaObject()->property(instr.fetch.property).name())));
-
-                stack.push(obj);
-            }
-            break;
-
-        case QmlInstruction::PopQList:
-            {
-                qliststack.pop();
-            }
-            break;
-
-        case QmlInstruction::Defer:
-            {
-                if (instr.defer.deferCount) {
-                    QObject *target = stack.top();
-                    QmlDeclarativeData *data = 
-                        QmlDeclarativeData::get(target, true);
-                    comp->addref();
-                    data->deferredComponent = comp;
-                    data->deferredIdx = ii;
-                    ii += instr.defer.deferCount;
-                }
-            }
-            break;
-
-        case QmlInstruction::PopFetchedObject:
-            {
-                stack.pop();
-            }
-            break;
-
-        case QmlInstruction::FetchValueType:
-            {
-                QObject *target = stack.top();
-                QmlValueType *valueHandler = 
-                    ep->valueTypes[instr.fetchValue.type];
-                valueHandler->read(target, instr.fetchValue.property);
-                stack.push(valueHandler);
-            }
-            break;
-
-        case QmlInstruction::PopValueType:
-            {
-                QmlValueType *valueHandler = 
-                    static_cast<QmlValueType *>(stack.pop());
-                QObject *target = stack.top();
-                valueHandler->write(target, instr.fetchValue.property, QmlMetaProperty::BypassInterceptor);
-            }
-            break;
-
-        default:
-            qFatal("QmlCompiledData: Internal error - unknown instruction %d", instr.type);
-            break;
-        }
-    }
-
-    if (isError()) {
-        if (!stack.isEmpty()) {
-            delete stack.at(0);
-        }
-
-        QmlEnginePrivate::clear(bindValues);
-        QmlEnginePrivate::clear(parserStatus);
-        return 0;
-    }
-
-    if (bindValues.count)
-        ep->bindValues << bindValues;
-    if (parserStatus.count)
-        ep->parserStatus << parserStatus;
-
-    if (stack.isEmpty())
-        return 0;
-    else
-        return stack.top();
-    return 0;
-}
-
-bool QmlVME::isError() const
-{
-    return !vmeErrors.isEmpty();
-}
-
-QList<QmlError> QmlVME::errors() const
-{
-    return vmeErrors;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h
deleted file mode 100644
index ae7dd7f..0000000
--- a/src/declarative/qml/qmlvme_p.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLVME_P_H
-#define QMLVME_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlerror.h"
-#include "qbitfield_p.h"
-
-#include <QtCore/QString>
-#include <QtCore/QStack>
-
-QT_BEGIN_NAMESPACE
-
-class QObject;
-class QmlInstruction;
-class QmlCompiledData;
-class QmlCompiledData;
-class QmlContext;
-
-template<typename T, int N = 128>
-class QmlVMEStack {
-public:
-    QmlVMEStack() : index(-1), maxSize(N), data(fixedData) {}
-    ~QmlVMEStack() { if (data != fixedData) qFree(fixedData); }
-
-    bool isEmpty() const { return index == -1; }
-    const T &top() const { return data[index]; }
-    void push(const T &i) { ++index; if (index == maxSize) realloc(); data[index] = i; }
-    const T &pop() { --index; return data[index + 1]; }
-    int count() const { return index + 1; }
-    const T &at(int idx) { return data[idx]; }
-
-private:
-    void realloc() {
-        maxSize += N;
-        if (data != fixedData) {
-            data = (T*)qRealloc(data, maxSize * sizeof(T));
-        } else {
-            data = (T*)qMalloc(maxSize * sizeof(T));
-        }
-    }
-    int index;
-    int maxSize;
-    T *data;
-    T fixedData[N];
-};
-
-class QmlVME
-{
-public:
-    QmlVME();
-
-    QObject *run(QmlContext *, QmlCompiledData *, 
-                 int start = -1, int count = -1, 
-                 const QBitField & = QBitField());
-    void runDeferred(QObject *);
-
-    bool isError() const;
-    QList<QmlError> errors() const;
-
-private:
-    QObject *run(QmlVMEStack<QObject *> &, QmlContext *, QmlCompiledData *, 
-                 int start, int count, const QBitField &);
-    QList<QmlError> vmeErrors;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLVME_P_H
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp
deleted file mode 100644
index 4886680..0000000
--- a/src/declarative/qml/qmlvmemetaobject.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlvmemetaobject_p.h"
-
-#include "qml.h"
-#include "qmlrefcount_p.h"
-#include "qmlexpression.h"
-#include "qmlexpression_p.h"
-#include "qmlcontext_p.h"
-
-#include <QColor>
-#include <QDate>
-#include <QtCore/qlist.h>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-QmlVMEMetaObject::QmlVMEMetaObject(QObject *obj,
-                                   const QMetaObject *other, 
-                                   const QmlVMEMetaData *meta,
-                                   QmlCompiledData *cdata)
-: object(obj), compiledData(cdata), ctxt(qmlContext(obj)), metaData(meta), methods(0),
-  parent(0)
-{
-    compiledData->addref();
-
-    *static_cast<QMetaObject *>(this) = *other;
-    this->d.superdata = obj->metaObject();
-
-    QObjectPrivate *op = QObjectPrivate::get(obj);
-    if (op->metaObject)
-        parent = static_cast<QAbstractDynamicMetaObject*>(op->metaObject);
-    op->metaObject = this;
-
-    propOffset = QAbstractDynamicMetaObject::propertyOffset();
-    methodOffset = QAbstractDynamicMetaObject::methodOffset();
-
-    data = new QVariant[metaData->propertyCount];
-    aConnected.resize(metaData->aliasCount);
-
-    int list_type = qMetaTypeId<QmlListProperty<QObject> >();
-    // ### Optimize
-    for (int ii = 0; ii < metaData->propertyCount; ++ii) {
-        int t = (metaData->propertyData() + ii)->propertyType;
-        if (t == list_type) {
-            listProperties.append(new List(methodOffset + ii));
-            data[ii] = QVariant::fromValue(QmlListProperty<QObject>(obj, listProperties.last(), list_append,
-                                                                    list_count, list_at, list_clear));
-        } else if (t != -1) {
-            data[ii] = QVariant((QVariant::Type)t);
-        }
-    }
-}
-
-QmlVMEMetaObject::~QmlVMEMetaObject()
-{
-    compiledData->release();
-    delete parent;
-    qDeleteAll(listProperties);
-    delete [] data;
-    delete [] methods;
-}
-
-int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a)
-{
-    int id = _id;
-    if(c == QMetaObject::WriteProperty) {
-        int flags = *reinterpret_cast<int*>(a[3]);
-        if (!(flags & QmlMetaProperty::BypassInterceptor)
-            && !aInterceptors.isEmpty()
-            && aInterceptors.testBit(id)) {
-            QPair<int, QmlPropertyValueInterceptor*> pair = interceptors.value(id);
-            int valueIndex = pair.first;
-            QmlPropertyValueInterceptor *vi = pair.second;
-            int type = property(id).userType();
-
-            if (type != QVariant::Invalid) {
-                if (valueIndex != -1) {
-                    QmlEnginePrivate *ep = ctxt?QmlEnginePrivate::get(ctxt->engine()):0;
-                    QmlValueType *valueType = 0;
-                    if (ep) valueType = ep->valueTypes[type];
-                    else valueType = QmlValueTypeFactory::valueType(type);
-                    Q_ASSERT(valueType);
-
-                    valueType->setValue(QVariant(type, a[0]));
-                    QMetaProperty valueProp = valueType->metaObject()->property(valueIndex);
-                    vi->write(valueProp.read(valueType));
-
-                    if (!ep) delete valueType;
-                    return -1;
-                } else {
-                    vi->write(QVariant(type, a[0]));
-                    return -1;
-                }
-            }
-        }
-    }
-    if(c == QMetaObject::ReadProperty || c == QMetaObject::WriteProperty) {
-        if (id >= propOffset) {
-            id -= propOffset;
-
-            if (id < metaData->propertyCount) {
-                int t = (metaData->propertyData() + id)->propertyType;
-                bool needActivate = false;
-
-                if (t == -1) {
-
-                    if (c == QMetaObject::ReadProperty) {
-                        *reinterpret_cast<QVariant *>(a[0]) = data[id];
-                    } else if (c == QMetaObject::WriteProperty) {
-                        needActivate = 
-                            (data[id] != *reinterpret_cast<QVariant *>(a[0]));
-                        data[id] = *reinterpret_cast<QVariant *>(a[0]);
-                    }
-
-                } else {
-
-                    if (c == QMetaObject::ReadProperty) {
-                        switch(t) {
-                        case QVariant::Int:
-                            *reinterpret_cast<int *>(a[0]) = data[id].toInt();
-                            break;
-                        case QVariant::Bool:
-                            *reinterpret_cast<bool *>(a[0]) = data[id].toBool();
-                            break;
-                        case QVariant::Double:
-                            *reinterpret_cast<double *>(a[0]) = data[id].toDouble();
-                            break;
-                        case QVariant::String:
-                            *reinterpret_cast<QString *>(a[0]) = data[id].toString();
-                            break;
-                        case QVariant::Url:
-                            *reinterpret_cast<QUrl *>(a[0]) = data[id].toUrl();
-                            break;
-                        case QVariant::Color:
-                            *reinterpret_cast<QColor *>(a[0]) = data[id].value<QColor>();
-                            break;
-                        case QVariant::Date:
-                            *reinterpret_cast<QDate *>(a[0]) = data[id].toDate();
-                            break;
-                        case QMetaType::QObjectStar:
-                            *reinterpret_cast<QObject **>(a[0]) = data[id].value<QObject*>();
-                            break;
-                        default:
-                            break;
-                        }
-                        if (t == qMetaTypeId<QmlListProperty<QObject> >()) {
-                            *reinterpret_cast<QmlListProperty<QObject> *>(a[0]) = 
-                                data[id].value<QmlListProperty<QObject> >();
-                        }
-
-                    } else if (c == QMetaObject::WriteProperty) {
-
-                        QVariant value = QVariant((QVariant::Type)data[id].type(), a[0]); 
-                        needActivate = (data[id] != value);
-                        data[id] = value;
-                    }
-
-                }
-
-                if (c == QMetaObject::WriteProperty && needActivate) {
-                    activate(object, methodOffset + id, 0);
-                }
-
-                return -1;
-            }
-
-            id -= metaData->propertyCount;
-
-            if (id < metaData->aliasCount) {
-
-                QmlVMEMetaData::AliasData *d = metaData->aliasData() + id;
-
-                if (d->flags & QML_ALIAS_FLAG_PTR && c == QMetaObject::ReadProperty) 
-                        *reinterpret_cast<void **>(a[0]) = 0;
-
-                if (!ctxt) return -1;
-                QmlContextPrivate *ctxtPriv = 
-                    (QmlContextPrivate *)QObjectPrivate::get(ctxt);
-
-                QObject *target = ctxtPriv->idValues[d->contextIdx].data();
-                if (!target) 
-                    return -1;
-
-                if (c == QMetaObject::ReadProperty && !aConnected.testBit(id)) {
-                    int sigIdx = methodOffset + id + metaData->propertyCount;
-                    QMetaObject::connect(ctxt, d->contextIdx + ctxtPriv->notifyIndex, object, sigIdx);
-
-                    if (d->propertyIdx != -1) {
-                        QMetaProperty prop = 
-                            target->metaObject()->property(d->propertyIdx);
-                        if (prop.hasNotifySignal())
-                            QMetaObject::connect(target, prop.notifySignalIndex(), 
-                                                 object, sigIdx);
-                    }
-                    aConnected.setBit(id);
-                }
-
-                if (d->propertyIdx == -1) {
-                    *reinterpret_cast<QObject **>(a[0]) = target;
-                    return -1;
-                } else {
-                    return QMetaObject::metacall(target, c, d->propertyIdx, a);
-                }
-
-            }
-            return -1;
-
-        }
-
-    } else if(c == QMetaObject::InvokeMetaMethod) {
-
-        if (id >= methodOffset) {
-
-            id -= methodOffset;
-            int plainSignals = metaData->signalCount + metaData->propertyCount +
-                               metaData->aliasCount;
-            if (id < plainSignals) {
-                QMetaObject::activate(object, _id, a);
-                return -1;
-            }
-
-            id -= plainSignals;
-
-            if (id < metaData->methodCount) {
-                if (!ctxt->engine())
-                    return -1; // We can't run the method
-
-                QmlEnginePrivate *ep = QmlEnginePrivate::get(ctxt->engine());
-
-                QScriptValue function = method(id);
-
-                QScriptValueList args;
-                QmlVMEMetaData::MethodData *data = metaData->methodData() + id;
-                if (data->parameterCount) {
-                    for (int ii = 0; ii < data->parameterCount; ++ii) {
-                        args << ep->scriptValueFromVariant(*(QVariant *)a[ii + 1]);
-                    }
-                }
-                QScriptValue rv = function.call(ep->objectClass->newQObject(object), args);
-
-                if (a[0]) *reinterpret_cast<QVariant *>(a[0]) = ep->scriptValueToVariant(rv);
-
-                return -1;
-            }
-            return -1;
-        }
-    }
-
-    if (parent)
-        return parent->metaCall(c, _id, a);
-    else
-        return object->qt_metacall(c, _id, a);
-}
-
-QScriptValue QmlVMEMetaObject::method(int index)
-{
-    if (!methods) 
-        methods = new QScriptValue[metaData->methodCount];
-
-    if (!methods[index].isValid()) {
-        QmlVMEMetaData::MethodData *data = metaData->methodData() + index;
-
-        const QChar *body = 
-            (const QChar *)(((const char*)metaData) + data->bodyOffset);
-
-        QString code = QString::fromRawData(body, data->bodyLength);
-
-        // XXX Use QScriptProgram
-        // XXX We should evaluate all methods in a single big script block to 
-        // improve the call time between dynamic methods defined on the same
-        // object
-        methods[index] = QmlExpressionPrivate::evalInObjectScope(ctxt, object, code);
-    }
-
-    return methods[index];
-}
-
-void QmlVMEMetaObject::listChanged(int id)
-{
-    activate(object, methodOffset + id, 0);
-}
-
-void QmlVMEMetaObject::list_append(QmlListProperty<QObject> *prop, QObject *o)
-{
-    List *list = static_cast<List *>(prop->data);
-    list->append(o);
-    QMetaObject::activate(prop->object, list->notifyIndex, 0);
-}
-
-int QmlVMEMetaObject::list_count(QmlListProperty<QObject> *prop)
-{
-    return static_cast<List *>(prop->data)->count();
-}
-
-QObject *QmlVMEMetaObject::list_at(QmlListProperty<QObject> *prop, int index)
-{
-    return static_cast<List *>(prop->data)->at(index);
-}
-
-void QmlVMEMetaObject::list_clear(QmlListProperty<QObject> *prop)
-{
-    List *list = static_cast<List *>(prop->data);
-    list->clear();
-    QMetaObject::activate(prop->object, list->notifyIndex, 0);
-}
-
-void QmlVMEMetaObject::registerInterceptor(int index, int valueIndex, QmlPropertyValueInterceptor *interceptor)
-{
-    if (aInterceptors.isEmpty())
-        aInterceptors.resize(propertyCount() + metaData->propertyCount);
-    aInterceptors.setBit(index);
-    interceptors.insert(index, qMakePair(valueIndex, interceptor));
-}
-
-QScriptValue QmlVMEMetaObject::vmeMethod(int index)
-{
-    if (index < methodOffset) {
-        Q_ASSERT(parent);
-        return static_cast<QmlVMEMetaObject *>(parent)->vmeMethod(index);
-    }
-    int plainSignals = metaData->signalCount + metaData->propertyCount + metaData->aliasCount;
-    Q_ASSERT(index >= (methodOffset + plainSignals) && index < (methodOffset + plainSignals + metaData->methodCount));
-    return method(index - methodOffset - plainSignals);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlvmemetaobject_p.h b/src/declarative/qml/qmlvmemetaobject_p.h
deleted file mode 100644
index 3eb776e..0000000
--- a/src/declarative/qml/qmlvmemetaobject_p.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLVMEMETAOBJECT_P_H
-#define QMLVMEMETAOBJECT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qml.h"
-
-#include <QtCore/QMetaObject>
-#include <QtCore/QBitArray>
-#include <QtCore/QPair>
-
-#include <private/qobject_p.h>
-
-#include "qmlguard_p.h"
-#include "qmlcompiler_p.h"
-
-QT_BEGIN_NAMESPACE
-
-#define QML_ALIAS_FLAG_PTR 0x00000001
-
-struct QmlVMEMetaData
-{
-    short propertyCount;
-    short aliasCount;
-    short signalCount;
-    short methodCount;
-
-    struct AliasData {
-        int contextIdx;
-        int propertyIdx;
-        int flags;
-    };
-    
-    struct PropertyData {
-        int propertyType;
-    };
-
-    struct MethodData {
-        int parameterCount;
-        int bodyOffset;
-        int bodyLength;
-        int scriptProgram;
-    };
-
-    PropertyData *propertyData() const {
-        return (PropertyData *)(((const char *)this) + sizeof(QmlVMEMetaData));
-    }
-
-    AliasData *aliasData() const {
-        return (AliasData *)(propertyData() + propertyCount);
-    }
-
-    MethodData *methodData() const {
-        return (MethodData *)(aliasData() + aliasCount);
-    }
-};
-
-class QmlRefCount;
-class QmlVMEMetaObject : public QAbstractDynamicMetaObject
-{
-public:
-    QmlVMEMetaObject(QObject *obj, const QMetaObject *other, const QmlVMEMetaData *data,
-                     QmlCompiledData *compiledData);
-    ~QmlVMEMetaObject();
-
-    void registerInterceptor(int index, int valueIndex, QmlPropertyValueInterceptor *interceptor);
-    QScriptValue vmeMethod(int index);
-protected:
-    virtual int metaCall(QMetaObject::Call _c, int _id, void **_a);
-
-private:
-    QObject *object;
-    QmlCompiledData *compiledData;
-    QmlGuard<QmlContext> ctxt;
-
-    const QmlVMEMetaData *metaData;
-    int propOffset;
-    int methodOffset;
-
-    QVariant *data;
-    QBitArray aConnected;
-    QBitArray aInterceptors;
-    QHash<int, QPair<int, QmlPropertyValueInterceptor*> > interceptors;
-
-    QScriptValue *methods;
-    QScriptValue method(int);
-
-    QAbstractDynamicMetaObject *parent;
-
-    void listChanged(int);
-    class List : public QList<QObject*>
-    {
-    public:
-        List(int lpi) : notifyIndex(lpi) {}
-        int notifyIndex;
-    };
-    QList<List *> listProperties;
-
-    static void list_append(QmlListProperty<QObject> *, QObject *);
-    static int list_count(QmlListProperty<QObject> *);
-    static QObject *list_at(QmlListProperty<QObject> *, int);
-    static void list_clear(QmlListProperty<QObject> *);
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLVMEMETAOBJECT_P_H
diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp
deleted file mode 100644
index a8a94c5..0000000
--- a/src/declarative/qml/qmlwatcher.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlwatcher_p.h"
-
-#include "qmlexpression.h"
-#include "qmlcontext.h"
-#include "qml.h"
-
-#include <qmldebugservice_p.h>
-
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QmlWatchProxy : public QObject
-{
-    Q_OBJECT
-public:
-    QmlWatchProxy(int id,
-                  QObject *object,
-                  int debugId,
-                  const QMetaProperty &prop,
-                  QmlWatcher *parent = 0);
-
-    QmlWatchProxy(int id,
-                  QmlExpression *exp,
-                  int debugId,
-                  QmlWatcher *parent = 0);
-
-public slots:
-    void notifyValueChanged();
-
-private:
-    friend class QmlWatcher;
-    int m_id;
-    QmlWatcher *m_watch;
-    QObject *m_object;
-    int m_debugId;
-    QMetaProperty m_property;
-
-    QmlExpression *m_expr;
-};
-
-QmlWatchProxy::QmlWatchProxy(int id,
-                             QmlExpression *exp,
-                             int debugId,
-                             QmlWatcher *parent)
-: QObject(parent), m_id(id), m_watch(parent), m_object(0), m_debugId(debugId), m_expr(exp)
-{
-    QObject::connect(m_expr, SIGNAL(valueChanged()), this, SLOT(notifyValueChanged()));
-}
-
-QmlWatchProxy::QmlWatchProxy(int id,
-                             QObject *object,
-                             int debugId,
-                             const QMetaProperty &prop,
-                             QmlWatcher *parent)
-: QObject(parent), m_id(id), m_watch(parent), m_object(object), m_debugId(debugId), m_property(prop), m_expr(0)
-{
-    static int refreshIdx = -1;
-    if(refreshIdx == -1)
-        refreshIdx = QmlWatchProxy::staticMetaObject.indexOfMethod("notifyValueChanged()");
-
-    if (prop.hasNotifySignal())
-        QMetaObject::connect(m_object, prop.notifySignalIndex(), this, refreshIdx);
-}
-
-void QmlWatchProxy::notifyValueChanged()
-{
-    QVariant v;
-    if (m_expr)
-        v = m_expr->value();
-    else
-        v = m_property.read(m_object);
-
-    emit m_watch->propertyChanged(m_id, m_debugId, m_property, v);
-}
-
-
-QmlWatcher::QmlWatcher(QObject *parent)
-    : QObject(parent)
-{
-}
-
-bool QmlWatcher::addWatch(int id, quint32 debugId)
-{
-    QObject *object = QmlDebugService::objectForId(debugId);
-    if (object) {
-        int propCount = object->metaObject()->propertyCount();
-        for (int ii=0; ii<propCount; ii++)
-            addPropertyWatch(id, object, debugId, object->metaObject()->property(ii));
-        return true;
-    }
-    return false;
-}
-
-bool QmlWatcher::addWatch(int id, quint32 debugId, const QByteArray &property)
-{
-    QObject *object = QmlDebugService::objectForId(debugId);
-    if (object) {
-        int index = object->metaObject()->indexOfProperty(property.constData());
-        if (index >= 0) {
-            addPropertyWatch(id, object, debugId, object->metaObject()->property(index));
-            return true;
-        }
-    }
-    return false;
-}
-
-bool QmlWatcher::addWatch(int id, quint32 objectId, const QString &expr)
-{
-    QObject *object = QmlDebugService::objectForId(objectId);
-    QmlContext *context = qmlContext(object);
-    if (context) {
-        QmlExpression *exprObj = new QmlExpression(context, expr, object);
-        exprObj->setNotifyOnValueChanged(true);
-        QmlWatchProxy *proxy = new QmlWatchProxy(id, exprObj, objectId, this);
-        exprObj->setParent(proxy);
-        m_proxies[id].append(proxy);
-        proxy->notifyValueChanged();
-        return true;
-    }
-    return false;
-}
-
-void QmlWatcher::removeWatch(int id)
-{
-    if (!m_proxies.contains(id))
-        return;
-
-    QList<QPointer<QmlWatchProxy> > proxies = m_proxies.take(id);
-    qDeleteAll(proxies);
-}
-
-void QmlWatcher::addPropertyWatch(int id, QObject *object, quint32 debugId, const QMetaProperty &property)
-{
-    QmlWatchProxy *proxy = new QmlWatchProxy(id, object, debugId, property, this);
-    m_proxies[id].append(proxy);
-
-    proxy->notifyValueChanged();
-}
-
-QT_END_NAMESPACE
-
-#include <qmlwatcher.moc>
diff --git a/src/declarative/qml/qmlwatcher_p.h b/src/declarative/qml/qmlwatcher_p.h
deleted file mode 100644
index 57b358d..0000000
--- a/src/declarative/qml/qmlwatcher_p.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLWATCHER_P_H
-#define QMLWATCHER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qobject.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qpair.h>
-#include <QtCore/qhash.h>
-#include <QtCore/qset.h>
-#include <QtCore/qpointer.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlWatchProxy;
-class QmlExpression;
-class QmlContext;
-class QMetaProperty;
-
-class QmlWatcher : public QObject
-{
-    Q_OBJECT
-public:
-    QmlWatcher(QObject * = 0);
-
-    bool addWatch(int id, quint32 objectId);
-    bool addWatch(int id, quint32 objectId, const QByteArray &property);
-    bool addWatch(int id, quint32 objectId, const QString &expr);
-
-    void removeWatch(int id);
-
-Q_SIGNALS:
-    void propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value);
-
-private:
-    friend class QmlWatchProxy;
-    void addPropertyWatch(int id, QObject *object, quint32 objectId, const QMetaProperty &property);
-
-    QHash<int, QList<QPointer<QmlWatchProxy> > > m_proxies;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLWATCHER_P_H
diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp
deleted file mode 100644
index 944d996..0000000
--- a/src/declarative/qml/qmlworkerscript.cpp
+++ /dev/null
@@ -1,1041 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlworkerscript_p.h"
-
-#include "qmlengine_p.h"
-
-#include <QtCore/qcoreevent.h>
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qdebug.h>
-#include <QtScript/qscriptengine.h>
-#include <QtCore/qmutex.h>
-#include <QtCore/qwaitcondition.h>
-#include <QtScript/qscriptvalueiterator.h>
-#include <QtCore/qfile.h>
-#include <QtNetwork/qnetworkaccessmanager.h>
-#include <QtDeclarative/qmlinfo.h>
-#include "qmlnetworkaccessmanagerfactory.h"
-
-
-QT_BEGIN_NAMESPACE
-
-class WorkerDataEvent : public QEvent
-{
-public:
-    enum Type { WorkerData = QEvent::User };
-
-    WorkerDataEvent(int workerId, const QVariant &data);
-    virtual ~WorkerDataEvent();
-
-    int workerId() const;
-    QVariant data() const;
-
-private:
-    int m_id;
-    QVariant m_data;
-};
-
-class WorkerLoadEvent : public QEvent
-{
-public:
-    enum Type { WorkerLoad = WorkerDataEvent::WorkerData + 1 };
-
-    WorkerLoadEvent(int workerId, const QUrl &url);
-
-    int workerId() const;
-    QUrl url() const;
-
-private:
-    int m_id;
-    QUrl m_url;
-};
-
-class WorkerRemoveEvent : public QEvent
-{
-public:
-    enum Type { WorkerRemove = WorkerLoadEvent::WorkerLoad + 1 };
-
-    WorkerRemoveEvent(int workerId);
-
-    int workerId() const;
-
-private:
-    int m_id;
-};
-
-class QmlWorkerScriptEnginePrivate : public QObject
-{
-public:
-    QmlWorkerScriptEnginePrivate(QmlEngine *eng);
-
-    struct ScriptEngine : public QmlScriptEngine 
-    {
-        ScriptEngine(QmlWorkerScriptEnginePrivate *parent) : QmlScriptEngine(0), p(parent), accessManager(0) {}
-        ~ScriptEngine() { delete accessManager; }
-        QmlWorkerScriptEnginePrivate *p;
-        QNetworkAccessManager *accessManager;
-
-        virtual QNetworkAccessManager *networkAccessManager() { 
-            if (!accessManager) {
-                if (p->qmlengine && p->qmlengine->networkAccessManagerFactory()) {
-                    accessManager = p->qmlengine->networkAccessManagerFactory()->create(this);
-                } else {
-                    accessManager = new QNetworkAccessManager(this);
-                }
-            }
-            return accessManager;
-        }
-    };
-    ScriptEngine *workerEngine;
-    static QmlWorkerScriptEnginePrivate *get(QScriptEngine *e) {
-        return static_cast<ScriptEngine *>(e)->p;
-    }
-
-    QmlEngine *qmlengine;
-
-    QMutex m_lock;
-    QWaitCondition m_wait;
-
-    struct WorkerScript {
-        WorkerScript();
-
-        int id;
-        bool initialized;
-        QmlWorkerScript *owner;
-        QScriptValue object;
-
-        QScriptValue callback;
-    };
-
-    QHash<int, WorkerScript *> workers;
-    QScriptValue getWorker(int);
-
-    int m_nextId;
-
-    static QVariant scriptValueToVariant(const QScriptValue &);
-    static QScriptValue variantToScriptValue(const QVariant &, QScriptEngine *);
-
-    static QScriptValue onMessage(QScriptContext *ctxt, QScriptEngine *engine);
-    static QScriptValue sendMessage(QScriptContext *ctxt, QScriptEngine *engine);
-
-protected:
-    virtual bool event(QEvent *);
-
-private:
-    void processMessage(int, const QVariant &);
-    void processLoad(int, const QUrl &);
-};
-
-// Currently this will leak as no-one releases it in the worker thread 
-class QmlWorkerListModelAgent : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int count READ count)
-
-public:
-    QmlWorkerListModelAgent(QmlWorkerListModel *);
-    ~QmlWorkerListModelAgent();
-
-    void addref();
-    void release();
-
-    int count() const;
-
-    Q_INVOKABLE void clear();
-    Q_INVOKABLE void remove(int index);
-    Q_INVOKABLE void append(const QScriptValue &);
-    Q_INVOKABLE void insert(int index, const QScriptValue&);
-    Q_INVOKABLE QScriptValue get(int index) const;
-    Q_INVOKABLE void set(int index, const QScriptValue &);
-    Q_INVOKABLE void sync();
-
-    struct VariantRef
-    {
-        VariantRef() : a(0) {}
-        VariantRef(const VariantRef &r) : a(r.a) { if (a) a->addref(); }
-        VariantRef(QmlWorkerListModelAgent *_a) : a(_a) { if (a) a->addref(); }
-        ~VariantRef() { if (a) a->release(); }
-
-        VariantRef &operator=(const VariantRef &o) { 
-            if (o.a) o.a->addref(); 
-            if (a) a->release(); a = o.a; 
-            return *this; 
-        }
-
-        QmlWorkerListModelAgent *a;
-    };
-protected:
-    virtual bool event(QEvent *);
-
-private:
-    friend class QmlWorkerScriptEnginePrivate;
-    friend class QmlWorkerListModel;
-    QScriptEngine *m_engine;
-
-    struct Change {
-        enum { Inserted, Removed, Moved, Changed } type;
-        int index; // Inserted/Removed/Moved/Changed
-        int count; // Inserted/Removed/Moved/Changed
-        int to;    // Moved
-    };
-
-    struct Data {
-        QHash<int, QString> roles;
-        QHash<QString, int> strings;
-        QList<QHash<int, QVariant> > values;
-        QList<Change> changes;
-
-        void clearChange();
-        void insertChange(int index, int count);
-        void removeChange(int index, int count);
-        void changedChange(int index, int count);
-    };
-    Data data;
-
-    struct Sync : public QEvent {
-        Sync() : QEvent(QEvent::User) {}
-        Data data;
-    };
-
-    QAtomicInt m_ref;
-    QmlWorkerListModel *m_model;
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QmlWorkerListModelAgent::VariantRef);
-
-QT_BEGIN_NAMESPACE
-
-QmlWorkerScriptEnginePrivate::QmlWorkerScriptEnginePrivate(QmlEngine *engine)
-: workerEngine(0), qmlengine(engine), m_nextId(0)
-{
-}
-
-QScriptValue QmlWorkerScriptEnginePrivate::onMessage(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    QmlWorkerScriptEnginePrivate *p = QmlWorkerScriptEnginePrivate::get(engine);
-
-    int id = ctxt->thisObject().data().toVariant().toInt();
-
-    WorkerScript *script = p->workers.value(id);
-    if (!script)
-        return engine->undefinedValue();
-
-    if (ctxt->argumentCount() >= 1) 
-        script->callback = ctxt->argument(0);
-
-    return script->callback;
-}
-
-QScriptValue QmlWorkerScriptEnginePrivate::sendMessage(QScriptContext *ctxt, QScriptEngine *engine)
-{
-    if (!ctxt->argumentCount())
-        return engine->undefinedValue();
-
-    QmlWorkerScriptEnginePrivate *p = QmlWorkerScriptEnginePrivate::get(engine);
-
-    int id = ctxt->thisObject().data().toVariant().toInt();
-
-    WorkerScript *script = p->workers.value(id);
-    if (!script) 
-        return engine->undefinedValue();
-
-    p->m_lock.lock();
-    if (script->owner) 
-        QCoreApplication::postEvent(script->owner, 
-                                    new WorkerDataEvent(0, scriptValueToVariant(ctxt->argument(0))));
-    p->m_lock.unlock();
-
-    return engine->undefinedValue();
-}
-
-QScriptValue QmlWorkerScriptEnginePrivate::getWorker(int id)
-{
-    QHash<int, WorkerScript *>::ConstIterator iter = workers.find(id);
-
-    if (iter == workers.end())
-        return workerEngine->nullValue();
-
-    WorkerScript *script = *iter;
-    if (!script->initialized) {
-
-        script->initialized = true;
-        script->object = workerEngine->newObject();
-
-        QScriptValue api = workerEngine->newObject();
-        api.setData(script->id);
-
-        api.setProperty(QLatin1String("onMessage"), workerEngine->newFunction(onMessage), 
-                        QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
-        api.setProperty(QLatin1String("sendMessage"), workerEngine->newFunction(sendMessage));
-
-        script->object.setProperty(QLatin1String("WorkerScript"), api);
-    }
-
-    return script->object;
-}
-
-bool QmlWorkerScriptEnginePrivate::event(QEvent *event)
-{
-    if (event->type() == (QEvent::Type)WorkerDataEvent::WorkerData) {
-        WorkerDataEvent *workerEvent = static_cast<WorkerDataEvent *>(event);
-        processMessage(workerEvent->workerId(), workerEvent->data());
-        return true;
-    } else if (event->type() == (QEvent::Type)WorkerLoadEvent::WorkerLoad) {
-        WorkerLoadEvent *workerEvent = static_cast<WorkerLoadEvent *>(event);
-        processLoad(workerEvent->workerId(), workerEvent->url());
-        return true;
-    } else {
-        return QObject::event(event);
-    }
-}
-
-void QmlWorkerScriptEnginePrivate::processMessage(int id, const QVariant &data)
-{
-    WorkerScript *script = workers.value(id);
-    if (!script)
-        return;
-
-    if (script->callback.isFunction()) {
-        QScriptValue args = workerEngine->newArray(1);
-        args.setProperty(0, variantToScriptValue(data, workerEngine));
-
-        script->callback.call(script->object, args);
-    }
-}
-
-void QmlWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
-{
-    if (url.isRelative() || url.scheme() != QLatin1String("file"))
-        return;
-
-    QString fileName = url.toLocalFile();
-
-    QFile f(fileName);
-    if (f.open(QIODevice::ReadOnly)) {
-        QByteArray data = f.readAll();
-        QString script = QString::fromUtf8(data);
-
-        QScriptValue activation = getWorker(id);
-
-        QScriptContext *ctxt = workerEngine->pushContext();
-        ctxt->setActivationObject(activation);
-
-        workerEngine->baseUrl = url;
-        workerEngine->evaluate(script);
-
-        workerEngine->popContext();
-    }
-}
-
-QVariant QmlWorkerScriptEnginePrivate::scriptValueToVariant(const QScriptValue &value)
-{
-    if (value.isBool()) {
-        return QVariant(value.toBool());
-    } else if (value.isString()) {
-        return QVariant(value.toString());
-    } else if (value.isNumber()) {
-        return QVariant((qreal)value.toNumber());
-    } else if (value.isArray()) {
-        QVariantList list;
-
-        quint32 length = (quint32)value.property(QLatin1String("length")).toNumber();
-
-        for (quint32 ii = 0; ii < length; ++ii) {
-            QVariant v = scriptValueToVariant(ii);
-            list << v;
-        }
-
-        return QVariant(list);
-    } else if (value.isQObject()) {
-        QmlWorkerListModel *lm = qobject_cast<QmlWorkerListModel *>(value.toQObject());
-        if (lm) {
-            QmlWorkerListModelAgent::VariantRef v(lm->agent());
-            return qVariantFromValue(v);
-        } else {
-            // No other QObject's are allowed to be sent
-            return QVariant();
-        }
-    } else if (value.isObject()) {
-        QVariantHash hash;
-
-        QScriptValueIterator iter(value);
-
-        while (iter.hasNext()) {
-            iter.next();
-            hash.insert(iter.name(), scriptValueToVariant(iter.value()));
-        }
-
-        return QVariant(hash);
-    }
-
-    return QVariant();
-
-}
-
-QScriptValue QmlWorkerScriptEnginePrivate::variantToScriptValue(const QVariant &value, QScriptEngine *engine)
-{
-    if (value.userType() == QVariant::Bool) {
-        return QScriptValue(value.toBool());
-    } else if (value.userType() == QVariant::String) {
-        return QScriptValue(value.toString());
-    } else if (value.userType() == QMetaType::QReal) {
-        return QScriptValue(value.toReal());
-    } else if (value.userType() == qMetaTypeId<QmlWorkerListModelAgent::VariantRef>()) {
-        QmlWorkerListModelAgent::VariantRef vr = qvariant_cast<QmlWorkerListModelAgent::VariantRef>(value);
-        if (vr.a->m_engine == 0)
-            vr.a->m_engine = engine;
-        else if (vr.a->m_engine != engine)
-            return engine->nullValue();
-        QScriptValue o = engine->newQObject(vr.a);
-        o.setData(engine->newVariant(value)); // Keeps the agent ref so that it is cleaned up on gc
-        return o;
-    } else if (value.userType() == QMetaType::QVariantList) {
-        QVariantList list = qvariant_cast<QVariantList>(value);
-        QScriptValue rv = engine->newArray(list.count());
-
-        for (quint32 ii = 0; ii < quint32(list.count()); ++ii) 
-            rv.setProperty(ii, variantToScriptValue(list.at(ii), engine));
-
-        return rv;
-    } else if (value.userType() == QMetaType::QVariantHash) {
-
-        QVariantHash hash = qvariant_cast<QVariantHash>(value);
-
-        QScriptValue rv = engine->newObject();
-
-        for (QVariantHash::ConstIterator iter = hash.begin(); iter != hash.end(); ++iter) 
-            rv.setProperty(iter.key(), variantToScriptValue(iter.value(), engine));
-
-        return rv;
-    } else {
-        return engine->nullValue();
-    }
-}
-
-WorkerDataEvent::WorkerDataEvent(int workerId, const QVariant &data)
-: QEvent((QEvent::Type)WorkerData), m_id(workerId), m_data(data)
-{
-}
-
-WorkerDataEvent::~WorkerDataEvent()
-{
-}
-
-int WorkerDataEvent::workerId() const
-{
-    return m_id;
-}
-
-QVariant WorkerDataEvent::data() const
-{
-    return m_data;
-}
-
-WorkerLoadEvent::WorkerLoadEvent(int workerId, const QUrl &url)
-: QEvent((QEvent::Type)WorkerLoad), m_id(workerId), m_url(url)
-{
-}
-
-int WorkerLoadEvent::workerId() const
-{
-    return m_id;
-}
-
-QUrl WorkerLoadEvent::url() const
-{
-    return m_url;
-}
-
-WorkerRemoveEvent::WorkerRemoveEvent(int workerId)
-: QEvent((QEvent::Type)WorkerRemove), m_id(workerId)
-{
-}
-
-int WorkerRemoveEvent::workerId() const
-{
-    return m_id;
-}
-
-QmlWorkerScriptEngine::QmlWorkerScriptEngine(QmlEngine *parent)
-: QThread(parent), d(new QmlWorkerScriptEnginePrivate(parent))
-{
-    d->m_lock.lock();
-    start(QThread::LowPriority);
-    d->m_wait.wait(&d->m_lock);
-    d->moveToThread(this);
-    d->m_lock.unlock();
-}
-
-QmlWorkerScriptEngine::~QmlWorkerScriptEngine()
-{
-    qDeleteAll(d->workers);
-    delete d; d = 0;
-}
-
-QmlWorkerScriptEnginePrivate::WorkerScript::WorkerScript()
-: id(-1), initialized(false), owner(0)
-{
-}
-
-int QmlWorkerScriptEngine::registerWorkerScript(QmlWorkerScript *owner)
-{
-    QmlWorkerScriptEnginePrivate::WorkerScript *script = new QmlWorkerScriptEnginePrivate::WorkerScript;
-    script->id = d->m_nextId++;
-    script->owner = owner;
-
-    d->m_lock.lock();
-    d->workers.insert(script->id, script);
-    d->m_lock.unlock();
-
-    return script->id;
-}
-
-void QmlWorkerScriptEngine::removeWorkerScript(int id)
-{
-    QCoreApplication::postEvent(d, new WorkerRemoveEvent(id));
-}
-
-void QmlWorkerScriptEngine::executeUrl(int id, const QUrl &url)
-{
-    QCoreApplication::postEvent(d, new WorkerLoadEvent(id, url));
-}
-
-void QmlWorkerScriptEngine::sendMessage(int id, const QVariant &data)
-{
-    QCoreApplication::postEvent(d, new WorkerDataEvent(id, data));
-}
-
-void QmlWorkerScriptEngine::run()
-{
-    d->m_lock.lock();
-
-    d->workerEngine = new QmlWorkerScriptEnginePrivate::ScriptEngine(d);
-
-    d->m_wait.wakeAll();
-
-    d->m_lock.unlock();
-
-    exec();
-
-    delete d->workerEngine; d->workerEngine = 0;
-}
-
-QmlWorkerScript::QmlWorkerScript(QObject *parent)
-: QObject(parent), m_engine(0), m_scriptId(-1)
-{
-}
-
-QmlWorkerScript::~QmlWorkerScript()
-{
-    if (m_scriptId != -1) m_engine->removeWorkerScript(m_scriptId);
-}
-
-QUrl QmlWorkerScript::source() const
-{
-    return m_source;
-}
-
-void QmlWorkerScript::setSource(const QUrl &source)
-{
-    if (m_source == source)
-        return;
-
-    m_source = source;
-
-    if (m_engine) 
-        m_engine->executeUrl(m_scriptId, m_source);
-
-    emit sourceChanged();
-}
-
-void QmlWorkerScript::sendMessage(const QScriptValue &message)
-{
-    if (!m_engine) {
-        qWarning("QmlWorkerScript: Attempt to send message before WorkerScript establishment");
-        return;
-    }
-
-    m_engine->sendMessage(m_scriptId, QmlWorkerScriptEnginePrivate::scriptValueToVariant(message));
-}
-
-void QmlWorkerScript::componentComplete()
-{
-    if (!m_engine) {
-        QmlEngine *engine = qmlEngine(this);
-        if (!engine) {
-            qWarning("QmlWorkerScript: componentComplete() called without qmlEngine() set");
-            return;
-        }
-
-        m_engine = QmlEnginePrivate::get(engine)->getWorkerScriptEngine();
-        m_scriptId = m_engine->registerWorkerScript(this);
-
-        if (m_source.isValid())
-            m_engine->executeUrl(m_scriptId, m_source);
-    }
-}
-
-bool QmlWorkerScript::event(QEvent *event)
-{
-    if (event->type() == (QEvent::Type)WorkerDataEvent::WorkerData) {
-        QmlEngine *engine = qmlEngine(this);
-        if (engine) {
-            QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-            WorkerDataEvent *workerEvent = static_cast<WorkerDataEvent *>(event);
-            QScriptValue value = 
-                QmlWorkerScriptEnginePrivate::variantToScriptValue(workerEvent->data(), scriptEngine);
-            emit message(value);
-        }
-        return true;
-    } else {
-        return QObject::event(event);
-    }
-}
-
-void QmlWorkerListModelAgent::Data::clearChange() 
-{ 
-    changes.clear(); 
-}
-
-void QmlWorkerListModelAgent::Data::insertChange(int index, int count) 
-{
-    Change c = { Change::Inserted, index, count, 0 };
-    changes << c;
-}
-
-void QmlWorkerListModelAgent::Data::removeChange(int index, int count) 
-{
-    Change c = { Change::Removed, index, count, 0 };
-    changes << c;
-}
-
-void QmlWorkerListModelAgent::Data::changedChange(int index, int count)
-{
-    Change c = { Change::Changed, index, count, 0 };
-    changes << c;
-}
-
-QmlWorkerListModelAgent::QmlWorkerListModelAgent(QmlWorkerListModel *m)
-: m_engine(0), m_ref(1), m_model(m)
-{
-    data.roles = m_model->m_roles;
-    data.strings = m_model->m_strings;
-    data.values = m_model->m_values;
-}
-
-QmlWorkerListModelAgent::~QmlWorkerListModelAgent()
-{
-}
-
-void QmlWorkerListModelAgent::addref()
-{
-    m_ref.ref();
-}
-
-void QmlWorkerListModelAgent::release()
-{
-    bool del = !m_ref.deref();
-
-    if (del)
-        delete this;
-}
-
-int QmlWorkerListModelAgent::count() const
-{
-    return data.values.count();
-}
-
-void QmlWorkerListModelAgent::clear()
-{
-    data.clearChange();
-    data.removeChange(0, data.values.count());
-    data.values.clear();
-}
-
-void QmlWorkerListModelAgent::remove(int index)
-{
-    if (data.values.count() <= index)
-        return;
-
-    data.values.removeAt(index);
-    data.removeChange(index, 1);
-}
-
-void QmlWorkerListModelAgent::append(const QScriptValue &value)
-{
-    QHash<int, QVariant> row;
-
-    QScriptValueIterator it(value);
-    while (it.hasNext()) {
-        it.next();
-        QString name = it.name();
-        QVariant v = it.value().toVariant();
-
-        QHash<QString, int>::Iterator iter = data.strings.find(name);
-        if (iter == data.strings.end()) {
-            int role = data.roles.count();
-            data.roles.insert(role, name);
-            iter = data.strings.insert(name, role);
-        }
-        row.insert(*iter, v);
-    }
-
-    data.values.append(row);
-    data.insertChange(data.values.count() - 1, 1);
-}
-
-void QmlWorkerListModelAgent::insert(int index, const QScriptValue &value)
-{
-    if (index > data.values.count())
-        return;
-
-    QHash<int, QVariant> row;
-
-    QScriptValueIterator it(value);
-    while (it.hasNext()) {
-        it.next();
-        QString name = it.name();
-        QVariant v = it.value().toVariant();
-
-        QHash<QString, int>::Iterator iter = data.strings.find(name);
-        if (iter == data.strings.end()) {
-            int role = data.roles.count();
-            data.roles.insert(role, name);
-            iter = data.strings.insert(name, role);
-        }
-        row.insert(*iter, v);
-    }
-
-    data.values.insert(index, row);
-    data.insertChange(index, 1);
-}
-
-void QmlWorkerListModelAgent::set(int index, const QScriptValue &value)
-{
-    if (data.values.count() <= index)
-        return;
-
-    QHash<int, QVariant> row;
-
-    QScriptValueIterator it(value);
-    while (it.hasNext()) {
-        it.next();
-        QString name = it.name();
-        QVariant v = it.value().toVariant();
-
-        QHash<QString, int>::Iterator iter = data.strings.find(name);
-        if (iter == data.strings.end()) {
-            int role = data.roles.count();
-            data.roles.insert(role, name);
-            iter = data.strings.insert(name, role);
-        }
-        row.insert(*iter, v);
-    }
-
-    if (data.values.at(index) != row) {
-        data.values[index] = row;
-        data.changedChange(index, 1);
-    }
-}
-
-QScriptValue QmlWorkerListModelAgent::get(int index) const
-{
-    if (data.values.count() <= index)
-        return m_engine->undefinedValue();
-
-    QScriptValue rv = m_engine->newObject();
-
-    QHash<int, QVariant> row = data.values.at(index);
-    for (QHash<int, QVariant>::ConstIterator iter = row.begin(); iter != row.end(); ++iter) 
-        rv.setProperty(data.roles.value(iter.key()), qScriptValueFromValue(m_engine, iter.value()));
-
-    return rv;
-}
-
-void QmlWorkerListModelAgent::sync()
-{
-    Sync *s = new Sync;
-    s->data = data;
-    data.changes.clear();
-    QCoreApplication::postEvent(this, s);
-}
-
-bool QmlWorkerListModelAgent::event(QEvent *e)
-{
-    if (e->type() == QEvent::User) {
-        Sync *s = static_cast<Sync *>(e);
-
-        const QList<Change> &changes = s->data.changes;
-
-        if (m_model) {
-            bool cc = m_model->m_values.count() != s->data.values.count();
-
-            m_model->m_roles = s->data.roles;
-            m_model->m_strings = s->data.strings;
-            m_model->m_values = s->data.values;
-
-            for (int ii = 0; ii < changes.count(); ++ii) {
-                const Change &change = changes.at(ii);
-                switch (change.type) {
-                case Change::Inserted:
-                    emit m_model->itemsInserted(change.index, change.count);
-                    break;
-                case Change::Removed:
-                    emit m_model->itemsRemoved(change.index, change.count);
-                    break;
-                case Change::Moved:
-                    emit m_model->itemsMoved(change.index, change.to, change.count);
-                    break;
-                case Change::Changed:
-                    emit m_model->itemsMoved(change.index, change.to, change.count);
-                    break;
-                }
-            }
-
-            if (cc)
-                emit m_model->countChanged();
-        }
-    }
-
-    return QObject::event(e);
-}
-
-QmlWorkerListModel::QmlWorkerListModel(QObject *parent)
-: QListModelInterface(parent), m_agent(0)
-{
-}
-
-QmlWorkerListModel::~QmlWorkerListModel()
-{
-    if (m_agent) {
-        m_agent->m_model = 0;
-        m_agent->release();
-    }
-}
-
-void QmlWorkerListModel::clear()
-{
-    if (m_agent) {
-        qmlInfo(this) << "List can only be modified from a WorkerScript";
-        return;
-    }
-
-    int count = m_values.count();
-    m_values.clear();
-    if (count) {
-        emit itemsRemoved(0, count);
-        emit countChanged();
-    }
-}
-
-void QmlWorkerListModel::remove(int index)
-{
-    if (m_agent) {
-        qmlInfo(this) << "List can only be modified from a WorkerScript";
-        return;
-    }
-
-    if (m_values.count() <= index)
-        return;
-
-    m_values.removeAt(index);
-    emit itemsRemoved(index, 1);
-    emit countChanged();
-}
-
-void QmlWorkerListModel::append(const QScriptValue &value)
-{
-    if (m_agent) {
-        qmlInfo(this) << "List can only be modified from a WorkerScript";
-        return;
-    }
-
-    QHash<int, QVariant> data;
-
-    QScriptValueIterator it(value);
-    while (it.hasNext()) {
-        it.next();
-        QString name = it.name();
-        QVariant v = it.value().toVariant();
-
-        QHash<QString, int>::Iterator iter = m_strings.find(name);
-        if (iter == m_strings.end()) {
-            int role = m_roles.count();
-            m_roles.insert(role, name);
-            iter = m_strings.insert(name, role);
-        }
-        data.insert(*iter, v);
-    }
-
-    m_values.append(data);
-
-    emit itemsInserted(m_values.count() - 1, 1);
-    emit countChanged();
-}
-
-void QmlWorkerListModel::insert(int index, const QScriptValue &value)
-{
-    if (m_agent) {
-        qmlInfo(this) << "List can only be modified from a WorkerScript";
-        return;
-    }
-
-    if (index > m_values.count())
-        return;
-
-    QHash<int, QVariant> data;
-
-    QScriptValueIterator it(value);
-    while (it.hasNext()) {
-        it.next();
-        QString name = it.name();
-        QVariant v = it.value().toVariant();
-
-        QHash<QString, int>::Iterator iter = m_strings.find(name);
-        if (iter == m_strings.end()) {
-            int role = m_roles.count();
-            m_roles.insert(role, name);
-            iter = m_strings.insert(name, role);
-        }
-        data.insert(*iter, v);
-    }
-
-    m_values.insert(index, data);
-    emit itemsInserted(index, 1);
-    emit countChanged();
-}
-
-QScriptValue QmlWorkerListModel::get(int index) const
-{
-    QmlEngine *engine = qmlEngine(this);
-    if (!engine || m_values.count() <= index)
-        return QScriptValue();
-
-    QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
-    QScriptValue rv = scriptEngine->newObject();
-
-    QHash<int, QVariant> data = m_values.at(index);
-    for (QHash<int, QVariant>::ConstIterator iter = data.begin(); iter != data.end(); ++iter) 
-        rv.setProperty(m_roles.value(iter.key()), qScriptValueFromValue(scriptEngine, iter.value()));
-
-    return rv;
-}
-
-void QmlWorkerListModel::set(int index, const QScriptValue &value)
-{
-    if (m_agent) {
-        qmlInfo(this) << "List can only be modified from a WorkerScript";
-        return;
-    }
-
-    if (m_values.count() <= index)
-        return;
-
-    QHash<int, QVariant> data;
-
-    QScriptValueIterator it(value);
-    while (it.hasNext()) {
-        it.next();
-        QString name = it.name();
-        QVariant v = it.value().toVariant();
-
-        QHash<QString, int>::Iterator iter = m_strings.find(name);
-        if (iter == m_strings.end()) {
-            int role = m_roles.count();
-            m_roles.insert(role, name);
-            iter = m_strings.insert(name, role);
-        }
-        data.insert(*iter, v);
-    }
-
-    if (m_values.at(index) != data) {
-        m_values[index] = data;
-        emit itemsChanged(index, 1, m_roles.keys());
-    }
-}
-
-QmlWorkerListModelAgent *QmlWorkerListModel::agent()
-{
-    if (!m_agent) 
-        m_agent = new QmlWorkerListModelAgent(this);
-
-    return m_agent;
-}
-
-QList<int> QmlWorkerListModel::roles() const
-{
-    return m_roles.keys();
-}
-
-QString QmlWorkerListModel::toString(int role) const
-{
-    return m_roles.value(role);
-}
-
-int QmlWorkerListModel::count() const
-{
-    return m_values.count();
-}
-
-QHash<int,QVariant> QmlWorkerListModel::data(int index, const QList<int> &) const
-{
-    if (m_values.count() <= index)
-        return QHash<int, QVariant>();
-    else
-        return m_values.at(index);
-}
-
-QVariant QmlWorkerListModel::data(int index, int role) const
-{
-    if (m_values.count() <= index)
-        return QVariant();
-    else
-        return m_values.at(index).value(role);
-}
-
-QT_END_NAMESPACE
-
-#include "qmlworkerscript.moc"
-
-
diff --git a/src/declarative/qml/qmlworkerscript_p.h b/src/declarative/qml/qmlworkerscript_p.h
deleted file mode 100644
index 7698a21..0000000
--- a/src/declarative/qml/qmlworkerscript_p.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLWORKERSCRIPT_P_H
-#define QMLWORKERSCRIPT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qml.h"
-#include "qmlparserstatus.h"
-#include <private/qlistmodelinterface_p.h>
-
-#include <QtCore/qthread.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtCore/qurl.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlWorkerScript;
-class QmlWorkerScriptEnginePrivate;
-class QmlWorkerScriptEngine : public QThread
-{
-Q_OBJECT
-public:
-    QmlWorkerScriptEngine(QmlEngine *parent = 0);
-    virtual ~QmlWorkerScriptEngine();
-
-    int registerWorkerScript(QmlWorkerScript *);
-    void removeWorkerScript(int);
-    void executeUrl(int, const QUrl &);
-    void sendMessage(int, const QVariant &);
-
-protected:
-    virtual void run();
-
-private:
-    QmlWorkerScriptEnginePrivate *d;
-};
-
-class QmlWorkerScript : public QObject, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-
-    Q_INTERFACES(QmlParserStatus)
-public:
-    QmlWorkerScript(QObject *parent = 0);
-    virtual ~QmlWorkerScript();
-
-    QUrl source() const;
-    void setSource(const QUrl &);
-
-public slots:
-    void sendMessage(const QScriptValue &);
-
-signals:
-    void sourceChanged();
-    void message(const QScriptValue &messageObject);
-
-protected:
-    virtual void componentComplete();
-    virtual bool event(QEvent *);
-
-private:
-    QmlWorkerScriptEngine *m_engine;
-    int m_scriptId;
-    QUrl m_source;
-};
-
-class QmlWorkerListModelAgent;
-class QmlWorkerListModel : public QListModelInterface
-{
-    Q_OBJECT
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-
-public:
-    QmlWorkerListModel(QObject * = 0);
-    virtual ~QmlWorkerListModel();
-
-    Q_INVOKABLE void clear();
-    Q_INVOKABLE void remove(int index);
-    Q_INVOKABLE void append(const QScriptValue &);
-    Q_INVOKABLE void insert(int index, const QScriptValue&);
-    Q_INVOKABLE QScriptValue get(int index) const;
-    Q_INVOKABLE void set(int index, const QScriptValue &);
-
-    QmlWorkerListModelAgent *agent();
-
-    virtual QList<int> roles() const;
-    virtual QString toString(int role) const;
-    virtual int count() const;
-    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
-    virtual QVariant data(int index, int role) const;
-
-Q_SIGNALS:
-    void countChanged();
-
-private:
-    friend class QmlWorkerListModelAgent;
-
-    QHash<int, QString> m_roles;
-    QHash<QString, int> m_strings;
-    QList<QHash<int, QVariant> > m_values;
-
-    QmlWorkerListModelAgent *m_agent;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlWorkerScript);
-QML_DECLARE_TYPE(QmlWorkerListModel);
-
-#endif // QMLWORKERSCRIPT_P_H
diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp
deleted file mode 100644
index eda2d9e..0000000
--- a/src/declarative/qml/qmlxmlhttprequest.cpp
+++ /dev/null
@@ -1,1631 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlxmlhttprequest_p.h"
-
-#include "qmlengine.h"
-#include "qmlengine_p.h"
-#include "qmlrefcount_p.h"
-#include "qmlengine_p.h"
-#include "qmlexpression_p.h"
-
-#include <QtCore/qobject.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtScript/qscriptcontext.h>
-#include <QtScript/qscriptengine.h>
-#include <QtNetwork/qnetworkreply.h>
-#include <QtCore/qxmlstream.h>
-#include <QtCore/qstack.h>
-#include <QtCore/qdebug.h>
-
-// From DOM-Level-3-Core spec
-// http://www.w3.org/TR/DOM-Level-3-Core/core.html
-#define INDEX_SIZE_ERR 1
-#define DOMSTRING_SIZE_ERR 2
-#define HIERARCHY_REQUEST_ERR 3
-#define WRONG_DOCUMENT_ERR 4
-#define INVALID_CHARACTER_ERR 5
-#define NO_DATA_ALLOWED_ERR 6
-#define NO_MODIFICATION_ALLOWED_ERR 7
-#define NOT_FOUND_ERR 8
-#define NOT_SUPPORTED_ERR 9
-#define INUSE_ATTRIBUTE_ERR 10
-#define INVALID_STATE_ERR 11
-#define SYNTAX_ERR 12
-#define INVALID_MODIFICATION_ERR 13
-#define NAMESPACE_ERR 14
-#define INVALID_ACCESS_ERR 15
-#define VALIDATION_ERR 16
-#define TYPE_MISMATCH_ERR 17
-
-#define THROW_DOM(error, desc) \
-{ \
-    QScriptValue errorValue = context->throwError(QLatin1String(desc)); \
-    errorValue.setProperty(QLatin1String("code"), error); \
-    return errorValue; \
-} 
-
-#define THROW_SYNTAX(desc) \
-    return context->throwError(QScriptContext::SyntaxError, QLatin1String(desc));
-#define THROW_REFERENCE(desc) \
-    return context->throwError(QScriptContext::ReferenceError, QLatin1String(desc));
-
-#define D(arg) (arg)->release()
-#define A(arg) (arg)->addref()
-
-QT_BEGIN_NAMESPACE
-
-class DocumentImpl;
-class NodeImpl 
-{
-public:
-    NodeImpl() : type(Element), document(0), parent(0) {}
-    virtual ~NodeImpl() { 
-        for (int ii = 0; ii < children.count(); ++ii)
-            delete children.at(ii);
-        for (int ii = 0; ii < attributes.count(); ++ii)
-            delete attributes.at(ii);
-    }
-
-    // These numbers are copied from the Node IDL definition
-    enum Type { 
-        Attr = 2, 
-        CDATA = 4, 
-        Comment = 8, 
-        Document = 9, 
-        DocumentFragment = 11, 
-        DocumentType = 10,
-        Element = 1, 
-        Entity = 6, 
-        EntityReference = 5,
-        Notation = 12, 
-        ProcessingInstruction = 7, 
-        Text = 3
-    };
-    Type type;
-
-    QString namespaceUri;
-    QString name;
-
-    QString data;
-
-    void addref();
-    void release();
-
-    DocumentImpl *document;
-    NodeImpl *parent;
-
-    QList<NodeImpl *> children;
-    QList<NodeImpl *> attributes;
-};
-
-class DocumentImpl : public QmlRefCount, public NodeImpl
-{
-public:
-    DocumentImpl() : root(0) { type = Document; }
-    virtual ~DocumentImpl() {
-        if (root) delete root;
-    }
-
-    QString version;
-    QString encoding;
-    bool isStandalone;
-
-    NodeImpl *root;
-
-    void addref() { QmlRefCount::addref(); }
-    void release() { QmlRefCount::release(); }
-};
-
-class NamedNodeMap
-{
-public:
-    // JS API
-    static QScriptValue length(QScriptContext *context, QScriptEngine *engine);
-
-    // C++ API
-    static QScriptValue prototype(QScriptEngine *);
-    static QScriptValue create(QScriptEngine *, NodeImpl *, QList<NodeImpl *> *);
-
-    NamedNodeMap();
-    NamedNodeMap(const NamedNodeMap &);
-    ~NamedNodeMap();
-    bool isNull();
-
-    NodeImpl *d;
-    QList<NodeImpl *> *list;
-private:
-    NamedNodeMap &operator=(const NamedNodeMap &);
-};
-
-class NamedNodeMapClass : public QScriptClass
-{
-public:
-    NamedNodeMapClass(QScriptEngine *engine) : QScriptClass(engine) {}
-
-    virtual QueryFlags queryProperty(const QScriptValue &object, const QScriptString &name, QueryFlags flags, uint *id);
-    virtual QScriptValue property(const QScriptValue &object, const QScriptString &name, uint id);
-};
-
-class NodeList 
-{
-public:
-    // JS API
-    static QScriptValue length(QScriptContext *context, QScriptEngine *engine);
-
-    // C++ API
-    static QScriptValue prototype(QScriptEngine *);
-    static QScriptValue create(QScriptEngine *, NodeImpl *);
-
-    NodeList();
-    NodeList(const NodeList &);
-    ~NodeList();
-    bool isNull();
-
-    NodeImpl *d;
-private:
-    NodeList &operator=(const NodeList &);
-};
-
-class NodeListClass : public QScriptClass
-{
-public:
-    NodeListClass(QScriptEngine *engine) : QScriptClass(engine) {}
-    virtual QueryFlags queryProperty(const QScriptValue &object, const QScriptString &name, QueryFlags flags, uint *id);
-    virtual QScriptValue property(const QScriptValue &object, const QScriptString &name, uint id);
-};
-
-class Node
-{
-public:
-    // JS API
-    static QScriptValue nodeName(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue nodeValue(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue nodeType(QScriptContext *context, QScriptEngine *engine);
-
-    static QScriptValue parentNode(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue childNodes(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue firstChild(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue lastChild(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue previousSibling(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue nextSibling(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue attributes(QScriptContext *context, QScriptEngine *engine);
-
-    //static QScriptValue ownerDocument(QScriptContext *context, QScriptEngine *engine);
-    //static QScriptValue namespaceURI(QScriptContext *context, QScriptEngine *engine);
-    //static QScriptValue prefix(QScriptContext *context, QScriptEngine *engine);
-    //static QScriptValue localName(QScriptContext *context, QScriptEngine *engine);
-    //static QScriptValue baseURI(QScriptContext *context, QScriptEngine *engine);
-    //static QScriptValue textContent(QScriptContext *context, QScriptEngine *engine);
-
-    // C++ API
-    static QScriptValue prototype(QScriptEngine *);
-    static QScriptValue create(QScriptEngine *, NodeImpl *);
-
-    Node();
-    Node(const Node &o);
-    ~Node();
-    bool isNull() const;
-
-    NodeImpl *d;
-
-private:
-    Node &operator=(const Node &);
-};
-
-class Element : public Node
-{
-public:
-    // C++ API
-    static QScriptValue prototype(QScriptEngine *);
-};
-
-class Attr : public Node
-{
-public:
-    // JS API
-    static QScriptValue name(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue specified(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue value(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue ownerElement(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue schemaTypeInfo(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue isId(QScriptContext *context, QScriptEngine *engine);
-
-    // C++ API
-    static QScriptValue prototype(QScriptEngine *);
-};
-
-class CharacterData : public Node
-{
-public:
-    // JS API
-    static QScriptValue length(QScriptContext *context, QScriptEngine *engine);
-
-    // C++ API
-    static QScriptValue prototype(QScriptEngine *);
-};
-
-class Text : public CharacterData
-{
-public:
-    // JS API
-    static QScriptValue isElementContentWhitespace(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue wholeText(QScriptContext *context, QScriptEngine *engine);
-
-    // C++ API
-    static QScriptValue prototype(QScriptEngine *);
-};
-
-class CDATA : public Text
-{
-public:
-    // C++ API
-    static QScriptValue prototype(QScriptEngine *);
-};
-
-class Document : public Node
-{
-public:
-    // JS API
-    static QScriptValue xmlVersion(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue xmlEncoding(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue xmlStandalone(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue documentElement(QScriptContext *context, QScriptEngine *engine);
-
-    // C++ API
-    static QScriptValue prototype(QScriptEngine *);
-    static QScriptValue load(QScriptEngine *engine, const QString &data);
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(Node);
-Q_DECLARE_METATYPE(NodeList);
-Q_DECLARE_METATYPE(NamedNodeMap);
-
-QT_BEGIN_NAMESPACE
-
-void NodeImpl::addref() 
-{
-    A(document);
-}
-
-void NodeImpl::release()
-{
-    D(document);
-}
-
-QScriptValue Node::nodeName(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    switch (node.d->type) {
-    case NodeImpl::Document:
-        return QScriptValue(QLatin1String("#document"));
-    case NodeImpl::CDATA:
-        return QScriptValue(QLatin1String("#cdata-section"));
-    case NodeImpl::Text:
-        return QScriptValue(QLatin1String("#text"));
-    default:
-        return QScriptValue(node.d->name);
-    }
-}
-
-QScriptValue Node::nodeValue(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    if (node.d->type == NodeImpl::Document ||
-        node.d->type == NodeImpl::DocumentFragment ||
-        node.d->type == NodeImpl::DocumentType ||
-        node.d->type == NodeImpl::Element ||
-        node.d->type == NodeImpl::Entity ||
-        node.d->type == NodeImpl::EntityReference ||
-        node.d->type == NodeImpl::Notation)
-        return engine->nullValue();
-
-    return QScriptValue(node.d->data);
-}
-
-QScriptValue Node::nodeType(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-    return QScriptValue(node.d->type);
-}
-
-QScriptValue Node::parentNode(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    if (node.d->parent) return Node::create(engine, node.d->parent);
-    else return engine->nullValue();
-}
-
-QScriptValue Node::childNodes(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    return NodeList::create(engine, node.d);
-}
-
-QScriptValue Node::firstChild(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    if (node.d->children.isEmpty()) return engine->nullValue();
-    else return Node::create(engine, node.d->children.first());
-}
-
-QScriptValue Node::lastChild(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    if (node.d->children.isEmpty()) return engine->nullValue();
-    else return Node::create(engine, node.d->children.last());
-}
-
-QScriptValue Node::previousSibling(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    if (!node.d->parent) return engine->nullValue();
-
-    for (int ii = 0; ii < node.d->parent->children.count(); ++ii) {
-        if (node.d->parent->children.at(ii) == node.d) {
-            if (ii == 0) return engine->nullValue();
-            else return Node::create(engine, node.d->parent->children.at(ii - 1));
-        }
-    }
-
-    return engine->nullValue();
-}
-
-QScriptValue Node::nextSibling(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    if (!node.d->parent) return engine->nullValue();
-
-    for (int ii = 0; ii < node.d->parent->children.count(); ++ii) {
-        if (node.d->parent->children.at(ii) == node.d) {
-            if ((ii + 1) == node.d->parent->children.count()) return engine->nullValue();
-            else return Node::create(engine, node.d->parent->children.at(ii + 1)); 
-        }
-    }
-
-    return engine->nullValue();
-}
-
-QScriptValue Node::attributes(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    if (node.d->type != NodeImpl::Element)
-        return engine->nullValue();
-    else
-        return NamedNodeMap::create(engine, node.d, &node.d->attributes);
-}
-
-QScriptValue Node::prototype(QScriptEngine *engine)
-{
-    QScriptValue proto = engine->newObject();
-
-    proto.setProperty(QLatin1String("nodeName"), engine->newFunction(nodeName), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("nodeValue"), engine->newFunction(nodeValue), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
-    proto.setProperty(QLatin1String("nodeType"), engine->newFunction(nodeType), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("parentNode"), engine->newFunction(parentNode), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("childNodes"), engine->newFunction(childNodes), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("firstChild"), engine->newFunction(firstChild), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("lastChild"), engine->newFunction(lastChild), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("previousSibling"), engine->newFunction(previousSibling), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("nextSibling"), engine->newFunction(nextSibling), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("attributes"), engine->newFunction(attributes), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-
-    return proto;
-}
-
-QScriptValue Node::create(QScriptEngine *engine, NodeImpl *data)
-{
-    QScriptValue instance = engine->newObject();
-
-    switch (data->type) {
-    case NodeImpl::Attr:
-        instance.setPrototype(Attr::prototype(engine));
-        break;
-    case NodeImpl::Comment:
-    case NodeImpl::Document:
-    case NodeImpl::DocumentFragment:
-    case NodeImpl::DocumentType:
-    case NodeImpl::Entity:
-    case NodeImpl::EntityReference:
-    case NodeImpl::Notation:
-    case NodeImpl::ProcessingInstruction:
-        return QScriptValue();
-    case NodeImpl::CDATA:
-        instance.setPrototype(CDATA::prototype(engine));
-        break;
-    case NodeImpl::Text:
-        instance.setPrototype(Text::prototype(engine));
-        break;
-    case NodeImpl::Element:
-        instance.setPrototype(Element::prototype(engine));
-        break;
-    }
-
-    Node node;
-    node.d = data;
-    if (data) A(data);
-
-    return engine->newVariant(instance, qVariantFromValue(node));
-}
-
-QScriptValue Element::prototype(QScriptEngine *engine)
-{
-    QScriptValue proto = engine->newObject();
-    proto.setPrototype(Node::prototype(engine));
-
-    proto.setProperty(QLatin1String("tagName"), engine->newFunction(nodeName), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-
-    return proto;
-}
-
-QScriptValue Attr::prototype(QScriptEngine *engine)
-{
-    QScriptValue proto = engine->newObject();
-    proto.setPrototype(Node::prototype(engine));
-
-    proto.setProperty(QLatin1String("name"), engine->newFunction(name), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("value"), engine->newFunction(value), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("ownerElement"), engine->newFunction(ownerElement), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-
-    return proto;
-}
-
-QScriptValue Attr::name(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    return QScriptValue(node.d->name);
-}
-
-QScriptValue Attr::value(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    return QScriptValue(node.d->data);
-}
-
-QScriptValue Attr::ownerElement(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    return Node::create(engine, node.d->parent);
-}
-
-QScriptValue CharacterData::length(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    return QScriptValue(node.d->data.length());
-}
-
-QScriptValue CharacterData::prototype(QScriptEngine *engine)
-{
-    QScriptValue proto = engine->newObject();
-    proto.setPrototype(Node::prototype(engine));
-
-    proto.setProperty(QLatin1String("data"), engine->newFunction(nodeValue), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
-    proto.setProperty(QLatin1String("length"), engine->newFunction(length), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-
-    return proto;
-}
-
-QScriptValue Text::isElementContentWhitespace(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    return node.d->data.trimmed().isEmpty();
-}
-
-QScriptValue Text::wholeText(QScriptContext *context, QScriptEngine *engine)
-{
-    Node node = qscriptvalue_cast<Node>(context->thisObject());
-    if (node.isNull()) return engine->undefinedValue();
-
-    return node.d->data;
-}
-
-QScriptValue Text::prototype(QScriptEngine *engine)
-{
-    QScriptValue proto = engine->newObject();
-    proto.setPrototype(CharacterData::prototype(engine));
-
-    proto.setProperty(QLatin1String("isElementContentWhitespace"), engine->newFunction(isElementContentWhitespace), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    proto.setProperty(QLatin1String("wholeText"), engine->newFunction(wholeText), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-
-    return proto;
-}
-
-QScriptValue CDATA::prototype(QScriptEngine *engine)
-{
-    QScriptValue proto = engine->newObject();
-    proto.setPrototype(Text::prototype(engine));
-    return proto;
-}
-
-QScriptValue Document::prototype(QScriptEngine *engine)
-{
-    QScriptValue proto = engine->newObject();
-    proto.setPrototype(Node::prototype(engine));
-
-    proto.setProperty(QLatin1String("xmlVersion"), engine->newFunction(xmlVersion), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
-    proto.setProperty(QLatin1String("xmlEncoding"), engine->newFunction(xmlEncoding), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
-    proto.setProperty(QLatin1String("xmlStandalone"), engine->newFunction(xmlStandalone), QScriptValue::ReadOnly | QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
-    proto.setProperty(QLatin1String("documentElement"), engine->newFunction(documentElement), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-
-    return proto;
-}
-
-QScriptValue Document::load(QScriptEngine *engine, const QString &data)
-{
-    Q_ASSERT(engine);
-
-    DocumentImpl *document = 0;
-    QStack<NodeImpl *> nodeStack;
-
-    QXmlStreamReader reader(data);
-
-    while (!reader.atEnd()) {
-        switch (reader.readNext()) {
-        case QXmlStreamReader::NoToken:
-            break;
-        case QXmlStreamReader::Invalid:
-            break;
-        case QXmlStreamReader::StartDocument:
-            Q_ASSERT(!document);
-            document = new DocumentImpl;
-            document->document = document;
-            document->version = reader.documentVersion().toString();
-            document->encoding = reader.documentEncoding().toString();
-            document->isStandalone = reader.isStandaloneDocument();
-            break;
-        case QXmlStreamReader::EndDocument:
-            break;
-        case QXmlStreamReader::StartElement: 
-        {
-            Q_ASSERT(document);
-            NodeImpl *node = new NodeImpl;
-            node->document = document;
-            node->namespaceUri = reader.namespaceUri().toString();
-            node->name = reader.name().toString();
-            if (nodeStack.isEmpty()) {
-                document->root = node;
-            } else {
-                node->parent = nodeStack.top();
-                node->parent->children.append(node);
-            }
-            nodeStack.append(node);
-
-            foreach (const QXmlStreamAttribute &a, reader.attributes()) {
-                NodeImpl *attr = new NodeImpl;
-                attr->document = document;
-                attr->type = NodeImpl::Attr;
-                attr->namespaceUri = a.namespaceUri().toString();
-                attr->name = a.name().toString();
-                attr->data = a.value().toString();
-                attr->parent = node;
-                node->attributes.append(attr);
-            }
-        } 
-            break;
-        case QXmlStreamReader::EndElement:
-            nodeStack.pop();
-            break;
-        case QXmlStreamReader::Characters:
-        {
-            NodeImpl *node = new NodeImpl;
-            node->document = document;
-            node->type = reader.isCDATA()?NodeImpl::CDATA:NodeImpl::Text;
-            node->parent = nodeStack.top();
-            node->parent->children.append(node);
-            node->data = reader.text().toString();
-        }
-            break;
-        case QXmlStreamReader::Comment:
-            break;
-        case QXmlStreamReader::DTD:
-            break;
-        case QXmlStreamReader::EntityReference:
-            break;
-        case QXmlStreamReader::ProcessingInstruction:
-            break;
-        }
-    }
-
-    if (!document || reader.hasError()) {
-        if (document) D(document);
-        return engine->nullValue();
-    }
-
-    QScriptValue instance = engine->newObject();
-    instance.setPrototype(Document::prototype(engine));
-    Node documentNode;
-    documentNode.d = document;
-    return engine->newVariant(instance, qVariantFromValue(documentNode));
-}
-
-Node::Node()
-: d(0)
-{
-}
-
-Node::Node(const Node &o)
-: d(o.d)
-{
-    if (d) A(d);
-}
-
-Node::~Node()
-{
-    if (d) D(d);
-}
-
-bool Node::isNull() const
-{
-    return d == 0;
-}
-
-QScriptValue NamedNodeMap::length(QScriptContext *context, QScriptEngine *engine)
-{
-    NamedNodeMap map = qscriptvalue_cast<NamedNodeMap>(context->thisObject().data());
-    if (map.isNull()) return engine->undefinedValue();
-
-    return QScriptValue(map.list->count());
-}
-
-QScriptValue NamedNodeMap::prototype(QScriptEngine *engine)
-{
-    QScriptValue proto = engine->newObject();
-
-    proto.setProperty(QLatin1String("length"), engine->newFunction(length), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-
-    return proto;
-}
-
-QScriptValue NamedNodeMap::create(QScriptEngine *engine, NodeImpl *data, QList<NodeImpl *> *list)
-{
-    QScriptValue instance = engine->newObject();
-    instance.setPrototype(NamedNodeMap::prototype(engine));
-
-    NamedNodeMap map;
-    map.d = data;
-    map.list = list;
-    if (data) A(data);
-
-    instance.setData(engine->newVariant(qVariantFromValue(map)));
-
-    if (!QmlScriptEngine::get(engine)->namedNodeMapClass)
-        QmlScriptEngine::get(engine)->namedNodeMapClass= new NamedNodeMapClass(engine);
-
-    instance.setScriptClass(QmlScriptEngine::get(engine)->namedNodeMapClass);
-
-    return instance;
-}
-
-NamedNodeMap::NamedNodeMap()
-: d(0), list(0)
-{
-}
-
-NamedNodeMap::NamedNodeMap(const NamedNodeMap &o)
-: d(o.d), list(o.list)
-{
-    if (d) A(d);
-}
-
-NamedNodeMap::~NamedNodeMap()
-{
-    if (d) D(d);
-}
-
-bool NamedNodeMap::isNull()
-{
-    return d == 0;
-}
-
-QScriptValue NodeList::length(QScriptContext *context, QScriptEngine *engine)
-{
-    NodeList list = qscriptvalue_cast<NodeList>(context->thisObject().data());
-    if (list.isNull()) return engine->undefinedValue();
-
-    return QScriptValue(list.d->children.count());
-}
-
-QScriptValue NodeList::prototype(QScriptEngine *engine)
-{
-    QScriptValue proto = engine->newObject();
-
-    proto.setProperty(QLatin1String("length"), engine->newFunction(length), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-
-    return proto;
-}
-
-QScriptValue NodeList::create(QScriptEngine *engine, NodeImpl *data)
-{
-    QScriptValue instance = engine->newObject();
-    instance.setPrototype(NodeList::prototype(engine));
-
-    NodeList list;
-    list.d = data;
-    if (data) A(data);
-
-    instance.setData(engine->newVariant(qVariantFromValue(list)));
-
-    if (!QmlScriptEngine::get(engine)->nodeListClass)
-        QmlScriptEngine::get(engine)->nodeListClass= new NodeListClass(engine);
-
-    instance.setScriptClass(QmlScriptEngine::get(engine)->nodeListClass);
-
-    return instance;
-}
-
-NodeList::NodeList()
-: d(0)
-{
-}
-
-NodeList::NodeList(const NodeList &o)
-: d(o.d)
-{
-    if (d) A(d);
-}
-
-NodeList::~NodeList()
-{
-    if (d) D(d);
-}
-
-bool NodeList::isNull()
-{
-    return d == 0;
-}
-
-NamedNodeMapClass::QueryFlags NamedNodeMapClass::queryProperty(const QScriptValue &object, const QScriptString &name, QueryFlags flags, uint *id)
-{
-    if (!(flags & HandlesReadAccess))
-        return 0;
-
-    NamedNodeMap map = qscriptvalue_cast<NamedNodeMap>(object.data());
-    Q_ASSERT(!map.isNull());
-
-    bool ok = false;
-    QString nameString = name.toString();
-    uint index = nameString.toUInt(&ok);
-    if (ok) {
-        if ((uint)map.list->count() <= index)
-            return 0;
-
-        *id = index;
-        return HandlesReadAccess;
-    } else {
-        for (int ii = 0; ii < map.list->count(); ++ii) {
-            if (map.list->at(ii) && map.list->at(ii)->name == nameString) {
-                *id = ii;
-                return HandlesReadAccess;
-            }
-        }
-    }
-
-    return 0;
-}
-
-QScriptValue NamedNodeMapClass::property(const QScriptValue &object, const QScriptString &, uint id)
-{
-    NamedNodeMap map = qscriptvalue_cast<NamedNodeMap>(object.data());
-    return Node::create(engine(), map.list->at(id));
-}
-
-NodeListClass::QueryFlags NodeListClass::queryProperty(const QScriptValue &object, const QScriptString &name, QueryFlags flags, uint *id)
-{
-    if (!(flags & HandlesReadAccess))
-        return 0;
-
-    bool ok = false;
-    uint index = name.toString().toUInt(&ok);
-    if (!ok)
-        return 0;
-
-    NodeList list = qscriptvalue_cast<NodeList>(object.data());
-    if (list.isNull() || (uint)list.d->children.count() <= index)
-        return 0; // ### I think we're meant to raise an exception
-
-    *id = index;
-    return HandlesReadAccess;
-}
-
-QScriptValue NodeListClass::property(const QScriptValue &object, const QScriptString &, uint id)
-{
-    NodeList list = qscriptvalue_cast<NodeList>(object.data());
-    return Node::create(engine(), list.d->children.at(id));
-}
-
-QScriptValue Document::documentElement(QScriptContext *context, QScriptEngine *engine)
-{
-    Node document = qscriptvalue_cast<Node>(context->thisObject());
-    if (document.isNull() || document.d->type != NodeImpl::Document) return engine->undefinedValue();
-
-    return Node::create(engine, static_cast<DocumentImpl *>(document.d)->root);
-}
-
-QScriptValue Document::xmlStandalone(QScriptContext *context, QScriptEngine *engine)
-{
-    Node document = qscriptvalue_cast<Node>(context->thisObject());
-    if (document.isNull() || document.d->type != NodeImpl::Document) return engine->undefinedValue();
-
-    return QScriptValue(static_cast<DocumentImpl *>(document.d)->isStandalone);
-}
-
-QScriptValue Document::xmlVersion(QScriptContext *context, QScriptEngine *engine)
-{
-    Node document = qscriptvalue_cast<Node>(context->thisObject());
-    if (document.isNull() || document.d->type != NodeImpl::Document) return engine->undefinedValue();
-
-    return QScriptValue(static_cast<DocumentImpl *>(document.d)->version);
-}
-
-QScriptValue Document::xmlEncoding(QScriptContext *context, QScriptEngine *engine)
-{
-    Node document = qscriptvalue_cast<Node>(context->thisObject());
-    if (document.isNull() || document.d->type != NodeImpl::Document) return engine->undefinedValue();
-
-    return QScriptValue(static_cast<DocumentImpl *>(document.d)->encoding);
-}
-
-class QmlXMLHttpRequest : public QObject
-{
-Q_OBJECT
-public:
-    enum State { Unsent = 0, 
-                 Opened = 1, HeadersReceived = 2,
-                 Loading = 3, Done = 4 };
-
-    QmlXMLHttpRequest(QNetworkAccessManager *manager);
-    virtual ~QmlXMLHttpRequest();
-
-    bool sendFlag() const;
-    bool errorFlag() const;
-    quint32 readyState() const;
-    int replyStatus() const;
-    QString replyStatusText() const;
-
-    QScriptValue open(QScriptValue *me, const QString &, const QUrl &);
-
-    void addHeader(const QString &, const QString &);
-    QString header(const QString &name);
-    QString headers();
-    QScriptValue send(QScriptValue *me, const QByteArray &);
-    QScriptValue abort(QScriptValue *me);
-
-    QString responseBody() const;
-private slots:
-    void downloadProgress(qint64);
-    void error(QNetworkReply::NetworkError);
-    void finished();
-
-private:
-    void requestFromUrl(const QUrl &url);
-
-    State m_state;
-    bool m_errorFlag;
-    bool m_sendFlag;
-    QString m_method;
-    QUrl m_url;
-    QByteArray m_responseEntityBody;
-    QByteArray m_data;
-    int m_redirectCount;
-
-    typedef QPair<QByteArray, QByteArray> HeaderPair;
-    typedef QList<HeaderPair> HeadersList;
-    HeadersList m_headersList;
-    void fillHeadersList();
-
-    QScriptValue m_me; // Set to the data object while a send() is ongoing (to access the callback)
-
-    QScriptValue dispatchCallback(QScriptValue *me);
-    void printError(const QScriptValue&);
-
-    int m_status;
-    QString m_statusText;
-    QNetworkRequest m_request;
-    QNetworkReply *m_network;
-    void destroyNetwork();
-
-    QNetworkAccessManager *m_nam;
-    QNetworkAccessManager *networkAccessManager() { return m_nam; }
-};
-
-QmlXMLHttpRequest::QmlXMLHttpRequest(QNetworkAccessManager *manager)
-: m_state(Unsent), m_errorFlag(false), m_sendFlag(false),
-  m_redirectCount(0), m_network(0), m_nam(manager)
-{
-}
-
-QmlXMLHttpRequest::~QmlXMLHttpRequest()
-{
-    destroyNetwork();
-}
-
-bool QmlXMLHttpRequest::sendFlag() const
-{
-    return m_sendFlag;
-}
-
-bool QmlXMLHttpRequest::errorFlag() const
-{
-    return m_errorFlag;
-}
-
-quint32 QmlXMLHttpRequest::readyState() const
-{
-    return m_state;
-}
-
-int QmlXMLHttpRequest::replyStatus() const
-{
-    return m_status;
-}
-
-QString QmlXMLHttpRequest::replyStatusText() const
-{
-    return m_statusText;
-}
-
-QScriptValue QmlXMLHttpRequest::open(QScriptValue *me, const QString &method, const QUrl &url)
-{
-    destroyNetwork();
-    m_sendFlag = false;
-    m_errorFlag = false;
-    m_responseEntityBody = QByteArray();
-    m_method = method;
-    m_url = url;
-    m_state = Opened;
-    return dispatchCallback(me);
-}
-
-void QmlXMLHttpRequest::addHeader(const QString &name, const QString &value)
-{
-    QByteArray utfname = name.toUtf8();
-
-    if (m_request.hasRawHeader(utfname)) {
-        m_request.setRawHeader(utfname, m_request.rawHeader(utfname) + ',' + value.toUtf8());
-    } else {
-        m_request.setRawHeader(utfname, value.toUtf8());
-    }
-}
-
-QString QmlXMLHttpRequest::header(const QString &name)
-{
-    QByteArray utfname = name.toLower().toUtf8();
-
-    foreach (const HeaderPair &header, m_headersList) {
-        if (header.first == utfname)
-            return QString::fromUtf8(header.second);
-    }
-    return QString();
-}
-
-QString QmlXMLHttpRequest::headers()
-{
-    QString ret;
-
-    foreach (const HeaderPair &header, m_headersList) {
-        if (ret.length())
-            ret.append(QString::fromUtf8("\r\n"));
-        ret.append(QString::fromUtf8(header.first));
-        ret.append(QString::fromUtf8(": "));
-        ret.append(QString::fromUtf8(header.second));
-    }
-    return ret;
-}
-
-void QmlXMLHttpRequest::fillHeadersList()
-{
-    QList<QByteArray> headerList = m_network->rawHeaderList();
-
-    m_headersList.clear();
-    foreach (const QByteArray &header, headerList) {
-        HeaderPair pair (header.toLower(), m_network->rawHeader(header));
-	if (pair.first == "set-cookie" ||
-	    pair.first == "set-cookie2") 
-	    continue;
-
-        m_headersList << pair;
-    }
-}
-
-void QmlXMLHttpRequest::requestFromUrl(const QUrl &url)
-{
-    QNetworkRequest request = m_request;
-    request.setUrl(url);
-    if(m_method == QLatin1String("POST") ||
-       m_method == QLatin1String("PUT")) {
-        QVariant var = request.header(QNetworkRequest::ContentTypeHeader);
-        if (var.isValid()) {
-            QString str = var.toString();
-            int charsetIdx = str.indexOf(QLatin1String("charset="));
-            if (charsetIdx == -1) {
-                // No charset - append
-                if (!str.isEmpty()) str.append(QLatin1Char(';'));
-                str.append(QLatin1String("charset=UTF-8"));
-            } else {
-                charsetIdx += 8;
-                int n = 0;
-                int semiColon = str.indexOf(QLatin1Char(';'), charsetIdx);
-                if (semiColon == -1) {
-                    n = str.length() - charsetIdx;
-                } else {
-                    n = semiColon - charsetIdx;
-                }
-
-                str.replace(charsetIdx, n, QLatin1String("UTF-8"));
-            }
-            request.setHeader(QNetworkRequest::ContentTypeHeader, str);
-        } else {
-            request.setHeader(QNetworkRequest::ContentTypeHeader, 
-                              QLatin1String("text/plain;charset=UTF-8"));
-        }
-    }
-
-    if (m_method == QLatin1String("GET"))
-        m_network = networkAccessManager()->get(request);
-    else if (m_method == QLatin1String("HEAD"))
-        m_network = networkAccessManager()->head(request);
-    else if(m_method == QLatin1String("POST"))
-        m_network = networkAccessManager()->post(request, m_data);
-    else if(m_method == QLatin1String("PUT"))
-        m_network = networkAccessManager()->put(request, m_data);
-
-    QObject::connect(m_network, SIGNAL(downloadProgress(qint64,qint64)), 
-                     this, SLOT(downloadProgress(qint64)));
-    QObject::connect(m_network, SIGNAL(error(QNetworkReply::NetworkError)),
-                     this, SLOT(error(QNetworkReply::NetworkError)));
-    QObject::connect(m_network, SIGNAL(finished()),
-                     this, SLOT(finished()));
-}
-
-QScriptValue QmlXMLHttpRequest::send(QScriptValue *me, const QByteArray &data)
-{
-    m_errorFlag = false;
-    m_sendFlag = true;
-    m_redirectCount = 0;
-    m_data = data;
-    m_me = *me;
-
-    requestFromUrl(m_url);
-
-    return QScriptValue();
-}
-
-QScriptValue QmlXMLHttpRequest::abort(QScriptValue *me)
-{
-    destroyNetwork();
-    m_responseEntityBody = QByteArray();
-    m_errorFlag = true;
-    m_request = QNetworkRequest();
-
-    if (!(m_state == Unsent || 
-          (m_state == Opened && !m_sendFlag) ||
-          m_state == Done)) {
-
-        m_state = Done;
-        m_sendFlag = false;
-        QScriptValue cbv = dispatchCallback(me);
-        if (cbv.isError()) return cbv;
-    }
-
-    m_state = Unsent;
-    return QScriptValue();
-}
-
-void QmlXMLHttpRequest::downloadProgress(qint64 bytes)
-{
-    Q_UNUSED(bytes)
-    m_status = 
-        m_network->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    m_statusText =
-        QString::fromUtf8(m_network->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray());
-
-    // ### We assume if this is called the headers are now available
-    if (m_state < HeadersReceived) {
-        m_state = HeadersReceived;
-        fillHeadersList ();
-        QScriptValue cbv = dispatchCallback(&m_me);
-        if (cbv.isError()) printError(cbv);
-    }
-
-    bool wasEmpty = m_responseEntityBody.isEmpty();
-    m_responseEntityBody.append(m_network->readAll());
-    if (wasEmpty && !m_responseEntityBody.isEmpty()) {
-        m_state = Loading;
-        QScriptValue cbv = dispatchCallback(&m_me);
-        if (cbv.isError()) printError(cbv);
-    }
-}
-
-void QmlXMLHttpRequest::error(QNetworkReply::NetworkError error)
-{
-    Q_UNUSED(error)
-    m_status =
-        m_network->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    m_statusText =
-        QString::fromUtf8(m_network->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray());
-
-    m_responseEntityBody = QByteArray();
-
-    m_request = QNetworkRequest();
-    m_data.clear();
-    destroyNetwork();
-
-    if (error == QNetworkReply::ContentAccessDenied ||
-        error == QNetworkReply::ContentOperationNotPermittedError ||
-        error == QNetworkReply::ContentNotFoundError ||
-        error == QNetworkReply::AuthenticationRequiredError ||
-        error == QNetworkReply::ContentReSendError) {
-        m_state = Loading;
-        QScriptValue cbv = dispatchCallback(&m_me);
-        if (cbv.isError()) printError(cbv);
-    } else {
-        m_errorFlag = true;
-    } 
-
-    m_state = Done;
-    QScriptValue cbv = dispatchCallback(&m_me);
-    if (cbv.isError()) printError(cbv);
-}
-
-#define XMLHTTPREQUEST_MAXIMUM_REDIRECT_RECURSION 15
-void QmlXMLHttpRequest::finished()
-{
-    m_redirectCount++;
-    if (m_redirectCount < XMLHTTPREQUEST_MAXIMUM_REDIRECT_RECURSION) {
-        QVariant redirect = m_network->attribute(QNetworkRequest::RedirectionTargetAttribute);
-        if (redirect.isValid()) {
-            QUrl url = redirect.toUrl();
-            destroyNetwork();
-            requestFromUrl(url);
-            return;
-        }
-    }
-
-    m_status =
-        m_network->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    m_statusText =
-        QString::fromUtf8(m_network->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray());
-
-    if (m_state < HeadersReceived) {
-        m_state = HeadersReceived;
-        fillHeadersList ();
-        QScriptValue cbv = dispatchCallback(&m_me);
-        if (cbv.isError()) printError(cbv);
-    }
-    m_responseEntityBody.append(m_network->readAll());
-    m_data.clear();
-    destroyNetwork();
-    if (m_state < Loading) {
-        m_state = Loading;
-        QScriptValue cbv = dispatchCallback(&m_me);
-        if (cbv.isError()) printError(cbv);
-    }
-    m_state = Done;
-    QScriptValue cbv = dispatchCallback(&m_me);
-    if (cbv.isError()) printError(cbv);
-
-    m_me = QScriptValue();
-}
-
-
-QString QmlXMLHttpRequest::responseBody() const
-{
-    return QString::fromUtf8(m_responseEntityBody);
-}
-
-QScriptValue QmlXMLHttpRequest::dispatchCallback(QScriptValue *me)
-{
-    QScriptValue v = me->property(QLatin1String("callback"));
-    return v.call();
-}
-
-void QmlXMLHttpRequest::printError(const QScriptValue& sv)
-{
-    QmlError error;
-    QmlExpressionPrivate::exceptionToError(sv.engine(), error);
-    qWarning().nospace() << qPrintable(error.toString());
-}
-
-void QmlXMLHttpRequest::destroyNetwork()
-{
-    if (m_network) {
-        m_network->disconnect();
-        m_network->deleteLater();
-        m_network = 0;
-    }
-}
-
-// XMLHttpRequest methods
-static QScriptValue qmlxmlhttprequest_open(QScriptContext *context, QScriptEngine *engine)
-{
-    QScriptValue dataObject = context->thisObject().data();
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(dataObject.toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (context->argumentCount() < 2 || context->argumentCount() > 5)
-        THROW_DOM(SYNTAX_ERR, "Incorrect argument count");
-
-    // Argument 0 - Method
-    QString method = context->argument(0).toString().toUpper();
-    if (method != QLatin1String("GET") && 
-        method != QLatin1String("PUT") &&
-        method != QLatin1String("HEAD") &&
-        method != QLatin1String("POST"))
-        THROW_DOM(SYNTAX_ERR, "Unsupported HTTP method type");
-
-
-    // Argument 1 - URL
-    QUrl url = QUrl::fromEncoded(context->argument(1).toString().toUtf8());
-
-    if (url.isRelative()) {
-        url = QmlScriptEngine::get(engine)->resolvedUrl(context,url);
-    }
-
-    // Argument 2 - async (optional)
-    if (context->argumentCount() > 2 && !context->argument(2).toBoolean())
-        THROW_DOM(NOT_SUPPORTED_ERR, "Synchronous XMLHttpRequest calls are not supported");
-
-
-    // Argument 3/4 - user/pass (optional)
-    QString username, password;
-    if (context->argumentCount() > 3)
-        username = context->argument(3).toString();
-    if (context->argumentCount() > 4)
-        password = context->argument(4).toString();
-
-
-    // Clear the fragment (if any)
-    url.setFragment(QString());
-    // Set username/password
-    if (!username.isNull()) url.setUserName(username);
-    if (!password.isNull()) url.setPassword(password);
-
-    return request->open(&dataObject, method, url);
-}
-
-static QScriptValue qmlxmlhttprequest_setRequestHeader(QScriptContext *context, QScriptEngine *engine)
-{
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(context->thisObject().data().toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (context->argumentCount() != 2)
-        THROW_DOM(SYNTAX_ERR, "Incorrect argument count");
-
-
-    if (request->readyState() != QmlXMLHttpRequest::Opened ||
-        request->sendFlag())
-        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
-
-
-    QString name = context->argument(0).toString();
-    QString value = context->argument(1).toString();
-
-    // ### Check that name and value are well formed
-
-    QString nameUpper = name.toUpper();
-    if (nameUpper == QLatin1String("ACCEPT-CHARSET") ||
-        nameUpper == QLatin1String("ACCEPT-ENCODING") ||
-        nameUpper == QLatin1String("CONNECTION") ||
-        nameUpper == QLatin1String("CONTENT-LENGTH") ||
-        nameUpper == QLatin1String("COOKIE") ||
-        nameUpper == QLatin1String("COOKIE2") ||
-        nameUpper == QLatin1String("CONTENT-TRANSFER-ENCODING") ||
-        nameUpper == QLatin1String("DATE") ||
-        nameUpper == QLatin1String("EXPECT") ||
-        nameUpper == QLatin1String("HOST") ||
-        nameUpper == QLatin1String("KEEP-ALIVE") ||
-        nameUpper == QLatin1String("REFERER") ||
-        nameUpper == QLatin1String("TE") ||
-        nameUpper == QLatin1String("TRAILER") ||
-        nameUpper == QLatin1String("TRANSFER-ENCODING") ||
-        nameUpper == QLatin1String("UPGRADE") ||
-        nameUpper == QLatin1String("USER-AGENT") ||
-        nameUpper == QLatin1String("VIA") ||
-        nameUpper.startsWith(QLatin1String("PROXY-")) ||
-        nameUpper.startsWith(QLatin1String("SEC-"))) 
-        return engine->undefinedValue();
-
-    request->addHeader(nameUpper, value);
-
-    return engine->undefinedValue();
-}
-
-static QScriptValue qmlxmlhttprequest_send(QScriptContext *context, QScriptEngine *)
-{
-    QScriptValue dataObject = context->thisObject().data();
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(dataObject.toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (request->readyState() != QmlXMLHttpRequest::Opened)
-        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
-
-    if (request->sendFlag())
-        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
-
-    QByteArray data;
-    if (context->argumentCount() > 0)
-        data = context->argument(0).toString().toUtf8();
-
-    return request->send(&dataObject, data);
-}
-
-static QScriptValue qmlxmlhttprequest_abort(QScriptContext *context, QScriptEngine *)
-{
-    QScriptValue dataObject = context->thisObject().data();
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(dataObject.toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    return request->abort(&dataObject);
-}
-
-static QScriptValue qmlxmlhttprequest_getResponseHeader(QScriptContext *context, QScriptEngine *engine)
-{
-    Q_UNUSED(engine)
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(context->thisObject().data().toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (context->argumentCount() != 1)
-        THROW_DOM(SYNTAX_ERR, "Incorrect argument count");
-
-    if (request->readyState() != QmlXMLHttpRequest::Loading &&
-        request->readyState() != QmlXMLHttpRequest::Done &&
-        request->readyState() != QmlXMLHttpRequest::HeadersReceived)
-        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
-
-    QString headerName = context->argument(0).toString();
-
-    return QScriptValue(request->header(headerName));
-}
-
-static QScriptValue qmlxmlhttprequest_getAllResponseHeaders(QScriptContext *context, QScriptEngine *engine)
-{
-    Q_UNUSED(engine)
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(context->thisObject().data().toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (context->argumentCount() != 0)
-        THROW_DOM(SYNTAX_ERR, "Incorrect argument count");
-
-    if (request->readyState() != QmlXMLHttpRequest::Loading &&
-        request->readyState() != QmlXMLHttpRequest::Done &&
-        request->readyState() != QmlXMLHttpRequest::HeadersReceived)
-        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
-
-    return QScriptValue(request->headers());
-}
-
-// XMLHttpRequest properties
-static QScriptValue qmlxmlhttprequest_readyState(QScriptContext *context, QScriptEngine *engine)
-{
-    Q_UNUSED(engine)
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(context->thisObject().data().toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    return QScriptValue(request->readyState());
-}
-
-static QScriptValue qmlxmlhttprequest_status(QScriptContext *context, QScriptEngine *engine)
-{
-    Q_UNUSED(engine)
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(context->thisObject().data().toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (request->readyState() == QmlXMLHttpRequest::Unsent ||
-        request->readyState() == QmlXMLHttpRequest::Opened)
-        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
-
-    if (request->errorFlag())
-        return QScriptValue(0);
-    else
-        return QScriptValue(request->replyStatus());
-}
-
-static QScriptValue qmlxmlhttprequest_statusText(QScriptContext *context, QScriptEngine *engine)
-{
-    Q_UNUSED(engine)
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(context->thisObject().data().toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (request->readyState() == QmlXMLHttpRequest::Unsent ||
-        request->readyState() == QmlXMLHttpRequest::Opened)
-        THROW_DOM(INVALID_STATE_ERR, "Invalid state");
-
-    if (request->errorFlag())
-        return QScriptValue(0);
-    else
-        return QScriptValue(request->replyStatusText());
-}
-
-static QScriptValue qmlxmlhttprequest_responseText(QScriptContext *context, QScriptEngine *engine)
-{
-    Q_UNUSED(engine)
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(context->thisObject().data().toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (request->readyState() != QmlXMLHttpRequest::Loading &&
-        request->readyState() != QmlXMLHttpRequest::Done)
-        return QScriptValue(QString());
-    else 
-        return QScriptValue(request->responseBody());
-}
-
-static QScriptValue qmlxmlhttprequest_responseXML(QScriptContext *context, QScriptEngine *engine)
-{
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(context->thisObject().data().toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (request->readyState() != QmlXMLHttpRequest::Loading &&
-        request->readyState() != QmlXMLHttpRequest::Done)
-        return engine->nullValue();
-    else  
-        return Document::load(engine, request->responseBody());
-}
-
-static QScriptValue qmlxmlhttprequest_onreadystatechange(QScriptContext *context, QScriptEngine *engine)
-{
-    Q_UNUSED(engine);
-    QScriptValue dataObject = context->thisObject().data();
-    QmlXMLHttpRequest *request = qobject_cast<QmlXMLHttpRequest *>(dataObject.toQObject());
-    if (!request) 
-        THROW_REFERENCE("Not an XMLHttpRequest object");
-
-    if (context->argumentCount()) {
-        QScriptValue v = context->argument(0);
-        dataObject.setProperty(QLatin1String("callback"), v);
-        return v;
-    } else {
-        return dataObject.property(QLatin1String("callback"));
-    }
-}
-
-// Constructor
-static QScriptValue qmlxmlhttprequest_new(QScriptContext *context, QScriptEngine *engine)
-{
-    if (context->isCalledAsConstructor()) {
-        context->thisObject().setData(engine->newQObject(new QmlXMLHttpRequest(QmlScriptEngine::get(engine)->networkAccessManager()), QScriptEngine::ScriptOwnership));
-    }
-    return engine->undefinedValue();
-}
-
-void qt_add_qmlxmlhttprequest(QScriptEngine *engine)
-{
-    QScriptValue prototype = engine->newObject();
-
-    // Methods
-    prototype.setProperty(QLatin1String("open"), engine->newFunction(qmlxmlhttprequest_open, 2));
-    prototype.setProperty(QLatin1String("setRequestHeader"), engine->newFunction(qmlxmlhttprequest_setRequestHeader, 2));
-    prototype.setProperty(QLatin1String("send"), engine->newFunction(qmlxmlhttprequest_send));
-    prototype.setProperty(QLatin1String("abort"), engine->newFunction(qmlxmlhttprequest_abort));
-    prototype.setProperty(QLatin1String("getResponseHeader"), engine->newFunction(qmlxmlhttprequest_getResponseHeader, 1));
-    prototype.setProperty(QLatin1String("getAllResponseHeaders"), engine->newFunction(qmlxmlhttprequest_getAllResponseHeaders));
-
-    // Read-only properties
-    prototype.setProperty(QLatin1String("readyState"), engine->newFunction(qmlxmlhttprequest_readyState), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    prototype.setProperty(QLatin1String("status"), engine->newFunction(qmlxmlhttprequest_status), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    prototype.setProperty(QLatin1String("statusText"), engine->newFunction(qmlxmlhttprequest_statusText), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    prototype.setProperty(QLatin1String("responseText"), engine->newFunction(qmlxmlhttprequest_responseText), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    prototype.setProperty(QLatin1String("responseXML"), engine->newFunction(qmlxmlhttprequest_responseXML), QScriptValue::ReadOnly | QScriptValue::PropertyGetter);
-    prototype.setProperty(QLatin1String("onreadystatechange"), engine->newFunction(qmlxmlhttprequest_onreadystatechange), QScriptValue::PropertyGetter | QScriptValue::PropertySetter);
-
-    // State values
-    prototype.setProperty(QLatin1String("UNSENT"), 0, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    prototype.setProperty(QLatin1String("OPENED"), 1, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    prototype.setProperty(QLatin1String("HEADERS_RECEIVED"), 2, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    prototype.setProperty(QLatin1String("LOADING"), 3, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    prototype.setProperty(QLatin1String("DONE"), 4, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-
-    // Constructor
-    QScriptValue constructor = engine->newFunction(qmlxmlhttprequest_new, prototype);
-    constructor.setProperty(QLatin1String("UNSENT"), 0, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    constructor.setProperty(QLatin1String("OPENED"), 1, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    constructor.setProperty(QLatin1String("HEADERS_RECEIVED"), 2, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    constructor.setProperty(QLatin1String("LOADING"), 3, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    constructor.setProperty(QLatin1String("DONE"), 4, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    engine->globalObject().setProperty(QLatin1String("XMLHttpRequest"), constructor);
-
-    // DOM Exception
-    QScriptValue domExceptionPrototype = engine->newObject();
-    domExceptionPrototype.setProperty(QLatin1String("INDEX_SIZE_ERR"), INDEX_SIZE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("DOMSTRING_SIZE_ERR"), DOMSTRING_SIZE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("HIERARCHY_REQUEST_ERR"), HIERARCHY_REQUEST_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("WRONG_DOCUMENT_ERR"), WRONG_DOCUMENT_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("INVALID_CHARACTER_ERR"), INVALID_CHARACTER_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("NO_DATA_ALLOWED_ERR"), NO_DATA_ALLOWED_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("NO_MODIFICATION_ALLOWED_ERR"), NO_MODIFICATION_ALLOWED_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("NOT_FOUND_ERR"), NOT_FOUND_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("NOT_SUPPORTED_ERR"), NOT_SUPPORTED_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("INUSE_ATTRIBUTE_ERR"), INUSE_ATTRIBUTE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("INVALID_STATE_ERR"), INVALID_STATE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("SYNTAX_ERR"), SYNTAX_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("INVALID_MODIFICATION_ERR"), INVALID_MODIFICATION_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("NAMESPACE_ERR"), NAMESPACE_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("INVALID_ACCESS_ERR"), INVALID_ACCESS_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("VALIDATION_ERR"), VALIDATION_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-    domExceptionPrototype.setProperty(QLatin1String("TYPE_MISMATCH_ERR"), TYPE_MISMATCH_ERR, QScriptValue::ReadOnly | QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
-
-    engine->globalObject().setProperty(QLatin1String("DOMException"), domExceptionPrototype);
-}
-
-QT_END_NAMESPACE
-
-#include <qmlxmlhttprequest.moc>
diff --git a/src/declarative/qml/qmlxmlhttprequest_p.h b/src/declarative/qml/qmlxmlhttprequest_p.h
deleted file mode 100644
index 59cb211..0000000
--- a/src/declarative/qml/qmlxmlhttprequest_p.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLXMLHTTPREQUEST_P_H
-#define QMLXMLHTTPREQUEST_P_H
-
-#include <QtScript/qscriptengine.h>
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QScriptEngine;
-void qt_add_qmlxmlhttprequest(QScriptEngine *engine);
-
-QT_END_NAMESPACE
-
-#endif // QMLXMLHTTPREQUEST_P_H
-
diff --git a/src/declarative/qml/rewriter/rewriter.cpp b/src/declarative/qml/rewriter/rewriter.cpp
index f848936..b458a8d 100644
--- a/src/declarative/qml/rewriter/rewriter.cpp
+++ b/src/declarative/qml/rewriter/rewriter.cpp
@@ -41,11 +41,11 @@
 
 #include "rewriter_p.h"
 
-#include <qmljsast_p.h>
+#include <qdeclarativejsast_p.h>
 
 QT_QML_BEGIN_NAMESPACE
 
-using namespace QmlJS;
+using namespace QDeclarativeJS;
 
 void Rewriter::replace(const AST::SourceLocation &loc, const QString &text)
 { replace(loc.offset, loc.length, text); }
@@ -77,8 +77,8 @@ QString Rewriter::textAt(const AST::SourceLocation &loc) const
 QString Rewriter::textAt(const AST::SourceLocation &firstLoc, const AST::SourceLocation &lastLoc) const
 { return _code.mid(firstLoc.offset, lastLoc.offset + lastLoc.length - firstLoc.offset); }
 
-void Rewriter::accept(QmlJS::AST::Node *node)
-{ QmlJS::AST::Node::acceptChild(node, this); }
+void Rewriter::accept(QDeclarativeJS::AST::Node *node)
+{ QDeclarativeJS::AST::Node::acceptChild(node, this); }
 
 void Rewriter::moveTextBefore(const AST::SourceLocation &firstLoc,
                               const AST::SourceLocation &lastLoc,
diff --git a/src/declarative/qml/rewriter/rewriter_p.h b/src/declarative/qml/rewriter/rewriter_p.h
index 36e8df7..d1445d8 100644
--- a/src/declarative/qml/rewriter/rewriter_p.h
+++ b/src/declarative/qml/rewriter/rewriter_p.h
@@ -44,7 +44,7 @@
 
 #include "textwriter_p.h"
 
-#include <qmljsastvisitor_p.h>
+#include <qdeclarativejsastvisitor_p.h>
 
 #include <QtCore/QList>
 #include <QtCore/QString>
@@ -52,7 +52,7 @@
 QT_BEGIN_HEADER
 QT_QML_BEGIN_NAMESPACE
 
-namespace QmlJS {
+namespace QDeclarativeJS {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Replacement
@@ -145,7 +145,7 @@ private:
 	QList<Replacement> _replacementList;
 };
 
-} // end of namespace QmlJS
+} // end of namespace QDeclarativeJS
 
 QT_QML_END_NAMESPACE
 QT_END_HEADER
diff --git a/src/declarative/qml/rewriter/textwriter.cpp b/src/declarative/qml/rewriter/textwriter.cpp
index cd3f26a..e63d24c 100644
--- a/src/declarative/qml/rewriter/textwriter.cpp
+++ b/src/declarative/qml/rewriter/textwriter.cpp
@@ -43,7 +43,7 @@
 
 QT_QML_BEGIN_NAMESPACE
 
-using namespace QmlJS;
+using namespace QDeclarativeJS;
 
 TextWriter::TextWriter()
         :string(0), cursor(0)
diff --git a/src/declarative/qml/rewriter/textwriter_p.h b/src/declarative/qml/rewriter/textwriter_p.h
index 43ef669..c712626 100644
--- a/src/declarative/qml/rewriter/textwriter_p.h
+++ b/src/declarative/qml/rewriter/textwriter_p.h
@@ -42,7 +42,7 @@
 #ifndef TEXTWRITER_H
 #define TEXTWRITER_H
 
-#include <qmljsglobal_p.h>
+#include <qdeclarativejsglobal_p.h>
 
 #include <QtCore/QString>
 #include <QtCore/QList>
@@ -51,7 +51,7 @@
 QT_BEGIN_HEADER
 QT_QML_BEGIN_NAMESPACE
 
-namespace QmlJS {
+namespace QDeclarativeJS {
 
 class TextWriter
 {
@@ -93,7 +93,7 @@ public:
 
 };
 
-} // end of namespace QmlJS
+} // end of namespace QDeclarativeJS
 
 QT_QML_END_NAMESPACE
 QT_END_HEADER
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
new file mode 100644
index 0000000..82e0d02
--- /dev/null
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -0,0 +1,2369 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p_p.h"
+
+#include "qdeclarativebehavior_p.h"
+#include "qdeclarativestateoperations_p.h"
+
+#include <qdeclarativepropertyvaluesource.h>
+#include <qdeclarative.h>
+#include <qdeclarativeinfo.h>
+#include <qdeclarativeexpression.h>
+#include <qdeclarativestringconverters_p.h>
+#include <qdeclarativeglobal_p.h>
+
+#include <qvariant.h>
+#include <qcolor.h>
+#include <qfile.h>
+#include <QParallelAnimationGroup>
+#include <QSequentialAnimationGroup>
+#include <QtCore/qset.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qpoint.h>
+#include <QtCore/qsize.h>
+
+#include <private/qvariantanimation_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass Animation QDeclarativeAbstractAnimation
+  \since 4.7
+    \brief The Animation element is the base of all QML animations.
+
+    The Animation element cannot be used directly in a QML file.  It exists
+    to provide a set of common properties and methods, available across all the
+    other animation types that inherit from it.  Attempting to use the Animation
+    element directly will result in an error.
+*/
+
+/*!
+    \class QDeclarativeAbstractAnimation
+    \internal
+*/
+
+QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(QObject *parent)
+: QObject(*(new QDeclarativeAbstractAnimationPrivate), parent)
+{
+}
+
+QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation()
+{
+}
+
+QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(QDeclarativeAbstractAnimationPrivate &dd, QObject *parent)
+: QObject(dd, parent)
+{
+}
+
+/*!
+    \qmlproperty bool Animation::running
+    This property holds whether the animation is currently running.
+
+    The \c running property can be set to declaratively control whether or not
+    an animation is running.  The following example will animate a rectangle
+    whenever the \l MouseArea is pressed.
+
+    \code
+    Rectangle {
+        width: 100; height: 100
+        x: NumberAnimation {
+            running: myMouse.pressed
+            from: 0; to: 100
+        }
+        MouseArea { id: myMouse }
+    }
+    \endcode
+
+    Likewise, the \c running property can be read to determine if the animation
+    is running.  In the following example the text element will indicate whether
+    or not the animation is running.
+
+    \code
+    NumberAnimation { id: myAnimation }
+    Text { text: myAnimation.running ? "Animation is running" : "Animation is not running" }
+    \endcode
+
+    Animations can also be started and stopped imperatively from JavaScript
+    using the \c start() and \c stop() methods.
+
+    By default, animations are not running. Though, when the animations are assigned to properties,
+    as property value sources, they are set to running by default.
+*/
+bool QDeclarativeAbstractAnimation::isRunning() const
+{
+    Q_D(const QDeclarativeAbstractAnimation);
+    return d->running;
+}
+
+//commence is called to start an animation when it is used as a
+//simple animation, and not as part of a transition
+void QDeclarativeAbstractAnimationPrivate::commence()
+{
+    Q_Q(QDeclarativeAbstractAnimation);
+
+    QDeclarativeStateActions actions;
+    QDeclarativeMetaProperties properties;
+    q->transition(actions, properties, QDeclarativeAbstractAnimation::Forward);
+
+    q->qtAnimation()->start();
+    if (q->qtAnimation()->state() != QAbstractAnimation::Running) {
+        running = false;
+        emit q->completed();
+    }
+}
+
+QDeclarativeMetaProperty QDeclarativeAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj)
+{
+    QDeclarativeMetaProperty prop = QDeclarativeMetaProperty::createProperty(obj, str, qmlContext(infoObj));
+    if (!prop.isValid()) {
+        qmlInfo(infoObj) << QDeclarativeAbstractAnimation::tr("Cannot animate non-existent property \"%1\"").arg(str);
+        return QDeclarativeMetaProperty();
+    } else if (!prop.isWritable()) {
+        qmlInfo(infoObj) << QDeclarativeAbstractAnimation::tr("Cannot animate read-only property \"%1\"").arg(str);
+        return QDeclarativeMetaProperty();
+    }
+    return prop;
+}
+
+void QDeclarativeAbstractAnimation::setRunning(bool r)
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    if (!d->componentComplete) {
+        d->running = r;
+        if (r == false)
+            d->avoidPropertyValueSourceStart = true;
+        return;
+    }
+
+    if (d->running == r)
+        return;
+
+    if (d->group || d->disableUserControl) {
+        qWarning("QDeclarativeAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
+        return;
+    }
+
+    d->running = r;
+    if (d->running) {
+        if (d->alwaysRunToEnd && d->repeat
+            && qtAnimation()->state() == QAbstractAnimation::Running) {
+            qtAnimation()->setLoopCount(-1);
+        }
+
+        if (!d->connectedTimeLine) {
+            QObject::connect(qtAnimation(), SIGNAL(finished()),
+                             this, SLOT(timelineComplete()));
+            d->connectedTimeLine = true;
+        }
+        d->commence();
+        emit started();
+    } else {
+        if (d->alwaysRunToEnd) {
+            if (d->repeat)
+                qtAnimation()->setLoopCount(qtAnimation()->currentLoop()+1);
+        } else
+            qtAnimation()->stop();
+
+        emit completed();
+    }
+
+    emit runningChanged(d->running);
+}
+
+/*!
+    \qmlproperty bool Animation::paused
+    This property holds whether the animation is currently paused.
+
+    The \c paused property can be set to declaratively control whether or not
+    an animation is paused.
+
+    Animations can also be paused and resumed imperatively from JavaScript
+    using the \c pause() and \c resume() methods.
+
+    By default, animations are not paused.
+*/
+bool QDeclarativeAbstractAnimation::isPaused() const
+{
+    Q_D(const QDeclarativeAbstractAnimation);
+    return d->paused;
+}
+
+void QDeclarativeAbstractAnimation::setPaused(bool p)
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    if (d->paused == p)
+        return;
+
+    if (d->group || d->disableUserControl) {
+        qWarning("QDeclarativeAbstractAnimation: setPaused() cannot be used on non-root animation nodes");
+        return;
+    }
+
+    d->paused = p;
+    if (d->paused)
+        qtAnimation()->pause();
+    else
+        qtAnimation()->resume();
+
+    emit pausedChanged(d->paused);
+}
+
+void QDeclarativeAbstractAnimation::classBegin()
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    d->componentComplete = false;
+}
+
+void QDeclarativeAbstractAnimation::componentComplete()
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    d->componentComplete = true;
+    if (d->running) {
+        d->running = false;
+        setRunning(true);
+    }
+}
+
+/*!
+    \qmlproperty bool Animation::alwaysRunToEnd
+    This property holds whether the animation should run to completion when it is stopped.
+
+    If this true the animation will complete its current iteration when it
+    is stopped - either by setting the \c running property to false, or by
+    calling the \c stop() method.  The \c complete() method is not effected
+    by this value.
+
+    This behavior is most useful when the \c repeat property is set, as the
+    animation will finish playing normally but not restart.
+
+    By default, the alwaysRunToEnd property is not set.
+*/
+bool QDeclarativeAbstractAnimation::alwaysRunToEnd() const
+{
+    Q_D(const QDeclarativeAbstractAnimation);
+    return d->alwaysRunToEnd;
+}
+
+void QDeclarativeAbstractAnimation::setAlwaysRunToEnd(bool f)
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    if (d->alwaysRunToEnd == f)
+        return;
+
+    d->alwaysRunToEnd = f;
+    emit alwaysRunToEndChanged(f);
+}
+
+/*!
+    \qmlproperty bool Animation::repeat
+    This property holds whether the animation should repeat.
+
+    If set, the animation will continuously repeat until it is explicitly
+    stopped - either by setting the \c running property to false, or by calling
+    the \c stop() method.
+
+    In the following example, the rectangle will spin indefinately.
+
+    \code
+    Rectangle {
+        rotation: NumberAnimation { running: true; repeat: true; from: 0 to: 360 }
+    }
+    \endcode
+*/
+bool QDeclarativeAbstractAnimation::repeat() const
+{
+    Q_D(const QDeclarativeAbstractAnimation);
+    return d->repeat;
+}
+
+void QDeclarativeAbstractAnimation::setRepeat(bool r)
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    if (r == d->repeat)
+        return;
+
+    d->repeat = r;
+    int lc = r ? -1 : 1;
+    qtAnimation()->setLoopCount(lc);
+    emit repeatChanged(r);
+}
+
+int QDeclarativeAbstractAnimation::currentTime()
+{
+    return qtAnimation()->currentLoopTime();
+}
+
+void QDeclarativeAbstractAnimation::setCurrentTime(int time)
+{
+    qtAnimation()->setCurrentTime(time);
+}
+
+QDeclarativeAnimationGroup *QDeclarativeAbstractAnimation::group() const
+{
+    Q_D(const QDeclarativeAbstractAnimation);
+    return d->group;
+}
+
+void QDeclarativeAbstractAnimation::setGroup(QDeclarativeAnimationGroup *g)
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    if (d->group == g)
+        return;
+    if (d->group)
+        static_cast<QDeclarativeAnimationGroupPrivate *>(d->group->d_func())->animations.removeAll(this);
+
+    d->group = g;
+
+    if (d->group && !static_cast<QDeclarativeAnimationGroupPrivate *>(d->group->d_func())->animations.contains(this))
+        static_cast<QDeclarativeAnimationGroupPrivate *>(d->group->d_func())->animations.append(this);
+
+    if (d->group)
+        ((QAnimationGroup*)d->group->qtAnimation())->addAnimation(qtAnimation());
+
+    //if (g) //if removed from a group, then the group should no longer be the parent
+        setParent(g);
+}
+
+/*!
+    \qmlmethod Animation::start()
+    \brief Starts the animation.
+
+    If the animation is already running, calling this method has no effect.  The
+    \c running property will be true following a call to \c start().
+*/
+void QDeclarativeAbstractAnimation::start()
+{
+    setRunning(true);
+}
+
+/*!
+    \qmlmethod Animation::pause()
+    \brief Pauses the animation.
+
+    If the animation is already paused, calling this method has no effect.  The
+    \c paused property will be true following a call to \c pause().
+*/
+void QDeclarativeAbstractAnimation::pause()
+{
+    setPaused(true);
+}
+
+/*!
+    \qmlmethod Animation::resume()
+    \brief Resumes a paused animation.
+
+    If the animation is not paused, calling this method has no effect.  The
+    \c paused property will be false following a call to \c resume().
+*/
+void QDeclarativeAbstractAnimation::resume()
+{
+    setPaused(false);
+}
+
+/*!
+    \qmlmethod Animation::stop()
+    \brief Stops the animation.
+
+    If the animation is not running, calling this method has no effect.  The
+    \c running property will be false following a call to \c stop().
+
+    Normally \c stop() stops the animation immediately, and the animation has
+    no further influence on property values.  In this example animation
+    \code
+    Rectangle {
+        x: NumberAnimation { from: 0; to: 100; duration: 500 }
+    }
+    \endcode
+    was stopped at time 250ms, the \c x property will have a value of 50.
+
+    However, if the \c alwaysRunToEnd property is set, the animation will
+    continue running until it completes and then stop.  The \c running property
+    will still become false immediately.
+*/
+void QDeclarativeAbstractAnimation::stop()
+{
+    setRunning(false);
+}
+
+/*!
+    \qmlmethod Animation::restart()
+    \brief Restarts the animation.
+
+    This is a convenience method, and is equivalent to calling \c stop() and
+    then \c start().
+*/
+void QDeclarativeAbstractAnimation::restart()
+{
+    stop();
+    start();
+}
+
+/*!
+    \qmlmethod Animation::complete()
+    \brief Stops the animation, jumping to the final property values.
+
+    If the animation is not running, calling this method has no effect.  The
+    \c running property will be false following a call to \c complete().
+
+    Unlike \c stop(), \c complete() immediately fast-forwards the animation to
+    its end.  In the following example,
+    \code
+    Rectangle {
+        x: NumberAnimation { from: 0; to: 100; duration: 500 }
+    }
+    \endcode
+    calling \c stop() at time 250ms will result in the \c x property having
+    a value of 50, while calling \c complete() will set the \c x property to
+    100, exactly as though the animation had played the whole way through.
+*/
+void QDeclarativeAbstractAnimation::complete()
+{
+    if (isRunning()) {
+         qtAnimation()->setCurrentTime(qtAnimation()->duration());
+    }
+}
+
+void QDeclarativeAbstractAnimation::setTarget(const QDeclarativeMetaProperty &p)
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    d->defaultProperty = p;
+
+    if (!d->avoidPropertyValueSourceStart)
+        setRunning(true);
+}
+
+/*
+    we rely on setTarget only being called when used as a value source
+    so this function allows us to do the same thing as setTarget without
+    that assumption
+*/
+void QDeclarativeAbstractAnimation::setDefaultTarget(const QDeclarativeMetaProperty &p)
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    d->defaultProperty = p;
+}
+
+/*
+    don't allow start/stop/pause/resume to be manually invoked,
+    because something else (like a Behavior) already has control
+    over the animation.
+*/
+void QDeclarativeAbstractAnimation::setDisableUserControl()
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    d->disableUserControl = true;
+}
+
+void QDeclarativeAbstractAnimation::transition(QDeclarativeStateActions &actions,
+                                      QDeclarativeMetaProperties &modified,
+                                      TransitionDirection direction)
+{
+    Q_UNUSED(actions);
+    Q_UNUSED(modified);
+    Q_UNUSED(direction);
+}
+
+void QDeclarativeAbstractAnimation::timelineComplete()
+{
+    Q_D(QDeclarativeAbstractAnimation);
+    setRunning(false);
+    if (d->alwaysRunToEnd && d->repeat) {
+        qtAnimation()->setLoopCount(-1);
+    }
+}
+
+/*!
+    \qmlclass PauseAnimation QDeclarativePauseAnimation
+  \since 4.7
+    \inherits Animation
+    \brief The PauseAnimation element provides a pause for an animation.
+
+    When used in a SequentialAnimation, PauseAnimation is a step when
+    nothing happens, for a specified duration.
+
+    A 500ms animation sequence, with a 100ms pause between two animations:
+    \code
+    SequentialAnimation {
+        NumberAnimation { ... duration: 200 }
+        PauseAnimation { duration: 100 }
+        NumberAnimation { ... duration: 200 }
+    }
+    \endcode
+*/
+/*!
+    \internal
+    \class QDeclarativePauseAnimation
+*/
+
+
+QDeclarativePauseAnimation::QDeclarativePauseAnimation(QObject *parent)
+: QDeclarativeAbstractAnimation(*(new QDeclarativePauseAnimationPrivate), parent)
+{
+    Q_D(QDeclarativePauseAnimation);
+    d->init();
+}
+
+QDeclarativePauseAnimation::~QDeclarativePauseAnimation()
+{
+}
+
+void QDeclarativePauseAnimationPrivate::init()
+{
+    Q_Q(QDeclarativePauseAnimation);
+    pa = new QPauseAnimation;
+    QDeclarativeGraphics_setParent_noEvent(pa, q);
+}
+
+/*!
+    \qmlproperty int PauseAnimation::duration
+    This property holds the duration of the pause in milliseconds
+
+    The default value is 250.
+*/
+int QDeclarativePauseAnimation::duration() const
+{
+    Q_D(const QDeclarativePauseAnimation);
+    return d->pa->duration();
+}
+
+void QDeclarativePauseAnimation::setDuration(int duration)
+{
+    if (duration < 0) {
+        qmlInfo(this) << tr("Cannot set a duration of < 0");
+        return;
+    }
+
+    Q_D(QDeclarativePauseAnimation);
+    if (d->pa->duration() == duration)
+        return;
+    d->pa->setDuration(duration);
+    emit durationChanged(duration);
+}
+
+QAbstractAnimation *QDeclarativePauseAnimation::qtAnimation()
+{
+    Q_D(QDeclarativePauseAnimation);
+    return d->pa;
+}
+
+/*!
+    \qmlclass ColorAnimation QDeclarativeColorAnimation
+  \since 4.7
+    \inherits PropertyAnimation
+    \brief The ColorAnimation element allows you to animate color changes.
+
+    \code
+    ColorAnimation { from: "white"; to: "#c0c0c0"; duration: 100 }
+    \endcode
+
+    When used in a transition, ColorAnimation will by default animate
+    all properties of type color that are changing. If a property or properties
+    are explicitly set for the animation, then those will be used instead.
+*/
+/*!
+    \internal
+    \class QDeclarativeColorAnimation
+*/
+
+QDeclarativeColorAnimation::QDeclarativeColorAnimation(QObject *parent)
+: QDeclarativePropertyAnimation(parent)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    d->interpolatorType = QMetaType::QColor;
+    d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
+    d->defaultToInterpolatorType = true;
+}
+
+QDeclarativeColorAnimation::~QDeclarativeColorAnimation()
+{
+}
+
+/*!
+    \qmlproperty color ColorAnimation::from
+    This property holds the starting color.
+*/
+QColor QDeclarativeColorAnimation::from() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->from.value<QColor>();
+}
+
+void QDeclarativeColorAnimation::setFrom(const QColor &f)
+{
+    QDeclarativePropertyAnimation::setFrom(f);
+}
+
+/*!
+    \qmlproperty color ColorAnimation::to
+    This property holds the ending color.
+*/
+QColor QDeclarativeColorAnimation::to() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->to.value<QColor>();
+}
+
+void QDeclarativeColorAnimation::setTo(const QColor &t)
+{
+    QDeclarativePropertyAnimation::setTo(t);
+}
+
+
+
+/*!
+    \qmlclass ScriptAction QDeclarativeScriptAction
+  \since 4.7
+    \inherits Animation
+    \brief The ScriptAction element allows scripts to be run during an animation.
+
+*/
+/*!
+    \internal
+    \class QDeclarativeScriptAction
+*/
+QDeclarativeScriptAction::QDeclarativeScriptAction(QObject *parent)
+    :QDeclarativeAbstractAnimation(*(new QDeclarativeScriptActionPrivate), parent)
+{
+    Q_D(QDeclarativeScriptAction);
+    d->init();
+}
+
+QDeclarativeScriptAction::~QDeclarativeScriptAction()
+{
+}
+
+void QDeclarativeScriptActionPrivate::init()
+{
+    Q_Q(QDeclarativeScriptAction);
+    rsa = new QActionAnimation(&proxy);
+    QDeclarativeGraphics_setParent_noEvent(rsa, q);
+}
+
+/*!
+    \qmlproperty script ScriptAction::script
+    This property holds the script to run.
+*/
+QDeclarativeScriptString QDeclarativeScriptAction::script() const
+{
+    Q_D(const QDeclarativeScriptAction);
+    return d->script;
+}
+
+void QDeclarativeScriptAction::setScript(const QDeclarativeScriptString &script)
+{
+    Q_D(QDeclarativeScriptAction);
+    d->script = script;
+}
+
+/*!
+    \qmlproperty QString ScriptAction::stateChangeScriptName
+    This property holds the the name of the StateChangeScript to run.
+
+    This property is only valid when ScriptAction is used as part of a transition.
+    If both script and stateChangeScriptName are set, stateChangeScriptName will be used.
+*/
+QString QDeclarativeScriptAction::stateChangeScriptName() const
+{
+    Q_D(const QDeclarativeScriptAction);
+    return d->name;
+}
+
+void QDeclarativeScriptAction::setStateChangeScriptName(const QString &name)
+{
+    Q_D(QDeclarativeScriptAction);
+    d->name = name;
+}
+
+void QDeclarativeScriptActionPrivate::execute()
+{
+    QDeclarativeScriptString scriptStr = hasRunScriptScript ? runScriptScript : script;
+
+    const QString &str = scriptStr.script();
+    if (!str.isEmpty()) {
+        QDeclarativeExpression expr(scriptStr.context(), str, scriptStr.scopeObject());
+        expr.value();
+    }
+}
+
+void QDeclarativeScriptAction::transition(QDeclarativeStateActions &actions,
+                                    QDeclarativeMetaProperties &modified,
+                                    TransitionDirection direction)
+{
+    Q_D(QDeclarativeScriptAction);
+    Q_UNUSED(modified);
+    Q_UNUSED(direction);
+
+    d->hasRunScriptScript = false;
+    for (int ii = 0; ii < actions.count(); ++ii) {
+        QDeclarativeAction &action = actions[ii];
+
+        if (action.event && action.event->typeName() == QLatin1String("StateChangeScript")
+            && static_cast<QDeclarativeStateChangeScript*>(action.event)->name() == d->name) {
+            //### how should we handle reverse direction?
+            d->runScriptScript = static_cast<QDeclarativeStateChangeScript*>(action.event)->script();
+            d->hasRunScriptScript = true;
+            action.actionDone = true;
+            break;  //assumes names are unique
+        }
+    }
+}
+
+QAbstractAnimation *QDeclarativeScriptAction::qtAnimation()
+{
+    Q_D(QDeclarativeScriptAction);
+    return d->rsa;
+}
+
+
+
+/*!
+    \qmlclass PropertyAction QDeclarativePropertyAction
+  \since 4.7
+    \inherits Animation
+    \brief The PropertyAction element allows immediate property changes during animation.
+
+    Explicitly set \c theimage.smooth=true during a transition:
+    \code
+    PropertyAction { target: theimage; property: "smooth"; value: true }
+    \endcode
+
+    Set \c thewebview.url to the value set for the destination state:
+    \code
+    PropertyAction { target: thewebview; property: "url" }
+    \endcode
+
+    The PropertyAction is immediate -
+    the target property is not animated to the selected value in any way.
+*/
+/*!
+    \internal
+    \class QDeclarativePropertyAction
+*/
+QDeclarativePropertyAction::QDeclarativePropertyAction(QObject *parent)
+: QDeclarativeAbstractAnimation(*(new QDeclarativePropertyActionPrivate), parent)
+{
+    Q_D(QDeclarativePropertyAction);
+    d->init();
+}
+
+QDeclarativePropertyAction::~QDeclarativePropertyAction()
+{
+}
+
+void QDeclarativePropertyActionPrivate::init()
+{
+    Q_Q(QDeclarativePropertyAction);
+    spa = new QActionAnimation;
+    QDeclarativeGraphics_setParent_noEvent(spa, q);
+}
+
+/*!
+    \qmlproperty Object PropertyAction::target
+    This property holds an explicit target object to animate.
+
+    The exact effect of the \c target property depends on how the animation
+    is being used.  Refer to the \l animation documentation for details.
+*/
+
+QObject *QDeclarativePropertyAction::target() const
+{
+    Q_D(const QDeclarativePropertyAction);
+    return d->target;
+}
+
+void QDeclarativePropertyAction::setTarget(QObject *o)
+{
+    Q_D(QDeclarativePropertyAction);
+    if (d->target == o)
+        return;
+    d->target = o;
+    emit targetChanged(d->target, d->propertyName);
+}
+
+QString QDeclarativePropertyAction::property() const
+{
+    Q_D(const QDeclarativePropertyAction);
+    return d->propertyName;
+}
+
+void QDeclarativePropertyAction::setProperty(const QString &n)
+{
+    Q_D(QDeclarativePropertyAction);
+    if (d->propertyName == n)
+        return;
+    d->propertyName = n;
+    emit targetChanged(d->target, d->propertyName);
+}
+
+/*!
+    \qmlproperty string PropertyAction::property
+    \qmlproperty string PropertyAction::properties
+    \qmlproperty Object PropertyAction::target
+    \qmlproperty list<Object> PropertyAction::targets
+
+    These properties are used as a set to determine which properties should be
+    affected by this action.
+
+    The details of how these properties are interpreted in different situations
+    is covered in the \l{PropertyAnimation::properties}{corresponding} PropertyAnimation
+    documentation.
+
+    \sa exclude
+*/
+QString QDeclarativePropertyAction::properties() const
+{
+    Q_D(const QDeclarativePropertyAction);
+    return d->properties;
+}
+
+void QDeclarativePropertyAction::setProperties(const QString &p)
+{
+    Q_D(QDeclarativePropertyAction);
+    if (d->properties == p)
+        return;
+    d->properties = p;
+    emit propertiesChanged(p);
+}
+
+QDeclarativeListProperty<QObject> QDeclarativePropertyAction::targets()
+{
+    Q_D(QDeclarativePropertyAction);
+    return QDeclarativeListProperty<QObject>(this, d->targets);
+}
+
+/*!
+    \qmlproperty list<Object> PropertyAction::exclude
+    This property holds the objects not to be affected by this animation.
+    \sa targets
+*/
+QDeclarativeListProperty<QObject> QDeclarativePropertyAction::exclude()
+{
+    Q_D(QDeclarativePropertyAction);
+    return QDeclarativeListProperty<QObject>(this, d->exclude);
+}
+
+/*!
+    \qmlproperty any PropertyAction::value
+    This property holds the value to be set on the property.
+    If not set, then the value defined for the end state of the transition.
+*/
+QVariant QDeclarativePropertyAction::value() const
+{
+    Q_D(const QDeclarativePropertyAction);
+    return d->value;
+}
+
+void QDeclarativePropertyAction::setValue(const QVariant &v)
+{
+    Q_D(QDeclarativePropertyAction);
+    if (d->value.isNull || d->value != v) {
+        d->value = v;
+        emit valueChanged(v);
+    }
+}
+
+QAbstractAnimation *QDeclarativePropertyAction::qtAnimation()
+{
+    Q_D(QDeclarativePropertyAction);
+    return d->spa;
+}
+
+void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions,
+                                      QDeclarativeMetaProperties &modified,
+                                      TransitionDirection direction)
+{
+    Q_D(QDeclarativePropertyAction);
+    Q_UNUSED(direction);
+
+    struct QDeclarativeSetPropertyAnimationAction : public QAbstractAnimationAction
+    {
+        QDeclarativeStateActions actions;
+        virtual void doAction()
+        {
+            for (int ii = 0; ii < actions.count(); ++ii) {
+                const QDeclarativeAction &action = actions.at(ii);
+                action.property.write(action.toValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+            }
+        }
+    };
+
+    QStringList props = d->properties.isEmpty() ? QStringList() : d->properties.split(QLatin1Char(','));
+    for (int ii = 0; ii < props.count(); ++ii)
+        props[ii] = props.at(ii).trimmed();
+    if (!d->propertyName.isEmpty())
+        props << d->propertyName;
+
+    QList<QObject*> targets = d->targets;
+    if (d->target)
+        targets.append(d->target);
+
+    bool hasSelectors = !props.isEmpty() || !targets.isEmpty() || !d->exclude.isEmpty();
+
+    if (d->defaultProperty.isValid() && !hasSelectors) {
+        props << d->defaultProperty.name();
+        targets << d->defaultProperty.object();
+    }
+
+    QDeclarativeSetPropertyAnimationAction *data = new QDeclarativeSetPropertyAnimationAction;
+
+    bool hasExplicit = false;
+    //an explicit animation has been specified
+    if (d->value.isValid()) {
+        for (int i = 0; i < props.count(); ++i) {
+            for (int j = 0; j < targets.count(); ++j) {
+                QDeclarativeAction myAction;
+                myAction.property = d->createProperty(targets.at(j), props.at(i), this);
+                if (myAction.property.isValid()) {
+                    myAction.toValue = d->value;
+                    QDeclarativePropertyAnimationPrivate::convertVariant(myAction.toValue, myAction.property.propertyType());
+                    data->actions << myAction;
+                    hasExplicit = true;
+                    for (int ii = 0; ii < actions.count(); ++ii) {
+                        QDeclarativeAction &action = actions[ii];
+                        if (action.property.object() == myAction.property.object() &&
+                            myAction.property.name() == action.property.name()) {
+                            modified << action.property;
+                            break;  //### any chance there could be multiples?
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (!hasExplicit)
+    for (int ii = 0; ii < actions.count(); ++ii) {
+        QDeclarativeAction &action = actions[ii];
+
+        QObject *obj = action.property.object();
+        QString propertyName = action.property.name();
+        QObject *sObj = action.specifiedObject;
+        QString sPropertyName = action.specifiedProperty;
+        bool same = (obj == sObj);
+
+        if ((targets.isEmpty() || targets.contains(obj) || (!same && targets.contains(sObj))) &&
+           (!d->exclude.contains(obj)) && (same || (!d->exclude.contains(sObj))) &&
+           (props.contains(propertyName) || (!same && props.contains(sPropertyName)))) {
+            QDeclarativeAction myAction = action;
+
+            if (d->value.isValid())
+                myAction.toValue = d->value;
+            QDeclarativePropertyAnimationPrivate::convertVariant(myAction.toValue, myAction.property.propertyType());
+
+            modified << action.property;
+            data->actions << myAction;
+            action.fromValue = myAction.toValue;
+        }
+    }
+
+    if (data->actions.count()) {
+        d->spa->setAnimAction(data, QAbstractAnimation::DeleteWhenStopped);
+    } else {
+        delete data;
+    }
+}
+
+
+
+/*!
+    \qmlclass ParentAction QDeclarativeParentAction
+  \since 4.7
+    \inherits Animation
+    \brief The ParentAction element allows parent changes during animation.
+
+    ParentAction provides a way to specify at what point in a Transition a ParentChange should
+    occur.
+    \qml
+    State {
+        ParentChange {
+            target: myItem
+            parent: newParent
+        }
+    }
+    Transition {
+        SequentialAnimation {
+            PropertyAnimation { ... }
+            ParentAction {}   //reparent myItem now
+            PropertyAnimation { ... }
+        }
+    }
+    \endqml
+
+    It also provides a way to explicitly reparent an item during an animation.
+    \qml
+    SequentialAnimation {
+        ParentAction { target: myItem; parent: newParent }
+        PropertyAnimation {}
+    }
+    \endqml
+
+    The ParentAction is immediate - it is not animated in any way.
+*/
+
+QDeclarativeParentAction::QDeclarativeParentAction(QObject *parent)
+: QDeclarativeAbstractAnimation(*(new QDeclarativeParentActionPrivate), parent)
+{
+    Q_D(QDeclarativeParentAction);
+    d->init();
+}
+
+QDeclarativeParentAction::~QDeclarativeParentAction()
+{
+}
+
+void QDeclarativeParentActionPrivate::init()
+{
+    Q_Q(QDeclarativeParentAction);
+    cpa = new QActionAnimation;
+    QDeclarativeGraphics_setParent_noEvent(cpa, q);
+}
+
+/*!
+    \qmlproperty Item ParentAction::target
+
+    This property holds a target item to reparent.
+
+    In the following example, \c myItem will be reparented by the ParentAction, while
+    \c myOtherItem will not.
+    \qml
+    State {
+        ParentChange {
+            target: myItem
+            parent: newParent
+        }
+        ParentChange {
+            target: myOtherItem
+            parent: otherNewParent
+        }
+    }
+    Transition {
+        SequentialAnimation {
+            PropertyAnimation { ... }
+            ParentAction { target: myItem }
+            PropertyAnimation { ... }
+        }
+    }
+    \endqml
+
+ */
+QDeclarativeItem *QDeclarativeParentAction::object() const
+{
+    Q_D(const QDeclarativeParentAction);
+    return d->pcTarget;
+}
+
+void QDeclarativeParentAction::setObject(QDeclarativeItem *target)
+{
+    Q_D(QDeclarativeParentAction);
+    d->pcTarget = target;
+}
+
+/*!
+    \qmlproperty Item ParentAction::parent
+
+    The item to reparent to (i.e. the new parent).
+ */
+QDeclarativeItem *QDeclarativeParentAction::parent() const
+{
+    Q_D(const QDeclarativeParentAction);
+    return d->pcParent;
+}
+
+void QDeclarativeParentAction::setParent(QDeclarativeItem *parent)
+{
+    Q_D(QDeclarativeParentAction);
+    d->pcParent = parent;
+}
+
+void QDeclarativeParentActionPrivate::doAction()
+{
+    QDeclarativeParentChange pc;
+    pc.setObject(pcTarget);
+    pc.setParent(pcParent);
+    pc.execute();
+}
+
+QAbstractAnimation *QDeclarativeParentAction::qtAnimation()
+{
+    Q_D(QDeclarativeParentAction);
+    return d->cpa;
+}
+
+void QDeclarativeParentAction::transition(QDeclarativeStateActions &actions,
+                                       QDeclarativeMetaProperties &modified,
+                                       TransitionDirection direction)
+{
+    Q_D(QDeclarativeParentAction);
+    Q_UNUSED(modified);
+    Q_UNUSED(direction);
+
+    struct QDeclarativeParentActionData : public QAbstractAnimationAction
+    {
+        QDeclarativeParentActionData(): pc(0) {}
+        ~QDeclarativeParentActionData() { delete pc; }
+
+        QDeclarativeStateActions actions;
+        bool reverse;
+        QDeclarativeParentChange *pc;
+        virtual void doAction()
+        {
+            for (int ii = 0; ii < actions.count(); ++ii) {
+                const QDeclarativeAction &action = actions.at(ii);
+                if (reverse)
+                    action.event->reverse();
+                else
+                    action.event->execute();
+            }
+        }
+    };
+
+    QDeclarativeParentActionData *data = new QDeclarativeParentActionData;
+
+    //### need to correctly handle modified/done
+
+    bool hasExplicit = false;
+    if (d->pcTarget && d->pcParent) {
+        data->reverse = false;
+        QDeclarativeAction myAction;
+        QDeclarativeParentChange *pc = new QDeclarativeParentChange;
+        pc->setObject(d->pcTarget);
+        pc->setParent(d->pcParent);
+        myAction.event = pc;
+        data->pc = pc;
+        data->actions << myAction;
+        hasExplicit = true;
+    }
+
+    if (!hasExplicit)
+    for (int ii = 0; ii < actions.count(); ++ii) {
+        QDeclarativeAction &action = actions[ii];
+
+        if (action.event && action.event->typeName() == QLatin1String("ParentChange")
+            && (!d->pcTarget || static_cast<QDeclarativeParentChange*>(action.event)->object() == d->pcTarget)) {
+            QDeclarativeAction myAction = action;
+            data->reverse = action.reverseEvent;
+            //### this logic differs from PropertyAnimation
+            //    (probably a result of modified vs. done)
+            if (d->pcParent) {
+                //### should we disallow this case?
+                QDeclarativeParentChange *pc = new QDeclarativeParentChange;
+                pc->setObject(d->pcTarget);
+                pc->setParent(static_cast<QDeclarativeParentChange*>(action.event)->parent());
+                myAction.event = pc;
+                data->pc = pc;
+                data->actions << myAction;
+                break;  //only match one
+            } else {
+                action.actionDone = true;
+                data->actions << myAction;
+            }
+        }
+    }
+
+    if (data->actions.count()) {
+        d->cpa->setAnimAction(data, QAbstractAnimation::DeleteWhenStopped);
+    } else {
+        delete data;
+    }
+}
+
+
+
+/*!
+    \qmlclass NumberAnimation QDeclarativeNumberAnimation
+  \since 4.7
+    \inherits PropertyAnimation
+    \brief The NumberAnimation element allows you to animate changes in properties of type qreal.
+
+    Animate a set of properties over 200ms, from their values in the start state to
+    their values in the end state of the transition:
+    \code
+    NumberAnimation { properties: "x,y,scale"; duration: 200 }
+    \endcode
+*/
+
+/*!
+    \internal
+    \class QDeclarativeNumberAnimation
+*/
+
+QDeclarativeNumberAnimation::QDeclarativeNumberAnimation(QObject *parent)
+: QDeclarativePropertyAnimation(parent)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    d->interpolatorType = QMetaType::QReal;
+    d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
+}
+
+QDeclarativeNumberAnimation::~QDeclarativeNumberAnimation()
+{
+}
+
+/*!
+    \qmlproperty real NumberAnimation::from
+    This property holds the starting value.
+    If not set, then the value defined in the start state of the transition.
+*/
+qreal QDeclarativeNumberAnimation::from() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->from.toReal();
+}
+
+void QDeclarativeNumberAnimation::setFrom(qreal f)
+{
+    QDeclarativePropertyAnimation::setFrom(f);
+}
+
+/*!
+    \qmlproperty real NumberAnimation::to
+    This property holds the ending value.
+    If not set, then the value defined in the end state of the transition or Behavior.
+*/
+qreal QDeclarativeNumberAnimation::to() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->to.toReal();
+}
+
+void QDeclarativeNumberAnimation::setTo(qreal t)
+{
+    QDeclarativePropertyAnimation::setTo(t);
+}
+
+
+
+/*!
+    \qmlclass Vector3dAnimation QDeclarativeVector3dAnimation
+  \since 4.7
+    \inherits PropertyAnimation
+    \brief The Vector3dAnimation element allows you to animate changes in properties of type QVector3d.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeVector3dAnimation
+*/
+
+QDeclarativeVector3dAnimation::QDeclarativeVector3dAnimation(QObject *parent)
+: QDeclarativePropertyAnimation(parent)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    d->interpolatorType = QMetaType::QVector3D;
+    d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
+	d->defaultToInterpolatorType = true;
+}
+
+QDeclarativeVector3dAnimation::~QDeclarativeVector3dAnimation()
+{
+}
+
+/*!
+    \qmlproperty real Vector3dAnimation::from
+    This property holds the starting value.
+    If not set, then the value defined in the start state of the transition.
+*/
+QVector3D QDeclarativeVector3dAnimation::from() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->from.value<QVector3D>();
+}
+
+void QDeclarativeVector3dAnimation::setFrom(QVector3D f)
+{
+    QDeclarativePropertyAnimation::setFrom(f);
+}
+
+/*!
+    \qmlproperty real Vector3dAnimation::to
+    This property holds the ending value.
+    If not set, then the value defined in the end state of the transition or Behavior.
+*/
+QVector3D QDeclarativeVector3dAnimation::to() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->to.value<QVector3D>();
+}
+
+void QDeclarativeVector3dAnimation::setTo(QVector3D t)
+{
+    QDeclarativePropertyAnimation::setTo(t);
+}
+
+
+
+/*!
+    \qmlclass RotationAnimation QDeclarativeRotationAnimation
+    \inherits PropertyAnimation
+    \brief The RotationAnimation element allows you to animate rotations.
+
+    RotationAnimation is a specialized PropertyAnimation that gives control
+    over the direction of rotation.
+
+    The RotationAnimation in the following example ensures that we always take
+    the shortest rotation path when switching between our states.
+    \qml
+    states: {
+        State { name: "180"; PropertyChanges { target: myItem; rotation: 180 } }
+        State { name: "-180"; PropertyChanges { target: myItem; rotation: -180 } }
+        State { name: "180"; PropertyChanges { target: myItem; rotation: 270 } }
+    }
+    transition: Transition {
+        RotationAnimation { direction: RotationAnimation.Shortest }
+    }
+    \endqml
+
+    By default, when used in a transition RotationAnimation will rotate all
+    properties named "rotation" or "angle". You can override this by providing
+    your own properties via \c properties or \c property.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeRotationAnimation
+*/
+
+QVariant _q_interpolateShortestRotation(qreal &f, qreal &t, qreal progress)
+{
+    qreal newt = t;
+    qreal diff = t-f;
+    while(diff > 180.0){
+        newt -= 360.0;
+        diff -= 360.0;
+    }
+    while(diff < -180.0){
+        newt += 360.0;
+        diff += 360.0;
+    }
+    return QVariant(f + (newt - f) * progress);
+}
+
+QVariant _q_interpolateClockwiseRotation(qreal &f, qreal &t, qreal progress)
+{
+    qreal newt = t;
+    qreal diff = t-f;
+    while(diff < 0.0){
+        newt += 360.0;
+        diff += 360.0;
+    }
+    return QVariant(f + (newt - f) * progress);
+}
+
+QVariant _q_interpolateCounterclockwiseRotation(qreal &f, qreal &t, qreal progress)
+{
+    qreal newt = t;
+    qreal diff = t-f;
+    while(diff > 0.0){
+        newt -= 360.0;
+        diff -= 360.0;
+    }
+    return QVariant(f + (newt - f) * progress);
+}
+
+QDeclarativeRotationAnimation::QDeclarativeRotationAnimation(QObject *parent)
+: QDeclarativePropertyAnimation(*(new QDeclarativeRotationAnimationPrivate), parent)
+{
+    Q_D(QDeclarativeRotationAnimation);
+    d->interpolatorType = QMetaType::QReal;
+    d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&_q_interpolateShortestRotation);
+    d->defaultProperties = QLatin1String("rotation,angle");
+}
+
+QDeclarativeRotationAnimation::~QDeclarativeRotationAnimation()
+{
+}
+
+/*!
+    \qmlproperty real RotationAnimation::from
+    This property holds the starting value.
+    If not set, then the value defined in the start state of the transition.
+*/
+qreal QDeclarativeRotationAnimation::from() const
+{
+    Q_D(const QDeclarativeRotationAnimation);
+    return d->from.toReal();
+}
+
+void QDeclarativeRotationAnimation::setFrom(qreal f)
+{
+    QDeclarativePropertyAnimation::setFrom(f);
+}
+
+/*!
+    \qmlproperty real RotationAnimation::to
+    This property holds the ending value.
+    If not set, then the value defined in the end state of the transition or Behavior.
+*/
+qreal QDeclarativeRotationAnimation::to() const
+{
+    Q_D(const QDeclarativeRotationAnimation);
+    return d->to.toReal();
+}
+
+void QDeclarativeRotationAnimation::setTo(qreal t)
+{
+    QDeclarativePropertyAnimation::setTo(t);
+}
+
+/*!
+    \qmlproperty enum RotationAnimation::direction
+    The direction in which to rotate.
+    Possible values are Numerical, Clockwise, Counterclockwise,
+    or Shortest.
+
+    \table
+    \row
+        \o Numerical
+        \o Rotate by linearly interpolating between the two numbers.
+           A rotation from 10 to 350 will rotate 340 degrees clockwise.
+    \row
+        \o Clockwise
+        \o Rotate clockwise between the two values
+    \row
+        \o Counterclockwise
+        \o Rotate counterclockwise between the two values
+    \row
+        \o Shortest
+        \o Rotate in the direction that produces the shortest animation path.
+           A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
+    \endtable
+
+    The default direction is Shortest.
+*/
+QDeclarativeRotationAnimation::RotationDirection QDeclarativeRotationAnimation::direction() const
+{
+    Q_D(const QDeclarativeRotationAnimation);
+    return d->direction;
+}
+
+void QDeclarativeRotationAnimation::setDirection(QDeclarativeRotationAnimation::RotationDirection direction)
+{
+    Q_D(QDeclarativeRotationAnimation);
+    if (d->direction == direction)
+        return;
+
+    d->direction = direction;
+    switch(d->direction) {
+    case Clockwise:
+        d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&_q_interpolateClockwiseRotation);
+        break;
+    case Counterclockwise:
+        d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&_q_interpolateCounterclockwiseRotation);
+        break;
+    case Shortest:
+        d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&_q_interpolateShortestRotation);
+        break;
+    default:
+        d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
+        break;
+    }
+
+    emit directionChanged();
+}
+
+
+
+QDeclarativeAnimationGroup::QDeclarativeAnimationGroup(QObject *parent)
+: QDeclarativeAbstractAnimation(*(new QDeclarativeAnimationGroupPrivate), parent)
+{
+}
+
+void QDeclarativeAnimationGroupPrivate::append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *a)
+{
+    QDeclarativeAnimationGroup *q = qobject_cast<QDeclarativeAnimationGroup *>(list->object);
+    if (q) {
+        q->d_func()->animations.append(a);
+        a->setGroup(q);
+    }
+}
+
+void QDeclarativeAnimationGroupPrivate::clear_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list)
+{
+    QDeclarativeAnimationGroup *q = qobject_cast<QDeclarativeAnimationGroup *>(list->object);
+    if (q) {
+        for (int i = 0; i < q->d_func()->animations.count(); ++i)
+            q->d_func()->animations.at(i)->setGroup(0);
+        q->d_func()->animations.clear();
+    }
+}
+
+QDeclarativeAnimationGroup::~QDeclarativeAnimationGroup()
+{
+}
+
+QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeAnimationGroup::animations()
+{
+    Q_D(QDeclarativeAnimationGroup);
+    QDeclarativeListProperty<QDeclarativeAbstractAnimation> list(this, d->animations);
+    list.append = &QDeclarativeAnimationGroupPrivate::append_animation;
+    list.clear = &QDeclarativeAnimationGroupPrivate::clear_animation;
+    return list;
+}
+
+/*!
+    \qmlclass SequentialAnimation QDeclarativeSequentialAnimation
+  \since 4.7
+    \inherits Animation
+    \brief The SequentialAnimation element allows you to run animations sequentially.
+
+    Animations controlled in SequentialAnimation will be run one after the other.
+
+    The following example chains two numeric animations together.  The \c MyItem
+    object will animate from its current x position to 100, and then back to 0.
+
+    \code
+    SequentialAnimation {
+        NumberAnimation { target: MyItem; property: "x"; to: 100 }
+        NumberAnimation { target: MyItem; property: "x"; to: 0 }
+    }
+    \endcode
+
+    \sa ParallelAnimation
+*/
+
+QDeclarativeSequentialAnimation::QDeclarativeSequentialAnimation(QObject *parent) :
+    QDeclarativeAnimationGroup(parent)
+{
+    Q_D(QDeclarativeAnimationGroup);
+    d->ag = new QSequentialAnimationGroup(this);
+}
+
+QDeclarativeSequentialAnimation::~QDeclarativeSequentialAnimation()
+{
+}
+
+QAbstractAnimation *QDeclarativeSequentialAnimation::qtAnimation()
+{
+    Q_D(QDeclarativeAnimationGroup);
+    return d->ag;
+}
+
+void QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actions,
+                                    QDeclarativeMetaProperties &modified,
+                                    TransitionDirection direction)
+{
+    Q_D(QDeclarativeAnimationGroup);
+
+    int inc = 1;
+    int from = 0;
+    if (direction == Backward) {
+        inc = -1;
+        from = d->animations.count() - 1;
+    }
+
+    bool valid = d->defaultProperty.isValid();
+    for (int ii = from; ii < d->animations.count() && ii >= 0; ii += inc) {
+        if (valid)
+            d->animations.at(ii)->setDefaultTarget(d->defaultProperty);
+        d->animations.at(ii)->transition(actions, modified, direction);
+    }
+}
+
+
+
+/*!
+    \qmlclass ParallelAnimation QDeclarativeParallelAnimation
+  \since 4.7
+    \inherits Animation
+    \brief The ParallelAnimation element allows you to run animations in parallel.
+
+    Animations contained in ParallelAnimation will be run at the same time.
+
+    The following animation demonstrates animating the \c MyItem item
+    to (100,100) by animating the x and y properties in parallel.
+
+    \code
+    ParallelAnimation {
+        NumberAnimation { target: MyItem; property: "x"; to: 100 }
+        NumberAnimation { target: MyItem; property: "y"; to: 100 }
+    }
+    \endcode
+
+    \sa SequentialAnimation
+*/
+/*!
+    \internal
+    \class QDeclarativeParallelAnimation
+*/
+
+QDeclarativeParallelAnimation::QDeclarativeParallelAnimation(QObject *parent) :
+    QDeclarativeAnimationGroup(parent)
+{
+    Q_D(QDeclarativeAnimationGroup);
+    d->ag = new QParallelAnimationGroup(this);
+}
+
+QDeclarativeParallelAnimation::~QDeclarativeParallelAnimation()
+{
+}
+
+QAbstractAnimation *QDeclarativeParallelAnimation::qtAnimation()
+{
+    Q_D(QDeclarativeAnimationGroup);
+    return d->ag;
+}
+
+void QDeclarativeParallelAnimation::transition(QDeclarativeStateActions &actions,
+                                      QDeclarativeMetaProperties &modified,
+                                      TransitionDirection direction)
+{
+    Q_D(QDeclarativeAnimationGroup);
+    bool valid = d->defaultProperty.isValid();
+    for (int ii = 0; ii < d->animations.count(); ++ii) {
+        if (valid)
+            d->animations.at(ii)->setDefaultTarget(d->defaultProperty);
+        d->animations.at(ii)->transition(actions, modified, direction);
+    }
+}
+
+
+
+//convert a variant from string type to another animatable type
+void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
+{
+    if (variant.userType() != QVariant::String) {
+        variant.convert((QVariant::Type)type);
+        return;
+    }
+
+    switch (type) {
+    case QVariant::Rect: {
+        variant.setValue(QDeclarativeStringConverters::rectFFromString(variant.toString()).toRect());
+        break;
+    }
+    case QVariant::RectF: {
+        variant.setValue(QDeclarativeStringConverters::rectFFromString(variant.toString()));
+        break;
+    }
+    case QVariant::Point: {
+        variant.setValue(QDeclarativeStringConverters::pointFFromString(variant.toString()).toPoint());
+        break;
+    }
+    case QVariant::PointF: {
+        variant.setValue(QDeclarativeStringConverters::pointFFromString(variant.toString()));
+        break;
+    }
+    case QVariant::Size: {
+        variant.setValue(QDeclarativeStringConverters::sizeFFromString(variant.toString()).toSize());
+        break;
+    }
+    case QVariant::SizeF: {
+        variant.setValue(QDeclarativeStringConverters::sizeFFromString(variant.toString()));
+        break;
+    }
+    case QVariant::Color: {
+        variant.setValue(QDeclarativeStringConverters::colorFromString(variant.toString()));
+        break;
+    }
+    case QVariant::Vector3D: {
+        variant.setValue(QDeclarativeStringConverters::vector3DFromString(variant.toString()));
+        break;
+    }
+    default:
+        if ((uint)type >= QVariant::UserType) {
+            QDeclarativeMetaType::StringConverter converter = QDeclarativeMetaType::customStringConverter(type);
+            if (converter)
+                variant = converter(variant.toString());
+        } else
+            variant.convert((QVariant::Type)type);
+        break;
+    }
+}
+
+/*!
+    \qmlclass PropertyAnimation QDeclarativePropertyAnimation
+  \since 4.7
+    \inherits Animation
+    \brief The PropertyAnimation element allows you to animate property changes.
+
+    PropertyAnimation provides a way to animate changes to a property's value. It can
+    be used in many different situations:
+    \list
+    \o In a Transition
+
+    Animate any objects that have changed their x or y properties in the target state using
+    an InOutQuad easing curve:
+    \qml
+    Transition { PropertyAnimation { properties: "x,y"; easing: "InOutQuad" } }
+    \endqml
+    \o In a Behavior
+
+    Animate all changes to a rectangle's x property.
+    \qml
+    Rectangle {
+        x: Behavior { PropertyAnimation {} }
+    }
+    \endqml
+    \o As a property value source
+
+    Repeatedly animate the rectangle's x property.
+    \qml
+    Rectangle {
+        x: SequentialAnimation {
+            repeat: true
+            PropertyAnimation { to: 50 }
+            PropertyAnimation { to: 0 }
+        }
+    }
+    \endqml
+    \o In a signal handler
+
+    Fade out \c theObject when clicked:
+    \qml
+    MouseArea {
+        anchors.fill: theObject
+        onClicked: PropertyAnimation { target: theObject; property: "opacity"; to: 0 }
+    }
+    \endqml
+    \o Standalone
+
+    Animate \c theObject's size property over 200ms, from its current size to 20-by-20:
+    \qml
+    PropertyAnimation { target: theObject; property: "size"; to: "20x20"; duration: 200 }
+    \endqml
+    \endlist
+
+    Depending on how the animation is used, the set of properties normally used will be
+    different. For more information see the individual property documentation, as well
+    as the \l{QML Animation} introduction.
+*/
+
+QDeclarativePropertyAnimation::QDeclarativePropertyAnimation(QObject *parent)
+: QDeclarativeAbstractAnimation(*(new QDeclarativePropertyAnimationPrivate), parent)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    d->init();
+}
+
+QDeclarativePropertyAnimation::QDeclarativePropertyAnimation(QDeclarativePropertyAnimationPrivate &dd, QObject *parent)
+: QDeclarativeAbstractAnimation(dd, parent)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    d->init();
+}
+
+QDeclarativePropertyAnimation::~QDeclarativePropertyAnimation()
+{
+}
+
+void QDeclarativePropertyAnimationPrivate::init()
+{
+    Q_Q(QDeclarativePropertyAnimation);
+    va = new QDeclarativeTimeLineValueAnimator;
+    QDeclarativeGraphics_setParent_noEvent(va, q);
+}
+
+/*!
+    \qmlproperty int PropertyAnimation::duration
+    This property holds the duration of the transition, in milliseconds.
+
+    The default value is 250.
+*/
+int QDeclarativePropertyAnimation::duration() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->va->duration();
+}
+
+void QDeclarativePropertyAnimation::setDuration(int duration)
+{
+    if (duration < 0) {
+        qmlInfo(this) << tr("Cannot set a duration of < 0");
+        return;
+    }
+
+    Q_D(QDeclarativePropertyAnimation);
+    if (d->va->duration() == duration)
+        return;
+    d->va->setDuration(duration);
+    emit durationChanged(duration);
+}
+
+/*!
+    \qmlproperty real PropertyAnimation::from
+    This property holds the starting value.
+    If not set, then the value defined in the start state of the transition.
+*/
+QVariant QDeclarativePropertyAnimation::from() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->from;
+}
+
+void QDeclarativePropertyAnimation::setFrom(const QVariant &f)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    if (d->fromIsDefined && f == d->from)
+        return;
+    d->from = f;
+    d->fromIsDefined = f.isValid();
+    emit fromChanged(f);
+}
+
+/*!
+    \qmlproperty real PropertyAnimation::to
+    This property holds the ending value.
+    If not set, then the value defined in the end state of the transition or Behavior.
+*/
+QVariant QDeclarativePropertyAnimation::to() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->to;
+}
+
+void QDeclarativePropertyAnimation::setTo(const QVariant &t)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    if (d->toIsDefined && t == d->to)
+        return;
+    d->to = t;
+    d->toIsDefined = t.isValid();
+    emit toChanged(t);
+}
+
+/*!
+    \qmlproperty QEasingCurve PropertyAnimation::easing
+    \brief the easing curve used for the transition.
+
+    Available values are:
+
+    \table
+    \row
+        \o \c Linear
+        \o Easing curve for a linear (t) function: velocity is constant.
+        \o \inlineimage qeasingcurve-linear.png
+    \row
+        \o \c InQuad
+        \o Easing curve for a quadratic (t^2) function: accelerating from zero velocity.
+        \o \inlineimage qeasingcurve-inquad.png
+    \row
+        \o \c OutQuad
+        \o Easing curve for a quadratic (t^2) function: decelerating to zero velocity.
+        \o \inlineimage qeasingcurve-outquad.png
+    \row
+        \o \c InOutQuad
+        \o Easing curve for a quadratic (t^2) function: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutquad.png
+    \row
+        \o \c OutInQuad
+        \o Easing curve for a quadratic (t^2) function: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outinquad.png
+    \row
+        \o \c InCubic
+        \o Easing curve for a cubic (t^3) function: accelerating from zero velocity.
+        \o \inlineimage qeasingcurve-incubic.png
+    \row
+        \o \c OutCubic
+        \o Easing curve for a cubic (t^3) function: decelerating from zero velocity.
+        \o \inlineimage qeasingcurve-outcubic.png
+    \row
+        \o \c InOutCubic
+        \o Easing curve for a cubic (t^3) function: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutcubic.png
+    \row
+        \o \c OutInCubic
+        \o Easing curve for a cubic (t^3) function: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outincubic.png
+    \row
+        \o \c InQuart
+        \o Easing curve for a quartic (t^4) function: accelerating from zero velocity.
+        \o \inlineimage qeasingcurve-inquart.png
+    \row
+        \o \c OutQuart
+        \o Easing curve for a cubic (t^4) function: decelerating from zero velocity.
+        \o \inlineimage qeasingcurve-outquart.png
+    \row
+        \o \c InOutQuart
+        \o Easing curve for a cubic (t^4) function: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutquart.png
+    \row
+        \o \c OutInQuart
+        \o Easing curve for a cubic (t^4) function: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outinquart.png
+    \row
+        \o \c InQuint
+        \o Easing curve for a quintic (t^5) function: accelerating from zero velocity.
+        \o \inlineimage qeasingcurve-inquint.png
+    \row
+        \o \c OutQuint
+        \o Easing curve for a cubic (t^5) function: decelerating from zero velocity.
+        \o \inlineimage qeasingcurve-outquint.png
+    \row
+        \o \c InOutQuint
+        \o Easing curve for a cubic (t^5) function: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutquint.png
+    \row
+        \o \c OutInQuint
+        \o Easing curve for a cubic (t^5) function: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outinquint.png
+    \row
+        \o \c InSine
+        \o Easing curve for a sinusoidal (sin(t)) function: accelerating from zero velocity.
+        \o \inlineimage qeasingcurve-insine.png
+    \row
+        \o \c OutSine
+        \o Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity.
+        \o \inlineimage qeasingcurve-outsine.png
+    \row
+        \o \c InOutSine
+        \o Easing curve for a sinusoidal (sin(t)) function: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutsine.png
+    \row
+        \o \c OutInSine
+        \o Easing curve for a sinusoidal (sin(t)) function: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outinsine.png
+    \row
+        \o \c InExpo
+        \o Easing curve for an exponential (2^t) function: accelerating from zero velocity.
+        \o \inlineimage qeasingcurve-inexpo.png
+    \row
+        \o \c OutExpo
+        \o Easing curve for an exponential (2^t) function: decelerating from zero velocity.
+        \o \inlineimage qeasingcurve-outexpo.png
+    \row
+        \o \c InOutExpo
+        \o Easing curve for an exponential (2^t) function: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutexpo.png
+    \row
+        \o \c OutInExpo
+        \o Easing curve for an exponential (2^t) function: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outinexpo.png
+    \row
+        \o \c InCirc
+        \o Easing curve for a circular (sqrt(1-t^2)) function: accelerating from zero velocity.
+        \o \inlineimage qeasingcurve-incirc.png
+    \row
+        \o \c OutCirc
+        \o Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity.
+        \o \inlineimage qeasingcurve-outcirc.png
+    \row
+        \o \c InOutCirc
+        \o Easing curve for a circular (sqrt(1-t^2)) function: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutcirc.png
+    \row
+        \o \c OutInCirc
+        \o Easing curve for a circular (sqrt(1-t^2)) function: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outincirc.png
+    \row
+        \o \c InElastic
+        \o Easing curve for an elastic (exponentially decaying sine wave) function: accelerating from zero velocity.
+        \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
+        \o \inlineimage qeasingcurve-inelastic.png
+    \row
+        \o \c OutElastic
+        \o Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity.
+        \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
+        \o \inlineimage qeasingcurve-outelastic.png
+    \row
+        \o \c InOutElastic
+        \o Easing curve for an elastic (exponentially decaying sine wave) function: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutelastic.png
+    \row
+        \o \c OutInElastic
+        \o Easing curve for an elastic (exponentially decaying sine wave) function: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outinelastic.png
+    \row
+        \o \c InBack
+        \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
+        \o \inlineimage qeasingcurve-inback.png
+    \row
+        \o \c OutBack
+        \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing out: decelerating to zero velocity.
+        \o \inlineimage qeasingcurve-outback.png
+    \row
+        \o \c InOutBack
+        \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutback.png
+    \row
+        \o \c OutInBack
+        \o Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outinback.png
+    \row
+        \o \c InBounce
+        \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: accelerating from zero velocity.
+        \o \inlineimage qeasingcurve-inbounce.png
+    \row
+        \o \c OutBounce
+        \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity.
+        \o \inlineimage qeasingcurve-outbounce.png
+    \row
+        \o \c InOutBounce
+        \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration.
+        \o \inlineimage qeasingcurve-inoutbounce.png
+    \row
+        \o \c OutInBounce
+        \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
+        \o \inlineimage qeasingcurve-outinbounce.png
+    \endtable
+
+*/
+QEasingCurve QDeclarativePropertyAnimation::easing() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->easing;
+}
+
+void QDeclarativePropertyAnimation::setEasing(const QEasingCurve &e)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    if (d->easing == e)
+        return;
+
+    d->easing = e;
+    d->va->setEasingCurve(d->easing);
+    emit easingChanged(e);
+}
+
+QObject *QDeclarativePropertyAnimation::target() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->target;
+}
+
+void QDeclarativePropertyAnimation::setTarget(QObject *o)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    if (d->target == o)
+        return;
+    d->target = o;
+    emit targetChanged(d->target, d->propertyName);
+}
+
+QString QDeclarativePropertyAnimation::property() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->propertyName;
+}
+
+void QDeclarativePropertyAnimation::setProperty(const QString &n)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    if (d->propertyName == n)
+        return;
+    d->propertyName = n;
+    emit targetChanged(d->target, d->propertyName);
+}
+
+QString QDeclarativePropertyAnimation::properties() const
+{
+    Q_D(const QDeclarativePropertyAnimation);
+    return d->properties;
+}
+
+void QDeclarativePropertyAnimation::setProperties(const QString &prop)
+{
+    Q_D(QDeclarativePropertyAnimation);
+    if (d->properties == prop)
+        return;
+
+    d->properties = prop;
+    emit propertiesChanged(prop);
+}
+
+/*!
+    \qmlproperty string PropertyAnimation::property
+    \qmlproperty string PropertyAnimation::properties
+    \qmlproperty Object PropertyAnimation::target
+    \qmlproperty list<Object> PropertyAnimation::targets
+
+    These properties are used as a set to determine which properties should be animated.
+    The singular and plural forms are functionally identical, e.g.
+    \qml
+    NumberAnimation { target: theItem; property: "x"; to: 500 }
+    \endqml
+    has the same meaning as
+    \qml
+    NumberAnimation { targets: theItem; properties: "x"; to: 500 }
+    \endqml
+    The singular forms are slightly optimized, so if you do have only a single target/property
+    to animate you should try to use them.
+
+    In many cases these properties do not need to be explicitly specified -- they can be
+    inferred from the animation framework.
+    \table 80%
+    \row
+    \o Value Source / Behavior
+    \o When an animation is used as a value source or in a Behavior, the default target and property
+       name to be animated can both be inferred.
+       \qml
+       Rectangle {
+           id: theRect
+           width: 100; height: 100
+           color: Qt.rgba(0,0,1)
+           x: NumberAnimation { to: 500; repeat: true } //animate theRect's x property
+           y: Behavior { NumberAnimation {} } //animate theRect's y property
+       }
+       \endqml
+    \row
+    \o Transition
+    \o When used in a transition, a property animation is assumed to match \e all targets
+       but \e no properties. In practice, that means you need to specify at least the properties
+       in order for the animation to do anything.
+       \qml
+       Rectangle {
+           id: theRect
+           width: 100; height: 100
+           color: Qt.rgba(0,0,1)
+           Item { id: uselessItem }
+           states: State {
+               name: "state1"
+               PropertyChanges { target: theRect; x: 200; y: 200; z: 4 }
+               PropertyChanges { target: uselessItem; x: 10; y: 10; z: 2 }
+           }
+           transitions: Transition {
+               //animate both theRect's and uselessItem's x and y to their final values
+               NumberAnimation { properties: "x,y" }
+
+               //animate theRect's z to its final value
+               NumberAnimation { target: theRect; property: "z" }
+           }
+       }
+       \endqml
+    \row
+    \o Standalone
+    \o When an animation is used standalone, both the target and property need to be
+       explicitly specified.
+       \qml
+       Rectangle {
+           id: theRect
+           width: 100; height: 100
+           color: Qt.rgba(0,0,1)
+           //need to explicitly specify target and property
+           NumberAnimation { id: theAnim; target: theRect; property: "x" to: 500 }
+           MouseArea {
+               anchors.fill: parent
+               onClicked: theAnim.start()
+           }
+       }
+       \endqml
+    \endtable
+
+    As seen in the above example, properties is specified as a comma-separated string of property names to animate.
+
+    \sa exclude
+*/
+QDeclarativeListProperty<QObject> QDeclarativePropertyAnimation::targets()
+{
+    Q_D(QDeclarativePropertyAnimation);
+    return QDeclarativeListProperty<QObject>(this, d->targets);
+}
+
+/*!
+    \qmlproperty list<Object> PropertyAnimation::exclude
+    This property holds the items not to be affected by this animation.
+    \sa targets
+*/
+QDeclarativeListProperty<QObject> QDeclarativePropertyAnimation::exclude()
+{
+    Q_D(QDeclarativePropertyAnimation);
+    return QDeclarativeListProperty<QObject>(this, d->exclude);
+}
+
+QAbstractAnimation *QDeclarativePropertyAnimation::qtAnimation()
+{
+    Q_D(QDeclarativePropertyAnimation);
+    return d->va;
+}
+
+struct PropertyUpdater : public QDeclarativeTimeLineValue
+{
+    QDeclarativeStateActions actions;
+    int interpolatorType;       //for Number/ColorAnimation
+    int prevInterpolatorType;   //for generic
+    QVariantAnimation::Interpolator interpolator;
+    bool reverse;
+    bool fromSourced;
+    bool fromDefined;
+    bool *wasDeleted;
+    PropertyUpdater() : wasDeleted(0) {}
+    ~PropertyUpdater() { if (wasDeleted) *wasDeleted = true; }
+    void setValue(qreal v)
+    {
+        bool deleted = false;
+        wasDeleted = &deleted;
+        if (reverse)    //QVariantAnimation sends us 1->0 when reversed, but we are expecting 0->1
+            v = 1 - v;
+        QDeclarativeTimeLineValue::setValue(v);
+        for (int ii = 0; ii < actions.count(); ++ii) {
+            QDeclarativeAction &action = actions[ii];
+
+            if (v == 1.)
+                action.property.write(action.toValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+            else {
+                if (!fromSourced && !fromDefined) {
+                    action.fromValue = action.property.read();
+                    if (interpolatorType)
+                        QDeclarativePropertyAnimationPrivate::convertVariant(action.fromValue, interpolatorType);
+                }
+                if (!interpolatorType) {
+                    int propType = action.property.propertyType();
+                    if (!prevInterpolatorType || prevInterpolatorType != propType) {
+                        prevInterpolatorType = propType;
+                        interpolator = QVariantAnimationPrivate::getInterpolator(prevInterpolatorType);
+                    }
+                }
+                if (interpolator)
+                    action.property.write(interpolator(action.fromValue.constData(), action.toValue.constData(), v), QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+            }
+            if (deleted)
+                return;
+        }
+        wasDeleted = 0;
+        fromSourced = true;
+    }
+};
+
+void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions,
+                                     QDeclarativeMetaProperties &modified,
+                                     TransitionDirection direction)
+{
+    Q_D(QDeclarativePropertyAnimation);
+
+    QStringList props = d->properties.isEmpty() ? QStringList() : d->properties.split(QLatin1Char(','));
+    for (int ii = 0; ii < props.count(); ++ii)
+        props[ii] = props.at(ii).trimmed();
+    if (!d->propertyName.isEmpty())
+        props << d->propertyName;
+
+    QList<QObject*> targets = d->targets;
+    if (d->target)
+        targets.append(d->target);
+
+    bool hasSelectors = !props.isEmpty() || !targets.isEmpty() || !d->exclude.isEmpty();
+    bool useType = (props.isEmpty() && d->defaultToInterpolatorType) ? true : false;
+
+    if (d->defaultProperty.isValid() && !hasSelectors) {
+        props << d->defaultProperty.name();
+        targets << d->defaultProperty.object();
+    }
+
+    if (props.isEmpty() && !d->defaultProperties.isEmpty()) {
+        props << d->defaultProperties.split(QLatin1Char(','));
+    }
+
+    PropertyUpdater *data = new PropertyUpdater;
+    data->interpolatorType = d->interpolatorType;
+    data->interpolator = d->interpolator;
+    data->reverse = direction == Backward ? true : false;
+    data->fromSourced = false;
+    data->fromDefined = d->fromIsDefined;
+
+    bool hasExplicit = false;
+    //an explicit animation has been specified
+    if (d->toIsDefined) {
+        for (int i = 0; i < props.count(); ++i) {
+            for (int j = 0; j < targets.count(); ++j) {
+                QDeclarativeAction myAction;
+                myAction.property = d->createProperty(targets.at(j), props.at(i), this);
+                if (myAction.property.isValid()) {
+                    if (d->fromIsDefined) {
+                        myAction.fromValue = d->from;
+                        d->convertVariant(myAction.fromValue, d->interpolatorType ? d->interpolatorType : myAction.property.propertyType());
+                    }
+                    myAction.toValue = d->to;
+                    d->convertVariant(myAction.toValue, d->interpolatorType ? d->interpolatorType : myAction.property.propertyType());
+                    data->actions << myAction;
+                    hasExplicit = true;
+                    for (int ii = 0; ii < actions.count(); ++ii) {
+                        QDeclarativeAction &action = actions[ii];
+                        if (action.property.object() == myAction.property.object() &&
+                            myAction.property.name() == action.property.name()) {
+                            modified << action.property;
+                            break;  //### any chance there could be multiples?
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (!hasExplicit)
+    for (int ii = 0; ii < actions.count(); ++ii) {
+        QDeclarativeAction &action = actions[ii];
+
+        QObject *obj = action.property.object();
+        QString propertyName = action.property.name();
+        QObject *sObj = action.specifiedObject;
+        QString sPropertyName = action.specifiedProperty;
+        bool same = (obj == sObj);
+
+        if ((targets.isEmpty() || targets.contains(obj) || (!same && targets.contains(sObj))) &&
+           (!d->exclude.contains(obj)) && (same || (!d->exclude.contains(sObj))) &&
+           (props.contains(propertyName) || (!same && props.contains(sPropertyName))
+               || (useType && action.property.propertyType() == d->interpolatorType))) {
+            QDeclarativeAction myAction = action;
+
+            if (d->fromIsDefined)
+                myAction.fromValue = d->from;
+            else
+                myAction.fromValue = QVariant();
+            if (d->toIsDefined)
+                myAction.toValue = d->to;
+
+            d->convertVariant(myAction.fromValue, d->interpolatorType ? d->interpolatorType : myAction.property.propertyType());
+            d->convertVariant(myAction.toValue, d->interpolatorType ? d->interpolatorType : myAction.property.propertyType());
+
+            modified << action.property;
+
+            data->actions << myAction;
+            action.fromValue = myAction.toValue;
+        }
+    }
+
+    if (data->actions.count()) {
+        if (!d->rangeIsSet) {
+            d->va->setStartValue(qreal(0));
+            d->va->setEndValue(qreal(1));
+            d->rangeIsSet = true;
+        }
+        d->va->setAnimValue(data, QAbstractAnimation::DeleteWhenStopped);
+        d->va->setFromSourcedValue(&data->fromSourced);
+    } else {
+        delete data;
+    }
+}
+
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
new file mode 100644
index 0000000..02dacb3
--- /dev/null
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -0,0 +1,467 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEANIMATION_H
+#define QDECLARATIVEANIMATION_H
+
+#include "qdeclarativetransition_p.h"
+#include "qdeclarativestate_p.h"
+#include <QtGui/qvector3d.h>
+
+#include <qdeclarativepropertyvaluesource.h>
+#include <qdeclarative.h>
+#include <qdeclarativescriptstring.h>
+
+#include <QtCore/qvariant.h>
+#include <QtCore/qeasingcurve.h>
+#include <QtCore/QAbstractAnimation>
+#include <QtGui/qcolor.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeAbstractAnimationPrivate;
+class QDeclarativeAnimationGroup;
+class Q_AUTOTEST_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeAbstractAnimation)
+
+    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QDeclarativePropertyValueSource)
+    Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
+    Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
+    Q_PROPERTY(bool alwaysRunToEnd READ alwaysRunToEnd WRITE setAlwaysRunToEnd NOTIFY alwaysRunToEndChanged())
+    Q_PROPERTY(bool repeat READ repeat WRITE setRepeat NOTIFY repeatChanged)
+    Q_CLASSINFO("DefaultMethod", "start()")
+
+public:
+    QDeclarativeAbstractAnimation(QObject *parent=0);
+    virtual ~QDeclarativeAbstractAnimation();
+
+    bool isRunning() const;
+    void setRunning(bool);
+    bool isPaused() const;
+    void setPaused(bool);
+    bool alwaysRunToEnd() const;
+    void setAlwaysRunToEnd(bool);
+    bool repeat() const;
+    void setRepeat(bool);
+
+    int currentTime();
+    void setCurrentTime(int);
+
+    QDeclarativeAnimationGroup *group() const;
+    void setGroup(QDeclarativeAnimationGroup *);
+
+    void setDefaultTarget(const QDeclarativeMetaProperty &);
+    void setDisableUserControl();
+
+    void classBegin();
+    void componentComplete();
+
+Q_SIGNALS:
+    void started();
+    void completed();
+    void runningChanged(bool);
+    void pausedChanged(bool);
+    void repeatChanged(bool);
+    void alwaysRunToEndChanged(bool);
+
+public Q_SLOTS:
+    void restart();
+    void start();
+    void pause();
+    void resume();
+    void stop();
+    void complete();
+
+protected:
+    QDeclarativeAbstractAnimation(QDeclarativeAbstractAnimationPrivate &dd, QObject *parent);
+
+public:
+    enum TransitionDirection { Forward, Backward };
+    virtual void transition(QDeclarativeStateActions &actions,
+                            QDeclarativeMetaProperties &modified,
+                            TransitionDirection direction);
+    virtual QAbstractAnimation *qtAnimation() = 0;
+
+private Q_SLOTS:
+    void timelineComplete();
+
+private:
+    virtual void setTarget(const QDeclarativeMetaProperty &);
+};
+
+class QDeclarativePauseAnimationPrivate;
+class Q_AUTOTEST_EXPORT QDeclarativePauseAnimation : public QDeclarativeAbstractAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativePauseAnimation)
+
+    Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
+
+public:
+    QDeclarativePauseAnimation(QObject *parent=0);
+    virtual ~QDeclarativePauseAnimation();
+
+    int duration() const;
+    void setDuration(int);
+
+Q_SIGNALS:
+    void durationChanged(int);
+
+protected:
+    virtual QAbstractAnimation *qtAnimation();
+};
+
+class QDeclarativeScriptActionPrivate;
+class QDeclarativeScriptAction : public QDeclarativeAbstractAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeScriptAction)
+
+    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript)
+    Q_PROPERTY(QString stateChangeScriptName READ stateChangeScriptName WRITE setStateChangeScriptName)
+
+public:
+    QDeclarativeScriptAction(QObject *parent=0);
+    virtual ~QDeclarativeScriptAction();
+
+    QDeclarativeScriptString script() const;
+    void setScript(const QDeclarativeScriptString &);
+
+    QString stateChangeScriptName() const;
+    void setStateChangeScriptName(const QString &);
+
+protected:
+    virtual void transition(QDeclarativeStateActions &actions,
+                            QDeclarativeMetaProperties &modified,
+                            TransitionDirection direction);
+    virtual QAbstractAnimation *qtAnimation();
+};
+
+class QDeclarativePropertyActionPrivate;
+class QDeclarativePropertyAction : public QDeclarativeAbstractAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativePropertyAction)
+
+    Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
+    Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged)
+    Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> targets READ targets)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> exclude READ exclude)
+    Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
+
+public:
+    QDeclarativePropertyAction(QObject *parent=0);
+    virtual ~QDeclarativePropertyAction();
+
+    QObject *target() const;
+    void setTarget(QObject *);
+
+    QString property() const;
+    void setProperty(const QString &);
+
+    QString properties() const;
+    void setProperties(const QString &);
+
+    QDeclarativeListProperty<QObject> targets();
+    QDeclarativeListProperty<QObject> exclude();
+
+    QVariant value() const;
+    void setValue(const QVariant &);
+
+Q_SIGNALS:
+    void valueChanged(const QVariant &);
+    void propertiesChanged(const QString &);
+    void targetChanged(QObject *, const QString &);
+
+protected:
+    virtual void transition(QDeclarativeStateActions &actions,
+                            QDeclarativeMetaProperties &modified,
+                            TransitionDirection direction);
+    virtual QAbstractAnimation *qtAnimation();
+};
+
+class QDeclarativeItem;
+class QDeclarativeParentActionPrivate;
+class QDeclarativeParentAction : public QDeclarativeAbstractAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeParentAction)
+
+    Q_PROPERTY(QDeclarativeItem *target READ object WRITE setObject)
+    Q_PROPERTY(QDeclarativeItem *parent READ parent WRITE setParent) //### newParent
+
+public:
+    QDeclarativeParentAction(QObject *parent=0);
+    virtual ~QDeclarativeParentAction();
+
+    QDeclarativeItem *object() const;
+    void setObject(QDeclarativeItem *);
+
+    QDeclarativeItem *parent() const;
+    void setParent(QDeclarativeItem *);
+
+protected:
+    virtual void transition(QDeclarativeStateActions &actions,
+                            QDeclarativeMetaProperties &modified,
+                            TransitionDirection direction);
+    virtual QAbstractAnimation *qtAnimation();
+};
+
+class QDeclarativePropertyAnimationPrivate;
+class Q_AUTOTEST_EXPORT QDeclarativePropertyAnimation : public QDeclarativeAbstractAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
+
+    Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
+    Q_PROPERTY(QVariant from READ from WRITE setFrom NOTIFY fromChanged)
+    Q_PROPERTY(QVariant to READ to WRITE setTo NOTIFY toChanged)
+    Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged)
+    Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
+    Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged)
+    Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> targets READ targets)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> exclude READ exclude)
+
+public:
+    QDeclarativePropertyAnimation(QObject *parent=0);
+    virtual ~QDeclarativePropertyAnimation();
+
+    int duration() const;
+    void setDuration(int);
+
+    QVariant from() const;
+    void setFrom(const QVariant &);
+
+    QVariant to() const;
+    void setTo(const QVariant &);
+
+    QEasingCurve easing() const;
+    void setEasing(const QEasingCurve &);
+
+    QObject *target() const;
+    void setTarget(QObject *);
+
+    QString property() const;
+    void setProperty(const QString &);
+
+    QString properties() const;
+    void setProperties(const QString &);
+
+    QDeclarativeListProperty<QObject> targets();
+    QDeclarativeListProperty<QObject> exclude();
+
+protected:
+    QDeclarativePropertyAnimation(QDeclarativePropertyAnimationPrivate &dd, QObject *parent);
+    virtual void transition(QDeclarativeStateActions &actions,
+                            QDeclarativeMetaProperties &modified,
+                            TransitionDirection direction);
+    virtual QAbstractAnimation *qtAnimation();
+
+Q_SIGNALS:
+    void durationChanged(int);
+    void fromChanged(QVariant);
+    void toChanged(QVariant);
+    void easingChanged(const QEasingCurve &);
+    void propertiesChanged(const QString &);
+    void targetChanged(QObject *, const QString &);
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeColorAnimation : public QDeclarativePropertyAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
+    Q_PROPERTY(QColor from READ from WRITE setFrom NOTIFY fromChanged)
+    Q_PROPERTY(QColor to READ to WRITE setTo NOTIFY toChanged)
+
+public:
+    QDeclarativeColorAnimation(QObject *parent=0);
+    virtual ~QDeclarativeColorAnimation();
+
+    QColor from() const;
+    void setFrom(const QColor &);
+
+    QColor to() const;
+    void setTo(const QColor &);
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeNumberAnimation : public QDeclarativePropertyAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
+
+    Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged)
+    Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged)
+
+public:
+    QDeclarativeNumberAnimation(QObject *parent=0);
+    virtual ~QDeclarativeNumberAnimation();
+
+    qreal from() const;
+    void setFrom(qreal);
+
+    qreal to() const;
+    void setTo(qreal);
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeVector3dAnimation : public QDeclarativePropertyAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
+
+    Q_PROPERTY(QVector3D from READ from WRITE setFrom NOTIFY fromChanged)
+    Q_PROPERTY(QVector3D to READ to WRITE setTo NOTIFY toChanged)
+
+public:
+    QDeclarativeVector3dAnimation(QObject *parent=0);
+    virtual ~QDeclarativeVector3dAnimation();
+
+    QVector3D from() const;
+    void setFrom(QVector3D);
+
+    QVector3D to() const;
+    void setTo(QVector3D);
+};
+
+class QDeclarativeRotationAnimationPrivate;
+class Q_AUTOTEST_EXPORT QDeclarativeRotationAnimation : public QDeclarativePropertyAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeRotationAnimation)
+    Q_ENUMS(RotationDirection)
+
+    Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged)
+    Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged)
+    Q_PROPERTY(RotationDirection direction READ direction WRITE setDirection NOTIFY directionChanged)
+
+public:
+    QDeclarativeRotationAnimation(QObject *parent=0);
+    virtual ~QDeclarativeRotationAnimation();
+
+    qreal from() const;
+    void setFrom(qreal);
+
+    qreal to() const;
+    void setTo(qreal);
+
+    enum RotationDirection { Numerical, Shortest, Clockwise, Counterclockwise };
+    RotationDirection direction() const;
+    void setDirection(RotationDirection direction);
+
+Q_SIGNALS:
+    void directionChanged();
+};
+
+class QDeclarativeAnimationGroupPrivate;
+class QDeclarativeAnimationGroup : public QDeclarativeAbstractAnimation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeAnimationGroup)
+
+    Q_CLASSINFO("DefaultProperty", "animations")
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations READ animations)
+
+public:
+    QDeclarativeAnimationGroup(QObject *parent);
+    virtual ~QDeclarativeAnimationGroup();
+
+    QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations();
+    friend class QDeclarativeAbstractAnimation;
+};
+
+class QDeclarativeSequentialAnimation : public QDeclarativeAnimationGroup
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeAnimationGroup)
+
+public:
+    QDeclarativeSequentialAnimation(QObject *parent=0);
+    virtual ~QDeclarativeSequentialAnimation();
+
+protected:
+    virtual void transition(QDeclarativeStateActions &actions,
+                            QDeclarativeMetaProperties &modified,
+                            TransitionDirection direction);
+    virtual QAbstractAnimation *qtAnimation();
+};
+
+class QDeclarativeParallelAnimation : public QDeclarativeAnimationGroup
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeAnimationGroup)
+
+public:
+    QDeclarativeParallelAnimation(QObject *parent=0);
+    virtual ~QDeclarativeParallelAnimation();
+
+protected:
+    virtual void transition(QDeclarativeStateActions &actions,
+                            QDeclarativeMetaProperties &modified,
+                            TransitionDirection direction);
+    virtual QAbstractAnimation *qtAnimation();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeAbstractAnimation)
+QML_DECLARE_TYPE(QDeclarativePauseAnimation)
+QML_DECLARE_TYPE(QDeclarativeScriptAction)
+QML_DECLARE_TYPE(QDeclarativePropertyAction)
+QML_DECLARE_TYPE(QDeclarativeParentAction)
+QML_DECLARE_TYPE(QDeclarativePropertyAnimation)
+QML_DECLARE_TYPE(QDeclarativeColorAnimation)
+QML_DECLARE_TYPE(QDeclarativeNumberAnimation)
+QML_DECLARE_TYPE(QDeclarativeSequentialAnimation)
+QML_DECLARE_TYPE(QDeclarativeParallelAnimation)
+QML_DECLARE_TYPE(QDeclarativeVector3dAnimation)
+QML_DECLARE_TYPE(QDeclarativeRotationAnimation)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEANIMATION_H
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
new file mode 100644
index 0000000..bb81fb3
--- /dev/null
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -0,0 +1,364 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEANIMATION_P_H
+#define QDECLARATIVEANIMATION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeanimation_p.h"
+
+#include "qdeclarativenullablevalue_p_p.h"
+#include "qdeclarativetimeline_p_p.h"
+
+#include <qdeclarative.h>
+#include <qdeclarativecontext.h>
+
+#include <QtCore/QPauseAnimation>
+#include <QtCore/QVariantAnimation>
+#include <QtCore/QAnimationGroup>
+#include <QtGui/QColor>
+#include <QDebug>
+
+#include <private/qobject_p.h>
+#include <private/qvariantanimation_p.h>
+
+QT_BEGIN_NAMESPACE
+
+//interface for classes that provide animation actions for QActionAnimation
+class QAbstractAnimationAction
+{
+public:
+    virtual ~QAbstractAnimationAction() {}
+    virtual void doAction() = 0;
+};
+
+//templated animation action
+//allows us to specify an action that calls a function of a class.
+//(so that class doesn't have to inherit QDeclarativeAbstractAnimationAction)
+template<class T, void (T::*method)()>
+class QAnimationActionProxy : public QAbstractAnimationAction
+{
+public:
+    QAnimationActionProxy(T *p) : m_p(p) {}
+    virtual void doAction() { (m_p->*method)(); }
+
+private:
+    T *m_p;
+};
+
+//performs an action of type QAbstractAnimationAction
+class QActionAnimation : public QAbstractAnimation
+{
+    Q_OBJECT
+public:
+    QActionAnimation(QObject *parent = 0) : QAbstractAnimation(parent), animAction(0), policy(KeepWhenStopped), running(false) {}
+    QActionAnimation(QAbstractAnimationAction *action, QObject *parent = 0)
+        : QAbstractAnimation(parent), animAction(action), policy(KeepWhenStopped), running(false) {}
+    ~QActionAnimation() { if (policy == DeleteWhenStopped) { delete animAction; animAction = 0; } }
+    virtual int duration() const { return 0; }
+    void setAnimAction(QAbstractAnimationAction *action, DeletionPolicy p)
+    {
+        if (state() == Running)
+            stop();
+        if (policy == DeleteWhenStopped)
+            delete animAction;
+        animAction = action;
+        policy = p;
+    }
+protected:
+    virtual void updateCurrentTime(int) {}
+
+    virtual void updateState(State newState, State /*oldState*/)
+    {
+        if (newState == Running) {
+            if (animAction) {
+                running = true;
+                animAction->doAction();
+                running = false;
+                if (state() == Stopped && policy == DeleteWhenStopped) {
+                    delete animAction;
+                    animAction = 0;
+                }
+            }
+        } /*else if (newState == Stopped && policy == DeleteWhenStopped) {
+            if (!running) {
+                delete animAction;
+                animAction = 0;
+            }
+        }*/
+    }
+
+private:
+    QAbstractAnimationAction *animAction;
+    DeletionPolicy policy;
+    bool running;
+};
+
+//animates QDeclarativeTimeLineValue (assumes start and end values will be reals or compatible)
+class QDeclarativeTimeLineValueAnimator : public QVariantAnimation
+{
+    Q_OBJECT
+public:
+    QDeclarativeTimeLineValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), fromSourced(0), policy(KeepWhenStopped) {}
+    ~QDeclarativeTimeLineValueAnimator() { if (policy == DeleteWhenStopped) { delete animValue; animValue = 0; } }
+    void setAnimValue(QDeclarativeTimeLineValue *value, DeletionPolicy p)
+    {
+        if (state() == Running)
+            stop();
+        if (policy == DeleteWhenStopped)
+            delete animValue;
+        animValue = value;
+        policy = p;
+    }
+    void setFromSourcedValue(bool *value)
+    {
+        fromSourced = value;
+    }
+protected:
+    virtual void updateCurrentValue(const QVariant &value)
+    {
+        if (animValue)
+            animValue->setValue(value.toReal());
+    }
+    virtual void updateState(State newState, State oldState)
+    {   
+        QVariantAnimation::updateState(newState, oldState);
+        if (newState == Running) {
+            //check for new from every loop
+            if (fromSourced)
+                *fromSourced = false;
+        } /*else if (newState == Stopped && policy == DeleteWhenStopped) {
+            delete animValue;
+            animValue = 0;
+        }*/ //### we get a stop each loop if we are in a group
+        //### top-level animation is the only reliable one for this
+    }
+
+private:
+    QDeclarativeTimeLineValue *animValue;
+    bool *fromSourced;
+    DeletionPolicy policy;
+};
+
+//an animation that just gives a tick
+template<class T, void (T::*method)(int)>
+class QTickAnimationProxy : public QAbstractAnimation
+{
+    //Q_OBJECT //doesn't work with templating
+public:
+    QTickAnimationProxy(T *p, QObject *parent = 0) : QAbstractAnimation(parent), m_p(p) {}
+    virtual int duration() const { return -1; }
+protected:
+    virtual void updateCurrentTime(int msec) { (m_p->*method)(msec); }
+
+private:
+    T *m_p;
+};
+
+class QDeclarativeAbstractAnimationPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeAbstractAnimation)
+public:
+    QDeclarativeAbstractAnimationPrivate()
+    : running(false), paused(false), alwaysRunToEnd(false), repeat(false),
+      connectedTimeLine(false), componentComplete(true),
+      avoidPropertyValueSourceStart(false), disableUserControl(false), group(0) {}
+
+    bool running:1;
+    bool paused:1;
+    bool alwaysRunToEnd:1;
+    bool repeat:1;
+    bool connectedTimeLine:1;
+    bool componentComplete:1;
+    bool avoidPropertyValueSourceStart:1;
+    bool disableUserControl:1;
+
+    void commence();
+
+    QDeclarativeMetaProperty defaultProperty;
+
+    QDeclarativeAnimationGroup *group;
+
+    static QDeclarativeMetaProperty createProperty(QObject *obj, const QString &str, QObject *infoObj);
+};
+
+class QDeclarativePauseAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePauseAnimation)
+public:
+    QDeclarativePauseAnimationPrivate()
+    : QDeclarativeAbstractAnimationPrivate(), pa(0) {}
+
+    void init();
+
+    QPauseAnimation *pa;
+};
+
+class QDeclarativeScriptActionPrivate : public QDeclarativeAbstractAnimationPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeScriptAction)
+public:
+    QDeclarativeScriptActionPrivate()
+        : QDeclarativeAbstractAnimationPrivate(), hasRunScriptScript(false), proxy(this), rsa(0) {}
+
+    void init();
+
+    QDeclarativeScriptString script;
+    QString name;
+    QDeclarativeScriptString runScriptScript;
+    bool hasRunScriptScript;
+
+    void execute();
+
+    QAnimationActionProxy<QDeclarativeScriptActionPrivate,
+                  &QDeclarativeScriptActionPrivate::execute> proxy;
+    QActionAnimation *rsa;
+};
+
+class QDeclarativePropertyActionPrivate : public QDeclarativeAbstractAnimationPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePropertyAction)
+public:
+    QDeclarativePropertyActionPrivate()
+    : QDeclarativeAbstractAnimationPrivate(), target(0), spa(0) {}
+
+    void init();
+
+    QObject *target;
+    QString propertyName;
+    QString properties;
+    QList<QObject *> targets;
+    QList<QObject *> exclude;
+
+    QDeclarativeNullableValue<QVariant> value;
+
+    QActionAnimation *spa;
+};
+
+class QDeclarativeParentActionPrivate : public QDeclarativeAbstractAnimationPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeParentAction)
+public:
+    QDeclarativeParentActionPrivate()
+    : QDeclarativeAbstractAnimationPrivate(), pcTarget(0), pcParent(0) {}
+
+    void init();
+
+    QDeclarativeItem *pcTarget;
+    QDeclarativeItem *pcParent;
+
+    void doAction();
+    QActionAnimation *cpa;
+};
+
+class QDeclarativeAnimationGroupPrivate : public QDeclarativeAbstractAnimationPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeAnimationGroup)
+public:
+    QDeclarativeAnimationGroupPrivate()
+    : QDeclarativeAbstractAnimationPrivate(), ag(0) {}
+
+    static void append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *role);
+    static void clear_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list);
+    static void removeAt_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, int i);
+    static void insert_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, int i, QDeclarativeAbstractAnimation *role);
+    QList<QDeclarativeAbstractAnimation *> animations;
+    QAnimationGroup *ag;
+};
+
+class QDeclarativePropertyAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePropertyAnimation)
+public:
+    QDeclarativePropertyAnimationPrivate()
+    : QDeclarativeAbstractAnimationPrivate(), target(0), fromSourced(false), fromIsDefined(false), toIsDefined(false),
+      rangeIsSet(false), defaultToInterpolatorType(0), interpolatorType(0), interpolator(0), va(0) {}
+
+    void init();
+
+    QVariant from;
+    QVariant to;
+
+    QEasingCurve easing;
+
+    QObject *target;
+    QString propertyName;
+    QString properties;
+    QList<QObject *> targets;
+    QList<QObject *> exclude;
+    QString defaultProperties;
+
+    bool fromSourced;
+    bool fromIsDefined:1;
+    bool toIsDefined:1;
+    bool rangeIsSet:1;
+    bool defaultToInterpolatorType:1;
+    int interpolatorType;
+    QVariantAnimation::Interpolator interpolator;
+
+    QDeclarativeTimeLineValueAnimator *va;
+
+    static QVariant interpolateVariant(const QVariant &from, const QVariant &to, qreal progress);
+    static void convertVariant(QVariant &variant, int type);
+};
+
+class QDeclarativeRotationAnimationPrivate : public QDeclarativePropertyAnimationPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeRotationAnimation)
+public:
+    QDeclarativeRotationAnimationPrivate() : direction(QDeclarativeRotationAnimation::Shortest) {}
+
+    QDeclarativeRotationAnimation::RotationDirection direction;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEANIMATION_P_H
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
new file mode 100644
index 0000000..303018d
--- /dev/null
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -0,0 +1,191 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativebehavior_p.h"
+
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativetransition_p.h"
+
+#include <qdeclarativecontext.h>
+#include <qdeclarativeinfo.h>
+
+#include <QtCore/qparallelanimationgroup.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+
+
+class QDeclarativeBehaviorPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeBehavior)
+public:
+    QDeclarativeBehaviorPrivate() : animation(0), enabled(true) {}
+
+    QDeclarativeMetaProperty property;
+    QVariant currentValue;
+    QDeclarativeAbstractAnimation *animation;
+    bool enabled;
+};
+
+/*!
+    \qmlclass Behavior QDeclarativeBehavior
+    \brief The Behavior element allows you to specify a default animation for a property change.
+
+    Behaviors provide one way to specify \l{qdeclarativeanimation.html}{animations} in QML.
+
+    In the example below, the rect will use a bounce easing curve over 200 millisecond for any changes to its y property:
+    \code
+    Rectangle {
+        width: 20; height: 20
+        color: "#00ff00"
+        y: 200  //initial value
+        y: Behavior {
+            NumberAnimation {
+                easing: "easeOutBounce(amplitude:100)"
+                duration: 200
+            }
+        }
+    }
+    \endcode
+
+    Currently only a single Behavior may be specified for a property;
+    this Behavior can be enabled and disabled via the \l{enabled} property.
+*/
+
+
+QDeclarativeBehavior::QDeclarativeBehavior(QObject *parent)
+    : QObject(*(new QDeclarativeBehaviorPrivate), parent)
+{
+}
+
+QDeclarativeBehavior::~QDeclarativeBehavior()
+{
+}
+
+/*!
+    \qmlproperty Animation Behavior::animation
+    \default
+
+    The animation to use when the behavior is triggered.
+*/
+
+QDeclarativeAbstractAnimation *QDeclarativeBehavior::animation()
+{
+    Q_D(QDeclarativeBehavior);
+    return d->animation;
+}
+
+void QDeclarativeBehavior::setAnimation(QDeclarativeAbstractAnimation *animation)
+{
+    Q_D(QDeclarativeBehavior);
+    if (d->animation) {
+        qmlInfo(this) << tr("Cannot change the animation assigned to a Behavior.");
+        return;
+    }
+
+    d->animation = animation;
+    if (d->animation) {
+        d->animation->setDefaultTarget(d->property);
+        d->animation->setDisableUserControl();
+    }
+}
+
+/*!
+    \qmlproperty bool Behavior::enabled
+    Whether the Behavior will be triggered when the property it is tracking changes.
+
+    By default a Behavior is enabled.
+*/
+
+bool QDeclarativeBehavior::enabled() const
+{
+    Q_D(const QDeclarativeBehavior);
+    return d->enabled;
+}
+
+void QDeclarativeBehavior::setEnabled(bool enabled)
+{
+    Q_D(QDeclarativeBehavior);
+    if (d->enabled == enabled)
+        return;
+    d->enabled = enabled;
+    emit enabledChanged();
+}
+
+void QDeclarativeBehavior::write(const QVariant &value)
+{
+    Q_D(QDeclarativeBehavior);
+    if (!d->animation || !d->enabled) {
+        d->property.write(value, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+        return;
+    }
+
+    d->currentValue = d->property.read();
+
+    d->animation->qtAnimation()->stop();
+
+    QDeclarativeStateOperation::ActionList actions;
+    QDeclarativeAction action;
+    action.property = d->property;
+    action.fromValue = d->currentValue;
+    action.toValue = value;
+    actions << action;
+
+    QList<QDeclarativeMetaProperty> after;
+    if (d->animation)
+        d->animation->transition(actions, after, QDeclarativeAbstractAnimation::Forward);
+    d->animation->qtAnimation()->start();
+    if (!after.contains(d->property))
+        d->property.write(value, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+}
+
+void QDeclarativeBehavior::setTarget(const QDeclarativeMetaProperty &property)
+{
+    Q_D(QDeclarativeBehavior);
+    d->property = property;
+    d->currentValue = property.read();
+    if (d->animation)
+        d->animation->setDefaultTarget(property);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h
new file mode 100644
index 0000000..fbc19f8
--- /dev/null
+++ b/src/declarative/util/qdeclarativebehavior_p.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEBEHAVIOR_H
+#define QDECLARATIVEBEHAVIOR_H
+
+#include "qdeclarativestate_p.h"
+
+#include <qdeclarativepropertyvaluesource.h>
+#include <qdeclarativepropertyvalueinterceptor.h>
+#include <qdeclarative.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeAbstractAnimation;
+class QDeclarativeBehaviorPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeBehavior)
+
+    Q_INTERFACES(QDeclarativePropertyValueInterceptor)
+    Q_CLASSINFO("DefaultProperty", "animation")
+    Q_PROPERTY(QDeclarativeAbstractAnimation *animation READ animation WRITE setAnimation)
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+
+public:
+    QDeclarativeBehavior(QObject *parent=0);
+    ~QDeclarativeBehavior();
+
+    virtual void setTarget(const QDeclarativeMetaProperty &);
+    virtual void write(const QVariant &value);
+
+    QDeclarativeAbstractAnimation *animation();
+    void setAnimation(QDeclarativeAbstractAnimation *);
+
+    bool enabled() const;
+    void setEnabled(bool enabled);
+
+Q_SIGNALS:
+    void enabledChanged();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeBehavior)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEBEHAVIOR_H
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
new file mode 100644
index 0000000..934030c
--- /dev/null
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -0,0 +1,202 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativebind_p.h"
+
+#include "qdeclarativenullablevalue_p_p.h"
+
+#include <qdeclarativeengine.h>
+#include <qdeclarativecontext.h>
+
+#include <QtCore/qfile.h>
+#include <QtCore/qdebug.h>
+#include <QtScript/qscriptvalue.h>
+#include <QtScript/qscriptcontext.h>
+#include <QtScript/qscriptengine.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeBindPrivate : public QObjectPrivate
+{
+public:
+    QDeclarativeBindPrivate() : when(true), componentComplete(false), obj(0) {}
+
+    bool when : 1;
+    bool componentComplete : 1;
+    QObject *obj;
+    QString prop;
+    QDeclarativeNullableValue<QVariant> value;
+};
+
+
+/*!
+    \qmlclass Binding QDeclarativeBind
+  \since 4.7
+    \brief The Binding element allows arbitrary property bindings to be created.
+
+    Sometimes it is necessary to bind to a property of an object that wasn't
+    directly instantiated by QML - generally a property of a class exported
+    to QML by C++. In these cases, regular property binding doesn't work. Binding
+    allows you to bind any value to any property.
+
+    For example, imagine a C++ application that maps an "app.enteredText"
+    property into QML. You could use Binding to update the enteredText property
+    like this.
+    \code
+    TextEdit { id: myTextField; text: "Please type here..." }
+    Binding { target: app; property: "enteredText"; value: myTextField.text }
+    \endcode
+    Whenever the text in the TextEdit is updated, the C++ property will be
+    updated also.
+
+    If the binding target or binding property is changed, the bound value is
+    immediately pushed onto the new target.
+    */
+/*!
+    \internal
+    \class QDeclarativeBind
+    \ingroup group_utility
+    \brief The QDeclarativeBind class allows arbitrary property bindings to be created.
+
+    Simple bindings are usually earier to do in-place rather than creating a
+    QDeclarativeBind item. For that reason, QDeclarativeBind is usually used to transfer property information
+    from Qml to C++.
+
+    \sa cppqml
+    */
+QDeclarativeBind::QDeclarativeBind(QObject *parent)
+    : QObject(*(new QDeclarativeBindPrivate), parent)
+{
+}
+
+QDeclarativeBind::~QDeclarativeBind()
+{
+}
+
+bool QDeclarativeBind::when() const
+{
+    Q_D(const QDeclarativeBind);
+    return d->when;
+}
+
+void QDeclarativeBind::setWhen(bool v)
+{
+    Q_D(QDeclarativeBind);
+    d->when = v;
+    eval();
+}
+
+/*!
+    \qmlproperty Object Binding::target
+
+    The object to be updated.
+*/
+QObject *QDeclarativeBind::object()
+{
+    Q_D(const QDeclarativeBind);
+    return d->obj;
+}
+
+void QDeclarativeBind::setObject(QObject *obj)
+{
+    Q_D(QDeclarativeBind);
+    d->obj = obj;
+    eval();
+}
+
+/*!
+    \qmlproperty string Binding::property
+
+    The property to be updated.
+*/
+QString QDeclarativeBind::property() const
+{
+    Q_D(const QDeclarativeBind);
+    return d->prop;
+}
+
+void QDeclarativeBind::setProperty(const QString &p)
+{
+    Q_D(QDeclarativeBind);
+    d->prop = p;
+    eval();
+}
+
+/*!
+    \qmlproperty any Binding::value
+
+    The value to be set on the target object and property.  This can be a
+    constant (which isn't very useful), or a bound expression.
+*/
+QVariant QDeclarativeBind::value() const
+{
+    Q_D(const QDeclarativeBind);
+    return d->value.value;
+}
+
+void QDeclarativeBind::setValue(const QVariant &v)
+{
+    Q_D(QDeclarativeBind);
+    d->value.value = v;
+    d->value.isNull = false;
+    eval();
+}
+
+void QDeclarativeBind::componentComplete()
+{
+    Q_D(QDeclarativeBind);
+    d->componentComplete = true;
+    eval();
+}
+
+void QDeclarativeBind::eval()
+{
+    Q_D(QDeclarativeBind);
+    if (!d->obj || d->value.isNull || !d->when || !d->componentComplete)
+        return;
+
+    QDeclarativeMetaProperty prop(d->obj, d->prop);
+    prop.write(d->value.value);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativebind_p.h b/src/declarative/util/qdeclarativebind_p.h
new file mode 100644
index 0000000..f756e80
--- /dev/null
+++ b/src/declarative/util/qdeclarativebind_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEBIND_H
+#define QDECLARATIVEBIND_H
+
+#include <qdeclarative.h>
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeBindPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeBind : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeBind)
+    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_PROPERTY(QObject *target READ object WRITE setObject)
+    Q_PROPERTY(QString property READ property WRITE setProperty)
+    Q_PROPERTY(QVariant value READ value WRITE setValue)
+    Q_PROPERTY(bool when READ when WRITE setWhen)
+
+public:
+    QDeclarativeBind(QObject *parent=0);
+    ~QDeclarativeBind();
+
+    bool when() const;
+    void setWhen(bool);
+
+    QObject *object();
+    void setObject(QObject *);
+
+    QString property() const;
+    void setProperty(const QString &);
+
+    QVariant value() const;
+    void setValue(const QVariant &);
+
+protected:
+    virtual void componentComplete();
+
+private:
+    void eval();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeBind)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/util/qdeclarativeconnection.cpp b/src/declarative/util/qdeclarativeconnection.cpp
new file mode 100644
index 0000000..89f8a77
--- /dev/null
+++ b/src/declarative/util/qdeclarativeconnection.cpp
@@ -0,0 +1,288 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeconnection_p.h"
+
+#include <qdeclarativeexpression.h>
+#include <qdeclarativeboundsignal_p.h>
+#include <qdeclarativecontext.h>
+
+#include <QtCore/qdebug.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeConnectionPrivate : public QObjectPrivate
+{
+public:
+    QDeclarativeConnectionPrivate() : boundsignal(0), signalSender(0), scriptset(false), componentcomplete(false) {}
+
+    QDeclarativeBoundSignal *boundsignal;
+    QObject *signalSender;
+    QDeclarativeScriptString script;
+    bool scriptset;
+    QString signal;
+    bool componentcomplete;
+};
+
+/*!
+    \qmlclass Connection QDeclarativeConnection
+  \since 4.7
+    \brief A Connection object describes generalized connections to signals.
+
+    When connecting to signals in QML, the usual way is to create an
+    "on<Signal>" handler that reacts when a signal is received, like this:
+
+    \qml
+    MouseArea {
+        onClicked: { foo(x+123,y+456) }
+    }
+    \endqml
+
+    However, in some cases, it is not possible to connect to a signal in this
+    way. For example, JavaScript-in-HTML style signal properties do not allow:
+
+    \list
+        \i connecting to signals with the same name but different parameters
+        \i conformance checking that parameters are correctly named
+        \i multiple connections to the same signal
+        \i connections outside the scope of the signal sender
+        \i signals in classes with coincidentally-named on<Signal> properties
+    \endlist
+
+    When any of these are needed, the Connection object can be used instead.
+
+    For example, the above code can be changed to use a Connection object,
+    like this:
+
+    \qml
+    MouseArea {
+        Connection {
+            signal: "clicked(x,y)"
+            script: { foo(x+123,y+456) }
+        }
+    }
+    \endqml
+
+    More generally, the Connection object can be a child of some other object than
+    the sender of the signal, and the script is the default attribute:
+
+    \qml
+    MouseArea {
+        id: mr
+    }
+    ...
+    Connection {
+        sender: mr
+        signal: "clicked(x,y)"
+        script: { foo(x+123,y+456) }
+    }
+    \endqml
+*/
+
+/*!
+    \internal
+    \class QDeclarativeConnection
+    \brief The QDeclarativeConnection class describes generalized connections to signals.
+
+*/
+QDeclarativeConnection::QDeclarativeConnection(QObject *parent) :
+    QObject(*(new QDeclarativeConnectionPrivate), parent)
+{
+}
+
+QDeclarativeConnection::~QDeclarativeConnection()
+{
+    Q_D(QDeclarativeConnection);
+    delete d->boundsignal;
+}
+
+/*!
+    \qmlproperty Object Connection::sender
+    This property holds the object that sends the signal.
+
+    By default, the sender is assumed to be the parent of the Connection.
+*/
+QObject *QDeclarativeConnection::signalSender() const
+{
+    Q_D(const QDeclarativeConnection);
+    return d->signalSender ? d->signalSender : parent();
+}
+
+void QDeclarativeConnection::setSignalSender(QObject *obj)
+{
+    Q_D(QDeclarativeConnection);
+    if (d->signalSender == obj)
+        return;
+    disconnectIfValid();
+    d->signalSender = obj;
+    connectIfValid();
+}
+
+void QDeclarativeConnection::connectIfValid()
+{
+    Q_D(QDeclarativeConnection);
+    if (!d->componentcomplete)
+        return;
+    // boundsignal must not exist
+    if ((d->signalSender || parent()) && !d->signal.isEmpty() && d->scriptset) {
+        // create
+        // XXX scope?
+        int sigIdx = -1;
+        int lparen = d->signal.indexOf(QLatin1Char('('));
+        QList<QByteArray> sigparams;
+        if (lparen >= 0 && d->signal.length() > lparen+2) {
+            QStringList l = d->signal.mid(lparen+1,d->signal.length()-lparen-2).split(QLatin1Char(','));
+            foreach (const QString &s, l) {
+                sigparams.append(s.trimmed().toUtf8());
+            }
+        }
+        QString signalname = d->signal.left(lparen);
+        QObject *sender = d->signalSender ? d->signalSender : parent();
+        const QMetaObject *mo = sender->metaObject();
+        int methods = mo->methodCount();
+        for (int ii = 0; ii < methods; ++ii) {
+            QMetaMethod method = mo->method(ii);
+            QString methodName = QString::fromUtf8(method.signature());
+            int idx = methodName.indexOf(QLatin1Char('('));
+            methodName = methodName.left(idx);
+            if (methodName == signalname && (lparen<0 || method.parameterNames() == sigparams)) {
+                sigIdx = ii;
+                break;
+            }
+        }
+        if (sigIdx < 0) {
+            // Cannot usefully warn, since could be in middle of
+            // changing sender and signal.
+            // XXX need state change transactions to do better
+            return;
+        }
+
+        d->boundsignal = new QDeclarativeBoundSignal(qmlContext(this), d->script.script(), sender, mo->method(sigIdx), this);
+    }
+}
+
+void QDeclarativeConnection::disconnectIfValid()
+{
+    Q_D(QDeclarativeConnection);
+    if (!d->componentcomplete)
+        return;
+    if ((d->signalSender || parent()) && !d->signal.isEmpty() && d->scriptset) {
+        // boundsignal must exist
+        // destroy
+        delete d->boundsignal;
+        d->boundsignal = 0;
+    }
+}
+
+void QDeclarativeConnection::componentComplete()
+{
+    Q_D(QDeclarativeConnection);
+    d->componentcomplete=true;
+    connectIfValid();
+}
+
+
+/*!
+    \qmlproperty script Connection::script
+    This property holds the JavaScript executed whenever the signal is sent.
+
+    This is the default attribute of Connection.
+*/
+QDeclarativeScriptString QDeclarativeConnection::script() const
+{
+    Q_D(const QDeclarativeConnection);
+    return d->script;
+}
+
+void QDeclarativeConnection::setScript(const QDeclarativeScriptString& script)
+{
+    Q_D(QDeclarativeConnection);
+    if ((d->signalSender || parent()) && !d->signal.isEmpty()) {
+        if (!d->scriptset) {
+            // mustn't exist - create
+            d->scriptset = true;
+            d->script = script;
+            connectIfValid();
+        } else {
+            // must exist - update
+            d->script = script;
+            d->boundsignal->expression()->setExpression(script.script());
+        }
+    } else {
+        d->scriptset = true;
+        d->script = script;
+    }
+}
+
+/*!
+    \qmlproperty string Connection::signal
+    This property holds the signal from the sender to which the script is attached.
+
+    The signal's formal parameter names must be given in parentheses:
+
+    \qml
+Connection {
+    signal: "clicked(x,y)"
+    script: { ... }
+}
+    \endqml
+*/
+QString QDeclarativeConnection::signal() const
+{
+    Q_D(const QDeclarativeConnection);
+    return d->signal;
+}
+
+void QDeclarativeConnection::setSignal(const QString& sig)
+{
+    Q_D(QDeclarativeConnection);
+    if (d->signal == sig)
+        return;
+    disconnectIfValid();
+    d->signal =  sig;
+    connectIfValid();
+}
+
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeconnection_p.h b/src/declarative/util/qdeclarativeconnection_p.h
new file mode 100644
index 0000000..ae2efe9
--- /dev/null
+++ b/src/declarative/util/qdeclarativeconnection_p.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECONNECTION_H
+#define QDECLARATIVECONNECTION_H
+
+#include <qdeclarative.h>
+#include <qdeclarativescriptstring.h>
+
+#include <QtCore/qobject.h>
+#include <QtCore/qstring.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeBoundSignal;
+class QDeclarativeContext;
+class QDeclarativeConnectionPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeConnection : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeConnection)
+
+    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_PROPERTY(QObject *sender READ signalSender WRITE setSignalSender)
+    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript)
+    Q_PROPERTY(QString signal READ signal WRITE setSignal)
+
+public:
+    QDeclarativeConnection(QObject *parent=0);
+    ~QDeclarativeConnection();
+
+    QObject *signalSender() const;
+    void setSignalSender(QObject *);
+    QDeclarativeScriptString script() const;
+    void setScript(const QDeclarativeScriptString&);
+    QString signal() const;
+    void setSignal(const QString&);
+
+private:
+    void disconnectIfValid();
+    void connectIfValid();
+    void componentComplete();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeConnection)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/util/qdeclarativedatetimeformatter.cpp b/src/declarative/util/qdeclarativedatetimeformatter.cpp
new file mode 100644
index 0000000..4087091
--- /dev/null
+++ b/src/declarative/util/qdeclarativedatetimeformatter.cpp
@@ -0,0 +1,373 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativedatetimeformatter_p.h"
+
+#include <QtCore/qlocale.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+//TODO: may need optimisation as the QDateTime member may not be needed?
+//      be able to set a locale?
+
+class QDeclarativeDateTimeFormatterPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeDateTimeFormatter)
+public:
+    QDeclarativeDateTimeFormatterPrivate() : locale(QLocale::system()), longStyle(false), componentComplete(true) {}
+
+    void updateText();
+
+    QDateTime dateTime;
+    QDate date;
+    QTime time;
+    QLocale locale;
+    QString dateTimeText;
+    QString dateText;
+    QString timeText;
+    QString dateTimeFormat; //set for convienience?
+    QString dateFormat;
+    QString timeFormat;
+    bool longStyle;
+    bool componentComplete;
+};
+
+/*!
+    \qmlclass DateTimeFormatter QDeclarativeDateTimeFormatter
+  \since 4.7
+    \brief The DateTimeFormatter allows you to control the format of a date string.
+
+    \code
+    DateTimeFormatter { id: formatter; date: System.date }
+    Text { text: formatter.dateText }
+    \endcode
+
+    By default, the text properties (dateText, timeText, and dateTimeText) will return the
+    date and time using the current system locale's format.
+*/
+
+/*!
+    \internal
+    \class QDeclarativeDateTimeFormatter
+    \ingroup group_utility
+    \brief The QDeclarativeDateTimeFormatter class allows you to format a date string.
+*/
+
+QDeclarativeDateTimeFormatter::QDeclarativeDateTimeFormatter(QObject *parent)
+: QObject(*(new QDeclarativeDateTimeFormatterPrivate), parent)
+{
+}
+
+QDeclarativeDateTimeFormatter::~QDeclarativeDateTimeFormatter()
+{
+}
+
+/*!
+    \qmlproperty string DateTimeFormatter::dateText
+    \qmlproperty string DateTimeFormatter::timeText
+    \qmlproperty string DateTimeFormatter::dateTimeText
+
+    Formatted text representations of the \c date, \c time,
+    and \c {date and time}, respectively.
+
+    If there is no explictly specified format the DateTimeFormatter
+    will use the system locale's default 'short' setting.
+
+    \code
+    // specify source date (assuming today is February 19, 2009)
+    DateTimeFormatter { id: formatter; dateTime: Today.date }
+
+    // display the full date and time
+    Text { text: formatter.dateText }
+    \endcode
+
+    Would be equivalent to the following for a US English locale:
+
+    \code
+    // display the date
+    Text { text: "2/19/09" }
+    \endcode
+*/
+QString QDeclarativeDateTimeFormatter::dateTimeText() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->dateTimeText;
+}
+
+QString QDeclarativeDateTimeFormatter::dateText() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->dateText;
+}
+
+QString QDeclarativeDateTimeFormatter::timeText() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->timeText;
+}
+
+/*!
+    \qmlproperty date DateTimeFormatter::date
+    \qmlproperty time DateTimeFormatter::time
+    \qmlproperty datetime DateTimeFormatter::dateTime
+
+    The source date and time to be used by the formatter.
+
+    \code
+    // setting the date and time
+    DateTimeFormatter { date: System.date; time: System.time }
+    \endcode
+
+    For convienience it is possible to set the datetime property to set both the date and the time.
+    \code
+    // setting the datetime
+    DateTimeFormatter { dateTime: System.dateTime }
+    \endcode
+
+    There can only be one instance of date and time per formatter; if date, time, and dateTime are all
+    set the actual date and time used is not guaranteed.
+
+    \note If no date is set, dateTimeText will be just the date;
+    If no time is set, the dateTimeText will be just the time.
+    
+*/
+QDate QDeclarativeDateTimeFormatter::date() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->date;
+}
+
+QTime QDeclarativeDateTimeFormatter::time() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->time;
+}
+
+QDateTime QDeclarativeDateTimeFormatter::dateTime() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->dateTime;
+}
+
+/*!
+    \qmlproperty string DateTimeFormatter::dateFormat
+    \qmlproperty string DateTimeFormatter::timeFormat
+    \qmlproperty string DateTimeFormatter::dateTimeFormat
+
+    Specifies a custom format which the DateTime Formatter can use.
+
+    If there is no explictly specified format the DateTimeFormatter
+    will use the system locale's default 'short' setting.
+
+    The text's format may be modified by setting:
+    \list
+    \i \c dateFormat
+    \i \c timeFormat
+    \i \c dateTimeFormat
+    \endlist
+
+    If only the format for date is defined, the time and dateTime formats will be defined
+    as the system locale default and likewise for the others.
+
+    Syntax for the format is based on the QDateTime::toString() formatting options.
+
+    \code
+    // Format the date such that the dateText is: '1997-12-12'
+    DateTimeFormatter { id: formatter; dateTime: Today.dateTime; formatDate: "yyyy-MM-d" }
+    \endcode
+
+    Assigning an empty string to a particular format will reset it.
+*/
+QString QDeclarativeDateTimeFormatter::dateTimeFormat() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->dateTimeFormat;
+}
+
+QString QDeclarativeDateTimeFormatter::dateFormat() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->dateFormat;
+}
+
+QString QDeclarativeDateTimeFormatter::timeFormat() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->timeFormat;
+}
+
+/*!
+    \qmlproperty bool DateTimeFormatter::longStyle
+
+    This property causes the formatter to use the system locale's long format rather than short format
+    by default.
+
+    This setting is off by default.
+*/
+bool QDeclarativeDateTimeFormatter::longStyle() const
+{
+    Q_D(const QDeclarativeDateTimeFormatter);
+    return d->longStyle;
+}
+
+void QDeclarativeDateTimeFormatter::setDateTime(const QDateTime &dateTime)
+{
+    Q_D(QDeclarativeDateTimeFormatter);
+    if (d->dateTime == dateTime)
+        return;
+    d->dateTime = dateTime;
+    d->date = d->dateTime.date();
+    d->time = d->dateTime.time();
+    d->updateText();
+}
+
+void QDeclarativeDateTimeFormatter::setTime(const QTime &time)
+{
+    Q_D(QDeclarativeDateTimeFormatter);
+    if (d->dateTime.time() == time)
+        return;
+    d->time = time;
+    d->dateTime.setTime(time);
+    d->updateText();
+}
+
+void QDeclarativeDateTimeFormatter::setDate(const QDate &date)
+{
+    Q_D(QDeclarativeDateTimeFormatter);
+    if (d->dateTime.date() == date)
+        return;
+    d->date = date;
+    bool clearTime = d->dateTime.time().isValid() ? false : true;   //because setting date generates default time
+    d->dateTime.setDate(date);
+    if (clearTime)
+        d->dateTime.setTime(QTime());
+    d->updateText();
+}
+
+//DateTime formatting may be a combination of date and time?
+void QDeclarativeDateTimeFormatter::setDateTimeFormat(const QString &format)
+{
+    Q_D(QDeclarativeDateTimeFormatter);
+    //no format checking
+    d->dateTimeFormat = format;
+    d->updateText();
+}
+
+void QDeclarativeDateTimeFormatter::setDateFormat(const QString &format)
+{
+    Q_D(QDeclarativeDateTimeFormatter);
+    //no format checking
+    d->dateFormat = format;
+    d->updateText();
+}
+
+void QDeclarativeDateTimeFormatter::setTimeFormat(const QString &format)
+{
+    Q_D(QDeclarativeDateTimeFormatter);
+    //no format checking
+    d->timeFormat = format;
+    d->updateText();
+}
+
+void QDeclarativeDateTimeFormatter::setLongStyle(bool longStyle)
+{
+    Q_D(QDeclarativeDateTimeFormatter);
+    d->longStyle = longStyle;
+    d->updateText();
+}
+
+void QDeclarativeDateTimeFormatterPrivate::updateText()
+{
+    Q_Q(QDeclarativeDateTimeFormatter);
+    if (!componentComplete)
+        return;
+
+    QString str;
+    QString str1;
+    QString str2;
+
+    Qt::DateFormat defaultFormat = longStyle ? Qt::SystemLocaleLongDate : Qt::SystemLocaleShortDate;
+
+    if (dateFormat.isEmpty())
+        str1 = date.toString(defaultFormat);
+    else
+        str1 = date.toString(dateFormat);
+
+    if (timeFormat.isEmpty())
+        str2 = time.toString(defaultFormat);
+    else
+        str2 = time.toString(timeFormat);
+
+    if (dateTimeFormat.isEmpty())
+        str = dateTime.toString(defaultFormat);
+    //else if (!formatTime.isEmpty() && !formatDate.isEmpty())
+    //    str = str1 + QLatin1Char(' ') + str2;
+    else
+        str = dateTime.toString(dateTimeFormat);
+
+    if (dateTimeText == str && dateText == str1 && timeText == str2)
+        return;
+
+    dateTimeText = str;
+    dateText = str1;
+    timeText = str2;
+
+    emit q->textChanged();
+}
+
+void QDeclarativeDateTimeFormatter::classBegin()
+{
+    Q_D(QDeclarativeDateTimeFormatter);
+    d->componentComplete = false;
+}
+
+void QDeclarativeDateTimeFormatter::componentComplete()
+{
+    Q_D(QDeclarativeDateTimeFormatter);
+    d->componentComplete = true;
+    d->updateText();
+}
+
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativedatetimeformatter_p.h b/src/declarative/util/qdeclarativedatetimeformatter_p.h
new file mode 100644
index 0000000..da900be
--- /dev/null
+++ b/src/declarative/util/qdeclarativedatetimeformatter_p.h
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEDATETIMEFORMATTER_H
+#define QDECLARATIVEDATETIMEFORMATTER_H
+
+#include <qdeclarative.h>
+
+#include <QtCore/qdatetime.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeDateTimeFormatterPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDateTimeFormatter : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativeParserStatus)
+
+    Q_PROPERTY(QString dateText READ dateText NOTIFY textChanged)
+    Q_PROPERTY(QString timeText READ timeText NOTIFY textChanged)
+    Q_PROPERTY(QString dateTimeText READ dateTimeText NOTIFY textChanged)
+    Q_PROPERTY(QDate date READ date WRITE setDate)
+    Q_PROPERTY(QTime time READ time WRITE setTime)
+    Q_PROPERTY(QDateTime dateTime READ dateTime WRITE setDateTime)
+    Q_PROPERTY(QString dateFormat READ dateFormat WRITE setDateFormat)
+    Q_PROPERTY(QString timeFormat READ timeFormat WRITE setTimeFormat)
+    Q_PROPERTY(QString dateTimeFormat READ dateTimeFormat WRITE setDateTimeFormat)
+    Q_PROPERTY(bool longStyle READ longStyle WRITE setLongStyle)
+public:
+    QDeclarativeDateTimeFormatter(QObject *parent=0);
+    ~QDeclarativeDateTimeFormatter();
+
+    QString dateTimeText() const;
+    QString dateText() const;
+    QString timeText() const;
+
+    QDate date() const;
+    void setDate(const QDate &);
+
+    QTime time() const;
+    void setTime(const QTime &);
+
+    QDateTime dateTime() const;
+    void setDateTime(const QDateTime &);
+
+    QString dateTimeFormat() const;
+    void setDateTimeFormat(const QString &);
+
+    QString dateFormat() const;
+    void setDateFormat(const QString &);
+
+    QString timeFormat() const;
+    void setTimeFormat(const QString &);
+
+    bool longStyle() const;
+    void setLongStyle(bool);
+
+    virtual void classBegin();
+    virtual void componentComplete();
+
+Q_SIGNALS:
+    void textChanged();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeDateTimeFormatter)
+    Q_DECLARE_PRIVATE(QDeclarativeDateTimeFormatter)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeDateTimeFormatter)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/util/qdeclarativeeasefollow.cpp b/src/declarative/util/qdeclarativeeasefollow.cpp
new file mode 100644
index 0000000..0430a0b
--- /dev/null
+++ b/src/declarative/util/qdeclarativeeasefollow.cpp
@@ -0,0 +1,536 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeeasefollow_p.h"
+
+#include "qdeclarativeanimation_p_p.h"
+
+#include <qdeclarativemetaproperty.h>
+
+#include <QtCore/qdebug.h>
+
+#include <math.h>
+
+QT_BEGIN_NAMESPACE
+
+
+
+class QDeclarativeEaseFollowPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeEaseFollow)
+public:
+    QDeclarativeEaseFollowPrivate()
+        : source(0), velocity(200), duration(-1), maximumEasingTime(-1),
+          reversingMode(QDeclarativeEaseFollow::Eased), initialVelocity(0), 
+          initialValue(0), invert(false), enabled(true), trackVelocity(0), clockOffset(0),
+          lastTick(0), clock(this)
+    {} 
+
+    qreal source;
+    qreal velocity;
+    qreal duration;
+    qreal maximumEasingTime;
+    QDeclarativeEaseFollow::ReversingMode reversingMode;
+
+    qreal initialVelocity;
+    qreal initialValue;
+    bool invert;
+    bool enabled;
+
+    qreal trackVelocity;
+
+    QDeclarativeMetaProperty target;
+
+    int clockOffset;
+    int lastTick;
+    void tick(int);
+    void clockStart();
+    void clockStop();
+    QTickAnimationProxy<QDeclarativeEaseFollowPrivate, &QDeclarativeEaseFollowPrivate::tick> clock;
+
+    void restart();
+
+    // Parameters for use in tick()
+    qreal a;  // Acceleration
+    qreal d;  // Deceleration
+    qreal tf; // Total time
+    qreal tp; // Time at which peak velocity occurs
+    qreal td; // Time at which decelleration begins
+    qreal vp; // Velocity at tp
+    qreal sp; // Displacement at tp
+    qreal sd; // Displacement at td
+    qreal vi; // "Normalized" initialvelocity
+    bool recalc();
+};
+
+bool QDeclarativeEaseFollowPrivate::recalc()
+{
+    qreal s = source - initialValue;
+    vi = initialVelocity;
+
+    s = (invert?-1.0:1.0) * s;
+    vi = (invert?-1.0:1.0) * vi;
+
+    if (duration > 0 && velocity > 0) {
+        tf = s / velocity;
+        if (tf > (duration / 1000.)) tf = (duration / 1000.);
+    } else if (duration > 0) {
+        tf = duration / 1000.;
+    } else if (velocity > 0) {
+        tf = s / velocity;
+    } else {
+        return false;
+    }
+
+    if (maximumEasingTime == 0) {
+        a = 0;
+        d = 0;
+        tp = 0;
+        td = tf;
+        vp = velocity;
+        sp = 0;
+        sd = s;
+    } else if (maximumEasingTime != -1 && tf > (maximumEasingTime / 1000.)) {
+
+        qreal met = maximumEasingTime / 1000.;
+        td = tf - met;
+
+        qreal c1 = td;
+        qreal c2 = (tf - td) * vi - tf * velocity;
+        qreal c3 = -0.5 * (tf - td) * vi * vi;
+
+        qreal vp1 = (-c2 + sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
+        // qreal vp2 = (-c2 - sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
+
+        vp = vp1;
+        a = vp / met;
+        d = a;
+        tp = (vp - vi) / a;
+        sp = vi * tp + 0.5 * a * tp * tp;
+        sd = sp + (td - tp) * vp;
+    } else {
+
+        qreal c1 = 0.25 * tf * tf;
+        qreal c2 = 0.5 * vi * tf - s;
+        qreal c3 = -0.25 * vi * vi;
+
+        qreal a1 = (-c2 + sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
+        //qreal a2 = (-c2 - sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
+
+        qreal tp1 = 0.5 * tf - 0.5 * vi / a1;
+        //qreal tp2 = 0.5 * tf - 0.5 * vi / a2;
+        qreal vp1 = a1 * tp1 + vi;
+        //qreal vp2 = a2 * tp2 + vi;
+
+        qreal sp1 = 0.5 * a1 * tp1 * tp1 + vi * tp1;
+        //qreal sp2 = 0.5 * a2 * tp2 * tp2 + vi * tp2;
+
+        a = a1;
+        d = a1;
+        tp = tp1;
+        td = tp1;
+        vp = vp1;
+        sp = sp1;
+        sd = sp1;
+    }
+
+    /*
+    qWarning() << "a:" << a << "tf:" << tf << "tp:" << tp << "vp:" 
+               << vp << "sp:" << sp << "vi:" << vi << "invert:" << invert;
+    */
+    return true;
+}
+
+void QDeclarativeEaseFollowPrivate::clockStart()
+{
+    if (clock.state() == QAbstractAnimation::Running) {
+        clockOffset = lastTick;
+        return;
+    } else {
+        clockOffset = 0;
+        lastTick = 0;
+        clock.start();
+    }
+}
+
+void QDeclarativeEaseFollowPrivate::clockStop()
+{
+    clockOffset = 0;
+    lastTick = 0;
+    clock.stop();
+}
+
+void QDeclarativeEaseFollowPrivate::tick(int t)
+{
+    lastTick = t;
+    t -= clockOffset;
+
+    qreal time_seconds = qreal(t) / 1000.;
+
+    qreal out = 0;
+    if (time_seconds < tp) {
+
+        trackVelocity = vi + time_seconds * a;
+        trackVelocity = (invert?-1.0:1.0) * trackVelocity;
+
+        qreal value = 0.5 * a * time_seconds * time_seconds + vi * time_seconds;
+        value = (invert?-1.0:1.0) * value;
+        target.write(initialValue + value);
+        out = initialValue + value;
+    } else if (time_seconds < td) {
+
+        time_seconds -= tp;
+        trackVelocity = (invert?-1.0:1.0) * vp;
+        qreal value = sp + time_seconds * vp;
+        value = (invert?-1.0:1.0) * value;
+
+        target.write(initialValue + value);
+
+        out = initialValue + value;
+    } else if (time_seconds < tf) {
+
+        time_seconds -= td;
+
+        trackVelocity = vp - time_seconds * a;
+        trackVelocity = (invert?-1.0:1.0) * trackVelocity;
+
+        qreal value = sd - 0.5 * d * time_seconds * time_seconds + vp * time_seconds;
+        value = (invert?-1.0:1.0) * value;
+
+        target.write(initialValue + value);
+
+        out = initialValue + value;
+    } else {
+
+        clock.stop();
+
+        trackVelocity = 0;
+        target.write(source);
+    }
+
+    //qWarning() << out << trackVelocity << t << a;
+}
+
+/*!
+    \qmlclass EaseFollow QDeclarativeEaseFollow
+    \brief The EaseFollow element allows a property to smoothly track a value.
+
+    The EaseFollow smoothly animates a property's value to a set target value 
+    using an ease in/out quad easing curve.  If the target value changes while
+    the animation is in progress, the easing curves used to animate to the old 
+    and the new target values are spliced together to avoid any obvious visual
+    glitches.
+
+    The property animation is configured by setting the velocity at which the
+    animation should occur, or the duration that the animation should take.  
+    If both a velocity and a duration are specified, the one that results in
+    the quickest animation is chosen for each change in the target value.
+
+    For example, animating from 0 to 800 will take 4 seconds if a velocity
+    of 200 is set, will take 8 seconds with a duration of 8000 set, and will 
+    take 4 seconds with both a velocity of 200 and a duration of 8000 set.
+    Animating from 0 to 20000 will take 10 seconds if a velocity of 200 is set,
+    will take 8 seconds with a duration of 8000 set, and will take 8 seconds
+    with both a velocity of 200 and a duration of 8000 set.
+
+    The follow example shows one rectangle tracking the position of another.
+\code
+import Qt 4.6
+
+Rectangle {
+    width: 800; height: 600; color: "blue"
+
+    Rectangle {
+        color: "green"
+        width: 60; height: 60;
+        x: -5; y: -5;
+        x: EaseFollow { source: rect1.x - 5; velocity: 200 }
+        y: EaseFollow { source: rect1.y - 5; velocity: 200 }
+    }
+
+    Rectangle {
+        id: rect1
+        color: "red"
+        width: 50; height: 50;
+    }
+
+    focus: true
+    Keys.onRightPressed: rect1.x = rect1.x + 100
+    Keys.onLeftPressed: rect1.x = rect1.x - 100
+    Keys.onUpPressed: rect1.y = rect1.y - 100
+    Keys.onDownPressed: rect1.y = rect1.y + 100
+}
+\endcode
+
+    The default velocity of EaseFollow is 200 units/second.  Note that if the range of the
+    value being animated is small, then the velocity will need to be adjusted
+    appropriately.  For example, the opacity of an item ranges from 0 - 1.0.
+    To enable a smooth animation in this range the velocity will need to be
+    set to a value such as 0.5 units/second.  Animating from 0 to 1.0 with a velocity
+    of 0.5 will take 2000 ms to complete.
+
+    \sa SpringFollow
+*/
+
+QDeclarativeEaseFollow::QDeclarativeEaseFollow(QObject *parent)
+: QObject(*(new QDeclarativeEaseFollowPrivate), parent)
+{
+}
+
+QDeclarativeEaseFollow::~QDeclarativeEaseFollow()
+{
+}
+
+/*!
+    \qmlproperty qreal EaseFollow::source
+    This property holds the source value which will be tracked.
+
+    Bind to a property in order to track its changes.
+*/
+qreal QDeclarativeEaseFollow::sourceValue() const
+{
+    Q_D(const QDeclarativeEaseFollow);
+    return d->source;
+}
+
+/*!
+    \qmlproperty enumeration EaseFollow::reversingMode
+
+    Sets how the EaseFollow behaves if an animation direction is reversed.
+
+    If reversing mode is \c Eased, the animation will smoothly decelerate, and
+    then reverse direction.  If the reversing mode is \c Immediate, the 
+    animation will immediately begin accelerating in the reverse direction, 
+    begining with a velocity of 0.  If the reversing mode is \c Sync, the
+    property is immediately set to the target value.
+*/
+QDeclarativeEaseFollow::ReversingMode QDeclarativeEaseFollow::reversingMode() const
+{
+    Q_D(const QDeclarativeEaseFollow);
+    return d->reversingMode;
+}
+
+void QDeclarativeEaseFollow::setReversingMode(ReversingMode m)
+{
+    Q_D(QDeclarativeEaseFollow);
+    if (d->reversingMode == m)
+        return;
+
+    d->reversingMode = m;
+    emit reversingModeChanged();
+}
+
+void QDeclarativeEaseFollowPrivate::restart()
+{
+    if (!enabled || velocity == 0) {
+        clockStop();
+        return;
+    }
+
+    initialValue = target.read().toReal();
+
+    if (source == initialValue) {
+        clockStop();
+        return;
+    }
+
+    bool hasReversed = trackVelocity != 0. && 
+                      ((trackVelocity > 0) == ((initialValue - source) > 0));
+
+    if (hasReversed) {
+        switch (reversingMode) {
+            default:
+            case QDeclarativeEaseFollow::Eased:
+                break;
+            case QDeclarativeEaseFollow::Sync:
+                target.write(source);
+                return;
+            case QDeclarativeEaseFollow::Immediate:
+                initialVelocity = 0;
+                clockStop();
+                break;
+        }
+    }
+
+    trackVelocity = initialVelocity;
+
+    invert = (source < initialValue);
+
+    if (!recalc()) {
+        target.write(source);
+        clockStop();
+        return;
+    }
+
+    clockStart();
+}
+
+void QDeclarativeEaseFollow::setSourceValue(qreal s)
+{
+    Q_D(QDeclarativeEaseFollow);
+
+    if (d->clock.state() == QAbstractAnimation::Running && d->source == s)
+        return;
+
+    d->source = s;
+    d->initialVelocity = d->trackVelocity;
+    d->restart();
+
+    emit sourceChanged();
+}
+
+/*!
+    \qmlproperty qreal EaseFollow::duration
+
+    This property holds the animation duration used when tracking the source.
+
+    Setting this to -1 (the default) disables the duration value.
+*/
+qreal QDeclarativeEaseFollow::duration() const
+{
+    Q_D(const QDeclarativeEaseFollow);
+    return d->duration;
+}
+
+void QDeclarativeEaseFollow::setDuration(qreal v)
+{
+    Q_D(QDeclarativeEaseFollow);
+    if (d->duration == v)
+        return;
+
+    d->duration = v;
+    d->trackVelocity = 0;
+
+    if (d->clock.state() == QAbstractAnimation::Running) 
+        d->restart();
+
+    emit durationChanged();
+}
+
+qreal QDeclarativeEaseFollow::velocity() const
+{
+    Q_D(const QDeclarativeEaseFollow);
+    return d->velocity;
+}
+
+/*!
+    \qmlproperty qreal EaseFollow::velocity
+
+    This property holds the average velocity allowed when tracking the source.
+
+    The default velocity of EaseFollow is 200 units/second.
+
+    Setting this to -1 disables the velocity value.
+*/
+void QDeclarativeEaseFollow::setVelocity(qreal v)
+{
+    Q_D(QDeclarativeEaseFollow);
+    if (d->velocity == v)
+        return;
+
+    d->velocity = v;
+    d->trackVelocity = 0;
+
+    if (d->clock.state() == QAbstractAnimation::Running) 
+        d->restart();
+
+    emit velocityChanged();
+}
+
+/*!
+    \qmlproperty bool EaseFollow::enabled
+    This property holds whether the target will track the source.
+*/
+bool QDeclarativeEaseFollow::enabled() const
+{
+    Q_D(const QDeclarativeEaseFollow);
+    return d->enabled;
+}
+
+void QDeclarativeEaseFollow::setEnabled(bool enabled)
+{
+    Q_D(QDeclarativeEaseFollow);
+    if (d->enabled == enabled)
+        return;
+
+    d->enabled = enabled;
+    if (enabled)
+        d->restart();
+    else
+        d->clockStop();
+
+    emit enabledChanged();
+}
+
+void QDeclarativeEaseFollow::setTarget(const QDeclarativeMetaProperty &t)
+{
+    Q_D(QDeclarativeEaseFollow);
+    d->target = t;
+}
+
+/*!
+\qmlproperty qreal EaseFollow::maximumEasingTime
+
+This property specifies the maximum time an "eases" during the follow should take.
+Setting this property causes the velocity to "level out" after at a time.  Setting 
+a negative value reverts to the normal mode of easing over the entire animation 
+duration.
+
+The default value is -1.
+*/
+qreal QDeclarativeEaseFollow::maximumEasingTime() const
+{
+    Q_D(const QDeclarativeEaseFollow);
+    return d->maximumEasingTime;
+}
+
+void QDeclarativeEaseFollow::setMaximumEasingTime(qreal v)
+{
+    Q_D(QDeclarativeEaseFollow);
+    d->maximumEasingTime = v;
+
+    if (d->clock.state() == QAbstractAnimation::Running) 
+        d->restart();
+
+    emit maximumEasingTimeChanged();
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeeasefollow_p.h b/src/declarative/util/qdeclarativeeasefollow_p.h
new file mode 100644
index 0000000..6d14eb5
--- /dev/null
+++ b/src/declarative/util/qdeclarativeeasefollow_p.h
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEEASEFOLLOW_H
+#define QDECLARATIVEEASEFOLLOW_H
+
+#include <qdeclarative.h>
+#include <qdeclarativepropertyvaluesource.h>
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeMetaProperty;
+class QDeclarativeEaseFollowPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeEaseFollow : public QObject, 
+                                           public QDeclarativePropertyValueSource
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeEaseFollow)
+    Q_INTERFACES(QDeclarativePropertyValueSource)
+    Q_ENUMS(ReversingMode)
+
+    Q_PROPERTY(qreal source READ sourceValue WRITE setSourceValue NOTIFY sourceChanged)
+    Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity NOTIFY velocityChanged)
+    Q_PROPERTY(qreal duration READ duration WRITE setDuration NOTIFY durationChanged)
+    Q_PROPERTY(ReversingMode reversingMode READ reversingMode WRITE setReversingMode NOTIFY reversingModeChanged)
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+    Q_PROPERTY(qreal maximumEasingTime READ maximumEasingTime WRITE setMaximumEasingTime NOTIFY maximumEasingTimeChanged)
+
+public:
+    enum ReversingMode { Eased, Immediate, Sync };
+
+    QDeclarativeEaseFollow(QObject *parent = 0);
+    ~QDeclarativeEaseFollow();
+
+    ReversingMode reversingMode() const;
+    void setReversingMode(ReversingMode);
+
+    qreal sourceValue() const;
+    void setSourceValue(qreal);
+
+    qreal velocity() const;
+    void setVelocity(qreal);
+
+    qreal duration() const;
+    void setDuration(qreal);
+
+    bool enabled() const;
+    void setEnabled(bool enabled);
+
+    qreal maximumEasingTime() const;
+    void setMaximumEasingTime(qreal);
+
+    virtual void setTarget(const QDeclarativeMetaProperty &);
+
+Q_SIGNALS:
+    void sourceChanged();
+    void velocityChanged();
+    void durationChanged();
+    void reversingModeChanged();
+    void enabledChanged();
+    void maximumEasingTimeChanged();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeEaseFollow);
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEEASEFOLLOW_H
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
new file mode 100644
index 0000000..391eadab
--- /dev/null
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -0,0 +1,229 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativefontloader_p.h"
+
+#include <qdeclarativecontext.h>
+#include <qdeclarativeengine.h>
+
+#include <QUrl>
+#include <QDebug>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QFile>
+#include <QFontDatabase>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeFontLoaderPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeFontLoader)
+
+public:
+    QDeclarativeFontLoaderPrivate() : reply(0), status(QDeclarativeFontLoader::Null) {}
+
+    void addFontToDatabase(const QByteArray &);
+
+    QUrl url;
+    QString name;
+    QNetworkReply *reply;
+    QDeclarativeFontLoader::Status status;
+};
+
+
+
+/*!
+    \qmlclass FontLoader QDeclarativeFontLoader
+    \ingroup group_utility
+    \brief This item allows using fonts by name or url.
+
+    Example:
+    \qml
+    FontLoader { id: fixedFont; name: "Courier" }
+    FontLoader { id: webFont; source: "http://www.mysite.com/myfont.ttf" }
+
+    Text { text: "Fixed-size font"; font.family: fixedFont.name }
+    Text { text: "Fancy font"; font.family: webFont.name }
+    \endqml
+*/
+QDeclarativeFontLoader::QDeclarativeFontLoader(QObject *parent)
+    : QObject(*(new QDeclarativeFontLoaderPrivate), parent)
+{
+}
+
+QDeclarativeFontLoader::~QDeclarativeFontLoader()
+{
+}
+
+static QString toLocalFileOrQrc(const QUrl& url)
+{
+    QString r = url.toLocalFile();
+    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
+        r = QLatin1Char(':') + url.path();
+    return r;
+}
+
+
+/*!
+    \qmlproperty url FontLoader::source
+    The url of the font to load.
+*/
+QUrl QDeclarativeFontLoader::source() const
+{
+    Q_D(const QDeclarativeFontLoader);
+    return d->url;
+}
+
+void QDeclarativeFontLoader::setSource(const QUrl &url)
+{
+    Q_D(QDeclarativeFontLoader);
+    if (url == d->url)
+        return;
+    d->url = qmlContext(this)->resolvedUrl(url);
+
+    d->status = Loading;
+    emit statusChanged();
+#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
+    QString lf = toLocalFileOrQrc(d->url);
+    if (!lf.isEmpty()) {
+        int id = QFontDatabase::addApplicationFont(lf);
+        if (id != -1) {
+            d->name = QFontDatabase::applicationFontFamilies(id).at(0);
+            emit nameChanged();
+            d->status = QDeclarativeFontLoader::Ready;
+        } else {
+            d->status = QDeclarativeFontLoader::Error;
+            qWarning() << "Cannot load font:" << url;
+        }
+        emit statusChanged();
+    } else
+#endif
+    {
+        QNetworkRequest req(d->url);
+        req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
+        d->reply = qmlEngine(this)->networkAccessManager()->get(req);
+        QObject::connect(d->reply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    }
+}
+
+/*!
+    \qmlproperty string FontLoader::name
+
+    This property holds the name of the font family.
+    It is set automatically when a font is loaded using the \c url property.
+
+    Use this to set the \c font.family property of a \c Text item.
+
+    Example:
+    \qml
+    FontLoader { id: webFont; source: "http://www.mysite.com/myfont.ttf" }
+    Text { text: "Fancy font"; font.family: webFont.name }
+    \endqml
+*/
+QString QDeclarativeFontLoader::name() const
+{
+    Q_D(const QDeclarativeFontLoader);
+    return d->name;
+}
+
+void QDeclarativeFontLoader::setName(const QString &name)
+{
+    Q_D(QDeclarativeFontLoader);
+    if (d->name == name )
+        return;
+    d->name = name;
+    emit nameChanged();
+    d->status = Ready;
+    emit statusChanged();
+}
+
+/*!
+    \qmlproperty enum FontLoader::status
+
+    This property holds the status of font loading.  It can be one of:
+    \list
+    \o Null - no font has been set
+    \o Ready - the font has been loaded
+    \o Loading - the font is currently being loaded
+    \o Error - an error occurred while loading the font
+    \endlist
+*/
+QDeclarativeFontLoader::Status QDeclarativeFontLoader::status() const
+{
+    Q_D(const QDeclarativeFontLoader);
+    return d->status;
+}
+
+void QDeclarativeFontLoader::replyFinished()
+{
+    Q_D(QDeclarativeFontLoader);
+    if (d->reply) {
+        if (!d->reply->error()) {
+            QByteArray ba = d->reply->readAll();
+            d->addFontToDatabase(ba);
+        } else {
+            d->status = Error;
+            emit statusChanged();
+        }
+        d->reply->deleteLater();
+        d->reply = 0;
+    }
+}
+
+void QDeclarativeFontLoaderPrivate::addFontToDatabase(const QByteArray &ba)
+{
+    Q_Q(QDeclarativeFontLoader);
+
+    int id = QFontDatabase::addApplicationFontFromData(ba);
+    if (id != -1) {
+        name = QFontDatabase::applicationFontFamilies(id).at(0);
+        emit q->nameChanged();
+        status = QDeclarativeFontLoader::Ready;
+    } else {
+        status = QDeclarativeFontLoader::Error;
+        qWarning() << "Cannot load font:" << url;
+    }
+    emit q->statusChanged();
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativefontloader_p.h b/src/declarative/util/qdeclarativefontloader_p.h
new file mode 100644
index 0000000..8a9131c
--- /dev/null
+++ b/src/declarative/util/qdeclarativefontloader_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEFONTLOADER_H
+#define QDECLARATIVEFONTLOADER_H
+
+#include <qdeclarative.h>
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeFontLoaderPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeFontLoader : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeFontLoader)
+    Q_ENUMS(Status)
+
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+
+public:
+    enum Status { Null = 0, Ready, Loading, Error };
+
+    QDeclarativeFontLoader(QObject *parent = 0);
+    ~QDeclarativeFontLoader();
+
+    QUrl source() const;
+    void setSource(const QUrl &url);
+
+    QString name() const;
+    void setName(const QString &name);
+
+    Status status() const;
+
+private Q_SLOTS:
+    void replyFinished();
+
+Q_SIGNALS:
+    void nameChanged();
+    void statusChanged();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeFontLoader)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEFONTLOADER_H
+
diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp
new file mode 100644
index 0000000..346f3e4
--- /dev/null
+++ b/src/declarative/util/qdeclarativelistaccessor.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativelistaccessor_p.h"
+
+#include <qdeclarativemetatype.h>
+
+#include <QStringList>
+#include <QtCore/qdebug.h>
+
+// ### Remove me
+#include <qdeclarativeengine_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeListAccessor::QDeclarativeListAccessor()
+: m_type(Invalid)
+{
+}
+
+QDeclarativeListAccessor::~QDeclarativeListAccessor()
+{
+}
+
+QVariant QDeclarativeListAccessor::list() const
+{
+    return d;
+}
+
+void QDeclarativeListAccessor::setList(const QVariant &v, QDeclarativeEngine *engine)
+{
+    d = v;
+
+    QDeclarativeEnginePrivate *enginePrivate = engine?QDeclarativeEnginePrivate::get(engine):0;
+
+    if (!d.isValid()) {
+        m_type = Invalid;
+    } else if (d.userType() == QVariant::StringList) {
+        m_type = StringList;
+    } else if (d.userType() == QMetaType::QVariantList) {
+        m_type = VariantList;
+    } else if (d.canConvert(QVariant::Int)) {
+        m_type = Integer;
+    } else if ((!enginePrivate && QDeclarativeMetaType::isQObject(d.userType())) ||
+               (enginePrivate && enginePrivate->isQObject(d.userType()))) {
+        QObject *data = enginePrivate?enginePrivate->toQObject(v):QDeclarativeMetaType::toQObject(v);
+        d = QVariant::fromValue(data);
+        m_type = Instance;
+    } else if (d.userType() == qMetaTypeId<QDeclarativeListReference>()) {
+        m_type = ListProperty;
+    } else {
+        m_type = Instance;
+    }
+}
+
+int QDeclarativeListAccessor::count() const
+{
+    switch(m_type) {
+    case StringList:
+        return qvariant_cast<QStringList>(d).count();
+    case VariantList:
+        return qvariant_cast<QVariantList>(d).count();
+    case ListProperty:
+        return ((QDeclarativeListReference *)d.constData())->count();
+    case Instance:
+        return 1;
+    case Integer:
+        return d.toInt();
+    default:
+    case Invalid:
+        return 0;
+    }
+}
+
+QVariant QDeclarativeListAccessor::at(int idx) const
+{
+    Q_ASSERT(idx >= 0 && idx < count());
+    switch(m_type) {
+    case StringList:
+        return QVariant::fromValue(qvariant_cast<QStringList>(d).at(idx));
+    case VariantList:
+        return qvariant_cast<QVariantList>(d).at(idx);
+    case ListProperty:
+        return QVariant::fromValue(((QDeclarativeListReference *)d.constData())->at(idx));
+    case Instance:
+        return d;
+    case Integer:
+        return QVariant(idx);
+    default:
+    case Invalid:
+        return QVariant();
+    }
+}
+
+bool QDeclarativeListAccessor::isValid() const
+{
+    return m_type != Invalid;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativelistaccessor_p.h b/src/declarative/util/qdeclarativelistaccessor_p.h
new file mode 100644
index 0000000..d8bb8af
--- /dev/null
+++ b/src/declarative/util/qdeclarativelistaccessor_p.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELISTACCESSOR_H
+#define QDECLARATIVELISTACCESSOR_H
+
+#include <QtCore/QVariant>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeEngine;
+class Q_DECLARATIVE_EXPORT QDeclarativeListAccessor
+{
+public:
+    QDeclarativeListAccessor();
+    ~QDeclarativeListAccessor();
+
+    QVariant list() const;
+    void setList(const QVariant &, QDeclarativeEngine * = 0);
+
+    bool isValid() const;
+
+    int count() const;
+    QVariant at(int) const;
+
+    enum Type { Invalid, StringList, VariantList, ListProperty, Instance, Integer };
+    Type type() const { return m_type; }
+
+private:
+    Type m_type;
+    QVariant d;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVELISTACCESSOR_H
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
new file mode 100644
index 0000000..e78e0e1
--- /dev/null
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -0,0 +1,983 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativelistmodel_p.h"
+
+#include "qdeclarativeopenmetaobject_p.h"
+
+#include <qdeclarativecustomparser_p.h>
+#include <qdeclarativeparser_p.h>
+#include <qdeclarativeengine_p.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeinfo.h>
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qstack.h>
+#include <QXmlStreamReader>
+#include <QtScript/qscriptvalueiterator.h>
+
+Q_DECLARE_METATYPE(QListModelInterface *)
+
+QT_BEGIN_NAMESPACE
+
+#define DATA_ROLE_ID 1
+#define DATA_ROLE_NAME "data"
+
+QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListModelData::instructions() const
+{
+    return (QDeclarativeListModelParser::ListInstruction *)((char *)this + sizeof(ListModelData));
+}
+
+static void dump(ModelNode *node, int ind);
+
+/*!
+    \qmlclass ListModel QDeclarativeListModel
+    \brief The ListModel element defines a free-form list data source.
+
+    The ListModel is a simple hierarchy of elements containing data roles. The contents can
+    be defined dynamically, or explicitly in QML:
+
+    For example:
+
+    \code
+    ListModel {
+        id: fruitModel
+        ListElement {
+            name: "Apple"
+            cost: 2.45
+        }
+        ListElement {
+            name: "Orange"
+            cost: 3.25
+        }
+        ListElement {
+            name: "Banana"
+            cost: 1.95
+        }
+    }
+    \endcode
+
+    Roles (properties) must begin with a lower-case letter.  The above example defines a
+    ListModel containing three elements, with the roles "name" and "cost".
+
+    The defined model can be used in views such as ListView:
+    \code
+    Component {
+        id: fruitDelegate
+        Item {
+            width: 200; height: 50
+            Text { text: name }
+            Text { text: '$'+cost; anchors.right: parent.right }
+        }
+    }
+
+    ListView {
+        model: fruitModel
+        delegate: fruitDelegate
+        anchors.fill: parent
+    }
+    \endcode
+
+    It is possible for roles to contain list data.  In the example below we create a list of fruit attributes:
+
+    \code
+    ListModel {
+        id: fruitModel
+        ListElement {
+            name: "Apple"
+            cost: 2.45
+            attributes: [
+                ListElement { description: "Core" },
+                ListElement { description: "Deciduous" }
+            ]
+        }
+        ListElement {
+            name: "Orange"
+            cost: 3.25
+            attributes: [
+                ListElement { description: "Citrus" }
+            ]
+        }
+        ListElement {
+            name: "Banana"
+            cost: 1.95
+            attributes: [
+                ListElement { description: "Tropical" },
+                ListElement { description: "Seedless" }
+            ]
+        }
+    }
+    \endcode
+
+    The delegate below will list all the fruit attributes:
+    \code
+    Component {
+        id: fruitDelegate
+        Item {
+            width: 200; height: 50
+            Text { id: name; text: name }
+            Text { text: '$'+cost; anchors.right: parent.right }
+            Row {
+                anchors.top: name.bottom
+                spacing: 5
+                Text { text: "Attributes:" }
+                Repeater {
+                    dataSource: attributes
+                    Component { Text { text: description } }
+                }
+            }
+        }
+    }
+    \endcode
+
+    The content of a ListModel may be created and modified using the clear(),
+    append(), and set() methods.  For example:
+
+    \code
+    Component {
+        id: fruitDelegate
+        Item {
+            width: 200; height: 50
+            Text { text: name }
+            Text { text: '$'+cost; anchors.right: parent.right }
+
+            // Double the price when clicked.
+            MouseArea {
+                anchors.fill: parent
+                onClicked: fruitModel.set(index, "cost", cost*2)
+            }
+        }
+    }
+    \endcode
+
+    When creating content dynamically, note that the set of available properties cannot be changed
+    except by first clearing the model - whatever properties are first added are then the
+    only permitted properties in the model.
+
+    \sa {qmlmodels}{Data Models}
+*/
+
+class ModelObject : public QObject
+{
+    Q_OBJECT
+public:
+    ModelObject();
+
+    void setValue(const QByteArray &name, const QVariant &val)
+    {
+        _mo->setValue(name, val);
+    }
+
+private:
+    QDeclarativeOpenMetaObject *_mo;
+};
+
+struct ModelNode
+{
+    ModelNode();
+    ~ModelNode();
+
+    QList<QVariant> values;
+    QHash<QString, ModelNode *> properties;
+
+    QDeclarativeListModel *model(const QDeclarativeListModel *parent) {
+        if (!modelCache) { 
+            modelCache = new QDeclarativeListModel;
+            QDeclarativeEngine::setContextForObject(modelCache,QDeclarativeEngine::contextForObject(parent));
+
+            modelCache->_root = this; 
+        }
+        return modelCache;
+    }
+
+    ModelObject *object(const QDeclarativeListModel *parent) {
+        if (!objectCache) {
+            objectCache = new ModelObject();
+            QHash<QString, ModelNode *>::iterator it;
+            for (it = properties.begin(); it != properties.end(); ++it) {
+                objectCache->setValue(it.key().toUtf8(), parent->valueForNode(*it));
+            }
+        }
+        return objectCache;
+    }
+
+    void setObjectValue(const QScriptValue& valuemap);
+    void setListValue(const QScriptValue& valuelist);
+
+    void setProperty(const QString& prop, const QVariant& val) {
+        QHash<QString, ModelNode *>::const_iterator it = properties.find(prop);
+        if (it != properties.end()) {
+            (*it)->values[0] = val;
+        } else {
+            ModelNode *n = new ModelNode;
+            n->values << val;
+            properties.insert(prop,n);
+        }
+        if (objectCache)
+            objectCache->setValue(prop.toUtf8(), val);
+    }
+
+    QDeclarativeListModel *modelCache;
+    ModelObject *objectCache;
+    bool isArray;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(ModelNode *)
+
+QT_BEGIN_NAMESPACE
+
+void ModelNode::setObjectValue(const QScriptValue& valuemap) {
+    QScriptValueIterator it(valuemap);
+    while (it.hasNext()) {
+        it.next();
+        ModelNode *value = new ModelNode;
+        QScriptValue v = it.value();
+        if (v.isArray()) {
+            value->isArray = true;
+            value->setListValue(v);
+        } else {
+            value->values << v.toVariant();
+        }
+        properties.insert(it.name(),value);
+    }
+}
+
+void ModelNode::setListValue(const QScriptValue& valuelist) {
+    QScriptValueIterator it(valuelist);
+    values.clear();
+    while (it.hasNext()) {
+        it.next();
+        ModelNode *value = new ModelNode;
+        QScriptValue v = it.value();
+        if (v.isArray()) {
+            value->isArray = true;
+            value->setListValue(v);
+        } else if (v.isObject()) {
+            value->setObjectValue(v);
+        } else {
+            value->values << v.toVariant();
+        }
+        values.append(qVariantFromValue(value));
+
+    }
+}
+
+
+ModelObject::ModelObject()
+: _mo(new QDeclarativeOpenMetaObject(this))
+{
+}
+
+QDeclarativeListModel::QDeclarativeListModel(QObject *parent)
+: QListModelInterface(parent), _rolesOk(false), _root(0)
+{
+}
+
+QDeclarativeListModel::~QDeclarativeListModel()
+{
+    delete _root;
+}
+
+void QDeclarativeListModel::checkRoles() const
+{
+    if (_rolesOk || !_root)
+        return;
+
+    for (int ii = 0; ii < _root->values.count(); ++ii) {
+        ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(ii));
+        if (node) {
+            foreach (const QString &role, node->properties.keys())
+                addRole(role);
+        } 
+    }
+
+    _rolesOk = true;
+}
+
+void QDeclarativeListModel::addRole(const QString &role) const
+{
+    if (!roleStrings.contains(role))
+        roleStrings << role;
+}
+
+QList<int> QDeclarativeListModel::roles() const
+{
+    checkRoles();
+    QList<int> rv;
+    for (int ii = 0; ii < roleStrings.count(); ++ii)
+        rv << ii;
+    return rv;
+}
+
+QString QDeclarativeListModel::toString(int role) const
+{
+    checkRoles();
+    if (role < roleStrings.count())
+        return roleStrings.at(role);
+    else
+        return QString();
+}
+
+QVariant QDeclarativeListModel::valueForNode(ModelNode *node) const
+{
+    QObject *rv = 0;
+
+    if (node->isArray) {
+        // List
+        rv = node->model(this);
+    } else {
+        if (!node->properties.isEmpty()) {
+            // Object
+            rv = node->object(this);
+        } else if (node->values.count() == 0) {
+            // Invalid
+            return QVariant();
+        } else if (node->values.count() == 1) {
+            // Value
+            QVariant &var = node->values[0];
+            ModelNode *valueNode = qvariant_cast<ModelNode *>(var);
+            if (valueNode) {
+                if (!valueNode->properties.isEmpty())
+                    rv = valueNode->object(this);
+                else
+                    rv = valueNode->model(this);
+            } else {
+                return var;
+            }
+        }
+    }
+
+    if (rv)
+        return QVariant::fromValue(rv);
+    else
+        return QVariant();
+}
+
+QHash<int,QVariant> QDeclarativeListModel::data(int index, const QList<int> &roles) const
+{
+    checkRoles();
+    QHash<int, QVariant> rv;
+    if (index >= count() || index < 0)
+        return rv;
+
+    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
+    if (!node) 
+        return rv;
+
+    for (int ii = 0; ii < roles.count(); ++ii) {
+        const QString &roleString = roleStrings.at(roles.at(ii));
+
+        QHash<QString, ModelNode *>::ConstIterator iter = 
+            node->properties.find(roleString);
+        if (iter != node->properties.end()) {
+            ModelNode *row = *iter;
+            rv.insert(roles.at(ii), valueForNode(row));
+        }
+    }
+
+    return rv;
+}
+
+QVariant QDeclarativeListModel::data(int index, int role) const
+{
+    checkRoles();
+    QVariant rv;
+    if (index >= count() || index < 0)
+        return rv;
+
+    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
+    if (!node)
+        return rv;
+
+    const QString &roleString = roleStrings.at(role);
+
+    QHash<QString, ModelNode *>::ConstIterator iter =
+        node->properties.find(roleString);
+    if (iter != node->properties.end()) {
+        ModelNode *row = *iter;
+        rv = valueForNode(row);
+    }
+
+    return rv;
+}
+
+/*!
+    \qmlproperty int ListModel::count
+    The number of data entries in the model.
+*/
+int QDeclarativeListModel::count() const
+{
+    if (!_root) return 0;
+    return _root->values.count();
+}
+
+/*!
+    \qmlmethod ListModel::clear()
+
+    Deletes all content from the model. The properties are cleared such that
+    different properties may be set on subsequent additions.
+
+    \sa append() remove()
+*/
+void QDeclarativeListModel::clear()
+{
+    int cleared = count();
+    _rolesOk = false;
+    delete _root;
+    _root = 0;
+    roleStrings.clear();
+    emit itemsRemoved(0,cleared);
+    emit countChanged(0);
+}
+
+/*!
+    \qmlmethod ListModel::remove(int index)
+
+    Deletes the content at \a index from the model.
+
+    \sa clear()
+*/
+void QDeclarativeListModel::remove(int index)
+{
+    if (!_root || index < 0 || index >= _root->values.count()) {
+        qmlInfo(this) << tr("remove: index %1 out of range").arg(index);
+        return;
+    }
+
+    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
+    _root->values.removeAt(index);
+    if (node)
+        delete node;
+    emit itemsRemoved(index,1);
+    emit countChanged(_root->values.count());
+}
+
+/*!
+    \qmlmethod ListModel::insert(int index, jsobject dict)
+
+    Adds a new item to the list model at position \a index, with the
+    values in \a dict.
+
+    \code
+        FruitModel.insert(2, {"cost": 5.95, "name":"Pizza"})
+    \endcode
+
+    The \a index must be to an existing item in the list, or one past
+    the end of the list (equivalent to append).
+
+    \sa set() append()
+*/
+void QDeclarativeListModel::insert(int index, const QScriptValue& valuemap)
+{
+    if (!valuemap.isObject() || valuemap.isArray()) {
+        qmlInfo(this) << tr("insert: value is not an object");
+        return;
+    }
+    if (!_root)
+        _root = new ModelNode;
+    if (index >= _root->values.count() || index<0) {
+        if (index == _root->values.count())
+            append(valuemap);
+        else
+            qmlInfo(this) << tr("insert: index %1 out of range").arg(index);
+        return;
+    }
+    ModelNode *mn = new ModelNode;
+    mn->setObjectValue(valuemap);
+    _root->values.insert(index,qVariantFromValue(mn));
+    emit itemsInserted(index,1);
+    emit countChanged(_root->values.count());
+}
+
+/*!
+    \qmlmethod ListModel::move(int from, int to, int n)
+
+    Moves \a n items \a from one position \a to another.
+
+    The from and to ranges must exist; for example, to move the first 3 items
+    to the end of the list:
+
+    \code
+        FruitModel.move(0,FruitModel.count-3,3)
+    \endcode
+
+    \sa append()
+*/
+void QDeclarativeListModel::move(int from, int to, int n)
+{
+    if (n==0 || from==to)
+        return;
+    if (from+n > count() || to+n > count() || from < 0 || to < 0 || n < 0) {
+        qmlInfo(this) << tr("move: out of range");
+        return;
+    }
+    int origfrom=from; // preserve actual move, so any animations are correct
+    int origto=to;
+    int orign=n;
+    if (from > to) {
+        // Only move forwards - flip if backwards moving
+        int tfrom = from;
+        int tto = to;
+        from = tto;
+        to = tto+n;
+        n = tfrom-tto;
+    }
+    if (n==1) {
+        _root->values.move(from,to);
+    } else {
+        QList<QVariant> replaced;
+        int i=0;
+        QVariantList::const_iterator it=_root->values.begin(); it += from+n;
+        for (; i<to-from; ++i,++it)
+            replaced.append(*it);
+        i=0;
+        it=_root->values.begin(); it += from;
+        for (; i<n; ++i,++it)
+            replaced.append(*it);
+        QVariantList::const_iterator f=replaced.begin();
+        QVariantList::iterator t=_root->values.begin(); t += from;
+        for (; f != replaced.end(); ++f, ++t)
+            *t = *f;
+    }
+    emit itemsMoved(origfrom,origto,orign);
+}
+
+/*!
+    \qmlmethod ListModel::append(jsobject dict)
+
+    Adds a new item to the end of the list model, with the
+    values in \a dict.
+
+    \code
+        FruitModel.append({"cost": 5.95, "name":"Pizza"})
+    \endcode
+
+    \sa set() remove()
+*/
+void QDeclarativeListModel::append(const QScriptValue& valuemap)
+{
+    if (!valuemap.isObject() || valuemap.isArray()) {
+        qmlInfo(this) << tr("append: value is not an object");
+        return;
+    }
+    if (!_root)
+        _root = new ModelNode;
+    ModelNode *mn = new ModelNode;
+    mn->setObjectValue(valuemap);
+    _root->values << qVariantFromValue(mn);
+    emit itemsInserted(count()-1,1);
+    emit countChanged(_root->values.count());
+}
+
+/*!
+    \qmlmethod object ListModel::get(int index)
+
+    Returns the item at \a index in the list model.
+
+    \code
+        FruitModel.append({"cost": 5.95, "name":"Jackfruit"})
+        FruitModel.get(0).cost
+    \endcode
+
+    The \a index must be an element in the list.
+
+    Note that properties of the returned object that are themselves objects
+    will also be models, and this get() method is used to access elements:
+
+    \code
+        FruitModel.append(..., "attributes":
+            [{"name":"spikes","value":"7mm"},
+             {"name":"color","value":"green"}]);
+        FruitModel.get(0).attributes.get(1).value; // == "green"
+    \endcode
+
+    \sa append()
+*/
+QScriptValue QDeclarativeListModel::get(int index) const
+{
+    if (index >= count() || index < 0) {
+        qmlInfo(this) << tr("get: index %1 out of range").arg(index);
+        return 0;
+    }
+
+    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
+    if (!node) 
+        return 0;
+    QDeclarativeEngine *eng = qmlEngine(this);
+    if (!eng) {
+        qWarning("Cannot call QDeclarativeListModel::get() without a QDeclarativeEngine");
+        return 0;
+    }
+    return QDeclarativeEnginePrivate::qmlScriptObject(node->object(this), eng);
+}
+
+/*!
+    \qmlmethod ListModel::set(int index, jsobject dict)
+
+    Changes the item at \a index in the list model with the
+    values in \a dict. Properties not appearing in \a valuemap
+    are left unchanged.
+
+    \code
+        FruitModel.set(3, {"cost": 5.95, "name":"Pizza"})
+    \endcode
+
+    The \a index must be an element in the list.
+
+    \sa append()
+*/
+void QDeclarativeListModel::set(int index, const QScriptValue& valuemap)
+{
+    if (!valuemap.isObject() || valuemap.isArray()) {
+        qmlInfo(this) << tr("set: value is not an object");
+        return;
+    }
+    if ( !_root || index > _root->values.count() || index < 0) {
+        qmlInfo(this) << tr("set: index %1 out of range").arg(index);
+        return;
+    }
+    if (index == _root->values.count())
+        append(valuemap);
+    else {
+        ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
+        QList<int> roles;
+        node->setObjectValue(valuemap);
+        QScriptValueIterator it(valuemap);
+        while (it.hasNext()) {
+            it.next();
+            int r = roleStrings.indexOf(it.name());
+            if (r<0) {
+                r = roleStrings.count();
+                roleStrings << it.name();
+            }
+            roles.append(r);
+        }
+        emit itemsChanged(index,1,roles);
+    }
+}
+
+/*!
+    \qmlmethod ListModel::setProperty(int index, string property, variant value)
+
+    Changes the \a property of the item at \a index in the list model to \a value.
+
+    \code
+        FruitModel.set(3, "cost", 5.95)
+    \endcode
+
+    The \a index must be an element in the list.
+
+    \sa append()
+*/
+void QDeclarativeListModel::setProperty(int index, const QString& property, const QVariant& value)
+{
+    if ( !_root || index >= _root->values.count() || index < 0) {
+        qmlInfo(this) << tr("set: index %1 out of range").arg(index);
+        return;
+    }
+    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
+    int r = roleStrings.indexOf(property);
+    if (r<0) {
+        r = roleStrings.count();
+        roleStrings << property;
+    }
+    QList<int> roles;
+    roles.append(r);
+
+    if (node)
+        node->setProperty(property,value);
+    emit itemsChanged(index,1,roles);
+}
+
+bool QDeclarativeListModelParser::compileProperty(const QDeclarativeCustomParserProperty &prop, QList<ListInstruction> &instr, QByteArray &data)
+{
+    QList<QVariant> values = prop.assignedValues();
+    for(int ii = 0; ii < values.count(); ++ii) {
+        const QVariant &value = values.at(ii);
+
+        if(value.userType() == qMetaTypeId<QDeclarativeCustomParserNode>()) {
+            QDeclarativeCustomParserNode node = 
+                qvariant_cast<QDeclarativeCustomParserNode>(value);
+
+            {
+            ListInstruction li;
+            li.type = ListInstruction::Push;
+            li.dataIdx = -1;
+            instr << li;
+            }
+
+            QList<QDeclarativeCustomParserProperty> props = node.properties();
+            for(int jj = 0; jj < props.count(); ++jj) {
+                const QDeclarativeCustomParserProperty &nodeProp = props.at(jj);
+                if (nodeProp.name() == "") {
+                    error(nodeProp, QDeclarativeListModel::tr("ListElement: cannot use default property"));
+                    return false;
+                }
+                if (nodeProp.name() == "id") {
+                    error(nodeProp, QDeclarativeListModel::tr("ListElement: cannot use reserved \"id\" property"));
+                    return false;
+                }
+
+                ListInstruction li;
+                int ref = data.count();
+                data.append(nodeProp.name());
+                data.append('\0');
+                li.type = ListInstruction::Set;
+                li.dataIdx = ref;
+                instr << li;
+
+                if(!compileProperty(nodeProp, instr, data))
+                    return false;
+
+                li.type = ListInstruction::Pop;
+                li.dataIdx = -1;
+                instr << li;
+            }
+
+            {
+            ListInstruction li;
+            li.type = ListInstruction::Pop;
+            li.dataIdx = -1;
+            instr << li;
+            }
+
+        } else {
+
+            QDeclarativeParser::Variant variant = 
+                qvariant_cast<QDeclarativeParser::Variant>(value);
+
+            int ref = data.count();
+
+            QByteArray d;
+            d += char(variant.type()); // type tag
+            if (variant.isString()) {
+                d += variant.asString().toUtf8();
+            } else if (variant.isNumber()) {
+                d += QByteArray::number(variant.asNumber(),'g',20);
+            } else if (variant.isBoolean()) {
+                d += char(variant.asBoolean());
+            } else if (variant.isScript()) {
+                if (definesEmptyList(variant.asScript())) {
+                    d[0] = 0; // QDeclarativeParser::Variant::Invalid - marks empty list
+                } else {
+                    error(prop, QDeclarativeListModel::tr("ListElement: cannot use script for property value"));
+                    return false;
+                }
+            }
+            d.append('\0');
+            data.append(d);
+
+            ListInstruction li;
+            li.type = ListInstruction::Value;
+            li.dataIdx = ref;
+            instr << li;
+        }
+    }
+
+    return true;
+}
+
+QByteArray QDeclarativeListModelParser::compile(const QList<QDeclarativeCustomParserProperty> &customProps)
+{
+    QList<ListInstruction> instr;
+    QByteArray data;
+
+    for(int ii = 0; ii < customProps.count(); ++ii) {
+        const QDeclarativeCustomParserProperty &prop = customProps.at(ii);
+        if(prop.name() != "") { // isn't default property
+            error(prop, QDeclarativeListModel::tr("ListModel: undefined property '%1'").arg(QString::fromUtf8(prop.name())));
+            return QByteArray();
+        }
+
+        if(!compileProperty(prop, instr, data)) {
+            return QByteArray();
+        }
+    }
+
+    int size = sizeof(ListModelData) + 
+               instr.count() * sizeof(ListInstruction) + 
+               data.count();
+
+    QByteArray rv;
+    rv.resize(size);
+
+    ListModelData *lmd = (ListModelData *)rv.data();
+    lmd->dataOffset = sizeof(ListModelData) + 
+                     instr.count() * sizeof(ListInstruction);
+    lmd->instrCount = instr.count();
+    for (int ii = 0; ii < instr.count(); ++ii)
+        lmd->instructions()[ii] = instr.at(ii);
+    ::memcpy(rv.data() + lmd->dataOffset, data.constData(), data.count());
+
+    return rv;
+}
+
+void QDeclarativeListModelParser::setCustomData(QObject *obj, const QByteArray &d)
+{
+    QDeclarativeListModel *rv = static_cast<QDeclarativeListModel *>(obj);
+
+    ModelNode *root = new ModelNode;
+    rv->_root = root;
+    QStack<ModelNode *> nodes;
+    nodes << root;
+
+    bool processingSet = false;
+
+    const ListModelData *lmd = (const ListModelData *)d.constData();
+    const char *data = ((const char *)lmd) + lmd->dataOffset;
+
+    for (int ii = 0; ii < lmd->instrCount; ++ii) {
+        const ListInstruction &instr = lmd->instructions()[ii];
+
+        switch(instr.type) {
+        case ListInstruction::Push:
+            {
+                ModelNode *n = nodes.top();
+                ModelNode *n2 = new ModelNode;
+                n->values << qVariantFromValue(n2);
+                nodes.push(n2);
+                if (processingSet)
+                    n->isArray = true;
+            }
+            break;
+
+        case ListInstruction::Pop:
+            nodes.pop();
+            break;
+
+        case ListInstruction::Value:
+            {
+                ModelNode *n = nodes.top();
+                switch (QDeclarativeParser::Variant::Type(data[instr.dataIdx])) {
+                 case QDeclarativeParser::Variant::Invalid:
+                    n->isArray = true;
+                    break;
+                 case QDeclarativeParser::Variant::Boolean:
+                    n->values.append(bool(data[1 + instr.dataIdx]));
+                    break;
+                 case QDeclarativeParser::Variant::Number:
+                    n->values.append(QByteArray(data + 1 + instr.dataIdx).toDouble());
+                    break;
+                 case QDeclarativeParser::Variant::String:
+                    n->values.append(QString::fromUtf8(data + 1 + instr.dataIdx));
+                    break;
+                 default:
+                    Q_ASSERT("Format error in ListInstruction");
+                }
+
+                processingSet = false;
+            }
+            break;
+
+        case ListInstruction::Set:
+            {
+                ModelNode *n = nodes.top();
+                ModelNode *n2 = new ModelNode;
+                n->properties.insert(QString::fromUtf8(data + instr.dataIdx), n2);
+                nodes.push(n2);
+                processingSet = true;
+            }
+            break;
+        }
+    }
+}
+
+bool QDeclarativeListModelParser::definesEmptyList(const QString &s)
+{
+    if (s.startsWith(QLatin1Char('[')) && s.endsWith(QLatin1Char(']'))) {
+        for (int i=1; i<s.length()-1; i++) {
+            if (!s[i].isSpace())
+                return false;
+        }
+        return true;
+    }
+    return false;
+}
+
+/*!
+    \qmlclass ListElement
+    \brief The ListElement element defines a data item in a ListModel.
+
+    \sa ListModel
+*/
+
+static void dump(ModelNode *node, int ind)
+{
+    QByteArray indentBa(ind * 4, ' ');
+    const char *indent = indentBa.constData();
+
+    for (int ii = 0; ii < node->values.count(); ++ii) {
+        ModelNode *subNode = qvariant_cast<ModelNode *>(node->values.at(ii));
+        if (subNode) {
+            qWarning().nospace() << indent << "Sub-node " << ii;
+            dump(subNode, ind + 1);
+        } else {
+            qWarning().nospace() << indent << "Sub-node " << ii << ": " << node->values.at(ii).toString();
+        }
+    }
+
+    for (QHash<QString, ModelNode *>::ConstIterator iter = node->properties.begin(); iter != node->properties.end(); ++iter) {
+        qWarning().nospace() << indent << "Property " << iter.key() << ':';
+        dump(iter.value(), ind + 1);
+    }
+}
+
+ModelNode::ModelNode()
+: modelCache(0), objectCache(0), isArray(false)
+{
+}
+
+ModelNode::~ModelNode()
+{
+    qDeleteAll(properties);
+    for (int ii = 0; ii < values.count(); ++ii) {
+        ModelNode *node = qvariant_cast<ModelNode *>(values.at(ii));
+        if (node) { delete node; node = 0; }
+    }
+    if (modelCache) { modelCache->_root = 0/* ==this */; delete modelCache; modelCache = 0; }
+    if (objectCache) { delete objectCache; }
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativelistmodel.moc>
diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h
new file mode 100644
index 0000000..251a31f
--- /dev/null
+++ b/src/declarative/util/qdeclarativelistmodel_p.h
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVELISTMODEL_H
+#define QDECLARATIVELISTMODEL_H
+
+#include <qdeclarative.h>
+#include <private/qdeclarativecustomparser_p.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
+#include "../3rdparty/qlistmodelinterface_p.h"
+#include <QtScript/qscriptvalue.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+struct ModelNode;
+class Q_DECLARATIVE_EXPORT QDeclarativeListModel : public QListModelInterface
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+
+public:
+    QDeclarativeListModel(QObject *parent=0);
+    ~QDeclarativeListModel();
+
+    virtual QList<int> roles() const;
+    virtual QString toString(int role) const;
+    virtual int count() const;
+    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
+    virtual QVariant data(int index, int role) const;
+
+    Q_INVOKABLE void clear();
+    Q_INVOKABLE void remove(int index);
+    Q_INVOKABLE void append(const QScriptValue&);
+    Q_INVOKABLE void insert(int index, const QScriptValue&);
+    Q_INVOKABLE QScriptValue get(int index) const;
+    Q_INVOKABLE void set(int index, const QScriptValue&);
+    Q_INVOKABLE void setProperty(int index, const QString& property, const QVariant& value);
+    Q_INVOKABLE void move(int from, int to, int count);
+
+Q_SIGNALS:
+    void countChanged(int);
+
+private:
+    QVariant valueForNode(ModelNode *) const;
+    mutable QStringList roleStrings;
+    friend class QDeclarativeListModelParser;
+    friend struct ModelNode;
+
+    void checkRoles() const;
+    void addRole(const QString &) const;
+    mutable bool _rolesOk;
+    ModelNode *_root;
+};
+
+// ### FIXME
+class QDeclarativeListElement : public QObject
+{
+Q_OBJECT
+};
+
+class QDeclarativeListModelParser : public QDeclarativeCustomParser
+{
+public:
+    QByteArray compile(const QList<QDeclarativeCustomParserProperty> &);
+    void setCustomData(QObject *, const QByteArray &);
+
+private:
+    struct ListInstruction
+    {
+        enum { Push, Pop, Value, Set } type;
+        int dataIdx;
+    };
+    struct ListModelData
+    {
+        int dataOffset;
+        int instrCount;
+        ListInstruction *instructions() const;
+    };
+    bool compileProperty(const QDeclarativeCustomParserProperty &prop, QList<ListInstruction> &instr, QByteArray &data);
+
+    bool definesEmptyList(const QString &);
+};
+
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeListModel)
+QML_DECLARE_TYPE(QDeclarativeListElement)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVELISTMODEL_H
diff --git a/src/declarative/util/qdeclarativenullablevalue_p_p.h b/src/declarative/util/qdeclarativenullablevalue_p_p.h
new file mode 100644
index 0000000..fc3f8af
--- /dev/null
+++ b/src/declarative/util/qdeclarativenullablevalue_p_p.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVENULLABLEVALUE_P_H
+#define QDECLARATIVENULLABLEVALUE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+QT_BEGIN_NAMESPACE
+
+template<typename T>
+struct QDeclarativeNullableValue 
+{
+    QDeclarativeNullableValue()
+    : isNull(true), value(T()) {}
+    QDeclarativeNullableValue(const QDeclarativeNullableValue<T> &o)
+    : isNull(o.isNull), value(o.value) {}
+    QDeclarativeNullableValue(const T &t)
+    : isNull(false), value(t) {}
+    QDeclarativeNullableValue<T> &operator=(const T &t)
+    { isNull = false; value = t; return *this; }
+    QDeclarativeNullableValue<T> &operator=(const QDeclarativeNullableValue<T> &o)
+    { isNull = o.isNull; value = o.value; return *this; }
+    operator T() const { return value; }
+
+    void invalidate() { isNull = true; }
+    bool isValid() const { return !isNull; }
+    bool isNull;
+    T value;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVENULLABLEVALUE_P_H
diff --git a/src/declarative/util/qdeclarativenumberformatter.cpp b/src/declarative/util/qdeclarativenumberformatter.cpp
new file mode 100644
index 0000000..5d81958
--- /dev/null
+++ b/src/declarative/util/qdeclarativenumberformatter.cpp
@@ -0,0 +1,261 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativenumberformatter_p.h"
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+//TODO: set locale
+//      docs
+//      this is a wrapper around qnumberformat (test integration)
+//      if number or format haven't been explictly set, text should be an empty string
+
+class QDeclarativeNumberFormatterPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeNumberFormatter)
+public:
+    QDeclarativeNumberFormatterPrivate() : locale(QLocale::system()), number(0), componentComplete(true) {}
+
+    void updateText();
+
+    QLocale locale;
+    QString format;
+    QNumberFormat numberFormat;
+    QString text;
+    qreal number;
+    bool componentComplete;
+};
+/*!
+    \qmlclass NumberFormatter
+  \since 4.7
+    \brief The NumberFormatter allows you to control the format of a number string.
+
+    The format property documentation has more details on how the format can be manipulated.
+
+    In the following example, the text element will display the text "1,234.57".
+    \code
+    NumberFormatter { id: formatter; number: 1234.5678; format: "##,##0.##" }
+    Text { text: formatter.text }
+    \endcode
+
+    */
+/*!
+    \internal
+    \class QDeclarativeNumberFormatter
+    \ingroup group_utility
+    \brief The QDeclarativeNumberFormatter class allows you to format a number to a particular string format/locale specific number format.
+*/
+
+QDeclarativeNumberFormatter::QDeclarativeNumberFormatter(QObject *parent)
+: QObject(*(new QDeclarativeNumberFormatterPrivate), parent) 
+{
+}
+
+QDeclarativeNumberFormatter::~QDeclarativeNumberFormatter()
+{
+}
+
+/*!
+    \qmlproperty string NumberFormatter::text
+
+    The number in the specified format.
+
+    If no format is specified the text will be empty.
+*/
+
+QString QDeclarativeNumberFormatter::text() const
+{
+    Q_D(const QDeclarativeNumberFormatter);
+    return d->text;
+}
+
+/*!
+    \qmlproperty real NumberFormatter::number
+   
+    A single point precision number. (Doubles are not yet supported)
+
+*/
+qreal QDeclarativeNumberFormatter::number() const
+{
+    Q_D(const QDeclarativeNumberFormatter);
+    return d->number;
+}
+
+/*!
+    \qmlproperty string NumberFormatter::format
+
+    The particular format the number will adhere to during the conversion to text.
+
+    The format syntax follows a style similar to the Unicode Standard (UTS35).
+
+    The table below shows the characters, patterns that can be used in the format.
+
+    \table
+    \header
+        \o Character
+        \o Meaning
+    \row
+        \o #
+        \o Any digit(s), zero shows as absent (for leading/trailing zeroes).
+    \row
+        \o 0
+        \o Implicit digit. Zero will show in the case that the input number is too small.
+    \row
+        \o .
+        \o Decimal separator. Output decimal seperator will be dependant on system locale.
+    \row
+        \o ,
+        \o Grouping separator. The number of digits (either #, or 0) between the grouping separator and the decimal (or the rightmost digit) will determine the groupingSize).
+    \row
+        \o other
+        \o Any other character will be taken as a string literal and placed directly into the output string.
+    \endtable
+    
+    Invalid formats will not guarantee a meaningful text output.
+    
+    \note Input numbers that are too long for the given format will be rounded dependent on precison based on the position of the decimal point.
+    
+    The following table illustrates the output text created by applying some examples of numeric formats to the formatter.
+
+    \table
+    \header
+        \o Format
+        \o Number
+        \o Output
+    \row
+        \o ###
+        \o 123456
+        \o  123456
+    \row
+        \o  000
+        \o  123456
+        \o  123456
+    \row
+        \o  ######
+        \o  1234
+        \o  1234
+    \row
+        \o  000000
+        \o  1234
+        \o  001234
+    \row
+        \o  ##,##0.##
+        \o  1234.456
+        \o  1,234.46 (for US locale)
+        \codeline 1 234,46 (for FR locale)
+    \row
+        \o  000000,000.#
+        \o  123456
+        \o  000,123,456 (for US locale)
+        \codeline 000 123 456 (for FR locale)
+    \row
+        \o  0.0###
+        \o  0.999997
+        \o  1.0
+    \row
+        \o  (000) 000 - 000
+        \o  12345678
+        \o  (012) 345 - 678
+    \row
+        \o  #A
+        \o 12
+        \o 12A
+    \endtable
+
+*/
+QString QDeclarativeNumberFormatter::format() const
+{
+    Q_D(const QDeclarativeNumberFormatter);
+    return d->format;
+}
+
+void QDeclarativeNumberFormatter::setNumber(const qreal &number)
+{
+    Q_D(QDeclarativeNumberFormatter);
+    if (d->number == number)
+        return;
+    d->number = number;
+    d->updateText();
+}
+
+void QDeclarativeNumberFormatter::setFormat(const QString &format)
+{
+    Q_D(QDeclarativeNumberFormatter);
+    //no format checking
+    if (format.isEmpty()) 
+        d->format = QString::null; 
+    else
+        d->format = format;
+    d->updateText();
+}
+
+void QDeclarativeNumberFormatterPrivate::updateText()
+{
+    Q_Q(QDeclarativeNumberFormatter);
+    if (!componentComplete)
+        return;
+
+    QNumberFormat tempFormat;
+    tempFormat.setFormat(format);
+    tempFormat.setNumber(number);
+
+    text = tempFormat.text();
+    
+    emit q->textChanged();
+}
+
+void QDeclarativeNumberFormatter::classBegin()
+{
+    Q_D(QDeclarativeNumberFormatter);
+    d->componentComplete = false;
+}
+
+void QDeclarativeNumberFormatter::componentComplete()
+{
+    Q_D(QDeclarativeNumberFormatter);
+    d->componentComplete = true;
+    d->updateText();
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativenumberformatter_p.h b/src/declarative/util/qdeclarativenumberformatter_p.h
new file mode 100644
index 0000000..3b8c7e1
--- /dev/null
+++ b/src/declarative/util/qdeclarativenumberformatter_p.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVENUMBERFORMATTER_H
+#define QDECLARATIVENUMBERFORMATTER_H
+
+#include "qnumberformat_p.h"
+
+#include <qdeclarative.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeNumberFormatterPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeNumberFormatter : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativeParserStatus)
+
+    Q_PROPERTY(QString text READ text NOTIFY textChanged)
+    Q_PROPERTY(QString format READ format WRITE setFormat)
+    Q_PROPERTY(qreal number READ number WRITE setNumber)
+public:
+    QDeclarativeNumberFormatter(QObject *parent=0);
+    ~QDeclarativeNumberFormatter();
+
+    QString text() const;
+
+    qreal number() const;
+    void setNumber(const qreal &);
+
+    QString format() const;
+    void setFormat(const QString &);
+
+    virtual void classBegin();
+    virtual void componentComplete();
+
+Q_SIGNALS:
+    void textChanged();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeNumberFormatter)
+    Q_DECLARE_PRIVATE(QDeclarativeNumberFormatter)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeNumberFormatter)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp
new file mode 100644
index 0000000..8c23354
--- /dev/null
+++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp
@@ -0,0 +1,355 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeopenmetaobject_p.h"
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativedeclarativedata_p.h"
+#include <qmetaobjectbuilder_p.h>
+#include <qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+
+class QDeclarativeOpenMetaObjectTypePrivate
+{
+public:
+    QDeclarativeOpenMetaObjectTypePrivate() : mem(0), cache(0), engine(0) {}
+
+    void init(const QMetaObject *metaObj);
+
+    int propertyOffset;
+    int signalOffset;
+    QHash<QByteArray, int> names;
+    QMetaObjectBuilder mob;
+    QMetaObject *mem;
+    QDeclarativePropertyCache *cache;
+    QDeclarativeEngine *engine;
+    QSet<QDeclarativeOpenMetaObject*> referers;
+};
+
+QDeclarativeOpenMetaObjectType::QDeclarativeOpenMetaObjectType(const QMetaObject *base, QDeclarativeEngine *engine)
+    : d(new QDeclarativeOpenMetaObjectTypePrivate)
+{
+    d->engine = engine;
+    d->init(base);
+}
+
+QDeclarativeOpenMetaObjectType::~QDeclarativeOpenMetaObjectType()
+{
+    if (d->mem)
+        qFree(d->mem);
+    if (d->cache)
+        d->cache->release();
+    delete d;
+}
+
+
+int QDeclarativeOpenMetaObjectType::propertyOffset() const
+{
+    return d->propertyOffset;
+}
+
+int QDeclarativeOpenMetaObjectType::signalOffset() const
+{
+    return d->signalOffset;
+}
+
+int QDeclarativeOpenMetaObjectType::createProperty(const QByteArray &name)
+{
+    int id = d->mob.propertyCount();
+    d->mob.addSignal("__" + QByteArray::number(id) + "()");
+    QMetaPropertyBuilder build = d->mob.addProperty(name, "QVariant", id);
+    build.setDynamic(true);
+    propertyCreated(id, build);
+    qFree(d->mem);
+    d->mem = d->mob.toMetaObject();
+    d->names.insert(name, id);
+    QSet<QDeclarativeOpenMetaObject*>::iterator it = d->referers.begin();
+    while (it != d->referers.end()) {
+        QDeclarativeOpenMetaObject *omo = *it;
+        *static_cast<QMetaObject *>(omo) = *d->mem;
+        if (d->cache)
+            d->cache->update(d->engine, omo);
+        ++it;
+    }
+
+    return d->propertyOffset + id;
+}
+
+void QDeclarativeOpenMetaObjectType::propertyCreated(int id, QMetaPropertyBuilder &builder)
+{
+    if (d->referers.count())
+        (*d->referers.begin())->propertyCreated(id, builder);
+}
+
+void QDeclarativeOpenMetaObjectTypePrivate::init(const QMetaObject *metaObj)
+{
+    if (!mem) {
+        mob.setSuperClass(metaObj);
+        mob.setClassName(metaObj->className());
+        mob.setFlags(QMetaObjectBuilder::DynamicMetaObject);
+
+        mem = mob.toMetaObject();
+
+        propertyOffset = mem->propertyOffset();
+        signalOffset = mem->methodOffset();
+    }
+}
+
+//----------------------------------------------------------------------------
+
+class QDeclarativeOpenMetaObjectPrivate
+{
+public:
+    QDeclarativeOpenMetaObjectPrivate(QDeclarativeOpenMetaObject *_q)
+        : q(_q), parent(0), type(0), cacheProperties(false) {}
+
+    inline QVariant &getData(int idx) {
+        while (data.count() <= idx)
+            data << QPair<QVariant, bool>(QVariant(), false);
+        QPair<QVariant, bool> &prop = data[idx];
+        if (!prop.second) {
+            prop.first = q->initialValue(idx);
+            prop.second = true;
+        }
+        return prop.first;
+    }
+
+    inline void writeData(int idx, const QVariant &value) {
+        while (data.count() <= idx)
+            data << QPair<QVariant, bool>(QVariant(), false);
+        QPair<QVariant, bool> &prop = data[idx];
+        prop.first = value;
+        prop.second = true;
+    }
+
+    bool autoCreate;
+    QDeclarativeOpenMetaObject *q;
+    QAbstractDynamicMetaObject *parent;
+    QList<QPair<QVariant, bool> > data;
+    QObject *object;
+    QDeclarativeOpenMetaObjectType *type;
+    bool cacheProperties;
+};
+
+QDeclarativeOpenMetaObject::QDeclarativeOpenMetaObject(QObject *obj, bool automatic)
+: d(new QDeclarativeOpenMetaObjectPrivate(this))
+{
+    d->autoCreate = automatic;
+    d->object = obj;
+
+    d->type = new QDeclarativeOpenMetaObjectType(obj->metaObject(), 0);
+    d->type->d->referers.insert(this);
+
+    QObjectPrivate *op = QObjectPrivate::get(obj);
+    *static_cast<QMetaObject *>(this) = *d->type->d->mem;
+    op->metaObject = this;
+}
+
+QDeclarativeOpenMetaObject::QDeclarativeOpenMetaObject(QObject *obj, QDeclarativeOpenMetaObjectType *type, bool automatic)
+: d(new QDeclarativeOpenMetaObjectPrivate(this))
+{
+    d->autoCreate = automatic;
+    d->object = obj;
+
+    d->type = type;
+    d->type->addref();
+    d->type->d->referers.insert(this);
+
+    QObjectPrivate *op = QObjectPrivate::get(obj);
+    *static_cast<QMetaObject *>(this) = *d->type->d->mem;
+    op->metaObject = this;
+}
+
+QDeclarativeOpenMetaObject::~QDeclarativeOpenMetaObject()
+{
+    if (d->parent)
+        delete d->parent;
+    d->type->d->referers.remove(this);
+    d->type->release();
+    delete d;
+}
+
+QDeclarativeOpenMetaObjectType *QDeclarativeOpenMetaObject::type() const
+{
+    return d->type;
+}
+
+int QDeclarativeOpenMetaObject::metaCall(QMetaObject::Call c, int id, void **a)
+{
+    if (( c == QMetaObject::ReadProperty || c == QMetaObject::WriteProperty)
+            && id >= d->type->d->propertyOffset) {
+        int propId = id - d->type->d->propertyOffset;
+        if (c == QMetaObject::ReadProperty) {
+            propertyRead(propId);
+            *reinterpret_cast<QVariant *>(a[0]) = d->getData(propId);
+        } else if (c == QMetaObject::WriteProperty) {
+            if (d->data[propId].first != *reinterpret_cast<QVariant *>(a[0]))  {
+                propertyWrite(propId);
+                d->writeData(propId, *reinterpret_cast<QVariant *>(a[0]));
+                activate(d->object, d->type->d->signalOffset + propId, 0);
+            }
+        } 
+        return -1;
+    } else {
+        if (d->parent)
+            return d->parent->metaCall(c, id, a);
+        else
+            return d->object->qt_metacall(c, id, a);
+    }
+}
+
+QAbstractDynamicMetaObject *QDeclarativeOpenMetaObject::parent() const
+{
+    return d->parent;
+}
+
+QVariant QDeclarativeOpenMetaObject::value(int id) const
+{
+    return d->getData(id);
+}
+
+void QDeclarativeOpenMetaObject::setValue(int id, const QVariant &value)
+{
+    d->writeData(id, value);
+    activate(d->object, id + d->type->d->signalOffset, 0);
+}
+
+QVariant QDeclarativeOpenMetaObject::value(const QByteArray &name) const
+{
+    QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name);
+    if (iter == d->type->d->names.end())
+        return QVariant();
+
+    return d->getData(*iter);
+}
+
+QVariant &QDeclarativeOpenMetaObject::operator[](const QByteArray &name)
+{
+    QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name);
+    Q_ASSERT(iter != d->type->d->names.end());
+
+    return d->getData(*iter);
+}
+
+void QDeclarativeOpenMetaObject::setValue(const QByteArray &name, const QVariant &val)
+{
+    QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name);
+
+    int id = -1;
+    if (iter == d->type->d->names.end()) {
+        id = d->type->createProperty(name.constData()) - d->type->d->propertyOffset;
+    } else {
+        id = *iter;
+    }
+
+    QVariant &dataVal = d->getData(id);
+    if (dataVal == val)
+        return;
+
+    dataVal = val;
+    activate(d->object, id + d->type->d->signalOffset, 0);
+}
+
+void QDeclarativeOpenMetaObject::setCached(bool c)
+{
+    if (c == d->cacheProperties || !d->type->d->engine)
+        return;
+
+    d->cacheProperties = c;
+
+    QDeclarativeDeclarativeData *qmldata = QDeclarativeDeclarativeData::get(d->object, true);
+    if (d->cacheProperties) {
+        if (!d->type->d->cache)
+            d->type->d->cache = QDeclarativePropertyCache::create(d->type->d->engine, this);
+        qmldata->propertyCache = d->type->d->cache;
+        d->type->d->cache->addref();
+    } else {
+        if (d->type->d->cache)
+            d->type->d->cache->release();
+        qmldata->propertyCache = 0;
+    }
+}
+
+
+int QDeclarativeOpenMetaObject::createProperty(const char *name, const char *)
+{
+    if (d->autoCreate)
+        return d->type->createProperty(name);
+    else
+        return -1;
+}
+
+void QDeclarativeOpenMetaObject::propertyRead(int)
+{
+}
+
+void QDeclarativeOpenMetaObject::propertyWrite(int)
+{
+}
+
+void QDeclarativeOpenMetaObject::propertyCreated(int, QMetaPropertyBuilder &)
+{
+}
+
+QVariant QDeclarativeOpenMetaObject::initialValue(int)
+{
+    return QVariant();
+}
+
+int QDeclarativeOpenMetaObject::count() const
+{
+    return d->type->d->names.count();
+}
+
+QByteArray QDeclarativeOpenMetaObject::name(int idx) const
+{
+    Q_ASSERT(idx >= 0 && idx < d->type->d->names.count());
+
+    return d->type->d->mob.property(idx).name();
+}
+
+QObject *QDeclarativeOpenMetaObject::object() const
+{
+    return d->object;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeopenmetaobject_p.h b/src/declarative/util/qdeclarativeopenmetaobject_p.h
new file mode 100644
index 0000000..ec5ac17
--- /dev/null
+++ b/src/declarative/util/qdeclarativeopenmetaobject_p.h
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEOPENMETAOBJECT_H
+#define QDECLARATIVEOPENMETAOBJECT_H
+
+#include <private/qdeclarativerefcount_p.h>
+#include <QtCore/QMetaObject>
+#include <QtCore/QObject>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeEngine;
+class QMetaPropertyBuilder;
+class QDeclarativeOpenMetaObjectTypePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeOpenMetaObjectType : public QDeclarativeRefCount
+{
+public:
+    QDeclarativeOpenMetaObjectType(const QMetaObject *base, QDeclarativeEngine *engine);
+    ~QDeclarativeOpenMetaObjectType();
+
+    int createProperty(const QByteArray &name);
+
+    int propertyOffset() const;
+    int signalOffset() const;
+
+protected:
+    virtual void propertyCreated(int, QMetaPropertyBuilder &);
+
+private:
+    QDeclarativeOpenMetaObjectTypePrivate *d;
+    friend class QDeclarativeOpenMetaObject;
+    friend class QDeclarativeOpenMetaObjectPrivate;
+};
+
+class QDeclarativeOpenMetaObjectPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeOpenMetaObject : public QAbstractDynamicMetaObject
+{
+public:
+    QDeclarativeOpenMetaObject(QObject *, bool = true);
+    QDeclarativeOpenMetaObject(QObject *, QDeclarativeOpenMetaObjectType *, bool = true);
+    ~QDeclarativeOpenMetaObject();
+
+    QVariant value(const QByteArray &) const;
+    void setValue(const QByteArray &, const QVariant &);
+    QVariant value(int) const;
+    void setValue(int, const QVariant &);
+    QVariant &operator[](const QByteArray &);
+
+    int count() const;
+    QByteArray name(int) const;
+
+    QObject *object() const;
+    virtual QVariant initialValue(int);
+
+    // Be careful - once setCached(true) is called createProperty() is no
+    // longer automatically called for new properties.
+    void setCached(bool);
+
+    QDeclarativeOpenMetaObjectType *type() const;
+
+protected:
+    virtual int metaCall(QMetaObject::Call _c, int _id, void **_a);
+    virtual int createProperty(const char *, const char *);
+
+    virtual void propertyRead(int);
+    virtual void propertyWrite(int);
+    virtual void propertyCreated(int, QMetaPropertyBuilder &);
+
+    QAbstractDynamicMetaObject *parent() const;
+
+private:
+    QDeclarativeOpenMetaObjectPrivate *d;
+    friend class QDeclarativeOpenMetaObjectType;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEOPENMETAOBJECT_H
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp
new file mode 100644
index 0000000..356d7a1
--- /dev/null
+++ b/src/declarative/util/qdeclarativepackage.cpp
@@ -0,0 +1,167 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepackage_p.h"
+
+#include <private/qobject_p.h>
+#include "private/qdeclarativeguard_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativePackagePrivate : public QObjectPrivate
+{
+public:
+    QDeclarativePackagePrivate() {}
+
+    struct DataGuard : public QDeclarativeGuard<QObject>
+    {
+        DataGuard(QObject *obj, QList<DataGuard> *l) : list(l) { (QDeclarativeGuard<QObject>&)*this = obj; }
+        QList<DataGuard> *list;
+        void objectDestroyed(QObject *) {
+            // we assume priv will always be destroyed after objectDestroyed calls
+            list->removeOne(*this);
+        }
+    };
+
+    QList<DataGuard> dataList;
+    static void data_append(QDeclarativeListProperty<QObject> *prop, QObject *o) {
+        QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
+        list->append(DataGuard(o, list));
+    }
+    static void data_clear(QDeclarativeListProperty<QObject> *prop) {
+        QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
+        list->clear();
+    }
+    static QObject *data_at(QDeclarativeListProperty<QObject> *prop, int index) {
+        QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
+        return list->at(index);
+    }
+    static int data_count(QDeclarativeListProperty<QObject> *prop) {
+        QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
+        return list->count();
+    }
+};
+
+QHash<QObject *, QDeclarativePackageAttached *> QDeclarativePackageAttached::attached;
+
+QDeclarativePackageAttached::QDeclarativePackageAttached(QObject *parent)
+: QObject(parent)
+{
+    attached.insert(parent, this);
+}
+
+QDeclarativePackageAttached::~QDeclarativePackageAttached()
+{
+    attached.remove(parent());
+}
+
+QString QDeclarativePackageAttached::name() const 
+{ 
+    return _name; 
+}
+
+void QDeclarativePackageAttached::setName(const QString &n) 
+{ 
+    _name = n; 
+}
+
+QDeclarativePackage::QDeclarativePackage(QObject *parent)
+    : QObject(*(new QDeclarativePackagePrivate), parent)
+{
+}
+
+QDeclarativePackage::~QDeclarativePackage()
+{
+    Q_D(QDeclarativePackage);
+    for (int ii = 0; ii < d->dataList.count(); ++ii) {
+        QObject *obj = d->dataList.at(ii);
+        obj->setParent(this);
+    }
+}
+
+QDeclarativeListProperty<QObject> QDeclarativePackage::data()
+{
+    Q_D(QDeclarativePackage);
+    return QDeclarativeListProperty<QObject>(this, &d->dataList, QDeclarativePackagePrivate::data_append, 
+                                                        QDeclarativePackagePrivate::data_count, 
+                                                        QDeclarativePackagePrivate::data_at, 
+                                                        QDeclarativePackagePrivate::data_clear);
+}
+
+bool QDeclarativePackage::hasPart(const QString &name)
+{
+    Q_D(QDeclarativePackage);
+    for (int ii = 0; ii < d->dataList.count(); ++ii) {
+        QObject *obj = d->dataList.at(ii);
+        QDeclarativePackageAttached *a = QDeclarativePackageAttached::attached.value(obj);
+        if (a && a->name() == name)
+            return true;
+    }
+    return false;
+}
+
+QObject *QDeclarativePackage::part(const QString &name)
+{
+    Q_D(QDeclarativePackage);
+    if (name.isEmpty() && !d->dataList.isEmpty())
+        return d->dataList.at(0);
+
+    for (int ii = 0; ii < d->dataList.count(); ++ii) {
+        QObject *obj = d->dataList.at(ii);
+        QDeclarativePackageAttached *a = QDeclarativePackageAttached::attached.value(obj);
+        if (a && a->name() == name)
+            return obj;
+    }
+
+    if (name == QLatin1String("default") && !d->dataList.isEmpty())
+        return d->dataList.at(0);
+
+    return 0;
+}
+
+QDeclarativePackageAttached *QDeclarativePackage::qmlAttachedProperties(QObject *o)
+{
+    return new QDeclarativePackageAttached(o);
+}
+
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativepackage_p.h b/src/declarative/util/qdeclarativepackage_p.h
new file mode 100644
index 0000000..87d9b80
--- /dev/null
+++ b/src/declarative/util/qdeclarativepackage_p.h
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPACKAGE_H
+#define QDECLARATIVEPACKAGE_H
+
+#include <qdeclarative.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+/*****************************************************************************
+ *****************************************************************************
+ XXX Experimental
+ *****************************************************************************
+*****************************************************************************/
+
+class QDeclarativePackagePrivate;
+class QDeclarativePackageAttached;
+class QDeclarativePackage : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativePackage)
+
+    Q_CLASSINFO("DefaultProperty", "data")
+    Q_PROPERTY(QDeclarativeListProperty<QObject> data READ data SCRIPTABLE false)
+
+public:
+    QDeclarativePackage(QObject *parent=0);
+    virtual ~QDeclarativePackage();
+
+    QDeclarativeListProperty<QObject> data();
+
+    QObject *part(const QString & = QString());
+    bool hasPart(const QString &);
+
+    static QDeclarativePackageAttached *qmlAttachedProperties(QObject *);
+};
+
+class QDeclarativePackageAttached : public QObject
+{
+Q_OBJECT
+Q_PROPERTY(QString name READ name WRITE setName)
+public:
+    QDeclarativePackageAttached(QObject *parent);
+    virtual ~QDeclarativePackageAttached();
+
+    QString name() const;
+    void setName(const QString &n);
+
+    static QHash<QObject *, QDeclarativePackageAttached *> attached;
+private:
+    QString _name;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativePackage)
+QML_DECLARE_TYPEINFO(QDeclarativePackage, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPACKAGE_H
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
new file mode 100644
index 0000000..c4b07cc
--- /dev/null
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -0,0 +1,611 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepixmapcache_p.h"
+#include "qdeclarativenetworkaccessmanagerfactory.h"
+#include "qdeclarativeimageprovider.h"
+
+#include "qfxperf_p_p.h"
+
+#include <qdeclarativeengine.h>
+#include <private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativeengine_p.h>
+
+#include <QCoreApplication>
+#include <QImageReader>
+#include <QHash>
+#include <QNetworkReply>
+#include <QPixmapCache>
+#include <QFile>
+#include <QThread>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QtCore/qdebug.h>
+#include <private/qobject_p.h>
+#include <QSslError>
+
+#ifdef Q_OS_LINUX
+#include <pthread.h>
+#include <linux/sched.h>
+#endif
+
+// Maximum number of simultaneous image requests to send.
+static const int maxImageRequestCount = 8;
+
+QT_BEGIN_NAMESPACE
+
+#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0))
+inline uint qHash(const QUrl &uri)
+{
+    return qHash(uri.toEncoded(QUrl::FormattingOption(0x100)));
+}
+#endif
+
+class QDeclarativeImageReaderEvent : public QEvent
+{
+public:
+    enum ReadError { NoError, Loading, Decoding };
+
+    QDeclarativeImageReaderEvent(QDeclarativeImageReaderEvent::ReadError err, const QString &errStr, const QImage &img)
+        : QEvent(QEvent::User), error(err), errorString(errStr), image(img) {}
+
+    ReadError error;
+    QString errorString;
+    QImage image;
+};
+
+class QDeclarativeImageRequestHandler;
+class QDeclarativeImageReader : public QThread
+{
+    Q_OBJECT
+public:
+    QDeclarativeImageReader(QDeclarativeEngine *eng);
+    ~QDeclarativeImageReader();
+
+    QDeclarativePixmapReply *getImage(const QUrl &url);
+    void cancel(QDeclarativePixmapReply *rep);
+
+    static QDeclarativeImageReader *instance(QDeclarativeEngine *engine);
+
+protected:
+    void run();
+
+private:
+    QList<QDeclarativePixmapReply*> jobs;
+    QList<QDeclarativePixmapReply*> cancelled;
+    QDeclarativeEngine *engine;
+    QDeclarativeImageRequestHandler *handler;
+    QMutex mutex;
+
+    static QHash<QDeclarativeEngine *,QDeclarativeImageReader*> readers;
+    static QMutex readerMutex;
+    friend class QDeclarativeImageRequestHandler;
+};
+
+QHash<QDeclarativeEngine *,QDeclarativeImageReader*> QDeclarativeImageReader::readers;
+QMutex QDeclarativeImageReader::readerMutex;
+
+
+class QDeclarativeImageRequestHandler : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeImageRequestHandler(QDeclarativeImageReader *read, QDeclarativeEngine *eng)
+        : QObject(), accessManager(0), engine(eng), reader(read)
+    {
+        QCoreApplication::postEvent(this, new QEvent(QEvent::User));
+    }
+
+    QDeclarativePixmapReply *getImage(const QUrl &url);
+    void cancel(QDeclarativePixmapReply *reply);
+
+protected:
+    bool event(QEvent *event);
+
+private slots:
+    void networkRequestDone();
+
+private:
+    QNetworkAccessManager *networkAccessManager() {
+        if (!accessManager)
+            accessManager = QDeclarativeEnginePrivate::get(engine)->createNetworkAccessManager(this);
+        return accessManager;
+    }
+
+    QHash<QNetworkReply*,QDeclarativePixmapReply*> replies;
+    QNetworkAccessManager *accessManager;
+    QDeclarativeEngine *engine;
+    QDeclarativeImageReader *reader;
+};
+
+//===========================================================================
+
+bool QDeclarativeImageRequestHandler::event(QEvent *event)
+{
+    if (event->type() == QEvent::User) {
+        static int replyDownloadProgress = -1;
+        static int replyFinished = -1;
+        static int downloadProgress = -1;
+        static int thisNetworkRequestDone = -1;
+
+        if (replyDownloadProgress == -1) {
+            replyDownloadProgress = QNetworkReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)");
+            replyFinished = QNetworkReply::staticMetaObject.indexOfSignal("finished()");
+            downloadProgress = QDeclarativePixmapReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)");
+            thisNetworkRequestDone = QDeclarativeImageRequestHandler::staticMetaObject.indexOfSlot("networkRequestDone()");
+        }
+
+        while (1) {
+            reader->mutex.lock();
+
+            if (reader->cancelled.count()) {
+                for (int i = 0; i < reader->cancelled.count(); ++i) {
+                    QDeclarativePixmapReply *job = reader->cancelled.at(i);
+                    // cancel any jobs already started
+                    QNetworkReply *reply = replies.key(job, 0);
+                    if (reply && reply->isRunning()) {
+                        replies.remove(reply);
+                        reply->close();
+                    }
+                    // remove from pending job list
+                    for (int j = 0; j < reader->jobs.count(); ++j) {
+                        if (reader->jobs.at(j) == job) {
+                            reader->jobs.removeAt(j);
+                            job->release(true);
+                            break;
+                        }
+                    }
+                }
+                reader->cancelled.clear();
+            }
+
+            if (!reader->jobs.count() || replies.count() > maxImageRequestCount) {
+                reader->mutex.unlock();
+                break;
+            }
+
+            QDeclarativePixmapReply *runningJob = reader->jobs.takeLast();
+            QUrl url = runningJob->url();
+            reader->mutex.unlock();
+
+            // fetch
+            if (url.scheme() == QLatin1String("image")) {
+                QImage image = QDeclarativeEnginePrivate::get(engine)->getImageFromProvider(url);
+                QDeclarativeImageReaderEvent::ReadError errorCode = QDeclarativeImageReaderEvent::NoError;
+                QString errorStr;
+                if (image.isNull()) {
+                    errorCode = QDeclarativeImageReaderEvent::Loading;
+                    errorStr = QLatin1String("Failed to get image from provider: ") + url.toString();
+                }
+                QCoreApplication::postEvent(runningJob, new QDeclarativeImageReaderEvent(errorCode, errorStr, image));
+            } else {
+                QNetworkRequest req(url);
+                req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
+                QNetworkReply *reply = networkAccessManager()->get(req);
+
+                QMetaObject::connect(reply, replyDownloadProgress, runningJob, downloadProgress);
+                QMetaObject::connect(reply, replyFinished, this, thisNetworkRequestDone);
+
+                replies.insert(reply, runningJob);
+            }
+        }
+        return true;
+    }
+
+    return QObject::event(event);
+}
+
+void QDeclarativeImageRequestHandler::networkRequestDone()
+{
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    QDeclarativePixmapReply *job = replies.take(reply);
+    if (job) {
+        QImage image;
+        QDeclarativeImageReaderEvent::ReadError error;
+        QString errorString;
+        if (reply->error()) {
+            error = QDeclarativeImageReaderEvent::Loading;
+            errorString = reply->errorString();
+        } else {
+            QImageReader imgio(reply);
+            if (imgio.read(&image)) {
+                error = QDeclarativeImageReaderEvent::NoError;
+            } else {
+                errorString = QLatin1String("Error decoding: ") + reply->url().toString()
+                              + QLatin1String(" \"") + imgio.errorString() + QLatin1String("\"");
+                error = QDeclarativeImageReaderEvent::Decoding;
+            }
+        }
+        // send completion event to the QDeclarativePixmapReply
+        QCoreApplication::postEvent(job, new QDeclarativeImageReaderEvent(error, errorString, image));
+    }
+    // kick off event loop again if we have dropped below max request count
+    if (replies.count() == maxImageRequestCount)
+        QCoreApplication::postEvent(this, new QEvent(QEvent::User));
+    reply->deleteLater();
+}
+
+//===========================================================================
+
+QDeclarativeImageReader::QDeclarativeImageReader(QDeclarativeEngine *eng)
+    : QThread(eng), engine(eng), handler(0)
+{
+    start(QThread::LowPriority);
+}
+
+QDeclarativeImageReader::~QDeclarativeImageReader()
+{
+    readerMutex.lock();
+    readers.remove(engine);
+    readerMutex.unlock();
+
+    quit();
+    wait();
+}
+
+QDeclarativeImageReader *QDeclarativeImageReader::instance(QDeclarativeEngine *engine)
+{
+    readerMutex.lock();
+    QDeclarativeImageReader *reader = readers.value(engine);
+    if (!reader) {
+        reader = new QDeclarativeImageReader(engine);
+        readers.insert(engine, reader);
+    }
+    readerMutex.unlock();
+
+    return reader;
+}
+
+QDeclarativePixmapReply *QDeclarativeImageReader::getImage(const QUrl &url)
+{
+    mutex.lock();
+    QDeclarativePixmapReply *reply = new QDeclarativePixmapReply(this, url);
+    reply->addRef();
+    reply->setLoading();
+    jobs.append(reply);
+    if (jobs.count() == 1 && handler)
+        QCoreApplication::postEvent(handler, new QEvent(QEvent::User));
+    mutex.unlock();
+    return reply;
+}
+
+void QDeclarativeImageReader::cancel(QDeclarativePixmapReply *reply)
+{
+    mutex.lock();
+    if (reply->isLoading()) {
+        // Add to cancel list to be cancelled in reader thread.
+        cancelled.append(reply);
+        if (cancelled.count() == 1 && handler)
+            QCoreApplication::postEvent(handler, new QEvent(QEvent::User));
+    }
+    mutex.unlock();
+}
+
+void QDeclarativeImageReader::run()
+{
+#if defined(Q_OS_LINUX) && defined(SCHED_IDLE)
+    struct sched_param param;
+    int policy;
+
+    pthread_getschedparam(pthread_self(), &policy, &param);
+    pthread_setschedparam(pthread_self(), SCHED_IDLE, &param);
+#endif
+
+    handler = new QDeclarativeImageRequestHandler(this, engine);
+
+    exec();
+
+    delete handler;
+    handler = 0;
+}
+
+//===========================================================================
+
+static bool readImage(QIODevice *dev, QPixmap *pixmap, QString &errorString)
+{
+    QImageReader imgio(dev);
+
+//#define QT_TEST_SCALED_SIZE
+#ifdef QT_TEST_SCALED_SIZE
+    /*
+    Some mechanism is needed for loading images at a limited size, especially
+    for remote images. Loading only thumbnails of remote progressive JPEG
+    images can be efficient. (Qt jpeg handler does not do so currently)
+    */
+
+    QSize limit(60,60);
+    QSize sz = imgio.size();
+    if (sz.width() > limit.width() || sz.height() > limit.height()) {
+        sz.scale(limit,Qt::KeepAspectRatio);
+        imgio.setScaledSize(sz);
+    }
+#endif
+
+    QImage img;
+    if (imgio.read(&img)) {
+#ifdef QT_TEST_SCALED_SIZE
+        if (!sz.isValid())
+            img = img.scaled(limit,Qt::KeepAspectRatio);
+#endif
+        *pixmap = QPixmap::fromImage(img);
+        return true;
+    } else {
+        errorString = imgio.errorString();
+        return false;
+    }
+}
+
+/*!
+    \internal
+    \class QDeclarativePixmapCache
+    \brief Enacapsultes a pixmap for QDeclarativeGraphics items.
+
+    This class is NOT reentrant.
+ */
+
+static QString toLocalFileOrQrc(const QUrl& url)
+{
+    QString r = url.toLocalFile();
+    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
+        r = QLatin1Char(':') + url.path();
+    return r;
+}
+
+typedef QHash<QUrl, QDeclarativePixmapReply *> QDeclarativePixmapReplyHash;
+Q_GLOBAL_STATIC(QDeclarativePixmapReplyHash, qmlActivePixmapReplies);
+
+class QDeclarativePixmapReplyPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePixmapReply)
+
+public:
+    QDeclarativePixmapReplyPrivate(QDeclarativeImageReader *r, const QUrl &u)
+        : QObjectPrivate(), refCount(1), url(u), status(QDeclarativePixmapReply::Loading), loading(false), reader(r) {
+    }
+
+    int refCount;
+    QUrl url;
+    QPixmap pixmap; // ensure reference to pixmap so QPixmapCache does not discard
+    QDeclarativePixmapReply::Status status;
+    bool loading;
+    QDeclarativeImageReader *reader;
+};
+
+
+QDeclarativePixmapReply::QDeclarativePixmapReply(QDeclarativeImageReader *reader, const QUrl &url)
+  : QObject(*new QDeclarativePixmapReplyPrivate(reader, url), 0)
+{
+}
+
+QDeclarativePixmapReply::~QDeclarativePixmapReply()
+{
+}
+
+const QUrl &QDeclarativePixmapReply::url() const
+{
+    Q_D(const QDeclarativePixmapReply);
+    return d->url;
+}
+
+bool QDeclarativePixmapReply::event(QEvent *event)
+{
+    Q_D(QDeclarativePixmapReply);
+    if (event->type() == QEvent::User) {
+        d->loading = false;
+        if (!release(true)) {
+            QDeclarativeImageReaderEvent *de = static_cast<QDeclarativeImageReaderEvent*>(event);
+            d->status = (de->error == QDeclarativeImageReaderEvent::NoError) ? Ready : Error;
+            if (d->status == Ready)
+                d->pixmap = QPixmap::fromImage(de->image);
+            else
+                qWarning() << de->errorString;
+            QByteArray key = d->url.toEncoded(QUrl::FormattingOption(0x100));
+            QString strKey = QString::fromLatin1(key.constData(), key.count());
+            QPixmapCache::insert(strKey, d->pixmap); // note: may fail (returns false)
+            emit finished();
+        }
+        return true;
+    }
+
+    return QObject::event(event);
+}
+
+QDeclarativePixmapReply::Status QDeclarativePixmapReply::status() const
+{
+    Q_D(const QDeclarativePixmapReply);
+    return d->status;
+}
+
+bool QDeclarativePixmapReply::isLoading() const
+{
+    Q_D(const QDeclarativePixmapReply);
+    return d->loading;
+}
+
+void QDeclarativePixmapReply::setLoading()
+{
+    Q_D(QDeclarativePixmapReply);
+    d->loading = true;
+}
+
+void QDeclarativePixmapReply::addRef()
+{
+    Q_D(QDeclarativePixmapReply);
+    ++d->refCount;
+}
+
+bool QDeclarativePixmapReply::release(bool defer)
+{
+    Q_D(QDeclarativePixmapReply);
+    Q_ASSERT(d->refCount > 0);
+    --d->refCount;
+    if (d->refCount == 0) {
+        qmlActivePixmapReplies()->remove(d->url);
+        if (defer)
+            deleteLater();
+        else
+            delete this;
+        return true;
+    } else if (d->refCount == 1 && d->loading) {
+        // The only reference left is the reader thread.
+        qmlActivePixmapReplies()->remove(d->url);
+        d->reader->cancel(this);
+    }
+
+    return false;
+}
+
+/*!
+    Finds the cached pixmap corresponding to \a url.
+    If the image is a network resource and has not yet
+    been retrieved and cached, request() must be called.
+
+    Returns Ready, or Error if the image has been retrieved,
+    otherwise the current retrieval status.
+*/
+QDeclarativePixmapReply::Status QDeclarativePixmapCache::get(const QUrl& url, QPixmap *pixmap)
+{
+    QDeclarativePixmapReply::Status status = QDeclarativePixmapReply::Unrequested;
+
+#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
+    QString lf = toLocalFileOrQrc(url);
+    if (!lf.isEmpty()) {
+        status = QDeclarativePixmapReply::Ready;
+        if (!QPixmapCache::find(lf,pixmap)) {
+            QFile f(lf);
+            if (f.open(QIODevice::ReadOnly)) {
+                QString errorString;
+                if (!readImage(&f, pixmap, errorString)) {
+                    errorString = QLatin1String("Error decoding: ") + url.toString()
+                                  + QLatin1String(" \"") + errorString + QLatin1String("\"");
+                    qWarning() << errorString;
+                    *pixmap = QPixmap();
+                    status = QDeclarativePixmapReply::Error;
+                }
+            } else {
+                qWarning() << "Cannot open" << url;
+                *pixmap = QPixmap();
+                status = QDeclarativePixmapReply::Error;
+            }
+            if (status == QDeclarativePixmapReply::Ready)
+                QPixmapCache::insert(lf, *pixmap);
+        }
+        return status;
+    }
+#endif
+
+    QByteArray key = url.toEncoded(QUrl::FormattingOption(0x100));
+    QString strKey = QString::fromLatin1(key.constData(), key.count());
+    QDeclarativePixmapReplyHash::Iterator iter = qmlActivePixmapReplies()->find(url);
+    if (iter != qmlActivePixmapReplies()->end() && (*iter)->status() == QDeclarativePixmapReply::Ready) {
+        // Must check this, since QPixmapCache::insert may have failed.
+        *pixmap = (*iter)->d_func()->pixmap;
+        status = (*iter)->status();
+        (*iter)->release();
+    } else if (QPixmapCache::find(strKey, pixmap)) {
+        if (iter != qmlActivePixmapReplies()->end()) {
+            status = (*iter)->status();
+            (*iter)->release();
+        } else {
+            status = pixmap->isNull() ? QDeclarativePixmapReply::Error : QDeclarativePixmapReply::Ready;
+        }
+    } else if (iter != qmlActivePixmapReplies()->end()) {
+        status = QDeclarativePixmapReply::Loading;
+    }
+
+    return status;
+}
+
+/*!
+    Starts a network request to load \a url.
+
+    Returns a QDeclarativePixmapReply.  Caller should connect to QDeclarativePixmapReply::finished()
+    and call get() when the image is available.
+
+    The returned QDeclarativePixmapReply will be deleted when all request() calls are
+    matched by a corresponding get() call.
+*/
+QDeclarativePixmapReply *QDeclarativePixmapCache::request(QDeclarativeEngine *engine, const QUrl &url)
+{
+    QDeclarativePixmapReplyHash::Iterator iter = qmlActivePixmapReplies()->find(url);
+    if (iter == qmlActivePixmapReplies()->end()) {
+        QDeclarativeImageReader *reader = QDeclarativeImageReader::instance(engine);
+        QDeclarativePixmapReply *item = reader->getImage(url);
+        iter = qmlActivePixmapReplies()->insert(url, item);
+    } else {
+        (*iter)->addRef();
+    }
+
+    return (*iter);
+}
+
+/*!
+    Cancels a previous call to request().
+
+    May also cancel loading (eg. if no other pending request).
+
+    Any connections from the QDeclarativePixmapReply returned by request() to \a obj will be
+    disconnected.
+*/
+void QDeclarativePixmapCache::cancel(const QUrl& url, QObject *obj)
+{
+    QDeclarativePixmapReplyHash::Iterator iter = qmlActivePixmapReplies()->find(url);
+    if (iter == qmlActivePixmapReplies()->end())
+        return;
+
+    QDeclarativePixmapReply *reply = *iter;
+    if (obj)
+        QObject::disconnect(reply, 0, obj, 0);
+    reply->release();
+}
+
+/*!
+    This function is mainly for test verification. It returns the number of
+    requests that are still unfinished.
+*/
+int QDeclarativePixmapCache::pendingRequests()
+{
+    return qmlActivePixmapReplies()->count();
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativepixmapcache.moc>
diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/declarative/util/qdeclarativepixmapcache_p.h
new file mode 100644
index 0000000..c615254
--- /dev/null
+++ b/src/declarative/util/qdeclarativepixmapcache_p.h
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPIXMAPCACHE_H
+#define QDECLARATIVEPIXMAPCACHE_H
+
+#include <QtCore/QString>
+#include <QtGui/QPixmap>
+#include <QtCore/qurl.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+class QDeclarativeEngine;
+class QNetworkReply;
+class QDeclarativeImageReader;
+
+class QDeclarativePixmapReplyPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativePixmapReply : public QObject
+{
+    Q_OBJECT
+public:
+    ~QDeclarativePixmapReply();
+
+    enum Status { Ready, Error, Unrequested, Loading };
+    Status status() const;
+
+    const QUrl &url() const;
+
+Q_SIGNALS:
+    void finished();
+    void downloadProgress(qint64, qint64);
+
+protected:
+    bool event(QEvent *event);
+
+private:
+    void addRef();
+    bool release(bool defer=false);
+    bool isLoading() const;
+    void setLoading();
+
+private:
+    QDeclarativePixmapReply(QDeclarativeImageReader *reader, const QUrl &url);
+    Q_DISABLE_COPY(QDeclarativePixmapReply)
+    Q_DECLARE_PRIVATE(QDeclarativePixmapReply)
+    friend class QDeclarativeImageRequestHandler;
+    friend class QDeclarativeImageReader;
+    friend class QDeclarativePixmapCache;
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativePixmapCache
+{
+public:
+    static QDeclarativePixmapReply::Status get(const QUrl& url, QPixmap *pixmap);
+    static QDeclarativePixmapReply *request(QDeclarativeEngine *, const QUrl& url);
+    static void cancel(const QUrl& url, QObject *obj);
+    static int pendingRequests();
+};
+
+
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPIXMAPCACHE_H
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
new file mode 100644
index 0000000..5907ddb
--- /dev/null
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -0,0 +1,456 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepropertychanges_p.h"
+
+#include "qdeclarativeopenmetaobject_p.h"
+
+#include <qdeclarativeinfo.h>
+#include <qdeclarativecustomparser_p.h>
+#include <qdeclarativeparser_p.h>
+#include <qdeclarativeexpression.h>
+#include <qdeclarativebinding_p.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeguard_p.h>
+
+#include <QtCore/qdebug.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass PropertyChanges QDeclarativePropertyChanges
+  \since 4.7
+    \brief The PropertyChanges element describes new property values for a state.
+
+    PropertyChanges provides a state change that modifies the properties of an item.
+
+    Here is a property change that modifies the text and color of a Text element
+    when it is clicked:
+    
+    \qml
+    Text {
+        id: myText
+        width: 100; height: 100
+        text: "Hello"
+        color: "blue"
+
+        states: State {
+            name: "myState"
+
+            PropertyChanges {
+                target: myText
+                text: "Goodbye"
+                color: "red"
+            }
+        }
+
+        MouseArea { anchors.fill: parent; onClicked: myText.state = 'myState' }
+    }
+    \endqml
+    
+    State-specific script for signal handlers can also be specified:
+
+    \qml
+    PropertyChanges {
+        target: myMouseArea
+        onClicked: doSomethingDifferent()
+    }
+    \endqml
+
+    Changes to an Item's parent or anchors should be done using the associated change elements
+    (ParentChange and AnchorChanges, respectively) rather than PropertyChanges.
+
+    \sa {qmlstate}{States}
+*/
+
+/*!
+    \internal
+    \class QDeclarativePropertyChanges
+    \brief The QDeclarativePropertyChanges class describes new property values for a state.
+*/
+
+/*!
+    \qmlproperty Object PropertyChanges::target
+    This property holds the object which contains the properties to be changed.
+*/
+
+class QDeclarativeReplaceSignalHandler : public QDeclarativeActionEvent
+{
+public:
+    QDeclarativeReplaceSignalHandler() : expression(0), reverseExpression(0),
+                                rewindExpression(0), ownedExpression(0) {}
+    ~QDeclarativeReplaceSignalHandler() {
+        delete ownedExpression;
+    }
+
+    virtual QString typeName() const { return QLatin1String("ReplaceSignalHandler"); }
+
+    QDeclarativeMetaProperty property;
+    QDeclarativeExpression *expression;
+    QDeclarativeExpression *reverseExpression;
+    QDeclarativeExpression *rewindExpression;
+    QDeclarativeGuard<QDeclarativeExpression> ownedExpression;
+
+    virtual void execute() {
+        ownedExpression = property.setSignalExpression(expression);
+    }
+
+    virtual bool isReversable() { return true; }
+    virtual void reverse() {
+        ownedExpression = property.setSignalExpression(reverseExpression);
+    }
+
+    virtual void saveOriginals() {
+        saveCurrentValues();
+        reverseExpression = rewindExpression;
+    }
+
+    virtual void rewind() {
+        ownedExpression = property.setSignalExpression(rewindExpression);
+    }
+    virtual void saveCurrentValues() { rewindExpression = property.signalExpression(); }
+
+    virtual bool override(QDeclarativeActionEvent*other) {
+        if (other == this)
+            return true;
+        if (other->typeName() != typeName())
+            return false;
+        if (static_cast<QDeclarativeReplaceSignalHandler*>(other)->property == property)
+            return true;
+        return false;
+    }
+};
+
+
+class QDeclarativePropertyChangesPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePropertyChanges)
+public:
+    QDeclarativePropertyChangesPrivate() : object(0), decoded(true), restore(true),
+                                isExplicit(false) {}
+
+    QObject *object;
+    QByteArray data;
+
+    bool decoded : 1;
+    bool restore : 1;
+    bool isExplicit : 1;
+
+    void decode();
+
+    QList<QPair<QByteArray, QVariant> > properties;
+    QList<QPair<QByteArray, QDeclarativeExpression *> > expressions;
+    QList<QDeclarativeReplaceSignalHandler*> signalReplacements;
+
+    QDeclarativeMetaProperty property(const QByteArray &);
+};
+
+void
+QDeclarativePropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> > &list,
+                                     const QByteArray &pre,
+                                     const QDeclarativeCustomParserProperty &prop)
+{
+    QByteArray propName = pre + prop.name();
+
+    QList<QVariant> values = prop.assignedValues();
+    for (int ii = 0; ii < values.count(); ++ii) {
+        const QVariant &value = values.at(ii);
+
+        if (value.userType() == qMetaTypeId<QDeclarativeCustomParserNode>()) {
+            continue;
+        } else if(value.userType() == qMetaTypeId<QDeclarativeCustomParserProperty>()) {
+
+            QDeclarativeCustomParserProperty prop =
+                qvariant_cast<QDeclarativeCustomParserProperty>(value);
+            QByteArray pre = propName + '.';
+            compileList(list, pre, prop);
+
+        } else {
+            list << qMakePair(propName, value);
+        }
+    }
+}
+
+QByteArray
+QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserProperty> &props)
+{
+    QList<QPair<QByteArray, QVariant> > data;
+    for(int ii = 0; ii < props.count(); ++ii)
+        compileList(data, QByteArray(), props.at(ii));
+
+    QByteArray rv;
+    QDataStream ds(&rv, QIODevice::WriteOnly);
+
+    ds << data.count();
+    for(int ii = 0; ii < data.count(); ++ii) {
+        QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(data.at(ii).second);
+        QVariant var;
+        bool isScript = v.isScript();
+        switch(v.type()) {
+        case QDeclarativeParser::Variant::Boolean:
+            var = QVariant(v.asBoolean());
+            break;
+        case QDeclarativeParser::Variant::Number:
+            var = QVariant(v.asNumber());
+            break;
+        case QDeclarativeParser::Variant::String:
+            var = QVariant(v.asString());
+            break;
+        case QDeclarativeParser::Variant::Invalid:
+        case QDeclarativeParser::Variant::Script:
+            var = QVariant(v.asScript());
+            break;
+        }
+
+        ds << data.at(ii).first << isScript << var;
+    }
+
+    return rv;
+}
+
+void QDeclarativePropertyChangesPrivate::decode()
+{
+    Q_Q(QDeclarativePropertyChanges);
+    if (decoded)
+        return;
+
+    QDataStream ds(&data, QIODevice::ReadOnly);
+
+    int count;
+    ds >> count;
+    for (int ii = 0; ii < count; ++ii) {
+        QByteArray name;
+        bool isScript;
+        QVariant data;
+        ds >> name;
+        ds >> isScript;
+        ds >> data;
+
+        QDeclarativeMetaProperty prop = property(name);      //### better way to check for signal property?
+        if (prop.type() & QDeclarativeMetaProperty::SignalProperty) {
+            QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), data.toString(), object);
+            QDeclarativeReplaceSignalHandler *handler = new QDeclarativeReplaceSignalHandler;
+            handler->property = prop;
+            handler->expression = expression;
+            signalReplacements << handler;
+        } else if (isScript) {
+            QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), data.toString(), object);
+            expressions << qMakePair(name, expression);
+        } else {
+            properties << qMakePair(name, data);
+        }
+    }
+
+    decoded = true;
+    data.clear();
+}
+
+void QDeclarativePropertyChangesParser::setCustomData(QObject *object,
+                                            const QByteArray &data)
+{
+    QDeclarativePropertyChangesPrivate *p =
+        static_cast<QDeclarativePropertyChangesPrivate *>(QObjectPrivate::get(object));
+    p->data = data;
+    p->decoded = false;
+}
+
+QDeclarativePropertyChanges::QDeclarativePropertyChanges()
+: QDeclarativeStateOperation(*(new QDeclarativePropertyChangesPrivate))
+{
+}
+
+QDeclarativePropertyChanges::~QDeclarativePropertyChanges()
+{
+    Q_D(QDeclarativePropertyChanges);
+    for(int ii = 0; ii < d->expressions.count(); ++ii)
+        delete d->expressions.at(ii).second;
+    for(int ii = 0; ii < d->signalReplacements.count(); ++ii)
+        delete d->signalReplacements.at(ii);
+}
+
+QObject *QDeclarativePropertyChanges::object() const
+{
+    Q_D(const QDeclarativePropertyChanges);
+    return d->object;
+}
+
+void QDeclarativePropertyChanges::setObject(QObject *o)
+{
+    Q_D(QDeclarativePropertyChanges);
+    d->object = o;
+}
+
+/*!
+    \qmlproperty bool PropertyChanges::restoreEntryValues
+    
+    Whether or not the previous values should be restored when
+    leaving the state. By default, restoreEntryValues is true.
+
+    By setting restoreEntryValues to false, you can create a temporary state
+    that has permanent effects on property values.
+*/
+bool QDeclarativePropertyChanges::restoreEntryValues() const
+{
+    Q_D(const QDeclarativePropertyChanges);
+    return d->restore;
+}
+
+void QDeclarativePropertyChanges::setRestoreEntryValues(bool v)
+{
+    Q_D(QDeclarativePropertyChanges);
+    d->restore = v;
+}
+
+QDeclarativeMetaProperty
+QDeclarativePropertyChangesPrivate::property(const QByteArray &property)
+{
+    Q_Q(QDeclarativePropertyChanges);
+    QDeclarativeMetaProperty prop = QDeclarativeMetaProperty::createProperty(object, QString::fromUtf8(property));
+    if (!prop.isValid()) {
+        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(property));
+        return QDeclarativeMetaProperty();
+    } else if (!(prop.type() & QDeclarativeMetaProperty::SignalProperty) && !prop.isWritable()) {
+        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(QString::fromUtf8(property));
+        return QDeclarativeMetaProperty();
+    }
+    return prop;
+}
+
+QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
+{
+    Q_D(QDeclarativePropertyChanges);
+
+    d->decode();
+
+    ActionList list;
+
+    for (int ii = 0; ii < d->properties.count(); ++ii) {
+
+        QByteArray property = d->properties.at(ii).first;
+
+        QDeclarativeAction a(d->object, QString::fromLatin1(property),
+                 d->properties.at(ii).second);
+
+        if (a.property.isValid()) {
+            a.restore = restoreEntryValues();
+
+            if (a.property.propertyType() == QVariant::Url &&
+                (a.toValue.userType() == QVariant::String || a.toValue.userType() == QVariant::ByteArray) && !a.toValue.isNull())
+                a.toValue.setValue(qmlContext(this)->resolvedUrl(QUrl(a.toValue.toString())));
+
+            list << a;
+        }
+    }
+
+    for (int ii = 0; ii < d->signalReplacements.count(); ++ii) {
+
+        QDeclarativeReplaceSignalHandler *handler = d->signalReplacements.at(ii);
+
+        if (handler->property.isValid()) {
+            QDeclarativeAction a;
+            a.event = handler;
+            list << a;
+        }
+    }
+
+    for (int ii = 0; ii < d->expressions.count(); ++ii) {
+
+        QByteArray property = d->expressions.at(ii).first;
+        QDeclarativeMetaProperty prop = d->property(property);
+
+        if (prop.isValid()) {
+            QDeclarativeAction a;
+            a.restore = restoreEntryValues();
+            a.property = prop;
+            a.fromValue = a.property.read();
+            a.specifiedObject = d->object;
+            a.specifiedProperty = QString::fromLatin1(property);
+
+            if (d->isExplicit) {
+                a.toValue = d->expressions.at(ii).second->value();
+            } else {
+                QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->expressions.at(ii).second->expression(), object(), qmlContext(this));
+                newBinding->setTarget(prop);
+                a.toBinding = newBinding;
+                a.deletableToBinding = true;
+            }
+
+            list << a;
+        }
+    }
+
+    return list;
+}
+
+/*!
+    \qmlproperty bool PropertyChanges::explicit
+
+    If explicit is set to true, any potential bindings will be interpreted as
+    once-off assignments that occur when the state is entered.
+
+    In the following example, the addition of explicit prevents myItem.width from
+    being bound to parent.width. Instead, it is assigned the value of parent.width
+    at the time of the state change.
+    \qml
+    PropertyChanges {
+        target: myItem
+        explicit: true
+        width: parent.width
+    }
+    \endqml
+
+    By default, explicit is false.
+*/
+bool QDeclarativePropertyChanges::isExplicit() const
+{
+    Q_D(const QDeclarativePropertyChanges);
+    return d->isExplicit;
+}
+
+void QDeclarativePropertyChanges::setIsExplicit(bool e)
+{
+    Q_D(QDeclarativePropertyChanges);
+    d->isExplicit = e;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h
new file mode 100644
index 0000000..1274b0c
--- /dev/null
+++ b/src/declarative/util/qdeclarativepropertychanges_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPROPERTYCHANGES_H
+#define QDECLARATIVEPROPERTYCHANGES_H
+
+#include "qdeclarativestateoperations_p.h"
+#include <private/qdeclarativecustomparser_p.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+    
+class QDeclarativePropertyChangesPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativePropertyChanges)
+
+    Q_PROPERTY(QObject *target READ object WRITE setObject)
+    Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues)
+    Q_PROPERTY(bool explicit READ isExplicit WRITE setIsExplicit)
+public:
+    QDeclarativePropertyChanges();
+    ~QDeclarativePropertyChanges();
+
+    QObject *object() const;
+    void setObject(QObject *);
+
+    bool restoreEntryValues() const;
+    void setRestoreEntryValues(bool);
+
+    bool isExplicit() const;
+    void setIsExplicit(bool);
+
+    virtual ActionList actions();
+};
+
+class QDeclarativePropertyChangesParser : public QDeclarativeCustomParser
+{
+public:
+    void compileList(QList<QPair<QByteArray, QVariant> > &list, const QByteArray &pre, const QDeclarativeCustomParserProperty &prop);
+
+    virtual QByteArray compile(const QList<QDeclarativeCustomParserProperty> &);
+    virtual void setCustomData(QObject *, const QByteArray &);
+};
+
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativePropertyChanges)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPROPERTYCHANGES_H
diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp
new file mode 100644
index 0000000..fcea515
--- /dev/null
+++ b/src/declarative/util/qdeclarativepropertymap.cpp
@@ -0,0 +1,279 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativepropertymap.h"
+
+#include "qdeclarativeopenmetaobject_p.h"
+
+#include <QDebug>
+
+QT_BEGIN_NAMESPACE
+
+//QDeclarativePropertyMapMetaObject lets us listen for changes coming from QML
+//so we can emit the changed signal.
+class QDeclarativePropertyMapMetaObject : public QDeclarativeOpenMetaObject
+{
+public:
+    QDeclarativePropertyMapMetaObject(QDeclarativePropertyMap *obj, QDeclarativePropertyMapPrivate *objPriv);
+
+protected:
+    virtual void propertyWrite(int index);
+
+private:
+    QDeclarativePropertyMap *map;
+    QDeclarativePropertyMapPrivate *priv;
+};
+
+class QDeclarativePropertyMapPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePropertyMap)
+public:
+    QDeclarativePropertyMapMetaObject *mo;
+    QStringList keys;
+    void emitChanged(const QString &key);
+};
+
+void QDeclarativePropertyMapPrivate::emitChanged(const QString &key)
+{
+    Q_Q(QDeclarativePropertyMap);
+    emit q->valueChanged(key);
+}
+
+QDeclarativePropertyMapMetaObject::QDeclarativePropertyMapMetaObject(QDeclarativePropertyMap *obj, QDeclarativePropertyMapPrivate *objPriv) : QDeclarativeOpenMetaObject(obj)
+{
+    map = obj;
+    priv = objPriv;
+}
+
+void QDeclarativePropertyMapMetaObject::propertyWrite(int index)
+{
+    priv->emitChanged(QString::fromUtf8(name(index)));
+}
+
+/*!
+    \class QDeclarativePropertyMap
+  \since 4.7
+    \brief The QDeclarativePropertyMap class allows you to set key-value pairs that can be used in bindings.
+
+    QDeclarativePropertyMap provides a convenient way to expose domain data to the UI layer.
+    The following example shows how you might declare data in C++ and then
+    access it in QML.
+
+    Setup in C++:
+    \code
+    //create our data
+    QDeclarativePropertyMap ownerData;
+    ownerData.insert("name", QVariant(QString("John Smith")));
+    ownerData.insert("phone", QVariant(QString("555-5555")));
+
+    //expose it to the UI layer
+    QDeclarativeContext *ctxt = view->bindContext();
+    ctxt->setProperty("owner", &data);
+    \endcode
+
+    Then, in QML:
+    \code
+    Text { text: owner.name }
+    Text { text: owner.phone }
+    \endcode
+
+    The binding is dynamic - whenever a key's value is updated, anything bound to that
+    key will be updated as well.
+
+    To detect value changes made in the UI layer you can connect to the valueChanged() signal.
+    However, note that valueChanged() is \bold NOT emitted when changes are made by calling insert()
+    or clear() - it is only emitted when a value is updated from QML.
+
+    \note It is not possible to remove keys from the map; once a key has been added, you can only
+    modify or clear its associated value.
+*/
+
+/*!
+    Constructs a bindable map with parent object \a parent.
+*/
+QDeclarativePropertyMap::QDeclarativePropertyMap(QObject *parent)
+: QObject(*(new QDeclarativePropertyMapPrivate), parent)
+{
+    Q_D(QDeclarativePropertyMap);
+    d->mo = new QDeclarativePropertyMapMetaObject(this, d);
+}
+
+/*!
+    Destroys the bindable map.
+*/
+QDeclarativePropertyMap::~QDeclarativePropertyMap()
+{
+}
+
+/*!
+    Clears the value (if any) associated with \a key.
+*/
+void QDeclarativePropertyMap::clear(const QString &key)
+{
+    Q_D(QDeclarativePropertyMap);
+    d->mo->setValue(key.toUtf8(), QVariant());
+}
+
+/*!
+    Returns the value associated with \a key.
+
+    If no value has been set for this key (or if the value has been cleared),
+    an invalid QVariant is returned.
+*/
+QVariant QDeclarativePropertyMap::value(const QString &key) const
+{
+    Q_D(const QDeclarativePropertyMap);
+    return d->mo->value(key.toUtf8());
+}
+
+/*!
+    Sets the value associated with \a key to \a value.
+
+    If the key doesn't exist, it is automatically created.
+*/
+void QDeclarativePropertyMap::insert(const QString &key, const QVariant &value)
+{
+    Q_D(QDeclarativePropertyMap);
+    if (!d->keys.contains(key))
+        d->keys.append(key);
+    d->mo->setValue(key.toUtf8(), value);
+}
+
+/*!
+    Returns the list of keys.
+
+    Keys that have been cleared will still appear in this list, even though their
+    associated values are invalid QVariants.
+*/
+QStringList QDeclarativePropertyMap::keys() const
+{
+    Q_D(const QDeclarativePropertyMap);
+    return d->keys;
+}
+
+/*!
+    \overload
+
+    Same as size().
+*/
+int QDeclarativePropertyMap::count() const
+{
+    Q_D(const QDeclarativePropertyMap);
+    return d->keys.count();
+}
+
+/*!
+    Returns the number of keys in the map.
+
+    \sa isEmpty(), count()
+*/
+int QDeclarativePropertyMap::size() const
+{
+    Q_D(const QDeclarativePropertyMap);
+    return d->keys.size();
+}
+
+/*!
+    Returns true if the map contains no keys; otherwise returns
+    false.
+
+    \sa size()
+*/
+bool QDeclarativePropertyMap::isEmpty() const
+{
+    Q_D(const QDeclarativePropertyMap);
+    return d->keys.isEmpty();
+}
+
+/*!
+    Returns true if the map contains \a key.
+
+    \sa size()
+*/
+bool QDeclarativePropertyMap::contains(const QString &key) const
+{
+    Q_D(const QDeclarativePropertyMap);
+    return d->keys.contains(key);
+}
+
+/*!
+    Returns the value associated with the key \a key as a modifiable
+    reference.
+
+    If the map contains no item with key \a key, the function inserts
+    an invalid QVariant into the map with key \a key, and
+    returns a reference to it.
+
+    \sa insert(), value()
+*/
+QVariant &QDeclarativePropertyMap::operator[](const QString &key)
+{
+    //### optimize
+    Q_D(QDeclarativePropertyMap);
+    QByteArray utf8key = key.toUtf8();
+    if (!d->keys.contains(key)) {
+        d->keys.append(key);
+        d->mo->setValue(utf8key, QVariant());   //force creation -- needed below
+    }
+
+    return (*(d->mo))[utf8key];
+}
+
+/*!
+    \overload
+
+    Same as value().
+*/
+const QVariant QDeclarativePropertyMap::operator[](const QString &key) const
+{
+    return value(key);
+}
+
+/*!
+    \fn void QDeclarativePropertyMap::valueChanged(const QString &key)
+    This signal is emitted whenever one of the values in the map is changed. \a key
+    is the key corresponding to the value that was changed.
+
+    \note valueChanged() is \bold NOT emitted when changes are made by calling insert()
+    or clear() - it is only emitted when a value is updated from QML.
+*/
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h
new file mode 100644
index 0000000..513089f
--- /dev/null
+++ b/src/declarative/util/qdeclarativepropertymap.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPROPERTYMAP_H
+#define QDECLARATIVEPROPERTYMAP_H
+
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativePropertyMapPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativePropertyMap : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativePropertyMap(QObject *parent = 0);
+    virtual ~QDeclarativePropertyMap();
+
+    QVariant value(const QString &key) const;
+    void insert(const QString &key, const QVariant &value);
+    void clear(const QString &key);
+
+    Q_INVOKABLE QStringList keys() const;
+
+    int count() const;
+    int size() const;
+    bool isEmpty() const;
+    bool contains(const QString &key) const;
+
+    QVariant &operator[](const QString &key);
+    const QVariant operator[](const QString &key) const;
+
+Q_SIGNALS:
+    void valueChanged(const QString &key);
+
+private:
+    Q_DECLARE_PRIVATE(QDeclarativePropertyMap)
+    Q_DISABLE_COPY(QDeclarativePropertyMap)
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/util/qdeclarativespringfollow.cpp b/src/declarative/util/qdeclarativespringfollow.cpp
new file mode 100644
index 0000000..b26a7e2
--- /dev/null
+++ b/src/declarative/util/qdeclarativespringfollow.cpp
@@ -0,0 +1,464 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativespringfollow_p.h"
+
+#include "qdeclarativeanimation_p_p.h"
+
+#include <QtCore/qdebug.h>
+
+#include <private/qobject_p.h>
+
+#include <limits.h>
+#include <math.h>
+
+QT_BEGIN_NAMESPACE
+
+
+
+class QDeclarativeSpringFollowPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeSpringFollow)
+public:
+    QDeclarativeSpringFollowPrivate()
+        : currentValue(0), sourceValue(0), maxVelocity(0), lastTime(0)
+        , mass(1.0), spring(0.), damping(0.), velocity(0), epsilon(0.01)
+        , modulus(0.0), useMass(false), haveModulus(false), enabled(true), mode(Track), clock(this) {}
+
+    QDeclarativeMetaProperty property;
+    qreal currentValue;
+    qreal sourceValue;
+    qreal maxVelocity;
+    qreal velocityms;
+    int lastTime;
+    qreal mass;
+    qreal spring;
+    qreal damping;
+    qreal velocity;
+    qreal epsilon;
+    qreal modulus;
+
+    bool useMass : 1;
+    bool haveModulus : 1;
+    bool enabled : 1;
+
+    enum Mode {
+        Track,
+        Velocity,
+        Spring
+    };
+    Mode mode;
+
+    void tick(int);
+    void updateMode();
+    void start();
+    void stop();
+
+    QTickAnimationProxy<QDeclarativeSpringFollowPrivate, &QDeclarativeSpringFollowPrivate::tick> clock;
+};
+
+void QDeclarativeSpringFollowPrivate::tick(int time)
+{
+    Q_Q(QDeclarativeSpringFollow);
+
+    int elapsed = time - lastTime;
+    if (!elapsed)
+        return;
+    qreal srcVal = sourceValue;
+    if (haveModulus) {
+        currentValue = fmod(currentValue, modulus);
+        srcVal = fmod(srcVal, modulus);
+    }
+    if (mode == Spring) {
+        if (elapsed < 16) // capped at 62fps.
+            return;
+        // Real men solve the spring DEs using RK4.
+        // We'll do something much simpler which gives a result that looks fine.
+        int count = elapsed / 16;
+        for (int i = 0; i < count; ++i) {
+            qreal diff = srcVal - currentValue;
+            if (haveModulus && qAbs(diff) > modulus / 2) {
+                if (diff < 0)
+                    diff += modulus;
+                else
+                    diff -= modulus;
+            }
+            if (useMass)
+                velocity = velocity + (spring * diff - damping * velocity) / mass;
+            else
+                velocity = velocity + spring * diff - damping * velocity;
+            if (maxVelocity > 0.) {
+                // limit velocity
+                if (velocity > maxVelocity)
+                    velocity = maxVelocity;
+                else if (velocity < -maxVelocity)
+                    velocity = -maxVelocity;
+            }
+            currentValue += velocity * 16.0 / 1000.0;
+            if (haveModulus) {
+                currentValue = fmod(currentValue, modulus);
+                if (currentValue < 0.0)
+                    currentValue += modulus;
+            }
+        }
+        if (qAbs(velocity) < epsilon && qAbs(srcVal - currentValue) < epsilon) {
+            velocity = 0.0;
+            currentValue = srcVal;
+            clock.stop();
+        }
+        lastTime = time - (elapsed - count * 16);
+    } else {
+        qreal moveBy = elapsed * velocityms;
+        qreal diff = srcVal - currentValue;
+        if (haveModulus && qAbs(diff) > modulus / 2) {
+            if (diff < 0)
+                diff += modulus;
+            else
+                diff -= modulus;
+        }
+        if (diff > 0) {
+            currentValue += moveBy;
+            if (haveModulus)
+                currentValue = fmod(currentValue, modulus);
+            if (currentValue > sourceValue) {
+                currentValue = sourceValue;
+                clock.stop();
+            }
+        } else {
+            currentValue -= moveBy;
+            if (haveModulus && currentValue < 0.0)
+                currentValue = fmod(currentValue, modulus) + modulus;
+            if (currentValue < sourceValue) {
+                currentValue = sourceValue;
+                clock.stop();
+            }
+        }
+        lastTime = time;
+    }
+    property.write(currentValue);
+    emit q->valueChanged(currentValue);
+    if (clock.state() != QAbstractAnimation::Running)
+        emit q->syncChanged();
+}
+
+void QDeclarativeSpringFollowPrivate::updateMode()
+{
+    if (spring == 0. && maxVelocity == 0.)
+        mode = Track;
+    else if (spring > 0.)
+        mode = Spring;
+    else
+        mode = Velocity;
+}
+
+void QDeclarativeSpringFollowPrivate::start()
+{
+    if (!enabled)
+        return;
+
+    Q_Q(QDeclarativeSpringFollow);
+    if (mode == QDeclarativeSpringFollowPrivate::Track) {
+        currentValue = sourceValue;
+        property.write(currentValue);
+    } else if (sourceValue != currentValue && clock.state() != QAbstractAnimation::Running) {
+        lastTime = 0;
+        currentValue = property.read().toReal();
+        clock.start(); // infinity??
+        emit q->syncChanged();
+    }
+}
+
+void QDeclarativeSpringFollowPrivate::stop()
+{
+    clock.stop();
+}
+
+/*!
+    \qmlclass SpringFollow QDeclarativeSpringFollow
+    \brief The SpringFollow element allows a property to track a value.
+
+    In example below, \e rect2 will follow \e rect1 moving with a velocity of up to 200:
+    \code
+    Rectangle {
+        id: rect1
+        width: 20; height: 20
+        color: "#00ff00"
+        y: 200  //initial value
+        y: SequentialAnimation {
+            running: true
+            repeat: true
+            NumberAnimation {
+                to: 200
+                easing: "easeOutBounce(amplitude:100)"
+                duration: 2000
+            }
+            PauseAnimation { duration: 1000 }
+        }
+    }
+    Rectangle {
+        id: rect2
+        x: rect1.width
+        width: 20; height: 20
+        color: "#ff0000"
+        y: SpringFollow { source: rect1.y; velocity: 200 }
+    }
+    \endcode
+
+    \sa EaseFollow
+*/
+
+QDeclarativeSpringFollow::QDeclarativeSpringFollow(QObject *parent)
+: QObject(*(new QDeclarativeSpringFollowPrivate),parent)
+{
+}
+
+QDeclarativeSpringFollow::~QDeclarativeSpringFollow()
+{
+}
+
+void QDeclarativeSpringFollow::setTarget(const QDeclarativeMetaProperty &property)
+{
+    Q_D(QDeclarativeSpringFollow);
+    d->property = property;
+    d->currentValue = property.read().toReal();
+}
+
+qreal QDeclarativeSpringFollow::sourceValue() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->sourceValue;
+}
+
+/*!
+    \qmlproperty qreal SpringFollow::source
+    This property holds the source value which will be tracked.
+
+    Bind to a property in order to track its changes.
+*/
+
+void QDeclarativeSpringFollow::setSourceValue(qreal value)
+{
+    Q_D(QDeclarativeSpringFollow);
+    if (d->clock.state() == QAbstractAnimation::Running && d->sourceValue == value)
+        return;
+
+    d->sourceValue = value;
+    d->start();
+}
+
+/*!
+    \qmlproperty qreal SpringFollow::velocity
+    This property holds the maximum velocity allowed when tracking the source.
+*/
+
+qreal QDeclarativeSpringFollow::velocity() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->maxVelocity;
+}
+
+void QDeclarativeSpringFollow::setVelocity(qreal velocity)
+{
+    Q_D(QDeclarativeSpringFollow);
+    d->maxVelocity = velocity;
+    d->velocityms = velocity / 1000.0;
+    d->updateMode();
+}
+
+/*!
+    \qmlproperty qreal SpringFollow::spring
+    This property holds the spring constant
+
+    The spring constant describes how strongly the target is pulled towards the
+    source.  Setting spring to 0 turns off spring tracking.  Useful values 0 - 5.0
+
+    When a spring constant is set and the velocity property is greater than 0,
+    velocity limits the maximum speed.
+*/
+qreal QDeclarativeSpringFollow::spring() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->spring;
+}
+
+void QDeclarativeSpringFollow::setSpring(qreal spring)
+{
+    Q_D(QDeclarativeSpringFollow);
+    d->spring = spring;
+    d->updateMode();
+}
+
+/*!
+    \qmlproperty qreal SpringFollow::damping
+    This property holds the spring damping constant
+
+    The damping constant describes how quickly a sprung follower comes to rest.
+    Useful range is 0 - 1.0
+*/
+qreal QDeclarativeSpringFollow::damping() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->damping;
+}
+
+void QDeclarativeSpringFollow::setDamping(qreal damping)
+{
+    Q_D(QDeclarativeSpringFollow);
+    if (damping > 1.)
+        damping = 1.;
+
+    d->damping = damping;
+}
+
+
+/*!
+    \qmlproperty qreal SpringFollow::epsilon
+    This property holds the spring epsilon
+
+    The epsilon is the rate and amount of change in the value which is close enough
+    to 0 to be considered equal to zero. This will depend on the usage of the value.
+    For pixel positions, 0.25 would suffice. For scale, 0.005 will suffice.
+
+    The default is 0.01. Tuning this value can provide small performance improvements.
+*/
+qreal QDeclarativeSpringFollow::epsilon() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->epsilon;
+}
+
+void QDeclarativeSpringFollow::setEpsilon(qreal epsilon)
+{
+    Q_D(QDeclarativeSpringFollow);
+    d->epsilon = epsilon;
+}
+
+/*!
+    \qmlproperty qreal SpringFollow::modulus
+    This property holds the modulus value.
+
+    Setting a \a modulus forces the target value to "wrap around" at the modulus.
+    For example, setting the modulus to 360 will cause a value of 370 to wrap around to 10.
+*/
+qreal QDeclarativeSpringFollow::modulus() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->modulus;
+}
+
+void QDeclarativeSpringFollow::setModulus(qreal modulus)
+{
+    Q_D(QDeclarativeSpringFollow);
+    if (d->modulus != modulus) {
+        d->haveModulus = modulus != 0.0;
+        d->modulus = modulus;
+        emit modulusChanged();
+    }
+}
+
+/*!
+    \qmlproperty qreal SpringFollow::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 QDeclarativeSpringFollow::mass() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->mass;
+}
+
+void QDeclarativeSpringFollow::setMass(qreal mass)
+{
+    Q_D(QDeclarativeSpringFollow);
+    if (d->mass != mass && mass > 0.0) {
+        d->useMass = mass != 1.0;
+        d->mass = mass;
+        emit massChanged();
+    }
+}
+
+/*!
+    \qmlproperty qreal SpringFollow::value
+    The current value.
+*/
+
+/*!
+    \qmlproperty bool SpringFollow::enabled
+    This property holds whether the target will track the source.
+*/
+bool QDeclarativeSpringFollow::enabled() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->enabled;
+}
+
+void QDeclarativeSpringFollow::setEnabled(bool enabled)
+{
+    Q_D(QDeclarativeSpringFollow);
+    d->enabled = enabled;
+    if (enabled)
+        d->start();
+    else
+        d->stop();
+}
+
+/*!
+    \qmlproperty bool SpringFollow::inSync
+    This property is true when target is equal to the source; otherwise
+    false.  If inSync is true the target is not being animated.
+
+    If \l enabled is false then inSync will also be false.
+*/
+bool QDeclarativeSpringFollow::inSync() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->enabled && d->clock.state() != QAbstractAnimation::Running;
+}
+
+qreal QDeclarativeSpringFollow::value() const
+{
+    Q_D(const QDeclarativeSpringFollow);
+    return d->currentValue;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativespringfollow_p.h b/src/declarative/util/qdeclarativespringfollow_p.h
new file mode 100644
index 0000000..63d38a4
--- /dev/null
+++ b/src/declarative/util/qdeclarativespringfollow_p.h
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESMOOTHFOLLOW_H
+#define QDECLARATIVESMOOTHFOLLOW_H
+
+#include <qdeclarativepropertyvaluesource.h>
+#include <qdeclarative.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeSpringFollowPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeSpringFollow : public QObject,
+                                       public QDeclarativePropertyValueSource
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeSpringFollow)
+    Q_INTERFACES(QDeclarativePropertyValueSource)
+
+    Q_PROPERTY(qreal source READ sourceValue WRITE setSourceValue)
+    Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity)
+    Q_PROPERTY(qreal spring READ spring WRITE setSpring)
+    Q_PROPERTY(qreal damping READ damping WRITE setDamping)
+    Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon)
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
+    Q_PROPERTY(qreal value 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:
+    QDeclarativeSpringFollow(QObject *parent=0);
+    ~QDeclarativeSpringFollow();
+
+    virtual void setTarget(const QDeclarativeMetaProperty &);
+
+    qreal sourceValue() const;
+    void setSourceValue(qreal value);
+    qreal velocity() const;
+    void setVelocity(qreal velocity);
+    qreal spring() const;
+    void setSpring(qreal spring);
+    qreal damping() const;
+    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;
+    void setEnabled(bool enabled);
+    bool inSync() const;
+
+    qreal value() const;
+
+Q_SIGNALS:
+    void valueChanged(qreal);
+    void modulusChanged();
+    void massChanged();
+    void syncChanged();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeSpringFollow)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVESMOOTHFOLLOW_H
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
new file mode 100644
index 0000000..5c3b909
--- /dev/null
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -0,0 +1,482 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativestate_p_p.h"
+#include "qdeclarativestate_p.h"
+
+#include "qdeclarativetransition_p.h"
+#include "qdeclarativestategroup_p.h"
+#include "qdeclarativestateoperations_p.h"
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p_p.h"
+
+#include <qdeclarativebinding_p.h>
+#include <qdeclarativeglobal_p.h>
+
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
+
+QDeclarativeAction::QDeclarativeAction()
+: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), fromBinding(0), toBinding(0), event(0),
+  specifiedObject(0)
+{
+}
+
+QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyName,
+               const QVariant &value)
+: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), toValue(value), fromBinding(0),
+  toBinding(0), event(0), specifiedObject(target),
+  specifiedProperty(propertyName)
+{
+    property = QDeclarativeMetaProperty::createProperty(target, propertyName);
+    if (property.isValid())
+        fromValue = property.read();
+}
+
+QDeclarativeActionEvent::~QDeclarativeActionEvent()
+{
+}
+
+QString QDeclarativeActionEvent::typeName() const
+{
+    return QString();
+}
+
+void QDeclarativeActionEvent::execute()
+{
+}
+
+bool QDeclarativeActionEvent::isReversable()
+{
+    return false;
+}
+
+void QDeclarativeActionEvent::reverse()
+{
+}
+
+QList<QDeclarativeAction> QDeclarativeActionEvent::extraActions()
+{
+    return QList<QDeclarativeAction>();
+}
+
+bool QDeclarativeActionEvent::changesBindings()
+{
+    return false;
+}
+
+void QDeclarativeActionEvent::clearForwardBindings()
+{
+}
+
+void QDeclarativeActionEvent::clearReverseBindings()
+{
+}
+
+bool QDeclarativeActionEvent::override(QDeclarativeActionEvent *other)
+{
+    Q_UNUSED(other);
+    return false;
+}
+
+/*!
+    \internal
+*/
+QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObject *parent)
+    : QObject(dd, parent)
+{
+}
+
+/*!
+    \qmlclass State QDeclarativeState
+  \since 4.7
+    \brief The State element defines configurations of objects and properties.
+
+    A state is specified as a set of batched changes from the default configuration.
+
+    Note that setting the state of an object from within another state of the same object is
+    inadvisible. Not only would this have the same effect as going directly to the second state
+    it may cause the program to crash.
+
+    \sa {qmlstates}{States}, {state-transitions}{Transitions}
+*/
+
+/*!
+    \internal
+    \class QDeclarativeState
+    \brief The QDeclarativeState class allows you to define configurations of objects and properties.
+
+    \ingroup group_states
+
+    QDeclarativeState allows you to specify a state as a set of batched changes from the default
+    configuration.
+
+    \sa {states-transitions}{States and Transitions}
+*/
+
+
+QDeclarativeState::QDeclarativeState(QObject *parent)
+: QObject(*(new QDeclarativeStatePrivate), parent)
+{
+    Q_D(QDeclarativeState);
+    d->transitionManager.setState(this);
+}
+
+QDeclarativeState::~QDeclarativeState()
+{
+    Q_D(QDeclarativeState);
+    if (d->group)
+        d->group->removeState(this);
+}
+
+/*!
+    \qmlproperty string State::name
+    This property holds the name of the state
+
+    Each state should have a unique name.
+*/
+QString QDeclarativeState::name() const
+{
+    Q_D(const QDeclarativeState);
+    return d->name;
+}
+
+void QDeclarativeState::setName(const QString &n)
+{
+    Q_D(QDeclarativeState);
+    d->name = n;
+}
+
+bool QDeclarativeState::isWhenKnown() const
+{
+    Q_D(const QDeclarativeState);
+    return d->when != 0;
+}
+
+/*!
+    \qmlproperty bool State::when
+    This property holds when the state should be applied
+
+    This should be set to an expression that evaluates to true when you want the state to
+    be applied.
+*/
+QDeclarativeBinding *QDeclarativeState::when() const
+{
+    Q_D(const QDeclarativeState);
+    return d->when;
+}
+
+void QDeclarativeState::setWhen(QDeclarativeBinding *when)
+{
+    Q_D(QDeclarativeState);
+    d->when = when;
+    if (d->group)
+        d->group->updateAutoState();
+}
+
+/*!
+    \qmlproperty string State::extend
+    This property holds the state that this state extends
+
+    The state being extended is treated as the base state in regards to
+    the changes specified by the extending state.
+*/
+QString QDeclarativeState::extends() const
+{
+    Q_D(const QDeclarativeState);
+    return d->extends;
+}
+
+void QDeclarativeState::setExtends(const QString &extends)
+{
+    Q_D(QDeclarativeState);
+    d->extends = extends;
+}
+
+/*!
+    \qmlproperty list<Change> State::changes
+    This property holds the changes to apply for this state
+    \default
+
+    By default these changes are applied against the default state. If the state
+    extends another state, then the changes are applied against the state being
+    extended.
+*/
+QDeclarativeListProperty<QDeclarativeStateOperation> QDeclarativeState::changes()
+{
+    Q_D(QDeclarativeState);
+    return QDeclarativeListProperty<QDeclarativeStateOperation>(this, &d->operations, QDeclarativeStatePrivate::operations_append,
+                                              QDeclarativeStatePrivate::operations_count, QDeclarativeStatePrivate::operations_at,
+                                              QDeclarativeStatePrivate::operations_clear);
+}
+
+int QDeclarativeState::operationCount() const
+{
+    Q_D(const QDeclarativeState);
+    return d->operations.count();
+}
+
+QDeclarativeStateOperation *QDeclarativeState::operationAt(int index) const
+{
+    Q_D(const QDeclarativeState);
+    return d->operations.at(index);
+}
+
+QDeclarativeState &QDeclarativeState::operator<<(QDeclarativeStateOperation *op)
+{
+    Q_D(QDeclarativeState);
+    d->operations.append(QDeclarativeStatePrivate::OperationGuard(op, &d->operations));
+    return *this;
+}
+
+void QDeclarativeStatePrivate::complete()
+{
+    Q_Q(QDeclarativeState);
+
+    for (int ii = 0; ii < reverting.count(); ++ii) {
+        for (int jj = 0; jj < revertList.count(); ++jj) {
+            if (revertList.at(jj).property == reverting.at(ii)) {
+                revertList.removeAt(jj);
+                break;
+            }
+        }
+    }
+    reverting.clear();
+
+    emit q->completed();
+}
+
+// Generate a list of actions for this state.  This includes coelescing state
+// actions that this state "extends"
+QDeclarativeStateOperation::ActionList
+QDeclarativeStatePrivate::generateActionList(QDeclarativeStateGroup *group) const
+{
+    QDeclarativeStateOperation::ActionList applyList;
+    if (inState)
+        return applyList;
+
+    // Prevent "extends" recursion
+    inState = true;
+
+    if (!extends.isEmpty()) {
+        QList<QDeclarativeState *> states = group->states();
+        for (int ii = 0; ii < states.count(); ++ii)
+            if (states.at(ii)->name() == extends)
+                applyList = static_cast<QDeclarativeStatePrivate*>(states.at(ii)->d_func())->generateActionList(group);
+    }
+
+    foreach(QDeclarativeStateOperation *op, operations)
+        applyList << op->actions();
+
+    inState = false;
+    return applyList;
+}
+
+QDeclarativeStateGroup *QDeclarativeState::stateGroup() const
+{
+    Q_D(const QDeclarativeState);
+    return d->group;
+}
+
+void QDeclarativeState::setStateGroup(QDeclarativeStateGroup *group)
+{
+    Q_D(QDeclarativeState);
+    d->group = group;
+}
+
+void QDeclarativeState::cancel()
+{
+    Q_D(QDeclarativeState);
+    d->transitionManager.cancel();
+}
+
+void QDeclarativeAction::deleteFromBinding()
+{
+    if (fromBinding) {
+        property.setBinding(0);
+        fromBinding->destroy();
+        fromBinding = 0;
+    }
+}
+
+void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransition *trans, QDeclarativeState *revert)
+{
+    Q_D(QDeclarativeState);
+
+    qmlExecuteDeferred(this);
+
+    cancel();
+    if (revert)
+        revert->cancel();
+    d->revertList.clear();
+    d->reverting.clear();
+
+    if (revert) {
+        QDeclarativeStatePrivate *revertPrivate =
+            static_cast<QDeclarativeStatePrivate*>(revert->d_func());
+        d->revertList = revertPrivate->revertList;
+        revertPrivate->revertList.clear();
+    }
+
+    // List of actions caused by this state
+    QDeclarativeStateOperation::ActionList applyList = d->generateActionList(group);
+
+    // List of actions that need to be reverted to roll back (just) this state
+    QDeclarativeStatePrivate::SimpleActionList additionalReverts;
+    // First add the reverse of all the applyList actions
+    for (int ii = 0; ii < applyList.count(); ++ii) {
+        QDeclarativeAction &action = applyList[ii];
+
+        bool found = false;
+
+        int jj;
+        if (action.event) {
+            if (!action.event->isReversable())
+                continue;
+            for (jj = 0; jj < d->revertList.count(); ++jj) {
+                QDeclarativeActionEvent *event = d->revertList.at(jj).event;
+                if (event && event->typeName() == action.event->typeName()) {
+                    if (action.event->override(event)) {
+                        found = true;
+                        break;
+                    }
+                }
+            }
+            if (!found || action.event != d->revertList.at(jj).event)
+                action.event->saveOriginals();
+            else if (action.event->isRewindable())
+                action.event->saveCurrentValues();
+        } else {
+            action.fromBinding = action.property.binding();
+
+            for (jj = 0; jj < d->revertList.count(); ++jj) {
+                if (d->revertList.at(jj).property == action.property) {
+                    found = true;
+                    break;
+                }
+            }
+        }
+
+        if (!found) {
+            if (!action.restore) {
+                action.deleteFromBinding();
+            } else {
+                // Only need to revert the applyList action if the previous
+                // state doesn't have a higher priority revert already
+                QDeclarativeSimpleAction r(action);
+                additionalReverts << r;
+            }
+        } else if (d->revertList.at(jj).binding != action.fromBinding) {
+            action.deleteFromBinding();
+        }
+    }
+
+    // Any reverts from a previous state that aren't carried forth
+    // into this state need to be translated into apply actions
+    for (int ii = 0; ii < d->revertList.count(); ++ii) {
+        bool found = false;
+        if (d->revertList.at(ii).event) {
+            QDeclarativeActionEvent *event = d->revertList.at(ii).event;
+            if (!event->isReversable())
+                continue;
+            for (int jj = 0; !found && jj < applyList.count(); ++jj) {
+                const QDeclarativeAction &action = applyList.at(jj);
+                if (action.event && action.event->typeName() == event->typeName()) {
+                    if (action.event->override(event))
+                        found = true;
+                }
+            }
+        } else {
+            for (int jj = 0; !found && jj < applyList.count(); ++jj) {
+                const QDeclarativeAction &action = applyList.at(jj);
+                if (action.property == d->revertList.at(ii).property)
+                    found = true;
+            }
+        }
+        if (!found) {
+            QVariant cur = d->revertList.at(ii).property.read();
+            QDeclarativeAbstractBinding *delBinding = d->revertList.at(ii).property.setBinding(0);
+            if (delBinding)
+                delBinding->destroy();
+
+            QDeclarativeAction a;
+            a.property = d->revertList.at(ii).property;
+            a.fromValue = cur;
+            a.toValue = d->revertList.at(ii).value;
+            a.toBinding = d->revertList.at(ii).binding;
+            a.specifiedObject = d->revertList.at(ii).specifiedObject;
+            a.specifiedProperty = d->revertList.at(ii).specifiedProperty;
+            a.event = d->revertList.at(ii).event;
+            a.reverseEvent = d->revertList.at(ii).reverseEvent;
+            if (a.event && a.event->isRewindable())
+                a.event->saveCurrentValues();
+            applyList << a;
+            // Store these special reverts in the reverting list
+            d->reverting << d->revertList.at(ii).property;
+        }
+    }
+    // All the local reverts now become part of the ongoing revertList
+    d->revertList << additionalReverts;
+
+    // Output for debugging
+    if (stateChangeDebug()) {
+        foreach(const QDeclarativeAction &action, applyList) {
+            if (action.event)
+                qWarning() << "    QDeclarativeAction event:" << action.event->typeName();
+            else
+                qWarning() << "    QDeclarativeAction:" << action.property.object()
+                           << action.property.name() << "From:" << action.fromValue 
+                           << "To:" << action.toValue;
+        }
+    }
+
+    d->transitionManager.transition(applyList, trans);
+}
+
+QDeclarativeStateOperation::ActionList QDeclarativeStateOperation::actions()
+{
+    return ActionList();
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
new file mode 100644
index 0000000..a370f18
--- /dev/null
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESTATE_H
+#define QDECLARATIVESTATE_H
+
+#include <qdeclarative.h>
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeActionEvent;
+class QDeclarativeBinding;
+class Q_DECLARATIVE_EXPORT QDeclarativeAction
+{
+public:
+    QDeclarativeAction();
+    QDeclarativeAction(QObject *, const QString &, const QVariant &);
+
+    bool restore:1;
+    bool actionDone:1;
+    bool reverseEvent:1;
+    bool deletableToBinding:1;
+
+    QDeclarativeMetaProperty property;
+    QVariant fromValue;
+    QVariant toValue;
+
+    QDeclarativeAbstractBinding *fromBinding;
+    QDeclarativeAbstractBinding *toBinding;
+    QDeclarativeActionEvent *event;
+
+    //strictly for matching
+    QObject *specifiedObject;
+    QString specifiedProperty;
+
+    void deleteFromBinding();
+};
+
+class QDeclarativeActionEvent
+{
+public:
+    virtual ~QDeclarativeActionEvent();
+    virtual QString typeName() const;
+
+    virtual void execute();
+    virtual bool isReversable();
+    virtual void reverse();
+    virtual void saveOriginals() {}
+
+    virtual bool isRewindable() { return isReversable(); }
+    virtual void rewind() {}
+    virtual void saveCurrentValues() {}
+
+    //virtual bool hasExtraActions();
+    virtual QList<QDeclarativeAction> extraActions();
+
+    virtual bool changesBindings();
+    virtual void clearForwardBindings();
+    virtual void clearReverseBindings();
+    virtual bool override(QDeclarativeActionEvent*other);
+};
+
+//### rename to QDeclarativeStateChange?
+class QDeclarativeStateGroup;
+class Q_DECLARATIVE_EXPORT QDeclarativeStateOperation : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeStateOperation(QObject *parent = 0)
+        : QObject(parent) {}
+    typedef QList<QDeclarativeAction> ActionList;
+
+    virtual ActionList actions();
+
+protected:
+    QDeclarativeStateOperation(QObjectPrivate &dd, QObject *parent = 0);
+};
+
+typedef QDeclarativeStateOperation::ActionList QDeclarativeStateActions;
+
+class QDeclarativeTransition;
+class QDeclarativeStatePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeState : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(QDeclarativeBinding *when READ when WRITE setWhen)
+    Q_PROPERTY(QString extend READ extends WRITE setExtends)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeStateOperation> changes READ changes)
+    Q_CLASSINFO("DefaultProperty", "changes")
+    Q_CLASSINFO("DeferredPropertyNames", "changes")
+
+public:
+    QDeclarativeState(QObject *parent=0);
+    virtual ~QDeclarativeState();
+
+    QString name() const;
+    void setName(const QString &);
+
+    /*'when' is a QDeclarativeBinding to limit state changes oscillation
+     due to the unpredictable order of evaluation of bound expressions*/
+    bool isWhenKnown() const;
+    QDeclarativeBinding *when() const;
+    void setWhen(QDeclarativeBinding *);
+
+    QString extends() const;
+    void setExtends(const QString &);
+
+    QDeclarativeListProperty<QDeclarativeStateOperation> changes();
+    int operationCount() const;
+    QDeclarativeStateOperation *operationAt(int) const;
+
+    QDeclarativeState &operator<<(QDeclarativeStateOperation *);
+
+    void apply(QDeclarativeStateGroup *, QDeclarativeTransition *, QDeclarativeState *revert);
+    void cancel();
+
+    QDeclarativeStateGroup *stateGroup() const;
+    void setStateGroup(QDeclarativeStateGroup *);
+
+Q_SIGNALS:
+    void completed();
+
+private:
+    Q_DECLARE_PRIVATE(QDeclarativeState)
+    Q_DISABLE_COPY(QDeclarativeState)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeStateOperation)
+QML_DECLARE_TYPE(QDeclarativeState)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVESTATE_H
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
new file mode 100644
index 0000000..dd925f2
--- /dev/null
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESTATE_P_H
+#define QDECLARATIVESTATE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativestate_p.h"
+
+#include "qdeclarativeanimation_p_p.h"
+#include "qdeclarativetransitionmanager_p_p.h"
+
+#include <qdeclarativeguard_p.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeSimpleAction
+{
+public:
+    enum State { StartState, EndState };
+    QDeclarativeSimpleAction(const QDeclarativeAction &a, State state = StartState) 
+    {
+        property = a.property;
+        specifiedObject = a.specifiedObject;
+        specifiedProperty = a.specifiedProperty;
+        event = a.event;
+        if (state == StartState) {
+            value = a.fromValue;
+            binding = property.binding();
+            reverseEvent = true;
+        } else {
+            value = a.toValue;
+            binding = a.toBinding;
+            reverseEvent = false;
+        }
+    }
+
+    QDeclarativeMetaProperty property;
+    QVariant value;
+    QDeclarativeAbstractBinding *binding;
+    QObject *specifiedObject;
+    QString specifiedProperty;
+    QDeclarativeActionEvent *event;
+    bool reverseEvent;
+};
+
+class QDeclarativeStatePrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeState)
+
+public:
+    QDeclarativeStatePrivate()
+    : when(0), inState(false), group(0) {}
+
+    typedef QList<QDeclarativeSimpleAction> SimpleActionList;
+
+    QString name;
+    QDeclarativeBinding *when;
+
+    struct OperationGuard : public QDeclarativeGuard<QDeclarativeStateOperation>
+    {
+        OperationGuard(QObject *obj, QList<OperationGuard> *l) : list(l) { (QDeclarativeGuard<QObject>&)*this = obj; }
+        QList<OperationGuard> *list;
+        void objectDestroyed(QDeclarativeStateOperation *) {
+            // we assume priv will always be destroyed after objectDestroyed calls
+            list->removeOne(*this);
+        }
+    };
+    QList<OperationGuard> operations;
+
+    static void operations_append(QDeclarativeListProperty<QDeclarativeStateOperation> *prop, QDeclarativeStateOperation *op) {
+        QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
+        list->append(OperationGuard(op, list));
+    }
+    static void operations_clear(QDeclarativeListProperty<QDeclarativeStateOperation> *prop) {
+        QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
+        list->clear();
+    }
+    static int operations_count(QDeclarativeListProperty<QDeclarativeStateOperation> *prop) {
+        QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
+        return list->count();
+    }
+    static QDeclarativeStateOperation *operations_at(QDeclarativeListProperty<QDeclarativeStateOperation> *prop, int index) {
+        QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
+        return list->at(index);
+    }
+
+    QDeclarativeTransitionManager transitionManager;
+
+    SimpleActionList revertList;
+    QList<QDeclarativeMetaProperty> reverting;
+    QString extends;
+    mutable bool inState;
+    QDeclarativeStateGroup *group;
+
+    QDeclarativeStateOperation::ActionList generateActionList(QDeclarativeStateGroup *) const;
+    void complete();
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVESTATE_P_H
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
new file mode 100644
index 0000000..0b81a53
--- /dev/null
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -0,0 +1,440 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativestategroup_p.h"
+
+#include "qdeclarativetransition_p.h"
+#include "qdeclarativestate_p_p.h"
+
+#include <qdeclarativebinding_p.h>
+#include <qdeclarativeglobal_p.h>
+
+#include <QtCore/qdebug.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
+
+class QDeclarativeStateGroupPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeStateGroup)
+public:
+    QDeclarativeStateGroupPrivate(QDeclarativeStateGroup *p)
+    : nullState(0), componentComplete(true),
+      ignoreTrans(false), applyingState(false) {}
+
+    QString currentState;
+    QDeclarativeState *nullState;
+
+    static void append_state(QDeclarativeListProperty<QDeclarativeState> *list, QDeclarativeState *state);
+    static int count_state(QDeclarativeListProperty<QDeclarativeState> *list);
+    static QDeclarativeState *at_state(QDeclarativeListProperty<QDeclarativeState> *list, int index);
+
+    QList<QDeclarativeState *> states;
+    QList<QDeclarativeTransition *> transitions;
+
+    bool componentComplete;
+    bool ignoreTrans;
+    bool applyingState;
+
+    QDeclarativeTransition *findTransition(const QString &from, const QString &to);
+    void setCurrentStateInternal(const QString &state, bool = false);
+    bool updateAutoState();
+};
+
+/*!
+   \qmlclass StateGroup QDeclarativeStateGroup
+   \brief The StateGroup element provides state support for non-Item elements.
+
+   Item (and all dervied elements) provides built in support for states and transitions
+   via its state, states and transitions properties. StateGroup provides an easy way to
+   use this support in other (non-Item-derived) elements.
+
+   \qml
+   MyCustomObject {
+       StateGroup {
+           id: myStateGroup
+           states: State {
+               name: "state1"
+               ...
+           }
+           transitions: Transition {
+               ...
+           }
+       }
+
+       onSomethingHappened: myStateGroup.state = "state1";
+   }
+   \endqml
+
+   \sa {qmlstate}{States} {state-transitions}{Transitions}
+*/
+
+QDeclarativeStateGroup::QDeclarativeStateGroup(QObject *parent)
+    : QObject(*(new QDeclarativeStateGroupPrivate(this)), parent)
+{
+}
+
+QDeclarativeStateGroup::~QDeclarativeStateGroup()
+{
+    Q_D(const QDeclarativeStateGroup);
+    for (int i = 0; i < d->states.count(); ++i)
+        d->states.at(i)->setStateGroup(0);
+}
+
+QList<QDeclarativeState *> QDeclarativeStateGroup::states() const
+{
+    Q_D(const QDeclarativeStateGroup);
+    return d->states;
+}
+
+/*!
+  \qmlproperty list<State> StateGroup::states
+  This property holds a list of states defined by the state group.
+
+  \qml
+  StateGroup {
+    states: [
+      State { ... },
+      State { ... }
+      ...
+    ]
+  }
+  \endqml
+
+  \sa {qmlstate}{States}
+*/
+QDeclarativeListProperty<QDeclarativeState> QDeclarativeStateGroup::statesProperty()
+{
+    Q_D(QDeclarativeStateGroup);
+    return QDeclarativeListProperty<QDeclarativeState>(this, &d->states, &QDeclarativeStateGroupPrivate::append_state,
+                                                       &QDeclarativeStateGroupPrivate::count_state,
+                                                       &QDeclarativeStateGroupPrivate::at_state);
+}
+
+void QDeclarativeStateGroupPrivate::append_state(QDeclarativeListProperty<QDeclarativeState> *list, QDeclarativeState *state)
+{
+    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    if (state) {
+        _this->d_func()->states.append(state);
+        state->setStateGroup(_this);
+    }
+
+}
+
+int QDeclarativeStateGroupPrivate::count_state(QDeclarativeListProperty<QDeclarativeState> *list)
+{
+    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    return _this->d_func()->states.count();
+}
+
+QDeclarativeState *QDeclarativeStateGroupPrivate::at_state(QDeclarativeListProperty<QDeclarativeState> *list, int index)
+{
+    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    return _this->d_func()->states.at(index);
+}
+
+/*!
+  \qmlproperty list<Transition> StateGroup::transitions
+  This property holds a list of transitions defined by the state group.
+
+  \qml
+  StateGroup {
+    transitions: [
+      Transition { ... },
+      Transition { ... }
+      ...
+    ]
+  }
+  \endqml
+
+  \sa {state-transitions}{Transitions}
+*/
+QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeStateGroup::transitionsProperty()
+{
+    Q_D(QDeclarativeStateGroup);
+    return QDeclarativeListProperty<QDeclarativeTransition>(this, d->transitions);
+}
+
+/*!
+  \qmlproperty string StateGroup::state
+
+  This property holds the name of the current state of the state group.
+
+  This property is often used in scripts to change between states. For
+  example:
+
+  \qml
+    Script {
+        function toggle() {
+            if (button.state == 'On')
+                button.state = 'Off';
+            else
+                button.state = 'On';
+        }
+    }
+  \endqml
+
+  If the state group is in its base state (i.e. no explicit state has been
+  set), \c state will be a blank string. Likewise, you can return a
+  state group to its base state by setting its current state to \c ''.
+
+  \sa {qmlstates}{States}
+*/
+QString QDeclarativeStateGroup::state() const
+{
+    Q_D(const QDeclarativeStateGroup);
+    return d->currentState;
+}
+
+void QDeclarativeStateGroup::setState(const QString &state)
+{
+    Q_D(QDeclarativeStateGroup);
+    if (d->currentState == state)
+        return;
+
+    d->setCurrentStateInternal(state);
+}
+
+void QDeclarativeStateGroup::classBegin()
+{
+    Q_D(QDeclarativeStateGroup);
+    d->componentComplete = false;
+}
+
+void QDeclarativeStateGroup::componentComplete()
+{
+    Q_D(QDeclarativeStateGroup);
+    d->componentComplete = true;
+
+    if (d->updateAutoState()) {
+        return;
+    } else if (!d->currentState.isEmpty()) {
+        QString cs = d->currentState;
+        d->currentState = QString();
+        d->setCurrentStateInternal(cs, true);
+    }
+}
+
+/*!
+    Returns true if the state was changed, otherwise false.
+*/
+bool QDeclarativeStateGroup::updateAutoState()
+{
+    Q_D(QDeclarativeStateGroup);
+    return d->updateAutoState();
+}
+
+bool QDeclarativeStateGroupPrivate::updateAutoState()
+{
+    Q_Q(QDeclarativeStateGroup);
+    if (!componentComplete)
+        return false;
+
+    bool revert = false;
+    for (int ii = 0; ii < states.count(); ++ii) {
+        QDeclarativeState *state = states.at(ii);
+        if (state->isWhenKnown()) {
+            if (!state->name().isEmpty()) {
+                if (state->when() && state->when()->value().toBool()) {
+                    if (stateChangeDebug()) 
+                        qWarning() << "Setting auto state due to:" 
+                                   << state->when()->expression();
+                    if (currentState != state->name()) {
+                        q->setState(state->name());
+                        return true;
+                    } else {
+                        return false;
+                    }
+                } else if (state->name() == currentState) {
+                    revert = true;
+                }
+            }
+        }
+    }
+    if (revert) {
+        bool rv = currentState != QString();
+        q->setState(QString());
+        return rv;
+    } else {
+        return false;
+    }
+}
+
+QDeclarativeTransition *QDeclarativeStateGroupPrivate::findTransition(const QString &from, const QString &to)
+{
+    QDeclarativeTransition *highest = 0;
+    int score = 0;
+    bool reversed = false;
+    bool done = false;
+
+    for (int ii = 0; !done && ii < transitions.count(); ++ii) {
+        QDeclarativeTransition *t = transitions.at(ii);
+        for (int ii = 0; ii < 2; ++ii)
+        {
+            if (ii && (!t->reversible() ||
+                      (t->fromState() == QLatin1String("*") && 
+                       t->toState() == QLatin1String("*"))))
+                break;
+            QStringList fromState;
+            QStringList toState;
+
+            fromState = t->fromState().split(QLatin1Char(','));
+            toState = t->toState().split(QLatin1Char(','));
+            if (ii == 1)
+                qSwap(fromState, toState);
+            int tScore = 0;
+            if (fromState.contains(from))
+                tScore += 2;
+            else if (fromState.contains(QLatin1String("*")))
+                tScore += 1;
+            else
+                continue;
+
+            if (toState.contains(to))
+                tScore += 2;
+            else if (toState.contains(QLatin1String("*")))
+                tScore += 1;
+            else
+                continue;
+
+            if (ii == 1)
+                reversed = true;
+            else
+                reversed = false;
+
+            if (tScore == 4) {
+                highest = t;
+                done = true;
+                break;
+            } else if (tScore > score) {
+                score = tScore;
+                highest = t;
+            }
+        }
+    }
+
+    if (highest)
+        highest->setReversed(reversed);
+
+    return highest;
+}
+
+void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state, 
+                                                   bool ignoreTrans)
+{
+    Q_Q(QDeclarativeStateGroup);
+    if (!componentComplete) {
+        currentState = state;
+        return;
+    }
+
+    if (applyingState) {
+        qWarning() << "Can't apply a state change as part of a state definition.";
+        return;
+    }
+
+    applyingState = true;
+
+    QDeclarativeTransition *transition = (ignoreTrans || ignoreTrans) ? 0 : findTransition(currentState, state);
+    if (stateChangeDebug()) {
+        qWarning() << this << "Changing state.  From" << currentState << ". To" << state;
+        if (transition)
+            qWarning() << "   using transition" << transition->fromState() 
+                       << transition->toState();
+    }
+
+    QDeclarativeState *oldState = 0;
+    if (!currentState.isEmpty()) {
+        for (int ii = 0; ii < states.count(); ++ii) {
+            if (states.at(ii)->name() == currentState) {
+                oldState = states.at(ii);
+                break;
+            }
+        }
+    }
+
+    currentState = state;
+    emit q->stateChanged(currentState);
+
+    QDeclarativeState *newState = 0;
+    for (int ii = 0; ii < states.count(); ++ii) {
+        if (states.at(ii)->name() == currentState) {
+            newState = states.at(ii);
+            break;
+        }
+    }
+
+    if (oldState == 0 || newState == 0) {
+        if (!nullState) { nullState = new QDeclarativeState; QDeclarativeGraphics_setParent_noEvent(nullState, q); }
+        if (!oldState) oldState = nullState;
+        if (!newState) newState = nullState;
+    }
+
+    newState->apply(q, transition, oldState);
+    applyingState = false;
+    if (!transition)
+        static_cast<QDeclarativeStatePrivate*>(QObjectPrivate::get(newState))->complete();
+}
+
+QDeclarativeState *QDeclarativeStateGroup::findState(const QString &name) const
+{
+    Q_D(const QDeclarativeStateGroup);
+    for (int i = 0; i < d->states.count(); ++i) {
+        QDeclarativeState *state = d->states.at(i);
+        if (state->name() == name)
+            return state;
+    }
+
+    return 0;
+}
+
+void QDeclarativeStateGroup::removeState(QDeclarativeState *state)
+{
+    Q_D(QDeclarativeStateGroup);
+    d->states.removeOne(state);
+}
+
+QT_END_NAMESPACE
+
+
diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/declarative/util/qdeclarativestategroup_p.h
new file mode 100644
index 0000000..9650199
--- /dev/null
+++ b/src/declarative/util/qdeclarativestategroup_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESTATEGROUP_H
+#define QDECLARATIVESTATEGROUP_H
+
+#include "qdeclarativestate_p.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeStateGroupPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_DECLARE_PRIVATE(QDeclarativeStateGroup)
+
+    Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeState> states READ statesProperty DESIGNABLE false)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeTransition> transitions READ transitionsProperty DESIGNABLE false)
+
+public:
+    QDeclarativeStateGroup(QObject * = 0);
+    virtual ~QDeclarativeStateGroup();
+
+    QString state() const;
+    void setState(const QString &);
+
+    QDeclarativeListProperty<QDeclarativeState> statesProperty();
+    QList<QDeclarativeState *> states() const;
+
+    QDeclarativeListProperty<QDeclarativeTransition> transitionsProperty();
+
+    QDeclarativeState *findState(const QString &name) const;
+
+    virtual void classBegin();
+    virtual void componentComplete();
+Q_SIGNALS:
+    void stateChanged(const QString &);
+
+private:
+    friend class QDeclarativeState;
+    bool updateAutoState();
+    void removeState(QDeclarativeState *state);
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeStateGroup)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVESTATEGROUP_H
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
new file mode 100644
index 0000000..6001a84
--- /dev/null
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -0,0 +1,833 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativestateoperations_p.h"
+
+#include <qdeclarative.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeexpression.h>
+#include <qdeclarativeinfo.h>
+#include <qdeclarativeanchors_p_p.h>
+#include <qdeclarativeitem_p.h>
+#include <qdeclarativeguard_p.h>
+
+#include <QtCore/qdebug.h>
+#include <QtGui/qgraphicsitem.h>
+#include <QtCore/qmath.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeParentChangePrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeParentChange)
+public:
+    QDeclarativeParentChangePrivate() : target(0), parent(0), origParent(0), origStackBefore(0),
+                               rewindParent(0), rewindStackBefore(0) {}
+
+    QDeclarativeItem *target;
+    QDeclarativeItem *parent;
+    QDeclarativeGuard<QDeclarativeItem> origParent;
+    QDeclarativeGuard<QDeclarativeItem> origStackBefore;
+    QDeclarativeItem *rewindParent;
+    QDeclarativeItem *rewindStackBefore;
+
+    void doChange(QDeclarativeItem *targetParent, QDeclarativeItem *stackBefore = 0);
+};
+
+void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, QDeclarativeItem *stackBefore)
+{
+    if (targetParent && target && target->parentItem()) {
+        //### for backwards direction, can we just restore original x, y, scale, rotation
+        Q_Q(QDeclarativeParentChange);
+        bool ok;
+        const QTransform &transform = target->itemTransform(targetParent, &ok);
+        if (transform.type() >= QTransform::TxShear || !ok) {
+            qmlInfo(q) << QDeclarativeParentChange::tr("Unable to preserve appearance under complex transform");
+            ok = false;
+        }
+
+        qreal scale = 1;
+        qreal rotation = 0;
+        if (ok && transform.type() != QTransform::TxRotate) {
+            if (transform.m11() == transform.m22())
+                scale = transform.m11();
+            else {
+                qmlInfo(q) << QDeclarativeParentChange::tr("Unable to preserve appearance under non-uniform scale");
+                ok = false;
+            }
+        } else if (ok && transform.type() == QTransform::TxRotate) {
+            if (transform.m11() == transform.m22())
+                scale = qSqrt(transform.m11()*transform.m11() + transform.m12()*transform.m12());
+            else {
+                qmlInfo(q) << QDeclarativeParentChange::tr("Unable to preserve appearance under non-uniform scale");
+                ok = false;
+            }
+
+            if (scale != 0)
+                rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/M_PI;
+            else {
+                qmlInfo(q) << QDeclarativeParentChange::tr("Unable to preserve appearance under scale of 0");
+                ok = false;
+            }
+        }
+
+        qreal xt = transform.dx();
+        qreal yt = transform.dy();
+        if (ok && target->transformOrigin() != QDeclarativeItem::TopLeft) {
+            qreal tempxt = target->transformOriginPoint().x();
+            qreal tempyt = target->transformOriginPoint().y();
+            QTransform t;
+            t.translate(-tempxt, -tempyt);
+            t.rotate(rotation);
+            t.scale(scale, scale);
+            t.translate(tempxt, tempyt);
+            QPointF offset = t.map(QPointF(0,0));
+            xt += offset.x();
+            yt += offset.y();
+        }
+
+        target->setParentItem(targetParent);
+        if (ok) {
+            //qDebug() << xt << yt << rotation << scale;
+            target->setX(xt);
+            target->setY(yt);
+            target->setRotation(rotation);
+            target->setScale(scale);
+        }
+    } else if (target) {
+        target->setParentItem(targetParent);
+    }
+
+    //restore the original stack position.
+    //### if stackBefore has also been reparented this won't work
+    if (stackBefore)
+        target->stackBefore(stackBefore);
+}
+
+/*!
+    \preliminary
+    \qmlclass ParentChange QDeclarativeParentChange
+    \brief The ParentChange element allows you to reparent an Item in a state change.
+
+    ParentChange reparents an Item while preserving its visual appearance (position, rotation,
+    and scale) on screen. You can then specify a transition to move/rotate/scale the Item to
+    its final intended appearance.
+
+    ParentChange can only preserve visual appearance if no complex transforms are involved.
+    More specifically, it will not work if the transform property has been set for any
+    Items involved in the reparenting (defined as any Items in the common ancestor tree
+    for the original and new parent).
+
+    You can specify at which point in a transition you want a ParentChange to occur by
+    using a ParentAction.
+*/
+
+
+QDeclarativeParentChange::QDeclarativeParentChange(QObject *parent)
+    : QDeclarativeStateOperation(*(new QDeclarativeParentChangePrivate), parent)
+{
+}
+
+QDeclarativeParentChange::~QDeclarativeParentChange()
+{
+}
+
+/*!
+    \qmlproperty Item ParentChange::target
+    This property holds the item to be reparented
+*/
+
+QDeclarativeItem *QDeclarativeParentChange::object() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->target;
+}
+
+void QDeclarativeParentChange::setObject(QDeclarativeItem *target)
+{
+    Q_D(QDeclarativeParentChange);
+    d->target = target;
+}
+
+/*!
+    \qmlproperty Item ParentChange::parent
+    This property holds the parent for the item in this state
+*/
+
+QDeclarativeItem *QDeclarativeParentChange::parent() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->parent;
+}
+
+void QDeclarativeParentChange::setParent(QDeclarativeItem *parent)
+{
+    Q_D(QDeclarativeParentChange);
+    d->parent = parent;
+}
+
+QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
+{
+    Q_D(QDeclarativeParentChange);
+    if (!d->target || !d->parent)
+        return ActionList();
+
+    QDeclarativeAction a;
+    a.event = this;
+
+    return ActionList() << a;
+}
+
+class AccessibleFxItem : public QDeclarativeItem
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeItem)
+public:
+    int siblingIndex() {
+        Q_D(QDeclarativeItem);
+        return d->siblingIndex;
+    }
+};
+
+void QDeclarativeParentChange::saveOriginals()
+{
+    Q_D(QDeclarativeParentChange);
+    saveCurrentValues();
+    d->origParent = d->rewindParent;
+    d->origStackBefore = d->rewindStackBefore;
+}
+
+void QDeclarativeParentChange::execute()
+{
+    Q_D(QDeclarativeParentChange);
+    d->doChange(d->parent);
+}
+
+bool QDeclarativeParentChange::isReversable()
+{
+    return true;
+}
+
+void QDeclarativeParentChange::reverse()
+{
+    Q_D(QDeclarativeParentChange);
+    d->doChange(d->origParent, d->origStackBefore);
+}
+
+QString QDeclarativeParentChange::typeName() const
+{
+    return QLatin1String("ParentChange");
+}
+
+bool QDeclarativeParentChange::override(QDeclarativeActionEvent*other)
+{
+    Q_D(QDeclarativeParentChange);
+    if (other->typeName() != QLatin1String("ParentChange"))
+        return false;
+    if (QDeclarativeParentChange *otherPC = static_cast<QDeclarativeParentChange*>(other))
+        return (d->target == otherPC->object());
+    return false;
+}
+
+void QDeclarativeParentChange::saveCurrentValues()
+{
+    Q_D(QDeclarativeParentChange);
+    if (!d->target) {
+        d->rewindParent = 0;
+        d->rewindStackBefore = 0;
+        return;
+    }
+
+    d->rewindParent = d->target->parentItem();
+
+    if (!d->rewindParent) {
+        d->rewindStackBefore = 0;
+        return;
+    }
+
+    //try to determine the item's original stack position so we can restore it
+    int siblingIndex = ((AccessibleFxItem*)d->target)->siblingIndex() + 1;
+    QList<QGraphicsItem*> children = d->rewindParent->childItems();
+    for (int i = 0; i < children.count(); ++i) {
+        QDeclarativeItem *child = qobject_cast<QDeclarativeItem*>(children.at(i));
+        if (!child)
+            continue;
+        if (((AccessibleFxItem*)child)->siblingIndex() == siblingIndex) {
+            d->rewindStackBefore = child;
+            break;
+        }
+    }
+}
+
+void QDeclarativeParentChange::rewind()
+{
+    Q_D(QDeclarativeParentChange);
+    d->doChange(d->rewindParent, d->rewindStackBefore);
+}
+
+class QDeclarativeStateChangeScriptPrivate : public QObjectPrivate
+{
+public:
+    QDeclarativeStateChangeScriptPrivate() {}
+
+    QDeclarativeScriptString script;
+    QString name;
+};
+
+/*!
+    \qmlclass StateChangeScript QDeclarativeStateChangeScript
+    \brief The StateChangeScript element allows you to run a script in a state.
+
+    The script specified will be run immediately when the state is made current.
+    Alternatively you can use a ScriptAction to specify at which point in the transition
+    you want the StateChangeScript to be run.
+*/
+
+QDeclarativeStateChangeScript::QDeclarativeStateChangeScript(QObject *parent)
+: QDeclarativeStateOperation(*(new QDeclarativeStateChangeScriptPrivate), parent)
+{
+}
+
+QDeclarativeStateChangeScript::~QDeclarativeStateChangeScript()
+{
+}
+
+/*!
+    \qmlproperty script StateChangeScript::script
+    This property holds the script to run when the state is current.
+*/
+QDeclarativeScriptString QDeclarativeStateChangeScript::script() const
+{
+    Q_D(const QDeclarativeStateChangeScript);
+    return d->script;
+}
+
+void QDeclarativeStateChangeScript::setScript(const QDeclarativeScriptString &s)
+{
+    Q_D(QDeclarativeStateChangeScript);
+    d->script = s;
+}
+
+/*!
+    \qmlproperty script StateChangeScript::script
+    This property holds the name of the script. This name can be used by a
+    ScriptAction to target a specific script.
+
+    \sa ScriptAction::stateChangeScriptName
+*/
+QString QDeclarativeStateChangeScript::name() const
+{
+    Q_D(const QDeclarativeStateChangeScript);
+    return d->name;
+}
+
+void QDeclarativeStateChangeScript::setName(const QString &n)
+{
+    Q_D(QDeclarativeStateChangeScript);
+    d->name = n;
+}
+
+void QDeclarativeStateChangeScript::execute()
+{
+    Q_D(QDeclarativeStateChangeScript);
+    const QString &script = d->script.script();
+    if (!script.isEmpty()) {
+        QDeclarativeExpression expr(d->script.context(), script, d->script.scopeObject());
+        expr.value();
+    }
+}
+
+QDeclarativeStateChangeScript::ActionList QDeclarativeStateChangeScript::actions()
+{
+    ActionList rv;
+    QDeclarativeAction a;
+    a.event = this;
+    rv << a;
+    return rv;
+}
+
+QString QDeclarativeStateChangeScript::typeName() const
+{
+    return QLatin1String("StateChangeScript");
+}
+
+/*!
+    \qmlclass AnchorChanges QDeclarativeAnchorChanges
+    \brief The AnchorChanges element allows you to change the anchors of an item in a state.
+
+    In the following example we change the top and bottom anchors of an item:
+    \snippet examples/declarative/anchors/anchor-changes.qml 0
+
+    AnchorChanges will 'inject' \c x, \c y, \c width, and \c height changes into the transition,
+    so you can animate them as you would normally changes to these properties:
+    \qml
+    //animate our anchor changes
+    NumberAnimation { targets: content; properties: "x,y,width,height" }
+    \endqml
+
+    For more information on anchors see \l {anchor-layout}{Anchor Layouts}.
+*/
+
+
+
+class QDeclarativeAnchorChangesPrivate : public QObjectPrivate
+{
+public:
+    QDeclarativeAnchorChangesPrivate() : target(0) {}
+
+    QString name;
+    QDeclarativeItem *target;
+    QString resetString;
+    QStringList resetList;
+    QDeclarativeAnchorLine left;
+    QDeclarativeAnchorLine right;
+    QDeclarativeAnchorLine horizontalCenter;
+    QDeclarativeAnchorLine top;
+    QDeclarativeAnchorLine bottom;
+    QDeclarativeAnchorLine verticalCenter;
+    QDeclarativeAnchorLine baseline;
+
+    QDeclarativeAnchorLine origLeft;
+    QDeclarativeAnchorLine origRight;
+    QDeclarativeAnchorLine origHCenter;
+    QDeclarativeAnchorLine origTop;
+    QDeclarativeAnchorLine origBottom;
+    QDeclarativeAnchorLine origVCenter;
+    QDeclarativeAnchorLine origBaseline;
+
+    QDeclarativeAnchorLine rewindLeft;
+    QDeclarativeAnchorLine rewindRight;
+    QDeclarativeAnchorLine rewindHCenter;
+    QDeclarativeAnchorLine rewindTop;
+    QDeclarativeAnchorLine rewindBottom;
+    QDeclarativeAnchorLine rewindVCenter;
+    QDeclarativeAnchorLine rewindBaseline;
+
+    qreal fromX;
+    qreal fromY;
+    qreal fromWidth;
+    qreal fromHeight;
+};
+
+/*!
+    \qmlproperty Item AnchorChanges::target
+    This property holds the Item whose anchors will change
+*/
+
+QDeclarativeAnchorChanges::QDeclarativeAnchorChanges(QObject *parent)
+ : QDeclarativeStateOperation(*(new QDeclarativeAnchorChangesPrivate), parent)
+{
+}
+
+QDeclarativeAnchorChanges::~QDeclarativeAnchorChanges()
+{
+}
+
+QDeclarativeAnchorChanges::ActionList QDeclarativeAnchorChanges::actions()
+{
+    QDeclarativeAction a;
+    a.event = this;
+    return ActionList() << a;
+}
+
+QDeclarativeItem *QDeclarativeAnchorChanges::object() const
+{
+    Q_D(const QDeclarativeAnchorChanges);
+    return d->target;
+}
+
+void QDeclarativeAnchorChanges::setObject(QDeclarativeItem *target)
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->target = target;
+}
+
+QString QDeclarativeAnchorChanges::reset() const
+{
+    Q_D(const QDeclarativeAnchorChanges);
+    return d->resetString;
+}
+
+void QDeclarativeAnchorChanges::setReset(const QString &reset)
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->resetString = reset;
+    d->resetList = d->resetString.split(QLatin1Char(','));
+    for (int i = 0; i < d->resetList.count(); ++i)
+        d->resetList[i] = d->resetList.at(i).trimmed();
+}
+
+/*!
+    \qmlproperty AnchorLine AnchorChanges::left
+    \qmlproperty AnchorLine AnchorChanges::right
+    \qmlproperty AnchorLine AnchorChanges::horizontalCenter
+    \qmlproperty AnchorLine AnchorChanges::top
+    \qmlproperty AnchorLine AnchorChanges::bottom
+    \qmlproperty AnchorLine AnchorChanges::verticalCenter
+    \qmlproperty AnchorLine AnchorChanges::baseline
+
+    These properties change the respective anchors of the item.
+*/
+
+QDeclarativeAnchorLine QDeclarativeAnchorChanges::left() const
+{
+    Q_D(const QDeclarativeAnchorChanges);
+    return d->left;
+}
+
+void QDeclarativeAnchorChanges::setLeft(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->left = edge;
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchorChanges::right() const
+{
+    Q_D(const QDeclarativeAnchorChanges);
+    return d->right;
+}
+
+void QDeclarativeAnchorChanges::setRight(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->right = edge;
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchorChanges::horizontalCenter() const
+{
+    Q_D(const QDeclarativeAnchorChanges);
+    return d->horizontalCenter;
+}
+
+void QDeclarativeAnchorChanges::setHorizontalCenter(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->horizontalCenter = edge;
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchorChanges::top() const
+{
+    Q_D(const QDeclarativeAnchorChanges);
+    return d->top;
+}
+
+void QDeclarativeAnchorChanges::setTop(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->top = edge;
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchorChanges::bottom() const
+{
+    Q_D(const QDeclarativeAnchorChanges);
+    return d->bottom;
+}
+
+void QDeclarativeAnchorChanges::setBottom(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->bottom = edge;
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchorChanges::verticalCenter() const
+{
+    Q_D(const QDeclarativeAnchorChanges);
+    return d->verticalCenter;
+}
+
+void QDeclarativeAnchorChanges::setVerticalCenter(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->verticalCenter = edge;
+}
+
+QDeclarativeAnchorLine QDeclarativeAnchorChanges::baseline() const
+{
+    Q_D(const QDeclarativeAnchorChanges);
+    return d->baseline;
+}
+
+void QDeclarativeAnchorChanges::setBaseline(const QDeclarativeAnchorLine &edge)
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->baseline = edge;
+}
+
+void QDeclarativeAnchorChanges::execute()
+{
+    Q_D(QDeclarativeAnchorChanges);
+    if (!d->target)
+        return;
+
+    //set any anchors that have been specified
+    if (d->left.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setLeft(d->left);
+    if (d->right.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setRight(d->right);
+    if (d->horizontalCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setHorizontalCenter(d->horizontalCenter);
+    if (d->top.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setTop(d->top);
+    if (d->bottom.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setBottom(d->bottom);
+    if (d->verticalCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setVerticalCenter(d->verticalCenter);
+    if (d->baseline.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setBaseline(d->baseline);
+}
+
+bool QDeclarativeAnchorChanges::isReversable()
+{
+    return true;
+}
+
+void QDeclarativeAnchorChanges::reverse()
+{
+    Q_D(QDeclarativeAnchorChanges);
+    if (!d->target)
+        return;
+
+    //restore previous anchors
+    if (d->origLeft.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setLeft(d->origLeft);
+    if (d->origRight.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setRight(d->origRight);
+    if (d->origHCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setHorizontalCenter(d->origHCenter);
+    if (d->origTop.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setTop(d->origTop);
+    if (d->origBottom.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setBottom(d->origBottom);
+    if (d->origVCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setVerticalCenter(d->origVCenter);
+    if (d->origBaseline.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setBaseline(d->origBaseline);
+}
+
+QString QDeclarativeAnchorChanges::typeName() const
+{
+    return QLatin1String("AnchorChanges");
+}
+
+QList<QDeclarativeAction> QDeclarativeAnchorChanges::extraActions()
+{
+    Q_D(QDeclarativeAnchorChanges);
+    QList<QDeclarativeAction> extra;
+
+    //### try to be smarter about which ones we add.
+    //    or short-circuit later on if they haven't actually changed.
+    //    we shouldn't set explicit width if there wasn't one before.
+    if (d->target) {
+        QDeclarativeAction a;
+        a.fromValue = d->fromX;
+        a.property = QDeclarativeMetaProperty(d->target, QLatin1String("x"));
+        extra << a;
+
+        a.fromValue = d->fromY;
+        a.property = QDeclarativeMetaProperty(d->target, QLatin1String("y"));
+        extra << a;
+
+        a.fromValue = d->fromWidth;
+        a.property = QDeclarativeMetaProperty(d->target, QLatin1String("width"));
+        extra << a;
+
+        a.fromValue = d->fromHeight;
+        a.property = QDeclarativeMetaProperty(d->target, QLatin1String("height"));
+        extra << a;
+    }
+
+    return extra;
+}
+
+bool QDeclarativeAnchorChanges::changesBindings()
+{
+    return true;
+}
+
+void QDeclarativeAnchorChanges::saveOriginals()
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->origLeft = d->target->anchors()->left();
+    d->origRight = d->target->anchors()->right();
+    d->origHCenter = d->target->anchors()->horizontalCenter();
+    d->origTop = d->target->anchors()->top();
+    d->origBottom = d->target->anchors()->bottom();
+    d->origVCenter = d->target->anchors()->verticalCenter();
+    d->origBaseline = d->target->anchors()->baseline();
+
+    saveCurrentValues();
+}
+
+void QDeclarativeAnchorChanges::clearForwardBindings()
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->fromX = d->target->x();
+    d->fromY = d->target->y();
+    d->fromWidth = d->target->width();
+    d->fromHeight = d->target->height();
+
+    //reset any anchors that have been specified
+    if (d->resetList.contains(QLatin1String("left")))
+        d->target->anchors()->resetLeft();
+    if (d->resetList.contains(QLatin1String("right")))
+        d->target->anchors()->resetRight();
+    if (d->resetList.contains(QLatin1String("horizontalCenter")))
+        d->target->anchors()->resetHorizontalCenter();
+    if (d->resetList.contains(QLatin1String("top")))
+        d->target->anchors()->resetTop();
+    if (d->resetList.contains(QLatin1String("bottom")))
+        d->target->anchors()->resetBottom();
+    if (d->resetList.contains(QLatin1String("verticalCenter")))
+        d->target->anchors()->resetVerticalCenter();
+    if (d->resetList.contains(QLatin1String("baseline")))
+        d->target->anchors()->resetBaseline();
+
+    //reset any anchors that we'll be setting in the state
+    if (d->left.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetLeft();
+    if (d->right.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetRight();
+    if (d->horizontalCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetHorizontalCenter();
+    if (d->top.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetTop();
+    if (d->bottom.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetBottom();
+    if (d->verticalCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetVerticalCenter();
+    if (d->baseline.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetBaseline();
+}
+
+void QDeclarativeAnchorChanges::clearReverseBindings()
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->fromX = d->target->x();
+    d->fromY = d->target->y();
+    d->fromWidth = d->target->width();
+    d->fromHeight = d->target->height();
+
+    //reset any anchors that were set in the state
+    if (d->left.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetLeft();
+    if (d->right.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetRight();
+    if (d->horizontalCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetHorizontalCenter();
+    if (d->top.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetTop();
+    if (d->bottom.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetBottom();
+    if (d->verticalCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetVerticalCenter();
+    if (d->baseline.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetBaseline();
+
+    //reset any anchors that were set in the original state
+    if (d->origLeft.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetLeft();
+    if (d->origRight.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetRight();
+    if (d->origHCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetHorizontalCenter();
+    if (d->origTop.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetTop();
+    if (d->origBottom.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetBottom();
+    if (d->origVCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetVerticalCenter();
+    if (d->origBaseline.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->resetBaseline();
+}
+
+bool QDeclarativeAnchorChanges::override(QDeclarativeActionEvent*other)
+{
+    if (other->typeName() != QLatin1String("AnchorChanges"))
+        return false;
+    if (static_cast<QDeclarativeActionEvent*>(this) == other)
+        return true;
+    if (static_cast<QDeclarativeAnchorChanges*>(other)->object() == object())
+        return true;
+    return false;
+}
+
+void QDeclarativeAnchorChanges::rewind()
+{
+    Q_D(QDeclarativeAnchorChanges);
+    if (!d->target)
+        return;
+
+    //restore previous anchors
+    if (d->rewindLeft.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setLeft(d->rewindLeft);
+    if (d->rewindRight.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setRight(d->rewindRight);
+    if (d->rewindHCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setHorizontalCenter(d->rewindHCenter);
+    if (d->rewindTop.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setTop(d->rewindTop);
+    if (d->rewindBottom.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setBottom(d->rewindBottom);
+    if (d->rewindVCenter.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setVerticalCenter(d->rewindVCenter);
+    if (d->rewindBaseline.anchorLine != QDeclarativeAnchorLine::Invalid)
+        d->target->anchors()->setBaseline(d->rewindBaseline);
+}
+
+void QDeclarativeAnchorChanges::saveCurrentValues()
+{
+    Q_D(QDeclarativeAnchorChanges);
+    d->rewindLeft = d->target->anchors()->left();
+    d->rewindRight = d->target->anchors()->right();
+    d->rewindHCenter = d->target->anchors()->horizontalCenter();
+    d->rewindTop = d->target->anchors()->top();
+    d->rewindBottom = d->target->anchors()->bottom();
+    d->rewindVCenter = d->target->anchors()->verticalCenter();
+    d->rewindBaseline = d->target->anchors()->baseline();
+}
+
+#include <qdeclarativestateoperations.moc>
+#include <moc_qdeclarativestateoperations_p.cpp>
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h
new file mode 100644
index 0000000..9204a58
--- /dev/null
+++ b/src/declarative/util/qdeclarativestateoperations_p.h
@@ -0,0 +1,184 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESTATEOPERATIONS_H
+#define QDECLARATIVESTATEOPERATIONS_H
+
+#include "qdeclarativestate_p.h"
+
+#include <qdeclarativeitem.h>
+#include "private/qdeclarativeanchors_p.h"
+#include <qdeclarativescriptstring.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeParentChangePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeParentChange)
+
+    Q_PROPERTY(QDeclarativeItem *target READ object WRITE setObject)
+    Q_PROPERTY(QDeclarativeItem *parent READ parent WRITE setParent)
+public:
+    QDeclarativeParentChange(QObject *parent=0);
+    ~QDeclarativeParentChange();
+
+    QDeclarativeItem *object() const;
+    void setObject(QDeclarativeItem *);
+
+    QDeclarativeItem *parent() const;
+    void setParent(QDeclarativeItem *);
+
+    virtual ActionList actions();
+
+    virtual void saveOriginals();
+    virtual void execute();
+    virtual bool isReversable();
+    virtual void reverse();
+    virtual QString typeName() const;
+    virtual bool override(QDeclarativeActionEvent*other);
+    virtual void rewind();
+    virtual void saveCurrentValues();
+};
+
+class QDeclarativeStateChangeScriptPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeStateChangeScript : public QDeclarativeStateOperation, public QDeclarativeActionEvent
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeStateChangeScript)
+
+    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript)
+    Q_PROPERTY(QString name READ name WRITE setName)
+
+public:
+    QDeclarativeStateChangeScript(QObject *parent=0);
+    ~QDeclarativeStateChangeScript();
+
+    virtual ActionList actions();
+
+    virtual QString typeName() const;
+
+    QDeclarativeScriptString script() const;
+    void setScript(const QDeclarativeScriptString &);
+    
+    QString name() const;
+    void setName(const QString &);
+
+    virtual void execute();
+};
+
+class QDeclarativeAnchorChangesPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeAnchorChanges : public QDeclarativeStateOperation, public QDeclarativeActionEvent
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeAnchorChanges)
+
+    Q_PROPERTY(QDeclarativeItem *target READ object WRITE setObject)
+    Q_PROPERTY(QString reset READ reset WRITE setReset)
+    Q_PROPERTY(QDeclarativeAnchorLine left READ left WRITE setLeft)
+    Q_PROPERTY(QDeclarativeAnchorLine right READ right WRITE setRight)
+    Q_PROPERTY(QDeclarativeAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter)
+    Q_PROPERTY(QDeclarativeAnchorLine top READ top WRITE setTop)
+    Q_PROPERTY(QDeclarativeAnchorLine bottom READ bottom WRITE setBottom)
+    Q_PROPERTY(QDeclarativeAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter)
+    Q_PROPERTY(QDeclarativeAnchorLine baseline READ baseline WRITE setBaseline)
+
+public:
+    QDeclarativeAnchorChanges(QObject *parent=0);
+    ~QDeclarativeAnchorChanges();
+
+    virtual ActionList actions();
+
+    QDeclarativeItem *object() const;
+    void setObject(QDeclarativeItem *);
+
+    QString reset() const;
+    void setReset(const QString &);
+
+    QDeclarativeAnchorLine left() const;
+    void setLeft(const QDeclarativeAnchorLine &edge);
+
+    QDeclarativeAnchorLine right() const;
+    void setRight(const QDeclarativeAnchorLine &edge);
+
+    QDeclarativeAnchorLine horizontalCenter() const;
+    void setHorizontalCenter(const QDeclarativeAnchorLine &edge);
+
+    QDeclarativeAnchorLine top() const;
+    void setTop(const QDeclarativeAnchorLine &edge);
+
+    QDeclarativeAnchorLine bottom() const;
+    void setBottom(const QDeclarativeAnchorLine &edge);
+
+    QDeclarativeAnchorLine verticalCenter() const;
+    void setVerticalCenter(const QDeclarativeAnchorLine &edge);
+
+    QDeclarativeAnchorLine baseline() const;
+    void setBaseline(const QDeclarativeAnchorLine &edge);
+
+    virtual void execute();
+    virtual bool isReversable();
+    virtual void reverse();
+    virtual QString typeName() const;
+    virtual bool override(QDeclarativeActionEvent*other);
+    virtual QList<QDeclarativeAction> extraActions();
+    virtual bool changesBindings();
+    virtual void saveOriginals();
+    virtual void clearForwardBindings();
+    virtual void clearReverseBindings();
+    virtual void rewind();
+    virtual void saveCurrentValues();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeParentChange)
+QML_DECLARE_TYPE(QDeclarativeStateChangeScript)
+QML_DECLARE_TYPE(QDeclarativeAnchorChanges)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVESTATEOPERATIONS_H
diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp
new file mode 100644
index 0000000..461de12
--- /dev/null
+++ b/src/declarative/util/qdeclarativestyledtext.cpp
@@ -0,0 +1,347 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QStack>
+#include <QVector>
+#include <QPainter>
+#include <QTextLayout>
+#include <QDebug>
+#include <qmath.h>
+#include "qdeclarativestyledtext_p.h"
+
+/*
+    QDeclarativeStyledText supports few tags:
+
+    <b></b> - bold
+    <i></i> - italic
+    <br> - new line
+    <font color="color_name" size="1-7"></font>
+
+    The opening and closing tags must be correctly nested.
+*/
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeStyledTextPrivate
+{
+public:
+    QDeclarativeStyledTextPrivate(const QString &t, QTextLayout &l) : text(t), layout(l), baseFont(layout.font()) {}
+
+    void parse();
+    bool parseTag(const QChar *&ch, const QString &textIn, QString &textOut, QTextCharFormat &format);
+    bool parseCloseTag(const QChar *&ch, const QString &textIn);
+    void parseEntity(const QChar *&ch, const QString &textIn, QString &textOut);
+    bool parseFontAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format);
+    QPair<QStringRef,QStringRef> parseAttribute(const QChar *&ch, const QString &textIn);
+    QStringRef parseValue(const QChar *&ch, const QString &textIn);
+
+    inline void skipSpace(const QChar *&ch) {
+        while (ch->isSpace() && !ch->isNull())
+            ++ch;
+    }
+
+    QString text;
+    QTextLayout &layout;
+    QFont baseFont;
+
+    static const QChar lessThan;
+    static const QChar greaterThan;
+    static const QChar equals;
+    static const QChar singleQuote;
+    static const QChar doubleQuote;
+    static const QChar slash;
+    static const QChar ampersand;
+};
+
+const QChar QDeclarativeStyledTextPrivate::lessThan(QLatin1Char('<'));
+const QChar QDeclarativeStyledTextPrivate::greaterThan(QLatin1Char('>'));
+const QChar QDeclarativeStyledTextPrivate::equals(QLatin1Char('='));
+const QChar QDeclarativeStyledTextPrivate::singleQuote(QLatin1Char('\''));
+const QChar QDeclarativeStyledTextPrivate::doubleQuote(QLatin1Char('\"'));
+const QChar QDeclarativeStyledTextPrivate::slash(QLatin1Char('/'));
+const QChar QDeclarativeStyledTextPrivate::ampersand(QLatin1Char('&'));
+
+QDeclarativeStyledText::QDeclarativeStyledText(const QString &string, QTextLayout &layout)
+: d(new QDeclarativeStyledTextPrivate(string, layout))
+{
+}
+
+QDeclarativeStyledText::~QDeclarativeStyledText()
+{
+    delete d;
+}
+
+void QDeclarativeStyledText::parse(const QString &string, QTextLayout &layout)
+{
+    if (string.isEmpty())
+        return;
+    QDeclarativeStyledText styledText(string, layout);
+    styledText.d->parse();
+}
+
+void QDeclarativeStyledTextPrivate::parse()
+{
+    QList<QTextLayout::FormatRange> ranges;
+    QStack<QTextCharFormat> formatStack;
+
+    QString drawText;
+    drawText.reserve(text.count());
+
+    int textStart = 0;
+    int textLength = 0;
+    int rangeStart = 0;
+    const QChar *ch = text.constData();
+    while (!ch->isNull()) {
+        if (*ch == lessThan) {
+            if (textLength)
+                drawText.append(QStringRef(&text, textStart, textLength));
+            if (rangeStart != drawText.length() && formatStack.count()) {
+                QTextLayout::FormatRange formatRange;
+                formatRange.format = formatStack.top();
+                formatRange.start = rangeStart;
+                formatRange.length = drawText.length() - rangeStart;
+                ranges.append(formatRange);
+            }
+            rangeStart = drawText.length();
+            ++ch;
+            if (*ch == slash) {
+                ++ch;
+                if (parseCloseTag(ch, text)) {
+                    if (formatStack.count())
+                        formatStack.pop();
+                }
+            } else {
+                QTextCharFormat format;
+                if (formatStack.count())
+                    format = formatStack.top();
+                else
+                    format.setFont(baseFont);
+                if (parseTag(ch, text, drawText, format))
+                    formatStack.push(format);
+            }
+            textStart = ch - text.constData() + 1;
+            textLength = 0;
+        } else if (*ch == ampersand) {
+            ++ch;
+            drawText.append(QStringRef(&text, textStart, textLength));
+            parseEntity(ch, text, drawText);
+            textStart = ch - text.constData() + 1;
+            textLength = 0;
+        } else {
+            ++textLength;
+        }
+        if (!ch->isNull())
+            ++ch;
+    }
+    if (textLength)
+        drawText.append(QStringRef(&text, textStart, textLength));
+    if (rangeStart != drawText.length() && formatStack.count()) {
+        QTextLayout::FormatRange formatRange;
+        formatRange.format = formatStack.top();
+        formatRange.start = rangeStart;
+        formatRange.length = drawText.length() - rangeStart;
+        ranges.append(formatRange);
+    }
+
+    layout.setText(drawText);
+    layout.setAdditionalFormats(ranges);
+}
+
+bool QDeclarativeStyledTextPrivate::parseTag(const QChar *&ch, const QString &textIn, QString &textOut, QTextCharFormat &format)
+{
+    skipSpace(ch);
+
+    int tagStart = ch - textIn.constData();
+    int tagLength = 0;
+    while (!ch->isNull()) {
+        if (*ch == greaterThan) {
+            QStringRef tag(&textIn, tagStart, tagLength);
+            const QChar char0 = tag.at(0);
+            if (char0 == QLatin1Char('b')) {
+                if (tagLength == 1)
+                    format.setFontWeight(QFont::Bold);
+                else if (tagLength == 2 && tag.at(1) == QLatin1Char('r'))
+                    textOut.append(QChar(QChar::LineSeparator));
+            } else if (char0 == QLatin1Char('i')) {
+                if (tagLength == 1)
+                    format.setFontItalic(true);
+            }
+            return true;
+        } else if (ch->isSpace()) {
+            // may have params.
+            QStringRef tag(&textIn, tagStart, tagLength);
+            if (tag == QLatin1String("font"))
+                return parseFontAttributes(ch, textIn, format);
+            if (*ch == greaterThan || ch->isNull())
+                continue;
+        } else if (*ch != slash){
+            tagLength++;
+        }
+        ++ch;
+    }
+
+    return false;
+}
+
+bool QDeclarativeStyledTextPrivate::parseCloseTag(const QChar *&ch, const QString &textIn)
+{
+    skipSpace(ch);
+
+    int tagStart = ch - textIn.constData();
+    int tagLength = 0;
+    while (!ch->isNull()) {
+        if (*ch == greaterThan) {
+            QStringRef tag(&textIn, tagStart, tagLength);
+            const QChar char0 = tag.at(0);
+            if (char0 == QLatin1Char('b')) {
+                if (tagLength == 1)
+                    return true;
+                else if (tag.at(1) == QLatin1Char('r') && tagLength == 2)
+                    return true;
+            } else if (char0 == QLatin1Char('i')) {
+                if (tagLength == 1)
+                    return true;
+            } else if (tag == QLatin1String("font")) {
+                return true;
+            }
+            return false;
+        } else if (!ch->isSpace()){
+            tagLength++;
+        }
+        ++ch;
+    }
+
+    return false;
+}
+
+void QDeclarativeStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textIn, QString &textOut)
+{
+    int entityStart = ch - textIn.constData();
+    int entityLength = 0;
+    while (!ch->isNull()) {
+        if (*ch == QLatin1Char(';')) {
+            QStringRef entity(&textIn, entityStart, entityLength);
+            if (entity == QLatin1String("gt"))
+                textOut += QChar(62);
+            else if (entity == QLatin1String("lt"))
+                textOut += QChar(60);
+            else if (entity == QLatin1String("amp"))
+                textOut += QChar(38);
+            return;
+        }
+        ++entityLength;
+        ++ch;
+    }
+}
+
+bool QDeclarativeStyledTextPrivate::parseFontAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format)
+{
+    bool valid = false;
+    QPair<QStringRef,QStringRef> attr;
+    do {
+        attr = parseAttribute(ch, textIn);
+        if (attr.first == QLatin1String("color")) {
+            valid = true;
+            format.setForeground(QColor(attr.second.toString()));
+        } else if (attr.first == QLatin1String("size")) {
+            valid = true;
+            int size = attr.second.toString().toInt();
+            if (attr.second.at(0) == QLatin1Char('-') || attr.second.at(0) == QLatin1Char('+'))
+                size += 3;
+            if (size >= 1 && size <= 7) {
+                static const qreal scaling[] = { 0.7, 0.8, 1.0, 1.2, 1.5, 2.0, 2.4 };
+                format.setFontPointSize(baseFont.pointSize() * scaling[size-1]);
+            }
+        }
+    } while (!ch->isNull() && !attr.first.isEmpty());
+
+    return valid;
+}
+
+QPair<QStringRef,QStringRef> QDeclarativeStyledTextPrivate::parseAttribute(const QChar *&ch, const QString &textIn)
+{
+    skipSpace(ch);
+
+    int attrStart = ch - textIn.constData();
+    int attrLength = 0;
+    while (!ch->isNull()) {
+        if (*ch == greaterThan) {
+            break;
+        } else if (*ch == equals) {
+            ++ch;
+            if (*ch != singleQuote && *ch != doubleQuote) {
+                while (*ch != greaterThan && !ch->isNull())
+                    ++ch;
+                break;
+            }
+            ++ch;
+            if (!attrLength)
+                break;
+            QStringRef attr(&textIn, attrStart, attrLength);
+            QStringRef val = parseValue(ch, textIn);
+            if (!val.isEmpty())
+                return QPair<QStringRef,QStringRef>(attr,val);
+            break;
+        } else {
+            ++attrLength;
+        }
+        ++ch;
+    }
+
+    return QPair<QStringRef,QStringRef>();
+}
+
+QStringRef QDeclarativeStyledTextPrivate::parseValue(const QChar *&ch, const QString &textIn)
+{
+    int valStart = ch - textIn.constData();
+    int valLength = 0;
+    while (*ch != singleQuote && *ch != doubleQuote && !ch->isNull()) {
+        ++valLength;
+        ++ch;
+    }
+    if (ch->isNull())
+        return QStringRef();
+    ++ch; // skip quote
+
+    return QStringRef(&textIn, valStart, valLength);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativestyledtext_p.h b/src/declarative/util/qdeclarativestyledtext_p.h
new file mode 100644
index 0000000..8d2c42d
--- /dev/null
+++ b/src/declarative/util/qdeclarativestyledtext_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESTYLEDTEXT_H
+#define QDECLARATIVESTYLEDTEXT_H
+
+#include <QSizeF>
+
+QT_BEGIN_NAMESPACE
+
+class QPainter;
+class QPointF;
+class QString;
+class QDeclarativeStyledTextPrivate;
+class QTextLayout;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeStyledText
+{
+public:
+    static void parse(const QString &string, QTextLayout &layout);
+
+private:
+    QDeclarativeStyledText(const QString &string, QTextLayout &layout);
+    ~QDeclarativeStyledText();
+
+    QDeclarativeStyledTextPrivate *d;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp
new file mode 100644
index 0000000..1e00f22
--- /dev/null
+++ b/src/declarative/util/qdeclarativesystempalette.cpp
@@ -0,0 +1,303 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativesystempalette_p.h"
+
+#include <QApplication>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeSystemPalettePrivate : public QObjectPrivate
+{
+public:
+    QPalette palette;
+    QPalette::ColorGroup group;
+};
+
+
+
+/*!
+    \qmlclass SystemPalette QDeclarativeSystemPalette
+    \ingroup group_utility
+    \brief The SystemPalette item gives access to the Qt palettes.
+    \sa QPalette
+
+    Example:
+    \qml
+    SystemPalette { id: myPalette; colorGroup: Qt.Active }
+
+    Rectangle {
+        width: 640; height: 480
+        color: myPalette.window
+        Text {
+            anchors.fill: parent
+            text: "Hello!"; color: myPalette.windowText
+        }
+    }
+    \endqml
+*/
+QDeclarativeSystemPalette::QDeclarativeSystemPalette(QObject *parent)
+    : QObject(*(new QDeclarativeSystemPalettePrivate), parent)
+{
+    Q_D(QDeclarativeSystemPalette);
+    d->palette = QApplication::palette();
+    d->group = QPalette::Active;
+    qApp->installEventFilter(this);
+}
+
+QDeclarativeSystemPalette::~QDeclarativeSystemPalette()
+{
+}
+
+/*!
+    \qmlproperty color SystemPalette::window
+    The window (general background) color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::window() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Window);
+}
+
+/*!
+    \qmlproperty color SystemPalette::windowText
+    The window text (general foreground) color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::windowText() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::WindowText);
+}
+
+/*!
+    \qmlproperty color SystemPalette::base
+    The base color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::base() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Base);
+}
+
+/*!
+    \qmlproperty color SystemPalette::text
+    The text color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::text() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Text);
+}
+
+/*!
+    \qmlproperty color SystemPalette::alternateBase
+    The alternate base color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::alternateBase() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::AlternateBase);
+}
+
+/*!
+    \qmlproperty color SystemPalette::button
+    The button color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::button() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Button);
+}
+
+/*!
+    \qmlproperty color SystemPalette::buttonText
+    The button text foreground color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::buttonText() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::ButtonText);
+}
+
+/*!
+    \qmlproperty color SystemPalette::light
+    The light color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::light() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Light);
+}
+
+/*!
+    \qmlproperty color SystemPalette::midlight
+    The midlight color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::midlight() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Midlight);
+}
+
+/*!
+    \qmlproperty color SystemPalette::dark
+    The dark color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::dark() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Dark);
+}
+
+/*!
+    \qmlproperty color SystemPalette::mid
+    The mid color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::mid() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Mid);
+}
+
+/*!
+    \qmlproperty color SystemPalette::shadow
+    The shadow color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::shadow() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Shadow);
+}
+
+/*!
+    \qmlproperty color SystemPalette::highlight
+    The highlight color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::highlight() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::Highlight);
+}
+
+/*!
+    \qmlproperty color SystemPalette::highlightedText
+    The highlighted text color of the current color group.
+
+    \sa QPalette::ColorRole
+*/
+QColor QDeclarativeSystemPalette::highlightedText() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return d->palette.color(d->group, QPalette::HighlightedText);
+}
+
+/*!
+    \qmlproperty QDeclarativeSystemPalette::ColorGroup SystemPalette::colorGroup
+
+    The color group of the palette. It can be Active, Inactive or Disabled.
+    Active is the default.
+
+    \sa QPalette::ColorGroup
+*/
+QDeclarativeSystemPalette::ColorGroup QDeclarativeSystemPalette::colorGroup() const
+{
+    Q_D(const QDeclarativeSystemPalette);
+    return (QDeclarativeSystemPalette::ColorGroup)d->group;
+}
+
+void QDeclarativeSystemPalette::setColorGroup(QDeclarativeSystemPalette::ColorGroup colorGroup)
+{
+    Q_D(QDeclarativeSystemPalette);
+    d->group = (QPalette::ColorGroup)colorGroup;
+    emit paletteChanged();
+}
+
+bool QDeclarativeSystemPalette::eventFilter(QObject *watched, QEvent *event)
+{
+    if (watched == qApp) {
+        if (event->type() == QEvent::ApplicationPaletteChange) {
+            QApplication::postEvent(this, new QEvent(QEvent::ApplicationPaletteChange));
+            return false;
+        }
+    }
+    return QObject::eventFilter(watched, event);
+}
+
+bool QDeclarativeSystemPalette::event(QEvent *event)
+{
+    Q_D(QDeclarativeSystemPalette);
+    if (event->type() == QEvent::ApplicationPaletteChange) {
+        d->palette = QApplication::palette();
+        emit paletteChanged();
+        return true;
+    }
+    return QObject::event(event);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativesystempalette_p.h b/src/declarative/util/qdeclarativesystempalette_p.h
new file mode 100644
index 0000000..9fa6b08
--- /dev/null
+++ b/src/declarative/util/qdeclarativesystempalette_p.h
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVESYSTEMPALETTE_H
+#define QDECLARATIVESYSTEMPALETTE_H
+
+#include <qdeclarative.h>
+
+#include <QtCore/qobject.h>
+#include <QPalette>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeSystemPalettePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeSystemPalette : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(ColorGroup)
+    Q_DECLARE_PRIVATE(QDeclarativeSystemPalette)
+
+    Q_PROPERTY(QDeclarativeSystemPalette::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)
+    Q_PROPERTY(QColor text READ text NOTIFY paletteChanged)
+    Q_PROPERTY(QColor alternateBase READ alternateBase NOTIFY paletteChanged)
+    Q_PROPERTY(QColor button READ button NOTIFY paletteChanged)
+    Q_PROPERTY(QColor buttonText READ buttonText NOTIFY paletteChanged)
+    Q_PROPERTY(QColor light READ light NOTIFY paletteChanged)
+    Q_PROPERTY(QColor midlight READ midlight NOTIFY paletteChanged)
+    Q_PROPERTY(QColor dark READ dark NOTIFY paletteChanged)
+    Q_PROPERTY(QColor mid READ mid NOTIFY paletteChanged)
+    Q_PROPERTY(QColor shadow READ shadow NOTIFY paletteChanged)
+    Q_PROPERTY(QColor highlight READ highlight NOTIFY paletteChanged)
+    Q_PROPERTY(QColor highlightedText READ highlightedText NOTIFY paletteChanged)
+
+public:
+    QDeclarativeSystemPalette(QObject *parent=0);
+    ~QDeclarativeSystemPalette();
+
+    enum ColorGroup { Active = QPalette::Active, Inactive = QPalette::Inactive, Disabled = QPalette::Disabled };
+
+    QColor window() const;
+    QColor windowText() const;
+
+    QColor base() const;
+    QColor text() const;
+    QColor alternateBase() const;
+
+    QColor button() const;
+    QColor buttonText() const;
+
+    QColor light() const;
+    QColor midlight() const;
+    QColor dark() const;
+    QColor mid() const;
+    QColor shadow() const;
+
+    QColor highlight() const;
+    QColor highlightedText() const;
+
+    QDeclarativeSystemPalette::ColorGroup colorGroup() const;
+    void setColorGroup(QDeclarativeSystemPalette::ColorGroup);
+
+Q_SIGNALS:
+    void paletteChanged();
+
+private:
+    bool eventFilter(QObject *watched, QEvent *event);
+    bool event(QEvent *event);
+
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeSystemPalette)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVESYSTEMPALETTE_H
diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp
new file mode 100644
index 0000000..8e133b6
--- /dev/null
+++ b/src/declarative/util/qdeclarativetimeline.cpp
@@ -0,0 +1,942 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetimeline_p_p.h"
+
+#include <QDebug>
+#include <QMutex>
+#include <QThread>
+#include <QWaitCondition>
+#include <QEvent>
+#include <QCoreApplication>
+#include <QEasingCurve>
+#include <QTime>
+
+QT_BEGIN_NAMESPACE
+
+struct Update {
+    Update(QDeclarativeTimeLineValue *_g, qreal _v)
+        : g(_g), v(_v) {}
+    Update(const QDeclarativeTimeLineCallback &_e)
+        : g(0), v(0), e(_e) {}
+
+    QDeclarativeTimeLineValue *g;
+    qreal v;
+    QDeclarativeTimeLineCallback e;
+};
+
+struct QDeclarativeTimeLinePrivate
+{
+    QDeclarativeTimeLinePrivate(QDeclarativeTimeLine *);
+
+    struct Op {
+        enum Type {
+            Pause,
+            Set,
+            Move,
+            MoveBy,
+            Accel,
+            AccelDistance,
+            Execute
+        };
+        Op() {}
+        Op(Type t, int l, qreal v, qreal v2, int o, 
+           const QDeclarativeTimeLineCallback &ev = QDeclarativeTimeLineCallback(), const QEasingCurve &es = QEasingCurve())
+            : type(t), length(l), value(v), value2(v2), order(o), event(ev),
+              easing(es) {}
+        Op(const Op &o)
+            : type(o.type), length(o.length), value(o.value), value2(o.value2),
+              order(o.order), event(o.event), easing(o.easing) {}
+        Op &operator=(const Op &o) {
+            type = o.type; length = o.length; value = o.value; 
+            value2 = o.value2; order = o.order; event = o.event; 
+            easing = o.easing;
+            return *this;
+        }
+
+        Type type;
+        int length;
+        qreal value;
+        qreal value2;
+
+        int order;
+        QDeclarativeTimeLineCallback event;
+        QEasingCurve easing;
+    };
+    struct TimeLine
+    {
+        TimeLine() : length(0), consumedOpLength(0), base(0.) {}
+        QList<Op> ops;
+        int length;
+        int consumedOpLength;
+        qreal base;
+    };
+
+    int length;
+    int syncPoint;
+    typedef QHash<QDeclarativeTimeLineObject *, TimeLine> Ops;
+    Ops ops;
+    QDeclarativeTimeLine *q;
+
+    void add(QDeclarativeTimeLineObject &, const Op &);
+    qreal value(const Op &op, int time, qreal base, bool *) const;
+
+    int advance(int);
+
+    bool clockRunning;
+    int prevTime;
+
+    int order;
+
+    QDeclarativeTimeLine::SyncMode syncMode;
+    int syncAdj;
+    QList<QPair<int, Update> > *updateQueue;
+};
+
+QDeclarativeTimeLinePrivate::QDeclarativeTimeLinePrivate(QDeclarativeTimeLine *parent)
+: length(0), syncPoint(0), q(parent), clockRunning(false), prevTime(0), order(0), syncMode(QDeclarativeTimeLine::LocalSync), syncAdj(0), updateQueue(0)
+{
+}
+
+void QDeclarativeTimeLinePrivate::add(QDeclarativeTimeLineObject &g, const Op &o)
+{
+    if (g._t && g._t != q) {
+        qWarning() << "QDeclarativeTimeLine: Cannot modify a QDeclarativeTimeLineValue owned by"
+                   << "another timeline.";
+        return;
+    }
+    g._t = q;
+
+    Ops::Iterator iter = ops.find(&g);
+    if (iter == ops.end()) {
+        iter = ops.insert(&g, TimeLine());
+        if (syncPoint > 0)
+            q->pause(g, syncPoint);
+    }
+    if (!iter->ops.isEmpty() &&
+       o.type == Op::Pause &&
+       iter->ops.last().type == Op::Pause) {
+        iter->ops.last().length += o.length;
+        iter->length += o.length;
+    } else {
+        iter->ops.append(o);
+        iter->length += o.length;
+    }
+
+    if (iter->length > length)
+        length = iter->length;
+
+    if (!clockRunning) {
+        q->stop();
+        prevTime = 0;
+        clockRunning = true;
+
+        if (syncMode == QDeclarativeTimeLine::LocalSync)  {
+            syncAdj = -1;
+        } else {
+            syncAdj = 0;
+        }
+        q->start();
+/*        q->tick(0);
+        if (syncMode == QDeclarativeTimeLine::LocalSync)  {
+            syncAdj = -1;
+        } else {
+            syncAdj = 0;
+        }
+        */
+    }
+}
+
+qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, bool *changed) const
+{
+    Q_ASSERT(time >= 0);
+    Q_ASSERT(time <= op.length);
+    *changed = true;
+
+    switch(op.type) {
+        case Op::Pause:
+            *changed = false;
+            return base;
+        case Op::Set:
+            return op.value;
+        case Op::Move:
+            if (time == 0) {
+                return base;
+            } else if (time == (op.length)) {
+                return op.value;
+            } else {
+                qreal delta = op.value - base;
+                qreal pTime = (qreal)(time) / (qreal)op.length;
+                if (op.easing.type() == QEasingCurve::Linear)
+                    return base + delta * pTime;
+                else
+                    return base + delta * op.easing.valueForProgress(pTime);
+            }
+        case Op::MoveBy:
+            if (time == 0) {
+                return base;
+            } else if (time == (op.length)) {
+                return base + op.value;
+            } else {
+                qreal delta = op.value;
+                qreal pTime = (qreal)(time) / (qreal)op.length;
+                if (op.easing.type() == QEasingCurve::Linear)
+                    return base + delta * pTime;
+                else
+                    return base + delta * op.easing.valueForProgress(pTime);
+            }
+        case Op::Accel:
+            if (time == 0) {
+                return base;
+            } else {
+                qreal t = (qreal)(time) / 1000.0f;
+                qreal delta = op.value * t + 0.5f * op.value2 * t * t;
+                return base + delta;
+            }
+        case Op::AccelDistance:
+            if (time == 0) {
+                return base;
+            } else if (time == (op.length)) {
+                return base + op.value2;
+            } else {
+                qreal t = (qreal)(time) / 1000.0f;
+                qreal accel = -1.0f * 1000.0f * op.value / (qreal)op.length;
+                qreal delta = op.value * t + 0.5f * accel * t * t;
+                return base + delta;
+
+            }
+        case Op::Execute:
+            op.event.d0(op.event.d1);
+            *changed = false;
+            return -1;
+    }
+
+    return base;
+}
+
+/*!
+    \internal
+    \class QDeclarativeTimeLine
+    \ingroup group_animation
+    \brief The QDeclarativeTimeLine class provides a timeline for controlling animations.
+
+    QDeclarativeTimeLine is similar to QTimeLine except:
+    \list
+    \i It updates QDeclarativeTimeLineValue instances directly, rather than maintaining a single
+    current value.
+
+    For example, the following animates a simple value over 200 milliseconds:
+    \code
+    QDeclarativeTimeLineValue v(<starting value>);
+    QDeclarativeTimeLine tl;
+    tl.move(v, 100., 200);
+    tl.start()
+    \endcode
+
+    If your program needs to know when values are changed, it can either
+    connect to the QDeclarativeTimeLine's updated() signal, or inherit from QDeclarativeTimeLineValue
+    and reimplement the QDeclarativeTimeLineValue::setValue() method.
+
+    \i Supports multiple QDeclarativeTimeLineValue, arbitrary start and end values and allows
+    animations to be strung together for more complex effects.
+
+    For example, the following animation moves the x and y coordinates of
+    an object from wherever they are to the position (100, 100) in 50
+    milliseconds and then further animates them to (100, 200) in 50
+    milliseconds:
+
+    \code
+    QDeclarativeTimeLineValue x(<starting value>);
+    QDeclarativeTimeLineValue y(<starting value>);
+
+    QDeclarativeTimeLine tl;
+    tl.start();
+
+    tl.move(x, 100., 50);
+    tl.move(y, 100., 50);
+    tl.move(y, 200., 50);
+    \endcode
+
+    \i All QDeclarativeTimeLine instances share a single, synchronized clock.
+
+    Actions scheduled within the same event loop tick are scheduled
+    synchronously against each other, regardless of the wall time between the
+    scheduling.  Synchronized scheduling applies both to within the same
+    QDeclarativeTimeLine and across separate QDeclarativeTimeLine's within the same process.
+
+    \endlist
+
+    Currently easing functions are not supported.
+*/
+
+
+/*!
+    Construct a new QDeclarativeTimeLine with the specified \a parent.
+*/
+QDeclarativeTimeLine::QDeclarativeTimeLine(QObject *parent)
+: QAbstractAnimation(parent)
+{
+    d = new QDeclarativeTimeLinePrivate(this);
+}
+
+/*!
+    Destroys the time line.  Any inprogress animations are canceled, but not
+    completed.
+*/
+QDeclarativeTimeLine::~QDeclarativeTimeLine()
+{
+    for (QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
+            iter != d->ops.end();
+            ++iter)
+        iter.key()->_t = 0;
+
+    delete d; d = 0;
+}
+
+/*!
+    \enum QDeclarativeTimeLine::SyncMode
+ */
+
+/*!
+    Return the timeline's synchronization mode.
+ */
+QDeclarativeTimeLine::SyncMode QDeclarativeTimeLine::syncMode() const
+{
+    return d->syncMode;
+}
+
+/*!
+    Set the timeline's synchronization mode to \a syncMode.
+ */
+void QDeclarativeTimeLine::setSyncMode(SyncMode syncMode)
+{
+    d->syncMode = syncMode;
+}
+
+/*!
+    Pause \a obj for \a time milliseconds.
+*/
+void QDeclarativeTimeLine::pause(QDeclarativeTimeLineObject &obj, int time)
+{
+    if (time <= 0) return;
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Pause, time, 0., 0., d->order++);
+    d->add(obj, op);
+}
+
+/*!
+    Execute the \a event.
+ */
+void QDeclarativeTimeLine::callback(const QDeclarativeTimeLineCallback &callback)
+{
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Execute, 0, 0, 0., d->order++, callback);
+    d->add(*callback.callbackObject(), op);
+}
+
+/*!
+    Set the \a value of \a timeLineValue.
+*/
+void QDeclarativeTimeLine::set(QDeclarativeTimeLineValue &timeLineValue, qreal value)
+{
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Set, 0, value, 0., d->order++);
+    d->add(timeLineValue, op);
+}
+
+/*!
+    Decelerate \a timeLineValue from the starting \a velocity to zero at the
+    given \a acceleration rate.  Although the \a acceleration is technically
+    a deceleration, it should always be positive.  The QDeclarativeTimeLine will ensure
+    that the deceleration is in the opposite direction to the initial velocity.
+*/
+int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal velocity, qreal acceleration)
+{
+    if ((velocity > 0.0f) ==  (acceleration > 0.0f))
+        acceleration = acceleration * -1.0f;
+
+    int time = static_cast<int>(-1000 * velocity / acceleration);
+
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Accel, time, velocity, acceleration, d->order++);
+    d->add(timeLineValue, op);
+
+    return time;
+}
+
+/*!
+    \overload
+
+    Decelerate \a timeLineValue from the starting \a velocity to zero at the
+    given \a acceleration rate over a maximum distance of maxDistance.
+
+    If necessary, QDeclarativeTimeLine will reduce the acceleration to ensure that the
+    entire operation does not require a move of more than \a maxDistance.
+    \a maxDistance should always be positive.
+*/
+int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal velocity, qreal acceleration, qreal maxDistance)
+{
+    Q_ASSERT(acceleration >= 0.0f && maxDistance >= 0.0f);
+
+    qreal maxAccel = (velocity * velocity) / (2.0f * maxDistance);
+    if (maxAccel > acceleration)
+        acceleration = maxAccel;
+
+    if ((velocity > 0.0f) ==  (acceleration > 0.0f))
+        acceleration = acceleration * -1.0f;
+
+    int time = static_cast<int>(-1000 * velocity / acceleration);
+
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Accel, time, velocity, acceleration, d->order++);
+    d->add(timeLineValue, op);
+
+    return time;
+}
+
+/*!
+    Decelerate \a timeLineValue from the starting \a velocity to zero over the given
+    \a distance.  This is like accel(), but the QDeclarativeTimeLine calculates the exact
+    deceleration to use.
+
+    \a distance should be positive.
+*/
+int QDeclarativeTimeLine::accelDistance(QDeclarativeTimeLineValue &timeLineValue, qreal velocity, qreal distance)
+{
+    if (distance == 0.0f || velocity == 0.0f)
+        return -1;
+    Q_ASSERT((distance >= 0.0f) == (velocity >= 0.0f));
+
+    int time = static_cast<int>(1000 * (2.0f * distance) / velocity);
+
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::AccelDistance, time, velocity, distance, d->order++);
+    d->add(timeLineValue, op);
+
+    return time;
+}
+
+/*!
+    Linearly change the \a timeLineValue from its current value to the given
+    \a destination value over \a time milliseconds.
+*/
+void QDeclarativeTimeLine::move(QDeclarativeTimeLineValue &timeLineValue, qreal destination, int time)
+{
+    if (time <= 0) return;
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++);
+    d->add(timeLineValue, op);
+}
+
+/*!
+    Change the \a timeLineValue from its current value to the given \a destination
+    value over \a time milliseconds using the \a easing curve.
+ */
+void QDeclarativeTimeLine::move(QDeclarativeTimeLineValue &timeLineValue, qreal destination, const QEasingCurve &easing, int time)
+{
+    if (time <= 0) return;
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++, QDeclarativeTimeLineCallback(), easing);
+    d->add(timeLineValue, op);
+}
+
+/*!
+    Linearly change the \a timeLineValue from its current value by the \a change amount
+    over \a time milliseconds.
+*/
+void QDeclarativeTimeLine::moveBy(QDeclarativeTimeLineValue &timeLineValue, qreal change, int time)
+{
+    if (time <= 0) return;
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++);
+    d->add(timeLineValue, op);
+}
+
+/*!
+    Change the \a timeLineValue from its current value by the \a change amount over
+    \a time milliseconds using the \a easing curve.
+ */
+void QDeclarativeTimeLine::moveBy(QDeclarativeTimeLineValue &timeLineValue, qreal change, const QEasingCurve &easing, int time)
+{
+    if (time <= 0) return;
+    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++, QDeclarativeTimeLineCallback(), easing);
+    d->add(timeLineValue, op);
+}
+
+/*!
+    Cancel (but don't complete) all scheduled actions for \a timeLineValue.
+*/
+void QDeclarativeTimeLine::reset(QDeclarativeTimeLineValue &timeLineValue)
+{
+    if (!timeLineValue._t)
+        return;
+    if (timeLineValue._t != this) {
+        qWarning() << "QDeclarativeTimeLine: Cannot reset a QDeclarativeTimeLineValue owned by another timeline.";
+        return;
+    }
+    remove(&timeLineValue);
+    timeLineValue._t = 0;
+}
+
+int QDeclarativeTimeLine::duration() const
+{
+    return -1;
+}
+
+/*!
+    Synchronize the end point of \a timeLineValue to the endpoint of \a syncTo
+    within this timeline.
+
+    Following operations on \a timeLineValue in this timeline will be scheduled after
+    all the currently scheduled actions on \a syncTo are complete.  In
+    psuedo-code this is equivalent to:
+    \code
+    QDeclarativeTimeLine::pause(timeLineValue, min(0, length_of(syncTo) - length_of(timeLineValue)))
+    \endcode
+*/
+void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue, QDeclarativeTimeLineValue &syncTo)
+{
+    QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.find(&syncTo);
+    if (iter == d->ops.end())
+        return;
+    int length = iter->length;
+
+    iter = d->ops.find(&timeLineValue);
+    if (iter == d->ops.end()) {
+        pause(timeLineValue, length);
+    } else {
+        int glength = iter->length;
+        pause(timeLineValue, length - glength);
+    }
+}
+
+/*!
+    Synchronize the end point of \a timeLineValue to the endpoint of the longest
+    action cursrently scheduled in the timeline.
+
+    In psuedo-code, this is equivalent to:
+    \code
+    QDeclarativeTimeLine::pause(timeLineValue, length_of(timeline) - length_of(timeLineValue))
+    \endcode
+*/
+void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue)
+{
+    QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.find(&timeLineValue);
+    if (iter == d->ops.end()) {
+        pause(timeLineValue, d->length);
+    } else {
+        pause(timeLineValue, d->length - iter->length);
+    }
+}
+
+/*
+    Synchronize all currently and future scheduled values in this timeline to
+    the longest action currently scheduled.
+
+    For example:
+    \code
+    value1->setValue(0.);
+    value2->setValue(0.);
+    value3->setValue(0.);
+    QDeclarativeTimeLine tl;
+    ...
+    tl.move(value1, 10, 200);
+    tl.move(value2, 10, 100);
+    tl.sync();
+    tl.move(value2, 20, 100);
+    tl.move(value3, 20, 100);
+    \endcode
+
+    will result in:
+
+    \table
+    \header \o \o 0ms \o 50ms \o 100ms \o 150ms \o 200ms \o 250ms \o 300ms
+    \row \o value1 \o 0 \o 2.5 \o 5.0 \o 7.5 \o 10 \o 10 \o 10
+    \row \o value2 \o 0 \o 5.0 \o 10.0 \o 10.0 \o 10.0 \o 15.0 \o 20.0
+    \row \o value2 \o 0 \o 0 \o 0 \o 0 \o 0 \o 10.0 \o 20.0
+    \endtable
+*/
+
+/*void QDeclarativeTimeLine::sync()
+{
+    for (QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
+            iter != d->ops.end();
+            ++iter)
+        pause(*iter.key(), d->length - iter->length);
+    d->syncPoint = d->length;
+}*/
+
+/*! 
+    \internal 
+
+    Temporary hack.
+ */
+void QDeclarativeTimeLine::setSyncPoint(int sp)
+{
+    d->syncPoint = sp;
+}
+
+/*! 
+    \internal 
+ 
+    Temporary hack.
+ */
+int QDeclarativeTimeLine::syncPoint() const
+{
+    return d->syncPoint;
+}
+
+/*!
+    Returns true if the timeline is active.  An active timeline is one where
+    QDeclarativeTimeLineValue actions are still pending.
+*/
+bool QDeclarativeTimeLine::isActive() const
+{
+    return !d->ops.isEmpty();
+}
+
+/*!
+    Completes the timeline.  All queued actions are played to completion, and then discarded.  For example,
+    \code
+    QDeclarativeTimeLineValue v(0.);
+    QDeclarativeTimeLine tl;
+    tl.move(v, 100., 1000.);
+    // 500 ms passes
+    // v.value() == 50.
+    tl.complete();
+    // v.value() == 100.
+    \endcode
+*/
+void QDeclarativeTimeLine::complete()
+{
+    d->advance(d->length);
+}
+
+/*!
+    Resets the timeline.  All queued actions are discarded and QDeclarativeTimeLineValue's retain their current value. For example,
+    \code
+    QDeclarativeTimeLineValue v(0.);
+    QDeclarativeTimeLine tl;
+    tl.move(v, 100., 1000.);
+    // 500 ms passes
+    // v.value() == 50.
+    tl.clear();
+    // v.value() == 50.
+    \endcode
+*/
+void QDeclarativeTimeLine::clear()
+{
+    for (QDeclarativeTimeLinePrivate::Ops::ConstIterator iter = d->ops.begin(); iter != d->ops.end(); ++iter)
+        iter.key()->_t = 0;
+    d->ops.clear();
+    d->length = 0;
+    d->syncPoint = 0;
+    //XXX need stop here?
+}
+
+int QDeclarativeTimeLine::time() const
+{
+    return d->prevTime;
+}
+
+/*!
+    \fn void QDeclarativeTimeLine::updated()
+
+    Emitted each time the timeline modifies QDeclarativeTimeLineValues.  Even if multiple
+    QDeclarativeTimeLineValues are changed, this signal is only emitted once for each clock tick.
+*/
+
+void QDeclarativeTimeLine::updateCurrentTime(int v)
+{
+    if (d->syncAdj == -1)
+        d->syncAdj = v;
+    v -= d->syncAdj;
+
+    int timeChanged = v - d->prevTime;
+#if 0
+    if (!timeChanged)
+        return;
+#endif
+    d->prevTime = v;
+    d->advance(timeChanged);
+    emit updated();
+
+    // Do we need to stop the clock?
+    if (d->ops.isEmpty()) {
+        stop();
+        d->prevTime = 0;
+        d->clockRunning = false;
+        emit completed();
+    } /*else if (pauseTime > 0) {
+        GfxClock::cancelClock();
+        d->prevTime = 0;
+        GfxClock::pauseFor(pauseTime);
+        d->syncAdj = 0;
+        d->clockRunning = false;
+    }*/ else if (/*!GfxClock::isActive()*/ state() != Running) {
+        stop();
+        d->prevTime = 0;
+        d->clockRunning = true;
+        d->syncAdj = 0;
+        start();
+    }
+}
+
+bool operator<(const QPair<int, Update> &lhs,
+               const QPair<int, Update> &rhs)
+{
+    return lhs.first < rhs.first;
+}
+
+int QDeclarativeTimeLinePrivate::advance(int t)
+{
+    int pauseTime = -1;
+
+    // XXX - surely there is a more efficient way?
+    do {
+        pauseTime = -1;
+        // Minimal advance time
+        int advanceTime = t;
+        for (Ops::Iterator iter = ops.begin(); iter != ops.end(); ++iter) {
+            TimeLine &tl = *iter;
+            Op &op = tl.ops.first();
+            int length = op.length - tl.consumedOpLength;
+                
+            if (length < advanceTime) {
+                advanceTime = length;
+                if (advanceTime == 0)
+                    break;
+            }
+        }
+        t -= advanceTime;
+
+        // Process until then.  A zero length advance time will only process 
+        // sets.
+        QList<QPair<int, Update> > updates;
+
+        for (Ops::Iterator iter = ops.begin(); iter != ops.end(); ) {
+            QDeclarativeTimeLineValue *v = static_cast<QDeclarativeTimeLineValue *>(iter.key());
+            TimeLine &tl = *iter;
+            Q_ASSERT(!tl.ops.isEmpty());
+
+            do {
+                Op &op = tl.ops.first();
+                if (advanceTime == 0 && op.length != 0)
+                    continue;
+
+                if (tl.consumedOpLength == 0 && 
+                   op.type != Op::Pause && 
+                   op.type != Op::Execute)
+                    tl.base = v->value();
+
+                if ((tl.consumedOpLength + advanceTime) == op.length) {
+                    if (op.type == Op::Execute) {
+                        updates << qMakePair(op.order, Update(op.event));
+                    } else {
+                        bool changed = false;
+                        qreal val = value(op, op.length, tl.base, &changed);
+                        if (changed)
+                            updates << qMakePair(op.order, Update(v, val));
+                    }
+                    tl.length -= qMin(advanceTime, tl.length);
+                    tl.consumedOpLength = 0;
+                    tl.ops.removeFirst();
+                } else {
+                    tl.consumedOpLength += advanceTime;
+                    bool changed = false;
+                    qreal val = value(op, tl.consumedOpLength, tl.base, &changed);
+                    if (changed)
+                        updates << qMakePair(op.order, Update(v, val));
+                    tl.length -= qMin(advanceTime, tl.length);
+                    break;
+                }
+
+            } while(!tl.ops.isEmpty() && advanceTime == 0 && tl.ops.first().length == 0);
+
+
+            if (tl.ops.isEmpty()) {
+                iter = ops.erase(iter);
+                v->_t = 0;
+            } else {
+                if (tl.ops.first().type == Op::Pause && pauseTime != 0) {
+                    int opPauseTime = tl.ops.first().length - tl.consumedOpLength;
+                    if (pauseTime == -1 || opPauseTime < pauseTime)
+                        pauseTime = opPauseTime;
+                } else {
+                    pauseTime = 0;
+                }
+                ++iter;
+            }
+        }
+
+        length -= qMin(length, advanceTime);
+        syncPoint -= advanceTime;
+
+        qSort(updates.begin(), updates.end());
+        updateQueue = &updates;
+        for (int ii = 0; ii < updates.count(); ++ii) {
+            const Update &v = updates.at(ii).second;
+            if (v.g) {
+                v.g->setValue(v.v);
+            } else {
+                v.e.d0(v.e.d1);
+            }
+        }
+        updateQueue = 0;
+    } while(t);
+
+    return pauseTime;
+}
+
+void QDeclarativeTimeLine::remove(QDeclarativeTimeLineObject *v)
+{
+    QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.find(v);
+    Q_ASSERT(iter != d->ops.end());
+
+    int len = iter->length;
+    d->ops.erase(iter);
+    if (len == d->length) {
+        // We need to recalculate the length
+        d->length = 0;
+        for (QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
+                iter != d->ops.end();
+                ++iter) {
+
+            if (iter->length > d->length)
+                d->length = iter->length;
+
+        }
+    }
+    if (d->ops.isEmpty()) {
+        stop();
+        d->clockRunning = false;
+    } else if (/*!GfxClock::isActive()*/ state() != Running) {
+        stop();
+        d->prevTime = 0;
+        d->clockRunning = true;
+
+        if (d->syncMode == QDeclarativeTimeLine::LocalSync) {
+            d->syncAdj = -1;
+        } else {
+            d->syncAdj = 0;
+        }
+        start();
+    }
+
+    if (d->updateQueue) {
+        for (int ii = 0; ii < d->updateQueue->count(); ++ii) {
+            if (d->updateQueue->at(ii).second.g == v ||
+               d->updateQueue->at(ii).second.e.callbackObject() == v) {
+                d->updateQueue->removeAt(ii);
+                --ii;
+            }
+        }
+    }
+
+
+}
+
+/*!
+    \internal
+    \class QDeclarativeTimeLineValue
+    \ingroup group_animation
+    \brief The QDeclarativeTimeLineValue class provides a value that can be modified by QDeclarativeTimeLine.
+*/
+
+/*!
+    \fn QDeclarativeTimeLineValue::QDeclarativeTimeLineValue(qreal value = 0)
+
+    Construct a new QDeclarativeTimeLineValue with an initial \a value.
+*/
+
+/*!
+    \fn qreal QDeclarativeTimeLineValue::value() const
+
+    Return the current value.
+*/
+
+/*!
+    \fn void QDeclarativeTimeLineValue::setValue(qreal value)
+
+    Set the current \a value.
+*/
+
+/*!
+    \fn QDeclarativeTimeLine *QDeclarativeTimeLineValue::timeLine() const
+
+    If a QDeclarativeTimeLine is operating on this value, return a pointer to it,
+    otherwise return null.
+*/
+
+
+QDeclarativeTimeLineObject::QDeclarativeTimeLineObject()
+: _t(0)
+{
+}
+
+QDeclarativeTimeLineObject::~QDeclarativeTimeLineObject()
+{
+    if (_t) {
+        _t->remove(this);
+        _t = 0;
+    }
+}
+
+QDeclarativeTimeLineCallback::QDeclarativeTimeLineCallback()
+: d0(0), d1(0), d2(0)
+{
+}
+
+QDeclarativeTimeLineCallback::QDeclarativeTimeLineCallback(QDeclarativeTimeLineObject *b, Callback f, void *d)
+: d0(f), d1(d), d2(b)
+{
+}
+
+QDeclarativeTimeLineCallback::QDeclarativeTimeLineCallback(const QDeclarativeTimeLineCallback &o)
+: d0(o.d0), d1(o.d1), d2(o.d2)
+{
+}
+
+QDeclarativeTimeLineCallback &QDeclarativeTimeLineCallback::operator=(const QDeclarativeTimeLineCallback &o)
+{
+    d0 = o.d0;
+    d1 = o.d1;
+    d2 = o.d2;
+    return *this;
+}
+
+QDeclarativeTimeLineObject *QDeclarativeTimeLineCallback::callbackObject() const
+{
+    return d2;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativetimeline_p_p.h b/src/declarative/util/qdeclarativetimeline_p_p.h
new file mode 100644
index 0000000..c08c07c
--- /dev/null
+++ b/src/declarative/util/qdeclarativetimeline_p_p.h
@@ -0,0 +1,200 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETIMELINE_H
+#define QDECLARATIVETIMELINE_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/QObject>
+#include <QtCore/QAbstractAnimation>
+
+QT_BEGIN_NAMESPACE
+
+class QEasingCurve;
+class QDeclarativeTimeLineValue;
+class QDeclarativeTimeLineCallback;
+struct QDeclarativeTimeLinePrivate;
+class QDeclarativeTimeLineObject;
+class QDeclarativeTimeLine : public QAbstractAnimation
+{
+Q_OBJECT
+public:
+    QDeclarativeTimeLine(QObject *parent = 0);
+    ~QDeclarativeTimeLine();
+
+    enum SyncMode { LocalSync, GlobalSync };
+    SyncMode syncMode() const;
+    void setSyncMode(SyncMode);
+
+    void pause(QDeclarativeTimeLineObject &, int);
+    void callback(const QDeclarativeTimeLineCallback &);
+    void set(QDeclarativeTimeLineValue &, qreal);
+
+    int accel(QDeclarativeTimeLineValue &, qreal velocity, qreal accel);
+    int accel(QDeclarativeTimeLineValue &, qreal velocity, qreal accel, qreal maxDistance);
+    int accelDistance(QDeclarativeTimeLineValue &, qreal velocity, qreal distance);
+
+    void move(QDeclarativeTimeLineValue &, qreal destination, int time = 500);
+    void move(QDeclarativeTimeLineValue &, qreal destination, const QEasingCurve &, int time = 500);
+    void moveBy(QDeclarativeTimeLineValue &, qreal change, int time = 500);
+    void moveBy(QDeclarativeTimeLineValue &, qreal change, const QEasingCurve &, int time = 500);
+
+    void sync();
+    void setSyncPoint(int);
+    int syncPoint() const;
+
+    void sync(QDeclarativeTimeLineValue &);
+    void sync(QDeclarativeTimeLineValue &, QDeclarativeTimeLineValue &);
+
+    void reset(QDeclarativeTimeLineValue &);
+
+    void complete();
+    void clear();
+    bool isActive() const;
+
+    int time() const;
+
+    virtual int duration() const;
+Q_SIGNALS:
+    void updated();
+    void completed();
+
+protected:
+    virtual void updateCurrentTime(int);
+
+private:
+    void remove(QDeclarativeTimeLineObject *);
+    friend class QDeclarativeTimeLineObject;
+    friend struct QDeclarativeTimeLinePrivate;
+    QDeclarativeTimeLinePrivate *d;
+};
+
+class QDeclarativeTimeLineObject
+{
+public:
+    QDeclarativeTimeLineObject();
+    virtual ~QDeclarativeTimeLineObject();
+
+protected:
+    friend class QDeclarativeTimeLine;
+    friend struct QDeclarativeTimeLinePrivate;
+    QDeclarativeTimeLine *_t;
+};
+
+class QDeclarativeTimeLineValue : public QDeclarativeTimeLineObject
+{
+public:
+    QDeclarativeTimeLineValue(qreal v = 0.) : _v(v) {}
+
+    virtual qreal value() const { return _v; }
+    virtual void setValue(qreal v) { _v = v; }
+
+    QDeclarativeTimeLine *timeLine() const { return _t; }
+
+    operator qreal() const { return _v; }
+    QDeclarativeTimeLineValue &operator=(qreal v) { setValue(v); return *this; }
+private:
+    friend class QDeclarativeTimeLine;
+    friend struct QDeclarativeTimeLinePrivate;
+    qreal _v;
+};
+
+class QDeclarativeTimeLineCallback
+{
+public:
+    typedef void (*Callback)(void *);
+
+    QDeclarativeTimeLineCallback();
+    QDeclarativeTimeLineCallback(QDeclarativeTimeLineObject *b, Callback, void * = 0);
+    QDeclarativeTimeLineCallback(const QDeclarativeTimeLineCallback &o);
+
+    QDeclarativeTimeLineCallback &operator=(const QDeclarativeTimeLineCallback &o);
+    QDeclarativeTimeLineObject *callbackObject() const;
+
+private:
+    friend class QDeclarativeTimeLinePrivate; 
+    Callback d0;
+    void *d1;
+    QDeclarativeTimeLineObject *d2;
+};
+
+template<class T>
+class QDeclarativeTimeLineValueProxy : public QDeclarativeTimeLineValue
+{
+public:
+    QDeclarativeTimeLineValueProxy(T *cls, void (T::*func)(qreal), qreal v = 0.)
+    : QDeclarativeTimeLineValue(v), _class(cls), _setFunctionReal(func), _setFunctionInt(0)
+    {
+        Q_ASSERT(_class);
+    }
+
+    QDeclarativeTimeLineValueProxy(T *cls, void (T::*func)(int), qreal v = 0.)
+    : QDeclarativeTimeLineValue(v), _class(cls), _setFunctionReal(0), _setFunctionInt(func)
+    {
+        Q_ASSERT(_class);
+    }
+
+    virtual void setValue(qreal v)
+    {
+        QDeclarativeTimeLineValue::setValue(v);
+        if (_setFunctionReal) (_class->*_setFunctionReal)(v);
+        else if (_setFunctionInt) (_class->*_setFunctionInt)((int)v);
+    }
+
+private:
+    T *_class;
+    void (T::*_setFunctionReal)(qreal);
+    void (T::*_setFunctionInt)(int);
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp
new file mode 100644
index 0000000..89c461b
--- /dev/null
+++ b/src/declarative/util/qdeclarativetimer.cpp
@@ -0,0 +1,313 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetimer_p.h"
+
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qpauseanimation.h>
+#include <qdebug.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+
+
+class QDeclarativeTimerPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeTimer)
+public:
+    QDeclarativeTimerPrivate()
+        : interval(1000), running(false), repeating(false), triggeredOnStart(false)
+        , classBegun(false), componentComplete(false), firstTick(true) {}
+    int interval;
+    QPauseAnimation pause;
+    bool running : 1;
+    bool repeating : 1;
+    bool triggeredOnStart : 1;
+    bool classBegun : 1;
+    bool componentComplete : 1;
+    bool firstTick : 1;
+};
+
+/*!
+    \qmlclass Timer QDeclarativeTimer
+    \brief The Timer item triggers a handler at a specified interval.
+
+    A timer can be used to trigger an action either once, or repeatedly
+    at a given interval.
+
+    Here is a timer that shows the current date and time, and updates
+    the text every 500 milliseconds:
+
+    \qml
+    Timer {
+        interval: 500; running: true; repeat: true
+        onTriggered: time.text = Date().toString()
+    }
+    Text {
+        id: time
+    }
+    \endqml
+
+    QDeclarativeTimer is synchronized with the animation timer.  Since the animation
+    timer is usually set to 60fps, the resolution of QDeclarativeTimer will be
+    at best 16ms.
+
+    If the Timer is running and one of its properties is changed, the
+    elapsed time will be reset.  For example, if a Timer with interval of
+    1000ms has its \e repeat property changed 500ms after starting, the
+    elapsed time will be reset to 0, and the Timer will be triggered
+    1000ms later.
+*/
+
+QDeclarativeTimer::QDeclarativeTimer(QObject *parent)
+    : QObject(*(new QDeclarativeTimerPrivate), parent)
+{
+    Q_D(QDeclarativeTimer);
+    connect(&d->pause, SIGNAL(currentLoopChanged(int)), this, SLOT(ticked()));
+    connect(&d->pause, SIGNAL(finished()), this, SLOT(finished()));
+    d->pause.setLoopCount(1);
+    d->pause.setDuration(d->interval);
+}
+
+/*!
+    \qmlproperty int Timer::interval
+
+    Sets the \a interval between triggers, in milliseconds.
+
+    The default interval is 1000 milliseconds.
+*/
+void QDeclarativeTimer::setInterval(int interval)
+{
+    Q_D(QDeclarativeTimer);
+    if (interval != d->interval) {
+        d->interval = interval;
+        update();
+    }
+}
+
+int QDeclarativeTimer::interval() const
+{
+    Q_D(const QDeclarativeTimer);
+    return d->interval;
+}
+
+/*!
+    \qmlproperty bool Timer::running
+
+    If set to true, starts the timer; otherwise stops the timer.
+    For a non-repeating timer, \a running is set to false after the
+    timer has been triggered.
+
+    \a running defaults to false.
+
+    \sa repeat
+*/
+bool QDeclarativeTimer::isRunning() const
+{
+    Q_D(const QDeclarativeTimer);
+    return d->running;
+}
+
+void QDeclarativeTimer::setRunning(bool running)
+{
+    Q_D(QDeclarativeTimer);
+    if (d->running != running) {
+        d->running = running;
+        d->firstTick = true;
+        emit runningChanged();
+        update();
+    }
+}
+
+/*!
+    \qmlproperty bool Timer::repeat
+
+    If \a repeat is true the timer is triggered repeatedly at the
+    specified interval; otherwise, the timer will trigger once at the
+    specified interval and then stop (i.e. running will be set to false).
+
+    \a repeat defaults to false.
+
+    \sa running
+*/
+bool QDeclarativeTimer::isRepeating() const
+{
+    Q_D(const QDeclarativeTimer);
+    return d->repeating;
+}
+
+void QDeclarativeTimer::setRepeating(bool repeating)
+{
+    Q_D(QDeclarativeTimer);
+    if (repeating != d->repeating) {
+        d->repeating = repeating;
+        update();
+    }
+}
+
+/*!
+    \qmlproperty bool Timer::triggeredOnStart
+
+    When a timer is started, the first trigger is usually after the specified
+    interval has elapsed.  It is sometimes desirable to trigger immediately
+    when the timer is started; for example, to establish an initial
+    state.
+
+    If \a triggeredOnStart is true, the timer is triggered immediately
+    when started, and subsequently at the specified interval. Note that if
+    \e repeat is set to false, the timer is triggered twice; once on start,
+    and again at the interval.
+
+    \a triggeredOnStart defaults to false.
+
+    \sa running
+*/
+bool QDeclarativeTimer::triggeredOnStart() const
+{
+    Q_D(const QDeclarativeTimer);
+    return d->triggeredOnStart;
+}
+
+void QDeclarativeTimer::setTriggeredOnStart(bool triggeredOnStart)
+{
+    Q_D(QDeclarativeTimer);
+    if (d->triggeredOnStart != triggeredOnStart) {
+        d->triggeredOnStart = triggeredOnStart;
+        update();
+    }
+}
+
+/*!
+    \qmlmethod Timer::start()
+    \brief Starts the timer.
+
+    If the timer is already running, calling this method has no effect.  The
+    \c running property will be true following a call to \c start().
+*/
+void QDeclarativeTimer::start()
+{
+    setRunning(true);
+}
+
+/*!
+    \qmlmethod Timer::stop()
+    \brief Stops the timer.
+
+    If the timer is not running, calling this method has no effect.  The
+    \c running property will be false following a call to \c stop().
+*/
+void QDeclarativeTimer::stop()
+{
+    setRunning(false);
+}
+
+/*!
+    \qmlmethod Timer::restart()
+    \brief Restarts the timer.
+
+    If the Timer is not running it will be started, otherwise it will be
+    stopped, reset to initial state and started.  The \c running property
+    will be true following a call to \c restart().
+*/
+void QDeclarativeTimer::restart()
+{
+    setRunning(false);
+    setRunning(true);
+}
+
+void QDeclarativeTimer::update()
+{
+    Q_D(QDeclarativeTimer);
+    if (d->classBegun && !d->componentComplete)
+        return;
+    d->pause.stop();
+    if (d->running) {
+        d->pause.setCurrentTime(0);
+        d->pause.setLoopCount(d->repeating ? -1 : 1);
+        d->pause.setDuration(d->interval);
+        d->pause.start();
+        if (d->triggeredOnStart && d->firstTick) {
+            QCoreApplication::removePostedEvents(this, QEvent::MetaCall);
+            QMetaObject::invokeMethod(this, "ticked", Qt::QueuedConnection);
+        }
+    }
+}
+
+void QDeclarativeTimer::classBegin()
+{
+    Q_D(QDeclarativeTimer);
+    d->classBegun = true;
+}
+
+void QDeclarativeTimer::componentComplete()
+{
+    Q_D(QDeclarativeTimer);
+    d->componentComplete = true;
+    update();
+}
+
+/*!
+    \qmlsignal Timer::onTriggered()
+
+    This handler is called when the Timer is triggered.
+*/
+void QDeclarativeTimer::ticked()
+{
+    Q_D(QDeclarativeTimer);
+    if (d->running && (d->pause.currentTime() > 0 || (d->triggeredOnStart && d->firstTick)))
+        emit triggered();
+    d->firstTick = false;
+}
+
+void QDeclarativeTimer::finished()
+{
+    Q_D(QDeclarativeTimer);
+    if (d->repeating || !d->running)
+        return;
+    emit triggered();
+    d->running = false;
+    d->firstTick = false;
+    emit runningChanged();
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h
new file mode 100644
index 0000000..e063657
--- /dev/null
+++ b/src/declarative/util/qdeclarativetimer_p.h
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETIMER_H
+#define QDECLARATIVETIMER_H
+
+#include <qdeclarative.h>
+
+#include <QtCore/qobject.h>
+#include <QtCore/qabstractanimation.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeTimerPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeTimer)
+    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_PROPERTY(int interval READ interval WRITE setInterval)
+    Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
+    Q_PROPERTY(bool repeat READ isRepeating WRITE setRepeating)
+    Q_PROPERTY(bool triggeredOnStart READ triggeredOnStart WRITE setTriggeredOnStart)
+
+public:
+    QDeclarativeTimer(QObject *parent=0);
+
+    void setInterval(int interval);
+    int interval() const;
+
+    bool isRunning() const;
+    void setRunning(bool running);
+
+    bool isRepeating() const;
+    void setRepeating(bool repeating);
+
+    bool triggeredOnStart() const;
+    void setTriggeredOnStart(bool triggeredOnStart);
+
+protected:
+    void classBegin();
+    void componentComplete();
+
+public Q_SLOTS:
+    void start();
+    void stop();
+    void restart();
+
+Q_SIGNALS:
+    void triggered();
+    void runningChanged();
+
+private:
+    void update();
+
+private Q_SLOTS:
+    void ticked();
+    void finished();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeTimer)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
new file mode 100644
index 0000000..3482814
--- /dev/null
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -0,0 +1,249 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativestate_p.h"
+#include "qdeclarativestategroup_p.h"
+#include "qdeclarativestate_p_p.h"
+#include "qdeclarativestateoperations_p.h"
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p_p.h"
+#include "qdeclarativetransitionmanager_p_p.h"
+
+#include <QParallelAnimationGroup>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass Transition QDeclarativeTransition
+  \since 4.7
+    \brief The Transition element defines animated transitions that occur on state changes.
+
+    \sa {qmlstates}{States}, {state-transitions}{Transitions}
+*/
+
+/*!
+    \internal
+    \class QDeclarativeTransition
+    \brief The QDeclarativeTransition class allows you to define animated transitions that occur on state changes.
+
+    \ingroup group_states
+*/
+
+//ParallelAnimationWrapperallows us to do a "callback" when the animation finishes, rather than connecting
+//and disconnecting signals and slots frequently
+class ParallelAnimationWrapper : public QParallelAnimationGroup
+{
+    Q_OBJECT
+public:
+    ParallelAnimationWrapper(QObject *parent = 0) : QParallelAnimationGroup(parent) {}
+    QDeclarativeTransitionPrivate *trans;
+protected:
+    virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
+};
+
+class QDeclarativeTransitionPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeTransition)
+public:
+    QDeclarativeTransitionPrivate() 
+    : fromState(QLatin1String("*")), toState(QLatin1String("*")), 
+      reversed(false), reversible(false), endState(0)
+    {
+        group.trans = this;
+    }
+
+    QString fromState;
+    QString toState;
+    bool reversed;
+    bool reversible;
+    ParallelAnimationWrapper group;
+    QDeclarativeTransitionManager *endState;
+
+    void complete()
+    {
+        endState->complete();
+    }
+    static void append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *a);
+    QList<QDeclarativeAbstractAnimation *> animations;
+};
+
+void QDeclarativeTransitionPrivate::append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *a)
+{
+    QDeclarativeTransition *q = static_cast<QDeclarativeTransition *>(list->object);
+    q->d_func()->animations.append(a);
+    q->d_func()->group.addAnimation(a->qtAnimation());
+    a->setDisableUserControl();
+}
+
+void ParallelAnimationWrapper::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
+{
+    QParallelAnimationGroup::updateState(newState, oldState);
+    if (newState == Stopped &&
+        ((direction() == QAbstractAnimation::Forward && currentLoopTime() == duration()) ||
+         (direction() == QAbstractAnimation::Backward && currentLoopTime() == 0)))
+    {
+        trans->complete();
+    }
+}
+
+
+
+QDeclarativeTransition::QDeclarativeTransition(QObject *parent)
+    : QObject(*(new QDeclarativeTransitionPrivate), parent)
+{
+}
+
+QDeclarativeTransition::~QDeclarativeTransition()
+{
+}
+
+void QDeclarativeTransition::stop()
+{
+    Q_D(QDeclarativeTransition);
+    d->group.stop();
+}
+
+void QDeclarativeTransition::setReversed(bool r)
+{
+    Q_D(QDeclarativeTransition);
+    d->reversed = r;
+}
+
+void QDeclarativeTransition::prepare(QDeclarativeStateOperation::ActionList &actions,
+                            QList<QDeclarativeMetaProperty> &after,
+                            QDeclarativeTransitionManager *endState)
+{
+    Q_D(QDeclarativeTransition);
+
+    qmlExecuteDeferred(this);
+
+    if (d->reversed) {
+        for (int ii = d->animations.count() - 1; ii >= 0; --ii) {
+            d->animations.at(ii)->transition(actions, after, QDeclarativeAbstractAnimation::Backward);
+        }
+    } else {
+        for (int ii = 0; ii < d->animations.count(); ++ii) {
+            d->animations.at(ii)->transition(actions, after, QDeclarativeAbstractAnimation::Forward);
+        }
+    }
+
+    d->endState = endState;
+    d->group.setDirection(d->reversed ? QAbstractAnimation::Backward : QAbstractAnimation::Forward);
+    d->group.start();
+}
+
+/*!
+    \qmlproperty string Transition::from
+    \qmlproperty string Transition::to
+    These properties are selectors indicating which state changes should trigger the transition.
+
+    from is used in conjunction with to to determine when a transition should
+    be applied. By default from and to are both "*" (any state). In the following example,
+    the transition is applied when changing from state1 to state2.
+    \code
+    Transition {
+        from: "state1"
+        to: "state2"
+        ...
+    }
+    \endcode
+*/
+QString QDeclarativeTransition::fromState() const
+{
+    Q_D(const QDeclarativeTransition);
+    return d->fromState;
+}
+
+void QDeclarativeTransition::setFromState(const QString &f)
+{
+    Q_D(QDeclarativeTransition);
+    d->fromState = f;
+}
+
+/*!
+    \qmlproperty bool Transition::reversible
+    This property holds whether the transition should be automatically reversed when the conditions that triggered this transition are reversed.
+
+    The default value is false.
+*/
+bool QDeclarativeTransition::reversible() const
+{
+    Q_D(const QDeclarativeTransition);
+    return d->reversible;
+}
+
+void QDeclarativeTransition::setReversible(bool r)
+{
+    Q_D(QDeclarativeTransition);
+    d->reversible = r;
+}
+
+QString QDeclarativeTransition::toState() const
+{
+    Q_D(const QDeclarativeTransition);
+    return d->toState;
+}
+
+void QDeclarativeTransition::setToState(const QString &t)
+{
+    Q_D(QDeclarativeTransition);
+    d->toState = t;
+}
+
+/*!
+    \qmlproperty list<Animation> Transition::animations
+    \default
+    This property holds a list of the animations to be run for this transition.
+
+    The top-level animations are run in parallel. To run them sequentially,
+    you can create a single SequentialAnimation which contains all the animations,
+    and assign that to animations the animations property.
+    \default
+*/
+QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeTransition::animations()
+{
+    Q_D(QDeclarativeTransition);
+    return QDeclarativeListProperty<QDeclarativeAbstractAnimation>(this, &d->animations, QDeclarativeTransitionPrivate::append_animation);
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativetransition.moc>
diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h
new file mode 100644
index 0000000..96448b8
--- /dev/null
+++ b/src/declarative/util/qdeclarativetransition_p.h
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETRANSITION_H
+#define QDECLARATIVETRANSITION_H
+
+#include "qdeclarativestate_p.h"
+
+#include <qdeclarative.h>
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeAbstractAnimation;
+class QDeclarativeTransitionPrivate;
+class QDeclarativeTransitionManager;
+class Q_DECLARATIVE_EXPORT QDeclarativeTransition : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeTransition)
+
+    Q_PROPERTY(QString from READ fromState WRITE setFromState)
+    Q_PROPERTY(QString to READ toState WRITE setToState)
+    Q_PROPERTY(bool reversible READ reversible WRITE setReversible)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations READ animations)
+    Q_CLASSINFO("DefaultProperty", "animations")
+    Q_CLASSINFO("DeferredPropertyNames", "animations")
+
+public:
+    QDeclarativeTransition(QObject *parent=0);
+    ~QDeclarativeTransition();
+
+    QString fromState() const;
+    void setFromState(const QString &);
+
+    QString toState() const;
+    void setToState(const QString &);
+
+    bool reversible() const;
+    void setReversible(bool);
+
+    QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations();
+
+    void prepare(QDeclarativeStateOperation::ActionList &actions,
+                 QList<QDeclarativeMetaProperty> &after,
+                 QDeclarativeTransitionManager *end);
+
+    void setReversed(bool r);
+    void stop();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeTransition)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVETRANSITION_H
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
new file mode 100644
index 0000000..b5841dc
--- /dev/null
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -0,0 +1,282 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetransitionmanager_p_p.h"
+
+#include "qdeclarativestate_p_p.h"
+
+#include <qdeclarativebinding_p.h>
+#include <qdeclarativeglobal_p.h>
+
+QT_BEGIN_NAMESPACE
+
+DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
+
+class QDeclarativeTransitionManagerPrivate
+{
+public:
+    QDeclarativeTransitionManagerPrivate()
+    : state(0), transition(0) {}
+
+    void applyBindings();
+    typedef QList<QDeclarativeSimpleAction> SimpleActionList;
+    QDeclarativeState *state;
+    QDeclarativeTransition *transition;
+    QDeclarativeStateOperation::ActionList bindingsList;
+    SimpleActionList completeList;
+};
+
+QDeclarativeTransitionManager::QDeclarativeTransitionManager()
+: d(new QDeclarativeTransitionManagerPrivate)
+{
+}
+
+void QDeclarativeTransitionManager::setState(QDeclarativeState *s)
+{
+    d->state = s;
+}
+
+QDeclarativeTransitionManager::~QDeclarativeTransitionManager()
+{
+    delete d; d = 0;
+}
+
+void QDeclarativeTransitionManager::complete() 
+{
+    d->applyBindings();
+
+    for (int ii = 0; ii < d->completeList.count(); ++ii) {
+        const QDeclarativeMetaProperty &prop = d->completeList.at(ii).property;
+        prop.write(d->completeList.at(ii).value);
+    }
+
+    d->completeList.clear();
+
+    if (d->state) 
+        static_cast<QDeclarativeStatePrivate*>(QObjectPrivate::get(d->state))->complete();
+}
+
+void QDeclarativeTransitionManagerPrivate::applyBindings()
+{
+    foreach(const QDeclarativeAction &action, bindingsList) {
+        if (action.toBinding) {
+            action.property.setBinding(action.toBinding);
+        } else if (action.event) {
+            if (action.reverseEvent)
+                action.event->reverse();
+            else
+                action.event->execute();
+        }
+
+    }
+
+    bindingsList.clear();
+}
+
+void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &list,
+                                      QDeclarativeTransition *transition)
+{
+    cancel();
+
+    QDeclarativeStateOperation::ActionList applyList = list;
+    // Determine which actions are binding changes.
+    foreach(const QDeclarativeAction &action, applyList) {
+        if (action.toBinding)
+            d->bindingsList << action;
+        if (action.fromBinding)
+            action.property.setBinding(0); // Disable current binding
+        if (action.event && action.event->changesBindings()) {  //### assume isReversable()?
+            d->bindingsList << action;
+            if (action.reverseEvent)
+                action.event->clearReverseBindings();
+            else
+                action.event->clearForwardBindings();
+        }
+    }
+
+    // Animated transitions need both the start and the end value for
+    // each property change.  In the presence of bindings, the end values
+    // are non-trivial to calculate.  As a "best effort" attempt, we first
+    // apply all the property and binding changes, then read all the actual
+    // final values, then roll back the changes and proceed as normal.
+    //
+    // This doesn't catch everything, and it might be a little fragile in
+    // some cases - but whatcha going to do?
+
+    if (!d->bindingsList.isEmpty()) {
+
+        //### do extra actions here?
+
+        // Apply all the property and binding changes
+        for (int ii = 0; ii < applyList.size(); ++ii) {
+            const QDeclarativeAction &action = applyList.at(ii);
+            if (action.toBinding) {
+                action.property.setBinding(action.toBinding, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+            } else if (!action.event) {
+                action.property.write(action.toValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+            } else if (action.event->isReversable()) {
+                if (action.reverseEvent)
+                    action.event->reverse();
+                else
+                    action.event->execute();
+                applyList << action.event->extraActions();
+            }
+        }
+
+        // Read all the end values for binding changes
+        for (int ii = 0; ii < applyList.size(); ++ii) {
+            QDeclarativeAction *action = &applyList[ii];
+            if (action->event)
+                continue;
+            const QDeclarativeMetaProperty &prop = action->property;
+            if (action->toBinding || !action->toValue.isValid()) {  //### is this always right (used for exta actions)
+                action->toValue = prop.read();
+            }
+        }
+
+        // Revert back to the original values
+        foreach(const QDeclarativeAction &action, applyList) {
+            if (action.event) {
+                if (action.event->isReversable()) {
+                    if (action.reverseEvent) {   //reverse the reverse
+                        action.event->clearForwardBindings();
+                        action.event->rewind();
+                        action.event->clearReverseBindings();
+                    } else {
+                        action.event->clearReverseBindings();
+                        action.event->rewind();
+                        action.event->clearForwardBindings();
+                    }
+                }
+                continue;
+            }
+
+            if (action.toBinding)
+                action.property.setBinding(0); // Make sure this is disabled during the transition
+
+            action.property.write(action.fromValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+        }
+    }
+
+    if (transition) {
+        QList<QDeclarativeMetaProperty> touched;
+        d->transition = transition;
+        d->transition->prepare(applyList, touched, this);
+
+        // Modify the action list to remove actions handled in the transition
+        for (int ii = 0; ii < applyList.count(); ++ii) {
+            const QDeclarativeAction &action = applyList.at(ii);
+
+            if (action.event) {
+
+                if (action.actionDone) {
+                    applyList.removeAt(ii);
+                    --ii;
+                }
+
+            } else {
+
+                if (touched.contains(action.property)) {
+                    if (action.toValue != action.fromValue) 
+                        d->completeList << 
+                            QDeclarativeSimpleAction(action, QDeclarativeSimpleAction::EndState);
+
+                    applyList.removeAt(ii);
+                    --ii;
+                }
+
+            }
+        }
+    }
+
+    // Any actions remaining have not been handled by the transition and should
+    // be applied immediately.  We skip applying bindings, as they are all
+    // applied at the end in applyBindings() to avoid any nastiness mid 
+    // transition
+    foreach(const QDeclarativeAction &action, applyList) {
+        if (action.event && !action.event->changesBindings()) {
+            if (action.event->isReversable() && action.reverseEvent)
+                action.event->reverse();
+            else
+                action.event->execute();
+        } else if (!action.event && !action.toBinding) {
+            action.property.write(action.toValue);
+        }
+    }
+    if (stateChangeDebug()) {
+        foreach(const QDeclarativeAction &action, applyList) {
+            if (action.event)
+                qWarning() << "    No transition for event:" << action.event->typeName();
+            else
+                qWarning() << "    No transition for:" << action.property.object()
+                           << action.property.name() << "From:" << action.fromValue 
+                           << "To:" << action.toValue;
+        }
+    }
+    if (!transition)
+        d->applyBindings();
+}
+
+void QDeclarativeTransitionManager::cancel()
+{
+    if (d->transition) {
+        // ### this could potentially trigger a complete in rare circumstances
+        d->transition->stop();  
+        d->transition = 0;
+    }
+
+    for(int i = 0; i < d->bindingsList.count(); ++i) {
+        QDeclarativeAction action = d->bindingsList[i];
+        if (action.toBinding && action.deletableToBinding) {
+            action.property.setBinding(0);
+            action.toBinding->destroy();
+            action.toBinding = 0;
+            action.deletableToBinding = false;
+        } else if (action.event) {
+            //### what do we do here?
+        }
+
+    }
+    d->bindingsList.clear();
+    d->completeList.clear();
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
new file mode 100644
index 0000000..d6e626e
--- /dev/null
+++ b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETRANSITIONMANAGER_P_H
+#define QDECLARATIVETRANSITIONMANAGER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativestateoperations_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeStatePrivate;
+class QDeclarativeTransitionManagerPrivate;
+class QDeclarativeTransitionManager 
+{
+public:
+    QDeclarativeTransitionManager();
+    ~QDeclarativeTransitionManager();
+
+    void transition(const QList<QDeclarativeAction> &, QDeclarativeTransition *transition);
+
+    void cancel();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeTransitionManager);
+    QDeclarativeTransitionManagerPrivate *d;
+
+    void complete();
+    void setState(QDeclarativeState *);
+
+    friend class QDeclarativeState;
+    friend class QDeclarativeTransitionPrivate;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVETRANSITIONMANAGER_P_H
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
new file mode 100644
index 0000000..1e4b963
--- /dev/null
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeutilmodule_p.h"
+#include "qfxperf_p_p.h"
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p_p.h"
+#include "qdeclarativebehavior_p.h"
+#include "qdeclarativebind_p.h"
+#include "qdeclarativeconnection_p.h"
+#include "qdeclarativedatetimeformatter_p.h"
+#include "qdeclarativeeasefollow_p.h"
+#include "qdeclarativefontloader_p.h"
+#include "qdeclarativelistaccessor_p.h"
+#include "qdeclarativelistmodel_p.h"
+#include "qdeclarativenullablevalue_p_p.h"
+#include "qdeclarativenumberformatter_p.h"
+#include "qdeclarativeopenmetaobject_p.h"
+#include "qdeclarativepackage_p.h"
+#include "qdeclarativepixmapcache_p.h"
+#include "qdeclarativepropertychanges_p.h"
+#include "qdeclarativepropertymap.h"
+#include "qdeclarativespringfollow_p.h"
+#include "qdeclarativestategroup_p.h"
+#include "qdeclarativestateoperations_p.h"
+#include "qdeclarativestate_p.h"
+#include "qdeclarativestate_p_p.h"
+#include "qdeclarativestyledtext_p.h"
+#include "qdeclarativesystempalette_p.h"
+#include "qdeclarativetimeline_p_p.h"
+#include "qdeclarativetimer_p.h"
+#include "qdeclarativetransitionmanager_p_p.h"
+#include "qdeclarativetransition_p.h"
+#include "qdeclarativeview.h"
+#include "qdeclarativexmllistmodel_p.h"
+#include "qnumberformat_p.h"
+#include "qperformancelog_p_p.h"
+
+void QDeclarativeUtilModule::defineModule()
+{
+    QML_REGISTER_TYPE(Qt,4,6,AnchorChanges,QDeclarativeAnchorChanges);
+    QML_REGISTER_TYPE(Qt,4,6,Behavior,QDeclarativeBehavior);
+    QML_REGISTER_TYPE(Qt,4,6,Binding,QDeclarativeBind);
+    QML_REGISTER_TYPE(Qt,4,6,ColorAnimation,QDeclarativeColorAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,Connection,QDeclarativeConnection);
+    QML_REGISTER_TYPE(Qt,4,6,DateTimeFormatter,QDeclarativeDateTimeFormatter);
+    QML_REGISTER_TYPE(Qt,4,6,EaseFollow,QDeclarativeEaseFollow);;
+    QML_REGISTER_TYPE(Qt,4,6,FontLoader,QDeclarativeFontLoader);
+    QML_REGISTER_TYPE(Qt,4,6,ListElement,QDeclarativeListElement);
+    QML_REGISTER_TYPE(Qt,4,6,NumberAnimation,QDeclarativeNumberAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,NumberFormatter,QDeclarativeNumberFormatter);;
+    QML_REGISTER_TYPE(Qt,4,6,Package,QDeclarativePackage);
+    QML_REGISTER_TYPE(Qt,4,6,ParallelAnimation,QDeclarativeParallelAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,ParentAction,QDeclarativeParentAction);
+    QML_REGISTER_TYPE(Qt,4,6,ParentChange,QDeclarativeParentChange);
+    QML_REGISTER_TYPE(Qt,4,6,PauseAnimation,QDeclarativePauseAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,PropertyAction,QDeclarativePropertyAction);
+    QML_REGISTER_TYPE(Qt,4,6,PropertyAnimation,QDeclarativePropertyAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,RotationAnimation,QDeclarativeRotationAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,ScriptAction,QDeclarativeScriptAction);
+    QML_REGISTER_TYPE(Qt,4,6,SequentialAnimation,QDeclarativeSequentialAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,SpringFollow,QDeclarativeSpringFollow);
+    QML_REGISTER_TYPE(Qt,4,6,StateChangeScript,QDeclarativeStateChangeScript);
+    QML_REGISTER_TYPE(Qt,4,6,StateGroup,QDeclarativeStateGroup);
+    QML_REGISTER_TYPE(Qt,4,6,State,QDeclarativeState);
+    QML_REGISTER_TYPE(Qt,4,6,SystemPalette,QDeclarativeSystemPalette);
+    QML_REGISTER_TYPE(Qt,4,6,Timer,QDeclarativeTimer);
+    QML_REGISTER_TYPE(Qt,4,6,Transition,QDeclarativeTransition);
+    QML_REGISTER_TYPE(Qt,4,6,Vector3dAnimation,QDeclarativeVector3dAnimation);
+    QML_REGISTER_TYPE(Qt,4,6,XmlListModel,QDeclarativeXmlListModel);
+    QML_REGISTER_TYPE(Qt,4,6,XmlRole,QDeclarativeXmlListModelRole);
+
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeAnchors);
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeAbstractAnimation);
+    QML_REGISTER_NOCREATE_TYPE(QDeclarativeStateOperation);
+    QML_REGISTER_NOCREATE_TYPE(QNumberFormat);
+
+    QML_REGISTER_CUSTOM_TYPE(Qt, 4,6, ListModel, QDeclarativeListModel, QDeclarativeListModelParser);
+    QML_REGISTER_CUSTOM_TYPE(Qt, 4,6, PropertyChanges, QDeclarativePropertyChanges, QDeclarativePropertyChangesParser);
+}
diff --git a/src/declarative/util/qdeclarativeutilmodule_p.h b/src/declarative/util/qdeclarativeutilmodule_p.h
new file mode 100644
index 0000000..602c8c5
--- /dev/null
+++ b/src/declarative/util/qdeclarativeutilmodule_p.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEUTILMODULE_H
+#define QDECLARATIVEUTILMODULE_H
+
+#include <qdeclarative.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeUtilModule
+{
+public:
+    static void defineModule();
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEUTILMODULE_H
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
new file mode 100644
index 0000000..6fe5bf3
--- /dev/null
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -0,0 +1,570 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeview.h"
+
+#include "qperformancelog_p_p.h"
+#include "qfxperf_p_p.h"
+
+#include <qdeclarative.h>
+#include <qdeclarativeitem.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativedebug_p.h>
+#include <qdeclarativedebugservice_p.h>
+#include <qdeclarativeglobal_p.h>
+
+#include <qscriptvalueiterator.h>
+#include <qdebug.h>
+#include <qtimer.h>
+#include <qevent.h>
+#include <qdir.h>
+#include <qcoreapplication.h>
+#include <qfontdatabase.h>
+#include <qicon.h>
+#include <qurl.h>
+#include <qboxlayout.h>
+#include <qbasictimer.h>
+#include <QtCore/qabstractanimation.h>
+#include <private/qgraphicsview_p.h>
+
+QT_BEGIN_NAMESPACE
+
+DEFINE_BOOL_CONFIG_OPTION(frameRateDebug, QML_SHOW_FRAMERATE)
+
+class QDeclarativeViewDebugServer;
+class FrameBreakAnimation : public QAbstractAnimation
+{
+public:
+    FrameBreakAnimation(QDeclarativeViewDebugServer *s)
+    : QAbstractAnimation((QObject*)s), server(s)
+    {
+        start();
+    }
+
+    virtual int duration() const { return -1; }
+    virtual void updateCurrentTime(int msecs);
+
+private:
+    QDeclarativeViewDebugServer *server;
+};
+
+class QDeclarativeViewDebugServer : public QDeclarativeDebugService
+{
+public:
+    QDeclarativeViewDebugServer(QObject *parent = 0) : QDeclarativeDebugService(QLatin1String("CanvasFrameRate"), parent), breaks(0)
+    {
+        timer.start();
+        new FrameBreakAnimation(this);
+    }
+
+    void addTiming(int pe, int tbf)
+    {
+        if (!isEnabled())
+            return;
+
+        bool isFrameBreak = breaks > 1;
+        breaks = 0;
+        int e = timer.elapsed();
+        QByteArray data;
+        QDataStream ds(&data, QIODevice::WriteOnly);
+        ds << (int)pe << (int)tbf << (int)e
+           << (bool)isFrameBreak;
+        sendMessage(data);
+    }
+
+    void frameBreak() { ++breaks; }
+
+private:
+    QTime timer;
+    int breaks;
+};
+
+Q_GLOBAL_STATIC(QDeclarativeViewDebugServer, qfxViewDebugServer);
+
+void FrameBreakAnimation::updateCurrentTime(int msecs)
+{
+    Q_UNUSED(msecs);
+    server->frameBreak();
+}
+
+class QDeclarativeViewPrivate
+{
+public:
+    QDeclarativeViewPrivate(QDeclarativeView *view)
+        : q(view), root(0), component(0), resizeMode(QDeclarativeView::SizeViewToRootObject) {}
+
+    void execute();
+
+    QDeclarativeView *q;
+
+    QGuard<QGraphicsObject> root;
+    QGuard<QDeclarativeItem> qmlRoot;
+
+    QUrl source;
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent *component;
+    QBasicTimer resizetimer;
+
+    mutable QSize initialSize;
+    QDeclarativeView::ResizeMode resizeMode;
+    QTime frameTimer;
+
+    void init();
+
+    QGraphicsScene scene;
+};
+
+void QDeclarativeViewPrivate::execute()
+{
+    delete root;
+    delete component;
+    component = new QDeclarativeComponent(&engine, source, q);
+
+    if (!component->isLoading()) {
+        q->continueExecute();
+    } else {
+        QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), q, SLOT(continueExecute()));
+    }
+}
+
+
+/*!
+    \class QDeclarativeView
+  \since 4.7
+    \brief The QDeclarativeView class provides a widget for displaying a Qt Declarative user interface.
+
+    Any QGraphicsObject or QDeclarativeItem
+    created via QML can be placed on a standard QGraphicsScene and viewed with a standard
+    QGraphicsView.
+
+    QDeclarativeView is a QGraphicsView subclass provided as a convenience for displaying QML
+    files, and connecting between QML and C++ Qt objects.
+
+    QDeclarativeView performs the following functions:
+
+    \list
+    \o Manages QDeclarativeComponent loading and object creation.
+    \o Initializes QGraphicsView for optimal performance with QML:
+        \list
+        \o QGraphicsView::setOptimizationFlags(QGraphicsView::DontSavePainterState);
+        \o QGraphicsView::setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+        \o QGraphicsScene::setItemIndexMethod(QGraphicsScene::NoIndex);
+        \endlist
+    \o Initializes QGraphicsView for QML key handling:
+        \list
+        \o QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus);
+        \o QGraphicsScene::setStickyFocus(true);
+        \endlist
+    \endlist
+
+    Typical usage:
+    \code
+    ...
+    QDeclarativeView *view = new QDeclarativeView(this);
+    vbox->addWidget(view);
+
+    QUrl url(fileName);
+    view->setSource(url);
+    view->show();
+    \endcode
+
+    To receive errors related to loading and executing QML with QDeclarativeView,
+    you can connect to the statusChanged() signal and monitor for QDeclarativeView::Error.
+    The errors are available via QDeclarativeView::errors().
+*/
+
+
+/*! \fn void QDeclarativeView::sceneResized(QSize size)
+  This signal is emitted when the view is resized to \a size.
+*/
+
+/*! \fn void QDeclarativeView::statusChanged(QDeclarativeView::Status status)
+    This signal is emitted when the component's current \l{QDeclarativeView::Status} {status} changes.
+*/
+
+/*!
+  \fn QDeclarativeView::QDeclarativeView(QWidget *parent)
+  
+  Constructs a QDeclarativeView with the given \a parent.
+*/
+QDeclarativeView::QDeclarativeView(QWidget *parent)
+: QGraphicsView(parent), d(new QDeclarativeViewPrivate(this))
+{
+    setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
+    d->init();
+}
+
+/*!
+  \fn QDeclarativeView::QDeclarativeView(const QUrl &source, QWidget *parent)
+
+  Constructs a QDeclarativeView with the given QML \a source and \a parent.
+*/
+QDeclarativeView::QDeclarativeView(const QUrl &source, QWidget *parent)
+: QGraphicsView(parent), d(new QDeclarativeViewPrivate(this))
+{
+    setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
+    d->init();
+    setSource(source);
+}
+
+void QDeclarativeViewPrivate::init()
+{
+#ifdef Q_ENABLE_PERFORMANCE_LOG
+    {
+        QDeclarativePerfTimer<QDeclarativePerf::FontDatabase> perf;
+        QFontDatabase database;
+    }
+#endif
+
+    q->setScene(&scene);
+
+    q->setOptimizationFlags(QGraphicsView::DontSavePainterState);
+    q->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    q->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    q->setFrameStyle(0);
+
+    // These seem to give the best performance
+    q->setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
+    q->viewport()->setFocusPolicy(Qt::NoFocus);
+
+    scene.setStickyFocus(true);  //### needed for correct focus handling
+}
+
+/*!
+  The destructor clears the view's \l {QGraphicsObject} {items} and
+  deletes the internal representation.
+ */
+QDeclarativeView::~QDeclarativeView()
+{
+    delete d->root;
+}
+
+/*!
+    Sets the source to the \a url, loads the QML component and instantiates it.
+ */
+void QDeclarativeView::setSource(const QUrl& url)
+{
+    if (url != d->source) {
+        d->source = url;
+        d->execute();
+    }
+}
+
+/*!
+  Returns the source URL, if set.
+
+  \sa setSource()
+ */
+QUrl QDeclarativeView::source() const
+{
+    return d->source;
+}
+
+/*!
+  Returns a pointer to the QDeclarativeEngine used for instantiating
+  QML Components.
+ */
+QDeclarativeEngine* QDeclarativeView::engine()
+{
+    return &d->engine;
+}
+
+/*!
+  This function returns the root of the context hierarchy.  Each QML
+  component is instantiated in a QDeclarativeContext.  QDeclarativeContext's are
+  essential for passing data to QML components.  In QML, contexts are
+  arranged hierarchically and this hierarchy is managed by the
+  QDeclarativeEngine.
+ */
+QDeclarativeContext* QDeclarativeView::rootContext()
+{
+    return d->engine.rootContext();
+}
+
+
+/*!
+  \enum QDeclarativeView::Status
+
+    Specifies the loading status of the QDeclarativeView.
+
+    \value Null This QDeclarativeView has no source set.
+    \value Ready This QDeclarativeView has loaded and created the QML component.
+    \value Loading This QDeclarativeView is loading network data.
+    \value Error An error has occured.  Calling errorDescription() to retrieve a description.
+*/
+
+/*!
+    \property QDeclarativeView::status
+    The component's current \l{QDeclarativeView::Status} {status}.
+*/
+
+QDeclarativeView::Status QDeclarativeView::status() const
+{
+    if (!d->component)
+        return QDeclarativeView::Null;
+
+    return QDeclarativeView::Status(d->component->status());
+}
+
+/*!
+    Return the list of errors that occured during the last compile or create
+    operation.  An empty list is returned if isError() is not set.
+*/
+QList<QDeclarativeError> QDeclarativeView::errors() const
+{
+    if (d->component)
+        return d->component->errors();
+    return QList<QDeclarativeError>();
+}
+
+
+/*!
+    \property QDeclarativeView::resizeMode
+    \brief whether the view should resize the canvas contents
+
+    If this property is set to SizeViewToRootObject (the default), the view
+    resizes with the root item in the QML.
+
+    If this property is set to SizeRootObjectToView, the view will
+    automatically resize the root item.
+
+    Regardless of this property, the sizeHint of the view
+    is the initial size of the root item. Note though that
+    since QML may load dynamically, that size may change.
+
+    \sa initialSize()
+*/
+
+void QDeclarativeView::setResizeMode(ResizeMode mode)
+{
+    if (d->resizeMode == mode)
+        return;
+
+    d->resizeMode = mode;
+    if (d->qmlRoot) {
+        if (d->resizeMode == SizeRootObjectToView) {
+            d->qmlRoot->setWidth(width());
+            d->qmlRoot->setHeight(height());
+        } else {
+            d->qmlRoot->setWidth(d->initialSize.width());
+            d->qmlRoot->setHeight(d->initialSize.height());
+        }
+    }
+}
+
+QDeclarativeView::ResizeMode QDeclarativeView::resizeMode() const
+{
+    return d->resizeMode;
+}
+
+/*!
+  \internal
+ */
+void QDeclarativeView::continueExecute()
+{
+
+    disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
+
+    if (d->component->isError()) {
+        QList<QDeclarativeError> errorList = d->component->errors();
+        foreach (const QDeclarativeError &error, errorList) {
+            qWarning() << error;
+        }
+        emit statusChanged(status());
+        return;
+    }
+
+    QObject *obj = d->component->create();
+
+    if(d->component->isError()) {
+        QList<QDeclarativeError> errorList = d->component->errors();
+        foreach (const QDeclarativeError &error, errorList) {
+            qWarning() << error;
+        }
+        emit statusChanged(status());
+        return;
+    }
+
+    setRootObject(obj);
+    emit statusChanged(status());
+}
+
+
+/*!
+  \internal
+*/
+void QDeclarativeView::setRootObject(QObject *obj)
+{
+    if (QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(obj)) {
+        d->scene.addItem(item);
+
+        QPerformanceLog::displayData();
+        QPerformanceLog::clear();
+        d->root = item;
+        d->qmlRoot = item;
+        connect(item, SIGNAL(widthChanged()), this, SLOT(sizeChanged()));
+        connect(item, SIGNAL(heightChanged()), this, SLOT(sizeChanged()));
+        if (d->initialSize.height() <= 0 && d->qmlRoot->width() > 0)
+            d->initialSize.setWidth(d->qmlRoot->width());
+        if (d->initialSize.height() <= 0 && d->qmlRoot->height() > 0)
+            d->initialSize.setHeight(d->qmlRoot->height());
+        resize(d->initialSize);
+
+        if (d->resizeMode == SizeRootObjectToView) {
+            d->qmlRoot->setWidth(width());
+            d->qmlRoot->setHeight(height());
+        } else {
+            QSize sz(d->qmlRoot->width(),d->qmlRoot->height());
+            emit sceneResized(sz);
+            resize(sz);
+        }
+        updateGeometry();
+    } else if (QGraphicsObject *item = qobject_cast<QGraphicsObject *>(obj)) {
+        d->scene.addItem(item);
+        qWarning() << "QDeclarativeView::resizeMode is not honored for components of type QGraphicsObject";
+    } else if (QWidget *wid = qobject_cast<QWidget *>(obj)) {
+        window()->setAttribute(Qt::WA_OpaquePaintEvent, false);
+        window()->setAttribute(Qt::WA_NoSystemBackground, false);
+        if (!layout()) {
+            setLayout(new QVBoxLayout);
+            layout()->setContentsMargins(0, 0, 0, 0);
+        } else if (layout()->count()) {
+            // Hide the QGraphicsView in GV mode.
+            QLayoutItem *item = layout()->itemAt(0);
+            if (item->widget())
+                item->widget()->hide();
+        }
+        layout()->addWidget(wid);
+        emit sceneResized(wid->size());
+    }
+}
+
+/*!
+  \internal
+ */
+void QDeclarativeView::sizeChanged()
+{
+    // delay, so we catch both width and height changing.
+    d->resizetimer.start(0,this);
+}
+
+/*!
+  \internal
+  If the \l {QTimerEvent} {timer event} \a e is this
+  view's resize timer, sceneResized() is emitted.
+ */
+void QDeclarativeView::timerEvent(QTimerEvent* e)
+{
+    if (!e || e->timerId() == d->resizetimer.timerId()) {
+        if (d->qmlRoot) {
+            QSize sz(d->qmlRoot->width(),d->qmlRoot->height());
+            emit sceneResized(sz);
+            //if (!d->resizable)
+                //resize(sz);
+        }
+        d->resizetimer.stop();
+        updateGeometry();
+    }
+}
+
+/*!
+    \internal
+    The size hint is the size of the root item.
+*/
+QSize QDeclarativeView::sizeHint() const
+{
+    if (d->qmlRoot) {
+        if (d->initialSize.width() <= 0)
+            d->initialSize.setWidth(d->qmlRoot->width());
+        if (d->initialSize.height() <= 0)
+            d->initialSize.setHeight(d->qmlRoot->height());
+    }
+    return d->initialSize;
+}
+
+/*!
+  Returns the view's root \l {QGraphicsObject} {item}.
+ */
+QGraphicsObject *QDeclarativeView::rootObject() const
+{
+    return d->root;
+}
+
+/*!
+  \internal
+  This function handles the \l {QResizeEvent} {resize event}
+  \a e.
+ */
+void QDeclarativeView::resizeEvent(QResizeEvent *e)
+{
+    if (d->resizeMode == SizeRootObjectToView && d->qmlRoot) {
+        d->qmlRoot->setWidth(width());
+        d->qmlRoot->setHeight(height());
+    }
+    if (d->qmlRoot) {
+        setSceneRect(QRectF(0, 0, d->qmlRoot->width(), d->qmlRoot->height()));
+    } else if (d->root) {
+        setSceneRect(d->root->boundingRect());
+    } else {
+        setSceneRect(rect());
+    }
+    QGraphicsView::resizeEvent(e);
+}
+
+/*!
+    \internal
+*/
+void QDeclarativeView::paintEvent(QPaintEvent *event)
+{
+    int time = 0;
+    if (frameRateDebug() || QDeclarativeViewDebugServer::isDebuggingEnabled())
+        time = d->frameTimer.restart();
+    QGraphicsView::paintEvent(event);
+    if (QDeclarativeViewDebugServer::isDebuggingEnabled())
+        qfxViewDebugServer()->addTiming(d->frameTimer.elapsed(), time);
+    if (frameRateDebug())
+        qDebug() << "paintEvent:" << d->frameTimer.elapsed() << "time since last frame:" << time;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h
new file mode 100644
index 0000000..03d8db3
--- /dev/null
+++ b/src/declarative/util/qdeclarativeview.h
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEVIEW_H
+#define QDECLARATIVEVIEW_H
+
+#include <QtCore/qdatetime.h>
+#include <QtGui/qgraphicssceneevent.h>
+#include <QtGui/qgraphicsview.h>
+#include <QtGui/qwidget.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QGraphicsObject;
+class QDeclarativeEngine;
+class QDeclarativeContext;
+class QDeclarativeError;
+
+class QDeclarativeViewPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView
+{
+    Q_OBJECT
+    Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+
+public:
+    explicit QDeclarativeView(QWidget *parent = 0);
+    QDeclarativeView(const QUrl &source, QWidget *parent = 0);
+    virtual ~QDeclarativeView();
+
+    QUrl source() const;
+    void setSource(const QUrl&);
+
+    QDeclarativeEngine* engine();
+    QDeclarativeContext* rootContext();
+
+    QGraphicsObject *rootObject() const;
+
+    enum ResizeMode { SizeViewToRootObject, SizeRootObjectToView };
+    ResizeMode resizeMode() const;
+    void setResizeMode(ResizeMode);
+
+    enum Status { Null, Ready, Loading, Error };
+    Status status() const;
+
+    QList<QDeclarativeError> errors() const;
+
+    QSize sizeHint() const;
+
+Q_SIGNALS:
+    void sceneResized(QSize size); // ???
+    void statusChanged(QDeclarativeView::Status);
+
+private Q_SLOTS:
+    void continueExecute();
+    void sizeChanged();
+
+protected:
+    virtual void resizeEvent(QResizeEvent *);
+    virtual void paintEvent(QPaintEvent *event);
+    virtual void timerEvent(QTimerEvent*);
+    virtual void setRootObject(QObject *obj);
+
+    friend class QDeclarativeViewPrivate;
+    QDeclarativeViewPrivate *d;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEVIEW_H
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
new file mode 100644
index 0000000..63bf02b
--- /dev/null
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -0,0 +1,796 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativexmllistmodel_p.h"
+
+#include <qdeclarativecontext.h>
+#include <qdeclarativeengine.h>
+
+#include <QDebug>
+#include <QApplication>
+#include <QThread>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QXmlQuery>
+#include <QXmlResultItems>
+#include <QXmlNodeModelIndex>
+#include <QBuffer>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+
+
+
+typedef QPair<int, int> QDeclarativeXmlListRange;
+
+/*!
+    \qmlclass XmlRole QDeclarativeXmlListModelRole
+  \since 4.7
+    \brief The XmlRole element allows you to specify a role for an XmlListModel.
+*/
+
+/*!
+    \qmlproperty string XmlRole::name
+    The name for the role. This name is used to access the model data for this role from Qml.
+
+    \qml
+    XmlRole { name: "title"; query: "title/string()" }
+
+    ...
+
+    Component {
+        id: myDelegate
+        Text { text: title }
+    }
+    \endqml
+*/
+
+/*!
+    \qmlproperty string XmlRole::query
+    The relative XPath query for this role. The query should not start with a '/' (i.e. it must be
+    relative).
+
+    \qml
+    XmlRole { name: "title"; query: "title/string()" }
+    \endqml
+*/
+
+/*!
+    \qmlproperty bool XmlRole::isKey
+    Defines whether this is a key role.
+    
+    Key roles are used to to determine whether a set of values should
+    be updated or added to the XML list model when XmlListModel::reload()
+    is called.
+
+    \sa XmlListModel
+*/
+
+
+class QDeclarativeXmlQuery : public QThread
+{
+    Q_OBJECT
+public:
+    QDeclarativeXmlQuery(QObject *parent=0)
+        : QThread(parent), m_quit(false), m_restart(false), m_abort(false), m_queryId(0) {
+    }
+    ~QDeclarativeXmlQuery() {
+        m_mutex.lock();
+        m_quit = true;
+        m_condition.wakeOne();
+        m_mutex.unlock();
+
+        wait();
+    }
+
+    void abort() {
+        QMutexLocker locker(&m_mutex);
+        m_abort = true;
+    }
+
+    int doQuery(QString query, QString namespaces, QByteArray data, QList<QDeclarativeXmlListModelRole *> *roleObjects) {
+        QMutexLocker locker(&m_mutex);
+        m_size = 0;
+        m_data = data;
+        m_query = QLatin1String("doc($src)") + query;
+        m_namespaces = namespaces;
+        m_roleObjects = roleObjects;
+        if (!isRunning()) {
+            m_abort = false;
+            start();
+        } else {
+            m_restart = true;
+            m_condition.wakeOne();
+        }
+        m_queryId++;
+        return m_queryId;
+    }
+
+    QList<QList<QVariant> > modelData() {
+        QMutexLocker locker(&m_mutex);
+        return m_modelData;
+    }
+
+    QList<QDeclarativeXmlListRange> insertedItemRanges() {
+        QMutexLocker locker(&m_mutex);
+        return m_insertedItemRanges;
+    }
+
+    QList<QDeclarativeXmlListRange> removedItemRanges() {
+        QMutexLocker locker(&m_mutex);
+        return m_removedItemRanges;
+    }
+
+Q_SIGNALS:
+    void queryCompleted(int queryId, int size);
+
+protected:
+    void run() {
+        while (!m_quit) {
+            m_mutex.lock();
+            int queryId = m_queryId;
+            doQueryJob();
+            doSubQueryJob();
+            m_data.clear(); // no longer needed
+            m_mutex.unlock();
+
+            m_mutex.lock();
+            if (!m_abort)
+                emit queryCompleted(queryId, m_size);
+            if (!m_restart)
+                m_condition.wait(&m_mutex);
+            m_abort = false;
+            m_restart = false;
+            m_mutex.unlock();
+        }
+    }
+
+private:
+    void doQueryJob();
+    void doSubQueryJob();
+    void getValuesOfKeyRoles(QStringList *values, QXmlQuery *query) const;
+    void addIndexToRangeList(QList<QDeclarativeXmlListRange> *ranges, int index) const;
+
+private:
+    QMutex m_mutex;
+    QWaitCondition m_condition;
+    bool m_quit;
+    bool m_restart;
+    bool m_abort;
+    QByteArray m_data;
+    QString m_query;
+    QString m_namespaces;
+    QString m_prefix;
+    int m_size;
+    int m_queryId;
+    const QList<QDeclarativeXmlListModelRole *> *m_roleObjects;
+    QList<QList<QVariant> > m_modelData;
+    QStringList m_keysValues;
+    QList<QDeclarativeXmlListRange> m_insertedItemRanges;
+    QList<QDeclarativeXmlListRange> m_removedItemRanges;
+};
+
+void QDeclarativeXmlQuery::doQueryJob()
+{
+    QString r;
+    QXmlQuery query;
+    QBuffer buffer(&m_data);
+    buffer.open(QIODevice::ReadOnly);
+    query.bindVariable(QLatin1String("src"), &buffer);
+    query.setQuery(m_namespaces + m_query);
+    query.evaluateTo(&r);
+
+    //qDebug() << r;
+
+    //always need a single root element
+    QByteArray xml = "<dummy:items xmlns:dummy=\"http://qtsotware.com/dummy\">\n" + r.toUtf8() + "</dummy:items>";
+    QBuffer b(&xml);
+    b.open(QIODevice::ReadOnly);
+    //qDebug() << xml;
+
+    QString namespaces = QLatin1String("declare namespace dummy=\"http://qtsotware.com/dummy\";\n") + m_namespaces;
+    QString prefix = QLatin1String("doc($inputDocument)/dummy:items") +
+                     m_query.mid(m_query.lastIndexOf(QLatin1Char('/')));
+
+    //figure out how many items we are dealing with
+    int count = -1;
+    {
+        QXmlResultItems result;
+        QXmlQuery countquery;
+        countquery.bindVariable(QLatin1String("inputDocument"), &b);
+        countquery.setQuery(namespaces + QLatin1String("count(") + prefix + QLatin1Char(')'));
+        countquery.evaluateTo(&result);
+        QXmlItem item(result.next());
+        if (item.isAtomicValue())
+            count = item.toAtomicValue().toInt();
+    }
+    //qDebug() << count;
+
+    m_prefix = namespaces + prefix + QLatin1Char('/');
+    m_data = xml;
+    if (count > 0)
+        m_size = count;
+}
+
+void QDeclarativeXmlQuery::getValuesOfKeyRoles(QStringList *values, QXmlQuery *query) const
+{
+    QStringList keysQueries;
+    for (int i=0; i<m_roleObjects->count(); i++) {
+        if (m_roleObjects->at(i)->isKey())
+            keysQueries << m_roleObjects->at(i)->query();
+    }
+    QString keysQuery;
+    if (keysQueries.count() == 1)
+        keysQuery = m_prefix + keysQueries[0];
+    else if (keysQueries.count() > 1)
+        keysQuery = m_prefix + QLatin1String("concat(") + keysQueries.join(QLatin1String(",")) + QLatin1String(")");
+
+    if (!keysQuery.isEmpty()) {
+        query->setQuery(keysQuery);
+        QXmlResultItems resultItems;
+        query->evaluateTo(&resultItems);
+        QXmlItem item(resultItems.next());
+        while (!item.isNull()) {
+            values->append(item.toAtomicValue().toString());
+            item = resultItems.next();
+        }
+    }
+}
+
+void QDeclarativeXmlQuery::addIndexToRangeList(QList<QDeclarativeXmlListRange> *ranges, int index) const {
+    if (ranges->isEmpty())
+        ranges->append(qMakePair(index, 1));
+    else if (ranges->last().first + ranges->last().second == index)
+        ranges->last().second += 1;
+    else
+        ranges->append(qMakePair(index, 1));
+}
+
+void QDeclarativeXmlQuery::doSubQueryJob()
+{
+    m_modelData.clear();
+
+    QBuffer b(&m_data);
+    b.open(QIODevice::ReadOnly);
+
+    QXmlQuery subquery;
+    subquery.bindVariable(QLatin1String("inputDocument"), &b);
+
+    QStringList keysValues;
+    getValuesOfKeyRoles(&keysValues, &subquery);
+
+    // See if any values of key roles have been inserted or removed.
+    m_insertedItemRanges.clear();
+    m_removedItemRanges.clear();
+    if (m_keysValues.isEmpty()) {
+        m_insertedItemRanges << qMakePair(0, m_size);
+    } else {
+        if (keysValues != m_keysValues) {
+            QStringList temp;
+            for (int i=0; i<m_keysValues.count(); i++) {
+                if (!keysValues.contains(m_keysValues[i]))
+                    addIndexToRangeList(&m_removedItemRanges, i);
+                else 
+                    temp << m_keysValues[i];
+            }
+
+            for (int i=0; i<keysValues.count(); i++) {
+                if (temp.count() == i || keysValues[i] != temp[i]) {
+                    temp.insert(i, keysValues[i]);
+                    addIndexToRangeList(&m_insertedItemRanges, i);
+                }
+            }
+        }
+    }
+    m_keysValues = keysValues;
+
+    // Get the new values for each role.
+    //### we might be able to condense even further (query for everything in one go)
+    for (int i = 0; i < m_roleObjects->size(); ++i) {
+        QDeclarativeXmlListModelRole *role = m_roleObjects->at(i);
+        if (!role->isValid()) {
+            QList<QVariant> resultList;
+            for (int j = 0; j < m_size; ++j)
+                resultList << QVariant();
+            m_modelData << resultList;
+            continue;
+        }
+        subquery.setQuery(m_prefix + QLatin1String("(let $v := ") + role->query() + QLatin1String(" return if ($v) then ") + role->query() + QLatin1String(" else \"\")"));
+        QXmlResultItems resultItems;
+        subquery.evaluateTo(&resultItems);
+        QXmlItem item(resultItems.next());
+        QList<QVariant> resultList;
+        while (!item.isNull()) {
+            resultList << item.toAtomicValue(); //### we used to trim strings
+            item = resultItems.next();
+        }
+        //### should warn here if things have gone wrong.
+        while (resultList.count() < m_size)
+            resultList << QVariant();
+        m_modelData << resultList;
+        b.seek(0);
+    }
+
+    //this method is much slower, but works better for incremental loading
+    /*for (int j = 0; j < m_size; ++j) {
+        QList<QVariant> resultList;
+        for (int i = 0; i < m_roleObjects->size(); ++i) {
+            QDeclarativeXmlListModelRole *role = m_roleObjects->at(i);
+            subquery.setQuery(m_prefix.arg(j+1) + role->query());
+            if (role->isStringList()) {
+                QStringList data;
+                subquery.evaluateTo(&data);
+                resultList << QVariant(data);
+                //qDebug() << data;
+            } else {
+                QString s;
+                subquery.evaluateTo(&s);
+                if (role->isCData()) {
+                    //un-escape
+                    s.replace(QLatin1String("&lt;"), QLatin1String("<"));
+                    s.replace(QLatin1String("&gt;"), QLatin1String(">"));
+                    s.replace(QLatin1String("&amp;"), QLatin1String("&"));
+                }
+                resultList << s.trimmed();
+                //qDebug() << s;
+            }
+            b.seek(0);
+        }
+        m_modelData << resultList;
+    }*/
+}
+
+class QDeclarativeXmlListModelPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeXmlListModel)
+public:
+    QDeclarativeXmlListModelPrivate()
+        : isComponentComplete(true), size(-1), highestRole(Qt::UserRole)
+        , reply(0), status(QDeclarativeXmlListModel::Null), progress(0.0)
+        , queryId(-1), roleObjects() {}
+
+    bool isComponentComplete;
+    QUrl src;
+    QString xml;
+    QString query;
+    QString namespaces;
+    int size;
+    QList<int> roles;
+    QStringList roleNames;
+    int highestRole;
+    QNetworkReply *reply;
+    QDeclarativeXmlListModel::Status status;
+    qreal progress;
+    QDeclarativeXmlQuery qmlXmlQuery;
+    int queryId;
+    QList<QDeclarativeXmlListModelRole *> roleObjects;
+    static void append_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, QDeclarativeXmlListModelRole *role);
+    static void clear_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list);
+    static void removeAt_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, int i);
+    static void insert_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, int i, QDeclarativeXmlListModelRole *role);
+    QList<QList<QVariant> > data;
+};
+
+
+void QDeclarativeXmlListModelPrivate::append_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, QDeclarativeXmlListModelRole *role)
+{
+    QDeclarativeXmlListModel *_this = qobject_cast<QDeclarativeXmlListModel *>(list->object);
+    if (_this) {
+        int i = _this->d_func()->roleObjects.count();
+        _this->d_func()->roleObjects.append(role);
+        if (_this->d_func()->roleNames.contains(role->name())) {
+            qmlInfo(role) << QObject::tr("\"%1\" duplicates a previous role name and will be disabled.").arg(role->name());
+            return;
+        }
+        _this->d_func()->roles.insert(i, _this->d_func()->highestRole);
+        _this->d_func()->roleNames.insert(i, role->name());
+        ++_this->d_func()->highestRole;
+    }
+}
+
+//### clear needs to invalidate any cached data (in data table) as well
+//    (and the model should emit the appropriate signals)
+void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list)
+{
+    QDeclarativeXmlListModel *_this = static_cast<QDeclarativeXmlListModel *>(list->object);
+    _this->d_func()->roles.clear();
+    _this->d_func()->roleNames.clear();
+    _this->d_func()->roleObjects.clear();
+}
+
+/*!
+    \class QDeclarativeXmlListModel
+    \internal
+*/
+
+/*!
+    \qmlclass XmlListModel QDeclarativeXmlListModel
+  \since 4.7
+    \brief The XmlListModel element is used to specify a model using XPath expressions.
+
+    XmlListModel is used to create a model from XML data that can be used as a data source
+    for the view classes (such as ListView, PathView, GridView) and other classes that interact with model
+    data (such as Repeater).
+
+    Here is an example of a model containing news from a Yahoo RSS feed:
+    \qml
+    XmlListModel {
+        id: feedModel
+        source: "http://rss.news.yahoo.com/rss/oceania"
+        query: "/rss/channel/item"
+        XmlRole { name: "title"; query: "title/string()" }
+        XmlRole { name: "pubDate"; query: "pubDate/string()" }
+        XmlRole { name: "description"; query: "description/string()" }
+    }
+    \endqml
+
+    You can also define certain roles as "keys" so that the model only adds data
+    that contains new values for these keys when reload() is called.
+
+    For example, if the roles above were defined like this:
+
+    \qml
+        XmlRole { name: "title"; query: "title/string()"; isKey: true }
+        XmlRole { name: "pubDate"; query: "pubDate/string()"; isKey: true }
+    \endqml
+
+    Then when reload() is called, the model will only add new items with a
+    "title" and "pubDate" value combination that is not already present in
+    the model.
+
+    This is useful to provide incremental updates and avoid repainting an
+    entire model in a view.
+*/
+
+QDeclarativeXmlListModel::QDeclarativeXmlListModel(QObject *parent)
+    : QListModelInterface(*(new QDeclarativeXmlListModelPrivate), parent)
+{
+    Q_D(QDeclarativeXmlListModel);
+    connect(&d->qmlXmlQuery, SIGNAL(queryCompleted(int,int)),
+            this, SLOT(queryCompleted(int,int)));
+}
+
+QDeclarativeXmlListModel::~QDeclarativeXmlListModel()
+{
+}
+
+/*!
+    \qmlproperty list<XmlRole> XmlListModel::roles
+
+    The roles to make available for this model.
+*/
+QDeclarativeListProperty<QDeclarativeXmlListModelRole> QDeclarativeXmlListModel::roleObjects()
+{
+    Q_D(QDeclarativeXmlListModel);
+    QDeclarativeListProperty<QDeclarativeXmlListModelRole> list(this, d->roleObjects);
+    list.append = &QDeclarativeXmlListModelPrivate::append_role;
+    list.clear = &QDeclarativeXmlListModelPrivate::clear_role;
+    return list;
+}
+
+QHash<int,QVariant> QDeclarativeXmlListModel::data(int index, const QList<int> &roles) const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    QHash<int, QVariant> rv;
+    for (int i = 0; i < roles.size(); ++i) {
+        int role = roles.at(i);
+        int roleIndex = d->roles.indexOf(role);
+        rv.insert(role, roleIndex == -1 ? QVariant() : d->data.at(roleIndex).at(index));
+    }
+    return rv;
+}
+
+QVariant QDeclarativeXmlListModel::data(int index, int role) const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    int roleIndex = d->roles.indexOf(role);
+    return (roleIndex == -1) ? QVariant() : d->data.at(roleIndex).at(index);
+}
+
+/*!
+    \qmlproperty int XmlListModel::count
+    The number of data entries in the model.
+*/
+int QDeclarativeXmlListModel::count() const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    return d->size;
+}
+
+QList<int> QDeclarativeXmlListModel::roles() const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    return d->roles;
+}
+
+QString QDeclarativeXmlListModel::toString(int role) const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    int index = d->roles.indexOf(role);
+    if (index == -1)
+        return QString();
+    return d->roleNames.at(index);
+}
+
+/*!
+    \qmlproperty url XmlListModel::source
+    The location of the XML data source.
+
+    If both source and xml are set, xml will be used.
+*/
+QUrl QDeclarativeXmlListModel::source() const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    return d->src;
+}
+
+void QDeclarativeXmlListModel::setSource(const QUrl &src)
+{
+    Q_D(QDeclarativeXmlListModel);
+    if (d->src != src) {
+        d->src = src;
+        reload();
+    }
+}
+
+/*!
+    \qmlproperty string XmlListModel::xml
+    This property holds XML text set directly.
+
+    The text is assumed to be UTF-8 encoded.
+
+    If both source and xml are set, xml will be used.
+*/
+QString QDeclarativeXmlListModel::xml() const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    return d->xml;
+}
+
+void QDeclarativeXmlListModel::setXml(const QString &xml)
+{
+    Q_D(QDeclarativeXmlListModel);
+    d->xml = xml;
+    reload();
+}
+
+/*!
+    \qmlproperty string XmlListModel::query
+    An absolute XPath query representing the base query for the model items. The query should start with
+    '/' or '//'.
+*/
+QString QDeclarativeXmlListModel::query() const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    return d->query;
+}
+
+void QDeclarativeXmlListModel::setQuery(const QString &query)
+{
+    Q_D(QDeclarativeXmlListModel);
+    if (!query.startsWith(QLatin1Char('/'))) {
+        qmlInfo(this) << QCoreApplication::translate("QDeclarativeXmlRoleList", "An XmlListModel query must start with '/' or \"//\"");
+        return;
+    }
+
+    if (d->query != query) {
+        d->query = query;
+        reload();
+    }
+}
+
+/*!
+    \qmlproperty string XmlListModel::namespaceDeclarations
+    A set of declarations for the namespaces used in the query.
+*/
+QString QDeclarativeXmlListModel::namespaceDeclarations() const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    return d->namespaces;
+}
+
+void QDeclarativeXmlListModel::setNamespaceDeclarations(const QString &declarations)
+{
+    Q_D(QDeclarativeXmlListModel);
+    if (d->namespaces != declarations) {
+        d->namespaces = declarations;
+        reload();
+    }
+}
+
+/*!
+    \qmlproperty enum XmlListModel::status
+
+    This property holds the status of data source loading.  It can be one of:
+    \list
+    \o Null - no data source has been set
+    \o Ready - nthe data source has been loaded
+    \o Loading - the data source is currently being loaded
+    \o Error - an error occurred while loading the data source
+    \endlist
+
+    \sa progress
+
+*/
+QDeclarativeXmlListModel::Status QDeclarativeXmlListModel::status() const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    return d->status;
+}
+
+/*!
+    \qmlproperty real XmlListModel::progress
+
+    This property holds the progress of data source loading, from 0.0 (nothing loaded)
+    to 1.0 (finished).
+
+    \sa status
+*/
+qreal QDeclarativeXmlListModel::progress() const
+{
+    Q_D(const QDeclarativeXmlListModel);
+    return d->progress;
+}
+
+void QDeclarativeXmlListModel::classBegin()
+{
+    Q_D(QDeclarativeXmlListModel);
+    d->isComponentComplete = false;
+}
+
+void QDeclarativeXmlListModel::componentComplete()
+{
+    Q_D(QDeclarativeXmlListModel);
+    d->isComponentComplete = true;
+    reload();
+}
+
+/*!
+    \qmlmethod XmlListModel::reload()
+
+    Reloads the model.
+    
+    If no key roles have been specified, all existing model
+    data is removed, and the model is rebuilt from scratch.
+
+    Otherwise, items are only added if the model does not already
+    contain items with matching key role values.
+*/
+void QDeclarativeXmlListModel::reload()
+{
+    Q_D(QDeclarativeXmlListModel);
+
+    if (!d->isComponentComplete)
+        return;
+
+    d->qmlXmlQuery.abort();
+    d->queryId = -1;
+
+    if (d->size < 0)
+        d->size = 0;
+
+    if (d->src.isEmpty() && d->xml.isEmpty())
+        return;
+
+    if (d->reply) {
+        d->reply->abort();
+        d->reply->deleteLater();
+        d->reply = 0;
+    }
+
+    if (!d->xml.isEmpty()) {
+        d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, d->xml.toUtf8(), &d->roleObjects);
+        d->progress = 1.0;
+        d->status = Ready;
+        emit progressChanged(d->progress);
+        emit statusChanged(d->status);
+        return;
+    }
+
+    d->progress = 0.0;
+    d->status = Loading;
+    emit progressChanged(d->progress);
+    emit statusChanged(d->status);
+
+    QNetworkRequest req(d->src);
+    d->reply = qmlContext(this)->engine()->networkAccessManager()->get(req);
+    QObject::connect(d->reply, SIGNAL(finished()), this, SLOT(requestFinished()));
+    QObject::connect(d->reply, SIGNAL(downloadProgress(qint64,qint64)),
+                     this, SLOT(requestProgress(qint64,qint64)));
+}
+
+void QDeclarativeXmlListModel::requestFinished()
+{
+    Q_D(QDeclarativeXmlListModel);
+    if (d->reply->error() != QNetworkReply::NoError) {
+        disconnect(d->reply, 0, this, 0);
+        d->reply->deleteLater();
+        d->reply = 0;
+        d->status = Error;
+    } else {
+        d->status = Ready;
+        QByteArray data = d->reply->readAll();
+        d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, data, &d->roleObjects);
+        disconnect(d->reply, 0, this, 0);
+        d->reply->deleteLater();
+        d->reply = 0;
+    }
+    d->progress = 1.0;
+    emit progressChanged(d->progress);
+    emit statusChanged(d->status);
+}
+
+void QDeclarativeXmlListModel::requestProgress(qint64 received, qint64 total)
+{
+    Q_D(QDeclarativeXmlListModel);
+    if (d->status == Loading && total > 0) {
+        d->progress = qreal(received)/total;
+        emit progressChanged(d->progress);
+    }
+}
+
+void QDeclarativeXmlListModel::queryCompleted(int id, int size)
+{
+    Q_D(QDeclarativeXmlListModel);
+    if (id != d->queryId)
+        return;
+    bool sizeChanged = size != d->size;
+    d->size = size;
+    d->data = d->qmlXmlQuery.modelData();
+
+    QList<QDeclarativeXmlListRange> removed = d->qmlXmlQuery.removedItemRanges();
+    for (int i=0; i<removed.count(); i++)
+        emit itemsRemoved(removed[i].first, removed[i].second);
+    QList<QDeclarativeXmlListRange> inserted = d->qmlXmlQuery.insertedItemRanges();
+    for (int i=0; i<inserted.count(); i++)
+        emit itemsInserted(inserted[i].first, inserted[i].second);
+
+    if (sizeChanged)
+        emit countChanged();
+}
+
+QT_END_NAMESPACE
+
+#include <qdeclarativexmllistmodel.moc>
diff --git a/src/declarative/util/qdeclarativexmllistmodel_p.h b/src/declarative/util/qdeclarativexmllistmodel_p.h
new file mode 100644
index 0000000..f23a85b
--- /dev/null
+++ b/src/declarative/util/qdeclarativexmllistmodel_p.h
@@ -0,0 +1,174 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEXMLLISTMODEL_H
+#define QDECLARATIVEXMLLISTMODEL_H
+
+#include <qdeclarative.h>
+#include <qdeclarativeinfo.h>
+
+#include "../3rdparty/qlistmodelinterface_p.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeContext;
+
+class QDeclarativeXmlListModelRole;
+
+class QDeclarativeXmlListModelPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeXmlListModel : public QListModelInterface, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_ENUMS(Status)
+
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+    Q_PROPERTY(QUrl source READ source WRITE setSource)
+    Q_PROPERTY(QString xml READ xml WRITE setXml)
+    Q_PROPERTY(QString query READ query WRITE setQuery)
+    Q_PROPERTY(QString namespaceDeclarations READ namespaceDeclarations WRITE setNamespaceDeclarations)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeXmlListModelRole> roles READ roleObjects)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_CLASSINFO("DefaultProperty", "roles")
+
+public:
+    QDeclarativeXmlListModel(QObject *parent = 0);
+    ~QDeclarativeXmlListModel();
+
+    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
+    virtual QVariant data(int index, int role) const;
+    virtual int count() const;
+    virtual QList<int> roles() const;
+    virtual QString toString(int role) const;
+
+    QDeclarativeListProperty<QDeclarativeXmlListModelRole> roleObjects();
+
+    QUrl source() const;
+    void setSource(const QUrl&);
+
+    QString xml() const;
+    void setXml(const QString&);
+
+    QString query() const;
+    void setQuery(const QString&);
+
+    QString namespaceDeclarations() const;
+    void setNamespaceDeclarations(const QString&);
+
+    enum Status { Null, Ready, Loading, Error };
+    Status status() const;
+    qreal progress() const;
+
+    virtual void classBegin();
+    virtual void componentComplete();
+
+Q_SIGNALS:
+    void statusChanged(Status);
+    void progressChanged(qreal progress);
+    void countChanged();
+
+public Q_SLOTS:
+    // ### need to use/expose Expiry to guess when to call this?
+    // ### property to auto-call this on reasonable Expiry?
+    // ### LastModified/Age also useful to guess.
+    // ### Probably also applies to other network-requesting types.
+    void reload();
+
+private Q_SLOTS:
+    void requestFinished();
+    void requestProgress(qint64,qint64);
+    void queryCompleted(int,int);
+
+private:
+    Q_DECLARE_PRIVATE(QDeclarativeXmlListModel)
+    Q_DISABLE_COPY(QDeclarativeXmlListModel)
+};
+
+class Q_DECLARATIVE_EXPORT QDeclarativeXmlListModelRole : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(QString query READ query WRITE setQuery)
+    Q_PROPERTY(bool isKey READ isKey WRITE setIsKey)
+
+public:
+    QDeclarativeXmlListModelRole() : m_isKey(false) {}
+    ~QDeclarativeXmlListModelRole() {}
+
+    QString name() const { return m_name; }
+    void setName(const QString &name) { m_name = name; }
+
+    QString query() const { return m_query; }
+    void setQuery(const QString &query)
+    {
+        if (query.startsWith(QLatin1Char('/'))) {
+            qmlInfo(this) << tr("An XmlRole query must not start with '/'");
+            return;
+        }
+        m_query = query;
+    }
+
+    bool isKey() const { return m_isKey; }
+    void setIsKey(bool b) { m_isKey = b; }
+
+    bool isValid() {
+        return !m_name.isEmpty() && !m_query.isEmpty();
+    }
+
+private:
+    QString m_name;
+    QString m_query;
+    bool m_isKey;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeXmlListModel)
+QML_DECLARE_TYPE(QDeclarativeXmlListModelRole)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEXMLLISTMODEL_H
diff --git a/src/declarative/util/qfxperf.cpp b/src/declarative/util/qfxperf.cpp
index 8f5617c..5611c49 100644
--- a/src/declarative/util/qfxperf.cpp
+++ b/src/declarative/util/qfxperf.cpp
@@ -43,25 +43,25 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_DEFINE_PERFORMANCE_LOG(QmlPerf, "QmlGraphics") {
-    Q_DEFINE_PERFORMANCE_METRIC(QmlParsing, "Compilation: QML Parsing")
+Q_DEFINE_PERFORMANCE_LOG(QDeclarativePerf, "QDeclarativeGraphics") {
+    Q_DEFINE_PERFORMANCE_METRIC(QDeclarativeParsing, "Compilation: QML Parsing")
     Q_DEFINE_PERFORMANCE_METRIC(Compilation, "             QML Compilation")
     Q_DEFINE_PERFORMANCE_METRIC(VMEExecution, "Execution:   QML VME Execution")
     Q_DEFINE_PERFORMANCE_METRIC(BindInit, "BindValue Initialization")
     Q_DEFINE_PERFORMANCE_METRIC(BindValue, "BindValue execution")
     Q_DEFINE_PERFORMANCE_METRIC(BindValueSSE, "BindValue execution SSE")
     Q_DEFINE_PERFORMANCE_METRIC(BindValueQt, "BindValue execution QtScript")
-    Q_DEFINE_PERFORMANCE_METRIC(BindableValueUpdate, "QmlBinding::update")
+    Q_DEFINE_PERFORMANCE_METRIC(BindableValueUpdate, "QDeclarativeBinding::update")
     Q_DEFINE_PERFORMANCE_METRIC(PixmapLoad, "Pixmap loading")
     Q_DEFINE_PERFORMANCE_METRIC(FontDatabase, "Font database creation")
-    Q_DEFINE_PERFORMANCE_METRIC(QmlGraphicsPathViewPathCache, "FX Items:    QmlGraphicsPathView: Path cache")
-    Q_DEFINE_PERFORMANCE_METRIC(CreateParticle, "             QmlGraphicsParticles: Particle creation")
-    Q_DEFINE_PERFORMANCE_METRIC(ItemComponentComplete, "             QmlGraphicsItem::componentComplete")
-    Q_DEFINE_PERFORMANCE_METRIC(ImageComponentComplete, "             QmlGraphicsImage::componentComplete")
-    Q_DEFINE_PERFORMANCE_METRIC(BaseLayoutComponentComplete, "             QmlGraphicsBasePositioner::componentComplete")
-    Q_DEFINE_PERFORMANCE_METRIC(TextComponentComplete, "             QmlGraphicsText::componentComplete")
-    Q_DEFINE_PERFORMANCE_METRIC(QmlGraphicsText_setText, "             QmlGraphicsText::setText")
-    Q_DEFINE_PERFORMANCE_METRIC(AddScript, "QmlScript::addScriptToEngine")
+    Q_DEFINE_PERFORMANCE_METRIC(QDeclarativePathViewPathCache, "FX Items:    QDeclarativePathView: Path cache")
+    Q_DEFINE_PERFORMANCE_METRIC(CreateParticle, "             QDeclarativeParticles: Particle creation")
+    Q_DEFINE_PERFORMANCE_METRIC(ItemComponentComplete, "             QDeclarativeItem::componentComplete")
+    Q_DEFINE_PERFORMANCE_METRIC(ImageComponentComplete, "             QDeclarativeImage::componentComplete")
+    Q_DEFINE_PERFORMANCE_METRIC(BaseLayoutComponentComplete, "             QDeclarativeBasePositioner::componentComplete")
+    Q_DEFINE_PERFORMANCE_METRIC(TextComponentComplete, "             QDeclarativeText::componentComplete")
+    Q_DEFINE_PERFORMANCE_METRIC(QDeclarativeText_setText, "             QDeclarativeText::setText")
+    Q_DEFINE_PERFORMANCE_METRIC(AddScript, "QDeclarativeScript::addScriptToEngine")
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qfxperf_p_p.h b/src/declarative/util/qfxperf_p_p.h
index 106f761..8b65821 100644
--- a/src/declarative/util/qfxperf_p_p.h
+++ b/src/declarative/util/qfxperf_p_p.h
@@ -60,8 +60,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-Q_DECLARE_PERFORMANCE_LOG(QmlPerf) {
-    Q_DECLARE_PERFORMANCE_METRIC(QmlParsing)
+Q_DECLARE_PERFORMANCE_LOG(QDeclarativePerf) {
+    Q_DECLARE_PERFORMANCE_METRIC(QDeclarativeParsing)
 
     Q_DECLARE_PERFORMANCE_METRIC(Compilation)
     Q_DECLARE_PERFORMANCE_METRIC(VMEExecution)
@@ -73,13 +73,13 @@ Q_DECLARE_PERFORMANCE_LOG(QmlPerf) {
     Q_DECLARE_PERFORMANCE_METRIC(BindableValueUpdate)
     Q_DECLARE_PERFORMANCE_METRIC(PixmapLoad)
     Q_DECLARE_PERFORMANCE_METRIC(FontDatabase)
-    Q_DECLARE_PERFORMANCE_METRIC(QmlGraphicsPathViewPathCache)
+    Q_DECLARE_PERFORMANCE_METRIC(QDeclarativePathViewPathCache)
     Q_DECLARE_PERFORMANCE_METRIC(CreateParticle)
     Q_DECLARE_PERFORMANCE_METRIC(ItemComponentComplete)
     Q_DECLARE_PERFORMANCE_METRIC(ImageComponentComplete)
     Q_DECLARE_PERFORMANCE_METRIC(BaseLayoutComponentComplete)
     Q_DECLARE_PERFORMANCE_METRIC(TextComponentComplete)
-    Q_DECLARE_PERFORMANCE_METRIC(QmlGraphicsText_setText)
+    Q_DECLARE_PERFORMANCE_METRIC(QDeclarativeText_setText)
     Q_DECLARE_PERFORMANCE_METRIC(AddScript)
 }
 
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
deleted file mode 100644
index cd1458c..0000000
--- a/src/declarative/util/qmlanimation.cpp
+++ /dev/null
@@ -1,2369 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlanimation_p.h"
-#include "qmlanimation_p_p.h"
-
-#include "qmlbehavior_p.h"
-#include "qmlstateoperations_p.h"
-
-#include <qmlpropertyvaluesource.h>
-#include <qml.h>
-#include <qmlinfo.h>
-#include <qmlexpression.h>
-#include <qmlstringconverters_p.h>
-#include <qmlglobal_p.h>
-
-#include <qvariant.h>
-#include <qcolor.h>
-#include <qfile.h>
-#include <QParallelAnimationGroup>
-#include <QSequentialAnimationGroup>
-#include <QtCore/qset.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qpoint.h>
-#include <QtCore/qsize.h>
-
-#include <private/qvariantanimation_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass Animation QmlAbstractAnimation
-  \since 4.7
-    \brief The Animation element is the base of all QML animations.
-
-    The Animation element cannot be used directly in a QML file.  It exists
-    to provide a set of common properties and methods, available across all the
-    other animation types that inherit from it.  Attempting to use the Animation
-    element directly will result in an error.
-*/
-
-/*!
-    \class QmlAbstractAnimation
-    \internal
-*/
-
-QmlAbstractAnimation::QmlAbstractAnimation(QObject *parent)
-: QObject(*(new QmlAbstractAnimationPrivate), parent)
-{
-}
-
-QmlAbstractAnimation::~QmlAbstractAnimation()
-{
-}
-
-QmlAbstractAnimation::QmlAbstractAnimation(QmlAbstractAnimationPrivate &dd, QObject *parent)
-: QObject(dd, parent)
-{
-}
-
-/*!
-    \qmlproperty bool Animation::running
-    This property holds whether the animation is currently running.
-
-    The \c running property can be set to declaratively control whether or not
-    an animation is running.  The following example will animate a rectangle
-    whenever the \l MouseArea is pressed.
-
-    \code
-    Rectangle {
-        width: 100; height: 100
-        x: NumberAnimation {
-            running: myMouse.pressed
-            from: 0; to: 100
-        }
-        MouseArea { id: myMouse }
-    }
-    \endcode
-
-    Likewise, the \c running property can be read to determine if the animation
-    is running.  In the following example the text element will indicate whether
-    or not the animation is running.
-
-    \code
-    NumberAnimation { id: myAnimation }
-    Text { text: myAnimation.running ? "Animation is running" : "Animation is not running" }
-    \endcode
-
-    Animations can also be started and stopped imperatively from JavaScript
-    using the \c start() and \c stop() methods.
-
-    By default, animations are not running. Though, when the animations are assigned to properties,
-    as property value sources, they are set to running by default.
-*/
-bool QmlAbstractAnimation::isRunning() const
-{
-    Q_D(const QmlAbstractAnimation);
-    return d->running;
-}
-
-//commence is called to start an animation when it is used as a
-//simple animation, and not as part of a transition
-void QmlAbstractAnimationPrivate::commence()
-{
-    Q_Q(QmlAbstractAnimation);
-
-    QmlStateActions actions;
-    QmlMetaProperties properties;
-    q->transition(actions, properties, QmlAbstractAnimation::Forward);
-
-    q->qtAnimation()->start();
-    if (q->qtAnimation()->state() != QAbstractAnimation::Running) {
-        running = false;
-        emit q->completed();
-    }
-}
-
-QmlMetaProperty QmlAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj)
-{
-    QmlMetaProperty prop = QmlMetaProperty::createProperty(obj, str, qmlContext(infoObj));
-    if (!prop.isValid()) {
-        qmlInfo(infoObj) << QmlAbstractAnimation::tr("Cannot animate non-existent property \"%1\"").arg(str);
-        return QmlMetaProperty();
-    } else if (!prop.isWritable()) {
-        qmlInfo(infoObj) << QmlAbstractAnimation::tr("Cannot animate read-only property \"%1\"").arg(str);
-        return QmlMetaProperty();
-    }
-    return prop;
-}
-
-void QmlAbstractAnimation::setRunning(bool r)
-{
-    Q_D(QmlAbstractAnimation);
-    if (!d->componentComplete) {
-        d->running = r;
-        if (r == false)
-            d->avoidPropertyValueSourceStart = true;
-        return;
-    }
-
-    if (d->running == r)
-        return;
-
-    if (d->group || d->disableUserControl) {
-        qWarning("QmlAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
-        return;
-    }
-
-    d->running = r;
-    if (d->running) {
-        if (d->alwaysRunToEnd && d->repeat
-            && qtAnimation()->state() == QAbstractAnimation::Running) {
-            qtAnimation()->setLoopCount(-1);
-        }
-
-        if (!d->connectedTimeLine) {
-            QObject::connect(qtAnimation(), SIGNAL(finished()),
-                             this, SLOT(timelineComplete()));
-            d->connectedTimeLine = true;
-        }
-        d->commence();
-        emit started();
-    } else {
-        if (d->alwaysRunToEnd) {
-            if (d->repeat)
-                qtAnimation()->setLoopCount(qtAnimation()->currentLoop()+1);
-        } else
-            qtAnimation()->stop();
-
-        emit completed();
-    }
-
-    emit runningChanged(d->running);
-}
-
-/*!
-    \qmlproperty bool Animation::paused
-    This property holds whether the animation is currently paused.
-
-    The \c paused property can be set to declaratively control whether or not
-    an animation is paused.
-
-    Animations can also be paused and resumed imperatively from JavaScript
-    using the \c pause() and \c resume() methods.
-
-    By default, animations are not paused.
-*/
-bool QmlAbstractAnimation::isPaused() const
-{
-    Q_D(const QmlAbstractAnimation);
-    return d->paused;
-}
-
-void QmlAbstractAnimation::setPaused(bool p)
-{
-    Q_D(QmlAbstractAnimation);
-    if (d->paused == p)
-        return;
-
-    if (d->group || d->disableUserControl) {
-        qWarning("QmlAbstractAnimation: setPaused() cannot be used on non-root animation nodes");
-        return;
-    }
-
-    d->paused = p;
-    if (d->paused)
-        qtAnimation()->pause();
-    else
-        qtAnimation()->resume();
-
-    emit pausedChanged(d->paused);
-}
-
-void QmlAbstractAnimation::classBegin()
-{
-    Q_D(QmlAbstractAnimation);
-    d->componentComplete = false;
-}
-
-void QmlAbstractAnimation::componentComplete()
-{
-    Q_D(QmlAbstractAnimation);
-    d->componentComplete = true;
-    if (d->running) {
-        d->running = false;
-        setRunning(true);
-    }
-}
-
-/*!
-    \qmlproperty bool Animation::alwaysRunToEnd
-    This property holds whether the animation should run to completion when it is stopped.
-
-    If this true the animation will complete its current iteration when it
-    is stopped - either by setting the \c running property to false, or by
-    calling the \c stop() method.  The \c complete() method is not effected
-    by this value.
-
-    This behavior is most useful when the \c repeat property is set, as the
-    animation will finish playing normally but not restart.
-
-    By default, the alwaysRunToEnd property is not set.
-*/
-bool QmlAbstractAnimation::alwaysRunToEnd() const
-{
-    Q_D(const QmlAbstractAnimation);
-    return d->alwaysRunToEnd;
-}
-
-void QmlAbstractAnimation::setAlwaysRunToEnd(bool f)
-{
-    Q_D(QmlAbstractAnimation);
-    if (d->alwaysRunToEnd == f)
-        return;
-
-    d->alwaysRunToEnd = f;
-    emit alwaysRunToEndChanged(f);
-}
-
-/*!
-    \qmlproperty bool Animation::repeat
-    This property holds whether the animation should repeat.
-
-    If set, the animation will continuously repeat until it is explicitly
-    stopped - either by setting the \c running property to false, or by calling
-    the \c stop() method.
-
-    In the following example, the rectangle will spin indefinately.
-
-    \code
-    Rectangle {
-        rotation: NumberAnimation { running: true; repeat: true; from: 0 to: 360 }
-    }
-    \endcode
-*/
-bool QmlAbstractAnimation::repeat() const
-{
-    Q_D(const QmlAbstractAnimation);
-    return d->repeat;
-}
-
-void QmlAbstractAnimation::setRepeat(bool r)
-{
-    Q_D(QmlAbstractAnimation);
-    if (r == d->repeat)
-        return;
-
-    d->repeat = r;
-    int lc = r ? -1 : 1;
-    qtAnimation()->setLoopCount(lc);
-    emit repeatChanged(r);
-}
-
-int QmlAbstractAnimation::currentTime()
-{
-    return qtAnimation()->currentLoopTime();
-}
-
-void QmlAbstractAnimation::setCurrentTime(int time)
-{
-    qtAnimation()->setCurrentTime(time);
-}
-
-QmlAnimationGroup *QmlAbstractAnimation::group() const
-{
-    Q_D(const QmlAbstractAnimation);
-    return d->group;
-}
-
-void QmlAbstractAnimation::setGroup(QmlAnimationGroup *g)
-{
-    Q_D(QmlAbstractAnimation);
-    if (d->group == g)
-        return;
-    if (d->group)
-        static_cast<QmlAnimationGroupPrivate *>(d->group->d_func())->animations.removeAll(this);
-
-    d->group = g;
-
-    if (d->group && !static_cast<QmlAnimationGroupPrivate *>(d->group->d_func())->animations.contains(this))
-        static_cast<QmlAnimationGroupPrivate *>(d->group->d_func())->animations.append(this);
-
-    if (d->group)
-        ((QAnimationGroup*)d->group->qtAnimation())->addAnimation(qtAnimation());
-
-    //if (g) //if removed from a group, then the group should no longer be the parent
-        setParent(g);
-}
-
-/*!
-    \qmlmethod Animation::start()
-    \brief Starts the animation.
-
-    If the animation is already running, calling this method has no effect.  The
-    \c running property will be true following a call to \c start().
-*/
-void QmlAbstractAnimation::start()
-{
-    setRunning(true);
-}
-
-/*!
-    \qmlmethod Animation::pause()
-    \brief Pauses the animation.
-
-    If the animation is already paused, calling this method has no effect.  The
-    \c paused property will be true following a call to \c pause().
-*/
-void QmlAbstractAnimation::pause()
-{
-    setPaused(true);
-}
-
-/*!
-    \qmlmethod Animation::resume()
-    \brief Resumes a paused animation.
-
-    If the animation is not paused, calling this method has no effect.  The
-    \c paused property will be false following a call to \c resume().
-*/
-void QmlAbstractAnimation::resume()
-{
-    setPaused(false);
-}
-
-/*!
-    \qmlmethod Animation::stop()
-    \brief Stops the animation.
-
-    If the animation is not running, calling this method has no effect.  The
-    \c running property will be false following a call to \c stop().
-
-    Normally \c stop() stops the animation immediately, and the animation has
-    no further influence on property values.  In this example animation
-    \code
-    Rectangle {
-        x: NumberAnimation { from: 0; to: 100; duration: 500 }
-    }
-    \endcode
-    was stopped at time 250ms, the \c x property will have a value of 50.
-
-    However, if the \c alwaysRunToEnd property is set, the animation will
-    continue running until it completes and then stop.  The \c running property
-    will still become false immediately.
-*/
-void QmlAbstractAnimation::stop()
-{
-    setRunning(false);
-}
-
-/*!
-    \qmlmethod Animation::restart()
-    \brief Restarts the animation.
-
-    This is a convenience method, and is equivalent to calling \c stop() and
-    then \c start().
-*/
-void QmlAbstractAnimation::restart()
-{
-    stop();
-    start();
-}
-
-/*!
-    \qmlmethod Animation::complete()
-    \brief Stops the animation, jumping to the final property values.
-
-    If the animation is not running, calling this method has no effect.  The
-    \c running property will be false following a call to \c complete().
-
-    Unlike \c stop(), \c complete() immediately fast-forwards the animation to
-    its end.  In the following example,
-    \code
-    Rectangle {
-        x: NumberAnimation { from: 0; to: 100; duration: 500 }
-    }
-    \endcode
-    calling \c stop() at time 250ms will result in the \c x property having
-    a value of 50, while calling \c complete() will set the \c x property to
-    100, exactly as though the animation had played the whole way through.
-*/
-void QmlAbstractAnimation::complete()
-{
-    if (isRunning()) {
-         qtAnimation()->setCurrentTime(qtAnimation()->duration());
-    }
-}
-
-void QmlAbstractAnimation::setTarget(const QmlMetaProperty &p)
-{
-    Q_D(QmlAbstractAnimation);
-    d->defaultProperty = p;
-
-    if (!d->avoidPropertyValueSourceStart)
-        setRunning(true);
-}
-
-/*
-    we rely on setTarget only being called when used as a value source
-    so this function allows us to do the same thing as setTarget without
-    that assumption
-*/
-void QmlAbstractAnimation::setDefaultTarget(const QmlMetaProperty &p)
-{
-    Q_D(QmlAbstractAnimation);
-    d->defaultProperty = p;
-}
-
-/*
-    don't allow start/stop/pause/resume to be manually invoked,
-    because something else (like a Behavior) already has control
-    over the animation.
-*/
-void QmlAbstractAnimation::setDisableUserControl()
-{
-    Q_D(QmlAbstractAnimation);
-    d->disableUserControl = true;
-}
-
-void QmlAbstractAnimation::transition(QmlStateActions &actions,
-                                      QmlMetaProperties &modified,
-                                      TransitionDirection direction)
-{
-    Q_UNUSED(actions);
-    Q_UNUSED(modified);
-    Q_UNUSED(direction);
-}
-
-void QmlAbstractAnimation::timelineComplete()
-{
-    Q_D(QmlAbstractAnimation);
-    setRunning(false);
-    if (d->alwaysRunToEnd && d->repeat) {
-        qtAnimation()->setLoopCount(-1);
-    }
-}
-
-/*!
-    \qmlclass PauseAnimation QmlPauseAnimation
-  \since 4.7
-    \inherits Animation
-    \brief The PauseAnimation element provides a pause for an animation.
-
-    When used in a SequentialAnimation, PauseAnimation is a step when
-    nothing happens, for a specified duration.
-
-    A 500ms animation sequence, with a 100ms pause between two animations:
-    \code
-    SequentialAnimation {
-        NumberAnimation { ... duration: 200 }
-        PauseAnimation { duration: 100 }
-        NumberAnimation { ... duration: 200 }
-    }
-    \endcode
-*/
-/*!
-    \internal
-    \class QmlPauseAnimation
-*/
-
-
-QmlPauseAnimation::QmlPauseAnimation(QObject *parent)
-: QmlAbstractAnimation(*(new QmlPauseAnimationPrivate), parent)
-{
-    Q_D(QmlPauseAnimation);
-    d->init();
-}
-
-QmlPauseAnimation::~QmlPauseAnimation()
-{
-}
-
-void QmlPauseAnimationPrivate::init()
-{
-    Q_Q(QmlPauseAnimation);
-    pa = new QPauseAnimation;
-    QmlGraphics_setParent_noEvent(pa, q);
-}
-
-/*!
-    \qmlproperty int PauseAnimation::duration
-    This property holds the duration of the pause in milliseconds
-
-    The default value is 250.
-*/
-int QmlPauseAnimation::duration() const
-{
-    Q_D(const QmlPauseAnimation);
-    return d->pa->duration();
-}
-
-void QmlPauseAnimation::setDuration(int duration)
-{
-    if (duration < 0) {
-        qmlInfo(this) << tr("Cannot set a duration of < 0");
-        return;
-    }
-
-    Q_D(QmlPauseAnimation);
-    if (d->pa->duration() == duration)
-        return;
-    d->pa->setDuration(duration);
-    emit durationChanged(duration);
-}
-
-QAbstractAnimation *QmlPauseAnimation::qtAnimation()
-{
-    Q_D(QmlPauseAnimation);
-    return d->pa;
-}
-
-/*!
-    \qmlclass ColorAnimation QmlColorAnimation
-  \since 4.7
-    \inherits PropertyAnimation
-    \brief The ColorAnimation element allows you to animate color changes.
-
-    \code
-    ColorAnimation { from: "white"; to: "#c0c0c0"; duration: 100 }
-    \endcode
-
-    When used in a transition, ColorAnimation will by default animate
-    all properties of type color that are changing. If a property or properties
-    are explicitly set for the animation, then those will be used instead.
-*/
-/*!
-    \internal
-    \class QmlColorAnimation
-*/
-
-QmlColorAnimation::QmlColorAnimation(QObject *parent)
-: QmlPropertyAnimation(parent)
-{
-    Q_D(QmlPropertyAnimation);
-    d->interpolatorType = QMetaType::QColor;
-    d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
-    d->defaultToInterpolatorType = true;
-}
-
-QmlColorAnimation::~QmlColorAnimation()
-{
-}
-
-/*!
-    \qmlproperty color ColorAnimation::from
-    This property holds the starting color.
-*/
-QColor QmlColorAnimation::from() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->from.value<QColor>();
-}
-
-void QmlColorAnimation::setFrom(const QColor &f)
-{
-    QmlPropertyAnimation::setFrom(f);
-}
-
-/*!
-    \qmlproperty color ColorAnimation::to
-    This property holds the ending color.
-*/
-QColor QmlColorAnimation::to() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->to.value<QColor>();
-}
-
-void QmlColorAnimation::setTo(const QColor &t)
-{
-    QmlPropertyAnimation::setTo(t);
-}
-
-
-
-/*!
-    \qmlclass ScriptAction QmlScriptAction
-  \since 4.7
-    \inherits Animation
-    \brief The ScriptAction element allows scripts to be run during an animation.
-
-*/
-/*!
-    \internal
-    \class QmlScriptAction
-*/
-QmlScriptAction::QmlScriptAction(QObject *parent)
-    :QmlAbstractAnimation(*(new QmlScriptActionPrivate), parent)
-{
-    Q_D(QmlScriptAction);
-    d->init();
-}
-
-QmlScriptAction::~QmlScriptAction()
-{
-}
-
-void QmlScriptActionPrivate::init()
-{
-    Q_Q(QmlScriptAction);
-    rsa = new QActionAnimation(&proxy);
-    QmlGraphics_setParent_noEvent(rsa, q);
-}
-
-/*!
-    \qmlproperty script ScriptAction::script
-    This property holds the script to run.
-*/
-QmlScriptString QmlScriptAction::script() const
-{
-    Q_D(const QmlScriptAction);
-    return d->script;
-}
-
-void QmlScriptAction::setScript(const QmlScriptString &script)
-{
-    Q_D(QmlScriptAction);
-    d->script = script;
-}
-
-/*!
-    \qmlproperty QString ScriptAction::stateChangeScriptName
-    This property holds the the name of the StateChangeScript to run.
-
-    This property is only valid when ScriptAction is used as part of a transition.
-    If both script and stateChangeScriptName are set, stateChangeScriptName will be used.
-*/
-QString QmlScriptAction::stateChangeScriptName() const
-{
-    Q_D(const QmlScriptAction);
-    return d->name;
-}
-
-void QmlScriptAction::setStateChangeScriptName(const QString &name)
-{
-    Q_D(QmlScriptAction);
-    d->name = name;
-}
-
-void QmlScriptActionPrivate::execute()
-{
-    QmlScriptString scriptStr = hasRunScriptScript ? runScriptScript : script;
-
-    const QString &str = scriptStr.script();
-    if (!str.isEmpty()) {
-        QmlExpression expr(scriptStr.context(), str, scriptStr.scopeObject());
-        expr.value();
-    }
-}
-
-void QmlScriptAction::transition(QmlStateActions &actions,
-                                    QmlMetaProperties &modified,
-                                    TransitionDirection direction)
-{
-    Q_D(QmlScriptAction);
-    Q_UNUSED(modified);
-    Q_UNUSED(direction);
-
-    d->hasRunScriptScript = false;
-    for (int ii = 0; ii < actions.count(); ++ii) {
-        QmlAction &action = actions[ii];
-
-        if (action.event && action.event->typeName() == QLatin1String("StateChangeScript")
-            && static_cast<QmlStateChangeScript*>(action.event)->name() == d->name) {
-            //### how should we handle reverse direction?
-            d->runScriptScript = static_cast<QmlStateChangeScript*>(action.event)->script();
-            d->hasRunScriptScript = true;
-            action.actionDone = true;
-            break;  //assumes names are unique
-        }
-    }
-}
-
-QAbstractAnimation *QmlScriptAction::qtAnimation()
-{
-    Q_D(QmlScriptAction);
-    return d->rsa;
-}
-
-
-
-/*!
-    \qmlclass PropertyAction QmlPropertyAction
-  \since 4.7
-    \inherits Animation
-    \brief The PropertyAction element allows immediate property changes during animation.
-
-    Explicitly set \c theimage.smooth=true during a transition:
-    \code
-    PropertyAction { target: theimage; property: "smooth"; value: true }
-    \endcode
-
-    Set \c thewebview.url to the value set for the destination state:
-    \code
-    PropertyAction { target: thewebview; property: "url" }
-    \endcode
-
-    The PropertyAction is immediate -
-    the target property is not animated to the selected value in any way.
-*/
-/*!
-    \internal
-    \class QmlPropertyAction
-*/
-QmlPropertyAction::QmlPropertyAction(QObject *parent)
-: QmlAbstractAnimation(*(new QmlPropertyActionPrivate), parent)
-{
-    Q_D(QmlPropertyAction);
-    d->init();
-}
-
-QmlPropertyAction::~QmlPropertyAction()
-{
-}
-
-void QmlPropertyActionPrivate::init()
-{
-    Q_Q(QmlPropertyAction);
-    spa = new QActionAnimation;
-    QmlGraphics_setParent_noEvent(spa, q);
-}
-
-/*!
-    \qmlproperty Object PropertyAction::target
-    This property holds an explicit target object to animate.
-
-    The exact effect of the \c target property depends on how the animation
-    is being used.  Refer to the \l animation documentation for details.
-*/
-
-QObject *QmlPropertyAction::target() const
-{
-    Q_D(const QmlPropertyAction);
-    return d->target;
-}
-
-void QmlPropertyAction::setTarget(QObject *o)
-{
-    Q_D(QmlPropertyAction);
-    if (d->target == o)
-        return;
-    d->target = o;
-    emit targetChanged(d->target, d->propertyName);
-}
-
-QString QmlPropertyAction::property() const
-{
-    Q_D(const QmlPropertyAction);
-    return d->propertyName;
-}
-
-void QmlPropertyAction::setProperty(const QString &n)
-{
-    Q_D(QmlPropertyAction);
-    if (d->propertyName == n)
-        return;
-    d->propertyName = n;
-    emit targetChanged(d->target, d->propertyName);
-}
-
-/*!
-    \qmlproperty string PropertyAction::property
-    \qmlproperty string PropertyAction::properties
-    \qmlproperty Object PropertyAction::target
-    \qmlproperty list<Object> PropertyAction::targets
-
-    These properties are used as a set to determine which properties should be
-    affected by this action.
-
-    The details of how these properties are interpreted in different situations
-    is covered in the \l{PropertyAnimation::properties}{corresponding} PropertyAnimation
-    documentation.
-
-    \sa exclude
-*/
-QString QmlPropertyAction::properties() const
-{
-    Q_D(const QmlPropertyAction);
-    return d->properties;
-}
-
-void QmlPropertyAction::setProperties(const QString &p)
-{
-    Q_D(QmlPropertyAction);
-    if (d->properties == p)
-        return;
-    d->properties = p;
-    emit propertiesChanged(p);
-}
-
-QmlListProperty<QObject> QmlPropertyAction::targets()
-{
-    Q_D(QmlPropertyAction);
-    return QmlListProperty<QObject>(this, d->targets);
-}
-
-/*!
-    \qmlproperty list<Object> PropertyAction::exclude
-    This property holds the objects not to be affected by this animation.
-    \sa targets
-*/
-QmlListProperty<QObject> QmlPropertyAction::exclude()
-{
-    Q_D(QmlPropertyAction);
-    return QmlListProperty<QObject>(this, d->exclude);
-}
-
-/*!
-    \qmlproperty any PropertyAction::value
-    This property holds the value to be set on the property.
-    If not set, then the value defined for the end state of the transition.
-*/
-QVariant QmlPropertyAction::value() const
-{
-    Q_D(const QmlPropertyAction);
-    return d->value;
-}
-
-void QmlPropertyAction::setValue(const QVariant &v)
-{
-    Q_D(QmlPropertyAction);
-    if (d->value.isNull || d->value != v) {
-        d->value = v;
-        emit valueChanged(v);
-    }
-}
-
-QAbstractAnimation *QmlPropertyAction::qtAnimation()
-{
-    Q_D(QmlPropertyAction);
-    return d->spa;
-}
-
-void QmlPropertyAction::transition(QmlStateActions &actions,
-                                      QmlMetaProperties &modified,
-                                      TransitionDirection direction)
-{
-    Q_D(QmlPropertyAction);
-    Q_UNUSED(direction);
-
-    struct QmlSetPropertyAnimationAction : public QAbstractAnimationAction
-    {
-        QmlStateActions actions;
-        virtual void doAction()
-        {
-            for (int ii = 0; ii < actions.count(); ++ii) {
-                const QmlAction &action = actions.at(ii);
-                action.property.write(action.toValue, QmlMetaProperty::BypassInterceptor | QmlMetaProperty::DontRemoveBinding);
-            }
-        }
-    };
-
-    QStringList props = d->properties.isEmpty() ? QStringList() : d->properties.split(QLatin1Char(','));
-    for (int ii = 0; ii < props.count(); ++ii)
-        props[ii] = props.at(ii).trimmed();
-    if (!d->propertyName.isEmpty())
-        props << d->propertyName;
-
-    QList<QObject*> targets = d->targets;
-    if (d->target)
-        targets.append(d->target);
-
-    bool hasSelectors = !props.isEmpty() || !targets.isEmpty() || !d->exclude.isEmpty();
-
-    if (d->defaultProperty.isValid() && !hasSelectors) {
-        props << d->defaultProperty.name();
-        targets << d->defaultProperty.object();
-    }
-
-    QmlSetPropertyAnimationAction *data = new QmlSetPropertyAnimationAction;
-
-    bool hasExplicit = false;
-    //an explicit animation has been specified
-    if (d->value.isValid()) {
-        for (int i = 0; i < props.count(); ++i) {
-            for (int j = 0; j < targets.count(); ++j) {
-                QmlAction myAction;
-                myAction.property = d->createProperty(targets.at(j), props.at(i), this);
-                if (myAction.property.isValid()) {
-                    myAction.toValue = d->value;
-                    QmlPropertyAnimationPrivate::convertVariant(myAction.toValue, myAction.property.propertyType());
-                    data->actions << myAction;
-                    hasExplicit = true;
-                    for (int ii = 0; ii < actions.count(); ++ii) {
-                        QmlAction &action = actions[ii];
-                        if (action.property.object() == myAction.property.object() &&
-                            myAction.property.name() == action.property.name()) {
-                            modified << action.property;
-                            break;  //### any chance there could be multiples?
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if (!hasExplicit)
-    for (int ii = 0; ii < actions.count(); ++ii) {
-        QmlAction &action = actions[ii];
-
-        QObject *obj = action.property.object();
-        QString propertyName = action.property.name();
-        QObject *sObj = action.specifiedObject;
-        QString sPropertyName = action.specifiedProperty;
-        bool same = (obj == sObj);
-
-        if ((targets.isEmpty() || targets.contains(obj) || (!same && targets.contains(sObj))) &&
-           (!d->exclude.contains(obj)) && (same || (!d->exclude.contains(sObj))) &&
-           (props.contains(propertyName) || (!same && props.contains(sPropertyName)))) {
-            QmlAction myAction = action;
-
-            if (d->value.isValid())
-                myAction.toValue = d->value;
-            QmlPropertyAnimationPrivate::convertVariant(myAction.toValue, myAction.property.propertyType());
-
-            modified << action.property;
-            data->actions << myAction;
-            action.fromValue = myAction.toValue;
-        }
-    }
-
-    if (data->actions.count()) {
-        d->spa->setAnimAction(data, QAbstractAnimation::DeleteWhenStopped);
-    } else {
-        delete data;
-    }
-}
-
-
-
-/*!
-    \qmlclass ParentAction QmlParentAction
-  \since 4.7
-    \inherits Animation
-    \brief The ParentAction element allows parent changes during animation.
-
-    ParentAction provides a way to specify at what point in a Transition a ParentChange should
-    occur.
-    \qml
-    State {
-        ParentChange {
-            target: myItem
-            parent: newParent
-        }
-    }
-    Transition {
-        SequentialAnimation {
-            PropertyAnimation { ... }
-            ParentAction {}   //reparent myItem now
-            PropertyAnimation { ... }
-        }
-    }
-    \endqml
-
-    It also provides a way to explicitly reparent an item during an animation.
-    \qml
-    SequentialAnimation {
-        ParentAction { target: myItem; parent: newParent }
-        PropertyAnimation {}
-    }
-    \endqml
-
-    The ParentAction is immediate - it is not animated in any way.
-*/
-
-QmlParentAction::QmlParentAction(QObject *parent)
-: QmlAbstractAnimation(*(new QmlParentActionPrivate), parent)
-{
-    Q_D(QmlParentAction);
-    d->init();
-}
-
-QmlParentAction::~QmlParentAction()
-{
-}
-
-void QmlParentActionPrivate::init()
-{
-    Q_Q(QmlParentAction);
-    cpa = new QActionAnimation;
-    QmlGraphics_setParent_noEvent(cpa, q);
-}
-
-/*!
-    \qmlproperty Item ParentAction::target
-
-    This property holds a target item to reparent.
-
-    In the following example, \c myItem will be reparented by the ParentAction, while
-    \c myOtherItem will not.
-    \qml
-    State {
-        ParentChange {
-            target: myItem
-            parent: newParent
-        }
-        ParentChange {
-            target: myOtherItem
-            parent: otherNewParent
-        }
-    }
-    Transition {
-        SequentialAnimation {
-            PropertyAnimation { ... }
-            ParentAction { target: myItem }
-            PropertyAnimation { ... }
-        }
-    }
-    \endqml
-
- */
-QmlGraphicsItem *QmlParentAction::object() const
-{
-    Q_D(const QmlParentAction);
-    return d->pcTarget;
-}
-
-void QmlParentAction::setObject(QmlGraphicsItem *target)
-{
-    Q_D(QmlParentAction);
-    d->pcTarget = target;
-}
-
-/*!
-    \qmlproperty Item ParentAction::parent
-
-    The item to reparent to (i.e. the new parent).
- */
-QmlGraphicsItem *QmlParentAction::parent() const
-{
-    Q_D(const QmlParentAction);
-    return d->pcParent;
-}
-
-void QmlParentAction::setParent(QmlGraphicsItem *parent)
-{
-    Q_D(QmlParentAction);
-    d->pcParent = parent;
-}
-
-void QmlParentActionPrivate::doAction()
-{
-    QmlParentChange pc;
-    pc.setObject(pcTarget);
-    pc.setParent(pcParent);
-    pc.execute();
-}
-
-QAbstractAnimation *QmlParentAction::qtAnimation()
-{
-    Q_D(QmlParentAction);
-    return d->cpa;
-}
-
-void QmlParentAction::transition(QmlStateActions &actions,
-                                       QmlMetaProperties &modified,
-                                       TransitionDirection direction)
-{
-    Q_D(QmlParentAction);
-    Q_UNUSED(modified);
-    Q_UNUSED(direction);
-
-    struct QmlParentActionData : public QAbstractAnimationAction
-    {
-        QmlParentActionData(): pc(0) {}
-        ~QmlParentActionData() { delete pc; }
-
-        QmlStateActions actions;
-        bool reverse;
-        QmlParentChange *pc;
-        virtual void doAction()
-        {
-            for (int ii = 0; ii < actions.count(); ++ii) {
-                const QmlAction &action = actions.at(ii);
-                if (reverse)
-                    action.event->reverse();
-                else
-                    action.event->execute();
-            }
-        }
-    };
-
-    QmlParentActionData *data = new QmlParentActionData;
-
-    //### need to correctly handle modified/done
-
-    bool hasExplicit = false;
-    if (d->pcTarget && d->pcParent) {
-        data->reverse = false;
-        QmlAction myAction;
-        QmlParentChange *pc = new QmlParentChange;
-        pc->setObject(d->pcTarget);
-        pc->setParent(d->pcParent);
-        myAction.event = pc;
-        data->pc = pc;
-        data->actions << myAction;
-        hasExplicit = true;
-    }
-
-    if (!hasExplicit)
-    for (int ii = 0; ii < actions.count(); ++ii) {
-        QmlAction &action = actions[ii];
-
-        if (action.event && action.event->typeName() == QLatin1String("ParentChange")
-            && (!d->pcTarget || static_cast<QmlParentChange*>(action.event)->object() == d->pcTarget)) {
-            QmlAction myAction = action;
-            data->reverse = action.reverseEvent;
-            //### this logic differs from PropertyAnimation
-            //    (probably a result of modified vs. done)
-            if (d->pcParent) {
-                //### should we disallow this case?
-                QmlParentChange *pc = new QmlParentChange;
-                pc->setObject(d->pcTarget);
-                pc->setParent(static_cast<QmlParentChange*>(action.event)->parent());
-                myAction.event = pc;
-                data->pc = pc;
-                data->actions << myAction;
-                break;  //only match one
-            } else {
-                action.actionDone = true;
-                data->actions << myAction;
-            }
-        }
-    }
-
-    if (data->actions.count()) {
-        d->cpa->setAnimAction(data, QAbstractAnimation::DeleteWhenStopped);
-    } else {
-        delete data;
-    }
-}
-
-
-
-/*!
-    \qmlclass NumberAnimation QmlNumberAnimation
-  \since 4.7
-    \inherits PropertyAnimation
-    \brief The NumberAnimation element allows you to animate changes in properties of type qreal.
-
-    Animate a set of properties over 200ms, from their values in the start state to
-    their values in the end state of the transition:
-    \code
-    NumberAnimation { properties: "x,y,scale"; duration: 200 }
-    \endcode
-*/
-
-/*!
-    \internal
-    \class QmlNumberAnimation
-*/
-
-QmlNumberAnimation::QmlNumberAnimation(QObject *parent)
-: QmlPropertyAnimation(parent)
-{
-    Q_D(QmlPropertyAnimation);
-    d->interpolatorType = QMetaType::QReal;
-    d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
-}
-
-QmlNumberAnimation::~QmlNumberAnimation()
-{
-}
-
-/*!
-    \qmlproperty real NumberAnimation::from
-    This property holds the starting value.
-    If not set, then the value defined in the start state of the transition.
-*/
-qreal QmlNumberAnimation::from() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->from.toReal();
-}
-
-void QmlNumberAnimation::setFrom(qreal f)
-{
-    QmlPropertyAnimation::setFrom(f);
-}
-
-/*!
-    \qmlproperty real NumberAnimation::to
-    This property holds the ending value.
-    If not set, then the value defined in the end state of the transition or Behavior.
-*/
-qreal QmlNumberAnimation::to() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->to.toReal();
-}
-
-void QmlNumberAnimation::setTo(qreal t)
-{
-    QmlPropertyAnimation::setTo(t);
-}
-
-
-
-/*!
-    \qmlclass Vector3dAnimation QmlVector3dAnimation
-  \since 4.7
-    \inherits PropertyAnimation
-    \brief The Vector3dAnimation element allows you to animate changes in properties of type QVector3d.
-*/
-
-/*!
-    \internal
-    \class QmlVector3dAnimation
-*/
-
-QmlVector3dAnimation::QmlVector3dAnimation(QObject *parent)
-: QmlPropertyAnimation(parent)
-{
-    Q_D(QmlPropertyAnimation);
-    d->interpolatorType = QMetaType::QVector3D;
-    d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
-	d->defaultToInterpolatorType = true;
-}
-
-QmlVector3dAnimation::~QmlVector3dAnimation()
-{
-}
-
-/*!
-    \qmlproperty real Vector3dAnimation::from
-    This property holds the starting value.
-    If not set, then the value defined in the start state of the transition.
-*/
-QVector3D QmlVector3dAnimation::from() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->from.value<QVector3D>();
-}
-
-void QmlVector3dAnimation::setFrom(QVector3D f)
-{
-    QmlPropertyAnimation::setFrom(f);
-}
-
-/*!
-    \qmlproperty real Vector3dAnimation::to
-    This property holds the ending value.
-    If not set, then the value defined in the end state of the transition or Behavior.
-*/
-QVector3D QmlVector3dAnimation::to() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->to.value<QVector3D>();
-}
-
-void QmlVector3dAnimation::setTo(QVector3D t)
-{
-    QmlPropertyAnimation::setTo(t);
-}
-
-
-
-/*!
-    \qmlclass RotationAnimation QmlRotationAnimation
-    \inherits PropertyAnimation
-    \brief The RotationAnimation element allows you to animate rotations.
-
-    RotationAnimation is a specialized PropertyAnimation that gives control
-    over the direction of rotation.
-
-    The RotationAnimation in the following example ensures that we always take
-    the shortest rotation path when switching between our states.
-    \qml
-    states: {
-        State { name: "180"; PropertyChanges { target: myItem; rotation: 180 } }
-        State { name: "-180"; PropertyChanges { target: myItem; rotation: -180 } }
-        State { name: "180"; PropertyChanges { target: myItem; rotation: 270 } }
-    }
-    transition: Transition {
-        RotationAnimation { direction: RotationAnimation.Shortest }
-    }
-    \endqml
-
-    By default, when used in a transition RotationAnimation will rotate all
-    properties named "rotation" or "angle". You can override this by providing
-    your own properties via \c properties or \c property.
-*/
-
-/*!
-    \internal
-    \class QmlRotationAnimation
-*/
-
-QVariant _q_interpolateShortestRotation(qreal &f, qreal &t, qreal progress)
-{
-    qreal newt = t;
-    qreal diff = t-f;
-    while(diff > 180.0){
-        newt -= 360.0;
-        diff -= 360.0;
-    }
-    while(diff < -180.0){
-        newt += 360.0;
-        diff += 360.0;
-    }
-    return QVariant(f + (newt - f) * progress);
-}
-
-QVariant _q_interpolateClockwiseRotation(qreal &f, qreal &t, qreal progress)
-{
-    qreal newt = t;
-    qreal diff = t-f;
-    while(diff < 0.0){
-        newt += 360.0;
-        diff += 360.0;
-    }
-    return QVariant(f + (newt - f) * progress);
-}
-
-QVariant _q_interpolateCounterclockwiseRotation(qreal &f, qreal &t, qreal progress)
-{
-    qreal newt = t;
-    qreal diff = t-f;
-    while(diff > 0.0){
-        newt -= 360.0;
-        diff -= 360.0;
-    }
-    return QVariant(f + (newt - f) * progress);
-}
-
-QmlRotationAnimation::QmlRotationAnimation(QObject *parent)
-: QmlPropertyAnimation(*(new QmlRotationAnimationPrivate), parent)
-{
-    Q_D(QmlRotationAnimation);
-    d->interpolatorType = QMetaType::QReal;
-    d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&_q_interpolateShortestRotation);
-    d->defaultProperties = QLatin1String("rotation,angle");
-}
-
-QmlRotationAnimation::~QmlRotationAnimation()
-{
-}
-
-/*!
-    \qmlproperty real RotationAnimation::from
-    This property holds the starting value.
-    If not set, then the value defined in the start state of the transition.
-*/
-qreal QmlRotationAnimation::from() const
-{
-    Q_D(const QmlRotationAnimation);
-    return d->from.toReal();
-}
-
-void QmlRotationAnimation::setFrom(qreal f)
-{
-    QmlPropertyAnimation::setFrom(f);
-}
-
-/*!
-    \qmlproperty real RotationAnimation::to
-    This property holds the ending value.
-    If not set, then the value defined in the end state of the transition or Behavior.
-*/
-qreal QmlRotationAnimation::to() const
-{
-    Q_D(const QmlRotationAnimation);
-    return d->to.toReal();
-}
-
-void QmlRotationAnimation::setTo(qreal t)
-{
-    QmlPropertyAnimation::setTo(t);
-}
-
-/*!
-    \qmlproperty enum RotationAnimation::direction
-    The direction in which to rotate.
-    Possible values are Numerical, Clockwise, Counterclockwise,
-    or Shortest.
-
-    \table
-    \row
-        \o Numerical
-        \o Rotate by linearly interpolating between the two numbers.
-           A rotation from 10 to 350 will rotate 340 degrees clockwise.
-    \row
-        \o Clockwise
-        \o Rotate clockwise between the two values
-    \row
-        \o Counterclockwise
-        \o Rotate counterclockwise between the two values
-    \row
-        \o Shortest
-        \o Rotate in the direction that produces the shortest animation path.
-           A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
-    \endtable
-
-    The default direction is Shortest.
-*/
-QmlRotationAnimation::RotationDirection QmlRotationAnimation::direction() const
-{
-    Q_D(const QmlRotationAnimation);
-    return d->direction;
-}
-
-void QmlRotationAnimation::setDirection(QmlRotationAnimation::RotationDirection direction)
-{
-    Q_D(QmlRotationAnimation);
-    if (d->direction == direction)
-        return;
-
-    d->direction = direction;
-    switch(d->direction) {
-    case Clockwise:
-        d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&_q_interpolateClockwiseRotation);
-        break;
-    case Counterclockwise:
-        d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&_q_interpolateCounterclockwiseRotation);
-        break;
-    case Shortest:
-        d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&_q_interpolateShortestRotation);
-        break;
-    default:
-        d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
-        break;
-    }
-
-    emit directionChanged();
-}
-
-
-
-QmlAnimationGroup::QmlAnimationGroup(QObject *parent)
-: QmlAbstractAnimation(*(new QmlAnimationGroupPrivate), parent)
-{
-}
-
-void QmlAnimationGroupPrivate::append_animation(QmlListProperty<QmlAbstractAnimation> *list, QmlAbstractAnimation *a)
-{
-    QmlAnimationGroup *q = qobject_cast<QmlAnimationGroup *>(list->object);
-    if (q) {
-        q->d_func()->animations.append(a);
-        a->setGroup(q);
-    }
-}
-
-void QmlAnimationGroupPrivate::clear_animation(QmlListProperty<QmlAbstractAnimation> *list)
-{
-    QmlAnimationGroup *q = qobject_cast<QmlAnimationGroup *>(list->object);
-    if (q) {
-        for (int i = 0; i < q->d_func()->animations.count(); ++i)
-            q->d_func()->animations.at(i)->setGroup(0);
-        q->d_func()->animations.clear();
-    }
-}
-
-QmlAnimationGroup::~QmlAnimationGroup()
-{
-}
-
-QmlListProperty<QmlAbstractAnimation> QmlAnimationGroup::animations()
-{
-    Q_D(QmlAnimationGroup);
-    QmlListProperty<QmlAbstractAnimation> list(this, d->animations);
-    list.append = &QmlAnimationGroupPrivate::append_animation;
-    list.clear = &QmlAnimationGroupPrivate::clear_animation;
-    return list;
-}
-
-/*!
-    \qmlclass SequentialAnimation QmlSequentialAnimation
-  \since 4.7
-    \inherits Animation
-    \brief The SequentialAnimation element allows you to run animations sequentially.
-
-    Animations controlled in SequentialAnimation will be run one after the other.
-
-    The following example chains two numeric animations together.  The \c MyItem
-    object will animate from its current x position to 100, and then back to 0.
-
-    \code
-    SequentialAnimation {
-        NumberAnimation { target: MyItem; property: "x"; to: 100 }
-        NumberAnimation { target: MyItem; property: "x"; to: 0 }
-    }
-    \endcode
-
-    \sa ParallelAnimation
-*/
-
-QmlSequentialAnimation::QmlSequentialAnimation(QObject *parent) :
-    QmlAnimationGroup(parent)
-{
-    Q_D(QmlAnimationGroup);
-    d->ag = new QSequentialAnimationGroup(this);
-}
-
-QmlSequentialAnimation::~QmlSequentialAnimation()
-{
-}
-
-QAbstractAnimation *QmlSequentialAnimation::qtAnimation()
-{
-    Q_D(QmlAnimationGroup);
-    return d->ag;
-}
-
-void QmlSequentialAnimation::transition(QmlStateActions &actions,
-                                    QmlMetaProperties &modified,
-                                    TransitionDirection direction)
-{
-    Q_D(QmlAnimationGroup);
-
-    int inc = 1;
-    int from = 0;
-    if (direction == Backward) {
-        inc = -1;
-        from = d->animations.count() - 1;
-    }
-
-    bool valid = d->defaultProperty.isValid();
-    for (int ii = from; ii < d->animations.count() && ii >= 0; ii += inc) {
-        if (valid)
-            d->animations.at(ii)->setDefaultTarget(d->defaultProperty);
-        d->animations.at(ii)->transition(actions, modified, direction);
-    }
-}
-
-
-
-/*!
-    \qmlclass ParallelAnimation QmlParallelAnimation
-  \since 4.7
-    \inherits Animation
-    \brief The ParallelAnimation element allows you to run animations in parallel.
-
-    Animations contained in ParallelAnimation will be run at the same time.
-
-    The following animation demonstrates animating the \c MyItem item
-    to (100,100) by animating the x and y properties in parallel.
-
-    \code
-    ParallelAnimation {
-        NumberAnimation { target: MyItem; property: "x"; to: 100 }
-        NumberAnimation { target: MyItem; property: "y"; to: 100 }
-    }
-    \endcode
-
-    \sa SequentialAnimation
-*/
-/*!
-    \internal
-    \class QmlParallelAnimation
-*/
-
-QmlParallelAnimation::QmlParallelAnimation(QObject *parent) :
-    QmlAnimationGroup(parent)
-{
-    Q_D(QmlAnimationGroup);
-    d->ag = new QParallelAnimationGroup(this);
-}
-
-QmlParallelAnimation::~QmlParallelAnimation()
-{
-}
-
-QAbstractAnimation *QmlParallelAnimation::qtAnimation()
-{
-    Q_D(QmlAnimationGroup);
-    return d->ag;
-}
-
-void QmlParallelAnimation::transition(QmlStateActions &actions,
-                                      QmlMetaProperties &modified,
-                                      TransitionDirection direction)
-{
-    Q_D(QmlAnimationGroup);
-    bool valid = d->defaultProperty.isValid();
-    for (int ii = 0; ii < d->animations.count(); ++ii) {
-        if (valid)
-            d->animations.at(ii)->setDefaultTarget(d->defaultProperty);
-        d->animations.at(ii)->transition(actions, modified, direction);
-    }
-}
-
-
-
-//convert a variant from string type to another animatable type
-void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
-{
-    if (variant.userType() != QVariant::String) {
-        variant.convert((QVariant::Type)type);
-        return;
-    }
-
-    switch (type) {
-    case QVariant::Rect: {
-        variant.setValue(QmlStringConverters::rectFFromString(variant.toString()).toRect());
-        break;
-    }
-    case QVariant::RectF: {
-        variant.setValue(QmlStringConverters::rectFFromString(variant.toString()));
-        break;
-    }
-    case QVariant::Point: {
-        variant.setValue(QmlStringConverters::pointFFromString(variant.toString()).toPoint());
-        break;
-    }
-    case QVariant::PointF: {
-        variant.setValue(QmlStringConverters::pointFFromString(variant.toString()));
-        break;
-    }
-    case QVariant::Size: {
-        variant.setValue(QmlStringConverters::sizeFFromString(variant.toString()).toSize());
-        break;
-    }
-    case QVariant::SizeF: {
-        variant.setValue(QmlStringConverters::sizeFFromString(variant.toString()));
-        break;
-    }
-    case QVariant::Color: {
-        variant.setValue(QmlStringConverters::colorFromString(variant.toString()));
-        break;
-    }
-    case QVariant::Vector3D: {
-        variant.setValue(QmlStringConverters::vector3DFromString(variant.toString()));
-        break;
-    }
-    default:
-        if ((uint)type >= QVariant::UserType) {
-            QmlMetaType::StringConverter converter = QmlMetaType::customStringConverter(type);
-            if (converter)
-                variant = converter(variant.toString());
-        } else
-            variant.convert((QVariant::Type)type);
-        break;
-    }
-}
-
-/*!
-    \qmlclass PropertyAnimation QmlPropertyAnimation
-  \since 4.7
-    \inherits Animation
-    \brief The PropertyAnimation element allows you to animate property changes.
-
-    PropertyAnimation provides a way to animate changes to a property's value. It can
-    be used in many different situations:
-    \list
-    \o In a Transition
-
-    Animate any objects that have changed their x or y properties in the target state using
-    an InOutQuad easing curve:
-    \qml
-    Transition { PropertyAnimation { properties: "x,y"; easing: "InOutQuad" } }
-    \endqml
-    \o In a Behavior
-
-    Animate all changes to a rectangle's x property.
-    \qml
-    Rectangle {
-        x: Behavior { PropertyAnimation {} }
-    }
-    \endqml
-    \o As a property value source
-
-    Repeatedly animate the rectangle's x property.
-    \qml
-    Rectangle {
-        x: SequentialAnimation {
-            repeat: true
-            PropertyAnimation { to: 50 }
-            PropertyAnimation { to: 0 }
-        }
-    }
-    \endqml
-    \o In a signal handler
-
-    Fade out \c theObject when clicked:
-    \qml
-    MouseArea {
-        anchors.fill: theObject
-        onClicked: PropertyAnimation { target: theObject; property: "opacity"; to: 0 }
-    }
-    \endqml
-    \o Standalone
-
-    Animate \c theObject's size property over 200ms, from its current size to 20-by-20:
-    \qml
-    PropertyAnimation { target: theObject; property: "size"; to: "20x20"; duration: 200 }
-    \endqml
-    \endlist
-
-    Depending on how the animation is used, the set of properties normally used will be
-    different. For more information see the individual property documentation, as well
-    as the \l{QML Animation} introduction.
-*/
-
-QmlPropertyAnimation::QmlPropertyAnimation(QObject *parent)
-: QmlAbstractAnimation(*(new QmlPropertyAnimationPrivate), parent)
-{
-    Q_D(QmlPropertyAnimation);
-    d->init();
-}
-
-QmlPropertyAnimation::QmlPropertyAnimation(QmlPropertyAnimationPrivate &dd, QObject *parent)
-: QmlAbstractAnimation(dd, parent)
-{
-    Q_D(QmlPropertyAnimation);
-    d->init();
-}
-
-QmlPropertyAnimation::~QmlPropertyAnimation()
-{
-}
-
-void QmlPropertyAnimationPrivate::init()
-{
-    Q_Q(QmlPropertyAnimation);
-    va = new QmlTimeLineValueAnimator;
-    QmlGraphics_setParent_noEvent(va, q);
-}
-
-/*!
-    \qmlproperty int PropertyAnimation::duration
-    This property holds the duration of the transition, in milliseconds.
-
-    The default value is 250.
-*/
-int QmlPropertyAnimation::duration() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->va->duration();
-}
-
-void QmlPropertyAnimation::setDuration(int duration)
-{
-    if (duration < 0) {
-        qmlInfo(this) << tr("Cannot set a duration of < 0");
-        return;
-    }
-
-    Q_D(QmlPropertyAnimation);
-    if (d->va->duration() == duration)
-        return;
-    d->va->setDuration(duration);
-    emit durationChanged(duration);
-}
-
-/*!
-    \qmlproperty real PropertyAnimation::from
-    This property holds the starting value.
-    If not set, then the value defined in the start state of the transition.
-*/
-QVariant QmlPropertyAnimation::from() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->from;
-}
-
-void QmlPropertyAnimation::setFrom(const QVariant &f)
-{
-    Q_D(QmlPropertyAnimation);
-    if (d->fromIsDefined && f == d->from)
-        return;
-    d->from = f;
-    d->fromIsDefined = f.isValid();
-    emit fromChanged(f);
-}
-
-/*!
-    \qmlproperty real PropertyAnimation::to
-    This property holds the ending value.
-    If not set, then the value defined in the end state of the transition or Behavior.
-*/
-QVariant QmlPropertyAnimation::to() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->to;
-}
-
-void QmlPropertyAnimation::setTo(const QVariant &t)
-{
-    Q_D(QmlPropertyAnimation);
-    if (d->toIsDefined && t == d->to)
-        return;
-    d->to = t;
-    d->toIsDefined = t.isValid();
-    emit toChanged(t);
-}
-
-/*!
-    \qmlproperty QEasingCurve PropertyAnimation::easing
-    \brief the easing curve used for the transition.
-
-    Available values are:
-
-    \table
-    \row
-        \o \c Linear
-        \o Easing curve for a linear (t) function: velocity is constant.
-        \o \inlineimage qeasingcurve-linear.png
-    \row
-        \o \c InQuad
-        \o Easing curve for a quadratic (t^2) function: accelerating from zero velocity.
-        \o \inlineimage qeasingcurve-inquad.png
-    \row
-        \o \c OutQuad
-        \o Easing curve for a quadratic (t^2) function: decelerating to zero velocity.
-        \o \inlineimage qeasingcurve-outquad.png
-    \row
-        \o \c InOutQuad
-        \o Easing curve for a quadratic (t^2) function: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutquad.png
-    \row
-        \o \c OutInQuad
-        \o Easing curve for a quadratic (t^2) function: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outinquad.png
-    \row
-        \o \c InCubic
-        \o Easing curve for a cubic (t^3) function: accelerating from zero velocity.
-        \o \inlineimage qeasingcurve-incubic.png
-    \row
-        \o \c OutCubic
-        \o Easing curve for a cubic (t^3) function: decelerating from zero velocity.
-        \o \inlineimage qeasingcurve-outcubic.png
-    \row
-        \o \c InOutCubic
-        \o Easing curve for a cubic (t^3) function: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutcubic.png
-    \row
-        \o \c OutInCubic
-        \o Easing curve for a cubic (t^3) function: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outincubic.png
-    \row
-        \o \c InQuart
-        \o Easing curve for a quartic (t^4) function: accelerating from zero velocity.
-        \o \inlineimage qeasingcurve-inquart.png
-    \row
-        \o \c OutQuart
-        \o Easing curve for a cubic (t^4) function: decelerating from zero velocity.
-        \o \inlineimage qeasingcurve-outquart.png
-    \row
-        \o \c InOutQuart
-        \o Easing curve for a cubic (t^4) function: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutquart.png
-    \row
-        \o \c OutInQuart
-        \o Easing curve for a cubic (t^4) function: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outinquart.png
-    \row
-        \o \c InQuint
-        \o Easing curve for a quintic (t^5) function: accelerating from zero velocity.
-        \o \inlineimage qeasingcurve-inquint.png
-    \row
-        \o \c OutQuint
-        \o Easing curve for a cubic (t^5) function: decelerating from zero velocity.
-        \o \inlineimage qeasingcurve-outquint.png
-    \row
-        \o \c InOutQuint
-        \o Easing curve for a cubic (t^5) function: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutquint.png
-    \row
-        \o \c OutInQuint
-        \o Easing curve for a cubic (t^5) function: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outinquint.png
-    \row
-        \o \c InSine
-        \o Easing curve for a sinusoidal (sin(t)) function: accelerating from zero velocity.
-        \o \inlineimage qeasingcurve-insine.png
-    \row
-        \o \c OutSine
-        \o Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity.
-        \o \inlineimage qeasingcurve-outsine.png
-    \row
-        \o \c InOutSine
-        \o Easing curve for a sinusoidal (sin(t)) function: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutsine.png
-    \row
-        \o \c OutInSine
-        \o Easing curve for a sinusoidal (sin(t)) function: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outinsine.png
-    \row
-        \o \c InExpo
-        \o Easing curve for an exponential (2^t) function: accelerating from zero velocity.
-        \o \inlineimage qeasingcurve-inexpo.png
-    \row
-        \o \c OutExpo
-        \o Easing curve for an exponential (2^t) function: decelerating from zero velocity.
-        \o \inlineimage qeasingcurve-outexpo.png
-    \row
-        \o \c InOutExpo
-        \o Easing curve for an exponential (2^t) function: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutexpo.png
-    \row
-        \o \c OutInExpo
-        \o Easing curve for an exponential (2^t) function: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outinexpo.png
-    \row
-        \o \c InCirc
-        \o Easing curve for a circular (sqrt(1-t^2)) function: accelerating from zero velocity.
-        \o \inlineimage qeasingcurve-incirc.png
-    \row
-        \o \c OutCirc
-        \o Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity.
-        \o \inlineimage qeasingcurve-outcirc.png
-    \row
-        \o \c InOutCirc
-        \o Easing curve for a circular (sqrt(1-t^2)) function: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutcirc.png
-    \row
-        \o \c OutInCirc
-        \o Easing curve for a circular (sqrt(1-t^2)) function: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outincirc.png
-    \row
-        \o \c InElastic
-        \o Easing curve for an elastic (exponentially decaying sine wave) function: accelerating from zero velocity.
-        \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
-        \o \inlineimage qeasingcurve-inelastic.png
-    \row
-        \o \c OutElastic
-        \o Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity.
-        \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
-        \o \inlineimage qeasingcurve-outelastic.png
-    \row
-        \o \c InOutElastic
-        \o Easing curve for an elastic (exponentially decaying sine wave) function: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutelastic.png
-    \row
-        \o \c OutInElastic
-        \o Easing curve for an elastic (exponentially decaying sine wave) function: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outinelastic.png
-    \row
-        \o \c InBack
-        \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
-        \o \inlineimage qeasingcurve-inback.png
-    \row
-        \o \c OutBack
-        \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing out: decelerating to zero velocity.
-        \o \inlineimage qeasingcurve-outback.png
-    \row
-        \o \c InOutBack
-        \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutback.png
-    \row
-        \o \c OutInBack
-        \o Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outinback.png
-    \row
-        \o \c InBounce
-        \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: accelerating from zero velocity.
-        \o \inlineimage qeasingcurve-inbounce.png
-    \row
-        \o \c OutBounce
-        \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity.
-        \o \inlineimage qeasingcurve-outbounce.png
-    \row
-        \o \c InOutBounce
-        \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration.
-        \o \inlineimage qeasingcurve-inoutbounce.png
-    \row
-        \o \c OutInBounce
-        \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
-        \o \inlineimage qeasingcurve-outinbounce.png
-    \endtable
-
-*/
-QEasingCurve QmlPropertyAnimation::easing() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->easing;
-}
-
-void QmlPropertyAnimation::setEasing(const QEasingCurve &e)
-{
-    Q_D(QmlPropertyAnimation);
-    if (d->easing == e)
-        return;
-
-    d->easing = e;
-    d->va->setEasingCurve(d->easing);
-    emit easingChanged(e);
-}
-
-QObject *QmlPropertyAnimation::target() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->target;
-}
-
-void QmlPropertyAnimation::setTarget(QObject *o)
-{
-    Q_D(QmlPropertyAnimation);
-    if (d->target == o)
-        return;
-    d->target = o;
-    emit targetChanged(d->target, d->propertyName);
-}
-
-QString QmlPropertyAnimation::property() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->propertyName;
-}
-
-void QmlPropertyAnimation::setProperty(const QString &n)
-{
-    Q_D(QmlPropertyAnimation);
-    if (d->propertyName == n)
-        return;
-    d->propertyName = n;
-    emit targetChanged(d->target, d->propertyName);
-}
-
-QString QmlPropertyAnimation::properties() const
-{
-    Q_D(const QmlPropertyAnimation);
-    return d->properties;
-}
-
-void QmlPropertyAnimation::setProperties(const QString &prop)
-{
-    Q_D(QmlPropertyAnimation);
-    if (d->properties == prop)
-        return;
-
-    d->properties = prop;
-    emit propertiesChanged(prop);
-}
-
-/*!
-    \qmlproperty string PropertyAnimation::property
-    \qmlproperty string PropertyAnimation::properties
-    \qmlproperty Object PropertyAnimation::target
-    \qmlproperty list<Object> PropertyAnimation::targets
-
-    These properties are used as a set to determine which properties should be animated.
-    The singular and plural forms are functionally identical, e.g.
-    \qml
-    NumberAnimation { target: theItem; property: "x"; to: 500 }
-    \endqml
-    has the same meaning as
-    \qml
-    NumberAnimation { targets: theItem; properties: "x"; to: 500 }
-    \endqml
-    The singular forms are slightly optimized, so if you do have only a single target/property
-    to animate you should try to use them.
-
-    In many cases these properties do not need to be explicitly specified -- they can be
-    inferred from the animation framework.
-    \table 80%
-    \row
-    \o Value Source / Behavior
-    \o When an animation is used as a value source or in a Behavior, the default target and property
-       name to be animated can both be inferred.
-       \qml
-       Rectangle {
-           id: theRect
-           width: 100; height: 100
-           color: Qt.rgba(0,0,1)
-           x: NumberAnimation { to: 500; repeat: true } //animate theRect's x property
-           y: Behavior { NumberAnimation {} } //animate theRect's y property
-       }
-       \endqml
-    \row
-    \o Transition
-    \o When used in a transition, a property animation is assumed to match \e all targets
-       but \e no properties. In practice, that means you need to specify at least the properties
-       in order for the animation to do anything.
-       \qml
-       Rectangle {
-           id: theRect
-           width: 100; height: 100
-           color: Qt.rgba(0,0,1)
-           Item { id: uselessItem }
-           states: State {
-               name: "state1"
-               PropertyChanges { target: theRect; x: 200; y: 200; z: 4 }
-               PropertyChanges { target: uselessItem; x: 10; y: 10; z: 2 }
-           }
-           transitions: Transition {
-               //animate both theRect's and uselessItem's x and y to their final values
-               NumberAnimation { properties: "x,y" }
-
-               //animate theRect's z to its final value
-               NumberAnimation { target: theRect; property: "z" }
-           }
-       }
-       \endqml
-    \row
-    \o Standalone
-    \o When an animation is used standalone, both the target and property need to be
-       explicitly specified.
-       \qml
-       Rectangle {
-           id: theRect
-           width: 100; height: 100
-           color: Qt.rgba(0,0,1)
-           //need to explicitly specify target and property
-           NumberAnimation { id: theAnim; target: theRect; property: "x" to: 500 }
-           MouseArea {
-               anchors.fill: parent
-               onClicked: theAnim.start()
-           }
-       }
-       \endqml
-    \endtable
-
-    As seen in the above example, properties is specified as a comma-separated string of property names to animate.
-
-    \sa exclude
-*/
-QmlListProperty<QObject> QmlPropertyAnimation::targets()
-{
-    Q_D(QmlPropertyAnimation);
-    return QmlListProperty<QObject>(this, d->targets);
-}
-
-/*!
-    \qmlproperty list<Object> PropertyAnimation::exclude
-    This property holds the items not to be affected by this animation.
-    \sa targets
-*/
-QmlListProperty<QObject> QmlPropertyAnimation::exclude()
-{
-    Q_D(QmlPropertyAnimation);
-    return QmlListProperty<QObject>(this, d->exclude);
-}
-
-QAbstractAnimation *QmlPropertyAnimation::qtAnimation()
-{
-    Q_D(QmlPropertyAnimation);
-    return d->va;
-}
-
-struct PropertyUpdater : public QmlTimeLineValue
-{
-    QmlStateActions actions;
-    int interpolatorType;       //for Number/ColorAnimation
-    int prevInterpolatorType;   //for generic
-    QVariantAnimation::Interpolator interpolator;
-    bool reverse;
-    bool fromSourced;
-    bool fromDefined;
-    bool *wasDeleted;
-    PropertyUpdater() : wasDeleted(0) {}
-    ~PropertyUpdater() { if (wasDeleted) *wasDeleted = true; }
-    void setValue(qreal v)
-    {
-        bool deleted = false;
-        wasDeleted = &deleted;
-        if (reverse)    //QVariantAnimation sends us 1->0 when reversed, but we are expecting 0->1
-            v = 1 - v;
-        QmlTimeLineValue::setValue(v);
-        for (int ii = 0; ii < actions.count(); ++ii) {
-            QmlAction &action = actions[ii];
-
-            if (v == 1.)
-                action.property.write(action.toValue, QmlMetaProperty::BypassInterceptor | QmlMetaProperty::DontRemoveBinding);
-            else {
-                if (!fromSourced && !fromDefined) {
-                    action.fromValue = action.property.read();
-                    if (interpolatorType)
-                        QmlPropertyAnimationPrivate::convertVariant(action.fromValue, interpolatorType);
-                }
-                if (!interpolatorType) {
-                    int propType = action.property.propertyType();
-                    if (!prevInterpolatorType || prevInterpolatorType != propType) {
-                        prevInterpolatorType = propType;
-                        interpolator = QVariantAnimationPrivate::getInterpolator(prevInterpolatorType);
-                    }
-                }
-                if (interpolator)
-                    action.property.write(interpolator(action.fromValue.constData(), action.toValue.constData(), v), QmlMetaProperty::BypassInterceptor | QmlMetaProperty::DontRemoveBinding);
-            }
-            if (deleted)
-                return;
-        }
-        wasDeleted = 0;
-        fromSourced = true;
-    }
-};
-
-void QmlPropertyAnimation::transition(QmlStateActions &actions,
-                                     QmlMetaProperties &modified,
-                                     TransitionDirection direction)
-{
-    Q_D(QmlPropertyAnimation);
-
-    QStringList props = d->properties.isEmpty() ? QStringList() : d->properties.split(QLatin1Char(','));
-    for (int ii = 0; ii < props.count(); ++ii)
-        props[ii] = props.at(ii).trimmed();
-    if (!d->propertyName.isEmpty())
-        props << d->propertyName;
-
-    QList<QObject*> targets = d->targets;
-    if (d->target)
-        targets.append(d->target);
-
-    bool hasSelectors = !props.isEmpty() || !targets.isEmpty() || !d->exclude.isEmpty();
-    bool useType = (props.isEmpty() && d->defaultToInterpolatorType) ? true : false;
-
-    if (d->defaultProperty.isValid() && !hasSelectors) {
-        props << d->defaultProperty.name();
-        targets << d->defaultProperty.object();
-    }
-
-    if (props.isEmpty() && !d->defaultProperties.isEmpty()) {
-        props << d->defaultProperties.split(QLatin1Char(','));
-    }
-
-    PropertyUpdater *data = new PropertyUpdater;
-    data->interpolatorType = d->interpolatorType;
-    data->interpolator = d->interpolator;
-    data->reverse = direction == Backward ? true : false;
-    data->fromSourced = false;
-    data->fromDefined = d->fromIsDefined;
-
-    bool hasExplicit = false;
-    //an explicit animation has been specified
-    if (d->toIsDefined) {
-        for (int i = 0; i < props.count(); ++i) {
-            for (int j = 0; j < targets.count(); ++j) {
-                QmlAction myAction;
-                myAction.property = d->createProperty(targets.at(j), props.at(i), this);
-                if (myAction.property.isValid()) {
-                    if (d->fromIsDefined) {
-                        myAction.fromValue = d->from;
-                        d->convertVariant(myAction.fromValue, d->interpolatorType ? d->interpolatorType : myAction.property.propertyType());
-                    }
-                    myAction.toValue = d->to;
-                    d->convertVariant(myAction.toValue, d->interpolatorType ? d->interpolatorType : myAction.property.propertyType());
-                    data->actions << myAction;
-                    hasExplicit = true;
-                    for (int ii = 0; ii < actions.count(); ++ii) {
-                        QmlAction &action = actions[ii];
-                        if (action.property.object() == myAction.property.object() &&
-                            myAction.property.name() == action.property.name()) {
-                            modified << action.property;
-                            break;  //### any chance there could be multiples?
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if (!hasExplicit)
-    for (int ii = 0; ii < actions.count(); ++ii) {
-        QmlAction &action = actions[ii];
-
-        QObject *obj = action.property.object();
-        QString propertyName = action.property.name();
-        QObject *sObj = action.specifiedObject;
-        QString sPropertyName = action.specifiedProperty;
-        bool same = (obj == sObj);
-
-        if ((targets.isEmpty() || targets.contains(obj) || (!same && targets.contains(sObj))) &&
-           (!d->exclude.contains(obj)) && (same || (!d->exclude.contains(sObj))) &&
-           (props.contains(propertyName) || (!same && props.contains(sPropertyName))
-               || (useType && action.property.propertyType() == d->interpolatorType))) {
-            QmlAction myAction = action;
-
-            if (d->fromIsDefined)
-                myAction.fromValue = d->from;
-            else
-                myAction.fromValue = QVariant();
-            if (d->toIsDefined)
-                myAction.toValue = d->to;
-
-            d->convertVariant(myAction.fromValue, d->interpolatorType ? d->interpolatorType : myAction.property.propertyType());
-            d->convertVariant(myAction.toValue, d->interpolatorType ? d->interpolatorType : myAction.property.propertyType());
-
-            modified << action.property;
-
-            data->actions << myAction;
-            action.fromValue = myAction.toValue;
-        }
-    }
-
-    if (data->actions.count()) {
-        if (!d->rangeIsSet) {
-            d->va->setStartValue(qreal(0));
-            d->va->setEndValue(qreal(1));
-            d->rangeIsSet = true;
-        }
-        d->va->setAnimValue(data, QAbstractAnimation::DeleteWhenStopped);
-        d->va->setFromSourcedValue(&data->fromSourced);
-    } else {
-        delete data;
-    }
-}
-
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
deleted file mode 100644
index fd868bc..0000000
--- a/src/declarative/util/qmlanimation_p.h
+++ /dev/null
@@ -1,467 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLANIMATION_H
-#define QMLANIMATION_H
-
-#include "qmltransition_p.h"
-#include "qmlstate_p.h"
-#include <QtGui/qvector3d.h>
-
-#include <qmlpropertyvaluesource.h>
-#include <qml.h>
-#include <qmlscriptstring.h>
-
-#include <QtCore/qvariant.h>
-#include <QtCore/qeasingcurve.h>
-#include <QtCore/QAbstractAnimation>
-#include <QtGui/qcolor.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlAbstractAnimationPrivate;
-class QmlAnimationGroup;
-class Q_AUTOTEST_EXPORT QmlAbstractAnimation : public QObject, public QmlPropertyValueSource, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlAbstractAnimation)
-
-    Q_INTERFACES(QmlParserStatus)
-    Q_INTERFACES(QmlPropertyValueSource)
-    Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
-    Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
-    Q_PROPERTY(bool alwaysRunToEnd READ alwaysRunToEnd WRITE setAlwaysRunToEnd NOTIFY alwaysRunToEndChanged())
-    Q_PROPERTY(bool repeat READ repeat WRITE setRepeat NOTIFY repeatChanged)
-    Q_CLASSINFO("DefaultMethod", "start()")
-
-public:
-    QmlAbstractAnimation(QObject *parent=0);
-    virtual ~QmlAbstractAnimation();
-
-    bool isRunning() const;
-    void setRunning(bool);
-    bool isPaused() const;
-    void setPaused(bool);
-    bool alwaysRunToEnd() const;
-    void setAlwaysRunToEnd(bool);
-    bool repeat() const;
-    void setRepeat(bool);
-
-    int currentTime();
-    void setCurrentTime(int);
-
-    QmlAnimationGroup *group() const;
-    void setGroup(QmlAnimationGroup *);
-
-    void setDefaultTarget(const QmlMetaProperty &);
-    void setDisableUserControl();
-
-    void classBegin();
-    void componentComplete();
-
-Q_SIGNALS:
-    void started();
-    void completed();
-    void runningChanged(bool);
-    void pausedChanged(bool);
-    void repeatChanged(bool);
-    void alwaysRunToEndChanged(bool);
-
-public Q_SLOTS:
-    void restart();
-    void start();
-    void pause();
-    void resume();
-    void stop();
-    void complete();
-
-protected:
-    QmlAbstractAnimation(QmlAbstractAnimationPrivate &dd, QObject *parent);
-
-public:
-    enum TransitionDirection { Forward, Backward };
-    virtual void transition(QmlStateActions &actions,
-                            QmlMetaProperties &modified,
-                            TransitionDirection direction);
-    virtual QAbstractAnimation *qtAnimation() = 0;
-
-private Q_SLOTS:
-    void timelineComplete();
-
-private:
-    virtual void setTarget(const QmlMetaProperty &);
-};
-
-class QmlPauseAnimationPrivate;
-class Q_AUTOTEST_EXPORT QmlPauseAnimation : public QmlAbstractAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlPauseAnimation)
-
-    Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
-
-public:
-    QmlPauseAnimation(QObject *parent=0);
-    virtual ~QmlPauseAnimation();
-
-    int duration() const;
-    void setDuration(int);
-
-Q_SIGNALS:
-    void durationChanged(int);
-
-protected:
-    virtual QAbstractAnimation *qtAnimation();
-};
-
-class QmlScriptActionPrivate;
-class QmlScriptAction : public QmlAbstractAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlScriptAction)
-
-    Q_PROPERTY(QmlScriptString script READ script WRITE setScript)
-    Q_PROPERTY(QString stateChangeScriptName READ stateChangeScriptName WRITE setStateChangeScriptName)
-
-public:
-    QmlScriptAction(QObject *parent=0);
-    virtual ~QmlScriptAction();
-
-    QmlScriptString script() const;
-    void setScript(const QmlScriptString &);
-
-    QString stateChangeScriptName() const;
-    void setStateChangeScriptName(const QString &);
-
-protected:
-    virtual void transition(QmlStateActions &actions,
-                            QmlMetaProperties &modified,
-                            TransitionDirection direction);
-    virtual QAbstractAnimation *qtAnimation();
-};
-
-class QmlPropertyActionPrivate;
-class QmlPropertyAction : public QmlAbstractAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlPropertyAction)
-
-    Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
-    Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged)
-    Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
-    Q_PROPERTY(QmlListProperty<QObject> targets READ targets)
-    Q_PROPERTY(QmlListProperty<QObject> exclude READ exclude)
-    Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
-
-public:
-    QmlPropertyAction(QObject *parent=0);
-    virtual ~QmlPropertyAction();
-
-    QObject *target() const;
-    void setTarget(QObject *);
-
-    QString property() const;
-    void setProperty(const QString &);
-
-    QString properties() const;
-    void setProperties(const QString &);
-
-    QmlListProperty<QObject> targets();
-    QmlListProperty<QObject> exclude();
-
-    QVariant value() const;
-    void setValue(const QVariant &);
-
-Q_SIGNALS:
-    void valueChanged(const QVariant &);
-    void propertiesChanged(const QString &);
-    void targetChanged(QObject *, const QString &);
-
-protected:
-    virtual void transition(QmlStateActions &actions,
-                            QmlMetaProperties &modified,
-                            TransitionDirection direction);
-    virtual QAbstractAnimation *qtAnimation();
-};
-
-class QmlGraphicsItem;
-class QmlParentActionPrivate;
-class QmlParentAction : public QmlAbstractAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlParentAction)
-
-    Q_PROPERTY(QmlGraphicsItem *target READ object WRITE setObject)
-    Q_PROPERTY(QmlGraphicsItem *parent READ parent WRITE setParent) //### newParent
-
-public:
-    QmlParentAction(QObject *parent=0);
-    virtual ~QmlParentAction();
-
-    QmlGraphicsItem *object() const;
-    void setObject(QmlGraphicsItem *);
-
-    QmlGraphicsItem *parent() const;
-    void setParent(QmlGraphicsItem *);
-
-protected:
-    virtual void transition(QmlStateActions &actions,
-                            QmlMetaProperties &modified,
-                            TransitionDirection direction);
-    virtual QAbstractAnimation *qtAnimation();
-};
-
-class QmlPropertyAnimationPrivate;
-class Q_AUTOTEST_EXPORT QmlPropertyAnimation : public QmlAbstractAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlPropertyAnimation)
-
-    Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
-    Q_PROPERTY(QVariant from READ from WRITE setFrom NOTIFY fromChanged)
-    Q_PROPERTY(QVariant to READ to WRITE setTo NOTIFY toChanged)
-    Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged)
-    Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
-    Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged)
-    Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
-    Q_PROPERTY(QmlListProperty<QObject> targets READ targets)
-    Q_PROPERTY(QmlListProperty<QObject> exclude READ exclude)
-
-public:
-    QmlPropertyAnimation(QObject *parent=0);
-    virtual ~QmlPropertyAnimation();
-
-    int duration() const;
-    void setDuration(int);
-
-    QVariant from() const;
-    void setFrom(const QVariant &);
-
-    QVariant to() const;
-    void setTo(const QVariant &);
-
-    QEasingCurve easing() const;
-    void setEasing(const QEasingCurve &);
-
-    QObject *target() const;
-    void setTarget(QObject *);
-
-    QString property() const;
-    void setProperty(const QString &);
-
-    QString properties() const;
-    void setProperties(const QString &);
-
-    QmlListProperty<QObject> targets();
-    QmlListProperty<QObject> exclude();
-
-protected:
-    QmlPropertyAnimation(QmlPropertyAnimationPrivate &dd, QObject *parent);
-    virtual void transition(QmlStateActions &actions,
-                            QmlMetaProperties &modified,
-                            TransitionDirection direction);
-    virtual QAbstractAnimation *qtAnimation();
-
-Q_SIGNALS:
-    void durationChanged(int);
-    void fromChanged(QVariant);
-    void toChanged(QVariant);
-    void easingChanged(const QEasingCurve &);
-    void propertiesChanged(const QString &);
-    void targetChanged(QObject *, const QString &);
-};
-
-class Q_AUTOTEST_EXPORT QmlColorAnimation : public QmlPropertyAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlPropertyAnimation)
-    Q_PROPERTY(QColor from READ from WRITE setFrom NOTIFY fromChanged)
-    Q_PROPERTY(QColor to READ to WRITE setTo NOTIFY toChanged)
-
-public:
-    QmlColorAnimation(QObject *parent=0);
-    virtual ~QmlColorAnimation();
-
-    QColor from() const;
-    void setFrom(const QColor &);
-
-    QColor to() const;
-    void setTo(const QColor &);
-};
-
-class Q_AUTOTEST_EXPORT QmlNumberAnimation : public QmlPropertyAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlPropertyAnimation)
-
-    Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged)
-    Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged)
-
-public:
-    QmlNumberAnimation(QObject *parent=0);
-    virtual ~QmlNumberAnimation();
-
-    qreal from() const;
-    void setFrom(qreal);
-
-    qreal to() const;
-    void setTo(qreal);
-};
-
-class Q_AUTOTEST_EXPORT QmlVector3dAnimation : public QmlPropertyAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlPropertyAnimation)
-
-    Q_PROPERTY(QVector3D from READ from WRITE setFrom NOTIFY fromChanged)
-    Q_PROPERTY(QVector3D to READ to WRITE setTo NOTIFY toChanged)
-
-public:
-    QmlVector3dAnimation(QObject *parent=0);
-    virtual ~QmlVector3dAnimation();
-
-    QVector3D from() const;
-    void setFrom(QVector3D);
-
-    QVector3D to() const;
-    void setTo(QVector3D);
-};
-
-class QmlRotationAnimationPrivate;
-class Q_AUTOTEST_EXPORT QmlRotationAnimation : public QmlPropertyAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlRotationAnimation)
-    Q_ENUMS(RotationDirection)
-
-    Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged)
-    Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged)
-    Q_PROPERTY(RotationDirection direction READ direction WRITE setDirection NOTIFY directionChanged)
-
-public:
-    QmlRotationAnimation(QObject *parent=0);
-    virtual ~QmlRotationAnimation();
-
-    qreal from() const;
-    void setFrom(qreal);
-
-    qreal to() const;
-    void setTo(qreal);
-
-    enum RotationDirection { Numerical, Shortest, Clockwise, Counterclockwise };
-    RotationDirection direction() const;
-    void setDirection(RotationDirection direction);
-
-Q_SIGNALS:
-    void directionChanged();
-};
-
-class QmlAnimationGroupPrivate;
-class QmlAnimationGroup : public QmlAbstractAnimation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlAnimationGroup)
-
-    Q_CLASSINFO("DefaultProperty", "animations")
-    Q_PROPERTY(QmlListProperty<QmlAbstractAnimation> animations READ animations)
-
-public:
-    QmlAnimationGroup(QObject *parent);
-    virtual ~QmlAnimationGroup();
-
-    QmlListProperty<QmlAbstractAnimation> animations();
-    friend class QmlAbstractAnimation;
-};
-
-class QmlSequentialAnimation : public QmlAnimationGroup
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlAnimationGroup)
-
-public:
-    QmlSequentialAnimation(QObject *parent=0);
-    virtual ~QmlSequentialAnimation();
-
-protected:
-    virtual void transition(QmlStateActions &actions,
-                            QmlMetaProperties &modified,
-                            TransitionDirection direction);
-    virtual QAbstractAnimation *qtAnimation();
-};
-
-class QmlParallelAnimation : public QmlAnimationGroup
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlAnimationGroup)
-
-public:
-    QmlParallelAnimation(QObject *parent=0);
-    virtual ~QmlParallelAnimation();
-
-protected:
-    virtual void transition(QmlStateActions &actions,
-                            QmlMetaProperties &modified,
-                            TransitionDirection direction);
-    virtual QAbstractAnimation *qtAnimation();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlAbstractAnimation)
-QML_DECLARE_TYPE(QmlPauseAnimation)
-QML_DECLARE_TYPE(QmlScriptAction)
-QML_DECLARE_TYPE(QmlPropertyAction)
-QML_DECLARE_TYPE(QmlParentAction)
-QML_DECLARE_TYPE(QmlPropertyAnimation)
-QML_DECLARE_TYPE(QmlColorAnimation)
-QML_DECLARE_TYPE(QmlNumberAnimation)
-QML_DECLARE_TYPE(QmlSequentialAnimation)
-QML_DECLARE_TYPE(QmlParallelAnimation)
-QML_DECLARE_TYPE(QmlVector3dAnimation)
-QML_DECLARE_TYPE(QmlRotationAnimation)
-
-QT_END_HEADER
-
-#endif // QMLANIMATION_H
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h
deleted file mode 100644
index 8c88f14..0000000
--- a/src/declarative/util/qmlanimation_p_p.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLANIMATION_P_H
-#define QMLANIMATION_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlanimation_p.h"
-
-#include "qmlnullablevalue_p_p.h"
-#include "qmltimeline_p_p.h"
-
-#include <qml.h>
-#include <qmlcontext.h>
-
-#include <QtCore/QPauseAnimation>
-#include <QtCore/QVariantAnimation>
-#include <QtCore/QAnimationGroup>
-#include <QtGui/QColor>
-#include <QDebug>
-
-#include <private/qobject_p.h>
-#include <private/qvariantanimation_p.h>
-
-QT_BEGIN_NAMESPACE
-
-//interface for classes that provide animation actions for QActionAnimation
-class QAbstractAnimationAction
-{
-public:
-    virtual ~QAbstractAnimationAction() {}
-    virtual void doAction() = 0;
-};
-
-//templated animation action
-//allows us to specify an action that calls a function of a class.
-//(so that class doesn't have to inherit QmlAbstractAnimationAction)
-template<class T, void (T::*method)()>
-class QAnimationActionProxy : public QAbstractAnimationAction
-{
-public:
-    QAnimationActionProxy(T *p) : m_p(p) {}
-    virtual void doAction() { (m_p->*method)(); }
-
-private:
-    T *m_p;
-};
-
-//performs an action of type QAbstractAnimationAction
-class QActionAnimation : public QAbstractAnimation
-{
-    Q_OBJECT
-public:
-    QActionAnimation(QObject *parent = 0) : QAbstractAnimation(parent), animAction(0), policy(KeepWhenStopped), running(false) {}
-    QActionAnimation(QAbstractAnimationAction *action, QObject *parent = 0)
-        : QAbstractAnimation(parent), animAction(action), policy(KeepWhenStopped), running(false) {}
-    ~QActionAnimation() { if (policy == DeleteWhenStopped) { delete animAction; animAction = 0; } }
-    virtual int duration() const { return 0; }
-    void setAnimAction(QAbstractAnimationAction *action, DeletionPolicy p)
-    {
-        if (state() == Running)
-            stop();
-        if (policy == DeleteWhenStopped)
-            delete animAction;
-        animAction = action;
-        policy = p;
-    }
-protected:
-    virtual void updateCurrentTime(int) {}
-
-    virtual void updateState(State newState, State /*oldState*/)
-    {
-        if (newState == Running) {
-            if (animAction) {
-                running = true;
-                animAction->doAction();
-                running = false;
-                if (state() == Stopped && policy == DeleteWhenStopped) {
-                    delete animAction;
-                    animAction = 0;
-                }
-            }
-        } /*else if (newState == Stopped && policy == DeleteWhenStopped) {
-            if (!running) {
-                delete animAction;
-                animAction = 0;
-            }
-        }*/
-    }
-
-private:
-    QAbstractAnimationAction *animAction;
-    DeletionPolicy policy;
-    bool running;
-};
-
-//animates QmlTimeLineValue (assumes start and end values will be reals or compatible)
-class QmlTimeLineValueAnimator : public QVariantAnimation
-{
-    Q_OBJECT
-public:
-    QmlTimeLineValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), fromSourced(0), policy(KeepWhenStopped) {}
-    ~QmlTimeLineValueAnimator() { if (policy == DeleteWhenStopped) { delete animValue; animValue = 0; } }
-    void setAnimValue(QmlTimeLineValue *value, DeletionPolicy p)
-    {
-        if (state() == Running)
-            stop();
-        if (policy == DeleteWhenStopped)
-            delete animValue;
-        animValue = value;
-        policy = p;
-    }
-    void setFromSourcedValue(bool *value)
-    {
-        fromSourced = value;
-    }
-protected:
-    virtual void updateCurrentValue(const QVariant &value)
-    {
-        if (animValue)
-            animValue->setValue(value.toReal());
-    }
-    virtual void updateState(State newState, State oldState)
-    {   
-        QVariantAnimation::updateState(newState, oldState);
-        if (newState == Running) {
-            //check for new from every loop
-            if (fromSourced)
-                *fromSourced = false;
-        } /*else if (newState == Stopped && policy == DeleteWhenStopped) {
-            delete animValue;
-            animValue = 0;
-        }*/ //### we get a stop each loop if we are in a group
-        //### top-level animation is the only reliable one for this
-    }
-
-private:
-    QmlTimeLineValue *animValue;
-    bool *fromSourced;
-    DeletionPolicy policy;
-};
-
-//an animation that just gives a tick
-template<class T, void (T::*method)(int)>
-class QTickAnimationProxy : public QAbstractAnimation
-{
-    //Q_OBJECT //doesn't work with templating
-public:
-    QTickAnimationProxy(T *p, QObject *parent = 0) : QAbstractAnimation(parent), m_p(p) {}
-    virtual int duration() const { return -1; }
-protected:
-    virtual void updateCurrentTime(int msec) { (m_p->*method)(msec); }
-
-private:
-    T *m_p;
-};
-
-class QmlAbstractAnimationPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlAbstractAnimation)
-public:
-    QmlAbstractAnimationPrivate()
-    : running(false), paused(false), alwaysRunToEnd(false), repeat(false),
-      connectedTimeLine(false), componentComplete(true),
-      avoidPropertyValueSourceStart(false), disableUserControl(false), group(0) {}
-
-    bool running:1;
-    bool paused:1;
-    bool alwaysRunToEnd:1;
-    bool repeat:1;
-    bool connectedTimeLine:1;
-    bool componentComplete:1;
-    bool avoidPropertyValueSourceStart:1;
-    bool disableUserControl:1;
-
-    void commence();
-
-    QmlMetaProperty defaultProperty;
-
-    QmlAnimationGroup *group;
-
-    static QmlMetaProperty createProperty(QObject *obj, const QString &str, QObject *infoObj);
-};
-
-class QmlPauseAnimationPrivate : public QmlAbstractAnimationPrivate
-{
-    Q_DECLARE_PUBLIC(QmlPauseAnimation)
-public:
-    QmlPauseAnimationPrivate()
-    : QmlAbstractAnimationPrivate(), pa(0) {}
-
-    void init();
-
-    QPauseAnimation *pa;
-};
-
-class QmlScriptActionPrivate : public QmlAbstractAnimationPrivate
-{
-    Q_DECLARE_PUBLIC(QmlScriptAction)
-public:
-    QmlScriptActionPrivate()
-        : QmlAbstractAnimationPrivate(), hasRunScriptScript(false), proxy(this), rsa(0) {}
-
-    void init();
-
-    QmlScriptString script;
-    QString name;
-    QmlScriptString runScriptScript;
-    bool hasRunScriptScript;
-
-    void execute();
-
-    QAnimationActionProxy<QmlScriptActionPrivate,
-                  &QmlScriptActionPrivate::execute> proxy;
-    QActionAnimation *rsa;
-};
-
-class QmlPropertyActionPrivate : public QmlAbstractAnimationPrivate
-{
-    Q_DECLARE_PUBLIC(QmlPropertyAction)
-public:
-    QmlPropertyActionPrivate()
-    : QmlAbstractAnimationPrivate(), target(0), spa(0) {}
-
-    void init();
-
-    QObject *target;
-    QString propertyName;
-    QString properties;
-    QList<QObject *> targets;
-    QList<QObject *> exclude;
-
-    QmlNullableValue<QVariant> value;
-
-    QActionAnimation *spa;
-};
-
-class QmlParentActionPrivate : public QmlAbstractAnimationPrivate
-{
-    Q_DECLARE_PUBLIC(QmlParentAction)
-public:
-    QmlParentActionPrivate()
-    : QmlAbstractAnimationPrivate(), pcTarget(0), pcParent(0) {}
-
-    void init();
-
-    QmlGraphicsItem *pcTarget;
-    QmlGraphicsItem *pcParent;
-
-    void doAction();
-    QActionAnimation *cpa;
-};
-
-class QmlAnimationGroupPrivate : public QmlAbstractAnimationPrivate
-{
-    Q_DECLARE_PUBLIC(QmlAnimationGroup)
-public:
-    QmlAnimationGroupPrivate()
-    : QmlAbstractAnimationPrivate(), ag(0) {}
-
-    static void append_animation(QmlListProperty<QmlAbstractAnimation> *list, QmlAbstractAnimation *role);
-    static void clear_animation(QmlListProperty<QmlAbstractAnimation> *list);
-    static void removeAt_animation(QmlListProperty<QmlAbstractAnimation> *list, int i);
-    static void insert_animation(QmlListProperty<QmlAbstractAnimation> *list, int i, QmlAbstractAnimation *role);
-    QList<QmlAbstractAnimation *> animations;
-    QAnimationGroup *ag;
-};
-
-class QmlPropertyAnimationPrivate : public QmlAbstractAnimationPrivate
-{
-    Q_DECLARE_PUBLIC(QmlPropertyAnimation)
-public:
-    QmlPropertyAnimationPrivate()
-    : QmlAbstractAnimationPrivate(), target(0), fromSourced(false), fromIsDefined(false), toIsDefined(false),
-      rangeIsSet(false), defaultToInterpolatorType(0), interpolatorType(0), interpolator(0), va(0) {}
-
-    void init();
-
-    QVariant from;
-    QVariant to;
-
-    QEasingCurve easing;
-
-    QObject *target;
-    QString propertyName;
-    QString properties;
-    QList<QObject *> targets;
-    QList<QObject *> exclude;
-    QString defaultProperties;
-
-    bool fromSourced;
-    bool fromIsDefined:1;
-    bool toIsDefined:1;
-    bool rangeIsSet:1;
-    bool defaultToInterpolatorType:1;
-    int interpolatorType;
-    QVariantAnimation::Interpolator interpolator;
-
-    QmlTimeLineValueAnimator *va;
-
-    static QVariant interpolateVariant(const QVariant &from, const QVariant &to, qreal progress);
-    static void convertVariant(QVariant &variant, int type);
-};
-
-class QmlRotationAnimationPrivate : public QmlPropertyAnimationPrivate
-{
-    Q_DECLARE_PUBLIC(QmlRotationAnimation)
-public:
-    QmlRotationAnimationPrivate() : direction(QmlRotationAnimation::Shortest) {}
-
-    QmlRotationAnimation::RotationDirection direction;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLANIMATION_P_H
diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp
deleted file mode 100644
index 6c67e00..0000000
--- a/src/declarative/util/qmlbehavior.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlbehavior_p.h"
-
-#include "qmlanimation_p.h"
-#include "qmltransition_p.h"
-
-#include <qmlcontext.h>
-#include <qmlinfo.h>
-
-#include <QtCore/qparallelanimationgroup.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-
-class QmlBehaviorPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlBehavior)
-public:
-    QmlBehaviorPrivate() : animation(0), enabled(true) {}
-
-    QmlMetaProperty property;
-    QVariant currentValue;
-    QmlAbstractAnimation *animation;
-    bool enabled;
-};
-
-/*!
-    \qmlclass Behavior QmlBehavior
-    \brief The Behavior element allows you to specify a default animation for a property change.
-
-    Behaviors provide one way to specify \l{qmlanimation.html}{animations} in QML.
-
-    In the example below, the rect will use a bounce easing curve over 200 millisecond for any changes to its y property:
-    \code
-    Rectangle {
-        width: 20; height: 20
-        color: "#00ff00"
-        y: 200  //initial value
-        y: Behavior {
-            NumberAnimation {
-                easing: "easeOutBounce(amplitude:100)"
-                duration: 200
-            }
-        }
-    }
-    \endcode
-
-    Currently only a single Behavior may be specified for a property;
-    this Behavior can be enabled and disabled via the \l{enabled} property.
-*/
-
-
-QmlBehavior::QmlBehavior(QObject *parent)
-    : QObject(*(new QmlBehaviorPrivate), parent)
-{
-}
-
-QmlBehavior::~QmlBehavior()
-{
-}
-
-/*!
-    \qmlproperty Animation Behavior::animation
-    \default
-
-    The animation to use when the behavior is triggered.
-*/
-
-QmlAbstractAnimation *QmlBehavior::animation()
-{
-    Q_D(QmlBehavior);
-    return d->animation;
-}
-
-void QmlBehavior::setAnimation(QmlAbstractAnimation *animation)
-{
-    Q_D(QmlBehavior);
-    if (d->animation) {
-        qmlInfo(this) << tr("Cannot change the animation assigned to a Behavior.");
-        return;
-    }
-
-    d->animation = animation;
-    if (d->animation) {
-        d->animation->setDefaultTarget(d->property);
-        d->animation->setDisableUserControl();
-    }
-}
-
-/*!
-    \qmlproperty bool Behavior::enabled
-    Whether the Behavior will be triggered when the property it is tracking changes.
-
-    By default a Behavior is enabled.
-*/
-
-bool QmlBehavior::enabled() const
-{
-    Q_D(const QmlBehavior);
-    return d->enabled;
-}
-
-void QmlBehavior::setEnabled(bool enabled)
-{
-    Q_D(QmlBehavior);
-    if (d->enabled == enabled)
-        return;
-    d->enabled = enabled;
-    emit enabledChanged();
-}
-
-void QmlBehavior::write(const QVariant &value)
-{
-    Q_D(QmlBehavior);
-    if (!d->animation || !d->enabled) {
-        d->property.write(value, QmlMetaProperty::BypassInterceptor | QmlMetaProperty::DontRemoveBinding);
-        return;
-    }
-
-    d->currentValue = d->property.read();
-
-    d->animation->qtAnimation()->stop();
-
-    QmlStateOperation::ActionList actions;
-    QmlAction action;
-    action.property = d->property;
-    action.fromValue = d->currentValue;
-    action.toValue = value;
-    actions << action;
-
-    QList<QmlMetaProperty> after;
-    if (d->animation)
-        d->animation->transition(actions, after, QmlAbstractAnimation::Forward);
-    d->animation->qtAnimation()->start();
-    if (!after.contains(d->property))
-        d->property.write(value, QmlMetaProperty::BypassInterceptor | QmlMetaProperty::DontRemoveBinding);
-}
-
-void QmlBehavior::setTarget(const QmlMetaProperty &property)
-{
-    Q_D(QmlBehavior);
-    d->property = property;
-    d->currentValue = property.read();
-    if (d->animation)
-        d->animation->setDefaultTarget(property);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h
deleted file mode 100644
index ee9e862..0000000
--- a/src/declarative/util/qmlbehavior_p.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLBEHAVIOR_H
-#define QMLBEHAVIOR_H
-
-#include "qmlstate_p.h"
-
-#include <qmlpropertyvaluesource.h>
-#include <qmlpropertyvalueinterceptor.h>
-#include <qml.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlAbstractAnimation;
-class QmlBehaviorPrivate;
-class Q_DECLARATIVE_EXPORT QmlBehavior : public QObject, public QmlPropertyValueInterceptor
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlBehavior)
-
-    Q_INTERFACES(QmlPropertyValueInterceptor)
-    Q_CLASSINFO("DefaultProperty", "animation")
-    Q_PROPERTY(QmlAbstractAnimation *animation READ animation WRITE setAnimation)
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-
-public:
-    QmlBehavior(QObject *parent=0);
-    ~QmlBehavior();
-
-    virtual void setTarget(const QmlMetaProperty &);
-    virtual void write(const QVariant &value);
-
-    QmlAbstractAnimation *animation();
-    void setAnimation(QmlAbstractAnimation *);
-
-    bool enabled() const;
-    void setEnabled(bool enabled);
-
-Q_SIGNALS:
-    void enabledChanged();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlBehavior)
-
-QT_END_HEADER
-
-#endif // QMLBEHAVIOR_H
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
deleted file mode 100644
index 777fa08..0000000
--- a/src/declarative/util/qmlbind.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlbind_p.h"
-
-#include "qmlnullablevalue_p_p.h"
-
-#include <qmlengine.h>
-#include <qmlcontext.h>
-
-#include <QtCore/qfile.h>
-#include <QtCore/qdebug.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtScript/qscriptcontext.h>
-#include <QtScript/qscriptengine.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlBindPrivate : public QObjectPrivate
-{
-public:
-    QmlBindPrivate() : when(true), componentComplete(false), obj(0) {}
-
-    bool when : 1;
-    bool componentComplete : 1;
-    QObject *obj;
-    QString prop;
-    QmlNullableValue<QVariant> value;
-};
-
-
-/*!
-    \qmlclass Binding QmlBind
-  \since 4.7
-    \brief The Binding element allows arbitrary property bindings to be created.
-
-    Sometimes it is necessary to bind to a property of an object that wasn't
-    directly instantiated by QML - generally a property of a class exported
-    to QML by C++. In these cases, regular property binding doesn't work. Binding
-    allows you to bind any value to any property.
-
-    For example, imagine a C++ application that maps an "app.enteredText"
-    property into QML. You could use Binding to update the enteredText property
-    like this.
-    \code
-    TextEdit { id: myTextField; text: "Please type here..." }
-    Binding { target: app; property: "enteredText"; value: myTextField.text }
-    \endcode
-    Whenever the text in the TextEdit is updated, the C++ property will be
-    updated also.
-
-    If the binding target or binding property is changed, the bound value is
-    immediately pushed onto the new target.
-    */
-/*!
-    \internal
-    \class QmlBind
-    \ingroup group_utility
-    \brief The QmlBind class allows arbitrary property bindings to be created.
-
-    Simple bindings are usually earier to do in-place rather than creating a
-    QmlBind item. For that reason, QmlBind is usually used to transfer property information
-    from Qml to C++.
-
-    \sa cppqml
-    */
-QmlBind::QmlBind(QObject *parent)
-    : QObject(*(new QmlBindPrivate), parent)
-{
-}
-
-QmlBind::~QmlBind()
-{
-}
-
-bool QmlBind::when() const
-{
-    Q_D(const QmlBind);
-    return d->when;
-}
-
-void QmlBind::setWhen(bool v)
-{
-    Q_D(QmlBind);
-    d->when = v;
-    eval();
-}
-
-/*!
-    \qmlproperty Object Binding::target
-
-    The object to be updated.
-*/
-QObject *QmlBind::object()
-{
-    Q_D(const QmlBind);
-    return d->obj;
-}
-
-void QmlBind::setObject(QObject *obj)
-{
-    Q_D(QmlBind);
-    d->obj = obj;
-    eval();
-}
-
-/*!
-    \qmlproperty string Binding::property
-
-    The property to be updated.
-*/
-QString QmlBind::property() const
-{
-    Q_D(const QmlBind);
-    return d->prop;
-}
-
-void QmlBind::setProperty(const QString &p)
-{
-    Q_D(QmlBind);
-    d->prop = p;
-    eval();
-}
-
-/*!
-    \qmlproperty any Binding::value
-
-    The value to be set on the target object and property.  This can be a
-    constant (which isn't very useful), or a bound expression.
-*/
-QVariant QmlBind::value() const
-{
-    Q_D(const QmlBind);
-    return d->value.value;
-}
-
-void QmlBind::setValue(const QVariant &v)
-{
-    Q_D(QmlBind);
-    d->value.value = v;
-    d->value.isNull = false;
-    eval();
-}
-
-void QmlBind::componentComplete()
-{
-    Q_D(QmlBind);
-    d->componentComplete = true;
-    eval();
-}
-
-void QmlBind::eval()
-{
-    Q_D(QmlBind);
-    if (!d->obj || d->value.isNull || !d->when || !d->componentComplete)
-        return;
-
-    QmlMetaProperty prop(d->obj, d->prop);
-    prop.write(d->value.value);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlbind_p.h b/src/declarative/util/qmlbind_p.h
deleted file mode 100644
index 6fdd2dc..0000000
--- a/src/declarative/util/qmlbind_p.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLBIND_H
-#define QMLBIND_H
-
-#include <qml.h>
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlBindPrivate;
-class Q_DECLARATIVE_EXPORT QmlBind : public QObject, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlBind)
-    Q_INTERFACES(QmlParserStatus)
-    Q_PROPERTY(QObject *target READ object WRITE setObject)
-    Q_PROPERTY(QString property READ property WRITE setProperty)
-    Q_PROPERTY(QVariant value READ value WRITE setValue)
-    Q_PROPERTY(bool when READ when WRITE setWhen)
-
-public:
-    QmlBind(QObject *parent=0);
-    ~QmlBind();
-
-    bool when() const;
-    void setWhen(bool);
-
-    QObject *object();
-    void setObject(QObject *);
-
-    QString property() const;
-    void setProperty(const QString &);
-
-    QVariant value() const;
-    void setValue(const QVariant &);
-
-protected:
-    virtual void componentComplete();
-
-private:
-    void eval();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlBind)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
deleted file mode 100644
index b24825b..0000000
--- a/src/declarative/util/qmlconnection.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlconnection_p.h"
-
-#include <qmlexpression.h>
-#include <qmlboundsignal_p.h>
-#include <qmlcontext.h>
-
-#include <QtCore/qdebug.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlConnectionPrivate : public QObjectPrivate
-{
-public:
-    QmlConnectionPrivate() : boundsignal(0), signalSender(0), scriptset(false), componentcomplete(false) {}
-
-    QmlBoundSignal *boundsignal;
-    QObject *signalSender;
-    QmlScriptString script;
-    bool scriptset;
-    QString signal;
-    bool componentcomplete;
-};
-
-/*!
-    \qmlclass Connection QmlConnection
-  \since 4.7
-    \brief A Connection object describes generalized connections to signals.
-
-    When connecting to signals in QML, the usual way is to create an
-    "on<Signal>" handler that reacts when a signal is received, like this:
-
-    \qml
-    MouseArea {
-        onClicked: { foo(x+123,y+456) }
-    }
-    \endqml
-
-    However, in some cases, it is not possible to connect to a signal in this
-    way. For example, JavaScript-in-HTML style signal properties do not allow:
-
-    \list
-        \i connecting to signals with the same name but different parameters
-        \i conformance checking that parameters are correctly named
-        \i multiple connections to the same signal
-        \i connections outside the scope of the signal sender
-        \i signals in classes with coincidentally-named on<Signal> properties
-    \endlist
-
-    When any of these are needed, the Connection object can be used instead.
-
-    For example, the above code can be changed to use a Connection object,
-    like this:
-
-    \qml
-    MouseArea {
-        Connection {
-            signal: "clicked(x,y)"
-            script: { foo(x+123,y+456) }
-        }
-    }
-    \endqml
-
-    More generally, the Connection object can be a child of some other object than
-    the sender of the signal, and the script is the default attribute:
-
-    \qml
-    MouseArea {
-        id: mr
-    }
-    ...
-    Connection {
-        sender: mr
-        signal: "clicked(x,y)"
-        script: { foo(x+123,y+456) }
-    }
-    \endqml
-*/
-
-/*!
-    \internal
-    \class QmlConnection
-    \brief The QmlConnection class describes generalized connections to signals.
-
-*/
-QmlConnection::QmlConnection(QObject *parent) :
-    QObject(*(new QmlConnectionPrivate), parent)
-{
-}
-
-QmlConnection::~QmlConnection()
-{
-    Q_D(QmlConnection);
-    delete d->boundsignal;
-}
-
-/*!
-    \qmlproperty Object Connection::sender
-    This property holds the object that sends the signal.
-
-    By default, the sender is assumed to be the parent of the Connection.
-*/
-QObject *QmlConnection::signalSender() const
-{
-    Q_D(const QmlConnection);
-    return d->signalSender ? d->signalSender : parent();
-}
-
-void QmlConnection::setSignalSender(QObject *obj)
-{
-    Q_D(QmlConnection);
-    if (d->signalSender == obj)
-        return;
-    disconnectIfValid();
-    d->signalSender = obj;
-    connectIfValid();
-}
-
-void QmlConnection::connectIfValid()
-{
-    Q_D(QmlConnection);
-    if (!d->componentcomplete)
-        return;
-    // boundsignal must not exist
-    if ((d->signalSender || parent()) && !d->signal.isEmpty() && d->scriptset) {
-        // create
-        // XXX scope?
-        int sigIdx = -1;
-        int lparen = d->signal.indexOf(QLatin1Char('('));
-        QList<QByteArray> sigparams;
-        if (lparen >= 0 && d->signal.length() > lparen+2) {
-            QStringList l = d->signal.mid(lparen+1,d->signal.length()-lparen-2).split(QLatin1Char(','));
-            foreach (const QString &s, l) {
-                sigparams.append(s.trimmed().toUtf8());
-            }
-        }
-        QString signalname = d->signal.left(lparen);
-        QObject *sender = d->signalSender ? d->signalSender : parent();
-        const QMetaObject *mo = sender->metaObject();
-        int methods = mo->methodCount();
-        for (int ii = 0; ii < methods; ++ii) {
-            QMetaMethod method = mo->method(ii);
-            QString methodName = QString::fromUtf8(method.signature());
-            int idx = methodName.indexOf(QLatin1Char('('));
-            methodName = methodName.left(idx);
-            if (methodName == signalname && (lparen<0 || method.parameterNames() == sigparams)) {
-                sigIdx = ii;
-                break;
-            }
-        }
-        if (sigIdx < 0) {
-            // Cannot usefully warn, since could be in middle of
-            // changing sender and signal.
-            // XXX need state change transactions to do better
-            return;
-        }
-
-        d->boundsignal = new QmlBoundSignal(qmlContext(this), d->script.script(), sender, mo->method(sigIdx), this);
-    }
-}
-
-void QmlConnection::disconnectIfValid()
-{
-    Q_D(QmlConnection);
-    if (!d->componentcomplete)
-        return;
-    if ((d->signalSender || parent()) && !d->signal.isEmpty() && d->scriptset) {
-        // boundsignal must exist
-        // destroy
-        delete d->boundsignal;
-        d->boundsignal = 0;
-    }
-}
-
-void QmlConnection::componentComplete()
-{
-    Q_D(QmlConnection);
-    d->componentcomplete=true;
-    connectIfValid();
-}
-
-
-/*!
-    \qmlproperty script Connection::script
-    This property holds the JavaScript executed whenever the signal is sent.
-
-    This is the default attribute of Connection.
-*/
-QmlScriptString QmlConnection::script() const
-{
-    Q_D(const QmlConnection);
-    return d->script;
-}
-
-void QmlConnection::setScript(const QmlScriptString& script)
-{
-    Q_D(QmlConnection);
-    if ((d->signalSender || parent()) && !d->signal.isEmpty()) {
-        if (!d->scriptset) {
-            // mustn't exist - create
-            d->scriptset = true;
-            d->script = script;
-            connectIfValid();
-        } else {
-            // must exist - update
-            d->script = script;
-            d->boundsignal->expression()->setExpression(script.script());
-        }
-    } else {
-        d->scriptset = true;
-        d->script = script;
-    }
-}
-
-/*!
-    \qmlproperty string Connection::signal
-    This property holds the signal from the sender to which the script is attached.
-
-    The signal's formal parameter names must be given in parentheses:
-
-    \qml
-Connection {
-    signal: "clicked(x,y)"
-    script: { ... }
-}
-    \endqml
-*/
-QString QmlConnection::signal() const
-{
-    Q_D(const QmlConnection);
-    return d->signal;
-}
-
-void QmlConnection::setSignal(const QString& sig)
-{
-    Q_D(QmlConnection);
-    if (d->signal == sig)
-        return;
-    disconnectIfValid();
-    d->signal =  sig;
-    connectIfValid();
-}
-
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlconnection_p.h b/src/declarative/util/qmlconnection_p.h
deleted file mode 100644
index 2106cb0..0000000
--- a/src/declarative/util/qmlconnection_p.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCONNECTION_H
-#define QMLCONNECTION_H
-
-#include <qml.h>
-#include <qmlscriptstring.h>
-
-#include <QtCore/qobject.h>
-#include <QtCore/qstring.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlBoundSignal;
-class QmlContext;
-class QmlConnectionPrivate;
-class Q_DECLARATIVE_EXPORT QmlConnection : public QObject, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlConnection)
-
-    Q_INTERFACES(QmlParserStatus)
-    Q_PROPERTY(QObject *sender READ signalSender WRITE setSignalSender)
-    Q_PROPERTY(QmlScriptString script READ script WRITE setScript)
-    Q_PROPERTY(QString signal READ signal WRITE setSignal)
-
-public:
-    QmlConnection(QObject *parent=0);
-    ~QmlConnection();
-
-    QObject *signalSender() const;
-    void setSignalSender(QObject *);
-    QmlScriptString script() const;
-    void setScript(const QmlScriptString&);
-    QString signal() const;
-    void setSignal(const QString&);
-
-private:
-    void disconnectIfValid();
-    void connectIfValid();
-    void componentComplete();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlConnection)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/util/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp
deleted file mode 100644
index 0188856..0000000
--- a/src/declarative/util/qmldatetimeformatter.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmldatetimeformatter_p.h"
-
-#include <QtCore/qlocale.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-//TODO: may need optimisation as the QDateTime member may not be needed?
-//      be able to set a locale?
-
-class QmlDateTimeFormatterPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlDateTimeFormatter)
-public:
-    QmlDateTimeFormatterPrivate() : locale(QLocale::system()), longStyle(false), componentComplete(true) {}
-
-    void updateText();
-
-    QDateTime dateTime;
-    QDate date;
-    QTime time;
-    QLocale locale;
-    QString dateTimeText;
-    QString dateText;
-    QString timeText;
-    QString dateTimeFormat; //set for convienience?
-    QString dateFormat;
-    QString timeFormat;
-    bool longStyle;
-    bool componentComplete;
-};
-
-/*!
-    \qmlclass DateTimeFormatter QmlDateTimeFormatter
-  \since 4.7
-    \brief The DateTimeFormatter allows you to control the format of a date string.
-
-    \code
-    DateTimeFormatter { id: formatter; date: System.date }
-    Text { text: formatter.dateText }
-    \endcode
-
-    By default, the text properties (dateText, timeText, and dateTimeText) will return the
-    date and time using the current system locale's format.
-*/
-
-/*!
-    \internal
-    \class QmlDateTimeFormatter
-    \ingroup group_utility
-    \brief The QmlDateTimeFormatter class allows you to format a date string.
-*/
-
-QmlDateTimeFormatter::QmlDateTimeFormatter(QObject *parent)
-: QObject(*(new QmlDateTimeFormatterPrivate), parent)
-{
-}
-
-QmlDateTimeFormatter::~QmlDateTimeFormatter()
-{
-}
-
-/*!
-    \qmlproperty string DateTimeFormatter::dateText
-    \qmlproperty string DateTimeFormatter::timeText
-    \qmlproperty string DateTimeFormatter::dateTimeText
-
-    Formatted text representations of the \c date, \c time,
-    and \c {date and time}, respectively.
-
-    If there is no explictly specified format the DateTimeFormatter
-    will use the system locale's default 'short' setting.
-
-    \code
-    // specify source date (assuming today is February 19, 2009)
-    DateTimeFormatter { id: formatter; dateTime: Today.date }
-
-    // display the full date and time
-    Text { text: formatter.dateText }
-    \endcode
-
-    Would be equivalent to the following for a US English locale:
-
-    \code
-    // display the date
-    Text { text: "2/19/09" }
-    \endcode
-*/
-QString QmlDateTimeFormatter::dateTimeText() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->dateTimeText;
-}
-
-QString QmlDateTimeFormatter::dateText() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->dateText;
-}
-
-QString QmlDateTimeFormatter::timeText() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->timeText;
-}
-
-/*!
-    \qmlproperty date DateTimeFormatter::date
-    \qmlproperty time DateTimeFormatter::time
-    \qmlproperty datetime DateTimeFormatter::dateTime
-
-    The source date and time to be used by the formatter.
-
-    \code
-    // setting the date and time
-    DateTimeFormatter { date: System.date; time: System.time }
-    \endcode
-
-    For convienience it is possible to set the datetime property to set both the date and the time.
-    \code
-    // setting the datetime
-    DateTimeFormatter { dateTime: System.dateTime }
-    \endcode
-
-    There can only be one instance of date and time per formatter; if date, time, and dateTime are all
-    set the actual date and time used is not guaranteed.
-
-    \note If no date is set, dateTimeText will be just the date;
-    If no time is set, the dateTimeText will be just the time.
-    
-*/
-QDate QmlDateTimeFormatter::date() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->date;
-}
-
-QTime QmlDateTimeFormatter::time() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->time;
-}
-
-QDateTime QmlDateTimeFormatter::dateTime() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->dateTime;
-}
-
-/*!
-    \qmlproperty string DateTimeFormatter::dateFormat
-    \qmlproperty string DateTimeFormatter::timeFormat
-    \qmlproperty string DateTimeFormatter::dateTimeFormat
-
-    Specifies a custom format which the DateTime Formatter can use.
-
-    If there is no explictly specified format the DateTimeFormatter
-    will use the system locale's default 'short' setting.
-
-    The text's format may be modified by setting:
-    \list
-    \i \c dateFormat
-    \i \c timeFormat
-    \i \c dateTimeFormat
-    \endlist
-
-    If only the format for date is defined, the time and dateTime formats will be defined
-    as the system locale default and likewise for the others.
-
-    Syntax for the format is based on the QDateTime::toString() formatting options.
-
-    \code
-    // Format the date such that the dateText is: '1997-12-12'
-    DateTimeFormatter { id: formatter; dateTime: Today.dateTime; formatDate: "yyyy-MM-d" }
-    \endcode
-
-    Assigning an empty string to a particular format will reset it.
-*/
-QString QmlDateTimeFormatter::dateTimeFormat() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->dateTimeFormat;
-}
-
-QString QmlDateTimeFormatter::dateFormat() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->dateFormat;
-}
-
-QString QmlDateTimeFormatter::timeFormat() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->timeFormat;
-}
-
-/*!
-    \qmlproperty bool DateTimeFormatter::longStyle
-
-    This property causes the formatter to use the system locale's long format rather than short format
-    by default.
-
-    This setting is off by default.
-*/
-bool QmlDateTimeFormatter::longStyle() const
-{
-    Q_D(const QmlDateTimeFormatter);
-    return d->longStyle;
-}
-
-void QmlDateTimeFormatter::setDateTime(const QDateTime &dateTime)
-{
-    Q_D(QmlDateTimeFormatter);
-    if (d->dateTime == dateTime)
-        return;
-    d->dateTime = dateTime;
-    d->date = d->dateTime.date();
-    d->time = d->dateTime.time();
-    d->updateText();
-}
-
-void QmlDateTimeFormatter::setTime(const QTime &time)
-{
-    Q_D(QmlDateTimeFormatter);
-    if (d->dateTime.time() == time)
-        return;
-    d->time = time;
-    d->dateTime.setTime(time);
-    d->updateText();
-}
-
-void QmlDateTimeFormatter::setDate(const QDate &date)
-{
-    Q_D(QmlDateTimeFormatter);
-    if (d->dateTime.date() == date)
-        return;
-    d->date = date;
-    bool clearTime = d->dateTime.time().isValid() ? false : true;   //because setting date generates default time
-    d->dateTime.setDate(date);
-    if (clearTime)
-        d->dateTime.setTime(QTime());
-    d->updateText();
-}
-
-//DateTime formatting may be a combination of date and time?
-void QmlDateTimeFormatter::setDateTimeFormat(const QString &format)
-{
-    Q_D(QmlDateTimeFormatter);
-    //no format checking
-    d->dateTimeFormat = format;
-    d->updateText();
-}
-
-void QmlDateTimeFormatter::setDateFormat(const QString &format)
-{
-    Q_D(QmlDateTimeFormatter);
-    //no format checking
-    d->dateFormat = format;
-    d->updateText();
-}
-
-void QmlDateTimeFormatter::setTimeFormat(const QString &format)
-{
-    Q_D(QmlDateTimeFormatter);
-    //no format checking
-    d->timeFormat = format;
-    d->updateText();
-}
-
-void QmlDateTimeFormatter::setLongStyle(bool longStyle)
-{
-    Q_D(QmlDateTimeFormatter);
-    d->longStyle = longStyle;
-    d->updateText();
-}
-
-void QmlDateTimeFormatterPrivate::updateText()
-{
-    Q_Q(QmlDateTimeFormatter);
-    if (!componentComplete)
-        return;
-
-    QString str;
-    QString str1;
-    QString str2;
-
-    Qt::DateFormat defaultFormat = longStyle ? Qt::SystemLocaleLongDate : Qt::SystemLocaleShortDate;
-
-    if (dateFormat.isEmpty())
-        str1 = date.toString(defaultFormat);
-    else
-        str1 = date.toString(dateFormat);
-
-    if (timeFormat.isEmpty())
-        str2 = time.toString(defaultFormat);
-    else
-        str2 = time.toString(timeFormat);
-
-    if (dateTimeFormat.isEmpty())
-        str = dateTime.toString(defaultFormat);
-    //else if (!formatTime.isEmpty() && !formatDate.isEmpty())
-    //    str = str1 + QLatin1Char(' ') + str2;
-    else
-        str = dateTime.toString(dateTimeFormat);
-
-    if (dateTimeText == str && dateText == str1 && timeText == str2)
-        return;
-
-    dateTimeText = str;
-    dateText = str1;
-    timeText = str2;
-
-    emit q->textChanged();
-}
-
-void QmlDateTimeFormatter::classBegin()
-{
-    Q_D(QmlDateTimeFormatter);
-    d->componentComplete = false;
-}
-
-void QmlDateTimeFormatter::componentComplete()
-{
-    Q_D(QmlDateTimeFormatter);
-    d->componentComplete = true;
-    d->updateText();
-}
-
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmldatetimeformatter_p.h b/src/declarative/util/qmldatetimeformatter_p.h
deleted file mode 100644
index 2cd80b9..0000000
--- a/src/declarative/util/qmldatetimeformatter_p.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLDATETIMEFORMATTER_H
-#define QMLDATETIMEFORMATTER_H
-
-#include <qml.h>
-
-#include <QtCore/qdatetime.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlDateTimeFormatterPrivate;
-class Q_DECLARATIVE_EXPORT QmlDateTimeFormatter : public QObject, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlParserStatus)
-
-    Q_PROPERTY(QString dateText READ dateText NOTIFY textChanged)
-    Q_PROPERTY(QString timeText READ timeText NOTIFY textChanged)
-    Q_PROPERTY(QString dateTimeText READ dateTimeText NOTIFY textChanged)
-    Q_PROPERTY(QDate date READ date WRITE setDate)
-    Q_PROPERTY(QTime time READ time WRITE setTime)
-    Q_PROPERTY(QDateTime dateTime READ dateTime WRITE setDateTime)
-    Q_PROPERTY(QString dateFormat READ dateFormat WRITE setDateFormat)
-    Q_PROPERTY(QString timeFormat READ timeFormat WRITE setTimeFormat)
-    Q_PROPERTY(QString dateTimeFormat READ dateTimeFormat WRITE setDateTimeFormat)
-    Q_PROPERTY(bool longStyle READ longStyle WRITE setLongStyle)
-public:
-    QmlDateTimeFormatter(QObject *parent=0);
-    ~QmlDateTimeFormatter();
-
-    QString dateTimeText() const;
-    QString dateText() const;
-    QString timeText() const;
-
-    QDate date() const;
-    void setDate(const QDate &);
-
-    QTime time() const;
-    void setTime(const QTime &);
-
-    QDateTime dateTime() const;
-    void setDateTime(const QDateTime &);
-
-    QString dateTimeFormat() const;
-    void setDateTimeFormat(const QString &);
-
-    QString dateFormat() const;
-    void setDateFormat(const QString &);
-
-    QString timeFormat() const;
-    void setTimeFormat(const QString &);
-
-    bool longStyle() const;
-    void setLongStyle(bool);
-
-    virtual void classBegin();
-    virtual void componentComplete();
-
-Q_SIGNALS:
-    void textChanged();
-
-private:
-    Q_DISABLE_COPY(QmlDateTimeFormatter)
-    Q_DECLARE_PRIVATE(QmlDateTimeFormatter)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlDateTimeFormatter)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp
deleted file mode 100644
index 6694678..0000000
--- a/src/declarative/util/qmleasefollow.cpp
+++ /dev/null
@@ -1,536 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmleasefollow_p.h"
-
-#include "qmlanimation_p_p.h"
-
-#include <qmlmetaproperty.h>
-
-#include <QtCore/qdebug.h>
-
-#include <math.h>
-
-QT_BEGIN_NAMESPACE
-
-
-
-class QmlEaseFollowPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlEaseFollow)
-public:
-    QmlEaseFollowPrivate()
-        : source(0), velocity(200), duration(-1), maximumEasingTime(-1),
-          reversingMode(QmlEaseFollow::Eased), initialVelocity(0), 
-          initialValue(0), invert(false), enabled(true), trackVelocity(0), clockOffset(0),
-          lastTick(0), clock(this)
-    {} 
-
-    qreal source;
-    qreal velocity;
-    qreal duration;
-    qreal maximumEasingTime;
-    QmlEaseFollow::ReversingMode reversingMode;
-
-    qreal initialVelocity;
-    qreal initialValue;
-    bool invert;
-    bool enabled;
-
-    qreal trackVelocity;
-
-    QmlMetaProperty target;
-
-    int clockOffset;
-    int lastTick;
-    void tick(int);
-    void clockStart();
-    void clockStop();
-    QTickAnimationProxy<QmlEaseFollowPrivate, &QmlEaseFollowPrivate::tick> clock;
-
-    void restart();
-
-    // Parameters for use in tick()
-    qreal a;  // Acceleration
-    qreal d;  // Deceleration
-    qreal tf; // Total time
-    qreal tp; // Time at which peak velocity occurs
-    qreal td; // Time at which decelleration begins
-    qreal vp; // Velocity at tp
-    qreal sp; // Displacement at tp
-    qreal sd; // Displacement at td
-    qreal vi; // "Normalized" initialvelocity
-    bool recalc();
-};
-
-bool QmlEaseFollowPrivate::recalc()
-{
-    qreal s = source - initialValue;
-    vi = initialVelocity;
-
-    s = (invert?-1.0:1.0) * s;
-    vi = (invert?-1.0:1.0) * vi;
-
-    if (duration > 0 && velocity > 0) {
-        tf = s / velocity;
-        if (tf > (duration / 1000.)) tf = (duration / 1000.);
-    } else if (duration > 0) {
-        tf = duration / 1000.;
-    } else if (velocity > 0) {
-        tf = s / velocity;
-    } else {
-        return false;
-    }
-
-    if (maximumEasingTime == 0) {
-        a = 0;
-        d = 0;
-        tp = 0;
-        td = tf;
-        vp = velocity;
-        sp = 0;
-        sd = s;
-    } else if (maximumEasingTime != -1 && tf > (maximumEasingTime / 1000.)) {
-
-        qreal met = maximumEasingTime / 1000.;
-        td = tf - met;
-
-        qreal c1 = td;
-        qreal c2 = (tf - td) * vi - tf * velocity;
-        qreal c3 = -0.5 * (tf - td) * vi * vi;
-
-        qreal vp1 = (-c2 + sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
-        // qreal vp2 = (-c2 - sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
-
-        vp = vp1;
-        a = vp / met;
-        d = a;
-        tp = (vp - vi) / a;
-        sp = vi * tp + 0.5 * a * tp * tp;
-        sd = sp + (td - tp) * vp;
-    } else {
-
-        qreal c1 = 0.25 * tf * tf;
-        qreal c2 = 0.5 * vi * tf - s;
-        qreal c3 = -0.25 * vi * vi;
-
-        qreal a1 = (-c2 + sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
-        //qreal a2 = (-c2 - sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
-
-        qreal tp1 = 0.5 * tf - 0.5 * vi / a1;
-        //qreal tp2 = 0.5 * tf - 0.5 * vi / a2;
-        qreal vp1 = a1 * tp1 + vi;
-        //qreal vp2 = a2 * tp2 + vi;
-
-        qreal sp1 = 0.5 * a1 * tp1 * tp1 + vi * tp1;
-        //qreal sp2 = 0.5 * a2 * tp2 * tp2 + vi * tp2;
-
-        a = a1;
-        d = a1;
-        tp = tp1;
-        td = tp1;
-        vp = vp1;
-        sp = sp1;
-        sd = sp1;
-    }
-
-    /*
-    qWarning() << "a:" << a << "tf:" << tf << "tp:" << tp << "vp:" 
-               << vp << "sp:" << sp << "vi:" << vi << "invert:" << invert;
-    */
-    return true;
-}
-
-void QmlEaseFollowPrivate::clockStart()
-{
-    if (clock.state() == QAbstractAnimation::Running) {
-        clockOffset = lastTick;
-        return;
-    } else {
-        clockOffset = 0;
-        lastTick = 0;
-        clock.start();
-    }
-}
-
-void QmlEaseFollowPrivate::clockStop()
-{
-    clockOffset = 0;
-    lastTick = 0;
-    clock.stop();
-}
-
-void QmlEaseFollowPrivate::tick(int t)
-{
-    lastTick = t;
-    t -= clockOffset;
-
-    qreal time_seconds = qreal(t) / 1000.;
-
-    qreal out = 0;
-    if (time_seconds < tp) {
-
-        trackVelocity = vi + time_seconds * a;
-        trackVelocity = (invert?-1.0:1.0) * trackVelocity;
-
-        qreal value = 0.5 * a * time_seconds * time_seconds + vi * time_seconds;
-        value = (invert?-1.0:1.0) * value;
-        target.write(initialValue + value);
-        out = initialValue + value;
-    } else if (time_seconds < td) {
-
-        time_seconds -= tp;
-        trackVelocity = (invert?-1.0:1.0) * vp;
-        qreal value = sp + time_seconds * vp;
-        value = (invert?-1.0:1.0) * value;
-
-        target.write(initialValue + value);
-
-        out = initialValue + value;
-    } else if (time_seconds < tf) {
-
-        time_seconds -= td;
-
-        trackVelocity = vp - time_seconds * a;
-        trackVelocity = (invert?-1.0:1.0) * trackVelocity;
-
-        qreal value = sd - 0.5 * d * time_seconds * time_seconds + vp * time_seconds;
-        value = (invert?-1.0:1.0) * value;
-
-        target.write(initialValue + value);
-
-        out = initialValue + value;
-    } else {
-
-        clock.stop();
-
-        trackVelocity = 0;
-        target.write(source);
-    }
-
-    //qWarning() << out << trackVelocity << t << a;
-}
-
-/*!
-    \qmlclass EaseFollow QmlEaseFollow
-    \brief The EaseFollow element allows a property to smoothly track a value.
-
-    The EaseFollow smoothly animates a property's value to a set target value 
-    using an ease in/out quad easing curve.  If the target value changes while
-    the animation is in progress, the easing curves used to animate to the old 
-    and the new target values are spliced together to avoid any obvious visual
-    glitches.
-
-    The property animation is configured by setting the velocity at which the
-    animation should occur, or the duration that the animation should take.  
-    If both a velocity and a duration are specified, the one that results in
-    the quickest animation is chosen for each change in the target value.
-
-    For example, animating from 0 to 800 will take 4 seconds if a velocity
-    of 200 is set, will take 8 seconds with a duration of 8000 set, and will 
-    take 4 seconds with both a velocity of 200 and a duration of 8000 set.
-    Animating from 0 to 20000 will take 10 seconds if a velocity of 200 is set,
-    will take 8 seconds with a duration of 8000 set, and will take 8 seconds
-    with both a velocity of 200 and a duration of 8000 set.
-
-    The follow example shows one rectangle tracking the position of another.
-\code
-import Qt 4.6
-
-Rectangle {
-    width: 800; height: 600; color: "blue"
-
-    Rectangle {
-        color: "green"
-        width: 60; height: 60;
-        x: -5; y: -5;
-        x: EaseFollow { source: rect1.x - 5; velocity: 200 }
-        y: EaseFollow { source: rect1.y - 5; velocity: 200 }
-    }
-
-    Rectangle {
-        id: rect1
-        color: "red"
-        width: 50; height: 50;
-    }
-
-    focus: true
-    Keys.onRightPressed: rect1.x = rect1.x + 100
-    Keys.onLeftPressed: rect1.x = rect1.x - 100
-    Keys.onUpPressed: rect1.y = rect1.y - 100
-    Keys.onDownPressed: rect1.y = rect1.y + 100
-}
-\endcode
-
-    The default velocity of EaseFollow is 200 units/second.  Note that if the range of the
-    value being animated is small, then the velocity will need to be adjusted
-    appropriately.  For example, the opacity of an item ranges from 0 - 1.0.
-    To enable a smooth animation in this range the velocity will need to be
-    set to a value such as 0.5 units/second.  Animating from 0 to 1.0 with a velocity
-    of 0.5 will take 2000 ms to complete.
-
-    \sa SpringFollow
-*/
-
-QmlEaseFollow::QmlEaseFollow(QObject *parent)
-: QObject(*(new QmlEaseFollowPrivate), parent)
-{
-}
-
-QmlEaseFollow::~QmlEaseFollow()
-{
-}
-
-/*!
-    \qmlproperty qreal EaseFollow::source
-    This property holds the source value which will be tracked.
-
-    Bind to a property in order to track its changes.
-*/
-qreal QmlEaseFollow::sourceValue() const
-{
-    Q_D(const QmlEaseFollow);
-    return d->source;
-}
-
-/*!
-    \qmlproperty enumeration EaseFollow::reversingMode
-
-    Sets how the EaseFollow behaves if an animation direction is reversed.
-
-    If reversing mode is \c Eased, the animation will smoothly decelerate, and
-    then reverse direction.  If the reversing mode is \c Immediate, the 
-    animation will immediately begin accelerating in the reverse direction, 
-    begining with a velocity of 0.  If the reversing mode is \c Sync, the
-    property is immediately set to the target value.
-*/
-QmlEaseFollow::ReversingMode QmlEaseFollow::reversingMode() const
-{
-    Q_D(const QmlEaseFollow);
-    return d->reversingMode;
-}
-
-void QmlEaseFollow::setReversingMode(ReversingMode m)
-{
-    Q_D(QmlEaseFollow);
-    if (d->reversingMode == m)
-        return;
-
-    d->reversingMode = m;
-    emit reversingModeChanged();
-}
-
-void QmlEaseFollowPrivate::restart()
-{
-    if (!enabled || velocity == 0) {
-        clockStop();
-        return;
-    }
-
-    initialValue = target.read().toReal();
-
-    if (source == initialValue) {
-        clockStop();
-        return;
-    }
-
-    bool hasReversed = trackVelocity != 0. && 
-                      ((trackVelocity > 0) == ((initialValue - source) > 0));
-
-    if (hasReversed) {
-        switch (reversingMode) {
-            default:
-            case QmlEaseFollow::Eased:
-                break;
-            case QmlEaseFollow::Sync:
-                target.write(source);
-                return;
-            case QmlEaseFollow::Immediate:
-                initialVelocity = 0;
-                clockStop();
-                break;
-        }
-    }
-
-    trackVelocity = initialVelocity;
-
-    invert = (source < initialValue);
-
-    if (!recalc()) {
-        target.write(source);
-        clockStop();
-        return;
-    }
-
-    clockStart();
-}
-
-void QmlEaseFollow::setSourceValue(qreal s)
-{
-    Q_D(QmlEaseFollow);
-
-    if (d->clock.state() == QAbstractAnimation::Running && d->source == s)
-        return;
-
-    d->source = s;
-    d->initialVelocity = d->trackVelocity;
-    d->restart();
-
-    emit sourceChanged();
-}
-
-/*!
-    \qmlproperty qreal EaseFollow::duration
-
-    This property holds the animation duration used when tracking the source.
-
-    Setting this to -1 (the default) disables the duration value.
-*/
-qreal QmlEaseFollow::duration() const
-{
-    Q_D(const QmlEaseFollow);
-    return d->duration;
-}
-
-void QmlEaseFollow::setDuration(qreal v)
-{
-    Q_D(QmlEaseFollow);
-    if (d->duration == v)
-        return;
-
-    d->duration = v;
-    d->trackVelocity = 0;
-
-    if (d->clock.state() == QAbstractAnimation::Running) 
-        d->restart();
-
-    emit durationChanged();
-}
-
-qreal QmlEaseFollow::velocity() const
-{
-    Q_D(const QmlEaseFollow);
-    return d->velocity;
-}
-
-/*!
-    \qmlproperty qreal EaseFollow::velocity
-
-    This property holds the average velocity allowed when tracking the source.
-
-    The default velocity of EaseFollow is 200 units/second.
-
-    Setting this to -1 disables the velocity value.
-*/
-void QmlEaseFollow::setVelocity(qreal v)
-{
-    Q_D(QmlEaseFollow);
-    if (d->velocity == v)
-        return;
-
-    d->velocity = v;
-    d->trackVelocity = 0;
-
-    if (d->clock.state() == QAbstractAnimation::Running) 
-        d->restart();
-
-    emit velocityChanged();
-}
-
-/*!
-    \qmlproperty bool EaseFollow::enabled
-    This property holds whether the target will track the source.
-*/
-bool QmlEaseFollow::enabled() const
-{
-    Q_D(const QmlEaseFollow);
-    return d->enabled;
-}
-
-void QmlEaseFollow::setEnabled(bool enabled)
-{
-    Q_D(QmlEaseFollow);
-    if (d->enabled == enabled)
-        return;
-
-    d->enabled = enabled;
-    if (enabled)
-        d->restart();
-    else
-        d->clockStop();
-
-    emit enabledChanged();
-}
-
-void QmlEaseFollow::setTarget(const QmlMetaProperty &t)
-{
-    Q_D(QmlEaseFollow);
-    d->target = t;
-}
-
-/*!
-\qmlproperty qreal EaseFollow::maximumEasingTime
-
-This property specifies the maximum time an "eases" during the follow should take.
-Setting this property causes the velocity to "level out" after at a time.  Setting 
-a negative value reverts to the normal mode of easing over the entire animation 
-duration.
-
-The default value is -1.
-*/
-qreal QmlEaseFollow::maximumEasingTime() const
-{
-    Q_D(const QmlEaseFollow);
-    return d->maximumEasingTime;
-}
-
-void QmlEaseFollow::setMaximumEasingTime(qreal v)
-{
-    Q_D(QmlEaseFollow);
-    d->maximumEasingTime = v;
-
-    if (d->clock.state() == QAbstractAnimation::Running) 
-        d->restart();
-
-    emit maximumEasingTimeChanged();
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmleasefollow_p.h b/src/declarative/util/qmleasefollow_p.h
deleted file mode 100644
index dddf54f..0000000
--- a/src/declarative/util/qmleasefollow_p.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLEASEFOLLOW_H
-#define QMLEASEFOLLOW_H
-
-#include <qml.h>
-#include <qmlpropertyvaluesource.h>
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlMetaProperty;
-class QmlEaseFollowPrivate;
-class Q_DECLARATIVE_EXPORT QmlEaseFollow : public QObject, 
-                                           public QmlPropertyValueSource
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlEaseFollow)
-    Q_INTERFACES(QmlPropertyValueSource)
-    Q_ENUMS(ReversingMode)
-
-    Q_PROPERTY(qreal source READ sourceValue WRITE setSourceValue NOTIFY sourceChanged)
-    Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity NOTIFY velocityChanged)
-    Q_PROPERTY(qreal duration READ duration WRITE setDuration NOTIFY durationChanged)
-    Q_PROPERTY(ReversingMode reversingMode READ reversingMode WRITE setReversingMode NOTIFY reversingModeChanged)
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_PROPERTY(qreal maximumEasingTime READ maximumEasingTime WRITE setMaximumEasingTime NOTIFY maximumEasingTimeChanged)
-
-public:
-    enum ReversingMode { Eased, Immediate, Sync };
-
-    QmlEaseFollow(QObject *parent = 0);
-    ~QmlEaseFollow();
-
-    ReversingMode reversingMode() const;
-    void setReversingMode(ReversingMode);
-
-    qreal sourceValue() const;
-    void setSourceValue(qreal);
-
-    qreal velocity() const;
-    void setVelocity(qreal);
-
-    qreal duration() const;
-    void setDuration(qreal);
-
-    bool enabled() const;
-    void setEnabled(bool enabled);
-
-    qreal maximumEasingTime() const;
-    void setMaximumEasingTime(qreal);
-
-    virtual void setTarget(const QmlMetaProperty &);
-
-Q_SIGNALS:
-    void sourceChanged();
-    void velocityChanged();
-    void durationChanged();
-    void reversingModeChanged();
-    void enabledChanged();
-    void maximumEasingTimeChanged();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlEaseFollow);
-
-QT_END_HEADER
-
-#endif // QMLEASEFOLLOW_H
diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
deleted file mode 100644
index 558c125..0000000
--- a/src/declarative/util/qmlfontloader.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlfontloader_p.h"
-
-#include <qmlcontext.h>
-#include <qmlengine.h>
-
-#include <QUrl>
-#include <QDebug>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QFile>
-#include <QFontDatabase>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlFontLoaderPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlFontLoader)
-
-public:
-    QmlFontLoaderPrivate() : reply(0), status(QmlFontLoader::Null) {}
-
-    void addFontToDatabase(const QByteArray &);
-
-    QUrl url;
-    QString name;
-    QNetworkReply *reply;
-    QmlFontLoader::Status status;
-};
-
-
-
-/*!
-    \qmlclass FontLoader QmlFontLoader
-    \ingroup group_utility
-    \brief This item allows using fonts by name or url.
-
-    Example:
-    \qml
-    FontLoader { id: fixedFont; name: "Courier" }
-    FontLoader { id: webFont; source: "http://www.mysite.com/myfont.ttf" }
-
-    Text { text: "Fixed-size font"; font.family: fixedFont.name }
-    Text { text: "Fancy font"; font.family: webFont.name }
-    \endqml
-*/
-QmlFontLoader::QmlFontLoader(QObject *parent)
-    : QObject(*(new QmlFontLoaderPrivate), parent)
-{
-}
-
-QmlFontLoader::~QmlFontLoader()
-{
-}
-
-static QString toLocalFileOrQrc(const QUrl& url)
-{
-    QString r = url.toLocalFile();
-    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
-        r = QLatin1Char(':') + url.path();
-    return r;
-}
-
-
-/*!
-    \qmlproperty url FontLoader::source
-    The url of the font to load.
-*/
-QUrl QmlFontLoader::source() const
-{
-    Q_D(const QmlFontLoader);
-    return d->url;
-}
-
-void QmlFontLoader::setSource(const QUrl &url)
-{
-    Q_D(QmlFontLoader);
-    if (url == d->url)
-        return;
-    d->url = qmlContext(this)->resolvedUrl(url);
-
-    d->status = Loading;
-    emit statusChanged();
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
-    QString lf = toLocalFileOrQrc(d->url);
-    if (!lf.isEmpty()) {
-        int id = QFontDatabase::addApplicationFont(lf);
-        if (id != -1) {
-            d->name = QFontDatabase::applicationFontFamilies(id).at(0);
-            emit nameChanged();
-            d->status = QmlFontLoader::Ready;
-        } else {
-            d->status = QmlFontLoader::Error;
-            qWarning() << "Cannot load font:" << url;
-        }
-        emit statusChanged();
-    } else
-#endif
-    {
-        QNetworkRequest req(d->url);
-        req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
-        d->reply = qmlEngine(this)->networkAccessManager()->get(req);
-        QObject::connect(d->reply, SIGNAL(finished()), this, SLOT(replyFinished()));
-    }
-}
-
-/*!
-    \qmlproperty string FontLoader::name
-
-    This property holds the name of the font family.
-    It is set automatically when a font is loaded using the \c url property.
-
-    Use this to set the \c font.family property of a \c Text item.
-
-    Example:
-    \qml
-    FontLoader { id: webFont; source: "http://www.mysite.com/myfont.ttf" }
-    Text { text: "Fancy font"; font.family: webFont.name }
-    \endqml
-*/
-QString QmlFontLoader::name() const
-{
-    Q_D(const QmlFontLoader);
-    return d->name;
-}
-
-void QmlFontLoader::setName(const QString &name)
-{
-    Q_D(QmlFontLoader);
-    if (d->name == name )
-        return;
-    d->name = name;
-    emit nameChanged();
-    d->status = Ready;
-    emit statusChanged();
-}
-
-/*!
-    \qmlproperty enum FontLoader::status
-
-    This property holds the status of font loading.  It can be one of:
-    \list
-    \o Null - no font has been set
-    \o Ready - the font has been loaded
-    \o Loading - the font is currently being loaded
-    \o Error - an error occurred while loading the font
-    \endlist
-*/
-QmlFontLoader::Status QmlFontLoader::status() const
-{
-    Q_D(const QmlFontLoader);
-    return d->status;
-}
-
-void QmlFontLoader::replyFinished()
-{
-    Q_D(QmlFontLoader);
-    if (d->reply) {
-        if (!d->reply->error()) {
-            QByteArray ba = d->reply->readAll();
-            d->addFontToDatabase(ba);
-        } else {
-            d->status = Error;
-            emit statusChanged();
-        }
-        d->reply->deleteLater();
-        d->reply = 0;
-    }
-}
-
-void QmlFontLoaderPrivate::addFontToDatabase(const QByteArray &ba)
-{
-    Q_Q(QmlFontLoader);
-
-    int id = QFontDatabase::addApplicationFontFromData(ba);
-    if (id != -1) {
-        name = QFontDatabase::applicationFontFamilies(id).at(0);
-        emit q->nameChanged();
-        status = QmlFontLoader::Ready;
-    } else {
-        status = QmlFontLoader::Error;
-        qWarning() << "Cannot load font:" << url;
-    }
-    emit q->statusChanged();
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlfontloader_p.h b/src/declarative/util/qmlfontloader_p.h
deleted file mode 100644
index 3d27452..0000000
--- a/src/declarative/util/qmlfontloader_p.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLFONTLOADER_H
-#define QMLFONTLOADER_H
-
-#include <qml.h>
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlFontLoaderPrivate;
-class Q_DECLARATIVE_EXPORT QmlFontLoader : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlFontLoader)
-    Q_ENUMS(Status)
-
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-
-public:
-    enum Status { Null = 0, Ready, Loading, Error };
-
-    QmlFontLoader(QObject *parent = 0);
-    ~QmlFontLoader();
-
-    QUrl source() const;
-    void setSource(const QUrl &url);
-
-    QString name() const;
-    void setName(const QString &name);
-
-    Status status() const;
-
-private Q_SLOTS:
-    void replyFinished();
-
-Q_SIGNALS:
-    void nameChanged();
-    void statusChanged();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlFontLoader)
-
-QT_END_HEADER
-
-#endif // QMLFONTLOADER_H
-
diff --git a/src/declarative/util/qmlgraphicsutilmodule.cpp b/src/declarative/util/qmlgraphicsutilmodule.cpp
deleted file mode 100644
index 13323be..0000000
--- a/src/declarative/util/qmlgraphicsutilmodule.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsutilmodule_p.h"
-#include "qfxperf_p_p.h"
-#include "qmlanimation_p.h"
-#include "qmlanimation_p_p.h"
-#include "qmlbehavior_p.h"
-#include "qmlbind_p.h"
-#include "qmlconnection_p.h"
-#include "qmldatetimeformatter_p.h"
-#include "qmleasefollow_p.h"
-#include "qmlfontloader_p.h"
-#include "qmllistaccessor_p.h"
-#include "qmllistmodel_p.h"
-#include "qmlnullablevalue_p_p.h"
-#include "qmlnumberformatter_p.h"
-#include "qmlopenmetaobject_p.h"
-#include "qmlpackage_p.h"
-#include "qmlpixmapcache_p.h"
-#include "qmlpropertychanges_p.h"
-#include "qmlpropertymap.h"
-#include "qmlspringfollow_p.h"
-#include "qmlstategroup_p.h"
-#include "qmlstateoperations_p.h"
-#include "qmlstate_p.h"
-#include "qmlstate_p_p.h"
-#include "qmlstyledtext_p.h"
-#include "qmlsystempalette_p.h"
-#include "qmltimeline_p_p.h"
-#include "qmltimer_p.h"
-#include "qmltransitionmanager_p_p.h"
-#include "qmltransition_p.h"
-#include "qmlview.h"
-#include "qmlxmllistmodel_p.h"
-#include "qnumberformat_p.h"
-#include "qperformancelog_p_p.h"
-
-void QmlGraphicsUtilModule::defineModule()
-{
-    QML_REGISTER_TYPE(Qt,4,6,AnchorChanges,QmlAnchorChanges);
-    QML_REGISTER_TYPE(Qt,4,6,Behavior,QmlBehavior);
-    QML_REGISTER_TYPE(Qt,4,6,Binding,QmlBind);
-    QML_REGISTER_TYPE(Qt,4,6,ColorAnimation,QmlColorAnimation);
-    QML_REGISTER_TYPE(Qt,4,6,Connection,QmlConnection);
-    QML_REGISTER_TYPE(Qt,4,6,DateTimeFormatter,QmlDateTimeFormatter);
-    QML_REGISTER_TYPE(Qt,4,6,EaseFollow,QmlEaseFollow);;
-    QML_REGISTER_TYPE(Qt,4,6,FontLoader,QmlFontLoader);
-    QML_REGISTER_TYPE(Qt,4,6,ListElement,QmlListElement);
-    QML_REGISTER_TYPE(Qt,4,6,NumberAnimation,QmlNumberAnimation);
-    QML_REGISTER_TYPE(Qt,4,6,NumberFormatter,QmlNumberFormatter);;
-    QML_REGISTER_TYPE(Qt,4,6,Package,QmlPackage);
-    QML_REGISTER_TYPE(Qt,4,6,ParallelAnimation,QmlParallelAnimation);
-    QML_REGISTER_TYPE(Qt,4,6,ParentAction,QmlParentAction);
-    QML_REGISTER_TYPE(Qt,4,6,ParentChange,QmlParentChange);
-    QML_REGISTER_TYPE(Qt,4,6,PauseAnimation,QmlPauseAnimation);
-    QML_REGISTER_TYPE(Qt,4,6,PropertyAction,QmlPropertyAction);
-    QML_REGISTER_TYPE(Qt,4,6,PropertyAnimation,QmlPropertyAnimation);
-    QML_REGISTER_TYPE(Qt,4,6,RotationAnimation,QmlRotationAnimation);
-    QML_REGISTER_TYPE(Qt,4,6,ScriptAction,QmlScriptAction);
-    QML_REGISTER_TYPE(Qt,4,6,SequentialAnimation,QmlSequentialAnimation);
-    QML_REGISTER_TYPE(Qt,4,6,SpringFollow,QmlSpringFollow);
-    QML_REGISTER_TYPE(Qt,4,6,StateChangeScript,QmlStateChangeScript);
-    QML_REGISTER_TYPE(Qt,4,6,StateGroup,QmlStateGroup);
-    QML_REGISTER_TYPE(Qt,4,6,State,QmlState);
-    QML_REGISTER_TYPE(Qt,4,6,SystemPalette,QmlSystemPalette);
-    QML_REGISTER_TYPE(Qt,4,6,Timer,QmlTimer);
-    QML_REGISTER_TYPE(Qt,4,6,Transition,QmlTransition);
-    QML_REGISTER_TYPE(Qt,4,6,Vector3dAnimation,QmlVector3dAnimation);
-    QML_REGISTER_TYPE(Qt,4,6,XmlListModel,QmlXmlListModel);
-    QML_REGISTER_TYPE(Qt,4,6,XmlRole,QmlXmlListModelRole);
-
-    QML_REGISTER_NOCREATE_TYPE(QmlGraphicsAnchors);
-    QML_REGISTER_NOCREATE_TYPE(QmlAbstractAnimation);
-    QML_REGISTER_NOCREATE_TYPE(QmlStateOperation);
-    QML_REGISTER_NOCREATE_TYPE(QNumberFormat);
-
-    QML_REGISTER_CUSTOM_TYPE(Qt, 4,6, ListModel, QmlListModel, QmlListModelParser);
-    QML_REGISTER_CUSTOM_TYPE(Qt, 4,6, PropertyChanges, QmlPropertyChanges, QmlPropertyChangesParser);
-}
diff --git a/src/declarative/util/qmlgraphicsutilmodule_p.h b/src/declarative/util/qmlgraphicsutilmodule_p.h
deleted file mode 100644
index 68a16a9..0000000
--- a/src/declarative/util/qmlgraphicsutilmodule_p.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSUTILMODULE_H
-#define QMLGRAPHICSUTILMODULE_H
-
-#include <qml.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlGraphicsUtilModule
-{
-public:
-    static void defineModule();
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLGRAPHICSUTILMODULE_H
diff --git a/src/declarative/util/qmllistaccessor.cpp b/src/declarative/util/qmllistaccessor.cpp
deleted file mode 100644
index abdb626..0000000
--- a/src/declarative/util/qmllistaccessor.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmllistaccessor_p.h"
-
-#include <qmlmetatype.h>
-
-#include <QStringList>
-#include <QtCore/qdebug.h>
-
-// ### Remove me
-#include <qmlengine_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QmlListAccessor::QmlListAccessor()
-: m_type(Invalid)
-{
-}
-
-QmlListAccessor::~QmlListAccessor()
-{
-}
-
-QVariant QmlListAccessor::list() const
-{
-    return d;
-}
-
-void QmlListAccessor::setList(const QVariant &v, QmlEngine *engine)
-{
-    d = v;
-
-    QmlEnginePrivate *enginePrivate = engine?QmlEnginePrivate::get(engine):0;
-
-    if (!d.isValid()) {
-        m_type = Invalid;
-    } else if (d.userType() == QVariant::StringList) {
-        m_type = StringList;
-    } else if (d.userType() == QMetaType::QVariantList) {
-        m_type = VariantList;
-    } else if (d.canConvert(QVariant::Int)) {
-        m_type = Integer;
-    } else if ((!enginePrivate && QmlMetaType::isQObject(d.userType())) ||
-               (enginePrivate && enginePrivate->isQObject(d.userType()))) {
-        QObject *data = enginePrivate?enginePrivate->toQObject(v):QmlMetaType::toQObject(v);
-        d = QVariant::fromValue(data);
-        m_type = Instance;
-    } else if (d.userType() == qMetaTypeId<QmlListReference>()) {
-        m_type = ListProperty;
-    } else {
-        m_type = Instance;
-    }
-}
-
-int QmlListAccessor::count() const
-{
-    switch(m_type) {
-    case StringList:
-        return qvariant_cast<QStringList>(d).count();
-    case VariantList:
-        return qvariant_cast<QVariantList>(d).count();
-    case ListProperty:
-        return ((QmlListReference *)d.constData())->count();
-    case Instance:
-        return 1;
-    case Integer:
-        return d.toInt();
-    default:
-    case Invalid:
-        return 0;
-    }
-}
-
-QVariant QmlListAccessor::at(int idx) const
-{
-    Q_ASSERT(idx >= 0 && idx < count());
-    switch(m_type) {
-    case StringList:
-        return QVariant::fromValue(qvariant_cast<QStringList>(d).at(idx));
-    case VariantList:
-        return qvariant_cast<QVariantList>(d).at(idx);
-    case ListProperty:
-        return QVariant::fromValue(((QmlListReference *)d.constData())->at(idx));
-    case Instance:
-        return d;
-    case Integer:
-        return QVariant(idx);
-    default:
-    case Invalid:
-        return QVariant();
-    }
-}
-
-bool QmlListAccessor::isValid() const
-{
-    return m_type != Invalid;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmllistaccessor_p.h b/src/declarative/util/qmllistaccessor_p.h
deleted file mode 100644
index 611eebb..0000000
--- a/src/declarative/util/qmllistaccessor_p.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLLISTACCESSOR_H
-#define QMLLISTACCESSOR_H
-
-#include <QtCore/QVariant>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlEngine;
-class Q_DECLARATIVE_EXPORT QmlListAccessor
-{
-public:
-    QmlListAccessor();
-    ~QmlListAccessor();
-
-    QVariant list() const;
-    void setList(const QVariant &, QmlEngine * = 0);
-
-    bool isValid() const;
-
-    int count() const;
-    QVariant at(int) const;
-
-    enum Type { Invalid, StringList, VariantList, ListProperty, Instance, Integer };
-    Type type() const { return m_type; }
-
-private:
-    Type m_type;
-    QVariant d;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLLISTACCESSOR_H
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
deleted file mode 100644
index c5e797e..0000000
--- a/src/declarative/util/qmllistmodel.cpp
+++ /dev/null
@@ -1,983 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmllistmodel_p.h"
-
-#include "qmlopenmetaobject_p.h"
-
-#include <qmlcustomparser_p.h>
-#include <qmlparser_p.h>
-#include <qmlengine_p.h>
-#include <qmlcontext.h>
-#include <qmlinfo.h>
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qstack.h>
-#include <QXmlStreamReader>
-#include <QtScript/qscriptvalueiterator.h>
-
-Q_DECLARE_METATYPE(QListModelInterface *)
-
-QT_BEGIN_NAMESPACE
-
-#define DATA_ROLE_ID 1
-#define DATA_ROLE_NAME "data"
-
-QmlListModelParser::ListInstruction *QmlListModelParser::ListModelData::instructions() const
-{
-    return (QmlListModelParser::ListInstruction *)((char *)this + sizeof(ListModelData));
-}
-
-static void dump(ModelNode *node, int ind);
-
-/*!
-    \qmlclass ListModel QmlListModel
-    \brief The ListModel element defines a free-form list data source.
-
-    The ListModel is a simple hierarchy of elements containing data roles. The contents can
-    be defined dynamically, or explicitly in QML:
-
-    For example:
-
-    \code
-    ListModel {
-        id: fruitModel
-        ListElement {
-            name: "Apple"
-            cost: 2.45
-        }
-        ListElement {
-            name: "Orange"
-            cost: 3.25
-        }
-        ListElement {
-            name: "Banana"
-            cost: 1.95
-        }
-    }
-    \endcode
-
-    Roles (properties) must begin with a lower-case letter.  The above example defines a
-    ListModel containing three elements, with the roles "name" and "cost".
-
-    The defined model can be used in views such as ListView:
-    \code
-    Component {
-        id: fruitDelegate
-        Item {
-            width: 200; height: 50
-            Text { text: name }
-            Text { text: '$'+cost; anchors.right: parent.right }
-        }
-    }
-
-    ListView {
-        model: fruitModel
-        delegate: fruitDelegate
-        anchors.fill: parent
-    }
-    \endcode
-
-    It is possible for roles to contain list data.  In the example below we create a list of fruit attributes:
-
-    \code
-    ListModel {
-        id: fruitModel
-        ListElement {
-            name: "Apple"
-            cost: 2.45
-            attributes: [
-                ListElement { description: "Core" },
-                ListElement { description: "Deciduous" }
-            ]
-        }
-        ListElement {
-            name: "Orange"
-            cost: 3.25
-            attributes: [
-                ListElement { description: "Citrus" }
-            ]
-        }
-        ListElement {
-            name: "Banana"
-            cost: 1.95
-            attributes: [
-                ListElement { description: "Tropical" },
-                ListElement { description: "Seedless" }
-            ]
-        }
-    }
-    \endcode
-
-    The delegate below will list all the fruit attributes:
-    \code
-    Component {
-        id: fruitDelegate
-        Item {
-            width: 200; height: 50
-            Text { id: name; text: name }
-            Text { text: '$'+cost; anchors.right: parent.right }
-            Row {
-                anchors.top: name.bottom
-                spacing: 5
-                Text { text: "Attributes:" }
-                Repeater {
-                    dataSource: attributes
-                    Component { Text { text: description } }
-                }
-            }
-        }
-    }
-    \endcode
-
-    The content of a ListModel may be created and modified using the clear(),
-    append(), and set() methods.  For example:
-
-    \code
-    Component {
-        id: fruitDelegate
-        Item {
-            width: 200; height: 50
-            Text { text: name }
-            Text { text: '$'+cost; anchors.right: parent.right }
-
-            // Double the price when clicked.
-            MouseArea {
-                anchors.fill: parent
-                onClicked: fruitModel.set(index, "cost", cost*2)
-            }
-        }
-    }
-    \endcode
-
-    When creating content dynamically, note that the set of available properties cannot be changed
-    except by first clearing the model - whatever properties are first added are then the
-    only permitted properties in the model.
-
-    \sa {qmlmodels}{Data Models}
-*/
-
-class ModelObject : public QObject
-{
-    Q_OBJECT
-public:
-    ModelObject();
-
-    void setValue(const QByteArray &name, const QVariant &val)
-    {
-        _mo->setValue(name, val);
-    }
-
-private:
-    QmlOpenMetaObject *_mo;
-};
-
-struct ModelNode
-{
-    ModelNode();
-    ~ModelNode();
-
-    QList<QVariant> values;
-    QHash<QString, ModelNode *> properties;
-
-    QmlListModel *model(const QmlListModel *parent) {
-        if (!modelCache) { 
-            modelCache = new QmlListModel;
-            QmlEngine::setContextForObject(modelCache,QmlEngine::contextForObject(parent));
-
-            modelCache->_root = this; 
-        }
-        return modelCache;
-    }
-
-    ModelObject *object(const QmlListModel *parent) {
-        if (!objectCache) {
-            objectCache = new ModelObject();
-            QHash<QString, ModelNode *>::iterator it;
-            for (it = properties.begin(); it != properties.end(); ++it) {
-                objectCache->setValue(it.key().toUtf8(), parent->valueForNode(*it));
-            }
-        }
-        return objectCache;
-    }
-
-    void setObjectValue(const QScriptValue& valuemap);
-    void setListValue(const QScriptValue& valuelist);
-
-    void setProperty(const QString& prop, const QVariant& val) {
-        QHash<QString, ModelNode *>::const_iterator it = properties.find(prop);
-        if (it != properties.end()) {
-            (*it)->values[0] = val;
-        } else {
-            ModelNode *n = new ModelNode;
-            n->values << val;
-            properties.insert(prop,n);
-        }
-        if (objectCache)
-            objectCache->setValue(prop.toUtf8(), val);
-    }
-
-    QmlListModel *modelCache;
-    ModelObject *objectCache;
-    bool isArray;
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(ModelNode *)
-
-QT_BEGIN_NAMESPACE
-
-void ModelNode::setObjectValue(const QScriptValue& valuemap) {
-    QScriptValueIterator it(valuemap);
-    while (it.hasNext()) {
-        it.next();
-        ModelNode *value = new ModelNode;
-        QScriptValue v = it.value();
-        if (v.isArray()) {
-            value->isArray = true;
-            value->setListValue(v);
-        } else {
-            value->values << v.toVariant();
-        }
-        properties.insert(it.name(),value);
-    }
-}
-
-void ModelNode::setListValue(const QScriptValue& valuelist) {
-    QScriptValueIterator it(valuelist);
-    values.clear();
-    while (it.hasNext()) {
-        it.next();
-        ModelNode *value = new ModelNode;
-        QScriptValue v = it.value();
-        if (v.isArray()) {
-            value->isArray = true;
-            value->setListValue(v);
-        } else if (v.isObject()) {
-            value->setObjectValue(v);
-        } else {
-            value->values << v.toVariant();
-        }
-        values.append(qVariantFromValue(value));
-
-    }
-}
-
-
-ModelObject::ModelObject()
-: _mo(new QmlOpenMetaObject(this))
-{
-}
-
-QmlListModel::QmlListModel(QObject *parent)
-: QListModelInterface(parent), _rolesOk(false), _root(0)
-{
-}
-
-QmlListModel::~QmlListModel()
-{
-    delete _root;
-}
-
-void QmlListModel::checkRoles() const
-{
-    if (_rolesOk || !_root)
-        return;
-
-    for (int ii = 0; ii < _root->values.count(); ++ii) {
-        ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(ii));
-        if (node) {
-            foreach (const QString &role, node->properties.keys())
-                addRole(role);
-        } 
-    }
-
-    _rolesOk = true;
-}
-
-void QmlListModel::addRole(const QString &role) const
-{
-    if (!roleStrings.contains(role))
-        roleStrings << role;
-}
-
-QList<int> QmlListModel::roles() const
-{
-    checkRoles();
-    QList<int> rv;
-    for (int ii = 0; ii < roleStrings.count(); ++ii)
-        rv << ii;
-    return rv;
-}
-
-QString QmlListModel::toString(int role) const
-{
-    checkRoles();
-    if (role < roleStrings.count())
-        return roleStrings.at(role);
-    else
-        return QString();
-}
-
-QVariant QmlListModel::valueForNode(ModelNode *node) const
-{
-    QObject *rv = 0;
-
-    if (node->isArray) {
-        // List
-        rv = node->model(this);
-    } else {
-        if (!node->properties.isEmpty()) {
-            // Object
-            rv = node->object(this);
-        } else if (node->values.count() == 0) {
-            // Invalid
-            return QVariant();
-        } else if (node->values.count() == 1) {
-            // Value
-            QVariant &var = node->values[0];
-            ModelNode *valueNode = qvariant_cast<ModelNode *>(var);
-            if (valueNode) {
-                if (!valueNode->properties.isEmpty())
-                    rv = valueNode->object(this);
-                else
-                    rv = valueNode->model(this);
-            } else {
-                return var;
-            }
-        }
-    }
-
-    if (rv)
-        return QVariant::fromValue(rv);
-    else
-        return QVariant();
-}
-
-QHash<int,QVariant> QmlListModel::data(int index, const QList<int> &roles) const
-{
-    checkRoles();
-    QHash<int, QVariant> rv;
-    if (index >= count() || index < 0)
-        return rv;
-
-    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-    if (!node) 
-        return rv;
-
-    for (int ii = 0; ii < roles.count(); ++ii) {
-        const QString &roleString = roleStrings.at(roles.at(ii));
-
-        QHash<QString, ModelNode *>::ConstIterator iter = 
-            node->properties.find(roleString);
-        if (iter != node->properties.end()) {
-            ModelNode *row = *iter;
-            rv.insert(roles.at(ii), valueForNode(row));
-        }
-    }
-
-    return rv;
-}
-
-QVariant QmlListModel::data(int index, int role) const
-{
-    checkRoles();
-    QVariant rv;
-    if (index >= count() || index < 0)
-        return rv;
-
-    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-    if (!node)
-        return rv;
-
-    const QString &roleString = roleStrings.at(role);
-
-    QHash<QString, ModelNode *>::ConstIterator iter =
-        node->properties.find(roleString);
-    if (iter != node->properties.end()) {
-        ModelNode *row = *iter;
-        rv = valueForNode(row);
-    }
-
-    return rv;
-}
-
-/*!
-    \qmlproperty int ListModel::count
-    The number of data entries in the model.
-*/
-int QmlListModel::count() const
-{
-    if (!_root) return 0;
-    return _root->values.count();
-}
-
-/*!
-    \qmlmethod ListModel::clear()
-
-    Deletes all content from the model. The properties are cleared such that
-    different properties may be set on subsequent additions.
-
-    \sa append() remove()
-*/
-void QmlListModel::clear()
-{
-    int cleared = count();
-    _rolesOk = false;
-    delete _root;
-    _root = 0;
-    roleStrings.clear();
-    emit itemsRemoved(0,cleared);
-    emit countChanged(0);
-}
-
-/*!
-    \qmlmethod ListModel::remove(int index)
-
-    Deletes the content at \a index from the model.
-
-    \sa clear()
-*/
-void QmlListModel::remove(int index)
-{
-    if (!_root || index < 0 || index >= _root->values.count()) {
-        qmlInfo(this) << tr("remove: index %1 out of range").arg(index);
-        return;
-    }
-
-    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-    _root->values.removeAt(index);
-    if (node)
-        delete node;
-    emit itemsRemoved(index,1);
-    emit countChanged(_root->values.count());
-}
-
-/*!
-    \qmlmethod ListModel::insert(int index, jsobject dict)
-
-    Adds a new item to the list model at position \a index, with the
-    values in \a dict.
-
-    \code
-        FruitModel.insert(2, {"cost": 5.95, "name":"Pizza"})
-    \endcode
-
-    The \a index must be to an existing item in the list, or one past
-    the end of the list (equivalent to append).
-
-    \sa set() append()
-*/
-void QmlListModel::insert(int index, const QScriptValue& valuemap)
-{
-    if (!valuemap.isObject() || valuemap.isArray()) {
-        qmlInfo(this) << tr("insert: value is not an object");
-        return;
-    }
-    if (!_root)
-        _root = new ModelNode;
-    if (index >= _root->values.count() || index<0) {
-        if (index == _root->values.count())
-            append(valuemap);
-        else
-            qmlInfo(this) << tr("insert: index %1 out of range").arg(index);
-        return;
-    }
-    ModelNode *mn = new ModelNode;
-    mn->setObjectValue(valuemap);
-    _root->values.insert(index,qVariantFromValue(mn));
-    emit itemsInserted(index,1);
-    emit countChanged(_root->values.count());
-}
-
-/*!
-    \qmlmethod ListModel::move(int from, int to, int n)
-
-    Moves \a n items \a from one position \a to another.
-
-    The from and to ranges must exist; for example, to move the first 3 items
-    to the end of the list:
-
-    \code
-        FruitModel.move(0,FruitModel.count-3,3)
-    \endcode
-
-    \sa append()
-*/
-void QmlListModel::move(int from, int to, int n)
-{
-    if (n==0 || from==to)
-        return;
-    if (from+n > count() || to+n > count() || from < 0 || to < 0 || n < 0) {
-        qmlInfo(this) << tr("move: out of range");
-        return;
-    }
-    int origfrom=from; // preserve actual move, so any animations are correct
-    int origto=to;
-    int orign=n;
-    if (from > to) {
-        // Only move forwards - flip if backwards moving
-        int tfrom = from;
-        int tto = to;
-        from = tto;
-        to = tto+n;
-        n = tfrom-tto;
-    }
-    if (n==1) {
-        _root->values.move(from,to);
-    } else {
-        QList<QVariant> replaced;
-        int i=0;
-        QVariantList::const_iterator it=_root->values.begin(); it += from+n;
-        for (; i<to-from; ++i,++it)
-            replaced.append(*it);
-        i=0;
-        it=_root->values.begin(); it += from;
-        for (; i<n; ++i,++it)
-            replaced.append(*it);
-        QVariantList::const_iterator f=replaced.begin();
-        QVariantList::iterator t=_root->values.begin(); t += from;
-        for (; f != replaced.end(); ++f, ++t)
-            *t = *f;
-    }
-    emit itemsMoved(origfrom,origto,orign);
-}
-
-/*!
-    \qmlmethod ListModel::append(jsobject dict)
-
-    Adds a new item to the end of the list model, with the
-    values in \a dict.
-
-    \code
-        FruitModel.append({"cost": 5.95, "name":"Pizza"})
-    \endcode
-
-    \sa set() remove()
-*/
-void QmlListModel::append(const QScriptValue& valuemap)
-{
-    if (!valuemap.isObject() || valuemap.isArray()) {
-        qmlInfo(this) << tr("append: value is not an object");
-        return;
-    }
-    if (!_root)
-        _root = new ModelNode;
-    ModelNode *mn = new ModelNode;
-    mn->setObjectValue(valuemap);
-    _root->values << qVariantFromValue(mn);
-    emit itemsInserted(count()-1,1);
-    emit countChanged(_root->values.count());
-}
-
-/*!
-    \qmlmethod object ListModel::get(int index)
-
-    Returns the item at \a index in the list model.
-
-    \code
-        FruitModel.append({"cost": 5.95, "name":"Jackfruit"})
-        FruitModel.get(0).cost
-    \endcode
-
-    The \a index must be an element in the list.
-
-    Note that properties of the returned object that are themselves objects
-    will also be models, and this get() method is used to access elements:
-
-    \code
-        FruitModel.append(..., "attributes":
-            [{"name":"spikes","value":"7mm"},
-             {"name":"color","value":"green"}]);
-        FruitModel.get(0).attributes.get(1).value; // == "green"
-    \endcode
-
-    \sa append()
-*/
-QScriptValue QmlListModel::get(int index) const
-{
-    if (index >= count() || index < 0) {
-        qmlInfo(this) << tr("get: index %1 out of range").arg(index);
-        return 0;
-    }
-
-    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-    if (!node) 
-        return 0;
-    QmlEngine *eng = qmlEngine(this);
-    if (!eng) {
-        qWarning("Cannot call QmlListModel::get() without a QmlEngine");
-        return 0;
-    }
-    return QmlEnginePrivate::qmlScriptObject(node->object(this), eng);
-}
-
-/*!
-    \qmlmethod ListModel::set(int index, jsobject dict)
-
-    Changes the item at \a index in the list model with the
-    values in \a dict. Properties not appearing in \a valuemap
-    are left unchanged.
-
-    \code
-        FruitModel.set(3, {"cost": 5.95, "name":"Pizza"})
-    \endcode
-
-    The \a index must be an element in the list.
-
-    \sa append()
-*/
-void QmlListModel::set(int index, const QScriptValue& valuemap)
-{
-    if (!valuemap.isObject() || valuemap.isArray()) {
-        qmlInfo(this) << tr("set: value is not an object");
-        return;
-    }
-    if ( !_root || index > _root->values.count() || index < 0) {
-        qmlInfo(this) << tr("set: index %1 out of range").arg(index);
-        return;
-    }
-    if (index == _root->values.count())
-        append(valuemap);
-    else {
-        ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-        QList<int> roles;
-        node->setObjectValue(valuemap);
-        QScriptValueIterator it(valuemap);
-        while (it.hasNext()) {
-            it.next();
-            int r = roleStrings.indexOf(it.name());
-            if (r<0) {
-                r = roleStrings.count();
-                roleStrings << it.name();
-            }
-            roles.append(r);
-        }
-        emit itemsChanged(index,1,roles);
-    }
-}
-
-/*!
-    \qmlmethod ListModel::setProperty(int index, string property, variant value)
-
-    Changes the \a property of the item at \a index in the list model to \a value.
-
-    \code
-        FruitModel.set(3, "cost", 5.95)
-    \endcode
-
-    The \a index must be an element in the list.
-
-    \sa append()
-*/
-void QmlListModel::setProperty(int index, const QString& property, const QVariant& value)
-{
-    if ( !_root || index >= _root->values.count() || index < 0) {
-        qmlInfo(this) << tr("set: index %1 out of range").arg(index);
-        return;
-    }
-    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-    int r = roleStrings.indexOf(property);
-    if (r<0) {
-        r = roleStrings.count();
-        roleStrings << property;
-    }
-    QList<int> roles;
-    roles.append(r);
-
-    if (node)
-        node->setProperty(property,value);
-    emit itemsChanged(index,1,roles);
-}
-
-bool QmlListModelParser::compileProperty(const QmlCustomParserProperty &prop, QList<ListInstruction> &instr, QByteArray &data)
-{
-    QList<QVariant> values = prop.assignedValues();
-    for(int ii = 0; ii < values.count(); ++ii) {
-        const QVariant &value = values.at(ii);
-
-        if(value.userType() == qMetaTypeId<QmlCustomParserNode>()) {
-            QmlCustomParserNode node = 
-                qvariant_cast<QmlCustomParserNode>(value);
-
-            {
-            ListInstruction li;
-            li.type = ListInstruction::Push;
-            li.dataIdx = -1;
-            instr << li;
-            }
-
-            QList<QmlCustomParserProperty> props = node.properties();
-            for(int jj = 0; jj < props.count(); ++jj) {
-                const QmlCustomParserProperty &nodeProp = props.at(jj);
-                if (nodeProp.name() == "") {
-                    error(nodeProp, QmlListModel::tr("ListElement: cannot use default property"));
-                    return false;
-                }
-                if (nodeProp.name() == "id") {
-                    error(nodeProp, QmlListModel::tr("ListElement: cannot use reserved \"id\" property"));
-                    return false;
-                }
-
-                ListInstruction li;
-                int ref = data.count();
-                data.append(nodeProp.name());
-                data.append('\0');
-                li.type = ListInstruction::Set;
-                li.dataIdx = ref;
-                instr << li;
-
-                if(!compileProperty(nodeProp, instr, data))
-                    return false;
-
-                li.type = ListInstruction::Pop;
-                li.dataIdx = -1;
-                instr << li;
-            }
-
-            {
-            ListInstruction li;
-            li.type = ListInstruction::Pop;
-            li.dataIdx = -1;
-            instr << li;
-            }
-
-        } else {
-
-            QmlParser::Variant variant = 
-                qvariant_cast<QmlParser::Variant>(value);
-
-            int ref = data.count();
-
-            QByteArray d;
-            d += char(variant.type()); // type tag
-            if (variant.isString()) {
-                d += variant.asString().toUtf8();
-            } else if (variant.isNumber()) {
-                d += QByteArray::number(variant.asNumber(),'g',20);
-            } else if (variant.isBoolean()) {
-                d += char(variant.asBoolean());
-            } else if (variant.isScript()) {
-                if (definesEmptyList(variant.asScript())) {
-                    d[0] = 0; // QmlParser::Variant::Invalid - marks empty list
-                } else {
-                    error(prop, QmlListModel::tr("ListElement: cannot use script for property value"));
-                    return false;
-                }
-            }
-            d.append('\0');
-            data.append(d);
-
-            ListInstruction li;
-            li.type = ListInstruction::Value;
-            li.dataIdx = ref;
-            instr << li;
-        }
-    }
-
-    return true;
-}
-
-QByteArray QmlListModelParser::compile(const QList<QmlCustomParserProperty> &customProps)
-{
-    QList<ListInstruction> instr;
-    QByteArray data;
-
-    for(int ii = 0; ii < customProps.count(); ++ii) {
-        const QmlCustomParserProperty &prop = customProps.at(ii);
-        if(prop.name() != "") { // isn't default property
-            error(prop, QmlListModel::tr("ListModel: undefined property '%1'").arg(QString::fromUtf8(prop.name())));
-            return QByteArray();
-        }
-
-        if(!compileProperty(prop, instr, data)) {
-            return QByteArray();
-        }
-    }
-
-    int size = sizeof(ListModelData) + 
-               instr.count() * sizeof(ListInstruction) + 
-               data.count();
-
-    QByteArray rv;
-    rv.resize(size);
-
-    ListModelData *lmd = (ListModelData *)rv.data();
-    lmd->dataOffset = sizeof(ListModelData) + 
-                     instr.count() * sizeof(ListInstruction);
-    lmd->instrCount = instr.count();
-    for (int ii = 0; ii < instr.count(); ++ii)
-        lmd->instructions()[ii] = instr.at(ii);
-    ::memcpy(rv.data() + lmd->dataOffset, data.constData(), data.count());
-
-    return rv;
-}
-
-void QmlListModelParser::setCustomData(QObject *obj, const QByteArray &d)
-{
-    QmlListModel *rv = static_cast<QmlListModel *>(obj);
-
-    ModelNode *root = new ModelNode;
-    rv->_root = root;
-    QStack<ModelNode *> nodes;
-    nodes << root;
-
-    bool processingSet = false;
-
-    const ListModelData *lmd = (const ListModelData *)d.constData();
-    const char *data = ((const char *)lmd) + lmd->dataOffset;
-
-    for (int ii = 0; ii < lmd->instrCount; ++ii) {
-        const ListInstruction &instr = lmd->instructions()[ii];
-
-        switch(instr.type) {
-        case ListInstruction::Push:
-            {
-                ModelNode *n = nodes.top();
-                ModelNode *n2 = new ModelNode;
-                n->values << qVariantFromValue(n2);
-                nodes.push(n2);
-                if (processingSet)
-                    n->isArray = true;
-            }
-            break;
-
-        case ListInstruction::Pop:
-            nodes.pop();
-            break;
-
-        case ListInstruction::Value:
-            {
-                ModelNode *n = nodes.top();
-                switch (QmlParser::Variant::Type(data[instr.dataIdx])) {
-                 case QmlParser::Variant::Invalid:
-                    n->isArray = true;
-                    break;
-                 case QmlParser::Variant::Boolean:
-                    n->values.append(bool(data[1 + instr.dataIdx]));
-                    break;
-                 case QmlParser::Variant::Number:
-                    n->values.append(QByteArray(data + 1 + instr.dataIdx).toDouble());
-                    break;
-                 case QmlParser::Variant::String:
-                    n->values.append(QString::fromUtf8(data + 1 + instr.dataIdx));
-                    break;
-                 default:
-                    Q_ASSERT("Format error in ListInstruction");
-                }
-
-                processingSet = false;
-            }
-            break;
-
-        case ListInstruction::Set:
-            {
-                ModelNode *n = nodes.top();
-                ModelNode *n2 = new ModelNode;
-                n->properties.insert(QString::fromUtf8(data + instr.dataIdx), n2);
-                nodes.push(n2);
-                processingSet = true;
-            }
-            break;
-        }
-    }
-}
-
-bool QmlListModelParser::definesEmptyList(const QString &s)
-{
-    if (s.startsWith(QLatin1Char('[')) && s.endsWith(QLatin1Char(']'))) {
-        for (int i=1; i<s.length()-1; i++) {
-            if (!s[i].isSpace())
-                return false;
-        }
-        return true;
-    }
-    return false;
-}
-
-/*!
-    \qmlclass ListElement
-    \brief The ListElement element defines a data item in a ListModel.
-
-    \sa ListModel
-*/
-
-static void dump(ModelNode *node, int ind)
-{
-    QByteArray indentBa(ind * 4, ' ');
-    const char *indent = indentBa.constData();
-
-    for (int ii = 0; ii < node->values.count(); ++ii) {
-        ModelNode *subNode = qvariant_cast<ModelNode *>(node->values.at(ii));
-        if (subNode) {
-            qWarning().nospace() << indent << "Sub-node " << ii;
-            dump(subNode, ind + 1);
-        } else {
-            qWarning().nospace() << indent << "Sub-node " << ii << ": " << node->values.at(ii).toString();
-        }
-    }
-
-    for (QHash<QString, ModelNode *>::ConstIterator iter = node->properties.begin(); iter != node->properties.end(); ++iter) {
-        qWarning().nospace() << indent << "Property " << iter.key() << ':';
-        dump(iter.value(), ind + 1);
-    }
-}
-
-ModelNode::ModelNode()
-: modelCache(0), objectCache(0), isArray(false)
-{
-}
-
-ModelNode::~ModelNode()
-{
-    qDeleteAll(properties);
-    for (int ii = 0; ii < values.count(); ++ii) {
-        ModelNode *node = qvariant_cast<ModelNode *>(values.at(ii));
-        if (node) { delete node; node = 0; }
-    }
-    if (modelCache) { modelCache->_root = 0/* ==this */; delete modelCache; modelCache = 0; }
-    if (objectCache) { delete objectCache; }
-}
-
-QT_END_NAMESPACE
-
-#include <qmllistmodel.moc>
diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h
deleted file mode 100644
index e6ddb0e..0000000
--- a/src/declarative/util/qmllistmodel_p.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLLISTMODEL_H
-#define QMLLISTMODEL_H
-
-#include <qml.h>
-#include <private/qmlcustomparser_p.h>
-
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include "../3rdparty/qlistmodelinterface_p.h"
-#include <QtScript/qscriptvalue.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-struct ModelNode;
-class Q_DECLARATIVE_EXPORT QmlListModel : public QListModelInterface
-{
-    Q_OBJECT
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-
-public:
-    QmlListModel(QObject *parent=0);
-    ~QmlListModel();
-
-    virtual QList<int> roles() const;
-    virtual QString toString(int role) const;
-    virtual int count() const;
-    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
-    virtual QVariant data(int index, int role) const;
-
-    Q_INVOKABLE void clear();
-    Q_INVOKABLE void remove(int index);
-    Q_INVOKABLE void append(const QScriptValue&);
-    Q_INVOKABLE void insert(int index, const QScriptValue&);
-    Q_INVOKABLE QScriptValue get(int index) const;
-    Q_INVOKABLE void set(int index, const QScriptValue&);
-    Q_INVOKABLE void setProperty(int index, const QString& property, const QVariant& value);
-    Q_INVOKABLE void move(int from, int to, int count);
-
-Q_SIGNALS:
-    void countChanged(int);
-
-private:
-    QVariant valueForNode(ModelNode *) const;
-    mutable QStringList roleStrings;
-    friend class QmlListModelParser;
-    friend struct ModelNode;
-
-    void checkRoles() const;
-    void addRole(const QString &) const;
-    mutable bool _rolesOk;
-    ModelNode *_root;
-};
-
-// ### FIXME
-class QmlListElement : public QObject
-{
-Q_OBJECT
-};
-
-class QmlListModelParser : public QmlCustomParser
-{
-public:
-    QByteArray compile(const QList<QmlCustomParserProperty> &);
-    void setCustomData(QObject *, const QByteArray &);
-
-private:
-    struct ListInstruction
-    {
-        enum { Push, Pop, Value, Set } type;
-        int dataIdx;
-    };
-    struct ListModelData
-    {
-        int dataOffset;
-        int instrCount;
-        ListInstruction *instructions() const;
-    };
-    bool compileProperty(const QmlCustomParserProperty &prop, QList<ListInstruction> &instr, QByteArray &data);
-
-    bool definesEmptyList(const QString &);
-};
-
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlListModel)
-QML_DECLARE_TYPE(QmlListElement)
-
-QT_END_HEADER
-
-#endif // QMLLISTMODEL_H
diff --git a/src/declarative/util/qmlnullablevalue_p_p.h b/src/declarative/util/qmlnullablevalue_p_p.h
deleted file mode 100644
index c426258..0000000
--- a/src/declarative/util/qmlnullablevalue_p_p.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLNULLABLEVALUE_P_H
-#define QMLNULLABLEVALUE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-QT_BEGIN_NAMESPACE
-
-template<typename T>
-struct QmlNullableValue 
-{
-    QmlNullableValue()
-    : isNull(true), value(T()) {}
-    QmlNullableValue(const QmlNullableValue<T> &o)
-    : isNull(o.isNull), value(o.value) {}
-    QmlNullableValue(const T &t)
-    : isNull(false), value(t) {}
-    QmlNullableValue<T> &operator=(const T &t)
-    { isNull = false; value = t; return *this; }
-    QmlNullableValue<T> &operator=(const QmlNullableValue<T> &o)
-    { isNull = o.isNull; value = o.value; return *this; }
-    operator T() const { return value; }
-
-    void invalidate() { isNull = true; }
-    bool isValid() const { return !isNull; }
-    bool isNull;
-    T value;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLNULLABLEVALUE_P_H
diff --git a/src/declarative/util/qmlnumberformatter.cpp b/src/declarative/util/qmlnumberformatter.cpp
deleted file mode 100644
index 026a682..0000000
--- a/src/declarative/util/qmlnumberformatter.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlnumberformatter_p.h"
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-//TODO: set locale
-//      docs
-//      this is a wrapper around qnumberformat (test integration)
-//      if number or format haven't been explictly set, text should be an empty string
-
-class QmlNumberFormatterPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlNumberFormatter)
-public:
-    QmlNumberFormatterPrivate() : locale(QLocale::system()), number(0), componentComplete(true) {}
-
-    void updateText();
-
-    QLocale locale;
-    QString format;
-    QNumberFormat numberFormat;
-    QString text;
-    qreal number;
-    bool componentComplete;
-};
-/*!
-    \qmlclass NumberFormatter
-  \since 4.7
-    \brief The NumberFormatter allows you to control the format of a number string.
-
-    The format property documentation has more details on how the format can be manipulated.
-
-    In the following example, the text element will display the text "1,234.57".
-    \code
-    NumberFormatter { id: formatter; number: 1234.5678; format: "##,##0.##" }
-    Text { text: formatter.text }
-    \endcode
-
-    */
-/*!
-    \internal
-    \class QmlNumberFormatter
-    \ingroup group_utility
-    \brief The QmlNumberFormatter class allows you to format a number to a particular string format/locale specific number format.
-*/
-
-QmlNumberFormatter::QmlNumberFormatter(QObject *parent)
-: QObject(*(new QmlNumberFormatterPrivate), parent) 
-{
-}
-
-QmlNumberFormatter::~QmlNumberFormatter()
-{
-}
-
-/*!
-    \qmlproperty string NumberFormatter::text
-
-    The number in the specified format.
-
-    If no format is specified the text will be empty.
-*/
-
-QString QmlNumberFormatter::text() const
-{
-    Q_D(const QmlNumberFormatter);
-    return d->text;
-}
-
-/*!
-    \qmlproperty real NumberFormatter::number
-   
-    A single point precision number. (Doubles are not yet supported)
-
-*/
-qreal QmlNumberFormatter::number() const
-{
-    Q_D(const QmlNumberFormatter);
-    return d->number;
-}
-
-/*!
-    \qmlproperty string NumberFormatter::format
-
-    The particular format the number will adhere to during the conversion to text.
-
-    The format syntax follows a style similar to the Unicode Standard (UTS35).
-
-    The table below shows the characters, patterns that can be used in the format.
-
-    \table
-    \header
-        \o Character
-        \o Meaning
-    \row
-        \o #
-        \o Any digit(s), zero shows as absent (for leading/trailing zeroes).
-    \row
-        \o 0
-        \o Implicit digit. Zero will show in the case that the input number is too small.
-    \row
-        \o .
-        \o Decimal separator. Output decimal seperator will be dependant on system locale.
-    \row
-        \o ,
-        \o Grouping separator. The number of digits (either #, or 0) between the grouping separator and the decimal (or the rightmost digit) will determine the groupingSize).
-    \row
-        \o other
-        \o Any other character will be taken as a string literal and placed directly into the output string.
-    \endtable
-    
-    Invalid formats will not guarantee a meaningful text output.
-    
-    \note Input numbers that are too long for the given format will be rounded dependent on precison based on the position of the decimal point.
-    
-    The following table illustrates the output text created by applying some examples of numeric formats to the formatter.
-
-    \table
-    \header
-        \o Format
-        \o Number
-        \o Output
-    \row
-        \o ###
-        \o 123456
-        \o  123456
-    \row
-        \o  000
-        \o  123456
-        \o  123456
-    \row
-        \o  ######
-        \o  1234
-        \o  1234
-    \row
-        \o  000000
-        \o  1234
-        \o  001234
-    \row
-        \o  ##,##0.##
-        \o  1234.456
-        \o  1,234.46 (for US locale)
-        \codeline 1 234,46 (for FR locale)
-    \row
-        \o  000000,000.#
-        \o  123456
-        \o  000,123,456 (for US locale)
-        \codeline 000 123 456 (for FR locale)
-    \row
-        \o  0.0###
-        \o  0.999997
-        \o  1.0
-    \row
-        \o  (000) 000 - 000
-        \o  12345678
-        \o  (012) 345 - 678
-    \row
-        \o  #A
-        \o 12
-        \o 12A
-    \endtable
-
-*/
-QString QmlNumberFormatter::format() const
-{
-    Q_D(const QmlNumberFormatter);
-    return d->format;
-}
-
-void QmlNumberFormatter::setNumber(const qreal &number)
-{
-    Q_D(QmlNumberFormatter);
-    if (d->number == number)
-        return;
-    d->number = number;
-    d->updateText();
-}
-
-void QmlNumberFormatter::setFormat(const QString &format)
-{
-    Q_D(QmlNumberFormatter);
-    //no format checking
-    if (format.isEmpty()) 
-        d->format = QString::null; 
-    else
-        d->format = format;
-    d->updateText();
-}
-
-void QmlNumberFormatterPrivate::updateText()
-{
-    Q_Q(QmlNumberFormatter);
-    if (!componentComplete)
-        return;
-
-    QNumberFormat tempFormat;
-    tempFormat.setFormat(format);
-    tempFormat.setNumber(number);
-
-    text = tempFormat.text();
-    
-    emit q->textChanged();
-}
-
-void QmlNumberFormatter::classBegin()
-{
-    Q_D(QmlNumberFormatter);
-    d->componentComplete = false;
-}
-
-void QmlNumberFormatter::componentComplete()
-{
-    Q_D(QmlNumberFormatter);
-    d->componentComplete = true;
-    d->updateText();
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h
deleted file mode 100644
index d08885b..0000000
--- a/src/declarative/util/qmlnumberformatter_p.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLNUMBERFORMATTER_H
-#define QMLNUMBERFORMATTER_H
-
-#include "qnumberformat_p.h"
-
-#include <qml.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlNumberFormatterPrivate;
-class Q_DECLARATIVE_EXPORT QmlNumberFormatter : public QObject, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlParserStatus)
-
-    Q_PROPERTY(QString text READ text NOTIFY textChanged)
-    Q_PROPERTY(QString format READ format WRITE setFormat)
-    Q_PROPERTY(qreal number READ number WRITE setNumber)
-public:
-    QmlNumberFormatter(QObject *parent=0);
-    ~QmlNumberFormatter();
-
-    QString text() const;
-
-    qreal number() const;
-    void setNumber(const qreal &);
-
-    QString format() const;
-    void setFormat(const QString &);
-
-    virtual void classBegin();
-    virtual void componentComplete();
-
-Q_SIGNALS:
-    void textChanged();
-
-private:
-    Q_DISABLE_COPY(QmlNumberFormatter)
-    Q_DECLARE_PRIVATE(QmlNumberFormatter)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlNumberFormatter)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp
deleted file mode 100644
index 0847c47..0000000
--- a/src/declarative/util/qmlopenmetaobject.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlopenmetaobject_p.h"
-#include "qmlpropertycache_p.h"
-#include "qmldeclarativedata_p.h"
-#include <qmetaobjectbuilder_p.h>
-#include <qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QmlOpenMetaObjectTypePrivate
-{
-public:
-    QmlOpenMetaObjectTypePrivate() : mem(0), cache(0), engine(0) {}
-
-    void init(const QMetaObject *metaObj);
-
-    int propertyOffset;
-    int signalOffset;
-    QHash<QByteArray, int> names;
-    QMetaObjectBuilder mob;
-    QMetaObject *mem;
-    QmlPropertyCache *cache;
-    QmlEngine *engine;
-    QSet<QmlOpenMetaObject*> referers;
-};
-
-QmlOpenMetaObjectType::QmlOpenMetaObjectType(const QMetaObject *base, QmlEngine *engine)
-    : d(new QmlOpenMetaObjectTypePrivate)
-{
-    d->engine = engine;
-    d->init(base);
-}
-
-QmlOpenMetaObjectType::~QmlOpenMetaObjectType()
-{
-    if (d->mem)
-        qFree(d->mem);
-    if (d->cache)
-        d->cache->release();
-    delete d;
-}
-
-
-int QmlOpenMetaObjectType::propertyOffset() const
-{
-    return d->propertyOffset;
-}
-
-int QmlOpenMetaObjectType::signalOffset() const
-{
-    return d->signalOffset;
-}
-
-int QmlOpenMetaObjectType::createProperty(const QByteArray &name)
-{
-    int id = d->mob.propertyCount();
-    d->mob.addSignal("__" + QByteArray::number(id) + "()");
-    QMetaPropertyBuilder build = d->mob.addProperty(name, "QVariant", id);
-    build.setDynamic(true);
-    propertyCreated(id, build);
-    qFree(d->mem);
-    d->mem = d->mob.toMetaObject();
-    d->names.insert(name, id);
-    QSet<QmlOpenMetaObject*>::iterator it = d->referers.begin();
-    while (it != d->referers.end()) {
-        QmlOpenMetaObject *omo = *it;
-        *static_cast<QMetaObject *>(omo) = *d->mem;
-        if (d->cache)
-            d->cache->update(d->engine, omo);
-        ++it;
-    }
-
-    return d->propertyOffset + id;
-}
-
-void QmlOpenMetaObjectType::propertyCreated(int id, QMetaPropertyBuilder &builder)
-{
-    if (d->referers.count())
-        (*d->referers.begin())->propertyCreated(id, builder);
-}
-
-void QmlOpenMetaObjectTypePrivate::init(const QMetaObject *metaObj)
-{
-    if (!mem) {
-        mob.setSuperClass(metaObj);
-        mob.setClassName(metaObj->className());
-        mob.setFlags(QMetaObjectBuilder::DynamicMetaObject);
-
-        mem = mob.toMetaObject();
-
-        propertyOffset = mem->propertyOffset();
-        signalOffset = mem->methodOffset();
-    }
-}
-
-//----------------------------------------------------------------------------
-
-class QmlOpenMetaObjectPrivate
-{
-public:
-    QmlOpenMetaObjectPrivate(QmlOpenMetaObject *_q)
-        : q(_q), parent(0), type(0), cacheProperties(false) {}
-
-    inline QVariant &getData(int idx) {
-        while (data.count() <= idx)
-            data << QPair<QVariant, bool>(QVariant(), false);
-        QPair<QVariant, bool> &prop = data[idx];
-        if (!prop.second) {
-            prop.first = q->initialValue(idx);
-            prop.second = true;
-        }
-        return prop.first;
-    }
-
-    inline void writeData(int idx, const QVariant &value) {
-        while (data.count() <= idx)
-            data << QPair<QVariant, bool>(QVariant(), false);
-        QPair<QVariant, bool> &prop = data[idx];
-        prop.first = value;
-        prop.second = true;
-    }
-
-    bool autoCreate;
-    QmlOpenMetaObject *q;
-    QAbstractDynamicMetaObject *parent;
-    QList<QPair<QVariant, bool> > data;
-    QObject *object;
-    QmlOpenMetaObjectType *type;
-    bool cacheProperties;
-};
-
-QmlOpenMetaObject::QmlOpenMetaObject(QObject *obj, bool automatic)
-: d(new QmlOpenMetaObjectPrivate(this))
-{
-    d->autoCreate = automatic;
-    d->object = obj;
-
-    d->type = new QmlOpenMetaObjectType(obj->metaObject(), 0);
-    d->type->d->referers.insert(this);
-
-    QObjectPrivate *op = QObjectPrivate::get(obj);
-    *static_cast<QMetaObject *>(this) = *d->type->d->mem;
-    op->metaObject = this;
-}
-
-QmlOpenMetaObject::QmlOpenMetaObject(QObject *obj, QmlOpenMetaObjectType *type, bool automatic)
-: d(new QmlOpenMetaObjectPrivate(this))
-{
-    d->autoCreate = automatic;
-    d->object = obj;
-
-    d->type = type;
-    d->type->addref();
-    d->type->d->referers.insert(this);
-
-    QObjectPrivate *op = QObjectPrivate::get(obj);
-    *static_cast<QMetaObject *>(this) = *d->type->d->mem;
-    op->metaObject = this;
-}
-
-QmlOpenMetaObject::~QmlOpenMetaObject()
-{
-    if (d->parent)
-        delete d->parent;
-    d->type->d->referers.remove(this);
-    d->type->release();
-    delete d;
-}
-
-QmlOpenMetaObjectType *QmlOpenMetaObject::type() const
-{
-    return d->type;
-}
-
-int QmlOpenMetaObject::metaCall(QMetaObject::Call c, int id, void **a)
-{
-    if (( c == QMetaObject::ReadProperty || c == QMetaObject::WriteProperty)
-            && id >= d->type->d->propertyOffset) {
-        int propId = id - d->type->d->propertyOffset;
-        if (c == QMetaObject::ReadProperty) {
-            propertyRead(propId);
-            *reinterpret_cast<QVariant *>(a[0]) = d->getData(propId);
-        } else if (c == QMetaObject::WriteProperty) {
-            if (d->data[propId].first != *reinterpret_cast<QVariant *>(a[0]))  {
-                propertyWrite(propId);
-                d->writeData(propId, *reinterpret_cast<QVariant *>(a[0]));
-                activate(d->object, d->type->d->signalOffset + propId, 0);
-            }
-        } 
-        return -1;
-    } else {
-        if (d->parent)
-            return d->parent->metaCall(c, id, a);
-        else
-            return d->object->qt_metacall(c, id, a);
-    }
-}
-
-QAbstractDynamicMetaObject *QmlOpenMetaObject::parent() const
-{
-    return d->parent;
-}
-
-QVariant QmlOpenMetaObject::value(int id) const
-{
-    return d->getData(id);
-}
-
-void QmlOpenMetaObject::setValue(int id, const QVariant &value)
-{
-    d->writeData(id, value);
-    activate(d->object, id + d->type->d->signalOffset, 0);
-}
-
-QVariant QmlOpenMetaObject::value(const QByteArray &name) const
-{
-    QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name);
-    if (iter == d->type->d->names.end())
-        return QVariant();
-
-    return d->getData(*iter);
-}
-
-QVariant &QmlOpenMetaObject::operator[](const QByteArray &name)
-{
-    QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name);
-    Q_ASSERT(iter != d->type->d->names.end());
-
-    return d->getData(*iter);
-}
-
-void QmlOpenMetaObject::setValue(const QByteArray &name, const QVariant &val)
-{
-    QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name);
-
-    int id = -1;
-    if (iter == d->type->d->names.end()) {
-        id = d->type->createProperty(name.constData()) - d->type->d->propertyOffset;
-    } else {
-        id = *iter;
-    }
-
-    QVariant &dataVal = d->getData(id);
-    if (dataVal == val)
-        return;
-
-    dataVal = val;
-    activate(d->object, id + d->type->d->signalOffset, 0);
-}
-
-void QmlOpenMetaObject::setCached(bool c)
-{
-    if (c == d->cacheProperties || !d->type->d->engine)
-        return;
-
-    d->cacheProperties = c;
-
-    QmlDeclarativeData *qmldata = QmlDeclarativeData::get(d->object, true);
-    if (d->cacheProperties) {
-        if (!d->type->d->cache)
-            d->type->d->cache = QmlPropertyCache::create(d->type->d->engine, this);
-        qmldata->propertyCache = d->type->d->cache;
-        d->type->d->cache->addref();
-    } else {
-        if (d->type->d->cache)
-            d->type->d->cache->release();
-        qmldata->propertyCache = 0;
-    }
-}
-
-
-int QmlOpenMetaObject::createProperty(const char *name, const char *)
-{
-    if (d->autoCreate)
-        return d->type->createProperty(name);
-    else
-        return -1;
-}
-
-void QmlOpenMetaObject::propertyRead(int)
-{
-}
-
-void QmlOpenMetaObject::propertyWrite(int)
-{
-}
-
-void QmlOpenMetaObject::propertyCreated(int, QMetaPropertyBuilder &)
-{
-}
-
-QVariant QmlOpenMetaObject::initialValue(int)
-{
-    return QVariant();
-}
-
-int QmlOpenMetaObject::count() const
-{
-    return d->type->d->names.count();
-}
-
-QByteArray QmlOpenMetaObject::name(int idx) const
-{
-    Q_ASSERT(idx >= 0 && idx < d->type->d->names.count());
-
-    return d->type->d->mob.property(idx).name();
-}
-
-QObject *QmlOpenMetaObject::object() const
-{
-    return d->object;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlopenmetaobject_p.h b/src/declarative/util/qmlopenmetaobject_p.h
deleted file mode 100644
index 3f9450d..0000000
--- a/src/declarative/util/qmlopenmetaobject_p.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLOPENMETAOBJECT_H
-#define QMLOPENMETAOBJECT_H
-
-#include <private/qmlrefcount_p.h>
-#include <QtCore/QMetaObject>
-#include <QtCore/QObject>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlEngine;
-class QMetaPropertyBuilder;
-class QmlOpenMetaObjectTypePrivate;
-class Q_DECLARATIVE_EXPORT QmlOpenMetaObjectType : public QmlRefCount
-{
-public:
-    QmlOpenMetaObjectType(const QMetaObject *base, QmlEngine *engine);
-    ~QmlOpenMetaObjectType();
-
-    int createProperty(const QByteArray &name);
-
-    int propertyOffset() const;
-    int signalOffset() const;
-
-protected:
-    virtual void propertyCreated(int, QMetaPropertyBuilder &);
-
-private:
-    QmlOpenMetaObjectTypePrivate *d;
-    friend class QmlOpenMetaObject;
-    friend class QmlOpenMetaObjectPrivate;
-};
-
-class QmlOpenMetaObjectPrivate;
-class Q_DECLARATIVE_EXPORT QmlOpenMetaObject : public QAbstractDynamicMetaObject
-{
-public:
-    QmlOpenMetaObject(QObject *, bool = true);
-    QmlOpenMetaObject(QObject *, QmlOpenMetaObjectType *, bool = true);
-    ~QmlOpenMetaObject();
-
-    QVariant value(const QByteArray &) const;
-    void setValue(const QByteArray &, const QVariant &);
-    QVariant value(int) const;
-    void setValue(int, const QVariant &);
-    QVariant &operator[](const QByteArray &);
-
-    int count() const;
-    QByteArray name(int) const;
-
-    QObject *object() const;
-    virtual QVariant initialValue(int);
-
-    // Be careful - once setCached(true) is called createProperty() is no
-    // longer automatically called for new properties.
-    void setCached(bool);
-
-    QmlOpenMetaObjectType *type() const;
-
-protected:
-    virtual int metaCall(QMetaObject::Call _c, int _id, void **_a);
-    virtual int createProperty(const char *, const char *);
-
-    virtual void propertyRead(int);
-    virtual void propertyWrite(int);
-    virtual void propertyCreated(int, QMetaPropertyBuilder &);
-
-    QAbstractDynamicMetaObject *parent() const;
-
-private:
-    QmlOpenMetaObjectPrivate *d;
-    friend class QmlOpenMetaObjectType;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLOPENMETAOBJECT_H
diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp
deleted file mode 100644
index c9b9cbb..0000000
--- a/src/declarative/util/qmlpackage.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlpackage_p.h"
-
-#include <private/qobject_p.h>
-#include "private/qmlguard_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlPackagePrivate : public QObjectPrivate
-{
-public:
-    QmlPackagePrivate() {}
-
-    struct DataGuard : public QmlGuard<QObject>
-    {
-        DataGuard(QObject *obj, QList<DataGuard> *l) : list(l) { (QmlGuard<QObject>&)*this = obj; }
-        QList<DataGuard> *list;
-        void objectDestroyed(QObject *) {
-            // we assume priv will always be destroyed after objectDestroyed calls
-            list->removeOne(*this);
-        }
-    };
-
-    QList<DataGuard> dataList;
-    static void data_append(QmlListProperty<QObject> *prop, QObject *o) {
-        QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
-        list->append(DataGuard(o, list));
-    }
-    static void data_clear(QmlListProperty<QObject> *prop) {
-        QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
-        list->clear();
-    }
-    static QObject *data_at(QmlListProperty<QObject> *prop, int index) {
-        QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
-        return list->at(index);
-    }
-    static int data_count(QmlListProperty<QObject> *prop) {
-        QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
-        return list->count();
-    }
-};
-
-QHash<QObject *, QmlPackageAttached *> QmlPackageAttached::attached;
-
-QmlPackageAttached::QmlPackageAttached(QObject *parent)
-: QObject(parent)
-{
-    attached.insert(parent, this);
-}
-
-QmlPackageAttached::~QmlPackageAttached()
-{
-    attached.remove(parent());
-}
-
-QString QmlPackageAttached::name() const 
-{ 
-    return _name; 
-}
-
-void QmlPackageAttached::setName(const QString &n) 
-{ 
-    _name = n; 
-}
-
-QmlPackage::QmlPackage(QObject *parent)
-    : QObject(*(new QmlPackagePrivate), parent)
-{
-}
-
-QmlPackage::~QmlPackage()
-{
-    Q_D(QmlPackage);
-    for (int ii = 0; ii < d->dataList.count(); ++ii) {
-        QObject *obj = d->dataList.at(ii);
-        obj->setParent(this);
-    }
-}
-
-QmlListProperty<QObject> QmlPackage::data()
-{
-    Q_D(QmlPackage);
-    return QmlListProperty<QObject>(this, &d->dataList, QmlPackagePrivate::data_append, 
-                                                        QmlPackagePrivate::data_count, 
-                                                        QmlPackagePrivate::data_at, 
-                                                        QmlPackagePrivate::data_clear);
-}
-
-bool QmlPackage::hasPart(const QString &name)
-{
-    Q_D(QmlPackage);
-    for (int ii = 0; ii < d->dataList.count(); ++ii) {
-        QObject *obj = d->dataList.at(ii);
-        QmlPackageAttached *a = QmlPackageAttached::attached.value(obj);
-        if (a && a->name() == name)
-            return true;
-    }
-    return false;
-}
-
-QObject *QmlPackage::part(const QString &name)
-{
-    Q_D(QmlPackage);
-    if (name.isEmpty() && !d->dataList.isEmpty())
-        return d->dataList.at(0);
-
-    for (int ii = 0; ii < d->dataList.count(); ++ii) {
-        QObject *obj = d->dataList.at(ii);
-        QmlPackageAttached *a = QmlPackageAttached::attached.value(obj);
-        if (a && a->name() == name)
-            return obj;
-    }
-
-    if (name == QLatin1String("default") && !d->dataList.isEmpty())
-        return d->dataList.at(0);
-
-    return 0;
-}
-
-QmlPackageAttached *QmlPackage::qmlAttachedProperties(QObject *o)
-{
-    return new QmlPackageAttached(o);
-}
-
-
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlpackage_p.h b/src/declarative/util/qmlpackage_p.h
deleted file mode 100644
index 63d878a..0000000
--- a/src/declarative/util/qmlpackage_p.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPACKAGE_H
-#define QMLPACKAGE_H
-
-#include <qml.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-/*****************************************************************************
- *****************************************************************************
- XXX Experimental
- *****************************************************************************
-*****************************************************************************/
-
-class QmlPackagePrivate;
-class QmlPackageAttached;
-class QmlPackage : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlPackage)
-
-    Q_CLASSINFO("DefaultProperty", "data")
-    Q_PROPERTY(QmlListProperty<QObject> data READ data SCRIPTABLE false)
-
-public:
-    QmlPackage(QObject *parent=0);
-    virtual ~QmlPackage();
-
-    QmlListProperty<QObject> data();
-
-    QObject *part(const QString & = QString());
-    bool hasPart(const QString &);
-
-    static QmlPackageAttached *qmlAttachedProperties(QObject *);
-};
-
-class QmlPackageAttached : public QObject
-{
-Q_OBJECT
-Q_PROPERTY(QString name READ name WRITE setName)
-public:
-    QmlPackageAttached(QObject *parent);
-    virtual ~QmlPackageAttached();
-
-    QString name() const;
-    void setName(const QString &n);
-
-    static QHash<QObject *, QmlPackageAttached *> attached;
-private:
-    QString _name;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlPackage)
-QML_DECLARE_TYPEINFO(QmlPackage, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif // QMLPACKAGE_H
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp
deleted file mode 100644
index 2459651..0000000
--- a/src/declarative/util/qmlpixmapcache.cpp
+++ /dev/null
@@ -1,611 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlpixmapcache_p.h"
-#include "qmlnetworkaccessmanagerfactory.h"
-#include "qmlimageprovider.h"
-
-#include "qfxperf_p_p.h"
-
-#include <qmlengine.h>
-#include <private/qmlglobal_p.h>
-#include <private/qmlengine_p.h>
-
-#include <QCoreApplication>
-#include <QImageReader>
-#include <QHash>
-#include <QNetworkReply>
-#include <QPixmapCache>
-#include <QFile>
-#include <QThread>
-#include <QMutex>
-#include <QWaitCondition>
-#include <QtCore/qdebug.h>
-#include <private/qobject_p.h>
-#include <QSslError>
-
-#ifdef Q_OS_LINUX
-#include <pthread.h>
-#include <linux/sched.h>
-#endif
-
-// Maximum number of simultaneous image requests to send.
-static const int maxImageRequestCount = 8;
-
-QT_BEGIN_NAMESPACE
-
-#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0))
-inline uint qHash(const QUrl &uri)
-{
-    return qHash(uri.toEncoded(QUrl::FormattingOption(0x100)));
-}
-#endif
-
-class QmlImageReaderEvent : public QEvent
-{
-public:
-    enum ReadError { NoError, Loading, Decoding };
-
-    QmlImageReaderEvent(QmlImageReaderEvent::ReadError err, const QString &errStr, const QImage &img)
-        : QEvent(QEvent::User), error(err), errorString(errStr), image(img) {}
-
-    ReadError error;
-    QString errorString;
-    QImage image;
-};
-
-class QmlImageRequestHandler;
-class QmlImageReader : public QThread
-{
-    Q_OBJECT
-public:
-    QmlImageReader(QmlEngine *eng);
-    ~QmlImageReader();
-
-    QmlPixmapReply *getImage(const QUrl &url);
-    void cancel(QmlPixmapReply *rep);
-
-    static QmlImageReader *instance(QmlEngine *engine);
-
-protected:
-    void run();
-
-private:
-    QList<QmlPixmapReply*> jobs;
-    QList<QmlPixmapReply*> cancelled;
-    QmlEngine *engine;
-    QmlImageRequestHandler *handler;
-    QMutex mutex;
-
-    static QHash<QmlEngine *,QmlImageReader*> readers;
-    static QMutex readerMutex;
-    friend class QmlImageRequestHandler;
-};
-
-QHash<QmlEngine *,QmlImageReader*> QmlImageReader::readers;
-QMutex QmlImageReader::readerMutex;
-
-
-class QmlImageRequestHandler : public QObject
-{
-    Q_OBJECT
-public:
-    QmlImageRequestHandler(QmlImageReader *read, QmlEngine *eng)
-        : QObject(), accessManager(0), engine(eng), reader(read)
-    {
-        QCoreApplication::postEvent(this, new QEvent(QEvent::User));
-    }
-
-    QmlPixmapReply *getImage(const QUrl &url);
-    void cancel(QmlPixmapReply *reply);
-
-protected:
-    bool event(QEvent *event);
-
-private slots:
-    void networkRequestDone();
-
-private:
-    QNetworkAccessManager *networkAccessManager() {
-        if (!accessManager)
-            accessManager = QmlEnginePrivate::get(engine)->createNetworkAccessManager(this);
-        return accessManager;
-    }
-
-    QHash<QNetworkReply*,QmlPixmapReply*> replies;
-    QNetworkAccessManager *accessManager;
-    QmlEngine *engine;
-    QmlImageReader *reader;
-};
-
-//===========================================================================
-
-bool QmlImageRequestHandler::event(QEvent *event)
-{
-    if (event->type() == QEvent::User) {
-        static int replyDownloadProgress = -1;
-        static int replyFinished = -1;
-        static int downloadProgress = -1;
-        static int thisNetworkRequestDone = -1;
-
-        if (replyDownloadProgress == -1) {
-            replyDownloadProgress = QNetworkReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)");
-            replyFinished = QNetworkReply::staticMetaObject.indexOfSignal("finished()");
-            downloadProgress = QmlPixmapReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)");
-            thisNetworkRequestDone = QmlImageRequestHandler::staticMetaObject.indexOfSlot("networkRequestDone()");
-        }
-
-        while (1) {
-            reader->mutex.lock();
-
-            if (reader->cancelled.count()) {
-                for (int i = 0; i < reader->cancelled.count(); ++i) {
-                    QmlPixmapReply *job = reader->cancelled.at(i);
-                    // cancel any jobs already started
-                    QNetworkReply *reply = replies.key(job, 0);
-                    if (reply && reply->isRunning()) {
-                        replies.remove(reply);
-                        reply->close();
-                    }
-                    // remove from pending job list
-                    for (int j = 0; j < reader->jobs.count(); ++j) {
-                        if (reader->jobs.at(j) == job) {
-                            reader->jobs.removeAt(j);
-                            job->release(true);
-                            break;
-                        }
-                    }
-                }
-                reader->cancelled.clear();
-            }
-
-            if (!reader->jobs.count() || replies.count() > maxImageRequestCount) {
-                reader->mutex.unlock();
-                break;
-            }
-
-            QmlPixmapReply *runningJob = reader->jobs.takeLast();
-            QUrl url = runningJob->url();
-            reader->mutex.unlock();
-
-            // fetch
-            if (url.scheme() == QLatin1String("image")) {
-                QImage image = QmlEnginePrivate::get(engine)->getImageFromProvider(url);
-                QmlImageReaderEvent::ReadError errorCode = QmlImageReaderEvent::NoError;
-                QString errorStr;
-                if (image.isNull()) {
-                    errorCode = QmlImageReaderEvent::Loading;
-                    errorStr = QLatin1String("Failed to get image from provider: ") + url.toString();
-                }
-                QCoreApplication::postEvent(runningJob, new QmlImageReaderEvent(errorCode, errorStr, image));
-            } else {
-                QNetworkRequest req(url);
-                req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
-                QNetworkReply *reply = networkAccessManager()->get(req);
-
-                QMetaObject::connect(reply, replyDownloadProgress, runningJob, downloadProgress);
-                QMetaObject::connect(reply, replyFinished, this, thisNetworkRequestDone);
-
-                replies.insert(reply, runningJob);
-            }
-        }
-        return true;
-    }
-
-    return QObject::event(event);
-}
-
-void QmlImageRequestHandler::networkRequestDone()
-{
-    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
-    QmlPixmapReply *job = replies.take(reply);
-    if (job) {
-        QImage image;
-        QmlImageReaderEvent::ReadError error;
-        QString errorString;
-        if (reply->error()) {
-            error = QmlImageReaderEvent::Loading;
-            errorString = reply->errorString();
-        } else {
-            QImageReader imgio(reply);
-            if (imgio.read(&image)) {
-                error = QmlImageReaderEvent::NoError;
-            } else {
-                errorString = QLatin1String("Error decoding: ") + reply->url().toString()
-                              + QLatin1String(" \"") + imgio.errorString() + QLatin1String("\"");
-                error = QmlImageReaderEvent::Decoding;
-            }
-        }
-        // send completion event to the QmlPixmapReply
-        QCoreApplication::postEvent(job, new QmlImageReaderEvent(error, errorString, image));
-    }
-    // kick off event loop again if we have dropped below max request count
-    if (replies.count() == maxImageRequestCount)
-        QCoreApplication::postEvent(this, new QEvent(QEvent::User));
-    reply->deleteLater();
-}
-
-//===========================================================================
-
-QmlImageReader::QmlImageReader(QmlEngine *eng)
-    : QThread(eng), engine(eng), handler(0)
-{
-    start(QThread::LowPriority);
-}
-
-QmlImageReader::~QmlImageReader()
-{
-    readerMutex.lock();
-    readers.remove(engine);
-    readerMutex.unlock();
-
-    quit();
-    wait();
-}
-
-QmlImageReader *QmlImageReader::instance(QmlEngine *engine)
-{
-    readerMutex.lock();
-    QmlImageReader *reader = readers.value(engine);
-    if (!reader) {
-        reader = new QmlImageReader(engine);
-        readers.insert(engine, reader);
-    }
-    readerMutex.unlock();
-
-    return reader;
-}
-
-QmlPixmapReply *QmlImageReader::getImage(const QUrl &url)
-{
-    mutex.lock();
-    QmlPixmapReply *reply = new QmlPixmapReply(this, url);
-    reply->addRef();
-    reply->setLoading();
-    jobs.append(reply);
-    if (jobs.count() == 1 && handler)
-        QCoreApplication::postEvent(handler, new QEvent(QEvent::User));
-    mutex.unlock();
-    return reply;
-}
-
-void QmlImageReader::cancel(QmlPixmapReply *reply)
-{
-    mutex.lock();
-    if (reply->isLoading()) {
-        // Add to cancel list to be cancelled in reader thread.
-        cancelled.append(reply);
-        if (cancelled.count() == 1 && handler)
-            QCoreApplication::postEvent(handler, new QEvent(QEvent::User));
-    }
-    mutex.unlock();
-}
-
-void QmlImageReader::run()
-{
-#if defined(Q_OS_LINUX) && defined(SCHED_IDLE)
-    struct sched_param param;
-    int policy;
-
-    pthread_getschedparam(pthread_self(), &policy, &param);
-    pthread_setschedparam(pthread_self(), SCHED_IDLE, &param);
-#endif
-
-    handler = new QmlImageRequestHandler(this, engine);
-
-    exec();
-
-    delete handler;
-    handler = 0;
-}
-
-//===========================================================================
-
-static bool readImage(QIODevice *dev, QPixmap *pixmap, QString &errorString)
-{
-    QImageReader imgio(dev);
-
-//#define QT_TEST_SCALED_SIZE
-#ifdef QT_TEST_SCALED_SIZE
-    /*
-    Some mechanism is needed for loading images at a limited size, especially
-    for remote images. Loading only thumbnails of remote progressive JPEG
-    images can be efficient. (Qt jpeg handler does not do so currently)
-    */
-
-    QSize limit(60,60);
-    QSize sz = imgio.size();
-    if (sz.width() > limit.width() || sz.height() > limit.height()) {
-        sz.scale(limit,Qt::KeepAspectRatio);
-        imgio.setScaledSize(sz);
-    }
-#endif
-
-    QImage img;
-    if (imgio.read(&img)) {
-#ifdef QT_TEST_SCALED_SIZE
-        if (!sz.isValid())
-            img = img.scaled(limit,Qt::KeepAspectRatio);
-#endif
-        *pixmap = QPixmap::fromImage(img);
-        return true;
-    } else {
-        errorString = imgio.errorString();
-        return false;
-    }
-}
-
-/*!
-    \internal
-    \class QmlPixmapCache
-    \brief Enacapsultes a pixmap for QmlGraphics items.
-
-    This class is NOT reentrant.
- */
-
-static QString toLocalFileOrQrc(const QUrl& url)
-{
-    QString r = url.toLocalFile();
-    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
-        r = QLatin1Char(':') + url.path();
-    return r;
-}
-
-typedef QHash<QUrl, QmlPixmapReply *> QmlPixmapReplyHash;
-Q_GLOBAL_STATIC(QmlPixmapReplyHash, qmlActivePixmapReplies);
-
-class QmlPixmapReplyPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlPixmapReply)
-
-public:
-    QmlPixmapReplyPrivate(QmlImageReader *r, const QUrl &u)
-        : QObjectPrivate(), refCount(1), url(u), status(QmlPixmapReply::Loading), loading(false), reader(r) {
-    }
-
-    int refCount;
-    QUrl url;
-    QPixmap pixmap; // ensure reference to pixmap so QPixmapCache does not discard
-    QmlPixmapReply::Status status;
-    bool loading;
-    QmlImageReader *reader;
-};
-
-
-QmlPixmapReply::QmlPixmapReply(QmlImageReader *reader, const QUrl &url)
-  : QObject(*new QmlPixmapReplyPrivate(reader, url), 0)
-{
-}
-
-QmlPixmapReply::~QmlPixmapReply()
-{
-}
-
-const QUrl &QmlPixmapReply::url() const
-{
-    Q_D(const QmlPixmapReply);
-    return d->url;
-}
-
-bool QmlPixmapReply::event(QEvent *event)
-{
-    Q_D(QmlPixmapReply);
-    if (event->type() == QEvent::User) {
-        d->loading = false;
-        if (!release(true)) {
-            QmlImageReaderEvent *de = static_cast<QmlImageReaderEvent*>(event);
-            d->status = (de->error == QmlImageReaderEvent::NoError) ? Ready : Error;
-            if (d->status == Ready)
-                d->pixmap = QPixmap::fromImage(de->image);
-            else
-                qWarning() << de->errorString;
-            QByteArray key = d->url.toEncoded(QUrl::FormattingOption(0x100));
-            QString strKey = QString::fromLatin1(key.constData(), key.count());
-            QPixmapCache::insert(strKey, d->pixmap); // note: may fail (returns false)
-            emit finished();
-        }
-        return true;
-    }
-
-    return QObject::event(event);
-}
-
-QmlPixmapReply::Status QmlPixmapReply::status() const
-{
-    Q_D(const QmlPixmapReply);
-    return d->status;
-}
-
-bool QmlPixmapReply::isLoading() const
-{
-    Q_D(const QmlPixmapReply);
-    return d->loading;
-}
-
-void QmlPixmapReply::setLoading()
-{
-    Q_D(QmlPixmapReply);
-    d->loading = true;
-}
-
-void QmlPixmapReply::addRef()
-{
-    Q_D(QmlPixmapReply);
-    ++d->refCount;
-}
-
-bool QmlPixmapReply::release(bool defer)
-{
-    Q_D(QmlPixmapReply);
-    Q_ASSERT(d->refCount > 0);
-    --d->refCount;
-    if (d->refCount == 0) {
-        qmlActivePixmapReplies()->remove(d->url);
-        if (defer)
-            deleteLater();
-        else
-            delete this;
-        return true;
-    } else if (d->refCount == 1 && d->loading) {
-        // The only reference left is the reader thread.
-        qmlActivePixmapReplies()->remove(d->url);
-        d->reader->cancel(this);
-    }
-
-    return false;
-}
-
-/*!
-    Finds the cached pixmap corresponding to \a url.
-    If the image is a network resource and has not yet
-    been retrieved and cached, request() must be called.
-
-    Returns Ready, or Error if the image has been retrieved,
-    otherwise the current retrieval status.
-*/
-QmlPixmapReply::Status QmlPixmapCache::get(const QUrl& url, QPixmap *pixmap)
-{
-    QmlPixmapReply::Status status = QmlPixmapReply::Unrequested;
-
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
-    QString lf = toLocalFileOrQrc(url);
-    if (!lf.isEmpty()) {
-        status = QmlPixmapReply::Ready;
-        if (!QPixmapCache::find(lf,pixmap)) {
-            QFile f(lf);
-            if (f.open(QIODevice::ReadOnly)) {
-                QString errorString;
-                if (!readImage(&f, pixmap, errorString)) {
-                    errorString = QLatin1String("Error decoding: ") + url.toString()
-                                  + QLatin1String(" \"") + errorString + QLatin1String("\"");
-                    qWarning() << errorString;
-                    *pixmap = QPixmap();
-                    status = QmlPixmapReply::Error;
-                }
-            } else {
-                qWarning() << "Cannot open" << url;
-                *pixmap = QPixmap();
-                status = QmlPixmapReply::Error;
-            }
-            if (status == QmlPixmapReply::Ready)
-                QPixmapCache::insert(lf, *pixmap);
-        }
-        return status;
-    }
-#endif
-
-    QByteArray key = url.toEncoded(QUrl::FormattingOption(0x100));
-    QString strKey = QString::fromLatin1(key.constData(), key.count());
-    QmlPixmapReplyHash::Iterator iter = qmlActivePixmapReplies()->find(url);
-    if (iter != qmlActivePixmapReplies()->end() && (*iter)->status() == QmlPixmapReply::Ready) {
-        // Must check this, since QPixmapCache::insert may have failed.
-        *pixmap = (*iter)->d_func()->pixmap;
-        status = (*iter)->status();
-        (*iter)->release();
-    } else if (QPixmapCache::find(strKey, pixmap)) {
-        if (iter != qmlActivePixmapReplies()->end()) {
-            status = (*iter)->status();
-            (*iter)->release();
-        } else {
-            status = pixmap->isNull() ? QmlPixmapReply::Error : QmlPixmapReply::Ready;
-        }
-    } else if (iter != qmlActivePixmapReplies()->end()) {
-        status = QmlPixmapReply::Loading;
-    }
-
-    return status;
-}
-
-/*!
-    Starts a network request to load \a url.
-
-    Returns a QmlPixmapReply.  Caller should connect to QmlPixmapReply::finished()
-    and call get() when the image is available.
-
-    The returned QmlPixmapReply will be deleted when all request() calls are
-    matched by a corresponding get() call.
-*/
-QmlPixmapReply *QmlPixmapCache::request(QmlEngine *engine, const QUrl &url)
-{
-    QmlPixmapReplyHash::Iterator iter = qmlActivePixmapReplies()->find(url);
-    if (iter == qmlActivePixmapReplies()->end()) {
-        QmlImageReader *reader = QmlImageReader::instance(engine);
-        QmlPixmapReply *item = reader->getImage(url);
-        iter = qmlActivePixmapReplies()->insert(url, item);
-    } else {
-        (*iter)->addRef();
-    }
-
-    return (*iter);
-}
-
-/*!
-    Cancels a previous call to request().
-
-    May also cancel loading (eg. if no other pending request).
-
-    Any connections from the QmlPixmapReply returned by request() to \a obj will be
-    disconnected.
-*/
-void QmlPixmapCache::cancel(const QUrl& url, QObject *obj)
-{
-    QmlPixmapReplyHash::Iterator iter = qmlActivePixmapReplies()->find(url);
-    if (iter == qmlActivePixmapReplies()->end())
-        return;
-
-    QmlPixmapReply *reply = *iter;
-    if (obj)
-        QObject::disconnect(reply, 0, obj, 0);
-    reply->release();
-}
-
-/*!
-    This function is mainly for test verification. It returns the number of
-    requests that are still unfinished.
-*/
-int QmlPixmapCache::pendingRequests()
-{
-    return qmlActivePixmapReplies()->count();
-}
-
-QT_END_NAMESPACE
-
-#include <qmlpixmapcache.moc>
diff --git a/src/declarative/util/qmlpixmapcache_p.h b/src/declarative/util/qmlpixmapcache_p.h
deleted file mode 100644
index 86908cc..0000000
--- a/src/declarative/util/qmlpixmapcache_p.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPIXMAPCACHE_H
-#define QMLPIXMAPCACHE_H
-
-#include <QtCore/QString>
-#include <QtGui/QPixmap>
-#include <QtCore/qurl.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-class QmlEngine;
-class QNetworkReply;
-class QmlImageReader;
-
-class QmlPixmapReplyPrivate;
-class Q_DECLARATIVE_EXPORT QmlPixmapReply : public QObject
-{
-    Q_OBJECT
-public:
-    ~QmlPixmapReply();
-
-    enum Status { Ready, Error, Unrequested, Loading };
-    Status status() const;
-
-    const QUrl &url() const;
-
-Q_SIGNALS:
-    void finished();
-    void downloadProgress(qint64, qint64);
-
-protected:
-    bool event(QEvent *event);
-
-private:
-    void addRef();
-    bool release(bool defer=false);
-    bool isLoading() const;
-    void setLoading();
-
-private:
-    QmlPixmapReply(QmlImageReader *reader, const QUrl &url);
-    Q_DISABLE_COPY(QmlPixmapReply)
-    Q_DECLARE_PRIVATE(QmlPixmapReply)
-    friend class QmlImageRequestHandler;
-    friend class QmlImageReader;
-    friend class QmlPixmapCache;
-};
-
-class Q_DECLARATIVE_EXPORT QmlPixmapCache
-{
-public:
-    static QmlPixmapReply::Status get(const QUrl& url, QPixmap *pixmap);
-    static QmlPixmapReply *request(QmlEngine *, const QUrl& url);
-    static void cancel(const QUrl& url, QObject *obj);
-    static int pendingRequests();
-};
-
-
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLPIXMAPCACHE_H
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
deleted file mode 100644
index 8f83566..0000000
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ /dev/null
@@ -1,456 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlpropertychanges_p.h"
-
-#include "qmlopenmetaobject_p.h"
-
-#include <qmlinfo.h>
-#include <qmlcustomparser_p.h>
-#include <qmlparser_p.h>
-#include <qmlexpression.h>
-#include <qmlbinding_p.h>
-#include <qmlcontext.h>
-#include <qmlguard_p.h>
-
-#include <QtCore/qdebug.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass PropertyChanges QmlPropertyChanges
-  \since 4.7
-    \brief The PropertyChanges element describes new property values for a state.
-
-    PropertyChanges provides a state change that modifies the properties of an item.
-
-    Here is a property change that modifies the text and color of a Text element
-    when it is clicked:
-    
-    \qml
-    Text {
-        id: myText
-        width: 100; height: 100
-        text: "Hello"
-        color: "blue"
-
-        states: State {
-            name: "myState"
-
-            PropertyChanges {
-                target: myText
-                text: "Goodbye"
-                color: "red"
-            }
-        }
-
-        MouseArea { anchors.fill: parent; onClicked: myText.state = 'myState' }
-    }
-    \endqml
-    
-    State-specific script for signal handlers can also be specified:
-
-    \qml
-    PropertyChanges {
-        target: myMouseArea
-        onClicked: doSomethingDifferent()
-    }
-    \endqml
-
-    Changes to an Item's parent or anchors should be done using the associated change elements
-    (ParentChange and AnchorChanges, respectively) rather than PropertyChanges.
-
-    \sa {qmlstate}{States}
-*/
-
-/*!
-    \internal
-    \class QmlPropertyChanges
-    \brief The QmlPropertyChanges class describes new property values for a state.
-*/
-
-/*!
-    \qmlproperty Object PropertyChanges::target
-    This property holds the object which contains the properties to be changed.
-*/
-
-class QmlReplaceSignalHandler : public QmlActionEvent
-{
-public:
-    QmlReplaceSignalHandler() : expression(0), reverseExpression(0),
-                                rewindExpression(0), ownedExpression(0) {}
-    ~QmlReplaceSignalHandler() {
-        delete ownedExpression;
-    }
-
-    virtual QString typeName() const { return QLatin1String("ReplaceSignalHandler"); }
-
-    QmlMetaProperty property;
-    QmlExpression *expression;
-    QmlExpression *reverseExpression;
-    QmlExpression *rewindExpression;
-    QmlGuard<QmlExpression> ownedExpression;
-
-    virtual void execute() {
-        ownedExpression = property.setSignalExpression(expression);
-    }
-
-    virtual bool isReversable() { return true; }
-    virtual void reverse() {
-        ownedExpression = property.setSignalExpression(reverseExpression);
-    }
-
-    virtual void saveOriginals() {
-        saveCurrentValues();
-        reverseExpression = rewindExpression;
-    }
-
-    virtual void rewind() {
-        ownedExpression = property.setSignalExpression(rewindExpression);
-    }
-    virtual void saveCurrentValues() { rewindExpression = property.signalExpression(); }
-
-    virtual bool override(QmlActionEvent*other) {
-        if (other == this)
-            return true;
-        if (other->typeName() != typeName())
-            return false;
-        if (static_cast<QmlReplaceSignalHandler*>(other)->property == property)
-            return true;
-        return false;
-    }
-};
-
-
-class QmlPropertyChangesPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlPropertyChanges)
-public:
-    QmlPropertyChangesPrivate() : object(0), decoded(true), restore(true),
-                                isExplicit(false) {}
-
-    QObject *object;
-    QByteArray data;
-
-    bool decoded : 1;
-    bool restore : 1;
-    bool isExplicit : 1;
-
-    void decode();
-
-    QList<QPair<QByteArray, QVariant> > properties;
-    QList<QPair<QByteArray, QmlExpression *> > expressions;
-    QList<QmlReplaceSignalHandler*> signalReplacements;
-
-    QmlMetaProperty property(const QByteArray &);
-};
-
-void
-QmlPropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> > &list,
-                                     const QByteArray &pre,
-                                     const QmlCustomParserProperty &prop)
-{
-    QByteArray propName = pre + prop.name();
-
-    QList<QVariant> values = prop.assignedValues();
-    for (int ii = 0; ii < values.count(); ++ii) {
-        const QVariant &value = values.at(ii);
-
-        if (value.userType() == qMetaTypeId<QmlCustomParserNode>()) {
-            continue;
-        } else if(value.userType() == qMetaTypeId<QmlCustomParserProperty>()) {
-
-            QmlCustomParserProperty prop =
-                qvariant_cast<QmlCustomParserProperty>(value);
-            QByteArray pre = propName + '.';
-            compileList(list, pre, prop);
-
-        } else {
-            list << qMakePair(propName, value);
-        }
-    }
-}
-
-QByteArray
-QmlPropertyChangesParser::compile(const QList<QmlCustomParserProperty> &props)
-{
-    QList<QPair<QByteArray, QVariant> > data;
-    for(int ii = 0; ii < props.count(); ++ii)
-        compileList(data, QByteArray(), props.at(ii));
-
-    QByteArray rv;
-    QDataStream ds(&rv, QIODevice::WriteOnly);
-
-    ds << data.count();
-    for(int ii = 0; ii < data.count(); ++ii) {
-        QmlParser::Variant v = qvariant_cast<QmlParser::Variant>(data.at(ii).second);
-        QVariant var;
-        bool isScript = v.isScript();
-        switch(v.type()) {
-        case QmlParser::Variant::Boolean:
-            var = QVariant(v.asBoolean());
-            break;
-        case QmlParser::Variant::Number:
-            var = QVariant(v.asNumber());
-            break;
-        case QmlParser::Variant::String:
-            var = QVariant(v.asString());
-            break;
-        case QmlParser::Variant::Invalid:
-        case QmlParser::Variant::Script:
-            var = QVariant(v.asScript());
-            break;
-        }
-
-        ds << data.at(ii).first << isScript << var;
-    }
-
-    return rv;
-}
-
-void QmlPropertyChangesPrivate::decode()
-{
-    Q_Q(QmlPropertyChanges);
-    if (decoded)
-        return;
-
-    QDataStream ds(&data, QIODevice::ReadOnly);
-
-    int count;
-    ds >> count;
-    for (int ii = 0; ii < count; ++ii) {
-        QByteArray name;
-        bool isScript;
-        QVariant data;
-        ds >> name;
-        ds >> isScript;
-        ds >> data;
-
-        QmlMetaProperty prop = property(name);      //### better way to check for signal property?
-        if (prop.type() & QmlMetaProperty::SignalProperty) {
-            QmlExpression *expression = new QmlExpression(qmlContext(q), data.toString(), object);
-            QmlReplaceSignalHandler *handler = new QmlReplaceSignalHandler;
-            handler->property = prop;
-            handler->expression = expression;
-            signalReplacements << handler;
-        } else if (isScript) {
-            QmlExpression *expression = new QmlExpression(qmlContext(q), data.toString(), object);
-            expressions << qMakePair(name, expression);
-        } else {
-            properties << qMakePair(name, data);
-        }
-    }
-
-    decoded = true;
-    data.clear();
-}
-
-void QmlPropertyChangesParser::setCustomData(QObject *object,
-                                            const QByteArray &data)
-{
-    QmlPropertyChangesPrivate *p =
-        static_cast<QmlPropertyChangesPrivate *>(QObjectPrivate::get(object));
-    p->data = data;
-    p->decoded = false;
-}
-
-QmlPropertyChanges::QmlPropertyChanges()
-: QmlStateOperation(*(new QmlPropertyChangesPrivate))
-{
-}
-
-QmlPropertyChanges::~QmlPropertyChanges()
-{
-    Q_D(QmlPropertyChanges);
-    for(int ii = 0; ii < d->expressions.count(); ++ii)
-        delete d->expressions.at(ii).second;
-    for(int ii = 0; ii < d->signalReplacements.count(); ++ii)
-        delete d->signalReplacements.at(ii);
-}
-
-QObject *QmlPropertyChanges::object() const
-{
-    Q_D(const QmlPropertyChanges);
-    return d->object;
-}
-
-void QmlPropertyChanges::setObject(QObject *o)
-{
-    Q_D(QmlPropertyChanges);
-    d->object = o;
-}
-
-/*!
-    \qmlproperty bool PropertyChanges::restoreEntryValues
-    
-    Whether or not the previous values should be restored when
-    leaving the state. By default, restoreEntryValues is true.
-
-    By setting restoreEntryValues to false, you can create a temporary state
-    that has permanent effects on property values.
-*/
-bool QmlPropertyChanges::restoreEntryValues() const
-{
-    Q_D(const QmlPropertyChanges);
-    return d->restore;
-}
-
-void QmlPropertyChanges::setRestoreEntryValues(bool v)
-{
-    Q_D(QmlPropertyChanges);
-    d->restore = v;
-}
-
-QmlMetaProperty
-QmlPropertyChangesPrivate::property(const QByteArray &property)
-{
-    Q_Q(QmlPropertyChanges);
-    QmlMetaProperty prop = QmlMetaProperty::createProperty(object, QString::fromUtf8(property));
-    if (!prop.isValid()) {
-        qmlInfo(q) << QmlPropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(property));
-        return QmlMetaProperty();
-    } else if (!(prop.type() & QmlMetaProperty::SignalProperty) && !prop.isWritable()) {
-        qmlInfo(q) << QmlPropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(QString::fromUtf8(property));
-        return QmlMetaProperty();
-    }
-    return prop;
-}
-
-QmlPropertyChanges::ActionList QmlPropertyChanges::actions()
-{
-    Q_D(QmlPropertyChanges);
-
-    d->decode();
-
-    ActionList list;
-
-    for (int ii = 0; ii < d->properties.count(); ++ii) {
-
-        QByteArray property = d->properties.at(ii).first;
-
-        QmlAction a(d->object, QString::fromLatin1(property),
-                 d->properties.at(ii).second);
-
-        if (a.property.isValid()) {
-            a.restore = restoreEntryValues();
-
-            if (a.property.propertyType() == QVariant::Url &&
-                (a.toValue.userType() == QVariant::String || a.toValue.userType() == QVariant::ByteArray) && !a.toValue.isNull())
-                a.toValue.setValue(qmlContext(this)->resolvedUrl(QUrl(a.toValue.toString())));
-
-            list << a;
-        }
-    }
-
-    for (int ii = 0; ii < d->signalReplacements.count(); ++ii) {
-
-        QmlReplaceSignalHandler *handler = d->signalReplacements.at(ii);
-
-        if (handler->property.isValid()) {
-            QmlAction a;
-            a.event = handler;
-            list << a;
-        }
-    }
-
-    for (int ii = 0; ii < d->expressions.count(); ++ii) {
-
-        QByteArray property = d->expressions.at(ii).first;
-        QmlMetaProperty prop = d->property(property);
-
-        if (prop.isValid()) {
-            QmlAction a;
-            a.restore = restoreEntryValues();
-            a.property = prop;
-            a.fromValue = a.property.read();
-            a.specifiedObject = d->object;
-            a.specifiedProperty = QString::fromLatin1(property);
-
-            if (d->isExplicit) {
-                a.toValue = d->expressions.at(ii).second->value();
-            } else {
-                QmlBinding *newBinding = new QmlBinding(d->expressions.at(ii).second->expression(), object(), qmlContext(this));
-                newBinding->setTarget(prop);
-                a.toBinding = newBinding;
-                a.deletableToBinding = true;
-            }
-
-            list << a;
-        }
-    }
-
-    return list;
-}
-
-/*!
-    \qmlproperty bool PropertyChanges::explicit
-
-    If explicit is set to true, any potential bindings will be interpreted as
-    once-off assignments that occur when the state is entered.
-
-    In the following example, the addition of explicit prevents myItem.width from
-    being bound to parent.width. Instead, it is assigned the value of parent.width
-    at the time of the state change.
-    \qml
-    PropertyChanges {
-        target: myItem
-        explicit: true
-        width: parent.width
-    }
-    \endqml
-
-    By default, explicit is false.
-*/
-bool QmlPropertyChanges::isExplicit() const
-{
-    Q_D(const QmlPropertyChanges);
-    return d->isExplicit;
-}
-
-void QmlPropertyChanges::setIsExplicit(bool e)
-{
-    Q_D(QmlPropertyChanges);
-    d->isExplicit = e;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlpropertychanges_p.h b/src/declarative/util/qmlpropertychanges_p.h
deleted file mode 100644
index 62e977a..0000000
--- a/src/declarative/util/qmlpropertychanges_p.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPROPERTYCHANGES_H
-#define QMLPROPERTYCHANGES_H
-
-#include "qmlstateoperations_p.h"
-#include <private/qmlcustomparser_p.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-    
-class QmlPropertyChangesPrivate;
-class Q_DECLARATIVE_EXPORT QmlPropertyChanges : public QmlStateOperation
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlPropertyChanges)
-
-    Q_PROPERTY(QObject *target READ object WRITE setObject)
-    Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues)
-    Q_PROPERTY(bool explicit READ isExplicit WRITE setIsExplicit)
-public:
-    QmlPropertyChanges();
-    ~QmlPropertyChanges();
-
-    QObject *object() const;
-    void setObject(QObject *);
-
-    bool restoreEntryValues() const;
-    void setRestoreEntryValues(bool);
-
-    bool isExplicit() const;
-    void setIsExplicit(bool);
-
-    virtual ActionList actions();
-};
-
-class QmlPropertyChangesParser : public QmlCustomParser
-{
-public:
-    void compileList(QList<QPair<QByteArray, QVariant> > &list, const QByteArray &pre, const QmlCustomParserProperty &prop);
-
-    virtual QByteArray compile(const QList<QmlCustomParserProperty> &);
-    virtual void setCustomData(QObject *, const QByteArray &);
-};
-
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlPropertyChanges)
-
-QT_END_HEADER
-
-#endif // QMLPROPERTYCHANGES_H
diff --git a/src/declarative/util/qmlpropertymap.cpp b/src/declarative/util/qmlpropertymap.cpp
deleted file mode 100644
index 317896e..0000000
--- a/src/declarative/util/qmlpropertymap.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlpropertymap.h"
-
-#include "qmlopenmetaobject_p.h"
-
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-
-//QmlPropertyMapMetaObject lets us listen for changes coming from QML
-//so we can emit the changed signal.
-class QmlPropertyMapMetaObject : public QmlOpenMetaObject
-{
-public:
-    QmlPropertyMapMetaObject(QmlPropertyMap *obj, QmlPropertyMapPrivate *objPriv);
-
-protected:
-    virtual void propertyWrite(int index);
-
-private:
-    QmlPropertyMap *map;
-    QmlPropertyMapPrivate *priv;
-};
-
-class QmlPropertyMapPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlPropertyMap)
-public:
-    QmlPropertyMapMetaObject *mo;
-    QStringList keys;
-    void emitChanged(const QString &key);
-};
-
-void QmlPropertyMapPrivate::emitChanged(const QString &key)
-{
-    Q_Q(QmlPropertyMap);
-    emit q->valueChanged(key);
-}
-
-QmlPropertyMapMetaObject::QmlPropertyMapMetaObject(QmlPropertyMap *obj, QmlPropertyMapPrivate *objPriv) : QmlOpenMetaObject(obj)
-{
-    map = obj;
-    priv = objPriv;
-}
-
-void QmlPropertyMapMetaObject::propertyWrite(int index)
-{
-    priv->emitChanged(QString::fromUtf8(name(index)));
-}
-
-/*!
-    \class QmlPropertyMap
-  \since 4.7
-    \brief The QmlPropertyMap class allows you to set key-value pairs that can be used in bindings.
-
-    QmlPropertyMap provides a convenient way to expose domain data to the UI layer.
-    The following example shows how you might declare data in C++ and then
-    access it in QML.
-
-    Setup in C++:
-    \code
-    //create our data
-    QmlPropertyMap ownerData;
-    ownerData.insert("name", QVariant(QString("John Smith")));
-    ownerData.insert("phone", QVariant(QString("555-5555")));
-
-    //expose it to the UI layer
-    QmlContext *ctxt = view->bindContext();
-    ctxt->setProperty("owner", &data);
-    \endcode
-
-    Then, in QML:
-    \code
-    Text { text: owner.name }
-    Text { text: owner.phone }
-    \endcode
-
-    The binding is dynamic - whenever a key's value is updated, anything bound to that
-    key will be updated as well.
-
-    To detect value changes made in the UI layer you can connect to the valueChanged() signal.
-    However, note that valueChanged() is \bold NOT emitted when changes are made by calling insert()
-    or clear() - it is only emitted when a value is updated from QML.
-
-    \note It is not possible to remove keys from the map; once a key has been added, you can only
-    modify or clear its associated value.
-*/
-
-/*!
-    Constructs a bindable map with parent object \a parent.
-*/
-QmlPropertyMap::QmlPropertyMap(QObject *parent)
-: QObject(*(new QmlPropertyMapPrivate), parent)
-{
-    Q_D(QmlPropertyMap);
-    d->mo = new QmlPropertyMapMetaObject(this, d);
-}
-
-/*!
-    Destroys the bindable map.
-*/
-QmlPropertyMap::~QmlPropertyMap()
-{
-}
-
-/*!
-    Clears the value (if any) associated with \a key.
-*/
-void QmlPropertyMap::clear(const QString &key)
-{
-    Q_D(QmlPropertyMap);
-    d->mo->setValue(key.toUtf8(), QVariant());
-}
-
-/*!
-    Returns the value associated with \a key.
-
-    If no value has been set for this key (or if the value has been cleared),
-    an invalid QVariant is returned.
-*/
-QVariant QmlPropertyMap::value(const QString &key) const
-{
-    Q_D(const QmlPropertyMap);
-    return d->mo->value(key.toUtf8());
-}
-
-/*!
-    Sets the value associated with \a key to \a value.
-
-    If the key doesn't exist, it is automatically created.
-*/
-void QmlPropertyMap::insert(const QString &key, const QVariant &value)
-{
-    Q_D(QmlPropertyMap);
-    if (!d->keys.contains(key))
-        d->keys.append(key);
-    d->mo->setValue(key.toUtf8(), value);
-}
-
-/*!
-    Returns the list of keys.
-
-    Keys that have been cleared will still appear in this list, even though their
-    associated values are invalid QVariants.
-*/
-QStringList QmlPropertyMap::keys() const
-{
-    Q_D(const QmlPropertyMap);
-    return d->keys;
-}
-
-/*!
-    \overload
-
-    Same as size().
-*/
-int QmlPropertyMap::count() const
-{
-    Q_D(const QmlPropertyMap);
-    return d->keys.count();
-}
-
-/*!
-    Returns the number of keys in the map.
-
-    \sa isEmpty(), count()
-*/
-int QmlPropertyMap::size() const
-{
-    Q_D(const QmlPropertyMap);
-    return d->keys.size();
-}
-
-/*!
-    Returns true if the map contains no keys; otherwise returns
-    false.
-
-    \sa size()
-*/
-bool QmlPropertyMap::isEmpty() const
-{
-    Q_D(const QmlPropertyMap);
-    return d->keys.isEmpty();
-}
-
-/*!
-    Returns true if the map contains \a key.
-
-    \sa size()
-*/
-bool QmlPropertyMap::contains(const QString &key) const
-{
-    Q_D(const QmlPropertyMap);
-    return d->keys.contains(key);
-}
-
-/*!
-    Returns the value associated with the key \a key as a modifiable
-    reference.
-
-    If the map contains no item with key \a key, the function inserts
-    an invalid QVariant into the map with key \a key, and
-    returns a reference to it.
-
-    \sa insert(), value()
-*/
-QVariant &QmlPropertyMap::operator[](const QString &key)
-{
-    //### optimize
-    Q_D(QmlPropertyMap);
-    QByteArray utf8key = key.toUtf8();
-    if (!d->keys.contains(key)) {
-        d->keys.append(key);
-        d->mo->setValue(utf8key, QVariant());   //force creation -- needed below
-    }
-
-    return (*(d->mo))[utf8key];
-}
-
-/*!
-    \overload
-
-    Same as value().
-*/
-const QVariant QmlPropertyMap::operator[](const QString &key) const
-{
-    return value(key);
-}
-
-/*!
-    \fn void QmlPropertyMap::valueChanged(const QString &key)
-    This signal is emitted whenever one of the values in the map is changed. \a key
-    is the key corresponding to the value that was changed.
-
-    \note valueChanged() is \bold NOT emitted when changes are made by calling insert()
-    or clear() - it is only emitted when a value is updated from QML.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlpropertymap.h b/src/declarative/util/qmlpropertymap.h
deleted file mode 100644
index a56ed0f..0000000
--- a/src/declarative/util/qmlpropertymap.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLPROPERTYMAP_H
-#define QMLPROPERTYMAP_H
-
-#include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlPropertyMapPrivate;
-class Q_DECLARATIVE_EXPORT QmlPropertyMap : public QObject
-{
-    Q_OBJECT
-public:
-    QmlPropertyMap(QObject *parent = 0);
-    virtual ~QmlPropertyMap();
-
-    QVariant value(const QString &key) const;
-    void insert(const QString &key, const QVariant &value);
-    void clear(const QString &key);
-
-    Q_INVOKABLE QStringList keys() const;
-
-    int count() const;
-    int size() const;
-    bool isEmpty() const;
-    bool contains(const QString &key) const;
-
-    QVariant &operator[](const QString &key);
-    const QVariant operator[](const QString &key) const;
-
-Q_SIGNALS:
-    void valueChanged(const QString &key);
-
-private:
-    Q_DECLARE_PRIVATE(QmlPropertyMap)
-    Q_DISABLE_COPY(QmlPropertyMap)
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp
deleted file mode 100644
index 1eafd9e..0000000
--- a/src/declarative/util/qmlspringfollow.cpp
+++ /dev/null
@@ -1,464 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlspringfollow_p.h"
-
-#include "qmlanimation_p_p.h"
-
-#include <QtCore/qdebug.h>
-
-#include <private/qobject_p.h>
-
-#include <limits.h>
-#include <math.h>
-
-QT_BEGIN_NAMESPACE
-
-
-
-class QmlSpringFollowPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlSpringFollow)
-public:
-    QmlSpringFollowPrivate()
-        : currentValue(0), sourceValue(0), maxVelocity(0), lastTime(0)
-        , mass(1.0), spring(0.), damping(0.), velocity(0), epsilon(0.01)
-        , modulus(0.0), useMass(false), haveModulus(false), enabled(true), mode(Track), clock(this) {}
-
-    QmlMetaProperty property;
-    qreal currentValue;
-    qreal sourceValue;
-    qreal maxVelocity;
-    qreal velocityms;
-    int lastTime;
-    qreal mass;
-    qreal spring;
-    qreal damping;
-    qreal velocity;
-    qreal epsilon;
-    qreal modulus;
-
-    bool useMass : 1;
-    bool haveModulus : 1;
-    bool enabled : 1;
-
-    enum Mode {
-        Track,
-        Velocity,
-        Spring
-    };
-    Mode mode;
-
-    void tick(int);
-    void updateMode();
-    void start();
-    void stop();
-
-    QTickAnimationProxy<QmlSpringFollowPrivate, &QmlSpringFollowPrivate::tick> clock;
-};
-
-void QmlSpringFollowPrivate::tick(int time)
-{
-    Q_Q(QmlSpringFollow);
-
-    int elapsed = time - lastTime;
-    if (!elapsed)
-        return;
-    qreal srcVal = sourceValue;
-    if (haveModulus) {
-        currentValue = fmod(currentValue, modulus);
-        srcVal = fmod(srcVal, modulus);
-    }
-    if (mode == Spring) {
-        if (elapsed < 16) // capped at 62fps.
-            return;
-        // Real men solve the spring DEs using RK4.
-        // We'll do something much simpler which gives a result that looks fine.
-        int count = elapsed / 16;
-        for (int i = 0; i < count; ++i) {
-            qreal diff = srcVal - currentValue;
-            if (haveModulus && qAbs(diff) > modulus / 2) {
-                if (diff < 0)
-                    diff += modulus;
-                else
-                    diff -= modulus;
-            }
-            if (useMass)
-                velocity = velocity + (spring * diff - damping * velocity) / mass;
-            else
-                velocity = velocity + spring * diff - damping * velocity;
-            if (maxVelocity > 0.) {
-                // limit velocity
-                if (velocity > maxVelocity)
-                    velocity = maxVelocity;
-                else if (velocity < -maxVelocity)
-                    velocity = -maxVelocity;
-            }
-            currentValue += velocity * 16.0 / 1000.0;
-            if (haveModulus) {
-                currentValue = fmod(currentValue, modulus);
-                if (currentValue < 0.0)
-                    currentValue += modulus;
-            }
-        }
-        if (qAbs(velocity) < epsilon && qAbs(srcVal - currentValue) < epsilon) {
-            velocity = 0.0;
-            currentValue = srcVal;
-            clock.stop();
-        }
-        lastTime = time - (elapsed - count * 16);
-    } else {
-        qreal moveBy = elapsed * velocityms;
-        qreal diff = srcVal - currentValue;
-        if (haveModulus && qAbs(diff) > modulus / 2) {
-            if (diff < 0)
-                diff += modulus;
-            else
-                diff -= modulus;
-        }
-        if (diff > 0) {
-            currentValue += moveBy;
-            if (haveModulus)
-                currentValue = fmod(currentValue, modulus);
-            if (currentValue > sourceValue) {
-                currentValue = sourceValue;
-                clock.stop();
-            }
-        } else {
-            currentValue -= moveBy;
-            if (haveModulus && currentValue < 0.0)
-                currentValue = fmod(currentValue, modulus) + modulus;
-            if (currentValue < sourceValue) {
-                currentValue = sourceValue;
-                clock.stop();
-            }
-        }
-        lastTime = time;
-    }
-    property.write(currentValue);
-    emit q->valueChanged(currentValue);
-    if (clock.state() != QAbstractAnimation::Running)
-        emit q->syncChanged();
-}
-
-void QmlSpringFollowPrivate::updateMode()
-{
-    if (spring == 0. && maxVelocity == 0.)
-        mode = Track;
-    else if (spring > 0.)
-        mode = Spring;
-    else
-        mode = Velocity;
-}
-
-void QmlSpringFollowPrivate::start()
-{
-    if (!enabled)
-        return;
-
-    Q_Q(QmlSpringFollow);
-    if (mode == QmlSpringFollowPrivate::Track) {
-        currentValue = sourceValue;
-        property.write(currentValue);
-    } else if (sourceValue != currentValue && clock.state() != QAbstractAnimation::Running) {
-        lastTime = 0;
-        currentValue = property.read().toReal();
-        clock.start(); // infinity??
-        emit q->syncChanged();
-    }
-}
-
-void QmlSpringFollowPrivate::stop()
-{
-    clock.stop();
-}
-
-/*!
-    \qmlclass SpringFollow QmlSpringFollow
-    \brief The SpringFollow element allows a property to track a value.
-
-    In example below, \e rect2 will follow \e rect1 moving with a velocity of up to 200:
-    \code
-    Rectangle {
-        id: rect1
-        width: 20; height: 20
-        color: "#00ff00"
-        y: 200  //initial value
-        y: SequentialAnimation {
-            running: true
-            repeat: true
-            NumberAnimation {
-                to: 200
-                easing: "easeOutBounce(amplitude:100)"
-                duration: 2000
-            }
-            PauseAnimation { duration: 1000 }
-        }
-    }
-    Rectangle {
-        id: rect2
-        x: rect1.width
-        width: 20; height: 20
-        color: "#ff0000"
-        y: SpringFollow { source: rect1.y; velocity: 200 }
-    }
-    \endcode
-
-    \sa EaseFollow
-*/
-
-QmlSpringFollow::QmlSpringFollow(QObject *parent)
-: QObject(*(new QmlSpringFollowPrivate),parent)
-{
-}
-
-QmlSpringFollow::~QmlSpringFollow()
-{
-}
-
-void QmlSpringFollow::setTarget(const QmlMetaProperty &property)
-{
-    Q_D(QmlSpringFollow);
-    d->property = property;
-    d->currentValue = property.read().toReal();
-}
-
-qreal QmlSpringFollow::sourceValue() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->sourceValue;
-}
-
-/*!
-    \qmlproperty qreal SpringFollow::source
-    This property holds the source value which will be tracked.
-
-    Bind to a property in order to track its changes.
-*/
-
-void QmlSpringFollow::setSourceValue(qreal value)
-{
-    Q_D(QmlSpringFollow);
-    if (d->clock.state() == QAbstractAnimation::Running && d->sourceValue == value)
-        return;
-
-    d->sourceValue = value;
-    d->start();
-}
-
-/*!
-    \qmlproperty qreal SpringFollow::velocity
-    This property holds the maximum velocity allowed when tracking the source.
-*/
-
-qreal QmlSpringFollow::velocity() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->maxVelocity;
-}
-
-void QmlSpringFollow::setVelocity(qreal velocity)
-{
-    Q_D(QmlSpringFollow);
-    d->maxVelocity = velocity;
-    d->velocityms = velocity / 1000.0;
-    d->updateMode();
-}
-
-/*!
-    \qmlproperty qreal SpringFollow::spring
-    This property holds the spring constant
-
-    The spring constant describes how strongly the target is pulled towards the
-    source.  Setting spring to 0 turns off spring tracking.  Useful values 0 - 5.0
-
-    When a spring constant is set and the velocity property is greater than 0,
-    velocity limits the maximum speed.
-*/
-qreal QmlSpringFollow::spring() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->spring;
-}
-
-void QmlSpringFollow::setSpring(qreal spring)
-{
-    Q_D(QmlSpringFollow);
-    d->spring = spring;
-    d->updateMode();
-}
-
-/*!
-    \qmlproperty qreal SpringFollow::damping
-    This property holds the spring damping constant
-
-    The damping constant describes how quickly a sprung follower comes to rest.
-    Useful range is 0 - 1.0
-*/
-qreal QmlSpringFollow::damping() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->damping;
-}
-
-void QmlSpringFollow::setDamping(qreal damping)
-{
-    Q_D(QmlSpringFollow);
-    if (damping > 1.)
-        damping = 1.;
-
-    d->damping = damping;
-}
-
-
-/*!
-    \qmlproperty qreal SpringFollow::epsilon
-    This property holds the spring epsilon
-
-    The epsilon is the rate and amount of change in the value which is close enough
-    to 0 to be considered equal to zero. This will depend on the usage of the value.
-    For pixel positions, 0.25 would suffice. For scale, 0.005 will suffice.
-
-    The default is 0.01. Tuning this value can provide small performance improvements.
-*/
-qreal QmlSpringFollow::epsilon() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->epsilon;
-}
-
-void QmlSpringFollow::setEpsilon(qreal epsilon)
-{
-    Q_D(QmlSpringFollow);
-    d->epsilon = epsilon;
-}
-
-/*!
-    \qmlproperty qreal SpringFollow::modulus
-    This property holds the modulus value.
-
-    Setting a \a modulus forces the target value to "wrap around" at the modulus.
-    For example, setting the modulus to 360 will cause a value of 370 to wrap around to 10.
-*/
-qreal QmlSpringFollow::modulus() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->modulus;
-}
-
-void QmlSpringFollow::setModulus(qreal modulus)
-{
-    Q_D(QmlSpringFollow);
-    if (d->modulus != modulus) {
-        d->haveModulus = modulus != 0.0;
-        d->modulus = modulus;
-        emit modulusChanged();
-    }
-}
-
-/*!
-    \qmlproperty qreal SpringFollow::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 QmlSpringFollow::mass() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->mass;
-}
-
-void QmlSpringFollow::setMass(qreal mass)
-{
-    Q_D(QmlSpringFollow);
-    if (d->mass != mass && mass > 0.0) {
-        d->useMass = mass != 1.0;
-        d->mass = mass;
-        emit massChanged();
-    }
-}
-
-/*!
-    \qmlproperty qreal SpringFollow::value
-    The current value.
-*/
-
-/*!
-    \qmlproperty bool SpringFollow::enabled
-    This property holds whether the target will track the source.
-*/
-bool QmlSpringFollow::enabled() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->enabled;
-}
-
-void QmlSpringFollow::setEnabled(bool enabled)
-{
-    Q_D(QmlSpringFollow);
-    d->enabled = enabled;
-    if (enabled)
-        d->start();
-    else
-        d->stop();
-}
-
-/*!
-    \qmlproperty bool SpringFollow::inSync
-    This property is true when target is equal to the source; otherwise
-    false.  If inSync is true the target is not being animated.
-
-    If \l enabled is false then inSync will also be false.
-*/
-bool QmlSpringFollow::inSync() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->enabled && d->clock.state() != QAbstractAnimation::Running;
-}
-
-qreal QmlSpringFollow::value() const
-{
-    Q_D(const QmlSpringFollow);
-    return d->currentValue;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlspringfollow_p.h b/src/declarative/util/qmlspringfollow_p.h
deleted file mode 100644
index 4a0ed1c..0000000
--- a/src/declarative/util/qmlspringfollow_p.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSMOOTHFOLLOW_H
-#define QMLSMOOTHFOLLOW_H
-
-#include <qmlpropertyvaluesource.h>
-#include <qml.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlSpringFollowPrivate;
-class Q_DECLARATIVE_EXPORT QmlSpringFollow : public QObject,
-                                       public QmlPropertyValueSource
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlSpringFollow)
-    Q_INTERFACES(QmlPropertyValueSource)
-
-    Q_PROPERTY(qreal source READ sourceValue WRITE setSourceValue)
-    Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity)
-    Q_PROPERTY(qreal spring READ spring WRITE setSpring)
-    Q_PROPERTY(qreal damping READ damping WRITE setDamping)
-    Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon)
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
-    Q_PROPERTY(qreal value 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:
-    QmlSpringFollow(QObject *parent=0);
-    ~QmlSpringFollow();
-
-    virtual void setTarget(const QmlMetaProperty &);
-
-    qreal sourceValue() const;
-    void setSourceValue(qreal value);
-    qreal velocity() const;
-    void setVelocity(qreal velocity);
-    qreal spring() const;
-    void setSpring(qreal spring);
-    qreal damping() const;
-    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;
-    void setEnabled(bool enabled);
-    bool inSync() const;
-
-    qreal value() const;
-
-Q_SIGNALS:
-    void valueChanged(qreal);
-    void modulusChanged();
-    void massChanged();
-    void syncChanged();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlSpringFollow)
-
-QT_END_HEADER
-
-#endif // QMLSMOOTHFOLLOW_H
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
deleted file mode 100644
index 3ac8713..0000000
--- a/src/declarative/util/qmlstate.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlstate_p_p.h"
-#include "qmlstate_p.h"
-
-#include "qmltransition_p.h"
-#include "qmlstategroup_p.h"
-#include "qmlstateoperations_p.h"
-#include "qmlanimation_p.h"
-#include "qmlanimation_p_p.h"
-
-#include <qmlbinding_p.h>
-#include <qmlglobal_p.h>
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
-
-QmlAction::QmlAction()
-: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), fromBinding(0), toBinding(0), event(0),
-  specifiedObject(0)
-{
-}
-
-QmlAction::QmlAction(QObject *target, const QString &propertyName,
-               const QVariant &value)
-: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), toValue(value), fromBinding(0),
-  toBinding(0), event(0), specifiedObject(target),
-  specifiedProperty(propertyName)
-{
-    property = QmlMetaProperty::createProperty(target, propertyName);
-    if (property.isValid())
-        fromValue = property.read();
-}
-
-QmlActionEvent::~QmlActionEvent()
-{
-}
-
-QString QmlActionEvent::typeName() const
-{
-    return QString();
-}
-
-void QmlActionEvent::execute()
-{
-}
-
-bool QmlActionEvent::isReversable()
-{
-    return false;
-}
-
-void QmlActionEvent::reverse()
-{
-}
-
-QList<QmlAction> QmlActionEvent::extraActions()
-{
-    return QList<QmlAction>();
-}
-
-bool QmlActionEvent::changesBindings()
-{
-    return false;
-}
-
-void QmlActionEvent::clearForwardBindings()
-{
-}
-
-void QmlActionEvent::clearReverseBindings()
-{
-}
-
-bool QmlActionEvent::override(QmlActionEvent *other)
-{
-    Q_UNUSED(other);
-    return false;
-}
-
-/*!
-    \internal
-*/
-QmlStateOperation::QmlStateOperation(QObjectPrivate &dd, QObject *parent)
-    : QObject(dd, parent)
-{
-}
-
-/*!
-    \qmlclass State QmlState
-  \since 4.7
-    \brief The State element defines configurations of objects and properties.
-
-    A state is specified as a set of batched changes from the default configuration.
-
-    Note that setting the state of an object from within another state of the same object is
-    inadvisible. Not only would this have the same effect as going directly to the second state
-    it may cause the program to crash.
-
-    \sa {qmlstates}{States}, {state-transitions}{Transitions}
-*/
-
-/*!
-    \internal
-    \class QmlState
-    \brief The QmlState class allows you to define configurations of objects and properties.
-
-    \ingroup group_states
-
-    QmlState allows you to specify a state as a set of batched changes from the default
-    configuration.
-
-    \sa {states-transitions}{States and Transitions}
-*/
-
-
-QmlState::QmlState(QObject *parent)
-: QObject(*(new QmlStatePrivate), parent)
-{
-    Q_D(QmlState);
-    d->transitionManager.setState(this);
-}
-
-QmlState::~QmlState()
-{
-    Q_D(QmlState);
-    if (d->group)
-        d->group->removeState(this);
-}
-
-/*!
-    \qmlproperty string State::name
-    This property holds the name of the state
-
-    Each state should have a unique name.
-*/
-QString QmlState::name() const
-{
-    Q_D(const QmlState);
-    return d->name;
-}
-
-void QmlState::setName(const QString &n)
-{
-    Q_D(QmlState);
-    d->name = n;
-}
-
-bool QmlState::isWhenKnown() const
-{
-    Q_D(const QmlState);
-    return d->when != 0;
-}
-
-/*!
-    \qmlproperty bool State::when
-    This property holds when the state should be applied
-
-    This should be set to an expression that evaluates to true when you want the state to
-    be applied.
-*/
-QmlBinding *QmlState::when() const
-{
-    Q_D(const QmlState);
-    return d->when;
-}
-
-void QmlState::setWhen(QmlBinding *when)
-{
-    Q_D(QmlState);
-    d->when = when;
-    if (d->group)
-        d->group->updateAutoState();
-}
-
-/*!
-    \qmlproperty string State::extend
-    This property holds the state that this state extends
-
-    The state being extended is treated as the base state in regards to
-    the changes specified by the extending state.
-*/
-QString QmlState::extends() const
-{
-    Q_D(const QmlState);
-    return d->extends;
-}
-
-void QmlState::setExtends(const QString &extends)
-{
-    Q_D(QmlState);
-    d->extends = extends;
-}
-
-/*!
-    \qmlproperty list<Change> State::changes
-    This property holds the changes to apply for this state
-    \default
-
-    By default these changes are applied against the default state. If the state
-    extends another state, then the changes are applied against the state being
-    extended.
-*/
-QmlListProperty<QmlStateOperation> QmlState::changes()
-{
-    Q_D(QmlState);
-    return QmlListProperty<QmlStateOperation>(this, &d->operations, QmlStatePrivate::operations_append,
-                                              QmlStatePrivate::operations_count, QmlStatePrivate::operations_at,
-                                              QmlStatePrivate::operations_clear);
-}
-
-int QmlState::operationCount() const
-{
-    Q_D(const QmlState);
-    return d->operations.count();
-}
-
-QmlStateOperation *QmlState::operationAt(int index) const
-{
-    Q_D(const QmlState);
-    return d->operations.at(index);
-}
-
-QmlState &QmlState::operator<<(QmlStateOperation *op)
-{
-    Q_D(QmlState);
-    d->operations.append(QmlStatePrivate::OperationGuard(op, &d->operations));
-    return *this;
-}
-
-void QmlStatePrivate::complete()
-{
-    Q_Q(QmlState);
-
-    for (int ii = 0; ii < reverting.count(); ++ii) {
-        for (int jj = 0; jj < revertList.count(); ++jj) {
-            if (revertList.at(jj).property == reverting.at(ii)) {
-                revertList.removeAt(jj);
-                break;
-            }
-        }
-    }
-    reverting.clear();
-
-    emit q->completed();
-}
-
-// Generate a list of actions for this state.  This includes coelescing state
-// actions that this state "extends"
-QmlStateOperation::ActionList
-QmlStatePrivate::generateActionList(QmlStateGroup *group) const
-{
-    QmlStateOperation::ActionList applyList;
-    if (inState)
-        return applyList;
-
-    // Prevent "extends" recursion
-    inState = true;
-
-    if (!extends.isEmpty()) {
-        QList<QmlState *> states = group->states();
-        for (int ii = 0; ii < states.count(); ++ii)
-            if (states.at(ii)->name() == extends)
-                applyList = static_cast<QmlStatePrivate*>(states.at(ii)->d_func())->generateActionList(group);
-    }
-
-    foreach(QmlStateOperation *op, operations)
-        applyList << op->actions();
-
-    inState = false;
-    return applyList;
-}
-
-QmlStateGroup *QmlState::stateGroup() const
-{
-    Q_D(const QmlState);
-    return d->group;
-}
-
-void QmlState::setStateGroup(QmlStateGroup *group)
-{
-    Q_D(QmlState);
-    d->group = group;
-}
-
-void QmlState::cancel()
-{
-    Q_D(QmlState);
-    d->transitionManager.cancel();
-}
-
-void QmlAction::deleteFromBinding()
-{
-    if (fromBinding) {
-        property.setBinding(0);
-        fromBinding->destroy();
-        fromBinding = 0;
-    }
-}
-
-void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *revert)
-{
-    Q_D(QmlState);
-
-    qmlExecuteDeferred(this);
-
-    cancel();
-    if (revert)
-        revert->cancel();
-    d->revertList.clear();
-    d->reverting.clear();
-
-    if (revert) {
-        QmlStatePrivate *revertPrivate =
-            static_cast<QmlStatePrivate*>(revert->d_func());
-        d->revertList = revertPrivate->revertList;
-        revertPrivate->revertList.clear();
-    }
-
-    // List of actions caused by this state
-    QmlStateOperation::ActionList applyList = d->generateActionList(group);
-
-    // List of actions that need to be reverted to roll back (just) this state
-    QmlStatePrivate::SimpleActionList additionalReverts;
-    // First add the reverse of all the applyList actions
-    for (int ii = 0; ii < applyList.count(); ++ii) {
-        QmlAction &action = applyList[ii];
-
-        bool found = false;
-
-        int jj;
-        if (action.event) {
-            if (!action.event->isReversable())
-                continue;
-            for (jj = 0; jj < d->revertList.count(); ++jj) {
-                QmlActionEvent *event = d->revertList.at(jj).event;
-                if (event && event->typeName() == action.event->typeName()) {
-                    if (action.event->override(event)) {
-                        found = true;
-                        break;
-                    }
-                }
-            }
-            if (!found || action.event != d->revertList.at(jj).event)
-                action.event->saveOriginals();
-            else if (action.event->isRewindable())
-                action.event->saveCurrentValues();
-        } else {
-            action.fromBinding = action.property.binding();
-
-            for (jj = 0; jj < d->revertList.count(); ++jj) {
-                if (d->revertList.at(jj).property == action.property) {
-                    found = true;
-                    break;
-                }
-            }
-        }
-
-        if (!found) {
-            if (!action.restore) {
-                action.deleteFromBinding();
-            } else {
-                // Only need to revert the applyList action if the previous
-                // state doesn't have a higher priority revert already
-                QmlSimpleAction r(action);
-                additionalReverts << r;
-            }
-        } else if (d->revertList.at(jj).binding != action.fromBinding) {
-            action.deleteFromBinding();
-        }
-    }
-
-    // Any reverts from a previous state that aren't carried forth
-    // into this state need to be translated into apply actions
-    for (int ii = 0; ii < d->revertList.count(); ++ii) {
-        bool found = false;
-        if (d->revertList.at(ii).event) {
-            QmlActionEvent *event = d->revertList.at(ii).event;
-            if (!event->isReversable())
-                continue;
-            for (int jj = 0; !found && jj < applyList.count(); ++jj) {
-                const QmlAction &action = applyList.at(jj);
-                if (action.event && action.event->typeName() == event->typeName()) {
-                    if (action.event->override(event))
-                        found = true;
-                }
-            }
-        } else {
-            for (int jj = 0; !found && jj < applyList.count(); ++jj) {
-                const QmlAction &action = applyList.at(jj);
-                if (action.property == d->revertList.at(ii).property)
-                    found = true;
-            }
-        }
-        if (!found) {
-            QVariant cur = d->revertList.at(ii).property.read();
-            QmlAbstractBinding *delBinding = d->revertList.at(ii).property.setBinding(0);
-            if (delBinding)
-                delBinding->destroy();
-
-            QmlAction a;
-            a.property = d->revertList.at(ii).property;
-            a.fromValue = cur;
-            a.toValue = d->revertList.at(ii).value;
-            a.toBinding = d->revertList.at(ii).binding;
-            a.specifiedObject = d->revertList.at(ii).specifiedObject;
-            a.specifiedProperty = d->revertList.at(ii).specifiedProperty;
-            a.event = d->revertList.at(ii).event;
-            a.reverseEvent = d->revertList.at(ii).reverseEvent;
-            if (a.event && a.event->isRewindable())
-                a.event->saveCurrentValues();
-            applyList << a;
-            // Store these special reverts in the reverting list
-            d->reverting << d->revertList.at(ii).property;
-        }
-    }
-    // All the local reverts now become part of the ongoing revertList
-    d->revertList << additionalReverts;
-
-    // Output for debugging
-    if (stateChangeDebug()) {
-        foreach(const QmlAction &action, applyList) {
-            if (action.event)
-                qWarning() << "    QmlAction event:" << action.event->typeName();
-            else
-                qWarning() << "    QmlAction:" << action.property.object()
-                           << action.property.name() << "From:" << action.fromValue 
-                           << "To:" << action.toValue;
-        }
-    }
-
-    d->transitionManager.transition(applyList, trans);
-}
-
-QmlStateOperation::ActionList QmlStateOperation::actions()
-{
-    return ActionList();
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
deleted file mode 100644
index 2c92387..0000000
--- a/src/declarative/util/qmlstate_p.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSTATE_H
-#define QMLSTATE_H
-
-#include <qml.h>
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlActionEvent;
-class QmlBinding;
-class Q_DECLARATIVE_EXPORT QmlAction
-{
-public:
-    QmlAction();
-    QmlAction(QObject *, const QString &, const QVariant &);
-
-    bool restore:1;
-    bool actionDone:1;
-    bool reverseEvent:1;
-    bool deletableToBinding:1;
-
-    QmlMetaProperty property;
-    QVariant fromValue;
-    QVariant toValue;
-
-    QmlAbstractBinding *fromBinding;
-    QmlAbstractBinding *toBinding;
-    QmlActionEvent *event;
-
-    //strictly for matching
-    QObject *specifiedObject;
-    QString specifiedProperty;
-
-    void deleteFromBinding();
-};
-
-class QmlActionEvent
-{
-public:
-    virtual ~QmlActionEvent();
-    virtual QString typeName() const;
-
-    virtual void execute();
-    virtual bool isReversable();
-    virtual void reverse();
-    virtual void saveOriginals() {}
-
-    virtual bool isRewindable() { return isReversable(); }
-    virtual void rewind() {}
-    virtual void saveCurrentValues() {}
-
-    //virtual bool hasExtraActions();
-    virtual QList<QmlAction> extraActions();
-
-    virtual bool changesBindings();
-    virtual void clearForwardBindings();
-    virtual void clearReverseBindings();
-    virtual bool override(QmlActionEvent*other);
-};
-
-//### rename to QmlStateChange?
-class QmlStateGroup;
-class Q_DECLARATIVE_EXPORT QmlStateOperation : public QObject
-{
-    Q_OBJECT
-public:
-    QmlStateOperation(QObject *parent = 0)
-        : QObject(parent) {}
-    typedef QList<QmlAction> ActionList;
-
-    virtual ActionList actions();
-
-protected:
-    QmlStateOperation(QObjectPrivate &dd, QObject *parent = 0);
-};
-
-typedef QmlStateOperation::ActionList QmlStateActions;
-
-class QmlTransition;
-class QmlStatePrivate;
-class Q_DECLARATIVE_EXPORT QmlState : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QmlBinding *when READ when WRITE setWhen)
-    Q_PROPERTY(QString extend READ extends WRITE setExtends)
-    Q_PROPERTY(QmlListProperty<QmlStateOperation> changes READ changes)
-    Q_CLASSINFO("DefaultProperty", "changes")
-    Q_CLASSINFO("DeferredPropertyNames", "changes")
-
-public:
-    QmlState(QObject *parent=0);
-    virtual ~QmlState();
-
-    QString name() const;
-    void setName(const QString &);
-
-    /*'when' is a QmlBinding to limit state changes oscillation
-     due to the unpredictable order of evaluation of bound expressions*/
-    bool isWhenKnown() const;
-    QmlBinding *when() const;
-    void setWhen(QmlBinding *);
-
-    QString extends() const;
-    void setExtends(const QString &);
-
-    QmlListProperty<QmlStateOperation> changes();
-    int operationCount() const;
-    QmlStateOperation *operationAt(int) const;
-
-    QmlState &operator<<(QmlStateOperation *);
-
-    void apply(QmlStateGroup *, QmlTransition *, QmlState *revert);
-    void cancel();
-
-    QmlStateGroup *stateGroup() const;
-    void setStateGroup(QmlStateGroup *);
-
-Q_SIGNALS:
-    void completed();
-
-private:
-    Q_DECLARE_PRIVATE(QmlState)
-    Q_DISABLE_COPY(QmlState)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlStateOperation)
-QML_DECLARE_TYPE(QmlState)
-
-QT_END_HEADER
-
-#endif // QMLSTATE_H
diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h
deleted file mode 100644
index d138e4e..0000000
--- a/src/declarative/util/qmlstate_p_p.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSTATE_P_H
-#define QMLSTATE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlstate_p.h"
-
-#include "qmlanimation_p_p.h"
-#include "qmltransitionmanager_p_p.h"
-
-#include <qmlguard_p.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlSimpleAction
-{
-public:
-    enum State { StartState, EndState };
-    QmlSimpleAction(const QmlAction &a, State state = StartState) 
-    {
-        property = a.property;
-        specifiedObject = a.specifiedObject;
-        specifiedProperty = a.specifiedProperty;
-        event = a.event;
-        if (state == StartState) {
-            value = a.fromValue;
-            binding = property.binding();
-            reverseEvent = true;
-        } else {
-            value = a.toValue;
-            binding = a.toBinding;
-            reverseEvent = false;
-        }
-    }
-
-    QmlMetaProperty property;
-    QVariant value;
-    QmlAbstractBinding *binding;
-    QObject *specifiedObject;
-    QString specifiedProperty;
-    QmlActionEvent *event;
-    bool reverseEvent;
-};
-
-class QmlStatePrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlState)
-
-public:
-    QmlStatePrivate()
-    : when(0), inState(false), group(0) {}
-
-    typedef QList<QmlSimpleAction> SimpleActionList;
-
-    QString name;
-    QmlBinding *when;
-
-    struct OperationGuard : public QmlGuard<QmlStateOperation>
-    {
-        OperationGuard(QObject *obj, QList<OperationGuard> *l) : list(l) { (QmlGuard<QObject>&)*this = obj; }
-        QList<OperationGuard> *list;
-        void objectDestroyed(QmlStateOperation *) {
-            // we assume priv will always be destroyed after objectDestroyed calls
-            list->removeOne(*this);
-        }
-    };
-    QList<OperationGuard> operations;
-
-    static void operations_append(QmlListProperty<QmlStateOperation> *prop, QmlStateOperation *op) {
-        QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
-        list->append(OperationGuard(op, list));
-    }
-    static void operations_clear(QmlListProperty<QmlStateOperation> *prop) {
-        QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
-        list->clear();
-    }
-    static int operations_count(QmlListProperty<QmlStateOperation> *prop) {
-        QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
-        return list->count();
-    }
-    static QmlStateOperation *operations_at(QmlListProperty<QmlStateOperation> *prop, int index) {
-        QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
-        return list->at(index);
-    }
-
-    QmlTransitionManager transitionManager;
-
-    SimpleActionList revertList;
-    QList<QmlMetaProperty> reverting;
-    QString extends;
-    mutable bool inState;
-    QmlStateGroup *group;
-
-    QmlStateOperation::ActionList generateActionList(QmlStateGroup *) const;
-    void complete();
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLSTATE_P_H
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
deleted file mode 100644
index e57575e..0000000
--- a/src/declarative/util/qmlstategroup.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlstategroup_p.h"
-
-#include "qmltransition_p.h"
-#include "qmlstate_p_p.h"
-
-#include <qmlbinding_p.h>
-#include <qmlglobal_p.h>
-
-#include <QtCore/qdebug.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
-
-class QmlStateGroupPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlStateGroup)
-public:
-    QmlStateGroupPrivate(QmlStateGroup *p)
-    : nullState(0), componentComplete(true),
-      ignoreTrans(false), applyingState(false) {}
-
-    QString currentState;
-    QmlState *nullState;
-
-    static void append_state(QmlListProperty<QmlState> *list, QmlState *state);
-    static int count_state(QmlListProperty<QmlState> *list);
-    static QmlState *at_state(QmlListProperty<QmlState> *list, int index);
-
-    QList<QmlState *> states;
-    QList<QmlTransition *> transitions;
-
-    bool componentComplete;
-    bool ignoreTrans;
-    bool applyingState;
-
-    QmlTransition *findTransition(const QString &from, const QString &to);
-    void setCurrentStateInternal(const QString &state, bool = false);
-    bool updateAutoState();
-};
-
-/*!
-   \qmlclass StateGroup QmlStateGroup
-   \brief The StateGroup element provides state support for non-Item elements.
-
-   Item (and all dervied elements) provides built in support for states and transitions
-   via its state, states and transitions properties. StateGroup provides an easy way to
-   use this support in other (non-Item-derived) elements.
-
-   \qml
-   MyCustomObject {
-       StateGroup {
-           id: myStateGroup
-           states: State {
-               name: "state1"
-               ...
-           }
-           transitions: Transition {
-               ...
-           }
-       }
-
-       onSomethingHappened: myStateGroup.state = "state1";
-   }
-   \endqml
-
-   \sa {qmlstate}{States} {state-transitions}{Transitions}
-*/
-
-QmlStateGroup::QmlStateGroup(QObject *parent)
-    : QObject(*(new QmlStateGroupPrivate(this)), parent)
-{
-}
-
-QmlStateGroup::~QmlStateGroup()
-{
-    Q_D(const QmlStateGroup);
-    for (int i = 0; i < d->states.count(); ++i)
-        d->states.at(i)->setStateGroup(0);
-}
-
-QList<QmlState *> QmlStateGroup::states() const
-{
-    Q_D(const QmlStateGroup);
-    return d->states;
-}
-
-/*!
-  \qmlproperty list<State> StateGroup::states
-  This property holds a list of states defined by the state group.
-
-  \qml
-  StateGroup {
-    states: [
-      State { ... },
-      State { ... }
-      ...
-    ]
-  }
-  \endqml
-
-  \sa {qmlstate}{States}
-*/
-QmlListProperty<QmlState> QmlStateGroup::statesProperty()
-{
-    Q_D(QmlStateGroup);
-    return QmlListProperty<QmlState>(this, &d->states, &QmlStateGroupPrivate::append_state,
-                                                       &QmlStateGroupPrivate::count_state,
-                                                       &QmlStateGroupPrivate::at_state);
-}
-
-void QmlStateGroupPrivate::append_state(QmlListProperty<QmlState> *list, QmlState *state)
-{
-    QmlStateGroup *_this = static_cast<QmlStateGroup *>(list->object);
-    if (state) {
-        _this->d_func()->states.append(state);
-        state->setStateGroup(_this);
-    }
-
-}
-
-int QmlStateGroupPrivate::count_state(QmlListProperty<QmlState> *list)
-{
-    QmlStateGroup *_this = static_cast<QmlStateGroup *>(list->object);
-    return _this->d_func()->states.count();
-}
-
-QmlState *QmlStateGroupPrivate::at_state(QmlListProperty<QmlState> *list, int index)
-{
-    QmlStateGroup *_this = static_cast<QmlStateGroup *>(list->object);
-    return _this->d_func()->states.at(index);
-}
-
-/*!
-  \qmlproperty list<Transition> StateGroup::transitions
-  This property holds a list of transitions defined by the state group.
-
-  \qml
-  StateGroup {
-    transitions: [
-      Transition { ... },
-      Transition { ... }
-      ...
-    ]
-  }
-  \endqml
-
-  \sa {state-transitions}{Transitions}
-*/
-QmlListProperty<QmlTransition> QmlStateGroup::transitionsProperty()
-{
-    Q_D(QmlStateGroup);
-    return QmlListProperty<QmlTransition>(this, d->transitions);
-}
-
-/*!
-  \qmlproperty string StateGroup::state
-
-  This property holds the name of the current state of the state group.
-
-  This property is often used in scripts to change between states. For
-  example:
-
-  \qml
-    Script {
-        function toggle() {
-            if (button.state == 'On')
-                button.state = 'Off';
-            else
-                button.state = 'On';
-        }
-    }
-  \endqml
-
-  If the state group is in its base state (i.e. no explicit state has been
-  set), \c state will be a blank string. Likewise, you can return a
-  state group to its base state by setting its current state to \c ''.
-
-  \sa {qmlstates}{States}
-*/
-QString QmlStateGroup::state() const
-{
-    Q_D(const QmlStateGroup);
-    return d->currentState;
-}
-
-void QmlStateGroup::setState(const QString &state)
-{
-    Q_D(QmlStateGroup);
-    if (d->currentState == state)
-        return;
-
-    d->setCurrentStateInternal(state);
-}
-
-void QmlStateGroup::classBegin()
-{
-    Q_D(QmlStateGroup);
-    d->componentComplete = false;
-}
-
-void QmlStateGroup::componentComplete()
-{
-    Q_D(QmlStateGroup);
-    d->componentComplete = true;
-
-    if (d->updateAutoState()) {
-        return;
-    } else if (!d->currentState.isEmpty()) {
-        QString cs = d->currentState;
-        d->currentState = QString();
-        d->setCurrentStateInternal(cs, true);
-    }
-}
-
-/*!
-    Returns true if the state was changed, otherwise false.
-*/
-bool QmlStateGroup::updateAutoState()
-{
-    Q_D(QmlStateGroup);
-    return d->updateAutoState();
-}
-
-bool QmlStateGroupPrivate::updateAutoState()
-{
-    Q_Q(QmlStateGroup);
-    if (!componentComplete)
-        return false;
-
-    bool revert = false;
-    for (int ii = 0; ii < states.count(); ++ii) {
-        QmlState *state = states.at(ii);
-        if (state->isWhenKnown()) {
-            if (!state->name().isEmpty()) {
-                if (state->when() && state->when()->value().toBool()) {
-                    if (stateChangeDebug()) 
-                        qWarning() << "Setting auto state due to:" 
-                                   << state->when()->expression();
-                    if (currentState != state->name()) {
-                        q->setState(state->name());
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else if (state->name() == currentState) {
-                    revert = true;
-                }
-            }
-        }
-    }
-    if (revert) {
-        bool rv = currentState != QString();
-        q->setState(QString());
-        return rv;
-    } else {
-        return false;
-    }
-}
-
-QmlTransition *QmlStateGroupPrivate::findTransition(const QString &from, const QString &to)
-{
-    QmlTransition *highest = 0;
-    int score = 0;
-    bool reversed = false;
-    bool done = false;
-
-    for (int ii = 0; !done && ii < transitions.count(); ++ii) {
-        QmlTransition *t = transitions.at(ii);
-        for (int ii = 0; ii < 2; ++ii)
-        {
-            if (ii && (!t->reversible() ||
-                      (t->fromState() == QLatin1String("*") && 
-                       t->toState() == QLatin1String("*"))))
-                break;
-            QStringList fromState;
-            QStringList toState;
-
-            fromState = t->fromState().split(QLatin1Char(','));
-            toState = t->toState().split(QLatin1Char(','));
-            if (ii == 1)
-                qSwap(fromState, toState);
-            int tScore = 0;
-            if (fromState.contains(from))
-                tScore += 2;
-            else if (fromState.contains(QLatin1String("*")))
-                tScore += 1;
-            else
-                continue;
-
-            if (toState.contains(to))
-                tScore += 2;
-            else if (toState.contains(QLatin1String("*")))
-                tScore += 1;
-            else
-                continue;
-
-            if (ii == 1)
-                reversed = true;
-            else
-                reversed = false;
-
-            if (tScore == 4) {
-                highest = t;
-                done = true;
-                break;
-            } else if (tScore > score) {
-                score = tScore;
-                highest = t;
-            }
-        }
-    }
-
-    if (highest)
-        highest->setReversed(reversed);
-
-    return highest;
-}
-
-void QmlStateGroupPrivate::setCurrentStateInternal(const QString &state, 
-                                                   bool ignoreTrans)
-{
-    Q_Q(QmlStateGroup);
-    if (!componentComplete) {
-        currentState = state;
-        return;
-    }
-
-    if (applyingState) {
-        qWarning() << "Can't apply a state change as part of a state definition.";
-        return;
-    }
-
-    applyingState = true;
-
-    QmlTransition *transition = (ignoreTrans || ignoreTrans) ? 0 : findTransition(currentState, state);
-    if (stateChangeDebug()) {
-        qWarning() << this << "Changing state.  From" << currentState << ". To" << state;
-        if (transition)
-            qWarning() << "   using transition" << transition->fromState() 
-                       << transition->toState();
-    }
-
-    QmlState *oldState = 0;
-    if (!currentState.isEmpty()) {
-        for (int ii = 0; ii < states.count(); ++ii) {
-            if (states.at(ii)->name() == currentState) {
-                oldState = states.at(ii);
-                break;
-            }
-        }
-    }
-
-    currentState = state;
-    emit q->stateChanged(currentState);
-
-    QmlState *newState = 0;
-    for (int ii = 0; ii < states.count(); ++ii) {
-        if (states.at(ii)->name() == currentState) {
-            newState = states.at(ii);
-            break;
-        }
-    }
-
-    if (oldState == 0 || newState == 0) {
-        if (!nullState) { nullState = new QmlState; QmlGraphics_setParent_noEvent(nullState, q); }
-        if (!oldState) oldState = nullState;
-        if (!newState) newState = nullState;
-    }
-
-    newState->apply(q, transition, oldState);
-    applyingState = false;
-    if (!transition)
-        static_cast<QmlStatePrivate*>(QObjectPrivate::get(newState))->complete();
-}
-
-QmlState *QmlStateGroup::findState(const QString &name) const
-{
-    Q_D(const QmlStateGroup);
-    for (int i = 0; i < d->states.count(); ++i) {
-        QmlState *state = d->states.at(i);
-        if (state->name() == name)
-            return state;
-    }
-
-    return 0;
-}
-
-void QmlStateGroup::removeState(QmlState *state)
-{
-    Q_D(QmlStateGroup);
-    d->states.removeOne(state);
-}
-
-QT_END_NAMESPACE
-
-
diff --git a/src/declarative/util/qmlstategroup_p.h b/src/declarative/util/qmlstategroup_p.h
deleted file mode 100644
index d39ca03..0000000
--- a/src/declarative/util/qmlstategroup_p.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSTATEGROUP_H
-#define QMLSTATEGROUP_H
-
-#include "qmlstate_p.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlStateGroupPrivate;
-class Q_DECLARATIVE_EXPORT QmlStateGroup : public QObject, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlParserStatus)
-    Q_DECLARE_PRIVATE(QmlStateGroup)
-
-    Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
-    Q_PROPERTY(QmlListProperty<QmlState> states READ statesProperty DESIGNABLE false)
-    Q_PROPERTY(QmlListProperty<QmlTransition> transitions READ transitionsProperty DESIGNABLE false)
-
-public:
-    QmlStateGroup(QObject * = 0);
-    virtual ~QmlStateGroup();
-
-    QString state() const;
-    void setState(const QString &);
-
-    QmlListProperty<QmlState> statesProperty();
-    QList<QmlState *> states() const;
-
-    QmlListProperty<QmlTransition> transitionsProperty();
-
-    QmlState *findState(const QString &name) const;
-
-    virtual void classBegin();
-    virtual void componentComplete();
-Q_SIGNALS:
-    void stateChanged(const QString &);
-
-private:
-    friend class QmlState;
-    bool updateAutoState();
-    void removeState(QmlState *state);
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlStateGroup)
-
-QT_END_HEADER
-
-#endif // QMLSTATEGROUP_H
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
deleted file mode 100644
index c102888..0000000
--- a/src/declarative/util/qmlstateoperations.cpp
+++ /dev/null
@@ -1,833 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlstateoperations_p.h"
-
-#include <qml.h>
-#include <qmlcontext.h>
-#include <qmlexpression.h>
-#include <qmlinfo.h>
-#include <qmlgraphicsanchors_p_p.h>
-#include <qmlgraphicsitem_p.h>
-#include <qmlguard_p.h>
-
-#include <QtCore/qdebug.h>
-#include <QtGui/qgraphicsitem.h>
-#include <QtCore/qmath.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlParentChangePrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlParentChange)
-public:
-    QmlParentChangePrivate() : target(0), parent(0), origParent(0), origStackBefore(0),
-                               rewindParent(0), rewindStackBefore(0) {}
-
-    QmlGraphicsItem *target;
-    QmlGraphicsItem *parent;
-    QmlGuard<QmlGraphicsItem> origParent;
-    QmlGuard<QmlGraphicsItem> origStackBefore;
-    QmlGraphicsItem *rewindParent;
-    QmlGraphicsItem *rewindStackBefore;
-
-    void doChange(QmlGraphicsItem *targetParent, QmlGraphicsItem *stackBefore = 0);
-};
-
-void QmlParentChangePrivate::doChange(QmlGraphicsItem *targetParent, QmlGraphicsItem *stackBefore)
-{
-    if (targetParent && target && target->parentItem()) {
-        //### for backwards direction, can we just restore original x, y, scale, rotation
-        Q_Q(QmlParentChange);
-        bool ok;
-        const QTransform &transform = target->itemTransform(targetParent, &ok);
-        if (transform.type() >= QTransform::TxShear || !ok) {
-            qmlInfo(q) << QmlParentChange::tr("Unable to preserve appearance under complex transform");
-            ok = false;
-        }
-
-        qreal scale = 1;
-        qreal rotation = 0;
-        if (ok && transform.type() != QTransform::TxRotate) {
-            if (transform.m11() == transform.m22())
-                scale = transform.m11();
-            else {
-                qmlInfo(q) << QmlParentChange::tr("Unable to preserve appearance under non-uniform scale");
-                ok = false;
-            }
-        } else if (ok && transform.type() == QTransform::TxRotate) {
-            if (transform.m11() == transform.m22())
-                scale = qSqrt(transform.m11()*transform.m11() + transform.m12()*transform.m12());
-            else {
-                qmlInfo(q) << QmlParentChange::tr("Unable to preserve appearance under non-uniform scale");
-                ok = false;
-            }
-
-            if (scale != 0)
-                rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/M_PI;
-            else {
-                qmlInfo(q) << QmlParentChange::tr("Unable to preserve appearance under scale of 0");
-                ok = false;
-            }
-        }
-
-        qreal xt = transform.dx();
-        qreal yt = transform.dy();
-        if (ok && target->transformOrigin() != QmlGraphicsItem::TopLeft) {
-            qreal tempxt = target->transformOriginPoint().x();
-            qreal tempyt = target->transformOriginPoint().y();
-            QTransform t;
-            t.translate(-tempxt, -tempyt);
-            t.rotate(rotation);
-            t.scale(scale, scale);
-            t.translate(tempxt, tempyt);
-            QPointF offset = t.map(QPointF(0,0));
-            xt += offset.x();
-            yt += offset.y();
-        }
-
-        target->setParentItem(targetParent);
-        if (ok) {
-            //qDebug() << xt << yt << rotation << scale;
-            target->setX(xt);
-            target->setY(yt);
-            target->setRotation(rotation);
-            target->setScale(scale);
-        }
-    } else if (target) {
-        target->setParentItem(targetParent);
-    }
-
-    //restore the original stack position.
-    //### if stackBefore has also been reparented this won't work
-    if (stackBefore)
-        target->stackBefore(stackBefore);
-}
-
-/*!
-    \preliminary
-    \qmlclass ParentChange QmlParentChange
-    \brief The ParentChange element allows you to reparent an Item in a state change.
-
-    ParentChange reparents an Item while preserving its visual appearance (position, rotation,
-    and scale) on screen. You can then specify a transition to move/rotate/scale the Item to
-    its final intended appearance.
-
-    ParentChange can only preserve visual appearance if no complex transforms are involved.
-    More specifically, it will not work if the transform property has been set for any
-    Items involved in the reparenting (defined as any Items in the common ancestor tree
-    for the original and new parent).
-
-    You can specify at which point in a transition you want a ParentChange to occur by
-    using a ParentAction.
-*/
-
-
-QmlParentChange::QmlParentChange(QObject *parent)
-    : QmlStateOperation(*(new QmlParentChangePrivate), parent)
-{
-}
-
-QmlParentChange::~QmlParentChange()
-{
-}
-
-/*!
-    \qmlproperty Item ParentChange::target
-    This property holds the item to be reparented
-*/
-
-QmlGraphicsItem *QmlParentChange::object() const
-{
-    Q_D(const QmlParentChange);
-    return d->target;
-}
-
-void QmlParentChange::setObject(QmlGraphicsItem *target)
-{
-    Q_D(QmlParentChange);
-    d->target = target;
-}
-
-/*!
-    \qmlproperty Item ParentChange::parent
-    This property holds the parent for the item in this state
-*/
-
-QmlGraphicsItem *QmlParentChange::parent() const
-{
-    Q_D(const QmlParentChange);
-    return d->parent;
-}
-
-void QmlParentChange::setParent(QmlGraphicsItem *parent)
-{
-    Q_D(QmlParentChange);
-    d->parent = parent;
-}
-
-QmlStateOperation::ActionList QmlParentChange::actions()
-{
-    Q_D(QmlParentChange);
-    if (!d->target || !d->parent)
-        return ActionList();
-
-    QmlAction a;
-    a.event = this;
-
-    return ActionList() << a;
-}
-
-class AccessibleFxItem : public QmlGraphicsItem
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsItem)
-public:
-    int siblingIndex() {
-        Q_D(QmlGraphicsItem);
-        return d->siblingIndex;
-    }
-};
-
-void QmlParentChange::saveOriginals()
-{
-    Q_D(QmlParentChange);
-    saveCurrentValues();
-    d->origParent = d->rewindParent;
-    d->origStackBefore = d->rewindStackBefore;
-}
-
-void QmlParentChange::execute()
-{
-    Q_D(QmlParentChange);
-    d->doChange(d->parent);
-}
-
-bool QmlParentChange::isReversable()
-{
-    return true;
-}
-
-void QmlParentChange::reverse()
-{
-    Q_D(QmlParentChange);
-    d->doChange(d->origParent, d->origStackBefore);
-}
-
-QString QmlParentChange::typeName() const
-{
-    return QLatin1String("ParentChange");
-}
-
-bool QmlParentChange::override(QmlActionEvent*other)
-{
-    Q_D(QmlParentChange);
-    if (other->typeName() != QLatin1String("ParentChange"))
-        return false;
-    if (QmlParentChange *otherPC = static_cast<QmlParentChange*>(other))
-        return (d->target == otherPC->object());
-    return false;
-}
-
-void QmlParentChange::saveCurrentValues()
-{
-    Q_D(QmlParentChange);
-    if (!d->target) {
-        d->rewindParent = 0;
-        d->rewindStackBefore = 0;
-        return;
-    }
-
-    d->rewindParent = d->target->parentItem();
-
-    if (!d->rewindParent) {
-        d->rewindStackBefore = 0;
-        return;
-    }
-
-    //try to determine the item's original stack position so we can restore it
-    int siblingIndex = ((AccessibleFxItem*)d->target)->siblingIndex() + 1;
-    QList<QGraphicsItem*> children = d->rewindParent->childItems();
-    for (int i = 0; i < children.count(); ++i) {
-        QmlGraphicsItem *child = qobject_cast<QmlGraphicsItem*>(children.at(i));
-        if (!child)
-            continue;
-        if (((AccessibleFxItem*)child)->siblingIndex() == siblingIndex) {
-            d->rewindStackBefore = child;
-            break;
-        }
-    }
-}
-
-void QmlParentChange::rewind()
-{
-    Q_D(QmlParentChange);
-    d->doChange(d->rewindParent, d->rewindStackBefore);
-}
-
-class QmlStateChangeScriptPrivate : public QObjectPrivate
-{
-public:
-    QmlStateChangeScriptPrivate() {}
-
-    QmlScriptString script;
-    QString name;
-};
-
-/*!
-    \qmlclass StateChangeScript QmlStateChangeScript
-    \brief The StateChangeScript element allows you to run a script in a state.
-
-    The script specified will be run immediately when the state is made current.
-    Alternatively you can use a ScriptAction to specify at which point in the transition
-    you want the StateChangeScript to be run.
-*/
-
-QmlStateChangeScript::QmlStateChangeScript(QObject *parent)
-: QmlStateOperation(*(new QmlStateChangeScriptPrivate), parent)
-{
-}
-
-QmlStateChangeScript::~QmlStateChangeScript()
-{
-}
-
-/*!
-    \qmlproperty script StateChangeScript::script
-    This property holds the script to run when the state is current.
-*/
-QmlScriptString QmlStateChangeScript::script() const
-{
-    Q_D(const QmlStateChangeScript);
-    return d->script;
-}
-
-void QmlStateChangeScript::setScript(const QmlScriptString &s)
-{
-    Q_D(QmlStateChangeScript);
-    d->script = s;
-}
-
-/*!
-    \qmlproperty script StateChangeScript::script
-    This property holds the name of the script. This name can be used by a
-    ScriptAction to target a specific script.
-
-    \sa ScriptAction::stateChangeScriptName
-*/
-QString QmlStateChangeScript::name() const
-{
-    Q_D(const QmlStateChangeScript);
-    return d->name;
-}
-
-void QmlStateChangeScript::setName(const QString &n)
-{
-    Q_D(QmlStateChangeScript);
-    d->name = n;
-}
-
-void QmlStateChangeScript::execute()
-{
-    Q_D(QmlStateChangeScript);
-    const QString &script = d->script.script();
-    if (!script.isEmpty()) {
-        QmlExpression expr(d->script.context(), script, d->script.scopeObject());
-        expr.value();
-    }
-}
-
-QmlStateChangeScript::ActionList QmlStateChangeScript::actions()
-{
-    ActionList rv;
-    QmlAction a;
-    a.event = this;
-    rv << a;
-    return rv;
-}
-
-QString QmlStateChangeScript::typeName() const
-{
-    return QLatin1String("StateChangeScript");
-}
-
-/*!
-    \qmlclass AnchorChanges QmlAnchorChanges
-    \brief The AnchorChanges element allows you to change the anchors of an item in a state.
-
-    In the following example we change the top and bottom anchors of an item:
-    \snippet examples/declarative/anchors/anchor-changes.qml 0
-
-    AnchorChanges will 'inject' \c x, \c y, \c width, and \c height changes into the transition,
-    so you can animate them as you would normally changes to these properties:
-    \qml
-    //animate our anchor changes
-    NumberAnimation { targets: content; properties: "x,y,width,height" }
-    \endqml
-
-    For more information on anchors see \l {anchor-layout}{Anchor Layouts}.
-*/
-
-
-
-class QmlAnchorChangesPrivate : public QObjectPrivate
-{
-public:
-    QmlAnchorChangesPrivate() : target(0) {}
-
-    QString name;
-    QmlGraphicsItem *target;
-    QString resetString;
-    QStringList resetList;
-    QmlGraphicsAnchorLine left;
-    QmlGraphicsAnchorLine right;
-    QmlGraphicsAnchorLine horizontalCenter;
-    QmlGraphicsAnchorLine top;
-    QmlGraphicsAnchorLine bottom;
-    QmlGraphicsAnchorLine verticalCenter;
-    QmlGraphicsAnchorLine baseline;
-
-    QmlGraphicsAnchorLine origLeft;
-    QmlGraphicsAnchorLine origRight;
-    QmlGraphicsAnchorLine origHCenter;
-    QmlGraphicsAnchorLine origTop;
-    QmlGraphicsAnchorLine origBottom;
-    QmlGraphicsAnchorLine origVCenter;
-    QmlGraphicsAnchorLine origBaseline;
-
-    QmlGraphicsAnchorLine rewindLeft;
-    QmlGraphicsAnchorLine rewindRight;
-    QmlGraphicsAnchorLine rewindHCenter;
-    QmlGraphicsAnchorLine rewindTop;
-    QmlGraphicsAnchorLine rewindBottom;
-    QmlGraphicsAnchorLine rewindVCenter;
-    QmlGraphicsAnchorLine rewindBaseline;
-
-    qreal fromX;
-    qreal fromY;
-    qreal fromWidth;
-    qreal fromHeight;
-};
-
-/*!
-    \qmlproperty Item AnchorChanges::target
-    This property holds the Item whose anchors will change
-*/
-
-QmlAnchorChanges::QmlAnchorChanges(QObject *parent)
- : QmlStateOperation(*(new QmlAnchorChangesPrivate), parent)
-{
-}
-
-QmlAnchorChanges::~QmlAnchorChanges()
-{
-}
-
-QmlAnchorChanges::ActionList QmlAnchorChanges::actions()
-{
-    QmlAction a;
-    a.event = this;
-    return ActionList() << a;
-}
-
-QmlGraphicsItem *QmlAnchorChanges::object() const
-{
-    Q_D(const QmlAnchorChanges);
-    return d->target;
-}
-
-void QmlAnchorChanges::setObject(QmlGraphicsItem *target)
-{
-    Q_D(QmlAnchorChanges);
-    d->target = target;
-}
-
-QString QmlAnchorChanges::reset() const
-{
-    Q_D(const QmlAnchorChanges);
-    return d->resetString;
-}
-
-void QmlAnchorChanges::setReset(const QString &reset)
-{
-    Q_D(QmlAnchorChanges);
-    d->resetString = reset;
-    d->resetList = d->resetString.split(QLatin1Char(','));
-    for (int i = 0; i < d->resetList.count(); ++i)
-        d->resetList[i] = d->resetList.at(i).trimmed();
-}
-
-/*!
-    \qmlproperty AnchorLine AnchorChanges::left
-    \qmlproperty AnchorLine AnchorChanges::right
-    \qmlproperty AnchorLine AnchorChanges::horizontalCenter
-    \qmlproperty AnchorLine AnchorChanges::top
-    \qmlproperty AnchorLine AnchorChanges::bottom
-    \qmlproperty AnchorLine AnchorChanges::verticalCenter
-    \qmlproperty AnchorLine AnchorChanges::baseline
-
-    These properties change the respective anchors of the item.
-*/
-
-QmlGraphicsAnchorLine QmlAnchorChanges::left() const
-{
-    Q_D(const QmlAnchorChanges);
-    return d->left;
-}
-
-void QmlAnchorChanges::setLeft(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlAnchorChanges);
-    d->left = edge;
-}
-
-QmlGraphicsAnchorLine QmlAnchorChanges::right() const
-{
-    Q_D(const QmlAnchorChanges);
-    return d->right;
-}
-
-void QmlAnchorChanges::setRight(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlAnchorChanges);
-    d->right = edge;
-}
-
-QmlGraphicsAnchorLine QmlAnchorChanges::horizontalCenter() const
-{
-    Q_D(const QmlAnchorChanges);
-    return d->horizontalCenter;
-}
-
-void QmlAnchorChanges::setHorizontalCenter(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlAnchorChanges);
-    d->horizontalCenter = edge;
-}
-
-QmlGraphicsAnchorLine QmlAnchorChanges::top() const
-{
-    Q_D(const QmlAnchorChanges);
-    return d->top;
-}
-
-void QmlAnchorChanges::setTop(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlAnchorChanges);
-    d->top = edge;
-}
-
-QmlGraphicsAnchorLine QmlAnchorChanges::bottom() const
-{
-    Q_D(const QmlAnchorChanges);
-    return d->bottom;
-}
-
-void QmlAnchorChanges::setBottom(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlAnchorChanges);
-    d->bottom = edge;
-}
-
-QmlGraphicsAnchorLine QmlAnchorChanges::verticalCenter() const
-{
-    Q_D(const QmlAnchorChanges);
-    return d->verticalCenter;
-}
-
-void QmlAnchorChanges::setVerticalCenter(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlAnchorChanges);
-    d->verticalCenter = edge;
-}
-
-QmlGraphicsAnchorLine QmlAnchorChanges::baseline() const
-{
-    Q_D(const QmlAnchorChanges);
-    return d->baseline;
-}
-
-void QmlAnchorChanges::setBaseline(const QmlGraphicsAnchorLine &edge)
-{
-    Q_D(QmlAnchorChanges);
-    d->baseline = edge;
-}
-
-void QmlAnchorChanges::execute()
-{
-    Q_D(QmlAnchorChanges);
-    if (!d->target)
-        return;
-
-    //set any anchors that have been specified
-    if (d->left.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setLeft(d->left);
-    if (d->right.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setRight(d->right);
-    if (d->horizontalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setHorizontalCenter(d->horizontalCenter);
-    if (d->top.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setTop(d->top);
-    if (d->bottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setBottom(d->bottom);
-    if (d->verticalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setVerticalCenter(d->verticalCenter);
-    if (d->baseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setBaseline(d->baseline);
-}
-
-bool QmlAnchorChanges::isReversable()
-{
-    return true;
-}
-
-void QmlAnchorChanges::reverse()
-{
-    Q_D(QmlAnchorChanges);
-    if (!d->target)
-        return;
-
-    //restore previous anchors
-    if (d->origLeft.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setLeft(d->origLeft);
-    if (d->origRight.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setRight(d->origRight);
-    if (d->origHCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setHorizontalCenter(d->origHCenter);
-    if (d->origTop.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setTop(d->origTop);
-    if (d->origBottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setBottom(d->origBottom);
-    if (d->origVCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setVerticalCenter(d->origVCenter);
-    if (d->origBaseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setBaseline(d->origBaseline);
-}
-
-QString QmlAnchorChanges::typeName() const
-{
-    return QLatin1String("AnchorChanges");
-}
-
-QList<QmlAction> QmlAnchorChanges::extraActions()
-{
-    Q_D(QmlAnchorChanges);
-    QList<QmlAction> extra;
-
-    //### try to be smarter about which ones we add.
-    //    or short-circuit later on if they haven't actually changed.
-    //    we shouldn't set explicit width if there wasn't one before.
-    if (d->target) {
-        QmlAction a;
-        a.fromValue = d->fromX;
-        a.property = QmlMetaProperty(d->target, QLatin1String("x"));
-        extra << a;
-
-        a.fromValue = d->fromY;
-        a.property = QmlMetaProperty(d->target, QLatin1String("y"));
-        extra << a;
-
-        a.fromValue = d->fromWidth;
-        a.property = QmlMetaProperty(d->target, QLatin1String("width"));
-        extra << a;
-
-        a.fromValue = d->fromHeight;
-        a.property = QmlMetaProperty(d->target, QLatin1String("height"));
-        extra << a;
-    }
-
-    return extra;
-}
-
-bool QmlAnchorChanges::changesBindings()
-{
-    return true;
-}
-
-void QmlAnchorChanges::saveOriginals()
-{
-    Q_D(QmlAnchorChanges);
-    d->origLeft = d->target->anchors()->left();
-    d->origRight = d->target->anchors()->right();
-    d->origHCenter = d->target->anchors()->horizontalCenter();
-    d->origTop = d->target->anchors()->top();
-    d->origBottom = d->target->anchors()->bottom();
-    d->origVCenter = d->target->anchors()->verticalCenter();
-    d->origBaseline = d->target->anchors()->baseline();
-
-    saveCurrentValues();
-}
-
-void QmlAnchorChanges::clearForwardBindings()
-{
-    Q_D(QmlAnchorChanges);
-    d->fromX = d->target->x();
-    d->fromY = d->target->y();
-    d->fromWidth = d->target->width();
-    d->fromHeight = d->target->height();
-
-    //reset any anchors that have been specified
-    if (d->resetList.contains(QLatin1String("left")))
-        d->target->anchors()->resetLeft();
-    if (d->resetList.contains(QLatin1String("right")))
-        d->target->anchors()->resetRight();
-    if (d->resetList.contains(QLatin1String("horizontalCenter")))
-        d->target->anchors()->resetHorizontalCenter();
-    if (d->resetList.contains(QLatin1String("top")))
-        d->target->anchors()->resetTop();
-    if (d->resetList.contains(QLatin1String("bottom")))
-        d->target->anchors()->resetBottom();
-    if (d->resetList.contains(QLatin1String("verticalCenter")))
-        d->target->anchors()->resetVerticalCenter();
-    if (d->resetList.contains(QLatin1String("baseline")))
-        d->target->anchors()->resetBaseline();
-
-    //reset any anchors that we'll be setting in the state
-    if (d->left.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetLeft();
-    if (d->right.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetRight();
-    if (d->horizontalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetHorizontalCenter();
-    if (d->top.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetTop();
-    if (d->bottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetBottom();
-    if (d->verticalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetVerticalCenter();
-    if (d->baseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetBaseline();
-}
-
-void QmlAnchorChanges::clearReverseBindings()
-{
-    Q_D(QmlAnchorChanges);
-    d->fromX = d->target->x();
-    d->fromY = d->target->y();
-    d->fromWidth = d->target->width();
-    d->fromHeight = d->target->height();
-
-    //reset any anchors that were set in the state
-    if (d->left.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetLeft();
-    if (d->right.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetRight();
-    if (d->horizontalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetHorizontalCenter();
-    if (d->top.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetTop();
-    if (d->bottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetBottom();
-    if (d->verticalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetVerticalCenter();
-    if (d->baseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetBaseline();
-
-    //reset any anchors that were set in the original state
-    if (d->origLeft.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetLeft();
-    if (d->origRight.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetRight();
-    if (d->origHCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetHorizontalCenter();
-    if (d->origTop.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetTop();
-    if (d->origBottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetBottom();
-    if (d->origVCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetVerticalCenter();
-    if (d->origBaseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->resetBaseline();
-}
-
-bool QmlAnchorChanges::override(QmlActionEvent*other)
-{
-    if (other->typeName() != QLatin1String("AnchorChanges"))
-        return false;
-    if (static_cast<QmlActionEvent*>(this) == other)
-        return true;
-    if (static_cast<QmlAnchorChanges*>(other)->object() == object())
-        return true;
-    return false;
-}
-
-void QmlAnchorChanges::rewind()
-{
-    Q_D(QmlAnchorChanges);
-    if (!d->target)
-        return;
-
-    //restore previous anchors
-    if (d->rewindLeft.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setLeft(d->rewindLeft);
-    if (d->rewindRight.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setRight(d->rewindRight);
-    if (d->rewindHCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setHorizontalCenter(d->rewindHCenter);
-    if (d->rewindTop.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setTop(d->rewindTop);
-    if (d->rewindBottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setBottom(d->rewindBottom);
-    if (d->rewindVCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setVerticalCenter(d->rewindVCenter);
-    if (d->rewindBaseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
-        d->target->anchors()->setBaseline(d->rewindBaseline);
-}
-
-void QmlAnchorChanges::saveCurrentValues()
-{
-    Q_D(QmlAnchorChanges);
-    d->rewindLeft = d->target->anchors()->left();
-    d->rewindRight = d->target->anchors()->right();
-    d->rewindHCenter = d->target->anchors()->horizontalCenter();
-    d->rewindTop = d->target->anchors()->top();
-    d->rewindBottom = d->target->anchors()->bottom();
-    d->rewindVCenter = d->target->anchors()->verticalCenter();
-    d->rewindBaseline = d->target->anchors()->baseline();
-}
-
-#include <qmlstateoperations.moc>
-#include <moc_qmlstateoperations_p.cpp>
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h
deleted file mode 100644
index dc1974b..0000000
--- a/src/declarative/util/qmlstateoperations_p.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSTATEOPERATIONS_H
-#define QMLSTATEOPERATIONS_H
-
-#include "qmlstate_p.h"
-
-#include <qmlgraphicsitem.h>
-#include "private/qmlgraphicsanchors_p.h"
-#include <qmlscriptstring.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlParentChangePrivate;
-class Q_DECLARATIVE_EXPORT QmlParentChange : public QmlStateOperation, public QmlActionEvent
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlParentChange)
-
-    Q_PROPERTY(QmlGraphicsItem *target READ object WRITE setObject)
-    Q_PROPERTY(QmlGraphicsItem *parent READ parent WRITE setParent)
-public:
-    QmlParentChange(QObject *parent=0);
-    ~QmlParentChange();
-
-    QmlGraphicsItem *object() const;
-    void setObject(QmlGraphicsItem *);
-
-    QmlGraphicsItem *parent() const;
-    void setParent(QmlGraphicsItem *);
-
-    virtual ActionList actions();
-
-    virtual void saveOriginals();
-    virtual void execute();
-    virtual bool isReversable();
-    virtual void reverse();
-    virtual QString typeName() const;
-    virtual bool override(QmlActionEvent*other);
-    virtual void rewind();
-    virtual void saveCurrentValues();
-};
-
-class QmlStateChangeScriptPrivate;
-class Q_DECLARATIVE_EXPORT QmlStateChangeScript : public QmlStateOperation, public QmlActionEvent
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlStateChangeScript)
-
-    Q_PROPERTY(QmlScriptString script READ script WRITE setScript)
-    Q_PROPERTY(QString name READ name WRITE setName)
-
-public:
-    QmlStateChangeScript(QObject *parent=0);
-    ~QmlStateChangeScript();
-
-    virtual ActionList actions();
-
-    virtual QString typeName() const;
-
-    QmlScriptString script() const;
-    void setScript(const QmlScriptString &);
-    
-    QString name() const;
-    void setName(const QString &);
-
-    virtual void execute();
-};
-
-class QmlAnchorChangesPrivate;
-class Q_DECLARATIVE_EXPORT QmlAnchorChanges : public QmlStateOperation, public QmlActionEvent
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlAnchorChanges)
-
-    Q_PROPERTY(QmlGraphicsItem *target READ object WRITE setObject)
-    Q_PROPERTY(QString reset READ reset WRITE setReset)
-    Q_PROPERTY(QmlGraphicsAnchorLine left READ left WRITE setLeft)
-    Q_PROPERTY(QmlGraphicsAnchorLine right READ right WRITE setRight)
-    Q_PROPERTY(QmlGraphicsAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter)
-    Q_PROPERTY(QmlGraphicsAnchorLine top READ top WRITE setTop)
-    Q_PROPERTY(QmlGraphicsAnchorLine bottom READ bottom WRITE setBottom)
-    Q_PROPERTY(QmlGraphicsAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter)
-    Q_PROPERTY(QmlGraphicsAnchorLine baseline READ baseline WRITE setBaseline)
-
-public:
-    QmlAnchorChanges(QObject *parent=0);
-    ~QmlAnchorChanges();
-
-    virtual ActionList actions();
-
-    QmlGraphicsItem *object() const;
-    void setObject(QmlGraphicsItem *);
-
-    QString reset() const;
-    void setReset(const QString &);
-
-    QmlGraphicsAnchorLine left() const;
-    void setLeft(const QmlGraphicsAnchorLine &edge);
-
-    QmlGraphicsAnchorLine right() const;
-    void setRight(const QmlGraphicsAnchorLine &edge);
-
-    QmlGraphicsAnchorLine horizontalCenter() const;
-    void setHorizontalCenter(const QmlGraphicsAnchorLine &edge);
-
-    QmlGraphicsAnchorLine top() const;
-    void setTop(const QmlGraphicsAnchorLine &edge);
-
-    QmlGraphicsAnchorLine bottom() const;
-    void setBottom(const QmlGraphicsAnchorLine &edge);
-
-    QmlGraphicsAnchorLine verticalCenter() const;
-    void setVerticalCenter(const QmlGraphicsAnchorLine &edge);
-
-    QmlGraphicsAnchorLine baseline() const;
-    void setBaseline(const QmlGraphicsAnchorLine &edge);
-
-    virtual void execute();
-    virtual bool isReversable();
-    virtual void reverse();
-    virtual QString typeName() const;
-    virtual bool override(QmlActionEvent*other);
-    virtual QList<QmlAction> extraActions();
-    virtual bool changesBindings();
-    virtual void saveOriginals();
-    virtual void clearForwardBindings();
-    virtual void clearReverseBindings();
-    virtual void rewind();
-    virtual void saveCurrentValues();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlParentChange)
-QML_DECLARE_TYPE(QmlStateChangeScript)
-QML_DECLARE_TYPE(QmlAnchorChanges)
-
-QT_END_HEADER
-
-#endif // QMLSTATEOPERATIONS_H
diff --git a/src/declarative/util/qmlstyledtext.cpp b/src/declarative/util/qmlstyledtext.cpp
deleted file mode 100644
index 6d01e3c..0000000
--- a/src/declarative/util/qmlstyledtext.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QStack>
-#include <QVector>
-#include <QPainter>
-#include <QTextLayout>
-#include <QDebug>
-#include <qmath.h>
-#include "qmlstyledtext_p.h"
-
-/*
-    QmlStyledText supports few tags:
-
-    <b></b> - bold
-    <i></i> - italic
-    <br> - new line
-    <font color="color_name" size="1-7"></font>
-
-    The opening and closing tags must be correctly nested.
-*/
-
-QT_BEGIN_NAMESPACE
-
-class QmlStyledTextPrivate
-{
-public:
-    QmlStyledTextPrivate(const QString &t, QTextLayout &l) : text(t), layout(l), baseFont(layout.font()) {}
-
-    void parse();
-    bool parseTag(const QChar *&ch, const QString &textIn, QString &textOut, QTextCharFormat &format);
-    bool parseCloseTag(const QChar *&ch, const QString &textIn);
-    void parseEntity(const QChar *&ch, const QString &textIn, QString &textOut);
-    bool parseFontAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format);
-    QPair<QStringRef,QStringRef> parseAttribute(const QChar *&ch, const QString &textIn);
-    QStringRef parseValue(const QChar *&ch, const QString &textIn);
-
-    inline void skipSpace(const QChar *&ch) {
-        while (ch->isSpace() && !ch->isNull())
-            ++ch;
-    }
-
-    QString text;
-    QTextLayout &layout;
-    QFont baseFont;
-
-    static const QChar lessThan;
-    static const QChar greaterThan;
-    static const QChar equals;
-    static const QChar singleQuote;
-    static const QChar doubleQuote;
-    static const QChar slash;
-    static const QChar ampersand;
-};
-
-const QChar QmlStyledTextPrivate::lessThan(QLatin1Char('<'));
-const QChar QmlStyledTextPrivate::greaterThan(QLatin1Char('>'));
-const QChar QmlStyledTextPrivate::equals(QLatin1Char('='));
-const QChar QmlStyledTextPrivate::singleQuote(QLatin1Char('\''));
-const QChar QmlStyledTextPrivate::doubleQuote(QLatin1Char('\"'));
-const QChar QmlStyledTextPrivate::slash(QLatin1Char('/'));
-const QChar QmlStyledTextPrivate::ampersand(QLatin1Char('&'));
-
-QmlStyledText::QmlStyledText(const QString &string, QTextLayout &layout)
-: d(new QmlStyledTextPrivate(string, layout))
-{
-}
-
-QmlStyledText::~QmlStyledText()
-{
-    delete d;
-}
-
-void QmlStyledText::parse(const QString &string, QTextLayout &layout)
-{
-    if (string.isEmpty())
-        return;
-    QmlStyledText styledText(string, layout);
-    styledText.d->parse();
-}
-
-void QmlStyledTextPrivate::parse()
-{
-    QList<QTextLayout::FormatRange> ranges;
-    QStack<QTextCharFormat> formatStack;
-
-    QString drawText;
-    drawText.reserve(text.count());
-
-    int textStart = 0;
-    int textLength = 0;
-    int rangeStart = 0;
-    const QChar *ch = text.constData();
-    while (!ch->isNull()) {
-        if (*ch == lessThan) {
-            if (textLength)
-                drawText.append(QStringRef(&text, textStart, textLength));
-            if (rangeStart != drawText.length() && formatStack.count()) {
-                QTextLayout::FormatRange formatRange;
-                formatRange.format = formatStack.top();
-                formatRange.start = rangeStart;
-                formatRange.length = drawText.length() - rangeStart;
-                ranges.append(formatRange);
-            }
-            rangeStart = drawText.length();
-            ++ch;
-            if (*ch == slash) {
-                ++ch;
-                if (parseCloseTag(ch, text)) {
-                    if (formatStack.count())
-                        formatStack.pop();
-                }
-            } else {
-                QTextCharFormat format;
-                if (formatStack.count())
-                    format = formatStack.top();
-                else
-                    format.setFont(baseFont);
-                if (parseTag(ch, text, drawText, format))
-                    formatStack.push(format);
-            }
-            textStart = ch - text.constData() + 1;
-            textLength = 0;
-        } else if (*ch == ampersand) {
-            ++ch;
-            drawText.append(QStringRef(&text, textStart, textLength));
-            parseEntity(ch, text, drawText);
-            textStart = ch - text.constData() + 1;
-            textLength = 0;
-        } else {
-            ++textLength;
-        }
-        if (!ch->isNull())
-            ++ch;
-    }
-    if (textLength)
-        drawText.append(QStringRef(&text, textStart, textLength));
-    if (rangeStart != drawText.length() && formatStack.count()) {
-        QTextLayout::FormatRange formatRange;
-        formatRange.format = formatStack.top();
-        formatRange.start = rangeStart;
-        formatRange.length = drawText.length() - rangeStart;
-        ranges.append(formatRange);
-    }
-
-    layout.setText(drawText);
-    layout.setAdditionalFormats(ranges);
-}
-
-bool QmlStyledTextPrivate::parseTag(const QChar *&ch, const QString &textIn, QString &textOut, QTextCharFormat &format)
-{
-    skipSpace(ch);
-
-    int tagStart = ch - textIn.constData();
-    int tagLength = 0;
-    while (!ch->isNull()) {
-        if (*ch == greaterThan) {
-            QStringRef tag(&textIn, tagStart, tagLength);
-            const QChar char0 = tag.at(0);
-            if (char0 == QLatin1Char('b')) {
-                if (tagLength == 1)
-                    format.setFontWeight(QFont::Bold);
-                else if (tagLength == 2 && tag.at(1) == QLatin1Char('r'))
-                    textOut.append(QChar(QChar::LineSeparator));
-            } else if (char0 == QLatin1Char('i')) {
-                if (tagLength == 1)
-                    format.setFontItalic(true);
-            }
-            return true;
-        } else if (ch->isSpace()) {
-            // may have params.
-            QStringRef tag(&textIn, tagStart, tagLength);
-            if (tag == QLatin1String("font"))
-                return parseFontAttributes(ch, textIn, format);
-            if (*ch == greaterThan || ch->isNull())
-                continue;
-        } else if (*ch != slash){
-            tagLength++;
-        }
-        ++ch;
-    }
-
-    return false;
-}
-
-bool QmlStyledTextPrivate::parseCloseTag(const QChar *&ch, const QString &textIn)
-{
-    skipSpace(ch);
-
-    int tagStart = ch - textIn.constData();
-    int tagLength = 0;
-    while (!ch->isNull()) {
-        if (*ch == greaterThan) {
-            QStringRef tag(&textIn, tagStart, tagLength);
-            const QChar char0 = tag.at(0);
-            if (char0 == QLatin1Char('b')) {
-                if (tagLength == 1)
-                    return true;
-                else if (tag.at(1) == QLatin1Char('r') && tagLength == 2)
-                    return true;
-            } else if (char0 == QLatin1Char('i')) {
-                if (tagLength == 1)
-                    return true;
-            } else if (tag == QLatin1String("font")) {
-                return true;
-            }
-            return false;
-        } else if (!ch->isSpace()){
-            tagLength++;
-        }
-        ++ch;
-    }
-
-    return false;
-}
-
-void QmlStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textIn, QString &textOut)
-{
-    int entityStart = ch - textIn.constData();
-    int entityLength = 0;
-    while (!ch->isNull()) {
-        if (*ch == QLatin1Char(';')) {
-            QStringRef entity(&textIn, entityStart, entityLength);
-            if (entity == QLatin1String("gt"))
-                textOut += QChar(62);
-            else if (entity == QLatin1String("lt"))
-                textOut += QChar(60);
-            else if (entity == QLatin1String("amp"))
-                textOut += QChar(38);
-            return;
-        }
-        ++entityLength;
-        ++ch;
-    }
-}
-
-bool QmlStyledTextPrivate::parseFontAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format)
-{
-    bool valid = false;
-    QPair<QStringRef,QStringRef> attr;
-    do {
-        attr = parseAttribute(ch, textIn);
-        if (attr.first == QLatin1String("color")) {
-            valid = true;
-            format.setForeground(QColor(attr.second.toString()));
-        } else if (attr.first == QLatin1String("size")) {
-            valid = true;
-            int size = attr.second.toString().toInt();
-            if (attr.second.at(0) == QLatin1Char('-') || attr.second.at(0) == QLatin1Char('+'))
-                size += 3;
-            if (size >= 1 && size <= 7) {
-                static const qreal scaling[] = { 0.7, 0.8, 1.0, 1.2, 1.5, 2.0, 2.4 };
-                format.setFontPointSize(baseFont.pointSize() * scaling[size-1]);
-            }
-        }
-    } while (!ch->isNull() && !attr.first.isEmpty());
-
-    return valid;
-}
-
-QPair<QStringRef,QStringRef> QmlStyledTextPrivate::parseAttribute(const QChar *&ch, const QString &textIn)
-{
-    skipSpace(ch);
-
-    int attrStart = ch - textIn.constData();
-    int attrLength = 0;
-    while (!ch->isNull()) {
-        if (*ch == greaterThan) {
-            break;
-        } else if (*ch == equals) {
-            ++ch;
-            if (*ch != singleQuote && *ch != doubleQuote) {
-                while (*ch != greaterThan && !ch->isNull())
-                    ++ch;
-                break;
-            }
-            ++ch;
-            if (!attrLength)
-                break;
-            QStringRef attr(&textIn, attrStart, attrLength);
-            QStringRef val = parseValue(ch, textIn);
-            if (!val.isEmpty())
-                return QPair<QStringRef,QStringRef>(attr,val);
-            break;
-        } else {
-            ++attrLength;
-        }
-        ++ch;
-    }
-
-    return QPair<QStringRef,QStringRef>();
-}
-
-QStringRef QmlStyledTextPrivate::parseValue(const QChar *&ch, const QString &textIn)
-{
-    int valStart = ch - textIn.constData();
-    int valLength = 0;
-    while (*ch != singleQuote && *ch != doubleQuote && !ch->isNull()) {
-        ++valLength;
-        ++ch;
-    }
-    if (ch->isNull())
-        return QStringRef();
-    ++ch; // skip quote
-
-    return QStringRef(&textIn, valStart, valLength);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlstyledtext_p.h b/src/declarative/util/qmlstyledtext_p.h
deleted file mode 100644
index 2c29832..0000000
--- a/src/declarative/util/qmlstyledtext_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSTYLEDTEXT_H
-#define QMLSTYLEDTEXT_H
-
-#include <QSizeF>
-
-QT_BEGIN_NAMESPACE
-
-class QPainter;
-class QPointF;
-class QString;
-class QmlStyledTextPrivate;
-class QTextLayout;
-
-class Q_DECLARATIVE_EXPORT QmlStyledText
-{
-public:
-    static void parse(const QString &string, QTextLayout &layout);
-
-private:
-    QmlStyledText(const QString &string, QTextLayout &layout);
-    ~QmlStyledText();
-
-    QmlStyledTextPrivate *d;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/declarative/util/qmlsystempalette.cpp b/src/declarative/util/qmlsystempalette.cpp
deleted file mode 100644
index 9bc62bd..0000000
--- a/src/declarative/util/qmlsystempalette.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlsystempalette_p.h"
-
-#include <QApplication>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlSystemPalettePrivate : public QObjectPrivate
-{
-public:
-    QPalette palette;
-    QPalette::ColorGroup group;
-};
-
-
-
-/*!
-    \qmlclass SystemPalette QmlSystemPalette
-    \ingroup group_utility
-    \brief The SystemPalette item gives access to the Qt palettes.
-    \sa QPalette
-
-    Example:
-    \qml
-    SystemPalette { id: myPalette; colorGroup: Qt.Active }
-
-    Rectangle {
-        width: 640; height: 480
-        color: myPalette.window
-        Text {
-            anchors.fill: parent
-            text: "Hello!"; color: myPalette.windowText
-        }
-    }
-    \endqml
-*/
-QmlSystemPalette::QmlSystemPalette(QObject *parent)
-    : QObject(*(new QmlSystemPalettePrivate), parent)
-{
-    Q_D(QmlSystemPalette);
-    d->palette = QApplication::palette();
-    d->group = QPalette::Active;
-    qApp->installEventFilter(this);
-}
-
-QmlSystemPalette::~QmlSystemPalette()
-{
-}
-
-/*!
-    \qmlproperty color SystemPalette::window
-    The window (general background) color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::window() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Window);
-}
-
-/*!
-    \qmlproperty color SystemPalette::windowText
-    The window text (general foreground) color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::windowText() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::WindowText);
-}
-
-/*!
-    \qmlproperty color SystemPalette::base
-    The base color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::base() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Base);
-}
-
-/*!
-    \qmlproperty color SystemPalette::text
-    The text color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::text() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Text);
-}
-
-/*!
-    \qmlproperty color SystemPalette::alternateBase
-    The alternate base color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::alternateBase() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::AlternateBase);
-}
-
-/*!
-    \qmlproperty color SystemPalette::button
-    The button color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::button() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Button);
-}
-
-/*!
-    \qmlproperty color SystemPalette::buttonText
-    The button text foreground color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::buttonText() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::ButtonText);
-}
-
-/*!
-    \qmlproperty color SystemPalette::light
-    The light color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::light() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Light);
-}
-
-/*!
-    \qmlproperty color SystemPalette::midlight
-    The midlight color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::midlight() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Midlight);
-}
-
-/*!
-    \qmlproperty color SystemPalette::dark
-    The dark color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::dark() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Dark);
-}
-
-/*!
-    \qmlproperty color SystemPalette::mid
-    The mid color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::mid() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Mid);
-}
-
-/*!
-    \qmlproperty color SystemPalette::shadow
-    The shadow color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::shadow() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Shadow);
-}
-
-/*!
-    \qmlproperty color SystemPalette::highlight
-    The highlight color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::highlight() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::Highlight);
-}
-
-/*!
-    \qmlproperty color SystemPalette::highlightedText
-    The highlighted text color of the current color group.
-
-    \sa QPalette::ColorRole
-*/
-QColor QmlSystemPalette::highlightedText() const
-{
-    Q_D(const QmlSystemPalette);
-    return d->palette.color(d->group, QPalette::HighlightedText);
-}
-
-/*!
-    \qmlproperty QmlSystemPalette::ColorGroup SystemPalette::colorGroup
-
-    The color group of the palette. It can be Active, Inactive or Disabled.
-    Active is the default.
-
-    \sa QPalette::ColorGroup
-*/
-QmlSystemPalette::ColorGroup QmlSystemPalette::colorGroup() const
-{
-    Q_D(const QmlSystemPalette);
-    return (QmlSystemPalette::ColorGroup)d->group;
-}
-
-void QmlSystemPalette::setColorGroup(QmlSystemPalette::ColorGroup colorGroup)
-{
-    Q_D(QmlSystemPalette);
-    d->group = (QPalette::ColorGroup)colorGroup;
-    emit paletteChanged();
-}
-
-bool QmlSystemPalette::eventFilter(QObject *watched, QEvent *event)
-{
-    if (watched == qApp) {
-        if (event->type() == QEvent::ApplicationPaletteChange) {
-            QApplication::postEvent(this, new QEvent(QEvent::ApplicationPaletteChange));
-            return false;
-        }
-    }
-    return QObject::eventFilter(watched, event);
-}
-
-bool QmlSystemPalette::event(QEvent *event)
-{
-    Q_D(QmlSystemPalette);
-    if (event->type() == QEvent::ApplicationPaletteChange) {
-        d->palette = QApplication::palette();
-        emit paletteChanged();
-        return true;
-    }
-    return QObject::event(event);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlsystempalette_p.h b/src/declarative/util/qmlsystempalette_p.h
deleted file mode 100644
index e25bf7f..0000000
--- a/src/declarative/util/qmlsystempalette_p.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSYSTEMPALETTE_H
-#define QMLSYSTEMPALETTE_H
-
-#include <qml.h>
-
-#include <QtCore/qobject.h>
-#include <QPalette>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlSystemPalettePrivate;
-class Q_DECLARATIVE_EXPORT QmlSystemPalette : public QObject
-{
-    Q_OBJECT
-    Q_ENUMS(ColorGroup)
-    Q_DECLARE_PRIVATE(QmlSystemPalette)
-
-    Q_PROPERTY(QmlSystemPalette::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)
-    Q_PROPERTY(QColor text READ text NOTIFY paletteChanged)
-    Q_PROPERTY(QColor alternateBase READ alternateBase NOTIFY paletteChanged)
-    Q_PROPERTY(QColor button READ button NOTIFY paletteChanged)
-    Q_PROPERTY(QColor buttonText READ buttonText NOTIFY paletteChanged)
-    Q_PROPERTY(QColor light READ light NOTIFY paletteChanged)
-    Q_PROPERTY(QColor midlight READ midlight NOTIFY paletteChanged)
-    Q_PROPERTY(QColor dark READ dark NOTIFY paletteChanged)
-    Q_PROPERTY(QColor mid READ mid NOTIFY paletteChanged)
-    Q_PROPERTY(QColor shadow READ shadow NOTIFY paletteChanged)
-    Q_PROPERTY(QColor highlight READ highlight NOTIFY paletteChanged)
-    Q_PROPERTY(QColor highlightedText READ highlightedText NOTIFY paletteChanged)
-
-public:
-    QmlSystemPalette(QObject *parent=0);
-    ~QmlSystemPalette();
-
-    enum ColorGroup { Active = QPalette::Active, Inactive = QPalette::Inactive, Disabled = QPalette::Disabled };
-
-    QColor window() const;
-    QColor windowText() const;
-
-    QColor base() const;
-    QColor text() const;
-    QColor alternateBase() const;
-
-    QColor button() const;
-    QColor buttonText() const;
-
-    QColor light() const;
-    QColor midlight() const;
-    QColor dark() const;
-    QColor mid() const;
-    QColor shadow() const;
-
-    QColor highlight() const;
-    QColor highlightedText() const;
-
-    QmlSystemPalette::ColorGroup colorGroup() const;
-    void setColorGroup(QmlSystemPalette::ColorGroup);
-
-Q_SIGNALS:
-    void paletteChanged();
-
-private:
-    bool eventFilter(QObject *watched, QEvent *event);
-    bool event(QEvent *event);
-
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlSystemPalette)
-
-QT_END_HEADER
-
-#endif // QMLSYSTEMPALETTE_H
diff --git a/src/declarative/util/qmltimeline.cpp b/src/declarative/util/qmltimeline.cpp
deleted file mode 100644
index 5c5df40..0000000
--- a/src/declarative/util/qmltimeline.cpp
+++ /dev/null
@@ -1,942 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmltimeline_p_p.h"
-
-#include <QDebug>
-#include <QMutex>
-#include <QThread>
-#include <QWaitCondition>
-#include <QEvent>
-#include <QCoreApplication>
-#include <QEasingCurve>
-#include <QTime>
-
-QT_BEGIN_NAMESPACE
-
-struct Update {
-    Update(QmlTimeLineValue *_g, qreal _v)
-        : g(_g), v(_v) {}
-    Update(const QmlTimeLineCallback &_e)
-        : g(0), v(0), e(_e) {}
-
-    QmlTimeLineValue *g;
-    qreal v;
-    QmlTimeLineCallback e;
-};
-
-struct QmlTimeLinePrivate
-{
-    QmlTimeLinePrivate(QmlTimeLine *);
-
-    struct Op {
-        enum Type {
-            Pause,
-            Set,
-            Move,
-            MoveBy,
-            Accel,
-            AccelDistance,
-            Execute
-        };
-        Op() {}
-        Op(Type t, int l, qreal v, qreal v2, int o, 
-           const QmlTimeLineCallback &ev = QmlTimeLineCallback(), const QEasingCurve &es = QEasingCurve())
-            : type(t), length(l), value(v), value2(v2), order(o), event(ev),
-              easing(es) {}
-        Op(const Op &o)
-            : type(o.type), length(o.length), value(o.value), value2(o.value2),
-              order(o.order), event(o.event), easing(o.easing) {}
-        Op &operator=(const Op &o) {
-            type = o.type; length = o.length; value = o.value; 
-            value2 = o.value2; order = o.order; event = o.event; 
-            easing = o.easing;
-            return *this;
-        }
-
-        Type type;
-        int length;
-        qreal value;
-        qreal value2;
-
-        int order;
-        QmlTimeLineCallback event;
-        QEasingCurve easing;
-    };
-    struct TimeLine
-    {
-        TimeLine() : length(0), consumedOpLength(0), base(0.) {}
-        QList<Op> ops;
-        int length;
-        int consumedOpLength;
-        qreal base;
-    };
-
-    int length;
-    int syncPoint;
-    typedef QHash<QmlTimeLineObject *, TimeLine> Ops;
-    Ops ops;
-    QmlTimeLine *q;
-
-    void add(QmlTimeLineObject &, const Op &);
-    qreal value(const Op &op, int time, qreal base, bool *) const;
-
-    int advance(int);
-
-    bool clockRunning;
-    int prevTime;
-
-    int order;
-
-    QmlTimeLine::SyncMode syncMode;
-    int syncAdj;
-    QList<QPair<int, Update> > *updateQueue;
-};
-
-QmlTimeLinePrivate::QmlTimeLinePrivate(QmlTimeLine *parent)
-: length(0), syncPoint(0), q(parent), clockRunning(false), prevTime(0), order(0), syncMode(QmlTimeLine::LocalSync), syncAdj(0), updateQueue(0)
-{
-}
-
-void QmlTimeLinePrivate::add(QmlTimeLineObject &g, const Op &o)
-{
-    if (g._t && g._t != q) {
-        qWarning() << "QmlTimeLine: Cannot modify a QmlTimeLineValue owned by"
-                   << "another timeline.";
-        return;
-    }
-    g._t = q;
-
-    Ops::Iterator iter = ops.find(&g);
-    if (iter == ops.end()) {
-        iter = ops.insert(&g, TimeLine());
-        if (syncPoint > 0)
-            q->pause(g, syncPoint);
-    }
-    if (!iter->ops.isEmpty() &&
-       o.type == Op::Pause &&
-       iter->ops.last().type == Op::Pause) {
-        iter->ops.last().length += o.length;
-        iter->length += o.length;
-    } else {
-        iter->ops.append(o);
-        iter->length += o.length;
-    }
-
-    if (iter->length > length)
-        length = iter->length;
-
-    if (!clockRunning) {
-        q->stop();
-        prevTime = 0;
-        clockRunning = true;
-
-        if (syncMode == QmlTimeLine::LocalSync)  {
-            syncAdj = -1;
-        } else {
-            syncAdj = 0;
-        }
-        q->start();
-/*        q->tick(0);
-        if (syncMode == QmlTimeLine::LocalSync)  {
-            syncAdj = -1;
-        } else {
-            syncAdj = 0;
-        }
-        */
-    }
-}
-
-qreal QmlTimeLinePrivate::value(const Op &op, int time, qreal base, bool *changed) const
-{
-    Q_ASSERT(time >= 0);
-    Q_ASSERT(time <= op.length);
-    *changed = true;
-
-    switch(op.type) {
-        case Op::Pause:
-            *changed = false;
-            return base;
-        case Op::Set:
-            return op.value;
-        case Op::Move:
-            if (time == 0) {
-                return base;
-            } else if (time == (op.length)) {
-                return op.value;
-            } else {
-                qreal delta = op.value - base;
-                qreal pTime = (qreal)(time) / (qreal)op.length;
-                if (op.easing.type() == QEasingCurve::Linear)
-                    return base + delta * pTime;
-                else
-                    return base + delta * op.easing.valueForProgress(pTime);
-            }
-        case Op::MoveBy:
-            if (time == 0) {
-                return base;
-            } else if (time == (op.length)) {
-                return base + op.value;
-            } else {
-                qreal delta = op.value;
-                qreal pTime = (qreal)(time) / (qreal)op.length;
-                if (op.easing.type() == QEasingCurve::Linear)
-                    return base + delta * pTime;
-                else
-                    return base + delta * op.easing.valueForProgress(pTime);
-            }
-        case Op::Accel:
-            if (time == 0) {
-                return base;
-            } else {
-                qreal t = (qreal)(time) / 1000.0f;
-                qreal delta = op.value * t + 0.5f * op.value2 * t * t;
-                return base + delta;
-            }
-        case Op::AccelDistance:
-            if (time == 0) {
-                return base;
-            } else if (time == (op.length)) {
-                return base + op.value2;
-            } else {
-                qreal t = (qreal)(time) / 1000.0f;
-                qreal accel = -1.0f * 1000.0f * op.value / (qreal)op.length;
-                qreal delta = op.value * t + 0.5f * accel * t * t;
-                return base + delta;
-
-            }
-        case Op::Execute:
-            op.event.d0(op.event.d1);
-            *changed = false;
-            return -1;
-    }
-
-    return base;
-}
-
-/*!
-    \internal
-    \class QmlTimeLine
-    \ingroup group_animation
-    \brief The QmlTimeLine class provides a timeline for controlling animations.
-
-    QmlTimeLine is similar to QTimeLine except:
-    \list
-    \i It updates QmlTimeLineValue instances directly, rather than maintaining a single
-    current value.
-
-    For example, the following animates a simple value over 200 milliseconds:
-    \code
-    QmlTimeLineValue v(<starting value>);
-    QmlTimeLine tl;
-    tl.move(v, 100., 200);
-    tl.start()
-    \endcode
-
-    If your program needs to know when values are changed, it can either
-    connect to the QmlTimeLine's updated() signal, or inherit from QmlTimeLineValue
-    and reimplement the QmlTimeLineValue::setValue() method.
-
-    \i Supports multiple QmlTimeLineValue, arbitrary start and end values and allows
-    animations to be strung together for more complex effects.
-
-    For example, the following animation moves the x and y coordinates of
-    an object from wherever they are to the position (100, 100) in 50
-    milliseconds and then further animates them to (100, 200) in 50
-    milliseconds:
-
-    \code
-    QmlTimeLineValue x(<starting value>);
-    QmlTimeLineValue y(<starting value>);
-
-    QmlTimeLine tl;
-    tl.start();
-
-    tl.move(x, 100., 50);
-    tl.move(y, 100., 50);
-    tl.move(y, 200., 50);
-    \endcode
-
-    \i All QmlTimeLine instances share a single, synchronized clock.
-
-    Actions scheduled within the same event loop tick are scheduled
-    synchronously against each other, regardless of the wall time between the
-    scheduling.  Synchronized scheduling applies both to within the same
-    QmlTimeLine and across separate QmlTimeLine's within the same process.
-
-    \endlist
-
-    Currently easing functions are not supported.
-*/
-
-
-/*!
-    Construct a new QmlTimeLine with the specified \a parent.
-*/
-QmlTimeLine::QmlTimeLine(QObject *parent)
-: QAbstractAnimation(parent)
-{
-    d = new QmlTimeLinePrivate(this);
-}
-
-/*!
-    Destroys the time line.  Any inprogress animations are canceled, but not
-    completed.
-*/
-QmlTimeLine::~QmlTimeLine()
-{
-    for (QmlTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
-            iter != d->ops.end();
-            ++iter)
-        iter.key()->_t = 0;
-
-    delete d; d = 0;
-}
-
-/*!
-    \enum QmlTimeLine::SyncMode
- */
-
-/*!
-    Return the timeline's synchronization mode.
- */
-QmlTimeLine::SyncMode QmlTimeLine::syncMode() const
-{
-    return d->syncMode;
-}
-
-/*!
-    Set the timeline's synchronization mode to \a syncMode.
- */
-void QmlTimeLine::setSyncMode(SyncMode syncMode)
-{
-    d->syncMode = syncMode;
-}
-
-/*!
-    Pause \a obj for \a time milliseconds.
-*/
-void QmlTimeLine::pause(QmlTimeLineObject &obj, int time)
-{
-    if (time <= 0) return;
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Pause, time, 0., 0., d->order++);
-    d->add(obj, op);
-}
-
-/*!
-    Execute the \a event.
- */
-void QmlTimeLine::callback(const QmlTimeLineCallback &callback)
-{
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Execute, 0, 0, 0., d->order++, callback);
-    d->add(*callback.callbackObject(), op);
-}
-
-/*!
-    Set the \a value of \a timeLineValue.
-*/
-void QmlTimeLine::set(QmlTimeLineValue &timeLineValue, qreal value)
-{
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Set, 0, value, 0., d->order++);
-    d->add(timeLineValue, op);
-}
-
-/*!
-    Decelerate \a timeLineValue from the starting \a velocity to zero at the
-    given \a acceleration rate.  Although the \a acceleration is technically
-    a deceleration, it should always be positive.  The QmlTimeLine will ensure
-    that the deceleration is in the opposite direction to the initial velocity.
-*/
-int QmlTimeLine::accel(QmlTimeLineValue &timeLineValue, qreal velocity, qreal acceleration)
-{
-    if ((velocity > 0.0f) ==  (acceleration > 0.0f))
-        acceleration = acceleration * -1.0f;
-
-    int time = static_cast<int>(-1000 * velocity / acceleration);
-
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Accel, time, velocity, acceleration, d->order++);
-    d->add(timeLineValue, op);
-
-    return time;
-}
-
-/*!
-    \overload
-
-    Decelerate \a timeLineValue from the starting \a velocity to zero at the
-    given \a acceleration rate over a maximum distance of maxDistance.
-
-    If necessary, QmlTimeLine will reduce the acceleration to ensure that the
-    entire operation does not require a move of more than \a maxDistance.
-    \a maxDistance should always be positive.
-*/
-int QmlTimeLine::accel(QmlTimeLineValue &timeLineValue, qreal velocity, qreal acceleration, qreal maxDistance)
-{
-    Q_ASSERT(acceleration >= 0.0f && maxDistance >= 0.0f);
-
-    qreal maxAccel = (velocity * velocity) / (2.0f * maxDistance);
-    if (maxAccel > acceleration)
-        acceleration = maxAccel;
-
-    if ((velocity > 0.0f) ==  (acceleration > 0.0f))
-        acceleration = acceleration * -1.0f;
-
-    int time = static_cast<int>(-1000 * velocity / acceleration);
-
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Accel, time, velocity, acceleration, d->order++);
-    d->add(timeLineValue, op);
-
-    return time;
-}
-
-/*!
-    Decelerate \a timeLineValue from the starting \a velocity to zero over the given
-    \a distance.  This is like accel(), but the QmlTimeLine calculates the exact
-    deceleration to use.
-
-    \a distance should be positive.
-*/
-int QmlTimeLine::accelDistance(QmlTimeLineValue &timeLineValue, qreal velocity, qreal distance)
-{
-    if (distance == 0.0f || velocity == 0.0f)
-        return -1;
-    Q_ASSERT((distance >= 0.0f) == (velocity >= 0.0f));
-
-    int time = static_cast<int>(1000 * (2.0f * distance) / velocity);
-
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::AccelDistance, time, velocity, distance, d->order++);
-    d->add(timeLineValue, op);
-
-    return time;
-}
-
-/*!
-    Linearly change the \a timeLineValue from its current value to the given
-    \a destination value over \a time milliseconds.
-*/
-void QmlTimeLine::move(QmlTimeLineValue &timeLineValue, qreal destination, int time)
-{
-    if (time <= 0) return;
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++);
-    d->add(timeLineValue, op);
-}
-
-/*!
-    Change the \a timeLineValue from its current value to the given \a destination
-    value over \a time milliseconds using the \a easing curve.
- */
-void QmlTimeLine::move(QmlTimeLineValue &timeLineValue, qreal destination, const QEasingCurve &easing, int time)
-{
-    if (time <= 0) return;
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++, QmlTimeLineCallback(), easing);
-    d->add(timeLineValue, op);
-}
-
-/*!
-    Linearly change the \a timeLineValue from its current value by the \a change amount
-    over \a time milliseconds.
-*/
-void QmlTimeLine::moveBy(QmlTimeLineValue &timeLineValue, qreal change, int time)
-{
-    if (time <= 0) return;
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++);
-    d->add(timeLineValue, op);
-}
-
-/*!
-    Change the \a timeLineValue from its current value by the \a change amount over
-    \a time milliseconds using the \a easing curve.
- */
-void QmlTimeLine::moveBy(QmlTimeLineValue &timeLineValue, qreal change, const QEasingCurve &easing, int time)
-{
-    if (time <= 0) return;
-    QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++, QmlTimeLineCallback(), easing);
-    d->add(timeLineValue, op);
-}
-
-/*!
-    Cancel (but don't complete) all scheduled actions for \a timeLineValue.
-*/
-void QmlTimeLine::reset(QmlTimeLineValue &timeLineValue)
-{
-    if (!timeLineValue._t)
-        return;
-    if (timeLineValue._t != this) {
-        qWarning() << "QmlTimeLine: Cannot reset a QmlTimeLineValue owned by another timeline.";
-        return;
-    }
-    remove(&timeLineValue);
-    timeLineValue._t = 0;
-}
-
-int QmlTimeLine::duration() const
-{
-    return -1;
-}
-
-/*!
-    Synchronize the end point of \a timeLineValue to the endpoint of \a syncTo
-    within this timeline.
-
-    Following operations on \a timeLineValue in this timeline will be scheduled after
-    all the currently scheduled actions on \a syncTo are complete.  In
-    psuedo-code this is equivalent to:
-    \code
-    QmlTimeLine::pause(timeLineValue, min(0, length_of(syncTo) - length_of(timeLineValue)))
-    \endcode
-*/
-void QmlTimeLine::sync(QmlTimeLineValue &timeLineValue, QmlTimeLineValue &syncTo)
-{
-    QmlTimeLinePrivate::Ops::Iterator iter = d->ops.find(&syncTo);
-    if (iter == d->ops.end())
-        return;
-    int length = iter->length;
-
-    iter = d->ops.find(&timeLineValue);
-    if (iter == d->ops.end()) {
-        pause(timeLineValue, length);
-    } else {
-        int glength = iter->length;
-        pause(timeLineValue, length - glength);
-    }
-}
-
-/*!
-    Synchronize the end point of \a timeLineValue to the endpoint of the longest
-    action cursrently scheduled in the timeline.
-
-    In psuedo-code, this is equivalent to:
-    \code
-    QmlTimeLine::pause(timeLineValue, length_of(timeline) - length_of(timeLineValue))
-    \endcode
-*/
-void QmlTimeLine::sync(QmlTimeLineValue &timeLineValue)
-{
-    QmlTimeLinePrivate::Ops::Iterator iter = d->ops.find(&timeLineValue);
-    if (iter == d->ops.end()) {
-        pause(timeLineValue, d->length);
-    } else {
-        pause(timeLineValue, d->length - iter->length);
-    }
-}
-
-/*
-    Synchronize all currently and future scheduled values in this timeline to
-    the longest action currently scheduled.
-
-    For example:
-    \code
-    value1->setValue(0.);
-    value2->setValue(0.);
-    value3->setValue(0.);
-    QmlTimeLine tl;
-    ...
-    tl.move(value1, 10, 200);
-    tl.move(value2, 10, 100);
-    tl.sync();
-    tl.move(value2, 20, 100);
-    tl.move(value3, 20, 100);
-    \endcode
-
-    will result in:
-
-    \table
-    \header \o \o 0ms \o 50ms \o 100ms \o 150ms \o 200ms \o 250ms \o 300ms
-    \row \o value1 \o 0 \o 2.5 \o 5.0 \o 7.5 \o 10 \o 10 \o 10
-    \row \o value2 \o 0 \o 5.0 \o 10.0 \o 10.0 \o 10.0 \o 15.0 \o 20.0
-    \row \o value2 \o 0 \o 0 \o 0 \o 0 \o 0 \o 10.0 \o 20.0
-    \endtable
-*/
-
-/*void QmlTimeLine::sync()
-{
-    for (QmlTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
-            iter != d->ops.end();
-            ++iter)
-        pause(*iter.key(), d->length - iter->length);
-    d->syncPoint = d->length;
-}*/
-
-/*! 
-    \internal 
-
-    Temporary hack.
- */
-void QmlTimeLine::setSyncPoint(int sp)
-{
-    d->syncPoint = sp;
-}
-
-/*! 
-    \internal 
- 
-    Temporary hack.
- */
-int QmlTimeLine::syncPoint() const
-{
-    return d->syncPoint;
-}
-
-/*!
-    Returns true if the timeline is active.  An active timeline is one where
-    QmlTimeLineValue actions are still pending.
-*/
-bool QmlTimeLine::isActive() const
-{
-    return !d->ops.isEmpty();
-}
-
-/*!
-    Completes the timeline.  All queued actions are played to completion, and then discarded.  For example,
-    \code
-    QmlTimeLineValue v(0.);
-    QmlTimeLine tl;
-    tl.move(v, 100., 1000.);
-    // 500 ms passes
-    // v.value() == 50.
-    tl.complete();
-    // v.value() == 100.
-    \endcode
-*/
-void QmlTimeLine::complete()
-{
-    d->advance(d->length);
-}
-
-/*!
-    Resets the timeline.  All queued actions are discarded and QmlTimeLineValue's retain their current value. For example,
-    \code
-    QmlTimeLineValue v(0.);
-    QmlTimeLine tl;
-    tl.move(v, 100., 1000.);
-    // 500 ms passes
-    // v.value() == 50.
-    tl.clear();
-    // v.value() == 50.
-    \endcode
-*/
-void QmlTimeLine::clear()
-{
-    for (QmlTimeLinePrivate::Ops::ConstIterator iter = d->ops.begin(); iter != d->ops.end(); ++iter)
-        iter.key()->_t = 0;
-    d->ops.clear();
-    d->length = 0;
-    d->syncPoint = 0;
-    //XXX need stop here?
-}
-
-int QmlTimeLine::time() const
-{
-    return d->prevTime;
-}
-
-/*!
-    \fn void QmlTimeLine::updated()
-
-    Emitted each time the timeline modifies QmlTimeLineValues.  Even if multiple
-    QmlTimeLineValues are changed, this signal is only emitted once for each clock tick.
-*/
-
-void QmlTimeLine::updateCurrentTime(int v)
-{
-    if (d->syncAdj == -1)
-        d->syncAdj = v;
-    v -= d->syncAdj;
-
-    int timeChanged = v - d->prevTime;
-#if 0
-    if (!timeChanged)
-        return;
-#endif
-    d->prevTime = v;
-    d->advance(timeChanged);
-    emit updated();
-
-    // Do we need to stop the clock?
-    if (d->ops.isEmpty()) {
-        stop();
-        d->prevTime = 0;
-        d->clockRunning = false;
-        emit completed();
-    } /*else if (pauseTime > 0) {
-        GfxClock::cancelClock();
-        d->prevTime = 0;
-        GfxClock::pauseFor(pauseTime);
-        d->syncAdj = 0;
-        d->clockRunning = false;
-    }*/ else if (/*!GfxClock::isActive()*/ state() != Running) {
-        stop();
-        d->prevTime = 0;
-        d->clockRunning = true;
-        d->syncAdj = 0;
-        start();
-    }
-}
-
-bool operator<(const QPair<int, Update> &lhs,
-               const QPair<int, Update> &rhs)
-{
-    return lhs.first < rhs.first;
-}
-
-int QmlTimeLinePrivate::advance(int t)
-{
-    int pauseTime = -1;
-
-    // XXX - surely there is a more efficient way?
-    do {
-        pauseTime = -1;
-        // Minimal advance time
-        int advanceTime = t;
-        for (Ops::Iterator iter = ops.begin(); iter != ops.end(); ++iter) {
-            TimeLine &tl = *iter;
-            Op &op = tl.ops.first();
-            int length = op.length - tl.consumedOpLength;
-                
-            if (length < advanceTime) {
-                advanceTime = length;
-                if (advanceTime == 0)
-                    break;
-            }
-        }
-        t -= advanceTime;
-
-        // Process until then.  A zero length advance time will only process 
-        // sets.
-        QList<QPair<int, Update> > updates;
-
-        for (Ops::Iterator iter = ops.begin(); iter != ops.end(); ) {
-            QmlTimeLineValue *v = static_cast<QmlTimeLineValue *>(iter.key());
-            TimeLine &tl = *iter;
-            Q_ASSERT(!tl.ops.isEmpty());
-
-            do {
-                Op &op = tl.ops.first();
-                if (advanceTime == 0 && op.length != 0)
-                    continue;
-
-                if (tl.consumedOpLength == 0 && 
-                   op.type != Op::Pause && 
-                   op.type != Op::Execute)
-                    tl.base = v->value();
-
-                if ((tl.consumedOpLength + advanceTime) == op.length) {
-                    if (op.type == Op::Execute) {
-                        updates << qMakePair(op.order, Update(op.event));
-                    } else {
-                        bool changed = false;
-                        qreal val = value(op, op.length, tl.base, &changed);
-                        if (changed)
-                            updates << qMakePair(op.order, Update(v, val));
-                    }
-                    tl.length -= qMin(advanceTime, tl.length);
-                    tl.consumedOpLength = 0;
-                    tl.ops.removeFirst();
-                } else {
-                    tl.consumedOpLength += advanceTime;
-                    bool changed = false;
-                    qreal val = value(op, tl.consumedOpLength, tl.base, &changed);
-                    if (changed)
-                        updates << qMakePair(op.order, Update(v, val));
-                    tl.length -= qMin(advanceTime, tl.length);
-                    break;
-                }
-
-            } while(!tl.ops.isEmpty() && advanceTime == 0 && tl.ops.first().length == 0);
-
-
-            if (tl.ops.isEmpty()) {
-                iter = ops.erase(iter);
-                v->_t = 0;
-            } else {
-                if (tl.ops.first().type == Op::Pause && pauseTime != 0) {
-                    int opPauseTime = tl.ops.first().length - tl.consumedOpLength;
-                    if (pauseTime == -1 || opPauseTime < pauseTime)
-                        pauseTime = opPauseTime;
-                } else {
-                    pauseTime = 0;
-                }
-                ++iter;
-            }
-        }
-
-        length -= qMin(length, advanceTime);
-        syncPoint -= advanceTime;
-
-        qSort(updates.begin(), updates.end());
-        updateQueue = &updates;
-        for (int ii = 0; ii < updates.count(); ++ii) {
-            const Update &v = updates.at(ii).second;
-            if (v.g) {
-                v.g->setValue(v.v);
-            } else {
-                v.e.d0(v.e.d1);
-            }
-        }
-        updateQueue = 0;
-    } while(t);
-
-    return pauseTime;
-}
-
-void QmlTimeLine::remove(QmlTimeLineObject *v)
-{
-    QmlTimeLinePrivate::Ops::Iterator iter = d->ops.find(v);
-    Q_ASSERT(iter != d->ops.end());
-
-    int len = iter->length;
-    d->ops.erase(iter);
-    if (len == d->length) {
-        // We need to recalculate the length
-        d->length = 0;
-        for (QmlTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
-                iter != d->ops.end();
-                ++iter) {
-
-            if (iter->length > d->length)
-                d->length = iter->length;
-
-        }
-    }
-    if (d->ops.isEmpty()) {
-        stop();
-        d->clockRunning = false;
-    } else if (/*!GfxClock::isActive()*/ state() != Running) {
-        stop();
-        d->prevTime = 0;
-        d->clockRunning = true;
-
-        if (d->syncMode == QmlTimeLine::LocalSync) {
-            d->syncAdj = -1;
-        } else {
-            d->syncAdj = 0;
-        }
-        start();
-    }
-
-    if (d->updateQueue) {
-        for (int ii = 0; ii < d->updateQueue->count(); ++ii) {
-            if (d->updateQueue->at(ii).second.g == v ||
-               d->updateQueue->at(ii).second.e.callbackObject() == v) {
-                d->updateQueue->removeAt(ii);
-                --ii;
-            }
-        }
-    }
-
-
-}
-
-/*!
-    \internal
-    \class QmlTimeLineValue
-    \ingroup group_animation
-    \brief The QmlTimeLineValue class provides a value that can be modified by QmlTimeLine.
-*/
-
-/*!
-    \fn QmlTimeLineValue::QmlTimeLineValue(qreal value = 0)
-
-    Construct a new QmlTimeLineValue with an initial \a value.
-*/
-
-/*!
-    \fn qreal QmlTimeLineValue::value() const
-
-    Return the current value.
-*/
-
-/*!
-    \fn void QmlTimeLineValue::setValue(qreal value)
-
-    Set the current \a value.
-*/
-
-/*!
-    \fn QmlTimeLine *QmlTimeLineValue::timeLine() const
-
-    If a QmlTimeLine is operating on this value, return a pointer to it,
-    otherwise return null.
-*/
-
-
-QmlTimeLineObject::QmlTimeLineObject()
-: _t(0)
-{
-}
-
-QmlTimeLineObject::~QmlTimeLineObject()
-{
-    if (_t) {
-        _t->remove(this);
-        _t = 0;
-    }
-}
-
-QmlTimeLineCallback::QmlTimeLineCallback()
-: d0(0), d1(0), d2(0)
-{
-}
-
-QmlTimeLineCallback::QmlTimeLineCallback(QmlTimeLineObject *b, Callback f, void *d)
-: d0(f), d1(d), d2(b)
-{
-}
-
-QmlTimeLineCallback::QmlTimeLineCallback(const QmlTimeLineCallback &o)
-: d0(o.d0), d1(o.d1), d2(o.d2)
-{
-}
-
-QmlTimeLineCallback &QmlTimeLineCallback::operator=(const QmlTimeLineCallback &o)
-{
-    d0 = o.d0;
-    d1 = o.d1;
-    d2 = o.d2;
-    return *this;
-}
-
-QmlTimeLineObject *QmlTimeLineCallback::callbackObject() const
-{
-    return d2;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmltimeline_p_p.h b/src/declarative/util/qmltimeline_p_p.h
deleted file mode 100644
index 076355d..0000000
--- a/src/declarative/util/qmltimeline_p_p.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLTIMELINE_H
-#define QMLTIMELINE_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/QObject>
-#include <QtCore/QAbstractAnimation>
-
-QT_BEGIN_NAMESPACE
-
-class QEasingCurve;
-class QmlTimeLineValue;
-class QmlTimeLineCallback;
-struct QmlTimeLinePrivate;
-class QmlTimeLineObject;
-class QmlTimeLine : public QAbstractAnimation
-{
-Q_OBJECT
-public:
-    QmlTimeLine(QObject *parent = 0);
-    ~QmlTimeLine();
-
-    enum SyncMode { LocalSync, GlobalSync };
-    SyncMode syncMode() const;
-    void setSyncMode(SyncMode);
-
-    void pause(QmlTimeLineObject &, int);
-    void callback(const QmlTimeLineCallback &);
-    void set(QmlTimeLineValue &, qreal);
-
-    int accel(QmlTimeLineValue &, qreal velocity, qreal accel);
-    int accel(QmlTimeLineValue &, qreal velocity, qreal accel, qreal maxDistance);
-    int accelDistance(QmlTimeLineValue &, qreal velocity, qreal distance);
-
-    void move(QmlTimeLineValue &, qreal destination, int time = 500);
-    void move(QmlTimeLineValue &, qreal destination, const QEasingCurve &, int time = 500);
-    void moveBy(QmlTimeLineValue &, qreal change, int time = 500);
-    void moveBy(QmlTimeLineValue &, qreal change, const QEasingCurve &, int time = 500);
-
-    void sync();
-    void setSyncPoint(int);
-    int syncPoint() const;
-
-    void sync(QmlTimeLineValue &);
-    void sync(QmlTimeLineValue &, QmlTimeLineValue &);
-
-    void reset(QmlTimeLineValue &);
-
-    void complete();
-    void clear();
-    bool isActive() const;
-
-    int time() const;
-
-    virtual int duration() const;
-Q_SIGNALS:
-    void updated();
-    void completed();
-
-protected:
-    virtual void updateCurrentTime(int);
-
-private:
-    void remove(QmlTimeLineObject *);
-    friend class QmlTimeLineObject;
-    friend struct QmlTimeLinePrivate;
-    QmlTimeLinePrivate *d;
-};
-
-class QmlTimeLineObject
-{
-public:
-    QmlTimeLineObject();
-    virtual ~QmlTimeLineObject();
-
-protected:
-    friend class QmlTimeLine;
-    friend struct QmlTimeLinePrivate;
-    QmlTimeLine *_t;
-};
-
-class QmlTimeLineValue : public QmlTimeLineObject
-{
-public:
-    QmlTimeLineValue(qreal v = 0.) : _v(v) {}
-
-    virtual qreal value() const { return _v; }
-    virtual void setValue(qreal v) { _v = v; }
-
-    QmlTimeLine *timeLine() const { return _t; }
-
-    operator qreal() const { return _v; }
-    QmlTimeLineValue &operator=(qreal v) { setValue(v); return *this; }
-private:
-    friend class QmlTimeLine;
-    friend struct QmlTimeLinePrivate;
-    qreal _v;
-};
-
-class QmlTimeLineCallback
-{
-public:
-    typedef void (*Callback)(void *);
-
-    QmlTimeLineCallback();
-    QmlTimeLineCallback(QmlTimeLineObject *b, Callback, void * = 0);
-    QmlTimeLineCallback(const QmlTimeLineCallback &o);
-
-    QmlTimeLineCallback &operator=(const QmlTimeLineCallback &o);
-    QmlTimeLineObject *callbackObject() const;
-
-private:
-    friend class QmlTimeLinePrivate; 
-    Callback d0;
-    void *d1;
-    QmlTimeLineObject *d2;
-};
-
-template<class T>
-class QmlTimeLineValueProxy : public QmlTimeLineValue
-{
-public:
-    QmlTimeLineValueProxy(T *cls, void (T::*func)(qreal), qreal v = 0.)
-    : QmlTimeLineValue(v), _class(cls), _setFunctionReal(func), _setFunctionInt(0)
-    {
-        Q_ASSERT(_class);
-    }
-
-    QmlTimeLineValueProxy(T *cls, void (T::*func)(int), qreal v = 0.)
-    : QmlTimeLineValue(v), _class(cls), _setFunctionReal(0), _setFunctionInt(func)
-    {
-        Q_ASSERT(_class);
-    }
-
-    virtual void setValue(qreal v)
-    {
-        QmlTimeLineValue::setValue(v);
-        if (_setFunctionReal) (_class->*_setFunctionReal)(v);
-        else if (_setFunctionInt) (_class->*_setFunctionInt)((int)v);
-    }
-
-private:
-    T *_class;
-    void (T::*_setFunctionReal)(qreal);
-    void (T::*_setFunctionInt)(int);
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp
deleted file mode 100644
index 5f926fe..0000000
--- a/src/declarative/util/qmltimer.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmltimer_p.h"
-
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qpauseanimation.h>
-#include <qdebug.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-
-class QmlTimerPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlTimer)
-public:
-    QmlTimerPrivate()
-        : interval(1000), running(false), repeating(false), triggeredOnStart(false)
-        , classBegun(false), componentComplete(false), firstTick(true) {}
-    int interval;
-    QPauseAnimation pause;
-    bool running : 1;
-    bool repeating : 1;
-    bool triggeredOnStart : 1;
-    bool classBegun : 1;
-    bool componentComplete : 1;
-    bool firstTick : 1;
-};
-
-/*!
-    \qmlclass Timer QmlTimer
-    \brief The Timer item triggers a handler at a specified interval.
-
-    A timer can be used to trigger an action either once, or repeatedly
-    at a given interval.
-
-    Here is a timer that shows the current date and time, and updates
-    the text every 500 milliseconds:
-
-    \qml
-    Timer {
-        interval: 500; running: true; repeat: true
-        onTriggered: time.text = Date().toString()
-    }
-    Text {
-        id: time
-    }
-    \endqml
-
-    QmlTimer is synchronized with the animation timer.  Since the animation
-    timer is usually set to 60fps, the resolution of QmlTimer will be
-    at best 16ms.
-
-    If the Timer is running and one of its properties is changed, the
-    elapsed time will be reset.  For example, if a Timer with interval of
-    1000ms has its \e repeat property changed 500ms after starting, the
-    elapsed time will be reset to 0, and the Timer will be triggered
-    1000ms later.
-*/
-
-QmlTimer::QmlTimer(QObject *parent)
-    : QObject(*(new QmlTimerPrivate), parent)
-{
-    Q_D(QmlTimer);
-    connect(&d->pause, SIGNAL(currentLoopChanged(int)), this, SLOT(ticked()));
-    connect(&d->pause, SIGNAL(finished()), this, SLOT(finished()));
-    d->pause.setLoopCount(1);
-    d->pause.setDuration(d->interval);
-}
-
-/*!
-    \qmlproperty int Timer::interval
-
-    Sets the \a interval between triggers, in milliseconds.
-
-    The default interval is 1000 milliseconds.
-*/
-void QmlTimer::setInterval(int interval)
-{
-    Q_D(QmlTimer);
-    if (interval != d->interval) {
-        d->interval = interval;
-        update();
-    }
-}
-
-int QmlTimer::interval() const
-{
-    Q_D(const QmlTimer);
-    return d->interval;
-}
-
-/*!
-    \qmlproperty bool Timer::running
-
-    If set to true, starts the timer; otherwise stops the timer.
-    For a non-repeating timer, \a running is set to false after the
-    timer has been triggered.
-
-    \a running defaults to false.
-
-    \sa repeat
-*/
-bool QmlTimer::isRunning() const
-{
-    Q_D(const QmlTimer);
-    return d->running;
-}
-
-void QmlTimer::setRunning(bool running)
-{
-    Q_D(QmlTimer);
-    if (d->running != running) {
-        d->running = running;
-        d->firstTick = true;
-        emit runningChanged();
-        update();
-    }
-}
-
-/*!
-    \qmlproperty bool Timer::repeat
-
-    If \a repeat is true the timer is triggered repeatedly at the
-    specified interval; otherwise, the timer will trigger once at the
-    specified interval and then stop (i.e. running will be set to false).
-
-    \a repeat defaults to false.
-
-    \sa running
-*/
-bool QmlTimer::isRepeating() const
-{
-    Q_D(const QmlTimer);
-    return d->repeating;
-}
-
-void QmlTimer::setRepeating(bool repeating)
-{
-    Q_D(QmlTimer);
-    if (repeating != d->repeating) {
-        d->repeating = repeating;
-        update();
-    }
-}
-
-/*!
-    \qmlproperty bool Timer::triggeredOnStart
-
-    When a timer is started, the first trigger is usually after the specified
-    interval has elapsed.  It is sometimes desirable to trigger immediately
-    when the timer is started; for example, to establish an initial
-    state.
-
-    If \a triggeredOnStart is true, the timer is triggered immediately
-    when started, and subsequently at the specified interval. Note that if
-    \e repeat is set to false, the timer is triggered twice; once on start,
-    and again at the interval.
-
-    \a triggeredOnStart defaults to false.
-
-    \sa running
-*/
-bool QmlTimer::triggeredOnStart() const
-{
-    Q_D(const QmlTimer);
-    return d->triggeredOnStart;
-}
-
-void QmlTimer::setTriggeredOnStart(bool triggeredOnStart)
-{
-    Q_D(QmlTimer);
-    if (d->triggeredOnStart != triggeredOnStart) {
-        d->triggeredOnStart = triggeredOnStart;
-        update();
-    }
-}
-
-/*!
-    \qmlmethod Timer::start()
-    \brief Starts the timer.
-
-    If the timer is already running, calling this method has no effect.  The
-    \c running property will be true following a call to \c start().
-*/
-void QmlTimer::start()
-{
-    setRunning(true);
-}
-
-/*!
-    \qmlmethod Timer::stop()
-    \brief Stops the timer.
-
-    If the timer is not running, calling this method has no effect.  The
-    \c running property will be false following a call to \c stop().
-*/
-void QmlTimer::stop()
-{
-    setRunning(false);
-}
-
-/*!
-    \qmlmethod Timer::restart()
-    \brief Restarts the timer.
-
-    If the Timer is not running it will be started, otherwise it will be
-    stopped, reset to initial state and started.  The \c running property
-    will be true following a call to \c restart().
-*/
-void QmlTimer::restart()
-{
-    setRunning(false);
-    setRunning(true);
-}
-
-void QmlTimer::update()
-{
-    Q_D(QmlTimer);
-    if (d->classBegun && !d->componentComplete)
-        return;
-    d->pause.stop();
-    if (d->running) {
-        d->pause.setCurrentTime(0);
-        d->pause.setLoopCount(d->repeating ? -1 : 1);
-        d->pause.setDuration(d->interval);
-        d->pause.start();
-        if (d->triggeredOnStart && d->firstTick) {
-            QCoreApplication::removePostedEvents(this, QEvent::MetaCall);
-            QMetaObject::invokeMethod(this, "ticked", Qt::QueuedConnection);
-        }
-    }
-}
-
-void QmlTimer::classBegin()
-{
-    Q_D(QmlTimer);
-    d->classBegun = true;
-}
-
-void QmlTimer::componentComplete()
-{
-    Q_D(QmlTimer);
-    d->componentComplete = true;
-    update();
-}
-
-/*!
-    \qmlsignal Timer::onTriggered()
-
-    This handler is called when the Timer is triggered.
-*/
-void QmlTimer::ticked()
-{
-    Q_D(QmlTimer);
-    if (d->running && (d->pause.currentTime() > 0 || (d->triggeredOnStart && d->firstTick)))
-        emit triggered();
-    d->firstTick = false;
-}
-
-void QmlTimer::finished()
-{
-    Q_D(QmlTimer);
-    if (d->repeating || !d->running)
-        return;
-    emit triggered();
-    d->running = false;
-    d->firstTick = false;
-    emit runningChanged();
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmltimer_p.h b/src/declarative/util/qmltimer_p.h
deleted file mode 100644
index d1c5ee5..0000000
--- a/src/declarative/util/qmltimer_p.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLTIMER_H
-#define QMLTIMER_H
-
-#include <qml.h>
-
-#include <QtCore/qobject.h>
-#include <QtCore/qabstractanimation.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlTimerPrivate;
-class Q_DECLARATIVE_EXPORT QmlTimer : public QObject, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlTimer)
-    Q_INTERFACES(QmlParserStatus)
-    Q_PROPERTY(int interval READ interval WRITE setInterval)
-    Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
-    Q_PROPERTY(bool repeat READ isRepeating WRITE setRepeating)
-    Q_PROPERTY(bool triggeredOnStart READ triggeredOnStart WRITE setTriggeredOnStart)
-
-public:
-    QmlTimer(QObject *parent=0);
-
-    void setInterval(int interval);
-    int interval() const;
-
-    bool isRunning() const;
-    void setRunning(bool running);
-
-    bool isRepeating() const;
-    void setRepeating(bool repeating);
-
-    bool triggeredOnStart() const;
-    void setTriggeredOnStart(bool triggeredOnStart);
-
-protected:
-    void classBegin();
-    void componentComplete();
-
-public Q_SLOTS:
-    void start();
-    void stop();
-    void restart();
-
-Q_SIGNALS:
-    void triggered();
-    void runningChanged();
-
-private:
-    void update();
-
-private Q_SLOTS:
-    void ticked();
-    void finished();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlTimer)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
deleted file mode 100644
index 9b22e23..0000000
--- a/src/declarative/util/qmltransition.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlstate_p.h"
-#include "qmlstategroup_p.h"
-#include "qmlstate_p_p.h"
-#include "qmlstateoperations_p.h"
-#include "qmlanimation_p.h"
-#include "qmlanimation_p_p.h"
-#include "qmltransitionmanager_p_p.h"
-
-#include <QParallelAnimationGroup>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmlclass Transition QmlTransition
-  \since 4.7
-    \brief The Transition element defines animated transitions that occur on state changes.
-
-    \sa {qmlstates}{States}, {state-transitions}{Transitions}
-*/
-
-/*!
-    \internal
-    \class QmlTransition
-    \brief The QmlTransition class allows you to define animated transitions that occur on state changes.
-
-    \ingroup group_states
-*/
-
-//ParallelAnimationWrapperallows us to do a "callback" when the animation finishes, rather than connecting
-//and disconnecting signals and slots frequently
-class ParallelAnimationWrapper : public QParallelAnimationGroup
-{
-    Q_OBJECT
-public:
-    ParallelAnimationWrapper(QObject *parent = 0) : QParallelAnimationGroup(parent) {}
-    QmlTransitionPrivate *trans;
-protected:
-    virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
-};
-
-class QmlTransitionPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlTransition)
-public:
-    QmlTransitionPrivate() 
-    : fromState(QLatin1String("*")), toState(QLatin1String("*")), 
-      reversed(false), reversible(false), endState(0)
-    {
-        group.trans = this;
-    }
-
-    QString fromState;
-    QString toState;
-    bool reversed;
-    bool reversible;
-    ParallelAnimationWrapper group;
-    QmlTransitionManager *endState;
-
-    void complete()
-    {
-        endState->complete();
-    }
-    static void append_animation(QmlListProperty<QmlAbstractAnimation> *list, QmlAbstractAnimation *a);
-    QList<QmlAbstractAnimation *> animations;
-};
-
-void QmlTransitionPrivate::append_animation(QmlListProperty<QmlAbstractAnimation> *list, QmlAbstractAnimation *a)
-{
-    QmlTransition *q = static_cast<QmlTransition *>(list->object);
-    q->d_func()->animations.append(a);
-    q->d_func()->group.addAnimation(a->qtAnimation());
-    a->setDisableUserControl();
-}
-
-void ParallelAnimationWrapper::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
-{
-    QParallelAnimationGroup::updateState(newState, oldState);
-    if (newState == Stopped &&
-        ((direction() == QAbstractAnimation::Forward && currentLoopTime() == duration()) ||
-         (direction() == QAbstractAnimation::Backward && currentLoopTime() == 0)))
-    {
-        trans->complete();
-    }
-}
-
-
-
-QmlTransition::QmlTransition(QObject *parent)
-    : QObject(*(new QmlTransitionPrivate), parent)
-{
-}
-
-QmlTransition::~QmlTransition()
-{
-}
-
-void QmlTransition::stop()
-{
-    Q_D(QmlTransition);
-    d->group.stop();
-}
-
-void QmlTransition::setReversed(bool r)
-{
-    Q_D(QmlTransition);
-    d->reversed = r;
-}
-
-void QmlTransition::prepare(QmlStateOperation::ActionList &actions,
-                            QList<QmlMetaProperty> &after,
-                            QmlTransitionManager *endState)
-{
-    Q_D(QmlTransition);
-
-    qmlExecuteDeferred(this);
-
-    if (d->reversed) {
-        for (int ii = d->animations.count() - 1; ii >= 0; --ii) {
-            d->animations.at(ii)->transition(actions, after, QmlAbstractAnimation::Backward);
-        }
-    } else {
-        for (int ii = 0; ii < d->animations.count(); ++ii) {
-            d->animations.at(ii)->transition(actions, after, QmlAbstractAnimation::Forward);
-        }
-    }
-
-    d->endState = endState;
-    d->group.setDirection(d->reversed ? QAbstractAnimation::Backward : QAbstractAnimation::Forward);
-    d->group.start();
-}
-
-/*!
-    \qmlproperty string Transition::from
-    \qmlproperty string Transition::to
-    These properties are selectors indicating which state changes should trigger the transition.
-
-    from is used in conjunction with to to determine when a transition should
-    be applied. By default from and to are both "*" (any state). In the following example,
-    the transition is applied when changing from state1 to state2.
-    \code
-    Transition {
-        from: "state1"
-        to: "state2"
-        ...
-    }
-    \endcode
-*/
-QString QmlTransition::fromState() const
-{
-    Q_D(const QmlTransition);
-    return d->fromState;
-}
-
-void QmlTransition::setFromState(const QString &f)
-{
-    Q_D(QmlTransition);
-    d->fromState = f;
-}
-
-/*!
-    \qmlproperty bool Transition::reversible
-    This property holds whether the transition should be automatically reversed when the conditions that triggered this transition are reversed.
-
-    The default value is false.
-*/
-bool QmlTransition::reversible() const
-{
-    Q_D(const QmlTransition);
-    return d->reversible;
-}
-
-void QmlTransition::setReversible(bool r)
-{
-    Q_D(QmlTransition);
-    d->reversible = r;
-}
-
-QString QmlTransition::toState() const
-{
-    Q_D(const QmlTransition);
-    return d->toState;
-}
-
-void QmlTransition::setToState(const QString &t)
-{
-    Q_D(QmlTransition);
-    d->toState = t;
-}
-
-/*!
-    \qmlproperty list<Animation> Transition::animations
-    \default
-    This property holds a list of the animations to be run for this transition.
-
-    The top-level animations are run in parallel. To run them sequentially,
-    you can create a single SequentialAnimation which contains all the animations,
-    and assign that to animations the animations property.
-    \default
-*/
-QmlListProperty<QmlAbstractAnimation> QmlTransition::animations()
-{
-    Q_D(QmlTransition);
-    return QmlListProperty<QmlAbstractAnimation>(this, &d->animations, QmlTransitionPrivate::append_animation);
-}
-
-QT_END_NAMESPACE
-
-#include <qmltransition.moc>
diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h
deleted file mode 100644
index ea02a33..0000000
--- a/src/declarative/util/qmltransition_p.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLTRANSITION_H
-#define QMLTRANSITION_H
-
-#include "qmlstate_p.h"
-
-#include <qml.h>
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlAbstractAnimation;
-class QmlTransitionPrivate;
-class QmlTransitionManager;
-class Q_DECLARATIVE_EXPORT QmlTransition : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlTransition)
-
-    Q_PROPERTY(QString from READ fromState WRITE setFromState)
-    Q_PROPERTY(QString to READ toState WRITE setToState)
-    Q_PROPERTY(bool reversible READ reversible WRITE setReversible)
-    Q_PROPERTY(QmlListProperty<QmlAbstractAnimation> animations READ animations)
-    Q_CLASSINFO("DefaultProperty", "animations")
-    Q_CLASSINFO("DeferredPropertyNames", "animations")
-
-public:
-    QmlTransition(QObject *parent=0);
-    ~QmlTransition();
-
-    QString fromState() const;
-    void setFromState(const QString &);
-
-    QString toState() const;
-    void setToState(const QString &);
-
-    bool reversible() const;
-    void setReversible(bool);
-
-    QmlListProperty<QmlAbstractAnimation> animations();
-
-    void prepare(QmlStateOperation::ActionList &actions,
-                 QList<QmlMetaProperty> &after,
-                 QmlTransitionManager *end);
-
-    void setReversed(bool r);
-    void stop();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlTransition)
-
-QT_END_HEADER
-
-#endif // QMLTRANSITION_H
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
deleted file mode 100644
index 60d9a60..0000000
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmltransitionmanager_p_p.h"
-
-#include "qmlstate_p_p.h"
-
-#include <qmlbinding_p.h>
-#include <qmlglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
-
-class QmlTransitionManagerPrivate
-{
-public:
-    QmlTransitionManagerPrivate()
-    : state(0), transition(0) {}
-
-    void applyBindings();
-    typedef QList<QmlSimpleAction> SimpleActionList;
-    QmlState *state;
-    QmlTransition *transition;
-    QmlStateOperation::ActionList bindingsList;
-    SimpleActionList completeList;
-};
-
-QmlTransitionManager::QmlTransitionManager()
-: d(new QmlTransitionManagerPrivate)
-{
-}
-
-void QmlTransitionManager::setState(QmlState *s)
-{
-    d->state = s;
-}
-
-QmlTransitionManager::~QmlTransitionManager()
-{
-    delete d; d = 0;
-}
-
-void QmlTransitionManager::complete() 
-{
-    d->applyBindings();
-
-    for (int ii = 0; ii < d->completeList.count(); ++ii) {
-        const QmlMetaProperty &prop = d->completeList.at(ii).property;
-        prop.write(d->completeList.at(ii).value);
-    }
-
-    d->completeList.clear();
-
-    if (d->state) 
-        static_cast<QmlStatePrivate*>(QObjectPrivate::get(d->state))->complete();
-}
-
-void QmlTransitionManagerPrivate::applyBindings()
-{
-    foreach(const QmlAction &action, bindingsList) {
-        if (action.toBinding) {
-            action.property.setBinding(action.toBinding);
-        } else if (action.event) {
-            if (action.reverseEvent)
-                action.event->reverse();
-            else
-                action.event->execute();
-        }
-
-    }
-
-    bindingsList.clear();
-}
-
-void QmlTransitionManager::transition(const QList<QmlAction> &list,
-                                      QmlTransition *transition)
-{
-    cancel();
-
-    QmlStateOperation::ActionList applyList = list;
-    // Determine which actions are binding changes.
-    foreach(const QmlAction &action, applyList) {
-        if (action.toBinding)
-            d->bindingsList << action;
-        if (action.fromBinding)
-            action.property.setBinding(0); // Disable current binding
-        if (action.event && action.event->changesBindings()) {  //### assume isReversable()?
-            d->bindingsList << action;
-            if (action.reverseEvent)
-                action.event->clearReverseBindings();
-            else
-                action.event->clearForwardBindings();
-        }
-    }
-
-    // Animated transitions need both the start and the end value for
-    // each property change.  In the presence of bindings, the end values
-    // are non-trivial to calculate.  As a "best effort" attempt, we first
-    // apply all the property and binding changes, then read all the actual
-    // final values, then roll back the changes and proceed as normal.
-    //
-    // This doesn't catch everything, and it might be a little fragile in
-    // some cases - but whatcha going to do?
-
-    if (!d->bindingsList.isEmpty()) {
-
-        //### do extra actions here?
-
-        // Apply all the property and binding changes
-        for (int ii = 0; ii < applyList.size(); ++ii) {
-            const QmlAction &action = applyList.at(ii);
-            if (action.toBinding) {
-                action.property.setBinding(action.toBinding, QmlMetaProperty::BypassInterceptor | QmlMetaProperty::DontRemoveBinding);
-            } else if (!action.event) {
-                action.property.write(action.toValue, QmlMetaProperty::BypassInterceptor | QmlMetaProperty::DontRemoveBinding);
-            } else if (action.event->isReversable()) {
-                if (action.reverseEvent)
-                    action.event->reverse();
-                else
-                    action.event->execute();
-                applyList << action.event->extraActions();
-            }
-        }
-
-        // Read all the end values for binding changes
-        for (int ii = 0; ii < applyList.size(); ++ii) {
-            QmlAction *action = &applyList[ii];
-            if (action->event)
-                continue;
-            const QmlMetaProperty &prop = action->property;
-            if (action->toBinding || !action->toValue.isValid()) {  //### is this always right (used for exta actions)
-                action->toValue = prop.read();
-            }
-        }
-
-        // Revert back to the original values
-        foreach(const QmlAction &action, applyList) {
-            if (action.event) {
-                if (action.event->isReversable()) {
-                    if (action.reverseEvent) {   //reverse the reverse
-                        action.event->clearForwardBindings();
-                        action.event->rewind();
-                        action.event->clearReverseBindings();
-                    } else {
-                        action.event->clearReverseBindings();
-                        action.event->rewind();
-                        action.event->clearForwardBindings();
-                    }
-                }
-                continue;
-            }
-
-            if (action.toBinding)
-                action.property.setBinding(0); // Make sure this is disabled during the transition
-
-            action.property.write(action.fromValue, QmlMetaProperty::BypassInterceptor | QmlMetaProperty::DontRemoveBinding);
-        }
-    }
-
-    if (transition) {
-        QList<QmlMetaProperty> touched;
-        d->transition = transition;
-        d->transition->prepare(applyList, touched, this);
-
-        // Modify the action list to remove actions handled in the transition
-        for (int ii = 0; ii < applyList.count(); ++ii) {
-            const QmlAction &action = applyList.at(ii);
-
-            if (action.event) {
-
-                if (action.actionDone) {
-                    applyList.removeAt(ii);
-                    --ii;
-                }
-
-            } else {
-
-                if (touched.contains(action.property)) {
-                    if (action.toValue != action.fromValue) 
-                        d->completeList << 
-                            QmlSimpleAction(action, QmlSimpleAction::EndState);
-
-                    applyList.removeAt(ii);
-                    --ii;
-                }
-
-            }
-        }
-    }
-
-    // Any actions remaining have not been handled by the transition and should
-    // be applied immediately.  We skip applying bindings, as they are all
-    // applied at the end in applyBindings() to avoid any nastiness mid 
-    // transition
-    foreach(const QmlAction &action, applyList) {
-        if (action.event && !action.event->changesBindings()) {
-            if (action.event->isReversable() && action.reverseEvent)
-                action.event->reverse();
-            else
-                action.event->execute();
-        } else if (!action.event && !action.toBinding) {
-            action.property.write(action.toValue);
-        }
-    }
-    if (stateChangeDebug()) {
-        foreach(const QmlAction &action, applyList) {
-            if (action.event)
-                qWarning() << "    No transition for event:" << action.event->typeName();
-            else
-                qWarning() << "    No transition for:" << action.property.object()
-                           << action.property.name() << "From:" << action.fromValue 
-                           << "To:" << action.toValue;
-        }
-    }
-    if (!transition)
-        d->applyBindings();
-}
-
-void QmlTransitionManager::cancel()
-{
-    if (d->transition) {
-        // ### this could potentially trigger a complete in rare circumstances
-        d->transition->stop();  
-        d->transition = 0;
-    }
-
-    for(int i = 0; i < d->bindingsList.count(); ++i) {
-        QmlAction action = d->bindingsList[i];
-        if (action.toBinding && action.deletableToBinding) {
-            action.property.setBinding(0);
-            action.toBinding->destroy();
-            action.toBinding = 0;
-            action.deletableToBinding = false;
-        } else if (action.event) {
-            //### what do we do here?
-        }
-
-    }
-    d->bindingsList.clear();
-    d->completeList.clear();
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmltransitionmanager_p_p.h b/src/declarative/util/qmltransitionmanager_p_p.h
deleted file mode 100644
index 19ee706..0000000
--- a/src/declarative/util/qmltransitionmanager_p_p.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLTRANSITIONMANAGER_P_H
-#define QMLTRANSITIONMANAGER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlstateoperations_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlStatePrivate;
-class QmlTransitionManagerPrivate;
-class QmlTransitionManager 
-{
-public:
-    QmlTransitionManager();
-    ~QmlTransitionManager();
-
-    void transition(const QList<QmlAction> &, QmlTransition *transition);
-
-    void cancel();
-
-private:
-    Q_DISABLE_COPY(QmlTransitionManager);
-    QmlTransitionManagerPrivate *d;
-
-    void complete();
-    void setState(QmlState *);
-
-    friend class QmlState;
-    friend class QmlTransitionPrivate;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLTRANSITIONMANAGER_P_H
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
deleted file mode 100644
index a45ea93..0000000
--- a/src/declarative/util/qmlview.cpp
+++ /dev/null
@@ -1,570 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlview.h"
-
-#include "qperformancelog_p_p.h"
-#include "qfxperf_p_p.h"
-
-#include <qml.h>
-#include <qmlgraphicsitem.h>
-#include <qmlengine.h>
-#include <qmlcontext.h>
-#include <qmldebug_p.h>
-#include <qmldebugservice_p.h>
-#include <qmlglobal_p.h>
-
-#include <qscriptvalueiterator.h>
-#include <qdebug.h>
-#include <qtimer.h>
-#include <qevent.h>
-#include <qdir.h>
-#include <qcoreapplication.h>
-#include <qfontdatabase.h>
-#include <qicon.h>
-#include <qurl.h>
-#include <qboxlayout.h>
-#include <qbasictimer.h>
-#include <QtCore/qabstractanimation.h>
-#include <private/qgraphicsview_p.h>
-
-QT_BEGIN_NAMESPACE
-
-DEFINE_BOOL_CONFIG_OPTION(frameRateDebug, QML_SHOW_FRAMERATE)
-
-class QmlViewDebugServer;
-class FrameBreakAnimation : public QAbstractAnimation
-{
-public:
-    FrameBreakAnimation(QmlViewDebugServer *s)
-    : QAbstractAnimation((QObject*)s), server(s)
-    {
-        start();
-    }
-
-    virtual int duration() const { return -1; }
-    virtual void updateCurrentTime(int msecs);
-
-private:
-    QmlViewDebugServer *server;
-};
-
-class QmlViewDebugServer : public QmlDebugService
-{
-public:
-    QmlViewDebugServer(QObject *parent = 0) : QmlDebugService(QLatin1String("CanvasFrameRate"), parent), breaks(0)
-    {
-        timer.start();
-        new FrameBreakAnimation(this);
-    }
-
-    void addTiming(int pe, int tbf)
-    {
-        if (!isEnabled())
-            return;
-
-        bool isFrameBreak = breaks > 1;
-        breaks = 0;
-        int e = timer.elapsed();
-        QByteArray data;
-        QDataStream ds(&data, QIODevice::WriteOnly);
-        ds << (int)pe << (int)tbf << (int)e
-           << (bool)isFrameBreak;
-        sendMessage(data);
-    }
-
-    void frameBreak() { ++breaks; }
-
-private:
-    QTime timer;
-    int breaks;
-};
-
-Q_GLOBAL_STATIC(QmlViewDebugServer, qfxViewDebugServer);
-
-void FrameBreakAnimation::updateCurrentTime(int msecs)
-{
-    Q_UNUSED(msecs);
-    server->frameBreak();
-}
-
-class QmlViewPrivate
-{
-public:
-    QmlViewPrivate(QmlView *view)
-        : q(view), root(0), component(0), resizeMode(QmlView::SizeViewToRootObject) {}
-
-    void execute();
-
-    QmlView *q;
-
-    QGuard<QGraphicsObject> root;
-    QGuard<QmlGraphicsItem> qmlRoot;
-
-    QUrl source;
-
-    QmlEngine engine;
-    QmlComponent *component;
-    QBasicTimer resizetimer;
-
-    mutable QSize initialSize;
-    QmlView::ResizeMode resizeMode;
-    QTime frameTimer;
-
-    void init();
-
-    QGraphicsScene scene;
-};
-
-void QmlViewPrivate::execute()
-{
-    delete root;
-    delete component;
-    component = new QmlComponent(&engine, source, q);
-
-    if (!component->isLoading()) {
-        q->continueExecute();
-    } else {
-        QObject::connect(component, SIGNAL(statusChanged(QmlComponent::Status)), q, SLOT(continueExecute()));
-    }
-}
-
-
-/*!
-    \class QmlView
-  \since 4.7
-    \brief The QmlView class provides a widget for displaying a Qt Declarative user interface.
-
-    Any QGraphicsObject or QmlGraphicsItem
-    created via QML can be placed on a standard QGraphicsScene and viewed with a standard
-    QGraphicsView.
-
-    QmlView is a QGraphicsView subclass provided as a convenience for displaying QML
-    files, and connecting between QML and C++ Qt objects.
-
-    QmlView performs the following functions:
-
-    \list
-    \o Manages QmlComponent loading and object creation.
-    \o Initializes QGraphicsView for optimal performance with QML:
-        \list
-        \o QGraphicsView::setOptimizationFlags(QGraphicsView::DontSavePainterState);
-        \o QGraphicsView::setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
-        \o QGraphicsScene::setItemIndexMethod(QGraphicsScene::NoIndex);
-        \endlist
-    \o Initializes QGraphicsView for QML key handling:
-        \list
-        \o QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus);
-        \o QGraphicsScene::setStickyFocus(true);
-        \endlist
-    \endlist
-
-    Typical usage:
-    \code
-    ...
-    QmlView *view = new QmlView(this);
-    vbox->addWidget(view);
-
-    QUrl url(fileName);
-    view->setSource(url);
-    view->show();
-    \endcode
-
-    To receive errors related to loading and executing QML with QmlView,
-    you can connect to the statusChanged() signal and monitor for QmlView::Error.
-    The errors are available via QmlView::errors().
-*/
-
-
-/*! \fn void QmlView::sceneResized(QSize size)
-  This signal is emitted when the view is resized to \a size.
-*/
-
-/*! \fn void QmlView::statusChanged(QmlView::Status status)
-    This signal is emitted when the component's current \l{QmlView::Status} {status} changes.
-*/
-
-/*!
-  \fn QmlView::QmlView(QWidget *parent)
-  
-  Constructs a QmlView with the given \a parent.
-*/
-QmlView::QmlView(QWidget *parent)
-: QGraphicsView(parent), d(new QmlViewPrivate(this))
-{
-    setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
-    d->init();
-}
-
-/*!
-  \fn QmlView::QmlView(const QUrl &source, QWidget *parent)
-
-  Constructs a QmlView with the given QML \a source and \a parent.
-*/
-QmlView::QmlView(const QUrl &source, QWidget *parent)
-: QGraphicsView(parent), d(new QmlViewPrivate(this))
-{
-    setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
-    d->init();
-    setSource(source);
-}
-
-void QmlViewPrivate::init()
-{
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    {
-        QmlPerfTimer<QmlPerf::FontDatabase> perf;
-        QFontDatabase database;
-    }
-#endif
-
-    q->setScene(&scene);
-
-    q->setOptimizationFlags(QGraphicsView::DontSavePainterState);
-    q->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    q->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    q->setFrameStyle(0);
-
-    // These seem to give the best performance
-    q->setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
-    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
-    q->viewport()->setFocusPolicy(Qt::NoFocus);
-
-    scene.setStickyFocus(true);  //### needed for correct focus handling
-}
-
-/*!
-  The destructor clears the view's \l {QGraphicsObject} {items} and
-  deletes the internal representation.
- */
-QmlView::~QmlView()
-{
-    delete d->root;
-}
-
-/*!
-    Sets the source to the \a url, loads the QML component and instantiates it.
- */
-void QmlView::setSource(const QUrl& url)
-{
-    if (url != d->source) {
-        d->source = url;
-        d->execute();
-    }
-}
-
-/*!
-  Returns the source URL, if set.
-
-  \sa setSource()
- */
-QUrl QmlView::source() const
-{
-    return d->source;
-}
-
-/*!
-  Returns a pointer to the QmlEngine used for instantiating
-  QML Components.
- */
-QmlEngine* QmlView::engine()
-{
-    return &d->engine;
-}
-
-/*!
-  This function returns the root of the context hierarchy.  Each QML
-  component is instantiated in a QmlContext.  QmlContext's are
-  essential for passing data to QML components.  In QML, contexts are
-  arranged hierarchically and this hierarchy is managed by the
-  QmlEngine.
- */
-QmlContext* QmlView::rootContext()
-{
-    return d->engine.rootContext();
-}
-
-
-/*!
-  \enum QmlView::Status
-
-    Specifies the loading status of the QmlView.
-
-    \value Null This QmlView has no source set.
-    \value Ready This QmlView has loaded and created the QML component.
-    \value Loading This QmlView is loading network data.
-    \value Error An error has occured.  Calling errorDescription() to retrieve a description.
-*/
-
-/*!
-    \property QmlView::status
-    The component's current \l{QmlView::Status} {status}.
-*/
-
-QmlView::Status QmlView::status() const
-{
-    if (!d->component)
-        return QmlView::Null;
-
-    return QmlView::Status(d->component->status());
-}
-
-/*!
-    Return the list of errors that occured during the last compile or create
-    operation.  An empty list is returned if isError() is not set.
-*/
-QList<QmlError> QmlView::errors() const
-{
-    if (d->component)
-        return d->component->errors();
-    return QList<QmlError>();
-}
-
-
-/*!
-    \property QmlView::resizeMode
-    \brief whether the view should resize the canvas contents
-
-    If this property is set to SizeViewToRootObject (the default), the view
-    resizes with the root item in the QML.
-
-    If this property is set to SizeRootObjectToView, the view will
-    automatically resize the root item.
-
-    Regardless of this property, the sizeHint of the view
-    is the initial size of the root item. Note though that
-    since QML may load dynamically, that size may change.
-
-    \sa initialSize()
-*/
-
-void QmlView::setResizeMode(ResizeMode mode)
-{
-    if (d->resizeMode == mode)
-        return;
-
-    d->resizeMode = mode;
-    if (d->qmlRoot) {
-        if (d->resizeMode == SizeRootObjectToView) {
-            d->qmlRoot->setWidth(width());
-            d->qmlRoot->setHeight(height());
-        } else {
-            d->qmlRoot->setWidth(d->initialSize.width());
-            d->qmlRoot->setHeight(d->initialSize.height());
-        }
-    }
-}
-
-QmlView::ResizeMode QmlView::resizeMode() const
-{
-    return d->resizeMode;
-}
-
-/*!
-  \internal
- */
-void QmlView::continueExecute()
-{
-
-    disconnect(d->component, SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(continueExecute()));
-
-    if (d->component->isError()) {
-        QList<QmlError> errorList = d->component->errors();
-        foreach (const QmlError &error, errorList) {
-            qWarning() << error;
-        }
-        emit statusChanged(status());
-        return;
-    }
-
-    QObject *obj = d->component->create();
-
-    if(d->component->isError()) {
-        QList<QmlError> errorList = d->component->errors();
-        foreach (const QmlError &error, errorList) {
-            qWarning() << error;
-        }
-        emit statusChanged(status());
-        return;
-    }
-
-    setRootObject(obj);
-    emit statusChanged(status());
-}
-
-
-/*!
-  \internal
-*/
-void QmlView::setRootObject(QObject *obj)
-{
-    if (QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(obj)) {
-        d->scene.addItem(item);
-
-        QPerformanceLog::displayData();
-        QPerformanceLog::clear();
-        d->root = item;
-        d->qmlRoot = item;
-        connect(item, SIGNAL(widthChanged()), this, SLOT(sizeChanged()));
-        connect(item, SIGNAL(heightChanged()), this, SLOT(sizeChanged()));
-        if (d->initialSize.height() <= 0 && d->qmlRoot->width() > 0)
-            d->initialSize.setWidth(d->qmlRoot->width());
-        if (d->initialSize.height() <= 0 && d->qmlRoot->height() > 0)
-            d->initialSize.setHeight(d->qmlRoot->height());
-        resize(d->initialSize);
-
-        if (d->resizeMode == SizeRootObjectToView) {
-            d->qmlRoot->setWidth(width());
-            d->qmlRoot->setHeight(height());
-        } else {
-            QSize sz(d->qmlRoot->width(),d->qmlRoot->height());
-            emit sceneResized(sz);
-            resize(sz);
-        }
-        updateGeometry();
-    } else if (QGraphicsObject *item = qobject_cast<QGraphicsObject *>(obj)) {
-        d->scene.addItem(item);
-        qWarning() << "QmlView::resizeMode is not honored for components of type QGraphicsObject";
-    } else if (QWidget *wid = qobject_cast<QWidget *>(obj)) {
-        window()->setAttribute(Qt::WA_OpaquePaintEvent, false);
-        window()->setAttribute(Qt::WA_NoSystemBackground, false);
-        if (!layout()) {
-            setLayout(new QVBoxLayout);
-            layout()->setContentsMargins(0, 0, 0, 0);
-        } else if (layout()->count()) {
-            // Hide the QGraphicsView in GV mode.
-            QLayoutItem *item = layout()->itemAt(0);
-            if (item->widget())
-                item->widget()->hide();
-        }
-        layout()->addWidget(wid);
-        emit sceneResized(wid->size());
-    }
-}
-
-/*!
-  \internal
- */
-void QmlView::sizeChanged()
-{
-    // delay, so we catch both width and height changing.
-    d->resizetimer.start(0,this);
-}
-
-/*!
-  \internal
-  If the \l {QTimerEvent} {timer event} \a e is this
-  view's resize timer, sceneResized() is emitted.
- */
-void QmlView::timerEvent(QTimerEvent* e)
-{
-    if (!e || e->timerId() == d->resizetimer.timerId()) {
-        if (d->qmlRoot) {
-            QSize sz(d->qmlRoot->width(),d->qmlRoot->height());
-            emit sceneResized(sz);
-            //if (!d->resizable)
-                //resize(sz);
-        }
-        d->resizetimer.stop();
-        updateGeometry();
-    }
-}
-
-/*!
-    \internal
-    The size hint is the size of the root item.
-*/
-QSize QmlView::sizeHint() const
-{
-    if (d->qmlRoot) {
-        if (d->initialSize.width() <= 0)
-            d->initialSize.setWidth(d->qmlRoot->width());
-        if (d->initialSize.height() <= 0)
-            d->initialSize.setHeight(d->qmlRoot->height());
-    }
-    return d->initialSize;
-}
-
-/*!
-  Returns the view's root \l {QGraphicsObject} {item}.
- */
-QGraphicsObject *QmlView::rootObject() const
-{
-    return d->root;
-}
-
-/*!
-  \internal
-  This function handles the \l {QResizeEvent} {resize event}
-  \a e.
- */
-void QmlView::resizeEvent(QResizeEvent *e)
-{
-    if (d->resizeMode == SizeRootObjectToView && d->qmlRoot) {
-        d->qmlRoot->setWidth(width());
-        d->qmlRoot->setHeight(height());
-    }
-    if (d->qmlRoot) {
-        setSceneRect(QRectF(0, 0, d->qmlRoot->width(), d->qmlRoot->height()));
-    } else if (d->root) {
-        setSceneRect(d->root->boundingRect());
-    } else {
-        setSceneRect(rect());
-    }
-    QGraphicsView::resizeEvent(e);
-}
-
-/*!
-    \internal
-*/
-void QmlView::paintEvent(QPaintEvent *event)
-{
-    int time = 0;
-    if (frameRateDebug() || QmlViewDebugServer::isDebuggingEnabled())
-        time = d->frameTimer.restart();
-    QGraphicsView::paintEvent(event);
-    if (QmlViewDebugServer::isDebuggingEnabled())
-        qfxViewDebugServer()->addTiming(d->frameTimer.elapsed(), time);
-    if (frameRateDebug())
-        qDebug() << "paintEvent:" << d->frameTimer.elapsed() << "time since last frame:" << time;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlview.h b/src/declarative/util/qmlview.h
deleted file mode 100644
index 26be18f..0000000
--- a/src/declarative/util/qmlview.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLVIEW_H
-#define QMLVIEW_H
-
-#include <QtCore/qdatetime.h>
-#include <QtGui/qgraphicssceneevent.h>
-#include <QtGui/qgraphicsview.h>
-#include <QtGui/qwidget.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsObject;
-class QmlEngine;
-class QmlContext;
-class QmlError;
-
-class QmlViewPrivate;
-class Q_DECLARATIVE_EXPORT QmlView : public QGraphicsView
-{
-    Q_OBJECT
-    Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-
-public:
-    explicit QmlView(QWidget *parent = 0);
-    QmlView(const QUrl &source, QWidget *parent = 0);
-    virtual ~QmlView();
-
-    QUrl source() const;
-    void setSource(const QUrl&);
-
-    QmlEngine* engine();
-    QmlContext* rootContext();
-
-    QGraphicsObject *rootObject() const;
-
-    enum ResizeMode { SizeViewToRootObject, SizeRootObjectToView };
-    ResizeMode resizeMode() const;
-    void setResizeMode(ResizeMode);
-
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
-
-    QList<QmlError> errors() const;
-
-    QSize sizeHint() const;
-
-Q_SIGNALS:
-    void sceneResized(QSize size); // ???
-    void statusChanged(QmlView::Status);
-
-private Q_SLOTS:
-    void continueExecute();
-    void sizeChanged();
-
-protected:
-    virtual void resizeEvent(QResizeEvent *);
-    virtual void paintEvent(QPaintEvent *event);
-    virtual void timerEvent(QTimerEvent*);
-    virtual void setRootObject(QObject *obj);
-
-    friend class QmlViewPrivate;
-    QmlViewPrivate *d;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QMLVIEW_H
diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp
deleted file mode 100644
index e302fdb..0000000
--- a/src/declarative/util/qmlxmllistmodel.cpp
+++ /dev/null
@@ -1,796 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlxmllistmodel_p.h"
-
-#include <qmlcontext.h>
-#include <qmlengine.h>
-
-#include <QDebug>
-#include <QApplication>
-#include <QThread>
-#include <QMutex>
-#include <QWaitCondition>
-#include <QXmlQuery>
-#include <QXmlResultItems>
-#include <QXmlNodeModelIndex>
-#include <QBuffer>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-
-
-typedef QPair<int, int> QmlXmlListRange;
-
-/*!
-    \qmlclass XmlRole QmlXmlListModelRole
-  \since 4.7
-    \brief The XmlRole element allows you to specify a role for an XmlListModel.
-*/
-
-/*!
-    \qmlproperty string XmlRole::name
-    The name for the role. This name is used to access the model data for this role from Qml.
-
-    \qml
-    XmlRole { name: "title"; query: "title/string()" }
-
-    ...
-
-    Component {
-        id: myDelegate
-        Text { text: title }
-    }
-    \endqml
-*/
-
-/*!
-    \qmlproperty string XmlRole::query
-    The relative XPath query for this role. The query should not start with a '/' (i.e. it must be
-    relative).
-
-    \qml
-    XmlRole { name: "title"; query: "title/string()" }
-    \endqml
-*/
-
-/*!
-    \qmlproperty bool XmlRole::isKey
-    Defines whether this is a key role.
-    
-    Key roles are used to to determine whether a set of values should
-    be updated or added to the XML list model when XmlListModel::reload()
-    is called.
-
-    \sa XmlListModel
-*/
-
-
-class QmlXmlQuery : public QThread
-{
-    Q_OBJECT
-public:
-    QmlXmlQuery(QObject *parent=0)
-        : QThread(parent), m_quit(false), m_restart(false), m_abort(false), m_queryId(0) {
-    }
-    ~QmlXmlQuery() {
-        m_mutex.lock();
-        m_quit = true;
-        m_condition.wakeOne();
-        m_mutex.unlock();
-
-        wait();
-    }
-
-    void abort() {
-        QMutexLocker locker(&m_mutex);
-        m_abort = true;
-    }
-
-    int doQuery(QString query, QString namespaces, QByteArray data, QList<QmlXmlListModelRole *> *roleObjects) {
-        QMutexLocker locker(&m_mutex);
-        m_size = 0;
-        m_data = data;
-        m_query = QLatin1String("doc($src)") + query;
-        m_namespaces = namespaces;
-        m_roleObjects = roleObjects;
-        if (!isRunning()) {
-            m_abort = false;
-            start();
-        } else {
-            m_restart = true;
-            m_condition.wakeOne();
-        }
-        m_queryId++;
-        return m_queryId;
-    }
-
-    QList<QList<QVariant> > modelData() {
-        QMutexLocker locker(&m_mutex);
-        return m_modelData;
-    }
-
-    QList<QmlXmlListRange> insertedItemRanges() {
-        QMutexLocker locker(&m_mutex);
-        return m_insertedItemRanges;
-    }
-
-    QList<QmlXmlListRange> removedItemRanges() {
-        QMutexLocker locker(&m_mutex);
-        return m_removedItemRanges;
-    }
-
-Q_SIGNALS:
-    void queryCompleted(int queryId, int size);
-
-protected:
-    void run() {
-        while (!m_quit) {
-            m_mutex.lock();
-            int queryId = m_queryId;
-            doQueryJob();
-            doSubQueryJob();
-            m_data.clear(); // no longer needed
-            m_mutex.unlock();
-
-            m_mutex.lock();
-            if (!m_abort)
-                emit queryCompleted(queryId, m_size);
-            if (!m_restart)
-                m_condition.wait(&m_mutex);
-            m_abort = false;
-            m_restart = false;
-            m_mutex.unlock();
-        }
-    }
-
-private:
-    void doQueryJob();
-    void doSubQueryJob();
-    void getValuesOfKeyRoles(QStringList *values, QXmlQuery *query) const;
-    void addIndexToRangeList(QList<QmlXmlListRange> *ranges, int index) const;
-
-private:
-    QMutex m_mutex;
-    QWaitCondition m_condition;
-    bool m_quit;
-    bool m_restart;
-    bool m_abort;
-    QByteArray m_data;
-    QString m_query;
-    QString m_namespaces;
-    QString m_prefix;
-    int m_size;
-    int m_queryId;
-    const QList<QmlXmlListModelRole *> *m_roleObjects;
-    QList<QList<QVariant> > m_modelData;
-    QStringList m_keysValues;
-    QList<QmlXmlListRange> m_insertedItemRanges;
-    QList<QmlXmlListRange> m_removedItemRanges;
-};
-
-void QmlXmlQuery::doQueryJob()
-{
-    QString r;
-    QXmlQuery query;
-    QBuffer buffer(&m_data);
-    buffer.open(QIODevice::ReadOnly);
-    query.bindVariable(QLatin1String("src"), &buffer);
-    query.setQuery(m_namespaces + m_query);
-    query.evaluateTo(&r);
-
-    //qDebug() << r;
-
-    //always need a single root element
-    QByteArray xml = "<dummy:items xmlns:dummy=\"http://qtsotware.com/dummy\">\n" + r.toUtf8() + "</dummy:items>";
-    QBuffer b(&xml);
-    b.open(QIODevice::ReadOnly);
-    //qDebug() << xml;
-
-    QString namespaces = QLatin1String("declare namespace dummy=\"http://qtsotware.com/dummy\";\n") + m_namespaces;
-    QString prefix = QLatin1String("doc($inputDocument)/dummy:items") +
-                     m_query.mid(m_query.lastIndexOf(QLatin1Char('/')));
-
-    //figure out how many items we are dealing with
-    int count = -1;
-    {
-        QXmlResultItems result;
-        QXmlQuery countquery;
-        countquery.bindVariable(QLatin1String("inputDocument"), &b);
-        countquery.setQuery(namespaces + QLatin1String("count(") + prefix + QLatin1Char(')'));
-        countquery.evaluateTo(&result);
-        QXmlItem item(result.next());
-        if (item.isAtomicValue())
-            count = item.toAtomicValue().toInt();
-    }
-    //qDebug() << count;
-
-    m_prefix = namespaces + prefix + QLatin1Char('/');
-    m_data = xml;
-    if (count > 0)
-        m_size = count;
-}
-
-void QmlXmlQuery::getValuesOfKeyRoles(QStringList *values, QXmlQuery *query) const
-{
-    QStringList keysQueries;
-    for (int i=0; i<m_roleObjects->count(); i++) {
-        if (m_roleObjects->at(i)->isKey())
-            keysQueries << m_roleObjects->at(i)->query();
-    }
-    QString keysQuery;
-    if (keysQueries.count() == 1)
-        keysQuery = m_prefix + keysQueries[0];
-    else if (keysQueries.count() > 1)
-        keysQuery = m_prefix + QLatin1String("concat(") + keysQueries.join(QLatin1String(",")) + QLatin1String(")");
-
-    if (!keysQuery.isEmpty()) {
-        query->setQuery(keysQuery);
-        QXmlResultItems resultItems;
-        query->evaluateTo(&resultItems);
-        QXmlItem item(resultItems.next());
-        while (!item.isNull()) {
-            values->append(item.toAtomicValue().toString());
-            item = resultItems.next();
-        }
-    }
-}
-
-void QmlXmlQuery::addIndexToRangeList(QList<QmlXmlListRange> *ranges, int index) const {
-    if (ranges->isEmpty())
-        ranges->append(qMakePair(index, 1));
-    else if (ranges->last().first + ranges->last().second == index)
-        ranges->last().second += 1;
-    else
-        ranges->append(qMakePair(index, 1));
-}
-
-void QmlXmlQuery::doSubQueryJob()
-{
-    m_modelData.clear();
-
-    QBuffer b(&m_data);
-    b.open(QIODevice::ReadOnly);
-
-    QXmlQuery subquery;
-    subquery.bindVariable(QLatin1String("inputDocument"), &b);
-
-    QStringList keysValues;
-    getValuesOfKeyRoles(&keysValues, &subquery);
-
-    // See if any values of key roles have been inserted or removed.
-    m_insertedItemRanges.clear();
-    m_removedItemRanges.clear();
-    if (m_keysValues.isEmpty()) {
-        m_insertedItemRanges << qMakePair(0, m_size);
-    } else {
-        if (keysValues != m_keysValues) {
-            QStringList temp;
-            for (int i=0; i<m_keysValues.count(); i++) {
-                if (!keysValues.contains(m_keysValues[i]))
-                    addIndexToRangeList(&m_removedItemRanges, i);
-                else 
-                    temp << m_keysValues[i];
-            }
-
-            for (int i=0; i<keysValues.count(); i++) {
-                if (temp.count() == i || keysValues[i] != temp[i]) {
-                    temp.insert(i, keysValues[i]);
-                    addIndexToRangeList(&m_insertedItemRanges, i);
-                }
-            }
-        }
-    }
-    m_keysValues = keysValues;
-
-    // Get the new values for each role.
-    //### we might be able to condense even further (query for everything in one go)
-    for (int i = 0; i < m_roleObjects->size(); ++i) {
-        QmlXmlListModelRole *role = m_roleObjects->at(i);
-        if (!role->isValid()) {
-            QList<QVariant> resultList;
-            for (int j = 0; j < m_size; ++j)
-                resultList << QVariant();
-            m_modelData << resultList;
-            continue;
-        }
-        subquery.setQuery(m_prefix + QLatin1String("(let $v := ") + role->query() + QLatin1String(" return if ($v) then ") + role->query() + QLatin1String(" else \"\")"));
-        QXmlResultItems resultItems;
-        subquery.evaluateTo(&resultItems);
-        QXmlItem item(resultItems.next());
-        QList<QVariant> resultList;
-        while (!item.isNull()) {
-            resultList << item.toAtomicValue(); //### we used to trim strings
-            item = resultItems.next();
-        }
-        //### should warn here if things have gone wrong.
-        while (resultList.count() < m_size)
-            resultList << QVariant();
-        m_modelData << resultList;
-        b.seek(0);
-    }
-
-    //this method is much slower, but works better for incremental loading
-    /*for (int j = 0; j < m_size; ++j) {
-        QList<QVariant> resultList;
-        for (int i = 0; i < m_roleObjects->size(); ++i) {
-            QmlXmlListModelRole *role = m_roleObjects->at(i);
-            subquery.setQuery(m_prefix.arg(j+1) + role->query());
-            if (role->isStringList()) {
-                QStringList data;
-                subquery.evaluateTo(&data);
-                resultList << QVariant(data);
-                //qDebug() << data;
-            } else {
-                QString s;
-                subquery.evaluateTo(&s);
-                if (role->isCData()) {
-                    //un-escape
-                    s.replace(QLatin1String("&lt;"), QLatin1String("<"));
-                    s.replace(QLatin1String("&gt;"), QLatin1String(">"));
-                    s.replace(QLatin1String("&amp;"), QLatin1String("&"));
-                }
-                resultList << s.trimmed();
-                //qDebug() << s;
-            }
-            b.seek(0);
-        }
-        m_modelData << resultList;
-    }*/
-}
-
-class QmlXmlListModelPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QmlXmlListModel)
-public:
-    QmlXmlListModelPrivate()
-        : isComponentComplete(true), size(-1), highestRole(Qt::UserRole)
-        , reply(0), status(QmlXmlListModel::Null), progress(0.0)
-        , queryId(-1), roleObjects() {}
-
-    bool isComponentComplete;
-    QUrl src;
-    QString xml;
-    QString query;
-    QString namespaces;
-    int size;
-    QList<int> roles;
-    QStringList roleNames;
-    int highestRole;
-    QNetworkReply *reply;
-    QmlXmlListModel::Status status;
-    qreal progress;
-    QmlXmlQuery qmlXmlQuery;
-    int queryId;
-    QList<QmlXmlListModelRole *> roleObjects;
-    static void append_role(QmlListProperty<QmlXmlListModelRole> *list, QmlXmlListModelRole *role);
-    static void clear_role(QmlListProperty<QmlXmlListModelRole> *list);
-    static void removeAt_role(QmlListProperty<QmlXmlListModelRole> *list, int i);
-    static void insert_role(QmlListProperty<QmlXmlListModelRole> *list, int i, QmlXmlListModelRole *role);
-    QList<QList<QVariant> > data;
-};
-
-
-void QmlXmlListModelPrivate::append_role(QmlListProperty<QmlXmlListModelRole> *list, QmlXmlListModelRole *role)
-{
-    QmlXmlListModel *_this = qobject_cast<QmlXmlListModel *>(list->object);
-    if (_this) {
-        int i = _this->d_func()->roleObjects.count();
-        _this->d_func()->roleObjects.append(role);
-        if (_this->d_func()->roleNames.contains(role->name())) {
-            qmlInfo(role) << QObject::tr("\"%1\" duplicates a previous role name and will be disabled.").arg(role->name());
-            return;
-        }
-        _this->d_func()->roles.insert(i, _this->d_func()->highestRole);
-        _this->d_func()->roleNames.insert(i, role->name());
-        ++_this->d_func()->highestRole;
-    }
-}
-
-//### clear needs to invalidate any cached data (in data table) as well
-//    (and the model should emit the appropriate signals)
-void QmlXmlListModelPrivate::clear_role(QmlListProperty<QmlXmlListModelRole> *list)
-{
-    QmlXmlListModel *_this = static_cast<QmlXmlListModel *>(list->object);
-    _this->d_func()->roles.clear();
-    _this->d_func()->roleNames.clear();
-    _this->d_func()->roleObjects.clear();
-}
-
-/*!
-    \class QmlXmlListModel
-    \internal
-*/
-
-/*!
-    \qmlclass XmlListModel QmlXmlListModel
-  \since 4.7
-    \brief The XmlListModel element is used to specify a model using XPath expressions.
-
-    XmlListModel is used to create a model from XML data that can be used as a data source
-    for the view classes (such as ListView, PathView, GridView) and other classes that interact with model
-    data (such as Repeater).
-
-    Here is an example of a model containing news from a Yahoo RSS feed:
-    \qml
-    XmlListModel {
-        id: feedModel
-        source: "http://rss.news.yahoo.com/rss/oceania"
-        query: "/rss/channel/item"
-        XmlRole { name: "title"; query: "title/string()" }
-        XmlRole { name: "pubDate"; query: "pubDate/string()" }
-        XmlRole { name: "description"; query: "description/string()" }
-    }
-    \endqml
-
-    You can also define certain roles as "keys" so that the model only adds data
-    that contains new values for these keys when reload() is called.
-
-    For example, if the roles above were defined like this:
-
-    \qml
-        XmlRole { name: "title"; query: "title/string()"; isKey: true }
-        XmlRole { name: "pubDate"; query: "pubDate/string()"; isKey: true }
-    \endqml
-
-    Then when reload() is called, the model will only add new items with a
-    "title" and "pubDate" value combination that is not already present in
-    the model.
-
-    This is useful to provide incremental updates and avoid repainting an
-    entire model in a view.
-*/
-
-QmlXmlListModel::QmlXmlListModel(QObject *parent)
-    : QListModelInterface(*(new QmlXmlListModelPrivate), parent)
-{
-    Q_D(QmlXmlListModel);
-    connect(&d->qmlXmlQuery, SIGNAL(queryCompleted(int,int)),
-            this, SLOT(queryCompleted(int,int)));
-}
-
-QmlXmlListModel::~QmlXmlListModel()
-{
-}
-
-/*!
-    \qmlproperty list<XmlRole> XmlListModel::roles
-
-    The roles to make available for this model.
-*/
-QmlListProperty<QmlXmlListModelRole> QmlXmlListModel::roleObjects()
-{
-    Q_D(QmlXmlListModel);
-    QmlListProperty<QmlXmlListModelRole> list(this, d->roleObjects);
-    list.append = &QmlXmlListModelPrivate::append_role;
-    list.clear = &QmlXmlListModelPrivate::clear_role;
-    return list;
-}
-
-QHash<int,QVariant> QmlXmlListModel::data(int index, const QList<int> &roles) const
-{
-    Q_D(const QmlXmlListModel);
-    QHash<int, QVariant> rv;
-    for (int i = 0; i < roles.size(); ++i) {
-        int role = roles.at(i);
-        int roleIndex = d->roles.indexOf(role);
-        rv.insert(role, roleIndex == -1 ? QVariant() : d->data.at(roleIndex).at(index));
-    }
-    return rv;
-}
-
-QVariant QmlXmlListModel::data(int index, int role) const
-{
-    Q_D(const QmlXmlListModel);
-    int roleIndex = d->roles.indexOf(role);
-    return (roleIndex == -1) ? QVariant() : d->data.at(roleIndex).at(index);
-}
-
-/*!
-    \qmlproperty int XmlListModel::count
-    The number of data entries in the model.
-*/
-int QmlXmlListModel::count() const
-{
-    Q_D(const QmlXmlListModel);
-    return d->size;
-}
-
-QList<int> QmlXmlListModel::roles() const
-{
-    Q_D(const QmlXmlListModel);
-    return d->roles;
-}
-
-QString QmlXmlListModel::toString(int role) const
-{
-    Q_D(const QmlXmlListModel);
-    int index = d->roles.indexOf(role);
-    if (index == -1)
-        return QString();
-    return d->roleNames.at(index);
-}
-
-/*!
-    \qmlproperty url XmlListModel::source
-    The location of the XML data source.
-
-    If both source and xml are set, xml will be used.
-*/
-QUrl QmlXmlListModel::source() const
-{
-    Q_D(const QmlXmlListModel);
-    return d->src;
-}
-
-void QmlXmlListModel::setSource(const QUrl &src)
-{
-    Q_D(QmlXmlListModel);
-    if (d->src != src) {
-        d->src = src;
-        reload();
-    }
-}
-
-/*!
-    \qmlproperty string XmlListModel::xml
-    This property holds XML text set directly.
-
-    The text is assumed to be UTF-8 encoded.
-
-    If both source and xml are set, xml will be used.
-*/
-QString QmlXmlListModel::xml() const
-{
-    Q_D(const QmlXmlListModel);
-    return d->xml;
-}
-
-void QmlXmlListModel::setXml(const QString &xml)
-{
-    Q_D(QmlXmlListModel);
-    d->xml = xml;
-    reload();
-}
-
-/*!
-    \qmlproperty string XmlListModel::query
-    An absolute XPath query representing the base query for the model items. The query should start with
-    '/' or '//'.
-*/
-QString QmlXmlListModel::query() const
-{
-    Q_D(const QmlXmlListModel);
-    return d->query;
-}
-
-void QmlXmlListModel::setQuery(const QString &query)
-{
-    Q_D(QmlXmlListModel);
-    if (!query.startsWith(QLatin1Char('/'))) {
-        qmlInfo(this) << QCoreApplication::translate("QmlXmlRoleList", "An XmlListModel query must start with '/' or \"//\"");
-        return;
-    }
-
-    if (d->query != query) {
-        d->query = query;
-        reload();
-    }
-}
-
-/*!
-    \qmlproperty string XmlListModel::namespaceDeclarations
-    A set of declarations for the namespaces used in the query.
-*/
-QString QmlXmlListModel::namespaceDeclarations() const
-{
-    Q_D(const QmlXmlListModel);
-    return d->namespaces;
-}
-
-void QmlXmlListModel::setNamespaceDeclarations(const QString &declarations)
-{
-    Q_D(QmlXmlListModel);
-    if (d->namespaces != declarations) {
-        d->namespaces = declarations;
-        reload();
-    }
-}
-
-/*!
-    \qmlproperty enum XmlListModel::status
-
-    This property holds the status of data source loading.  It can be one of:
-    \list
-    \o Null - no data source has been set
-    \o Ready - nthe data source has been loaded
-    \o Loading - the data source is currently being loaded
-    \o Error - an error occurred while loading the data source
-    \endlist
-
-    \sa progress
-
-*/
-QmlXmlListModel::Status QmlXmlListModel::status() const
-{
-    Q_D(const QmlXmlListModel);
-    return d->status;
-}
-
-/*!
-    \qmlproperty real XmlListModel::progress
-
-    This property holds the progress of data source loading, from 0.0 (nothing loaded)
-    to 1.0 (finished).
-
-    \sa status
-*/
-qreal QmlXmlListModel::progress() const
-{
-    Q_D(const QmlXmlListModel);
-    return d->progress;
-}
-
-void QmlXmlListModel::classBegin()
-{
-    Q_D(QmlXmlListModel);
-    d->isComponentComplete = false;
-}
-
-void QmlXmlListModel::componentComplete()
-{
-    Q_D(QmlXmlListModel);
-    d->isComponentComplete = true;
-    reload();
-}
-
-/*!
-    \qmlmethod XmlListModel::reload()
-
-    Reloads the model.
-    
-    If no key roles have been specified, all existing model
-    data is removed, and the model is rebuilt from scratch.
-
-    Otherwise, items are only added if the model does not already
-    contain items with matching key role values.
-*/
-void QmlXmlListModel::reload()
-{
-    Q_D(QmlXmlListModel);
-
-    if (!d->isComponentComplete)
-        return;
-
-    d->qmlXmlQuery.abort();
-    d->queryId = -1;
-
-    if (d->size < 0)
-        d->size = 0;
-
-    if (d->src.isEmpty() && d->xml.isEmpty())
-        return;
-
-    if (d->reply) {
-        d->reply->abort();
-        d->reply->deleteLater();
-        d->reply = 0;
-    }
-
-    if (!d->xml.isEmpty()) {
-        d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, d->xml.toUtf8(), &d->roleObjects);
-        d->progress = 1.0;
-        d->status = Ready;
-        emit progressChanged(d->progress);
-        emit statusChanged(d->status);
-        return;
-    }
-
-    d->progress = 0.0;
-    d->status = Loading;
-    emit progressChanged(d->progress);
-    emit statusChanged(d->status);
-
-    QNetworkRequest req(d->src);
-    d->reply = qmlContext(this)->engine()->networkAccessManager()->get(req);
-    QObject::connect(d->reply, SIGNAL(finished()), this, SLOT(requestFinished()));
-    QObject::connect(d->reply, SIGNAL(downloadProgress(qint64,qint64)),
-                     this, SLOT(requestProgress(qint64,qint64)));
-}
-
-void QmlXmlListModel::requestFinished()
-{
-    Q_D(QmlXmlListModel);
-    if (d->reply->error() != QNetworkReply::NoError) {
-        disconnect(d->reply, 0, this, 0);
-        d->reply->deleteLater();
-        d->reply = 0;
-        d->status = Error;
-    } else {
-        d->status = Ready;
-        QByteArray data = d->reply->readAll();
-        d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, data, &d->roleObjects);
-        disconnect(d->reply, 0, this, 0);
-        d->reply->deleteLater();
-        d->reply = 0;
-    }
-    d->progress = 1.0;
-    emit progressChanged(d->progress);
-    emit statusChanged(d->status);
-}
-
-void QmlXmlListModel::requestProgress(qint64 received, qint64 total)
-{
-    Q_D(QmlXmlListModel);
-    if (d->status == Loading && total > 0) {
-        d->progress = qreal(received)/total;
-        emit progressChanged(d->progress);
-    }
-}
-
-void QmlXmlListModel::queryCompleted(int id, int size)
-{
-    Q_D(QmlXmlListModel);
-    if (id != d->queryId)
-        return;
-    bool sizeChanged = size != d->size;
-    d->size = size;
-    d->data = d->qmlXmlQuery.modelData();
-
-    QList<QmlXmlListRange> removed = d->qmlXmlQuery.removedItemRanges();
-    for (int i=0; i<removed.count(); i++)
-        emit itemsRemoved(removed[i].first, removed[i].second);
-    QList<QmlXmlListRange> inserted = d->qmlXmlQuery.insertedItemRanges();
-    for (int i=0; i<inserted.count(); i++)
-        emit itemsInserted(inserted[i].first, inserted[i].second);
-
-    if (sizeChanged)
-        emit countChanged();
-}
-
-QT_END_NAMESPACE
-
-#include <qmlxmllistmodel.moc>
diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
deleted file mode 100644
index 50967a5..0000000
--- a/src/declarative/util/qmlxmllistmodel_p.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLXMLLISTMODEL_H
-#define QMLXMLLISTMODEL_H
-
-#include <qml.h>
-#include <qmlinfo.h>
-
-#include "../3rdparty/qlistmodelinterface_p.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QmlContext;
-
-class QmlXmlListModelRole;
-
-class QmlXmlListModelPrivate;
-class Q_DECLARATIVE_EXPORT QmlXmlListModel : public QListModelInterface, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlParserStatus)
-    Q_ENUMS(Status)
-
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
-    Q_PROPERTY(QUrl source READ source WRITE setSource)
-    Q_PROPERTY(QString xml READ xml WRITE setXml)
-    Q_PROPERTY(QString query READ query WRITE setQuery)
-    Q_PROPERTY(QString namespaceDeclarations READ namespaceDeclarations WRITE setNamespaceDeclarations)
-    Q_PROPERTY(QmlListProperty<QmlXmlListModelRole> roles READ roleObjects)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_CLASSINFO("DefaultProperty", "roles")
-
-public:
-    QmlXmlListModel(QObject *parent = 0);
-    ~QmlXmlListModel();
-
-    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
-    virtual QVariant data(int index, int role) const;
-    virtual int count() const;
-    virtual QList<int> roles() const;
-    virtual QString toString(int role) const;
-
-    QmlListProperty<QmlXmlListModelRole> roleObjects();
-
-    QUrl source() const;
-    void setSource(const QUrl&);
-
-    QString xml() const;
-    void setXml(const QString&);
-
-    QString query() const;
-    void setQuery(const QString&);
-
-    QString namespaceDeclarations() const;
-    void setNamespaceDeclarations(const QString&);
-
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
-    qreal progress() const;
-
-    virtual void classBegin();
-    virtual void componentComplete();
-
-Q_SIGNALS:
-    void statusChanged(Status);
-    void progressChanged(qreal progress);
-    void countChanged();
-
-public Q_SLOTS:
-    // ### need to use/expose Expiry to guess when to call this?
-    // ### property to auto-call this on reasonable Expiry?
-    // ### LastModified/Age also useful to guess.
-    // ### Probably also applies to other network-requesting types.
-    void reload();
-
-private Q_SLOTS:
-    void requestFinished();
-    void requestProgress(qint64,qint64);
-    void queryCompleted(int,int);
-
-private:
-    Q_DECLARE_PRIVATE(QmlXmlListModel)
-    Q_DISABLE_COPY(QmlXmlListModel)
-};
-
-class Q_DECLARATIVE_EXPORT QmlXmlListModelRole : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QString query READ query WRITE setQuery)
-    Q_PROPERTY(bool isKey READ isKey WRITE setIsKey)
-
-public:
-    QmlXmlListModelRole() : m_isKey(false) {}
-    ~QmlXmlListModelRole() {}
-
-    QString name() const { return m_name; }
-    void setName(const QString &name) { m_name = name; }
-
-    QString query() const { return m_query; }
-    void setQuery(const QString &query)
-    {
-        if (query.startsWith(QLatin1Char('/'))) {
-            qmlInfo(this) << tr("An XmlRole query must not start with '/'");
-            return;
-        }
-        m_query = query;
-    }
-
-    bool isKey() const { return m_isKey; }
-    void setIsKey(bool b) { m_isKey = b; }
-
-    bool isValid() {
-        return !m_name.isEmpty() && !m_query.isEmpty();
-    }
-
-private:
-    QString m_name;
-    QString m_query;
-    bool m_isKey;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlXmlListModel)
-QML_DECLARE_TYPE(QmlXmlListModelRole)
-
-QT_END_HEADER
-
-#endif // QMLXMLLISTMODEL_H
diff --git a/src/declarative/util/qnumberformat_p.h b/src/declarative/util/qnumberformat_p.h
index 902dcde..ced4442 100644
--- a/src/declarative/util/qnumberformat_p.h
+++ b/src/declarative/util/qnumberformat_p.h
@@ -42,7 +42,7 @@
 #ifndef NUMBERFORMAT_H
 #define NUMBERFORMAT_H 
 
-#include <qml.h>
+#include <qdeclarative.h>
 
 #include <QtCore/QLocale>
 #include <QtCore/QTime>
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 90a8a27..610eb3f 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -1,74 +1,74 @@
 INCLUDEPATH += $$PWD
 
 SOURCES += \
-    $$PWD/qmlgraphicsutilmodule.cpp\
-    $$PWD/qmlview.cpp \
+    $$PWD/qdeclarativeutilmodule.cpp\
+    $$PWD/qdeclarativeview.cpp \
     $$PWD/qfxperf.cpp \
     $$PWD/qperformancelog.cpp \
-    $$PWD/qmlconnection.cpp \
-    $$PWD/qmlpackage.cpp \
-    $$PWD/qmlanimation.cpp \
-    $$PWD/qmlsystempalette.cpp \
-    $$PWD/qmlspringfollow.cpp \
-    $$PWD/qmleasefollow.cpp \
-    $$PWD/qmlstate.cpp\
-    $$PWD/qmltransitionmanager.cpp \
-    $$PWD/qmlstateoperations.cpp \
-    $$PWD/qmlpropertychanges.cpp \
-    $$PWD/qmlstategroup.cpp \
-    $$PWD/qmltransition.cpp \
-    $$PWD/qmllistmodel.cpp\
-    $$PWD/qmllistaccessor.cpp \
-    $$PWD/qmlopenmetaobject.cpp \
-    $$PWD/qmltimeline.cpp \
-    $$PWD/qmltimer.cpp \
-    $$PWD/qmlbind.cpp \
-    $$PWD/qmlpropertymap.cpp \
-    $$PWD/qmlpixmapcache.cpp \
+    $$PWD/qdeclarativeconnection.cpp \
+    $$PWD/qdeclarativepackage.cpp \
+    $$PWD/qdeclarativeanimation.cpp \
+    $$PWD/qdeclarativesystempalette.cpp \
+    $$PWD/qdeclarativespringfollow.cpp \
+    $$PWD/qdeclarativeeasefollow.cpp \
+    $$PWD/qdeclarativestate.cpp\
+    $$PWD/qdeclarativetransitionmanager.cpp \
+    $$PWD/qdeclarativestateoperations.cpp \
+    $$PWD/qdeclarativepropertychanges.cpp \
+    $$PWD/qdeclarativestategroup.cpp \
+    $$PWD/qdeclarativetransition.cpp \
+    $$PWD/qdeclarativelistmodel.cpp\
+    $$PWD/qdeclarativelistaccessor.cpp \
+    $$PWD/qdeclarativeopenmetaobject.cpp \
+    $$PWD/qdeclarativetimeline.cpp \
+    $$PWD/qdeclarativetimer.cpp \
+    $$PWD/qdeclarativebind.cpp \
+    $$PWD/qdeclarativepropertymap.cpp \
+    $$PWD/qdeclarativepixmapcache.cpp \
     $$PWD/qnumberformat.cpp \
-    $$PWD/qmlnumberformatter.cpp \
-    $$PWD/qmldatetimeformatter.cpp \
-    $$PWD/qmlbehavior.cpp \
-    $$PWD/qmlfontloader.cpp \
-    $$PWD/qmlstyledtext.cpp
+    $$PWD/qdeclarativenumberformatter.cpp \
+    $$PWD/qdeclarativedatetimeformatter.cpp \
+    $$PWD/qdeclarativebehavior.cpp \
+    $$PWD/qdeclarativefontloader.cpp \
+    $$PWD/qdeclarativestyledtext.cpp
 
 HEADERS += \
-    $$PWD/qmlgraphicsutilmodule_p.h\
-    $$PWD/qmlview.h \
+    $$PWD/qdeclarativeutilmodule_p.h\
+    $$PWD/qdeclarativeview.h \
     $$PWD/qfxperf_p_p.h \
     $$PWD/qperformancelog_p_p.h \
-    $$PWD/qmlconnection_p.h \
-    $$PWD/qmlpackage_p.h \
-    $$PWD/qmlanimation_p.h \
-    $$PWD/qmlanimation_p_p.h \
-    $$PWD/qmlsystempalette_p.h \
-    $$PWD/qmlspringfollow_p.h \
-    $$PWD/qmleasefollow_p.h \
-    $$PWD/qmlstate_p.h\
-    $$PWD/qmlstateoperations_p.h \
-    $$PWD/qmlpropertychanges_p.h \
-    $$PWD/qmlstate_p_p.h\
-    $$PWD/qmltransitionmanager_p_p.h \
-    $$PWD/qmlstategroup_p.h \
-    $$PWD/qmltransition_p.h \
-    $$PWD/qmllistmodel_p.h\
-    $$PWD/qmllistaccessor_p.h \
-    $$PWD/qmlopenmetaobject_p.h \
-    $$PWD/qmlnullablevalue_p_p.h \
-    $$PWD/qmltimeline_p_p.h \
-    $$PWD/qmltimer_p.h \
-    $$PWD/qmlbind_p.h \
-    $$PWD/qmlpropertymap.h \
-    $$PWD/qmlpixmapcache_p.h \
+    $$PWD/qdeclarativeconnection_p.h \
+    $$PWD/qdeclarativepackage_p.h \
+    $$PWD/qdeclarativeanimation_p.h \
+    $$PWD/qdeclarativeanimation_p_p.h \
+    $$PWD/qdeclarativesystempalette_p.h \
+    $$PWD/qdeclarativespringfollow_p.h \
+    $$PWD/qdeclarativeeasefollow_p.h \
+    $$PWD/qdeclarativestate_p.h\
+    $$PWD/qdeclarativestateoperations_p.h \
+    $$PWD/qdeclarativepropertychanges_p.h \
+    $$PWD/qdeclarativestate_p_p.h\
+    $$PWD/qdeclarativetransitionmanager_p_p.h \
+    $$PWD/qdeclarativestategroup_p.h \
+    $$PWD/qdeclarativetransition_p.h \
+    $$PWD/qdeclarativelistmodel_p.h\
+    $$PWD/qdeclarativelistaccessor_p.h \
+    $$PWD/qdeclarativeopenmetaobject_p.h \
+    $$PWD/qdeclarativenullablevalue_p_p.h \
+    $$PWD/qdeclarativetimeline_p_p.h \
+    $$PWD/qdeclarativetimer_p.h \
+    $$PWD/qdeclarativebind_p.h \
+    $$PWD/qdeclarativepropertymap.h \
+    $$PWD/qdeclarativepixmapcache_p.h \
     $$PWD/qnumberformat_p.h \
-    $$PWD/qmlnumberformatter_p.h \
-    $$PWD/qmldatetimeformatter_p.h \
-    $$PWD/qmlbehavior_p.h \
-    $$PWD/qmlfontloader_p.h \
-    $$PWD/qmlstyledtext_p.h
+    $$PWD/qdeclarativenumberformatter_p.h \
+    $$PWD/qdeclarativedatetimeformatter_p.h \
+    $$PWD/qdeclarativebehavior_p.h \
+    $$PWD/qdeclarativefontloader_p.h \
+    $$PWD/qdeclarativestyledtext_p.h
 
 contains(QT_CONFIG, xmlpatterns) {
     QT+=xmlpatterns
-    SOURCES += $$PWD/qmlxmllistmodel.cpp
-    HEADERS += $$PWD/qmlxmllistmodel_p.h
+    SOURCES += $$PWD/qdeclarativexmllistmodel.cpp
+    HEADERS += $$PWD/qdeclarativexmllistmodel_p.h
 }
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index b3ca3b5..a059a77 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -608,7 +608,7 @@ public:
         return item->type() == QGraphicsPixmapItem::Type
                && !(item->flags() & QGraphicsItem::ItemIsSelectable)
                && item->d_ptr->children.size() == 0;
-            //|| (item->d_ptr->isObject && qobject_cast<QmlGraphicsImage *>(q_func()));
+            //|| (item->d_ptr->isObject && qobject_cast<QDeclarativeImage *>(q_func()));
     }
 
     inline const QStyleOption *styleOption() const
diff --git a/src/multimedia/qml/qdeclarative.cpp b/src/multimedia/qml/qdeclarative.cpp
new file mode 100644
index 0000000..b9c9186
--- /dev/null
+++ b/src/multimedia/qml/qdeclarative.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtMultimedia module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtMultimedia/qdeclarative.h>
+#include <QtMultimedia/private/qsoundeffect_p.h>
+#include <QtMultimedia/private/qdeclarativeaudio_p.h>
+#include <QtMultimedia/private/qdeclarativevideo_p.h>
+
+
+QT_BEGIN_NAMESPACE
+
+namespace QtMultimedia
+{
+
+/*!
+    Register the Multimedia QML elements.
+    \internal
+*/
+
+void qRegisterQmlElements(QDeclarativeEngine *engine, const char *uri)
+{
+    Q_UNUSED(engine);
+
+    qmlRegisterType<QSoundEffect>(uri, 4, 7, "SoundEffect", "SoundEffect");
+    qmlRegisterType<QDeclarativeAudio>(uri, 4, 7, "Audio", "Audio");
+    qmlRegisterType<QDeclarativeVideo>(uri, 4, 7, "Video", "Video");
+}
+
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/multimedia/qml/qdeclarative.h b/src/multimedia/qml/qdeclarative.h
new file mode 100644
index 0000000..f4579f4
--- /dev/null
+++ b/src/multimedia/qml/qdeclarative.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtMultimedia module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTMULTIMEDIA_QML_H
+#define QTMULTIMEDIA_QML_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+
+QT_MODULE(Multimedia)
+
+namespace QtMultimedia
+{
+extern void Q_MULTIMEDIA_EXPORT qRegisterQmlElements(QDeclarativeEngine *engine, const char *uri);
+}
+
+QT_END_NAMESPACE
+QT_END_HEADER
+
+#endif  // ifndef QTMULTIMEDIA_QML_H
diff --git a/src/multimedia/qml/qdeclarativeaudio.cpp b/src/multimedia/qml/qdeclarativeaudio.cpp
new file mode 100644
index 0000000..67df625
--- /dev/null
+++ b/src/multimedia/qml/qdeclarativeaudio.cpp
@@ -0,0 +1,326 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtMultimedia module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeaudio_p.h"
+
+#include <QtMultimedia/qmediaplayercontrol.h>
+
+QT_BEGIN_NAMESPACE
+
+
+/*!
+    \qmlclass Audio QDeclarativeAudio
+    \brief The Audio element allows you to add audio playback to a scene.
+
+    \qml
+    Audio { source: "audio/song.mp3" }
+    \endqml
+
+    \sa Video
+*/
+
+/*!
+    \internal
+    \class QDeclarativeAudio
+    \brief The QDeclarativeAudio class provides an audio item that you can add to a QDeclarativeView.
+*/
+
+void QDeclarativeAudio::_q_error(int errorCode, const QString &errorString)
+{
+    m_error = QMediaPlayer::Error(errorCode);
+    m_errorString = errorString;
+
+    emit error(Error(errorCode), errorString);
+    emit errorChanged();
+}
+
+
+QDeclarativeAudio::QDeclarativeAudio(QObject *parent)
+    : QObject(parent)
+{
+    setObject(this);
+}
+
+QDeclarativeAudio::~QDeclarativeAudio()
+{
+    shutdown();
+}
+
+/*!
+    \qmlmethod Audio::play()
+
+    Starts playback of the media.
+
+    Sets the \l playing property to true, and the \l paused property to false.
+*/
+
+void QDeclarativeAudio::play()
+{    
+    m_playerControl->play();
+
+    if (m_paused) {
+        m_paused = false;
+        emit pausedChanged();
+    }
+}
+
+/*!
+    \qmlmethod Audio::pause()
+
+    Pauses playback of the media.
+
+    Sets the \l playing and \l paused properties to true.
+*/
+
+void QDeclarativeAudio::pause()
+{
+    m_playerControl->pause();
+
+    if (!m_paused && m_state == QMediaPlayer::PausedState) {
+        m_paused = true;
+        emit pausedChanged();
+    }
+}
+
+/*!
+    \qmlmethod Audio::stop()
+
+    Stops playback of the media.
+
+    Sets the \l playing and \l paused properties to false.
+*/
+
+void QDeclarativeAudio::stop()
+{
+    m_playerControl->stop();
+
+    if (m_paused) {
+        m_paused = false;
+        emit pausedChanged();
+    }
+}
+
+/*!
+    \qmlproperty url Audio::source
+
+    This property holds the source URL of the media.
+*/
+
+/*!
+    \qmlproperty bool Audio::playing
+
+    This property holds whether the media is playing.
+
+    Defaults to false, and can be set to true to start playback.
+*/
+
+/*!
+    \qmlproperty bool Audio::paused
+
+    This property holds whether the media is paused.
+
+    Defaults to false, and can be set to true to pause playback.
+*/
+
+/*!
+    \qmlsignal Audio::onStarted()
+
+    This handler is called when playback is started.
+*/
+
+/*!
+    \qmlsignal Audio::onResumed()
+
+    This handler is called when playback is resumed from the paused state.
+*/
+
+/*!
+    \qmlsignal Audio::onPaused()
+
+    This handler is called when playback is paused.
+*/
+
+/*!
+    \qmlsignal Audio::onStopped()
+
+    This handler is called when playback is stopped.
+*/
+
+/*!
+    \qmlproperty enum Audio::status
+
+    This property holds the status of media loading. It can be one of:
+
+    \list
+    \o NoMedia - no media has been set.
+    \o Loading - the media is currently being loaded.
+    \o Loaded - the media has been loaded.
+    \o Buffering - the media is buffering data.
+    \o Stalled - playback has been interrupted while the media is buffering data.
+    \o Buffered - the media has buffered data.
+    \o EndOfMedia - the media has played to the end.
+    \o InvalidMedia - the media cannot be played.
+    \o UnknownStatus - the status of the media is unknown.
+    \endlist
+*/
+
+QDeclarativeAudio::Status QDeclarativeAudio::status() const
+{
+    return Status(m_status);
+}
+
+/*!
+    \qmlsignal Audio::onLoaded()
+
+    This handler is called when the media source has been loaded.
+*/
+
+/*!
+    \qmlsignal Audio::onBuffering()
+
+    This handler is called when the media  starts buffering.
+*/
+
+/*!
+    \qmlsignal Audio::onStalled()
+
+    This handler is called when playback has stalled while the media buffers.
+*/
+
+/*!
+    \qmlsignal Audio::onBuffered()
+
+    This handler is called when the media has finished buffering.
+*/
+
+/*!
+    \qmlsignal Audio::onEndOfMedia()
+
+    This handler is called when playback stops because end of the media has been reached.
+*/
+/*!
+    \qmlproperty int Audio::duration
+
+    This property holds the duration of the media in milliseconds.
+
+    If the media doesn't have a fixed duration (a live stream for example) this will be 0.
+*/
+
+/*!
+    \qmlproperty int Audio::position
+
+    This property holds the current playback position in milliseconds.
+
+    If the \l seekable property is true, this property can be set to seek to a new position.
+*/
+
+/*!
+    \qmlproperty qreal Audio::volume
+
+    This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
+*/
+
+/*!
+    \qmlproperty bool Audio::muted
+
+    This property holds whether the audio output is muted.
+*/
+
+/*!
+    \qmlproperty qreal Audio::bufferProgress
+
+    This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
+    (full).
+*/
+
+/*!
+    \qmlproperty bool Audio::seekable
+
+    This property holds whether position of the audio can be changed.
+
+    If true; setting a \l position value will cause playback to seek to the new position.
+*/
+
+/*!
+    \qmlproperty qreal Audio::playbackRate
+
+    This property holds the rate at which audio is played at as a multiple of the normal rate.
+*/
+
+/*!
+    \qmlproperty enum Audio::error
+
+    This property holds the error state of the audio.  It can be one of:
+
+    \list
+    \o NoError - there is no current error.
+    \o ResourceError - the audio cannot be played due to a problem allocating resources.
+    \o FormatError - the audio format is not supported.
+    \o NetworkError - the audio cannot be played due to network issues.
+    \o AccessDenied - the audio cannot be played due to insufficient permissions.
+    \o ServiceMissing -  the audio cannot be played because the media service could not be
+    instantiated.
+    \endlist
+*/
+
+QDeclarativeAudio::Error QDeclarativeAudio::error() const
+{
+    return Error(m_error);
+}
+
+/*!
+    \qmlproperty string Audio::errorString
+
+    This property holds a string describing the current error condition in more detail.
+*/
+
+/*!
+    \qmlsignal Audio::onError(error, errorString)
+
+    This handler is called when an \l {Error}{error} has occurred.  The errorString parameter
+    may contain more detailed information about the error.
+*/
+
+QT_END_NAMESPACE
+
+#include "moc_qdeclarativeaudio_p.cpp"
+
+
diff --git a/src/multimedia/qml/qdeclarativeaudio_p.h b/src/multimedia/qml/qdeclarativeaudio_p.h
new file mode 100644
index 0000000..d28c1dd
--- /dev/null
+++ b/src/multimedia/qml/qdeclarativeaudio_p.h
@@ -0,0 +1,162 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtMultimedia module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEAUDIO_P_H
+#define QDECLARATIVEAUDIO_P_H
+
+#include <QtMultimedia/private/qdeclarativemediabase_p.h>
+
+#include <QtCore/qbasictimer.h>
+#include <QtDeclarative/qdeclarativeitem.h>
+
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QTimerEvent;
+
+class Q_AUTOTEST_EXPORT QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(bool playing READ isPlaying WRITE setPlaying NOTIFY playingChanged)
+    Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
+    Q_PROPERTY(int position READ position WRITE setPosition NOTIFY positionChanged)
+    Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
+    Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
+    Q_PROPERTY(int bufferProgress READ bufferProgress NOTIFY bufferProgressChanged)
+    Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
+    Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged)
+    Q_PROPERTY(Error error READ error NOTIFY errorChanged)
+    Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
+    Q_ENUMS(Status)
+    Q_ENUMS(Error)
+    Q_INTERFACES(QDeclarativeParserStatus)
+public:
+    enum Status
+    {
+        UnknownStatus = QMediaPlayer::UnknownMediaStatus,
+        NoMedia       = QMediaPlayer::NoMedia,
+        Loading       = QMediaPlayer::LoadingMedia,
+        Loaded        = QMediaPlayer::LoadedMedia,
+        Stalled       = QMediaPlayer::StalledMedia,
+        Buffering     = QMediaPlayer::BufferingMedia,
+        Buffered      = QMediaPlayer::BufferedMedia,
+        EndOfMedia    = QMediaPlayer::EndOfMedia,
+        InvalidMedia  = QMediaPlayer::InvalidMedia
+    };
+
+    enum Error
+    {
+        NoError        = QMediaPlayer::NoError,
+        ResourceError  = QMediaPlayer::ResourceError,
+        FormatError    = QMediaPlayer::FormatError,
+        NetworkError   = QMediaPlayer::NetworkError,
+        AccessDenied   = QMediaPlayer::AccessDeniedError,
+        ServiceMissing = QMediaPlayer::ServiceMissingError
+    };
+
+    QDeclarativeAudio(QObject *parent = 0);
+    ~QDeclarativeAudio();
+
+    Status status() const;
+    Error error() const;
+
+public Q_SLOTS:
+    void play();
+    void pause();
+    void stop();
+
+Q_SIGNALS:
+    void sourceChanged();
+
+    void playingChanged();
+    void pausedChanged();
+
+    void started();
+    void resumed();
+    void paused();
+    void stopped();
+
+    void statusChanged();
+
+    void loaded();
+    void buffering();
+    void stalled();
+    void buffered();
+    void endOfMedia();
+
+    void durationChanged();
+    void positionChanged();
+
+    void volumeChanged();
+    void mutedChanged();
+
+    void bufferProgressChanged();
+
+    void seekableChanged();
+    void playbackRateChanged();
+
+    void errorChanged();
+    void error(QDeclarativeAudio::Error error, const QString &errorString);
+
+private Q_SLOTS:
+    void _q_error(int, const QString &);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeAudio)
+    Q_PRIVATE_SLOT(mediaBase(), void _q_stateChanged(QMediaPlayer::State))
+    Q_PRIVATE_SLOT(mediaBase(), void _q_mediaStatusChanged(QMediaPlayer::MediaStatus))
+    Q_PRIVATE_SLOT(mediaBase(), void _q_metaDataChanged())
+
+    inline QDeclarativeMediaBase *mediaBase() { return this; }
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeAudio))
+
+QT_END_HEADER
+
+#endif
diff --git a/src/multimedia/qml/qdeclarativemediabase.cpp b/src/multimedia/qml/qdeclarativemediabase.cpp
new file mode 100644
index 0000000..e054cb2
--- /dev/null
+++ b/src/multimedia/qml/qdeclarativemediabase.cpp
@@ -0,0 +1,413 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtMultimedia module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "QtMultimedia/private/qdeclarativemediabase_p.h"
+
+#include <QtCore/qcoreevent.h>
+#include <QtCore/qurl.h>
+
+#include <QtMultimedia/qmediaplayercontrol.h>
+#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimedia/qmediaserviceprovider.h>
+#include <QtMultimedia/qmetadatacontrol.h>
+#include <QtMultimedia/private/qmetadatacontrolmetaobject_p.h>
+
+
+
+QT_BEGIN_NAMESPACE
+
+
+class QDeclarativeMediaBaseObject : public QMediaObject
+{
+public:
+    QDeclarativeMediaBaseObject(QMediaService *service)
+        : QMediaObject(0, service)
+    {
+    }
+};
+
+class QDeclarativeMediaBasePlayerControl : public QMediaPlayerControl
+{
+public:
+    QDeclarativeMediaBasePlayerControl(QObject *parent)
+        : QMediaPlayerControl(parent)
+    {
+    }
+
+    QMediaPlayer::State state() const { return QMediaPlayer::StoppedState; }
+    QMediaPlayer::MediaStatus mediaStatus() const { return QMediaPlayer::NoMedia; }
+
+    qint64 duration() const { return 0; }
+    qint64 position() const { return 0; }
+    void setPosition(qint64) {}
+    int volume() const { return 0; }
+    void setVolume(int) {}
+    bool isMuted() const { return false; }
+    void setMuted(bool) {}
+    int bufferStatus() const { return 0; }
+    bool isAudioAvailable() const { return false; }
+    bool isVideoAvailable() const { return false; }
+    bool isSeekable() const { return false; }
+    QMediaTimeRange availablePlaybackRanges() const { return QMediaTimeRange(); }
+    qreal playbackRate() const { return 1; }
+    void setPlaybackRate(qreal) {}
+    QMediaContent media() const { return QMediaContent(); }
+    const QIODevice *mediaStream() const { return 0; }
+    void setMedia(const QMediaContent &, QIODevice *) {}
+
+    void play() {}
+    void pause() {}
+    void stop() {}
+};
+
+class QDeclarativeMediaBaseAnimation : public QObject
+{
+public:
+    QDeclarativeMediaBaseAnimation(QDeclarativeMediaBase *media)
+        : m_media(media)
+    {
+    }
+
+    void start() { if (!m_timer.isActive()) m_timer.start(500, this); }
+    void stop() { m_timer.stop(); }
+
+protected:
+    void timerEvent(QTimerEvent *event)
+    {
+        if (event->timerId() == m_timer.timerId()) {
+            event->accept();
+
+            if (m_media->m_state == QMediaPlayer::PlayingState)
+                emit m_media->positionChanged();
+            if (m_media->m_status == QMediaPlayer::BufferingMedia || QMediaPlayer::StalledMedia)
+                emit m_media->bufferProgressChanged();
+        } else {
+            QObject::timerEvent(event);
+        }
+    }
+
+private:
+    QDeclarativeMediaBase *m_media;
+    QBasicTimer m_timer;
+};
+
+void QDeclarativeMediaBase::_q_stateChanged(QMediaPlayer::State state)
+{
+    if (state != m_state) {
+        QMediaPlayer::State oldState = m_state;
+
+        m_state = state;
+
+        if (state == QMediaPlayer::StoppedState) {
+            emit stopped();
+            emit playingChanged();
+        } else if (oldState == QMediaPlayer::StoppedState) {
+            emit started();
+            emit playingChanged();
+        } else if (oldState  == QMediaPlayer::PausedState) {
+            m_paused = false;
+
+            emit resumed();
+            emit pausedChanged();
+        }
+
+        if (state == m_state && state == QMediaPlayer::PausedState) {
+            bool wasPaused = m_paused;
+
+            m_paused = true;
+
+            emit paused();
+
+            if (!wasPaused)
+                emit pausedChanged();
+        }
+
+        if (m_state == QMediaPlayer::PlayingState
+                || m_status == QMediaPlayer::BufferingMedia
+                || m_status == QMediaPlayer::StalledMedia) {
+            m_animation->start();
+        } else {
+            m_animation->stop();
+        }
+    }
+}
+
+void QDeclarativeMediaBase::_q_mediaStatusChanged(QMediaPlayer::MediaStatus status)
+{
+    if (status != m_status) {
+        m_status = status;
+
+        switch (status) {
+        case QMediaPlayer::LoadedMedia:
+            emit loaded();
+            break;
+        case QMediaPlayer::BufferingMedia:
+            emit buffering();
+            break;
+        case QMediaPlayer::BufferedMedia:
+            emit buffered();
+            break;
+        case QMediaPlayer::StalledMedia:
+            emit stalled();
+            break;
+        case QMediaPlayer::EndOfMedia:
+            emit endOfMedia();
+            break;
+        default:
+            break;
+        }
+
+        emit statusChanged();
+
+        if (m_state == QMediaPlayer::PlayingState
+                || m_status == QMediaPlayer::BufferingMedia
+                || m_status == QMediaPlayer::StalledMedia) {
+            m_animation->start();
+        } else {
+            m_animation->stop();
+        }
+    }
+}
+
+void QDeclarativeMediaBase::_q_metaDataChanged()
+{
+    m_metaObject->metaDataChanged();
+}
+
+QDeclarativeMediaBase::QDeclarativeMediaBase()
+    : m_mediaService(0)
+    , m_playerControl(0)
+    , m_mediaObject(0)
+    , m_mediaProvider(0)
+    , m_metaDataControl(0)
+    , m_metaObject(0)
+    , m_animation(0)
+    , m_state(QMediaPlayer::StoppedState)
+    , m_status(QMediaPlayer::NoMedia)
+    , m_error(QMediaPlayer::NoError)
+    , m_paused(false)
+{
+}
+
+QDeclarativeMediaBase::~QDeclarativeMediaBase()
+{
+}
+
+void QDeclarativeMediaBase::shutdown()
+{
+    delete m_metaObject;
+    delete m_mediaObject;
+
+    if (m_mediaProvider)
+        m_mediaProvider->releaseService(m_mediaService);
+
+    delete m_animation;
+
+}
+
+void QDeclarativeMediaBase::setObject(QObject *object)
+{
+    if ((m_mediaProvider = QMediaServiceProvider::defaultServiceProvider())) {
+        if ((m_mediaService = m_mediaProvider->requestService(Q_MEDIASERVICE_MEDIAPLAYER))) {
+            m_playerControl = qobject_cast<QMediaPlayerControl *>(
+                    m_mediaService->control(QMediaPlayerControl_iid));
+            m_metaDataControl = qobject_cast<QMetaDataControl *>(
+                    m_mediaService->control(QMetaDataControl_iid));
+            m_mediaObject = new QDeclarativeMediaBaseObject(m_mediaService);
+        }
+    }
+
+    if (m_playerControl) {
+        QObject::connect(m_playerControl, SIGNAL(stateChanged(QMediaPlayer::State)),
+                object, SLOT(_q_stateChanged(QMediaPlayer::State)));
+        QObject::connect(m_playerControl, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)),
+                object, SLOT(_q_mediaStatusChanged(QMediaPlayer::MediaStatus)));
+        QObject::connect(m_playerControl, SIGNAL(mediaChanged(QMediaContent)),
+                object, SIGNAL(sourceChanged()));
+        QObject::connect(m_playerControl, SIGNAL(durationChanged(qint64)),
+                object, SIGNAL(durationChanged()));
+        QObject::connect(m_playerControl, SIGNAL(positionChanged(qint64)),
+                object, SIGNAL(positionChanged()));
+        QObject::connect(m_playerControl, SIGNAL(volumeChanged(int)),
+                object, SIGNAL(volumeChanged()));
+        QObject::connect(m_playerControl, SIGNAL(mutedChanged(bool)),
+                object, SIGNAL(mutedChanged()));
+        QObject::connect(m_playerControl, SIGNAL(bufferStatusChanged(int)),
+                object, SIGNAL(bufferProgressChanged()));
+        QObject::connect(m_playerControl, SIGNAL(seekableChanged(bool)),
+                object, SIGNAL(seekableChanged()));
+        QObject::connect(m_playerControl, SIGNAL(playbackRateChanged(qreal)),
+                object, SIGNAL(playbackRateChanged()));
+        QObject::connect(m_playerControl, SIGNAL(error(int,QString)),
+                object, SLOT(_q_error(int,QString)));
+
+        m_animation = new QDeclarativeMediaBaseAnimation(this);
+    } else {
+        m_error = QMediaPlayer::ServiceMissingError;
+
+        m_playerControl = new QDeclarativeMediaBasePlayerControl(object);
+    }
+
+    if (m_metaDataControl) {
+        m_metaObject = new QMetaDataControlMetaObject(m_metaDataControl, object);
+
+        QObject::connect(m_metaDataControl, SIGNAL(metaDataChanged()),
+                object, SLOT(_q_metaDataChanged()));
+    }
+}
+
+QUrl QDeclarativeMediaBase::source() const
+{
+    return m_playerControl->media().canonicalUrl();
+}
+
+void QDeclarativeMediaBase::setSource(const QUrl &url)
+{
+    if (m_error != QMediaPlayer::ServiceMissingError && m_error != QMediaPlayer::NoError) {
+        m_error = QMediaPlayer::NoError;
+        m_errorString = QString();
+
+        emit errorChanged();
+    }
+
+    m_playerControl->setMedia(QMediaContent(url), 0);
+}
+
+bool QDeclarativeMediaBase::isPlaying() const
+{
+    return m_state != QMediaPlayer::StoppedState;
+}
+
+void QDeclarativeMediaBase::setPlaying(bool playing)
+{
+    if (playing && m_state == QMediaPlayer::StoppedState) {
+        if (m_paused)
+            m_playerControl->pause();
+        else
+            m_playerControl->play();
+    } else if (!playing) {
+        m_playerControl->stop();
+    }
+}
+
+bool QDeclarativeMediaBase::isPaused() const
+{
+    return m_paused;
+}
+
+void QDeclarativeMediaBase::setPaused(bool paused)
+{
+    if (m_paused != paused) {
+        if (paused && m_state == QMediaPlayer::PlayingState) {
+            m_playerControl->pause();
+        } else if (!paused && m_state == QMediaPlayer::PausedState) {
+            m_playerControl->play();
+        } else {
+            m_paused = paused;
+
+            emit pausedChanged();
+        }
+    }
+}
+
+int QDeclarativeMediaBase::duration() const
+{
+    return m_playerControl->duration();
+}
+
+int QDeclarativeMediaBase::position() const
+{
+    return m_playerControl->position();
+
+}
+
+void QDeclarativeMediaBase::setPosition(int position)
+{
+    m_playerControl->setPosition(position);
+}
+
+qreal QDeclarativeMediaBase::volume() const
+{
+    return qreal(m_playerControl->volume()) / 100;
+}
+
+void QDeclarativeMediaBase::setVolume(qreal volume)
+{
+    m_playerControl->setVolume(qRound(volume * 100));
+}
+
+bool QDeclarativeMediaBase::isMuted() const
+{
+    return m_playerControl->isMuted();
+}
+
+void QDeclarativeMediaBase::setMuted(bool muted)
+{
+    m_playerControl->setMuted(muted);
+}
+
+qreal QDeclarativeMediaBase::bufferProgress() const
+{
+    return qreal(m_playerControl->bufferStatus()) / 100;
+}
+
+bool QDeclarativeMediaBase::isSeekable() const
+{
+    return m_playerControl->isSeekable();
+}
+
+qreal QDeclarativeMediaBase::playbackRate() const
+{
+    return m_playerControl->playbackRate();
+}
+
+void QDeclarativeMediaBase::setPlaybackRate(qreal rate)
+{
+    m_playerControl->setPlaybackRate(rate);
+}
+
+QString QDeclarativeMediaBase::errorString() const
+{
+    return m_errorString;
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/multimedia/qml/qdeclarativemediabase_p.h b/src/multimedia/qml/qdeclarativemediabase_p.h
new file mode 100644
index 0000000..cee190c
--- /dev/null
+++ b/src/multimedia/qml/qdeclarativemediabase_p.h
@@ -0,0 +1,158 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtMultimedia module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEMEDIABASE_P_H
+#define QDECLARATIVEMEDIABASE_P_H
+
+
+#include <QtCore/qbasictimer.h>
+#include <QtMultimedia/qmediaplayer.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QMediaPlayerControl;
+class QMediaService;
+class QMediaServiceProvider;
+class QMetaDataControl;
+class QMetaDataControlMetaObject;
+class QDeclarativeMediaBaseAnimation;
+
+class Q_AUTOTEST_EXPORT QDeclarativeMediaBase
+{
+public:
+    QDeclarativeMediaBase();
+    virtual ~QDeclarativeMediaBase();
+
+    QUrl source() const;
+    void setSource(const QUrl &url);
+
+    bool isPlaying() const;
+    void setPlaying(bool playing);
+
+    bool isPaused() const;
+    void setPaused(bool paused);
+
+    int duration() const;
+
+    int position() const;
+    void setPosition(int position);
+
+    qreal volume() const;
+    void setVolume(qreal volume);
+
+    bool isMuted() const;
+    void setMuted(bool muted);
+
+    qreal bufferProgress() const;
+
+    bool isSeekable() const;
+
+    qreal playbackRate() const;
+    void setPlaybackRate(qreal rate);
+
+    QString errorString() const;
+
+    void _q_stateChanged(QMediaPlayer::State state);
+    void _q_mediaStatusChanged(QMediaPlayer::MediaStatus status);
+
+    void _q_metaDataChanged();
+
+protected:
+    void shutdown();
+
+    void setObject(QObject *object);
+
+    virtual void sourceChanged() = 0;
+
+    virtual void playingChanged() = 0;
+    virtual void pausedChanged() = 0;
+
+    virtual void started() = 0;
+    virtual void resumed() = 0;
+    virtual void paused() = 0;
+    virtual void stopped() = 0;
+
+    virtual void statusChanged() = 0;
+
+    virtual void loaded() = 0;
+    virtual void buffering() = 0;
+    virtual void stalled() = 0;
+    virtual void buffered() = 0;
+    virtual void endOfMedia() = 0;
+
+    virtual void durationChanged() = 0;
+    virtual void positionChanged() = 0;
+
+    virtual void volumeChanged() = 0;
+    virtual void mutedChanged() = 0;
+
+    virtual void bufferProgressChanged() = 0;
+
+    virtual void seekableChanged() = 0;
+    virtual void playbackRateChanged() = 0;
+
+    virtual void errorChanged() = 0;
+
+    QMediaService *m_mediaService;
+    QMediaPlayerControl *m_playerControl;
+
+    QMediaObject *m_mediaObject;
+    QMediaServiceProvider *m_mediaProvider;
+    QMetaDataControl *m_metaDataControl;
+    QMetaDataControlMetaObject *m_metaObject;
+    QDeclarativeMediaBaseAnimation *m_animation;
+
+    QMediaPlayer::State m_state;
+    QMediaPlayer::MediaStatus m_status;
+    QMediaPlayer::Error m_error;
+    bool m_paused;
+    QString m_errorString;
+
+    friend class QDeclarativeMediaBaseAnimation;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif
diff --git a/src/multimedia/qml/qdeclarativevideo.cpp b/src/multimedia/qml/qdeclarativevideo.cpp
new file mode 100644
index 0000000..d0e94f6
--- /dev/null
+++ b/src/multimedia/qml/qdeclarativevideo.cpp
@@ -0,0 +1,944 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtMultimedia module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativevideo_p.h"
+
+#include <QtMultimedia/qmediaplayercontrol.h>
+#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimedia/private/qpaintervideosurface_p.h>
+#include <QtMultimedia/qvideooutputcontrol.h>
+#include <QtMultimedia/qvideorenderercontrol.h>
+
+
+QT_BEGIN_NAMESPACE
+
+
+void QDeclarativeVideo::_q_nativeSizeChanged(const QSizeF &size)
+{
+    setImplicitWidth(size.width());
+    setImplicitHeight(size.height());
+}
+
+void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString)
+{
+    m_error = QMediaPlayer::Error(errorCode);
+    m_errorString = errorString;
+
+    emit error(Error(errorCode), errorString);
+    emit errorChanged();
+}
+
+
+/*!
+    \qmlclass Video QDeclarativeVideo
+    \brief The Video element allows you to add videos to a scene.
+    \inherits Item
+
+    \qml
+    Video { source: "video/movie.mpg" }
+    \endqml
+
+    The video item supports untransformed, stretched, and uniformly scaled video presentation.
+    For a description of stretched uniformly scaled presentation, see the \l fillMode property
+    description.
+
+    The video item is only visible when the \l hasVideo property is true and the video is playing.
+
+    \sa Audio
+*/
+
+/*!
+    \internal
+    \class QDeclarativeVideo
+    \brief The QDeclarativeVideo class provides a video item that you can add to a QDeclarativeView.
+*/
+
+QDeclarativeVideo::QDeclarativeVideo(QDeclarativeItem *parent)
+    : QDeclarativeItem(parent)
+    , m_graphicsItem(0)
+
+{
+    m_graphicsItem = new QGraphicsVideoItem(this);
+    connect(m_graphicsItem, SIGNAL(nativeSizeChanged(QSizeF)),
+            this, SLOT(_q_nativeSizeChanged(QSizeF)));
+
+    setObject(this);
+
+    if (m_mediaService) {
+        connect(m_playerControl, SIGNAL(audioAvailableChanged(bool)),
+                this, SIGNAL(hasAudioChanged()));
+        connect(m_playerControl, SIGNAL(videoAvailableChanged(bool)),
+                this, SIGNAL(hasVideoChanged()));
+
+        m_graphicsItem->setMediaObject(m_mediaObject);
+    }
+}
+
+QDeclarativeVideo::~QDeclarativeVideo()
+{
+    shutdown();
+
+    delete m_graphicsItem;
+}
+
+/*!
+    \qmlproperty url Video::source
+
+    This property holds the source URL of the media.
+*/
+
+/*!
+    \qmlproperty bool Video::playing
+
+    This property holds whether the media is playing.
+
+    Defaults to false, and can be set to true to start playback.
+*/
+
+/*!
+    \qmlproperty bool Video::paused
+
+    This property holds whether the media is paused.
+
+    Defaults to false, and can be set to true to pause playback.
+*/
+
+/*!
+    \qmlsignal Video::onStarted()
+
+    This handler is called when playback is started.
+*/
+
+/*!
+    \qmlsignal Video::onResumed()
+
+    This handler is called when playback is resumed from the paused state.
+*/
+
+/*!
+    \qmlsignal Video::onPaused()
+
+    This handler is called when playback is paused.
+*/
+
+/*!
+    \qmlsignal Video::onStopped()
+
+    This handler is called when playback is stopped.
+*/
+
+/*!
+    \qmlproperty enum Video::status
+
+    This property holds the status of media loading. It can be one of:
+
+    \list
+    \o NoMedia - no media has been set.
+    \o Loading - the media is currently being loaded.
+    \o Loaded - the media has been loaded.
+    \o Buffering - the media is buffering data.
+    \o Stalled - playback has been interrupted while the media is buffering data.
+    \o Buffered - the media has buffered data.
+    \o EndOfMedia - the media has played to the end.
+    \o InvalidMedia - the media cannot be played.
+    \o UnknownStatus - the status of the media is cannot be determined.
+    \endlist
+*/
+
+QDeclarativeVideo::Status QDeclarativeVideo::status() const
+{
+    return Status(m_status);
+}
+
+/*!
+    \qmlsignal Video::onLoaded()
+
+    This handler is called when the media source has been loaded.
+*/
+
+/*!
+    \qmlsignal Video::onBuffering()
+
+    This handler is called when the media starts buffering.
+*/
+
+/*!
+    \qmlsignal Video::onStalled()
+
+    This handler is called when playback has stalled while the media buffers.
+*/
+
+/*!
+    \qmlsignal Video::onBuffered()
+
+    This handler is called when the media has finished buffering.
+*/
+
+/*!
+    \qmlsignal Video::onEndOfMedia()
+
+    This handler is called when playback stops because end of the media has been reached.
+*/
+
+/*!
+    \qmlproperty int Video::duration
+
+    This property holds the duration of the media in milliseconds.
+
+    If the media doesn't have a fixed duration (a live stream for example) this will be 0.
+*/
+
+/*!
+    \qmlproperty int Video::position
+
+    This property holds the current playback position in milliseconds.
+*/
+
+/*!
+    \qmlproperty qreal Video::volume
+
+    This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
+*/
+
+/*!
+    \qmlproperty bool Video::muted
+
+    This property holds whether the audio output is muted.
+*/
+
+/*!
+    \qmlproperty bool Video::hasAudio
+
+    This property holds whether the media contains audio.
+*/
+
+bool QDeclarativeVideo::hasAudio() const
+{
+    return m_playerControl->isAudioAvailable();
+}
+
+/*!
+    \qmlproperty bool Video::hasVideo
+
+    This property holds whether the media contains video.
+*/
+
+bool QDeclarativeVideo::hasVideo() const
+{
+    return m_playerControl->isVideoAvailable();
+}
+
+/*!
+    \qmlproperty qreal Video::bufferProgress
+
+    This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
+    (full).
+*/
+
+/*!
+    \qmlproperty bool Video::seekable
+
+    This property holds whether position of the video can be changed.
+*/
+
+/*!
+    \qmlproperty qreal Video::playbackRate
+
+    This property holds the rate at which video is played at as a multiple of the normal rate.
+*/
+
+/*!
+    \qmlproperty enum Video::error
+
+    This property holds the error state of the video.  It can be one of:
+
+    \list
+    \o NoError - there is no current error.
+    \o ResourceError - the video cannot be played due to a problem allocating resources.
+    \o FormatError - the video format is not supported.
+    \o NetworkError - the video cannot be played due to network issues.
+    \o AccessDenied - the video cannot be played due to insufficient permissions.
+    \o ServiceMissing -  the video cannot be played because the media service could not be
+    instantiated.
+    \endlist
+*/
+
+
+QDeclarativeVideo::Error QDeclarativeVideo::error() const
+{
+    return Error(m_error);
+}
+
+/*!
+    \qmlproperty string Video::errorString
+
+    This property holds a string describing the current error condition in more detail.
+*/
+
+/*!
+    \qmlsignal Video::onError(error, errorString)
+
+    This handler is called when an \l {Error}{error} has occurred.  The errorString parameter
+    may contain more detailed information about the error.
+*/
+
+/*!
+    \qmlproperty enum Video::fillMode
+
+    Set this property to define how the video is scaled to fit the target area.
+
+    \list
+    \o Stretch - the video is scaled to fit.
+    \o PreserveAspectFit - the video is scaled uniformly to fit without cropping
+    \o PreserveAspectCrop - the video is scaled uniformly to fill, cropping if necessary
+    \endlist
+
+    The default fill mode is PreserveAspectFit.
+*/
+
+QDeclarativeVideo::FillMode QDeclarativeVideo::fillMode() const
+{
+    return FillMode(m_graphicsItem->aspectRatioMode());
+}
+
+void QDeclarativeVideo::setFillMode(FillMode mode)
+{
+    m_graphicsItem->setAspectRatioMode(Qt::AspectRatioMode(mode));
+}
+
+/*!
+    \qmlmethod Video::play()
+
+    Starts playback of the media.
+
+    Sets the \l playing property to true, and the \l paused property to false.
+*/
+
+void QDeclarativeVideo::play()
+{
+    m_playerControl->play();
+
+    if (m_paused) {
+        m_paused = false;
+        emit pausedChanged();
+    }
+}
+
+/*!
+    \qmlmethod Video::pause()
+
+    Pauses playback of the media.
+
+    Sets the \l playing and \l paused properties to true.
+*/
+
+void QDeclarativeVideo::pause()
+{
+    m_playerControl->pause();
+
+    if (!m_paused && m_state == QMediaPlayer::PausedState) {
+        m_paused = true;
+        emit pausedChanged();
+    }
+}
+
+/*!
+    \qmlmethod Video::stop()
+
+    Stops playback of the media.
+
+    Sets the \l playing and \l paused properties to false.
+*/
+
+void QDeclarativeVideo::stop()
+{
+    m_playerControl->stop();
+
+    if (m_paused) {
+        m_paused = false;
+        emit pausedChanged();
+    }
+}
+
+void QDeclarativeVideo::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
+{
+}
+
+void QDeclarativeVideo::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    m_graphicsItem->setSize(newGeometry.size());
+
+    QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
+}
+
+QT_END_NAMESPACE
+
+// ***************************************
+// Documentation for meta-data properties.
+// ***************************************
+
+/*!
+    \qmlproperty variant Video::title
+
+    This property holds the tile of the media.
+
+    \sa {QtMultimedia::Title}
+*/
+
+/*!
+    \qmlproperty variant Video::subTitle
+
+    This property holds the sub-title of the media.
+
+    \sa {QtMultimedia::SubTitle}
+*/
+
+/*!
+    \qmlproperty variant Video::author
+
+    This property holds the author of the media.
+
+    \sa {QtMultimedia::Author}
+*/
+
+/*!
+    \qmlproperty variant Video::comment
+
+    This property holds a user comment about the media.
+
+    \sa {QtMultimedia::Comment}
+*/
+
+/*!
+    \qmlproperty variant Video::description
+
+    This property holds a description of the media.
+
+    \sa {QtMultimedia::Description}
+*/
+
+/*!
+    \qmlproperty variant Video::category
+
+    This property holds the category of the media
+
+    \sa {QtMultimedia::Category}
+*/
+
+/*!
+    \qmlproperty variant Video::genre
+
+    This property holds the genre of the media.
+
+    \sa {QtMultimedia::Genre}
+*/
+
+/*!
+    \qmlproperty variant Video::year
+
+    This property holds the year of release of the media.
+
+    \sa {QtMultimedia::Year}
+*/
+
+/*!
+    \qmlproperty variant Video::date
+
+    This property holds the date of the media.
+
+    \sa {QtMultimedia::Date}
+*/
+
+/*!
+    \qmlproperty variant Video::userRating
+
+    This property holds a user rating of the media in the range of 0 to 100.
+
+    \sa {QtMultimedia::UserRating}
+*/
+
+/*!
+    \qmlproperty variant Video::keywords
+
+    This property holds a list of keywords describing the media.
+
+    \sa {QtMultimedia::Keywords}
+*/
+
+/*!
+    \qmlproperty variant Video::language
+
+    This property holds the language of the media, as an ISO 639-2 code.
+
+    \sa {QtMultimedia::Language}
+*/
+
+/*!
+    \qmlproperty variant Video::publisher
+
+    This property holds the publisher of the media.
+
+    \sa {QtMultimedia::Publisher}
+*/
+
+/*!
+    \qmlproperty variant Video::copyright
+
+    This property holds the media's copyright notice.
+
+    \sa {QtMultimedia::Copyright}
+*/
+
+/*!
+    \qmlproperty variant Video::parentalRating
+
+    This property holds the parental rating of the media.
+
+    \sa {QtMultimedia::ParentalRating}
+*/
+
+/*!
+    \qmlproperty variant Video::ratingOrganisation
+
+    This property holds the name of the rating organisation responsible for the
+    parental rating of the media.
+
+    \sa {QtMultimedia::RatingOrganisation}
+*/
+
+/*!
+    \qmlproperty variant Video::size
+
+    This property property holds the size of the media in bytes.
+
+    \sa {QtMultimedia::Size}
+*/
+
+/*!
+    \qmlproperty variant Video::mediaType
+
+    This property holds the type of the media.
+
+    \sa {QtMultimedia::MediaType}
+*/
+
+/*!
+    \qmlproperty variant Video::audioBitRate
+
+    This property holds the bit rate of the media's audio stream ni bits per
+    second.
+
+    \sa {QtMultimedia::AudioBitRate}
+*/
+
+/*!
+    \qmlproperty variant Video::audioCodec
+
+    This property holds the encoding of the media audio stream.
+
+    \sa {QtMultimedia::AudioCodec}
+*/
+
+/*!
+    \qmlproperty variant Video::averageLevel
+
+    This property holds the average volume level of the media.
+
+    \sa {QtMultimedia::AverageLevel}
+*/
+
+/*!
+    \qmlproperty variant Video::channelCount
+
+    This property holds the number of channels in the media's audio stream.
+
+    \sa {QtMultimedia::ChannelCount}
+*/
+
+/*!
+    \qmlproperty variant Video::peakValue
+
+    This property holds the peak volume of media's audio stream.
+
+    \sa {QtMultimedia::PeakValue}
+*/
+
+/*!
+    \qmlproperty variant Video::sampleRate
+
+    This property holds the sample rate of the media's audio stream in hertz.
+
+    \sa {QtMultimedia::SampleRate}
+*/
+
+/*!
+    \qmlproperty variant Video::albumTitle
+
+    This property holds the title of the album the media belongs to.
+
+    \sa {QtMultimedia::AlbumTitle}
+*/
+
+/*!
+    \qmlproperty variant Video::albumArtist
+
+    This property holds the name of the principal artist of the album the media
+    belongs to.
+
+    \sa {QtMultimedia::AlbumArtist}
+*/
+
+/*!
+    \qmlproperty variant Video::contributingArtist
+
+    This property holds the names of artists contributing to the media.
+
+    \sa {QtMultimedia::ContributingArtist}
+*/
+
+/*!
+    \qmlproperty variant Video::composer
+
+    This property holds the composer of the media.
+
+    \sa {QtMultimedia::Composer}
+*/
+
+/*!
+    \qmlproperty variant Video::conductor
+
+    This property holds the conductor of the media.
+
+    \sa {QtMultimedia::Conductor}
+*/
+
+/*!
+    \qmlproperty variant Video::lyrics
+
+    This property holds the lyrics to the media.
+
+    \sa {QtMultimedia::Lyrics}
+*/
+
+/*!
+    \qmlproperty variant Video::mood
+
+    This property holds the mood of the media.
+
+    \sa {QtMultimedia::Mood}
+*/
+
+/*!
+    \qmlproperty variant Video::trackNumber
+
+    This property holds the track number of the media.
+
+    \sa {QtMultimedia::TrackNumber}
+*/
+
+/*!
+    \qmlproperty variant Video::trackCount
+
+    This property holds the number of track on the album containing the media.
+
+    \sa {QtMultimedia::TrackNumber}
+*/
+
+/*!
+    \qmlproperty variant Video::coverArtUrlSmall
+
+    This property holds the URL of a small cover art image.
+
+    \sa {QtMultimedia::CoverArtUrlSmall}
+*/
+
+/*!
+    \qmlproperty variant Video::coverArtUrlLarge
+
+    This property holds the URL of a large cover art image.
+
+    \sa {QtMultimedia::CoverArtUrlLarge}
+*/
+
+/*!
+    \qmlproperty variant Video::resolution
+
+    This property holds the dimension of an image or video.
+
+    \sa {QtMultimedia::Resolution}
+*/
+
+/*!
+    \qmlproperty variant Video::pixelAspectRatio
+
+    This property holds the pixel aspect ratio of an image or video.
+
+    \sa {QtMultimedia::PixelAspectRatio}
+*/
+
+/*!
+    \qmlproperty variant Video::videoFrameRate
+
+    This property holds the frame rate of the media's video stream.
+
+    \sa {QtMultimedia::VideoFrameRate}
+*/
+
+/*!
+    \qmlproperty variant Video::videoBitRate
+
+    This property holds the bit rate of the media's video stream in bits per
+    second.
+
+    \sa {QtMultimedia::VideoBitRate}
+*/
+
+/*!
+    \qmlproperty variant Video::videoCodec
+
+    This property holds the encoding of the media's video stream.
+
+    \sa {QtMultimedia::VideoCodec}
+*/
+
+/*!
+    \qmlproperty variant Video::posterUrl
+
+    This property holds the URL of a poster image.
+
+    \sa {QtMultimedia::PosterUrl}
+*/
+
+/*!
+    \qmlproperty variant Video::chapterNumber
+
+    This property holds the chapter number of the media.
+
+    \sa {QtMultimedia::ChapterNumber}
+*/
+
+/*!
+    \qmlproperty variant Video::director
+
+    This property holds the director of the media.
+
+    \sa {QtMultimedia::Director}
+*/
+
+/*!
+    \qmlproperty variant Video::leadPerformer
+
+    This property holds the lead performer in the media.
+
+    \sa {QtMultimedia::LeadPerformer}
+*/
+
+/*!
+    \qmlproperty variant Video::writer
+
+    This property holds the writer of the media.
+
+    \sa {QtMultimedia::Writer}
+*/
+
+// The remaining properties are related to photos, and are technically
+// available but will certainly never have values.
+#ifndef Q_QDOC
+
+/*!
+    \qmlproperty variant Video::cameraManufacturer
+
+    \sa {QtMultimedia::CameraManufacturer}
+*/
+
+/*!
+    \qmlproperty variant Video::cameraModel
+
+    \sa {QtMultimedia::CameraModel}
+*/
+
+/*!
+    \qmlproperty variant Video::event
+
+    \sa {QtMultimedia::Event}
+*/
+
+/*!
+    \qmlproperty variant Video::subject
+
+    \sa {QtMultimedia::Subject}
+*/
+
+/*!
+    \qmlproperty variant Video::orientation
+
+    \sa {QtMultimedia::Orientation}
+*/
+
+/*!
+    \qmlproperty variant Video::exposureTime
+
+    \sa {QtMultimedia::ExposureTime}
+*/
+
+/*!
+    \qmlproperty variant Video::fNumber
+
+    \sa {QtMultimedia::FNumber}
+*/
+
+/*!
+    \qmlproperty variant Video::exposureProgram
+
+    \sa {QtMultimedia::ExposureProgram}
+*/
+
+/*!
+    \qmlproperty variant Video::isoSpeedRatings
+
+    \sa {QtMultimedia::ISOSpeedRatings}
+*/
+
+/*!
+    \qmlproperty variant Video::exposureBiasValue
+
+    \sa {QtMultimedia::ExposureBiasValue}
+*/
+
+/*!
+    \qmlproperty variant Video::dateTimeDigitized
+
+    \sa {QtMultimedia::DateTimeDigitized}
+*/
+
+/*!
+    \qmlproperty variant Video::subjectDistance
+
+    \sa {QtMultimedia::SubjectDistance}
+*/
+
+/*!
+    \qmlproperty variant Video::meteringMode
+
+    \sa {QtMultimedia::MeteringMode}
+*/
+
+/*!
+    \qmlproperty variant Video::lightSource
+
+    \sa {QtMultimedia::LightSource}
+*/
+
+/*!
+    \qmlproperty variant Video::flash
+
+    \sa {QtMultimedia::Flash}
+*/
+
+/*!
+    \qmlproperty variant Video::focalLength
+
+    \sa {QtMultimedia::FocalLength}
+*/
+
+/*!
+    \qmlproperty variant Video::exposureMode
+
+    \sa {QtMultimedia::ExposureMode}
+*/
+
+/*!
+    \qmlproperty variant Video::whiteBalance
+
+    \sa {QtMultimedia::WhiteBalance}
+*/
+
+/*!
+    \qmlproperty variant Video::DigitalZoomRatio
+
+    \sa {QtMultimedia::DigitalZoomRatio}
+*/
+
+/*!
+    \qmlproperty variant Video::focalLengthIn35mmFilm
+
+    \sa {QtMultimedia::FocalLengthIn35mmFile}
+*/
+
+/*!
+    \qmlproperty variant Video::sceneCaptureType
+
+    \sa {QtMultimedia::SceneCaptureType}
+*/
+
+/*!
+    \qmlproperty variant Video::gainControl
+
+    \sa {QtMultimedia::GainControl}
+*/
+
+/*!
+    \qmlproperty variant Video::contrast
+
+    \sa {QtMultimedia::contrast}
+*/
+
+/*!
+    \qmlproperty variant Video::saturation
+
+    \sa {QtMultimedia::Saturation}
+*/
+
+/*!
+    \qmlproperty variant Video::sharpness
+
+    \sa {QtMultimedia::Sharpness}
+*/
+
+/*!
+    \qmlproperty variant Video::deviceSettingDescription
+
+    \sa {QtMultimedia::DeviceSettingDescription}
+*/
+
+#endif
+
+#include "moc_qdeclarativevideo_p.cpp"
diff --git a/src/multimedia/qml/qdeclarativevideo_p.h b/src/multimedia/qml/qdeclarativevideo_p.h
new file mode 100644
index 0000000..164edae
--- /dev/null
+++ b/src/multimedia/qml/qdeclarativevideo_p.h
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtMultimedia module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEVIDEO_H
+#define QDECLARATIVEVIDEO_H
+
+#include <QtMultimedia/private/qdeclarativemediabase_p.h>
+
+#include <QtMultimedia/qgraphicsvideoitem.h>
+
+#include <QtCore/qbasictimer.h>
+#include <QtDeclarative/qdeclarativeitem.h>
+
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QTimerEvent;
+class QVideoSurfaceFormat;
+
+
+class Q_AUTOTEST_EXPORT QDeclarativeVideo : public QDeclarativeItem, public QDeclarativeMediaBase
+{
+    Q_OBJECT
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(bool playing READ isPlaying WRITE setPlaying NOTIFY playingChanged)
+    Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
+    Q_PROPERTY(int position READ position WRITE setPosition NOTIFY positionChanged)
+    Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
+    Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
+    Q_PROPERTY(bool hasAudio READ hasAudio NOTIFY hasAudioChanged)
+    Q_PROPERTY(bool hasVideo READ hasVideo NOTIFY hasVideoChanged)
+    Q_PROPERTY(int bufferProgress READ bufferProgress NOTIFY bufferProgressChanged)
+    Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
+    Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged)
+    Q_PROPERTY(Error error READ error NOTIFY errorChanged)
+    Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
+    Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode)
+    Q_ENUMS(FillMode)
+    Q_ENUMS(Status)
+    Q_ENUMS(Error)
+public:
+    enum FillMode
+    {
+        Stretch            = Qt::IgnoreAspectRatio,
+        PreserveAspectFit  = Qt::KeepAspectRatio,
+        PreserveAspectCrop = Qt::KeepAspectRatioByExpanding
+    };
+
+    enum Status
+    {
+        UnknownStatus = QMediaPlayer::UnknownMediaStatus,
+        NoMedia       = QMediaPlayer::NoMedia,
+        Loading       = QMediaPlayer::LoadingMedia,
+        Loaded        = QMediaPlayer::LoadedMedia,
+        Stalled       = QMediaPlayer::StalledMedia,
+        Buffering     = QMediaPlayer::BufferingMedia,
+        Buffered      = QMediaPlayer::BufferedMedia,
+        EndOfMedia    = QMediaPlayer::EndOfMedia,
+        InvalidMedia  = QMediaPlayer::InvalidMedia
+    };
+
+    enum Error
+    {
+        NoError        = QMediaPlayer::NoError,
+        ResourceError  = QMediaPlayer::ResourceError,
+        FormatError    = QMediaPlayer::FormatError,
+        NetworkError   = QMediaPlayer::NetworkError,
+        AccessDenied   = QMediaPlayer::AccessDeniedError,
+        ServiceMissing = QMediaPlayer::ServiceMissingError
+    };
+
+    QDeclarativeVideo(QDeclarativeItem *parent = 0);
+    ~QDeclarativeVideo();
+
+    bool hasAudio() const;
+    bool hasVideo() const;
+
+    FillMode fillMode() const;
+    void setFillMode(FillMode mode);
+
+    Status status() const;
+    Error error() const;
+
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+
+public Q_SLOTS:
+    void play();
+    void pause();
+    void stop();
+
+Q_SIGNALS:
+    void sourceChanged();
+
+    void playingChanged();
+    void pausedChanged();
+
+    void started();
+    void resumed();
+    void paused();
+    void stopped();
+
+    void statusChanged();
+
+    void loaded();
+    void buffering();
+    void stalled();
+    void buffered();
+    void endOfMedia();
+
+    void durationChanged();
+    void positionChanged();
+
+    void volumeChanged();
+    void mutedChanged();
+    void hasAudioChanged();
+    void hasVideoChanged();
+
+    void bufferProgressChanged();
+
+    void seekableChanged();
+    void playbackRateChanged();
+
+    void errorChanged();
+    void error(QDeclarativeVideo::Error error, const QString &errorString);
+
+protected:
+    void geometryChanged(const QRectF &geometry, const QRectF &);
+
+private Q_SLOTS:
+    void _q_nativeSizeChanged(const QSizeF &size);
+    void _q_error(int, const QString &);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeVideo)
+
+    QGraphicsVideoItem *m_graphicsItem;
+
+    Q_PRIVATE_SLOT(mediaBase(), void _q_stateChanged(QMediaPlayer::State))
+    Q_PRIVATE_SLOT(mediaBase(), void _q_mediaStatusChanged(QMediaPlayer::MediaStatus))
+    Q_PRIVATE_SLOT(mediaBase(), void _q_metaDataChanged())
+
+    inline QDeclarativeMediaBase *mediaBase() { return this; }
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeVideo))
+
+QT_END_HEADER
+
+#endif
diff --git a/src/multimedia/qml/qml.cpp b/src/multimedia/qml/qml.cpp
deleted file mode 100644
index 43a32c5..0000000
--- a/src/multimedia/qml/qml.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtMultimedia/qml.h>
-#include <QtMultimedia/private/qsoundeffect_p.h>
-#include <QtMultimedia/private/qmlaudio_p.h>
-#include <QtMultimedia/private/qmlgraphicsvideo_p.h>
-
-
-QT_BEGIN_NAMESPACE
-
-namespace QtMultimedia
-{
-
-/*!
-    Register the Multimedia QML elements.
-    \internal
-*/
-
-void qRegisterQmlElements(QmlEngine *engine, const char *uri)
-{
-    Q_UNUSED(engine);
-
-    qmlRegisterType<QSoundEffect>(uri, 4, 7, "SoundEffect", "SoundEffect");
-    qmlRegisterType<QmlAudio>(uri, 4, 7, "Audio", "Audio");
-    qmlRegisterType<QmlGraphicsVideo>(uri, 4, 7, "Video", "Video");
-}
-
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/multimedia/qml/qml.h b/src/multimedia/qml/qml.h
deleted file mode 100644
index c4159b3..0000000
--- a/src/multimedia/qml/qml.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTMULTIMEDIA_QML_H
-#define QTMULTIMEDIA_QML_H
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-class QmlEngine;
-
-QT_MODULE(Multimedia)
-
-namespace QtMultimedia
-{
-extern void Q_MULTIMEDIA_EXPORT qRegisterQmlElements(QmlEngine *engine, const char *uri);
-}
-
-QT_END_NAMESPACE
-QT_END_HEADER
-
-#endif  // ifndef QTMULTIMEDIA_QML_H
diff --git a/src/multimedia/qml/qml.pri b/src/multimedia/qml/qml.pri
index e506632..dfc006e 100644
--- a/src/multimedia/qml/qml.pri
+++ b/src/multimedia/qml/qml.pri
@@ -17,20 +17,20 @@ contains(QT_CONFIG, declarative) {
     }
 
     HEADERS += \
-        $$PWD/qml.h \
+        $$PWD/qdeclarative.h \
         $$PWD/qmetadatacontrolmetaobject_p.h \
-        $$PWD/qmlaudio_p.h \
-        $$PWD/qmlgraphicsvideo_p.h \
-        $$PWD/qmlmediabase_p.h \
+        $$PWD/qdeclarativeaudio_p.h \
+        $$PWD/qdeclarativevideo_p.h \
+        $$PWD/qdeclarativemediabase_p.h \
         $$PWD/qsoundeffect_p.h \
         $$PWD/wavedecoder_p.h
 
     SOURCES += \
-        $$PWD/qml.cpp \
+        $$PWD/qdeclarative.cpp \
         $$PWD/qmetadatacontrolmetaobject.cpp \
-        $$PWD/qmlaudio.cpp \
-        $$PWD/qmlgraphicsvideo.cpp \
-        $$PWD/qmlmediabase.cpp \
+        $$PWD/qdeclarativeaudio.cpp \
+        $$PWD/qdeclarativevideo.cpp \
+        $$PWD/qdeclarativemediabase.cpp \
         $$PWD/qsoundeffect.cpp \
         $$PWD/wavedecoder_p.cpp
 }
diff --git a/src/multimedia/qml/qmlaudio.cpp b/src/multimedia/qml/qmlaudio.cpp
deleted file mode 100644
index 89f045e..0000000
--- a/src/multimedia/qml/qmlaudio.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlaudio_p.h"
-
-#include <QtMultimedia/qmediaplayercontrol.h>
-
-QT_BEGIN_NAMESPACE
-
-
-/*!
-    \qmlclass Audio QmlAudio
-    \brief The Audio element allows you to add audio playback to a scene.
-
-    \qml
-    Audio { source: "audio/song.mp3" }
-    \endqml
-
-    \sa Video
-*/
-
-/*!
-    \internal
-    \class QmlAudio
-    \brief The QmlAudio class provides an audio item that you can add to a QmlView.
-*/
-
-void QmlAudio::_q_error(int errorCode, const QString &errorString)
-{
-    m_error = QMediaPlayer::Error(errorCode);
-    m_errorString = errorString;
-
-    emit error(Error(errorCode), errorString);
-    emit errorChanged();
-}
-
-
-QmlAudio::QmlAudio(QObject *parent)
-    : QObject(parent)
-{
-    setObject(this);
-}
-
-QmlAudio::~QmlAudio()
-{
-    shutdown();
-}
-
-/*!
-    \qmlmethod Audio::play()
-
-    Starts playback of the media.
-
-    Sets the \l playing property to true, and the \l paused property to false.
-*/
-
-void QmlAudio::play()
-{    
-    m_playerControl->play();
-
-    if (m_paused) {
-        m_paused = false;
-        emit pausedChanged();
-    }
-}
-
-/*!
-    \qmlmethod Audio::pause()
-
-    Pauses playback of the media.
-
-    Sets the \l playing and \l paused properties to true.
-*/
-
-void QmlAudio::pause()
-{
-    m_playerControl->pause();
-
-    if (!m_paused && m_state == QMediaPlayer::PausedState) {
-        m_paused = true;
-        emit pausedChanged();
-    }
-}
-
-/*!
-    \qmlmethod Audio::stop()
-
-    Stops playback of the media.
-
-    Sets the \l playing and \l paused properties to false.
-*/
-
-void QmlAudio::stop()
-{
-    m_playerControl->stop();
-
-    if (m_paused) {
-        m_paused = false;
-        emit pausedChanged();
-    }
-}
-
-/*!
-    \qmlproperty url Audio::source
-
-    This property holds the source URL of the media.
-*/
-
-/*!
-    \qmlproperty bool Audio::playing
-
-    This property holds whether the media is playing.
-
-    Defaults to false, and can be set to true to start playback.
-*/
-
-/*!
-    \qmlproperty bool Audio::paused
-
-    This property holds whether the media is paused.
-
-    Defaults to false, and can be set to true to pause playback.
-*/
-
-/*!
-    \qmlsignal Audio::onStarted()
-
-    This handler is called when playback is started.
-*/
-
-/*!
-    \qmlsignal Audio::onResumed()
-
-    This handler is called when playback is resumed from the paused state.
-*/
-
-/*!
-    \qmlsignal Audio::onPaused()
-
-    This handler is called when playback is paused.
-*/
-
-/*!
-    \qmlsignal Audio::onStopped()
-
-    This handler is called when playback is stopped.
-*/
-
-/*!
-    \qmlproperty enum Audio::status
-
-    This property holds the status of media loading. It can be one of:
-
-    \list
-    \o NoMedia - no media has been set.
-    \o Loading - the media is currently being loaded.
-    \o Loaded - the media has been loaded.
-    \o Buffering - the media is buffering data.
-    \o Stalled - playback has been interrupted while the media is buffering data.
-    \o Buffered - the media has buffered data.
-    \o EndOfMedia - the media has played to the end.
-    \o InvalidMedia - the media cannot be played.
-    \o UnknownStatus - the status of the media is unknown.
-    \endlist
-*/
-
-QmlAudio::Status QmlAudio::status() const
-{
-    return Status(m_status);
-}
-
-/*!
-    \qmlsignal Audio::onLoaded()
-
-    This handler is called when the media source has been loaded.
-*/
-
-/*!
-    \qmlsignal Audio::onBuffering()
-
-    This handler is called when the media  starts buffering.
-*/
-
-/*!
-    \qmlsignal Audio::onStalled()
-
-    This handler is called when playback has stalled while the media buffers.
-*/
-
-/*!
-    \qmlsignal Audio::onBuffered()
-
-    This handler is called when the media has finished buffering.
-*/
-
-/*!
-    \qmlsignal Audio::onEndOfMedia()
-
-    This handler is called when playback stops because end of the media has been reached.
-*/
-/*!
-    \qmlproperty int Audio::duration
-
-    This property holds the duration of the media in milliseconds.
-
-    If the media doesn't have a fixed duration (a live stream for example) this will be 0.
-*/
-
-/*!
-    \qmlproperty int Audio::position
-
-    This property holds the current playback position in milliseconds.
-
-    If the \l seekable property is true, this property can be set to seek to a new position.
-*/
-
-/*!
-    \qmlproperty qreal Audio::volume
-
-    This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
-*/
-
-/*!
-    \qmlproperty bool Audio::muted
-
-    This property holds whether the audio output is muted.
-*/
-
-/*!
-    \qmlproperty qreal Audio::bufferProgress
-
-    This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
-    (full).
-*/
-
-/*!
-    \qmlproperty bool Audio::seekable
-
-    This property holds whether position of the audio can be changed.
-
-    If true; setting a \l position value will cause playback to seek to the new position.
-*/
-
-/*!
-    \qmlproperty qreal Audio::playbackRate
-
-    This property holds the rate at which audio is played at as a multiple of the normal rate.
-*/
-
-/*!
-    \qmlproperty enum Audio::error
-
-    This property holds the error state of the audio.  It can be one of:
-
-    \list
-    \o NoError - there is no current error.
-    \o ResourceError - the audio cannot be played due to a problem allocating resources.
-    \o FormatError - the audio format is not supported.
-    \o NetworkError - the audio cannot be played due to network issues.
-    \o AccessDenied - the audio cannot be played due to insufficient permissions.
-    \o ServiceMissing -  the audio cannot be played because the media service could not be
-    instantiated.
-    \endlist
-*/
-
-QmlAudio::Error QmlAudio::error() const
-{
-    return Error(m_error);
-}
-
-/*!
-    \qmlproperty string Audio::errorString
-
-    This property holds a string describing the current error condition in more detail.
-*/
-
-/*!
-    \qmlsignal Audio::onError(error, errorString)
-
-    This handler is called when an \l {Error}{error} has occurred.  The errorString parameter
-    may contain more detailed information about the error.
-*/
-
-QT_END_NAMESPACE
-
-#include "moc_qmlaudio_p.cpp"
-
-
diff --git a/src/multimedia/qml/qmlaudio_p.h b/src/multimedia/qml/qmlaudio_p.h
deleted file mode 100644
index f034518..0000000
--- a/src/multimedia/qml/qmlaudio_p.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLAUDIO_P_H
-#define QMLAUDIO_P_H
-
-#include <QtMultimedia/private/qmlmediabase_p.h>
-
-#include <QtCore/qbasictimer.h>
-#include <QtDeclarative/qmlgraphicsitem.h>
-
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QTimerEvent;
-
-class Q_AUTOTEST_EXPORT QmlAudio : public QObject, public QmlMediaBase, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(bool playing READ isPlaying WRITE setPlaying NOTIFY playingChanged)
-    Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-    Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
-    Q_PROPERTY(int position READ position WRITE setPosition NOTIFY positionChanged)
-    Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
-    Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
-    Q_PROPERTY(int bufferProgress READ bufferProgress NOTIFY bufferProgressChanged)
-    Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
-    Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged)
-    Q_PROPERTY(Error error READ error NOTIFY errorChanged)
-    Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
-    Q_ENUMS(Status)
-    Q_ENUMS(Error)
-    Q_INTERFACES(QmlParserStatus)
-public:
-    enum Status
-    {
-        UnknownStatus = QMediaPlayer::UnknownMediaStatus,
-        NoMedia       = QMediaPlayer::NoMedia,
-        Loading       = QMediaPlayer::LoadingMedia,
-        Loaded        = QMediaPlayer::LoadedMedia,
-        Stalled       = QMediaPlayer::StalledMedia,
-        Buffering     = QMediaPlayer::BufferingMedia,
-        Buffered      = QMediaPlayer::BufferedMedia,
-        EndOfMedia    = QMediaPlayer::EndOfMedia,
-        InvalidMedia  = QMediaPlayer::InvalidMedia
-    };
-
-    enum Error
-    {
-        NoError        = QMediaPlayer::NoError,
-        ResourceError  = QMediaPlayer::ResourceError,
-        FormatError    = QMediaPlayer::FormatError,
-        NetworkError   = QMediaPlayer::NetworkError,
-        AccessDenied   = QMediaPlayer::AccessDeniedError,
-        ServiceMissing = QMediaPlayer::ServiceMissingError
-    };
-
-    QmlAudio(QObject *parent = 0);
-    ~QmlAudio();
-
-    Status status() const;
-    Error error() const;
-
-public Q_SLOTS:
-    void play();
-    void pause();
-    void stop();
-
-Q_SIGNALS:
-    void sourceChanged();
-
-    void playingChanged();
-    void pausedChanged();
-
-    void started();
-    void resumed();
-    void paused();
-    void stopped();
-
-    void statusChanged();
-
-    void loaded();
-    void buffering();
-    void stalled();
-    void buffered();
-    void endOfMedia();
-
-    void durationChanged();
-    void positionChanged();
-
-    void volumeChanged();
-    void mutedChanged();
-
-    void bufferProgressChanged();
-
-    void seekableChanged();
-    void playbackRateChanged();
-
-    void errorChanged();
-    void error(QmlAudio::Error error, const QString &errorString);
-
-private Q_SLOTS:
-    void _q_error(int, const QString &);
-
-private:
-    Q_DISABLE_COPY(QmlAudio)
-    Q_PRIVATE_SLOT(mediaBase(), void _q_stateChanged(QMediaPlayer::State))
-    Q_PRIVATE_SLOT(mediaBase(), void _q_mediaStatusChanged(QMediaPlayer::MediaStatus))
-    Q_PRIVATE_SLOT(mediaBase(), void _q_metaDataChanged())
-
-    inline QmlMediaBase *mediaBase() { return this; }
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QmlAudio))
-
-QT_END_HEADER
-
-#endif
diff --git a/src/multimedia/qml/qmlgraphicsvideo.cpp b/src/multimedia/qml/qmlgraphicsvideo.cpp
deleted file mode 100644
index 7289f4d..0000000
--- a/src/multimedia/qml/qmlgraphicsvideo.cpp
+++ /dev/null
@@ -1,944 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlgraphicsvideo_p.h"
-
-#include <QtMultimedia/qmediaplayercontrol.h>
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/private/qpaintervideosurface_p.h>
-#include <QtMultimedia/qvideooutputcontrol.h>
-#include <QtMultimedia/qvideorenderercontrol.h>
-
-
-QT_BEGIN_NAMESPACE
-
-
-void QmlGraphicsVideo::_q_nativeSizeChanged(const QSizeF &size)
-{
-    setImplicitWidth(size.width());
-    setImplicitHeight(size.height());
-}
-
-void QmlGraphicsVideo::_q_error(int errorCode, const QString &errorString)
-{
-    m_error = QMediaPlayer::Error(errorCode);
-    m_errorString = errorString;
-
-    emit error(Error(errorCode), errorString);
-    emit errorChanged();
-}
-
-
-/*!
-    \qmlclass Video QmlGraphicsVideo
-    \brief The Video element allows you to add videos to a scene.
-    \inherits Item
-
-    \qml
-    Video { source: "video/movie.mpg" }
-    \endqml
-
-    The video item supports untransformed, stretched, and uniformly scaled video presentation.
-    For a description of stretched uniformly scaled presentation, see the \l fillMode property
-    description.
-
-    The video item is only visible when the \l hasVideo property is true and the video is playing.
-
-    \sa Audio
-*/
-
-/*!
-    \internal
-    \class QmlGraphicsVideo
-    \brief The QmlGraphicsVideo class provides a video item that you can add to a QmlView.
-*/
-
-QmlGraphicsVideo::QmlGraphicsVideo(QmlGraphicsItem *parent)
-    : QmlGraphicsItem(parent)
-    , m_graphicsItem(0)
-
-{
-    m_graphicsItem = new QGraphicsVideoItem(this);
-    connect(m_graphicsItem, SIGNAL(nativeSizeChanged(QSizeF)),
-            this, SLOT(_q_nativeSizeChanged(QSizeF)));
-
-    setObject(this);
-
-    if (m_mediaService) {
-        connect(m_playerControl, SIGNAL(audioAvailableChanged(bool)),
-                this, SIGNAL(hasAudioChanged()));
-        connect(m_playerControl, SIGNAL(videoAvailableChanged(bool)),
-                this, SIGNAL(hasVideoChanged()));
-
-        m_graphicsItem->setMediaObject(m_mediaObject);
-    }
-}
-
-QmlGraphicsVideo::~QmlGraphicsVideo()
-{
-    shutdown();
-
-    delete m_graphicsItem;
-}
-
-/*!
-    \qmlproperty url Video::source
-
-    This property holds the source URL of the media.
-*/
-
-/*!
-    \qmlproperty bool Video::playing
-
-    This property holds whether the media is playing.
-
-    Defaults to false, and can be set to true to start playback.
-*/
-
-/*!
-    \qmlproperty bool Video::paused
-
-    This property holds whether the media is paused.
-
-    Defaults to false, and can be set to true to pause playback.
-*/
-
-/*!
-    \qmlsignal Video::onStarted()
-
-    This handler is called when playback is started.
-*/
-
-/*!
-    \qmlsignal Video::onResumed()
-
-    This handler is called when playback is resumed from the paused state.
-*/
-
-/*!
-    \qmlsignal Video::onPaused()
-
-    This handler is called when playback is paused.
-*/
-
-/*!
-    \qmlsignal Video::onStopped()
-
-    This handler is called when playback is stopped.
-*/
-
-/*!
-    \qmlproperty enum Video::status
-
-    This property holds the status of media loading. It can be one of:
-
-    \list
-    \o NoMedia - no media has been set.
-    \o Loading - the media is currently being loaded.
-    \o Loaded - the media has been loaded.
-    \o Buffering - the media is buffering data.
-    \o Stalled - playback has been interrupted while the media is buffering data.
-    \o Buffered - the media has buffered data.
-    \o EndOfMedia - the media has played to the end.
-    \o InvalidMedia - the media cannot be played.
-    \o UnknownStatus - the status of the media is cannot be determined.
-    \endlist
-*/
-
-QmlGraphicsVideo::Status QmlGraphicsVideo::status() const
-{
-    return Status(m_status);
-}
-
-/*!
-    \qmlsignal Video::onLoaded()
-
-    This handler is called when the media source has been loaded.
-*/
-
-/*!
-    \qmlsignal Video::onBuffering()
-
-    This handler is called when the media starts buffering.
-*/
-
-/*!
-    \qmlsignal Video::onStalled()
-
-    This handler is called when playback has stalled while the media buffers.
-*/
-
-/*!
-    \qmlsignal Video::onBuffered()
-
-    This handler is called when the media has finished buffering.
-*/
-
-/*!
-    \qmlsignal Video::onEndOfMedia()
-
-    This handler is called when playback stops because end of the media has been reached.
-*/
-
-/*!
-    \qmlproperty int Video::duration
-
-    This property holds the duration of the media in milliseconds.
-
-    If the media doesn't have a fixed duration (a live stream for example) this will be 0.
-*/
-
-/*!
-    \qmlproperty int Video::position
-
-    This property holds the current playback position in milliseconds.
-*/
-
-/*!
-    \qmlproperty qreal Video::volume
-
-    This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
-*/
-
-/*!
-    \qmlproperty bool Video::muted
-
-    This property holds whether the audio output is muted.
-*/
-
-/*!
-    \qmlproperty bool Video::hasAudio
-
-    This property holds whether the media contains audio.
-*/
-
-bool QmlGraphicsVideo::hasAudio() const
-{
-    return m_playerControl->isAudioAvailable();
-}
-
-/*!
-    \qmlproperty bool Video::hasVideo
-
-    This property holds whether the media contains video.
-*/
-
-bool QmlGraphicsVideo::hasVideo() const
-{
-    return m_playerControl->isVideoAvailable();
-}
-
-/*!
-    \qmlproperty qreal Video::bufferProgress
-
-    This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
-    (full).
-*/
-
-/*!
-    \qmlproperty bool Video::seekable
-
-    This property holds whether position of the video can be changed.
-*/
-
-/*!
-    \qmlproperty qreal Video::playbackRate
-
-    This property holds the rate at which video is played at as a multiple of the normal rate.
-*/
-
-/*!
-    \qmlproperty enum Video::error
-
-    This property holds the error state of the video.  It can be one of:
-
-    \list
-    \o NoError - there is no current error.
-    \o ResourceError - the video cannot be played due to a problem allocating resources.
-    \o FormatError - the video format is not supported.
-    \o NetworkError - the video cannot be played due to network issues.
-    \o AccessDenied - the video cannot be played due to insufficient permissions.
-    \o ServiceMissing -  the video cannot be played because the media service could not be
-    instantiated.
-    \endlist
-*/
-
-
-QmlGraphicsVideo::Error QmlGraphicsVideo::error() const
-{
-    return Error(m_error);
-}
-
-/*!
-    \qmlproperty string Video::errorString
-
-    This property holds a string describing the current error condition in more detail.
-*/
-
-/*!
-    \qmlsignal Video::onError(error, errorString)
-
-    This handler is called when an \l {Error}{error} has occurred.  The errorString parameter
-    may contain more detailed information about the error.
-*/
-
-/*!
-    \qmlproperty enum Video::fillMode
-
-    Set this property to define how the video is scaled to fit the target area.
-
-    \list
-    \o Stretch - the video is scaled to fit.
-    \o PreserveAspectFit - the video is scaled uniformly to fit without cropping
-    \o PreserveAspectCrop - the video is scaled uniformly to fill, cropping if necessary
-    \endlist
-
-    The default fill mode is PreserveAspectFit.
-*/
-
-QmlGraphicsVideo::FillMode QmlGraphicsVideo::fillMode() const
-{
-    return FillMode(m_graphicsItem->aspectRatioMode());
-}
-
-void QmlGraphicsVideo::setFillMode(FillMode mode)
-{
-    m_graphicsItem->setAspectRatioMode(Qt::AspectRatioMode(mode));
-}
-
-/*!
-    \qmlmethod Video::play()
-
-    Starts playback of the media.
-
-    Sets the \l playing property to true, and the \l paused property to false.
-*/
-
-void QmlGraphicsVideo::play()
-{
-    m_playerControl->play();
-
-    if (m_paused) {
-        m_paused = false;
-        emit pausedChanged();
-    }
-}
-
-/*!
-    \qmlmethod Video::pause()
-
-    Pauses playback of the media.
-
-    Sets the \l playing and \l paused properties to true.
-*/
-
-void QmlGraphicsVideo::pause()
-{
-    m_playerControl->pause();
-
-    if (!m_paused && m_state == QMediaPlayer::PausedState) {
-        m_paused = true;
-        emit pausedChanged();
-    }
-}
-
-/*!
-    \qmlmethod Video::stop()
-
-    Stops playback of the media.
-
-    Sets the \l playing and \l paused properties to false.
-*/
-
-void QmlGraphicsVideo::stop()
-{
-    m_playerControl->stop();
-
-    if (m_paused) {
-        m_paused = false;
-        emit pausedChanged();
-    }
-}
-
-void QmlGraphicsVideo::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
-{
-}
-
-void QmlGraphicsVideo::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
-{
-    m_graphicsItem->setSize(newGeometry.size());
-
-    QmlGraphicsItem::geometryChanged(newGeometry, oldGeometry);
-}
-
-QT_END_NAMESPACE
-
-// ***************************************
-// Documentation for meta-data properties.
-// ***************************************
-
-/*!
-    \qmlproperty variant Video::title
-
-    This property holds the tile of the media.
-
-    \sa {QtMultimedia::Title}
-*/
-
-/*!
-    \qmlproperty variant Video::subTitle
-
-    This property holds the sub-title of the media.
-
-    \sa {QtMultimedia::SubTitle}
-*/
-
-/*!
-    \qmlproperty variant Video::author
-
-    This property holds the author of the media.
-
-    \sa {QtMultimedia::Author}
-*/
-
-/*!
-    \qmlproperty variant Video::comment
-
-    This property holds a user comment about the media.
-
-    \sa {QtMultimedia::Comment}
-*/
-
-/*!
-    \qmlproperty variant Video::description
-
-    This property holds a description of the media.
-
-    \sa {QtMultimedia::Description}
-*/
-
-/*!
-    \qmlproperty variant Video::category
-
-    This property holds the category of the media
-
-    \sa {QtMultimedia::Category}
-*/
-
-/*!
-    \qmlproperty variant Video::genre
-
-    This property holds the genre of the media.
-
-    \sa {QtMultimedia::Genre}
-*/
-
-/*!
-    \qmlproperty variant Video::year
-
-    This property holds the year of release of the media.
-
-    \sa {QtMultimedia::Year}
-*/
-
-/*!
-    \qmlproperty variant Video::date
-
-    This property holds the date of the media.
-
-    \sa {QtMultimedia::Date}
-*/
-
-/*!
-    \qmlproperty variant Video::userRating
-
-    This property holds a user rating of the media in the range of 0 to 100.
-
-    \sa {QtMultimedia::UserRating}
-*/
-
-/*!
-    \qmlproperty variant Video::keywords
-
-    This property holds a list of keywords describing the media.
-
-    \sa {QtMultimedia::Keywords}
-*/
-
-/*!
-    \qmlproperty variant Video::language
-
-    This property holds the language of the media, as an ISO 639-2 code.
-
-    \sa {QtMultimedia::Language}
-*/
-
-/*!
-    \qmlproperty variant Video::publisher
-
-    This property holds the publisher of the media.
-
-    \sa {QtMultimedia::Publisher}
-*/
-
-/*!
-    \qmlproperty variant Video::copyright
-
-    This property holds the media's copyright notice.
-
-    \sa {QtMultimedia::Copyright}
-*/
-
-/*!
-    \qmlproperty variant Video::parentalRating
-
-    This property holds the parental rating of the media.
-
-    \sa {QtMultimedia::ParentalRating}
-*/
-
-/*!
-    \qmlproperty variant Video::ratingOrganisation
-
-    This property holds the name of the rating organisation responsible for the
-    parental rating of the media.
-
-    \sa {QtMultimedia::RatingOrganisation}
-*/
-
-/*!
-    \qmlproperty variant Video::size
-
-    This property property holds the size of the media in bytes.
-
-    \sa {QtMultimedia::Size}
-*/
-
-/*!
-    \qmlproperty variant Video::mediaType
-
-    This property holds the type of the media.
-
-    \sa {QtMultimedia::MediaType}
-*/
-
-/*!
-    \qmlproperty variant Video::audioBitRate
-
-    This property holds the bit rate of the media's audio stream ni bits per
-    second.
-
-    \sa {QtMultimedia::AudioBitRate}
-*/
-
-/*!
-    \qmlproperty variant Video::audioCodec
-
-    This property holds the encoding of the media audio stream.
-
-    \sa {QtMultimedia::AudioCodec}
-*/
-
-/*!
-    \qmlproperty variant Video::averageLevel
-
-    This property holds the average volume level of the media.
-
-    \sa {QtMultimedia::AverageLevel}
-*/
-
-/*!
-    \qmlproperty variant Video::channelCount
-
-    This property holds the number of channels in the media's audio stream.
-
-    \sa {QtMultimedia::ChannelCount}
-*/
-
-/*!
-    \qmlproperty variant Video::peakValue
-
-    This property holds the peak volume of media's audio stream.
-
-    \sa {QtMultimedia::PeakValue}
-*/
-
-/*!
-    \qmlproperty variant Video::sampleRate
-
-    This property holds the sample rate of the media's audio stream in hertz.
-
-    \sa {QtMultimedia::SampleRate}
-*/
-
-/*!
-    \qmlproperty variant Video::albumTitle
-
-    This property holds the title of the album the media belongs to.
-
-    \sa {QtMultimedia::AlbumTitle}
-*/
-
-/*!
-    \qmlproperty variant Video::albumArtist
-
-    This property holds the name of the principal artist of the album the media
-    belongs to.
-
-    \sa {QtMultimedia::AlbumArtist}
-*/
-
-/*!
-    \qmlproperty variant Video::contributingArtist
-
-    This property holds the names of artists contributing to the media.
-
-    \sa {QtMultimedia::ContributingArtist}
-*/
-
-/*!
-    \qmlproperty variant Video::composer
-
-    This property holds the composer of the media.
-
-    \sa {QtMultimedia::Composer}
-*/
-
-/*!
-    \qmlproperty variant Video::conductor
-
-    This property holds the conductor of the media.
-
-    \sa {QtMultimedia::Conductor}
-*/
-
-/*!
-    \qmlproperty variant Video::lyrics
-
-    This property holds the lyrics to the media.
-
-    \sa {QtMultimedia::Lyrics}
-*/
-
-/*!
-    \qmlproperty variant Video::mood
-
-    This property holds the mood of the media.
-
-    \sa {QtMultimedia::Mood}
-*/
-
-/*!
-    \qmlproperty variant Video::trackNumber
-
-    This property holds the track number of the media.
-
-    \sa {QtMultimedia::TrackNumber}
-*/
-
-/*!
-    \qmlproperty variant Video::trackCount
-
-    This property holds the number of track on the album containing the media.
-
-    \sa {QtMultimedia::TrackNumber}
-*/
-
-/*!
-    \qmlproperty variant Video::coverArtUrlSmall
-
-    This property holds the URL of a small cover art image.
-
-    \sa {QtMultimedia::CoverArtUrlSmall}
-*/
-
-/*!
-    \qmlproperty variant Video::coverArtUrlLarge
-
-    This property holds the URL of a large cover art image.
-
-    \sa {QtMultimedia::CoverArtUrlLarge}
-*/
-
-/*!
-    \qmlproperty variant Video::resolution
-
-    This property holds the dimension of an image or video.
-
-    \sa {QtMultimedia::Resolution}
-*/
-
-/*!
-    \qmlproperty variant Video::pixelAspectRatio
-
-    This property holds the pixel aspect ratio of an image or video.
-
-    \sa {QtMultimedia::PixelAspectRatio}
-*/
-
-/*!
-    \qmlproperty variant Video::videoFrameRate
-
-    This property holds the frame rate of the media's video stream.
-
-    \sa {QtMultimedia::VideoFrameRate}
-*/
-
-/*!
-    \qmlproperty variant Video::videoBitRate
-
-    This property holds the bit rate of the media's video stream in bits per
-    second.
-
-    \sa {QtMultimedia::VideoBitRate}
-*/
-
-/*!
-    \qmlproperty variant Video::videoCodec
-
-    This property holds the encoding of the media's video stream.
-
-    \sa {QtMultimedia::VideoCodec}
-*/
-
-/*!
-    \qmlproperty variant Video::posterUrl
-
-    This property holds the URL of a poster image.
-
-    \sa {QtMultimedia::PosterUrl}
-*/
-
-/*!
-    \qmlproperty variant Video::chapterNumber
-
-    This property holds the chapter number of the media.
-
-    \sa {QtMultimedia::ChapterNumber}
-*/
-
-/*!
-    \qmlproperty variant Video::director
-
-    This property holds the director of the media.
-
-    \sa {QtMultimedia::Director}
-*/
-
-/*!
-    \qmlproperty variant Video::leadPerformer
-
-    This property holds the lead performer in the media.
-
-    \sa {QtMultimedia::LeadPerformer}
-*/
-
-/*!
-    \qmlproperty variant Video::writer
-
-    This property holds the writer of the media.
-
-    \sa {QtMultimedia::Writer}
-*/
-
-// The remaining properties are related to photos, and are technically
-// available but will certainly never have values.
-#ifndef Q_QDOC
-
-/*!
-    \qmlproperty variant Video::cameraManufacturer
-
-    \sa {QtMultimedia::CameraManufacturer}
-*/
-
-/*!
-    \qmlproperty variant Video::cameraModel
-
-    \sa {QtMultimedia::CameraModel}
-*/
-
-/*!
-    \qmlproperty variant Video::event
-
-    \sa {QtMultimedia::Event}
-*/
-
-/*!
-    \qmlproperty variant Video::subject
-
-    \sa {QtMultimedia::Subject}
-*/
-
-/*!
-    \qmlproperty variant Video::orientation
-
-    \sa {QtMultimedia::Orientation}
-*/
-
-/*!
-    \qmlproperty variant Video::exposureTime
-
-    \sa {QtMultimedia::ExposureTime}
-*/
-
-/*!
-    \qmlproperty variant Video::fNumber
-
-    \sa {QtMultimedia::FNumber}
-*/
-
-/*!
-    \qmlproperty variant Video::exposureProgram
-
-    \sa {QtMultimedia::ExposureProgram}
-*/
-
-/*!
-    \qmlproperty variant Video::isoSpeedRatings
-
-    \sa {QtMultimedia::ISOSpeedRatings}
-*/
-
-/*!
-    \qmlproperty variant Video::exposureBiasValue
-
-    \sa {QtMultimedia::ExposureBiasValue}
-*/
-
-/*!
-    \qmlproperty variant Video::dateTimeDigitized
-
-    \sa {QtMultimedia::DateTimeDigitized}
-*/
-
-/*!
-    \qmlproperty variant Video::subjectDistance
-
-    \sa {QtMultimedia::SubjectDistance}
-*/
-
-/*!
-    \qmlproperty variant Video::meteringMode
-
-    \sa {QtMultimedia::MeteringMode}
-*/
-
-/*!
-    \qmlproperty variant Video::lightSource
-
-    \sa {QtMultimedia::LightSource}
-*/
-
-/*!
-    \qmlproperty variant Video::flash
-
-    \sa {QtMultimedia::Flash}
-*/
-
-/*!
-    \qmlproperty variant Video::focalLength
-
-    \sa {QtMultimedia::FocalLength}
-*/
-
-/*!
-    \qmlproperty variant Video::exposureMode
-
-    \sa {QtMultimedia::ExposureMode}
-*/
-
-/*!
-    \qmlproperty variant Video::whiteBalance
-
-    \sa {QtMultimedia::WhiteBalance}
-*/
-
-/*!
-    \qmlproperty variant Video::DigitalZoomRatio
-
-    \sa {QtMultimedia::DigitalZoomRatio}
-*/
-
-/*!
-    \qmlproperty variant Video::focalLengthIn35mmFilm
-
-    \sa {QtMultimedia::FocalLengthIn35mmFile}
-*/
-
-/*!
-    \qmlproperty variant Video::sceneCaptureType
-
-    \sa {QtMultimedia::SceneCaptureType}
-*/
-
-/*!
-    \qmlproperty variant Video::gainControl
-
-    \sa {QtMultimedia::GainControl}
-*/
-
-/*!
-    \qmlproperty variant Video::contrast
-
-    \sa {QtMultimedia::contrast}
-*/
-
-/*!
-    \qmlproperty variant Video::saturation
-
-    \sa {QtMultimedia::Saturation}
-*/
-
-/*!
-    \qmlproperty variant Video::sharpness
-
-    \sa {QtMultimedia::Sharpness}
-*/
-
-/*!
-    \qmlproperty variant Video::deviceSettingDescription
-
-    \sa {QtMultimedia::DeviceSettingDescription}
-*/
-
-#endif
-
-#include "moc_qmlgraphicsvideo_p.cpp"
diff --git a/src/multimedia/qml/qmlgraphicsvideo_p.h b/src/multimedia/qml/qmlgraphicsvideo_p.h
deleted file mode 100644
index a4f8e32..0000000
--- a/src/multimedia/qml/qmlgraphicsvideo_p.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLGRAPHICSVIDEO_H
-#define QMLGRAPHICSVIDEO_H
-
-#include <QtMultimedia/private/qmlmediabase_p.h>
-
-#include <QtMultimedia/qgraphicsvideoitem.h>
-
-#include <QtCore/qbasictimer.h>
-#include <QtDeclarative/qmlgraphicsitem.h>
-
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QTimerEvent;
-class QVideoSurfaceFormat;
-
-
-class Q_AUTOTEST_EXPORT QmlGraphicsVideo : public QmlGraphicsItem, public QmlMediaBase
-{
-    Q_OBJECT
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(bool playing READ isPlaying WRITE setPlaying NOTIFY playingChanged)
-    Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-    Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
-    Q_PROPERTY(int position READ position WRITE setPosition NOTIFY positionChanged)
-    Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
-    Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
-    Q_PROPERTY(bool hasAudio READ hasAudio NOTIFY hasAudioChanged)
-    Q_PROPERTY(bool hasVideo READ hasVideo NOTIFY hasVideoChanged)
-    Q_PROPERTY(int bufferProgress READ bufferProgress NOTIFY bufferProgressChanged)
-    Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
-    Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged)
-    Q_PROPERTY(Error error READ error NOTIFY errorChanged)
-    Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
-    Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode)
-    Q_ENUMS(FillMode)
-    Q_ENUMS(Status)
-    Q_ENUMS(Error)
-public:
-    enum FillMode
-    {
-        Stretch            = Qt::IgnoreAspectRatio,
-        PreserveAspectFit  = Qt::KeepAspectRatio,
-        PreserveAspectCrop = Qt::KeepAspectRatioByExpanding
-    };
-
-    enum Status
-    {
-        UnknownStatus = QMediaPlayer::UnknownMediaStatus,
-        NoMedia       = QMediaPlayer::NoMedia,
-        Loading       = QMediaPlayer::LoadingMedia,
-        Loaded        = QMediaPlayer::LoadedMedia,
-        Stalled       = QMediaPlayer::StalledMedia,
-        Buffering     = QMediaPlayer::BufferingMedia,
-        Buffered      = QMediaPlayer::BufferedMedia,
-        EndOfMedia    = QMediaPlayer::EndOfMedia,
-        InvalidMedia  = QMediaPlayer::InvalidMedia
-    };
-
-    enum Error
-    {
-        NoError        = QMediaPlayer::NoError,
-        ResourceError  = QMediaPlayer::ResourceError,
-        FormatError    = QMediaPlayer::FormatError,
-        NetworkError   = QMediaPlayer::NetworkError,
-        AccessDenied   = QMediaPlayer::AccessDeniedError,
-        ServiceMissing = QMediaPlayer::ServiceMissingError
-    };
-
-    QmlGraphicsVideo(QmlGraphicsItem *parent = 0);
-    ~QmlGraphicsVideo();
-
-    bool hasAudio() const;
-    bool hasVideo() const;
-
-    FillMode fillMode() const;
-    void setFillMode(FillMode mode);
-
-    Status status() const;
-    Error error() const;
-
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-
-public Q_SLOTS:
-    void play();
-    void pause();
-    void stop();
-
-Q_SIGNALS:
-    void sourceChanged();
-
-    void playingChanged();
-    void pausedChanged();
-
-    void started();
-    void resumed();
-    void paused();
-    void stopped();
-
-    void statusChanged();
-
-    void loaded();
-    void buffering();
-    void stalled();
-    void buffered();
-    void endOfMedia();
-
-    void durationChanged();
-    void positionChanged();
-
-    void volumeChanged();
-    void mutedChanged();
-    void hasAudioChanged();
-    void hasVideoChanged();
-
-    void bufferProgressChanged();
-
-    void seekableChanged();
-    void playbackRateChanged();
-
-    void errorChanged();
-    void error(QmlGraphicsVideo::Error error, const QString &errorString);
-
-protected:
-    void geometryChanged(const QRectF &geometry, const QRectF &);
-
-private Q_SLOTS:
-    void _q_nativeSizeChanged(const QSizeF &size);
-    void _q_error(int, const QString &);
-
-private:
-    Q_DISABLE_COPY(QmlGraphicsVideo)
-
-    QGraphicsVideoItem *m_graphicsItem;
-
-    Q_PRIVATE_SLOT(mediaBase(), void _q_stateChanged(QMediaPlayer::State))
-    Q_PRIVATE_SLOT(mediaBase(), void _q_mediaStatusChanged(QMediaPlayer::MediaStatus))
-    Q_PRIVATE_SLOT(mediaBase(), void _q_metaDataChanged())
-
-    inline QmlMediaBase *mediaBase() { return this; }
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QmlGraphicsVideo))
-
-QT_END_HEADER
-
-#endif
diff --git a/src/multimedia/qml/qmlmediabase.cpp b/src/multimedia/qml/qmlmediabase.cpp
deleted file mode 100644
index 11b4337..0000000
--- a/src/multimedia/qml/qmlmediabase.cpp
+++ /dev/null
@@ -1,413 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "QtMultimedia/private/qmlmediabase_p.h"
-
-#include <QtCore/qcoreevent.h>
-#include <QtCore/qurl.h>
-
-#include <QtMultimedia/qmediaplayercontrol.h>
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/qmediaserviceprovider.h>
-#include <QtMultimedia/qmetadatacontrol.h>
-#include <QtMultimedia/private/qmetadatacontrolmetaobject_p.h>
-
-
-
-QT_BEGIN_NAMESPACE
-
-
-class QmlMediaBaseObject : public QMediaObject
-{
-public:
-    QmlMediaBaseObject(QMediaService *service)
-        : QMediaObject(0, service)
-    {
-    }
-};
-
-class QmlMediaBasePlayerControl : public QMediaPlayerControl
-{
-public:
-    QmlMediaBasePlayerControl(QObject *parent)
-        : QMediaPlayerControl(parent)
-    {
-    }
-
-    QMediaPlayer::State state() const { return QMediaPlayer::StoppedState; }
-    QMediaPlayer::MediaStatus mediaStatus() const { return QMediaPlayer::NoMedia; }
-
-    qint64 duration() const { return 0; }
-    qint64 position() const { return 0; }
-    void setPosition(qint64) {}
-    int volume() const { return 0; }
-    void setVolume(int) {}
-    bool isMuted() const { return false; }
-    void setMuted(bool) {}
-    int bufferStatus() const { return 0; }
-    bool isAudioAvailable() const { return false; }
-    bool isVideoAvailable() const { return false; }
-    bool isSeekable() const { return false; }
-    QMediaTimeRange availablePlaybackRanges() const { return QMediaTimeRange(); }
-    qreal playbackRate() const { return 1; }
-    void setPlaybackRate(qreal) {}
-    QMediaContent media() const { return QMediaContent(); }
-    const QIODevice *mediaStream() const { return 0; }
-    void setMedia(const QMediaContent &, QIODevice *) {}
-
-    void play() {}
-    void pause() {}
-    void stop() {}
-};
-
-class QmlMediaBaseAnimation : public QObject
-{
-public:
-    QmlMediaBaseAnimation(QmlMediaBase *media)
-        : m_media(media)
-    {
-    }
-
-    void start() { if (!m_timer.isActive()) m_timer.start(500, this); }
-    void stop() { m_timer.stop(); }
-
-protected:
-    void timerEvent(QTimerEvent *event)
-    {
-        if (event->timerId() == m_timer.timerId()) {
-            event->accept();
-
-            if (m_media->m_state == QMediaPlayer::PlayingState)
-                emit m_media->positionChanged();
-            if (m_media->m_status == QMediaPlayer::BufferingMedia || QMediaPlayer::StalledMedia)
-                emit m_media->bufferProgressChanged();
-        } else {
-            QObject::timerEvent(event);
-        }
-    }
-
-private:
-    QmlMediaBase *m_media;
-    QBasicTimer m_timer;
-};
-
-void QmlMediaBase::_q_stateChanged(QMediaPlayer::State state)
-{
-    if (state != m_state) {
-        QMediaPlayer::State oldState = m_state;
-
-        m_state = state;
-
-        if (state == QMediaPlayer::StoppedState) {
-            emit stopped();
-            emit playingChanged();
-        } else if (oldState == QMediaPlayer::StoppedState) {
-            emit started();
-            emit playingChanged();
-        } else if (oldState  == QMediaPlayer::PausedState) {
-            m_paused = false;
-
-            emit resumed();
-            emit pausedChanged();
-        }
-
-        if (state == m_state && state == QMediaPlayer::PausedState) {
-            bool wasPaused = m_paused;
-
-            m_paused = true;
-
-            emit paused();
-
-            if (!wasPaused)
-                emit pausedChanged();
-        }
-
-        if (m_state == QMediaPlayer::PlayingState
-                || m_status == QMediaPlayer::BufferingMedia
-                || m_status == QMediaPlayer::StalledMedia) {
-            m_animation->start();
-        } else {
-            m_animation->stop();
-        }
-    }
-}
-
-void QmlMediaBase::_q_mediaStatusChanged(QMediaPlayer::MediaStatus status)
-{
-    if (status != m_status) {
-        m_status = status;
-
-        switch (status) {
-        case QMediaPlayer::LoadedMedia:
-            emit loaded();
-            break;
-        case QMediaPlayer::BufferingMedia:
-            emit buffering();
-            break;
-        case QMediaPlayer::BufferedMedia:
-            emit buffered();
-            break;
-        case QMediaPlayer::StalledMedia:
-            emit stalled();
-            break;
-        case QMediaPlayer::EndOfMedia:
-            emit endOfMedia();
-            break;
-        default:
-            break;
-        }
-
-        emit statusChanged();
-
-        if (m_state == QMediaPlayer::PlayingState
-                || m_status == QMediaPlayer::BufferingMedia
-                || m_status == QMediaPlayer::StalledMedia) {
-            m_animation->start();
-        } else {
-            m_animation->stop();
-        }
-    }
-}
-
-void QmlMediaBase::_q_metaDataChanged()
-{
-    m_metaObject->metaDataChanged();
-}
-
-QmlMediaBase::QmlMediaBase()
-    : m_mediaService(0)
-    , m_playerControl(0)
-    , m_mediaObject(0)
-    , m_mediaProvider(0)
-    , m_metaDataControl(0)
-    , m_metaObject(0)
-    , m_animation(0)
-    , m_state(QMediaPlayer::StoppedState)
-    , m_status(QMediaPlayer::NoMedia)
-    , m_error(QMediaPlayer::NoError)
-    , m_paused(false)
-{
-}
-
-QmlMediaBase::~QmlMediaBase()
-{
-}
-
-void QmlMediaBase::shutdown()
-{
-    delete m_metaObject;
-    delete m_mediaObject;
-
-    if (m_mediaProvider)
-        m_mediaProvider->releaseService(m_mediaService);
-
-    delete m_animation;
-
-}
-
-void QmlMediaBase::setObject(QObject *object)
-{
-    if ((m_mediaProvider = QMediaServiceProvider::defaultServiceProvider())) {
-        if ((m_mediaService = m_mediaProvider->requestService(Q_MEDIASERVICE_MEDIAPLAYER))) {
-            m_playerControl = qobject_cast<QMediaPlayerControl *>(
-                    m_mediaService->control(QMediaPlayerControl_iid));
-            m_metaDataControl = qobject_cast<QMetaDataControl *>(
-                    m_mediaService->control(QMetaDataControl_iid));
-            m_mediaObject = new QmlMediaBaseObject(m_mediaService);
-        }
-    }
-
-    if (m_playerControl) {
-        QObject::connect(m_playerControl, SIGNAL(stateChanged(QMediaPlayer::State)),
-                object, SLOT(_q_stateChanged(QMediaPlayer::State)));
-        QObject::connect(m_playerControl, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)),
-                object, SLOT(_q_mediaStatusChanged(QMediaPlayer::MediaStatus)));
-        QObject::connect(m_playerControl, SIGNAL(mediaChanged(QMediaContent)),
-                object, SIGNAL(sourceChanged()));
-        QObject::connect(m_playerControl, SIGNAL(durationChanged(qint64)),
-                object, SIGNAL(durationChanged()));
-        QObject::connect(m_playerControl, SIGNAL(positionChanged(qint64)),
-                object, SIGNAL(positionChanged()));
-        QObject::connect(m_playerControl, SIGNAL(volumeChanged(int)),
-                object, SIGNAL(volumeChanged()));
-        QObject::connect(m_playerControl, SIGNAL(mutedChanged(bool)),
-                object, SIGNAL(mutedChanged()));
-        QObject::connect(m_playerControl, SIGNAL(bufferStatusChanged(int)),
-                object, SIGNAL(bufferProgressChanged()));
-        QObject::connect(m_playerControl, SIGNAL(seekableChanged(bool)),
-                object, SIGNAL(seekableChanged()));
-        QObject::connect(m_playerControl, SIGNAL(playbackRateChanged(qreal)),
-                object, SIGNAL(playbackRateChanged()));
-        QObject::connect(m_playerControl, SIGNAL(error(int,QString)),
-                object, SLOT(_q_error(int,QString)));
-
-        m_animation = new QmlMediaBaseAnimation(this);
-    } else {
-        m_error = QMediaPlayer::ServiceMissingError;
-
-        m_playerControl = new QmlMediaBasePlayerControl(object);
-    }
-
-    if (m_metaDataControl) {
-        m_metaObject = new QMetaDataControlMetaObject(m_metaDataControl, object);
-
-        QObject::connect(m_metaDataControl, SIGNAL(metaDataChanged()),
-                object, SLOT(_q_metaDataChanged()));
-    }
-}
-
-QUrl QmlMediaBase::source() const
-{
-    return m_playerControl->media().canonicalUrl();
-}
-
-void QmlMediaBase::setSource(const QUrl &url)
-{
-    if (m_error != QMediaPlayer::ServiceMissingError && m_error != QMediaPlayer::NoError) {
-        m_error = QMediaPlayer::NoError;
-        m_errorString = QString();
-
-        emit errorChanged();
-    }
-
-    m_playerControl->setMedia(QMediaContent(url), 0);
-}
-
-bool QmlMediaBase::isPlaying() const
-{
-    return m_state != QMediaPlayer::StoppedState;
-}
-
-void QmlMediaBase::setPlaying(bool playing)
-{
-    if (playing && m_state == QMediaPlayer::StoppedState) {
-        if (m_paused)
-            m_playerControl->pause();
-        else
-            m_playerControl->play();
-    } else if (!playing) {
-        m_playerControl->stop();
-    }
-}
-
-bool QmlMediaBase::isPaused() const
-{
-    return m_paused;
-}
-
-void QmlMediaBase::setPaused(bool paused)
-{
-    if (m_paused != paused) {
-        if (paused && m_state == QMediaPlayer::PlayingState) {
-            m_playerControl->pause();
-        } else if (!paused && m_state == QMediaPlayer::PausedState) {
-            m_playerControl->play();
-        } else {
-            m_paused = paused;
-
-            emit pausedChanged();
-        }
-    }
-}
-
-int QmlMediaBase::duration() const
-{
-    return m_playerControl->duration();
-}
-
-int QmlMediaBase::position() const
-{
-    return m_playerControl->position();
-
-}
-
-void QmlMediaBase::setPosition(int position)
-{
-    m_playerControl->setPosition(position);
-}
-
-qreal QmlMediaBase::volume() const
-{
-    return qreal(m_playerControl->volume()) / 100;
-}
-
-void QmlMediaBase::setVolume(qreal volume)
-{
-    m_playerControl->setVolume(qRound(volume * 100));
-}
-
-bool QmlMediaBase::isMuted() const
-{
-    return m_playerControl->isMuted();
-}
-
-void QmlMediaBase::setMuted(bool muted)
-{
-    m_playerControl->setMuted(muted);
-}
-
-qreal QmlMediaBase::bufferProgress() const
-{
-    return qreal(m_playerControl->bufferStatus()) / 100;
-}
-
-bool QmlMediaBase::isSeekable() const
-{
-    return m_playerControl->isSeekable();
-}
-
-qreal QmlMediaBase::playbackRate() const
-{
-    return m_playerControl->playbackRate();
-}
-
-void QmlMediaBase::setPlaybackRate(qreal rate)
-{
-    m_playerControl->setPlaybackRate(rate);
-}
-
-QString QmlMediaBase::errorString() const
-{
-    return m_errorString;
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/multimedia/qml/qmlmediabase_p.h b/src/multimedia/qml/qmlmediabase_p.h
deleted file mode 100644
index 948a0e8..0000000
--- a/src/multimedia/qml/qmlmediabase_p.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLMEDIABASE_P_H
-#define QMLMEDIABASE_P_H
-
-
-#include <QtCore/qbasictimer.h>
-#include <QtMultimedia/qmediaplayer.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QMediaPlayerControl;
-class QMediaService;
-class QMediaServiceProvider;
-class QMetaDataControl;
-class QMetaDataControlMetaObject;
-class QmlMediaBaseAnimation;
-
-class Q_AUTOTEST_EXPORT QmlMediaBase
-{
-public:
-    QmlMediaBase();
-    virtual ~QmlMediaBase();
-
-    QUrl source() const;
-    void setSource(const QUrl &url);
-
-    bool isPlaying() const;
-    void setPlaying(bool playing);
-
-    bool isPaused() const;
-    void setPaused(bool paused);
-
-    int duration() const;
-
-    int position() const;
-    void setPosition(int position);
-
-    qreal volume() const;
-    void setVolume(qreal volume);
-
-    bool isMuted() const;
-    void setMuted(bool muted);
-
-    qreal bufferProgress() const;
-
-    bool isSeekable() const;
-
-    qreal playbackRate() const;
-    void setPlaybackRate(qreal rate);
-
-    QString errorString() const;
-
-    void _q_stateChanged(QMediaPlayer::State state);
-    void _q_mediaStatusChanged(QMediaPlayer::MediaStatus status);
-
-    void _q_metaDataChanged();
-
-protected:
-    void shutdown();
-
-    void setObject(QObject *object);
-
-    virtual void sourceChanged() = 0;
-
-    virtual void playingChanged() = 0;
-    virtual void pausedChanged() = 0;
-
-    virtual void started() = 0;
-    virtual void resumed() = 0;
-    virtual void paused() = 0;
-    virtual void stopped() = 0;
-
-    virtual void statusChanged() = 0;
-
-    virtual void loaded() = 0;
-    virtual void buffering() = 0;
-    virtual void stalled() = 0;
-    virtual void buffered() = 0;
-    virtual void endOfMedia() = 0;
-
-    virtual void durationChanged() = 0;
-    virtual void positionChanged() = 0;
-
-    virtual void volumeChanged() = 0;
-    virtual void mutedChanged() = 0;
-
-    virtual void bufferProgressChanged() = 0;
-
-    virtual void seekableChanged() = 0;
-    virtual void playbackRateChanged() = 0;
-
-    virtual void errorChanged() = 0;
-
-    QMediaService *m_mediaService;
-    QMediaPlayerControl *m_playerControl;
-
-    QMediaObject *m_mediaObject;
-    QMediaServiceProvider *m_mediaProvider;
-    QMetaDataControl *m_metaDataControl;
-    QMetaDataControlMetaObject *m_metaObject;
-    QmlMediaBaseAnimation *m_animation;
-
-    QMediaPlayer::State m_state;
-    QMediaPlayer::MediaStatus m_status;
-    QMediaPlayer::Error m_error;
-    bool m_paused;
-    QString m_errorString;
-
-    friend class QmlMediaBaseAnimation;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/multimedia/qml/qsoundeffect_p.h b/src/multimedia/qml/qsoundeffect_p.h
index 4b440ec..51ebe52 100644
--- a/src/multimedia/qml/qsoundeffect_p.h
+++ b/src/multimedia/qml/qsoundeffect_p.h
@@ -56,7 +56,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
-#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qdeclarative.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index dc2266b..be861a4 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -12,6 +12,6 @@ embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
 symbian:SUBDIRS += s60
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon
 contains(QT_CONFIG, multimedia): SUBDIRS *= audio mediaservices
-contains(QT_CONFIG, declarative): SUBDIRS *= qmlmodules
+contains(QT_CONFIG, declarative): SUBDIRS *= qdeclarativemodules
 
 
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
new file mode 100644
index 0000000..1158c88
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QtMultimedia/qdeclarative.h>
+
+QT_BEGIN_NAMESPACE
+
+class QMultimediaQmlModule : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    virtual void initialize(QDeclarativeEngine *engine, const char *uri)
+    {
+        QtMultimedia::qRegisterQmlElements(engine, uri);
+    }
+};
+
+QT_END_NAMESPACE
+
+#include "multimedia.moc"
+
+Q_EXPORT_PLUGIN2(qmultimediaqmlmodule, QT_PREPEND_NAMESPACE(QMultimediaQmlModule));
+
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.pro b/src/plugins/qdeclarativemodules/multimedia/multimedia.pro
new file mode 100644
index 0000000..21382c5
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.pro
@@ -0,0 +1,11 @@
+TARGET  = multimedia
+include(../../qpluginbase.pri)
+
+QT += multimedia declarative
+
+SOURCES += multimedia.cpp
+
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qdeclarativemodules
+target.path = $$[QT_INSTALL_PLUGINS]/plugins/qdeclarativemodules
+INSTALLS += target
+
diff --git a/src/plugins/qdeclarativemodules/qdeclarativemodules.pro b/src/plugins/qdeclarativemodules/qdeclarativemodules.pro
new file mode 100644
index 0000000..0a6f444
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/qdeclarativemodules.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+
+SUBDIRS += widgets
+
+contains(QT_CONFIG, multimedia): SUBDIRS += multimedia
+
diff --git a/src/plugins/qdeclarativemodules/widgets/graphicslayouts.cpp b/src/plugins/qdeclarativemodules/widgets/graphicslayouts.cpp
new file mode 100644
index 0000000..fc15ad2
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/widgets/graphicslayouts.cpp
@@ -0,0 +1,260 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "graphicslayouts_p.h"
+
+#include <QtGui/qgraphicswidget.h>
+#include <QtCore/qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
+: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter)
+{
+}
+
+void LinearLayoutAttached::setStretchFactor(int f)
+{
+    if (_stretch == f)
+        return;
+
+    _stretch = f;
+    emit stretchChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _stretch);
+}
+
+void LinearLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
+}
+
+QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+Q_UNUSED(which);
+Q_UNUSED(constraint);
+return QSizeF();
+}
+
+
+QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
+{
+}
+
+void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
+{
+insertItem(index, item);
+
+//connect attached properties
+if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
+    setStretchFactor(item, obj->stretchFactor());
+    setAlignment(item, obj->alignment());
+    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
+                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
+    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
+                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
+    //### need to disconnect when widget is removed?
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsLinearLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
+{
+QGraphicsLinearLayout::setStretchFactor(item, stretch);
+}
+
+void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+QGraphicsLinearLayout::setAlignment(item, alignment);
+}
+
+QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> QGraphicsLinearLayoutObject::attachedProperties;
+LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast<QGraphicsLayoutItem*>(obj))
+    return 0;
+LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
+attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
+return rv;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+// QGraphicsGridLayout-related classes
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+GridLayoutAttached::GridLayoutAttached(QObject *parent)
+: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1)
+{
+}
+
+void GridLayoutAttached::setRow(int r)
+{
+    if (_row == r)
+        return;
+
+    _row = r;
+    //emit rowChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _row);
+}
+
+void GridLayoutAttached::setColumn(int c)
+{
+    if (_column == c)
+        return;
+
+    _column = c;
+    //emit columnChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _column);
+}
+
+void GridLayoutAttached::setRowSpan(int rs)
+{
+    if (_rowspan == rs)
+        return;
+
+    _rowspan = rs;
+    //emit rowSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _rowSpan);
+}
+
+void GridLayoutAttached::setColumnSpan(int cs)
+{
+    if (_colspan == cs)
+        return;
+
+    _colspan = cs;
+    //emit columnSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _columnSpan);
+}
+
+void GridLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    //emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
+}
+
+QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
+{
+}
+
+void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
+{
+//use attached properties
+if (QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(wid))) {
+    int row = static_cast<GridLayoutAttached *>(obj)->row();
+    int column = static_cast<GridLayoutAttached *>(obj)->column();
+    int rowSpan = static_cast<GridLayoutAttached *>(obj)->rowSpan();
+    int columnSpan = static_cast<GridLayoutAttached *>(obj)->columnSpan();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    addItem(wid, row, column, rowSpan, columnSpan);
+}
+}
+
+void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
+{
+//use attached properties
+if (GridLayoutAttached *obj = attachedProperties.value(item)) {
+    int row = obj->row();
+    int column = obj->column();
+    int rowSpan = obj->rowSpan();
+    int columnSpan = obj->columnSpan();
+    Qt::Alignment alignment = obj->alignment();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    addItem(item, row, column, rowSpan, columnSpan);
+    if (alignment != -1)
+        setAlignment(item,alignment);
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsGridLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+qreal QGraphicsGridLayoutObject::spacing() const
+{
+if (verticalSpacing() == horizontalSpacing())
+    return verticalSpacing();
+return -1;  //###
+}
+
+QHash<QGraphicsLayoutItem*, GridLayoutAttached*> QGraphicsGridLayoutObject::attachedProperties;
+GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast<QGraphicsLayoutItem*>(obj))
+    return 0;
+GridLayoutAttached *rv = new GridLayoutAttached(obj);
+attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
+return rv;
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/qdeclarativemodules/widgets/graphicslayouts_p.h b/src/plugins/qdeclarativemodules/widgets/graphicslayouts_p.h
new file mode 100644
index 0000000..f9b9ae8
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/widgets/graphicslayouts_p.h
@@ -0,0 +1,226 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GRAPHICSLAYOUTS_H
+#define GRAPHICSLAYOUTS_H
+
+#include "graphicswidgets_p.h"
+
+#include <QtGui/QGraphicsLinearLayout>
+#include <QtGui/QGraphicsGridLayout>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayoutItem)
+public:
+    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
+
+    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
+};
+
+class LinearLayoutAttached;
+class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
+    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsLinearLayoutObject(QObject * = 0);
+    ~QGraphicsLinearLayoutObject();
+
+    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
+
+    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
+
+private Q_SLOTS:
+    void updateStretch(QGraphicsLayoutItem*,int);
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class LinearLayoutAttached;
+    void clearChildren();
+    void insertLayoutItem(int, QGraphicsLayoutItem *);
+    static QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> attachedProperties;
+
+    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
+        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
+    }
+
+    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
+        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
+        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
+        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
+    }
+};
+
+class GridLayoutAttached;
+class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
+    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsGridLayoutObject(QObject * = 0);
+    ~QGraphicsGridLayoutObject();
+
+    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
+
+    qreal spacing() const;
+
+    static GridLayoutAttached *qmlAttachedProperties(QObject *);
+
+private:
+    friend class GraphicsLayoutAttached;
+    void addWidget(QGraphicsWidget *);
+    void clearChildren();
+    void addLayoutItem(QGraphicsLayoutItem *);
+    static QHash<QGraphicsLayoutItem*, GridLayoutAttached*> attachedProperties;
+
+    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
+        static_cast<QGraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
+    }
+
+    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
+        static_cast<QGraphicsGridLayoutObject*>(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
+        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
+        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->itemAt(index);
+    }
+};
+
+class LinearLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
+public:
+    LinearLayoutAttached(QObject *parent);
+
+    int stretchFactor() const { return _stretch; }
+    void setStretchFactor(int f);
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+
+Q_SIGNALS:
+    void stretchChanged(QGraphicsLayoutItem*,int);
+    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    int _stretch;
+    Qt::Alignment _alignment;
+};
+
+class GridLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int row READ row WRITE setRow)
+    Q_PROPERTY(int column READ column WRITE setColumn)
+    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
+    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
+public:
+    GridLayoutAttached(QObject *parent);
+
+    int row() const { return _row; }
+    void setRow(int r);
+
+    int column() const { return _column; }
+    void setColumn(int c);
+
+    int rowSpan() const { return _rowspan; }
+    void setRowSpan(int rs);
+
+    int columnSpan() const { return _colspan; }
+    void setColumnSpan(int cs);
+
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+
+private:
+    int _row;
+    int _column;
+    int _rowspan;
+    int _colspan;
+    Qt::Alignment _alignment;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
+QML_DECLARE_INTERFACE(QGraphicsLayout)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif // GRAPHICSLAYOUTS_H
diff --git a/src/plugins/qdeclarativemodules/widgets/graphicswidgets.cpp b/src/plugins/qdeclarativemodules/widgets/graphicswidgets.cpp
new file mode 100644
index 0000000..062e516
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/widgets/graphicswidgets.cpp
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
diff --git a/src/plugins/qdeclarativemodules/widgets/graphicswidgets_p.h b/src/plugins/qdeclarativemodules/widgets/graphicswidgets_p.h
new file mode 100644
index 0000000..2c2b707
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/widgets/graphicswidgets_p.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GRAPHICSWIDGETS_H
+#define GRAPHICSWIDGETS_H
+
+#include <qdeclarative.h>
+
+#include <QtGui/QGraphicsScene>
+#include <QtGui/QGraphicsView>
+#include <QtGui/QGraphicsWidget>
+#include <QtGui/QGraphicsItem>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QGraphicsView)
+QML_DECLARE_TYPE_HASMETATYPE(QGraphicsScene)
+QML_DECLARE_TYPE(QGraphicsWidget)
+QML_DECLARE_TYPE(QGraphicsObject)
+QML_DECLARE_INTERFACE_HASMETATYPE(QGraphicsItem)
+
+QT_END_HEADER
+
+#endif // GRAPHICSWIDGETS_H
diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.cpp b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
new file mode 100644
index 0000000..a0a2597
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
@@ -0,0 +1,146 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+
+#include "graphicslayouts_p.h"
+#include "graphicswidgets_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QGraphicsViewDeclarativeUI : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QGraphicsScene *scene READ scene WRITE setScene)
+    Q_CLASSINFO("DefaultProperty", "scene")
+public:
+    QGraphicsViewDeclarativeUI(QObject *other) : QObject(other) {}
+
+    QGraphicsScene *scene() const { return static_cast<QGraphicsView *>(parent())->scene(); }
+    void setScene(QGraphicsScene *scene)
+    {
+        static_cast<QGraphicsView *>(parent())->setScene(scene);
+    }
+};
+
+class QGraphicsSceneDeclarativeUI : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QDeclarativeListProperty<QObject> children READ children)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsSceneDeclarativeUI(QObject *other) : QObject(other) {}
+
+    QDeclarativeListProperty<QObject> children() { return QDeclarativeListProperty<QObject>(this->parent(), 0, children_append); }
+
+private:
+    static void children_append(QDeclarativeListProperty<QObject> *prop, QObject *o) {
+        if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o))
+            static_cast<QGraphicsScene *>(prop->object)->addItem(go);
+    }
+};
+
+class QGraphicsWidgetDeclarativeUI : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QDeclarativeListProperty<QGraphicsItem> children READ children)
+    Q_PROPERTY(QGraphicsLayout *layout READ layout WRITE setLayout)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsWidgetDeclarativeUI(QObject *other) : QObject(other) {}
+
+    QDeclarativeListProperty<QGraphicsItem> children() { return QDeclarativeListProperty<QGraphicsItem>(this, 0, children_append); }
+
+    QGraphicsLayout *layout() const { return static_cast<QGraphicsWidget *>(parent())->layout(); }
+    void setLayout(QGraphicsLayout *lo)
+    {
+        static_cast<QGraphicsWidget *>(parent())->setLayout(lo);
+    }
+
+private:
+    void setItemParent(QGraphicsItem *wid)
+    {
+        wid->setParentItem(static_cast<QGraphicsWidget *>(parent()));
+    }
+
+    static void children_append(QDeclarativeListProperty<QGraphicsItem> *prop, QGraphicsItem *i) {
+        static_cast<QGraphicsWidgetDeclarativeUI*>(prop->object)->setItemParent(i);
+    }
+};
+
+class QWidgetsQmlModule : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    QStringList keys() const
+    {
+        return QStringList() << QLatin1String("Qt.widgets");
+    }
+
+    virtual void initialize(QDeclarativeEngine *engine, const char *uri)
+    {
+        Q_UNUSED(uri);
+        Q_UNUSED(engine);
+
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.widgets"));
+
+        QML_REGISTER_INTERFACE(QGraphicsLayoutItem);
+        QML_REGISTER_INTERFACE(QGraphicsLayout);
+        QML_REGISTER_TYPE(Qt,4,6,QGraphicsLinearLayoutStretchItem,QGraphicsLinearLayoutStretchItemObject);
+        QML_REGISTER_TYPE(Qt,4,6,QGraphicsLinearLayout,QGraphicsLinearLayoutObject);
+        QML_REGISTER_TYPE(Qt,4,6,QGraphicsGridLayout,QGraphicsGridLayoutObject);
+        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI);
+        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI);
+        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI);
+        QML_REGISTER_INTERFACE(QGraphicsItem);
+    }
+};
+
+QT_END_NAMESPACE
+
+#include "widgets.moc"
+
+Q_EXPORT_PLUGIN2(qtwidgetsqmlmodule, QT_PREPEND_NAMESPACE(QWidgetsQmlModule));
+
diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.pro b/src/plugins/qdeclarativemodules/widgets/widgets.pro
new file mode 100644
index 0000000..03c4bf1
--- /dev/null
+++ b/src/plugins/qdeclarativemodules/widgets/widgets.pro
@@ -0,0 +1,15 @@
+TARGET  = widgets
+include(../../qpluginbase.pri)
+
+QT += declarative
+
+SOURCES += \
+    graphicslayouts.cpp \
+    widgets.cpp
+
+HEADERS += \
+    graphicswidgets_p.h \
+    graphicslayouts_p.h
+
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qdeclarativemodules
+target.path = $$[QT_INSTALL_PLUGINS]/plugins/qdeclarativemodules
diff --git a/src/plugins/qmlmodules/multimedia/multimedia.cpp b/src/plugins/qmlmodules/multimedia/multimedia.cpp
deleted file mode 100644
index 0ebdfd9..0000000
--- a/src/plugins/qmlmodules/multimedia/multimedia.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtDeclarative/qmlextensionplugin.h>
-#include <QtDeclarative/qml.h>
-#include <QtMultimedia/qml.h>
-
-QT_BEGIN_NAMESPACE
-
-class QMultimediaQmlModule : public QmlExtensionPlugin
-{
-    Q_OBJECT
-public:
-    virtual void initialize(QmlEngine *engine, const char *uri)
-    {
-        QtMultimedia::qRegisterQmlElements(engine, uri);
-    }
-};
-
-QT_END_NAMESPACE
-
-#include "multimedia.moc"
-
-Q_EXPORT_PLUGIN2(qmultimediaqmlmodule, QT_PREPEND_NAMESPACE(QMultimediaQmlModule));
-
diff --git a/src/plugins/qmlmodules/multimedia/multimedia.pro b/src/plugins/qmlmodules/multimedia/multimedia.pro
deleted file mode 100644
index f04cc14..0000000
--- a/src/plugins/qmlmodules/multimedia/multimedia.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET  = multimedia
-include(../../qpluginbase.pri)
-
-QT += multimedia declarative
-
-SOURCES += multimedia.cpp
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmlmodules
-target.path = $$[QT_INSTALL_PLUGINS]/plugins/qmlmodules
-INSTALLS += target
-
diff --git a/src/plugins/qmlmodules/qmlmodules.pro b/src/plugins/qmlmodules/qmlmodules.pro
deleted file mode 100644
index 0a6f444..0000000
--- a/src/plugins/qmlmodules/qmlmodules.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += widgets
-
-contains(QT_CONFIG, multimedia): SUBDIRS += multimedia
-
diff --git a/src/plugins/qmlmodules/widgets/graphicslayouts.cpp b/src/plugins/qmlmodules/widgets/graphicslayouts.cpp
deleted file mode 100644
index fc15ad2..0000000
--- a/src/plugins/qmlmodules/widgets/graphicslayouts.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "graphicslayouts_p.h"
-
-#include <QtGui/qgraphicswidget.h>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
-: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter)
-{
-}
-
-void LinearLayoutAttached::setStretchFactor(int f)
-{
-    if (_stretch == f)
-        return;
-
-    _stretch = f;
-    emit stretchChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _stretch);
-}
-
-void LinearLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
-}
-
-QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
-Q_UNUSED(which);
-Q_UNUSED(constraint);
-return QSizeF();
-}
-
-
-QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
-{
-}
-
-void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
-{
-insertItem(index, item);
-
-//connect attached properties
-if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
-    setStretchFactor(item, obj->stretchFactor());
-    setAlignment(item, obj->alignment());
-    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
-                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
-    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-    //### need to disconnect when widget is removed?
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsLinearLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
-{
-QGraphicsLinearLayout::setStretchFactor(item, stretch);
-}
-
-void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-QGraphicsLinearLayout::setAlignment(item, alignment);
-}
-
-QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> QGraphicsLinearLayoutObject::attachedProperties;
-LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast<QGraphicsLayoutItem*>(obj))
-    return 0;
-LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
-attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
-return rv;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-// QGraphicsGridLayout-related classes
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-GridLayoutAttached::GridLayoutAttached(QObject *parent)
-: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1)
-{
-}
-
-void GridLayoutAttached::setRow(int r)
-{
-    if (_row == r)
-        return;
-
-    _row = r;
-    //emit rowChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _row);
-}
-
-void GridLayoutAttached::setColumn(int c)
-{
-    if (_column == c)
-        return;
-
-    _column = c;
-    //emit columnChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _column);
-}
-
-void GridLayoutAttached::setRowSpan(int rs)
-{
-    if (_rowspan == rs)
-        return;
-
-    _rowspan = rs;
-    //emit rowSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _rowSpan);
-}
-
-void GridLayoutAttached::setColumnSpan(int cs)
-{
-    if (_colspan == cs)
-        return;
-
-    _colspan = cs;
-    //emit columnSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _columnSpan);
-}
-
-void GridLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    //emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
-}
-
-QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
-{
-}
-
-void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
-{
-//use attached properties
-if (QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(wid))) {
-    int row = static_cast<GridLayoutAttached *>(obj)->row();
-    int column = static_cast<GridLayoutAttached *>(obj)->column();
-    int rowSpan = static_cast<GridLayoutAttached *>(obj)->rowSpan();
-    int columnSpan = static_cast<GridLayoutAttached *>(obj)->columnSpan();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    addItem(wid, row, column, rowSpan, columnSpan);
-}
-}
-
-void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
-{
-//use attached properties
-if (GridLayoutAttached *obj = attachedProperties.value(item)) {
-    int row = obj->row();
-    int column = obj->column();
-    int rowSpan = obj->rowSpan();
-    int columnSpan = obj->columnSpan();
-    Qt::Alignment alignment = obj->alignment();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    addItem(item, row, column, rowSpan, columnSpan);
-    if (alignment != -1)
-        setAlignment(item,alignment);
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsGridLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-qreal QGraphicsGridLayoutObject::spacing() const
-{
-if (verticalSpacing() == horizontalSpacing())
-    return verticalSpacing();
-return -1;  //###
-}
-
-QHash<QGraphicsLayoutItem*, GridLayoutAttached*> QGraphicsGridLayoutObject::attachedProperties;
-GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast<QGraphicsLayoutItem*>(obj))
-    return 0;
-GridLayoutAttached *rv = new GridLayoutAttached(obj);
-attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
-return rv;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/qmlmodules/widgets/graphicslayouts_p.h b/src/plugins/qmlmodules/widgets/graphicslayouts_p.h
deleted file mode 100644
index 5394ffa..0000000
--- a/src/plugins/qmlmodules/widgets/graphicslayouts_p.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GRAPHICSLAYOUTS_H
-#define GRAPHICSLAYOUTS_H
-
-#include "graphicswidgets_p.h"
-
-#include <QtGui/QGraphicsLinearLayout>
-#include <QtGui/QGraphicsGridLayout>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayoutItem)
-public:
-    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
-
-    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
-};
-
-class LinearLayoutAttached;
-class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QmlListProperty<QGraphicsLayoutItem> children READ children)
-    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsLinearLayoutObject(QObject * = 0);
-    ~QGraphicsLinearLayoutObject();
-
-    QmlListProperty<QGraphicsLayoutItem> children() { return QmlListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
-
-    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
-
-private Q_SLOTS:
-    void updateStretch(QGraphicsLayoutItem*,int);
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class LinearLayoutAttached;
-    void clearChildren();
-    void insertLayoutItem(int, QGraphicsLayoutItem *);
-    static QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> attachedProperties;
-
-    static void children_append(QmlListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
-    }
-
-    static void children_clear(QmlListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->clearChildren();
-    }
-
-    static int children_count(QmlListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QmlListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
-    }
-};
-
-class GridLayoutAttached;
-class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QmlListProperty<QGraphicsLayoutItem> children READ children)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
-    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsGridLayoutObject(QObject * = 0);
-    ~QGraphicsGridLayoutObject();
-
-    QmlListProperty<QGraphicsLayoutItem> children() { return QmlListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
-
-    qreal spacing() const;
-
-    static GridLayoutAttached *qmlAttachedProperties(QObject *);
-
-private:
-    friend class GraphicsLayoutAttached;
-    void addWidget(QGraphicsWidget *);
-    void clearChildren();
-    void addLayoutItem(QGraphicsLayoutItem *);
-    static QHash<QGraphicsLayoutItem*, GridLayoutAttached*> attachedProperties;
-
-    static void children_append(QmlListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<QGraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
-    }
-
-    static void children_clear(QmlListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<QGraphicsGridLayoutObject*>(prop->object)->clearChildren();
-    }
-
-    static int children_count(QmlListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QmlListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->itemAt(index);
-    }
-};
-
-class LinearLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
-public:
-    LinearLayoutAttached(QObject *parent);
-
-    int stretchFactor() const { return _stretch; }
-    void setStretchFactor(int f);
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-
-Q_SIGNALS:
-    void stretchChanged(QGraphicsLayoutItem*,int);
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    int _stretch;
-    Qt::Alignment _alignment;
-};
-
-class GridLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int row READ row WRITE setRow)
-    Q_PROPERTY(int column READ column WRITE setColumn)
-    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
-    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
-public:
-    GridLayoutAttached(QObject *parent);
-
-    int row() const { return _row; }
-    void setRow(int r);
-
-    int column() const { return _column; }
-    void setColumn(int c);
-
-    int rowSpan() const { return _rowspan; }
-    void setRowSpan(int rs);
-
-    int columnSpan() const { return _colspan; }
-    void setColumnSpan(int cs);
-
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-
-private:
-    int _row;
-    int _column;
-    int _rowspan;
-    int _colspan;
-    Qt::Alignment _alignment;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
-QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif // GRAPHICSLAYOUTS_H
diff --git a/src/plugins/qmlmodules/widgets/graphicswidgets.cpp b/src/plugins/qmlmodules/widgets/graphicswidgets.cpp
deleted file mode 100644
index 062e516..0000000
--- a/src/plugins/qmlmodules/widgets/graphicswidgets.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
diff --git a/src/plugins/qmlmodules/widgets/graphicswidgets_p.h b/src/plugins/qmlmodules/widgets/graphicswidgets_p.h
deleted file mode 100644
index 6255d2b..0000000
--- a/src/plugins/qmlmodules/widgets/graphicswidgets_p.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GRAPHICSWIDGETS_H
-#define GRAPHICSWIDGETS_H
-
-#include <qml.h>
-
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGraphicsWidget>
-#include <QtGui/QGraphicsItem>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QGraphicsView)
-QML_DECLARE_TYPE_HASMETATYPE(QGraphicsScene)
-QML_DECLARE_TYPE(QGraphicsWidget)
-QML_DECLARE_TYPE(QGraphicsObject)
-QML_DECLARE_INTERFACE_HASMETATYPE(QGraphicsItem)
-
-QT_END_HEADER
-
-#endif // GRAPHICSWIDGETS_H
diff --git a/src/plugins/qmlmodules/widgets/widgets.cpp b/src/plugins/qmlmodules/widgets/widgets.cpp
deleted file mode 100644
index 72d5ce1..0000000
--- a/src/plugins/qmlmodules/widgets/widgets.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtDeclarative/qmlextensionplugin.h>
-#include <QtDeclarative/qml.h>
-
-#include "graphicslayouts_p.h"
-#include "graphicswidgets_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QGraphicsViewDeclarativeUI : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QGraphicsScene *scene READ scene WRITE setScene)
-    Q_CLASSINFO("DefaultProperty", "scene")
-public:
-    QGraphicsViewDeclarativeUI(QObject *other) : QObject(other) {}
-
-    QGraphicsScene *scene() const { return static_cast<QGraphicsView *>(parent())->scene(); }
-    void setScene(QGraphicsScene *scene)
-    {
-        static_cast<QGraphicsView *>(parent())->setScene(scene);
-    }
-};
-
-class QGraphicsSceneDeclarativeUI : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QmlListProperty<QObject> children READ children)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsSceneDeclarativeUI(QObject *other) : QObject(other) {}
-
-    QmlListProperty<QObject> children() { return QmlListProperty<QObject>(this->parent(), 0, children_append); }
-
-private:
-    static void children_append(QmlListProperty<QObject> *prop, QObject *o) {
-        if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o))
-            static_cast<QGraphicsScene *>(prop->object)->addItem(go);
-    }
-};
-
-class QGraphicsWidgetDeclarativeUI : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QmlListProperty<QGraphicsItem> children READ children)
-    Q_PROPERTY(QGraphicsLayout *layout READ layout WRITE setLayout)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsWidgetDeclarativeUI(QObject *other) : QObject(other) {}
-
-    QmlListProperty<QGraphicsItem> children() { return QmlListProperty<QGraphicsItem>(this, 0, children_append); }
-
-    QGraphicsLayout *layout() const { return static_cast<QGraphicsWidget *>(parent())->layout(); }
-    void setLayout(QGraphicsLayout *lo)
-    {
-        static_cast<QGraphicsWidget *>(parent())->setLayout(lo);
-    }
-
-private:
-    void setItemParent(QGraphicsItem *wid)
-    {
-        wid->setParentItem(static_cast<QGraphicsWidget *>(parent()));
-    }
-
-    static void children_append(QmlListProperty<QGraphicsItem> *prop, QGraphicsItem *i) {
-        static_cast<QGraphicsWidgetDeclarativeUI*>(prop->object)->setItemParent(i);
-    }
-};
-
-class QWidgetsQmlModule : public QmlExtensionPlugin
-{
-    Q_OBJECT
-public:
-    QStringList keys() const
-    {
-        return QStringList() << QLatin1String("Qt.widgets");
-    }
-
-    virtual void initialize(QmlEngine *engine, const char *uri)
-    {
-        Q_UNUSED(uri);
-        Q_UNUSED(engine);
-
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.widgets"));
-
-        QML_REGISTER_INTERFACE(QGraphicsLayoutItem);
-        QML_REGISTER_INTERFACE(QGraphicsLayout);
-        QML_REGISTER_TYPE(Qt,4,6,QGraphicsLinearLayoutStretchItem,QGraphicsLinearLayoutStretchItemObject);
-        QML_REGISTER_TYPE(Qt,4,6,QGraphicsLinearLayout,QGraphicsLinearLayoutObject);
-        QML_REGISTER_TYPE(Qt,4,6,QGraphicsGridLayout,QGraphicsGridLayoutObject);
-        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI);
-        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI);
-        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI);
-        QML_REGISTER_INTERFACE(QGraphicsItem);
-    }
-};
-
-QT_END_NAMESPACE
-
-#include "widgets.moc"
-
-Q_EXPORT_PLUGIN2(qtwidgetsqmlmodule, QT_PREPEND_NAMESPACE(QWidgetsQmlModule));
-
diff --git a/src/plugins/qmlmodules/widgets/widgets.pro b/src/plugins/qmlmodules/widgets/widgets.pro
deleted file mode 100644
index 5cc8dcc..0000000
--- a/src/plugins/qmlmodules/widgets/widgets.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TARGET  = widgets
-include(../../qpluginbase.pri)
-
-QT += declarative
-
-SOURCES += \
-    graphicslayouts.cpp \
-    widgets.cpp
-
-HEADERS += \
-    graphicswidgets_p.h \
-    graphicslayouts_p.h
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmlmodules
-target.path = $$[QT_INSTALL_PLUGINS]/plugins/qmlmodules
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 791d23c..dd9f395 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -313,8 +313,8 @@ SUBDIRS += \
            qmediaserviceprovider \
            qmediatimerange \
            qvideowidget \
-           qmlaudio \
-           qmlgraphicsvideo \
+           qdeclarativeaudio \
+           qdeclarativevideo \
            qspinbox \
            qsplitter \
            qsql \
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index c9b1052..669213c 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -4,66 +4,66 @@ SUBDIRS += \
            layouts \                # Cover
            parserstress \           # Cover
            qmetaobjectbuilder \     # Cover
-           qmlanimations \          # Cover
-           qmlbehaviors \           # Cover
-           qmlbinding \             # Cover
-           qmlconnection \          # Cover
-           qmlcontext \             # Cover
-           qmldatetimeformatter \   # Cover
-           qmldebug \               # Cover
-           qmldebugclient \         # Cover
-           qmldebugservice \        # Cover
-           qmldom \                 # Cover
-           qmleasefollow \          # Cover
-           qmlecmascript \          # Cover
-           qmlengine     \          # Cover
-           qmlerror \               # Cover
-           qmlfontloader \          # Cover
-           qmlgraphicsanchors \     # Cover
-           qmlgraphicsanimatedimage \ # Cover
-           qmlgraphicsimage \       # Cover
-           qmlgraphicsborderimage \ # Cover
-           qmlgraphicsflickable   \ # Cover
-           qmlgraphicsflipable    \ # Cover
-           qmlgraphicsgridview \    # Cover
-           qmlgraphicsitem \        # Cover
-           qmlgraphicslistview \    # Cover
-           qmlgraphicsloader \      # Cover
-           qmlgraphicsmousearea \   # Cover
-           qmlgraphicsparticles \   # Cover
-           qmlgraphicspathview \    # Cover
-           qmlgraphicspositioners \ # Cover
-           qmlgraphicstext \        # Cover
-           qmlgraphicstextedit \    # Cover
-           qmlgraphicstextinput \   # Cover
-           qmlinfo \                # Cover
-           qmlinstruction \         # Cover
-           qmllanguage \            # Cover
-           qmllistreference \       # Cover
-           qmllistmodel \           # Cover
-           qmlmetaproperty \        # Cover
-           qmlmetatype \            # Cover
-           qmlmoduleplugin \        # Cover
-           qmlnumberformatter \     # Cover
-           qmlpixmapcache \         # Cover
-           qmlpropertymap \         # Cover
-           qmlqt \                  # Cover
-           qmlspringfollow \        # Cover
-           qmlstates \              # Cover
-           qmlsystempalette \       # Cover
-           qmltimer \               # Cover
-           qmlxmllistmodel \        # Cover
+           qdeclarativeanimations \          # Cover
+           qdeclarativebehaviors \           # Cover
+           qdeclarativebinding \             # Cover
+           qdeclarativeconnection \          # Cover
+           qdeclarativecontext \             # Cover
+           qdeclarativedatetimeformatter \   # Cover
+           qdeclarativedebug \               # Cover
+           qdeclarativedebugclient \         # Cover
+           qdeclarativedebugservice \        # Cover
+           qdeclarativedom \                 # Cover
+           qdeclarativeeasefollow \          # Cover
+           qdeclarativeecmascript \          # Cover
+           qdeclarativeengine     \          # Cover
+           qdeclarativeerror \               # Cover
+           qdeclarativefontloader \          # Cover
+           qdeclarativeanchors \     # Cover
+           qdeclarativeanimatedimage \ # Cover
+           qdeclarativeimage \       # Cover
+           qdeclarativeborderimage \ # Cover
+           qdeclarativeflickable   \ # Cover
+           qdeclarativeflipable    \ # Cover
+           qdeclarativegridview \    # Cover
+           qdeclarativeitem \        # Cover
+           qdeclarativelistview \    # Cover
+           qdeclarativeloader \      # Cover
+           qdeclarativemousearea \   # Cover
+           qdeclarativeparticles \   # Cover
+           qdeclarativepathview \    # Cover
+           qdeclarativepositioners \ # Cover
+           qdeclarativetext \        # Cover
+           qdeclarativetextedit \    # Cover
+           qdeclarativetextinput \   # Cover
+           qdeclarativeinfo \                # Cover
+           qdeclarativeinstruction \         # Cover
+           qdeclarativelanguage \            # Cover
+           qdeclarativelistreference \       # Cover
+           qdeclarativelistmodel \           # Cover
+           qdeclarativemetaproperty \        # Cover
+           qdeclarativemetatype \            # Cover
+           qdeclarativemoduleplugin \        # Cover
+           qdeclarativenumberformatter \     # Cover
+           qdeclarativepixmapcache \         # Cover
+           qdeclarativepropertymap \         # Cover
+           qdeclarativeqt \                  # Cover
+           qdeclarativespringfollow \        # Cover
+           qdeclarativestates \              # Cover
+           qdeclarativesystempalette \       # Cover
+           qdeclarativetimer \               # Cover
+           qdeclarativexmllistmodel \        # Cover
            qpacketprotocol \        # Cover
-           qmlgraphicsrepeater \    # Cover
-           qmlvaluetypes \          # Cover
-           qmlxmlhttprequest \      # Cover
-           qmlimageprovider \       # Cover
-           qmlstyledtext \          # Cover
+           qdeclarativerepeater \    # Cover
+           qdeclarativevaluetypes \          # Cover
+           qdeclarativexmlhttprequest \      # Cover
+           qdeclarativeimageprovider \       # Cover
+           qdeclarativestyledtext \          # Cover
            sql                      # Cover
 
 contains(QT_CONFIG, webkit) {
     SUBDIRS += \
-           qmlgraphicswebview       # Cover
+           qdeclarativewebview       # Cover
 }
 
 # Tests which should run in Pulse
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 104c2d3..6160e7c 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -56,7 +56,7 @@ private slots:
 
     void namingConvention();
 private:
-    QString qmlviewer;
+    QString qmlruntime;
     QStringList excludedDirs;
 
     void namingConvention(const QDir &);
@@ -68,11 +68,11 @@ tst_examples::tst_examples()
     QString binaries = QLibraryInfo::location(QLibraryInfo::BinariesPath);
 
 #if defined(Q_WS_MAC)
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.app/Contents/MacOS/qmlviewer");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml.app/Contents/MacOS/qml");
 #elif defined(Q_WS_WIN)
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.exe");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml.exe");
 #else
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml");
 #endif
 
 
@@ -190,7 +190,8 @@ void tst_examples::examples()
               << "-scriptopts" << "play,testerror,exitoncomplete,exitonfailure" 
               << file;
     QProcess p;
-    p.start(qmlviewer, arguments);
+qDebug() << qmlruntime << arguments;
+    p.start(qmlruntime, arguments);
     QVERIFY(p.waitForFinished());
     QCOMPARE(p.exitStatus(), QProcess::NormalExit);
     QCOMPARE(p.exitCode(), 0);
diff --git a/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp b/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp
index cb618c6..a85ceed 100644
--- a/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp
+++ b/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QFile>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/graphicswidgets_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtGui/qgraphicsview.h>
 
 class tst_graphicswidgets : public QObject
 
@@ -61,8 +61,8 @@ tst_graphicswidgets::tst_graphicswidgets()
 
 void tst_graphicswidgets::widgets()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/graphicswidgets.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/graphicswidgets.qml"));
     QGraphicsView *obj = qobject_cast<QGraphicsView*>(c.create());
 
     QVERIFY(obj != 0);
diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp
index 53c1ede..b580336 100644
--- a/tests/auto/declarative/layouts/tst_layouts.cpp
+++ b/tests/auto/declarative/layouts/tst_layouts.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 #include <QtTest/QtTest>
 #include <private/qlistmodelinterface_p.h>
-#include <qmlview.h>
-#include <private/qmlgraphicslayoutitem_p.h>
-#include <qmlexpression.h>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativelayoutitem_p.h>
+#include <qdeclarativeexpression.h>
 #include <QStyle>
 
 class tst_QmlGraphicsLayouts : public QObject
@@ -56,7 +56,7 @@ private slots:
     void test_cpp();//GraphicsLayout set up in C++
 
 private:
-    QmlView *createView(const QString &filename);
+    QDeclarativeView *createView(const QString &filename);
 };
 
 tst_QmlGraphicsLayouts::tst_QmlGraphicsLayouts()
@@ -65,13 +65,13 @@ tst_QmlGraphicsLayouts::tst_QmlGraphicsLayouts()
 
 void tst_QmlGraphicsLayouts::test_qml()
 {
-    QmlView *canvas = createView(SRCDIR "/data/layouts.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/layouts.qml");
 
     qApp->processEvents();
-    QmlGraphicsLayoutItem *left = static_cast<QmlGraphicsLayoutItem*>(canvas->rootObject()->findChild<QmlGraphicsItem*>("left"));
+    QDeclarativeLayoutItem *left = static_cast<QDeclarativeLayoutItem*>(canvas->rootObject()->findChild<QDeclarativeItem*>("left"));
     QVERIFY(left != 0);
 
-    QmlGraphicsLayoutItem *right = static_cast<QmlGraphicsLayoutItem*>(canvas->rootObject()->findChild<QmlGraphicsItem*>("right"));
+    QDeclarativeLayoutItem *right = static_cast<QDeclarativeLayoutItem*>(canvas->rootObject()->findChild<QDeclarativeItem*>("right"));
     QVERIFY(right != 0);
 
     qreal l = QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
@@ -81,7 +81,7 @@ void tst_QmlGraphicsLayouts::test_qml()
     QVERIFY2(l == r && r == t && t == b, "Test assumes equal margins.");
     qreal gvMargin = l;
 
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(canvas->rootObject());
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
     QVERIFY(rootItem != 0);
 
     //Preferred Size
@@ -133,9 +133,9 @@ void tst_QmlGraphicsLayouts::test_cpp()
     //TODO: Waiting on QT-2407 to write this test
 }
 
-QmlView *tst_QmlGraphicsLayouts::createView(const QString &filename)
+QDeclarativeView *tst_QmlGraphicsLayouts::createView(const QString &filename)
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setSource(QUrl::fromLocalFile(filename));
 
     return canvas;
diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp
index 8af1b12..6ff5515 100644
--- a/tests/auto/declarative/parserstress/tst_parserstress.cpp
+++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
@@ -58,7 +58,7 @@ private slots:
 
 private:
     static QStringList findJSFiles(const QDir &);
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 QStringList tst_parserstress::findJSFiles(const QDir &d)
@@ -130,7 +130,7 @@ void tst_parserstress::ecmascript()
 
     QByteArray qmlData = qml.toUtf8();
 
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(qmlData, QUrl::fromLocalFile(SRCDIR + QString("/dummy.qml")));
     QSet<QString> failingTests;
     failingTests << "uc-003.js" << "uc-005.js" << "regress-352044-02-n.js"
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/anchors.qml b/tests/auto/declarative/qdeclarativeanchors/data/anchors.qml
new file mode 100644
index 0000000..b64d0b0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanchors/data/anchors.qml
@@ -0,0 +1,162 @@
+import Qt 4.6
+
+Rectangle {
+    color: "white"
+    width: 240
+    height: 320
+    Rectangle { id: masterRect; objectName: "masterRect"; x: 26; width: 96; height: 20; color: "red" }
+    Rectangle {
+        id: rect1; objectName: "rect1"
+        y: 20; width: 10; height: 10
+        anchors.left: masterRect.left
+    }
+    Rectangle {
+        id: rect2; objectName: "rect2"
+        y: 20; width: 10; height: 10
+        anchors.left: masterRect.right
+    }
+    Rectangle {
+        id: rect3; objectName: "rect3"
+        y: 20; width: 10; height: 10
+        anchors.left: masterRect.horizontalCenter
+    }
+    Rectangle {
+        id: rect4; objectName: "rect4"
+        y: 30; width: 10; height: 10
+        anchors.right: masterRect.left
+    }
+    Rectangle {
+        id: rect5; objectName: "rect5"
+        y: 30; width: 10; height: 10
+        anchors.right: masterRect.right
+    }
+    Rectangle {
+        id: rect6; objectName: "rect6"
+        y: 30; width: 10; height: 10
+        anchors.right: masterRect.horizontalCenter
+    }
+    Rectangle {
+        id: rect7; objectName: "rect7"
+        y: 50; width: 10; height: 10
+        anchors.left: parent.left
+    }
+    Rectangle {
+        id: rect8; objectName: "rect8"
+        y: 50; width: 10; height: 10
+        anchors.left: parent.right
+    }
+    Rectangle {
+        id: rect9; objectName: "rect9"
+        y: 50; width: 10; height: 10
+        anchors.left: parent.horizontalCenter
+    }
+    Rectangle {
+        id: rect10; objectName: "rect10"
+        y: 60; width: 10; height: 10
+        anchors.right: parent.left
+    }
+    Rectangle {
+        id: rect11; objectName: "rect11"
+        y: 60; width: 10; height: 10
+        anchors.right: parent.right
+    }
+    Rectangle {
+        id: rect12; objectName: "rect12"
+        y: 60; width: 10; height: 10
+        anchors.right: parent.horizontalCenter
+    }
+    Rectangle {
+        id: rect13; objectName: "rect13"
+        x: 200; width: 10; height: 10
+        anchors.top: masterRect.bottom
+    }
+    Rectangle {
+        id: rect14; objectName: "rect14"
+        width: 10; height: 10; color: "steelblue"
+        anchors.verticalCenter: parent.verticalCenter
+    }
+    Rectangle {
+        id: rect15; objectName: "rect15"
+        y: 200; height: 10
+        anchors.left: masterRect.left
+        anchors.right: masterRect.right
+    }
+    Rectangle {
+        id: rect16; objectName: "rect16"
+        y: 220; height: 10
+        anchors.left: masterRect.left
+        anchors.horizontalCenter: masterRect.right
+    }
+    Rectangle {
+        id: rect17; objectName: "rect17"
+        y: 240; height: 10
+        anchors.right: masterRect.right
+        anchors.horizontalCenter: masterRect.left
+    }
+    Rectangle {
+        id: rect18; objectName: "rect18"
+        x: 180; width: 10
+        anchors.top: masterRect.bottom
+        anchors.bottom: rect12.top
+    }
+    Rectangle {
+        id: rect19; objectName: "rect19"
+        y: 70; width: 10; height: 10
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+    Rectangle {
+        id: rect20; objectName: "rect20"
+        y: 70; width: 10; height: 10
+        anchors.horizontalCenter: parent.right
+    }
+    Rectangle {
+        id: rect21; objectName: "rect21"
+        y: 70; width: 10; height: 10
+        anchors.horizontalCenter: parent.left
+    }
+    Rectangle {
+        id: rect22; objectName: "rect22"
+        width: 10; height: 10
+        anchors.centerIn: masterRect
+    }
+    Rectangle {
+        id: rect23; objectName: "rect23"
+        anchors.left: masterRect.left
+        anchors.leftMargin: 5
+        anchors.right: masterRect.right
+        anchors.rightMargin: 5
+        anchors.top: masterRect.top
+        anchors.topMargin: 5
+        anchors.bottom: masterRect.bottom
+        anchors.bottomMargin: 5
+    }
+    Rectangle {
+        id: rect24; objectName: "rect24"
+        width: 10; height: 10
+        anchors.horizontalCenter: masterRect.left
+        anchors.horizontalCenterOffset: width/2
+    }
+    Rectangle {
+        id: rect25; objectName: "rect25"
+        width: 10; height: 10
+        anchors.verticalCenter: rect12.top
+        anchors.verticalCenterOffset: height/2
+    }
+    Rectangle {
+        id: rect26; objectName: "rect26"
+        width: 10; height: 10
+        anchors.baseline: masterRect.top
+        anchors.baselineOffset: height/2
+    }
+    Text {
+        id: text1; objectName: "text1"
+        y: 200;
+        text: "Hello"
+    }
+    Text {
+        id: text2; objectName: "text2"
+        anchors.baseline: text1.baseline
+        anchors.left: text1.right
+        text: "World"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/centerin.qml b/tests/auto/declarative/qdeclarativeanchors/data/centerin.qml
new file mode 100644
index 0000000..09b97f6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanchors/data/centerin.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200; height: 200
+    Rectangle {
+        objectName: "centered"
+        width: 50; height: 50; color: "blue"
+        anchors.centerIn: parent;
+        anchors.verticalCenterOffset: 30
+        anchors.horizontalCenterOffset: 10
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/crash1.qml b/tests/auto/declarative/qdeclarativeanchors/data/crash1.qml
new file mode 100644
index 0000000..fd9dc55
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanchors/data/crash1.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+Column {
+    Text {
+        text: "foo"
+        anchors.fill: parent
+    }
+    Text {
+        text: "bar"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/fill.qml b/tests/auto/declarative/qdeclarativeanchors/data/fill.qml
new file mode 100644
index 0000000..902465c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanchors/data/fill.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200; height: 200
+    Rectangle {
+        objectName: "filler"
+        width: 50; height: 50; color: "blue"
+        anchors.fill: parent;
+	anchors.leftMargin: 10;
+	anchors.rightMargin: 20;
+	anchors.topMargin: 30;
+	anchors.bottomMargin: 40;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/loop1.qml b/tests/auto/declarative/qdeclarativeanchors/data/loop1.qml
new file mode 100644
index 0000000..a266612
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanchors/data/loop1.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+Rectangle {
+    id: rect
+    width: 120; height: 200; color: "white"
+    Text { id: text1; anchors.right: text2.right; text: "Hello" }
+    Text { id: text2; anchors.right: text1.right; anchors.rightMargin: 10; text: "World" }
+}
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/loop2.qml b/tests/auto/declarative/qdeclarativeanchors/data/loop2.qml
new file mode 100644
index 0000000..acb57cd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanchors/data/loop2.qml
@@ -0,0 +1,20 @@
+import Qt 4.6
+
+Rectangle {
+  id: container;
+  width: 600;
+  height: 600;
+
+  Image {
+    id: image1
+    source: "http://labs.trolltech.com/blogs/wp-content/uploads/2009/03/3311388091_ac2a257feb.jpg"
+    anchors.right: image2.left
+  }
+
+  Image  {
+    id: image2
+    source: "http://labs.trolltech.com/blogs/wp-content/uploads/2009/03/oslo_groupphoto.jpg"
+    anchors.left: image1.right
+    anchors.leftMargin: 20
+  }
+}
diff --git a/tests/auto/declarative/qdeclarativeanchors/data/margins.qml b/tests/auto/declarative/qdeclarativeanchors/data/margins.qml
new file mode 100644
index 0000000..4a29e77
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanchors/data/margins.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200; height: 200
+    Rectangle {
+        objectName: "filler"
+        width: 50; height: 50; color: "blue"
+        anchors.fill: parent;
+	anchors.margins: 10
+	anchors.leftMargin: 5
+	anchors.topMargin: 6
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro
new file mode 100644
index 0000000..ca2f68f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativeanchors.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
new file mode 100644
index 0000000..ccc0ec7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
@@ -0,0 +1,448 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QSignalSpy>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativetext_p.h>
+#include <QtDeclarative/private/qdeclarativeanchors_p_p.h>
+
+Q_DECLARE_METATYPE(QDeclarativeAnchors::UsedAnchor)
+Q_DECLARE_METATYPE(QDeclarativeAnchorLine::AnchorLine)
+
+
+class tst_qmlgraphicsanchors : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicsanchors() {}
+
+    template<typename T>
+    T *findItem(QGraphicsObject *parent, const QString &id);
+
+private slots:
+    void basicAnchors();
+    void loops();
+    void illegalSets();
+    void illegalSets_data();
+    void reset();
+    void reset_data();
+    void resetConvenience();
+    void nullItem();
+    void nullItem_data();
+    void crash1();
+    void centerIn();
+    void fill();
+    void margins();
+};
+
+/*
+   Find an item with the specified id.
+*/
+template<typename T>
+T *tst_qmlgraphicsanchors::findItem(QGraphicsObject *parent, const QString &objectName)
+{
+    const QMetaObject &mo = T::staticMetaObject;
+    QList<QGraphicsItem *> children = parent->childItems();
+    for (int i = 0; i < children.count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(children.at(i)->toGraphicsObject());
+        if (item) {
+            if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
+                return static_cast<T*>(item);
+            }
+            item = findItem<T>(item, objectName);
+            if (item)
+                return static_cast<T*>(item);
+        }
+    }
+
+    return 0;
+}
+
+void tst_qmlgraphicsanchors::basicAnchors()
+{
+    QDeclarativeView *view = new QDeclarativeView;
+    view->setSource(QUrl::fromLocalFile(SRCDIR "/data/anchors.qml"));
+
+    qApp->processEvents();
+
+    //sibling horizontal
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect1"))->x(), 26.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect2"))->x(), 122.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect3"))->x(), 74.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect4"))->x(), 16.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect5"))->x(), 112.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect6"))->x(), 64.0);
+
+    //parent horizontal
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect7"))->x(), 0.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect8"))->x(), 240.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect9"))->x(), 120.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect10"))->x(), -10.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect11"))->x(), 230.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect12"))->x(), 110.0);
+
+    //vertical
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect13"))->y(), 20.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect14"))->y(), 155.0);
+
+    //stretch
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect15"))->x(), 26.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect15"))->width(), 96.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect16"))->x(), 26.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect16"))->width(), 192.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect17"))->x(), -70.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect17"))->width(), 192.0);
+
+    //vertical stretch
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect18"))->y(), 20.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect18"))->height(), 40.0);
+
+    //more parent horizontal
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect19"))->x(), 115.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect20"))->x(), 235.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect21"))->x(), -5.0);
+
+    //centerIn
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect22"))->x(), 69.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect22"))->y(), 5.0);
+
+     //margins
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect23"))->x(), 31.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect23"))->y(), 5.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect23"))->width(), 86.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect23"))->height(), 10.0);
+
+    // offsets
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect24"))->x(), 26.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect25"))->y(), 60.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect26"))->y(), 5.0);
+
+    //baseline
+    QDeclarativeText *text1 = findItem<QDeclarativeText>(view->rootObject(), QLatin1String("text1"));
+    QDeclarativeText *text2 = findItem<QDeclarativeText>(view->rootObject(), QLatin1String("text2"));
+    QCOMPARE(text1->y(), text2->y());
+
+    delete view;
+}
+
+// mostly testing that we don't crash
+void tst_qmlgraphicsanchors::loops()
+{
+    {
+        QUrl source(QUrl::fromLocalFile(SRCDIR "/data/loop1.qml"));
+
+        QString expect = "QML Text (" + source.toString() + ":6:5" + ") Possible anchor loop detected on horizontal anchor.";
+        QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
+        QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
+        QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
+
+        QDeclarativeView *view = new QDeclarativeView;
+        view->setSource(source);
+        qApp->processEvents();
+
+        delete view;
+    }
+
+    {
+        QUrl source(QUrl::fromLocalFile(SRCDIR "/data/loop2.qml"));
+
+        QString expect = "QML Image (" + source.toString() + ":8:3" + ") Possible anchor loop detected on horizontal anchor.";
+        QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
+
+        QDeclarativeView *view = new QDeclarativeView;
+        view->setSource(source);
+        qApp->processEvents();
+
+        delete view;
+    }
+}
+
+void tst_qmlgraphicsanchors::illegalSets()
+{
+    QFETCH(QString, qml);
+    QFETCH(QString, warning);
+
+    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\n" + qml.toUtf8()), QUrl::fromLocalFile(""));
+    if (!component.isReady())
+        qWarning() << "Test errors:" << component.errors();
+    QVERIFY(component.isReady());
+    QObject *o = component.create();
+    delete o;
+}
+
+void tst_qmlgraphicsanchors::illegalSets_data()
+{
+    QTest::addColumn<QString>("qml");
+    QTest::addColumn<QString>("warning");
+
+    QTest::newRow("H - too many anchors")
+        << "Rectangle { id: rect; Rectangle { anchors.left: rect.left; anchors.right: rect.right; anchors.horizontalCenter: rect.horizontalCenter } }"
+        << "QML Rectangle (file::2:23) Cannot specify left, right, and hcenter anchors.";
+
+    foreach (const QString &side, QStringList() << "left" << "right") {
+        QTest::newRow("H - anchor to V")
+            << QString("Rectangle { Rectangle { anchors.%1: parent.top } }").arg(side)
+            << "QML Rectangle (file::2:13) Cannot anchor a horizontal edge to a vertical edge.";
+
+        QTest::newRow("H - anchor to non parent/sibling")
+            << QString("Rectangle { Item { Rectangle { id: rect } } Rectangle { anchors.%1: rect.%1 } }").arg(side)
+            << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling.";
+
+        QTest::newRow("H - anchor to self")
+            << QString("Rectangle { id: rect; anchors.%1: rect.%1 }").arg(side)
+            << "QML Rectangle (file::2:1) Cannot anchor item to self.";
+    }
+
+
+    QTest::newRow("V - too many anchors")
+        << "Rectangle { id: rect; Rectangle { anchors.top: rect.top; anchors.bottom: rect.bottom; anchors.verticalCenter: rect.verticalCenter } }"
+        << "QML Rectangle (file::2:23) Cannot specify top, bottom, and vcenter anchors.";
+
+    QTest::newRow("V - too many anchors with baseline")
+        << "Rectangle { Text { id: text1; text: \"Hello\" } Text { anchors.baseline: text1.baseline; anchors.top: text1.top; } }"
+        << "QML Text (file::2:47) Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.";
+
+    foreach (const QString &side, QStringList() << "top" << "bottom" << "baseline") {
+
+        QTest::newRow("V - anchor to H")
+            << QString("Rectangle { Rectangle { anchors.%1: parent.left } }").arg(side)
+            << "QML Rectangle (file::2:13) Cannot anchor a vertical edge to a horizontal edge.";
+
+        QTest::newRow("V - anchor to non parent/sibling")
+            << QString("Rectangle { Item { Rectangle { id: rect } } Rectangle { anchors.%1: rect.%1 } }").arg(side)
+            << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling.";
+
+        QTest::newRow("V - anchor to self")
+            << QString("Rectangle { id: rect; anchors.%1: rect.%1 }").arg(side)
+            << "QML Rectangle (file::2:1) Cannot anchor item to self.";
+    }
+
+
+    QTest::newRow("centerIn - anchor to non parent/sibling")
+        << "Rectangle { Item { Rectangle { id: rect } } Rectangle { anchors.centerIn: rect} }"
+        << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling.";
+
+
+    QTest::newRow("fill - anchor to non parent/sibling")
+        << "Rectangle { Item { Rectangle { id: rect } } Rectangle { anchors.fill: rect} }"
+        << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling.";
+}
+
+void tst_qmlgraphicsanchors::reset()
+{
+    QFETCH(QString, side);
+    QFETCH(QDeclarativeAnchorLine::AnchorLine, anchorLine);
+    QFETCH(QDeclarativeAnchors::UsedAnchor, usedAnchor);
+
+    QDeclarativeItem *baseItem = new QDeclarativeItem;
+
+    QDeclarativeAnchorLine anchor;
+    anchor.item = baseItem;
+    anchor.anchorLine = anchorLine;
+
+    QDeclarativeItem *item = new QDeclarativeItem;
+
+    const QMetaObject *meta = item->anchors()->metaObject();
+    QMetaProperty p = meta->property(meta->indexOfProperty(side.toUtf8().constData()));
+
+    QVERIFY(p.write(item->anchors(), qVariantFromValue(anchor)));
+    QCOMPARE(item->anchors()->usedAnchors().testFlag(usedAnchor), true);
+
+    QVERIFY(p.reset(item->anchors()));
+    QCOMPARE(item->anchors()->usedAnchors().testFlag(usedAnchor), false);
+
+    delete item;
+    delete baseItem;
+}
+
+void tst_qmlgraphicsanchors::reset_data()
+{
+    QTest::addColumn<QString>("side");
+    QTest::addColumn<QDeclarativeAnchorLine::AnchorLine>("anchorLine");
+    QTest::addColumn<QDeclarativeAnchors::UsedAnchor>("usedAnchor");
+
+    QTest::newRow("left") << "left" << QDeclarativeAnchorLine::Left << QDeclarativeAnchors::HasLeftAnchor;
+    QTest::newRow("top") << "top" << QDeclarativeAnchorLine::Top << QDeclarativeAnchors::HasTopAnchor;
+    QTest::newRow("right") << "right" << QDeclarativeAnchorLine::Right << QDeclarativeAnchors::HasRightAnchor;
+    QTest::newRow("bottom") << "bottom" << QDeclarativeAnchorLine::Bottom << QDeclarativeAnchors::HasBottomAnchor;
+
+    QTest::newRow("hcenter") << "horizontalCenter" << QDeclarativeAnchorLine::HCenter << QDeclarativeAnchors::HasHCenterAnchor;
+    QTest::newRow("vcenter") << "verticalCenter" << QDeclarativeAnchorLine::VCenter << QDeclarativeAnchors::HasVCenterAnchor;
+    QTest::newRow("baseline") << "baseline" << QDeclarativeAnchorLine::Baseline << QDeclarativeAnchors::HasBaselineAnchor;
+}
+
+void tst_qmlgraphicsanchors::resetConvenience()
+{
+    QDeclarativeItem *baseItem = new QDeclarativeItem;
+    QDeclarativeItem *item = new QDeclarativeItem;
+
+    //fill
+    item->anchors()->setFill(baseItem);
+    QVERIFY(item->anchors()->fill() == baseItem);
+    item->anchors()->resetFill();
+    QVERIFY(item->anchors()->fill() == 0);
+
+    //centerIn
+    item->anchors()->setCenterIn(baseItem);
+    QVERIFY(item->anchors()->centerIn() == baseItem);
+    item->anchors()->resetCenterIn();
+    QVERIFY(item->anchors()->centerIn() == 0);
+
+    delete item;
+    delete baseItem;
+}
+
+void tst_qmlgraphicsanchors::nullItem()
+{
+    QFETCH(QString, side);
+
+    QDeclarativeAnchorLine anchor;
+    QDeclarativeItem *item = new QDeclarativeItem;
+
+    const QMetaObject *meta = item->anchors()->metaObject();
+    QMetaProperty p = meta->property(meta->indexOfProperty(side.toUtf8().constData()));
+
+    QTest::ignoreMessage(QtWarningMsg, "QML Item (unknown location) Cannot anchor to a null item.");
+    QVERIFY(p.write(item->anchors(), qVariantFromValue(anchor)));
+
+    delete item;
+}
+
+void tst_qmlgraphicsanchors::nullItem_data()
+{
+    QTest::addColumn<QString>("side");
+
+    QTest::newRow("left") << "left";
+    QTest::newRow("top") << "top";
+    QTest::newRow("right") << "right";
+    QTest::newRow("bottom") << "bottom";
+
+    QTest::newRow("hcenter") << "horizontalCenter";
+    QTest::newRow("vcenter") << "verticalCenter";
+    QTest::newRow("baseline") << "baseline";
+}
+
+void tst_qmlgraphicsanchors::crash1()
+{
+    QUrl source(QUrl::fromLocalFile(SRCDIR "/data/crash1.qml"));
+
+    QString expect = "QML Text (" + source.toString() + ":4:5" + ") Possible anchor loop detected on fill.";
+    QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
+    QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); // XXX ideally, should be one message
+
+    QDeclarativeView *view = new QDeclarativeView(source);
+    qApp->processEvents();
+
+    delete view;
+}
+
+void tst_qmlgraphicsanchors::fill()
+{
+    QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/fill.qml"));
+
+    qApp->processEvents();
+    QDeclarativeRectangle* rect = findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("filler"));
+    QCOMPARE(rect->x(), 0.0 + 10.0);
+    QCOMPARE(rect->y(), 0.0 + 30.0);
+    QCOMPARE(rect->width(), 200.0 - 10.0 - 20.0);
+    QCOMPARE(rect->height(), 200.0 - 30.0 - 40.0);
+    //Alter Offsets (QTBUG-6631)
+    rect->anchors()->setLeftMargin(20.0);
+    rect->anchors()->setRightMargin(0.0);
+    rect->anchors()->setBottomMargin(0.0);
+    rect->anchors()->setTopMargin(10.0);
+    QCOMPARE(rect->x(), 0.0 + 20.0);
+    QCOMPARE(rect->y(), 0.0 + 10.0);
+    QCOMPARE(rect->width(), 200.0 - 20.0);
+    QCOMPARE(rect->height(), 200.0 - 10.0);
+
+    delete view;
+}
+
+void tst_qmlgraphicsanchors::centerIn()
+{
+    QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/centerin.qml"));
+
+    qApp->processEvents();
+    QDeclarativeRectangle* rect = findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("centered"));
+    QCOMPARE(rect->x(), 75.0 + 10);
+    QCOMPARE(rect->y(), 75.0 + 30);
+    //Alter Offsets (QTBUG-6631)
+    rect->anchors()->setHorizontalCenterOffset(-20.0);
+    rect->anchors()->setVerticalCenterOffset(-10.0);
+    QCOMPARE(rect->x(), 75.0 - 20.0);
+    QCOMPARE(rect->y(), 75.0 - 10.0);
+
+    delete view;
+}
+
+void tst_qmlgraphicsanchors::margins()
+{
+    QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/margins.qml"));
+
+    qApp->processEvents();
+    QDeclarativeRectangle* rect = findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("filler"));
+    QCOMPARE(rect->x(), 5.0);
+    QCOMPARE(rect->y(), 6.0);
+    QCOMPARE(rect->width(), 200.0 - 5.0 - 10.0);
+    QCOMPARE(rect->height(), 200.0 - 6.0 - 10.0);
+
+    rect->anchors()->setTopMargin(0.0);
+    rect->anchors()->setMargins(20.0);
+
+    QCOMPARE(rect->x(), 5.0);
+    QCOMPARE(rect->y(), 20.0);
+    QCOMPARE(rect->width(), 200.0 - 5.0 - 20.0);
+    QCOMPARE(rect->height(), 200.0 - 20.0 - 20.0);
+
+    delete view;
+}
+
+QTEST_MAIN(tst_qmlgraphicsanchors)
+
+#include "tst_qdeclarativeanchors.moc"
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.gif b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.gif
new file mode 100644
index 0000000..1270bfa
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.gif differ
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml
new file mode 100644
index 0000000..5bada34
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+AnimatedImage {
+    source: "colors.gif"
+}
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.gif b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.gif
new file mode 100644
index 0000000..7c4cd18
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.gif differ
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml
new file mode 100644
index 0000000..a70db5d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+AnimatedImage {
+    source: "stickman.gif"
+}
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml
new file mode 100644
index 0000000..7ab17d4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+AnimatedImage {
+    source: "stickman.gif"
+    paused: true
+    currentFrame: 2
+}
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml
new file mode 100644
index 0000000..53b0c3a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+AnimatedImage {
+    source: "stickman.gif"
+    playing: false
+}
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro
new file mode 100644
index 0000000..2904986
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative network
+HEADERS += ../shared/testhttpserver.h
+SOURCES += tst_qdeclarativeanimatedimage.cpp ../shared/testhttpserver.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
new file mode 100644
index 0000000..cb56813
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
@@ -0,0 +1,191 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativeimage_p.h>
+#include <private/qdeclarativeanimatedimage_p.h>
+
+#include "../shared/testhttpserver.h"
+
+#define TRY_WAIT(expr) \
+    do { \
+        for (int ii = 0; ii < 6; ++ii) { \
+            if ((expr)) break; \
+            QTest::qWait(50); \
+        } \
+        QVERIFY((expr)); \
+    } while (false)
+
+
+class tst_qmlgraphicsanimatedimage : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicsanimatedimage() {}
+
+private slots:
+    void play();
+    void pause();
+    void stopped();
+    void setFrame();
+    void frameCount();
+    void remote();
+    void remote_data();
+    void invalidSource();
+};
+
+void tst_qmlgraphicsanimatedimage::play()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickman.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
+    QVERIFY(anim);
+    QVERIFY(anim->isPlaying());
+
+    delete anim;
+}
+
+void tst_qmlgraphicsanimatedimage::pause()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
+    QVERIFY(anim);
+    QVERIFY(anim->isPlaying());
+    QVERIFY(anim->isPaused());
+
+    delete anim;
+}
+
+void tst_qmlgraphicsanimatedimage::stopped()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanstopped.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
+    QVERIFY(anim);
+    QVERIFY(!anim->isPlaying());
+    QCOMPARE(anim->currentFrame(), 0);
+
+    delete anim;
+}
+
+void tst_qmlgraphicsanimatedimage::setFrame()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
+    QVERIFY(anim);
+    QVERIFY(anim->isPlaying());
+    QCOMPARE(anim->currentFrame(), 2);
+
+    delete anim;
+}
+
+void tst_qmlgraphicsanimatedimage::frameCount()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/colors.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
+    QVERIFY(anim);
+    QVERIFY(anim->isPlaying());
+    QCOMPARE(anim->frameCount(), 3);
+
+    delete anim;
+}
+
+void tst_qmlgraphicsanimatedimage::remote()
+{
+    QFETCH(QString, fileName);
+    QFETCH(bool, paused);
+
+    TestHTTPServer server(14445);
+    QVERIFY(server.isValid());
+    server.serveDirectory(SRCDIR "/data");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl("http://127.0.0.1:14445/" + fileName));
+    TRY_WAIT(component.isReady());
+
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
+    QVERIFY(anim);
+
+    TRY_WAIT(anim->isPlaying());
+    if (paused) {
+        TRY_WAIT(anim->isPaused());
+        QCOMPARE(anim->currentFrame(), 2);
+    }
+
+    delete anim;
+}
+
+void tst_qmlgraphicsanimatedimage::remote_data()
+{
+    QTest::addColumn<QString>("fileName");
+    QTest::addColumn<bool>("paused");
+
+    QTest::newRow("playing") << "stickman.qml" << false;
+    QTest::newRow("paused") << "stickmanpause.qml" << true;
+}
+
+void tst_qmlgraphicsanimatedimage::invalidSource()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6\n AnimatedImage { source: \"no-such-file.gif\" }", QUrl::fromLocalFile(""));
+    QVERIFY(component.isReady());
+
+    QTest::ignoreMessage(QtWarningMsg, "Error Reading Animated Image File  QUrl( \"file:no-such-file.gif\" )  ");
+
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
+    QVERIFY(anim);
+
+    QVERIFY(!anim->isPlaying());
+    QVERIFY(!anim->isPaused());
+    QCOMPARE(anim->currentFrame(), 0);
+    QCOMPARE(anim->frameCount(), 0);
+}
+
+QTEST_MAIN(tst_qmlgraphicsanimatedimage)
+
+#include "tst_qdeclarativeanimatedimage.moc"
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/attached.qml b/tests/auto/declarative/qdeclarativeanimations/data/attached.qml
new file mode 100644
index 0000000..0fb6f8c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/attached.qml
@@ -0,0 +1,34 @@
+import Qt 4.6
+
+Rectangle {
+    width: 180; height: 200;
+
+    Component {
+        id: delegate
+        Rectangle {
+            id: wrapper
+            width: 180; height: 200
+            color: "blue"
+
+            states: State {
+                name: "otherState"
+                PropertyChanges { target: wrapper; color: "green" }
+            }
+
+            transitions: Transition {
+                PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
+                ScriptAction { script: console.log(ListView.delayRemove ? "on" : "off") }
+            }
+
+            Component.onCompleted: {
+                console.log(ListView.delayRemove ? "on" : "off");
+                wrapper.state = "otherState"
+            }
+        }
+    }
+
+    ListView {
+        model: 1
+        delegate: delegate
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml b/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml
new file mode 100644
index 0000000..d31cae9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 240
+    height: 320
+    Rectangle {
+        id: myRect
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+    }
+    states: State {
+        name: "state1"
+        PropertyChanges { target: myRect; border.color: "blue" }
+    }
+    transitions: Transition {
+        ColorAnimation { target: myRect; to: "red"; property: "border.colr"; duration: 1000 }
+    }
+    Component.onCompleted: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml b/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml
new file mode 100644
index 0000000..3b8b111
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 240
+    height: 320
+    Rectangle {
+        id: myRect
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+    }
+    states: State {
+        name: "state1"
+        PropertyChanges { target: myRect; border.color: "blue" }
+    }
+    transitions: Transition {
+        ColorAnimation { target: myRect; to: "red"; property: "border"; duration: 1000 }
+    }
+    Component.onCompleted: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml
new file mode 100644
index 0000000..6381df3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    Rectangle {
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        x: PropertyAnimation { from: "blue"; to: "green"; }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml
new file mode 100644
index 0000000..8d57e41
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    Rectangle {
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        x: NumberAnimation { from: "blue"; to: "green"; }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml
new file mode 100644
index 0000000..c4867c3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    Rectangle {
+        color: "red"
+        color: ColorAnimation { from: 10; to: 15; }
+        width: 50; height: 50
+        x: 100; y: 100
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml
new file mode 100644
index 0000000..e80762f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 240
+    height: 320
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        MouseArea {
+            anchors.fill: parent
+            onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
+        }
+    }
+    states: State {
+        name: "state1"
+        PropertyChanges { target: myRect; x: 200; color: "blue" }
+    }
+    transitions: Transition {
+        //comment out each in turn to make sure each only animates the relevant property
+        ColorAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color
+        NumberAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml
new file mode 100644
index 0000000..d9660b6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 600
+    height: 400
+
+    Rectangle {
+        id: redRect
+        width: 100; height: 100
+        color: Qt.rgba(1,0,0)
+        x: Behavior {
+            NumberAnimation { objectName: "MyAnim"; target: redRect; property: "y"; to: 300; repeat: true}
+        }
+
+    }
+
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml
new file mode 100644
index 0000000..36417db
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml
@@ -0,0 +1,19 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 600
+    height: 400
+
+    Rectangle {
+        id: redRect
+        width: 100; height: 100
+        color: Qt.rgba(1,0,0)
+        x: SequentialAnimation {
+            running: false
+            NumberAnimation { objectName: "MyAnim"; running: true }
+        }
+
+    }
+
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml
new file mode 100644
index 0000000..1a6540f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml
@@ -0,0 +1,19 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 600
+    height: 400
+
+    Rectangle {
+        id: redRect
+        width: 100; height: 100
+        color: Qt.rgba(1,0,0)
+
+        transitions: Transition {
+            SequentialAnimation {
+                NumberAnimation { id: myAnim; objectName: "MyAnim"; running: true }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml b/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml
new file mode 100644
index 0000000..9f0e699
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml
@@ -0,0 +1,24 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 240
+    height: 320
+    Rectangle {
+        id: myRect
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        MouseArea {
+            anchors.fill: parent
+            onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
+        }
+    }
+    states: State {
+        name: "state1"
+        PropertyChanges { target: myRect; border.color: "blue" }
+    }
+    transitions: Transition {
+        ColorAnimation { properties: "border.color"; duration: 1000 }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml
new file mode 100644
index 0000000..6770366
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml
@@ -0,0 +1,25 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 240
+    height: 320
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        MouseArea {
+            anchors.fill: parent
+            onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
+        }
+    }
+    states: State {
+        name: "state1"
+        PropertyChanges { target: myRect; x: 200; border.width: 10 }
+    }
+    transitions: Transition {
+        PropertyAnimation { properties: "x,border.width"; duration: 1000 } //x is real, border.width is int
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml
new file mode 100644
index 0000000..80c9473
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml
@@ -0,0 +1,25 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 240
+    height: 320
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        MouseArea {
+            anchors.fill: parent
+            onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
+        }
+    }
+    states: State {
+        name: "state1"
+        PropertyChanges { target: myRect; x: 200; color: "blue" }
+    }
+    transitions: Transition {
+        PropertyAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties.qml
new file mode 100644
index 0000000..7e73f57
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        x: NumberAnimation { to: 200 }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml
new file mode 100644
index 0000000..6c96155
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        x: NumberAnimation { targets: theRect; properties: "x"; to: 200; }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml
new file mode 100644
index 0000000..ff08885
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        x: NumberAnimation { target: theRect; property: "x"; to: 300; }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml
new file mode 100644
index 0000000..dab7e5f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        x: NumberAnimation { target: theRect; property: "y"; to: 200; }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml
new file mode 100644
index 0000000..38396b1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        x: NumberAnimation { targets: theRect; properties: "y"; to: 200; }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml
new file mode 100644
index 0000000..b13b94b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml
@@ -0,0 +1,29 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+    }
+
+    states: State {
+        name: "moved"
+        PropertyChanges {
+            target: theRect
+            x: 200
+        }
+    }
+    transitions: Transition {
+        NumberAnimation { targets: theRect; properties: "x" }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: parent.state = "moved"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml
new file mode 100644
index 0000000..033c5c1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml
@@ -0,0 +1,29 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+    }
+
+    states: State {
+        name: "moved"
+        PropertyChanges {
+            target: theRect
+            x: 200
+        }
+    }
+    transitions: Transition {
+        NumberAnimation { target: theRect; property: "y"; to: 200 }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: parent.state = "moved"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml
new file mode 100644
index 0000000..d0704c9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml
@@ -0,0 +1,29 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+    }
+
+    states: State {
+        name: "moved"
+        PropertyChanges {
+            target: theRect
+            x: 200
+        }
+    }
+    transitions: Transition {
+        NumberAnimation { targets: theRect; properties: "y" }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: parent.state = "moved"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml
new file mode 100644
index 0000000..e70c95c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml
@@ -0,0 +1,29 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+    }
+
+    states: State {
+        name: "moved"
+        PropertyChanges {
+            target: theRect
+            x: 200
+        }
+    }
+    transitions: Transition {
+        NumberAnimation { target: theRect; properties: "x" }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: parent.state = "moved"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml
new file mode 100644
index 0000000..b9e27da
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml
@@ -0,0 +1,29 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+    }
+
+    states: State {
+        name: "moved"
+        PropertyChanges {
+            target: theRect
+            x: 200
+        }
+    }
+    transitions: Transition {
+        NumberAnimation { targets: theRect; property: "x" }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: parent.state = "moved"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml
new file mode 100644
index 0000000..7417ed1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml
@@ -0,0 +1,29 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: theRect
+        objectName: "TheRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+    }
+
+    states: State {
+        name: "moved"
+        PropertyChanges {
+            target: theRect
+            x: 200
+        }
+    }
+    transitions: Transition {
+        NumberAnimation { targets: theItem; properties: "x" }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: parent.state = "moved"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml b/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml
new file mode 100644
index 0000000..c35063d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        x: NumberAnimation { id: anim; objectName: "MyAnim"; to: 200 }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml b/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml
new file mode 100644
index 0000000..1a60542
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        color: "red"
+        width: 50; height: 50
+        x: 100; y: 100
+        x: NumberAnimation { id: anim; objectName: "MyAnim"; running: false; to: 200 }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
new file mode 100644
index 0000000..8eac75f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativeanimations.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
new file mode 100644
index 0000000..9894fe0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -0,0 +1,672 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativeanimation_p.h>
+#include <QVariantAnimation>
+#include <QEasingCurve>
+
+class tst_qmlanimations : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlanimations() {}
+
+private slots:
+    void initTestCase() { QDeclarativeEngine engine; } // ensure types are registered
+
+    void simpleProperty();
+    void simpleNumber();
+    void simpleColor();
+    void alwaysRunToEnd();
+    void complete();
+    void resume();
+    void dotProperty();
+    void badTypes();
+    void badProperties();
+    void mixedTypes();
+    void properties();
+    void propertiesTransition();
+    void invalidDuration();
+    void attached();
+    void propertyValueSourceDefaultStart();
+    void dontStart();
+    void easingProperties();
+};
+
+#define QTIMED_COMPARE(lhs, rhs) do { \
+    for (int ii = 0; ii < 5; ++ii) { \
+        if (lhs == rhs)  \
+            break; \
+        QTest::qWait(50); \
+    } \
+    QCOMPARE(lhs, rhs); \
+} while (false)
+
+void tst_qmlanimations::simpleProperty()
+{
+    QDeclarativeRectangle rect;
+    QDeclarativePropertyAnimation animation;
+    animation.setTarget(&rect);
+    animation.setProperty("pos");
+    animation.setTo(QPointF(200,200));
+    QVERIFY(animation.target() == &rect);
+    QVERIFY(animation.property() == "pos");
+    QVERIFY(animation.to().toPointF() == QPointF(200,200));
+    animation.start();
+    QVERIFY(animation.isRunning());
+    QTest::qWait(animation.duration());
+    QTIMED_COMPARE(rect.pos(), QPointF(200,200));
+
+    rect.setPos(0,0);
+    animation.start();
+    animation.pause();
+    QVERIFY(animation.isRunning());
+    QVERIFY(animation.isPaused());
+    animation.setCurrentTime(125);
+    QVERIFY(animation.currentTime() == 125);
+    QCOMPARE(rect.pos(), QPointF(100,100));
+}
+
+void tst_qmlanimations::simpleNumber()
+{
+    QDeclarativeRectangle rect;
+    QDeclarativeNumberAnimation animation;
+    animation.setTarget(&rect);
+    animation.setProperty("x");
+    animation.setTo(200);
+    QVERIFY(animation.target() == &rect);
+    QVERIFY(animation.property() == "x");
+    QVERIFY(animation.to() == 200);
+    animation.start();
+    QVERIFY(animation.isRunning());
+    QTest::qWait(animation.duration());
+    QTIMED_COMPARE(rect.x(), qreal(200));
+
+    rect.setX(0);
+    animation.start();
+    animation.pause();
+    QVERIFY(animation.isRunning());
+    QVERIFY(animation.isPaused());
+    animation.setCurrentTime(125);
+    QVERIFY(animation.currentTime() == 125);
+    QCOMPARE(rect.x(), qreal(100));
+}
+
+void tst_qmlanimations::simpleColor()
+{
+    QDeclarativeRectangle rect;
+    QDeclarativeColorAnimation animation;
+    animation.setTarget(&rect);
+    animation.setProperty("color");
+    animation.setTo(QColor("red"));
+    QVERIFY(animation.target() == &rect);
+    QVERIFY(animation.property() == "color");
+    QVERIFY(animation.to() == QColor("red"));
+    animation.start();
+    QVERIFY(animation.isRunning());
+    QTest::qWait(animation.duration());
+    QTIMED_COMPARE(rect.color(), QColor("red"));
+
+    rect.setColor(QColor("blue"));
+    animation.start();
+    animation.pause();
+    QVERIFY(animation.isRunning());
+    QVERIFY(animation.isPaused());
+    animation.setCurrentTime(125);
+    QVERIFY(animation.currentTime() == 125);
+    QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1));
+
+    rect.setColor(QColor("green"));
+    animation.setFrom(QColor("blue"));
+    QVERIFY(animation.from() == QColor("blue"));
+    animation.restart();
+    QCOMPARE(rect.color(), QColor("blue"));
+    QVERIFY(animation.isRunning());
+    animation.setCurrentTime(125);
+    QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1));
+}
+
+void tst_qmlanimations::alwaysRunToEnd()
+{
+    QDeclarativeRectangle rect;
+    QDeclarativePropertyAnimation animation;
+    animation.setTarget(&rect);
+    animation.setProperty("x");
+    animation.setTo(200);
+    animation.setDuration(1000);
+    animation.setRepeat(true);
+    animation.setAlwaysRunToEnd(true);
+    QVERIFY(animation.repeat() == true);
+    QVERIFY(animation.alwaysRunToEnd() == true);
+    animation.start();
+    QTest::qWait(1500);
+    animation.stop();
+    QVERIFY(rect.x() != qreal(200));
+    QTest::qWait(500);
+    QTIMED_COMPARE(rect.x(), qreal(200));
+}
+
+void tst_qmlanimations::complete()
+{
+    QDeclarativeRectangle rect;
+    QDeclarativePropertyAnimation animation;
+    animation.setTarget(&rect);
+    animation.setProperty("x");
+    animation.setFrom(1);
+    animation.setTo(200);
+    animation.setDuration(500);
+    QVERIFY(animation.from() == 1);
+    animation.start();
+    QTest::qWait(50);
+    animation.stop();
+    QVERIFY(rect.x() != qreal(200));
+    animation.start();
+    QTest::qWait(50);
+    QVERIFY(animation.isRunning());
+    animation.complete();
+    QCOMPARE(rect.x(), qreal(200));
+}
+
+void tst_qmlanimations::resume()
+{
+    QDeclarativeRectangle rect;
+    QDeclarativePropertyAnimation animation;
+    animation.setTarget(&rect);
+    animation.setProperty("x");
+    animation.setFrom(10);
+    animation.setTo(200);
+    animation.setDuration(500);
+    QVERIFY(animation.from() == 10);
+
+    animation.start();
+    QTest::qWait(100);
+    animation.pause();
+    qreal x = rect.x();
+    QVERIFY(x != qreal(200));
+    QVERIFY(animation.isRunning());
+    QVERIFY(animation.isPaused());
+
+    animation.resume();
+    QVERIFY(animation.isRunning());
+    QVERIFY(!animation.isPaused());
+    QTest::qWait(100);
+    animation.stop();
+    QVERIFY(rect.x() > x);
+}
+
+void tst_qmlanimations::dotProperty()
+{
+    QDeclarativeRectangle rect;
+    QDeclarativeNumberAnimation animation;
+    animation.setTarget(&rect);
+    animation.setProperty("border.width");
+    animation.setTo(10);
+    animation.start();
+    QTest::qWait(animation.duration()+50);
+    QTIMED_COMPARE(rect.border()->width(), 10);
+
+    rect.border()->setWidth(0);
+    animation.start();
+    animation.pause();
+    animation.setCurrentTime(125);
+    QVERIFY(animation.currentTime() == 125);
+    QCOMPARE(rect.border()->width(), 5);
+}
+
+void tst_qmlanimations::badTypes()
+{
+    //don't crash
+    {
+        QDeclarativeView *view = new QDeclarativeView;
+        view->setSource(QUrl::fromLocalFile(SRCDIR "/data/badtype1.qml"));
+
+        qApp->processEvents();
+
+        delete view;
+    }
+
+    //make sure we get a compiler error
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype2.qml"));
+        QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready");
+        c.create();
+
+        QVERIFY(c.errors().count() == 1);
+        QCOMPARE(c.errors().at(0).description(), QLatin1String("Invalid property assignment: double expected"));
+    }
+
+    //make sure we get a compiler error
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype3.qml"));
+        QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready");
+        c.create();
+
+        QVERIFY(c.errors().count() == 1);
+        QCOMPARE(c.errors().at(0).description(), QLatin1String("Invalid property assignment: color expected"));
+    }
+
+    //don't crash
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype4.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        rect->setState("state1");
+        QTest::qWait(1000 + 50);
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("MyRect");
+        QVERIFY(myRect);
+        QCOMPARE(myRect->x(),qreal(200));
+    }
+}
+
+void tst_qmlanimations::badProperties()
+{
+    //make sure we get a runtime error
+    {
+        QDeclarativeEngine engine;
+
+        QDeclarativeComponent c1(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty1.qml"));
+        QByteArray message = "QML ColorAnimation (" + QUrl::fromLocalFile(SRCDIR "/data/badproperty1.qml").toString().toUtf8() + ":18:9) Cannot animate non-existent property \"border.colr\"";
+        QTest::ignoreMessage(QtWarningMsg, message);
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c1.create());
+        QVERIFY(rect);
+
+        QDeclarativeComponent c2(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty2.qml"));
+        message = "QML ColorAnimation (" + QUrl::fromLocalFile(SRCDIR "/data/badproperty2.qml").toString().toUtf8() + ":18:9) Cannot animate read-only property \"border\"";
+        QTest::ignoreMessage(QtWarningMsg, message);
+        rect = qobject_cast<QDeclarativeRectangle*>(c2.create());
+        QVERIFY(rect);
+
+        //### should we warn here are well?
+        //rect->setState("state1");
+    }
+}
+
+//test animating mixed types with property animation in a transition
+//for example, int + real; color + real; etc
+void tst_qmlanimations::mixedTypes()
+{
+    //assumes border.width stays a real -- not real robust
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype1.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        rect->setState("state1");
+        QTest::qWait(500);
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("MyRect");
+        QVERIFY(myRect);
+
+        //rather inexact -- is there a better way?
+        QVERIFY(myRect->x() > 100 && myRect->x() < 200);
+        QVERIFY(myRect->border()->width() > 1 && myRect->border()->width() < 10);
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        rect->setState("state1");
+        QTest::qWait(500);
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("MyRect");
+        QVERIFY(myRect);
+
+        //rather inexact -- is there a better way?
+        QVERIFY(myRect->x() > 100 && myRect->x() < 200);
+        QVERIFY(myRect->color() != QColor("red") && myRect->color() != QColor("blue"));
+    }
+}
+
+void tst_qmlanimations::properties()
+{
+    const int waitDuration = 300;
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->x(),qreal(200));
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->x(),qreal(200));
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties3.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->x(),qreal(300));
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties4.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->y(),qreal(200));
+        QTIMED_COMPARE(myRect->x(),qreal(100));
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties5.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->x(),qreal(100));
+        QTIMED_COMPARE(myRect->y(),qreal(200));
+    }
+}
+
+void tst_qmlanimations::propertiesTransition()
+{
+    const int waitDuration = 300;
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        rect->setState("moved");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->x(),qreal(200));
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        rect->setState("moved");
+        QCOMPARE(myRect->x(),qreal(200));
+        QCOMPARE(myRect->y(),qreal(100));
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->y(),qreal(200));
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition3.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        rect->setState("moved");
+        QCOMPARE(myRect->x(),qreal(200));
+        QCOMPARE(myRect->y(),qreal(100));
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition4.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        rect->setState("moved");
+        QCOMPARE(myRect->x(),qreal(100));
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->x(),qreal(200));
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition5.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        rect->setState("moved");
+        QCOMPARE(myRect->x(),qreal(100));
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->x(),qreal(200));
+    }
+
+    /*{
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition6.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
+        QVERIFY(myRect);
+        rect->setState("moved");
+        QCOMPARE(myRect->x(),qreal(100));
+        QTest::qWait(waitDuration);
+        QTIMED_COMPARE(myRect->x(),qreal(100));
+    }*/
+}
+
+void tst_qmlanimations::invalidDuration()
+{
+    QDeclarativePropertyAnimation *animation = new QDeclarativePropertyAnimation;
+    QTest::ignoreMessage(QtWarningMsg, "QML PropertyAnimation (unknown location) Cannot set a duration of < 0");
+    animation->setDuration(-1);
+    QCOMPARE(animation->duration(), 250);
+
+    QDeclarativePauseAnimation *pauseAnimation = new QDeclarativePauseAnimation;
+    QTest::ignoreMessage(QtWarningMsg, "QML PauseAnimation (unknown location) Cannot set a duration of < 0");
+    pauseAnimation->setDuration(-1);
+    QCOMPARE(pauseAnimation->duration(), 250);
+}
+
+void tst_qmlanimations::attached()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/attached.qml"));
+    QTest::ignoreMessage(QtDebugMsg, "off");
+    QTest::ignoreMessage(QtDebugMsg, "on");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+}
+
+void tst_qmlanimations::propertyValueSourceDefaultStart()
+{
+    {
+        QDeclarativeEngine engine;
+
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource.qml"));
+
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
+        QVERIFY(myAnim);
+        QVERIFY(myAnim->isRunning());
+    }
+
+    {
+        QDeclarativeEngine engine;
+
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource2.qml"));
+
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
+        QVERIFY(myAnim);
+        QVERIFY(myAnim->isRunning() == false);
+    }
+
+    {
+        QDeclarativeEngine engine;
+
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontAutoStart.qml"));
+
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
+        QVERIFY(myAnim && myAnim->qtAnimation());
+        QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
+    }
+}
+
+
+void tst_qmlanimations::dontStart()
+{
+    {
+        QDeclarativeEngine engine;
+
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
+
+        QTest::ignoreMessage(QtWarningMsg, "QDeclarativeAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
+        QVERIFY(myAnim && myAnim->qtAnimation());
+        QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
+    }
+
+    {
+        QDeclarativeEngine engine;
+
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart2.qml"));
+
+        QTest::ignoreMessage(QtWarningMsg, "QDeclarativeAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
+        QVERIFY(myAnim && myAnim->qtAnimation());
+        QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
+    }
+}
+
+void tst_qmlanimations::easingProperties()
+{
+    {
+        QDeclarativeEngine engine;
+        QString componentStr = "import Qt 4.6\nNumberAnimation { easing.type: \"InOutQuad\" }";
+        QDeclarativeComponent animationComponent(&engine);
+        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
+
+        QVERIFY(animObject != 0);
+        QCOMPARE(animObject->easing().type(), QEasingCurve::InOutQuad);
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"OutBounce\"; easing.amplitude: 5.0 }";
+        QDeclarativeComponent animationComponent(&engine);
+        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
+
+        QVERIFY(animObject != 0);
+        QCOMPARE(animObject->easing().type(), QEasingCurve::OutBounce);
+        QCOMPARE(animObject->easing().amplitude(), 5.0);
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"OutElastic\"; easing.amplitude: 5.0; easing.period: 3.0}";
+        QDeclarativeComponent animationComponent(&engine);
+        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
+
+        QVERIFY(animObject != 0);
+        QCOMPARE(animObject->easing().type(), QEasingCurve::OutElastic);
+        QCOMPARE(animObject->easing().amplitude(), 5.0);
+        QCOMPARE(animObject->easing().period(), 3.0);
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"InOutBack\"; easing.overshoot: 2 }";
+        QDeclarativeComponent animationComponent(&engine);
+        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
+
+        QVERIFY(animObject != 0);
+        QCOMPARE(animObject->easing().type(), QEasingCurve::InOutBack);
+        QCOMPARE(animObject->easing().overshoot(), 2.0);
+    }
+}
+
+QTEST_MAIN(tst_qmlanimations)
+
+#include "tst_qdeclarativeanimations.moc"
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml b/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
new file mode 100644
index 0000000..201da37
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    property real basex : 0
+    property real movedx: 200
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: basex
+        x: Behavior { NumberAnimation { duration: 500; } }
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "moved"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            x: movedx
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/color.qml b/tests/auto/declarative/qdeclarativebehaviors/data/color.qml
new file mode 100644
index 0000000..91dbbd1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/color.qml
@@ -0,0 +1,24 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100;
+        color: "green"
+        color: Behavior { ColorAnimation { duration: 500; } }
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "red"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            color: "red"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml b/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml
new file mode 100644
index 0000000..8d032f0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: Behavior { NumberAnimation { duration: 500; } }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml b/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml
new file mode 100644
index 0000000..3c7078a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: Behavior {
+            objectName: "MyBehavior";
+            enabled: false
+            NumberAnimation { duration: 200; }
+        }
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "moved"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            x: 200
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml b/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml
new file mode 100644
index 0000000..ba7cc9c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 600
+    height: 400
+
+    Rectangle {
+        id: redRect
+        width: 100; height: 100
+        color: Qt.rgba(1,0,0)
+        x: Behavior {
+            NumberAnimation { objectName: "MyAnim"; running: true }
+        }
+
+    }
+
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml b/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml
new file mode 100644
index 0000000..95d934a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: Behavior {}
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "moved"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            x: 200
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml b/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml
new file mode 100644
index 0000000..1b2025a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: Behavior {
+            objectName: "MyBehavior";
+            NumberAnimation { target: rect; property: "x"; duration: 500; }
+        }
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "moved"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            x: 200
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml
new file mode 100644
index 0000000..14883d4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        pos: Behavior { PropertyAnimation { duration: 500; } }
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "moved"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            pos: Qt.point(200,0);
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml
new file mode 100644
index 0000000..b43ddbc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        pos.x: Behavior { NumberAnimation { duration: 500; } }
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "moved"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            pos.x: 200;
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml b/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml
new file mode 100644
index 0000000..5f2c057
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml
@@ -0,0 +1,19 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: Behavior { NumberAnimation { duration: 200; } }
+        onXChanged: x = 100;
+    }
+    states: State {
+        name: "moved"
+        PropertyChanges {
+            target: rect
+            x: 200
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml b/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml
new file mode 100644
index 0000000..f267a05
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: Behavior {
+            objectName: "MyBehavior";
+            NumberAnimation { targets: rect; properties: "y"; duration: 200; }
+        }
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "moved"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            x: 200
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml b/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
new file mode 100644
index 0000000..7c7fdcb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
@@ -0,0 +1,28 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        parent: Behavior {
+            SequentialAnimation {
+                PauseAnimation { duration: 500 }
+                PropertyAction {}
+            }
+        }
+    }
+    Item {
+        id: newParent
+        objectName: "NewParent"
+        x: 100
+    }
+    states: State {
+        name: "reparented"
+        PropertyChanges {
+            target: rect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml b/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml
new file mode 100644
index 0000000..ba744b1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: Behavior {
+            objectName: "MyBehavior"
+            NumberAnimation { duration: 200 }
+            NumberAnimation { duration: 1000 }
+        }
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "moved"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            x: 200
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml b/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
new file mode 100644
index 0000000..a91ca88
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+
+    onColorChanged: {
+        rect.x = 200
+    }
+
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: Behavior { NumberAnimation { duration: 500; } }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml b/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml
new file mode 100644
index 0000000..ac98ed0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+Rectangle {
+    width: 400
+    height: 400
+    Rectangle {
+        id: rect
+        objectName: "MyRect"
+        width: 100; height: 100; color: "green"
+        x: Behavior {
+            objectName: "MyBehavior";
+            NumberAnimation { duration: 500; }
+        }
+    }
+    MouseArea {
+        id: clicker
+        anchors.fill: parent
+    }
+    states: State {
+        name: "moved"
+        when: clicker.pressed
+        PropertyChanges {
+            target: rect
+            x: 200
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
new file mode 100644
index 0000000..a1dac32
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativebehaviors.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
new file mode 100644
index 0000000..a177247
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
@@ -0,0 +1,301 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativebehavior_p.h>
+#include <private/qdeclarativeanimation_p.h>
+
+class tst_qmlbehaviors : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlbehaviors() {}
+
+private slots:
+    void simpleBehavior();
+    void scriptTriggered();
+    void cppTriggered();
+    void loop();
+    void colorBehavior();
+    void parentBehavior();
+    void replaceBinding();
+    //void transitionOverrides();
+    void group();
+    void emptyBehavior();
+    void explicitSelection();
+    void nonSelectingBehavior();
+    void reassignedAnimation();
+    void disabled();
+    void dontStart();
+};
+
+void tst_qmlbehaviors::simpleBehavior()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/simple.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+    QVERIFY(qobject_cast<QDeclarativeBehavior*>(rect->findChild<QDeclarativeBehavior*>("MyBehavior"))->animation());
+
+    rect->setState("moved");
+    QTest::qWait(200);
+    qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
+    QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+}
+
+void tst_qmlbehaviors::scriptTriggered()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/scripttrigger.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+
+    rect->setColor(QColor("red"));
+    QTest::qWait(200);
+    qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
+    QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+}
+
+void tst_qmlbehaviors::cppTriggered()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/cpptrigger.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+    QVERIFY(innerRect);
+
+    innerRect->setProperty("x", 200);
+    QTest::qWait(200);
+    qreal x = innerRect->x();
+    QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+}
+
+void tst_qmlbehaviors::loop()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/loop.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+
+    //don't crash
+    rect->setState("moved");
+}
+
+void tst_qmlbehaviors::colorBehavior()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/color.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+
+    rect->setState("red");
+    QTest::qWait(200);
+    QColor color = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->color();
+    QVERIFY(color != QColor("red") && color != QColor("green"));  //i.e. the behavior has been triggered
+}
+
+void tst_qmlbehaviors::parentBehavior()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/parent.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+
+    rect->setState("reparented");
+    QTest::qWait(200);
+    QDeclarativeItem *newParent = rect->findChild<QDeclarativeItem*>("NewParent");
+    QDeclarativeItem *parent = rect->findChild<QDeclarativeRectangle*>("MyRect")->parentItem();
+    QVERIFY(parent != newParent);
+    QTest::qWait(600);
+    parent = rect->findChild<QDeclarativeRectangle*>("MyRect")->parentItem();
+    QVERIFY(parent == newParent);
+}
+
+void tst_qmlbehaviors::replaceBinding()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/binding.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+
+    rect->setState("moved");
+    QTest::qWait(200);
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+    QVERIFY(innerRect);
+    qreal x = innerRect->x();
+    QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+    QTest::qWait(600);
+    QCOMPARE(innerRect->x(), (qreal)200);
+    rect->setProperty("basex", 10);
+    QCOMPARE(innerRect->x(), (qreal)200);
+    rect->setProperty("movedx", 210);
+    QTest::qWait(600);
+    QCOMPARE(innerRect->x(), (qreal)210);
+
+    rect->setState("");
+    QTest::qWait(200);
+    x = innerRect->x();
+    QVERIFY(x > 10 && x < 210);  //i.e. the behavior has been triggered
+    QTest::qWait(600);
+    QCOMPARE(innerRect->x(), (qreal)10);
+    rect->setProperty("movedx", 200);
+    QCOMPARE(innerRect->x(), (qreal)10);
+    rect->setProperty("basex", 20);
+    QTest::qWait(600);
+    QCOMPARE(innerRect->x(), (qreal)20);
+}
+
+void tst_qmlbehaviors::group()
+{
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/groupProperty.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        rect->setState("moved");
+        QTest::qWait(200);
+        qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
+        QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+    }
+
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/groupProperty2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        rect->setState("moved");
+        QTest::qWait(200);
+        qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
+        QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+    }
+}
+
+void tst_qmlbehaviors::emptyBehavior()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/empty.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+
+    rect->setState("moved");
+    qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
+    QCOMPARE(x, qreal(200));    //should change immediately
+}
+
+void tst_qmlbehaviors::explicitSelection()
+{
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/explicit.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        rect->setState("moved");
+        QTest::qWait(200);
+        qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
+        QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
+    }
+}
+
+void tst_qmlbehaviors::nonSelectingBehavior()
+{
+    {
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/nonSelecting2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+        QVERIFY(rect);
+
+        rect->setState("moved");
+        qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
+        QCOMPARE(x, qreal(200));    //should change immediately
+    }
+}
+
+void tst_qmlbehaviors::reassignedAnimation()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml"));
+    QTest::ignoreMessage(QtWarningMsg, QString("QML Behavior (" + QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml").toString() + ":9:12) Cannot change the animation assigned to a Behavior.").toUtf8().constData());
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+    QCOMPARE(qobject_cast<QDeclarativeNumberAnimation*>(
+                 qobject_cast<QDeclarativeBehavior*>(
+                     rect->findChild<QDeclarativeBehavior*>("MyBehavior"))->animation())->duration(), 200);
+}
+
+void tst_qmlbehaviors::disabled()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/disabled.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+    QCOMPARE(rect->findChild<QDeclarativeBehavior*>("MyBehavior")->enabled(), false);
+
+    rect->setState("moved");
+    qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
+    QCOMPARE(x, qreal(200));    //should change immediately
+}
+
+void tst_qmlbehaviors::dontStart()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
+
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect);
+
+    QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
+    QVERIFY(myAnim && myAnim->qtAnimation());
+    QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
+}
+
+QTEST_MAIN(tst_qmlbehaviors)
+
+#include "tst_qdeclarativebehaviors.moc"
diff --git a/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml b/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
new file mode 100644
index 0000000..e9101e4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+
+Rectangle {
+    id: screen
+    width: 320; height: 240
+    property string text
+    property bool changeColor: false
+
+    Text { id: s1; text: "Hello" }
+    Rectangle { id: r1; width: 1; height: 1; color: "yellow" }
+    Rectangle { id: r2; width: 1; height: 1; color: "red" }
+
+    Binding { target: screen; property: "text"; value: s1.text; objectName: "binding1" }
+    Binding { target: screen; property: "color"; value: r1.color }
+    Binding { target: screen; property: "color"; when: screen.changeColor == true; value: r2.color }
+}
diff --git a/tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml b/tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml
new file mode 100644
index 0000000..ea20c16
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+
+Rectangle {
+    id: screen
+    width: 320; height: 240
+    property string text
+    property bool changeColor: false
+
+    Text { id: s1; text: "Hello" }
+    Rectangle { id: r1; width: 1; height: 1; color: "yellow" }
+    Rectangle { id: r2; width: 1; height: 1; color: "red" }
+
+    Binding { target: screen; property: "text"; value: s1.text }
+    Binding { target: screen; property: "color"; value: r1.color }
+    Binding { target: screen; property: "color"; value: r2.color; when: screen.changeColor == true }
+}
diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
new file mode 100644
index 0000000..7879976
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativebinding.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
new file mode 100644
index 0000000..36d8483
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativebind_p.h>
+#include <private/qdeclarativerectangle_p.h>
+#include "../../../shared/util.h"
+
+class tst_qmlbinding : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlbinding();
+
+private slots:
+    void binding();
+    void whenAfterValue();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlbinding::tst_qmlbinding()
+{
+}
+
+void tst_qmlbinding::binding()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+
+    QVERIFY(rect != 0);
+    QCOMPARE(rect->color(), QColor("yellow"));
+    QCOMPARE(rect->property("text").toString(), QString("Hello"));
+
+    rect->setProperty("changeColor", true);
+    QCOMPARE(rect->color(), QColor("red"));
+
+    QDeclarativeBind *binding = qobject_cast<QDeclarativeBind*>(rect->findChild<QDeclarativeBind*>("binding1"));
+    QVERIFY(binding != 0);
+    QCOMPARE(binding->object(), rect);
+    QCOMPARE(binding->property(), QLatin1String("text"));
+    QCOMPARE(binding->value().toString(), QLatin1String("Hello"));
+
+    delete rect;
+}
+
+void tst_qmlbinding::whenAfterValue()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding2.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+
+    QVERIFY(rect != 0);
+    QCOMPARE(rect->color(), QColor("yellow"));
+    QCOMPARE(rect->property("text").toString(), QString("Hello"));
+
+    rect->setProperty("changeColor", true);
+    QCOMPARE(rect->color(), QColor("red"));
+
+    delete rect;
+}
+
+QTEST_MAIN(tst_qmlbinding)
+
+#include "tst_qdeclarativebinding.moc"
diff --git a/tests/auto/declarative/qdeclarativeborderimage/data/colors-round.sci b/tests/auto/declarative/qdeclarativeborderimage/data/colors-round.sci
new file mode 100644
index 0000000..5d2f49f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeborderimage/data/colors-round.sci
@@ -0,0 +1,7 @@
+border.left:10
+border.top:20
+border.right:30
+border.bottom:40
+horizontalTileRule:Round
+verticalTileRule:Repeat
+source:colors.png
diff --git a/tests/auto/declarative/qdeclarativeborderimage/data/colors.png b/tests/auto/declarative/qdeclarativeborderimage/data/colors.png
new file mode 100644
index 0000000..dfb62f3
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeborderimage/data/colors.png differ
diff --git a/tests/auto/declarative/qdeclarativeborderimage/data/invalid.sci b/tests/auto/declarative/qdeclarativeborderimage/data/invalid.sci
new file mode 100644
index 0000000..98c72c9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeborderimage/data/invalid.sci
@@ -0,0 +1,7 @@
+border.left:10
+border.top:20
+border.down:30
+border.up:40
+horizontalTileRule:Roun
+verticalTileRule:Repea
+source:colors.png
diff --git a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro
new file mode 100644
index 0000000..0574ddb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui network
+macx:CONFIG -= app_bundle
+
+HEADERS += ../shared/testhttpserver.h
+SOURCES += tst_qdeclarativeborderimage.cpp ../shared/testhttpserver.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
new file mode 100644
index 0000000..b220f00
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
@@ -0,0 +1,351 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QTextDocument>
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QDir>
+
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeborderimage_p.h>
+#include <private/qdeclarativeimagebase_p.h>
+#include <private/qdeclarativescalegrid_p_p.h>
+#include <private/qdeclarativeloader_p.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+
+#include "../shared/testhttpserver.h"
+
+
+#define SERVER_PORT 14445
+#define SERVER_ADDR "http://127.0.0.1:14445"
+
+#define TRY_WAIT(expr) \
+    do { \
+        for (int ii = 0; ii < 6; ++ii) { \
+            if ((expr)) break; \
+            QTest::qWait(50); \
+        } \
+        QVERIFY((expr)); \
+    } while (false)
+
+
+class tst_qmlgraphicsborderimage : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicsborderimage();
+
+private slots:
+    void noSource();
+    void imageSource();
+    void imageSource_data();
+    void clearSource();
+    void resized();
+    void smooth();
+    void tileModes();
+    void sciSource();
+    void sciSource_data();
+    void invalidSciFile();
+    void pendingRemoteRequest();
+    void pendingRemoteRequest_data();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlgraphicsborderimage::tst_qmlgraphicsborderimage()
+{
+}
+
+void tst_qmlgraphicsborderimage::noSource()
+{
+    QString componentStr = "import Qt 4.6\nBorderImage { source: \"\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->source(), QUrl());
+    QCOMPARE(obj->width(), 0.);
+    QCOMPARE(obj->height(), 0.);
+    QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+    QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsborderimage::imageSource_data()
+{
+    QTest::addColumn<QString>("source");
+    QTest::addColumn<bool>("remote");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << false << "";
+    QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << false
+        << "Cannot open  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() + "\" )  ";
+    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << "";
+    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true
+        << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
+}
+
+void tst_qmlgraphicsborderimage::imageSource()
+{
+    QFETCH(QString, source);
+    QFETCH(bool, remote);
+    QFETCH(QString, error);
+
+    TestHTTPServer *server = 0;
+    if (remote) {
+        server = new TestHTTPServer(SERVER_PORT);
+        QVERIFY(server->isValid());
+        server->serveDirectory(SRCDIR "/data");
+    }
+
+    if (!error.isEmpty())
+        QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
+
+    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+    QVERIFY(obj != 0);
+    
+    if (remote)
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Loading);
+
+    QCOMPARE(obj->source(), remote ? source : QUrl(source));
+
+    if (error.isEmpty()) {
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Ready);
+        QCOMPARE(obj->width(), 120.);
+        QCOMPARE(obj->height(), 120.);
+        QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+        QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
+    } else {
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Error);
+    }
+
+    delete obj;
+    delete server;
+}
+
+void tst_qmlgraphicsborderimage::clearSource()
+{
+    QString componentStr = "import Qt 4.6\nBorderImage { source: srcImage }";
+    QDeclarativeContext *ctxt = engine.rootContext();
+    ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png"));
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+    QVERIFY(obj != 0);
+    QVERIFY(obj->status() == QDeclarativeBorderImage::Ready);
+    QCOMPARE(obj->width(), 120.);
+    QCOMPARE(obj->height(), 120.);
+
+    ctxt->setContextProperty("srcImage", "");
+    QVERIFY(obj->source().isEmpty());
+    QVERIFY(obj->status() == QDeclarativeBorderImage::Null);
+    QCOMPARE(obj->width(), 0.);
+    QCOMPARE(obj->height(), 0.);
+}
+
+void tst_qmlgraphicsborderimage::resized()
+{
+    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() + "\"; width: 300; height: 300 }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->width(), 300.);
+    QCOMPARE(obj->height(), 300.);
+    QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+    QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsborderimage::smooth()
+{
+    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->width(), 300.);
+    QCOMPARE(obj->height(), 300.);
+    QCOMPARE(obj->smooth(), true);
+    QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+    QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsborderimage::tileModes()
+{
+    {
+        QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 100; height: 300; horizontalTileMode: BorderImage.Repeat; verticalTileMode: BorderImage.Repeat }";
+        QDeclarativeComponent component(&engine);
+        component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+        QVERIFY(obj != 0);
+        QCOMPARE(obj->width(), 100.);
+        QCOMPARE(obj->height(), 300.);
+        QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Repeat);
+        QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Repeat);
+
+        delete obj;
+    }
+    {
+        QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 150; horizontalTileMode: BorderImage.Round; verticalTileMode: BorderImage.Round }";
+        QDeclarativeComponent component(&engine);
+        component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+        QVERIFY(obj != 0);
+        QCOMPARE(obj->width(), 300.);
+        QCOMPARE(obj->height(), 150.);
+        QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Round);
+        QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Round);
+
+        delete obj;
+    }
+}
+
+void tst_qmlgraphicsborderimage::sciSource()
+{
+    QFETCH(QString, source);
+    QFETCH(bool, valid);
+
+    bool remote = source.startsWith("http");
+    TestHTTPServer *server = 0;
+    if (remote) {
+        server = new TestHTTPServer(SERVER_PORT);
+        QVERIFY(server->isValid());
+        server->serveDirectory(SRCDIR "/data");
+    }
+
+    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\"; width: 300; height: 300 }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+    QVERIFY(obj != 0);
+    
+    if (remote)
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Loading);
+    
+    QCOMPARE(obj->source(), remote ? source : QUrl(source));
+    QCOMPARE(obj->width(), 300.);
+    QCOMPARE(obj->height(), 300.);
+    
+    if (valid) {
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Ready);
+        QCOMPARE(obj->border()->left(), 10);
+        QCOMPARE(obj->border()->top(), 20);
+        QCOMPARE(obj->border()->right(), 30);
+        QCOMPARE(obj->border()->bottom(), 40);
+        QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Round);
+        QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Repeat);
+    } else {
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Error);
+    }
+
+    delete obj;
+    delete server;
+}
+
+void tst_qmlgraphicsborderimage::sciSource_data()
+{
+    QTest::addColumn<QString>("source");
+    QTest::addColumn<bool>("valid");
+
+    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors-round.sci").toString() << true;
+    QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.sci").toString() << false;
+    QTest::newRow("remote") << SERVER_ADDR "/colors-round.sci" << true;
+    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.sci" << false;
+}
+
+void tst_qmlgraphicsborderimage::invalidSciFile()
+{
+    QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Roun"
+    QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Repea"
+
+    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/invalid.sci").toString() +"\"; width: 300; height: 300 }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->width(), 300.);
+    QCOMPARE(obj->height(), 300.);
+    QCOMPARE(obj->status(), QDeclarativeImageBase::Error);
+    QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+    QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsborderimage::pendingRemoteRequest()
+{
+    QFETCH(QString, source);
+
+    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->status(), QDeclarativeBorderImage::Loading);
+
+    // verify no crash
+    // This will cause a delayed "QThread: Destroyed while thread is still running" warning
+    delete obj;
+    QTest::qWait(50);
+}
+
+void tst_qmlgraphicsborderimage::pendingRemoteRequest_data()
+{
+    QTest::addColumn<QString>("source");
+
+    QTest::newRow("png file") << "http://no-such-qt-server-like-this/none.png";
+    QTest::newRow("sci file") << "http://no-such-qt-server-like-this/none.sci";
+}
+
+QTEST_MAIN(tst_qmlgraphicsborderimage)
+
+#include "tst_qdeclarativeborderimage.moc"
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
new file mode 100644
index 0000000..9534621
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+Item {
+    id: screen; width: 50
+
+    property bool tested: false
+    signal testMe
+
+    Connection { sender: screen; signal: "widthChanged()"; script: screen.tested = true }
+}
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
new file mode 100644
index 0000000..65fe23a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+Connection { id: connection; sender: connection; signal: "widthChanged()"; script: 1 == 1 }
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
new file mode 100644
index 0000000..32133f9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+Connection {}
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
new file mode 100644
index 0000000..c27dc46
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+Item {
+    id: screen; width: 50
+
+    property string tested
+    signal testMe(int param1, string param2)
+
+    Connection { sender: screen; signal: "testMe(param1, param2)"; script: screen.tested = param2 + param1 }
+}
diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
new file mode 100644
index 0000000..a6adfa4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeconnection.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
new file mode 100644
index 0000000..5e3de5e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeconnection_p.h>
+#include <private/qdeclarativeitem_p.h>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativescriptstring.h>
+
+class tst_qmlconnection : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlconnection();
+
+private slots:
+    void defaultValues();
+    void properties();
+    void connection();
+    void trimming();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlconnection::tst_qmlconnection()
+{
+}
+
+void tst_qmlconnection::defaultValues()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
+    QDeclarativeConnection *item = qobject_cast<QDeclarativeConnection*>(c.create());
+
+    QVERIFY(item != 0);
+    QVERIFY(item->signalSender() == 0);
+    QCOMPARE(item->script().script(), QString());
+    QCOMPARE(item->signal(), QString());
+
+    delete item;
+}
+
+void tst_qmlconnection::properties()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
+    QDeclarativeConnection *item = qobject_cast<QDeclarativeConnection*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QVERIFY(item != 0);
+    QVERIFY(item->signalSender() == item);
+    QCOMPARE(item->script().script(), QString("1 == 1"));
+    QCOMPARE(item->signal(), QString("widthChanged()"));
+
+    delete item;
+}
+
+void tst_qmlconnection::connection()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QCOMPARE(item->property("tested").toBool(), false);
+    QCOMPARE(item->width(), 50.);
+    emit item->setWidth(100.);
+    QCOMPARE(item->width(), 100.);
+    QCOMPARE(item->property("tested").toBool(), true);
+
+    delete item;
+}
+
+void tst_qmlconnection::trimming()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QCOMPARE(item->property("tested").toString(), QString(""));
+    int index = item->metaObject()->indexOfSignal("testMe(int,QString)");
+    QMetaMethod method = item->metaObject()->method(index);
+    method.invoke(item,
+                  Qt::DirectConnection,
+                  Q_ARG(int, 5),
+                  Q_ARG(QString, "worked"));
+    QCOMPARE(item->property("tested").toString(), QString("worked5"));
+
+    delete item;
+}
+
+QTEST_MAIN(tst_qmlconnection)
+
+#include "tst_qdeclarativeconnection.moc"
diff --git a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
new file mode 100644
index 0000000..adace70
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativecontext.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
new file mode 100644
index 0000000..c1d6bdb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -0,0 +1,434 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDebug>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
+#include <QDeclarativeComponent>
+#include <QDeclarativeExpression>
+
+class tst_qmlcontext : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlcontext() {}
+
+private slots:
+    void baseUrl();
+    void resolvedUrl();
+    void engineMethod();
+    void parentContext();
+    void setContextProperty();
+    void addDefaultObject();
+    void destruction();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+void tst_qmlcontext::baseUrl()
+{
+    QDeclarativeContext ctxt(&engine);
+
+    QCOMPARE(ctxt.baseUrl(), QUrl());
+
+    ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
+
+    QCOMPARE(ctxt.baseUrl(), QUrl("http://www.nokia.com/"));
+}
+
+void tst_qmlcontext::resolvedUrl()
+{
+    // Relative to the component
+    {
+        QDeclarativeContext ctxt(&engine);
+        ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
+
+        QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), QUrl("http://www.nokia.com/main.qml"));
+    }
+
+    // Relative to a parent
+    {
+        QDeclarativeContext ctxt(&engine);
+        ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
+
+        QDeclarativeContext ctxt2(&ctxt);
+        QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
+    }
+
+    // Relative to the engine
+    {
+        QDeclarativeContext ctxt(&engine);
+        QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), engine.baseUrl().resolved(QUrl("main.qml")));
+    }
+
+    // Relative to a deleted parent
+    {
+        QDeclarativeContext *ctxt = new QDeclarativeContext(&engine);
+        ctxt->setBaseUrl(QUrl("http://www.nokia.com/"));
+
+        QDeclarativeContext ctxt2(ctxt);
+        QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
+
+        delete ctxt; ctxt = 0;
+
+        QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl());
+    }
+
+    // Absolute
+    {
+        QDeclarativeContext ctxt(&engine);
+
+        QCOMPARE(ctxt.resolvedUrl(QUrl("http://www.nokia.com/main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
+        QCOMPARE(ctxt.resolvedUrl(QUrl("file:///main2.qml")), QUrl("file:///main2.qml"));
+    }
+}
+
+void tst_qmlcontext::engineMethod()
+{
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
+
+    QDeclarativeContext ctxt(engine);
+    QDeclarativeContext ctxt2(&ctxt);
+    QDeclarativeContext ctxt3(&ctxt2);
+    QDeclarativeContext ctxt4(&ctxt2);
+
+    QCOMPARE(ctxt.engine(), engine);
+    QCOMPARE(ctxt2.engine(), engine);
+    QCOMPARE(ctxt3.engine(), engine);
+    QCOMPARE(ctxt4.engine(), engine);
+
+    delete engine; engine = 0;
+
+    QCOMPARE(ctxt.engine(), engine);
+    QCOMPARE(ctxt2.engine(), engine);
+    QCOMPARE(ctxt3.engine(), engine);
+    QCOMPARE(ctxt4.engine(), engine);
+}
+
+void tst_qmlcontext::parentContext()
+{
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
+
+    QCOMPARE(engine->rootContext()->parentContext(), (QDeclarativeContext *)0);
+
+    QDeclarativeContext *ctxt = new QDeclarativeContext(engine);
+    QDeclarativeContext *ctxt2 = new QDeclarativeContext(ctxt);
+    QDeclarativeContext *ctxt3 = new QDeclarativeContext(ctxt2);
+    QDeclarativeContext *ctxt4 = new QDeclarativeContext(ctxt2);
+    QDeclarativeContext *ctxt5 = new QDeclarativeContext(ctxt);
+    QDeclarativeContext *ctxt6 = new QDeclarativeContext(engine);
+    QDeclarativeContext *ctxt7 = new QDeclarativeContext(engine->rootContext());
+
+    QCOMPARE(ctxt->parentContext(), engine->rootContext());
+    QCOMPARE(ctxt2->parentContext(), ctxt);
+    QCOMPARE(ctxt3->parentContext(), ctxt2);
+    QCOMPARE(ctxt4->parentContext(), ctxt2);
+    QCOMPARE(ctxt5->parentContext(), ctxt);
+    QCOMPARE(ctxt6->parentContext(), engine->rootContext());
+    QCOMPARE(ctxt7->parentContext(), engine->rootContext());
+
+    delete ctxt2; ctxt2 = 0;
+
+    QCOMPARE(ctxt->parentContext(), engine->rootContext());
+    QCOMPARE(ctxt3->parentContext(), ctxt2);
+    QCOMPARE(ctxt4->parentContext(), ctxt2);
+    QCOMPARE(ctxt5->parentContext(), ctxt);
+    QCOMPARE(ctxt6->parentContext(), engine->rootContext());
+    QCOMPARE(ctxt7->parentContext(), engine->rootContext());
+
+    delete engine; engine = 0;
+
+    QCOMPARE(ctxt->parentContext(), (QDeclarativeContext *)0);
+    QCOMPARE(ctxt3->parentContext(), ctxt2);
+    QCOMPARE(ctxt4->parentContext(), ctxt2);
+    QCOMPARE(ctxt5->parentContext(), ctxt);
+    QCOMPARE(ctxt6->parentContext(), (QDeclarativeContext *)0);
+    QCOMPARE(ctxt7->parentContext(), (QDeclarativeContext *)0);
+
+    delete ctxt7;
+    delete ctxt6;
+    delete ctxt5;
+    delete ctxt4;
+    delete ctxt3;
+    delete ctxt;
+}
+
+class TestObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int a READ a NOTIFY aChanged)
+    Q_PROPERTY(int b READ b NOTIFY bChanged)
+    Q_PROPERTY(int c READ c NOTIFY cChanged)
+
+public:
+    TestObject() : _a(10), _b(10), _c(10) {}
+
+    int a() const { return _a; }
+    void setA(int a) { _a = a; emit aChanged(); }
+
+    int b() const { return _b; }
+    void setB(int b) { _b = b; emit bChanged(); }
+
+    int c() const { return _c; }
+    void setC(int c) { _c = c; emit cChanged(); }
+
+signals:
+    void aChanged();
+    void bChanged();
+    void cChanged();
+
+private:
+    int _a;
+    int _b;
+    int _c;
+};
+
+class TestObject2 : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int b READ b NOTIFY bChanged)
+
+public:
+    TestObject2() : _b(10) {}
+
+    int b() const { return _b; }
+    void setB(int b) { _b = b; emit bChanged(); }
+
+signals:
+    void bChanged();
+
+private:
+    int _b;
+};
+
+#define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
+{ \
+    QDeclarativeComponent component(&engine); \
+    component.setData("import Qt 4.6; QtObject { property var test: " #name " }", QUrl()); \
+\
+    QObject *obj = component.create(ctxt); \
+\
+    QCOMPARE(obj->property("test"), value); \
+\
+    delete obj; \
+} 
+
+void tst_qmlcontext::setContextProperty()
+{
+    QDeclarativeContext ctxt(&engine);
+    QDeclarativeContext ctxt2(&ctxt);
+
+    TestObject obj1;
+    obj1.setA(3345);
+    TestObject obj2;
+    obj2.setA(-19);
+
+    // Static context properties
+    ctxt.setContextProperty("a", QVariant(10));
+    ctxt.setContextProperty("b", QVariant(9));
+    ctxt2.setContextProperty("d", &obj2);
+    ctxt2.setContextProperty("b", QVariant(19));
+    ctxt2.setContextProperty("c", QVariant(QString("Hello World!")));
+    ctxt.setContextProperty("d", &obj1);
+    ctxt.setContextProperty("e", &obj1);
+
+    TEST_CONTEXT_PROPERTY(&ctxt2, a, QVariant(10));
+    TEST_CONTEXT_PROPERTY(&ctxt2, b, QVariant(19));
+    TEST_CONTEXT_PROPERTY(&ctxt2, c, QVariant(QString("Hello World!")));
+    TEST_CONTEXT_PROPERTY(&ctxt2, d.a, QVariant(-19));
+    TEST_CONTEXT_PROPERTY(&ctxt2, e.a, QVariant(3345));
+
+    ctxt.setContextProperty("a", QVariant(13));
+    ctxt.setContextProperty("b", QVariant(4));
+    ctxt2.setContextProperty("b", QVariant(8));
+    ctxt2.setContextProperty("c", QVariant(QString("Hi World!")));
+    ctxt2.setContextProperty("d", &obj1);
+    obj1.setA(12);
+
+    TEST_CONTEXT_PROPERTY(&ctxt2, a, QVariant(13));
+    TEST_CONTEXT_PROPERTY(&ctxt2, b, QVariant(8));
+    TEST_CONTEXT_PROPERTY(&ctxt2, c, QVariant(QString("Hi World!")));
+    TEST_CONTEXT_PROPERTY(&ctxt2, d.a, QVariant(12));
+    TEST_CONTEXT_PROPERTY(&ctxt2, e.a, QVariant(12));
+
+    // Changes in context properties
+    {
+        QDeclarativeComponent component(&engine); 
+        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
+
+        QObject *obj = component.create(&ctxt2); 
+
+        QCOMPARE(obj->property("test"), QVariant(13)); 
+        ctxt.setContextProperty("a", QVariant(19));
+        QCOMPARE(obj->property("test"), QVariant(19)); 
+
+        delete obj; 
+    }
+    {
+        QDeclarativeComponent component(&engine); 
+        component.setData("import Qt 4.6; QtObject { property var test: b }", QUrl()); 
+
+        QObject *obj = component.create(&ctxt2); 
+
+        QCOMPARE(obj->property("test"), QVariant(8)); 
+        ctxt.setContextProperty("b", QVariant(5));
+        QCOMPARE(obj->property("test"), QVariant(8)); 
+        ctxt2.setContextProperty("b", QVariant(1912));
+        QCOMPARE(obj->property("test"), QVariant(1912)); 
+
+        delete obj; 
+    }
+    {
+        QDeclarativeComponent component(&engine); 
+        component.setData("import Qt 4.6; QtObject { property var test: e.a }", QUrl()); 
+
+        QObject *obj = component.create(&ctxt2); 
+
+        QCOMPARE(obj->property("test"), QVariant(12)); 
+        obj1.setA(13);
+        QCOMPARE(obj->property("test"), QVariant(13)); 
+
+        delete obj; 
+    }
+
+    // New context properties
+    {
+        QDeclarativeComponent component(&engine); 
+        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
+
+        QObject *obj = component.create(&ctxt2); 
+
+        QCOMPARE(obj->property("test"), QVariant(19)); 
+        ctxt2.setContextProperty("a", QVariant(1945));
+        QCOMPARE(obj->property("test"), QVariant(1945)); 
+
+        delete obj; 
+    }
+
+    // Setting an object-variant context property
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Qt 4.6; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property var obj: root; }", QUrl());
+
+        QDeclarativeContext ctxt(engine.rootContext());
+        ctxt.setContextProperty("ctxtProp", QVariant());
+
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:1: TypeError: Result of expression 'ctxtProp' [undefined] is not an object.");
+        QObject *obj = component.create(&ctxt);
+
+        QVariant v = obj->property("obj");
+
+        ctxt.setContextProperty("ctxtProp", v);
+
+        QCOMPARE(obj->property("test"), QVariant(10));
+
+        delete obj;
+    }
+}
+
+void tst_qmlcontext::addDefaultObject()
+{
+    QDeclarativeContext ctxt(&engine);
+
+    TestObject to;
+    TestObject2 to2;
+
+    to.setA(2);
+    to.setB(192);
+    to.setC(18);
+    to2.setB(111999);
+
+    ctxt.addDefaultObject(&to2);
+    ctxt.addDefaultObject(&to);
+    ctxt.setContextProperty("c", QVariant(9));
+
+    // Static context properties
+    TEST_CONTEXT_PROPERTY(&ctxt, a, QVariant(2));
+    TEST_CONTEXT_PROPERTY(&ctxt, b, QVariant(111999));
+    TEST_CONTEXT_PROPERTY(&ctxt, c, QVariant(9));
+
+    to.setA(12);
+    to.setB(100);
+    to.setC(7);
+    to2.setB(1612);
+    ctxt.setContextProperty("c", QVariant(3));
+
+    TEST_CONTEXT_PROPERTY(&ctxt, a, QVariant(12));
+    TEST_CONTEXT_PROPERTY(&ctxt, b, QVariant(1612));
+    TEST_CONTEXT_PROPERTY(&ctxt, c, QVariant(3));
+
+    // Changes in context properties
+    {
+        QDeclarativeComponent component(&engine); 
+        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
+
+        QObject *obj = component.create(&ctxt); 
+
+        QCOMPARE(obj->property("test"), QVariant(12)); 
+        to.setA(14);
+        QCOMPARE(obj->property("test"), QVariant(14)); 
+
+        delete obj; 
+    }
+}
+
+void tst_qmlcontext::destruction()
+{
+    QDeclarativeContext *ctxt = new QDeclarativeContext(&engine);
+
+    QObject obj;
+    QDeclarativeEngine::setContextForObject(&obj, ctxt);
+    QDeclarativeExpression expr(ctxt, "a", 0);
+
+    QCOMPARE(ctxt, QDeclarativeEngine::contextForObject(&obj));
+    QCOMPARE(ctxt, expr.context());
+
+    delete ctxt; ctxt = 0;
+
+    QCOMPARE(ctxt, QDeclarativeEngine::contextForObject(&obj));
+    QCOMPARE(ctxt, expr.context());
+}
+
+QTEST_MAIN(tst_qmlcontext)
+
+#include "tst_qdeclarativecontext.moc"
diff --git a/tests/auto/declarative/qdeclarativedatetimeformatter/qdeclarativedatetimeformatter.pro b/tests/auto/declarative/qdeclarativedatetimeformatter/qdeclarativedatetimeformatter.pro
new file mode 100644
index 0000000..22f53e6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedatetimeformatter/qdeclarativedatetimeformatter.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativedatetimeformatter.cpp
diff --git a/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp b/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp
new file mode 100644
index 0000000..5970cc2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp
@@ -0,0 +1,150 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativedatetimeformatter_p.h>
+#include <QDebug>
+
+class tst_qmldatetimeformatter : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmldatetimeformatter() {}
+
+private slots:
+    void date();
+    void time();
+    void dateTime();
+};
+
+void tst_qmldatetimeformatter::date()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent formatterComponent(&engine);
+    formatterComponent.setData(QByteArray("import Qt 4.6\n DateTimeFormatter { date: \"2008-12-24\" }"),
+                               QUrl::fromLocalFile(""));
+    QDeclarativeDateTimeFormatter *formatter = qobject_cast<QDeclarativeDateTimeFormatter*>(formatterComponent.create());
+    if(formatterComponent.isError())
+        qDebug() << formatterComponent.errors();
+    QVERIFY(formatter != 0);
+
+    QDate date(2008,12,24);
+    QCOMPARE(formatter->date(), date);
+    QCOMPARE(formatter->dateTime().date(), date);
+    QCOMPARE(formatter->dateText(),date.toString(Qt::SystemLocaleShortDate));
+
+    formatter->setLongStyle(true);
+    QVERIFY(formatter->longStyle());
+    QCOMPARE(formatter->dateText(),date.toString(Qt::SystemLocaleLongDate));
+
+    formatter->setDateFormat("ddd MMMM d yy");
+    QCOMPARE(formatter->dateFormat(), QLatin1String("ddd MMMM d yy"));
+    QCOMPARE(formatter->dateText(),date.toString("ddd MMMM d yy"));
+
+    QVERIFY(formatter->timeText().isEmpty());
+    QVERIFY(formatter->dateTimeText().isEmpty());
+
+    delete formatter;
+}
+
+void tst_qmldatetimeformatter::time()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent formatterComponent(&engine);
+    formatterComponent.setData("import Qt 4.6\n DateTimeFormatter { time: \"14:15:38.200\" }", QUrl::fromLocalFile(""));
+    QDeclarativeDateTimeFormatter *formatter = qobject_cast<QDeclarativeDateTimeFormatter*>(formatterComponent.create());
+    if(formatterComponent.isError())
+        qDebug() << formatterComponent.errors();
+    QVERIFY(formatter != 0);
+
+    QTime time(14,15,38,200);
+
+    QCOMPARE(formatter->time(),time);
+    QCOMPARE(formatter->dateTime().time(),time);
+
+    QCOMPARE(formatter->timeText(),time.toString(Qt::SystemLocaleShortDate));
+
+    formatter->setLongStyle(true);
+    QCOMPARE(formatter->timeText(),time.toString(Qt::SystemLocaleLongDate));
+
+    formatter->setTimeFormat("H:m:s a");
+    QCOMPARE(formatter->timeFormat(), QLatin1String("H:m:s a"));
+    QCOMPARE(formatter->timeText(),time.toString("H:m:s a"));
+
+    formatter->setTimeFormat("hh:mm:ss.zzz");
+    QCOMPARE(formatter->timeText(),time.toString("hh:mm:ss.zzz"));
+
+    QVERIFY(formatter->dateText().isEmpty());
+    QVERIFY(formatter->dateTimeText().isEmpty());
+
+    delete formatter;
+}
+
+void tst_qmldatetimeformatter::dateTime()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent formatterComponent(&engine);
+    formatterComponent.setData("import Qt 4.6\n DateTimeFormatter { dateTime: \"1978-03-04T09:13:54\" }", QUrl::fromLocalFile(""));
+    QDeclarativeDateTimeFormatter *formatter = qobject_cast<QDeclarativeDateTimeFormatter*>(formatterComponent.create());
+    if(formatterComponent.isError())
+        qDebug() << formatterComponent.errors();
+    QVERIFY(formatter != 0);
+
+    QDateTime dateTime(QDate(1978,03,04),QTime(9,13,54));
+    QCOMPARE(formatter->dateTime(),dateTime);
+    QCOMPARE(formatter->date(),dateTime.date());
+    QCOMPARE(formatter->time(),dateTime.time());
+    QCOMPARE(formatter->dateTimeText(),dateTime.toString(Qt::SystemLocaleShortDate));
+
+    formatter->setLongStyle(true);
+    QCOMPARE(formatter->dateTimeText(),dateTime.toString(Qt::SystemLocaleLongDate));
+
+    formatter->setDateTimeFormat("M/d/yy H:m:s a");
+    QCOMPARE(formatter->dateTimeFormat(), QLatin1String("M/d/yy H:m:s a"));
+    QCOMPARE(formatter->dateTimeText(),dateTime.toString("M/d/yy H:m:s a"));
+
+    delete formatter;
+}
+
+QTEST_MAIN(tst_qmldatetimeformatter)
+
+#include "tst_qdeclarativedatetimeformatter.moc"
diff --git a/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro
new file mode 100644
index 0000000..ff1d0d4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += network declarative
+macx:CONFIG -= app_bundle
+
+HEADERS += ../shared/debugutil_p.h
+SOURCES += tst_qdeclarativedebug.cpp \
+           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
new file mode 100644
index 0000000..b23bddc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -0,0 +1,841 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QSignalSpy>
+#include <QTimer>
+#include <QHostAddress>
+#include <QDebug>
+#include <QThread>
+
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeexpression.h>
+#include <QtDeclarative/qdeclarativemetatype.h>
+#include <QtDeclarative/qdeclarativemetaproperty.h>
+
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativedebug_p.h>
+#include <private/qdeclarativeenginedebug_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
+#include <private/qdeclarativerectangle_p.h>
+
+#include "../shared/debugutil_p.h"
+
+Q_DECLARE_METATYPE(QDeclarativeDebugWatch::State)
+
+
+class tst_QmlDebug : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QmlDebug(QDeclarativeDebugTestData *data)
+    {
+        m_conn = data->conn;
+        m_engine = data->engine;
+        m_rootItem = data->items[0];
+    }
+
+private:
+    QDeclarativeDebugObjectReference findRootObject();
+    QDeclarativeDebugPropertyReference findProperty(const QList<QDeclarativeDebugPropertyReference> &props, const QString &name) const;
+    void waitForQuery(QDeclarativeDebugQuery *query);
+
+    void recursiveObjectTest(QObject *o, const QDeclarativeDebugObjectReference &oref, bool recursive) const;
+
+    void recursiveCompareObjects(const QDeclarativeDebugObjectReference &a, const QDeclarativeDebugObjectReference &b) const;
+    void recursiveCompareContexts(const QDeclarativeDebugContextReference &a, const QDeclarativeDebugContextReference &b) const;
+    void compareProperties(const QDeclarativeDebugPropertyReference &a, const QDeclarativeDebugPropertyReference &b) const;
+    
+    QDeclarativeDebugConnection *m_conn;
+    QDeclarativeEngineDebug *m_dbg;
+    QDeclarativeEngine *m_engine;
+    QDeclarativeItem *m_rootItem;
+
+private slots:
+    void initTestCase();
+
+    void watch_property();
+    void watch_object();
+    void watch_expression();
+    void watch_expression_data();
+    void watch_context();
+    void watch_file();
+
+    void queryAvailableEngines();
+    void queryRootContexts();
+    void queryObject();
+    void queryObject_data();
+    void queryExpressionResult();
+    void queryExpressionResult_data();
+
+    void tst_QmlDebugFileReference();
+    void tst_QmlDebugEngineReference();
+    void tst_QmlDebugObjectReference();
+    void tst_QmlDebugContextReference();
+    void tst_QmlDebugPropertyReference();
+};
+
+QDeclarativeDebugObjectReference tst_QmlDebug::findRootObject()
+{
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    
+    if (q_engines->engines().count() == 0)
+        return QDeclarativeDebugObjectReference();
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+
+    if (q_context->rootContext().objects().count() == 0)
+        return QDeclarativeDebugObjectReference();
+    QDeclarativeDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
+    waitForQuery(q_obj);
+
+    QDeclarativeDebugObjectReference result = q_obj->object();
+
+    delete q_engines;
+    delete q_context;
+    delete q_obj;
+
+    return result;
+}
+
+QDeclarativeDebugPropertyReference tst_QmlDebug::findProperty(const QList<QDeclarativeDebugPropertyReference> &props, const QString &name) const
+{
+    foreach(const QDeclarativeDebugPropertyReference &p, props) {
+        if (p.name() == name)
+            return p;
+    }
+    return QDeclarativeDebugPropertyReference();
+}
+
+void tst_QmlDebug::waitForQuery(QDeclarativeDebugQuery *query)
+{
+    QVERIFY(query);
+    QCOMPARE(query->parent(), this);
+    QVERIFY(query->state() == QDeclarativeDebugQuery::Waiting);
+    if (!QDeclarativeDebugTest::waitForSignal(query, SIGNAL(stateChanged(QDeclarativeDebugQuery::State))))
+        QFAIL("query timed out");
+}
+
+void tst_QmlDebug::recursiveObjectTest(QObject *o, const QDeclarativeDebugObjectReference &oref, bool recursive) const
+{
+    const QMetaObject *meta = o->metaObject();
+
+    QDeclarativeType *type = QDeclarativeMetaType::qmlType(o->metaObject());
+    QString className = type ? type->qmlTypeName() : QString();
+    className = className.mid(className.lastIndexOf(QLatin1Char('/'))+1);
+
+    QCOMPARE(oref.debugId(), QDeclarativeDebugService::idForObject(o));
+    QCOMPARE(oref.name(), o->objectName());
+    QCOMPARE(oref.className(), className);
+    QCOMPARE(oref.contextDebugId(), QDeclarativeDebugService::idForObject(qmlContext(o)));
+
+    const QObjectList &children = o->children();
+    for (int i=0; i<children.count(); i++) {
+        QObject *child = children[i];
+        if (!qmlContext(child))
+            continue;
+        int debugId = QDeclarativeDebugService::idForObject(child);
+        QVERIFY(debugId >= 0);
+
+        QDeclarativeDebugObjectReference cref;
+        foreach (const QDeclarativeDebugObjectReference &ref, oref.children()) {
+            if (ref.debugId() == debugId) {
+                cref = ref;
+                break;
+            }
+        }
+        QVERIFY(cref.debugId() >= 0);
+
+        if (recursive)
+            recursiveObjectTest(child, cref, true);
+    }
+
+    foreach (const QDeclarativeDebugPropertyReference &p, oref.properties()) {
+        QCOMPARE(p.objectDebugId(), QDeclarativeDebugService::idForObject(o));
+
+        // signal properties are fake - they are generated from QDeclarativeBoundSignal children
+        if (p.name().startsWith("on") && p.name().length() > 2 && p.name()[2].isUpper()) {
+            QVERIFY(p.value().toString().startsWith('{') && p.value().toString().endsWith('}'));
+            QVERIFY(p.valueTypeName().isEmpty());
+            QVERIFY(p.binding().isEmpty());
+            QVERIFY(!p.hasNotifySignal());
+            continue;
+        }
+
+        QMetaProperty pmeta = meta->property(meta->indexOfProperty(p.name().toUtf8().constData()));
+
+        QCOMPARE(p.name(), QString::fromUtf8(pmeta.name()));
+
+        if (pmeta.type() < QVariant::UserType) // TODO test complex types
+            QCOMPARE(p.value(), pmeta.read(o));
+
+        if (p.name() == "parent")
+            QVERIFY(p.valueTypeName() == "QGraphicsObject*" || p.valueTypeName() == "QDeclarativeItem*");
+        else
+            QCOMPARE(p.valueTypeName(), QString::fromUtf8(pmeta.typeName()));
+
+        QDeclarativeAbstractBinding *binding = QDeclarativeMetaProperty(o, p.name()).binding();
+        if (binding)
+            QCOMPARE(binding->expression(), p.binding());
+
+        QCOMPARE(p.hasNotifySignal(), pmeta.hasNotifySignal());
+
+        QVERIFY(pmeta.isValid());
+    }
+}
+
+void tst_QmlDebug::recursiveCompareObjects(const QDeclarativeDebugObjectReference &a, const QDeclarativeDebugObjectReference &b) const
+{
+    QCOMPARE(a.debugId(), b.debugId());
+    QCOMPARE(a.className(), b.className());
+    QCOMPARE(a.name(), b.name());
+    QCOMPARE(a.contextDebugId(), b.contextDebugId());
+
+    QCOMPARE(a.source().url(), b.source().url());
+    QCOMPARE(a.source().lineNumber(), b.source().lineNumber());
+    QCOMPARE(a.source().columnNumber(), b.source().columnNumber());
+
+    QCOMPARE(a.properties().count(), b.properties().count());
+    QCOMPARE(a.children().count(), b.children().count());
+
+    QList<QDeclarativeDebugPropertyReference> aprops = a.properties();
+    QList<QDeclarativeDebugPropertyReference> bprops = b.properties();
+
+    for (int i=0; i<aprops.count(); i++)
+        compareProperties(aprops[i], bprops[i]);
+
+    for (int i=0; i<a.children().count(); i++)
+        recursiveCompareObjects(a.children()[i], b.children()[i]);
+}
+
+void tst_QmlDebug::recursiveCompareContexts(const QDeclarativeDebugContextReference &a, const QDeclarativeDebugContextReference &b) const
+{
+    QCOMPARE(a.debugId(), b.debugId());
+    QCOMPARE(a.name(), b.name());
+    QCOMPARE(a.objects().count(), b.objects().count());
+    QCOMPARE(a.contexts().count(), b.contexts().count());
+
+    for (int i=0; i<a.objects().count(); i++)
+        recursiveCompareObjects(a.objects()[i], b.objects()[i]);
+
+    for (int i=0; i<a.contexts().count(); i++)
+        recursiveCompareContexts(a.contexts()[i], b.contexts()[i]);
+}
+
+void tst_QmlDebug::compareProperties(const QDeclarativeDebugPropertyReference &a, const QDeclarativeDebugPropertyReference &b) const
+{
+    QCOMPARE(a.objectDebugId(), b.objectDebugId());
+    QCOMPARE(a.name(), b.name());
+    QCOMPARE(a.value(), b.value());
+    QCOMPARE(a.valueTypeName(), b.valueTypeName());
+    QCOMPARE(a.binding(), b.binding());
+    QCOMPARE(a.hasNotifySignal(), b.hasNotifySignal());
+}
+
+void tst_QmlDebug::initTestCase()
+{
+    m_dbg = new QDeclarativeEngineDebug(m_conn, this);
+
+    qRegisterMetaType<QDeclarativeDebugWatch::State>();
+}
+
+void tst_QmlDebug::watch_property()
+{
+    QDeclarativeDebugObjectReference obj = findRootObject();
+    QDeclarativeDebugPropertyReference prop = findProperty(obj.properties(), "width");
+
+    QDeclarativeDebugPropertyWatch *watch;
+    
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
+    watch = unconnected->addWatch(prop, this);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Dead);
+    delete watch;
+    delete unconnected;
+
+    watch = m_dbg->addWatch(QDeclarativeDebugPropertyReference(), this);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Inactive);
+    delete watch;
+    
+    watch = m_dbg->addWatch(prop, this);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Waiting);
+    QCOMPARE(watch->objectDebugId(), obj.debugId());
+    QCOMPARE(watch->name(), prop.name());
+
+    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
+
+    int origWidth = m_rootItem->property("width").toInt();
+    m_rootItem->setProperty("width", origWidth*2);
+
+    // stateChanged() is received before valueChanged()
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Active);
+    QCOMPARE(spy.count(), 1);
+
+    m_dbg->removeWatch(watch);
+    delete watch;
+
+    // restore original value and verify spy doesn't get additional signal since watch has been removed
+    m_rootItem->setProperty("width", origWidth);
+    QTest::qWait(100);
+    QCOMPARE(spy.count(), 1);
+
+    QCOMPARE(spy.at(0).at(0).value<QByteArray>(), prop.name().toUtf8());
+    QCOMPARE(spy.at(0).at(1).value<QVariant>(), qVariantFromValue(origWidth*2));
+}
+
+void tst_QmlDebug::watch_object()
+{
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    
+    Q_ASSERT(q_engines->engines().count() > 0);
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+
+    Q_ASSERT(q_context->rootContext().objects().count() > 0);
+    QDeclarativeDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
+    waitForQuery(q_obj);
+
+    QDeclarativeDebugObjectReference obj = q_obj->object();
+
+    delete q_engines;
+    delete q_context;
+    delete q_obj;
+
+    QDeclarativeDebugWatch *watch;
+
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
+    watch = unconnected->addWatch(obj, this);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Dead);
+    delete watch;
+    delete unconnected;
+    
+    watch = m_dbg->addWatch(QDeclarativeDebugObjectReference(), this);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Inactive);
+    delete watch;
+
+    watch = m_dbg->addWatch(obj, this);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Waiting);
+    QCOMPARE(watch->objectDebugId(), obj.debugId());
+
+    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
+
+    int origWidth = m_rootItem->property("width").toInt();
+    int origHeight = m_rootItem->property("height").toInt();
+    m_rootItem->setProperty("width", origWidth*2);
+    m_rootItem->setProperty("height", origHeight*2);
+
+    // stateChanged() is received before any valueChanged() signals
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Active);
+    QVERIFY(spy.count() > 0);
+
+    int newWidth = -1;
+    int newHeight = -1;
+    for (int i=0; i<spy.count(); i++) {
+        const QVariantList &values = spy[i];
+        if (values[0].value<QByteArray>() == "width")
+            newWidth = values[1].value<QVariant>().toInt();
+        else if (values[0].value<QByteArray>() == "height")
+            newHeight = values[1].value<QVariant>().toInt();
+
+    }
+
+    m_dbg->removeWatch(watch);
+    delete watch;
+
+    // since watch has been removed, restoring the original values should not trigger a valueChanged()
+    spy.clear();
+    m_rootItem->setProperty("width", origWidth);
+    m_rootItem->setProperty("height", origHeight);
+    QTest::qWait(100);
+    QCOMPARE(spy.count(), 0);
+
+    QCOMPARE(newWidth, origWidth * 2);
+    QCOMPARE(newHeight, origHeight * 2);
+}
+
+void tst_QmlDebug::watch_expression()
+{
+    QFETCH(QString, expr);
+    QFETCH(int, increment);
+    QFETCH(int, incrementCount);
+
+    int origWidth = m_rootItem->property("width").toInt();
+    
+    QDeclarativeDebugObjectReference obj = findRootObject();
+
+    QDeclarativeDebugObjectExpressionWatch *watch;
+
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
+    watch = unconnected->addWatch(obj, expr, this);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Dead);
+    delete watch;
+    delete unconnected;
+    
+    watch = m_dbg->addWatch(QDeclarativeDebugObjectReference(), expr, this);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Inactive);
+    delete watch;
+    
+    watch = m_dbg->addWatch(obj, expr, this);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Waiting);
+    QCOMPARE(watch->objectDebugId(), obj.debugId());
+    QCOMPARE(watch->expression(), expr);
+
+    QSignalSpy spyState(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State)));
+
+    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
+    int expectedSpyCount = incrementCount + 1;  // should also get signal with expression's initial value
+
+    int width = origWidth;
+    for (int i=0; i<incrementCount+1; i++) {
+        if (i > 0) {
+            width += increment;
+            m_rootItem->setProperty("width", width);
+        }
+        if (!QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(valueChanged(QByteArray,QVariant))))
+            QFAIL("Did not receive valueChanged() for expression");
+    }
+
+    if (spyState.count() == 0)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(spyState.count(), 1);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Active);
+
+    m_dbg->removeWatch(watch);
+    delete watch;
+
+    // restore original value and verify spy doesn't get a signal since watch has been removed
+    m_rootItem->setProperty("width", origWidth); 
+    QTest::qWait(100);
+    QCOMPARE(spy.count(), expectedSpyCount);
+
+    width = origWidth + increment;
+    for (int i=0; i<spy.count(); i++) {
+        QCOMPARE(spy.at(i).at(1).value<QVariant>().toInt(), width);
+        width += increment;
+    }
+}
+
+void tst_QmlDebug::watch_expression_data()
+{
+    QTest::addColumn<QString>("expr");
+    QTest::addColumn<int>("increment");
+    QTest::addColumn<int>("incrementCount");
+
+    QTest::newRow("width") << "width" << 0 << 0;
+    QTest::newRow("width+10") << "width + 10" << 10 << 5;
+}
+
+void tst_QmlDebug::watch_context()
+{
+    QDeclarativeDebugContextReference c;
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngineDebug::addWatch(): Not implemented");
+    QVERIFY(!m_dbg->addWatch(c, QString(), this));
+}
+
+void tst_QmlDebug::watch_file()
+{
+    QDeclarativeDebugFileReference f;
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngineDebug::addWatch(): Not implemented");
+    QVERIFY(!m_dbg->addWatch(f, this));
+}
+
+void tst_QmlDebug::queryAvailableEngines()
+{
+    QDeclarativeDebugEnginesQuery *q_engines;
+
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
+    q_engines = unconnected->queryAvailableEngines(0);
+    QCOMPARE(q_engines->state(), QDeclarativeDebugQuery::Error);
+    delete q_engines;
+    delete unconnected;
+
+    q_engines = m_dbg->queryAvailableEngines(this);
+    delete q_engines;
+
+    q_engines = m_dbg->queryAvailableEngines(this);
+    QVERIFY(q_engines->engines().isEmpty());
+    waitForQuery(q_engines);
+
+    // TODO test multiple engines
+    QList<QDeclarativeDebugEngineReference> engines = q_engines->engines();
+    QCOMPARE(engines.count(), 1);
+
+    foreach(const QDeclarativeDebugEngineReference &e, engines) {
+        QCOMPARE(e.debugId(), QDeclarativeDebugService::idForObject(m_engine));
+        QCOMPARE(e.name(), m_engine->objectName());
+    }
+
+    delete q_engines;
+}
+
+void tst_QmlDebug::queryRootContexts()
+{
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    int engineId = q_engines->engines()[0].debugId();
+
+    QDeclarativeDebugRootContextQuery *q_context;
+    
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
+    q_context = unconnected->queryRootContexts(engineId, this);
+    QCOMPARE(q_context->state(), QDeclarativeDebugQuery::Error);
+    delete q_context;
+    delete unconnected;
+
+    q_context = m_dbg->queryRootContexts(engineId, this);
+    delete q_context;
+
+    q_context = m_dbg->queryRootContexts(engineId, this);
+    waitForQuery(q_context);
+
+    QDeclarativeContext *actualContext = m_engine->rootContext();
+    QDeclarativeDebugContextReference context = q_context->rootContext();
+    QCOMPARE(context.debugId(), QDeclarativeDebugService::idForObject(actualContext));
+    QCOMPARE(context.name(), actualContext->objectName());
+
+    QCOMPARE(context.objects().count(), 2); // 2 qml component objects created for context in main()
+
+    // root context query sends only root object data - it doesn't fill in
+    // the children or property info
+    QCOMPARE(context.objects()[0].properties().count(), 0);
+    QCOMPARE(context.objects()[0].children().count(), 0);
+
+    QCOMPARE(context.contexts().count(), 1);
+    QVERIFY(context.contexts()[0].debugId() >= 0);
+    QCOMPARE(context.contexts()[0].name(), QString("tst_QmlDebug_childContext"));
+
+    delete q_engines;
+    delete q_context;
+}
+
+void tst_QmlDebug::queryObject()
+{
+    QFETCH(bool, recursive);
+
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+    QDeclarativeDebugObjectReference rootObject = q_context->rootContext().objects()[0];
+
+    QDeclarativeDebugObjectQuery *q_obj = 0;
+
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
+    q_obj = recursive ? unconnected->queryObjectRecursive(rootObject, this) : unconnected->queryObject(rootObject, this);
+    QCOMPARE(q_obj->state(), QDeclarativeDebugQuery::Error);
+    delete q_obj;
+    delete unconnected;
+
+    q_obj = recursive ? m_dbg->queryObjectRecursive(rootObject, this) : m_dbg->queryObject(rootObject, this);
+    delete q_obj;
+
+    q_obj = recursive ? m_dbg->queryObjectRecursive(rootObject, this) : m_dbg->queryObject(rootObject, this);
+    waitForQuery(q_obj);
+
+    QDeclarativeDebugObjectReference obj = q_obj->object();
+
+    delete q_engines;
+    delete q_context;
+    delete q_obj;
+
+    // check source as defined in main()
+    QDeclarativeDebugFileReference source = obj.source();
+    QCOMPARE(source.url(), QUrl::fromLocalFile(""));
+    QCOMPARE(source.lineNumber(), 2);
+    QCOMPARE(source.columnNumber(), 1);
+
+    // generically test all properties, children and childrens' properties
+    recursiveObjectTest(m_rootItem, obj, recursive);
+
+    if (recursive) {
+        foreach(const QDeclarativeDebugObjectReference &child, obj.children())
+            QVERIFY(child.properties().count() > 0);
+
+        QDeclarativeDebugObjectReference rect;
+        QDeclarativeDebugObjectReference text;
+        foreach (const QDeclarativeDebugObjectReference &child, obj.children()) {
+            if (child.className() == "Rectangle")
+                rect = child;
+            else if (child.className() == "Text")
+                text = child;
+        }
+
+        // test specific property values
+        QCOMPARE(findProperty(rect.properties(), "width").value(), qVariantFromValue(500));
+        QCOMPARE(findProperty(rect.properties(), "height").value(), qVariantFromValue(600));
+        QCOMPARE(findProperty(rect.properties(), "color").value(), qVariantFromValue(QColor("blue")));
+
+        QCOMPARE(findProperty(text.properties(), "color").value(), qVariantFromValue(QColor("blue")));
+
+    } else {
+        foreach(const QDeclarativeDebugObjectReference &child, obj.children())
+            QCOMPARE(child.properties().count(), 0);
+    }
+}
+
+void tst_QmlDebug::queryObject_data()
+{
+    QTest::addColumn<bool>("recursive");
+
+    QTest::newRow("non-recursive") << false;
+    QTest::newRow("recursive") << true;
+}
+
+void tst_QmlDebug::queryExpressionResult()
+{
+    QFETCH(QString, expr);
+    QFETCH(QVariant, result);
+
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);    // check immediate deletion is ok
+    
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+    int objectId = q_context->rootContext().objects()[0].debugId();
+
+    QDeclarativeDebugExpressionQuery *q_expr;
+
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
+    q_expr = unconnected->queryExpressionResult(objectId, expr, this);
+    QCOMPARE(q_expr->state(), QDeclarativeDebugQuery::Error);
+    delete q_expr;
+    delete unconnected;
+    
+    q_expr = m_dbg->queryExpressionResult(objectId, expr, this);
+    delete q_expr;
+
+    q_expr = m_dbg->queryExpressionResult(objectId, expr, this);
+    QCOMPARE(q_expr->expression(), expr);
+    waitForQuery(q_expr);
+
+    QCOMPARE(q_expr->result(), result);
+
+    delete q_engines;
+    delete q_context;
+    delete q_expr;
+}
+
+void tst_QmlDebug::queryExpressionResult_data()
+{
+    QTest::addColumn<QString>("expr");
+    QTest::addColumn<QVariant>("result");
+
+    QTest::newRow("width + 50") << "width + 50" << qVariantFromValue(60);
+    QTest::newRow("blueRect.width") << "blueRect.width" << qVariantFromValue(500);
+    QTest::newRow("bad expr") << "aeaef" << qVariantFromValue(QString("<undefined>"));
+}
+
+void tst_QmlDebug::tst_QmlDebugFileReference()
+{
+    QDeclarativeDebugFileReference ref;
+    QVERIFY(ref.url().isEmpty());
+    QCOMPARE(ref.lineNumber(), -1);
+    QCOMPARE(ref.columnNumber(), -1);
+
+    ref.setUrl(QUrl("http://test"));
+    QCOMPARE(ref.url(), QUrl("http://test"));
+    ref.setLineNumber(1);
+    QCOMPARE(ref.lineNumber(), 1);
+    ref.setColumnNumber(1);
+    QCOMPARE(ref.columnNumber(), 1);
+
+    QDeclarativeDebugFileReference copy(ref);
+    QDeclarativeDebugFileReference copyAssign;
+    copyAssign = ref;
+    foreach (const QDeclarativeDebugFileReference &r, (QList<QDeclarativeDebugFileReference>() << copy << copyAssign)) {
+        QCOMPARE(r.url(), ref.url());
+        QCOMPARE(r.lineNumber(), ref.lineNumber());
+        QCOMPARE(r.columnNumber(), ref.columnNumber());
+    }
+}
+
+void tst_QmlDebug::tst_QmlDebugEngineReference()
+{
+    QDeclarativeDebugEngineReference ref;
+    QCOMPARE(ref.debugId(), -1);
+    QVERIFY(ref.name().isEmpty());
+
+    ref = QDeclarativeDebugEngineReference(1);
+    QCOMPARE(ref.debugId(), 1);
+    QVERIFY(ref.name().isEmpty());
+
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    ref = q_engines->engines()[0];
+    delete q_engines;
+
+    QDeclarativeDebugEngineReference copy(ref);
+    QDeclarativeDebugEngineReference copyAssign;
+    copyAssign = ref;
+    foreach (const QDeclarativeDebugEngineReference &r, (QList<QDeclarativeDebugEngineReference>() << copy << copyAssign)) {
+        QCOMPARE(r.debugId(), ref.debugId());
+        QCOMPARE(r.name(), ref.name());
+    }
+}
+
+void tst_QmlDebug::tst_QmlDebugObjectReference()
+{
+    QDeclarativeDebugObjectReference ref;
+    QCOMPARE(ref.debugId(), -1);
+    QCOMPARE(ref.className(), QString());
+    QCOMPARE(ref.name(), QString());
+    QCOMPARE(ref.contextDebugId(), -1);
+    QVERIFY(ref.properties().isEmpty());
+    QVERIFY(ref.children().isEmpty());
+
+    QDeclarativeDebugFileReference source = ref.source();
+    QVERIFY(source.url().isEmpty());
+    QVERIFY(source.lineNumber() < 0);
+    QVERIFY(source.columnNumber() < 0);
+
+    ref = QDeclarativeDebugObjectReference(1);
+    QCOMPARE(ref.debugId(), 1);
+
+    QDeclarativeDebugObjectReference rootObject = findRootObject();
+    QDeclarativeDebugObjectQuery *query = m_dbg->queryObjectRecursive(rootObject, this);
+    waitForQuery(query);
+    ref = query->object();
+    delete query;
+
+    QVERIFY(ref.debugId() >= 0);
+
+    QDeclarativeDebugObjectReference copy(ref);
+    QDeclarativeDebugObjectReference copyAssign;
+    copyAssign = ref;
+    foreach (const QDeclarativeDebugObjectReference &r, (QList<QDeclarativeDebugObjectReference>() << copy << copyAssign))
+        recursiveCompareObjects(r, ref);
+}
+
+void tst_QmlDebug::tst_QmlDebugContextReference()
+{
+    QDeclarativeDebugContextReference ref;
+    QCOMPARE(ref.debugId(), -1);
+    QVERIFY(ref.name().isEmpty());
+    QVERIFY(ref.objects().isEmpty());
+    QVERIFY(ref.contexts().isEmpty());
+
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+
+    ref = q_context->rootContext();
+    delete q_engines;
+    delete q_context;
+    QVERIFY(ref.debugId() >= 0);
+
+    QDeclarativeDebugContextReference copy(ref);
+    QDeclarativeDebugContextReference copyAssign;
+    copyAssign = ref;
+    foreach (const QDeclarativeDebugContextReference &r, (QList<QDeclarativeDebugContextReference>() << copy << copyAssign))
+        recursiveCompareContexts(r, ref);
+}
+
+void tst_QmlDebug::tst_QmlDebugPropertyReference()
+{
+    QDeclarativeDebugObjectReference rootObject = findRootObject();
+    QDeclarativeDebugObjectQuery *query = m_dbg->queryObject(rootObject, this);
+    waitForQuery(query);
+    QDeclarativeDebugObjectReference obj = query->object();
+    delete query;   
+
+    QDeclarativeDebugPropertyReference ref = findProperty(obj.properties(), "scale");
+    QVERIFY(ref.objectDebugId() > 0);
+    QVERIFY(!ref.name().isEmpty());
+    QVERIFY(!ref.value().isNull());
+    QVERIFY(!ref.valueTypeName().isEmpty());
+    QVERIFY(!ref.binding().isEmpty());
+    QVERIFY(ref.hasNotifySignal());
+  
+    QDeclarativeDebugPropertyReference copy(ref);
+    QDeclarativeDebugPropertyReference copyAssign;
+    copyAssign = ref;
+    foreach (const QDeclarativeDebugPropertyReference &r, (QList<QDeclarativeDebugPropertyReference>() << copy << copyAssign))
+        compareProperties(r, ref);
+}
+
+
+class tst_QmlDebug_Factory : public QDeclarativeTestFactory
+{
+public:
+    QObject *createTest(QDeclarativeDebugTestData *data)
+    {
+        tst_QmlDebug *test = new tst_QmlDebug(data);
+        QDeclarativeContext *c = new QDeclarativeContext(data->engine->rootContext(), test);
+        c->setObjectName("tst_QmlDebug_childContext");
+        return test;
+    }
+};
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QList<QByteArray> qml;
+    qml << "import Qt 4.6\n"
+            "Item {"
+                "width: 10; height: 20; scale: blueRect.scale;"
+                "Rectangle { id: blueRect; width: 500; height: 600; color: \"blue\"; }"
+                "Text { color: blueRect.color; }"
+                "MouseArea {"
+                    "onEntered: { console.log('hello') }"
+                "}"
+            "}";
+    // add second component to test multiple root contexts
+    qml << "import Qt 4.6\n"
+            "Item {}";
+    tst_QmlDebug_Factory factory;
+    return QDeclarativeDebugTest::runTests(&factory, qml);
+}
+
+//QTEST_MAIN(tst_QmlDebug)
+
+#include "tst_qdeclarativedebug.moc"
diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro
new file mode 100644
index 0000000..a3afd99
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += network declarative
+macx:CONFIG -= app_bundle
+
+HEADERS += ../shared/debugutil_p.h
+SOURCES += tst_qdeclarativedebugclient.cpp \
+           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
new file mode 100644
index 0000000..7e68ae8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QSignalSpy>
+#include <QTimer>
+#include <QHostAddress>
+#include <QDebug>
+#include <QThread>
+
+#include <QtDeclarative/qdeclarativeengine.h>
+
+#include <private/qdeclarativedebug_p.h>
+#include <private/qdeclarativeenginedebug_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
+
+#include "../shared/debugutil_p.h"
+
+class tst_QmlDebugClient : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QmlDebugClient(QDeclarativeDebugTestData *data)
+    {
+        m_conn = data->conn;
+    }
+
+    QDeclarativeDebugConnection *m_conn;
+
+private slots:
+    void name();
+    void isEnabled();
+    void setEnabled();
+    void isConnected();
+    void sendMessage();
+};
+
+void tst_QmlDebugClient::name()
+{
+    QString name = "tst_QmlDebugClient::name()";
+
+    QDeclarativeDebugClient client(name, m_conn);
+    QCOMPARE(client.name(), name);
+}
+
+void tst_QmlDebugClient::isEnabled()
+{
+    QDeclarativeDebugClient client("tst_QmlDebugClient::isEnabled()", m_conn);
+    QCOMPARE(client.isEnabled(), false);
+}
+
+void tst_QmlDebugClient::setEnabled()
+{
+    QDeclarativeDebugTestService service("tst_QmlDebugClient::setEnabled()");
+    QDeclarativeDebugTestClient client("tst_QmlDebugClient::setEnabled()", m_conn);
+
+    QCOMPARE(service.isEnabled(), false);
+
+    client.setEnabled(true);
+    QCOMPARE(client.isEnabled(), true);
+    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QCOMPARE(service.isEnabled(), true);
+
+    client.setEnabled(false);
+    QCOMPARE(client.isEnabled(), false);
+    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QCOMPARE(service.isEnabled(), false);
+}
+
+void tst_QmlDebugClient::isConnected()
+{
+    QDeclarativeDebugClient client1("tst_QmlDebugClient::isConnected() A", m_conn);
+    QCOMPARE(client1.isConnected(), true);
+
+    QDeclarativeDebugConnection conn;
+    QDeclarativeDebugClient client2("tst_QmlDebugClient::isConnected() B", &conn);
+    QCOMPARE(client2.isConnected(), false);
+
+    QDeclarativeDebugClient client3("tst_QmlDebugClient::isConnected() C", 0);
+    QCOMPARE(client3.isConnected(), false);
+
+    // duplicate plugin name
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugClient: Conflicting plugin name \"tst_QmlDebugClient::isConnected() A\" ");
+    QDeclarativeDebugClient client4("tst_QmlDebugClient::isConnected() A", m_conn);
+    QCOMPARE(client4.isConnected(), false);
+}
+
+void tst_QmlDebugClient::sendMessage()
+{
+    QDeclarativeDebugTestService service("tst_QmlDebugClient::sendMessage()");
+    QDeclarativeDebugTestClient client("tst_QmlDebugClient::sendMessage()", m_conn);
+
+    QByteArray msg = "hello!";
+
+    client.sendMessage(msg);
+    QByteArray resp = client.waitForResponse();
+    QCOMPARE(resp, msg);
+}
+
+
+class tst_QmlDebugClient_Factory : public QDeclarativeTestFactory
+{
+public:
+    QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QmlDebugClient(data); }
+};
+
+
+// This does not use QTEST_MAIN because the test has to be created and run
+// in a separate thread.
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    tst_QmlDebugClient_Factory factory;
+    return QDeclarativeDebugTest::runTests(&factory);
+}
+
+#include "tst_qdeclarativedebugclient.moc"
diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
new file mode 100644
index 0000000..e375889
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += network declarative
+macx:CONFIG -= app_bundle
+
+HEADERS += ../shared/debugutil_p.h
+SOURCES += tst_qdeclarativedebugservice.cpp \
+           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
new file mode 100644
index 0000000..69def9a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -0,0 +1,190 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QSignalSpy>
+#include <QTimer>
+#include <QHostAddress>
+#include <QDebug>
+#include <QThread>
+
+#include <QtDeclarative/qdeclarativeengine.h>
+
+#include <private/qdeclarativedebug_p.h>
+#include <private/qdeclarativeenginedebug_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
+
+#include "../shared/debugutil_p.h"
+
+class tst_QmlDebugService : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QmlDebugService(QDeclarativeDebugTestData *data)
+    {
+        m_conn = data->conn;
+    }
+
+    QDeclarativeDebugConnection *m_conn;
+
+private slots:
+    void name();
+    void isEnabled();
+    void enabledChanged();
+    void sendMessage();
+    void idForObject();
+    void objectForId();
+    void objectToString();
+};
+
+void tst_QmlDebugService::name()
+{
+    QString name = "tst_QmlDebugService::name()";
+
+    QDeclarativeDebugService service(name);
+    QCOMPARE(service.name(), name);
+}
+
+void tst_QmlDebugService::isEnabled()
+{
+    QDeclarativeDebugTestService service("tst_QmlDebugService::isEnabled()", m_conn);
+    QCOMPARE(service.isEnabled(), false);
+
+    QDeclarativeDebugTestClient client("tst_QmlDebugService::isEnabled()", m_conn);
+    client.setEnabled(true);
+    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QCOMPARE(service.isEnabled(), true);
+
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QmlDebugService::isEnabled()\" ");
+    QDeclarativeDebugService duplicate("tst_QmlDebugService::isEnabled()", m_conn);
+    QCOMPARE(duplicate.isEnabled(), false);
+}
+
+void tst_QmlDebugService::enabledChanged()
+{
+    QDeclarativeDebugTestService service("tst_QmlDebugService::enabledChanged()");
+    QDeclarativeDebugTestClient client("tst_QmlDebugService::enabledChanged()", m_conn);
+
+    QCOMPARE(service.enabled, false);
+
+    client.setEnabled(true);
+    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QCOMPARE(service.enabled, true);
+}
+
+void tst_QmlDebugService::sendMessage()
+{
+    QDeclarativeDebugTestService service("tst_QmlDebugService::sendMessage()");
+    QDeclarativeDebugTestClient client("tst_QmlDebugService::sendMessage()", m_conn);
+
+    QByteArray msg = "hello!";
+
+    client.sendMessage(msg);
+    QByteArray resp = client.waitForResponse();
+    QCOMPARE(resp, msg);
+}
+
+void tst_QmlDebugService::idForObject()
+{
+    QCOMPARE(QDeclarativeDebugService::idForObject(0), -1);
+
+    QObject *objA = new QObject;
+
+    int idA = QDeclarativeDebugService::idForObject(objA);
+    QVERIFY(idA >= 0);
+    QCOMPARE(QDeclarativeDebugService::objectForId(idA), objA);
+
+    int idAA = QDeclarativeDebugService::idForObject(objA);
+    QCOMPARE(idAA, idA);
+
+    QObject *objB = new QObject;
+    int idB = QDeclarativeDebugService::idForObject(objB);
+    QVERIFY(idB != idA);
+    QCOMPARE(QDeclarativeDebugService::objectForId(idB), objB);
+ 
+    delete objA;
+    delete objB;
+}
+
+void tst_QmlDebugService::objectForId()
+{
+    QCOMPARE(QDeclarativeDebugService::objectForId(-1), static_cast<QObject*>(0));
+    QCOMPARE(QDeclarativeDebugService::objectForId(1), static_cast<QObject*>(0));
+
+    QObject *obj = new QObject;
+    int id = QDeclarativeDebugService::idForObject(obj);
+    QCOMPARE(QDeclarativeDebugService::objectForId(id), obj);
+
+    delete obj;
+    QCOMPARE(QDeclarativeDebugService::objectForId(id), static_cast<QObject*>(0));
+}
+
+void tst_QmlDebugService::objectToString()
+{
+    QCOMPARE(QDeclarativeDebugService::objectToString(0), QString("NULL"));
+
+    QObject *obj = new QObject;
+    QCOMPARE(QDeclarativeDebugService::objectToString(obj), QString("QObject: <unnamed>"));
+
+    obj->setObjectName("Hello");
+    QCOMPARE(QDeclarativeDebugService::objectToString(obj), QString("QObject: Hello"));
+    delete obj;
+}
+
+
+class tst_QmlDebugService_Factory : public QDeclarativeTestFactory
+{
+public:
+    QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QmlDebugService(data); }
+};
+
+// This does not use QTEST_MAIN because the test has to be created and run
+// in a separate thread.
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    tst_QmlDebugService_Factory factory;
+    return QDeclarativeDebugTest::runTests(&factory);
+}
+
+#include "tst_qdeclarativedebugservice.moc"
diff --git a/tests/auto/declarative/qdeclarativedom/data/MyComponent.qml b/tests/auto/declarative/qdeclarativedom/data/MyComponent.qml
new file mode 100644
index 0000000..1472f01
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedom/data/MyComponent.qml
@@ -0,0 +1,4 @@
+import Qt 4.6
+
+Item {
+}
diff --git a/tests/auto/declarative/qdeclarativedom/data/MyItem.qml b/tests/auto/declarative/qdeclarativedom/data/MyItem.qml
new file mode 100644
index 0000000..1472f01
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedom/data/MyItem.qml
@@ -0,0 +1,4 @@
+import Qt 4.6
+
+Item {
+}
diff --git a/tests/auto/declarative/qdeclarativedom/data/importdir/Bar.qml b/tests/auto/declarative/qdeclarativedom/data/importdir/Bar.qml
new file mode 100644
index 0000000..2d1a4a3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedom/data/importdir/Bar.qml
@@ -0,0 +1,2 @@
+import Qt 4.6
+
diff --git a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml
new file mode 100644
index 0000000..2d1a4a3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml
@@ -0,0 +1,2 @@
+import Qt 4.6
+
diff --git a/tests/auto/declarative/qdeclarativedom/data/top.qml b/tests/auto/declarative/qdeclarativedom/data/top.qml
new file mode 100644
index 0000000..2681993
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedom/data/top.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+MyComponent {
+    width: 100
+    height: 100
+}
diff --git a/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro
new file mode 100644
index 0000000..35df26e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativedom.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
new file mode 100644
index 0000000..a92a240
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -0,0 +1,1313 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/private/qdeclarativedom_p.h>
+
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+
+class tst_qmldom : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmldom() {}
+
+private slots:
+    void loadSimple();
+    void loadProperties();
+    void loadGroupedProperties();
+    void loadChildObject();
+    void loadComposite();
+    void loadImports();
+    void loadErrors();
+    void loadSyntaxErrors();
+    void loadRemoteErrors();
+    void loadDynamicProperty();
+    void loadComponent();
+
+    void testValueSource();
+    void testValueInterceptor();
+
+    void object_dynamicProperty();
+    void object_property();
+    void object_url();
+
+    void copy();
+    void position();
+private:
+    QDeclarativeEngine engine;
+};
+
+
+void tst_qmldom::loadSimple()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                      "Item {}";
+
+    QDeclarativeDomDocument document;
+    QVERIFY(document.load(&engine, qml));
+    QVERIFY(document.errors().isEmpty());
+
+    QDeclarativeDomObject rootObject = document.rootObject();
+    QVERIFY(rootObject.isValid());
+    QVERIFY(!rootObject.isComponent());
+    QVERIFY(!rootObject.isCustomType());
+    QVERIFY(rootObject.objectType() == "Qt/Item");
+    QVERIFY(rootObject.objectTypeMajorVersion() == 4);
+    QVERIFY(rootObject.objectTypeMinorVersion() == 6);
+}
+
+// Test regular properties
+void tst_qmldom::loadProperties()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                     "Item { id : item; x : 300; visible : true }";
+
+    QDeclarativeDomDocument document;
+    QVERIFY(document.load(&engine, qml));
+
+    QDeclarativeDomObject rootObject = document.rootObject();
+    QVERIFY(rootObject.isValid());
+    QVERIFY(rootObject.objectId() == "item");
+    QCOMPARE(rootObject.properties().size(), 3);
+
+    QDeclarativeDomProperty xProperty = rootObject.property("x");
+    QVERIFY(xProperty.propertyName() == "x");
+    QCOMPARE(xProperty.propertyNameParts().count(), 1);
+    QVERIFY(xProperty.propertyNameParts().at(0) == "x");
+    QCOMPARE(xProperty.position(), 32);
+    QCOMPARE(xProperty.length(), 1);
+    QVERIFY(xProperty.value().isLiteral());
+    QVERIFY(xProperty.value().toLiteral().literal() == "300");
+
+    QDeclarativeDomProperty visibleProperty = rootObject.property("visible");
+    QVERIFY(visibleProperty.propertyName() == "visible");
+    QCOMPARE(visibleProperty.propertyNameParts().count(), 1);
+    QVERIFY(visibleProperty.propertyNameParts().at(0) == "visible");
+    QCOMPARE(visibleProperty.position(), 41);
+    QCOMPARE(visibleProperty.length(), 7);
+    QVERIFY(visibleProperty.value().isLiteral());
+    QVERIFY(visibleProperty.value().toLiteral().literal() == "true");
+}
+
+// Test grouped properties
+void tst_qmldom::loadGroupedProperties()
+{
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item { anchors.left: parent.left; anchors.right: parent.right }";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootItem = document.rootObject();
+        QVERIFY(rootItem.isValid());
+        QVERIFY(rootItem.properties().size() == 2);
+
+        // Order is not deterministic
+        QDeclarativeDomProperty p0 = rootItem.properties().at(0);
+        QDeclarativeDomProperty p1 = rootItem.properties().at(1);
+        QDeclarativeDomProperty leftProperty;
+        QDeclarativeDomProperty rightProperty;
+        if (p0.propertyName() == "anchors.left") {
+            leftProperty = p0;
+            rightProperty = p1;
+        } else {
+            leftProperty = p1;
+            rightProperty = p0;
+        }
+
+        QVERIFY(leftProperty.propertyName() == "anchors.left");
+        QCOMPARE(leftProperty.propertyNameParts().count(), 2);
+        QVERIFY(leftProperty.propertyNameParts().at(0) == "anchors");
+        QVERIFY(leftProperty.propertyNameParts().at(1) == "left");
+        QCOMPARE(leftProperty.position(), 21);
+        QCOMPARE(leftProperty.length(), 12);
+        QVERIFY(leftProperty.value().isBinding());
+        QVERIFY(leftProperty.value().toBinding().binding() == "parent.left");
+
+        QVERIFY(rightProperty.propertyName() == "anchors.right");
+        QCOMPARE(rightProperty.propertyNameParts().count(), 2);
+        QVERIFY(rightProperty.propertyNameParts().at(0) == "anchors");
+        QVERIFY(rightProperty.propertyNameParts().at(1) == "right");
+        QCOMPARE(rightProperty.position(), 48);
+        QCOMPARE(rightProperty.length(), 13);
+        QVERIFY(rightProperty.value().isBinding());
+        QVERIFY(rightProperty.value().toBinding().binding() == "parent.right");
+    }
+
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item { \n"
+                         "    anchors {\n"
+                         "        left: parent.left\n"
+                         "        right: parent.right\n"
+                         "    }\n"
+                         "}";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootItem = document.rootObject();
+        QVERIFY(rootItem.isValid());
+        QVERIFY(rootItem.properties().size() == 2);
+
+        // Order is not deterministic
+        QDeclarativeDomProperty p0 = rootItem.properties().at(0);
+        QDeclarativeDomProperty p1 = rootItem.properties().at(1);
+        QDeclarativeDomProperty leftProperty;
+        QDeclarativeDomProperty rightProperty;
+        if (p0.propertyName() == "anchors.left") {
+            leftProperty = p0;
+            rightProperty = p1;
+        } else {
+            leftProperty = p1;
+            rightProperty = p0;
+        }
+
+        QVERIFY(leftProperty.propertyName() == "anchors.left");
+        QCOMPARE(leftProperty.propertyNameParts().count(), 2);
+        QVERIFY(leftProperty.propertyNameParts().at(0) == "anchors");
+        QVERIFY(leftProperty.propertyNameParts().at(1) == "left");
+        QCOMPARE(leftProperty.position(), 44);
+        QCOMPARE(leftProperty.length(), 4);
+        QVERIFY(leftProperty.value().isBinding());
+        QVERIFY(leftProperty.value().toBinding().binding() == "parent.left");
+
+        QVERIFY(rightProperty.propertyName() == "anchors.right");
+        QCOMPARE(rightProperty.propertyNameParts().count(), 2);
+        QVERIFY(rightProperty.propertyNameParts().at(0) == "anchors");
+        QVERIFY(rightProperty.propertyNameParts().at(1) == "right");
+        QCOMPARE(rightProperty.position(), 70);
+        QCOMPARE(rightProperty.length(), 5);
+        QVERIFY(rightProperty.value().isBinding());
+        QVERIFY(rightProperty.value().toBinding().binding() == "parent.right");
+    }
+
+}
+
+void tst_qmldom::loadChildObject()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                     "Item { Item {} }";
+
+    QDeclarativeDomDocument document;
+    QVERIFY(document.load(&engine, qml));
+
+    QDeclarativeDomObject rootItem = document.rootObject();
+    QVERIFY(rootItem.isValid());
+    QVERIFY(rootItem.properties().size() == 1);
+
+    QDeclarativeDomProperty listProperty = rootItem.properties().at(0);
+    QVERIFY(listProperty.isDefaultProperty());
+    QVERIFY(listProperty.value().isList());
+
+    QDeclarativeDomList list = listProperty.value().toList();
+    QVERIFY(list.values().size() == 1);
+
+    QDeclarativeDomObject childItem = list.values().first().toObject();
+    QVERIFY(childItem.isValid());
+    QVERIFY(childItem.objectType() == "Qt/Item");
+}
+
+void tst_qmldom::loadComposite()
+{
+    QFile file(SRCDIR  "/data/top.qml");
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+
+    QDeclarativeDomDocument document;
+    QVERIFY(document.load(&engine, file.readAll(), QUrl::fromLocalFile(file.fileName())));
+    QVERIFY(document.errors().isEmpty());
+
+    QDeclarativeDomObject rootItem = document.rootObject();
+    QVERIFY(rootItem.isValid());
+    QCOMPARE(rootItem.objectType(), QByteArray("MyComponent"));
+    QCOMPARE(rootItem.properties().size(), 2);
+
+    QDeclarativeDomProperty widthProperty = rootItem.property("width");
+    QVERIFY(widthProperty.value().isLiteral());
+
+    QDeclarativeDomProperty heightProperty = rootItem.property("height");
+    QVERIFY(heightProperty.value().isLiteral());
+}
+
+void tst_qmldom::testValueSource()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                     "Rectangle { height: SpringFollow { spring: 1.4; damping: .15; source: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
+
+    QDeclarativeEngine freshEngine;
+    QDeclarativeDomDocument document;
+    QVERIFY(document.load(&freshEngine, qml));
+
+    QDeclarativeDomObject rootItem = document.rootObject();
+    QVERIFY(rootItem.isValid());
+    QDeclarativeDomProperty heightProperty = rootItem.properties().at(0);
+    QVERIFY(heightProperty.propertyName() == "height");
+    QVERIFY(heightProperty.value().isValueSource());
+
+    const QDeclarativeDomValueValueSource valueSource = heightProperty.value().toValueSource();
+    QDeclarativeDomObject valueSourceObject = valueSource.object();
+    QVERIFY(valueSourceObject.isValid());
+
+    QVERIFY(valueSourceObject.objectType() == "Qt/SpringFollow");
+    
+    const QDeclarativeDomValue springValue = valueSourceObject.property("spring").value();
+    QVERIFY(!springValue.isInvalid());
+    QVERIFY(springValue.isLiteral());
+    QVERIFY(springValue.toLiteral().literal() == "1.4");
+
+    const QDeclarativeDomValue sourceValue = valueSourceObject.property("source").value();
+    QVERIFY(!sourceValue.isInvalid());
+    QVERIFY(sourceValue.isBinding());
+    QVERIFY(sourceValue.toBinding().binding() == "Math.min(Math.max(-130, value*2.2 - 130), 133)");
+}
+
+void tst_qmldom::testValueInterceptor()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                     "Rectangle { height: Behavior { NumberAnimation { duration: 100 } } }";
+
+    QDeclarativeEngine freshEngine;
+    QDeclarativeDomDocument document;
+    QVERIFY(document.load(&freshEngine, qml));
+
+    QDeclarativeDomObject rootItem = document.rootObject();
+    QVERIFY(rootItem.isValid());
+    QDeclarativeDomProperty heightProperty = rootItem.properties().at(0);
+    QVERIFY(heightProperty.propertyName() == "height");
+    QVERIFY(heightProperty.value().isValueInterceptor());
+
+    const QDeclarativeDomValueValueInterceptor valueInterceptor = heightProperty.value().toValueInterceptor();
+    QDeclarativeDomObject valueInterceptorObject = valueInterceptor.object();
+    QVERIFY(valueInterceptorObject.isValid());
+
+    QVERIFY(valueInterceptorObject.objectType() == "Qt/Behavior");
+
+    const QDeclarativeDomValue animationValue = valueInterceptorObject.property("animation").value();
+    QVERIFY(!animationValue.isInvalid());
+    QVERIFY(animationValue.isObject());
+}
+
+// Test QDeclarativeDomDocument::imports()
+void tst_qmldom::loadImports()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                     "import importlib.sublib 4.7\n"
+                     "import importlib.sublib 4.6 as NewFoo\n"
+                     "import 'import'\n"
+                     "import 'import' as X\n"
+                     "Item {}";
+
+    QDeclarativeEngine engine;
+    engine.addImportPath(SRCDIR "/data");
+    QDeclarativeDomDocument document;
+    QVERIFY(document.load(&engine, qml));
+
+    QCOMPARE(document.imports().size(), 5);
+
+    QDeclarativeDomImport import = document.imports().at(0);
+    QCOMPARE(import.type(), QDeclarativeDomImport::Library);
+    QCOMPARE(import.uri(), QLatin1String("Qt"));
+    QCOMPARE(import.qualifier(), QString());
+    QCOMPARE(import.version(), QLatin1String("4.6"));
+
+    import = document.imports().at(1);
+    QCOMPARE(import.type(), QDeclarativeDomImport::Library);
+    QCOMPARE(import.uri(), QLatin1String("importlib.sublib"));
+    QCOMPARE(import.qualifier(), QString());
+    QCOMPARE(import.version(), QLatin1String("4.7"));
+
+    import = document.imports().at(2);
+    QCOMPARE(import.type(), QDeclarativeDomImport::Library);
+    QCOMPARE(import.uri(), QLatin1String("importlib.sublib"));
+    QCOMPARE(import.qualifier(), QLatin1String("NewFoo"));
+    QCOMPARE(import.version(), QLatin1String("4.6"));
+
+    import = document.imports().at(3);
+    QCOMPARE(import.type(), QDeclarativeDomImport::File);
+    QCOMPARE(import.uri(), QLatin1String("import"));
+    QCOMPARE(import.qualifier(), QLatin1String(""));
+    QCOMPARE(import.version(), QLatin1String(""));
+
+    import = document.imports().at(4);
+    QCOMPARE(import.type(), QDeclarativeDomImport::File);
+    QCOMPARE(import.uri(), QLatin1String("import"));
+    QCOMPARE(import.qualifier(), QLatin1String("X"));
+    QCOMPARE(import.version(), QLatin1String(""));
+}
+
+// Test loading a file with errors
+void tst_qmldom::loadErrors()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                     "Item {\n"
+                     "  foo: 12\n"
+                     "}";
+
+    QDeclarativeDomDocument document;
+    QVERIFY(false == document.load(&engine, qml));
+
+    QCOMPARE(document.errors().count(), 1);
+    QDeclarativeError error = document.errors().first();
+
+    QCOMPARE(error.url(), QUrl());
+    QCOMPARE(error.line(), 3);
+    QCOMPARE(error.column(), 3);
+    QCOMPARE(error.description(), QString("Cannot assign to non-existent property \"foo\""));
+}
+
+// Test loading a file with syntax errors
+void tst_qmldom::loadSyntaxErrors()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                     "asdf";
+
+    QDeclarativeDomDocument document;
+    QVERIFY(false == document.load(&engine, qml));
+
+    QCOMPARE(document.errors().count(), 1);
+    QDeclarativeError error = document.errors().first();
+
+    QCOMPARE(error.url(), QUrl());
+    QCOMPARE(error.line(), 2);
+    QCOMPARE(error.column(), 1);
+    QCOMPARE(error.description(), QString("Syntax error"));
+}
+
+// Test attempting to load a file with remote references 
+void tst_qmldom::loadRemoteErrors()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                     "Item {\n"
+                     "    Script {\n"
+                     "        source: \"http://localhost/exampleQmlScript.js\""
+                     "    }\n"
+                     "}";
+    QDeclarativeDomDocument document;
+    QVERIFY(false == document.load(&engine, qml));
+
+    QCOMPARE(document.errors().count(), 1);
+    QDeclarativeError error = document.errors().first();
+
+    QCOMPARE(error.url(), QUrl());
+    QCOMPARE(error.line(), -1);
+    QCOMPARE(error.column(), -1);
+    QCOMPARE(error.description(), QString("QDeclarativeDomDocument supports local types only"));
+}
+
+// Test dynamic property declarations
+void tst_qmldom::loadDynamicProperty()
+{
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item {\n"
+                         "    property int a\n"
+                         "    property bool b\n"
+                         "    property double c\n"
+                         "    property real d\n"
+                         "    property string e\n"
+                         "    property url f\n"
+                         "    property color g\n"
+                         "    property date h\n"
+                         "    property var i\n"
+                         "    property variant j\n"
+                         "    property QtObject k\n"
+                         "}";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootObject = document.rootObject();
+        QVERIFY(rootObject.isValid());
+
+        QCOMPARE(rootObject.dynamicProperties().count(), 11);
+
+#define DP_TEST(index, name, type, test_position, test_length, propTypeName) \
+    { \
+        QDeclarativeDomDynamicProperty d = rootObject.dynamicProperties().at(index); \
+        QVERIFY(d.isValid()); \
+        QVERIFY(d.propertyName() == # name ); \
+        QVERIFY(d.propertyType() == type); \
+        QVERIFY(d.propertyTypeName() == propTypeName); \
+        QVERIFY(d.isDefaultProperty() == false); \
+        QVERIFY(d.defaultValue().isValid() == false); \
+        QCOMPARE(d.position(), test_position); \
+        QCOMPARE(d.length(), test_length); \
+    } \
+
+        DP_TEST(0, a, QVariant::Int, 25, 14, "int");
+        DP_TEST(1, b, QVariant::Bool, 44, 15, "bool");
+        DP_TEST(2, c, QVariant::Double, 64, 17, "double");
+        DP_TEST(3, d, QMetaType::QReal, 86, 15, "real");
+        DP_TEST(4, e, QVariant::String, 106, 17, "string");
+        DP_TEST(5, f, QVariant::Url, 128, 14, "url");
+        DP_TEST(6, g, QVariant::Color, 147, 16, "color");
+        DP_TEST(7, h, QVariant::Date, 168, 15, "date");
+        DP_TEST(8, i, qMetaTypeId<QVariant>(), 188, 14, "var");
+        DP_TEST(9, j, qMetaTypeId<QVariant>(), 207, 18, "variant");
+        DP_TEST(10, k, -1, 230, 19, "QtObject");
+    }
+
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item {\n"
+                         "    property int a: 12\n"
+                         "    property int b: a + 6\n"
+                         "    default property QtObject c\n"
+                         "}\n";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootObject = document.rootObject();
+        QVERIFY(rootObject.isValid());
+
+        QCOMPARE(rootObject.dynamicProperties().count(), 3);
+        
+        {
+            QDeclarativeDomDynamicProperty d = rootObject.dynamicProperties().at(0);
+            QVERIFY(d.isDefaultProperty() == false);
+            QVERIFY(d.defaultValue().isValid());
+            QVERIFY(d.defaultValue().propertyName() == "a");
+            QVERIFY(d.defaultValue().value().isLiteral());
+        }
+
+        {
+            QDeclarativeDomDynamicProperty d = rootObject.dynamicProperties().at(1);
+            QVERIFY(d.isDefaultProperty() == false);
+            QVERIFY(d.defaultValue().isValid());
+            QVERIFY(d.defaultValue().propertyName() == "b");
+            QVERIFY(d.defaultValue().value().isBinding());
+        }
+
+        {
+            QDeclarativeDomDynamicProperty d = rootObject.dynamicProperties().at(2);
+            QVERIFY(d.isDefaultProperty() == true);
+            QVERIFY(d.defaultValue().isValid() == false);
+        }
+    }
+}
+
+// Test inline components
+void tst_qmldom::loadComponent()
+{
+    // Explicit component
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item {\n"
+                         "    Component {\n"
+                         "        id: myComponent\n"
+                         "        Item {}\n"
+                         "    }\n"
+                         "}";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootItem = document.rootObject();
+        QVERIFY(rootItem.isValid());
+        QVERIFY(rootItem.properties().size() == 1);
+
+        QDeclarativeDomProperty listProperty = rootItem.properties().at(0);
+        QVERIFY(listProperty.isDefaultProperty());
+        QVERIFY(listProperty.value().isList());
+
+        QDeclarativeDomList list = listProperty.value().toList();
+        QVERIFY(list.values().size() == 1);
+
+        QDeclarativeDomObject componentObject = list.values().first().toObject();
+        QVERIFY(componentObject.isValid());
+        QVERIFY(componentObject.objectClassName() == "Component");
+        QVERIFY(componentObject.isComponent());
+
+        QDeclarativeDomComponent component = componentObject.toComponent();
+        QVERIFY(component.isValid());
+        QVERIFY(component.objectType() == "Qt/Component");
+        QVERIFY(component.objectTypeMajorVersion() == 4);
+        QVERIFY(component.objectTypeMinorVersion() == 6);
+        QVERIFY(component.objectClassName() == "Component");
+        QVERIFY(component.objectId() == "myComponent");
+        QVERIFY(component.properties().isEmpty());
+        QVERIFY(component.dynamicProperties().isEmpty());
+        QVERIFY(component.isCustomType() == false);
+        QVERIFY(component.customTypeData() == "");
+        QVERIFY(component.isComponent());
+        QCOMPARE(component.position(), 25);
+        QCOMPARE(component.length(), 57);
+
+        QVERIFY(component.componentRoot().isValid());
+        QVERIFY(component.componentRoot().objectClassName() == "Item");
+    }
+
+    // Implicit component
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "ListView {\n"
+                         "    delegate: Item {}\n"
+                         "}";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootItem = document.rootObject();
+        QVERIFY(rootItem.isValid());
+        QVERIFY(rootItem.properties().size() == 1);
+
+        QDeclarativeDomProperty delegate = rootItem.property("delegate");
+
+        QDeclarativeDomObject componentObject = delegate.value().toObject();
+        QVERIFY(componentObject.isValid());
+        QVERIFY(componentObject.objectClassName() == "Component");
+        QVERIFY(componentObject.isComponent());
+
+        QDeclarativeDomComponent component = componentObject.toComponent();
+        QVERIFY(component.isValid());
+        QVERIFY(component.objectType() == "Qt/Component");
+        QVERIFY(component.objectClassName() == "Component");
+        QVERIFY(component.objectId() == "");
+        QVERIFY(component.properties().isEmpty());
+        QVERIFY(component.dynamicProperties().isEmpty());
+        QVERIFY(component.isCustomType() == false);
+        QVERIFY(component.customTypeData() == "");
+        QVERIFY(component.isComponent());
+        QCOMPARE(component.position(), 39);
+        QCOMPARE(component.length(), 7);
+
+        QVERIFY(component.componentRoot().isValid());
+        QVERIFY(component.componentRoot().objectClassName() == "Item");
+    }
+}
+
+// Test QDeclarativeDomObject::dynamicProperty() method
+void tst_qmldom::object_dynamicProperty()
+{
+    // Invalid object
+    {
+        QDeclarativeDomObject object;
+        QVERIFY(object.dynamicProperty("").isValid() == false);
+        QVERIFY(object.dynamicProperty("foo").isValid() == false);
+    }
+
+
+    // Valid object, no dynamic properties
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item {}";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootObject = document.rootObject();
+        QVERIFY(rootObject.isValid());
+
+        QVERIFY(rootObject.dynamicProperty("").isValid() == false);
+        QVERIFY(rootObject.dynamicProperty("foo").isValid() == false);
+    }
+
+    // Valid object, dynamic properties
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item {\n"
+                         "    property int a\n"
+                         "}";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootObject = document.rootObject();
+        QVERIFY(rootObject.isValid());
+
+        QVERIFY(rootObject.dynamicProperty("").isValid() == false);
+        QVERIFY(rootObject.dynamicProperty("foo").isValid() == false);
+
+        QDeclarativeDomDynamicProperty p = rootObject.dynamicProperty("a");
+        QVERIFY(p.isValid());
+        QVERIFY(p.propertyName() == "a");
+        QVERIFY(p.propertyType() == QVariant::Int);
+        QVERIFY(p.propertyTypeName() == "int");
+        QVERIFY(p.isDefaultProperty() == false);
+        QCOMPARE(p.position(), 25);
+        QCOMPARE(p.length(), 14);
+    }
+
+}
+
+// Test QDeclarativeObject::property() method
+void tst_qmldom::object_property()
+{
+    // Invalid object
+    {
+        QDeclarativeDomObject object;
+        QVERIFY(object.property("").isValid() == false);
+        QVERIFY(object.property("foo").isValid() == false);
+    }
+
+    // Valid object - no default
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item {\n"
+                         "    x: 10\n"
+                         "    y: 12\n"
+                         "}\n";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootObject = document.rootObject();
+        QVERIFY(rootObject.isValid());
+
+        QVERIFY(rootObject.property("").isValid() == false);
+        QVERIFY(rootObject.property("foo").isValid() == false);
+
+        QDeclarativeDomProperty x = rootObject.property("x");
+        QVERIFY(x.isValid());
+        QVERIFY(x.propertyName() == "x");
+        QVERIFY(x.propertyNameParts().count() == 1);
+        QVERIFY(x.propertyNameParts().at(0) == "x");
+        QVERIFY(x.isDefaultProperty() == false);
+        QVERIFY(x.value().isLiteral());
+        QVERIFY(x.value().toLiteral().literal() == "10");
+        QCOMPARE(x.position(), 25);
+        QCOMPARE(x.length(), 1);
+
+        QDeclarativeDomProperty y = rootObject.property("y");
+        QVERIFY(y.isValid());
+        QVERIFY(y.propertyName() == "y");
+        QVERIFY(y.propertyNameParts().count() == 1);
+        QVERIFY(y.propertyNameParts().at(0) == "y");
+        QVERIFY(y.isDefaultProperty() == false);
+        QVERIFY(y.value().isLiteral());
+        QVERIFY(y.value().toLiteral().literal() == "12");
+        QCOMPARE(y.position(), 35);
+        QCOMPARE(y.length(), 1);
+    }
+
+    // Valid object - with default
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item {\n"
+                         "    x: 10\n"
+                         "    y: 12\n"
+                         "    Item {}\n"
+                         "}\n";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootObject = document.rootObject();
+        QVERIFY(rootObject.isValid());
+
+        QVERIFY(rootObject.property("").isValid() == false);
+        QVERIFY(rootObject.property("foo").isValid() == false);
+
+        QDeclarativeDomProperty x = rootObject.property("x");
+        QVERIFY(x.isValid());
+        QVERIFY(x.propertyName() == "x");
+        QVERIFY(x.propertyNameParts().count() == 1);
+        QVERIFY(x.propertyNameParts().at(0) == "x");
+        QVERIFY(x.isDefaultProperty() == false);
+        QVERIFY(x.value().isLiteral());
+        QVERIFY(x.value().toLiteral().literal() == "10");
+        QCOMPARE(x.position(), 25);
+        QCOMPARE(x.length(), 1);
+
+        QDeclarativeDomProperty y = rootObject.property("y");
+        QVERIFY(y.isValid());
+        QVERIFY(y.propertyName() == "y");
+        QVERIFY(y.propertyNameParts().count() == 1);
+        QVERIFY(y.propertyNameParts().at(0) == "y");
+        QVERIFY(y.isDefaultProperty() == false);
+        QVERIFY(y.value().isLiteral());
+        QVERIFY(y.value().toLiteral().literal() == "12");
+        QCOMPARE(y.position(), 35);
+        QCOMPARE(y.length(), 1);
+        
+        QDeclarativeDomProperty data = rootObject.property("data");
+        QVERIFY(data.isValid());
+        QVERIFY(data.propertyName() == "data");
+        QVERIFY(data.propertyNameParts().count() == 1);
+        QVERIFY(data.propertyNameParts().at(0) == "data");
+        QVERIFY(data.isDefaultProperty() == true);
+        QVERIFY(data.value().isList());
+        QCOMPARE(data.position(), 45);
+        QCOMPARE(data.length(), 0);
+    }
+}
+
+// Tests the QDeclarativeDomObject::url() method
+void tst_qmldom::object_url()
+{
+    // Invalid object
+    {
+        QDeclarativeDomObject object;
+        QCOMPARE(object.url(), QUrl());
+    }
+
+    // Valid builtin object 
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "Item {}";
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml));
+
+        QDeclarativeDomObject rootObject = document.rootObject();
+        QVERIFY(rootObject.isValid());
+        QCOMPARE(rootObject.url(), QUrl());
+    }
+
+    // Valid composite object
+    {
+        QByteArray qml = "import Qt 4.6\n"
+                         "MyItem {}";
+
+        QUrl myUrl = QUrl::fromLocalFile(SRCDIR "/data/main.qml");
+        QUrl subUrl = QUrl::fromLocalFile(SRCDIR "/data/MyItem.qml");
+
+        QDeclarativeDomDocument document;
+        QVERIFY(document.load(&engine, qml, myUrl));
+
+        QDeclarativeDomObject rootObject = document.rootObject();
+        QVERIFY(rootObject.isValid());
+        QCOMPARE(rootObject.url(), subUrl);
+    }
+}
+
+// Test copy constructors and operators
+void tst_qmldom::copy()
+{
+    QByteArray qml = "import Qt 4.6\n"
+                     "MyItem {\n"
+                     "    id: myItem\n"
+                     "    property int a: 10\n"
+                     "    x: 10\n"
+                     "    y: x + 10\n"
+                     "    z: NumberAnimation {}\n"
+                     "    opacity: Behavior {}\n"
+                     "    Component {\n"
+                     "        Item{}\n"
+                     "    }\n"
+                     "    children: [ Item{}, Item{} ]\n"
+                     "}\n";
+
+    QUrl myUrl = QUrl::fromLocalFile(SRCDIR "/data/main.qml");
+
+    QDeclarativeDomDocument document;
+    QVERIFY(document.load(&engine, qml, myUrl));
+
+    // QDeclarativeDomDocument
+    {
+        QDeclarativeDomDocument document2(document);
+        QDeclarativeDomDocument document3;
+        document3 = document;
+
+        QCOMPARE(document.imports().count(), document2.imports().count());
+        QCOMPARE(document.errors().count(), document2.errors().count());
+        QCOMPARE(document.rootObject().objectClassName(), document2.rootObject().objectClassName());
+
+        QCOMPARE(document.imports().count(), document3.imports().count());
+        QCOMPARE(document.errors().count(), document3.errors().count());
+        QCOMPARE(document.rootObject().objectClassName(), document3.rootObject().objectClassName());
+    }
+
+    // QDeclarativeDomImport
+    {
+        QCOMPARE(document.imports().count(), 1);
+        QDeclarativeDomImport import = document.imports().at(0);
+
+        QDeclarativeDomImport import2(import);
+        QDeclarativeDomImport import3;
+        import3 = import2;
+
+        QCOMPARE(import.type(), import2.type());
+        QCOMPARE(import.uri(), import2.uri());
+        QCOMPARE(import.version(), import2.version());
+        QCOMPARE(import.qualifier(), import2.qualifier());
+
+        QCOMPARE(import.type(), import3.type());
+        QCOMPARE(import.uri(), import3.uri());
+        QCOMPARE(import.version(), import3.version());
+        QCOMPARE(import.qualifier(), import3.qualifier());
+    }
+
+    // QDeclarativeDomObject
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QVERIFY(object.isValid());
+
+        QDeclarativeDomObject object2(object);
+        QDeclarativeDomObject object3;
+        object3 = object;
+
+        QCOMPARE(object.isValid(), object2.isValid());
+        QCOMPARE(object.objectType(), object2.objectType());
+        QCOMPARE(object.objectClassName(), object2.objectClassName());
+        QCOMPARE(object.objectTypeMajorVersion(), object2.objectTypeMajorVersion());
+        QCOMPARE(object.objectTypeMinorVersion(), object2.objectTypeMinorVersion());
+        QCOMPARE(object.objectId(), object2.objectId());
+        QCOMPARE(object.properties().count(), object2.properties().count());
+        QCOMPARE(object.dynamicProperties().count(), object2.dynamicProperties().count());
+        QCOMPARE(object.isCustomType(), object2.isCustomType());
+        QCOMPARE(object.customTypeData(), object2.customTypeData());
+        QCOMPARE(object.isComponent(), object2.isComponent());
+        QCOMPARE(object.position(), object2.position());
+        QCOMPARE(object.length(), object2.length());
+        QCOMPARE(object.url(), object2.url());
+
+        QCOMPARE(object.isValid(), object3.isValid());
+        QCOMPARE(object.objectType(), object3.objectType());
+        QCOMPARE(object.objectClassName(), object3.objectClassName());
+        QCOMPARE(object.objectTypeMajorVersion(), object3.objectTypeMajorVersion());
+        QCOMPARE(object.objectTypeMinorVersion(), object3.objectTypeMinorVersion());
+        QCOMPARE(object.objectId(), object3.objectId());
+        QCOMPARE(object.properties().count(), object3.properties().count());
+        QCOMPARE(object.dynamicProperties().count(), object3.dynamicProperties().count());
+        QCOMPARE(object.isCustomType(), object3.isCustomType());
+        QCOMPARE(object.customTypeData(), object3.customTypeData());
+        QCOMPARE(object.isComponent(), object3.isComponent());
+        QCOMPARE(object.position(), object3.position());
+        QCOMPARE(object.length(), object3.length());
+        QCOMPARE(object.url(), object3.url());
+    }
+
+    // QDeclarativeDomDynamicProperty
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomDynamicProperty property = object.dynamicProperty("a");
+
+        QDeclarativeDomDynamicProperty property2(property);
+        QDeclarativeDomDynamicProperty property3;
+        property3 = property;
+
+        QCOMPARE(property.isValid(), property2.isValid());
+        QCOMPARE(property.propertyName(), property2.propertyName());
+        QCOMPARE(property.propertyType(), property2.propertyType());
+        QCOMPARE(property.propertyTypeName(), property2.propertyTypeName());
+        QCOMPARE(property.isDefaultProperty(), property2.isDefaultProperty());
+        QCOMPARE(property.defaultValue().propertyName(), property2.defaultValue().propertyName());
+        QCOMPARE(property.position(), property2.position());
+        QCOMPARE(property.length(), property2.length());
+
+        QCOMPARE(property.isValid(), property3.isValid());
+        QCOMPARE(property.propertyName(), property3.propertyName());
+        QCOMPARE(property.propertyType(), property3.propertyType());
+        QCOMPARE(property.propertyTypeName(), property3.propertyTypeName());
+        QCOMPARE(property.isDefaultProperty(), property3.isDefaultProperty());
+        QCOMPARE(property.defaultValue().propertyName(), property3.defaultValue().propertyName());
+        QCOMPARE(property.position(), property3.position());
+        QCOMPARE(property.length(), property3.length());
+    }
+
+    // QDeclarativeDomProperty
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("opacity");
+
+        QDeclarativeDomProperty property2(property);
+        QDeclarativeDomProperty property3;
+        property3 = property;
+
+        QCOMPARE(property.isValid(), property2.isValid());
+        QCOMPARE(property.propertyName(), property2.propertyName());
+        QCOMPARE(property.propertyNameParts(), property2.propertyNameParts());
+        QCOMPARE(property.isDefaultProperty(), property2.isDefaultProperty());
+        QCOMPARE(property.value().type(), property2.value().type());
+        QCOMPARE(property.position(), property2.position());
+        QCOMPARE(property.length(), property2.length());
+
+        QCOMPARE(property.isValid(), property3.isValid());
+        QCOMPARE(property.propertyName(), property3.propertyName());
+        QCOMPARE(property.propertyNameParts(), property3.propertyNameParts());
+        QCOMPARE(property.isDefaultProperty(), property3.isDefaultProperty());
+        QCOMPARE(property.value().type(), property3.value().type());
+        QCOMPARE(property.position(), property3.position());
+        QCOMPARE(property.length(), property3.length());
+    }
+
+    // QDeclarativeDomValueLiteral
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("x");
+        QDeclarativeDomValueLiteral literal = property.value().toLiteral();
+        QCOMPARE(literal.literal(), QString("10"));
+
+        QDeclarativeDomValueLiteral literal2(literal);
+        QDeclarativeDomValueLiteral literal3;
+        literal3 = literal2;
+
+        QCOMPARE(literal2.literal(), QString("10"));
+        QCOMPARE(literal3.literal(), QString("10"));
+    }
+
+
+    // QDeclarativeDomValueBinding
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("y");
+        QDeclarativeDomValueBinding binding = property.value().toBinding();
+        QCOMPARE(binding.binding(), QString("x + 10"));
+
+        QDeclarativeDomValueBinding binding2(binding);
+        QDeclarativeDomValueBinding binding3;
+        binding3 = binding2;
+
+        QCOMPARE(binding2.binding(), QString("x + 10"));
+        QCOMPARE(binding3.binding(), QString("x + 10"));
+    }
+
+    // QDeclarativeDomValueValueSource
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("z");
+        QDeclarativeDomValueValueSource source = property.value().toValueSource();
+        QCOMPARE(source.object().objectClassName(), QByteArray("NumberAnimation"));
+
+        QDeclarativeDomValueValueSource source2(source);
+        QDeclarativeDomValueValueSource source3;
+        source3 = source;
+
+        QCOMPARE(source2.object().objectClassName(), QByteArray("NumberAnimation"));
+        QCOMPARE(source3.object().objectClassName(), QByteArray("NumberAnimation"));
+    }
+
+    // QDeclarativeDomValueValueInterceptor
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("opacity");
+        QDeclarativeDomValueValueInterceptor interceptor = property.value().toValueInterceptor();
+        QCOMPARE(interceptor.object().objectClassName(), QByteArray("Behavior"));
+
+        QDeclarativeDomValueValueInterceptor interceptor2(interceptor);
+        QDeclarativeDomValueValueInterceptor interceptor3;
+        interceptor3 = interceptor;
+
+        QCOMPARE(interceptor2.object().objectClassName(), QByteArray("Behavior"));
+        QCOMPARE(interceptor3.object().objectClassName(), QByteArray("Behavior"));
+    }
+
+    // QDeclarativeDomComponent
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("data");
+        QCOMPARE(property.value().toList().values().count(), 1);
+        QDeclarativeDomComponent component = 
+            property.value().toList().values().at(0).toObject().toComponent();
+        QCOMPARE(component.componentRoot().objectClassName(), QByteArray("Item"));
+
+        QDeclarativeDomComponent component2(component);
+        QDeclarativeDomComponent component3;
+        component3 = component;
+
+        QCOMPARE(component.componentRoot().objectClassName(), component2.componentRoot().objectClassName());
+        QCOMPARE(component.isValid(), component2.isValid());
+        QCOMPARE(component.objectType(), component2.objectType());
+        QCOMPARE(component.objectClassName(), component2.objectClassName());
+        QCOMPARE(component.objectTypeMajorVersion(), component2.objectTypeMajorVersion());
+        QCOMPARE(component.objectTypeMinorVersion(), component2.objectTypeMinorVersion());
+        QCOMPARE(component.objectId(), component2.objectId());
+        QCOMPARE(component.properties().count(), component2.properties().count());
+        QCOMPARE(component.dynamicProperties().count(), component2.dynamicProperties().count());
+        QCOMPARE(component.isCustomType(), component2.isCustomType());
+        QCOMPARE(component.customTypeData(), component2.customTypeData());
+        QCOMPARE(component.isComponent(), component2.isComponent());
+        QCOMPARE(component.position(), component2.position());
+        QCOMPARE(component.length(), component2.length());
+        QCOMPARE(component.url(), component2.url());
+
+        QCOMPARE(component.componentRoot().objectClassName(), component3.componentRoot().objectClassName());
+        QCOMPARE(component.isValid(), component3.isValid());
+        QCOMPARE(component.objectType(), component3.objectType());
+        QCOMPARE(component.objectClassName(), component3.objectClassName());
+        QCOMPARE(component.objectTypeMajorVersion(), component3.objectTypeMajorVersion());
+        QCOMPARE(component.objectTypeMinorVersion(), component3.objectTypeMinorVersion());
+        QCOMPARE(component.objectId(), component3.objectId());
+        QCOMPARE(component.properties().count(), component3.properties().count());
+        QCOMPARE(component.dynamicProperties().count(), component3.dynamicProperties().count());
+        QCOMPARE(component.isCustomType(), component3.isCustomType());
+        QCOMPARE(component.customTypeData(), component3.customTypeData());
+        QCOMPARE(component.isComponent(), component3.isComponent());
+        QCOMPARE(component.position(), component3.position());
+        QCOMPARE(component.length(), component3.length());
+        QCOMPARE(component.url(), component3.url());
+    }
+
+    // QDeclarativeDomValue
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("data");
+        QDeclarativeDomValue value = property.value();
+
+        QDeclarativeDomValue value2(value);
+        QDeclarativeDomValue value3;
+        value3 = value;
+
+        QCOMPARE(value.type(), value2.type());
+        QCOMPARE(value.isInvalid(), value2.isInvalid());
+        QCOMPARE(value.isLiteral(), value2.isLiteral());
+        QCOMPARE(value.isBinding(), value2.isBinding());
+        QCOMPARE(value.isValueSource(), value2.isValueSource());
+        QCOMPARE(value.isValueInterceptor(), value2.isValueInterceptor());
+        QCOMPARE(value.isObject(), value2.isObject());
+        QCOMPARE(value.isList(), value2.isList());
+        QCOMPARE(value.position(), value2.position());
+        QCOMPARE(value.length(), value2.length());
+
+        QCOMPARE(value.type(), value3.type());
+        QCOMPARE(value.isInvalid(), value3.isInvalid());
+        QCOMPARE(value.isLiteral(), value3.isLiteral());
+        QCOMPARE(value.isBinding(), value3.isBinding());
+        QCOMPARE(value.isValueSource(), value3.isValueSource());
+        QCOMPARE(value.isValueInterceptor(), value3.isValueInterceptor());
+        QCOMPARE(value.isObject(), value3.isObject());
+        QCOMPARE(value.isList(), value3.isList());
+        QCOMPARE(value.position(), value3.position());
+        QCOMPARE(value.length(), value3.length());
+    }
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("x");
+        QDeclarativeDomValue value = property.value();
+
+        QDeclarativeDomValue value2(value);
+        QDeclarativeDomValue value3;
+        value3 = value;
+
+        QCOMPARE(value.type(), value2.type());
+        QCOMPARE(value.isInvalid(), value2.isInvalid());
+        QCOMPARE(value.isLiteral(), value2.isLiteral());
+        QCOMPARE(value.isBinding(), value2.isBinding());
+        QCOMPARE(value.isValueSource(), value2.isValueSource());
+        QCOMPARE(value.isValueInterceptor(), value2.isValueInterceptor());
+        QCOMPARE(value.isObject(), value2.isObject());
+        QCOMPARE(value.isList(), value2.isList());
+        QCOMPARE(value.position(), value2.position());
+        QCOMPARE(value.length(), value2.length());
+
+        QCOMPARE(value.type(), value3.type());
+        QCOMPARE(value.isInvalid(), value3.isInvalid());
+        QCOMPARE(value.isLiteral(), value3.isLiteral());
+        QCOMPARE(value.isBinding(), value3.isBinding());
+        QCOMPARE(value.isValueSource(), value3.isValueSource());
+        QCOMPARE(value.isValueInterceptor(), value3.isValueInterceptor());
+        QCOMPARE(value.isObject(), value3.isObject());
+        QCOMPARE(value.isList(), value3.isList());
+        QCOMPARE(value.position(), value3.position());
+        QCOMPARE(value.length(), value3.length());
+    }
+    {
+        QDeclarativeDomValue value;
+
+        QDeclarativeDomValue value2(value);
+        QDeclarativeDomValue value3;
+        value3 = value;
+
+        QCOMPARE(value.type(), value2.type());
+        QCOMPARE(value.isInvalid(), value2.isInvalid());
+        QCOMPARE(value.isLiteral(), value2.isLiteral());
+        QCOMPARE(value.isBinding(), value2.isBinding());
+        QCOMPARE(value.isValueSource(), value2.isValueSource());
+        QCOMPARE(value.isValueInterceptor(), value2.isValueInterceptor());
+        QCOMPARE(value.isObject(), value2.isObject());
+        QCOMPARE(value.isList(), value2.isList());
+        QCOMPARE(value.position(), value2.position());
+        QCOMPARE(value.length(), value2.length());
+
+        QCOMPARE(value.type(), value3.type());
+        QCOMPARE(value.isInvalid(), value3.isInvalid());
+        QCOMPARE(value.isLiteral(), value3.isLiteral());
+        QCOMPARE(value.isBinding(), value3.isBinding());
+        QCOMPARE(value.isValueSource(), value3.isValueSource());
+        QCOMPARE(value.isValueInterceptor(), value3.isValueInterceptor());
+        QCOMPARE(value.isObject(), value3.isObject());
+        QCOMPARE(value.isList(), value3.isList());
+        QCOMPARE(value.position(), value3.position());
+        QCOMPARE(value.length(), value3.length());
+    }
+
+    // QDeclarativeDomList
+    {
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("children");
+        QDeclarativeDomList list = property.value().toList();
+        QCOMPARE(list.values().count(), 2);
+
+        QDeclarativeDomList list2(list);
+        QDeclarativeDomList list3;
+        list3 = list2;
+
+        QCOMPARE(list.values().count(), list2.values().count());
+        QCOMPARE(list.position(), list2.position());
+        QCOMPARE(list.length(), list2.length());
+        QCOMPARE(list.commaPositions(), list2.commaPositions());
+
+        QCOMPARE(list.values().count(), list3.values().count());
+        QCOMPARE(list.position(), list3.position());
+        QCOMPARE(list.length(), list3.length());
+        QCOMPARE(list.commaPositions(), list3.commaPositions());
+
+    }
+}
+
+// Tests the position/length of various elements
+void tst_qmldom::position()
+{
+    QByteArray qml = "import Qt 4.6\n"
+         /*14*/      "Item {\n"
+         /*21*/      "    id: myItem\n"
+         /*36*/      "    property int a: 10\n"
+         /*59*/      "    x: 10\n"
+         /*69*/      "    y: x + 10\n"
+         /*83*/      "    z: NumberAnimation {}\n"
+        /*109*/      "    opacity: Behavior {}\n"
+        /*134*/      "    Component {\n"
+        /*150*/      "        Item{}\n"
+        /*165*/      "    }\n"
+        /*171*/      "    children: [ Item{}, Item{} ]\n"
+        /*204*/      "}\n";
+
+
+    QDeclarativeDomDocument document;
+    QVERIFY(document.load(&engine, qml));
+
+    QDeclarativeDomObject root = document.rootObject();
+
+    // All QDeclarativeDomDynamicProperty
+    QDeclarativeDomDynamicProperty dynProp = root.dynamicProperty("a");
+    QCOMPARE(dynProp.position(), 40);
+    QCOMPARE(dynProp.length(), 18);
+
+    // All QDeclarativeDomProperty
+    QDeclarativeDomProperty x = root.property("x");
+    QCOMPARE(x.position(), 63);
+    QCOMPARE(x.length(), 1);
+
+    QDeclarativeDomProperty y = root.property("y");
+    QCOMPARE(y.position(), 73);
+    QCOMPARE(y.length(), 1);
+
+    QDeclarativeDomProperty z = root.property("z");
+    QCOMPARE(z.position(), 87);
+    QCOMPARE(z.length(), 1);
+
+    QDeclarativeDomProperty opacity = root.property("opacity");
+    QCOMPARE(opacity.position(), 113);
+    QCOMPARE(opacity.length(), 7);
+
+    QDeclarativeDomProperty data = root.property("data");
+    QCOMPARE(data.position(), 138);
+    QCOMPARE(data.length(), 0);
+
+    QDeclarativeDomProperty children = root.property("children");
+    QCOMPARE(children.position(), 175);
+    QCOMPARE(children.length(), 8);
+
+    QDeclarativeDomList dataList = data.value().toList();
+    QCOMPARE(dataList.values().count(), 1);
+    QDeclarativeDomList childrenList = children.value().toList();
+    QCOMPARE(childrenList.values().count(), 2);
+
+    // All QDeclarativeDomObject
+    QCOMPARE(root.position(), 14);
+    QCOMPARE(root.length(), 191);
+
+    QDeclarativeDomObject numberAnimation = z.value().toValueSource().object();
+    QCOMPARE(numberAnimation.position(), 90);
+    QCOMPARE(numberAnimation.length(), 18);
+
+    QDeclarativeDomObject behavior = opacity.value().toValueInterceptor().object();
+    QCOMPARE(behavior.position(), 122);
+    QCOMPARE(behavior.length(), 11);
+
+    QDeclarativeDomObject component = dataList.values().at(0).toObject();
+    QCOMPARE(component.position(), 138);
+    QCOMPARE(component.length(), 32);
+
+    QDeclarativeDomObject componentRoot = component.toComponent().componentRoot();
+    QCOMPARE(componentRoot.position(), 158);
+    QCOMPARE(componentRoot.length(), 6);
+
+    QDeclarativeDomObject child1 = childrenList.values().at(0).toObject();
+    QCOMPARE(child1.position(), 187);
+    QCOMPARE(child1.length(), 6);
+
+    QDeclarativeDomObject child2 = childrenList.values().at(1).toObject();
+    QCOMPARE(child2.position(), 195);
+    QCOMPARE(child2.length(), 6);
+
+    // All QDeclarativeDomValue
+    QDeclarativeDomValue xValue = x.value();
+    QCOMPARE(xValue.position(), 66);
+    QCOMPARE(xValue.length(), 2);
+
+    QDeclarativeDomValue yValue = y.value();
+    QCOMPARE(yValue.position(), 76);
+    QCOMPARE(yValue.length(), 6);
+
+    QDeclarativeDomValue zValue = z.value();
+    QCOMPARE(zValue.position(), 90);
+    QCOMPARE(zValue.length(), 18);
+
+    QDeclarativeDomValue opacityValue = opacity.value();
+    QCOMPARE(opacityValue.position(), 122);
+    QCOMPARE(opacityValue.length(), 11);
+
+    QDeclarativeDomValue dataValue = data.value();
+    QCOMPARE(dataValue.position(), 138);
+    QCOMPARE(dataValue.length(), 32);
+
+    QDeclarativeDomValue child1Value = childrenList.values().at(0);
+    QCOMPARE(child1Value.position(), 187);
+    QCOMPARE(child1Value.length(), 6);
+
+    QDeclarativeDomValue child2Value = childrenList.values().at(1);
+    QCOMPARE(child2Value.position(), 195);
+    QCOMPARE(child2Value.length(), 6);
+
+    // All QDeclarativeDomList
+    qWarning("QDeclarativeListValue position test required");
+}
+
+QTEST_MAIN(tst_qmldom)
+
+#include "tst_qdeclarativedom.moc"
diff --git a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow1.qml b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow1.qml
new file mode 100644
index 0000000..0cc19eb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow1.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+EaseFollow {}
diff --git a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow2.qml b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow2.qml
new file mode 100644
index 0000000..b65964e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow2.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+EaseFollow {
+    source: 10; duration: 300; enabled: true; reversingMode: EaseFollow.Immediate
+}
diff --git a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow3.qml b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow3.qml
new file mode 100644
index 0000000..f8886e9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow3.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+EaseFollow {
+    source: 10; velocity: 250; enabled: false; reversingMode: EaseFollow.Sync
+    maximumEasingTime: 150
+}
diff --git a/tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro b/tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro
new file mode 100644
index 0000000..71df4f4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeeasefollow.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp b/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp
new file mode 100644
index 0000000..60c74ef
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeeasefollow_p.h>
+#include <private/qdeclarativevaluetype_p.h>
+#include "../../../shared/util.h"
+
+class tst_qmleasefollow : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmleasefollow();
+
+private slots:
+    void defaultValues();
+    void values();
+    void disabled();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmleasefollow::tst_qmleasefollow()
+{
+}
+
+void tst_qmleasefollow::defaultValues()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow1.qml"));
+    QDeclarativeEaseFollow *obj = qobject_cast<QDeclarativeEaseFollow*>(c.create());
+
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->sourceValue(), 0.);
+    QCOMPARE(obj->velocity(), 200.);
+    QCOMPARE(obj->enabled(), true);
+    QCOMPARE(obj->duration(), -1.);
+    QCOMPARE(obj->maximumEasingTime(), -1.);
+    QCOMPARE(obj->reversingMode(), QDeclarativeEaseFollow::Eased);
+
+    delete obj;
+}
+
+void tst_qmleasefollow::values()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow2.qml"));
+    QDeclarativeEaseFollow *obj = qobject_cast<QDeclarativeEaseFollow*>(c.create());
+
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->sourceValue(), 10.);
+    QCOMPARE(obj->velocity(), 200.);
+    QCOMPARE(obj->enabled(), true);
+    QCOMPARE(obj->duration(), 300.);
+    QCOMPARE(obj->maximumEasingTime(), -1.);
+    QCOMPARE(obj->reversingMode(), QDeclarativeEaseFollow::Immediate);
+
+    delete obj;
+}
+
+void tst_qmleasefollow::disabled()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow3.qml"));
+    QDeclarativeEaseFollow *obj = qobject_cast<QDeclarativeEaseFollow*>(c.create());
+
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->sourceValue(), 10.);
+    QCOMPARE(obj->velocity(), 250.);
+    QCOMPARE(obj->enabled(), false);
+    QCOMPARE(obj->maximumEasingTime(), 150.);
+    QCOMPARE(obj->reversingMode(), QDeclarativeEaseFollow::Sync);
+
+    delete obj;
+}
+
+QTEST_MAIN(tst_qmleasefollow)
+
+#include "tst_qdeclarativeeasefollow.moc"
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml
new file mode 100644
index 0000000..b4a702b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml
@@ -0,0 +1,6 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int c1: 0
+    property int c2: c1
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml
new file mode 100644
index 0000000..691d9ec
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    property string greeting: "hello world"
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml
new file mode 100644
index 0000000..f51ca86
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+QtObject {
+    function testFunction() { return 19; }
+    function testFunction2() { return 18; }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
new file mode 100644
index 0000000..7c32e56
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+QtObject {
+    property int b: obj.prop.a
+
+    property var prop;
+    prop: QtObject {
+        property int a: 10
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml
new file mode 100644
index 0000000..b7bec63
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Item {
+    property int a: 3
+    property int binding: myFunction();
+    property int binding2: myCompFunction();
+
+    Script {
+        function myCompFunction() {
+            return a;
+        }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/TypeForDynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/TypeForDynamicCreation.qml
new file mode 100644
index 0000000..56e0625
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/TypeForDynamicCreation.qml
@@ -0,0 +1,2 @@
+import Qt.test 1.0
+MyQmlObject{objectName:"objectThree"}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml
new file mode 100644
index 0000000..5c3ea1f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+import Qt.test 1.0
+
+MyQmlObject {
+    property alias c1: myObject.c1
+    property int c2: 3
+    property int c3: c2 
+    objectProperty: QtObject { 
+        id: myObject 
+        property int c1
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml
new file mode 100644
index 0000000..db7f2b5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml
@@ -0,0 +1,26 @@
+import Qt.test 1.0
+
+MyTypeObject {
+    flagProperty: if(1) "FlagVal1 | FlagVal3"
+    enumProperty: if(1) "EnumVal2"
+    stringProperty: if(1) "Hello World!"
+    uintProperty: if(1) 10
+    intProperty: if(1) -19
+    realProperty: if(1) 23.2
+    doubleProperty: if(1) -19.7
+    floatProperty: if(1) 8.5
+    colorProperty: if(1) "red"
+    dateProperty: if(1) "1982-11-25"
+    timeProperty: if(1) "11:11:32" 
+    dateTimeProperty: if(1) "2009-05-12T13:22:01"
+    pointProperty: if(1) "99,13"
+    pointFProperty: if(1) "-10.1,12.3"
+    sizeProperty: if(1) "99x13"
+    sizeFProperty: if(1) "0.1x0.2"
+    rectProperty: if(1) "9,7,100x200"
+    rectFProperty: if(1) "1000.1,-10.9,400x90.99"
+    boolProperty: if(1) true
+    variantProperty: if(1) "Hello World!"
+    vectorProperty: if(1) "10,1,2.2"
+    urlProperty: if(1) "main.qml"
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml
new file mode 100644
index 0000000..128db69
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml
@@ -0,0 +1,29 @@
+import Qt.test 1.0
+import Qt 4.6
+
+MyTypeObject {
+    Component.onCompleted: {
+        flagProperty = "FlagVal1 | FlagVal3"
+        enumProperty = "EnumVal2"
+        stringProperty = "Hello World!"
+        uintProperty = 10
+        intProperty = -19
+        realProperty = 23.2
+        doubleProperty = -19.7
+        floatProperty = 8.5
+        colorProperty = "red"
+        dateProperty = "1982-11-25"
+        timeProperty = "11:11:32" 
+        dateTimeProperty = "2009-05-12T13:22:01"
+        pointProperty = "99,13"
+        pointFProperty = "-10.1,12.3"
+        sizeProperty = "99x13"
+        sizeFProperty = "0.1x0.2"
+        rectProperty = "9,7,100x200"
+        rectFProperty = "1000.1,-10.9,400x90.99"
+        boolProperty = true
+        variantProperty = "Hello World!"
+        vectorProperty = "10,1,2.2"
+        urlProperty = "main.qml"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.qml
new file mode 100644
index 0000000..061eda0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.qml
@@ -0,0 +1,11 @@
+import Qt.test 1.0
+import Qt.test 1.0 as Namespace
+
+MyQmlObject {
+    id: me
+    property int a: MyQmlObject.value
+    property int b: Namespace.MyQmlObject.value
+    property int c: me.Namespace.MyQmlObject.value
+    property int d: me.Namespace.MyQmlObject.value
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml b/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml
new file mode 100644
index 0000000..80545cf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml
@@ -0,0 +1,14 @@
+import Qt.test 1.0
+
+MyQmlContainer { 
+    children : [ 
+        MyQmlObject { 
+            id: object1 
+            stringProperty: "hello" + object2.stringProperty 
+        },
+        MyQmlObject { 
+            id: object2 
+            stringProperty: "hello" + object1.stringProperty 
+        } 
+    ] 
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml
new file mode 100644
index 0000000..3147f63
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml
@@ -0,0 +1,5 @@
+import Qt.test 1.0
+
+MyQmlObject { 
+    stringProperty: trueProperty?'pass':'fail' 
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml
new file mode 100644
index 0000000..c89bb49
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml
@@ -0,0 +1,5 @@
+import Qt.test 1.0
+
+MyQmlObject { 
+    stringProperty: falseProperty?'fail':'pass' 
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml
new file mode 100644
index 0000000..266de76
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+QtObject {
+    property int a: 10
+    property bool b: false
+
+    property int test
+
+    test: ((a == 10)?(a + 1):0) + ((b == true)?9:3)
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml b/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml
new file mode 100644
index 0000000..80a2814
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    property CustomObject myObject
+    myObject: CustomObject { }
+
+    Component.onCompleted: console.log(myObject.greeting)
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.1.qml
new file mode 100644
index 0000000..13c5ae5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.1.qml
@@ -0,0 +1,8 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int c1: 0
+    property int c2: c1
+
+    onBasicSignal: c2 = 13
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml
new file mode 100644
index 0000000..207a06b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml
@@ -0,0 +1,11 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property alias c1: myConstants.c1
+    property alias c2: myConstants.c2
+
+    objectProperty: ConstantsOverrideBindings { 
+        id: myConstants
+        c2: 10 
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.3.qml
new file mode 100644
index 0000000..ca9d1d8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.3.qml
@@ -0,0 +1,7 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int c1: 0
+    property int c2: c1
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deferredProperties.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deferredProperties.qml
new file mode 100644
index 0000000..e01f708
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deferredProperties.qml
@@ -0,0 +1,10 @@
+import Qt.test 1.0
+
+MyDeferredObject {
+    id: root
+    value: 10
+    objectProperty: MyQmlObject {
+        value: root.value
+    }
+    objectProperty2: MyQmlObject { id: blah }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
new file mode 100644
index 0000000..6bc3a17
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
@@ -0,0 +1,25 @@
+import Qt 4.6
+import Qt.test 1.0
+
+QtObject {
+    property var obj
+    obj: MyQmlObject {
+        id: myObject
+        value: 92
+    }
+
+    property bool test1: false
+    property bool test2: false
+    property bool test3: false
+    property bool test4: false
+
+    Component.onCompleted: {
+        test1 = myObject.value == 92;
+        test2 = obj.value == 92;
+
+        myObject.deleteOnSet = 1;
+
+        test3 = myObject.value == undefined;
+    //    test4 = obj.value == undefined;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.helper.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.helper.qml
new file mode 100644
index 0000000..d790d63
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.helper.qml
@@ -0,0 +1,6 @@
+import Qt.test 1.0
+
+MyQmlObject{
+    objectName: "objectTwo"
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
new file mode 100644
index 0000000..ed5e571
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
@@ -0,0 +1,21 @@
+import Qt.test 1.0
+
+MyQmlObject{
+    id: obj
+    objectName: "obj"
+    function createOne()
+    {
+        obj.objectProperty = createQmlObject('import Qt.test 1.0; MyQmlObject{objectName:"objectOne"}', obj);
+    }
+
+    function createTwo()
+    {
+        var component = createComponent('dynamicCreation.helper.qml');
+        obj.objectProperty = component.createObject();
+    }
+
+    function createThree()
+    {
+        obj.objectProperty = createQmlObject('TypeForDynamicCreation{}', obj);
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.qml
new file mode 100644
index 0000000..0855b29
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.qml
@@ -0,0 +1,20 @@
+import Qt.test 1.0
+
+MyQmlObject{
+    id: obj
+    objectName: "obj"
+    function create()
+    {
+        obj.objectProperty = createQmlObject('import Qt.test 1.0; MyQmlObject{objectName:"emptyObject"}', obj);
+    }
+
+    function killOther()
+    {
+        obj.objectProperty.destroy(500);
+    }
+
+    function killMe()
+    {
+        obj.destroy();//Must not segfault
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/enums.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/enums.1.qml
new file mode 100644
index 0000000..6351823
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/enums.1.qml
@@ -0,0 +1,20 @@
+import Qt.test 1.0
+import Qt.test 1.0 as Namespace
+
+MyQmlObject {
+    // Enums from non-namespaced type
+    property int a: MyQmlObject.EnumValue1
+    property int b: MyQmlObject.EnumValue2
+    property int c: MyQmlObject.EnumValue3
+    property int d: MyQmlObject.EnumValue4
+
+    // Enums from namespaced type
+    property int e: Namespace.MyQmlObject.EnumValue1
+    property int f: Namespace.MyQmlObject.EnumValue2
+    property int g: Namespace.MyQmlObject.EnumValue3
+    property int h: Namespace.MyQmlObject.EnumValue4
+
+    // Test that enums don't mask attached properties
+    property int i: MyQmlObject.value
+    property int j: Namespace.MyQmlObject.value
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/enums.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/enums.2.qml
new file mode 100644
index 0000000..bdc672f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/enums.2.qml
@@ -0,0 +1,8 @@
+import Qt.test 1.0
+import Qt.test 1.0 as Namespace
+
+MyQmlObject {
+    property int a: MyQmlObject.EnumValue10
+    property int b: Namespace.MyQmlObject.EnumValue10
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionClearsOnReeval.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionClearsOnReeval.qml
new file mode 100644
index 0000000..a2f0d1a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionClearsOnReeval.qml
@@ -0,0 +1,6 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property bool test: objectProperty.objectProperty.trueProperty
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml
new file mode 100644
index 0000000..acc3163
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+import Qt.test 1.0
+
+MyQmlObject {
+    Component.onCompleted:
+        { throw(new Error("JS exception")) }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml
new file mode 100644
index 0000000..44e10c1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+import Qt.test 1.0
+
+MyQmlObject {
+    value: { throw(new Error("JS exception")) }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml
new file mode 100644
index 0000000..9a82ad1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml
@@ -0,0 +1,8 @@
+import Qt.test 1.0
+import Qt 4.6
+
+QtObject {
+    property MyExtendedObject a;
+    a: MyExtendedObject { id: root }
+    property int b: Math.max(root.extendedProperty, 0)
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml
new file mode 100644
index 0000000..a902312
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml
@@ -0,0 +1,10 @@
+import Qt.test 1.0
+
+MyExtendedObject
+{
+    baseProperty: baseExtendedProperty
+    baseExtendedProperty: 13
+
+    coreProperty: extendedProperty
+    extendedProperty: 9
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.1.qml
new file mode 100644
index 0000000..2ac7b6e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.1.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+QtObject {
+    property int test: external_script_func();
+
+    Script {
+        // Single source as non-array literal
+        source: "externalScript.js"
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.js b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.js
new file mode 100644
index 0000000..78c3a86
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.js
@@ -0,0 +1,8 @@
+function external_script_func2() {
+    return a;
+}
+
+function is_a_undefined() {
+    return a == undefined;
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.qml
new file mode 100644
index 0000000..dec657c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+QtObject {
+    property int test: external_script_func();
+
+    Script {
+        // Single source as array 
+        source: [ "externalScript.js" ]
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml
new file mode 100644
index 0000000..d7acf38
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+
+QtObject {
+    property int test: external_script_func();
+    property int test2: external_script_func2();
+    property bool test3: is_a_undefined();
+
+    Script {
+        // Multiple script
+        source: [ "externalScript.js", "externalScript.2.js" ]
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.4.qml
new file mode 100644
index 0000000..16211aa
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.4.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+
+QtObject {
+    property int test: external_script_func();
+    property bool test2: is_a_undefined();
+
+    // Disconnected scripts
+    Script {
+        source: "externalScript.js"
+    }
+
+    Script {
+        source: "externalScript.2.js"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.js b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.js
new file mode 100644
index 0000000..8928652
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.js
@@ -0,0 +1,6 @@
+var a = 92;
+
+function external_script_func() {
+    return a;
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
new file mode 100644
index 0000000..2db0fc6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
@@ -0,0 +1,13 @@
+import Qt.test 1.0
+import Qt 4.6
+
+MyQmlObject {
+    objectProperty: if(1) otherObject
+
+    property var obj
+
+    obj: QtObject {
+        id: otherObject
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
new file mode 100644
index 0000000..f66428d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
@@ -0,0 +1,12 @@
+import Qt.test 1.0
+import Qt 4.6
+
+MyQmlObject {
+    objectProperty: otherObject
+
+    property var obj
+
+    obj: QtObject {
+        id: otherObject
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml
new file mode 100644
index 0000000..4128c92
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+
+QtObject {
+    property int test
+
+    Component.onCompleted: {
+        var o = new Object;
+        o.test = 92;
+        test = o.test;
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
new file mode 100644
index 0000000..810f9b6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
@@ -0,0 +1,27 @@
+import Qt.test 1.0
+import Qt 4.6
+
+MyQmlObject {
+    id: root
+
+    objectListProperty: [
+        QtObject { property int a: 10 },
+        QtObject { property int a: 11 }
+    ]
+
+    Script {
+        function calcTest1() {
+            var rv = 0;
+            for (var ii = 0; ii < root.objectListProperty.length; ++ii) {
+                rv += root.objectListProperty[ii].a;
+            }
+            return rv;
+        }
+
+    }
+
+    property int test1: calcTest1();
+    property int test2: root.objectListProperty.length
+    property bool test3: root.objectListProperty[1] != undefined
+    property bool test4: root.objectListProperty[100] == undefined
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
new file mode 100644
index 0000000..47f4e50
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    property var test: children
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml
new file mode 100644
index 0000000..0bbee16
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml
@@ -0,0 +1,6 @@
+import Qt.test 1.0
+
+MyQmlObject { 
+    id: myObject
+    onBasicSignal: myObject.methodNoArgs() 
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml
new file mode 100644
index 0000000..9f0c6b1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml
@@ -0,0 +1,6 @@
+import Qt.test 1.0
+
+MyQmlObject { 
+    id: myObject
+    onBasicSignal: myObject.method(163) 
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml
new file mode 100644
index 0000000..79efc50
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+QtObject {
+    function testFunction() { return 19; }
+
+    property int test: testFunction()
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml
new file mode 100644
index 0000000..aac711c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+MethodsObject {
+    function testFunction2() { return 17; }
+    function testFunction3() { return 16; }
+
+    property int test: testFunction()
+    property int test2: testFunction2()
+    property int test3: testFunction3()
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml
new file mode 100644
index 0000000..3d45b15
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+Item {
+    property alias x: item.x
+    Item { id: item }
+
+    function testFunction() { return 9; }
+    property int test: testFunction();
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml
new file mode 100644
index 0000000..7da09e4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    property string test: thing.stringProperty
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/nonExistantAttachedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nonExistantAttachedObject.qml
new file mode 100644
index 0000000..f9585db
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/nonExistantAttachedObject.qml
@@ -0,0 +1,5 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    stringProperty: MyQmlContainer.prop
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml b/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
new file mode 100644
index 0000000..18e488a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+
+Item {
+    id: root
+
+    property var item: child
+    Item { id: child }
+
+    property bool test1: child == child
+    property bool test2: child.parent == root
+    property bool test3: root != child
+    property bool test4: item == child
+    property bool test5: item != root
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
new file mode 100644
index 0000000..0a933e8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
@@ -0,0 +1,14 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property alias c1: myConstants.c1
+    property alias c2: myConstants.c2
+    property int c3: 0
+
+    objectProperty: ConstantsOverrideBindings { 
+        id: myConstants 
+        c2: c3
+    }
+
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml
new file mode 100644
index 0000000..ac296ce
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml
@@ -0,0 +1,11 @@
+import Qt.test 1.0
+
+MyQmlObject{
+    id: obj
+    objectName: "objName"
+    function testToString()
+    {
+        obj.stringProperty = obj.toString();
+    }
+
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml
new file mode 100644
index 0000000..8e5aa0b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml
@@ -0,0 +1,42 @@
+import Qt 4.6
+
+Item {
+    property int a: 0
+    property int b: 0
+
+    Script {
+        function b() { return 11; }
+        function c() { return 33; }
+    }
+
+    QtObject {
+        id: a
+        property int value: 19
+    }
+
+    QtObject {
+        id: c
+        property int value: 24
+    }
+
+    QtObject {
+        id: nested
+        property int a: 1
+        property int test: a.value
+        property int test2: b()
+        property int test3: c.value
+    }
+
+
+    // id takes precedence over local, and root properties
+    property int test1: a.value 
+    property alias test2: nested.test
+
+    // methods takes precedence over local, and root properties
+    property int test3: b()
+    property alias test4: nested.test2
+
+    // id takes precedence over methods
+    property int test5: c.value
+    property alias test6: nested.test3
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml
new file mode 100644
index 0000000..cccd3d3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml
@@ -0,0 +1,48 @@
+import Qt 4.6
+
+Item {
+    id: root
+
+    property int a: 1
+    property int binding: a
+    property string binding2: a + "Test"
+    property int binding3: myFunction()
+    property int binding4: myNestedFunction()
+
+    Script {
+        function myFunction() {
+            return a;
+        }
+    }
+
+    Item {
+        id: nestedObject
+
+        Script {
+            function myNestedFunction() {
+                return a;
+            }
+        }
+
+        property int a: 2
+        property int binding: a
+        property string binding2: a + "Test"
+        property int binding3: myFunction()
+        property int binding4: myNestedFunction()
+    }
+
+    ScopeObject {
+        id: compObject
+    }
+
+    property alias test1: root.binding
+    property alias test2: nestedObject.binding
+    property alias test3: root.binding2
+    property alias test4: nestedObject.binding2
+    property alias test5: root.binding3
+    property alias test6: nestedObject.binding3
+    property alias test7: root.binding4
+    property alias test8: nestedObject.binding4
+    property alias test9: compObject.binding
+    property alias test10: compObject.binding2
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.js
new file mode 100644
index 0000000..c00d285
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.js
@@ -0,0 +1,7 @@
+var extVariable = 19;
+
+function extMethod()
+{
+    return extVariable;
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.qml
new file mode 100644
index 0000000..feb6d16
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.qml
@@ -0,0 +1,17 @@
+import Qt 4.6
+
+Item {
+    Script {
+        function method() {
+            return 10;
+        }
+    }
+
+    Script {
+        source: "scriptAccess.js"
+    }
+
+    property int test1: method()
+    property int test2: extMethod()
+    property int test3: extVariable
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.js
new file mode 100644
index 0000000..1d7b357
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.js
@@ -0,0 +1,2 @@
+// Comment
+a = 10
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml
new file mode 100644
index 0000000..c2edb41
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml
@@ -0,0 +1,17 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    Script { source: "scriptErrors.js" }
+    Script { function getValue() { a = 10; return 0; } }
+
+    property int t: a.value
+    property int w: getValue();
+    property int x: undefinedObject
+    property int y: (a.value, undefinedObject)
+
+    onBasicSignal: { console.log(a.value); }
+    id: myObj
+    onAnotherBasicSignal: myObj.trueProperty = false;
+    onThirdBasicSignal: myObj.fakeProperty = "";
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml
new file mode 100644
index 0000000..58cf805
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml
@@ -0,0 +1,17 @@
+import Qt.test 1.0
+
+MyQmlContainer {
+    property bool triggerDelete: false
+
+    children: [
+        MyQmlObject {
+            // Will trigger deletion on binding assignment
+            deleteOnSet: Math.max(0, 1)
+        },
+
+        MyQmlObject {
+            // Will trigger deletion on binding assignment, but after component creation
+            deleteOnSet: if (triggerDelete) 1; else 0; 
+        }
+    ]
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.qml
new file mode 100644
index 0000000..074851a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.qml
@@ -0,0 +1,18 @@
+import Qt.test 1.0
+
+MyQmlContainer {
+    property bool triggerDelete: false
+
+    children: [
+        MyQmlObject {
+            // Will trigger deletion during binding evaluation
+            stringProperty: {deleteMe(), "Hello"}
+        },
+
+        MyQmlObject {
+            // Will trigger deletion during binding evaluation, but after component creation
+            stringProperty: if (triggerDelete) { deleteMe(), "Hello" } else { "World" }
+        }
+
+    ]
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml
new file mode 100644
index 0000000..5a19639
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+
+Item {
+    property int test: myObject.object.a
+
+    Item {
+        id: myObject
+        property QtObject object;
+        object: QtObject {
+            property int a: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml
new file mode 100644
index 0000000..fbd0914
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml
@@ -0,0 +1,5 @@
+import Qt.test 1.0
+
+MyQmlObject { 
+    onBasicSignal: setString('pass') 
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml
new file mode 100644
index 0000000..8addcb9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml
@@ -0,0 +1,5 @@
+import Qt.test 1.0
+
+MyQmlObject { 
+    onArgumentSignal: setString('pass ' + a + ' ' + b + ' ' + c) 
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml
new file mode 100644
index 0000000..6fc8b02
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml
@@ -0,0 +1,16 @@
+import Qt.test 1.0
+
+MyQmlObject
+{
+    id: root
+    property int intProperty
+    property real realProperty
+    property color colorProperty
+    property var variantProperty
+
+    signal mySignal(int a, real b, color c, var d)
+
+    onMySignal: { intProperty = a; realProperty = b; colorProperty = c; variantProperty = d; }
+
+    onBasicSignal: root.mySignal(10, 19.2, Qt.rgba(1, 1, 0, 1), Qt.rgba(1, 0, 1, 1))
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml
new file mode 100644
index 0000000..7d419cd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml
@@ -0,0 +1,20 @@
+import Qt.test 1.0
+import Qt 4.6
+
+MyQmlObject {
+    property real base: 50
+    property alias test1: myObject.test1
+    property alias test2: myObject.test2
+
+    objectProperty: QtObject {
+        id: myObject
+        property real test1: base
+        property real test2: Math.max(0, base)
+    }
+        
+    // Signal with no args
+    onBasicSignal: base = 200
+    // Signal with args
+    onArgumentSignal: base = 400
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
new file mode 100644
index 0000000..fa7e01c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+QtObject {
+    property var obj: nested
+
+    property var obj2
+    obj2: NestedTypeTransientErrors {
+        id: nested
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.2.qml
new file mode 100644
index 0000000..e73d38e2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.2.qml
@@ -0,0 +1,10 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    resettableProperty: 19
+
+    function doReset() {
+        resettableProperty = undefined;
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.qml
new file mode 100644
index 0000000..eceff60
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.qml
@@ -0,0 +1,7 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property bool setUndefined: false
+
+    resettableProperty: setUndefined?undefined:92
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/valueTypeFunctions.qml b/tests/auto/declarative/qdeclarativeecmascript/data/valueTypeFunctions.qml
new file mode 100644
index 0000000..33b4a68
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/valueTypeFunctions.qml
@@ -0,0 +1,6 @@
+import Qt.test 1.0
+
+MyTypeObject {
+    rectProperty: Qt.rect(0,0,100,100)
+    rectFProperty: Qt.rect(0,0.5,100,99.5)
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
new file mode 100644
index 0000000..0e21cb2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
@@ -0,0 +1,10 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative script
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeecmascript.cpp \
+           testtypes.cpp
+HEADERS += testtypes.h
+
+# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
+# LIBS += -lgcov
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
new file mode 100644
index 0000000..6a04704
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "testtypes.h"
+
+class BaseExtensionObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int baseExtendedProperty READ extendedProperty WRITE setExtendedProperty NOTIFY extendedPropertyChanged);
+public:
+    BaseExtensionObject(QObject *parent) : QObject(parent), m_value(0) {}
+
+    int extendedProperty() const { return m_value; }
+    void setExtendedProperty(int v) { m_value = v; emit extendedPropertyChanged(); }
+
+signals:
+    void extendedPropertyChanged();
+private:
+    int m_value;
+};
+
+class ExtensionObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int extendedProperty READ extendedProperty WRITE setExtendedProperty NOTIFY extendedPropertyChanged);
+public:
+    ExtensionObject(QObject *parent) : QObject(parent), m_value(0) {}
+
+    int extendedProperty() const { return m_value; }
+    void setExtendedProperty(int v) { m_value = v; emit extendedPropertyChanged(); }
+
+signals:
+    void extendedPropertyChanged();
+private:
+    int m_value;
+};
+
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Qt.test, 1,0, MyQmlObject,MyQmlObject);
+    QML_REGISTER_TYPE(Qt.test, 1,0, MyDeferredObject,MyDeferredObject);
+    QML_REGISTER_TYPE(Qt.test, 1,0, MyQmlContainer,MyQmlContainer);
+    QML_REGISTER_EXTENDED_TYPE(Qt.test, 1,0, MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject);
+    QML_REGISTER_EXTENDED_TYPE(Qt.test, 1,0, MyExtendedObject,MyExtendedObject,ExtensionObject);
+    QML_REGISTER_TYPE(Qt.test, 1,0, MyTypeObject, MyTypeObject);
+}
+
+#include "testtypes.moc"
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
new file mode 100644
index 0000000..779e4e4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
@@ -0,0 +1,598 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef TESTTYPES_H
+#define TESTTYPES_H
+
+#include <QtCore/qobject.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeexpression.h>
+#include <QtCore/qpoint.h>
+#include <QtCore/qsize.h>
+#include <QtDeclarative/qdeclarativelist.h>
+#include <QtCore/qrect.h>
+#include <QtGui/qmatrix.h>
+#include <QtGui/qcolor.h>
+#include <QtGui/qvector3d.h>
+#include <QtCore/qdatetime.h>
+#include <QtScript/qscriptvalue.h>
+#include <QtDeclarative/qdeclarativescriptstring.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+
+class MyQmlAttachedObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value CONSTANT)
+public:
+    MyQmlAttachedObject(QObject *parent) : QObject(parent) {}
+
+    int value() const { return 19; }
+};
+
+class MyQmlObject : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(MyEnum)
+    Q_ENUMS(MyEnum2)
+    Q_PROPERTY(int deleteOnSet READ deleteOnSet WRITE setDeleteOnSet)
+    Q_PROPERTY(bool trueProperty READ trueProperty CONSTANT)
+    Q_PROPERTY(bool falseProperty READ falseProperty CONSTANT)
+    Q_PROPERTY(int value READ value WRITE setValue)
+    Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty NOTIFY stringChanged)
+    Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty NOTIFY objectChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> objectListProperty READ objectListProperty CONSTANT)
+    Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty)
+
+public:
+    MyQmlObject(): m_methodCalled(false), m_methodIntCalled(false), m_object(0), m_value(0), m_resetProperty(13) {}
+
+    enum MyEnum { EnumValue1 = 0, EnumValue2 = 1 };
+    enum MyEnum2 { EnumValue3 = 2, EnumValue4 = 3 };
+
+    bool trueProperty() const { return true; }
+    bool falseProperty() const { return false; }
+
+    QString stringProperty() const { return m_string; }
+    void setStringProperty(const QString &s)
+    {
+        if (s == m_string)
+            return;
+        m_string = s;
+        emit stringChanged();
+    }
+
+    QObject *objectProperty() const { return m_object; }
+    void setObjectProperty(QObject *obj) { 
+        if (obj == m_object)
+            return;
+        m_object = obj;
+        emit objectChanged();
+    }
+
+    QDeclarativeListProperty<QObject> objectListProperty() { return QDeclarativeListProperty<QObject>(this, m_objectQList); }
+
+    bool methodCalled() const { return m_methodCalled; }
+    bool methodIntCalled() const { return m_methodIntCalled; }
+
+    QString string() const { return m_string; }
+
+    static MyQmlAttachedObject *qmlAttachedProperties(QObject *o) {
+        return new MyQmlAttachedObject(o);
+    }
+
+    int deleteOnSet() const { return 1; }
+    void setDeleteOnSet(int v) { if(v) delete this; }
+
+    int value() const { return m_value; }
+    void setValue(int v) { m_value = v; }
+
+    int resettableProperty() const { return m_resetProperty; }
+    void setResettableProperty(int v) { m_resetProperty = v; }
+    void resetProperty() { m_resetProperty = 13; }
+
+signals:
+    void basicSignal();
+    void argumentSignal(int a, QString b, qreal c);
+    void stringChanged();
+    void objectChanged();
+    void anotherBasicSignal();
+    void thirdBasicSignal();
+
+public slots:
+    void deleteMe() { delete this; }
+    void methodNoArgs() { m_methodCalled = true; }
+    void method(int a) { if(a == 163) m_methodIntCalled = true; }
+    void setString(const QString &s) { m_string = s; }
+
+private:
+    friend class tst_qmlecmascript;
+    bool m_methodCalled;
+    bool m_methodIntCalled;
+
+    QObject *m_object;
+    QString m_string;
+    QList<QObject *> m_objectQList;
+    int m_value;
+    int m_resetProperty;
+};
+
+QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(MyQmlObject);
+
+class MyQmlContainer : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDeclarativeListProperty<MyQmlObject> children READ children CONSTANT)
+public:
+    MyQmlContainer() {}
+
+    QDeclarativeListProperty<MyQmlObject> children() { return QDeclarativeListProperty<MyQmlObject>(this, m_children); }
+
+private:
+    QList<MyQmlObject*> m_children;
+};
+
+QML_DECLARE_TYPE(MyQmlContainer);
+
+class MyExpression : public QDeclarativeExpression
+{
+    Q_OBJECT
+public:
+    MyExpression(QDeclarativeContext *ctxt, const QString &expr)
+        : QDeclarativeExpression(ctxt, expr, 0), changed(false)
+    {
+        QObject::connect(this, SIGNAL(valueChanged()), this, SLOT(expressionValueChanged()));
+        setNotifyOnValueChanged(true);
+    }
+
+    bool changed;
+
+public slots:
+    void expressionValueChanged() {
+        changed = true;
+    }
+};
+
+
+class MyDefaultObject1 : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int horseLegs READ horseLegs CONSTANT);
+    Q_PROPERTY(int antLegs READ antLegs CONSTANT);
+public:
+    int horseLegs() const { return 4; }
+    int antLegs() const { return 6; }
+};
+
+class MyDefaultObject2 : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int antLegs READ antLegs CONSTANT);
+    Q_PROPERTY(int emuLegs READ emuLegs CONSTANT);
+public:
+    int antLegs() const { return 5; } // Had an accident
+    int emuLegs() const { return 2; }
+};
+
+class MyDefaultObject3 : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int antLegs READ antLegs CONSTANT);
+    Q_PROPERTY(int humanLegs READ humanLegs CONSTANT);
+public:
+    int antLegs() const { return 7; } // Mutant
+    int humanLegs() const { return 2; }
+    int millipedeLegs() const { return 1000; }
+};
+
+class MyDeferredObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
+    Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty);
+    Q_PROPERTY(QObject *objectProperty2 READ objectProperty2 WRITE setObjectProperty2);
+    Q_CLASSINFO("DeferredPropertyNames", "value,objectProperty,objectProperty2");
+
+public:
+    MyDeferredObject() : m_value(0), m_object(0), m_object2(0) {}
+
+    int value() const { return m_value; }
+    void setValue(int v) { m_value = v; emit valueChanged(); }
+
+    QObject *objectProperty() const { return m_object; }
+    void setObjectProperty(QObject *obj) { m_object = obj; }
+
+    QObject *objectProperty2() const { return m_object2; }
+    void setObjectProperty2(QObject *obj) { m_object2 = obj; }
+
+signals:
+    void valueChanged();
+
+private:
+    int m_value;
+    QObject *m_object;
+    QObject *m_object2;
+};
+QML_DECLARE_TYPE(MyDeferredObject);
+
+class MyBaseExtendedObject : public QObject
+{
+Q_OBJECT
+Q_PROPERTY(int baseProperty READ baseProperty WRITE setBaseProperty);
+public:
+    MyBaseExtendedObject() : m_value(0) {}
+
+    int baseProperty() const { return m_value; }
+    void setBaseProperty(int v) { m_value = v; }
+
+private:
+    int m_value;
+};
+QML_DECLARE_TYPE(MyBaseExtendedObject);
+
+class MyExtendedObject : public MyBaseExtendedObject
+{
+Q_OBJECT
+Q_PROPERTY(int coreProperty READ coreProperty WRITE setCoreProperty);
+public:
+    MyExtendedObject() : m_value(0) {}
+
+    int coreProperty() const { return m_value; }
+    void setCoreProperty(int v) { m_value = v; }
+
+private:
+    int m_value;
+};
+QML_DECLARE_TYPE(MyExtendedObject);
+
+class MyTypeObject : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(MyEnum)
+    Q_FLAGS(MyFlags)
+
+    Q_PROPERTY(QString id READ id WRITE setId);
+    Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty);
+    Q_PROPERTY(QDeclarativeComponent *componentProperty READ componentProperty WRITE setComponentProperty);
+    Q_PROPERTY(MyFlags flagProperty READ flagProperty WRITE setFlagProperty);
+    Q_PROPERTY(MyEnum enumProperty READ enumProperty WRITE setEnumProperty);
+    Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty);
+    Q_PROPERTY(uint uintProperty READ uintProperty WRITE setUintProperty);
+    Q_PROPERTY(int intProperty READ intProperty WRITE setIntProperty);
+    Q_PROPERTY(qreal realProperty READ realProperty WRITE setRealProperty);
+    Q_PROPERTY(double doubleProperty READ doubleProperty WRITE setDoubleProperty);
+    Q_PROPERTY(float floatProperty READ floatProperty WRITE setFloatProperty);
+    Q_PROPERTY(QColor colorProperty READ colorProperty WRITE setColorProperty);
+    Q_PROPERTY(QDate dateProperty READ dateProperty WRITE setDateProperty);
+    Q_PROPERTY(QTime timeProperty READ timeProperty WRITE setTimeProperty);
+    Q_PROPERTY(QDateTime dateTimeProperty READ dateTimeProperty WRITE setDateTimeProperty);
+    Q_PROPERTY(QPoint pointProperty READ pointProperty WRITE setPointProperty);
+    Q_PROPERTY(QPointF pointFProperty READ pointFProperty WRITE setPointFProperty);
+    Q_PROPERTY(QSize sizeProperty READ sizeProperty WRITE setSizeProperty);
+    Q_PROPERTY(QSizeF sizeFProperty READ sizeFProperty WRITE setSizeFProperty);
+    Q_PROPERTY(QRect rectProperty READ rectProperty WRITE setRectProperty NOTIFY rectPropertyChanged);
+    Q_PROPERTY(QRect rectProperty2 READ rectProperty2 WRITE setRectProperty2);
+    Q_PROPERTY(QRectF rectFProperty READ rectFProperty WRITE setRectFProperty);
+    Q_PROPERTY(bool boolProperty READ boolProperty WRITE setBoolProperty);
+    Q_PROPERTY(QVariant variantProperty READ variantProperty WRITE setVariantProperty);
+    Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty);
+    Q_PROPERTY(QUrl urlProperty READ urlProperty WRITE setUrlProperty);
+
+    Q_PROPERTY(QDeclarativeScriptString scriptProperty READ scriptProperty WRITE setScriptProperty);
+
+public:
+    MyTypeObject()
+        : objectPropertyValue(0), componentPropertyValue(0) {}
+
+    QString idValue;
+    QString id() const {
+        return idValue;
+    }
+    void setId(const QString &v) {
+        idValue = v;
+    }
+
+    QObject *objectPropertyValue;
+    QObject *objectProperty() const {
+        return objectPropertyValue;
+    }
+    void setObjectProperty(QObject *v) {
+        objectPropertyValue = v;
+    }
+
+    QDeclarativeComponent *componentPropertyValue;
+    QDeclarativeComponent *componentProperty() const {
+        return componentPropertyValue;
+    }
+    void setComponentProperty(QDeclarativeComponent *v) {
+        componentPropertyValue = v;
+    }
+
+    enum MyFlag { FlagVal1 = 0x01, FlagVal2 = 0x02, FlagVal3 = 0x04 };
+    Q_DECLARE_FLAGS(MyFlags, MyFlag)
+    MyFlags flagPropertyValue;
+    MyFlags flagProperty() const {
+        return flagPropertyValue;
+    }
+    void setFlagProperty(MyFlags v) {
+        flagPropertyValue = v;
+    }
+
+    enum MyEnum { EnumVal1, EnumVal2 };
+    MyEnum enumPropertyValue;
+    MyEnum enumProperty() const {
+        return enumPropertyValue;
+    }
+    void setEnumProperty(MyEnum v) {
+        enumPropertyValue = v;
+    }
+
+    QString stringPropertyValue;
+    QString stringProperty() const {
+       return stringPropertyValue;
+    }
+    void setStringProperty(const QString &v) {
+        stringPropertyValue = v;
+    }
+
+    uint uintPropertyValue;
+    uint uintProperty() const {
+       return uintPropertyValue;
+    }
+    void setUintProperty(const uint &v) {
+        uintPropertyValue = v;
+    }
+
+    int intPropertyValue;
+    int intProperty() const {
+       return intPropertyValue;
+    }
+    void setIntProperty(const int &v) {
+        intPropertyValue = v;
+    }
+
+    qreal realPropertyValue;
+    qreal realProperty() const {
+       return realPropertyValue;
+    }
+    void setRealProperty(const qreal &v) {
+        realPropertyValue = v;
+    }
+
+    double doublePropertyValue;
+    double doubleProperty() const {
+       return doublePropertyValue;
+    }
+    void setDoubleProperty(const double &v) {
+        doublePropertyValue = v;
+    }
+
+    float floatPropertyValue;
+    float floatProperty() const {
+       return floatPropertyValue;
+    }
+    void setFloatProperty(const float &v) {
+        floatPropertyValue = v;
+    }
+
+    QColor colorPropertyValue;
+    QColor colorProperty() const {
+       return colorPropertyValue;
+    }
+    void setColorProperty(const QColor &v) {
+        colorPropertyValue = v;
+    }
+
+    QDate datePropertyValue;
+    QDate dateProperty() const {
+       return datePropertyValue;
+    }
+    void setDateProperty(const QDate &v) {
+        datePropertyValue = v;
+    }
+
+    QTime timePropertyValue;
+    QTime timeProperty() const {
+       return timePropertyValue;
+    }
+    void setTimeProperty(const QTime &v) {
+        timePropertyValue = v;
+    }
+
+    QDateTime dateTimePropertyValue;
+    QDateTime dateTimeProperty() const {
+       return dateTimePropertyValue;
+    }
+    void setDateTimeProperty(const QDateTime &v) {
+        dateTimePropertyValue = v;
+    }
+
+    QPoint pointPropertyValue;
+    QPoint pointProperty() const {
+       return pointPropertyValue;
+    }
+    void setPointProperty(const QPoint &v) {
+        pointPropertyValue = v;
+    }
+
+    QPointF pointFPropertyValue;
+    QPointF pointFProperty() const {
+       return pointFPropertyValue;
+    }
+    void setPointFProperty(const QPointF &v) {
+        pointFPropertyValue = v;
+    }
+
+    QSize sizePropertyValue;
+    QSize sizeProperty() const {
+       return sizePropertyValue;
+    }
+    void setSizeProperty(const QSize &v) {
+        sizePropertyValue = v;
+    }
+
+    QSizeF sizeFPropertyValue;
+    QSizeF sizeFProperty() const {
+       return sizeFPropertyValue;
+    }
+    void setSizeFProperty(const QSizeF &v) {
+        sizeFPropertyValue = v;
+    }
+
+    QRect rectPropertyValue;
+    QRect rectProperty() const {
+       return rectPropertyValue;
+    }
+    void setRectProperty(const QRect &v) {
+        rectPropertyValue = v;
+        emit rectPropertyChanged();
+    }
+
+    QRect rectPropertyValue2;
+    QRect rectProperty2() const {
+       return rectPropertyValue2;
+    }
+    void setRectProperty2(const QRect &v) {
+        rectPropertyValue2 = v;
+    }
+
+    QRectF rectFPropertyValue;
+    QRectF rectFProperty() const {
+       return rectFPropertyValue;
+    }
+    void setRectFProperty(const QRectF &v) {
+        rectFPropertyValue = v;
+    }
+
+    bool boolPropertyValue;
+    bool boolProperty() const {
+       return boolPropertyValue;
+    }
+    void setBoolProperty(const bool &v) {
+        boolPropertyValue = v;
+    }
+
+    QVariant variantPropertyValue;
+    QVariant variantProperty() const {
+       return variantPropertyValue;
+    }
+    void setVariantProperty(const QVariant &v) {
+        variantPropertyValue = v;
+    }
+
+    QVector3D vectorPropertyValue;
+    QVector3D vectorProperty() const {
+        return vectorPropertyValue;
+    }
+    void setVectorProperty(const QVector3D &v) {
+        vectorPropertyValue = v;
+    }
+
+    QUrl urlPropertyValue;
+    QUrl urlProperty() const {
+        return urlPropertyValue;
+    }
+    void setUrlProperty(const QUrl &v) {
+        urlPropertyValue = v;
+    }
+
+    QDeclarativeScriptString scriptPropertyValue;
+    QDeclarativeScriptString scriptProperty() const {
+        return scriptPropertyValue;
+    }
+    void setScriptProperty(const QDeclarativeScriptString &v) {
+        scriptPropertyValue = v;
+    }
+
+    void doAction() { emit action(); }
+signals:
+    void action();
+    void rectPropertyChanged();
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(MyTypeObject::MyFlags)
+QML_DECLARE_TYPE(MyTypeObject);
+
+Q_DECLARE_METATYPE(QScriptValue);
+class MyInvokableObject : public QObject
+{
+    Q_OBJECT
+public:
+    MyInvokableObject() { reset(); }
+
+    int invoked() const { return m_invoked; }
+    bool error() const { return m_invokedError; }
+    const QVariantList &actuals() const { return m_actuals; }
+    void reset() { m_invoked = -1; m_invokedError = false; m_actuals.clear(); }
+
+    Q_INVOKABLE QPointF method_get_QPointF() { return QPointF(99.3, -10.2); }
+    Q_INVOKABLE QPoint method_get_QPoint() { return QPoint(9, 12); }
+
+    Q_INVOKABLE void method_NoArgs() { invoke(0); }
+    Q_INVOKABLE int method_NoArgs_int() { invoke(1); return 6; }
+    Q_INVOKABLE qreal method_NoArgs_real() { invoke(2); return 19.7; }
+    Q_INVOKABLE QPointF method_NoArgs_QPointF() { invoke(3); return QPointF(123, 4.5); }
+    Q_INVOKABLE QObject *method_NoArgs_QObject() { invoke(4); return this; }
+    Q_INVOKABLE MyInvokableObject *method_NoArgs_unknown() { invoke(5); return this; }
+    Q_INVOKABLE QScriptValue method_NoArgs_QScriptValue() { invoke(6); return QScriptValue("Hello world"); }
+    Q_INVOKABLE QVariant method_NoArgs_QVariant() { invoke(7); return QVariant("QML rocks"); }
+
+    Q_INVOKABLE void method_int(int a) { invoke(8); m_actuals << a; }
+    Q_INVOKABLE void method_intint(int a, int b) { invoke(9); m_actuals << a << b; }
+    Q_INVOKABLE void method_real(qreal a) { invoke(10); m_actuals << a; }
+    Q_INVOKABLE void method_QString(QString a) { invoke(11); m_actuals << a; }
+    Q_INVOKABLE void method_QPointF(QPointF a) { invoke(12); m_actuals << a; }
+    Q_INVOKABLE void method_QObject(QObject *a) { invoke(13); m_actuals << qVariantFromValue(a); }
+    Q_INVOKABLE void method_QScriptValue(QScriptValue a) { invoke(14); m_actuals << qVariantFromValue(a); }
+    Q_INVOKABLE void method_intQScriptValue(int a, QScriptValue b) { invoke(15); m_actuals << a << qVariantFromValue(b); }
+    
+    Q_INVOKABLE void method_overload(int a) { invoke(16); m_actuals << a; }
+    Q_INVOKABLE void method_overload(int a, int b) { invoke(17); m_actuals << a << b; }
+
+private:
+    void invoke(int idx) { if (m_invoked != -1) m_invokedError = true; m_invoked = idx;}
+    int m_invoked;
+    bool m_invokedError;
+    QVariantList m_actuals;
+};
+
+void registerTypes();
+
+#endif // TESTTYPES_H
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
new file mode 100644
index 0000000..0c8dcb5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -0,0 +1,1662 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativeexpression.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qdebug.h>
+#include <QtDeclarative/private/qdeclarativeguard_p.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qnumeric.h>
+#include <private/qdeclarativeengine_p.h>
+#include <private/qdeclarativeglobalscriptclass_p.h>
+#include "testtypes.h"
+
+/*
+This test covers evaluation of ECMAScript expressions and bindings from within
+QML.  This does not include static QML language issues.
+
+Static QML language issues are covered in qmllanguage
+*/
+inline QUrl TEST_FILE(const QString &filename)
+{
+    QFileInfo fileInfo(__FILE__);
+    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename));
+}
+
+inline QUrl TEST_FILE(const char *filename)
+{
+    return TEST_FILE(QLatin1String(filename));
+}
+
+class tst_qmlecmascript : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlecmascript() {}
+
+private slots:
+    void initTestCase();
+    void assignBasicTypes();
+    void idShortcutInvalidates();
+    void boolPropertiesEvaluateAsBool();
+    void methods();
+    void signalAssignment();
+    void bindingLoop();
+    void basicExpressions();
+    void basicExpressions_data();
+    void arrayExpressions();
+    void contextPropertiesTriggerReeval();
+    void objectPropertiesTriggerReeval();
+    void deferredProperties();
+    void extensionObjects();
+    void attachedProperties();
+    void enums();
+    void valueTypeFunctions();
+    void constantsOverrideBindings();
+    void outerBindingOverridesInnerBinding();
+    void aliasPropertyAndBinding();
+    void nonExistantAttachedObject();
+    void scope();
+    void signalParameterTypes();
+    void objectsCompareAsEqual();
+    void scriptAccess();
+    void dynamicCreation_data();
+    void dynamicCreation();
+    void dynamicDestruction();
+    void objectToString();
+    void selfDeletingBinding();
+    void extendedObjectPropertyLookup();
+    void scriptErrors();
+    void signalTriggeredBindings();
+    void listProperties();
+    void exceptionClearsOnReeval();
+    void exceptionSlotProducesWarning();
+    void exceptionBindingProducesWarning();
+    void transientErrors();
+    void shutdownErrors();
+    void externalScript();
+    void compositePropertyType();
+    void jsObject();
+    void undefinedResetsProperty();
+    void listToVariant();
+    void multiEngineObject();
+    void deletedObject();
+
+    void bug1();
+
+    void callQtInvokables();
+private:
+    QDeclarativeEngine engine;
+};
+
+void tst_qmlecmascript::initTestCase() { registerTypes(); }
+
+void tst_qmlecmascript::assignBasicTypes()
+{
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3);
+    QCOMPARE(object->enumProperty(), MyTypeObject::EnumVal2);
+    QCOMPARE(object->stringProperty(), QString("Hello World!"));
+    QCOMPARE(object->uintProperty(), uint(10));
+    QCOMPARE(object->intProperty(), -19);
+    QCOMPARE((float)object->realProperty(), float(23.2));
+    QCOMPARE((float)object->doubleProperty(), float(-19.7));
+    QCOMPARE((float)object->floatProperty(), float(8.5));
+    QCOMPARE(object->colorProperty(), QColor("red"));
+    QCOMPARE(object->dateProperty(), QDate(1982, 11, 25));
+    QCOMPARE(object->timeProperty(), QTime(11, 11, 32));
+    QCOMPARE(object->dateTimeProperty(), QDateTime(QDate(2009, 5, 12), QTime(13, 22, 1)));
+    QCOMPARE(object->pointProperty(), QPoint(99,13));
+    QCOMPARE(object->pointFProperty(), QPointF(-10.1, 12.3));
+    QCOMPARE(object->sizeProperty(), QSize(99, 13));
+    QCOMPARE(object->sizeFProperty(), QSizeF(0.1, 0.2));
+    QCOMPARE(object->rectProperty(), QRect(9, 7, 100, 200));
+    QCOMPARE(object->rectFProperty(), QRectF(1000.1, -10.9, 400, 90.99));
+    QCOMPARE(object->boolProperty(), true);
+    QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
+    QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2));
+    QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml")));
+    delete object;
+    }
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.2.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3);
+    QCOMPARE(object->enumProperty(), MyTypeObject::EnumVal2);
+    QCOMPARE(object->stringProperty(), QString("Hello World!"));
+    QCOMPARE(object->uintProperty(), uint(10));
+    QCOMPARE(object->intProperty(), -19);
+    QCOMPARE((float)object->realProperty(), float(23.2));
+    QCOMPARE((float)object->doubleProperty(), float(-19.7));
+    QCOMPARE((float)object->floatProperty(), float(8.5));
+    QCOMPARE(object->colorProperty(), QColor("red"));
+    QCOMPARE(object->dateProperty(), QDate(1982, 11, 25));
+    QCOMPARE(object->timeProperty(), QTime(11, 11, 32));
+    QCOMPARE(object->dateTimeProperty(), QDateTime(QDate(2009, 5, 12), QTime(13, 22, 1)));
+    QCOMPARE(object->pointProperty(), QPoint(99,13));
+    QCOMPARE(object->pointFProperty(), QPointF(-10.1, 12.3));
+    QCOMPARE(object->sizeProperty(), QSize(99, 13));
+    QCOMPARE(object->sizeFProperty(), QSizeF(0.1, 0.2));
+    QCOMPARE(object->rectProperty(), QRect(9, 7, 100, 200));
+    QCOMPARE(object->rectFProperty(), QRectF(1000.1, -10.9, 400, 90.99));
+    QCOMPARE(object->boolProperty(), true);
+    QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
+    QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2));
+    QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml")));
+    delete object;
+    }
+}
+
+void tst_qmlecmascript::idShortcutInvalidates()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        QVERIFY(object->objectProperty() != 0);
+        delete object->objectProperty();
+        QVERIFY(object->objectProperty() == 0);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("idShortcutInvalidates.1.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        QVERIFY(object->objectProperty() != 0);
+        delete object->objectProperty();
+        QVERIFY(object->objectProperty() == 0);
+    }
+}
+
+void tst_qmlecmascript::boolPropertiesEvaluateAsBool()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->stringProperty(), QLatin1String("pass"));
+    }
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.2.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->stringProperty(), QLatin1String("pass"));
+    }
+}
+
+void tst_qmlecmascript::signalAssignment()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("signalAssignment.1.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->string(), QString());
+        emit object->basicSignal();
+        QCOMPARE(object->string(), QString("pass"));
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("signalAssignment.2.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->string(), QString());
+        emit object->argumentSignal(19, "Hello world!", 10.3);
+        QCOMPARE(object->string(), QString("pass 19 Hello world! 10.3"));
+    }
+}
+
+void tst_qmlecmascript::methods()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.1.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->methodCalled(), false);
+        QCOMPARE(object->methodIntCalled(), false);
+        emit object->basicSignal();
+        QCOMPARE(object->methodCalled(), true);
+        QCOMPARE(object->methodIntCalled(), false);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.2.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+        QCOMPARE(object->methodCalled(), false);
+        QCOMPARE(object->methodIntCalled(), false);
+        emit object->basicSignal();
+        QCOMPARE(object->methodCalled(), false);
+        QCOMPARE(object->methodIntCalled(), true);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.3.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        QCOMPARE(object->property("test").toInt(), 19);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.4.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        QCOMPARE(object->property("test").toInt(), 19);
+        QCOMPARE(object->property("test2").toInt(), 17);
+        QCOMPARE(object->property("test3").toInt(), 16);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.5.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        QCOMPARE(object->property("test").toInt(), 9);
+    }
+}
+
+void tst_qmlecmascript::bindingLoop()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingLoop.qml"));
+    QString warning = "QML MyQmlObject (" + component.url().toString() + ":9:9) Binding loop detected for property \"stringProperty\"";
+    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+}
+
+void tst_qmlecmascript::basicExpressions_data()
+{
+    QTest::addColumn<QString>("expression");
+    QTest::addColumn<QVariant>("result");
+    QTest::addColumn<bool>("nest");
+
+    QTest::newRow("Syntax error (self test)") << "{console.log({'a':1'}.a)}" << QVariant() << false;
+    QTest::newRow("Context property") << "a" << QVariant(1944) << false;
+    QTest::newRow("Context property") << "a" << QVariant(1944) << true;
+    QTest::newRow("Context property expression") << "a * 2" << QVariant(3888) << false;
+    QTest::newRow("Context property expression") << "a * 2" << QVariant(3888) << true;
+    QTest::newRow("Overridden context property") << "b" << QVariant("Milk") << false;
+    QTest::newRow("Overridden context property") << "b" << QVariant("Cow") << true;
+    QTest::newRow("Object property") << "object.stringProperty" << QVariant("Object1") << false;
+    QTest::newRow("Object property") << "object.stringProperty" << QVariant("Object1") << true;
+    QTest::newRow("Overridden object property") << "objectOverride.stringProperty" << QVariant("Object2") << false;
+    QTest::newRow("Overridden object property") << "objectOverride.stringProperty" << QVariant("Object3") << true;
+    QTest::newRow("Default object property") << "horseLegs" << QVariant(4) << false;
+    QTest::newRow("Default object property") << "antLegs" << QVariant(6) << false;
+    QTest::newRow("Default object property") << "emuLegs" << QVariant(2) << false;
+    QTest::newRow("Nested default object property") << "horseLegs" << QVariant(4) << true;
+    QTest::newRow("Nested default object property") << "antLegs" << QVariant(7) << true;
+    QTest::newRow("Nested default object property") << "emuLegs" << QVariant(2) << true;
+    QTest::newRow("Nested default object property") << "humanLegs" << QVariant(2) << true;
+    QTest::newRow("Context property override default object property") << "millipedeLegs" << QVariant(100) << true;
+}
+
+void tst_qmlecmascript::basicExpressions()
+{
+    QFETCH(QString, expression);
+    QFETCH(QVariant, result);
+    QFETCH(bool, nest);
+
+    MyQmlObject object1;
+    MyQmlObject object2;
+    MyQmlObject object3;
+    MyDefaultObject1 default1;
+    MyDefaultObject2 default2;
+    MyDefaultObject3 default3;
+    object1.setStringProperty("Object1");
+    object2.setStringProperty("Object2");
+    object3.setStringProperty("Object3");
+
+    QDeclarativeContext context(engine.rootContext());
+    QDeclarativeContext nestedContext(&context);
+
+    context.addDefaultObject(&default1);
+    context.addDefaultObject(&default2);
+    context.setContextProperty("a", QVariant(1944));
+    context.setContextProperty("b", QVariant("Milk"));
+    context.setContextProperty("object", &object1);
+    context.setContextProperty("objectOverride", &object2);
+    nestedContext.addDefaultObject(&default3);
+    nestedContext.setContextProperty("b", QVariant("Cow"));
+    nestedContext.setContextProperty("objectOverride", &object3);
+    nestedContext.setContextProperty("millipedeLegs", QVariant(100));
+
+    MyExpression expr(nest?&nestedContext:&context, expression);
+    QCOMPARE(expr.value(), result);
+}
+
+void tst_qmlecmascript::arrayExpressions()
+{
+    QObject obj1;
+    QObject obj2;
+    QObject obj3;
+
+    QDeclarativeContext context(engine.rootContext());
+    context.setContextProperty("a", &obj1);
+    context.setContextProperty("b", &obj2);
+    context.setContextProperty("c", &obj3);
+
+    MyExpression expr(&context, "[a, b, c, 10]");
+    QVariant result = expr.value();
+    QCOMPARE(result.userType(), qMetaTypeId<QList<QObject *> >());
+    QList<QObject *> list = qvariant_cast<QList<QObject *> >(result);
+    QCOMPARE(list.count(), 4);
+    QCOMPARE(list.at(0), &obj1);
+    QCOMPARE(list.at(1), &obj2);
+    QCOMPARE(list.at(2), &obj3);
+    QCOMPARE(list.at(3), (QObject *)0);
+}
+
+// Tests that modifying a context property will reevaluate expressions
+void tst_qmlecmascript::contextPropertiesTriggerReeval()
+{
+    QDeclarativeContext context(engine.rootContext());
+    MyQmlObject object1;
+    MyQmlObject object2;
+    MyQmlObject *object3 = new MyQmlObject;
+
+    object1.setStringProperty("Hello");
+    object2.setStringProperty("World");
+
+    context.setContextProperty("testProp", QVariant(1));
+    context.setContextProperty("testObj", &object1);
+    context.setContextProperty("testObj2", object3);
+
+    { 
+        MyExpression expr(&context, "testProp + 1");
+        QCOMPARE(expr.changed, false);
+        QCOMPARE(expr.value(), QVariant(2));
+
+        context.setContextProperty("testProp", QVariant(2));
+        QCOMPARE(expr.changed, true);
+        QCOMPARE(expr.value(), QVariant(3));
+    }
+
+    { 
+        MyExpression expr(&context, "testProp + testProp + testProp");
+        QCOMPARE(expr.changed, false);
+        QCOMPARE(expr.value(), QVariant(6));
+
+        context.setContextProperty("testProp", QVariant(4));
+        QCOMPARE(expr.changed, true);
+        QCOMPARE(expr.value(), QVariant(12));
+    }
+
+    { 
+        MyExpression expr(&context, "testObj.stringProperty");
+        QCOMPARE(expr.changed, false);
+        QCOMPARE(expr.value(), QVariant("Hello"));
+
+        context.setContextProperty("testObj", &object2);
+        QCOMPARE(expr.changed, true);
+        QCOMPARE(expr.value(), QVariant("World"));
+    }
+
+    { 
+        MyExpression expr(&context, "testObj.stringProperty /**/");
+        QCOMPARE(expr.changed, false);
+        QCOMPARE(expr.value(), QVariant("World"));
+
+        context.setContextProperty("testObj", &object1);
+        QCOMPARE(expr.changed, true);
+        QCOMPARE(expr.value(), QVariant("Hello"));
+    }
+
+    { 
+        MyExpression expr(&context, "testObj2");
+        QCOMPARE(expr.changed, false);
+        QCOMPARE(expr.value(), QVariant::fromValue((QObject *)object3));
+    }
+
+}
+
+void tst_qmlecmascript::objectPropertiesTriggerReeval()
+{
+    QDeclarativeContext context(engine.rootContext());
+    MyQmlObject object1;
+    MyQmlObject object2;
+    MyQmlObject object3;
+    context.setContextProperty("testObj", &object1);
+
+    object1.setStringProperty(QLatin1String("Hello"));
+    object2.setStringProperty(QLatin1String("Dog"));
+    object3.setStringProperty(QLatin1String("Cat"));
+
+    { 
+        MyExpression expr(&context, "testObj.stringProperty");
+        QCOMPARE(expr.changed, false);
+        QCOMPARE(expr.value(), QVariant("Hello"));
+
+        object1.setStringProperty(QLatin1String("World"));
+        QCOMPARE(expr.changed, true);
+        QCOMPARE(expr.value(), QVariant("World"));
+    }
+
+    { 
+        MyExpression expr(&context, "testObj.objectProperty.stringProperty");
+        QCOMPARE(expr.changed, false);
+        QCOMPARE(expr.value(), QVariant());
+
+        object1.setObjectProperty(&object2);
+        QCOMPARE(expr.changed, true);
+        expr.changed = false;
+        QCOMPARE(expr.value(), QVariant("Dog"));
+
+        object1.setObjectProperty(&object3);
+        QCOMPARE(expr.changed, true);
+        expr.changed = false;
+        QCOMPARE(expr.value(), QVariant("Cat"));
+
+        object1.setObjectProperty(0);
+        QCOMPARE(expr.changed, true);
+        expr.changed = false;
+        QCOMPARE(expr.value(), QVariant());
+
+        object1.setObjectProperty(&object3);
+        QCOMPARE(expr.changed, true);
+        expr.changed = false;
+        QCOMPARE(expr.value(), QVariant("Cat"));
+
+        object3.setStringProperty("Donkey");
+        QCOMPARE(expr.changed, true);
+        expr.changed = false;
+        QCOMPARE(expr.value(), QVariant("Donkey"));
+    }
+}
+
+void tst_qmlecmascript::deferredProperties()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("deferredProperties.qml"));
+    MyDeferredObject *object = 
+        qobject_cast<MyDeferredObject *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->value(), 0);
+    QVERIFY(object->objectProperty() == 0);
+    QVERIFY(object->objectProperty2() != 0);
+    qmlExecuteDeferred(object);
+    QCOMPARE(object->value(), 10);
+    QVERIFY(object->objectProperty() != 0);
+    MyQmlObject *qmlObject = 
+        qobject_cast<MyQmlObject *>(object->objectProperty());
+    QVERIFY(qmlObject != 0);
+    QCOMPARE(qmlObject->value(), 10);
+    object->setValue(19);
+    QCOMPARE(qmlObject->value(), 19);
+}
+
+void tst_qmlecmascript::extensionObjects()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("extensionObjects.qml"));
+    MyExtendedObject *object = 
+        qobject_cast<MyExtendedObject *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->baseProperty(), 13);
+    QCOMPARE(object->coreProperty(), 9);
+
+    object->setProperty("extendedProperty", QVariant(11));
+    object->setProperty("baseExtendedProperty", QVariant(92));
+    QCOMPARE(object->coreProperty(), 11);
+    QCOMPARE(object->baseProperty(), 92);
+}
+
+void tst_qmlecmascript::attachedProperties()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("attachedProperty.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("a").toInt(), 19);
+    QCOMPARE(object->property("b").toInt(), 19);
+    QCOMPARE(object->property("c").toInt(), 19);
+    QCOMPARE(object->property("d").toInt(), 19);
+
+    // ### Need to test attached property assignment
+}
+
+void tst_qmlecmascript::enums()
+{
+    // Existant enums
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.1.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("a").toInt(), 0);
+    QCOMPARE(object->property("b").toInt(), 1);
+    QCOMPARE(object->property("c").toInt(), 2);
+    QCOMPARE(object->property("d").toInt(), 3);
+    QCOMPARE(object->property("e").toInt(), 0);
+    QCOMPARE(object->property("f").toInt(), 1);
+    QCOMPARE(object->property("g").toInt(), 2);
+    QCOMPARE(object->property("h").toInt(), 3);
+    QCOMPARE(object->property("i").toInt(), 19);
+    QCOMPARE(object->property("j").toInt(), 19);
+    }
+    // Non-existent enums
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.2.qml"));
+
+    QString warning1 = component.url().toString() + ":5: Unable to assign [undefined] to int";
+    QString warning2 = component.url().toString() + ":6: Unable to assign [undefined] to int";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("a").toInt(), 0);
+    QCOMPARE(object->property("b").toInt(), 0);
+    }
+}
+
+void tst_qmlecmascript::valueTypeFunctions()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("valueTypeFunctions.qml"));
+    MyTypeObject *obj = qobject_cast<MyTypeObject*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->rectProperty(), QRect(0,0,100,100));
+    QCOMPARE(obj->rectFProperty(), QRectF(0,0.5,100,99.5));
+}
+
+/* 
+Tests that writing a constant to a property with a binding on it disables the
+binding.
+*/
+void tst_qmlecmascript::constantsOverrideBindings()
+{
+    // From ECMAScript
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.1.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c2").toInt(), 0);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c2").toInt(), 9);
+
+        emit object->basicSignal();
+
+        QCOMPARE(object->property("c2").toInt(), 13);
+        object->setProperty("c1", QVariant(8));
+        QCOMPARE(object->property("c2").toInt(), 13);
+    }
+
+    // During construction
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.2.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c1").toInt(), 0);
+        QCOMPARE(object->property("c2").toInt(), 10);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c1").toInt(), 9);
+        QCOMPARE(object->property("c2").toInt(), 10);
+    }
+
+#if 0
+    // From C++
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.3.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("c2").toInt(), 0);
+        object->setProperty("c1", QVariant(9));
+        QCOMPARE(object->property("c2").toInt(), 9);
+
+        object->setProperty("c2", QVariant(13));
+        QCOMPARE(object->property("c2").toInt(), 13);
+        object->setProperty("c1", QVariant(7));
+        QCOMPARE(object->property("c1").toInt(), 7);
+        QCOMPARE(object->property("c2").toInt(), 13);
+    }
+#endif
+}
+
+/*
+Tests that assigning a binding to a property that already has a binding causes
+the original binding to be disabled.
+*/
+void tst_qmlecmascript::outerBindingOverridesInnerBinding()
+{
+    QDeclarativeComponent component(&engine, 
+                           TEST_FILE("outerBindingOverridesInnerBinding.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("c1").toInt(), 0);
+    QCOMPARE(object->property("c2").toInt(), 0);
+    QCOMPARE(object->property("c3").toInt(), 0);
+
+    object->setProperty("c1", QVariant(9));
+    QCOMPARE(object->property("c1").toInt(), 9);
+    QCOMPARE(object->property("c2").toInt(), 0);
+    QCOMPARE(object->property("c3").toInt(), 0);
+
+    object->setProperty("c3", QVariant(8));
+    QCOMPARE(object->property("c1").toInt(), 9);
+    QCOMPARE(object->property("c2").toInt(), 8);
+    QCOMPARE(object->property("c3").toInt(), 8);
+}
+
+/*
+Access a non-existent attached object.  
+
+Tests for a regression where this used to crash.
+*/
+void tst_qmlecmascript::nonExistantAttachedObject()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("nonExistantAttachedObject.qml"));
+
+    QString warning = component.url().toString() + ":4: Unable to assign [undefined] to QString";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+}
+
+void tst_qmlecmascript::scope()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("scope.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("test1").toInt(), 1);
+        QCOMPARE(object->property("test2").toInt(), 2);
+        QCOMPARE(object->property("test3").toString(), QString("1Test"));
+        QCOMPARE(object->property("test4").toString(), QString("2Test"));
+        QCOMPARE(object->property("test5").toInt(), 1);
+        QCOMPARE(object->property("test6").toInt(), 1);
+        QCOMPARE(object->property("test7").toInt(), 2);
+        QCOMPARE(object->property("test8").toInt(), 2);
+        QCOMPARE(object->property("test9").toInt(), 1);
+        QCOMPARE(object->property("test10").toInt(), 3);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("scope.2.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("test1").toInt(), 19);
+        QCOMPARE(object->property("test2").toInt(), 19);
+        QCOMPARE(object->property("test3").toInt(), 11);
+        QCOMPARE(object->property("test4").toInt(), 11);
+        QCOMPARE(object->property("test5").toInt(), 24);
+        QCOMPARE(object->property("test6").toInt(), 24);
+    }
+}
+
+/*
+Tests that "any" type passes through a synthesized signal parameter.  This
+is essentially a test of QDeclarativeMetaType::copy()
+*/
+void tst_qmlecmascript::signalParameterTypes()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("signalParameterTypes.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+
+    emit object->basicSignal();
+
+    QCOMPARE(object->property("intProperty").toInt(), 10);
+    QCOMPARE(object->property("realProperty").toReal(), 19.2);
+    QVERIFY(object->property("colorProperty").value<QColor>() == QColor(255, 255, 0, 255));
+    QVERIFY(object->property("variantProperty") == QVariant::fromValue(QColor(255, 0, 255, 255)));
+}
+
+/*
+Test that two JS objects for the same QObject compare as equal.
+*/
+void tst_qmlecmascript::objectsCompareAsEqual()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("objectsCompareAsEqual.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test1").toBool(), true);
+    QCOMPARE(object->property("test2").toBool(), true);
+    QCOMPARE(object->property("test3").toBool(), true);
+    QCOMPARE(object->property("test4").toBool(), true);
+    QCOMPARE(object->property("test5").toBool(), true);
+}
+
+/*
+Confirm bindings and alias properties can coexist.
+
+Tests for a regression where the binding would not reevaluate.
+*/
+void tst_qmlecmascript::aliasPropertyAndBinding()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("aliasPropertyAndBinding.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("c2").toInt(), 3);
+    QCOMPARE(object->property("c3").toInt(), 3);
+
+    object->setProperty("c2", QVariant(19));
+
+    QCOMPARE(object->property("c2").toInt(), 19);
+    QCOMPARE(object->property("c3").toInt(), 19);
+}
+
+/*
+Tests that only methods of Script {} blocks are exposed.
+*/
+void tst_qmlecmascript::scriptAccess()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptAccess.qml"));
+
+    QString warning = component.url().toString() + ":16: Unable to assign [undefined] to int";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test1").toInt(), 10);
+    QCOMPARE(object->property("test2").toInt(), 19);
+    QCOMPARE(object->property("test3").toInt(), 0);
+}
+
+void tst_qmlecmascript::dynamicCreation_data()
+{
+    QTest::addColumn<QString>("method");
+    QTest::addColumn<QString>("createdName");
+
+    QTest::newRow("One") << "createOne" << "objectOne";
+    QTest::newRow("Two") << "createTwo" << "objectTwo";
+    QTest::newRow("Three") << "createThree" << "objectThree";
+}
+
+/*
+Test using createQmlObject to dynamically generate an item
+Also using createComponent is tested.
+*/
+void tst_qmlecmascript::dynamicCreation()
+{
+    QFETCH(QString, method);
+    QFETCH(QString, createdName);
+
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicCreation.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+
+    QMetaObject::invokeMethod(object, method.toUtf8());
+    QObject *created = object->objectProperty();
+    QVERIFY(created);
+    QCOMPARE(created->objectName(), createdName);
+}
+
+/*
+   Tests the destroy function
+*/
+void tst_qmlecmascript::dynamicDestruction()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicDeletion.qml"));
+    QDeclarativeGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+    QDeclarativeGuard<QObject> createdQmlObject = 0;
+
+    QMetaObject::invokeMethod(object, "create");
+    createdQmlObject = object->objectProperty();
+    QVERIFY(createdQmlObject);
+    QCOMPARE(createdQmlObject->objectName(), QString("emptyObject"));
+
+    QMetaObject::invokeMethod(object, "killOther");
+    QVERIFY(createdQmlObject);
+    QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion);
+    QVERIFY(createdQmlObject);
+    for (int ii = 0; createdQmlObject && ii < 50; ++ii) { // After 5 seconds we should give up
+        if (createdQmlObject) {
+            QTest::qWait(100);
+            QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion);
+        }
+    }
+    QVERIFY(!createdQmlObject);
+
+    QMetaObject::invokeMethod(object, "killMe");
+    QVERIFY(object);
+    QTest::qWait(0);
+    QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion);
+    QVERIFY(!object);
+}
+
+/*
+   tests that id.toString() works
+*/
+void tst_qmlecmascript::objectToString()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("qmlToString.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+    QMetaObject::invokeMethod(object, "testToString");
+    QVERIFY(object->stringProperty().startsWith("MyQmlObject_QML_"));
+    QVERIFY(object->stringProperty().endsWith(", \"objName\")"));
+}
+
+/*
+Tests bindings that indirectly cause their own deletion work.
+
+This test is best run under valgrind to ensure no invalid memory access occur.
+*/
+void tst_qmlecmascript::selfDeletingBinding()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("selfDeletingBinding.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        object->setProperty("triggerDelete", true);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("selfDeletingBinding.2.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        object->setProperty("triggerDelete", true);
+    }
+}
+
+/*
+Test that extended object properties can be accessed.
+
+This test a regression where this used to crash.  The issue was specificially
+for extended objects that did not include a synthesized meta object (so non-root
+and no synthesiszed properties).
+*/
+void tst_qmlecmascript::extendedObjectPropertyLookup()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("extendedObjectPropertyLookup.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+}
+
+/*
+Test file/lineNumbers for binding/Script errors.
+*/
+void tst_qmlecmascript::scriptErrors()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptErrors.qml"));
+    QString url = component.url().toString();
+
+    QString warning1 = url.left(url.length() - 3) + "js:2: Error: Invalid write to global property \"a\"";
+    QString warning2 = url + ":7: TypeError: Result of expression 'a' [undefined] is not an object.";
+    QString warning3 = url + ":5: Error: Invalid write to global property \"a\"";
+    QString warning4 = url + ":12: TypeError: Result of expression 'a' [undefined] is not an object.";
+    QString warning5 = url + ":10: TypeError: Result of expression 'a' [undefined] is not an object.";
+    QString warning6 = url + ":9: Unable to assign [undefined] to int";
+    QString warning7 = url + ":14: Error: Cannot assign to read-only property \"trueProperty\"";
+    QString warning8 = url + ":15: Error: Cannot assign to non-existent property \"fakeProperty\"";
+
+    QTest::ignoreMessage(QtWarningMsg, warning1.toLatin1().constData());
+    QTest::ignoreMessage(QtWarningMsg, warning2.toLatin1().constData());
+    QTest::ignoreMessage(QtWarningMsg, warning3.toLatin1().constData());
+    QTest::ignoreMessage(QtWarningMsg, warning5.toLatin1().constData());
+    QTest::ignoreMessage(QtWarningMsg, warning6.toLatin1().constData());
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QTest::ignoreMessage(QtWarningMsg, warning4.toLatin1().constData());
+    emit object->basicSignal();
+
+    QTest::ignoreMessage(QtWarningMsg, warning7.toLatin1().constData());
+    emit object->anotherBasicSignal();
+
+    QTest::ignoreMessage(QtWarningMsg, warning8.toLatin1().constData());
+    emit object->thirdBasicSignal();
+}
+
+/*
+Test bindings still work when the reeval is triggered from within
+a signal script.
+*/
+void tst_qmlecmascript::signalTriggeredBindings()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("signalTriggeredBindings.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("base").toReal(), 50.);
+    QCOMPARE(object->property("test1").toReal(), 50.);
+    QCOMPARE(object->property("test2").toReal(), 50.);
+
+    object->basicSignal();
+
+    QCOMPARE(object->property("base").toReal(), 200.);
+    QCOMPARE(object->property("test1").toReal(), 200.);
+    QCOMPARE(object->property("test2").toReal(), 200.);
+
+    object->argumentSignal(10, QString(), 10);
+
+    QCOMPARE(object->property("base").toReal(), 400.);
+    QCOMPARE(object->property("test1").toReal(), 400.);
+    QCOMPARE(object->property("test2").toReal(), 400.);
+}
+
+/*
+Test that list properties can be iterated from ECMAScript
+*/
+void tst_qmlecmascript::listProperties()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("listProperties.qml"));
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test1").toInt(), 21);
+    QCOMPARE(object->property("test2").toInt(), 2);
+    QCOMPARE(object->property("test3").toBool(), true);
+    QCOMPARE(object->property("test4").toBool(), true);
+}
+
+void tst_qmlecmascript::exceptionClearsOnReeval()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml"));
+    QString url = component.url().toString();
+
+    QString warning = url + ":4: TypeError: Result of expression 'objectProperty.objectProperty' [undefined] is not an object.";
+
+    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toBool(), false);
+
+    MyQmlObject object2;
+    MyQmlObject object3;
+    object2.setObjectProperty(&object3);
+    object->setObjectProperty(&object2);
+
+    QCOMPARE(object->property("test").toBool(), true);
+}
+
+void tst_qmlecmascript::exceptionSlotProducesWarning()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning.qml"));
+    QString url = component.url().toString();
+
+    QString warning = component.url().toString() + ":6: Error: JS exception";
+
+    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+}
+
+void tst_qmlecmascript::exceptionBindingProducesWarning()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning2.qml"));
+    QString url = component.url().toString();
+
+    QString warning = component.url().toString() + ":5: Error: JS exception";
+
+    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+}
+
+static int transientErrorsMsgCount = 0;
+static void transientErrorsMsgHandler(QtMsgType, const char *)
+{
+    ++transientErrorsMsgCount;
+}
+
+// Check that transient binding errors are not displayed
+void tst_qmlecmascript::transientErrors()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("transientErrors.qml"));
+
+    transientErrorsMsgCount = 0;
+    QtMsgHandler old = qInstallMsgHandler(transientErrorsMsgHandler);
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    qInstallMsgHandler(old);
+
+    QCOMPARE(transientErrorsMsgCount, 0);
+}
+
+// Check that errors during shutdown are minimized
+void tst_qmlecmascript::shutdownErrors()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("shutdownErrors.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    transientErrorsMsgCount = 0;
+    QtMsgHandler old = qInstallMsgHandler(transientErrorsMsgHandler);
+
+    delete object;
+
+    qInstallMsgHandler(old);
+    QCOMPARE(transientErrorsMsgCount, 0);
+}
+
+// Check that Script::source property works as expected
+void tst_qmlecmascript::externalScript()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("externalScript.1.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("test").toInt(), 92);
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("externalScript.2.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("test").toInt(), 92);
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("externalScript.3.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("test").toInt(), 92);
+        QCOMPARE(object->property("test2").toInt(), 92);
+        QCOMPARE(object->property("test3").toBool(), false);
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("externalScript.4.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("test").toInt(), 92);
+        QCOMPARE(object->property("test2").toBool(), true);
+
+        delete object;
+    }
+}
+
+void tst_qmlecmascript::compositePropertyType()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("compositePropertyType.qml"));
+    QTest::ignoreMessage(QtDebugMsg, "hello world");
+    QObject *object = qobject_cast<QObject *>(component.create());
+    delete object;
+}
+
+// QTBUG-5759
+void tst_qmlecmascript::jsObject()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("jsObject.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toInt(), 92);
+
+    delete object;
+}
+
+void tst_qmlecmascript::undefinedResetsProperty()
+{
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("undefinedResetsProperty.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("resettableProperty").toInt(), 92);
+
+    object->setProperty("setUndefined", true);
+
+    QCOMPARE(object->property("resettableProperty").toInt(), 13);
+
+    object->setProperty("setUndefined", false);
+
+    QCOMPARE(object->property("resettableProperty").toInt(), 92);
+
+    delete object;
+    }
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("undefinedResetsProperty.2.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("resettableProperty").toInt(), 19);
+
+    QMetaObject::invokeMethod(object, "doReset");
+
+    QCOMPARE(object->property("resettableProperty").toInt(), 13);
+
+    delete object;
+    }
+}
+
+// QTBUG-6781
+void tst_qmlecmascript::bug1()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("bug.1.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toInt(), 14);
+
+    object->setProperty("a", 11);
+
+    QCOMPARE(object->property("test").toInt(), 3);
+
+    object->setProperty("b", true);
+
+    QCOMPARE(object->property("test").toInt(), 9);
+
+    delete object;
+}
+
+void tst_qmlecmascript::callQtInvokables()
+{
+    MyInvokableObject o;
+
+    QDeclarativeEngine qmlengine;
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(&qmlengine);
+    QScriptEngine *engine = &ep->scriptEngine;
+    ep->globalClass->explicitSetProperty("object", ep->objectClass->newQObject(&o));
+
+    // Non-existent methods
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_nonexistent()").isError(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), -1);
+    QCOMPARE(o.actuals().count(), 0);
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_nonexistent(10, 11)").isError(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), -1);
+    QCOMPARE(o.actuals().count(), 0);
+
+    // Insufficient arguments
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_int()").isError(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), -1);
+    QCOMPARE(o.actuals().count(), 0);
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_intint(10)").isError(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), -1);
+    QCOMPARE(o.actuals().count(), 0);
+
+    // Excessive arguments
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_int(10, 11)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 8);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(10));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_intint(10, 11, 12)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 9);
+    QCOMPARE(o.actuals().count(), 2);
+    QCOMPARE(o.actuals().at(0), QVariant(10));
+    QCOMPARE(o.actuals().at(1), QVariant(11));
+
+    // Test return types
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_NoArgs()").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 0);
+    QCOMPARE(o.actuals().count(), 0);
+
+    o.reset();
+    QVERIFY(engine->evaluate("object.method_NoArgs_int()").strictlyEquals(QScriptValue(engine, 6)));
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 1);
+    QCOMPARE(o.actuals().count(), 0);
+
+    o.reset();
+    QVERIFY(engine->evaluate("object.method_NoArgs_real()").strictlyEquals(QScriptValue(engine, 19.7)));
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 2);
+    QCOMPARE(o.actuals().count(), 0);
+
+    o.reset();
+    {
+    QScriptValue ret = engine->evaluate("object.method_NoArgs_QPointF()");
+    QVERIFY(ret.isVariant());
+    QCOMPARE(ret.toVariant(), QVariant(QPointF(123, 4.5)));
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 3);
+    QCOMPARE(o.actuals().count(), 0);
+    }
+
+    o.reset();
+    {
+    QScriptValue ret = engine->evaluate("object.method_NoArgs_QObject()");
+    QVERIFY(ret.isQObject());
+    QCOMPARE(ret.toQObject(), (QObject *)&o);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 4);
+    QCOMPARE(o.actuals().count(), 0);
+    }
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_NoArgs_unknown()").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 5);
+    QCOMPARE(o.actuals().count(), 0);
+
+    o.reset();
+    {
+    QScriptValue ret = engine->evaluate("object.method_NoArgs_QScriptValue()");
+    QVERIFY(ret.isString());
+    QCOMPARE(ret.toString(), QString("Hello world"));
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 6);
+    QCOMPARE(o.actuals().count(), 0);
+    }
+
+    o.reset();
+    QVERIFY(engine->evaluate("object.method_NoArgs_QVariant()").strictlyEquals(QScriptValue(engine, "QML rocks")));
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 7);
+    QCOMPARE(o.actuals().count(), 0);
+
+    // Test arg types
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_int(94)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 8);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(94));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_int(\"94\")").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 8);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(94));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_int(\"not a number\")").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 8);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(0));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_int(null)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 8);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(0));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_int(undefined)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 8);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(0));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_int(object)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 8);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(0));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_intint(122, 9)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 9);
+    QCOMPARE(o.actuals().count(), 2);
+    QCOMPARE(o.actuals().at(0), QVariant(122));
+    QCOMPARE(o.actuals().at(1), QVariant(9));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_real(94.3)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 10);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(94.3));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_real(\"94.3\")").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 10);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(94.3));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_real(\"not a number\")").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 10);
+    QCOMPARE(o.actuals().count(), 1);
+    QVERIFY(qIsNaN(o.actuals().at(0).toDouble()));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_real(null)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 10);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(0));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_real(undefined)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 10);
+    QCOMPARE(o.actuals().count(), 1);
+    QVERIFY(qIsNaN(o.actuals().at(0).toDouble()));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_real(object)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 10);
+    QCOMPARE(o.actuals().count(), 1);
+    QVERIFY(qIsNaN(o.actuals().at(0).toDouble()));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QString(\"Hello world\")").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 11);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant("Hello world"));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QString(19)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 11);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant("19"));
+
+    o.reset();
+    {
+    QString expected = "MyInvokableObject(0x" + QString::number((intptr_t)&o, 16) + ")";
+    QCOMPARE(engine->evaluate("object.method_QString(object)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 11);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(expected));
+    }
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QString(null)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 11);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(QString()));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QString(undefined)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 11);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(QString()));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QPointF(0)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 12);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(QPointF()));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QPointF(null)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 12);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(QPointF()));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QPointF(undefined)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 12);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(QPointF()));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QPointF(object)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 12);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(QPointF()));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QPointF(object.method_get_QPointF())").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 12);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(QPointF(99.3, -10.2)));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QPointF(object.method_get_QPoint())").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 12);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), QVariant(QPointF(9, 12)));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QObject(0)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 13);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)0));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QObject(\"Hello world\")").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 13);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)0));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QObject(null)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 13);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)0));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QObject(undefined)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 13);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)0));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QObject(object)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 13);
+    QCOMPARE(o.actuals().count(), 1);
+    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)&o));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QScriptValue(null)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 14);
+    QCOMPARE(o.actuals().count(), 1);
+    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(0)).isNull());
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QScriptValue(undefined)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 14);
+    QCOMPARE(o.actuals().count(), 1);
+    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(0)).isUndefined());
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QScriptValue(19)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 14);
+    QCOMPARE(o.actuals().count(), 1);
+    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(0)).strictlyEquals(QScriptValue(engine, 19)));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_QScriptValue([19, 20])").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 14);
+    QCOMPARE(o.actuals().count(), 1);
+    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(0)).isArray());
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_intQScriptValue(4, null)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 15);
+    QCOMPARE(o.actuals().count(), 2);
+    QCOMPARE(o.actuals().at(0), QVariant(4));
+    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(1)).isNull());
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_intQScriptValue(8, undefined)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 15);
+    QCOMPARE(o.actuals().count(), 2);
+    QCOMPARE(o.actuals().at(0), QVariant(8));
+    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(1)).isUndefined());
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_intQScriptValue(3, 19)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 15);
+    QCOMPARE(o.actuals().count(), 2);
+    QCOMPARE(o.actuals().at(0), QVariant(3));
+    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(1)).strictlyEquals(QScriptValue(engine, 19)));
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_intQScriptValue(44, [19, 20])").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 15);
+    QCOMPARE(o.actuals().count(), 2);
+    QCOMPARE(o.actuals().at(0), QVariant(44));
+    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(1)).isArray());
+
+    // Test overloads - QML will always invoke the *last* method
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_overload()").isError(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), -1);
+    QCOMPARE(o.actuals().count(), 0);
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_overload(10)").isError(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), -1);
+    QCOMPARE(o.actuals().count(), 0);
+
+    o.reset();
+    QCOMPARE(engine->evaluate("object.method_overload(10, 11)").isUndefined(), true);
+    QCOMPARE(o.error(), false);
+    QCOMPARE(o.invoked(), 17);
+    QCOMPARE(o.actuals().count(), 2);
+    QCOMPARE(o.actuals().at(0), QVariant(10));
+    QCOMPARE(o.actuals().at(1), QVariant(11));
+}
+
+// QTBUG-5675
+void tst_qmlecmascript::listToVariant()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("listToVariant.qml"));
+
+    MyQmlContainer container;
+
+    QDeclarativeContext context(engine.rootContext());
+    context.addDefaultObject(&container);
+
+    QObject *object = component.create(&context);
+    QVERIFY(object != 0);
+
+    QVariant v = object->property("test");
+    QCOMPARE(v.userType(), qMetaTypeId<QDeclarativeListReference>());
+    QVERIFY(qvariant_cast<QDeclarativeListReference>(v).object() == &container);
+
+    delete object;
+}
+
+// QTBUG-7957
+void tst_qmlecmascript::multiEngineObject()
+{
+    MyQmlObject obj;
+    obj.setStringProperty("Howdy planet");
+
+    QDeclarativeEngine e1;
+    e1.rootContext()->setContextProperty("thing", &obj);
+    QDeclarativeComponent c1(&e1, TEST_FILE("multiEngineObject.qml"));
+
+    QDeclarativeEngine e2;
+    e2.rootContext()->setContextProperty("thing", &obj);
+    QDeclarativeComponent c2(&e2, TEST_FILE("multiEngineObject.qml"));
+
+    QObject *o1 = c1.create();
+    QObject *o2 = c2.create();
+
+    QCOMPARE(o1->property("test").toString(), QString("Howdy planet"));
+    QCOMPARE(o2->property("test").toString(), QString("Howdy planet"));
+
+    delete o2;
+    delete o1;
+}
+
+// Test that references to QObjects are cleanup when the object is destroyed
+void tst_qmlecmascript::deletedObject()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml"));
+
+    QObject *object = component.create();
+
+    QCOMPARE(object->property("test1").toBool(), true);
+    QCOMPARE(object->property("test2").toBool(), true);
+    QCOMPARE(object->property("test3").toBool(), true);
+    QEXPECT_FAIL("", "QTBUG-8077", Continue);
+    QCOMPARE(object->property("test4").toBool(), true);
+
+    delete object;
+}
+
+QTEST_MAIN(tst_qmlecmascript)
+
+#include "tst_qdeclarativeecmascript.moc"
diff --git a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
new file mode 100644
index 0000000..5b6530d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative network
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeengine.cpp 
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
new file mode 100644
index 0000000..ca48bd2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
@@ -0,0 +1,240 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
+#include <QNetworkAccessManager>
+#include <QPointer>
+#include <QDir>
+#include <QDesktopServices>
+#include <QDebug>
+#include <QDeclarativeComponent>
+#include <QDeclarativeNetworkAccessManagerFactory>
+
+class tst_qmlengine : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlengine() {}
+
+private slots:
+    void rootContext();
+    void networkAccessManager();
+    void baseUrl();
+    void contextForObject();
+    void offlineStoragePath();
+    void clearComponentCache();
+};
+
+void tst_qmlengine::rootContext()
+{
+    QDeclarativeEngine engine;
+
+    QVERIFY(engine.rootContext());
+
+    QCOMPARE(engine.rootContext()->engine(), &engine);
+    QVERIFY(engine.rootContext()->parentContext() == 0);
+}
+
+class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
+{
+public:
+    NetworkAccessManagerFactory() : manager(0) {}
+
+    QNetworkAccessManager *create(QObject *parent) {
+        manager = new QNetworkAccessManager(parent);
+        return manager;
+    }
+
+    QNetworkAccessManager *manager;
+};
+
+void tst_qmlengine::networkAccessManager()
+{
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
+
+    // Test QDeclarativeEngine created manager
+    QPointer<QNetworkAccessManager> manager = engine->networkAccessManager();
+    QVERIFY(manager != 0);
+    delete engine;
+
+    // Test factory created manager
+    engine = new QDeclarativeEngine;
+    NetworkAccessManagerFactory factory;
+    engine->setNetworkAccessManagerFactory(&factory);
+    QVERIFY(engine->networkAccessManager() == factory.manager);
+    delete engine;
+}
+
+void tst_qmlengine::baseUrl()
+{
+    QDeclarativeEngine engine;
+
+    QUrl cwd = QUrl::fromLocalFile(QDir::currentPath() + QDir::separator());
+
+    QCOMPARE(engine.baseUrl(), cwd);
+    QCOMPARE(engine.rootContext()->resolvedUrl(QUrl("main.qml")), cwd.resolved(QUrl("main.qml")));
+
+    QDir dir = QDir::current();
+    dir.cdUp();
+    QVERIFY(dir != QDir::current());
+    QDir::setCurrent(dir.path());
+    QVERIFY(QDir::current() == dir);
+
+    QUrl cwd2 = QUrl::fromLocalFile(QDir::currentPath() + QDir::separator());
+    QCOMPARE(engine.baseUrl(), cwd2);
+    QCOMPARE(engine.rootContext()->resolvedUrl(QUrl("main.qml")), cwd2.resolved(QUrl("main.qml")));
+
+    engine.setBaseUrl(cwd);
+    QCOMPARE(engine.baseUrl(), cwd);
+    QCOMPARE(engine.rootContext()->resolvedUrl(QUrl("main.qml")), cwd.resolved(QUrl("main.qml")));
+}
+
+void tst_qmlengine::contextForObject()
+{
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
+
+    // Test null-object
+    QVERIFY(QDeclarativeEngine::contextForObject(0) == 0);
+
+    // Test an object with no context
+    QObject object;
+    QVERIFY(QDeclarativeEngine::contextForObject(&object) == 0);
+
+    // Test setting null-object
+    QDeclarativeEngine::setContextForObject(0, engine->rootContext());
+
+    // Test setting null-context
+    QDeclarativeEngine::setContextForObject(&object, 0);
+
+    // Test setting context
+    QDeclarativeEngine::setContextForObject(&object, engine->rootContext());
+    QVERIFY(QDeclarativeEngine::contextForObject(&object) == engine->rootContext());
+
+    QDeclarativeContext context(engine->rootContext());
+
+    // Try changing context
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngine::setContextForObject(): Object already has a QDeclarativeContext");
+    QDeclarativeEngine::setContextForObject(&object, &context);
+    QVERIFY(QDeclarativeEngine::contextForObject(&object) == engine->rootContext());
+
+    // Delete context
+    delete engine; engine = 0;
+    QVERIFY(QDeclarativeEngine::contextForObject(&object) == 0);
+}
+
+void tst_qmlengine::offlineStoragePath()
+{
+    // Without these set, QDesktopServices::storageLocation returns
+    // strings with extra "//" at the end. We set them to ignore this problem.
+    qApp->setApplicationName("tst_qmlengine");
+    qApp->setOrganizationName("Nokia");
+    qApp->setOrganizationDomain("nokia.com");
+
+    QDeclarativeEngine engine;
+
+    QDir dir(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
+    dir.mkpath("QML");
+    dir.cd("QML");
+    dir.mkpath("OfflineStorage");
+    dir.cd("OfflineStorage");
+
+    QCOMPARE(QDir::fromNativeSeparators(engine.offlineStoragePath()), dir.path());
+
+    engine.setOfflineStoragePath(QDir::homePath());
+    QCOMPARE(engine.offlineStoragePath(), QDir::homePath());
+}
+
+void tst_qmlengine::clearComponentCache()
+{
+    QDeclarativeEngine engine;
+
+    // Create original qml file
+    {
+        QFile file("temp.qml");
+        QVERIFY(file.open(QIODevice::WriteOnly));
+        file.write("import Qt 4.6\nQtObject {\nproperty int test: 10\n}\n");
+        file.close();
+    }
+
+    // Test "test" property
+    {
+        QDeclarativeComponent component(&engine, "temp.qml");
+        QObject *obj = component.create();
+        QVERIFY(obj != 0);
+        QCOMPARE(obj->property("test").toInt(), 10);
+        delete obj;
+    }
+
+    // Modify qml file
+    {
+        QFile file("temp.qml");
+        QVERIFY(file.open(QIODevice::WriteOnly));
+        file.write("import Qt 4.6\nQtObject {\nproperty int test: 11\n}\n");
+        file.close();
+    }
+
+    // Test cache hit
+    {
+        QDeclarativeComponent component(&engine, "temp.qml");
+        QObject *obj = component.create();
+        QVERIFY(obj != 0);
+        QCOMPARE(obj->property("test").toInt(), 10);
+        delete obj;
+    }
+
+    // Clear cache
+    engine.clearComponentCache();
+
+    // Test cache refresh
+    {
+        QDeclarativeComponent component(&engine, "temp.qml");
+        QObject *obj = component.create();
+        QVERIFY(obj != 0);
+        QCOMPARE(obj->property("test").toInt(), 11);
+        delete obj;
+    }
+}
+
+QTEST_MAIN(tst_qmlengine)
+
+#include "tst_qdeclarativeengine.moc"
diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
new file mode 100644
index 0000000..6591406
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativeerror.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeerror/test.txt b/tests/auto/declarative/qdeclarativeerror/test.txt
new file mode 100644
index 0000000..cdafd9e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeerror/test.txt
@@ -0,0 +1,3 @@
+Line Content
+Line2 Content
+Line3 Content
diff --git a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
new file mode 100644
index 0000000..2df11d3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
@@ -0,0 +1,242 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDeclarativeError>
+#include <QDebug>
+
+class tst_qmlerror : public QObject
+{
+    Q_OBJECT
+private slots:
+    void url();
+    void description();
+    void line();
+    void column();
+    void toString();
+
+    void copy();
+    void debug();
+};
+
+void tst_qmlerror::url()
+{
+    QDeclarativeError error;
+
+    QCOMPARE(error.url(), QUrl());
+
+    error.setUrl(QUrl("http://www.nokia.com/main.qml"));
+
+    QCOMPARE(error.url(), QUrl("http://www.nokia.com/main.qml"));
+
+    QDeclarativeError error2 = error;
+
+    QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
+
+    error.setUrl(QUrl("http://qt.nokia.com/main.qml"));
+
+    QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml"));
+    QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
+}
+
+void tst_qmlerror::description()
+{
+    QDeclarativeError error;
+
+    QCOMPARE(error.description(), QString());
+
+    error.setDescription("An Error");
+
+    QCOMPARE(error.description(), QString("An Error"));
+
+    QDeclarativeError error2 = error;
+
+    QCOMPARE(error2.description(), QString("An Error"));
+
+    error.setDescription("Another Error");
+
+    QCOMPARE(error.description(), QString("Another Error"));
+    QCOMPARE(error2.description(), QString("An Error"));
+}
+
+void tst_qmlerror::line()
+{
+    QDeclarativeError error;
+
+    QCOMPARE(error.line(), -1);
+
+    error.setLine(102);
+
+    QCOMPARE(error.line(), 102);
+
+    QDeclarativeError error2 = error;
+
+    QCOMPARE(error2.line(), 102);
+
+    error.setLine(4);
+
+    QCOMPARE(error.line(), 4);
+    QCOMPARE(error2.line(), 102);
+}
+
+void tst_qmlerror::column()
+{
+    QDeclarativeError error;
+
+    QCOMPARE(error.column(), -1);
+
+    error.setColumn(16);
+
+    QCOMPARE(error.column(), 16);
+
+    QDeclarativeError error2 = error;
+
+    QCOMPARE(error2.column(), 16);
+
+    error.setColumn(3);
+
+    QCOMPARE(error.column(), 3);
+    QCOMPARE(error2.column(), 16);
+}
+
+void tst_qmlerror::toString()
+{
+    {
+        QDeclarativeError error;
+        error.setUrl(QUrl("http://www.nokia.com/main.qml"));
+        error.setDescription("An Error");
+        error.setLine(92);
+        error.setColumn(13);
+
+        QCOMPARE(error.toString(), QString("http://www.nokia.com/main.qml:92:13: An Error"));
+    }
+
+    {
+        QDeclarativeError error;
+        error.setUrl(QUrl("http://www.nokia.com/main.qml"));
+        error.setDescription("An Error");
+        error.setLine(92);
+
+        QCOMPARE(error.toString(), QString("http://www.nokia.com/main.qml:92: An Error"));
+    }
+}
+
+void tst_qmlerror::copy()
+{
+    QDeclarativeError error;
+    error.setUrl(QUrl("http://www.nokia.com/main.qml"));
+    error.setDescription("An Error");
+    error.setLine(92);
+    error.setColumn(13);
+
+    QDeclarativeError error2(error);
+    QDeclarativeError error3;
+    error3 = error;
+
+    error.setUrl(QUrl("http://qt.nokia.com/main.qml"));
+    error.setDescription("Another Error");
+    error.setLine(2);
+    error.setColumn(33);
+
+    QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml"));
+    QCOMPARE(error.description(), QString("Another Error"));
+    QCOMPARE(error.line(), 2);
+    QCOMPARE(error.column(), 33);
+
+    QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
+    QCOMPARE(error2.description(), QString("An Error"));
+    QCOMPARE(error2.line(), 92);
+    QCOMPARE(error2.column(), 13);
+
+    QCOMPARE(error3.url(), QUrl("http://www.nokia.com/main.qml"));
+    QCOMPARE(error3.description(), QString("An Error"));
+    QCOMPARE(error3.line(), 92);
+    QCOMPARE(error3.column(), 13);
+
+}
+
+void tst_qmlerror::debug()
+{
+    {
+        QDeclarativeError error;
+        error.setUrl(QUrl("http://www.nokia.com/main.qml"));
+        error.setDescription("An Error");
+        error.setLine(92);
+        error.setColumn(13);
+
+        QTest::ignoreMessage(QtWarningMsg, "http://www.nokia.com/main.qml:92:13: An Error ");
+        qWarning() << error;
+    }
+
+    {
+        QUrl url(QUrl::fromLocalFile(QString(SRCDIR) + "/").resolved(QUrl("test.txt")));
+        QDeclarativeError error;
+        error.setUrl(url);
+        error.setDescription("An Error");
+        error.setLine(2);
+        error.setColumn(5);
+
+        QString out = url.toString() + ":2:5: An Error \n     Line2 Content \n         ^ ";
+        QTest::ignoreMessage(QtWarningMsg, qPrintable(out));
+
+        qWarning() << error;
+    }
+
+    {
+        QUrl url(QUrl::fromLocalFile(QString(SRCDIR) + "/").resolved(QUrl("foo.txt")));
+        QDeclarativeError error;
+        error.setUrl(url);
+        error.setDescription("An Error");
+        error.setLine(2);
+        error.setColumn(5);
+
+        QString out = url.toString() + ":2:5: An Error ";
+        QTest::ignoreMessage(QtWarningMsg, qPrintable(out));
+
+        qWarning() << error;
+    }
+}
+
+
+
+QTEST_MAIN(tst_qmlerror)
+
+#include "tst_qdeclarativeerror.moc"
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml
new file mode 100644
index 0000000..8a1843c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml
@@ -0,0 +1,4 @@
+import Qt 4.6
+
+Flickable {
+}
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
new file mode 100644
index 0000000..3e08359
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Flickable {
+    width: 100; height: 100
+    viewportWidth: row.width; viewportHeight: row.height
+
+    Row {
+        id: row
+        Repeater {
+            model: 4
+            Rectangle { width: 200; height: 300; color: "blue" }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
new file mode 100644
index 0000000..3ed173d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Flickable {
+    width: 100; height: 100
+    viewportWidth: column.width; viewportHeight: column.height
+
+    Column {
+        id: column
+        Repeater {
+            model: 4
+            Rectangle { width: 200; height: 300; color: "blue" }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
new file mode 100644
index 0000000..1425d85
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+
+Flickable {
+    width: 100; height: 100
+    viewportWidth: column.width; viewportHeight: column.height
+    pressDelay: 200; overShoot: false; interactive: false
+    maximumFlickVelocity: 2000
+
+    Column {
+        id: column
+        Repeater {
+            model: 4
+            Rectangle { width: 200; height: 300; color: "blue" }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro
new file mode 100644
index 0000000..4b71381
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeflickable.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
new file mode 100644
index 0000000..9e5238e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -0,0 +1,224 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtTest/QSignalSpy>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeflickable_p.h>
+#include <private/qdeclarativevaluetype_p.h>
+#include <math.h>
+
+class tst_qmlgraphicsflickable : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicsflickable();
+
+private slots:
+    void create();
+    void horizontalViewportSize();
+    void verticalViewportSize();
+    void properties();
+    void overShoot();
+    void maximumFlickVelocity();
+    void flickDeceleration();
+    void pressDelay();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlgraphicsflickable::tst_qmlgraphicsflickable()
+{
+}
+
+void tst_qmlgraphicsflickable::create()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable01.qml"));
+    QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
+
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->isAtXBeginning(), true);
+    QCOMPARE(obj->isAtXEnd(), false);
+    QCOMPARE(obj->isAtYBeginning(), true);
+    QCOMPARE(obj->isAtYEnd(), false);
+    QCOMPARE(obj->viewportX(), 0.);
+    QCOMPARE(obj->viewportY(), 0.);
+
+    QCOMPARE(obj->horizontalVelocity(), 0.);
+    QCOMPARE(obj->verticalVelocity(), 0.);
+    QCOMPARE(obj->reportedVelocitySmoothing(), 100.);
+
+    QCOMPARE(obj->isInteractive(), true);
+    QCOMPARE(obj->overShoot(), true);
+    QCOMPARE(obj->pressDelay(), 0);
+    QCOMPARE(obj->maximumFlickVelocity(), 2000.);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsflickable::horizontalViewportSize()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable02.qml"));
+    QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
+
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->viewportWidth(), 800.);
+    QCOMPARE(obj->viewportHeight(), 300.);
+    QCOMPARE(obj->isAtXBeginning(), true);
+    QCOMPARE(obj->isAtXEnd(), false);
+    QCOMPARE(obj->isAtYBeginning(), true);
+    QCOMPARE(obj->isAtYEnd(), false);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsflickable::verticalViewportSize()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable03.qml"));
+    QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
+
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->viewportWidth(), 200.);
+    QCOMPARE(obj->viewportHeight(), 1200.);
+    QCOMPARE(obj->isAtXBeginning(), true);
+    QCOMPARE(obj->isAtXEnd(), false);
+    QCOMPARE(obj->isAtYBeginning(), true);
+    QCOMPARE(obj->isAtYEnd(), false);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsflickable::properties()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable04.qml"));
+    QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
+
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->isInteractive(), false);
+    QCOMPARE(obj->overShoot(), false);
+    QCOMPARE(obj->pressDelay(), 200);
+    QCOMPARE(obj->maximumFlickVelocity(), 2000.);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsflickable::overShoot()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6; Flickable { overShoot: false; }", QUrl::fromLocalFile(""));
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
+    QSignalSpy spy(flickable, SIGNAL(overShootChanged()));
+
+    QVERIFY(flickable);
+    QVERIFY(!flickable->overShoot());
+
+    flickable->setOverShoot(true);
+    QVERIFY(flickable->overShoot());
+    QCOMPARE(spy.count(),1);
+    flickable->setOverShoot(true);
+    QCOMPARE(spy.count(),1);
+
+    flickable->setOverShoot(false);
+    QVERIFY(!flickable->overShoot());
+    QCOMPARE(spy.count(),2);
+    flickable->setOverShoot(false);
+    QCOMPARE(spy.count(),2);
+}
+
+void tst_qmlgraphicsflickable::maximumFlickVelocity()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6; Flickable { maximumFlickVelocity: 1.0; }", QUrl::fromLocalFile(""));
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
+    QSignalSpy spy(flickable, SIGNAL(maximumFlickVelocityChanged()));
+
+    QVERIFY(flickable);
+    QCOMPARE(flickable->maximumFlickVelocity(), 1.0);
+
+    flickable->setMaximumFlickVelocity(2.0);
+    QCOMPARE(flickable->maximumFlickVelocity(), 2.0);
+    QCOMPARE(spy.count(),1);
+    flickable->setMaximumFlickVelocity(2.0);
+    QCOMPARE(spy.count(),1);
+}
+
+void tst_qmlgraphicsflickable::flickDeceleration()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6; Flickable { flickDeceleration: 1.0; }", QUrl::fromLocalFile(""));
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
+    QSignalSpy spy(flickable, SIGNAL(flickDecelerationChanged()));
+
+    QVERIFY(flickable);
+    QCOMPARE(flickable->flickDeceleration(), 1.0);
+
+    flickable->setFlickDeceleration(2.0);
+    QCOMPARE(flickable->flickDeceleration(), 2.0);
+    QCOMPARE(spy.count(),1);
+    flickable->setFlickDeceleration(2.0);
+    QCOMPARE(spy.count(),1);
+}
+
+void tst_qmlgraphicsflickable::pressDelay()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6; Flickable { pressDelay: 100; }", QUrl::fromLocalFile(""));
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
+    QSignalSpy spy(flickable, SIGNAL(pressDelayChanged()));
+
+    QVERIFY(flickable);
+    QCOMPARE(flickable->pressDelay(), 100);
+
+    flickable->setPressDelay(200);
+    QCOMPARE(flickable->pressDelay(), 200);
+    QCOMPARE(spy.count(),1);
+    flickable->setPressDelay(200);
+    QCOMPARE(spy.count(),1);
+}
+
+QTEST_MAIN(tst_qmlgraphicsflickable)
+
+#include "tst_qdeclarativeflickable.moc"
diff --git a/tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml b/tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml
new file mode 100644
index 0000000..21d356d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+Flipable {
+    id: flipable
+    width: 640; height: 480
+
+    front: Rectangle { anchors.fill: flipable }
+    back: Rectangle { anchors.fill: flipable }
+}
diff --git a/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro
new file mode 100644
index 0000000..e29d324
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeflipable.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
new file mode 100644
index 0000000..f29ed18
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeflipable_p.h>
+#include <private/qdeclarativevaluetype_p.h>
+#include <QFontMetrics>
+#include <private/qdeclarativerectangle_p.h>
+#include <math.h>
+
+class tst_qmlgraphicsflipable : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicsflipable();
+
+private slots:
+    void create();
+    void checkFrontAndBack();
+    void setFrontAndBack();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlgraphicsflipable::tst_qmlgraphicsflipable()
+{
+}
+
+void tst_qmlgraphicsflipable::create()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
+    QDeclarativeFlipable *obj = qobject_cast<QDeclarativeFlipable*>(c.create());
+
+    QVERIFY(obj != 0);
+    delete obj;
+}
+
+void tst_qmlgraphicsflipable::checkFrontAndBack()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
+    QDeclarativeFlipable *obj = qobject_cast<QDeclarativeFlipable*>(c.create());
+
+    QVERIFY(obj != 0);
+    QVERIFY(obj->front() != 0);
+    QVERIFY(obj->back() != 0);
+    delete obj;
+}
+
+void tst_qmlgraphicsflipable::setFrontAndBack()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
+    QDeclarativeFlipable *obj = qobject_cast<QDeclarativeFlipable*>(c.create());
+
+    QVERIFY(obj != 0);
+    QVERIFY(obj->front() != 0);
+    QVERIFY(obj->back() != 0);
+
+    QString message = "QML Flipable (" + c.url().toString() + ":3:1) front is a write-once property";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+    obj->setFront(new QDeclarativeRectangle());
+
+    message = "QML Flipable (" + c.url().toString() + ":3:1) back is a write-once property";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+    obj->setBack(new QDeclarativeRectangle());
+    delete obj;
+}
+
+QTEST_MAIN(tst_qmlgraphicsflipable)
+
+#include "tst_qdeclarativeflipable.moc"
diff --git a/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf b/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf
new file mode 100644
index 0000000..e69de29
diff --git a/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf b/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf
new file mode 100644
index 0000000..cf93f96
Binary files /dev/null and b/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf differ
diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
new file mode 100644
index 0000000..0c736b4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativefontloader.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
new file mode 100644
index 0000000..5a1259d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativefontloader_p.h>
+#include "../../../shared/util.h"
+
+class tst_qmlfontloader : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlfontloader();
+
+private slots:
+    void noFont();
+    void namedFont();
+    void localFont();
+    void failLocalFont();
+    void webFont();
+    void failWebFont();
+
+private slots:
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlfontloader::tst_qmlfontloader()
+{
+}
+
+void tst_qmlfontloader::noFont()
+{
+    QString componentStr = "import Qt 4.6\nFontLoader { }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
+
+    QVERIFY(fontObject != 0);
+    QCOMPARE(fontObject->name(), QString(""));
+    QCOMPARE(fontObject->source(), QUrl(""));
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Null);
+
+    delete fontObject;
+}
+
+void tst_qmlfontloader::namedFont()
+{
+    QString componentStr = "import Qt 4.6\nFontLoader { name: \"Helvetica\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
+
+    QVERIFY(fontObject != 0);
+    QCOMPARE(fontObject->source(), QUrl(""));
+    QCOMPARE(fontObject->name(), QString("Helvetica"));
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
+}
+
+void tst_qmlfontloader::localFont()
+{
+    QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR  "/data/tarzeau_ocr_a.ttf\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
+
+    QVERIFY(fontObject != 0);
+    QVERIFY(fontObject->source() != QUrl(""));
+    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
+}
+
+void tst_qmlfontloader::failLocalFont()
+{
+    QString componentStr = "import Qt 4.6\nFontLoader { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" }";
+    QTest::ignoreMessage(QtWarningMsg, QString("Cannot load font:  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" )  ").toUtf8().constData());
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
+
+    QVERIFY(fontObject != 0);
+    QVERIFY(fontObject->source() != QUrl(""));
+    QTRY_COMPARE(fontObject->name(), QString(""));
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error);
+}
+
+void tst_qmlfontloader::webFont()
+{
+    QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://www.princexml.com/fonts/steffmann/Starburst.ttf\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
+
+    QVERIFY(fontObject != 0);
+    QVERIFY(fontObject->source() != QUrl(""));
+    QTRY_COMPARE(fontObject->name(), QString("Starburst"));
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
+}
+
+void tst_qmlfontloader::failWebFont()
+{
+    QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://wrong.address.com/Starburst.ttf\" }";
+    QTest::ignoreMessage(QtWarningMsg, "Cannot load font:  QUrl( \"http://wrong.address.com/Starburst.ttf\" )  ");
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
+
+    QVERIFY(fontObject != 0);
+    QVERIFY(fontObject->source() != QUrl(""));
+    QTRY_COMPARE(fontObject->name(), QString(""));
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error);
+}
+
+QTEST_MAIN(tst_qmlfontloader)
+
+#include "tst_qdeclarativefontloader.moc"
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
new file mode 100644
index 0000000..32833d2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
@@ -0,0 +1,51 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    resources: [
+        Component {
+            id: myDelegate
+            Rectangle {
+                id: wrapper
+                objectName: "wrapper"
+                width: 80
+                height: 60
+                border.color: "blue"
+                Text {
+                    text: index
+                }
+                Text {
+                    x: 40
+                    text: wrapper.x + ", " + wrapper.y
+                }
+                Text {
+                    y: 20
+                    id: textName
+                    objectName: "textName"
+                    text: name
+                }
+                Text {
+                    y: 40
+                    id: textNumber
+                    objectName: "textNumber"
+                    text: number
+                }
+                color: GridView.isCurrentItem ? "lightsteelblue" : "white"
+            }
+        }
+    ]
+    GridView {
+        id: grid
+        objectName: "grid"
+        focus: true
+        width: 240
+        height: 320
+        currentIndex: 5
+        cellWidth: 80
+        cellHeight: 60
+        delegate: myDelegate
+        model: testModel
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview.qml
new file mode 100644
index 0000000..344b4b5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview.qml
@@ -0,0 +1,50 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    resources: [
+        Component {
+            id: myDelegate
+            Rectangle {
+                id: wrapper
+                objectName: "wrapper"
+                width: 80
+                height: 60
+                border.color: "blue"
+                Text {
+                    text: index
+                }
+                Text {
+                    x: 40
+                    text: wrapper.x + ", " + wrapper.y
+                }
+                Text {
+                    y: 20
+                    id: textName
+                    objectName: "textName"
+                    text: name
+                }
+                Text {
+                    y: 40
+                    id: textNumber
+                    objectName: "textNumber"
+                    text: number
+                }
+                color: GridView.isCurrentItem ? "lightsteelblue" : "white"
+            }
+        }
+    ]
+    GridView {
+        id: grid
+        objectName: "grid"
+        width: 240
+        height: 320
+        cellWidth: 80
+        cellHeight: 60
+        flow: (testTopToBottom == false) ? "LeftToRight" : "TopToBottom"
+        model: testModel
+        delegate: myDelegate
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview2.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview2.qml
new file mode 100644
index 0000000..62b5bd3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview2.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+
+GridView {
+    anchors.fill: parent
+    width: 320; height: 200
+    cellWidth: 100; cellHeight: 100; cacheBuffer: 200; focus: true
+    keyNavigationWraps: true; highlightFollowsCurrentItem: false
+
+    model: ListModel {
+        id: appModel
+        ListElement { lColor: "red" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "blue" }
+    }
+
+    delegate: Item {
+        width: 100; height: 100
+        Rectangle {
+            color: lColor; x: 4; y: 4
+            width: 92; height: 92
+        }
+    }
+
+    highlight: Rectangle { width: 100; height: 100; color: "black" }
+}
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview3.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview3.qml
new file mode 100644
index 0000000..b133d55
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview3.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+GridView {
+    anchors.fill: parent
+    width: 320; height: 200
+}
diff --git a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro
new file mode 100644
index 0000000..af206d7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativegridview.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
new file mode 100644
index 0000000..0deb43d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -0,0 +1,964 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qdeclarativeengine.h>
+#include <qdeclarativecomponent.h>
+#include <QtTest/QtTest>
+#include <private/qlistmodelinterface_p.h>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativegridview_p.h>
+#include <private/qdeclarativetext_p.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeexpression.h>
+
+class tst_QmlGraphicsGridView : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlGraphicsGridView();
+
+private slots:
+    void items();
+    void changed();
+    void inserted();
+    void removed();
+    void moved();
+    void changeFlow();
+    void currentIndex();
+    void defaultValues();
+    void properties();
+    void positionViewAtIndex();
+
+private:
+    QDeclarativeView *createView();
+    template<typename T>
+    T *findItem(QGraphicsObject *parent, const QString &id, int index=-1);
+    template<typename T>
+    QList<T*> findItems(QGraphicsObject *parent, const QString &objectName);
+    void dumpTree(QDeclarativeItem *parent, int depth = 0);
+};
+
+class TestModel : public QAbstractListModel
+{
+public:
+    enum Roles { Name = Qt::UserRole+1, Number = Qt::UserRole+2 };
+
+    TestModel(QObject *parent=0) : QAbstractListModel(parent) {
+        QHash<int, QByteArray> roles;
+        roles[Name] = "name";
+        roles[Number] = "number";
+        setRoleNames(roles);
+    }
+
+    int rowCount(const QModelIndex &parent=QModelIndex()) const { return list.count(); }
+    QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const {
+        QVariant rv;
+        if (role == Name)
+            rv = list.at(index.row()).first;
+        else if (role == Number)
+            rv = list.at(index.row()).second;
+
+        return rv;
+    }
+
+    int count() const { return rowCount(); }
+    QString name(int index) const { return list.at(index).first; }
+    QString number(int index) const { return list.at(index).second; }
+
+    void addItem(const QString &name, const QString &number) {
+        emit beginInsertRows(QModelIndex(), list.count(), list.count());
+        list.append(QPair<QString,QString>(name, number));
+        emit endInsertRows();
+    }
+
+    void insertItem(int index, const QString &name, const QString &number) {
+        emit beginInsertRows(QModelIndex(), index, index);
+        list.insert(index, QPair<QString,QString>(name, number));
+        emit endInsertRows();
+    }
+
+    void removeItem(int index) {
+        emit beginRemoveRows(QModelIndex(), index, index);
+        list.removeAt(index);
+        emit endRemoveRows();
+    }
+
+    void moveItem(int from, int to) {
+        emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
+        list.move(from, to);
+        emit endMoveRows();
+    }
+
+    void modifyItem(int idx, const QString &name, const QString &number) {
+        list[idx] = QPair<QString,QString>(name, number);
+        emit dataChanged(index(idx,0), index(idx,0));
+    }
+
+private:
+    QList<QPair<QString,QString> > list;
+};
+
+tst_QmlGraphicsGridView::tst_QmlGraphicsGridView()
+{
+}
+
+void tst_QmlGraphicsGridView::items()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    model.addItem("Fred", "12345");
+    model.addItem("John", "2345");
+    model.addItem("Bob", "54321");
+    model.addItem("Billy", "22345");
+    model.addItem("Sam", "2945");
+    model.addItem("Ben", "04321");
+    model.addItem("Jim", "0780");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testTopToBottom", QVariant(false));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QDeclarativeItem *viewport = gridview->viewport();
+    QVERIFY(viewport != 0);
+
+    QCOMPARE(gridview->count(), model.count());
+    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
+
+    for (int i = 0; i < model.count(); ++i) {
+        QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", i);
+        QVERIFY(name != 0);
+        QCOMPARE(name->text(), model.name(i));
+        QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", i);
+        QVERIFY(number != 0);
+        QCOMPARE(number->text(), model.number(i));
+    }
+
+    // set an empty model and confirm that items are destroyed
+    TestModel model2;
+    ctxt->setContextProperty("testModel", &model2);
+
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    QVERIFY(itemCount == 0);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsGridView::changed()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    model.addItem("Fred", "12345");
+    model.addItem("John", "2345");
+    model.addItem("Bob", "54321");
+    model.addItem("Billy", "22345");
+    model.addItem("Sam", "2945");
+    model.addItem("Ben", "04321");
+    model.addItem("Jim", "0780");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testTopToBottom", QVariant(false));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeFlickable *gridview = findItem<QDeclarativeFlickable>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QDeclarativeItem *viewport = gridview->viewport();
+    QVERIFY(viewport != 0);
+
+    model.modifyItem(1, "Will", "9876");
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(1));
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(1));
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsGridView::inserted()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    model.addItem("Fred", "12345");
+    model.addItem("John", "2345");
+    model.addItem("Bob", "54321");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testTopToBottom", QVariant(false));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QDeclarativeItem *viewport = gridview->viewport();
+    QVERIFY(viewport != 0);
+
+    model.insertItem(1, "Will", "9876");
+
+    // let transitions settle.
+    QTest::qWait(300);
+
+    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
+
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(1));
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(1));
+
+    // Confirm items positioned correctly
+    for (int i = 0; i < model.count(); ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        QCOMPARE(item->x(), (i%3)*80.0);
+        QCOMPARE(item->y(), (i/3)*60.0);
+    }
+
+    model.insertItem(0, "Foo", "1111"); // zero index, and current item
+
+    // let transitions settle.
+    QTest::qWait(300);
+
+    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
+
+    name = findItem<QDeclarativeText>(viewport, "textName", 0);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(0));
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(0));
+
+    QCOMPARE(gridview->currentIndex(), 1);
+
+    // Confirm items positioned correctly
+    for (int i = 0; i < model.count(); ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        QVERIFY(item->x() == (i%3)*80);
+        QVERIFY(item->y() == (i/3)*60);
+    }
+
+    for (int i = model.count(); i < 30; ++i)
+        model.insertItem(i, "Hello", QString::number(i));
+    QTest::qWait(300);
+
+    gridview->setViewportY(120);
+    QTest::qWait(300);
+
+    // Insert item outside visible area
+    model.insertItem(1, "Hello", "1324");
+    QTest::qWait(300);
+
+    QVERIFY(gridview->viewportY() == 120);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsGridView::removed()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 40; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testTopToBottom", QVariant(false));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QDeclarativeItem *viewport = gridview->viewport();
+    QVERIFY(viewport != 0);
+
+    model.removeItem(1);
+
+    // let transitions settle.
+    QTest::qWait(300);
+
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(1));
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(1));
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->x() == (i%3)*80);
+        QVERIFY(item->y() == (i/3)*60);
+    }
+
+    // Remove first item (which is the current item);
+    model.removeItem(0);
+
+    // let transitions settle.
+    QTest::qWait(300);
+
+    name = findItem<QDeclarativeText>(viewport, "textName", 0);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(0));
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(0));
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->x() == (i%3)*80);
+        QVERIFY(item->y() == (i/3)*60);
+    }
+
+    // Remove items not visible
+    model.removeItem(25);
+    // let transitions settle.
+    QTest::qWait(300);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->x() == (i%3)*80);
+        QVERIFY(item->y() == (i/3)*60);
+    }
+
+    // Remove items before visible
+    gridview->setViewportY(120);
+    QTest::qWait(500);
+    gridview->setCurrentIndex(10);
+
+    // let transitions settle.
+    QTest::qWait(300);
+
+    // Setting currentIndex above shouldn't cause view to scroll
+    QCOMPARE(gridview->viewportY(), 120.0);
+
+    model.removeItem(1);
+
+    // let transitions settle.
+    QTest::qWait(300);
+
+    // Confirm items positioned correctly
+    for (int i = 6; i < 18; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->x() == (i%3)*80);
+        QVERIFY(item->y() == (i/3)*60);
+    }
+
+    // Remove currentIndex
+    QDeclarativeItem *oldCurrent = gridview->currentItem();
+    model.removeItem(9);
+    QTest::qWait(500);
+
+    QCOMPARE(gridview->currentIndex(), 9);
+    QVERIFY(gridview->currentItem() != oldCurrent);
+
+    gridview->setViewportY(0);
+    // let transitions settle.
+    QTest::qWait(300);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->x() == (i%3)*80);
+        QVERIFY(item->y() == (i/3)*60);
+    }
+
+    // remove item outside current view.
+    gridview->setCurrentIndex(32);
+    QTest::qWait(500);
+    gridview->setViewportY(240);
+
+    model.removeItem(30);
+    QVERIFY(gridview->currentIndex() == 31);
+
+    // remove current item beyond visible items.
+    gridview->setCurrentIndex(20);
+    QTest::qWait(500);
+    gridview->setViewportY(0);
+    model.removeItem(20);
+    QTest::qWait(500);
+
+    QCOMPARE(gridview->currentIndex(), 20);
+    QVERIFY(gridview->currentItem() != 0);
+
+    // remove item before current, but visible
+    gridview->setCurrentIndex(8);
+    QTest::qWait(500);
+    gridview->setViewportY(240);
+    oldCurrent = gridview->currentItem();
+    model.removeItem(6);
+    QTest::qWait(500);
+
+    QCOMPARE(gridview->currentIndex(), 7);
+    QVERIFY(gridview->currentItem() == oldCurrent);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsGridView::moved()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testTopToBottom", QVariant(false));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QDeclarativeItem *viewport = gridview->viewport();
+    QVERIFY(viewport != 0);
+
+    model.moveItem(1, 8);
+
+    // let transitions settle.
+    QTest::qWait(300);
+
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(1));
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(1));
+
+    name = findItem<QDeclarativeText>(viewport, "textName", 8);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(8));
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 8);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(8));
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->x() == (i%3)*80);
+        QVERIFY(item->y() == (i/3)*60);
+    }
+
+    gridview->setViewportY(120);
+
+    // move outside visible area
+    model.moveItem(1, 25);
+
+    // let transitions settle.
+    QTest::qWait(300);
+
+    // Confirm items positioned correctly and indexes correct
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count()-1;
+    for (int i = 6; i < model.count()-6 && i < itemCount+6; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->x(), qreal((i%3)*80));
+        QCOMPARE(item->y(), qreal((i/3)*60));
+        name = findItem<QDeclarativeText>(viewport, "textName", i);
+        QVERIFY(name != 0);
+        QCOMPARE(name->text(), model.name(i));
+        number = findItem<QDeclarativeText>(viewport, "textNumber", i);
+        QVERIFY(number != 0);
+        QCOMPARE(number->text(), model.number(i));
+    }
+
+    // move from outside visible into visible
+    model.moveItem(28, 8);
+
+    // let transitions settle.
+    QTest::qWait(300);
+
+    // Confirm items positioned correctly and indexes correct
+    for (int i = 6; i < model.count()-6 && i < itemCount+6; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->x() == (i%3)*80);
+        QVERIFY(item->y() == (i/3)*60);
+        name = findItem<QDeclarativeText>(viewport, "textName", i);
+        QVERIFY(name != 0);
+        QCOMPARE(name->text(), model.name(i));
+        number = findItem<QDeclarativeText>(viewport, "textNumber", i);
+        QVERIFY(number != 0);
+        QCOMPARE(number->text(), model.number(i));
+    }
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsGridView::currentIndex()
+{
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), QString::number(i));
+
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    QString filename(SRCDIR "/data/gridview-initCurrent.qml");
+    canvas->setSource(QUrl::fromLocalFile(filename));
+
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QDeclarativeItem *viewport = gridview->viewport();
+    QVERIFY(viewport != 0);
+
+    QTest::qWait(500);
+
+    // current item should be third item
+    QCOMPARE(gridview->currentIndex(), 5);
+    QCOMPARE(gridview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 5));
+    QCOMPARE(gridview->currentItem()->y(), gridview->highlightItem()->y());
+
+    gridview->moveCurrentIndexRight();
+    QCOMPARE(gridview->currentIndex(), 6);
+    gridview->moveCurrentIndexDown();
+    QCOMPARE(gridview->currentIndex(), 9);
+    gridview->moveCurrentIndexUp();
+    QCOMPARE(gridview->currentIndex(), 6);
+    gridview->moveCurrentIndexLeft();
+    QCOMPARE(gridview->currentIndex(), 5);
+
+    // no wrap
+    gridview->setCurrentIndex(0);
+    QCOMPARE(gridview->currentIndex(), 0);
+
+    gridview->moveCurrentIndexUp();
+    QCOMPARE(gridview->currentIndex(), 0);
+
+    gridview->moveCurrentIndexLeft();
+    QCOMPARE(gridview->currentIndex(), 0);
+
+    gridview->setCurrentIndex(model.count()-1);
+    QTest::qWait(500);
+    QCOMPARE(gridview->currentIndex(), model.count()-1);
+
+    gridview->moveCurrentIndexRight();
+    QCOMPARE(gridview->currentIndex(), model.count()-1);
+
+    gridview->moveCurrentIndexDown();
+    QCOMPARE(gridview->currentIndex(), model.count()-1);
+
+    // with wrap
+    gridview->setWrapEnabled(true);
+
+    gridview->setCurrentIndex(0);
+    QCOMPARE(gridview->currentIndex(), 0);
+    QTest::qWait(500);
+
+    gridview->moveCurrentIndexLeft();
+    QCOMPARE(gridview->currentIndex(), model.count()-1);
+
+    QTest::qWait(500);
+    QCOMPARE(gridview->viewportY(), 279.0);
+
+    gridview->moveCurrentIndexRight();
+    QCOMPARE(gridview->currentIndex(), 0);
+
+    QTest::qWait(500);
+    QCOMPARE(gridview->viewportY(), 0.0);
+
+    // Test keys
+    qApp->setActiveWindow(canvas);
+    canvas->show();
+    canvas->setFocus();
+    qApp->processEvents();
+
+    QTest::keyClick(canvas, Qt::Key_Down);
+    QCOMPARE(gridview->currentIndex(), 3);
+
+    QTest::keyClick(canvas, Qt::Key_Up);
+    QCOMPARE(gridview->currentIndex(), 0);
+
+    gridview->setFlow(QDeclarativeGridView::TopToBottom);
+
+    QTest::keyClick(canvas, Qt::Key_Right);
+    QCOMPARE(gridview->currentIndex(), 5);
+
+    QTest::keyClick(canvas, Qt::Key_Left);
+    QCOMPARE(gridview->currentIndex(), 0);
+
+    QTest::keyClick(canvas, Qt::Key_Down);
+    QCOMPARE(gridview->currentIndex(), 1);
+
+    QTest::keyClick(canvas, Qt::Key_Up);
+    QCOMPARE(gridview->currentIndex(), 0);
+
+
+    // turn off auto highlight
+    gridview->setHighlightFollowsCurrentItem(false);
+    QVERIFY(gridview->highlightFollowsCurrentItem() == false);
+
+    QTest::qWait(500);
+    QVERIFY(gridview->highlightItem());
+    qreal hlPosX = gridview->highlightItem()->x();
+    qreal hlPosY = gridview->highlightItem()->y();
+
+    gridview->setCurrentIndex(5);
+    QTest::qWait(500);
+    QCOMPARE(gridview->highlightItem()->x(), hlPosX);
+    QCOMPARE(gridview->highlightItem()->y(), hlPosY);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsGridView::changeFlow()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), QString::number(i));
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testTopToBottom", QVariant(false));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QDeclarativeItem *viewport = gridview->viewport();
+    QVERIFY(viewport != 0);
+
+    // Confirm items positioned correctly and indexes correct
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->x(), qreal((i%3)*80));
+        QCOMPARE(item->y(), qreal((i/3)*60));
+        QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", i);
+        QVERIFY(name != 0);
+        QCOMPARE(name->text(), model.name(i));
+        QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", i);
+        QVERIFY(number != 0);
+        QCOMPARE(number->text(), model.number(i));
+    }
+
+    ctxt->setContextProperty("testTopToBottom", QVariant(true));
+    QTest::qWait(500);
+
+    // Confirm items positioned correctly and indexes correct
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->x(), qreal((i/5)*80));
+        QCOMPARE(item->y(), qreal((i%5)*60));
+        QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", i);
+        QVERIFY(name != 0);
+        QCOMPARE(name->text(), model.name(i));
+        QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", i);
+        QVERIFY(number != 0);
+        QCOMPARE(number->text(), model.number(i));
+    }
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsGridView::defaultValues()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview3.qml"));
+    QDeclarativeGridView *obj = qobject_cast<QDeclarativeGridView*>(c.create());
+
+    QVERIFY(obj != 0);
+    QVERIFY(obj->model() == QVariant());
+    QVERIFY(obj->delegate() == 0);
+    QCOMPARE(obj->currentIndex(), -1);
+    QVERIFY(obj->currentItem() == 0);
+    QCOMPARE(obj->count(), 0);
+    QVERIFY(obj->highlight() == 0);
+    QVERIFY(obj->highlightItem() == 0);
+    QCOMPARE(obj->highlightFollowsCurrentItem(), true);
+    QVERIFY(obj->flow() == 0);
+    QCOMPARE(obj->isWrapEnabled(), false);
+    QCOMPARE(obj->cacheBuffer(), 0);
+    QCOMPARE(obj->cellWidth(), 100); //### Should 100 be the default?
+    QCOMPARE(obj->cellHeight(), 100);
+    delete obj;
+}
+
+void tst_QmlGraphicsGridView::properties()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview2.qml"));
+    QDeclarativeGridView *obj = qobject_cast<QDeclarativeGridView*>(c.create());
+
+    QVERIFY(obj != 0);
+    QVERIFY(obj->model() != QVariant());
+    QVERIFY(obj->delegate() != 0);
+    QCOMPARE(obj->currentIndex(), 0);
+    QVERIFY(obj->currentItem() != 0);
+    QCOMPARE(obj->count(), 4);
+    QVERIFY(obj->highlight() != 0);
+    QVERIFY(obj->highlightItem() != 0);
+    QCOMPARE(obj->highlightFollowsCurrentItem(), false);
+    QVERIFY(obj->flow() == 0);
+    QCOMPARE(obj->isWrapEnabled(), true);
+    QCOMPARE(obj->cacheBuffer(), 200);
+    QCOMPARE(obj->cellWidth(), 100);
+    QCOMPARE(obj->cellHeight(), 100);
+    delete obj;
+}
+
+void tst_QmlGraphicsGridView::positionViewAtIndex()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 40; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testTopToBottom", QVariant(false));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QDeclarativeItem *viewport = gridview->viewport();
+    QVERIFY(viewport != 0);
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->x(), (i%3)*80.);
+        QCOMPARE(item->y(), (i/3)*60.);
+    }
+
+    // Position on a currently visible item
+    gridview->positionViewAtIndex(4);
+    QCOMPARE(gridview->viewportY(), 60.);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 3; i < model.count() && i < itemCount-3-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->x(), (i%3)*80.);
+        QCOMPARE(item->y(), (i/3)*60.);
+    }
+
+    // Position on an item beyond the visible items
+    gridview->positionViewAtIndex(21);
+    QCOMPARE(gridview->viewportY(), 420.);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 22; i < model.count() && i < itemCount-22-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->x(), (i%3)*80.);
+        QCOMPARE(item->y(), (i/3)*60.);
+    }
+
+    // Position on an item that would leave empty space if positioned at the top
+    gridview->positionViewAtIndex(31);
+    QCOMPARE(gridview->viewportY(), 520.);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 24; i < model.count() && i < itemCount-24-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->x(), (i%3)*80.);
+        QCOMPARE(item->y(), (i/3)*60.);
+    }
+
+    // Position at the beginning again
+    gridview->positionViewAtIndex(0);
+    QCOMPARE(gridview->viewportY(), 0.);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->x(), (i%3)*80.);
+        QCOMPARE(item->y(), (i/3)*60.);
+    }
+
+    delete canvas;
+}
+
+QDeclarativeView *tst_QmlGraphicsGridView::createView()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    return canvas;
+}
+
+/*
+   Find an item with the specified objectName.  If index is supplied then the
+   item must also evaluate the {index} expression equal to index
+*/
+template<typename T>
+T *tst_QmlGraphicsGridView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
+{
+    const QMetaObject &mo = T::staticMetaObject;
+    //qDebug() << parent->childItems().count() << "children";
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if(!item)
+            continue;
+        //qDebug() << "try" << item;
+        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
+            if (index != -1) {
+                QDeclarativeContext *context = QDeclarativeEngine::contextForObject(item);
+                if (context) {
+                    if (context->contextProperty("index").toInt() == index) {
+                        return static_cast<T*>(item);
+                    }
+                }
+            } else {
+                return static_cast<T*>(item);
+            }
+        }
+        item = findItem<T>(item, objectName, index);
+        if (item)
+            return static_cast<T*>(item);
+    }
+
+    return 0;
+}
+
+template<typename T>
+QList<T*> tst_QmlGraphicsGridView::findItems(QGraphicsObject *parent, const QString &objectName)
+{
+    QList<T*> items;
+    const QMetaObject &mo = T::staticMetaObject;
+    //qDebug() << parent->childItems().count() << "children";
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if(!item)
+            continue;
+        //qDebug() << "try" << item;
+        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
+            items.append(static_cast<T*>(item));
+            //qDebug() << " found:" << item;
+        }
+        items += findItems<T>(item, objectName);
+    }
+
+    return items;
+}
+
+void tst_QmlGraphicsGridView::dumpTree(QDeclarativeItem *parent, int depth)
+{
+    static QString padding("                       ");
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if(!item)
+            continue;
+        QDeclarativeContext *context = QDeclarativeEngine::contextForObject(item);
+        qDebug() << padding.left(depth*2) << item << (context ? context->contextProperty("index").toInt() : -1);
+        dumpTree(item, depth+1);
+    }
+}
+
+
+QTEST_MAIN(tst_QmlGraphicsGridView)
+
+#include "tst_qdeclarativegridview.moc"
diff --git a/tests/auto/declarative/qdeclarativeimage/data/colors.png b/tests/auto/declarative/qdeclarativeimage/data/colors.png
new file mode 100644
index 0000000..dfb62f3
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeimage/data/colors.png differ
diff --git a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro
new file mode 100644
index 0000000..7634c12
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui network
+macx:CONFIG -= app_bundle
+
+HEADERS += ../shared/testhttpserver.h
+SOURCES += tst_qdeclarativeimage.cpp ../shared/testhttpserver.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
new file mode 100644
index 0000000..097e5fc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -0,0 +1,247 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QTextDocument>
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QDir>
+
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeimage_p.h>
+#include <private/qdeclarativeimagebase_p.h>
+#include <private/qdeclarativeloader_p.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+
+#include "../shared/testhttpserver.h"
+
+
+#define SERVER_PORT 14445
+#define SERVER_ADDR "http://127.0.0.1:14445"
+
+#define TRY_WAIT(expr) \
+    do { \
+        for (int ii = 0; ii < 6; ++ii) { \
+            if ((expr)) break; \
+            QTest::qWait(50); \
+        } \
+        QVERIFY((expr)); \
+    } while (false)
+
+
+class tst_qmlgraphicsimage : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicsimage();
+
+private slots:
+    void noSource();
+    void imageSource();
+    void imageSource_data();
+    void clearSource();
+    void resized();
+    void smooth();
+    void pixmap();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlgraphicsimage::tst_qmlgraphicsimage()
+{
+}
+
+void tst_qmlgraphicsimage::noSource()
+{
+    QString componentStr = "import Qt 4.6\nImage { source: \"\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->source(), QUrl());
+    QVERIFY(obj->status() == QDeclarativeImage::Null);
+    QCOMPARE(obj->width(), 0.);
+    QCOMPARE(obj->height(), 0.);
+    QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
+    QCOMPARE(obj->progress(), 0.0);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsimage::imageSource_data()
+{
+    QTest::addColumn<QString>("source");
+    QTest::addColumn<bool>("remote");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << false << "";
+    QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << false
+        << "Cannot open  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() + "\" )  ";
+    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << "";
+    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true
+        << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
+}
+
+void tst_qmlgraphicsimage::imageSource()
+{
+    QFETCH(QString, source);
+    QFETCH(bool, remote);
+    QFETCH(QString, error);
+
+    TestHTTPServer server(SERVER_PORT);
+    if (remote) {
+        QVERIFY(server.isValid());
+        server.serveDirectory(SRCDIR "/data");
+    }
+
+    if (!error.isEmpty())
+        QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
+
+    QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+    
+    if (remote)
+        TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
+
+    QCOMPARE(obj->source(), remote ? source : QUrl(source));
+
+    if (error.isEmpty()) {
+        TRY_WAIT(obj->status() == QDeclarativeImage::Ready);
+        QCOMPARE(obj->width(), 120.);
+        QCOMPARE(obj->height(), 120.);
+        QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
+        QCOMPARE(obj->progress(), 1.0);
+    } else {
+        TRY_WAIT(obj->status() == QDeclarativeImage::Error);
+    }
+
+    delete obj;
+}
+
+void tst_qmlgraphicsimage::clearSource()
+{
+    QString componentStr = "import Qt 4.6\nImage { source: srcImage }";
+    QDeclarativeContext *ctxt = engine.rootContext();
+    ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png"));
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+    QVERIFY(obj->status() == QDeclarativeImage::Ready);
+    QCOMPARE(obj->width(), 120.);
+    QCOMPARE(obj->height(), 120.);
+    QCOMPARE(obj->progress(), 1.0);
+
+    ctxt->setContextProperty("srcImage", "");
+    QVERIFY(obj->source().isEmpty());
+    QVERIFY(obj->status() == QDeclarativeImage::Null);
+    QCOMPARE(obj->width(), 0.);
+    QCOMPARE(obj->height(), 0.);
+    QCOMPARE(obj->progress(), 0.0);
+}
+
+void tst_qmlgraphicsimage::resized()
+{
+    QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 300 }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->width(), 300.);
+    QCOMPARE(obj->height(), 300.);
+    QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsimage::smooth()
+{
+    QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->width(), 300.);
+    QCOMPARE(obj->height(), 300.);
+    QCOMPARE(obj->smooth(), true);
+    QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
+
+    delete obj;
+}
+
+void tst_qmlgraphicsimage::pixmap()
+{
+    QString componentStr = "import Qt 4.6\nImage { pixmap: testPixmap }";
+
+    QPixmap pixmap;
+    QDeclarativeContext *ctxt = engine.rootContext();
+    ctxt->setContextProperty("testPixmap", pixmap);
+
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->source(), QUrl());
+    QVERIFY(obj->status() == QDeclarativeImage::Null);
+    QCOMPARE(obj->width(), 0.);
+    QCOMPARE(obj->height(), 0.);
+    QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
+    QCOMPARE(obj->progress(), 0.0);
+    QVERIFY(obj->pixmap().isNull());
+
+    pixmap = QPixmap(SRCDIR "/data/colors.png");
+    ctxt->setContextProperty("testPixmap", pixmap);
+    QCOMPARE(obj->width(), 120.);
+    QCOMPARE(obj->height(), 120.);
+    QVERIFY(obj->status() == QDeclarativeImage::Ready);
+
+    delete obj;
+}
+
+QTEST_MAIN(tst_qmlgraphicsimage)
+
+#include "tst_qdeclarativeimage.moc"
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/data/exists.png b/tests/auto/declarative/qdeclarativeimageprovider/data/exists.png
new file mode 100644
index 0000000..399bd0b
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeimageprovider/data/exists.png differ
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/data/exists1.png b/tests/auto/declarative/qdeclarativeimageprovider/data/exists1.png
new file mode 100644
index 0000000..399bd0b
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeimageprovider/data/exists1.png differ
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/data/exists2.png b/tests/auto/declarative/qdeclarativeimageprovider/data/exists2.png
new file mode 100644
index 0000000..399bd0b
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeimageprovider/data/exists2.png differ
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
new file mode 100644
index 0000000..a4d3eb2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
@@ -0,0 +1,12 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+QT += network
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeimageprovider.cpp
+
+# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
+# LIBS += -lgcov
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
new file mode 100644
index 0000000..704899d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -0,0 +1,166 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtTest/QtTest>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativeimageprovider.h>
+#include <private/qdeclarativeimage_p.h>
+
+// QDeclarativeImageProvider::request() is run in an idle thread where possible
+// Be generous in our timeout.
+#define TRY_WAIT(expr) \
+    do { \
+        for (int ii = 0; ii < 10; ++ii) { \
+            if ((expr)) break; \
+            QTest::qWait(100); \
+        } \
+        QVERIFY((expr)); \
+    } while (false)
+
+
+class tst_qmlimageprovider : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlimageprovider()
+    {
+    }
+
+private slots:
+    void imageSource();
+    void imageSource_data();
+    void removeProvider();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+class TestProvider : public QDeclarativeImageProvider
+{
+public:
+    QImage request(const QString &id) {
+        QImage image;
+        image.load(SRCDIR "/data/" + id);
+        return image;
+    }
+};
+
+void tst_qmlimageprovider::imageSource_data()
+{
+    QTest::addColumn<QString>("source");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("exists") << "image://test/exists.png" << "";
+    QTest::newRow("missing") << "image://test/no-such-file.png"
+        << "\"Failed to get image from provider: image://test/no-such-file.png\" ";
+    QTest::newRow("unknown provider") << "image://bogus/exists.png"
+        << "\"Failed to get image from provider: image://bogus/exists.png\" ";
+}
+    
+void tst_qmlimageprovider::imageSource()
+{
+    QFETCH(QString, source);
+    QFETCH(QString, error);
+
+    if (!error.isEmpty())
+        QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
+
+    engine.addImageProvider("test", new TestProvider);
+    QVERIFY(engine.imageProvider("test") != 0);
+
+    QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+
+    TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
+
+    QCOMPARE(obj->source(), QUrl(source));
+
+    if (error.isEmpty()) {
+        TRY_WAIT(obj->status() == QDeclarativeImage::Ready);
+        QCOMPARE(obj->width(), 100.);
+        QCOMPARE(obj->height(), 100.);
+        QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
+        QCOMPARE(obj->progress(), 1.0);
+    } else {
+        TRY_WAIT(obj->status() == QDeclarativeImage::Error);
+    }
+
+    delete obj;
+}
+
+void tst_qmlimageprovider::removeProvider()
+{
+    engine.addImageProvider("test2", new TestProvider);
+    QVERIFY(engine.imageProvider("test2") != 0);
+
+    // add provider, confirm it works
+    QString componentStr = "import Qt 4.6\nImage { source: \"image://test2/exists1.png\" }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+
+    TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
+    TRY_WAIT(obj->status() == QDeclarativeImage::Ready);
+
+    QCOMPARE(obj->width(), 100.0);
+
+    // remove the provider and confirm
+    QString error("\"Failed to get image from provider: image://test2/exists2.png\" ");
+    QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
+
+    engine.removeImageProvider("test2");
+
+    obj->setSource(QUrl("image://test2/exists2.png"));
+
+    TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
+    TRY_WAIT(obj->status() == QDeclarativeImage::Error);
+
+    delete obj;
+}
+
+
+QTEST_MAIN(tst_qmlimageprovider)
+
+#include "tst_qdeclarativeimageprovider.moc"
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
new file mode 100644
index 0000000..cd5b426
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    property var nested
+
+    nested:  QtObject {}
+}
+
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
new file mode 100644
index 0000000..a2ce78a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    property var nested
+    nested: NestedObject { }
+    property var nested2: nested.nested
+}
+
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml
new file mode 100644
index 0000000..ce05f89
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    property var nested
+
+    nested: QtObject {
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
new file mode 100644
index 0000000..015c094
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeinfo.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
new file mode 100644
index 0000000..dc3e816
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QPushButton>
+#include <QDeclarativeContext>
+#include <qdeclarativeinfo.h>
+
+class tst_qmlinfo : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlinfo() {}
+
+private slots:
+    void qmlObject();
+    void nestedQmlObject();
+    void nonQmlObject();
+    void nullObject();
+    void nonQmlContextedObject();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
+void tst_qmlinfo::qmlObject()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("qmlObject.qml"));
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QString message = "QML QObject_QML_0 (" + component.url().toString() + ":3:1) Test Message";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+    qmlInfo(object) << "Test Message";
+
+    QObject *nested = qvariant_cast<QObject *>(object->property("nested"));
+    QVERIFY(nested != 0);
+
+    message = "QML QtObject (" + component.url().toString() + ":6:13) Second Test Message";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+    qmlInfo(nested) << "Second Test Message";
+}
+
+void tst_qmlinfo::nestedQmlObject()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("nestedQmlObject.qml"));
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QObject *nested = qvariant_cast<QObject *>(object->property("nested"));
+    QVERIFY(nested != 0);
+    QObject *nested2 = qvariant_cast<QObject *>(object->property("nested2"));
+    QVERIFY(nested2 != 0);
+
+    QString message = "QML NestedObject (" + component.url().toString() + ":5:13) Outer Object";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+    qmlInfo(nested) << "Outer Object";
+
+    message = "QML QtObject (" + TEST_FILE("NestedObject.qml").toString() + ":6:14) Inner Object";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+    qmlInfo(nested2) << "Inner Object";
+}
+
+void tst_qmlinfo::nonQmlObject()
+{
+    QObject object;
+    QTest::ignoreMessage(QtWarningMsg, "QML QtObject (unknown location) Test Message");
+    qmlInfo(&object) << "Test Message";
+
+    QPushButton pbObject;
+    QTest::ignoreMessage(QtWarningMsg, "QML QPushButton (unknown location) Test Message");
+    qmlInfo(&pbObject) << "Test Message";
+}
+
+void tst_qmlinfo::nullObject()
+{
+    QTest::ignoreMessage(QtWarningMsg, "QML (unknown location) Null Object Test Message");
+    qmlInfo(0) << "Null Object Test Message";
+}
+
+void tst_qmlinfo::nonQmlContextedObject()
+{
+    QObject object;
+    QDeclarativeContext context(&engine);
+    QDeclarativeEngine::setContextForObject(&object, &context);
+    QTest::ignoreMessage(QtWarningMsg, "QML QtObject (unknown location) Test Message");
+    qmlInfo(&object) << "Test Message";
+}
+
+QTEST_MAIN(tst_qmlinfo)
+
+#include "tst_qdeclarativeinfo.moc"
diff --git a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
new file mode 100644
index 0000000..b8f7d27
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative script
+SOURCES += tst_qdeclarativeinstruction.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
new file mode 100644
index 0000000..71495f3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
@@ -0,0 +1,585 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <private/qdeclarativecompiler_p.h>
+
+class tst_qmlinstruction : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlinstruction() {}
+
+private slots:
+    void dump();
+};
+
+static QStringList messages;
+static void msgHandler(QtMsgType, const char *msg)
+{
+    messages << QLatin1String(msg);
+}
+
+void tst_qmlinstruction::dump()
+{
+    QDeclarativeCompiledData *data = new QDeclarativeCompiledData(0);
+    {
+        QDeclarativeInstruction i;
+        i.line = 0;
+        i.type = QDeclarativeInstruction::Init;
+        i.init.bindingsSize = 0;
+        i.init.parserStatusSize = 3;
+        i.init.contextCache = -1;
+        i.init.compiledBinding = -1;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeCompiledData::TypeReference ref;
+        ref.className = "Test";
+        data->types << ref;
+
+        QDeclarativeInstruction i;
+        i.line = 1;
+        i.type = QDeclarativeInstruction::CreateObject;
+        i.create.type = 0;
+        i.create.data = -1;
+        i.create.bindingBits = -1;
+        i.create.column = 10;
+        data->bytecode << i;
+    }
+
+    {
+        data->primitives << "testId";
+
+        QDeclarativeInstruction i;
+        i.line = 2;
+        i.type = QDeclarativeInstruction::SetId;
+        i.setId.value = 0;
+        i.setId.index = 0;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 3;
+        i.type = QDeclarativeInstruction::SetDefault;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 4;
+        i.type = QDeclarativeInstruction::CreateComponent;
+        i.createComponent.count = 3;
+        i.createComponent.column = 4;
+        i.createComponent.endLine = 14;
+        i.createComponent.metaObject = 0;
+
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 5;
+        i.type = QDeclarativeInstruction::StoreMetaObject;
+        i.storeMeta.data = 3;
+        i.storeMeta.aliasData = 6;
+        i.storeMeta.propertyCache = 7;
+
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 6;
+        i.type = QDeclarativeInstruction::StoreFloat;
+        i.storeFloat.propertyIndex = 3;
+        i.storeFloat.value = 11.3;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 7;
+        i.type = QDeclarativeInstruction::StoreDouble;
+        i.storeDouble.propertyIndex = 4;
+        i.storeDouble.value = 14.8;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 8;
+        i.type = QDeclarativeInstruction::StoreInteger;
+        i.storeInteger.propertyIndex = 5;
+        i.storeInteger.value = 9;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 9;
+        i.type = QDeclarativeInstruction::StoreBool;
+        i.storeBool.propertyIndex = 6;
+        i.storeBool.value = true;
+
+        data->bytecode << i;
+    }
+
+    {
+        data->primitives << "Test String";
+        QDeclarativeInstruction i;
+        i.line = 10;
+        i.type = QDeclarativeInstruction::StoreString;
+        i.storeString.propertyIndex = 7;
+        i.storeString.value = 1;
+        data->bytecode << i;
+    }
+
+    {
+        data->primitives << "http://www.nokia.com";
+        QDeclarativeInstruction i;
+        i.line = 11;
+        i.type = QDeclarativeInstruction::StoreUrl;
+        i.storeUrl.propertyIndex = 8;
+        i.storeUrl.value = 2;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 12;
+        i.type = QDeclarativeInstruction::StoreColor;
+        i.storeColor.propertyIndex = 9;
+        i.storeColor.value = 0xFF00FF00;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 13;
+        i.type = QDeclarativeInstruction::StoreDate;
+        i.storeDate.propertyIndex = 10;
+        i.storeDate.value = 9;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 14;
+        i.type = QDeclarativeInstruction::StoreTime;
+        i.storeTime.propertyIndex = 11;
+        i.storeTime.valueIndex = 33;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 15;
+        i.type = QDeclarativeInstruction::StoreDateTime;
+        i.storeDateTime.propertyIndex = 12;
+        i.storeDateTime.valueIndex = 44;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 16;
+        i.type = QDeclarativeInstruction::StorePoint;
+        i.storeRealPair.propertyIndex = 13;
+        i.storeRealPair.valueIndex = 3;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 17;
+        i.type = QDeclarativeInstruction::StorePointF;
+        i.storeRealPair.propertyIndex = 14;
+        i.storeRealPair.valueIndex = 9;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 18;
+        i.type = QDeclarativeInstruction::StoreSize;
+        i.storeRealPair.propertyIndex = 15;
+        i.storeRealPair.valueIndex = 8;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 19;
+        i.type = QDeclarativeInstruction::StoreSizeF;
+        i.storeRealPair.propertyIndex = 16;
+        i.storeRealPair.valueIndex = 99;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 20;
+        i.type = QDeclarativeInstruction::StoreRect;
+        i.storeRect.propertyIndex = 17;
+        i.storeRect.valueIndex = 2;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 21;
+        i.type = QDeclarativeInstruction::StoreRectF;
+        i.storeRect.propertyIndex = 18;
+        i.storeRect.valueIndex = 19;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 22;
+        i.type = QDeclarativeInstruction::StoreVector3D;
+        i.storeVector3D.propertyIndex = 19;
+        i.storeVector3D.valueIndex = 9;
+        data->bytecode << i;
+    }
+
+    {
+        data->primitives << "color(1, 1, 1, 1)";
+        QDeclarativeInstruction i;
+        i.line = 23;
+        i.type = QDeclarativeInstruction::StoreVariant;
+        i.storeString.propertyIndex = 20;
+        i.storeString.value = 3;
+
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 24;
+        i.type = QDeclarativeInstruction::StoreObject;
+        i.storeObject.propertyIndex = 21;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 25;
+        i.type = QDeclarativeInstruction::StoreVariantObject;
+        i.storeObject.propertyIndex = 22;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 26;
+        i.type = QDeclarativeInstruction::StoreInterface;
+        i.storeObject.propertyIndex = 23;
+        data->bytecode << i;
+    }
+
+    {
+        data->primitives << "console.log(1921)";
+
+        QDeclarativeInstruction i;
+        i.line = 27;
+        i.type = QDeclarativeInstruction::StoreSignal;
+        i.storeSignal.signalIndex = 2;
+        i.storeSignal.value = 4;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 28;
+        i.type = QDeclarativeInstruction::StoreScript;
+        i.storeScript.value = 2;
+        //i.storeScript.fileName = 18;
+        //i.storeScript.lineNumber = 28;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 29;
+        i.type = QDeclarativeInstruction::StoreScriptString;
+        i.storeScriptString.propertyIndex = 24;
+        i.storeScriptString.value = 3;
+        i.storeScriptString.scope = 1;
+        data->bytecode << i;
+    }
+
+    {
+        data->datas << "mySignal";
+
+        QDeclarativeInstruction i;
+        i.line = 30;
+        i.type = QDeclarativeInstruction::AssignSignalObject;
+        i.assignSignalObject.signal = 0;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 31;
+        i.type = QDeclarativeInstruction::AssignCustomType;
+        i.assignCustomType.propertyIndex = 25;
+        i.assignCustomType.valueIndex = 4;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 32;
+        i.type = QDeclarativeInstruction::StoreBinding;
+        i.assignBinding.property = 26;
+        i.assignBinding.value = 3;
+        i.assignBinding.context = 2;
+        i.assignBinding.owner = 0;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 33;
+        i.type = QDeclarativeInstruction::StoreCompiledBinding;
+        i.assignBinding.property = 27;
+        i.assignBinding.value = 2;
+        i.assignBinding.context = 4;
+        i.assignBinding.owner = 0;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 34;
+        i.type = QDeclarativeInstruction::StoreValueSource;
+        i.assignValueSource.property = 29;
+        i.assignValueSource.owner = 1;
+        i.assignValueSource.castValue = 4;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 35;
+        i.type = QDeclarativeInstruction::StoreValueInterceptor;
+        i.assignValueInterceptor.property = 30;
+        i.assignValueInterceptor.owner = 2;
+        i.assignValueInterceptor.castValue = -4;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 36;
+        i.type = QDeclarativeInstruction::BeginObject;
+        i.begin.castValue = 4;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 38;
+        i.type = QDeclarativeInstruction::StoreObjectQList;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 39;
+        i.type = QDeclarativeInstruction::AssignObjectList;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 40;
+        i.type = QDeclarativeInstruction::FetchAttached;
+        i.fetchAttached.id = 23;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 42;
+        i.type = QDeclarativeInstruction::FetchQList;
+        i.fetch.property = 32;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 43;
+        i.type = QDeclarativeInstruction::FetchObject;
+        i.fetch.property = 33;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 44;
+        i.type = QDeclarativeInstruction::FetchValueType;
+        i.fetchValue.property = 34;
+        i.fetchValue.type = 6;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 45;
+        i.type = QDeclarativeInstruction::PopFetchedObject;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 46;
+        i.type = QDeclarativeInstruction::PopQList;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 47;
+        i.type = QDeclarativeInstruction::PopValueType;
+        i.fetchValue.property = 35;
+        i.fetchValue.type = 8;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 48;
+        i.type = QDeclarativeInstruction::Defer;
+        i.defer.deferCount = 7;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = -1;
+        i.type = QDeclarativeInstruction::Defer;
+        i.defer.deferCount = 7;
+        data->bytecode << i;
+    }
+
+    {
+        QDeclarativeInstruction i;
+        i.line = 50;
+        i.type = (QDeclarativeInstruction::Type)(QDeclarativeInstruction::Defer + 1); // Non-existant
+        data->bytecode << i;
+    }
+
+    QStringList expect;
+    expect 
+        << "Index\tLine\tOperation\t\tData1\tData2\tData3\tComments"
+        << "-------------------------------------------------------------------------------"
+        << "0\t\t0\tINIT\t\t\t0\t3\t-1\t-1"
+        << "1\t\t1\tCREATE\t\t\t0\t\t\t\"Test\""
+        << "2\t\t2\tSETID\t\t\t0\t\t\t\"testId\""
+        << "3\t\t3\tSET_DEFAULT"
+        << "4\t\t4\tCREATE_COMPONENT\t3"
+        << "5\t\t5\tSTORE_META\t\t3"
+        << "6\t\t6\tSTORE_FLOAT\t\t3\t11.3"
+        << "7\t\t7\tSTORE_DOUBLE\t\t4\t14.8"
+        << "8\t\t8\tSTORE_INTEGER\t\t5\t9"
+        << "9\t\t9\tSTORE_BOOL\t\t6\ttrue"
+        << "10\t\t10\tSTORE_STRING\t\t7\t1\t\t\"Test String\""
+        << "11\t\t11\tSTORE_URL\t\t8\t2\t\t\"http://www.nokia.com\""
+        << "12\t\t12\tSTORE_COLOR\t\t9\t\t\t\"ff00ff00\""
+        << "13\t\t13\tSTORE_DATE\t\t10\t9"
+        << "14\t\t14\tSTORE_TIME\t\t11\t33"
+        << "15\t\t15\tSTORE_DATETIME\t\t12\t44"
+        << "16\t\t16\tSTORE_POINT\t\t13\t3"
+        << "17\t\t17\tSTORE_POINTF\t\t14\t9"
+        << "18\t\t18\tSTORE_SIZE\t\t15\t8"
+        << "19\t\t19\tSTORE_SIZEF\t\t16\t99"
+        << "20\t\t20\tSTORE_RECT\t\t17\t2"
+        << "21\t\t21\tSTORE_RECTF\t\t18\t19"
+        << "22\t\t22\tSTORE_VECTOR3D\t\t19\t9"
+        << "23\t\t23\tSTORE_VARIANT\t\t20\t3\t\t\"color(1, 1, 1, 1)\""
+        << "24\t\t24\tSTORE_OBJECT\t\t21"
+        << "25\t\t25\tSTORE_VARIANT_OBJECT\t22"
+        << "26\t\t26\tSTORE_INTERFACE\t\t23"
+        << "27\t\t27\tSTORE_SIGNAL\t\t2\t4\t\t\"console.log(1921)\""
+        << "28\t\t28\tSTORE_SCRIPT\t\t2"
+        << "29\t\t29\tSTORE_SCRIPT_STRING\t24\t3\t1"
+        << "30\t\t30\tASSIGN_SIGNAL_OBJECT\t0\t\t\t\"mySignal\""
+        << "31\t\t31\tASSIGN_CUSTOMTYPE\t25\t4"
+        << "32\t\t32\tSTORE_BINDING\t26\t3\t2"
+        << "33\t\t33\tSTORE_COMPILED_BINDING\t27\t2\t4"
+        << "34\t\t34\tSTORE_VALUE_SOURCE\t29\t4"
+        << "35\t\t35\tSTORE_VALUE_INTERCEPTOR\t30\t-4"
+        << "36\t\t36\tBEGIN\t\t\t4"
+        << "37\t\t38\tSTORE_OBJECT_QLIST"
+        << "38\t\t39\tASSIGN_OBJECT_LIST"
+        << "39\t\t40\tFETCH_ATTACHED\t\t23"
+        << "40\t\t42\tFETCH_QLIST\t\t32"
+        << "41\t\t43\tFETCH\t\t\t33"
+        << "42\t\t44\tFETCH_VALUE\t\t34\t6"
+        << "43\t\t45\tPOP"
+        << "44\t\t46\tPOP_QLIST"
+        << "45\t\t47\tPOP_VALUE\t\t35\t8"
+        << "46\t\t48\tDEFER\t\t\t7"
+        << "47\t\tNA\tDEFER\t\t\t7"
+        << "48\t\t50\tXXX UNKOWN INSTRUCTION\t47"
+        << "-------------------------------------------------------------------------------";
+
+    messages = QStringList();
+    QtMsgHandler old = qInstallMsgHandler(msgHandler);
+    data->dumpInstructions();
+    qInstallMsgHandler(old);
+
+    QCOMPARE(messages.count(), expect.count());
+    for (int ii = 0; ii < messages.count(); ++ii) {
+        QCOMPARE(messages.at(ii), expect.at(ii));
+    }
+
+    data->release();
+}
+
+QTEST_MAIN(tst_qmlinstruction)
+
+#include "tst_qdeclarativeinstruction.moc"
diff --git a/tests/auto/declarative/qdeclarativeitem/data/keynavigation.qml b/tests/auto/declarative/qdeclarativeitem/data/keynavigation.qml
new file mode 100644
index 0000000..9281a17
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeitem/data/keynavigation.qml
@@ -0,0 +1,39 @@
+import Qt 4.6
+
+Grid {
+    columns: 2
+    width: 100; height: 100
+    Rectangle {
+        id: item1
+        objectName: "item1"
+        focus: true
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.right: item2
+        KeyNavigation.down: item3
+    }
+    Rectangle {
+        id: item2
+        objectName: "item2"
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.left: item1
+        KeyNavigation.down: item4
+    }
+    Rectangle {
+        id: item3
+        objectName: "item3"
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.right: item4
+        KeyNavigation.up: item1
+    }
+    Rectangle {
+        id: item4
+        objectName: "item4"
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.left: item3
+        KeyNavigation.up: item2
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeitem/data/keys.qml b/tests/auto/declarative/qdeclarativeitem/data/keys.qml
new file mode 100644
index 0000000..f3c1f7b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeitem/data/keys.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Item {
+    focus: true
+    Keys.onPressed: keysTestObject.keyPress(event.key, event.text, event.modifiers)
+    Keys.onReleased: { keysTestObject.keyRelease(event.key, event.text, event.modifiers); event.accepted = true; }
+    Keys.onReturnPressed: keysTestObject.keyPress(event.key, "Return", event.modifiers)
+    Keys.onDigit0Pressed: keysTestObject.keyPress(event.key, event.text, event.modifiers)
+    Keys.onDigit9Pressed: { event.accepted = false; keysTestObject.keyPress(event.key, event.text, event.modifiers) }
+    Keys.forwardTo: [ item2 ]
+    Keys.enabled: enableKeyHanding
+
+    Item {
+        id: item2
+        Keys.onPressed: keysTestObject.forwardedKey(event.key)
+        Keys.onReleased: keysTestObject.forwardedKey(event.key)
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro
new file mode 100644
index 0000000..0eb2141
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeitem.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
new file mode 100644
index 0000000..9feabdb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -0,0 +1,318 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtTest/QSignalSpy>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <QtDeclarative/qdeclarativeitem.h>
+
+class tst_QmlGraphicsItem : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_QmlGraphicsItem();
+
+private slots:
+    void keys();
+    void keyNavigation();
+    void smooth();
+    void clip();
+
+private:
+    template<typename T>
+    T *findItem(QGraphicsObject *parent, const QString &objectName);
+    QDeclarativeEngine engine;
+};
+
+class KeysTestObject : public QObject
+{
+    Q_OBJECT
+public:
+    KeysTestObject() : mKey(0), mModifiers(0), mForwardedKey(0) {}
+
+    void reset() {
+        mKey = 0;
+        mText = QString();
+        mModifiers = 0;
+        mForwardedKey = 0;
+    }
+
+public slots:
+    void keyPress(int key, QString text, int modifiers) {
+        mKey = key;
+        mText = text;
+        mModifiers = modifiers;
+    }
+    void keyRelease(int key, QString text, int modifiers) {
+        mKey = key;
+        mText = text;
+        mModifiers = modifiers;
+    }
+    void forwardedKey(int key) {
+        mForwardedKey = key;
+    }
+
+public:
+    int mKey;
+    QString mText;
+    int mModifiers;
+    int mForwardedKey;
+
+private:
+};
+
+
+tst_QmlGraphicsItem::tst_QmlGraphicsItem()
+{
+}
+
+void tst_QmlGraphicsItem::keys()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    KeysTestObject *testObject = new KeysTestObject;
+    canvas->rootContext()->setContextProperty("keysTestObject", testObject);
+
+    canvas->rootContext()->setContextProperty("enableKeyHanding", QVariant(true));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keys.qml"));
+    canvas->show();
+    qApp->processEvents();
+
+    QEvent wa(QEvent::WindowActivate);
+    QApplication::sendEvent(canvas, &wa);
+    QFocusEvent fe(QEvent::FocusIn);
+    QApplication::sendEvent(canvas, &fe);
+
+    QKeyEvent key(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, int(Qt::Key_A));
+    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A));
+    QCOMPARE(testObject->mText, QLatin1String("A"));
+    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QVERIFY(!key.isAccepted());
+
+    testObject->reset();
+
+    key = QKeyEvent(QEvent::KeyRelease, Qt::Key_A, Qt::ShiftModifier, "A", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, int(Qt::Key_A));
+    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A));
+    QCOMPARE(testObject->mText, QLatin1String("A"));
+    QVERIFY(testObject->mModifiers == Qt::ShiftModifier);
+    QVERIFY(key.isAccepted());
+
+    testObject->reset();
+
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, int(Qt::Key_Return));
+    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Return));
+    QCOMPARE(testObject->mText, QLatin1String("Return"));
+    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QVERIFY(key.isAccepted());
+
+    testObject->reset();
+
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_0, Qt::NoModifier, "0", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, int(Qt::Key_0));
+    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_0));
+    QCOMPARE(testObject->mText, QLatin1String("0"));
+    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QVERIFY(key.isAccepted());
+
+    testObject->reset();
+
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_9, Qt::NoModifier, "9", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, int(Qt::Key_9));
+    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_9));
+    QCOMPARE(testObject->mText, QLatin1String("9"));
+    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QVERIFY(!key.isAccepted());
+
+    testObject->reset();
+
+    canvas->rootContext()->setContextProperty("enableKeyHanding", QVariant(false));
+
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, 0);
+    QVERIFY(!key.isAccepted());
+
+    delete canvas;
+    delete testObject;
+}
+
+void tst_QmlGraphicsItem::keyNavigation()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keynavigation.qml"));
+    canvas->show();
+    qApp->processEvents();
+
+    QEvent wa(QEvent::WindowActivate);
+    QApplication::sendEvent(canvas, &wa);
+    QFocusEvent fe(QEvent::FocusIn);
+    QApplication::sendEvent(canvas, &fe);
+
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(canvas->rootObject(), "item1");
+    QVERIFY(item);
+    QVERIFY(item->hasFocus());
+
+    // right
+    QKeyEvent key(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item2");
+    QVERIFY(item);
+    QVERIFY(item->hasFocus());
+
+    // down
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item4");
+    QVERIFY(item);
+    QVERIFY(item->hasFocus());
+
+    // left
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item3");
+    QVERIFY(item);
+    QVERIFY(item->hasFocus());
+
+    // up
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item1");
+    QVERIFY(item);
+    QVERIFY(item->hasFocus());
+}
+
+void tst_QmlGraphicsItem::smooth()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6; Item { smooth: false; }", QUrl::fromLocalFile(""));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QSignalSpy spy(item, SIGNAL(smoothChanged()));
+
+    QVERIFY(item);
+    QVERIFY(!item->smooth());
+
+    item->setSmooth(true);
+    QVERIFY(item->smooth());
+    QCOMPARE(spy.count(),1);
+    item->setSmooth(true);
+    QCOMPARE(spy.count(),1);
+
+    item->setSmooth(false);
+    QVERIFY(!item->smooth());
+    QCOMPARE(spy.count(),2);
+    item->setSmooth(false);
+    QCOMPARE(spy.count(),2);
+}
+
+void tst_QmlGraphicsItem::clip()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6\nItem { clip: false\n }", QUrl::fromLocalFile(""));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QSignalSpy spy(item, SIGNAL(clipChanged()));
+
+    QVERIFY(item);
+    QVERIFY(!item->clip());
+
+    item->setClip(true);
+    QVERIFY(item->clip());
+    QCOMPARE(spy.count(),1);
+    item->setClip(true);
+    QCOMPARE(spy.count(),1);
+
+    item->setClip(false);
+    QVERIFY(!item->clip());
+    QCOMPARE(spy.count(),2);
+    item->setClip(false);
+    QCOMPARE(spy.count(),2);
+}
+
+template<typename T>
+T *tst_QmlGraphicsItem::findItem(QGraphicsObject *parent, const QString &objectName)
+{
+    if (!parent)
+        return 0;
+
+    const QMetaObject &mo = T::staticMetaObject;
+    //qDebug() << parent->QGraphicsObject::children().count() << "children";
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if(!item)
+            continue;
+        //qDebug() << "try" << item;
+        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName))
+            return static_cast<T*>(item);
+        item = findItem<T>(item, objectName);
+        if (item)
+            return static_cast<T*>(item);
+    }
+
+    return 0;
+}
+
+
+
+QTEST_MAIN(tst_QmlGraphicsItem)
+
+#include "tst_qdeclarativeitem.moc"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
new file mode 100644
index 0000000..55aa231
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    id: root
+    property int value: 1892
+    property alias aliasValue: root.value
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
new file mode 100644
index 0000000..6362b2d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
@@ -0,0 +1,9 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    property var other
+    other: MyTypeObject { id: obj }
+    property alias enumAlias: obj.enumProperty;
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
new file mode 100644
index 0000000..d1e78f8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
@@ -0,0 +1,12 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    property alias obj : otherObj
+    property var child
+    child: QtObject {
+        id: otherObj
+        property int myValue: 10
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
new file mode 100644
index 0000000..573674c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+import Qt 4.6
+
+Alias3 {}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml b/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
new file mode 100644
index 0000000..05fbc3f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Component {
+    QtObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
new file mode 100644
index 0000000..99d010f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
@@ -0,0 +1,4 @@
+import Qt 4.6
+
+QtObject {
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType2.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType2.qml
new file mode 100644
index 0000000..86210e9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType2.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyQmlObject {
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
new file mode 100644
index 0000000..d08f35b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    property int a
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType4.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType4.qml
new file mode 100644
index 0000000..a6a8168
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType4.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyQmlObject {
+    property int a
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
new file mode 100644
index 0000000..aefbf9a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+QtObject {
+    property int super_a: 10
+    property int super_c: 14
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
new file mode 100644
index 0000000..dc3b382
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
@@ -0,0 +1,9 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    property var child
+    child: QtObject { id: obj }
+    property alias objAlias: obj;
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/I18n.qml b/tests/auto/declarative/qdeclarativelanguage/data/I18n.qml
new file mode 100644
index 0000000..558c836
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/I18n.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    property int áâãäå: 10
+    stringProperty: "Test áâãäå: " + áâãäå
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/I18nType30.qml b/tests/auto/declarative/qdeclarativelanguage/data/I18nType30.qml
new file mode 100644
index 0000000..42dbc69
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/I18nType30.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    stringProperty: "Test áâãäå: 30"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/MyComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/MyComponent.qml
new file mode 100644
index 0000000..1a23277
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/MyComponent.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyQmlObject {
+    property real x;
+    property real y;
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/MyCompositeValueSource.qml b/tests/auto/declarative/qdeclarativelanguage/data/MyCompositeValueSource.qml
new file mode 100644
index 0000000..e620e26
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/MyCompositeValueSource.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyPropertyValueSource {
+    property int x
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/MyContainerComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/MyContainerComponent.qml
new file mode 100644
index 0000000..61f54c5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/MyContainerComponent.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyContainer {
+    property int x
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
new file mode 100644
index 0000000..5155612
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+QtObject {
+    property QtObject o1
+    property QtObject o2
+
+    property alias a: object2.a
+
+    o1: QtObject { id: object1 }
+    o2: QtObject { 
+        id: object2 
+        property int a: 1923
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
new file mode 100644
index 0000000..5cc8d20
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Item {
+    x: "You can't assign a string to a real!"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
new file mode 100644
index 0000000..2889caf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+import Qt 4.6
+
+MyQmlObject {
+    property int a: Math.max(10, 9)
+    property int b: 11 
+    Component.onCompleted: console.log("Completed " + a + " " + b);
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
new file mode 100644
index 0000000..500b0f6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    id: root
+    property int value: 10
+    property alias valueAlias: root.value
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.2.qml
new file mode 100644
index 0000000..5c92270
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.2.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+
+MyQmlObject {
+    id: root
+    property alias aliasObject: root.qmlobjectProperty
+
+    qmlobjectProperty: MyQmlObject { value : 10 }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
new file mode 100644
index 0000000..e059937
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+QtObject {
+   property var other
+   other: Alias { id: myAliasObject }
+
+   property alias value: myAliasObject.aliasValue
+   property alias value2: myAliasObject.value
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
new file mode 100644
index 0000000..bd6a769
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+Alias2 {
+    enumAlias: MyTypeObject.EnumVal2 
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
new file mode 100644
index 0000000..4316d0d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+import Test 1.0
+
+QtObject {
+    property alias otherAlias: otherObject
+
+    property var other 
+    other: MyQmlObject {
+        id: otherObject
+        value: 10
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
new file mode 100644
index 0000000..e3af230
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    property QtObject o;
+    property alias a: object.a
+    o: NestedAlias { id: object }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
new file mode 100644
index 0000000..a9a57eb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+QtObject {
+    property QtObject object
+    property alias aliasedObject: target.object
+
+    object: QtObject {
+        id: target
+
+        property QtObject object
+        object: QtObject {}
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
new file mode 100644
index 0000000..2b9ad85
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+   property var other
+   other: Alias3 { id: myAliasObject }
+
+   property int value: myAliasObject.obj.myValue
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
new file mode 100644
index 0000000..a2a41a1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+   property var other
+   other: Alias4 { id: myAliasObject }
+
+   property int value: myAliasObject.obj.myValue
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
new file mode 100644
index 0000000..c86c96b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
@@ -0,0 +1,29 @@
+import Test 1.0
+MyTypeObject {
+    flagProperty: "FlagVal1 | FlagVal3"
+    enumProperty: "EnumVal2"
+    stringProperty: "Hello World!"
+    uintProperty: 10
+    intProperty: -19
+    realProperty: 23.2
+    doubleProperty: -19.7
+    floatProperty: 8.5
+    colorProperty: "red"
+    dateProperty: "1982-11-25"
+    timeProperty: "11:11:31"
+    timeProperty: "11:11:32"
+    timeProperty: "11:11:32" 
+    dateTimeProperty: "2009-05-12T13:22:01"
+    pointProperty: "99,13"
+    pointFProperty: "-10.1,12.3"
+    sizeProperty: "99x13"
+    sizeFProperty: "0.1x0.2"
+    rectProperty: "9,7,100x200"
+    rectFProperty: "1000.1,-10.9,400x90.99"
+    boolProperty: true
+    variantProperty: "Hello World!"
+    vectorProperty: "10,1,2.2"
+    urlProperty: "main.qml"
+
+    objectProperty: MyTypeObject { intProperty: 8 }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
new file mode 100644
index 0000000..f6422bd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+import Test 1.0
+
+QtObject {
+    property QtObject myProperty
+    property QtObject myProperty2
+    property QtObject myProperty3
+    property QtObject myProperty4
+    property MyQmlObject myProperty5
+    property MyQmlObject myProperty6
+
+    myProperty: CompositeType {}
+    myProperty2: CompositeType2 {}
+    myProperty3: CompositeType3 {}
+    myProperty4: CompositeType4 {}
+    myProperty5: CompositeType2 {}
+    myProperty6: CompositeType4 {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralSignalProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralSignalProperty.qml
new file mode 100644
index 0000000..399fcea
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralSignalProperty.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    onLiteralSignal: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToSignal.qml
new file mode 100644
index 0000000..789cc66
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToSignal.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    onBasicSignal: MyQmlObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
new file mode 100644
index 0000000..0ff9370
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    property var a;
+    a: MyQmlObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignQmlComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignQmlComponent.qml
new file mode 100644
index 0000000..20bdc55
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignQmlComponent.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyContainer {
+    MyComponent { x: 10; y: 11; }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignSignal.qml
new file mode 100644
index 0000000..2a48df8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignSignal.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyQmlObject {
+    onBasicSignal: basicSlot()
+    onBasicParameterizedSignal: basicSlotWithArgs(parameter)
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignTypeExtremes.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignTypeExtremes.qml
new file mode 100644
index 0000000..60ede52
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignTypeExtremes.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    uintProperty: 4000000000
+    intProperty: -2000000000
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
new file mode 100644
index 0000000..b46ec34
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+import Test 1.0 as Namespace
+import Qt 4.6
+
+QtObject {
+    MyQmlObject.value: 10
+    Namespace.MyQmlObject.value2: 13
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/autoComponentCreation.qml b/tests/auto/declarative/qdeclarativelanguage/data/autoComponentCreation.qml
new file mode 100644
index 0000000..5d00144
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/autoComponentCreation.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyTypeObject {
+    componentProperty : MyTypeObject { realProperty: 9 }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.1.errors.txt
new file mode 100644
index 0000000..091aad6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.1.errors.txt
@@ -0,0 +1 @@
+3:1:Cannot create empty component specification
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
new file mode 100644
index 0000000..07e463a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
@@ -0,0 +1,4 @@
+import Qt 4.6
+
+Component {
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.2.errors.txt
new file mode 100644
index 0000000..76e7656
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.2.errors.txt
@@ -0,0 +1 @@
+6:9:id is not unique
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
new file mode 100644
index 0000000..88e0f73
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+Item {
+    id: myId
+    Component {
+        id: myId
+        QtObject {}
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
new file mode 100644
index 0000000..9a13142
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
@@ -0,0 +1 @@
+6:9:Invalid component id specification
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
new file mode 100644
index 0000000..287a959
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+Item {
+    Component {
+        id: myId
+        id: myId2
+        QtObject {}
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.4.errors.txt
new file mode 100644
index 0000000..2ab18685
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.4.errors.txt
@@ -0,0 +1 @@
+3:1:Invalid component body specification
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
new file mode 100644
index 0000000..ab1e29b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Component {
+    QtObject {}
+    QtObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.5.errors.txt
new file mode 100644
index 0000000..e3c2df7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.5.errors.txt
@@ -0,0 +1 @@
+4:5:Component elements may not contain properties other than id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
new file mode 100644
index 0000000..629e998
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Component {
+    x: 10
+    QtObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.6.errors.txt
new file mode 100644
index 0000000..2b1c6ca
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.6.errors.txt
@@ -0,0 +1 @@
+4:5:Invalid component id specification
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
new file mode 100644
index 0000000..2303ebf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Component {
+    id: QtObject {}
+    QtObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
new file mode 100644
index 0000000..0a7249a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    property var test
+
+    test: ComponentComposite {}
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.2.qml
new file mode 100644
index 0000000..e3b32ca
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.2.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MySecondNamespacedType {
+    list: [ MyNamespacedType {} ]
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.qml b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.qml
new file mode 100644
index 0000000..e1daf3b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+
+MyNamespacedType {
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml b/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
new file mode 100644
index 0000000..a22c776
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    objectName: "Hello" + "World"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.errors.txt
new file mode 100644
index 0000000..43a8bb2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.errors.txt
@@ -0,0 +1 @@
+4:19:ListElement: cannot use reserved "id" property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
new file mode 100644
index 0000000..00cc0c4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+ListModel {
+    ListElement { a: 10 }
+    ListElement { id: foo; a: 12 }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
new file mode 100644
index 0000000..cf2f272
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+ListModel {
+    ListElement { a: 10 }
+    ListElement { a: 12 }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customVariantTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/customVariantTypes.qml
new file mode 100644
index 0000000..0263ed2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customVariantTypes.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    customType: "10"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml b/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
new file mode 100644
index 0000000..3987a3c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    property int a: 10
+    property int b: 10 + a
+    property QtObject c: QtObject {}
+    property list<QtObject> d: [ QtObject {}, QtObject {} ]
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.errors.txt
new file mode 100644
index 0000000..945d51b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.errors.txt
@@ -0,0 +1 @@
+7:9:Invalid value in grouped property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
new file mode 100644
index 0000000..0fd1404
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
@@ -0,0 +1,10 @@
+import Test 1.0
+import Qt 4.6
+
+MyTypeObject {
+    grouped {
+        script: console.log(1921)
+        QtObject {}
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
new file mode 100644
index 0000000..3651511
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
@@ -0,0 +1,29 @@
+import Test 1.0
+import Qt 4.6
+
+MyContainer {
+    QtObject {
+        property int index: 0
+    }
+
+    QtObject {
+        property int index: 1
+    }
+
+    children: [
+        QtObject {
+            property int index: 2
+        }, 
+        QtObject {
+            property int index: 3
+        } 
+    ]
+
+    QtObject {
+        property int index: 4
+    }
+
+    QtObject {
+        property int index: 5
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.errors.txt
new file mode 100644
index 0000000..2aea251
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.errors.txt
@@ -0,0 +1 @@
+5:5:Incorrectly specified signal
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.qml
new file mode 100644
index 0000000..fb07b9f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+
+MyQmlObject {
+    onBasicSignal: console.log(1921)
+    onBasicSignal: console.log(1921)
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.errors.txt
new file mode 100644
index 0000000..66241cf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.errors.txt
@@ -0,0 +1 @@
+4:19:id is not unique
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.qml b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.qml
new file mode 100644
index 0000000..a993abd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+MyContainer {
+    MyQmlObject { id: myID }
+    MyQmlObject { id: myID }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
new file mode 100644
index 0000000..85d1052
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+import Qt 4.6
+PropertyChanges {
+    propa: a + 10
+    propb: Math.min(a, 10)
+    propc: MyPropertyValueSource {}
+    onPropA: a
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
new file mode 100644
index 0000000..c80a7c0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
@@ -0,0 +1,13 @@
+import Test 1.0
+import Qt 4.6
+import Qt 4.6 as Qt
+
+QtObject {
+    property QtObject objectProperty
+    property QtObject objectProperty2
+    objectProperty2: QtObject {}
+
+    property MyComponent myComponentProperty
+    property MyComponent myComponentProperty2 
+    myComponentProperty2: MyComponent {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
new file mode 100644
index 0000000..aef3269
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
@@ -0,0 +1,14 @@
+import Test 1.0
+import Qt 4.6
+QtObject {
+    default property int intProperty : 10
+    property bool boolProperty: false
+    property double doubleProperty: -10.1
+    property real realProperty: -19.9
+    property string stringProperty: "Hello World!"
+    property color colorProperty: "red"
+    property url urlProperty: "main.qml"
+    property date dateProperty: "1945-09-02"
+    property var varProperty: "Hello World!"
+    property variant variantProperty: 12
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
new file mode 100644
index 0000000..7bfab67
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+DynamicPropertiesNestedType {
+    property int a: 13
+    property int b: 12
+
+    super_a: 11
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
new file mode 100644
index 0000000..2a834e8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+QtObject {
+    signal signal1
+    function slot1() {}
+    signal signal2
+    function slot2() {}
+
+    property int test: 0
+    function slot3(a) { console.log(1921); test = a; }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/empty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/empty.errors.txt
new file mode 100644
index 0000000..d416e76
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/empty.errors.txt
@@ -0,0 +1,2 @@
+0:0:Expected token `numeric literal'
+0:0:Expected a qualified name id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/empty.qml b/tests/auto/declarative/qdeclarativelanguage/data/empty.qml
new file mode 100644
index 0000000..e69de29
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
new file mode 100644
index 0000000..353bbf5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
@@ -0,0 +1 @@
+4:5:Empty signal assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
new file mode 100644
index 0000000..4c5a122
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyQmlObject {
+    onBasicSignal: " " 
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/failingComponent.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/failingComponent.errors.txt
new file mode 100644
index 0000000..0cf0ef3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/failingComponent.errors.txt
@@ -0,0 +1 @@
+3:5:Type FailingComponent unavailable
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/failingComponentTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/failingComponentTest.qml
new file mode 100644
index 0000000..74a6acf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/failingComponentTest.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyContainer {
+    FailingComponent {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.errors.txt
new file mode 100644
index 0000000..3074823
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.errors.txt
@@ -0,0 +1 @@
+3:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.qml
new file mode 100644
index 0000000..d971eee
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    value.something: "hello"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.errors.txt
new file mode 100644
index 0000000..49e06cb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.errors.txt
@@ -0,0 +1 @@
+3:5:Cannot override FINAL property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.qml b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.qml
new file mode 100644
index 0000000..a84393a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    property int value: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyNames.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyNames.qml
new file mode 100644
index 0000000..558c836
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyNames.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    property int áâãäå: 10
+    stringProperty: "Test áâãäå: " + áâãäå
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyUse.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyUse.qml
new file mode 100644
index 0000000..74918e2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyUse.qml
@@ -0,0 +1,3 @@
+I18n {
+    áâãäå: 15
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nNameSpace.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nNameSpace.qml
new file mode 100644
index 0000000..c0b2f94
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nNameSpace.qml
@@ -0,0 +1,5 @@
+import Test 1.0 as Áâãäå
+
+Áâãäå.MyTypeObject {
+    stringProperty: "Test áâãäå: 40"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
new file mode 100644
index 0000000..942ed90
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
@@ -0,0 +1,12 @@
+import Test 1.0
+
+MyTypeObject {
+    Script {
+        function val() {
+            var áâãäå = 20
+            return "Test áâãäå: " + áâãäå
+        }
+        
+    }
+    stringProperty: val()
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nStrings.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nStrings.qml
new file mode 100644
index 0000000..764c926
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nStrings.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    stringProperty: "Test áâãäå (5 accented 'a' letters)"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/i18nType.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nType.qml
new file mode 100644
index 0000000..d7954ef
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nType.qml
@@ -0,0 +1 @@
+I18nTypeÁâãäå { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
new file mode 100644
index 0000000..90c1483
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+MyContainer {
+    property var object : myObjectId
+
+    MyTypeObject {
+        id: "myObjectId"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.errors.txt
new file mode 100644
index 0000000..231998d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.errors.txt
@@ -0,0 +1 @@
+4:1:Namespace Rectangle cannot be used as a type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
new file mode 100644
index 0000000..cd112af
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
@@ -0,0 +1,4 @@
+import Test 1.0 as Rectangle
+import Qt 4.6
+
+Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.errors.txt
new file mode 100644
index 0000000..c7d880e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.errors.txt
@@ -0,0 +1 @@
+1:16:Library import requires a version
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.qml b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.qml
new file mode 100644
index 0000000..23ed566
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.qml
@@ -0,0 +1,7 @@
+import Test as S
+
+S.MyQmlObject {
+    property real x;
+    property real y;
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
new file mode 100644
index 0000000..89e58ee
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
@@ -0,0 +1 @@
+1:35:Library import requires a version
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
new file mode 100644
index 0000000..97ec222
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
@@ -0,0 +1,3 @@
+import com.nokia.installedtest as T
+
+T.InstalledTest {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml b/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
new file mode 100644
index 0000000..478f06a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
@@ -0,0 +1,10 @@
+import Test 1.0
+import Qt 4.6
+MyContainer {
+    Component {
+        id: myComponent
+        MyQmlObject {
+            value: 11
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
new file mode 100644
index 0000000..70879ff
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+import Qt 4.6
+MyQmlObject {
+    interfaceProperty: MyQmlObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
new file mode 100644
index 0000000..c87dfae
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+MyContainer {
+    qlistInterfaces: [ 
+        MyQmlObject {},
+        MyQmlObject {}
+    ]
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.errors.txt
new file mode 100644
index 0000000..492bbb4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.errors.txt
@@ -0,0 +1 @@
+5:17:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
new file mode 100644
index 0000000..324f79c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    MyQmlObject.foo: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.errors.txt
new file mode 100644
index 0000000..ff2409b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.errors.txt
@@ -0,0 +1 @@
+5:15:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
new file mode 100644
index 0000000..b768e9f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
@@ -0,0 +1,6 @@
+import Test 1.0 as Namespace
+import Qt 4.6
+
+QtObject {
+    Namespace.MadeUpClass.foo: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.errors.txt
new file mode 100644
index 0000000..fee5050
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.errors.txt
@@ -0,0 +1 @@
+5:15:Not an attached property name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
new file mode 100644
index 0000000..7b782be
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
@@ -0,0 +1,7 @@
+import Test 1.0 as Namespace
+import Qt 4.6
+
+QtObject {
+    Namespace.madeUpClass.foo: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.errors.txt
new file mode 100644
index 0000000..34de769
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.errors.txt
@@ -0,0 +1 @@
+5:27:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
new file mode 100644
index 0000000..1f47c61
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
@@ -0,0 +1,6 @@
+import Test 1.0 as Namespace
+import Qt 4.6
+
+QtObject {
+    Namespace.MyQmlObject.foo: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.errors.txt
new file mode 100644
index 0000000..05161c4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.errors.txt
@@ -0,0 +1 @@
+5:5:Invalid attached object assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
new file mode 100644
index 0000000..79c2981
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    MyQmlObject: 10
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.errors.txt
new file mode 100644
index 0000000..a208bcf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.errors.txt
@@ -0,0 +1 @@
+5:15:Invalid attached object assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
new file mode 100644
index 0000000..af0be80
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
@@ -0,0 +1,7 @@
+import Test 1.0 as Namespace
+import Qt 4.6
+
+QtObject {
+    Namespace.MyQmlObject: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.errors.txt
new file mode 100644
index 0000000..05161c4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.errors.txt
@@ -0,0 +1 @@
+5:5:Invalid attached object assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
new file mode 100644
index 0000000..0546322
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    MyQmlObject: QtObject {}
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.errors.txt
new file mode 100644
index 0000000..6770e1f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.errors.txt
@@ -0,0 +1 @@
+5:5:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
new file mode 100644
index 0000000..108109a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    Test.MyQmlObject: QtObject {}
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.errors.txt
new file mode 100644
index 0000000..6770e1f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.errors.txt
@@ -0,0 +1 @@
+5:5:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
new file mode 100644
index 0000000..ccf0353
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    MyTypeObject.foo: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.errors.txt
new file mode 100644
index 0000000..ff2409b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.errors.txt
@@ -0,0 +1 @@
+5:15:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
new file mode 100644
index 0000000..e736379
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
@@ -0,0 +1,6 @@
+import Test 1.0 as Namespace
+import Qt 4.6
+
+QtObject {
+    Namespace.MyTypeObject.foo: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.errors.txt
new file mode 100644
index 0000000..6770e1f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.errors.txt
@@ -0,0 +1 @@
+5:5:Non-existent attached object
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
new file mode 100644
index 0000000..a095229
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    MadeUpClass.foo: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.errors.txt
new file mode 100644
index 0000000..810fd31
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.errors.txt
@@ -0,0 +1 @@
+5:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
new file mode 100644
index 0000000..1167e39
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
@@ -0,0 +1,6 @@
+import Qt 4.6 
+
+QtObject {
+    property var o;
+    o.blah: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.errors.txt
new file mode 100644
index 0000000..810fd31
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.errors.txt
@@ -0,0 +1 @@
+5:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
new file mode 100644
index 0000000..a0c8306
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
@@ -0,0 +1,7 @@
+import Qt 4.6 
+
+QtObject {
+    property int o;
+    o.blah: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.errors.txt
new file mode 100644
index 0000000..f6d6f29
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.errors.txt
@@ -0,0 +1 @@
+4:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.qml
new file mode 100644
index 0000000..0bbfc4f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyQmlObject {
+    customType.x: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
new file mode 100644
index 0000000..69c6871
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
@@ -0,0 +1 @@
+4:5:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.qml
new file mode 100644
index 0000000..134fef9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyQmlObject {
+    foo.x: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.errors.txt
new file mode 100644
index 0000000..2c8a970
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.errors.txt
@@ -0,0 +1 @@
+4:18:Property assignment expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.qml
new file mode 100644
index 0000000..55cefe6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    rectProperty.x.foo: 100
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.errors.txt
new file mode 100644
index 0000000..8331725
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.errors.txt
@@ -0,0 +1 @@
+5:18:Single property assignment expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.qml
new file mode 100644
index 0000000..9ec33ab
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    rectProperty.x: 100
+    rectProperty.x: 101
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.errors.txt
new file mode 100644
index 0000000..4a7e383
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.errors.txt
@@ -0,0 +1 @@
+4:-1:Cannot set properties on nullGrouped as it is null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.qml
new file mode 100644
index 0000000..977539a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    nullGrouped.script: console.log(1921)
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.errors.txt
new file mode 100644
index 0000000..56e3eeb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.errors.txt
@@ -0,0 +1,2 @@
+3:5:"" is not a valid object id
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.qml
new file mode 100644
index 0000000..4fb3b29
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyQmlObject {
+    id: ""
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.errors.txt
new file mode 100644
index 0000000..bb811cf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.errors.txt
@@ -0,0 +1 @@
+3:5:Invalid use of id property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.qml
new file mode 100644
index 0000000..6684172
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyQmlObject {
+    id.other: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.errors.txt
new file mode 100644
index 0000000..cfe8756
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.errors.txt
@@ -0,0 +1 @@
+4:5:Invalid use of id property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.qml
new file mode 100644
index 0000000..86010bf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+MyQmlObject {
+    id: hello
+    id: world
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.errors.txt
new file mode 100644
index 0000000..c167de3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.errors.txt
@@ -0,0 +1 @@
+2:20:Invalid import qualifier ID
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.qml
new file mode 100644
index 0000000..5b92a1a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+import Test 1.0 as hello
+MyQmlObject {
+    id: hello
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.errors.txt
new file mode 100644
index 0000000..160e8b5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.errors.txt
@@ -0,0 +1 @@
+3:5:"StartsWithUpperCase" is not a valid object id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.qml
new file mode 100644
index 0000000..62187d9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyQmlObject {
+    id: StartsWithUpperCase
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.errors.txt
new file mode 100644
index 0000000..1ca678c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.errors.txt
@@ -0,0 +1 @@
+3:5:"1" is not a valid object id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidID.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.qml
new file mode 100644
index 0000000..04db3eb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    id: 1
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
new file mode 100644
index 0000000..a65f5fd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
@@ -0,0 +1 @@
+2:18:Invalid import qualifier ID
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
new file mode 100644
index 0000000..30d88d5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
@@ -0,0 +1,4 @@
+import Qt 4.6
+import Qt 4.6 as qt
+
+QtObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.errors.txt
new file mode 100644
index 0000000..4bcc948
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.errors.txt
@@ -0,0 +1 @@
+1:1:Expected type name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.qml
new file mode 100644
index 0000000..427827c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.qml
@@ -0,0 +1,2 @@
+foo {
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
new file mode 100644
index 0000000..d8a22a8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
@@ -0,0 +1,2 @@
+import Qt 4.6
+Rectangle {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
new file mode 100644
index 0000000..a0706ad
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
@@ -0,0 +1,2 @@
+import Qt 4.6
+Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
new file mode 100644
index 0000000..93c7630
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
@@ -0,0 +1,2 @@
+import Qt 4.6
+Image {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir
new file mode 100644
index 0000000..eeb9a05
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir
@@ -0,0 +1,4 @@
+Rectangle 1.5 InstalledTest2.qml
+InstalledTest 1.4 InstalledTest2.qml
+InstalledTest 1.0 InstalledTest.qml
+InstalledTestTP 0.0 InstalledTest.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.errors.txt
new file mode 100644
index 0000000..8b40aa3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.errors.txt
@@ -0,0 +1,2 @@
+3:15:Cannot assign primitives to lists
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.qml
new file mode 100644
index 0000000..e3baadb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyContainer {
+    children: 2
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.errors.txt
new file mode 100644
index 0000000..8c7b7e9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.errors.txt
@@ -0,0 +1 @@
+4:15:Can only assign one binding to lists
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.qml
new file mode 100644
index 0000000..00c4c6b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+MyContainer {
+    children: childBinding.expression
+    children: childBinding2.expression
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml b/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
new file mode 100644
index 0000000..32b5b6c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
@@ -0,0 +1,38 @@
+import Qt 4.6
+
+Item {
+    ListModel {
+        id: fruitModel
+        ListElement {
+            name: "Apple"
+            cost: 2.45
+        }
+        ListElement {
+            name: "Orange"
+            cost: 3.25
+        }
+        ListElement {
+            name: "Banana"
+            cost: 1.95
+        }
+    }
+
+    Component {
+        id: fruitDelegate
+        Item {
+            width: 200; height: 50
+            Text { text: name }
+            Text { text: '$'+cost; anchors.right: parent.right }
+            MouseArea {
+                anchors.fill: parent
+                onClicked: fruitModel.remove(index)
+            }
+        }
+    }
+
+    ListView {
+        model: fruitModel
+        delegate: fruitDelegate
+        anchors.fill: parent
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
new file mode 100644
index 0000000..ba9e37c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+    property list<QtObject> listProperty
+    property int test: listProperty.length
+
+    listProperty: [ QtObject{}, QtObject {} ]
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingObject.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.errors.txt
new file mode 100644
index 0000000..b31b562
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.errors.txt
@@ -0,0 +1 @@
+1:10:Expected token `{'
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingObject.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.qml
new file mode 100644
index 0000000..2f17045
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.qml
@@ -0,0 +1 @@
+something: 24
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.errors.txt
new file mode 100644
index 0000000..f562246
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.errors.txt
@@ -0,0 +1 @@
+4:5:Cannot assign to non-existent property "onClicked"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
new file mode 100644
index 0000000..3bf75f6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+import Qt 4.6
+QtObject {
+    onClicked: console.log("Hello world!")
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.errors.txt
new file mode 100644
index 0000000..caf7e55
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.errors.txt
@@ -0,0 +1 @@
+4:18:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.qml
new file mode 100644
index 0000000..9a0fa6a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    rectProperty.foo: 9
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt
new file mode 100644
index 0000000..886da55
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt
@@ -0,0 +1,2 @@
+4:5:Unable to create type NestedErrorsType
+4:8:Invalid property assignment: double expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
new file mode 100644
index 0000000..c0d755a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Item {
+    NestedErrorsType {}
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.errors.txt
new file mode 100644
index 0000000..6bfce9a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.errors.txt
@@ -0,0 +1 @@
+2:15:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.qml
new file mode 100644
index 0000000..df7406c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.qml
@@ -0,0 +1,2 @@
+import Test 1.0
+MyQmlObject { something: 24 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.errors.txt
new file mode 100644
index 0000000..4b30056
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.errors.txt
@@ -0,0 +1 @@
+3:5:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.qml
new file mode 100644
index 0000000..06ccd37
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    something: 24
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.errors.txt
new file mode 100644
index 0000000..4b30056
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.errors.txt
@@ -0,0 +1 @@
+3:5:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
new file mode 100644
index 0000000..5b08608
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject { 
+    something: 1 + 1 
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.errors.txt
new file mode 100644
index 0000000..4b30056
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.errors.txt
@@ -0,0 +1 @@
+3:5:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.qml
new file mode 100644
index 0000000..6579191
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    something: ;
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.errors.txt
new file mode 100644
index 0000000..c07f2b9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.errors.txt
@@ -0,0 +1 @@
+3:5:Expected a qualified name id
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.qml
new file mode 100644
index 0000000..37af057
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    24
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.errors.txt
new file mode 100644
index 0000000..89925b7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.errors.txt
@@ -0,0 +1 @@
+3:5:Cannot assign to non-existent default property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.qml
new file mode 100644
index 0000000..5cd55d0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    MyQmlObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.errors.txt
new file mode 100644
index 0000000..07a4094
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.errors.txt
@@ -0,0 +1 @@
+3:-1:Cannot set properties on obj as it is null
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.qml
new file mode 100644
index 0000000..4e36779
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyDotPropertyObject {
+    obj.value: 1
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.errors.txt
new file mode 100644
index 0000000..db7d9c0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.errors.txt
@@ -0,0 +1 @@
+4:18:Unexpected object assignment
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.qml
new file mode 100644
index 0000000..9924773
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    rectProperty.x: MyTypeObject {}
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
new file mode 100644
index 0000000..5725f85
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
@@ -0,0 +1,17 @@
+import Test 1.0
+import Qt 4.6
+
+MyTypeObject {
+    // We set a and b to ensure that onCompleted is executed after bindings and
+    // constants have been assigned
+    property int a: Math.min(6, 7)
+    Component.onCompleted: console.log("Completed " + a + " " + nestedObject.b)
+
+    objectProperty: OnCompletedType {
+        qmlobjectProperty: MyQmlObject {
+            id: nestedObject
+            property int b: 10 
+            Component.onCompleted: console.log("Completed " + a + " " + nestedObject.b)
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.1.errors.txt
new file mode 100644
index 0000000..3ae6c46
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.1.errors.txt
@@ -0,0 +1 @@
+4:14:Expected property type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
new file mode 100644
index 0000000..cadc39a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    property blah a;
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.2.errors.txt
new file mode 100644
index 0000000..a18e21a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.2.errors.txt
@@ -0,0 +1 @@
+4:14:Unexpected property type modifier
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
new file mode 100644
index 0000000..e810c6c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+QtObject {
+    property invalidmodifier<int> a;
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.3.errors.txt
new file mode 100644
index 0000000..5e09a25
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.3.errors.txt
@@ -0,0 +1 @@
+4:14:Invalid property type modifier
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
new file mode 100644
index 0000000..04147c2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+QtObject {
+    property invalidmodifier<QtObject> a;
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.4.errors.txt
new file mode 100644
index 0000000..b447186
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.4.errors.txt
@@ -0,0 +1 @@
+5:1:Syntax error
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
new file mode 100644
index 0000000..b2ec482
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    readonly property int a
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.5.errors.txt
new file mode 100644
index 0000000..32a8dc1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.5.errors.txt
@@ -0,0 +1 @@
+4:5:Readonly not yet supported
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml
new file mode 100644
index 0000000..65fafbb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+QtObject {
+    readonly property int a: value
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
new file mode 100644
index 0000000..57a6070
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    intProperty : MyCompositeValueSource {}
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.qml
new file mode 100644
index 0000000..ad71fcf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyTypeObject {
+    intProperty : MyPropertyValueSource {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml
new file mode 100644
index 0000000..429c327
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+import Qt 4.6
+QtObject {
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml
new file mode 100644
index 0000000..0f57b61
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+import Qt 4.6
+QtObject {
+    MyQmlObject.value: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.errors.txt
new file mode 100644
index 0000000..b8c3404
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.errors.txt
@@ -0,0 +1 @@
+3:21:Invalid property assignment: "readOnlyString" is a read-only property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.qml
new file mode 100644
index 0000000..60757bd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    readOnlyString: "Hello World"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.errors.txt
new file mode 100644
index 0000000..d857a04
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.errors.txt
@@ -0,0 +1 @@
+3:5:Invalid property assignment: "readOnlyString" is a read-only property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.qml
new file mode 100644
index 0000000..8f1633c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    readOnlyString: "Hello" + "World"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.errors.txt
new file mode 100644
index 0000000..c7e9e1b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.errors.txt
@@ -0,0 +1 @@
+6:36:Invalid property assignment: "objAlias" is a read-only property
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
new file mode 100644
index 0000000..cd86a48
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+import Qt 4.6
+
+QtObject {
+    property var child
+    child: HelperAlias { objAlias: QtObject {} }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/rootAsQmlComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/rootAsQmlComponent.qml
new file mode 100644
index 0000000..8d72cd3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/rootAsQmlComponent.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+MyContainerComponent {
+    x: 11
+    MyQmlObject {}
+    MyQmlObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt
new file mode 100644
index 0000000..50518cc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt
@@ -0,0 +1 @@
+3:1:Invalid use of Script block
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.1.qml
new file mode 100644
index 0000000..8dac8b7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.1.qml
@@ -0,0 +1,4 @@
+import Qt 4.6
+
+Script {
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.10.errors.txt
new file mode 100644
index 0000000..13f47d1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.10.errors.txt
@@ -0,0 +1 @@
+6:9:Component elements may not contain script blocks
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.10.qml
new file mode 100644
index 0000000..516e878
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.10.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+Item {
+    Component {
+        Item {}
+        Script {}
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.11.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.11.errors.txt
new file mode 100644
index 0000000..a664203
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.11.errors.txt
@@ -0,0 +1 @@
+5:9:Invalid Script block
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.11.qml
new file mode 100644
index 0000000..6d2d598
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.11.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+QtObject {
+    Script {
+        QtObject {}
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt
new file mode 100644
index 0000000..85c8396
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt
@@ -0,0 +1 @@
+4:5:QmlJS declaration outside Script element
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.12.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.12.qml
new file mode 100644
index 0000000..9ecb5d9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.12.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+QtObject {
+    var a
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.2.errors.txt
new file mode 100644
index 0000000..8fb3bbd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.2.errors.txt
@@ -0,0 +1 @@
+5:9:Properties cannot be set on Script block
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.2.qml
new file mode 100644
index 0000000..dce1a41
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.2.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+QtObject {
+    Script {
+        id: myScript
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.3.errors.txt
new file mode 100644
index 0000000..8fb3bbd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.3.errors.txt
@@ -0,0 +1 @@
+5:9:Properties cannot be set on Script block
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.3.qml
new file mode 100644
index 0000000..8621a9a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.3.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+QtObject {
+    Script {
+        hello: world
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.4.errors.txt
new file mode 100644
index 0000000..49a507f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.4.errors.txt
@@ -0,0 +1 @@
+5:9:Invalid Script source value
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.4.qml
new file mode 100644
index 0000000..d89817c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.4.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    Script {
+        source: 10
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.5.errors.txt
new file mode 100644
index 0000000..49a507f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.5.errors.txt
@@ -0,0 +1 @@
+5:9:Invalid Script source value
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.5.qml
new file mode 100644
index 0000000..8986b3b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.5.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+    Script {
+        source: "hello" + ".js"
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.6.errors.txt
new file mode 100644
index 0000000..4e53b6b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.6.errors.txt
@@ -0,0 +1 @@
+5:9:Invalid Script block.  Specify either the source property or inline script
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.6.qml
new file mode 100644
index 0000000..07e9d78
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.6.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+QtObject {
+    Script {
+        source: "test.js"
+        function helloWorld() {}
+    }
+}
+
+
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.7.errors.txt
new file mode 100644
index 0000000..dc15ddf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.7.errors.txt
@@ -0,0 +1 @@
+5:9:Variable declarations not allow in inline Script blocks
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.7.qml
new file mode 100644
index 0000000..fa905e6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.7.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+QtObject {
+    Script {
+        var a = 10;
+    }
+}
+
+
+
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
new file mode 100644
index 0000000..b5bf1a8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
@@ -0,0 +1 @@
+6:9:Invalid Script source value
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.8.qml
new file mode 100644
index 0000000..f600c88
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.8.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+    Script {
+        source: "test.js"
+        source: "test2.js"
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.9.errors.txt
new file mode 100644
index 0000000..41e8d46
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.9.errors.txt
@@ -0,0 +1 @@
+5:9:Component elements may not contain script blocks
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.9.qml
new file mode 100644
index 0000000..79aa504
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.9.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+Item {
+    Component {
+        Script {}
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/scriptString.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString.qml
new file mode 100644
index 0000000..40a3bbe
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/scriptString.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    scriptProperty: foo + bar
+    grouped.script: console.log(1921)
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.errors.txt
new file mode 100644
index 0000000..78d9960
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.errors.txt
@@ -0,0 +1 @@
+4:12:Expected parameter type
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
new file mode 100644
index 0000000..fbaf017
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    signal mySignal(nontype a)
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.errors.txt
new file mode 100644
index 0000000..fce8928
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.errors.txt
@@ -0,0 +1 @@
+4:21:Unexpected token `;'
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
new file mode 100644
index 0000000..5049192
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+QtObject {
+    signal mySignal(,)
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.errors.txt
new file mode 100644
index 0000000..bf043ac
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.errors.txt
@@ -0,0 +1 @@
+4:22:Expected token `identifier'
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
new file mode 100644
index 0000000..9dd4cc7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+QtObject {
+    signal mySignal(a)
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/simpleBindings.qml b/tests/auto/declarative/qdeclarativelanguage/data/simpleBindings.qml
new file mode 100644
index 0000000..2fcd1a5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/simpleBindings.qml
@@ -0,0 +1,18 @@
+import Test 1.0
+MyTypeObject {
+    id: me
+    property int v1: 10
+    property int v2: 11
+
+    property int value1
+    property int value2
+    property int value3
+    property int value4
+
+    value1: v1
+    value2: me.v1
+    value3: v1 + v2
+    value4: Math.min(v1, v2)
+
+    objectProperty: me
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/simpleContainer.qml b/tests/auto/declarative/qdeclarativelanguage/data/simpleContainer.qml
new file mode 100644
index 0000000..c3a795f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/simpleContainer.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyContainer {
+    MyQmlObject {}
+    MyQmlObject {}
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/simpleObject.qml b/tests/auto/declarative/qdeclarativelanguage/data/simpleObject.qml
new file mode 100644
index 0000000..30c7823
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/simpleObject.qml
@@ -0,0 +1,2 @@
+import Test 1.0
+MyQmlObject {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
new file mode 100644
index 0000000..c4d5905
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
@@ -0,0 +1,2 @@
+import Qt 4.6
+Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
new file mode 100644
index 0000000..c4d5905
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
@@ -0,0 +1,2 @@
+import Qt 4.6
+Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/test.js b/tests/auto/declarative/qdeclarativelanguage/data/test.js
new file mode 100644
index 0000000..e69de29
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/test2.js b/tests/auto/declarative/qdeclarativelanguage/data/test2.js
new file mode 100644
index 0000000..e69de29
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.errors.txt
new file mode 100644
index 0000000..347db05
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.errors.txt
@@ -0,0 +1 @@
+2:1:Type UnregisteredObjectType unavailable
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.qml b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.qml
new file mode 100644
index 0000000..4969f62
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.qml
@@ -0,0 +1,2 @@
+import Test 1.0
+UnregisteredObjectType {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.errors.txt
new file mode 100644
index 0000000..3cd626d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.errors.txt
@@ -0,0 +1 @@
+3:13:Invalid property assignment: unsupported type "QMatrix"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.qml
new file mode 100644
index 0000000..9f19680
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    matrix: "1,0,0,0,1,0,0,0,1"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/valueTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/valueTypes.qml
new file mode 100644
index 0000000..bf325a7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/valueTypes.qml
@@ -0,0 +1,13 @@
+import Test 1.0
+MyTypeObject {
+    rectProperty.x: 10
+    rectProperty.y: 11
+    rectProperty.width: rectProperty.x + 2
+    rectProperty.height: 13
+
+    intProperty: rectProperty.x
+
+    onAction: { var a = rectProperty; a.x = 12; }
+
+    rectProperty2: rectProperty
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.errors.txt
new file mode 100644
index 0000000..ba7a076
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.errors.txt
@@ -0,0 +1 @@
+3:12:Invalid property assignment: int expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.qml
new file mode 100644
index 0000000..289d37f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    value: "hello"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.errors.txt
new file mode 100644
index 0000000..ae75b52
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.errors.txt
@@ -0,0 +1 @@
+3:23:Invalid property assignment: datetime expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.qml
new file mode 100644
index 0000000..2cf0e50
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    dateTimeProperty: 12
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.errors.txt
new file mode 100644
index 0000000..23a4cda
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.errors.txt
@@ -0,0 +1 @@
+3:20:Invalid property assignment: point expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.qml
new file mode 100644
index 0000000..ae77ba1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    pointProperty: "apples"
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.errors.txt
new file mode 100644
index 0000000..3092100
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.errors.txt
@@ -0,0 +1 @@
+3:19:Invalid property assignment: size expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.qml
new file mode 100644
index 0000000..b7a366f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    sizeProperty: "red"
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.errors.txt
new file mode 100644
index 0000000..ba7a076
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.errors.txt
@@ -0,0 +1 @@
+3:12:Invalid property assignment: int expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.qml
new file mode 100644
index 0000000..477aff1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    value: "12"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.errors.txt
new file mode 100644
index 0000000..d621fdd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.errors.txt
@@ -0,0 +1 @@
+3:21:Invalid property assignment: string expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.qml
new file mode 100644
index 0000000..672d693
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    stringProperty: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.errors.txt
new file mode 100644
index 0000000..44768e3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.errors.txt
@@ -0,0 +1 @@
+3:18:Invalid property assignment: url expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.qml
new file mode 100644
index 0000000..633a5ba
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyTypeObject {
+    urlProperty: 12
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.errors.txt
new file mode 100644
index 0000000..9ff9f25
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.errors.txt
@@ -0,0 +1 @@
+3:14:Invalid property assignment: boolean expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.qml
new file mode 100644
index 0000000..34b74f7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    enabled: 5
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.errors.txt
new file mode 100644
index 0000000..6d971c6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.errors.txt
@@ -0,0 +1 @@
+3:11:Invalid property assignment: rect expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.qml
new file mode 100644
index 0000000..384181a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyQmlObject {
+    rect: "5,5x10"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.errors.txt
new file mode 100644
index 0000000..ef34d0e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.errors.txt
@@ -0,0 +1 @@
+3:19:Invalid property assignment: unknown enumeration
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.qml
new file mode 100644
index 0000000..0787bf5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.qml
@@ -0,0 +1,4 @@
+import Test 1.0
+MyTypeObject {
+    enumProperty: "InvalidEnumName"
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.errors.txt
new file mode 100644
index 0000000..cab10bd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.errors.txt
@@ -0,0 +1 @@
+3:19:Invalid property assignment: unsigned int expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.qml
new file mode 100644
index 0000000..c50ae9a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    uintProperty: -13
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.errors.txt
new file mode 100644
index 0000000..d0a0b00
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.errors.txt
@@ -0,0 +1 @@
+3:19:Invalid property assignment: double expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.qml
new file mode 100644
index 0000000..da10b78
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    realProperty: "Hello"
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.errors.txt
new file mode 100644
index 0000000..614346b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.errors.txt
@@ -0,0 +1 @@
+3:20:Invalid property assignment: color expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.qml
new file mode 100644
index 0000000..ddc3835
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    colorProperty: 12
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.errors.txt
new file mode 100644
index 0000000..1773c00
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.errors.txt
@@ -0,0 +1 @@
+3:19:Invalid property assignment: date expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.qml
new file mode 100644
index 0000000..a5f6756
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    dateProperty: 12
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.errors.txt
new file mode 100644
index 0000000..8630975
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.errors.txt
@@ -0,0 +1 @@
+3:19:Invalid property assignment: time expected
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.qml
new file mode 100644
index 0000000..a3db732
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+MyTypeObject {
+    timeProperty: 12
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
new file mode 100644
index 0000000..d7c1def
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
@@ -0,0 +1,14 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+QT += script network
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativelanguage.cpp \
+           testtypes.cpp
+HEADERS += testtypes.h
+
+INCLUDEPATH += ../shared/
+HEADERS += ../shared/testhttpserver.h
+SOURCES += ../shared/testhttpserver.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml
new file mode 100644
index 0000000..836c20a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+Image { source: "pics/blue.png" }
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml
new file mode 100644
index 0000000..c4d5905
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml
@@ -0,0 +1,2 @@
+import Qt 4.6
+Rectangle { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestLocal.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestLocal.qml
new file mode 100644
index 0000000..11443ca
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestLocal.qml
@@ -0,0 +1 @@
+LocalInternal {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestSubDir.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestSubDir.qml
new file mode 100644
index 0000000..0dfede4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestSubDir.qml
@@ -0,0 +1,2 @@
+import "subdir"
+SubTest { }
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/pics/blue.png b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/pics/blue.png
new file mode 100644
index 0000000..46f815f
Binary files /dev/null and b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/pics/blue.png differ
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir
new file mode 100644
index 0000000..b32f82b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir
@@ -0,0 +1,3 @@
+Test 0.0 Test.qml
+TestSubDir 0.0 TestSubDir.qml
+TestLocal 0.0 TestLocal.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
new file mode 100644
index 0000000..0ea9ec6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+Text {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir
new file mode 100644
index 0000000..f7016c7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir
@@ -0,0 +1 @@
+SubTest 0.0 SubTest.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
new file mode 100644
index 0000000..9ffe28a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "testtypes.h"
+
+void registerTypes()
+{
+    QML_REGISTER_INTERFACE(MyInterface);
+    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
+    QML_REGISTER_TYPE(Test,1,0,MyTypeObject,MyTypeObject);
+    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
+    QML_REGISTER_TYPE(Test,1,0,MyPropertyValueSource,MyPropertyValueSource);
+    QML_REGISTER_TYPE(Test,1,0,MyDotPropertyObject,MyDotPropertyObject);
+    QML_REGISTER_TYPE(Test,1,0,MyNamespacedType,MyNamespace::MyNamespacedType);
+    QML_REGISTER_TYPE(Test,1,0,MySecondNamespacedType,MyNamespace::MySecondNamespacedType);
+    QML_REGISTER_NOCREATE_TYPE(MyGroupedObject);
+}
+
+QVariant myCustomVariantTypeConverter(const QString &data)
+{
+    MyCustomVariantType rv;
+    rv.a = data.toInt();
+    return QVariant::fromValue(rv);
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
new file mode 100644
index 0000000..21f3e70
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -0,0 +1,547 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef TESTTYPES_H
+#define TESTTYPES_H
+
+#include <QtCore/qobject.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qdatetime.h>
+#include <QtGui/qmatrix.h>
+#include <QtGui/qcolor.h>
+#include <QtGui/qvector3d.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeparserstatus.h>
+#include <QtDeclarative/qdeclarativepropertyvaluesource.h>
+#include <QtDeclarative/qdeclarativescriptstring.h>
+
+QVariant myCustomVariantTypeConverter(const QString &data);
+
+class MyInterface 
+{
+public:
+    MyInterface() : id(913) {}
+    int id;
+};
+Q_DECLARE_INTERFACE(MyInterface, "com.trolltech.Qt.Test.MyInterface");
+QML_DECLARE_INTERFACE(MyInterface);
+
+struct MyCustomVariantType
+{
+    MyCustomVariantType() : a(0) {}
+    int a;
+};
+Q_DECLARE_METATYPE(MyCustomVariantType);
+
+class MyAttachedObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value WRITE setValue)
+    Q_PROPERTY(int value2 READ value2 WRITE setValue2)
+public:
+    MyAttachedObject(QObject *parent) : QObject(parent), m_value(0), m_value2(0) {}
+
+    int value() const { return m_value; }
+    void setValue(int v) { m_value = v; }
+
+    int value2() const { return m_value2; }
+    void setValue2(int v) { m_value2 = v; }
+
+private:
+    int m_value;
+    int m_value2;
+};
+
+class MyQmlObject : public QObject, public MyInterface, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value WRITE setValue FINAL)
+    Q_PROPERTY(QString readOnlyString READ readOnlyString)
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
+    Q_PROPERTY(QRect rect READ rect WRITE setRect)
+    Q_PROPERTY(QMatrix matrix READ matrix WRITE setMatrix)  //assumed to be unsupported by QML
+    Q_PROPERTY(MyInterface *interfaceProperty READ interface WRITE setInterface)
+    Q_PROPERTY(int onLiteralSignal READ onLiteralSignal WRITE setOnLiteralSignal);
+    Q_PROPERTY(MyCustomVariantType customType READ customType WRITE setCustomType);
+    Q_PROPERTY(MyQmlObject *qmlobjectProperty READ qmlobject WRITE setQmlobject)
+
+    Q_INTERFACES(MyInterface QDeclarativeParserStatus)
+public:
+    MyQmlObject() : m_value(-1), m_interface(0), m_qmlobject(0) { qRegisterMetaType<MyCustomVariantType>("MyCustomVariantType"); }
+
+    int value() const { return m_value; }
+    void setValue(int v) { m_value = v; }
+
+    QString readOnlyString() const { return QLatin1String(""); }
+
+    bool enabled() const { return false; }
+    void setEnabled(bool) {}
+
+    QRect rect() const { return QRect(); }
+    void setRect(const QRect&) {}
+
+    QMatrix matrix() const { return QMatrix(); }
+    void setMatrix(const QMatrix&) {}
+
+    MyInterface *interface() const { return m_interface; }
+    void setInterface(MyInterface *iface) { m_interface = iface; }
+
+    static MyAttachedObject *qmlAttachedProperties(QObject *other) {
+        return new MyAttachedObject(other);
+    }
+    Q_CLASSINFO("DefaultMethod", "basicSlot()");
+
+    int onLiteralSignal() const { return m_value; }
+    void setOnLiteralSignal(int v) { m_value = v; }
+
+    MyQmlObject *qmlobject() const { return m_qmlobject; }
+    void setQmlobject(MyQmlObject *o) { m_qmlobject = o; }
+
+    MyCustomVariantType customType() const { return m_custom; }
+    void setCustomType(const MyCustomVariantType &v)  { m_custom = v; }
+public slots:
+    void basicSlot() { qWarning("MyQmlObject::basicSlot"); }
+    void basicSlotWithArgs(int v) { qWarning("MyQmlObject::basicSlotWithArgs(%d)", v); }
+
+signals:
+    void basicSignal();
+    void basicParameterizedSignal(int parameter);
+
+private:
+    friend class tst_qmllanguage;
+    int m_value;
+    MyInterface *m_interface;
+    MyQmlObject *m_qmlobject;
+    MyCustomVariantType m_custom;
+};
+QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(MyQmlObject);
+
+class MyGroupedObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript);
+public:
+    QDeclarativeScriptString script() const { return m_script; }
+    void setScript(const QDeclarativeScriptString &s) { m_script = s; }
+
+private:
+    QDeclarativeScriptString m_script;
+};
+
+QML_DECLARE_TYPE(MyGroupedObject);
+
+
+class MyTypeObject : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(MyEnum)
+    Q_FLAGS(MyFlags)
+
+    Q_PROPERTY(QString id READ id WRITE setId);
+    Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty);
+    Q_PROPERTY(QDeclarativeComponent *componentProperty READ componentProperty WRITE setComponentProperty);
+    Q_PROPERTY(MyFlags flagProperty READ flagProperty WRITE setFlagProperty);
+    Q_PROPERTY(MyEnum enumProperty READ enumProperty WRITE setEnumProperty);
+    Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty);
+    Q_PROPERTY(uint uintProperty READ uintProperty WRITE setUintProperty);
+    Q_PROPERTY(int intProperty READ intProperty WRITE setIntProperty);
+    Q_PROPERTY(qreal realProperty READ realProperty WRITE setRealProperty);
+    Q_PROPERTY(double doubleProperty READ doubleProperty WRITE setDoubleProperty);
+    Q_PROPERTY(float floatProperty READ floatProperty WRITE setFloatProperty);
+    Q_PROPERTY(QColor colorProperty READ colorProperty WRITE setColorProperty);
+    Q_PROPERTY(QDate dateProperty READ dateProperty WRITE setDateProperty);
+    Q_PROPERTY(QTime timeProperty READ timeProperty WRITE setTimeProperty);
+    Q_PROPERTY(QDateTime dateTimeProperty READ dateTimeProperty WRITE setDateTimeProperty);
+    Q_PROPERTY(QPoint pointProperty READ pointProperty WRITE setPointProperty);
+    Q_PROPERTY(QPointF pointFProperty READ pointFProperty WRITE setPointFProperty);
+    Q_PROPERTY(QSize sizeProperty READ sizeProperty WRITE setSizeProperty);
+    Q_PROPERTY(QSizeF sizeFProperty READ sizeFProperty WRITE setSizeFProperty);
+    Q_PROPERTY(QRect rectProperty READ rectProperty WRITE setRectProperty NOTIFY rectPropertyChanged);
+    Q_PROPERTY(QRect rectProperty2 READ rectProperty2 WRITE setRectProperty2);
+    Q_PROPERTY(QRectF rectFProperty READ rectFProperty WRITE setRectFProperty);
+    Q_PROPERTY(bool boolProperty READ boolProperty WRITE setBoolProperty);
+    Q_PROPERTY(QVariant variantProperty READ variantProperty WRITE setVariantProperty);
+    Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty);
+    Q_PROPERTY(QUrl urlProperty READ urlProperty WRITE setUrlProperty);
+
+    Q_PROPERTY(QDeclarativeScriptString scriptProperty READ scriptProperty WRITE setScriptProperty);
+    Q_PROPERTY(MyGroupedObject *grouped READ grouped CONSTANT);
+    Q_PROPERTY(MyGroupedObject *nullGrouped READ nullGrouped CONSTANT);
+
+public:
+    MyTypeObject()
+        : objectPropertyValue(0), componentPropertyValue(0) {}
+
+    QString idValue;
+    QString id() const {
+        return idValue;
+    }
+    void setId(const QString &v) {
+        idValue = v;
+    }
+
+    QObject *objectPropertyValue;
+    QObject *objectProperty() const {
+        return objectPropertyValue;
+    }
+    void setObjectProperty(QObject *v) {
+        objectPropertyValue = v;
+    }
+
+    QDeclarativeComponent *componentPropertyValue;
+    QDeclarativeComponent *componentProperty() const {
+        return componentPropertyValue;
+    }
+    void setComponentProperty(QDeclarativeComponent *v) {
+        componentPropertyValue = v;
+    }
+
+    enum MyFlag { FlagVal1 = 0x01, FlagVal2 = 0x02, FlagVal3 = 0x04 };
+    Q_DECLARE_FLAGS(MyFlags, MyFlag)
+    MyFlags flagPropertyValue;
+    MyFlags flagProperty() const {
+        return flagPropertyValue;
+    }
+    void setFlagProperty(MyFlags v) {
+        flagPropertyValue = v;
+    }
+
+    enum MyEnum { EnumVal1, EnumVal2 };
+    MyEnum enumPropertyValue;
+    MyEnum enumProperty() const {
+        return enumPropertyValue;
+    }
+    void setEnumProperty(MyEnum v) {
+        enumPropertyValue = v;
+    }
+
+    QString stringPropertyValue;
+    QString stringProperty() const {
+       return stringPropertyValue;
+    }
+    void setStringProperty(const QString &v) {
+        stringPropertyValue = v;
+    }
+
+    uint uintPropertyValue;
+    uint uintProperty() const {
+       return uintPropertyValue;
+    }
+    void setUintProperty(const uint &v) {
+        uintPropertyValue = v;
+    }
+
+    int intPropertyValue;
+    int intProperty() const {
+       return intPropertyValue;
+    }
+    void setIntProperty(const int &v) {
+        intPropertyValue = v;
+    }
+
+    qreal realPropertyValue;
+    qreal realProperty() const {
+       return realPropertyValue;
+    }
+    void setRealProperty(const qreal &v) {
+        realPropertyValue = v;
+    }
+
+    double doublePropertyValue;
+    double doubleProperty() const {
+       return doublePropertyValue;
+    }
+    void setDoubleProperty(const double &v) {
+        doublePropertyValue = v;
+    }
+
+    float floatPropertyValue;
+    float floatProperty() const {
+       return floatPropertyValue;
+    }
+    void setFloatProperty(const float &v) {
+        floatPropertyValue = v;
+    }
+
+    QColor colorPropertyValue;
+    QColor colorProperty() const {
+       return colorPropertyValue;
+    }
+    void setColorProperty(const QColor &v) {
+        colorPropertyValue = v;
+    }
+
+    QDate datePropertyValue;
+    QDate dateProperty() const {
+       return datePropertyValue;
+    }
+    void setDateProperty(const QDate &v) {
+        datePropertyValue = v;
+    }
+
+    QTime timePropertyValue;
+    QTime timeProperty() const {
+       return timePropertyValue;
+    }
+    void setTimeProperty(const QTime &v) {
+        timePropertyValue = v;
+    }
+
+    QDateTime dateTimePropertyValue;
+    QDateTime dateTimeProperty() const {
+       return dateTimePropertyValue;
+    }
+    void setDateTimeProperty(const QDateTime &v) {
+        dateTimePropertyValue = v;
+    }
+
+    QPoint pointPropertyValue;
+    QPoint pointProperty() const {
+       return pointPropertyValue;
+    }
+    void setPointProperty(const QPoint &v) {
+        pointPropertyValue = v;
+    }
+
+    QPointF pointFPropertyValue;
+    QPointF pointFProperty() const {
+       return pointFPropertyValue;
+    }
+    void setPointFProperty(const QPointF &v) {
+        pointFPropertyValue = v;
+    }
+
+    QSize sizePropertyValue;
+    QSize sizeProperty() const {
+       return sizePropertyValue;
+    }
+    void setSizeProperty(const QSize &v) {
+        sizePropertyValue = v;
+    }
+
+    QSizeF sizeFPropertyValue;
+    QSizeF sizeFProperty() const {
+       return sizeFPropertyValue;
+    }
+    void setSizeFProperty(const QSizeF &v) {
+        sizeFPropertyValue = v;
+    }
+
+    QRect rectPropertyValue;
+    QRect rectProperty() const {
+       return rectPropertyValue;
+    }
+    void setRectProperty(const QRect &v) {
+        rectPropertyValue = v;
+        emit rectPropertyChanged();
+    }
+
+    QRect rectPropertyValue2;
+    QRect rectProperty2() const {
+       return rectPropertyValue2;
+    }
+    void setRectProperty2(const QRect &v) {
+        rectPropertyValue2 = v;
+    }
+
+    QRectF rectFPropertyValue;
+    QRectF rectFProperty() const {
+       return rectFPropertyValue;
+    }
+    void setRectFProperty(const QRectF &v) {
+        rectFPropertyValue = v;
+    }
+
+    bool boolPropertyValue;
+    bool boolProperty() const {
+       return boolPropertyValue;
+    }
+    void setBoolProperty(const bool &v) {
+        boolPropertyValue = v;
+    }
+
+    QVariant variantPropertyValue;
+    QVariant variantProperty() const {
+       return variantPropertyValue;
+    }
+    void setVariantProperty(const QVariant &v) {
+        variantPropertyValue = v;
+    }
+
+    QVector3D vectorPropertyValue;
+    QVector3D vectorProperty() const {
+        return vectorPropertyValue;
+    }
+    void setVectorProperty(const QVector3D &v) {
+        vectorPropertyValue = v;
+    }
+
+    QUrl urlPropertyValue;
+    QUrl urlProperty() const {
+        return urlPropertyValue;
+    }
+    void setUrlProperty(const QUrl &v) {
+        urlPropertyValue = v;
+    }
+
+    QDeclarativeScriptString scriptPropertyValue;
+    QDeclarativeScriptString scriptProperty() const {
+        return scriptPropertyValue;
+    }
+    void setScriptProperty(const QDeclarativeScriptString &v) {
+        scriptPropertyValue = v;
+    }
+
+    MyGroupedObject groupedValue;
+    MyGroupedObject *grouped() { return &groupedValue; }
+
+    MyGroupedObject *nullGrouped() { return 0; }
+
+    void doAction() { emit action(); }
+signals:
+    void action();
+    void rectPropertyChanged();
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(MyTypeObject::MyFlags)
+QML_DECLARE_TYPE(MyTypeObject);
+
+class MyContainer : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDeclarativeListProperty<QObject> children READ children)
+    Q_PROPERTY(QDeclarativeListProperty<MyInterface> qlistInterfaces READ qlistInterfaces)
+    Q_CLASSINFO("DefaultProperty", "children");
+public:
+    MyContainer() {}
+
+    QDeclarativeListProperty<QObject> children() { return QDeclarativeListProperty<QObject>(this, m_children); }
+    QList<QObject *> *getChildren() { return &m_children; }
+    QDeclarativeListProperty<MyInterface> qlistInterfaces() { return QDeclarativeListProperty<MyInterface>(this, m_interfaces); }
+    QList<MyInterface *> *getQListInterfaces() { return &m_interfaces; }
+
+    QList<QObject*> m_children;
+    QList<MyInterface *> m_interfaces;
+};
+
+QML_DECLARE_TYPE(MyContainer);
+
+
+class MyPropertyValueSource : public QObject, public QDeclarativePropertyValueSource
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativePropertyValueSource)
+public:
+    MyPropertyValueSource()
+        : QDeclarativePropertyValueSource() {}
+
+    QDeclarativeMetaProperty prop;
+    virtual void setTarget(const QDeclarativeMetaProperty &p)
+    {
+        prop = p;
+    }
+};
+QML_DECLARE_TYPE(MyPropertyValueSource);
+
+class MyDotPropertyObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(MyQmlObject *obj READ obj)
+    Q_PROPERTY(MyQmlObject *readWriteObj READ readWriteObj WRITE setReadWriteObj)
+public:
+    MyDotPropertyObject() : m_rwobj(0), m_ownRWObj(false) {}
+    ~MyDotPropertyObject()
+    {
+        if (m_ownRWObj)
+            delete m_rwobj;
+    }
+
+    MyQmlObject *obj() { return 0; }
+
+    MyQmlObject *readWriteObj()
+    {
+        if (!m_rwobj) {
+            m_rwobj = new MyQmlObject;
+            m_ownRWObj = true;
+        }
+        return m_rwobj;
+    }
+
+    void setReadWriteObj(MyQmlObject *obj)
+    {
+        if (m_ownRWObj) {
+            delete m_rwobj;
+            m_ownRWObj = false;
+        }
+
+        m_rwobj = obj;
+    }
+
+private:
+    MyQmlObject *m_rwobj;
+    bool m_ownRWObj;
+};
+
+QML_DECLARE_TYPE(MyDotPropertyObject);
+
+namespace MyNamespace {
+    class MyNamespacedType : public QObject
+    {
+        Q_OBJECT
+    };
+
+    class MySecondNamespacedType : public QObject
+    {
+        Q_OBJECT
+        Q_PROPERTY(QDeclarativeListProperty<MyNamespace::MyNamespacedType> list READ list);
+    public:
+        QDeclarativeListProperty<MyNamespacedType> list() { return QDeclarativeListProperty<MyNamespacedType>(this, m_list); }
+
+    private:
+        QList<MyNamespacedType *> m_list;
+    };
+}
+QML_DECLARE_TYPE(MyNamespace::MyNamespacedType);
+QML_DECLARE_TYPE(MyNamespace::MySecondNamespacedType);
+
+void registerTypes();
+
+#endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
new file mode 100644
index 0000000..cb59f47
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -0,0 +1,1386 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qdir.h>
+#include <private/qdeclarativemetaproperty_p.h>
+#include "testtypes.h"
+
+#include "../../../shared/util.h"
+
+/*
+This test case covers QML language issues.  This covers everything that does not
+involve evaluating ECMAScript expressions and bindings.
+
+Evaluation of expressions and bindings is covered in qmlecmascript
+*/
+class tst_qmllanguage : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmllanguage() {
+        QDeclarativeMetaType::registerCustomStringConverter(qMetaTypeId<MyCustomVariantType>(), myCustomVariantTypeConverter);
+        QFileInfo fileInfo(__FILE__);
+        engine.addImportPath(fileInfo.absoluteDir().filePath(QLatin1String("data/lib")));
+    }
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+    void errors_data();
+    void errors();
+
+    void simpleObject();
+    void simpleContainer();
+    void interfaceProperty();
+    void interfaceQList();
+    void assignObjectToSignal();
+    void assignObjectToVariant();
+    void assignLiteralSignalProperty();
+    void assignQmlComponent();
+    void assignBasicTypes();
+    void assignTypeExtremes();
+    void assignCompositeToType();
+    void customParserTypes();
+    void rootAsQmlComponent();
+    void inlineQmlComponents();
+    void idProperty();
+    void assignSignal();
+    void dynamicProperties();
+    void dynamicPropertiesNested();
+    void listProperties();
+    void dynamicObjectProperties();
+    void dynamicSignalsAndSlots();
+    void simpleBindings();
+    void autoComponentCreation();
+    void propertyValueSource();
+    void attachedProperties();
+    void dynamicObjects();
+    void customVariantTypes();
+    void valueTypes();
+    void cppnamespace();
+    void aliasProperties();
+    void componentCompositeType();
+    void i18n();
+    void i18n_data();
+    void onCompleted();
+    void scriptString();
+    void defaultPropertyListOrder();
+    void declaredPropertyValues();
+
+    void importsBuiltin_data();
+    void importsBuiltin();
+    void importsLocal_data();
+    void importsLocal();
+    void importsRemote_data();
+    void importsRemote();
+    void importsInstalled_data();
+    void importsInstalled();
+    void importsOrder_data();
+    void importsOrder();
+
+    void qmlAttachedPropertiesObjectMethod();
+
+    // regression tests for crashes
+    void crash1();
+    void crash2();
+
+private:
+    QDeclarativeEngine engine;
+    void testType(const QString& qml, const QString& type);
+};
+
+#define VERIFY_ERRORS(errorfile) \
+    if (!errorfile) { \
+        if (qgetenv("DEBUG") != "" && !component.errors().isEmpty()) \
+            qWarning() << "Unexpected Errors:" << component.errors(); \
+        QVERIFY(!component.isError()); \
+        QVERIFY(component.errors().isEmpty()); \
+    } else { \
+        QFile file(QLatin1String(SRCDIR) + QLatin1String("/data/") + QLatin1String(errorfile)); \
+        QVERIFY(file.open(QIODevice::ReadOnly)); \
+        QByteArray data = file.readAll(); \
+        file.close(); \
+        QList<QByteArray> expected = data.split('\n'); \
+        expected.removeAll(QByteArray("")); \
+        QList<QDeclarativeError> errors = component.errors(); \
+        QList<QByteArray> actual; \
+        for (int ii = 0; ii < errors.count(); ++ii) { \
+            const QDeclarativeError &error = errors.at(ii); \
+            QByteArray errorStr = QByteArray::number(error.line()) + ":" +  \
+                                  QByteArray::number(error.column()) + ":" + \
+                                  error.description().toUtf8(); \
+            actual << errorStr; \
+        } \
+        if (qgetenv("DEBUG") != "" && expected != actual) \
+            qWarning() << "Expected:" << expected << "Actual:" << actual;  \
+        if (qgetenv("QDECLARATIVELANGUAGE_UPDATEERRORS") != "" && expected != actual) {\
+            QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
+            QVERIFY(file.open(QIODevice::WriteOnly)); \
+            for (int ii = 0; ii < actual.count(); ++ii) { \
+                file.write(actual.at(ii)); file.write("\n"); \
+            } \
+            file.close(); \
+        } else { \
+            QCOMPARE(expected, actual); \
+        } \
+    }
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    QFileInfo fileInfo(__FILE__);
+    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(QLatin1String("data/") + filename));
+}
+
+inline QUrl TEST_FILE(const char *filename)
+{
+    return TEST_FILE(QLatin1String(filename));
+}
+
+void tst_qmllanguage::cleanupTestCase()
+{
+    QVERIFY(QFile::remove(TEST_FILE(QString::fromUtf8("I18nType\303\201\303\242\303\243\303\244\303\245.qml")).toLocalFile()));
+}
+
+void tst_qmllanguage::errors_data()
+{
+    QTest::addColumn<QString>("file");
+    QTest::addColumn<QString>("errorFile");
+    QTest::addColumn<bool>("create");
+
+    QTest::newRow("nonexistantProperty.1") << "nonexistantProperty.1.qml" << "nonexistantProperty.1.errors.txt" << false;
+    QTest::newRow("nonexistantProperty.2") << "nonexistantProperty.2.qml" << "nonexistantProperty.2.errors.txt" << false;
+    QTest::newRow("nonexistantProperty.3") << "nonexistantProperty.3.qml" << "nonexistantProperty.3.errors.txt" << false;
+    QTest::newRow("nonexistantProperty.4") << "nonexistantProperty.4.qml" << "nonexistantProperty.4.errors.txt" << false;
+    QTest::newRow("nonexistantProperty.5") << "nonexistantProperty.5.qml" << "nonexistantProperty.5.errors.txt" << false;
+    QTest::newRow("nonexistantProperty.6") << "nonexistantProperty.6.qml" << "nonexistantProperty.6.errors.txt" << false;
+
+    QTest::newRow("wrongType (string for int)") << "wrongType.1.qml" << "wrongType.1.errors.txt" << false;
+    QTest::newRow("wrongType (int for bool)") << "wrongType.2.qml" << "wrongType.2.errors.txt" << false;
+    QTest::newRow("wrongType (bad rect)") << "wrongType.3.qml" << "wrongType.3.errors.txt" << false;
+
+    QTest::newRow("wrongType (invalid enum)") << "wrongType.4.qml" << "wrongType.4.errors.txt" << false;
+    QTest::newRow("wrongType (int for uint)") << "wrongType.5.qml" << "wrongType.5.errors.txt" << false;
+    QTest::newRow("wrongType (string for real)") << "wrongType.6.qml" << "wrongType.6.errors.txt" << false;
+    QTest::newRow("wrongType (int for color)") << "wrongType.7.qml" << "wrongType.7.errors.txt" << false;
+    QTest::newRow("wrongType (int for date)") << "wrongType.8.qml" << "wrongType.8.errors.txt" << false;
+    QTest::newRow("wrongType (int for time)") << "wrongType.9.qml" << "wrongType.9.errors.txt" << false;
+    QTest::newRow("wrongType (int for datetime)") << "wrongType.10.qml" << "wrongType.10.errors.txt" << false;
+    QTest::newRow("wrongType (string for point)") << "wrongType.11.qml" << "wrongType.11.errors.txt" << false;
+    QTest::newRow("wrongType (color for size)") << "wrongType.12.qml" << "wrongType.12.errors.txt" << false;
+    QTest::newRow("wrongType (number string for int)") << "wrongType.13.qml" << "wrongType.13.errors.txt" << false;
+    QTest::newRow("wrongType (int for string)") << "wrongType.14.qml" << "wrongType.14.errors.txt" << false;
+    QTest::newRow("wrongType (int for url)") << "wrongType.15.qml" << "wrongType.15.errors.txt" << false;
+
+    QTest::newRow("readOnly.1") << "readOnly.1.qml" << "readOnly.1.errors.txt" << false;
+    QTest::newRow("readOnly.2") << "readOnly.2.qml" << "readOnly.2.errors.txt" << false;
+    QTest::newRow("readOnly.3") << "readOnly.3.qml" << "readOnly.3.errors.txt" << false;
+
+    QTest::newRow("listAssignment.2") << "listAssignment.2.qml" << "listAssignment.2.errors.txt" << false;
+    QTest::newRow("listAssignment.3") << "listAssignment.3.qml" << "listAssignment.3.errors.txt" << false;
+
+    QTest::newRow("invalidID.1") << "invalidID.qml" << "invalidID.errors.txt" << false;
+    QTest::newRow("invalidID.2") << "invalidID.2.qml" << "invalidID.2.errors.txt" << false;
+    QTest::newRow("invalidID.3") << "invalidID.3.qml" << "invalidID.3.errors.txt" << false;
+    QTest::newRow("invalidID.4") << "invalidID.4.qml" << "invalidID.4.errors.txt" << false;
+    QTest::newRow("invalidID.5") << "invalidID.5.qml" << "invalidID.5.errors.txt" << false;
+    QTest::newRow("invalidID.6") << "invalidID.6.qml" << "invalidID.6.errors.txt" << false;
+
+    QTest::newRow("unsupportedProperty") << "unsupportedProperty.qml" << "unsupportedProperty.errors.txt" << false;
+    QTest::newRow("nullDotProperty") << "nullDotProperty.qml" << "nullDotProperty.errors.txt" << true;
+    QTest::newRow("fakeDotProperty") << "fakeDotProperty.qml" << "fakeDotProperty.errors.txt" << false;
+    QTest::newRow("duplicateIDs") << "duplicateIDs.qml" << "duplicateIDs.errors.txt" << false;
+    QTest::newRow("unregisteredObject") << "unregisteredObject.qml" << "unregisteredObject.errors.txt" << false;
+    QTest::newRow("empty") << "empty.qml" << "empty.errors.txt" << false;
+    QTest::newRow("missingObject") << "missingObject.qml" << "missingObject.errors.txt" << false;
+    QTest::newRow("failingComponent") << "failingComponentTest.qml" << "failingComponent.errors.txt" << false;
+    QTest::newRow("missingSignal") << "missingSignal.qml" << "missingSignal.errors.txt" << false;
+    QTest::newRow("finalOverride") << "finalOverride.qml" << "finalOverride.errors.txt" << false;
+    QTest::newRow("customParserIdNotAllowed") << "customParserIdNotAllowed.qml" << "customParserIdNotAllowed.errors.txt" << false;
+
+    QTest::newRow("invalidGroupedProperty.1") << "invalidGroupedProperty.1.qml" << "invalidGroupedProperty.1.errors.txt" << false;
+    QTest::newRow("invalidGroupedProperty.2") << "invalidGroupedProperty.2.qml" << "invalidGroupedProperty.2.errors.txt" << false;
+    QTest::newRow("invalidGroupedProperty.3") << "invalidGroupedProperty.3.qml" << "invalidGroupedProperty.3.errors.txt" << false;
+    QTest::newRow("invalidGroupedProperty.4") << "invalidGroupedProperty.4.qml" << "invalidGroupedProperty.4.errors.txt" << false;
+    QTest::newRow("invalidGroupedProperty.5") << "invalidGroupedProperty.5.qml" << "invalidGroupedProperty.5.errors.txt" << false;
+    QTest::newRow("invalidGroupedProperty.6") << "invalidGroupedProperty.6.qml" << "invalidGroupedProperty.6.errors.txt" << false;
+    QTest::newRow("invalidGroupedProperty.7") << "invalidGroupedProperty.7.qml" << "invalidGroupedProperty.7.errors.txt" << true;
+
+    QTest::newRow("importNamespaceConflict") << "importNamespaceConflict.qml" << "importNamespaceConflict.errors.txt" << false;
+    QTest::newRow("importVersionMissing (builtin)") << "importVersionMissingBuiltIn.qml" << "importVersionMissingBuiltIn.errors.txt" << false;
+    QTest::newRow("importVersionMissing (installed)") << "importVersionMissingInstalled.qml" << "importVersionMissingInstalled.errors.txt" << false;
+    QTest::newRow("invalidImportID") << "invalidImportID.qml" << "invalidImportID.errors.txt" << false;
+
+    QTest::newRow("signal.1") << "signal.1.qml" << "signal.1.errors.txt" << false;
+    QTest::newRow("signal.2") << "signal.2.qml" << "signal.2.errors.txt" << false;
+    QTest::newRow("signal.3") << "signal.3.qml" << "signal.3.errors.txt" << false;
+
+    QTest::newRow("property.1") << "property.1.qml" << "property.1.errors.txt" << false;
+    QTest::newRow("property.2") << "property.2.qml" << "property.2.errors.txt" << false;
+    QTest::newRow("property.3") << "property.3.qml" << "property.3.errors.txt" << false;
+    QTest::newRow("property.4") << "property.4.qml" << "property.4.errors.txt" << false;
+    QTest::newRow("property.5") << "property.5.qml" << "property.5.errors.txt" << false;
+
+    QTest::newRow("Script.1") << "script.1.qml" << "script.1.errors.txt" << false;
+    QTest::newRow("Script.2") << "script.2.qml" << "script.2.errors.txt" << false;
+    QTest::newRow("Script.3") << "script.3.qml" << "script.3.errors.txt" << false;
+    QTest::newRow("Script.4") << "script.4.qml" << "script.4.errors.txt" << false;
+    QTest::newRow("Script.5") << "script.5.qml" << "script.5.errors.txt" << false;
+    QTest::newRow("Script.6") << "script.6.qml" << "script.6.errors.txt" << false;
+    QTest::newRow("Script.7") << "script.7.qml" << "script.7.errors.txt" << false;
+    QTest::newRow("Script.8") << "script.8.qml" << "script.8.errors.txt" << false;
+    QTest::newRow("Script.9") << "script.9.qml" << "script.9.errors.txt" << false;
+    QTest::newRow("Script.10") << "script.10.qml" << "script.10.errors.txt" << false;
+    QTest::newRow("Script.11") << "script.11.qml" << "script.11.errors.txt" << false;
+    QTest::newRow("Script.12") << "script.12.qml" << "script.12.errors.txt" << false;
+
+    QTest::newRow("Component.1") << "component.1.qml" << "component.1.errors.txt" << false;
+    QTest::newRow("Component.2") << "component.2.qml" << "component.2.errors.txt" << false;
+    QTest::newRow("Component.3") << "component.3.qml" << "component.3.errors.txt" << false;
+    QTest::newRow("Component.4") << "component.4.qml" << "component.4.errors.txt" << false;
+    QTest::newRow("Component.5") << "component.5.qml" << "component.5.errors.txt" << false;
+    QTest::newRow("Component.6") << "component.6.qml" << "component.6.errors.txt" << false;
+
+    QTest::newRow("invalidAttachedProperty.1") << "invalidAttachedProperty.1.qml" << "invalidAttachedProperty.1.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.2") << "invalidAttachedProperty.2.qml" << "invalidAttachedProperty.2.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.3") << "invalidAttachedProperty.3.qml" << "invalidAttachedProperty.3.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.4") << "invalidAttachedProperty.4.qml" << "invalidAttachedProperty.4.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.5") << "invalidAttachedProperty.5.qml" << "invalidAttachedProperty.5.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.6") << "invalidAttachedProperty.6.qml" << "invalidAttachedProperty.6.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.7") << "invalidAttachedProperty.7.qml" << "invalidAttachedProperty.7.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.8") << "invalidAttachedProperty.8.qml" << "invalidAttachedProperty.8.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.9") << "invalidAttachedProperty.9.qml" << "invalidAttachedProperty.9.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.10") << "invalidAttachedProperty.10.qml" << "invalidAttachedProperty.10.errors.txt" << false;
+    QTest::newRow("invalidAttachedProperty.11") << "invalidAttachedProperty.11.qml" << "invalidAttachedProperty.11.errors.txt" << false;
+
+    QTest::newRow("nestedErrors") << "nestedErrors.qml" << "nestedErrors.errors.txt" << false;
+    QTest::newRow("defaultGrouped") << "defaultGrouped.qml" << "defaultGrouped.errors.txt" << false;
+    QTest::newRow("emptySignal") << "emptySignal.qml" << "emptySignal.errors.txt" << false;
+    QTest::newRow("doubleSignal") << "doubleSignal.qml" << "doubleSignal.errors.txt" << false;
+    QTest::newRow("invalidRoot") << "invalidRoot.qml" << "invalidRoot.errors.txt" << false;
+    QTest::newRow("missingValueTypeProperty") << "missingValueTypeProperty.qml" << "missingValueTypeProperty.errors.txt" << false;
+    QTest::newRow("objectValueTypeProperty") << "objectValueTypeProperty.qml" << "objectValueTypeProperty.errors.txt" << false;
+}
+
+
+void tst_qmllanguage::errors()
+{
+    QFETCH(QString, file);
+    QFETCH(QString, errorFile);
+    QFETCH(bool, create);
+
+    if (file == "invalidID.6.qml")
+        QTest::ignoreMessage(QtWarningMsg, "id \"StartsWithUpperCase\" is invalid: ids cannot start with uppercase letters");
+
+    QDeclarativeComponent component(&engine, TEST_FILE(file));
+
+    if(create) {
+        QObject *object = component.create();
+        QVERIFY(object == 0);
+    }
+
+    VERIFY_ERRORS(errorFile.toLatin1().constData());
+}
+
+void tst_qmllanguage::simpleObject()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("simpleObject.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+}
+
+void tst_qmllanguage::simpleContainer()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("simpleContainer.qml"));
+    VERIFY_ERRORS(0);
+    MyContainer *container= qobject_cast<MyContainer*>(component.create());
+    QVERIFY(container != 0);
+    QCOMPARE(container->getChildren()->count(),2);
+}
+
+void tst_qmllanguage::interfaceProperty()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("interfaceProperty.qml"));
+    VERIFY_ERRORS(0);
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+    QVERIFY(object->interface());
+    QVERIFY(object->interface()->id == 913);
+}
+
+void tst_qmllanguage::interfaceQList()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("interfaceQList.qml"));
+    VERIFY_ERRORS(0);
+    MyContainer *container= qobject_cast<MyContainer*>(component.create());
+    QVERIFY(container != 0);
+    QVERIFY(container->getQListInterfaces()->count() == 2);
+    for(int ii = 0; ii < 2; ++ii)
+        QVERIFY(container->getQListInterfaces()->at(ii)->id == 913);
+}
+
+void tst_qmllanguage::assignObjectToSignal()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("assignObjectToSignal.qml"));
+    VERIFY_ERRORS(0);
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+    QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlot");
+    emit object->basicSignal();
+}
+
+void tst_qmllanguage::assignObjectToVariant()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("assignObjectToVariant.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QVariant v = object->property("a");
+    QVERIFY(v.userType() == qMetaTypeId<QObject *>());
+}
+
+void tst_qmllanguage::assignLiteralSignalProperty()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("assignLiteralSignalProperty.qml"));
+    VERIFY_ERRORS(0);
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->onLiteralSignal(), 10);
+}
+
+// Test is an external component can be loaded and assigned (to a qlist)
+void tst_qmllanguage::assignQmlComponent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("assignQmlComponent.qml"));
+    VERIFY_ERRORS(0);
+    MyContainer *object = qobject_cast<MyContainer *>(component.create());
+    QVERIFY(object != 0);
+    QVERIFY(object->getChildren()->count() == 1);
+    QObject *child = object->getChildren()->at(0);
+    QCOMPARE(child->property("x"), QVariant(10));
+    QCOMPARE(child->property("y"), QVariant(11));
+}
+
+// Test literal assignment to all the basic types 
+void tst_qmllanguage::assignBasicTypes()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
+    VERIFY_ERRORS(0);
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3);
+    QCOMPARE(object->enumProperty(), MyTypeObject::EnumVal2);
+    QCOMPARE(object->stringProperty(), QString("Hello World!"));
+    QCOMPARE(object->uintProperty(), uint(10));
+    QCOMPARE(object->intProperty(), -19);
+    QCOMPARE((float)object->realProperty(), float(23.2));
+    QCOMPARE((float)object->doubleProperty(), float(-19.7));
+    QCOMPARE((float)object->floatProperty(), float(8.5));
+    QCOMPARE(object->colorProperty(), QColor("red"));
+    QCOMPARE(object->dateProperty(), QDate(1982, 11, 25));
+    QCOMPARE(object->timeProperty(), QTime(11, 11, 32));
+    QCOMPARE(object->dateTimeProperty(), QDateTime(QDate(2009, 5, 12), QTime(13, 22, 1)));
+    QCOMPARE(object->pointProperty(), QPoint(99,13));
+    QCOMPARE(object->pointFProperty(), QPointF((float)-10.1, (float)12.3));
+    QCOMPARE(object->sizeProperty(), QSize(99, 13));
+    QCOMPARE(object->sizeFProperty(), QSizeF((float)0.1, (float)0.2));
+    QCOMPARE(object->rectProperty(), QRect(9, 7, 100, 200));
+    QCOMPARE(object->rectFProperty(), QRectF((float)1000.1, (float)-10.9, (float)400, (float)90.99));
+    QCOMPARE(object->boolProperty(), true);
+    QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
+    QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2));
+    QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml")));
+    QVERIFY(object->objectProperty() != 0);
+    MyTypeObject *child = qobject_cast<MyTypeObject *>(object->objectProperty());
+    QVERIFY(child != 0);
+    QCOMPARE(child->intProperty(), 8);
+}
+
+// Test edge case type assignments
+void tst_qmllanguage::assignTypeExtremes()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("assignTypeExtremes.qml"));
+    VERIFY_ERRORS(0);
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->uintProperty(), 0xEE6B2800);
+    QCOMPARE(object->intProperty(), -0x77359400);
+}
+
+// Test that a composite type can assign to a property of its base type
+void tst_qmllanguage::assignCompositeToType()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("assignCompositeToType.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+}
+
+// Tests that custom parser types can be instantiated
+void tst_qmllanguage::customParserTypes()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("customParserTypes.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QVERIFY(object->property("count") == QVariant(2));
+}
+
+// Tests that the root item can be a custom component
+void tst_qmllanguage::rootAsQmlComponent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("rootAsQmlComponent.qml"));
+    VERIFY_ERRORS(0);
+    MyContainer *object = qobject_cast<MyContainer *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("x"), QVariant(11));
+    QCOMPARE(object->getChildren()->count(), 2);
+}
+
+// Tests that components can be specified inline
+void tst_qmllanguage::inlineQmlComponents()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("inlineQmlComponents.qml"));
+    VERIFY_ERRORS(0);
+    MyContainer *object = qobject_cast<MyContainer *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->getChildren()->count(), 1);
+    QDeclarativeComponent *comp = qobject_cast<QDeclarativeComponent *>(object->getChildren()->at(0));
+    QVERIFY(comp != 0);
+    MyQmlObject *compObject = qobject_cast<MyQmlObject *>(comp->create());
+    QVERIFY(compObject != 0);
+    QCOMPARE(compObject->value(), 11);
+}
+
+// Tests that types that have an id property have it set
+void tst_qmllanguage::idProperty()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("idProperty.qml"));
+    VERIFY_ERRORS(0);
+    MyContainer *object = qobject_cast<MyContainer *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->getChildren()->count(), 1);
+    MyTypeObject *child = 
+        qobject_cast<MyTypeObject *>(object->getChildren()->at(0));
+    QVERIFY(child != 0);
+    QCOMPARE(child->id(), QString("myObjectId"));
+    QCOMPARE(object->property("object"), QVariant::fromValue((QObject *)child));
+}
+
+// Tests that signals can be assigned to
+void tst_qmllanguage::assignSignal()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("assignSignal.qml"));
+    VERIFY_ERRORS(0);
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+    QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlot");
+    emit object->basicSignal();
+    QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlotWithArgs(9)");
+    emit object->basicParameterizedSignal(9);
+}
+
+// Tests the creation and assignment of dynamic properties
+void tst_qmllanguage::dynamicProperties()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicProperties.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("intProperty"), QVariant(10));
+    QCOMPARE(object->property("boolProperty"), QVariant(false));
+    QCOMPARE(object->property("doubleProperty"), QVariant(-10.1));
+    QCOMPARE(object->property("realProperty"), QVariant((qreal)-19.9));
+    QCOMPARE(object->property("stringProperty"), QVariant("Hello World!"));
+    QCOMPARE(object->property("urlProperty"), QVariant(TEST_FILE("main.qml")));
+    QCOMPARE(object->property("colorProperty"), QVariant(QColor("red")));
+    QCOMPARE(object->property("dateProperty"), QVariant(QDate(1945, 9, 2)));
+    QCOMPARE(object->property("varProperty"), QVariant("Hello World!"));
+    QCOMPARE(object->property("variantProperty"), QVariant(12));
+}
+
+// Test that nested types can use dynamic properties
+void tst_qmllanguage::dynamicPropertiesNested()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicPropertiesNested.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("super_a").toInt(), 11); // Overridden
+    QCOMPARE(object->property("super_c").toInt(), 14); // Inherited
+    QCOMPARE(object->property("a").toInt(), 13); // New
+    QCOMPARE(object->property("b").toInt(), 12); // New
+
+    delete object;
+}
+
+// Tests the creation and assignment to dynamic list properties
+void tst_qmllanguage::listProperties()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("listProperties.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toInt(), 2);
+}
+
+// Tests the creation and assignment of dynamic object properties
+// ### Not complete
+void tst_qmllanguage::dynamicObjectProperties()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicObjectProperties.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QVERIFY(object->property("objectProperty") == qVariantFromValue((QObject*)0));
+    QVERIFY(object->property("objectProperty2") != qVariantFromValue((QObject*)0));
+}
+
+// Tests the declaration of dynamic signals and slots
+void tst_qmllanguage::dynamicSignalsAndSlots()
+{
+    QTest::ignoreMessage(QtDebugMsg, "1921");
+
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicSignalsAndSlots.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QVERIFY(object->metaObject()->indexOfMethod("signal1()") != -1);
+    QVERIFY(object->metaObject()->indexOfMethod("signal2()") != -1);
+    QVERIFY(object->metaObject()->indexOfMethod("slot1()") != -1);
+    QVERIFY(object->metaObject()->indexOfMethod("slot2()") != -1);
+
+    QCOMPARE(object->property("test").toInt(), 0);
+    QMetaObject::invokeMethod(object, "slot3", Qt::DirectConnection, Q_ARG(QVariant, QVariant(10)));
+    QCOMPARE(object->property("test").toInt(), 10);
+}
+
+void tst_qmllanguage::simpleBindings()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("simpleBindings.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("value1"), QVariant(10));
+    QCOMPARE(object->property("value2"), QVariant(10));
+    QCOMPARE(object->property("value3"), QVariant(21));
+    QCOMPARE(object->property("value4"), QVariant(10));
+    QCOMPARE(object->property("objectProperty"), QVariant::fromValue(object));
+}
+
+void tst_qmllanguage::autoComponentCreation()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("autoComponentCreation.qml"));
+    VERIFY_ERRORS(0);
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QVERIFY(object->componentProperty() != 0);
+    MyTypeObject *child = qobject_cast<MyTypeObject *>(object->componentProperty()->create());
+    QVERIFY(child != 0);
+    QCOMPARE(child->realProperty(), qreal(9));
+}
+
+void tst_qmllanguage::propertyValueSource()
+{
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("propertyValueSource.qml"));
+    VERIFY_ERRORS(0);
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QList<QObject *> valueSources;
+    QObjectList allChildren = object->findChildren<QObject*>();
+    foreach (QObject *child, allChildren) {
+        if (qobject_cast<QDeclarativePropertyValueSource *>(child)) 
+            valueSources.append(child);
+    }
+
+    QCOMPARE(valueSources.count(), 1);
+    MyPropertyValueSource *valueSource = 
+        qobject_cast<MyPropertyValueSource *>(valueSources.at(0));
+    QVERIFY(valueSource != 0);
+    QCOMPARE(valueSource->prop.object(), object);
+    QCOMPARE(valueSource->prop.name(), QString(QLatin1String("intProperty")));
+    }
+
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("propertyValueSource.2.qml"));
+    VERIFY_ERRORS(0);
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QList<QObject *> valueSources;
+    QObjectList allChildren = object->findChildren<QObject*>();
+    foreach (QObject *child, allChildren) {
+        if (qobject_cast<QDeclarativePropertyValueSource *>(child)) 
+            valueSources.append(child);
+    }
+
+    QCOMPARE(valueSources.count(), 1);
+    MyPropertyValueSource *valueSource = 
+        qobject_cast<MyPropertyValueSource *>(valueSources.at(0));
+    QVERIFY(valueSource != 0);
+    QCOMPARE(valueSource->prop.object(), object);
+    QCOMPARE(valueSource->prop.name(), QString(QLatin1String("intProperty")));
+    }
+}
+
+void tst_qmllanguage::attachedProperties()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("attachedProperties.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QObject *attached = qmlAttachedPropertiesObject<MyQmlObject>(object);
+    QVERIFY(attached != 0);
+    QCOMPARE(attached->property("value"), QVariant(10));
+    QCOMPARE(attached->property("value2"), QVariant(13));
+}
+
+// Tests non-static object properties
+void tst_qmllanguage::dynamicObjects()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicObject.1.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+}
+
+// Tests the registration of custom variant string converters
+void tst_qmllanguage::customVariantTypes()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("customVariantTypes.qml"));
+    VERIFY_ERRORS(0);
+    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->customType().a, 10);
+}
+
+void tst_qmllanguage::valueTypes()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("valueTypes.qml"));
+    VERIFY_ERRORS(0);
+
+    QString message = QLatin1String("QML MyTypeObject (") + component.url().toString() + 
+                      QLatin1String(":2:1) Binding loop detected for property \"rectProperty.width\"");
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
+
+    MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
+    QVERIFY(object != 0);
+
+
+    QCOMPARE(object->rectProperty(), QRect(10, 11, 12, 13));
+    QCOMPARE(object->rectProperty2(), QRect(10, 11, 12, 13));
+    QCOMPARE(object->intProperty(), 10);
+    object->doAction();
+    QCOMPARE(object->rectProperty(), QRect(12, 11, 14, 13));
+    QCOMPARE(object->rectProperty2(), QRect(12, 11, 14, 13));
+    QCOMPARE(object->intProperty(), 12);
+
+    // ###
+#if 0
+    QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "rectProperty.x");
+    QCOMPARE(p.read(), QVariant(12));
+    p.write(13);
+    QCOMPARE(p.read(), QVariant(13));
+
+    quint32 r = QDeclarativeMetaPropertyPrivate::saveValueType(p.coreIndex(), p.valueTypeCoreIndex());
+    QDeclarativeMetaProperty p2;
+    QDeclarativeMetaPropertyPrivate::restore(p2, r, object);
+    QCOMPARE(p2.read(), QVariant(13));
+#endif
+}
+
+void tst_qmllanguage::cppnamespace()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("cppnamespace.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("cppnamespace.2.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        delete object;
+    }
+}
+
+void tst_qmllanguage::aliasProperties()
+{
+    // Simple "int" alias
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.1.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        // Read through alias
+        QCOMPARE(object->property("valueAlias").toInt(), 10);
+        object->setProperty("value", QVariant(13));
+        QCOMPARE(object->property("valueAlias").toInt(), 13);
+
+        // Write throught alias
+        object->setProperty("valueAlias", QVariant(19));
+        QCOMPARE(object->property("valueAlias").toInt(), 19);
+        QCOMPARE(object->property("value").toInt(), 19);
+
+        delete object;
+    }
+
+    // Complex object alias
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.2.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        // Read through alias
+        MyQmlObject *v = 
+            qvariant_cast<MyQmlObject *>(object->property("aliasObject"));
+        QVERIFY(v != 0);
+        QCOMPARE(v->value(), 10);
+
+        // Write through alias
+        MyQmlObject *v2 = new MyQmlObject();
+        v2->setParent(object);
+        object->setProperty("aliasObject", qVariantFromValue(v2));
+        MyQmlObject *v3 = 
+            qvariant_cast<MyQmlObject *>(object->property("aliasObject"));
+        QVERIFY(v3 != 0);
+        QCOMPARE(v3, v2);
+
+        delete object;
+    }
+
+    // Nested aliases
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.3.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("value").toInt(), 1892);
+        QCOMPARE(object->property("value2").toInt(), 1892);
+
+        object->setProperty("value", QVariant(1313));
+        QCOMPARE(object->property("value").toInt(), 1313);
+        QCOMPARE(object->property("value2").toInt(), 1313);
+
+        object->setProperty("value2", QVariant(8080));
+        QCOMPARE(object->property("value").toInt(), 8080);
+        QCOMPARE(object->property("value2").toInt(), 8080);
+
+        delete object;
+    }
+
+    // Enum aliases
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.4.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("enumAlias").toInt(), 1);
+
+        delete object;
+    }
+
+    // Id aliases
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.5.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QVariant v = object->property("otherAlias");
+        QCOMPARE(v.userType(), qMetaTypeId<MyQmlObject*>());
+        MyQmlObject *o = qvariant_cast<MyQmlObject*>(v);
+        QCOMPARE(o->value(), 10);
+
+        delete o;
+
+        v = object->property("otherAlias");
+        QCOMPARE(v.userType(), qMetaTypeId<MyQmlObject*>());
+        o = qvariant_cast<MyQmlObject*>(v);
+        QVERIFY(o == 0);
+
+        delete object;
+    }
+
+    // Nested aliases - this used to cause a crash
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.6.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("a").toInt(), 1923);
+    }
+
+    // Ptr Alias Cleanup - check that aliases to ptr types return 0 
+    // if the object aliased to is removed
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.7.qml"));
+        VERIFY_ERRORS(0);
+
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QObject *object1 = qvariant_cast<QObject *>(object->property("object"));
+        QVERIFY(object1 != 0);
+        QObject *object2 = qvariant_cast<QObject *>(object1->property("object"));
+        QVERIFY(object2 != 0);
+
+        QObject *alias = qvariant_cast<QObject *>(object->property("aliasedObject"));
+        QVERIFY(alias == object2);
+
+        delete object1;
+
+        QObject *alias2 = object; // "Random" start value
+        int status = -1;
+        void *a[] = { &alias2, 0, &status };
+        QMetaObject::metacall(object, QMetaObject::ReadProperty,
+                              object->metaObject()->indexOfProperty("aliasedObject"), a);
+        QVERIFY(alias2 == 0);
+    }
+
+    // Simple composite type
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.8.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("value").toInt(), 10);
+
+        delete object;
+    }
+
+    // Complex composite type
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.9.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("value").toInt(), 10);
+
+        delete object;
+    }
+}
+
+// Test that the root element in a composite type can be a Component
+void tst_qmllanguage::componentCompositeType()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("componentCompositeType.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+}
+
+class TestType : public QObject {
+    Q_OBJECT
+public:
+    TestType(QObject *p=0) : QObject(p) {}
+};
+
+class TestType2 : public QObject {
+    Q_OBJECT
+public:
+    TestType2(QObject *p=0) : QObject(p) {}
+};
+
+void tst_qmllanguage::i18n_data()
+{
+    QTest::addColumn<QString>("file");
+    QTest::addColumn<QString>("stringProperty");
+    QTest::newRow("i18nStrings") << "i18nStrings.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245 (5 accented 'a' letters)");
+    QTest::newRow("i18nDeclaredPropertyNames") << "i18nDeclaredPropertyNames.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 10");
+    QTest::newRow("i18nDeclaredPropertyUse") << "i18nDeclaredPropertyUse.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 15");
+    QTest::newRow("i18nScript") << "i18nScript.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 20");
+    QTest::newRow("i18nType") << "i18nType.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 30");
+    QTest::newRow("i18nNameSpace") << "i18nNameSpace.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 40");
+}
+
+void tst_qmllanguage::i18n()
+{
+    QFETCH(QString, file);
+    QFETCH(QString, stringProperty);
+    QDeclarativeComponent component(&engine, TEST_FILE(file));
+    VERIFY_ERRORS(0);
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->stringProperty(), stringProperty);
+
+    delete object;
+}
+
+// Check that the Component::onCompleted attached property works
+void tst_qmllanguage::onCompleted()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("onCompleted.qml"));
+    VERIFY_ERRORS(0);
+    QTest::ignoreMessage(QtDebugMsg, "Completed 6 10");
+    QTest::ignoreMessage(QtDebugMsg, "Completed 6 10");
+    QTest::ignoreMessage(QtDebugMsg, "Completed 10 11");
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+}
+
+// Check that assignments to QDeclarativeScriptString properties work
+void tst_qmllanguage::scriptString()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptString.qml"));
+    VERIFY_ERRORS(0);
+
+    MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
+    QVERIFY(object != 0);
+    QCOMPARE(object->scriptProperty().script(), QString("foo + bar"));
+    QCOMPARE(object->scriptProperty().scopeObject(), object);
+    QCOMPARE(object->scriptProperty().context(), qmlContext(object));
+
+    QVERIFY(object->grouped() != 0);
+    QCOMPARE(object->grouped()->script().script(), QString("console.log(1921)"));
+    QCOMPARE(object->grouped()->script().scopeObject(), object);
+    QCOMPARE(object->grouped()->script().context(), qmlContext(object));
+}
+
+// Check that default property assignments are correctly spliced into explicit 
+// property assignments
+void tst_qmllanguage::defaultPropertyListOrder()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("defaultPropertyListOrder.qml"));
+    VERIFY_ERRORS(0);
+
+    MyContainer *container = qobject_cast<MyContainer *>(component.create());
+    QVERIFY(container  != 0);
+
+    QCOMPARE(container->getChildren()->count(), 6);
+    QCOMPARE(container->getChildren()->at(0)->property("index"), QVariant(0));
+    QCOMPARE(container->getChildren()->at(1)->property("index"), QVariant(1));
+    QCOMPARE(container->getChildren()->at(2)->property("index"), QVariant(2));
+    QCOMPARE(container->getChildren()->at(3)->property("index"), QVariant(3));
+    QCOMPARE(container->getChildren()->at(4)->property("index"), QVariant(4));
+    QCOMPARE(container->getChildren()->at(5)->property("index"), QVariant(5));
+}
+
+void tst_qmllanguage::declaredPropertyValues()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("declaredPropertyValues.qml"));
+    QEXPECT_FAIL("", "QTBUG-7860", Abort);
+    VERIFY_ERRORS(0);
+}
+
+// Check that first child of qml is of given type. Empty type insists on error.
+void tst_qmllanguage::testType(const QString& qml, const QString& type)
+{
+    QDeclarativeComponent component(&engine);
+    component.setData(qml.toUtf8(), TEST_FILE("empty.qml")); // just a file for relative local imports
+
+    QTRY_VERIFY(!component.isLoading());
+
+    if (type.isEmpty()) {
+        QVERIFY(component.isError());
+    } else {
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        QCOMPARE(QString(object->metaObject()->className()), type);
+    }
+}
+
+QML_DECLARE_TYPE(TestType)
+QML_DECLARE_TYPE(TestType2)
+
+// Import tests (QT-558)
+
+void tst_qmllanguage::importsBuiltin_data()
+{
+    // QT-610
+
+    QTest::addColumn<QString>("qml");
+    QTest::addColumn<QString>("type");
+
+    // import built-ins
+    QTest::newRow("missing import")
+        << "Test {}"
+        << "";
+    QTest::newRow("not in version 0.0")
+        << "import com.nokia.Test 0.0\n"
+           "Test {}"
+        << "";
+    QTest::newRow("in version 0.0")
+        << "import com.nokia.Test 0.0\n"
+           "TestTP {}"
+        << "TestType";
+    QTest::newRow("qualified in version 0.0")
+        << "import com.nokia.Test 0.0 as T\n"
+           "T.TestTP {}"
+        << "TestType";
+    QTest::newRow("in version 1.0")
+        << "import com.nokia.Test 1.0\n"
+           "Test {}"
+        << "TestType";
+    QTest::newRow("qualified wrong")
+        << "import com.nokia.Test 1.0 as T\n" // QT-610
+           "Test {}"
+        << "";
+    QTest::newRow("qualified right")
+        << "import com.nokia.Test 1.0 as T\n"
+           "T.Test {}"
+        << "TestType";
+    QTest::newRow("qualified right but not in version 0.0")
+        << "import com.nokia.Test 0.0 as T\n"
+           "T.Test {}"
+        << "";
+    QTest::newRow("in version 1.1")
+        << "import com.nokia.Test 1.1\n"
+           "Test {}"
+        << "TestType";
+    QTest::newRow("in version 1.3")
+        << "import com.nokia.Test 1.3\n"
+           "Test {}"
+        << "TestType";
+    QTest::newRow("in version 1.5")
+        << "import com.nokia.Test 1.5\n"
+           "Test {}"
+        << "TestType";
+    QTest::newRow("changed in version 1.8")
+        << "import com.nokia.Test 1.8\n"
+           "Test {}"
+        << "TestType2";
+    QTest::newRow("in version 1.12")
+        << "import com.nokia.Test 1.12\n"
+           "Test {}"
+        << "TestType2";
+    QTest::newRow("old in version 1.9")
+        << "import com.nokia.Test 1.9\n"
+           "OldTest {}"
+        << "TestType";
+    QTest::newRow("old in version 1.11")
+        << "import com.nokia.Test 1.11\n"
+           "OldTest {}"
+        << "TestType";
+    QTest::newRow("multiversion 1")
+        << "import com.nokia.Test 1.11\n"
+           "import com.nokia.Test 1.12\n"
+           "Test {}"
+        << "TestType2";
+    QTest::newRow("multiversion 2")
+        << "import com.nokia.Test 1.11\n"
+           "import com.nokia.Test 1.12\n"
+           "OldTest {}"
+        << "TestType";
+    QTest::newRow("qualified multiversion 3")
+        << "import com.nokia.Test 1.0 as T0\n"
+           "import com.nokia.Test 1.8 as T8\n"
+           "T0.Test {}"
+        << "TestType";
+    QTest::newRow("qualified multiversion 4")
+        << "import com.nokia.Test 1.0 as T0\n"
+           "import com.nokia.Test 1.8 as T8\n"
+           "T8.Test {}"
+        << "TestType2";
+}
+
+void tst_qmllanguage::importsBuiltin()
+{
+    QFETCH(QString, qml);
+    QFETCH(QString, type);
+    testType(qml,type);
+}
+
+void tst_qmllanguage::importsLocal_data()
+{
+    QTest::addColumn<QString>("qml");
+    QTest::addColumn<QString>("type");
+
+    // import locals
+    QTest::newRow("local import")
+        << "import \"subdir\"\n" // QT-613
+           "Test {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("local import second")
+        << "import Qt 4.6\nimport \"subdir\"\n"
+           "Test {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("local import subsubdir")
+        << "import Qt 4.6\nimport \"subdir/subsubdir\"\n"
+           "SubTest {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("local import QTBUG-7721 A")
+        << "subdir.Test {}" // no longer allowed (QTBUG-7721)
+        << "";
+    QTest::newRow("local import QTBUG-7721 B")
+        << "import \"subdir\" as X\n"
+           "X.subsubdir.SubTest {}" // no longer allowed (QTBUG-7721)
+        << "";
+    QTest::newRow("local import as")
+        << "import \"subdir\" as T\n"
+           "T.Test {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("wrong local import as")
+        << "import \"subdir\" as T\n"
+           "Test {}"
+        << "";
+    QTest::newRow("library precedence over local import")
+        << "import \"subdir\"\n"
+           "import com.nokia.Test 1.0\n"
+           "Test {}"
+        << "TestType";
+}
+
+void tst_qmllanguage::importsLocal()
+{
+    QFETCH(QString, qml);
+    QFETCH(QString, type);
+    testType(qml,type);
+}
+
+void tst_qmllanguage::importsRemote_data()
+{
+    QTest::addColumn<QString>("qml");
+    QTest::addColumn<QString>("type");
+
+    QString serverdir = "http://127.0.0.1:14445/qtest/declarative/qmllanguage";
+
+    QTest::newRow("remote import") << "import \""+serverdir+"\"\nTest {}" << "QDeclarativeRectangle";
+    QTest::newRow("remote import with subdir") << "import \""+serverdir+"\"\nTestSubDir {}" << "QDeclarativeText";
+    QTest::newRow("remote import with local") << "import \""+serverdir+"\"\nTestLocal {}" << "QDeclarativeImage";
+}
+
+#include "testhttpserver.h"
+
+void tst_qmllanguage::importsRemote()
+{
+    QFETCH(QString, qml);
+    QFETCH(QString, type);
+
+    TestHTTPServer server(14445);
+    server.serveDirectory(SRCDIR);
+
+    testType(qml,type);
+}
+
+void tst_qmllanguage::importsInstalled_data()
+{
+    // QT-610
+
+    QTest::addColumn<QString>("qml");
+    QTest::addColumn<QString>("type");
+
+    // import installed
+    QTest::newRow("installed import 0")
+        << "import com.nokia.installedtest 0.0\n"
+           "InstalledTestTP {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("installed import 0 as TP")
+        << "import com.nokia.installedtest 0.0 as TP\n"
+           "TP.InstalledTestTP {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("installed import 1")
+        << "import com.nokia.installedtest 1.0\n"
+           "InstalledTest {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("installed import 2")
+        << "import com.nokia.installedtest 1.3\n"
+           "InstalledTest {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("installed import 3")
+        << "import com.nokia.installedtest 1.4\n"
+           "InstalledTest {}"
+        << "QDeclarativeText";
+    QTest::newRow("installed import 4")
+        << "import com.nokia.installedtest 1.10\n"
+           "InstalledTest {}"
+        << "QDeclarativeText";
+    QTest::newRow("installed import visibility") // QT-614
+        << "import com.nokia.installedtest 1.4\n"
+           "PrivateType {}"
+        << "";
+}
+
+void tst_qmllanguage::importsInstalled()
+{
+    QFETCH(QString, qml);
+    QFETCH(QString, type);
+    testType(qml,type);
+}
+
+
+void tst_qmllanguage::importsOrder_data()
+{
+    QTest::addColumn<QString>("qml");
+    QTest::addColumn<QString>("type");
+
+    QTest::newRow("installed import overrides 1") <<
+           "import com.nokia.installedtest 1.0\n"
+           "import com.nokia.installedtest 1.4\n"
+           "InstalledTest {}"
+        << "QDeclarativeText";
+    QTest::newRow("installed import overrides 2") <<
+           "import com.nokia.installedtest 1.4\n"
+           "import com.nokia.installedtest 1.0\n"
+           "InstalledTest {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("installed import re-overrides 1") <<
+           "import com.nokia.installedtest 1.4\n"
+           "import com.nokia.installedtest 1.0\n"
+           "import com.nokia.installedtest 1.4\n"
+           "InstalledTest {}"
+        << "QDeclarativeText";
+    QTest::newRow("installed import re-overrides 2") <<
+           "import com.nokia.installedtest 1.4\n"
+           "import com.nokia.installedtest 1.0\n"
+           "import com.nokia.installedtest 1.4\n"
+           "import com.nokia.installedtest 1.0\n"
+           "InstalledTest {}"
+        << "QDeclarativeRectangle";
+
+    QTest::newRow("installed import versus builtin 1") <<
+           "import com.nokia.installedtest 1.5\n"
+           "import Qt 4.6\n"
+           "Rectangle {}"
+        << "QDeclarativeRectangle";
+    QTest::newRow("installed import versus builtin 2") <<
+           "import Qt 4.6\n"
+           "import com.nokia.installedtest 1.5\n"
+           "Rectangle {}"
+        << "QDeclarativeText";
+    QTest::newRow("namespaces cannot be overridden by types 1") <<
+           "import Qt 4.6 as Rectangle\n"
+           "import com.nokia.installedtest 1.5\n"
+           "Rectangle {}"
+        << "";
+    QTest::newRow("namespaces cannot be overridden by types 2") <<
+           "import Qt 4.6 as Rectangle\n"
+           "import com.nokia.installedtest 1.5\n"
+           "Rectangle.Image {}"
+        << "QDeclarativeImage";
+}
+
+void tst_qmllanguage::importsOrder()
+{
+    QFETCH(QString, qml);
+    QFETCH(QString, type);
+    testType(qml,type);
+}
+
+void tst_qmllanguage::qmlAttachedPropertiesObjectMethod()
+{
+    QObject object;
+
+    QCOMPARE(qmlAttachedPropertiesObject<MyQmlObject>(&object, false), (QObject *)0);
+    QCOMPARE(qmlAttachedPropertiesObject<MyQmlObject>(&object, true), (QObject *)0);
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("qmlAttachedPropertiesObjectMethod.1.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(qmlAttachedPropertiesObject<MyQmlObject>(object, false), (QObject *)0);
+        QVERIFY(qmlAttachedPropertiesObject<MyQmlObject>(object, true) != 0);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("qmlAttachedPropertiesObjectMethod.2.qml"));
+        VERIFY_ERRORS(0);
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QVERIFY(qmlAttachedPropertiesObject<MyQmlObject>(object, false) != 0);
+        QVERIFY(qmlAttachedPropertiesObject<MyQmlObject>(object, true) != 0);
+    }
+}
+
+void tst_qmllanguage::crash1()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6\nComponent {}", QUrl());
+}
+
+void tst_qmllanguage::crash2()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("crash2.qml"));
+}
+
+
+void tst_qmllanguage::initTestCase()
+{
+    registerTypes();
+
+    QML_REGISTER_TYPE(com.nokia.Test, 0, 0, TestTP, TestType);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 0, Test, TestType);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 5, Test, TestType);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 8, Test, TestType2);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 9, OldTest, TestType);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 12, Test, TestType2);
+
+    // Create locale-specific file
+    // For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit
+    // For iso8859-1 locale, this will just be data/I18nType?????.qml where ????? is 5 8-bit characters
+    // For utf-8 locale, this will be data/I18nType??????????.qml where ?????????? is 5 8-bit characters, UTF-8 encoded
+    QFile in(TEST_FILE(QLatin1String("I18nType30.qml")).toLocalFile());
+    QVERIFY(in.open(QIODevice::ReadOnly));
+    QFile out(TEST_FILE(QString::fromUtf8("I18nType\303\201\303\242\303\243\303\244\303\245.qml")).toLocalFile());
+    QVERIFY(out.open(QIODevice::WriteOnly));
+    out.write(in.readAll());
+}
+
+QTEST_MAIN(tst_qmllanguage)
+
+#include "tst_qdeclarativelanguage.moc"
diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro
new file mode 100644
index 0000000..d728d08
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+QT += script
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativelistmodel.cpp
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
new file mode 100644
index 0000000..390ebe0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -0,0 +1,346 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/private/qdeclarativelistmodel_p.h>
+#include <QtDeclarative/private/qdeclarativeexpression_p.h>
+#include <QDeclarativeComponent>
+#include <QDebug>
+
+class tst_QmlListModel : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlListModel() {}
+
+private slots:
+    void static_types();
+    void static_types_data();
+    void static_i18n();
+    void static_nestedElements();
+    void static_nestedElements_data();
+    void dynamic_data();
+    void dynamic();
+    void error_data();
+    void error();
+};
+
+void tst_QmlListModel::static_i18n()
+{
+    QString expect = QString::fromUtf8("na\303\257ve");
+    QString componentStr = "import Qt 4.6\nListModel { ListElement { prop1: \""+expect+"\" } }";
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
+    QDeclarativeListModel *obj = qobject_cast<QDeclarativeListModel*>(component.create());
+    QVERIFY(obj != 0);
+    QString prop = obj->get(0).property(QLatin1String("prop1")).toString();
+    QCOMPARE(prop,expect);
+    delete obj;
+}
+
+void tst_QmlListModel::static_nestedElements()
+{
+    QFETCH(int, elementCount);
+
+    QStringList elements;
+    for (int i=0; i<elementCount; i++) 
+        elements.append("ListElement { a: 1; b: 2 }");
+    QString elementsStr = elements.join(",\n") + "\n";
+
+    QString componentStr = 
+        "import Qt 4.6\n"
+        "ListModel {\n"
+        "   ListElement {\n"
+        "       attributes: [\n";
+    componentStr += elementsStr.toUtf8().constData();
+    componentStr += 
+        "       ]\n"
+        "   }\n"
+        "}";
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
+
+    QDeclarativeListModel *obj = qobject_cast<QDeclarativeListModel*>(component.create());
+    QVERIFY(obj != 0);
+
+    QScriptValue prop = obj->get(0).property(QLatin1String("attributes")).property(QLatin1String("count"));
+    QVERIFY(prop.isNumber());
+    QCOMPARE(prop.toInt32(), qint32(elementCount));
+
+    delete obj;
+}
+
+void tst_QmlListModel::static_nestedElements_data()
+{
+    QTest::addColumn<int>("elementCount");
+
+    QTest::newRow("0 items") << 0;
+    QTest::newRow("1 item") << 1;
+    QTest::newRow("2 items") << 2;
+    QTest::newRow("many items") << 5;
+}
+
+void tst_QmlListModel::dynamic_data()
+{
+    QTest::addColumn<QString>("script");
+    QTest::addColumn<int>("result");
+    QTest::addColumn<QString>("warning");
+
+    // Simple flat model
+
+    QTest::newRow("count") << "count" << 0 << "";
+
+    QTest::newRow("get1") << "{get(0)}" << 0 << "QML ListModel (unknown location) get: index 0 out of range";
+    QTest::newRow("get2") << "{get(-1)}" << 0 << "QML ListModel (unknown location) get: index -1 out of range";
+
+    QTest::newRow("append1") << "{append({'foo':123});count}" << 1 << "";
+    QTest::newRow("append2") << "{append({'foo':123,'bar':456});count}" << 1 << "";
+    QTest::newRow("append3a") << "{append({'foo':123});append({'foo':456});get(0).foo}" << 123 << "";
+    QTest::newRow("append3b") << "{append({'foo':123});append({'foo':456});get(1).foo}" << 456 << "";
+    QTest::newRow("append4a") << "{append(123)}" << 0 << "QML ListModel (unknown location) append: value is not an object";
+    QTest::newRow("append4b") << "{append([1,2,3])}" << 0 << "QML ListModel (unknown location) append: value is not an object";
+
+    QTest::newRow("clear1") << "{append({'foo':456});clear();count}" << 0 << "";
+    QTest::newRow("clear2") << "{append({'foo':123});append({'foo':456});clear();count}" << 0 << "";
+    QTest::newRow("clear2") << "{append({'foo':123});clear();get(0).foo}" << 0 << "QML ListModel (unknown location) get: index 0 out of range";
+
+    QTest::newRow("remove1") << "{append({'foo':123});remove(0);count}" << 0 << "";
+    QTest::newRow("remove2a") << "{append({'foo':123});append({'foo':456});remove(0);count}" << 1 << "";
+    QTest::newRow("remove2b") << "{append({'foo':123});append({'foo':456});remove(0);get(0).foo}" << 456 << "";
+    QTest::newRow("remove2c") << "{append({'foo':123});append({'foo':456});remove(1);get(0).foo}" << 123 << "";
+    QTest::newRow("remove3") << "{append({'foo':123});remove(0);get(0).foo}" << 0 << "QML ListModel (unknown location) get: index 0 out of range";
+    QTest::newRow("remove3a") << "{append({'foo':123});remove(-1)}" << 0 << "QML ListModel (unknown location) remove: index -1 out of range";
+    QTest::newRow("remove4a") << "{remove(0)}" << 0 << "QML ListModel (unknown location) remove: index 0 out of range";
+    QTest::newRow("remove4b") << "{append({'foo':123});remove(0);remove(0)}" << 0 << "QML ListModel (unknown location) remove: index 0 out of range";
+    QTest::newRow("remove4c") << "{append({'foo':123});remove(1)}" << 0 << "QML ListModel (unknown location) remove: index 1 out of range";
+
+    QTest::newRow("insert1") << "{insert(0,{'foo':123});count}" << 1 << "";
+    QTest::newRow("insert2") << "{insert(1,{'foo':123});count}" << 0 << "QML ListModel (unknown location) insert: index 1 out of range";
+    QTest::newRow("insert3a") << "{append({'foo':123});insert(1,{'foo':456});count}" << 2 << "";
+    QTest::newRow("insert3b") << "{append({'foo':123});insert(1,{'foo':456});get(0).foo}" << 123 << "";
+    QTest::newRow("insert3c") << "{append({'foo':123});insert(1,{'foo':456});get(1).foo}" << 456 << "";
+    QTest::newRow("insert3d") << "{append({'foo':123});insert(0,{'foo':456});get(0).foo}" << 456 << "";
+    QTest::newRow("insert3e") << "{append({'foo':123});insert(0,{'foo':456});get(1).foo}" << 123 << "";
+    QTest::newRow("insert4") << "{append({'foo':123});insert(-1,{'foo':456})}" << 0 << "QML ListModel (unknown location) insert: index -1 out of range";
+    QTest::newRow("insert5a") << "{insert(0,123)}" << 0 << "QML ListModel (unknown location) insert: value is not an object";
+    QTest::newRow("insert5b") << "{insert(0,[1,2,3])}" << 0 << "QML ListModel (unknown location) insert: value is not an object";
+
+    QTest::newRow("set1") << "{append({'foo':123});set(0,{'foo':456});count}" << 1 << "";
+    QTest::newRow("set2") << "{append({'foo':123});set(0,{'foo':456});get(0).foo}" << 456 << "";
+    QTest::newRow("set3a") << "{append({'foo':123,'bar':456});set(0,{'foo':999});get(0).foo}" << 999 << "";
+    QTest::newRow("set3b") << "{append({'foo':123,'bar':456});set(0,{'foo':999});get(0).bar}" << 456 << "";
+    QTest::newRow("set4a") << "{set(0,{'foo':456})}" << 0 << "QML ListModel (unknown location) set: index 0 out of range";
+    QTest::newRow("set4c") << "{set(-1,{'foo':456})}" << 0 << "QML ListModel (unknown location) set: index -1 out of range";
+    QTest::newRow("set5a") << "{append({'foo':123,'bar':456});set(0,123)}" << 0 << "QML ListModel (unknown location) set: value is not an object";
+    QTest::newRow("set5b") << "{append({'foo':123,'bar':456});set(0,[1,2,3])}" << 0 << "QML ListModel (unknown location) set: value is not an object";
+    QTest::newRow("set6") << "{append({'foo':123});set(1,{'foo':456});count}" << 2 << "";
+
+    QTest::newRow("setprop1") << "{append({'foo':123});setProperty(0,'foo',456);count}" << 1 << "";
+    QTest::newRow("setprop2") << "{append({'foo':123});setProperty(0,'foo',456);get(0).foo}" << 456 << "";
+    QTest::newRow("setprop3a") << "{append({'foo':123,'bar':456});setProperty(0,'foo',999);get(0).foo}" << 999 << "";
+    QTest::newRow("setprop3b") << "{append({'foo':123,'bar':456});setProperty(0,'foo',999);get(0).bar}" << 456 << "";
+    QTest::newRow("setprop4a") << "{setProperty(0,'foo',456)}" << 0 << "QML ListModel (unknown location) set: index 0 out of range";
+    QTest::newRow("setprop4b") << "{setProperty(-1,'foo',456)}" << 0 << "QML ListModel (unknown location) set: index -1 out of range";
+    QTest::newRow("setprop4c") << "{append({'foo':123,'bar':456});setProperty(1,'foo',456)}" << 0 << "QML ListModel (unknown location) set: index 1 out of range";
+    QTest::newRow("setprop5") << "{append({'foo':123,'bar':456});append({'foo':111});setProperty(1,'bar',222);get(1).bar}" << 222 << "";
+
+    QTest::newRow("move1a") << "{append({'foo':123});append({'foo':456});move(0,1,1);count}" << 2 << "";
+    QTest::newRow("move1b") << "{append({'foo':123});append({'foo':456});move(0,1,1);get(0).foo}" << 456 << "";
+    QTest::newRow("move1c") << "{append({'foo':123});append({'foo':456});move(0,1,1);get(1).foo}" << 123 << "";
+    QTest::newRow("move1d") << "{append({'foo':123});append({'foo':456});move(1,0,1);get(0).foo}" << 456 << "";
+    QTest::newRow("move1e") << "{append({'foo':123});append({'foo':456});move(1,0,1);get(1).foo}" << 123 << "";
+    QTest::newRow("move2a") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);count}" << 3 << "";
+    QTest::newRow("move2b") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);get(0).foo}" << 789 << "";
+    QTest::newRow("move2c") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);get(1).foo}" << 123 << "";
+    QTest::newRow("move2d") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);get(2).foo}" << 456 << "";
+    QTest::newRow("move3a") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(1,0,3)}" << 0 << "QML ListModel (unknown location) move: out of range";
+    QTest::newRow("move3b") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(1,-1,1)}" << 0 << "QML ListModel (unknown location) move: out of range";
+    QTest::newRow("move3c") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(1,0,-1)}" << 0 << "QML ListModel (unknown location) move: out of range";
+    QTest::newRow("move3d") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,3,1)}" << 0 << "QML ListModel (unknown location) move: out of range";
+
+    // Structured model
+
+    QTest::newRow("listprop1a") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});count}" << 1 << "";
+    QTest::newRow("listprop1b") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.get(1).a}" << 2 << "";
+    QTest::newRow("listprop2a") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.append({'a':4});get(0).bars.get(3).a}" << 4 << "";
+}
+
+void tst_QmlListModel::dynamic()
+{
+    QFETCH(QString, script);
+    QFETCH(int, result);
+    QFETCH(QString, warning);
+
+    QDeclarativeEngine engine;
+    QDeclarativeListModel model;
+    QDeclarativeEngine::setContextForObject(&model,engine.rootContext());
+    engine.rootContext()->addDefaultObject(&model);
+    QDeclarativeExpression e(engine.rootContext(), script, &model);
+    if (!warning.isEmpty())
+        QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
+    int actual = e.value().toInt();
+    if (e.hasError())
+        qDebug() << e.error(); // errors not expected
+    QVERIFY(!e.hasError());
+    QCOMPARE(actual,result);
+}
+
+void tst_QmlListModel::static_types_data()
+{
+    QTest::addColumn<QString>("qml");
+    QTest::addColumn<QVariant>("value");
+
+    QTest::newRow("string")
+        << "ListElement { foo: \"bar\" }"
+        << QVariant(QString("bar"));
+
+    QTest::newRow("real")
+        << "ListElement { foo: 10.5 }"
+        << QVariant(10.5);
+
+    QTest::newRow("real0")
+        << "ListElement { foo: 0 }"
+        << QVariant(double(0));
+
+    QTest::newRow("bool")
+        << "ListElement { foo: false }"
+        << QVariant(false);
+
+    QTest::newRow("bool")
+        << "ListElement { foo: true }"
+        << QVariant(true);
+
+    QTest::newRow("enum")
+        << "ListElement { foo: Text.AlignHCenter }"
+        << QVariant("QTBUG-5974:ListElement: constant script support for property value");
+}
+
+void tst_QmlListModel::static_types()
+{
+    QFETCH(QString, qml);
+    QFETCH(QVariant, value);
+
+    qml = "import Qt 4.6\nListModel { " + qml + " }";
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(qml.toUtf8(),
+                      QUrl::fromLocalFile(QString("dummy.qml")));
+
+    if (value.toString().startsWith("QTBUG-"))
+        QEXPECT_FAIL("",value.toString().toLatin1(),Abort);
+
+    QVERIFY(!component.isError());
+
+    QDeclarativeListModel *obj = qobject_cast<QDeclarativeListModel*>(component.create());
+    QVERIFY(obj != 0);
+
+    QScriptValue actual = obj->get(0).property(QLatin1String("foo"));
+
+    QCOMPARE(actual.isString(), value.type() == QVariant::String);
+    QCOMPARE(actual.isBoolean(), value.type() == QVariant::Bool);
+    QCOMPARE(actual.isNumber(), value.type() == QVariant::Double);
+
+    QCOMPARE(actual.toString(), value.toString());
+
+    delete obj;
+}
+
+void tst_QmlListModel::error_data()
+{
+    QTest::addColumn<QString>("qml");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("id not allowed in ListElement")
+        << "import Qt 4.6\nListModel { ListElement { id: fred } }"
+        << "ListElement: cannot use reserved \"id\" property";
+
+    QTest::newRow("id allowed in ListModel")
+        << "import Qt 4.6\nListModel { id:model }"
+        << "";
+
+    QTest::newRow("random properties not allowed in ListModel")
+        << "import Qt 4.6\nListModel { foo:123 }"
+        << "ListModel: undefined property 'foo'";
+
+    QTest::newRow("random properties allowed in ListElement")
+        << "import Qt 4.6\nListModel { ListElement { foo:123 } }"
+        << "";
+
+    QTest::newRow("bindings not allowed in ListElement")
+        << "import Qt 4.6\nRectangle { id: rect; ListModel { ListElement { foo: rect.color } } }"
+        << "ListElement: cannot use script for property value"; // but note QTBUG-5974
+
+    QTest::newRow("random object list properties allowed in ListElement")
+        << "import Qt 4.6\nListModel { ListElement { foo: [ ListElement { bar: 123 } ] } }"
+        << "";
+
+    QTest::newRow("default properties not allowed in ListElement")
+        << "import Qt 4.6\nListModel { ListElement { Item { } } }"
+        << "QTBUG-6082 ListElement should not allow child objects";
+}
+
+void tst_QmlListModel::error()
+{
+    QFETCH(QString, qml);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(qml.toUtf8(),
+                      QUrl::fromLocalFile(QString("dummy.qml")));
+    if (error.isEmpty()) {
+        QVERIFY(!component.isError());
+    } else {
+        if (error.startsWith(QLatin1String("QTBUG-")))
+            QEXPECT_FAIL("",error.toLatin1(),Abort);
+        QVERIFY(component.isError());
+        QList<QDeclarativeError> errors = component.errors();
+        QCOMPARE(errors.count(),1);
+        QCOMPARE(errors.at(0).description(),error);
+    }
+}
+
+QTEST_MAIN(tst_QmlListModel)
+
+#include "tst_qdeclarativelistmodel.moc"
diff --git a/tests/auto/declarative/qdeclarativelistreference/data/MyType.qml b/tests/auto/declarative/qdeclarativelistreference/data/MyType.qml
new file mode 100644
index 0000000..d08f35b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistreference/data/MyType.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    property int a
+}
diff --git a/tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml b/tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml
new file mode 100644
index 0000000..670aee4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+    property list<MyType> myList
+
+    myList: [ MyType { a: 1 },
+              MyType { a: 9 } ]
+
+}
diff --git a/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml b/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
new file mode 100644
index 0000000..0c2d0aa
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+QtObject {
+    property list<QtObject> myList;
+    myList: QtObject {}
+
+    property var value: myList
+    property int test: value.length
+}
+
diff --git a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro
new file mode 100644
index 0000000..0c9b2d9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativelistreference.cpp
diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
new file mode 100644
index 0000000..9eafc7c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
@@ -0,0 +1,579 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QUrl>
+#include <QFileInfo>
+#include <QDir>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QtDeclarative/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeprivate.h>
+#include <QDebug>
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    QFileInfo fileInfo(__FILE__);
+    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename));
+}
+
+inline QUrl TEST_FILE(const char *filename)
+{
+    return TEST_FILE(QLatin1String(filename));
+}
+
+class tst_qmllistreference : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmllistreference() {}
+
+private slots:
+    void initTestCase();
+    void qmllistreference();
+    void qmllistreference_invalid();
+    void isValid();
+    void object();
+    void listElementType();
+    void canAppend();
+    void canAt();
+    void canClear();
+    void canCount();
+    void append();
+    void at();
+    void clear();
+    void count();
+    void copy();
+    void qmlmetaproperty();
+    void engineTypes();
+    void variantToList();
+};
+
+class TestType : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDeclarativeListProperty<TestType> data READ dataProperty);
+    Q_PROPERTY(int intProperty READ intProperty);
+
+public:
+    TestType() : property(this, data) {}
+    QDeclarativeListProperty<TestType> dataProperty() { return property; }
+    int intProperty() const { return 10; }
+
+    QList<TestType *> data;
+    QDeclarativeListProperty<TestType> property;
+};
+QML_DECLARE_TYPE(TestType);
+
+void tst_qmllistreference::initTestCase()
+{
+    QML_REGISTER_NOCREATE_TYPE(TestType);
+}
+
+void tst_qmllistreference::qmllistreference()
+{
+    TestType tt;
+
+    QDeclarativeListReference r(&tt, "data");
+    QVERIFY(r.isValid() == true);
+    QCOMPARE(r.count(), 0);
+
+    tt.data.append(&tt);
+    QCOMPARE(r.count(), 1);
+}
+
+void tst_qmllistreference::qmllistreference_invalid()
+{
+    TestType tt;
+
+    // Invalid
+    {
+    QDeclarativeListReference r;
+    QVERIFY(r.isValid() == false);
+    QVERIFY(r.object() == 0);
+    QVERIFY(r.listElementType() == 0);
+    QVERIFY(r.canAt() == false);
+    QVERIFY(r.canClear() == false);
+    QVERIFY(r.canCount() == false);
+    QVERIFY(r.append(0) == false);
+    QVERIFY(r.at(10) == 0);
+    QVERIFY(r.clear() == false);
+    QVERIFY(r.count() == 0);
+    }
+
+    // Non-property
+    {
+    QDeclarativeListReference r(&tt, "blah");
+    QVERIFY(r.isValid() == false);
+    QVERIFY(r.object() == 0);
+    QVERIFY(r.listElementType() == 0);
+    QVERIFY(r.canAt() == false);
+    QVERIFY(r.canClear() == false);
+    QVERIFY(r.canCount() == false);
+    QVERIFY(r.append(0) == false);
+    QVERIFY(r.at(10) == 0);
+    QVERIFY(r.clear() == false);
+    QVERIFY(r.count() == 0);
+    }
+
+    // Non-list property
+    {
+    QDeclarativeListReference r(&tt, "intProperty");
+    QVERIFY(r.isValid() == false);
+    QVERIFY(r.object() == 0);
+    QVERIFY(r.listElementType() == 0);
+    QVERIFY(r.canAt() == false);
+    QVERIFY(r.canClear() == false);
+    QVERIFY(r.canCount() == false);
+    QVERIFY(r.append(0) == false);
+    QVERIFY(r.at(10) == 0);
+    QVERIFY(r.clear() == false);
+    QVERIFY(r.count() == 0);
+    }
+}
+
+void tst_qmllistreference::isValid()
+{
+    TestType *tt = new TestType;
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.isValid() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.isValid() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.isValid() == true);
+    delete tt;
+    QVERIFY(ref.isValid() == false);
+    }
+}
+
+void tst_qmllistreference::object()
+{
+    TestType *tt = new TestType;
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.object() == 0);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.object() == 0);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.object() == tt);
+    delete tt;
+    QVERIFY(ref.object() == 0);
+    }
+}
+
+void tst_qmllistreference::listElementType()
+{
+    TestType *tt = new TestType;
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.listElementType() == 0);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.listElementType() == 0);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
+    delete tt;
+    QVERIFY(ref.listElementType() == 0);
+    }
+}
+
+void tst_qmllistreference::canAppend()
+{
+    TestType *tt = new TestType;
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.canAppend() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.canAppend() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.canAppend() == true);
+    delete tt;
+    QVERIFY(ref.canAppend() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.append = 0;
+    QDeclarativeListReference ref(&tt, "data");
+    QVERIFY(ref.canAppend() == false);
+    }
+}
+
+void tst_qmllistreference::canAt()
+{
+    TestType *tt = new TestType;
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.canAt() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.canAt() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.canAt() == true);
+    delete tt;
+    QVERIFY(ref.canAt() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.at = 0;
+    QDeclarativeListReference ref(&tt, "data");
+    QVERIFY(ref.canAt() == false);
+    }
+}
+
+void tst_qmllistreference::canClear()
+{
+    TestType *tt = new TestType;
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.canClear() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.canClear() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.canClear() == true);
+    delete tt;
+    QVERIFY(ref.canClear() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.clear = 0;
+    QDeclarativeListReference ref(&tt, "data");
+    QVERIFY(ref.canClear() == false);
+    }
+}
+
+void tst_qmllistreference::canCount()
+{
+    TestType *tt = new TestType;
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.canCount() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.canCount() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.canCount() == true);
+    delete tt;
+    QVERIFY(ref.canCount() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.count = 0;
+    QDeclarativeListReference ref(&tt, "data");
+    QVERIFY(ref.canCount() == false);
+    }
+}
+
+void tst_qmllistreference::append()
+{
+    TestType *tt = new TestType;
+    QObject object;
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.append(tt) == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.append(tt) == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.append(tt) == true);
+    QVERIFY(tt->data.count() == 1);
+    QVERIFY(tt->data.at(0) == tt);
+    QVERIFY(ref.append(&object) == false);
+    QVERIFY(tt->data.count() == 1);
+    QVERIFY(tt->data.at(0) == tt);
+    QVERIFY(ref.append(0) == true);
+    QVERIFY(tt->data.count() == 2);
+    QVERIFY(tt->data.at(0) == tt);
+    QVERIFY(tt->data.at(1) == 0);
+    delete tt;
+    QVERIFY(ref.append(0) == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.append = 0;
+    QDeclarativeListReference ref(&tt, "data");
+    QVERIFY(ref.append(&tt) == false);
+    }
+}
+
+void tst_qmllistreference::at()
+{
+    TestType *tt = new TestType;
+    tt->data.append(tt);
+    tt->data.append(0);
+    tt->data.append(tt);
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.at(0) == 0);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.at(0) == 0);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.at(0) == tt);
+    QVERIFY(ref.at(1) == 0);
+    QVERIFY(ref.at(2) == tt);
+    delete tt;
+    QVERIFY(ref.at(0) == 0);
+    }
+
+    {
+    TestType tt;
+    tt.data.append(&tt);
+    tt.property.at = 0;
+    QDeclarativeListReference ref(&tt, "data");
+    QVERIFY(ref.at(0) == 0);
+    }
+}
+
+void tst_qmllistreference::clear()
+{
+    TestType *tt = new TestType;
+    tt->data.append(tt);
+    tt->data.append(0);
+    tt->data.append(tt);
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.clear() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.clear() == false);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.clear() == true);
+    QVERIFY(tt->data.count() == 0);
+    delete tt;
+    QVERIFY(ref.clear() == false);
+    }
+
+    {
+    TestType tt;
+    tt.property.clear = 0;
+    QDeclarativeListReference ref(&tt, "data");
+    QVERIFY(ref.clear() == false);
+    }
+}
+
+void tst_qmllistreference::count()
+{
+    TestType *tt = new TestType;
+    tt->data.append(tt);
+    tt->data.append(0);
+    tt->data.append(tt);
+
+    {
+    QDeclarativeListReference ref;
+    QVERIFY(ref.count() == 0);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "blah");
+    QVERIFY(ref.count() == 0);
+    }
+
+    {
+    QDeclarativeListReference ref(tt, "data");
+    QVERIFY(ref.count() == 3);
+    tt->data.removeAt(1);
+    QVERIFY(ref.count() == 2);
+    delete tt;
+    QVERIFY(ref.count() == 0);
+    }
+
+    {
+    TestType tt;
+    tt.data.append(&tt);
+    tt.property.count = 0;
+    QDeclarativeListReference ref(&tt, "data");
+    QVERIFY(ref.count() == 0);
+    }
+}
+
+void tst_qmllistreference::copy()
+{
+    TestType tt;
+    tt.data.append(&tt);
+    tt.data.append(0);
+    tt.data.append(&tt);
+
+    QDeclarativeListReference *r1 = new QDeclarativeListReference(&tt, "data");
+    QVERIFY(r1->count() == 3);
+
+    QDeclarativeListReference r2(*r1);
+    QDeclarativeListReference r3;
+    r3 = *r1;
+
+    QVERIFY(r2.count() == 3);
+    QVERIFY(r3.count() == 3);
+
+    delete r1;
+
+    QVERIFY(r2.count() == 3);
+    QVERIFY(r3.count() == 3);
+
+    tt.data.removeAt(2);
+
+    QVERIFY(r2.count() == 2);
+    QVERIFY(r3.count() == 2);
+}
+
+void tst_qmllistreference::qmlmetaproperty()
+{
+    TestType tt;
+    tt.data.append(&tt);
+    tt.data.append(0);
+    tt.data.append(&tt);
+
+    QDeclarativeMetaProperty prop(&tt, QLatin1String("data"));
+    QVariant v = prop.read();
+    QVERIFY(v.userType() == qMetaTypeId<QDeclarativeListReference>());
+    QDeclarativeListReference ref = qvariant_cast<QDeclarativeListReference>(v);
+    QVERIFY(ref.count() == 3);
+    QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
+}
+
+void tst_qmllistreference::engineTypes()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("engineTypes.qml"));
+
+    QObject *o = component.create();
+    QVERIFY(o);
+
+    QDeclarativeMetaProperty p1(o, QLatin1String("myList"));
+    QVERIFY(p1.propertyCategory() == QDeclarativeMetaProperty::Normal);
+
+    QDeclarativeMetaProperty p2(o, QLatin1String("myList"), engine.rootContext());
+    QVERIFY(p2.propertyCategory() == QDeclarativeMetaProperty::List);
+    QVariant v = p2.read();
+    QVERIFY(v.userType() == qMetaTypeId<QDeclarativeListReference>());
+    QDeclarativeListReference ref = qvariant_cast<QDeclarativeListReference>(v);
+    QVERIFY(ref.count() == 2);
+    QVERIFY(ref.listElementType());
+    QVERIFY(ref.listElementType() != &QObject::staticMetaObject);
+
+    delete o;
+}
+
+void tst_qmllistreference::variantToList()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("variantToList.qml"));
+
+    QObject *o = component.create();
+    QVERIFY(o);
+
+    QVERIFY(o->property("value").userType() == qMetaTypeId<QDeclarativeListReference>());
+    QCOMPARE(o->property("test").toInt(), 1);
+
+    delete o;
+}
+
+QTEST_MAIN(tst_qmllistreference)
+
+#include "tst_qdeclarativelistreference.moc"
diff --git a/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml b/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml
new file mode 100644
index 0000000..e6b5c8f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml
@@ -0,0 +1,43 @@
+// This example demonstrates placing items in a view using
+// a VisualItemModel
+
+import Qt 4.6
+
+Rectangle {
+    color: "lightgray"
+    width: 240
+    height: 320
+
+    VisualItemModel {
+        id: itemModel
+        objectName: "itemModel"
+        Rectangle {
+            objectName: "item1"
+            height: view.height; width: view.width; color: "#FFFEF0"
+            Text { objectName: "text1"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+        }
+        Rectangle {
+            objectName: "item2"
+            height: view.height; width: view.width; color: "#F0FFF7"
+            Text { objectName: "text2"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+        }
+        Rectangle {
+            objectName: "item3"
+            height: view.height; width: view.width; color: "#F4F0FF"
+            Text { objectName: "text3"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+        }
+    }
+
+    ListView {
+        id: view
+        objectName: "view"
+        anchors.fill: parent
+        anchors.bottomMargin: 30
+        model: itemModel
+        preferredHighlightBegin: 0
+        preferredHighlightEnd: 0
+        highlightRangeMode: "StrictlyEnforceRange"
+        orientation: ListView.Horizontal
+        flickDeceleration: 2000
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml
new file mode 100644
index 0000000..46fddae
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml
@@ -0,0 +1,55 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    Component {
+        id: myDelegate
+        Item {
+            id: wrapper
+            objectName: "wrapper"
+            height: 20
+            width: 240
+            Text {
+                text: index
+            }
+            Text {
+                x: 30
+                id: textName
+                objectName: "textName"
+                text: name
+            }
+            Text {
+                x: 120
+                id: textNumber
+                objectName: "textNumber"
+                text: number
+            }
+            Text {
+                x: 200
+                text: wrapper.y
+            }
+        }
+    }
+
+    Component {
+        id: myHighlight
+        Rectangle {
+            color: "lightsteelblue"
+        }
+    }
+        
+    ListView {
+        id: list
+        objectName: "list"
+        width: 240
+        height: 320
+        model: testModel
+        delegate: myDelegate
+        highlight: myHighlight
+        preferredHighlightBegin: 100
+        preferredHighlightEnd: 100
+        highlightRangeMode: "StrictlyEnforceRange"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
new file mode 100644
index 0000000..74f5ef4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
@@ -0,0 +1,50 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    resources: [
+        Component {
+            id: myDelegate
+            Rectangle {
+                id: wrapper
+                objectName: "wrapper"
+                height: 20
+                width: 240
+                Text {
+                    text: index
+                }
+                Text {
+                    x: 30
+                    id: textName
+                    objectName: "textName"
+                    text: name
+                }
+                Text {
+                    x: 120
+                    id: textNumber
+                    objectName: "textNumber"
+                    text: number
+                }
+                Text {
+                    x: 200
+                    text: wrapper.y
+                }
+                color: ListView.isCurrentItem ? "lightsteelblue" : "white"
+            }
+        }
+    ]
+    ListView {
+        id: list
+        objectName: "list"
+        focus: true
+        currentIndex: 3
+        width: 240
+        height: 320
+        keyNavigationWraps: testWrap
+        delegate: myDelegate
+        highlightMoveSpeed: 1000
+        model: testModel
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml
new file mode 100644
index 0000000..4b5bea6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml
@@ -0,0 +1,59 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    resources: [
+        Component {
+            id: myDelegate
+            Item {
+                id: wrapper
+                objectName: "wrapper"
+                height: ListView.prevSection != ListView.section ? 40 : 20;
+                width: 240
+                Rectangle {
+                    y: wrapper.ListView.prevSection != wrapper.ListView.section ? 20 : 0
+                    height: 20
+                    width: parent.width
+                    color: wrapper.ListView.isCurrentItem ? "lightsteelblue" : "white"
+                    Text {
+                        text: index
+                    }
+                    Text {
+                        x: 30
+                        id: textName
+                        objectName: "textName"
+                        text: name
+                    }
+                    Text {
+                        x: 120
+                        id: textNumber
+                        objectName: "textNumber"
+                        text: number
+                    }
+                    Text {
+                        x: 200
+                        text: wrapper.y
+                    }
+                }
+                Rectangle {
+                    color: "#99bb99"
+                    height: wrapper.ListView.prevSection != wrapper.ListView.section ? 20 : 0
+                    width: parent.width
+                    visible: wrapper.ListView.prevSection != wrapper.ListView.section ? true : false
+                    Text { text: wrapper.ListView.section }
+                }
+            }
+        }
+    ]
+    ListView {
+        id: list
+        objectName: "list"
+        width: 240
+        height: 320
+        model: testModel
+        delegate: myDelegate
+        section.property: "number"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview.qml b/tests/auto/declarative/qdeclarativelistview/data/listview.qml
new file mode 100644
index 0000000..1c1b3f8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview.qml
@@ -0,0 +1,119 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    function checkProperties() {
+        testObject.error = false;
+        if (list.model != testModel) {
+            console.log("model property incorrect");
+            testObject.error = true;
+        }
+        if (!testObject.animate && list.delegate != myDelegate) {
+            console.log("delegate property incorrect - expected myDelegate");
+            testObject.error = true;
+        }
+        if (testObject.animate && list.delegate != animatedDelegate) {
+            console.log("delegate property incorrect - expected animatedDelegate");
+            testObject.error = true;
+        }
+        if (testObject.invalidHighlight && list.highlight != invalidHl) {
+            console.log("highlight property incorrect - expected invalidHl");
+            testObject.error = true;
+        }
+        if (!testObject.invalidHighlight && list.highlight != myHighlight) {
+            console.log("highlight property incorrect - expected myHighlight");
+            testObject.error = true;
+        }
+    }
+    resources: [
+        Component {
+            id: myDelegate
+            Rectangle {
+                id: wrapper
+                objectName: "wrapper"
+                height: 20
+                width: 240
+                Text {
+                    text: index
+                }
+                Text {
+                    x: 30
+                    id: textName
+                    objectName: "textName"
+                    text: name
+                }
+                Text {
+                    x: 120
+                    id: textNumber
+                    objectName: "textNumber"
+                    text: number
+                }
+                Text {
+                    x: 200
+                    text: wrapper.y
+                }
+                color: ListView.isCurrentItem ? "lightsteelblue" : "white"
+            }
+        },
+        Component {
+            id: animatedDelegate
+            Rectangle {
+                id: wrapper
+                objectName: "wrapper"
+                height: 20
+                width: 240
+                Text {
+                    text: index
+                }
+                Text {
+                    x: 30
+                    id: textName
+                    objectName: "textName"
+                    text: name
+                }
+                Text {
+                    x: 120
+                    id: textNumber
+                    objectName: "textNumber"
+                    text: number
+                }
+                Text {
+                    x: 200
+                    text: wrapper.y
+                }
+                color: ListView.isCurrentItem ? "lightsteelblue" : "white"
+                ListView.onRemove: SequentialAnimation {
+                    ScriptAction { script: console.log("Fix PropertyAction with attached properties") }
+/*
+                    PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
+                    NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" }
+                    PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
+*/
+                }
+            }
+        },
+        Component {
+            id: myHighlight
+            Rectangle { color: "green" }
+        },
+        Component {
+            id: invalidHl
+            EaseFollow {}
+        }
+    ]
+    ListView {
+        id: list
+        objectName: "list"
+        focus: true
+        width: 240
+        height: 320
+        model: testModel
+        delegate: testObject.animate ? animatedDelegate : myDelegate
+        highlight: testObject.invalidHighlight ? invalidHl : myHighlight
+        highlightMoveSpeed: 1000
+        highlightResizeSpeed: 1000
+        cacheBuffer: testObject.cacheBuffer
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro
new file mode 100644
index 0000000..3a076f8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativelistview.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
new file mode 100644
index 0000000..2b6e7f0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -0,0 +1,1370 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtTest/QtTest>
+#include <private/qlistmodelinterface_p.h>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativelistview_p.h>
+#include <private/qdeclarativetext_p.h>
+#include <private/qdeclarativevisualitemmodel_p.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeexpression.h>
+
+class tst_QmlGraphicsListView : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlGraphicsListView();
+
+private slots:
+    // Test both QListModelInterface and QAbstractItemModel model types
+    void qListModelInterface_items();
+    void qAbstractItemModel_items();
+
+    void qListModelInterface_changed();
+    void qAbstractItemModel_changed();
+
+    void qListModelInterface_inserted();
+    void qAbstractItemModel_inserted();
+
+    void qListModelInterface_removed();
+    void qAbstractItemModel_removed();
+
+    void qListModelInterface_moved();
+    void qAbstractItemModel_moved();
+
+    void qListModelInterface_clear();
+    void qAbstractItemModel_clear();
+
+    void itemList();
+    void currentIndex();
+    void enforceRange();
+    void spacing();
+    void sections();
+    void cacheBuffer();
+    void positionViewAtIndex();
+
+private:
+    template <class T> void items();
+    template <class T> void changed();
+    template <class T> void inserted();
+    template <class T> void removed(bool animated);
+    template <class T> void moved();
+    template <class T> void clear();
+    QDeclarativeView *createView();
+    template<typename T>
+    T *findItem(QGraphicsObject *parent, const QString &id, int index=-1);
+    template<typename T>
+    QList<T*> findItems(QGraphicsObject *parent, const QString &objectName);
+    void dumpTree(QDeclarativeItem *parent, int depth = 0);
+};
+
+class TestObject : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool error READ error WRITE setError NOTIFY changedError)
+    Q_PROPERTY(bool animate READ animate NOTIFY changedAnim)
+    Q_PROPERTY(bool invalidHighlight READ invalidHighlight NOTIFY changedHl)
+    Q_PROPERTY(int cacheBuffer READ cacheBuffer NOTIFY changedCacheBuffer)
+
+public:
+    TestObject(QObject *parent = 0)
+        : QObject(parent), mError(true), mAnimate(false), mInvalidHighlight(false)
+        , mCacheBuffer(0) {}
+
+    bool error() const { return mError; }
+    void setError(bool err) { mError = err; emit changedError(); }
+
+    bool animate() const { return mAnimate; }
+    void setAnimate(bool anim) { mAnimate = anim; emit changedAnim(); }
+
+    bool invalidHighlight() const { return mInvalidHighlight; }
+    void setInvalidHighlight(bool invalid) { mInvalidHighlight = invalid; emit changedHl(); }
+
+    int cacheBuffer() const { return mCacheBuffer; }
+    void setCacheBuffer(int buffer) { mCacheBuffer = buffer; emit changedCacheBuffer(); }
+
+signals:
+    void changedError();
+    void changedAnim();
+    void changedHl();
+    void changedCacheBuffer();
+
+public:
+    bool mError;
+    bool mAnimate;
+    bool mInvalidHighlight;
+    int mCacheBuffer;
+};
+
+class TestModel : public QListModelInterface
+{
+    Q_OBJECT
+public:
+    TestModel(QObject *parent = 0) : QListModelInterface(parent) {}
+    ~TestModel() {}
+
+    enum Roles { Name, Number };
+
+    QString name(int index) const { return list.at(index).first; }
+    QString number(int index) const { return list.at(index).second; }
+
+    int count() const { return list.count(); }
+
+    QList<int> roles() const { return QList<int>() << Name << Number; }
+    QString toString(int role) const {
+        switch(role) {
+        case Name:
+            return "name";
+        case Number:
+            return "number";
+        default:
+            return "";
+        }
+    }
+
+    QVariant data(int index, int role) const
+    {
+        if (role==0)
+            return list.at(index).first;
+        if (role==1)
+            return list.at(index).second;
+        return QVariant();
+    }
+    QHash<int, QVariant> data(int index, const QList<int> &roles) const {
+        QHash<int,QVariant> returnHash;
+
+        for (int i = 0; i < roles.size(); ++i) {
+            int role = roles.at(i);
+            QVariant info;
+            switch(role) {
+            case Name:
+                info = list.at(index).first;
+                break;
+            case Number:
+                info = list.at(index).second;
+                break;
+            default:
+                break;
+            }
+            returnHash.insert(role, info);
+        }
+        return returnHash;
+    }
+
+    void addItem(const QString &name, const QString &number) {
+        list.append(QPair<QString,QString>(name, number));
+        emit itemsInserted(list.count()-1, 1);
+    }
+
+    void insertItem(int index, const QString &name, const QString &number) {
+        list.insert(index, QPair<QString,QString>(name, number));
+        emit itemsInserted(index, 1);
+    }
+
+    void removeItem(int index) {
+        list.removeAt(index);
+        emit itemsRemoved(index, 1);
+    }
+
+    void moveItem(int from, int to) {
+        list.move(from, to);
+        emit itemsMoved(from, to, 1);
+    }
+
+    void modifyItem(int index, const QString &name, const QString &number) {
+        list[index] = QPair<QString,QString>(name, number);
+        emit itemsChanged(index, 1, roles());
+    }
+
+    void clear() {
+        int count = list.count();
+        list.clear();
+        emit itemsRemoved(0, count);
+    }
+
+private:
+    QList<QPair<QString,QString> > list;
+};
+
+
+class TestModel2 : public QAbstractListModel
+{
+public:
+    enum Roles { Name = Qt::UserRole+1, Number = Qt::UserRole+2 };
+
+    TestModel2(QObject *parent=0) : QAbstractListModel(parent) {
+        QHash<int, QByteArray> roles;
+        roles[Name] = "name";
+        roles[Number] = "number";
+        setRoleNames(roles);
+    }
+
+    int rowCount(const QModelIndex &parent=QModelIndex()) const { return list.count(); }
+    QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const {
+        QVariant rv;
+        if (role == Name)
+            rv = list.at(index.row()).first;
+        else if (role == Number)
+            rv = list.at(index.row()).second;
+
+        return rv;
+    }
+
+    int count() const { return rowCount(); }
+    QString name(int index) const { return list.at(index).first; }
+    QString number(int index) const { return list.at(index).second; }
+
+    void addItem(const QString &name, const QString &number) {
+        emit beginInsertRows(QModelIndex(), list.count(), list.count());
+        list.append(QPair<QString,QString>(name, number));
+        emit endInsertRows();
+    }
+
+    void insertItem(int index, const QString &name, const QString &number) {
+        emit beginInsertRows(QModelIndex(), index, index);
+        list.insert(index, QPair<QString,QString>(name, number));
+        emit endInsertRows();
+    }
+
+    void removeItem(int index) {
+        emit beginRemoveRows(QModelIndex(), index, index);
+        list.removeAt(index);
+        emit endRemoveRows();
+    }
+
+    void moveItem(int from, int to) {
+        emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
+        list.move(from, to);
+        emit endMoveRows();
+    }
+
+    void modifyItem(int idx, const QString &name, const QString &number) {
+        list[idx] = QPair<QString,QString>(name, number);
+        emit dataChanged(index(idx,0), index(idx,0));
+    }
+
+    void clear() {
+        int count = list.count();
+        emit beginRemoveRows(QModelIndex(), 0, count-1);
+        list.clear();
+        emit endRemoveRows();
+    }
+
+private:
+    QList<QPair<QString,QString> > list;
+};
+
+tst_QmlGraphicsListView::tst_QmlGraphicsListView()
+{
+}
+
+template <class T>
+void tst_QmlGraphicsListView::items()
+{
+    QDeclarativeView *canvas = createView();
+
+    T model;
+    model.addItem("Fred", "12345");
+    model.addItem("John", "2345");
+    model.addItem("Bob", "54321");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
+    QVERIFY(testObject->error() == false);
+
+    QVERIFY(listview->highlightItem() != 0);
+    QCOMPARE(listview->count(), model.count());
+    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
+
+    // current item should be first item
+    QCOMPARE(listview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 0));
+
+    for (int i = 0; i < model.count(); ++i) {
+        QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", i);
+        QVERIFY(name != 0);
+        QCOMPARE(name->text(), model.name(i));
+        QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", i);
+        QVERIFY(number != 0);
+        QCOMPARE(number->text(), model.number(i));
+    }
+
+    // switch to other delegate
+    testObject->setAnimate(true);
+    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
+    QVERIFY(testObject->error() == false);
+    QVERIFY(listview->currentItem());
+
+    // set invalid highlight
+    testObject->setInvalidHighlight(true);
+    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
+    QVERIFY(testObject->error() == false);
+    QVERIFY(listview->currentItem());
+    QVERIFY(listview->highlightItem() == 0);
+
+    // back to normal highlight
+    testObject->setInvalidHighlight(false);
+    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
+    QVERIFY(testObject->error() == false);
+    QVERIFY(listview->currentItem());
+    QVERIFY(listview->highlightItem() != 0);
+
+    // set an empty model and confirm that items are destroyed
+    T model2;
+    ctxt->setContextProperty("testModel", &model2);
+
+    // Allow deleteLaters to process
+    QTest::qWait(500);
+
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    QVERIFY(itemCount == 0);
+
+    QCOMPARE(listview->highlightResizeSpeed(), 1000.0);
+    QCOMPARE(listview->highlightMoveSpeed(), 1000.0);
+
+    delete canvas;
+}
+
+template <class T>
+void tst_QmlGraphicsListView::changed()
+{
+    QDeclarativeView *canvas = createView();
+
+    T model;
+    model.addItem("Fred", "12345");
+    model.addItem("John", "2345");
+    model.addItem("Bob", "54321");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeFlickable *listview = findItem<QDeclarativeFlickable>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    model.modifyItem(1, "Will", "9876");
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(1));
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(1));
+
+    delete canvas;
+}
+
+template <class T>
+void tst_QmlGraphicsListView::inserted()
+{
+    QDeclarativeView *canvas = createView();
+
+    T model;
+    model.addItem("Fred", "12345");
+    model.addItem("John", "2345");
+    model.addItem("Bob", "54321");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    model.insertItem(1, "Will", "9876");
+
+    // let transitions settle.
+    QTest::qWait(500);
+
+    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
+
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(1));
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(1));
+
+    // Confirm items positioned correctly
+    for (int i = 0; i < model.count(); ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        QCOMPARE(item->y(), i*20.0);
+    }
+
+    model.insertItem(0, "Foo", "1111"); // zero index, and current item
+
+    // let transitions settle.
+    QTest::qWait(500);
+
+    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
+
+    name = findItem<QDeclarativeText>(viewport, "textName", 0);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(0));
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(0));
+
+    QCOMPARE(listview->currentIndex(), 1);
+
+    // Confirm items positioned correctly
+    for (int i = 0; i < model.count(); ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        QCOMPARE(item->y(), i*20.0);
+    }
+
+    for (int i = model.count(); i < 30; ++i)
+        model.insertItem(i, "Hello", QString::number(i));
+    QTest::qWait(500);
+
+    listview->setViewportY(80);
+    QTest::qWait(500);
+
+    // Insert item outside visible area
+    model.insertItem(1, "Hello", "1324");
+    QTest::qWait(500);
+
+    QVERIFY(listview->viewportY() == 80);
+
+    // Confirm items positioned correctly
+    for (int i = 5; i < 5+15; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(), i*20.0 - 20.0);
+    }
+
+//    QCOMPARE(listview->viewportHeight(), model.count() * 20.0);
+
+    delete canvas;
+}
+
+template <class T>
+void tst_QmlGraphicsListView::removed(bool animated)
+{
+    QDeclarativeView *canvas = createView();
+
+    T model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    TestObject *testObject = new TestObject;
+    testObject->setAnimate(animated);
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    model.removeItem(1);
+
+    // let transitions settle.
+    QTest::qWait(500);
+
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(1));
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(1));
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->y() == i*20);
+    }
+
+    // Remove first item (which is the current item);
+    model.removeItem(0);  // post: top item starts at 20
+
+    // let transitions settle.
+    QTest::qWait(500);
+
+    name = findItem<QDeclarativeText>(viewport, "textName", 0);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(0));
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(0));
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(),i*20.0 + 20.0);
+    }
+
+    // Remove items not visible
+    model.removeItem(18);
+    // let transitions settle.
+    QTest::qWait(500);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(),i*20.0+20.0);
+    }
+
+    // Remove items before visible
+    listview->setViewportY(80);
+    listview->setCurrentIndex(10);
+
+    model.removeItem(1); // post: top item will be at 40
+    // let transitions settle.
+    QTest::qWait(500);
+
+    // Confirm items positioned correctly
+    for (int i = 2; i < 18; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(),40+i*20.0);
+    }
+
+    // Remove current index
+    QVERIFY(listview->currentIndex() == 9);
+    QDeclarativeItem *oldCurrent = listview->currentItem();
+    model.removeItem(9);
+    QTest::qWait(500);
+
+    QCOMPARE(listview->currentIndex(), 9);
+    QVERIFY(listview->currentItem() != oldCurrent);
+
+    listview->setViewportY(40); // That's the top now
+    // let transitions settle.
+    QTest::qWait(500);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(),40+i*20.0);
+    }
+
+    // remove current item beyond visible items.
+    listview->setCurrentIndex(20);
+    QTest::qWait(500);
+    listview->setViewportY(40);
+    model.removeItem(20);
+    QTest::qWait(500);
+
+    QCOMPARE(listview->currentIndex(), 20);
+    QVERIFY(listview->currentItem() != 0);
+
+    // remove item before current, but visible
+    listview->setCurrentIndex(8);
+    QTest::qWait(500);
+    oldCurrent = listview->currentItem();
+    model.removeItem(6);
+    QTest::qWait(500);
+
+    QCOMPARE(listview->currentIndex(), 7);
+    QVERIFY(listview->currentItem() == oldCurrent);
+
+    delete canvas;
+}
+
+template <class T>
+void tst_QmlGraphicsListView::clear()
+{
+    QDeclarativeView *canvas = createView();
+
+    T model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    model.clear();
+
+    // let transitions settle.
+    QTest::qWait(500);
+
+    QVERIFY(listview->count() == 0);
+    QVERIFY(listview->currentItem() == 0);
+    QVERIFY(listview->viewportY() == 0);
+
+    delete canvas;
+}
+
+
+template <class T>
+void tst_QmlGraphicsListView::moved()
+{
+    QDeclarativeView *canvas = createView();
+
+    T model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    model.moveItem(1, 4);
+
+    // let transitions settle.
+    QTest::qWait(500);
+
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(1));
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(1));
+
+    name = findItem<QDeclarativeText>(viewport, "textName", 4);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(4));
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 4);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(4));
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->y() == i*20);
+    }
+
+    listview->setViewportY(80);
+
+    // move outside visible area
+    model.moveItem(1, 18);
+
+    // let transitions settle.
+    QTest::qWait(500);
+
+    // Confirm items positioned correctly and indexes correct
+    for (int i = 3; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(), i*20.0 + 20);
+        name = findItem<QDeclarativeText>(viewport, "textName", i);
+        QVERIFY(name != 0);
+        QCOMPARE(name->text(), model.name(i));
+        number = findItem<QDeclarativeText>(viewport, "textNumber", i);
+        QVERIFY(number != 0);
+        QCOMPARE(number->text(), model.number(i));
+    }
+
+    // move from outside visible into visible
+    model.moveItem(20, 4);
+
+    // let transitions settle.
+    QTest::qWait(500);
+
+    // Confirm items positioned correctly and indexes correct
+    for (int i = 3; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(), i*20.0 + 20);
+        name = findItem<QDeclarativeText>(viewport, "textName", i);
+        QVERIFY(name != 0);
+        QCOMPARE(name->text(), model.name(i));
+        number = findItem<QDeclarativeText>(viewport, "textNumber", i);
+        QVERIFY(number != 0);
+        QCOMPARE(number->text(), model.number(i));
+    }
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsListView::enforceRange()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview-enforcerange.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QCOMPARE(listview->preferredHighlightBegin(), 100.0);
+    QCOMPARE(listview->preferredHighlightEnd(), 100.0);
+    QCOMPARE(listview->highlightRangeMode(), QDeclarativeListView::StrictlyEnforceRange);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    // view should be positioned at the top of the range.
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", 0);
+    QVERIFY(item);
+    QCOMPARE(listview->viewportY(), -100.0);
+
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 0);
+    QVERIFY(name != 0);
+    QCOMPARE(name->text(), model.name(0));
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
+    QVERIFY(number != 0);
+    QCOMPARE(number->text(), model.number(0));
+
+    // Check currentIndex is updated when viewport moves
+    listview->setViewportY(20);
+    QTest::qWait(500);
+
+    QCOMPARE(listview->currentIndex(), 6);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsListView::spacing()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->y() == i*20);
+    }
+
+    listview->setSpacing(10);
+    QVERIFY(listview->spacing() == 10);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->y() == i*30);
+    }
+
+    listview->setSpacing(0);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(), i*20.0);
+    }
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsListView::sections()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), QString::number(i/5));
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview-sections.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        QVERIFY(item);
+        QCOMPARE(item->y(), qreal(i*20 + ((i+4)/5) * 20));
+    }
+
+    // Remove section boundary
+    model.removeItem(5);
+
+    // New section header created
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", 5);
+    QVERIFY(item);
+    QCOMPARE(item->height(), 40.0);
+
+    model.insertItem(3, "New Item", "0");
+
+    // Section header moved
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 5);
+    QVERIFY(item);
+    QCOMPARE(item->height(), 20.0);
+
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 6);
+    QVERIFY(item);
+    QCOMPARE(item->height(), 40.0);
+
+    // insert item which will become a section header
+    model.insertItem(6, "Replace header", "1");
+
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 6);
+    QVERIFY(item);
+    QCOMPARE(item->height(), 40.0);
+
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 7);
+    QVERIFY(item);
+    QCOMPARE(item->height(), 20.0);
+
+    QCOMPARE(listview->currentSection(), QString("0"));
+
+    listview->setViewportY(140);
+    QCOMPARE(listview->currentSection(), QString("1"));
+
+    listview->setViewportY(20);
+    QCOMPARE(listview->currentSection(), QString("0"));
+
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 1);
+    QVERIFY(item);
+    QCOMPARE(item->height(), 20.0);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsListView::currentIndex()
+{
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), QString::number(i));
+
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testWrap", QVariant(false));
+
+    QString filename(SRCDIR "/data/listview-initCurrent.qml");
+    canvas->setSource(QUrl::fromLocalFile(filename));
+
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    QTest::qWait(500);
+
+    // current item should be third item
+    QCOMPARE(listview->currentIndex(), 3);
+    QCOMPARE(listview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 3));
+    QCOMPARE(listview->highlightItem()->y(), listview->currentItem()->y());
+
+    // no wrap
+    listview->setCurrentIndex(0);
+    QCOMPARE(listview->currentIndex(), 0);
+
+    listview->incrementCurrentIndex();
+    QCOMPARE(listview->currentIndex(), 1);
+    listview->decrementCurrentIndex();
+    QCOMPARE(listview->currentIndex(), 0);
+
+    listview->decrementCurrentIndex();
+    QCOMPARE(listview->currentIndex(), 0);
+
+    // with wrap
+    ctxt->setContextProperty("testWrap", QVariant(true));
+    QVERIFY(listview->isWrapEnabled());
+
+    listview->decrementCurrentIndex();
+    QCOMPARE(listview->currentIndex(), model.count()-1);
+
+    QTest::qWait(1000);
+    QCOMPARE(listview->viewportY(), 279.0);
+
+    listview->incrementCurrentIndex();
+    QCOMPARE(listview->currentIndex(), 0);
+
+    QTest::qWait(1000);
+    QCOMPARE(listview->viewportY(), 0.0);
+
+    // Test keys
+    canvas->show();
+    qApp->processEvents();
+
+    QEvent wa(QEvent::WindowActivate);
+    QApplication::sendEvent(canvas, &wa);
+    QFocusEvent fe(QEvent::FocusIn);
+    QApplication::sendEvent(canvas, &fe);
+
+    QKeyEvent key(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+    QCOMPARE(listview->currentIndex(), 1);
+
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+    QCOMPARE(listview->currentIndex(), 0);
+
+    // turn off auto highlight
+    listview->setHighlightFollowsCurrentItem(false);
+    QVERIFY(listview->highlightFollowsCurrentItem() == false);
+
+    QTest::qWait(500);
+    QVERIFY(listview->highlightItem());
+    qreal hlPos = listview->highlightItem()->y();
+
+    listview->setCurrentIndex(4);
+    QTest::qWait(500);
+    QCOMPARE(listview->highlightItem()->y(), hlPos);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsListView::itemList()
+{
+    QDeclarativeView *canvas = createView();
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/itemlist.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "view");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    QDeclarativeVisualItemModel *model = canvas->rootObject()->findChild<QDeclarativeVisualItemModel*>("itemModel");
+    QVERIFY(model != 0);
+
+    QVERIFY(model->count() == 3);
+    QCOMPARE(listview->currentIndex(), 0);
+
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "item1");
+    QVERIFY(item);
+    QCOMPARE(item->x(), 0.0);
+
+    QDeclarativeText *text = findItem<QDeclarativeText>(viewport, "text1");
+    QVERIFY(text);
+    QCOMPARE(text->text(), QLatin1String("index: 0"));
+
+    listview->setCurrentIndex(2);
+    QTest::qWait(1000);
+
+    item = findItem<QDeclarativeItem>(viewport, "item3");
+    QVERIFY(item);
+    QCOMPARE(item->x(), 480.0);
+
+    text = findItem<QDeclarativeText>(viewport, "text3");
+    QVERIFY(text);
+    QCOMPARE(text->text(), QLatin1String("index: 2"));
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsListView::cacheBuffer()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+    QVERIFY(listview->delegate() != 0);
+    QVERIFY(listview->model() != 0);
+    QVERIFY(listview->highlight() != 0);
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->y() == i*20);
+    }
+
+    testObject->setCacheBuffer(400);
+    QVERIFY(listview->cacheBuffer() == 400);
+
+    int newItemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    QVERIFY(newItemCount > itemCount);
+
+    // Confirm items positioned correctly
+    for (int i = 0; i < model.count() && i < newItemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QVERIFY(item->y() == i*20);
+    }
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsListView::positionViewAtIndex()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 40; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(), i*20.);
+    }
+
+    // Position on a currently visible item
+    listview->positionViewAtIndex(3);
+    QCOMPARE(listview->viewportY(), 60.);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 3; i < model.count() && i < itemCount-3-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(), i*20.);
+    }
+
+    // Position on an item beyond the visible items
+    listview->positionViewAtIndex(22);
+    QCOMPARE(listview->viewportY(), 440.);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 22; i < model.count() && i < itemCount-22-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(), i*20.);
+    }
+
+    // Position on an item that would leave empty space if positioned at the top
+    listview->positionViewAtIndex(28);
+    QCOMPARE(listview->viewportY(), 480.);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 24; i < model.count() && i < itemCount-24-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(), i*20.);
+    }
+
+    // Position at the beginning again
+    listview->positionViewAtIndex(0);
+    QCOMPARE(listview->viewportY(), 0.);
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QVERIFY(item);
+        QCOMPARE(item->y(), i*20.);
+    }
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsListView::qListModelInterface_items()
+{
+    items<TestModel>();
+}
+
+void tst_QmlGraphicsListView::qAbstractItemModel_items()
+{
+    items<TestModel2>();
+}
+
+void tst_QmlGraphicsListView::qListModelInterface_changed()
+{
+    changed<TestModel>();
+}
+
+void tst_QmlGraphicsListView::qAbstractItemModel_changed()
+{
+    changed<TestModel2>();
+}
+
+void tst_QmlGraphicsListView::qListModelInterface_inserted()
+{
+    inserted<TestModel>();
+}
+
+void tst_QmlGraphicsListView::qAbstractItemModel_inserted()
+{
+    inserted<TestModel2>();
+}
+
+void tst_QmlGraphicsListView::qListModelInterface_removed()
+{
+    removed<TestModel>(false);
+    removed<TestModel>(true);
+}
+
+void tst_QmlGraphicsListView::qAbstractItemModel_removed()
+{
+    removed<TestModel2>(false);
+    removed<TestModel2>(true);
+}
+
+void tst_QmlGraphicsListView::qListModelInterface_moved()
+{
+    moved<TestModel>();
+}
+
+void tst_QmlGraphicsListView::qAbstractItemModel_moved()
+{
+    moved<TestModel2>();
+}
+
+void tst_QmlGraphicsListView::qListModelInterface_clear()
+{
+    clear<TestModel>();
+}
+
+void tst_QmlGraphicsListView::qAbstractItemModel_clear()
+{
+    clear<TestModel2>();
+}
+
+QDeclarativeView *tst_QmlGraphicsListView::createView()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    return canvas;
+}
+
+/*
+   Find an item with the specified objectName.  If index is supplied then the
+   item must also evaluate the {index} expression equal to index
+*/
+template<typename T>
+T *tst_QmlGraphicsListView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
+{
+    const QMetaObject &mo = T::staticMetaObject;
+    //qDebug() << parent->childItems().count() << "children";
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if(!item)
+            continue;
+        //qDebug() << "try" << item;
+        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
+            if (index != -1) {
+                QDeclarativeExpression e(qmlContext(item), "index", item);
+                if (e.value().toInt() == index)
+                    return static_cast<T*>(item);
+            } else {
+                return static_cast<T*>(item);
+            }
+        }
+        item = findItem<T>(item, objectName, index);
+        if (item)
+            return static_cast<T*>(item);
+    }
+
+    return 0;
+}
+
+template<typename T>
+QList<T*> tst_QmlGraphicsListView::findItems(QGraphicsObject *parent, const QString &objectName)
+{
+    QList<T*> items;
+    const QMetaObject &mo = T::staticMetaObject;
+    //qDebug() << parent->childItems().count() << "children";
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if(!item)
+            continue;
+        //qDebug() << "try" << item;
+        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName))
+            items.append(static_cast<T*>(item));
+        items += findItems<T>(item, objectName);
+    }
+
+    return items;
+}
+
+void tst_QmlGraphicsListView::dumpTree(QDeclarativeItem *parent, int depth)
+{
+    static QString padding("                       ");
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if(!item)
+            continue;
+        qDebug() << padding.left(depth*2) << item;
+        dumpTree(item, depth+1);
+    }
+}
+
+
+QTEST_MAIN(tst_QmlGraphicsListView)
+
+#include "tst_qdeclarativelistview.moc"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
new file mode 100644
index 0000000..627c7df
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QGraphicsWidget {
+    size: "250x250"
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml b/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
new file mode 100644
index 0000000..cfbb55a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+Loader {
+    resizeMode: "NoResize"
+    width: 200; height: 80
+    source: "Rect120x60.qml"
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml b/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
new file mode 100644
index 0000000..5eab965
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+Loader {
+    resizeMode: Loader.NoResize
+    source: "GraphicsWidget250x250.qml"
+    width: 200
+    height: 80    
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml b/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
new file mode 100644
index 0000000..aa4b0c2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Rectangle {
+    width: 120
+   height:60
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml b/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
new file mode 100644
index 0000000..1db56c4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Item {
+    Component { id: comp; Rectangle { width: 100; height: 50 } }
+    Loader { sourceComponent: comp }
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
new file mode 100644
index 0000000..568a136
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+Loader {
+    resizeMode: Loader.SizeItemToLoader
+    width: 200
+    height: 80
+    source: "GraphicsWidget250x250.qml"
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
new file mode 100644
index 0000000..a710803
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Loader {
+    resizeMode: Loader.SizeLoaderToItem
+    source: "GraphicsWidget250x250.qml"
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
new file mode 100644
index 0000000..b52fa03
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Loader {
+    resizeMode: "SizeLoaderToItem"
+    source: "Rect120x60.qml"
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
new file mode 100644
index 0000000..1a107e1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+Loader {
+    resizeMode: "SizeItemToLoader"
+    width: 200; height: 80
+    source: "Rect120x60.qml"
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro
new file mode 100644
index 0000000..8ff2be4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro
@@ -0,0 +1,11 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui network
+macx:CONFIG -= app_bundle
+
+INCLUDEPATH += ../shared/
+HEADERS += ../shared/testhttpserver.h
+SOURCES += tst_qdeclarativeloader.cpp \
+           ../shared/testhttpserver.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
new file mode 100644
index 0000000..235487c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -0,0 +1,464 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtGui/QGraphicsWidget>
+#include <QtGui/QGraphicsScene>
+
+#include <QSignalSpy>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeloader_p.h>
+#include "testhttpserver.h"
+
+#define SERVER_PORT 14445
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
+#define TRY_WAIT(expr) \
+    do { \
+        for (int ii = 0; ii < 6; ++ii) { \
+            if ((expr)) break; \
+            QTest::qWait(50); \
+        } \
+        QVERIFY((expr)); \
+    } while (false)
+
+class tst_QmlGraphicsLoader : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_QmlGraphicsLoader();
+
+private slots:
+    void url();
+    void invalidUrl();
+    void component();
+    void clear();
+    void urlToComponent();
+    void componentToUrl();
+    void sizeLoaderToItem();
+    void sizeItemToLoader();
+    void noResize();
+    void sizeLoaderToGraphicsWidget();
+    void sizeGraphicsWidgetToLoader();
+    void noResizeGraphicsWidget();
+    void networkRequestUrl();
+    void failNetworkRequest();
+//    void networkComponent();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+
+tst_QmlGraphicsLoader::tst_QmlGraphicsLoader()
+{
+}
+
+void tst_QmlGraphicsLoader::url()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), TEST_FILE(""));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QVERIFY(loader != 0);
+    QVERIFY(loader->item());
+    QVERIFY(loader->source() == QUrl::fromLocalFile(SRCDIR "/data/Rect120x60.qml"));
+    QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+    delete loader;
+}
+
+void tst_QmlGraphicsLoader::component()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(item);
+
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); 
+    QVERIFY(loader);
+    QVERIFY(loader->item());
+    QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+    delete loader;
+}
+
+void tst_QmlGraphicsLoader::invalidUrl()
+{
+    QTest::ignoreMessage(QtWarningMsg, QString("(:-1: File error for URL " + QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString() + ") ").toUtf8().constData());
+
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nLoader { source: \"IDontExist.qml\" }"), TEST_FILE(""));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QVERIFY(loader != 0);
+    QVERIFY(loader->item() == 0);
+    QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(loader->status(), QDeclarativeLoader::Error);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
+
+    delete loader;
+}
+
+void tst_QmlGraphicsLoader::clear()
+{
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData(QByteArray(
+                    "import Qt 4.6\n"
+                    " Loader { id: loader\n"
+                    "  source: 'Rect120x60.qml'\n"
+                    "  Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n"
+                    " }")
+                , TEST_FILE(""));
+        QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+        QVERIFY(loader != 0);
+        QVERIFY(loader->item());
+        QCOMPARE(loader->progress(), 1.0);
+        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+        QTest::qWait(500);
+
+        QVERIFY(loader->item() == 0);
+        QCOMPARE(loader->progress(), 0.0);
+        QCOMPARE(loader->status(), QDeclarativeLoader::Null);
+        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
+
+        delete loader;
+    }
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+        QVERIFY(item);
+
+        QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); 
+        QVERIFY(loader);
+        QVERIFY(loader->item());
+        QCOMPARE(loader->progress(), 1.0);
+        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+        loader->setSourceComponent(0);
+
+        QVERIFY(loader->item() == 0);
+        QCOMPARE(loader->progress(), 0.0);
+        QCOMPARE(loader->status(), QDeclarativeLoader::Null);
+        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
+
+        delete loader;
+    }
+}
+
+void tst_QmlGraphicsLoader::urlToComponent()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\n"
+                "Loader {\n"
+                " id: loader\n"
+                " Component { id: myComp; Rectangle { width: 10; height: 10 } }\n"
+                " source: \"Rect120x60.qml\"\n"
+                " Timer { interval: 100; running: true; onTriggered: loader.sourceComponent = myComp }\n"
+                "}" )
+            , TEST_FILE(""));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QTest::qWait(500);
+    QVERIFY(loader != 0);
+    QVERIFY(loader->item());
+    QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+    QCOMPARE(loader->width(), 10.0);
+    QCOMPARE(loader->height(), 10.0);
+
+    delete loader;
+}
+
+void tst_QmlGraphicsLoader::componentToUrl()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(item);
+
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); 
+    QVERIFY(loader);
+    QVERIFY(loader->item());
+    QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+    loader->setSource(TEST_FILE("/Rect120x60.qml"));
+    QVERIFY(loader->item());
+    QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+    QCOMPARE(loader->width(), 120.0);
+    QCOMPARE(loader->height(), 60.0);
+
+    delete loader;
+}
+
+void tst_QmlGraphicsLoader::sizeLoaderToItem()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("/SizeToItem.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QVERIFY(loader != 0);
+    QVERIFY(loader->resizeMode() == QDeclarativeLoader::SizeLoaderToItem);
+    QCOMPARE(loader->width(), 120.0);
+    QCOMPARE(loader->height(), 60.0);
+
+    // Check resize
+    QDeclarativeItem *rect = qobject_cast<QDeclarativeItem*>(loader->item());
+    QVERIFY(rect);
+    rect->setWidth(150);
+    rect->setHeight(45);
+    QCOMPARE(loader->width(), 150.0);
+    QCOMPARE(loader->height(), 45.0);
+
+    // Switch mode
+    loader->setResizeMode(QDeclarativeLoader::SizeItemToLoader);
+    loader->setWidth(180);
+    loader->setHeight(30);
+    QCOMPARE(rect->width(), 180.0);
+    QCOMPARE(rect->height(), 30.0);
+
+    // notify
+    QSignalSpy spy(loader, SIGNAL(resizeModeChanged()));
+    loader->setResizeMode(QDeclarativeLoader::NoResize);
+    QCOMPARE(spy.count(),1);
+    loader->setResizeMode(QDeclarativeLoader::NoResize);
+    QCOMPARE(spy.count(),1);
+}
+
+void tst_QmlGraphicsLoader::sizeItemToLoader()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("/SizeToLoader.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QVERIFY(loader != 0);
+    QVERIFY(loader->resizeMode() == QDeclarativeLoader::SizeItemToLoader);
+    QCOMPARE(loader->width(), 200.0);
+    QCOMPARE(loader->height(), 80.0);
+
+    QDeclarativeItem *rect = qobject_cast<QDeclarativeItem*>(loader->item());
+    QVERIFY(rect);
+    QCOMPARE(rect->width(), 200.0);
+    QCOMPARE(rect->height(), 80.0);
+
+    // Check resize
+    loader->setWidth(180);
+    loader->setHeight(30);
+    QCOMPARE(rect->width(), 180.0);
+    QCOMPARE(rect->height(), 30.0);
+
+    // Switch mode
+    loader->setResizeMode(QDeclarativeLoader::SizeLoaderToItem);
+    rect->setWidth(160);
+    rect->setHeight(45);
+    QCOMPARE(loader->width(), 160.0);
+    QCOMPARE(loader->height(), 45.0);
+}
+
+void tst_QmlGraphicsLoader::noResize()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("/NoResize.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QVERIFY(loader != 0);
+    QCOMPARE(loader->width(), 200.0);
+    QCOMPARE(loader->height(), 80.0);
+
+    QDeclarativeItem *rect = qobject_cast<QDeclarativeItem*>(loader->item());
+    QVERIFY(rect);
+    QCOMPARE(rect->width(), 120.0);
+    QCOMPARE(rect->height(), 60.0);
+}
+
+void tst_QmlGraphicsLoader::sizeLoaderToGraphicsWidget()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("/SizeLoaderToGraphicsWidget.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QGraphicsScene scene;
+    scene.addItem(loader);
+
+    QVERIFY(loader != 0);
+    QVERIFY(loader->resizeMode() == QDeclarativeLoader::SizeLoaderToItem);
+    QCOMPARE(loader->width(), 250.0);
+    QCOMPARE(loader->height(), 250.0);
+
+    // Check resize
+    QGraphicsWidget *widget = qobject_cast<QGraphicsWidget*>(loader->item());
+    QVERIFY(widget);
+    widget->resize(QSizeF(150,45));
+    QCOMPARE(loader->width(), 150.0);
+    QCOMPARE(loader->height(), 45.0);
+
+    // Switch mode
+    loader->setResizeMode(QDeclarativeLoader::SizeItemToLoader);
+    loader->setWidth(180);
+    loader->setHeight(30);
+    QCOMPARE(widget->size().width(), 180.0);
+    QCOMPARE(widget->size().height(), 30.0);
+}
+
+void tst_QmlGraphicsLoader::sizeGraphicsWidgetToLoader()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("/SizeGraphicsWidgetToLoader.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QGraphicsScene scene;
+    scene.addItem(loader);
+
+    QVERIFY(loader != 0);
+    QVERIFY(loader->resizeMode() == QDeclarativeLoader::SizeItemToLoader);
+    QCOMPARE(loader->width(), 200.0);
+    QCOMPARE(loader->height(), 80.0);
+
+    QGraphicsWidget *widget = qobject_cast<QGraphicsWidget*>(loader->item());
+    QVERIFY(widget);
+    QCOMPARE(widget->size().width(), 200.0);
+    QCOMPARE(widget->size().height(), 80.0);
+
+    // Check resize
+    loader->setWidth(180);
+    loader->setHeight(30);
+    QCOMPARE(widget->size().width(), 180.0);
+    QCOMPARE(widget->size().height(), 30.0);
+
+    // Switch mode
+    loader->setResizeMode(QDeclarativeLoader::SizeLoaderToItem);
+    widget->resize(QSizeF(160,45));
+    QCOMPARE(loader->width(), 160.0);
+    QCOMPARE(loader->height(), 45.0);
+}
+
+void tst_QmlGraphicsLoader::noResizeGraphicsWidget()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("/NoResizeGraphicsWidget.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QGraphicsScene scene;
+    scene.addItem(loader);
+
+    QVERIFY(loader != 0);
+    QCOMPARE(loader->width(), 200.0);
+    QCOMPARE(loader->height(), 80.0);
+
+    QGraphicsWidget *widget = qobject_cast<QGraphicsWidget*>(loader->item());
+    QVERIFY(widget);
+    QCOMPARE(widget->size().width(), 250.0);
+    QCOMPARE(widget->size().height(), 250.0);
+}
+
+void tst_QmlGraphicsLoader::networkRequestUrl()
+{
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    server.serveDirectory(SRCDIR "/data");
+
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/Rect120x60.qml\" }"), TEST_FILE(""));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QVERIFY(loader != 0);
+
+    TRY_WAIT(loader->status() == QDeclarativeLoader::Ready);
+
+    QVERIFY(loader->item());
+    QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+    delete loader;
+}
+
+/* XXX Component waits until all dependencies are loaded.  Is this actually possible?
+void tst_QmlGraphicsLoader::networkComponent()
+{
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    server.serveDirectory("slowdata", TestHTTPServer::Delay);
+
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray(
+                "import Qt 4.6\n"
+                "import \"http://127.0.0.1:14445/\" as NW\n"
+                "Item {\n"
+                " Component { id: comp; NW.SlowRect {} }\n"
+                " Loader { sourceComponent: comp } }")
+            , TEST_FILE(""));
+
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(item);
+
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); 
+    QVERIFY(loader);
+    TRY_WAIT(loader->status() == QDeclarativeLoader::Ready);
+
+    QVERIFY(loader->item());
+    QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+    delete loader;
+}
+*/
+
+void tst_QmlGraphicsLoader::failNetworkRequest()
+{
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    server.serveDirectory(SRCDIR "/data");
+
+    QTest::ignoreMessage(QtWarningMsg, "(:-1: Network error for URL http://127.0.0.1:14445/IDontExist.qml) ");
+
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/IDontExist.qml\" }"), TEST_FILE(""));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
+    QVERIFY(loader != 0);
+
+    TRY_WAIT(loader->status() == QDeclarativeLoader::Error);
+
+    QVERIFY(loader->item() == 0);
+    QCOMPARE(loader->progress(), 0.0);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
+
+    delete loader;
+}
+
+QTEST_MAIN(tst_QmlGraphicsLoader)
+
+#include "tst_qdeclarativeloader.moc"
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
new file mode 100644
index 0000000..7170469
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativemetaproperty.cpp
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
new file mode 100644
index 0000000..0271c64
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -0,0 +1,1185 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativemetaproperty.h>
+#include <private/qguard_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <QtGui/QLineEdit>
+
+class MyQmlObject : public QObject
+{
+    Q_OBJECT
+public:
+    MyQmlObject() {}
+};
+
+QML_DECLARE_TYPE(MyQmlObject);
+
+class MyAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int foo READ foo WRITE setFoo)
+public:
+    MyAttached(QObject *parent) : QObject(parent), m_foo(13) {}
+
+    int foo() const { return m_foo; }
+    void setFoo(int f) { m_foo = f; }
+
+private:
+    int m_foo;
+};
+
+class MyContainer : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDeclarativeListProperty<MyQmlObject> children READ children)
+public:
+    MyContainer() {}
+
+    QDeclarativeListProperty<MyQmlObject> children() { return QDeclarativeListProperty<MyQmlObject>(this, m_children); }
+
+    static MyAttached *qmlAttachedProperties(QObject *o) {
+        return new MyAttached(o);
+    }
+
+private:
+    QList<MyQmlObject*> m_children;
+};
+
+QML_DECLARE_TYPE(MyContainer);
+QML_DECLARE_TYPEINFO(MyContainer, QML_HAS_ATTACHED_PROPERTIES)
+
+class tst_qmlmetaproperty : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlmetaproperty() {}
+
+private slots:
+    void initTestCase();
+
+    // Constructors
+    void qmlmetaproperty();
+    void qmlmetaproperty_object();
+    void qmlmetaproperty_object_string();
+    void qmlmetaproperty_object_context();
+    void qmlmetaproperty_object_string_context();
+
+    // Methods
+    void name();
+    void read();
+    void write();
+    void reset();
+
+    // Functionality
+    void writeObjectToList();
+    void writeListToList();
+
+    //writeToReadOnly();
+
+    // Bugs
+    void crashOnValueProperty();
+
+    void copy();
+private:
+    QDeclarativeEngine engine;
+};
+
+void tst_qmlmetaproperty::qmlmetaproperty()
+{
+    QDeclarativeMetaProperty prop;
+
+    QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+    QVERIFY(binding != 0);
+    QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+    QVERIFY(expression != 0);
+
+    QObject *obj = new QObject;
+
+    QCOMPARE(prop.name(), QString());
+    QCOMPARE(prop.read(), QVariant());
+    QCOMPARE(prop.write(QVariant()), false);
+    QCOMPARE(prop.hasChangedNotifier(), false);
+    QCOMPARE(prop.needsChangedNotifier(), false);
+    QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+    QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+    QCOMPARE(prop.connectNotifier(obj, 0), false);
+    QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+    QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+    QCOMPARE(prop.connectNotifier(obj, -1), false);
+    QVERIFY(prop.method().signature() == 0);
+    QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
+    QCOMPARE(prop.isProperty(), false);
+    QCOMPARE(prop.isDefault(), false);
+    QCOMPARE(prop.isWritable(), false);
+    QCOMPARE(prop.isDesignable(), false);
+    QCOMPARE(prop.isResettable(), false);
+    QCOMPARE(prop.isValid(), false);
+    QCOMPARE(prop.object(), (QObject *)0);
+    QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+    QCOMPARE(prop.propertyType(), 0);
+    QCOMPARE(prop.propertyTypeName(), (const char *)0);
+    QVERIFY(prop.property().name() == 0);
+    QVERIFY(prop.binding() == 0);
+    QVERIFY(prop.setBinding(binding) == 0);
+    QVERIFY(binding == 0);
+    QVERIFY(prop.signalExpression() == 0);
+    QVERIFY(prop.setSignalExpression(expression) == 0);
+    QVERIFY(expression == 0);
+    QCOMPARE(prop.coreIndex(), -1);
+    QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+    delete obj;
+}
+
+class PropertyObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int defaultProperty READ defaultProperty);
+    Q_PROPERTY(QRect rectProperty READ rectProperty);
+    Q_PROPERTY(QRect wrectProperty READ wrectProperty WRITE setWRectProperty);
+    Q_PROPERTY(QUrl url READ url WRITE setUrl);
+    Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty);
+
+    Q_CLASSINFO("DefaultProperty", "defaultProperty");
+public:
+    PropertyObject() : m_resetProperty(9) {}
+
+    int defaultProperty() { return 10; }
+    QRect rectProperty() { return QRect(10, 10, 1, 209); }
+
+    QRect wrectProperty() { return m_rect; }
+    void setWRectProperty(const QRect &r) { m_rect = r; }
+
+    QUrl url() { return m_url; }
+    void setUrl(const QUrl &u) { m_url = u; }
+
+    int resettableProperty() const { return m_resetProperty; }
+    void setResettableProperty(int r) { m_resetProperty = r; }
+    void resetProperty() { m_resetProperty = 9; }
+
+signals:
+    void clicked();
+
+private:
+    int m_resetProperty;
+    QRect m_rect;
+    QUrl m_url;
+};
+
+QML_DECLARE_TYPE(PropertyObject);
+
+void tst_qmlmetaproperty::qmlmetaproperty_object()
+{
+    QObject object; // Has no default property
+    PropertyObject dobject; // Has default property
+
+    {
+        QDeclarativeMetaProperty prop(&object);
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString());
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), false);
+        QCOMPARE(prop.object(), (QObject *)0);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QVERIFY(prop.property().name() == 0);
+        QVERIFY(prop.binding() == 0);
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeMetaProperty prop(&dobject);
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("defaultProperty"));
+        QCOMPARE(prop.read(), QVariant(10));
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), true);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), (QDeclarativeMetaProperty::Type)(QDeclarativeMetaProperty::Property | QDeclarativeMetaProperty::Default));
+        QCOMPARE(prop.isProperty(), true);
+        QCOMPARE(prop.isDefault(), true);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), true);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
+        QCOMPARE(prop.propertyTypeName(), "int");
+        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
+        QVERIFY(prop.binding() == 0);
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding != 0);
+        QVERIFY(prop.binding() == binding);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+}
+
+void tst_qmlmetaproperty::qmlmetaproperty_object_string()
+{
+    QObject object; 
+    PropertyObject dobject; 
+
+    {
+        QDeclarativeMetaProperty prop(&object, QString("defaultProperty"));
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString());
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), false);
+        QCOMPARE(prop.object(), (QObject *)0);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QVERIFY(prop.property().name() == 0);
+        QVERIFY(prop.binding() == 0);
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeMetaProperty prop(&dobject, QString("defaultProperty"));
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("defaultProperty"));
+        QCOMPARE(prop.read(), QVariant(10));
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), true);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Property);
+        QCOMPARE(prop.isProperty(), true);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), true);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
+        QCOMPARE(prop.propertyTypeName(), "int");
+        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
+        QVERIFY(prop.binding() == 0);
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding != 0);
+        QVERIFY(prop.binding() == binding);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeMetaProperty prop(&dobject, QString("onClicked"));
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("onClicked"));
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant("Hello")), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QCOMPARE(prop.property().name(), (const char *)0);
+        QVERIFY(prop.binding() == 0);
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression != 0);
+        QVERIFY(prop.signalExpression() == expression);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+}
+
+void tst_qmlmetaproperty::qmlmetaproperty_object_context()
+{
+    QObject object; // Has no default property
+    PropertyObject dobject; // Has default property
+
+    {
+        QDeclarativeMetaProperty prop(&object, engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString());
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), false);
+        QCOMPARE(prop.object(), (QObject *)0);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QVERIFY(prop.property().name() == 0);
+        QVERIFY(prop.binding() == 0);
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeMetaProperty prop(&dobject, engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("defaultProperty"));
+        QCOMPARE(prop.read(), QVariant(10));
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), true);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), (QDeclarativeMetaProperty::Type)(QDeclarativeMetaProperty::Property | QDeclarativeMetaProperty::Default));
+        QCOMPARE(prop.isProperty(), true);
+        QCOMPARE(prop.isDefault(), true);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), true);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
+        QCOMPARE(prop.propertyTypeName(), "int");
+        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
+        QVERIFY(prop.binding() == 0);
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding != 0);
+        QVERIFY(prop.binding() == binding);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+}
+
+void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
+{
+    QObject object; 
+    PropertyObject dobject; 
+
+    {
+        QDeclarativeMetaProperty prop(&object, QString("defaultProperty"), engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString());
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), false);
+        QCOMPARE(prop.object(), (QObject *)0);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QVERIFY(prop.property().name() == 0);
+        QVERIFY(prop.binding() == 0);
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeMetaProperty prop(&dobject, QString("defaultProperty"), engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("defaultProperty"));
+        QCOMPARE(prop.read(), QVariant(10));
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), true);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Property);
+        QCOMPARE(prop.isProperty(), true);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), true);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
+        QCOMPARE(prop.propertyTypeName(), "int");
+        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
+        QVERIFY(prop.binding() == 0);
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding != 0);
+        QVERIFY(prop.binding() == binding);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeMetaProperty prop(&dobject, QString("onClicked"), engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("onClicked"));
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant("Hello")), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QCOMPARE(prop.property().name(), (const char *)0);
+        QVERIFY(prop.binding() == 0);
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression != 0);
+        QVERIFY(prop.signalExpression() == expression);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
+}
+
+void tst_qmlmetaproperty::name()
+{
+    { 
+        QDeclarativeMetaProperty p;
+        QCOMPARE(p.name(), QString());
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o);
+        QCOMPARE(p.name(), QString("defaultProperty"));
+    }
+
+    {
+        QObject o;
+        QDeclarativeMetaProperty p(&o, QString("objectName"));
+        QCOMPARE(p.name(), QString("objectName"));
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "onClicked");
+        QCOMPARE(p.name(), QString("onClicked"));
+    }
+
+    {
+        QObject o;
+        QDeclarativeMetaProperty p(&o, "onClicked");
+        QCOMPARE(p.name(), QString());
+    }
+
+    {
+        QObject o;
+        QDeclarativeMetaProperty p(&o, "foo");
+        QCOMPARE(p.name(), QString());
+    }
+
+    {
+        QDeclarativeMetaProperty p(0, "foo");
+        QCOMPARE(p.name(), QString());
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty");
+        QCOMPARE(p.name(), QString("rectProperty"));
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.x");
+        QCOMPARE(p.name(), QString("rectProperty.x"));
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.foo");
+        QCOMPARE(p.name(), QString());
+    }
+}
+
+void tst_qmlmetaproperty::read()
+{
+    // Invalid 
+    {
+        QDeclarativeMetaProperty p;
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Default prop
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o);
+        QCOMPARE(p.read(), QVariant(10));
+    }
+
+    // Invalid default prop
+    {
+        QObject o;
+        QDeclarativeMetaProperty p(&o);
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Value prop by name
+    {
+        QObject o;
+
+        QDeclarativeMetaProperty p(&o, "objectName");
+        QCOMPARE(p.read(), QVariant(QString()));
+
+        o.setObjectName("myName");
+
+        QCOMPARE(p.read(), QVariant("myName"));
+    }
+
+    // Value-type prop
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.x");
+        QCOMPARE(p.read(), QVariant(10));
+    }
+
+    // Invalid value-type prop
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.foo");
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Signal property
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "onClicked");
+        QCOMPARE(p.read(), QVariant());
+
+        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
+        QVERIFY(0 != p.signalExpression());
+
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Deleted object
+    {
+        PropertyObject *o = new PropertyObject;
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(o, "rectProperty.x");
+        QCOMPARE(p.read(), QVariant(10));
+        delete o;
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Attached property
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0\nMyContainer { }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
+        QCOMPARE(p.read(), QVariant(13));
+        delete object;
+    }
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0\nMyContainer { MyContainer.foo: 10 }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
+        QCOMPARE(p.read(), QVariant(10));
+        delete object;
+    }
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
+        QCOMPARE(p.read(), QVariant(10));
+        delete object;
+    }
+}
+
+void tst_qmlmetaproperty::write()
+{
+    // Invalid
+    {
+        QDeclarativeMetaProperty p;
+        QCOMPARE(p.write(QVariant(10)), false);
+    }
+
+    // Read-only default prop
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o);
+        QCOMPARE(p.write(QVariant(10)), false);
+    }
+
+    // Invalid default prop
+    {
+        QObject o;
+        QDeclarativeMetaProperty p(&o);
+        QCOMPARE(p.write(QVariant(10)), false);
+    }
+
+    // Read-only prop by name
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, QString("defaultProperty"));
+        QCOMPARE(p.write(QVariant(10)), false);
+    }
+
+    // Writable prop by name
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, QString("objectName"));
+        QCOMPARE(o.objectName(), QString());
+        QCOMPARE(p.write(QVariant(QString("myName"))), true);
+        QCOMPARE(o.objectName(), QString("myName"));
+    }
+
+    // Deleted object
+    {
+        PropertyObject *o = new PropertyObject;
+        QDeclarativeMetaProperty p(o, QString("objectName"));
+        QCOMPARE(p.write(QVariant(QString("myName"))), true);
+        QCOMPARE(o->objectName(), QString("myName"));
+
+        delete o;
+
+        QCOMPARE(p.write(QVariant(QString("myName"))), false);
+    }
+
+    // Signal property
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "onClicked");
+        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
+
+        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
+        QVERIFY(0 != p.signalExpression());
+
+        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
+
+        QVERIFY(0 != p.signalExpression());
+    }
+
+    // Value-type property
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "wrectProperty");
+
+        QCOMPARE(o.wrectProperty(), QRect());
+        QCOMPARE(p.write(QRect(1, 13, 99, 8)), true);
+        QCOMPARE(o.wrectProperty(), QRect(1, 13, 99, 8));
+
+        QDeclarativeMetaProperty p2 = QDeclarativeMetaProperty::createProperty(&o, "wrectProperty.x");
+        QCOMPARE(p2.read(), QVariant(1));
+        QCOMPARE(p2.write(QVariant(6)), true);
+        QCOMPARE(p2.read(), QVariant(6));
+        QCOMPARE(o.wrectProperty(), QRect(6, 13, 99, 8));
+    }
+
+    // URL-property
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "url");
+
+        QCOMPARE(p.write(QUrl("main.qml")), true);
+        QCOMPARE(o.url(), QUrl("main.qml"));
+
+        QDeclarativeMetaProperty p2(&o, "url", engine.rootContext());
+
+        QUrl result = engine.baseUrl().resolved(QUrl("main.qml"));
+        QVERIFY(result != QUrl("main.qml"));
+
+        QCOMPARE(p2.write(QUrl("main.qml")), true);
+        QCOMPARE(o.url(), result);
+    }
+
+    // Attached property
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0\nMyContainer { }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
+        p.write(QVariant(99));
+        QCOMPARE(p.read(), QVariant(99));
+        delete object;
+    }
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
+        p.write(QVariant(99));
+        QCOMPARE(p.read(), QVariant(99));
+        delete object;
+    }
+}
+
+void tst_qmlmetaproperty::reset()
+{
+    // Invalid
+    {
+        QDeclarativeMetaProperty p;
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Read-only default prop
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o);
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Invalid default prop
+    {
+        QObject o;
+        QDeclarativeMetaProperty p(&o);
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Non-resettable-only prop by name
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, QString("defaultProperty"));
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Resettable prop by name
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, QString("resettableProperty"));
+
+        QCOMPARE(p.read(), QVariant(9));
+        QCOMPARE(p.write(QVariant(11)), true);
+        QCOMPARE(p.read(), QVariant(11));
+
+        QCOMPARE(p.isResettable(), true);
+        QCOMPARE(p.reset(), true);
+
+        QCOMPARE(p.read(), QVariant(9));
+    }
+
+    // Deleted object
+    {
+        PropertyObject *o = new PropertyObject;
+
+        QDeclarativeMetaProperty p(o, QString("resettableProperty"));
+
+        QCOMPARE(p.isResettable(), true);
+        QCOMPARE(p.reset(), true);
+
+        delete o;
+
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Signal property
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "onClicked");
+
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+}
+
+void tst_qmlmetaproperty::writeObjectToList()
+{
+    QDeclarativeComponent containerComponent(&engine);
+    containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
+    MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
+    QVERIFY(container != 0);
+    QDeclarativeListReference list(container, "children");
+    QVERIFY(list.count() == 1);
+
+    MyQmlObject *object = new MyQmlObject;
+    QDeclarativeMetaProperty prop(container, "children");
+    prop.write(qVariantFromValue(object));
+    QCOMPARE(list.count(), 1);
+    QCOMPARE(list.at(0), object);
+}
+
+Q_DECLARE_METATYPE(QList<QObject *>);
+void tst_qmlmetaproperty::writeListToList()
+{
+    QDeclarativeComponent containerComponent(&engine);
+    containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
+    MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
+    QVERIFY(container != 0);
+    QDeclarativeListReference list(container, "children");
+    QVERIFY(list.count() == 1);
+
+    QList<QObject*> objList;
+    objList << new MyQmlObject() << new MyQmlObject() << new MyQmlObject() << new MyQmlObject();
+    QDeclarativeMetaProperty prop(container, "children");
+    prop.write(qVariantFromValue(objList));
+    QCOMPARE(list.count(), 4);
+
+    //XXX need to try this with read/write prop (for read-only it correctly doesn't write)
+    /*QList<MyQmlObject*> typedObjList;
+    typedObjList << new MyQmlObject();
+    prop.write(qVariantFromValue(&typedObjList));
+    QCOMPARE(container->children()->size(), 1);*/
+}
+
+void tst_qmlmetaproperty::crashOnValueProperty()
+{
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
+    QDeclarativeComponent component(engine);
+
+    component.setData("import Test 1.0\nPropertyObject { wrectProperty.x: 10 }", QUrl());
+    PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
+    QVERIFY(obj != 0);
+
+    QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(obj, "wrectProperty.x", qmlContext(obj));
+    QCOMPARE(p.name(), QString("wrectProperty.x"));
+
+    QCOMPARE(p.read(), QVariant(10));
+
+    //don't crash once the engine is deleted
+    delete engine;
+    engine = 0;
+
+    QCOMPARE(p.propertyTypeName(), "int");
+    QCOMPARE(p.read(), QVariant(10));
+    p.write(QVariant(20));
+    QCOMPARE(p.read(), QVariant(20));
+}
+
+void tst_qmlmetaproperty::copy()
+{
+    PropertyObject object;
+
+    QDeclarativeMetaProperty *property = new QDeclarativeMetaProperty(&object, QLatin1String("defaultProperty"));
+    QCOMPARE(property->name(), QString("defaultProperty"));
+    QCOMPARE(property->read(), QVariant(10));
+    QCOMPARE(property->type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(property->propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(property->propertyType(), (int)QVariant::Int);
+
+    QDeclarativeMetaProperty p1(*property);
+    QCOMPARE(p1.name(), QString("defaultProperty"));
+    QCOMPARE(p1.read(), QVariant(10));
+    QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(p1.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
+
+    QDeclarativeMetaProperty p2(&object, QLatin1String("url"));
+    QCOMPARE(p2.name(), QString("url"));
+    p2 = *property;
+    QCOMPARE(p2.name(), QString("defaultProperty"));
+    QCOMPARE(p2.read(), QVariant(10));
+    QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(p2.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
+
+    delete property; property = 0;
+
+    QCOMPARE(p1.name(), QString("defaultProperty"));
+    QCOMPARE(p1.read(), QVariant(10));
+    QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(p1.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
+
+    QCOMPARE(p2.name(), QString("defaultProperty"));
+    QCOMPARE(p2.read(), QVariant(10));
+    QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(p2.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
+}
+
+void tst_qmlmetaproperty::initTestCase()
+{
+    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
+    QML_REGISTER_TYPE(Test,1,0,PropertyObject,PropertyObject);
+    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
+}
+
+
+QTEST_MAIN(tst_qmlmetaproperty)
+
+#include "tst_qdeclarativemetaproperty.moc"
diff --git a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro
new file mode 100644
index 0000000..2f7ff82
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativemetatype.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
new file mode 100644
index 0000000..e7372d3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
@@ -0,0 +1,377 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDeclarativeMetaType>
+#include <QLocale>
+#include <QPixmap>
+#include <QBitmap>
+#include <QPen>
+#include <QTextLength>
+#include <QMatrix4x4>
+#include <QVector2D>
+#include <QVector3D>
+#include <QVector4D>
+#include <QQuaternion>
+#include <qdeclarative.h>
+
+class tst_qmlmetatype : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlmetatype() {}
+
+private slots:
+    void initTestCase();
+
+    void copy();
+
+    void qmlParserStatusCast();
+    void qmlPropertyValueSourceCast();
+    void qmlPropertyValueInterceptorCast();
+
+    void isList();
+
+    void defaultObject();
+};
+
+class TestType : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int foo READ foo);
+
+    Q_CLASSINFO("DefaultProperty", "foo");
+public:
+    int foo() { return 0; }
+};
+QML_DECLARE_TYPE(TestType);
+
+class ParserStatusTestType : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_CLASSINFO("DefaultProperty", "foo"); // Missing default property
+};
+QML_DECLARE_TYPE(ParserStatusTestType);
+
+class ValueSourceTestType : public QObject, public QDeclarativePropertyValueSource
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativePropertyValueSource)
+public:
+    virtual void setTarget(const QDeclarativeMetaProperty &) {}
+};
+QML_DECLARE_TYPE(ValueSourceTestType);
+
+class ValueInterceptorTestType : public QObject, public QDeclarativePropertyValueInterceptor
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativePropertyValueInterceptor)
+public:
+    virtual void setTarget(const QDeclarativeMetaProperty &) {}
+    virtual void write(const QVariant &) {}
+};
+QML_DECLARE_TYPE(ValueInterceptorTestType);
+
+
+#define COPY_TEST(cpptype, metatype, value, defaultvalue) \
+{ \
+    cpptype v = (value); cpptype v2 = (value); \
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType:: metatype, &v, 0)); \
+    QVERIFY(v == (defaultvalue)); \
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType:: metatype, &v, &v2)); \
+    QVERIFY(v == (value)); \
+}
+
+#define QT_COPY_TEST(type, value) \
+{ \
+    type v = (value); type v2 = (value); \
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType:: type, &v, 0)); \
+    QVERIFY(v == (type ())); \
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType:: type, &v, &v2)); \
+    QVERIFY(v == (value)); \
+}
+
+void tst_qmlmetatype::initTestCase()
+{
+    QML_REGISTER_TYPE(Test, 1, 0, TestType, TestType);
+    QML_REGISTER_TYPE(Test, 1, 0, ParserStatusTestType, ParserStatusTestType);
+    QML_REGISTER_TYPE(Test, 1, 0, ValueSourceTestType, ValueSourceTestType);
+    QML_REGISTER_TYPE(Test, 1, 0, ValueInterceptorTestType, ValueInterceptorTestType);
+}
+
+void tst_qmlmetatype::copy()
+{
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType::Void, 0, 0));
+
+    COPY_TEST(bool, Bool, true, false);
+    COPY_TEST(int, Int, 10, 0);
+    COPY_TEST(unsigned int, UInt, 10, 0);
+    COPY_TEST(long long, LongLong, 10, 0);
+    COPY_TEST(unsigned long long, ULongLong, 10, 0);
+    COPY_TEST(double, Double, 19.2, 0);
+
+    QT_COPY_TEST(QChar, QChar('a'));
+
+    QVariantMap variantMap;
+    variantMap.insert("Hello World!", QVariant(10));
+    QT_COPY_TEST(QVariantMap, variantMap);
+
+    QT_COPY_TEST(QVariantList, QVariantList() << QVariant(19.2));
+    QT_COPY_TEST(QString, QString("QML Rocks!"));
+    QT_COPY_TEST(QStringList, QStringList() << "QML" << "Rocks");
+    QT_COPY_TEST(QByteArray, QByteArray("0x1102DDD"));
+    QT_COPY_TEST(QBitArray, QBitArray(102, true));
+    QDate cd = QDate::currentDate();
+    QT_COPY_TEST(QDate, cd);
+    QTime ct = QTime::currentTime();
+    QT_COPY_TEST(QTime, ct);
+    QDateTime cdt = QDateTime::currentDateTime();
+    QT_COPY_TEST(QDateTime, cdt);
+    QT_COPY_TEST(QUrl, QUrl("http://www.nokia.com"));
+    QT_COPY_TEST(QLocale, QLocale(QLocale::English, QLocale::Australia));
+    QT_COPY_TEST(QRect, QRect(-10, 10, 102, 99));
+    QT_COPY_TEST(QRectF, QRectF(-10.2, 1.2, 102, 99.6));
+    QT_COPY_TEST(QSize, QSize(100, 2));
+    QT_COPY_TEST(QSizeF, QSizeF(20.2, -100234.2)); 
+    QT_COPY_TEST(QLine, QLine(0, 0, 100, 100));
+    QT_COPY_TEST(QLineF, QLineF(-10.2, 0, 103, 1));
+    QT_COPY_TEST(QPoint, QPoint(-1912, 1613));
+    QT_COPY_TEST(QPointF, QPointF(-908.1, 1612));
+    QT_COPY_TEST(QRegExp, QRegExp("(\\d+)(?:\\s*)(cm|inch)"));
+
+    QVariantHash variantHash;
+    variantHash.insert("Hello World!", QVariant(19));
+    QT_COPY_TEST(QVariantHash, variantHash);
+
+#ifdef QT3_SUPPORT
+    QT_COPY_TEST(QColorGroup, QColorGroup(Qt::red, Qt::red, Qt::red, Qt::red, Qt::red, Qt::red, Qt::red));
+#endif
+
+    QT_COPY_TEST(QFont, QFont("Helvetica", 1024));
+
+    {
+        QPixmap v = QPixmap(100, 100); QPixmap v2 = QPixmap(100, 100);
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QPixmap, &v, 0)); 
+        QVERIFY(v.size() == QPixmap().size());
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QPixmap , &v, &v2)); 
+        QVERIFY(v.size() == QPixmap(100,100).size());
+    }
+
+    QT_COPY_TEST(QBrush, QBrush(Qt::blue));
+    QT_COPY_TEST(QColor, QColor("lightsteelblue"));
+    QT_COPY_TEST(QPalette, QPalette(Qt::green));
+    
+    {
+        QPixmap icon(100, 100);
+
+        QIcon v = QIcon(icon); QIcon v2 = QIcon(icon);
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon, &v, 0)); 
+        QVERIFY(v.isNull() == QIcon().isNull());
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon , &v, &v2)); 
+        QVERIFY(v.isNull() == QIcon(icon).isNull());
+    }
+
+    {
+        QImage v = QImage(100, 100, QImage::Format_RGB32); 
+        QImage v2 = QImage(100, 100, QImage::Format_RGB32);
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QImage, &v, 0)); 
+        QVERIFY(v.size() == QImage().size());
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QImage , &v, &v2)); 
+        QVERIFY(v.size() == QImage(100,100, QImage::Format_RGB32).size());
+    }
+
+    QT_COPY_TEST(QPolygon, QPolygon(QRect(100, 100, 200, 103)));
+    QT_COPY_TEST(QRegion, QRegion(QRect(0, 10, 99, 87)));
+
+    {
+        QBitmap v = QBitmap(100, 100); QBitmap v2 = QBitmap(100, 100);
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QBitmap, &v, 0)); 
+        QVERIFY(v.size() == QBitmap().size());
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QBitmap , &v, &v2)); 
+        QVERIFY(v.size() == QBitmap(100,100).size());
+    }
+
+    {
+        QCursor v = QCursor(Qt::SizeFDiagCursor); QCursor v2 = QCursor(Qt::SizeFDiagCursor);
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QCursor, &v, 0)); 
+        QVERIFY(v.shape() == QCursor().shape());
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QCursor , &v, &v2)); 
+        QVERIFY(v.shape() == QCursor(Qt::SizeFDiagCursor).shape());
+    }
+
+    QT_COPY_TEST(QSizePolicy, QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Maximum));
+    QT_COPY_TEST(QKeySequence, QKeySequence("Ctrl+O"));
+    QT_COPY_TEST(QPen, QPen(Qt::red));
+    QT_COPY_TEST(QTextLength, QTextLength(QTextLength::FixedLength, 10.2));
+    QT_COPY_TEST(QTextFormat, QTextFormat(QTextFormat::ListFormat));
+    QT_COPY_TEST(QMatrix, QMatrix().translate(10, 10));
+    QT_COPY_TEST(QTransform, QTransform().translate(10, 10));
+    QT_COPY_TEST(QMatrix4x4, QMatrix4x4(1,0,2,3,0,1,0,0,9,0,1,0,0,0,10,1));
+    QT_COPY_TEST(QVector2D, QVector2D(10.2, 1));
+    QT_COPY_TEST(QVector3D, QVector3D(10.2, 1, -2));
+    QT_COPY_TEST(QVector4D, QVector4D(10.2, 1, -2, 1.2));
+    QT_COPY_TEST(QQuaternion, QQuaternion(1.0, 10.2, 1, -2));
+
+    int voidValue;
+    COPY_TEST(void *, VoidStar, (void *)&voidValue, (void *)0);
+    COPY_TEST(long, Long, 10, 0);
+    COPY_TEST(short, Short, 10, 0);
+    COPY_TEST(char, Char, 'a', 0);
+    COPY_TEST(unsigned long, ULong, 10, 0);
+    COPY_TEST(unsigned short, UShort, 10, 0);
+    COPY_TEST(unsigned char, UChar, 'a', 0);
+    COPY_TEST(float, Float, 10.5, 0);
+
+    QObject objectValue;
+    QWidget widgetValue;
+    COPY_TEST(QObject *, QObjectStar, &objectValue, 0);
+    COPY_TEST(QWidget *, QWidgetStar, &widgetValue, 0);
+    COPY_TEST(qreal, QReal, 10.2, 0);
+
+    {
+        QVariant tv = QVariant::fromValue(QVariant(10));
+        QVariant v(tv); QVariant v2(tv);
+        QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<QVariant>(), &v, 0)); 
+        QVERIFY(v == QVariant());
+        QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<QVariant>(), &v, &v2)); 
+        QVERIFY(v == tv);
+    }
+
+    {
+        TestType t;  QVariant tv = QVariant::fromValue(&t);
+
+        QVariant v(tv); QVariant v2(tv);
+        QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<TestType *>(), &v, 0)); 
+        QVERIFY(v == QVariant::fromValue((TestType *)0));
+        QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<TestType *>(), &v, &v2)); 
+        QVERIFY(v == tv);
+    }
+}
+
+void tst_qmlmetatype::qmlParserStatusCast()
+{
+    QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>())->parserStatusCast(), -1);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->parserStatusCast(), -1);
+            
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
+    int cast = QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->parserStatusCast();
+    QVERIFY(cast != -1);
+    QVERIFY(cast != 0);
+
+    ParserStatusTestType t;
+    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QDeclarativeParserStatus *)&t));
+
+    QDeclarativeParserStatus *status = reinterpret_cast<QDeclarativeParserStatus *>(reinterpret_cast<char *>((QObject *)&t) + cast);
+    QCOMPARE(status, &t);
+}
+
+void tst_qmlmetatype::qmlPropertyValueSourceCast()
+{
+    QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueSourceCast(), -1);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueSourceCast(), -1);
+            
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
+    int cast = QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->propertyValueSourceCast();
+    QVERIFY(cast != -1);
+    QVERIFY(cast != 0);
+
+    ValueSourceTestType t;
+    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QDeclarativePropertyValueSource *)&t));
+
+    QDeclarativePropertyValueSource *source = reinterpret_cast<QDeclarativePropertyValueSource *>(reinterpret_cast<char *>((QObject *)&t) + cast);
+    QCOMPARE(source, &t);
+}
+
+void tst_qmlmetatype::qmlPropertyValueInterceptorCast()
+{
+    QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueInterceptorCast(), -1);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueInterceptorCast(), -1);
+            
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>()) != 0);
+    int cast = QDeclarativeMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>())->propertyValueInterceptorCast();
+    QVERIFY(cast != -1);
+    QVERIFY(cast != 0);
+
+    ValueInterceptorTestType t;
+    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QDeclarativePropertyValueInterceptor *)&t));
+
+    QDeclarativePropertyValueInterceptor *interceptor = reinterpret_cast<QDeclarativePropertyValueInterceptor *>(reinterpret_cast<char *>((QObject *)&t) + cast);
+    QCOMPARE(interceptor, &t);
+}
+
+void tst_qmlmetatype::isList()
+{
+    QCOMPARE(QDeclarativeMetaType::isList(QVariant::Invalid), false);
+    QCOMPARE(QDeclarativeMetaType::isList(QVariant::Int), false);
+
+    QDeclarativeListProperty<TestType> list;
+
+    QCOMPARE(QDeclarativeMetaType::isList(qMetaTypeId<QDeclarativeListProperty<TestType> >()), true);
+}
+
+void tst_qmlmetatype::defaultObject()
+{
+    QVERIFY(QDeclarativeMetaType::defaultProperty(&QObject::staticMetaObject).name() == 0);
+    QVERIFY(QDeclarativeMetaType::defaultProperty(&ParserStatusTestType::staticMetaObject).name() == 0);
+    QCOMPARE(QString(QDeclarativeMetaType::defaultProperty(&TestType::staticMetaObject).name()), QString("foo"));
+
+    QObject o;
+    TestType t;
+    ParserStatusTestType p;
+
+    QVERIFY(QDeclarativeMetaType::defaultProperty((QObject *)0).name() == 0);
+    QVERIFY(QDeclarativeMetaType::defaultProperty(&o).name() == 0);
+    QVERIFY(QDeclarativeMetaType::defaultProperty(&p).name() == 0);
+    QCOMPARE(QString(QDeclarativeMetaType::defaultProperty(&t).name()), QString("foo"));
+}
+
+QTEST_MAIN(tst_qmlmetatype)
+
+#include "tst_qdeclarativemetatype.moc"
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.qml b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.qml
new file mode 100644
index 0000000..f29ae24
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.qml
@@ -0,0 +1,3 @@
+import com.nokia.AutoTestQmlPluginType 1.0
+
+MyPluginType { value: 123 }
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
new file mode 100644
index 0000000..6433791
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QDebug>
+
+class MyPluginType : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value WRITE setValue)
+
+public:
+    MyPluginType(QObject *parent=0) : QObject(parent)
+    {
+        qWarning("import worked");
+    }
+
+    int value() const { return v; }
+    void setValue(int i) { v = i; }
+
+private:
+    int v;
+};
+
+QML_DECLARE_TYPE(MyPluginType);
+
+
+class MyPlugin : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    MyPlugin()
+    {
+        qWarning("plugin created");
+    }
+
+    QStringList keys() const
+    {
+        return QStringList() << QLatin1String("com.nokia.AutoTestQmlPluginType");
+    }
+
+    void initialize(QDeclarativeEngine*, const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType");
+        QML_REGISTER_TYPE(com.nokia.AutoTestQmlPluginType,1,0,MyPluginType,MyPluginType);
+    }
+};
+
+#include "plugin.moc"
+
+Q_EXPORT_PLUGIN2(plugin, MyPlugin);
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
new file mode 100644
index 0000000..348080d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
@@ -0,0 +1,5 @@
+TEMPLATE = lib
+CONFIG += plugin
+SOURCES = plugin.cpp
+QT = core declarative
+DESTDIR = qdeclarativemodules
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
new file mode 100644
index 0000000..96f4454
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
@@ -0,0 +1,7 @@
+QT = core
+TEMPLATE = subdirs
+SUBDIRS = plugin
+tst_qdeclarativemoduleplugin_pro.depends += plugin
+SUBDIRS += tst_qdeclarativemoduleplugin.pro
+
+
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
new file mode 100644
index 0000000..64c7499
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <qdir.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QDebug>
+
+class tst_qmlmoduleplugin : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlmoduleplugin() {
+        QCoreApplication::addLibraryPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin"));
+qDebug() << QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin");
+    }
+
+private slots:
+    void importsPlugin();
+};
+
+#define VERIFY_ERRORS(errorfile) \
+    if (!errorfile) { \
+        if (qgetenv("DEBUG") != "" && !component.errors().isEmpty()) \
+            qWarning() << "Unexpected Errors:" << component.errors(); \
+        QVERIFY(!component.isError()); \
+        QVERIFY(component.errors().isEmpty()); \
+    } else { \
+        QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
+        QVERIFY(file.open(QIODevice::ReadOnly)); \
+        QByteArray data = file.readAll(); \
+        file.close(); \
+        QList<QByteArray> expected = data.split('\n'); \
+        expected.removeAll(QByteArray("")); \
+        QList<QDeclarativeError> errors = component.errors(); \
+        QList<QByteArray> actual; \
+        for (int ii = 0; ii < errors.count(); ++ii) { \
+            const QDeclarativeError &error = errors.at(ii); \
+            QByteArray errorStr = QByteArray::number(error.line()) + ":" +  \
+                                  QByteArray::number(error.column()) + ":" + \
+                                  error.description().toUtf8(); \
+            actual << errorStr; \
+        } \
+        if (qgetenv("DEBUG") != "" && expected != actual) \
+            qWarning() << "Expected:" << expected << "Actual:" << actual;  \
+        if (qgetenv("QDECLARATIVELANGUAGE_UPDATEERRORS") != "" && expected != actual) {\
+            QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
+            QVERIFY(file.open(QIODevice::WriteOnly)); \
+            for (int ii = 0; ii < actual.count(); ++ii) { \
+                file.write(actual.at(ii)); file.write("\n"); \
+            } \
+            file.close(); \
+        } else { \
+            QCOMPARE(expected, actual); \
+        } \
+    }
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    QFileInfo fileInfo(__FILE__);
+    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename));
+}
+
+
+void tst_qmlmoduleplugin::importsPlugin()
+{
+    QDeclarativeEngine engine;
+    QTest::ignoreMessage(QtWarningMsg, "plugin created");
+    QTest::ignoreMessage(QtWarningMsg, "import worked");
+    QDeclarativeComponent component(&engine, TEST_FILE("plugin.qml"));
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("value").toInt(),123);
+}
+
+QTEST_MAIN(tst_qmlmoduleplugin)
+
+#include "tst_qdeclarativemoduleplugin.moc"
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
new file mode 100644
index 0000000..dd65511
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+SOURCES = tst_qdeclarativemoduleplugin.cpp
+QT += declarative
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml b/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml
new file mode 100644
index 0000000..4cd78da
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml
@@ -0,0 +1,28 @@
+import Qt 4.6
+Rectangle {
+    id: whiteRect
+    width: 200 
+    height: 200
+    color: "white"
+    Rectangle {
+        id: blackRect
+        objectName: "blackrect"
+        color: "black"
+        y: 50
+        x: 50
+        width: 100
+        height: 100
+        opacity: (whiteRect.width-blackRect.x+whiteRect.height-blackRect.y-199)/200
+        Text { text: blackRect.opacity}
+        MouseArea {
+            objectName: "mouseregion"
+            anchors.fill: parent
+            drag.target: blackRect
+            drag.axis: Drag.XandYAxis
+            drag.minimumX: 0
+            drag.maximumX: whiteRect.width-blackRect.width
+            drag.minimumY: 0
+            drag.maximumY: whiteRect.height-blackRect.height
+         }
+     }
+ }
diff --git a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
new file mode 100644
index 0000000..d01955b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui network
+macx:CONFIG -= app_bundle
+
+HEADERS += ../shared/testhttpserver.h
+SOURCES += tst_qdeclarativemousearea.cpp ../shared/testhttpserver.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
new file mode 100644
index 0000000..42a1e69
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtTest/QSignalSpy>
+#include <private/qdeclarativemousearea_p.h>
+#include <QtDeclarative/qdeclarativeview.h>
+
+class tst_QmlGraphicsMouseArea: public QObject
+{
+    Q_OBJECT
+private slots:
+    void dragProperties();
+private:
+    QDeclarativeView *createView(const QString &filename);
+};
+
+void tst_QmlGraphicsMouseArea::dragProperties()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/dragproperties.qml");
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeMouseArea *mouseRegion = canvas->rootObject()->findChild<QDeclarativeMouseArea*>("mouseregion");
+    QDeclarativeDrag *drag = mouseRegion->drag();
+    QVERIFY(mouseRegion != 0);
+    QVERIFY(drag != 0);
+
+    // target
+    QDeclarativeItem *blackRect = canvas->rootObject()->findChild<QDeclarativeItem*>("blackrect");
+    QVERIFY(blackRect != 0);
+    QVERIFY(blackRect == drag->target());
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
+    QVERIFY(rootItem != 0);
+    QSignalSpy targetSpy(drag, SIGNAL(targetChanged()));
+    drag->setTarget(rootItem);
+    QCOMPARE(targetSpy.count(),1);
+    drag->setTarget(rootItem);
+    QCOMPARE(targetSpy.count(),1);
+
+    // axis
+    QCOMPARE(drag->axis(), QDeclarativeDrag::XandYAxis);
+    QSignalSpy axisSpy(drag, SIGNAL(axisChanged()));
+    drag->setAxis(QDeclarativeDrag::XAxis);
+    QCOMPARE(drag->axis(), QDeclarativeDrag::XAxis);
+    QCOMPARE(axisSpy.count(),1);
+    drag->setAxis(QDeclarativeDrag::XAxis);
+    QCOMPARE(axisSpy.count(),1);
+
+    // minimum and maximum properties
+    QSignalSpy xminSpy(drag, SIGNAL(minimumXChanged()));
+    QSignalSpy xmaxSpy(drag, SIGNAL(maximumXChanged()));
+    QSignalSpy yminSpy(drag, SIGNAL(minimumYChanged()));
+    QSignalSpy ymaxSpy(drag, SIGNAL(maximumYChanged()));
+
+    QCOMPARE(drag->xmin(), 0.0);
+    QCOMPARE(drag->xmax(), rootItem->width()-blackRect->width());
+    QCOMPARE(drag->ymin(), 0.0);
+    QCOMPARE(drag->ymax(), rootItem->height()-blackRect->height());
+
+    drag->setXmin(10);
+    drag->setXmax(10);
+    drag->setYmin(10);
+    drag->setYmax(10);
+
+    QCOMPARE(drag->xmin(), 10.0);
+    QCOMPARE(drag->xmax(), 10.0);
+    QCOMPARE(drag->ymin(), 10.0);
+    QCOMPARE(drag->ymax(), 10.0);
+
+    QCOMPARE(xminSpy.count(),1);
+    QCOMPARE(xmaxSpy.count(),1);
+    QCOMPARE(yminSpy.count(),1);
+    QCOMPARE(ymaxSpy.count(),1);
+
+    drag->setXmin(10);
+    drag->setXmax(10);
+    drag->setYmin(10);
+    drag->setYmax(10);
+
+    QCOMPARE(xminSpy.count(),1);
+    QCOMPARE(xmaxSpy.count(),1);
+    QCOMPARE(yminSpy.count(),1);
+    QCOMPARE(ymaxSpy.count(),1);
+}
+
+QDeclarativeView *tst_QmlGraphicsMouseArea::createView(const QString &filename)
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    canvas->setSource(QUrl::fromLocalFile(filename));
+
+    return canvas;
+}
+
+QTEST_MAIN(tst_QmlGraphicsMouseArea)
+
+#include "tst_qdeclarativemousearea.moc"
diff --git a/tests/auto/declarative/qdeclarativenumberformatter/qdeclarativenumberformatter.pro b/tests/auto/declarative/qdeclarativenumberformatter/qdeclarativenumberformatter.pro
new file mode 100644
index 0000000..672e95c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativenumberformatter/qdeclarativenumberformatter.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative 
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativenumberformatter.cpp
diff --git a/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp b/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp
new file mode 100644
index 0000000..77ad442
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp
@@ -0,0 +1,222 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QDebug>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qnumberformat_p.h>
+#include <private/qdeclarativenumberformatter_p.h>
+
+class tst_qmlnumberformatter : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlnumberformatter();
+
+    void init() {}
+    void initTestCase() {}
+
+    void cleanup() {}
+    void cleanupTestCase() {}
+
+private slots:
+    void text_data();
+    void text();
+
+private:
+    QStringList strings;
+    QStringList formats;
+    QStringList texts;
+};
+
+tst_qmlnumberformatter::tst_qmlnumberformatter()
+{
+    strings << "100.0"
+            << "12345"
+            << "1234567"
+            << "0.123"
+            << "0.9999"
+            << "0.989"
+            << "1"
+            << "1.0"
+            << "1.01";
+
+    formats << ""
+            << "0000"
+            << "0000.00"
+            << "##"
+            << "##.##"
+            << "#0.00#"
+            << "##,##0.##"
+            << "(000) 000 - 000"
+            << "00000,000.0000";
+
+    //US locale only.
+    texts << "100.000000"
+          << "12345.000000"
+          << "1234567.000000"
+          << "0.123000"
+          << "0.999900"
+          << "0.989000"
+          << "1.000000"
+          << "1.000000"
+          << "1.010000" //end ""
+          << "0100"
+          << "12345"
+          << "1234567"
+          << "0000"
+          << "0001"
+          << "0001"
+          << "0001"
+          << "0001"
+          << "0001" // end "0000"
+          << "0100.00"
+          << "12345.00"
+          << "1234567.00"
+          << "0000.12"
+          << "0001.00"
+          << "0000.99"
+          << "0001.00"
+          << "0001.00"
+          << "0001.01" // end "0000.00"
+          << "100"
+          << "12345"
+          << "1234567"
+          << "0"
+          << "1"
+          << "1"
+          << "1"
+          << "1"
+          << "1" // end "##"
+          << "100"//start "##.##"
+          << "12345"
+          << "1234567"
+          << "0.12"
+          << "1"
+          << "0.99"
+          << "1"
+          << "1"
+          << "1.01" // end "##.##" -- ### EXPECT FAIL ### QNumberFormat::formatDecimal() bug
+          << "100.00" //start "#0.00#"
+          << "12345.00"
+          << "1234567.00"
+          << "0.123"
+          << "1.00"
+          << "0.989"
+          << "1.00"
+          << "1.00"
+          << "1.01" //end "#0.00#"
+          << "100" //start "##,##0.##"
+          << "12,345"
+          << "1,234,567"
+          << "0.12"
+          << "1"
+          << "0.99"
+          << "1"
+          << "1"
+          << "1.01" //end "##,##0.##" -- ### EXPECT FAIL ### QNumberFormat::formatDecimal() bug
+          << "(000) 000 - 100" //start "(000) 000 - 000"
+          << "(000) 012 - 345"
+          << "(001) 234 - 567"
+          << "(000) 000 - 000"
+          << "(000) 000 - 001"
+          << "(000) 000 - 001"
+          << "(000) 000 - 001"
+          << "(000) 000 - 001"
+          << "(000) 000 - 001" // end "(000) 000 - 000"
+          << "00,000,100.0000" // start "00000,000.0000"
+          << "00,012,345.0000" 
+          << "01,234,567.0000"
+          << "00,000,000.1230"
+          << "00,000,000.9999"
+          << "00,000,000.9890"
+          << "00,000,001.0000"
+          << "00,000,001.0000"
+          << "00,000,001.0100"; // end 
+
+    qDebug() << "strings.size()" << strings.size()
+             << "\nformats.size()" << formats.size()
+             << "texts.size()" << texts.size();
+}
+
+void tst_qmlnumberformatter::text_data()
+{
+    QTest::addColumn<QString>("string");
+    QTest::addColumn<QString>("format");
+    QTest::addColumn<QString>("text");
+
+    for (int j=0; j < formats.size(); j++)
+    {
+        for (int i=0; i < strings.size(); i++)
+        {
+            QTest::newRow(QString("%1, %2").arg(strings.at(i)).arg(formats.at(j)).toAscii())
+                << strings.at(i) << formats.at(j) << texts.at(j*formats.size()+i);
+        }
+    }
+
+}
+
+void tst_qmlnumberformatter::text()
+{
+    QFETCH(QString, string);
+    QFETCH(QString, format);
+    QFETCH(QString, text);
+
+    QString componentStr = QString("import Qt 4.6\nNumberFormatter { number: ") + string + QString("; format: \"") + format + QString("\" }");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent formatterComponent(&engine);
+    formatterComponent.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
+    if(formatterComponent.isError())
+        qDebug() << formatterComponent.errors();
+    QVERIFY(formatterComponent.isReady());
+    QDeclarativeNumberFormatter *formatter = qobject_cast<QDeclarativeNumberFormatter*>(formatterComponent.create());
+    QVERIFY(formatter != 0);
+
+    QCOMPARE(formatter->format(), format);
+    QCOMPARE(formatter->text(), text);
+
+    delete formatter;
+}
+
+QTEST_MAIN(tst_qmlnumberformatter)
+
+#include "tst_qdeclarativenumberformatter.moc"
diff --git a/tests/auto/declarative/qdeclarativeparticles/data/particle.png b/tests/auto/declarative/qdeclarativeparticles/data/particle.png
new file mode 100644
index 0000000..defbde5
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeparticles/data/particle.png differ
diff --git a/tests/auto/declarative/qdeclarativeparticles/data/particlemotion.qml b/tests/auto/declarative/qdeclarativeparticles/data/particlemotion.qml
new file mode 100644
index 0000000..ace61fe
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeparticles/data/particlemotion.qml
@@ -0,0 +1,33 @@
+import Qt 4.6
+Rectangle {
+    width: 240
+    height: 320
+    color: "black"
+    Particles {
+        objectName: "particles"    
+        anchors.fill: parent
+        width: 1
+        height: 1
+        source: "particle.png"
+        lifeSpan: 5000
+        count: 200
+        angle: 270
+        angleDeviation: 45
+        velocity: 50
+        velocityDeviation: 30
+        ParticleMotionGravity {
+            objectName: "motionGravity"
+            yattractor: 1000
+            xattractor: 0
+            acceleration: 25
+        }
+    }
+    resources: [
+        ParticleMotionWander {
+            objectName: "motionWander"
+            xvariance: 30
+            yvariance: 30
+            pace: 100
+        }
+    ]
+}
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativeparticles/data/particles.qml b/tests/auto/declarative/qdeclarativeparticles/data/particles.qml
new file mode 100644
index 0000000..c58927e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeparticles/data/particles.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+Rectangle{
+    width: 100
+    height: 100
+    color: "black"
+    objectName: "rect"
+    Particles { id: particles
+        objectName: "particles"
+        width:1; height:1; anchors.centerIn: parent; opacity: 1
+        lifeSpan: 100; lifeSpanDeviation: 20; count:1000; 
+        fadeInDuration: 20; fadeOutDuration: 20; count: -1; emissionRate: 1000
+        angle: 0; angleDeviation: 360; velocity: 500; velocityDeviation:30
+        source: "particle.png"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro
new file mode 100644
index 0000000..043bb85
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeparticles.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
new file mode 100644
index 0000000..328a480
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtTest/QtTest>
+#include <QtTest/QSignalSpy>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativeparticles_p.h>
+
+class tst_QmlGraphicsParticles : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlGraphicsParticles();
+
+private slots:
+    void properties();
+    void motionGravity();
+    void motionWander();
+    void runs();
+private:
+    QDeclarativeView *createView(const QString &filename);
+
+};
+
+tst_QmlGraphicsParticles::tst_QmlGraphicsParticles()
+{
+}
+
+void tst_QmlGraphicsParticles::properties()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml");
+    QVERIFY(canvas->rootObject());
+    QDeclarativeParticles* particles = canvas->rootObject()->findChild<QDeclarativeParticles*>("particles");
+    QVERIFY(particles);
+
+    particles->setSource(QUrl::fromLocalFile(SRCDIR "/data/particle.png"));
+    QCOMPARE(particles->source(), QUrl::fromLocalFile(SRCDIR "/data/particle.png"));
+
+    particles->setLifeSpanDeviation(1000);
+    QCOMPARE(particles->lifeSpanDeviation(), 1000);
+
+    particles->setFadeInDuration(1000);
+    QCOMPARE(particles->fadeInDuration(), 1000);
+
+    particles->setFadeOutDuration(1000);
+    QCOMPARE(particles->fadeOutDuration(), 1000);
+
+    particles->setAngle(100.0);
+    QCOMPARE(particles->angle(), 100.0);
+
+    particles->setAngleDeviation(100.0);
+    QCOMPARE(particles->angleDeviation(), 100.0);
+
+    particles->setVelocity(100.0);
+    QCOMPARE(particles->velocity(), 100.0);
+
+    particles->setVelocityDeviation(100.0);
+    QCOMPARE(particles->velocityDeviation(), 100.0);
+
+    particles->setEmissionVariance(0.5);
+    QCOMPARE(particles->emissionVariance(),0.5);
+
+    particles->setEmissionRate(12);
+    QCOMPARE(particles->emissionRate(), 12);
+}
+
+void tst_QmlGraphicsParticles::motionGravity()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml");
+    QVERIFY(canvas->rootObject());
+    QDeclarativeParticles* particles = canvas->rootObject()->findChild<QDeclarativeParticles*>("particles");
+    QVERIFY(particles);
+
+    QDeclarativeParticleMotionGravity* motionGravity = canvas->rootObject()->findChild<QDeclarativeParticleMotionGravity*>("motionGravity");
+    QCOMPARE(particles->motion(), motionGravity);
+
+    QSignalSpy xattractorSpy(motionGravity, SIGNAL(xattractorChanged()));
+    QSignalSpy yattractorSpy(motionGravity, SIGNAL(yattractorChanged()));
+    QSignalSpy accelerationSpy(motionGravity, SIGNAL(accelerationChanged()));
+
+    QCOMPARE(motionGravity->xAttractor(), 0.0);
+    QCOMPARE(motionGravity->yAttractor(), 1000.0);
+    QCOMPARE(motionGravity->acceleration(), 25.0);
+
+    motionGravity->setXAttractor(20.0);
+    motionGravity->setYAttractor(10.0);
+    motionGravity->setAcceleration(10.0);
+
+    QCOMPARE(motionGravity->xAttractor(), 20.0);
+    QCOMPARE(motionGravity->yAttractor(), 10.0);
+    QCOMPARE(motionGravity->acceleration(), 10.0);
+
+    QCOMPARE(xattractorSpy.count(), 1);
+    QCOMPARE(yattractorSpy.count(), 1);
+    QCOMPARE(accelerationSpy.count(), 1);
+
+    motionGravity->setXAttractor(20.0);
+    motionGravity->setYAttractor(10.0);
+    motionGravity->setAcceleration(10.0);
+
+    QCOMPARE(xattractorSpy.count(), 1);
+    QCOMPARE(yattractorSpy.count(), 1);
+    QCOMPARE(accelerationSpy.count(), 1);
+}
+
+void tst_QmlGraphicsParticles::motionWander()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml");
+    QVERIFY(canvas->rootObject());
+    QDeclarativeParticles* particles = canvas->rootObject()->findChild<QDeclarativeParticles*>("particles");
+    QVERIFY(particles);
+    
+    QSignalSpy motionSpy(particles, SIGNAL(motionChanged()));
+    QDeclarativeParticleMotionWander* motionWander = canvas->rootObject()->findChild<QDeclarativeParticleMotionWander*>("motionWander");
+    
+    particles->setMotion(motionWander);
+    QCOMPARE(particles->motion(),motionWander);
+    QCOMPARE(motionSpy.count(), 1);
+    
+    particles->setMotion(motionWander);
+    QCOMPARE(motionSpy.count(), 1);
+
+    QSignalSpy xvarianceSpy(motionWander, SIGNAL(xvarianceChanged()));
+    QSignalSpy yvarianceSpy(motionWander, SIGNAL(yvarianceChanged()));
+    QSignalSpy paceSpy(motionWander, SIGNAL(paceChanged()));
+
+    QCOMPARE(motionWander->xVariance(), 30.0);
+    QCOMPARE(motionWander->yVariance(), 30.0);
+    QCOMPARE(motionWander->pace(), 100.0);
+
+    motionWander->setXVariance(20.0);
+    motionWander->setYVariance(10.0);
+    motionWander->setPace(10.0);
+
+    QCOMPARE(motionWander->xVariance(), 20.0);
+    QCOMPARE(motionWander->yVariance(), 10.0);
+    QCOMPARE(motionWander->pace(), 10.0);
+
+    QCOMPARE(xvarianceSpy.count(), 1);
+    QCOMPARE(yvarianceSpy.count(), 1);
+    QCOMPARE(paceSpy.count(), 1);
+
+    motionWander->setXVariance(20.0);
+    motionWander->setYVariance(10.0);
+    motionWander->setPace(10.0);
+
+    QCOMPARE(xvarianceSpy.count(), 1);
+    QCOMPARE(yvarianceSpy.count(), 1);
+    QCOMPARE(paceSpy.count(), 1);
+}
+
+void tst_QmlGraphicsParticles::runs()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml");
+    QVERIFY(canvas->rootObject());
+    QDeclarativeParticles* particles = canvas->rootObject()->findChild<QDeclarativeParticles*>("particles");
+    QVERIFY(particles);
+    QTest::qWait(1000);//Run for one second. Test passes if it doesn't crash.
+}
+
+QDeclarativeView *tst_QmlGraphicsParticles::createView(const QString &filename)
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    canvas->setSource(QUrl::fromLocalFile(filename));
+
+    return canvas;
+}
+QTEST_MAIN(tst_QmlGraphicsParticles)
+
+#include "tst_qdeclarativeparticles.moc"
diff --git a/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
new file mode 100644
index 0000000..8d07db2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
@@ -0,0 +1,36 @@
+import Qt 4.6
+
+PathView {
+    id: pathview
+    objectName: "pathview"
+    width: 240; height: 320
+    pathItemCount: testObject.pathItemCount
+
+    function checkProperties() {
+        testObject.error = false;
+        if (testObject.useModel && pathview.model != testData) {
+            console.log("model property incorrect");
+            testObject.error = true;
+        }
+    }
+
+    model: testObject.useModel ? testData : 0
+
+    delegate: Component {
+        id: myDelegate
+        Rectangle {
+            id: wrapper
+            objectName: "wrapper"
+            width: 20; height: 20; color: name
+            Text {
+                objectName: "myText"
+                text: name
+            }
+        }
+    }
+
+    path: Path {
+        startX: 120; startY: 20;
+        PathLine { x: 120; y: 300 }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/data/path.qml b/tests/auto/declarative/qdeclarativepathview/data/path.qml
new file mode 100644
index 0000000..7e82a48
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/path.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Path {
+    startX: 120; startY: 100
+
+    PathAttribute { name: "scale"; value: 1.0 }
+    PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 }
+    PathPercent { value: 0.3 }
+    PathLine { x: 120; y: 100 }
+    PathCubic {
+        x: 180; y: 0; control1X: -10; control1Y: 90
+        control2X: 210; control2Y: 90
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview.qml
new file mode 100644
index 0000000..8fa8d59
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview.qml
@@ -0,0 +1,66 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    resources: [
+        Component {
+            id: delegate
+            Rectangle {
+                id: wrapper
+                objectName: "wrapper"
+                height: 20
+                width: 60
+                color: "white"
+                border.color: "black"
+                Text {
+                    text: index
+                }
+                Text {
+                    x: 20
+                    id: textName
+                    objectName: "textName"
+                    text: name
+                }
+                Text {
+                    x: 40
+                    id: textNumber
+                    objectName: "textNumber"
+                    text: number
+                }
+            }
+        }
+    ]
+    PathView {
+        id: view
+        objectName: "view"
+        width: 240
+        height: 320
+        model: testModel
+        delegate: delegate
+        snapPosition: 0.01
+        path: Path {
+            startY: 120
+            startX: 160
+            PathQuad {
+                y: 120
+                x: 80
+                controlY: 330
+                controlX: 100
+            }
+            PathLine {
+                y: 160
+                x: 20
+            }
+            PathCubic {
+                y: 120
+                x: 160
+                control1Y: 0
+                control1X: 100
+                control2Y: 000
+                control2X: 200
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview1.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview1.qml
new file mode 100644
index 0000000..b3b0a9a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview1.qml
@@ -0,0 +1,4 @@
+import Qt 4.6
+
+PathView {
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml
new file mode 100644
index 0000000..0d5c98b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml
@@ -0,0 +1,57 @@
+import Qt 4.6
+
+PathView {
+    id: photoPathView; model: rssModel; delegate: photoDelegate
+    y: 100; width: 800; height: 330; pathItemCount: 10; z: 1
+
+    path: Path {
+        startX: -50; startY: 40;
+
+        PathAttribute { name: "scale"; value: 0.5 }
+        PathAttribute { name: "angle"; value: -45 }
+
+        PathCubic {
+            x: 400; y: 220
+            control1X: 140; control1Y: 40
+            control2X: 210; control2Y: 220
+        }
+
+        PathAttribute { name: "scale"; value: 1.2  }
+        PathAttribute { name: "angle"; value: 0 }
+
+        PathCubic {
+            x: 850; y: 40
+            control2X: 660; control2Y: 40
+            control1X: 590; control1Y: 220
+        }
+
+        PathAttribute { name: "scale"; value: 0.5 }
+        PathAttribute { name: "angle"; value: 45 }
+    }
+
+    model: ListModel {
+        id: rssModel
+        ListElement { lColor: "red" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "gray" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "thistle" }
+    }
+
+    delegate: Component {
+        id: photoDelegate
+        Rectangle {
+            id: wrapper
+            width: 85; height: 85; color: lColor
+            scale: wrapper.PathView.scale
+
+            transform: Rotation {
+                id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
+                axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
new file mode 100644
index 0000000..412cca2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
@@ -0,0 +1,57 @@
+import Qt 4.6
+
+PathView {
+    id: photoPathView; model: rssModel; delegate: photoDelegate
+    y: 100; width: 800; height: 330; pathItemCount: 4; offset: 10
+    dragMargin: 24; snapPosition: 50
+
+    path: Path {
+        startX: -50; startY: 40;
+
+        PathAttribute { name: "scale"; value: 0.5 }
+        PathAttribute { name: "angle"; value: -45 }
+
+        PathCubic {
+            x: 400; y: 220
+            control1X: 140; control1Y: 40
+            control2X: 210; control2Y: 220
+        }
+
+        PathAttribute { name: "scale"; value: 1.2  }
+        PathAttribute { name: "angle"; value: 0 }
+
+        PathCubic {
+            x: 850; y: 40
+            control2X: 660; control2Y: 40
+            control1X: 590; control1Y: 220
+        }
+
+        PathAttribute { name: "scale"; value: 0.5 }
+        PathAttribute { name: "angle"; value: 45 }
+    }
+
+    model: ListModel {
+        id: rssModel
+        ListElement { lColor: "red" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "gray" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "thistle" }
+    }
+
+    delegate: Component {
+        id: photoDelegate
+        Rectangle {
+            id: wrapper
+            width: 85; height: 85; color: lColor
+
+            transform: Rotation {
+                id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
+                axis.y: 1; axis.z: 0
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro
new file mode 100644
index 0000000..2f6ae32
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativepathview.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
new file mode 100644
index 0000000..6873757
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -0,0 +1,488 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <private/qdeclarativepathview_p.h>
+#include <private/qdeclarativepath_p.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeexpression.h>
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <QtDeclarative/private/qdeclarativetext_p.h>
+#include <QtDeclarative/private/qdeclarativerectangle_p.h>
+#include <QAbstractListModel>
+#include <QFile>
+#include <private/qdeclarativevaluetype_p.h>
+#include "../../../shared/util.h"
+
+class tst_QmlGraphicsPathView : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlGraphicsPathView();
+
+private slots:
+    void initValues();
+    void items();
+    void dataModel();
+    void pathview2();
+    void pathview3();
+    void path();
+    void pathMoved();
+
+private:
+    QDeclarativeView *createView();
+    template<typename T>
+    T *findItem(QGraphicsObject *parent, const QString &objectName, int index=-1);
+    template<typename T>
+    QList<T*> findItems(QGraphicsObject *parent, const QString &objectName);
+};
+
+class TestObject : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool error READ error WRITE setError)
+    Q_PROPERTY(bool useModel READ useModel NOTIFY useModelChanged)
+    Q_PROPERTY(int pathItemCount READ pathItemCount NOTIFY pathItemCountChanged)
+
+public:
+    TestObject() : QObject(), mError(true), mUseModel(true), mPathItemCount(-1) {}
+
+    bool error() const { return mError; }
+    void setError(bool err) { mError = err; }
+
+    bool useModel() const { return mUseModel; }
+    void setUseModel(bool use) { mUseModel = use; emit useModelChanged(); }
+
+    int pathItemCount() const { return mPathItemCount; }
+    void setPathItemCount(int count) { mPathItemCount = count; emit pathItemCountChanged(); }
+
+signals:
+    void useModelChanged();
+    void pathItemCountChanged();
+
+private:
+    bool mError;
+    bool mUseModel;
+    int mPathItemCount;
+};
+
+class TestModel : public QAbstractListModel
+{
+public:
+    enum Roles { Name = Qt::UserRole+1, Number = Qt::UserRole+2 };
+
+    TestModel(QObject *parent=0) : QAbstractListModel(parent) {
+        QHash<int, QByteArray> roles;
+        roles[Name] = "name";
+        roles[Number] = "number";
+        setRoleNames(roles);
+    }
+
+    int rowCount(const QModelIndex &parent=QModelIndex()) const { return list.count(); }
+    QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const {
+        QVariant rv;
+        if (role == Name)
+            rv = list.at(index.row()).first;
+        else if (role == Number)
+            rv = list.at(index.row()).second;
+
+        return rv;
+    }
+
+    int count() const { return rowCount(); }
+    QString name(int index) const { return list.at(index).first; }
+    QString number(int index) const { return list.at(index).second; }
+
+    void addItem(const QString &name, const QString &number) {
+        emit beginInsertRows(QModelIndex(), list.count(), list.count());
+        list.append(QPair<QString,QString>(name, number));
+        emit endInsertRows();
+    }
+
+    void insertItem(int index, const QString &name, const QString &number) {
+        emit beginInsertRows(QModelIndex(), index, index);
+        list.insert(index, QPair<QString,QString>(name, number));
+        emit endInsertRows();
+    }
+
+    void removeItem(int index) {
+        emit beginRemoveRows(QModelIndex(), index, index);
+        list.removeAt(index);
+        emit endRemoveRows();
+    }
+
+    void moveItem(int from, int to) {
+        emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
+        list.move(from, to);
+        emit endMoveRows();
+    }
+
+    void modifyItem(int idx, const QString &name, const QString &number) {
+        list[idx] = QPair<QString,QString>(name, number);
+        emit dataChanged(index(idx,0), index(idx,0));
+    }
+
+private:
+    QList<QPair<QString,QString> > list;
+};
+
+
+tst_QmlGraphicsPathView::tst_QmlGraphicsPathView()
+{
+}
+
+void tst_QmlGraphicsPathView::initValues()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview1.qml"));
+    QDeclarativePathView *obj = qobject_cast<QDeclarativePathView*>(c.create());
+
+    QVERIFY(obj != 0);
+    QVERIFY(obj->path() == 0);
+    QVERIFY(obj->delegate() == 0);
+    QCOMPARE(obj->model(), QVariant());
+    QCOMPARE(obj->currentIndex(), 0);
+    QCOMPARE(obj->offset(), 0.);
+    QCOMPARE(obj->snapPosition(), 0.);
+    QCOMPARE(obj->dragMargin(), 0.);
+    QCOMPARE(obj->count(), 0);
+    QCOMPARE(obj->pathItemCount(), -1);
+}
+
+void tst_QmlGraphicsPathView::items()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    model.addItem("Fred", "12345");
+    model.addItem("John", "2345");
+    model.addItem("Bob", "54321");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview.qml"));
+    qApp->processEvents();
+
+    QDeclarativePathView *pathview = findItem<QDeclarativePathView>(canvas->rootObject(), "view");
+    QVERIFY(pathview != 0);
+
+    QCOMPARE(pathview->childItems().count(), model.count()); // assumes all are visible
+
+    for (int i = 0; i < model.count(); ++i) {
+        QDeclarativeText *name = findItem<QDeclarativeText>(pathview, "textName", i);
+        QVERIFY(name != 0);
+        QCOMPARE(name->text(), model.name(i));
+        QDeclarativeText *number = findItem<QDeclarativeText>(pathview, "textNumber", i);
+        QVERIFY(number != 0);
+        QCOMPARE(number->text(), model.number(i));
+    }
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsPathView::pathview2()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview2.qml"));
+    QDeclarativePathView *obj = qobject_cast<QDeclarativePathView*>(c.create());
+
+    QVERIFY(obj != 0);
+    QVERIFY(obj->path() != 0);
+    QVERIFY(obj->delegate() != 0);
+    QVERIFY(obj->model() != QVariant());
+    QCOMPARE(obj->currentIndex(), 0);
+    QCOMPARE(obj->offset(), 0.);
+    QCOMPARE(obj->snapPosition(), 0.);
+    QCOMPARE(obj->dragMargin(), 0.);
+    QCOMPARE(obj->count(), 8);
+    QCOMPARE(obj->pathItemCount(), 10);
+}
+
+void tst_QmlGraphicsPathView::pathview3()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview3.qml"));
+    QDeclarativePathView *obj = qobject_cast<QDeclarativePathView*>(c.create());
+
+    QVERIFY(obj != 0);
+    QVERIFY(obj->path() != 0);
+    QVERIFY(obj->delegate() != 0);
+    QVERIFY(obj->model() != QVariant());
+    QCOMPARE(obj->currentIndex(), 0);
+    QCOMPARE(obj->offset(), 50.); // ???
+    QCOMPARE(obj->snapPosition(), 0.5); // ???
+    QCOMPARE(obj->dragMargin(), 24.);
+    QCOMPARE(obj->count(), 8);
+    QCOMPARE(obj->pathItemCount(), 4);
+}
+
+void tst_QmlGraphicsPathView::path()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/path.qml"));
+    QDeclarativePath *obj = qobject_cast<QDeclarativePath*>(c.create());
+
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->startX(), 120.);
+    QCOMPARE(obj->startY(), 100.);
+    QVERIFY(obj->path() != QPainterPath());
+
+    QDeclarativeListReference list(obj, "pathElements");
+    QCOMPARE(list.count(), 5);
+
+    QDeclarativePathAttribute* attr = qobject_cast<QDeclarativePathAttribute*>(list.at(0));
+    QVERIFY(attr != 0);
+    QCOMPARE(attr->name(), QString("scale"));
+    QCOMPARE(attr->value(), 1.0);
+
+    QDeclarativePathQuad* quad = qobject_cast<QDeclarativePathQuad*>(list.at(1));
+    QVERIFY(quad != 0);
+    QCOMPARE(quad->x(), 120.);
+    QCOMPARE(quad->y(), 25.);
+    QCOMPARE(quad->controlX(), 260.);
+    QCOMPARE(quad->controlY(), 75.);
+
+    QDeclarativePathPercent* perc = qobject_cast<QDeclarativePathPercent*>(list.at(2));
+    QVERIFY(perc != 0);
+    QCOMPARE(perc->value(), 0.3);
+
+    QDeclarativePathLine* line = qobject_cast<QDeclarativePathLine*>(list.at(3));
+    QVERIFY(line != 0);
+    QCOMPARE(line->x(), 120.);
+    QCOMPARE(line->y(), 100.);
+
+    QDeclarativePathCubic* cubic = qobject_cast<QDeclarativePathCubic*>(list.at(4));
+    QVERIFY(cubic != 0);
+    QCOMPARE(cubic->x(), 180.);
+    QCOMPARE(cubic->y(), 0.);
+    QCOMPARE(cubic->control1X(), -10.);
+    QCOMPARE(cubic->control1Y(), 90.);
+    QCOMPARE(cubic->control2X(), 210.);
+    QCOMPARE(cubic->control2Y(), 90.);
+}
+
+void tst_QmlGraphicsPathView::dataModel()
+{
+    QDeclarativeView *canvas = createView();
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    TestModel model;
+    model.addItem("red", "1");
+    model.addItem("green", "2");
+    model.addItem("blue", "3");
+    model.addItem("purple", "4");
+    model.addItem("gray", "5");
+    model.addItem("brown", "6");
+    model.addItem("yellow", "7");
+    model.addItem("thistle", "8");
+    model.addItem("cyan", "9");
+
+    ctxt->setContextProperty("testData", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/datamodel.qml"));
+    qApp->processEvents();
+
+    QDeclarativePathView *pathview = qobject_cast<QDeclarativePathView*>(canvas->rootObject());
+    QVERIFY(pathview != 0);
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
+    QVERIFY(testObject->error() == false);
+
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(pathview, "wrapper", 0);
+    QVERIFY(item);
+    QCOMPARE(item->x(), 110.0);
+    QCOMPARE(item->y(), 10.0);
+
+    model.insertItem(4, "orange", "10");
+
+    int itemCount = findItems<QDeclarativeItem>(pathview, "wrapper").count();
+    QCOMPARE(itemCount, 10);
+
+    QDeclarativeText *text = findItem<QDeclarativeText>(pathview, "myText", 4);
+    QVERIFY(text);
+    QCOMPARE(text->text(), model.name(4));
+
+    model.removeItem(2);
+    text = findItem<QDeclarativeText>(pathview, "myText", 2);
+    QVERIFY(text);
+    QCOMPARE(text->text(), model.name(2));
+
+    testObject->setPathItemCount(5);
+    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
+    QVERIFY(testObject->error() == false);
+
+    itemCount = findItems<QDeclarativeItem>(pathview, "wrapper").count();
+    QCOMPARE(itemCount, 5);
+
+    QDeclarativeRectangle *testItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", 4);
+    QVERIFY(testItem != 0);
+    testItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", 5);
+    QVERIFY(testItem == 0);
+
+    model.insertItem(2, "pink", "2");
+
+    itemCount = findItems<QDeclarativeItem>(pathview, "wrapper").count();
+    QCOMPARE(itemCount, 5);
+
+    text = findItem<QDeclarativeText>(pathview, "myText", 2);
+    QVERIFY(text);
+    QCOMPARE(text->text(), model.name(2));
+
+    model.removeItem(3);
+    itemCount = findItems<QDeclarativeItem>(pathview, "wrapper").count();
+    QCOMPARE(itemCount, 5);
+    text = findItem<QDeclarativeText>(pathview, "myText", 3);
+    QVERIFY(text);
+    QCOMPARE(text->text(), model.name(3));
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsPathView::pathMoved()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    model.addItem("Ben", "12345");
+    model.addItem("Bohn", "2345");
+    model.addItem("Bob", "54321");
+    model.addItem("Bill", "4321");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview.qml"));
+    qApp->processEvents();
+
+    QDeclarativePathView *pathview = findItem<QDeclarativePathView>(canvas->rootObject(), "view");
+    QVERIFY(pathview != 0);
+
+    QDeclarativeRectangle *firstItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", 0);
+    QVERIFY(firstItem);
+    QDeclarativePath *path = qobject_cast<QDeclarativePath*>(pathview->path());
+    QVERIFY(path);
+    QPointF start = path->pointAt(0.0);
+    QPointF offset;//Center of item is at point, but pos is from corner
+    offset.setX(firstItem->width()/2);
+    offset.setY(firstItem->height()/2);
+    QCOMPARE(firstItem->pos() + offset, start);
+    pathview->setOffset(10);
+    QTest::qWait(1000);//Moving is animated?
+
+    for(int i=0; i<model.count(); i++){
+        QDeclarativeRectangle *curItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", i);
+        QCOMPARE(curItem->pos() + offset, path->pointAt(0.1 + i*0.25));
+    }
+
+    pathview->setOffset(100);
+    QTest::qWait(1000);//Moving is animated?
+    QCOMPARE(firstItem->pos() + offset, start);
+
+    delete canvas;
+}
+
+QDeclarativeView *tst_QmlGraphicsPathView::createView()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    return canvas;
+}
+
+/*
+   Find an item with the specified objectName.  If index is supplied then the
+   item must also evaluate the {index} expression equal to index
+ */
+template<typename T>
+T *tst_QmlGraphicsPathView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
+{
+    const QMetaObject &mo = T::staticMetaObject;
+    //qDebug() << parent->childItems().count() << "children";
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if(!item)
+            continue;
+        //qDebug() << "try" << item;
+        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
+            if (index != -1) {
+                QDeclarativeExpression e(qmlContext(item), "index", item);
+                if (e.value().toInt() == index)
+                    return static_cast<T*>(item);
+            } else {
+                return static_cast<T*>(item);
+            }
+        }
+        item = findItem<T>(item, objectName, index);
+        if (item)
+            return static_cast<T*>(item);
+    }
+
+    return 0;
+}
+
+template<typename T>
+QList<T*> tst_QmlGraphicsPathView::findItems(QGraphicsObject *parent, const QString &objectName)
+{
+    QList<T*> items;
+    const QMetaObject &mo = T::staticMetaObject;
+    //qDebug() << parent->QGraphicsObject::children().count() << "children";
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if(!item)
+            continue;
+        //qDebug() << "try" << item;
+        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName))
+            items.append(static_cast<T*>(item));
+        items += findItems<T>(item, objectName);
+    }
+
+    return items;
+}
+
+QTEST_MAIN(tst_QmlGraphicsPathView)
+
+#include "tst_qdeclarativepathview.moc"
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/exists.png b/tests/auto/declarative/qdeclarativepixmapcache/data/exists.png
new file mode 100644
index 0000000..399bd0b
Binary files /dev/null and b/tests/auto/declarative/qdeclarativepixmapcache/data/exists.png differ
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png b/tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png
new file mode 100644
index 0000000..399bd0b
Binary files /dev/null and b/tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png differ
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png b/tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png
new file mode 100644
index 0000000..399bd0b
Binary files /dev/null and b/tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png differ
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro
new file mode 100644
index 0000000..899c43f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+QT += network
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativepixmapcache.cpp
+
+# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
+# LIBS += -lgcov
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
new file mode 100644
index 0000000..ccf41c6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -0,0 +1,282 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtTest/QtTest>
+#include <private/qdeclarativepixmapcache_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QNetworkReply>
+
+// These don't let normal people run tests!
+//#include "../network-settings.h"
+
+class tst_qmlpixmapcache : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlpixmapcache() :
+        thisfile(QUrl::fromLocalFile(__FILE__))
+    {
+    }
+
+private slots:
+    void single();
+    void single_data();
+    void parallel();
+    void parallel_data();
+
+private:
+    QDeclarativeEngine engine;
+    QUrl thisfile;
+};
+
+
+static int slotters=0;
+
+class Slotter : public QObject
+{
+    Q_OBJECT
+public:
+    Slotter()
+    {
+        gotslot = false;
+        slotters++;
+    }
+    bool gotslot;
+
+public slots:
+    void got()
+    {
+        gotslot = true;
+        --slotters;
+        if (slotters==0)
+            QTestEventLoop::instance().exitLoop();
+    }
+};
+
+#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
+static const bool localfile_optimized = true;
+#else
+static const bool localfile_optimized = false;
+#endif
+
+void tst_qmlpixmapcache::single_data()
+{
+    // Note, since QDeclarativePixmapCache is shared, tests affect each other!
+    // so use different files fore all test functions.
+
+    QTest::addColumn<QUrl>("target");
+    QTest::addColumn<bool>("incache");
+    QTest::addColumn<bool>("exists");
+    QTest::addColumn<bool>("neterror");
+
+    // File URLs are optimized
+    QTest::newRow("local") << thisfile.resolved(QUrl("data/exists.png")) << localfile_optimized << true << false;
+    QTest::newRow("local") << thisfile.resolved(QUrl("data/notexists.png")) << localfile_optimized << false << false;
+    QTest::newRow("remote") << QUrl("http://qt.nokia.com/logo.png") << false << true << false;
+    QTest::newRow("remote") << QUrl("http://qt.nokia.com/thereisnologo.png") << false << false << true;
+}
+
+void tst_qmlpixmapcache::single()
+{
+    QFETCH(QUrl, target);
+    QFETCH(bool, incache);
+    QFETCH(bool, exists);
+    QFETCH(bool, neterror);
+
+    if (neterror) {
+        QString expected = "\"Error downloading " + target.toString() + " - server replied: Not Found\" ";
+        QTest::ignoreMessage(QtWarningMsg, expected.toLatin1());
+    } else if (!exists) {
+        QString expected = "Cannot open  QUrl( \"" + target.toString() + "\" )  ";
+        QTest::ignoreMessage(QtWarningMsg, expected.toLatin1());
+    }
+
+    QPixmap pixmap;
+    QVERIFY(pixmap.width() <= 0); // Check Qt assumption
+    QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(target, &pixmap);
+
+    if (incache) {
+        if (exists) {
+            QVERIFY(status == QDeclarativePixmapReply::Ready);
+            QVERIFY(pixmap.width() > 0);
+        } else {
+            QVERIFY(status == QDeclarativePixmapReply::Error);
+            QVERIFY(pixmap.width() <= 0);
+        }
+    } else {
+        QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(&engine, target);
+        QVERIFY(reply);
+        QVERIFY(pixmap.width() <= 0);
+
+        Slotter getter;
+        connect(reply, SIGNAL(finished()), &getter, SLOT(got()));
+        QTestEventLoop::instance().enterLoop(10);
+        QVERIFY(!QTestEventLoop::instance().timeout());
+        QVERIFY(getter.gotslot);
+        if (exists) {
+            QVERIFY(QDeclarativePixmapCache::get(target, &pixmap) == QDeclarativePixmapReply::Ready);
+            QVERIFY(pixmap.width() > 0);
+        } else {
+            QVERIFY(QDeclarativePixmapCache::get(target, &pixmap) == QDeclarativePixmapReply::Error);
+            QVERIFY(pixmap.width() <= 0);
+        }
+    }
+
+    QCOMPARE(QDeclarativePixmapCache::pendingRequests(), 0);
+}
+
+void tst_qmlpixmapcache::parallel_data()
+{
+    // Note, since QDeclarativePixmapCache is shared, tests affect each other!
+    // so use different files fore all test functions.
+
+    QTest::addColumn<QUrl>("target1");
+    QTest::addColumn<QUrl>("target2");
+    QTest::addColumn<int>("incache");
+    QTest::addColumn<int>("cancel"); // which one to cancel
+    QTest::addColumn<int>("requests");
+
+    QTest::newRow("local")
+            << thisfile.resolved(QUrl("data/exists1.png"))
+            << thisfile.resolved(QUrl("data/exists2.png"))
+            << (localfile_optimized ? 2 : 0)
+            << -1
+            << (localfile_optimized ? 0 : 2)
+            ;
+
+    QTest::newRow("remote")
+            << QUrl("http://qt.nokia.com/images/template/checkbox-on.png")
+            << QUrl("http://qt.nokia.com/images/products/qt-logo/image_tile")
+            << 0
+            << -1
+            << 2
+            ;
+
+    QTest::newRow("remoteagain")
+            << QUrl("http://qt.nokia.com/images/template/checkbox-on.png")
+            << QUrl("http://qt.nokia.com/images/products/qt-logo/image_tile")
+            << 2
+            << -1
+            << 0
+            ;
+
+    QTest::newRow("remotecopy")
+            << QUrl("http://qt.nokia.com/images/template/checkbox-off.png")
+            << QUrl("http://qt.nokia.com/images/template/checkbox-off.png")
+            << 0
+            << -1
+            << 1
+            ;
+
+    QTest::newRow("remotecopycancel")
+            << QUrl("http://qt.nokia.com/rounded_block_bg.png")
+            << QUrl("http://qt.nokia.com/rounded_block_bg.png")
+            << 0
+            << 0
+            << 1
+            ;
+}
+
+void tst_qmlpixmapcache::parallel()
+{
+    QFETCH(QUrl, target1);
+    QFETCH(QUrl, target2);
+    QFETCH(int, incache);
+    QFETCH(int, cancel);
+    QFETCH(int, requests);
+
+    QList<QUrl> targets;
+    targets << target1 << target2;
+
+    QList<QDeclarativePixmapReply*> replies;
+    QList<Slotter*> getters;
+    for (int i=0; i<targets.count(); ++i) {
+        QUrl target = targets.at(i);
+        QPixmap pixmap;
+        QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(target, &pixmap);
+        QDeclarativePixmapReply *reply = 0;
+        if (status != QDeclarativePixmapReply::Error && status != QDeclarativePixmapReply::Ready)
+            reply = QDeclarativePixmapCache::request(&engine, target);
+        replies.append(reply);
+        if (!reply) {
+            QVERIFY(pixmap.width() > 0);
+            getters.append(0);
+        } else {
+            QVERIFY(pixmap.width() <= 0);
+            getters.append(new Slotter);
+            connect(reply, SIGNAL(finished()), getters[i], SLOT(got()));
+        }
+    }
+
+    QCOMPARE(incache+slotters, targets.count());
+    QCOMPARE(QDeclarativePixmapCache::pendingRequests(), requests);
+
+    if (cancel >= 0) {
+        QDeclarativePixmapCache::cancel(targets.at(cancel), getters[cancel]);
+        slotters--;
+    }
+
+    if (slotters) {
+        QTestEventLoop::instance().enterLoop(10);
+        QVERIFY(!QTestEventLoop::instance().timeout());
+    }
+
+    for (int i=0; i<targets.count(); ++i) {
+        QDeclarativePixmapReply *reply = replies[i];
+        if (reply) {
+            if (i == cancel) {
+                QVERIFY(!getters[i]->gotslot);
+            } else {
+                QVERIFY(getters[i]->gotslot);
+                QPixmap pixmap;
+                QVERIFY(QDeclarativePixmapCache::get(targets[i], &pixmap) == QDeclarativePixmapReply::Ready);
+                QVERIFY(pixmap.width() > 0);
+            }
+            delete getters[i];
+        }
+    }
+
+    QCOMPARE(QDeclarativePixmapCache::pendingRequests(), 0);
+}
+
+QTEST_MAIN(tst_qmlpixmapcache)
+
+#include "tst_qdeclarativepixmapcache.moc"
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
new file mode 100644
index 0000000..f6376a1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
@@ -0,0 +1,60 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Grid {
+        columns: 3
+        add: Transition {
+            NumberAnimation {
+                properties: "x,y";
+            }
+        }
+        move: Transition {
+            NumberAnimation {
+                properties: "x,y";
+            }
+        }
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            x: -100
+            y: -100
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            x: -100
+            y: -100
+            opacity: 0
+            color: "green"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            x: -100
+            y: -100
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            x: -100
+            y: -100
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            x: -100
+            y: -100
+            width: 50
+            height: 50
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml
new file mode 100644
index 0000000..5b4a30d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml
@@ -0,0 +1,40 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Grid {
+        columns: 3
+        spacing: 4
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid.qml
new file mode 100644
index 0000000..830df6a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid.qml
@@ -0,0 +1,39 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Grid {
+        columns: 3
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
new file mode 100644
index 0000000..c113a36
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
@@ -0,0 +1,40 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Row {
+        add: Transition {
+            NumberAnimation {
+                properties: "x";
+            }
+        }
+        move: Transition {
+            NumberAnimation {
+                properties: "x";
+            }
+        }
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            x: -100;
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "blue"
+            x: -100;
+            opacity: 0
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            x: -100;
+            color: "green"
+            width: 50
+            height: 50
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
new file mode 100644
index 0000000..32bf775
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Row {
+        spacing: 10
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
new file mode 100644
index 0000000..06ae151
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Row {
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/propertychanges.qml b/tests/auto/declarative/qdeclarativepositioners/data/propertychanges.qml
new file mode 100644
index 0000000..4370a18
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/propertychanges.qml
@@ -0,0 +1,39 @@
+import Qt 4.6
+
+Grid {
+    id: myGrid
+
+    width: 270
+    height: 270
+    x: 3
+    y: 3
+    columns: 4
+    spacing: 3
+
+    add: columnTransition
+    move: columnTransition
+
+    Repeater {
+        model: 20
+        Rectangle { color: "black"; width: 50; height: 50 }
+    }
+
+    data: [
+    Transition {
+        id: rowTransition
+        objectName: "rowTransition"
+        NumberAnimation {
+            properties: "x,y";
+            easing.type: "OutInCubic"
+        }
+    },
+    Transition {
+        id: columnTransition
+        objectName: "columnTransition"
+        NumberAnimation {
+            properties: "x,y";
+            easing.type: "OutInCubic"
+        }
+    }
+    ]
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/repeater.qml b/tests/auto/declarative/qdeclarativepositioners/data/repeater.qml
new file mode 100644
index 0000000..2bc5e94
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/repeater.qml
@@ -0,0 +1,20 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Row {
+        Repeater{ model: 3;
+            delegate: Component {
+                Rectangle {
+                    color: "red"
+                    width: 50
+                    height: 50
+                    z: {if(index == 0){2;}else if(index == 1){1;} else{3;}}
+                    objectName: {if(index == 0){"one";}else if(index == 1){"two";} else{"three";}}
+
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml
new file mode 100644
index 0000000..10f6cbb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml
@@ -0,0 +1,40 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Column {
+        add: Transition {
+            NumberAnimation {
+                properties: "y";
+            }
+        }
+        move: Transition {
+            NumberAnimation {
+                properties: "y";
+            }
+        }
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            y: -100
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "blue"
+            y: -100
+            opacity: 0
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            y: -100
+            width: 50
+            height: 50
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml
new file mode 100644
index 0000000..69a8256
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Column {
+        spacing: 10
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/vertical.qml b/tests/auto/declarative/qdeclarativepositioners/data/vertical.qml
new file mode 100644
index 0000000..856c180
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/vertical.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Column {
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro
new file mode 100644
index 0000000..5edfa55
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativepositioners.cpp
+macx:CONFIG -= app_bundle
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
new file mode 100644
index 0000000..a8de83b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -0,0 +1,455 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtTest/QtTest>
+#include <private/qlistmodelinterface_p.h>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativepositioners_p.h>
+#include <private/qdeclarativetransition_p.h>
+#include <qdeclarativeexpression.h>
+#include "../../../shared/util.h"
+
+class tst_QmlGraphicsPositioners : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlGraphicsPositioners();
+
+private slots:
+    void test_horizontal();
+    void test_horizontal_spacing();
+    void test_horizontal_animated();
+    void test_vertical();
+    void test_vertical_spacing();
+    void test_vertical_animated();
+    void test_grid();
+    void test_grid_spacing();
+    void test_grid_animated();
+    void test_propertychanges();
+    void test_repeater();
+private:
+    QDeclarativeView *createView(const QString &filename);
+};
+
+tst_QmlGraphicsPositioners::tst_QmlGraphicsPositioners()
+{
+}
+
+void tst_QmlGraphicsPositioners::test_horizontal()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 70.0);
+    QCOMPARE(three->y(), 0.0);
+}
+
+void tst_QmlGraphicsPositioners::test_horizontal_spacing()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 60.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 90.0);
+    QCOMPARE(three->y(), 0.0);
+}
+
+void tst_QmlGraphicsPositioners::test_horizontal_animated()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    //Note that they animate in
+    QCOMPARE(one->x(), -100.0);
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(three->x(), -100.0);
+
+    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
+    //Note that this means the duration of the animation is NOT tested
+
+    QTRY_COMPARE(one->x(), 0.0);
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(two->opacity(), 0.0);
+    QTRY_COMPARE(two->x(), -100.0);//Not 'in' yet
+    QTRY_COMPARE(two->y(), 0.0);
+    QTRY_COMPARE(three->x(), 50.0);
+    QTRY_COMPARE(three->y(), 0.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QCOMPARE(two->opacity(), 1.0);
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(three->x(), 50.0);
+
+    QTRY_COMPARE(two->x(), 50.0);
+    QTRY_COMPARE(three->x(), 100.0);
+}
+
+void tst_QmlGraphicsPositioners::test_vertical()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/vertical.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 0.0);
+    QCOMPARE(two->y(), 50.0);
+    QCOMPARE(three->x(), 0.0);
+    QCOMPARE(three->y(), 60.0);
+}
+
+void tst_QmlGraphicsPositioners::test_vertical_spacing()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/vertical-spacing.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 0.0);
+    QCOMPARE(two->y(), 60.0);
+    QCOMPARE(three->x(), 0.0);
+    QCOMPARE(three->y(), 80.0);
+}
+
+void tst_QmlGraphicsPositioners::test_vertical_animated()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/vertical-animated.qml");
+
+    //Note that they animate in
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QCOMPARE(one->y(), -100.0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QCOMPARE(two->y(), -100.0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QCOMPARE(three->y(), -100.0);
+
+    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
+    //Note that this means the duration of the animation is NOT tested
+
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(one->x(), 0.0);
+    QTRY_COMPARE(two->opacity(), 0.0);
+    QTRY_COMPARE(two->y(), -100.0);//Not 'in' yet
+    QTRY_COMPARE(two->x(), 0.0);
+    QTRY_COMPARE(three->y(), 50.0);
+    QTRY_COMPARE(three->x(), 0.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QTRY_COMPARE(two->opacity(), 1.0);
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(two->y(), -100.0);
+    QCOMPARE(three->y(), 50.0);
+
+    QTRY_COMPARE(two->y(), 50.0);
+    QTRY_COMPARE(three->y(), 100.0);
+
+}
+
+void tst_QmlGraphicsPositioners::test_grid()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 70.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 50.0);
+    QCOMPARE(five->x(), 50.0);
+    QCOMPARE(five->y(), 50.0);
+}
+
+void tst_QmlGraphicsPositioners::test_grid_spacing()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid-spacing.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 54.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 78.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 54.0);
+    QCOMPARE(five->x(), 54.0);
+    QCOMPARE(five->y(), 54.0);
+}
+
+void tst_QmlGraphicsPositioners::test_grid_animated()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid-animated.qml");
+
+    //Note that all animate in
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QCOMPARE(one->x(), -100.0);
+    QCOMPARE(one->y(), -100.0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(two->y(), -100.0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QCOMPARE(three->x(), -100.0);
+    QCOMPARE(three->y(), -100.0);
+
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QCOMPARE(four->x(), -100.0);
+    QCOMPARE(four->y(), -100.0);
+
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+    QCOMPARE(five->x(), -100.0);
+    QCOMPARE(five->y(), -100.0);
+
+    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
+    //Note that this means the duration of the animation is NOT tested
+
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(one->x(), 0.0);
+    QTRY_COMPARE(two->opacity(), 0.0);
+    QTRY_COMPARE(two->y(), -100.0);
+    QTRY_COMPARE(two->x(), -100.0);
+    QTRY_COMPARE(three->y(), 0.0);
+    QTRY_COMPARE(three->x(), 50.0);
+    QTRY_COMPARE(four->y(), 0.0);
+    QTRY_COMPARE(four->x(), 100.0);
+    QTRY_COMPARE(five->y(), 50.0);
+    QTRY_COMPARE(five->x(), 0.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QCOMPARE(two->opacity(), 1.0);
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(two->y(), -100.0);
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 100.0);
+    QCOMPARE(four->y(), 0.0);
+    QCOMPARE(five->x(), 0.0);
+    QCOMPARE(five->y(), 50.0);
+    //Let the animation complete
+    QTRY_COMPARE(two->x(), 50.0);
+    QTRY_COMPARE(two->y(), 0.0);
+    QTRY_COMPARE(one->x(), 0.0);
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(three->x(), 100.0);
+    QTRY_COMPARE(three->y(), 0.0);
+    QTRY_COMPARE(four->x(), 0.0);
+    QTRY_COMPARE(four->y(), 50.0);
+    QTRY_COMPARE(five->x(), 50.0);
+    QTRY_COMPARE(five->y(), 50.0);
+
+}
+void tst_QmlGraphicsPositioners::test_propertychanges()
+{
+    QDeclarativeView *canvas = createView("data/propertychanges.qml");
+
+    QDeclarativeGrid *grid = qobject_cast<QDeclarativeGrid*>(canvas->rootObject());
+    QDeclarativeTransition *rowTransition = canvas->rootObject()->findChild<QDeclarativeTransition*>("rowTransition");
+    QDeclarativeTransition *columnTransition = canvas->rootObject()->findChild<QDeclarativeTransition*>("columnTransition");
+
+    QSignalSpy addSpy(grid, SIGNAL(addChanged()));
+    QSignalSpy moveSpy(grid, SIGNAL(moveChanged()));
+    QSignalSpy columnsSpy(grid, SIGNAL(columnsChanged()));
+    QSignalSpy rowsSpy(grid, SIGNAL(rowsChanged()));
+
+    QVERIFY(grid);
+    QVERIFY(rowTransition);
+    QVERIFY(columnTransition);
+    QCOMPARE(grid->add(), columnTransition);
+    QCOMPARE(grid->move(), columnTransition);
+    QCOMPARE(grid->columns(), 4);
+    QCOMPARE(grid->rows(), -1);
+
+    grid->setAdd(rowTransition);
+    grid->setMove(rowTransition);
+    QCOMPARE(grid->add(), rowTransition);
+    QCOMPARE(grid->move(), rowTransition);
+    QCOMPARE(addSpy.count(),1);
+    QCOMPARE(moveSpy.count(),1);
+
+    grid->setAdd(rowTransition);
+    grid->setMove(rowTransition);
+    QCOMPARE(addSpy.count(),1);
+    QCOMPARE(moveSpy.count(),1);
+
+    grid->setAdd(0);
+    grid->setMove(0);
+    QCOMPARE(addSpy.count(),2);
+    QCOMPARE(moveSpy.count(),2);
+
+    grid->setColumns(-1);
+    grid->setRows(3);
+    QCOMPARE(grid->columns(), -1);
+    QCOMPARE(grid->rows(), 3);
+    QCOMPARE(columnsSpy.count(),1);
+    QCOMPARE(rowsSpy.count(),1);
+
+    grid->setColumns(-1);
+    grid->setRows(3);
+    QCOMPARE(columnsSpy.count(),1);
+    QCOMPARE(rowsSpy.count(),1);
+
+    grid->setColumns(2);
+    grid->setRows(2);
+    QCOMPARE(columnsSpy.count(),2);
+    QCOMPARE(rowsSpy.count(),2);
+}
+
+void tst_QmlGraphicsPositioners::test_repeater()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/repeater.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 100.0);
+    QCOMPARE(three->y(), 0.0);
+}
+
+QDeclarativeView *tst_QmlGraphicsPositioners::createView(const QString &filename)
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+
+    canvas->setSource(QUrl::fromLocalFile(filename));
+
+    return canvas;
+}
+
+
+QTEST_MAIN(tst_QmlGraphicsPositioners)
+
+#include "tst_qdeclarativepositioners.moc"
diff --git a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro
new file mode 100644
index 0000000..aeccf9b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativepropertymap.cpp
diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
new file mode 100644
index 0000000..1a65bd9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
@@ -0,0 +1,171 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtDeclarative/qdeclarativepropertymap.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetext_p.h>
+#include <QSignalSpy>
+
+class tst_QmlPropertyMap : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlPropertyMap() {}
+
+private slots:
+    void insert();
+    void operatorInsert();
+    void operatorValue();
+    void clear();
+    void changed();
+    void count();
+};
+
+void tst_QmlPropertyMap::insert()
+{
+    QDeclarativePropertyMap map;
+    map.insert(QLatin1String("key1"),100);
+    map.insert(QLatin1String("key2"),200);
+    QVERIFY(map.keys().count() == 2);
+    QVERIFY(map.contains(QLatin1String("key1")));
+
+    QCOMPARE(map.value(QLatin1String("key1")), QVariant(100));
+    QCOMPARE(map.value(QLatin1String("key2")), QVariant(200));
+
+    map.insert(QLatin1String("key1"),"Hello World");
+    QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
+}
+
+void tst_QmlPropertyMap::operatorInsert()
+{
+    QDeclarativePropertyMap map;
+    map[QLatin1String("key1")] = 100;
+    map[QLatin1String("key2")] = 200;
+    QVERIFY(map.keys().count() == 2);
+
+    QCOMPARE(map.value(QLatin1String("key1")), QVariant(100));
+    QCOMPARE(map.value(QLatin1String("key2")), QVariant(200));
+
+    map[QLatin1String("key1")] = "Hello World";
+    QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
+}
+
+void tst_QmlPropertyMap::operatorValue()
+{
+    QDeclarativePropertyMap map;
+    map.insert(QLatin1String("key1"),100);
+    map.insert(QLatin1String("key2"),200);
+    QVERIFY(map.count() == 2);
+    QVERIFY(map.contains(QLatin1String("key1")));
+
+    const QDeclarativePropertyMap &constMap = map;
+
+    QCOMPARE(constMap.value(QLatin1String("key1")), QVariant(100));
+    QCOMPARE(constMap.value(QLatin1String("key2")), QVariant(200));
+    QCOMPARE(constMap[QLatin1String("key1")], constMap.value(QLatin1String("key1")));
+    QCOMPARE(constMap[QLatin1String("key2")], constMap.value(QLatin1String("key2")));
+}
+
+void tst_QmlPropertyMap::clear()
+{
+    QDeclarativePropertyMap map;
+    map.insert(QLatin1String("key1"),100);
+    QVERIFY(map.keys().count() == 1);
+
+    QCOMPARE(map.value(QLatin1String("key1")), QVariant(100));
+
+    map.clear(QLatin1String("key1"));
+    QVERIFY(map.keys().count() == 1);
+    QVERIFY(map.contains(QLatin1String("key1")));
+    QCOMPARE(map.value(QLatin1String("key1")), QVariant());
+}
+
+void tst_QmlPropertyMap::changed()
+{
+    QDeclarativePropertyMap map;
+    QSignalSpy spy(&map, SIGNAL(valueChanged(const QString&)));
+    map.insert(QLatin1String("key1"),100);
+    map.insert(QLatin1String("key2"),200);
+    QCOMPARE(spy.count(), 0);
+
+    map.clear(QLatin1String("key1"));
+    QCOMPARE(spy.count(), 0);
+
+    //make changes in QML
+    QDeclarativeEngine engine;
+    QDeclarativeContext *ctxt = engine.rootContext();
+    ctxt->setContextProperty(QLatin1String("testdata"), &map);
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.6\nText { text: { testdata.key1 = 'Hello World'; 'X' } }",
+            QUrl::fromLocalFile(""));
+    QVERIFY(component.isReady());
+    QDeclarativeText *txt = qobject_cast<QDeclarativeText*>(component.create());
+    QVERIFY(txt);
+    QCOMPARE(txt->text(), QString('X'));
+    QCOMPARE(spy.count(), 1);
+    QList<QVariant> arguments = spy.takeFirst();
+    QCOMPARE(arguments.at(0).toString(),QLatin1String("key1"));
+    QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
+}
+
+void tst_QmlPropertyMap::count()
+{
+    QDeclarativePropertyMap map;
+    QCOMPARE(map.isEmpty(), true);
+    map.insert(QLatin1String("key1"),100);
+    map.insert(QLatin1String("key2"),200);
+    QCOMPARE(map.count(), 2);
+    QCOMPARE(map.isEmpty(), false);
+
+    map.insert(QLatin1String("key3"),"Hello World");
+    QCOMPARE(map.count(), 3);
+
+    //clearing doesn't remove the key
+    map.clear(QLatin1String("key3"));
+    QCOMPARE(map.count(), 3);
+    QCOMPARE(map.size(), map.count());
+}
+
+QTEST_MAIN(tst_QmlPropertyMap)
+
+#include "tst_qdeclarativepropertymap.moc"
diff --git a/tests/auto/declarative/qdeclarativeqt/data/closestangle.qml b/tests/auto/declarative/qdeclarativeqt/data/closestangle.qml
new file mode 100644
index 0000000..b5f7fc6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/closestangle.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+
+QtObject {
+    property var testSame: Qt.closestAngle(0,1)
+    property var testLess: Qt.closestAngle(0,-359)
+    property var testMore: Qt.closestAngle(0,361)
+    property var testFail: Qt.closestAngle(0)
+    property var test5: Qt.closestAngle(0,1,2)
+    property var test6: Qt.closestAngle(123.45465768,1.11)
+    property var test7: Qt.closestAngle(-3.1415,1.11)
+}
+
diff --git a/tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml b/tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml
new file mode 100644
index 0000000..e657ff1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    Component.onCompleted: {
+        console.log("completed", "ok")
+        console.log("completed ok")
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml
new file mode 100644
index 0000000..d9b70ec
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property bool incorrectArgCount1: false
+    property bool incorrectArgCount2: false
+    property bool emptyArg: false
+
+    property string relativeUrl
+    property string absoluteUrl
+
+    Component.onCompleted: {
+        // Test that using incorrect argument count returns a null object
+        incorrectArgCount1 = (createComponent() == null);
+        incorrectArgCount2 = (createComponent("main.qml", 10) == null);
+        emptyArg = (createComponent("") == null);
+
+        var r = createComponent("createComponentData.qml");
+        relativeUrl = r.url;
+
+        var a = createComponent("http://www.example.com/test.qml");
+        absoluteUrl = a.url;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml
new file mode 100644
index 0000000..a5e99a0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    property int test: 1913
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml b/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml
new file mode 100644
index 0000000..9150782
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml
@@ -0,0 +1,31 @@
+import Qt 4.6
+
+Item {
+    id: root
+
+    property bool incorrectArgCount1: false
+    property bool incorrectArgCount2: false
+    property bool emptyArg: false
+    property bool noParent: false
+    property bool notReady: false
+    property bool runtimeError: false
+    property bool errors: false
+
+    property bool success: false
+
+    Component.onCompleted: {
+        // errors
+        incorrectArgCount1 = (createQmlObject() == null);
+        incorrectArgCount2 = (createQmlObject("import Qt 4.6\nQtObject{}", root, "main.qml", 10) == null);
+        emptyArg = (createQmlObject("", root) == null);
+        errors = (createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13\nproperty int test: 13\n}", root, "main.qml") == null);
+        noParent = (createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13}", 0) == null);
+        notReady = (createQmlObject("import Qt 4.6\nQtObject{\nBlah{}\n}", root, "http://www.example.com/main.qml") == null);
+        runtimeError = (createQmlObject("import Qt 4.6\nQtObject{property int test\nonTestChanged: QtObject{}\n}", root) == null);
+
+        var o = createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13\n}", root);
+        success = (o.test == 13);
+
+        createQmlObject("import Qt 4.6\nItem {}\n", root);
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/data/darker.qml b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
new file mode 100644
index 0000000..2df067e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+QtObject {
+    property var test1: Qt.darker(Qt.rgba(1, 0.8, 0.3))
+    property var test2: Qt.darker()
+    property var test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 10)
+    property var test4: Qt.darker("red");
+    property var test5: Qt.darker("perfectred"); // Non-existant color
+    property var test6: Qt.darker(10);
+}
+
diff --git a/tests/auto/declarative/qdeclarativeqt/data/enums.qml b/tests/auto/declarative/qdeclarativeqt/data/enums.qml
new file mode 100644
index 0000000..1efa6f5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/enums.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+    property int test1: Qt.Key_Escape
+    property int test2: Qt.DescendingOrder
+    property int test3: Qt.ElideMiddle
+    property int test4: Qt.AlignRight
+}
+
diff --git a/tests/auto/declarative/qdeclarativeqt/data/hsla.qml b/tests/auto/declarative/qdeclarativeqt/data/hsla.qml
new file mode 100644
index 0000000..df51ccd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/hsla.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+QtObject {
+    property color test1: Qt.hsla(1, 0, 0, 0.8);
+    property color test2: Qt.hsla(1, 0.5, 0.3);
+    property color test3: Qt.hsla(1, 1);
+    property color test4: Qt.hsla(1, 1, 1, 1, 1);
+    property color test5: Qt.hsla(1.2, 1, 1);
+    property color test6: Qt.hsla(-0.1, 1, 1);
+}
+
diff --git a/tests/auto/declarative/qdeclarativeqt/data/lighter.qml b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
new file mode 100644
index 0000000..4e0c431
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+QtObject {
+    property var test1: Qt.lighter(Qt.rgba(1, 0.8, 0.3))
+    property var test2: Qt.lighter()
+    property var test3: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 10)
+    property var test4: Qt.lighter("red");
+    property var test5: Qt.lighter("perfectred"); // Non-existant color
+    property var test6: Qt.lighter(10);
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/data/md5.qml b/tests/auto/declarative/qdeclarativeqt/data/md5.qml
new file mode 100644
index 0000000..c474b71
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/md5.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+QtObject {
+    property string test1: Qt.md5()
+    property string test2: Qt.md5("Hello World")
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/data/point.qml b/tests/auto/declarative/qdeclarativeqt/data/point.qml
new file mode 100644
index 0000000..c383beb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/point.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+    property var test1: Qt.point(19, 34);
+    property var test2: Qt.point(-3, 109.2);
+    property var test3: Qt.point(-3);
+    property var test4: Qt.point(-3, 109.2, 1);
+}
+
diff --git a/tests/auto/declarative/qdeclarativeqt/data/rect.qml b/tests/auto/declarative/qdeclarativeqt/data/rect.qml
new file mode 100644
index 0000000..82b6428
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/rect.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+    property var test1: Qt.rect(10, 13, 100, 109)
+    property var test2: Qt.rect(-10, 13, 100, 109.6)
+    property var test3: Qt.rect(10, 13);
+    property var test4: Qt.rect(10, 13, 100, 109, 10)
+    property var test5: Qt.rect(10, 13, 100, -109)
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/data/rgba.qml b/tests/auto/declarative/qdeclarativeqt/data/rgba.qml
new file mode 100644
index 0000000..6dd6565
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/rgba.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+QtObject {
+    property color test1: Qt.rgba(1, 0, 0, 0.8);
+    property color test2: Qt.rgba(1, 0.5, 0.3);
+    property color test3: Qt.rgba(1, 1);
+    property color test4: Qt.rgba(1, 1, 1, 1, 1);
+    property color test5: Qt.rgba(1.2, 1, 1);
+    property color test6: Qt.rgba(-0.1, 1, 1);
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/data/size.qml b/tests/auto/declarative/qdeclarativeqt/data/size.qml
new file mode 100644
index 0000000..05b0317
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/size.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+QtObject {
+    property var test1: Qt.size(19, 34);
+    property var test2: Qt.size(3, 109.2);
+    property var test3: Qt.size(-3, 10);
+    property var test4: Qt.size(3);
+    property var test5: Qt.size(3, 109.2, 1);
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativeqt/data/tint.qml b/tests/auto/declarative/qdeclarativeqt/data/tint.qml
new file mode 100644
index 0000000..da8afe2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/tint.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+QtObject {
+    property color test1: Qt.tint("red", "blue");
+    property color test2: Qt.tint(Qt.rgba(1, 0, 0), Qt.rgba(0, 0, 0, 0));
+    property color test3: Qt.tint("red", Qt.rgba(0, 0, 1, 0.5)); // XXX - what should this be?
+    property color test4: Qt.tint("red", Qt.rgba(0, 0, 1, 0.5), 10);
+    property color test5: Qt.tint("red")
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/data/vector.qml b/tests/auto/declarative/qdeclarativeqt/data/vector.qml
new file mode 100644
index 0000000..a471c7a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/data/vector.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    property var test1: Qt.vector3d(1, 0, 0.9);
+    property var test2: Qt.vector3d(102, -10, -982.1);
+    property var test3: Qt.vector3d(102, -10);
+    property var test4: Qt.vector3d(102, -10, -982.1, 10);
+}
diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
new file mode 100644
index 0000000..aff00ad
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativeqt.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
+# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
+# LIBS += -lgcov
diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
new file mode 100644
index 0000000..9cbcaec
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
@@ -0,0 +1,369 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDebug>
+#include <QDeclarativeEngine>
+#include <QFileInfo>
+#include <QDeclarativeComponent>
+#include <QDir>
+#include <QVector3D>
+#include <QCryptographicHash>
+#include <QDeclarativeItem>
+
+class tst_qmlqt : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlqt() {}
+
+private slots:
+    void enums();
+    void rgba();
+    void hsla();
+    void rect();
+    void point();
+    void size();
+    void vector();
+    void lighter();
+    void darker();
+    void tint();
+    void closestAngle();
+    void playSound();
+    void openUrlExternally();
+    void md5();
+    void createComponent();
+    void createQmlObject();
+    void consoleLog();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
+void tst_qmlqt::enums()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test1").toInt(), (int)Qt::Key_Escape);
+    QCOMPARE(object->property("test2").toInt(), (int)Qt::DescendingOrder);
+    QCOMPARE(object->property("test3").toInt(), (int)Qt::ElideMiddle);
+    QCOMPARE(object->property("test4").toInt(), (int)Qt::AlignRight);
+
+    delete object;
+}
+
+void tst_qmlqt::rgba()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("rgba.qml"));
+
+    QString warning1 = component.url().toString() + ":6: Unable to assign null to QColor";
+    QString warning2 = component.url().toString() + ":7: Unable to assign null to QColor";
+    QString warning3 = component.url().toString() + ":8: Unable to assign null to QColor";
+    QString warning4 = component.url().toString() + ":9: Unable to assign null to QColor";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning4));
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+
+    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromRgbF(1, 0, 0, 0.8));
+    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor::fromRgbF(1, 0.5, 0.3, 1));
+    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test6")), QColor());
+
+    delete object;
+}
+
+void tst_qmlqt::hsla()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("hsla.qml"));
+
+    QString warning1 = component.url().toString() + ":6: Unable to assign null to QColor";
+    QString warning2 = component.url().toString() + ":7: Unable to assign null to QColor";
+    QString warning3 = component.url().toString() + ":8: Unable to assign null to QColor";
+    QString warning4 = component.url().toString() + ":9: Unable to assign null to QColor";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning4));
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromHslF(1, 0, 0, 0.8));
+    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor::fromHslF(1, 0.5, 0.3, 1));
+    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test6")), QColor());
+
+    delete object;
+}
+
+void tst_qmlqt::rect()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("rect.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(qvariant_cast<QRectF>(object->property("test1")), QRectF(10, 13, 100, 109));
+    QCOMPARE(qvariant_cast<QRectF>(object->property("test2")), QRectF(-10, 13, 100, 109.6));
+    QCOMPARE(qvariant_cast<QRectF>(object->property("test3")), QRectF());
+    QCOMPARE(qvariant_cast<QRectF>(object->property("test4")), QRectF());
+    QCOMPARE(qvariant_cast<QRectF>(object->property("test5")), QRectF());
+
+    delete object;
+}
+
+void tst_qmlqt::point()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("point.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(qvariant_cast<QPointF>(object->property("test1")), QPointF(19, 34));
+    QCOMPARE(qvariant_cast<QPointF>(object->property("test2")), QPointF(-3, 109.2));
+    QCOMPARE(qvariant_cast<QPointF>(object->property("test3")), QPointF());
+    QCOMPARE(qvariant_cast<QPointF>(object->property("test4")), QPointF());
+
+    delete object;
+}
+
+void tst_qmlqt::size()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("size.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(qvariant_cast<QSizeF>(object->property("test1")), QSizeF(19, 34));
+    QCOMPARE(qvariant_cast<QSizeF>(object->property("test2")), QSizeF(3, 109.2));
+    QCOMPARE(qvariant_cast<QSizeF>(object->property("test3")), QSizeF(-3, 10));
+    QCOMPARE(qvariant_cast<QSizeF>(object->property("test4")), QSizeF());
+    QCOMPARE(qvariant_cast<QSizeF>(object->property("test5")), QSizeF());
+
+    delete object;
+}
+
+void tst_qmlqt::vector()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("vector.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(qvariant_cast<QVector3D>(object->property("test1")), QVector3D(1, 0, 0.9));
+    QCOMPARE(qvariant_cast<QVector3D>(object->property("test2")), QVector3D(102, -10, -982.1));
+    QCOMPARE(qvariant_cast<QVector3D>(object->property("test3")), QVector3D());
+    QCOMPARE(qvariant_cast<QVector3D>(object->property("test4")), QVector3D());
+
+    delete object;
+}
+
+void tst_qmlqt::lighter()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("lighter.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromRgbF(1, 0.8, 0.3).lighter());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor("red").lighter());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test6")), QColor());
+
+    delete object;
+}
+
+void tst_qmlqt::darker()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("darker.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromRgbF(1, 0.8, 0.3).darker());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor("red").darker());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test6")), QColor());
+
+    delete object;
+}
+
+void tst_qmlqt::tint()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("tint.qml"));
+
+    QString warning1 = component.url().toString() + ":7: Unable to assign null to QColor";
+    QString warning2 = component.url().toString() + ":8: Unable to assign null to QColor";
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromRgbF(0, 0, 1));
+    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor::fromRgbF(1, 0, 0));
+    QEXPECT_FAIL("", "QT-2424",Continue);
+    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor::fromRgbF(1, 0, 0)); 
+    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor());
+    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
+
+    delete object;
+}
+
+void tst_qmlqt::closestAngle()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("closestangle.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(qvariant_cast<qreal>(object->property("testSame")), 1.0);
+    QCOMPARE(qvariant_cast<qreal>(object->property("testLess")), 1.0);
+    QCOMPARE(qvariant_cast<qreal>(object->property("testMore")), 1.0);
+    QCOMPARE(qvariant_cast<qreal>(object->property("testFail")), 0.0);
+    QCOMPARE(qvariant_cast<qreal>(object->property("test5")), 1.0);
+    QCOMPARE(qvariant_cast<qreal>(object->property("test6")), 1.11);
+    QCOMPARE(qvariant_cast<qreal>(object->property("test7")), 1.11);
+
+    delete object;
+}
+
+void tst_qmlqt::playSound()
+{
+    QEXPECT_FAIL("", "How do we test this?", Abort);
+    QVERIFY(false);
+}
+
+void tst_qmlqt::openUrlExternally()
+{
+    QEXPECT_FAIL("", "How do we test this?", Abort);
+    QVERIFY(false);
+}
+
+void tst_qmlqt::md5()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("md5.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test1").toString(), QLatin1String(QCryptographicHash::hash(QByteArray(), QCryptographicHash::Md5).toHex()));
+    QCOMPARE(object->property("test2").toString(), QLatin1String(QCryptographicHash::hash("Hello World", QCryptographicHash::Md5).toHex()));
+
+    delete object;
+}
+
+void tst_qmlqt::createComponent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("createComponent.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("incorrectArgCount1").toBool(), true);
+    QCOMPARE(object->property("incorrectArgCount2").toBool(), true);
+    QCOMPARE(object->property("emptyArg").toBool(), true);
+
+    QCOMPARE(object->property("absoluteUrl").toString(), QString("http://www.example.com/test.qml"));
+    QCOMPARE(object->property("relativeUrl").toString(), TEST_FILE("createComponentData.qml").toString());
+
+    delete object;
+}
+
+void tst_qmlqt::createQmlObject()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("createQmlObject.qml"));
+
+    QString warning1 = "QDeclarativeEngine::createQmlObject():";
+    QString warning2 = "    " + TEST_FILE("main.qml").toString() + ":4:1: Duplicate property name";
+    QString warning3 = "QDeclarativeEngine::createQmlObject(): Component is not ready";
+    QString warning4 = "QDeclarativeEngine::createQmlObject():";
+    QString warning5 = "    " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method";
+
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning4));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning5));
+
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("incorrectArgCount1").toBool(), true);
+    QCOMPARE(object->property("incorrectArgCount2").toBool(), true);
+    QCOMPARE(object->property("emptyArg").toBool(), true);
+    QCOMPARE(object->property("errors").toBool(), true);
+    QCOMPARE(object->property("noParent").toBool(), true);
+    QCOMPARE(object->property("notReady").toBool(), true);
+    QCOMPARE(object->property("runtimeError").toBool(), true);
+    QCOMPARE(object->property("success").toBool(), true);
+
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(object);
+    QVERIFY(item != 0);
+    QVERIFY(item->childItems().count() == 1);
+
+    delete object;
+}
+
+void tst_qmlqt::consoleLog()
+{
+    QTest::ignoreMessage(QtDebugMsg, "completed ok");
+    QTest::ignoreMessage(QtDebugMsg, "completed ok");
+    QDeclarativeComponent component(&engine, TEST_FILE("consoleLog.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    delete object;
+}
+
+QTEST_MAIN(tst_qmlqt)
+
+#include "tst_qdeclarativeqt.moc"
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml b/tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml
new file mode 100644
index 0000000..cf1fb4d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml
@@ -0,0 +1,29 @@
+import Qt 4.6
+
+Rectangle {
+    id: container
+    objectName: "container"
+    width: 240
+    height: 320
+    color: "white"
+
+    function checkProperties() {
+        testObject.error = false;
+        if (repeater.delegate != comp) {
+            console.log("delegate property incorrect");
+            testObject.error = true;
+        }
+    }
+
+    Component {
+        id: comp
+        Item{}
+    }
+
+    Repeater {
+        id: repeater
+        objectName: "repeater"
+        model: testData
+        delegate: comp
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml b/tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml
new file mode 100644
index 0000000..fc6b34c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml
@@ -0,0 +1,49 @@
+// This example demonstrates placing items in a view using
+// a VisualItemModel
+
+import Qt 4.6
+
+Rectangle {
+    color: "lightgray"
+    width: 240
+    height: 320
+
+    function checkProperties() {
+        testObject.error = false;
+        if (testObject.useModel && view.model != itemModel) {
+            console.log("model property incorrect");
+            testObject.error = true;
+        }
+    }
+
+    VisualItemModel {
+        id: itemModel
+        objectName: "itemModel"
+        Rectangle {
+            objectName: "item1"
+            height: view.height; width: view.width; color: "#FFFEF0"
+            Text { objectName: "text1"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+        }
+        Rectangle {
+            objectName: "item2"
+            height: view.height; width: view.width; color: "#F0FFF7"
+            Text { objectName: "text2"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+        }
+        Rectangle {
+            objectName: "item3"
+            height: view.height; width: view.width; color: "#F4F0FF"
+            Text { objectName: "text3"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+        }
+    }
+
+    Column {
+        objectName: "container"
+        Repeater {
+            id: view
+            objectName: "repeater"
+            anchors.fill: parent
+            anchors.bottomMargin: 30
+            model: testObject.useModel ? itemModel : 0
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
new file mode 100644
index 0000000..e6d0acb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle {
+    id: container
+    objectName: "container"
+    width: 240
+    height: 320
+    color: "white"
+    Repeater {
+        id: repeater
+        objectName: "repeater"
+        model: testData
+        property int errors: 0
+        property int instantiated: 0
+        Component {
+            Item{
+                Component.onCompleted: {if(index!=model.idx) repeater.errors += 1; repeater.instantiated++}
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/properties.qml b/tests/auto/declarative/qdeclarativerepeater/data/properties.qml
new file mode 100644
index 0000000..550ce8d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativerepeater/data/properties.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+Row { 
+    Repeater { 
+        objectName: "repeater"
+        model: 5
+        Text { 
+            text: "I'm item " + index 
+        } 
+    }
+}
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/repeater.qml b/tests/auto/declarative/qdeclarativerepeater/data/repeater.qml
new file mode 100644
index 0000000..7d83230
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativerepeater/data/repeater.qml
@@ -0,0 +1,28 @@
+import Qt 4.6
+
+Rectangle {
+    id: container
+    objectName: "container"
+    width: 240
+    height: 320
+    color: "white"
+    Text {
+        text: "Zero"
+    }
+    Repeater {
+        id: repeater
+        objectName: "repeater"
+        width: 240
+        height: 320
+        model: testData
+        Component {
+            Text {
+                y: index*20
+                text: modelData
+            }
+        }
+    }
+    Text {
+        text: "Last"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml b/tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml
new file mode 100644
index 0000000..c3c3260
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml
@@ -0,0 +1,35 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "white"
+    Component {
+        id: myDelegate
+        Item {
+            objectName: "myDelegate"
+            height: 20
+            Text {
+                y: index*20
+                text: name
+            }
+            Text {
+                y: index*20
+                x: 100
+                text: number
+            }
+        }
+    }
+    Column {
+        id: container
+        objectName: "container"
+        Repeater {
+            id: repeater
+            objectName: "repeater"
+            width: 240
+            height: 320
+            delegate: myDelegate
+            model: testData
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro
new file mode 100644
index 0000000..132123a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativerepeater.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
new file mode 100644
index 0000000..e442989
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
@@ -0,0 +1,385 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtTest/QSignalSpy>
+#include <private/qlistmodelinterface_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <private/qdeclarativerepeater_p.h>
+#include <private/qdeclarativetext_p.h>
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
+class tst_QmlGraphicsRepeater : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlGraphicsRepeater();
+
+private slots:
+    void numberModel();
+    void objectList();
+    void stringList();
+    void dataModel();
+    void itemModel();
+    void properties();
+
+private:
+    QDeclarativeView *createView();
+    template<typename T>
+    T *findItem(QGraphicsObject *parent, const QString &id);
+};
+
+class TestObject : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool error READ error WRITE setError)
+    Q_PROPERTY(bool useModel READ useModel NOTIFY useModelChanged)
+
+public:
+    TestObject() : QObject(), mError(true), mUseModel(false) {}
+
+    bool error() const { return mError; }
+    void setError(bool err) { mError = err; }
+
+    bool useModel() const { return mUseModel; }
+    void setUseModel(bool use) { mUseModel = use; emit useModelChanged(); }
+
+signals:
+    void useModelChanged();
+
+private:
+    bool mError;
+    bool mUseModel;
+};
+
+class TestModel : public QAbstractListModel
+{
+public:
+    enum Roles { Name = Qt::UserRole+1, Number = Qt::UserRole+2 };
+
+    TestModel(QObject *parent=0) : QAbstractListModel(parent) {
+        QHash<int, QByteArray> roles;
+        roles[Name] = "name";
+        roles[Number] = "number";
+        setRoleNames(roles);
+    }
+
+    int rowCount(const QModelIndex &parent=QModelIndex()) const { return list.count(); }
+    QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const {
+        QVariant rv;
+        if (role == Name)
+            rv = list.at(index.row()).first;
+        else if (role == Number)
+            rv = list.at(index.row()).second;
+
+        return rv;
+    }
+
+    int count() const { return rowCount(); }
+    QString name(int index) const { return list.at(index).first; }
+    QString number(int index) const { return list.at(index).second; }
+
+    void addItem(const QString &name, const QString &number) {
+        emit beginInsertRows(QModelIndex(), list.count(), list.count());
+        list.append(QPair<QString,QString>(name, number));
+        emit endInsertRows();
+    }
+
+    void insertItem(int index, const QString &name, const QString &number) {
+        emit beginInsertRows(QModelIndex(), index, index);
+        list.insert(index, QPair<QString,QString>(name, number));
+        emit endInsertRows();
+    }
+
+    void removeItem(int index) {
+        emit beginRemoveRows(QModelIndex(), index, index);
+        list.removeAt(index);
+        emit endRemoveRows();
+    }
+
+    void moveItem(int from, int to) {
+        emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
+        list.move(from, to);
+        emit endMoveRows();
+    }
+
+    void modifyItem(int idx, const QString &name, const QString &number) {
+        list[idx] = QPair<QString,QString>(name, number);
+        emit dataChanged(index(idx,0), index(idx,0));
+    }
+
+private:
+    QList<QPair<QString,QString> > list;
+};
+
+
+tst_QmlGraphicsRepeater::tst_QmlGraphicsRepeater()
+{
+}
+
+void tst_QmlGraphicsRepeater::numberModel()
+{
+    QDeclarativeView *canvas = createView();
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testData", 5);
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/intmodel.qml"));
+    qApp->processEvents();
+
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
+    QVERIFY(repeater != 0);
+    QCOMPARE(repeater->parentItem()->childItems().count(), 5+1);
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
+    QVERIFY(testObject->error() == false);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsRepeater::objectList()
+{
+    QDeclarativeView *canvas = createView();
+
+    QObjectList data;
+    for(int i=0; i<100; i++){
+        data << new QObject();
+        data.back()->setProperty("idx", i);
+    }
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testData", QVariant::fromValue(data));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/objlist.qml"));
+    qApp->processEvents();
+
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
+    QVERIFY(repeater != 0);
+    QCOMPARE(repeater->property("errors").toInt(), 0);//If this fails either they are out of order or can't find the object's data
+    QCOMPARE(repeater->property("instantiated").toInt(), 100);
+}
+
+/*
+The Repeater element creates children at its own position in its parent's
+stacking order.  In this test we insert a repeater between two other Text
+elements to test this.
+*/
+void tst_QmlGraphicsRepeater::stringList()
+{
+    QDeclarativeView *canvas = createView();
+
+    QStringList data;
+    data << "One";
+    data << "Two";
+    data << "Three";
+    data << "Four";
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testData", data);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater.qml"));
+    qApp->processEvents();
+
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
+    QVERIFY(repeater != 0);
+
+    QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
+    QVERIFY(container != 0);
+
+    QCOMPARE(container->childItems().count(), data.count() + 3);
+
+    bool saw_repeater = false;
+    for (int i = 0; i < container->childItems().count(); ++i) {
+
+        if (i == 0) {
+            QDeclarativeText *name = qobject_cast<QDeclarativeText*>(container->childItems().at(i));
+            QVERIFY(name != 0);
+            QCOMPARE(name->text(), QLatin1String("Zero"));
+        } else if (i == container->childItems().count() - 2) {
+            // The repeater itself
+            QDeclarativeRepeater *rep = qobject_cast<QDeclarativeRepeater*>(container->childItems().at(i));
+            QCOMPARE(rep, repeater);
+            saw_repeater = true;
+            continue;
+        } else if (i == container->childItems().count() - 1) {
+            QDeclarativeText *name = qobject_cast<QDeclarativeText*>(container->childItems().at(i));
+            QVERIFY(name != 0);
+            QCOMPARE(name->text(), QLatin1String("Last"));
+        } else {
+            QDeclarativeText *name = qobject_cast<QDeclarativeText*>(container->childItems().at(i));
+            QVERIFY(name != 0);
+            QCOMPARE(name->text(), data.at(i-1));
+        }
+    }
+    QVERIFY(saw_repeater);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsRepeater::dataModel()
+{
+    QDeclarativeView *canvas = createView();
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    TestModel testModel;
+    testModel.addItem("one", "1");
+    testModel.addItem("two", "2");
+    testModel.addItem("three", "3");
+
+    ctxt->setContextProperty("testData", &testModel);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater2.qml"));
+    qApp->processEvents();
+
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
+    QVERIFY(repeater != 0);
+
+    QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
+    QVERIFY(container != 0);
+
+    QCOMPARE(container->childItems().count(), 4);
+
+    testModel.addItem("four", "4");
+    QCOMPARE(container->childItems().count(), 5);
+
+    testModel.removeItem(2);
+    QCOMPARE(container->childItems().count(), 4);
+}
+
+void tst_QmlGraphicsRepeater::itemModel()
+{
+    QDeclarativeView *canvas = createView();
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/itemlist.qml"));
+    qApp->processEvents();
+
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
+    QVERIFY(repeater != 0);
+
+    QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
+    QVERIFY(container != 0);
+
+    QCOMPARE(container->childItems().count(), 1);
+
+    testObject->setUseModel(true);
+    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
+    QVERIFY(testObject->error() == false);
+
+    QCOMPARE(container->childItems().count(), 4);
+    QVERIFY(qobject_cast<QObject*>(container->childItems().at(0))->objectName() == "item1");
+    QVERIFY(qobject_cast<QObject*>(container->childItems().at(1))->objectName() == "item2");
+    QVERIFY(qobject_cast<QObject*>(container->childItems().at(2))->objectName() == "item3");
+    QVERIFY(container->childItems().at(3) == repeater);
+
+    delete canvas;
+}
+
+void tst_QmlGraphicsRepeater::properties()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("/properties.qml"));
+
+    QDeclarativeItem *rootObject = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(rootObject);
+
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(rootObject, "repeater");
+    QVERIFY(repeater);
+
+    QSignalSpy modelSpy(repeater, SIGNAL(modelChanged()));
+    repeater->setModel(3);
+    QCOMPARE(modelSpy.count(),1);
+    repeater->setModel(3);
+    QCOMPARE(modelSpy.count(),1);
+
+    QSignalSpy delegateSpy(repeater, SIGNAL(delegateChanged()));
+
+    QDeclarativeComponent rectComponent(&engine);
+    rectComponent.setData("import Qt 4.6; Rectangle {}", QUrl::fromLocalFile(""));
+
+    repeater->setDelegate(&rectComponent);
+    QCOMPARE(delegateSpy.count(),1);
+    repeater->setDelegate(&rectComponent);
+    QCOMPARE(delegateSpy.count(),1);
+}
+
+QDeclarativeView *tst_QmlGraphicsRepeater::createView()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    return canvas;
+}
+
+template<typename T>
+T *tst_QmlGraphicsRepeater::findItem(QGraphicsObject *parent, const QString &objectName)
+{
+    const QMetaObject &mo = T::staticMetaObject;
+    if (mo.cast(parent) && (objectName.isEmpty() || parent->objectName() == objectName))
+        return static_cast<T*>(parent);
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *child = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
+        if (!child)
+            continue;
+        QDeclarativeItem *item = findItem<T>(child, objectName);
+        if (item)
+            return static_cast<T*>(item);
+    }
+
+    return 0;
+}
+
+QTEST_MAIN(tst_QmlGraphicsRepeater)
+
+#include "tst_qdeclarativerepeater.moc"
diff --git a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml
new file mode 100644
index 0000000..959d206
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml
@@ -0,0 +1,4 @@
+import Qt 4.6
+
+SpringFollow {
+}
diff --git a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml
new file mode 100644
index 0000000..7c81fb5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+SpringFollow {
+    source: 1.44; velocity: 0.9
+    spring: 1.0; damping: 0.5
+    epsilon: 0.25; modulus: 360.0
+    mass: 2.0; enabled: true
+}
diff --git a/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml
new file mode 100644
index 0000000..6fec55b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+SpringFollow {
+    source: 1.44; velocity: 0.9
+    spring: 1.0; damping: 0.5
+    epsilon: 0.25; modulus: 360.0
+    mass: 2.0; enabled: false
+}
diff --git a/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro b/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
new file mode 100644
index 0000000..61aad0f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativespringfollow.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp
new file mode 100644
index 0000000..594b9a0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativespringfollow_p.h>
+#include <private/qdeclarativevaluetype_p.h>
+#include "../../../shared/util.h"
+
+class tst_qmlspringfollow : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlspringfollow();
+
+private slots:
+    void defaultValues();
+    void values();
+    void disabled();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlspringfollow::tst_qmlspringfollow()
+{
+}
+
+void tst_qmlspringfollow::defaultValues()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow1.qml"));
+    QDeclarativeSpringFollow *obj = qobject_cast<QDeclarativeSpringFollow*>(c.create());
+
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->sourceValue(), 0.);
+    QCOMPARE(obj->velocity(), 0.);
+    QCOMPARE(obj->spring(), 0.);
+    QCOMPARE(obj->damping(), 0.);
+    QCOMPARE(obj->epsilon(), 0.01);
+    QCOMPARE(obj->modulus(), 0.);
+    QCOMPARE(obj->value(), 0.);
+    QCOMPARE(obj->mass(), 1.);
+    QCOMPARE(obj->enabled(), true);
+    QCOMPARE(obj->inSync(), true);
+
+    delete obj;
+}
+
+void tst_qmlspringfollow::values()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow2.qml"));
+    QDeclarativeSpringFollow *obj = qobject_cast<QDeclarativeSpringFollow*>(c.create());
+
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->sourceValue(), 1.44);
+    QCOMPARE(obj->velocity(), 0.9);
+    QCOMPARE(obj->spring(), 1.0);
+    QCOMPARE(obj->damping(), 0.5);
+    QCOMPARE(obj->epsilon(), 0.25);
+    QCOMPARE(obj->modulus(), 360.0);
+    QCOMPARE(obj->mass(), 2.0);
+    QCOMPARE(obj->enabled(), true);
+
+    QTRY_COMPARE(obj->value(), 1.44);
+    QTRY_COMPARE(obj->inSync(), true);
+
+    delete obj;
+}
+
+void tst_qmlspringfollow::disabled()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow3.qml"));
+    QDeclarativeSpringFollow *obj = qobject_cast<QDeclarativeSpringFollow*>(c.create());
+
+    QVERIFY(obj != 0);
+
+    QCOMPARE(obj->sourceValue(), 1.44);
+    QCOMPARE(obj->velocity(), 0.9);
+    QCOMPARE(obj->spring(), 1.0);
+    QCOMPARE(obj->damping(), 0.5);
+    QCOMPARE(obj->epsilon(), 0.25);
+    QCOMPARE(obj->modulus(), 360.0);
+    QCOMPARE(obj->mass(), 2.0);
+    QCOMPARE(obj->enabled(), false);
+
+    QCOMPARE(obj->value(), 0.0);
+    QCOMPARE(obj->inSync(), false);
+
+    delete obj;
+}
+
+QTEST_MAIN(tst_qmlspringfollow)
+
+#include "tst_qdeclarativespringfollow.moc"
diff --git a/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml b/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
new file mode 100644
index 0000000..8d64663
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
@@ -0,0 +1,19 @@
+import Qt 4.6
+Rectangle {
+    id: extendedRect
+    objectName: "extendedRect"
+    property color extendedColor: "orange"
+
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "green"
+        PropertyChanges {
+            target: rect
+            onDidSomething: {
+                extendedRect.color = "green"
+                extendedColor = "green"
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges.qml
new file mode 100644
index 0000000..7dce889
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+Rectangle {
+    id: container
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        width: 50; height: 50
+        color: "green";
+        anchors.left: parent.left
+        anchors.leftMargin: 5
+    }
+    states: State {
+        name: "right"
+        AnchorChanges {
+            id: ancCh
+            target: myRect;
+            reset: "left"
+            right: container.right
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
new file mode 100644
index 0000000..545345e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        width: 50; height: 50
+        color: "green";
+        anchors.left: parent.left
+        anchors.leftMargin: 5
+    }
+    states: State {
+        name: "right"
+        AnchorChanges {
+            target: myRect;
+            reset: "left"
+            right: parent.right
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
new file mode 100644
index 0000000..9d5b317
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
@@ -0,0 +1,29 @@
+import Qt 4.6
+
+Rectangle {
+    id: container
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        color: "green";
+        anchors.left: parent.left
+        anchors.right: rightGuideline.left
+        anchors.top: topGuideline.top
+        anchors.bottom: container.bottom
+    }
+    Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 }
+    Item { id: rightGuideline; x: 150 }
+    Item { id: topGuideline; y: 10 }
+    Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 }
+    states: State {
+        name: "reanchored"
+        AnchorChanges {
+            target: myRect;
+            left: leftGuideline.left
+            right: container.right
+            top: container.top
+            bottom: bottomGuideline.bottom
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
new file mode 100644
index 0000000..f128989
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
@@ -0,0 +1,22 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        color: "green";
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.verticalCenter: parent.verticalCenter
+    }
+    Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 }
+    Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 }
+    states: State {
+        name: "reanchored"
+        AnchorChanges {
+            target: myRect;
+            horizontalCenter: bottomGuideline.horizontalCenter
+            verticalCenter: leftGuideline.verticalCenter
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
new file mode 100644
index 0000000..4e6d34b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
@@ -0,0 +1,22 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200; height: 200
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        color: "green";
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.baseline: parent.baseline
+    }
+    Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 }
+    Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 }
+    states: State {
+        name: "reanchored"
+        AnchorChanges {
+            target: myRect;
+            horizontalCenter: bottomGuideline.horizontalCenter
+            baseline: leftGuideline.baseline
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml b/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
new file mode 100644
index 0000000..693a5c5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Item {
+    id: root
+    property int input: 1
+    property int test: 9
+
+    states: [
+        State {
+            name: "portrait"
+            when: root.input == 1
+            PropertyChanges {
+                target: root
+                test: 3
+            }
+        }
+    ]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
new file mode 100644
index 0000000..6528113
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+
+    property color sourceColor: "blue"
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; color: sourceColor }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
new file mode 100644
index 0000000..2e7b4cf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+
+    property color sourceColor: "red"
+    width: 100; height: 100
+    color: sourceColor
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; color: "blue" }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
new file mode 100644
index 0000000..a3c47d9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+
+    property color sourceColor: "red"
+    property color sourceColor2: "blue"
+    width: 100; height: 100
+    color: sourceColor
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; color: sourceColor2 }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
new file mode 100644
index 0000000..1f52d0e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
@@ -0,0 +1,17 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+
+    property color sourceColor: "blue"
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: sourceColor }
+        },
+        State {
+            name: "green"
+            PropertyChanges { target: myRectangle; color: "green" }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
new file mode 100644
index 0000000..88ea256
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; color: "blue" }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
new file mode 100644
index 0000000..4dd293f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: "blue" }
+        },
+        State {
+            name: "green"
+            PropertyChanges { target: myRectangle; color: "green" }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
new file mode 100644
index 0000000..62ab1d5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: "blue" }
+        },
+        State {
+            name: "bordered"
+            PropertyChanges { target: myRectangle; border.width: 2 }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml b/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
new file mode 100644
index 0000000..1836f8a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: "blue" }
+        },
+        State {
+            name: "bordered"
+            extend: "blue"
+            PropertyChanges { target: myRectangle; border.width: 2 }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/deleting.qml b/tests/auto/declarative/qdeclarativestates/data/deleting.qml
new file mode 100644
index 0000000..3da0b12
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/deleting.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; color: "blue"; objectName: "pc1" }
+        PropertyChanges { target: myRectangle; radius: 5; objectName: "pc2" }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/deletingState.qml b/tests/auto/declarative/qdeclarativestates/data/deletingState.qml
new file mode 100644
index 0000000..a5e8ed3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/deletingState.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    StateGroup {
+        id: stateGroup
+        states: State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: "blue" }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/explicit.qml b/tests/auto/declarative/qdeclarativestates/data/explicit.qml
new file mode 100644
index 0000000..7543f84
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/explicit.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    property color sourceColor: "blue"
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges {
+            objectName: "changes"
+            target: myRectangle; explicit: true
+            color: sourceColor
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml b/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
new file mode 100644
index 0000000..c7975e1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: [
+        State {
+            name: "blue"
+            PropertyChanges { target: myRectangle; color: "blue" }
+        },
+        State {
+            name: "green"
+            extend: "blue"
+            PropertyChanges { target: myRectangle; color: "green" }
+        }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml b/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
new file mode 100644
index 0000000..0dc39ae
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle {
+    id: card
+    width: 100; height: 100
+
+    states: [
+        State {
+            name: "placed"
+            PropertyChanges { target: card; state: "idle" }
+        },
+        State {
+            name: "idle"
+        }
+    ]
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: card.state = "placed"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml b/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
new file mode 100644
index 0000000..9be984c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+Rectangle {
+    id: card
+    width: 100; height: 100
+
+    states: [
+        State {
+            name: "placed"
+            onCompleted: card.state = "idle"
+            StateChangeScript { script: console.log("entering placed") }
+        },
+        State {
+            name: "idle"
+            StateChangeScript { script: console.log("entering idle") }
+        }
+    ]
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: card.state = "placed"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml b/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml
new file mode 100644
index 0000000..a5dd86a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; colr: "blue" }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange.qml
new file mode 100644
index 0000000..b8c7818
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange.qml
@@ -0,0 +1,37 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Item {
+        x: 10; y: 10
+        Rectangle {
+            id: myRect
+            objectName: "MyRect"
+            x: 5
+            width: 100; height: 100
+            color: "red"
+        }
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        x: -100; y: -50
+        Item {
+            id: newParent
+            objectName: "NewParent"
+            x: 248; y: 360
+        }
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
new file mode 100644
index 0000000..8b23591
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
@@ -0,0 +1,31 @@
+import Qt 4.6
+
+Rectangle {
+    id: newParent
+    width: 400; height: 400
+    Item {
+        scale: .5
+        rotation: 15
+        x: 10; y: 10
+        Rectangle {
+            id: myRect
+            objectName: "MyRect"
+            x: 5
+            width: 100; height: 100
+            color: "red"
+        }
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
new file mode 100644
index 0000000..ddf9268
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
@@ -0,0 +1,42 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Item {
+        scale: .5
+        rotation: 15
+        transformOrigin: "Center"
+        x: 10; y: 10
+        Rectangle {
+            id: myRect
+            objectName: "MyRect"
+            x: 5
+            width: 100; height: 100
+            transformOrigin: "BottomLeft"
+            color: "red"
+        }
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        x: 200; y: 200
+        rotation: 52;
+        scale: 2
+        Item {
+            id: newParent
+            x: 100; y: 100
+        }
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
new file mode 100644
index 0000000..34d667a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
@@ -0,0 +1,30 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        x: 5; y: 5
+        width: 100; height: 100
+        color: "red"
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        id: newParent
+        transform: Scale { xScale: .5; yScale: .7}
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
new file mode 100644
index 0000000..56bdd89
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
@@ -0,0 +1,30 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 400
+    Rectangle {
+        id: myRect
+        objectName: "MyRect"
+        x: 5; y: 5
+        width: 100; height: 100
+        color: "red"
+    }
+    MouseArea {
+        id: clickable
+        anchors.fill: parent
+    }
+
+    Item {
+        id: newParent
+        transform: Rotation { angle: 30; axis { x: 0; y: 1; z: 0 } }
+    }
+
+    states: State {
+        name: "reparented"
+        when: clickable.pressed
+        ParentChange {
+            target: myRect
+            parent: newParent
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml b/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
new file mode 100644
index 0000000..080e833
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges { target: myRectangle; colr: "blue"; wantsFocus: true }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml b/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
new file mode 100644
index 0000000..088c608
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        PropertyChanges {
+            target: myRectangle
+            restoreEntryValues: false
+            color: "blue"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/script.qml b/tests/auto/declarative/qdeclarativestates/data/script.qml
new file mode 100644
index 0000000..3c5f33e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/script.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+Rectangle {
+    id: myRectangle
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "blue"
+        StateChangeScript { script: myRectangle.color = "blue"; }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
new file mode 100644
index 0000000..5ba1566
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+import Qt.test 1.0
+
+MyRectangle {
+    id: rect
+
+    onDidSomething: color = "blue"
+
+    width: 100; height: 100
+    color: "red"
+    states: State {
+        name: "green"
+        PropertyChanges {
+            target: rect
+            onDidSomething: color = "green"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
new file mode 100644
index 0000000..527e165
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+import Qt.test 1.0
+
+MyRectangle {
+    id: rect
+    onDidSomething: color = "blue"
+    width: 100; height: 100
+    ExtendedRectangle {}
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
new file mode 100644
index 0000000..702fa86
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+import Qt.test 1.0
+
+MyRectangle {
+    id: rect
+
+    width: 100; height: 100
+    states: State {
+        name: "overridden"
+        PropertyChanges {
+            target: rect
+            onDidSomething: rect.state = ""
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro
new file mode 100644
index 0000000..f874803
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativestates.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
new file mode 100644
index 0000000..1bc67e9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -0,0 +1,917 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeanchors_p_p.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativepropertychanges_p.h>
+#include <private/qdeclarativestategroup_p.h>
+
+class tst_qmlstates : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlstates() {}
+
+private:
+    static QByteArray fullDataPath(const QString &path);
+
+private slots:
+    void initTestCase();
+
+    void basicChanges();
+    void basicExtension();
+    void basicBinding();
+    void signalOverride();
+    void signalOverrideCrash();
+    void parentChange();
+    void parentChangeErrors();
+    void anchorChanges();
+    void anchorChanges2();
+    void anchorChanges3();
+    void anchorChanges4();
+    void anchorChanges5();
+    void script();
+    void restoreEntryValues();
+    void explicitChanges();
+    void propertyErrors();
+    void incorrectRestoreBug();
+    void autoStateAtStartupRestoreBug();
+    void deletingChange();
+    void deletingState();
+    void tempState();
+    void illegalTempState();
+    void nonExistantProperty();
+};
+
+QByteArray tst_qmlstates::fullDataPath(const QString &path)
+{
+    return QUrl::fromLocalFile(SRCDIR + path).toString().toUtf8();    
+}
+
+void tst_qmlstates::basicChanges()
+{
+    QDeclarativeEngine engine;
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicChanges.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicChanges2.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("green");
+        QCOMPARE(rect->color(),QColor("green"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("green");
+        QCOMPARE(rect->color(),QColor("green"));
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicChanges3.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+        QCOMPARE(rect->border()->width(),1);
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+        QCOMPARE(rect->border()->width(),1);
+
+        rect->setState("bordered");
+        QCOMPARE(rect->color(),QColor("red"));
+        QCOMPARE(rect->border()->width(),2);
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+        QCOMPARE(rect->border()->width(),1);
+        //### we should be checking that this is an implicit rather than explicit 1 (which currently fails)
+
+        rect->setState("bordered");
+        QCOMPARE(rect->color(),QColor("red"));
+        QCOMPARE(rect->border()->width(),2);
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+        QCOMPARE(rect->border()->width(),1);
+
+    }
+}
+
+void tst_qmlstates::basicExtension()
+{
+    QDeclarativeEngine engine;
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicExtension.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+        QCOMPARE(rect->border()->width(),1);
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+        QCOMPARE(rect->border()->width(),1);
+
+        rect->setState("bordered");
+        QCOMPARE(rect->color(),QColor("blue"));
+        QCOMPARE(rect->border()->width(),2);
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+        QCOMPARE(rect->border()->width(),1);
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+        QCOMPARE(rect->border()->width(),1);
+
+        rect->setState("bordered");
+        QCOMPARE(rect->color(),QColor("blue"));
+        QCOMPARE(rect->border()->width(),2);
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+        QCOMPARE(rect->border()->width(),1);
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/fakeExtension.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("green");
+        QCOMPARE(rect->color(),QColor("green"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("green");
+        QCOMPARE(rect->color(),QColor("green"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("green");
+        QCOMPARE(rect->color(),QColor("green"));
+    }
+}
+
+void tst_qmlstates::basicBinding()
+{
+    QDeclarativeEngine engine;
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicBinding.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+        rect->setProperty("sourceColor", QColor("green"));
+        QCOMPARE(rect->color(),QColor("green"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+        rect->setProperty("sourceColor", QColor("yellow"));
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("yellow"));
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicBinding2.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+        rect->setProperty("sourceColor", QColor("green"));
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("green"));
+        rect->setProperty("sourceColor", QColor("yellow"));
+        QCOMPARE(rect->color(),QColor("yellow"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("yellow"));
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicBinding3.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+        rect->setProperty("sourceColor", QColor("green"));
+        QCOMPARE(rect->color(),QColor("green"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+        rect->setProperty("sourceColor", QColor("red"));
+        QCOMPARE(rect->color(),QColor("blue"));
+        rect->setProperty("sourceColor2", QColor("yellow"));
+        QCOMPARE(rect->color(),QColor("yellow"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+        rect->setProperty("sourceColor2", QColor("green"));
+        QCOMPARE(rect->color(),QColor("red"));
+        rect->setProperty("sourceColor", QColor("yellow"));
+        QCOMPARE(rect->color(),QColor("yellow"));
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicBinding4.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+        rect->setProperty("sourceColor", QColor("yellow"));
+        QCOMPARE(rect->color(),QColor("yellow"));
+
+        rect->setState("green");
+        QCOMPARE(rect->color(),QColor("green"));
+        rect->setProperty("sourceColor", QColor("purple"));
+        QCOMPARE(rect->color(),QColor("green"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("purple"));
+
+        rect->setState("green");
+        QCOMPARE(rect->color(),QColor("green"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("red"));
+    }
+}
+
+class MyRect : public QDeclarativeRectangle
+{
+   Q_OBJECT
+public:
+    MyRect() {}
+    void doSomething() { emit didSomething(); }
+Q_SIGNALS:
+    void didSomething();
+};
+
+QML_DECLARE_TYPE(MyRect)
+
+void tst_qmlstates::initTestCase()
+{
+    QML_REGISTER_TYPE(Qt.test, 1, 0, MyRectangle,MyRect);
+}
+
+void tst_qmlstates::signalOverride()
+{
+    QDeclarativeEngine engine;
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/signalOverride.qml");
+        MyRect *rect = qobject_cast<MyRect*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+        rect->doSomething();
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("green");
+        rect->doSomething();
+        QCOMPARE(rect->color(),QColor("green"));
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/signalOverride2.qml");
+        MyRect *rect = qobject_cast<MyRect*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("white"));
+        rect->doSomething();
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("extendedRect"));
+
+        innerRect->setState("green");
+        rect->doSomething();
+        QCOMPARE(rect->color(),QColor("blue"));
+        QCOMPARE(innerRect->color(),QColor("green"));
+        QCOMPARE(innerRect->property("extendedColor").value<QColor>(),QColor("green"));
+    }
+}
+
+void tst_qmlstates::signalOverrideCrash()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/signalOverrideCrash.qml");
+    MyRect *rect = qobject_cast<MyRect*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    rect->setState("overridden");
+    rect->doSomething();
+}
+
+void tst_qmlstates::parentChange()
+{
+    QDeclarativeEngine engine;
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+        QVERIFY(innerRect != 0);
+
+        QDeclarativeListReference list(rect, "states");
+        QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
+        QVERIFY(state != 0);
+
+        qmlExecuteDeferred(state);
+        QDeclarativeParentChange *pChange = qobject_cast<QDeclarativeParentChange*>(state->operationAt(0));
+        QVERIFY(pChange != 0);
+        QDeclarativeItem *nParent = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("NewParent"));
+        QVERIFY(nParent != 0);
+
+        QCOMPARE(pChange->parent(), nParent);
+
+        rect->setState("reparented");
+        QCOMPARE(innerRect->rotation(), qreal(0));
+        QCOMPARE(innerRect->scale(), qreal(1));
+        QCOMPARE(innerRect->x(), qreal(-133));
+        QCOMPARE(innerRect->y(), qreal(-300));
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange2.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+        QVERIFY(innerRect != 0);
+
+        rect->setState("reparented");
+        QCOMPARE(innerRect->rotation(), qreal(15));
+        QCOMPARE(innerRect->scale(), qreal(.5));
+        QEXPECT_FAIL("", "QTBUG-2919", Continue);
+        QCOMPARE(QString("%1").arg(innerRect->x()), QString("%1").arg(12.4148145657));
+        QEXPECT_FAIL("", "QTBUG-2919", Continue);
+        QCOMPARE(QString("%1").arg(innerRect->y()), QString("%1").arg(10.6470476128));
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange3.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+        QVERIFY(innerRect != 0);
+
+        rect->setState("reparented");
+        QCOMPARE(innerRect->rotation(), qreal(-37));
+        QCOMPARE(innerRect->scale(), qreal(.25));
+        QCOMPARE(QString("%1").arg(innerRect->x()), QString("%1").arg(-217.305));
+        QCOMPARE(QString("%1").arg(innerRect->y()), QString("%1").arg(-164.413));
+
+        rect->setState("");
+        QCOMPARE(innerRect->rotation(), qreal(0));
+        QCOMPARE(innerRect->scale(), qreal(1));
+        QCOMPARE(innerRect->x(), qreal(5));
+        QEXPECT_FAIL("", "QTBUG-2919", Continue);
+        QCOMPARE(innerRect->y(), qreal(0));
+    }
+}
+
+void tst_qmlstates::parentChangeErrors()
+{
+    QDeclarativeEngine engine;
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange4.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+        QVERIFY(innerRect != 0);
+
+        QTest::ignoreMessage(QtWarningMsg, QByteArray("QML ParentChange (" + fullDataPath("/data/parentChange4.qml") + ":25:9) Unable to preserve appearance under non-uniform scale").constData());
+        rect->setState("reparented");
+        QCOMPARE(innerRect->rotation(), qreal(0));
+        QCOMPARE(innerRect->scale(), qreal(1));
+        QCOMPARE(innerRect->x(), qreal(5));
+        QCOMPARE(innerRect->y(), qreal(5));
+    }
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange5.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+        QVERIFY(innerRect != 0);
+
+        QTest::ignoreMessage(QtWarningMsg, QByteArray("QML ParentChange (" + fullDataPath("/data/parentChange5.qml") + ":25:9) Unable to preserve appearance under complex transform").constData());
+        rect->setState("reparented");
+        QCOMPARE(innerRect->rotation(), qreal(0));
+        QCOMPARE(innerRect->scale(), qreal(1));
+        QCOMPARE(innerRect->x(), qreal(5));
+        QCOMPARE(innerRect->y(), qreal(5));
+    }
+}
+
+void tst_qmlstates::anchorChanges()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+    QVERIFY(innerRect != 0);
+
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
+    QVERIFY(state != 0);
+
+    qmlExecuteDeferred(state);
+    QDeclarativeAnchorChanges *aChanges = qobject_cast<QDeclarativeAnchorChanges*>(state->operationAt(0));
+    QVERIFY(aChanges != 0);
+
+    rect->setState("right");
+    QCOMPARE(innerRect->x(), qreal(150));
+    QCOMPARE(aChanges->reset(), QString("left"));
+    QCOMPARE(aChanges->object(), innerRect);
+    QCOMPARE(aChanges->right().item, rect->right().item);
+    QCOMPARE(aChanges->right().anchorLine, rect->right().anchorLine);
+
+    rect->setState("");
+    QCOMPARE(innerRect->x(), qreal(5));
+
+    delete rect;
+}
+
+void tst_qmlstates::anchorChanges2()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges2.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+    QVERIFY(innerRect != 0);
+
+    rect->setState("right");
+    QEXPECT_FAIL("", "QTBUG-5338", Continue);
+    QCOMPARE(innerRect->x(), qreal(150));
+
+    rect->setState("");
+    QCOMPARE(innerRect->x(), qreal(5));
+
+    delete rect;
+}
+
+void tst_qmlstates::anchorChanges3()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges3.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+    QVERIFY(innerRect != 0);
+
+    QDeclarativeItem *leftGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("LeftGuideline"));
+    QVERIFY(leftGuideline != 0);
+
+    QDeclarativeItem *bottomGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("BottomGuideline"));
+    QVERIFY(bottomGuideline != 0);
+
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
+    QVERIFY(state != 0);
+
+    qmlExecuteDeferred(state);
+    QDeclarativeAnchorChanges *aChanges = qobject_cast<QDeclarativeAnchorChanges*>(state->operationAt(0));
+    QVERIFY(aChanges != 0);
+
+    rect->setState("reanchored");
+    QCOMPARE(aChanges->object(), innerRect);
+    QCOMPARE(aChanges->left().item, leftGuideline->left().item);
+    QCOMPARE(aChanges->left().anchorLine, leftGuideline->left().anchorLine);
+    QCOMPARE(aChanges->right().item, rect->right().item);
+    QCOMPARE(aChanges->right().anchorLine, rect->right().anchorLine);
+    QCOMPARE(aChanges->top().item, rect->top().item);
+    QCOMPARE(aChanges->top().anchorLine, rect->top().anchorLine);
+    QCOMPARE(aChanges->bottom().item, bottomGuideline->bottom().item);
+    QCOMPARE(aChanges->bottom().anchorLine, bottomGuideline->bottom().anchorLine);
+
+    QCOMPARE(innerRect->x(), qreal(10));
+    QCOMPARE(innerRect->y(), qreal(0));
+    QCOMPARE(innerRect->width(), qreal(190));
+    QCOMPARE(innerRect->height(), qreal(150));
+
+    rect->setState("");
+    QCOMPARE(innerRect->x(), qreal(0));
+    QCOMPARE(innerRect->y(), qreal(10));
+    QCOMPARE(innerRect->width(), qreal(150));
+    QCOMPARE(innerRect->height(), qreal(190));
+
+    delete rect;
+}
+
+void tst_qmlstates::anchorChanges4()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges4.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+    QVERIFY(innerRect != 0);
+
+    QDeclarativeItem *leftGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("LeftGuideline"));
+    QVERIFY(leftGuideline != 0);
+
+    QDeclarativeItem *bottomGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("BottomGuideline"));
+    QVERIFY(bottomGuideline != 0);
+
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
+    QVERIFY(state != 0);
+
+    qmlExecuteDeferred(state);
+    QDeclarativeAnchorChanges *aChanges = qobject_cast<QDeclarativeAnchorChanges*>(state->operationAt(0));
+    QVERIFY(aChanges != 0);
+
+    rect->setState("reanchored");
+    QCOMPARE(aChanges->object(), innerRect);
+    QCOMPARE(aChanges->horizontalCenter().item, bottomGuideline->horizontalCenter().item);
+    QCOMPARE(aChanges->horizontalCenter().anchorLine, bottomGuideline->horizontalCenter().anchorLine);
+    QCOMPARE(aChanges->verticalCenter().item, leftGuideline->verticalCenter().item);
+    QCOMPARE(aChanges->verticalCenter().anchorLine, leftGuideline->verticalCenter().anchorLine);
+
+    delete rect;
+}
+
+void tst_qmlstates::anchorChanges5()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges5.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
+    QVERIFY(innerRect != 0);
+
+    QDeclarativeItem *leftGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("LeftGuideline"));
+    QVERIFY(leftGuideline != 0);
+
+    QDeclarativeItem *bottomGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("BottomGuideline"));
+    QVERIFY(bottomGuideline != 0);
+
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
+    QVERIFY(state != 0);
+
+    qmlExecuteDeferred(state);
+    QDeclarativeAnchorChanges *aChanges = qobject_cast<QDeclarativeAnchorChanges*>(state->operationAt(0));
+    QVERIFY(aChanges != 0);
+
+    rect->setState("reanchored");
+    QCOMPARE(aChanges->object(), innerRect);
+    QCOMPARE(aChanges->horizontalCenter().item, bottomGuideline->horizontalCenter().item);
+    QCOMPARE(aChanges->horizontalCenter().anchorLine, bottomGuideline->horizontalCenter().anchorLine);
+    QCOMPARE(aChanges->baseline().item, leftGuideline->baseline().item);
+    QCOMPARE(aChanges->baseline().anchorLine, leftGuideline->baseline().anchorLine);
+
+    delete rect;
+}
+
+void tst_qmlstates::script()
+{
+    QDeclarativeEngine engine;
+
+    {
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/script.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+        QVERIFY(rect != 0);
+
+        QCOMPARE(rect->color(),QColor("red"));
+
+        rect->setState("blue");
+        QCOMPARE(rect->color(),QColor("blue"));
+
+        rect->setState("");
+        QCOMPARE(rect->color(),QColor("blue")); // a script isn't reverted
+    }
+}
+
+void tst_qmlstates::restoreEntryValues()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/restoreEntryValues.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QCOMPARE(rect->color(),QColor("red"));
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("blue"));
+
+    rect->setState("");
+    QCOMPARE(rect->color(),QColor("blue"));
+}
+
+void tst_qmlstates::explicitChanges()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/explicit.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
+    QVERIFY(state != 0);
+
+    qmlExecuteDeferred(state);
+    QDeclarativePropertyChanges *changes = qobject_cast<QDeclarativePropertyChanges*>(rect->findChild<QDeclarativePropertyChanges*>("changes"));
+    QVERIFY(changes != 0);
+    QVERIFY(changes->isExplicit());
+
+    QCOMPARE(rect->color(),QColor("red"));
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("blue"));
+
+    rect->setProperty("sourceColor", QColor("green"));
+    QCOMPARE(rect->color(),QColor("blue"));
+
+    rect->setState("");
+    QCOMPARE(rect->color(),QColor("red"));
+    rect->setProperty("sourceColor", QColor("yellow"));
+    QCOMPARE(rect->color(),QColor("red"));
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("yellow"));
+}
+
+void tst_qmlstates::propertyErrors()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/propertyErrors.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QCOMPARE(rect->color(),QColor("red"));
+
+    QTest::ignoreMessage(QtWarningMsg, QByteArray("QML PropertyChanges (" + fullDataPath("/data/propertyErrors.qml") + ":8:9) Cannot assign to non-existent property \"colr\"").constData());
+    QTest::ignoreMessage(QtWarningMsg, QByteArray("QML PropertyChanges (" + fullDataPath("/data/propertyErrors.qml") + ":8:9) Cannot assign to read-only property \"wantsFocus\"").constData());
+    rect->setState("blue");
+}
+
+void tst_qmlstates::incorrectRestoreBug()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicChanges.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QCOMPARE(rect->color(),QColor("red"));
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("blue"));
+
+    rect->setState("");
+    QCOMPARE(rect->color(),QColor("red"));
+
+    // make sure if we change the base state value, we then restore to it correctly
+    rect->setColor(QColor("green"));
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("blue"));
+
+    rect->setState("");
+    QCOMPARE(rect->color(),QColor("green"));
+}
+
+void tst_qmlstates::autoStateAtStartupRestoreBug()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent component(&engine, SRCDIR "/data/autoStateAtStartupRestoreBug.qml");
+    QObject *obj = component.create();
+
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->property("test").toInt(), 3);
+
+    obj->setProperty("input", 2);
+
+    QCOMPARE(obj->property("test").toInt(), 9);
+
+    delete obj;
+}
+
+void tst_qmlstates::deletingChange()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/deleting.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("blue"));
+    QCOMPARE(rect->radius(),qreal(5));
+
+    rect->setState("");
+    QCOMPARE(rect->color(),QColor("red"));
+    QCOMPARE(rect->radius(),qreal(0));
+
+    QDeclarativePropertyChanges *pc = rect->findChild<QDeclarativePropertyChanges*>("pc1");
+    QVERIFY(pc != 0);
+    delete pc;
+
+    QDeclarativeState *state = rect->findChild<QDeclarativeState*>();
+    QVERIFY(state != 0);
+    qmlExecuteDeferred(state);
+    QCOMPARE(state->operationCount(), 1);
+
+    rect->setState("blue");
+    QCOMPARE(rect->color(),QColor("red"));
+    QCOMPARE(rect->radius(),qreal(5));
+
+    delete rect;
+}
+
+void tst_qmlstates::deletingState()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/deletingState.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeStateGroup *sg = rect->findChild<QDeclarativeStateGroup*>();
+    QVERIFY(sg != 0);
+    QVERIFY(sg->findState("blue") != 0);
+
+    sg->setState("blue");
+    QCOMPARE(rect->color(),QColor("blue"));
+
+    sg->setState("");
+    QCOMPARE(rect->color(),QColor("red"));
+
+    QDeclarativeState *state = rect->findChild<QDeclarativeState*>();
+    QVERIFY(state != 0);
+    delete state;
+
+    QVERIFY(sg->findState("blue") == 0);
+
+    //### should we warn that state doesn't exist
+    sg->setState("blue");
+    QCOMPARE(rect->color(),QColor("red"));
+
+    delete rect;
+}
+
+void tst_qmlstates::tempState()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/legalTempState.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QTest::ignoreMessage(QtDebugMsg, "entering placed");
+    QTest::ignoreMessage(QtDebugMsg, "entering idle");
+    rect->setState("placed");
+    QCOMPARE(rect->state(), QLatin1String("idle"));
+}
+
+void tst_qmlstates::illegalTempState()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/illegalTempState.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QTest::ignoreMessage(QtWarningMsg, "Can't apply a state change as part of a state definition. ");
+    rect->setState("placed");
+    QCOMPARE(rect->state(), QLatin1String("placed"));
+}
+
+void tst_qmlstates::nonExistantProperty()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/nonExistantProp.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QTest::ignoreMessage(QtWarningMsg, QByteArray("QML PropertyChanges (" + fullDataPath("/data/nonExistantProp.qml") + ":9:9) Cannot assign to non-existent property \"colr\"").constData());
+    rect->setState("blue");
+    QCOMPARE(rect->state(), QLatin1String("blue"));
+}
+
+QTEST_MAIN(tst_qmlstates)
+
+#include "tst_qdeclarativestates.moc"
diff --git a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro
new file mode 100644
index 0000000..bd4d829
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+QT += network
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativestyledtext.cpp
+
+# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
+# LIBS += -lgcov
diff --git a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
new file mode 100644
index 0000000..1968300
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtTest/QtTest>
+#include <QtGui/QTextLayout>
+#include <private/qdeclarativestyledtext_p.h>
+
+class tst_qmlstyledtext : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlstyledtext()
+    {
+    }
+
+private slots:
+    void textOutput();
+    void textOutput_data();
+};
+
+// For malformed input all we test is that we get the expected text out.
+// 
+void tst_qmlstyledtext::textOutput_data()
+{
+    QTest::addColumn<QString>("input");
+    QTest::addColumn<QString>("output");
+
+    QTest::newRow("bold") << "<b>bold</b>" << "bold";
+    QTest::newRow("italic") << "<b>italic</b>" << "italic";
+    QTest::newRow("missing >") << "<b>text</b" << "text";
+    QTest::newRow("missing b>") << "<b>text</" << "text";
+    QTest::newRow("missing /b>") << "<b>text<" << "text";
+    QTest::newRow("missing </b>") << "<b>text" << "text";
+    QTest::newRow("bad nest") << "<b>text <i>italic</b></i>" << "text italic";
+    QTest::newRow("font color") << "<font color=\"red\">red text</font>" << "red text";
+    QTest::newRow("font size") << "<font size=\"1\">text</font>" << "text";
+    QTest::newRow("font empty") << "<font>text</font>" << "text";
+    QTest::newRow("font bad 1") << "<font ezis=\"blah\">text</font>" << "text";
+    QTest::newRow("font bad 2") << "<font size=\"1>text</font>" << "";
+    QTest::newRow("extra close") << "<b>text</b></b>" << "text";
+    QTest::newRow("empty") << "" << "";
+}
+
+void tst_qmlstyledtext::textOutput()
+{
+    QFETCH(QString, input);
+    QFETCH(QString, output);
+
+    QTextLayout layout;
+    QDeclarativeStyledText::parse(input, layout);
+
+    QCOMPARE(layout.text(), output);
+}
+
+
+QTEST_MAIN(tst_qmlstyledtext)
+
+#include "tst_qdeclarativestyledtext.moc"
diff --git a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro
new file mode 100644
index 0000000..0781774
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativesystempalette.cpp
diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
new file mode 100644
index 0000000..0f6383e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
@@ -0,0 +1,187 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDebug>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativesystempalette_p.h>
+#include <qpalette.h>
+#include "../../../shared/util.h"
+
+class tst_qmlsystempalette : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlsystempalette();
+
+private slots:
+    void activePalette();
+    void inactivePalette();
+    void disabledPalette();
+    void paletteChanged();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlsystempalette::tst_qmlsystempalette()
+{
+}
+
+void tst_qmlsystempalette::activePalette()
+{
+    QString componentStr = "import Qt 4.6\nSystemPalette { }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
+
+    QVERIFY(object != 0);
+
+    QPalette palette;
+    palette.setCurrentColorGroup(QPalette::Active);
+    QCOMPARE(palette.window().color(), object->window());
+    QCOMPARE(palette.windowText().color(), object->windowText());
+    QCOMPARE(palette.base().color(), object->base());
+    QCOMPARE(palette.text().color(), object->text());
+    QCOMPARE(palette.alternateBase().color(), object->alternateBase());
+    QCOMPARE(palette.button().color(), object->button());
+    QCOMPARE(palette.buttonText().color(), object->buttonText());
+    QCOMPARE(palette.light().color(), object->light());
+    QCOMPARE(palette.midlight().color(), object->midlight());
+    QCOMPARE(palette.dark().color(), object->dark());
+    QCOMPARE(palette.mid().color(), object->mid());
+    QCOMPARE(palette.shadow().color(), object->shadow());
+    QCOMPARE(palette.highlight().color(), object->highlight());
+    QCOMPARE(palette.highlightedText().color(), object->highlightedText());
+
+    delete object;
+}
+
+void tst_qmlsystempalette::inactivePalette()
+{
+    QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Inactive }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
+
+    QVERIFY(object != 0);
+    QVERIFY(object->colorGroup() == QDeclarativeSystemPalette::Inactive);
+
+    QPalette palette;
+    palette.setCurrentColorGroup(QPalette::Inactive);
+    QCOMPARE(palette.window().color(), object->window());
+    QCOMPARE(palette.windowText().color(), object->windowText());
+    QCOMPARE(palette.base().color(), object->base());
+    QCOMPARE(palette.text().color(), object->text());
+    QCOMPARE(palette.alternateBase().color(), object->alternateBase());
+    QCOMPARE(palette.button().color(), object->button());
+    QCOMPARE(palette.buttonText().color(), object->buttonText());
+    QCOMPARE(palette.light().color(), object->light());
+    QCOMPARE(palette.midlight().color(), object->midlight());
+    QCOMPARE(palette.dark().color(), object->dark());
+    QCOMPARE(palette.mid().color(), object->mid());
+    QCOMPARE(palette.shadow().color(), object->shadow());
+    QCOMPARE(palette.highlight().color(), object->highlight());
+    QCOMPARE(palette.highlightedText().color(), object->highlightedText());
+
+    delete object;
+}
+
+void tst_qmlsystempalette::disabledPalette()
+{
+    QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Disabled }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
+
+    QVERIFY(object != 0);
+    QVERIFY(object->colorGroup() == QDeclarativeSystemPalette::Disabled);
+
+    QPalette palette;
+    palette.setCurrentColorGroup(QPalette::Disabled);
+    QCOMPARE(palette.window().color(), object->window());
+    QCOMPARE(palette.windowText().color(), object->windowText());
+    QCOMPARE(palette.base().color(), object->base());
+    QCOMPARE(palette.text().color(), object->text());
+    QCOMPARE(palette.alternateBase().color(), object->alternateBase());
+    QCOMPARE(palette.button().color(), object->button());
+    QCOMPARE(palette.buttonText().color(), object->buttonText());
+    QCOMPARE(palette.light().color(), object->light());
+    QCOMPARE(palette.midlight().color(), object->midlight());
+    QCOMPARE(palette.dark().color(), object->dark());
+    QCOMPARE(palette.mid().color(), object->mid());
+    QCOMPARE(palette.shadow().color(), object->shadow());
+    QCOMPARE(palette.highlight().color(), object->highlight());
+    QCOMPARE(palette.highlightedText().color(), object->highlightedText());
+
+    delete object;
+}
+
+void tst_qmlsystempalette::paletteChanged()
+{
+    QString componentStr = "import Qt 4.6\nSystemPalette { }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
+
+    QVERIFY(object != 0);
+
+    QPalette p;
+    p.setCurrentColorGroup(QPalette::Active);
+    p.setColor(QPalette::Active, QPalette::Text, QColor("red"));
+    p.setColor(QPalette::Active, QPalette::ButtonText, QColor("green"));
+    p.setColor(QPalette::Active, QPalette::WindowText, QColor("blue"));
+
+    qApp->setPalette(p);
+
+    object->setColorGroup(QDeclarativeSystemPalette::Active);
+    QTRY_COMPARE(QColor("red"), object->text());
+    QTRY_COMPARE(QColor("green"), object->buttonText());
+    QTRY_COMPARE(QColor("blue"), object->windowText());
+
+    delete object;
+}
+
+QTEST_MAIN(tst_qmlsystempalette)
+
+#include "tst_qdeclarativesystempalette.moc"
diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
new file mode 100644
index 0000000..8b4b4d1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativetext.cpp
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
new file mode 100644
index 0000000..8026f1a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -0,0 +1,844 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QTextDocument>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetext_p.h>
+#include <private/qdeclarativevaluetype_p.h>
+#include <QFontMetrics>
+#include <QGraphicsSceneMouseEvent>
+#include <qmath.h>
+
+class tst_qmlgraphicstext : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicstext();
+
+private slots:
+    void text();
+    void width();
+    void wrap();
+    void elide();
+    void textFormat();
+
+    // ### these tests may be trivial    
+    void horizontalAlignment();
+    void verticalAlignment();
+    void font();
+    void style();
+    void color();
+    void smooth();
+
+    // QDeclarativeFontValueType
+    void weight();
+    void underline();
+    void overline();
+    void strikeout();
+    void capitalization();
+    void letterSpacing();
+    void wordSpacing();
+
+    void clickLink();
+
+private:
+    QStringList standard;
+    QStringList richText;
+
+    QStringList horizontalAlignmentmentStrings;
+    QStringList verticalAlignmentmentStrings;
+
+    QList<Qt::Alignment> verticalAlignmentments;
+    QList<Qt::Alignment> horizontalAlignmentments;
+
+    QStringList styleStrings;
+    QList<QDeclarativeText::TextStyle> styles;
+
+    QStringList colorStrings;
+
+    QDeclarativeEngine engine;
+};
+
+tst_qmlgraphicstext::tst_qmlgraphicstext()
+{
+    standard << "the quick brown fox jumped over the lazy dog"
+            << "the quick brown fox\n jumped over the lazy dog";
+
+    richText << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a> jumped over the <b>lazy</b> dog</i>"
+            << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a><br>jumped over the <b>lazy</b> dog</i>";
+
+    horizontalAlignmentmentStrings << "AlignLeft"
+            << "AlignRight"
+            << "AlignHCenter";
+
+    verticalAlignmentmentStrings << "AlignTop"
+            << "AlignBottom"
+            << "AlignVCenter";
+
+    horizontalAlignmentments << Qt::AlignLeft
+            << Qt::AlignRight
+            << Qt::AlignHCenter;
+
+    verticalAlignmentments << Qt::AlignTop
+            << Qt::AlignBottom
+            << Qt::AlignVCenter;
+
+    styleStrings << "Normal"
+            << "Outline"
+            << "Raised"
+            << "Sunken";
+
+    styles << QDeclarativeText::Normal
+            << QDeclarativeText::Outline
+            << QDeclarativeText::Raised
+            << QDeclarativeText::Sunken;
+
+    colorStrings << "aliceblue"
+            << "antiquewhite"
+            << "aqua"
+            << "darkkhaki"
+            << "darkolivegreen"
+            << "dimgray"
+            << "palevioletred"
+            << "lightsteelblue"
+            << "#000000"
+            << "#AAAAAA"
+            << "#FFFFFF"
+            << "#2AC05F";
+    //
+    // need a different test to do alpha channel test
+    // << "#AA0011DD"
+    // << "#00F16B11";
+    //
+}
+
+void tst_qmlgraphicstext::text()
+{
+    {
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData("import Qt 4.6\nText { text: \"\" }", QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->text(), QString(""));
+        QVERIFY(textObject->width() == 0);
+
+        delete textObject;
+    }
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"" + standard.at(i) + "\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->text(), standard.at(i));
+        QVERIFY(textObject->width() > 0);
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"" + richText.at(i) + "\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QString expected = richText.at(i);
+        QCOMPARE(textObject->text(), expected.replace("\\\"", "\""));
+        QVERIFY(textObject->width() > 0);
+    }
+}
+
+void tst_qmlgraphicstext::width()
+{
+    // uses Font metrics to find the width for standard and document to find the width for rich
+    {
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData("import Qt 4.6\nText { text: \"\" }", QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->width(), 0.);
+    }
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        QVERIFY(!Qt::mightBeRichText(standard.at(i))); // self-test
+
+        QFont f;
+        QFontMetricsF fm(f);
+        qreal metricWidth = fm.size(Qt::TextExpandTabs && Qt::TextShowMnemonic, standard.at(i)).width();
+        metricWidth = qCeil(metricWidth);
+
+        QString componentStr = "import Qt 4.6\nText { text: \"" + standard.at(i) + "\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->width(), qreal(metricWidth));
+        QVERIFY(textObject->textFormat() == QDeclarativeText::AutoText); // setting text doesn't change format
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        QVERIFY(Qt::mightBeRichText(richText.at(i))); // self-test
+
+        QTextDocument document;
+        document.setHtml(richText.at(i));
+        document.setDocumentMargin(0);
+
+        int documentWidth = document.idealWidth();
+
+        QString componentStr = "import Qt 4.6\nText { text: \"" + richText.at(i) + "\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->width(), qreal(documentWidth));
+        QVERIFY(textObject->textFormat() == QDeclarativeText::AutoText); // setting text doesn't change format
+    }
+}
+
+void tst_qmlgraphicstext::wrap()
+{
+    int textHeight = 0;
+    // for specified width and wrap set true
+    {
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData("import Qt 4.6\nText { text: \"Hello\"; wrap: true; width: 300 }", QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+        textHeight = textObject->height();
+
+        QVERIFY(textObject != 0);
+        QVERIFY(textObject->wrap() == true);
+        QCOMPARE(textObject->width(), 300.);
+    }
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nText { wrap: true; width: 30; text: \"" + standard.at(i) + "\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->width(), 30.);
+        QVERIFY(textObject->height() > textHeight);
+
+        int oldHeight = textObject->height();
+        textObject->setWidth(100);
+        QVERIFY(textObject->height() < oldHeight);
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nText { wrap: true; width: 30; text: \"" + richText.at(i) + "\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->width(), 30.);
+        QVERIFY(textObject->height() > textHeight);
+    }
+
+}
+
+void tst_qmlgraphicstext::elide()
+{
+    for (QDeclarativeText::TextElideMode m = QDeclarativeText::ElideLeft; m<=QDeclarativeText::ElideNone; m=QDeclarativeText::TextElideMode(int(m)+1)) {
+        const char* elidename[]={"ElideLeft", "ElideRight", "ElideMiddle", "ElideNone"};
+        QString elide = "elide: Text." + QString(elidename[int(m)]) + ";";
+
+        // XXX Poor coverage.
+
+        {
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(("import Qt 4.6\nText { text: \"\"; "+elide+" width: 100 }").toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+            QCOMPARE(textObject->elideMode(), m);
+            QCOMPARE(textObject->width(), 100.);
+        }
+
+        for (int i = 0; i < standard.size(); i++)
+        {
+            QString componentStr = "import Qt 4.6\nText { "+elide+" width: 100; text: \"" + standard.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+            QCOMPARE(textObject->elideMode(), m);
+            QCOMPARE(textObject->width(), 100.);
+        }
+
+        // richtext - does nothing
+        for (int i = 0; i < richText.size(); i++)
+        {
+            QString componentStr = "import Qt 4.6\nText { "+elide+" width: 100; text: \"" + richText.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+            QCOMPARE(textObject->elideMode(), m);
+            QCOMPARE(textObject->width(), 100.);
+        }
+    }
+}
+
+void tst_qmlgraphicstext::textFormat()
+{
+    {
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData("import Qt 4.6\nText { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QVERIFY(textObject->textFormat() == QDeclarativeText::RichText);
+    }
+    {
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData("import Qt 4.6\nText { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QVERIFY(textObject->textFormat() == QDeclarativeText::PlainText);
+    }
+}
+
+//the alignment tests may be trivial o.oa
+void tst_qmlgraphicstext::horizontalAlignment()
+{
+    //test one align each, and then test if two align fails.
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        for (int j=0; j < horizontalAlignmentmentStrings.size(); j++)
+        {
+            QString componentStr = "import Qt 4.6\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+            QCOMPARE((int)textObject->hAlign(), (int)horizontalAlignmentments.at(j));
+        }
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        for (int j=0; j < horizontalAlignmentmentStrings.size(); j++)
+        {
+            QString componentStr = "import Qt 4.6\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+            QCOMPARE((int)textObject->hAlign(), (int)horizontalAlignmentments.at(j));
+        }
+    }
+
+}
+
+void tst_qmlgraphicstext::verticalAlignment()
+{
+    //test one align each, and then test if two align fails.
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        for (int j=0; j < verticalAlignmentmentStrings.size(); j++)
+        {
+            QString componentStr = "import Qt 4.6\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+            QVERIFY(textObject != 0);
+            QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j));
+        }
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        for (int j=0; j < verticalAlignmentmentStrings.size(); j++)
+        {
+            QString componentStr = "import Qt 4.6\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+            QVERIFY(textObject != 0);
+            QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j));
+        }
+    }
+
+}
+
+void tst_qmlgraphicstext::font()
+{
+    //test size, then bold, then italic, then family
+    {
+        QString componentStr = "import Qt 4.6\nText { font.pointSize: 40; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE(textObject->font().pointSize(), 40);
+        QCOMPARE(textObject->font().bold(), false);
+        QCOMPARE(textObject->font().italic(), false);
+    }
+
+    {
+        QString componentStr = "import Qt 4.6\nText { font.pixelSize: 40; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE(textObject->font().pixelSize(), 40);
+        QCOMPARE(textObject->font().bold(), false);
+        QCOMPARE(textObject->font().italic(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nText { font.bold: true; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE(textObject->font().bold(), true);
+        QCOMPARE(textObject->font().italic(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nText { font.italic: true; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE(textObject->font().italic(), true);
+        QCOMPARE(textObject->font().bold(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nText { font.family: \"Helvetica\"; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE(textObject->font().family(), QString("Helvetica"));
+        QCOMPARE(textObject->font().bold(), false);
+        QCOMPARE(textObject->font().italic(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nText { font.family: \"\"; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE(textObject->font().family(), QString(""));
+    }
+}
+
+void tst_qmlgraphicstext::style()
+{
+    //test style
+    for (int i = 0; i < styles.size(); i++)
+    { 
+        QString componentStr = "import Qt 4.6\nText { style: \"" + styleStrings.at(i) + "\"; styleColor: \"white\"; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE((int)textObject->style(), (int)styles.at(i));
+        QCOMPARE(textObject->styleColor(), QColor("white"));
+    }
+}
+
+void tst_qmlgraphicstext::color()
+{
+    //test style
+    for (int i = 0; i < colorStrings.size(); i++)
+    { 
+        QString componentStr = "import Qt 4.6\nText { color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE(textObject->color(), QColor(colorStrings.at(i)));
+        QCOMPARE(textObject->styleColor(), QColor());
+    }
+
+    for (int i = 0; i < colorStrings.size(); i++)
+    { 
+        QString componentStr = "import Qt 4.6\nText { styleColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE(textObject->styleColor(), QColor(colorStrings.at(i)));
+        // default color to black?
+        QCOMPARE(textObject->color(), QColor("black"));
+    }
+    
+    for (int i = 0; i < colorStrings.size(); i++)
+    { 
+        for (int j = 0; j < colorStrings.size(); j++)
+        {
+            QString componentStr = "import Qt 4.6\nText { color: \"" + colorStrings.at(i) + "\"; styleColor: \"" + colorStrings.at(j) + "\"; text: \"Hello World\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+            QCOMPARE(textObject->color(), QColor(colorStrings.at(i)));
+            QCOMPARE(textObject->styleColor(), QColor(colorStrings.at(j)));
+        }
+    }
+    {
+        QString colorStr = "#AA001234";
+        QColor testColor("#001234");
+        testColor.setAlpha(170);
+
+        QString componentStr = "import Qt 4.6\nText { color: \"" + colorStr + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QCOMPARE(textObject->color(), testColor);
+    }
+}
+
+void tst_qmlgraphicstext::smooth()
+{
+    for (int i = 0; i < standard.size(); i++)
+    {
+        {
+            QString componentStr = "import Qt 4.6\nText { smooth: true; text: \"" + standard.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+            QCOMPARE(textObject->smooth(), true);
+        }
+        {
+            QString componentStr = "import Qt 4.6\nText { text: \"" + standard.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+            QCOMPARE(textObject->smooth(), false);
+        }
+    }
+    for (int i = 0; i < richText.size(); i++)
+    {
+        {
+            QString componentStr = "import Qt 4.6\nText { smooth: true; text: \"" + richText.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+            QCOMPARE(textObject->smooth(), true);
+        }
+        {
+            QString componentStr = "import Qt 4.6\nText { text: \"" + richText.at(i) + "\" }";
+            QDeclarativeComponent textComponent(&engine);
+            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+            QCOMPARE(textObject->smooth(), false);
+        }
+    }
+}
+
+void tst_qmlgraphicstext::weight()
+{
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE((int)textObject->font().weight(), (int)QDeclarativeFontValueType::Normal);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { font.weight: \"Bold\"; text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE((int)textObject->font().weight(), (int)QDeclarativeFontValueType::Bold);
+    }
+}
+
+void tst_qmlgraphicstext::underline()
+{
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().underline(), false);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { font.underline: true; text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().underline(), true);
+    }
+}
+
+void tst_qmlgraphicstext::overline()
+{
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().overline(), false);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { font.overline: true; text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().overline(), true);
+    }
+}
+
+void tst_qmlgraphicstext::strikeout()
+{
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().strikeOut(), false);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { font.strikeout: true; text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().strikeOut(), true);
+    }
+}
+
+void tst_qmlgraphicstext::capitalization()
+{
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::MixedCase);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"AllUppercase\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::AllUppercase);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"AllLowercase\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::AllLowercase);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"SmallCaps\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::SmallCaps);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"Capitalize\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::Capitalize);
+    }
+}
+
+void tst_qmlgraphicstext::letterSpacing()
+{
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().letterSpacing(), 0.0);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.letterSpacing: -50 }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().letterSpacing(), -50.);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.letterSpacing: 200 }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().letterSpacing(), 200.);
+    }
+}
+
+void tst_qmlgraphicstext::wordSpacing()
+{
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().wordSpacing(), 0.0);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.wordSpacing: -50 }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().wordSpacing(), -50.);
+    }
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.wordSpacing: 200 }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QCOMPARE(textObject->font().wordSpacing(), 200.);
+    }
+}
+
+class EventSender : public QGraphicsItem
+{
+public:
+    void sendEvent(QEvent *event) { sceneEvent(event); }
+};
+
+class LinkTest : public QObject
+{
+    Q_OBJECT
+public:
+    LinkTest() {}
+
+    QString link;
+
+public slots:
+    void linkClicked(QString l) { link = l; }
+};
+
+void tst_qmlgraphicstext::clickLink()
+{
+    {
+        QString componentStr = "import Qt 4.6\nText { text: \"<a href=\\\"http://qt.nokia.com\\\">Hello world!</a>\" }";
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+
+        LinkTest test;
+        QObject::connect(textObject, SIGNAL(linkActivated(QString)), &test, SLOT(linkClicked(QString)));
+
+        {
+            QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMousePress);
+            me.setPos(QPointF(textObject->x()/2, textObject->y()/2));
+            me.setButton(Qt::LeftButton);
+            static_cast<EventSender*>(static_cast<QGraphicsItem*>(textObject))->sendEvent(&me);
+        }
+
+        {
+            QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMouseRelease);
+            me.setPos(QPointF(textObject->x()/2, textObject->y()/2));
+            me.setButton(Qt::LeftButton);
+            static_cast<EventSender*>(static_cast<QGraphicsItem*>(textObject))->sendEvent(&me);
+        }
+
+        QCOMPARE(test.link, QLatin1String("http://qt.nokia.com"));
+    }
+}
+
+QTEST_MAIN(tst_qmlgraphicstext)
+
+#include "tst_qdeclarativetext.moc"
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml b/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml
new file mode 100644
index 0000000..e5df8f1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+Rectangle { width: 300; height: 300; color: "white"
+    TextEdit {  text: "Hello world!"; id: textEditObject; objectName: "textEditObject"
+        resources: [ Component { id:cursor; Item { id:cursorInstance; objectName: "cursorInstance" } } ] 
+        cursorDelegate: cursor
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml
new file mode 100644
index 0000000..34b3883
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+Item{
+    Fungus{
+        palatable: false;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml
new file mode 100644
index 0000000..718cb71
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Item {
+    objectName: "delegateOkay"
+    Rectangle { }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml
new file mode 100644
index 0000000..3c31e11
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml
@@ -0,0 +1,22 @@
+import Qt 4.6
+
+Rectangle { width: 300; height: 300; color: "white"
+    resources: [ 
+        Component { id:cursorFail; FailItem { objectName: "delegateFail" } },
+        Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
+        Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } },
+        Component { id:cursorErr; ErrItem { objectName: "delegateErrorA" } }
+    ] 
+    TextEdit {
+        cursorDelegate: cursorFail
+    }
+    TextEdit {
+        cursorDelegate: cursorWait
+    }
+    TextEdit {
+        cursorDelegate: cursorNorm
+    }
+    TextEdit {
+        cursorDelegate: cursorErr
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml
new file mode 100644
index 0000000..a44aec2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Rectangle { width: 300; height: 300; color: "white"
+    resources: [ 
+        Component { id:cursorFail; FailItem { objectName: "delegateFail" } },
+        Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
+        Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } }
+    ] 
+    TextEdit {
+        cursorDelegate: cursorFail
+    }
+    TextEdit {
+        cursorDelegate: cursorWait
+    }
+    TextEdit {
+        cursorDelegate: cursorNorm
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml
new file mode 100644
index 0000000..57d3e47
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Rectangle { width: 300; height: 300; color: "white"
+    resources: [ 
+        Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
+        Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } },
+        Component { id:cursorErr; ErrItem { objectName: "delegateErrorA" } }
+    ] 
+    TextEdit {
+        cursorDelegate: cursorWait
+    }
+    TextEdit {
+        cursorDelegate: cursorNorm
+    }
+    TextEdit {
+        cursorDelegate: cursorErr
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml
new file mode 100644
index 0000000..a44e867
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Rectangle { width: 300; height: 300; color: "white"
+    resources: [ 
+        Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
+        Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } }
+    ] 
+    TextEdit {
+        cursorDelegate: cursorWait
+        text: "Hello"
+    }
+    TextEdit {
+        objectName: "textEditObject"
+        cursorDelegate: cursorNorm
+        focus: true;
+        text: "Hello"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml
new file mode 100644
index 0000000..ddbf526
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Item {
+    Rectangle { }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml
new file mode 100644
index 0000000..ddbf526
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Item {
+    Rectangle { }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml b/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml
new file mode 100644
index 0000000..c3d4c16
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+TextEdit {  
+    text: "Hello world!"
+    inputMethodHints: Qt.ImhNoPredictiveText
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml b/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
new file mode 100644
index 0000000..8d7dbbc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+Rectangle {
+    property var myInput: input
+
+    width: 800; height: 600; color: "blue"
+
+    Item { 
+        id: firstItem;
+        KeyNavigation.right: input
+    }
+
+    TextEdit { id: input; focus: true
+        KeyNavigation.left: firstItem
+        KeyNavigation.right: lastItem
+        KeyNavigation.up: firstItem
+        KeyNavigation.down: lastItem
+    }
+    Item {
+        id: lastItem 
+        KeyNavigation.left: input
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml b/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
new file mode 100644
index 0000000..103a627
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+
+Rectangle {
+    property var myInput: input
+
+    width: 800; height: 600; color: "blue"
+
+    TextEdit { id: input; focus: true
+        readOnly: true
+        text: "I am the very model of a modern major general.\n"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro
new file mode 100644
index 0000000..2228f11
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui network
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativetextedit.cpp ../shared/testhttpserver.cpp
+HEADERS += ../shared/testhttpserver.h
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
new file mode 100644
index 0000000..e08783f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -0,0 +1,791 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include "../../../shared/util.h"
+#include "../shared/testhttpserver.h"
+#include <math.h>
+#include <QFile>
+#include <QTextDocument>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtDeclarative/qdeclarativeexpression.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetextedit_p.h>
+#include <QFontMetrics>
+#include <QDeclarativeView>
+#include <QStyle>
+#include <QInputContext>
+
+class tst_qmlgraphicstextedit : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicstextedit();
+
+private slots:
+    void text();
+    void width();
+    void wrap();
+    void textFormat();
+
+    // ### these tests may be trivial    
+    void hAlign();
+    void vAlign();
+    void font();
+    void color();
+    void textMargin();
+    void persistentSelection();
+    void focusOnPress();
+    void selection();
+    void inputMethodHints();
+
+    void cursorDelegate();
+    void delegateLoading();
+    void navigation();
+    void readOnly();
+    void sendRequestSoftwareInputPanelEvent();
+
+private:
+    void simulateKey(QDeclarativeView *, int key);
+    QDeclarativeView *createView(const QString &filename);
+
+    QStringList standard;
+    QStringList richText;
+
+    QStringList hAlignmentStrings;
+    QStringList vAlignmentStrings;
+
+    QList<Qt::Alignment> vAlignments;
+    QList<Qt::Alignment> hAlignments;
+
+    QStringList colorStrings;
+
+    QDeclarativeEngine engine;
+};
+
+tst_qmlgraphicstextedit::tst_qmlgraphicstextedit()
+{
+    standard << "the quick brown fox jumped over the lazy dog"
+             << "the quick brown fox\n jumped over the lazy dog";
+
+    richText << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a> jumped over the <b>lazy</b> dog</i>"
+             << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a><br>jumped over the <b>lazy</b> dog</i>";
+
+    hAlignmentStrings << "AlignLeft"
+                      << "AlignRight"
+                      << "AlignHCenter";
+
+    vAlignmentStrings << "AlignTop"
+                      << "AlignBottom"
+                      << "AlignVCenter";
+
+    hAlignments << Qt::AlignLeft
+                << Qt::AlignRight
+                << Qt::AlignHCenter;
+
+    vAlignments << Qt::AlignTop
+                << Qt::AlignBottom
+                << Qt::AlignVCenter;
+
+    colorStrings << "aliceblue"
+                 << "antiquewhite"
+                 << "aqua"
+                 << "darkkhaki"
+                 << "darkolivegreen"
+                 << "dimgray"
+                 << "palevioletred"
+                 << "lightsteelblue"
+                 << "#000000"
+                 << "#AAAAAA"
+                 << "#FFFFFF"
+                 << "#2AC05F";
+                 //
+                 // need a different test to do alpha channel test
+                 // << "#AA0011DD"
+                 // << "#00F16B11";
+                 // 
+}
+
+void tst_qmlgraphicstextedit::text()
+{
+    {
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData("import Qt 4.6\nTextEdit {  text: \"\"  }", QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->text(), QString(""));
+    }
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + standard.at(i) + "\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->text(), standard.at(i));
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + richText.at(i) + "\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QString actual = textEditObject->text();
+        QString expected = richText.at(i);
+        actual.replace(QRegExp(".*<body[^>]*>"),"");
+        actual.replace(QRegExp("(<[^>]*>)+"),"<>");
+        expected.replace(QRegExp("(<[^>]*>)+"),"<>");
+        QCOMPARE(actual.simplified(),expected.simplified());
+    }
+}
+
+void tst_qmlgraphicstextedit::width()
+{
+    // uses Font metrics to find the width for standard and document to find the width for rich
+    {
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData("import Qt 4.6\nTextEdit {  text: \"\" }", QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->width(), 1.);//+1 for cursor
+    }
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        QFont f;
+        QFontMetricsF fm(f);
+        qreal metricWidth = fm.size(Qt::TextExpandTabs && Qt::TextShowMnemonic, standard.at(i)).width();
+        metricWidth = floor(metricWidth);
+
+        QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + standard.at(i) + "\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->width(), qreal(metricWidth + 1 + 3));//+3 is the current way of accounting for space between cursor and last character.
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        QTextDocument document;
+        document.setHtml(richText.at(i));
+        document.setDocumentMargin(0);
+
+        int documentWidth = document.idealWidth();
+
+        QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + richText.at(i) + "\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->width(), qreal(documentWidth + 1 + 3));
+    }
+}
+
+void tst_qmlgraphicstextedit::wrap()
+{
+    // for specified width and wrap set true
+    {
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData("import Qt 4.6\nTextEdit {  text: \"\"; wrap: true; width: 300 }", QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->width(), 300.);
+    }
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit {  wrap: true; width: 300; text: \"" + standard.at(i) + "\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->width(), 300.);
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit {  wrap: true; width: 300; text: \"" + richText.at(i) + "\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->width(), 300.);
+    }
+
+}
+
+void tst_qmlgraphicstextedit::textFormat()
+{
+    {
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData("import Qt 4.6\nTextEdit { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
+        QDeclarativeTextEdit *textObject = qobject_cast<QDeclarativeTextEdit*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QVERIFY(textObject->textFormat() == QDeclarativeTextEdit::RichText);
+    }
+    {
+        QDeclarativeComponent textComponent(&engine);
+        textComponent.setData("import Qt 4.6\nTextEdit { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
+        QDeclarativeTextEdit *textObject = qobject_cast<QDeclarativeTextEdit*>(textComponent.create());
+
+        QVERIFY(textObject != 0);
+        QVERIFY(textObject->textFormat() == QDeclarativeTextEdit::PlainText);
+    }
+}
+
+//the alignment tests may be trivial o.oa
+void tst_qmlgraphicstextedit::hAlign()
+{
+    //test one align each, and then test if two align fails.
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        for (int j=0; j < hAlignmentStrings.size(); j++)
+        {
+            QString componentStr = "import Qt 4.6\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
+            QDeclarativeComponent texteditComponent(&engine);
+            texteditComponent.setData(componentStr.toLatin1(), QUrl());
+            QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+            QVERIFY(textEditObject != 0);
+            QCOMPARE((int)textEditObject->hAlign(), (int)hAlignments.at(j));
+        }
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        for (int j=0; j < hAlignmentStrings.size(); j++)
+        {
+            QString componentStr = "import Qt 4.6\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
+            QDeclarativeComponent texteditComponent(&engine);
+            texteditComponent.setData(componentStr.toLatin1(), QUrl());
+            QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+            QVERIFY(textEditObject != 0);
+            QCOMPARE((int)textEditObject->hAlign(), (int)hAlignments.at(j));
+        }
+    }
+
+}
+
+void tst_qmlgraphicstextedit::vAlign()
+{
+    //test one align each, and then test if two align fails.
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        for (int j=0; j < vAlignmentStrings.size(); j++)
+        {
+            QString componentStr = "import Qt 4.6\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
+            QDeclarativeComponent texteditComponent(&engine);
+            texteditComponent.setData(componentStr.toLatin1(), QUrl());
+            QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+            QVERIFY(textEditObject != 0);
+            QCOMPARE((int)textEditObject->vAlign(), (int)vAlignments.at(j));
+        }
+    }
+
+    for (int i = 0; i < richText.size(); i++)
+    {
+        for (int j=0; j < vAlignmentStrings.size(); j++)
+        {
+            QString componentStr = "import Qt 4.6\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
+            QDeclarativeComponent texteditComponent(&engine);
+            texteditComponent.setData(componentStr.toLatin1(), QUrl());
+            QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+            QVERIFY(textEditObject != 0);
+            QCOMPARE((int)textEditObject->vAlign(), (int)vAlignments.at(j));
+        }
+    }
+
+}
+
+void tst_qmlgraphicstextedit::font()
+{
+    //test size, then bold, then italic, then family
+    { 
+        QString componentStr = "import Qt 4.6\nTextEdit {  font.pointSize: 40; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->font().pointSize(), 40);
+        QCOMPARE(textEditObject->font().bold(), false);
+        QCOMPARE(textEditObject->font().italic(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nTextEdit {  font.bold: true; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->font().bold(), true);
+        QCOMPARE(textEditObject->font().italic(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nTextEdit {  font.italic: true; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->font().italic(), true);
+        QCOMPARE(textEditObject->font().bold(), false);
+    }
+ 
+    { 
+        QString componentStr = "import Qt 4.6\nTextEdit {  font.family: \"Helvetica\"; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->font().family(), QString("Helvetica"));
+        QCOMPARE(textEditObject->font().bold(), false);
+        QCOMPARE(textEditObject->font().italic(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nTextEdit {  font.family: \"\"; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->font().family(), QString(""));
+    }
+}
+
+void tst_qmlgraphicstextedit::color()
+{
+    //test normal
+    for (int i = 0; i < colorStrings.size(); i++)
+    { 
+        QString componentStr = "import Qt 4.6\nTextEdit {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+        //qDebug() << "textEditObject: " << textEditObject->color() << "vs. " << QColor(colorStrings.at(i));
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->color(), QColor(colorStrings.at(i)));
+    }
+
+    //test selection
+    for (int i = 0; i < colorStrings.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->selectionColor(), QColor(colorStrings.at(i)));
+    }
+
+    //test selected text
+    for (int i = 0; i < colorStrings.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->selectedTextColor(), QColor(colorStrings.at(i)));
+    }
+
+    {
+        QString colorStr = "#AA001234";
+        QColor testColor("#001234");
+        testColor.setAlpha(170);
+
+        QString componentStr = "import Qt 4.6\nTextEdit {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->color(), testColor);
+    }
+}
+
+void tst_qmlgraphicstextedit::textMargin()
+{
+    for(qreal i=0; i<=10; i+=0.3){
+        QString componentStr = "import Qt 4.6\nTextEdit {  textMargin: " + QString::number(i) + "; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->textMargin(), i);
+    }
+}
+
+void tst_qmlgraphicstextedit::persistentSelection()
+{
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit {  persistentSelection: true; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->persistentSelection(), true);
+    }
+
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit {  persistentSelection: false; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->persistentSelection(), false);
+    }
+}
+
+void tst_qmlgraphicstextedit::focusOnPress()
+{
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit {  focusOnPress: true; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->focusOnPress(), true);
+    }
+
+    {
+        QString componentStr = "import Qt 4.6\nTextEdit {  focusOnPress: false; text: \"Hello World\" }";
+        QDeclarativeComponent texteditComponent(&engine);
+        texteditComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+        QVERIFY(textEditObject != 0);
+        QCOMPARE(textEditObject->focusOnPress(), false);
+    }
+}
+
+void tst_qmlgraphicstextedit::selection()
+{
+    QString testStr = standard[0];//TODO: What should happen for multiline/rich text?
+    QString componentStr = "import Qt 4.6\nTextEdit {  text: \""+ testStr +"\"; }";
+    QDeclarativeComponent texteditComponent(&engine);
+    texteditComponent.setData(componentStr.toLatin1(), QUrl());
+    QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+    QVERIFY(textEditObject != 0);
+
+
+    //Test selection follows cursor
+    for(int i=0; i<= testStr.size(); i++) {
+        textEditObject->setCursorPosition(i);
+        QCOMPARE(textEditObject->cursorPosition(), i);
+        QCOMPARE(textEditObject->selectionStart(), i);
+        QCOMPARE(textEditObject->selectionEnd(), i);
+        QVERIFY(textEditObject->selectedText().isNull());
+    }
+
+    textEditObject->setCursorPosition(0);
+    QVERIFY(textEditObject->cursorPosition() == 0);
+    QVERIFY(textEditObject->selectionStart() == 0);
+    QVERIFY(textEditObject->selectionEnd() == 0);
+    QVERIFY(textEditObject->selectedText().isNull());
+
+    //Test selection
+    for(int i=0; i<= testStr.size(); i++) {
+        textEditObject->setSelectionEnd(i);
+        QCOMPARE(testStr.mid(0,i), textEditObject->selectedText());
+    }
+    for(int i=0; i<= testStr.size(); i++) {
+        textEditObject->setSelectionStart(i);
+        QCOMPARE(testStr.mid(i,testStr.size()-i), textEditObject->selectedText());
+    }
+
+    textEditObject->setCursorPosition(0);
+    QVERIFY(textEditObject->cursorPosition() == 0);
+    QVERIFY(textEditObject->selectionStart() == 0);
+    QVERIFY(textEditObject->selectionEnd() == 0);
+    QVERIFY(textEditObject->selectedText().isNull());
+
+    for(int i=0; i< testStr.size(); i++) {
+        textEditObject->setSelectionStart(i);
+        QCOMPARE(textEditObject->selectionEnd(), i);
+        QCOMPARE(testStr.mid(i,0), textEditObject->selectedText());
+        textEditObject->setSelectionEnd(i+1);
+        QCOMPARE(textEditObject->selectionStart(), i);
+        QCOMPARE(testStr.mid(i,1), textEditObject->selectedText());
+    }
+
+    for(int i= testStr.size() - 1; i>0; i--) {
+        textEditObject->setSelectionEnd(i);
+        QCOMPARE(testStr.mid(i,0), textEditObject->selectedText());
+        textEditObject->setSelectionStart(i-1);
+        QCOMPARE(testStr.mid(i-1,1), textEditObject->selectedText());
+    }
+
+    //Test Error Ignoring behaviour
+    textEditObject->setCursorPosition(0);
+    QVERIFY(textEditObject->selectedText().isNull());
+    textEditObject->setSelectionStart(-10);
+    QVERIFY(textEditObject->selectedText().isNull());
+    textEditObject->setSelectionStart(100);
+    QVERIFY(textEditObject->selectedText().isNull());
+    textEditObject->setSelectionEnd(-10);
+    QVERIFY(textEditObject->selectedText().isNull());
+    textEditObject->setSelectionEnd(100);
+    QVERIFY(textEditObject->selectedText().isNull());
+    textEditObject->setSelectionStart(0);
+    textEditObject->setSelectionEnd(10);
+    QVERIFY(textEditObject->selectedText().size() == 10);
+    textEditObject->setSelectionStart(-10);
+    QVERIFY(textEditObject->selectedText().size() == 10);
+    textEditObject->setSelectionStart(100);
+    QVERIFY(textEditObject->selectedText().size() == 10);
+    textEditObject->setSelectionEnd(-10);
+    QVERIFY(textEditObject->selectedText().size() == 10);
+    textEditObject->setSelectionEnd(100);
+    QVERIFY(textEditObject->selectedText().size() == 10);
+}
+
+void tst_qmlgraphicstextedit::inputMethodHints()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
+    canvas->show();
+    canvas->setFocus();
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit *>(canvas->rootObject());
+    QVERIFY(textEditObject != 0);
+    QVERIFY(textEditObject->inputMethodHints() & Qt::ImhNoPredictiveText);
+    textEditObject->setInputMethodHints(Qt::ImhUppercaseOnly);
+    QVERIFY(textEditObject->inputMethodHints() & Qt::ImhUppercaseOnly);
+}
+
+void tst_qmlgraphicstextedit::cursorDelegate()
+{
+    QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml");
+    view->show();
+    view->setFocus();
+    QDeclarativeTextEdit *textEditObject = view->rootObject()->findChild<QDeclarativeTextEdit*>("textEditObject");
+    QVERIFY(textEditObject != 0);
+    QVERIFY(textEditObject->findChild<QDeclarativeItem*>("cursorInstance"));
+    //Test Delegate gets created
+    textEditObject->setFocus(true);
+    QDeclarativeItem* delegateObject = textEditObject->findChild<QDeclarativeItem*>("cursorInstance");
+    QVERIFY(delegateObject);
+    //Test Delegate gets moved
+    for(int i=0; i<= textEditObject->text().length(); i++){
+        textEditObject->setCursorPosition(i);
+        QCOMPARE(textEditObject->cursorRect().x(), qRound(delegateObject->x()));
+        QCOMPARE(textEditObject->cursorRect().y(), qRound(delegateObject->y()));
+    }
+    textEditObject->setCursorPosition(0);
+    QCOMPARE(textEditObject->cursorRect().x(), qRound(delegateObject->x()));
+    QCOMPARE(textEditObject->cursorRect().y(), qRound(delegateObject->y()));
+    //Test Delegate gets deleted
+    textEditObject->setCursorDelegate(0);
+    QVERIFY(!textEditObject->findChild<QDeclarativeItem*>("cursorInstance"));
+}
+
+void tst_qmlgraphicstextedit::delegateLoading()
+{
+    TestHTTPServer server(42332);
+    server.serveDirectory(SRCDIR "/data/httpfail", TestHTTPServer::Disconnect);
+    server.serveDirectory(SRCDIR "/data/httpslow", TestHTTPServer::Delay);
+    server.serveDirectory(SRCDIR "/data/http");
+    QDeclarativeView* view = new QDeclarativeView(0);
+    view->setSource(QUrl("http://localhost:42332/cursorHttpTestPass.qml"));
+    view->show();
+    view->setFocus();
+    QTRY_VERIFY(view->rootObject());//Wait for loading to finish.
+    QDeclarativeTextEdit *textEditObject = view->rootObject()->findChild<QDeclarativeTextEdit*>("textEditObject");
+    //    view->rootObject()->dumpObjectTree();
+    QVERIFY(textEditObject != 0);
+    textEditObject->setFocus(true);
+    QDeclarativeItem *delegate;
+    delegate = view->rootObject()->findChild<QDeclarativeItem*>("delegateOkay");
+    QVERIFY(delegate);
+    delegate = view->rootObject()->findChild<QDeclarativeItem*>("delegateSlow");
+    QVERIFY(delegate);
+    view->setSource(QUrl("http://localhost:42332/cursorHttpTestFail1.qml"));
+    view->show();
+    view->setFocus();
+    QTRY_VERIFY(!view->rootObject()); // there is fail item inside this test
+    view->setSource(QUrl("http://localhost:42332/cursorHttpTestFail2.qml"));
+    view->show();
+    view->setFocus();
+    QTRY_VERIFY(!view->rootObject()); // there is fail item inside this test
+    //ErrorB should get a component which is ready but component.create() returns null
+    //Not sure how to accomplish this with QDeclarativeTextEdits cursor delegate
+    //###This could be a case of overzealous defensive programming
+    //delegate = view->rootObject()->findChild<QDeclarativeItem*>("delegateErrorB");
+    //QVERIFY(!delegate);
+}
+
+/*
+TextEdit element should only handle left/right keys until the cursor reaches
+the extent of the text, then they should ignore the keys.
+*/
+void tst_qmlgraphicstextedit::navigation()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml");
+    canvas->show();
+    canvas->setFocus();
+
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeItem *input = qobject_cast<QDeclarativeItem *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
+
+    QVERIFY(input != 0);
+    QTRY_VERIFY(input->hasFocus() == true);
+    simulateKey(canvas, Qt::Key_Left);
+    QVERIFY(input->hasFocus() == false);
+    simulateKey(canvas, Qt::Key_Right);
+    QVERIFY(input->hasFocus() == true);
+    simulateKey(canvas, Qt::Key_Right);
+    QVERIFY(input->hasFocus() == false);
+    simulateKey(canvas, Qt::Key_Left);
+    QVERIFY(input->hasFocus() == true);
+}
+
+void tst_qmlgraphicstextedit::readOnly()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml");
+    canvas->show();
+    canvas->setFocus();
+
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeTextEdit *edit = qobject_cast<QDeclarativeTextEdit *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
+
+    QVERIFY(edit != 0);
+    QTRY_VERIFY(edit->hasFocus() == true);
+    QVERIFY(edit->isReadOnly() == true);
+    QString initial = edit->text();
+    for(int k=Qt::Key_0; k<=Qt::Key_Z; k++)
+        simulateKey(canvas, k);
+    simulateKey(canvas, Qt::Key_Return);
+    simulateKey(canvas, Qt::Key_Space);
+    simulateKey(canvas, Qt::Key_Escape);
+    QCOMPARE(edit->text(), initial);
+}
+
+void tst_qmlgraphicstextedit::simulateKey(QDeclarativeView *view, int key)
+{
+    QKeyEvent press(QKeyEvent::KeyPress, key, 0);
+    QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
+
+    QApplication::sendEvent(view, &press);
+    QApplication::sendEvent(view, &release);
+}
+
+QDeclarativeView *tst_qmlgraphicstextedit::createView(const QString &filename)
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+
+    canvas->setSource(QUrl::fromLocalFile(filename));
+    return canvas;
+}
+
+class MyInputContext : public QInputContext
+{
+public:
+    MyInputContext() : softwareInputPanelEventReceived(false) {}
+    ~MyInputContext() {}
+
+    QString identifierName() { return QString(); }
+    QString language() { return QString(); }
+
+    void reset() {}
+
+    bool isComposing() const { return false; }
+
+    bool filterEvent( const QEvent *event )
+    {
+        if (event->type() == QEvent::RequestSoftwareInputPanel)
+            softwareInputPanelEventReceived = true;
+        return QInputContext::filterEvent(event);
+    }
+    bool softwareInputPanelEventReceived;
+};
+
+void tst_qmlgraphicstextedit::sendRequestSoftwareInputPanelEvent()
+{
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    MyInputContext ic;
+    view.viewport()->setInputContext(&ic);
+    QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel(
+            view.style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
+    if ((behavior != QStyle::RSIP_OnMouseClick))
+        QSKIP("This test need to have a style with RSIP_OnMouseClick", SkipSingle);
+    QDeclarativeTextEdit edit;
+    edit.setText("Hello world");
+    edit.setPos(0, 0);
+    scene.addItem(&edit);
+    view.show();
+    qApp->setAutoSipEnabled(true);
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(edit.scenePos()));
+    QApplication::processEvents();
+    QCOMPARE(ic.softwareInputPanelEventReceived, true);
+}
+QTEST_MAIN(tst_qmlgraphicstextedit)
+
+#include "tst_qdeclarativetextedit.moc"
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml b/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml
new file mode 100644
index 0000000..ddc98cc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+Rectangle { width: 300; height: 300; color: "white"
+    TextInput {  text: "Hello world!"; id: textInputObject; objectName: "textInputObject"
+        resources: [ Component { id:cursor; Item { id:cursorInstance; objectName: "cursorInstance";} } ] 
+        cursorDelegate: cursor
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/inputmethodhints.qml b/tests/auto/declarative/qdeclarativetextinput/data/inputmethodhints.qml
new file mode 100644
index 0000000..b404682
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/inputmethodhints.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+TextInput {
+    text: "Hello world!"
+    inputMethodHints: Qt.ImhNoPredictiveText
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/masks.qml b/tests/auto/declarative/qdeclarativetextinput/data/masks.qml
new file mode 100644
index 0000000..08a857c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/masks.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+TextInput{
+    focus: true
+    objectName: "myInput"
+    inputMask: "HHHHhhhh; "
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml b/tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml
new file mode 100644
index 0000000..7cbeadd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+TextInput{
+    focus: true
+    objectName: "myInput"
+    maximumLength: 10
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
new file mode 100644
index 0000000..493db5b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
@@ -0,0 +1,24 @@
+import Qt 4.6
+
+Rectangle {
+    property var myInput: input
+
+    width: 800; height: 600; color: "blue"
+
+    Item { 
+        id: firstItem;
+        KeyNavigation.right: input
+    }
+
+    TextInput { id: input; focus: true
+        text: "Needs some text"
+        KeyNavigation.left: firstItem
+        KeyNavigation.right: lastItem
+        KeyNavigation.up: firstItem
+        KeyNavigation.down: lastItem
+    }
+    Item {
+        id: lastItem 
+        KeyNavigation.left: input
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
new file mode 100644
index 0000000..c47371a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+
+Rectangle {
+    property var myInput: input
+
+    width: 800; height: 600; color: "blue"
+
+    TextInput { id: input; focus: true
+        readOnly: true
+        text: "I am the very model of a modern major general.\n"
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
new file mode 100644
index 0000000..0c81548
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
@@ -0,0 +1,23 @@
+import Qt 4.7
+
+Item {
+    property var intInput: intInput
+    property var dblInput: dblInput
+    property var strInput: strInput
+
+    width: 800; height: 600;
+
+    Column{
+        TextInput { id: intInput;
+            validator: QIntValidator{top: 11; bottom: 2}
+        }
+        TextInput { id: dblInput;
+            validator: QDoubleValidator{top: 12.12; bottom: 2.93; decimals: 2; notation: QDoubleValidator.StandardNotation}
+        }
+        TextInput { id: strInput;
+            //Requires QTBUG-8025 to be implemented first
+            //validator: QRegExpValidator { regExp: /[a-zA-z]{2,4}/;}
+        }
+    }
+        
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro
new file mode 100644
index 0000000..5aed51f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativetextinput.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
new file mode 100644
index 0000000..5b98455
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -0,0 +1,656 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QFile>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativetextinput_p.h>
+#include <QDebug>
+#include <QStyle>
+#include <QInputContext>
+
+class tst_qmlgraphicstextinput : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicstextinput();
+
+private slots:
+    void text();
+    void width();
+    void font();
+    void color();
+    void selection();
+
+    void maxLength();
+    void masks();
+    void validators();
+    void inputMethodHints();
+
+    void cursorDelegate();
+    void navigation();
+    void readOnly();
+
+    void sendRequestSoftwareInputPanelEvent();
+
+private:
+    void simulateKey(QDeclarativeView *, int key);
+    QDeclarativeView *createView(const QString &filename);
+
+    QDeclarativeEngine engine;
+    QStringList standard;
+    QStringList colorStrings;
+};
+
+tst_qmlgraphicstextinput::tst_qmlgraphicstextinput()
+{
+    standard << "the quick brown fox jumped over the lazy dog"
+        << "It's supercalifragisiticexpialidocious!"
+        << "Hello, world!";
+
+    colorStrings << "aliceblue"
+                 << "antiquewhite"
+                 << "aqua"
+                 << "darkkhaki"
+                 << "darkolivegreen"
+                 << "dimgray"
+                 << "palevioletred"
+                 << "lightsteelblue"
+                 << "#000000"
+                 << "#AAAAAA"
+                 << "#FFFFFF"
+                 << "#2AC05F";
+}
+
+void tst_qmlgraphicstextinput::text()
+{
+    {
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData("import Qt 4.6\nTextInput {  text: \"\"  }", QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->text(), QString(""));
+    }
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nTextInput { text: \"" + standard.at(i) + "\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->text(), standard.at(i));
+    }
+
+}
+
+void tst_qmlgraphicstextinput::width()
+{
+    // uses Font metrics to find the width for standard
+    {
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData("import Qt 4.6\nTextInput {  text: \"\" }", QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->width(), 1.);//1 for the cursor
+    }
+
+    for (int i = 0; i < standard.size(); i++)
+    {
+        QFont f;
+        QFontMetricsF fm(f);
+        qreal metricWidth = fm.width(standard.at(i));
+
+        QString componentStr = "import Qt 4.6\nTextInput { text: \"" + standard.at(i) + "\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->width(), qreal(metricWidth) + 1.);//1 for the cursor
+    }
+}
+
+void tst_qmlgraphicstextinput::font()
+{
+    //test size, then bold, then italic, then family
+    { 
+        QString componentStr = "import Qt 4.6\nTextInput {  font.pointSize: 40; text: \"Hello World\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->font().pointSize(), 40);
+        QCOMPARE(textinputObject->font().bold(), false);
+        QCOMPARE(textinputObject->font().italic(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nTextInput {  font.bold: true; text: \"Hello World\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->font().bold(), true);
+        QCOMPARE(textinputObject->font().italic(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nTextInput {  font.italic: true; text: \"Hello World\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->font().italic(), true);
+        QCOMPARE(textinputObject->font().bold(), false);
+    }
+ 
+    { 
+        QString componentStr = "import Qt 4.6\nTextInput {  font.family: \"Helvetica\"; text: \"Hello World\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->font().family(), QString("Helvetica"));
+        QCOMPARE(textinputObject->font().bold(), false);
+        QCOMPARE(textinputObject->font().italic(), false);
+    }
+
+    { 
+        QString componentStr = "import Qt 4.6\nTextInput {  font.family: \"\"; text: \"Hello World\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->font().family(), QString(""));
+    }
+}
+
+void tst_qmlgraphicstextinput::color()
+{
+    //test color
+    for (int i = 0; i < colorStrings.size(); i++)
+    { 
+        QString componentStr = "import Qt 4.6\nTextInput {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->color(), QColor(colorStrings.at(i)));
+    }
+
+    //test selection color
+    for (int i = 0; i < colorStrings.size(); i++)
+    {
+        QString componentStr = "import Qt 4.6\nTextInput {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->selectionColor(), QColor(colorStrings.at(i)));
+    }
+
+    //test selected text color
+    for (int i = 0; i < colorStrings.size(); i++)
+    { 
+        QString componentStr = "import Qt 4.6\nTextInput {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->selectedTextColor(), QColor(colorStrings.at(i)));
+    }
+
+    {
+        QString colorStr = "#AA001234";
+        QColor testColor("#001234");
+        testColor.setAlpha(170);
+
+        QString componentStr = "import Qt 4.6\nTextInput {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
+        QDeclarativeComponent textinputComponent(&engine);
+        textinputComponent.setData(componentStr.toLatin1(), QUrl());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+
+        QVERIFY(textinputObject != 0);
+        QCOMPARE(textinputObject->color(), testColor);
+    }
+}
+
+void tst_qmlgraphicstextinput::selection()
+{
+    QString testStr = standard[0];
+    QString componentStr = "import Qt 4.6\nTextInput {  text: \""+ testStr +"\"; }";
+    QDeclarativeComponent textinputComponent(&engine);
+    textinputComponent.setData(componentStr.toLatin1(), QUrl());
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+    QVERIFY(textinputObject != 0);
+
+
+    //Test selection follows cursor
+    for(int i=0; i<= testStr.size(); i++) {
+        textinputObject->setCursorPosition(i);
+        QCOMPARE(textinputObject->cursorPosition(), i);
+        QCOMPARE(textinputObject->selectionStart(), i);
+        QCOMPARE(textinputObject->selectionEnd(), i);
+        QVERIFY(textinputObject->selectedText().isNull());
+    }
+
+    textinputObject->setCursorPosition(0);
+    QVERIFY(textinputObject->cursorPosition() == 0);
+    QVERIFY(textinputObject->selectionStart() == 0);
+    QVERIFY(textinputObject->selectionEnd() == 0);
+    QVERIFY(textinputObject->selectedText().isNull());
+
+    //Test selection
+    for(int i=0; i<= testStr.size(); i++) {
+        textinputObject->setSelectionEnd(i);
+        QCOMPARE(testStr.mid(0,i), textinputObject->selectedText());
+    }
+    for(int i=0; i<= testStr.size(); i++) {
+        textinputObject->setSelectionStart(i);
+        QCOMPARE(testStr.mid(i,testStr.size()-i), textinputObject->selectedText());
+    }
+
+    textinputObject->setCursorPosition(0);
+    QVERIFY(textinputObject->cursorPosition() == 0);
+    QVERIFY(textinputObject->selectionStart() == 0);
+    QVERIFY(textinputObject->selectionEnd() == 0);
+    QVERIFY(textinputObject->selectedText().isNull());
+
+    for(int i=0; i< testStr.size(); i++) {
+        textinputObject->setSelectionStart(i);
+        QCOMPARE(textinputObject->selectionEnd(), i);
+        QCOMPARE(testStr.mid(i,0), textinputObject->selectedText());
+        textinputObject->setSelectionEnd(i+1);
+        QCOMPARE(textinputObject->selectionStart(), i);
+        QCOMPARE(testStr.mid(i,1), textinputObject->selectedText());
+    }
+
+    for(int i= testStr.size() - 1; i>0; i--) {
+        textinputObject->setSelectionEnd(i);
+        QCOMPARE(testStr.mid(i,0), textinputObject->selectedText());
+        textinputObject->setSelectionStart(i-1);
+        QCOMPARE(testStr.mid(i-1,1), textinputObject->selectedText());
+    }
+
+    //Test Error Ignoring behaviour
+    textinputObject->setCursorPosition(0);
+    QVERIFY(textinputObject->selectedText().isNull());
+    textinputObject->setSelectionStart(-10);
+    QVERIFY(textinputObject->selectedText().isNull());
+    textinputObject->setSelectionStart(100);
+    QVERIFY(textinputObject->selectedText().isNull());
+    textinputObject->setSelectionEnd(-10);
+    QVERIFY(textinputObject->selectedText().isNull());
+    textinputObject->setSelectionEnd(100);
+    QVERIFY(textinputObject->selectedText().isNull());
+    textinputObject->setSelectionStart(0);
+    textinputObject->setSelectionEnd(10);
+    QVERIFY(textinputObject->selectedText().size() == 10);
+    textinputObject->setSelectionStart(-10);
+    QVERIFY(textinputObject->selectedText().size() == 10);
+    textinputObject->setSelectionStart(100);
+    QVERIFY(textinputObject->selectedText().size() == 10);
+    textinputObject->setSelectionEnd(-10);
+    QVERIFY(textinputObject->selectedText().size() == 10);
+    textinputObject->setSelectionEnd(100);
+    QVERIFY(textinputObject->selectedText().size() == 10);
+}
+
+void tst_qmlgraphicstextinput::maxLength()
+{
+    //QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
+    QDeclarativeView *canvas = createView(SRCDIR "/data/maxLength.qml");
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
+    QVERIFY(textinputObject != 0);
+    QVERIFY(textinputObject->text().isEmpty());
+    QVERIFY(textinputObject->maxLength() == 10);
+    foreach(const QString &str, standard){
+        QVERIFY(textinputObject->text().length() <= 10);
+        textinputObject->setText(str);
+        QVERIFY(textinputObject->text().length() <= 10);
+    }
+
+    textinputObject->setText("");
+    QTRY_VERIFY(textinputObject->hasFocus() == true);
+    for(int i=0; i<20; i++){
+        QCOMPARE(textinputObject->text().length(), qMin(i,10));
+        //simulateKey(canvas, Qt::Key_A);
+        QTest::keyPress(canvas, Qt::Key_A);
+        QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
+    }
+}
+
+void tst_qmlgraphicstextinput::masks()
+{
+    //Not a comprehensive test of the possible masks, that's done elsewhere (QLineEdit)
+    //QString componentStr = "import Qt 4.6\nTextInput {  inputMask: 'HHHHhhhh'; }";
+    QDeclarativeView *canvas = createView(SRCDIR "/data/masks.qml");
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
+    QVERIFY(textinputObject != 0);
+    QTRY_VERIFY(textinputObject->hasFocus() == true);
+    QVERIFY(textinputObject->text().length() == 0);
+    QCOMPARE(textinputObject->inputMask(), QString("HHHHhhhh; "));
+    for(int i=0; i<10; i++){
+        QCOMPARE(qMin(i,8), textinputObject->text().length());
+        QCOMPARE(i>=4, textinputObject->hasAcceptableInput());
+        //simulateKey(canvas, Qt::Key_A);
+        QTest::keyPress(canvas, Qt::Key_A);
+        QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
+    }
+}
+
+void tst_qmlgraphicstextinput::validators()
+{
+    // Note that this test assumes that the validators are working properly
+    // so you may need to run their tests first. All validators are checked
+    // here to ensure that their exposure to QML is working.
+
+    QDeclarativeView *canvas = createView(SRCDIR "/data/validators.qml");
+    canvas->show();
+    canvas->setFocus();
+
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeTextInput *intInput = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("intInput")));
+    QVERIFY(intInput);
+    intInput->setFocus(true);
+    QTRY_VERIFY(intInput->hasFocus());
+    QTest::keyPress(canvas, Qt::Key_1);
+    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
+    QCOMPARE(intInput->text(), QLatin1String("1"));
+    QCOMPARE(intInput->hasAcceptableInput(), false);
+    QTest::keyPress(canvas, Qt::Key_2);
+    QTest::keyRelease(canvas, Qt::Key_2, Qt::NoModifier ,10);
+    QCOMPARE(intInput->text(), QLatin1String("1"));
+    QCOMPARE(intInput->hasAcceptableInput(), false);
+    QTest::keyPress(canvas, Qt::Key_1);
+    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
+    QCOMPARE(intInput->text(), QLatin1String("11"));
+    QCOMPARE(intInput->hasAcceptableInput(), true);
+    QTest::keyPress(canvas, Qt::Key_0);
+    QTest::keyRelease(canvas, Qt::Key_0, Qt::NoModifier ,10);
+    QCOMPARE(intInput->text(), QLatin1String("11"));
+    QCOMPARE(intInput->hasAcceptableInput(), true);
+
+    QDeclarativeTextInput *dblInput = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("dblInput")));
+    QTRY_VERIFY(dblInput);
+    dblInput->setFocus(true);
+    QVERIFY(dblInput->hasFocus() == true);
+    QTest::keyPress(canvas, Qt::Key_1);
+    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
+    QCOMPARE(dblInput->text(), QLatin1String("1"));
+    QCOMPARE(dblInput->hasAcceptableInput(), false);
+    QTest::keyPress(canvas, Qt::Key_2);
+    QTest::keyRelease(canvas, Qt::Key_2, Qt::NoModifier ,10);
+    QCOMPARE(dblInput->text(), QLatin1String("12"));
+    QCOMPARE(dblInput->hasAcceptableInput(), true);
+    QTest::keyPress(canvas, Qt::Key_Period);
+    QTest::keyRelease(canvas, Qt::Key_Period, Qt::NoModifier ,10);
+    QCOMPARE(dblInput->text(), QLatin1String("12."));
+    QCOMPARE(dblInput->hasAcceptableInput(), true);
+    QTest::keyPress(canvas, Qt::Key_1);
+    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
+    QCOMPARE(dblInput->text(), QLatin1String("12.1"));
+    QCOMPARE(dblInput->hasAcceptableInput(), true);
+    QTest::keyPress(canvas, Qt::Key_1);
+    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
+    QCOMPARE(dblInput->text(), QLatin1String("12.11"));
+    QCOMPARE(dblInput->hasAcceptableInput(), true);
+    QTest::keyPress(canvas, Qt::Key_1);
+    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
+    QCOMPARE(dblInput->text(), QLatin1String("12.11"));
+    QCOMPARE(dblInput->hasAcceptableInput(), true);
+
+    QDeclarativeTextInput *strInput = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("strInput")));
+    QTRY_VERIFY(strInput);
+    strInput->setFocus(true);
+    QVERIFY(strInput->hasFocus() == true);
+    QTest::keyPress(canvas, Qt::Key_1);
+    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
+    QEXPECT_FAIL("","Will not work until QTBUG-8025 is resolved", Abort);
+    QCOMPARE(strInput->text(), QLatin1String(""));
+    QCOMPARE(strInput->hasAcceptableInput(), false);
+    QTest::keyPress(canvas, Qt::Key_A);
+    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
+    QCOMPARE(strInput->text(), QLatin1String("a"));
+    QCOMPARE(strInput->hasAcceptableInput(), false);
+    QTest::keyPress(canvas, Qt::Key_A);
+    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
+    QCOMPARE(strInput->text(), QLatin1String("aa"));
+    QCOMPARE(strInput->hasAcceptableInput(), true);
+    QTest::keyPress(canvas, Qt::Key_A);
+    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
+    QCOMPARE(strInput->text(), QLatin1String("aaa"));
+    QCOMPARE(strInput->hasAcceptableInput(), true);
+    QTest::keyPress(canvas, Qt::Key_A);
+    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
+    QCOMPARE(strInput->text(), QLatin1String("aaaa"));
+    QCOMPARE(strInput->hasAcceptableInput(), true);
+    QTest::keyPress(canvas, Qt::Key_A);
+    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
+    QCOMPARE(strInput->text(), QLatin1String("aaaa"));
+    QCOMPARE(strInput->hasAcceptableInput(), true);
+}
+
+void tst_qmlgraphicstextinput::inputMethodHints()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
+    canvas->show();
+    canvas->setFocus();
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
+    QVERIFY(textinputObject != 0);
+    QVERIFY(textinputObject->inputMethodHints() & Qt::ImhNoPredictiveText);
+    textinputObject->setInputMethodHints(Qt::ImhUppercaseOnly);
+    QVERIFY(textinputObject->inputMethodHints() & Qt::ImhUppercaseOnly);
+}
+
+/*
+TextInput element should only handle left/right keys until the cursor reaches
+the extent of the text, then they should ignore the keys.
+
+*/
+void tst_qmlgraphicstextinput::navigation()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml");
+    canvas->show();
+    canvas->setFocus();
+
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeTextInput *input = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
+
+    QVERIFY(input != 0);
+    input->setCursorPosition(0);
+    QTRY_VERIFY(input->hasFocus() == true);
+    simulateKey(canvas, Qt::Key_Left);
+    QVERIFY(input->hasFocus() == false);
+    simulateKey(canvas, Qt::Key_Right);
+    QVERIFY(input->hasFocus() == true);
+    //QT-2944: If text is selected, then we should deselect first.
+    input->setCursorPosition(input->text().length());
+    input->setSelectionStart(0);
+    input->setSelectionEnd(input->text().length());
+    QVERIFY(input->selectionStart() != input->selectionEnd());
+    simulateKey(canvas, Qt::Key_Right);
+    QVERIFY(input->selectionStart() == input->selectionEnd());
+    QVERIFY(input->selectionStart() == input->text().length());
+    QVERIFY(input->hasFocus() == true);
+    simulateKey(canvas, Qt::Key_Right);
+    QVERIFY(input->hasFocus() == false);
+    simulateKey(canvas, Qt::Key_Left);
+    QVERIFY(input->hasFocus() == true);
+}
+
+void tst_qmlgraphicstextinput::cursorDelegate()
+{
+    QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml");
+    view->show();
+    view->setFocus();
+    QDeclarativeTextInput *textInputObject = view->rootObject()->findChild<QDeclarativeTextInput*>("textInputObject");
+    QVERIFY(textInputObject != 0);
+    QVERIFY(textInputObject->findChild<QDeclarativeItem*>("cursorInstance"));
+    //Test Delegate gets created
+    textInputObject->setFocus(true);
+    QDeclarativeItem* delegateObject = textInputObject->findChild<QDeclarativeItem*>("cursorInstance");
+    QVERIFY(delegateObject);
+    //Test Delegate gets moved
+    for(int i=0; i<= textInputObject->text().length(); i++){
+        textInputObject->setCursorPosition(i);
+        //+5 is because the TextInput cursorRect is just a 10xHeight area centered on cursor position
+        QCOMPARE(textInputObject->cursorRect().x() + 5, qRound(delegateObject->x()));
+        QCOMPARE(textInputObject->cursorRect().y(), qRound(delegateObject->y()));
+    }
+    textInputObject->setCursorPosition(0);
+    QCOMPARE(textInputObject->cursorRect().x()+5, qRound(delegateObject->x()));
+    QCOMPARE(textInputObject->cursorRect().y(), qRound(delegateObject->y()));
+    //Test Delegate gets deleted
+    textInputObject->setCursorDelegate(0);
+    QVERIFY(!textInputObject->findChild<QDeclarativeItem*>("cursorInstance"));
+}
+
+void tst_qmlgraphicstextinput::readOnly()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml");
+    canvas->show();
+    canvas->setFocus();
+
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeTextInput *input = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
+
+    QVERIFY(input != 0);
+    QTRY_VERIFY(input->hasFocus() == true);
+    QVERIFY(input->isReadOnly() == true);
+    QString initial = input->text();
+    for(int k=Qt::Key_0; k<=Qt::Key_Z; k++)
+        simulateKey(canvas, k);
+    simulateKey(canvas, Qt::Key_Return);
+    simulateKey(canvas, Qt::Key_Space);
+    simulateKey(canvas, Qt::Key_Escape);
+    QCOMPARE(input->text(), initial);
+}
+
+void tst_qmlgraphicstextinput::simulateKey(QDeclarativeView *view, int key)
+{
+    QKeyEvent press(QKeyEvent::KeyPress, key, 0);
+    QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
+
+    QApplication::sendEvent(view, &press);
+    QApplication::sendEvent(view, &release);
+}
+
+QDeclarativeView *tst_qmlgraphicstextinput::createView(const QString &filename)
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+
+    canvas->setSource(QUrl::fromLocalFile(filename));
+
+    return canvas;
+}
+
+class MyInputContext : public QInputContext
+{
+public:
+    MyInputContext() : softwareInputPanelEventReceived(false) {}
+    ~MyInputContext() {}
+
+    QString identifierName() { return QString(); }
+    QString language() { return QString(); }
+
+    void reset() {}
+
+    bool isComposing() const { return false; }
+
+    bool filterEvent( const QEvent *event )
+    {
+        if (event->type() == QEvent::RequestSoftwareInputPanel)
+            softwareInputPanelEventReceived = true;
+        return QInputContext::filterEvent(event);
+    }
+    bool softwareInputPanelEventReceived;
+};
+
+void tst_qmlgraphicstextinput::sendRequestSoftwareInputPanelEvent()
+{
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    MyInputContext ic;
+    view.viewport()->setInputContext(&ic);
+    QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel(
+            view.style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
+    if ((behavior != QStyle::RSIP_OnMouseClick))
+        QSKIP("This test need to have a style with RSIP_OnMouseClick", SkipSingle);
+    QDeclarativeTextInput input;
+    input.setText("Hello world");
+    input.setPos(0, 0);
+    scene.addItem(&input);
+    view.show();
+    qApp->setAutoSipEnabled(true);
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(input.scenePos()));
+    QApplication::processEvents();
+    QCOMPARE(ic.softwareInputPanelEventReceived, true);
+}
+
+QTEST_MAIN(tst_qmlgraphicstextinput)
+
+#include "tst_qdeclarativetextinput.moc"
diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
new file mode 100644
index 0000000..b162739
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativetimer.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
new file mode 100644
index 0000000..62c9e91
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
@@ -0,0 +1,285 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetimer_p.h>
+#include <QDebug>
+
+class tst_qmltimer : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmltimer();
+
+private slots:
+    void notRepeating();
+    void notRepeatingStart();
+    void repeat();
+    void noTriggerIfNotRunning();
+    void triggeredOnStart();
+    void triggeredOnStartRepeat();
+    void changeDuration();
+    void restart();
+};
+
+class TimerHelper : public QObject
+{
+    Q_OBJECT
+public:
+    TimerHelper() : QObject(), count(0)
+    {
+    }
+
+    int count;
+
+public slots:
+    void timeout() {
+        ++count;
+    }
+};
+
+#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
+// Increase wait as emulator startup can cause unexpected delays
+#define TIMEOUT_TIMEOUT 2000
+#else
+#define TIMEOUT_TIMEOUT 200
+#endif
+
+tst_qmltimer::tst_qmltimer()
+{
+}
+
+void tst_qmltimer::notRepeating()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; running: true }"), QUrl::fromLocalFile(""));
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
+    QVERIFY(timer != 0);
+    QVERIFY(timer->isRunning());
+    QVERIFY(!timer->isRepeating());
+    QCOMPARE(timer->interval(), 100);
+
+    TimerHelper helper;
+    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
+
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QCOMPARE(helper.count, 1);
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QCOMPARE(helper.count, 1);
+    QVERIFY(timer->isRunning() == false);
+}
+
+void tst_qmltimer::notRepeatingStart()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100 }"), QUrl::fromLocalFile(""));
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
+    QVERIFY(timer != 0);
+    QVERIFY(!timer->isRunning());
+
+    TimerHelper helper;
+    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
+
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QCOMPARE(helper.count, 0);
+
+    timer->start();
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QCOMPARE(helper.count, 1);
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QCOMPARE(helper.count, 1);
+    QVERIFY(timer->isRunning() == false);
+
+    delete timer;
+}
+
+void tst_qmltimer::repeat()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; repeat: true; running: true }"), QUrl::fromLocalFile(""));
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
+    QVERIFY(timer != 0);
+
+    TimerHelper helper;
+    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
+    QCOMPARE(helper.count, 0);
+
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QVERIFY(helper.count > 0);
+    int oldCount = helper.count;
+
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QVERIFY(helper.count > oldCount);
+    QVERIFY(timer->isRunning());
+
+    oldCount = helper.count;
+    timer->stop();
+
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QVERIFY(helper.count == oldCount);
+    QVERIFY(timer->isRunning() == false);
+
+    delete timer;
+}
+
+void tst_qmltimer::triggeredOnStart()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; running: true; triggeredOnStart: true }"), QUrl::fromLocalFile(""));
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
+    QVERIFY(timer != 0);
+    QVERIFY(timer->triggeredOnStart());
+
+    TimerHelper helper;
+    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
+    QTest::qWait(1);
+    QCOMPARE(helper.count, 1);
+
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QCOMPARE(helper.count, 2);
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QCOMPARE(helper.count, 2);
+    QVERIFY(timer->isRunning() == false);
+
+    delete timer;
+}
+
+void tst_qmltimer::triggeredOnStartRepeat()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; running: true; triggeredOnStart: true; repeat: true }"), QUrl::fromLocalFile(""));
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
+    QVERIFY(timer != 0);
+
+    TimerHelper helper;
+    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
+    QTest::qWait(1);
+    QCOMPARE(helper.count, 1);
+
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QVERIFY(helper.count > 1);
+    int oldCount = helper.count;
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QVERIFY(helper.count > oldCount);
+    QVERIFY(timer->isRunning());
+
+    delete timer;
+}
+
+void tst_qmltimer::noTriggerIfNotRunning()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray(
+        "import Qt 4.6\n"
+        "Item { property bool ok: true\n"
+            "Timer { id: t1; interval: 100; repeat: true; running: true; onTriggered: if (!running) ok=false }"
+            "Timer { interval: 10; running: true; onTriggered: t1.running=false }"
+        "}"
+    ), QUrl::fromLocalFile(""));
+    QObject *item = component.create();
+    QVERIFY(item != 0);
+    QTest::qWait(TIMEOUT_TIMEOUT);
+    QCOMPARE(item->property("ok").toBool(), true);
+
+    delete item;
+}
+
+void tst_qmltimer::changeDuration()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 200; repeat: true; running: true }"), QUrl::fromLocalFile(""));
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
+    QVERIFY(timer != 0);
+
+    TimerHelper helper;
+    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
+    QCOMPARE(helper.count, 0);
+
+    QTest::qWait(500);
+    QCOMPARE(helper.count, 2);
+
+    timer->setInterval(500);
+
+    QTest::qWait(600);
+    QCOMPARE(helper.count, 3);
+    QVERIFY(timer->isRunning());
+
+    delete timer;
+}
+
+void tst_qmltimer::restart()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 500; repeat: true; running: true }"), QUrl::fromLocalFile(""));
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
+    QVERIFY(timer != 0);
+
+    TimerHelper helper;
+    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
+    QCOMPARE(helper.count, 0);
+
+    QTest::qWait(600);
+    QCOMPARE(helper.count, 1);
+
+    QTest::qWait(300);
+
+    timer->restart();
+
+    QTest::qWait(700);
+
+    QCOMPARE(helper.count, 2);
+    QVERIFY(timer->isRunning());
+
+    delete timer;
+}
+
+QTEST_MAIN(tst_qmltimer)
+
+#include "tst_qdeclarativetimer.moc"
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.2.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.2.qml
new file mode 100644
index 0000000..ce2e82d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.2.qml
@@ -0,0 +1,9 @@
+import Test 1.0
+
+MyTypeObject {
+    property int value: 10
+    rect.x: value
+
+    onRunScript: { rect = Qt.rect(10, 10, 10, 10) }
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml
new file mode 100644
index 0000000..c82b533
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml
@@ -0,0 +1,10 @@
+import Test 1.0
+
+MyTypeObject {
+    property var value
+
+    rect: value
+
+    onRunScript: { rect.x = 44 }
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.qml
new file mode 100644
index 0000000..a8a72f5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.qml
@@ -0,0 +1,9 @@
+import Test 1.0
+
+MyTypeObject {
+    property int value: 10
+    rect.x: value
+
+    onRunScript: { rect.x = 42; }
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/bindingAssignment.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingAssignment.qml
new file mode 100644
index 0000000..a652186
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingAssignment.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+
+MyTypeObject {
+    property int value: 10
+
+    rect.x: value
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/bindingConflict.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingConflict.qml
new file mode 100644
index 0000000..fd25c9f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingConflict.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+
+MyTypeObject {
+    property int value: 13
+
+    rect.x: value
+    rect: "10,10,10x10"
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/bindingRead.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingRead.qml
new file mode 100644
index 0000000..538d776
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingRead.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    property int value: rect.x
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml
new file mode 100644
index 0000000..691a56c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml
@@ -0,0 +1,13 @@
+import Test 1.0
+
+MyTypeObject {
+    property var object
+    object: MyTypeObject {
+        rect.x: 19
+        rect.y: 33
+        rect.width: 5
+        rect.height: 99
+    }
+
+    rect: object.rect
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.js b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.js
new file mode 100644
index 0000000..af298ff
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.js
@@ -0,0 +1,13 @@
+var savedReference;
+
+function startup()
+{
+    savedReference = object.rect;
+    console.log("Test: " + savedReference.x);
+}
+
+function afterDelete()
+{
+    console.log("Test: " + savedReference.x);
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
new file mode 100644
index 0000000..05459f4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
@@ -0,0 +1,12 @@
+import Test 1.0
+import Qt 4.6
+
+MyTypeObject {
+    property var object
+
+    Script { source: "deletedObject.js" }
+
+    object: MyTypeObject {}
+    Component.onCompleted: startup()
+    onRunScript: afterDelete()
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/enums.1.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.1.qml
new file mode 100644
index 0000000..0eadd50
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.1.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    font.capitalization: "MixedCase"
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/enums.2.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.2.qml
new file mode 100644
index 0000000..81f1c92
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.2.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    font.capitalization: if (1) "MixedCase"
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml
new file mode 100644
index 0000000..e1d1ce0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml
@@ -0,0 +1,18 @@
+import Test 1.0
+
+MyTypeObject {
+    property string f_family: font.family
+    property bool f_bold: font.bold
+    property int f_weight: font.weight
+    property bool f_italic: font.italic
+    property bool f_underline: font.underline
+    property bool f_overline: font.overline
+    property bool f_strikeout: font.strikeout
+    property real f_pointSize: font.pointSize
+    property int f_pixelSize: font.pixelSize
+    property int f_capitalization: font.capitalization
+    property real f_letterSpacing: font.letterSpacing
+    property real f_wordSpacing: font.wordSpacing;
+    property var copy: font
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.2.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.2.qml
new file mode 100644
index 0000000..b559389
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.2.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    font.pixelSize: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.3.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.3.qml
new file mode 100644
index 0000000..913ac50
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.3.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+
+MyTypeObject {
+    font.pixelSize: 10
+    font.pointSize: 19
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.qml
new file mode 100644
index 0000000..ff4d0a1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.qml
@@ -0,0 +1,16 @@
+import Test 1.0
+
+MyTypeObject {
+    font.family: if(1) "Helvetica"
+    font.bold: if(1) false
+    font.weight: "Normal"
+    font.italic: if(1) false
+    font.underline: if(1) false
+    font.overline: if(1) false
+    font.strikeout: if(1) false
+    font.pointSize: if(1) 15
+    font.capitalization: "AllLowercase"
+    font.letterSpacing: if(1) 9.7
+    font.wordSpacing: if(1) 11.2
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml
new file mode 100644
index 0000000..3e67de6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+
+MyTypeObject {
+    property int p_x: point.x
+    property int p_y: point.y
+    property var copy: point
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/point_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/point_write.qml
new file mode 100644
index 0000000..063525a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/point_write.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    point.x: if (true) 11
+    point.y: if (true) 12
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml
new file mode 100644
index 0000000..d845a5b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+
+MyTypeObject {
+    property real p_x: pointf.x
+    property real p_y: pointf.y
+    property var copy: pointf
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_write.qml
new file mode 100644
index 0000000..9ee3fc1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_write.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    pointf.x: if (true) 6.8
+    pointf.y: if (true) 9.3
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml
new file mode 100644
index 0000000..5364431
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml
@@ -0,0 +1,10 @@
+import Test 1.0
+
+MyTypeObject {
+    property int r_x: rect.x
+    property int r_y: rect.y
+    property int r_width: rect.width
+    property int r_height: rect.height
+    property var copy: rect
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/rect_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_write.qml
new file mode 100644
index 0000000..8add453
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_write.qml
@@ -0,0 +1,9 @@
+import Test 1.0
+
+MyTypeObject {
+    rect.x: if (true) 1234
+    rect.y: if (true) 7
+    rect.width: if (true) 56
+    rect.height: if (true) 63
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml
new file mode 100644
index 0000000..aeb9f41
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml
@@ -0,0 +1,10 @@
+import Test 1.0
+
+MyTypeObject {
+    property real r_x: rectf.x
+    property real r_y: rectf.y
+    property real r_width: rectf.width
+    property real r_height: rectf.height
+    property var copy: rectf
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_write.qml
new file mode 100644
index 0000000..1e6ff4f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_write.qml
@@ -0,0 +1,9 @@
+import Test 1.0
+
+MyTypeObject {
+    rectf.x: if (true) 70.1
+    rectf.y: if (true) -113.2
+    rectf.width: if (true) 80924.8
+    rectf.height: if (true) 99.2
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml
new file mode 100644
index 0000000..96592eb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+import Test 1.0
+
+MyTypeObject {
+    property int valuePre;
+    property int valuePost;
+
+    Component.onCompleted: { valuePre = rect.x; rect.x = 19; valuePost = rect.x; }
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml
new file mode 100644
index 0000000..29157e8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml
@@ -0,0 +1,14 @@
+import Test 1.0
+
+MyTypeObject {
+    property var object
+    object: MyTypeObject {
+        rect.x: 19
+        rect.y: 33
+        rect.width: 5
+        rect.height: 99
+    }
+
+    onRunScript: rect = object.rect
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml
new file mode 100644
index 0000000..86dba03
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+
+MyTypeObject {
+    property int s_width: size.width
+    property int s_height: size.height
+    property var copy: size
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/size_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/size_write.qml
new file mode 100644
index 0000000..2f9d10e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/size_write.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+
+MyTypeObject {
+    size.width: if (true) 13
+    size.height: if (true) 88
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml
new file mode 100644
index 0000000..c6f34e4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml
@@ -0,0 +1,9 @@
+import Test 1.0
+
+MyTypeObject {
+    property real s_width: sizef.width
+    property real s_height: sizef.height
+    property var copy: sizef
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_write.qml
new file mode 100644
index 0000000..f16f0bd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_write.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyTypeObject {
+    sizef.width: if (true) 44.3
+    sizef.height: if (true) 92.8
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/staticAssignment.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/staticAssignment.qml
new file mode 100644
index 0000000..b687f89
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/staticAssignment.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    rect.x: 9
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/valueInterceptors.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/valueInterceptors.qml
new file mode 100644
index 0000000..026ae83
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/valueInterceptors.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+
+MyTypeObject {
+    property int value: 13;
+
+    rect.x: MyOffsetValueInterceptor {}
+    rect.x: value
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/valueSources.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/valueSources.qml
new file mode 100644
index 0000000..d4d4391
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/valueSources.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    rect.x: MyConstantValueSource {}
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml
new file mode 100644
index 0000000..abdf9f0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml
@@ -0,0 +1,9 @@
+import Test 1.0
+
+MyTypeObject {
+    property real v_x: vector.x
+    property real v_y: vector.y
+    property real v_z: vector.z
+    property var copy: vector
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_write.qml
new file mode 100644
index 0000000..9c1bf76
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_write.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+
+MyTypeObject {
+    vector.x: if (true) -0.3
+    vector.y: if (true) -12.9
+    vector.z: if (true) 907.4
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro
new file mode 100644
index 0000000..028fc57
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro
@@ -0,0 +1,10 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+HEADERS += testtypes.h
+
+SOURCES += tst_qdeclarativevaluetypes.cpp \
+           testtypes.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp
new file mode 100644
index 0000000..aa8bd6e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "testtypes.h"
+
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Test, 1, 0, MyTypeObject, MyTypeObject);
+    QML_REGISTER_TYPE(Test, 1, 0, MyConstantValueSource, MyConstantValueSource);
+    QML_REGISTER_TYPE(Test, 1, 0, MyOffsetValueInterceptor, MyOffsetValueInterceptor);
+}
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
new file mode 100644
index 0000000..c4a9187
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef TESTTYPES_H
+#define TESTTYPES_H
+
+#include <QObject>
+#include <QPoint>
+#include <QPointF>
+#include <QSize>
+#include <QSizeF>
+#include <QRect>
+#include <QRectF>
+#include <QVector3D>
+#include <QFont>
+#include <qdeclarative.h>
+#include <QDeclarativePropertyValueSource>
+
+class MyTypeObject : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QPoint point READ point WRITE setPoint NOTIFY changed);
+    Q_PROPERTY(QPointF pointf READ pointf WRITE setPointf NOTIFY changed);
+    Q_PROPERTY(QSize size READ size WRITE setSize NOTIFY changed);
+    Q_PROPERTY(QSizeF sizef READ sizef WRITE setSizef NOTIFY changed);
+    Q_PROPERTY(QRect rect READ rect WRITE setRect NOTIFY changed);
+    Q_PROPERTY(QRectF rectf READ rectf WRITE setRectf NOTIFY changed);
+    Q_PROPERTY(QVector3D vector READ vector WRITE setVector NOTIFY changed);
+    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY changed);
+
+public:
+    MyTypeObject() :
+        m_point(10, 4),
+        m_pointf(11.3, -10.9),
+        m_size(1912, 1913),
+        m_sizef(0.1, 100923.2),
+        m_rect(2, 3, 109, 102),
+        m_rectf(103.8, 99.2, 88.1, 77.6),
+        m_vector(23.88, 3.1, 4.3)
+    {
+        m_font.setFamily("Arial");
+        m_font.setBold(true);
+        m_font.setWeight(QFont::DemiBold);
+        m_font.setItalic(true);
+        m_font.setUnderline(true);
+        m_font.setOverline(true);
+        m_font.setStrikeOut(true);
+        m_font.setPointSize(29);
+        m_font.setCapitalization(QFont::AllUppercase);
+        m_font.setLetterSpacing(QFont::AbsoluteSpacing, 10.2);
+        m_font.setWordSpacing(19.7);
+    }
+
+    QPoint m_point;
+    QPoint point() const { return m_point; }
+    void setPoint(const QPoint &v) { m_point = v; emit changed(); }
+
+    QPointF m_pointf;
+    QPointF pointf() const { return m_pointf; }
+    void setPointf(const QPointF &v) { m_pointf = v; emit changed(); }
+
+    QSize m_size;
+    QSize size() const { return m_size; }
+    void setSize(const QSize &v) { m_size = v; emit changed(); }
+
+    QSizeF m_sizef;
+    QSizeF sizef() const { return m_sizef; }
+    void setSizef(const QSizeF &v) { m_sizef = v; emit changed(); }
+
+    QRect m_rect;
+    QRect rect() const { return m_rect; }
+    void setRect(const QRect &v) { m_rect = v; emit changed(); }
+
+    QRectF m_rectf;
+    QRectF rectf() const { return m_rectf; }
+    void setRectf(const QRectF &v) { m_rectf = v; emit changed(); }
+
+    QVector3D m_vector;
+    QVector3D vector() const { return m_vector; }
+    void setVector(const QVector3D &v) { m_vector = v; emit changed(); }
+
+    QFont m_font;
+    QFont font() const { return m_font; }
+    void setFont(const QFont &v) { m_font = v; emit changed(); }
+
+    void emitRunScript() { emit runScript(); }
+
+signals:
+    void changed();
+    void runScript();
+};
+QML_DECLARE_TYPE(MyTypeObject);
+
+class MyConstantValueSource : public QObject, public QDeclarativePropertyValueSource
+{
+    Q_OBJECT
+public:
+    virtual void setTarget(const QDeclarativeMetaProperty &p) { p.write(3345); }
+};
+QML_DECLARE_TYPE(MyConstantValueSource);
+
+class MyOffsetValueInterceptor : public QObject, public QDeclarativePropertyValueInterceptor
+{
+    Q_OBJECT
+public:
+    virtual void setTarget(const QDeclarativeMetaProperty &p) { prop = p; }
+    virtual void write(const QVariant &value) { prop.write(value.toInt() + 13, QDeclarativeMetaProperty::BypassInterceptor); }
+
+private:
+    QDeclarativeMetaProperty prop;
+};
+QML_DECLARE_TYPE(MyOffsetValueInterceptor);
+
+void registerTypes();
+
+#endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
new file mode 100644
index 0000000..e53ac91
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
@@ -0,0 +1,616 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QDebug>
+#include <private/qdeclarativevaluetype_p.h>
+#include "testtypes.h"
+
+class tst_qmlvaluetypes : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlvaluetypes() {}
+
+private slots:
+    void initTestCase();
+
+    void point();
+    void pointf();
+    void size();
+    void sizef();
+    void rect();
+    void rectf();
+    void vector3d();
+    void font();
+
+    void bindingAssignment();
+    void bindingRead();
+    void staticAssignment();
+    void scriptAccess();
+    void autoBindingRemoval();
+    void valueSources();
+    void valueInterceptors();
+    void bindingConflict();
+    void deletedObject();
+    void bindingVariantCopy();
+    void scriptVariantCopy();
+    void cppClasses();
+    void enums();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+void tst_qmlvaluetypes::initTestCase()
+{
+    registerTypes();
+}
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
+void tst_qmlvaluetypes::point()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("point_read.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("p_x").toInt(), 10);
+        QCOMPARE(object->property("p_y").toInt(), 4);
+        QCOMPARE(object->property("copy"), QVariant(QPoint(10, 4)));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("point_write.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->point(), QPoint(11, 12));
+
+        delete object;
+    }
+}
+
+void tst_qmlvaluetypes::pointf()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("pointf_read.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("p_x").toDouble(), 11.3);
+        QCOMPARE(object->property("p_y").toDouble(), -10.9);
+        QCOMPARE(object->property("copy"), QVariant(QPointF(11.3, -10.9)));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("pointf_write.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->pointf(), QPointF(6.8, 9.3));
+
+        delete object;
+    }
+}
+
+void tst_qmlvaluetypes::size()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("size_read.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("s_width").toInt(), 1912);
+        QCOMPARE(object->property("s_height").toInt(), 1913);
+        QCOMPARE(object->property("copy"), QVariant(QSize(1912, 1913)));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("size_write.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->size(), QSize(13, 88));
+
+        delete object;
+    }
+}
+
+void tst_qmlvaluetypes::sizef()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("sizef_read.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("s_width").toDouble(), 0.1);
+        QCOMPARE(object->property("s_height").toDouble(), 100923.2);
+        QCOMPARE(object->property("copy"), QVariant(QSizeF(0.1, 100923.2)));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("sizef_write.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->sizef(), QSizeF(44.3, 92.8));
+
+        delete object;
+    }
+}
+
+void tst_qmlvaluetypes::rect()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("rect_read.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("r_x").toInt(), 2);
+        QCOMPARE(object->property("r_y").toInt(), 3);
+        QCOMPARE(object->property("r_width").toInt(), 109);
+        QCOMPARE(object->property("r_height").toInt(), 102);
+        QCOMPARE(object->property("copy"), QVariant(QRect(2, 3, 109, 102)));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("rect_write.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->rect(), QRect(1234, 7, 56, 63));
+
+        delete object;
+    }
+}
+
+void tst_qmlvaluetypes::rectf()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("rectf_read.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("r_x").toDouble(), 103.8);
+        QCOMPARE(object->property("r_y").toDouble(), 99.2);
+        QCOMPARE(object->property("r_width").toDouble(), 88.1);
+        QCOMPARE(object->property("r_height").toDouble(), 77.6);
+        QCOMPARE(object->property("copy"), QVariant(QRectF(103.8, 99.2, 88.1, 77.6)));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("rectf_write.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->rectf(), QRectF(70.1, -113.2, 80924.8, 99.2));
+
+        delete object;
+    }
+}
+
+void tst_qmlvaluetypes::vector3d()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("vector3d_read.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE((float)object->property("v_x").toDouble(), (float)23.88);
+        QCOMPARE((float)object->property("v_y").toDouble(), (float)3.1);
+        QCOMPARE((float)object->property("v_z").toDouble(), (float)4.3);
+        QCOMPARE(object->property("copy"), QVariant(QVector3D(23.88, 3.1, 4.3)));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("vector3d_write.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->vector(), QVector3D(-0.3, -12.9, 907.4));
+
+        delete object;
+    }
+}
+
+void tst_qmlvaluetypes::font()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("font_read.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("f_family").toString(), object->font().family());
+        QCOMPARE(object->property("f_bold").toBool(), object->font().bold());
+        QCOMPARE(object->property("f_weight").toInt(), object->font().weight());
+        QCOMPARE(object->property("f_italic").toBool(), object->font().italic());
+        QCOMPARE(object->property("f_underline").toBool(), object->font().underline());
+        QCOMPARE(object->property("f_overline").toBool(), object->font().overline());
+        QCOMPARE(object->property("f_strikeout").toBool(), object->font().strikeOut());
+        QCOMPARE(object->property("f_pointSize").toDouble(), object->font().pointSizeF());
+        QCOMPARE(object->property("f_pixelSize").toInt(), object->font().pixelSize());
+        QCOMPARE(object->property("f_capitalization").toInt(), (int)object->font().capitalization());
+        QCOMPARE(object->property("f_letterSpacing").toDouble(), object->font().letterSpacing());
+        QCOMPARE(object->property("f_wordSpacing").toDouble(), object->font().wordSpacing());
+
+        QCOMPARE(object->property("copy"), QVariant(object->font()));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("font_write.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QFont font;
+        font.setFamily("Helvetica");
+        font.setBold(false);
+        font.setWeight(QFont::Normal);
+        font.setItalic(false);
+        font.setUnderline(false);
+        font.setStrikeOut(false);
+        font.setPointSize(15);
+        font.setCapitalization(QFont::AllLowercase);
+        font.setLetterSpacing(QFont::AbsoluteSpacing, 9.7);
+        font.setWordSpacing(11.2);
+
+        QEXPECT_FAIL("", "QT-2920", Continue);
+        QCOMPARE(object->font(), font);
+
+        delete object;
+    }
+
+    // Test pixelSize
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("font_write.2.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->font().pixelSize(), 10);
+
+        delete object;
+    }
+
+    // Test pixelSize and pointSize
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("font_write.3.qml"));
+        QTest::ignoreMessage(QtWarningMsg, "Both point size and pixel size set. Using pixel size. ");
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->font().pixelSize(), 10);
+
+        delete object;
+    }
+}
+
+// Test bindings can write to value types
+void tst_qmlvaluetypes::bindingAssignment()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingAssignment.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->rect().x(), 10);
+
+    object->setProperty("value", QVariant(92));
+
+    QCOMPARE(object->rect().x(), 92);
+
+    delete object;
+}
+
+// Test bindings can read from value types
+void tst_qmlvaluetypes::bindingRead()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingRead.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("value").toInt(), 2);
+
+    object->setRect(QRect(19, 3, 88, 2));
+
+    QCOMPARE(object->property("value").toInt(), 19);
+
+    delete object;
+}
+
+// Test static values can assign to value types
+void tst_qmlvaluetypes::staticAssignment()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("staticAssignment.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->rect().x(), 9);
+
+    delete object;
+}
+
+// Test scripts can read/write value types
+void tst_qmlvaluetypes::scriptAccess()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptAccess.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("valuePre").toInt(), 2);
+    QCOMPARE(object->rect().x(), 19);
+    QCOMPARE(object->property("valuePost").toInt(), 19);
+
+    delete object;
+}
+
+// Test that assigning a constant from script removes any binding
+void tst_qmlvaluetypes::autoBindingRemoval()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->rect().x(), 10);
+
+        object->setProperty("value", QVariant(13));
+
+        QCOMPARE(object->rect().x(), 13);
+
+        object->emitRunScript();
+
+        QCOMPARE(object->rect().x(), 42);
+
+        object->setProperty("value", QVariant(92));
+
+        QEXPECT_FAIL("", "QT-2920", Continue);
+        QCOMPARE(object->rect().x(), 42);
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.2.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->rect().x(), 10);
+
+        object->setProperty("value", QVariant(13));
+
+        QCOMPARE(object->rect().x(), 13);
+
+        object->emitRunScript();
+
+        QCOMPARE(object->rect(), QRect(10, 10, 10, 10));
+
+        object->setProperty("value", QVariant(92));
+
+        QCOMPARE(object->rect(), QRect(10, 10, 10, 10));
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.3.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        object->setProperty("value", QVariant(QRect(9, 22, 33, 44)));
+
+        QCOMPARE(object->rect(), QRect(9, 22, 33, 44));
+
+        object->emitRunScript();
+
+        QCOMPARE(object->rect(), QRect(44, 22, 33, 44));
+
+        object->setProperty("value", QVariant(QRect(19, 3, 4, 8)));
+
+        QEXPECT_FAIL("", "QT-2920", Continue);
+        QCOMPARE(object->rect(), QRect(44, 22, 33, 44));
+
+        delete object;
+    }
+
+}
+
+// Test that property value sources assign to value types
+void tst_qmlvaluetypes::valueSources()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("valueSources.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->rect().x(), 3345);
+
+    delete object;
+}
+
+static void checkNoErrors(QDeclarativeComponent& component)
+{
+    QList<QDeclarativeError> errors = component.errors();
+    if (errors.isEmpty())
+        return;
+    for (int ii = 0; ii < errors.count(); ++ii) {
+        const QDeclarativeError &error = errors.at(ii);
+        qWarning("%d:%d:%s",error.line(),error.column(),error.description().toUtf8().constData());
+    }
+}
+
+// Test that property value interceptors can be applied to value types
+void tst_qmlvaluetypes::valueInterceptors()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("valueInterceptors.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    checkNoErrors(component);
+    QEXPECT_FAIL("", "QT-2920", Abort);
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->rect().x(), 26);
+
+    object->setProperty("value", 99);
+
+    QCOMPARE(object->rect().x(), 112);
+
+    delete object;
+}
+
+// Test that you can't assign a binding to the "root" value type, and a sub-property
+void tst_qmlvaluetypes::bindingConflict()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingConflict.qml"));
+    QCOMPARE(component.isError(), true);
+}
+
+#define CPP_TEST(type, v) \
+{ \
+    type *t = new type; \
+    QVariant value(v); \
+    t->setValue(value); \
+    QCOMPARE(t->value(), value); \
+    delete t; \
+}
+
+// Test that accessing a reference to a valuetype after the owning object is deleted
+// doesn't crash
+void tst_qmlvaluetypes::deletedObject()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml"));
+    QTest::ignoreMessage(QtDebugMsg, "Test: 2");
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QObject *dObject = qvariant_cast<QObject *>(object->property("object"));
+    QVERIFY(dObject != 0);
+    delete dObject;
+
+    QTest::ignoreMessage(QtDebugMsg, "Test: undefined");
+    object->emitRunScript();
+
+    delete object;
+}
+
+// Test that value types can be assigned to another value type property in a binding
+void tst_qmlvaluetypes::bindingVariantCopy()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingVariantCopy.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->rect(), QRect(19, 33, 5, 99));
+
+    delete object;
+}
+
+// Test that value types can be assigned to another value type property in script
+void tst_qmlvaluetypes::scriptVariantCopy()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptVariantCopy.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->rect(), QRect(2, 3, 109, 102));
+
+    object->emitRunScript();
+
+    QCOMPARE(object->rect(), QRect(19, 33, 5, 99));
+
+    delete object;
+}
+
+
+// Test that the value type classes can be used manually
+void tst_qmlvaluetypes::cppClasses()
+{
+    CPP_TEST(QDeclarativePointValueType, QPoint(19, 33));
+    CPP_TEST(QDeclarativePointFValueType, QPointF(33.6, -23));
+    CPP_TEST(QDeclarativeSizeValueType, QSize(-100, 18));
+    CPP_TEST(QDeclarativeSizeFValueType, QSizeF(-100.7, 18.2));
+    CPP_TEST(QDeclarativeRectValueType, QRect(13, 39, 10928, 88));
+    CPP_TEST(QDeclarativeRectFValueType, QRectF(88.2, -90.1, 103.2, 118));
+    CPP_TEST(QDeclarativeVector3DValueType, QVector3D(18.2, 19.7, 1002));
+    CPP_TEST(QDeclarativeFontValueType, QFont("Helvetica"));
+
+}
+
+void tst_qmlvaluetypes::enums()
+{
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.1.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QVERIFY(object->font().capitalization() == QFont::MixedCase);
+    delete object;
+    }
+
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.2.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QVERIFY(object->font().capitalization() == QFont::MixedCase);
+    delete object;
+    }
+}
+
+QTEST_MAIN(tst_qmlvaluetypes)
+
+#include "tst_qdeclarativevaluetypes.moc"
diff --git a/tests/auto/declarative/qdeclarativewebview/data/basic.html b/tests/auto/declarative/qdeclarativewebview/data/basic.html
new file mode 100644
index 0000000..22e3e24
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/basic.html
@@ -0,0 +1,17 @@
+<html>
+<head><title>Basic</title>
+<link rel="icon" sizes="48x48" href="basic.png">
+<script type="text/javascript">
+<!--
+window.onload = function(){ window.status = "status here"; }
+// -->
+</script>
+</head>
+<body leftmargin="0" marginwidth="0">
+<table width="123">
+<tbody>
+<tr><td>This is a basic test.</td></tr>
+</tbody>
+</table>
+</body>
+</html>
diff --git a/tests/auto/declarative/qdeclarativewebview/data/basic.ico b/tests/auto/declarative/qdeclarativewebview/data/basic.ico
new file mode 100644
index 0000000..8f3d05e
Binary files /dev/null and b/tests/auto/declarative/qdeclarativewebview/data/basic.ico differ
diff --git a/tests/auto/declarative/qdeclarativewebview/data/basic.png b/tests/auto/declarative/qdeclarativewebview/data/basic.png
new file mode 100644
index 0000000..35717cc
Binary files /dev/null and b/tests/auto/declarative/qdeclarativewebview/data/basic.png differ
diff --git a/tests/auto/declarative/qdeclarativewebview/data/basic.qml b/tests/auto/declarative/qdeclarativewebview/data/basic.qml
new file mode 100644
index 0000000..5394837
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/basic.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+WebView {
+    url: "basic.html"
+}
diff --git a/tests/auto/declarative/qdeclarativewebview/data/elements.html b/tests/auto/declarative/qdeclarativewebview/data/elements.html
new file mode 100644
index 0000000..9236867
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/elements.html
@@ -0,0 +1,14 @@
+<body leftmargin=0 topmargin=0>
+<table width="300px" border=1 cellpadding=0 cellspacing=0>
+<tr>
+<td align=center width=25%%><p>A</p></td>
+<td width=75% height=50px>
+    <table width=100% border=1 cellpadding=0 cellspacing=0>
+    <tr>
+    <td align=center width=50% height=50px><p>B</p></td>
+    <td align=center width=50% height=50px><p>C</p></td>
+    </tr>
+    </table>
+</td>
+</tr>
+</table>
diff --git a/tests/auto/declarative/qdeclarativewebview/data/elements.qml b/tests/auto/declarative/qdeclarativewebview/data/elements.qml
new file mode 100644
index 0000000..7c030e6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/elements.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+WebView {
+    url: "elements.html"
+    width: 310
+    height: 100
+}
diff --git a/tests/auto/declarative/qdeclarativewebview/data/forward.html b/tests/auto/declarative/qdeclarativewebview/data/forward.html
new file mode 100644
index 0000000..030446a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/forward.html
@@ -0,0 +1,12 @@
+<html>
+<head><title>Forward</title>
+<link rel="icon" sizes="48x48" href="basic.png">
+</head>
+<body leftmargin="0" marginwidth="0">
+<table width="123">
+<tbody>
+<tr><td>This is more.</td></tr>
+</tbody>
+</table>
+</body>
+</html>
diff --git a/tests/auto/declarative/qdeclarativewebview/data/javaScript.html b/tests/auto/declarative/qdeclarativewebview/data/javaScript.html
new file mode 100644
index 0000000..35270bc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/javaScript.html
@@ -0,0 +1,11 @@
+<html>
+<head><title>JavaScript</title>
+<link rel="icon" sizes="48x48" href="basic.png">
+<script type="text/javascript">
+<!--
+window.onload = function(){ window.status = "status here"; }
+// -->
+</script>
+</head>
+<body>
+This is a JS test.
diff --git a/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml b/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
new file mode 100644
index 0000000..07eee88
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+WebView {
+    url: "javaScript.html"
+    javaScriptWindowObjects: [
+        QtObject {
+            property string qmlprop: "qmlvalue"
+            WebView.windowObjectName: "myjsname"
+        }
+    ]
+}
diff --git a/tests/auto/declarative/qdeclarativewebview/data/loadError.qml b/tests/auto/declarative/qdeclarativewebview/data/loadError.qml
new file mode 100644
index 0000000..1460f30
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/loadError.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+WebView {
+    url: "does-not-exist.html"
+}
diff --git a/tests/auto/declarative/qdeclarativewebview/data/newwindows.html b/tests/auto/declarative/qdeclarativewebview/data/newwindows.html
new file mode 100644
index 0000000..dd541f9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/newwindows.html
@@ -0,0 +1,16 @@
+<html>
+<head>
+<script type="text/javascript">
+<!--
+function clickTheLink()
+{
+    var ev = document.createEvent('MouseEvents');
+    ev.initEvent( "click", true, false );
+    document.getElementById('thelink').dispatchEvent(ev);
+}
+// -->
+</script>
+</head>
+<h1>Multiple windows...</h1>
+
+<a id=thelink target="_blank" href="newwindows.html">Popup!</a>
diff --git a/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml b/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml
new file mode 100644
index 0000000..0bc8263
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml
@@ -0,0 +1,33 @@
+// Demonstrates opening new WebViews from HTML
+
+import Qt 4.6
+
+Grid {
+    columns: 3
+    id: pages
+    height: 300; width: 600
+    property int total: 0
+
+    Component {
+        id: webViewPage
+        Rectangle {
+            width: webView.width
+            height: webView.height
+            border.color: "gray"
+
+            WebView {
+                id: webView
+                width: 150 // force predictable for test
+                newWindowComponent: webViewPage
+                newWindowParent: pages
+                url: "newwindows.html"
+                Timer {
+                    interval: 10; running: webView.status==WebView.Ready && total<4; repeat: false;
+                    onTriggered: {total++; webView.evaluateJavaScript("clickTheLink()")}
+                }
+            }
+        }
+    }
+
+    Loader { sourceComponent: webViewPage }
+}
diff --git a/tests/auto/declarative/qdeclarativewebview/data/pixelCache.html b/tests/auto/declarative/qdeclarativewebview/data/pixelCache.html
new file mode 100644
index 0000000..9412674
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/pixelCache.html
@@ -0,0 +1,10 @@
+<html>
+<body topmargin=0 leftmargin=0>
+<table width=120 cellpadding=0 cellspacing=0>
+<tr><td>
+<h1>Pixel Cache</h1>
+This test is for the pixel cache. Because this is a long document,
+as it scrolls, more of the document will need to be rendered.
+If the pixelCacheSize is small, the first parts of the document will
+no longer be in the cache when it returns.
+</table>
diff --git a/tests/auto/declarative/qdeclarativewebview/data/pixelCache.qml b/tests/auto/declarative/qdeclarativewebview/data/pixelCache.qml
new file mode 100644
index 0000000..08e4d65
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/pixelCache.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyWebView {
+    anchors.fill: parent
+    url: "pixelCache.html"
+}
diff --git a/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml b/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
new file mode 100644
index 0000000..3dd4e51
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
@@ -0,0 +1,33 @@
+import Qt 4.6
+
+Item {
+    width: 240
+    height: 160
+    Grid {
+        anchors.fill: parent
+        objectName: "newWindowParent"
+        id: newWindowParent
+    }
+
+    Row {
+        anchors.fill: parent
+        id: oldWindowParent
+        objectName: "oldWindowParent"
+    }
+
+    Loader {
+        sourceComponent: webViewComponent
+    }
+    Component {
+            id: webViewComponent
+            WebView {
+                id: webView
+                objectName: "webView"
+                newWindowComponent: webViewComponent
+                newWindowParent: oldWindowParent         
+                url: "basic.html"
+                renderingEnabled: true
+                pressGrabTime: 200
+            }
+    }
+}
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml b/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml
new file mode 100644
index 0000000..063b5a8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+WebView {
+    html: "<p>This is a <b>string</b> set on the WebView"
+}
diff --git a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
new file mode 100644
index 0000000..6af0a60
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
@@ -0,0 +1,10 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+contains(QT_CONFIG,webkit): QT += webkit
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativewebview.cpp testtypes.cpp
+HEADERS += testtypes.h
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativewebview/testtypes.cpp b/tests/auto/declarative/qdeclarativewebview/testtypes.cpp
new file mode 100644
index 0000000..7efc214
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/testtypes.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "testtypes.h"
+
+void MyWebView::drawContents(QPainter *p, const QRect &r)
+{
+    pp += r.width()*r.height();
+    QDeclarativeWebView::drawContents(p,r);
+}
+
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Test,1,0,MyWebView,MyWebView);
+}
diff --git a/tests/auto/declarative/qdeclarativewebview/testtypes.h b/tests/auto/declarative/qdeclarativewebview/testtypes.h
new file mode 100644
index 0000000..8eb703f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/testtypes.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef TESTTYPES_H
+#define TESTTYPES_H
+
+#include <private/qdeclarativewebview_p.h>
+
+class MyWebView : public QDeclarativeWebView
+{
+    Q_OBJECT
+    Q_PROPERTY(int pixelsPainted READ pixelsPainted);
+
+public:
+    MyWebView() : pp(0) {}
+
+    int pixelsPainted() const { return pp; }
+
+    void drawContents(QPainter *p, const QRect &r);
+
+private:
+    int pp;
+};
+
+QML_DECLARE_TYPE(MyWebView);
+
+void registerTypes();
+
+#endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
new file mode 100644
index 0000000..aa5b8e3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -0,0 +1,511 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtTest/QSignalSpy>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativewebview_p.h>
+#include <private/qdeclarativewebview_p_p.h>
+#include <private/qdeclarativepositioners_p.h>
+#include <QtWebKit/qwebpage.h>
+#include <QtWebKit/qwebframe.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtGui/qpainter.h>
+#include "testtypes.h"
+
+class tst_qmlgraphicswebview : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicswebview() {}
+
+private slots:
+    void initTestCase();
+    void basicProperties();
+    void settings();
+    void historyNav();
+    void multipleWindows();
+    void elementAreaAt();
+    void loadError();
+    void setHtml();
+    void javaScript();
+    void cleanupTestCase();
+    void pixelCache();
+    void newWindowParent();
+    void newWindowComponent();
+    void renderingEnabled();
+    void pressGrabTime();
+
+private:
+    void checkNoErrors(const QDeclarativeComponent& component);
+    QDeclarativeEngine engine;
+    QString tmpDir() const
+    {
+        static QString tmpd = QDir::tempPath()+"/tst_qmlgraphicswebview-"
+            + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
+        return tmpd;
+    }
+};
+
+void tst_qmlgraphicswebview::initTestCase()
+{
+    registerTypes();
+}
+
+static QString strippedHtml(QString html)
+{
+    html.replace(QRegExp("\\s+"),"");
+    return html;
+}
+
+static QString fileContents(const QString& filename)
+{
+    QFile file(filename);
+    file.open(QIODevice::ReadOnly);
+    return QString::fromUtf8(file.readAll());
+}
+
+
+static void removeRecursive(const QString& dirname)
+{
+    QDir dir(dirname);
+    QFileInfoList entries(dir.entryInfoList(QDir::Dirs|QDir::Files|QDir::NoDotAndDotDot));
+    for (int i = 0; i < entries.count(); ++i)
+        if (entries[i].isDir())
+            removeRecursive(entries[i].filePath());
+        else
+            dir.remove(entries[i].fileName());
+    QDir().rmdir(dirname);
+}
+
+void tst_qmlgraphicswebview::cleanupTestCase()
+{
+    removeRecursive(tmpDir());
+}
+
+void tst_qmlgraphicswebview::checkNoErrors(const QDeclarativeComponent& component)
+{
+    // Wait until the component is ready
+    QTRY_VERIFY(component.isReady());
+
+
+    if (component.isError()) {
+        QList<QDeclarativeError> errors = component.errors();
+        for (int ii = 0; ii < errors.count(); ++ii) {
+            const QDeclarativeError &error = errors.at(ii);
+            QByteArray errorStr = QByteArray::number(error.line()) + ":" +
+                                  QByteArray::number(error.column()) + ":" +
+                                  error.description().toUtf8();
+            qWarning() << errorStr;
+        }
+    }
+    QVERIFY(!component.isError());
+}
+
+void tst_qmlgraphicswebview::basicProperties()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
+    checkNoErrors(component);
+    QWebSettings::enablePersistentStorage(tmpDir());
+
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+    QCOMPARE(wv->title(),QString("Basic"));
+    QTRY_COMPARE(wv->icon().width(), 48);
+    QCOMPARE(wv->icon(),QPixmap(SRCDIR "/data/basic.png"));
+    QCOMPARE(wv->statusText(),QString("status here"));
+    QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/basic.html")), strippedHtml(wv->html()));
+    QCOMPARE(wv->width(), 123.0);
+    QCOMPARE(wv->preferredWidth(), 0);
+    QCOMPARE(wv->preferredHeight(), 0);
+    QCOMPARE(wv->zoomFactor(), 1.0);
+    QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/basic.html"));
+    QCOMPARE(wv->status(), QDeclarativeWebView::Ready);
+    QVERIFY(wv->reloadAction());
+    QVERIFY(wv->reloadAction()->isEnabled());
+    QVERIFY(wv->backAction());
+    QVERIFY(!wv->backAction()->isEnabled());
+    QVERIFY(wv->forwardAction());
+    QVERIFY(!wv->forwardAction()->isEnabled());
+    QVERIFY(wv->stopAction());
+    QVERIFY(!wv->stopAction()->isEnabled());
+
+    wv->setPixelCacheSize(0); // mainly testing that it doesn't crash or anything!
+    QCOMPARE(wv->pixelCacheSize(),0);
+    wv->reloadAction()->trigger();
+    QTRY_COMPARE(wv->progress(), 1.0);
+}
+
+void tst_qmlgraphicswebview::settings()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
+    checkNoErrors(component);
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+
+    QDeclarativeWebSettings *s = wv->settingsObject();
+
+    // merely tests that setting gets stored (in QWebSettings)
+    // behavioural tests are in WebKit.
+    for (int b=0; b<=1; ++b) {
+        bool on = !!b;
+
+        s->setAutoLoadImages(on);
+        s->setDeveloperExtrasEnabled(on);
+        s->setJavaEnabled(on);
+        s->setJavascriptCanAccessClipboard(on);
+        s->setJavascriptCanOpenWindows(on);
+        s->setJavascriptEnabled(on);
+        s->setLinksIncludedInFocusChain(on);
+        s->setLocalContentCanAccessRemoteUrls(on);
+        s->setLocalStorageDatabaseEnabled(on);
+        s->setOfflineStorageDatabaseEnabled(on);
+        s->setOfflineWebApplicationCacheEnabled(on);
+        s->setPluginsEnabled(on);
+        s->setPrintElementBackgrounds(on);
+        s->setPrivateBrowsingEnabled(on);
+        s->setZoomTextOnly(on);
+
+        QVERIFY(s->autoLoadImages() == on);
+        QVERIFY(s->developerExtrasEnabled() == on);
+        QVERIFY(s->javaEnabled() == on);
+        QVERIFY(s->javascriptCanAccessClipboard() == on);
+        QVERIFY(s->javascriptCanOpenWindows() == on);
+        QVERIFY(s->javascriptEnabled() == on);
+        QVERIFY(s->linksIncludedInFocusChain() == on);
+        QVERIFY(s->localContentCanAccessRemoteUrls() == on);
+        QVERIFY(s->localStorageDatabaseEnabled() == on);
+        QVERIFY(s->offlineStorageDatabaseEnabled() == on);
+        QVERIFY(s->offlineWebApplicationCacheEnabled() == on);
+        QVERIFY(s->pluginsEnabled() == on);
+        QVERIFY(s->printElementBackgrounds() == on);
+        QVERIFY(s->privateBrowsingEnabled() == on);
+        QVERIFY(s->zoomTextOnly() == on);
+
+        QVERIFY(s->property("autoLoadImages") == on);
+        QVERIFY(s->property("developerExtrasEnabled") == on);
+        QVERIFY(s->property("javaEnabled") == on);
+        QVERIFY(s->property("javascriptCanAccessClipboard") == on);
+        QVERIFY(s->property("javascriptCanOpenWindows") == on);
+        QVERIFY(s->property("javascriptEnabled") == on);
+        QVERIFY(s->property("linksIncludedInFocusChain") == on);
+        QVERIFY(s->property("localContentCanAccessRemoteUrls") == on);
+        QVERIFY(s->property("localStorageDatabaseEnabled") == on);
+        QVERIFY(s->property("offlineStorageDatabaseEnabled") == on);
+        QVERIFY(s->property("offlineWebApplicationCacheEnabled") == on);
+        QVERIFY(s->property("pluginsEnabled") == on);
+        QVERIFY(s->property("printElementBackgrounds") == on);
+        QVERIFY(s->property("privateBrowsingEnabled") == on);
+        QVERIFY(s->property("zoomTextOnly") == on);
+    }
+}
+
+void tst_qmlgraphicswebview::historyNav()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
+    checkNoErrors(component);
+    QWebSettings::enablePersistentStorage(tmpDir());
+
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
+    QVERIFY(wv != 0);
+    for (int i=1; i<=2; ++i) {
+        QTRY_COMPARE(wv->progress(), 1.0);
+        QCOMPARE(wv->title(),QString("Basic"));
+        QTRY_COMPARE(wv->icon().width(), 48);
+        QCOMPARE(wv->icon(),QPixmap(SRCDIR "/data/basic.png"));
+        QCOMPARE(wv->statusText(),QString("status here"));
+        QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/basic.html")), strippedHtml(wv->html()));
+        QCOMPARE(wv->width(), 123.0);
+        QCOMPARE(wv->preferredWidth(), 0);
+        QCOMPARE(wv->zoomFactor(), 1.0);
+        QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/basic.html"));
+        QCOMPARE(wv->status(), QDeclarativeWebView::Ready);
+        QVERIFY(wv->reloadAction());
+        QVERIFY(wv->reloadAction()->isEnabled());
+        QVERIFY(wv->backAction());
+        QVERIFY(!wv->backAction()->isEnabled());
+        QVERIFY(wv->forwardAction());
+        QVERIFY(!wv->forwardAction()->isEnabled());
+        QVERIFY(wv->stopAction());
+        QVERIFY(!wv->stopAction()->isEnabled());
+
+        wv->reloadAction()->trigger();
+    }
+
+    wv->setUrl(QUrl::fromLocalFile(SRCDIR "/data/forward.html"));
+    QTRY_COMPARE(wv->progress(), 1.0);
+    QCOMPARE(wv->title(),QString("Forward"));
+    QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/forward.html")), strippedHtml(wv->html()));
+    QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/forward.html"));
+    QCOMPARE(wv->status(), QDeclarativeWebView::Ready);
+    QCOMPARE(wv->statusText(),QString(""));
+    QVERIFY(wv->reloadAction());
+    QVERIFY(wv->reloadAction()->isEnabled());
+    QVERIFY(wv->backAction());
+    QVERIFY(wv->backAction()->isEnabled());
+    QVERIFY(wv->forwardAction());
+    QVERIFY(!wv->forwardAction()->isEnabled());
+    QVERIFY(wv->stopAction());
+    QVERIFY(!wv->stopAction()->isEnabled());
+
+    wv->backAction()->trigger();
+
+    QTRY_COMPARE(wv->progress(), 1.0);
+    QCOMPARE(wv->title(),QString("Basic"));
+    QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/basic.html")), strippedHtml(wv->html()));
+    QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/basic.html"));
+    QCOMPARE(wv->status(), QDeclarativeWebView::Ready);
+    QVERIFY(wv->reloadAction());
+    QVERIFY(wv->reloadAction()->isEnabled());
+    QVERIFY(wv->backAction());
+    QVERIFY(!wv->backAction()->isEnabled());
+    QVERIFY(wv->forwardAction());
+    QVERIFY(wv->forwardAction()->isEnabled());
+    QVERIFY(wv->stopAction());
+    QVERIFY(!wv->stopAction()->isEnabled());
+}
+
+void tst_qmlgraphicswebview::multipleWindows()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/newwindows.qml"));
+    checkNoErrors(component);
+
+    QDeclarativeGrid *grid = qobject_cast<QDeclarativeGrid*>(component.create());
+    QVERIFY(grid != 0);
+    QTRY_COMPARE(grid->children().count(), 2+5); // Component, Loader, 5 WebViews
+    QDeclarativeItem* popup = qobject_cast<QDeclarativeItem*>(grid->children().at(3)); // first popup after Component, Loaded, original.
+    QVERIFY(popup != 0);
+    QTRY_COMPARE(popup->x(), 150.0);
+}
+
+void tst_qmlgraphicswebview::loadError()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/loadError.qml"));
+    checkNoErrors(component);
+    QWebSettings::enablePersistentStorage(tmpDir());
+
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
+    QVERIFY(wv != 0);
+    for (int i=1; i<=2; ++i) {
+        QTRY_COMPARE(wv->progress(), 1.0);
+        QCOMPARE(wv->title(),QString(""));
+        QCOMPARE(wv->statusText(),QString("")); // HTML 'status bar' text, not error message
+        QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/does-not-exist.html")); // Unlike QWebPage, which loses url
+        QCOMPARE(wv->status(), QDeclarativeWebView::Error);
+
+        wv->reloadAction()->trigger();
+    }
+}
+
+void tst_qmlgraphicswebview::setHtml()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/sethtml.qml"));
+    checkNoErrors(component);
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
+    QVERIFY(wv != 0);
+    QCOMPARE(wv->html(),QString("<html><head></head><body><p>This is a <b>string</b> set on the WebView</p></body></html>"));
+
+    QSignalSpy spy(wv, SIGNAL(htmlChanged()));
+    wv->setHtml(QString("<html><head><title>Basic</title></head><body><p>text</p></body></html>"));
+    QCOMPARE(spy.count(),1);
+}
+
+void tst_qmlgraphicswebview::elementAreaAt()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/elements.qml"));
+    checkNoErrors(component);
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+
+    QCOMPARE(wv->elementAreaAt(40,30,100,100),QRect(1,1,75,54)); // Area A in data/elements.html
+    QCOMPARE(wv->elementAreaAt(130,30,200,100),QRect(78,3,110,50)); // Area B
+    QCOMPARE(wv->elementAreaAt(40,30,400,400),QRect(0,0,310,100)); // Whole view
+    QCOMPARE(wv->elementAreaAt(130,30,280,280),QRect(76,1,223,54)); // Area BC
+    QCOMPARE(wv->elementAreaAt(130,30,400,400),QRect(0,0,310,100)); // Whole view
+}
+
+void tst_qmlgraphicswebview::javaScript()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/javaScript.qml"));
+    checkNoErrors(component);
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+    QCOMPARE(wv->evaluateJavaScript("123").toInt(), 123);
+    QCOMPARE(wv->evaluateJavaScript("window.status").toString(), QString("status here"));
+    QCOMPARE(wv->evaluateJavaScript("window.myjsname.qmlprop").toString(), QString("qmlvalue"));
+}
+
+void tst_qmlgraphicswebview::pixelCache()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/pixelCache.qml"));
+    checkNoErrors(component);
+    MyWebView *wv = qobject_cast<MyWebView*>(component.create());
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+    QPixmap pm(150,150);
+    QPainter p(&pm);
+    wv->paint(&p,0,0);
+    const int expected = 120*(150+128); // 120 = width of HTML page, 150=pixmap height, 128=cache extra area
+    QCOMPARE(wv->pixelsPainted(), expected);
+    wv->paint(&p,0,0);
+    QCOMPARE(wv->pixelsPainted(), expected); // nothing new needed to be painted
+    wv->setPixelCacheSize(0); // clears the cache
+    wv->paint(&p,0,0);
+    QCOMPARE(wv->pixelsPainted(), expected*2); // everything needed to be painted
+    // Note that painted things always go into the cache (even if they don't "fit"),
+    // just that they will be removed if anything else needs to be painted.
+    wv->setPixelCacheSize(expected); // won't clear the cache
+    wv->paint(&p,0,0);
+    QCOMPARE(wv->pixelsPainted(), expected*2); // still there
+    wv->setPixelCacheSize(expected-1); // too small - will clear the cache
+    wv->paint(&p,0,0);
+    QCOMPARE(wv->pixelsPainted(), expected*3); // repainted
+}
+
+void tst_qmlgraphicswebview::newWindowParent()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    checkNoErrors(component);
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(component.create());
+    QDeclarativeWebView *wv = rootItem->findChild<QDeclarativeWebView*>("webView");
+    QVERIFY(rootItem != 0);
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+
+    QDeclarativeItem* oldWindowParent = rootItem->findChild<QDeclarativeItem*>("oldWindowParent");
+    QCOMPARE(wv->newWindowParent(), oldWindowParent);
+    QSignalSpy newWindowParentSpy(wv, SIGNAL(newWindowParentChanged()));
+
+    QDeclarativeItem* newWindowParent = rootItem->findChild<QDeclarativeItem*>("newWindowParent");
+    wv->setNewWindowParent(newWindowParent);
+    QVERIFY(oldWindowParent);
+    QVERIFY(oldWindowParent->childItems().count() == 0);
+    QCOMPARE(wv->newWindowParent(), newWindowParent);
+    QCOMPARE(newWindowParentSpy.count(),1);
+
+    wv->setNewWindowParent(newWindowParent);
+    QCOMPARE(newWindowParentSpy.count(),1);
+
+    wv->setNewWindowParent(0);
+    QCOMPARE(newWindowParentSpy.count(),2);
+}
+
+void tst_qmlgraphicswebview::newWindowComponent()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    checkNoErrors(component);
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(component.create());
+    QDeclarativeWebView *wv = rootItem->findChild<QDeclarativeWebView*>("webView");
+    QVERIFY(rootItem != 0);
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+
+    QDeclarativeComponent substituteComponent(&engine);
+    substituteComponent.setData("import Qt 4.6; WebView { objectName: 'newWebView'; url: 'basic.html'; }", QUrl::fromLocalFile(""));
+    QSignalSpy newWindowComponentSpy(wv, SIGNAL(newWindowComponentChanged()));
+
+    wv->setNewWindowComponent(&substituteComponent);
+    QCOMPARE(wv->newWindowComponent(), &substituteComponent);
+    QCOMPARE(newWindowComponentSpy.count(),1);
+
+    wv->setNewWindowComponent(&substituteComponent);
+    QCOMPARE(newWindowComponentSpy.count(),1);
+
+    wv->setNewWindowComponent(0);
+    QCOMPARE(newWindowComponentSpy.count(),2);
+}
+
+void tst_qmlgraphicswebview::renderingEnabled()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    checkNoErrors(component);
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(component.create());
+    QDeclarativeWebView *wv = rootItem->findChild<QDeclarativeWebView*>("webView");
+    QVERIFY(rootItem != 0);
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+
+    QVERIFY(wv->renderingEnabled());
+    QSignalSpy renderingEnabledSpy(wv, SIGNAL(renderingEnabledChanged()));
+
+    wv->setRenderingEnabled(false);
+    QVERIFY(!wv->renderingEnabled());
+    QCOMPARE(renderingEnabledSpy.count(),1);
+
+    wv->setRenderingEnabled(false);
+    QCOMPARE(renderingEnabledSpy.count(),1);
+
+    wv->setRenderingEnabled(true);
+    QCOMPARE(renderingEnabledSpy.count(),2);
+}
+
+void tst_qmlgraphicswebview::pressGrabTime()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    checkNoErrors(component);
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(component.create());
+    QDeclarativeWebView *wv = rootItem->findChild<QDeclarativeWebView*>("webView");
+    QVERIFY(rootItem != 0);
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+    QCOMPARE(wv->pressGrabTime(), 200);
+    QSignalSpy pressGrabTimeSpy(wv, SIGNAL(pressGrabTimeChanged()));
+
+    wv->setPressGrabTime(100);
+    QCOMPARE(wv->pressGrabTime(), 100);
+    QCOMPARE(pressGrabTimeSpy.count(),1);
+
+    wv->setPressGrabTime(100);
+    QCOMPARE(pressGrabTimeSpy.count(),1);
+
+    wv->setPressGrabTime(0);
+    QCOMPARE(pressGrabTimeSpy.count(),2);
+}
+
+QTEST_MAIN(tst_qmlgraphicswebview)
+
+#include "tst_qdeclarativewebview.moc"
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.expect
new file mode 100644
index 0000000..f43e043
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.expect
@@ -0,0 +1,10 @@
+PUT /testdocument.html HTTP/1.1
+Content-Type: text/plain;charset=UTF-8
+Content-Length: 9
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
+Test Data
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml
new file mode 100644
index 0000000..d7b9266
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml
@@ -0,0 +1,42 @@
+import Qt 4.6
+
+QtObject {
+    property string urlDummy
+    property string url
+
+    property bool seenDone: false
+    property bool didNotSeeUnsent: true
+    property bool endStateUnsent: false
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("GET", urlDummy);
+        x.setRequestHeader("Test-header", "TestValue");
+        x.send();
+
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                seenDone = true;
+            } else if (x.readyState == XMLHttpRequest.UNSENT) {
+                didNotSeeUnsent = false;
+            }
+        }
+
+        x.abort();
+
+        if (x.readyState == XMLHttpRequest.UNSENT) {
+            endStateUnsent = true;
+        }
+
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+        x.open("PUT", url);
+        x.send("Test Data");
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.reply
new file mode 100644
index 0000000..7ae6951
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.reply
@@ -0,0 +1,3 @@
+HTTP/1.0 200 OK
+Connection: close
+Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml
new file mode 100644
index 0000000..72a45e7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml
@@ -0,0 +1,58 @@
+import Qt 4.6
+
+QtObject {
+    property string url: "testdocument.html"
+
+    property bool readyState: false
+    property bool openedState: false
+
+    property bool status: false
+    property bool statusText: false
+    property bool responseText: false
+    property bool responseXML: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+	x.abort();
+
+        if (x.readyState == XMLHttpRequest.UNSENT)
+            readyState = true;
+
+        x.open("PUT", url);
+
+	x.abort();
+
+        x.open("GET", url);
+
+        if (x.readyState  == XMLHttpRequest.OPENED)
+            openedState = true;
+
+        try {
+            var a = x.status;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                status = true;
+        }
+        try {
+            var a = x.statusText;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                statusText = true;
+        }
+        responseText = (x.responseText == "");
+        responseXML = (x.responseXML == null);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+
+        x.send()
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml
new file mode 100644
index 0000000..aa78cde
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml
@@ -0,0 +1,54 @@
+import Qt 4.6
+
+QtObject {
+    property string url: "testdocument.html"
+
+    property bool readyState: false
+    property bool openedState: false
+
+    property bool status: false
+    property bool statusText: false
+    property bool responseText: false
+    property bool responseXML: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+	x.abort();
+
+        if (x.readyState == XMLHttpRequest.UNSENT)
+            readyState = true;
+
+        x.open("GET", url);
+
+        if (x.readyState  == XMLHttpRequest.OPENED)
+            openedState = true;
+
+        try {
+            var a = x.status;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                status = true;
+        }
+        try {
+            var a = x.statusText;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                statusText = true;
+        }
+        responseText = (x.responseText == "");
+        responseXML = (x.responseXML == null);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+
+        x.send()
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
new file mode 100644
index 0000000..9049fc7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
@@ -0,0 +1,80 @@
+import Qt 4.6
+
+QtObject {
+    property bool xmlTest: false
+    property bool dataOK: false
+
+    Script {
+        function checkAttr(documentElement, attr)
+        {
+            if (attr == null)
+                return;
+
+            if (attr.name != "attr")
+                return;
+
+            if (attr.value != "myvalue")
+                return;
+
+            if (attr.ownerElement.tagName != documentElement.tagName)
+                return;
+
+            if (attr.nodeName != "attr")
+                return;
+
+            if (attr.nodeValue != "myvalue")
+                return;
+
+            if (attr.nodeType != 2)
+                return;
+
+            if (attr.childNodes.length != 0)
+                return;
+
+            if (attr.firstChild != null)
+                return;
+
+            if (attr.lastChild != null)
+                return;
+
+            if (attr.previousSibling != null)
+                return;
+
+            if (attr.nextSibling != null)
+                return;
+
+            if (attr.attributes != null)
+                return;
+
+            xmlTest = true;
+        }
+
+        function checkXML(document)
+        {
+            checkAttr(document.documentElement, document.documentElement.attributes[0]);
+        }
+    }
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "attr.xml");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+
+                dataOK = true;
+
+                if (x.responseXML != null)
+                    checkXML(x.responseXML);
+
+            }
+        }
+
+        x.send()
+    }
+}
+
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.xml
new file mode 100644
index 0000000..2aa64a3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.xml
@@ -0,0 +1 @@
+<root attr="myvalue" />
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml
new file mode 100644
index 0000000..9255922
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml
@@ -0,0 +1,25 @@
+import Qt 4.6
+
+QtObject {
+    id: obj
+    property string url
+    property string which
+    property bool threw: false
+
+    onWhichChanged: {
+        var x = new XMLHttpRequest;
+
+        x.onreadystatechange = function() {
+            if (x.readyState == which) {
+                obj.threw = true
+                throw(new Error("Exception from Callback"))
+            }
+        }
+
+        x.open("GET", url);
+        x.setRequestHeader("Test-header", "TestValue");
+        x.send();
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
new file mode 100644
index 0000000..b2d0209
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
@@ -0,0 +1,135 @@
+import Qt 4.6
+
+QtObject {
+    property bool xmlTest: false
+    property bool dataOK: false
+
+    Script {
+        function checkCData(text, whitespacetext)
+        {
+            // This is essentially a copy of text.qml/checkText()
+
+            if (text == null)
+                return;
+
+            if (text.nodeName != "#cdata-section")
+                return;
+
+            if (text.nodeValue != "Hello world!")
+                return;
+
+            if (text.nodeType != 4)
+                return;
+
+            if (text.parentNode.nodeName != "item")
+                return;
+
+            if (text.childNodes.length != 0)
+                return;
+
+            if (text.firstChild != null)
+                return;
+
+            if (text.lastChild != null)
+                return;
+
+            if (text.previousSibling != null)
+                return;
+
+            if (text.nextSibling != null)
+                return;
+
+            if (text.attributes != null)
+                return;
+
+            if (text.wholeText != "Hello world!")
+                return;
+
+            if (text.data != "Hello world!")
+                return;
+
+            if (text.length != 12)
+                return;
+
+            if (text.isElementContentWhitespace != false)
+                return;
+
+            if (whitespacetext.nodeName != "#cdata-section")
+                return;
+
+            if (whitespacetext.nodeValue != "   ")
+                return;
+
+            if (whitespacetext.nodeType != 4)
+                return;
+
+            if (whitespacetext.parentNode.nodeName != "item")
+                return;
+
+            if (whitespacetext.childNodes.length != 0)
+                return;
+
+            if (whitespacetext.firstChild != null)
+                return;
+
+            if (whitespacetext.lastChild != null)
+                return;
+
+            if (whitespacetext.previousSibling != null)
+                return;
+
+            if (whitespacetext.nextSibling != null)
+                return;
+
+            if (whitespacetext.attributes != null)
+                return;
+
+            if (whitespacetext.wholeText != "   ")
+                return;
+
+            if (whitespacetext.data != "   ")
+                return;
+
+            if (whitespacetext.length != 3)
+                return;
+
+            if (whitespacetext.isElementContentWhitespace != true)
+                return;
+
+
+            xmlTest = true;
+        }
+
+        function checkXML(document)
+        {
+            checkCData(document.documentElement.childNodes[0].childNodes[0],
+                       document.documentElement.childNodes[1].childNodes[0]);
+
+        }
+    }
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "cdata.xml");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+
+                dataOK = true;
+
+                if (x.responseXML != null)
+                    checkXML(x.responseXML);
+
+            }
+        }
+
+        x.send()
+    }
+}
+
+
+
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.xml
new file mode 100644
index 0000000..061d37c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.xml
@@ -0,0 +1,2 @@
+<root><item><![CDATA[Hello world!]]></item><item><![CDATA[   ]]></item></root>
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml
new file mode 100644
index 0000000..93e44fd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+QtObject {
+    property bool calledAsConstructor
+    property bool calledAsFunction
+
+    Component.onCompleted: {
+        var x1 = new XMLHttpRequest;
+        var x2 = XMLHttpRequest();
+
+        calledAsConstructor = (x1 != null && x1 instanceof XMLHttpRequest);
+        calledAsFunction = (x2 == undefined);
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml
new file mode 100644
index 0000000..4dcf6f9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml
@@ -0,0 +1,30 @@
+import Qt 4.6
+
+QtObject {
+    property int readyState
+    property bool statusIsException: false
+    property bool statusTextIsException: false
+    property string responseText
+    property bool responseXMLIsNull
+
+    Component.onCompleted: {
+        var xhr = new XMLHttpRequest();
+
+        readyState = xhr.readyState;
+        try {
+            status = xhr.status;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                statusIsException = true;
+        }
+        try {
+            statusText = xhr.statusText;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                statusTextIsException = true;
+        }
+        responseText = xhr.responseText;
+        responseXMLIsNull = (xhr.responseXML == null);
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
new file mode 100644
index 0000000..e372361
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
@@ -0,0 +1,58 @@
+import Qt 4.6
+
+QtObject {
+    property bool xmlTest: false
+    property bool dataOK: false
+
+    Script {
+        function checkXML(document)
+        {
+            if (document.xmlVersion != "1.0")
+                return;
+
+            if (document.xmlEncoding != "UTF-8")
+                return;
+
+            if (document.xmlStandalone != true)
+                return;
+
+            if (document.documentElement == null)
+                return;
+
+            if (document.nodeName != "#document")
+                return;
+
+            if (document.nodeValue != null)
+                return;
+
+            if (document.parentNode != null)
+                return;
+
+            // ### Test other node properties
+            // ### test encoding (what is a valid qt encoding?)
+            xmlTest = true;
+        }
+    }
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "document.xml");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+
+                dataOK = true;
+
+                if (x.responseXML != null)
+                    checkXML(x.responseXML);
+
+            }
+        }
+
+        x.send()
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.xml
new file mode 100644
index 0000000..fb693ea
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone='yes'?>
+<root>
+</root>
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml
new file mode 100644
index 0000000..de5ee4f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml
@@ -0,0 +1,60 @@
+import Qt 4.6
+
+QtObject {
+    property int index_size_err: DOMException.INDEX_SIZE_ERR
+    property int domstring_size_err: DOMException.DOMSTRING_SIZE_ERR
+    property int hierarchy_request_err: DOMException.HIERARCHY_REQUEST_ERR
+    property int wrong_document_err: DOMException.WRONG_DOCUMENT_ERR
+    property int invalid_character_err: DOMException.INVALID_CHARACTER_ERR
+    property int no_data_allowed_err: DOMException.NO_DATA_ALLOWED_ERR
+    property int no_modification_allowed_err: DOMException.NO_MODIFICATION_ALLOWED_ERR
+    property int not_found_err: DOMException.NOT_FOUND_ERR
+    property int not_supported_err: DOMException.NOT_SUPPORTED_ERR
+    property int inuse_attribute_err: DOMException.INUSE_ATTRIBUTE_ERR
+    property int invalid_state_err: DOMException.INVALID_STATE_ERR
+    property int syntax_err: DOMException.SYNTAX_ERR
+    property int invalid_modification_err: DOMException.INVALID_MODIFICATION_ERR
+    property int namespace_err: DOMException.NAMESPACE_ERR
+    property int invalid_access_err: DOMException.INVALID_ACCESS_ERR
+    property int validation_err: DOMException.VALIDATION_ERR
+    property int type_mismatch_err: DOMException.TYPE_MISMATCH_ERR
+
+    Component.onCompleted: {
+        // Attempt to overwrite and delete values
+        DOMException.INDEX_SIZE_ERR = 44;
+        DOMException.DOMSTRING_SIZE_ERR = 44;
+        DOMException.HIERARCHY_REQUEST_ERR = 44;
+        DOMException.WRONG_DOCUMENT_ERR = 44;
+        DOMException.INVALID_CHARACTER_ERR = 44;
+        DOMException.NO_DATA_ALLOWED_ERR = 44;
+        DOMException.NO_MODIFICATION_ALLOWED_ERR = 44;
+        DOMException.NOT_FOUND_ERR = 44;
+        DOMException.NOT_SUPPORTED_ERR = 44;
+        DOMException.INUSE_ATTRIBUTE_ERR = 44;
+        DOMException.INVALID_STATE_ERR = 44;
+        DOMException.SYNTAX_ERR = 44;
+        DOMException.INVALID_MODIFICATION_ERR = 44;
+        DOMException.NAMESPACE_ERR = 44;
+        DOMException.INVALID_ACCESS_ERR = 44;
+        DOMException.VALIDATION_ERR = 44;
+        DOMException.TYPE_MISMATCH_ERR = 44;
+
+        delete DOMException.INDEX_SIZE_ERR;
+        delete DOMException.DOMSTRING_SIZE_ERR;
+        delete DOMException.HIERARCHY_REQUEST_ERR;
+        delete DOMException.WRONG_DOCUMENT_ERR;
+        delete DOMException.INVALID_CHARACTER_ERR;
+        delete DOMException.NO_DATA_ALLOWED_ERR;
+        delete DOMException.NO_MODIFICATION_ALLOWED_ERR;
+        delete DOMException.NOT_FOUND_ERR;
+        delete DOMException.NOT_SUPPORTED_ERR;
+        delete DOMException.INUSE_ATTRIBUTE_ERR;
+        delete DOMException.INVALID_STATE_ERR;
+        delete DOMException.SYNTAX_ERR;
+        delete DOMException.INVALID_MODIFICATION_ERR;
+        delete DOMException.NAMESPACE_ERR;
+        delete DOMException.INVALID_ACCESS_ERR;
+        delete DOMException.VALIDATION_ERR;
+        delete DOMException.TYPE_MISMATCH_ERR;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
new file mode 100644
index 0000000..78c0374
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
@@ -0,0 +1,147 @@
+import Qt 4.6
+
+QtObject {
+    property bool xmlTest: false
+    property bool dataOK: false
+
+    Script {
+        function checkElement(e, person, fruit)
+        {
+            if (e.tagName != "root")
+                return;
+
+            if (e.nodeName != "root")
+                return;
+
+            if (e.nodeValue != null)
+                return;
+
+            if (e.nodeType != 1)
+                return;
+
+            var childTagNames = [ "person", "fruit" ];
+
+            if (e.childNodes.length != childTagNames.length)
+                return;
+
+            for (var ii = 0; ii < childTagNames.length; ++ii) {
+                if (e.childNodes[ii].tagName != childTagNames[ii])
+                    return;
+            }
+
+            if (e.childNodes[childTagNames.length + 1] != null)
+                return;
+
+            // Check writing fails
+            e.childNodes[0] = null;
+            if (e.childNodes[0] == null)
+                return;
+
+            e.childNodes[10] = 10;
+            if (e.childNodes[10] != null)
+                return;
+
+            if (e.firstChild.tagName != e.childNodes[0].tagName)
+                return;
+
+            if (e.lastChild.tagName != e.childNodes[1].tagName)
+                return;
+
+            if (e.previousSibling != null)
+                return;
+
+            if (e.nextSibling != null)
+                return;
+
+            if (e.attributes == null)
+                return;
+
+            if (e.attributes.length != 2)
+                return;
+
+            var attr1 = e.attributes["attr"];
+            if (attr1.nodeValue != "value")
+                return;
+
+            var attrIdx = e.attributes[0];
+            if (attrIdx.nodeValue != "value")
+                return;
+
+            var attr2 = e.attributes["attr2"];
+            if (attr2.nodeValue != "value2")
+                return;
+
+            var attr3 = e.attributes["attr3"];
+            if (attr3 != null)
+                return;
+
+            var attrIdx2 = e.attributes[11];
+            if (attrIdx2 != null)
+                return;
+
+            // Check writing fails
+            e.attributes[0] = null;
+            if (e.attributes[0] == null)
+                return;
+
+            e.attributes["attr"] = null;
+            if (e.attributes["attr"] == null)
+                return;
+
+            e.attributes["attr3"] = 10;
+            if (e.attributes["attr3"] != null)
+                return;
+
+            // Check person and fruit sub elements
+            if (person.parentNode.nodeName != "root")
+                return;
+
+            if (person.previousSibling != null)
+                return;
+
+            if (person.nextSibling.nodeName != "fruit")
+                return;
+
+            if (fruit.parentNode.nodeName != "root")
+                return;
+
+            if (fruit.previousSibling.nodeName != "person")
+                return;
+
+            if (fruit.nextSibling != null)
+                return;
+
+            xmlTest = true;
+        }
+
+        function checkXML(document)
+        {
+            checkElement(document.documentElement, 
+                         document.documentElement.childNodes[0], 
+                         document.documentElement.childNodes[1]);
+        }
+    }
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "element.xml");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+
+                dataOK = true;
+
+                if (x.responseXML != null)
+                    checkXML(x.responseXML);
+
+            }
+        }
+
+        x.send()
+    }
+}
+
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.xml
new file mode 100644
index 0000000..071ffae
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.xml
@@ -0,0 +1 @@
+<root attr="value" attr2="value2"><person /><fruit /></root>
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml
new file mode 100644
index 0000000..8d67fad
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml
@@ -0,0 +1,65 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool unsentException: false
+    property bool openedException: false
+
+    property bool readyState: false
+    property bool openedState: false
+
+    property bool headersReceivedState: false
+    property bool headersReceivedHeader: false
+
+    property bool doneState: false
+    property bool doneHeader: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+	try {
+	    x.getResponseHeader("Test-Header");
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		unsentException = true;
+	}
+
+        if (x.readyState == XMLHttpRequest.UNSENT)
+            readyState = true;
+
+        x.open("GET", url);
+
+        if (x.readyState  == XMLHttpRequest.OPENED)
+            openedState = true;
+
+	try {
+	    x.getResponseHeader("Test-Header");
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		openedException = true;
+	}
+
+        var headers = "connection: close\r\ncontent-type: text/html; charset=UTF-8\r\ntest-header: TestValue\r\nmultitest-header: TestValue, SecondTestValue\r\ncontent-length: 11";
+
+        // Test to the end
+        x.onreadystatechange = function() {
+	    if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
+		headersReceivedState = true;
+
+		headersReceivedHeader = (x.getAllResponseHeaders() == headers);
+	    } else if (x.readyState == XMLHttpRequest.DONE) {
+		doneState = headersReceivedState && true;
+
+		doneHeader = (x.getAllResponseHeaders() == headers);
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send()
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml
new file mode 100644
index 0000000..37124c7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property bool exceptionThrown: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "testdocument.html");
+        x.send();
+
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                try {
+                    x.getAllResponseHeaders("Test-header");
+                } catch (e) {
+                    if (e.code == DOMException.SYNTAX_ERR)
+                        exceptionThrown = true;
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml
new file mode 100644
index 0000000..505e4b1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml
@@ -0,0 +1,20 @@
+import Qt 4.6
+
+QtObject {
+    property bool test: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "testdocument.html");
+        x.send();
+
+        try {
+            x.getAllResponseHeaders();
+        } catch (e) {
+            if (e.code == DOMException.INVALID_STATE_ERR)
+                test = true;
+        }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml
new file mode 100644
index 0000000..20fb040
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+
+QtObject {
+    property bool test: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        try {
+            x.getAllResponseHeaders();
+        } catch (e) {
+            if (e.code == DOMException.INVALID_STATE_ERR)
+                test = true;
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.expect
new file mode 100644
index 0000000..a740c79
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.expect
@@ -0,0 +1,7 @@
+GET /testdocument.html HTTP/1.1
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml
new file mode 100644
index 0000000..2f949e1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml
@@ -0,0 +1,75 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool unsentException: false
+    property bool openedException: false
+
+    property bool readyState: false
+    property bool openedState: false
+
+    property bool headersReceivedState: false
+    property bool headersReceivedNullHeader: false
+    property bool headersReceivedValidHeader: false
+    property bool headersReceivedMultiValidHeader: false
+    property bool headersReceivedCookieHeader: false
+
+    property bool doneState: false
+    property bool doneNullHeader: false
+    property bool doneValidHeader: false
+    property bool doneMultiValidHeader: false
+    property bool doneCookieHeader: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+	try {
+	    x.getResponseHeader("Test-Header");
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		unsentException = true;
+	}
+
+        if (x.readyState == XMLHttpRequest.UNSENT)
+            readyState = true;
+
+        x.open("GET", url);
+
+        if (x.readyState  == XMLHttpRequest.OPENED)
+            openedState = true;
+
+	try {
+	    x.getResponseHeader("Test-Header");
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		openedException = true;
+	}
+
+        // Test to the end
+        x.onreadystatechange = function() {
+	    if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
+		headersReceivedState = true;
+
+		headersReceivedNullHeader = (x.getResponseHeader("Nonexistant-header") == "");
+		headersReceivedValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue");
+		headersReceivedMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue");
+		headersReceivedCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == "");
+	    } else if (x.readyState == XMLHttpRequest.DONE) {
+		doneState = headersReceivedState && true;
+
+		doneNullHeader = (x.getResponseHeader("Nonexistant-header") == "");
+		doneValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue");
+		doneMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue");
+		doneCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == "");
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send()
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.reply
new file mode 100644
index 0000000..c4b4bb2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.reply
@@ -0,0 +1,8 @@
+HTTP/1.0 200 OK
+Connection: close
+Content-type: text/html; charset=UTF-8
+Test-Header: TestValue
+MultiTest-Header: TestValue
+MultiTest-Header: SecondTestValue
+Set-Cookie: mycook=Value
+Set-Cookie2: mycook=Value
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml
new file mode 100644
index 0000000..d5aa4b1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property bool exceptionThrown: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "testdocument.html");
+        x.send();
+
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                try {
+                    x.getResponseHeader();
+                } catch (e) {
+                    if (e.code == DOMException.SYNTAX_ERR)
+                        exceptionThrown = true;
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml
new file mode 100644
index 0000000..7538ffd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml
@@ -0,0 +1,20 @@
+import Qt 4.6
+
+QtObject {
+    property bool test: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "testdocument.html");
+        x.send();
+
+        try {
+            x.getResponseHeader("Test-header");
+        } catch (e) {
+            if (e.code == DOMException.INVALID_STATE_ERR)
+                test = true;
+        }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml
new file mode 100644
index 0000000..3b55802
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+
+QtObject {
+    property bool test: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        try {
+            x.getResponseHeader("Test-header");
+        } catch (e) {
+            if (e.code == DOMException.INVALID_STATE_ERR)
+                test = true;
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml
new file mode 100644
index 0000000..b8d01c4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml
@@ -0,0 +1,33 @@
+import Qt 4.6
+
+QtObject {
+    property int unsent
+    property int opened
+    property int headers_received
+    property int loading
+    property int done
+
+    Component.onCompleted: {
+        // Attempt to overwrite and delete values
+        var x = new XMLHttpRequest();
+
+        x.UNSENT = 9;
+        x.OPENED = 9;
+        x.HEADERS_RECEIVED = 9;
+        x.LOADING = 9;
+        x.DONE = 9;
+
+        delete x.UNSENT;
+        delete x.OPENED;
+        delete x.HEADERS_RECEIVED;
+        delete x.LOADING;
+        delete x.DONE;
+
+        unsent = x.UNSENT
+        opened = x.OPENED
+        headers_received = x.HEADERS_RECEIVED
+        loading = x.LOADING
+        done = x.DONE
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml
new file mode 100644
index 0000000..b30989b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml
@@ -0,0 +1,160 @@
+import Qt 4.6 
+
+QtObject {
+    property bool onreadystatechange: false
+    property bool readyState: false
+    property bool status: false
+    property bool statusText: false
+    property bool responseText: false
+    property bool responseXML: false
+
+    property bool open: false
+    property bool setRequestHeader: false
+    property bool send: false
+    property bool abort: false
+    property bool getResponseHeader: false
+    property bool getAllResponseHeaders: false
+
+    Component.onCompleted: {
+        var o = 10;
+
+        try {
+            XMLHttpRequest.prototype.onreadystatechange
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            onreadystatechange = true;
+        }
+        try {
+            XMLHttpRequest.prototype.readyState
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            readyState = true;
+        }
+        try {
+            XMLHttpRequest.prototype.status
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            status = true;
+        }
+        try {
+            XMLHttpRequest.prototype.statusText
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            statusText = true;
+        }
+        try {
+            XMLHttpRequest.prototype.responseText
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            responseText = true;
+        }
+        try {
+            XMLHttpRequest.prototype.responseXML
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            responseXML = true;
+        }
+
+        try {
+            XMLHttpRequest.prototype.open.call(o);
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            open = true;
+        }
+
+        try {
+            XMLHttpRequest.prototype.setRequestHeader.call(o);
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            setRequestHeader = true;
+        }
+
+        try {
+            XMLHttpRequest.prototype.send.call(o);
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            send = true;
+        }
+
+        try {
+            XMLHttpRequest.prototype.abort.call(o);
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            abort = true;
+        }
+
+        try {
+            XMLHttpRequest.prototype.getResponseHeader.call(o);
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            getResponseHeader = true;
+        }
+
+        try {
+            XMLHttpRequest.prototype.getAllResponseHeaders.call(o);
+        } catch (e) {
+            if (!(e instanceof ReferenceError))
+                return;
+
+            if (e.message != "Not an XMLHttpRequest object")
+                return;
+
+            getAllResponseHeaders = true;
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml
new file mode 100644
index 0000000..c06bae3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml
@@ -0,0 +1,53 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool readyState: false
+    property bool openedState: false
+
+    property bool status: false
+    property bool statusText: false
+    property bool responseText: false
+    property bool responseXML: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        if (x.readyState == XMLHttpRequest.UNSENT)
+            readyState = true;
+
+        x.open("GET", url);
+
+        if (x.readyState  == XMLHttpRequest.OPENED)
+            openedState = true;
+
+        try {
+            var a = x.status;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                status = true;
+        }
+        try {
+            var a = x.statusText;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                statusText = true;
+        }
+        responseText = (x.responseText == "");
+        responseXML = (x.responseXML == null);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+
+        x.send()
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml
new file mode 100644
index 0000000..b6d4c32
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+QtObject {
+    property bool exceptionThrown: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        try {
+            x.open("GET");
+        } catch (e) {
+            if (e.code == DOMException.SYNTAX_ERR)
+                exceptionThrown = true;
+        }
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml
new file mode 100644
index 0000000..8c86c20
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+QtObject {
+    property bool exceptionThrown: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        try {
+            x.open("GET", "http://www.nokia.com", true, "user", "password", "extra");
+        } catch (e) {
+            if (e.code == DOMException.SYNTAX_ERR)
+                exceptionThrown = true;
+        }
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml
new file mode 100644
index 0000000..69f79ae
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+
+QtObject {
+    property bool exceptionThrown: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        try {
+            x.open("BLAH", "http://www.nokia.com");
+        } catch (e) {
+            if (e.code == DOMException.SYNTAX_ERR)
+                exceptionThrown = true;
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.expect
new file mode 100644
index 0000000..a740c79
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.expect
@@ -0,0 +1,7 @@
+GET /testdocument.html HTTP/1.1
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.reply
new file mode 100644
index 0000000..7ae6951
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.reply
@@ -0,0 +1,3 @@
+HTTP/1.0 200 OK
+Connection: close
+Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.wait b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.wait
new file mode 100644
index 0000000..e69de29
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml
new file mode 100644
index 0000000..1477279
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml
@@ -0,0 +1,17 @@
+import Qt 4.6
+
+QtObject {
+    property bool exceptionThrown: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        try {
+            x.open("GET", "http://www.nokia.com", false);
+        } catch (e) {
+            if (e.code == DOMException.NOT_SUPPORTED_ERR)
+                exceptionThrown = true;
+        }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml
new file mode 100644
index 0000000..19e37fa
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml
@@ -0,0 +1,53 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool readyState: false
+    property bool openedState: false
+
+    property bool status: false
+    property bool statusText: false
+    property bool responseText: false
+    property bool responseXML: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        if (x.readyState == XMLHttpRequest.UNSENT)
+            readyState = true;
+
+        x.open("GET", url, true, "username", "password");
+
+        if (x.readyState  == XMLHttpRequest.OPENED)
+            openedState = true;
+
+        try {
+            var a = x.status;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                status = true;
+        }
+        try {
+            var a = x.statusText;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                statusText = true;
+        }
+        responseText = (x.responseText == "");
+        responseXML = (x.responseXML == null);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+
+        x.send()
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml
new file mode 100644
index 0000000..983ea14
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml
@@ -0,0 +1,54 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool readyState: false
+    property bool openedState: false
+
+    property bool status: false
+    property bool statusText: false
+    property bool responseText: false
+    property bool responseXML: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        if (x.readyState == XMLHttpRequest.UNSENT)
+            readyState = true;
+
+        x.open("GET", url, true, "sampleusername", "password");
+
+        if (x.readyState  == XMLHttpRequest.OPENED)
+            openedState = true;
+
+        try {
+            var a = x.status;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                status = true;
+        }
+        try {
+            var a = x.statusText;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                statusText = true;
+        }
+        responseText = (x.responseText == "");
+        responseXML = (x.responseXML == null);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+
+        x.send()
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml
new file mode 100644
index 0000000..6b345cc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+    property bool done: false
+        
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("GET", url);
+
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                done = true;
+                dataOK = x.status == 404;
+            }
+        }
+
+        x.send();
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml
new file mode 100644
index 0000000..c0321dc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+    property bool done: false
+        
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("GET", url);
+
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                done = true;
+                dataOK = x.status == 302;
+            }
+        }
+
+        x.send();
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml
new file mode 100644
index 0000000..f6fabdb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml
@@ -0,0 +1,22 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+    property bool done: false
+        
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("GET", url);
+
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                done = true;
+                dataOK = x.responseText == "Redirected\n";
+            }
+        }
+
+        x.send();
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirecttarget.html b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirecttarget.html
new file mode 100644
index 0000000..95f35e0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirecttarget.html
@@ -0,0 +1 @@
+Redirected
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml
new file mode 100644
index 0000000..4bb3a7a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml
@@ -0,0 +1,52 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+    property string expectedText
+
+    property bool unsent: false
+    property bool opened: false
+    property bool sent: false
+    property bool headersReceived: false
+
+    property bool loading: false
+    property bool done: false
+
+    property bool reset: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        unsent = (x.responseText == "");
+
+        x.open("GET", url);
+
+        opened = (x.responseText == "");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
+                headersReceived = (x.responseText == "");
+            } else if (x.readyState == XMLHttpRequest.LOADING) {
+                if (x.responseText == expectedText)
+                    loading = true;
+            } else if (x.readyState == XMLHttpRequest.DONE) {
+                if (x.responseText == expectedText)
+                    done = true;
+
+                dataOK = (x.responseText == expectedText);
+
+                x.open("GET", url);
+
+                reset = (x.responseText == "");
+            }
+        }
+
+        x.send()
+
+        sent = (x.responseText == "");
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml
new file mode 100644
index 0000000..63f288e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml
@@ -0,0 +1,24 @@
+import Qt 4.6
+
+QtObject {
+    property bool xmlNull: false
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "testdocument.html");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+                xmlNull = (x.responseXML == null);
+            }
+        }
+
+
+        x.send()
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/seconddocument.html b/tests/auto/declarative/qdeclarativexmlhttprequest/data/seconddocument.html
new file mode 100644
index 0000000..a33f44b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/seconddocument.html
@@ -0,0 +1 @@
+This should not be read!
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml
new file mode 100644
index 0000000..0bad7df
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+
+QtObject {
+    property bool dataOK: false
+    property bool test: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("GET", "testdocument.html");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send();
+
+        try {
+            x.send()        
+        } catch (e) {
+            if (e.code == DOMException.INVALID_STATE_ERR)
+                test = true;
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.expect
new file mode 100644
index 0000000..81dd4a0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.expect
@@ -0,0 +1,10 @@
+POST /testdocument.html HTTP/1.1
+Content-Type: text/plain;charset=UTF-8
+Content-Length: 12
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
+My Sent Data
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml
new file mode 100644
index 0000000..03543a9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("POST", url);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send("My Sent Data");
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml
new file mode 100644
index 0000000..79a27b6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("POST", url);
+        x.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send("My Sent Data");
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml
new file mode 100644
index 0000000..e048769
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("POST", url);
+        x.setRequestHeader("Content-Type", "text/plain;charset=latin1");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send("My Sent Data");
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.expect
new file mode 100644
index 0000000..8fcf3ac
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.expect
@@ -0,0 +1,10 @@
+POST /testdocument.html HTTP/1.1
+Content-Type: charset=UTF-8;text/plain
+Content-Length: 12
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
+My Sent Data
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml
new file mode 100644
index 0000000..7ab0b27
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("POST", url);
+        x.setRequestHeader("Content-Type", "charset=UTF-8;text/plain");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send("My Sent Data");
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml
new file mode 100644
index 0000000..29bf2c2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("POST", url);
+        x.setRequestHeader("Content-Type", "charset=latin1;text/plain");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send("My Sent Data");
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.expect
new file mode 100644
index 0000000..97e6fac
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.expect
@@ -0,0 +1,10 @@
+PUT /testdocument.html HTTP/1.1
+Content-Type: text/plain;charset=UTF-8
+Content-Length: 12
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
+My Sent Data
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml
new file mode 100644
index 0000000..135f45c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("PUT", url);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send("My Sent Data");
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml
new file mode 100644
index 0000000..4a09527
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml
@@ -0,0 +1,23 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open("POST", url);
+        x.setRequestHeader("Content-Type", "text/plain");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send("My Sent Data");
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.reply
new file mode 100644
index 0000000..7ae6951
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.reply
@@ -0,0 +1,3 @@
+HTTP/1.0 200 OK
+Connection: close
+Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml
new file mode 100644
index 0000000..dd5fa46
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+
+QtObject {
+    property string reqType
+    property string url
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+        x.open(reqType, url);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                if (reqType == "HEAD")
+                    dataOK = (x.responseText == "");
+                else
+                    dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send("Data To Ignore");
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.reply
new file mode 100644
index 0000000..7ae6951
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.reply
@@ -0,0 +1,3 @@
+HTTP/1.0 200 OK
+Connection: close
+Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_GET.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_GET.expect
new file mode 100644
index 0000000..a740c79
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_GET.expect
@@ -0,0 +1,7 @@
+GET /testdocument.html HTTP/1.1
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_PUT.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_PUT.expect
new file mode 100644
index 0000000..991bd59
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_PUT.expect
@@ -0,0 +1,7 @@
+HEAD /testdocument.html HTTP/1.1
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml
new file mode 100644
index 0000000..7f51ecf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+
+QtObject {
+    property bool test: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        try {
+            x.send();
+        } catch (e) {
+            if (e.code == DOMException.INVALID_STATE_ERR)
+                test = true;
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.expect
new file mode 100644
index 0000000..4600f2a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.expect
@@ -0,0 +1,9 @@
+GET /testdocument.html HTTP/1.1
+TEST-HEADER: value
+TEST-HEADER2: value,value2
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml
new file mode 100644
index 0000000..b0723aa
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml
@@ -0,0 +1,28 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", url);
+
+        x.setRequestHeader("Test-header", "value");
+        x.setRequestHeader("Test-header2", "value");
+        x.setRequestHeader("Test-header2", "value2");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send();
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.reply
new file mode 100644
index 0000000..7ae6951
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.reply
@@ -0,0 +1,3 @@
+HTTP/1.0 200 OK
+Connection: close
+Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml
new file mode 100644
index 0000000..8305ae1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+QtObject {
+    property bool exceptionThrown: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "testdocument.html");
+
+        try {
+            x.setRequestHeader("Test-header");
+        } catch (e) {
+            if (e.code == DOMException.SYNTAX_ERR)
+                exceptionThrown = true;
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml
new file mode 100644
index 0000000..bf31eca
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml
@@ -0,0 +1,57 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+    property string header
+
+    property bool readyState: false
+    property bool openedState: false
+
+    property bool status: false
+    property bool statusText: false
+    property bool responseText: false
+    property bool responseXML: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        if (x.readyState == XMLHttpRequest.UNSENT)
+            readyState = true;
+
+        x.open("GET", url);
+
+        x.setRequestHeader(header, "Value");
+
+        if (x.readyState  == XMLHttpRequest.OPENED)
+            openedState = true;
+
+        try {
+            var a = x.status;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                status = true;
+        }
+        try {
+            var a = x.statusText;
+        } catch (error) {
+            if (error.code == DOMException.INVALID_STATE_ERR)
+                statusText = true;
+        }
+        responseText = (x.responseText == "");
+        responseXML = (x.responseXML == null);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+
+        x.send()
+    }
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml
new file mode 100644
index 0000000..c2bbc6e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml
@@ -0,0 +1,31 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+    property bool test: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", url);
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+                dataOK = (x.responseText == "QML Rocks!\n");
+            }
+        }
+
+        x.send();
+
+        try {
+            x.setRequestHeader("Test-header", "value");
+        } catch (e) {
+            if (e.code == DOMException.INVALID_STATE_ERR)
+                test = true;
+        }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml
new file mode 100644
index 0000000..30bc93e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml
@@ -0,0 +1,17 @@
+import Qt 4.6
+
+QtObject {
+    property bool test: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        try {
+            x.setRequestHeader("Test-header", "value");
+        } catch (e) {
+            if (e.code == DOMException.INVALID_STATE_ERR)
+                test = true;
+        }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml
new file mode 100644
index 0000000..ec1c5d8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml
@@ -0,0 +1,24 @@
+import Qt 4.6
+
+QtObject {
+    property int unsent: XMLHttpRequest.UNSENT
+    property int opened: XMLHttpRequest.OPENED
+    property int headers_received: XMLHttpRequest.HEADERS_RECEIVED
+    property int loading: XMLHttpRequest.LOADING
+    property int done: XMLHttpRequest.DONE
+
+    Component.onCompleted: {
+        // Attempt to overwrite and delete values
+        XMLHttpRequest.UNSENT = 9;
+        XMLHttpRequest.OPENED = 9;
+        XMLHttpRequest.HEADERS_RECEIVED = 9;
+        XMLHttpRequest.LOADING = 9;
+        XMLHttpRequest.DONE = 9;
+
+        delete XMLHttpRequest.UNSENT;
+        delete XMLHttpRequest.OPENED;
+        delete XMLHttpRequest.HEADERS_RECEIVED;
+        delete XMLHttpRequest.LOADING;
+        delete XMLHttpRequest.DONE;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.200.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.200.reply
new file mode 100644
index 0000000..7ae6951
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.200.reply
@@ -0,0 +1,3 @@
+HTTP/1.0 200 OK
+Connection: close
+Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.404.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.404.reply
new file mode 100644
index 0000000..2e29f56
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.404.reply
@@ -0,0 +1,3 @@
+HTTP/1.0 404 Document not found
+Connection: close
+Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.expect
new file mode 100644
index 0000000..a740c79
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.expect
@@ -0,0 +1,7 @@
+GET /testdocument.html HTTP/1.1
+Connection: Keep-Alive
+Accept-Encoding: gzip
+Accept-Language: en-US,*
+User-Agent: Mozilla/5.0
+Host: 127.0.0.1:14445
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml
new file mode 100644
index 0000000..04202c4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml
@@ -0,0 +1,77 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+    property int expectedStatus
+
+    property bool unsentException: false;
+    property bool openedException: false;
+    property bool sentException: false;
+
+    property bool headersReceived: false
+    property bool loading: false
+    property bool done: false
+
+    property bool resetException: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+	try {
+	    var a = x.status;
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		unsentException = true;
+	}
+
+        x.open("GET", url);
+
+	try {
+	    var a = x.status;
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		openedException = true;
+	}
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
+                if (x.status == expectedStatus)
+                    headersReceived = true;
+            } else if (x.readyState == XMLHttpRequest.LOADING) {
+                if (x.status == expectedStatus)
+                    loading = true;
+            } else if (x.readyState == XMLHttpRequest.DONE) {
+                if (x.status == expectedStatus)
+                    done = true;
+
+                if (expectedStatus == 404) {
+                    dataOK = (x.responseText == "");
+                } else {
+                    dataOK = (x.responseText == "QML Rocks!\n");
+                }
+
+                x.open("GET", url);
+
+                try {
+                    var a = x.status;
+                } catch (e) {
+                    if (e.code == DOMException.INVALID_STATE_ERR)
+                        resetException = true;
+                }
+
+            }
+        }
+
+        x.send()
+
+	try {
+	    var a = x.status;
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		sentException = true;
+	}
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml
new file mode 100644
index 0000000..8becc3b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml
@@ -0,0 +1,77 @@
+import Qt 4.6
+
+QtObject {
+    property string url
+    property string expectedStatus
+
+    property bool unsentException: false;
+    property bool openedException: false;
+    property bool sentException: false;
+
+    property bool headersReceived: false
+    property bool loading: false
+    property bool done: false
+
+    property bool resetException: false
+
+    property bool dataOK: false
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+	try {
+	    var a = x.statusText;
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		unsentException = true;
+	}
+
+        x.open("GET", url);
+
+	try {
+	    var a = x.statusText;
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		openedException = true;
+	}
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
+                if (x.statusText == expectedStatus)
+                    headersReceived = true;
+            } else if (x.readyState == XMLHttpRequest.LOADING) {
+                if (x.statusText == expectedStatus)
+                    loading = true;
+            } else if (x.readyState == XMLHttpRequest.DONE) {
+                if (x.statusText == expectedStatus)
+                    done = true;
+
+                if (expectedStatus != "OK") {
+                    dataOK = (x.responseText == "");
+                } else {
+                    dataOK = (x.responseText == "QML Rocks!\n");
+                }
+
+                x.open("GET", url);
+
+                try {
+                    var a = x.statusText;
+                } catch (e) {
+                    if (e.code == DOMException.INVALID_STATE_ERR)
+                        resetException = true;
+                }
+
+            }
+        }
+
+        x.send()
+
+	try {
+	    var a = x.statusText;
+	} catch (e) {
+	    if (e.code == DOMException.INVALID_STATE_ERR)
+		sentException = true;
+	}
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/testdocument.html b/tests/auto/declarative/qdeclarativexmlhttprequest/data/testdocument.html
new file mode 100644
index 0000000..8fe0f4b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/testdocument.html
@@ -0,0 +1 @@
+QML Rocks!
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
new file mode 100644
index 0000000..4615a07
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
@@ -0,0 +1,131 @@
+import Qt 4.6
+
+QtObject {
+    property bool xmlTest: false
+    property bool dataOK: false
+
+    Script {
+        function checkText(text, whitespacetext)
+        {
+            if (text == null)
+                return;
+
+            if (text.nodeName != "#text")
+                return;
+
+            if (text.nodeValue != "Hello world!")
+                return;
+
+            if (text.nodeType != 3)
+                return;
+
+            if (text.parentNode.nodeName != "item")
+                return;
+
+            if (text.childNodes.length != 0)
+                return;
+
+            if (text.firstChild != null)
+                return;
+
+            if (text.lastChild != null)
+                return;
+
+            if (text.previousSibling != null)
+                return;
+
+            if (text.nextSibling != null)
+                return;
+
+            if (text.attributes != null)
+                return;
+
+            if (text.wholeText != "Hello world!")
+                return;
+
+            if (text.data != "Hello world!")
+                return;
+
+            if (text.length != 12)
+                return;
+
+            if (text.isElementContentWhitespace != false)
+                return;
+
+            if (whitespacetext.nodeName != "#text")
+                return;
+
+            if (whitespacetext.nodeValue != "   ")
+                return;
+
+            if (whitespacetext.nodeType != 3)
+                return;
+
+            if (whitespacetext.parentNode.nodeName != "item")
+                return;
+
+            if (whitespacetext.childNodes.length != 0)
+                return;
+
+            if (whitespacetext.firstChild != null)
+                return;
+
+            if (whitespacetext.lastChild != null)
+                return;
+
+            if (whitespacetext.previousSibling != null)
+                return;
+
+            if (whitespacetext.nextSibling != null)
+                return;
+
+            if (whitespacetext.attributes != null)
+                return;
+
+            if (whitespacetext.wholeText != "   ")
+                return;
+
+            if (whitespacetext.data != "   ")
+                return;
+
+            if (whitespacetext.length != 3)
+                return;
+
+            if (whitespacetext.isElementContentWhitespace != true)
+                return;
+
+            xmlTest = true;
+        }
+
+        function checkXML(document)
+        {
+            checkText(document.documentElement.childNodes[0].childNodes[0],
+                      document.documentElement.childNodes[1].childNodes[0]);
+
+        }
+    }
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "text.xml");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+
+                dataOK = true;
+
+                if (x.responseXML != null)
+                    checkXML(x.responseXML);
+
+            }
+        }
+
+        x.send()
+    }
+}
+
+
+
+
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.xml
new file mode 100644
index 0000000..e741688
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.xml
@@ -0,0 +1 @@
+<root><item>Hello world!</item><item>   </item></root>
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro
new file mode 100644
index 0000000..7bc92af
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro
@@ -0,0 +1,13 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative network
+macx:CONFIG -= app_bundle
+
+INCLUDEPATH += ../shared/
+HEADERS += ../shared/testhttpserver.h
+
+SOURCES += tst_qdeclarativexmlhttprequest.cpp \
+           ../shared/testhttpserver.cpp
+
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
new file mode 100644
index 0000000..c4ae90a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
@@ -0,0 +1,1315 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QDebug>
+#include <QNetworkCookieJar>
+#include "testhttpserver.h"
+
+#define SERVER_PORT 14445
+
+class tst_qmlxmlhttprequest : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlxmlhttprequest() {}
+
+private slots:
+    void initTestCase() {
+        if (QLocale::system().name().replace(QChar::fromAscii('_'),QChar::fromAscii('-')) != QLatin1String("en-US")) {
+            qWarning() << "Test will fail unless LANG is en_US";
+        }
+    }
+
+    void domExceptionCodes();
+    void callbackException();
+    void callbackException_data();
+    void staticStateValues();
+    void instanceStateValues();
+    void constructor();
+    void defaultState();
+    void open();
+    void open_invalid_method();
+    void open_sync();
+    void open_arg_count();
+    void setRequestHeader();
+    void setRequestHeader_unsent();
+    void setRequestHeader_illegalName_data();
+    void setRequestHeader_illegalName();
+    void setRequestHeader_sent();
+    void setRequestHeader_args();
+    void send_unsent();
+    void send_alreadySent();
+    void send_ignoreData();
+    void send_withdata();
+    void abort();
+    void abort_unsent();
+    void abort_opened();
+    void getResponseHeader();
+    void getResponseHeader_unsent();
+    void getResponseHeader_sent();
+    void getResponseHeader_args();
+    void getAllResponseHeaders();
+    void getAllResponseHeaders_unsent();
+    void getAllResponseHeaders_sent();
+    void getAllResponseHeaders_args();
+    void status();
+    void statusText();
+    void responseText();
+    void responseXML_invalid();
+    void invalidMethodUsage();
+    void redirects();
+
+    // Attributes
+    void document();
+    void element();
+    void attr();
+    void text();
+    void cdata();
+
+    // Crashes
+    // void outstanding_request_at_shutdown();
+
+    // void network_errors()
+    // void readyState()
+
+private:
+    QDeclarativeEngine engine;
+};
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
+// Test that the dom exception codes are correct
+void tst_qmlxmlhttprequest::domExceptionCodes()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("domExceptionCodes.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("index_size_err").toInt(), 1);
+    QCOMPARE(object->property("domstring_size_err").toInt(), 2);
+    QCOMPARE(object->property("hierarchy_request_err").toInt(), 3);
+    QCOMPARE(object->property("wrong_document_err").toInt(), 4);
+    QCOMPARE(object->property("invalid_character_err").toInt(), 5);
+    QCOMPARE(object->property("no_data_allowed_err").toInt(), 6);
+    QCOMPARE(object->property("no_modification_allowed_err").toInt(), 7);
+    QCOMPARE(object->property("not_found_err").toInt(), 8);
+    QCOMPARE(object->property("not_supported_err").toInt(), 9);
+    QCOMPARE(object->property("inuse_attribute_err").toInt(), 10);
+    QCOMPARE(object->property("invalid_state_err").toInt(), 11);
+    QCOMPARE(object->property("syntax_err").toInt(), 12);
+    QCOMPARE(object->property("invalid_modification_err").toInt(), 13);
+    QCOMPARE(object->property("namespace_err").toInt(), 14);
+    QCOMPARE(object->property("invalid_access_err").toInt(), 15);
+    QCOMPARE(object->property("validation_err").toInt(), 16);
+    QCOMPARE(object->property("type_mismatch_err").toInt(), 17);
+
+    delete object;
+}
+
+#define TRY_WAIT(expr) \
+    do { \
+        for (int ii = 0; ii < 6; ++ii) { \
+            if ((expr)) break; \
+            QTest::qWait(50); \
+        } \
+        QVERIFY((expr)); \
+    } while (false) 
+
+
+void tst_qmlxmlhttprequest::callbackException_data()
+{
+    QTest::addColumn<QString>("which");
+    QTest::addColumn<int>("line");
+
+    QTest::newRow("on-opened") << "1" << 15;
+    QTest::newRow("on-loading") << "3" << 15;
+    QTest::newRow("on-done") << "4" << 15;
+}
+
+void tst_qmlxmlhttprequest::callbackException()
+{
+    // Test exception reporting for exceptions thrown at various points.
+
+    QFETCH(QString, which);
+    QFETCH(int, line);
+    
+    QString expect = TEST_FILE("callbackException.qml").toString() + ":"+QString::number(line)+": Error: Exception from Callback";
+    QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
+
+    QDeclarativeComponent component(&engine, TEST_FILE("callbackException.qml"));
+    QObject *object = component.beginCreate(engine.rootContext());
+    QVERIFY(object != 0);
+    object->setProperty("url", "testdocument.html");
+    object->setProperty("which", which);
+    component.completeCreate();
+
+    TRY_WAIT(object->property("threw").toBool() == true);
+
+    delete object;
+}
+
+// Test that the state value properties on the XMLHttpRequest constructor have the correct values.
+// ### WebKit does not do this, but it seems to fit the standard and QML better
+void tst_qmlxmlhttprequest::staticStateValues()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("staticStateValues.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("unsent").toInt(), 0);
+    QCOMPARE(object->property("opened").toInt(), 1);
+    QCOMPARE(object->property("headers_received").toInt(), 2);
+    QCOMPARE(object->property("loading").toInt(), 3);
+    QCOMPARE(object->property("done").toInt(), 4);
+
+    delete object;
+}
+
+// Test that the state value properties on instances have the correct values.
+void tst_qmlxmlhttprequest::instanceStateValues()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("instanceStateValues.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("unsent").toInt(), 0);
+    QCOMPARE(object->property("opened").toInt(), 1);
+    QCOMPARE(object->property("headers_received").toInt(), 2);
+    QCOMPARE(object->property("loading").toInt(), 3);
+    QCOMPARE(object->property("done").toInt(), 4);
+
+    delete object;
+}
+
+// Test calling constructor 
+void tst_qmlxmlhttprequest::constructor()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("constructor.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("calledAsConstructor").toBool(), true);
+    QCOMPARE(object->property("calledAsFunction").toBool(), true);
+
+    delete object;
+}
+
+// Test that all the properties are set correctly before any request is sent
+void tst_qmlxmlhttprequest::defaultState()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("defaultState.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("readState").toInt(), 0);
+    QCOMPARE(object->property("statusIsException").toBool(), true);
+    QCOMPARE(object->property("statusTextIsException").toBool(), true);
+    QCOMPARE(object->property("responseText").toString(), QString());
+    QCOMPARE(object->property("responseXMLIsNull").toBool(), true);
+
+    delete object;
+}
+
+// Test valid XMLHttpRequest.open() calls
+void tst_qmlxmlhttprequest::open()
+{
+    // Relative url
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("open.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "testdocument.html");
+        component.completeCreate();
+
+        QCOMPARE(object->property("readyState").toBool(), true);
+        QCOMPARE(object->property("openedState").toBool(), true);
+        QCOMPARE(object->property("status").toBool(), true);
+        QCOMPARE(object->property("statusText").toBool(), true);
+        QCOMPARE(object->property("responseText").toBool(), true);
+        QCOMPARE(object->property("responseXML").toBool(), true);
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+
+    // Absolute url
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("open.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", TEST_FILE("testdocument.html").toString());
+        component.completeCreate();
+
+        QCOMPARE(object->property("readyState").toBool(), true);
+        QCOMPARE(object->property("openedState").toBool(), true);
+        QCOMPARE(object->property("status").toBool(), true);
+        QCOMPARE(object->property("statusText").toBool(), true);
+        QCOMPARE(object->property("responseText").toBool(), true);
+        QCOMPARE(object->property("responseXML").toBool(), true);
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+
+    // Absolute network url
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("open_network.expect"), 
+                            TEST_FILE("open_network.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("open.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        QCOMPARE(object->property("readyState").toBool(), true);
+        QCOMPARE(object->property("openedState").toBool(), true);
+        QCOMPARE(object->property("status").toBool(), true);
+        QCOMPARE(object->property("statusText").toBool(), true);
+        QCOMPARE(object->property("responseText").toBool(), true);
+        QCOMPARE(object->property("responseXML").toBool(), true);
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+
+    // User/pass
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("open_network.expect"), 
+                            TEST_FILE("open_network.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("open_user.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        QCOMPARE(object->property("readyState").toBool(), true);
+        QCOMPARE(object->property("openedState").toBool(), true);
+        QCOMPARE(object->property("status").toBool(), true);
+        QCOMPARE(object->property("statusText").toBool(), true);
+        QCOMPARE(object->property("responseText").toBool(), true);
+        QCOMPARE(object->property("responseXML").toBool(), true);
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        // ### Check that the username/password were sent to the server
+
+        delete object;
+    }
+}
+
+// Test that calling XMLHttpRequest.open() with an invalid method raises an exception
+void tst_qmlxmlhttprequest::open_invalid_method()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("open_invalid_method.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("exceptionThrown").toBool(), true);
+
+    delete object;
+}
+
+// Test that calling XMLHttpRequest.open() with sync raises an exception
+void tst_qmlxmlhttprequest::open_sync()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("open_sync.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("exceptionThrown").toBool(), true);
+
+    delete object;
+}
+
+// Calling with incorrect arg count raises an exception
+void tst_qmlxmlhttprequest::open_arg_count()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("open_arg_count.1.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("exceptionThrown").toBool(), true);
+
+        delete object;
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("open_arg_count.2.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->property("exceptionThrown").toBool(), true);
+
+        delete object;
+    }
+}
+
+// Test valid setRequestHeader() calls
+void tst_qmlxmlhttprequest::setRequestHeader()
+{
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    QVERIFY(server.wait(TEST_FILE("setRequestHeader.expect"), 
+                        TEST_FILE("setRequestHeader.reply"), 
+                        TEST_FILE("testdocument.html")));
+
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader.qml"));
+    QObject *object = component.beginCreate(engine.rootContext());
+    QVERIFY(object != 0);
+    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+    component.completeCreate();
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    delete object;
+}
+
+// Test setting headers before open() throws exception
+void tst_qmlxmlhttprequest::setRequestHeader_unsent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_unsent.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toBool(), true);
+
+    delete object;
+}
+
+void tst_qmlxmlhttprequest::setRequestHeader_illegalName_data()
+{
+    QTest::addColumn<QString>("name");
+
+    QTest::newRow("Accept-Charset") << "AccePT-CHArset";
+    QTest::newRow("Accept-Encoding") << "AccEpt-EnCOding";
+    QTest::newRow("Connection") << "ConnECtion";
+    QTest::newRow("Content-Length") << "ContEnt-LenGth";
+    QTest::newRow("Cookie") << "CookIe";
+    QTest::newRow("Cookie2") << "CoOkie2";
+    QTest::newRow("Content-Transfer-Encoding") << "ConteNT-tRANSFER-eNCOding";
+    QTest::newRow("Date") << "DaTE";
+    QTest::newRow("Expect") << "ExPect";
+    QTest::newRow("Host") << "HoST";
+    QTest::newRow("Keep-Alive") << "KEEP-aLive";
+    QTest::newRow("Referer") << "ReferEr";
+    QTest::newRow("TE") << "Te";
+    QTest::newRow("Trailer") << "TraILEr";
+    QTest::newRow("Transfer-Encoding") << "tRANsfer-Encoding";
+    QTest::newRow("Upgrade") << "UpgrADe";
+    QTest::newRow("User-Agent") << "uSEr-Agent";
+    QTest::newRow("Via") << "vIa";
+    QTest::newRow("Proxy-") << "ProXy-";
+    QTest::newRow("Sec-") << "SeC-";
+    QTest::newRow("Proxy-*") << "Proxy-BLAH";
+    QTest::newRow("Sec-*") << "Sec-F";
+}
+
+// Tests that using illegal header names has no effect
+void tst_qmlxmlhttprequest::setRequestHeader_illegalName()
+{
+    QFETCH(QString, name);
+
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    QVERIFY(server.wait(TEST_FILE("open_network.expect"), 
+                        TEST_FILE("open_network.reply"), 
+                        TEST_FILE("testdocument.html")));
+
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_illegalName.qml"));
+    QObject *object = component.beginCreate(engine.rootContext());
+    QVERIFY(object != 0);
+    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+    object->setProperty("header", name);
+    component.completeCreate();
+
+    QCOMPARE(object->property("readyState").toBool(), true);
+    QCOMPARE(object->property("openedState").toBool(), true);
+    QCOMPARE(object->property("status").toBool(), true);
+    QCOMPARE(object->property("statusText").toBool(), true);
+    QCOMPARE(object->property("responseText").toBool(), true);
+    QCOMPARE(object->property("responseXML").toBool(), true);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    delete object;
+}
+
+// Test that attempting to set a header after a request is sent throws an exception
+void tst_qmlxmlhttprequest::setRequestHeader_sent()
+{
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    QVERIFY(server.wait(TEST_FILE("open_network.expect"), 
+                        TEST_FILE("open_network.reply"), 
+                        TEST_FILE("testdocument.html")));
+
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_sent.qml"));
+    QObject *object = component.beginCreate(engine.rootContext());
+    QVERIFY(object != 0);
+    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+    component.completeCreate();
+
+    QCOMPARE(object->property("test").toBool(), true);
+    
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    delete object;
+}
+
+// Invalid arg count throws exception
+void tst_qmlxmlhttprequest::setRequestHeader_args()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_args.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("exceptionThrown").toBool(), true);
+
+    delete object;
+}
+
+// Test that calling send() in UNSENT state throws an exception
+void tst_qmlxmlhttprequest::send_unsent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("send_unsent.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toBool(), true);
+
+    delete object;
+}
+
+// Test attempting to resend a sent request throws an exception
+void tst_qmlxmlhttprequest::send_alreadySent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("send_alreadySent.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toBool(), true);
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    delete object;
+}
+
+// Test that send for a GET or HEAD ignores data
+void tst_qmlxmlhttprequest::send_ignoreData()
+{
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("send_ignoreData_GET.expect"), 
+                            TEST_FILE("send_ignoreData.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("send_ignoreData.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("reqType", "GET");
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("send_ignoreData_PUT.expect"), 
+                            TEST_FILE("send_ignoreData.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("send_ignoreData.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("reqType", "HEAD");
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+}
+
+// Test that send()'ing data works
+void tst_qmlxmlhttprequest::send_withdata()
+{
+    // No content-type
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("send_data.1.expect"), 
+                            TEST_FILE("send_data.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.1.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+
+    // Correct content-type
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("send_data.1.expect"), 
+                            TEST_FILE("send_data.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.2.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+
+    // Incorrect content-type
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("send_data.1.expect"), 
+                            TEST_FILE("send_data.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.3.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+    
+    // Correct content-type - out of order
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("send_data.4.expect"), 
+                            TEST_FILE("send_data.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.4.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+
+    // Incorrect content-type - out of order
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("send_data.4.expect"), 
+                            TEST_FILE("send_data.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.5.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+
+    // PUT
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("send_data.6.expect"), 
+                            TEST_FILE("send_data.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.6.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+
+    // Correct content-type - no charset
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("send_data.1.expect"), 
+                            TEST_FILE("send_data.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.7.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        delete object;
+    }
+}
+
+// Test abort() has no effect in unsent state
+void tst_qmlxmlhttprequest::abort_unsent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("abort_unsent.qml"));
+    QObject *object = component.beginCreate(engine.rootContext());
+    QVERIFY(object != 0);
+    object->setProperty("url", "testdocument.html");
+    component.completeCreate();
+
+    QCOMPARE(object->property("readyState").toBool(), true);
+    QCOMPARE(object->property("openedState").toBool(), true);
+    QCOMPARE(object->property("status").toBool(), true);
+    QCOMPARE(object->property("statusText").toBool(), true);
+    QCOMPARE(object->property("responseText").toBool(), true);
+    QCOMPARE(object->property("responseXML").toBool(), true);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    delete object;
+}
+
+// Test abort() cancels an open (but unsent) request
+void tst_qmlxmlhttprequest::abort_opened()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("abort_opened.qml"));
+    QObject *object = component.beginCreate(engine.rootContext());
+    QVERIFY(object != 0);
+    object->setProperty("url", "testdocument.html");
+    component.completeCreate();
+
+    QCOMPARE(object->property("readyState").toBool(), true);
+    QCOMPARE(object->property("openedState").toBool(), true);
+    QCOMPARE(object->property("status").toBool(), true);
+    QCOMPARE(object->property("statusText").toBool(), true);
+    QCOMPARE(object->property("responseText").toBool(), true);
+    QCOMPARE(object->property("responseXML").toBool(), true);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    delete object;
+}
+
+// Test abort() aborts in progress send
+void tst_qmlxmlhttprequest::abort()
+{
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    QVERIFY(server.wait(TEST_FILE("abort.expect"), 
+                        TEST_FILE("abort.reply"), 
+                        TEST_FILE("testdocument.html")));
+
+    QDeclarativeComponent component(&engine, TEST_FILE("abort.qml"));
+    QObject *object = component.beginCreate(engine.rootContext());
+    QVERIFY(object != 0);
+    object->setProperty("urlDummy", "http://127.0.0.1:14449/testdocument.html");
+    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+    component.completeCreate();
+
+    QCOMPARE(object->property("seenDone").toBool(), true);
+    QCOMPARE(object->property("didNotSeeUnsent").toBool(), true);
+    QCOMPARE(object->property("endStateUnsent").toBool(), true);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    delete object;
+}
+
+void tst_qmlxmlhttprequest::getResponseHeader()
+{
+    QDeclarativeEngine engine; // Avoid cookie contamination
+
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    QVERIFY(server.wait(TEST_FILE("getResponseHeader.expect"), 
+                        TEST_FILE("getResponseHeader.reply"), 
+                        TEST_FILE("testdocument.html")));
+
+
+    QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader.qml"));
+    QObject *object = component.beginCreate(engine.rootContext());
+    QVERIFY(object != 0);
+    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+    component.completeCreate();
+
+    QCOMPARE(object->property("unsentException").toBool(), true);
+    QCOMPARE(object->property("openedException").toBool(), true);
+    QCOMPARE(object->property("readyState").toBool(), true);
+    QCOMPARE(object->property("openedState").toBool(), true);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    QCOMPARE(object->property("headersReceivedState").toBool(), true);
+    QCOMPARE(object->property("headersReceivedNullHeader").toBool(), true);
+    QCOMPARE(object->property("headersReceivedValidHeader").toBool(), true);
+    QCOMPARE(object->property("headersReceivedMultiValidHeader").toBool(), true);
+    QCOMPARE(object->property("headersReceivedCookieHeader").toBool(), true);
+
+    QCOMPARE(object->property("doneState").toBool(), true);
+    QCOMPARE(object->property("doneNullHeader").toBool(), true);
+    QCOMPARE(object->property("doneValidHeader").toBool(), true);
+    QCOMPARE(object->property("doneMultiValidHeader").toBool(), true);
+    QCOMPARE(object->property("doneCookieHeader").toBool(), true);
+
+    delete object;
+}
+
+// Test getResponseHeader throws an exception in an invalid state
+void tst_qmlxmlhttprequest::getResponseHeader_unsent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_unsent.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toBool(), true);
+
+    delete object;
+}
+
+// Test getResponseHeader throws an exception in an invalid state
+void tst_qmlxmlhttprequest::getResponseHeader_sent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_sent.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toBool(), true);
+
+    delete object;
+}
+
+// Invalid arg count throws exception
+void tst_qmlxmlhttprequest::getResponseHeader_args()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_args.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    TRY_WAIT(object->property("exceptionThrown").toBool() == true);
+
+    delete object;
+}
+
+void tst_qmlxmlhttprequest::getAllResponseHeaders()
+{
+    QDeclarativeEngine engine; // Avoid cookie contamination
+
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    QVERIFY(server.wait(TEST_FILE("getResponseHeader.expect"), 
+                        TEST_FILE("getResponseHeader.reply"), 
+                        TEST_FILE("testdocument.html")));
+
+    QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders.qml"));
+    QObject *object = component.beginCreate(engine.rootContext());
+    QVERIFY(object != 0);
+    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+    component.completeCreate();
+
+    QCOMPARE(object->property("unsentException").toBool(), true);
+    QCOMPARE(object->property("openedException").toBool(), true);
+    QCOMPARE(object->property("readyState").toBool(), true);
+    QCOMPARE(object->property("openedState").toBool(), true);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    QCOMPARE(object->property("headersReceivedState").toBool(), true);
+    QCOMPARE(object->property("headersReceivedHeader").toBool(), true);
+
+    QCOMPARE(object->property("doneState").toBool(), true);
+    QCOMPARE(object->property("doneHeader").toBool(), true);
+
+    delete object;
+}
+
+// Test getAllResponseHeaders throws an exception in an invalid state
+void tst_qmlxmlhttprequest::getAllResponseHeaders_unsent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_unsent.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toBool(), true);
+
+    delete object;
+}
+
+// Test getAllResponseHeaders throws an exception in an invalid state
+void tst_qmlxmlhttprequest::getAllResponseHeaders_sent()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_sent.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("test").toBool(), true);
+
+    delete object;
+}
+
+// Invalid arg count throws exception
+void tst_qmlxmlhttprequest::getAllResponseHeaders_args()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_args.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    TRY_WAIT(object->property("exceptionThrown").toBool() == true);
+
+    delete object;
+}
+
+void tst_qmlxmlhttprequest::status()
+{
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("status.expect"), 
+                            TEST_FILE("status.200.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("status.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        object->setProperty("expectedStatus", 200);
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        QCOMPARE(object->property("unsentException").toBool(), true);
+        QCOMPARE(object->property("openedException").toBool(), true);
+        QCOMPARE(object->property("sentException").toBool(), true);
+        QCOMPARE(object->property("headersReceived").toBool(), true);
+        QCOMPARE(object->property("loading").toBool(), true);
+        QCOMPARE(object->property("done").toBool(), true);
+        QCOMPARE(object->property("resetException").toBool(), true);
+
+        delete object;
+    }
+
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("status.expect"), 
+                            TEST_FILE("status.404.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("status.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        object->setProperty("expectedStatus", 404);
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        QCOMPARE(object->property("unsentException").toBool(), true);
+        QCOMPARE(object->property("openedException").toBool(), true);
+        QCOMPARE(object->property("sentException").toBool(), true);
+        QCOMPARE(object->property("headersReceived").toBool(), true);
+        QCOMPARE(object->property("loading").toBool(), true);
+        QCOMPARE(object->property("done").toBool(), true);
+        QCOMPARE(object->property("resetException").toBool(), true);
+
+        delete object;
+    }
+}
+
+void tst_qmlxmlhttprequest::statusText()
+{
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("status.expect"), 
+                            TEST_FILE("status.200.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("statusText.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        object->setProperty("expectedStatus", "OK");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        QCOMPARE(object->property("unsentException").toBool(), true);
+        QCOMPARE(object->property("openedException").toBool(), true);
+        QCOMPARE(object->property("sentException").toBool(), true);
+        QCOMPARE(object->property("headersReceived").toBool(), true);
+        QCOMPARE(object->property("loading").toBool(), true);
+        QCOMPARE(object->property("done").toBool(), true);
+        QCOMPARE(object->property("resetException").toBool(), true);
+
+        delete object;
+    }
+
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("status.expect"), 
+                            TEST_FILE("status.404.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("statusText.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        object->setProperty("expectedStatus", "Document not found");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        QCOMPARE(object->property("unsentException").toBool(), true);
+        QCOMPARE(object->property("openedException").toBool(), true);
+        QCOMPARE(object->property("sentException").toBool(), true);
+        QCOMPARE(object->property("headersReceived").toBool(), true);
+        QCOMPARE(object->property("loading").toBool(), true);
+        QCOMPARE(object->property("done").toBool(), true);
+        QCOMPARE(object->property("resetException").toBool(), true);
+
+        delete object;
+    }
+}
+
+void tst_qmlxmlhttprequest::responseText()
+{
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("status.expect"), 
+                            TEST_FILE("status.200.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("responseText.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        object->setProperty("expectedText", "QML Rocks!\n");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        QCOMPARE(object->property("unsent").toBool(), true);
+        QCOMPARE(object->property("opened").toBool(), true);
+        QCOMPARE(object->property("sent").toBool(), true);
+        QCOMPARE(object->property("headersReceived").toBool(), true);
+        QCOMPARE(object->property("loading").toBool(), true);
+        QCOMPARE(object->property("done").toBool(), true);
+        QCOMPARE(object->property("reset").toBool(), true);
+
+        delete object;
+    }
+
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("status.expect"), 
+                            TEST_FILE("status.200.reply"), 
+                            QUrl()));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("responseText.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        object->setProperty("expectedText", "");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        QCOMPARE(object->property("unsent").toBool(), true);
+        QCOMPARE(object->property("opened").toBool(), true);
+        QCOMPARE(object->property("sent").toBool(), true);
+        QCOMPARE(object->property("headersReceived").toBool(), true);
+        QCOMPARE(object->property("loading").toBool(), true);
+        QCOMPARE(object->property("done").toBool(), true);
+        QCOMPARE(object->property("reset").toBool(), true);
+
+        delete object;
+    }
+
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        QVERIFY(server.wait(TEST_FILE("status.expect"), 
+                            TEST_FILE("status.404.reply"), 
+                            TEST_FILE("testdocument.html")));
+
+        QDeclarativeComponent component(&engine, TEST_FILE("responseText.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
+        object->setProperty("expectedText", "");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("dataOK").toBool() == true);
+
+        QCOMPARE(object->property("unsent").toBool(), true);
+        QCOMPARE(object->property("opened").toBool(), true);
+        QCOMPARE(object->property("sent").toBool(), true);
+        QCOMPARE(object->property("headersReceived").toBool(), true);
+        QCOMPARE(object->property("loading").toBool(), true);
+        QCOMPARE(object->property("done").toBool(), true);
+        QCOMPARE(object->property("reset").toBool(), true);
+
+        delete object;
+    }
+}
+
+// Test that calling hte XMLHttpRequest methods on a non-XMLHttpRequest object
+// throws an exception
+void tst_qmlxmlhttprequest::invalidMethodUsage()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("invalidMethodUsage.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("onreadystatechange").toBool(), true);
+    QCOMPARE(object->property("readyState").toBool(), true);
+    QCOMPARE(object->property("status").toBool(), true);
+    QCOMPARE(object->property("statusText").toBool(), true);
+    QCOMPARE(object->property("responseText").toBool(), true);
+    QCOMPARE(object->property("responseXML").toBool(), true);
+
+    QCOMPARE(object->property("open").toBool(), true);
+    QCOMPARE(object->property("setRequestHeader").toBool(), true);
+    QCOMPARE(object->property("send").toBool(), true);
+    QCOMPARE(object->property("abort").toBool(), true);
+    QCOMPARE(object->property("getResponseHeader").toBool(), true);
+    QCOMPARE(object->property("getAllResponseHeaders").toBool(), true);
+
+    delete object;
+}
+
+// Test that XMLHttpRequest transparently redirects
+void tst_qmlxmlhttprequest::redirects()
+{
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirecttarget.html");
+        server.serveDirectory("data");
+
+        QDeclarativeComponent component(&engine, TEST_FILE("redirects.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/redirect.html");
+        object->setProperty("expectedText", "");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("done").toBool() == true);
+        QCOMPARE(object->property("dataOK").toBool(), true);
+
+        delete object;
+    }
+
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirectmissing.html");
+        server.serveDirectory("data");
+
+        QDeclarativeComponent component(&engine, TEST_FILE("redirectError.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/redirect.html");
+        object->setProperty("expectedText", "");
+        component.completeCreate();
+
+        TRY_WAIT(object->property("done").toBool() == true);
+        QCOMPARE(object->property("dataOK").toBool(), true);
+
+        delete object;
+    }
+
+    {
+        TestHTTPServer server(SERVER_PORT);
+        QVERIFY(server.isValid());
+        server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirect.html");
+        server.serveDirectory("data");
+
+        QDeclarativeComponent component(&engine, TEST_FILE("redirectRecur.qml"));
+        QObject *object = component.beginCreate(engine.rootContext());
+        QVERIFY(object != 0);
+        object->setProperty("url", "http://127.0.0.1:14445/redirect.html");
+        object->setProperty("expectedText", "");
+        component.completeCreate();
+
+        for (int ii = 0; ii < 60; ++ii) { 
+            if (object->property("done").toBool()) break; 
+            QTest::qWait(50); 
+        } 
+        QVERIFY(object->property("done").toBool() == true);
+
+        QCOMPARE(object->property("dataOK").toBool(), true);
+
+        delete object;
+    }
+}
+
+void tst_qmlxmlhttprequest::responseXML_invalid()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("responseXML_invalid.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    QCOMPARE(object->property("xmlNull").toBool(), true);
+
+    delete object;
+}
+
+// Test the Document DOM element
+void tst_qmlxmlhttprequest::document()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("document.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    QCOMPARE(object->property("xmlTest").toBool(), true);
+
+    delete object;
+}
+
+// Test the Element DOM element
+void tst_qmlxmlhttprequest::element()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("element.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    QCOMPARE(object->property("xmlTest").toBool(), true);
+
+    delete object;
+}
+
+// Test the Attr DOM element
+void tst_qmlxmlhttprequest::attr()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("attr.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    QCOMPARE(object->property("xmlTest").toBool(), true);
+
+    delete object;
+}
+
+// Test the Text DOM element
+void tst_qmlxmlhttprequest::text()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("text.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    QCOMPARE(object->property("xmlTest").toBool(), true);
+
+    delete object;
+}
+
+// Test the CDataSection DOM element
+void tst_qmlxmlhttprequest::cdata()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("cdata.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    TRY_WAIT(object->property("dataOK").toBool() == true);
+
+    QCOMPARE(object->property("xmlTest").toBool(), true);
+
+    delete object;
+}
+
+QTEST_MAIN(tst_qmlxmlhttprequest)
+
+#include "tst_qdeclarativexmlhttprequest.moc"
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml
new file mode 100644
index 0000000..2cbb027
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+XmlListModel {
+    source: "model.xml"
+    query: "/Pets/Pet"
+    XmlRole { name: "name"; query: "name/string()" }
+    XmlRole { name: "type"; query: "type/string()" }
+    XmlRole { name: "age"; query: "age/number()" }
+    XmlRole { name: "size"; query: "size/string()" }
+}
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml
new file mode 100644
index 0000000..40cd6d0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml
@@ -0,0 +1,54 @@
+<Pets>
+    <Pet>
+        <name>Polly</name>
+        <type>Parrot</type>
+        <age>12</age>
+        <size>Small</size>
+    </Pet>
+    <Pet>
+        <name>Penny</name>
+        <type>Turtle</type>
+        <age>4</age>
+        <size>Small</size>
+    </Pet>
+    <Pet>
+        <name>Warren</name>
+        <type>Rabbit</type>
+        <age>2</age>
+        <size>Small</size>
+    </Pet>
+    <Pet>
+        <name>Spot</name>
+        <type>Dog</type>
+        <age>9</age>
+        <size>Medium</size>
+    </Pet>
+    <Pet>
+        <name>Whiskers</name>
+        <type>Cat</type>
+        <age>2</age>
+        <size>Medium</size>
+    </Pet>
+    <Pet>
+        <name>Joey</name>
+        <type>Kangaroo</type>
+        <age>1</age>
+    </Pet>
+    <Pet>
+        <name>Kimba</name>
+        <type>Bunny</type>
+        <age>65</age>
+        <size>Large</size>
+    </Pet>
+    <Pet>
+        <name>Rover</name>
+        <type>Dog</type>
+        <size>Large</size>
+    </Pet>
+    <Pet>
+        <name>Tiny</name>
+        <type>Elephant</type>
+        <age>15</age>
+        <size>Large</size>
+    </Pet>
+</Pets>
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
new file mode 100644
index 0000000..140e0ad
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+XmlListModel {
+    source: "model.xml"
+    query: "/Pets/Pet"
+    XmlRole { name: "name"; query: "name/string()" }
+    XmlRole { name: "type"; query: "type/string()" }
+    XmlRole { name: "age"; query: "age/number()" }
+    XmlRole { name: "size"; query: "size/string()" }
+    XmlRole { name: "tricks"; query: "tricks/string()" }
+}
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml
new file mode 100644
index 0000000..13dea91
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+XmlListModel {
+    source: "recipes.xml"
+    query: "/recipes/recipe"
+    XmlRole { name: "title"; query: "@title/string()" }
+    XmlRole { name: "picture"; query: "picture/string()" }
+    XmlRole { name: "ingredients"; query: "ingredients/string()" }
+    XmlRole { name: "preparation"; query: "method/string()" }
+}
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml
new file mode 100644
index 0000000..d71de60
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml
@@ -0,0 +1,90 @@
+<recipes>
+    <recipe title="Pancakes">
+        <picture>content/pics/pancakes.jpg</picture>
+        <ingredients><![CDATA[<html>
+                       <ul>
+                        <li> 1 cup (150g) self-raising flour
+                        <li> 1 tbs caster sugar
+                        <li> 3/4 cup (185ml) milk
+                        <li> 1 egg
+                       </ul>
+                      </html>
+        ]]></ingredients>
+        <method><![CDATA[<html>
+                  <ol>
+                   <li> Sift flour and sugar together into a bowl. Add a pinch of salt.
+                   <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth.
+                   <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface.
+                   <li> Turn over and cook other side until golden.
+                  </ol>
+                 </html>
+        ]]></method>
+    </recipe>
+    <recipe title="Fruit Salad">
+        <picture>content/pics/fruit-salad.jpg</picture>
+        <ingredients><![CDATA[* Seasonal Fruit]]></ingredients>
+        <method><![CDATA[* Chop fruit and place in a bowl.]]></method>
+    </recipe>
+    <recipe title="Vegetable Soup">
+        <picture>content/pics/vegetable-soup.jpg</picture>
+        <ingredients><![CDATA[<html>
+                       <ul>
+                        <li> 1 onion
+                        <li> 1 turnip
+                        <li> 1 potato
+                        <li> 1 carrot
+                        <li> 1 head of celery
+                        <li> 1 1/2 litres of water
+                       </ul>
+                      </html>
+        ]]></ingredients>
+        <method><![CDATA[<html>
+                  <ol>
+                   <li> Chop vegetables.
+                   <li> Boil in water until vegetables soften.
+                   <li> Season with salt and pepper to taste.
+                  </ol>
+                 </html>
+        ]]></method>
+    </recipe>
+    <recipe title="Hamburger">
+        <picture>content/pics/hamburger.jpg</picture>
+        <ingredients><![CDATA[<html>
+                       <ul>
+                        <li> 500g minced beef
+                        <li> Seasoning
+                        <li> lettuce, tomato, onion, cheese
+                        <li> 1 hamburger bun for each burger
+                       </ul>
+                      </html>
+        ]]></ingredients>
+        <method><![CDATA[<html>
+                  <ol>
+                   <li> Mix the beef, together with seasoning, in a food processor.
+                   <li> Shape the beef into burgers.
+                   <li> Grill the burgers for about 5 mins on each side (until cooked through)
+                   <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion.
+                  </ol>
+                 </html>
+        ]]></method>
+    </recipe>
+    <recipe title="Lemonade">
+        <picture>content/pics/lemonade.jpg</picture>
+        <ingredients><![CDATA[<html>
+                       <ul>
+                        <li> 1 cup Lemon Juice
+                        <li> 1 cup Sugar
+                        <li> 6 Cups of Water (2 cups warm water, 4 cups cold water)
+                       </ul>
+                      </html>
+        ]]></ingredients>
+        <method><![CDATA[<html>
+                  <ol>
+                   <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves.
+                   <li> Pour in lemon juice, stir again, and add 4 cups of cold water.
+                   <li> Chill or serve over ice cubes.
+                  </ol>
+                 </html>
+        ]]></method>
+    </recipe>
+</recipes>
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml
new file mode 100644
index 0000000..26c533f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+XmlListModel {
+    source: "model.xml"
+    query: "/Pets/Pet"
+    XmlRole { name: "name"; query: "/name/string()" }   //starts with '/'
+    XmlRole { name: "type"; query: "type" }             //no type
+    XmlRole { name: "age"; query: "age/" }              //ends with '/'
+    XmlRole { name: "size"; query: "size/number()" }    //wrong type
+}
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml
new file mode 100644
index 0000000..b90e57e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+
+XmlListModel {
+    query: "/data/item"
+    XmlRole { id: nameRole; name: "name"; query: "name/string()"; isKey: true }
+    XmlRole { name: "age"; query: "age/number()"; isKey: true }
+    XmlRole { name: "sport"; query: "sport/string()" }
+
+    function disableNameKey() {
+        nameRole.isKey = false;
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml
new file mode 100644
index 0000000..ed0f293
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+XmlListModel {
+    source: "model.xml"
+    query: "/Pets/Pet"
+    XmlRole { name: "name"; query: "name/string()" }
+    XmlRole { name: "name"; query: "type/string()" }
+}
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
new file mode 100644
index 0000000..88832dc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
@@ -0,0 +1,11 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+contains(QT_CONFIG,xmlpatterns) {
+    QT += xmlpatterns
+    DEFINES += QTEST_XMLPATTERNS
+}
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativexmllistmodel.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
new file mode 100644
index 0000000..9ef1298
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -0,0 +1,457 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtTest/qsignalspy.h>
+#include <QtCore/qtimer.h>
+
+#ifdef QTEST_XMLPATTERNS
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativexmllistmodel_p.h>
+#include "../../../shared/util.h"
+
+typedef QPair<int, int> QDeclarativeXmlListRange;
+typedef QList<QVariantList> QDeclarativeXmlModelData;
+
+Q_DECLARE_METATYPE(QList<QDeclarativeXmlListRange>)
+Q_DECLARE_METATYPE(QDeclarativeXmlModelData)
+
+class tst_qmlxmllistmodel : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlxmllistmodel() {}
+
+private slots:
+    void buildModel();
+    void missingFields();
+    void cdata();
+    void attributes();
+    void roles();
+    void roleErrors();
+    void uniqueRoleNames();
+    void useKeys();
+    void useKeys_data();
+    void noKeysValueChanges();
+    void keysChanged();
+
+private:
+    QString makeItemXmlAndData(const QString &data, QDeclarativeXmlModelData *modelData = 0) const
+    {
+        if (modelData)
+            modelData->clear();
+        QString xml;
+
+        if (!data.isEmpty()) {
+            QStringList items = data.split(";");
+            foreach(const QString &item, items) {
+                QVariantList variants;
+                xml += QLatin1String("<item>");
+                QStringList fields = item.split(",");
+                foreach(const QString &field, fields) {
+                    QStringList values = field.split("=");
+                    Q_ASSERT(values.count() == 2);
+                    xml += QString("<%1>%2</%1>").arg(values[0], values[1]);
+                    if (!modelData)
+                        continue;
+                    bool isNum = false;
+                    int number = values[1].toInt(&isNum);
+                    if (isNum)
+                        variants << number;
+                    else
+                        variants << values[1];
+                }
+                xml += QLatin1String("</item>");
+                if (modelData)
+                    modelData->append(variants);
+            }
+        }
+
+        QString decl = "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>";
+        return decl + QLatin1String("<data>") + xml + QLatin1String("</data>");
+    }
+
+    QDeclarativeEngine engine;
+};
+
+void tst_qmlxmllistmodel::buildModel()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(listModel != 0);
+    QTRY_COMPARE(listModel->count(), 9);
+
+    QList<int> roles;
+    roles << Qt::UserRole << Qt::UserRole + 1 << Qt::UserRole + 2 << Qt::UserRole + 3;
+    QHash<int, QVariant> data = listModel->data(3, roles);
+    QVERIFY(data.count() == 4);
+    QCOMPARE(data.value(Qt::UserRole).toString(), QLatin1String("Spot"));
+    QCOMPARE(data.value(Qt::UserRole+1).toString(), QLatin1String("Dog"));
+    QCOMPARE(data.value(Qt::UserRole+2).toInt(), 9);
+    QCOMPARE(data.value(Qt::UserRole+3).toString(), QLatin1String("Medium"));
+
+    delete listModel;
+}
+
+void tst_qmlxmllistmodel::missingFields()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model2.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(listModel != 0);
+    QTRY_COMPARE(listModel->count(), 9);
+
+    QList<int> roles;
+    roles << Qt::UserRole << Qt::UserRole + 1 << Qt::UserRole + 2 << Qt::UserRole + 3 << Qt::UserRole + 4;
+    QHash<int, QVariant> data = listModel->data(5, roles);
+    QVERIFY(data.count() == 5);
+    QCOMPARE(data.value(Qt::UserRole+3).toString(), QLatin1String(""));
+    QCOMPARE(data.value(Qt::UserRole+4).toString(), QLatin1String(""));
+
+    data = listModel->data(7, roles);
+    QVERIFY(data.count() == 5);
+    QCOMPARE(data.value(Qt::UserRole+2).toString(), QLatin1String(""));
+
+    delete listModel;
+}
+
+void tst_qmlxmllistmodel::cdata()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(listModel != 0);
+    QTRY_COMPARE(listModel->count(), 5);
+
+    QList<int> roles;
+    roles << Qt::UserRole + 2;
+    QHash<int, QVariant> data = listModel->data(2, roles);
+    QVERIFY(data.count() == 1);
+    QVERIFY(data.value(Qt::UserRole+2).toString().startsWith(QLatin1String("<html>")));
+
+    delete listModel;
+}
+
+void tst_qmlxmllistmodel::attributes()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(listModel != 0);
+    QTRY_COMPARE(listModel->count(), 5);
+
+    QList<int> roles;
+    roles << Qt::UserRole;
+    QHash<int, QVariant> data = listModel->data(2, roles);
+    QVERIFY(data.count() == 1);
+    QCOMPARE(data.value(Qt::UserRole).toString(), QLatin1String("Vegetable Soup"));
+
+    delete listModel;
+}
+
+void tst_qmlxmllistmodel::roles()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(listModel != 0);
+    QTRY_COMPARE(listModel->count(), 9);
+
+    QList<int> roles = listModel->roles();
+    QCOMPARE(roles.count(), 4);
+    QCOMPARE(listModel->toString(roles.at(0)), QLatin1String("name"));
+    QCOMPARE(listModel->toString(roles.at(1)), QLatin1String("type"));
+    QCOMPARE(listModel->toString(roles.at(2)), QLatin1String("age"));
+    QCOMPARE(listModel->toString(roles.at(3)), QLatin1String("size"));
+
+    delete listModel;
+}
+
+void tst_qmlxmllistmodel::roleErrors()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml"));
+    QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml").toString() + ":6:5) An XmlRole query must not start with '/'").toUtf8().constData());
+    //### make sure we receive all expected warning messages.
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(listModel != 0);
+    QTRY_COMPARE(listModel->count(), 9);
+
+    QList<int> roles;
+    roles << Qt::UserRole << Qt::UserRole + 1 << Qt::UserRole + 2 << Qt::UserRole + 3;
+    QHash<int, QVariant> data = listModel->data(3, roles);
+    QVERIFY(data.count() == 4);
+
+    //### should any of these return valid values?
+    QCOMPARE(data.value(Qt::UserRole), QVariant());
+    QCOMPARE(data.value(Qt::UserRole+1), QVariant());
+    QCOMPARE(data.value(Qt::UserRole+2), QVariant());
+
+    QEXPECT_FAIL("", "QT-2456", Continue);
+    QCOMPARE(data.value(Qt::UserRole+3), QVariant());
+
+    delete listModel;
+}
+
+void tst_qmlxmllistmodel::uniqueRoleNames()
+{
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/unique.qml"));
+    QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/unique.qml").toString() + ":7:5) \"name\" duplicates a previous role name and will be disabled.").toUtf8().constData());
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(listModel != 0);
+    QTRY_COMPARE(listModel->count(), 9);
+
+    QList<int> roles = listModel->roles();
+    QCOMPARE(roles.count(), 1);
+
+    delete listModel;
+}
+
+void tst_qmlxmllistmodel::useKeys()
+{
+    // If using incremental updates through keys, the model should only
+    // insert & remove some of the items, instead of throwing everything
+    // away and causing the view to repaint the whole view.
+
+    QFETCH(QString, oldXml);
+    QFETCH(int, oldCount);
+    QFETCH(QString, newXml);
+    QFETCH(QDeclarativeXmlModelData, newData);
+    QFETCH(QList<QDeclarativeXmlListRange>, insertRanges);
+    QFETCH(QList<QDeclarativeXmlListRange>, removeRanges);
+
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+    QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(model != 0);
+    
+    model->setXml(oldXml);
+    QTRY_COMPARE(model->count(), oldCount);
+
+    QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int)));
+    QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
+    QSignalSpy spyCount(model, SIGNAL(countChanged()));
+
+    model->setXml(newXml);
+
+    if (oldCount != newData.count()) {
+        QTRY_COMPARE(model->count(), newData.count());
+        QCOMPARE(spyCount.count(), 1);
+    } else {
+        QTRY_VERIFY(spyInsert.count() > 0 || spyRemove.count() > 0);
+        QCOMPARE(spyCount.count(), 0);
+    }
+
+    QList<int> roles = model->roles();
+    for (int i=0; i<model->count(); i++) {
+        for (int j=0; j<roles.count(); j++)
+            QCOMPARE(model->data(i, roles[j]), newData[i][j]);
+    }
+
+    QCOMPARE(spyInsert.count(), insertRanges.count());
+    for (int i=0; i<spyInsert.count(); i++) {
+        QCOMPARE(spyInsert[i][0].toInt(), insertRanges[i].first);
+        QCOMPARE(spyInsert[i][1].toInt(), insertRanges[i].second);
+    }
+
+    QCOMPARE(spyRemove.count(), removeRanges.count());
+    for (int i=0; i<spyRemove.count(); i++) {
+        QCOMPARE(spyRemove[i][0].toInt(), removeRanges[i].first);
+        QCOMPARE(spyRemove[i][1].toInt(), removeRanges[i].second);
+    }
+}
+
+void tst_qmlxmllistmodel::useKeys_data()
+{
+    QTest::addColumn<QString>("oldXml");
+    QTest::addColumn<int>("oldCount");
+    QTest::addColumn<QString>("newXml");
+    QTest::addColumn<QDeclarativeXmlModelData>("newData");
+    QTest::addColumn<QList<QDeclarativeXmlListRange> >("insertRanges");
+    QTest::addColumn<QList<QDeclarativeXmlListRange> >("removeRanges");
+
+    QDeclarativeXmlModelData modelData;
+
+    QTest::newRow("append 1")
+        << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics", &modelData)
+        << modelData
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 1))
+        << QList<QDeclarativeXmlListRange>();
+
+    QTest::newRow("append multiple")
+        << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling", &modelData)
+        << modelData
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 2))
+        << QList<QDeclarativeXmlListRange>();
+
+    QTest::newRow("insert in different spots")
+        << makeItemXmlAndData("name=B,age=35,sport=Athletics") << 1
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf", &modelData)
+        << modelData
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2))
+        << QList<QDeclarativeXmlListRange>();
+
+    QTest::newRow("insert in middle")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=D,age=55,sport=Golf") << 2
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf", &modelData)
+        << modelData
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 2))
+        << QList<QDeclarativeXmlListRange>();
+
+    QTest::newRow("remove first")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics") << 2
+        << makeItemXmlAndData("name=B,age=35,sport=Athletics", &modelData)
+        << modelData
+        << QList<QDeclarativeXmlListRange>()
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1));
+
+    QTest::newRow("remove last")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics") << 2
+        << makeItemXmlAndData("name=A,age=25,sport=Football", &modelData)
+        << modelData
+        << QList<QDeclarativeXmlListRange>()
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 1));
+
+    QTest::newRow("remove from multiple spots")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf;name=E,age=65,sport=Fencing") << 5
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=C,age=45,sport=Curling", &modelData)
+        << modelData
+        << QList<QDeclarativeXmlListRange>()
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 1) << qMakePair(3,2));
+
+    QTest::newRow("remove all")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling") << 3
+        << makeItemXmlAndData("", &modelData)
+        << modelData
+        << QList<QDeclarativeXmlListRange>()
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 3));
+
+    QTest::newRow("replace item")
+        << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
+        << makeItemXmlAndData("name=ZZZ,age=25,sport=Football", &modelData)
+        << modelData
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1))
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1));
+
+    QTest::newRow("add and remove simultaneously")
+        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf") << 4
+        << makeItemXmlAndData("name=B,age=35,sport=Athletics;name=E,age=65,sport=Fencing", &modelData)
+        << modelData
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 1))
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2));
+}
+
+void tst_qmlxmllistmodel::noKeysValueChanges()
+{
+    // The 'key' roles are 'name' and 'age', as defined in roleKeys.qml.
+    // If a 'sport' value is changed, the model should not be reloaded,
+    // since 'sport' is not marked as a key.
+
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+    QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(model != 0);
+    
+    QString xml;
+    
+    xml = makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics");
+    model->setXml(xml);
+    QTRY_COMPARE(model->count(), 2);
+
+    QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int)));
+    QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
+    QSignalSpy spyCount(model, SIGNAL(countChanged()));
+
+    xml = makeItemXmlAndData("name=A,age=25,sport=AussieRules;name=B,age=35,sport=Athletics");
+    model->setXml(xml);
+
+    // wait for the new xml data to be set, and verify no signals were emitted
+    for (int i=0; i<50; i++) {
+        QTest::qWait(100);
+        if (model->data(0, model->roles()[2]).toString() != QLatin1String("AussieRules"))
+            break;
+    }
+    QCOMPARE(model->data(0, model->roles()[2]).toString(), QLatin1String("AussieRules"));
+
+    QVERIFY(spyInsert.count() == 0);
+    QVERIFY(spyRemove.count() == 0);
+    QVERIFY(spyCount.count() == 0);
+    
+    QCOMPARE(model->count(), 2);
+}
+
+void tst_qmlxmllistmodel::keysChanged()
+{
+    // If the key roles change, the next time the data is reloaded, it should
+    // delete all its data and build a clean model (i.e. same behaviour as
+    // if no keys are set).
+
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+    QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(model != 0);
+
+    QString xml = makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics");
+    model->setXml(xml);
+    QTRY_COMPARE(model->count(), 2);
+
+    QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int)));
+    QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
+    QSignalSpy spyCount(model, SIGNAL(countChanged()));
+
+    QVERIFY(QMetaObject::invokeMethod(model, "disableNameKey"));
+    model->setXml(xml);
+
+    QTRY_VERIFY(spyInsert.count() > 0 && spyRemove.count() > 0);
+
+    QCOMPARE(spyInsert.count(), 1);
+    QCOMPARE(spyInsert[0][0].toInt(), 0);
+    QCOMPARE(spyInsert[0][1].toInt(), 2);
+
+    QCOMPARE(spyRemove.count(), 1);
+    QCOMPARE(spyRemove[0][0].toInt(), 0);
+    QCOMPARE(spyRemove[0][1].toInt(), 2);
+
+    QCOMPARE(spyCount.count(), 0);
+}
+
+QTEST_MAIN(tst_qmlxmllistmodel)
+
+#include "tst_qdeclarativexmllistmodel.moc"
+
+#else
+QTEST_NOOP_MAIN
+#endif
diff --git a/tests/auto/declarative/qmlanimations/data/attached.qml b/tests/auto/declarative/qmlanimations/data/attached.qml
deleted file mode 100644
index 0fb6f8c..0000000
--- a/tests/auto/declarative/qmlanimations/data/attached.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 180; height: 200;
-
-    Component {
-        id: delegate
-        Rectangle {
-            id: wrapper
-            width: 180; height: 200
-            color: "blue"
-
-            states: State {
-                name: "otherState"
-                PropertyChanges { target: wrapper; color: "green" }
-            }
-
-            transitions: Transition {
-                PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
-                ScriptAction { script: console.log(ListView.delayRemove ? "on" : "off") }
-            }
-
-            Component.onCompleted: {
-                console.log(ListView.delayRemove ? "on" : "off");
-                wrapper.state = "otherState"
-            }
-        }
-    }
-
-    ListView {
-        model: 1
-        delegate: delegate
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/badproperty1.qml b/tests/auto/declarative/qmlanimations/data/badproperty1.qml
deleted file mode 100644
index d31cae9..0000000
--- a/tests/auto/declarative/qmlanimations/data/badproperty1.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 240
-    height: 320
-    Rectangle {
-        id: myRect
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-    }
-    states: State {
-        name: "state1"
-        PropertyChanges { target: myRect; border.color: "blue" }
-    }
-    transitions: Transition {
-        ColorAnimation { target: myRect; to: "red"; property: "border.colr"; duration: 1000 }
-    }
-    Component.onCompleted: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
-}
diff --git a/tests/auto/declarative/qmlanimations/data/badproperty2.qml b/tests/auto/declarative/qmlanimations/data/badproperty2.qml
deleted file mode 100644
index 3b8b111..0000000
--- a/tests/auto/declarative/qmlanimations/data/badproperty2.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 240
-    height: 320
-    Rectangle {
-        id: myRect
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-    }
-    states: State {
-        name: "state1"
-        PropertyChanges { target: myRect; border.color: "blue" }
-    }
-    transitions: Transition {
-        ColorAnimation { target: myRect; to: "red"; property: "border"; duration: 1000 }
-    }
-    Component.onCompleted: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
-}
diff --git a/tests/auto/declarative/qmlanimations/data/badtype1.qml b/tests/auto/declarative/qmlanimations/data/badtype1.qml
deleted file mode 100644
index 6381df3..0000000
--- a/tests/auto/declarative/qmlanimations/data/badtype1.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    Rectangle {
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        x: PropertyAnimation { from: "blue"; to: "green"; }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/badtype2.qml b/tests/auto/declarative/qmlanimations/data/badtype2.qml
deleted file mode 100644
index 8d57e41..0000000
--- a/tests/auto/declarative/qmlanimations/data/badtype2.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    Rectangle {
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        x: NumberAnimation { from: "blue"; to: "green"; }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/badtype3.qml b/tests/auto/declarative/qmlanimations/data/badtype3.qml
deleted file mode 100644
index c4867c3..0000000
--- a/tests/auto/declarative/qmlanimations/data/badtype3.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    Rectangle {
-        color: "red"
-        color: ColorAnimation { from: 10; to: 15; }
-        width: 50; height: 50
-        x: 100; y: 100
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/badtype4.qml b/tests/auto/declarative/qmlanimations/data/badtype4.qml
deleted file mode 100644
index e80762f..0000000
--- a/tests/auto/declarative/qmlanimations/data/badtype4.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 240
-    height: 320
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        MouseArea {
-            anchors.fill: parent
-            onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
-        }
-    }
-    states: State {
-        name: "state1"
-        PropertyChanges { target: myRect; x: 200; color: "blue" }
-    }
-    transitions: Transition {
-        //comment out each in turn to make sure each only animates the relevant property
-        ColorAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color
-        NumberAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/dontAutoStart.qml b/tests/auto/declarative/qmlanimations/data/dontAutoStart.qml
deleted file mode 100644
index d9660b6..0000000
--- a/tests/auto/declarative/qmlanimations/data/dontAutoStart.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 600
-    height: 400
-
-    Rectangle {
-        id: redRect
-        width: 100; height: 100
-        color: Qt.rgba(1,0,0)
-        x: Behavior {
-            NumberAnimation { objectName: "MyAnim"; target: redRect; property: "y"; to: 300; repeat: true}
-        }
-
-    }
-
-}
diff --git a/tests/auto/declarative/qmlanimations/data/dontStart.qml b/tests/auto/declarative/qmlanimations/data/dontStart.qml
deleted file mode 100644
index 36417db..0000000
--- a/tests/auto/declarative/qmlanimations/data/dontStart.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 600
-    height: 400
-
-    Rectangle {
-        id: redRect
-        width: 100; height: 100
-        color: Qt.rgba(1,0,0)
-        x: SequentialAnimation {
-            running: false
-            NumberAnimation { objectName: "MyAnim"; running: true }
-        }
-
-    }
-
-}
diff --git a/tests/auto/declarative/qmlanimations/data/dontStart2.qml b/tests/auto/declarative/qmlanimations/data/dontStart2.qml
deleted file mode 100644
index 1a6540f..0000000
--- a/tests/auto/declarative/qmlanimations/data/dontStart2.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 600
-    height: 400
-
-    Rectangle {
-        id: redRect
-        width: 100; height: 100
-        color: Qt.rgba(1,0,0)
-
-        transitions: Transition {
-            SequentialAnimation {
-                NumberAnimation { id: myAnim; objectName: "MyAnim"; running: true }
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/dotproperty.qml b/tests/auto/declarative/qmlanimations/data/dotproperty.qml
deleted file mode 100644
index 9f0e699..0000000
--- a/tests/auto/declarative/qmlanimations/data/dotproperty.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 240
-    height: 320
-    Rectangle {
-        id: myRect
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        MouseArea {
-            anchors.fill: parent
-            onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
-        }
-    }
-    states: State {
-        name: "state1"
-        PropertyChanges { target: myRect; border.color: "blue" }
-    }
-    transitions: Transition {
-        ColorAnimation { properties: "border.color"; duration: 1000 }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/mixedtype1.qml b/tests/auto/declarative/qmlanimations/data/mixedtype1.qml
deleted file mode 100644
index 6770366..0000000
--- a/tests/auto/declarative/qmlanimations/data/mixedtype1.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 240
-    height: 320
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        MouseArea {
-            anchors.fill: parent
-            onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
-        }
-    }
-    states: State {
-        name: "state1"
-        PropertyChanges { target: myRect; x: 200; border.width: 10 }
-    }
-    transitions: Transition {
-        PropertyAnimation { properties: "x,border.width"; duration: 1000 } //x is real, border.width is int
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/mixedtype2.qml b/tests/auto/declarative/qmlanimations/data/mixedtype2.qml
deleted file mode 100644
index 80c9473..0000000
--- a/tests/auto/declarative/qmlanimations/data/mixedtype2.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 240
-    height: 320
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        MouseArea {
-            anchors.fill: parent
-            onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
-        }
-    }
-    states: State {
-        name: "state1"
-        PropertyChanges { target: myRect; x: 200; color: "blue" }
-    }
-    transitions: Transition {
-        PropertyAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/properties.qml b/tests/auto/declarative/qmlanimations/data/properties.qml
deleted file mode 100644
index 7e73f57..0000000
--- a/tests/auto/declarative/qmlanimations/data/properties.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        x: NumberAnimation { to: 200 }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/properties2.qml b/tests/auto/declarative/qmlanimations/data/properties2.qml
deleted file mode 100644
index 6c96155..0000000
--- a/tests/auto/declarative/qmlanimations/data/properties2.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        x: NumberAnimation { targets: theRect; properties: "x"; to: 200; }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/properties3.qml b/tests/auto/declarative/qmlanimations/data/properties3.qml
deleted file mode 100644
index ff08885..0000000
--- a/tests/auto/declarative/qmlanimations/data/properties3.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        x: NumberAnimation { target: theRect; property: "x"; to: 300; }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/properties4.qml b/tests/auto/declarative/qmlanimations/data/properties4.qml
deleted file mode 100644
index dab7e5f..0000000
--- a/tests/auto/declarative/qmlanimations/data/properties4.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        x: NumberAnimation { target: theRect; property: "y"; to: 200; }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/properties5.qml b/tests/auto/declarative/qmlanimations/data/properties5.qml
deleted file mode 100644
index 38396b1..0000000
--- a/tests/auto/declarative/qmlanimations/data/properties5.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        x: NumberAnimation { targets: theRect; properties: "y"; to: 200; }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition.qml
deleted file mode 100644
index b13b94b..0000000
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-    }
-
-    states: State {
-        name: "moved"
-        PropertyChanges {
-            target: theRect
-            x: 200
-        }
-    }
-    transitions: Transition {
-        NumberAnimation { targets: theRect; properties: "x" }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: parent.state = "moved"
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition2.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition2.qml
deleted file mode 100644
index 033c5c1..0000000
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition2.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-    }
-
-    states: State {
-        name: "moved"
-        PropertyChanges {
-            target: theRect
-            x: 200
-        }
-    }
-    transitions: Transition {
-        NumberAnimation { target: theRect; property: "y"; to: 200 }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: parent.state = "moved"
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition3.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition3.qml
deleted file mode 100644
index d0704c9..0000000
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition3.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-    }
-
-    states: State {
-        name: "moved"
-        PropertyChanges {
-            target: theRect
-            x: 200
-        }
-    }
-    transitions: Transition {
-        NumberAnimation { targets: theRect; properties: "y" }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: parent.state = "moved"
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition4.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition4.qml
deleted file mode 100644
index e70c95c..0000000
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition4.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-    }
-
-    states: State {
-        name: "moved"
-        PropertyChanges {
-            target: theRect
-            x: 200
-        }
-    }
-    transitions: Transition {
-        NumberAnimation { target: theRect; properties: "x" }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: parent.state = "moved"
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition5.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition5.qml
deleted file mode 100644
index b9e27da..0000000
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition5.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-    }
-
-    states: State {
-        name: "moved"
-        PropertyChanges {
-            target: theRect
-            x: 200
-        }
-    }
-    transitions: Transition {
-        NumberAnimation { targets: theRect; property: "x" }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: parent.state = "moved"
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition6.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition6.qml
deleted file mode 100644
index 7417ed1..0000000
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition6.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: theRect
-        objectName: "TheRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-    }
-
-    states: State {
-        name: "moved"
-        PropertyChanges {
-            target: theRect
-            x: 200
-        }
-    }
-    transitions: Transition {
-        NumberAnimation { targets: theItem; properties: "x" }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: parent.state = "moved"
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/valuesource.qml b/tests/auto/declarative/qmlanimations/data/valuesource.qml
deleted file mode 100644
index c35063d..0000000
--- a/tests/auto/declarative/qmlanimations/data/valuesource.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        x: NumberAnimation { id: anim; objectName: "MyAnim"; to: 200 }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/data/valuesource2.qml b/tests/auto/declarative/qmlanimations/data/valuesource2.qml
deleted file mode 100644
index 1a60542..0000000
--- a/tests/auto/declarative/qmlanimations/data/valuesource2.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        color: "red"
-        width: 50; height: 50
-        x: 100; y: 100
-        x: NumberAnimation { id: anim; objectName: "MyAnim"; running: false; to: 200 }
-    }
-}
diff --git a/tests/auto/declarative/qmlanimations/qmlanimations.pro b/tests/auto/declarative/qmlanimations/qmlanimations.pro
deleted file mode 100644
index 447fb0f..0000000
--- a/tests/auto/declarative/qmlanimations/qmlanimations.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlanimations.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp b/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
deleted file mode 100644
index 00e099e..0000000
--- a/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
+++ /dev/null
@@ -1,672 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlanimation_p.h>
-#include <QVariantAnimation>
-#include <QEasingCurve>
-
-class tst_qmlanimations : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlanimations() {}
-
-private slots:
-    void initTestCase() { QmlEngine engine; } // ensure types are registered
-
-    void simpleProperty();
-    void simpleNumber();
-    void simpleColor();
-    void alwaysRunToEnd();
-    void complete();
-    void resume();
-    void dotProperty();
-    void badTypes();
-    void badProperties();
-    void mixedTypes();
-    void properties();
-    void propertiesTransition();
-    void invalidDuration();
-    void attached();
-    void propertyValueSourceDefaultStart();
-    void dontStart();
-    void easingProperties();
-};
-
-#define QTIMED_COMPARE(lhs, rhs) do { \
-    for (int ii = 0; ii < 5; ++ii) { \
-        if (lhs == rhs)  \
-            break; \
-        QTest::qWait(50); \
-    } \
-    QCOMPARE(lhs, rhs); \
-} while (false)
-
-void tst_qmlanimations::simpleProperty()
-{
-    QmlGraphicsRectangle rect;
-    QmlPropertyAnimation animation;
-    animation.setTarget(&rect);
-    animation.setProperty("pos");
-    animation.setTo(QPointF(200,200));
-    QVERIFY(animation.target() == &rect);
-    QVERIFY(animation.property() == "pos");
-    QVERIFY(animation.to().toPointF() == QPointF(200,200));
-    animation.start();
-    QVERIFY(animation.isRunning());
-    QTest::qWait(animation.duration());
-    QTIMED_COMPARE(rect.pos(), QPointF(200,200));
-
-    rect.setPos(0,0);
-    animation.start();
-    animation.pause();
-    QVERIFY(animation.isRunning());
-    QVERIFY(animation.isPaused());
-    animation.setCurrentTime(125);
-    QVERIFY(animation.currentTime() == 125);
-    QCOMPARE(rect.pos(), QPointF(100,100));
-}
-
-void tst_qmlanimations::simpleNumber()
-{
-    QmlGraphicsRectangle rect;
-    QmlNumberAnimation animation;
-    animation.setTarget(&rect);
-    animation.setProperty("x");
-    animation.setTo(200);
-    QVERIFY(animation.target() == &rect);
-    QVERIFY(animation.property() == "x");
-    QVERIFY(animation.to() == 200);
-    animation.start();
-    QVERIFY(animation.isRunning());
-    QTest::qWait(animation.duration());
-    QTIMED_COMPARE(rect.x(), qreal(200));
-
-    rect.setX(0);
-    animation.start();
-    animation.pause();
-    QVERIFY(animation.isRunning());
-    QVERIFY(animation.isPaused());
-    animation.setCurrentTime(125);
-    QVERIFY(animation.currentTime() == 125);
-    QCOMPARE(rect.x(), qreal(100));
-}
-
-void tst_qmlanimations::simpleColor()
-{
-    QmlGraphicsRectangle rect;
-    QmlColorAnimation animation;
-    animation.setTarget(&rect);
-    animation.setProperty("color");
-    animation.setTo(QColor("red"));
-    QVERIFY(animation.target() == &rect);
-    QVERIFY(animation.property() == "color");
-    QVERIFY(animation.to() == QColor("red"));
-    animation.start();
-    QVERIFY(animation.isRunning());
-    QTest::qWait(animation.duration());
-    QTIMED_COMPARE(rect.color(), QColor("red"));
-
-    rect.setColor(QColor("blue"));
-    animation.start();
-    animation.pause();
-    QVERIFY(animation.isRunning());
-    QVERIFY(animation.isPaused());
-    animation.setCurrentTime(125);
-    QVERIFY(animation.currentTime() == 125);
-    QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1));
-
-    rect.setColor(QColor("green"));
-    animation.setFrom(QColor("blue"));
-    QVERIFY(animation.from() == QColor("blue"));
-    animation.restart();
-    QCOMPARE(rect.color(), QColor("blue"));
-    QVERIFY(animation.isRunning());
-    animation.setCurrentTime(125);
-    QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1));
-}
-
-void tst_qmlanimations::alwaysRunToEnd()
-{
-    QmlGraphicsRectangle rect;
-    QmlPropertyAnimation animation;
-    animation.setTarget(&rect);
-    animation.setProperty("x");
-    animation.setTo(200);
-    animation.setDuration(1000);
-    animation.setRepeat(true);
-    animation.setAlwaysRunToEnd(true);
-    QVERIFY(animation.repeat() == true);
-    QVERIFY(animation.alwaysRunToEnd() == true);
-    animation.start();
-    QTest::qWait(1500);
-    animation.stop();
-    QVERIFY(rect.x() != qreal(200));
-    QTest::qWait(500);
-    QTIMED_COMPARE(rect.x(), qreal(200));
-}
-
-void tst_qmlanimations::complete()
-{
-    QmlGraphicsRectangle rect;
-    QmlPropertyAnimation animation;
-    animation.setTarget(&rect);
-    animation.setProperty("x");
-    animation.setFrom(1);
-    animation.setTo(200);
-    animation.setDuration(500);
-    QVERIFY(animation.from() == 1);
-    animation.start();
-    QTest::qWait(50);
-    animation.stop();
-    QVERIFY(rect.x() != qreal(200));
-    animation.start();
-    QTest::qWait(50);
-    QVERIFY(animation.isRunning());
-    animation.complete();
-    QCOMPARE(rect.x(), qreal(200));
-}
-
-void tst_qmlanimations::resume()
-{
-    QmlGraphicsRectangle rect;
-    QmlPropertyAnimation animation;
-    animation.setTarget(&rect);
-    animation.setProperty("x");
-    animation.setFrom(10);
-    animation.setTo(200);
-    animation.setDuration(500);
-    QVERIFY(animation.from() == 10);
-
-    animation.start();
-    QTest::qWait(100);
-    animation.pause();
-    qreal x = rect.x();
-    QVERIFY(x != qreal(200));
-    QVERIFY(animation.isRunning());
-    QVERIFY(animation.isPaused());
-
-    animation.resume();
-    QVERIFY(animation.isRunning());
-    QVERIFY(!animation.isPaused());
-    QTest::qWait(100);
-    animation.stop();
-    QVERIFY(rect.x() > x);
-}
-
-void tst_qmlanimations::dotProperty()
-{
-    QmlGraphicsRectangle rect;
-    QmlNumberAnimation animation;
-    animation.setTarget(&rect);
-    animation.setProperty("border.width");
-    animation.setTo(10);
-    animation.start();
-    QTest::qWait(animation.duration()+50);
-    QTIMED_COMPARE(rect.border()->width(), 10);
-
-    rect.border()->setWidth(0);
-    animation.start();
-    animation.pause();
-    animation.setCurrentTime(125);
-    QVERIFY(animation.currentTime() == 125);
-    QCOMPARE(rect.border()->width(), 5);
-}
-
-void tst_qmlanimations::badTypes()
-{
-    //don't crash
-    {
-        QmlView *view = new QmlView;
-        view->setSource(QUrl::fromLocalFile(SRCDIR "/data/badtype1.qml"));
-
-        qApp->processEvents();
-
-        delete view;
-    }
-
-    //make sure we get a compiler error
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype2.qml"));
-        QTest::ignoreMessage(QtWarningMsg, "QmlComponent: Component is not ready");
-        c.create();
-
-        QVERIFY(c.errors().count() == 1);
-        QCOMPARE(c.errors().at(0).description(), QLatin1String("Invalid property assignment: double expected"));
-    }
-
-    //make sure we get a compiler error
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype3.qml"));
-        QTest::ignoreMessage(QtWarningMsg, "QmlComponent: Component is not ready");
-        c.create();
-
-        QVERIFY(c.errors().count() == 1);
-        QCOMPARE(c.errors().at(0).description(), QLatin1String("Invalid property assignment: color expected"));
-    }
-
-    //don't crash
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype4.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        rect->setState("state1");
-        QTest::qWait(1000 + 50);
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("MyRect");
-        QVERIFY(myRect);
-        QCOMPARE(myRect->x(),qreal(200));
-    }
-}
-
-void tst_qmlanimations::badProperties()
-{
-    //make sure we get a runtime error
-    {
-        QmlEngine engine;
-
-        QmlComponent c1(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty1.qml"));
-        QByteArray message = "QML ColorAnimation (" + QUrl::fromLocalFile(SRCDIR "/data/badproperty1.qml").toString().toUtf8() + ":18:9) Cannot animate non-existent property \"border.colr\"";
-        QTest::ignoreMessage(QtWarningMsg, message);
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c1.create());
-        QVERIFY(rect);
-
-        QmlComponent c2(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty2.qml"));
-        message = "QML ColorAnimation (" + QUrl::fromLocalFile(SRCDIR "/data/badproperty2.qml").toString().toUtf8() + ":18:9) Cannot animate read-only property \"border\"";
-        QTest::ignoreMessage(QtWarningMsg, message);
-        rect = qobject_cast<QmlGraphicsRectangle*>(c2.create());
-        QVERIFY(rect);
-
-        //### should we warn here are well?
-        //rect->setState("state1");
-    }
-}
-
-//test animating mixed types with property animation in a transition
-//for example, int + real; color + real; etc
-void tst_qmlanimations::mixedTypes()
-{
-    //assumes border.width stays a real -- not real robust
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype1.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        rect->setState("state1");
-        QTest::qWait(500);
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("MyRect");
-        QVERIFY(myRect);
-
-        //rather inexact -- is there a better way?
-        QVERIFY(myRect->x() > 100 && myRect->x() < 200);
-        QVERIFY(myRect->border()->width() > 1 && myRect->border()->width() < 10);
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        rect->setState("state1");
-        QTest::qWait(500);
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("MyRect");
-        QVERIFY(myRect);
-
-        //rather inexact -- is there a better way?
-        QVERIFY(myRect->x() > 100 && myRect->x() < 200);
-        QVERIFY(myRect->color() != QColor("red") && myRect->color() != QColor("blue"));
-    }
-}
-
-void tst_qmlanimations::properties()
-{
-    const int waitDuration = 300;
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->x(),qreal(200));
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->x(),qreal(200));
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties3.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->x(),qreal(300));
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties4.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->y(),qreal(200));
-        QTIMED_COMPARE(myRect->x(),qreal(100));
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties5.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->x(),qreal(100));
-        QTIMED_COMPARE(myRect->y(),qreal(200));
-    }
-}
-
-void tst_qmlanimations::propertiesTransition()
-{
-    const int waitDuration = 300;
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        rect->setState("moved");
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->x(),qreal(200));
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        rect->setState("moved");
-        QCOMPARE(myRect->x(),qreal(200));
-        QCOMPARE(myRect->y(),qreal(100));
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->y(),qreal(200));
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition3.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        rect->setState("moved");
-        QCOMPARE(myRect->x(),qreal(200));
-        QCOMPARE(myRect->y(),qreal(100));
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition4.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        rect->setState("moved");
-        QCOMPARE(myRect->x(),qreal(100));
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->x(),qreal(200));
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition5.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        rect->setState("moved");
-        QCOMPARE(myRect->x(),qreal(100));
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->x(),qreal(200));
-    }
-
-    /*{
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition6.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
-        QVERIFY(myRect);
-        rect->setState("moved");
-        QCOMPARE(myRect->x(),qreal(100));
-        QTest::qWait(waitDuration);
-        QTIMED_COMPARE(myRect->x(),qreal(100));
-    }*/
-}
-
-void tst_qmlanimations::invalidDuration()
-{
-    QmlPropertyAnimation *animation = new QmlPropertyAnimation;
-    QTest::ignoreMessage(QtWarningMsg, "QML PropertyAnimation (unknown location) Cannot set a duration of < 0");
-    animation->setDuration(-1);
-    QCOMPARE(animation->duration(), 250);
-
-    QmlPauseAnimation *pauseAnimation = new QmlPauseAnimation;
-    QTest::ignoreMessage(QtWarningMsg, "QML PauseAnimation (unknown location) Cannot set a duration of < 0");
-    pauseAnimation->setDuration(-1);
-    QCOMPARE(pauseAnimation->duration(), 250);
-}
-
-void tst_qmlanimations::attached()
-{
-    QmlEngine engine;
-
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/attached.qml"));
-    QTest::ignoreMessage(QtDebugMsg, "off");
-    QTest::ignoreMessage(QtDebugMsg, "on");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-}
-
-void tst_qmlanimations::propertyValueSourceDefaultStart()
-{
-    {
-        QmlEngine engine;
-
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource.qml"));
-
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
-        QVERIFY(myAnim);
-        QVERIFY(myAnim->isRunning());
-    }
-
-    {
-        QmlEngine engine;
-
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource2.qml"));
-
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
-        QVERIFY(myAnim);
-        QVERIFY(myAnim->isRunning() == false);
-    }
-
-    {
-        QmlEngine engine;
-
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontAutoStart.qml"));
-
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
-        QVERIFY(myAnim && myAnim->qtAnimation());
-        QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
-    }
-}
-
-
-void tst_qmlanimations::dontStart()
-{
-    {
-        QmlEngine engine;
-
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
-
-        QTest::ignoreMessage(QtWarningMsg, "QmlAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
-        QVERIFY(myAnim && myAnim->qtAnimation());
-        QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
-    }
-
-    {
-        QmlEngine engine;
-
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart2.qml"));
-
-        QTest::ignoreMessage(QtWarningMsg, "QmlAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
-        QVERIFY(myAnim && myAnim->qtAnimation());
-        QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
-    }
-}
-
-void tst_qmlanimations::easingProperties()
-{
-    {
-        QmlEngine engine;
-        QString componentStr = "import Qt 4.6\nNumberAnimation { easing.type: \"InOutQuad\" }";
-        QmlComponent animationComponent(&engine);
-        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
-
-        QVERIFY(animObject != 0);
-        QCOMPARE(animObject->easing().type(), QEasingCurve::InOutQuad);
-    }
-
-    {
-        QmlEngine engine;
-        QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"OutBounce\"; easing.amplitude: 5.0 }";
-        QmlComponent animationComponent(&engine);
-        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
-
-        QVERIFY(animObject != 0);
-        QCOMPARE(animObject->easing().type(), QEasingCurve::OutBounce);
-        QCOMPARE(animObject->easing().amplitude(), 5.0);
-    }
-
-    {
-        QmlEngine engine;
-        QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"OutElastic\"; easing.amplitude: 5.0; easing.period: 3.0}";
-        QmlComponent animationComponent(&engine);
-        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
-
-        QVERIFY(animObject != 0);
-        QCOMPARE(animObject->easing().type(), QEasingCurve::OutElastic);
-        QCOMPARE(animObject->easing().amplitude(), 5.0);
-        QCOMPARE(animObject->easing().period(), 3.0);
-    }
-
-    {
-        QmlEngine engine;
-        QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"InOutBack\"; easing.overshoot: 2 }";
-        QmlComponent animationComponent(&engine);
-        animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
-
-        QVERIFY(animObject != 0);
-        QCOMPARE(animObject->easing().type(), QEasingCurve::InOutBack);
-        QCOMPARE(animObject->easing().overshoot(), 2.0);
-    }
-}
-
-QTEST_MAIN(tst_qmlanimations)
-
-#include "tst_qmlanimations.moc"
diff --git a/tests/auto/declarative/qmlbehaviors/data/binding.qml b/tests/auto/declarative/qmlbehaviors/data/binding.qml
deleted file mode 100644
index 201da37..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/binding.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    property real basex : 0
-    property real movedx: 200
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: basex
-        x: Behavior { NumberAnimation { duration: 500; } }
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "moved"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            x: movedx
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/color.qml b/tests/auto/declarative/qmlbehaviors/data/color.qml
deleted file mode 100644
index 91dbbd1..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/color.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100;
-        color: "green"
-        color: Behavior { ColorAnimation { duration: 500; } }
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "red"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            color: "red"
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml b/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml
deleted file mode 100644
index 8d032f0..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: Behavior { NumberAnimation { duration: 500; } }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/disabled.qml b/tests/auto/declarative/qmlbehaviors/data/disabled.qml
deleted file mode 100644
index 3c7078a..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/disabled.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: Behavior {
-            objectName: "MyBehavior";
-            enabled: false
-            NumberAnimation { duration: 200; }
-        }
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "moved"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            x: 200
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/dontStart.qml b/tests/auto/declarative/qmlbehaviors/data/dontStart.qml
deleted file mode 100644
index ba7cc9c..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/dontStart.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: wrapper
-    width: 600
-    height: 400
-
-    Rectangle {
-        id: redRect
-        width: 100; height: 100
-        color: Qt.rgba(1,0,0)
-        x: Behavior {
-            NumberAnimation { objectName: "MyAnim"; running: true }
-        }
-
-    }
-
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/empty.qml b/tests/auto/declarative/qmlbehaviors/data/empty.qml
deleted file mode 100644
index 95d934a..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/empty.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: Behavior {}
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "moved"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            x: 200
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/explicit.qml b/tests/auto/declarative/qmlbehaviors/data/explicit.qml
deleted file mode 100644
index 1b2025a..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/explicit.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: Behavior {
-            objectName: "MyBehavior";
-            NumberAnimation { target: rect; property: "x"; duration: 500; }
-        }
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "moved"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            x: 200
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml b/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml
deleted file mode 100644
index 14883d4..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        pos: Behavior { PropertyAnimation { duration: 500; } }
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "moved"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            pos: Qt.point(200,0);
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml b/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml
deleted file mode 100644
index b43ddbc..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        pos.x: Behavior { NumberAnimation { duration: 500; } }
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "moved"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            pos.x: 200;
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/loop.qml b/tests/auto/declarative/qmlbehaviors/data/loop.qml
deleted file mode 100644
index 5f2c057..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/loop.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: Behavior { NumberAnimation { duration: 200; } }
-        onXChanged: x = 100;
-    }
-    states: State {
-        name: "moved"
-        PropertyChanges {
-            target: rect
-            x: 200
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml b/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
deleted file mode 100644
index f267a05..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: Behavior {
-            objectName: "MyBehavior";
-            NumberAnimation { targets: rect; properties: "y"; duration: 200; }
-        }
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "moved"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            x: 200
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/parent.qml b/tests/auto/declarative/qmlbehaviors/data/parent.qml
deleted file mode 100644
index 7c7fdcb..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/parent.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        parent: Behavior {
-            SequentialAnimation {
-                PauseAnimation { duration: 500 }
-                PropertyAction {}
-            }
-        }
-    }
-    Item {
-        id: newParent
-        objectName: "NewParent"
-        x: 100
-    }
-    states: State {
-        name: "reparented"
-        PropertyChanges {
-            target: rect
-            parent: newParent
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml b/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml
deleted file mode 100644
index ba744b1..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: Behavior {
-            objectName: "MyBehavior"
-            NumberAnimation { duration: 200 }
-            NumberAnimation { duration: 1000 }
-        }
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "moved"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            x: 200
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml b/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml
deleted file mode 100644
index a91ca88..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-
-    onColorChanged: {
-        rect.x = 200
-    }
-
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: Behavior { NumberAnimation { duration: 500; } }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/data/simple.qml b/tests/auto/declarative/qmlbehaviors/data/simple.qml
deleted file mode 100644
index ac98ed0..0000000
--- a/tests/auto/declarative/qmlbehaviors/data/simple.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 400
-    height: 400
-    Rectangle {
-        id: rect
-        objectName: "MyRect"
-        width: 100; height: 100; color: "green"
-        x: Behavior {
-            objectName: "MyBehavior";
-            NumberAnimation { duration: 500; }
-        }
-    }
-    MouseArea {
-        id: clicker
-        anchors.fill: parent
-    }
-    states: State {
-        name: "moved"
-        when: clicker.pressed
-        PropertyChanges {
-            target: rect
-            x: 200
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlbehaviors/qmlbehaviors.pro b/tests/auto/declarative/qmlbehaviors/qmlbehaviors.pro
deleted file mode 100644
index 1e685ee..0000000
--- a/tests/auto/declarative/qmlbehaviors/qmlbehaviors.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlbehaviors.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp b/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
deleted file mode 100644
index e31b600..0000000
--- a/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlbehavior_p.h>
-#include <private/qmlanimation_p.h>
-
-class tst_qmlbehaviors : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlbehaviors() {}
-
-private slots:
-    void simpleBehavior();
-    void scriptTriggered();
-    void cppTriggered();
-    void loop();
-    void colorBehavior();
-    void parentBehavior();
-    void replaceBinding();
-    //void transitionOverrides();
-    void group();
-    void emptyBehavior();
-    void explicitSelection();
-    void nonSelectingBehavior();
-    void reassignedAnimation();
-    void disabled();
-    void dontStart();
-};
-
-void tst_qmlbehaviors::simpleBehavior()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/simple.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-    QVERIFY(qobject_cast<QmlBehavior*>(rect->findChild<QmlBehavior*>("MyBehavior"))->animation());
-
-    rect->setState("moved");
-    QTest::qWait(200);
-    qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-    QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
-}
-
-void tst_qmlbehaviors::scriptTriggered()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/scripttrigger.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-
-    rect->setColor(QColor("red"));
-    QTest::qWait(200);
-    qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-    QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
-}
-
-void tst_qmlbehaviors::cppTriggered()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/cpptrigger.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-    QVERIFY(innerRect);
-
-    innerRect->setProperty("x", 200);
-    QTest::qWait(200);
-    qreal x = innerRect->x();
-    QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
-}
-
-void tst_qmlbehaviors::loop()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/loop.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-
-    //don't crash
-    rect->setState("moved");
-}
-
-void tst_qmlbehaviors::colorBehavior()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/color.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-
-    rect->setState("red");
-    QTest::qWait(200);
-    QColor color = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->color();
-    QVERIFY(color != QColor("red") && color != QColor("green"));  //i.e. the behavior has been triggered
-}
-
-void tst_qmlbehaviors::parentBehavior()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/parent.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-
-    rect->setState("reparented");
-    QTest::qWait(200);
-    QmlGraphicsItem *newParent = rect->findChild<QmlGraphicsItem*>("NewParent");
-    QmlGraphicsItem *parent = rect->findChild<QmlGraphicsRectangle*>("MyRect")->parentItem();
-    QVERIFY(parent != newParent);
-    QTest::qWait(600);
-    parent = rect->findChild<QmlGraphicsRectangle*>("MyRect")->parentItem();
-    QVERIFY(parent == newParent);
-}
-
-void tst_qmlbehaviors::replaceBinding()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/binding.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-
-    rect->setState("moved");
-    QTest::qWait(200);
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-    QVERIFY(innerRect);
-    qreal x = innerRect->x();
-    QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
-    QTest::qWait(600);
-    QCOMPARE(innerRect->x(), (qreal)200);
-    rect->setProperty("basex", 10);
-    QCOMPARE(innerRect->x(), (qreal)200);
-    rect->setProperty("movedx", 210);
-    QTest::qWait(600);
-    QCOMPARE(innerRect->x(), (qreal)210);
-
-    rect->setState("");
-    QTest::qWait(200);
-    x = innerRect->x();
-    QVERIFY(x > 10 && x < 210);  //i.e. the behavior has been triggered
-    QTest::qWait(600);
-    QCOMPARE(innerRect->x(), (qreal)10);
-    rect->setProperty("movedx", 200);
-    QCOMPARE(innerRect->x(), (qreal)10);
-    rect->setProperty("basex", 20);
-    QTest::qWait(600);
-    QCOMPARE(innerRect->x(), (qreal)20);
-}
-
-void tst_qmlbehaviors::group()
-{
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/groupProperty.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        rect->setState("moved");
-        QTest::qWait(200);
-        qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-        QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
-    }
-
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/groupProperty2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        rect->setState("moved");
-        QTest::qWait(200);
-        qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-        QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
-    }
-}
-
-void tst_qmlbehaviors::emptyBehavior()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/empty.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-
-    rect->setState("moved");
-    qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-    QCOMPARE(x, qreal(200));    //should change immediately
-}
-
-void tst_qmlbehaviors::explicitSelection()
-{
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/explicit.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        rect->setState("moved");
-        QTest::qWait(200);
-        qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-        QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
-    }
-}
-
-void tst_qmlbehaviors::nonSelectingBehavior()
-{
-    {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/nonSelecting2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-        QVERIFY(rect);
-
-        rect->setState("moved");
-        qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-        QCOMPARE(x, qreal(200));    //should change immediately
-    }
-}
-
-void tst_qmlbehaviors::reassignedAnimation()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml"));
-    QTest::ignoreMessage(QtWarningMsg, QString("QML Behavior (" + QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml").toString() + ":9:12) Cannot change the animation assigned to a Behavior.").toUtf8().constData());
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-    QCOMPARE(qobject_cast<QmlNumberAnimation*>(
-                 qobject_cast<QmlBehavior*>(
-                     rect->findChild<QmlBehavior*>("MyBehavior"))->animation())->duration(), 200);
-}
-
-void tst_qmlbehaviors::disabled()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/disabled.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-    QCOMPARE(rect->findChild<QmlBehavior*>("MyBehavior")->enabled(), false);
-
-    rect->setState("moved");
-    qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-    QCOMPARE(x, qreal(200));    //should change immediately
-}
-
-void tst_qmlbehaviors::dontStart()
-{
-    QmlEngine engine;
-
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
-
-    QTest::ignoreMessage(QtWarningMsg, "QmlAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-    QVERIFY(rect);
-
-    QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
-    QVERIFY(myAnim && myAnim->qtAnimation());
-    QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
-}
-
-QTEST_MAIN(tst_qmlbehaviors)
-
-#include "tst_qmlbehaviors.moc"
diff --git a/tests/auto/declarative/qmlbinding/data/test-binding.qml b/tests/auto/declarative/qmlbinding/data/test-binding.qml
deleted file mode 100644
index e9101e4..0000000
--- a/tests/auto/declarative/qmlbinding/data/test-binding.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: screen
-    width: 320; height: 240
-    property string text
-    property bool changeColor: false
-
-    Text { id: s1; text: "Hello" }
-    Rectangle { id: r1; width: 1; height: 1; color: "yellow" }
-    Rectangle { id: r2; width: 1; height: 1; color: "red" }
-
-    Binding { target: screen; property: "text"; value: s1.text; objectName: "binding1" }
-    Binding { target: screen; property: "color"; value: r1.color }
-    Binding { target: screen; property: "color"; when: screen.changeColor == true; value: r2.color }
-}
diff --git a/tests/auto/declarative/qmlbinding/data/test-binding2.qml b/tests/auto/declarative/qmlbinding/data/test-binding2.qml
deleted file mode 100644
index ea20c16..0000000
--- a/tests/auto/declarative/qmlbinding/data/test-binding2.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: screen
-    width: 320; height: 240
-    property string text
-    property bool changeColor: false
-
-    Text { id: s1; text: "Hello" }
-    Rectangle { id: r1; width: 1; height: 1; color: "yellow" }
-    Rectangle { id: r2; width: 1; height: 1; color: "red" }
-
-    Binding { target: screen; property: "text"; value: s1.text }
-    Binding { target: screen; property: "color"; value: r1.color }
-    Binding { target: screen; property: "color"; value: r2.color; when: screen.changeColor == true }
-}
diff --git a/tests/auto/declarative/qmlbinding/qmlbinding.pro b/tests/auto/declarative/qmlbinding/qmlbinding.pro
deleted file mode 100644
index dfaca91..0000000
--- a/tests/auto/declarative/qmlbinding/qmlbinding.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlbinding.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlbinding/tst_qmlbinding.cpp b/tests/auto/declarative/qmlbinding/tst_qmlbinding.cpp
deleted file mode 100644
index 92d1b69..0000000
--- a/tests/auto/declarative/qmlbinding/tst_qmlbinding.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlbind_p.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include "../../../shared/util.h"
-
-class tst_qmlbinding : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlbinding();
-
-private slots:
-    void binding();
-    void whenAfterValue();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlbinding::tst_qmlbinding()
-{
-}
-
-void tst_qmlbinding::binding()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-
-    QVERIFY(rect != 0);
-    QCOMPARE(rect->color(), QColor("yellow"));
-    QCOMPARE(rect->property("text").toString(), QString("Hello"));
-
-    rect->setProperty("changeColor", true);
-    QCOMPARE(rect->color(), QColor("red"));
-
-    QmlBind *binding = qobject_cast<QmlBind*>(rect->findChild<QmlBind*>("binding1"));
-    QVERIFY(binding != 0);
-    QCOMPARE(binding->object(), rect);
-    QCOMPARE(binding->property(), QLatin1String("text"));
-    QCOMPARE(binding->value().toString(), QLatin1String("Hello"));
-
-    delete rect;
-}
-
-void tst_qmlbinding::whenAfterValue()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding2.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
-
-    QVERIFY(rect != 0);
-    QCOMPARE(rect->color(), QColor("yellow"));
-    QCOMPARE(rect->property("text").toString(), QString("Hello"));
-
-    rect->setProperty("changeColor", true);
-    QCOMPARE(rect->color(), QColor("red"));
-
-    delete rect;
-}
-
-QTEST_MAIN(tst_qmlbinding)
-
-#include "tst_qmlbinding.moc"
diff --git a/tests/auto/declarative/qmlconnection/data/test-connection.qml b/tests/auto/declarative/qmlconnection/data/test-connection.qml
deleted file mode 100644
index 9534621..0000000
--- a/tests/auto/declarative/qmlconnection/data/test-connection.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: screen; width: 50
-
-    property bool tested: false
-    signal testMe
-
-    Connection { sender: screen; signal: "widthChanged()"; script: screen.tested = true }
-}
diff --git a/tests/auto/declarative/qmlconnection/data/test-connection2.qml b/tests/auto/declarative/qmlconnection/data/test-connection2.qml
deleted file mode 100644
index 65fe23a..0000000
--- a/tests/auto/declarative/qmlconnection/data/test-connection2.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-Connection { id: connection; sender: connection; signal: "widthChanged()"; script: 1 == 1 }
diff --git a/tests/auto/declarative/qmlconnection/data/test-connection3.qml b/tests/auto/declarative/qmlconnection/data/test-connection3.qml
deleted file mode 100644
index 32133f9..0000000
--- a/tests/auto/declarative/qmlconnection/data/test-connection3.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-Connection {}
diff --git a/tests/auto/declarative/qmlconnection/data/trimming.qml b/tests/auto/declarative/qmlconnection/data/trimming.qml
deleted file mode 100644
index c27dc46..0000000
--- a/tests/auto/declarative/qmlconnection/data/trimming.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: screen; width: 50
-
-    property string tested
-    signal testMe(int param1, string param2)
-
-    Connection { sender: screen; signal: "testMe(param1, param2)"; script: screen.tested = param2 + param1 }
-}
diff --git a/tests/auto/declarative/qmlconnection/qmlconnection.pro b/tests/auto/declarative/qmlconnection/qmlconnection.pro
deleted file mode 100644
index 3d46fa6..0000000
--- a/tests/auto/declarative/qmlconnection/qmlconnection.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlconnection.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlconnection/tst_qmlconnection.cpp b/tests/auto/declarative/qmlconnection/tst_qmlconnection.cpp
deleted file mode 100644
index 2aba7b5..0000000
--- a/tests/auto/declarative/qmlconnection/tst_qmlconnection.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlconnection_p.h>
-#include <private/qmlgraphicsitem_p.h>
-#include "../../../shared/util.h"
-#include <QtDeclarative/qmlscriptstring.h>
-
-class tst_qmlconnection : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlconnection();
-
-private slots:
-    void defaultValues();
-    void properties();
-    void connection();
-    void trimming();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlconnection::tst_qmlconnection()
-{
-}
-
-void tst_qmlconnection::defaultValues()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
-    QmlConnection *item = qobject_cast<QmlConnection*>(c.create());
-
-    QVERIFY(item != 0);
-    QVERIFY(item->signalSender() == 0);
-    QCOMPARE(item->script().script(), QString());
-    QCOMPARE(item->signal(), QString());
-
-    delete item;
-}
-
-void tst_qmlconnection::properties()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
-    QmlConnection *item = qobject_cast<QmlConnection*>(c.create());
-
-    QVERIFY(item != 0);
-
-    QVERIFY(item != 0);
-    QVERIFY(item->signalSender() == item);
-    QCOMPARE(item->script().script(), QString("1 == 1"));
-    QCOMPARE(item->signal(), QString("widthChanged()"));
-
-    delete item;
-}
-
-void tst_qmlconnection::connection()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(c.create());
-
-    QVERIFY(item != 0);
-
-    QCOMPARE(item->property("tested").toBool(), false);
-    QCOMPARE(item->width(), 50.);
-    emit item->setWidth(100.);
-    QCOMPARE(item->width(), 100.);
-    QCOMPARE(item->property("tested").toBool(), true);
-
-    delete item;
-}
-
-void tst_qmlconnection::trimming()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(c.create());
-
-    QVERIFY(item != 0);
-
-    QCOMPARE(item->property("tested").toString(), QString(""));
-    int index = item->metaObject()->indexOfSignal("testMe(int,QString)");
-    QMetaMethod method = item->metaObject()->method(index);
-    method.invoke(item,
-                  Qt::DirectConnection,
-                  Q_ARG(int, 5),
-                  Q_ARG(QString, "worked"));
-    QCOMPARE(item->property("tested").toString(), QString("worked5"));
-
-    delete item;
-}
-
-QTEST_MAIN(tst_qmlconnection)
-
-#include "tst_qmlconnection.moc"
diff --git a/tests/auto/declarative/qmlcontext/qmlcontext.pro b/tests/auto/declarative/qmlcontext/qmlcontext.pro
deleted file mode 100644
index 9e66429..0000000
--- a/tests/auto/declarative/qmlcontext/qmlcontext.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlcontext.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp b/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp
deleted file mode 100644
index 7ff7af2..0000000
--- a/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp
+++ /dev/null
@@ -1,434 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QDebug>
-#include <QmlEngine>
-#include <QmlContext>
-#include <QmlComponent>
-#include <QmlExpression>
-
-class tst_qmlcontext : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlcontext() {}
-
-private slots:
-    void baseUrl();
-    void resolvedUrl();
-    void engineMethod();
-    void parentContext();
-    void setContextProperty();
-    void addDefaultObject();
-    void destruction();
-
-private:
-    QmlEngine engine;
-};
-
-void tst_qmlcontext::baseUrl()
-{
-    QmlContext ctxt(&engine);
-
-    QCOMPARE(ctxt.baseUrl(), QUrl());
-
-    ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
-
-    QCOMPARE(ctxt.baseUrl(), QUrl("http://www.nokia.com/"));
-}
-
-void tst_qmlcontext::resolvedUrl()
-{
-    // Relative to the component
-    {
-        QmlContext ctxt(&engine);
-        ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
-
-        QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), QUrl("http://www.nokia.com/main.qml"));
-    }
-
-    // Relative to a parent
-    {
-        QmlContext ctxt(&engine);
-        ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
-
-        QmlContext ctxt2(&ctxt);
-        QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
-    }
-
-    // Relative to the engine
-    {
-        QmlContext ctxt(&engine);
-        QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), engine.baseUrl().resolved(QUrl("main.qml")));
-    }
-
-    // Relative to a deleted parent
-    {
-        QmlContext *ctxt = new QmlContext(&engine);
-        ctxt->setBaseUrl(QUrl("http://www.nokia.com/"));
-
-        QmlContext ctxt2(ctxt);
-        QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
-
-        delete ctxt; ctxt = 0;
-
-        QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl());
-    }
-
-    // Absolute
-    {
-        QmlContext ctxt(&engine);
-
-        QCOMPARE(ctxt.resolvedUrl(QUrl("http://www.nokia.com/main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
-        QCOMPARE(ctxt.resolvedUrl(QUrl("file:///main2.qml")), QUrl("file:///main2.qml"));
-    }
-}
-
-void tst_qmlcontext::engineMethod()
-{
-    QmlEngine *engine = new QmlEngine;
-
-    QmlContext ctxt(engine);
-    QmlContext ctxt2(&ctxt);
-    QmlContext ctxt3(&ctxt2);
-    QmlContext ctxt4(&ctxt2);
-
-    QCOMPARE(ctxt.engine(), engine);
-    QCOMPARE(ctxt2.engine(), engine);
-    QCOMPARE(ctxt3.engine(), engine);
-    QCOMPARE(ctxt4.engine(), engine);
-
-    delete engine; engine = 0;
-
-    QCOMPARE(ctxt.engine(), engine);
-    QCOMPARE(ctxt2.engine(), engine);
-    QCOMPARE(ctxt3.engine(), engine);
-    QCOMPARE(ctxt4.engine(), engine);
-}
-
-void tst_qmlcontext::parentContext()
-{
-    QmlEngine *engine = new QmlEngine;
-
-    QCOMPARE(engine->rootContext()->parentContext(), (QmlContext *)0);
-
-    QmlContext *ctxt = new QmlContext(engine);
-    QmlContext *ctxt2 = new QmlContext(ctxt);
-    QmlContext *ctxt3 = new QmlContext(ctxt2);
-    QmlContext *ctxt4 = new QmlContext(ctxt2);
-    QmlContext *ctxt5 = new QmlContext(ctxt);
-    QmlContext *ctxt6 = new QmlContext(engine);
-    QmlContext *ctxt7 = new QmlContext(engine->rootContext());
-
-    QCOMPARE(ctxt->parentContext(), engine->rootContext());
-    QCOMPARE(ctxt2->parentContext(), ctxt);
-    QCOMPARE(ctxt3->parentContext(), ctxt2);
-    QCOMPARE(ctxt4->parentContext(), ctxt2);
-    QCOMPARE(ctxt5->parentContext(), ctxt);
-    QCOMPARE(ctxt6->parentContext(), engine->rootContext());
-    QCOMPARE(ctxt7->parentContext(), engine->rootContext());
-
-    delete ctxt2; ctxt2 = 0;
-
-    QCOMPARE(ctxt->parentContext(), engine->rootContext());
-    QCOMPARE(ctxt3->parentContext(), ctxt2);
-    QCOMPARE(ctxt4->parentContext(), ctxt2);
-    QCOMPARE(ctxt5->parentContext(), ctxt);
-    QCOMPARE(ctxt6->parentContext(), engine->rootContext());
-    QCOMPARE(ctxt7->parentContext(), engine->rootContext());
-
-    delete engine; engine = 0;
-
-    QCOMPARE(ctxt->parentContext(), (QmlContext *)0);
-    QCOMPARE(ctxt3->parentContext(), ctxt2);
-    QCOMPARE(ctxt4->parentContext(), ctxt2);
-    QCOMPARE(ctxt5->parentContext(), ctxt);
-    QCOMPARE(ctxt6->parentContext(), (QmlContext *)0);
-    QCOMPARE(ctxt7->parentContext(), (QmlContext *)0);
-
-    delete ctxt7;
-    delete ctxt6;
-    delete ctxt5;
-    delete ctxt4;
-    delete ctxt3;
-    delete ctxt;
-}
-
-class TestObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int a READ a NOTIFY aChanged)
-    Q_PROPERTY(int b READ b NOTIFY bChanged)
-    Q_PROPERTY(int c READ c NOTIFY cChanged)
-
-public:
-    TestObject() : _a(10), _b(10), _c(10) {}
-
-    int a() const { return _a; }
-    void setA(int a) { _a = a; emit aChanged(); }
-
-    int b() const { return _b; }
-    void setB(int b) { _b = b; emit bChanged(); }
-
-    int c() const { return _c; }
-    void setC(int c) { _c = c; emit cChanged(); }
-
-signals:
-    void aChanged();
-    void bChanged();
-    void cChanged();
-
-private:
-    int _a;
-    int _b;
-    int _c;
-};
-
-class TestObject2 : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int b READ b NOTIFY bChanged)
-
-public:
-    TestObject2() : _b(10) {}
-
-    int b() const { return _b; }
-    void setB(int b) { _b = b; emit bChanged(); }
-
-signals:
-    void bChanged();
-
-private:
-    int _b;
-};
-
-#define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
-{ \
-    QmlComponent component(&engine); \
-    component.setData("import Qt 4.6; QtObject { property var test: " #name " }", QUrl()); \
-\
-    QObject *obj = component.create(ctxt); \
-\
-    QCOMPARE(obj->property("test"), value); \
-\
-    delete obj; \
-} 
-
-void tst_qmlcontext::setContextProperty()
-{
-    QmlContext ctxt(&engine);
-    QmlContext ctxt2(&ctxt);
-
-    TestObject obj1;
-    obj1.setA(3345);
-    TestObject obj2;
-    obj2.setA(-19);
-
-    // Static context properties
-    ctxt.setContextProperty("a", QVariant(10));
-    ctxt.setContextProperty("b", QVariant(9));
-    ctxt2.setContextProperty("d", &obj2);
-    ctxt2.setContextProperty("b", QVariant(19));
-    ctxt2.setContextProperty("c", QVariant(QString("Hello World!")));
-    ctxt.setContextProperty("d", &obj1);
-    ctxt.setContextProperty("e", &obj1);
-
-    TEST_CONTEXT_PROPERTY(&ctxt2, a, QVariant(10));
-    TEST_CONTEXT_PROPERTY(&ctxt2, b, QVariant(19));
-    TEST_CONTEXT_PROPERTY(&ctxt2, c, QVariant(QString("Hello World!")));
-    TEST_CONTEXT_PROPERTY(&ctxt2, d.a, QVariant(-19));
-    TEST_CONTEXT_PROPERTY(&ctxt2, e.a, QVariant(3345));
-
-    ctxt.setContextProperty("a", QVariant(13));
-    ctxt.setContextProperty("b", QVariant(4));
-    ctxt2.setContextProperty("b", QVariant(8));
-    ctxt2.setContextProperty("c", QVariant(QString("Hi World!")));
-    ctxt2.setContextProperty("d", &obj1);
-    obj1.setA(12);
-
-    TEST_CONTEXT_PROPERTY(&ctxt2, a, QVariant(13));
-    TEST_CONTEXT_PROPERTY(&ctxt2, b, QVariant(8));
-    TEST_CONTEXT_PROPERTY(&ctxt2, c, QVariant(QString("Hi World!")));
-    TEST_CONTEXT_PROPERTY(&ctxt2, d.a, QVariant(12));
-    TEST_CONTEXT_PROPERTY(&ctxt2, e.a, QVariant(12));
-
-    // Changes in context properties
-    {
-        QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
-
-        QObject *obj = component.create(&ctxt2); 
-
-        QCOMPARE(obj->property("test"), QVariant(13)); 
-        ctxt.setContextProperty("a", QVariant(19));
-        QCOMPARE(obj->property("test"), QVariant(19)); 
-
-        delete obj; 
-    }
-    {
-        QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: b }", QUrl()); 
-
-        QObject *obj = component.create(&ctxt2); 
-
-        QCOMPARE(obj->property("test"), QVariant(8)); 
-        ctxt.setContextProperty("b", QVariant(5));
-        QCOMPARE(obj->property("test"), QVariant(8)); 
-        ctxt2.setContextProperty("b", QVariant(1912));
-        QCOMPARE(obj->property("test"), QVariant(1912)); 
-
-        delete obj; 
-    }
-    {
-        QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: e.a }", QUrl()); 
-
-        QObject *obj = component.create(&ctxt2); 
-
-        QCOMPARE(obj->property("test"), QVariant(12)); 
-        obj1.setA(13);
-        QCOMPARE(obj->property("test"), QVariant(13)); 
-
-        delete obj; 
-    }
-
-    // New context properties
-    {
-        QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
-
-        QObject *obj = component.create(&ctxt2); 
-
-        QCOMPARE(obj->property("test"), QVariant(19)); 
-        ctxt2.setContextProperty("a", QVariant(1945));
-        QCOMPARE(obj->property("test"), QVariant(1945)); 
-
-        delete obj; 
-    }
-
-    // Setting an object-variant context property
-    {
-        QmlComponent component(&engine);
-        component.setData("import Qt 4.6; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property var obj: root; }", QUrl());
-
-        QmlContext ctxt(engine.rootContext());
-        ctxt.setContextProperty("ctxtProp", QVariant());
-
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:1: TypeError: Result of expression 'ctxtProp' [undefined] is not an object.");
-        QObject *obj = component.create(&ctxt);
-
-        QVariant v = obj->property("obj");
-
-        ctxt.setContextProperty("ctxtProp", v);
-
-        QCOMPARE(obj->property("test"), QVariant(10));
-
-        delete obj;
-    }
-}
-
-void tst_qmlcontext::addDefaultObject()
-{
-    QmlContext ctxt(&engine);
-
-    TestObject to;
-    TestObject2 to2;
-
-    to.setA(2);
-    to.setB(192);
-    to.setC(18);
-    to2.setB(111999);
-
-    ctxt.addDefaultObject(&to2);
-    ctxt.addDefaultObject(&to);
-    ctxt.setContextProperty("c", QVariant(9));
-
-    // Static context properties
-    TEST_CONTEXT_PROPERTY(&ctxt, a, QVariant(2));
-    TEST_CONTEXT_PROPERTY(&ctxt, b, QVariant(111999));
-    TEST_CONTEXT_PROPERTY(&ctxt, c, QVariant(9));
-
-    to.setA(12);
-    to.setB(100);
-    to.setC(7);
-    to2.setB(1612);
-    ctxt.setContextProperty("c", QVariant(3));
-
-    TEST_CONTEXT_PROPERTY(&ctxt, a, QVariant(12));
-    TEST_CONTEXT_PROPERTY(&ctxt, b, QVariant(1612));
-    TEST_CONTEXT_PROPERTY(&ctxt, c, QVariant(3));
-
-    // Changes in context properties
-    {
-        QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
-
-        QObject *obj = component.create(&ctxt); 
-
-        QCOMPARE(obj->property("test"), QVariant(12)); 
-        to.setA(14);
-        QCOMPARE(obj->property("test"), QVariant(14)); 
-
-        delete obj; 
-    }
-}
-
-void tst_qmlcontext::destruction()
-{
-    QmlContext *ctxt = new QmlContext(&engine);
-
-    QObject obj;
-    QmlEngine::setContextForObject(&obj, ctxt);
-    QmlExpression expr(ctxt, "a", 0);
-
-    QCOMPARE(ctxt, QmlEngine::contextForObject(&obj));
-    QCOMPARE(ctxt, expr.context());
-
-    delete ctxt; ctxt = 0;
-
-    QCOMPARE(ctxt, QmlEngine::contextForObject(&obj));
-    QCOMPARE(ctxt, expr.context());
-}
-
-QTEST_MAIN(tst_qmlcontext)
-
-#include "tst_qmlcontext.moc"
diff --git a/tests/auto/declarative/qmldatetimeformatter/qmldatetimeformatter.pro b/tests/auto/declarative/qmldatetimeformatter/qmldatetimeformatter.pro
deleted file mode 100644
index 2b1947d..0000000
--- a/tests/auto/declarative/qmldatetimeformatter/qmldatetimeformatter.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmldatetimeformatter.cpp
diff --git a/tests/auto/declarative/qmldatetimeformatter/tst_qmldatetimeformatter.cpp b/tests/auto/declarative/qmldatetimeformatter/tst_qmldatetimeformatter.cpp
deleted file mode 100644
index 4b5dc1d..0000000
--- a/tests/auto/declarative/qmldatetimeformatter/tst_qmldatetimeformatter.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmldatetimeformatter_p.h>
-#include <QDebug>
-
-class tst_qmldatetimeformatter : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmldatetimeformatter() {}
-
-private slots:
-    void date();
-    void time();
-    void dateTime();
-};
-
-void tst_qmldatetimeformatter::date()
-{
-    QmlEngine engine;
-    QmlComponent formatterComponent(&engine);
-    formatterComponent.setData(QByteArray("import Qt 4.6\n DateTimeFormatter { date: \"2008-12-24\" }"),
-                               QUrl::fromLocalFile(""));
-    QmlDateTimeFormatter *formatter = qobject_cast<QmlDateTimeFormatter*>(formatterComponent.create());
-    if(formatterComponent.isError())
-        qDebug() << formatterComponent.errors();
-    QVERIFY(formatter != 0);
-
-    QDate date(2008,12,24);
-    QCOMPARE(formatter->date(), date);
-    QCOMPARE(formatter->dateTime().date(), date);
-    QCOMPARE(formatter->dateText(),date.toString(Qt::SystemLocaleShortDate));
-
-    formatter->setLongStyle(true);
-    QVERIFY(formatter->longStyle());
-    QCOMPARE(formatter->dateText(),date.toString(Qt::SystemLocaleLongDate));
-
-    formatter->setDateFormat("ddd MMMM d yy");
-    QCOMPARE(formatter->dateFormat(), QLatin1String("ddd MMMM d yy"));
-    QCOMPARE(formatter->dateText(),date.toString("ddd MMMM d yy"));
-
-    QVERIFY(formatter->timeText().isEmpty());
-    QVERIFY(formatter->dateTimeText().isEmpty());
-
-    delete formatter;
-}
-
-void tst_qmldatetimeformatter::time()
-{
-    QmlEngine engine;
-    QmlComponent formatterComponent(&engine);
-    formatterComponent.setData("import Qt 4.6\n DateTimeFormatter { time: \"14:15:38.200\" }", QUrl::fromLocalFile(""));
-    QmlDateTimeFormatter *formatter = qobject_cast<QmlDateTimeFormatter*>(formatterComponent.create());
-    if(formatterComponent.isError())
-        qDebug() << formatterComponent.errors();
-    QVERIFY(formatter != 0);
-
-    QTime time(14,15,38,200);
-
-    QCOMPARE(formatter->time(),time);
-    QCOMPARE(formatter->dateTime().time(),time);
-
-    QCOMPARE(formatter->timeText(),time.toString(Qt::SystemLocaleShortDate));
-
-    formatter->setLongStyle(true);
-    QCOMPARE(formatter->timeText(),time.toString(Qt::SystemLocaleLongDate));
-
-    formatter->setTimeFormat("H:m:s a");
-    QCOMPARE(formatter->timeFormat(), QLatin1String("H:m:s a"));
-    QCOMPARE(formatter->timeText(),time.toString("H:m:s a"));
-
-    formatter->setTimeFormat("hh:mm:ss.zzz");
-    QCOMPARE(formatter->timeText(),time.toString("hh:mm:ss.zzz"));
-
-    QVERIFY(formatter->dateText().isEmpty());
-    QVERIFY(formatter->dateTimeText().isEmpty());
-
-    delete formatter;
-}
-
-void tst_qmldatetimeformatter::dateTime()
-{
-    QmlEngine engine;
-    QmlComponent formatterComponent(&engine);
-    formatterComponent.setData("import Qt 4.6\n DateTimeFormatter { dateTime: \"1978-03-04T09:13:54\" }", QUrl::fromLocalFile(""));
-    QmlDateTimeFormatter *formatter = qobject_cast<QmlDateTimeFormatter*>(formatterComponent.create());
-    if(formatterComponent.isError())
-        qDebug() << formatterComponent.errors();
-    QVERIFY(formatter != 0);
-
-    QDateTime dateTime(QDate(1978,03,04),QTime(9,13,54));
-    QCOMPARE(formatter->dateTime(),dateTime);
-    QCOMPARE(formatter->date(),dateTime.date());
-    QCOMPARE(formatter->time(),dateTime.time());
-    QCOMPARE(formatter->dateTimeText(),dateTime.toString(Qt::SystemLocaleShortDate));
-
-    formatter->setLongStyle(true);
-    QCOMPARE(formatter->dateTimeText(),dateTime.toString(Qt::SystemLocaleLongDate));
-
-    formatter->setDateTimeFormat("M/d/yy H:m:s a");
-    QCOMPARE(formatter->dateTimeFormat(), QLatin1String("M/d/yy H:m:s a"));
-    QCOMPARE(formatter->dateTimeText(),dateTime.toString("M/d/yy H:m:s a"));
-
-    delete formatter;
-}
-
-QTEST_MAIN(tst_qmldatetimeformatter)
-
-#include "tst_qmldatetimeformatter.moc"
diff --git a/tests/auto/declarative/qmldebug/qmldebug.pro b/tests/auto/declarative/qmldebug/qmldebug.pro
deleted file mode 100644
index f79829d..0000000
--- a/tests/auto/declarative/qmldebug/qmldebug.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += network declarative
-macx:CONFIG -= app_bundle
-
-HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qmldebug.cpp \
-           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qmldebug/tst_qmldebug.cpp b/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
deleted file mode 100644
index 2f1a557..0000000
--- a/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
+++ /dev/null
@@ -1,841 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QSignalSpy>
-#include <QTimer>
-#include <QHostAddress>
-#include <QDebug>
-#include <QThread>
-
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlexpression.h>
-#include <QtDeclarative/qmlmetatype.h>
-#include <QtDeclarative/qmlmetaproperty.h>
-
-#include <private/qmlbinding_p.h>
-#include <private/qmldebug_p.h>
-#include <private/qmlenginedebug_p.h>
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-#include <private/qmlgraphicsrectangle_p.h>
-
-#include "../shared/debugutil_p.h"
-
-Q_DECLARE_METATYPE(QmlDebugWatch::State)
-
-
-class tst_QmlDebug : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_QmlDebug(QmlDebugTestData *data)
-    {
-        m_conn = data->conn;
-        m_engine = data->engine;
-        m_rootItem = data->items[0];
-    }
-
-private:
-    QmlDebugObjectReference findRootObject();
-    QmlDebugPropertyReference findProperty(const QList<QmlDebugPropertyReference> &props, const QString &name) const;
-    void waitForQuery(QmlDebugQuery *query);
-
-    void recursiveObjectTest(QObject *o, const QmlDebugObjectReference &oref, bool recursive) const;
-
-    void recursiveCompareObjects(const QmlDebugObjectReference &a, const QmlDebugObjectReference &b) const;
-    void recursiveCompareContexts(const QmlDebugContextReference &a, const QmlDebugContextReference &b) const;
-    void compareProperties(const QmlDebugPropertyReference &a, const QmlDebugPropertyReference &b) const;
-    
-    QmlDebugConnection *m_conn;
-    QmlEngineDebug *m_dbg;
-    QmlEngine *m_engine;
-    QmlGraphicsItem *m_rootItem;
-
-private slots:
-    void initTestCase();
-
-    void watch_property();
-    void watch_object();
-    void watch_expression();
-    void watch_expression_data();
-    void watch_context();
-    void watch_file();
-
-    void queryAvailableEngines();
-    void queryRootContexts();
-    void queryObject();
-    void queryObject_data();
-    void queryExpressionResult();
-    void queryExpressionResult_data();
-
-    void tst_QmlDebugFileReference();
-    void tst_QmlDebugEngineReference();
-    void tst_QmlDebugObjectReference();
-    void tst_QmlDebugContextReference();
-    void tst_QmlDebugPropertyReference();
-};
-
-QmlDebugObjectReference tst_QmlDebug::findRootObject()
-{
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    
-    if (q_engines->engines().count() == 0)
-        return QmlDebugObjectReference();
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-
-    if (q_context->rootContext().objects().count() == 0)
-        return QmlDebugObjectReference();
-    QmlDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
-    waitForQuery(q_obj);
-
-    QmlDebugObjectReference result = q_obj->object();
-
-    delete q_engines;
-    delete q_context;
-    delete q_obj;
-
-    return result;
-}
-
-QmlDebugPropertyReference tst_QmlDebug::findProperty(const QList<QmlDebugPropertyReference> &props, const QString &name) const
-{
-    foreach(const QmlDebugPropertyReference &p, props) {
-        if (p.name() == name)
-            return p;
-    }
-    return QmlDebugPropertyReference();
-}
-
-void tst_QmlDebug::waitForQuery(QmlDebugQuery *query)
-{
-    QVERIFY(query);
-    QCOMPARE(query->parent(), this);
-    QVERIFY(query->state() == QmlDebugQuery::Waiting);
-    if (!QmlDebugTest::waitForSignal(query, SIGNAL(stateChanged(QmlDebugQuery::State))))
-        QFAIL("query timed out");
-}
-
-void tst_QmlDebug::recursiveObjectTest(QObject *o, const QmlDebugObjectReference &oref, bool recursive) const
-{
-    const QMetaObject *meta = o->metaObject();
-
-    QmlType *type = QmlMetaType::qmlType(o->metaObject());
-    QString className = type ? type->qmlTypeName() : QString();
-    className = className.mid(className.lastIndexOf(QLatin1Char('/'))+1);
-
-    QCOMPARE(oref.debugId(), QmlDebugService::idForObject(o));
-    QCOMPARE(oref.name(), o->objectName());
-    QCOMPARE(oref.className(), className);
-    QCOMPARE(oref.contextDebugId(), QmlDebugService::idForObject(qmlContext(o)));
-
-    const QObjectList &children = o->children();
-    for (int i=0; i<children.count(); i++) {
-        QObject *child = children[i];
-        if (!qmlContext(child))
-            continue;
-        int debugId = QmlDebugService::idForObject(child);
-        QVERIFY(debugId >= 0);
-
-        QmlDebugObjectReference cref;
-        foreach (const QmlDebugObjectReference &ref, oref.children()) {
-            if (ref.debugId() == debugId) {
-                cref = ref;
-                break;
-            }
-        }
-        QVERIFY(cref.debugId() >= 0);
-
-        if (recursive)
-            recursiveObjectTest(child, cref, true);
-    }
-
-    foreach (const QmlDebugPropertyReference &p, oref.properties()) {
-        QCOMPARE(p.objectDebugId(), QmlDebugService::idForObject(o));
-
-        // signal properties are fake - they are generated from QmlBoundSignal children
-        if (p.name().startsWith("on") && p.name().length() > 2 && p.name()[2].isUpper()) {
-            QVERIFY(p.value().toString().startsWith('{') && p.value().toString().endsWith('}'));
-            QVERIFY(p.valueTypeName().isEmpty());
-            QVERIFY(p.binding().isEmpty());
-            QVERIFY(!p.hasNotifySignal());
-            continue;
-        }
-
-        QMetaProperty pmeta = meta->property(meta->indexOfProperty(p.name().toUtf8().constData()));
-
-        QCOMPARE(p.name(), QString::fromUtf8(pmeta.name()));
-
-        if (pmeta.type() < QVariant::UserType) // TODO test complex types
-            QCOMPARE(p.value(), pmeta.read(o));
-
-        if (p.name() == "parent")
-            QVERIFY(p.valueTypeName() == "QGraphicsObject*" || p.valueTypeName() == "QmlGraphicsItem*");
-        else
-            QCOMPARE(p.valueTypeName(), QString::fromUtf8(pmeta.typeName()));
-
-        QmlAbstractBinding *binding = QmlMetaProperty(o, p.name()).binding();
-        if (binding)
-            QCOMPARE(binding->expression(), p.binding());
-
-        QCOMPARE(p.hasNotifySignal(), pmeta.hasNotifySignal());
-
-        QVERIFY(pmeta.isValid());
-    }
-}
-
-void tst_QmlDebug::recursiveCompareObjects(const QmlDebugObjectReference &a, const QmlDebugObjectReference &b) const
-{
-    QCOMPARE(a.debugId(), b.debugId());
-    QCOMPARE(a.className(), b.className());
-    QCOMPARE(a.name(), b.name());
-    QCOMPARE(a.contextDebugId(), b.contextDebugId());
-
-    QCOMPARE(a.source().url(), b.source().url());
-    QCOMPARE(a.source().lineNumber(), b.source().lineNumber());
-    QCOMPARE(a.source().columnNumber(), b.source().columnNumber());
-
-    QCOMPARE(a.properties().count(), b.properties().count());
-    QCOMPARE(a.children().count(), b.children().count());
-
-    QList<QmlDebugPropertyReference> aprops = a.properties();
-    QList<QmlDebugPropertyReference> bprops = b.properties();
-
-    for (int i=0; i<aprops.count(); i++)
-        compareProperties(aprops[i], bprops[i]);
-
-    for (int i=0; i<a.children().count(); i++)
-        recursiveCompareObjects(a.children()[i], b.children()[i]);
-}
-
-void tst_QmlDebug::recursiveCompareContexts(const QmlDebugContextReference &a, const QmlDebugContextReference &b) const
-{
-    QCOMPARE(a.debugId(), b.debugId());
-    QCOMPARE(a.name(), b.name());
-    QCOMPARE(a.objects().count(), b.objects().count());
-    QCOMPARE(a.contexts().count(), b.contexts().count());
-
-    for (int i=0; i<a.objects().count(); i++)
-        recursiveCompareObjects(a.objects()[i], b.objects()[i]);
-
-    for (int i=0; i<a.contexts().count(); i++)
-        recursiveCompareContexts(a.contexts()[i], b.contexts()[i]);
-}
-
-void tst_QmlDebug::compareProperties(const QmlDebugPropertyReference &a, const QmlDebugPropertyReference &b) const
-{
-    QCOMPARE(a.objectDebugId(), b.objectDebugId());
-    QCOMPARE(a.name(), b.name());
-    QCOMPARE(a.value(), b.value());
-    QCOMPARE(a.valueTypeName(), b.valueTypeName());
-    QCOMPARE(a.binding(), b.binding());
-    QCOMPARE(a.hasNotifySignal(), b.hasNotifySignal());
-}
-
-void tst_QmlDebug::initTestCase()
-{
-    m_dbg = new QmlEngineDebug(m_conn, this);
-
-    qRegisterMetaType<QmlDebugWatch::State>();
-}
-
-void tst_QmlDebug::watch_property()
-{
-    QmlDebugObjectReference obj = findRootObject();
-    QmlDebugPropertyReference prop = findProperty(obj.properties(), "width");
-
-    QmlDebugPropertyWatch *watch;
-    
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
-    watch = unconnected->addWatch(prop, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Dead);
-    delete watch;
-    delete unconnected;
-
-    watch = m_dbg->addWatch(QmlDebugPropertyReference(), this);
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Inactive);
-    delete watch;
-    
-    watch = m_dbg->addWatch(prop, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
-    QCOMPARE(watch->objectDebugId(), obj.debugId());
-    QCOMPARE(watch->name(), prop.name());
-
-    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
-
-    int origWidth = m_rootItem->property("width").toInt();
-    m_rootItem->setProperty("width", origWidth*2);
-
-    // stateChanged() is received before valueChanged()
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Active);
-    QCOMPARE(spy.count(), 1);
-
-    m_dbg->removeWatch(watch);
-    delete watch;
-
-    // restore original value and verify spy doesn't get additional signal since watch has been removed
-    m_rootItem->setProperty("width", origWidth);
-    QTest::qWait(100);
-    QCOMPARE(spy.count(), 1);
-
-    QCOMPARE(spy.at(0).at(0).value<QByteArray>(), prop.name().toUtf8());
-    QCOMPARE(spy.at(0).at(1).value<QVariant>(), qVariantFromValue(origWidth*2));
-}
-
-void tst_QmlDebug::watch_object()
-{
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    
-    Q_ASSERT(q_engines->engines().count() > 0);
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-
-    Q_ASSERT(q_context->rootContext().objects().count() > 0);
-    QmlDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
-    waitForQuery(q_obj);
-
-    QmlDebugObjectReference obj = q_obj->object();
-
-    delete q_engines;
-    delete q_context;
-    delete q_obj;
-
-    QmlDebugWatch *watch;
-
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
-    watch = unconnected->addWatch(obj, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Dead);
-    delete watch;
-    delete unconnected;
-    
-    watch = m_dbg->addWatch(QmlDebugObjectReference(), this);
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Inactive);
-    delete watch;
-
-    watch = m_dbg->addWatch(obj, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
-    QCOMPARE(watch->objectDebugId(), obj.debugId());
-
-    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
-
-    int origWidth = m_rootItem->property("width").toInt();
-    int origHeight = m_rootItem->property("height").toInt();
-    m_rootItem->setProperty("width", origWidth*2);
-    m_rootItem->setProperty("height", origHeight*2);
-
-    // stateChanged() is received before any valueChanged() signals
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Active);
-    QVERIFY(spy.count() > 0);
-
-    int newWidth = -1;
-    int newHeight = -1;
-    for (int i=0; i<spy.count(); i++) {
-        const QVariantList &values = spy[i];
-        if (values[0].value<QByteArray>() == "width")
-            newWidth = values[1].value<QVariant>().toInt();
-        else if (values[0].value<QByteArray>() == "height")
-            newHeight = values[1].value<QVariant>().toInt();
-
-    }
-
-    m_dbg->removeWatch(watch);
-    delete watch;
-
-    // since watch has been removed, restoring the original values should not trigger a valueChanged()
-    spy.clear();
-    m_rootItem->setProperty("width", origWidth);
-    m_rootItem->setProperty("height", origHeight);
-    QTest::qWait(100);
-    QCOMPARE(spy.count(), 0);
-
-    QCOMPARE(newWidth, origWidth * 2);
-    QCOMPARE(newHeight, origHeight * 2);
-}
-
-void tst_QmlDebug::watch_expression()
-{
-    QFETCH(QString, expr);
-    QFETCH(int, increment);
-    QFETCH(int, incrementCount);
-
-    int origWidth = m_rootItem->property("width").toInt();
-    
-    QmlDebugObjectReference obj = findRootObject();
-
-    QmlDebugObjectExpressionWatch *watch;
-
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
-    watch = unconnected->addWatch(obj, expr, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Dead);
-    delete watch;
-    delete unconnected;
-    
-    watch = m_dbg->addWatch(QmlDebugObjectReference(), expr, this);
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Inactive);
-    delete watch;
-    
-    watch = m_dbg->addWatch(obj, expr, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
-    QCOMPARE(watch->objectDebugId(), obj.debugId());
-    QCOMPARE(watch->expression(), expr);
-
-    QSignalSpy spyState(watch, SIGNAL(stateChanged(QmlDebugWatch::State)));
-
-    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
-    int expectedSpyCount = incrementCount + 1;  // should also get signal with expression's initial value
-
-    int width = origWidth;
-    for (int i=0; i<incrementCount+1; i++) {
-        if (i > 0) {
-            width += increment;
-            m_rootItem->setProperty("width", width);
-        }
-        if (!QmlDebugTest::waitForSignal(watch, SIGNAL(valueChanged(QByteArray,QVariant))))
-            QFAIL("Did not receive valueChanged() for expression");
-    }
-
-    if (spyState.count() == 0)
-        QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(spyState.count(), 1);
-    QCOMPARE(watch->state(), QmlDebugWatch::Active);
-
-    m_dbg->removeWatch(watch);
-    delete watch;
-
-    // restore original value and verify spy doesn't get a signal since watch has been removed
-    m_rootItem->setProperty("width", origWidth); 
-    QTest::qWait(100);
-    QCOMPARE(spy.count(), expectedSpyCount);
-
-    width = origWidth + increment;
-    for (int i=0; i<spy.count(); i++) {
-        QCOMPARE(spy.at(i).at(1).value<QVariant>().toInt(), width);
-        width += increment;
-    }
-}
-
-void tst_QmlDebug::watch_expression_data()
-{
-    QTest::addColumn<QString>("expr");
-    QTest::addColumn<int>("increment");
-    QTest::addColumn<int>("incrementCount");
-
-    QTest::newRow("width") << "width" << 0 << 0;
-    QTest::newRow("width+10") << "width + 10" << 10 << 5;
-}
-
-void tst_QmlDebug::watch_context()
-{
-    QmlDebugContextReference c;
-    QTest::ignoreMessage(QtWarningMsg, "QmlEngineDebug::addWatch(): Not implemented");
-    QVERIFY(!m_dbg->addWatch(c, QString(), this));
-}
-
-void tst_QmlDebug::watch_file()
-{
-    QmlDebugFileReference f;
-    QTest::ignoreMessage(QtWarningMsg, "QmlEngineDebug::addWatch(): Not implemented");
-    QVERIFY(!m_dbg->addWatch(f, this));
-}
-
-void tst_QmlDebug::queryAvailableEngines()
-{
-    QmlDebugEnginesQuery *q_engines;
-
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
-    q_engines = unconnected->queryAvailableEngines(0);
-    QCOMPARE(q_engines->state(), QmlDebugQuery::Error);
-    delete q_engines;
-    delete unconnected;
-
-    q_engines = m_dbg->queryAvailableEngines(this);
-    delete q_engines;
-
-    q_engines = m_dbg->queryAvailableEngines(this);
-    QVERIFY(q_engines->engines().isEmpty());
-    waitForQuery(q_engines);
-
-    // TODO test multiple engines
-    QList<QmlDebugEngineReference> engines = q_engines->engines();
-    QCOMPARE(engines.count(), 1);
-
-    foreach(const QmlDebugEngineReference &e, engines) {
-        QCOMPARE(e.debugId(), QmlDebugService::idForObject(m_engine));
-        QCOMPARE(e.name(), m_engine->objectName());
-    }
-
-    delete q_engines;
-}
-
-void tst_QmlDebug::queryRootContexts()
-{
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    int engineId = q_engines->engines()[0].debugId();
-
-    QmlDebugRootContextQuery *q_context;
-    
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
-    q_context = unconnected->queryRootContexts(engineId, this);
-    QCOMPARE(q_context->state(), QmlDebugQuery::Error);
-    delete q_context;
-    delete unconnected;
-
-    q_context = m_dbg->queryRootContexts(engineId, this);
-    delete q_context;
-
-    q_context = m_dbg->queryRootContexts(engineId, this);
-    waitForQuery(q_context);
-
-    QmlContext *actualContext = m_engine->rootContext();
-    QmlDebugContextReference context = q_context->rootContext();
-    QCOMPARE(context.debugId(), QmlDebugService::idForObject(actualContext));
-    QCOMPARE(context.name(), actualContext->objectName());
-
-    QCOMPARE(context.objects().count(), 2); // 2 qml component objects created for context in main()
-
-    // root context query sends only root object data - it doesn't fill in
-    // the children or property info
-    QCOMPARE(context.objects()[0].properties().count(), 0);
-    QCOMPARE(context.objects()[0].children().count(), 0);
-
-    QCOMPARE(context.contexts().count(), 1);
-    QVERIFY(context.contexts()[0].debugId() >= 0);
-    QCOMPARE(context.contexts()[0].name(), QString("tst_QmlDebug_childContext"));
-
-    delete q_engines;
-    delete q_context;
-}
-
-void tst_QmlDebug::queryObject()
-{
-    QFETCH(bool, recursive);
-
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-    QmlDebugObjectReference rootObject = q_context->rootContext().objects()[0];
-
-    QmlDebugObjectQuery *q_obj = 0;
-
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
-    q_obj = recursive ? unconnected->queryObjectRecursive(rootObject, this) : unconnected->queryObject(rootObject, this);
-    QCOMPARE(q_obj->state(), QmlDebugQuery::Error);
-    delete q_obj;
-    delete unconnected;
-
-    q_obj = recursive ? m_dbg->queryObjectRecursive(rootObject, this) : m_dbg->queryObject(rootObject, this);
-    delete q_obj;
-
-    q_obj = recursive ? m_dbg->queryObjectRecursive(rootObject, this) : m_dbg->queryObject(rootObject, this);
-    waitForQuery(q_obj);
-
-    QmlDebugObjectReference obj = q_obj->object();
-
-    delete q_engines;
-    delete q_context;
-    delete q_obj;
-
-    // check source as defined in main()
-    QmlDebugFileReference source = obj.source();
-    QCOMPARE(source.url(), QUrl::fromLocalFile(""));
-    QCOMPARE(source.lineNumber(), 2);
-    QCOMPARE(source.columnNumber(), 1);
-
-    // generically test all properties, children and childrens' properties
-    recursiveObjectTest(m_rootItem, obj, recursive);
-
-    if (recursive) {
-        foreach(const QmlDebugObjectReference &child, obj.children())
-            QVERIFY(child.properties().count() > 0);
-
-        QmlDebugObjectReference rect;
-        QmlDebugObjectReference text;
-        foreach (const QmlDebugObjectReference &child, obj.children()) {
-            if (child.className() == "Rectangle")
-                rect = child;
-            else if (child.className() == "Text")
-                text = child;
-        }
-
-        // test specific property values
-        QCOMPARE(findProperty(rect.properties(), "width").value(), qVariantFromValue(500));
-        QCOMPARE(findProperty(rect.properties(), "height").value(), qVariantFromValue(600));
-        QCOMPARE(findProperty(rect.properties(), "color").value(), qVariantFromValue(QColor("blue")));
-
-        QCOMPARE(findProperty(text.properties(), "color").value(), qVariantFromValue(QColor("blue")));
-
-    } else {
-        foreach(const QmlDebugObjectReference &child, obj.children())
-            QCOMPARE(child.properties().count(), 0);
-    }
-}
-
-void tst_QmlDebug::queryObject_data()
-{
-    QTest::addColumn<bool>("recursive");
-
-    QTest::newRow("non-recursive") << false;
-    QTest::newRow("recursive") << true;
-}
-
-void tst_QmlDebug::queryExpressionResult()
-{
-    QFETCH(QString, expr);
-    QFETCH(QVariant, result);
-
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);    // check immediate deletion is ok
-    
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-    int objectId = q_context->rootContext().objects()[0].debugId();
-
-    QmlDebugExpressionQuery *q_expr;
-
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
-    q_expr = unconnected->queryExpressionResult(objectId, expr, this);
-    QCOMPARE(q_expr->state(), QmlDebugQuery::Error);
-    delete q_expr;
-    delete unconnected;
-    
-    q_expr = m_dbg->queryExpressionResult(objectId, expr, this);
-    delete q_expr;
-
-    q_expr = m_dbg->queryExpressionResult(objectId, expr, this);
-    QCOMPARE(q_expr->expression(), expr);
-    waitForQuery(q_expr);
-
-    QCOMPARE(q_expr->result(), result);
-
-    delete q_engines;
-    delete q_context;
-    delete q_expr;
-}
-
-void tst_QmlDebug::queryExpressionResult_data()
-{
-    QTest::addColumn<QString>("expr");
-    QTest::addColumn<QVariant>("result");
-
-    QTest::newRow("width + 50") << "width + 50" << qVariantFromValue(60);
-    QTest::newRow("blueRect.width") << "blueRect.width" << qVariantFromValue(500);
-    QTest::newRow("bad expr") << "aeaef" << qVariantFromValue(QString("<undefined>"));
-}
-
-void tst_QmlDebug::tst_QmlDebugFileReference()
-{
-    QmlDebugFileReference ref;
-    QVERIFY(ref.url().isEmpty());
-    QCOMPARE(ref.lineNumber(), -1);
-    QCOMPARE(ref.columnNumber(), -1);
-
-    ref.setUrl(QUrl("http://test"));
-    QCOMPARE(ref.url(), QUrl("http://test"));
-    ref.setLineNumber(1);
-    QCOMPARE(ref.lineNumber(), 1);
-    ref.setColumnNumber(1);
-    QCOMPARE(ref.columnNumber(), 1);
-
-    QmlDebugFileReference copy(ref);
-    QmlDebugFileReference copyAssign;
-    copyAssign = ref;
-    foreach (const QmlDebugFileReference &r, (QList<QmlDebugFileReference>() << copy << copyAssign)) {
-        QCOMPARE(r.url(), ref.url());
-        QCOMPARE(r.lineNumber(), ref.lineNumber());
-        QCOMPARE(r.columnNumber(), ref.columnNumber());
-    }
-}
-
-void tst_QmlDebug::tst_QmlDebugEngineReference()
-{
-    QmlDebugEngineReference ref;
-    QCOMPARE(ref.debugId(), -1);
-    QVERIFY(ref.name().isEmpty());
-
-    ref = QmlDebugEngineReference(1);
-    QCOMPARE(ref.debugId(), 1);
-    QVERIFY(ref.name().isEmpty());
-
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    ref = q_engines->engines()[0];
-    delete q_engines;
-
-    QmlDebugEngineReference copy(ref);
-    QmlDebugEngineReference copyAssign;
-    copyAssign = ref;
-    foreach (const QmlDebugEngineReference &r, (QList<QmlDebugEngineReference>() << copy << copyAssign)) {
-        QCOMPARE(r.debugId(), ref.debugId());
-        QCOMPARE(r.name(), ref.name());
-    }
-}
-
-void tst_QmlDebug::tst_QmlDebugObjectReference()
-{
-    QmlDebugObjectReference ref;
-    QCOMPARE(ref.debugId(), -1);
-    QCOMPARE(ref.className(), QString());
-    QCOMPARE(ref.name(), QString());
-    QCOMPARE(ref.contextDebugId(), -1);
-    QVERIFY(ref.properties().isEmpty());
-    QVERIFY(ref.children().isEmpty());
-
-    QmlDebugFileReference source = ref.source();
-    QVERIFY(source.url().isEmpty());
-    QVERIFY(source.lineNumber() < 0);
-    QVERIFY(source.columnNumber() < 0);
-
-    ref = QmlDebugObjectReference(1);
-    QCOMPARE(ref.debugId(), 1);
-
-    QmlDebugObjectReference rootObject = findRootObject();
-    QmlDebugObjectQuery *query = m_dbg->queryObjectRecursive(rootObject, this);
-    waitForQuery(query);
-    ref = query->object();
-    delete query;
-
-    QVERIFY(ref.debugId() >= 0);
-
-    QmlDebugObjectReference copy(ref);
-    QmlDebugObjectReference copyAssign;
-    copyAssign = ref;
-    foreach (const QmlDebugObjectReference &r, (QList<QmlDebugObjectReference>() << copy << copyAssign))
-        recursiveCompareObjects(r, ref);
-}
-
-void tst_QmlDebug::tst_QmlDebugContextReference()
-{
-    QmlDebugContextReference ref;
-    QCOMPARE(ref.debugId(), -1);
-    QVERIFY(ref.name().isEmpty());
-    QVERIFY(ref.objects().isEmpty());
-    QVERIFY(ref.contexts().isEmpty());
-
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
-    waitForQuery(q_engines);
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
-    waitForQuery(q_context);
-
-    ref = q_context->rootContext();
-    delete q_engines;
-    delete q_context;
-    QVERIFY(ref.debugId() >= 0);
-
-    QmlDebugContextReference copy(ref);
-    QmlDebugContextReference copyAssign;
-    copyAssign = ref;
-    foreach (const QmlDebugContextReference &r, (QList<QmlDebugContextReference>() << copy << copyAssign))
-        recursiveCompareContexts(r, ref);
-}
-
-void tst_QmlDebug::tst_QmlDebugPropertyReference()
-{
-    QmlDebugObjectReference rootObject = findRootObject();
-    QmlDebugObjectQuery *query = m_dbg->queryObject(rootObject, this);
-    waitForQuery(query);
-    QmlDebugObjectReference obj = query->object();
-    delete query;   
-
-    QmlDebugPropertyReference ref = findProperty(obj.properties(), "scale");
-    QVERIFY(ref.objectDebugId() > 0);
-    QVERIFY(!ref.name().isEmpty());
-    QVERIFY(!ref.value().isNull());
-    QVERIFY(!ref.valueTypeName().isEmpty());
-    QVERIFY(!ref.binding().isEmpty());
-    QVERIFY(ref.hasNotifySignal());
-  
-    QmlDebugPropertyReference copy(ref);
-    QmlDebugPropertyReference copyAssign;
-    copyAssign = ref;
-    foreach (const QmlDebugPropertyReference &r, (QList<QmlDebugPropertyReference>() << copy << copyAssign))
-        compareProperties(r, ref);
-}
-
-
-class tst_QmlDebug_Factory : public QmlTestFactory
-{
-public:
-    QObject *createTest(QmlDebugTestData *data)
-    {
-        tst_QmlDebug *test = new tst_QmlDebug(data);
-        QmlContext *c = new QmlContext(data->engine->rootContext(), test);
-        c->setObjectName("tst_QmlDebug_childContext");
-        return test;
-    }
-};
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QList<QByteArray> qml;
-    qml << "import Qt 4.6\n"
-            "Item {"
-                "width: 10; height: 20; scale: blueRect.scale;"
-                "Rectangle { id: blueRect; width: 500; height: 600; color: \"blue\"; }"
-                "Text { color: blueRect.color; }"
-                "MouseArea {"
-                    "onEntered: { console.log('hello') }"
-                "}"
-            "}";
-    // add second component to test multiple root contexts
-    qml << "import Qt 4.6\n"
-            "Item {}";
-    tst_QmlDebug_Factory factory;
-    return QmlDebugTest::runTests(&factory, qml);
-}
-
-//QTEST_MAIN(tst_QmlDebug)
-
-#include "tst_qmldebug.moc"
diff --git a/tests/auto/declarative/qmldebugclient/qmldebugclient.pro b/tests/auto/declarative/qmldebugclient/qmldebugclient.pro
deleted file mode 100644
index 36aa818..0000000
--- a/tests/auto/declarative/qmldebugclient/qmldebugclient.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += network declarative
-macx:CONFIG -= app_bundle
-
-HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qmldebugclient.cpp \
-           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qmldebugclient/tst_qmldebugclient.cpp b/tests/auto/declarative/qmldebugclient/tst_qmldebugclient.cpp
deleted file mode 100644
index 3c87d71..0000000
--- a/tests/auto/declarative/qmldebugclient/tst_qmldebugclient.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QSignalSpy>
-#include <QTimer>
-#include <QHostAddress>
-#include <QDebug>
-#include <QThread>
-
-#include <QtDeclarative/qmlengine.h>
-
-#include <private/qmldebug_p.h>
-#include <private/qmlenginedebug_p.h>
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-
-#include "../shared/debugutil_p.h"
-
-class tst_QmlDebugClient : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_QmlDebugClient(QmlDebugTestData *data)
-    {
-        m_conn = data->conn;
-    }
-
-    QmlDebugConnection *m_conn;
-
-private slots:
-    void name();
-    void isEnabled();
-    void setEnabled();
-    void isConnected();
-    void sendMessage();
-};
-
-void tst_QmlDebugClient::name()
-{
-    QString name = "tst_QmlDebugClient::name()";
-
-    QmlDebugClient client(name, m_conn);
-    QCOMPARE(client.name(), name);
-}
-
-void tst_QmlDebugClient::isEnabled()
-{
-    QmlDebugClient client("tst_QmlDebugClient::isEnabled()", m_conn);
-    QCOMPARE(client.isEnabled(), false);
-}
-
-void tst_QmlDebugClient::setEnabled()
-{
-    QmlDebugTestService service("tst_QmlDebugClient::setEnabled()");
-    QmlDebugTestClient client("tst_QmlDebugClient::setEnabled()", m_conn);
-
-    QCOMPARE(service.isEnabled(), false);
-
-    client.setEnabled(true);
-    QCOMPARE(client.isEnabled(), true);
-    QmlDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
-    QCOMPARE(service.isEnabled(), true);
-
-    client.setEnabled(false);
-    QCOMPARE(client.isEnabled(), false);
-    QmlDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
-    QCOMPARE(service.isEnabled(), false);
-}
-
-void tst_QmlDebugClient::isConnected()
-{
-    QmlDebugClient client1("tst_QmlDebugClient::isConnected() A", m_conn);
-    QCOMPARE(client1.isConnected(), true);
-
-    QmlDebugConnection conn;
-    QmlDebugClient client2("tst_QmlDebugClient::isConnected() B", &conn);
-    QCOMPARE(client2.isConnected(), false);
-
-    QmlDebugClient client3("tst_QmlDebugClient::isConnected() C", 0);
-    QCOMPARE(client3.isConnected(), false);
-
-    // duplicate plugin name
-    QTest::ignoreMessage(QtWarningMsg, "QmlDebugClient: Conflicting plugin name \"tst_QmlDebugClient::isConnected() A\" ");
-    QmlDebugClient client4("tst_QmlDebugClient::isConnected() A", m_conn);
-    QCOMPARE(client4.isConnected(), false);
-}
-
-void tst_QmlDebugClient::sendMessage()
-{
-    QmlDebugTestService service("tst_QmlDebugClient::sendMessage()");
-    QmlDebugTestClient client("tst_QmlDebugClient::sendMessage()", m_conn);
-
-    QByteArray msg = "hello!";
-
-    client.sendMessage(msg);
-    QByteArray resp = client.waitForResponse();
-    QCOMPARE(resp, msg);
-}
-
-
-class tst_QmlDebugClient_Factory : public QmlTestFactory
-{
-public:
-    QObject *createTest(QmlDebugTestData *data) { return new tst_QmlDebugClient(data); }
-};
-
-
-// This does not use QTEST_MAIN because the test has to be created and run
-// in a separate thread.
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    tst_QmlDebugClient_Factory factory;
-    return QmlDebugTest::runTests(&factory);
-}
-
-#include "tst_qmldebugclient.moc"
diff --git a/tests/auto/declarative/qmldebugservice/qmldebugservice.pro b/tests/auto/declarative/qmldebugservice/qmldebugservice.pro
deleted file mode 100644
index 9995f1f..0000000
--- a/tests/auto/declarative/qmldebugservice/qmldebugservice.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += network declarative
-macx:CONFIG -= app_bundle
-
-HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qmldebugservice.cpp \
-           ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qmldebugservice/tst_qmldebugservice.cpp b/tests/auto/declarative/qmldebugservice/tst_qmldebugservice.cpp
deleted file mode 100644
index e9e31ca..0000000
--- a/tests/auto/declarative/qmldebugservice/tst_qmldebugservice.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QSignalSpy>
-#include <QTimer>
-#include <QHostAddress>
-#include <QDebug>
-#include <QThread>
-
-#include <QtDeclarative/qmlengine.h>
-
-#include <private/qmldebug_p.h>
-#include <private/qmlenginedebug_p.h>
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-
-#include "../shared/debugutil_p.h"
-
-class tst_QmlDebugService : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_QmlDebugService(QmlDebugTestData *data)
-    {
-        m_conn = data->conn;
-    }
-
-    QmlDebugConnection *m_conn;
-
-private slots:
-    void name();
-    void isEnabled();
-    void enabledChanged();
-    void sendMessage();
-    void idForObject();
-    void objectForId();
-    void objectToString();
-};
-
-void tst_QmlDebugService::name()
-{
-    QString name = "tst_QmlDebugService::name()";
-
-    QmlDebugService service(name);
-    QCOMPARE(service.name(), name);
-}
-
-void tst_QmlDebugService::isEnabled()
-{
-    QmlDebugTestService service("tst_QmlDebugService::isEnabled()", m_conn);
-    QCOMPARE(service.isEnabled(), false);
-
-    QmlDebugTestClient client("tst_QmlDebugService::isEnabled()", m_conn);
-    client.setEnabled(true);
-    QmlDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
-    QCOMPARE(service.isEnabled(), true);
-
-    QTest::ignoreMessage(QtWarningMsg, "QmlDebugService: Conflicting plugin name \"tst_QmlDebugService::isEnabled()\" ");
-    QmlDebugService duplicate("tst_QmlDebugService::isEnabled()", m_conn);
-    QCOMPARE(duplicate.isEnabled(), false);
-}
-
-void tst_QmlDebugService::enabledChanged()
-{
-    QmlDebugTestService service("tst_QmlDebugService::enabledChanged()");
-    QmlDebugTestClient client("tst_QmlDebugService::enabledChanged()", m_conn);
-
-    QCOMPARE(service.enabled, false);
-
-    client.setEnabled(true);
-    QmlDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
-    QCOMPARE(service.enabled, true);
-}
-
-void tst_QmlDebugService::sendMessage()
-{
-    QmlDebugTestService service("tst_QmlDebugService::sendMessage()");
-    QmlDebugTestClient client("tst_QmlDebugService::sendMessage()", m_conn);
-
-    QByteArray msg = "hello!";
-
-    client.sendMessage(msg);
-    QByteArray resp = client.waitForResponse();
-    QCOMPARE(resp, msg);
-}
-
-void tst_QmlDebugService::idForObject()
-{
-    QCOMPARE(QmlDebugService::idForObject(0), -1);
-
-    QObject *objA = new QObject;
-
-    int idA = QmlDebugService::idForObject(objA);
-    QVERIFY(idA >= 0);
-    QCOMPARE(QmlDebugService::objectForId(idA), objA);
-
-    int idAA = QmlDebugService::idForObject(objA);
-    QCOMPARE(idAA, idA);
-
-    QObject *objB = new QObject;
-    int idB = QmlDebugService::idForObject(objB);
-    QVERIFY(idB != idA);
-    QCOMPARE(QmlDebugService::objectForId(idB), objB);
- 
-    delete objA;
-    delete objB;
-}
-
-void tst_QmlDebugService::objectForId()
-{
-    QCOMPARE(QmlDebugService::objectForId(-1), static_cast<QObject*>(0));
-    QCOMPARE(QmlDebugService::objectForId(1), static_cast<QObject*>(0));
-
-    QObject *obj = new QObject;
-    int id = QmlDebugService::idForObject(obj);
-    QCOMPARE(QmlDebugService::objectForId(id), obj);
-
-    delete obj;
-    QCOMPARE(QmlDebugService::objectForId(id), static_cast<QObject*>(0));
-}
-
-void tst_QmlDebugService::objectToString()
-{
-    QCOMPARE(QmlDebugService::objectToString(0), QString("NULL"));
-
-    QObject *obj = new QObject;
-    QCOMPARE(QmlDebugService::objectToString(obj), QString("QObject: <unnamed>"));
-
-    obj->setObjectName("Hello");
-    QCOMPARE(QmlDebugService::objectToString(obj), QString("QObject: Hello"));
-    delete obj;
-}
-
-
-class tst_QmlDebugService_Factory : public QmlTestFactory
-{
-public:
-    QObject *createTest(QmlDebugTestData *data) { return new tst_QmlDebugService(data); }
-};
-
-// This does not use QTEST_MAIN because the test has to be created and run
-// in a separate thread.
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    tst_QmlDebugService_Factory factory;
-    return QmlDebugTest::runTests(&factory);
-}
-
-#include "tst_qmldebugservice.moc"
diff --git a/tests/auto/declarative/qmldom/data/MyComponent.qml b/tests/auto/declarative/qmldom/data/MyComponent.qml
deleted file mode 100644
index 1472f01..0000000
--- a/tests/auto/declarative/qmldom/data/MyComponent.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.6
-
-Item {
-}
diff --git a/tests/auto/declarative/qmldom/data/MyItem.qml b/tests/auto/declarative/qmldom/data/MyItem.qml
deleted file mode 100644
index 1472f01..0000000
--- a/tests/auto/declarative/qmldom/data/MyItem.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.6
-
-Item {
-}
diff --git a/tests/auto/declarative/qmldom/data/importdir/Bar.qml b/tests/auto/declarative/qmldom/data/importdir/Bar.qml
deleted file mode 100644
index 2d1a4a3..0000000
--- a/tests/auto/declarative/qmldom/data/importdir/Bar.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Qt 4.6
-
diff --git a/tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml b/tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml
deleted file mode 100644
index 2d1a4a3..0000000
--- a/tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Qt 4.6
-
diff --git a/tests/auto/declarative/qmldom/data/top.qml b/tests/auto/declarative/qmldom/data/top.qml
deleted file mode 100644
index 2681993..0000000
--- a/tests/auto/declarative/qmldom/data/top.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-MyComponent {
-    width: 100
-    height: 100
-}
diff --git a/tests/auto/declarative/qmldom/qmldom.pro b/tests/auto/declarative/qmldom/qmldom.pro
deleted file mode 100644
index 7ff317d..0000000
--- a/tests/auto/declarative/qmldom/qmldom.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmldom.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmldom/tst_qmldom.cpp b/tests/auto/declarative/qmldom/tst_qmldom.cpp
deleted file mode 100644
index 16cdef0..0000000
--- a/tests/auto/declarative/qmldom/tst_qmldom.cpp
+++ /dev/null
@@ -1,1313 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/private/qmldom_p.h>
-
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-
-class tst_qmldom : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmldom() {}
-
-private slots:
-    void loadSimple();
-    void loadProperties();
-    void loadGroupedProperties();
-    void loadChildObject();
-    void loadComposite();
-    void loadImports();
-    void loadErrors();
-    void loadSyntaxErrors();
-    void loadRemoteErrors();
-    void loadDynamicProperty();
-    void loadComponent();
-
-    void testValueSource();
-    void testValueInterceptor();
-
-    void object_dynamicProperty();
-    void object_property();
-    void object_url();
-
-    void copy();
-    void position();
-private:
-    QmlEngine engine;
-};
-
-
-void tst_qmldom::loadSimple()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                      "Item {}";
-
-    QmlDomDocument document;
-    QVERIFY(document.load(&engine, qml));
-    QVERIFY(document.errors().isEmpty());
-
-    QmlDomObject rootObject = document.rootObject();
-    QVERIFY(rootObject.isValid());
-    QVERIFY(!rootObject.isComponent());
-    QVERIFY(!rootObject.isCustomType());
-    QVERIFY(rootObject.objectType() == "Qt/Item");
-    QVERIFY(rootObject.objectTypeMajorVersion() == 4);
-    QVERIFY(rootObject.objectTypeMinorVersion() == 6);
-}
-
-// Test regular properties
-void tst_qmldom::loadProperties()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                     "Item { id : item; x : 300; visible : true }";
-
-    QmlDomDocument document;
-    QVERIFY(document.load(&engine, qml));
-
-    QmlDomObject rootObject = document.rootObject();
-    QVERIFY(rootObject.isValid());
-    QVERIFY(rootObject.objectId() == "item");
-    QCOMPARE(rootObject.properties().size(), 3);
-
-    QmlDomProperty xProperty = rootObject.property("x");
-    QVERIFY(xProperty.propertyName() == "x");
-    QCOMPARE(xProperty.propertyNameParts().count(), 1);
-    QVERIFY(xProperty.propertyNameParts().at(0) == "x");
-    QCOMPARE(xProperty.position(), 32);
-    QCOMPARE(xProperty.length(), 1);
-    QVERIFY(xProperty.value().isLiteral());
-    QVERIFY(xProperty.value().toLiteral().literal() == "300");
-
-    QmlDomProperty visibleProperty = rootObject.property("visible");
-    QVERIFY(visibleProperty.propertyName() == "visible");
-    QCOMPARE(visibleProperty.propertyNameParts().count(), 1);
-    QVERIFY(visibleProperty.propertyNameParts().at(0) == "visible");
-    QCOMPARE(visibleProperty.position(), 41);
-    QCOMPARE(visibleProperty.length(), 7);
-    QVERIFY(visibleProperty.value().isLiteral());
-    QVERIFY(visibleProperty.value().toLiteral().literal() == "true");
-}
-
-// Test grouped properties
-void tst_qmldom::loadGroupedProperties()
-{
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item { anchors.left: parent.left; anchors.right: parent.right }";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootItem = document.rootObject();
-        QVERIFY(rootItem.isValid());
-        QVERIFY(rootItem.properties().size() == 2);
-
-        // Order is not deterministic
-        QmlDomProperty p0 = rootItem.properties().at(0);
-        QmlDomProperty p1 = rootItem.properties().at(1);
-        QmlDomProperty leftProperty;
-        QmlDomProperty rightProperty;
-        if (p0.propertyName() == "anchors.left") {
-            leftProperty = p0;
-            rightProperty = p1;
-        } else {
-            leftProperty = p1;
-            rightProperty = p0;
-        }
-
-        QVERIFY(leftProperty.propertyName() == "anchors.left");
-        QCOMPARE(leftProperty.propertyNameParts().count(), 2);
-        QVERIFY(leftProperty.propertyNameParts().at(0) == "anchors");
-        QVERIFY(leftProperty.propertyNameParts().at(1) == "left");
-        QCOMPARE(leftProperty.position(), 21);
-        QCOMPARE(leftProperty.length(), 12);
-        QVERIFY(leftProperty.value().isBinding());
-        QVERIFY(leftProperty.value().toBinding().binding() == "parent.left");
-
-        QVERIFY(rightProperty.propertyName() == "anchors.right");
-        QCOMPARE(rightProperty.propertyNameParts().count(), 2);
-        QVERIFY(rightProperty.propertyNameParts().at(0) == "anchors");
-        QVERIFY(rightProperty.propertyNameParts().at(1) == "right");
-        QCOMPARE(rightProperty.position(), 48);
-        QCOMPARE(rightProperty.length(), 13);
-        QVERIFY(rightProperty.value().isBinding());
-        QVERIFY(rightProperty.value().toBinding().binding() == "parent.right");
-    }
-
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item { \n"
-                         "    anchors {\n"
-                         "        left: parent.left\n"
-                         "        right: parent.right\n"
-                         "    }\n"
-                         "}";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootItem = document.rootObject();
-        QVERIFY(rootItem.isValid());
-        QVERIFY(rootItem.properties().size() == 2);
-
-        // Order is not deterministic
-        QmlDomProperty p0 = rootItem.properties().at(0);
-        QmlDomProperty p1 = rootItem.properties().at(1);
-        QmlDomProperty leftProperty;
-        QmlDomProperty rightProperty;
-        if (p0.propertyName() == "anchors.left") {
-            leftProperty = p0;
-            rightProperty = p1;
-        } else {
-            leftProperty = p1;
-            rightProperty = p0;
-        }
-
-        QVERIFY(leftProperty.propertyName() == "anchors.left");
-        QCOMPARE(leftProperty.propertyNameParts().count(), 2);
-        QVERIFY(leftProperty.propertyNameParts().at(0) == "anchors");
-        QVERIFY(leftProperty.propertyNameParts().at(1) == "left");
-        QCOMPARE(leftProperty.position(), 44);
-        QCOMPARE(leftProperty.length(), 4);
-        QVERIFY(leftProperty.value().isBinding());
-        QVERIFY(leftProperty.value().toBinding().binding() == "parent.left");
-
-        QVERIFY(rightProperty.propertyName() == "anchors.right");
-        QCOMPARE(rightProperty.propertyNameParts().count(), 2);
-        QVERIFY(rightProperty.propertyNameParts().at(0) == "anchors");
-        QVERIFY(rightProperty.propertyNameParts().at(1) == "right");
-        QCOMPARE(rightProperty.position(), 70);
-        QCOMPARE(rightProperty.length(), 5);
-        QVERIFY(rightProperty.value().isBinding());
-        QVERIFY(rightProperty.value().toBinding().binding() == "parent.right");
-    }
-
-}
-
-void tst_qmldom::loadChildObject()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                     "Item { Item {} }";
-
-    QmlDomDocument document;
-    QVERIFY(document.load(&engine, qml));
-
-    QmlDomObject rootItem = document.rootObject();
-    QVERIFY(rootItem.isValid());
-    QVERIFY(rootItem.properties().size() == 1);
-
-    QmlDomProperty listProperty = rootItem.properties().at(0);
-    QVERIFY(listProperty.isDefaultProperty());
-    QVERIFY(listProperty.value().isList());
-
-    QmlDomList list = listProperty.value().toList();
-    QVERIFY(list.values().size() == 1);
-
-    QmlDomObject childItem = list.values().first().toObject();
-    QVERIFY(childItem.isValid());
-    QVERIFY(childItem.objectType() == "Qt/Item");
-}
-
-void tst_qmldom::loadComposite()
-{
-    QFile file(SRCDIR  "/data/top.qml");
-    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-
-    QmlDomDocument document;
-    QVERIFY(document.load(&engine, file.readAll(), QUrl::fromLocalFile(file.fileName())));
-    QVERIFY(document.errors().isEmpty());
-
-    QmlDomObject rootItem = document.rootObject();
-    QVERIFY(rootItem.isValid());
-    QCOMPARE(rootItem.objectType(), QByteArray("MyComponent"));
-    QCOMPARE(rootItem.properties().size(), 2);
-
-    QmlDomProperty widthProperty = rootItem.property("width");
-    QVERIFY(widthProperty.value().isLiteral());
-
-    QmlDomProperty heightProperty = rootItem.property("height");
-    QVERIFY(heightProperty.value().isLiteral());
-}
-
-void tst_qmldom::testValueSource()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                     "Rectangle { height: SpringFollow { spring: 1.4; damping: .15; source: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
-
-    QmlEngine freshEngine;
-    QmlDomDocument document;
-    QVERIFY(document.load(&freshEngine, qml));
-
-    QmlDomObject rootItem = document.rootObject();
-    QVERIFY(rootItem.isValid());
-    QmlDomProperty heightProperty = rootItem.properties().at(0);
-    QVERIFY(heightProperty.propertyName() == "height");
-    QVERIFY(heightProperty.value().isValueSource());
-
-    const QmlDomValueValueSource valueSource = heightProperty.value().toValueSource();
-    QmlDomObject valueSourceObject = valueSource.object();
-    QVERIFY(valueSourceObject.isValid());
-
-    QVERIFY(valueSourceObject.objectType() == "Qt/SpringFollow");
-    
-    const QmlDomValue springValue = valueSourceObject.property("spring").value();
-    QVERIFY(!springValue.isInvalid());
-    QVERIFY(springValue.isLiteral());
-    QVERIFY(springValue.toLiteral().literal() == "1.4");
-
-    const QmlDomValue sourceValue = valueSourceObject.property("source").value();
-    QVERIFY(!sourceValue.isInvalid());
-    QVERIFY(sourceValue.isBinding());
-    QVERIFY(sourceValue.toBinding().binding() == "Math.min(Math.max(-130, value*2.2 - 130), 133)");
-}
-
-void tst_qmldom::testValueInterceptor()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                     "Rectangle { height: Behavior { NumberAnimation { duration: 100 } } }";
-
-    QmlEngine freshEngine;
-    QmlDomDocument document;
-    QVERIFY(document.load(&freshEngine, qml));
-
-    QmlDomObject rootItem = document.rootObject();
-    QVERIFY(rootItem.isValid());
-    QmlDomProperty heightProperty = rootItem.properties().at(0);
-    QVERIFY(heightProperty.propertyName() == "height");
-    QVERIFY(heightProperty.value().isValueInterceptor());
-
-    const QmlDomValueValueInterceptor valueInterceptor = heightProperty.value().toValueInterceptor();
-    QmlDomObject valueInterceptorObject = valueInterceptor.object();
-    QVERIFY(valueInterceptorObject.isValid());
-
-    QVERIFY(valueInterceptorObject.objectType() == "Qt/Behavior");
-
-    const QmlDomValue animationValue = valueInterceptorObject.property("animation").value();
-    QVERIFY(!animationValue.isInvalid());
-    QVERIFY(animationValue.isObject());
-}
-
-// Test QmlDomDocument::imports()
-void tst_qmldom::loadImports()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                     "import importlib.sublib 4.7\n"
-                     "import importlib.sublib 4.6 as NewFoo\n"
-                     "import 'import'\n"
-                     "import 'import' as X\n"
-                     "Item {}";
-
-    QmlEngine engine;
-    engine.addImportPath(SRCDIR "/data");
-    QmlDomDocument document;
-    QVERIFY(document.load(&engine, qml));
-
-    QCOMPARE(document.imports().size(), 5);
-
-    QmlDomImport import = document.imports().at(0);
-    QCOMPARE(import.type(), QmlDomImport::Library);
-    QCOMPARE(import.uri(), QLatin1String("Qt"));
-    QCOMPARE(import.qualifier(), QString());
-    QCOMPARE(import.version(), QLatin1String("4.6"));
-
-    import = document.imports().at(1);
-    QCOMPARE(import.type(), QmlDomImport::Library);
-    QCOMPARE(import.uri(), QLatin1String("importlib.sublib"));
-    QCOMPARE(import.qualifier(), QString());
-    QCOMPARE(import.version(), QLatin1String("4.7"));
-
-    import = document.imports().at(2);
-    QCOMPARE(import.type(), QmlDomImport::Library);
-    QCOMPARE(import.uri(), QLatin1String("importlib.sublib"));
-    QCOMPARE(import.qualifier(), QLatin1String("NewFoo"));
-    QCOMPARE(import.version(), QLatin1String("4.6"));
-
-    import = document.imports().at(3);
-    QCOMPARE(import.type(), QmlDomImport::File);
-    QCOMPARE(import.uri(), QLatin1String("import"));
-    QCOMPARE(import.qualifier(), QLatin1String(""));
-    QCOMPARE(import.version(), QLatin1String(""));
-
-    import = document.imports().at(4);
-    QCOMPARE(import.type(), QmlDomImport::File);
-    QCOMPARE(import.uri(), QLatin1String("import"));
-    QCOMPARE(import.qualifier(), QLatin1String("X"));
-    QCOMPARE(import.version(), QLatin1String(""));
-}
-
-// Test loading a file with errors
-void tst_qmldom::loadErrors()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                     "Item {\n"
-                     "  foo: 12\n"
-                     "}";
-
-    QmlDomDocument document;
-    QVERIFY(false == document.load(&engine, qml));
-
-    QCOMPARE(document.errors().count(), 1);
-    QmlError error = document.errors().first();
-
-    QCOMPARE(error.url(), QUrl());
-    QCOMPARE(error.line(), 3);
-    QCOMPARE(error.column(), 3);
-    QCOMPARE(error.description(), QString("Cannot assign to non-existent property \"foo\""));
-}
-
-// Test loading a file with syntax errors
-void tst_qmldom::loadSyntaxErrors()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                     "asdf";
-
-    QmlDomDocument document;
-    QVERIFY(false == document.load(&engine, qml));
-
-    QCOMPARE(document.errors().count(), 1);
-    QmlError error = document.errors().first();
-
-    QCOMPARE(error.url(), QUrl());
-    QCOMPARE(error.line(), 2);
-    QCOMPARE(error.column(), 1);
-    QCOMPARE(error.description(), QString("Syntax error"));
-}
-
-// Test attempting to load a file with remote references 
-void tst_qmldom::loadRemoteErrors()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                     "Item {\n"
-                     "    Script {\n"
-                     "        source: \"http://localhost/exampleQmlScript.js\""
-                     "    }\n"
-                     "}";
-    QmlDomDocument document;
-    QVERIFY(false == document.load(&engine, qml));
-
-    QCOMPARE(document.errors().count(), 1);
-    QmlError error = document.errors().first();
-
-    QCOMPARE(error.url(), QUrl());
-    QCOMPARE(error.line(), -1);
-    QCOMPARE(error.column(), -1);
-    QCOMPARE(error.description(), QString("QmlDomDocument supports local types only"));
-}
-
-// Test dynamic property declarations
-void tst_qmldom::loadDynamicProperty()
-{
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item {\n"
-                         "    property int a\n"
-                         "    property bool b\n"
-                         "    property double c\n"
-                         "    property real d\n"
-                         "    property string e\n"
-                         "    property url f\n"
-                         "    property color g\n"
-                         "    property date h\n"
-                         "    property var i\n"
-                         "    property variant j\n"
-                         "    property QtObject k\n"
-                         "}";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootObject = document.rootObject();
-        QVERIFY(rootObject.isValid());
-
-        QCOMPARE(rootObject.dynamicProperties().count(), 11);
-
-#define DP_TEST(index, name, type, test_position, test_length, propTypeName) \
-    { \
-        QmlDomDynamicProperty d = rootObject.dynamicProperties().at(index); \
-        QVERIFY(d.isValid()); \
-        QVERIFY(d.propertyName() == # name ); \
-        QVERIFY(d.propertyType() == type); \
-        QVERIFY(d.propertyTypeName() == propTypeName); \
-        QVERIFY(d.isDefaultProperty() == false); \
-        QVERIFY(d.defaultValue().isValid() == false); \
-        QCOMPARE(d.position(), test_position); \
-        QCOMPARE(d.length(), test_length); \
-    } \
-
-        DP_TEST(0, a, QVariant::Int, 25, 14, "int");
-        DP_TEST(1, b, QVariant::Bool, 44, 15, "bool");
-        DP_TEST(2, c, QVariant::Double, 64, 17, "double");
-        DP_TEST(3, d, QMetaType::QReal, 86, 15, "real");
-        DP_TEST(4, e, QVariant::String, 106, 17, "string");
-        DP_TEST(5, f, QVariant::Url, 128, 14, "url");
-        DP_TEST(6, g, QVariant::Color, 147, 16, "color");
-        DP_TEST(7, h, QVariant::Date, 168, 15, "date");
-        DP_TEST(8, i, qMetaTypeId<QVariant>(), 188, 14, "var");
-        DP_TEST(9, j, qMetaTypeId<QVariant>(), 207, 18, "variant");
-        DP_TEST(10, k, -1, 230, 19, "QtObject");
-    }
-
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item {\n"
-                         "    property int a: 12\n"
-                         "    property int b: a + 6\n"
-                         "    default property QtObject c\n"
-                         "}\n";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootObject = document.rootObject();
-        QVERIFY(rootObject.isValid());
-
-        QCOMPARE(rootObject.dynamicProperties().count(), 3);
-        
-        {
-            QmlDomDynamicProperty d = rootObject.dynamicProperties().at(0);
-            QVERIFY(d.isDefaultProperty() == false);
-            QVERIFY(d.defaultValue().isValid());
-            QVERIFY(d.defaultValue().propertyName() == "a");
-            QVERIFY(d.defaultValue().value().isLiteral());
-        }
-
-        {
-            QmlDomDynamicProperty d = rootObject.dynamicProperties().at(1);
-            QVERIFY(d.isDefaultProperty() == false);
-            QVERIFY(d.defaultValue().isValid());
-            QVERIFY(d.defaultValue().propertyName() == "b");
-            QVERIFY(d.defaultValue().value().isBinding());
-        }
-
-        {
-            QmlDomDynamicProperty d = rootObject.dynamicProperties().at(2);
-            QVERIFY(d.isDefaultProperty() == true);
-            QVERIFY(d.defaultValue().isValid() == false);
-        }
-    }
-}
-
-// Test inline components
-void tst_qmldom::loadComponent()
-{
-    // Explicit component
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item {\n"
-                         "    Component {\n"
-                         "        id: myComponent\n"
-                         "        Item {}\n"
-                         "    }\n"
-                         "}";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootItem = document.rootObject();
-        QVERIFY(rootItem.isValid());
-        QVERIFY(rootItem.properties().size() == 1);
-
-        QmlDomProperty listProperty = rootItem.properties().at(0);
-        QVERIFY(listProperty.isDefaultProperty());
-        QVERIFY(listProperty.value().isList());
-
-        QmlDomList list = listProperty.value().toList();
-        QVERIFY(list.values().size() == 1);
-
-        QmlDomObject componentObject = list.values().first().toObject();
-        QVERIFY(componentObject.isValid());
-        QVERIFY(componentObject.objectClassName() == "Component");
-        QVERIFY(componentObject.isComponent());
-
-        QmlDomComponent component = componentObject.toComponent();
-        QVERIFY(component.isValid());
-        QVERIFY(component.objectType() == "Qt/Component");
-        QVERIFY(component.objectTypeMajorVersion() == 4);
-        QVERIFY(component.objectTypeMinorVersion() == 6);
-        QVERIFY(component.objectClassName() == "Component");
-        QVERIFY(component.objectId() == "myComponent");
-        QVERIFY(component.properties().isEmpty());
-        QVERIFY(component.dynamicProperties().isEmpty());
-        QVERIFY(component.isCustomType() == false);
-        QVERIFY(component.customTypeData() == "");
-        QVERIFY(component.isComponent());
-        QCOMPARE(component.position(), 25);
-        QCOMPARE(component.length(), 57);
-
-        QVERIFY(component.componentRoot().isValid());
-        QVERIFY(component.componentRoot().objectClassName() == "Item");
-    }
-
-    // Implicit component
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "ListView {\n"
-                         "    delegate: Item {}\n"
-                         "}";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootItem = document.rootObject();
-        QVERIFY(rootItem.isValid());
-        QVERIFY(rootItem.properties().size() == 1);
-
-        QmlDomProperty delegate = rootItem.property("delegate");
-
-        QmlDomObject componentObject = delegate.value().toObject();
-        QVERIFY(componentObject.isValid());
-        QVERIFY(componentObject.objectClassName() == "Component");
-        QVERIFY(componentObject.isComponent());
-
-        QmlDomComponent component = componentObject.toComponent();
-        QVERIFY(component.isValid());
-        QVERIFY(component.objectType() == "Qt/Component");
-        QVERIFY(component.objectClassName() == "Component");
-        QVERIFY(component.objectId() == "");
-        QVERIFY(component.properties().isEmpty());
-        QVERIFY(component.dynamicProperties().isEmpty());
-        QVERIFY(component.isCustomType() == false);
-        QVERIFY(component.customTypeData() == "");
-        QVERIFY(component.isComponent());
-        QCOMPARE(component.position(), 39);
-        QCOMPARE(component.length(), 7);
-
-        QVERIFY(component.componentRoot().isValid());
-        QVERIFY(component.componentRoot().objectClassName() == "Item");
-    }
-}
-
-// Test QmlDomObject::dynamicProperty() method
-void tst_qmldom::object_dynamicProperty()
-{
-    // Invalid object
-    {
-        QmlDomObject object;
-        QVERIFY(object.dynamicProperty("").isValid() == false);
-        QVERIFY(object.dynamicProperty("foo").isValid() == false);
-    }
-
-
-    // Valid object, no dynamic properties
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item {}";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootObject = document.rootObject();
-        QVERIFY(rootObject.isValid());
-
-        QVERIFY(rootObject.dynamicProperty("").isValid() == false);
-        QVERIFY(rootObject.dynamicProperty("foo").isValid() == false);
-    }
-
-    // Valid object, dynamic properties
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item {\n"
-                         "    property int a\n"
-                         "}";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootObject = document.rootObject();
-        QVERIFY(rootObject.isValid());
-
-        QVERIFY(rootObject.dynamicProperty("").isValid() == false);
-        QVERIFY(rootObject.dynamicProperty("foo").isValid() == false);
-
-        QmlDomDynamicProperty p = rootObject.dynamicProperty("a");
-        QVERIFY(p.isValid());
-        QVERIFY(p.propertyName() == "a");
-        QVERIFY(p.propertyType() == QVariant::Int);
-        QVERIFY(p.propertyTypeName() == "int");
-        QVERIFY(p.isDefaultProperty() == false);
-        QCOMPARE(p.position(), 25);
-        QCOMPARE(p.length(), 14);
-    }
-
-}
-
-// Test QmlObject::property() method
-void tst_qmldom::object_property()
-{
-    // Invalid object
-    {
-        QmlDomObject object;
-        QVERIFY(object.property("").isValid() == false);
-        QVERIFY(object.property("foo").isValid() == false);
-    }
-
-    // Valid object - no default
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item {\n"
-                         "    x: 10\n"
-                         "    y: 12\n"
-                         "}\n";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootObject = document.rootObject();
-        QVERIFY(rootObject.isValid());
-
-        QVERIFY(rootObject.property("").isValid() == false);
-        QVERIFY(rootObject.property("foo").isValid() == false);
-
-        QmlDomProperty x = rootObject.property("x");
-        QVERIFY(x.isValid());
-        QVERIFY(x.propertyName() == "x");
-        QVERIFY(x.propertyNameParts().count() == 1);
-        QVERIFY(x.propertyNameParts().at(0) == "x");
-        QVERIFY(x.isDefaultProperty() == false);
-        QVERIFY(x.value().isLiteral());
-        QVERIFY(x.value().toLiteral().literal() == "10");
-        QCOMPARE(x.position(), 25);
-        QCOMPARE(x.length(), 1);
-
-        QmlDomProperty y = rootObject.property("y");
-        QVERIFY(y.isValid());
-        QVERIFY(y.propertyName() == "y");
-        QVERIFY(y.propertyNameParts().count() == 1);
-        QVERIFY(y.propertyNameParts().at(0) == "y");
-        QVERIFY(y.isDefaultProperty() == false);
-        QVERIFY(y.value().isLiteral());
-        QVERIFY(y.value().toLiteral().literal() == "12");
-        QCOMPARE(y.position(), 35);
-        QCOMPARE(y.length(), 1);
-    }
-
-    // Valid object - with default
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item {\n"
-                         "    x: 10\n"
-                         "    y: 12\n"
-                         "    Item {}\n"
-                         "}\n";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootObject = document.rootObject();
-        QVERIFY(rootObject.isValid());
-
-        QVERIFY(rootObject.property("").isValid() == false);
-        QVERIFY(rootObject.property("foo").isValid() == false);
-
-        QmlDomProperty x = rootObject.property("x");
-        QVERIFY(x.isValid());
-        QVERIFY(x.propertyName() == "x");
-        QVERIFY(x.propertyNameParts().count() == 1);
-        QVERIFY(x.propertyNameParts().at(0) == "x");
-        QVERIFY(x.isDefaultProperty() == false);
-        QVERIFY(x.value().isLiteral());
-        QVERIFY(x.value().toLiteral().literal() == "10");
-        QCOMPARE(x.position(), 25);
-        QCOMPARE(x.length(), 1);
-
-        QmlDomProperty y = rootObject.property("y");
-        QVERIFY(y.isValid());
-        QVERIFY(y.propertyName() == "y");
-        QVERIFY(y.propertyNameParts().count() == 1);
-        QVERIFY(y.propertyNameParts().at(0) == "y");
-        QVERIFY(y.isDefaultProperty() == false);
-        QVERIFY(y.value().isLiteral());
-        QVERIFY(y.value().toLiteral().literal() == "12");
-        QCOMPARE(y.position(), 35);
-        QCOMPARE(y.length(), 1);
-        
-        QmlDomProperty data = rootObject.property("data");
-        QVERIFY(data.isValid());
-        QVERIFY(data.propertyName() == "data");
-        QVERIFY(data.propertyNameParts().count() == 1);
-        QVERIFY(data.propertyNameParts().at(0) == "data");
-        QVERIFY(data.isDefaultProperty() == true);
-        QVERIFY(data.value().isList());
-        QCOMPARE(data.position(), 45);
-        QCOMPARE(data.length(), 0);
-    }
-}
-
-// Tests the QmlDomObject::url() method
-void tst_qmldom::object_url()
-{
-    // Invalid object
-    {
-        QmlDomObject object;
-        QCOMPARE(object.url(), QUrl());
-    }
-
-    // Valid builtin object 
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "Item {}";
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml));
-
-        QmlDomObject rootObject = document.rootObject();
-        QVERIFY(rootObject.isValid());
-        QCOMPARE(rootObject.url(), QUrl());
-    }
-
-    // Valid composite object
-    {
-        QByteArray qml = "import Qt 4.6\n"
-                         "MyItem {}";
-
-        QUrl myUrl = QUrl::fromLocalFile(SRCDIR "/data/main.qml");
-        QUrl subUrl = QUrl::fromLocalFile(SRCDIR "/data/MyItem.qml");
-
-        QmlDomDocument document;
-        QVERIFY(document.load(&engine, qml, myUrl));
-
-        QmlDomObject rootObject = document.rootObject();
-        QVERIFY(rootObject.isValid());
-        QCOMPARE(rootObject.url(), subUrl);
-    }
-}
-
-// Test copy constructors and operators
-void tst_qmldom::copy()
-{
-    QByteArray qml = "import Qt 4.6\n"
-                     "MyItem {\n"
-                     "    id: myItem\n"
-                     "    property int a: 10\n"
-                     "    x: 10\n"
-                     "    y: x + 10\n"
-                     "    z: NumberAnimation {}\n"
-                     "    opacity: Behavior {}\n"
-                     "    Component {\n"
-                     "        Item{}\n"
-                     "    }\n"
-                     "    children: [ Item{}, Item{} ]\n"
-                     "}\n";
-
-    QUrl myUrl = QUrl::fromLocalFile(SRCDIR "/data/main.qml");
-
-    QmlDomDocument document;
-    QVERIFY(document.load(&engine, qml, myUrl));
-
-    // QmlDomDocument
-    {
-        QmlDomDocument document2(document);
-        QmlDomDocument document3;
-        document3 = document;
-
-        QCOMPARE(document.imports().count(), document2.imports().count());
-        QCOMPARE(document.errors().count(), document2.errors().count());
-        QCOMPARE(document.rootObject().objectClassName(), document2.rootObject().objectClassName());
-
-        QCOMPARE(document.imports().count(), document3.imports().count());
-        QCOMPARE(document.errors().count(), document3.errors().count());
-        QCOMPARE(document.rootObject().objectClassName(), document3.rootObject().objectClassName());
-    }
-
-    // QmlDomImport
-    {
-        QCOMPARE(document.imports().count(), 1);
-        QmlDomImport import = document.imports().at(0);
-
-        QmlDomImport import2(import);
-        QmlDomImport import3;
-        import3 = import2;
-
-        QCOMPARE(import.type(), import2.type());
-        QCOMPARE(import.uri(), import2.uri());
-        QCOMPARE(import.version(), import2.version());
-        QCOMPARE(import.qualifier(), import2.qualifier());
-
-        QCOMPARE(import.type(), import3.type());
-        QCOMPARE(import.uri(), import3.uri());
-        QCOMPARE(import.version(), import3.version());
-        QCOMPARE(import.qualifier(), import3.qualifier());
-    }
-
-    // QmlDomObject
-    {
-        QmlDomObject object = document.rootObject();
-        QVERIFY(object.isValid());
-
-        QmlDomObject object2(object);
-        QmlDomObject object3;
-        object3 = object;
-
-        QCOMPARE(object.isValid(), object2.isValid());
-        QCOMPARE(object.objectType(), object2.objectType());
-        QCOMPARE(object.objectClassName(), object2.objectClassName());
-        QCOMPARE(object.objectTypeMajorVersion(), object2.objectTypeMajorVersion());
-        QCOMPARE(object.objectTypeMinorVersion(), object2.objectTypeMinorVersion());
-        QCOMPARE(object.objectId(), object2.objectId());
-        QCOMPARE(object.properties().count(), object2.properties().count());
-        QCOMPARE(object.dynamicProperties().count(), object2.dynamicProperties().count());
-        QCOMPARE(object.isCustomType(), object2.isCustomType());
-        QCOMPARE(object.customTypeData(), object2.customTypeData());
-        QCOMPARE(object.isComponent(), object2.isComponent());
-        QCOMPARE(object.position(), object2.position());
-        QCOMPARE(object.length(), object2.length());
-        QCOMPARE(object.url(), object2.url());
-
-        QCOMPARE(object.isValid(), object3.isValid());
-        QCOMPARE(object.objectType(), object3.objectType());
-        QCOMPARE(object.objectClassName(), object3.objectClassName());
-        QCOMPARE(object.objectTypeMajorVersion(), object3.objectTypeMajorVersion());
-        QCOMPARE(object.objectTypeMinorVersion(), object3.objectTypeMinorVersion());
-        QCOMPARE(object.objectId(), object3.objectId());
-        QCOMPARE(object.properties().count(), object3.properties().count());
-        QCOMPARE(object.dynamicProperties().count(), object3.dynamicProperties().count());
-        QCOMPARE(object.isCustomType(), object3.isCustomType());
-        QCOMPARE(object.customTypeData(), object3.customTypeData());
-        QCOMPARE(object.isComponent(), object3.isComponent());
-        QCOMPARE(object.position(), object3.position());
-        QCOMPARE(object.length(), object3.length());
-        QCOMPARE(object.url(), object3.url());
-    }
-
-    // QmlDomDynamicProperty
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomDynamicProperty property = object.dynamicProperty("a");
-
-        QmlDomDynamicProperty property2(property);
-        QmlDomDynamicProperty property3;
-        property3 = property;
-
-        QCOMPARE(property.isValid(), property2.isValid());
-        QCOMPARE(property.propertyName(), property2.propertyName());
-        QCOMPARE(property.propertyType(), property2.propertyType());
-        QCOMPARE(property.propertyTypeName(), property2.propertyTypeName());
-        QCOMPARE(property.isDefaultProperty(), property2.isDefaultProperty());
-        QCOMPARE(property.defaultValue().propertyName(), property2.defaultValue().propertyName());
-        QCOMPARE(property.position(), property2.position());
-        QCOMPARE(property.length(), property2.length());
-
-        QCOMPARE(property.isValid(), property3.isValid());
-        QCOMPARE(property.propertyName(), property3.propertyName());
-        QCOMPARE(property.propertyType(), property3.propertyType());
-        QCOMPARE(property.propertyTypeName(), property3.propertyTypeName());
-        QCOMPARE(property.isDefaultProperty(), property3.isDefaultProperty());
-        QCOMPARE(property.defaultValue().propertyName(), property3.defaultValue().propertyName());
-        QCOMPARE(property.position(), property3.position());
-        QCOMPARE(property.length(), property3.length());
-    }
-
-    // QmlDomProperty
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("opacity");
-
-        QmlDomProperty property2(property);
-        QmlDomProperty property3;
-        property3 = property;
-
-        QCOMPARE(property.isValid(), property2.isValid());
-        QCOMPARE(property.propertyName(), property2.propertyName());
-        QCOMPARE(property.propertyNameParts(), property2.propertyNameParts());
-        QCOMPARE(property.isDefaultProperty(), property2.isDefaultProperty());
-        QCOMPARE(property.value().type(), property2.value().type());
-        QCOMPARE(property.position(), property2.position());
-        QCOMPARE(property.length(), property2.length());
-
-        QCOMPARE(property.isValid(), property3.isValid());
-        QCOMPARE(property.propertyName(), property3.propertyName());
-        QCOMPARE(property.propertyNameParts(), property3.propertyNameParts());
-        QCOMPARE(property.isDefaultProperty(), property3.isDefaultProperty());
-        QCOMPARE(property.value().type(), property3.value().type());
-        QCOMPARE(property.position(), property3.position());
-        QCOMPARE(property.length(), property3.length());
-    }
-
-    // QmlDomValueLiteral
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("x");
-        QmlDomValueLiteral literal = property.value().toLiteral();
-        QCOMPARE(literal.literal(), QString("10"));
-
-        QmlDomValueLiteral literal2(literal);
-        QmlDomValueLiteral literal3;
-        literal3 = literal2;
-
-        QCOMPARE(literal2.literal(), QString("10"));
-        QCOMPARE(literal3.literal(), QString("10"));
-    }
-
-
-    // QmlDomValueBinding
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("y");
-        QmlDomValueBinding binding = property.value().toBinding();
-        QCOMPARE(binding.binding(), QString("x + 10"));
-
-        QmlDomValueBinding binding2(binding);
-        QmlDomValueBinding binding3;
-        binding3 = binding2;
-
-        QCOMPARE(binding2.binding(), QString("x + 10"));
-        QCOMPARE(binding3.binding(), QString("x + 10"));
-    }
-
-    // QmlDomValueValueSource
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("z");
-        QmlDomValueValueSource source = property.value().toValueSource();
-        QCOMPARE(source.object().objectClassName(), QByteArray("NumberAnimation"));
-
-        QmlDomValueValueSource source2(source);
-        QmlDomValueValueSource source3;
-        source3 = source;
-
-        QCOMPARE(source2.object().objectClassName(), QByteArray("NumberAnimation"));
-        QCOMPARE(source3.object().objectClassName(), QByteArray("NumberAnimation"));
-    }
-
-    // QmlDomValueValueInterceptor
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("opacity");
-        QmlDomValueValueInterceptor interceptor = property.value().toValueInterceptor();
-        QCOMPARE(interceptor.object().objectClassName(), QByteArray("Behavior"));
-
-        QmlDomValueValueInterceptor interceptor2(interceptor);
-        QmlDomValueValueInterceptor interceptor3;
-        interceptor3 = interceptor;
-
-        QCOMPARE(interceptor2.object().objectClassName(), QByteArray("Behavior"));
-        QCOMPARE(interceptor3.object().objectClassName(), QByteArray("Behavior"));
-    }
-
-    // QmlDomComponent
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("data");
-        QCOMPARE(property.value().toList().values().count(), 1);
-        QmlDomComponent component = 
-            property.value().toList().values().at(0).toObject().toComponent();
-        QCOMPARE(component.componentRoot().objectClassName(), QByteArray("Item"));
-
-        QmlDomComponent component2(component);
-        QmlDomComponent component3;
-        component3 = component;
-
-        QCOMPARE(component.componentRoot().objectClassName(), component2.componentRoot().objectClassName());
-        QCOMPARE(component.isValid(), component2.isValid());
-        QCOMPARE(component.objectType(), component2.objectType());
-        QCOMPARE(component.objectClassName(), component2.objectClassName());
-        QCOMPARE(component.objectTypeMajorVersion(), component2.objectTypeMajorVersion());
-        QCOMPARE(component.objectTypeMinorVersion(), component2.objectTypeMinorVersion());
-        QCOMPARE(component.objectId(), component2.objectId());
-        QCOMPARE(component.properties().count(), component2.properties().count());
-        QCOMPARE(component.dynamicProperties().count(), component2.dynamicProperties().count());
-        QCOMPARE(component.isCustomType(), component2.isCustomType());
-        QCOMPARE(component.customTypeData(), component2.customTypeData());
-        QCOMPARE(component.isComponent(), component2.isComponent());
-        QCOMPARE(component.position(), component2.position());
-        QCOMPARE(component.length(), component2.length());
-        QCOMPARE(component.url(), component2.url());
-
-        QCOMPARE(component.componentRoot().objectClassName(), component3.componentRoot().objectClassName());
-        QCOMPARE(component.isValid(), component3.isValid());
-        QCOMPARE(component.objectType(), component3.objectType());
-        QCOMPARE(component.objectClassName(), component3.objectClassName());
-        QCOMPARE(component.objectTypeMajorVersion(), component3.objectTypeMajorVersion());
-        QCOMPARE(component.objectTypeMinorVersion(), component3.objectTypeMinorVersion());
-        QCOMPARE(component.objectId(), component3.objectId());
-        QCOMPARE(component.properties().count(), component3.properties().count());
-        QCOMPARE(component.dynamicProperties().count(), component3.dynamicProperties().count());
-        QCOMPARE(component.isCustomType(), component3.isCustomType());
-        QCOMPARE(component.customTypeData(), component3.customTypeData());
-        QCOMPARE(component.isComponent(), component3.isComponent());
-        QCOMPARE(component.position(), component3.position());
-        QCOMPARE(component.length(), component3.length());
-        QCOMPARE(component.url(), component3.url());
-    }
-
-    // QmlDomValue
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("data");
-        QmlDomValue value = property.value();
-
-        QmlDomValue value2(value);
-        QmlDomValue value3;
-        value3 = value;
-
-        QCOMPARE(value.type(), value2.type());
-        QCOMPARE(value.isInvalid(), value2.isInvalid());
-        QCOMPARE(value.isLiteral(), value2.isLiteral());
-        QCOMPARE(value.isBinding(), value2.isBinding());
-        QCOMPARE(value.isValueSource(), value2.isValueSource());
-        QCOMPARE(value.isValueInterceptor(), value2.isValueInterceptor());
-        QCOMPARE(value.isObject(), value2.isObject());
-        QCOMPARE(value.isList(), value2.isList());
-        QCOMPARE(value.position(), value2.position());
-        QCOMPARE(value.length(), value2.length());
-
-        QCOMPARE(value.type(), value3.type());
-        QCOMPARE(value.isInvalid(), value3.isInvalid());
-        QCOMPARE(value.isLiteral(), value3.isLiteral());
-        QCOMPARE(value.isBinding(), value3.isBinding());
-        QCOMPARE(value.isValueSource(), value3.isValueSource());
-        QCOMPARE(value.isValueInterceptor(), value3.isValueInterceptor());
-        QCOMPARE(value.isObject(), value3.isObject());
-        QCOMPARE(value.isList(), value3.isList());
-        QCOMPARE(value.position(), value3.position());
-        QCOMPARE(value.length(), value3.length());
-    }
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("x");
-        QmlDomValue value = property.value();
-
-        QmlDomValue value2(value);
-        QmlDomValue value3;
-        value3 = value;
-
-        QCOMPARE(value.type(), value2.type());
-        QCOMPARE(value.isInvalid(), value2.isInvalid());
-        QCOMPARE(value.isLiteral(), value2.isLiteral());
-        QCOMPARE(value.isBinding(), value2.isBinding());
-        QCOMPARE(value.isValueSource(), value2.isValueSource());
-        QCOMPARE(value.isValueInterceptor(), value2.isValueInterceptor());
-        QCOMPARE(value.isObject(), value2.isObject());
-        QCOMPARE(value.isList(), value2.isList());
-        QCOMPARE(value.position(), value2.position());
-        QCOMPARE(value.length(), value2.length());
-
-        QCOMPARE(value.type(), value3.type());
-        QCOMPARE(value.isInvalid(), value3.isInvalid());
-        QCOMPARE(value.isLiteral(), value3.isLiteral());
-        QCOMPARE(value.isBinding(), value3.isBinding());
-        QCOMPARE(value.isValueSource(), value3.isValueSource());
-        QCOMPARE(value.isValueInterceptor(), value3.isValueInterceptor());
-        QCOMPARE(value.isObject(), value3.isObject());
-        QCOMPARE(value.isList(), value3.isList());
-        QCOMPARE(value.position(), value3.position());
-        QCOMPARE(value.length(), value3.length());
-    }
-    {
-        QmlDomValue value;
-
-        QmlDomValue value2(value);
-        QmlDomValue value3;
-        value3 = value;
-
-        QCOMPARE(value.type(), value2.type());
-        QCOMPARE(value.isInvalid(), value2.isInvalid());
-        QCOMPARE(value.isLiteral(), value2.isLiteral());
-        QCOMPARE(value.isBinding(), value2.isBinding());
-        QCOMPARE(value.isValueSource(), value2.isValueSource());
-        QCOMPARE(value.isValueInterceptor(), value2.isValueInterceptor());
-        QCOMPARE(value.isObject(), value2.isObject());
-        QCOMPARE(value.isList(), value2.isList());
-        QCOMPARE(value.position(), value2.position());
-        QCOMPARE(value.length(), value2.length());
-
-        QCOMPARE(value.type(), value3.type());
-        QCOMPARE(value.isInvalid(), value3.isInvalid());
-        QCOMPARE(value.isLiteral(), value3.isLiteral());
-        QCOMPARE(value.isBinding(), value3.isBinding());
-        QCOMPARE(value.isValueSource(), value3.isValueSource());
-        QCOMPARE(value.isValueInterceptor(), value3.isValueInterceptor());
-        QCOMPARE(value.isObject(), value3.isObject());
-        QCOMPARE(value.isList(), value3.isList());
-        QCOMPARE(value.position(), value3.position());
-        QCOMPARE(value.length(), value3.length());
-    }
-
-    // QmlDomList
-    {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("children");
-        QmlDomList list = property.value().toList();
-        QCOMPARE(list.values().count(), 2);
-
-        QmlDomList list2(list);
-        QmlDomList list3;
-        list3 = list2;
-
-        QCOMPARE(list.values().count(), list2.values().count());
-        QCOMPARE(list.position(), list2.position());
-        QCOMPARE(list.length(), list2.length());
-        QCOMPARE(list.commaPositions(), list2.commaPositions());
-
-        QCOMPARE(list.values().count(), list3.values().count());
-        QCOMPARE(list.position(), list3.position());
-        QCOMPARE(list.length(), list3.length());
-        QCOMPARE(list.commaPositions(), list3.commaPositions());
-
-    }
-}
-
-// Tests the position/length of various elements
-void tst_qmldom::position()
-{
-    QByteArray qml = "import Qt 4.6\n"
-         /*14*/      "Item {\n"
-         /*21*/      "    id: myItem\n"
-         /*36*/      "    property int a: 10\n"
-         /*59*/      "    x: 10\n"
-         /*69*/      "    y: x + 10\n"
-         /*83*/      "    z: NumberAnimation {}\n"
-        /*109*/      "    opacity: Behavior {}\n"
-        /*134*/      "    Component {\n"
-        /*150*/      "        Item{}\n"
-        /*165*/      "    }\n"
-        /*171*/      "    children: [ Item{}, Item{} ]\n"
-        /*204*/      "}\n";
-
-
-    QmlDomDocument document;
-    QVERIFY(document.load(&engine, qml));
-
-    QmlDomObject root = document.rootObject();
-
-    // All QmlDomDynamicProperty
-    QmlDomDynamicProperty dynProp = root.dynamicProperty("a");
-    QCOMPARE(dynProp.position(), 40);
-    QCOMPARE(dynProp.length(), 18);
-
-    // All QmlDomProperty
-    QmlDomProperty x = root.property("x");
-    QCOMPARE(x.position(), 63);
-    QCOMPARE(x.length(), 1);
-
-    QmlDomProperty y = root.property("y");
-    QCOMPARE(y.position(), 73);
-    QCOMPARE(y.length(), 1);
-
-    QmlDomProperty z = root.property("z");
-    QCOMPARE(z.position(), 87);
-    QCOMPARE(z.length(), 1);
-
-    QmlDomProperty opacity = root.property("opacity");
-    QCOMPARE(opacity.position(), 113);
-    QCOMPARE(opacity.length(), 7);
-
-    QmlDomProperty data = root.property("data");
-    QCOMPARE(data.position(), 138);
-    QCOMPARE(data.length(), 0);
-
-    QmlDomProperty children = root.property("children");
-    QCOMPARE(children.position(), 175);
-    QCOMPARE(children.length(), 8);
-
-    QmlDomList dataList = data.value().toList();
-    QCOMPARE(dataList.values().count(), 1);
-    QmlDomList childrenList = children.value().toList();
-    QCOMPARE(childrenList.values().count(), 2);
-
-    // All QmlDomObject
-    QCOMPARE(root.position(), 14);
-    QCOMPARE(root.length(), 191);
-
-    QmlDomObject numberAnimation = z.value().toValueSource().object();
-    QCOMPARE(numberAnimation.position(), 90);
-    QCOMPARE(numberAnimation.length(), 18);
-
-    QmlDomObject behavior = opacity.value().toValueInterceptor().object();
-    QCOMPARE(behavior.position(), 122);
-    QCOMPARE(behavior.length(), 11);
-
-    QmlDomObject component = dataList.values().at(0).toObject();
-    QCOMPARE(component.position(), 138);
-    QCOMPARE(component.length(), 32);
-
-    QmlDomObject componentRoot = component.toComponent().componentRoot();
-    QCOMPARE(componentRoot.position(), 158);
-    QCOMPARE(componentRoot.length(), 6);
-
-    QmlDomObject child1 = childrenList.values().at(0).toObject();
-    QCOMPARE(child1.position(), 187);
-    QCOMPARE(child1.length(), 6);
-
-    QmlDomObject child2 = childrenList.values().at(1).toObject();
-    QCOMPARE(child2.position(), 195);
-    QCOMPARE(child2.length(), 6);
-
-    // All QmlDomValue
-    QmlDomValue xValue = x.value();
-    QCOMPARE(xValue.position(), 66);
-    QCOMPARE(xValue.length(), 2);
-
-    QmlDomValue yValue = y.value();
-    QCOMPARE(yValue.position(), 76);
-    QCOMPARE(yValue.length(), 6);
-
-    QmlDomValue zValue = z.value();
-    QCOMPARE(zValue.position(), 90);
-    QCOMPARE(zValue.length(), 18);
-
-    QmlDomValue opacityValue = opacity.value();
-    QCOMPARE(opacityValue.position(), 122);
-    QCOMPARE(opacityValue.length(), 11);
-
-    QmlDomValue dataValue = data.value();
-    QCOMPARE(dataValue.position(), 138);
-    QCOMPARE(dataValue.length(), 32);
-
-    QmlDomValue child1Value = childrenList.values().at(0);
-    QCOMPARE(child1Value.position(), 187);
-    QCOMPARE(child1Value.length(), 6);
-
-    QmlDomValue child2Value = childrenList.values().at(1);
-    QCOMPARE(child2Value.position(), 195);
-    QCOMPARE(child2Value.length(), 6);
-
-    // All QmlDomList
-    qWarning("QmlListValue position test required");
-}
-
-QTEST_MAIN(tst_qmldom)
-
-#include "tst_qmldom.moc"
diff --git a/tests/auto/declarative/qmleasefollow/data/easefollow1.qml b/tests/auto/declarative/qmleasefollow/data/easefollow1.qml
deleted file mode 100644
index 0cc19eb..0000000
--- a/tests/auto/declarative/qmleasefollow/data/easefollow1.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-EaseFollow {}
diff --git a/tests/auto/declarative/qmleasefollow/data/easefollow2.qml b/tests/auto/declarative/qmleasefollow/data/easefollow2.qml
deleted file mode 100644
index b65964e..0000000
--- a/tests/auto/declarative/qmleasefollow/data/easefollow2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-EaseFollow {
-    source: 10; duration: 300; enabled: true; reversingMode: EaseFollow.Immediate
-}
diff --git a/tests/auto/declarative/qmleasefollow/data/easefollow3.qml b/tests/auto/declarative/qmleasefollow/data/easefollow3.qml
deleted file mode 100644
index f8886e9..0000000
--- a/tests/auto/declarative/qmleasefollow/data/easefollow3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-EaseFollow {
-    source: 10; velocity: 250; enabled: false; reversingMode: EaseFollow.Sync
-    maximumEasingTime: 150
-}
diff --git a/tests/auto/declarative/qmleasefollow/qmleasefollow.pro b/tests/auto/declarative/qmleasefollow/qmleasefollow.pro
deleted file mode 100644
index 4224a7e..0000000
--- a/tests/auto/declarative/qmleasefollow/qmleasefollow.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmleasefollow.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmleasefollow/tst_qmleasefollow.cpp b/tests/auto/declarative/qmleasefollow/tst_qmleasefollow.cpp
deleted file mode 100644
index f28311f..0000000
--- a/tests/auto/declarative/qmleasefollow/tst_qmleasefollow.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmleasefollow_p.h>
-#include <private/qmlvaluetype_p.h>
-#include "../../../shared/util.h"
-
-class tst_qmleasefollow : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmleasefollow();
-
-private slots:
-    void defaultValues();
-    void values();
-    void disabled();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmleasefollow::tst_qmleasefollow()
-{
-}
-
-void tst_qmleasefollow::defaultValues()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow1.qml"));
-    QmlEaseFollow *obj = qobject_cast<QmlEaseFollow*>(c.create());
-
-    QVERIFY(obj != 0);
-
-    QCOMPARE(obj->sourceValue(), 0.);
-    QCOMPARE(obj->velocity(), 200.);
-    QCOMPARE(obj->enabled(), true);
-    QCOMPARE(obj->duration(), -1.);
-    QCOMPARE(obj->maximumEasingTime(), -1.);
-    QCOMPARE(obj->reversingMode(), QmlEaseFollow::Eased);
-
-    delete obj;
-}
-
-void tst_qmleasefollow::values()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow2.qml"));
-    QmlEaseFollow *obj = qobject_cast<QmlEaseFollow*>(c.create());
-
-    QVERIFY(obj != 0);
-
-    QCOMPARE(obj->sourceValue(), 10.);
-    QCOMPARE(obj->velocity(), 200.);
-    QCOMPARE(obj->enabled(), true);
-    QCOMPARE(obj->duration(), 300.);
-    QCOMPARE(obj->maximumEasingTime(), -1.);
-    QCOMPARE(obj->reversingMode(), QmlEaseFollow::Immediate);
-
-    delete obj;
-}
-
-void tst_qmleasefollow::disabled()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow3.qml"));
-    QmlEaseFollow *obj = qobject_cast<QmlEaseFollow*>(c.create());
-
-    QVERIFY(obj != 0);
-
-    QCOMPARE(obj->sourceValue(), 10.);
-    QCOMPARE(obj->velocity(), 250.);
-    QCOMPARE(obj->enabled(), false);
-    QCOMPARE(obj->maximumEasingTime(), 150.);
-    QCOMPARE(obj->reversingMode(), QmlEaseFollow::Sync);
-
-    delete obj;
-}
-
-QTEST_MAIN(tst_qmleasefollow)
-
-#include "tst_qmleasefollow.moc"
diff --git a/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml b/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml
deleted file mode 100644
index b4a702b..0000000
--- a/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    property int c1: 0
-    property int c2: c1
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/CustomObject.qml b/tests/auto/declarative/qmlecmascript/data/CustomObject.qml
deleted file mode 100644
index 691d9ec..0000000
--- a/tests/auto/declarative/qmlecmascript/data/CustomObject.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string greeting: "hello world"
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/MethodsObject.qml b/tests/auto/declarative/qmlecmascript/data/MethodsObject.qml
deleted file mode 100644
index f51ca86..0000000
--- a/tests/auto/declarative/qmlecmascript/data/MethodsObject.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    function testFunction() { return 19; }
-    function testFunction2() { return 18; }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml b/tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml
deleted file mode 100644
index 7c32e56..0000000
--- a/tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int b: obj.prop.a
-
-    property var prop;
-    prop: QtObject {
-        property int a: 10
-    }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/ScopeObject.qml b/tests/auto/declarative/qmlecmascript/data/ScopeObject.qml
deleted file mode 100644
index b7bec63..0000000
--- a/tests/auto/declarative/qmlecmascript/data/ScopeObject.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Item {
-    property int a: 3
-    property int binding: myFunction();
-    property int binding2: myCompFunction();
-
-    Script {
-        function myCompFunction() {
-            return a;
-        }
-    }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/TypeForDynamicCreation.qml b/tests/auto/declarative/qmlecmascript/data/TypeForDynamicCreation.qml
deleted file mode 100644
index 56e0625..0000000
--- a/tests/auto/declarative/qmlecmascript/data/TypeForDynamicCreation.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Qt.test 1.0
-MyQmlObject{objectName:"objectThree"}
diff --git a/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml b/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml
deleted file mode 100644
index 5c3ea1f..0000000
--- a/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-import Qt.test 1.0
-
-MyQmlObject {
-    property alias c1: myObject.c1
-    property int c2: 3
-    property int c3: c2 
-    objectProperty: QtObject { 
-        id: myObject 
-        property int c1
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.2.qml b/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.2.qml
deleted file mode 100644
index db7f2b5..0000000
--- a/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.2.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt.test 1.0
-
-MyTypeObject {
-    flagProperty: if(1) "FlagVal1 | FlagVal3"
-    enumProperty: if(1) "EnumVal2"
-    stringProperty: if(1) "Hello World!"
-    uintProperty: if(1) 10
-    intProperty: if(1) -19
-    realProperty: if(1) 23.2
-    doubleProperty: if(1) -19.7
-    floatProperty: if(1) 8.5
-    colorProperty: if(1) "red"
-    dateProperty: if(1) "1982-11-25"
-    timeProperty: if(1) "11:11:32" 
-    dateTimeProperty: if(1) "2009-05-12T13:22:01"
-    pointProperty: if(1) "99,13"
-    pointFProperty: if(1) "-10.1,12.3"
-    sizeProperty: if(1) "99x13"
-    sizeFProperty: if(1) "0.1x0.2"
-    rectProperty: if(1) "9,7,100x200"
-    rectFProperty: if(1) "1000.1,-10.9,400x90.99"
-    boolProperty: if(1) true
-    variantProperty: if(1) "Hello World!"
-    vectorProperty: if(1) "10,1,2.2"
-    urlProperty: if(1) "main.qml"
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.qml b/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.qml
deleted file mode 100644
index 128db69..0000000
--- a/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt.test 1.0
-import Qt 4.6
-
-MyTypeObject {
-    Component.onCompleted: {
-        flagProperty = "FlagVal1 | FlagVal3"
-        enumProperty = "EnumVal2"
-        stringProperty = "Hello World!"
-        uintProperty = 10
-        intProperty = -19
-        realProperty = 23.2
-        doubleProperty = -19.7
-        floatProperty = 8.5
-        colorProperty = "red"
-        dateProperty = "1982-11-25"
-        timeProperty = "11:11:32" 
-        dateTimeProperty = "2009-05-12T13:22:01"
-        pointProperty = "99,13"
-        pointFProperty = "-10.1,12.3"
-        sizeProperty = "99x13"
-        sizeFProperty = "0.1x0.2"
-        rectProperty = "9,7,100x200"
-        rectFProperty = "1000.1,-10.9,400x90.99"
-        boolProperty = true
-        variantProperty = "Hello World!"
-        vectorProperty = "10,1,2.2"
-        urlProperty = "main.qml"
-    }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/attachedProperty.qml b/tests/auto/declarative/qmlecmascript/data/attachedProperty.qml
deleted file mode 100644
index 061eda0..0000000
--- a/tests/auto/declarative/qmlecmascript/data/attachedProperty.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt.test 1.0
-import Qt.test 1.0 as Namespace
-
-MyQmlObject {
-    id: me
-    property int a: MyQmlObject.value
-    property int b: Namespace.MyQmlObject.value
-    property int c: me.Namespace.MyQmlObject.value
-    property int d: me.Namespace.MyQmlObject.value
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/bindingLoop.qml b/tests/auto/declarative/qmlecmascript/data/bindingLoop.qml
deleted file mode 100644
index 80545cf..0000000
--- a/tests/auto/declarative/qmlecmascript/data/bindingLoop.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt.test 1.0
-
-MyQmlContainer { 
-    children : [ 
-        MyQmlObject { 
-            id: object1 
-            stringProperty: "hello" + object2.stringProperty 
-        },
-        MyQmlObject { 
-            id: object2 
-            stringProperty: "hello" + object1.stringProperty 
-        } 
-    ] 
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml b/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml
deleted file mode 100644
index 3147f63..0000000
--- a/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject { 
-    stringProperty: trueProperty?'pass':'fail' 
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml b/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml
deleted file mode 100644
index c89bb49..0000000
--- a/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject { 
-    stringProperty: falseProperty?'fail':'pass' 
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/bug.1.qml b/tests/auto/declarative/qmlecmascript/data/bug.1.qml
deleted file mode 100644
index 266de76..0000000
--- a/tests/auto/declarative/qmlecmascript/data/bug.1.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int a: 10
-    property bool b: false
-
-    property int test
-
-    test: ((a == 10)?(a + 1):0) + ((b == true)?9:3)
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/compositePropertyType.qml b/tests/auto/declarative/qmlecmascript/data/compositePropertyType.qml
deleted file mode 100644
index 80a2814..0000000
--- a/tests/auto/declarative/qmlecmascript/data/compositePropertyType.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property CustomObject myObject
-    myObject: CustomObject { }
-
-    Component.onCompleted: console.log(myObject.greeting)
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml
deleted file mode 100644
index 13c5ae5..0000000
--- a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    property int c1: 0
-    property int c2: c1
-
-    onBasicSignal: c2 = 13
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml
deleted file mode 100644
index 207a06b..0000000
--- a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    property alias c1: myConstants.c1
-    property alias c2: myConstants.c2
-
-    objectProperty: ConstantsOverrideBindings { 
-        id: myConstants
-        c2: 10 
-    }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml
deleted file mode 100644
index ca9d1d8..0000000
--- a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    property int c1: 0
-    property int c2: c1
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/deferredProperties.qml b/tests/auto/declarative/qmlecmascript/data/deferredProperties.qml
deleted file mode 100644
index e01f708..0000000
--- a/tests/auto/declarative/qmlecmascript/data/deferredProperties.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt.test 1.0
-
-MyDeferredObject {
-    id: root
-    value: 10
-    objectProperty: MyQmlObject {
-        value: root.value
-    }
-    objectProperty2: MyQmlObject { id: blah }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/deletedObject.qml b/tests/auto/declarative/qmlecmascript/data/deletedObject.qml
deleted file mode 100644
index 6bc3a17..0000000
--- a/tests/auto/declarative/qmlecmascript/data/deletedObject.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import Qt 4.6
-import Qt.test 1.0
-
-QtObject {
-    property var obj
-    obj: MyQmlObject {
-        id: myObject
-        value: 92
-    }
-
-    property bool test1: false
-    property bool test2: false
-    property bool test3: false
-    property bool test4: false
-
-    Component.onCompleted: {
-        test1 = myObject.value == 92;
-        test2 = obj.value == 92;
-
-        myObject.deleteOnSet = 1;
-
-        test3 = myObject.value == undefined;
-    //    test4 = obj.value == undefined;
-    }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/dynamicCreation.helper.qml b/tests/auto/declarative/qmlecmascript/data/dynamicCreation.helper.qml
deleted file mode 100644
index d790d63..0000000
--- a/tests/auto/declarative/qmlecmascript/data/dynamicCreation.helper.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject{
-    objectName: "objectTwo"
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/dynamicCreation.qml b/tests/auto/declarative/qmlecmascript/data/dynamicCreation.qml
deleted file mode 100644
index ed5e571..0000000
--- a/tests/auto/declarative/qmlecmascript/data/dynamicCreation.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject{
-    id: obj
-    objectName: "obj"
-    function createOne()
-    {
-        obj.objectProperty = createQmlObject('import Qt.test 1.0; MyQmlObject{objectName:"objectOne"}', obj);
-    }
-
-    function createTwo()
-    {
-        var component = createComponent('dynamicCreation.helper.qml');
-        obj.objectProperty = component.createObject();
-    }
-
-    function createThree()
-    {
-        obj.objectProperty = createQmlObject('TypeForDynamicCreation{}', obj);
-    }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/dynamicDeletion.qml b/tests/auto/declarative/qmlecmascript/data/dynamicDeletion.qml
deleted file mode 100644
index 0855b29..0000000
--- a/tests/auto/declarative/qmlecmascript/data/dynamicDeletion.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject{
-    id: obj
-    objectName: "obj"
-    function create()
-    {
-        obj.objectProperty = createQmlObject('import Qt.test 1.0; MyQmlObject{objectName:"emptyObject"}', obj);
-    }
-
-    function killOther()
-    {
-        obj.objectProperty.destroy(500);
-    }
-
-    function killMe()
-    {
-        obj.destroy();//Must not segfault
-    }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/enums.1.qml b/tests/auto/declarative/qmlecmascript/data/enums.1.qml
deleted file mode 100644
index 6351823..0000000
--- a/tests/auto/declarative/qmlecmascript/data/enums.1.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt.test 1.0
-import Qt.test 1.0 as Namespace
-
-MyQmlObject {
-    // Enums from non-namespaced type
-    property int a: MyQmlObject.EnumValue1
-    property int b: MyQmlObject.EnumValue2
-    property int c: MyQmlObject.EnumValue3
-    property int d: MyQmlObject.EnumValue4
-
-    // Enums from namespaced type
-    property int e: Namespace.MyQmlObject.EnumValue1
-    property int f: Namespace.MyQmlObject.EnumValue2
-    property int g: Namespace.MyQmlObject.EnumValue3
-    property int h: Namespace.MyQmlObject.EnumValue4
-
-    // Test that enums don't mask attached properties
-    property int i: MyQmlObject.value
-    property int j: Namespace.MyQmlObject.value
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/enums.2.qml b/tests/auto/declarative/qmlecmascript/data/enums.2.qml
deleted file mode 100644
index bdc672f..0000000
--- a/tests/auto/declarative/qmlecmascript/data/enums.2.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt.test 1.0
-import Qt.test 1.0 as Namespace
-
-MyQmlObject {
-    property int a: MyQmlObject.EnumValue10
-    property int b: Namespace.MyQmlObject.EnumValue10
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/exceptionClearsOnReeval.qml b/tests/auto/declarative/qmlecmascript/data/exceptionClearsOnReeval.qml
deleted file mode 100644
index a2f0d1a..0000000
--- a/tests/auto/declarative/qmlecmascript/data/exceptionClearsOnReeval.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    property bool test: objectProperty.objectProperty.trueProperty
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning.qml b/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning.qml
deleted file mode 100644
index acc3163..0000000
--- a/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-import Qt.test 1.0
-
-MyQmlObject {
-    Component.onCompleted:
-        { throw(new Error("JS exception")) }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning2.qml b/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning2.qml
deleted file mode 100644
index 44e10c1..0000000
--- a/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning2.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-import Qt.test 1.0
-
-MyQmlObject {
-    value: { throw(new Error("JS exception")) }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml b/tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml
deleted file mode 100644
index 9a82ad1..0000000
--- a/tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt.test 1.0
-import Qt 4.6
-
-QtObject {
-    property MyExtendedObject a;
-    a: MyExtendedObject { id: root }
-    property int b: Math.max(root.extendedProperty, 0)
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/extensionObjects.qml b/tests/auto/declarative/qmlecmascript/data/extensionObjects.qml
deleted file mode 100644
index a902312..0000000
--- a/tests/auto/declarative/qmlecmascript/data/extensionObjects.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt.test 1.0
-
-MyExtendedObject
-{
-    baseProperty: baseExtendedProperty
-    baseExtendedProperty: 13
-
-    coreProperty: extendedProperty
-    extendedProperty: 9
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.1.qml b/tests/auto/declarative/qmlecmascript/data/externalScript.1.qml
deleted file mode 100644
index 2ac7b6e..0000000
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.1.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int test: external_script_func();
-
-    Script {
-        // Single source as non-array literal
-        source: "externalScript.js"
-    }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.2.js b/tests/auto/declarative/qmlecmascript/data/externalScript.2.js
deleted file mode 100644
index 78c3a86..0000000
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.2.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function external_script_func2() {
-    return a;
-}
-
-function is_a_undefined() {
-    return a == undefined;
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.2.qml b/tests/auto/declarative/qmlecmascript/data/externalScript.2.qml
deleted file mode 100644
index dec657c..0000000
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.2.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int test: external_script_func();
-
-    Script {
-        // Single source as array 
-        source: [ "externalScript.js" ]
-    }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.3.qml b/tests/auto/declarative/qmlecmascript/data/externalScript.3.qml
deleted file mode 100644
index d7acf38..0000000
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.3.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int test: external_script_func();
-    property int test2: external_script_func2();
-    property bool test3: is_a_undefined();
-
-    Script {
-        // Multiple script
-        source: [ "externalScript.js", "externalScript.2.js" ]
-    }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.4.qml b/tests/auto/declarative/qmlecmascript/data/externalScript.4.qml
deleted file mode 100644
index 16211aa..0000000
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.4.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int test: external_script_func();
-    property bool test2: is_a_undefined();
-
-    // Disconnected scripts
-    Script {
-        source: "externalScript.js"
-    }
-
-    Script {
-        source: "externalScript.2.js"
-    }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.js b/tests/auto/declarative/qmlecmascript/data/externalScript.js
deleted file mode 100644
index 8928652..0000000
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var a = 92;
-
-function external_script_func() {
-    return a;
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml
deleted file mode 100644
index 2db0fc6..0000000
--- a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt.test 1.0
-import Qt 4.6
-
-MyQmlObject {
-    objectProperty: if(1) otherObject
-
-    property var obj
-
-    obj: QtObject {
-        id: otherObject
-    }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml
deleted file mode 100644
index f66428d..0000000
--- a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt.test 1.0
-import Qt 4.6
-
-MyQmlObject {
-    objectProperty: otherObject
-
-    property var obj
-
-    obj: QtObject {
-        id: otherObject
-    }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/jsObject.qml b/tests/auto/declarative/qmlecmascript/data/jsObject.qml
deleted file mode 100644
index 4128c92..0000000
--- a/tests/auto/declarative/qmlecmascript/data/jsObject.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int test
-
-    Component.onCompleted: {
-        var o = new Object;
-        o.test = 92;
-        test = o.test;
-    }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/listProperties.qml b/tests/auto/declarative/qmlecmascript/data/listProperties.qml
deleted file mode 100644
index 810f9b6..0000000
--- a/tests/auto/declarative/qmlecmascript/data/listProperties.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt.test 1.0
-import Qt 4.6
-
-MyQmlObject {
-    id: root
-
-    objectListProperty: [
-        QtObject { property int a: 10 },
-        QtObject { property int a: 11 }
-    ]
-
-    Script {
-        function calcTest1() {
-            var rv = 0;
-            for (var ii = 0; ii < root.objectListProperty.length; ++ii) {
-                rv += root.objectListProperty[ii].a;
-            }
-            return rv;
-        }
-
-    }
-
-    property int test1: calcTest1();
-    property int test2: root.objectListProperty.length
-    property bool test3: root.objectListProperty[1] != undefined
-    property bool test4: root.objectListProperty[100] == undefined
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/listToVariant.qml b/tests/auto/declarative/qmlecmascript/data/listToVariant.qml
deleted file mode 100644
index 47f4e50..0000000
--- a/tests/auto/declarative/qmlecmascript/data/listToVariant.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var test: children
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.1.qml b/tests/auto/declarative/qmlecmascript/data/methods.1.qml
deleted file mode 100644
index 0bbee16..0000000
--- a/tests/auto/declarative/qmlecmascript/data/methods.1.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject { 
-    id: myObject
-    onBasicSignal: myObject.methodNoArgs() 
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.2.qml b/tests/auto/declarative/qmlecmascript/data/methods.2.qml
deleted file mode 100644
index 9f0c6b1..0000000
--- a/tests/auto/declarative/qmlecmascript/data/methods.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject { 
-    id: myObject
-    onBasicSignal: myObject.method(163) 
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.3.qml b/tests/auto/declarative/qmlecmascript/data/methods.3.qml
deleted file mode 100644
index 79efc50..0000000
--- a/tests/auto/declarative/qmlecmascript/data/methods.3.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    function testFunction() { return 19; }
-
-    property int test: testFunction()
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.4.qml b/tests/auto/declarative/qmlecmascript/data/methods.4.qml
deleted file mode 100644
index aac711c..0000000
--- a/tests/auto/declarative/qmlecmascript/data/methods.4.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-MethodsObject {
-    function testFunction2() { return 17; }
-    function testFunction3() { return 16; }
-
-    property int test: testFunction()
-    property int test2: testFunction2()
-    property int test3: testFunction3()
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.5.qml b/tests/auto/declarative/qmlecmascript/data/methods.5.qml
deleted file mode 100644
index 3d45b15..0000000
--- a/tests/auto/declarative/qmlecmascript/data/methods.5.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-Item {
-    property alias x: item.x
-    Item { id: item }
-
-    function testFunction() { return 9; }
-    property int test: testFunction();
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/multiEngineObject.qml b/tests/auto/declarative/qmlecmascript/data/multiEngineObject.qml
deleted file mode 100644
index 7da09e4..0000000
--- a/tests/auto/declarative/qmlecmascript/data/multiEngineObject.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string test: thing.stringProperty
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/nonExistantAttachedObject.qml b/tests/auto/declarative/qmlecmascript/data/nonExistantAttachedObject.qml
deleted file mode 100644
index f9585db..0000000
--- a/tests/auto/declarative/qmlecmascript/data/nonExistantAttachedObject.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    stringProperty: MyQmlContainer.prop
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/objectsCompareAsEqual.qml b/tests/auto/declarative/qmlecmascript/data/objectsCompareAsEqual.qml
deleted file mode 100644
index 18e488a..0000000
--- a/tests/auto/declarative/qmlecmascript/data/objectsCompareAsEqual.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: root
-
-    property var item: child
-    Item { id: child }
-
-    property bool test1: child == child
-    property bool test2: child.parent == root
-    property bool test3: root != child
-    property bool test4: item == child
-    property bool test5: item != root
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml
deleted file mode 100644
index 0a933e8..0000000
--- a/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    property alias c1: myConstants.c1
-    property alias c2: myConstants.c2
-    property int c3: 0
-
-    objectProperty: ConstantsOverrideBindings { 
-        id: myConstants 
-        c2: c3
-    }
-
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/qmlToString.qml b/tests/auto/declarative/qmlecmascript/data/qmlToString.qml
deleted file mode 100644
index ac296ce..0000000
--- a/tests/auto/declarative/qmlecmascript/data/qmlToString.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject{
-    id: obj
-    objectName: "objName"
-    function testToString()
-    {
-        obj.stringProperty = obj.toString();
-    }
-
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/scope.2.qml b/tests/auto/declarative/qmlecmascript/data/scope.2.qml
deleted file mode 100644
index 8e5aa0b..0000000
--- a/tests/auto/declarative/qmlecmascript/data/scope.2.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-import Qt 4.6
-
-Item {
-    property int a: 0
-    property int b: 0
-
-    Script {
-        function b() { return 11; }
-        function c() { return 33; }
-    }
-
-    QtObject {
-        id: a
-        property int value: 19
-    }
-
-    QtObject {
-        id: c
-        property int value: 24
-    }
-
-    QtObject {
-        id: nested
-        property int a: 1
-        property int test: a.value
-        property int test2: b()
-        property int test3: c.value
-    }
-
-
-    // id takes precedence over local, and root properties
-    property int test1: a.value 
-    property alias test2: nested.test
-
-    // methods takes precedence over local, and root properties
-    property int test3: b()
-    property alias test4: nested.test2
-
-    // id takes precedence over methods
-    property int test5: c.value
-    property alias test6: nested.test3
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/scope.qml b/tests/auto/declarative/qmlecmascript/data/scope.qml
deleted file mode 100644
index cccd3d3..0000000
--- a/tests/auto/declarative/qmlecmascript/data/scope.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: root
-
-    property int a: 1
-    property int binding: a
-    property string binding2: a + "Test"
-    property int binding3: myFunction()
-    property int binding4: myNestedFunction()
-
-    Script {
-        function myFunction() {
-            return a;
-        }
-    }
-
-    Item {
-        id: nestedObject
-
-        Script {
-            function myNestedFunction() {
-                return a;
-            }
-        }
-
-        property int a: 2
-        property int binding: a
-        property string binding2: a + "Test"
-        property int binding3: myFunction()
-        property int binding4: myNestedFunction()
-    }
-
-    ScopeObject {
-        id: compObject
-    }
-
-    property alias test1: root.binding
-    property alias test2: nestedObject.binding
-    property alias test3: root.binding2
-    property alias test4: nestedObject.binding2
-    property alias test5: root.binding3
-    property alias test6: nestedObject.binding3
-    property alias test7: root.binding4
-    property alias test8: nestedObject.binding4
-    property alias test9: compObject.binding
-    property alias test10: compObject.binding2
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/scriptAccess.js b/tests/auto/declarative/qmlecmascript/data/scriptAccess.js
deleted file mode 100644
index c00d285..0000000
--- a/tests/auto/declarative/qmlecmascript/data/scriptAccess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var extVariable = 19;
-
-function extMethod()
-{
-    return extVariable;
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/scriptAccess.qml b/tests/auto/declarative/qmlecmascript/data/scriptAccess.qml
deleted file mode 100644
index feb6d16..0000000
--- a/tests/auto/declarative/qmlecmascript/data/scriptAccess.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Qt 4.6
-
-Item {
-    Script {
-        function method() {
-            return 10;
-        }
-    }
-
-    Script {
-        source: "scriptAccess.js"
-    }
-
-    property int test1: method()
-    property int test2: extMethod()
-    property int test3: extVariable
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/scriptErrors.js b/tests/auto/declarative/qmlecmascript/data/scriptErrors.js
deleted file mode 100644
index 1d7b357..0000000
--- a/tests/auto/declarative/qmlecmascript/data/scriptErrors.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Comment
-a = 10
diff --git a/tests/auto/declarative/qmlecmascript/data/scriptErrors.qml b/tests/auto/declarative/qmlecmascript/data/scriptErrors.qml
deleted file mode 100644
index c2edb41..0000000
--- a/tests/auto/declarative/qmlecmascript/data/scriptErrors.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    Script { source: "scriptErrors.js" }
-    Script { function getValue() { a = 10; return 0; } }
-
-    property int t: a.value
-    property int w: getValue();
-    property int x: undefinedObject
-    property int y: (a.value, undefinedObject)
-
-    onBasicSignal: { console.log(a.value); }
-    id: myObj
-    onAnotherBasicSignal: myObj.trueProperty = false;
-    onThirdBasicSignal: myObj.fakeProperty = "";
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.2.qml b/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.2.qml
deleted file mode 100644
index 58cf805..0000000
--- a/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.2.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Qt.test 1.0
-
-MyQmlContainer {
-    property bool triggerDelete: false
-
-    children: [
-        MyQmlObject {
-            // Will trigger deletion on binding assignment
-            deleteOnSet: Math.max(0, 1)
-        },
-
-        MyQmlObject {
-            // Will trigger deletion on binding assignment, but after component creation
-            deleteOnSet: if (triggerDelete) 1; else 0; 
-        }
-    ]
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.qml b/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.qml
deleted file mode 100644
index 074851a..0000000
--- a/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt.test 1.0
-
-MyQmlContainer {
-    property bool triggerDelete: false
-
-    children: [
-        MyQmlObject {
-            // Will trigger deletion during binding evaluation
-            stringProperty: {deleteMe(), "Hello"}
-        },
-
-        MyQmlObject {
-            // Will trigger deletion during binding evaluation, but after component creation
-            stringProperty: if (triggerDelete) { deleteMe(), "Hello" } else { "World" }
-        }
-
-    ]
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml b/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml
deleted file mode 100644
index 5a19639..0000000
--- a/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.6
-
-Item {
-    property int test: myObject.object.a
-
-    Item {
-        id: myObject
-        property QtObject object;
-        object: QtObject {
-            property int a: 10
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/signalAssignment.1.qml b/tests/auto/declarative/qmlecmascript/data/signalAssignment.1.qml
deleted file mode 100644
index fbd0914..0000000
--- a/tests/auto/declarative/qmlecmascript/data/signalAssignment.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject { 
-    onBasicSignal: setString('pass') 
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/signalAssignment.2.qml b/tests/auto/declarative/qmlecmascript/data/signalAssignment.2.qml
deleted file mode 100644
index 8addcb9..0000000
--- a/tests/auto/declarative/qmlecmascript/data/signalAssignment.2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject { 
-    onArgumentSignal: setString('pass ' + a + ' ' + b + ' ' + c) 
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/signalParameterTypes.qml b/tests/auto/declarative/qmlecmascript/data/signalParameterTypes.qml
deleted file mode 100644
index 6fc8b02..0000000
--- a/tests/auto/declarative/qmlecmascript/data/signalParameterTypes.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject
-{
-    id: root
-    property int intProperty
-    property real realProperty
-    property color colorProperty
-    property var variantProperty
-
-    signal mySignal(int a, real b, color c, var d)
-
-    onMySignal: { intProperty = a; realProperty = b; colorProperty = c; variantProperty = d; }
-
-    onBasicSignal: root.mySignal(10, 19.2, Qt.rgba(1, 1, 0, 1), Qt.rgba(1, 0, 1, 1))
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml b/tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml
deleted file mode 100644
index 7d419cd..0000000
--- a/tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt.test 1.0
-import Qt 4.6
-
-MyQmlObject {
-    property real base: 50
-    property alias test1: myObject.test1
-    property alias test2: myObject.test2
-
-    objectProperty: QtObject {
-        id: myObject
-        property real test1: base
-        property real test2: Math.max(0, base)
-    }
-        
-    // Signal with no args
-    onBasicSignal: base = 200
-    // Signal with args
-    onArgumentSignal: base = 400
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/transientErrors.qml b/tests/auto/declarative/qmlecmascript/data/transientErrors.qml
deleted file mode 100644
index fa7e01c..0000000
--- a/tests/auto/declarative/qmlecmascript/data/transientErrors.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var obj: nested
-
-    property var obj2
-    obj2: NestedTypeTransientErrors {
-        id: nested
-    }
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.2.qml b/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.2.qml
deleted file mode 100644
index e73d38e2..0000000
--- a/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.2.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    resettableProperty: 19
-
-    function doReset() {
-        resettableProperty = undefined;
-    }
-}
-
diff --git a/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.qml b/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.qml
deleted file mode 100644
index eceff60..0000000
--- a/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject {
-    property bool setUndefined: false
-
-    resettableProperty: setUndefined?undefined:92
-}
diff --git a/tests/auto/declarative/qmlecmascript/data/valueTypeFunctions.qml b/tests/auto/declarative/qmlecmascript/data/valueTypeFunctions.qml
deleted file mode 100644
index 33b4a68..0000000
--- a/tests/auto/declarative/qmlecmascript/data/valueTypeFunctions.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt.test 1.0
-
-MyTypeObject {
-    rectProperty: Qt.rect(0,0,100,100)
-    rectFProperty: Qt.rect(0,0.5,100,99.5)
-}
diff --git a/tests/auto/declarative/qmlecmascript/qmlecmascript.pro b/tests/auto/declarative/qmlecmascript/qmlecmascript.pro
deleted file mode 100644
index 9f592e8..0000000
--- a/tests/auto/declarative/qmlecmascript/qmlecmascript.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative script
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlecmascript.cpp \
-           testtypes.cpp
-HEADERS += testtypes.h
-
-# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
-# LIBS += -lgcov
diff --git a/tests/auto/declarative/qmlecmascript/testtypes.cpp b/tests/auto/declarative/qmlecmascript/testtypes.cpp
deleted file mode 100644
index 6a04704..0000000
--- a/tests/auto/declarative/qmlecmascript/testtypes.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "testtypes.h"
-
-class BaseExtensionObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int baseExtendedProperty READ extendedProperty WRITE setExtendedProperty NOTIFY extendedPropertyChanged);
-public:
-    BaseExtensionObject(QObject *parent) : QObject(parent), m_value(0) {}
-
-    int extendedProperty() const { return m_value; }
-    void setExtendedProperty(int v) { m_value = v; emit extendedPropertyChanged(); }
-
-signals:
-    void extendedPropertyChanged();
-private:
-    int m_value;
-};
-
-class ExtensionObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int extendedProperty READ extendedProperty WRITE setExtendedProperty NOTIFY extendedPropertyChanged);
-public:
-    ExtensionObject(QObject *parent) : QObject(parent), m_value(0) {}
-
-    int extendedProperty() const { return m_value; }
-    void setExtendedProperty(int v) { m_value = v; emit extendedPropertyChanged(); }
-
-signals:
-    void extendedPropertyChanged();
-private:
-    int m_value;
-};
-
-void registerTypes()
-{
-    QML_REGISTER_TYPE(Qt.test, 1,0, MyQmlObject,MyQmlObject);
-    QML_REGISTER_TYPE(Qt.test, 1,0, MyDeferredObject,MyDeferredObject);
-    QML_REGISTER_TYPE(Qt.test, 1,0, MyQmlContainer,MyQmlContainer);
-    QML_REGISTER_EXTENDED_TYPE(Qt.test, 1,0, MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject);
-    QML_REGISTER_EXTENDED_TYPE(Qt.test, 1,0, MyExtendedObject,MyExtendedObject,ExtensionObject);
-    QML_REGISTER_TYPE(Qt.test, 1,0, MyTypeObject, MyTypeObject);
-}
-
-#include "testtypes.moc"
diff --git a/tests/auto/declarative/qmlecmascript/testtypes.h b/tests/auto/declarative/qmlecmascript/testtypes.h
deleted file mode 100644
index 9d7d0a7..0000000
--- a/tests/auto/declarative/qmlecmascript/testtypes.h
+++ /dev/null
@@ -1,598 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef TESTTYPES_H
-#define TESTTYPES_H
-
-#include <QtCore/qobject.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlexpression.h>
-#include <QtCore/qpoint.h>
-#include <QtCore/qsize.h>
-#include <QtDeclarative/qmllist.h>
-#include <QtCore/qrect.h>
-#include <QtGui/qmatrix.h>
-#include <QtGui/qcolor.h>
-#include <QtGui/qvector3d.h>
-#include <QtCore/qdatetime.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtDeclarative/qmlscriptstring.h>
-#include <QtDeclarative/qmlcomponent.h>
-
-class MyQmlAttachedObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int value READ value CONSTANT)
-public:
-    MyQmlAttachedObject(QObject *parent) : QObject(parent) {}
-
-    int value() const { return 19; }
-};
-
-class MyQmlObject : public QObject
-{
-    Q_OBJECT
-    Q_ENUMS(MyEnum)
-    Q_ENUMS(MyEnum2)
-    Q_PROPERTY(int deleteOnSet READ deleteOnSet WRITE setDeleteOnSet)
-    Q_PROPERTY(bool trueProperty READ trueProperty CONSTANT)
-    Q_PROPERTY(bool falseProperty READ falseProperty CONSTANT)
-    Q_PROPERTY(int value READ value WRITE setValue)
-    Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty NOTIFY stringChanged)
-    Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty NOTIFY objectChanged)
-    Q_PROPERTY(QmlListProperty<QObject> objectListProperty READ objectListProperty CONSTANT)
-    Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty)
-
-public:
-    MyQmlObject(): m_methodCalled(false), m_methodIntCalled(false), m_object(0), m_value(0), m_resetProperty(13) {}
-
-    enum MyEnum { EnumValue1 = 0, EnumValue2 = 1 };
-    enum MyEnum2 { EnumValue3 = 2, EnumValue4 = 3 };
-
-    bool trueProperty() const { return true; }
-    bool falseProperty() const { return false; }
-
-    QString stringProperty() const { return m_string; }
-    void setStringProperty(const QString &s)
-    {
-        if (s == m_string)
-            return;
-        m_string = s;
-        emit stringChanged();
-    }
-
-    QObject *objectProperty() const { return m_object; }
-    void setObjectProperty(QObject *obj) { 
-        if (obj == m_object)
-            return;
-        m_object = obj;
-        emit objectChanged();
-    }
-
-    QmlListProperty<QObject> objectListProperty() { return QmlListProperty<QObject>(this, m_objectQList); }
-
-    bool methodCalled() const { return m_methodCalled; }
-    bool methodIntCalled() const { return m_methodIntCalled; }
-
-    QString string() const { return m_string; }
-
-    static MyQmlAttachedObject *qmlAttachedProperties(QObject *o) {
-        return new MyQmlAttachedObject(o);
-    }
-
-    int deleteOnSet() const { return 1; }
-    void setDeleteOnSet(int v) { if(v) delete this; }
-
-    int value() const { return m_value; }
-    void setValue(int v) { m_value = v; }
-
-    int resettableProperty() const { return m_resetProperty; }
-    void setResettableProperty(int v) { m_resetProperty = v; }
-    void resetProperty() { m_resetProperty = 13; }
-
-signals:
-    void basicSignal();
-    void argumentSignal(int a, QString b, qreal c);
-    void stringChanged();
-    void objectChanged();
-    void anotherBasicSignal();
-    void thirdBasicSignal();
-
-public slots:
-    void deleteMe() { delete this; }
-    void methodNoArgs() { m_methodCalled = true; }
-    void method(int a) { if(a == 163) m_methodIntCalled = true; }
-    void setString(const QString &s) { m_string = s; }
-
-private:
-    friend class tst_qmlecmascript;
-    bool m_methodCalled;
-    bool m_methodIntCalled;
-
-    QObject *m_object;
-    QString m_string;
-    QList<QObject *> m_objectQList;
-    int m_value;
-    int m_resetProperty;
-};
-
-QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(MyQmlObject);
-
-class MyQmlContainer : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QmlListProperty<MyQmlObject> children READ children CONSTANT)
-public:
-    MyQmlContainer() {}
-
-    QmlListProperty<MyQmlObject> children() { return QmlListProperty<MyQmlObject>(this, m_children); }
-
-private:
-    QList<MyQmlObject*> m_children;
-};
-
-QML_DECLARE_TYPE(MyQmlContainer);
-
-class MyExpression : public QmlExpression
-{
-    Q_OBJECT
-public:
-    MyExpression(QmlContext *ctxt, const QString &expr)
-        : QmlExpression(ctxt, expr, 0), changed(false)
-    {
-        QObject::connect(this, SIGNAL(valueChanged()), this, SLOT(expressionValueChanged()));
-        setNotifyOnValueChanged(true);
-    }
-
-    bool changed;
-
-public slots:
-    void expressionValueChanged() {
-        changed = true;
-    }
-};
-
-
-class MyDefaultObject1 : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int horseLegs READ horseLegs CONSTANT);
-    Q_PROPERTY(int antLegs READ antLegs CONSTANT);
-public:
-    int horseLegs() const { return 4; }
-    int antLegs() const { return 6; }
-};
-
-class MyDefaultObject2 : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int antLegs READ antLegs CONSTANT);
-    Q_PROPERTY(int emuLegs READ emuLegs CONSTANT);
-public:
-    int antLegs() const { return 5; } // Had an accident
-    int emuLegs() const { return 2; }
-};
-
-class MyDefaultObject3 : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int antLegs READ antLegs CONSTANT);
-    Q_PROPERTY(int humanLegs READ humanLegs CONSTANT);
-public:
-    int antLegs() const { return 7; } // Mutant
-    int humanLegs() const { return 2; }
-    int millipedeLegs() const { return 1000; }
-};
-
-class MyDeferredObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
-    Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty);
-    Q_PROPERTY(QObject *objectProperty2 READ objectProperty2 WRITE setObjectProperty2);
-    Q_CLASSINFO("DeferredPropertyNames", "value,objectProperty,objectProperty2");
-
-public:
-    MyDeferredObject() : m_value(0), m_object(0), m_object2(0) {}
-
-    int value() const { return m_value; }
-    void setValue(int v) { m_value = v; emit valueChanged(); }
-
-    QObject *objectProperty() const { return m_object; }
-    void setObjectProperty(QObject *obj) { m_object = obj; }
-
-    QObject *objectProperty2() const { return m_object2; }
-    void setObjectProperty2(QObject *obj) { m_object2 = obj; }
-
-signals:
-    void valueChanged();
-
-private:
-    int m_value;
-    QObject *m_object;
-    QObject *m_object2;
-};
-QML_DECLARE_TYPE(MyDeferredObject);
-
-class MyBaseExtendedObject : public QObject
-{
-Q_OBJECT
-Q_PROPERTY(int baseProperty READ baseProperty WRITE setBaseProperty);
-public:
-    MyBaseExtendedObject() : m_value(0) {}
-
-    int baseProperty() const { return m_value; }
-    void setBaseProperty(int v) { m_value = v; }
-
-private:
-    int m_value;
-};
-QML_DECLARE_TYPE(MyBaseExtendedObject);
-
-class MyExtendedObject : public MyBaseExtendedObject
-{
-Q_OBJECT
-Q_PROPERTY(int coreProperty READ coreProperty WRITE setCoreProperty);
-public:
-    MyExtendedObject() : m_value(0) {}
-
-    int coreProperty() const { return m_value; }
-    void setCoreProperty(int v) { m_value = v; }
-
-private:
-    int m_value;
-};
-QML_DECLARE_TYPE(MyExtendedObject);
-
-class MyTypeObject : public QObject
-{
-    Q_OBJECT
-    Q_ENUMS(MyEnum)
-    Q_FLAGS(MyFlags)
-
-    Q_PROPERTY(QString id READ id WRITE setId);
-    Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty);
-    Q_PROPERTY(QmlComponent *componentProperty READ componentProperty WRITE setComponentProperty);
-    Q_PROPERTY(MyFlags flagProperty READ flagProperty WRITE setFlagProperty);
-    Q_PROPERTY(MyEnum enumProperty READ enumProperty WRITE setEnumProperty);
-    Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty);
-    Q_PROPERTY(uint uintProperty READ uintProperty WRITE setUintProperty);
-    Q_PROPERTY(int intProperty READ intProperty WRITE setIntProperty);
-    Q_PROPERTY(qreal realProperty READ realProperty WRITE setRealProperty);
-    Q_PROPERTY(double doubleProperty READ doubleProperty WRITE setDoubleProperty);
-    Q_PROPERTY(float floatProperty READ floatProperty WRITE setFloatProperty);
-    Q_PROPERTY(QColor colorProperty READ colorProperty WRITE setColorProperty);
-    Q_PROPERTY(QDate dateProperty READ dateProperty WRITE setDateProperty);
-    Q_PROPERTY(QTime timeProperty READ timeProperty WRITE setTimeProperty);
-    Q_PROPERTY(QDateTime dateTimeProperty READ dateTimeProperty WRITE setDateTimeProperty);
-    Q_PROPERTY(QPoint pointProperty READ pointProperty WRITE setPointProperty);
-    Q_PROPERTY(QPointF pointFProperty READ pointFProperty WRITE setPointFProperty);
-    Q_PROPERTY(QSize sizeProperty READ sizeProperty WRITE setSizeProperty);
-    Q_PROPERTY(QSizeF sizeFProperty READ sizeFProperty WRITE setSizeFProperty);
-    Q_PROPERTY(QRect rectProperty READ rectProperty WRITE setRectProperty NOTIFY rectPropertyChanged);
-    Q_PROPERTY(QRect rectProperty2 READ rectProperty2 WRITE setRectProperty2);
-    Q_PROPERTY(QRectF rectFProperty READ rectFProperty WRITE setRectFProperty);
-    Q_PROPERTY(bool boolProperty READ boolProperty WRITE setBoolProperty);
-    Q_PROPERTY(QVariant variantProperty READ variantProperty WRITE setVariantProperty);
-    Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty);
-    Q_PROPERTY(QUrl urlProperty READ urlProperty WRITE setUrlProperty);
-
-    Q_PROPERTY(QmlScriptString scriptProperty READ scriptProperty WRITE setScriptProperty);
-
-public:
-    MyTypeObject()
-        : objectPropertyValue(0), componentPropertyValue(0) {}
-
-    QString idValue;
-    QString id() const {
-        return idValue;
-    }
-    void setId(const QString &v) {
-        idValue = v;
-    }
-
-    QObject *objectPropertyValue;
-    QObject *objectProperty() const {
-        return objectPropertyValue;
-    }
-    void setObjectProperty(QObject *v) {
-        objectPropertyValue = v;
-    }
-
-    QmlComponent *componentPropertyValue;
-    QmlComponent *componentProperty() const {
-        return componentPropertyValue;
-    }
-    void setComponentProperty(QmlComponent *v) {
-        componentPropertyValue = v;
-    }
-
-    enum MyFlag { FlagVal1 = 0x01, FlagVal2 = 0x02, FlagVal3 = 0x04 };
-    Q_DECLARE_FLAGS(MyFlags, MyFlag)
-    MyFlags flagPropertyValue;
-    MyFlags flagProperty() const {
-        return flagPropertyValue;
-    }
-    void setFlagProperty(MyFlags v) {
-        flagPropertyValue = v;
-    }
-
-    enum MyEnum { EnumVal1, EnumVal2 };
-    MyEnum enumPropertyValue;
-    MyEnum enumProperty() const {
-        return enumPropertyValue;
-    }
-    void setEnumProperty(MyEnum v) {
-        enumPropertyValue = v;
-    }
-
-    QString stringPropertyValue;
-    QString stringProperty() const {
-       return stringPropertyValue;
-    }
-    void setStringProperty(const QString &v) {
-        stringPropertyValue = v;
-    }
-
-    uint uintPropertyValue;
-    uint uintProperty() const {
-       return uintPropertyValue;
-    }
-    void setUintProperty(const uint &v) {
-        uintPropertyValue = v;
-    }
-
-    int intPropertyValue;
-    int intProperty() const {
-       return intPropertyValue;
-    }
-    void setIntProperty(const int &v) {
-        intPropertyValue = v;
-    }
-
-    qreal realPropertyValue;
-    qreal realProperty() const {
-       return realPropertyValue;
-    }
-    void setRealProperty(const qreal &v) {
-        realPropertyValue = v;
-    }
-
-    double doublePropertyValue;
-    double doubleProperty() const {
-       return doublePropertyValue;
-    }
-    void setDoubleProperty(const double &v) {
-        doublePropertyValue = v;
-    }
-
-    float floatPropertyValue;
-    float floatProperty() const {
-       return floatPropertyValue;
-    }
-    void setFloatProperty(const float &v) {
-        floatPropertyValue = v;
-    }
-
-    QColor colorPropertyValue;
-    QColor colorProperty() const {
-       return colorPropertyValue;
-    }
-    void setColorProperty(const QColor &v) {
-        colorPropertyValue = v;
-    }
-
-    QDate datePropertyValue;
-    QDate dateProperty() const {
-       return datePropertyValue;
-    }
-    void setDateProperty(const QDate &v) {
-        datePropertyValue = v;
-    }
-
-    QTime timePropertyValue;
-    QTime timeProperty() const {
-       return timePropertyValue;
-    }
-    void setTimeProperty(const QTime &v) {
-        timePropertyValue = v;
-    }
-
-    QDateTime dateTimePropertyValue;
-    QDateTime dateTimeProperty() const {
-       return dateTimePropertyValue;
-    }
-    void setDateTimeProperty(const QDateTime &v) {
-        dateTimePropertyValue = v;
-    }
-
-    QPoint pointPropertyValue;
-    QPoint pointProperty() const {
-       return pointPropertyValue;
-    }
-    void setPointProperty(const QPoint &v) {
-        pointPropertyValue = v;
-    }
-
-    QPointF pointFPropertyValue;
-    QPointF pointFProperty() const {
-       return pointFPropertyValue;
-    }
-    void setPointFProperty(const QPointF &v) {
-        pointFPropertyValue = v;
-    }
-
-    QSize sizePropertyValue;
-    QSize sizeProperty() const {
-       return sizePropertyValue;
-    }
-    void setSizeProperty(const QSize &v) {
-        sizePropertyValue = v;
-    }
-
-    QSizeF sizeFPropertyValue;
-    QSizeF sizeFProperty() const {
-       return sizeFPropertyValue;
-    }
-    void setSizeFProperty(const QSizeF &v) {
-        sizeFPropertyValue = v;
-    }
-
-    QRect rectPropertyValue;
-    QRect rectProperty() const {
-       return rectPropertyValue;
-    }
-    void setRectProperty(const QRect &v) {
-        rectPropertyValue = v;
-        emit rectPropertyChanged();
-    }
-
-    QRect rectPropertyValue2;
-    QRect rectProperty2() const {
-       return rectPropertyValue2;
-    }
-    void setRectProperty2(const QRect &v) {
-        rectPropertyValue2 = v;
-    }
-
-    QRectF rectFPropertyValue;
-    QRectF rectFProperty() const {
-       return rectFPropertyValue;
-    }
-    void setRectFProperty(const QRectF &v) {
-        rectFPropertyValue = v;
-    }
-
-    bool boolPropertyValue;
-    bool boolProperty() const {
-       return boolPropertyValue;
-    }
-    void setBoolProperty(const bool &v) {
-        boolPropertyValue = v;
-    }
-
-    QVariant variantPropertyValue;
-    QVariant variantProperty() const {
-       return variantPropertyValue;
-    }
-    void setVariantProperty(const QVariant &v) {
-        variantPropertyValue = v;
-    }
-
-    QVector3D vectorPropertyValue;
-    QVector3D vectorProperty() const {
-        return vectorPropertyValue;
-    }
-    void setVectorProperty(const QVector3D &v) {
-        vectorPropertyValue = v;
-    }
-
-    QUrl urlPropertyValue;
-    QUrl urlProperty() const {
-        return urlPropertyValue;
-    }
-    void setUrlProperty(const QUrl &v) {
-        urlPropertyValue = v;
-    }
-
-    QmlScriptString scriptPropertyValue;
-    QmlScriptString scriptProperty() const {
-        return scriptPropertyValue;
-    }
-    void setScriptProperty(const QmlScriptString &v) {
-        scriptPropertyValue = v;
-    }
-
-    void doAction() { emit action(); }
-signals:
-    void action();
-    void rectPropertyChanged();
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(MyTypeObject::MyFlags)
-QML_DECLARE_TYPE(MyTypeObject);
-
-Q_DECLARE_METATYPE(QScriptValue);
-class MyInvokableObject : public QObject
-{
-    Q_OBJECT
-public:
-    MyInvokableObject() { reset(); }
-
-    int invoked() const { return m_invoked; }
-    bool error() const { return m_invokedError; }
-    const QVariantList &actuals() const { return m_actuals; }
-    void reset() { m_invoked = -1; m_invokedError = false; m_actuals.clear(); }
-
-    Q_INVOKABLE QPointF method_get_QPointF() { return QPointF(99.3, -10.2); }
-    Q_INVOKABLE QPoint method_get_QPoint() { return QPoint(9, 12); }
-
-    Q_INVOKABLE void method_NoArgs() { invoke(0); }
-    Q_INVOKABLE int method_NoArgs_int() { invoke(1); return 6; }
-    Q_INVOKABLE qreal method_NoArgs_real() { invoke(2); return 19.7; }
-    Q_INVOKABLE QPointF method_NoArgs_QPointF() { invoke(3); return QPointF(123, 4.5); }
-    Q_INVOKABLE QObject *method_NoArgs_QObject() { invoke(4); return this; }
-    Q_INVOKABLE MyInvokableObject *method_NoArgs_unknown() { invoke(5); return this; }
-    Q_INVOKABLE QScriptValue method_NoArgs_QScriptValue() { invoke(6); return QScriptValue("Hello world"); }
-    Q_INVOKABLE QVariant method_NoArgs_QVariant() { invoke(7); return QVariant("QML rocks"); }
-
-    Q_INVOKABLE void method_int(int a) { invoke(8); m_actuals << a; }
-    Q_INVOKABLE void method_intint(int a, int b) { invoke(9); m_actuals << a << b; }
-    Q_INVOKABLE void method_real(qreal a) { invoke(10); m_actuals << a; }
-    Q_INVOKABLE void method_QString(QString a) { invoke(11); m_actuals << a; }
-    Q_INVOKABLE void method_QPointF(QPointF a) { invoke(12); m_actuals << a; }
-    Q_INVOKABLE void method_QObject(QObject *a) { invoke(13); m_actuals << qVariantFromValue(a); }
-    Q_INVOKABLE void method_QScriptValue(QScriptValue a) { invoke(14); m_actuals << qVariantFromValue(a); }
-    Q_INVOKABLE void method_intQScriptValue(int a, QScriptValue b) { invoke(15); m_actuals << a << qVariantFromValue(b); }
-    
-    Q_INVOKABLE void method_overload(int a) { invoke(16); m_actuals << a; }
-    Q_INVOKABLE void method_overload(int a, int b) { invoke(17); m_actuals << a << b; }
-
-private:
-    void invoke(int idx) { if (m_invoked != -1) m_invokedError = true; m_invoked = idx;}
-    int m_invoked;
-    bool m_invokedError;
-    QVariantList m_actuals;
-};
-
-void registerTypes();
-
-#endif // TESTTYPES_H
-
diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
deleted file mode 100644
index 88f06ad..0000000
--- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
+++ /dev/null
@@ -1,1662 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlexpression.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qdebug.h>
-#include <QtDeclarative/private/qmlguard_p.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qnumeric.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlglobalscriptclass_p.h>
-#include "testtypes.h"
-
-/*
-This test covers evaluation of ECMAScript expressions and bindings from within
-QML.  This does not include static QML language issues.
-
-Static QML language issues are covered in qmllanguage
-*/
-inline QUrl TEST_FILE(const QString &filename)
-{
-    QFileInfo fileInfo(__FILE__);
-    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename));
-}
-
-inline QUrl TEST_FILE(const char *filename)
-{
-    return TEST_FILE(QLatin1String(filename));
-}
-
-class tst_qmlecmascript : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlecmascript() {}
-
-private slots:
-    void initTestCase();
-    void assignBasicTypes();
-    void idShortcutInvalidates();
-    void boolPropertiesEvaluateAsBool();
-    void methods();
-    void signalAssignment();
-    void bindingLoop();
-    void basicExpressions();
-    void basicExpressions_data();
-    void arrayExpressions();
-    void contextPropertiesTriggerReeval();
-    void objectPropertiesTriggerReeval();
-    void deferredProperties();
-    void extensionObjects();
-    void attachedProperties();
-    void enums();
-    void valueTypeFunctions();
-    void constantsOverrideBindings();
-    void outerBindingOverridesInnerBinding();
-    void aliasPropertyAndBinding();
-    void nonExistantAttachedObject();
-    void scope();
-    void signalParameterTypes();
-    void objectsCompareAsEqual();
-    void scriptAccess();
-    void dynamicCreation_data();
-    void dynamicCreation();
-    void dynamicDestruction();
-    void objectToString();
-    void selfDeletingBinding();
-    void extendedObjectPropertyLookup();
-    void scriptErrors();
-    void signalTriggeredBindings();
-    void listProperties();
-    void exceptionClearsOnReeval();
-    void exceptionSlotProducesWarning();
-    void exceptionBindingProducesWarning();
-    void transientErrors();
-    void shutdownErrors();
-    void externalScript();
-    void compositePropertyType();
-    void jsObject();
-    void undefinedResetsProperty();
-    void listToVariant();
-    void multiEngineObject();
-    void deletedObject();
-
-    void bug1();
-
-    void callQtInvokables();
-private:
-    QmlEngine engine;
-};
-
-void tst_qmlecmascript::initTestCase() { registerTypes(); }
-
-void tst_qmlecmascript::assignBasicTypes()
-{
-    {
-    QmlComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3);
-    QCOMPARE(object->enumProperty(), MyTypeObject::EnumVal2);
-    QCOMPARE(object->stringProperty(), QString("Hello World!"));
-    QCOMPARE(object->uintProperty(), uint(10));
-    QCOMPARE(object->intProperty(), -19);
-    QCOMPARE((float)object->realProperty(), float(23.2));
-    QCOMPARE((float)object->doubleProperty(), float(-19.7));
-    QCOMPARE((float)object->floatProperty(), float(8.5));
-    QCOMPARE(object->colorProperty(), QColor("red"));
-    QCOMPARE(object->dateProperty(), QDate(1982, 11, 25));
-    QCOMPARE(object->timeProperty(), QTime(11, 11, 32));
-    QCOMPARE(object->dateTimeProperty(), QDateTime(QDate(2009, 5, 12), QTime(13, 22, 1)));
-    QCOMPARE(object->pointProperty(), QPoint(99,13));
-    QCOMPARE(object->pointFProperty(), QPointF(-10.1, 12.3));
-    QCOMPARE(object->sizeProperty(), QSize(99, 13));
-    QCOMPARE(object->sizeFProperty(), QSizeF(0.1, 0.2));
-    QCOMPARE(object->rectProperty(), QRect(9, 7, 100, 200));
-    QCOMPARE(object->rectFProperty(), QRectF(1000.1, -10.9, 400, 90.99));
-    QCOMPARE(object->boolProperty(), true);
-    QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
-    QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2));
-    QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml")));
-    delete object;
-    }
-    {
-    QmlComponent component(&engine, TEST_FILE("assignBasicTypes.2.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3);
-    QCOMPARE(object->enumProperty(), MyTypeObject::EnumVal2);
-    QCOMPARE(object->stringProperty(), QString("Hello World!"));
-    QCOMPARE(object->uintProperty(), uint(10));
-    QCOMPARE(object->intProperty(), -19);
-    QCOMPARE((float)object->realProperty(), float(23.2));
-    QCOMPARE((float)object->doubleProperty(), float(-19.7));
-    QCOMPARE((float)object->floatProperty(), float(8.5));
-    QCOMPARE(object->colorProperty(), QColor("red"));
-    QCOMPARE(object->dateProperty(), QDate(1982, 11, 25));
-    QCOMPARE(object->timeProperty(), QTime(11, 11, 32));
-    QCOMPARE(object->dateTimeProperty(), QDateTime(QDate(2009, 5, 12), QTime(13, 22, 1)));
-    QCOMPARE(object->pointProperty(), QPoint(99,13));
-    QCOMPARE(object->pointFProperty(), QPointF(-10.1, 12.3));
-    QCOMPARE(object->sizeProperty(), QSize(99, 13));
-    QCOMPARE(object->sizeFProperty(), QSizeF(0.1, 0.2));
-    QCOMPARE(object->rectProperty(), QRect(9, 7, 100, 200));
-    QCOMPARE(object->rectFProperty(), QRectF(1000.1, -10.9, 400, 90.99));
-    QCOMPARE(object->boolProperty(), true);
-    QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
-    QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2));
-    QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml")));
-    delete object;
-    }
-}
-
-void tst_qmlecmascript::idShortcutInvalidates()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-        QVERIFY(object->objectProperty() != 0);
-        delete object->objectProperty();
-        QVERIFY(object->objectProperty() == 0);
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.1.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-        QVERIFY(object->objectProperty() != 0);
-        delete object->objectProperty();
-        QVERIFY(object->objectProperty() == 0);
-    }
-}
-
-void tst_qmlecmascript::boolPropertiesEvaluateAsBool()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-        QCOMPARE(object->stringProperty(), QLatin1String("pass"));
-    }
-    {
-        QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.2.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-        QCOMPARE(object->stringProperty(), QLatin1String("pass"));
-    }
-}
-
-void tst_qmlecmascript::signalAssignment()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("signalAssignment.1.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-        QCOMPARE(object->string(), QString());
-        emit object->basicSignal();
-        QCOMPARE(object->string(), QString("pass"));
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("signalAssignment.2.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-        QCOMPARE(object->string(), QString());
-        emit object->argumentSignal(19, "Hello world!", 10.3);
-        QCOMPARE(object->string(), QString("pass 19 Hello world! 10.3"));
-    }
-}
-
-void tst_qmlecmascript::methods()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("methods.1.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-        QCOMPARE(object->methodCalled(), false);
-        QCOMPARE(object->methodIntCalled(), false);
-        emit object->basicSignal();
-        QCOMPARE(object->methodCalled(), true);
-        QCOMPARE(object->methodIntCalled(), false);
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("methods.2.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-        QCOMPARE(object->methodCalled(), false);
-        QCOMPARE(object->methodIntCalled(), false);
-        emit object->basicSignal();
-        QCOMPARE(object->methodCalled(), false);
-        QCOMPARE(object->methodIntCalled(), true);
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("methods.3.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-        QCOMPARE(object->property("test").toInt(), 19);
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("methods.4.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-        QCOMPARE(object->property("test").toInt(), 19);
-        QCOMPARE(object->property("test2").toInt(), 17);
-        QCOMPARE(object->property("test3").toInt(), 16);
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("methods.5.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-        QCOMPARE(object->property("test").toInt(), 9);
-    }
-}
-
-void tst_qmlecmascript::bindingLoop()
-{
-    QmlComponent component(&engine, TEST_FILE("bindingLoop.qml"));
-    QString warning = "QML MyQmlObject (" + component.url().toString() + ":9:9) Binding loop detected for property \"stringProperty\"";
-    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-}
-
-void tst_qmlecmascript::basicExpressions_data()
-{
-    QTest::addColumn<QString>("expression");
-    QTest::addColumn<QVariant>("result");
-    QTest::addColumn<bool>("nest");
-
-    QTest::newRow("Syntax error (self test)") << "{console.log({'a':1'}.a)}" << QVariant() << false;
-    QTest::newRow("Context property") << "a" << QVariant(1944) << false;
-    QTest::newRow("Context property") << "a" << QVariant(1944) << true;
-    QTest::newRow("Context property expression") << "a * 2" << QVariant(3888) << false;
-    QTest::newRow("Context property expression") << "a * 2" << QVariant(3888) << true;
-    QTest::newRow("Overridden context property") << "b" << QVariant("Milk") << false;
-    QTest::newRow("Overridden context property") << "b" << QVariant("Cow") << true;
-    QTest::newRow("Object property") << "object.stringProperty" << QVariant("Object1") << false;
-    QTest::newRow("Object property") << "object.stringProperty" << QVariant("Object1") << true;
-    QTest::newRow("Overridden object property") << "objectOverride.stringProperty" << QVariant("Object2") << false;
-    QTest::newRow("Overridden object property") << "objectOverride.stringProperty" << QVariant("Object3") << true;
-    QTest::newRow("Default object property") << "horseLegs" << QVariant(4) << false;
-    QTest::newRow("Default object property") << "antLegs" << QVariant(6) << false;
-    QTest::newRow("Default object property") << "emuLegs" << QVariant(2) << false;
-    QTest::newRow("Nested default object property") << "horseLegs" << QVariant(4) << true;
-    QTest::newRow("Nested default object property") << "antLegs" << QVariant(7) << true;
-    QTest::newRow("Nested default object property") << "emuLegs" << QVariant(2) << true;
-    QTest::newRow("Nested default object property") << "humanLegs" << QVariant(2) << true;
-    QTest::newRow("Context property override default object property") << "millipedeLegs" << QVariant(100) << true;
-}
-
-void tst_qmlecmascript::basicExpressions()
-{
-    QFETCH(QString, expression);
-    QFETCH(QVariant, result);
-    QFETCH(bool, nest);
-
-    MyQmlObject object1;
-    MyQmlObject object2;
-    MyQmlObject object3;
-    MyDefaultObject1 default1;
-    MyDefaultObject2 default2;
-    MyDefaultObject3 default3;
-    object1.setStringProperty("Object1");
-    object2.setStringProperty("Object2");
-    object3.setStringProperty("Object3");
-
-    QmlContext context(engine.rootContext());
-    QmlContext nestedContext(&context);
-
-    context.addDefaultObject(&default1);
-    context.addDefaultObject(&default2);
-    context.setContextProperty("a", QVariant(1944));
-    context.setContextProperty("b", QVariant("Milk"));
-    context.setContextProperty("object", &object1);
-    context.setContextProperty("objectOverride", &object2);
-    nestedContext.addDefaultObject(&default3);
-    nestedContext.setContextProperty("b", QVariant("Cow"));
-    nestedContext.setContextProperty("objectOverride", &object3);
-    nestedContext.setContextProperty("millipedeLegs", QVariant(100));
-
-    MyExpression expr(nest?&nestedContext:&context, expression);
-    QCOMPARE(expr.value(), result);
-}
-
-void tst_qmlecmascript::arrayExpressions()
-{
-    QObject obj1;
-    QObject obj2;
-    QObject obj3;
-
-    QmlContext context(engine.rootContext());
-    context.setContextProperty("a", &obj1);
-    context.setContextProperty("b", &obj2);
-    context.setContextProperty("c", &obj3);
-
-    MyExpression expr(&context, "[a, b, c, 10]");
-    QVariant result = expr.value();
-    QCOMPARE(result.userType(), qMetaTypeId<QList<QObject *> >());
-    QList<QObject *> list = qvariant_cast<QList<QObject *> >(result);
-    QCOMPARE(list.count(), 4);
-    QCOMPARE(list.at(0), &obj1);
-    QCOMPARE(list.at(1), &obj2);
-    QCOMPARE(list.at(2), &obj3);
-    QCOMPARE(list.at(3), (QObject *)0);
-}
-
-// Tests that modifying a context property will reevaluate expressions
-void tst_qmlecmascript::contextPropertiesTriggerReeval()
-{
-    QmlContext context(engine.rootContext());
-    MyQmlObject object1;
-    MyQmlObject object2;
-    MyQmlObject *object3 = new MyQmlObject;
-
-    object1.setStringProperty("Hello");
-    object2.setStringProperty("World");
-
-    context.setContextProperty("testProp", QVariant(1));
-    context.setContextProperty("testObj", &object1);
-    context.setContextProperty("testObj2", object3);
-
-    { 
-        MyExpression expr(&context, "testProp + 1");
-        QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant(2));
-
-        context.setContextProperty("testProp", QVariant(2));
-        QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant(3));
-    }
-
-    { 
-        MyExpression expr(&context, "testProp + testProp + testProp");
-        QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant(6));
-
-        context.setContextProperty("testProp", QVariant(4));
-        QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant(12));
-    }
-
-    { 
-        MyExpression expr(&context, "testObj.stringProperty");
-        QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant("Hello"));
-
-        context.setContextProperty("testObj", &object2);
-        QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant("World"));
-    }
-
-    { 
-        MyExpression expr(&context, "testObj.stringProperty /**/");
-        QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant("World"));
-
-        context.setContextProperty("testObj", &object1);
-        QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant("Hello"));
-    }
-
-    { 
-        MyExpression expr(&context, "testObj2");
-        QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant::fromValue((QObject *)object3));
-    }
-
-}
-
-void tst_qmlecmascript::objectPropertiesTriggerReeval()
-{
-    QmlContext context(engine.rootContext());
-    MyQmlObject object1;
-    MyQmlObject object2;
-    MyQmlObject object3;
-    context.setContextProperty("testObj", &object1);
-
-    object1.setStringProperty(QLatin1String("Hello"));
-    object2.setStringProperty(QLatin1String("Dog"));
-    object3.setStringProperty(QLatin1String("Cat"));
-
-    { 
-        MyExpression expr(&context, "testObj.stringProperty");
-        QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant("Hello"));
-
-        object1.setStringProperty(QLatin1String("World"));
-        QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant("World"));
-    }
-
-    { 
-        MyExpression expr(&context, "testObj.objectProperty.stringProperty");
-        QCOMPARE(expr.changed, false);
-        QCOMPARE(expr.value(), QVariant());
-
-        object1.setObjectProperty(&object2);
-        QCOMPARE(expr.changed, true);
-        expr.changed = false;
-        QCOMPARE(expr.value(), QVariant("Dog"));
-
-        object1.setObjectProperty(&object3);
-        QCOMPARE(expr.changed, true);
-        expr.changed = false;
-        QCOMPARE(expr.value(), QVariant("Cat"));
-
-        object1.setObjectProperty(0);
-        QCOMPARE(expr.changed, true);
-        expr.changed = false;
-        QCOMPARE(expr.value(), QVariant());
-
-        object1.setObjectProperty(&object3);
-        QCOMPARE(expr.changed, true);
-        expr.changed = false;
-        QCOMPARE(expr.value(), QVariant("Cat"));
-
-        object3.setStringProperty("Donkey");
-        QCOMPARE(expr.changed, true);
-        expr.changed = false;
-        QCOMPARE(expr.value(), QVariant("Donkey"));
-    }
-}
-
-void tst_qmlecmascript::deferredProperties()
-{
-    QmlComponent component(&engine, TEST_FILE("deferredProperties.qml"));
-    MyDeferredObject *object = 
-        qobject_cast<MyDeferredObject *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->value(), 0);
-    QVERIFY(object->objectProperty() == 0);
-    QVERIFY(object->objectProperty2() != 0);
-    qmlExecuteDeferred(object);
-    QCOMPARE(object->value(), 10);
-    QVERIFY(object->objectProperty() != 0);
-    MyQmlObject *qmlObject = 
-        qobject_cast<MyQmlObject *>(object->objectProperty());
-    QVERIFY(qmlObject != 0);
-    QCOMPARE(qmlObject->value(), 10);
-    object->setValue(19);
-    QCOMPARE(qmlObject->value(), 19);
-}
-
-void tst_qmlecmascript::extensionObjects()
-{
-    QmlComponent component(&engine, TEST_FILE("extensionObjects.qml"));
-    MyExtendedObject *object = 
-        qobject_cast<MyExtendedObject *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->baseProperty(), 13);
-    QCOMPARE(object->coreProperty(), 9);
-
-    object->setProperty("extendedProperty", QVariant(11));
-    object->setProperty("baseExtendedProperty", QVariant(92));
-    QCOMPARE(object->coreProperty(), 11);
-    QCOMPARE(object->baseProperty(), 92);
-}
-
-void tst_qmlecmascript::attachedProperties()
-{
-    QmlComponent component(&engine, TEST_FILE("attachedProperty.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    QCOMPARE(object->property("a").toInt(), 19);
-    QCOMPARE(object->property("b").toInt(), 19);
-    QCOMPARE(object->property("c").toInt(), 19);
-    QCOMPARE(object->property("d").toInt(), 19);
-
-    // ### Need to test attached property assignment
-}
-
-void tst_qmlecmascript::enums()
-{
-    // Existant enums
-    {
-    QmlComponent component(&engine, TEST_FILE("enums.1.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("a").toInt(), 0);
-    QCOMPARE(object->property("b").toInt(), 1);
-    QCOMPARE(object->property("c").toInt(), 2);
-    QCOMPARE(object->property("d").toInt(), 3);
-    QCOMPARE(object->property("e").toInt(), 0);
-    QCOMPARE(object->property("f").toInt(), 1);
-    QCOMPARE(object->property("g").toInt(), 2);
-    QCOMPARE(object->property("h").toInt(), 3);
-    QCOMPARE(object->property("i").toInt(), 19);
-    QCOMPARE(object->property("j").toInt(), 19);
-    }
-    // Non-existent enums
-    {
-    QmlComponent component(&engine, TEST_FILE("enums.2.qml"));
-
-    QString warning1 = component.url().toString() + ":5: Unable to assign [undefined] to int";
-    QString warning2 = component.url().toString() + ":6: Unable to assign [undefined] to int";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    QCOMPARE(object->property("a").toInt(), 0);
-    QCOMPARE(object->property("b").toInt(), 0);
-    }
-}
-
-void tst_qmlecmascript::valueTypeFunctions()
-{
-    QmlComponent component(&engine, TEST_FILE("valueTypeFunctions.qml"));
-    MyTypeObject *obj = qobject_cast<MyTypeObject*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->rectProperty(), QRect(0,0,100,100));
-    QCOMPARE(obj->rectFProperty(), QRectF(0,0.5,100,99.5));
-}
-
-/* 
-Tests that writing a constant to a property with a binding on it disables the
-binding.
-*/
-void tst_qmlecmascript::constantsOverrideBindings()
-{
-    // From ECMAScript
-    {
-        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.1.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("c2").toInt(), 0);
-        object->setProperty("c1", QVariant(9));
-        QCOMPARE(object->property("c2").toInt(), 9);
-
-        emit object->basicSignal();
-
-        QCOMPARE(object->property("c2").toInt(), 13);
-        object->setProperty("c1", QVariant(8));
-        QCOMPARE(object->property("c2").toInt(), 13);
-    }
-
-    // During construction
-    {
-        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.2.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("c1").toInt(), 0);
-        QCOMPARE(object->property("c2").toInt(), 10);
-        object->setProperty("c1", QVariant(9));
-        QCOMPARE(object->property("c1").toInt(), 9);
-        QCOMPARE(object->property("c2").toInt(), 10);
-    }
-
-#if 0
-    // From C++
-    {
-        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.3.qml"));
-        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("c2").toInt(), 0);
-        object->setProperty("c1", QVariant(9));
-        QCOMPARE(object->property("c2").toInt(), 9);
-
-        object->setProperty("c2", QVariant(13));
-        QCOMPARE(object->property("c2").toInt(), 13);
-        object->setProperty("c1", QVariant(7));
-        QCOMPARE(object->property("c1").toInt(), 7);
-        QCOMPARE(object->property("c2").toInt(), 13);
-    }
-#endif
-}
-
-/*
-Tests that assigning a binding to a property that already has a binding causes
-the original binding to be disabled.
-*/
-void tst_qmlecmascript::outerBindingOverridesInnerBinding()
-{
-    QmlComponent component(&engine, 
-                           TEST_FILE("outerBindingOverridesInnerBinding.qml"));
-    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("c1").toInt(), 0);
-    QCOMPARE(object->property("c2").toInt(), 0);
-    QCOMPARE(object->property("c3").toInt(), 0);
-
-    object->setProperty("c1", QVariant(9));
-    QCOMPARE(object->property("c1").toInt(), 9);
-    QCOMPARE(object->property("c2").toInt(), 0);
-    QCOMPARE(object->property("c3").toInt(), 0);
-
-    object->setProperty("c3", QVariant(8));
-    QCOMPARE(object->property("c1").toInt(), 9);
-    QCOMPARE(object->property("c2").toInt(), 8);
-    QCOMPARE(object->property("c3").toInt(), 8);
-}
-
-/*
-Access a non-existent attached object.  
-
-Tests for a regression where this used to crash.
-*/
-void tst_qmlecmascript::nonExistantAttachedObject()
-{
-    QmlComponent component(&engine, TEST_FILE("nonExistantAttachedObject.qml"));
-
-    QString warning = component.url().toString() + ":4: Unable to assign [undefined] to QString";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-}
-
-void tst_qmlecmascript::scope()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("scope.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("test1").toInt(), 1);
-        QCOMPARE(object->property("test2").toInt(), 2);
-        QCOMPARE(object->property("test3").toString(), QString("1Test"));
-        QCOMPARE(object->property("test4").toString(), QString("2Test"));
-        QCOMPARE(object->property("test5").toInt(), 1);
-        QCOMPARE(object->property("test6").toInt(), 1);
-        QCOMPARE(object->property("test7").toInt(), 2);
-        QCOMPARE(object->property("test8").toInt(), 2);
-        QCOMPARE(object->property("test9").toInt(), 1);
-        QCOMPARE(object->property("test10").toInt(), 3);
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("scope.2.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("test1").toInt(), 19);
-        QCOMPARE(object->property("test2").toInt(), 19);
-        QCOMPARE(object->property("test3").toInt(), 11);
-        QCOMPARE(object->property("test4").toInt(), 11);
-        QCOMPARE(object->property("test5").toInt(), 24);
-        QCOMPARE(object->property("test6").toInt(), 24);
-    }
-}
-
-/*
-Tests that "any" type passes through a synthesized signal parameter.  This
-is essentially a test of QmlMetaType::copy()
-*/
-void tst_qmlecmascript::signalParameterTypes()
-{
-    QmlComponent component(&engine, TEST_FILE("signalParameterTypes.qml"));
-    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-    QVERIFY(object != 0);
-
-    emit object->basicSignal();
-
-    QCOMPARE(object->property("intProperty").toInt(), 10);
-    QCOMPARE(object->property("realProperty").toReal(), 19.2);
-    QVERIFY(object->property("colorProperty").value<QColor>() == QColor(255, 255, 0, 255));
-    QVERIFY(object->property("variantProperty") == QVariant::fromValue(QColor(255, 0, 255, 255)));
-}
-
-/*
-Test that two JS objects for the same QObject compare as equal.
-*/
-void tst_qmlecmascript::objectsCompareAsEqual()
-{
-    QmlComponent component(&engine, TEST_FILE("objectsCompareAsEqual.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test1").toBool(), true);
-    QCOMPARE(object->property("test2").toBool(), true);
-    QCOMPARE(object->property("test3").toBool(), true);
-    QCOMPARE(object->property("test4").toBool(), true);
-    QCOMPARE(object->property("test5").toBool(), true);
-}
-
-/*
-Confirm bindings and alias properties can coexist.
-
-Tests for a regression where the binding would not reevaluate.
-*/
-void tst_qmlecmascript::aliasPropertyAndBinding()
-{
-    QmlComponent component(&engine, TEST_FILE("aliasPropertyAndBinding.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("c2").toInt(), 3);
-    QCOMPARE(object->property("c3").toInt(), 3);
-
-    object->setProperty("c2", QVariant(19));
-
-    QCOMPARE(object->property("c2").toInt(), 19);
-    QCOMPARE(object->property("c3").toInt(), 19);
-}
-
-/*
-Tests that only methods of Script {} blocks are exposed.
-*/
-void tst_qmlecmascript::scriptAccess()
-{
-    QmlComponent component(&engine, TEST_FILE("scriptAccess.qml"));
-
-    QString warning = component.url().toString() + ":16: Unable to assign [undefined] to int";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test1").toInt(), 10);
-    QCOMPARE(object->property("test2").toInt(), 19);
-    QCOMPARE(object->property("test3").toInt(), 0);
-}
-
-void tst_qmlecmascript::dynamicCreation_data()
-{
-    QTest::addColumn<QString>("method");
-    QTest::addColumn<QString>("createdName");
-
-    QTest::newRow("One") << "createOne" << "objectOne";
-    QTest::newRow("Two") << "createTwo" << "objectTwo";
-    QTest::newRow("Three") << "createThree" << "objectThree";
-}
-
-/*
-Test using createQmlObject to dynamically generate an item
-Also using createComponent is tested.
-*/
-void tst_qmlecmascript::dynamicCreation()
-{
-    QFETCH(QString, method);
-    QFETCH(QString, createdName);
-
-    QmlComponent component(&engine, TEST_FILE("dynamicCreation.qml"));
-    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-
-    QMetaObject::invokeMethod(object, method.toUtf8());
-    QObject *created = object->objectProperty();
-    QVERIFY(created);
-    QCOMPARE(created->objectName(), createdName);
-}
-
-/*
-   Tests the destroy function
-*/
-void tst_qmlecmascript::dynamicDestruction()
-{
-    QmlComponent component(&engine, TEST_FILE("dynamicDeletion.qml"));
-    QmlGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-    QmlGuard<QObject> createdQmlObject = 0;
-
-    QMetaObject::invokeMethod(object, "create");
-    createdQmlObject = object->objectProperty();
-    QVERIFY(createdQmlObject);
-    QCOMPARE(createdQmlObject->objectName(), QString("emptyObject"));
-
-    QMetaObject::invokeMethod(object, "killOther");
-    QVERIFY(createdQmlObject);
-    QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion);
-    QVERIFY(createdQmlObject);
-    for (int ii = 0; createdQmlObject && ii < 50; ++ii) { // After 5 seconds we should give up
-        if (createdQmlObject) {
-            QTest::qWait(100);
-            QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion);
-        }
-    }
-    QVERIFY(!createdQmlObject);
-
-    QMetaObject::invokeMethod(object, "killMe");
-    QVERIFY(object);
-    QTest::qWait(0);
-    QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion);
-    QVERIFY(!object);
-}
-
-/*
-   tests that id.toString() works
-*/
-void tst_qmlecmascript::objectToString()
-{
-    QmlComponent component(&engine, TEST_FILE("qmlToString.qml"));
-    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-    QMetaObject::invokeMethod(object, "testToString");
-    QVERIFY(object->stringProperty().startsWith("MyQmlObject_QML_"));
-    QVERIFY(object->stringProperty().endsWith(", \"objName\")"));
-}
-
-/*
-Tests bindings that indirectly cause their own deletion work.
-
-This test is best run under valgrind to ensure no invalid memory access occur.
-*/
-void tst_qmlecmascript::selfDeletingBinding()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("selfDeletingBinding.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-        object->setProperty("triggerDelete", true);
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("selfDeletingBinding.2.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-        object->setProperty("triggerDelete", true);
-    }
-}
-
-/*
-Test that extended object properties can be accessed.
-
-This test a regression where this used to crash.  The issue was specificially
-for extended objects that did not include a synthesized meta object (so non-root
-and no synthesiszed properties).
-*/
-void tst_qmlecmascript::extendedObjectPropertyLookup()
-{
-    QmlComponent component(&engine, TEST_FILE("extendedObjectPropertyLookup.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-}
-
-/*
-Test file/lineNumbers for binding/Script errors.
-*/
-void tst_qmlecmascript::scriptErrors()
-{
-    QmlComponent component(&engine, TEST_FILE("scriptErrors.qml"));
-    QString url = component.url().toString();
-
-    QString warning1 = url.left(url.length() - 3) + "js:2: Error: Invalid write to global property \"a\"";
-    QString warning2 = url + ":7: TypeError: Result of expression 'a' [undefined] is not an object.";
-    QString warning3 = url + ":5: Error: Invalid write to global property \"a\"";
-    QString warning4 = url + ":12: TypeError: Result of expression 'a' [undefined] is not an object.";
-    QString warning5 = url + ":10: TypeError: Result of expression 'a' [undefined] is not an object.";
-    QString warning6 = url + ":9: Unable to assign [undefined] to int";
-    QString warning7 = url + ":14: Error: Cannot assign to read-only property \"trueProperty\"";
-    QString warning8 = url + ":15: Error: Cannot assign to non-existent property \"fakeProperty\"";
-
-    QTest::ignoreMessage(QtWarningMsg, warning1.toLatin1().constData());
-    QTest::ignoreMessage(QtWarningMsg, warning2.toLatin1().constData());
-    QTest::ignoreMessage(QtWarningMsg, warning3.toLatin1().constData());
-    QTest::ignoreMessage(QtWarningMsg, warning5.toLatin1().constData());
-    QTest::ignoreMessage(QtWarningMsg, warning6.toLatin1().constData());
-    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QTest::ignoreMessage(QtWarningMsg, warning4.toLatin1().constData());
-    emit object->basicSignal();
-
-    QTest::ignoreMessage(QtWarningMsg, warning7.toLatin1().constData());
-    emit object->anotherBasicSignal();
-
-    QTest::ignoreMessage(QtWarningMsg, warning8.toLatin1().constData());
-    emit object->thirdBasicSignal();
-}
-
-/*
-Test bindings still work when the reeval is triggered from within
-a signal script.
-*/
-void tst_qmlecmascript::signalTriggeredBindings()
-{
-    QmlComponent component(&engine, TEST_FILE("signalTriggeredBindings.qml"));
-    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("base").toReal(), 50.);
-    QCOMPARE(object->property("test1").toReal(), 50.);
-    QCOMPARE(object->property("test2").toReal(), 50.);
-
-    object->basicSignal();
-
-    QCOMPARE(object->property("base").toReal(), 200.);
-    QCOMPARE(object->property("test1").toReal(), 200.);
-    QCOMPARE(object->property("test2").toReal(), 200.);
-
-    object->argumentSignal(10, QString(), 10);
-
-    QCOMPARE(object->property("base").toReal(), 400.);
-    QCOMPARE(object->property("test1").toReal(), 400.);
-    QCOMPARE(object->property("test2").toReal(), 400.);
-}
-
-/*
-Test that list properties can be iterated from ECMAScript
-*/
-void tst_qmlecmascript::listProperties()
-{
-    QmlComponent component(&engine, TEST_FILE("listProperties.qml"));
-    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test1").toInt(), 21);
-    QCOMPARE(object->property("test2").toInt(), 2);
-    QCOMPARE(object->property("test3").toBool(), true);
-    QCOMPARE(object->property("test4").toBool(), true);
-}
-
-void tst_qmlecmascript::exceptionClearsOnReeval()
-{
-    QmlComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml"));
-    QString url = component.url().toString();
-
-    QString warning = url + ":4: TypeError: Result of expression 'objectProperty.objectProperty' [undefined] is not an object.";
-
-    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
-    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toBool(), false);
-
-    MyQmlObject object2;
-    MyQmlObject object3;
-    object2.setObjectProperty(&object3);
-    object->setObjectProperty(&object2);
-
-    QCOMPARE(object->property("test").toBool(), true);
-}
-
-void tst_qmlecmascript::exceptionSlotProducesWarning()
-{
-    QmlComponent component(&engine, TEST_FILE("exceptionProducesWarning.qml"));
-    QString url = component.url().toString();
-
-    QString warning = component.url().toString() + ":6: Error: JS exception";
-
-    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
-    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-}
-
-void tst_qmlecmascript::exceptionBindingProducesWarning()
-{
-    QmlComponent component(&engine, TEST_FILE("exceptionProducesWarning2.qml"));
-    QString url = component.url().toString();
-
-    QString warning = component.url().toString() + ":5: Error: JS exception";
-
-    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
-    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-}
-
-static int transientErrorsMsgCount = 0;
-static void transientErrorsMsgHandler(QtMsgType, const char *)
-{
-    ++transientErrorsMsgCount;
-}
-
-// Check that transient binding errors are not displayed
-void tst_qmlecmascript::transientErrors()
-{
-    QmlComponent component(&engine, TEST_FILE("transientErrors.qml"));
-
-    transientErrorsMsgCount = 0;
-    QtMsgHandler old = qInstallMsgHandler(transientErrorsMsgHandler);
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    qInstallMsgHandler(old);
-
-    QCOMPARE(transientErrorsMsgCount, 0);
-}
-
-// Check that errors during shutdown are minimized
-void tst_qmlecmascript::shutdownErrors()
-{
-    QmlComponent component(&engine, TEST_FILE("shutdownErrors.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    transientErrorsMsgCount = 0;
-    QtMsgHandler old = qInstallMsgHandler(transientErrorsMsgHandler);
-
-    delete object;
-
-    qInstallMsgHandler(old);
-    QCOMPARE(transientErrorsMsgCount, 0);
-}
-
-// Check that Script::source property works as expected
-void tst_qmlecmascript::externalScript()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("externalScript.1.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("test").toInt(), 92);
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("externalScript.2.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("test").toInt(), 92);
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("externalScript.3.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("test").toInt(), 92);
-        QCOMPARE(object->property("test2").toInt(), 92);
-        QCOMPARE(object->property("test3").toBool(), false);
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("externalScript.4.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("test").toInt(), 92);
-        QCOMPARE(object->property("test2").toBool(), true);
-
-        delete object;
-    }
-}
-
-void tst_qmlecmascript::compositePropertyType()
-{
-    QmlComponent component(&engine, TEST_FILE("compositePropertyType.qml"));
-    QTest::ignoreMessage(QtDebugMsg, "hello world");
-    QObject *object = qobject_cast<QObject *>(component.create());
-    delete object;
-}
-
-// QTBUG-5759
-void tst_qmlecmascript::jsObject()
-{
-    QmlComponent component(&engine, TEST_FILE("jsObject.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toInt(), 92);
-
-    delete object;
-}
-
-void tst_qmlecmascript::undefinedResetsProperty()
-{
-    {
-    QmlComponent component(&engine, TEST_FILE("undefinedResetsProperty.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("resettableProperty").toInt(), 92);
-
-    object->setProperty("setUndefined", true);
-
-    QCOMPARE(object->property("resettableProperty").toInt(), 13);
-
-    object->setProperty("setUndefined", false);
-
-    QCOMPARE(object->property("resettableProperty").toInt(), 92);
-
-    delete object;
-    }
-    {
-    QmlComponent component(&engine, TEST_FILE("undefinedResetsProperty.2.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("resettableProperty").toInt(), 19);
-
-    QMetaObject::invokeMethod(object, "doReset");
-
-    QCOMPARE(object->property("resettableProperty").toInt(), 13);
-
-    delete object;
-    }
-}
-
-// QTBUG-6781
-void tst_qmlecmascript::bug1()
-{
-    QmlComponent component(&engine, TEST_FILE("bug.1.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toInt(), 14);
-
-    object->setProperty("a", 11);
-
-    QCOMPARE(object->property("test").toInt(), 3);
-
-    object->setProperty("b", true);
-
-    QCOMPARE(object->property("test").toInt(), 9);
-
-    delete object;
-}
-
-void tst_qmlecmascript::callQtInvokables()
-{
-    MyInvokableObject o;
-
-    QmlEngine qmlengine;
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(&qmlengine);
-    QScriptEngine *engine = &ep->scriptEngine;
-    ep->globalClass->explicitSetProperty("object", ep->objectClass->newQObject(&o));
-
-    // Non-existent methods
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_nonexistent()").isError(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), -1);
-    QCOMPARE(o.actuals().count(), 0);
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_nonexistent(10, 11)").isError(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), -1);
-    QCOMPARE(o.actuals().count(), 0);
-
-    // Insufficient arguments
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_int()").isError(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), -1);
-    QCOMPARE(o.actuals().count(), 0);
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_intint(10)").isError(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), -1);
-    QCOMPARE(o.actuals().count(), 0);
-
-    // Excessive arguments
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_int(10, 11)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 8);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(10));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_intint(10, 11, 12)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 9);
-    QCOMPARE(o.actuals().count(), 2);
-    QCOMPARE(o.actuals().at(0), QVariant(10));
-    QCOMPARE(o.actuals().at(1), QVariant(11));
-
-    // Test return types
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_NoArgs()").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 0);
-    QCOMPARE(o.actuals().count(), 0);
-
-    o.reset();
-    QVERIFY(engine->evaluate("object.method_NoArgs_int()").strictlyEquals(QScriptValue(engine, 6)));
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 1);
-    QCOMPARE(o.actuals().count(), 0);
-
-    o.reset();
-    QVERIFY(engine->evaluate("object.method_NoArgs_real()").strictlyEquals(QScriptValue(engine, 19.7)));
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 2);
-    QCOMPARE(o.actuals().count(), 0);
-
-    o.reset();
-    {
-    QScriptValue ret = engine->evaluate("object.method_NoArgs_QPointF()");
-    QVERIFY(ret.isVariant());
-    QCOMPARE(ret.toVariant(), QVariant(QPointF(123, 4.5)));
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 3);
-    QCOMPARE(o.actuals().count(), 0);
-    }
-
-    o.reset();
-    {
-    QScriptValue ret = engine->evaluate("object.method_NoArgs_QObject()");
-    QVERIFY(ret.isQObject());
-    QCOMPARE(ret.toQObject(), (QObject *)&o);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 4);
-    QCOMPARE(o.actuals().count(), 0);
-    }
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_NoArgs_unknown()").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 5);
-    QCOMPARE(o.actuals().count(), 0);
-
-    o.reset();
-    {
-    QScriptValue ret = engine->evaluate("object.method_NoArgs_QScriptValue()");
-    QVERIFY(ret.isString());
-    QCOMPARE(ret.toString(), QString("Hello world"));
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 6);
-    QCOMPARE(o.actuals().count(), 0);
-    }
-
-    o.reset();
-    QVERIFY(engine->evaluate("object.method_NoArgs_QVariant()").strictlyEquals(QScriptValue(engine, "QML rocks")));
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 7);
-    QCOMPARE(o.actuals().count(), 0);
-
-    // Test arg types
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_int(94)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 8);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(94));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_int(\"94\")").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 8);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(94));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_int(\"not a number\")").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 8);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(0));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_int(null)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 8);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(0));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_int(undefined)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 8);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(0));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_int(object)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 8);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(0));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_intint(122, 9)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 9);
-    QCOMPARE(o.actuals().count(), 2);
-    QCOMPARE(o.actuals().at(0), QVariant(122));
-    QCOMPARE(o.actuals().at(1), QVariant(9));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_real(94.3)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 10);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(94.3));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_real(\"94.3\")").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 10);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(94.3));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_real(\"not a number\")").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 10);
-    QCOMPARE(o.actuals().count(), 1);
-    QVERIFY(qIsNaN(o.actuals().at(0).toDouble()));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_real(null)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 10);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(0));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_real(undefined)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 10);
-    QCOMPARE(o.actuals().count(), 1);
-    QVERIFY(qIsNaN(o.actuals().at(0).toDouble()));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_real(object)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 10);
-    QCOMPARE(o.actuals().count(), 1);
-    QVERIFY(qIsNaN(o.actuals().at(0).toDouble()));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QString(\"Hello world\")").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 11);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant("Hello world"));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QString(19)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 11);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant("19"));
-
-    o.reset();
-    {
-    QString expected = "MyInvokableObject(0x" + QString::number((intptr_t)&o, 16) + ")";
-    QCOMPARE(engine->evaluate("object.method_QString(object)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 11);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(expected));
-    }
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QString(null)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 11);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(QString()));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QString(undefined)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 11);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(QString()));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QPointF(0)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 12);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(QPointF()));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QPointF(null)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 12);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(QPointF()));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QPointF(undefined)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 12);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(QPointF()));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QPointF(object)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 12);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(QPointF()));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QPointF(object.method_get_QPointF())").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 12);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(QPointF(99.3, -10.2)));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QPointF(object.method_get_QPoint())").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 12);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), QVariant(QPointF(9, 12)));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QObject(0)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 13);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)0));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QObject(\"Hello world\")").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 13);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)0));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QObject(null)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 13);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)0));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QObject(undefined)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 13);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)0));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QObject(object)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 13);
-    QCOMPARE(o.actuals().count(), 1);
-    QCOMPARE(o.actuals().at(0), qVariantFromValue((QObject *)&o));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QScriptValue(null)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 14);
-    QCOMPARE(o.actuals().count(), 1);
-    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(0)).isNull());
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QScriptValue(undefined)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 14);
-    QCOMPARE(o.actuals().count(), 1);
-    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(0)).isUndefined());
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QScriptValue(19)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 14);
-    QCOMPARE(o.actuals().count(), 1);
-    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(0)).strictlyEquals(QScriptValue(engine, 19)));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_QScriptValue([19, 20])").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 14);
-    QCOMPARE(o.actuals().count(), 1);
-    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(0)).isArray());
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_intQScriptValue(4, null)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 15);
-    QCOMPARE(o.actuals().count(), 2);
-    QCOMPARE(o.actuals().at(0), QVariant(4));
-    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(1)).isNull());
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_intQScriptValue(8, undefined)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 15);
-    QCOMPARE(o.actuals().count(), 2);
-    QCOMPARE(o.actuals().at(0), QVariant(8));
-    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(1)).isUndefined());
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_intQScriptValue(3, 19)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 15);
-    QCOMPARE(o.actuals().count(), 2);
-    QCOMPARE(o.actuals().at(0), QVariant(3));
-    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(1)).strictlyEquals(QScriptValue(engine, 19)));
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_intQScriptValue(44, [19, 20])").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 15);
-    QCOMPARE(o.actuals().count(), 2);
-    QCOMPARE(o.actuals().at(0), QVariant(44));
-    QVERIFY(qvariant_cast<QScriptValue>(o.actuals().at(1)).isArray());
-
-    // Test overloads - QML will always invoke the *last* method
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_overload()").isError(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), -1);
-    QCOMPARE(o.actuals().count(), 0);
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_overload(10)").isError(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), -1);
-    QCOMPARE(o.actuals().count(), 0);
-
-    o.reset();
-    QCOMPARE(engine->evaluate("object.method_overload(10, 11)").isUndefined(), true);
-    QCOMPARE(o.error(), false);
-    QCOMPARE(o.invoked(), 17);
-    QCOMPARE(o.actuals().count(), 2);
-    QCOMPARE(o.actuals().at(0), QVariant(10));
-    QCOMPARE(o.actuals().at(1), QVariant(11));
-}
-
-// QTBUG-5675
-void tst_qmlecmascript::listToVariant()
-{
-    QmlComponent component(&engine, TEST_FILE("listToVariant.qml"));
-
-    MyQmlContainer container;
-
-    QmlContext context(engine.rootContext());
-    context.addDefaultObject(&container);
-
-    QObject *object = component.create(&context);
-    QVERIFY(object != 0);
-
-    QVariant v = object->property("test");
-    QCOMPARE(v.userType(), qMetaTypeId<QmlListReference>());
-    QVERIFY(qvariant_cast<QmlListReference>(v).object() == &container);
-
-    delete object;
-}
-
-// QTBUG-7957
-void tst_qmlecmascript::multiEngineObject()
-{
-    MyQmlObject obj;
-    obj.setStringProperty("Howdy planet");
-
-    QmlEngine e1;
-    e1.rootContext()->setContextProperty("thing", &obj);
-    QmlComponent c1(&e1, TEST_FILE("multiEngineObject.qml"));
-
-    QmlEngine e2;
-    e2.rootContext()->setContextProperty("thing", &obj);
-    QmlComponent c2(&e2, TEST_FILE("multiEngineObject.qml"));
-
-    QObject *o1 = c1.create();
-    QObject *o2 = c2.create();
-
-    QCOMPARE(o1->property("test").toString(), QString("Howdy planet"));
-    QCOMPARE(o2->property("test").toString(), QString("Howdy planet"));
-
-    delete o2;
-    delete o1;
-}
-
-// Test that references to QObjects are cleanup when the object is destroyed
-void tst_qmlecmascript::deletedObject()
-{
-    QmlComponent component(&engine, TEST_FILE("deletedObject.qml"));
-
-    QObject *object = component.create();
-
-    QCOMPARE(object->property("test1").toBool(), true);
-    QCOMPARE(object->property("test2").toBool(), true);
-    QCOMPARE(object->property("test3").toBool(), true);
-    QEXPECT_FAIL("", "QTBUG-8077", Continue);
-    QCOMPARE(object->property("test4").toBool(), true);
-
-    delete object;
-}
-
-QTEST_MAIN(tst_qmlecmascript)
-
-#include "tst_qmlecmascript.moc"
diff --git a/tests/auto/declarative/qmlengine/qmlengine.pro b/tests/auto/declarative/qmlengine/qmlengine.pro
deleted file mode 100644
index 1a0e5f4..0000000
--- a/tests/auto/declarative/qmlengine/qmlengine.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative network
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlengine.cpp 
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlengine/tst_qmlengine.cpp b/tests/auto/declarative/qmlengine/tst_qmlengine.cpp
deleted file mode 100644
index 6504d03..0000000
--- a/tests/auto/declarative/qmlengine/tst_qmlengine.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QmlEngine>
-#include <QmlContext>
-#include <QNetworkAccessManager>
-#include <QPointer>
-#include <QDir>
-#include <QDesktopServices>
-#include <QDebug>
-#include <QmlComponent>
-#include <QmlNetworkAccessManagerFactory>
-
-class tst_qmlengine : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlengine() {}
-
-private slots:
-    void rootContext();
-    void networkAccessManager();
-    void baseUrl();
-    void contextForObject();
-    void offlineStoragePath();
-    void clearComponentCache();
-};
-
-void tst_qmlengine::rootContext()
-{
-    QmlEngine engine;
-
-    QVERIFY(engine.rootContext());
-
-    QCOMPARE(engine.rootContext()->engine(), &engine);
-    QVERIFY(engine.rootContext()->parentContext() == 0);
-}
-
-class NetworkAccessManagerFactory : public QmlNetworkAccessManagerFactory
-{
-public:
-    NetworkAccessManagerFactory() : manager(0) {}
-
-    QNetworkAccessManager *create(QObject *parent) {
-        manager = new QNetworkAccessManager(parent);
-        return manager;
-    }
-
-    QNetworkAccessManager *manager;
-};
-
-void tst_qmlengine::networkAccessManager()
-{
-    QmlEngine *engine = new QmlEngine;
-
-    // Test QmlEngine created manager
-    QPointer<QNetworkAccessManager> manager = engine->networkAccessManager();
-    QVERIFY(manager != 0);
-    delete engine;
-
-    // Test factory created manager
-    engine = new QmlEngine;
-    NetworkAccessManagerFactory factory;
-    engine->setNetworkAccessManagerFactory(&factory);
-    QVERIFY(engine->networkAccessManager() == factory.manager);
-    delete engine;
-}
-
-void tst_qmlengine::baseUrl()
-{
-    QmlEngine engine;
-
-    QUrl cwd = QUrl::fromLocalFile(QDir::currentPath() + QDir::separator());
-
-    QCOMPARE(engine.baseUrl(), cwd);
-    QCOMPARE(engine.rootContext()->resolvedUrl(QUrl("main.qml")), cwd.resolved(QUrl("main.qml")));
-
-    QDir dir = QDir::current();
-    dir.cdUp();
-    QVERIFY(dir != QDir::current());
-    QDir::setCurrent(dir.path());
-    QVERIFY(QDir::current() == dir);
-
-    QUrl cwd2 = QUrl::fromLocalFile(QDir::currentPath() + QDir::separator());
-    QCOMPARE(engine.baseUrl(), cwd2);
-    QCOMPARE(engine.rootContext()->resolvedUrl(QUrl("main.qml")), cwd2.resolved(QUrl("main.qml")));
-
-    engine.setBaseUrl(cwd);
-    QCOMPARE(engine.baseUrl(), cwd);
-    QCOMPARE(engine.rootContext()->resolvedUrl(QUrl("main.qml")), cwd.resolved(QUrl("main.qml")));
-}
-
-void tst_qmlengine::contextForObject()
-{
-    QmlEngine *engine = new QmlEngine;
-
-    // Test null-object
-    QVERIFY(QmlEngine::contextForObject(0) == 0);
-
-    // Test an object with no context
-    QObject object;
-    QVERIFY(QmlEngine::contextForObject(&object) == 0);
-
-    // Test setting null-object
-    QmlEngine::setContextForObject(0, engine->rootContext());
-
-    // Test setting null-context
-    QmlEngine::setContextForObject(&object, 0);
-
-    // Test setting context
-    QmlEngine::setContextForObject(&object, engine->rootContext());
-    QVERIFY(QmlEngine::contextForObject(&object) == engine->rootContext());
-
-    QmlContext context(engine->rootContext());
-
-    // Try changing context
-    QTest::ignoreMessage(QtWarningMsg, "QmlEngine::setContextForObject(): Object already has a QmlContext");
-    QmlEngine::setContextForObject(&object, &context);
-    QVERIFY(QmlEngine::contextForObject(&object) == engine->rootContext());
-
-    // Delete context
-    delete engine; engine = 0;
-    QVERIFY(QmlEngine::contextForObject(&object) == 0);
-}
-
-void tst_qmlengine::offlineStoragePath()
-{
-    // Without these set, QDesktopServices::storageLocation returns
-    // strings with extra "//" at the end. We set them to ignore this problem.
-    qApp->setApplicationName("tst_qmlengine");
-    qApp->setOrganizationName("Nokia");
-    qApp->setOrganizationDomain("nokia.com");
-
-    QmlEngine engine;
-
-    QDir dir(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
-    dir.mkpath("QML");
-    dir.cd("QML");
-    dir.mkpath("OfflineStorage");
-    dir.cd("OfflineStorage");
-
-    QCOMPARE(QDir::fromNativeSeparators(engine.offlineStoragePath()), dir.path());
-
-    engine.setOfflineStoragePath(QDir::homePath());
-    QCOMPARE(engine.offlineStoragePath(), QDir::homePath());
-}
-
-void tst_qmlengine::clearComponentCache()
-{
-    QmlEngine engine;
-
-    // Create original qml file
-    {
-        QFile file("temp.qml");
-        QVERIFY(file.open(QIODevice::WriteOnly));
-        file.write("import Qt 4.6\nQtObject {\nproperty int test: 10\n}\n");
-        file.close();
-    }
-
-    // Test "test" property
-    {
-        QmlComponent component(&engine, "temp.qml");
-        QObject *obj = component.create();
-        QVERIFY(obj != 0);
-        QCOMPARE(obj->property("test").toInt(), 10);
-        delete obj;
-    }
-
-    // Modify qml file
-    {
-        QFile file("temp.qml");
-        QVERIFY(file.open(QIODevice::WriteOnly));
-        file.write("import Qt 4.6\nQtObject {\nproperty int test: 11\n}\n");
-        file.close();
-    }
-
-    // Test cache hit
-    {
-        QmlComponent component(&engine, "temp.qml");
-        QObject *obj = component.create();
-        QVERIFY(obj != 0);
-        QCOMPARE(obj->property("test").toInt(), 10);
-        delete obj;
-    }
-
-    // Clear cache
-    engine.clearComponentCache();
-
-    // Test cache refresh
-    {
-        QmlComponent component(&engine, "temp.qml");
-        QObject *obj = component.create();
-        QVERIFY(obj != 0);
-        QCOMPARE(obj->property("test").toInt(), 11);
-        delete obj;
-    }
-}
-
-QTEST_MAIN(tst_qmlengine)
-
-#include "tst_qmlengine.moc"
diff --git a/tests/auto/declarative/qmlerror/qmlerror.pro b/tests/auto/declarative/qmlerror/qmlerror.pro
deleted file mode 100644
index fa9b79e..0000000
--- a/tests/auto/declarative/qmlerror/qmlerror.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlerror.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlerror/test.txt b/tests/auto/declarative/qmlerror/test.txt
deleted file mode 100644
index cdafd9e..0000000
--- a/tests/auto/declarative/qmlerror/test.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Line Content
-Line2 Content
-Line3 Content
diff --git a/tests/auto/declarative/qmlerror/tst_qmlerror.cpp b/tests/auto/declarative/qmlerror/tst_qmlerror.cpp
deleted file mode 100644
index 12dde57..0000000
--- a/tests/auto/declarative/qmlerror/tst_qmlerror.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QmlError>
-#include <QDebug>
-
-class tst_qmlerror : public QObject
-{
-    Q_OBJECT
-private slots:
-    void url();
-    void description();
-    void line();
-    void column();
-    void toString();
-
-    void copy();
-    void debug();
-};
-
-void tst_qmlerror::url()
-{
-    QmlError error;
-
-    QCOMPARE(error.url(), QUrl());
-
-    error.setUrl(QUrl("http://www.nokia.com/main.qml"));
-
-    QCOMPARE(error.url(), QUrl("http://www.nokia.com/main.qml"));
-
-    QmlError error2 = error;
-
-    QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
-
-    error.setUrl(QUrl("http://qt.nokia.com/main.qml"));
-
-    QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml"));
-    QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
-}
-
-void tst_qmlerror::description()
-{
-    QmlError error;
-
-    QCOMPARE(error.description(), QString());
-
-    error.setDescription("An Error");
-
-    QCOMPARE(error.description(), QString("An Error"));
-
-    QmlError error2 = error;
-
-    QCOMPARE(error2.description(), QString("An Error"));
-
-    error.setDescription("Another Error");
-
-    QCOMPARE(error.description(), QString("Another Error"));
-    QCOMPARE(error2.description(), QString("An Error"));
-}
-
-void tst_qmlerror::line()
-{
-    QmlError error;
-
-    QCOMPARE(error.line(), -1);
-
-    error.setLine(102);
-
-    QCOMPARE(error.line(), 102);
-
-    QmlError error2 = error;
-
-    QCOMPARE(error2.line(), 102);
-
-    error.setLine(4);
-
-    QCOMPARE(error.line(), 4);
-    QCOMPARE(error2.line(), 102);
-}
-
-void tst_qmlerror::column()
-{
-    QmlError error;
-
-    QCOMPARE(error.column(), -1);
-
-    error.setColumn(16);
-
-    QCOMPARE(error.column(), 16);
-
-    QmlError error2 = error;
-
-    QCOMPARE(error2.column(), 16);
-
-    error.setColumn(3);
-
-    QCOMPARE(error.column(), 3);
-    QCOMPARE(error2.column(), 16);
-}
-
-void tst_qmlerror::toString()
-{
-    {
-        QmlError error;
-        error.setUrl(QUrl("http://www.nokia.com/main.qml"));
-        error.setDescription("An Error");
-        error.setLine(92);
-        error.setColumn(13);
-
-        QCOMPARE(error.toString(), QString("http://www.nokia.com/main.qml:92:13: An Error"));
-    }
-
-    {
-        QmlError error;
-        error.setUrl(QUrl("http://www.nokia.com/main.qml"));
-        error.setDescription("An Error");
-        error.setLine(92);
-
-        QCOMPARE(error.toString(), QString("http://www.nokia.com/main.qml:92: An Error"));
-    }
-}
-
-void tst_qmlerror::copy()
-{
-    QmlError error;
-    error.setUrl(QUrl("http://www.nokia.com/main.qml"));
-    error.setDescription("An Error");
-    error.setLine(92);
-    error.setColumn(13);
-
-    QmlError error2(error);
-    QmlError error3;
-    error3 = error;
-
-    error.setUrl(QUrl("http://qt.nokia.com/main.qml"));
-    error.setDescription("Another Error");
-    error.setLine(2);
-    error.setColumn(33);
-
-    QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml"));
-    QCOMPARE(error.description(), QString("Another Error"));
-    QCOMPARE(error.line(), 2);
-    QCOMPARE(error.column(), 33);
-
-    QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
-    QCOMPARE(error2.description(), QString("An Error"));
-    QCOMPARE(error2.line(), 92);
-    QCOMPARE(error2.column(), 13);
-
-    QCOMPARE(error3.url(), QUrl("http://www.nokia.com/main.qml"));
-    QCOMPARE(error3.description(), QString("An Error"));
-    QCOMPARE(error3.line(), 92);
-    QCOMPARE(error3.column(), 13);
-
-}
-
-void tst_qmlerror::debug()
-{
-    {
-        QmlError error;
-        error.setUrl(QUrl("http://www.nokia.com/main.qml"));
-        error.setDescription("An Error");
-        error.setLine(92);
-        error.setColumn(13);
-
-        QTest::ignoreMessage(QtWarningMsg, "http://www.nokia.com/main.qml:92:13: An Error ");
-        qWarning() << error;
-    }
-
-    {
-        QUrl url(QUrl::fromLocalFile(QString(SRCDIR) + "/").resolved(QUrl("test.txt")));
-        QmlError error;
-        error.setUrl(url);
-        error.setDescription("An Error");
-        error.setLine(2);
-        error.setColumn(5);
-
-        QString out = url.toString() + ":2:5: An Error \n     Line2 Content \n         ^ ";
-        QTest::ignoreMessage(QtWarningMsg, qPrintable(out));
-
-        qWarning() << error;
-    }
-
-    {
-        QUrl url(QUrl::fromLocalFile(QString(SRCDIR) + "/").resolved(QUrl("foo.txt")));
-        QmlError error;
-        error.setUrl(url);
-        error.setDescription("An Error");
-        error.setLine(2);
-        error.setColumn(5);
-
-        QString out = url.toString() + ":2:5: An Error ";
-        QTest::ignoreMessage(QtWarningMsg, qPrintable(out));
-
-        qWarning() << error;
-    }
-}
-
-
-
-QTEST_MAIN(tst_qmlerror)
-
-#include "tst_qmlerror.moc"
diff --git a/tests/auto/declarative/qmlfontloader/data/dummy.ttf b/tests/auto/declarative/qmlfontloader/data/dummy.ttf
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf b/tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf
deleted file mode 100644
index cf93f96..0000000
Binary files a/tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf and /dev/null differ
diff --git a/tests/auto/declarative/qmlfontloader/qmlfontloader.pro b/tests/auto/declarative/qmlfontloader/qmlfontloader.pro
deleted file mode 100644
index bc89639..0000000
--- a/tests/auto/declarative/qmlfontloader/qmlfontloader.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlfontloader.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp b/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
deleted file mode 100644
index 41b5359..0000000
--- a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlfontloader_p.h>
-#include "../../../shared/util.h"
-
-class tst_qmlfontloader : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlfontloader();
-
-private slots:
-    void noFont();
-    void namedFont();
-    void localFont();
-    void failLocalFont();
-    void webFont();
-    void failWebFont();
-
-private slots:
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlfontloader::tst_qmlfontloader()
-{
-}
-
-void tst_qmlfontloader::noFont()
-{
-    QString componentStr = "import Qt 4.6\nFontLoader { }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QCOMPARE(fontObject->name(), QString(""));
-    QCOMPARE(fontObject->source(), QUrl(""));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Null);
-
-    delete fontObject;
-}
-
-void tst_qmlfontloader::namedFont()
-{
-    QString componentStr = "import Qt 4.6\nFontLoader { name: \"Helvetica\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QCOMPARE(fontObject->source(), QUrl(""));
-    QCOMPARE(fontObject->name(), QString("Helvetica"));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Ready);
-}
-
-void tst_qmlfontloader::localFont()
-{
-    QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR  "/data/tarzeau_ocr_a.ttf\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Ready);
-}
-
-void tst_qmlfontloader::failLocalFont()
-{
-    QString componentStr = "import Qt 4.6\nFontLoader { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" }";
-    QTest::ignoreMessage(QtWarningMsg, QString("Cannot load font:  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" )  ").toUtf8().constData());
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString(""));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Error);
-}
-
-void tst_qmlfontloader::webFont()
-{
-    QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://www.princexml.com/fonts/steffmann/Starburst.ttf\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString("Starburst"));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Ready);
-}
-
-void tst_qmlfontloader::failWebFont()
-{
-    QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://wrong.address.com/Starburst.ttf\" }";
-    QTest::ignoreMessage(QtWarningMsg, "Cannot load font:  QUrl( \"http://wrong.address.com/Starburst.ttf\" )  ");
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
-
-    QVERIFY(fontObject != 0);
-    QVERIFY(fontObject->source() != QUrl(""));
-    QTRY_COMPARE(fontObject->name(), QString(""));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Error);
-}
-
-QTEST_MAIN(tst_qmlfontloader)
-
-#include "tst_qmlfontloader.moc"
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/anchors.qml b/tests/auto/declarative/qmlgraphicsanchors/data/anchors.qml
deleted file mode 100644
index b64d0b0..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/data/anchors.qml
+++ /dev/null
@@ -1,162 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    color: "white"
-    width: 240
-    height: 320
-    Rectangle { id: masterRect; objectName: "masterRect"; x: 26; width: 96; height: 20; color: "red" }
-    Rectangle {
-        id: rect1; objectName: "rect1"
-        y: 20; width: 10; height: 10
-        anchors.left: masterRect.left
-    }
-    Rectangle {
-        id: rect2; objectName: "rect2"
-        y: 20; width: 10; height: 10
-        anchors.left: masterRect.right
-    }
-    Rectangle {
-        id: rect3; objectName: "rect3"
-        y: 20; width: 10; height: 10
-        anchors.left: masterRect.horizontalCenter
-    }
-    Rectangle {
-        id: rect4; objectName: "rect4"
-        y: 30; width: 10; height: 10
-        anchors.right: masterRect.left
-    }
-    Rectangle {
-        id: rect5; objectName: "rect5"
-        y: 30; width: 10; height: 10
-        anchors.right: masterRect.right
-    }
-    Rectangle {
-        id: rect6; objectName: "rect6"
-        y: 30; width: 10; height: 10
-        anchors.right: masterRect.horizontalCenter
-    }
-    Rectangle {
-        id: rect7; objectName: "rect7"
-        y: 50; width: 10; height: 10
-        anchors.left: parent.left
-    }
-    Rectangle {
-        id: rect8; objectName: "rect8"
-        y: 50; width: 10; height: 10
-        anchors.left: parent.right
-    }
-    Rectangle {
-        id: rect9; objectName: "rect9"
-        y: 50; width: 10; height: 10
-        anchors.left: parent.horizontalCenter
-    }
-    Rectangle {
-        id: rect10; objectName: "rect10"
-        y: 60; width: 10; height: 10
-        anchors.right: parent.left
-    }
-    Rectangle {
-        id: rect11; objectName: "rect11"
-        y: 60; width: 10; height: 10
-        anchors.right: parent.right
-    }
-    Rectangle {
-        id: rect12; objectName: "rect12"
-        y: 60; width: 10; height: 10
-        anchors.right: parent.horizontalCenter
-    }
-    Rectangle {
-        id: rect13; objectName: "rect13"
-        x: 200; width: 10; height: 10
-        anchors.top: masterRect.bottom
-    }
-    Rectangle {
-        id: rect14; objectName: "rect14"
-        width: 10; height: 10; color: "steelblue"
-        anchors.verticalCenter: parent.verticalCenter
-    }
-    Rectangle {
-        id: rect15; objectName: "rect15"
-        y: 200; height: 10
-        anchors.left: masterRect.left
-        anchors.right: masterRect.right
-    }
-    Rectangle {
-        id: rect16; objectName: "rect16"
-        y: 220; height: 10
-        anchors.left: masterRect.left
-        anchors.horizontalCenter: masterRect.right
-    }
-    Rectangle {
-        id: rect17; objectName: "rect17"
-        y: 240; height: 10
-        anchors.right: masterRect.right
-        anchors.horizontalCenter: masterRect.left
-    }
-    Rectangle {
-        id: rect18; objectName: "rect18"
-        x: 180; width: 10
-        anchors.top: masterRect.bottom
-        anchors.bottom: rect12.top
-    }
-    Rectangle {
-        id: rect19; objectName: "rect19"
-        y: 70; width: 10; height: 10
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-    Rectangle {
-        id: rect20; objectName: "rect20"
-        y: 70; width: 10; height: 10
-        anchors.horizontalCenter: parent.right
-    }
-    Rectangle {
-        id: rect21; objectName: "rect21"
-        y: 70; width: 10; height: 10
-        anchors.horizontalCenter: parent.left
-    }
-    Rectangle {
-        id: rect22; objectName: "rect22"
-        width: 10; height: 10
-        anchors.centerIn: masterRect
-    }
-    Rectangle {
-        id: rect23; objectName: "rect23"
-        anchors.left: masterRect.left
-        anchors.leftMargin: 5
-        anchors.right: masterRect.right
-        anchors.rightMargin: 5
-        anchors.top: masterRect.top
-        anchors.topMargin: 5
-        anchors.bottom: masterRect.bottom
-        anchors.bottomMargin: 5
-    }
-    Rectangle {
-        id: rect24; objectName: "rect24"
-        width: 10; height: 10
-        anchors.horizontalCenter: masterRect.left
-        anchors.horizontalCenterOffset: width/2
-    }
-    Rectangle {
-        id: rect25; objectName: "rect25"
-        width: 10; height: 10
-        anchors.verticalCenter: rect12.top
-        anchors.verticalCenterOffset: height/2
-    }
-    Rectangle {
-        id: rect26; objectName: "rect26"
-        width: 10; height: 10
-        anchors.baseline: masterRect.top
-        anchors.baselineOffset: height/2
-    }
-    Text {
-        id: text1; objectName: "text1"
-        y: 200;
-        text: "Hello"
-    }
-    Text {
-        id: text2; objectName: "text2"
-        anchors.baseline: text1.baseline
-        anchors.left: text1.right
-        text: "World"
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/centerin.qml b/tests/auto/declarative/qmlgraphicsanchors/data/centerin.qml
deleted file mode 100644
index 09b97f6..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/data/centerin.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 200; height: 200
-    Rectangle {
-        objectName: "centered"
-        width: 50; height: 50; color: "blue"
-        anchors.centerIn: parent;
-        anchors.verticalCenterOffset: 30
-        anchors.horizontalCenterOffset: 10
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/crash1.qml b/tests/auto/declarative/qmlgraphicsanchors/data/crash1.qml
deleted file mode 100644
index fd9dc55..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/data/crash1.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-Column {
-    Text {
-        text: "foo"
-        anchors.fill: parent
-    }
-    Text {
-        text: "bar"
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/fill.qml b/tests/auto/declarative/qmlgraphicsanchors/data/fill.qml
deleted file mode 100644
index 902465c..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/data/fill.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 200; height: 200
-    Rectangle {
-        objectName: "filler"
-        width: 50; height: 50; color: "blue"
-        anchors.fill: parent;
-	anchors.leftMargin: 10;
-	anchors.rightMargin: 20;
-	anchors.topMargin: 30;
-	anchors.bottomMargin: 40;
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/loop1.qml b/tests/auto/declarative/qmlgraphicsanchors/data/loop1.qml
deleted file mode 100644
index a266612..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/data/loop1.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: rect
-    width: 120; height: 200; color: "white"
-    Text { id: text1; anchors.right: text2.right; text: "Hello" }
-    Text { id: text2; anchors.right: text1.right; anchors.rightMargin: 10; text: "World" }
-}
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/loop2.qml b/tests/auto/declarative/qmlgraphicsanchors/data/loop2.qml
deleted file mode 100644
index acb57cd..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/data/loop2.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-  id: container;
-  width: 600;
-  height: 600;
-
-  Image {
-    id: image1
-    source: "http://labs.trolltech.com/blogs/wp-content/uploads/2009/03/3311388091_ac2a257feb.jpg"
-    anchors.right: image2.left
-  }
-
-  Image  {
-    id: image2
-    source: "http://labs.trolltech.com/blogs/wp-content/uploads/2009/03/oslo_groupphoto.jpg"
-    anchors.left: image1.right
-    anchors.leftMargin: 20
-  }
-}
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/margins.qml b/tests/auto/declarative/qmlgraphicsanchors/data/margins.qml
deleted file mode 100644
index 4a29e77..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/data/margins.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 200; height: 200
-    Rectangle {
-        objectName: "filler"
-        width: 50; height: 50; color: "blue"
-        anchors.fill: parent;
-	anchors.margins: 10
-	anchors.leftMargin: 5
-	anchors.topMargin: 6
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsanchors/qmlgraphicsanchors.pro b/tests/auto/declarative/qmlgraphicsanchors/qmlgraphicsanchors.pro
deleted file mode 100644
index 755de3f..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/qmlgraphicsanchors.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlgraphicsanchors.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp b/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp
deleted file mode 100644
index 721608e..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QSignalSpy>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlgraphicstext_p.h>
-#include <QtDeclarative/private/qmlgraphicsanchors_p_p.h>
-
-Q_DECLARE_METATYPE(QmlGraphicsAnchors::UsedAnchor)
-Q_DECLARE_METATYPE(QmlGraphicsAnchorLine::AnchorLine)
-
-
-class tst_qmlgraphicsanchors : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicsanchors() {}
-
-    template<typename T>
-    T *findItem(QGraphicsObject *parent, const QString &id);
-
-private slots:
-    void basicAnchors();
-    void loops();
-    void illegalSets();
-    void illegalSets_data();
-    void reset();
-    void reset_data();
-    void resetConvenience();
-    void nullItem();
-    void nullItem_data();
-    void crash1();
-    void centerIn();
-    void fill();
-    void margins();
-};
-
-/*
-   Find an item with the specified id.
-*/
-template<typename T>
-T *tst_qmlgraphicsanchors::findItem(QGraphicsObject *parent, const QString &objectName)
-{
-    const QMetaObject &mo = T::staticMetaObject;
-    QList<QGraphicsItem *> children = parent->childItems();
-    for (int i = 0; i < children.count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(children.at(i)->toGraphicsObject());
-        if (item) {
-            if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
-                return static_cast<T*>(item);
-            }
-            item = findItem<T>(item, objectName);
-            if (item)
-                return static_cast<T*>(item);
-        }
-    }
-
-    return 0;
-}
-
-void tst_qmlgraphicsanchors::basicAnchors()
-{
-    QmlView *view = new QmlView;
-    view->setSource(QUrl::fromLocalFile(SRCDIR "/data/anchors.qml"));
-
-    qApp->processEvents();
-
-    //sibling horizontal
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect1"))->x(), 26.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect2"))->x(), 122.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect3"))->x(), 74.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect4"))->x(), 16.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect5"))->x(), 112.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect6"))->x(), 64.0);
-
-    //parent horizontal
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect7"))->x(), 0.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect8"))->x(), 240.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect9"))->x(), 120.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect10"))->x(), -10.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect11"))->x(), 230.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect12"))->x(), 110.0);
-
-    //vertical
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect13"))->y(), 20.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect14"))->y(), 155.0);
-
-    //stretch
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect15"))->x(), 26.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect15"))->width(), 96.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect16"))->x(), 26.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect16"))->width(), 192.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect17"))->x(), -70.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect17"))->width(), 192.0);
-
-    //vertical stretch
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect18"))->y(), 20.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect18"))->height(), 40.0);
-
-    //more parent horizontal
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect19"))->x(), 115.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect20"))->x(), 235.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect21"))->x(), -5.0);
-
-    //centerIn
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect22"))->x(), 69.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect22"))->y(), 5.0);
-
-     //margins
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect23"))->x(), 31.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect23"))->y(), 5.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect23"))->width(), 86.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect23"))->height(), 10.0);
-
-    // offsets
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect24"))->x(), 26.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect25"))->y(), 60.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect26"))->y(), 5.0);
-
-    //baseline
-    QmlGraphicsText *text1 = findItem<QmlGraphicsText>(view->rootObject(), QLatin1String("text1"));
-    QmlGraphicsText *text2 = findItem<QmlGraphicsText>(view->rootObject(), QLatin1String("text2"));
-    QCOMPARE(text1->y(), text2->y());
-
-    delete view;
-}
-
-// mostly testing that we don't crash
-void tst_qmlgraphicsanchors::loops()
-{
-    {
-        QUrl source(QUrl::fromLocalFile(SRCDIR "/data/loop1.qml"));
-
-        QString expect = "QML Text (" + source.toString() + ":6:5" + ") Possible anchor loop detected on horizontal anchor.";
-        QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
-        QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
-        QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
-
-        QmlView *view = new QmlView;
-        view->setSource(source);
-        qApp->processEvents();
-
-        delete view;
-    }
-
-    {
-        QUrl source(QUrl::fromLocalFile(SRCDIR "/data/loop2.qml"));
-
-        QString expect = "QML Image (" + source.toString() + ":8:3" + ") Possible anchor loop detected on horizontal anchor.";
-        QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
-
-        QmlView *view = new QmlView;
-        view->setSource(source);
-        qApp->processEvents();
-
-        delete view;
-    }
-}
-
-void tst_qmlgraphicsanchors::illegalSets()
-{
-    QFETCH(QString, qml);
-    QFETCH(QString, warning);
-
-    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
-
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\n" + qml.toUtf8()), QUrl::fromLocalFile(""));
-    if (!component.isReady())
-        qWarning() << "Test errors:" << component.errors();
-    QVERIFY(component.isReady());
-    QObject *o = component.create();
-    delete o;
-}
-
-void tst_qmlgraphicsanchors::illegalSets_data()
-{
-    QTest::addColumn<QString>("qml");
-    QTest::addColumn<QString>("warning");
-
-    QTest::newRow("H - too many anchors")
-        << "Rectangle { id: rect; Rectangle { anchors.left: rect.left; anchors.right: rect.right; anchors.horizontalCenter: rect.horizontalCenter } }"
-        << "QML Rectangle (file::2:23) Cannot specify left, right, and hcenter anchors.";
-
-    foreach (const QString &side, QStringList() << "left" << "right") {
-        QTest::newRow("H - anchor to V")
-            << QString("Rectangle { Rectangle { anchors.%1: parent.top } }").arg(side)
-            << "QML Rectangle (file::2:13) Cannot anchor a horizontal edge to a vertical edge.";
-
-        QTest::newRow("H - anchor to non parent/sibling")
-            << QString("Rectangle { Item { Rectangle { id: rect } } Rectangle { anchors.%1: rect.%1 } }").arg(side)
-            << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling.";
-
-        QTest::newRow("H - anchor to self")
-            << QString("Rectangle { id: rect; anchors.%1: rect.%1 }").arg(side)
-            << "QML Rectangle (file::2:1) Cannot anchor item to self.";
-    }
-
-
-    QTest::newRow("V - too many anchors")
-        << "Rectangle { id: rect; Rectangle { anchors.top: rect.top; anchors.bottom: rect.bottom; anchors.verticalCenter: rect.verticalCenter } }"
-        << "QML Rectangle (file::2:23) Cannot specify top, bottom, and vcenter anchors.";
-
-    QTest::newRow("V - too many anchors with baseline")
-        << "Rectangle { Text { id: text1; text: \"Hello\" } Text { anchors.baseline: text1.baseline; anchors.top: text1.top; } }"
-        << "QML Text (file::2:47) Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.";
-
-    foreach (const QString &side, QStringList() << "top" << "bottom" << "baseline") {
-
-        QTest::newRow("V - anchor to H")
-            << QString("Rectangle { Rectangle { anchors.%1: parent.left } }").arg(side)
-            << "QML Rectangle (file::2:13) Cannot anchor a vertical edge to a horizontal edge.";
-
-        QTest::newRow("V - anchor to non parent/sibling")
-            << QString("Rectangle { Item { Rectangle { id: rect } } Rectangle { anchors.%1: rect.%1 } }").arg(side)
-            << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling.";
-
-        QTest::newRow("V - anchor to self")
-            << QString("Rectangle { id: rect; anchors.%1: rect.%1 }").arg(side)
-            << "QML Rectangle (file::2:1) Cannot anchor item to self.";
-    }
-
-
-    QTest::newRow("centerIn - anchor to non parent/sibling")
-        << "Rectangle { Item { Rectangle { id: rect } } Rectangle { anchors.centerIn: rect} }"
-        << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling.";
-
-
-    QTest::newRow("fill - anchor to non parent/sibling")
-        << "Rectangle { Item { Rectangle { id: rect } } Rectangle { anchors.fill: rect} }"
-        << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling.";
-}
-
-void tst_qmlgraphicsanchors::reset()
-{
-    QFETCH(QString, side);
-    QFETCH(QmlGraphicsAnchorLine::AnchorLine, anchorLine);
-    QFETCH(QmlGraphicsAnchors::UsedAnchor, usedAnchor);
-
-    QmlGraphicsItem *baseItem = new QmlGraphicsItem;
-
-    QmlGraphicsAnchorLine anchor;
-    anchor.item = baseItem;
-    anchor.anchorLine = anchorLine;
-
-    QmlGraphicsItem *item = new QmlGraphicsItem;
-
-    const QMetaObject *meta = item->anchors()->metaObject();
-    QMetaProperty p = meta->property(meta->indexOfProperty(side.toUtf8().constData()));
-
-    QVERIFY(p.write(item->anchors(), qVariantFromValue(anchor)));
-    QCOMPARE(item->anchors()->usedAnchors().testFlag(usedAnchor), true);
-
-    QVERIFY(p.reset(item->anchors()));
-    QCOMPARE(item->anchors()->usedAnchors().testFlag(usedAnchor), false);
-
-    delete item;
-    delete baseItem;
-}
-
-void tst_qmlgraphicsanchors::reset_data()
-{
-    QTest::addColumn<QString>("side");
-    QTest::addColumn<QmlGraphicsAnchorLine::AnchorLine>("anchorLine");
-    QTest::addColumn<QmlGraphicsAnchors::UsedAnchor>("usedAnchor");
-
-    QTest::newRow("left") << "left" << QmlGraphicsAnchorLine::Left << QmlGraphicsAnchors::HasLeftAnchor;
-    QTest::newRow("top") << "top" << QmlGraphicsAnchorLine::Top << QmlGraphicsAnchors::HasTopAnchor;
-    QTest::newRow("right") << "right" << QmlGraphicsAnchorLine::Right << QmlGraphicsAnchors::HasRightAnchor;
-    QTest::newRow("bottom") << "bottom" << QmlGraphicsAnchorLine::Bottom << QmlGraphicsAnchors::HasBottomAnchor;
-
-    QTest::newRow("hcenter") << "horizontalCenter" << QmlGraphicsAnchorLine::HCenter << QmlGraphicsAnchors::HasHCenterAnchor;
-    QTest::newRow("vcenter") << "verticalCenter" << QmlGraphicsAnchorLine::VCenter << QmlGraphicsAnchors::HasVCenterAnchor;
-    QTest::newRow("baseline") << "baseline" << QmlGraphicsAnchorLine::Baseline << QmlGraphicsAnchors::HasBaselineAnchor;
-}
-
-void tst_qmlgraphicsanchors::resetConvenience()
-{
-    QmlGraphicsItem *baseItem = new QmlGraphicsItem;
-    QmlGraphicsItem *item = new QmlGraphicsItem;
-
-    //fill
-    item->anchors()->setFill(baseItem);
-    QVERIFY(item->anchors()->fill() == baseItem);
-    item->anchors()->resetFill();
-    QVERIFY(item->anchors()->fill() == 0);
-
-    //centerIn
-    item->anchors()->setCenterIn(baseItem);
-    QVERIFY(item->anchors()->centerIn() == baseItem);
-    item->anchors()->resetCenterIn();
-    QVERIFY(item->anchors()->centerIn() == 0);
-
-    delete item;
-    delete baseItem;
-}
-
-void tst_qmlgraphicsanchors::nullItem()
-{
-    QFETCH(QString, side);
-
-    QmlGraphicsAnchorLine anchor;
-    QmlGraphicsItem *item = new QmlGraphicsItem;
-
-    const QMetaObject *meta = item->anchors()->metaObject();
-    QMetaProperty p = meta->property(meta->indexOfProperty(side.toUtf8().constData()));
-
-    QTest::ignoreMessage(QtWarningMsg, "QML Item (unknown location) Cannot anchor to a null item.");
-    QVERIFY(p.write(item->anchors(), qVariantFromValue(anchor)));
-
-    delete item;
-}
-
-void tst_qmlgraphicsanchors::nullItem_data()
-{
-    QTest::addColumn<QString>("side");
-
-    QTest::newRow("left") << "left";
-    QTest::newRow("top") << "top";
-    QTest::newRow("right") << "right";
-    QTest::newRow("bottom") << "bottom";
-
-    QTest::newRow("hcenter") << "horizontalCenter";
-    QTest::newRow("vcenter") << "verticalCenter";
-    QTest::newRow("baseline") << "baseline";
-}
-
-void tst_qmlgraphicsanchors::crash1()
-{
-    QUrl source(QUrl::fromLocalFile(SRCDIR "/data/crash1.qml"));
-
-    QString expect = "QML Text (" + source.toString() + ":4:5" + ") Possible anchor loop detected on fill.";
-    QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
-    QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); // XXX ideally, should be one message
-
-    QmlView *view = new QmlView(source);
-    qApp->processEvents();
-
-    delete view;
-}
-
-void tst_qmlgraphicsanchors::fill()
-{
-    QmlView *view = new QmlView(QUrl::fromLocalFile(SRCDIR "/data/fill.qml"));
-
-    qApp->processEvents();
-    QmlGraphicsRectangle* rect = findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("filler"));
-    QCOMPARE(rect->x(), 0.0 + 10.0);
-    QCOMPARE(rect->y(), 0.0 + 30.0);
-    QCOMPARE(rect->width(), 200.0 - 10.0 - 20.0);
-    QCOMPARE(rect->height(), 200.0 - 30.0 - 40.0);
-    //Alter Offsets (QTBUG-6631)
-    rect->anchors()->setLeftMargin(20.0);
-    rect->anchors()->setRightMargin(0.0);
-    rect->anchors()->setBottomMargin(0.0);
-    rect->anchors()->setTopMargin(10.0);
-    QCOMPARE(rect->x(), 0.0 + 20.0);
-    QCOMPARE(rect->y(), 0.0 + 10.0);
-    QCOMPARE(rect->width(), 200.0 - 20.0);
-    QCOMPARE(rect->height(), 200.0 - 10.0);
-
-    delete view;
-}
-
-void tst_qmlgraphicsanchors::centerIn()
-{
-    QmlView *view = new QmlView(QUrl::fromLocalFile(SRCDIR "/data/centerin.qml"));
-
-    qApp->processEvents();
-    QmlGraphicsRectangle* rect = findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("centered"));
-    QCOMPARE(rect->x(), 75.0 + 10);
-    QCOMPARE(rect->y(), 75.0 + 30);
-    //Alter Offsets (QTBUG-6631)
-    rect->anchors()->setHorizontalCenterOffset(-20.0);
-    rect->anchors()->setVerticalCenterOffset(-10.0);
-    QCOMPARE(rect->x(), 75.0 - 20.0);
-    QCOMPARE(rect->y(), 75.0 - 10.0);
-
-    delete view;
-}
-
-void tst_qmlgraphicsanchors::margins()
-{
-    QmlView *view = new QmlView(QUrl::fromLocalFile(SRCDIR "/data/margins.qml"));
-
-    qApp->processEvents();
-    QmlGraphicsRectangle* rect = findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("filler"));
-    QCOMPARE(rect->x(), 5.0);
-    QCOMPARE(rect->y(), 6.0);
-    QCOMPARE(rect->width(), 200.0 - 5.0 - 10.0);
-    QCOMPARE(rect->height(), 200.0 - 6.0 - 10.0);
-
-    rect->anchors()->setTopMargin(0.0);
-    rect->anchors()->setMargins(20.0);
-
-    QCOMPARE(rect->x(), 5.0);
-    QCOMPARE(rect->y(), 20.0);
-    QCOMPARE(rect->width(), 200.0 - 5.0 - 20.0);
-    QCOMPARE(rect->height(), 200.0 - 20.0 - 20.0);
-
-    delete view;
-}
-
-QTEST_MAIN(tst_qmlgraphicsanchors)
-
-#include "tst_qmlgraphicsanchors.moc"
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.gif b/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.gif
deleted file mode 100644
index 1270bfa..0000000
Binary files a/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.gif and /dev/null differ
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.qml b/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.qml
deleted file mode 100644
index 5bada34..0000000
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-AnimatedImage {
-    source: "colors.gif"
-}
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.gif b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.gif
deleted file mode 100644
index 7c4cd18..0000000
Binary files a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.gif and /dev/null differ
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.qml b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.qml
deleted file mode 100644
index a70db5d..0000000
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-AnimatedImage {
-    source: "stickman.gif"
-}
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanpause.qml b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanpause.qml
deleted file mode 100644
index 7ab17d4..0000000
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanpause.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-AnimatedImage {
-    source: "stickman.gif"
-    paused: true
-    currentFrame: 2
-}
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanstopped.qml b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanstopped.qml
deleted file mode 100644
index 53b0c3a..0000000
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanstopped.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-AnimatedImage {
-    source: "stickman.gif"
-    playing: false
-}
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/qmlgraphicsanimatedimage.pro b/tests/auto/declarative/qmlgraphicsanimatedimage/qmlgraphicsanimatedimage.pro
deleted file mode 100644
index 877dfab..0000000
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/qmlgraphicsanimatedimage.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative network
-HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsanimatedimage.cpp ../shared/testhttpserver.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/tst_qmlgraphicsanimatedimage.cpp b/tests/auto/declarative/qmlgraphicsanimatedimage/tst_qmlgraphicsanimatedimage.cpp
deleted file mode 100644
index 2342f25..0000000
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/tst_qmlgraphicsanimatedimage.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlgraphicsimage_p.h>
-#include <private/qmlgraphicsanimatedimage_p.h>
-
-#include "../shared/testhttpserver.h"
-
-#define TRY_WAIT(expr) \
-    do { \
-        for (int ii = 0; ii < 6; ++ii) { \
-            if ((expr)) break; \
-            QTest::qWait(50); \
-        } \
-        QVERIFY((expr)); \
-    } while (false)
-
-
-class tst_qmlgraphicsanimatedimage : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicsanimatedimage() {}
-
-private slots:
-    void play();
-    void pause();
-    void stopped();
-    void setFrame();
-    void frameCount();
-    void remote();
-    void remote_data();
-    void invalidSource();
-};
-
-void tst_qmlgraphicsanimatedimage::play()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickman.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
-    QVERIFY(anim);
-    QVERIFY(anim->isPlaying());
-
-    delete anim;
-}
-
-void tst_qmlgraphicsanimatedimage::pause()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
-    QVERIFY(anim);
-    QVERIFY(anim->isPlaying());
-    QVERIFY(anim->isPaused());
-
-    delete anim;
-}
-
-void tst_qmlgraphicsanimatedimage::stopped()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanstopped.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
-    QVERIFY(anim);
-    QVERIFY(!anim->isPlaying());
-    QCOMPARE(anim->currentFrame(), 0);
-
-    delete anim;
-}
-
-void tst_qmlgraphicsanimatedimage::setFrame()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
-    QVERIFY(anim);
-    QVERIFY(anim->isPlaying());
-    QCOMPARE(anim->currentFrame(), 2);
-
-    delete anim;
-}
-
-void tst_qmlgraphicsanimatedimage::frameCount()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/colors.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
-    QVERIFY(anim);
-    QVERIFY(anim->isPlaying());
-    QCOMPARE(anim->frameCount(), 3);
-
-    delete anim;
-}
-
-void tst_qmlgraphicsanimatedimage::remote()
-{
-    QFETCH(QString, fileName);
-    QFETCH(bool, paused);
-
-    TestHTTPServer server(14445);
-    QVERIFY(server.isValid());
-    server.serveDirectory(SRCDIR "/data");
-
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl("http://127.0.0.1:14445/" + fileName));
-    TRY_WAIT(component.isReady());
-
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
-    QVERIFY(anim);
-
-    TRY_WAIT(anim->isPlaying());
-    if (paused) {
-        TRY_WAIT(anim->isPaused());
-        QCOMPARE(anim->currentFrame(), 2);
-    }
-
-    delete anim;
-}
-
-void tst_qmlgraphicsanimatedimage::remote_data()
-{
-    QTest::addColumn<QString>("fileName");
-    QTest::addColumn<bool>("paused");
-
-    QTest::newRow("playing") << "stickman.qml" << false;
-    QTest::newRow("paused") << "stickmanpause.qml" << true;
-}
-
-void tst_qmlgraphicsanimatedimage::invalidSource()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6\n AnimatedImage { source: \"no-such-file.gif\" }", QUrl::fromLocalFile(""));
-    QVERIFY(component.isReady());
-
-    QTest::ignoreMessage(QtWarningMsg, "Error Reading Animated Image File  QUrl( \"file:no-such-file.gif\" )  ");
-
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
-    QVERIFY(anim);
-
-    QVERIFY(!anim->isPlaying());
-    QVERIFY(!anim->isPaused());
-    QCOMPARE(anim->currentFrame(), 0);
-    QCOMPARE(anim->frameCount(), 0);
-}
-
-QTEST_MAIN(tst_qmlgraphicsanimatedimage)
-
-#include "tst_qmlgraphicsanimatedimage.moc"
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/data/colors-round.sci b/tests/auto/declarative/qmlgraphicsborderimage/data/colors-round.sci
deleted file mode 100644
index 5d2f49f..0000000
--- a/tests/auto/declarative/qmlgraphicsborderimage/data/colors-round.sci
+++ /dev/null
@@ -1,7 +0,0 @@
-border.left:10
-border.top:20
-border.right:30
-border.bottom:40
-horizontalTileRule:Round
-verticalTileRule:Repeat
-source:colors.png
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/data/colors.png b/tests/auto/declarative/qmlgraphicsborderimage/data/colors.png
deleted file mode 100644
index dfb62f3..0000000
Binary files a/tests/auto/declarative/qmlgraphicsborderimage/data/colors.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/data/invalid.sci b/tests/auto/declarative/qmlgraphicsborderimage/data/invalid.sci
deleted file mode 100644
index 98c72c9..0000000
--- a/tests/auto/declarative/qmlgraphicsborderimage/data/invalid.sci
+++ /dev/null
@@ -1,7 +0,0 @@
-border.left:10
-border.top:20
-border.down:30
-border.up:40
-horizontalTileRule:Roun
-verticalTileRule:Repea
-source:colors.png
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/qmlgraphicsborderimage.pro b/tests/auto/declarative/qmlgraphicsborderimage/qmlgraphicsborderimage.pro
deleted file mode 100644
index 1f606e5..0000000
--- a/tests/auto/declarative/qmlgraphicsborderimage/qmlgraphicsborderimage.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui network
-macx:CONFIG -= app_bundle
-
-HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsborderimage.cpp ../shared/testhttpserver.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp b/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
deleted file mode 100644
index 183f7e4..0000000
--- a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QTextDocument>
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QDir>
-
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsborderimage_p.h>
-#include <private/qmlgraphicsimagebase_p.h>
-#include <private/qmlgraphicsscalegrid_p_p.h>
-#include <private/qmlgraphicsloader_p.h>
-#include <QtDeclarative/qmlcontext.h>
-
-#include "../shared/testhttpserver.h"
-
-
-#define SERVER_PORT 14445
-#define SERVER_ADDR "http://127.0.0.1:14445"
-
-#define TRY_WAIT(expr) \
-    do { \
-        for (int ii = 0; ii < 6; ++ii) { \
-            if ((expr)) break; \
-            QTest::qWait(50); \
-        } \
-        QVERIFY((expr)); \
-    } while (false)
-
-
-class tst_qmlgraphicsborderimage : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicsborderimage();
-
-private slots:
-    void noSource();
-    void imageSource();
-    void imageSource_data();
-    void clearSource();
-    void resized();
-    void smooth();
-    void tileModes();
-    void sciSource();
-    void sciSource_data();
-    void invalidSciFile();
-    void pendingRemoteRequest();
-    void pendingRemoteRequest_data();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlgraphicsborderimage::tst_qmlgraphicsborderimage()
-{
-}
-
-void tst_qmlgraphicsborderimage::noSource()
-{
-    QString componentStr = "import Qt 4.6\nBorderImage { source: \"\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->source(), QUrl());
-    QCOMPARE(obj->width(), 0.);
-    QCOMPARE(obj->height(), 0.);
-    QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-    QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsborderimage::imageSource_data()
-{
-    QTest::addColumn<QString>("source");
-    QTest::addColumn<bool>("remote");
-    QTest::addColumn<QString>("error");
-
-    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << false << "";
-    QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << false
-        << "Cannot open  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() + "\" )  ";
-    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << "";
-    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true
-        << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
-}
-
-void tst_qmlgraphicsborderimage::imageSource()
-{
-    QFETCH(QString, source);
-    QFETCH(bool, remote);
-    QFETCH(QString, error);
-
-    TestHTTPServer *server = 0;
-    if (remote) {
-        server = new TestHTTPServer(SERVER_PORT);
-        QVERIFY(server->isValid());
-        server->serveDirectory(SRCDIR "/data");
-    }
-
-    if (!error.isEmpty())
-        QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
-
-    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-    QVERIFY(obj != 0);
-    
-    if (remote)
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Loading);
-
-    QCOMPARE(obj->source(), remote ? source : QUrl(source));
-
-    if (error.isEmpty()) {
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Ready);
-        QCOMPARE(obj->width(), 120.);
-        QCOMPARE(obj->height(), 120.);
-        QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-        QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
-    } else {
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Error);
-    }
-
-    delete obj;
-    delete server;
-}
-
-void tst_qmlgraphicsborderimage::clearSource()
-{
-    QString componentStr = "import Qt 4.6\nBorderImage { source: srcImage }";
-    QmlContext *ctxt = engine.rootContext();
-    ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png"));
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-    QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QmlGraphicsBorderImage::Ready);
-    QCOMPARE(obj->width(), 120.);
-    QCOMPARE(obj->height(), 120.);
-
-    ctxt->setContextProperty("srcImage", "");
-    QVERIFY(obj->source().isEmpty());
-    QVERIFY(obj->status() == QmlGraphicsBorderImage::Null);
-    QCOMPARE(obj->width(), 0.);
-    QCOMPARE(obj->height(), 0.);
-}
-
-void tst_qmlgraphicsborderimage::resized()
-{
-    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() + "\"; width: 300; height: 300 }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->width(), 300.);
-    QCOMPARE(obj->height(), 300.);
-    QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-    QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsborderimage::smooth()
-{
-    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->width(), 300.);
-    QCOMPARE(obj->height(), 300.);
-    QCOMPARE(obj->smooth(), true);
-    QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-    QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsborderimage::tileModes()
-{
-    {
-        QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 100; height: 300; horizontalTileMode: BorderImage.Repeat; verticalTileMode: BorderImage.Repeat }";
-        QmlComponent component(&engine);
-        component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-        QVERIFY(obj != 0);
-        QCOMPARE(obj->width(), 100.);
-        QCOMPARE(obj->height(), 300.);
-        QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Repeat);
-        QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Repeat);
-
-        delete obj;
-    }
-    {
-        QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 150; horizontalTileMode: BorderImage.Round; verticalTileMode: BorderImage.Round }";
-        QmlComponent component(&engine);
-        component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-        QVERIFY(obj != 0);
-        QCOMPARE(obj->width(), 300.);
-        QCOMPARE(obj->height(), 150.);
-        QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Round);
-        QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Round);
-
-        delete obj;
-    }
-}
-
-void tst_qmlgraphicsborderimage::sciSource()
-{
-    QFETCH(QString, source);
-    QFETCH(bool, valid);
-
-    bool remote = source.startsWith("http");
-    TestHTTPServer *server = 0;
-    if (remote) {
-        server = new TestHTTPServer(SERVER_PORT);
-        QVERIFY(server->isValid());
-        server->serveDirectory(SRCDIR "/data");
-    }
-
-    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\"; width: 300; height: 300 }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-    QVERIFY(obj != 0);
-    
-    if (remote)
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Loading);
-    
-    QCOMPARE(obj->source(), remote ? source : QUrl(source));
-    QCOMPARE(obj->width(), 300.);
-    QCOMPARE(obj->height(), 300.);
-    
-    if (valid) {
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Ready);
-        QCOMPARE(obj->border()->left(), 10);
-        QCOMPARE(obj->border()->top(), 20);
-        QCOMPARE(obj->border()->right(), 30);
-        QCOMPARE(obj->border()->bottom(), 40);
-        QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Round);
-        QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Repeat);
-    } else {
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Error);
-    }
-
-    delete obj;
-    delete server;
-}
-
-void tst_qmlgraphicsborderimage::sciSource_data()
-{
-    QTest::addColumn<QString>("source");
-    QTest::addColumn<bool>("valid");
-
-    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors-round.sci").toString() << true;
-    QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.sci").toString() << false;
-    QTest::newRow("remote") << SERVER_ADDR "/colors-round.sci" << true;
-    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.sci" << false;
-}
-
-void tst_qmlgraphicsborderimage::invalidSciFile()
-{
-    QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Roun"
-    QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Repea"
-
-    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/invalid.sci").toString() +"\"; width: 300; height: 300 }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->width(), 300.);
-    QCOMPARE(obj->height(), 300.);
-    QCOMPARE(obj->status(), QmlGraphicsImageBase::Error);
-    QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-    QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsborderimage::pendingRemoteRequest()
-{
-    QFETCH(QString, source);
-
-    QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->status(), QmlGraphicsBorderImage::Loading);
-
-    // verify no crash
-    // This will cause a delayed "QThread: Destroyed while thread is still running" warning
-    delete obj;
-    QTest::qWait(50);
-}
-
-void tst_qmlgraphicsborderimage::pendingRemoteRequest_data()
-{
-    QTest::addColumn<QString>("source");
-
-    QTest::newRow("png file") << "http://no-such-qt-server-like-this/none.png";
-    QTest::newRow("sci file") << "http://no-such-qt-server-like-this/none.sci";
-}
-
-QTEST_MAIN(tst_qmlgraphicsborderimage)
-
-#include "tst_qmlgraphicsborderimage.moc"
diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable01.qml b/tests/auto/declarative/qmlgraphicsflickable/data/flickable01.qml
deleted file mode 100644
index 8a1843c..0000000
--- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable01.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.6
-
-Flickable {
-}
diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml b/tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml
deleted file mode 100644
index 3e08359..0000000
--- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Flickable {
-    width: 100; height: 100
-    viewportWidth: row.width; viewportHeight: row.height
-
-    Row {
-        id: row
-        Repeater {
-            model: 4
-            Rectangle { width: 200; height: 300; color: "blue" }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml b/tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml
deleted file mode 100644
index 3ed173d..0000000
--- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Flickable {
-    width: 100; height: 100
-    viewportWidth: column.width; viewportHeight: column.height
-
-    Column {
-        id: column
-        Repeater {
-            model: 4
-            Rectangle { width: 200; height: 300; color: "blue" }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml b/tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml
deleted file mode 100644
index 1425d85..0000000
--- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-
-Flickable {
-    width: 100; height: 100
-    viewportWidth: column.width; viewportHeight: column.height
-    pressDelay: 200; overShoot: false; interactive: false
-    maximumFlickVelocity: 2000
-
-    Column {
-        id: column
-        Repeater {
-            model: 4
-            Rectangle { width: 200; height: 300; color: "blue" }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsflickable/qmlgraphicsflickable.pro b/tests/auto/declarative/qmlgraphicsflickable/qmlgraphicsflickable.pro
deleted file mode 100644
index 7c4c959..0000000
--- a/tests/auto/declarative/qmlgraphicsflickable/qmlgraphicsflickable.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicsflickable.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsflickable/tst_qmlgraphicsflickable.cpp b/tests/auto/declarative/qmlgraphicsflickable/tst_qmlgraphicsflickable.cpp
deleted file mode 100644
index b503571..0000000
--- a/tests/auto/declarative/qmlgraphicsflickable/tst_qmlgraphicsflickable.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtTest/QSignalSpy>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsflickable_p.h>
-#include <private/qmlvaluetype_p.h>
-#include <math.h>
-
-class tst_qmlgraphicsflickable : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicsflickable();
-
-private slots:
-    void create();
-    void horizontalViewportSize();
-    void verticalViewportSize();
-    void properties();
-    void overShoot();
-    void maximumFlickVelocity();
-    void flickDeceleration();
-    void pressDelay();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlgraphicsflickable::tst_qmlgraphicsflickable()
-{
-}
-
-void tst_qmlgraphicsflickable::create()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable01.qml"));
-    QmlGraphicsFlickable *obj = qobject_cast<QmlGraphicsFlickable*>(c.create());
-
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->isAtXBeginning(), true);
-    QCOMPARE(obj->isAtXEnd(), false);
-    QCOMPARE(obj->isAtYBeginning(), true);
-    QCOMPARE(obj->isAtYEnd(), false);
-    QCOMPARE(obj->viewportX(), 0.);
-    QCOMPARE(obj->viewportY(), 0.);
-
-    QCOMPARE(obj->horizontalVelocity(), 0.);
-    QCOMPARE(obj->verticalVelocity(), 0.);
-    QCOMPARE(obj->reportedVelocitySmoothing(), 100.);
-
-    QCOMPARE(obj->isInteractive(), true);
-    QCOMPARE(obj->overShoot(), true);
-    QCOMPARE(obj->pressDelay(), 0);
-    QCOMPARE(obj->maximumFlickVelocity(), 2000.);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsflickable::horizontalViewportSize()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable02.qml"));
-    QmlGraphicsFlickable *obj = qobject_cast<QmlGraphicsFlickable*>(c.create());
-
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->viewportWidth(), 800.);
-    QCOMPARE(obj->viewportHeight(), 300.);
-    QCOMPARE(obj->isAtXBeginning(), true);
-    QCOMPARE(obj->isAtXEnd(), false);
-    QCOMPARE(obj->isAtYBeginning(), true);
-    QCOMPARE(obj->isAtYEnd(), false);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsflickable::verticalViewportSize()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable03.qml"));
-    QmlGraphicsFlickable *obj = qobject_cast<QmlGraphicsFlickable*>(c.create());
-
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->viewportWidth(), 200.);
-    QCOMPARE(obj->viewportHeight(), 1200.);
-    QCOMPARE(obj->isAtXBeginning(), true);
-    QCOMPARE(obj->isAtXEnd(), false);
-    QCOMPARE(obj->isAtYBeginning(), true);
-    QCOMPARE(obj->isAtYEnd(), false);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsflickable::properties()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable04.qml"));
-    QmlGraphicsFlickable *obj = qobject_cast<QmlGraphicsFlickable*>(c.create());
-
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->isInteractive(), false);
-    QCOMPARE(obj->overShoot(), false);
-    QCOMPARE(obj->pressDelay(), 200);
-    QCOMPARE(obj->maximumFlickVelocity(), 2000.);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsflickable::overShoot()
-{
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6; Flickable { overShoot: false; }", QUrl::fromLocalFile(""));
-    QmlGraphicsFlickable *flickable = qobject_cast<QmlGraphicsFlickable*>(component.create());
-    QSignalSpy spy(flickable, SIGNAL(overShootChanged()));
-
-    QVERIFY(flickable);
-    QVERIFY(!flickable->overShoot());
-
-    flickable->setOverShoot(true);
-    QVERIFY(flickable->overShoot());
-    QCOMPARE(spy.count(),1);
-    flickable->setOverShoot(true);
-    QCOMPARE(spy.count(),1);
-
-    flickable->setOverShoot(false);
-    QVERIFY(!flickable->overShoot());
-    QCOMPARE(spy.count(),2);
-    flickable->setOverShoot(false);
-    QCOMPARE(spy.count(),2);
-}
-
-void tst_qmlgraphicsflickable::maximumFlickVelocity()
-{
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6; Flickable { maximumFlickVelocity: 1.0; }", QUrl::fromLocalFile(""));
-    QmlGraphicsFlickable *flickable = qobject_cast<QmlGraphicsFlickable*>(component.create());
-    QSignalSpy spy(flickable, SIGNAL(maximumFlickVelocityChanged()));
-
-    QVERIFY(flickable);
-    QCOMPARE(flickable->maximumFlickVelocity(), 1.0);
-
-    flickable->setMaximumFlickVelocity(2.0);
-    QCOMPARE(flickable->maximumFlickVelocity(), 2.0);
-    QCOMPARE(spy.count(),1);
-    flickable->setMaximumFlickVelocity(2.0);
-    QCOMPARE(spy.count(),1);
-}
-
-void tst_qmlgraphicsflickable::flickDeceleration()
-{
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6; Flickable { flickDeceleration: 1.0; }", QUrl::fromLocalFile(""));
-    QmlGraphicsFlickable *flickable = qobject_cast<QmlGraphicsFlickable*>(component.create());
-    QSignalSpy spy(flickable, SIGNAL(flickDecelerationChanged()));
-
-    QVERIFY(flickable);
-    QCOMPARE(flickable->flickDeceleration(), 1.0);
-
-    flickable->setFlickDeceleration(2.0);
-    QCOMPARE(flickable->flickDeceleration(), 2.0);
-    QCOMPARE(spy.count(),1);
-    flickable->setFlickDeceleration(2.0);
-    QCOMPARE(spy.count(),1);
-}
-
-void tst_qmlgraphicsflickable::pressDelay()
-{
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6; Flickable { pressDelay: 100; }", QUrl::fromLocalFile(""));
-    QmlGraphicsFlickable *flickable = qobject_cast<QmlGraphicsFlickable*>(component.create());
-    QSignalSpy spy(flickable, SIGNAL(pressDelayChanged()));
-
-    QVERIFY(flickable);
-    QCOMPARE(flickable->pressDelay(), 100);
-
-    flickable->setPressDelay(200);
-    QCOMPARE(flickable->pressDelay(), 200);
-    QCOMPARE(spy.count(),1);
-    flickable->setPressDelay(200);
-    QCOMPARE(spy.count(),1);
-}
-
-QTEST_MAIN(tst_qmlgraphicsflickable)
-
-#include "tst_qmlgraphicsflickable.moc"
diff --git a/tests/auto/declarative/qmlgraphicsflipable/data/test-flipable.qml b/tests/auto/declarative/qmlgraphicsflipable/data/test-flipable.qml
deleted file mode 100644
index 21d356d..0000000
--- a/tests/auto/declarative/qmlgraphicsflipable/data/test-flipable.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-Flipable {
-    id: flipable
-    width: 640; height: 480
-
-    front: Rectangle { anchors.fill: flipable }
-    back: Rectangle { anchors.fill: flipable }
-}
diff --git a/tests/auto/declarative/qmlgraphicsflipable/qmlgraphicsflipable.pro b/tests/auto/declarative/qmlgraphicsflipable/qmlgraphicsflipable.pro
deleted file mode 100644
index b046086..0000000
--- a/tests/auto/declarative/qmlgraphicsflipable/qmlgraphicsflipable.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicsflipable.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsflipable/tst_qmlgraphicsflipable.cpp b/tests/auto/declarative/qmlgraphicsflipable/tst_qmlgraphicsflipable.cpp
deleted file mode 100644
index 24dc2e8..0000000
--- a/tests/auto/declarative/qmlgraphicsflipable/tst_qmlgraphicsflipable.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsflipable_p.h>
-#include <private/qmlvaluetype_p.h>
-#include <QFontMetrics>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <math.h>
-
-class tst_qmlgraphicsflipable : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicsflipable();
-
-private slots:
-    void create();
-    void checkFrontAndBack();
-    void setFrontAndBack();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlgraphicsflipable::tst_qmlgraphicsflipable()
-{
-}
-
-void tst_qmlgraphicsflipable::create()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
-    QmlGraphicsFlipable *obj = qobject_cast<QmlGraphicsFlipable*>(c.create());
-
-    QVERIFY(obj != 0);
-    delete obj;
-}
-
-void tst_qmlgraphicsflipable::checkFrontAndBack()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
-    QmlGraphicsFlipable *obj = qobject_cast<QmlGraphicsFlipable*>(c.create());
-
-    QVERIFY(obj != 0);
-    QVERIFY(obj->front() != 0);
-    QVERIFY(obj->back() != 0);
-    delete obj;
-}
-
-void tst_qmlgraphicsflipable::setFrontAndBack()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
-    QmlGraphicsFlipable *obj = qobject_cast<QmlGraphicsFlipable*>(c.create());
-
-    QVERIFY(obj != 0);
-    QVERIFY(obj->front() != 0);
-    QVERIFY(obj->back() != 0);
-
-    QString message = "QML Flipable (" + c.url().toString() + ":3:1) front is a write-once property";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-    obj->setFront(new QmlGraphicsRectangle());
-
-    message = "QML Flipable (" + c.url().toString() + ":3:1) back is a write-once property";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-    obj->setBack(new QmlGraphicsRectangle());
-    delete obj;
-}
-
-QTEST_MAIN(tst_qmlgraphicsflipable)
-
-#include "tst_qmlgraphicsflipable.moc"
diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml b/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml
deleted file mode 100644
index 32833d2..0000000
--- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    color: "#ffffff"
-    resources: [
-        Component {
-            id: myDelegate
-            Rectangle {
-                id: wrapper
-                objectName: "wrapper"
-                width: 80
-                height: 60
-                border.color: "blue"
-                Text {
-                    text: index
-                }
-                Text {
-                    x: 40
-                    text: wrapper.x + ", " + wrapper.y
-                }
-                Text {
-                    y: 20
-                    id: textName
-                    objectName: "textName"
-                    text: name
-                }
-                Text {
-                    y: 40
-                    id: textNumber
-                    objectName: "textNumber"
-                    text: number
-                }
-                color: GridView.isCurrentItem ? "lightsteelblue" : "white"
-            }
-        }
-    ]
-    GridView {
-        id: grid
-        objectName: "grid"
-        focus: true
-        width: 240
-        height: 320
-        currentIndex: 5
-        cellWidth: 80
-        cellHeight: 60
-        delegate: myDelegate
-        model: testModel
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview.qml b/tests/auto/declarative/qmlgraphicsgridview/data/gridview.qml
deleted file mode 100644
index 344b4b5..0000000
--- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    color: "#ffffff"
-    resources: [
-        Component {
-            id: myDelegate
-            Rectangle {
-                id: wrapper
-                objectName: "wrapper"
-                width: 80
-                height: 60
-                border.color: "blue"
-                Text {
-                    text: index
-                }
-                Text {
-                    x: 40
-                    text: wrapper.x + ", " + wrapper.y
-                }
-                Text {
-                    y: 20
-                    id: textName
-                    objectName: "textName"
-                    text: name
-                }
-                Text {
-                    y: 40
-                    id: textNumber
-                    objectName: "textNumber"
-                    text: number
-                }
-                color: GridView.isCurrentItem ? "lightsteelblue" : "white"
-            }
-        }
-    ]
-    GridView {
-        id: grid
-        objectName: "grid"
-        width: 240
-        height: 320
-        cellWidth: 80
-        cellHeight: 60
-        flow: (testTopToBottom == false) ? "LeftToRight" : "TopToBottom"
-        model: testModel
-        delegate: myDelegate
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview2.qml b/tests/auto/declarative/qmlgraphicsgridview/data/gridview2.qml
deleted file mode 100644
index 62b5bd3..0000000
--- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview2.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-
-GridView {
-    anchors.fill: parent
-    width: 320; height: 200
-    cellWidth: 100; cellHeight: 100; cacheBuffer: 200; focus: true
-    keyNavigationWraps: true; highlightFollowsCurrentItem: false
-
-    model: ListModel {
-        id: appModel
-        ListElement { lColor: "red" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "green" }
-        ListElement { lColor: "blue" }
-    }
-
-    delegate: Item {
-        width: 100; height: 100
-        Rectangle {
-            color: lColor; x: 4; y: 4
-            width: 92; height: 92
-        }
-    }
-
-    highlight: Rectangle { width: 100; height: 100; color: "black" }
-}
diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview3.qml b/tests/auto/declarative/qmlgraphicsgridview/data/gridview3.qml
deleted file mode 100644
index b133d55..0000000
--- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-GridView {
-    anchors.fill: parent
-    width: 320; height: 200
-}
diff --git a/tests/auto/declarative/qmlgraphicsgridview/qmlgraphicsgridview.pro b/tests/auto/declarative/qmlgraphicsgridview/qmlgraphicsgridview.pro
deleted file mode 100644
index 8eae8ae..0000000
--- a/tests/auto/declarative/qmlgraphicsgridview/qmlgraphicsgridview.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicsgridview.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp b/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
deleted file mode 100644
index 7c8501c..0000000
--- a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
+++ /dev/null
@@ -1,964 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qmlengine.h>
-#include <qmlcomponent.h>
-#include <QtTest/QtTest>
-#include <private/qlistmodelinterface_p.h>
-#include <qmlview.h>
-#include <private/qmlgraphicsgridview_p.h>
-#include <private/qmlgraphicstext_p.h>
-#include <qmlcontext.h>
-#include <qmlexpression.h>
-
-class tst_QmlGraphicsGridView : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QmlGraphicsGridView();
-
-private slots:
-    void items();
-    void changed();
-    void inserted();
-    void removed();
-    void moved();
-    void changeFlow();
-    void currentIndex();
-    void defaultValues();
-    void properties();
-    void positionViewAtIndex();
-
-private:
-    QmlView *createView();
-    template<typename T>
-    T *findItem(QGraphicsObject *parent, const QString &id, int index=-1);
-    template<typename T>
-    QList<T*> findItems(QGraphicsObject *parent, const QString &objectName);
-    void dumpTree(QmlGraphicsItem *parent, int depth = 0);
-};
-
-class TestModel : public QAbstractListModel
-{
-public:
-    enum Roles { Name = Qt::UserRole+1, Number = Qt::UserRole+2 };
-
-    TestModel(QObject *parent=0) : QAbstractListModel(parent) {
-        QHash<int, QByteArray> roles;
-        roles[Name] = "name";
-        roles[Number] = "number";
-        setRoleNames(roles);
-    }
-
-    int rowCount(const QModelIndex &parent=QModelIndex()) const { return list.count(); }
-    QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const {
-        QVariant rv;
-        if (role == Name)
-            rv = list.at(index.row()).first;
-        else if (role == Number)
-            rv = list.at(index.row()).second;
-
-        return rv;
-    }
-
-    int count() const { return rowCount(); }
-    QString name(int index) const { return list.at(index).first; }
-    QString number(int index) const { return list.at(index).second; }
-
-    void addItem(const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), list.count(), list.count());
-        list.append(QPair<QString,QString>(name, number));
-        emit endInsertRows();
-    }
-
-    void insertItem(int index, const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), index, index);
-        list.insert(index, QPair<QString,QString>(name, number));
-        emit endInsertRows();
-    }
-
-    void removeItem(int index) {
-        emit beginRemoveRows(QModelIndex(), index, index);
-        list.removeAt(index);
-        emit endRemoveRows();
-    }
-
-    void moveItem(int from, int to) {
-        emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
-        list.move(from, to);
-        emit endMoveRows();
-    }
-
-    void modifyItem(int idx, const QString &name, const QString &number) {
-        list[idx] = QPair<QString,QString>(name, number);
-        emit dataChanged(index(idx,0), index(idx,0));
-    }
-
-private:
-    QList<QPair<QString,QString> > list;
-};
-
-tst_QmlGraphicsGridView::tst_QmlGraphicsGridView()
-{
-}
-
-void tst_QmlGraphicsGridView::items()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    model.addItem("Fred", "12345");
-    model.addItem("John", "2345");
-    model.addItem("Bob", "54321");
-    model.addItem("Billy", "22345");
-    model.addItem("Sam", "2945");
-    model.addItem("Ben", "04321");
-    model.addItem("Jim", "0780");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("testTopToBottom", QVariant(false));
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
-    QVERIFY(gridview != 0);
-
-    QmlGraphicsItem *viewport = gridview->viewport();
-    QVERIFY(viewport != 0);
-
-    QCOMPARE(gridview->count(), model.count());
-    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
-
-    for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", i);
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
-        QVERIFY(number != 0);
-        QCOMPARE(number->text(), model.number(i));
-    }
-
-    // set an empty model and confirm that items are destroyed
-    TestModel model2;
-    ctxt->setContextProperty("testModel", &model2);
-
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    QVERIFY(itemCount == 0);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsGridView::changed()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    model.addItem("Fred", "12345");
-    model.addItem("John", "2345");
-    model.addItem("Bob", "54321");
-    model.addItem("Billy", "22345");
-    model.addItem("Sam", "2945");
-    model.addItem("Ben", "04321");
-    model.addItem("Jim", "0780");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("testTopToBottom", QVariant(false));
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsFlickable *gridview = findItem<QmlGraphicsFlickable>(canvas->rootObject(), "grid");
-    QVERIFY(gridview != 0);
-
-    QmlGraphicsItem *viewport = gridview->viewport();
-    QVERIFY(viewport != 0);
-
-    model.modifyItem(1, "Will", "9876");
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(1));
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsGridView::inserted()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    model.addItem("Fred", "12345");
-    model.addItem("John", "2345");
-    model.addItem("Bob", "54321");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("testTopToBottom", QVariant(false));
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
-    QVERIFY(gridview != 0);
-
-    QmlGraphicsItem *viewport = gridview->viewport();
-    QVERIFY(viewport != 0);
-
-    model.insertItem(1, "Will", "9876");
-
-    // let transitions settle.
-    QTest::qWait(300);
-
-    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
-
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(1));
-
-    // Confirm items positioned correctly
-    for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        QCOMPARE(item->x(), (i%3)*80.0);
-        QCOMPARE(item->y(), (i/3)*60.0);
-    }
-
-    model.insertItem(0, "Foo", "1111"); // zero index, and current item
-
-    // let transitions settle.
-    QTest::qWait(300);
-
-    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
-
-    name = findItem<QmlGraphicsText>(viewport, "textName", 0);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(0));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(0));
-
-    QCOMPARE(gridview->currentIndex(), 1);
-
-    // Confirm items positioned correctly
-    for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        QVERIFY(item->x() == (i%3)*80);
-        QVERIFY(item->y() == (i/3)*60);
-    }
-
-    for (int i = model.count(); i < 30; ++i)
-        model.insertItem(i, "Hello", QString::number(i));
-    QTest::qWait(300);
-
-    gridview->setViewportY(120);
-    QTest::qWait(300);
-
-    // Insert item outside visible area
-    model.insertItem(1, "Hello", "1324");
-    QTest::qWait(300);
-
-    QVERIFY(gridview->viewportY() == 120);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsGridView::removed()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 40; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("testTopToBottom", QVariant(false));
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
-    QVERIFY(gridview != 0);
-
-    QmlGraphicsItem *viewport = gridview->viewport();
-    QVERIFY(viewport != 0);
-
-    model.removeItem(1);
-
-    // let transitions settle.
-    QTest::qWait(300);
-
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(1));
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->x() == (i%3)*80);
-        QVERIFY(item->y() == (i/3)*60);
-    }
-
-    // Remove first item (which is the current item);
-    model.removeItem(0);
-
-    // let transitions settle.
-    QTest::qWait(300);
-
-    name = findItem<QmlGraphicsText>(viewport, "textName", 0);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(0));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(0));
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->x() == (i%3)*80);
-        QVERIFY(item->y() == (i/3)*60);
-    }
-
-    // Remove items not visible
-    model.removeItem(25);
-    // let transitions settle.
-    QTest::qWait(300);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->x() == (i%3)*80);
-        QVERIFY(item->y() == (i/3)*60);
-    }
-
-    // Remove items before visible
-    gridview->setViewportY(120);
-    QTest::qWait(500);
-    gridview->setCurrentIndex(10);
-
-    // let transitions settle.
-    QTest::qWait(300);
-
-    // Setting currentIndex above shouldn't cause view to scroll
-    QCOMPARE(gridview->viewportY(), 120.0);
-
-    model.removeItem(1);
-
-    // let transitions settle.
-    QTest::qWait(300);
-
-    // Confirm items positioned correctly
-    for (int i = 6; i < 18; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->x() == (i%3)*80);
-        QVERIFY(item->y() == (i/3)*60);
-    }
-
-    // Remove currentIndex
-    QmlGraphicsItem *oldCurrent = gridview->currentItem();
-    model.removeItem(9);
-    QTest::qWait(500);
-
-    QCOMPARE(gridview->currentIndex(), 9);
-    QVERIFY(gridview->currentItem() != oldCurrent);
-
-    gridview->setViewportY(0);
-    // let transitions settle.
-    QTest::qWait(300);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->x() == (i%3)*80);
-        QVERIFY(item->y() == (i/3)*60);
-    }
-
-    // remove item outside current view.
-    gridview->setCurrentIndex(32);
-    QTest::qWait(500);
-    gridview->setViewportY(240);
-
-    model.removeItem(30);
-    QVERIFY(gridview->currentIndex() == 31);
-
-    // remove current item beyond visible items.
-    gridview->setCurrentIndex(20);
-    QTest::qWait(500);
-    gridview->setViewportY(0);
-    model.removeItem(20);
-    QTest::qWait(500);
-
-    QCOMPARE(gridview->currentIndex(), 20);
-    QVERIFY(gridview->currentItem() != 0);
-
-    // remove item before current, but visible
-    gridview->setCurrentIndex(8);
-    QTest::qWait(500);
-    gridview->setViewportY(240);
-    oldCurrent = gridview->currentItem();
-    model.removeItem(6);
-    QTest::qWait(500);
-
-    QCOMPARE(gridview->currentIndex(), 7);
-    QVERIFY(gridview->currentItem() == oldCurrent);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsGridView::moved()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("testTopToBottom", QVariant(false));
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
-    QVERIFY(gridview != 0);
-
-    QmlGraphicsItem *viewport = gridview->viewport();
-    QVERIFY(viewport != 0);
-
-    model.moveItem(1, 8);
-
-    // let transitions settle.
-    QTest::qWait(300);
-
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(1));
-
-    name = findItem<QmlGraphicsText>(viewport, "textName", 8);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(8));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 8);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(8));
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->x() == (i%3)*80);
-        QVERIFY(item->y() == (i/3)*60);
-    }
-
-    gridview->setViewportY(120);
-
-    // move outside visible area
-    model.moveItem(1, 25);
-
-    // let transitions settle.
-    QTest::qWait(300);
-
-    // Confirm items positioned correctly and indexes correct
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count()-1;
-    for (int i = 6; i < model.count()-6 && i < itemCount+6; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->x(), qreal((i%3)*80));
-        QCOMPARE(item->y(), qreal((i/3)*60));
-        name = findItem<QmlGraphicsText>(viewport, "textName", i);
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), model.name(i));
-        number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
-        QVERIFY(number != 0);
-        QCOMPARE(number->text(), model.number(i));
-    }
-
-    // move from outside visible into visible
-    model.moveItem(28, 8);
-
-    // let transitions settle.
-    QTest::qWait(300);
-
-    // Confirm items positioned correctly and indexes correct
-    for (int i = 6; i < model.count()-6 && i < itemCount+6; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->x() == (i%3)*80);
-        QVERIFY(item->y() == (i/3)*60);
-        name = findItem<QmlGraphicsText>(viewport, "textName", i);
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), model.name(i));
-        number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
-        QVERIFY(number != 0);
-        QCOMPARE(number->text(), model.number(i));
-    }
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsGridView::currentIndex()
-{
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), QString::number(i));
-
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    QString filename(SRCDIR "/data/gridview-initCurrent.qml");
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    qApp->processEvents();
-
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
-    QVERIFY(gridview != 0);
-
-    QmlGraphicsItem *viewport = gridview->viewport();
-    QVERIFY(viewport != 0);
-
-    QTest::qWait(500);
-
-    // current item should be third item
-    QCOMPARE(gridview->currentIndex(), 5);
-    QCOMPARE(gridview->currentItem(), findItem<QmlGraphicsItem>(viewport, "wrapper", 5));
-    QCOMPARE(gridview->currentItem()->y(), gridview->highlightItem()->y());
-
-    gridview->moveCurrentIndexRight();
-    QCOMPARE(gridview->currentIndex(), 6);
-    gridview->moveCurrentIndexDown();
-    QCOMPARE(gridview->currentIndex(), 9);
-    gridview->moveCurrentIndexUp();
-    QCOMPARE(gridview->currentIndex(), 6);
-    gridview->moveCurrentIndexLeft();
-    QCOMPARE(gridview->currentIndex(), 5);
-
-    // no wrap
-    gridview->setCurrentIndex(0);
-    QCOMPARE(gridview->currentIndex(), 0);
-
-    gridview->moveCurrentIndexUp();
-    QCOMPARE(gridview->currentIndex(), 0);
-
-    gridview->moveCurrentIndexLeft();
-    QCOMPARE(gridview->currentIndex(), 0);
-
-    gridview->setCurrentIndex(model.count()-1);
-    QTest::qWait(500);
-    QCOMPARE(gridview->currentIndex(), model.count()-1);
-
-    gridview->moveCurrentIndexRight();
-    QCOMPARE(gridview->currentIndex(), model.count()-1);
-
-    gridview->moveCurrentIndexDown();
-    QCOMPARE(gridview->currentIndex(), model.count()-1);
-
-    // with wrap
-    gridview->setWrapEnabled(true);
-
-    gridview->setCurrentIndex(0);
-    QCOMPARE(gridview->currentIndex(), 0);
-    QTest::qWait(500);
-
-    gridview->moveCurrentIndexLeft();
-    QCOMPARE(gridview->currentIndex(), model.count()-1);
-
-    QTest::qWait(500);
-    QCOMPARE(gridview->viewportY(), 279.0);
-
-    gridview->moveCurrentIndexRight();
-    QCOMPARE(gridview->currentIndex(), 0);
-
-    QTest::qWait(500);
-    QCOMPARE(gridview->viewportY(), 0.0);
-
-    // Test keys
-    qApp->setActiveWindow(canvas);
-    canvas->show();
-    canvas->setFocus();
-    qApp->processEvents();
-
-    QTest::keyClick(canvas, Qt::Key_Down);
-    QCOMPARE(gridview->currentIndex(), 3);
-
-    QTest::keyClick(canvas, Qt::Key_Up);
-    QCOMPARE(gridview->currentIndex(), 0);
-
-    gridview->setFlow(QmlGraphicsGridView::TopToBottom);
-
-    QTest::keyClick(canvas, Qt::Key_Right);
-    QCOMPARE(gridview->currentIndex(), 5);
-
-    QTest::keyClick(canvas, Qt::Key_Left);
-    QCOMPARE(gridview->currentIndex(), 0);
-
-    QTest::keyClick(canvas, Qt::Key_Down);
-    QCOMPARE(gridview->currentIndex(), 1);
-
-    QTest::keyClick(canvas, Qt::Key_Up);
-    QCOMPARE(gridview->currentIndex(), 0);
-
-
-    // turn off auto highlight
-    gridview->setHighlightFollowsCurrentItem(false);
-    QVERIFY(gridview->highlightFollowsCurrentItem() == false);
-
-    QTest::qWait(500);
-    QVERIFY(gridview->highlightItem());
-    qreal hlPosX = gridview->highlightItem()->x();
-    qreal hlPosY = gridview->highlightItem()->y();
-
-    gridview->setCurrentIndex(5);
-    QTest::qWait(500);
-    QCOMPARE(gridview->highlightItem()->x(), hlPosX);
-    QCOMPARE(gridview->highlightItem()->y(), hlPosY);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsGridView::changeFlow()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), QString::number(i));
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("testTopToBottom", QVariant(false));
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
-    QVERIFY(gridview != 0);
-
-    QmlGraphicsItem *viewport = gridview->viewport();
-    QVERIFY(viewport != 0);
-
-    // Confirm items positioned correctly and indexes correct
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->x(), qreal((i%3)*80));
-        QCOMPARE(item->y(), qreal((i/3)*60));
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", i);
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
-        QVERIFY(number != 0);
-        QCOMPARE(number->text(), model.number(i));
-    }
-
-    ctxt->setContextProperty("testTopToBottom", QVariant(true));
-    QTest::qWait(500);
-
-    // Confirm items positioned correctly and indexes correct
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->x(), qreal((i/5)*80));
-        QCOMPARE(item->y(), qreal((i%5)*60));
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", i);
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
-        QVERIFY(number != 0);
-        QCOMPARE(number->text(), model.number(i));
-    }
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsGridView::defaultValues()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview3.qml"));
-    QmlGraphicsGridView *obj = qobject_cast<QmlGraphicsGridView*>(c.create());
-
-    QVERIFY(obj != 0);
-    QVERIFY(obj->model() == QVariant());
-    QVERIFY(obj->delegate() == 0);
-    QCOMPARE(obj->currentIndex(), -1);
-    QVERIFY(obj->currentItem() == 0);
-    QCOMPARE(obj->count(), 0);
-    QVERIFY(obj->highlight() == 0);
-    QVERIFY(obj->highlightItem() == 0);
-    QCOMPARE(obj->highlightFollowsCurrentItem(), true);
-    QVERIFY(obj->flow() == 0);
-    QCOMPARE(obj->isWrapEnabled(), false);
-    QCOMPARE(obj->cacheBuffer(), 0);
-    QCOMPARE(obj->cellWidth(), 100); //### Should 100 be the default?
-    QCOMPARE(obj->cellHeight(), 100);
-    delete obj;
-}
-
-void tst_QmlGraphicsGridView::properties()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview2.qml"));
-    QmlGraphicsGridView *obj = qobject_cast<QmlGraphicsGridView*>(c.create());
-
-    QVERIFY(obj != 0);
-    QVERIFY(obj->model() != QVariant());
-    QVERIFY(obj->delegate() != 0);
-    QCOMPARE(obj->currentIndex(), 0);
-    QVERIFY(obj->currentItem() != 0);
-    QCOMPARE(obj->count(), 4);
-    QVERIFY(obj->highlight() != 0);
-    QVERIFY(obj->highlightItem() != 0);
-    QCOMPARE(obj->highlightFollowsCurrentItem(), false);
-    QVERIFY(obj->flow() == 0);
-    QCOMPARE(obj->isWrapEnabled(), true);
-    QCOMPARE(obj->cacheBuffer(), 200);
-    QCOMPARE(obj->cellWidth(), 100);
-    QCOMPARE(obj->cellHeight(), 100);
-    delete obj;
-}
-
-void tst_QmlGraphicsGridView::positionViewAtIndex()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 40; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("testTopToBottom", QVariant(false));
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
-    QVERIFY(gridview != 0);
-
-    QmlGraphicsItem *viewport = gridview->viewport();
-    QVERIFY(viewport != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->x(), (i%3)*80.);
-        QCOMPARE(item->y(), (i/3)*60.);
-    }
-
-    // Position on a currently visible item
-    gridview->positionViewAtIndex(4);
-    QCOMPARE(gridview->viewportY(), 60.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 3; i < model.count() && i < itemCount-3-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->x(), (i%3)*80.);
-        QCOMPARE(item->y(), (i/3)*60.);
-    }
-
-    // Position on an item beyond the visible items
-    gridview->positionViewAtIndex(21);
-    QCOMPARE(gridview->viewportY(), 420.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 22; i < model.count() && i < itemCount-22-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->x(), (i%3)*80.);
-        QCOMPARE(item->y(), (i/3)*60.);
-    }
-
-    // Position on an item that would leave empty space if positioned at the top
-    gridview->positionViewAtIndex(31);
-    QCOMPARE(gridview->viewportY(), 520.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 24; i < model.count() && i < itemCount-24-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->x(), (i%3)*80.);
-        QCOMPARE(item->y(), (i/3)*60.);
-    }
-
-    // Position at the beginning again
-    gridview->positionViewAtIndex(0);
-    QCOMPARE(gridview->viewportY(), 0.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->x(), (i%3)*80.);
-        QCOMPARE(item->y(), (i/3)*60.);
-    }
-
-    delete canvas;
-}
-
-QmlView *tst_QmlGraphicsGridView::createView()
-{
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    return canvas;
-}
-
-/*
-   Find an item with the specified objectName.  If index is supplied then the
-   item must also evaluate the {index} expression equal to index
-*/
-template<typename T>
-T *tst_QmlGraphicsGridView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
-{
-    const QMetaObject &mo = T::staticMetaObject;
-    //qDebug() << parent->childItems().count() << "children";
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if(!item)
-            continue;
-        //qDebug() << "try" << item;
-        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
-            if (index != -1) {
-                QmlContext *context = QmlEngine::contextForObject(item);
-                if (context) {
-                    if (context->contextProperty("index").toInt() == index) {
-                        return static_cast<T*>(item);
-                    }
-                }
-            } else {
-                return static_cast<T*>(item);
-            }
-        }
-        item = findItem<T>(item, objectName, index);
-        if (item)
-            return static_cast<T*>(item);
-    }
-
-    return 0;
-}
-
-template<typename T>
-QList<T*> tst_QmlGraphicsGridView::findItems(QGraphicsObject *parent, const QString &objectName)
-{
-    QList<T*> items;
-    const QMetaObject &mo = T::staticMetaObject;
-    //qDebug() << parent->childItems().count() << "children";
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if(!item)
-            continue;
-        //qDebug() << "try" << item;
-        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
-            items.append(static_cast<T*>(item));
-            //qDebug() << " found:" << item;
-        }
-        items += findItems<T>(item, objectName);
-    }
-
-    return items;
-}
-
-void tst_QmlGraphicsGridView::dumpTree(QmlGraphicsItem *parent, int depth)
-{
-    static QString padding("                       ");
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if(!item)
-            continue;
-        QmlContext *context = QmlEngine::contextForObject(item);
-        qDebug() << padding.left(depth*2) << item << (context ? context->contextProperty("index").toInt() : -1);
-        dumpTree(item, depth+1);
-    }
-}
-
-
-QTEST_MAIN(tst_QmlGraphicsGridView)
-
-#include "tst_qmlgraphicsgridview.moc"
diff --git a/tests/auto/declarative/qmlgraphicsimage/data/colors.png b/tests/auto/declarative/qmlgraphicsimage/data/colors.png
deleted file mode 100644
index dfb62f3..0000000
Binary files a/tests/auto/declarative/qmlgraphicsimage/data/colors.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlgraphicsimage/qmlgraphicsimage.pro b/tests/auto/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
deleted file mode 100644
index b5f7f83..0000000
--- a/tests/auto/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui network
-macx:CONFIG -= app_bundle
-
-HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsimage.cpp ../shared/testhttpserver.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp b/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
deleted file mode 100644
index 503b05e..0000000
--- a/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QTextDocument>
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QDir>
-
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsimage_p.h>
-#include <private/qmlgraphicsimagebase_p.h>
-#include <private/qmlgraphicsloader_p.h>
-#include <QtDeclarative/qmlcontext.h>
-
-#include "../shared/testhttpserver.h"
-
-
-#define SERVER_PORT 14445
-#define SERVER_ADDR "http://127.0.0.1:14445"
-
-#define TRY_WAIT(expr) \
-    do { \
-        for (int ii = 0; ii < 6; ++ii) { \
-            if ((expr)) break; \
-            QTest::qWait(50); \
-        } \
-        QVERIFY((expr)); \
-    } while (false)
-
-
-class tst_qmlgraphicsimage : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicsimage();
-
-private slots:
-    void noSource();
-    void imageSource();
-    void imageSource_data();
-    void clearSource();
-    void resized();
-    void smooth();
-    void pixmap();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlgraphicsimage::tst_qmlgraphicsimage()
-{
-}
-
-void tst_qmlgraphicsimage::noSource()
-{
-    QString componentStr = "import Qt 4.6\nImage { source: \"\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->source(), QUrl());
-    QVERIFY(obj->status() == QmlGraphicsImage::Null);
-    QCOMPARE(obj->width(), 0.);
-    QCOMPARE(obj->height(), 0.);
-    QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
-    QCOMPARE(obj->progress(), 0.0);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsimage::imageSource_data()
-{
-    QTest::addColumn<QString>("source");
-    QTest::addColumn<bool>("remote");
-    QTest::addColumn<QString>("error");
-
-    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << false << "";
-    QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << false
-        << "Cannot open  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() + "\" )  ";
-    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << "";
-    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true
-        << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
-}
-
-void tst_qmlgraphicsimage::imageSource()
-{
-    QFETCH(QString, source);
-    QFETCH(bool, remote);
-    QFETCH(QString, error);
-
-    TestHTTPServer server(SERVER_PORT);
-    if (remote) {
-        QVERIFY(server.isValid());
-        server.serveDirectory(SRCDIR "/data");
-    }
-
-    if (!error.isEmpty())
-        QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
-
-    QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
-    QVERIFY(obj != 0);
-    
-    if (remote)
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Loading);
-
-    QCOMPARE(obj->source(), remote ? source : QUrl(source));
-
-    if (error.isEmpty()) {
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Ready);
-        QCOMPARE(obj->width(), 120.);
-        QCOMPARE(obj->height(), 120.);
-        QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
-        QCOMPARE(obj->progress(), 1.0);
-    } else {
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Error);
-    }
-
-    delete obj;
-}
-
-void tst_qmlgraphicsimage::clearSource()
-{
-    QString componentStr = "import Qt 4.6\nImage { source: srcImage }";
-    QmlContext *ctxt = engine.rootContext();
-    ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png"));
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
-    QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QmlGraphicsImage::Ready);
-    QCOMPARE(obj->width(), 120.);
-    QCOMPARE(obj->height(), 120.);
-    QCOMPARE(obj->progress(), 1.0);
-
-    ctxt->setContextProperty("srcImage", "");
-    QVERIFY(obj->source().isEmpty());
-    QVERIFY(obj->status() == QmlGraphicsImage::Null);
-    QCOMPARE(obj->width(), 0.);
-    QCOMPARE(obj->height(), 0.);
-    QCOMPARE(obj->progress(), 0.0);
-}
-
-void tst_qmlgraphicsimage::resized()
-{
-    QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 300 }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->width(), 300.);
-    QCOMPARE(obj->height(), 300.);
-    QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsimage::smooth()
-{
-    QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->width(), 300.);
-    QCOMPARE(obj->height(), 300.);
-    QCOMPARE(obj->smooth(), true);
-    QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
-
-    delete obj;
-}
-
-void tst_qmlgraphicsimage::pixmap()
-{
-    QString componentStr = "import Qt 4.6\nImage { pixmap: testPixmap }";
-
-    QPixmap pixmap;
-    QmlContext *ctxt = engine.rootContext();
-    ctxt->setContextProperty("testPixmap", pixmap);
-
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->source(), QUrl());
-    QVERIFY(obj->status() == QmlGraphicsImage::Null);
-    QCOMPARE(obj->width(), 0.);
-    QCOMPARE(obj->height(), 0.);
-    QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
-    QCOMPARE(obj->progress(), 0.0);
-    QVERIFY(obj->pixmap().isNull());
-
-    pixmap = QPixmap(SRCDIR "/data/colors.png");
-    ctxt->setContextProperty("testPixmap", pixmap);
-    QCOMPARE(obj->width(), 120.);
-    QCOMPARE(obj->height(), 120.);
-    QVERIFY(obj->status() == QmlGraphicsImage::Ready);
-
-    delete obj;
-}
-
-QTEST_MAIN(tst_qmlgraphicsimage)
-
-#include "tst_qmlgraphicsimage.moc"
diff --git a/tests/auto/declarative/qmlgraphicsitem/data/keynavigation.qml b/tests/auto/declarative/qmlgraphicsitem/data/keynavigation.qml
deleted file mode 100644
index 9281a17..0000000
--- a/tests/auto/declarative/qmlgraphicsitem/data/keynavigation.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-import Qt 4.6
-
-Grid {
-    columns: 2
-    width: 100; height: 100
-    Rectangle {
-        id: item1
-        objectName: "item1"
-        focus: true
-        width: 50; height: 50
-        color: focus ? "red" : "lightgray"
-        KeyNavigation.right: item2
-        KeyNavigation.down: item3
-    }
-    Rectangle {
-        id: item2
-        objectName: "item2"
-        width: 50; height: 50
-        color: focus ? "red" : "lightgray"
-        KeyNavigation.left: item1
-        KeyNavigation.down: item4
-    }
-    Rectangle {
-        id: item3
-        objectName: "item3"
-        width: 50; height: 50
-        color: focus ? "red" : "lightgray"
-        KeyNavigation.right: item4
-        KeyNavigation.up: item1
-    }
-    Rectangle {
-        id: item4
-        objectName: "item4"
-        width: 50; height: 50
-        color: focus ? "red" : "lightgray"
-        KeyNavigation.left: item3
-        KeyNavigation.up: item2
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsitem/data/keys.qml b/tests/auto/declarative/qmlgraphicsitem/data/keys.qml
deleted file mode 100644
index f3c1f7b..0000000
--- a/tests/auto/declarative/qmlgraphicsitem/data/keys.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-Item {
-    focus: true
-    Keys.onPressed: keysTestObject.keyPress(event.key, event.text, event.modifiers)
-    Keys.onReleased: { keysTestObject.keyRelease(event.key, event.text, event.modifiers); event.accepted = true; }
-    Keys.onReturnPressed: keysTestObject.keyPress(event.key, "Return", event.modifiers)
-    Keys.onDigit0Pressed: keysTestObject.keyPress(event.key, event.text, event.modifiers)
-    Keys.onDigit9Pressed: { event.accepted = false; keysTestObject.keyPress(event.key, event.text, event.modifiers) }
-    Keys.forwardTo: [ item2 ]
-    Keys.enabled: enableKeyHanding
-
-    Item {
-        id: item2
-        Keys.onPressed: keysTestObject.forwardedKey(event.key)
-        Keys.onReleased: keysTestObject.forwardedKey(event.key)
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsitem/qmlgraphicsitem.pro b/tests/auto/declarative/qmlgraphicsitem/qmlgraphicsitem.pro
deleted file mode 100644
index ddabf9a..0000000
--- a/tests/auto/declarative/qmlgraphicsitem/qmlgraphicsitem.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicsitem.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp b/tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp
deleted file mode 100644
index 1bface4..0000000
--- a/tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtTest/QSignalSpy>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlview.h>
-#include <QtDeclarative/qmlgraphicsitem.h>
-
-class tst_QmlGraphicsItem : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_QmlGraphicsItem();
-
-private slots:
-    void keys();
-    void keyNavigation();
-    void smooth();
-    void clip();
-
-private:
-    template<typename T>
-    T *findItem(QGraphicsObject *parent, const QString &objectName);
-    QmlEngine engine;
-};
-
-class KeysTestObject : public QObject
-{
-    Q_OBJECT
-public:
-    KeysTestObject() : mKey(0), mModifiers(0), mForwardedKey(0) {}
-
-    void reset() {
-        mKey = 0;
-        mText = QString();
-        mModifiers = 0;
-        mForwardedKey = 0;
-    }
-
-public slots:
-    void keyPress(int key, QString text, int modifiers) {
-        mKey = key;
-        mText = text;
-        mModifiers = modifiers;
-    }
-    void keyRelease(int key, QString text, int modifiers) {
-        mKey = key;
-        mText = text;
-        mModifiers = modifiers;
-    }
-    void forwardedKey(int key) {
-        mForwardedKey = key;
-    }
-
-public:
-    int mKey;
-    QString mText;
-    int mModifiers;
-    int mForwardedKey;
-
-private:
-};
-
-
-tst_QmlGraphicsItem::tst_QmlGraphicsItem()
-{
-}
-
-void tst_QmlGraphicsItem::keys()
-{
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    KeysTestObject *testObject = new KeysTestObject;
-    canvas->rootContext()->setContextProperty("keysTestObject", testObject);
-
-    canvas->rootContext()->setContextProperty("enableKeyHanding", QVariant(true));
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keys.qml"));
-    canvas->show();
-    qApp->processEvents();
-
-    QEvent wa(QEvent::WindowActivate);
-    QApplication::sendEvent(canvas, &wa);
-    QFocusEvent fe(QEvent::FocusIn);
-    QApplication::sendEvent(canvas, &fe);
-
-    QKeyEvent key(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QCOMPARE(testObject->mKey, int(Qt::Key_A));
-    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A));
-    QCOMPARE(testObject->mText, QLatin1String("A"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
-    QVERIFY(!key.isAccepted());
-
-    testObject->reset();
-
-    key = QKeyEvent(QEvent::KeyRelease, Qt::Key_A, Qt::ShiftModifier, "A", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QCOMPARE(testObject->mKey, int(Qt::Key_A));
-    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A));
-    QCOMPARE(testObject->mText, QLatin1String("A"));
-    QVERIFY(testObject->mModifiers == Qt::ShiftModifier);
-    QVERIFY(key.isAccepted());
-
-    testObject->reset();
-
-    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QCOMPARE(testObject->mKey, int(Qt::Key_Return));
-    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Return));
-    QCOMPARE(testObject->mText, QLatin1String("Return"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
-    QVERIFY(key.isAccepted());
-
-    testObject->reset();
-
-    key = QKeyEvent(QEvent::KeyPress, Qt::Key_0, Qt::NoModifier, "0", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QCOMPARE(testObject->mKey, int(Qt::Key_0));
-    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_0));
-    QCOMPARE(testObject->mText, QLatin1String("0"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
-    QVERIFY(key.isAccepted());
-
-    testObject->reset();
-
-    key = QKeyEvent(QEvent::KeyPress, Qt::Key_9, Qt::NoModifier, "9", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QCOMPARE(testObject->mKey, int(Qt::Key_9));
-    QCOMPARE(testObject->mForwardedKey, int(Qt::Key_9));
-    QCOMPARE(testObject->mText, QLatin1String("9"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
-    QVERIFY(!key.isAccepted());
-
-    testObject->reset();
-
-    canvas->rootContext()->setContextProperty("enableKeyHanding", QVariant(false));
-
-    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QCOMPARE(testObject->mKey, 0);
-    QVERIFY(!key.isAccepted());
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QmlGraphicsItem::keyNavigation()
-{
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keynavigation.qml"));
-    canvas->show();
-    qApp->processEvents();
-
-    QEvent wa(QEvent::WindowActivate);
-    QApplication::sendEvent(canvas, &wa);
-    QFocusEvent fe(QEvent::FocusIn);
-    QApplication::sendEvent(canvas, &fe);
-
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item1");
-    QVERIFY(item);
-    QVERIFY(item->hasFocus());
-
-    // right
-    QKeyEvent key(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QVERIFY(key.isAccepted());
-
-    item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item2");
-    QVERIFY(item);
-    QVERIFY(item->hasFocus());
-
-    // down
-    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QVERIFY(key.isAccepted());
-
-    item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item4");
-    QVERIFY(item);
-    QVERIFY(item->hasFocus());
-
-    // left
-    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier, "", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QVERIFY(key.isAccepted());
-
-    item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item3");
-    QVERIFY(item);
-    QVERIFY(item->hasFocus());
-
-    // up
-    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier, "", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QVERIFY(key.isAccepted());
-
-    item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item1");
-    QVERIFY(item);
-    QVERIFY(item->hasFocus());
-}
-
-void tst_QmlGraphicsItem::smooth()
-{
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6; Item { smooth: false; }", QUrl::fromLocalFile(""));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
-    QSignalSpy spy(item, SIGNAL(smoothChanged()));
-
-    QVERIFY(item);
-    QVERIFY(!item->smooth());
-
-    item->setSmooth(true);
-    QVERIFY(item->smooth());
-    QCOMPARE(spy.count(),1);
-    item->setSmooth(true);
-    QCOMPARE(spy.count(),1);
-
-    item->setSmooth(false);
-    QVERIFY(!item->smooth());
-    QCOMPARE(spy.count(),2);
-    item->setSmooth(false);
-    QCOMPARE(spy.count(),2);
-}
-
-void tst_QmlGraphicsItem::clip()
-{
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6\nItem { clip: false\n }", QUrl::fromLocalFile(""));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
-    QSignalSpy spy(item, SIGNAL(clipChanged()));
-
-    QVERIFY(item);
-    QVERIFY(!item->clip());
-
-    item->setClip(true);
-    QVERIFY(item->clip());
-    QCOMPARE(spy.count(),1);
-    item->setClip(true);
-    QCOMPARE(spy.count(),1);
-
-    item->setClip(false);
-    QVERIFY(!item->clip());
-    QCOMPARE(spy.count(),2);
-    item->setClip(false);
-    QCOMPARE(spy.count(),2);
-}
-
-template<typename T>
-T *tst_QmlGraphicsItem::findItem(QGraphicsObject *parent, const QString &objectName)
-{
-    if (!parent)
-        return 0;
-
-    const QMetaObject &mo = T::staticMetaObject;
-    //qDebug() << parent->QGraphicsObject::children().count() << "children";
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if(!item)
-            continue;
-        //qDebug() << "try" << item;
-        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName))
-            return static_cast<T*>(item);
-        item = findItem<T>(item, objectName);
-        if (item)
-            return static_cast<T*>(item);
-    }
-
-    return 0;
-}
-
-
-
-QTEST_MAIN(tst_QmlGraphicsItem)
-
-#include "tst_qmlgraphicsitem.moc"
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/itemlist.qml b/tests/auto/declarative/qmlgraphicslistview/data/itemlist.qml
deleted file mode 100644
index e6b5c8f..0000000
--- a/tests/auto/declarative/qmlgraphicslistview/data/itemlist.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-// This example demonstrates placing items in a view using
-// a VisualItemModel
-
-import Qt 4.6
-
-Rectangle {
-    color: "lightgray"
-    width: 240
-    height: 320
-
-    VisualItemModel {
-        id: itemModel
-        objectName: "itemModel"
-        Rectangle {
-            objectName: "item1"
-            height: view.height; width: view.width; color: "#FFFEF0"
-            Text { objectName: "text1"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
-        }
-        Rectangle {
-            objectName: "item2"
-            height: view.height; width: view.width; color: "#F0FFF7"
-            Text { objectName: "text2"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
-        }
-        Rectangle {
-            objectName: "item3"
-            height: view.height; width: view.width; color: "#F4F0FF"
-            Text { objectName: "text3"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
-        }
-    }
-
-    ListView {
-        id: view
-        objectName: "view"
-        anchors.fill: parent
-        anchors.bottomMargin: 30
-        model: itemModel
-        preferredHighlightBegin: 0
-        preferredHighlightEnd: 0
-        highlightRangeMode: "StrictlyEnforceRange"
-        orientation: ListView.Horizontal
-        flickDeceleration: 2000
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-enforcerange.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview-enforcerange.qml
deleted file mode 100644
index 46fddae..0000000
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview-enforcerange.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    color: "#ffffff"
-    Component {
-        id: myDelegate
-        Item {
-            id: wrapper
-            objectName: "wrapper"
-            height: 20
-            width: 240
-            Text {
-                text: index
-            }
-            Text {
-                x: 30
-                id: textName
-                objectName: "textName"
-                text: name
-            }
-            Text {
-                x: 120
-                id: textNumber
-                objectName: "textNumber"
-                text: number
-            }
-            Text {
-                x: 200
-                text: wrapper.y
-            }
-        }
-    }
-
-    Component {
-        id: myHighlight
-        Rectangle {
-            color: "lightsteelblue"
-        }
-    }
-        
-    ListView {
-        id: list
-        objectName: "list"
-        width: 240
-        height: 320
-        model: testModel
-        delegate: myDelegate
-        highlight: myHighlight
-        preferredHighlightBegin: 100
-        preferredHighlightEnd: 100
-        highlightRangeMode: "StrictlyEnforceRange"
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
deleted file mode 100644
index 74f5ef4..0000000
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    color: "#ffffff"
-    resources: [
-        Component {
-            id: myDelegate
-            Rectangle {
-                id: wrapper
-                objectName: "wrapper"
-                height: 20
-                width: 240
-                Text {
-                    text: index
-                }
-                Text {
-                    x: 30
-                    id: textName
-                    objectName: "textName"
-                    text: name
-                }
-                Text {
-                    x: 120
-                    id: textNumber
-                    objectName: "textNumber"
-                    text: number
-                }
-                Text {
-                    x: 200
-                    text: wrapper.y
-                }
-                color: ListView.isCurrentItem ? "lightsteelblue" : "white"
-            }
-        }
-    ]
-    ListView {
-        id: list
-        objectName: "list"
-        focus: true
-        currentIndex: 3
-        width: 240
-        height: 320
-        keyNavigationWraps: testWrap
-        delegate: myDelegate
-        highlightMoveSpeed: 1000
-        model: testModel
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml
deleted file mode 100644
index 4b5bea6..0000000
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    color: "#ffffff"
-    resources: [
-        Component {
-            id: myDelegate
-            Item {
-                id: wrapper
-                objectName: "wrapper"
-                height: ListView.prevSection != ListView.section ? 40 : 20;
-                width: 240
-                Rectangle {
-                    y: wrapper.ListView.prevSection != wrapper.ListView.section ? 20 : 0
-                    height: 20
-                    width: parent.width
-                    color: wrapper.ListView.isCurrentItem ? "lightsteelblue" : "white"
-                    Text {
-                        text: index
-                    }
-                    Text {
-                        x: 30
-                        id: textName
-                        objectName: "textName"
-                        text: name
-                    }
-                    Text {
-                        x: 120
-                        id: textNumber
-                        objectName: "textNumber"
-                        text: number
-                    }
-                    Text {
-                        x: 200
-                        text: wrapper.y
-                    }
-                }
-                Rectangle {
-                    color: "#99bb99"
-                    height: wrapper.ListView.prevSection != wrapper.ListView.section ? 20 : 0
-                    width: parent.width
-                    visible: wrapper.ListView.prevSection != wrapper.ListView.section ? true : false
-                    Text { text: wrapper.ListView.section }
-                }
-            }
-        }
-    ]
-    ListView {
-        id: list
-        objectName: "list"
-        width: 240
-        height: 320
-        model: testModel
-        delegate: myDelegate
-        section.property: "number"
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
deleted file mode 100644
index 1c1b3f8..0000000
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
+++ /dev/null
@@ -1,119 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    color: "#ffffff"
-    function checkProperties() {
-        testObject.error = false;
-        if (list.model != testModel) {
-            console.log("model property incorrect");
-            testObject.error = true;
-        }
-        if (!testObject.animate && list.delegate != myDelegate) {
-            console.log("delegate property incorrect - expected myDelegate");
-            testObject.error = true;
-        }
-        if (testObject.animate && list.delegate != animatedDelegate) {
-            console.log("delegate property incorrect - expected animatedDelegate");
-            testObject.error = true;
-        }
-        if (testObject.invalidHighlight && list.highlight != invalidHl) {
-            console.log("highlight property incorrect - expected invalidHl");
-            testObject.error = true;
-        }
-        if (!testObject.invalidHighlight && list.highlight != myHighlight) {
-            console.log("highlight property incorrect - expected myHighlight");
-            testObject.error = true;
-        }
-    }
-    resources: [
-        Component {
-            id: myDelegate
-            Rectangle {
-                id: wrapper
-                objectName: "wrapper"
-                height: 20
-                width: 240
-                Text {
-                    text: index
-                }
-                Text {
-                    x: 30
-                    id: textName
-                    objectName: "textName"
-                    text: name
-                }
-                Text {
-                    x: 120
-                    id: textNumber
-                    objectName: "textNumber"
-                    text: number
-                }
-                Text {
-                    x: 200
-                    text: wrapper.y
-                }
-                color: ListView.isCurrentItem ? "lightsteelblue" : "white"
-            }
-        },
-        Component {
-            id: animatedDelegate
-            Rectangle {
-                id: wrapper
-                objectName: "wrapper"
-                height: 20
-                width: 240
-                Text {
-                    text: index
-                }
-                Text {
-                    x: 30
-                    id: textName
-                    objectName: "textName"
-                    text: name
-                }
-                Text {
-                    x: 120
-                    id: textNumber
-                    objectName: "textNumber"
-                    text: number
-                }
-                Text {
-                    x: 200
-                    text: wrapper.y
-                }
-                color: ListView.isCurrentItem ? "lightsteelblue" : "white"
-                ListView.onRemove: SequentialAnimation {
-                    ScriptAction { script: console.log("Fix PropertyAction with attached properties") }
-/*
-                    PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
-                    NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" }
-                    PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
-*/
-                }
-            }
-        },
-        Component {
-            id: myHighlight
-            Rectangle { color: "green" }
-        },
-        Component {
-            id: invalidHl
-            EaseFollow {}
-        }
-    ]
-    ListView {
-        id: list
-        objectName: "list"
-        focus: true
-        width: 240
-        height: 320
-        model: testModel
-        delegate: testObject.animate ? animatedDelegate : myDelegate
-        highlight: testObject.invalidHighlight ? invalidHl : myHighlight
-        highlightMoveSpeed: 1000
-        highlightResizeSpeed: 1000
-        cacheBuffer: testObject.cacheBuffer
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicslistview/qmlgraphicslistview.pro b/tests/auto/declarative/qmlgraphicslistview/qmlgraphicslistview.pro
deleted file mode 100644
index f00de39..0000000
--- a/tests/auto/declarative/qmlgraphicslistview/qmlgraphicslistview.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicslistview.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
deleted file mode 100644
index cf96ad5..0000000
--- a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
+++ /dev/null
@@ -1,1370 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QtTest/QtTest>
-#include <private/qlistmodelinterface_p.h>
-#include <qmlview.h>
-#include <private/qmlgraphicslistview_p.h>
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmlgraphicsvisualitemmodel_p.h>
-#include <qmlcontext.h>
-#include <qmlexpression.h>
-
-class tst_QmlGraphicsListView : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QmlGraphicsListView();
-
-private slots:
-    // Test both QListModelInterface and QAbstractItemModel model types
-    void qListModelInterface_items();
-    void qAbstractItemModel_items();
-
-    void qListModelInterface_changed();
-    void qAbstractItemModel_changed();
-
-    void qListModelInterface_inserted();
-    void qAbstractItemModel_inserted();
-
-    void qListModelInterface_removed();
-    void qAbstractItemModel_removed();
-
-    void qListModelInterface_moved();
-    void qAbstractItemModel_moved();
-
-    void qListModelInterface_clear();
-    void qAbstractItemModel_clear();
-
-    void itemList();
-    void currentIndex();
-    void enforceRange();
-    void spacing();
-    void sections();
-    void cacheBuffer();
-    void positionViewAtIndex();
-
-private:
-    template <class T> void items();
-    template <class T> void changed();
-    template <class T> void inserted();
-    template <class T> void removed(bool animated);
-    template <class T> void moved();
-    template <class T> void clear();
-    QmlView *createView();
-    template<typename T>
-    T *findItem(QGraphicsObject *parent, const QString &id, int index=-1);
-    template<typename T>
-    QList<T*> findItems(QGraphicsObject *parent, const QString &objectName);
-    void dumpTree(QmlGraphicsItem *parent, int depth = 0);
-};
-
-class TestObject : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(bool error READ error WRITE setError NOTIFY changedError)
-    Q_PROPERTY(bool animate READ animate NOTIFY changedAnim)
-    Q_PROPERTY(bool invalidHighlight READ invalidHighlight NOTIFY changedHl)
-    Q_PROPERTY(int cacheBuffer READ cacheBuffer NOTIFY changedCacheBuffer)
-
-public:
-    TestObject(QObject *parent = 0)
-        : QObject(parent), mError(true), mAnimate(false), mInvalidHighlight(false)
-        , mCacheBuffer(0) {}
-
-    bool error() const { return mError; }
-    void setError(bool err) { mError = err; emit changedError(); }
-
-    bool animate() const { return mAnimate; }
-    void setAnimate(bool anim) { mAnimate = anim; emit changedAnim(); }
-
-    bool invalidHighlight() const { return mInvalidHighlight; }
-    void setInvalidHighlight(bool invalid) { mInvalidHighlight = invalid; emit changedHl(); }
-
-    int cacheBuffer() const { return mCacheBuffer; }
-    void setCacheBuffer(int buffer) { mCacheBuffer = buffer; emit changedCacheBuffer(); }
-
-signals:
-    void changedError();
-    void changedAnim();
-    void changedHl();
-    void changedCacheBuffer();
-
-public:
-    bool mError;
-    bool mAnimate;
-    bool mInvalidHighlight;
-    int mCacheBuffer;
-};
-
-class TestModel : public QListModelInterface
-{
-    Q_OBJECT
-public:
-    TestModel(QObject *parent = 0) : QListModelInterface(parent) {}
-    ~TestModel() {}
-
-    enum Roles { Name, Number };
-
-    QString name(int index) const { return list.at(index).first; }
-    QString number(int index) const { return list.at(index).second; }
-
-    int count() const { return list.count(); }
-
-    QList<int> roles() const { return QList<int>() << Name << Number; }
-    QString toString(int role) const {
-        switch(role) {
-        case Name:
-            return "name";
-        case Number:
-            return "number";
-        default:
-            return "";
-        }
-    }
-
-    QVariant data(int index, int role) const
-    {
-        if (role==0)
-            return list.at(index).first;
-        if (role==1)
-            return list.at(index).second;
-        return QVariant();
-    }
-    QHash<int, QVariant> data(int index, const QList<int> &roles) const {
-        QHash<int,QVariant> returnHash;
-
-        for (int i = 0; i < roles.size(); ++i) {
-            int role = roles.at(i);
-            QVariant info;
-            switch(role) {
-            case Name:
-                info = list.at(index).first;
-                break;
-            case Number:
-                info = list.at(index).second;
-                break;
-            default:
-                break;
-            }
-            returnHash.insert(role, info);
-        }
-        return returnHash;
-    }
-
-    void addItem(const QString &name, const QString &number) {
-        list.append(QPair<QString,QString>(name, number));
-        emit itemsInserted(list.count()-1, 1);
-    }
-
-    void insertItem(int index, const QString &name, const QString &number) {
-        list.insert(index, QPair<QString,QString>(name, number));
-        emit itemsInserted(index, 1);
-    }
-
-    void removeItem(int index) {
-        list.removeAt(index);
-        emit itemsRemoved(index, 1);
-    }
-
-    void moveItem(int from, int to) {
-        list.move(from, to);
-        emit itemsMoved(from, to, 1);
-    }
-
-    void modifyItem(int index, const QString &name, const QString &number) {
-        list[index] = QPair<QString,QString>(name, number);
-        emit itemsChanged(index, 1, roles());
-    }
-
-    void clear() {
-        int count = list.count();
-        list.clear();
-        emit itemsRemoved(0, count);
-    }
-
-private:
-    QList<QPair<QString,QString> > list;
-};
-
-
-class TestModel2 : public QAbstractListModel
-{
-public:
-    enum Roles { Name = Qt::UserRole+1, Number = Qt::UserRole+2 };
-
-    TestModel2(QObject *parent=0) : QAbstractListModel(parent) {
-        QHash<int, QByteArray> roles;
-        roles[Name] = "name";
-        roles[Number] = "number";
-        setRoleNames(roles);
-    }
-
-    int rowCount(const QModelIndex &parent=QModelIndex()) const { return list.count(); }
-    QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const {
-        QVariant rv;
-        if (role == Name)
-            rv = list.at(index.row()).first;
-        else if (role == Number)
-            rv = list.at(index.row()).second;
-
-        return rv;
-    }
-
-    int count() const { return rowCount(); }
-    QString name(int index) const { return list.at(index).first; }
-    QString number(int index) const { return list.at(index).second; }
-
-    void addItem(const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), list.count(), list.count());
-        list.append(QPair<QString,QString>(name, number));
-        emit endInsertRows();
-    }
-
-    void insertItem(int index, const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), index, index);
-        list.insert(index, QPair<QString,QString>(name, number));
-        emit endInsertRows();
-    }
-
-    void removeItem(int index) {
-        emit beginRemoveRows(QModelIndex(), index, index);
-        list.removeAt(index);
-        emit endRemoveRows();
-    }
-
-    void moveItem(int from, int to) {
-        emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
-        list.move(from, to);
-        emit endMoveRows();
-    }
-
-    void modifyItem(int idx, const QString &name, const QString &number) {
-        list[idx] = QPair<QString,QString>(name, number);
-        emit dataChanged(index(idx,0), index(idx,0));
-    }
-
-    void clear() {
-        int count = list.count();
-        emit beginRemoveRows(QModelIndex(), 0, count-1);
-        list.clear();
-        emit endRemoveRows();
-    }
-
-private:
-    QList<QPair<QString,QString> > list;
-};
-
-tst_QmlGraphicsListView::tst_QmlGraphicsListView()
-{
-}
-
-template <class T>
-void tst_QmlGraphicsListView::items()
-{
-    QmlView *canvas = createView();
-
-    T model;
-    model.addItem("Fred", "12345");
-    model.addItem("John", "2345");
-    model.addItem("Bob", "54321");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QVERIFY(testObject->error() == false);
-
-    QVERIFY(listview->highlightItem() != 0);
-    QCOMPARE(listview->count(), model.count());
-    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
-
-    // current item should be first item
-    QCOMPARE(listview->currentItem(), findItem<QmlGraphicsItem>(viewport, "wrapper", 0));
-
-    for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", i);
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
-        QVERIFY(number != 0);
-        QCOMPARE(number->text(), model.number(i));
-    }
-
-    // switch to other delegate
-    testObject->setAnimate(true);
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QVERIFY(testObject->error() == false);
-    QVERIFY(listview->currentItem());
-
-    // set invalid highlight
-    testObject->setInvalidHighlight(true);
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QVERIFY(testObject->error() == false);
-    QVERIFY(listview->currentItem());
-    QVERIFY(listview->highlightItem() == 0);
-
-    // back to normal highlight
-    testObject->setInvalidHighlight(false);
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QVERIFY(testObject->error() == false);
-    QVERIFY(listview->currentItem());
-    QVERIFY(listview->highlightItem() != 0);
-
-    // set an empty model and confirm that items are destroyed
-    T model2;
-    ctxt->setContextProperty("testModel", &model2);
-
-    // Allow deleteLaters to process
-    QTest::qWait(500);
-
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    QVERIFY(itemCount == 0);
-
-    QCOMPARE(listview->highlightResizeSpeed(), 1000.0);
-    QCOMPARE(listview->highlightMoveSpeed(), 1000.0);
-
-    delete canvas;
-}
-
-template <class T>
-void tst_QmlGraphicsListView::changed()
-{
-    QmlView *canvas = createView();
-
-    T model;
-    model.addItem("Fred", "12345");
-    model.addItem("John", "2345");
-    model.addItem("Bob", "54321");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsFlickable *listview = findItem<QmlGraphicsFlickable>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    model.modifyItem(1, "Will", "9876");
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(1));
-
-    delete canvas;
-}
-
-template <class T>
-void tst_QmlGraphicsListView::inserted()
-{
-    QmlView *canvas = createView();
-
-    T model;
-    model.addItem("Fred", "12345");
-    model.addItem("John", "2345");
-    model.addItem("Bob", "54321");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    model.insertItem(1, "Will", "9876");
-
-    // let transitions settle.
-    QTest::qWait(500);
-
-    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
-
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(1));
-
-    // Confirm items positioned correctly
-    for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        QCOMPARE(item->y(), i*20.0);
-    }
-
-    model.insertItem(0, "Foo", "1111"); // zero index, and current item
-
-    // let transitions settle.
-    QTest::qWait(500);
-
-    QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
-
-    name = findItem<QmlGraphicsText>(viewport, "textName", 0);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(0));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(0));
-
-    QCOMPARE(listview->currentIndex(), 1);
-
-    // Confirm items positioned correctly
-    for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        QCOMPARE(item->y(), i*20.0);
-    }
-
-    for (int i = model.count(); i < 30; ++i)
-        model.insertItem(i, "Hello", QString::number(i));
-    QTest::qWait(500);
-
-    listview->setViewportY(80);
-    QTest::qWait(500);
-
-    // Insert item outside visible area
-    model.insertItem(1, "Hello", "1324");
-    QTest::qWait(500);
-
-    QVERIFY(listview->viewportY() == 80);
-
-    // Confirm items positioned correctly
-    for (int i = 5; i < 5+15; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(), i*20.0 - 20.0);
-    }
-
-//    QCOMPARE(listview->viewportHeight(), model.count() * 20.0);
-
-    delete canvas;
-}
-
-template <class T>
-void tst_QmlGraphicsListView::removed(bool animated)
-{
-    QmlView *canvas = createView();
-
-    T model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    TestObject *testObject = new TestObject;
-    testObject->setAnimate(animated);
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    model.removeItem(1);
-
-    // let transitions settle.
-    QTest::qWait(500);
-
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(1));
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->y() == i*20);
-    }
-
-    // Remove first item (which is the current item);
-    model.removeItem(0);  // post: top item starts at 20
-
-    // let transitions settle.
-    QTest::qWait(500);
-
-    name = findItem<QmlGraphicsText>(viewport, "textName", 0);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(0));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(0));
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(),i*20.0 + 20.0);
-    }
-
-    // Remove items not visible
-    model.removeItem(18);
-    // let transitions settle.
-    QTest::qWait(500);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(),i*20.0+20.0);
-    }
-
-    // Remove items before visible
-    listview->setViewportY(80);
-    listview->setCurrentIndex(10);
-
-    model.removeItem(1); // post: top item will be at 40
-    // let transitions settle.
-    QTest::qWait(500);
-
-    // Confirm items positioned correctly
-    for (int i = 2; i < 18; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(),40+i*20.0);
-    }
-
-    // Remove current index
-    QVERIFY(listview->currentIndex() == 9);
-    QmlGraphicsItem *oldCurrent = listview->currentItem();
-    model.removeItem(9);
-    QTest::qWait(500);
-
-    QCOMPARE(listview->currentIndex(), 9);
-    QVERIFY(listview->currentItem() != oldCurrent);
-
-    listview->setViewportY(40); // That's the top now
-    // let transitions settle.
-    QTest::qWait(500);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(),40+i*20.0);
-    }
-
-    // remove current item beyond visible items.
-    listview->setCurrentIndex(20);
-    QTest::qWait(500);
-    listview->setViewportY(40);
-    model.removeItem(20);
-    QTest::qWait(500);
-
-    QCOMPARE(listview->currentIndex(), 20);
-    QVERIFY(listview->currentItem() != 0);
-
-    // remove item before current, but visible
-    listview->setCurrentIndex(8);
-    QTest::qWait(500);
-    oldCurrent = listview->currentItem();
-    model.removeItem(6);
-    QTest::qWait(500);
-
-    QCOMPARE(listview->currentIndex(), 7);
-    QVERIFY(listview->currentItem() == oldCurrent);
-
-    delete canvas;
-}
-
-template <class T>
-void tst_QmlGraphicsListView::clear()
-{
-    QmlView *canvas = createView();
-
-    T model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    model.clear();
-
-    // let transitions settle.
-    QTest::qWait(500);
-
-    QVERIFY(listview->count() == 0);
-    QVERIFY(listview->currentItem() == 0);
-    QVERIFY(listview->viewportY() == 0);
-
-    delete canvas;
-}
-
-
-template <class T>
-void tst_QmlGraphicsListView::moved()
-{
-    QmlView *canvas = createView();
-
-    T model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    model.moveItem(1, 4);
-
-    // let transitions settle.
-    QTest::qWait(500);
-
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(1));
-
-    name = findItem<QmlGraphicsText>(viewport, "textName", 4);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(4));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 4);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(4));
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->y() == i*20);
-    }
-
-    listview->setViewportY(80);
-
-    // move outside visible area
-    model.moveItem(1, 18);
-
-    // let transitions settle.
-    QTest::qWait(500);
-
-    // Confirm items positioned correctly and indexes correct
-    for (int i = 3; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(), i*20.0 + 20);
-        name = findItem<QmlGraphicsText>(viewport, "textName", i);
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), model.name(i));
-        number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
-        QVERIFY(number != 0);
-        QCOMPARE(number->text(), model.number(i));
-    }
-
-    // move from outside visible into visible
-    model.moveItem(20, 4);
-
-    // let transitions settle.
-    QTest::qWait(500);
-
-    // Confirm items positioned correctly and indexes correct
-    for (int i = 3; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(), i*20.0 + 20);
-        name = findItem<QmlGraphicsText>(viewport, "textName", i);
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), model.name(i));
-        number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
-        QVERIFY(number != 0);
-        QCOMPARE(number->text(), model.number(i));
-    }
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsListView::enforceRange()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview-enforcerange.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QCOMPARE(listview->preferredHighlightBegin(), 100.0);
-    QCOMPARE(listview->preferredHighlightEnd(), 100.0);
-    QCOMPARE(listview->highlightRangeMode(), QmlGraphicsListView::StrictlyEnforceRange);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    // view should be positioned at the top of the range.
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", 0);
-    QVERIFY(item);
-    QCOMPARE(listview->viewportY(), -100.0);
-
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 0);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), model.name(0));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
-    QVERIFY(number != 0);
-    QCOMPARE(number->text(), model.number(0));
-
-    // Check currentIndex is updated when viewport moves
-    listview->setViewportY(20);
-    QTest::qWait(500);
-
-    QCOMPARE(listview->currentIndex(), 6);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsListView::spacing()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->y() == i*20);
-    }
-
-    listview->setSpacing(10);
-    QVERIFY(listview->spacing() == 10);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->y() == i*30);
-    }
-
-    listview->setSpacing(0);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(), i*20.0);
-    }
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsListView::sections()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), QString::number(i/5));
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview-sections.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        QVERIFY(item);
-        QCOMPARE(item->y(), qreal(i*20 + ((i+4)/5) * 20));
-    }
-
-    // Remove section boundary
-    model.removeItem(5);
-
-    // New section header created
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", 5);
-    QVERIFY(item);
-    QCOMPARE(item->height(), 40.0);
-
-    model.insertItem(3, "New Item", "0");
-
-    // Section header moved
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 5);
-    QVERIFY(item);
-    QCOMPARE(item->height(), 20.0);
-
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 6);
-    QVERIFY(item);
-    QCOMPARE(item->height(), 40.0);
-
-    // insert item which will become a section header
-    model.insertItem(6, "Replace header", "1");
-
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 6);
-    QVERIFY(item);
-    QCOMPARE(item->height(), 40.0);
-
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 7);
-    QVERIFY(item);
-    QCOMPARE(item->height(), 20.0);
-
-    QCOMPARE(listview->currentSection(), QString("0"));
-
-    listview->setViewportY(140);
-    QCOMPARE(listview->currentSection(), QString("1"));
-
-    listview->setViewportY(20);
-    QCOMPARE(listview->currentSection(), QString("0"));
-
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 1);
-    QVERIFY(item);
-    QCOMPARE(item->height(), 20.0);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsListView::currentIndex()
-{
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), QString::number(i));
-
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("testWrap", QVariant(false));
-
-    QString filename(SRCDIR "/data/listview-initCurrent.qml");
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    QTest::qWait(500);
-
-    // current item should be third item
-    QCOMPARE(listview->currentIndex(), 3);
-    QCOMPARE(listview->currentItem(), findItem<QmlGraphicsItem>(viewport, "wrapper", 3));
-    QCOMPARE(listview->highlightItem()->y(), listview->currentItem()->y());
-
-    // no wrap
-    listview->setCurrentIndex(0);
-    QCOMPARE(listview->currentIndex(), 0);
-
-    listview->incrementCurrentIndex();
-    QCOMPARE(listview->currentIndex(), 1);
-    listview->decrementCurrentIndex();
-    QCOMPARE(listview->currentIndex(), 0);
-
-    listview->decrementCurrentIndex();
-    QCOMPARE(listview->currentIndex(), 0);
-
-    // with wrap
-    ctxt->setContextProperty("testWrap", QVariant(true));
-    QVERIFY(listview->isWrapEnabled());
-
-    listview->decrementCurrentIndex();
-    QCOMPARE(listview->currentIndex(), model.count()-1);
-
-    QTest::qWait(1000);
-    QCOMPARE(listview->viewportY(), 279.0);
-
-    listview->incrementCurrentIndex();
-    QCOMPARE(listview->currentIndex(), 0);
-
-    QTest::qWait(1000);
-    QCOMPARE(listview->viewportY(), 0.0);
-
-    // Test keys
-    canvas->show();
-    qApp->processEvents();
-
-    QEvent wa(QEvent::WindowActivate);
-    QApplication::sendEvent(canvas, &wa);
-    QFocusEvent fe(QEvent::FocusIn);
-    QApplication::sendEvent(canvas, &fe);
-
-    QKeyEvent key(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QVERIFY(key.isAccepted());
-    QCOMPARE(listview->currentIndex(), 1);
-
-    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier, "", false, 1);
-    QApplication::sendEvent(canvas, &key);
-    QVERIFY(key.isAccepted());
-    QCOMPARE(listview->currentIndex(), 0);
-
-    // turn off auto highlight
-    listview->setHighlightFollowsCurrentItem(false);
-    QVERIFY(listview->highlightFollowsCurrentItem() == false);
-
-    QTest::qWait(500);
-    QVERIFY(listview->highlightItem());
-    qreal hlPos = listview->highlightItem()->y();
-
-    listview->setCurrentIndex(4);
-    QTest::qWait(500);
-    QCOMPARE(listview->highlightItem()->y(), hlPos);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsListView::itemList()
-{
-    QmlView *canvas = createView();
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/itemlist.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "view");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    QmlGraphicsVisualItemModel *model = canvas->rootObject()->findChild<QmlGraphicsVisualItemModel*>("itemModel");
-    QVERIFY(model != 0);
-
-    QVERIFY(model->count() == 3);
-    QCOMPARE(listview->currentIndex(), 0);
-
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "item1");
-    QVERIFY(item);
-    QCOMPARE(item->x(), 0.0);
-
-    QmlGraphicsText *text = findItem<QmlGraphicsText>(viewport, "text1");
-    QVERIFY(text);
-    QCOMPARE(text->text(), QLatin1String("index: 0"));
-
-    listview->setCurrentIndex(2);
-    QTest::qWait(1000);
-
-    item = findItem<QmlGraphicsItem>(viewport, "item3");
-    QVERIFY(item);
-    QCOMPARE(item->x(), 480.0);
-
-    text = findItem<QmlGraphicsText>(viewport, "text3");
-    QVERIFY(text);
-    QCOMPARE(text->text(), QLatin1String("index: 2"));
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsListView::cacheBuffer()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-    QVERIFY(listview->delegate() != 0);
-    QVERIFY(listview->model() != 0);
-    QVERIFY(listview->highlight() != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->y() == i*20);
-    }
-
-    testObject->setCacheBuffer(400);
-    QVERIFY(listview->cacheBuffer() == 400);
-
-    int newItemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    QVERIFY(newItemCount > itemCount);
-
-    // Confirm items positioned correctly
-    for (int i = 0; i < model.count() && i < newItemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->y() == i*20);
-    }
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsListView::positionViewAtIndex()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 40; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QmlGraphicsItem *viewport = listview->viewport();
-    QVERIFY(viewport != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(), i*20.);
-    }
-
-    // Position on a currently visible item
-    listview->positionViewAtIndex(3);
-    QCOMPARE(listview->viewportY(), 60.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 3; i < model.count() && i < itemCount-3-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(), i*20.);
-    }
-
-    // Position on an item beyond the visible items
-    listview->positionViewAtIndex(22);
-    QCOMPARE(listview->viewportY(), 440.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 22; i < model.count() && i < itemCount-22-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(), i*20.);
-    }
-
-    // Position on an item that would leave empty space if positioned at the top
-    listview->positionViewAtIndex(28);
-    QCOMPARE(listview->viewportY(), 480.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 24; i < model.count() && i < itemCount-24-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(), i*20.);
-    }
-
-    // Position at the beginning again
-    listview->positionViewAtIndex(0);
-    QCOMPARE(listview->viewportY(), 0.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QCOMPARE(item->y(), i*20.);
-    }
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsListView::qListModelInterface_items()
-{
-    items<TestModel>();
-}
-
-void tst_QmlGraphicsListView::qAbstractItemModel_items()
-{
-    items<TestModel2>();
-}
-
-void tst_QmlGraphicsListView::qListModelInterface_changed()
-{
-    changed<TestModel>();
-}
-
-void tst_QmlGraphicsListView::qAbstractItemModel_changed()
-{
-    changed<TestModel2>();
-}
-
-void tst_QmlGraphicsListView::qListModelInterface_inserted()
-{
-    inserted<TestModel>();
-}
-
-void tst_QmlGraphicsListView::qAbstractItemModel_inserted()
-{
-    inserted<TestModel2>();
-}
-
-void tst_QmlGraphicsListView::qListModelInterface_removed()
-{
-    removed<TestModel>(false);
-    removed<TestModel>(true);
-}
-
-void tst_QmlGraphicsListView::qAbstractItemModel_removed()
-{
-    removed<TestModel2>(false);
-    removed<TestModel2>(true);
-}
-
-void tst_QmlGraphicsListView::qListModelInterface_moved()
-{
-    moved<TestModel>();
-}
-
-void tst_QmlGraphicsListView::qAbstractItemModel_moved()
-{
-    moved<TestModel2>();
-}
-
-void tst_QmlGraphicsListView::qListModelInterface_clear()
-{
-    clear<TestModel>();
-}
-
-void tst_QmlGraphicsListView::qAbstractItemModel_clear()
-{
-    clear<TestModel2>();
-}
-
-QmlView *tst_QmlGraphicsListView::createView()
-{
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    return canvas;
-}
-
-/*
-   Find an item with the specified objectName.  If index is supplied then the
-   item must also evaluate the {index} expression equal to index
-*/
-template<typename T>
-T *tst_QmlGraphicsListView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
-{
-    const QMetaObject &mo = T::staticMetaObject;
-    //qDebug() << parent->childItems().count() << "children";
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if(!item)
-            continue;
-        //qDebug() << "try" << item;
-        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
-            if (index != -1) {
-                QmlExpression e(qmlContext(item), "index", item);
-                if (e.value().toInt() == index)
-                    return static_cast<T*>(item);
-            } else {
-                return static_cast<T*>(item);
-            }
-        }
-        item = findItem<T>(item, objectName, index);
-        if (item)
-            return static_cast<T*>(item);
-    }
-
-    return 0;
-}
-
-template<typename T>
-QList<T*> tst_QmlGraphicsListView::findItems(QGraphicsObject *parent, const QString &objectName)
-{
-    QList<T*> items;
-    const QMetaObject &mo = T::staticMetaObject;
-    //qDebug() << parent->childItems().count() << "children";
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if(!item)
-            continue;
-        //qDebug() << "try" << item;
-        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName))
-            items.append(static_cast<T*>(item));
-        items += findItems<T>(item, objectName);
-    }
-
-    return items;
-}
-
-void tst_QmlGraphicsListView::dumpTree(QmlGraphicsItem *parent, int depth)
-{
-    static QString padding("                       ");
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if(!item)
-            continue;
-        qDebug() << padding.left(depth*2) << item;
-        dumpTree(item, depth+1);
-    }
-}
-
-
-QTEST_MAIN(tst_QmlGraphicsListView)
-
-#include "tst_qmlgraphicslistview.moc"
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/GraphicsWidget250x250.qml b/tests/auto/declarative/qmlgraphicsloader/data/GraphicsWidget250x250.qml
deleted file mode 100644
index 627c7df..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/data/GraphicsWidget250x250.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QGraphicsWidget {
-    size: "250x250"
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml b/tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml
deleted file mode 100644
index cfbb55a..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-Loader {
-    resizeMode: "NoResize"
-    width: 200; height: 80
-    source: "Rect120x60.qml"
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/NoResizeGraphicsWidget.qml b/tests/auto/declarative/qmlgraphicsloader/data/NoResizeGraphicsWidget.qml
deleted file mode 100644
index 5eab965..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/data/NoResizeGraphicsWidget.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-Loader {
-    resizeMode: Loader.NoResize
-    source: "GraphicsWidget250x250.qml"
-    width: 200
-    height: 80    
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml b/tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml
deleted file mode 100644
index aa4b0c2..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 120
-   height:60
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml b/tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml
deleted file mode 100644
index 1db56c4..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Item {
-    Component { id: comp; Rectangle { width: 100; height: 50 } }
-    Loader { sourceComponent: comp }
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeGraphicsWidgetToLoader.qml b/tests/auto/declarative/qmlgraphicsloader/data/SizeGraphicsWidgetToLoader.qml
deleted file mode 100644
index 568a136..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/data/SizeGraphicsWidgetToLoader.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-Loader {
-    resizeMode: Loader.SizeItemToLoader
-    width: 200
-    height: 80
-    source: "GraphicsWidget250x250.qml"
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeLoaderToGraphicsWidget.qml b/tests/auto/declarative/qmlgraphicsloader/data/SizeLoaderToGraphicsWidget.qml
deleted file mode 100644
index a710803..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/data/SizeLoaderToGraphicsWidget.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Loader {
-    resizeMode: Loader.SizeLoaderToItem
-    source: "GraphicsWidget250x250.qml"
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml b/tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml
deleted file mode 100644
index b52fa03..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Loader {
-    resizeMode: "SizeLoaderToItem"
-    source: "Rect120x60.qml"
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml b/tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml
deleted file mode 100644
index 1a107e1..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-Loader {
-    resizeMode: "SizeItemToLoader"
-    width: 200; height: 80
-    source: "Rect120x60.qml"
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro b/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro
deleted file mode 100644
index 4837075..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui network
-macx:CONFIG -= app_bundle
-
-INCLUDEPATH += ../shared/
-HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsloader.cpp \
-           ../shared/testhttpserver.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
diff --git a/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp b/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
deleted file mode 100644
index 2d3d5ee..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
+++ /dev/null
@@ -1,464 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtGui/QGraphicsWidget>
-#include <QtGui/QGraphicsScene>
-
-#include <QSignalSpy>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsloader_p.h>
-#include "testhttpserver.h"
-
-#define SERVER_PORT 14445
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
-}
-
-#define TRY_WAIT(expr) \
-    do { \
-        for (int ii = 0; ii < 6; ++ii) { \
-            if ((expr)) break; \
-            QTest::qWait(50); \
-        } \
-        QVERIFY((expr)); \
-    } while (false)
-
-class tst_QmlGraphicsLoader : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_QmlGraphicsLoader();
-
-private slots:
-    void url();
-    void invalidUrl();
-    void component();
-    void clear();
-    void urlToComponent();
-    void componentToUrl();
-    void sizeLoaderToItem();
-    void sizeItemToLoader();
-    void noResize();
-    void sizeLoaderToGraphicsWidget();
-    void sizeGraphicsWidgetToLoader();
-    void noResizeGraphicsWidget();
-    void networkRequestUrl();
-    void failNetworkRequest();
-//    void networkComponent();
-
-private:
-    QmlEngine engine;
-};
-
-
-tst_QmlGraphicsLoader::tst_QmlGraphicsLoader()
-{
-}
-
-void tst_QmlGraphicsLoader::url()
-{
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QVERIFY(loader != 0);
-    QVERIFY(loader->item());
-    QVERIFY(loader->source() == QUrl::fromLocalFile(SRCDIR "/data/Rect120x60.qml"));
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QmlGraphicsLoader::Ready);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-
-    delete loader;
-}
-
-void tst_QmlGraphicsLoader::component()
-{
-    QmlComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
-    QVERIFY(item);
-
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(item->QGraphicsObject::children().at(1)); 
-    QVERIFY(loader);
-    QVERIFY(loader->item());
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QmlGraphicsLoader::Ready);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-
-    delete loader;
-}
-
-void tst_QmlGraphicsLoader::invalidUrl()
-{
-    QTest::ignoreMessage(QtWarningMsg, QString("(:-1: File error for URL " + QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString() + ") ").toUtf8().constData());
-
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nLoader { source: \"IDontExist.qml\" }"), TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QVERIFY(loader != 0);
-    QVERIFY(loader->item() == 0);
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QmlGraphicsLoader::Error);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
-
-    delete loader;
-}
-
-void tst_QmlGraphicsLoader::clear()
-{
-    {
-        QmlComponent component(&engine);
-        component.setData(QByteArray(
-                    "import Qt 4.6\n"
-                    " Loader { id: loader\n"
-                    "  source: 'Rect120x60.qml'\n"
-                    "  Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n"
-                    " }")
-                , TEST_FILE(""));
-        QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-        QVERIFY(loader != 0);
-        QVERIFY(loader->item());
-        QCOMPARE(loader->progress(), 1.0);
-        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-
-        QTest::qWait(500);
-
-        QVERIFY(loader->item() == 0);
-        QCOMPARE(loader->progress(), 0.0);
-        QCOMPARE(loader->status(), QmlGraphicsLoader::Null);
-        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
-
-        delete loader;
-    }
-    {
-        QmlComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
-        QVERIFY(item);
-
-        QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(item->QGraphicsObject::children().at(1)); 
-        QVERIFY(loader);
-        QVERIFY(loader->item());
-        QCOMPARE(loader->progress(), 1.0);
-        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-
-        loader->setSourceComponent(0);
-
-        QVERIFY(loader->item() == 0);
-        QCOMPARE(loader->progress(), 0.0);
-        QCOMPARE(loader->status(), QmlGraphicsLoader::Null);
-        QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
-
-        delete loader;
-    }
-}
-
-void tst_QmlGraphicsLoader::urlToComponent()
-{
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\n"
-                "Loader {\n"
-                " id: loader\n"
-                " Component { id: myComp; Rectangle { width: 10; height: 10 } }\n"
-                " source: \"Rect120x60.qml\"\n"
-                " Timer { interval: 100; running: true; onTriggered: loader.sourceComponent = myComp }\n"
-                "}" )
-            , TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QTest::qWait(500);
-    QVERIFY(loader != 0);
-    QVERIFY(loader->item());
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-    QCOMPARE(loader->width(), 10.0);
-    QCOMPARE(loader->height(), 10.0);
-
-    delete loader;
-}
-
-void tst_QmlGraphicsLoader::componentToUrl()
-{
-    QmlComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
-    QVERIFY(item);
-
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(item->QGraphicsObject::children().at(1)); 
-    QVERIFY(loader);
-    QVERIFY(loader->item());
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-
-    loader->setSource(TEST_FILE("/Rect120x60.qml"));
-    QVERIFY(loader->item());
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-    QCOMPARE(loader->width(), 120.0);
-    QCOMPARE(loader->height(), 60.0);
-
-    delete loader;
-}
-
-void tst_QmlGraphicsLoader::sizeLoaderToItem()
-{
-    QmlComponent component(&engine, TEST_FILE("/SizeToItem.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QVERIFY(loader != 0);
-    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeLoaderToItem);
-    QCOMPARE(loader->width(), 120.0);
-    QCOMPARE(loader->height(), 60.0);
-
-    // Check resize
-    QmlGraphicsItem *rect = qobject_cast<QmlGraphicsItem*>(loader->item());
-    QVERIFY(rect);
-    rect->setWidth(150);
-    rect->setHeight(45);
-    QCOMPARE(loader->width(), 150.0);
-    QCOMPARE(loader->height(), 45.0);
-
-    // Switch mode
-    loader->setResizeMode(QmlGraphicsLoader::SizeItemToLoader);
-    loader->setWidth(180);
-    loader->setHeight(30);
-    QCOMPARE(rect->width(), 180.0);
-    QCOMPARE(rect->height(), 30.0);
-
-    // notify
-    QSignalSpy spy(loader, SIGNAL(resizeModeChanged()));
-    loader->setResizeMode(QmlGraphicsLoader::NoResize);
-    QCOMPARE(spy.count(),1);
-    loader->setResizeMode(QmlGraphicsLoader::NoResize);
-    QCOMPARE(spy.count(),1);
-}
-
-void tst_QmlGraphicsLoader::sizeItemToLoader()
-{
-    QmlComponent component(&engine, TEST_FILE("/SizeToLoader.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QVERIFY(loader != 0);
-    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeItemToLoader);
-    QCOMPARE(loader->width(), 200.0);
-    QCOMPARE(loader->height(), 80.0);
-
-    QmlGraphicsItem *rect = qobject_cast<QmlGraphicsItem*>(loader->item());
-    QVERIFY(rect);
-    QCOMPARE(rect->width(), 200.0);
-    QCOMPARE(rect->height(), 80.0);
-
-    // Check resize
-    loader->setWidth(180);
-    loader->setHeight(30);
-    QCOMPARE(rect->width(), 180.0);
-    QCOMPARE(rect->height(), 30.0);
-
-    // Switch mode
-    loader->setResizeMode(QmlGraphicsLoader::SizeLoaderToItem);
-    rect->setWidth(160);
-    rect->setHeight(45);
-    QCOMPARE(loader->width(), 160.0);
-    QCOMPARE(loader->height(), 45.0);
-}
-
-void tst_QmlGraphicsLoader::noResize()
-{
-    QmlComponent component(&engine, TEST_FILE("/NoResize.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QVERIFY(loader != 0);
-    QCOMPARE(loader->width(), 200.0);
-    QCOMPARE(loader->height(), 80.0);
-
-    QmlGraphicsItem *rect = qobject_cast<QmlGraphicsItem*>(loader->item());
-    QVERIFY(rect);
-    QCOMPARE(rect->width(), 120.0);
-    QCOMPARE(rect->height(), 60.0);
-}
-
-void tst_QmlGraphicsLoader::sizeLoaderToGraphicsWidget()
-{
-    QmlComponent component(&engine, TEST_FILE("/SizeLoaderToGraphicsWidget.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QGraphicsScene scene;
-    scene.addItem(loader);
-
-    QVERIFY(loader != 0);
-    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeLoaderToItem);
-    QCOMPARE(loader->width(), 250.0);
-    QCOMPARE(loader->height(), 250.0);
-
-    // Check resize
-    QGraphicsWidget *widget = qobject_cast<QGraphicsWidget*>(loader->item());
-    QVERIFY(widget);
-    widget->resize(QSizeF(150,45));
-    QCOMPARE(loader->width(), 150.0);
-    QCOMPARE(loader->height(), 45.0);
-
-    // Switch mode
-    loader->setResizeMode(QmlGraphicsLoader::SizeItemToLoader);
-    loader->setWidth(180);
-    loader->setHeight(30);
-    QCOMPARE(widget->size().width(), 180.0);
-    QCOMPARE(widget->size().height(), 30.0);
-}
-
-void tst_QmlGraphicsLoader::sizeGraphicsWidgetToLoader()
-{
-    QmlComponent component(&engine, TEST_FILE("/SizeGraphicsWidgetToLoader.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QGraphicsScene scene;
-    scene.addItem(loader);
-
-    QVERIFY(loader != 0);
-    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeItemToLoader);
-    QCOMPARE(loader->width(), 200.0);
-    QCOMPARE(loader->height(), 80.0);
-
-    QGraphicsWidget *widget = qobject_cast<QGraphicsWidget*>(loader->item());
-    QVERIFY(widget);
-    QCOMPARE(widget->size().width(), 200.0);
-    QCOMPARE(widget->size().height(), 80.0);
-
-    // Check resize
-    loader->setWidth(180);
-    loader->setHeight(30);
-    QCOMPARE(widget->size().width(), 180.0);
-    QCOMPARE(widget->size().height(), 30.0);
-
-    // Switch mode
-    loader->setResizeMode(QmlGraphicsLoader::SizeLoaderToItem);
-    widget->resize(QSizeF(160,45));
-    QCOMPARE(loader->width(), 160.0);
-    QCOMPARE(loader->height(), 45.0);
-}
-
-void tst_QmlGraphicsLoader::noResizeGraphicsWidget()
-{
-    QmlComponent component(&engine, TEST_FILE("/NoResizeGraphicsWidget.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QGraphicsScene scene;
-    scene.addItem(loader);
-
-    QVERIFY(loader != 0);
-    QCOMPARE(loader->width(), 200.0);
-    QCOMPARE(loader->height(), 80.0);
-
-    QGraphicsWidget *widget = qobject_cast<QGraphicsWidget*>(loader->item());
-    QVERIFY(widget);
-    QCOMPARE(widget->size().width(), 250.0);
-    QCOMPARE(widget->size().height(), 250.0);
-}
-
-void tst_QmlGraphicsLoader::networkRequestUrl()
-{
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
-    server.serveDirectory(SRCDIR "/data");
-
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/Rect120x60.qml\" }"), TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QVERIFY(loader != 0);
-
-    TRY_WAIT(loader->status() == QmlGraphicsLoader::Ready);
-
-    QVERIFY(loader->item());
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-
-    delete loader;
-}
-
-/* XXX Component waits until all dependencies are loaded.  Is this actually possible?
-void tst_QmlGraphicsLoader::networkComponent()
-{
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
-    server.serveDirectory("slowdata", TestHTTPServer::Delay);
-
-    QmlComponent component(&engine);
-    component.setData(QByteArray(
-                "import Qt 4.6\n"
-                "import \"http://127.0.0.1:14445/\" as NW\n"
-                "Item {\n"
-                " Component { id: comp; NW.SlowRect {} }\n"
-                " Loader { sourceComponent: comp } }")
-            , TEST_FILE(""));
-
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
-    QVERIFY(item);
-
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(item->QGraphicsObject::children().at(1)); 
-    QVERIFY(loader);
-    TRY_WAIT(loader->status() == QmlGraphicsLoader::Ready);
-
-    QVERIFY(loader->item());
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QmlGraphicsLoader::Ready);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
-
-    delete loader;
-}
-*/
-
-void tst_QmlGraphicsLoader::failNetworkRequest()
-{
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
-    server.serveDirectory(SRCDIR "/data");
-
-    QTest::ignoreMessage(QtWarningMsg, "(:-1: Network error for URL http://127.0.0.1:14445/IDontExist.qml) ");
-
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/IDontExist.qml\" }"), TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
-    QVERIFY(loader != 0);
-
-    TRY_WAIT(loader->status() == QmlGraphicsLoader::Error);
-
-    QVERIFY(loader->item() == 0);
-    QCOMPARE(loader->progress(), 0.0);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
-
-    delete loader;
-}
-
-QTEST_MAIN(tst_QmlGraphicsLoader)
-
-#include "tst_qmlgraphicsloader.moc"
diff --git a/tests/auto/declarative/qmlgraphicsmousearea/data/dragproperties.qml b/tests/auto/declarative/qmlgraphicsmousearea/data/dragproperties.qml
deleted file mode 100644
index 4cd78da..0000000
--- a/tests/auto/declarative/qmlgraphicsmousearea/data/dragproperties.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: whiteRect
-    width: 200 
-    height: 200
-    color: "white"
-    Rectangle {
-        id: blackRect
-        objectName: "blackrect"
-        color: "black"
-        y: 50
-        x: 50
-        width: 100
-        height: 100
-        opacity: (whiteRect.width-blackRect.x+whiteRect.height-blackRect.y-199)/200
-        Text { text: blackRect.opacity}
-        MouseArea {
-            objectName: "mouseregion"
-            anchors.fill: parent
-            drag.target: blackRect
-            drag.axis: Drag.XandYAxis
-            drag.minimumX: 0
-            drag.maximumX: whiteRect.width-blackRect.width
-            drag.minimumY: 0
-            drag.maximumY: whiteRect.height-blackRect.height
-         }
-     }
- }
diff --git a/tests/auto/declarative/qmlgraphicsmousearea/qmlgraphicsmousearea.pro b/tests/auto/declarative/qmlgraphicsmousearea/qmlgraphicsmousearea.pro
deleted file mode 100644
index f85bf0f..0000000
--- a/tests/auto/declarative/qmlgraphicsmousearea/qmlgraphicsmousearea.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui network
-macx:CONFIG -= app_bundle
-
-HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsmousearea.cpp ../shared/testhttpserver.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp b/tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp
deleted file mode 100644
index 22a12a9..0000000
--- a/tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-#include <QtTest/QSignalSpy>
-#include <private/qmlgraphicsmousearea_p.h>
-#include <QtDeclarative/qmlview.h>
-
-class tst_QmlGraphicsMouseArea: public QObject
-{
-    Q_OBJECT
-private slots:
-    void dragProperties();
-private:
-    QmlView *createView(const QString &filename);
-};
-
-void tst_QmlGraphicsMouseArea::dragProperties()
-{
-    QmlView *canvas = createView(SRCDIR "/data/dragproperties.qml");
-    canvas->show();
-    canvas->setFocus();
-    QVERIFY(canvas->rootObject() != 0);
-
-    QmlGraphicsMouseArea *mouseRegion = canvas->rootObject()->findChild<QmlGraphicsMouseArea*>("mouseregion");
-    QmlGraphicsDrag *drag = mouseRegion->drag();
-    QVERIFY(mouseRegion != 0);
-    QVERIFY(drag != 0);
-
-    // target
-    QmlGraphicsItem *blackRect = canvas->rootObject()->findChild<QmlGraphicsItem*>("blackrect");
-    QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(canvas->rootObject());
-    QVERIFY(rootItem != 0);
-    QSignalSpy targetSpy(drag, SIGNAL(targetChanged()));
-    drag->setTarget(rootItem);
-    QCOMPARE(targetSpy.count(),1);
-    drag->setTarget(rootItem);
-    QCOMPARE(targetSpy.count(),1);
-
-    // axis
-    QCOMPARE(drag->axis(), QmlGraphicsDrag::XandYAxis);
-    QSignalSpy axisSpy(drag, SIGNAL(axisChanged()));
-    drag->setAxis(QmlGraphicsDrag::XAxis);
-    QCOMPARE(drag->axis(), QmlGraphicsDrag::XAxis);
-    QCOMPARE(axisSpy.count(),1);
-    drag->setAxis(QmlGraphicsDrag::XAxis);
-    QCOMPARE(axisSpy.count(),1);
-
-    // minimum and maximum properties
-    QSignalSpy xminSpy(drag, SIGNAL(minimumXChanged()));
-    QSignalSpy xmaxSpy(drag, SIGNAL(maximumXChanged()));
-    QSignalSpy yminSpy(drag, SIGNAL(minimumYChanged()));
-    QSignalSpy ymaxSpy(drag, SIGNAL(maximumYChanged()));
-
-    QCOMPARE(drag->xmin(), 0.0);
-    QCOMPARE(drag->xmax(), rootItem->width()-blackRect->width());
-    QCOMPARE(drag->ymin(), 0.0);
-    QCOMPARE(drag->ymax(), rootItem->height()-blackRect->height());
-
-    drag->setXmin(10);
-    drag->setXmax(10);
-    drag->setYmin(10);
-    drag->setYmax(10);
-
-    QCOMPARE(drag->xmin(), 10.0);
-    QCOMPARE(drag->xmax(), 10.0);
-    QCOMPARE(drag->ymin(), 10.0);
-    QCOMPARE(drag->ymax(), 10.0);
-
-    QCOMPARE(xminSpy.count(),1);
-    QCOMPARE(xmaxSpy.count(),1);
-    QCOMPARE(yminSpy.count(),1);
-    QCOMPARE(ymaxSpy.count(),1);
-
-    drag->setXmin(10);
-    drag->setXmax(10);
-    drag->setYmin(10);
-    drag->setYmax(10);
-
-    QCOMPARE(xminSpy.count(),1);
-    QCOMPARE(xmaxSpy.count(),1);
-    QCOMPARE(yminSpy.count(),1);
-    QCOMPARE(ymaxSpy.count(),1);
-}
-
-QmlView *tst_QmlGraphicsMouseArea::createView(const QString &filename)
-{
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    return canvas;
-}
-
-QTEST_MAIN(tst_QmlGraphicsMouseArea)
-
-#include "tst_qmlgraphicsmousearea.moc"
diff --git a/tests/auto/declarative/qmlgraphicsparticles/data/particle.png b/tests/auto/declarative/qmlgraphicsparticles/data/particle.png
deleted file mode 100644
index defbde5..0000000
Binary files a/tests/auto/declarative/qmlgraphicsparticles/data/particle.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml b/tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml
deleted file mode 100644
index ace61fe..0000000
--- a/tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import Qt 4.6
-Rectangle {
-    width: 240
-    height: 320
-    color: "black"
-    Particles {
-        objectName: "particles"    
-        anchors.fill: parent
-        width: 1
-        height: 1
-        source: "particle.png"
-        lifeSpan: 5000
-        count: 200
-        angle: 270
-        angleDeviation: 45
-        velocity: 50
-        velocityDeviation: 30
-        ParticleMotionGravity {
-            objectName: "motionGravity"
-            yattractor: 1000
-            xattractor: 0
-            acceleration: 25
-        }
-    }
-    resources: [
-        ParticleMotionWander {
-            objectName: "motionWander"
-            xvariance: 30
-            yvariance: 30
-            pace: 100
-        }
-    ]
-}
\ No newline at end of file
diff --git a/tests/auto/declarative/qmlgraphicsparticles/data/particles.qml b/tests/auto/declarative/qmlgraphicsparticles/data/particles.qml
deleted file mode 100644
index c58927e..0000000
--- a/tests/auto/declarative/qmlgraphicsparticles/data/particles.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-Rectangle{
-    width: 100
-    height: 100
-    color: "black"
-    objectName: "rect"
-    Particles { id: particles
-        objectName: "particles"
-        width:1; height:1; anchors.centerIn: parent; opacity: 1
-        lifeSpan: 100; lifeSpanDeviation: 20; count:1000; 
-        fadeInDuration: 20; fadeOutDuration: 20; count: -1; emissionRate: 1000
-        angle: 0; angleDeviation: 360; velocity: 500; velocityDeviation:30
-        source: "particle.png"
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsparticles/qmlgraphicsparticles.pro b/tests/auto/declarative/qmlgraphicsparticles/qmlgraphicsparticles.pro
deleted file mode 100644
index 94eeb4e..0000000
--- a/tests/auto/declarative/qmlgraphicsparticles/qmlgraphicsparticles.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicsparticles.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp b/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
deleted file mode 100644
index 9436772..0000000
--- a/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QtTest/QtTest>
-#include <QtTest/QSignalSpy>
-#include <qmlview.h>
-#include <private/qmlgraphicsparticles_p.h>
-
-class tst_QmlGraphicsParticles : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QmlGraphicsParticles();
-
-private slots:
-    void properties();
-    void motionGravity();
-    void motionWander();
-    void runs();
-private:
-    QmlView *createView(const QString &filename);
-
-};
-
-tst_QmlGraphicsParticles::tst_QmlGraphicsParticles()
-{
-}
-
-void tst_QmlGraphicsParticles::properties()
-{
-    QmlView *canvas = createView(SRCDIR "/data/particles.qml");
-    QVERIFY(canvas->rootObject());
-    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
-    QVERIFY(particles);
-
-    particles->setSource(QUrl::fromLocalFile(SRCDIR "/data/particle.png"));
-    QCOMPARE(particles->source(), QUrl::fromLocalFile(SRCDIR "/data/particle.png"));
-
-    particles->setLifeSpanDeviation(1000);
-    QCOMPARE(particles->lifeSpanDeviation(), 1000);
-
-    particles->setFadeInDuration(1000);
-    QCOMPARE(particles->fadeInDuration(), 1000);
-
-    particles->setFadeOutDuration(1000);
-    QCOMPARE(particles->fadeOutDuration(), 1000);
-
-    particles->setAngle(100.0);
-    QCOMPARE(particles->angle(), 100.0);
-
-    particles->setAngleDeviation(100.0);
-    QCOMPARE(particles->angleDeviation(), 100.0);
-
-    particles->setVelocity(100.0);
-    QCOMPARE(particles->velocity(), 100.0);
-
-    particles->setVelocityDeviation(100.0);
-    QCOMPARE(particles->velocityDeviation(), 100.0);
-
-    particles->setEmissionVariance(0.5);
-    QCOMPARE(particles->emissionVariance(),0.5);
-
-    particles->setEmissionRate(12);
-    QCOMPARE(particles->emissionRate(), 12);
-}
-
-void tst_QmlGraphicsParticles::motionGravity()
-{
-    QmlView *canvas = createView(SRCDIR "/data/particlemotion.qml");
-    QVERIFY(canvas->rootObject());
-    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
-    QVERIFY(particles);
-
-    QmlGraphicsParticleMotionGravity* motionGravity = canvas->rootObject()->findChild<QmlGraphicsParticleMotionGravity*>("motionGravity");
-    QCOMPARE(particles->motion(), motionGravity);
-
-    QSignalSpy xattractorSpy(motionGravity, SIGNAL(xattractorChanged()));
-    QSignalSpy yattractorSpy(motionGravity, SIGNAL(yattractorChanged()));
-    QSignalSpy accelerationSpy(motionGravity, SIGNAL(accelerationChanged()));
-
-    QCOMPARE(motionGravity->xAttractor(), 0.0);
-    QCOMPARE(motionGravity->yAttractor(), 1000.0);
-    QCOMPARE(motionGravity->acceleration(), 25.0);
-
-    motionGravity->setXAttractor(20.0);
-    motionGravity->setYAttractor(10.0);
-    motionGravity->setAcceleration(10.0);
-
-    QCOMPARE(motionGravity->xAttractor(), 20.0);
-    QCOMPARE(motionGravity->yAttractor(), 10.0);
-    QCOMPARE(motionGravity->acceleration(), 10.0);
-
-    QCOMPARE(xattractorSpy.count(), 1);
-    QCOMPARE(yattractorSpy.count(), 1);
-    QCOMPARE(accelerationSpy.count(), 1);
-
-    motionGravity->setXAttractor(20.0);
-    motionGravity->setYAttractor(10.0);
-    motionGravity->setAcceleration(10.0);
-
-    QCOMPARE(xattractorSpy.count(), 1);
-    QCOMPARE(yattractorSpy.count(), 1);
-    QCOMPARE(accelerationSpy.count(), 1);
-}
-
-void tst_QmlGraphicsParticles::motionWander()
-{
-    QmlView *canvas = createView(SRCDIR "/data/particlemotion.qml");
-    QVERIFY(canvas->rootObject());
-    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
-    QVERIFY(particles);
-    
-    QSignalSpy motionSpy(particles, SIGNAL(motionChanged()));
-    QmlGraphicsParticleMotionWander* motionWander = canvas->rootObject()->findChild<QmlGraphicsParticleMotionWander*>("motionWander");
-    
-    particles->setMotion(motionWander);
-    QCOMPARE(particles->motion(),motionWander);
-    QCOMPARE(motionSpy.count(), 1);
-    
-    particles->setMotion(motionWander);
-    QCOMPARE(motionSpy.count(), 1);
-
-    QSignalSpy xvarianceSpy(motionWander, SIGNAL(xvarianceChanged()));
-    QSignalSpy yvarianceSpy(motionWander, SIGNAL(yvarianceChanged()));
-    QSignalSpy paceSpy(motionWander, SIGNAL(paceChanged()));
-
-    QCOMPARE(motionWander->xVariance(), 30.0);
-    QCOMPARE(motionWander->yVariance(), 30.0);
-    QCOMPARE(motionWander->pace(), 100.0);
-
-    motionWander->setXVariance(20.0);
-    motionWander->setYVariance(10.0);
-    motionWander->setPace(10.0);
-
-    QCOMPARE(motionWander->xVariance(), 20.0);
-    QCOMPARE(motionWander->yVariance(), 10.0);
-    QCOMPARE(motionWander->pace(), 10.0);
-
-    QCOMPARE(xvarianceSpy.count(), 1);
-    QCOMPARE(yvarianceSpy.count(), 1);
-    QCOMPARE(paceSpy.count(), 1);
-
-    motionWander->setXVariance(20.0);
-    motionWander->setYVariance(10.0);
-    motionWander->setPace(10.0);
-
-    QCOMPARE(xvarianceSpy.count(), 1);
-    QCOMPARE(yvarianceSpy.count(), 1);
-    QCOMPARE(paceSpy.count(), 1);
-}
-
-void tst_QmlGraphicsParticles::runs()
-{
-    QmlView *canvas = createView(SRCDIR "/data/particles.qml");
-    QVERIFY(canvas->rootObject());
-    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
-    QVERIFY(particles);
-    QTest::qWait(1000);//Run for one second. Test passes if it doesn't crash.
-}
-
-QmlView *tst_QmlGraphicsParticles::createView(const QString &filename)
-{
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    return canvas;
-}
-QTEST_MAIN(tst_QmlGraphicsParticles)
-
-#include "tst_qmlgraphicsparticles.moc"
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/datamodel.qml b/tests/auto/declarative/qmlgraphicspathview/data/datamodel.qml
deleted file mode 100644
index 8d07db2..0000000
--- a/tests/auto/declarative/qmlgraphicspathview/data/datamodel.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-import Qt 4.6
-
-PathView {
-    id: pathview
-    objectName: "pathview"
-    width: 240; height: 320
-    pathItemCount: testObject.pathItemCount
-
-    function checkProperties() {
-        testObject.error = false;
-        if (testObject.useModel && pathview.model != testData) {
-            console.log("model property incorrect");
-            testObject.error = true;
-        }
-    }
-
-    model: testObject.useModel ? testData : 0
-
-    delegate: Component {
-        id: myDelegate
-        Rectangle {
-            id: wrapper
-            objectName: "wrapper"
-            width: 20; height: 20; color: name
-            Text {
-                objectName: "myText"
-                text: name
-            }
-        }
-    }
-
-    path: Path {
-        startX: 120; startY: 20;
-        PathLine { x: 120; y: 300 }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/path.qml b/tests/auto/declarative/qmlgraphicspathview/data/path.qml
deleted file mode 100644
index 7e82a48..0000000
--- a/tests/auto/declarative/qmlgraphicspathview/data/path.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Path {
-    startX: 120; startY: 100
-
-    PathAttribute { name: "scale"; value: 1.0 }
-    PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 }
-    PathPercent { value: 0.3 }
-    PathLine { x: 120; y: 100 }
-    PathCubic {
-        x: 180; y: 0; control1X: -10; control1Y: 90
-        control2X: 210; control2Y: 90
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/pathview.qml b/tests/auto/declarative/qmlgraphicspathview/data/pathview.qml
deleted file mode 100644
index 8fa8d59..0000000
--- a/tests/auto/declarative/qmlgraphicspathview/data/pathview.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    color: "#ffffff"
-    resources: [
-        Component {
-            id: delegate
-            Rectangle {
-                id: wrapper
-                objectName: "wrapper"
-                height: 20
-                width: 60
-                color: "white"
-                border.color: "black"
-                Text {
-                    text: index
-                }
-                Text {
-                    x: 20
-                    id: textName
-                    objectName: "textName"
-                    text: name
-                }
-                Text {
-                    x: 40
-                    id: textNumber
-                    objectName: "textNumber"
-                    text: number
-                }
-            }
-        }
-    ]
-    PathView {
-        id: view
-        objectName: "view"
-        width: 240
-        height: 320
-        model: testModel
-        delegate: delegate
-        snapPosition: 0.01
-        path: Path {
-            startY: 120
-            startX: 160
-            PathQuad {
-                y: 120
-                x: 80
-                controlY: 330
-                controlX: 100
-            }
-            PathLine {
-                y: 160
-                x: 20
-            }
-            PathCubic {
-                y: 120
-                x: 160
-                control1Y: 0
-                control1X: 100
-                control2Y: 000
-                control2X: 200
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/pathview1.qml b/tests/auto/declarative/qmlgraphicspathview/data/pathview1.qml
deleted file mode 100644
index b3b0a9a..0000000
--- a/tests/auto/declarative/qmlgraphicspathview/data/pathview1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.6
-
-PathView {
-}
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/pathview2.qml b/tests/auto/declarative/qmlgraphicspathview/data/pathview2.qml
deleted file mode 100644
index 0d5c98b..0000000
--- a/tests/auto/declarative/qmlgraphicspathview/data/pathview2.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-import Qt 4.6
-
-PathView {
-    id: photoPathView; model: rssModel; delegate: photoDelegate
-    y: 100; width: 800; height: 330; pathItemCount: 10; z: 1
-
-    path: Path {
-        startX: -50; startY: 40;
-
-        PathAttribute { name: "scale"; value: 0.5 }
-        PathAttribute { name: "angle"; value: -45 }
-
-        PathCubic {
-            x: 400; y: 220
-            control1X: 140; control1Y: 40
-            control2X: 210; control2Y: 220
-        }
-
-        PathAttribute { name: "scale"; value: 1.2  }
-        PathAttribute { name: "angle"; value: 0 }
-
-        PathCubic {
-            x: 850; y: 40
-            control2X: 660; control2Y: 40
-            control1X: 590; control1Y: 220
-        }
-
-        PathAttribute { name: "scale"; value: 0.5 }
-        PathAttribute { name: "angle"; value: 45 }
-    }
-
-    model: ListModel {
-        id: rssModel
-        ListElement { lColor: "red" }
-        ListElement { lColor: "green" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "blue" }
-        ListElement { lColor: "purple" }
-        ListElement { lColor: "gray" }
-        ListElement { lColor: "brown" }
-        ListElement { lColor: "thistle" }
-    }
-
-    delegate: Component {
-        id: photoDelegate
-        Rectangle {
-            id: wrapper
-            width: 85; height: 85; color: lColor
-            scale: wrapper.PathView.scale
-
-            transform: Rotation {
-                id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
-                axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml b/tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml
deleted file mode 100644
index 412cca2..0000000
--- a/tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-import Qt 4.6
-
-PathView {
-    id: photoPathView; model: rssModel; delegate: photoDelegate
-    y: 100; width: 800; height: 330; pathItemCount: 4; offset: 10
-    dragMargin: 24; snapPosition: 50
-
-    path: Path {
-        startX: -50; startY: 40;
-
-        PathAttribute { name: "scale"; value: 0.5 }
-        PathAttribute { name: "angle"; value: -45 }
-
-        PathCubic {
-            x: 400; y: 220
-            control1X: 140; control1Y: 40
-            control2X: 210; control2Y: 220
-        }
-
-        PathAttribute { name: "scale"; value: 1.2  }
-        PathAttribute { name: "angle"; value: 0 }
-
-        PathCubic {
-            x: 850; y: 40
-            control2X: 660; control2Y: 40
-            control1X: 590; control1Y: 220
-        }
-
-        PathAttribute { name: "scale"; value: 0.5 }
-        PathAttribute { name: "angle"; value: 45 }
-    }
-
-    model: ListModel {
-        id: rssModel
-        ListElement { lColor: "red" }
-        ListElement { lColor: "green" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "blue" }
-        ListElement { lColor: "purple" }
-        ListElement { lColor: "gray" }
-        ListElement { lColor: "brown" }
-        ListElement { lColor: "thistle" }
-    }
-
-    delegate: Component {
-        id: photoDelegate
-        Rectangle {
-            id: wrapper
-            width: 85; height: 85; color: lColor
-
-            transform: Rotation {
-                id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
-                axis.y: 1; axis.z: 0
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspathview/qmlgraphicspathview.pro b/tests/auto/declarative/qmlgraphicspathview/qmlgraphicspathview.pro
deleted file mode 100644
index 142a256..0000000
--- a/tests/auto/declarative/qmlgraphicspathview/qmlgraphicspathview.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicspathview.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp b/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
deleted file mode 100644
index b57142e..0000000
--- a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <private/qmlgraphicspathview_p.h>
-#include <private/qmlgraphicspath_p.h>
-#include <qmlcontext.h>
-#include <qmlexpression.h>
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <QtDeclarative/private/qmlgraphicstext_p.h>
-#include <QtDeclarative/private/qmlgraphicsrectangle_p.h>
-#include <QAbstractListModel>
-#include <QFile>
-#include <private/qmlvaluetype_p.h>
-#include "../../../shared/util.h"
-
-class tst_QmlGraphicsPathView : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QmlGraphicsPathView();
-
-private slots:
-    void initValues();
-    void items();
-    void dataModel();
-    void pathview2();
-    void pathview3();
-    void path();
-    void pathMoved();
-
-private:
-    QmlView *createView();
-    template<typename T>
-    T *findItem(QGraphicsObject *parent, const QString &objectName, int index=-1);
-    template<typename T>
-    QList<T*> findItems(QGraphicsObject *parent, const QString &objectName);
-};
-
-class TestObject : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(bool error READ error WRITE setError)
-    Q_PROPERTY(bool useModel READ useModel NOTIFY useModelChanged)
-    Q_PROPERTY(int pathItemCount READ pathItemCount NOTIFY pathItemCountChanged)
-
-public:
-    TestObject() : QObject(), mError(true), mUseModel(true), mPathItemCount(-1) {}
-
-    bool error() const { return mError; }
-    void setError(bool err) { mError = err; }
-
-    bool useModel() const { return mUseModel; }
-    void setUseModel(bool use) { mUseModel = use; emit useModelChanged(); }
-
-    int pathItemCount() const { return mPathItemCount; }
-    void setPathItemCount(int count) { mPathItemCount = count; emit pathItemCountChanged(); }
-
-signals:
-    void useModelChanged();
-    void pathItemCountChanged();
-
-private:
-    bool mError;
-    bool mUseModel;
-    int mPathItemCount;
-};
-
-class TestModel : public QAbstractListModel
-{
-public:
-    enum Roles { Name = Qt::UserRole+1, Number = Qt::UserRole+2 };
-
-    TestModel(QObject *parent=0) : QAbstractListModel(parent) {
-        QHash<int, QByteArray> roles;
-        roles[Name] = "name";
-        roles[Number] = "number";
-        setRoleNames(roles);
-    }
-
-    int rowCount(const QModelIndex &parent=QModelIndex()) const { return list.count(); }
-    QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const {
-        QVariant rv;
-        if (role == Name)
-            rv = list.at(index.row()).first;
-        else if (role == Number)
-            rv = list.at(index.row()).second;
-
-        return rv;
-    }
-
-    int count() const { return rowCount(); }
-    QString name(int index) const { return list.at(index).first; }
-    QString number(int index) const { return list.at(index).second; }
-
-    void addItem(const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), list.count(), list.count());
-        list.append(QPair<QString,QString>(name, number));
-        emit endInsertRows();
-    }
-
-    void insertItem(int index, const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), index, index);
-        list.insert(index, QPair<QString,QString>(name, number));
-        emit endInsertRows();
-    }
-
-    void removeItem(int index) {
-        emit beginRemoveRows(QModelIndex(), index, index);
-        list.removeAt(index);
-        emit endRemoveRows();
-    }
-
-    void moveItem(int from, int to) {
-        emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
-        list.move(from, to);
-        emit endMoveRows();
-    }
-
-    void modifyItem(int idx, const QString &name, const QString &number) {
-        list[idx] = QPair<QString,QString>(name, number);
-        emit dataChanged(index(idx,0), index(idx,0));
-    }
-
-private:
-    QList<QPair<QString,QString> > list;
-};
-
-
-tst_QmlGraphicsPathView::tst_QmlGraphicsPathView()
-{
-}
-
-void tst_QmlGraphicsPathView::initValues()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview1.qml"));
-    QmlGraphicsPathView *obj = qobject_cast<QmlGraphicsPathView*>(c.create());
-
-    QVERIFY(obj != 0);
-    QVERIFY(obj->path() == 0);
-    QVERIFY(obj->delegate() == 0);
-    QCOMPARE(obj->model(), QVariant());
-    QCOMPARE(obj->currentIndex(), 0);
-    QCOMPARE(obj->offset(), 0.);
-    QCOMPARE(obj->snapPosition(), 0.);
-    QCOMPARE(obj->dragMargin(), 0.);
-    QCOMPARE(obj->count(), 0);
-    QCOMPARE(obj->pathItemCount(), -1);
-}
-
-void tst_QmlGraphicsPathView::items()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    model.addItem("Fred", "12345");
-    model.addItem("John", "2345");
-    model.addItem("Bob", "54321");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsPathView *pathview = findItem<QmlGraphicsPathView>(canvas->rootObject(), "view");
-    QVERIFY(pathview != 0);
-
-    QCOMPARE(pathview->childItems().count(), model.count()); // assumes all are visible
-
-    for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(pathview, "textName", i);
-        QVERIFY(name != 0);
-        QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(pathview, "textNumber", i);
-        QVERIFY(number != 0);
-        QCOMPARE(number->text(), model.number(i));
-    }
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsPathView::pathview2()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview2.qml"));
-    QmlGraphicsPathView *obj = qobject_cast<QmlGraphicsPathView*>(c.create());
-
-    QVERIFY(obj != 0);
-    QVERIFY(obj->path() != 0);
-    QVERIFY(obj->delegate() != 0);
-    QVERIFY(obj->model() != QVariant());
-    QCOMPARE(obj->currentIndex(), 0);
-    QCOMPARE(obj->offset(), 0.);
-    QCOMPARE(obj->snapPosition(), 0.);
-    QCOMPARE(obj->dragMargin(), 0.);
-    QCOMPARE(obj->count(), 8);
-    QCOMPARE(obj->pathItemCount(), 10);
-}
-
-void tst_QmlGraphicsPathView::pathview3()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview3.qml"));
-    QmlGraphicsPathView *obj = qobject_cast<QmlGraphicsPathView*>(c.create());
-
-    QVERIFY(obj != 0);
-    QVERIFY(obj->path() != 0);
-    QVERIFY(obj->delegate() != 0);
-    QVERIFY(obj->model() != QVariant());
-    QCOMPARE(obj->currentIndex(), 0);
-    QCOMPARE(obj->offset(), 50.); // ???
-    QCOMPARE(obj->snapPosition(), 0.5); // ???
-    QCOMPARE(obj->dragMargin(), 24.);
-    QCOMPARE(obj->count(), 8);
-    QCOMPARE(obj->pathItemCount(), 4);
-}
-
-void tst_QmlGraphicsPathView::path()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/path.qml"));
-    QmlGraphicsPath *obj = qobject_cast<QmlGraphicsPath*>(c.create());
-
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->startX(), 120.);
-    QCOMPARE(obj->startY(), 100.);
-    QVERIFY(obj->path() != QPainterPath());
-
-    QmlListReference list(obj, "pathElements");
-    QCOMPARE(list.count(), 5);
-
-    QmlGraphicsPathAttribute* attr = qobject_cast<QmlGraphicsPathAttribute*>(list.at(0));
-    QVERIFY(attr != 0);
-    QCOMPARE(attr->name(), QString("scale"));
-    QCOMPARE(attr->value(), 1.0);
-
-    QmlGraphicsPathQuad* quad = qobject_cast<QmlGraphicsPathQuad*>(list.at(1));
-    QVERIFY(quad != 0);
-    QCOMPARE(quad->x(), 120.);
-    QCOMPARE(quad->y(), 25.);
-    QCOMPARE(quad->controlX(), 260.);
-    QCOMPARE(quad->controlY(), 75.);
-
-    QmlGraphicsPathPercent* perc = qobject_cast<QmlGraphicsPathPercent*>(list.at(2));
-    QVERIFY(perc != 0);
-    QCOMPARE(perc->value(), 0.3);
-
-    QmlGraphicsPathLine* line = qobject_cast<QmlGraphicsPathLine*>(list.at(3));
-    QVERIFY(line != 0);
-    QCOMPARE(line->x(), 120.);
-    QCOMPARE(line->y(), 100.);
-
-    QmlGraphicsPathCubic* cubic = qobject_cast<QmlGraphicsPathCubic*>(list.at(4));
-    QVERIFY(cubic != 0);
-    QCOMPARE(cubic->x(), 180.);
-    QCOMPARE(cubic->y(), 0.);
-    QCOMPARE(cubic->control1X(), -10.);
-    QCOMPARE(cubic->control1Y(), 90.);
-    QCOMPARE(cubic->control2X(), 210.);
-    QCOMPARE(cubic->control2Y(), 90.);
-}
-
-void tst_QmlGraphicsPathView::dataModel()
-{
-    QmlView *canvas = createView();
-
-    QmlContext *ctxt = canvas->rootContext();
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    TestModel model;
-    model.addItem("red", "1");
-    model.addItem("green", "2");
-    model.addItem("blue", "3");
-    model.addItem("purple", "4");
-    model.addItem("gray", "5");
-    model.addItem("brown", "6");
-    model.addItem("yellow", "7");
-    model.addItem("thistle", "8");
-    model.addItem("cyan", "9");
-
-    ctxt->setContextProperty("testData", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/datamodel.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsPathView *pathview = qobject_cast<QmlGraphicsPathView*>(canvas->rootObject());
-    QVERIFY(pathview != 0);
-
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QVERIFY(testObject->error() == false);
-
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(pathview, "wrapper", 0);
-    QVERIFY(item);
-    QCOMPARE(item->x(), 110.0);
-    QCOMPARE(item->y(), 10.0);
-
-    model.insertItem(4, "orange", "10");
-
-    int itemCount = findItems<QmlGraphicsItem>(pathview, "wrapper").count();
-    QCOMPARE(itemCount, 10);
-
-    QmlGraphicsText *text = findItem<QmlGraphicsText>(pathview, "myText", 4);
-    QVERIFY(text);
-    QCOMPARE(text->text(), model.name(4));
-
-    model.removeItem(2);
-    text = findItem<QmlGraphicsText>(pathview, "myText", 2);
-    QVERIFY(text);
-    QCOMPARE(text->text(), model.name(2));
-
-    testObject->setPathItemCount(5);
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QVERIFY(testObject->error() == false);
-
-    itemCount = findItems<QmlGraphicsItem>(pathview, "wrapper").count();
-    QCOMPARE(itemCount, 5);
-
-    QmlGraphicsRectangle *testItem = findItem<QmlGraphicsRectangle>(pathview, "wrapper", 4);
-    QVERIFY(testItem != 0);
-    testItem = findItem<QmlGraphicsRectangle>(pathview, "wrapper", 5);
-    QVERIFY(testItem == 0);
-
-    model.insertItem(2, "pink", "2");
-
-    itemCount = findItems<QmlGraphicsItem>(pathview, "wrapper").count();
-    QCOMPARE(itemCount, 5);
-
-    text = findItem<QmlGraphicsText>(pathview, "myText", 2);
-    QVERIFY(text);
-    QCOMPARE(text->text(), model.name(2));
-
-    model.removeItem(3);
-    itemCount = findItems<QmlGraphicsItem>(pathview, "wrapper").count();
-    QCOMPARE(itemCount, 5);
-    text = findItem<QmlGraphicsText>(pathview, "myText", 3);
-    QVERIFY(text);
-    QCOMPARE(text->text(), model.name(3));
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsPathView::pathMoved()
-{
-    QmlView *canvas = createView();
-
-    TestModel model;
-    model.addItem("Ben", "12345");
-    model.addItem("Bohn", "2345");
-    model.addItem("Bob", "54321");
-    model.addItem("Bill", "4321");
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsPathView *pathview = findItem<QmlGraphicsPathView>(canvas->rootObject(), "view");
-    QVERIFY(pathview != 0);
-
-    QmlGraphicsRectangle *firstItem = findItem<QmlGraphicsRectangle>(pathview, "wrapper", 0);
-    QVERIFY(firstItem);
-    QmlGraphicsPath *path = qobject_cast<QmlGraphicsPath*>(pathview->path());
-    QVERIFY(path);
-    QPointF start = path->pointAt(0.0);
-    QPointF offset;//Center of item is at point, but pos is from corner
-    offset.setX(firstItem->width()/2);
-    offset.setY(firstItem->height()/2);
-    QCOMPARE(firstItem->pos() + offset, start);
-    pathview->setOffset(10);
-    QTest::qWait(1000);//Moving is animated?
-
-    for(int i=0; i<model.count(); i++){
-        QmlGraphicsRectangle *curItem = findItem<QmlGraphicsRectangle>(pathview, "wrapper", i);
-        QCOMPARE(curItem->pos() + offset, path->pointAt(0.1 + i*0.25));
-    }
-
-    pathview->setOffset(100);
-    QTest::qWait(1000);//Moving is animated?
-    QCOMPARE(firstItem->pos() + offset, start);
-
-    delete canvas;
-}
-
-QmlView *tst_QmlGraphicsPathView::createView()
-{
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    return canvas;
-}
-
-/*
-   Find an item with the specified objectName.  If index is supplied then the
-   item must also evaluate the {index} expression equal to index
- */
-template<typename T>
-T *tst_QmlGraphicsPathView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
-{
-    const QMetaObject &mo = T::staticMetaObject;
-    //qDebug() << parent->childItems().count() << "children";
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if(!item)
-            continue;
-        //qDebug() << "try" << item;
-        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
-            if (index != -1) {
-                QmlExpression e(qmlContext(item), "index", item);
-                if (e.value().toInt() == index)
-                    return static_cast<T*>(item);
-            } else {
-                return static_cast<T*>(item);
-            }
-        }
-        item = findItem<T>(item, objectName, index);
-        if (item)
-            return static_cast<T*>(item);
-    }
-
-    return 0;
-}
-
-template<typename T>
-QList<T*> tst_QmlGraphicsPathView::findItems(QGraphicsObject *parent, const QString &objectName)
-{
-    QList<T*> items;
-    const QMetaObject &mo = T::staticMetaObject;
-    //qDebug() << parent->QGraphicsObject::children().count() << "children";
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if(!item)
-            continue;
-        //qDebug() << "try" << item;
-        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName))
-            items.append(static_cast<T*>(item));
-        items += findItems<T>(item, objectName);
-    }
-
-    return items;
-}
-
-QTEST_MAIN(tst_QmlGraphicsPathView)
-
-#include "tst_qmlgraphicspathview.moc"
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml b/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml
deleted file mode 100644
index f6376a1..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Grid {
-        columns: 3
-        add: Transition {
-            NumberAnimation {
-                properties: "x,y";
-            }
-        }
-        move: Transition {
-            NumberAnimation {
-                properties: "x,y";
-            }
-        }
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            x: -100
-            y: -100
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            x: -100
-            y: -100
-            opacity: 0
-            color: "green"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            color: "blue"
-            x: -100
-            y: -100
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "four"
-            color: "cyan"
-            x: -100
-            y: -100
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "five"
-            color: "magenta"
-            x: -100
-            y: -100
-            width: 50
-            height: 50
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml b/tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml
deleted file mode 100644
index 5b4a30d..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Grid {
-        columns: 3
-        spacing: 4
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "green"
-            width: 20
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            color: "blue"
-            width: 50
-            height: 20
-        }
-        Rectangle {
-            objectName: "four"
-            color: "cyan"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "five"
-            color: "magenta"
-            width: 10
-            height: 10
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid.qml b/tests/auto/declarative/qmlgraphicspositioners/data/grid.qml
deleted file mode 100644
index 830df6a..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/grid.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Grid {
-        columns: 3
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "green"
-            width: 20
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            color: "blue"
-            width: 50
-            height: 20
-        }
-        Rectangle {
-            objectName: "four"
-            color: "cyan"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "five"
-            color: "magenta"
-            width: 10
-            height: 10
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml b/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml
deleted file mode 100644
index c113a36..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Row {
-        add: Transition {
-            NumberAnimation {
-                properties: "x";
-            }
-        }
-        move: Transition {
-            NumberAnimation {
-                properties: "x";
-            }
-        }
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            x: -100;
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "blue"
-            x: -100;
-            opacity: 0
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            x: -100;
-            color: "green"
-            width: 50
-            height: 50
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml b/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml
deleted file mode 100644
index 32bf775..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Row {
-        spacing: 10
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "red"
-            width: 20
-            height: 10
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 40
-            height: 20
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml b/tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml
deleted file mode 100644
index 06ae151..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Row {
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "red"
-            width: 20
-            height: 10
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 40
-            height: 20
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml b/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
deleted file mode 100644
index 4370a18..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-import Qt 4.6
-
-Grid {
-    id: myGrid
-
-    width: 270
-    height: 270
-    x: 3
-    y: 3
-    columns: 4
-    spacing: 3
-
-    add: columnTransition
-    move: columnTransition
-
-    Repeater {
-        model: 20
-        Rectangle { color: "black"; width: 50; height: 50 }
-    }
-
-    data: [
-    Transition {
-        id: rowTransition
-        objectName: "rowTransition"
-        NumberAnimation {
-            properties: "x,y";
-            easing.type: "OutInCubic"
-        }
-    },
-    Transition {
-        id: columnTransition
-        objectName: "columnTransition"
-        NumberAnimation {
-            properties: "x,y";
-            easing.type: "OutInCubic"
-        }
-    }
-    ]
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml b/tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml
deleted file mode 100644
index 2bc5e94..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Row {
-        Repeater{ model: 3;
-            delegate: Component {
-                Rectangle {
-                    color: "red"
-                    width: 50
-                    height: 50
-                    z: {if(index == 0){2;}else if(index == 1){1;} else{3;}}
-                    objectName: {if(index == 0){"one";}else if(index == 1){"two";} else{"three";}}
-
-                }
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml b/tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml
deleted file mode 100644
index 10f6cbb..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Column {
-        add: Transition {
-            NumberAnimation {
-                properties: "y";
-            }
-        }
-        move: Transition {
-            NumberAnimation {
-                properties: "y";
-            }
-        }
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            y: -100
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "blue"
-            y: -100
-            opacity: 0
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            y: -100
-            width: 50
-            height: 50
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml b/tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml
deleted file mode 100644
index 69a8256..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Column {
-        spacing: 10
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "red"
-            width: 20
-            height: 10
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 40
-            height: 20
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml b/tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml
deleted file mode 100644
index 856c180..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Column {
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "red"
-            width: 20
-            height: 10
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 40
-            height: 20
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro b/tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro
deleted file mode 100644
index d151026..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlgraphicspositioners.cpp
-macx:CONFIG -= app_bundle
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp b/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
deleted file mode 100644
index 27db5fe..0000000
--- a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QtTest/QtTest>
-#include <private/qlistmodelinterface_p.h>
-#include <qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlgraphicspositioners_p.h>
-#include <private/qmltransition_p.h>
-#include <qmlexpression.h>
-#include "../../../shared/util.h"
-
-class tst_QmlGraphicsPositioners : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QmlGraphicsPositioners();
-
-private slots:
-    void test_horizontal();
-    void test_horizontal_spacing();
-    void test_horizontal_animated();
-    void test_vertical();
-    void test_vertical_spacing();
-    void test_vertical_animated();
-    void test_grid();
-    void test_grid_spacing();
-    void test_grid_animated();
-    void test_propertychanges();
-    void test_repeater();
-private:
-    QmlView *createView(const QString &filename);
-};
-
-tst_QmlGraphicsPositioners::tst_QmlGraphicsPositioners()
-{
-}
-
-void tst_QmlGraphicsPositioners::test_horizontal()
-{
-    QmlView *canvas = createView(SRCDIR "/data/horizontal.qml");
-
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 70.0);
-    QCOMPARE(three->y(), 0.0);
-}
-
-void tst_QmlGraphicsPositioners::test_horizontal_spacing()
-{
-    QmlView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
-
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 60.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 90.0);
-    QCOMPARE(three->y(), 0.0);
-}
-
-void tst_QmlGraphicsPositioners::test_horizontal_animated()
-{
-    QmlView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
-
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    //Note that they animate in
-    QCOMPARE(one->x(), -100.0);
-    QCOMPARE(two->x(), -100.0);
-    QCOMPARE(three->x(), -100.0);
-
-    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
-    //Note that this means the duration of the animation is NOT tested
-
-    QTRY_COMPARE(one->x(), 0.0);
-    QTRY_COMPARE(one->y(), 0.0);
-    QTRY_COMPARE(two->opacity(), 0.0);
-    QTRY_COMPARE(two->x(), -100.0);//Not 'in' yet
-    QTRY_COMPARE(two->y(), 0.0);
-    QTRY_COMPARE(three->x(), 50.0);
-    QTRY_COMPARE(three->y(), 0.0);
-
-    //Add 'two'
-    two->setOpacity(1.0);
-    QCOMPARE(two->opacity(), 1.0);
-    QTest::qWait(0);//Let the animation start
-    QCOMPARE(two->x(), -100.0);
-    QCOMPARE(three->x(), 50.0);
-
-    QTRY_COMPARE(two->x(), 50.0);
-    QTRY_COMPARE(three->x(), 100.0);
-}
-
-void tst_QmlGraphicsPositioners::test_vertical()
-{
-    QmlView *canvas = createView(SRCDIR "/data/vertical.qml");
-
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 0.0);
-    QCOMPARE(two->y(), 50.0);
-    QCOMPARE(three->x(), 0.0);
-    QCOMPARE(three->y(), 60.0);
-}
-
-void tst_QmlGraphicsPositioners::test_vertical_spacing()
-{
-    QmlView *canvas = createView(SRCDIR "/data/vertical-spacing.qml");
-
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 0.0);
-    QCOMPARE(two->y(), 60.0);
-    QCOMPARE(three->x(), 0.0);
-    QCOMPARE(three->y(), 80.0);
-}
-
-void tst_QmlGraphicsPositioners::test_vertical_animated()
-{
-    QmlView *canvas = createView(SRCDIR "/data/vertical-animated.qml");
-
-    //Note that they animate in
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-    QCOMPARE(one->y(), -100.0);
-
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-    QCOMPARE(two->y(), -100.0);
-
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-    QCOMPARE(three->y(), -100.0);
-
-    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
-    //Note that this means the duration of the animation is NOT tested
-
-    QTRY_COMPARE(one->y(), 0.0);
-    QTRY_COMPARE(one->x(), 0.0);
-    QTRY_COMPARE(two->opacity(), 0.0);
-    QTRY_COMPARE(two->y(), -100.0);//Not 'in' yet
-    QTRY_COMPARE(two->x(), 0.0);
-    QTRY_COMPARE(three->y(), 50.0);
-    QTRY_COMPARE(three->x(), 0.0);
-
-    //Add 'two'
-    two->setOpacity(1.0);
-    QTRY_COMPARE(two->opacity(), 1.0);
-    QTest::qWait(0);//Let the animation start
-    QCOMPARE(two->y(), -100.0);
-    QCOMPARE(three->y(), 50.0);
-
-    QTRY_COMPARE(two->y(), 50.0);
-    QTRY_COMPARE(three->y(), 100.0);
-
-}
-
-void tst_QmlGraphicsPositioners::test_grid()
-{
-    QmlView *canvas = createView(SRCDIR "/data/grid.qml");
-
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-    QmlGraphicsRectangle *four = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("four");
-    QVERIFY(four != 0);
-    QmlGraphicsRectangle *five = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("five");
-    QVERIFY(five != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 70.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(four->x(), 0.0);
-    QCOMPARE(four->y(), 50.0);
-    QCOMPARE(five->x(), 50.0);
-    QCOMPARE(five->y(), 50.0);
-}
-
-void tst_QmlGraphicsPositioners::test_grid_spacing()
-{
-    QmlView *canvas = createView(SRCDIR "/data/grid-spacing.qml");
-
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-    QmlGraphicsRectangle *four = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("four");
-    QVERIFY(four != 0);
-    QmlGraphicsRectangle *five = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("five");
-    QVERIFY(five != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 54.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 78.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(four->x(), 0.0);
-    QCOMPARE(four->y(), 54.0);
-    QCOMPARE(five->x(), 54.0);
-    QCOMPARE(five->y(), 54.0);
-}
-
-void tst_QmlGraphicsPositioners::test_grid_animated()
-{
-    QmlView *canvas = createView(SRCDIR "/data/grid-animated.qml");
-
-    //Note that all animate in
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-    QCOMPARE(one->x(), -100.0);
-    QCOMPARE(one->y(), -100.0);
-
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-    QCOMPARE(two->x(), -100.0);
-    QCOMPARE(two->y(), -100.0);
-
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-    QCOMPARE(three->x(), -100.0);
-    QCOMPARE(three->y(), -100.0);
-
-    QmlGraphicsRectangle *four = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("four");
-    QVERIFY(four != 0);
-    QCOMPARE(four->x(), -100.0);
-    QCOMPARE(four->y(), -100.0);
-
-    QmlGraphicsRectangle *five = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("five");
-    QVERIFY(five != 0);
-    QCOMPARE(five->x(), -100.0);
-    QCOMPARE(five->y(), -100.0);
-
-    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
-    //Note that this means the duration of the animation is NOT tested
-
-    QTRY_COMPARE(one->y(), 0.0);
-    QTRY_COMPARE(one->x(), 0.0);
-    QTRY_COMPARE(two->opacity(), 0.0);
-    QTRY_COMPARE(two->y(), -100.0);
-    QTRY_COMPARE(two->x(), -100.0);
-    QTRY_COMPARE(three->y(), 0.0);
-    QTRY_COMPARE(three->x(), 50.0);
-    QTRY_COMPARE(four->y(), 0.0);
-    QTRY_COMPARE(four->x(), 100.0);
-    QTRY_COMPARE(five->y(), 50.0);
-    QTRY_COMPARE(five->x(), 0.0);
-
-    //Add 'two'
-    two->setOpacity(1.0);
-    QCOMPARE(two->opacity(), 1.0);
-    QTest::qWait(0);//Let the animation start
-    QCOMPARE(two->x(), -100.0);
-    QCOMPARE(two->y(), -100.0);
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(three->x(), 50.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(four->x(), 100.0);
-    QCOMPARE(four->y(), 0.0);
-    QCOMPARE(five->x(), 0.0);
-    QCOMPARE(five->y(), 50.0);
-    //Let the animation complete
-    QTRY_COMPARE(two->x(), 50.0);
-    QTRY_COMPARE(two->y(), 0.0);
-    QTRY_COMPARE(one->x(), 0.0);
-    QTRY_COMPARE(one->y(), 0.0);
-    QTRY_COMPARE(three->x(), 100.0);
-    QTRY_COMPARE(three->y(), 0.0);
-    QTRY_COMPARE(four->x(), 0.0);
-    QTRY_COMPARE(four->y(), 50.0);
-    QTRY_COMPARE(five->x(), 50.0);
-    QTRY_COMPARE(five->y(), 50.0);
-
-}
-void tst_QmlGraphicsPositioners::test_propertychanges()
-{
-    QmlView *canvas = createView("data/propertychanges.qml");
-
-    QmlGraphicsGrid *grid = qobject_cast<QmlGraphicsGrid*>(canvas->rootObject());
-    QmlTransition *rowTransition = canvas->rootObject()->findChild<QmlTransition*>("rowTransition");
-    QmlTransition *columnTransition = canvas->rootObject()->findChild<QmlTransition*>("columnTransition");
-
-    QSignalSpy addSpy(grid, SIGNAL(addChanged()));
-    QSignalSpy moveSpy(grid, SIGNAL(moveChanged()));
-    QSignalSpy columnsSpy(grid, SIGNAL(columnsChanged()));
-    QSignalSpy rowsSpy(grid, SIGNAL(rowsChanged()));
-
-    QVERIFY(grid);
-    QVERIFY(rowTransition);
-    QVERIFY(columnTransition);
-    QCOMPARE(grid->add(), columnTransition);
-    QCOMPARE(grid->move(), columnTransition);
-    QCOMPARE(grid->columns(), 4);
-    QCOMPARE(grid->rows(), -1);
-
-    grid->setAdd(rowTransition);
-    grid->setMove(rowTransition);
-    QCOMPARE(grid->add(), rowTransition);
-    QCOMPARE(grid->move(), rowTransition);
-    QCOMPARE(addSpy.count(),1);
-    QCOMPARE(moveSpy.count(),1);
-
-    grid->setAdd(rowTransition);
-    grid->setMove(rowTransition);
-    QCOMPARE(addSpy.count(),1);
-    QCOMPARE(moveSpy.count(),1);
-
-    grid->setAdd(0);
-    grid->setMove(0);
-    QCOMPARE(addSpy.count(),2);
-    QCOMPARE(moveSpy.count(),2);
-
-    grid->setColumns(-1);
-    grid->setRows(3);
-    QCOMPARE(grid->columns(), -1);
-    QCOMPARE(grid->rows(), 3);
-    QCOMPARE(columnsSpy.count(),1);
-    QCOMPARE(rowsSpy.count(),1);
-
-    grid->setColumns(-1);
-    grid->setRows(3);
-    QCOMPARE(columnsSpy.count(),1);
-    QCOMPARE(rowsSpy.count(),1);
-
-    grid->setColumns(2);
-    grid->setRows(2);
-    QCOMPARE(columnsSpy.count(),2);
-    QCOMPARE(rowsSpy.count(),2);
-}
-
-void tst_QmlGraphicsPositioners::test_repeater()
-{
-    QmlView *canvas = createView(SRCDIR "/data/repeater.qml");
-
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 100.0);
-    QCOMPARE(three->y(), 0.0);
-}
-
-QmlView *tst_QmlGraphicsPositioners::createView(const QString &filename)
-{
-    QmlView *canvas = new QmlView(0);
-
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    return canvas;
-}
-
-
-QTEST_MAIN(tst_QmlGraphicsPositioners)
-
-#include "tst_qmlgraphicspositioners.moc"
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/intmodel.qml b/tests/auto/declarative/qmlgraphicsrepeater/data/intmodel.qml
deleted file mode 100644
index cf1fb4d..0000000
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/intmodel.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: container
-    objectName: "container"
-    width: 240
-    height: 320
-    color: "white"
-
-    function checkProperties() {
-        testObject.error = false;
-        if (repeater.delegate != comp) {
-            console.log("delegate property incorrect");
-            testObject.error = true;
-        }
-    }
-
-    Component {
-        id: comp
-        Item{}
-    }
-
-    Repeater {
-        id: repeater
-        objectName: "repeater"
-        model: testData
-        delegate: comp
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/itemlist.qml b/tests/auto/declarative/qmlgraphicsrepeater/data/itemlist.qml
deleted file mode 100644
index fc6b34c..0000000
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/itemlist.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-// This example demonstrates placing items in a view using
-// a VisualItemModel
-
-import Qt 4.6
-
-Rectangle {
-    color: "lightgray"
-    width: 240
-    height: 320
-
-    function checkProperties() {
-        testObject.error = false;
-        if (testObject.useModel && view.model != itemModel) {
-            console.log("model property incorrect");
-            testObject.error = true;
-        }
-    }
-
-    VisualItemModel {
-        id: itemModel
-        objectName: "itemModel"
-        Rectangle {
-            objectName: "item1"
-            height: view.height; width: view.width; color: "#FFFEF0"
-            Text { objectName: "text1"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
-        }
-        Rectangle {
-            objectName: "item2"
-            height: view.height; width: view.width; color: "#F0FFF7"
-            Text { objectName: "text2"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
-        }
-        Rectangle {
-            objectName: "item3"
-            height: view.height; width: view.width; color: "#F4F0FF"
-            Text { objectName: "text3"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
-        }
-    }
-
-    Column {
-        objectName: "container"
-        Repeater {
-            id: view
-            objectName: "repeater"
-            anchors.fill: parent
-            anchors.bottomMargin: 30
-            model: testObject.useModel ? itemModel : 0
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/objlist.qml b/tests/auto/declarative/qmlgraphicsrepeater/data/objlist.qml
deleted file mode 100644
index e6d0acb..0000000
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/objlist.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: container
-    objectName: "container"
-    width: 240
-    height: 320
-    color: "white"
-    Repeater {
-        id: repeater
-        objectName: "repeater"
-        model: testData
-        property int errors: 0
-        property int instantiated: 0
-        Component {
-            Item{
-                Component.onCompleted: {if(index!=model.idx) repeater.errors += 1; repeater.instantiated++}
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/properties.qml b/tests/auto/declarative/qmlgraphicsrepeater/data/properties.qml
deleted file mode 100644
index 550ce8d..0000000
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/properties.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-Row { 
-    Repeater { 
-        objectName: "repeater"
-        model: 5
-        Text { 
-            text: "I'm item " + index 
-        } 
-    }
-}
\ No newline at end of file
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/repeater.qml b/tests/auto/declarative/qmlgraphicsrepeater/data/repeater.qml
deleted file mode 100644
index 7d83230..0000000
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/repeater.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: container
-    objectName: "container"
-    width: 240
-    height: 320
-    color: "white"
-    Text {
-        text: "Zero"
-    }
-    Repeater {
-        id: repeater
-        objectName: "repeater"
-        width: 240
-        height: 320
-        model: testData
-        Component {
-            Text {
-                y: index*20
-                text: modelData
-            }
-        }
-    }
-    Text {
-        text: "Last"
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/repeater2.qml b/tests/auto/declarative/qmlgraphicsrepeater/data/repeater2.qml
deleted file mode 100644
index c3c3260..0000000
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/repeater2.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 240
-    height: 320
-    color: "white"
-    Component {
-        id: myDelegate
-        Item {
-            objectName: "myDelegate"
-            height: 20
-            Text {
-                y: index*20
-                text: name
-            }
-            Text {
-                y: index*20
-                x: 100
-                text: number
-            }
-        }
-    }
-    Column {
-        id: container
-        objectName: "container"
-        Repeater {
-            id: repeater
-            objectName: "repeater"
-            width: 240
-            height: 320
-            delegate: myDelegate
-            model: testData
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/qmlgraphicsrepeater.pro b/tests/auto/declarative/qmlgraphicsrepeater/qmlgraphicsrepeater.pro
deleted file mode 100644
index 0a10ec6..0000000
--- a/tests/auto/declarative/qmlgraphicsrepeater/qmlgraphicsrepeater.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicsrepeater.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp b/tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp
deleted file mode 100644
index 9f3ff45..0000000
--- a/tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-#include <QtTest/QSignalSpy>
-#include <private/qlistmodelinterface_p.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlview.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <private/qmlgraphicsrepeater_p.h>
-#include <private/qmlgraphicstext_p.h>
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
-}
-
-class tst_QmlGraphicsRepeater : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QmlGraphicsRepeater();
-
-private slots:
-    void numberModel();
-    void objectList();
-    void stringList();
-    void dataModel();
-    void itemModel();
-    void properties();
-
-private:
-    QmlView *createView();
-    template<typename T>
-    T *findItem(QGraphicsObject *parent, const QString &id);
-};
-
-class TestObject : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(bool error READ error WRITE setError)
-    Q_PROPERTY(bool useModel READ useModel NOTIFY useModelChanged)
-
-public:
-    TestObject() : QObject(), mError(true), mUseModel(false) {}
-
-    bool error() const { return mError; }
-    void setError(bool err) { mError = err; }
-
-    bool useModel() const { return mUseModel; }
-    void setUseModel(bool use) { mUseModel = use; emit useModelChanged(); }
-
-signals:
-    void useModelChanged();
-
-private:
-    bool mError;
-    bool mUseModel;
-};
-
-class TestModel : public QAbstractListModel
-{
-public:
-    enum Roles { Name = Qt::UserRole+1, Number = Qt::UserRole+2 };
-
-    TestModel(QObject *parent=0) : QAbstractListModel(parent) {
-        QHash<int, QByteArray> roles;
-        roles[Name] = "name";
-        roles[Number] = "number";
-        setRoleNames(roles);
-    }
-
-    int rowCount(const QModelIndex &parent=QModelIndex()) const { return list.count(); }
-    QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const {
-        QVariant rv;
-        if (role == Name)
-            rv = list.at(index.row()).first;
-        else if (role == Number)
-            rv = list.at(index.row()).second;
-
-        return rv;
-    }
-
-    int count() const { return rowCount(); }
-    QString name(int index) const { return list.at(index).first; }
-    QString number(int index) const { return list.at(index).second; }
-
-    void addItem(const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), list.count(), list.count());
-        list.append(QPair<QString,QString>(name, number));
-        emit endInsertRows();
-    }
-
-    void insertItem(int index, const QString &name, const QString &number) {
-        emit beginInsertRows(QModelIndex(), index, index);
-        list.insert(index, QPair<QString,QString>(name, number));
-        emit endInsertRows();
-    }
-
-    void removeItem(int index) {
-        emit beginRemoveRows(QModelIndex(), index, index);
-        list.removeAt(index);
-        emit endRemoveRows();
-    }
-
-    void moveItem(int from, int to) {
-        emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
-        list.move(from, to);
-        emit endMoveRows();
-    }
-
-    void modifyItem(int idx, const QString &name, const QString &number) {
-        list[idx] = QPair<QString,QString>(name, number);
-        emit dataChanged(index(idx,0), index(idx,0));
-    }
-
-private:
-    QList<QPair<QString,QString> > list;
-};
-
-
-tst_QmlGraphicsRepeater::tst_QmlGraphicsRepeater()
-{
-}
-
-void tst_QmlGraphicsRepeater::numberModel()
-{
-    QmlView *canvas = createView();
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testData", 5);
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/intmodel.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
-    QVERIFY(repeater != 0);
-    QCOMPARE(repeater->parentItem()->childItems().count(), 5+1);
-
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QVERIFY(testObject->error() == false);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsRepeater::objectList()
-{
-    QmlView *canvas = createView();
-
-    QObjectList data;
-    for(int i=0; i<100; i++){
-        data << new QObject();
-        data.back()->setProperty("idx", i);
-    }
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testData", QVariant::fromValue(data));
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/objlist.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
-    QVERIFY(repeater != 0);
-    QCOMPARE(repeater->property("errors").toInt(), 0);//If this fails either they are out of order or can't find the object's data
-    QCOMPARE(repeater->property("instantiated").toInt(), 100);
-}
-
-/*
-The Repeater element creates children at its own position in its parent's
-stacking order.  In this test we insert a repeater between two other Text
-elements to test this.
-*/
-void tst_QmlGraphicsRepeater::stringList()
-{
-    QmlView *canvas = createView();
-
-    QStringList data;
-    data << "One";
-    data << "Two";
-    data << "Three";
-    data << "Four";
-
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testData", data);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
-    QVERIFY(repeater != 0);
-
-    QmlGraphicsItem *container = findItem<QmlGraphicsItem>(canvas->rootObject(), "container");
-    QVERIFY(container != 0);
-
-    QCOMPARE(container->childItems().count(), data.count() + 3);
-
-    bool saw_repeater = false;
-    for (int i = 0; i < container->childItems().count(); ++i) {
-
-        if (i == 0) {
-            QmlGraphicsText *name = qobject_cast<QmlGraphicsText*>(container->childItems().at(i));
-            QVERIFY(name != 0);
-            QCOMPARE(name->text(), QLatin1String("Zero"));
-        } else if (i == container->childItems().count() - 2) {
-            // The repeater itself
-            QmlGraphicsRepeater *rep = qobject_cast<QmlGraphicsRepeater*>(container->childItems().at(i));
-            QCOMPARE(rep, repeater);
-            saw_repeater = true;
-            continue;
-        } else if (i == container->childItems().count() - 1) {
-            QmlGraphicsText *name = qobject_cast<QmlGraphicsText*>(container->childItems().at(i));
-            QVERIFY(name != 0);
-            QCOMPARE(name->text(), QLatin1String("Last"));
-        } else {
-            QmlGraphicsText *name = qobject_cast<QmlGraphicsText*>(container->childItems().at(i));
-            QVERIFY(name != 0);
-            QCOMPARE(name->text(), data.at(i-1));
-        }
-    }
-    QVERIFY(saw_repeater);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsRepeater::dataModel()
-{
-    QmlView *canvas = createView();
-    QmlContext *ctxt = canvas->rootContext();
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    TestModel testModel;
-    testModel.addItem("one", "1");
-    testModel.addItem("two", "2");
-    testModel.addItem("three", "3");
-
-    ctxt->setContextProperty("testData", &testModel);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater2.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
-    QVERIFY(repeater != 0);
-
-    QmlGraphicsItem *container = findItem<QmlGraphicsItem>(canvas->rootObject(), "container");
-    QVERIFY(container != 0);
-
-    QCOMPARE(container->childItems().count(), 4);
-
-    testModel.addItem("four", "4");
-    QCOMPARE(container->childItems().count(), 5);
-
-    testModel.removeItem(2);
-    QCOMPARE(container->childItems().count(), 4);
-}
-
-void tst_QmlGraphicsRepeater::itemModel()
-{
-    QmlView *canvas = createView();
-    QmlContext *ctxt = canvas->rootContext();
-    TestObject *testObject = new TestObject;
-    ctxt->setContextProperty("testObject", testObject);
-
-    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/itemlist.qml"));
-    qApp->processEvents();
-
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
-    QVERIFY(repeater != 0);
-
-    QmlGraphicsItem *container = findItem<QmlGraphicsItem>(canvas->rootObject(), "container");
-    QVERIFY(container != 0);
-
-    QCOMPARE(container->childItems().count(), 1);
-
-    testObject->setUseModel(true);
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QVERIFY(testObject->error() == false);
-
-    QCOMPARE(container->childItems().count(), 4);
-    QVERIFY(qobject_cast<QObject*>(container->childItems().at(0))->objectName() == "item1");
-    QVERIFY(qobject_cast<QObject*>(container->childItems().at(1))->objectName() == "item2");
-    QVERIFY(qobject_cast<QObject*>(container->childItems().at(2))->objectName() == "item3");
-    QVERIFY(container->childItems().at(3) == repeater);
-
-    delete canvas;
-}
-
-void tst_QmlGraphicsRepeater::properties()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("/properties.qml"));
-
-    QmlGraphicsItem *rootObject = qobject_cast<QmlGraphicsItem*>(component.create());
-    QVERIFY(rootObject);
-
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(rootObject, "repeater");
-    QVERIFY(repeater);
-
-    QSignalSpy modelSpy(repeater, SIGNAL(modelChanged()));
-    repeater->setModel(3);
-    QCOMPARE(modelSpy.count(),1);
-    repeater->setModel(3);
-    QCOMPARE(modelSpy.count(),1);
-
-    QSignalSpy delegateSpy(repeater, SIGNAL(delegateChanged()));
-
-    QmlComponent rectComponent(&engine);
-    rectComponent.setData("import Qt 4.6; Rectangle {}", QUrl::fromLocalFile(""));
-
-    repeater->setDelegate(&rectComponent);
-    QCOMPARE(delegateSpy.count(),1);
-    repeater->setDelegate(&rectComponent);
-    QCOMPARE(delegateSpy.count(),1);
-}
-
-QmlView *tst_QmlGraphicsRepeater::createView()
-{
-    QmlView *canvas = new QmlView(0);
-    canvas->setFixedSize(240,320);
-
-    return canvas;
-}
-
-template<typename T>
-T *tst_QmlGraphicsRepeater::findItem(QGraphicsObject *parent, const QString &objectName)
-{
-    const QMetaObject &mo = T::staticMetaObject;
-    if (mo.cast(parent) && (objectName.isEmpty() || parent->objectName() == objectName))
-        return static_cast<T*>(parent);
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *child = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
-        if (!child)
-            continue;
-        QmlGraphicsItem *item = findItem<T>(child, objectName);
-        if (item)
-            return static_cast<T*>(item);
-    }
-
-    return 0;
-}
-
-QTEST_MAIN(tst_QmlGraphicsRepeater)
-
-#include "tst_qmlgraphicsrepeater.moc"
diff --git a/tests/auto/declarative/qmlgraphicstext/qmlgraphicstext.pro b/tests/auto/declarative/qmlgraphicstext/qmlgraphicstext.pro
deleted file mode 100644
index 1d8c59f..0000000
--- a/tests/auto/declarative/qmlgraphicstext/qmlgraphicstext.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicstext.cpp
diff --git a/tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp b/tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp
deleted file mode 100644
index 2c1e09b..0000000
--- a/tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp
+++ /dev/null
@@ -1,844 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QTextDocument>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmlvaluetype_p.h>
-#include <QFontMetrics>
-#include <QGraphicsSceneMouseEvent>
-#include <qmath.h>
-
-class tst_qmlgraphicstext : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicstext();
-
-private slots:
-    void text();
-    void width();
-    void wrap();
-    void elide();
-    void textFormat();
-
-    // ### these tests may be trivial    
-    void horizontalAlignment();
-    void verticalAlignment();
-    void font();
-    void style();
-    void color();
-    void smooth();
-
-    // QmlFontValueType
-    void weight();
-    void underline();
-    void overline();
-    void strikeout();
-    void capitalization();
-    void letterSpacing();
-    void wordSpacing();
-
-    void clickLink();
-
-private:
-    QStringList standard;
-    QStringList richText;
-
-    QStringList horizontalAlignmentmentStrings;
-    QStringList verticalAlignmentmentStrings;
-
-    QList<Qt::Alignment> verticalAlignmentments;
-    QList<Qt::Alignment> horizontalAlignmentments;
-
-    QStringList styleStrings;
-    QList<QmlGraphicsText::TextStyle> styles;
-
-    QStringList colorStrings;
-
-    QmlEngine engine;
-};
-
-tst_qmlgraphicstext::tst_qmlgraphicstext()
-{
-    standard << "the quick brown fox jumped over the lazy dog"
-            << "the quick brown fox\n jumped over the lazy dog";
-
-    richText << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a> jumped over the <b>lazy</b> dog</i>"
-            << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a><br>jumped over the <b>lazy</b> dog</i>";
-
-    horizontalAlignmentmentStrings << "AlignLeft"
-            << "AlignRight"
-            << "AlignHCenter";
-
-    verticalAlignmentmentStrings << "AlignTop"
-            << "AlignBottom"
-            << "AlignVCenter";
-
-    horizontalAlignmentments << Qt::AlignLeft
-            << Qt::AlignRight
-            << Qt::AlignHCenter;
-
-    verticalAlignmentments << Qt::AlignTop
-            << Qt::AlignBottom
-            << Qt::AlignVCenter;
-
-    styleStrings << "Normal"
-            << "Outline"
-            << "Raised"
-            << "Sunken";
-
-    styles << QmlGraphicsText::Normal
-            << QmlGraphicsText::Outline
-            << QmlGraphicsText::Raised
-            << QmlGraphicsText::Sunken;
-
-    colorStrings << "aliceblue"
-            << "antiquewhite"
-            << "aqua"
-            << "darkkhaki"
-            << "darkolivegreen"
-            << "dimgray"
-            << "palevioletred"
-            << "lightsteelblue"
-            << "#000000"
-            << "#AAAAAA"
-            << "#FFFFFF"
-            << "#2AC05F";
-    //
-    // need a different test to do alpha channel test
-    // << "#AA0011DD"
-    // << "#00F16B11";
-    //
-}
-
-void tst_qmlgraphicstext::text()
-{
-    {
-        QmlComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.6\nText { text: \"\" }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->text(), QString(""));
-        QVERIFY(textObject->width() == 0);
-
-        delete textObject;
-    }
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"" + standard.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->text(), standard.at(i));
-        QVERIFY(textObject->width() > 0);
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"" + richText.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QString expected = richText.at(i);
-        QCOMPARE(textObject->text(), expected.replace("\\\"", "\""));
-        QVERIFY(textObject->width() > 0);
-    }
-}
-
-void tst_qmlgraphicstext::width()
-{
-    // uses Font metrics to find the width for standard and document to find the width for rich
-    {
-        QmlComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.6\nText { text: \"\" }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->width(), 0.);
-    }
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        QVERIFY(!Qt::mightBeRichText(standard.at(i))); // self-test
-
-        QFont f;
-        QFontMetricsF fm(f);
-        qreal metricWidth = fm.size(Qt::TextExpandTabs && Qt::TextShowMnemonic, standard.at(i)).width();
-        metricWidth = qCeil(metricWidth);
-
-        QString componentStr = "import Qt 4.6\nText { text: \"" + standard.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->width(), qreal(metricWidth));
-        QVERIFY(textObject->textFormat() == QmlGraphicsText::AutoText); // setting text doesn't change format
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        QVERIFY(Qt::mightBeRichText(richText.at(i))); // self-test
-
-        QTextDocument document;
-        document.setHtml(richText.at(i));
-        document.setDocumentMargin(0);
-
-        int documentWidth = document.idealWidth();
-
-        QString componentStr = "import Qt 4.6\nText { text: \"" + richText.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->width(), qreal(documentWidth));
-        QVERIFY(textObject->textFormat() == QmlGraphicsText::AutoText); // setting text doesn't change format
-    }
-}
-
-void tst_qmlgraphicstext::wrap()
-{
-    int textHeight = 0;
-    // for specified width and wrap set true
-    {
-        QmlComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.6\nText { text: \"Hello\"; wrap: true; width: 300 }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-        textHeight = textObject->height();
-
-        QVERIFY(textObject != 0);
-        QVERIFY(textObject->wrap() == true);
-        QCOMPARE(textObject->width(), 300.);
-    }
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nText { wrap: true; width: 30; text: \"" + standard.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->width(), 30.);
-        QVERIFY(textObject->height() > textHeight);
-
-        int oldHeight = textObject->height();
-        textObject->setWidth(100);
-        QVERIFY(textObject->height() < oldHeight);
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nText { wrap: true; width: 30; text: \"" + richText.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->width(), 30.);
-        QVERIFY(textObject->height() > textHeight);
-    }
-
-}
-
-void tst_qmlgraphicstext::elide()
-{
-    for (QmlGraphicsText::TextElideMode m = QmlGraphicsText::ElideLeft; m<=QmlGraphicsText::ElideNone; m=QmlGraphicsText::TextElideMode(int(m)+1)) {
-        const char* elidename[]={"ElideLeft", "ElideRight", "ElideMiddle", "ElideNone"};
-        QString elide = "elide: Text." + QString(elidename[int(m)]) + ";";
-
-        // XXX Poor coverage.
-
-        {
-            QmlComponent textComponent(&engine);
-            textComponent.setData(("import Qt 4.6\nText { text: \"\"; "+elide+" width: 100 }").toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-            QCOMPARE(textObject->elideMode(), m);
-            QCOMPARE(textObject->width(), 100.);
-        }
-
-        for (int i = 0; i < standard.size(); i++)
-        {
-            QString componentStr = "import Qt 4.6\nText { "+elide+" width: 100; text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-            QCOMPARE(textObject->elideMode(), m);
-            QCOMPARE(textObject->width(), 100.);
-        }
-
-        // richtext - does nothing
-        for (int i = 0; i < richText.size(); i++)
-        {
-            QString componentStr = "import Qt 4.6\nText { "+elide+" width: 100; text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-            QCOMPARE(textObject->elideMode(), m);
-            QCOMPARE(textObject->width(), 100.);
-        }
-    }
-}
-
-void tst_qmlgraphicstext::textFormat()
-{
-    {
-        QmlComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.6\nText { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QmlGraphicsText::RichText);
-    }
-    {
-        QmlComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.6\nText { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QmlGraphicsText::PlainText);
-    }
-}
-
-//the alignment tests may be trivial o.oa
-void tst_qmlgraphicstext::horizontalAlignment()
-{
-    //test one align each, and then test if two align fails.
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        for (int j=0; j < horizontalAlignmentmentStrings.size(); j++)
-        {
-            QString componentStr = "import Qt 4.6\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-            QCOMPARE((int)textObject->hAlign(), (int)horizontalAlignmentments.at(j));
-        }
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        for (int j=0; j < horizontalAlignmentmentStrings.size(); j++)
-        {
-            QString componentStr = "import Qt 4.6\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-            QCOMPARE((int)textObject->hAlign(), (int)horizontalAlignmentments.at(j));
-        }
-    }
-
-}
-
-void tst_qmlgraphicstext::verticalAlignment()
-{
-    //test one align each, and then test if two align fails.
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        for (int j=0; j < verticalAlignmentmentStrings.size(); j++)
-        {
-            QString componentStr = "import Qt 4.6\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-            QVERIFY(textObject != 0);
-            QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j));
-        }
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        for (int j=0; j < verticalAlignmentmentStrings.size(); j++)
-        {
-            QString componentStr = "import Qt 4.6\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-            QVERIFY(textObject != 0);
-            QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j));
-        }
-    }
-
-}
-
-void tst_qmlgraphicstext::font()
-{
-    //test size, then bold, then italic, then family
-    {
-        QString componentStr = "import Qt 4.6\nText { font.pointSize: 40; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE(textObject->font().pointSize(), 40);
-        QCOMPARE(textObject->font().bold(), false);
-        QCOMPARE(textObject->font().italic(), false);
-    }
-
-    {
-        QString componentStr = "import Qt 4.6\nText { font.pixelSize: 40; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE(textObject->font().pixelSize(), 40);
-        QCOMPARE(textObject->font().bold(), false);
-        QCOMPARE(textObject->font().italic(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nText { font.bold: true; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE(textObject->font().bold(), true);
-        QCOMPARE(textObject->font().italic(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nText { font.italic: true; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE(textObject->font().italic(), true);
-        QCOMPARE(textObject->font().bold(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nText { font.family: \"Helvetica\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE(textObject->font().family(), QString("Helvetica"));
-        QCOMPARE(textObject->font().bold(), false);
-        QCOMPARE(textObject->font().italic(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nText { font.family: \"\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE(textObject->font().family(), QString(""));
-    }
-}
-
-void tst_qmlgraphicstext::style()
-{
-    //test style
-    for (int i = 0; i < styles.size(); i++)
-    { 
-        QString componentStr = "import Qt 4.6\nText { style: \"" + styleStrings.at(i) + "\"; styleColor: \"white\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE((int)textObject->style(), (int)styles.at(i));
-        QCOMPARE(textObject->styleColor(), QColor("white"));
-    }
-}
-
-void tst_qmlgraphicstext::color()
-{
-    //test style
-    for (int i = 0; i < colorStrings.size(); i++)
-    { 
-        QString componentStr = "import Qt 4.6\nText { color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE(textObject->color(), QColor(colorStrings.at(i)));
-        QCOMPARE(textObject->styleColor(), QColor());
-    }
-
-    for (int i = 0; i < colorStrings.size(); i++)
-    { 
-        QString componentStr = "import Qt 4.6\nText { styleColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE(textObject->styleColor(), QColor(colorStrings.at(i)));
-        // default color to black?
-        QCOMPARE(textObject->color(), QColor("black"));
-    }
-    
-    for (int i = 0; i < colorStrings.size(); i++)
-    { 
-        for (int j = 0; j < colorStrings.size(); j++)
-        {
-            QString componentStr = "import Qt 4.6\nText { color: \"" + colorStrings.at(i) + "\"; styleColor: \"" + colorStrings.at(j) + "\"; text: \"Hello World\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-            QCOMPARE(textObject->color(), QColor(colorStrings.at(i)));
-            QCOMPARE(textObject->styleColor(), QColor(colorStrings.at(j)));
-        }
-    }
-    {
-        QString colorStr = "#AA001234";
-        QColor testColor("#001234");
-        testColor.setAlpha(170);
-
-        QString componentStr = "import Qt 4.6\nText { color: \"" + colorStr + "\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QCOMPARE(textObject->color(), testColor);
-    }
-}
-
-void tst_qmlgraphicstext::smooth()
-{
-    for (int i = 0; i < standard.size(); i++)
-    {
-        {
-            QString componentStr = "import Qt 4.6\nText { smooth: true; text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-            QCOMPARE(textObject->smooth(), true);
-        }
-        {
-            QString componentStr = "import Qt 4.6\nText { text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-            QCOMPARE(textObject->smooth(), false);
-        }
-    }
-    for (int i = 0; i < richText.size(); i++)
-    {
-        {
-            QString componentStr = "import Qt 4.6\nText { smooth: true; text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-            QCOMPARE(textObject->smooth(), true);
-        }
-        {
-            QString componentStr = "import Qt 4.6\nText { text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
-            textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-            QCOMPARE(textObject->smooth(), false);
-        }
-    }
-}
-
-void tst_qmlgraphicstext::weight()
-{
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().weight(), (int)QmlFontValueType::Normal);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { font.weight: \"Bold\"; text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().weight(), (int)QmlFontValueType::Bold);
-    }
-}
-
-void tst_qmlgraphicstext::underline()
-{
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().underline(), false);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { font.underline: true; text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().underline(), true);
-    }
-}
-
-void tst_qmlgraphicstext::overline()
-{
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().overline(), false);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { font.overline: true; text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().overline(), true);
-    }
-}
-
-void tst_qmlgraphicstext::strikeout()
-{
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().strikeOut(), false);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { font.strikeout: true; text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().strikeOut(), true);
-    }
-}
-
-void tst_qmlgraphicstext::capitalization()
-{
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::MixedCase);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"AllUppercase\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::AllUppercase);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"AllLowercase\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::AllLowercase);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"SmallCaps\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::SmallCaps);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"Capitalize\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::Capitalize);
-    }
-}
-
-void tst_qmlgraphicstext::letterSpacing()
-{
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().letterSpacing(), 0.0);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.letterSpacing: -50 }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().letterSpacing(), -50.);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.letterSpacing: 200 }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().letterSpacing(), 200.);
-    }
-}
-
-void tst_qmlgraphicstext::wordSpacing()
-{
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().wordSpacing(), 0.0);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.wordSpacing: -50 }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().wordSpacing(), -50.);
-    }
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.wordSpacing: 200 }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QCOMPARE(textObject->font().wordSpacing(), 200.);
-    }
-}
-
-class EventSender : public QGraphicsItem
-{
-public:
-    void sendEvent(QEvent *event) { sceneEvent(event); }
-};
-
-class LinkTest : public QObject
-{
-    Q_OBJECT
-public:
-    LinkTest() {}
-
-    QString link;
-
-public slots:
-    void linkClicked(QString l) { link = l; }
-};
-
-void tst_qmlgraphicstext::clickLink()
-{
-    {
-        QString componentStr = "import Qt 4.6\nText { text: \"<a href=\\\"http://qt.nokia.com\\\">Hello world!</a>\" }";
-        QmlComponent textComponent(&engine);
-        textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-
-        LinkTest test;
-        QObject::connect(textObject, SIGNAL(linkActivated(QString)), &test, SLOT(linkClicked(QString)));
-
-        {
-            QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMousePress);
-            me.setPos(QPointF(textObject->x()/2, textObject->y()/2));
-            me.setButton(Qt::LeftButton);
-            static_cast<EventSender*>(static_cast<QGraphicsItem*>(textObject))->sendEvent(&me);
-        }
-
-        {
-            QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMouseRelease);
-            me.setPos(QPointF(textObject->x()/2, textObject->y()/2));
-            me.setButton(Qt::LeftButton);
-            static_cast<EventSender*>(static_cast<QGraphicsItem*>(textObject))->sendEvent(&me);
-        }
-
-        QCOMPARE(test.link, QLatin1String("http://qt.nokia.com"));
-    }
-}
-
-QTEST_MAIN(tst_qmlgraphicstext)
-
-#include "tst_qmlgraphicstext.moc"
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/cursorTest.qml b/tests/auto/declarative/qmlgraphicstextedit/data/cursorTest.qml
deleted file mode 100644
index e5df8f1..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/cursorTest.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-Rectangle { width: 300; height: 300; color: "white"
-    TextEdit {  text: "Hello world!"; id: textEditObject; objectName: "textEditObject"
-        resources: [ Component { id:cursor; Item { id:cursorInstance; objectName: "cursorInstance" } } ] 
-        cursorDelegate: cursor
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/ErrItem.qml b/tests/auto/declarative/qmlgraphicstextedit/data/http/ErrItem.qml
deleted file mode 100644
index 34b3883..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/ErrItem.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-Item{
-    Fungus{
-        palatable: false;
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/NormItem.qml b/tests/auto/declarative/qmlgraphicstextedit/data/http/NormItem.qml
deleted file mode 100644
index 718cb71..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/NormItem.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Item {
-    objectName: "delegateOkay"
-    Rectangle { }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTest.qml b/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTest.qml
deleted file mode 100644
index 3c31e11..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTest.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.6
-
-Rectangle { width: 300; height: 300; color: "white"
-    resources: [ 
-        Component { id:cursorFail; FailItem { objectName: "delegateFail" } },
-        Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
-        Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } },
-        Component { id:cursorErr; ErrItem { objectName: "delegateErrorA" } }
-    ] 
-    TextEdit {
-        cursorDelegate: cursorFail
-    }
-    TextEdit {
-        cursorDelegate: cursorWait
-    }
-    TextEdit {
-        cursorDelegate: cursorNorm
-    }
-    TextEdit {
-        cursorDelegate: cursorErr
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail1.qml b/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail1.qml
deleted file mode 100644
index a44aec2..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail1.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-Rectangle { width: 300; height: 300; color: "white"
-    resources: [ 
-        Component { id:cursorFail; FailItem { objectName: "delegateFail" } },
-        Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
-        Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } }
-    ] 
-    TextEdit {
-        cursorDelegate: cursorFail
-    }
-    TextEdit {
-        cursorDelegate: cursorWait
-    }
-    TextEdit {
-        cursorDelegate: cursorNorm
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail2.qml b/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail2.qml
deleted file mode 100644
index 57d3e47..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail2.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-Rectangle { width: 300; height: 300; color: "white"
-    resources: [ 
-        Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
-        Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } },
-        Component { id:cursorErr; ErrItem { objectName: "delegateErrorA" } }
-    ] 
-    TextEdit {
-        cursorDelegate: cursorWait
-    }
-    TextEdit {
-        cursorDelegate: cursorNorm
-    }
-    TextEdit {
-        cursorDelegate: cursorErr
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestPass.qml b/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestPass.qml
deleted file mode 100644
index a44e867..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestPass.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-Rectangle { width: 300; height: 300; color: "white"
-    resources: [ 
-        Component { id:cursorWait; WaitItem { objectName: "delegateSlow" } },
-        Component { id:cursorNorm; NormItem { objectName: "delegateOkay" } }
-    ] 
-    TextEdit {
-        cursorDelegate: cursorWait
-        text: "Hello"
-    }
-    TextEdit {
-        objectName: "textEditObject"
-        cursorDelegate: cursorNorm
-        focus: true;
-        text: "Hello"
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/httpfail/FailItem.qml b/tests/auto/declarative/qmlgraphicstextedit/data/httpfail/FailItem.qml
deleted file mode 100644
index ddbf526..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/httpfail/FailItem.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-Item {
-    Rectangle { }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/httpslow/WaitItem.qml b/tests/auto/declarative/qmlgraphicstextedit/data/httpslow/WaitItem.qml
deleted file mode 100644
index ddbf526..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/httpslow/WaitItem.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-Item {
-    Rectangle { }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/inputmethodhints.qml b/tests/auto/declarative/qmlgraphicstextedit/data/inputmethodhints.qml
deleted file mode 100644
index c3d4c16..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/inputmethodhints.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-TextEdit {  
-    text: "Hello world!"
-    inputMethodHints: Qt.ImhNoPredictiveText
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml b/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml
deleted file mode 100644
index 8d7dbbc..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    property var myInput: input
-
-    width: 800; height: 600; color: "blue"
-
-    Item { 
-        id: firstItem;
-        KeyNavigation.right: input
-    }
-
-    TextEdit { id: input; focus: true
-        KeyNavigation.left: firstItem
-        KeyNavigation.right: lastItem
-        KeyNavigation.up: firstItem
-        KeyNavigation.down: lastItem
-    }
-    Item {
-        id: lastItem 
-        KeyNavigation.left: input
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml b/tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml
deleted file mode 100644
index 103a627..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    property var myInput: input
-
-    width: 800; height: 600; color: "blue"
-
-    TextEdit { id: input; focus: true
-        readOnly: true
-        text: "I am the very model of a modern major general.\n"
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextedit/qmlgraphicstextedit.pro b/tests/auto/declarative/qmlgraphicstextedit/qmlgraphicstextedit.pro
deleted file mode 100644
index a129120..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/qmlgraphicstextedit.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui network
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicstextedit.cpp ../shared/testhttpserver.cpp
-HEADERS += ../shared/testhttpserver.h
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp b/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp
deleted file mode 100644
index 0d6ac77..0000000
--- a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp
+++ /dev/null
@@ -1,791 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include "../../../shared/util.h"
-#include "../shared/testhttpserver.h"
-#include <math.h>
-#include <QFile>
-#include <QTextDocument>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlexpression.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicstextedit_p.h>
-#include <QFontMetrics>
-#include <QmlView>
-#include <QStyle>
-#include <QInputContext>
-
-class tst_qmlgraphicstextedit : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicstextedit();
-
-private slots:
-    void text();
-    void width();
-    void wrap();
-    void textFormat();
-
-    // ### these tests may be trivial    
-    void hAlign();
-    void vAlign();
-    void font();
-    void color();
-    void textMargin();
-    void persistentSelection();
-    void focusOnPress();
-    void selection();
-    void inputMethodHints();
-
-    void cursorDelegate();
-    void delegateLoading();
-    void navigation();
-    void readOnly();
-    void sendRequestSoftwareInputPanelEvent();
-
-private:
-    void simulateKey(QmlView *, int key);
-    QmlView *createView(const QString &filename);
-
-    QStringList standard;
-    QStringList richText;
-
-    QStringList hAlignmentStrings;
-    QStringList vAlignmentStrings;
-
-    QList<Qt::Alignment> vAlignments;
-    QList<Qt::Alignment> hAlignments;
-
-    QStringList colorStrings;
-
-    QmlEngine engine;
-};
-
-tst_qmlgraphicstextedit::tst_qmlgraphicstextedit()
-{
-    standard << "the quick brown fox jumped over the lazy dog"
-             << "the quick brown fox\n jumped over the lazy dog";
-
-    richText << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a> jumped over the <b>lazy</b> dog</i>"
-             << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a><br>jumped over the <b>lazy</b> dog</i>";
-
-    hAlignmentStrings << "AlignLeft"
-                      << "AlignRight"
-                      << "AlignHCenter";
-
-    vAlignmentStrings << "AlignTop"
-                      << "AlignBottom"
-                      << "AlignVCenter";
-
-    hAlignments << Qt::AlignLeft
-                << Qt::AlignRight
-                << Qt::AlignHCenter;
-
-    vAlignments << Qt::AlignTop
-                << Qt::AlignBottom
-                << Qt::AlignVCenter;
-
-    colorStrings << "aliceblue"
-                 << "antiquewhite"
-                 << "aqua"
-                 << "darkkhaki"
-                 << "darkolivegreen"
-                 << "dimgray"
-                 << "palevioletred"
-                 << "lightsteelblue"
-                 << "#000000"
-                 << "#AAAAAA"
-                 << "#FFFFFF"
-                 << "#2AC05F";
-                 //
-                 // need a different test to do alpha channel test
-                 // << "#AA0011DD"
-                 // << "#00F16B11";
-                 // 
-}
-
-void tst_qmlgraphicstextedit::text()
-{
-    {
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData("import Qt 4.6\nTextEdit {  text: \"\"  }", QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->text(), QString(""));
-    }
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + standard.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->text(), standard.at(i));
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + richText.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QString actual = textEditObject->text();
-        QString expected = richText.at(i);
-        actual.replace(QRegExp(".*<body[^>]*>"),"");
-        actual.replace(QRegExp("(<[^>]*>)+"),"<>");
-        expected.replace(QRegExp("(<[^>]*>)+"),"<>");
-        QCOMPARE(actual.simplified(),expected.simplified());
-    }
-}
-
-void tst_qmlgraphicstextedit::width()
-{
-    // uses Font metrics to find the width for standard and document to find the width for rich
-    {
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData("import Qt 4.6\nTextEdit {  text: \"\" }", QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->width(), 1.);//+1 for cursor
-    }
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        QFont f;
-        QFontMetricsF fm(f);
-        qreal metricWidth = fm.size(Qt::TextExpandTabs && Qt::TextShowMnemonic, standard.at(i)).width();
-        metricWidth = floor(metricWidth);
-
-        QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + standard.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->width(), qreal(metricWidth + 1 + 3));//+3 is the current way of accounting for space between cursor and last character.
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        QTextDocument document;
-        document.setHtml(richText.at(i));
-        document.setDocumentMargin(0);
-
-        int documentWidth = document.idealWidth();
-
-        QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + richText.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->width(), qreal(documentWidth + 1 + 3));
-    }
-}
-
-void tst_qmlgraphicstextedit::wrap()
-{
-    // for specified width and wrap set true
-    {
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData("import Qt 4.6\nTextEdit {  text: \"\"; wrap: true; width: 300 }", QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->width(), 300.);
-    }
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit {  wrap: true; width: 300; text: \"" + standard.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->width(), 300.);
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit {  wrap: true; width: 300; text: \"" + richText.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->width(), 300.);
-    }
-
-}
-
-void tst_qmlgraphicstextedit::textFormat()
-{
-    {
-        QmlComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.6\nTextEdit { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
-        QmlGraphicsTextEdit *textObject = qobject_cast<QmlGraphicsTextEdit*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QmlGraphicsTextEdit::RichText);
-    }
-    {
-        QmlComponent textComponent(&engine);
-        textComponent.setData("import Qt 4.6\nTextEdit { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
-        QmlGraphicsTextEdit *textObject = qobject_cast<QmlGraphicsTextEdit*>(textComponent.create());
-
-        QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QmlGraphicsTextEdit::PlainText);
-    }
-}
-
-//the alignment tests may be trivial o.oa
-void tst_qmlgraphicstextedit::hAlign()
-{
-    //test one align each, and then test if two align fails.
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        for (int j=0; j < hAlignmentStrings.size(); j++)
-        {
-            QString componentStr = "import Qt 4.6\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
-            QmlComponent texteditComponent(&engine);
-            texteditComponent.setData(componentStr.toLatin1(), QUrl());
-            QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-            QVERIFY(textEditObject != 0);
-            QCOMPARE((int)textEditObject->hAlign(), (int)hAlignments.at(j));
-        }
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        for (int j=0; j < hAlignmentStrings.size(); j++)
-        {
-            QString componentStr = "import Qt 4.6\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
-            QmlComponent texteditComponent(&engine);
-            texteditComponent.setData(componentStr.toLatin1(), QUrl());
-            QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-            QVERIFY(textEditObject != 0);
-            QCOMPARE((int)textEditObject->hAlign(), (int)hAlignments.at(j));
-        }
-    }
-
-}
-
-void tst_qmlgraphicstextedit::vAlign()
-{
-    //test one align each, and then test if two align fails.
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        for (int j=0; j < vAlignmentStrings.size(); j++)
-        {
-            QString componentStr = "import Qt 4.6\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
-            QmlComponent texteditComponent(&engine);
-            texteditComponent.setData(componentStr.toLatin1(), QUrl());
-            QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-            QVERIFY(textEditObject != 0);
-            QCOMPARE((int)textEditObject->vAlign(), (int)vAlignments.at(j));
-        }
-    }
-
-    for (int i = 0; i < richText.size(); i++)
-    {
-        for (int j=0; j < vAlignmentStrings.size(); j++)
-        {
-            QString componentStr = "import Qt 4.6\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
-            QmlComponent texteditComponent(&engine);
-            texteditComponent.setData(componentStr.toLatin1(), QUrl());
-            QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-            QVERIFY(textEditObject != 0);
-            QCOMPARE((int)textEditObject->vAlign(), (int)vAlignments.at(j));
-        }
-    }
-
-}
-
-void tst_qmlgraphicstextedit::font()
-{
-    //test size, then bold, then italic, then family
-    { 
-        QString componentStr = "import Qt 4.6\nTextEdit {  font.pointSize: 40; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->font().pointSize(), 40);
-        QCOMPARE(textEditObject->font().bold(), false);
-        QCOMPARE(textEditObject->font().italic(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nTextEdit {  font.bold: true; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->font().bold(), true);
-        QCOMPARE(textEditObject->font().italic(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nTextEdit {  font.italic: true; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->font().italic(), true);
-        QCOMPARE(textEditObject->font().bold(), false);
-    }
- 
-    { 
-        QString componentStr = "import Qt 4.6\nTextEdit {  font.family: \"Helvetica\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->font().family(), QString("Helvetica"));
-        QCOMPARE(textEditObject->font().bold(), false);
-        QCOMPARE(textEditObject->font().italic(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nTextEdit {  font.family: \"\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->font().family(), QString(""));
-    }
-}
-
-void tst_qmlgraphicstextedit::color()
-{
-    //test normal
-    for (int i = 0; i < colorStrings.size(); i++)
-    { 
-        QString componentStr = "import Qt 4.6\nTextEdit {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-        //qDebug() << "textEditObject: " << textEditObject->color() << "vs. " << QColor(colorStrings.at(i));
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->color(), QColor(colorStrings.at(i)));
-    }
-
-    //test selection
-    for (int i = 0; i < colorStrings.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->selectionColor(), QColor(colorStrings.at(i)));
-    }
-
-    //test selected text
-    for (int i = 0; i < colorStrings.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->selectedTextColor(), QColor(colorStrings.at(i)));
-    }
-
-    {
-        QString colorStr = "#AA001234";
-        QColor testColor("#001234");
-        testColor.setAlpha(170);
-
-        QString componentStr = "import Qt 4.6\nTextEdit {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->color(), testColor);
-    }
-}
-
-void tst_qmlgraphicstextedit::textMargin()
-{
-    for(qreal i=0; i<=10; i+=0.3){
-        QString componentStr = "import Qt 4.6\nTextEdit {  textMargin: " + QString::number(i) + "; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->textMargin(), i);
-    }
-}
-
-void tst_qmlgraphicstextedit::persistentSelection()
-{
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit {  persistentSelection: true; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->persistentSelection(), true);
-    }
-
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit {  persistentSelection: false; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->persistentSelection(), false);
-    }
-}
-
-void tst_qmlgraphicstextedit::focusOnPress()
-{
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit {  focusOnPress: true; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->focusOnPress(), true);
-    }
-
-    {
-        QString componentStr = "import Qt 4.6\nTextEdit {  focusOnPress: false; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
-        texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-        QVERIFY(textEditObject != 0);
-        QCOMPARE(textEditObject->focusOnPress(), false);
-    }
-}
-
-void tst_qmlgraphicstextedit::selection()
-{
-    QString testStr = standard[0];//TODO: What should happen for multiline/rich text?
-    QString componentStr = "import Qt 4.6\nTextEdit {  text: \""+ testStr +"\"; }";
-    QmlComponent texteditComponent(&engine);
-    texteditComponent.setData(componentStr.toLatin1(), QUrl());
-    QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
-    QVERIFY(textEditObject != 0);
-
-
-    //Test selection follows cursor
-    for(int i=0; i<= testStr.size(); i++) {
-        textEditObject->setCursorPosition(i);
-        QCOMPARE(textEditObject->cursorPosition(), i);
-        QCOMPARE(textEditObject->selectionStart(), i);
-        QCOMPARE(textEditObject->selectionEnd(), i);
-        QVERIFY(textEditObject->selectedText().isNull());
-    }
-
-    textEditObject->setCursorPosition(0);
-    QVERIFY(textEditObject->cursorPosition() == 0);
-    QVERIFY(textEditObject->selectionStart() == 0);
-    QVERIFY(textEditObject->selectionEnd() == 0);
-    QVERIFY(textEditObject->selectedText().isNull());
-
-    //Test selection
-    for(int i=0; i<= testStr.size(); i++) {
-        textEditObject->setSelectionEnd(i);
-        QCOMPARE(testStr.mid(0,i), textEditObject->selectedText());
-    }
-    for(int i=0; i<= testStr.size(); i++) {
-        textEditObject->setSelectionStart(i);
-        QCOMPARE(testStr.mid(i,testStr.size()-i), textEditObject->selectedText());
-    }
-
-    textEditObject->setCursorPosition(0);
-    QVERIFY(textEditObject->cursorPosition() == 0);
-    QVERIFY(textEditObject->selectionStart() == 0);
-    QVERIFY(textEditObject->selectionEnd() == 0);
-    QVERIFY(textEditObject->selectedText().isNull());
-
-    for(int i=0; i< testStr.size(); i++) {
-        textEditObject->setSelectionStart(i);
-        QCOMPARE(textEditObject->selectionEnd(), i);
-        QCOMPARE(testStr.mid(i,0), textEditObject->selectedText());
-        textEditObject->setSelectionEnd(i+1);
-        QCOMPARE(textEditObject->selectionStart(), i);
-        QCOMPARE(testStr.mid(i,1), textEditObject->selectedText());
-    }
-
-    for(int i= testStr.size() - 1; i>0; i--) {
-        textEditObject->setSelectionEnd(i);
-        QCOMPARE(testStr.mid(i,0), textEditObject->selectedText());
-        textEditObject->setSelectionStart(i-1);
-        QCOMPARE(testStr.mid(i-1,1), textEditObject->selectedText());
-    }
-
-    //Test Error Ignoring behaviour
-    textEditObject->setCursorPosition(0);
-    QVERIFY(textEditObject->selectedText().isNull());
-    textEditObject->setSelectionStart(-10);
-    QVERIFY(textEditObject->selectedText().isNull());
-    textEditObject->setSelectionStart(100);
-    QVERIFY(textEditObject->selectedText().isNull());
-    textEditObject->setSelectionEnd(-10);
-    QVERIFY(textEditObject->selectedText().isNull());
-    textEditObject->setSelectionEnd(100);
-    QVERIFY(textEditObject->selectedText().isNull());
-    textEditObject->setSelectionStart(0);
-    textEditObject->setSelectionEnd(10);
-    QVERIFY(textEditObject->selectedText().size() == 10);
-    textEditObject->setSelectionStart(-10);
-    QVERIFY(textEditObject->selectedText().size() == 10);
-    textEditObject->setSelectionStart(100);
-    QVERIFY(textEditObject->selectedText().size() == 10);
-    textEditObject->setSelectionEnd(-10);
-    QVERIFY(textEditObject->selectedText().size() == 10);
-    textEditObject->setSelectionEnd(100);
-    QVERIFY(textEditObject->selectedText().size() == 10);
-}
-
-void tst_qmlgraphicstextedit::inputMethodHints()
-{
-    QmlView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
-    canvas->show();
-    canvas->setFocus();
-
-    QVERIFY(canvas->rootObject() != 0);
-    QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit *>(canvas->rootObject());
-    QVERIFY(textEditObject != 0);
-    QVERIFY(textEditObject->inputMethodHints() & Qt::ImhNoPredictiveText);
-    textEditObject->setInputMethodHints(Qt::ImhUppercaseOnly);
-    QVERIFY(textEditObject->inputMethodHints() & Qt::ImhUppercaseOnly);
-}
-
-void tst_qmlgraphicstextedit::cursorDelegate()
-{
-    QmlView* view = createView(SRCDIR "/data/cursorTest.qml");
-    view->show();
-    view->setFocus();
-    QmlGraphicsTextEdit *textEditObject = view->rootObject()->findChild<QmlGraphicsTextEdit*>("textEditObject");
-    QVERIFY(textEditObject != 0);
-    QVERIFY(textEditObject->findChild<QmlGraphicsItem*>("cursorInstance"));
-    //Test Delegate gets created
-    textEditObject->setFocus(true);
-    QmlGraphicsItem* delegateObject = textEditObject->findChild<QmlGraphicsItem*>("cursorInstance");
-    QVERIFY(delegateObject);
-    //Test Delegate gets moved
-    for(int i=0; i<= textEditObject->text().length(); i++){
-        textEditObject->setCursorPosition(i);
-        QCOMPARE(textEditObject->cursorRect().x(), qRound(delegateObject->x()));
-        QCOMPARE(textEditObject->cursorRect().y(), qRound(delegateObject->y()));
-    }
-    textEditObject->setCursorPosition(0);
-    QCOMPARE(textEditObject->cursorRect().x(), qRound(delegateObject->x()));
-    QCOMPARE(textEditObject->cursorRect().y(), qRound(delegateObject->y()));
-    //Test Delegate gets deleted
-    textEditObject->setCursorDelegate(0);
-    QVERIFY(!textEditObject->findChild<QmlGraphicsItem*>("cursorInstance"));
-}
-
-void tst_qmlgraphicstextedit::delegateLoading()
-{
-    TestHTTPServer server(42332);
-    server.serveDirectory(SRCDIR "/data/httpfail", TestHTTPServer::Disconnect);
-    server.serveDirectory(SRCDIR "/data/httpslow", TestHTTPServer::Delay);
-    server.serveDirectory(SRCDIR "/data/http");
-    QmlView* view = new QmlView(0);
-    view->setSource(QUrl("http://localhost:42332/cursorHttpTestPass.qml"));
-    view->show();
-    view->setFocus();
-    QTRY_VERIFY(view->rootObject());//Wait for loading to finish.
-    QmlGraphicsTextEdit *textEditObject = view->rootObject()->findChild<QmlGraphicsTextEdit*>("textEditObject");
-    //    view->rootObject()->dumpObjectTree();
-    QVERIFY(textEditObject != 0);
-    textEditObject->setFocus(true);
-    QmlGraphicsItem *delegate;
-    delegate = view->rootObject()->findChild<QmlGraphicsItem*>("delegateOkay");
-    QVERIFY(delegate);
-    delegate = view->rootObject()->findChild<QmlGraphicsItem*>("delegateSlow");
-    QVERIFY(delegate);
-    view->setSource(QUrl("http://localhost:42332/cursorHttpTestFail1.qml"));
-    view->show();
-    view->setFocus();
-    QTRY_VERIFY(!view->rootObject()); // there is fail item inside this test
-    view->setSource(QUrl("http://localhost:42332/cursorHttpTestFail2.qml"));
-    view->show();
-    view->setFocus();
-    QTRY_VERIFY(!view->rootObject()); // there is fail item inside this test
-    //ErrorB should get a component which is ready but component.create() returns null
-    //Not sure how to accomplish this with QmlGraphicsTextEdits cursor delegate
-    //###This could be a case of overzealous defensive programming
-    //delegate = view->rootObject()->findChild<QmlGraphicsItem*>("delegateErrorB");
-    //QVERIFY(!delegate);
-}
-
-/*
-TextEdit element should only handle left/right keys until the cursor reaches
-the extent of the text, then they should ignore the keys.
-*/
-void tst_qmlgraphicstextedit::navigation()
-{
-    QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
-    canvas->show();
-    canvas->setFocus();
-
-    QVERIFY(canvas->rootObject() != 0);
-
-    QmlGraphicsItem *input = qobject_cast<QmlGraphicsItem *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
-
-    QVERIFY(input != 0);
-    QTRY_VERIFY(input->hasFocus() == true);
-    simulateKey(canvas, Qt::Key_Left);
-    QVERIFY(input->hasFocus() == false);
-    simulateKey(canvas, Qt::Key_Right);
-    QVERIFY(input->hasFocus() == true);
-    simulateKey(canvas, Qt::Key_Right);
-    QVERIFY(input->hasFocus() == false);
-    simulateKey(canvas, Qt::Key_Left);
-    QVERIFY(input->hasFocus() == true);
-}
-
-void tst_qmlgraphicstextedit::readOnly()
-{
-    QmlView *canvas = createView(SRCDIR "/data/readOnly.qml");
-    canvas->show();
-    canvas->setFocus();
-
-    QVERIFY(canvas->rootObject() != 0);
-
-    QmlGraphicsTextEdit *edit = qobject_cast<QmlGraphicsTextEdit *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
-
-    QVERIFY(edit != 0);
-    QTRY_VERIFY(edit->hasFocus() == true);
-    QVERIFY(edit->isReadOnly() == true);
-    QString initial = edit->text();
-    for(int k=Qt::Key_0; k<=Qt::Key_Z; k++)
-        simulateKey(canvas, k);
-    simulateKey(canvas, Qt::Key_Return);
-    simulateKey(canvas, Qt::Key_Space);
-    simulateKey(canvas, Qt::Key_Escape);
-    QCOMPARE(edit->text(), initial);
-}
-
-void tst_qmlgraphicstextedit::simulateKey(QmlView *view, int key)
-{
-    QKeyEvent press(QKeyEvent::KeyPress, key, 0);
-    QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
-
-    QApplication::sendEvent(view, &press);
-    QApplication::sendEvent(view, &release);
-}
-
-QmlView *tst_qmlgraphicstextedit::createView(const QString &filename)
-{
-    QmlView *canvas = new QmlView(0);
-
-    canvas->setSource(QUrl::fromLocalFile(filename));
-    return canvas;
-}
-
-class MyInputContext : public QInputContext
-{
-public:
-    MyInputContext() : softwareInputPanelEventReceived(false) {}
-    ~MyInputContext() {}
-
-    QString identifierName() { return QString(); }
-    QString language() { return QString(); }
-
-    void reset() {}
-
-    bool isComposing() const { return false; }
-
-    bool filterEvent( const QEvent *event )
-    {
-        if (event->type() == QEvent::RequestSoftwareInputPanel)
-            softwareInputPanelEventReceived = true;
-        return QInputContext::filterEvent(event);
-    }
-    bool softwareInputPanelEventReceived;
-};
-
-void tst_qmlgraphicstextedit::sendRequestSoftwareInputPanelEvent()
-{
-    QGraphicsScene scene;
-    QGraphicsView view(&scene);
-    MyInputContext ic;
-    view.viewport()->setInputContext(&ic);
-    QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel(
-            view.style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
-    if ((behavior != QStyle::RSIP_OnMouseClick))
-        QSKIP("This test need to have a style with RSIP_OnMouseClick", SkipSingle);
-    QmlGraphicsTextEdit edit;
-    edit.setText("Hello world");
-    edit.setPos(0, 0);
-    scene.addItem(&edit);
-    view.show();
-    qApp->setAutoSipEnabled(true);
-    QApplication::setActiveWindow(&view);
-    QTest::qWaitForWindowShown(&view);
-    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(edit.scenePos()));
-    QApplication::processEvents();
-    QCOMPARE(ic.softwareInputPanelEventReceived, true);
-}
-QTEST_MAIN(tst_qmlgraphicstextedit)
-
-#include "tst_qmlgraphicstextedit.moc"
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/cursorTest.qml b/tests/auto/declarative/qmlgraphicstextinput/data/cursorTest.qml
deleted file mode 100644
index ddc98cc..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/data/cursorTest.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-Rectangle { width: 300; height: 300; color: "white"
-    TextInput {  text: "Hello world!"; id: textInputObject; objectName: "textInputObject"
-        resources: [ Component { id:cursor; Item { id:cursorInstance; objectName: "cursorInstance";} } ] 
-        cursorDelegate: cursor
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/inputmethodhints.qml b/tests/auto/declarative/qmlgraphicstextinput/data/inputmethodhints.qml
deleted file mode 100644
index b404682..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/data/inputmethodhints.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-TextInput {
-    text: "Hello world!"
-    inputMethodHints: Qt.ImhNoPredictiveText
-}
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/masks.qml b/tests/auto/declarative/qmlgraphicstextinput/data/masks.qml
deleted file mode 100644
index 08a857c..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/data/masks.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-TextInput{
-    focus: true
-    objectName: "myInput"
-    inputMask: "HHHHhhhh; "
-}
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/maxLength.qml b/tests/auto/declarative/qmlgraphicstextinput/data/maxLength.qml
deleted file mode 100644
index 7cbeadd..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/data/maxLength.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-TextInput{
-    focus: true
-    objectName: "myInput"
-    maximumLength: 10
-}
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml b/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml
deleted file mode 100644
index 493db5b..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    property var myInput: input
-
-    width: 800; height: 600; color: "blue"
-
-    Item { 
-        id: firstItem;
-        KeyNavigation.right: input
-    }
-
-    TextInput { id: input; focus: true
-        text: "Needs some text"
-        KeyNavigation.left: firstItem
-        KeyNavigation.right: lastItem
-        KeyNavigation.up: firstItem
-        KeyNavigation.down: lastItem
-    }
-    Item {
-        id: lastItem 
-        KeyNavigation.left: input
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml b/tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml
deleted file mode 100644
index c47371a..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    property var myInput: input
-
-    width: 800; height: 600; color: "blue"
-
-    TextInput { id: input; focus: true
-        readOnly: true
-        text: "I am the very model of a modern major general.\n"
-    }
-}
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/validators.qml b/tests/auto/declarative/qmlgraphicstextinput/data/validators.qml
deleted file mode 100644
index 0c81548..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/data/validators.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.7
-
-Item {
-    property var intInput: intInput
-    property var dblInput: dblInput
-    property var strInput: strInput
-
-    width: 800; height: 600;
-
-    Column{
-        TextInput { id: intInput;
-            validator: QIntValidator{top: 11; bottom: 2}
-        }
-        TextInput { id: dblInput;
-            validator: QDoubleValidator{top: 12.12; bottom: 2.93; decimals: 2; notation: QDoubleValidator.StandardNotation}
-        }
-        TextInput { id: strInput;
-            //Requires QTBUG-8025 to be implemented first
-            //validator: QRegExpValidator { regExp: /[a-zA-z]{2,4}/;}
-        }
-    }
-        
-}
diff --git a/tests/auto/declarative/qmlgraphicstextinput/qmlgraphicstextinput.pro b/tests/auto/declarative/qmlgraphicstextinput/qmlgraphicstextinput.pro
deleted file mode 100644
index fd75fec..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/qmlgraphicstextinput.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicstextinput.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp b/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp
deleted file mode 100644
index 748cf5e..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include "../../../shared/util.h"
-#include <QtDeclarative/qmlengine.h>
-#include <QFile>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicstextinput_p.h>
-#include <QDebug>
-#include <QStyle>
-#include <QInputContext>
-
-class tst_qmlgraphicstextinput : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicstextinput();
-
-private slots:
-    void text();
-    void width();
-    void font();
-    void color();
-    void selection();
-
-    void maxLength();
-    void masks();
-    void validators();
-    void inputMethodHints();
-
-    void cursorDelegate();
-    void navigation();
-    void readOnly();
-
-    void sendRequestSoftwareInputPanelEvent();
-
-private:
-    void simulateKey(QmlView *, int key);
-    QmlView *createView(const QString &filename);
-
-    QmlEngine engine;
-    QStringList standard;
-    QStringList colorStrings;
-};
-
-tst_qmlgraphicstextinput::tst_qmlgraphicstextinput()
-{
-    standard << "the quick brown fox jumped over the lazy dog"
-        << "It's supercalifragisiticexpialidocious!"
-        << "Hello, world!";
-
-    colorStrings << "aliceblue"
-                 << "antiquewhite"
-                 << "aqua"
-                 << "darkkhaki"
-                 << "darkolivegreen"
-                 << "dimgray"
-                 << "palevioletred"
-                 << "lightsteelblue"
-                 << "#000000"
-                 << "#AAAAAA"
-                 << "#FFFFFF"
-                 << "#2AC05F";
-}
-
-void tst_qmlgraphicstextinput::text()
-{
-    {
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData("import Qt 4.6\nTextInput {  text: \"\"  }", QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->text(), QString(""));
-    }
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nTextInput { text: \"" + standard.at(i) + "\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->text(), standard.at(i));
-    }
-
-}
-
-void tst_qmlgraphicstextinput::width()
-{
-    // uses Font metrics to find the width for standard
-    {
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData("import Qt 4.6\nTextInput {  text: \"\" }", QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->width(), 1.);//1 for the cursor
-    }
-
-    for (int i = 0; i < standard.size(); i++)
-    {
-        QFont f;
-        QFontMetricsF fm(f);
-        qreal metricWidth = fm.width(standard.at(i));
-
-        QString componentStr = "import Qt 4.6\nTextInput { text: \"" + standard.at(i) + "\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->width(), qreal(metricWidth) + 1.);//1 for the cursor
-    }
-}
-
-void tst_qmlgraphicstextinput::font()
-{
-    //test size, then bold, then italic, then family
-    { 
-        QString componentStr = "import Qt 4.6\nTextInput {  font.pointSize: 40; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->font().pointSize(), 40);
-        QCOMPARE(textinputObject->font().bold(), false);
-        QCOMPARE(textinputObject->font().italic(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nTextInput {  font.bold: true; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->font().bold(), true);
-        QCOMPARE(textinputObject->font().italic(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nTextInput {  font.italic: true; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->font().italic(), true);
-        QCOMPARE(textinputObject->font().bold(), false);
-    }
- 
-    { 
-        QString componentStr = "import Qt 4.6\nTextInput {  font.family: \"Helvetica\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->font().family(), QString("Helvetica"));
-        QCOMPARE(textinputObject->font().bold(), false);
-        QCOMPARE(textinputObject->font().italic(), false);
-    }
-
-    { 
-        QString componentStr = "import Qt 4.6\nTextInput {  font.family: \"\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->font().family(), QString(""));
-    }
-}
-
-void tst_qmlgraphicstextinput::color()
-{
-    //test color
-    for (int i = 0; i < colorStrings.size(); i++)
-    { 
-        QString componentStr = "import Qt 4.6\nTextInput {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->color(), QColor(colorStrings.at(i)));
-    }
-
-    //test selection color
-    for (int i = 0; i < colorStrings.size(); i++)
-    {
-        QString componentStr = "import Qt 4.6\nTextInput {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->selectionColor(), QColor(colorStrings.at(i)));
-    }
-
-    //test selected text color
-    for (int i = 0; i < colorStrings.size(); i++)
-    { 
-        QString componentStr = "import Qt 4.6\nTextInput {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->selectedTextColor(), QColor(colorStrings.at(i)));
-    }
-
-    {
-        QString colorStr = "#AA001234";
-        QColor testColor("#001234");
-        testColor.setAlpha(170);
-
-        QString componentStr = "import Qt 4.6\nTextInput {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
-        textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-
-        QVERIFY(textinputObject != 0);
-        QCOMPARE(textinputObject->color(), testColor);
-    }
-}
-
-void tst_qmlgraphicstextinput::selection()
-{
-    QString testStr = standard[0];
-    QString componentStr = "import Qt 4.6\nTextInput {  text: \""+ testStr +"\"; }";
-    QmlComponent textinputComponent(&engine);
-    textinputComponent.setData(componentStr.toLatin1(), QUrl());
-    QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
-    QVERIFY(textinputObject != 0);
-
-
-    //Test selection follows cursor
-    for(int i=0; i<= testStr.size(); i++) {
-        textinputObject->setCursorPosition(i);
-        QCOMPARE(textinputObject->cursorPosition(), i);
-        QCOMPARE(textinputObject->selectionStart(), i);
-        QCOMPARE(textinputObject->selectionEnd(), i);
-        QVERIFY(textinputObject->selectedText().isNull());
-    }
-
-    textinputObject->setCursorPosition(0);
-    QVERIFY(textinputObject->cursorPosition() == 0);
-    QVERIFY(textinputObject->selectionStart() == 0);
-    QVERIFY(textinputObject->selectionEnd() == 0);
-    QVERIFY(textinputObject->selectedText().isNull());
-
-    //Test selection
-    for(int i=0; i<= testStr.size(); i++) {
-        textinputObject->setSelectionEnd(i);
-        QCOMPARE(testStr.mid(0,i), textinputObject->selectedText());
-    }
-    for(int i=0; i<= testStr.size(); i++) {
-        textinputObject->setSelectionStart(i);
-        QCOMPARE(testStr.mid(i,testStr.size()-i), textinputObject->selectedText());
-    }
-
-    textinputObject->setCursorPosition(0);
-    QVERIFY(textinputObject->cursorPosition() == 0);
-    QVERIFY(textinputObject->selectionStart() == 0);
-    QVERIFY(textinputObject->selectionEnd() == 0);
-    QVERIFY(textinputObject->selectedText().isNull());
-
-    for(int i=0; i< testStr.size(); i++) {
-        textinputObject->setSelectionStart(i);
-        QCOMPARE(textinputObject->selectionEnd(), i);
-        QCOMPARE(testStr.mid(i,0), textinputObject->selectedText());
-        textinputObject->setSelectionEnd(i+1);
-        QCOMPARE(textinputObject->selectionStart(), i);
-        QCOMPARE(testStr.mid(i,1), textinputObject->selectedText());
-    }
-
-    for(int i= testStr.size() - 1; i>0; i--) {
-        textinputObject->setSelectionEnd(i);
-        QCOMPARE(testStr.mid(i,0), textinputObject->selectedText());
-        textinputObject->setSelectionStart(i-1);
-        QCOMPARE(testStr.mid(i-1,1), textinputObject->selectedText());
-    }
-
-    //Test Error Ignoring behaviour
-    textinputObject->setCursorPosition(0);
-    QVERIFY(textinputObject->selectedText().isNull());
-    textinputObject->setSelectionStart(-10);
-    QVERIFY(textinputObject->selectedText().isNull());
-    textinputObject->setSelectionStart(100);
-    QVERIFY(textinputObject->selectedText().isNull());
-    textinputObject->setSelectionEnd(-10);
-    QVERIFY(textinputObject->selectedText().isNull());
-    textinputObject->setSelectionEnd(100);
-    QVERIFY(textinputObject->selectedText().isNull());
-    textinputObject->setSelectionStart(0);
-    textinputObject->setSelectionEnd(10);
-    QVERIFY(textinputObject->selectedText().size() == 10);
-    textinputObject->setSelectionStart(-10);
-    QVERIFY(textinputObject->selectedText().size() == 10);
-    textinputObject->setSelectionStart(100);
-    QVERIFY(textinputObject->selectedText().size() == 10);
-    textinputObject->setSelectionEnd(-10);
-    QVERIFY(textinputObject->selectedText().size() == 10);
-    textinputObject->setSelectionEnd(100);
-    QVERIFY(textinputObject->selectedText().size() == 10);
-}
-
-void tst_qmlgraphicstextinput::maxLength()
-{
-    //QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
-    QmlView *canvas = createView(SRCDIR "/data/maxLength.qml");
-    canvas->show();
-    canvas->setFocus();
-    QVERIFY(canvas->rootObject() != 0);
-    QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput *>(canvas->rootObject());
-    QVERIFY(textinputObject != 0);
-    QVERIFY(textinputObject->text().isEmpty());
-    QVERIFY(textinputObject->maxLength() == 10);
-    foreach(const QString &str, standard){
-        QVERIFY(textinputObject->text().length() <= 10);
-        textinputObject->setText(str);
-        QVERIFY(textinputObject->text().length() <= 10);
-    }
-
-    textinputObject->setText("");
-    QTRY_VERIFY(textinputObject->hasFocus() == true);
-    for(int i=0; i<20; i++){
-        QCOMPARE(textinputObject->text().length(), qMin(i,10));
-        //simulateKey(canvas, Qt::Key_A);
-        QTest::keyPress(canvas, Qt::Key_A);
-        QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
-    }
-}
-
-void tst_qmlgraphicstextinput::masks()
-{
-    //Not a comprehensive test of the possible masks, that's done elsewhere (QLineEdit)
-    //QString componentStr = "import Qt 4.6\nTextInput {  inputMask: 'HHHHhhhh'; }";
-    QmlView *canvas = createView(SRCDIR "/data/masks.qml");
-    canvas->show();
-    canvas->setFocus();
-    QVERIFY(canvas->rootObject() != 0);
-    QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput *>(canvas->rootObject());
-    QVERIFY(textinputObject != 0);
-    QTRY_VERIFY(textinputObject->hasFocus() == true);
-    QVERIFY(textinputObject->text().length() == 0);
-    QCOMPARE(textinputObject->inputMask(), QString("HHHHhhhh; "));
-    for(int i=0; i<10; i++){
-        QCOMPARE(qMin(i,8), textinputObject->text().length());
-        QCOMPARE(i>=4, textinputObject->hasAcceptableInput());
-        //simulateKey(canvas, Qt::Key_A);
-        QTest::keyPress(canvas, Qt::Key_A);
-        QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
-    }
-}
-
-void tst_qmlgraphicstextinput::validators()
-{
-    // Note that this test assumes that the validators are working properly
-    // so you may need to run their tests first. All validators are checked
-    // here to ensure that their exposure to QML is working.
-
-    QmlView *canvas = createView(SRCDIR "/data/validators.qml");
-    canvas->show();
-    canvas->setFocus();
-
-    QVERIFY(canvas->rootObject() != 0);
-
-    QmlGraphicsTextInput *intInput = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("intInput")));
-    QVERIFY(intInput);
-    intInput->setFocus(true);
-    QTRY_VERIFY(intInput->hasFocus());
-    QTest::keyPress(canvas, Qt::Key_1);
-    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
-    QCOMPARE(intInput->text(), QLatin1String("1"));
-    QCOMPARE(intInput->hasAcceptableInput(), false);
-    QTest::keyPress(canvas, Qt::Key_2);
-    QTest::keyRelease(canvas, Qt::Key_2, Qt::NoModifier ,10);
-    QCOMPARE(intInput->text(), QLatin1String("1"));
-    QCOMPARE(intInput->hasAcceptableInput(), false);
-    QTest::keyPress(canvas, Qt::Key_1);
-    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
-    QCOMPARE(intInput->text(), QLatin1String("11"));
-    QCOMPARE(intInput->hasAcceptableInput(), true);
-    QTest::keyPress(canvas, Qt::Key_0);
-    QTest::keyRelease(canvas, Qt::Key_0, Qt::NoModifier ,10);
-    QCOMPARE(intInput->text(), QLatin1String("11"));
-    QCOMPARE(intInput->hasAcceptableInput(), true);
-
-    QmlGraphicsTextInput *dblInput = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("dblInput")));
-    QTRY_VERIFY(dblInput);
-    dblInput->setFocus(true);
-    QVERIFY(dblInput->hasFocus() == true);
-    QTest::keyPress(canvas, Qt::Key_1);
-    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
-    QCOMPARE(dblInput->text(), QLatin1String("1"));
-    QCOMPARE(dblInput->hasAcceptableInput(), false);
-    QTest::keyPress(canvas, Qt::Key_2);
-    QTest::keyRelease(canvas, Qt::Key_2, Qt::NoModifier ,10);
-    QCOMPARE(dblInput->text(), QLatin1String("12"));
-    QCOMPARE(dblInput->hasAcceptableInput(), true);
-    QTest::keyPress(canvas, Qt::Key_Period);
-    QTest::keyRelease(canvas, Qt::Key_Period, Qt::NoModifier ,10);
-    QCOMPARE(dblInput->text(), QLatin1String("12."));
-    QCOMPARE(dblInput->hasAcceptableInput(), true);
-    QTest::keyPress(canvas, Qt::Key_1);
-    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
-    QCOMPARE(dblInput->text(), QLatin1String("12.1"));
-    QCOMPARE(dblInput->hasAcceptableInput(), true);
-    QTest::keyPress(canvas, Qt::Key_1);
-    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
-    QCOMPARE(dblInput->text(), QLatin1String("12.11"));
-    QCOMPARE(dblInput->hasAcceptableInput(), true);
-    QTest::keyPress(canvas, Qt::Key_1);
-    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
-    QCOMPARE(dblInput->text(), QLatin1String("12.11"));
-    QCOMPARE(dblInput->hasAcceptableInput(), true);
-
-    QmlGraphicsTextInput *strInput = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("strInput")));
-    QTRY_VERIFY(strInput);
-    strInput->setFocus(true);
-    QVERIFY(strInput->hasFocus() == true);
-    QTest::keyPress(canvas, Qt::Key_1);
-    QTest::keyRelease(canvas, Qt::Key_1, Qt::NoModifier ,10);
-    QEXPECT_FAIL("","Will not work until QTBUG-8025 is resolved", Abort);
-    QCOMPARE(strInput->text(), QLatin1String(""));
-    QCOMPARE(strInput->hasAcceptableInput(), false);
-    QTest::keyPress(canvas, Qt::Key_A);
-    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
-    QCOMPARE(strInput->text(), QLatin1String("a"));
-    QCOMPARE(strInput->hasAcceptableInput(), false);
-    QTest::keyPress(canvas, Qt::Key_A);
-    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
-    QCOMPARE(strInput->text(), QLatin1String("aa"));
-    QCOMPARE(strInput->hasAcceptableInput(), true);
-    QTest::keyPress(canvas, Qt::Key_A);
-    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
-    QCOMPARE(strInput->text(), QLatin1String("aaa"));
-    QCOMPARE(strInput->hasAcceptableInput(), true);
-    QTest::keyPress(canvas, Qt::Key_A);
-    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
-    QCOMPARE(strInput->text(), QLatin1String("aaaa"));
-    QCOMPARE(strInput->hasAcceptableInput(), true);
-    QTest::keyPress(canvas, Qt::Key_A);
-    QTest::keyRelease(canvas, Qt::Key_A, Qt::NoModifier ,10);
-    QCOMPARE(strInput->text(), QLatin1String("aaaa"));
-    QCOMPARE(strInput->hasAcceptableInput(), true);
-}
-
-void tst_qmlgraphicstextinput::inputMethodHints()
-{
-    QmlView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
-    canvas->show();
-    canvas->setFocus();
-
-    QVERIFY(canvas->rootObject() != 0);
-    QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput *>(canvas->rootObject());
-    QVERIFY(textinputObject != 0);
-    QVERIFY(textinputObject->inputMethodHints() & Qt::ImhNoPredictiveText);
-    textinputObject->setInputMethodHints(Qt::ImhUppercaseOnly);
-    QVERIFY(textinputObject->inputMethodHints() & Qt::ImhUppercaseOnly);
-}
-
-/*
-TextInput element should only handle left/right keys until the cursor reaches
-the extent of the text, then they should ignore the keys.
-
-*/
-void tst_qmlgraphicstextinput::navigation()
-{
-    QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
-    canvas->show();
-    canvas->setFocus();
-
-    QVERIFY(canvas->rootObject() != 0);
-
-    QmlGraphicsTextInput *input = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
-
-    QVERIFY(input != 0);
-    input->setCursorPosition(0);
-    QTRY_VERIFY(input->hasFocus() == true);
-    simulateKey(canvas, Qt::Key_Left);
-    QVERIFY(input->hasFocus() == false);
-    simulateKey(canvas, Qt::Key_Right);
-    QVERIFY(input->hasFocus() == true);
-    //QT-2944: If text is selected, then we should deselect first.
-    input->setCursorPosition(input->text().length());
-    input->setSelectionStart(0);
-    input->setSelectionEnd(input->text().length());
-    QVERIFY(input->selectionStart() != input->selectionEnd());
-    simulateKey(canvas, Qt::Key_Right);
-    QVERIFY(input->selectionStart() == input->selectionEnd());
-    QVERIFY(input->selectionStart() == input->text().length());
-    QVERIFY(input->hasFocus() == true);
-    simulateKey(canvas, Qt::Key_Right);
-    QVERIFY(input->hasFocus() == false);
-    simulateKey(canvas, Qt::Key_Left);
-    QVERIFY(input->hasFocus() == true);
-}
-
-void tst_qmlgraphicstextinput::cursorDelegate()
-{
-    QmlView* view = createView(SRCDIR "/data/cursorTest.qml");
-    view->show();
-    view->setFocus();
-    QmlGraphicsTextInput *textInputObject = view->rootObject()->findChild<QmlGraphicsTextInput*>("textInputObject");
-    QVERIFY(textInputObject != 0);
-    QVERIFY(textInputObject->findChild<QmlGraphicsItem*>("cursorInstance"));
-    //Test Delegate gets created
-    textInputObject->setFocus(true);
-    QmlGraphicsItem* delegateObject = textInputObject->findChild<QmlGraphicsItem*>("cursorInstance");
-    QVERIFY(delegateObject);
-    //Test Delegate gets moved
-    for(int i=0; i<= textInputObject->text().length(); i++){
-        textInputObject->setCursorPosition(i);
-        //+5 is because the TextInput cursorRect is just a 10xHeight area centered on cursor position
-        QCOMPARE(textInputObject->cursorRect().x() + 5, qRound(delegateObject->x()));
-        QCOMPARE(textInputObject->cursorRect().y(), qRound(delegateObject->y()));
-    }
-    textInputObject->setCursorPosition(0);
-    QCOMPARE(textInputObject->cursorRect().x()+5, qRound(delegateObject->x()));
-    QCOMPARE(textInputObject->cursorRect().y(), qRound(delegateObject->y()));
-    //Test Delegate gets deleted
-    textInputObject->setCursorDelegate(0);
-    QVERIFY(!textInputObject->findChild<QmlGraphicsItem*>("cursorInstance"));
-}
-
-void tst_qmlgraphicstextinput::readOnly()
-{
-    QmlView *canvas = createView(SRCDIR "/data/readOnly.qml");
-    canvas->show();
-    canvas->setFocus();
-
-    QVERIFY(canvas->rootObject() != 0);
-
-    QmlGraphicsTextInput *input = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
-
-    QVERIFY(input != 0);
-    QTRY_VERIFY(input->hasFocus() == true);
-    QVERIFY(input->isReadOnly() == true);
-    QString initial = input->text();
-    for(int k=Qt::Key_0; k<=Qt::Key_Z; k++)
-        simulateKey(canvas, k);
-    simulateKey(canvas, Qt::Key_Return);
-    simulateKey(canvas, Qt::Key_Space);
-    simulateKey(canvas, Qt::Key_Escape);
-    QCOMPARE(input->text(), initial);
-}
-
-void tst_qmlgraphicstextinput::simulateKey(QmlView *view, int key)
-{
-    QKeyEvent press(QKeyEvent::KeyPress, key, 0);
-    QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
-
-    QApplication::sendEvent(view, &press);
-    QApplication::sendEvent(view, &release);
-}
-
-QmlView *tst_qmlgraphicstextinput::createView(const QString &filename)
-{
-    QmlView *canvas = new QmlView(0);
-
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    return canvas;
-}
-
-class MyInputContext : public QInputContext
-{
-public:
-    MyInputContext() : softwareInputPanelEventReceived(false) {}
-    ~MyInputContext() {}
-
-    QString identifierName() { return QString(); }
-    QString language() { return QString(); }
-
-    void reset() {}
-
-    bool isComposing() const { return false; }
-
-    bool filterEvent( const QEvent *event )
-    {
-        if (event->type() == QEvent::RequestSoftwareInputPanel)
-            softwareInputPanelEventReceived = true;
-        return QInputContext::filterEvent(event);
-    }
-    bool softwareInputPanelEventReceived;
-};
-
-void tst_qmlgraphicstextinput::sendRequestSoftwareInputPanelEvent()
-{
-    QGraphicsScene scene;
-    QGraphicsView view(&scene);
-    MyInputContext ic;
-    view.viewport()->setInputContext(&ic);
-    QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel(
-            view.style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
-    if ((behavior != QStyle::RSIP_OnMouseClick))
-        QSKIP("This test need to have a style with RSIP_OnMouseClick", SkipSingle);
-    QmlGraphicsTextInput input;
-    input.setText("Hello world");
-    input.setPos(0, 0);
-    scene.addItem(&input);
-    view.show();
-    qApp->setAutoSipEnabled(true);
-    QApplication::setActiveWindow(&view);
-    QTest::qWaitForWindowShown(&view);
-    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(input.scenePos()));
-    QApplication::processEvents();
-    QCOMPARE(ic.softwareInputPanelEventReceived, true);
-}
-
-QTEST_MAIN(tst_qmlgraphicstextinput)
-
-#include "tst_qmlgraphicstextinput.moc"
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.html b/tests/auto/declarative/qmlgraphicswebview/data/basic.html
deleted file mode 100644
index 22e3e24..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/basic.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head><title>Basic</title>
-<link rel="icon" sizes="48x48" href="basic.png">
-<script type="text/javascript">
-<!--
-window.onload = function(){ window.status = "status here"; }
-// -->
-</script>
-</head>
-<body leftmargin="0" marginwidth="0">
-<table width="123">
-<tbody>
-<tr><td>This is a basic test.</td></tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.ico b/tests/auto/declarative/qmlgraphicswebview/data/basic.ico
deleted file mode 100644
index 8f3d05e..0000000
Binary files a/tests/auto/declarative/qmlgraphicswebview/data/basic.ico and /dev/null differ
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.png b/tests/auto/declarative/qmlgraphicswebview/data/basic.png
deleted file mode 100644
index 35717cc..0000000
Binary files a/tests/auto/declarative/qmlgraphicswebview/data/basic.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.qml b/tests/auto/declarative/qmlgraphicswebview/data/basic.qml
deleted file mode 100644
index 5394837..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/basic.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-WebView {
-    url: "basic.html"
-}
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/elements.html b/tests/auto/declarative/qmlgraphicswebview/data/elements.html
deleted file mode 100644
index 9236867..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/elements.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<body leftmargin=0 topmargin=0>
-<table width="300px" border=1 cellpadding=0 cellspacing=0>
-<tr>
-<td align=center width=25%%><p>A</p></td>
-<td width=75% height=50px>
-    <table width=100% border=1 cellpadding=0 cellspacing=0>
-    <tr>
-    <td align=center width=50% height=50px><p>B</p></td>
-    <td align=center width=50% height=50px><p>C</p></td>
-    </tr>
-    </table>
-</td>
-</tr>
-</table>
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/elements.qml b/tests/auto/declarative/qmlgraphicswebview/data/elements.qml
deleted file mode 100644
index 7c030e6..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/elements.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-WebView {
-    url: "elements.html"
-    width: 310
-    height: 100
-}
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/forward.html b/tests/auto/declarative/qmlgraphicswebview/data/forward.html
deleted file mode 100644
index 030446a..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/forward.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head><title>Forward</title>
-<link rel="icon" sizes="48x48" href="basic.png">
-</head>
-<body leftmargin="0" marginwidth="0">
-<table width="123">
-<tbody>
-<tr><td>This is more.</td></tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html
deleted file mode 100644
index 35270bc..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head><title>JavaScript</title>
-<link rel="icon" sizes="48x48" href="basic.png">
-<script type="text/javascript">
-<!--
-window.onload = function(){ window.status = "status here"; }
-// -->
-</script>
-</head>
-<body>
-This is a JS test.
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
deleted file mode 100644
index 07eee88..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-WebView {
-    url: "javaScript.html"
-    javaScriptWindowObjects: [
-        QtObject {
-            property string qmlprop: "qmlvalue"
-            WebView.windowObjectName: "myjsname"
-        }
-    ]
-}
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml b/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml
deleted file mode 100644
index 1460f30..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-WebView {
-    url: "does-not-exist.html"
-}
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/newwindows.html b/tests/auto/declarative/qmlgraphicswebview/data/newwindows.html
deleted file mode 100644
index dd541f9..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/newwindows.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-<script type="text/javascript">
-<!--
-function clickTheLink()
-{
-    var ev = document.createEvent('MouseEvents');
-    ev.initEvent( "click", true, false );
-    document.getElementById('thelink').dispatchEvent(ev);
-}
-// -->
-</script>
-</head>
-<h1>Multiple windows...</h1>
-
-<a id=thelink target="_blank" href="newwindows.html">Popup!</a>
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/newwindows.qml b/tests/auto/declarative/qmlgraphicswebview/data/newwindows.qml
deleted file mode 100644
index 0bc8263..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/newwindows.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-// Demonstrates opening new WebViews from HTML
-
-import Qt 4.6
-
-Grid {
-    columns: 3
-    id: pages
-    height: 300; width: 600
-    property int total: 0
-
-    Component {
-        id: webViewPage
-        Rectangle {
-            width: webView.width
-            height: webView.height
-            border.color: "gray"
-
-            WebView {
-                id: webView
-                width: 150 // force predictable for test
-                newWindowComponent: webViewPage
-                newWindowParent: pages
-                url: "newwindows.html"
-                Timer {
-                    interval: 10; running: webView.status==WebView.Ready && total<4; repeat: false;
-                    onTriggered: {total++; webView.evaluateJavaScript("clickTheLink()")}
-                }
-            }
-        }
-    }
-
-    Loader { sourceComponent: webViewPage }
-}
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.html b/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.html
deleted file mode 100644
index 9412674..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<body topmargin=0 leftmargin=0>
-<table width=120 cellpadding=0 cellspacing=0>
-<tr><td>
-<h1>Pixel Cache</h1>
-This test is for the pixel cache. Because this is a long document,
-as it scrolls, more of the document will need to be rendered.
-If the pixelCacheSize is small, the first parts of the document will
-no longer be in the cache when it returns.
-</table>
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.qml b/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.qml
deleted file mode 100644
index 08e4d65..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyWebView {
-    anchors.fill: parent
-    url: "pixelCache.html"
-}
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml b/tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml
deleted file mode 100644
index 3dd4e51..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 240
-    height: 160
-    Grid {
-        anchors.fill: parent
-        objectName: "newWindowParent"
-        id: newWindowParent
-    }
-
-    Row {
-        anchors.fill: parent
-        id: oldWindowParent
-        objectName: "oldWindowParent"
-    }
-
-    Loader {
-        sourceComponent: webViewComponent
-    }
-    Component {
-            id: webViewComponent
-            WebView {
-                id: webView
-                objectName: "webView"
-                newWindowComponent: webViewComponent
-                newWindowParent: oldWindowParent         
-                url: "basic.html"
-                renderingEnabled: true
-                pressGrabTime: 200
-            }
-    }
-}
\ No newline at end of file
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/sethtml.qml b/tests/auto/declarative/qmlgraphicswebview/data/sethtml.qml
deleted file mode 100644
index 063b5a8..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/data/sethtml.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-WebView {
-    html: "<p>This is a <b>string</b> set on the WebView"
-}
diff --git a/tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro b/tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro
deleted file mode 100644
index a590616..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-contains(QT_CONFIG,webkit): QT += webkit
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicswebview.cpp testtypes.cpp
-HEADERS += testtypes.h
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicswebview/testtypes.cpp b/tests/auto/declarative/qmlgraphicswebview/testtypes.cpp
deleted file mode 100644
index 676d19a..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/testtypes.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "testtypes.h"
-
-void MyWebView::drawContents(QPainter *p, const QRect &r)
-{
-    pp += r.width()*r.height();
-    QmlGraphicsWebView::drawContents(p,r);
-}
-
-void registerTypes()
-{
-    QML_REGISTER_TYPE(Test,1,0,MyWebView,MyWebView);
-}
diff --git a/tests/auto/declarative/qmlgraphicswebview/testtypes.h b/tests/auto/declarative/qmlgraphicswebview/testtypes.h
deleted file mode 100644
index fa9a301..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/testtypes.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef TESTTYPES_H
-#define TESTTYPES_H
-
-#include <private/qmlgraphicswebview_p.h>
-
-class MyWebView : public QmlGraphicsWebView
-{
-    Q_OBJECT
-    Q_PROPERTY(int pixelsPainted READ pixelsPainted);
-
-public:
-    MyWebView() : pp(0) {}
-
-    int pixelsPainted() const { return pp; }
-
-    void drawContents(QPainter *p, const QRect &r);
-
-private:
-    int pp;
-};
-
-QML_DECLARE_TYPE(MyWebView);
-
-void registerTypes();
-
-#endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
deleted file mode 100644
index f4f8a33..0000000
--- a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
+++ /dev/null
@@ -1,511 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtTest/QSignalSpy>
-#include "../../../shared/util.h"
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicswebview_p.h>
-#include <private/qmlgraphicswebview_p_p.h>
-#include <private/qmlgraphicspositioners_p.h>
-#include <QtWebKit/qwebpage.h>
-#include <QtWebKit/qwebframe.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qfile.h>
-#include <QtGui/qpainter.h>
-#include "testtypes.h"
-
-class tst_qmlgraphicswebview : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicswebview() {}
-
-private slots:
-    void initTestCase();
-    void basicProperties();
-    void settings();
-    void historyNav();
-    void multipleWindows();
-    void elementAreaAt();
-    void loadError();
-    void setHtml();
-    void javaScript();
-    void cleanupTestCase();
-    void pixelCache();
-    void newWindowParent();
-    void newWindowComponent();
-    void renderingEnabled();
-    void pressGrabTime();
-
-private:
-    void checkNoErrors(const QmlComponent& component);
-    QmlEngine engine;
-    QString tmpDir() const
-    {
-        static QString tmpd = QDir::tempPath()+"/tst_qmlgraphicswebview-"
-            + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
-        return tmpd;
-    }
-};
-
-void tst_qmlgraphicswebview::initTestCase()
-{
-    registerTypes();
-}
-
-static QString strippedHtml(QString html)
-{
-    html.replace(QRegExp("\\s+"),"");
-    return html;
-}
-
-static QString fileContents(const QString& filename)
-{
-    QFile file(filename);
-    file.open(QIODevice::ReadOnly);
-    return QString::fromUtf8(file.readAll());
-}
-
-
-static void removeRecursive(const QString& dirname)
-{
-    QDir dir(dirname);
-    QFileInfoList entries(dir.entryInfoList(QDir::Dirs|QDir::Files|QDir::NoDotAndDotDot));
-    for (int i = 0; i < entries.count(); ++i)
-        if (entries[i].isDir())
-            removeRecursive(entries[i].filePath());
-        else
-            dir.remove(entries[i].fileName());
-    QDir().rmdir(dirname);
-}
-
-void tst_qmlgraphicswebview::cleanupTestCase()
-{
-    removeRecursive(tmpDir());
-}
-
-void tst_qmlgraphicswebview::checkNoErrors(const QmlComponent& component)
-{
-    // Wait until the component is ready
-    QTRY_VERIFY(component.isReady());
-
-
-    if (component.isError()) {
-        QList<QmlError> errors = component.errors();
-        for (int ii = 0; ii < errors.count(); ++ii) {
-            const QmlError &error = errors.at(ii);
-            QByteArray errorStr = QByteArray::number(error.line()) + ":" +
-                                  QByteArray::number(error.column()) + ":" +
-                                  error.description().toUtf8();
-            qWarning() << errorStr;
-        }
-    }
-    QVERIFY(!component.isError());
-}
-
-void tst_qmlgraphicswebview::basicProperties()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
-    checkNoErrors(component);
-    QWebSettings::enablePersistentStorage(tmpDir());
-
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
-    QVERIFY(wv != 0);
-    QTRY_COMPARE(wv->progress(), 1.0);
-    QCOMPARE(wv->title(),QString("Basic"));
-    QTRY_COMPARE(wv->icon().width(), 48);
-    QCOMPARE(wv->icon(),QPixmap(SRCDIR "/data/basic.png"));
-    QCOMPARE(wv->statusText(),QString("status here"));
-    QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/basic.html")), strippedHtml(wv->html()));
-    QCOMPARE(wv->width(), 123.0);
-    QCOMPARE(wv->preferredWidth(), 0);
-    QCOMPARE(wv->preferredHeight(), 0);
-    QCOMPARE(wv->zoomFactor(), 1.0);
-    QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/basic.html"));
-    QCOMPARE(wv->status(), QmlGraphicsWebView::Ready);
-    QVERIFY(wv->reloadAction());
-    QVERIFY(wv->reloadAction()->isEnabled());
-    QVERIFY(wv->backAction());
-    QVERIFY(!wv->backAction()->isEnabled());
-    QVERIFY(wv->forwardAction());
-    QVERIFY(!wv->forwardAction()->isEnabled());
-    QVERIFY(wv->stopAction());
-    QVERIFY(!wv->stopAction()->isEnabled());
-
-    wv->setPixelCacheSize(0); // mainly testing that it doesn't crash or anything!
-    QCOMPARE(wv->pixelCacheSize(),0);
-    wv->reloadAction()->trigger();
-    QTRY_COMPARE(wv->progress(), 1.0);
-}
-
-void tst_qmlgraphicswebview::settings()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
-    checkNoErrors(component);
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
-    QVERIFY(wv != 0);
-    QTRY_COMPARE(wv->progress(), 1.0);
-
-    QmlGraphicsWebSettings *s = wv->settingsObject();
-
-    // merely tests that setting gets stored (in QWebSettings)
-    // behavioural tests are in WebKit.
-    for (int b=0; b<=1; ++b) {
-        bool on = !!b;
-
-        s->setAutoLoadImages(on);
-        s->setDeveloperExtrasEnabled(on);
-        s->setJavaEnabled(on);
-        s->setJavascriptCanAccessClipboard(on);
-        s->setJavascriptCanOpenWindows(on);
-        s->setJavascriptEnabled(on);
-        s->setLinksIncludedInFocusChain(on);
-        s->setLocalContentCanAccessRemoteUrls(on);
-        s->setLocalStorageDatabaseEnabled(on);
-        s->setOfflineStorageDatabaseEnabled(on);
-        s->setOfflineWebApplicationCacheEnabled(on);
-        s->setPluginsEnabled(on);
-        s->setPrintElementBackgrounds(on);
-        s->setPrivateBrowsingEnabled(on);
-        s->setZoomTextOnly(on);
-
-        QVERIFY(s->autoLoadImages() == on);
-        QVERIFY(s->developerExtrasEnabled() == on);
-        QVERIFY(s->javaEnabled() == on);
-        QVERIFY(s->javascriptCanAccessClipboard() == on);
-        QVERIFY(s->javascriptCanOpenWindows() == on);
-        QVERIFY(s->javascriptEnabled() == on);
-        QVERIFY(s->linksIncludedInFocusChain() == on);
-        QVERIFY(s->localContentCanAccessRemoteUrls() == on);
-        QVERIFY(s->localStorageDatabaseEnabled() == on);
-        QVERIFY(s->offlineStorageDatabaseEnabled() == on);
-        QVERIFY(s->offlineWebApplicationCacheEnabled() == on);
-        QVERIFY(s->pluginsEnabled() == on);
-        QVERIFY(s->printElementBackgrounds() == on);
-        QVERIFY(s->privateBrowsingEnabled() == on);
-        QVERIFY(s->zoomTextOnly() == on);
-
-        QVERIFY(s->property("autoLoadImages") == on);
-        QVERIFY(s->property("developerExtrasEnabled") == on);
-        QVERIFY(s->property("javaEnabled") == on);
-        QVERIFY(s->property("javascriptCanAccessClipboard") == on);
-        QVERIFY(s->property("javascriptCanOpenWindows") == on);
-        QVERIFY(s->property("javascriptEnabled") == on);
-        QVERIFY(s->property("linksIncludedInFocusChain") == on);
-        QVERIFY(s->property("localContentCanAccessRemoteUrls") == on);
-        QVERIFY(s->property("localStorageDatabaseEnabled") == on);
-        QVERIFY(s->property("offlineStorageDatabaseEnabled") == on);
-        QVERIFY(s->property("offlineWebApplicationCacheEnabled") == on);
-        QVERIFY(s->property("pluginsEnabled") == on);
-        QVERIFY(s->property("printElementBackgrounds") == on);
-        QVERIFY(s->property("privateBrowsingEnabled") == on);
-        QVERIFY(s->property("zoomTextOnly") == on);
-    }
-}
-
-void tst_qmlgraphicswebview::historyNav()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
-    checkNoErrors(component);
-    QWebSettings::enablePersistentStorage(tmpDir());
-
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
-    QVERIFY(wv != 0);
-    for (int i=1; i<=2; ++i) {
-        QTRY_COMPARE(wv->progress(), 1.0);
-        QCOMPARE(wv->title(),QString("Basic"));
-        QTRY_COMPARE(wv->icon().width(), 48);
-        QCOMPARE(wv->icon(),QPixmap(SRCDIR "/data/basic.png"));
-        QCOMPARE(wv->statusText(),QString("status here"));
-        QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/basic.html")), strippedHtml(wv->html()));
-        QCOMPARE(wv->width(), 123.0);
-        QCOMPARE(wv->preferredWidth(), 0);
-        QCOMPARE(wv->zoomFactor(), 1.0);
-        QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/basic.html"));
-        QCOMPARE(wv->status(), QmlGraphicsWebView::Ready);
-        QVERIFY(wv->reloadAction());
-        QVERIFY(wv->reloadAction()->isEnabled());
-        QVERIFY(wv->backAction());
-        QVERIFY(!wv->backAction()->isEnabled());
-        QVERIFY(wv->forwardAction());
-        QVERIFY(!wv->forwardAction()->isEnabled());
-        QVERIFY(wv->stopAction());
-        QVERIFY(!wv->stopAction()->isEnabled());
-
-        wv->reloadAction()->trigger();
-    }
-
-    wv->setUrl(QUrl::fromLocalFile(SRCDIR "/data/forward.html"));
-    QTRY_COMPARE(wv->progress(), 1.0);
-    QCOMPARE(wv->title(),QString("Forward"));
-    QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/forward.html")), strippedHtml(wv->html()));
-    QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/forward.html"));
-    QCOMPARE(wv->status(), QmlGraphicsWebView::Ready);
-    QCOMPARE(wv->statusText(),QString(""));
-    QVERIFY(wv->reloadAction());
-    QVERIFY(wv->reloadAction()->isEnabled());
-    QVERIFY(wv->backAction());
-    QVERIFY(wv->backAction()->isEnabled());
-    QVERIFY(wv->forwardAction());
-    QVERIFY(!wv->forwardAction()->isEnabled());
-    QVERIFY(wv->stopAction());
-    QVERIFY(!wv->stopAction()->isEnabled());
-
-    wv->backAction()->trigger();
-
-    QTRY_COMPARE(wv->progress(), 1.0);
-    QCOMPARE(wv->title(),QString("Basic"));
-    QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/basic.html")), strippedHtml(wv->html()));
-    QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/basic.html"));
-    QCOMPARE(wv->status(), QmlGraphicsWebView::Ready);
-    QVERIFY(wv->reloadAction());
-    QVERIFY(wv->reloadAction()->isEnabled());
-    QVERIFY(wv->backAction());
-    QVERIFY(!wv->backAction()->isEnabled());
-    QVERIFY(wv->forwardAction());
-    QVERIFY(wv->forwardAction()->isEnabled());
-    QVERIFY(wv->stopAction());
-    QVERIFY(!wv->stopAction()->isEnabled());
-}
-
-void tst_qmlgraphicswebview::multipleWindows()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/newwindows.qml"));
-    checkNoErrors(component);
-
-    QmlGraphicsGrid *grid = qobject_cast<QmlGraphicsGrid*>(component.create());
-    QVERIFY(grid != 0);
-    QTRY_COMPARE(grid->children().count(), 2+5); // Component, Loader, 5 WebViews
-    QmlGraphicsItem* popup = qobject_cast<QmlGraphicsItem*>(grid->children().at(3)); // first popup after Component, Loaded, original.
-    QVERIFY(popup != 0);
-    QTRY_COMPARE(popup->x(), 150.0);
-}
-
-void tst_qmlgraphicswebview::loadError()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/loadError.qml"));
-    checkNoErrors(component);
-    QWebSettings::enablePersistentStorage(tmpDir());
-
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
-    QVERIFY(wv != 0);
-    for (int i=1; i<=2; ++i) {
-        QTRY_COMPARE(wv->progress(), 1.0);
-        QCOMPARE(wv->title(),QString(""));
-        QCOMPARE(wv->statusText(),QString("")); // HTML 'status bar' text, not error message
-        QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/does-not-exist.html")); // Unlike QWebPage, which loses url
-        QCOMPARE(wv->status(), QmlGraphicsWebView::Error);
-
-        wv->reloadAction()->trigger();
-    }
-}
-
-void tst_qmlgraphicswebview::setHtml()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/sethtml.qml"));
-    checkNoErrors(component);
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
-    QVERIFY(wv != 0);
-    QCOMPARE(wv->html(),QString("<html><head></head><body><p>This is a <b>string</b> set on the WebView</p></body></html>"));
-
-    QSignalSpy spy(wv, SIGNAL(htmlChanged()));
-    wv->setHtml(QString("<html><head><title>Basic</title></head><body><p>text</p></body></html>"));
-    QCOMPARE(spy.count(),1);
-}
-
-void tst_qmlgraphicswebview::elementAreaAt()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/elements.qml"));
-    checkNoErrors(component);
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
-    QVERIFY(wv != 0);
-    QTRY_COMPARE(wv->progress(), 1.0);
-
-    QCOMPARE(wv->elementAreaAt(40,30,100,100),QRect(1,1,75,54)); // Area A in data/elements.html
-    QCOMPARE(wv->elementAreaAt(130,30,200,100),QRect(78,3,110,50)); // Area B
-    QCOMPARE(wv->elementAreaAt(40,30,400,400),QRect(0,0,310,100)); // Whole view
-    QCOMPARE(wv->elementAreaAt(130,30,280,280),QRect(76,1,223,54)); // Area BC
-    QCOMPARE(wv->elementAreaAt(130,30,400,400),QRect(0,0,310,100)); // Whole view
-}
-
-void tst_qmlgraphicswebview::javaScript()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/javaScript.qml"));
-    checkNoErrors(component);
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
-    QVERIFY(wv != 0);
-    QTRY_COMPARE(wv->progress(), 1.0);
-    QCOMPARE(wv->evaluateJavaScript("123").toInt(), 123);
-    QCOMPARE(wv->evaluateJavaScript("window.status").toString(), QString("status here"));
-    QCOMPARE(wv->evaluateJavaScript("window.myjsname.qmlprop").toString(), QString("qmlvalue"));
-}
-
-void tst_qmlgraphicswebview::pixelCache()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/pixelCache.qml"));
-    checkNoErrors(component);
-    MyWebView *wv = qobject_cast<MyWebView*>(component.create());
-    QVERIFY(wv != 0);
-    QTRY_COMPARE(wv->progress(), 1.0);
-    QPixmap pm(150,150);
-    QPainter p(&pm);
-    wv->paint(&p,0,0);
-    const int expected = 120*(150+128); // 120 = width of HTML page, 150=pixmap height, 128=cache extra area
-    QCOMPARE(wv->pixelsPainted(), expected);
-    wv->paint(&p,0,0);
-    QCOMPARE(wv->pixelsPainted(), expected); // nothing new needed to be painted
-    wv->setPixelCacheSize(0); // clears the cache
-    wv->paint(&p,0,0);
-    QCOMPARE(wv->pixelsPainted(), expected*2); // everything needed to be painted
-    // Note that painted things always go into the cache (even if they don't "fit"),
-    // just that they will be removed if anything else needs to be painted.
-    wv->setPixelCacheSize(expected); // won't clear the cache
-    wv->paint(&p,0,0);
-    QCOMPARE(wv->pixelsPainted(), expected*2); // still there
-    wv->setPixelCacheSize(expected-1); // too small - will clear the cache
-    wv->paint(&p,0,0);
-    QCOMPARE(wv->pixelsPainted(), expected*3); // repainted
-}
-
-void tst_qmlgraphicswebview::newWindowParent()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
-    checkNoErrors(component);
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
-    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
-    QVERIFY(rootItem != 0);
-    QVERIFY(wv != 0);
-    QTRY_COMPARE(wv->progress(), 1.0);
-
-    QmlGraphicsItem* oldWindowParent = rootItem->findChild<QmlGraphicsItem*>("oldWindowParent");
-    QCOMPARE(wv->newWindowParent(), oldWindowParent);
-    QSignalSpy newWindowParentSpy(wv, SIGNAL(newWindowParentChanged()));
-
-    QmlGraphicsItem* newWindowParent = rootItem->findChild<QmlGraphicsItem*>("newWindowParent");
-    wv->setNewWindowParent(newWindowParent);
-    QVERIFY(oldWindowParent);
-    QVERIFY(oldWindowParent->childItems().count() == 0);
-    QCOMPARE(wv->newWindowParent(), newWindowParent);
-    QCOMPARE(newWindowParentSpy.count(),1);
-
-    wv->setNewWindowParent(newWindowParent);
-    QCOMPARE(newWindowParentSpy.count(),1);
-
-    wv->setNewWindowParent(0);
-    QCOMPARE(newWindowParentSpy.count(),2);
-}
-
-void tst_qmlgraphicswebview::newWindowComponent()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
-    checkNoErrors(component);
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
-    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
-    QVERIFY(rootItem != 0);
-    QVERIFY(wv != 0);
-    QTRY_COMPARE(wv->progress(), 1.0);
-
-    QmlComponent substituteComponent(&engine);
-    substituteComponent.setData("import Qt 4.6; WebView { objectName: 'newWebView'; url: 'basic.html'; }", QUrl::fromLocalFile(""));
-    QSignalSpy newWindowComponentSpy(wv, SIGNAL(newWindowComponentChanged()));
-
-    wv->setNewWindowComponent(&substituteComponent);
-    QCOMPARE(wv->newWindowComponent(), &substituteComponent);
-    QCOMPARE(newWindowComponentSpy.count(),1);
-
-    wv->setNewWindowComponent(&substituteComponent);
-    QCOMPARE(newWindowComponentSpy.count(),1);
-
-    wv->setNewWindowComponent(0);
-    QCOMPARE(newWindowComponentSpy.count(),2);
-}
-
-void tst_qmlgraphicswebview::renderingEnabled()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
-    checkNoErrors(component);
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
-    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
-    QVERIFY(rootItem != 0);
-    QVERIFY(wv != 0);
-    QTRY_COMPARE(wv->progress(), 1.0);
-
-    QVERIFY(wv->renderingEnabled());
-    QSignalSpy renderingEnabledSpy(wv, SIGNAL(renderingEnabledChanged()));
-
-    wv->setRenderingEnabled(false);
-    QVERIFY(!wv->renderingEnabled());
-    QCOMPARE(renderingEnabledSpy.count(),1);
-
-    wv->setRenderingEnabled(false);
-    QCOMPARE(renderingEnabledSpy.count(),1);
-
-    wv->setRenderingEnabled(true);
-    QCOMPARE(renderingEnabledSpy.count(),2);
-}
-
-void tst_qmlgraphicswebview::pressGrabTime()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
-    checkNoErrors(component);
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
-    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
-    QVERIFY(rootItem != 0);
-    QVERIFY(wv != 0);
-    QTRY_COMPARE(wv->progress(), 1.0);
-    QCOMPARE(wv->pressGrabTime(), 200);
-    QSignalSpy pressGrabTimeSpy(wv, SIGNAL(pressGrabTimeChanged()));
-
-    wv->setPressGrabTime(100);
-    QCOMPARE(wv->pressGrabTime(), 100);
-    QCOMPARE(pressGrabTimeSpy.count(),1);
-
-    wv->setPressGrabTime(100);
-    QCOMPARE(pressGrabTimeSpy.count(),1);
-
-    wv->setPressGrabTime(0);
-    QCOMPARE(pressGrabTimeSpy.count(),2);
-}
-
-QTEST_MAIN(tst_qmlgraphicswebview)
-
-#include "tst_qmlgraphicswebview.moc"
diff --git a/tests/auto/declarative/qmlimageprovider/data/exists.png b/tests/auto/declarative/qmlimageprovider/data/exists.png
deleted file mode 100644
index 399bd0b..0000000
Binary files a/tests/auto/declarative/qmlimageprovider/data/exists.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlimageprovider/data/exists1.png b/tests/auto/declarative/qmlimageprovider/data/exists1.png
deleted file mode 100644
index 399bd0b..0000000
Binary files a/tests/auto/declarative/qmlimageprovider/data/exists1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlimageprovider/data/exists2.png b/tests/auto/declarative/qmlimageprovider/data/exists2.png
deleted file mode 100644
index 399bd0b..0000000
Binary files a/tests/auto/declarative/qmlimageprovider/data/exists2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlimageprovider/qmlimageprovider.pro b/tests/auto/declarative/qmlimageprovider/qmlimageprovider.pro
deleted file mode 100644
index 0ef7739..0000000
--- a/tests/auto/declarative/qmlimageprovider/qmlimageprovider.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += network
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlimageprovider.cpp
-
-# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
-# LIBS += -lgcov
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlimageprovider/tst_qmlimageprovider.cpp b/tests/auto/declarative/qmlimageprovider/tst_qmlimageprovider.cpp
deleted file mode 100644
index d07558a..0000000
--- a/tests/auto/declarative/qmlimageprovider/tst_qmlimageprovider.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtTest/QtTest>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlimageprovider.h>
-#include <private/qmlgraphicsimage_p.h>
-
-// QmlImageProvider::request() is run in an idle thread where possible
-// Be generous in our timeout.
-#define TRY_WAIT(expr) \
-    do { \
-        for (int ii = 0; ii < 10; ++ii) { \
-            if ((expr)) break; \
-            QTest::qWait(100); \
-        } \
-        QVERIFY((expr)); \
-    } while (false)
-
-
-class tst_qmlimageprovider : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlimageprovider()
-    {
-    }
-
-private slots:
-    void imageSource();
-    void imageSource_data();
-    void removeProvider();
-
-private:
-    QmlEngine engine;
-};
-
-class TestProvider : public QmlImageProvider
-{
-public:
-    QImage request(const QString &id) {
-        QImage image;
-        image.load(SRCDIR "/data/" + id);
-        return image;
-    }
-};
-
-void tst_qmlimageprovider::imageSource_data()
-{
-    QTest::addColumn<QString>("source");
-    QTest::addColumn<QString>("error");
-
-    QTest::newRow("exists") << "image://test/exists.png" << "";
-    QTest::newRow("missing") << "image://test/no-such-file.png"
-        << "\"Failed to get image from provider: image://test/no-such-file.png\" ";
-    QTest::newRow("unknown provider") << "image://bogus/exists.png"
-        << "\"Failed to get image from provider: image://bogus/exists.png\" ";
-}
-    
-void tst_qmlimageprovider::imageSource()
-{
-    QFETCH(QString, source);
-    QFETCH(QString, error);
-
-    if (!error.isEmpty())
-        QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
-
-    engine.addImageProvider("test", new TestProvider);
-    QVERIFY(engine.imageProvider("test") != 0);
-
-    QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
-    QVERIFY(obj != 0);
-
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Loading);
-
-    QCOMPARE(obj->source(), QUrl(source));
-
-    if (error.isEmpty()) {
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Ready);
-        QCOMPARE(obj->width(), 100.);
-        QCOMPARE(obj->height(), 100.);
-        QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
-        QCOMPARE(obj->progress(), 1.0);
-    } else {
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Error);
-    }
-
-    delete obj;
-}
-
-void tst_qmlimageprovider::removeProvider()
-{
-    engine.addImageProvider("test2", new TestProvider);
-    QVERIFY(engine.imageProvider("test2") != 0);
-
-    // add provider, confirm it works
-    QString componentStr = "import Qt 4.6\nImage { source: \"image://test2/exists1.png\" }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
-    QVERIFY(obj != 0);
-
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Loading);
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Ready);
-
-    QCOMPARE(obj->width(), 100.0);
-
-    // remove the provider and confirm
-    QString error("\"Failed to get image from provider: image://test2/exists2.png\" ");
-    QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
-
-    engine.removeImageProvider("test2");
-
-    obj->setSource(QUrl("image://test2/exists2.png"));
-
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Loading);
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Error);
-
-    delete obj;
-}
-
-
-QTEST_MAIN(tst_qmlimageprovider)
-
-#include "tst_qmlimageprovider.moc"
diff --git a/tests/auto/declarative/qmlinfo/data/NestedObject.qml b/tests/auto/declarative/qmlinfo/data/NestedObject.qml
deleted file mode 100644
index cd5b426..0000000
--- a/tests/auto/declarative/qmlinfo/data/NestedObject.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var nested
-
-    nested:  QtObject {}
-}
-
diff --git a/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml b/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
deleted file mode 100644
index a2ce78a..0000000
--- a/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var nested
-    nested: NestedObject { }
-    property var nested2: nested.nested
-}
-
diff --git a/tests/auto/declarative/qmlinfo/data/qmlObject.qml b/tests/auto/declarative/qmlinfo/data/qmlObject.qml
deleted file mode 100644
index ce05f89..0000000
--- a/tests/auto/declarative/qmlinfo/data/qmlObject.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var nested
-
-    nested: QtObject {
-    }
-}
diff --git a/tests/auto/declarative/qmlinfo/qmlinfo.pro b/tests/auto/declarative/qmlinfo/qmlinfo.pro
deleted file mode 100644
index dbebf92..0000000
--- a/tests/auto/declarative/qmlinfo/qmlinfo.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlinfo.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp b/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
deleted file mode 100644
index e4da993..0000000
--- a/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QPushButton>
-#include <QmlContext>
-#include <qmlinfo.h>
-
-class tst_qmlinfo : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlinfo() {}
-
-private slots:
-    void qmlObject();
-    void nestedQmlObject();
-    void nonQmlObject();
-    void nullObject();
-    void nonQmlContextedObject();
-
-private:
-    QmlEngine engine;
-};
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
-}
-
-void tst_qmlinfo::qmlObject()
-{
-    QmlComponent component(&engine, TEST_FILE("qmlObject.qml"));
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QString message = "QML QObject_QML_0 (" + component.url().toString() + ":3:1) Test Message";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-    qmlInfo(object) << "Test Message";
-
-    QObject *nested = qvariant_cast<QObject *>(object->property("nested"));
-    QVERIFY(nested != 0);
-
-    message = "QML QtObject (" + component.url().toString() + ":6:13) Second Test Message";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-    qmlInfo(nested) << "Second Test Message";
-}
-
-void tst_qmlinfo::nestedQmlObject()
-{
-    QmlComponent component(&engine, TEST_FILE("nestedQmlObject.qml"));
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QObject *nested = qvariant_cast<QObject *>(object->property("nested"));
-    QVERIFY(nested != 0);
-    QObject *nested2 = qvariant_cast<QObject *>(object->property("nested2"));
-    QVERIFY(nested2 != 0);
-
-    QString message = "QML NestedObject (" + component.url().toString() + ":5:13) Outer Object";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-    qmlInfo(nested) << "Outer Object";
-
-    message = "QML QtObject (" + TEST_FILE("NestedObject.qml").toString() + ":6:14) Inner Object";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-    qmlInfo(nested2) << "Inner Object";
-}
-
-void tst_qmlinfo::nonQmlObject()
-{
-    QObject object;
-    QTest::ignoreMessage(QtWarningMsg, "QML QtObject (unknown location) Test Message");
-    qmlInfo(&object) << "Test Message";
-
-    QPushButton pbObject;
-    QTest::ignoreMessage(QtWarningMsg, "QML QPushButton (unknown location) Test Message");
-    qmlInfo(&pbObject) << "Test Message";
-}
-
-void tst_qmlinfo::nullObject()
-{
-    QTest::ignoreMessage(QtWarningMsg, "QML (unknown location) Null Object Test Message");
-    qmlInfo(0) << "Null Object Test Message";
-}
-
-void tst_qmlinfo::nonQmlContextedObject()
-{
-    QObject object;
-    QmlContext context(&engine);
-    QmlEngine::setContextForObject(&object, &context);
-    QTest::ignoreMessage(QtWarningMsg, "QML QtObject (unknown location) Test Message");
-    qmlInfo(&object) << "Test Message";
-}
-
-QTEST_MAIN(tst_qmlinfo)
-
-#include "tst_qmlinfo.moc"
diff --git a/tests/auto/declarative/qmlinstruction/qmlinstruction.pro b/tests/auto/declarative/qmlinstruction/qmlinstruction.pro
deleted file mode 100644
index 41be488..0000000
--- a/tests/auto/declarative/qmlinstruction/qmlinstruction.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative script
-SOURCES += tst_qmlinstruction.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp b/tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp
deleted file mode 100644
index 38d024a..0000000
--- a/tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp
+++ /dev/null
@@ -1,585 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <private/qmlcompiler_p.h>
-
-class tst_qmlinstruction : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlinstruction() {}
-
-private slots:
-    void dump();
-};
-
-static QStringList messages;
-static void msgHandler(QtMsgType, const char *msg)
-{
-    messages << QLatin1String(msg);
-}
-
-void tst_qmlinstruction::dump()
-{
-    QmlCompiledData *data = new QmlCompiledData(0);
-    {
-        QmlInstruction i;
-        i.line = 0;
-        i.type = QmlInstruction::Init;
-        i.init.bindingsSize = 0;
-        i.init.parserStatusSize = 3;
-        i.init.contextCache = -1;
-        i.init.compiledBinding = -1;
-        data->bytecode << i;
-    }
-
-    {
-        QmlCompiledData::TypeReference ref;
-        ref.className = "Test";
-        data->types << ref;
-
-        QmlInstruction i;
-        i.line = 1;
-        i.type = QmlInstruction::CreateObject;
-        i.create.type = 0;
-        i.create.data = -1;
-        i.create.bindingBits = -1;
-        i.create.column = 10;
-        data->bytecode << i;
-    }
-
-    {
-        data->primitives << "testId";
-
-        QmlInstruction i;
-        i.line = 2;
-        i.type = QmlInstruction::SetId;
-        i.setId.value = 0;
-        i.setId.index = 0;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 3;
-        i.type = QmlInstruction::SetDefault;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 4;
-        i.type = QmlInstruction::CreateComponent;
-        i.createComponent.count = 3;
-        i.createComponent.column = 4;
-        i.createComponent.endLine = 14;
-        i.createComponent.metaObject = 0;
-
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 5;
-        i.type = QmlInstruction::StoreMetaObject;
-        i.storeMeta.data = 3;
-        i.storeMeta.aliasData = 6;
-        i.storeMeta.propertyCache = 7;
-
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 6;
-        i.type = QmlInstruction::StoreFloat;
-        i.storeFloat.propertyIndex = 3;
-        i.storeFloat.value = 11.3;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 7;
-        i.type = QmlInstruction::StoreDouble;
-        i.storeDouble.propertyIndex = 4;
-        i.storeDouble.value = 14.8;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 8;
-        i.type = QmlInstruction::StoreInteger;
-        i.storeInteger.propertyIndex = 5;
-        i.storeInteger.value = 9;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 9;
-        i.type = QmlInstruction::StoreBool;
-        i.storeBool.propertyIndex = 6;
-        i.storeBool.value = true;
-
-        data->bytecode << i;
-    }
-
-    {
-        data->primitives << "Test String";
-        QmlInstruction i;
-        i.line = 10;
-        i.type = QmlInstruction::StoreString;
-        i.storeString.propertyIndex = 7;
-        i.storeString.value = 1;
-        data->bytecode << i;
-    }
-
-    {
-        data->primitives << "http://www.nokia.com";
-        QmlInstruction i;
-        i.line = 11;
-        i.type = QmlInstruction::StoreUrl;
-        i.storeUrl.propertyIndex = 8;
-        i.storeUrl.value = 2;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 12;
-        i.type = QmlInstruction::StoreColor;
-        i.storeColor.propertyIndex = 9;
-        i.storeColor.value = 0xFF00FF00;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 13;
-        i.type = QmlInstruction::StoreDate;
-        i.storeDate.propertyIndex = 10;
-        i.storeDate.value = 9;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 14;
-        i.type = QmlInstruction::StoreTime;
-        i.storeTime.propertyIndex = 11;
-        i.storeTime.valueIndex = 33;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 15;
-        i.type = QmlInstruction::StoreDateTime;
-        i.storeDateTime.propertyIndex = 12;
-        i.storeDateTime.valueIndex = 44;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 16;
-        i.type = QmlInstruction::StorePoint;
-        i.storeRealPair.propertyIndex = 13;
-        i.storeRealPair.valueIndex = 3;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 17;
-        i.type = QmlInstruction::StorePointF;
-        i.storeRealPair.propertyIndex = 14;
-        i.storeRealPair.valueIndex = 9;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 18;
-        i.type = QmlInstruction::StoreSize;
-        i.storeRealPair.propertyIndex = 15;
-        i.storeRealPair.valueIndex = 8;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 19;
-        i.type = QmlInstruction::StoreSizeF;
-        i.storeRealPair.propertyIndex = 16;
-        i.storeRealPair.valueIndex = 99;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 20;
-        i.type = QmlInstruction::StoreRect;
-        i.storeRect.propertyIndex = 17;
-        i.storeRect.valueIndex = 2;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 21;
-        i.type = QmlInstruction::StoreRectF;
-        i.storeRect.propertyIndex = 18;
-        i.storeRect.valueIndex = 19;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 22;
-        i.type = QmlInstruction::StoreVector3D;
-        i.storeVector3D.propertyIndex = 19;
-        i.storeVector3D.valueIndex = 9;
-        data->bytecode << i;
-    }
-
-    {
-        data->primitives << "color(1, 1, 1, 1)";
-        QmlInstruction i;
-        i.line = 23;
-        i.type = QmlInstruction::StoreVariant;
-        i.storeString.propertyIndex = 20;
-        i.storeString.value = 3;
-
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 24;
-        i.type = QmlInstruction::StoreObject;
-        i.storeObject.propertyIndex = 21;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 25;
-        i.type = QmlInstruction::StoreVariantObject;
-        i.storeObject.propertyIndex = 22;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 26;
-        i.type = QmlInstruction::StoreInterface;
-        i.storeObject.propertyIndex = 23;
-        data->bytecode << i;
-    }
-
-    {
-        data->primitives << "console.log(1921)";
-
-        QmlInstruction i;
-        i.line = 27;
-        i.type = QmlInstruction::StoreSignal;
-        i.storeSignal.signalIndex = 2;
-        i.storeSignal.value = 4;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 28;
-        i.type = QmlInstruction::StoreScript;
-        i.storeScript.value = 2;
-        //i.storeScript.fileName = 18;
-        //i.storeScript.lineNumber = 28;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 29;
-        i.type = QmlInstruction::StoreScriptString;
-        i.storeScriptString.propertyIndex = 24;
-        i.storeScriptString.value = 3;
-        i.storeScriptString.scope = 1;
-        data->bytecode << i;
-    }
-
-    {
-        data->datas << "mySignal";
-
-        QmlInstruction i;
-        i.line = 30;
-        i.type = QmlInstruction::AssignSignalObject;
-        i.assignSignalObject.signal = 0;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 31;
-        i.type = QmlInstruction::AssignCustomType;
-        i.assignCustomType.propertyIndex = 25;
-        i.assignCustomType.valueIndex = 4;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 32;
-        i.type = QmlInstruction::StoreBinding;
-        i.assignBinding.property = 26;
-        i.assignBinding.value = 3;
-        i.assignBinding.context = 2;
-        i.assignBinding.owner = 0;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 33;
-        i.type = QmlInstruction::StoreCompiledBinding;
-        i.assignBinding.property = 27;
-        i.assignBinding.value = 2;
-        i.assignBinding.context = 4;
-        i.assignBinding.owner = 0;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 34;
-        i.type = QmlInstruction::StoreValueSource;
-        i.assignValueSource.property = 29;
-        i.assignValueSource.owner = 1;
-        i.assignValueSource.castValue = 4;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 35;
-        i.type = QmlInstruction::StoreValueInterceptor;
-        i.assignValueInterceptor.property = 30;
-        i.assignValueInterceptor.owner = 2;
-        i.assignValueInterceptor.castValue = -4;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 36;
-        i.type = QmlInstruction::BeginObject;
-        i.begin.castValue = 4;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 38;
-        i.type = QmlInstruction::StoreObjectQList;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 39;
-        i.type = QmlInstruction::AssignObjectList;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 40;
-        i.type = QmlInstruction::FetchAttached;
-        i.fetchAttached.id = 23;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 42;
-        i.type = QmlInstruction::FetchQList;
-        i.fetch.property = 32;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 43;
-        i.type = QmlInstruction::FetchObject;
-        i.fetch.property = 33;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 44;
-        i.type = QmlInstruction::FetchValueType;
-        i.fetchValue.property = 34;
-        i.fetchValue.type = 6;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 45;
-        i.type = QmlInstruction::PopFetchedObject;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 46;
-        i.type = QmlInstruction::PopQList;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 47;
-        i.type = QmlInstruction::PopValueType;
-        i.fetchValue.property = 35;
-        i.fetchValue.type = 8;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 48;
-        i.type = QmlInstruction::Defer;
-        i.defer.deferCount = 7;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = -1;
-        i.type = QmlInstruction::Defer;
-        i.defer.deferCount = 7;
-        data->bytecode << i;
-    }
-
-    {
-        QmlInstruction i;
-        i.line = 50;
-        i.type = (QmlInstruction::Type)(QmlInstruction::Defer + 1); // Non-existant
-        data->bytecode << i;
-    }
-
-    QStringList expect;
-    expect 
-        << "Index\tLine\tOperation\t\tData1\tData2\tData3\tComments"
-        << "-------------------------------------------------------------------------------"
-        << "0\t\t0\tINIT\t\t\t0\t3\t-1\t-1"
-        << "1\t\t1\tCREATE\t\t\t0\t\t\t\"Test\""
-        << "2\t\t2\tSETID\t\t\t0\t\t\t\"testId\""
-        << "3\t\t3\tSET_DEFAULT"
-        << "4\t\t4\tCREATE_COMPONENT\t3"
-        << "5\t\t5\tSTORE_META\t\t3"
-        << "6\t\t6\tSTORE_FLOAT\t\t3\t11.3"
-        << "7\t\t7\tSTORE_DOUBLE\t\t4\t14.8"
-        << "8\t\t8\tSTORE_INTEGER\t\t5\t9"
-        << "9\t\t9\tSTORE_BOOL\t\t6\ttrue"
-        << "10\t\t10\tSTORE_STRING\t\t7\t1\t\t\"Test String\""
-        << "11\t\t11\tSTORE_URL\t\t8\t2\t\t\"http://www.nokia.com\""
-        << "12\t\t12\tSTORE_COLOR\t\t9\t\t\t\"ff00ff00\""
-        << "13\t\t13\tSTORE_DATE\t\t10\t9"
-        << "14\t\t14\tSTORE_TIME\t\t11\t33"
-        << "15\t\t15\tSTORE_DATETIME\t\t12\t44"
-        << "16\t\t16\tSTORE_POINT\t\t13\t3"
-        << "17\t\t17\tSTORE_POINTF\t\t14\t9"
-        << "18\t\t18\tSTORE_SIZE\t\t15\t8"
-        << "19\t\t19\tSTORE_SIZEF\t\t16\t99"
-        << "20\t\t20\tSTORE_RECT\t\t17\t2"
-        << "21\t\t21\tSTORE_RECTF\t\t18\t19"
-        << "22\t\t22\tSTORE_VECTOR3D\t\t19\t9"
-        << "23\t\t23\tSTORE_VARIANT\t\t20\t3\t\t\"color(1, 1, 1, 1)\""
-        << "24\t\t24\tSTORE_OBJECT\t\t21"
-        << "25\t\t25\tSTORE_VARIANT_OBJECT\t22"
-        << "26\t\t26\tSTORE_INTERFACE\t\t23"
-        << "27\t\t27\tSTORE_SIGNAL\t\t2\t4\t\t\"console.log(1921)\""
-        << "28\t\t28\tSTORE_SCRIPT\t\t2"
-        << "29\t\t29\tSTORE_SCRIPT_STRING\t24\t3\t1"
-        << "30\t\t30\tASSIGN_SIGNAL_OBJECT\t0\t\t\t\"mySignal\""
-        << "31\t\t31\tASSIGN_CUSTOMTYPE\t25\t4"
-        << "32\t\t32\tSTORE_BINDING\t26\t3\t2"
-        << "33\t\t33\tSTORE_COMPILED_BINDING\t27\t2\t4"
-        << "34\t\t34\tSTORE_VALUE_SOURCE\t29\t4"
-        << "35\t\t35\tSTORE_VALUE_INTERCEPTOR\t30\t-4"
-        << "36\t\t36\tBEGIN\t\t\t4"
-        << "37\t\t38\tSTORE_OBJECT_QLIST"
-        << "38\t\t39\tASSIGN_OBJECT_LIST"
-        << "39\t\t40\tFETCH_ATTACHED\t\t23"
-        << "40\t\t42\tFETCH_QLIST\t\t32"
-        << "41\t\t43\tFETCH\t\t\t33"
-        << "42\t\t44\tFETCH_VALUE\t\t34\t6"
-        << "43\t\t45\tPOP"
-        << "44\t\t46\tPOP_QLIST"
-        << "45\t\t47\tPOP_VALUE\t\t35\t8"
-        << "46\t\t48\tDEFER\t\t\t7"
-        << "47\t\tNA\tDEFER\t\t\t7"
-        << "48\t\t50\tXXX UNKOWN INSTRUCTION\t47"
-        << "-------------------------------------------------------------------------------";
-
-    messages = QStringList();
-    QtMsgHandler old = qInstallMsgHandler(msgHandler);
-    data->dumpInstructions();
-    qInstallMsgHandler(old);
-
-    QCOMPARE(messages.count(), expect.count());
-    for (int ii = 0; ii < messages.count(); ++ii) {
-        QCOMPARE(messages.at(ii), expect.at(ii));
-    }
-
-    data->release();
-}
-
-QTEST_MAIN(tst_qmlinstruction)
-
-#include "tst_qmlinstruction.moc"
diff --git a/tests/auto/declarative/qmllanguage/data/Alias.qml b/tests/auto/declarative/qmllanguage/data/Alias.qml
deleted file mode 100644
index 55aa231..0000000
--- a/tests/auto/declarative/qmllanguage/data/Alias.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    id: root
-    property int value: 1892
-    property alias aliasValue: root.value
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/Alias2.qml b/tests/auto/declarative/qmllanguage/data/Alias2.qml
deleted file mode 100644
index 6362b2d..0000000
--- a/tests/auto/declarative/qmllanguage/data/Alias2.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    property var other
-    other: MyTypeObject { id: obj }
-    property alias enumAlias: obj.enumProperty;
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/Alias3.qml b/tests/auto/declarative/qmllanguage/data/Alias3.qml
deleted file mode 100644
index d1e78f8..0000000
--- a/tests/auto/declarative/qmllanguage/data/Alias3.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    property alias obj : otherObj
-    property var child
-    child: QtObject {
-        id: otherObj
-        property int myValue: 10
-    }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/Alias4.qml b/tests/auto/declarative/qmllanguage/data/Alias4.qml
deleted file mode 100644
index 573674c..0000000
--- a/tests/auto/declarative/qmllanguage/data/Alias4.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-Alias3 {}
-
diff --git a/tests/auto/declarative/qmllanguage/data/ComponentComposite.qml b/tests/auto/declarative/qmllanguage/data/ComponentComposite.qml
deleted file mode 100644
index 05fbc3f..0000000
--- a/tests/auto/declarative/qmllanguage/data/ComponentComposite.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-Component {
-    QtObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType.qml b/tests/auto/declarative/qmllanguage/data/CompositeType.qml
deleted file mode 100644
index 99d010f..0000000
--- a/tests/auto/declarative/qmllanguage/data/CompositeType.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.6
-
-QtObject {
-}
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType2.qml b/tests/auto/declarative/qmllanguage/data/CompositeType2.qml
deleted file mode 100644
index 86210e9..0000000
--- a/tests/auto/declarative/qmllanguage/data/CompositeType2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType3.qml b/tests/auto/declarative/qmllanguage/data/CompositeType3.qml
deleted file mode 100644
index d08f35b..0000000
--- a/tests/auto/declarative/qmllanguage/data/CompositeType3.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int a
-}
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType4.qml b/tests/auto/declarative/qmllanguage/data/CompositeType4.qml
deleted file mode 100644
index a6a8168..0000000
--- a/tests/auto/declarative/qmllanguage/data/CompositeType4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    property int a
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml b/tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml
deleted file mode 100644
index aefbf9a..0000000
--- a/tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int super_a: 10
-    property int super_c: 14
-}
diff --git a/tests/auto/declarative/qmllanguage/data/HelperAlias.qml b/tests/auto/declarative/qmllanguage/data/HelperAlias.qml
deleted file mode 100644
index dc3b382..0000000
--- a/tests/auto/declarative/qmllanguage/data/HelperAlias.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    property var child
-    child: QtObject { id: obj }
-    property alias objAlias: obj;
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/I18n.qml b/tests/auto/declarative/qmllanguage/data/I18n.qml
deleted file mode 100644
index 558c836..0000000
--- a/tests/auto/declarative/qmllanguage/data/I18n.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int áâãäå: 10
-    stringProperty: "Test áâãäå: " + áâãäå
-}
diff --git a/tests/auto/declarative/qmllanguage/data/I18nType30.qml b/tests/auto/declarative/qmllanguage/data/I18nType30.qml
deleted file mode 100644
index 42dbc69..0000000
--- a/tests/auto/declarative/qmllanguage/data/I18nType30.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    stringProperty: "Test áâãäå: 30"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/MyComponent.qml b/tests/auto/declarative/qmllanguage/data/MyComponent.qml
deleted file mode 100644
index 1a23277..0000000
--- a/tests/auto/declarative/qmllanguage/data/MyComponent.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    property real x;
-    property real y;
-}
diff --git a/tests/auto/declarative/qmllanguage/data/MyCompositeValueSource.qml b/tests/auto/declarative/qmllanguage/data/MyCompositeValueSource.qml
deleted file mode 100644
index e620e26..0000000
--- a/tests/auto/declarative/qmllanguage/data/MyCompositeValueSource.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyPropertyValueSource {
-    property int x
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/MyContainerComponent.qml b/tests/auto/declarative/qmllanguage/data/MyContainerComponent.qml
deleted file mode 100644
index 61f54c5..0000000
--- a/tests/auto/declarative/qmllanguage/data/MyContainerComponent.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyContainer {
-    property int x
-}
diff --git a/tests/auto/declarative/qmllanguage/data/NestedAlias.qml b/tests/auto/declarative/qmllanguage/data/NestedAlias.qml
deleted file mode 100644
index 5155612..0000000
--- a/tests/auto/declarative/qmllanguage/data/NestedAlias.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property QtObject o1
-    property QtObject o2
-
-    property alias a: object2.a
-
-    o1: QtObject { id: object1 }
-    o2: QtObject { 
-        id: object2 
-        property int a: 1923
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml b/tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml
deleted file mode 100644
index 5cc8d20..0000000
--- a/tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-Item {
-    x: "You can't assign a string to a real!"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/OnCompletedType.qml b/tests/auto/declarative/qmllanguage/data/OnCompletedType.qml
deleted file mode 100644
index 2889caf..0000000
--- a/tests/auto/declarative/qmllanguage/data/OnCompletedType.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-MyQmlObject {
-    property int a: Math.max(10, 9)
-    property int b: 11 
-    Component.onCompleted: console.log("Completed " + a + " " + b);
-}
diff --git a/tests/auto/declarative/qmllanguage/data/alias.1.qml b/tests/auto/declarative/qmllanguage/data/alias.1.qml
deleted file mode 100644
index 500b0f6..0000000
--- a/tests/auto/declarative/qmllanguage/data/alias.1.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    id: root
-    property int value: 10
-    property alias valueAlias: root.value
-}
diff --git a/tests/auto/declarative/qmllanguage/data/alias.2.qml b/tests/auto/declarative/qmllanguage/data/alias.2.qml
deleted file mode 100644
index 5c92270..0000000
--- a/tests/auto/declarative/qmllanguage/data/alias.2.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    id: root
-    property alias aliasObject: root.qmlobjectProperty
-
-    qmlobjectProperty: MyQmlObject { value : 10 }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/alias.3.qml b/tests/auto/declarative/qmllanguage/data/alias.3.qml
deleted file mode 100644
index e059937..0000000
--- a/tests/auto/declarative/qmllanguage/data/alias.3.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-QtObject {
-   property var other
-   other: Alias { id: myAliasObject }
-
-   property alias value: myAliasObject.aliasValue
-   property alias value2: myAliasObject.value
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/alias.4.qml b/tests/auto/declarative/qmllanguage/data/alias.4.qml
deleted file mode 100644
index bd6a769..0000000
--- a/tests/auto/declarative/qmllanguage/data/alias.4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-Alias2 {
-    enumAlias: MyTypeObject.EnumVal2 
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/alias.5.qml b/tests/auto/declarative/qmllanguage/data/alias.5.qml
deleted file mode 100644
index 4316d0d..0000000
--- a/tests/auto/declarative/qmllanguage/data/alias.5.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.6
-import Test 1.0
-
-QtObject {
-    property alias otherAlias: otherObject
-
-    property var other 
-    other: MyQmlObject {
-        id: otherObject
-        value: 10
-    }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/alias.6.qml b/tests/auto/declarative/qmllanguage/data/alias.6.qml
deleted file mode 100644
index e3af230..0000000
--- a/tests/auto/declarative/qmllanguage/data/alias.6.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property QtObject o;
-    property alias a: object.a
-    o: NestedAlias { id: object }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/alias.7.qml b/tests/auto/declarative/qmllanguage/data/alias.7.qml
deleted file mode 100644
index a9a57eb..0000000
--- a/tests/auto/declarative/qmllanguage/data/alias.7.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property QtObject object
-    property alias aliasedObject: target.object
-
-    object: QtObject {
-        id: target
-
-        property QtObject object
-        object: QtObject {}
-    }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/alias.8.qml b/tests/auto/declarative/qmllanguage/data/alias.8.qml
deleted file mode 100644
index 2b9ad85..0000000
--- a/tests/auto/declarative/qmllanguage/data/alias.8.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-   property var other
-   other: Alias3 { id: myAliasObject }
-
-   property int value: myAliasObject.obj.myValue
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/alias.9.qml b/tests/auto/declarative/qmllanguage/data/alias.9.qml
deleted file mode 100644
index a2a41a1..0000000
--- a/tests/auto/declarative/qmllanguage/data/alias.9.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-   property var other
-   other: Alias4 { id: myAliasObject }
-
-   property int value: myAliasObject.obj.myValue
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml b/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml
deleted file mode 100644
index c86c96b..0000000
--- a/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    flagProperty: "FlagVal1 | FlagVal3"
-    enumProperty: "EnumVal2"
-    stringProperty: "Hello World!"
-    uintProperty: 10
-    intProperty: -19
-    realProperty: 23.2
-    doubleProperty: -19.7
-    floatProperty: 8.5
-    colorProperty: "red"
-    dateProperty: "1982-11-25"
-    timeProperty: "11:11:31"
-    timeProperty: "11:11:32"
-    timeProperty: "11:11:32" 
-    dateTimeProperty: "2009-05-12T13:22:01"
-    pointProperty: "99,13"
-    pointFProperty: "-10.1,12.3"
-    sizeProperty: "99x13"
-    sizeFProperty: "0.1x0.2"
-    rectProperty: "9,7,100x200"
-    rectFProperty: "1000.1,-10.9,400x90.99"
-    boolProperty: true
-    variantProperty: "Hello World!"
-    vectorProperty: "10,1,2.2"
-    urlProperty: "main.qml"
-
-    objectProperty: MyTypeObject { intProperty: 8 }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml b/tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml
deleted file mode 100644
index f6422bd..0000000
--- a/tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-import Test 1.0
-
-QtObject {
-    property QtObject myProperty
-    property QtObject myProperty2
-    property QtObject myProperty3
-    property QtObject myProperty4
-    property MyQmlObject myProperty5
-    property MyQmlObject myProperty6
-
-    myProperty: CompositeType {}
-    myProperty2: CompositeType2 {}
-    myProperty3: CompositeType3 {}
-    myProperty4: CompositeType4 {}
-    myProperty5: CompositeType2 {}
-    myProperty6: CompositeType4 {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/assignLiteralSignalProperty.qml b/tests/auto/declarative/qmllanguage/data/assignLiteralSignalProperty.qml
deleted file mode 100644
index 399fcea..0000000
--- a/tests/auto/declarative/qmllanguage/data/assignLiteralSignalProperty.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    onLiteralSignal: 10
-}
diff --git a/tests/auto/declarative/qmllanguage/data/assignObjectToSignal.qml b/tests/auto/declarative/qmllanguage/data/assignObjectToSignal.qml
deleted file mode 100644
index 789cc66..0000000
--- a/tests/auto/declarative/qmllanguage/data/assignObjectToSignal.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    onBasicSignal: MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml b/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml
deleted file mode 100644
index 0ff9370..0000000
--- a/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    property var a;
-    a: MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/assignQmlComponent.qml b/tests/auto/declarative/qmllanguage/data/assignQmlComponent.qml
deleted file mode 100644
index 20bdc55..0000000
--- a/tests/auto/declarative/qmllanguage/data/assignQmlComponent.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyContainer {
-    MyComponent { x: 10; y: 11; }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/assignSignal.qml b/tests/auto/declarative/qmllanguage/data/assignSignal.qml
deleted file mode 100644
index 2a48df8..0000000
--- a/tests/auto/declarative/qmllanguage/data/assignSignal.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    onBasicSignal: basicSlot()
-    onBasicParameterizedSignal: basicSlotWithArgs(parameter)
-}
diff --git a/tests/auto/declarative/qmllanguage/data/assignTypeExtremes.qml b/tests/auto/declarative/qmllanguage/data/assignTypeExtremes.qml
deleted file mode 100644
index 60ede52..0000000
--- a/tests/auto/declarative/qmllanguage/data/assignTypeExtremes.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    uintProperty: 4000000000
-    intProperty: -2000000000
-}
diff --git a/tests/auto/declarative/qmllanguage/data/attachedProperties.qml b/tests/auto/declarative/qmllanguage/data/attachedProperties.qml
deleted file mode 100644
index b46ec34..0000000
--- a/tests/auto/declarative/qmllanguage/data/attachedProperties.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import Test 1.0 as Namespace
-import Qt 4.6
-
-QtObject {
-    MyQmlObject.value: 10
-    Namespace.MyQmlObject.value2: 13
-}
diff --git a/tests/auto/declarative/qmllanguage/data/autoComponentCreation.qml b/tests/auto/declarative/qmllanguage/data/autoComponentCreation.qml
deleted file mode 100644
index 5d00144..0000000
--- a/tests/auto/declarative/qmllanguage/data/autoComponentCreation.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    componentProperty : MyTypeObject { realProperty: 9 }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/component.1.errors.txt b/tests/auto/declarative/qmllanguage/data/component.1.errors.txt
deleted file mode 100644
index 091aad6..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Cannot create empty component specification
diff --git a/tests/auto/declarative/qmllanguage/data/component.1.qml b/tests/auto/declarative/qmllanguage/data/component.1.qml
deleted file mode 100644
index 07e463a..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.6
-
-Component {
-}
diff --git a/tests/auto/declarative/qmllanguage/data/component.2.errors.txt b/tests/auto/declarative/qmllanguage/data/component.2.errors.txt
deleted file mode 100644
index 76e7656..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:9:id is not unique
diff --git a/tests/auto/declarative/qmllanguage/data/component.2.qml b/tests/auto/declarative/qmllanguage/data/component.2.qml
deleted file mode 100644
index 88e0f73..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.2.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: myId
-    Component {
-        id: myId
-        QtObject {}
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/component.3.errors.txt b/tests/auto/declarative/qmllanguage/data/component.3.errors.txt
deleted file mode 100644
index 9a13142..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:9:Invalid component id specification
diff --git a/tests/auto/declarative/qmllanguage/data/component.3.qml b/tests/auto/declarative/qmllanguage/data/component.3.qml
deleted file mode 100644
index 287a959..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.3.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-Item {
-    Component {
-        id: myId
-        id: myId2
-        QtObject {}
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/component.4.errors.txt b/tests/auto/declarative/qmllanguage/data/component.4.errors.txt
deleted file mode 100644
index 2ab18685..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Invalid component body specification
diff --git a/tests/auto/declarative/qmllanguage/data/component.4.qml b/tests/auto/declarative/qmllanguage/data/component.4.qml
deleted file mode 100644
index ab1e29b..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Component {
-    QtObject {}
-    QtObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/component.5.errors.txt b/tests/auto/declarative/qmllanguage/data/component.5.errors.txt
deleted file mode 100644
index e3c2df7..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Component elements may not contain properties other than id
diff --git a/tests/auto/declarative/qmllanguage/data/component.5.qml b/tests/auto/declarative/qmllanguage/data/component.5.qml
deleted file mode 100644
index 629e998..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.5.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Component {
-    x: 10
-    QtObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/component.6.errors.txt b/tests/auto/declarative/qmllanguage/data/component.6.errors.txt
deleted file mode 100644
index 2b1c6ca..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Invalid component id specification
diff --git a/tests/auto/declarative/qmllanguage/data/component.6.qml b/tests/auto/declarative/qmllanguage/data/component.6.qml
deleted file mode 100644
index 2303ebf..0000000
--- a/tests/auto/declarative/qmllanguage/data/component.6.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Component {
-    id: QtObject {}
-    QtObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/componentCompositeType.qml b/tests/auto/declarative/qmllanguage/data/componentCompositeType.qml
deleted file mode 100644
index 0a7249a..0000000
--- a/tests/auto/declarative/qmllanguage/data/componentCompositeType.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var test
-
-    test: ComponentComposite {}
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/cppnamespace.2.qml b/tests/auto/declarative/qmllanguage/data/cppnamespace.2.qml
deleted file mode 100644
index e3b32ca..0000000
--- a/tests/auto/declarative/qmllanguage/data/cppnamespace.2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MySecondNamespacedType {
-    list: [ MyNamespacedType {} ]
-}
diff --git a/tests/auto/declarative/qmllanguage/data/cppnamespace.qml b/tests/auto/declarative/qmllanguage/data/cppnamespace.qml
deleted file mode 100644
index e1daf3b..0000000
--- a/tests/auto/declarative/qmllanguage/data/cppnamespace.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-
-MyNamespacedType {
-}
diff --git a/tests/auto/declarative/qmllanguage/data/crash2.qml b/tests/auto/declarative/qmllanguage/data/crash2.qml
deleted file mode 100644
index a22c776..0000000
--- a/tests/auto/declarative/qmllanguage/data/crash2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    objectName: "Hello" + "World"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.errors.txt b/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.errors.txt
deleted file mode 100644
index 43a8bb2..0000000
--- a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:19:ListElement: cannot use reserved "id" property
diff --git a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml b/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml
deleted file mode 100644
index 00cc0c4..0000000
--- a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-ListModel {
-    ListElement { a: 10 }
-    ListElement { id: foo; a: 12 }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/customParserTypes.qml b/tests/auto/declarative/qmllanguage/data/customParserTypes.qml
deleted file mode 100644
index cf2f272..0000000
--- a/tests/auto/declarative/qmllanguage/data/customParserTypes.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-ListModel {
-    ListElement { a: 10 }
-    ListElement { a: 12 }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/customVariantTypes.qml b/tests/auto/declarative/qmllanguage/data/customVariantTypes.qml
deleted file mode 100644
index 0263ed2..0000000
--- a/tests/auto/declarative/qmllanguage/data/customVariantTypes.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    customType: "10"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/declaredPropertyValues.qml b/tests/auto/declarative/qmllanguage/data/declaredPropertyValues.qml
deleted file mode 100644
index 3987a3c..0000000
--- a/tests/auto/declarative/qmllanguage/data/declaredPropertyValues.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int a: 10
-    property int b: 10 + a
-    property QtObject c: QtObject {}
-    property list<QtObject> d: [ QtObject {}, QtObject {} ]
-}
diff --git a/tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt b/tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt
deleted file mode 100644
index 945d51b..0000000
--- a/tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-7:9:Invalid value in grouped property
diff --git a/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml b/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml
deleted file mode 100644
index 0fd1404..0000000
--- a/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-MyTypeObject {
-    grouped {
-        script: console.log(1921)
-        QtObject {}
-    }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/defaultPropertyListOrder.qml b/tests/auto/declarative/qmllanguage/data/defaultPropertyListOrder.qml
deleted file mode 100644
index 3651511..0000000
--- a/tests/auto/declarative/qmllanguage/data/defaultPropertyListOrder.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-MyContainer {
-    QtObject {
-        property int index: 0
-    }
-
-    QtObject {
-        property int index: 1
-    }
-
-    children: [
-        QtObject {
-            property int index: 2
-        }, 
-        QtObject {
-            property int index: 3
-        } 
-    ]
-
-    QtObject {
-        property int index: 4
-    }
-
-    QtObject {
-        property int index: 5
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt b/tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt
deleted file mode 100644
index 2aea251..0000000
--- a/tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Incorrectly specified signal
diff --git a/tests/auto/declarative/qmllanguage/data/doubleSignal.qml b/tests/auto/declarative/qmllanguage/data/doubleSignal.qml
deleted file mode 100644
index fb07b9f..0000000
--- a/tests/auto/declarative/qmllanguage/data/doubleSignal.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    onBasicSignal: console.log(1921)
-    onBasicSignal: console.log(1921)
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/duplicateIDs.errors.txt b/tests/auto/declarative/qmllanguage/data/duplicateIDs.errors.txt
deleted file mode 100644
index 66241cf..0000000
--- a/tests/auto/declarative/qmllanguage/data/duplicateIDs.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:19:id is not unique
diff --git a/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml b/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml
deleted file mode 100644
index a993abd..0000000
--- a/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-MyContainer {
-    MyQmlObject { id: myID }
-    MyQmlObject { id: myID }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicObject.1.qml b/tests/auto/declarative/qmllanguage/data/dynamicObject.1.qml
deleted file mode 100644
index 85d1052..0000000
--- a/tests/auto/declarative/qmllanguage/data/dynamicObject.1.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import Qt 4.6
-PropertyChanges {
-    propa: a + 10
-    propb: Math.min(a, 10)
-    propc: MyPropertyValueSource {}
-    onPropA: a
-}
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml
deleted file mode 100644
index c80a7c0..0000000
--- a/tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Test 1.0
-import Qt 4.6
-import Qt 4.6 as Qt
-
-QtObject {
-    property QtObject objectProperty
-    property QtObject objectProperty2
-    objectProperty2: QtObject {}
-
-    property MyComponent myComponentProperty
-    property MyComponent myComponentProperty2 
-    myComponentProperty2: MyComponent {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml b/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml
deleted file mode 100644
index aef3269..0000000
--- a/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Test 1.0
-import Qt 4.6
-QtObject {
-    default property int intProperty : 10
-    property bool boolProperty: false
-    property double doubleProperty: -10.1
-    property real realProperty: -19.9
-    property string stringProperty: "Hello World!"
-    property color colorProperty: "red"
-    property url urlProperty: "main.qml"
-    property date dateProperty: "1945-09-02"
-    property var varProperty: "Hello World!"
-    property variant variantProperty: 12
-}
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicPropertiesNested.qml b/tests/auto/declarative/qmllanguage/data/dynamicPropertiesNested.qml
deleted file mode 100644
index 7bfab67..0000000
--- a/tests/auto/declarative/qmllanguage/data/dynamicPropertiesNested.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-DynamicPropertiesNestedType {
-    property int a: 13
-    property int b: 12
-
-    super_a: 11
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml b/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml
deleted file mode 100644
index 2a834e8..0000000
--- a/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-QtObject {
-    signal signal1
-    function slot1() {}
-    signal signal2
-    function slot2() {}
-
-    property int test: 0
-    function slot3(a) { console.log(1921); test = a; }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/empty.errors.txt b/tests/auto/declarative/qmllanguage/data/empty.errors.txt
deleted file mode 100644
index d416e76..0000000
--- a/tests/auto/declarative/qmllanguage/data/empty.errors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-0:0:Expected token `numeric literal'
-0:0:Expected a qualified name id
diff --git a/tests/auto/declarative/qmllanguage/data/empty.qml b/tests/auto/declarative/qmllanguage/data/empty.qml
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt b/tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt
deleted file mode 100644
index 353bbf5..0000000
--- a/tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Empty signal assignment
diff --git a/tests/auto/declarative/qmllanguage/data/emptySignal.qml b/tests/auto/declarative/qmllanguage/data/emptySignal.qml
deleted file mode 100644
index 4c5a122..0000000
--- a/tests/auto/declarative/qmllanguage/data/emptySignal.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    onBasicSignal: " " 
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/failingComponent.errors.txt b/tests/auto/declarative/qmllanguage/data/failingComponent.errors.txt
deleted file mode 100644
index 0cf0ef3..0000000
--- a/tests/auto/declarative/qmllanguage/data/failingComponent.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Type FailingComponent unavailable
diff --git a/tests/auto/declarative/qmllanguage/data/failingComponentTest.qml b/tests/auto/declarative/qmllanguage/data/failingComponentTest.qml
deleted file mode 100644
index 74a6acf..0000000
--- a/tests/auto/declarative/qmllanguage/data/failingComponentTest.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyContainer {
-    FailingComponent {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt
deleted file mode 100644
index 3074823..0000000
--- a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.qml b/tests/auto/declarative/qmllanguage/data/fakeDotProperty.qml
deleted file mode 100644
index d971eee..0000000
--- a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    value.something: "hello"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/finalOverride.errors.txt b/tests/auto/declarative/qmllanguage/data/finalOverride.errors.txt
deleted file mode 100644
index 49e06cb..0000000
--- a/tests/auto/declarative/qmllanguage/data/finalOverride.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot override FINAL property
diff --git a/tests/auto/declarative/qmllanguage/data/finalOverride.qml b/tests/auto/declarative/qmllanguage/data/finalOverride.qml
deleted file mode 100644
index a84393a..0000000
--- a/tests/auto/declarative/qmllanguage/data/finalOverride.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    property int value: 10
-}
diff --git a/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyNames.qml b/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyNames.qml
deleted file mode 100644
index 558c836..0000000
--- a/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyNames.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int áâãäå: 10
-    stringProperty: "Test áâãäå: " + áâãäå
-}
diff --git a/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyUse.qml b/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyUse.qml
deleted file mode 100644
index 74918e2..0000000
--- a/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyUse.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-I18n {
-    áâãäå: 15
-}
diff --git a/tests/auto/declarative/qmllanguage/data/i18nNameSpace.qml b/tests/auto/declarative/qmllanguage/data/i18nNameSpace.qml
deleted file mode 100644
index c0b2f94..0000000
--- a/tests/auto/declarative/qmllanguage/data/i18nNameSpace.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0 as Áâãäå
-
-Áâãäå.MyTypeObject {
-    stringProperty: "Test áâãäå: 40"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/i18nScript.qml b/tests/auto/declarative/qmllanguage/data/i18nScript.qml
deleted file mode 100644
index 942ed90..0000000
--- a/tests/auto/declarative/qmllanguage/data/i18nScript.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    Script {
-        function val() {
-            var áâãäå = 20
-            return "Test áâãäå: " + áâãäå
-        }
-        
-    }
-    stringProperty: val()
-}
diff --git a/tests/auto/declarative/qmllanguage/data/i18nStrings.qml b/tests/auto/declarative/qmllanguage/data/i18nStrings.qml
deleted file mode 100644
index 764c926..0000000
--- a/tests/auto/declarative/qmllanguage/data/i18nStrings.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    stringProperty: "Test áâãäå (5 accented 'a' letters)"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/i18nType.qml b/tests/auto/declarative/qmllanguage/data/i18nType.qml
deleted file mode 100644
index d7954ef..0000000
--- a/tests/auto/declarative/qmllanguage/data/i18nType.qml
+++ /dev/null
@@ -1 +0,0 @@
-I18nTypeÁâãäå { }
diff --git a/tests/auto/declarative/qmllanguage/data/idProperty.qml b/tests/auto/declarative/qmllanguage/data/idProperty.qml
deleted file mode 100644
index 90c1483..0000000
--- a/tests/auto/declarative/qmllanguage/data/idProperty.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-MyContainer {
-    property var object : myObjectId
-
-    MyTypeObject {
-        id: "myObjectId"
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.errors.txt b/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.errors.txt
deleted file mode 100644
index 231998d..0000000
--- a/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:1:Namespace Rectangle cannot be used as a type
diff --git a/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.qml b/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.qml
deleted file mode 100644
index cd112af..0000000
--- a/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0 as Rectangle
-import Qt 4.6
-
-Rectangle { }
diff --git a/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.errors.txt b/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.errors.txt
deleted file mode 100644
index c7d880e..0000000
--- a/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:16:Library import requires a version
diff --git a/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.qml b/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.qml
deleted file mode 100644
index 23ed566..0000000
--- a/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test as S
-
-S.MyQmlObject {
-    property real x;
-    property real y;
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.errors.txt b/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.errors.txt
deleted file mode 100644
index 89e58ee..0000000
--- a/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:35:Library import requires a version
diff --git a/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.qml b/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.qml
deleted file mode 100644
index 97ec222..0000000
--- a/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import com.nokia.installedtest as T
-
-T.InstalledTest {}
diff --git a/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml b/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml
deleted file mode 100644
index 478f06a..0000000
--- a/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Test 1.0
-import Qt 4.6
-MyContainer {
-    Component {
-        id: myComponent
-        MyQmlObject {
-            value: 11
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/interfaceProperty.qml b/tests/auto/declarative/qmllanguage/data/interfaceProperty.qml
deleted file mode 100644
index 70879ff..0000000
--- a/tests/auto/declarative/qmllanguage/data/interfaceProperty.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import Qt 4.6
-MyQmlObject {
-    interfaceProperty: MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/interfaceQList.qml b/tests/auto/declarative/qmllanguage/data/interfaceQList.qml
deleted file mode 100644
index c87dfae..0000000
--- a/tests/auto/declarative/qmllanguage/data/interfaceQList.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-MyContainer {
-    qlistInterfaces: [ 
-        MyQmlObject {},
-        MyQmlObject {}
-    ]
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.errors.txt
deleted file mode 100644
index 492bbb4..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:17:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml
deleted file mode 100644
index 324f79c..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    MyQmlObject.foo: 10
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.errors.txt
deleted file mode 100644
index ff2409b..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:15:Non-existent attached object
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml
deleted file mode 100644
index b768e9f..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0 as Namespace
-import Qt 4.6
-
-QtObject {
-    Namespace.MadeUpClass.foo: 10
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.errors.txt
deleted file mode 100644
index fee5050..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:15:Not an attached property name
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml
deleted file mode 100644
index 7b782be..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0 as Namespace
-import Qt 4.6
-
-QtObject {
-    Namespace.madeUpClass.foo: 10
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.errors.txt
deleted file mode 100644
index 34de769..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:27:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml
deleted file mode 100644
index 1f47c61..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0 as Namespace
-import Qt 4.6
-
-QtObject {
-    Namespace.MyQmlObject.foo: 10
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.errors.txt
deleted file mode 100644
index 05161c4..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Invalid attached object assignment
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml
deleted file mode 100644
index 79c2981..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    MyQmlObject: 10
-}
-
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.errors.txt
deleted file mode 100644
index a208bcf..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:15:Invalid attached object assignment
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml
deleted file mode 100644
index af0be80..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0 as Namespace
-import Qt 4.6
-
-QtObject {
-    Namespace.MyQmlObject: 10
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.errors.txt
deleted file mode 100644
index 05161c4..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Invalid attached object assignment
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml
deleted file mode 100644
index 0546322..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    MyQmlObject: QtObject {}
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.errors.txt
deleted file mode 100644
index 6770e1f..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Non-existent attached object
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml
deleted file mode 100644
index 108109a..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    Test.MyQmlObject: QtObject {}
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.errors.txt
deleted file mode 100644
index 6770e1f..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Non-existent attached object
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml
deleted file mode 100644
index ccf0353..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    MyTypeObject.foo: 10
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.errors.txt
deleted file mode 100644
index ff2409b..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:15:Non-existent attached object
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml
deleted file mode 100644
index e736379..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0 as Namespace
-import Qt 4.6
-
-QtObject {
-    Namespace.MyTypeObject.foo: 10
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.errors.txt
deleted file mode 100644
index 6770e1f..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Non-existent attached object
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml
deleted file mode 100644
index a095229..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    MadeUpClass.foo: 10
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt
deleted file mode 100644
index 810fd31..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml
deleted file mode 100644
index 1167e39..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6 
-
-QtObject {
-    property var o;
-    o.blah: 10
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt
deleted file mode 100644
index 810fd31..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml
deleted file mode 100644
index a0c8306..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6 
-
-QtObject {
-    property int o;
-    o.blah: 10
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.errors.txt
deleted file mode 100644
index f6d6f29..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Invalid grouped property access
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.qml
deleted file mode 100644
index 0bbfc4f..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    customType.x: 10
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.errors.txt
deleted file mode 100644
index 69c6871..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.qml
deleted file mode 100644
index 134fef9..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyQmlObject {
-    foo.x: 10
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.errors.txt
deleted file mode 100644
index 2c8a970..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:18:Property assignment expected
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.qml
deleted file mode 100644
index 55cefe6..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectProperty.x.foo: 100
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.errors.txt
deleted file mode 100644
index 8331725..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:18:Single property assignment expected
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.qml
deleted file mode 100644
index 9ec33ab..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectProperty.x: 100
-    rectProperty.x: 101
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.errors.txt
deleted file mode 100644
index 4a7e383..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:-1:Cannot set properties on nullGrouped as it is null
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.qml
deleted file mode 100644
index 977539a..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    nullGrouped.script: console.log(1921)
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.2.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.2.errors.txt
deleted file mode 100644
index 56e3eeb..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.2.errors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-3:5:"" is not a valid object id
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.2.qml b/tests/auto/declarative/qmllanguage/data/invalidID.2.qml
deleted file mode 100644
index 4fb3b29..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: ""
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.3.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.3.errors.txt
deleted file mode 100644
index bb811cf..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Invalid use of id property
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.3.qml b/tests/auto/declarative/qmllanguage/data/invalidID.3.qml
deleted file mode 100644
index 6684172..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.3.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id.other: 10
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.4.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.4.errors.txt
deleted file mode 100644
index cfe8756..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Invalid use of id property
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.4.qml b/tests/auto/declarative/qmllanguage/data/invalidID.4.qml
deleted file mode 100644
index 86010bf..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.4.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: hello
-    id: world
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt
deleted file mode 100644
index c167de3..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:20:Invalid import qualifier ID
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.5.qml b/tests/auto/declarative/qmllanguage/data/invalidID.5.qml
deleted file mode 100644
index 5b92a1a..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.5.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-import Test 1.0 as hello
-MyQmlObject {
-    id: hello
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt
deleted file mode 100644
index 160e8b5..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:"StartsWithUpperCase" is not a valid object id
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.6.qml b/tests/auto/declarative/qmllanguage/data/invalidID.6.qml
deleted file mode 100644
index 62187d9..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.6.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: StartsWithUpperCase
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.errors.txt
deleted file mode 100644
index 1ca678c..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:"1" is not a valid object id
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.qml b/tests/auto/declarative/qmllanguage/data/invalidID.qml
deleted file mode 100644
index 04db3eb..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidID.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    id: 1
-}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidImportID.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidImportID.errors.txt
deleted file mode 100644
index a65f5fd..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidImportID.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:18:Invalid import qualifier ID
diff --git a/tests/auto/declarative/qmllanguage/data/invalidImportID.qml b/tests/auto/declarative/qmllanguage/data/invalidImportID.qml
deleted file mode 100644
index 30d88d5..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidImportID.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.6
-import Qt 4.6 as qt
-
-QtObject {}
diff --git a/tests/auto/declarative/qmllanguage/data/invalidRoot.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidRoot.errors.txt
deleted file mode 100644
index 4bcc948..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidRoot.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:1:Expected type name
diff --git a/tests/auto/declarative/qmllanguage/data/invalidRoot.qml b/tests/auto/declarative/qmllanguage/data/invalidRoot.qml
deleted file mode 100644
index 427827c..0000000
--- a/tests/auto/declarative/qmllanguage/data/invalidRoot.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-foo {
-}
diff --git a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
deleted file mode 100644
index d8a22a8..0000000
--- a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Qt 4.6
-Rectangle {}
diff --git a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
deleted file mode 100644
index a0706ad..0000000
--- a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Qt 4.6
-Text {}
diff --git a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml
deleted file mode 100644
index 93c7630..0000000
--- a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Qt 4.6
-Image {}
diff --git a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/qmldir
deleted file mode 100644
index eeb9a05..0000000
--- a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/qmldir
+++ /dev/null
@@ -1,4 +0,0 @@
-Rectangle 1.5 InstalledTest2.qml
-InstalledTest 1.4 InstalledTest2.qml
-InstalledTest 1.0 InstalledTest.qml
-InstalledTestTP 0.0 InstalledTest.qml
diff --git a/tests/auto/declarative/qmllanguage/data/listAssignment.2.errors.txt b/tests/auto/declarative/qmllanguage/data/listAssignment.2.errors.txt
deleted file mode 100644
index 8b40aa3..0000000
--- a/tests/auto/declarative/qmllanguage/data/listAssignment.2.errors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-3:15:Cannot assign primitives to lists
-
diff --git a/tests/auto/declarative/qmllanguage/data/listAssignment.2.qml b/tests/auto/declarative/qmllanguage/data/listAssignment.2.qml
deleted file mode 100644
index e3baadb..0000000
--- a/tests/auto/declarative/qmllanguage/data/listAssignment.2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyContainer {
-    children: 2
-}
diff --git a/tests/auto/declarative/qmllanguage/data/listAssignment.3.errors.txt b/tests/auto/declarative/qmllanguage/data/listAssignment.3.errors.txt
deleted file mode 100644
index 8c7b7e9..0000000
--- a/tests/auto/declarative/qmllanguage/data/listAssignment.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:15:Can only assign one binding to lists
diff --git a/tests/auto/declarative/qmllanguage/data/listAssignment.3.qml b/tests/auto/declarative/qmllanguage/data/listAssignment.3.qml
deleted file mode 100644
index 00c4c6b..0000000
--- a/tests/auto/declarative/qmllanguage/data/listAssignment.3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-MyContainer {
-    children: childBinding.expression
-    children: childBinding2.expression
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml b/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml
deleted file mode 100644
index 32b5b6c..0000000
--- a/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import Qt 4.6
-
-Item {
-    ListModel {
-        id: fruitModel
-        ListElement {
-            name: "Apple"
-            cost: 2.45
-        }
-        ListElement {
-            name: "Orange"
-            cost: 3.25
-        }
-        ListElement {
-            name: "Banana"
-            cost: 1.95
-        }
-    }
-
-    Component {
-        id: fruitDelegate
-        Item {
-            width: 200; height: 50
-            Text { text: name }
-            Text { text: '$'+cost; anchors.right: parent.right }
-            MouseArea {
-                anchors.fill: parent
-                onClicked: fruitModel.remove(index)
-            }
-        }
-    }
-
-    ListView {
-        model: fruitModel
-        delegate: fruitDelegate
-        anchors.fill: parent
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/listProperties.qml b/tests/auto/declarative/qmllanguage/data/listProperties.qml
deleted file mode 100644
index ba9e37c..0000000
--- a/tests/auto/declarative/qmllanguage/data/listProperties.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property list<QtObject> listProperty
-    property int test: listProperty.length
-
-    listProperty: [ QtObject{}, QtObject {} ]
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/missingObject.errors.txt b/tests/auto/declarative/qmllanguage/data/missingObject.errors.txt
deleted file mode 100644
index b31b562..0000000
--- a/tests/auto/declarative/qmllanguage/data/missingObject.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-1:10:Expected token `{'
diff --git a/tests/auto/declarative/qmllanguage/data/missingObject.qml b/tests/auto/declarative/qmllanguage/data/missingObject.qml
deleted file mode 100644
index 2f17045..0000000
--- a/tests/auto/declarative/qmllanguage/data/missingObject.qml
+++ /dev/null
@@ -1 +0,0 @@
-something: 24
diff --git a/tests/auto/declarative/qmllanguage/data/missingSignal.errors.txt b/tests/auto/declarative/qmllanguage/data/missingSignal.errors.txt
deleted file mode 100644
index f562246..0000000
--- a/tests/auto/declarative/qmllanguage/data/missingSignal.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Cannot assign to non-existent property "onClicked"
diff --git a/tests/auto/declarative/qmllanguage/data/missingSignal.qml b/tests/auto/declarative/qmllanguage/data/missingSignal.qml
deleted file mode 100644
index 3bf75f6..0000000
--- a/tests/auto/declarative/qmllanguage/data/missingSignal.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import Qt 4.6
-QtObject {
-    onClicked: console.log("Hello world!")
-}
diff --git a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.errors.txt
deleted file mode 100644
index caf7e55..0000000
--- a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:18:Cannot assign to non-existent property "foo"
diff --git a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.qml b/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.qml
deleted file mode 100644
index 9a0fa6a..0000000
--- a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectProperty.foo: 9
-}
diff --git a/tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt b/tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt
deleted file mode 100644
index 886da55..0000000
--- a/tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-4:5:Unable to create type NestedErrorsType
-4:8:Invalid property assignment: double expected
diff --git a/tests/auto/declarative/qmllanguage/data/nestedErrors.qml b/tests/auto/declarative/qmllanguage/data/nestedErrors.qml
deleted file mode 100644
index c0d755a..0000000
--- a/tests/auto/declarative/qmllanguage/data/nestedErrors.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Item {
-    NestedErrorsType {}
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.errors.txt
deleted file mode 100644
index 6bfce9a..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:15:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.qml
deleted file mode 100644
index df7406c..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Test 1.0
-MyQmlObject { something: 24 }
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.errors.txt
deleted file mode 100644
index 4b30056..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.qml
deleted file mode 100644
index 06ccd37..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    something: 24
-}
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.errors.txt
deleted file mode 100644
index 4b30056..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.qml
deleted file mode 100644
index 5b08608..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject { 
-    something: 1 + 1 
-}
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.errors.txt
deleted file mode 100644
index 4b30056..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot assign to non-existent property "something"
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.qml
deleted file mode 100644
index 6579191..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    something: ;
-}
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.errors.txt
deleted file mode 100644
index c07f2b9..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Expected a qualified name id
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.qml
deleted file mode 100644
index 37af057..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    24
-}
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.errors.txt b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.errors.txt
deleted file mode 100644
index 89925b7..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Cannot assign to non-existent default property
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.qml b/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.qml
deleted file mode 100644
index 5cd55d0..0000000
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/nullDotProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/nullDotProperty.errors.txt
deleted file mode 100644
index 07a4094..0000000
--- a/tests/auto/declarative/qmllanguage/data/nullDotProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:-1:Cannot set properties on obj as it is null
diff --git a/tests/auto/declarative/qmllanguage/data/nullDotProperty.qml b/tests/auto/declarative/qmllanguage/data/nullDotProperty.qml
deleted file mode 100644
index 4e36779..0000000
--- a/tests/auto/declarative/qmllanguage/data/nullDotProperty.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyDotPropertyObject {
-    obj.value: 1
-}
diff --git a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.errors.txt
deleted file mode 100644
index db7d9c0..0000000
--- a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:18:Unexpected object assignment
diff --git a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.qml b/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.qml
deleted file mode 100644
index 9924773..0000000
--- a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectProperty.x: MyTypeObject {}
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/onCompleted.qml b/tests/auto/declarative/qmllanguage/data/onCompleted.qml
deleted file mode 100644
index 5725f85..0000000
--- a/tests/auto/declarative/qmllanguage/data/onCompleted.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-MyTypeObject {
-    // We set a and b to ensure that onCompleted is executed after bindings and
-    // constants have been assigned
-    property int a: Math.min(6, 7)
-    Component.onCompleted: console.log("Completed " + a + " " + nestedObject.b)
-
-    objectProperty: OnCompletedType {
-        qmlobjectProperty: MyQmlObject {
-            id: nestedObject
-            property int b: 10 
-            Component.onCompleted: console.log("Completed " + a + " " + nestedObject.b)
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/property.1.errors.txt b/tests/auto/declarative/qmllanguage/data/property.1.errors.txt
deleted file mode 100644
index 3ae6c46..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:14:Expected property type
diff --git a/tests/auto/declarative/qmllanguage/data/property.1.qml b/tests/auto/declarative/qmllanguage/data/property.1.qml
deleted file mode 100644
index cadc39a..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property blah a;
-}
diff --git a/tests/auto/declarative/qmllanguage/data/property.2.errors.txt b/tests/auto/declarative/qmllanguage/data/property.2.errors.txt
deleted file mode 100644
index a18e21a..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:14:Unexpected property type modifier
diff --git a/tests/auto/declarative/qmllanguage/data/property.2.qml b/tests/auto/declarative/qmllanguage/data/property.2.qml
deleted file mode 100644
index e810c6c..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property invalidmodifier<int> a;
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/property.3.errors.txt b/tests/auto/declarative/qmllanguage/data/property.3.errors.txt
deleted file mode 100644
index 5e09a25..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:14:Invalid property type modifier
diff --git a/tests/auto/declarative/qmllanguage/data/property.3.qml b/tests/auto/declarative/qmllanguage/data/property.3.qml
deleted file mode 100644
index 04147c2..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.3.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property invalidmodifier<QtObject> a;
-}
-
-
diff --git a/tests/auto/declarative/qmllanguage/data/property.4.errors.txt b/tests/auto/declarative/qmllanguage/data/property.4.errors.txt
deleted file mode 100644
index b447186..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:1:Syntax error
diff --git a/tests/auto/declarative/qmllanguage/data/property.4.qml b/tests/auto/declarative/qmllanguage/data/property.4.qml
deleted file mode 100644
index b2ec482..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.4.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    readonly property int a
-}
diff --git a/tests/auto/declarative/qmllanguage/data/property.5.errors.txt b/tests/auto/declarative/qmllanguage/data/property.5.errors.txt
deleted file mode 100644
index 32a8dc1..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:Readonly not yet supported
diff --git a/tests/auto/declarative/qmllanguage/data/property.5.qml b/tests/auto/declarative/qmllanguage/data/property.5.qml
deleted file mode 100644
index 65fafbb..0000000
--- a/tests/auto/declarative/qmllanguage/data/property.5.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    readonly property int a: value
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/propertyValueSource.2.qml b/tests/auto/declarative/qmllanguage/data/propertyValueSource.2.qml
deleted file mode 100644
index 57a6070..0000000
--- a/tests/auto/declarative/qmllanguage/data/propertyValueSource.2.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    intProperty : MyCompositeValueSource {}
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/propertyValueSource.qml b/tests/auto/declarative/qmllanguage/data/propertyValueSource.qml
deleted file mode 100644
index ad71fcf..0000000
--- a/tests/auto/declarative/qmllanguage/data/propertyValueSource.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    intProperty : MyPropertyValueSource {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
deleted file mode 100644
index 429c327..0000000
--- a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import Qt 4.6
-QtObject {
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
deleted file mode 100644
index 0f57b61..0000000
--- a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-import Qt 4.6
-QtObject {
-    MyQmlObject.value: 10
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.1.errors.txt b/tests/auto/declarative/qmllanguage/data/readOnly.1.errors.txt
deleted file mode 100644
index b8c3404..0000000
--- a/tests/auto/declarative/qmllanguage/data/readOnly.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:21:Invalid property assignment: "readOnlyString" is a read-only property
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.1.qml b/tests/auto/declarative/qmllanguage/data/readOnly.1.qml
deleted file mode 100644
index 60757bd..0000000
--- a/tests/auto/declarative/qmllanguage/data/readOnly.1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    readOnlyString: "Hello World"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.2.errors.txt b/tests/auto/declarative/qmllanguage/data/readOnly.2.errors.txt
deleted file mode 100644
index d857a04..0000000
--- a/tests/auto/declarative/qmllanguage/data/readOnly.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:5:Invalid property assignment: "readOnlyString" is a read-only property
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.2.qml b/tests/auto/declarative/qmllanguage/data/readOnly.2.qml
deleted file mode 100644
index 8f1633c..0000000
--- a/tests/auto/declarative/qmllanguage/data/readOnly.2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    readOnlyString: "Hello" + "World"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.3.errors.txt b/tests/auto/declarative/qmllanguage/data/readOnly.3.errors.txt
deleted file mode 100644
index c7e9e1b..0000000
--- a/tests/auto/declarative/qmllanguage/data/readOnly.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:36:Invalid property assignment: "objAlias" is a read-only property
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.3.qml b/tests/auto/declarative/qmllanguage/data/readOnly.3.qml
deleted file mode 100644
index cd86a48..0000000
--- a/tests/auto/declarative/qmllanguage/data/readOnly.3.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-QtObject {
-    property var child
-    child: HelperAlias { objAlias: QtObject {} }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/rootAsQmlComponent.qml b/tests/auto/declarative/qmllanguage/data/rootAsQmlComponent.qml
deleted file mode 100644
index 8d72cd3..0000000
--- a/tests/auto/declarative/qmllanguage/data/rootAsQmlComponent.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-MyContainerComponent {
-    x: 11
-    MyQmlObject {}
-    MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/script.1.errors.txt b/tests/auto/declarative/qmllanguage/data/script.1.errors.txt
deleted file mode 100644
index 50518cc..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:1:Invalid use of Script block
diff --git a/tests/auto/declarative/qmllanguage/data/script.1.qml b/tests/auto/declarative/qmllanguage/data/script.1.qml
deleted file mode 100644
index 8dac8b7..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.6
-
-Script {
-}
diff --git a/tests/auto/declarative/qmllanguage/data/script.10.errors.txt b/tests/auto/declarative/qmllanguage/data/script.10.errors.txt
deleted file mode 100644
index 13f47d1..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.10.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:9:Component elements may not contain script blocks
diff --git a/tests/auto/declarative/qmllanguage/data/script.10.qml b/tests/auto/declarative/qmllanguage/data/script.10.qml
deleted file mode 100644
index 516e878..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.10.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-Item {
-    Component {
-        Item {}
-        Script {}
-    }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/script.11.errors.txt b/tests/auto/declarative/qmllanguage/data/script.11.errors.txt
deleted file mode 100644
index a664203..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.11.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Invalid Script block
diff --git a/tests/auto/declarative/qmllanguage/data/script.11.qml b/tests/auto/declarative/qmllanguage/data/script.11.qml
deleted file mode 100644
index 6d2d598..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.11.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    Script {
-        QtObject {}
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/script.12.errors.txt b/tests/auto/declarative/qmllanguage/data/script.12.errors.txt
deleted file mode 100644
index 85c8396..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.12.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:5:QmlJS declaration outside Script element
diff --git a/tests/auto/declarative/qmllanguage/data/script.12.qml b/tests/auto/declarative/qmllanguage/data/script.12.qml
deleted file mode 100644
index 9ecb5d9..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.12.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    var a
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/script.2.errors.txt b/tests/auto/declarative/qmllanguage/data/script.2.errors.txt
deleted file mode 100644
index 8fb3bbd..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Properties cannot be set on Script block
diff --git a/tests/auto/declarative/qmllanguage/data/script.2.qml b/tests/auto/declarative/qmllanguage/data/script.2.qml
deleted file mode 100644
index dce1a41..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.2.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    Script {
-        id: myScript
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/script.3.errors.txt b/tests/auto/declarative/qmllanguage/data/script.3.errors.txt
deleted file mode 100644
index 8fb3bbd..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Properties cannot be set on Script block
diff --git a/tests/auto/declarative/qmllanguage/data/script.3.qml b/tests/auto/declarative/qmllanguage/data/script.3.qml
deleted file mode 100644
index 8621a9a..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.3.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    Script {
-        hello: world
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/script.4.errors.txt b/tests/auto/declarative/qmllanguage/data/script.4.errors.txt
deleted file mode 100644
index 49a507f..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Invalid Script source value
diff --git a/tests/auto/declarative/qmllanguage/data/script.4.qml b/tests/auto/declarative/qmllanguage/data/script.4.qml
deleted file mode 100644
index d89817c..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.4.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    Script {
-        source: 10
-    }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/script.5.errors.txt b/tests/auto/declarative/qmllanguage/data/script.5.errors.txt
deleted file mode 100644
index 49a507f..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Invalid Script source value
diff --git a/tests/auto/declarative/qmllanguage/data/script.5.qml b/tests/auto/declarative/qmllanguage/data/script.5.qml
deleted file mode 100644
index 8986b3b..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.5.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    Script {
-        source: "hello" + ".js"
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmllanguage/data/script.6.errors.txt b/tests/auto/declarative/qmllanguage/data/script.6.errors.txt
deleted file mode 100644
index 4e53b6b..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Invalid Script block.  Specify either the source property or inline script
diff --git a/tests/auto/declarative/qmllanguage/data/script.6.qml b/tests/auto/declarative/qmllanguage/data/script.6.qml
deleted file mode 100644
index 07e9d78..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.6.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    Script {
-        source: "test.js"
-        function helloWorld() {}
-    }
-}
-
-
-
diff --git a/tests/auto/declarative/qmllanguage/data/script.7.errors.txt b/tests/auto/declarative/qmllanguage/data/script.7.errors.txt
deleted file mode 100644
index dc15ddf..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Variable declarations not allow in inline Script blocks
diff --git a/tests/auto/declarative/qmllanguage/data/script.7.qml b/tests/auto/declarative/qmllanguage/data/script.7.qml
deleted file mode 100644
index fa905e6..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.7.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    Script {
-        var a = 10;
-    }
-}
-
-
-
-
diff --git a/tests/auto/declarative/qmllanguage/data/script.8.errors.txt b/tests/auto/declarative/qmllanguage/data/script.8.errors.txt
deleted file mode 100644
index b5bf1a8..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-6:9:Invalid Script source value
diff --git a/tests/auto/declarative/qmllanguage/data/script.8.qml b/tests/auto/declarative/qmllanguage/data/script.8.qml
deleted file mode 100644
index f600c88..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.8.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    Script {
-        source: "test.js"
-        source: "test2.js"
-    }
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/script.9.errors.txt b/tests/auto/declarative/qmllanguage/data/script.9.errors.txt
deleted file mode 100644
index 41e8d46..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-5:9:Component elements may not contain script blocks
diff --git a/tests/auto/declarative/qmllanguage/data/script.9.qml b/tests/auto/declarative/qmllanguage/data/script.9.qml
deleted file mode 100644
index 79aa504..0000000
--- a/tests/auto/declarative/qmllanguage/data/script.9.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-Item {
-    Component {
-        Script {}
-    }
-}
diff --git a/tests/auto/declarative/qmllanguage/data/scriptString.qml b/tests/auto/declarative/qmllanguage/data/scriptString.qml
deleted file mode 100644
index 40a3bbe..0000000
--- a/tests/auto/declarative/qmllanguage/data/scriptString.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    scriptProperty: foo + bar
-    grouped.script: console.log(1921)
-}
diff --git a/tests/auto/declarative/qmllanguage/data/signal.1.errors.txt b/tests/auto/declarative/qmllanguage/data/signal.1.errors.txt
deleted file mode 100644
index 78d9960..0000000
--- a/tests/auto/declarative/qmllanguage/data/signal.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:12:Expected parameter type
diff --git a/tests/auto/declarative/qmllanguage/data/signal.1.qml b/tests/auto/declarative/qmllanguage/data/signal.1.qml
deleted file mode 100644
index fbaf017..0000000
--- a/tests/auto/declarative/qmllanguage/data/signal.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    signal mySignal(nontype a)
-}
diff --git a/tests/auto/declarative/qmllanguage/data/signal.2.errors.txt b/tests/auto/declarative/qmllanguage/data/signal.2.errors.txt
deleted file mode 100644
index fce8928..0000000
--- a/tests/auto/declarative/qmllanguage/data/signal.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:21:Unexpected token `;'
diff --git a/tests/auto/declarative/qmllanguage/data/signal.2.qml b/tests/auto/declarative/qmllanguage/data/signal.2.qml
deleted file mode 100644
index 5049192..0000000
--- a/tests/auto/declarative/qmllanguage/data/signal.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    signal mySignal(,)
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/signal.3.errors.txt b/tests/auto/declarative/qmllanguage/data/signal.3.errors.txt
deleted file mode 100644
index bf043ac..0000000
--- a/tests/auto/declarative/qmllanguage/data/signal.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-4:22:Expected token `identifier'
diff --git a/tests/auto/declarative/qmllanguage/data/signal.3.qml b/tests/auto/declarative/qmllanguage/data/signal.3.qml
deleted file mode 100644
index 9dd4cc7..0000000
--- a/tests/auto/declarative/qmllanguage/data/signal.3.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    signal mySignal(a)
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/simpleBindings.qml b/tests/auto/declarative/qmllanguage/data/simpleBindings.qml
deleted file mode 100644
index 2fcd1a5..0000000
--- a/tests/auto/declarative/qmllanguage/data/simpleBindings.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    id: me
-    property int v1: 10
-    property int v2: 11
-
-    property int value1
-    property int value2
-    property int value3
-    property int value4
-
-    value1: v1
-    value2: me.v1
-    value3: v1 + v2
-    value4: Math.min(v1, v2)
-
-    objectProperty: me
-}
diff --git a/tests/auto/declarative/qmllanguage/data/simpleContainer.qml b/tests/auto/declarative/qmllanguage/data/simpleContainer.qml
deleted file mode 100644
index c3a795f..0000000
--- a/tests/auto/declarative/qmllanguage/data/simpleContainer.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyContainer {
-    MyQmlObject {}
-    MyQmlObject {}
-}
diff --git a/tests/auto/declarative/qmllanguage/data/simpleObject.qml b/tests/auto/declarative/qmllanguage/data/simpleObject.qml
deleted file mode 100644
index 30c7823..0000000
--- a/tests/auto/declarative/qmllanguage/data/simpleObject.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Test 1.0
-MyQmlObject {}
diff --git a/tests/auto/declarative/qmllanguage/data/subdir/Test.qml b/tests/auto/declarative/qmllanguage/data/subdir/Test.qml
deleted file mode 100644
index c4d5905..0000000
--- a/tests/auto/declarative/qmllanguage/data/subdir/Test.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Qt 4.6
-Rectangle { }
diff --git a/tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml b/tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml
deleted file mode 100644
index c4d5905..0000000
--- a/tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Qt 4.6
-Rectangle { }
diff --git a/tests/auto/declarative/qmllanguage/data/test.js b/tests/auto/declarative/qmllanguage/data/test.js
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/auto/declarative/qmllanguage/data/test2.js b/tests/auto/declarative/qmllanguage/data/test2.js
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/auto/declarative/qmllanguage/data/unregisteredObject.errors.txt b/tests/auto/declarative/qmllanguage/data/unregisteredObject.errors.txt
deleted file mode 100644
index 347db05..0000000
--- a/tests/auto/declarative/qmllanguage/data/unregisteredObject.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-2:1:Type UnregisteredObjectType unavailable
diff --git a/tests/auto/declarative/qmllanguage/data/unregisteredObject.qml b/tests/auto/declarative/qmllanguage/data/unregisteredObject.qml
deleted file mode 100644
index 4969f62..0000000
--- a/tests/auto/declarative/qmllanguage/data/unregisteredObject.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Test 1.0
-UnregisteredObjectType {}
diff --git a/tests/auto/declarative/qmllanguage/data/unsupportedProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/unsupportedProperty.errors.txt
deleted file mode 100644
index 3cd626d..0000000
--- a/tests/auto/declarative/qmllanguage/data/unsupportedProperty.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:13:Invalid property assignment: unsupported type "QMatrix"
diff --git a/tests/auto/declarative/qmllanguage/data/unsupportedProperty.qml b/tests/auto/declarative/qmllanguage/data/unsupportedProperty.qml
deleted file mode 100644
index 9f19680..0000000
--- a/tests/auto/declarative/qmllanguage/data/unsupportedProperty.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    matrix: "1,0,0,0,1,0,0,0,1"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/valueTypes.qml b/tests/auto/declarative/qmllanguage/data/valueTypes.qml
deleted file mode 100644
index bf325a7..0000000
--- a/tests/auto/declarative/qmllanguage/data/valueTypes.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    rectProperty.x: 10
-    rectProperty.y: 11
-    rectProperty.width: rectProperty.x + 2
-    rectProperty.height: 13
-
-    intProperty: rectProperty.x
-
-    onAction: { var a = rectProperty; a.x = 12; }
-
-    rectProperty2: rectProperty
-}
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.1.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.1.errors.txt
deleted file mode 100644
index ba7a076..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.1.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:12:Invalid property assignment: int expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.1.qml b/tests/auto/declarative/qmllanguage/data/wrongType.1.qml
deleted file mode 100644
index 289d37f..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    value: "hello"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.10.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.10.errors.txt
deleted file mode 100644
index ae75b52..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.10.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:23:Invalid property assignment: datetime expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.10.qml b/tests/auto/declarative/qmllanguage/data/wrongType.10.qml
deleted file mode 100644
index 2cf0e50..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.10.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    dateTimeProperty: 12
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.11.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.11.errors.txt
deleted file mode 100644
index 23a4cda..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.11.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:20:Invalid property assignment: point expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.11.qml b/tests/auto/declarative/qmllanguage/data/wrongType.11.qml
deleted file mode 100644
index ae77ba1..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.11.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    pointProperty: "apples"
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.12.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.12.errors.txt
deleted file mode 100644
index 3092100..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.12.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: size expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.12.qml b/tests/auto/declarative/qmllanguage/data/wrongType.12.qml
deleted file mode 100644
index b7a366f..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.12.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    sizeProperty: "red"
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.13.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.13.errors.txt
deleted file mode 100644
index ba7a076..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.13.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:12:Invalid property assignment: int expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.13.qml b/tests/auto/declarative/qmllanguage/data/wrongType.13.qml
deleted file mode 100644
index 477aff1..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.13.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    value: "12"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.14.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.14.errors.txt
deleted file mode 100644
index d621fdd..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.14.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:21:Invalid property assignment: string expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.14.qml b/tests/auto/declarative/qmllanguage/data/wrongType.14.qml
deleted file mode 100644
index 672d693..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.14.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    stringProperty: 10
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.15.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.15.errors.txt
deleted file mode 100644
index 44768e3..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.15.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:18:Invalid property assignment: url expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.15.qml b/tests/auto/declarative/qmllanguage/data/wrongType.15.qml
deleted file mode 100644
index 633a5ba..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.15.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    urlProperty: 12
-}
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.2.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.2.errors.txt
deleted file mode 100644
index 9ff9f25..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.2.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:14:Invalid property assignment: boolean expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.2.qml b/tests/auto/declarative/qmllanguage/data/wrongType.2.qml
deleted file mode 100644
index 34b74f7..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.2.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    enabled: 5
-}
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.3.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.3.errors.txt
deleted file mode 100644
index 6d971c6..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.3.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:11:Invalid property assignment: rect expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.3.qml b/tests/auto/declarative/qmllanguage/data/wrongType.3.qml
deleted file mode 100644
index 384181a..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.3.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyQmlObject {
-    rect: "5,5x10"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.4.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.4.errors.txt
deleted file mode 100644
index ef34d0e..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.4.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: unknown enumeration
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.4.qml b/tests/auto/declarative/qmllanguage/data/wrongType.4.qml
deleted file mode 100644
index 0787bf5..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.4.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    enumProperty: "InvalidEnumName"
-}
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.5.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.5.errors.txt
deleted file mode 100644
index cab10bd..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.5.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: unsigned int expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.5.qml b/tests/auto/declarative/qmllanguage/data/wrongType.5.qml
deleted file mode 100644
index c50ae9a..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.5.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    uintProperty: -13
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.6.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.6.errors.txt
deleted file mode 100644
index d0a0b00..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.6.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: double expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.6.qml b/tests/auto/declarative/qmllanguage/data/wrongType.6.qml
deleted file mode 100644
index da10b78..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.6.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    realProperty: "Hello"
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.7.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.7.errors.txt
deleted file mode 100644
index 614346b..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.7.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:20:Invalid property assignment: color expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.7.qml b/tests/auto/declarative/qmllanguage/data/wrongType.7.qml
deleted file mode 100644
index ddc3835..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.7.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    colorProperty: 12
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.8.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.8.errors.txt
deleted file mode 100644
index 1773c00..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.8.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: date expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.8.qml b/tests/auto/declarative/qmllanguage/data/wrongType.8.qml
deleted file mode 100644
index a5f6756..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.8.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    dateProperty: 12
-}
-
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.9.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.9.errors.txt
deleted file mode 100644
index 8630975..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.9.errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-3:19:Invalid property assignment: time expected
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.9.qml b/tests/auto/declarative/qmllanguage/data/wrongType.9.qml
deleted file mode 100644
index a3db732..0000000
--- a/tests/auto/declarative/qmllanguage/data/wrongType.9.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-MyTypeObject {
-    timeProperty: 12
-}
-
diff --git a/tests/auto/declarative/qmllanguage/qmllanguage.pro b/tests/auto/declarative/qmllanguage/qmllanguage.pro
deleted file mode 100644
index d1876ef..0000000
--- a/tests/auto/declarative/qmllanguage/qmllanguage.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += script network
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmllanguage.cpp \
-           testtypes.cpp
-HEADERS += testtypes.h
-
-INCLUDEPATH += ../shared/
-HEADERS += ../shared/testhttpserver.h
-SOURCES += ../shared/testhttpserver.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/LocalInternal.qml b/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/LocalInternal.qml
deleted file mode 100644
index 836c20a..0000000
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/LocalInternal.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-Image { source: "pics/blue.png" }
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/Test.qml b/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/Test.qml
deleted file mode 100644
index c4d5905..0000000
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/Test.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import Qt 4.6
-Rectangle { }
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestLocal.qml b/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestLocal.qml
deleted file mode 100644
index 11443ca..0000000
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestLocal.qml
+++ /dev/null
@@ -1 +0,0 @@
-LocalInternal {}
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestSubDir.qml b/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestSubDir.qml
deleted file mode 100644
index 0dfede4..0000000
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestSubDir.qml
+++ /dev/null
@@ -1,2 +0,0 @@
-import "subdir"
-SubTest { }
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/pics/blue.png b/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/pics/blue.png
deleted file mode 100644
index 46f815f..0000000
Binary files a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/pics/blue.png and /dev/null differ
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/qmldir b/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/qmldir
deleted file mode 100644
index b32f82b..0000000
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-Test 0.0 Test.qml
-TestSubDir 0.0 TestSubDir.qml
-TestLocal 0.0 TestLocal.qml
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml b/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
deleted file mode 100644
index 0ea9ec6..0000000
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-Text {}
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/qmldir b/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/qmldir
deleted file mode 100644
index f7016c7..0000000
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-SubTest 0.0 SubTest.qml
diff --git a/tests/auto/declarative/qmllanguage/testtypes.cpp b/tests/auto/declarative/qmllanguage/testtypes.cpp
deleted file mode 100644
index 9ffe28a..0000000
--- a/tests/auto/declarative/qmllanguage/testtypes.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "testtypes.h"
-
-void registerTypes()
-{
-    QML_REGISTER_INTERFACE(MyInterface);
-    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
-    QML_REGISTER_TYPE(Test,1,0,MyTypeObject,MyTypeObject);
-    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
-    QML_REGISTER_TYPE(Test,1,0,MyPropertyValueSource,MyPropertyValueSource);
-    QML_REGISTER_TYPE(Test,1,0,MyDotPropertyObject,MyDotPropertyObject);
-    QML_REGISTER_TYPE(Test,1,0,MyNamespacedType,MyNamespace::MyNamespacedType);
-    QML_REGISTER_TYPE(Test,1,0,MySecondNamespacedType,MyNamespace::MySecondNamespacedType);
-    QML_REGISTER_NOCREATE_TYPE(MyGroupedObject);
-}
-
-QVariant myCustomVariantTypeConverter(const QString &data)
-{
-    MyCustomVariantType rv;
-    rv.a = data.toInt();
-    return QVariant::fromValue(rv);
-}
-
diff --git a/tests/auto/declarative/qmllanguage/testtypes.h b/tests/auto/declarative/qmllanguage/testtypes.h
deleted file mode 100644
index 9fd0973..0000000
--- a/tests/auto/declarative/qmllanguage/testtypes.h
+++ /dev/null
@@ -1,547 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef TESTTYPES_H
-#define TESTTYPES_H
-
-#include <QtCore/qobject.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qdatetime.h>
-#include <QtGui/qmatrix.h>
-#include <QtGui/qcolor.h>
-#include <QtGui/qvector3d.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlparserstatus.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qmlscriptstring.h>
-
-QVariant myCustomVariantTypeConverter(const QString &data);
-
-class MyInterface 
-{
-public:
-    MyInterface() : id(913) {}
-    int id;
-};
-Q_DECLARE_INTERFACE(MyInterface, "com.trolltech.Qt.Test.MyInterface");
-QML_DECLARE_INTERFACE(MyInterface);
-
-struct MyCustomVariantType
-{
-    MyCustomVariantType() : a(0) {}
-    int a;
-};
-Q_DECLARE_METATYPE(MyCustomVariantType);
-
-class MyAttachedObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int value READ value WRITE setValue)
-    Q_PROPERTY(int value2 READ value2 WRITE setValue2)
-public:
-    MyAttachedObject(QObject *parent) : QObject(parent), m_value(0), m_value2(0) {}
-
-    int value() const { return m_value; }
-    void setValue(int v) { m_value = v; }
-
-    int value2() const { return m_value2; }
-    void setValue2(int v) { m_value2 = v; }
-
-private:
-    int m_value;
-    int m_value2;
-};
-
-class MyQmlObject : public QObject, public MyInterface, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_PROPERTY(int value READ value WRITE setValue FINAL)
-    Q_PROPERTY(QString readOnlyString READ readOnlyString)
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
-    Q_PROPERTY(QRect rect READ rect WRITE setRect)
-    Q_PROPERTY(QMatrix matrix READ matrix WRITE setMatrix)  //assumed to be unsupported by QML
-    Q_PROPERTY(MyInterface *interfaceProperty READ interface WRITE setInterface)
-    Q_PROPERTY(int onLiteralSignal READ onLiteralSignal WRITE setOnLiteralSignal);
-    Q_PROPERTY(MyCustomVariantType customType READ customType WRITE setCustomType);
-    Q_PROPERTY(MyQmlObject *qmlobjectProperty READ qmlobject WRITE setQmlobject)
-
-    Q_INTERFACES(MyInterface QmlParserStatus)
-public:
-    MyQmlObject() : m_value(-1), m_interface(0), m_qmlobject(0) { qRegisterMetaType<MyCustomVariantType>("MyCustomVariantType"); }
-
-    int value() const { return m_value; }
-    void setValue(int v) { m_value = v; }
-
-    QString readOnlyString() const { return QLatin1String(""); }
-
-    bool enabled() const { return false; }
-    void setEnabled(bool) {}
-
-    QRect rect() const { return QRect(); }
-    void setRect(const QRect&) {}
-
-    QMatrix matrix() const { return QMatrix(); }
-    void setMatrix(const QMatrix&) {}
-
-    MyInterface *interface() const { return m_interface; }
-    void setInterface(MyInterface *iface) { m_interface = iface; }
-
-    static MyAttachedObject *qmlAttachedProperties(QObject *other) {
-        return new MyAttachedObject(other);
-    }
-    Q_CLASSINFO("DefaultMethod", "basicSlot()");
-
-    int onLiteralSignal() const { return m_value; }
-    void setOnLiteralSignal(int v) { m_value = v; }
-
-    MyQmlObject *qmlobject() const { return m_qmlobject; }
-    void setQmlobject(MyQmlObject *o) { m_qmlobject = o; }
-
-    MyCustomVariantType customType() const { return m_custom; }
-    void setCustomType(const MyCustomVariantType &v)  { m_custom = v; }
-public slots:
-    void basicSlot() { qWarning("MyQmlObject::basicSlot"); }
-    void basicSlotWithArgs(int v) { qWarning("MyQmlObject::basicSlotWithArgs(%d)", v); }
-
-signals:
-    void basicSignal();
-    void basicParameterizedSignal(int parameter);
-
-private:
-    friend class tst_qmllanguage;
-    int m_value;
-    MyInterface *m_interface;
-    MyQmlObject *m_qmlobject;
-    MyCustomVariantType m_custom;
-};
-QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(MyQmlObject);
-
-class MyGroupedObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QmlScriptString script READ script WRITE setScript);
-public:
-    QmlScriptString script() const { return m_script; }
-    void setScript(const QmlScriptString &s) { m_script = s; }
-
-private:
-    QmlScriptString m_script;
-};
-
-QML_DECLARE_TYPE(MyGroupedObject);
-
-
-class MyTypeObject : public QObject
-{
-    Q_OBJECT
-    Q_ENUMS(MyEnum)
-    Q_FLAGS(MyFlags)
-
-    Q_PROPERTY(QString id READ id WRITE setId);
-    Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty);
-    Q_PROPERTY(QmlComponent *componentProperty READ componentProperty WRITE setComponentProperty);
-    Q_PROPERTY(MyFlags flagProperty READ flagProperty WRITE setFlagProperty);
-    Q_PROPERTY(MyEnum enumProperty READ enumProperty WRITE setEnumProperty);
-    Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty);
-    Q_PROPERTY(uint uintProperty READ uintProperty WRITE setUintProperty);
-    Q_PROPERTY(int intProperty READ intProperty WRITE setIntProperty);
-    Q_PROPERTY(qreal realProperty READ realProperty WRITE setRealProperty);
-    Q_PROPERTY(double doubleProperty READ doubleProperty WRITE setDoubleProperty);
-    Q_PROPERTY(float floatProperty READ floatProperty WRITE setFloatProperty);
-    Q_PROPERTY(QColor colorProperty READ colorProperty WRITE setColorProperty);
-    Q_PROPERTY(QDate dateProperty READ dateProperty WRITE setDateProperty);
-    Q_PROPERTY(QTime timeProperty READ timeProperty WRITE setTimeProperty);
-    Q_PROPERTY(QDateTime dateTimeProperty READ dateTimeProperty WRITE setDateTimeProperty);
-    Q_PROPERTY(QPoint pointProperty READ pointProperty WRITE setPointProperty);
-    Q_PROPERTY(QPointF pointFProperty READ pointFProperty WRITE setPointFProperty);
-    Q_PROPERTY(QSize sizeProperty READ sizeProperty WRITE setSizeProperty);
-    Q_PROPERTY(QSizeF sizeFProperty READ sizeFProperty WRITE setSizeFProperty);
-    Q_PROPERTY(QRect rectProperty READ rectProperty WRITE setRectProperty NOTIFY rectPropertyChanged);
-    Q_PROPERTY(QRect rectProperty2 READ rectProperty2 WRITE setRectProperty2);
-    Q_PROPERTY(QRectF rectFProperty READ rectFProperty WRITE setRectFProperty);
-    Q_PROPERTY(bool boolProperty READ boolProperty WRITE setBoolProperty);
-    Q_PROPERTY(QVariant variantProperty READ variantProperty WRITE setVariantProperty);
-    Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty);
-    Q_PROPERTY(QUrl urlProperty READ urlProperty WRITE setUrlProperty);
-
-    Q_PROPERTY(QmlScriptString scriptProperty READ scriptProperty WRITE setScriptProperty);
-    Q_PROPERTY(MyGroupedObject *grouped READ grouped CONSTANT);
-    Q_PROPERTY(MyGroupedObject *nullGrouped READ nullGrouped CONSTANT);
-
-public:
-    MyTypeObject()
-        : objectPropertyValue(0), componentPropertyValue(0) {}
-
-    QString idValue;
-    QString id() const {
-        return idValue;
-    }
-    void setId(const QString &v) {
-        idValue = v;
-    }
-
-    QObject *objectPropertyValue;
-    QObject *objectProperty() const {
-        return objectPropertyValue;
-    }
-    void setObjectProperty(QObject *v) {
-        objectPropertyValue = v;
-    }
-
-    QmlComponent *componentPropertyValue;
-    QmlComponent *componentProperty() const {
-        return componentPropertyValue;
-    }
-    void setComponentProperty(QmlComponent *v) {
-        componentPropertyValue = v;
-    }
-
-    enum MyFlag { FlagVal1 = 0x01, FlagVal2 = 0x02, FlagVal3 = 0x04 };
-    Q_DECLARE_FLAGS(MyFlags, MyFlag)
-    MyFlags flagPropertyValue;
-    MyFlags flagProperty() const {
-        return flagPropertyValue;
-    }
-    void setFlagProperty(MyFlags v) {
-        flagPropertyValue = v;
-    }
-
-    enum MyEnum { EnumVal1, EnumVal2 };
-    MyEnum enumPropertyValue;
-    MyEnum enumProperty() const {
-        return enumPropertyValue;
-    }
-    void setEnumProperty(MyEnum v) {
-        enumPropertyValue = v;
-    }
-
-    QString stringPropertyValue;
-    QString stringProperty() const {
-       return stringPropertyValue;
-    }
-    void setStringProperty(const QString &v) {
-        stringPropertyValue = v;
-    }
-
-    uint uintPropertyValue;
-    uint uintProperty() const {
-       return uintPropertyValue;
-    }
-    void setUintProperty(const uint &v) {
-        uintPropertyValue = v;
-    }
-
-    int intPropertyValue;
-    int intProperty() const {
-       return intPropertyValue;
-    }
-    void setIntProperty(const int &v) {
-        intPropertyValue = v;
-    }
-
-    qreal realPropertyValue;
-    qreal realProperty() const {
-       return realPropertyValue;
-    }
-    void setRealProperty(const qreal &v) {
-        realPropertyValue = v;
-    }
-
-    double doublePropertyValue;
-    double doubleProperty() const {
-       return doublePropertyValue;
-    }
-    void setDoubleProperty(const double &v) {
-        doublePropertyValue = v;
-    }
-
-    float floatPropertyValue;
-    float floatProperty() const {
-       return floatPropertyValue;
-    }
-    void setFloatProperty(const float &v) {
-        floatPropertyValue = v;
-    }
-
-    QColor colorPropertyValue;
-    QColor colorProperty() const {
-       return colorPropertyValue;
-    }
-    void setColorProperty(const QColor &v) {
-        colorPropertyValue = v;
-    }
-
-    QDate datePropertyValue;
-    QDate dateProperty() const {
-       return datePropertyValue;
-    }
-    void setDateProperty(const QDate &v) {
-        datePropertyValue = v;
-    }
-
-    QTime timePropertyValue;
-    QTime timeProperty() const {
-       return timePropertyValue;
-    }
-    void setTimeProperty(const QTime &v) {
-        timePropertyValue = v;
-    }
-
-    QDateTime dateTimePropertyValue;
-    QDateTime dateTimeProperty() const {
-       return dateTimePropertyValue;
-    }
-    void setDateTimeProperty(const QDateTime &v) {
-        dateTimePropertyValue = v;
-    }
-
-    QPoint pointPropertyValue;
-    QPoint pointProperty() const {
-       return pointPropertyValue;
-    }
-    void setPointProperty(const QPoint &v) {
-        pointPropertyValue = v;
-    }
-
-    QPointF pointFPropertyValue;
-    QPointF pointFProperty() const {
-       return pointFPropertyValue;
-    }
-    void setPointFProperty(const QPointF &v) {
-        pointFPropertyValue = v;
-    }
-
-    QSize sizePropertyValue;
-    QSize sizeProperty() const {
-       return sizePropertyValue;
-    }
-    void setSizeProperty(const QSize &v) {
-        sizePropertyValue = v;
-    }
-
-    QSizeF sizeFPropertyValue;
-    QSizeF sizeFProperty() const {
-       return sizeFPropertyValue;
-    }
-    void setSizeFProperty(const QSizeF &v) {
-        sizeFPropertyValue = v;
-    }
-
-    QRect rectPropertyValue;
-    QRect rectProperty() const {
-       return rectPropertyValue;
-    }
-    void setRectProperty(const QRect &v) {
-        rectPropertyValue = v;
-        emit rectPropertyChanged();
-    }
-
-    QRect rectPropertyValue2;
-    QRect rectProperty2() const {
-       return rectPropertyValue2;
-    }
-    void setRectProperty2(const QRect &v) {
-        rectPropertyValue2 = v;
-    }
-
-    QRectF rectFPropertyValue;
-    QRectF rectFProperty() const {
-       return rectFPropertyValue;
-    }
-    void setRectFProperty(const QRectF &v) {
-        rectFPropertyValue = v;
-    }
-
-    bool boolPropertyValue;
-    bool boolProperty() const {
-       return boolPropertyValue;
-    }
-    void setBoolProperty(const bool &v) {
-        boolPropertyValue = v;
-    }
-
-    QVariant variantPropertyValue;
-    QVariant variantProperty() const {
-       return variantPropertyValue;
-    }
-    void setVariantProperty(const QVariant &v) {
-        variantPropertyValue = v;
-    }
-
-    QVector3D vectorPropertyValue;
-    QVector3D vectorProperty() const {
-        return vectorPropertyValue;
-    }
-    void setVectorProperty(const QVector3D &v) {
-        vectorPropertyValue = v;
-    }
-
-    QUrl urlPropertyValue;
-    QUrl urlProperty() const {
-        return urlPropertyValue;
-    }
-    void setUrlProperty(const QUrl &v) {
-        urlPropertyValue = v;
-    }
-
-    QmlScriptString scriptPropertyValue;
-    QmlScriptString scriptProperty() const {
-        return scriptPropertyValue;
-    }
-    void setScriptProperty(const QmlScriptString &v) {
-        scriptPropertyValue = v;
-    }
-
-    MyGroupedObject groupedValue;
-    MyGroupedObject *grouped() { return &groupedValue; }
-
-    MyGroupedObject *nullGrouped() { return 0; }
-
-    void doAction() { emit action(); }
-signals:
-    void action();
-    void rectPropertyChanged();
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(MyTypeObject::MyFlags)
-QML_DECLARE_TYPE(MyTypeObject);
-
-class MyContainer : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QmlListProperty<QObject> children READ children)
-    Q_PROPERTY(QmlListProperty<MyInterface> qlistInterfaces READ qlistInterfaces)
-    Q_CLASSINFO("DefaultProperty", "children");
-public:
-    MyContainer() {}
-
-    QmlListProperty<QObject> children() { return QmlListProperty<QObject>(this, m_children); }
-    QList<QObject *> *getChildren() { return &m_children; }
-    QmlListProperty<MyInterface> qlistInterfaces() { return QmlListProperty<MyInterface>(this, m_interfaces); }
-    QList<MyInterface *> *getQListInterfaces() { return &m_interfaces; }
-
-    QList<QObject*> m_children;
-    QList<MyInterface *> m_interfaces;
-};
-
-QML_DECLARE_TYPE(MyContainer);
-
-
-class MyPropertyValueSource : public QObject, public QmlPropertyValueSource
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlPropertyValueSource)
-public:
-    MyPropertyValueSource()
-        : QmlPropertyValueSource() {}
-
-    QmlMetaProperty prop;
-    virtual void setTarget(const QmlMetaProperty &p)
-    {
-        prop = p;
-    }
-};
-QML_DECLARE_TYPE(MyPropertyValueSource);
-
-class MyDotPropertyObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(MyQmlObject *obj READ obj)
-    Q_PROPERTY(MyQmlObject *readWriteObj READ readWriteObj WRITE setReadWriteObj)
-public:
-    MyDotPropertyObject() : m_rwobj(0), m_ownRWObj(false) {}
-    ~MyDotPropertyObject()
-    {
-        if (m_ownRWObj)
-            delete m_rwobj;
-    }
-
-    MyQmlObject *obj() { return 0; }
-
-    MyQmlObject *readWriteObj()
-    {
-        if (!m_rwobj) {
-            m_rwobj = new MyQmlObject;
-            m_ownRWObj = true;
-        }
-        return m_rwobj;
-    }
-
-    void setReadWriteObj(MyQmlObject *obj)
-    {
-        if (m_ownRWObj) {
-            delete m_rwobj;
-            m_ownRWObj = false;
-        }
-
-        m_rwobj = obj;
-    }
-
-private:
-    MyQmlObject *m_rwobj;
-    bool m_ownRWObj;
-};
-
-QML_DECLARE_TYPE(MyDotPropertyObject);
-
-namespace MyNamespace {
-    class MyNamespacedType : public QObject
-    {
-        Q_OBJECT
-    };
-
-    class MySecondNamespacedType : public QObject
-    {
-        Q_OBJECT
-        Q_PROPERTY(QmlListProperty<MyNamespace::MyNamespacedType> list READ list);
-    public:
-        QmlListProperty<MyNamespacedType> list() { return QmlListProperty<MyNamespacedType>(this, m_list); }
-
-    private:
-        QList<MyNamespacedType *> m_list;
-    };
-}
-QML_DECLARE_TYPE(MyNamespace::MyNamespacedType);
-QML_DECLARE_TYPE(MyNamespace::MySecondNamespacedType);
-
-void registerTypes();
-
-#endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
deleted file mode 100644
index ecdd33a..0000000
--- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
+++ /dev/null
@@ -1,1385 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtCore/qfile.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qdir.h>
-#include <private/qmlmetaproperty_p.h>
-#include "testtypes.h"
-
-#include "../../../shared/util.h"
-
-/*
-This test case covers QML language issues.  This covers everything that does not
-involve evaluating ECMAScript expressions and bindings.
-
-Evaluation of expressions and bindings is covered in qmlecmascript
-*/
-class tst_qmllanguage : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmllanguage() {
-        QmlMetaType::registerCustomStringConverter(qMetaTypeId<MyCustomVariantType>(), myCustomVariantTypeConverter);
-        QFileInfo fileInfo(__FILE__);
-        engine.addImportPath(fileInfo.absoluteDir().filePath(QLatin1String("data/lib")));
-    }
-
-private slots:
-    void initTestCase();
-    void cleanupTestCase();
-
-    void errors_data();
-    void errors();
-
-    void simpleObject();
-    void simpleContainer();
-    void interfaceProperty();
-    void interfaceQList();
-    void assignObjectToSignal();
-    void assignObjectToVariant();
-    void assignLiteralSignalProperty();
-    void assignQmlComponent();
-    void assignBasicTypes();
-    void assignTypeExtremes();
-    void assignCompositeToType();
-    void customParserTypes();
-    void rootAsQmlComponent();
-    void inlineQmlComponents();
-    void idProperty();
-    void assignSignal();
-    void dynamicProperties();
-    void dynamicPropertiesNested();
-    void listProperties();
-    void dynamicObjectProperties();
-    void dynamicSignalsAndSlots();
-    void simpleBindings();
-    void autoComponentCreation();
-    void propertyValueSource();
-    void attachedProperties();
-    void dynamicObjects();
-    void customVariantTypes();
-    void valueTypes();
-    void cppnamespace();
-    void aliasProperties();
-    void componentCompositeType();
-    void i18n();
-    void i18n_data();
-    void onCompleted();
-    void scriptString();
-    void defaultPropertyListOrder();
-    void declaredPropertyValues();
-
-    void importsBuiltin_data();
-    void importsBuiltin();
-    void importsLocal_data();
-    void importsLocal();
-    void importsRemote_data();
-    void importsRemote();
-    void importsInstalled_data();
-    void importsInstalled();
-    void importsOrder_data();
-    void importsOrder();
-
-    void qmlAttachedPropertiesObjectMethod();
-
-    // regression tests for crashes
-    void crash1();
-    void crash2();
-
-private:
-    QmlEngine engine;
-    void testType(const QString& qml, const QString& type);
-};
-
-#define VERIFY_ERRORS(errorfile) \
-    if (!errorfile) { \
-        if (qgetenv("DEBUG") != "" && !component.errors().isEmpty()) \
-            qWarning() << "Unexpected Errors:" << component.errors(); \
-        QVERIFY(!component.isError()); \
-        QVERIFY(component.errors().isEmpty()); \
-    } else { \
-        QFile file(QLatin1String(SRCDIR) + QLatin1String("/data/") + QLatin1String(errorfile)); \
-        QVERIFY(file.open(QIODevice::ReadOnly)); \
-        QByteArray data = file.readAll(); \
-        file.close(); \
-        QList<QByteArray> expected = data.split('\n'); \
-        expected.removeAll(QByteArray("")); \
-        QList<QmlError> errors = component.errors(); \
-        QList<QByteArray> actual; \
-        for (int ii = 0; ii < errors.count(); ++ii) { \
-            const QmlError &error = errors.at(ii); \
-            QByteArray errorStr = QByteArray::number(error.line()) + ":" +  \
-                                  QByteArray::number(error.column()) + ":" + \
-                                  error.description().toUtf8(); \
-            actual << errorStr; \
-        } \
-        if (qgetenv("DEBUG") != "" && expected != actual) \
-            qWarning() << "Expected:" << expected << "Actual:" << actual;  \
-        if (qgetenv("QMLLANGUAGE_UPDATEERRORS") != "" && expected != actual) {\
-            QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
-            QVERIFY(file.open(QIODevice::WriteOnly)); \
-            for (int ii = 0; ii < actual.count(); ++ii) { \
-                file.write(actual.at(ii)); file.write("\n"); \
-            } \
-            file.close(); \
-        } else { \
-            QCOMPARE(expected, actual); \
-        } \
-    }
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    QFileInfo fileInfo(__FILE__);
-    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(QLatin1String("data/") + filename));
-}
-
-inline QUrl TEST_FILE(const char *filename)
-{
-    return TEST_FILE(QLatin1String(filename));
-}
-
-void tst_qmllanguage::initTestCase()
-{
-    registerTypes();
-
-    QML_REGISTER_TYPE(com.nokia.Test, 0, 0, TestTP, TestType)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 0, Test, TestType)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 5, Test, TestType)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 8, Test, TestType2)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 9, OldTest, TestType)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 12, Test, TestType2)
-
-    // Create locale-specific file
-    // For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit
-    // For iso8859-1 locale, this will just be data/I18nType?????.qml where ????? is 5 8-bit characters
-    // For utf-8 locale, this will be data/I18nType??????????.qml where ?????????? is 5 8-bit characters, UTF-8 encoded
-    QFile in(TEST_FILE(QLatin1String("I18nType30.qml")).toLocalFile());
-    QVERIFY(in.open(QIODevice::ReadOnly));
-    QFile out(TEST_FILE(QString::fromUtf8("I18nType\303\201\303\242\303\243\303\244\303\245.qml")).toLocalFile());
-    QVERIFY(out.open(QIODevice::WriteOnly));
-    out.write(in.readAll());
-}
-
-void tst_qmllanguage::cleanupTestCase()
-{
-    QVERIFY(QFile::remove(TEST_FILE(QString::fromUtf8("I18nType\303\201\303\242\303\243\303\244\303\245.qml")).toLocalFile()));
-}
-
-void tst_qmllanguage::errors_data()
-{
-    QTest::addColumn<QString>("file");
-    QTest::addColumn<QString>("errorFile");
-    QTest::addColumn<bool>("create");
-
-    QTest::newRow("nonexistantProperty.1") << "nonexistantProperty.1.qml" << "nonexistantProperty.1.errors.txt" << false;
-    QTest::newRow("nonexistantProperty.2") << "nonexistantProperty.2.qml" << "nonexistantProperty.2.errors.txt" << false;
-    QTest::newRow("nonexistantProperty.3") << "nonexistantProperty.3.qml" << "nonexistantProperty.3.errors.txt" << false;
-    QTest::newRow("nonexistantProperty.4") << "nonexistantProperty.4.qml" << "nonexistantProperty.4.errors.txt" << false;
-    QTest::newRow("nonexistantProperty.5") << "nonexistantProperty.5.qml" << "nonexistantProperty.5.errors.txt" << false;
-    QTest::newRow("nonexistantProperty.6") << "nonexistantProperty.6.qml" << "nonexistantProperty.6.errors.txt" << false;
-
-    QTest::newRow("wrongType (string for int)") << "wrongType.1.qml" << "wrongType.1.errors.txt" << false;
-    QTest::newRow("wrongType (int for bool)") << "wrongType.2.qml" << "wrongType.2.errors.txt" << false;
-    QTest::newRow("wrongType (bad rect)") << "wrongType.3.qml" << "wrongType.3.errors.txt" << false;
-
-    QTest::newRow("wrongType (invalid enum)") << "wrongType.4.qml" << "wrongType.4.errors.txt" << false;
-    QTest::newRow("wrongType (int for uint)") << "wrongType.5.qml" << "wrongType.5.errors.txt" << false;
-    QTest::newRow("wrongType (string for real)") << "wrongType.6.qml" << "wrongType.6.errors.txt" << false;
-    QTest::newRow("wrongType (int for color)") << "wrongType.7.qml" << "wrongType.7.errors.txt" << false;
-    QTest::newRow("wrongType (int for date)") << "wrongType.8.qml" << "wrongType.8.errors.txt" << false;
-    QTest::newRow("wrongType (int for time)") << "wrongType.9.qml" << "wrongType.9.errors.txt" << false;
-    QTest::newRow("wrongType (int for datetime)") << "wrongType.10.qml" << "wrongType.10.errors.txt" << false;
-    QTest::newRow("wrongType (string for point)") << "wrongType.11.qml" << "wrongType.11.errors.txt" << false;
-    QTest::newRow("wrongType (color for size)") << "wrongType.12.qml" << "wrongType.12.errors.txt" << false;
-    QTest::newRow("wrongType (number string for int)") << "wrongType.13.qml" << "wrongType.13.errors.txt" << false;
-    QTest::newRow("wrongType (int for string)") << "wrongType.14.qml" << "wrongType.14.errors.txt" << false;
-    QTest::newRow("wrongType (int for url)") << "wrongType.15.qml" << "wrongType.15.errors.txt" << false;
-
-    QTest::newRow("readOnly.1") << "readOnly.1.qml" << "readOnly.1.errors.txt" << false;
-    QTest::newRow("readOnly.2") << "readOnly.2.qml" << "readOnly.2.errors.txt" << false;
-    QTest::newRow("readOnly.3") << "readOnly.3.qml" << "readOnly.3.errors.txt" << false;
-
-    QTest::newRow("listAssignment.2") << "listAssignment.2.qml" << "listAssignment.2.errors.txt" << false;
-    QTest::newRow("listAssignment.3") << "listAssignment.3.qml" << "listAssignment.3.errors.txt" << false;
-
-    QTest::newRow("invalidID.1") << "invalidID.qml" << "invalidID.errors.txt" << false;
-    QTest::newRow("invalidID.2") << "invalidID.2.qml" << "invalidID.2.errors.txt" << false;
-    QTest::newRow("invalidID.3") << "invalidID.3.qml" << "invalidID.3.errors.txt" << false;
-    QTest::newRow("invalidID.4") << "invalidID.4.qml" << "invalidID.4.errors.txt" << false;
-    QTest::newRow("invalidID.5") << "invalidID.5.qml" << "invalidID.5.errors.txt" << false;
-    QTest::newRow("invalidID.6") << "invalidID.6.qml" << "invalidID.6.errors.txt" << false;
-
-    QTest::newRow("unsupportedProperty") << "unsupportedProperty.qml" << "unsupportedProperty.errors.txt" << false;
-    QTest::newRow("nullDotProperty") << "nullDotProperty.qml" << "nullDotProperty.errors.txt" << true;
-    QTest::newRow("fakeDotProperty") << "fakeDotProperty.qml" << "fakeDotProperty.errors.txt" << false;
-    QTest::newRow("duplicateIDs") << "duplicateIDs.qml" << "duplicateIDs.errors.txt" << false;
-    QTest::newRow("unregisteredObject") << "unregisteredObject.qml" << "unregisteredObject.errors.txt" << false;
-    QTest::newRow("empty") << "empty.qml" << "empty.errors.txt" << false;
-    QTest::newRow("missingObject") << "missingObject.qml" << "missingObject.errors.txt" << false;
-    QTest::newRow("failingComponent") << "failingComponentTest.qml" << "failingComponent.errors.txt" << false;
-    QTest::newRow("missingSignal") << "missingSignal.qml" << "missingSignal.errors.txt" << false;
-    QTest::newRow("finalOverride") << "finalOverride.qml" << "finalOverride.errors.txt" << false;
-    QTest::newRow("customParserIdNotAllowed") << "customParserIdNotAllowed.qml" << "customParserIdNotAllowed.errors.txt" << false;
-
-    QTest::newRow("invalidGroupedProperty.1") << "invalidGroupedProperty.1.qml" << "invalidGroupedProperty.1.errors.txt" << false;
-    QTest::newRow("invalidGroupedProperty.2") << "invalidGroupedProperty.2.qml" << "invalidGroupedProperty.2.errors.txt" << false;
-    QTest::newRow("invalidGroupedProperty.3") << "invalidGroupedProperty.3.qml" << "invalidGroupedProperty.3.errors.txt" << false;
-    QTest::newRow("invalidGroupedProperty.4") << "invalidGroupedProperty.4.qml" << "invalidGroupedProperty.4.errors.txt" << false;
-    QTest::newRow("invalidGroupedProperty.5") << "invalidGroupedProperty.5.qml" << "invalidGroupedProperty.5.errors.txt" << false;
-    QTest::newRow("invalidGroupedProperty.6") << "invalidGroupedProperty.6.qml" << "invalidGroupedProperty.6.errors.txt" << false;
-    QTest::newRow("invalidGroupedProperty.7") << "invalidGroupedProperty.7.qml" << "invalidGroupedProperty.7.errors.txt" << true;
-
-    QTest::newRow("importNamespaceConflict") << "importNamespaceConflict.qml" << "importNamespaceConflict.errors.txt" << false;
-    QTest::newRow("importVersionMissing (builtin)") << "importVersionMissingBuiltIn.qml" << "importVersionMissingBuiltIn.errors.txt" << false;
-    QTest::newRow("importVersionMissing (installed)") << "importVersionMissingInstalled.qml" << "importVersionMissingInstalled.errors.txt" << false;
-    QTest::newRow("invalidImportID") << "invalidImportID.qml" << "invalidImportID.errors.txt" << false;
-
-    QTest::newRow("signal.1") << "signal.1.qml" << "signal.1.errors.txt" << false;
-    QTest::newRow("signal.2") << "signal.2.qml" << "signal.2.errors.txt" << false;
-    QTest::newRow("signal.3") << "signal.3.qml" << "signal.3.errors.txt" << false;
-
-    QTest::newRow("property.1") << "property.1.qml" << "property.1.errors.txt" << false;
-    QTest::newRow("property.2") << "property.2.qml" << "property.2.errors.txt" << false;
-    QTest::newRow("property.3") << "property.3.qml" << "property.3.errors.txt" << false;
-    QTest::newRow("property.4") << "property.4.qml" << "property.4.errors.txt" << false;
-    QTest::newRow("property.5") << "property.5.qml" << "property.5.errors.txt" << false;
-
-    QTest::newRow("Script.1") << "script.1.qml" << "script.1.errors.txt" << false;
-    QTest::newRow("Script.2") << "script.2.qml" << "script.2.errors.txt" << false;
-    QTest::newRow("Script.3") << "script.3.qml" << "script.3.errors.txt" << false;
-    QTest::newRow("Script.4") << "script.4.qml" << "script.4.errors.txt" << false;
-    QTest::newRow("Script.5") << "script.5.qml" << "script.5.errors.txt" << false;
-    QTest::newRow("Script.6") << "script.6.qml" << "script.6.errors.txt" << false;
-    QTest::newRow("Script.7") << "script.7.qml" << "script.7.errors.txt" << false;
-    QTest::newRow("Script.8") << "script.8.qml" << "script.8.errors.txt" << false;
-    QTest::newRow("Script.9") << "script.9.qml" << "script.9.errors.txt" << false;
-    QTest::newRow("Script.10") << "script.10.qml" << "script.10.errors.txt" << false;
-    QTest::newRow("Script.11") << "script.11.qml" << "script.11.errors.txt" << false;
-    QTest::newRow("Script.12") << "script.12.qml" << "script.12.errors.txt" << false;
-
-    QTest::newRow("Component.1") << "component.1.qml" << "component.1.errors.txt" << false;
-    QTest::newRow("Component.2") << "component.2.qml" << "component.2.errors.txt" << false;
-    QTest::newRow("Component.3") << "component.3.qml" << "component.3.errors.txt" << false;
-    QTest::newRow("Component.4") << "component.4.qml" << "component.4.errors.txt" << false;
-    QTest::newRow("Component.5") << "component.5.qml" << "component.5.errors.txt" << false;
-    QTest::newRow("Component.6") << "component.6.qml" << "component.6.errors.txt" << false;
-
-    QTest::newRow("invalidAttachedProperty.1") << "invalidAttachedProperty.1.qml" << "invalidAttachedProperty.1.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.2") << "invalidAttachedProperty.2.qml" << "invalidAttachedProperty.2.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.3") << "invalidAttachedProperty.3.qml" << "invalidAttachedProperty.3.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.4") << "invalidAttachedProperty.4.qml" << "invalidAttachedProperty.4.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.5") << "invalidAttachedProperty.5.qml" << "invalidAttachedProperty.5.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.6") << "invalidAttachedProperty.6.qml" << "invalidAttachedProperty.6.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.7") << "invalidAttachedProperty.7.qml" << "invalidAttachedProperty.7.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.8") << "invalidAttachedProperty.8.qml" << "invalidAttachedProperty.8.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.9") << "invalidAttachedProperty.9.qml" << "invalidAttachedProperty.9.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.10") << "invalidAttachedProperty.10.qml" << "invalidAttachedProperty.10.errors.txt" << false;
-    QTest::newRow("invalidAttachedProperty.11") << "invalidAttachedProperty.11.qml" << "invalidAttachedProperty.11.errors.txt" << false;
-
-    QTest::newRow("nestedErrors") << "nestedErrors.qml" << "nestedErrors.errors.txt" << false;
-    QTest::newRow("defaultGrouped") << "defaultGrouped.qml" << "defaultGrouped.errors.txt" << false;
-    QTest::newRow("emptySignal") << "emptySignal.qml" << "emptySignal.errors.txt" << false;
-    QTest::newRow("doubleSignal") << "doubleSignal.qml" << "doubleSignal.errors.txt" << false;
-    QTest::newRow("invalidRoot") << "invalidRoot.qml" << "invalidRoot.errors.txt" << false;
-    QTest::newRow("missingValueTypeProperty") << "missingValueTypeProperty.qml" << "missingValueTypeProperty.errors.txt" << false;
-    QTest::newRow("objectValueTypeProperty") << "objectValueTypeProperty.qml" << "objectValueTypeProperty.errors.txt" << false;
-}
-
-
-void tst_qmllanguage::errors()
-{
-    QFETCH(QString, file);
-    QFETCH(QString, errorFile);
-    QFETCH(bool, create);
-
-    if (file == "invalidID.6.qml")
-        QTest::ignoreMessage(QtWarningMsg, "id \"StartsWithUpperCase\" is invalid: ids cannot start with uppercase letters");
-
-    QmlComponent component(&engine, TEST_FILE(file));
-
-    if(create) {
-        QObject *object = component.create();
-        QVERIFY(object == 0);
-    }
-
-    VERIFY_ERRORS(errorFile.toLatin1().constData());
-}
-
-void tst_qmllanguage::simpleObject()
-{
-    QmlComponent component(&engine, TEST_FILE("simpleObject.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-}
-
-void tst_qmllanguage::simpleContainer()
-{
-    QmlComponent component(&engine, TEST_FILE("simpleContainer.qml"));
-    VERIFY_ERRORS(0);
-    MyContainer *container= qobject_cast<MyContainer*>(component.create());
-    QVERIFY(container != 0);
-    QCOMPARE(container->getChildren()->count(),2);
-}
-
-void tst_qmllanguage::interfaceProperty()
-{
-    QmlComponent component(&engine, TEST_FILE("interfaceProperty.qml"));
-    VERIFY_ERRORS(0);
-    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-    QVERIFY(object->interface());
-    QVERIFY(object->interface()->id == 913);
-}
-
-void tst_qmllanguage::interfaceQList()
-{
-    QmlComponent component(&engine, TEST_FILE("interfaceQList.qml"));
-    VERIFY_ERRORS(0);
-    MyContainer *container= qobject_cast<MyContainer*>(component.create());
-    QVERIFY(container != 0);
-    QVERIFY(container->getQListInterfaces()->count() == 2);
-    for(int ii = 0; ii < 2; ++ii)
-        QVERIFY(container->getQListInterfaces()->at(ii)->id == 913);
-}
-
-void tst_qmllanguage::assignObjectToSignal()
-{
-    QmlComponent component(&engine, TEST_FILE("assignObjectToSignal.qml"));
-    VERIFY_ERRORS(0);
-    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-    QVERIFY(object != 0);
-    QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlot");
-    emit object->basicSignal();
-}
-
-void tst_qmllanguage::assignObjectToVariant()
-{
-    QmlComponent component(&engine, TEST_FILE("assignObjectToVariant.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    QVariant v = object->property("a");
-    QVERIFY(v.userType() == qMetaTypeId<QObject *>());
-}
-
-void tst_qmllanguage::assignLiteralSignalProperty()
-{
-    QmlComponent component(&engine, TEST_FILE("assignLiteralSignalProperty.qml"));
-    VERIFY_ERRORS(0);
-    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->onLiteralSignal(), 10);
-}
-
-// Test is an external component can be loaded and assigned (to a qlist)
-void tst_qmllanguage::assignQmlComponent()
-{
-    QmlComponent component(&engine, TEST_FILE("assignQmlComponent.qml"));
-    VERIFY_ERRORS(0);
-    MyContainer *object = qobject_cast<MyContainer *>(component.create());
-    QVERIFY(object != 0);
-    QVERIFY(object->getChildren()->count() == 1);
-    QObject *child = object->getChildren()->at(0);
-    QCOMPARE(child->property("x"), QVariant(10));
-    QCOMPARE(child->property("y"), QVariant(11));
-}
-
-// Test literal assignment to all the basic types 
-void tst_qmllanguage::assignBasicTypes()
-{
-    QmlComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
-    VERIFY_ERRORS(0);
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3);
-    QCOMPARE(object->enumProperty(), MyTypeObject::EnumVal2);
-    QCOMPARE(object->stringProperty(), QString("Hello World!"));
-    QCOMPARE(object->uintProperty(), uint(10));
-    QCOMPARE(object->intProperty(), -19);
-    QCOMPARE((float)object->realProperty(), float(23.2));
-    QCOMPARE((float)object->doubleProperty(), float(-19.7));
-    QCOMPARE((float)object->floatProperty(), float(8.5));
-    QCOMPARE(object->colorProperty(), QColor("red"));
-    QCOMPARE(object->dateProperty(), QDate(1982, 11, 25));
-    QCOMPARE(object->timeProperty(), QTime(11, 11, 32));
-    QCOMPARE(object->dateTimeProperty(), QDateTime(QDate(2009, 5, 12), QTime(13, 22, 1)));
-    QCOMPARE(object->pointProperty(), QPoint(99,13));
-    QCOMPARE(object->pointFProperty(), QPointF((float)-10.1, (float)12.3));
-    QCOMPARE(object->sizeProperty(), QSize(99, 13));
-    QCOMPARE(object->sizeFProperty(), QSizeF((float)0.1, (float)0.2));
-    QCOMPARE(object->rectProperty(), QRect(9, 7, 100, 200));
-    QCOMPARE(object->rectFProperty(), QRectF((float)1000.1, (float)-10.9, (float)400, (float)90.99));
-    QCOMPARE(object->boolProperty(), true);
-    QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
-    QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2));
-    QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml")));
-    QVERIFY(object->objectProperty() != 0);
-    MyTypeObject *child = qobject_cast<MyTypeObject *>(object->objectProperty());
-    QVERIFY(child != 0);
-    QCOMPARE(child->intProperty(), 8);
-}
-
-// Test edge case type assignments
-void tst_qmllanguage::assignTypeExtremes()
-{
-    QmlComponent component(&engine, TEST_FILE("assignTypeExtremes.qml"));
-    VERIFY_ERRORS(0);
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->uintProperty(), 0xEE6B2800);
-    QCOMPARE(object->intProperty(), -0x77359400);
-}
-
-// Test that a composite type can assign to a property of its base type
-void tst_qmllanguage::assignCompositeToType()
-{
-    QmlComponent component(&engine, TEST_FILE("assignCompositeToType.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-}
-
-// Tests that custom parser types can be instantiated
-void tst_qmllanguage::customParserTypes()
-{
-    QmlComponent component(&engine, TEST_FILE("customParserTypes.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    QVERIFY(object->property("count") == QVariant(2));
-}
-
-// Tests that the root item can be a custom component
-void tst_qmllanguage::rootAsQmlComponent()
-{
-    QmlComponent component(&engine, TEST_FILE("rootAsQmlComponent.qml"));
-    VERIFY_ERRORS(0);
-    MyContainer *object = qobject_cast<MyContainer *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->property("x"), QVariant(11));
-    QCOMPARE(object->getChildren()->count(), 2);
-}
-
-// Tests that components can be specified inline
-void tst_qmllanguage::inlineQmlComponents()
-{
-    QmlComponent component(&engine, TEST_FILE("inlineQmlComponents.qml"));
-    VERIFY_ERRORS(0);
-    MyContainer *object = qobject_cast<MyContainer *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->getChildren()->count(), 1);
-    QmlComponent *comp = qobject_cast<QmlComponent *>(object->getChildren()->at(0));
-    QVERIFY(comp != 0);
-    MyQmlObject *compObject = qobject_cast<MyQmlObject *>(comp->create());
-    QVERIFY(compObject != 0);
-    QCOMPARE(compObject->value(), 11);
-}
-
-// Tests that types that have an id property have it set
-void tst_qmllanguage::idProperty()
-{
-    QmlComponent component(&engine, TEST_FILE("idProperty.qml"));
-    VERIFY_ERRORS(0);
-    MyContainer *object = qobject_cast<MyContainer *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->getChildren()->count(), 1);
-    MyTypeObject *child = 
-        qobject_cast<MyTypeObject *>(object->getChildren()->at(0));
-    QVERIFY(child != 0);
-    QCOMPARE(child->id(), QString("myObjectId"));
-    QCOMPARE(object->property("object"), QVariant::fromValue((QObject *)child));
-}
-
-// Tests that signals can be assigned to
-void tst_qmllanguage::assignSignal()
-{
-    QmlComponent component(&engine, TEST_FILE("assignSignal.qml"));
-    VERIFY_ERRORS(0);
-    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
-    QVERIFY(object != 0);
-    QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlot");
-    emit object->basicSignal();
-    QTest::ignoreMessage(QtWarningMsg, "MyQmlObject::basicSlotWithArgs(9)");
-    emit object->basicParameterizedSignal(9);
-}
-
-// Tests the creation and assignment of dynamic properties
-void tst_qmllanguage::dynamicProperties()
-{
-    QmlComponent component(&engine, TEST_FILE("dynamicProperties.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    QCOMPARE(object->property("intProperty"), QVariant(10));
-    QCOMPARE(object->property("boolProperty"), QVariant(false));
-    QCOMPARE(object->property("doubleProperty"), QVariant(-10.1));
-    QCOMPARE(object->property("realProperty"), QVariant((qreal)-19.9));
-    QCOMPARE(object->property("stringProperty"), QVariant("Hello World!"));
-    QCOMPARE(object->property("urlProperty"), QVariant(TEST_FILE("main.qml")));
-    QCOMPARE(object->property("colorProperty"), QVariant(QColor("red")));
-    QCOMPARE(object->property("dateProperty"), QVariant(QDate(1945, 9, 2)));
-    QCOMPARE(object->property("varProperty"), QVariant("Hello World!"));
-    QCOMPARE(object->property("variantProperty"), QVariant(12));
-}
-
-// Test that nested types can use dynamic properties
-void tst_qmllanguage::dynamicPropertiesNested()
-{
-    QmlComponent component(&engine, TEST_FILE("dynamicPropertiesNested.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("super_a").toInt(), 11); // Overridden
-    QCOMPARE(object->property("super_c").toInt(), 14); // Inherited
-    QCOMPARE(object->property("a").toInt(), 13); // New
-    QCOMPARE(object->property("b").toInt(), 12); // New
-
-    delete object;
-}
-
-// Tests the creation and assignment to dynamic list properties
-void tst_qmllanguage::listProperties()
-{
-    QmlComponent component(&engine, TEST_FILE("listProperties.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toInt(), 2);
-}
-
-// Tests the creation and assignment of dynamic object properties
-// ### Not complete
-void tst_qmllanguage::dynamicObjectProperties()
-{
-    QmlComponent component(&engine, TEST_FILE("dynamicObjectProperties.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QVERIFY(object->property("objectProperty") == qVariantFromValue((QObject*)0));
-    QVERIFY(object->property("objectProperty2") != qVariantFromValue((QObject*)0));
-}
-
-// Tests the declaration of dynamic signals and slots
-void tst_qmllanguage::dynamicSignalsAndSlots()
-{
-    QTest::ignoreMessage(QtDebugMsg, "1921");
-
-    QmlComponent component(&engine, TEST_FILE("dynamicSignalsAndSlots.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    QVERIFY(object->metaObject()->indexOfMethod("signal1()") != -1);
-    QVERIFY(object->metaObject()->indexOfMethod("signal2()") != -1);
-    QVERIFY(object->metaObject()->indexOfMethod("slot1()") != -1);
-    QVERIFY(object->metaObject()->indexOfMethod("slot2()") != -1);
-
-    QCOMPARE(object->property("test").toInt(), 0);
-    QMetaObject::invokeMethod(object, "slot3", Qt::DirectConnection, Q_ARG(QVariant, QVariant(10)));
-    QCOMPARE(object->property("test").toInt(), 10);
-}
-
-void tst_qmllanguage::simpleBindings()
-{
-    QmlComponent component(&engine, TEST_FILE("simpleBindings.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    QCOMPARE(object->property("value1"), QVariant(10));
-    QCOMPARE(object->property("value2"), QVariant(10));
-    QCOMPARE(object->property("value3"), QVariant(21));
-    QCOMPARE(object->property("value4"), QVariant(10));
-    QCOMPARE(object->property("objectProperty"), QVariant::fromValue(object));
-}
-
-void tst_qmllanguage::autoComponentCreation()
-{
-    QmlComponent component(&engine, TEST_FILE("autoComponentCreation.qml"));
-    VERIFY_ERRORS(0);
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-    QVERIFY(object->componentProperty() != 0);
-    MyTypeObject *child = qobject_cast<MyTypeObject *>(object->componentProperty()->create());
-    QVERIFY(child != 0);
-    QCOMPARE(child->realProperty(), qreal(9));
-}
-
-void tst_qmllanguage::propertyValueSource()
-{
-    {
-    QmlComponent component(&engine, TEST_FILE("propertyValueSource.qml"));
-    VERIFY_ERRORS(0);
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QList<QObject *> valueSources;
-    QObjectList allChildren = object->findChildren<QObject*>();
-    foreach (QObject *child, allChildren) {
-        if (qobject_cast<QmlPropertyValueSource *>(child)) 
-            valueSources.append(child);
-    }
-
-    QCOMPARE(valueSources.count(), 1);
-    MyPropertyValueSource *valueSource = 
-        qobject_cast<MyPropertyValueSource *>(valueSources.at(0));
-    QVERIFY(valueSource != 0);
-    QCOMPARE(valueSource->prop.object(), object);
-    QCOMPARE(valueSource->prop.name(), QString(QLatin1String("intProperty")));
-    }
-
-    {
-    QmlComponent component(&engine, TEST_FILE("propertyValueSource.2.qml"));
-    VERIFY_ERRORS(0);
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QList<QObject *> valueSources;
-    QObjectList allChildren = object->findChildren<QObject*>();
-    foreach (QObject *child, allChildren) {
-        if (qobject_cast<QmlPropertyValueSource *>(child)) 
-            valueSources.append(child);
-    }
-
-    QCOMPARE(valueSources.count(), 1);
-    MyPropertyValueSource *valueSource = 
-        qobject_cast<MyPropertyValueSource *>(valueSources.at(0));
-    QVERIFY(valueSource != 0);
-    QCOMPARE(valueSource->prop.object(), object);
-    QCOMPARE(valueSource->prop.name(), QString(QLatin1String("intProperty")));
-    }
-}
-
-void tst_qmllanguage::attachedProperties()
-{
-    QmlComponent component(&engine, TEST_FILE("attachedProperties.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    QObject *attached = qmlAttachedPropertiesObject<MyQmlObject>(object);
-    QVERIFY(attached != 0);
-    QCOMPARE(attached->property("value"), QVariant(10));
-    QCOMPARE(attached->property("value2"), QVariant(13));
-}
-
-// Tests non-static object properties
-void tst_qmllanguage::dynamicObjects()
-{
-    QmlComponent component(&engine, TEST_FILE("dynamicObject.1.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-}
-
-// Tests the registration of custom variant string converters
-void tst_qmllanguage::customVariantTypes()
-{
-    QmlComponent component(&engine, TEST_FILE("customVariantTypes.qml"));
-    VERIFY_ERRORS(0);
-    MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->customType().a, 10);
-}
-
-void tst_qmllanguage::valueTypes()
-{
-    QmlComponent component(&engine, TEST_FILE("valueTypes.qml"));
-    VERIFY_ERRORS(0);
-
-    QString message = QLatin1String("QML MyTypeObject (") + component.url().toString() + 
-                      QLatin1String(":2:1) Binding loop detected for property \"rectProperty.width\"");
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-
-    MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
-    QVERIFY(object != 0);
-
-
-    QCOMPARE(object->rectProperty(), QRect(10, 11, 12, 13));
-    QCOMPARE(object->rectProperty2(), QRect(10, 11, 12, 13));
-    QCOMPARE(object->intProperty(), 10);
-    object->doAction();
-    QCOMPARE(object->rectProperty(), QRect(12, 11, 14, 13));
-    QCOMPARE(object->rectProperty2(), QRect(12, 11, 14, 13));
-    QCOMPARE(object->intProperty(), 12);
-
-    // ###
-#if 0
-    QmlMetaProperty p = QmlMetaProperty::createProperty(object, "rectProperty.x");
-    QCOMPARE(p.read(), QVariant(12));
-    p.write(13);
-    QCOMPARE(p.read(), QVariant(13));
-
-    quint32 r = QmlMetaPropertyPrivate::saveValueType(p.coreIndex(), p.valueTypeCoreIndex());
-    QmlMetaProperty p2;
-    QmlMetaPropertyPrivate::restore(p2, r, object);
-    QCOMPARE(p2.read(), QVariant(13));
-#endif
-}
-
-void tst_qmllanguage::cppnamespace()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("cppnamespace.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("cppnamespace.2.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-        delete object;
-    }
-}
-
-void tst_qmllanguage::aliasProperties()
-{
-    // Simple "int" alias
-    {
-        QmlComponent component(&engine, TEST_FILE("alias.1.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        // Read through alias
-        QCOMPARE(object->property("valueAlias").toInt(), 10);
-        object->setProperty("value", QVariant(13));
-        QCOMPARE(object->property("valueAlias").toInt(), 13);
-
-        // Write throught alias
-        object->setProperty("valueAlias", QVariant(19));
-        QCOMPARE(object->property("valueAlias").toInt(), 19);
-        QCOMPARE(object->property("value").toInt(), 19);
-
-        delete object;
-    }
-
-    // Complex object alias
-    {
-        QmlComponent component(&engine, TEST_FILE("alias.2.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        // Read through alias
-        MyQmlObject *v = 
-            qvariant_cast<MyQmlObject *>(object->property("aliasObject"));
-        QVERIFY(v != 0);
-        QCOMPARE(v->value(), 10);
-
-        // Write through alias
-        MyQmlObject *v2 = new MyQmlObject();
-        v2->setParent(object);
-        object->setProperty("aliasObject", qVariantFromValue(v2));
-        MyQmlObject *v3 = 
-            qvariant_cast<MyQmlObject *>(object->property("aliasObject"));
-        QVERIFY(v3 != 0);
-        QCOMPARE(v3, v2);
-
-        delete object;
-    }
-
-    // Nested aliases
-    {
-        QmlComponent component(&engine, TEST_FILE("alias.3.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("value").toInt(), 1892);
-        QCOMPARE(object->property("value2").toInt(), 1892);
-
-        object->setProperty("value", QVariant(1313));
-        QCOMPARE(object->property("value").toInt(), 1313);
-        QCOMPARE(object->property("value2").toInt(), 1313);
-
-        object->setProperty("value2", QVariant(8080));
-        QCOMPARE(object->property("value").toInt(), 8080);
-        QCOMPARE(object->property("value2").toInt(), 8080);
-
-        delete object;
-    }
-
-    // Enum aliases
-    {
-        QmlComponent component(&engine, TEST_FILE("alias.4.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("enumAlias").toInt(), 1);
-
-        delete object;
-    }
-
-    // Id aliases
-    {
-        QmlComponent component(&engine, TEST_FILE("alias.5.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QVariant v = object->property("otherAlias");
-        QCOMPARE(v.userType(), qMetaTypeId<MyQmlObject*>());
-        MyQmlObject *o = qvariant_cast<MyQmlObject*>(v);
-        QCOMPARE(o->value(), 10);
-
-        delete o;
-
-        v = object->property("otherAlias");
-        QCOMPARE(v.userType(), qMetaTypeId<MyQmlObject*>());
-        o = qvariant_cast<MyQmlObject*>(v);
-        QVERIFY(o == 0);
-
-        delete object;
-    }
-
-    // Nested aliases - this used to cause a crash
-    {
-        QmlComponent component(&engine, TEST_FILE("alias.6.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("a").toInt(), 1923);
-    }
-
-    // Ptr Alias Cleanup - check that aliases to ptr types return 0 
-    // if the object aliased to is removed
-    {
-        QmlComponent component(&engine, TEST_FILE("alias.7.qml"));
-        VERIFY_ERRORS(0);
-
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QObject *object1 = qvariant_cast<QObject *>(object->property("object"));
-        QVERIFY(object1 != 0);
-        QObject *object2 = qvariant_cast<QObject *>(object1->property("object"));
-        QVERIFY(object2 != 0);
-
-        QObject *alias = qvariant_cast<QObject *>(object->property("aliasedObject"));
-        QVERIFY(alias == object2);
-
-        delete object1;
-
-        QObject *alias2 = object; // "Random" start value
-        int status = -1;
-        void *a[] = { &alias2, 0, &status };
-        QMetaObject::metacall(object, QMetaObject::ReadProperty,
-                              object->metaObject()->indexOfProperty("aliasedObject"), a);
-        QVERIFY(alias2 == 0);
-    }
-
-    // Simple composite type
-    {
-        QmlComponent component(&engine, TEST_FILE("alias.8.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("value").toInt(), 10);
-
-        delete object;
-    }
-
-    // Complex composite type
-    {
-        QmlComponent component(&engine, TEST_FILE("alias.9.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("value").toInt(), 10);
-
-        delete object;
-    }
-}
-
-// Test that the root element in a composite type can be a Component
-void tst_qmllanguage::componentCompositeType()
-{
-    QmlComponent component(&engine, TEST_FILE("componentCompositeType.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-}
-
-class TestType : public QObject {
-    Q_OBJECT
-public:
-    TestType(QObject *p=0) : QObject(p) {}
-};
-
-class TestType2 : public QObject {
-    Q_OBJECT
-public:
-    TestType2(QObject *p=0) : QObject(p) {}
-};
-
-void tst_qmllanguage::i18n_data()
-{
-    QTest::addColumn<QString>("file");
-    QTest::addColumn<QString>("stringProperty");
-    QTest::newRow("i18nStrings") << "i18nStrings.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245 (5 accented 'a' letters)");
-    QTest::newRow("i18nDeclaredPropertyNames") << "i18nDeclaredPropertyNames.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 10");
-    QTest::newRow("i18nDeclaredPropertyUse") << "i18nDeclaredPropertyUse.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 15");
-    QTest::newRow("i18nScript") << "i18nScript.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 20");
-    QTest::newRow("i18nType") << "i18nType.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 30");
-    QTest::newRow("i18nNameSpace") << "i18nNameSpace.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 40");
-}
-
-void tst_qmllanguage::i18n()
-{
-    QFETCH(QString, file);
-    QFETCH(QString, stringProperty);
-    QmlComponent component(&engine, TEST_FILE(file));
-    VERIFY_ERRORS(0);
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->stringProperty(), stringProperty);
-
-    delete object;
-}
-
-// Check that the Component::onCompleted attached property works
-void tst_qmllanguage::onCompleted()
-{
-    QmlComponent component(&engine, TEST_FILE("onCompleted.qml"));
-    VERIFY_ERRORS(0);
-    QTest::ignoreMessage(QtDebugMsg, "Completed 6 10");
-    QTest::ignoreMessage(QtDebugMsg, "Completed 6 10");
-    QTest::ignoreMessage(QtDebugMsg, "Completed 10 11");
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-}
-
-// Check that assignments to QmlScriptString properties work
-void tst_qmllanguage::scriptString()
-{
-    QmlComponent component(&engine, TEST_FILE("scriptString.qml"));
-    VERIFY_ERRORS(0);
-
-    MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
-    QVERIFY(object != 0);
-    QCOMPARE(object->scriptProperty().script(), QString("foo + bar"));
-    QCOMPARE(object->scriptProperty().scopeObject(), object);
-    QCOMPARE(object->scriptProperty().context(), qmlContext(object));
-
-    QVERIFY(object->grouped() != 0);
-    QCOMPARE(object->grouped()->script().script(), QString("console.log(1921)"));
-    QCOMPARE(object->grouped()->script().scopeObject(), object);
-    QCOMPARE(object->grouped()->script().context(), qmlContext(object));
-}
-
-// Check that default property assignments are correctly spliced into explicit 
-// property assignments
-void tst_qmllanguage::defaultPropertyListOrder()
-{
-    QmlComponent component(&engine, TEST_FILE("defaultPropertyListOrder.qml"));
-    VERIFY_ERRORS(0);
-
-    MyContainer *container = qobject_cast<MyContainer *>(component.create());
-    QVERIFY(container  != 0);
-
-    QCOMPARE(container->getChildren()->count(), 6);
-    QCOMPARE(container->getChildren()->at(0)->property("index"), QVariant(0));
-    QCOMPARE(container->getChildren()->at(1)->property("index"), QVariant(1));
-    QCOMPARE(container->getChildren()->at(2)->property("index"), QVariant(2));
-    QCOMPARE(container->getChildren()->at(3)->property("index"), QVariant(3));
-    QCOMPARE(container->getChildren()->at(4)->property("index"), QVariant(4));
-    QCOMPARE(container->getChildren()->at(5)->property("index"), QVariant(5));
-}
-
-void tst_qmllanguage::declaredPropertyValues()
-{
-    QmlComponent component(&engine, TEST_FILE("declaredPropertyValues.qml"));
-    QEXPECT_FAIL("", "QTBUG-7860", Abort);
-    VERIFY_ERRORS(0);
-}
-
-// Check that first child of qml is of given type. Empty type insists on error.
-void tst_qmllanguage::testType(const QString& qml, const QString& type)
-{
-    QmlComponent component(&engine);
-    component.setData(qml.toUtf8(), TEST_FILE("empty.qml")); // just a file for relative local imports
-
-    QTRY_VERIFY(!component.isLoading());
-
-    if (type.isEmpty()) {
-        QVERIFY(component.isError());
-    } else {
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-        QCOMPARE(QString(object->metaObject()->className()), type);
-    }
-}
-
-QML_DECLARE_TYPE(TestType)
-QML_DECLARE_TYPE(TestType2)
-
-// Import tests (QT-558)
-
-void tst_qmllanguage::importsBuiltin_data()
-{
-    // QT-610
-
-    QTest::addColumn<QString>("qml");
-    QTest::addColumn<QString>("type");
-
-    // import built-ins
-    QTest::newRow("missing import")
-        << "Test {}"
-        << "";
-    QTest::newRow("not in version 0.0")
-        << "import com.nokia.Test 0.0\n"
-           "Test {}"
-        << "";
-    QTest::newRow("in version 0.0")
-        << "import com.nokia.Test 0.0\n"
-           "TestTP {}"
-        << "TestType";
-    QTest::newRow("qualified in version 0.0")
-        << "import com.nokia.Test 0.0 as T\n"
-           "T.TestTP {}"
-        << "TestType";
-    QTest::newRow("in version 1.0")
-        << "import com.nokia.Test 1.0\n"
-           "Test {}"
-        << "TestType";
-    QTest::newRow("qualified wrong")
-        << "import com.nokia.Test 1.0 as T\n" // QT-610
-           "Test {}"
-        << "";
-    QTest::newRow("qualified right")
-        << "import com.nokia.Test 1.0 as T\n"
-           "T.Test {}"
-        << "TestType";
-    QTest::newRow("qualified right but not in version 0.0")
-        << "import com.nokia.Test 0.0 as T\n"
-           "T.Test {}"
-        << "";
-    QTest::newRow("in version 1.1")
-        << "import com.nokia.Test 1.1\n"
-           "Test {}"
-        << "TestType";
-    QTest::newRow("in version 1.3")
-        << "import com.nokia.Test 1.3\n"
-           "Test {}"
-        << "TestType";
-    QTest::newRow("in version 1.5")
-        << "import com.nokia.Test 1.5\n"
-           "Test {}"
-        << "TestType";
-    QTest::newRow("changed in version 1.8")
-        << "import com.nokia.Test 1.8\n"
-           "Test {}"
-        << "TestType2";
-    QTest::newRow("in version 1.12")
-        << "import com.nokia.Test 1.12\n"
-           "Test {}"
-        << "TestType2";
-    QTest::newRow("old in version 1.9")
-        << "import com.nokia.Test 1.9\n"
-           "OldTest {}"
-        << "TestType";
-    QTest::newRow("old in version 1.11")
-        << "import com.nokia.Test 1.11\n"
-           "OldTest {}"
-        << "TestType";
-    QTest::newRow("multiversion 1")
-        << "import com.nokia.Test 1.11\n"
-           "import com.nokia.Test 1.12\n"
-           "Test {}"
-        << "TestType2";
-    QTest::newRow("multiversion 2")
-        << "import com.nokia.Test 1.11\n"
-           "import com.nokia.Test 1.12\n"
-           "OldTest {}"
-        << "TestType";
-    QTest::newRow("qualified multiversion 3")
-        << "import com.nokia.Test 1.0 as T0\n"
-           "import com.nokia.Test 1.8 as T8\n"
-           "T0.Test {}"
-        << "TestType";
-    QTest::newRow("qualified multiversion 4")
-        << "import com.nokia.Test 1.0 as T0\n"
-           "import com.nokia.Test 1.8 as T8\n"
-           "T8.Test {}"
-        << "TestType2";
-}
-
-void tst_qmllanguage::importsBuiltin()
-{
-    QFETCH(QString, qml);
-    QFETCH(QString, type);
-    testType(qml,type);
-}
-
-void tst_qmllanguage::importsLocal_data()
-{
-    QTest::addColumn<QString>("qml");
-    QTest::addColumn<QString>("type");
-
-    // import locals
-    QTest::newRow("local import")
-        << "import \"subdir\"\n" // QT-613
-           "Test {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("local import second")
-        << "import Qt 4.6\nimport \"subdir\"\n"
-           "Test {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("local import subsubdir")
-        << "import Qt 4.6\nimport \"subdir/subsubdir\"\n"
-           "SubTest {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("local import QTBUG-7721 A")
-        << "subdir.Test {}" // no longer allowed (QTBUG-7721)
-        << "";
-    QTest::newRow("local import QTBUG-7721 B")
-        << "import \"subdir\" as X\n"
-           "X.subsubdir.SubTest {}" // no longer allowed (QTBUG-7721)
-        << "";
-    QTest::newRow("local import as")
-        << "import \"subdir\" as T\n"
-           "T.Test {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("wrong local import as")
-        << "import \"subdir\" as T\n"
-           "Test {}"
-        << "";
-    QTest::newRow("library precedence over local import")
-        << "import \"subdir\"\n"
-           "import com.nokia.Test 1.0\n"
-           "Test {}"
-        << "TestType";
-}
-
-void tst_qmllanguage::importsLocal()
-{
-    QFETCH(QString, qml);
-    QFETCH(QString, type);
-    testType(qml,type);
-}
-
-void tst_qmllanguage::importsRemote_data()
-{
-    QTest::addColumn<QString>("qml");
-    QTest::addColumn<QString>("type");
-
-    QString serverdir = "http://127.0.0.1:14445/qtest/declarative/qmllanguage";
-
-    QTest::newRow("remote import") << "import \""+serverdir+"\"\nTest {}" << "QmlGraphicsRectangle";
-    QTest::newRow("remote import with subdir") << "import \""+serverdir+"\"\nTestSubDir {}" << "QmlGraphicsText";
-    QTest::newRow("remote import with local") << "import \""+serverdir+"\"\nTestLocal {}" << "QmlGraphicsImage";
-}
-
-#include "testhttpserver.h"
-
-void tst_qmllanguage::importsRemote()
-{
-    QFETCH(QString, qml);
-    QFETCH(QString, type);
-
-    TestHTTPServer server(14445);
-    server.serveDirectory(SRCDIR);
-
-    testType(qml,type);
-}
-
-void tst_qmllanguage::importsInstalled_data()
-{
-    // QT-610
-
-    QTest::addColumn<QString>("qml");
-    QTest::addColumn<QString>("type");
-
-    // import installed
-    QTest::newRow("installed import 0")
-        << "import com.nokia.installedtest 0.0\n"
-           "InstalledTestTP {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("installed import 0 as TP")
-        << "import com.nokia.installedtest 0.0 as TP\n"
-           "TP.InstalledTestTP {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("installed import 1")
-        << "import com.nokia.installedtest 1.0\n"
-           "InstalledTest {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("installed import 2")
-        << "import com.nokia.installedtest 1.3\n"
-           "InstalledTest {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("installed import 3")
-        << "import com.nokia.installedtest 1.4\n"
-           "InstalledTest {}"
-        << "QmlGraphicsText";
-    QTest::newRow("installed import 4")
-        << "import com.nokia.installedtest 1.10\n"
-           "InstalledTest {}"
-        << "QmlGraphicsText";
-    QTest::newRow("installed import visibility") // QT-614
-        << "import com.nokia.installedtest 1.4\n"
-           "PrivateType {}"
-        << "";
-}
-
-void tst_qmllanguage::importsInstalled()
-{
-    QFETCH(QString, qml);
-    QFETCH(QString, type);
-    testType(qml,type);
-}
-
-
-void tst_qmllanguage::importsOrder_data()
-{
-    QTest::addColumn<QString>("qml");
-    QTest::addColumn<QString>("type");
-
-    QTest::newRow("installed import overrides 1") <<
-           "import com.nokia.installedtest 1.0\n"
-           "import com.nokia.installedtest 1.4\n"
-           "InstalledTest {}"
-        << "QmlGraphicsText";
-    QTest::newRow("installed import overrides 2") <<
-           "import com.nokia.installedtest 1.4\n"
-           "import com.nokia.installedtest 1.0\n"
-           "InstalledTest {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("installed import re-overrides 1") <<
-           "import com.nokia.installedtest 1.4\n"
-           "import com.nokia.installedtest 1.0\n"
-           "import com.nokia.installedtest 1.4\n"
-           "InstalledTest {}"
-        << "QmlGraphicsText";
-    QTest::newRow("installed import re-overrides 2") <<
-           "import com.nokia.installedtest 1.4\n"
-           "import com.nokia.installedtest 1.0\n"
-           "import com.nokia.installedtest 1.4\n"
-           "import com.nokia.installedtest 1.0\n"
-           "InstalledTest {}"
-        << "QmlGraphicsRectangle";
-
-    QTest::newRow("installed import versus builtin 1") <<
-           "import com.nokia.installedtest 1.5\n"
-           "import Qt 4.6\n"
-           "Rectangle {}"
-        << "QmlGraphicsRectangle";
-    QTest::newRow("installed import versus builtin 2") <<
-           "import Qt 4.6\n"
-           "import com.nokia.installedtest 1.5\n"
-           "Rectangle {}"
-        << "QmlGraphicsText";
-    QTest::newRow("namespaces cannot be overridden by types 1") <<
-           "import Qt 4.6 as Rectangle\n"
-           "import com.nokia.installedtest 1.5\n"
-           "Rectangle {}"
-        << "";
-    QTest::newRow("namespaces cannot be overridden by types 2") <<
-           "import Qt 4.6 as Rectangle\n"
-           "import com.nokia.installedtest 1.5\n"
-           "Rectangle.Image {}"
-        << "QmlGraphicsImage";
-}
-
-void tst_qmllanguage::importsOrder()
-{
-    QFETCH(QString, qml);
-    QFETCH(QString, type);
-    testType(qml,type);
-}
-
-void tst_qmllanguage::qmlAttachedPropertiesObjectMethod()
-{
-    QObject object;
-
-    QCOMPARE(qmlAttachedPropertiesObject<MyQmlObject>(&object, false), (QObject *)0);
-    QCOMPARE(qmlAttachedPropertiesObject<MyQmlObject>(&object, true), (QObject *)0);
-
-    {
-        QmlComponent component(&engine, TEST_FILE("qmlAttachedPropertiesObjectMethod.1.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(qmlAttachedPropertiesObject<MyQmlObject>(object, false), (QObject *)0);
-        QVERIFY(qmlAttachedPropertiesObject<MyQmlObject>(object, true) != 0);
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("qmlAttachedPropertiesObjectMethod.2.qml"));
-        VERIFY_ERRORS(0);
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QVERIFY(qmlAttachedPropertiesObject<MyQmlObject>(object, false) != 0);
-        QVERIFY(qmlAttachedPropertiesObject<MyQmlObject>(object, true) != 0);
-    }
-}
-
-void tst_qmllanguage::crash1()
-{
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6\nComponent {}", QUrl());
-}
-
-void tst_qmllanguage::crash2()
-{
-    QmlComponent component(&engine, TEST_FILE("crash2.qml"));
-}
-
-QTEST_MAIN(tst_qmllanguage)
-
-#include "tst_qmllanguage.moc"
diff --git a/tests/auto/declarative/qmllistmodel/qmllistmodel.pro b/tests/auto/declarative/qmllistmodel/qmllistmodel.pro
deleted file mode 100644
index 60b0c4b..0000000
--- a/tests/auto/declarative/qmllistmodel/qmllistmodel.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += script
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmllistmodel.cpp
diff --git a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
deleted file mode 100644
index 8513a3b..0000000
--- a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/private/qmllistmodel_p.h>
-#include <QtDeclarative/private/qmlexpression_p.h>
-#include <QmlComponent>
-#include <QDebug>
-
-class tst_QmlListModel : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QmlListModel() {}
-
-private slots:
-    void static_types();
-    void static_types_data();
-    void static_i18n();
-    void static_nestedElements();
-    void static_nestedElements_data();
-    void dynamic_data();
-    void dynamic();
-    void error_data();
-    void error();
-};
-
-void tst_QmlListModel::static_i18n()
-{
-    QString expect = QString::fromUtf8("na\303\257ve");
-    QString componentStr = "import Qt 4.6\nListModel { ListElement { prop1: \""+expect+"\" } }";
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
-    QmlListModel *obj = qobject_cast<QmlListModel*>(component.create());
-    QVERIFY(obj != 0);
-    QString prop = obj->get(0).property(QLatin1String("prop1")).toString();
-    QCOMPARE(prop,expect);
-    delete obj;
-}
-
-void tst_QmlListModel::static_nestedElements()
-{
-    QFETCH(int, elementCount);
-
-    QStringList elements;
-    for (int i=0; i<elementCount; i++) 
-        elements.append("ListElement { a: 1; b: 2 }");
-    QString elementsStr = elements.join(",\n") + "\n";
-
-    QString componentStr = 
-        "import Qt 4.6\n"
-        "ListModel {\n"
-        "   ListElement {\n"
-        "       attributes: [\n";
-    componentStr += elementsStr.toUtf8().constData();
-    componentStr += 
-        "       ]\n"
-        "   }\n"
-        "}";
-
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
-
-    QmlListModel *obj = qobject_cast<QmlListModel*>(component.create());
-    QVERIFY(obj != 0);
-
-    QScriptValue prop = obj->get(0).property(QLatin1String("attributes")).property(QLatin1String("count"));
-    QVERIFY(prop.isNumber());
-    QCOMPARE(prop.toInt32(), qint32(elementCount));
-
-    delete obj;
-}
-
-void tst_QmlListModel::static_nestedElements_data()
-{
-    QTest::addColumn<int>("elementCount");
-
-    QTest::newRow("0 items") << 0;
-    QTest::newRow("1 item") << 1;
-    QTest::newRow("2 items") << 2;
-    QTest::newRow("many items") << 5;
-}
-
-void tst_QmlListModel::dynamic_data()
-{
-    QTest::addColumn<QString>("script");
-    QTest::addColumn<int>("result");
-    QTest::addColumn<QString>("warning");
-
-    // Simple flat model
-
-    QTest::newRow("count") << "count" << 0 << "";
-
-    QTest::newRow("get1") << "{get(0)}" << 0 << "QML ListModel (unknown location) get: index 0 out of range";
-    QTest::newRow("get2") << "{get(-1)}" << 0 << "QML ListModel (unknown location) get: index -1 out of range";
-
-    QTest::newRow("append1") << "{append({'foo':123});count}" << 1 << "";
-    QTest::newRow("append2") << "{append({'foo':123,'bar':456});count}" << 1 << "";
-    QTest::newRow("append3a") << "{append({'foo':123});append({'foo':456});get(0).foo}" << 123 << "";
-    QTest::newRow("append3b") << "{append({'foo':123});append({'foo':456});get(1).foo}" << 456 << "";
-    QTest::newRow("append4a") << "{append(123)}" << 0 << "QML ListModel (unknown location) append: value is not an object";
-    QTest::newRow("append4b") << "{append([1,2,3])}" << 0 << "QML ListModel (unknown location) append: value is not an object";
-
-    QTest::newRow("clear1") << "{append({'foo':456});clear();count}" << 0 << "";
-    QTest::newRow("clear2") << "{append({'foo':123});append({'foo':456});clear();count}" << 0 << "";
-    QTest::newRow("clear2") << "{append({'foo':123});clear();get(0).foo}" << 0 << "QML ListModel (unknown location) get: index 0 out of range";
-
-    QTest::newRow("remove1") << "{append({'foo':123});remove(0);count}" << 0 << "";
-    QTest::newRow("remove2a") << "{append({'foo':123});append({'foo':456});remove(0);count}" << 1 << "";
-    QTest::newRow("remove2b") << "{append({'foo':123});append({'foo':456});remove(0);get(0).foo}" << 456 << "";
-    QTest::newRow("remove2c") << "{append({'foo':123});append({'foo':456});remove(1);get(0).foo}" << 123 << "";
-    QTest::newRow("remove3") << "{append({'foo':123});remove(0);get(0).foo}" << 0 << "QML ListModel (unknown location) get: index 0 out of range";
-    QTest::newRow("remove3a") << "{append({'foo':123});remove(-1)}" << 0 << "QML ListModel (unknown location) remove: index -1 out of range";
-    QTest::newRow("remove4a") << "{remove(0)}" << 0 << "QML ListModel (unknown location) remove: index 0 out of range";
-    QTest::newRow("remove4b") << "{append({'foo':123});remove(0);remove(0)}" << 0 << "QML ListModel (unknown location) remove: index 0 out of range";
-    QTest::newRow("remove4c") << "{append({'foo':123});remove(1)}" << 0 << "QML ListModel (unknown location) remove: index 1 out of range";
-
-    QTest::newRow("insert1") << "{insert(0,{'foo':123});count}" << 1 << "";
-    QTest::newRow("insert2") << "{insert(1,{'foo':123});count}" << 0 << "QML ListModel (unknown location) insert: index 1 out of range";
-    QTest::newRow("insert3a") << "{append({'foo':123});insert(1,{'foo':456});count}" << 2 << "";
-    QTest::newRow("insert3b") << "{append({'foo':123});insert(1,{'foo':456});get(0).foo}" << 123 << "";
-    QTest::newRow("insert3c") << "{append({'foo':123});insert(1,{'foo':456});get(1).foo}" << 456 << "";
-    QTest::newRow("insert3d") << "{append({'foo':123});insert(0,{'foo':456});get(0).foo}" << 456 << "";
-    QTest::newRow("insert3e") << "{append({'foo':123});insert(0,{'foo':456});get(1).foo}" << 123 << "";
-    QTest::newRow("insert4") << "{append({'foo':123});insert(-1,{'foo':456})}" << 0 << "QML ListModel (unknown location) insert: index -1 out of range";
-    QTest::newRow("insert5a") << "{insert(0,123)}" << 0 << "QML ListModel (unknown location) insert: value is not an object";
-    QTest::newRow("insert5b") << "{insert(0,[1,2,3])}" << 0 << "QML ListModel (unknown location) insert: value is not an object";
-
-    QTest::newRow("set1") << "{append({'foo':123});set(0,{'foo':456});count}" << 1 << "";
-    QTest::newRow("set2") << "{append({'foo':123});set(0,{'foo':456});get(0).foo}" << 456 << "";
-    QTest::newRow("set3a") << "{append({'foo':123,'bar':456});set(0,{'foo':999});get(0).foo}" << 999 << "";
-    QTest::newRow("set3b") << "{append({'foo':123,'bar':456});set(0,{'foo':999});get(0).bar}" << 456 << "";
-    QTest::newRow("set4a") << "{set(0,{'foo':456})}" << 0 << "QML ListModel (unknown location) set: index 0 out of range";
-    QTest::newRow("set4c") << "{set(-1,{'foo':456})}" << 0 << "QML ListModel (unknown location) set: index -1 out of range";
-    QTest::newRow("set5a") << "{append({'foo':123,'bar':456});set(0,123)}" << 0 << "QML ListModel (unknown location) set: value is not an object";
-    QTest::newRow("set5b") << "{append({'foo':123,'bar':456});set(0,[1,2,3])}" << 0 << "QML ListModel (unknown location) set: value is not an object";
-    QTest::newRow("set6") << "{append({'foo':123});set(1,{'foo':456});count}" << 2 << "";
-
-    QTest::newRow("setprop1") << "{append({'foo':123});setProperty(0,'foo',456);count}" << 1 << "";
-    QTest::newRow("setprop2") << "{append({'foo':123});setProperty(0,'foo',456);get(0).foo}" << 456 << "";
-    QTest::newRow("setprop3a") << "{append({'foo':123,'bar':456});setProperty(0,'foo',999);get(0).foo}" << 999 << "";
-    QTest::newRow("setprop3b") << "{append({'foo':123,'bar':456});setProperty(0,'foo',999);get(0).bar}" << 456 << "";
-    QTest::newRow("setprop4a") << "{setProperty(0,'foo',456)}" << 0 << "QML ListModel (unknown location) set: index 0 out of range";
-    QTest::newRow("setprop4b") << "{setProperty(-1,'foo',456)}" << 0 << "QML ListModel (unknown location) set: index -1 out of range";
-    QTest::newRow("setprop4c") << "{append({'foo':123,'bar':456});setProperty(1,'foo',456)}" << 0 << "QML ListModel (unknown location) set: index 1 out of range";
-    QTest::newRow("setprop5") << "{append({'foo':123,'bar':456});append({'foo':111});setProperty(1,'bar',222);get(1).bar}" << 222 << "";
-
-    QTest::newRow("move1a") << "{append({'foo':123});append({'foo':456});move(0,1,1);count}" << 2 << "";
-    QTest::newRow("move1b") << "{append({'foo':123});append({'foo':456});move(0,1,1);get(0).foo}" << 456 << "";
-    QTest::newRow("move1c") << "{append({'foo':123});append({'foo':456});move(0,1,1);get(1).foo}" << 123 << "";
-    QTest::newRow("move1d") << "{append({'foo':123});append({'foo':456});move(1,0,1);get(0).foo}" << 456 << "";
-    QTest::newRow("move1e") << "{append({'foo':123});append({'foo':456});move(1,0,1);get(1).foo}" << 123 << "";
-    QTest::newRow("move2a") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);count}" << 3 << "";
-    QTest::newRow("move2b") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);get(0).foo}" << 789 << "";
-    QTest::newRow("move2c") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);get(1).foo}" << 123 << "";
-    QTest::newRow("move2d") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);get(2).foo}" << 456 << "";
-    QTest::newRow("move3a") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(1,0,3)}" << 0 << "QML ListModel (unknown location) move: out of range";
-    QTest::newRow("move3b") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(1,-1,1)}" << 0 << "QML ListModel (unknown location) move: out of range";
-    QTest::newRow("move3c") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(1,0,-1)}" << 0 << "QML ListModel (unknown location) move: out of range";
-    QTest::newRow("move3d") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,3,1)}" << 0 << "QML ListModel (unknown location) move: out of range";
-
-    // Structured model
-
-    QTest::newRow("listprop1a") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});count}" << 1 << "";
-    QTest::newRow("listprop1b") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.get(1).a}" << 2 << "";
-    QTest::newRow("listprop2a") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.append({'a':4});get(0).bars.get(3).a}" << 4 << "";
-}
-
-void tst_QmlListModel::dynamic()
-{
-    QFETCH(QString, script);
-    QFETCH(int, result);
-    QFETCH(QString, warning);
-
-    QmlEngine engine;
-    QmlListModel model;
-    QmlEngine::setContextForObject(&model,engine.rootContext());
-    engine.rootContext()->addDefaultObject(&model);
-    QmlExpression e(engine.rootContext(), script, &model);
-    if (!warning.isEmpty())
-        QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
-    int actual = e.value().toInt();
-    if (e.hasError())
-        qDebug() << e.error(); // errors not expected
-    QVERIFY(!e.hasError());
-    QCOMPARE(actual,result);
-}
-
-void tst_QmlListModel::static_types_data()
-{
-    QTest::addColumn<QString>("qml");
-    QTest::addColumn<QVariant>("value");
-
-    QTest::newRow("string")
-        << "ListElement { foo: \"bar\" }"
-        << QVariant(QString("bar"));
-
-    QTest::newRow("real")
-        << "ListElement { foo: 10.5 }"
-        << QVariant(10.5);
-
-    QTest::newRow("real0")
-        << "ListElement { foo: 0 }"
-        << QVariant(double(0));
-
-    QTest::newRow("bool")
-        << "ListElement { foo: false }"
-        << QVariant(false);
-
-    QTest::newRow("bool")
-        << "ListElement { foo: true }"
-        << QVariant(true);
-
-    QTest::newRow("enum")
-        << "ListElement { foo: Text.AlignHCenter }"
-        << QVariant("QTBUG-5974:ListElement: constant script support for property value");
-}
-
-void tst_QmlListModel::static_types()
-{
-    QFETCH(QString, qml);
-    QFETCH(QVariant, value);
-
-    qml = "import Qt 4.6\nListModel { " + qml + " }";
-
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(qml.toUtf8(),
-                      QUrl::fromLocalFile(QString("dummy.qml")));
-
-    if (value.toString().startsWith("QTBUG-"))
-        QEXPECT_FAIL("",value.toString().toLatin1(),Abort);
-
-    QVERIFY(!component.isError());
-
-    QmlListModel *obj = qobject_cast<QmlListModel*>(component.create());
-    QVERIFY(obj != 0);
-
-    QScriptValue actual = obj->get(0).property(QLatin1String("foo"));
-
-    QCOMPARE(actual.isString(), value.type() == QVariant::String);
-    QCOMPARE(actual.isBoolean(), value.type() == QVariant::Bool);
-    QCOMPARE(actual.isNumber(), value.type() == QVariant::Double);
-
-    QCOMPARE(actual.toString(), value.toString());
-
-    delete obj;
-}
-
-void tst_QmlListModel::error_data()
-{
-    QTest::addColumn<QString>("qml");
-    QTest::addColumn<QString>("error");
-
-    QTest::newRow("id not allowed in ListElement")
-        << "import Qt 4.6\nListModel { ListElement { id: fred } }"
-        << "ListElement: cannot use reserved \"id\" property";
-
-    QTest::newRow("id allowed in ListModel")
-        << "import Qt 4.6\nListModel { id:model }"
-        << "";
-
-    QTest::newRow("random properties not allowed in ListModel")
-        << "import Qt 4.6\nListModel { foo:123 }"
-        << "ListModel: undefined property 'foo'";
-
-    QTest::newRow("random properties allowed in ListElement")
-        << "import Qt 4.6\nListModel { ListElement { foo:123 } }"
-        << "";
-
-    QTest::newRow("bindings not allowed in ListElement")
-        << "import Qt 4.6\nRectangle { id: rect; ListModel { ListElement { foo: rect.color } } }"
-        << "ListElement: cannot use script for property value"; // but note QTBUG-5974
-
-    QTest::newRow("random object list properties allowed in ListElement")
-        << "import Qt 4.6\nListModel { ListElement { foo: [ ListElement { bar: 123 } ] } }"
-        << "";
-
-    QTest::newRow("default properties not allowed in ListElement")
-        << "import Qt 4.6\nListModel { ListElement { Item { } } }"
-        << "QTBUG-6082 ListElement should not allow child objects";
-}
-
-void tst_QmlListModel::error()
-{
-    QFETCH(QString, qml);
-    QFETCH(QString, error);
-
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(qml.toUtf8(),
-                      QUrl::fromLocalFile(QString("dummy.qml")));
-    if (error.isEmpty()) {
-        QVERIFY(!component.isError());
-    } else {
-        if (error.startsWith(QLatin1String("QTBUG-")))
-            QEXPECT_FAIL("",error.toLatin1(),Abort);
-        QVERIFY(component.isError());
-        QList<QmlError> errors = component.errors();
-        QCOMPARE(errors.count(),1);
-        QCOMPARE(errors.at(0).description(),error);
-    }
-}
-
-QTEST_MAIN(tst_QmlListModel)
-
-#include "tst_qmllistmodel.moc"
diff --git a/tests/auto/declarative/qmllistreference/data/MyType.qml b/tests/auto/declarative/qmllistreference/data/MyType.qml
deleted file mode 100644
index d08f35b..0000000
--- a/tests/auto/declarative/qmllistreference/data/MyType.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int a
-}
diff --git a/tests/auto/declarative/qmllistreference/data/engineTypes.qml b/tests/auto/declarative/qmllistreference/data/engineTypes.qml
deleted file mode 100644
index 670aee4..0000000
--- a/tests/auto/declarative/qmllistreference/data/engineTypes.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property list<MyType> myList
-
-    myList: [ MyType { a: 1 },
-              MyType { a: 9 } ]
-
-}
diff --git a/tests/auto/declarative/qmllistreference/data/variantToList.qml b/tests/auto/declarative/qmllistreference/data/variantToList.qml
deleted file mode 100644
index 0c2d0aa..0000000
--- a/tests/auto/declarative/qmllistreference/data/variantToList.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property list<QtObject> myList;
-    myList: QtObject {}
-
-    property var value: myList
-    property int test: value.length
-}
-
diff --git a/tests/auto/declarative/qmllistreference/qmllistreference.pro b/tests/auto/declarative/qmllistreference/qmllistreference.pro
deleted file mode 100644
index fa49d5a..0000000
--- a/tests/auto/declarative/qmllistreference/qmllistreference.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmllistreference.cpp
diff --git a/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp b/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp
deleted file mode 100644
index db9f218..0000000
--- a/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp
+++ /dev/null
@@ -1,579 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QUrl>
-#include <QFileInfo>
-#include <QDir>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlprivate.h>
-#include <QDebug>
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    QFileInfo fileInfo(__FILE__);
-    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename));
-}
-
-inline QUrl TEST_FILE(const char *filename)
-{
-    return TEST_FILE(QLatin1String(filename));
-}
-
-class tst_qmllistreference : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmllistreference() {}
-
-private slots:
-    void initTestCase();
-    void qmllistreference();
-    void qmllistreference_invalid();
-    void isValid();
-    void object();
-    void listElementType();
-    void canAppend();
-    void canAt();
-    void canClear();
-    void canCount();
-    void append();
-    void at();
-    void clear();
-    void count();
-    void copy();
-    void qmlmetaproperty();
-    void engineTypes();
-    void variantToList();
-};
-
-class TestType : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QmlListProperty<TestType> data READ dataProperty);
-    Q_PROPERTY(int intProperty READ intProperty);
-
-public:
-    TestType() : property(this, data) {}
-    QmlListProperty<TestType> dataProperty() { return property; }
-    int intProperty() const { return 10; }
-
-    QList<TestType *> data;
-    QmlListProperty<TestType> property;
-};
-QML_DECLARE_TYPE(TestType);
-
-void tst_qmllistreference::initTestCase()
-{
-    QML_REGISTER_NOCREATE_TYPE(TestType);
-}
-
-void tst_qmllistreference::qmllistreference()
-{
-    TestType tt;
-
-    QmlListReference r(&tt, "data");
-    QVERIFY(r.isValid() == true);
-    QCOMPARE(r.count(), 0);
-
-    tt.data.append(&tt);
-    QCOMPARE(r.count(), 1);
-}
-
-void tst_qmllistreference::qmllistreference_invalid()
-{
-    TestType tt;
-
-    // Invalid
-    {
-    QmlListReference r;
-    QVERIFY(r.isValid() == false);
-    QVERIFY(r.object() == 0);
-    QVERIFY(r.listElementType() == 0);
-    QVERIFY(r.canAt() == false);
-    QVERIFY(r.canClear() == false);
-    QVERIFY(r.canCount() == false);
-    QVERIFY(r.append(0) == false);
-    QVERIFY(r.at(10) == 0);
-    QVERIFY(r.clear() == false);
-    QVERIFY(r.count() == 0);
-    }
-
-    // Non-property
-    {
-    QmlListReference r(&tt, "blah");
-    QVERIFY(r.isValid() == false);
-    QVERIFY(r.object() == 0);
-    QVERIFY(r.listElementType() == 0);
-    QVERIFY(r.canAt() == false);
-    QVERIFY(r.canClear() == false);
-    QVERIFY(r.canCount() == false);
-    QVERIFY(r.append(0) == false);
-    QVERIFY(r.at(10) == 0);
-    QVERIFY(r.clear() == false);
-    QVERIFY(r.count() == 0);
-    }
-
-    // Non-list property
-    {
-    QmlListReference r(&tt, "intProperty");
-    QVERIFY(r.isValid() == false);
-    QVERIFY(r.object() == 0);
-    QVERIFY(r.listElementType() == 0);
-    QVERIFY(r.canAt() == false);
-    QVERIFY(r.canClear() == false);
-    QVERIFY(r.canCount() == false);
-    QVERIFY(r.append(0) == false);
-    QVERIFY(r.at(10) == 0);
-    QVERIFY(r.clear() == false);
-    QVERIFY(r.count() == 0);
-    }
-}
-
-void tst_qmllistreference::isValid()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.isValid() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.isValid() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.isValid() == true);
-    delete tt;
-    QVERIFY(ref.isValid() == false);
-    }
-}
-
-void tst_qmllistreference::object()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.object() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.object() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.object() == tt);
-    delete tt;
-    QVERIFY(ref.object() == 0);
-    }
-}
-
-void tst_qmllistreference::listElementType()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.listElementType() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.listElementType() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
-    delete tt;
-    QVERIFY(ref.listElementType() == 0);
-    }
-}
-
-void tst_qmllistreference::canAppend()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.canAppend() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.canAppend() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.canAppend() == true);
-    delete tt;
-    QVERIFY(ref.canAppend() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.append = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.canAppend() == false);
-    }
-}
-
-void tst_qmllistreference::canAt()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.canAt() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.canAt() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.canAt() == true);
-    delete tt;
-    QVERIFY(ref.canAt() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.at = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.canAt() == false);
-    }
-}
-
-void tst_qmllistreference::canClear()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.canClear() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.canClear() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.canClear() == true);
-    delete tt;
-    QVERIFY(ref.canClear() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.clear = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.canClear() == false);
-    }
-}
-
-void tst_qmllistreference::canCount()
-{
-    TestType *tt = new TestType;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.canCount() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.canCount() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.canCount() == true);
-    delete tt;
-    QVERIFY(ref.canCount() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.count = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.canCount() == false);
-    }
-}
-
-void tst_qmllistreference::append()
-{
-    TestType *tt = new TestType;
-    QObject object;
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.append(tt) == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.append(tt) == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.append(tt) == true);
-    QVERIFY(tt->data.count() == 1);
-    QVERIFY(tt->data.at(0) == tt);
-    QVERIFY(ref.append(&object) == false);
-    QVERIFY(tt->data.count() == 1);
-    QVERIFY(tt->data.at(0) == tt);
-    QVERIFY(ref.append(0) == true);
-    QVERIFY(tt->data.count() == 2);
-    QVERIFY(tt->data.at(0) == tt);
-    QVERIFY(tt->data.at(1) == 0);
-    delete tt;
-    QVERIFY(ref.append(0) == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.append = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.append(&tt) == false);
-    }
-}
-
-void tst_qmllistreference::at()
-{
-    TestType *tt = new TestType;
-    tt->data.append(tt);
-    tt->data.append(0);
-    tt->data.append(tt);
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.at(0) == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.at(0) == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.at(0) == tt);
-    QVERIFY(ref.at(1) == 0);
-    QVERIFY(ref.at(2) == tt);
-    delete tt;
-    QVERIFY(ref.at(0) == 0);
-    }
-
-    {
-    TestType tt;
-    tt.data.append(&tt);
-    tt.property.at = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.at(0) == 0);
-    }
-}
-
-void tst_qmllistreference::clear()
-{
-    TestType *tt = new TestType;
-    tt->data.append(tt);
-    tt->data.append(0);
-    tt->data.append(tt);
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.clear() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.clear() == false);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.clear() == true);
-    QVERIFY(tt->data.count() == 0);
-    delete tt;
-    QVERIFY(ref.clear() == false);
-    }
-
-    {
-    TestType tt;
-    tt.property.clear = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.clear() == false);
-    }
-}
-
-void tst_qmllistreference::count()
-{
-    TestType *tt = new TestType;
-    tt->data.append(tt);
-    tt->data.append(0);
-    tt->data.append(tt);
-
-    {
-    QmlListReference ref;
-    QVERIFY(ref.count() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "blah");
-    QVERIFY(ref.count() == 0);
-    }
-
-    {
-    QmlListReference ref(tt, "data");
-    QVERIFY(ref.count() == 3);
-    tt->data.removeAt(1);
-    QVERIFY(ref.count() == 2);
-    delete tt;
-    QVERIFY(ref.count() == 0);
-    }
-
-    {
-    TestType tt;
-    tt.data.append(&tt);
-    tt.property.count = 0;
-    QmlListReference ref(&tt, "data");
-    QVERIFY(ref.count() == 0);
-    }
-}
-
-void tst_qmllistreference::copy()
-{
-    TestType tt;
-    tt.data.append(&tt);
-    tt.data.append(0);
-    tt.data.append(&tt);
-
-    QmlListReference *r1 = new QmlListReference(&tt, "data");
-    QVERIFY(r1->count() == 3);
-
-    QmlListReference r2(*r1);
-    QmlListReference r3;
-    r3 = *r1;
-
-    QVERIFY(r2.count() == 3);
-    QVERIFY(r3.count() == 3);
-
-    delete r1;
-
-    QVERIFY(r2.count() == 3);
-    QVERIFY(r3.count() == 3);
-
-    tt.data.removeAt(2);
-
-    QVERIFY(r2.count() == 2);
-    QVERIFY(r3.count() == 2);
-}
-
-void tst_qmllistreference::qmlmetaproperty()
-{
-    TestType tt;
-    tt.data.append(&tt);
-    tt.data.append(0);
-    tt.data.append(&tt);
-
-    QmlMetaProperty prop(&tt, QLatin1String("data"));
-    QVariant v = prop.read();
-    QVERIFY(v.userType() == qMetaTypeId<QmlListReference>());
-    QmlListReference ref = qvariant_cast<QmlListReference>(v);
-    QVERIFY(ref.count() == 3);
-    QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
-}
-
-void tst_qmllistreference::engineTypes()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("engineTypes.qml"));
-
-    QObject *o = component.create();
-    QVERIFY(o);
-
-    QmlMetaProperty p1(o, QLatin1String("myList"));
-    QVERIFY(p1.propertyCategory() == QmlMetaProperty::Normal);
-
-    QmlMetaProperty p2(o, QLatin1String("myList"), engine.rootContext());
-    QVERIFY(p2.propertyCategory() == QmlMetaProperty::List);
-    QVariant v = p2.read();
-    QVERIFY(v.userType() == qMetaTypeId<QmlListReference>());
-    QmlListReference ref = qvariant_cast<QmlListReference>(v);
-    QVERIFY(ref.count() == 2);
-    QVERIFY(ref.listElementType());
-    QVERIFY(ref.listElementType() != &QObject::staticMetaObject);
-
-    delete o;
-}
-
-void tst_qmllistreference::variantToList()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("variantToList.qml"));
-
-    QObject *o = component.create();
-    QVERIFY(o);
-
-    QVERIFY(o->property("value").userType() == qMetaTypeId<QmlListReference>());
-    QCOMPARE(o->property("test").toInt(), 1);
-
-    delete o;
-}
-
-QTEST_MAIN(tst_qmllistreference)
-
-#include "tst_qmllistreference.moc"
diff --git a/tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro b/tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro
deleted file mode 100644
index 542c14e..0000000
--- a/tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlmetaproperty.cpp
diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
deleted file mode 100644
index 7bb3e96..0000000
--- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ /dev/null
@@ -1,1184 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlmetaproperty.h>
-#include <private/qguard_p.h>
-#include <private/qmlbinding_p.h>
-#include <QtGui/QLineEdit>
-
-class MyQmlObject : public QObject
-{
-    Q_OBJECT
-public:
-    MyQmlObject() {}
-};
-
-QML_DECLARE_TYPE(MyQmlObject);
-
-class MyAttached : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int foo READ foo WRITE setFoo)
-public:
-    MyAttached(QObject *parent) : QObject(parent), m_foo(13) {}
-
-    int foo() const { return m_foo; }
-    void setFoo(int f) { m_foo = f; }
-
-private:
-    int m_foo;
-};
-
-class MyContainer : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QmlListProperty<MyQmlObject> children READ children)
-public:
-    MyContainer() {}
-
-    QmlListProperty<MyQmlObject> children() { return QmlListProperty<MyQmlObject>(this, m_children); }
-
-    static MyAttached *qmlAttachedProperties(QObject *o) {
-        return new MyAttached(o);
-    }
-
-private:
-    QList<MyQmlObject*> m_children;
-};
-
-QML_DECLARE_TYPE(MyContainer);
-QML_DECLARE_TYPEINFO(MyContainer, QML_HAS_ATTACHED_PROPERTIES)
-
-class tst_qmlmetaproperty : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlmetaproperty() {}
-
-private slots:
-    void initTestCase();
-
-    // Constructors
-    void qmlmetaproperty();
-    void qmlmetaproperty_object();
-    void qmlmetaproperty_object_string();
-    void qmlmetaproperty_object_context();
-    void qmlmetaproperty_object_string_context();
-
-    // Methods
-    void name();
-    void read();
-    void write();
-    void reset();
-
-    // Functionality
-    void writeObjectToList();
-    void writeListToList();
-
-    //writeToReadOnly();
-
-    // Bugs
-    void crashOnValueProperty();
-
-    void copy();
-private:
-    QmlEngine engine;
-};
-
-void tst_qmlmetaproperty::initTestCase()
-{
-    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
-    QML_REGISTER_TYPE(Test,1,0,PropertyObject,PropertyObject);
-    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
-}
-
-void tst_qmlmetaproperty::qmlmetaproperty()
-{
-    QmlMetaProperty prop;
-
-    QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-    QVERIFY(binding != 0);
-    QGuard<QmlExpression> expression(new QmlExpression());
-    QVERIFY(expression != 0);
-
-    QObject *obj = new QObject;
-
-    QCOMPARE(prop.name(), QString());
-    QCOMPARE(prop.read(), QVariant());
-    QCOMPARE(prop.write(QVariant()), false);
-    QCOMPARE(prop.hasChangedNotifier(), false);
-    QCOMPARE(prop.needsChangedNotifier(), false);
-    QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-    QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-    QCOMPARE(prop.connectNotifier(obj, 0), false);
-    QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-    QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-    QCOMPARE(prop.connectNotifier(obj, -1), false);
-    QVERIFY(prop.method().signature() == 0);
-    QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
-    QCOMPARE(prop.isProperty(), false);
-    QCOMPARE(prop.isDefault(), false);
-    QCOMPARE(prop.isWritable(), false);
-    QCOMPARE(prop.isDesignable(), false);
-    QCOMPARE(prop.isResettable(), false);
-    QCOMPARE(prop.isValid(), false);
-    QCOMPARE(prop.object(), (QObject *)0);
-    QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
-    QCOMPARE(prop.propertyType(), 0);
-    QCOMPARE(prop.propertyTypeName(), (const char *)0);
-    QVERIFY(prop.property().name() == 0);
-    QVERIFY(prop.binding() == 0);
-    QVERIFY(prop.setBinding(binding) == 0);
-    QVERIFY(binding == 0);
-    QVERIFY(prop.signalExpression() == 0);
-    QVERIFY(prop.setSignalExpression(expression) == 0);
-    QVERIFY(expression == 0);
-    QCOMPARE(prop.coreIndex(), -1);
-    QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-    delete obj;
-}
-
-class PropertyObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int defaultProperty READ defaultProperty);
-    Q_PROPERTY(QRect rectProperty READ rectProperty);
-    Q_PROPERTY(QRect wrectProperty READ wrectProperty WRITE setWRectProperty);
-    Q_PROPERTY(QUrl url READ url WRITE setUrl);
-    Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty);
-
-    Q_CLASSINFO("DefaultProperty", "defaultProperty");
-public:
-    PropertyObject() : m_resetProperty(9) {}
-
-    int defaultProperty() { return 10; }
-    QRect rectProperty() { return QRect(10, 10, 1, 209); }
-
-    QRect wrectProperty() { return m_rect; }
-    void setWRectProperty(const QRect &r) { m_rect = r; }
-
-    QUrl url() { return m_url; }
-    void setUrl(const QUrl &u) { m_url = u; }
-
-    int resettableProperty() const { return m_resetProperty; }
-    void setResettableProperty(int r) { m_resetProperty = r; }
-    void resetProperty() { m_resetProperty = 9; }
-
-signals:
-    void clicked();
-
-private:
-    int m_resetProperty;
-    QRect m_rect;
-    QUrl m_url;
-};
-
-QML_DECLARE_TYPE(PropertyObject);
-
-void tst_qmlmetaproperty::qmlmetaproperty_object()
-{
-    QObject object; // Has no default property
-    PropertyObject dobject; // Has default property
-
-    {
-        QmlMetaProperty prop(&object);
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString());
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), false);
-        QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QVERIFY(prop.property().name() == 0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-
-    {
-        QmlMetaProperty prop(&dobject);
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("defaultProperty"));
-        QCOMPARE(prop.read(), QVariant(10));
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), (QmlMetaProperty::Type)(QmlMetaProperty::Property | QmlMetaProperty::Default));
-        QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), true);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), true);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal);
-        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
-        QCOMPARE(prop.propertyTypeName(), "int");
-        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(prop.binding() == 0);
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding != 0);
-        QVERIFY(prop.binding() == binding);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-}
-
-void tst_qmlmetaproperty::qmlmetaproperty_object_string()
-{
-    QObject object; 
-    PropertyObject dobject; 
-
-    {
-        QmlMetaProperty prop(&object, QString("defaultProperty"));
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString());
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), false);
-        QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QVERIFY(prop.property().name() == 0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-
-    {
-        QmlMetaProperty prop(&dobject, QString("defaultProperty"));
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("defaultProperty"));
-        QCOMPARE(prop.read(), QVariant(10));
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Property);
-        QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), true);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal);
-        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
-        QCOMPARE(prop.propertyTypeName(), "int");
-        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(prop.binding() == 0);
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding != 0);
-        QVERIFY(prop.binding() == binding);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-
-    {
-        QmlMetaProperty prop(&dobject, QString("onClicked"));
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("onClicked"));
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant("Hello")), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
-        QCOMPARE(prop.type(), QmlMetaProperty::SignalProperty);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QCOMPARE(prop.property().name(), (const char *)0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression != 0);
-        QVERIFY(prop.signalExpression() == expression);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-}
-
-void tst_qmlmetaproperty::qmlmetaproperty_object_context()
-{
-    QObject object; // Has no default property
-    PropertyObject dobject; // Has default property
-
-    {
-        QmlMetaProperty prop(&object, engine.rootContext());
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString());
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), false);
-        QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QVERIFY(prop.property().name() == 0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-
-    {
-        QmlMetaProperty prop(&dobject, engine.rootContext());
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("defaultProperty"));
-        QCOMPARE(prop.read(), QVariant(10));
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), (QmlMetaProperty::Type)(QmlMetaProperty::Property | QmlMetaProperty::Default));
-        QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), true);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), true);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal);
-        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
-        QCOMPARE(prop.propertyTypeName(), "int");
-        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(prop.binding() == 0);
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding != 0);
-        QVERIFY(prop.binding() == binding);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-}
-
-void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
-{
-    QObject object; 
-    PropertyObject dobject; 
-
-    {
-        QmlMetaProperty prop(&object, QString("defaultProperty"), engine.rootContext());
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString());
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), false);
-        QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QVERIFY(prop.property().name() == 0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-
-    {
-        QmlMetaProperty prop(&dobject, QString("defaultProperty"), engine.rootContext());
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("defaultProperty"));
-        QCOMPARE(prop.read(), QVariant(10));
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Property);
-        QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), true);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal);
-        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
-        QCOMPARE(prop.propertyTypeName(), "int");
-        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(prop.binding() == 0);
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding != 0);
-        QVERIFY(prop.binding() == binding);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-
-    {
-        QmlMetaProperty prop(&dobject, QString("onClicked"), engine.rootContext());
-
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("onClicked"));
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant("Hello")), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
-        QCOMPARE(prop.type(), QmlMetaProperty::SignalProperty);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QCOMPARE(prop.property().name(), (const char *)0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
-        QVERIFY(expression != 0);
-        QVERIFY(prop.signalExpression() == expression);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
-
-        delete obj;
-    }
-}
-
-void tst_qmlmetaproperty::name()
-{
-    { 
-        QmlMetaProperty p;
-        QCOMPARE(p.name(), QString());
-    }
-
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o);
-        QCOMPARE(p.name(), QString("defaultProperty"));
-    }
-
-    {
-        QObject o;
-        QmlMetaProperty p(&o, QString("objectName"));
-        QCOMPARE(p.name(), QString("objectName"));
-    }
-
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, "onClicked");
-        QCOMPARE(p.name(), QString("onClicked"));
-    }
-
-    {
-        QObject o;
-        QmlMetaProperty p(&o, "onClicked");
-        QCOMPARE(p.name(), QString());
-    }
-
-    {
-        QObject o;
-        QmlMetaProperty p(&o, "foo");
-        QCOMPARE(p.name(), QString());
-    }
-
-    {
-        QmlMetaProperty p(0, "foo");
-        QCOMPARE(p.name(), QString());
-    }
-
-    {
-        PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty");
-        QCOMPARE(p.name(), QString("rectProperty"));
-    }
-
-    {
-        PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.x");
-        QCOMPARE(p.name(), QString("rectProperty.x"));
-    }
-
-    {
-        PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.foo");
-        QCOMPARE(p.name(), QString());
-    }
-}
-
-void tst_qmlmetaproperty::read()
-{
-    // Invalid 
-    {
-        QmlMetaProperty p;
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Default prop
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o);
-        QCOMPARE(p.read(), QVariant(10));
-    }
-
-    // Invalid default prop
-    {
-        QObject o;
-        QmlMetaProperty p(&o);
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Value prop by name
-    {
-        QObject o;
-
-        QmlMetaProperty p(&o, "objectName");
-        QCOMPARE(p.read(), QVariant(QString()));
-
-        o.setObjectName("myName");
-
-        QCOMPARE(p.read(), QVariant("myName"));
-    }
-
-    // Value-type prop
-    {
-        PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.x");
-        QCOMPARE(p.read(), QVariant(10));
-    }
-
-    // Invalid value-type prop
-    {
-        PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.foo");
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Signal property
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, "onClicked");
-        QCOMPARE(p.read(), QVariant());
-
-        QVERIFY(0 == p.setSignalExpression(new QmlExpression()));
-        QVERIFY(0 != p.signalExpression());
-
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Deleted object
-    {
-        PropertyObject *o = new PropertyObject;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(o, "rectProperty.x");
-        QCOMPARE(p.read(), QVariant(10));
-        delete o;
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Attached property
-    {
-        QmlComponent component(&engine);
-        component.setData("import Test 1.0\nMyContainer { }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
-        QCOMPARE(p.read(), QVariant(13));
-        delete object;
-    }
-    {
-        QmlComponent component(&engine);
-        component.setData("import Test 1.0\nMyContainer { MyContainer.foo: 10 }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
-        QCOMPARE(p.read(), QVariant(10));
-        delete object;
-    }
-    {
-        QmlComponent component(&engine);
-        component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
-        QCOMPARE(p.read(), QVariant(10));
-        delete object;
-    }
-}
-
-void tst_qmlmetaproperty::write()
-{
-    // Invalid
-    {
-        QmlMetaProperty p;
-        QCOMPARE(p.write(QVariant(10)), false);
-    }
-
-    // Read-only default prop
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o);
-        QCOMPARE(p.write(QVariant(10)), false);
-    }
-
-    // Invalid default prop
-    {
-        QObject o;
-        QmlMetaProperty p(&o);
-        QCOMPARE(p.write(QVariant(10)), false);
-    }
-
-    // Read-only prop by name
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, QString("defaultProperty"));
-        QCOMPARE(p.write(QVariant(10)), false);
-    }
-
-    // Writable prop by name
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, QString("objectName"));
-        QCOMPARE(o.objectName(), QString());
-        QCOMPARE(p.write(QVariant(QString("myName"))), true);
-        QCOMPARE(o.objectName(), QString("myName"));
-    }
-
-    // Deleted object
-    {
-        PropertyObject *o = new PropertyObject;
-        QmlMetaProperty p(o, QString("objectName"));
-        QCOMPARE(p.write(QVariant(QString("myName"))), true);
-        QCOMPARE(o->objectName(), QString("myName"));
-
-        delete o;
-
-        QCOMPARE(p.write(QVariant(QString("myName"))), false);
-    }
-
-    // Signal property
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, "onClicked");
-        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
-
-        QVERIFY(0 == p.setSignalExpression(new QmlExpression()));
-        QVERIFY(0 != p.signalExpression());
-
-        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
-
-        QVERIFY(0 != p.signalExpression());
-    }
-
-    // Value-type property
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, "wrectProperty");
-
-        QCOMPARE(o.wrectProperty(), QRect());
-        QCOMPARE(p.write(QRect(1, 13, 99, 8)), true);
-        QCOMPARE(o.wrectProperty(), QRect(1, 13, 99, 8));
-
-        QmlMetaProperty p2 = QmlMetaProperty::createProperty(&o, "wrectProperty.x");
-        QCOMPARE(p2.read(), QVariant(1));
-        QCOMPARE(p2.write(QVariant(6)), true);
-        QCOMPARE(p2.read(), QVariant(6));
-        QCOMPARE(o.wrectProperty(), QRect(6, 13, 99, 8));
-    }
-
-    // URL-property
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, "url");
-
-        QCOMPARE(p.write(QUrl("main.qml")), true);
-        QCOMPARE(o.url(), QUrl("main.qml"));
-
-        QmlMetaProperty p2(&o, "url", engine.rootContext());
-
-        QUrl result = engine.baseUrl().resolved(QUrl("main.qml"));
-        QVERIFY(result != QUrl("main.qml"));
-
-        QCOMPARE(p2.write(QUrl("main.qml")), true);
-        QCOMPARE(o.url(), result);
-    }
-
-    // Attached property
-    {
-        QmlComponent component(&engine);
-        component.setData("import Test 1.0\nMyContainer { }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
-        p.write(QVariant(99));
-        QCOMPARE(p.read(), QVariant(99));
-        delete object;
-    }
-    {
-        QmlComponent component(&engine);
-        component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
-        p.write(QVariant(99));
-        QCOMPARE(p.read(), QVariant(99));
-        delete object;
-    }
-}
-
-void tst_qmlmetaproperty::reset()
-{
-    // Invalid
-    {
-        QmlMetaProperty p;
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Read-only default prop
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o);
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Invalid default prop
-    {
-        QObject o;
-        QmlMetaProperty p(&o);
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Non-resettable-only prop by name
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, QString("defaultProperty"));
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Resettable prop by name
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, QString("resettableProperty"));
-
-        QCOMPARE(p.read(), QVariant(9));
-        QCOMPARE(p.write(QVariant(11)), true);
-        QCOMPARE(p.read(), QVariant(11));
-
-        QCOMPARE(p.isResettable(), true);
-        QCOMPARE(p.reset(), true);
-
-        QCOMPARE(p.read(), QVariant(9));
-    }
-
-    // Deleted object
-    {
-        PropertyObject *o = new PropertyObject;
-
-        QmlMetaProperty p(o, QString("resettableProperty"));
-
-        QCOMPARE(p.isResettable(), true);
-        QCOMPARE(p.reset(), true);
-
-        delete o;
-
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Signal property
-    {
-        PropertyObject o;
-        QmlMetaProperty p(&o, "onClicked");
-
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-}
-
-void tst_qmlmetaproperty::writeObjectToList()
-{
-    QmlComponent containerComponent(&engine);
-    containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
-    MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
-    QVERIFY(container != 0);
-    QmlListReference list(container, "children");
-    QVERIFY(list.count() == 1);
-
-    MyQmlObject *object = new MyQmlObject;
-    QmlMetaProperty prop(container, "children");
-    prop.write(qVariantFromValue(object));
-    QCOMPARE(list.count(), 1);
-    QCOMPARE(list.at(0), object);
-}
-
-Q_DECLARE_METATYPE(QList<QObject *>);
-void tst_qmlmetaproperty::writeListToList()
-{
-    QmlComponent containerComponent(&engine);
-    containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
-    MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
-    QVERIFY(container != 0);
-    QmlListReference list(container, "children");
-    QVERIFY(list.count() == 1);
-
-    QList<QObject*> objList;
-    objList << new MyQmlObject() << new MyQmlObject() << new MyQmlObject() << new MyQmlObject();
-    QmlMetaProperty prop(container, "children");
-    prop.write(qVariantFromValue(objList));
-    QCOMPARE(list.count(), 4);
-
-    //XXX need to try this with read/write prop (for read-only it correctly doesn't write)
-    /*QList<MyQmlObject*> typedObjList;
-    typedObjList << new MyQmlObject();
-    prop.write(qVariantFromValue(&typedObjList));
-    QCOMPARE(container->children()->size(), 1);*/
-}
-
-void tst_qmlmetaproperty::crashOnValueProperty()
-{
-    QmlEngine *engine = new QmlEngine;
-    QmlComponent component(engine);
-
-    component.setData("import Test 1.0\nPropertyObject { wrectProperty.x: 10 }", QUrl());
-    PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
-    QVERIFY(obj != 0);
-
-    QmlMetaProperty p = QmlMetaProperty::createProperty(obj, "wrectProperty.x", qmlContext(obj));
-    QCOMPARE(p.name(), QString("wrectProperty.x"));
-
-    QCOMPARE(p.read(), QVariant(10));
-
-    //don't crash once the engine is deleted
-    delete engine;
-    engine = 0;
-
-    QCOMPARE(p.propertyTypeName(), "int");
-    QCOMPARE(p.read(), QVariant(10));
-    p.write(QVariant(20));
-    QCOMPARE(p.read(), QVariant(20));
-}
-
-void tst_qmlmetaproperty::copy()
-{
-    PropertyObject object;
-
-    QmlMetaProperty *property = new QmlMetaProperty(&object, QLatin1String("defaultProperty"));
-    QCOMPARE(property->name(), QString("defaultProperty"));
-    QCOMPARE(property->read(), QVariant(10));
-    QCOMPARE(property->type(), QmlMetaProperty::Property);
-    QCOMPARE(property->propertyCategory(), QmlMetaProperty::Normal);
-    QCOMPARE(property->propertyType(), (int)QVariant::Int);
-
-    QmlMetaProperty p1(*property);
-    QCOMPARE(p1.name(), QString("defaultProperty"));
-    QCOMPARE(p1.read(), QVariant(10));
-    QCOMPARE(p1.type(), QmlMetaProperty::Property);
-    QCOMPARE(p1.propertyCategory(), QmlMetaProperty::Normal);
-    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
-
-    QmlMetaProperty p2(&object, QLatin1String("url"));
-    QCOMPARE(p2.name(), QString("url"));
-    p2 = *property;
-    QCOMPARE(p2.name(), QString("defaultProperty"));
-    QCOMPARE(p2.read(), QVariant(10));
-    QCOMPARE(p2.type(), QmlMetaProperty::Property);
-    QCOMPARE(p2.propertyCategory(), QmlMetaProperty::Normal);
-    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
-
-    delete property; property = 0;
-
-    QCOMPARE(p1.name(), QString("defaultProperty"));
-    QCOMPARE(p1.read(), QVariant(10));
-    QCOMPARE(p1.type(), QmlMetaProperty::Property);
-    QCOMPARE(p1.propertyCategory(), QmlMetaProperty::Normal);
-    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
-
-    QCOMPARE(p2.name(), QString("defaultProperty"));
-    QCOMPARE(p2.read(), QVariant(10));
-    QCOMPARE(p2.type(), QmlMetaProperty::Property);
-    QCOMPARE(p2.propertyCategory(), QmlMetaProperty::Normal);
-    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
-}
-
-QTEST_MAIN(tst_qmlmetaproperty)
-
-#include "tst_qmlmetaproperty.moc"
diff --git a/tests/auto/declarative/qmlmetatype/qmlmetatype.pro b/tests/auto/declarative/qmlmetatype/qmlmetatype.pro
deleted file mode 100644
index 3a9a400..0000000
--- a/tests/auto/declarative/qmlmetatype/qmlmetatype.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlmetatype.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp b/tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp
deleted file mode 100644
index 027b607..0000000
--- a/tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp
+++ /dev/null
@@ -1,377 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QmlMetaType>
-#include <QLocale>
-#include <QPixmap>
-#include <QBitmap>
-#include <QPen>
-#include <QTextLength>
-#include <QMatrix4x4>
-#include <QVector2D>
-#include <QVector3D>
-#include <QVector4D>
-#include <QQuaternion>
-#include <qml.h>
-
-class tst_qmlmetatype : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlmetatype() {}
-
-private slots:
-    void initTestCase();
-
-    void copy();
-
-    void qmlParserStatusCast();
-    void qmlPropertyValueSourceCast();
-    void qmlPropertyValueInterceptorCast();
-
-    void isList();
-
-    void defaultObject();
-};
-
-class TestType : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int foo READ foo);
-
-    Q_CLASSINFO("DefaultProperty", "foo");
-public:
-    int foo() { return 0; }
-};
-QML_DECLARE_TYPE(TestType);
-
-class ParserStatusTestType : public QObject, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_CLASSINFO("DefaultProperty", "foo"); // Missing default property
-};
-QML_DECLARE_TYPE(ParserStatusTestType);
-
-class ValueSourceTestType : public QObject, public QmlPropertyValueSource
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlPropertyValueSource)
-public:
-    virtual void setTarget(const QmlMetaProperty &) {}
-};
-QML_DECLARE_TYPE(ValueSourceTestType);
-
-class ValueInterceptorTestType : public QObject, public QmlPropertyValueInterceptor
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlPropertyValueInterceptor)
-public:
-    virtual void setTarget(const QmlMetaProperty &) {}
-    virtual void write(const QVariant &) {}
-};
-QML_DECLARE_TYPE(ValueInterceptorTestType);
-
-
-#define COPY_TEST(cpptype, metatype, value, defaultvalue) \
-{ \
-    cpptype v = (value); cpptype v2 = (value); \
-    QVERIFY(QmlMetaType::copy(QMetaType:: metatype, &v, 0)); \
-    QVERIFY(v == (defaultvalue)); \
-    QVERIFY(QmlMetaType::copy(QMetaType:: metatype, &v, &v2)); \
-    QVERIFY(v == (value)); \
-}
-
-#define QT_COPY_TEST(type, value) \
-{ \
-    type v = (value); type v2 = (value); \
-    QVERIFY(QmlMetaType::copy(QMetaType:: type, &v, 0)); \
-    QVERIFY(v == (type ())); \
-    QVERIFY(QmlMetaType::copy(QMetaType:: type, &v, &v2)); \
-    QVERIFY(v == (value)); \
-}
-
-void tst_qmlmetatype::initTestCase()
-{
-    QML_REGISTER_TYPE(Test, 1, 0, TestType, TestType);
-    QML_REGISTER_TYPE(Test, 1, 0, ParserStatusTestType, ParserStatusTestType);
-    QML_REGISTER_TYPE(Test, 1, 0, ValueSourceTestType, ValueSourceTestType);
-    QML_REGISTER_TYPE(Test, 1, 0, ValueInterceptorTestType, ValueInterceptorTestType);
-}
-
-void tst_qmlmetatype::copy()
-{
-    QVERIFY(QmlMetaType::copy(QMetaType::Void, 0, 0));
-
-    COPY_TEST(bool, Bool, true, false);
-    COPY_TEST(int, Int, 10, 0);
-    COPY_TEST(unsigned int, UInt, 10, 0);
-    COPY_TEST(long long, LongLong, 10, 0);
-    COPY_TEST(unsigned long long, ULongLong, 10, 0);
-    COPY_TEST(double, Double, 19.2, 0);
-
-    QT_COPY_TEST(QChar, QChar('a'));
-
-    QVariantMap variantMap;
-    variantMap.insert("Hello World!", QVariant(10));
-    QT_COPY_TEST(QVariantMap, variantMap);
-
-    QT_COPY_TEST(QVariantList, QVariantList() << QVariant(19.2));
-    QT_COPY_TEST(QString, QString("QML Rocks!"));
-    QT_COPY_TEST(QStringList, QStringList() << "QML" << "Rocks");
-    QT_COPY_TEST(QByteArray, QByteArray("0x1102DDD"));
-    QT_COPY_TEST(QBitArray, QBitArray(102, true));
-    QDate cd = QDate::currentDate();
-    QT_COPY_TEST(QDate, cd);
-    QTime ct = QTime::currentTime();
-    QT_COPY_TEST(QTime, ct);
-    QDateTime cdt = QDateTime::currentDateTime();
-    QT_COPY_TEST(QDateTime, cdt);
-    QT_COPY_TEST(QUrl, QUrl("http://www.nokia.com"));
-    QT_COPY_TEST(QLocale, QLocale(QLocale::English, QLocale::Australia));
-    QT_COPY_TEST(QRect, QRect(-10, 10, 102, 99));
-    QT_COPY_TEST(QRectF, QRectF(-10.2, 1.2, 102, 99.6));
-    QT_COPY_TEST(QSize, QSize(100, 2));
-    QT_COPY_TEST(QSizeF, QSizeF(20.2, -100234.2)); 
-    QT_COPY_TEST(QLine, QLine(0, 0, 100, 100));
-    QT_COPY_TEST(QLineF, QLineF(-10.2, 0, 103, 1));
-    QT_COPY_TEST(QPoint, QPoint(-1912, 1613));
-    QT_COPY_TEST(QPointF, QPointF(-908.1, 1612));
-    QT_COPY_TEST(QRegExp, QRegExp("(\\d+)(?:\\s*)(cm|inch)"));
-
-    QVariantHash variantHash;
-    variantHash.insert("Hello World!", QVariant(19));
-    QT_COPY_TEST(QVariantHash, variantHash);
-
-#ifdef QT3_SUPPORT
-    QT_COPY_TEST(QColorGroup, QColorGroup(Qt::red, Qt::red, Qt::red, Qt::red, Qt::red, Qt::red, Qt::red));
-#endif
-
-    QT_COPY_TEST(QFont, QFont("Helvetica", 1024));
-
-    {
-        QPixmap v = QPixmap(100, 100); QPixmap v2 = QPixmap(100, 100);
-        QVERIFY(QmlMetaType::copy(QMetaType::QPixmap, &v, 0)); 
-        QVERIFY(v.size() == QPixmap().size());
-        QVERIFY(QmlMetaType::copy(QMetaType::QPixmap , &v, &v2)); 
-        QVERIFY(v.size() == QPixmap(100,100).size());
-    }
-
-    QT_COPY_TEST(QBrush, QBrush(Qt::blue));
-    QT_COPY_TEST(QColor, QColor("lightsteelblue"));
-    QT_COPY_TEST(QPalette, QPalette(Qt::green));
-    
-    {
-        QPixmap icon(100, 100);
-
-        QIcon v = QIcon(icon); QIcon v2 = QIcon(icon);
-        QVERIFY(QmlMetaType::copy(QMetaType::QIcon, &v, 0)); 
-        QVERIFY(v.isNull() == QIcon().isNull());
-        QVERIFY(QmlMetaType::copy(QMetaType::QIcon , &v, &v2)); 
-        QVERIFY(v.isNull() == QIcon(icon).isNull());
-    }
-
-    {
-        QImage v = QImage(100, 100, QImage::Format_RGB32); 
-        QImage v2 = QImage(100, 100, QImage::Format_RGB32);
-        QVERIFY(QmlMetaType::copy(QMetaType::QImage, &v, 0)); 
-        QVERIFY(v.size() == QImage().size());
-        QVERIFY(QmlMetaType::copy(QMetaType::QImage , &v, &v2)); 
-        QVERIFY(v.size() == QImage(100,100, QImage::Format_RGB32).size());
-    }
-
-    QT_COPY_TEST(QPolygon, QPolygon(QRect(100, 100, 200, 103)));
-    QT_COPY_TEST(QRegion, QRegion(QRect(0, 10, 99, 87)));
-
-    {
-        QBitmap v = QBitmap(100, 100); QBitmap v2 = QBitmap(100, 100);
-        QVERIFY(QmlMetaType::copy(QMetaType::QBitmap, &v, 0)); 
-        QVERIFY(v.size() == QBitmap().size());
-        QVERIFY(QmlMetaType::copy(QMetaType::QBitmap , &v, &v2)); 
-        QVERIFY(v.size() == QBitmap(100,100).size());
-    }
-
-    {
-        QCursor v = QCursor(Qt::SizeFDiagCursor); QCursor v2 = QCursor(Qt::SizeFDiagCursor);
-        QVERIFY(QmlMetaType::copy(QMetaType::QCursor, &v, 0)); 
-        QVERIFY(v.shape() == QCursor().shape());
-        QVERIFY(QmlMetaType::copy(QMetaType::QCursor , &v, &v2)); 
-        QVERIFY(v.shape() == QCursor(Qt::SizeFDiagCursor).shape());
-    }
-
-    QT_COPY_TEST(QSizePolicy, QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Maximum));
-    QT_COPY_TEST(QKeySequence, QKeySequence("Ctrl+O"));
-    QT_COPY_TEST(QPen, QPen(Qt::red));
-    QT_COPY_TEST(QTextLength, QTextLength(QTextLength::FixedLength, 10.2));
-    QT_COPY_TEST(QTextFormat, QTextFormat(QTextFormat::ListFormat));
-    QT_COPY_TEST(QMatrix, QMatrix().translate(10, 10));
-    QT_COPY_TEST(QTransform, QTransform().translate(10, 10));
-    QT_COPY_TEST(QMatrix4x4, QMatrix4x4(1,0,2,3,0,1,0,0,9,0,1,0,0,0,10,1));
-    QT_COPY_TEST(QVector2D, QVector2D(10.2, 1));
-    QT_COPY_TEST(QVector3D, QVector3D(10.2, 1, -2));
-    QT_COPY_TEST(QVector4D, QVector4D(10.2, 1, -2, 1.2));
-    QT_COPY_TEST(QQuaternion, QQuaternion(1.0, 10.2, 1, -2));
-
-    int voidValue;
-    COPY_TEST(void *, VoidStar, (void *)&voidValue, (void *)0);
-    COPY_TEST(long, Long, 10, 0);
-    COPY_TEST(short, Short, 10, 0);
-    COPY_TEST(char, Char, 'a', 0);
-    COPY_TEST(unsigned long, ULong, 10, 0);
-    COPY_TEST(unsigned short, UShort, 10, 0);
-    COPY_TEST(unsigned char, UChar, 'a', 0);
-    COPY_TEST(float, Float, 10.5, 0);
-
-    QObject objectValue;
-    QWidget widgetValue;
-    COPY_TEST(QObject *, QObjectStar, &objectValue, 0);
-    COPY_TEST(QWidget *, QWidgetStar, &widgetValue, 0);
-    COPY_TEST(qreal, QReal, 10.2, 0);
-
-    {
-        QVariant tv = QVariant::fromValue(QVariant(10));
-        QVariant v(tv); QVariant v2(tv);
-        QVERIFY(QmlMetaType::copy(qMetaTypeId<QVariant>(), &v, 0)); 
-        QVERIFY(v == QVariant());
-        QVERIFY(QmlMetaType::copy(qMetaTypeId<QVariant>(), &v, &v2)); 
-        QVERIFY(v == tv);
-    }
-
-    {
-        TestType t;  QVariant tv = QVariant::fromValue(&t);
-
-        QVariant v(tv); QVariant v2(tv);
-        QVERIFY(QmlMetaType::copy(qMetaTypeId<TestType *>(), &v, 0)); 
-        QVERIFY(v == QVariant::fromValue((TestType *)0));
-        QVERIFY(QmlMetaType::copy(qMetaTypeId<TestType *>(), &v, &v2)); 
-        QVERIFY(v == tv);
-    }
-}
-
-void tst_qmlmetatype::qmlParserStatusCast()
-{
-    QVERIFY(QmlMetaType::qmlType(QVariant::Int) == 0);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<TestType *>())->parserStatusCast(), -1);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->parserStatusCast(), -1);
-            
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
-    int cast = QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->parserStatusCast();
-    QVERIFY(cast != -1);
-    QVERIFY(cast != 0);
-
-    ParserStatusTestType t;
-    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QmlParserStatus *)&t));
-
-    QmlParserStatus *status = reinterpret_cast<QmlParserStatus *>(reinterpret_cast<char *>((QObject *)&t) + cast);
-    QCOMPARE(status, &t);
-}
-
-void tst_qmlmetatype::qmlPropertyValueSourceCast()
-{
-    QVERIFY(QmlMetaType::qmlType(QVariant::Int) == 0);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueSourceCast(), -1);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueSourceCast(), -1);
-            
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
-    int cast = QmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->propertyValueSourceCast();
-    QVERIFY(cast != -1);
-    QVERIFY(cast != 0);
-
-    ValueSourceTestType t;
-    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QmlPropertyValueSource *)&t));
-
-    QmlPropertyValueSource *source = reinterpret_cast<QmlPropertyValueSource *>(reinterpret_cast<char *>((QObject *)&t) + cast);
-    QCOMPARE(source, &t);
-}
-
-void tst_qmlmetatype::qmlPropertyValueInterceptorCast()
-{
-    QVERIFY(QmlMetaType::qmlType(QVariant::Int) == 0);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueInterceptorCast(), -1);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueInterceptorCast(), -1);
-            
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>()) != 0);
-    int cast = QmlMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>())->propertyValueInterceptorCast();
-    QVERIFY(cast != -1);
-    QVERIFY(cast != 0);
-
-    ValueInterceptorTestType t;
-    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QmlPropertyValueInterceptor *)&t));
-
-    QmlPropertyValueInterceptor *interceptor = reinterpret_cast<QmlPropertyValueInterceptor *>(reinterpret_cast<char *>((QObject *)&t) + cast);
-    QCOMPARE(interceptor, &t);
-}
-
-void tst_qmlmetatype::isList()
-{
-    QCOMPARE(QmlMetaType::isList(QVariant::Invalid), false);
-    QCOMPARE(QmlMetaType::isList(QVariant::Int), false);
-
-    QmlListProperty<TestType> list;
-
-    QCOMPARE(QmlMetaType::isList(qMetaTypeId<QmlListProperty<TestType> >()), true);
-}
-
-void tst_qmlmetatype::defaultObject()
-{
-    QVERIFY(QmlMetaType::defaultProperty(&QObject::staticMetaObject).name() == 0);
-    QVERIFY(QmlMetaType::defaultProperty(&ParserStatusTestType::staticMetaObject).name() == 0);
-    QCOMPARE(QString(QmlMetaType::defaultProperty(&TestType::staticMetaObject).name()), QString("foo"));
-
-    QObject o;
-    TestType t;
-    ParserStatusTestType p;
-
-    QVERIFY(QmlMetaType::defaultProperty((QObject *)0).name() == 0);
-    QVERIFY(QmlMetaType::defaultProperty(&o).name() == 0);
-    QVERIFY(QmlMetaType::defaultProperty(&p).name() == 0);
-    QCOMPARE(QString(QmlMetaType::defaultProperty(&t).name()), QString("foo"));
-}
-
-QTEST_MAIN(tst_qmlmetatype)
-
-#include "tst_qmlmetatype.moc"
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin.qml b/tests/auto/declarative/qmlmoduleplugin/plugin.qml
deleted file mode 100644
index f29ae24..0000000
--- a/tests/auto/declarative/qmlmoduleplugin/plugin.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import com.nokia.AutoTestQmlPluginType 1.0
-
-MyPluginType { value: 123 }
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
deleted file mode 100644
index 8af9c0d..0000000
--- a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QtDeclarative/qmlextensionplugin.h>
-#include <QtDeclarative/qml.h>
-#include <QDebug>
-
-class MyPluginType : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int value READ value WRITE setValue)
-
-public:
-    MyPluginType(QObject *parent=0) : QObject(parent)
-    {
-        qWarning("import worked");
-    }
-
-    int value() const { return v; }
-    void setValue(int i) { v = i; }
-
-private:
-    int v;
-};
-
-QML_DECLARE_TYPE(MyPluginType);
-
-
-class MyPlugin : public QmlExtensionPlugin
-{
-    Q_OBJECT
-public:
-    MyPlugin()
-    {
-        qWarning("plugin created");
-    }
-
-    QStringList keys() const
-    {
-        return QStringList() << QLatin1String("com.nokia.AutoTestQmlPluginType");
-    }
-
-    void initialize(QmlEngine*, const char *uri)
-    {
-        Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType");
-        QML_REGISTER_TYPE(com.nokia.AutoTestQmlPluginType,1,0,MyPluginType,MyPluginType);
-    }
-};
-
-#include "plugin.moc"
-
-Q_EXPORT_PLUGIN2(plugin, MyPlugin);
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.pro
deleted file mode 100644
index 0625ea3..0000000
--- a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin
-SOURCES = plugin.cpp
-QT = core declarative
-DESTDIR = qmlmodules
diff --git a/tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro b/tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro
deleted file mode 100644
index c60743d..0000000
--- a/tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-QT = core
-TEMPLATE = subdirs
-SUBDIRS = plugin
-tst_qmlmoduleplugin_pro.depends += plugin
-SUBDIRS += tst_qmlmoduleplugin.pro
-
-
diff --git a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.cpp b/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.cpp
deleted file mode 100644
index 87125fc..0000000
--- a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <qdir.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QDebug>
-
-class tst_qmlmoduleplugin : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlmoduleplugin() {
-        QCoreApplication::addLibraryPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin"));
-qDebug() << QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin");
-    }
-
-private slots:
-    void importsPlugin();
-};
-
-#define VERIFY_ERRORS(errorfile) \
-    if (!errorfile) { \
-        if (qgetenv("DEBUG") != "" && !component.errors().isEmpty()) \
-            qWarning() << "Unexpected Errors:" << component.errors(); \
-        QVERIFY(!component.isError()); \
-        QVERIFY(component.errors().isEmpty()); \
-    } else { \
-        QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
-        QVERIFY(file.open(QIODevice::ReadOnly)); \
-        QByteArray data = file.readAll(); \
-        file.close(); \
-        QList<QByteArray> expected = data.split('\n'); \
-        expected.removeAll(QByteArray("")); \
-        QList<QmlError> errors = component.errors(); \
-        QList<QByteArray> actual; \
-        for (int ii = 0; ii < errors.count(); ++ii) { \
-            const QmlError &error = errors.at(ii); \
-            QByteArray errorStr = QByteArray::number(error.line()) + ":" +  \
-                                  QByteArray::number(error.column()) + ":" + \
-                                  error.description().toUtf8(); \
-            actual << errorStr; \
-        } \
-        if (qgetenv("DEBUG") != "" && expected != actual) \
-            qWarning() << "Expected:" << expected << "Actual:" << actual;  \
-        if (qgetenv("QMLLANGUAGE_UPDATEERRORS") != "" && expected != actual) {\
-            QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
-            QVERIFY(file.open(QIODevice::WriteOnly)); \
-            for (int ii = 0; ii < actual.count(); ++ii) { \
-                file.write(actual.at(ii)); file.write("\n"); \
-            } \
-            file.close(); \
-        } else { \
-            QCOMPARE(expected, actual); \
-        } \
-    }
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    QFileInfo fileInfo(__FILE__);
-    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename));
-}
-
-
-void tst_qmlmoduleplugin::importsPlugin()
-{
-    QmlEngine engine;
-    QTest::ignoreMessage(QtWarningMsg, "plugin created");
-    QTest::ignoreMessage(QtWarningMsg, "import worked");
-    QmlComponent component(&engine, TEST_FILE("plugin.qml"));
-    VERIFY_ERRORS(0);
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    QCOMPARE(object->property("value").toInt(),123);
-}
-
-QTEST_MAIN(tst_qmlmoduleplugin)
-
-#include "tst_qmlmoduleplugin.moc"
diff --git a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.pro b/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.pro
deleted file mode 100644
index 3c8a568..0000000
--- a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-load(qttest_p4)
-SOURCES = tst_qmlmoduleplugin.cpp
-QT += declarative
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlnumberformatter/qmlnumberformatter.pro b/tests/auto/declarative/qmlnumberformatter/qmlnumberformatter.pro
deleted file mode 100644
index 8113278..0000000
--- a/tests/auto/declarative/qmlnumberformatter/qmlnumberformatter.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative 
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlnumberformatter.cpp
diff --git a/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp b/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp
deleted file mode 100644
index 30f2fea..0000000
--- a/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QDebug>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qnumberformat_p.h>
-#include <private/qmlnumberformatter_p.h>
-
-class tst_qmlnumberformatter : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlnumberformatter();
-
-    void init() {}
-    void initTestCase() {}
-
-    void cleanup() {}
-    void cleanupTestCase() {}
-
-private slots:
-    void text_data();
-    void text();
-
-private:
-    QStringList strings;
-    QStringList formats;
-    QStringList texts;
-};
-
-tst_qmlnumberformatter::tst_qmlnumberformatter()
-{
-    strings << "100.0"
-            << "12345"
-            << "1234567"
-            << "0.123"
-            << "0.9999"
-            << "0.989"
-            << "1"
-            << "1.0"
-            << "1.01";
-
-    formats << ""
-            << "0000"
-            << "0000.00"
-            << "##"
-            << "##.##"
-            << "#0.00#"
-            << "##,##0.##"
-            << "(000) 000 - 000"
-            << "00000,000.0000";
-
-    //US locale only.
-    texts << "100.000000"
-          << "12345.000000"
-          << "1234567.000000"
-          << "0.123000"
-          << "0.999900"
-          << "0.989000"
-          << "1.000000"
-          << "1.000000"
-          << "1.010000" //end ""
-          << "0100"
-          << "12345"
-          << "1234567"
-          << "0000"
-          << "0001"
-          << "0001"
-          << "0001"
-          << "0001"
-          << "0001" // end "0000"
-          << "0100.00"
-          << "12345.00"
-          << "1234567.00"
-          << "0000.12"
-          << "0001.00"
-          << "0000.99"
-          << "0001.00"
-          << "0001.00"
-          << "0001.01" // end "0000.00"
-          << "100"
-          << "12345"
-          << "1234567"
-          << "0"
-          << "1"
-          << "1"
-          << "1"
-          << "1"
-          << "1" // end "##"
-          << "100"//start "##.##"
-          << "12345"
-          << "1234567"
-          << "0.12"
-          << "1"
-          << "0.99"
-          << "1"
-          << "1"
-          << "1.01" // end "##.##" -- ### EXPECT FAIL ### QNumberFormat::formatDecimal() bug
-          << "100.00" //start "#0.00#"
-          << "12345.00"
-          << "1234567.00"
-          << "0.123"
-          << "1.00"
-          << "0.989"
-          << "1.00"
-          << "1.00"
-          << "1.01" //end "#0.00#"
-          << "100" //start "##,##0.##"
-          << "12,345"
-          << "1,234,567"
-          << "0.12"
-          << "1"
-          << "0.99"
-          << "1"
-          << "1"
-          << "1.01" //end "##,##0.##" -- ### EXPECT FAIL ### QNumberFormat::formatDecimal() bug
-          << "(000) 000 - 100" //start "(000) 000 - 000"
-          << "(000) 012 - 345"
-          << "(001) 234 - 567"
-          << "(000) 000 - 000"
-          << "(000) 000 - 001"
-          << "(000) 000 - 001"
-          << "(000) 000 - 001"
-          << "(000) 000 - 001"
-          << "(000) 000 - 001" // end "(000) 000 - 000"
-          << "00,000,100.0000" // start "00000,000.0000"
-          << "00,012,345.0000" 
-          << "01,234,567.0000"
-          << "00,000,000.1230"
-          << "00,000,000.9999"
-          << "00,000,000.9890"
-          << "00,000,001.0000"
-          << "00,000,001.0000"
-          << "00,000,001.0100"; // end 
-
-    qDebug() << "strings.size()" << strings.size()
-             << "\nformats.size()" << formats.size()
-             << "texts.size()" << texts.size();
-}
-
-void tst_qmlnumberformatter::text_data()
-{
-    QTest::addColumn<QString>("string");
-    QTest::addColumn<QString>("format");
-    QTest::addColumn<QString>("text");
-
-    for (int j=0; j < formats.size(); j++)
-    {
-        for (int i=0; i < strings.size(); i++)
-        {
-            QTest::newRow(QString("%1, %2").arg(strings.at(i)).arg(formats.at(j)).toAscii())
-                << strings.at(i) << formats.at(j) << texts.at(j*formats.size()+i);
-        }
-    }
-
-}
-
-void tst_qmlnumberformatter::text()
-{
-    QFETCH(QString, string);
-    QFETCH(QString, format);
-    QFETCH(QString, text);
-
-    QString componentStr = QString("import Qt 4.6\nNumberFormatter { number: ") + string + QString("; format: \"") + format + QString("\" }");
-
-    QmlEngine engine;
-    QmlComponent formatterComponent(&engine);
-    formatterComponent.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
-    if(formatterComponent.isError())
-        qDebug() << formatterComponent.errors();
-    QVERIFY(formatterComponent.isReady());
-    QmlNumberFormatter *formatter = qobject_cast<QmlNumberFormatter*>(formatterComponent.create());
-    QVERIFY(formatter != 0);
-
-    QCOMPARE(formatter->format(), format);
-    QCOMPARE(formatter->text(), text);
-
-    delete formatter;
-}
-
-QTEST_MAIN(tst_qmlnumberformatter)
-
-#include "tst_qmlnumberformatter.moc"
diff --git a/tests/auto/declarative/qmlpixmapcache/data/exists.png b/tests/auto/declarative/qmlpixmapcache/data/exists.png
deleted file mode 100644
index 399bd0b..0000000
Binary files a/tests/auto/declarative/qmlpixmapcache/data/exists.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlpixmapcache/data/exists1.png b/tests/auto/declarative/qmlpixmapcache/data/exists1.png
deleted file mode 100644
index 399bd0b..0000000
Binary files a/tests/auto/declarative/qmlpixmapcache/data/exists1.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlpixmapcache/data/exists2.png b/tests/auto/declarative/qmlpixmapcache/data/exists2.png
deleted file mode 100644
index 399bd0b..0000000
Binary files a/tests/auto/declarative/qmlpixmapcache/data/exists2.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlpixmapcache/qmlpixmapcache.pro b/tests/auto/declarative/qmlpixmapcache/qmlpixmapcache.pro
deleted file mode 100644
index 423fa2f..0000000
--- a/tests/auto/declarative/qmlpixmapcache/qmlpixmapcache.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += network
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlpixmapcache.cpp
-
-# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
-# LIBS += -lgcov
diff --git a/tests/auto/declarative/qmlpixmapcache/tst_qmlpixmapcache.cpp b/tests/auto/declarative/qmlpixmapcache/tst_qmlpixmapcache.cpp
deleted file mode 100644
index 019fc2a..0000000
--- a/tests/auto/declarative/qmlpixmapcache/tst_qmlpixmapcache.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtTest/QtTest>
-#include <private/qmlpixmapcache_p.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QNetworkReply>
-
-// These don't let normal people run tests!
-//#include "../network-settings.h"
-
-class tst_qmlpixmapcache : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlpixmapcache() :
-        thisfile(QUrl::fromLocalFile(__FILE__))
-    {
-    }
-
-private slots:
-    void single();
-    void single_data();
-    void parallel();
-    void parallel_data();
-
-private:
-    QmlEngine engine;
-    QUrl thisfile;
-};
-
-
-static int slotters=0;
-
-class Slotter : public QObject
-{
-    Q_OBJECT
-public:
-    Slotter()
-    {
-        gotslot = false;
-        slotters++;
-    }
-    bool gotslot;
-
-public slots:
-    void got()
-    {
-        gotslot = true;
-        --slotters;
-        if (slotters==0)
-            QTestEventLoop::instance().exitLoop();
-    }
-};
-
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
-static const bool localfile_optimized = true;
-#else
-static const bool localfile_optimized = false;
-#endif
-
-void tst_qmlpixmapcache::single_data()
-{
-    // Note, since QmlPixmapCache is shared, tests affect each other!
-    // so use different files fore all test functions.
-
-    QTest::addColumn<QUrl>("target");
-    QTest::addColumn<bool>("incache");
-    QTest::addColumn<bool>("exists");
-    QTest::addColumn<bool>("neterror");
-
-    // File URLs are optimized
-    QTest::newRow("local") << thisfile.resolved(QUrl("data/exists.png")) << localfile_optimized << true << false;
-    QTest::newRow("local") << thisfile.resolved(QUrl("data/notexists.png")) << localfile_optimized << false << false;
-    QTest::newRow("remote") << QUrl("http://qt.nokia.com/logo.png") << false << true << false;
-    QTest::newRow("remote") << QUrl("http://qt.nokia.com/thereisnologo.png") << false << false << true;
-}
-
-void tst_qmlpixmapcache::single()
-{
-    QFETCH(QUrl, target);
-    QFETCH(bool, incache);
-    QFETCH(bool, exists);
-    QFETCH(bool, neterror);
-
-    if (neterror) {
-        QString expected = "\"Error downloading " + target.toString() + " - server replied: Not Found\" ";
-        QTest::ignoreMessage(QtWarningMsg, expected.toLatin1());
-    } else if (!exists) {
-        QString expected = "Cannot open  QUrl( \"" + target.toString() + "\" )  ";
-        QTest::ignoreMessage(QtWarningMsg, expected.toLatin1());
-    }
-
-    QPixmap pixmap;
-    QVERIFY(pixmap.width() <= 0); // Check Qt assumption
-    QmlPixmapReply::Status status = QmlPixmapCache::get(target, &pixmap);
-
-    if (incache) {
-        if (exists) {
-            QVERIFY(status == QmlPixmapReply::Ready);
-            QVERIFY(pixmap.width() > 0);
-        } else {
-            QVERIFY(status == QmlPixmapReply::Error);
-            QVERIFY(pixmap.width() <= 0);
-        }
-    } else {
-        QmlPixmapReply *reply = QmlPixmapCache::request(&engine, target);
-        QVERIFY(reply);
-        QVERIFY(pixmap.width() <= 0);
-
-        Slotter getter;
-        connect(reply, SIGNAL(finished()), &getter, SLOT(got()));
-        QTestEventLoop::instance().enterLoop(10);
-        QVERIFY(!QTestEventLoop::instance().timeout());
-        QVERIFY(getter.gotslot);
-        if (exists) {
-            QVERIFY(QmlPixmapCache::get(target, &pixmap) == QmlPixmapReply::Ready);
-            QVERIFY(pixmap.width() > 0);
-        } else {
-            QVERIFY(QmlPixmapCache::get(target, &pixmap) == QmlPixmapReply::Error);
-            QVERIFY(pixmap.width() <= 0);
-        }
-    }
-
-    QCOMPARE(QmlPixmapCache::pendingRequests(), 0);
-}
-
-void tst_qmlpixmapcache::parallel_data()
-{
-    // Note, since QmlPixmapCache is shared, tests affect each other!
-    // so use different files fore all test functions.
-
-    QTest::addColumn<QUrl>("target1");
-    QTest::addColumn<QUrl>("target2");
-    QTest::addColumn<int>("incache");
-    QTest::addColumn<int>("cancel"); // which one to cancel
-    QTest::addColumn<int>("requests");
-
-    QTest::newRow("local")
-            << thisfile.resolved(QUrl("data/exists1.png"))
-            << thisfile.resolved(QUrl("data/exists2.png"))
-            << (localfile_optimized ? 2 : 0)
-            << -1
-            << (localfile_optimized ? 0 : 2)
-            ;
-
-    QTest::newRow("remote")
-            << QUrl("http://qt.nokia.com/images/template/checkbox-on.png")
-            << QUrl("http://qt.nokia.com/images/products/qt-logo/image_tile")
-            << 0
-            << -1
-            << 2
-            ;
-
-    QTest::newRow("remoteagain")
-            << QUrl("http://qt.nokia.com/images/template/checkbox-on.png")
-            << QUrl("http://qt.nokia.com/images/products/qt-logo/image_tile")
-            << 2
-            << -1
-            << 0
-            ;
-
-    QTest::newRow("remotecopy")
-            << QUrl("http://qt.nokia.com/images/template/checkbox-off.png")
-            << QUrl("http://qt.nokia.com/images/template/checkbox-off.png")
-            << 0
-            << -1
-            << 1
-            ;
-
-    QTest::newRow("remotecopycancel")
-            << QUrl("http://qt.nokia.com/rounded_block_bg.png")
-            << QUrl("http://qt.nokia.com/rounded_block_bg.png")
-            << 0
-            << 0
-            << 1
-            ;
-}
-
-void tst_qmlpixmapcache::parallel()
-{
-    QFETCH(QUrl, target1);
-    QFETCH(QUrl, target2);
-    QFETCH(int, incache);
-    QFETCH(int, cancel);
-    QFETCH(int, requests);
-
-    QList<QUrl> targets;
-    targets << target1 << target2;
-
-    QList<QmlPixmapReply*> replies;
-    QList<Slotter*> getters;
-    for (int i=0; i<targets.count(); ++i) {
-        QUrl target = targets.at(i);
-        QPixmap pixmap;
-        QmlPixmapReply::Status status = QmlPixmapCache::get(target, &pixmap);
-        QmlPixmapReply *reply = 0;
-        if (status != QmlPixmapReply::Error && status != QmlPixmapReply::Ready)
-            reply = QmlPixmapCache::request(&engine, target);
-        replies.append(reply);
-        if (!reply) {
-            QVERIFY(pixmap.width() > 0);
-            getters.append(0);
-        } else {
-            QVERIFY(pixmap.width() <= 0);
-            getters.append(new Slotter);
-            connect(reply, SIGNAL(finished()), getters[i], SLOT(got()));
-        }
-    }
-
-    QCOMPARE(incache+slotters, targets.count());
-    QCOMPARE(QmlPixmapCache::pendingRequests(), requests);
-
-    if (cancel >= 0) {
-        QmlPixmapCache::cancel(targets.at(cancel), getters[cancel]);
-        slotters--;
-    }
-
-    if (slotters) {
-        QTestEventLoop::instance().enterLoop(10);
-        QVERIFY(!QTestEventLoop::instance().timeout());
-    }
-
-    for (int i=0; i<targets.count(); ++i) {
-        QmlPixmapReply *reply = replies[i];
-        if (reply) {
-            if (i == cancel) {
-                QVERIFY(!getters[i]->gotslot);
-            } else {
-                QVERIFY(getters[i]->gotslot);
-                QPixmap pixmap;
-                QVERIFY(QmlPixmapCache::get(targets[i], &pixmap) == QmlPixmapReply::Ready);
-                QVERIFY(pixmap.width() > 0);
-            }
-            delete getters[i];
-        }
-    }
-
-    QCOMPARE(QmlPixmapCache::pendingRequests(), 0);
-}
-
-QTEST_MAIN(tst_qmlpixmapcache)
-
-#include "tst_qmlpixmapcache.moc"
diff --git a/tests/auto/declarative/qmlpropertymap/qmlpropertymap.pro b/tests/auto/declarative/qmlpropertymap/qmlpropertymap.pro
deleted file mode 100644
index 967ab76..0000000
--- a/tests/auto/declarative/qmlpropertymap/qmlpropertymap.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlpropertymap.cpp
diff --git a/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp b/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp
deleted file mode 100644
index 26b89a6..0000000
--- a/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlpropertymap.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicstext_p.h>
-#include <QSignalSpy>
-
-class tst_QmlPropertyMap : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QmlPropertyMap() {}
-
-private slots:
-    void insert();
-    void operatorInsert();
-    void operatorValue();
-    void clear();
-    void changed();
-    void count();
-};
-
-void tst_QmlPropertyMap::insert()
-{
-    QmlPropertyMap map;
-    map.insert(QLatin1String("key1"),100);
-    map.insert(QLatin1String("key2"),200);
-    QVERIFY(map.keys().count() == 2);
-    QVERIFY(map.contains(QLatin1String("key1")));
-
-    QCOMPARE(map.value(QLatin1String("key1")), QVariant(100));
-    QCOMPARE(map.value(QLatin1String("key2")), QVariant(200));
-
-    map.insert(QLatin1String("key1"),"Hello World");
-    QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
-}
-
-void tst_QmlPropertyMap::operatorInsert()
-{
-    QmlPropertyMap map;
-    map[QLatin1String("key1")] = 100;
-    map[QLatin1String("key2")] = 200;
-    QVERIFY(map.keys().count() == 2);
-
-    QCOMPARE(map.value(QLatin1String("key1")), QVariant(100));
-    QCOMPARE(map.value(QLatin1String("key2")), QVariant(200));
-
-    map[QLatin1String("key1")] = "Hello World";
-    QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
-}
-
-void tst_QmlPropertyMap::operatorValue()
-{
-    QmlPropertyMap map;
-    map.insert(QLatin1String("key1"),100);
-    map.insert(QLatin1String("key2"),200);
-    QVERIFY(map.count() == 2);
-    QVERIFY(map.contains(QLatin1String("key1")));
-
-    const QmlPropertyMap &constMap = map;
-
-    QCOMPARE(constMap.value(QLatin1String("key1")), QVariant(100));
-    QCOMPARE(constMap.value(QLatin1String("key2")), QVariant(200));
-    QCOMPARE(constMap[QLatin1String("key1")], constMap.value(QLatin1String("key1")));
-    QCOMPARE(constMap[QLatin1String("key2")], constMap.value(QLatin1String("key2")));
-}
-
-void tst_QmlPropertyMap::clear()
-{
-    QmlPropertyMap map;
-    map.insert(QLatin1String("key1"),100);
-    QVERIFY(map.keys().count() == 1);
-
-    QCOMPARE(map.value(QLatin1String("key1")), QVariant(100));
-
-    map.clear(QLatin1String("key1"));
-    QVERIFY(map.keys().count() == 1);
-    QVERIFY(map.contains(QLatin1String("key1")));
-    QCOMPARE(map.value(QLatin1String("key1")), QVariant());
-}
-
-void tst_QmlPropertyMap::changed()
-{
-    QmlPropertyMap map;
-    QSignalSpy spy(&map, SIGNAL(valueChanged(const QString&)));
-    map.insert(QLatin1String("key1"),100);
-    map.insert(QLatin1String("key2"),200);
-    QCOMPARE(spy.count(), 0);
-
-    map.clear(QLatin1String("key1"));
-    QCOMPARE(spy.count(), 0);
-
-    //make changes in QML
-    QmlEngine engine;
-    QmlContext *ctxt = engine.rootContext();
-    ctxt->setContextProperty(QLatin1String("testdata"), &map);
-    QmlComponent component(&engine);
-    component.setData("import Qt 4.6\nText { text: { testdata.key1 = 'Hello World'; 'X' } }",
-            QUrl::fromLocalFile(""));
-    QVERIFY(component.isReady());
-    QmlGraphicsText *txt = qobject_cast<QmlGraphicsText*>(component.create());
-    QVERIFY(txt);
-    QCOMPARE(txt->text(), QString('X'));
-    QCOMPARE(spy.count(), 1);
-    QList<QVariant> arguments = spy.takeFirst();
-    QCOMPARE(arguments.at(0).toString(),QLatin1String("key1"));
-    QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
-}
-
-void tst_QmlPropertyMap::count()
-{
-    QmlPropertyMap map;
-    QCOMPARE(map.isEmpty(), true);
-    map.insert(QLatin1String("key1"),100);
-    map.insert(QLatin1String("key2"),200);
-    QCOMPARE(map.count(), 2);
-    QCOMPARE(map.isEmpty(), false);
-
-    map.insert(QLatin1String("key3"),"Hello World");
-    QCOMPARE(map.count(), 3);
-
-    //clearing doesn't remove the key
-    map.clear(QLatin1String("key3"));
-    QCOMPARE(map.count(), 3);
-    QCOMPARE(map.size(), map.count());
-}
-
-QTEST_MAIN(tst_QmlPropertyMap)
-
-#include "tst_qmlpropertymap.moc"
diff --git a/tests/auto/declarative/qmlqt/data/closestangle.qml b/tests/auto/declarative/qmlqt/data/closestangle.qml
deleted file mode 100644
index b5f7fc6..0000000
--- a/tests/auto/declarative/qmlqt/data/closestangle.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var testSame: Qt.closestAngle(0,1)
-    property var testLess: Qt.closestAngle(0,-359)
-    property var testMore: Qt.closestAngle(0,361)
-    property var testFail: Qt.closestAngle(0)
-    property var test5: Qt.closestAngle(0,1,2)
-    property var test6: Qt.closestAngle(123.45465768,1.11)
-    property var test7: Qt.closestAngle(-3.1415,1.11)
-}
-
diff --git a/tests/auto/declarative/qmlqt/data/consoleLog.qml b/tests/auto/declarative/qmlqt/data/consoleLog.qml
deleted file mode 100644
index e657ff1..0000000
--- a/tests/auto/declarative/qmlqt/data/consoleLog.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    Component.onCompleted: {
-        console.log("completed", "ok")
-        console.log("completed ok")
-    }
-}
diff --git a/tests/auto/declarative/qmlqt/data/createComponent.qml b/tests/auto/declarative/qmlqt/data/createComponent.qml
deleted file mode 100644
index d9b70ec..0000000
--- a/tests/auto/declarative/qmlqt/data/createComponent.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool incorrectArgCount1: false
-    property bool incorrectArgCount2: false
-    property bool emptyArg: false
-
-    property string relativeUrl
-    property string absoluteUrl
-
-    Component.onCompleted: {
-        // Test that using incorrect argument count returns a null object
-        incorrectArgCount1 = (createComponent() == null);
-        incorrectArgCount2 = (createComponent("main.qml", 10) == null);
-        emptyArg = (createComponent("") == null);
-
-        var r = createComponent("createComponentData.qml");
-        relativeUrl = r.url;
-
-        var a = createComponent("http://www.example.com/test.qml");
-        absoluteUrl = a.url;
-    }
-}
diff --git a/tests/auto/declarative/qmlqt/data/createComponentData.qml b/tests/auto/declarative/qmlqt/data/createComponentData.qml
deleted file mode 100644
index a5e99a0..0000000
--- a/tests/auto/declarative/qmlqt/data/createComponentData.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int test: 1913
-}
diff --git a/tests/auto/declarative/qmlqt/data/createQmlObject.qml b/tests/auto/declarative/qmlqt/data/createQmlObject.qml
deleted file mode 100644
index 9150782..0000000
--- a/tests/auto/declarative/qmlqt/data/createQmlObject.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: root
-
-    property bool incorrectArgCount1: false
-    property bool incorrectArgCount2: false
-    property bool emptyArg: false
-    property bool noParent: false
-    property bool notReady: false
-    property bool runtimeError: false
-    property bool errors: false
-
-    property bool success: false
-
-    Component.onCompleted: {
-        // errors
-        incorrectArgCount1 = (createQmlObject() == null);
-        incorrectArgCount2 = (createQmlObject("import Qt 4.6\nQtObject{}", root, "main.qml", 10) == null);
-        emptyArg = (createQmlObject("", root) == null);
-        errors = (createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13\nproperty int test: 13\n}", root, "main.qml") == null);
-        noParent = (createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13}", 0) == null);
-        notReady = (createQmlObject("import Qt 4.6\nQtObject{\nBlah{}\n}", root, "http://www.example.com/main.qml") == null);
-        runtimeError = (createQmlObject("import Qt 4.6\nQtObject{property int test\nonTestChanged: QtObject{}\n}", root) == null);
-
-        var o = createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13\n}", root);
-        success = (o.test == 13);
-
-        createQmlObject("import Qt 4.6\nItem {}\n", root);
-    }
-}
diff --git a/tests/auto/declarative/qmlqt/data/darker.qml b/tests/auto/declarative/qmlqt/data/darker.qml
deleted file mode 100644
index 2df067e..0000000
--- a/tests/auto/declarative/qmlqt/data/darker.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var test1: Qt.darker(Qt.rgba(1, 0.8, 0.3))
-    property var test2: Qt.darker()
-    property var test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 10)
-    property var test4: Qt.darker("red");
-    property var test5: Qt.darker("perfectred"); // Non-existant color
-    property var test6: Qt.darker(10);
-}
-
diff --git a/tests/auto/declarative/qmlqt/data/enums.qml b/tests/auto/declarative/qmlqt/data/enums.qml
deleted file mode 100644
index 1efa6f5..0000000
--- a/tests/auto/declarative/qmlqt/data/enums.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int test1: Qt.Key_Escape
-    property int test2: Qt.DescendingOrder
-    property int test3: Qt.ElideMiddle
-    property int test4: Qt.AlignRight
-}
-
diff --git a/tests/auto/declarative/qmlqt/data/hsla.qml b/tests/auto/declarative/qmlqt/data/hsla.qml
deleted file mode 100644
index df51ccd..0000000
--- a/tests/auto/declarative/qmlqt/data/hsla.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property color test1: Qt.hsla(1, 0, 0, 0.8);
-    property color test2: Qt.hsla(1, 0.5, 0.3);
-    property color test3: Qt.hsla(1, 1);
-    property color test4: Qt.hsla(1, 1, 1, 1, 1);
-    property color test5: Qt.hsla(1.2, 1, 1);
-    property color test6: Qt.hsla(-0.1, 1, 1);
-}
-
diff --git a/tests/auto/declarative/qmlqt/data/lighter.qml b/tests/auto/declarative/qmlqt/data/lighter.qml
deleted file mode 100644
index 4e0c431..0000000
--- a/tests/auto/declarative/qmlqt/data/lighter.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var test1: Qt.lighter(Qt.rgba(1, 0.8, 0.3))
-    property var test2: Qt.lighter()
-    property var test3: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 10)
-    property var test4: Qt.lighter("red");
-    property var test5: Qt.lighter("perfectred"); // Non-existant color
-    property var test6: Qt.lighter(10);
-}
diff --git a/tests/auto/declarative/qmlqt/data/md5.qml b/tests/auto/declarative/qmlqt/data/md5.qml
deleted file mode 100644
index c474b71..0000000
--- a/tests/auto/declarative/qmlqt/data/md5.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string test1: Qt.md5()
-    property string test2: Qt.md5("Hello World")
-}
diff --git a/tests/auto/declarative/qmlqt/data/point.qml b/tests/auto/declarative/qmlqt/data/point.qml
deleted file mode 100644
index c383beb..0000000
--- a/tests/auto/declarative/qmlqt/data/point.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var test1: Qt.point(19, 34);
-    property var test2: Qt.point(-3, 109.2);
-    property var test3: Qt.point(-3);
-    property var test4: Qt.point(-3, 109.2, 1);
-}
-
diff --git a/tests/auto/declarative/qmlqt/data/rect.qml b/tests/auto/declarative/qmlqt/data/rect.qml
deleted file mode 100644
index 82b6428..0000000
--- a/tests/auto/declarative/qmlqt/data/rect.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var test1: Qt.rect(10, 13, 100, 109)
-    property var test2: Qt.rect(-10, 13, 100, 109.6)
-    property var test3: Qt.rect(10, 13);
-    property var test4: Qt.rect(10, 13, 100, 109, 10)
-    property var test5: Qt.rect(10, 13, 100, -109)
-}
diff --git a/tests/auto/declarative/qmlqt/data/rgba.qml b/tests/auto/declarative/qmlqt/data/rgba.qml
deleted file mode 100644
index 6dd6565..0000000
--- a/tests/auto/declarative/qmlqt/data/rgba.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property color test1: Qt.rgba(1, 0, 0, 0.8);
-    property color test2: Qt.rgba(1, 0.5, 0.3);
-    property color test3: Qt.rgba(1, 1);
-    property color test4: Qt.rgba(1, 1, 1, 1, 1);
-    property color test5: Qt.rgba(1.2, 1, 1);
-    property color test6: Qt.rgba(-0.1, 1, 1);
-}
diff --git a/tests/auto/declarative/qmlqt/data/size.qml b/tests/auto/declarative/qmlqt/data/size.qml
deleted file mode 100644
index 05b0317..0000000
--- a/tests/auto/declarative/qmlqt/data/size.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var test1: Qt.size(19, 34);
-    property var test2: Qt.size(3, 109.2);
-    property var test3: Qt.size(-3, 10);
-    property var test4: Qt.size(3);
-    property var test5: Qt.size(3, 109.2, 1);
-}
-
-
diff --git a/tests/auto/declarative/qmlqt/data/tint.qml b/tests/auto/declarative/qmlqt/data/tint.qml
deleted file mode 100644
index da8afe2..0000000
--- a/tests/auto/declarative/qmlqt/data/tint.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property color test1: Qt.tint("red", "blue");
-    property color test2: Qt.tint(Qt.rgba(1, 0, 0), Qt.rgba(0, 0, 0, 0));
-    property color test3: Qt.tint("red", Qt.rgba(0, 0, 1, 0.5)); // XXX - what should this be?
-    property color test4: Qt.tint("red", Qt.rgba(0, 0, 1, 0.5), 10);
-    property color test5: Qt.tint("red")
-}
diff --git a/tests/auto/declarative/qmlqt/data/vector.qml b/tests/auto/declarative/qmlqt/data/vector.qml
deleted file mode 100644
index a471c7a..0000000
--- a/tests/auto/declarative/qmlqt/data/vector.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var test1: Qt.vector3d(1, 0, 0.9);
-    property var test2: Qt.vector3d(102, -10, -982.1);
-    property var test3: Qt.vector3d(102, -10);
-    property var test4: Qt.vector3d(102, -10, -982.1, 10);
-}
diff --git a/tests/auto/declarative/qmlqt/qmlqt.pro b/tests/auto/declarative/qmlqt/qmlqt.pro
deleted file mode 100644
index 5e79ea6..0000000
--- a/tests/auto/declarative/qmlqt/qmlqt.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlqt.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
-# LIBS += -lgcov
diff --git a/tests/auto/declarative/qmlqt/tst_qmlqt.cpp b/tests/auto/declarative/qmlqt/tst_qmlqt.cpp
deleted file mode 100644
index c3c2521..0000000
--- a/tests/auto/declarative/qmlqt/tst_qmlqt.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QDebug>
-#include <QmlEngine>
-#include <QFileInfo>
-#include <QmlComponent>
-#include <QDir>
-#include <QVector3D>
-#include <QCryptographicHash>
-#include <QmlGraphicsItem>
-
-class tst_qmlqt : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlqt() {}
-
-private slots:
-    void enums();
-    void rgba();
-    void hsla();
-    void rect();
-    void point();
-    void size();
-    void vector();
-    void lighter();
-    void darker();
-    void tint();
-    void closestAngle();
-    void playSound();
-    void openUrlExternally();
-    void md5();
-    void createComponent();
-    void createQmlObject();
-    void consoleLog();
-
-private:
-    QmlEngine engine;
-};
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
-}
-
-void tst_qmlqt::enums()
-{
-    QmlComponent component(&engine, TEST_FILE("enums.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test1").toInt(), (int)Qt::Key_Escape);
-    QCOMPARE(object->property("test2").toInt(), (int)Qt::DescendingOrder);
-    QCOMPARE(object->property("test3").toInt(), (int)Qt::ElideMiddle);
-    QCOMPARE(object->property("test4").toInt(), (int)Qt::AlignRight);
-
-    delete object;
-}
-
-void tst_qmlqt::rgba()
-{
-    QmlComponent component(&engine, TEST_FILE("rgba.qml"));
-
-    QString warning1 = component.url().toString() + ":6: Unable to assign null to QColor";
-    QString warning2 = component.url().toString() + ":7: Unable to assign null to QColor";
-    QString warning3 = component.url().toString() + ":8: Unable to assign null to QColor";
-    QString warning4 = component.url().toString() + ":9: Unable to assign null to QColor";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning4));
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-
-    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromRgbF(1, 0, 0, 0.8));
-    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor::fromRgbF(1, 0.5, 0.3, 1));
-    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test6")), QColor());
-
-    delete object;
-}
-
-void tst_qmlqt::hsla()
-{
-    QmlComponent component(&engine, TEST_FILE("hsla.qml"));
-
-    QString warning1 = component.url().toString() + ":6: Unable to assign null to QColor";
-    QString warning2 = component.url().toString() + ":7: Unable to assign null to QColor";
-    QString warning3 = component.url().toString() + ":8: Unable to assign null to QColor";
-    QString warning4 = component.url().toString() + ":9: Unable to assign null to QColor";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning4));
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromHslF(1, 0, 0, 0.8));
-    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor::fromHslF(1, 0.5, 0.3, 1));
-    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test6")), QColor());
-
-    delete object;
-}
-
-void tst_qmlqt::rect()
-{
-    QmlComponent component(&engine, TEST_FILE("rect.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(qvariant_cast<QRectF>(object->property("test1")), QRectF(10, 13, 100, 109));
-    QCOMPARE(qvariant_cast<QRectF>(object->property("test2")), QRectF(-10, 13, 100, 109.6));
-    QCOMPARE(qvariant_cast<QRectF>(object->property("test3")), QRectF());
-    QCOMPARE(qvariant_cast<QRectF>(object->property("test4")), QRectF());
-    QCOMPARE(qvariant_cast<QRectF>(object->property("test5")), QRectF());
-
-    delete object;
-}
-
-void tst_qmlqt::point()
-{
-    QmlComponent component(&engine, TEST_FILE("point.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(qvariant_cast<QPointF>(object->property("test1")), QPointF(19, 34));
-    QCOMPARE(qvariant_cast<QPointF>(object->property("test2")), QPointF(-3, 109.2));
-    QCOMPARE(qvariant_cast<QPointF>(object->property("test3")), QPointF());
-    QCOMPARE(qvariant_cast<QPointF>(object->property("test4")), QPointF());
-
-    delete object;
-}
-
-void tst_qmlqt::size()
-{
-    QmlComponent component(&engine, TEST_FILE("size.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(qvariant_cast<QSizeF>(object->property("test1")), QSizeF(19, 34));
-    QCOMPARE(qvariant_cast<QSizeF>(object->property("test2")), QSizeF(3, 109.2));
-    QCOMPARE(qvariant_cast<QSizeF>(object->property("test3")), QSizeF(-3, 10));
-    QCOMPARE(qvariant_cast<QSizeF>(object->property("test4")), QSizeF());
-    QCOMPARE(qvariant_cast<QSizeF>(object->property("test5")), QSizeF());
-
-    delete object;
-}
-
-void tst_qmlqt::vector()
-{
-    QmlComponent component(&engine, TEST_FILE("vector.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(qvariant_cast<QVector3D>(object->property("test1")), QVector3D(1, 0, 0.9));
-    QCOMPARE(qvariant_cast<QVector3D>(object->property("test2")), QVector3D(102, -10, -982.1));
-    QCOMPARE(qvariant_cast<QVector3D>(object->property("test3")), QVector3D());
-    QCOMPARE(qvariant_cast<QVector3D>(object->property("test4")), QVector3D());
-
-    delete object;
-}
-
-void tst_qmlqt::lighter()
-{
-    QmlComponent component(&engine, TEST_FILE("lighter.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromRgbF(1, 0.8, 0.3).lighter());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor("red").lighter());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test6")), QColor());
-
-    delete object;
-}
-
-void tst_qmlqt::darker()
-{
-    QmlComponent component(&engine, TEST_FILE("darker.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromRgbF(1, 0.8, 0.3).darker());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor("red").darker());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test6")), QColor());
-
-    delete object;
-}
-
-void tst_qmlqt::tint()
-{
-    QmlComponent component(&engine, TEST_FILE("tint.qml"));
-
-    QString warning1 = component.url().toString() + ":7: Unable to assign null to QColor";
-    QString warning2 = component.url().toString() + ":8: Unable to assign null to QColor";
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromRgbF(0, 0, 1));
-    QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor::fromRgbF(1, 0, 0));
-    QEXPECT_FAIL("", "QT-2424",Continue);
-    QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor::fromRgbF(1, 0, 0)); 
-    QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor());
-    QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor());
-
-    delete object;
-}
-
-void tst_qmlqt::closestAngle()
-{
-    QmlComponent component(&engine, TEST_FILE("closestangle.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(qvariant_cast<qreal>(object->property("testSame")), 1.0);
-    QCOMPARE(qvariant_cast<qreal>(object->property("testLess")), 1.0);
-    QCOMPARE(qvariant_cast<qreal>(object->property("testMore")), 1.0);
-    QCOMPARE(qvariant_cast<qreal>(object->property("testFail")), 0.0);
-    QCOMPARE(qvariant_cast<qreal>(object->property("test5")), 1.0);
-    QCOMPARE(qvariant_cast<qreal>(object->property("test6")), 1.11);
-    QCOMPARE(qvariant_cast<qreal>(object->property("test7")), 1.11);
-
-    delete object;
-}
-
-void tst_qmlqt::playSound()
-{
-    QEXPECT_FAIL("", "How do we test this?", Abort);
-    QVERIFY(false);
-}
-
-void tst_qmlqt::openUrlExternally()
-{
-    QEXPECT_FAIL("", "How do we test this?", Abort);
-    QVERIFY(false);
-}
-
-void tst_qmlqt::md5()
-{
-    QmlComponent component(&engine, TEST_FILE("md5.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test1").toString(), QLatin1String(QCryptographicHash::hash(QByteArray(), QCryptographicHash::Md5).toHex()));
-    QCOMPARE(object->property("test2").toString(), QLatin1String(QCryptographicHash::hash("Hello World", QCryptographicHash::Md5).toHex()));
-
-    delete object;
-}
-
-void tst_qmlqt::createComponent()
-{
-    QmlComponent component(&engine, TEST_FILE("createComponent.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("incorrectArgCount1").toBool(), true);
-    QCOMPARE(object->property("incorrectArgCount2").toBool(), true);
-    QCOMPARE(object->property("emptyArg").toBool(), true);
-
-    QCOMPARE(object->property("absoluteUrl").toString(), QString("http://www.example.com/test.qml"));
-    QCOMPARE(object->property("relativeUrl").toString(), TEST_FILE("createComponentData.qml").toString());
-
-    delete object;
-}
-
-void tst_qmlqt::createQmlObject()
-{
-    QmlComponent component(&engine, TEST_FILE("createQmlObject.qml"));
-
-    QString warning1 = "QmlEngine::createQmlObject():";
-    QString warning2 = "    " + TEST_FILE("main.qml").toString() + ":4:1: Duplicate property name";
-    QString warning3 = "QmlEngine::createQmlObject(): Component is not ready";
-    QString warning4 = "QmlEngine::createQmlObject():";
-    QString warning5 = "    " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method";
-
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning4));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning5));
-
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("incorrectArgCount1").toBool(), true);
-    QCOMPARE(object->property("incorrectArgCount2").toBool(), true);
-    QCOMPARE(object->property("emptyArg").toBool(), true);
-    QCOMPARE(object->property("errors").toBool(), true);
-    QCOMPARE(object->property("noParent").toBool(), true);
-    QCOMPARE(object->property("notReady").toBool(), true);
-    QCOMPARE(object->property("runtimeError").toBool(), true);
-    QCOMPARE(object->property("success").toBool(), true);
-
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(object);
-    QVERIFY(item != 0);
-    QVERIFY(item->childItems().count() == 1);
-
-    delete object;
-}
-
-void tst_qmlqt::consoleLog()
-{
-    QTest::ignoreMessage(QtDebugMsg, "completed ok");
-    QTest::ignoreMessage(QtDebugMsg, "completed ok");
-    QmlComponent component(&engine, TEST_FILE("consoleLog.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-    delete object;
-}
-
-QTEST_MAIN(tst_qmlqt)
-
-#include "tst_qmlqt.moc"
diff --git a/tests/auto/declarative/qmlspringfollow/data/springfollow1.qml b/tests/auto/declarative/qmlspringfollow/data/springfollow1.qml
deleted file mode 100644
index 959d206..0000000
--- a/tests/auto/declarative/qmlspringfollow/data/springfollow1.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import Qt 4.6
-
-SpringFollow {
-}
diff --git a/tests/auto/declarative/qmlspringfollow/data/springfollow2.qml b/tests/auto/declarative/qmlspringfollow/data/springfollow2.qml
deleted file mode 100644
index 7c81fb5..0000000
--- a/tests/auto/declarative/qmlspringfollow/data/springfollow2.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-SpringFollow {
-    source: 1.44; velocity: 0.9
-    spring: 1.0; damping: 0.5
-    epsilon: 0.25; modulus: 360.0
-    mass: 2.0; enabled: true
-}
diff --git a/tests/auto/declarative/qmlspringfollow/data/springfollow3.qml b/tests/auto/declarative/qmlspringfollow/data/springfollow3.qml
deleted file mode 100644
index 6fec55b..0000000
--- a/tests/auto/declarative/qmlspringfollow/data/springfollow3.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-SpringFollow {
-    source: 1.44; velocity: 0.9
-    spring: 1.0; damping: 0.5
-    epsilon: 0.25; modulus: 360.0
-    mass: 2.0; enabled: false
-}
diff --git a/tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro b/tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro
deleted file mode 100644
index ffaa97f..0000000
--- a/tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlspringfollow.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlspringfollow/tst_qmlspringfollow.cpp b/tests/auto/declarative/qmlspringfollow/tst_qmlspringfollow.cpp
deleted file mode 100644
index 393b351..0000000
--- a/tests/auto/declarative/qmlspringfollow/tst_qmlspringfollow.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlspringfollow_p.h>
-#include <private/qmlvaluetype_p.h>
-#include "../../../shared/util.h"
-
-class tst_qmlspringfollow : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlspringfollow();
-
-private slots:
-    void defaultValues();
-    void values();
-    void disabled();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlspringfollow::tst_qmlspringfollow()
-{
-}
-
-void tst_qmlspringfollow::defaultValues()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow1.qml"));
-    QmlSpringFollow *obj = qobject_cast<QmlSpringFollow*>(c.create());
-
-    QVERIFY(obj != 0);
-
-    QCOMPARE(obj->sourceValue(), 0.);
-    QCOMPARE(obj->velocity(), 0.);
-    QCOMPARE(obj->spring(), 0.);
-    QCOMPARE(obj->damping(), 0.);
-    QCOMPARE(obj->epsilon(), 0.01);
-    QCOMPARE(obj->modulus(), 0.);
-    QCOMPARE(obj->value(), 0.);
-    QCOMPARE(obj->mass(), 1.);
-    QCOMPARE(obj->enabled(), true);
-    QCOMPARE(obj->inSync(), true);
-
-    delete obj;
-}
-
-void tst_qmlspringfollow::values()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow2.qml"));
-    QmlSpringFollow *obj = qobject_cast<QmlSpringFollow*>(c.create());
-
-    QVERIFY(obj != 0);
-
-    QCOMPARE(obj->sourceValue(), 1.44);
-    QCOMPARE(obj->velocity(), 0.9);
-    QCOMPARE(obj->spring(), 1.0);
-    QCOMPARE(obj->damping(), 0.5);
-    QCOMPARE(obj->epsilon(), 0.25);
-    QCOMPARE(obj->modulus(), 360.0);
-    QCOMPARE(obj->mass(), 2.0);
-    QCOMPARE(obj->enabled(), true);
-
-    QTRY_COMPARE(obj->value(), 1.44);
-    QTRY_COMPARE(obj->inSync(), true);
-
-    delete obj;
-}
-
-void tst_qmlspringfollow::disabled()
-{
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow3.qml"));
-    QmlSpringFollow *obj = qobject_cast<QmlSpringFollow*>(c.create());
-
-    QVERIFY(obj != 0);
-
-    QCOMPARE(obj->sourceValue(), 1.44);
-    QCOMPARE(obj->velocity(), 0.9);
-    QCOMPARE(obj->spring(), 1.0);
-    QCOMPARE(obj->damping(), 0.5);
-    QCOMPARE(obj->epsilon(), 0.25);
-    QCOMPARE(obj->modulus(), 360.0);
-    QCOMPARE(obj->mass(), 2.0);
-    QCOMPARE(obj->enabled(), false);
-
-    QCOMPARE(obj->value(), 0.0);
-    QCOMPARE(obj->inSync(), false);
-
-    delete obj;
-}
-
-QTEST_MAIN(tst_qmlspringfollow)
-
-#include "tst_qmlspringfollow.moc"
diff --git a/tests/auto/declarative/qmlstates/data/ExtendedRectangle.qml b/tests/auto/declarative/qmlstates/data/ExtendedRectangle.qml
deleted file mode 100644
index 8d64663..0000000
--- a/tests/auto/declarative/qmlstates/data/ExtendedRectangle.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: extendedRect
-    objectName: "extendedRect"
-    property color extendedColor: "orange"
-
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "green"
-        PropertyChanges {
-            target: rect
-            onDidSomething: {
-                extendedRect.color = "green"
-                extendedColor = "green"
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges.qml b/tests/auto/declarative/qmlstates/data/anchorChanges.qml
deleted file mode 100644
index 7dce889..0000000
--- a/tests/auto/declarative/qmlstates/data/anchorChanges.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: container
-    width: 200; height: 200
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        width: 50; height: 50
-        color: "green";
-        anchors.left: parent.left
-        anchors.leftMargin: 5
-    }
-    states: State {
-        name: "right"
-        AnchorChanges {
-            id: ancCh
-            target: myRect;
-            reset: "left"
-            right: container.right
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges2.qml b/tests/auto/declarative/qmlstates/data/anchorChanges2.qml
deleted file mode 100644
index 545345e..0000000
--- a/tests/auto/declarative/qmlstates/data/anchorChanges2.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 200; height: 200
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        width: 50; height: 50
-        color: "green";
-        anchors.left: parent.left
-        anchors.leftMargin: 5
-    }
-    states: State {
-        name: "right"
-        AnchorChanges {
-            target: myRect;
-            reset: "left"
-            right: parent.right
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges3.qml b/tests/auto/declarative/qmlstates/data/anchorChanges3.qml
deleted file mode 100644
index 9d5b317..0000000
--- a/tests/auto/declarative/qmlstates/data/anchorChanges3.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: container
-    width: 200; height: 200
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        color: "green";
-        anchors.left: parent.left
-        anchors.right: rightGuideline.left
-        anchors.top: topGuideline.top
-        anchors.bottom: container.bottom
-    }
-    Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 }
-    Item { id: rightGuideline; x: 150 }
-    Item { id: topGuideline; y: 10 }
-    Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 }
-    states: State {
-        name: "reanchored"
-        AnchorChanges {
-            target: myRect;
-            left: leftGuideline.left
-            right: container.right
-            top: container.top
-            bottom: bottomGuideline.bottom
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges4.qml b/tests/auto/declarative/qmlstates/data/anchorChanges4.qml
deleted file mode 100644
index f128989..0000000
--- a/tests/auto/declarative/qmlstates/data/anchorChanges4.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 200; height: 200
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        color: "green";
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-    }
-    Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 }
-    Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 }
-    states: State {
-        name: "reanchored"
-        AnchorChanges {
-            target: myRect;
-            horizontalCenter: bottomGuideline.horizontalCenter
-            verticalCenter: leftGuideline.verticalCenter
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges5.qml b/tests/auto/declarative/qmlstates/data/anchorChanges5.qml
deleted file mode 100644
index 4e6d34b..0000000
--- a/tests/auto/declarative/qmlstates/data/anchorChanges5.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 200; height: 200
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        color: "green";
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.baseline: parent.baseline
-    }
-    Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 }
-    Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 }
-    states: State {
-        name: "reanchored"
-        AnchorChanges {
-            target: myRect;
-            horizontalCenter: bottomGuideline.horizontalCenter
-            baseline: leftGuideline.baseline
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/autoStateAtStartupRestoreBug.qml b/tests/auto/declarative/qmlstates/data/autoStateAtStartupRestoreBug.qml
deleted file mode 100644
index 693a5c5..0000000
--- a/tests/auto/declarative/qmlstates/data/autoStateAtStartupRestoreBug.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: root
-    property int input: 1
-    property int test: 9
-
-    states: [
-        State {
-            name: "portrait"
-            when: root.input == 1
-            PropertyChanges {
-                target: root
-                test: 3
-            }
-        }
-    ]
-}
diff --git a/tests/auto/declarative/qmlstates/data/basicBinding.qml b/tests/auto/declarative/qmlstates/data/basicBinding.qml
deleted file mode 100644
index 6528113..0000000
--- a/tests/auto/declarative/qmlstates/data/basicBinding.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-
-    property color sourceColor: "blue"
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "blue"
-        PropertyChanges { target: myRectangle; color: sourceColor }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/basicBinding2.qml b/tests/auto/declarative/qmlstates/data/basicBinding2.qml
deleted file mode 100644
index 2e7b4cf..0000000
--- a/tests/auto/declarative/qmlstates/data/basicBinding2.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-
-    property color sourceColor: "red"
-    width: 100; height: 100
-    color: sourceColor
-    states: State {
-        name: "blue"
-        PropertyChanges { target: myRectangle; color: "blue" }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/basicBinding3.qml b/tests/auto/declarative/qmlstates/data/basicBinding3.qml
deleted file mode 100644
index a3c47d9..0000000
--- a/tests/auto/declarative/qmlstates/data/basicBinding3.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-
-    property color sourceColor: "red"
-    property color sourceColor2: "blue"
-    width: 100; height: 100
-    color: sourceColor
-    states: State {
-        name: "blue"
-        PropertyChanges { target: myRectangle; color: sourceColor2 }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/basicBinding4.qml b/tests/auto/declarative/qmlstates/data/basicBinding4.qml
deleted file mode 100644
index 1f52d0e..0000000
--- a/tests/auto/declarative/qmlstates/data/basicBinding4.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-
-    property color sourceColor: "blue"
-    width: 100; height: 100
-    color: "red"
-    states: [
-        State {
-            name: "blue"
-            PropertyChanges { target: myRectangle; color: sourceColor }
-        },
-        State {
-            name: "green"
-            PropertyChanges { target: myRectangle; color: "green" }
-        }]
-}
diff --git a/tests/auto/declarative/qmlstates/data/basicChanges.qml b/tests/auto/declarative/qmlstates/data/basicChanges.qml
deleted file mode 100644
index 88ea256..0000000
--- a/tests/auto/declarative/qmlstates/data/basicChanges.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "blue"
-        PropertyChanges { target: myRectangle; color: "blue" }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/basicChanges2.qml b/tests/auto/declarative/qmlstates/data/basicChanges2.qml
deleted file mode 100644
index 4dd293f..0000000
--- a/tests/auto/declarative/qmlstates/data/basicChanges2.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    states: [
-        State {
-            name: "blue"
-            PropertyChanges { target: myRectangle; color: "blue" }
-        },
-        State {
-            name: "green"
-            PropertyChanges { target: myRectangle; color: "green" }
-        }]
-}
diff --git a/tests/auto/declarative/qmlstates/data/basicChanges3.qml b/tests/auto/declarative/qmlstates/data/basicChanges3.qml
deleted file mode 100644
index 62ab1d5..0000000
--- a/tests/auto/declarative/qmlstates/data/basicChanges3.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    states: [
-        State {
-            name: "blue"
-            PropertyChanges { target: myRectangle; color: "blue" }
-        },
-        State {
-            name: "bordered"
-            PropertyChanges { target: myRectangle; border.width: 2 }
-        }]
-}
diff --git a/tests/auto/declarative/qmlstates/data/basicExtension.qml b/tests/auto/declarative/qmlstates/data/basicExtension.qml
deleted file mode 100644
index 1836f8a..0000000
--- a/tests/auto/declarative/qmlstates/data/basicExtension.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    states: [
-        State {
-            name: "blue"
-            PropertyChanges { target: myRectangle; color: "blue" }
-        },
-        State {
-            name: "bordered"
-            extend: "blue"
-            PropertyChanges { target: myRectangle; border.width: 2 }
-        }]
-}
diff --git a/tests/auto/declarative/qmlstates/data/deleting.qml b/tests/auto/declarative/qmlstates/data/deleting.qml
deleted file mode 100644
index 3da0b12..0000000
--- a/tests/auto/declarative/qmlstates/data/deleting.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "blue"
-        PropertyChanges { target: myRectangle; color: "blue"; objectName: "pc1" }
-        PropertyChanges { target: myRectangle; radius: 5; objectName: "pc2" }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/deletingState.qml b/tests/auto/declarative/qmlstates/data/deletingState.qml
deleted file mode 100644
index a5e8ed3..0000000
--- a/tests/auto/declarative/qmlstates/data/deletingState.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    StateGroup {
-        id: stateGroup
-        states: State {
-            name: "blue"
-            PropertyChanges { target: myRectangle; color: "blue" }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/explicit.qml b/tests/auto/declarative/qmlstates/data/explicit.qml
deleted file mode 100644
index 7543f84..0000000
--- a/tests/auto/declarative/qmlstates/data/explicit.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    property color sourceColor: "blue"
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "blue"
-        PropertyChanges {
-            objectName: "changes"
-            target: myRectangle; explicit: true
-            color: sourceColor
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/fakeExtension.qml b/tests/auto/declarative/qmlstates/data/fakeExtension.qml
deleted file mode 100644
index c7975e1..0000000
--- a/tests/auto/declarative/qmlstates/data/fakeExtension.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    states: [
-        State {
-            name: "blue"
-            PropertyChanges { target: myRectangle; color: "blue" }
-        },
-        State {
-            name: "green"
-            extend: "blue"
-            PropertyChanges { target: myRectangle; color: "green" }
-        }]
-}
diff --git a/tests/auto/declarative/qmlstates/data/illegalTempState.qml b/tests/auto/declarative/qmlstates/data/illegalTempState.qml
deleted file mode 100644
index 0dc39ae..0000000
--- a/tests/auto/declarative/qmlstates/data/illegalTempState.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: card
-    width: 100; height: 100
-
-    states: [
-        State {
-            name: "placed"
-            PropertyChanges { target: card; state: "idle" }
-        },
-        State {
-            name: "idle"
-        }
-    ]
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: card.state = "placed"
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/legalTempState.qml b/tests/auto/declarative/qmlstates/data/legalTempState.qml
deleted file mode 100644
index 9be984c..0000000
--- a/tests/auto/declarative/qmlstates/data/legalTempState.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: card
-    width: 100; height: 100
-
-    states: [
-        State {
-            name: "placed"
-            onCompleted: card.state = "idle"
-            StateChangeScript { script: console.log("entering placed") }
-        },
-        State {
-            name: "idle"
-            StateChangeScript { script: console.log("entering idle") }
-        }
-    ]
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: card.state = "placed"
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/nonExistantProp.qml b/tests/auto/declarative/qmlstates/data/nonExistantProp.qml
deleted file mode 100644
index a5dd86a..0000000
--- a/tests/auto/declarative/qmlstates/data/nonExistantProp.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "blue"
-        PropertyChanges { target: myRectangle; colr: "blue" }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/parentChange.qml b/tests/auto/declarative/qmlstates/data/parentChange.qml
deleted file mode 100644
index b8c7818..0000000
--- a/tests/auto/declarative/qmlstates/data/parentChange.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400; height: 400
-    Item {
-        x: 10; y: 10
-        Rectangle {
-            id: myRect
-            objectName: "MyRect"
-            x: 5
-            width: 100; height: 100
-            color: "red"
-        }
-    }
-    MouseArea {
-        id: clickable
-        anchors.fill: parent
-    }
-
-    Item {
-        x: -100; y: -50
-        Item {
-            id: newParent
-            objectName: "NewParent"
-            x: 248; y: 360
-        }
-    }
-
-    states: State {
-        name: "reparented"
-        when: clickable.pressed
-        ParentChange {
-            target: myRect
-            parent: newParent
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/parentChange2.qml b/tests/auto/declarative/qmlstates/data/parentChange2.qml
deleted file mode 100644
index 8b23591..0000000
--- a/tests/auto/declarative/qmlstates/data/parentChange2.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: newParent
-    width: 400; height: 400
-    Item {
-        scale: .5
-        rotation: 15
-        x: 10; y: 10
-        Rectangle {
-            id: myRect
-            objectName: "MyRect"
-            x: 5
-            width: 100; height: 100
-            color: "red"
-        }
-    }
-    MouseArea {
-        id: clickable
-        anchors.fill: parent
-    }
-
-    states: State {
-        name: "reparented"
-        when: clickable.pressed
-        ParentChange {
-            target: myRect
-            parent: newParent
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/parentChange3.qml b/tests/auto/declarative/qmlstates/data/parentChange3.qml
deleted file mode 100644
index ddf9268..0000000
--- a/tests/auto/declarative/qmlstates/data/parentChange3.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400; height: 400
-    Item {
-        scale: .5
-        rotation: 15
-        transformOrigin: "Center"
-        x: 10; y: 10
-        Rectangle {
-            id: myRect
-            objectName: "MyRect"
-            x: 5
-            width: 100; height: 100
-            transformOrigin: "BottomLeft"
-            color: "red"
-        }
-    }
-    MouseArea {
-        id: clickable
-        anchors.fill: parent
-    }
-
-    Item {
-        x: 200; y: 200
-        rotation: 52;
-        scale: 2
-        Item {
-            id: newParent
-            x: 100; y: 100
-        }
-    }
-
-    states: State {
-        name: "reparented"
-        when: clickable.pressed
-        ParentChange {
-            target: myRect
-            parent: newParent
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/parentChange4.qml b/tests/auto/declarative/qmlstates/data/parentChange4.qml
deleted file mode 100644
index 34d667a..0000000
--- a/tests/auto/declarative/qmlstates/data/parentChange4.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400; height: 400
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        x: 5; y: 5
-        width: 100; height: 100
-        color: "red"
-    }
-    MouseArea {
-        id: clickable
-        anchors.fill: parent
-    }
-
-    Item {
-        id: newParent
-        transform: Scale { xScale: .5; yScale: .7}
-    }
-
-    states: State {
-        name: "reparented"
-        when: clickable.pressed
-        ParentChange {
-            target: myRect
-            parent: newParent
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/parentChange5.qml b/tests/auto/declarative/qmlstates/data/parentChange5.qml
deleted file mode 100644
index 56bdd89..0000000
--- a/tests/auto/declarative/qmlstates/data/parentChange5.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400; height: 400
-    Rectangle {
-        id: myRect
-        objectName: "MyRect"
-        x: 5; y: 5
-        width: 100; height: 100
-        color: "red"
-    }
-    MouseArea {
-        id: clickable
-        anchors.fill: parent
-    }
-
-    Item {
-        id: newParent
-        transform: Rotation { angle: 30; axis { x: 0; y: 1; z: 0 } }
-    }
-
-    states: State {
-        name: "reparented"
-        when: clickable.pressed
-        ParentChange {
-            target: myRect
-            parent: newParent
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/propertyErrors.qml b/tests/auto/declarative/qmlstates/data/propertyErrors.qml
deleted file mode 100644
index 080e833..0000000
--- a/tests/auto/declarative/qmlstates/data/propertyErrors.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "blue"
-        PropertyChanges { target: myRectangle; colr: "blue"; wantsFocus: true }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/restoreEntryValues.qml b/tests/auto/declarative/qmlstates/data/restoreEntryValues.qml
deleted file mode 100644
index 088c608..0000000
--- a/tests/auto/declarative/qmlstates/data/restoreEntryValues.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "blue"
-        PropertyChanges {
-            target: myRectangle
-            restoreEntryValues: false
-            color: "blue"
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/script.qml b/tests/auto/declarative/qmlstates/data/script.qml
deleted file mode 100644
index 3c5f33e..0000000
--- a/tests/auto/declarative/qmlstates/data/script.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-Rectangle {
-    id: myRectangle
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "blue"
-        StateChangeScript { script: myRectangle.color = "blue"; }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/signalOverride.qml b/tests/auto/declarative/qmlstates/data/signalOverride.qml
deleted file mode 100644
index 5ba1566..0000000
--- a/tests/auto/declarative/qmlstates/data/signalOverride.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-import Qt.test 1.0
-
-MyRectangle {
-    id: rect
-
-    onDidSomething: color = "blue"
-
-    width: 100; height: 100
-    color: "red"
-    states: State {
-        name: "green"
-        PropertyChanges {
-            target: rect
-            onDidSomething: color = "green"
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/data/signalOverride2.qml b/tests/auto/declarative/qmlstates/data/signalOverride2.qml
deleted file mode 100644
index 527e165..0000000
--- a/tests/auto/declarative/qmlstates/data/signalOverride2.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-import Qt.test 1.0
-
-MyRectangle {
-    id: rect
-    onDidSomething: color = "blue"
-    width: 100; height: 100
-    ExtendedRectangle {}
-}
diff --git a/tests/auto/declarative/qmlstates/data/signalOverrideCrash.qml b/tests/auto/declarative/qmlstates/data/signalOverrideCrash.qml
deleted file mode 100644
index 702fa86..0000000
--- a/tests/auto/declarative/qmlstates/data/signalOverrideCrash.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-import Qt.test 1.0
-
-MyRectangle {
-    id: rect
-
-    width: 100; height: 100
-    states: State {
-        name: "overridden"
-        PropertyChanges {
-            target: rect
-            onDidSomething: rect.state = ""
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlstates/qmlstates.pro b/tests/auto/declarative/qmlstates/qmlstates.pro
deleted file mode 100644
index 538734a..0000000
--- a/tests/auto/declarative/qmlstates/qmlstates.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlstates.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlstates/tst_qmlstates.cpp b/tests/auto/declarative/qmlstates/tst_qmlstates.cpp
deleted file mode 100644
index c372a15..0000000
--- a/tests/auto/declarative/qmlstates/tst_qmlstates.cpp
+++ /dev/null
@@ -1,917 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsanchors_p_p.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlpropertychanges_p.h>
-#include <private/qmlstategroup_p.h>
-
-class tst_qmlstates : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlstates() {}
-
-private:
-    static QByteArray fullDataPath(const QString &path);
-
-private slots:
-    void initTestCase();
-
-    void basicChanges();
-    void basicExtension();
-    void basicBinding();
-    void signalOverride();
-    void signalOverrideCrash();
-    void parentChange();
-    void parentChangeErrors();
-    void anchorChanges();
-    void anchorChanges2();
-    void anchorChanges3();
-    void anchorChanges4();
-    void anchorChanges5();
-    void script();
-    void restoreEntryValues();
-    void explicitChanges();
-    void propertyErrors();
-    void incorrectRestoreBug();
-    void autoStateAtStartupRestoreBug();
-    void deletingChange();
-    void deletingState();
-    void tempState();
-    void illegalTempState();
-    void nonExistantProperty();
-};
-
-QByteArray tst_qmlstates::fullDataPath(const QString &path)
-{
-    return QUrl::fromLocalFile(SRCDIR + path).toString().toUtf8();    
-}
-
-void tst_qmlstates::basicChanges()
-{
-    QmlEngine engine;
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicChanges.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicChanges2.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("green");
-        QCOMPARE(rect->color(),QColor("green"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("green");
-        QCOMPARE(rect->color(),QColor("green"));
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicChanges3.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-        QCOMPARE(rect->border()->width(),1);
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-        QCOMPARE(rect->border()->width(),1);
-
-        rect->setState("bordered");
-        QCOMPARE(rect->color(),QColor("red"));
-        QCOMPARE(rect->border()->width(),2);
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-        QCOMPARE(rect->border()->width(),1);
-        //### we should be checking that this is an implicit rather than explicit 1 (which currently fails)
-
-        rect->setState("bordered");
-        QCOMPARE(rect->color(),QColor("red"));
-        QCOMPARE(rect->border()->width(),2);
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-        QCOMPARE(rect->border()->width(),1);
-
-    }
-}
-
-void tst_qmlstates::basicExtension()
-{
-    QmlEngine engine;
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicExtension.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-        QCOMPARE(rect->border()->width(),1);
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-        QCOMPARE(rect->border()->width(),1);
-
-        rect->setState("bordered");
-        QCOMPARE(rect->color(),QColor("blue"));
-        QCOMPARE(rect->border()->width(),2);
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-        QCOMPARE(rect->border()->width(),1);
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-        QCOMPARE(rect->border()->width(),1);
-
-        rect->setState("bordered");
-        QCOMPARE(rect->color(),QColor("blue"));
-        QCOMPARE(rect->border()->width(),2);
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-        QCOMPARE(rect->border()->width(),1);
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/fakeExtension.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("green");
-        QCOMPARE(rect->color(),QColor("green"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("green");
-        QCOMPARE(rect->color(),QColor("green"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("green");
-        QCOMPARE(rect->color(),QColor("green"));
-    }
-}
-
-void tst_qmlstates::basicBinding()
-{
-    QmlEngine engine;
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicBinding.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-        rect->setProperty("sourceColor", QColor("green"));
-        QCOMPARE(rect->color(),QColor("green"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-        rect->setProperty("sourceColor", QColor("yellow"));
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("yellow"));
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicBinding2.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-        rect->setProperty("sourceColor", QColor("green"));
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("green"));
-        rect->setProperty("sourceColor", QColor("yellow"));
-        QCOMPARE(rect->color(),QColor("yellow"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("yellow"));
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicBinding3.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-        rect->setProperty("sourceColor", QColor("green"));
-        QCOMPARE(rect->color(),QColor("green"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-        rect->setProperty("sourceColor", QColor("red"));
-        QCOMPARE(rect->color(),QColor("blue"));
-        rect->setProperty("sourceColor2", QColor("yellow"));
-        QCOMPARE(rect->color(),QColor("yellow"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-        rect->setProperty("sourceColor2", QColor("green"));
-        QCOMPARE(rect->color(),QColor("red"));
-        rect->setProperty("sourceColor", QColor("yellow"));
-        QCOMPARE(rect->color(),QColor("yellow"));
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicBinding4.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-        rect->setProperty("sourceColor", QColor("yellow"));
-        QCOMPARE(rect->color(),QColor("yellow"));
-
-        rect->setState("green");
-        QCOMPARE(rect->color(),QColor("green"));
-        rect->setProperty("sourceColor", QColor("purple"));
-        QCOMPARE(rect->color(),QColor("green"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("purple"));
-
-        rect->setState("green");
-        QCOMPARE(rect->color(),QColor("green"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("red"));
-    }
-}
-
-class MyRect : public QmlGraphicsRectangle
-{
-   Q_OBJECT
-public:
-    MyRect() {}
-    void doSomething() { emit didSomething(); }
-Q_SIGNALS:
-    void didSomething();
-};
-
-QML_DECLARE_TYPE(MyRect)
-
-void tst_qmlstates::initTestCase()
-{
-    QML_REGISTER_TYPE(Qt.test, 1, 0, MyRectangle,MyRect);
-}
-
-void tst_qmlstates::signalOverride()
-{
-    QmlEngine engine;
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/signalOverride.qml");
-        MyRect *rect = qobject_cast<MyRect*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-        rect->doSomething();
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("green");
-        rect->doSomething();
-        QCOMPARE(rect->color(),QColor("green"));
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/signalOverride2.qml");
-        MyRect *rect = qobject_cast<MyRect*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("white"));
-        rect->doSomething();
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("extendedRect"));
-
-        innerRect->setState("green");
-        rect->doSomething();
-        QCOMPARE(rect->color(),QColor("blue"));
-        QCOMPARE(innerRect->color(),QColor("green"));
-        QCOMPARE(innerRect->property("extendedColor").value<QColor>(),QColor("green"));
-    }
-}
-
-void tst_qmlstates::signalOverrideCrash()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/signalOverrideCrash.qml");
-    MyRect *rect = qobject_cast<MyRect*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    rect->setState("overridden");
-    rect->doSomething();
-}
-
-void tst_qmlstates::parentChange()
-{
-    QmlEngine engine;
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-        QVERIFY(innerRect != 0);
-
-        QmlListReference list(rect, "states");
-        QmlState *state = qobject_cast<QmlState*>(list.at(0));
-        QVERIFY(state != 0);
-
-        qmlExecuteDeferred(state);
-        QmlParentChange *pChange = qobject_cast<QmlParentChange*>(state->operationAt(0));
-        QVERIFY(pChange != 0);
-        QmlGraphicsItem *nParent = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("NewParent"));
-        QVERIFY(nParent != 0);
-
-        QCOMPARE(pChange->parent(), nParent);
-
-        rect->setState("reparented");
-        QCOMPARE(innerRect->rotation(), qreal(0));
-        QCOMPARE(innerRect->scale(), qreal(1));
-        QCOMPARE(innerRect->x(), qreal(-133));
-        QCOMPARE(innerRect->y(), qreal(-300));
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange2.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-        QVERIFY(innerRect != 0);
-
-        rect->setState("reparented");
-        QCOMPARE(innerRect->rotation(), qreal(15));
-        QCOMPARE(innerRect->scale(), qreal(.5));
-        QEXPECT_FAIL("", "QTBUG-2919", Continue);
-        QCOMPARE(QString("%1").arg(innerRect->x()), QString("%1").arg(12.4148145657));
-        QEXPECT_FAIL("", "QTBUG-2919", Continue);
-        QCOMPARE(QString("%1").arg(innerRect->y()), QString("%1").arg(10.6470476128));
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange3.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-        QVERIFY(innerRect != 0);
-
-        rect->setState("reparented");
-        QCOMPARE(innerRect->rotation(), qreal(-37));
-        QCOMPARE(innerRect->scale(), qreal(.25));
-        QCOMPARE(QString("%1").arg(innerRect->x()), QString("%1").arg(-217.305));
-        QCOMPARE(QString("%1").arg(innerRect->y()), QString("%1").arg(-164.413));
-
-        rect->setState("");
-        QCOMPARE(innerRect->rotation(), qreal(0));
-        QCOMPARE(innerRect->scale(), qreal(1));
-        QCOMPARE(innerRect->x(), qreal(5));
-        QEXPECT_FAIL("", "QTBUG-2919", Continue);
-        QCOMPARE(innerRect->y(), qreal(0));
-    }
-}
-
-void tst_qmlstates::parentChangeErrors()
-{
-    QmlEngine engine;
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange4.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-        QVERIFY(innerRect != 0);
-
-        QTest::ignoreMessage(QtWarningMsg, QByteArray("QML ParentChange (" + fullDataPath("/data/parentChange4.qml") + ":25:9) Unable to preserve appearance under non-uniform scale").constData());
-        rect->setState("reparented");
-        QCOMPARE(innerRect->rotation(), qreal(0));
-        QCOMPARE(innerRect->scale(), qreal(1));
-        QCOMPARE(innerRect->x(), qreal(5));
-        QCOMPARE(innerRect->y(), qreal(5));
-    }
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange5.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-        QVERIFY(innerRect != 0);
-
-        QTest::ignoreMessage(QtWarningMsg, QByteArray("QML ParentChange (" + fullDataPath("/data/parentChange5.qml") + ":25:9) Unable to preserve appearance under complex transform").constData());
-        rect->setState("reparented");
-        QCOMPARE(innerRect->rotation(), qreal(0));
-        QCOMPARE(innerRect->scale(), qreal(1));
-        QCOMPARE(innerRect->x(), qreal(5));
-        QCOMPARE(innerRect->y(), qreal(5));
-    }
-}
-
-void tst_qmlstates::anchorChanges()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-    QVERIFY(innerRect != 0);
-
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
-    QVERIFY(state != 0);
-
-    qmlExecuteDeferred(state);
-    QmlAnchorChanges *aChanges = qobject_cast<QmlAnchorChanges*>(state->operationAt(0));
-    QVERIFY(aChanges != 0);
-
-    rect->setState("right");
-    QCOMPARE(innerRect->x(), qreal(150));
-    QCOMPARE(aChanges->reset(), QString("left"));
-    QCOMPARE(aChanges->object(), innerRect);
-    QCOMPARE(aChanges->right().item, rect->right().item);
-    QCOMPARE(aChanges->right().anchorLine, rect->right().anchorLine);
-
-    rect->setState("");
-    QCOMPARE(innerRect->x(), qreal(5));
-
-    delete rect;
-}
-
-void tst_qmlstates::anchorChanges2()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges2.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-    QVERIFY(innerRect != 0);
-
-    rect->setState("right");
-    QEXPECT_FAIL("", "QTBUG-5338", Continue);
-    QCOMPARE(innerRect->x(), qreal(150));
-
-    rect->setState("");
-    QCOMPARE(innerRect->x(), qreal(5));
-
-    delete rect;
-}
-
-void tst_qmlstates::anchorChanges3()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges3.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-    QVERIFY(innerRect != 0);
-
-    QmlGraphicsItem *leftGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("LeftGuideline"));
-    QVERIFY(leftGuideline != 0);
-
-    QmlGraphicsItem *bottomGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("BottomGuideline"));
-    QVERIFY(bottomGuideline != 0);
-
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
-    QVERIFY(state != 0);
-
-    qmlExecuteDeferred(state);
-    QmlAnchorChanges *aChanges = qobject_cast<QmlAnchorChanges*>(state->operationAt(0));
-    QVERIFY(aChanges != 0);
-
-    rect->setState("reanchored");
-    QCOMPARE(aChanges->object(), innerRect);
-    QCOMPARE(aChanges->left().item, leftGuideline->left().item);
-    QCOMPARE(aChanges->left().anchorLine, leftGuideline->left().anchorLine);
-    QCOMPARE(aChanges->right().item, rect->right().item);
-    QCOMPARE(aChanges->right().anchorLine, rect->right().anchorLine);
-    QCOMPARE(aChanges->top().item, rect->top().item);
-    QCOMPARE(aChanges->top().anchorLine, rect->top().anchorLine);
-    QCOMPARE(aChanges->bottom().item, bottomGuideline->bottom().item);
-    QCOMPARE(aChanges->bottom().anchorLine, bottomGuideline->bottom().anchorLine);
-
-    QCOMPARE(innerRect->x(), qreal(10));
-    QCOMPARE(innerRect->y(), qreal(0));
-    QCOMPARE(innerRect->width(), qreal(190));
-    QCOMPARE(innerRect->height(), qreal(150));
-
-    rect->setState("");
-    QCOMPARE(innerRect->x(), qreal(0));
-    QCOMPARE(innerRect->y(), qreal(10));
-    QCOMPARE(innerRect->width(), qreal(150));
-    QCOMPARE(innerRect->height(), qreal(190));
-
-    delete rect;
-}
-
-void tst_qmlstates::anchorChanges4()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges4.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-    QVERIFY(innerRect != 0);
-
-    QmlGraphicsItem *leftGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("LeftGuideline"));
-    QVERIFY(leftGuideline != 0);
-
-    QmlGraphicsItem *bottomGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("BottomGuideline"));
-    QVERIFY(bottomGuideline != 0);
-
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
-    QVERIFY(state != 0);
-
-    qmlExecuteDeferred(state);
-    QmlAnchorChanges *aChanges = qobject_cast<QmlAnchorChanges*>(state->operationAt(0));
-    QVERIFY(aChanges != 0);
-
-    rect->setState("reanchored");
-    QCOMPARE(aChanges->object(), innerRect);
-    QCOMPARE(aChanges->horizontalCenter().item, bottomGuideline->horizontalCenter().item);
-    QCOMPARE(aChanges->horizontalCenter().anchorLine, bottomGuideline->horizontalCenter().anchorLine);
-    QCOMPARE(aChanges->verticalCenter().item, leftGuideline->verticalCenter().item);
-    QCOMPARE(aChanges->verticalCenter().anchorLine, leftGuideline->verticalCenter().anchorLine);
-
-    delete rect;
-}
-
-void tst_qmlstates::anchorChanges5()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges5.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
-    QVERIFY(innerRect != 0);
-
-    QmlGraphicsItem *leftGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("LeftGuideline"));
-    QVERIFY(leftGuideline != 0);
-
-    QmlGraphicsItem *bottomGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("BottomGuideline"));
-    QVERIFY(bottomGuideline != 0);
-
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
-    QVERIFY(state != 0);
-
-    qmlExecuteDeferred(state);
-    QmlAnchorChanges *aChanges = qobject_cast<QmlAnchorChanges*>(state->operationAt(0));
-    QVERIFY(aChanges != 0);
-
-    rect->setState("reanchored");
-    QCOMPARE(aChanges->object(), innerRect);
-    QCOMPARE(aChanges->horizontalCenter().item, bottomGuideline->horizontalCenter().item);
-    QCOMPARE(aChanges->horizontalCenter().anchorLine, bottomGuideline->horizontalCenter().anchorLine);
-    QCOMPARE(aChanges->baseline().item, leftGuideline->baseline().item);
-    QCOMPARE(aChanges->baseline().anchorLine, leftGuideline->baseline().anchorLine);
-
-    delete rect;
-}
-
-void tst_qmlstates::script()
-{
-    QmlEngine engine;
-
-    {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/script.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-        QVERIFY(rect != 0);
-
-        QCOMPARE(rect->color(),QColor("red"));
-
-        rect->setState("blue");
-        QCOMPARE(rect->color(),QColor("blue"));
-
-        rect->setState("");
-        QCOMPARE(rect->color(),QColor("blue")); // a script isn't reverted
-    }
-}
-
-void tst_qmlstates::restoreEntryValues()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/restoreEntryValues.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QCOMPARE(rect->color(),QColor("red"));
-
-    rect->setState("blue");
-    QCOMPARE(rect->color(),QColor("blue"));
-
-    rect->setState("");
-    QCOMPARE(rect->color(),QColor("blue"));
-}
-
-void tst_qmlstates::explicitChanges()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/explicit.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
-    QVERIFY(state != 0);
-
-    qmlExecuteDeferred(state);
-    QmlPropertyChanges *changes = qobject_cast<QmlPropertyChanges*>(rect->findChild<QmlPropertyChanges*>("changes"));
-    QVERIFY(changes != 0);
-    QVERIFY(changes->isExplicit());
-
-    QCOMPARE(rect->color(),QColor("red"));
-
-    rect->setState("blue");
-    QCOMPARE(rect->color(),QColor("blue"));
-
-    rect->setProperty("sourceColor", QColor("green"));
-    QCOMPARE(rect->color(),QColor("blue"));
-
-    rect->setState("");
-    QCOMPARE(rect->color(),QColor("red"));
-    rect->setProperty("sourceColor", QColor("yellow"));
-    QCOMPARE(rect->color(),QColor("red"));
-
-    rect->setState("blue");
-    QCOMPARE(rect->color(),QColor("yellow"));
-}
-
-void tst_qmlstates::propertyErrors()
-{
-    QmlEngine engine;
-    QmlComponent rectComponent(&engine, SRCDIR "/data/propertyErrors.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QCOMPARE(rect->color(),QColor("red"));
-
-    QTest::ignoreMessage(QtWarningMsg, QByteArray("QML PropertyChanges (" + fullDataPath("/data/propertyErrors.qml") + ":8:9) Cannot assign to non-existent property \"colr\"").constData());
-    QTest::ignoreMessage(QtWarningMsg, QByteArray("QML PropertyChanges (" + fullDataPath("/data/propertyErrors.qml") + ":8:9) Cannot assign to read-only property \"wantsFocus\"").constData());
-    rect->setState("blue");
-}
-
-void tst_qmlstates::incorrectRestoreBug()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/basicChanges.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QCOMPARE(rect->color(),QColor("red"));
-
-    rect->setState("blue");
-    QCOMPARE(rect->color(),QColor("blue"));
-
-    rect->setState("");
-    QCOMPARE(rect->color(),QColor("red"));
-
-    // make sure if we change the base state value, we then restore to it correctly
-    rect->setColor(QColor("green"));
-
-    rect->setState("blue");
-    QCOMPARE(rect->color(),QColor("blue"));
-
-    rect->setState("");
-    QCOMPARE(rect->color(),QColor("green"));
-}
-
-void tst_qmlstates::autoStateAtStartupRestoreBug()
-{
-    QmlEngine engine;
-
-    QmlComponent component(&engine, SRCDIR "/data/autoStateAtStartupRestoreBug.qml");
-    QObject *obj = component.create();
-
-    QVERIFY(obj != 0);
-    QCOMPARE(obj->property("test").toInt(), 3);
-
-    obj->setProperty("input", 2);
-
-    QCOMPARE(obj->property("test").toInt(), 9);
-
-    delete obj;
-}
-
-void tst_qmlstates::deletingChange()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/deleting.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    rect->setState("blue");
-    QCOMPARE(rect->color(),QColor("blue"));
-    QCOMPARE(rect->radius(),qreal(5));
-
-    rect->setState("");
-    QCOMPARE(rect->color(),QColor("red"));
-    QCOMPARE(rect->radius(),qreal(0));
-
-    QmlPropertyChanges *pc = rect->findChild<QmlPropertyChanges*>("pc1");
-    QVERIFY(pc != 0);
-    delete pc;
-
-    QmlState *state = rect->findChild<QmlState*>();
-    QVERIFY(state != 0);
-    qmlExecuteDeferred(state);
-    QCOMPARE(state->operationCount(), 1);
-
-    rect->setState("blue");
-    QCOMPARE(rect->color(),QColor("red"));
-    QCOMPARE(rect->radius(),qreal(5));
-
-    delete rect;
-}
-
-void tst_qmlstates::deletingState()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/deletingState.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QmlStateGroup *sg = rect->findChild<QmlStateGroup*>();
-    QVERIFY(sg != 0);
-    QVERIFY(sg->findState("blue") != 0);
-
-    sg->setState("blue");
-    QCOMPARE(rect->color(),QColor("blue"));
-
-    sg->setState("");
-    QCOMPARE(rect->color(),QColor("red"));
-
-    QmlState *state = rect->findChild<QmlState*>();
-    QVERIFY(state != 0);
-    delete state;
-
-    QVERIFY(sg->findState("blue") == 0);
-
-    //### should we warn that state doesn't exist
-    sg->setState("blue");
-    QCOMPARE(rect->color(),QColor("red"));
-
-    delete rect;
-}
-
-void tst_qmlstates::tempState()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/legalTempState.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QTest::ignoreMessage(QtDebugMsg, "entering placed");
-    QTest::ignoreMessage(QtDebugMsg, "entering idle");
-    rect->setState("placed");
-    QCOMPARE(rect->state(), QLatin1String("idle"));
-}
-
-void tst_qmlstates::illegalTempState()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/illegalTempState.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QTest::ignoreMessage(QtWarningMsg, "Can't apply a state change as part of a state definition. ");
-    rect->setState("placed");
-    QCOMPARE(rect->state(), QLatin1String("placed"));
-}
-
-void tst_qmlstates::nonExistantProperty()
-{
-    QmlEngine engine;
-
-    QmlComponent rectComponent(&engine, SRCDIR "/data/nonExistantProp.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
-    QVERIFY(rect != 0);
-
-    QTest::ignoreMessage(QtWarningMsg, QByteArray("QML PropertyChanges (" + fullDataPath("/data/nonExistantProp.qml") + ":9:9) Cannot assign to non-existent property \"colr\"").constData());
-    rect->setState("blue");
-    QCOMPARE(rect->state(), QLatin1String("blue"));
-}
-
-QTEST_MAIN(tst_qmlstates)
-
-#include "tst_qmlstates.moc"
diff --git a/tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro b/tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro
deleted file mode 100644
index d535835..0000000
--- a/tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += network
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlstyledtext.cpp
-
-# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
-# LIBS += -lgcov
diff --git a/tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp b/tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp
deleted file mode 100644
index 5e675b1..0000000
--- a/tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtTest/QtTest>
-#include <QtGui/QTextLayout>
-#include <private/qmlstyledtext_p.h>
-
-class tst_qmlstyledtext : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlstyledtext()
-    {
-    }
-
-private slots:
-    void textOutput();
-    void textOutput_data();
-};
-
-// For malformed input all we test is that we get the expected text out.
-// 
-void tst_qmlstyledtext::textOutput_data()
-{
-    QTest::addColumn<QString>("input");
-    QTest::addColumn<QString>("output");
-
-    QTest::newRow("bold") << "<b>bold</b>" << "bold";
-    QTest::newRow("italic") << "<b>italic</b>" << "italic";
-    QTest::newRow("missing >") << "<b>text</b" << "text";
-    QTest::newRow("missing b>") << "<b>text</" << "text";
-    QTest::newRow("missing /b>") << "<b>text<" << "text";
-    QTest::newRow("missing </b>") << "<b>text" << "text";
-    QTest::newRow("bad nest") << "<b>text <i>italic</b></i>" << "text italic";
-    QTest::newRow("font color") << "<font color=\"red\">red text</font>" << "red text";
-    QTest::newRow("font size") << "<font size=\"1\">text</font>" << "text";
-    QTest::newRow("font empty") << "<font>text</font>" << "text";
-    QTest::newRow("font bad 1") << "<font ezis=\"blah\">text</font>" << "text";
-    QTest::newRow("font bad 2") << "<font size=\"1>text</font>" << "";
-    QTest::newRow("extra close") << "<b>text</b></b>" << "text";
-    QTest::newRow("empty") << "" << "";
-}
-
-void tst_qmlstyledtext::textOutput()
-{
-    QFETCH(QString, input);
-    QFETCH(QString, output);
-
-    QTextLayout layout;
-    QmlStyledText::parse(input, layout);
-
-    QCOMPARE(layout.text(), output);
-}
-
-
-QTEST_MAIN(tst_qmlstyledtext)
-
-#include "tst_qmlstyledtext.moc"
diff --git a/tests/auto/declarative/qmlsystempalette/qmlsystempalette.pro b/tests/auto/declarative/qmlsystempalette/qmlsystempalette.pro
deleted file mode 100644
index 4d55b46..0000000
--- a/tests/auto/declarative/qmlsystempalette/qmlsystempalette.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlsystempalette.cpp
diff --git a/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp b/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp
deleted file mode 100644
index 06e4d1c..0000000
--- a/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QDebug>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlsystempalette_p.h>
-#include <qpalette.h>
-#include "../../../shared/util.h"
-
-class tst_qmlsystempalette : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlsystempalette();
-
-private slots:
-    void activePalette();
-    void inactivePalette();
-    void disabledPalette();
-    void paletteChanged();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlsystempalette::tst_qmlsystempalette()
-{
-}
-
-void tst_qmlsystempalette::activePalette()
-{
-    QString componentStr = "import Qt 4.6\nSystemPalette { }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
-
-    QVERIFY(object != 0);
-
-    QPalette palette;
-    palette.setCurrentColorGroup(QPalette::Active);
-    QCOMPARE(palette.window().color(), object->window());
-    QCOMPARE(palette.windowText().color(), object->windowText());
-    QCOMPARE(palette.base().color(), object->base());
-    QCOMPARE(palette.text().color(), object->text());
-    QCOMPARE(palette.alternateBase().color(), object->alternateBase());
-    QCOMPARE(palette.button().color(), object->button());
-    QCOMPARE(palette.buttonText().color(), object->buttonText());
-    QCOMPARE(palette.light().color(), object->light());
-    QCOMPARE(palette.midlight().color(), object->midlight());
-    QCOMPARE(palette.dark().color(), object->dark());
-    QCOMPARE(palette.mid().color(), object->mid());
-    QCOMPARE(palette.shadow().color(), object->shadow());
-    QCOMPARE(palette.highlight().color(), object->highlight());
-    QCOMPARE(palette.highlightedText().color(), object->highlightedText());
-
-    delete object;
-}
-
-void tst_qmlsystempalette::inactivePalette()
-{
-    QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Inactive }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
-
-    QVERIFY(object != 0);
-    QVERIFY(object->colorGroup() == QmlSystemPalette::Inactive);
-
-    QPalette palette;
-    palette.setCurrentColorGroup(QPalette::Inactive);
-    QCOMPARE(palette.window().color(), object->window());
-    QCOMPARE(palette.windowText().color(), object->windowText());
-    QCOMPARE(palette.base().color(), object->base());
-    QCOMPARE(palette.text().color(), object->text());
-    QCOMPARE(palette.alternateBase().color(), object->alternateBase());
-    QCOMPARE(palette.button().color(), object->button());
-    QCOMPARE(palette.buttonText().color(), object->buttonText());
-    QCOMPARE(palette.light().color(), object->light());
-    QCOMPARE(palette.midlight().color(), object->midlight());
-    QCOMPARE(palette.dark().color(), object->dark());
-    QCOMPARE(palette.mid().color(), object->mid());
-    QCOMPARE(palette.shadow().color(), object->shadow());
-    QCOMPARE(palette.highlight().color(), object->highlight());
-    QCOMPARE(palette.highlightedText().color(), object->highlightedText());
-
-    delete object;
-}
-
-void tst_qmlsystempalette::disabledPalette()
-{
-    QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Disabled }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
-
-    QVERIFY(object != 0);
-    QVERIFY(object->colorGroup() == QmlSystemPalette::Disabled);
-
-    QPalette palette;
-    palette.setCurrentColorGroup(QPalette::Disabled);
-    QCOMPARE(palette.window().color(), object->window());
-    QCOMPARE(palette.windowText().color(), object->windowText());
-    QCOMPARE(palette.base().color(), object->base());
-    QCOMPARE(palette.text().color(), object->text());
-    QCOMPARE(palette.alternateBase().color(), object->alternateBase());
-    QCOMPARE(palette.button().color(), object->button());
-    QCOMPARE(palette.buttonText().color(), object->buttonText());
-    QCOMPARE(palette.light().color(), object->light());
-    QCOMPARE(palette.midlight().color(), object->midlight());
-    QCOMPARE(palette.dark().color(), object->dark());
-    QCOMPARE(palette.mid().color(), object->mid());
-    QCOMPARE(palette.shadow().color(), object->shadow());
-    QCOMPARE(palette.highlight().color(), object->highlight());
-    QCOMPARE(palette.highlightedText().color(), object->highlightedText());
-
-    delete object;
-}
-
-void tst_qmlsystempalette::paletteChanged()
-{
-    QString componentStr = "import Qt 4.6\nSystemPalette { }";
-    QmlComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
-
-    QVERIFY(object != 0);
-
-    QPalette p;
-    p.setCurrentColorGroup(QPalette::Active);
-    p.setColor(QPalette::Active, QPalette::Text, QColor("red"));
-    p.setColor(QPalette::Active, QPalette::ButtonText, QColor("green"));
-    p.setColor(QPalette::Active, QPalette::WindowText, QColor("blue"));
-
-    qApp->setPalette(p);
-
-    object->setColorGroup(QmlSystemPalette::Active);
-    QTRY_COMPARE(QColor("red"), object->text());
-    QTRY_COMPARE(QColor("green"), object->buttonText());
-    QTRY_COMPARE(QColor("blue"), object->windowText());
-
-    delete object;
-}
-
-QTEST_MAIN(tst_qmlsystempalette)
-
-#include "tst_qmlsystempalette.moc"
diff --git a/tests/auto/declarative/qmltimer/qmltimer.pro b/tests/auto/declarative/qmltimer/qmltimer.pro
deleted file mode 100644
index 2b244ed..0000000
--- a/tests/auto/declarative/qmltimer/qmltimer.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmltimer.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmltimer/tst_qmltimer.cpp b/tests/auto/declarative/qmltimer/tst_qmltimer.cpp
deleted file mode 100644
index b8b5e62..0000000
--- a/tests/auto/declarative/qmltimer/tst_qmltimer.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmltimer_p.h>
-#include <QDebug>
-
-class tst_qmltimer : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmltimer();
-
-private slots:
-    void notRepeating();
-    void notRepeatingStart();
-    void repeat();
-    void noTriggerIfNotRunning();
-    void triggeredOnStart();
-    void triggeredOnStartRepeat();
-    void changeDuration();
-    void restart();
-};
-
-class TimerHelper : public QObject
-{
-    Q_OBJECT
-public:
-    TimerHelper() : QObject(), count(0)
-    {
-    }
-
-    int count;
-
-public slots:
-    void timeout() {
-        ++count;
-    }
-};
-
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
-// Increase wait as emulator startup can cause unexpected delays
-#define TIMEOUT_TIMEOUT 2000
-#else
-#define TIMEOUT_TIMEOUT 200
-#endif
-
-tst_qmltimer::tst_qmltimer()
-{
-}
-
-void tst_qmltimer::notRepeating()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; running: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
-    QVERIFY(timer != 0);
-    QVERIFY(timer->isRunning());
-    QVERIFY(!timer->isRepeating());
-    QCOMPARE(timer->interval(), 100);
-
-    TimerHelper helper;
-    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
-
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QCOMPARE(helper.count, 1);
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QCOMPARE(helper.count, 1);
-    QVERIFY(timer->isRunning() == false);
-}
-
-void tst_qmltimer::notRepeatingStart()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100 }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
-    QVERIFY(timer != 0);
-    QVERIFY(!timer->isRunning());
-
-    TimerHelper helper;
-    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
-
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QCOMPARE(helper.count, 0);
-
-    timer->start();
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QCOMPARE(helper.count, 1);
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QCOMPARE(helper.count, 1);
-    QVERIFY(timer->isRunning() == false);
-
-    delete timer;
-}
-
-void tst_qmltimer::repeat()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; repeat: true; running: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
-    QVERIFY(timer != 0);
-
-    TimerHelper helper;
-    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
-    QCOMPARE(helper.count, 0);
-
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QVERIFY(helper.count > 0);
-    int oldCount = helper.count;
-
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QVERIFY(helper.count > oldCount);
-    QVERIFY(timer->isRunning());
-
-    oldCount = helper.count;
-    timer->stop();
-
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QVERIFY(helper.count == oldCount);
-    QVERIFY(timer->isRunning() == false);
-
-    delete timer;
-}
-
-void tst_qmltimer::triggeredOnStart()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; running: true; triggeredOnStart: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
-    QVERIFY(timer != 0);
-    QVERIFY(timer->triggeredOnStart());
-
-    TimerHelper helper;
-    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
-    QTest::qWait(1);
-    QCOMPARE(helper.count, 1);
-
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QCOMPARE(helper.count, 2);
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QCOMPARE(helper.count, 2);
-    QVERIFY(timer->isRunning() == false);
-
-    delete timer;
-}
-
-void tst_qmltimer::triggeredOnStartRepeat()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; running: true; triggeredOnStart: true; repeat: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
-    QVERIFY(timer != 0);
-
-    TimerHelper helper;
-    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
-    QTest::qWait(1);
-    QCOMPARE(helper.count, 1);
-
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QVERIFY(helper.count > 1);
-    int oldCount = helper.count;
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QVERIFY(helper.count > oldCount);
-    QVERIFY(timer->isRunning());
-
-    delete timer;
-}
-
-void tst_qmltimer::noTriggerIfNotRunning()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(QByteArray(
-        "import Qt 4.6\n"
-        "Item { property bool ok: true\n"
-            "Timer { id: t1; interval: 100; repeat: true; running: true; onTriggered: if (!running) ok=false }"
-            "Timer { interval: 10; running: true; onTriggered: t1.running=false }"
-        "}"
-    ), QUrl::fromLocalFile(""));
-    QObject *item = component.create();
-    QVERIFY(item != 0);
-    QTest::qWait(TIMEOUT_TIMEOUT);
-    QCOMPARE(item->property("ok").toBool(), true);
-
-    delete item;
-}
-
-void tst_qmltimer::changeDuration()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 200; repeat: true; running: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
-    QVERIFY(timer != 0);
-
-    TimerHelper helper;
-    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
-    QCOMPARE(helper.count, 0);
-
-    QTest::qWait(500);
-    QCOMPARE(helper.count, 2);
-
-    timer->setInterval(500);
-
-    QTest::qWait(600);
-    QCOMPARE(helper.count, 3);
-    QVERIFY(timer->isRunning());
-
-    delete timer;
-}
-
-void tst_qmltimer::restart()
-{
-    QmlEngine engine;
-    QmlComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.6\nTimer { interval: 500; repeat: true; running: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
-    QVERIFY(timer != 0);
-
-    TimerHelper helper;
-    connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout()));
-    QCOMPARE(helper.count, 0);
-
-    QTest::qWait(600);
-    QCOMPARE(helper.count, 1);
-
-    QTest::qWait(300);
-
-    timer->restart();
-
-    QTest::qWait(700);
-
-    QCOMPARE(helper.count, 2);
-    QVERIFY(timer->isRunning());
-
-    delete timer;
-}
-
-QTEST_MAIN(tst_qmltimer)
-
-#include "tst_qmltimer.moc"
diff --git a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.2.qml b/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.2.qml
deleted file mode 100644
index ce2e82d..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.2.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int value: 10
-    rect.x: value
-
-    onRunScript: { rect = Qt.rect(10, 10, 10, 10) }
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.3.qml b/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.3.qml
deleted file mode 100644
index c82b533..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.3.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property var value
-
-    rect: value
-
-    onRunScript: { rect.x = 44 }
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.qml b/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.qml
deleted file mode 100644
index a8a72f5..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int value: 10
-    rect.x: value
-
-    onRunScript: { rect.x = 42; }
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/bindingAssignment.qml b/tests/auto/declarative/qmlvaluetypes/data/bindingAssignment.qml
deleted file mode 100644
index a652186..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/bindingAssignment.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int value: 10
-
-    rect.x: value
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/bindingConflict.qml b/tests/auto/declarative/qmlvaluetypes/data/bindingConflict.qml
deleted file mode 100644
index fd25c9f..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/bindingConflict.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int value: 13
-
-    rect.x: value
-    rect: "10,10,10x10"
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/bindingRead.qml b/tests/auto/declarative/qmlvaluetypes/data/bindingRead.qml
deleted file mode 100644
index 538d776..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/bindingRead.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int value: rect.x
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/bindingVariantCopy.qml b/tests/auto/declarative/qmlvaluetypes/data/bindingVariantCopy.qml
deleted file mode 100644
index 691a56c..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/bindingVariantCopy.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property var object
-    object: MyTypeObject {
-        rect.x: 19
-        rect.y: 33
-        rect.width: 5
-        rect.height: 99
-    }
-
-    rect: object.rect
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/deletedObject.js b/tests/auto/declarative/qmlvaluetypes/data/deletedObject.js
deleted file mode 100644
index af298ff..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/deletedObject.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var savedReference;
-
-function startup()
-{
-    savedReference = object.rect;
-    console.log("Test: " + savedReference.x);
-}
-
-function afterDelete()
-{
-    console.log("Test: " + savedReference.x);
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/deletedObject.qml b/tests/auto/declarative/qmlvaluetypes/data/deletedObject.qml
deleted file mode 100644
index 05459f4..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/deletedObject.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Test 1.0
-import Qt 4.6
-
-MyTypeObject {
-    property var object
-
-    Script { source: "deletedObject.js" }
-
-    object: MyTypeObject {}
-    Component.onCompleted: startup()
-    onRunScript: afterDelete()
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/enums.1.qml b/tests/auto/declarative/qmlvaluetypes/data/enums.1.qml
deleted file mode 100644
index 0eadd50..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/enums.1.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    font.capitalization: "MixedCase"
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/enums.2.qml b/tests/auto/declarative/qmlvaluetypes/data/enums.2.qml
deleted file mode 100644
index 81f1c92..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/enums.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    font.capitalization: if (1) "MixedCase"
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/font_read.qml b/tests/auto/declarative/qmlvaluetypes/data/font_read.qml
deleted file mode 100644
index e1d1ce0..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/font_read.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property string f_family: font.family
-    property bool f_bold: font.bold
-    property int f_weight: font.weight
-    property bool f_italic: font.italic
-    property bool f_underline: font.underline
-    property bool f_overline: font.overline
-    property bool f_strikeout: font.strikeout
-    property real f_pointSize: font.pointSize
-    property int f_pixelSize: font.pixelSize
-    property int f_capitalization: font.capitalization
-    property real f_letterSpacing: font.letterSpacing
-    property real f_wordSpacing: font.wordSpacing;
-    property var copy: font
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/font_write.2.qml b/tests/auto/declarative/qmlvaluetypes/data/font_write.2.qml
deleted file mode 100644
index b559389..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/font_write.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    font.pixelSize: 10
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/font_write.3.qml b/tests/auto/declarative/qmlvaluetypes/data/font_write.3.qml
deleted file mode 100644
index 913ac50..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/font_write.3.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    font.pixelSize: 10
-    font.pointSize: 19
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/font_write.qml b/tests/auto/declarative/qmlvaluetypes/data/font_write.qml
deleted file mode 100644
index ff4d0a1..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/font_write.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    font.family: if(1) "Helvetica"
-    font.bold: if(1) false
-    font.weight: "Normal"
-    font.italic: if(1) false
-    font.underline: if(1) false
-    font.overline: if(1) false
-    font.strikeout: if(1) false
-    font.pointSize: if(1) 15
-    font.capitalization: "AllLowercase"
-    font.letterSpacing: if(1) 9.7
-    font.wordSpacing: if(1) 11.2
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/point_read.qml b/tests/auto/declarative/qmlvaluetypes/data/point_read.qml
deleted file mode 100644
index 3e67de6..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/point_read.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int p_x: point.x
-    property int p_y: point.y
-    property var copy: point
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/point_write.qml b/tests/auto/declarative/qmlvaluetypes/data/point_write.qml
deleted file mode 100644
index 063525a..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/point_write.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    point.x: if (true) 11
-    point.y: if (true) 12
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/pointf_read.qml b/tests/auto/declarative/qmlvaluetypes/data/pointf_read.qml
deleted file mode 100644
index d845a5b..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/pointf_read.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property real p_x: pointf.x
-    property real p_y: pointf.y
-    property var copy: pointf
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/pointf_write.qml b/tests/auto/declarative/qmlvaluetypes/data/pointf_write.qml
deleted file mode 100644
index 9ee3fc1..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/pointf_write.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    pointf.x: if (true) 6.8
-    pointf.y: if (true) 9.3
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/rect_read.qml b/tests/auto/declarative/qmlvaluetypes/data/rect_read.qml
deleted file mode 100644
index 5364431..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/rect_read.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int r_x: rect.x
-    property int r_y: rect.y
-    property int r_width: rect.width
-    property int r_height: rect.height
-    property var copy: rect
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/rect_write.qml b/tests/auto/declarative/qmlvaluetypes/data/rect_write.qml
deleted file mode 100644
index 8add453..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/rect_write.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rect.x: if (true) 1234
-    rect.y: if (true) 7
-    rect.width: if (true) 56
-    rect.height: if (true) 63
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/rectf_read.qml b/tests/auto/declarative/qmlvaluetypes/data/rectf_read.qml
deleted file mode 100644
index aeb9f41..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/rectf_read.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property real r_x: rectf.x
-    property real r_y: rectf.y
-    property real r_width: rectf.width
-    property real r_height: rectf.height
-    property var copy: rectf
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/rectf_write.qml b/tests/auto/declarative/qmlvaluetypes/data/rectf_write.qml
deleted file mode 100644
index 1e6ff4f..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/rectf_write.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rectf.x: if (true) 70.1
-    rectf.y: if (true) -113.2
-    rectf.width: if (true) 80924.8
-    rectf.height: if (true) 99.2
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/scriptAccess.qml b/tests/auto/declarative/qmlvaluetypes/data/scriptAccess.qml
deleted file mode 100644
index 96592eb..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/scriptAccess.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-import Test 1.0
-
-MyTypeObject {
-    property int valuePre;
-    property int valuePost;
-
-    Component.onCompleted: { valuePre = rect.x; rect.x = 19; valuePost = rect.x; }
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/scriptVariantCopy.qml b/tests/auto/declarative/qmlvaluetypes/data/scriptVariantCopy.qml
deleted file mode 100644
index 29157e8..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/scriptVariantCopy.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property var object
-    object: MyTypeObject {
-        rect.x: 19
-        rect.y: 33
-        rect.width: 5
-        rect.height: 99
-    }
-
-    onRunScript: rect = object.rect
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/size_read.qml b/tests/auto/declarative/qmlvaluetypes/data/size_read.qml
deleted file mode 100644
index 86dba03..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/size_read.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int s_width: size.width
-    property int s_height: size.height
-    property var copy: size
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/size_write.qml b/tests/auto/declarative/qmlvaluetypes/data/size_write.qml
deleted file mode 100644
index 2f9d10e..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/size_write.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    size.width: if (true) 13
-    size.height: if (true) 88
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/sizef_read.qml b/tests/auto/declarative/qmlvaluetypes/data/sizef_read.qml
deleted file mode 100644
index c6f34e4..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/sizef_read.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property real s_width: sizef.width
-    property real s_height: sizef.height
-    property var copy: sizef
-}
-
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/sizef_write.qml b/tests/auto/declarative/qmlvaluetypes/data/sizef_write.qml
deleted file mode 100644
index f16f0bd..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/sizef_write.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    sizef.width: if (true) 44.3
-    sizef.height: if (true) 92.8
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/staticAssignment.qml b/tests/auto/declarative/qmlvaluetypes/data/staticAssignment.qml
deleted file mode 100644
index b687f89..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/staticAssignment.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rect.x: 9
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/valueInterceptors.qml b/tests/auto/declarative/qmlvaluetypes/data/valueInterceptors.qml
deleted file mode 100644
index 026ae83..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/valueInterceptors.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property int value: 13;
-
-    rect.x: MyOffsetValueInterceptor {}
-    rect.x: value
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/valueSources.qml b/tests/auto/declarative/qmlvaluetypes/data/valueSources.qml
deleted file mode 100644
index d4d4391..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/valueSources.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    rect.x: MyConstantValueSource {}
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/data/vector3d_read.qml b/tests/auto/declarative/qmlvaluetypes/data/vector3d_read.qml
deleted file mode 100644
index abdf9f0..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/vector3d_read.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    property real v_x: vector.x
-    property real v_y: vector.y
-    property real v_z: vector.z
-    property var copy: vector
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/data/vector3d_write.qml b/tests/auto/declarative/qmlvaluetypes/data/vector3d_write.qml
deleted file mode 100644
index 9c1bf76..0000000
--- a/tests/auto/declarative/qmlvaluetypes/data/vector3d_write.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Test 1.0
-
-MyTypeObject {
-    vector.x: if (true) -0.3
-    vector.y: if (true) -12.9
-    vector.z: if (true) 907.4
-}
-
diff --git a/tests/auto/declarative/qmlvaluetypes/qmlvaluetypes.pro b/tests/auto/declarative/qmlvaluetypes/qmlvaluetypes.pro
deleted file mode 100644
index 82d067e..0000000
--- a/tests/auto/declarative/qmlvaluetypes/qmlvaluetypes.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-HEADERS += testtypes.h
-
-SOURCES += tst_qmlvaluetypes.cpp \
-           testtypes.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlvaluetypes/testtypes.cpp b/tests/auto/declarative/qmlvaluetypes/testtypes.cpp
deleted file mode 100644
index aa8bd6e..0000000
--- a/tests/auto/declarative/qmlvaluetypes/testtypes.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "testtypes.h"
-
-void registerTypes()
-{
-    QML_REGISTER_TYPE(Test, 1, 0, MyTypeObject, MyTypeObject);
-    QML_REGISTER_TYPE(Test, 1, 0, MyConstantValueSource, MyConstantValueSource);
-    QML_REGISTER_TYPE(Test, 1, 0, MyOffsetValueInterceptor, MyOffsetValueInterceptor);
-}
diff --git a/tests/auto/declarative/qmlvaluetypes/testtypes.h b/tests/auto/declarative/qmlvaluetypes/testtypes.h
deleted file mode 100644
index 5f9dde1..0000000
--- a/tests/auto/declarative/qmlvaluetypes/testtypes.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef TESTTYPES_H
-#define TESTTYPES_H
-
-#include <QObject>
-#include <QPoint>
-#include <QPointF>
-#include <QSize>
-#include <QSizeF>
-#include <QRect>
-#include <QRectF>
-#include <QVector3D>
-#include <QFont>
-#include <qml.h>
-#include <QmlPropertyValueSource>
-
-class MyTypeObject : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QPoint point READ point WRITE setPoint NOTIFY changed);
-    Q_PROPERTY(QPointF pointf READ pointf WRITE setPointf NOTIFY changed);
-    Q_PROPERTY(QSize size READ size WRITE setSize NOTIFY changed);
-    Q_PROPERTY(QSizeF sizef READ sizef WRITE setSizef NOTIFY changed);
-    Q_PROPERTY(QRect rect READ rect WRITE setRect NOTIFY changed);
-    Q_PROPERTY(QRectF rectf READ rectf WRITE setRectf NOTIFY changed);
-    Q_PROPERTY(QVector3D vector READ vector WRITE setVector NOTIFY changed);
-    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY changed);
-
-public:
-    MyTypeObject() :
-        m_point(10, 4),
-        m_pointf(11.3, -10.9),
-        m_size(1912, 1913),
-        m_sizef(0.1, 100923.2),
-        m_rect(2, 3, 109, 102),
-        m_rectf(103.8, 99.2, 88.1, 77.6),
-        m_vector(23.88, 3.1, 4.3)
-    {
-        m_font.setFamily("Arial");
-        m_font.setBold(true);
-        m_font.setWeight(QFont::DemiBold);
-        m_font.setItalic(true);
-        m_font.setUnderline(true);
-        m_font.setOverline(true);
-        m_font.setStrikeOut(true);
-        m_font.setPointSize(29);
-        m_font.setCapitalization(QFont::AllUppercase);
-        m_font.setLetterSpacing(QFont::AbsoluteSpacing, 10.2);
-        m_font.setWordSpacing(19.7);
-    }
-
-    QPoint m_point;
-    QPoint point() const { return m_point; }
-    void setPoint(const QPoint &v) { m_point = v; emit changed(); }
-
-    QPointF m_pointf;
-    QPointF pointf() const { return m_pointf; }
-    void setPointf(const QPointF &v) { m_pointf = v; emit changed(); }
-
-    QSize m_size;
-    QSize size() const { return m_size; }
-    void setSize(const QSize &v) { m_size = v; emit changed(); }
-
-    QSizeF m_sizef;
-    QSizeF sizef() const { return m_sizef; }
-    void setSizef(const QSizeF &v) { m_sizef = v; emit changed(); }
-
-    QRect m_rect;
-    QRect rect() const { return m_rect; }
-    void setRect(const QRect &v) { m_rect = v; emit changed(); }
-
-    QRectF m_rectf;
-    QRectF rectf() const { return m_rectf; }
-    void setRectf(const QRectF &v) { m_rectf = v; emit changed(); }
-
-    QVector3D m_vector;
-    QVector3D vector() const { return m_vector; }
-    void setVector(const QVector3D &v) { m_vector = v; emit changed(); }
-
-    QFont m_font;
-    QFont font() const { return m_font; }
-    void setFont(const QFont &v) { m_font = v; emit changed(); }
-
-    void emitRunScript() { emit runScript(); }
-
-signals:
-    void changed();
-    void runScript();
-};
-QML_DECLARE_TYPE(MyTypeObject);
-
-class MyConstantValueSource : public QObject, public QmlPropertyValueSource
-{
-    Q_OBJECT
-public:
-    virtual void setTarget(const QmlMetaProperty &p) { p.write(3345); }
-};
-QML_DECLARE_TYPE(MyConstantValueSource);
-
-class MyOffsetValueInterceptor : public QObject, public QmlPropertyValueInterceptor
-{
-    Q_OBJECT
-public:
-    virtual void setTarget(const QmlMetaProperty &p) { prop = p; }
-    virtual void write(const QVariant &value) { prop.write(value.toInt() + 13, QmlMetaProperty::BypassInterceptor); }
-
-private:
-    QmlMetaProperty prop;
-};
-QML_DECLARE_TYPE(MyOffsetValueInterceptor);
-
-void registerTypes();
-
-#endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp b/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
deleted file mode 100644
index f28dc51..0000000
--- a/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
+++ /dev/null
@@ -1,616 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QDebug>
-#include <private/qmlvaluetype_p.h>
-#include "testtypes.h"
-
-class tst_qmlvaluetypes : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlvaluetypes() {}
-
-private slots:
-    void initTestCase();
-
-    void point();
-    void pointf();
-    void size();
-    void sizef();
-    void rect();
-    void rectf();
-    void vector3d();
-    void font();
-
-    void bindingAssignment();
-    void bindingRead();
-    void staticAssignment();
-    void scriptAccess();
-    void autoBindingRemoval();
-    void valueSources();
-    void valueInterceptors();
-    void bindingConflict();
-    void deletedObject();
-    void bindingVariantCopy();
-    void scriptVariantCopy();
-    void cppClasses();
-    void enums();
-
-private:
-    QmlEngine engine;
-};
-
-void tst_qmlvaluetypes::initTestCase()
-{
-    registerTypes();
-}
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
-}
-
-void tst_qmlvaluetypes::point()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("point_read.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("p_x").toInt(), 10);
-        QCOMPARE(object->property("p_y").toInt(), 4);
-        QCOMPARE(object->property("copy"), QVariant(QPoint(10, 4)));
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("point_write.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->point(), QPoint(11, 12));
-
-        delete object;
-    }
-}
-
-void tst_qmlvaluetypes::pointf()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("pointf_read.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("p_x").toDouble(), 11.3);
-        QCOMPARE(object->property("p_y").toDouble(), -10.9);
-        QCOMPARE(object->property("copy"), QVariant(QPointF(11.3, -10.9)));
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("pointf_write.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->pointf(), QPointF(6.8, 9.3));
-
-        delete object;
-    }
-}
-
-void tst_qmlvaluetypes::size()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("size_read.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("s_width").toInt(), 1912);
-        QCOMPARE(object->property("s_height").toInt(), 1913);
-        QCOMPARE(object->property("copy"), QVariant(QSize(1912, 1913)));
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("size_write.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->size(), QSize(13, 88));
-
-        delete object;
-    }
-}
-
-void tst_qmlvaluetypes::sizef()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("sizef_read.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("s_width").toDouble(), 0.1);
-        QCOMPARE(object->property("s_height").toDouble(), 100923.2);
-        QCOMPARE(object->property("copy"), QVariant(QSizeF(0.1, 100923.2)));
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("sizef_write.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->sizef(), QSizeF(44.3, 92.8));
-
-        delete object;
-    }
-}
-
-void tst_qmlvaluetypes::rect()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("rect_read.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("r_x").toInt(), 2);
-        QCOMPARE(object->property("r_y").toInt(), 3);
-        QCOMPARE(object->property("r_width").toInt(), 109);
-        QCOMPARE(object->property("r_height").toInt(), 102);
-        QCOMPARE(object->property("copy"), QVariant(QRect(2, 3, 109, 102)));
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("rect_write.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->rect(), QRect(1234, 7, 56, 63));
-
-        delete object;
-    }
-}
-
-void tst_qmlvaluetypes::rectf()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("rectf_read.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("r_x").toDouble(), 103.8);
-        QCOMPARE(object->property("r_y").toDouble(), 99.2);
-        QCOMPARE(object->property("r_width").toDouble(), 88.1);
-        QCOMPARE(object->property("r_height").toDouble(), 77.6);
-        QCOMPARE(object->property("copy"), QVariant(QRectF(103.8, 99.2, 88.1, 77.6)));
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("rectf_write.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->rectf(), QRectF(70.1, -113.2, 80924.8, 99.2));
-
-        delete object;
-    }
-}
-
-void tst_qmlvaluetypes::vector3d()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("vector3d_read.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE((float)object->property("v_x").toDouble(), (float)23.88);
-        QCOMPARE((float)object->property("v_y").toDouble(), (float)3.1);
-        QCOMPARE((float)object->property("v_z").toDouble(), (float)4.3);
-        QCOMPARE(object->property("copy"), QVariant(QVector3D(23.88, 3.1, 4.3)));
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("vector3d_write.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->vector(), QVector3D(-0.3, -12.9, 907.4));
-
-        delete object;
-    }
-}
-
-void tst_qmlvaluetypes::font()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("font_read.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("f_family").toString(), object->font().family());
-        QCOMPARE(object->property("f_bold").toBool(), object->font().bold());
-        QCOMPARE(object->property("f_weight").toInt(), object->font().weight());
-        QCOMPARE(object->property("f_italic").toBool(), object->font().italic());
-        QCOMPARE(object->property("f_underline").toBool(), object->font().underline());
-        QCOMPARE(object->property("f_overline").toBool(), object->font().overline());
-        QCOMPARE(object->property("f_strikeout").toBool(), object->font().strikeOut());
-        QCOMPARE(object->property("f_pointSize").toDouble(), object->font().pointSizeF());
-        QCOMPARE(object->property("f_pixelSize").toInt(), object->font().pixelSize());
-        QCOMPARE(object->property("f_capitalization").toInt(), (int)object->font().capitalization());
-        QCOMPARE(object->property("f_letterSpacing").toDouble(), object->font().letterSpacing());
-        QCOMPARE(object->property("f_wordSpacing").toDouble(), object->font().wordSpacing());
-
-        QCOMPARE(object->property("copy"), QVariant(object->font()));
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("font_write.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QFont font;
-        font.setFamily("Helvetica");
-        font.setBold(false);
-        font.setWeight(QFont::Normal);
-        font.setItalic(false);
-        font.setUnderline(false);
-        font.setStrikeOut(false);
-        font.setPointSize(15);
-        font.setCapitalization(QFont::AllLowercase);
-        font.setLetterSpacing(QFont::AbsoluteSpacing, 9.7);
-        font.setWordSpacing(11.2);
-
-        QEXPECT_FAIL("", "QT-2920", Continue);
-        QCOMPARE(object->font(), font);
-
-        delete object;
-    }
-
-    // Test pixelSize
-    {
-        QmlComponent component(&engine, TEST_FILE("font_write.2.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->font().pixelSize(), 10);
-
-        delete object;
-    }
-
-    // Test pixelSize and pointSize
-    {
-        QmlComponent component(&engine, TEST_FILE("font_write.3.qml"));
-        QTest::ignoreMessage(QtWarningMsg, "Both point size and pixel size set. Using pixel size. ");
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->font().pixelSize(), 10);
-
-        delete object;
-    }
-}
-
-// Test bindings can write to value types
-void tst_qmlvaluetypes::bindingAssignment()
-{
-    QmlComponent component(&engine, TEST_FILE("bindingAssignment.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->rect().x(), 10);
-
-    object->setProperty("value", QVariant(92));
-
-    QCOMPARE(object->rect().x(), 92);
-
-    delete object;
-}
-
-// Test bindings can read from value types
-void tst_qmlvaluetypes::bindingRead()
-{
-    QmlComponent component(&engine, TEST_FILE("bindingRead.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("value").toInt(), 2);
-
-    object->setRect(QRect(19, 3, 88, 2));
-
-    QCOMPARE(object->property("value").toInt(), 19);
-
-    delete object;
-}
-
-// Test static values can assign to value types
-void tst_qmlvaluetypes::staticAssignment()
-{
-    QmlComponent component(&engine, TEST_FILE("staticAssignment.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->rect().x(), 9);
-
-    delete object;
-}
-
-// Test scripts can read/write value types
-void tst_qmlvaluetypes::scriptAccess()
-{
-    QmlComponent component(&engine, TEST_FILE("scriptAccess.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("valuePre").toInt(), 2);
-    QCOMPARE(object->rect().x(), 19);
-    QCOMPARE(object->property("valuePost").toInt(), 19);
-
-    delete object;
-}
-
-// Test that assigning a constant from script removes any binding
-void tst_qmlvaluetypes::autoBindingRemoval()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("autoBindingRemoval.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->rect().x(), 10);
-
-        object->setProperty("value", QVariant(13));
-
-        QCOMPARE(object->rect().x(), 13);
-
-        object->emitRunScript();
-
-        QCOMPARE(object->rect().x(), 42);
-
-        object->setProperty("value", QVariant(92));
-
-        QEXPECT_FAIL("", "QT-2920", Continue);
-        QCOMPARE(object->rect().x(), 42);
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("autoBindingRemoval.2.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->rect().x(), 10);
-
-        object->setProperty("value", QVariant(13));
-
-        QCOMPARE(object->rect().x(), 13);
-
-        object->emitRunScript();
-
-        QCOMPARE(object->rect(), QRect(10, 10, 10, 10));
-
-        object->setProperty("value", QVariant(92));
-
-        QCOMPARE(object->rect(), QRect(10, 10, 10, 10));
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("autoBindingRemoval.3.qml"));
-        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-        QVERIFY(object != 0);
-
-        object->setProperty("value", QVariant(QRect(9, 22, 33, 44)));
-
-        QCOMPARE(object->rect(), QRect(9, 22, 33, 44));
-
-        object->emitRunScript();
-
-        QCOMPARE(object->rect(), QRect(44, 22, 33, 44));
-
-        object->setProperty("value", QVariant(QRect(19, 3, 4, 8)));
-
-        QEXPECT_FAIL("", "QT-2920", Continue);
-        QCOMPARE(object->rect(), QRect(44, 22, 33, 44));
-
-        delete object;
-    }
-
-}
-
-// Test that property value sources assign to value types
-void tst_qmlvaluetypes::valueSources()
-{
-    QmlComponent component(&engine, TEST_FILE("valueSources.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->rect().x(), 3345);
-
-    delete object;
-}
-
-static void checkNoErrors(QmlComponent& component)
-{
-    QList<QmlError> errors = component.errors();
-    if (errors.isEmpty())
-        return;
-    for (int ii = 0; ii < errors.count(); ++ii) {
-        const QmlError &error = errors.at(ii);
-        qWarning("%d:%d:%s",error.line(),error.column(),error.description().toUtf8().constData());
-    }
-}
-
-// Test that property value interceptors can be applied to value types
-void tst_qmlvaluetypes::valueInterceptors()
-{
-    QmlComponent component(&engine, TEST_FILE("valueInterceptors.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    checkNoErrors(component);
-    QEXPECT_FAIL("", "QT-2920", Abort);
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->rect().x(), 26);
-
-    object->setProperty("value", 99);
-
-    QCOMPARE(object->rect().x(), 112);
-
-    delete object;
-}
-
-// Test that you can't assign a binding to the "root" value type, and a sub-property
-void tst_qmlvaluetypes::bindingConflict()
-{
-    QmlComponent component(&engine, TEST_FILE("bindingConflict.qml"));
-    QCOMPARE(component.isError(), true);
-}
-
-#define CPP_TEST(type, v) \
-{ \
-    type *t = new type; \
-    QVariant value(v); \
-    t->setValue(value); \
-    QCOMPARE(t->value(), value); \
-    delete t; \
-}
-
-// Test that accessing a reference to a valuetype after the owning object is deleted
-// doesn't crash
-void tst_qmlvaluetypes::deletedObject()
-{
-    QmlComponent component(&engine, TEST_FILE("deletedObject.qml"));
-    QTest::ignoreMessage(QtDebugMsg, "Test: 2");
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QObject *dObject = qvariant_cast<QObject *>(object->property("object"));
-    QVERIFY(dObject != 0);
-    delete dObject;
-
-    QTest::ignoreMessage(QtDebugMsg, "Test: undefined");
-    object->emitRunScript();
-
-    delete object;
-}
-
-// Test that value types can be assigned to another value type property in a binding
-void tst_qmlvaluetypes::bindingVariantCopy()
-{
-    QmlComponent component(&engine, TEST_FILE("bindingVariantCopy.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->rect(), QRect(19, 33, 5, 99));
-
-    delete object;
-}
-
-// Test that value types can be assigned to another value type property in script
-void tst_qmlvaluetypes::scriptVariantCopy()
-{
-    QmlComponent component(&engine, TEST_FILE("scriptVariantCopy.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->rect(), QRect(2, 3, 109, 102));
-
-    object->emitRunScript();
-
-    QCOMPARE(object->rect(), QRect(19, 33, 5, 99));
-
-    delete object;
-}
-
-
-// Test that the value type classes can be used manually
-void tst_qmlvaluetypes::cppClasses()
-{
-    CPP_TEST(QmlPointValueType, QPoint(19, 33));
-    CPP_TEST(QmlPointFValueType, QPointF(33.6, -23));
-    CPP_TEST(QmlSizeValueType, QSize(-100, 18));
-    CPP_TEST(QmlSizeFValueType, QSizeF(-100.7, 18.2));
-    CPP_TEST(QmlRectValueType, QRect(13, 39, 10928, 88));
-    CPP_TEST(QmlRectFValueType, QRectF(88.2, -90.1, 103.2, 118));
-    CPP_TEST(QmlVector3DValueType, QVector3D(18.2, 19.7, 1002));
-    CPP_TEST(QmlFontValueType, QFont("Helvetica"));
-
-}
-
-void tst_qmlvaluetypes::enums()
-{
-    {
-    QmlComponent component(&engine, TEST_FILE("enums.1.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-    QVERIFY(object->font().capitalization() == QFont::MixedCase);
-    delete object;
-    }
-
-    {
-    QmlComponent component(&engine, TEST_FILE("enums.2.qml"));
-    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
-    QVERIFY(object != 0);
-    QVERIFY(object->font().capitalization() == QFont::MixedCase);
-    delete object;
-    }
-}
-
-QTEST_MAIN(tst_qmlvaluetypes)
-
-#include "tst_qmlvaluetypes.moc"
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort.expect b/tests/auto/declarative/qmlxmlhttprequest/data/abort.expect
deleted file mode 100644
index f43e043..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-PUT /testdocument.html HTTP/1.1
-Content-Type: text/plain;charset=UTF-8
-Content-Length: 9
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
-Test Data
\ No newline at end of file
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort.qml b/tests/auto/declarative/qmlxmlhttprequest/data/abort.qml
deleted file mode 100644
index d7b9266..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string urlDummy
-    property string url
-
-    property bool seenDone: false
-    property bool didNotSeeUnsent: true
-    property bool endStateUnsent: false
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("GET", urlDummy);
-        x.setRequestHeader("Test-header", "TestValue");
-        x.send();
-
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                seenDone = true;
-            } else if (x.readyState == XMLHttpRequest.UNSENT) {
-                didNotSeeUnsent = false;
-            }
-        }
-
-        x.abort();
-
-        if (x.readyState == XMLHttpRequest.UNSENT) {
-            endStateUnsent = true;
-        }
-
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-        x.open("PUT", url);
-        x.send("Test Data");
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort.reply b/tests/auto/declarative/qmlxmlhttprequest/data/abort.reply
deleted file mode 100644
index 7ae6951..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort.reply
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP/1.0 200 OK
-Connection: close
-Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort_opened.qml b/tests/auto/declarative/qmlxmlhttprequest/data/abort_opened.qml
deleted file mode 100644
index 72a45e7..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort_opened.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url: "testdocument.html"
-
-    property bool readyState: false
-    property bool openedState: false
-
-    property bool status: false
-    property bool statusText: false
-    property bool responseText: false
-    property bool responseXML: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-	x.abort();
-
-        if (x.readyState == XMLHttpRequest.UNSENT)
-            readyState = true;
-
-        x.open("PUT", url);
-
-	x.abort();
-
-        x.open("GET", url);
-
-        if (x.readyState  == XMLHttpRequest.OPENED)
-            openedState = true;
-
-        try {
-            var a = x.status;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                status = true;
-        }
-        try {
-            var a = x.statusText;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                statusText = true;
-        }
-        responseText = (x.responseText == "");
-        responseXML = (x.responseXML == null);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-
-        x.send()
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/abort_unsent.qml
deleted file mode 100644
index aa78cde..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort_unsent.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url: "testdocument.html"
-
-    property bool readyState: false
-    property bool openedState: false
-
-    property bool status: false
-    property bool statusText: false
-    property bool responseText: false
-    property bool responseXML: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-	x.abort();
-
-        if (x.readyState == XMLHttpRequest.UNSENT)
-            readyState = true;
-
-        x.open("GET", url);
-
-        if (x.readyState  == XMLHttpRequest.OPENED)
-            openedState = true;
-
-        try {
-            var a = x.status;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                status = true;
-        }
-        try {
-            var a = x.statusText;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                statusText = true;
-        }
-        responseText = (x.responseText == "");
-        responseXML = (x.responseXML == null);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-
-        x.send()
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/attr.qml b/tests/auto/declarative/qmlxmlhttprequest/data/attr.qml
deleted file mode 100644
index 9049fc7..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/attr.qml
+++ /dev/null
@@ -1,80 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool xmlTest: false
-    property bool dataOK: false
-
-    Script {
-        function checkAttr(documentElement, attr)
-        {
-            if (attr == null)
-                return;
-
-            if (attr.name != "attr")
-                return;
-
-            if (attr.value != "myvalue")
-                return;
-
-            if (attr.ownerElement.tagName != documentElement.tagName)
-                return;
-
-            if (attr.nodeName != "attr")
-                return;
-
-            if (attr.nodeValue != "myvalue")
-                return;
-
-            if (attr.nodeType != 2)
-                return;
-
-            if (attr.childNodes.length != 0)
-                return;
-
-            if (attr.firstChild != null)
-                return;
-
-            if (attr.lastChild != null)
-                return;
-
-            if (attr.previousSibling != null)
-                return;
-
-            if (attr.nextSibling != null)
-                return;
-
-            if (attr.attributes != null)
-                return;
-
-            xmlTest = true;
-        }
-
-        function checkXML(document)
-        {
-            checkAttr(document.documentElement, document.documentElement.attributes[0]);
-        }
-    }
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "attr.xml");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-
-                dataOK = true;
-
-                if (x.responseXML != null)
-                    checkXML(x.responseXML);
-
-            }
-        }
-
-        x.send()
-    }
-}
-
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/attr.xml b/tests/auto/declarative/qmlxmlhttprequest/data/attr.xml
deleted file mode 100644
index 2aa64a3..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/attr.xml
+++ /dev/null
@@ -1 +0,0 @@
-<root attr="myvalue" />
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/callbackException.qml b/tests/auto/declarative/qmlxmlhttprequest/data/callbackException.qml
deleted file mode 100644
index 9255922..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/callbackException.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    id: obj
-    property string url
-    property string which
-    property bool threw: false
-
-    onWhichChanged: {
-        var x = new XMLHttpRequest;
-
-        x.onreadystatechange = function() {
-            if (x.readyState == which) {
-                obj.threw = true
-                throw(new Error("Exception from Callback"))
-            }
-        }
-
-        x.open("GET", url);
-        x.setRequestHeader("Test-header", "TestValue");
-        x.send();
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/cdata.qml b/tests/auto/declarative/qmlxmlhttprequest/data/cdata.qml
deleted file mode 100644
index b2d0209..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/cdata.qml
+++ /dev/null
@@ -1,135 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool xmlTest: false
-    property bool dataOK: false
-
-    Script {
-        function checkCData(text, whitespacetext)
-        {
-            // This is essentially a copy of text.qml/checkText()
-
-            if (text == null)
-                return;
-
-            if (text.nodeName != "#cdata-section")
-                return;
-
-            if (text.nodeValue != "Hello world!")
-                return;
-
-            if (text.nodeType != 4)
-                return;
-
-            if (text.parentNode.nodeName != "item")
-                return;
-
-            if (text.childNodes.length != 0)
-                return;
-
-            if (text.firstChild != null)
-                return;
-
-            if (text.lastChild != null)
-                return;
-
-            if (text.previousSibling != null)
-                return;
-
-            if (text.nextSibling != null)
-                return;
-
-            if (text.attributes != null)
-                return;
-
-            if (text.wholeText != "Hello world!")
-                return;
-
-            if (text.data != "Hello world!")
-                return;
-
-            if (text.length != 12)
-                return;
-
-            if (text.isElementContentWhitespace != false)
-                return;
-
-            if (whitespacetext.nodeName != "#cdata-section")
-                return;
-
-            if (whitespacetext.nodeValue != "   ")
-                return;
-
-            if (whitespacetext.nodeType != 4)
-                return;
-
-            if (whitespacetext.parentNode.nodeName != "item")
-                return;
-
-            if (whitespacetext.childNodes.length != 0)
-                return;
-
-            if (whitespacetext.firstChild != null)
-                return;
-
-            if (whitespacetext.lastChild != null)
-                return;
-
-            if (whitespacetext.previousSibling != null)
-                return;
-
-            if (whitespacetext.nextSibling != null)
-                return;
-
-            if (whitespacetext.attributes != null)
-                return;
-
-            if (whitespacetext.wholeText != "   ")
-                return;
-
-            if (whitespacetext.data != "   ")
-                return;
-
-            if (whitespacetext.length != 3)
-                return;
-
-            if (whitespacetext.isElementContentWhitespace != true)
-                return;
-
-
-            xmlTest = true;
-        }
-
-        function checkXML(document)
-        {
-            checkCData(document.documentElement.childNodes[0].childNodes[0],
-                       document.documentElement.childNodes[1].childNodes[0]);
-
-        }
-    }
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "cdata.xml");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-
-                dataOK = true;
-
-                if (x.responseXML != null)
-                    checkXML(x.responseXML);
-
-            }
-        }
-
-        x.send()
-    }
-}
-
-
-
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/cdata.xml b/tests/auto/declarative/qmlxmlhttprequest/data/cdata.xml
deleted file mode 100644
index 061d37c..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/cdata.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<root><item><![CDATA[Hello world!]]></item><item><![CDATA[   ]]></item></root>
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/constructor.qml b/tests/auto/declarative/qmlxmlhttprequest/data/constructor.qml
deleted file mode 100644
index 93e44fd..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/constructor.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool calledAsConstructor
-    property bool calledAsFunction
-
-    Component.onCompleted: {
-        var x1 = new XMLHttpRequest;
-        var x2 = XMLHttpRequest();
-
-        calledAsConstructor = (x1 != null && x1 instanceof XMLHttpRequest);
-        calledAsFunction = (x2 == undefined);
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/defaultState.qml b/tests/auto/declarative/qmlxmlhttprequest/data/defaultState.qml
deleted file mode 100644
index 4dcf6f9..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/defaultState.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int readyState
-    property bool statusIsException: false
-    property bool statusTextIsException: false
-    property string responseText
-    property bool responseXMLIsNull
-
-    Component.onCompleted: {
-        var xhr = new XMLHttpRequest();
-
-        readyState = xhr.readyState;
-        try {
-            status = xhr.status;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                statusIsException = true;
-        }
-        try {
-            statusText = xhr.statusText;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                statusTextIsException = true;
-        }
-        responseText = xhr.responseText;
-        responseXMLIsNull = (xhr.responseXML == null);
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/document.qml b/tests/auto/declarative/qmlxmlhttprequest/data/document.qml
deleted file mode 100644
index e372361..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/document.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool xmlTest: false
-    property bool dataOK: false
-
-    Script {
-        function checkXML(document)
-        {
-            if (document.xmlVersion != "1.0")
-                return;
-
-            if (document.xmlEncoding != "UTF-8")
-                return;
-
-            if (document.xmlStandalone != true)
-                return;
-
-            if (document.documentElement == null)
-                return;
-
-            if (document.nodeName != "#document")
-                return;
-
-            if (document.nodeValue != null)
-                return;
-
-            if (document.parentNode != null)
-                return;
-
-            // ### Test other node properties
-            // ### test encoding (what is a valid qt encoding?)
-            xmlTest = true;
-        }
-    }
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "document.xml");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-
-                dataOK = true;
-
-                if (x.responseXML != null)
-                    checkXML(x.responseXML);
-
-            }
-        }
-
-        x.send()
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/document.xml b/tests/auto/declarative/qmlxmlhttprequest/data/document.xml
deleted file mode 100644
index fb693ea..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/document.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone='yes'?>
-<root>
-</root>
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/domExceptionCodes.qml b/tests/auto/declarative/qmlxmlhttprequest/data/domExceptionCodes.qml
deleted file mode 100644
index de5ee4f..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/domExceptionCodes.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int index_size_err: DOMException.INDEX_SIZE_ERR
-    property int domstring_size_err: DOMException.DOMSTRING_SIZE_ERR
-    property int hierarchy_request_err: DOMException.HIERARCHY_REQUEST_ERR
-    property int wrong_document_err: DOMException.WRONG_DOCUMENT_ERR
-    property int invalid_character_err: DOMException.INVALID_CHARACTER_ERR
-    property int no_data_allowed_err: DOMException.NO_DATA_ALLOWED_ERR
-    property int no_modification_allowed_err: DOMException.NO_MODIFICATION_ALLOWED_ERR
-    property int not_found_err: DOMException.NOT_FOUND_ERR
-    property int not_supported_err: DOMException.NOT_SUPPORTED_ERR
-    property int inuse_attribute_err: DOMException.INUSE_ATTRIBUTE_ERR
-    property int invalid_state_err: DOMException.INVALID_STATE_ERR
-    property int syntax_err: DOMException.SYNTAX_ERR
-    property int invalid_modification_err: DOMException.INVALID_MODIFICATION_ERR
-    property int namespace_err: DOMException.NAMESPACE_ERR
-    property int invalid_access_err: DOMException.INVALID_ACCESS_ERR
-    property int validation_err: DOMException.VALIDATION_ERR
-    property int type_mismatch_err: DOMException.TYPE_MISMATCH_ERR
-
-    Component.onCompleted: {
-        // Attempt to overwrite and delete values
-        DOMException.INDEX_SIZE_ERR = 44;
-        DOMException.DOMSTRING_SIZE_ERR = 44;
-        DOMException.HIERARCHY_REQUEST_ERR = 44;
-        DOMException.WRONG_DOCUMENT_ERR = 44;
-        DOMException.INVALID_CHARACTER_ERR = 44;
-        DOMException.NO_DATA_ALLOWED_ERR = 44;
-        DOMException.NO_MODIFICATION_ALLOWED_ERR = 44;
-        DOMException.NOT_FOUND_ERR = 44;
-        DOMException.NOT_SUPPORTED_ERR = 44;
-        DOMException.INUSE_ATTRIBUTE_ERR = 44;
-        DOMException.INVALID_STATE_ERR = 44;
-        DOMException.SYNTAX_ERR = 44;
-        DOMException.INVALID_MODIFICATION_ERR = 44;
-        DOMException.NAMESPACE_ERR = 44;
-        DOMException.INVALID_ACCESS_ERR = 44;
-        DOMException.VALIDATION_ERR = 44;
-        DOMException.TYPE_MISMATCH_ERR = 44;
-
-        delete DOMException.INDEX_SIZE_ERR;
-        delete DOMException.DOMSTRING_SIZE_ERR;
-        delete DOMException.HIERARCHY_REQUEST_ERR;
-        delete DOMException.WRONG_DOCUMENT_ERR;
-        delete DOMException.INVALID_CHARACTER_ERR;
-        delete DOMException.NO_DATA_ALLOWED_ERR;
-        delete DOMException.NO_MODIFICATION_ALLOWED_ERR;
-        delete DOMException.NOT_FOUND_ERR;
-        delete DOMException.NOT_SUPPORTED_ERR;
-        delete DOMException.INUSE_ATTRIBUTE_ERR;
-        delete DOMException.INVALID_STATE_ERR;
-        delete DOMException.SYNTAX_ERR;
-        delete DOMException.INVALID_MODIFICATION_ERR;
-        delete DOMException.NAMESPACE_ERR;
-        delete DOMException.INVALID_ACCESS_ERR;
-        delete DOMException.VALIDATION_ERR;
-        delete DOMException.TYPE_MISMATCH_ERR;
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/element.qml b/tests/auto/declarative/qmlxmlhttprequest/data/element.qml
deleted file mode 100644
index 78c0374..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/element.qml
+++ /dev/null
@@ -1,147 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool xmlTest: false
-    property bool dataOK: false
-
-    Script {
-        function checkElement(e, person, fruit)
-        {
-            if (e.tagName != "root")
-                return;
-
-            if (e.nodeName != "root")
-                return;
-
-            if (e.nodeValue != null)
-                return;
-
-            if (e.nodeType != 1)
-                return;
-
-            var childTagNames = [ "person", "fruit" ];
-
-            if (e.childNodes.length != childTagNames.length)
-                return;
-
-            for (var ii = 0; ii < childTagNames.length; ++ii) {
-                if (e.childNodes[ii].tagName != childTagNames[ii])
-                    return;
-            }
-
-            if (e.childNodes[childTagNames.length + 1] != null)
-                return;
-
-            // Check writing fails
-            e.childNodes[0] = null;
-            if (e.childNodes[0] == null)
-                return;
-
-            e.childNodes[10] = 10;
-            if (e.childNodes[10] != null)
-                return;
-
-            if (e.firstChild.tagName != e.childNodes[0].tagName)
-                return;
-
-            if (e.lastChild.tagName != e.childNodes[1].tagName)
-                return;
-
-            if (e.previousSibling != null)
-                return;
-
-            if (e.nextSibling != null)
-                return;
-
-            if (e.attributes == null)
-                return;
-
-            if (e.attributes.length != 2)
-                return;
-
-            var attr1 = e.attributes["attr"];
-            if (attr1.nodeValue != "value")
-                return;
-
-            var attrIdx = e.attributes[0];
-            if (attrIdx.nodeValue != "value")
-                return;
-
-            var attr2 = e.attributes["attr2"];
-            if (attr2.nodeValue != "value2")
-                return;
-
-            var attr3 = e.attributes["attr3"];
-            if (attr3 != null)
-                return;
-
-            var attrIdx2 = e.attributes[11];
-            if (attrIdx2 != null)
-                return;
-
-            // Check writing fails
-            e.attributes[0] = null;
-            if (e.attributes[0] == null)
-                return;
-
-            e.attributes["attr"] = null;
-            if (e.attributes["attr"] == null)
-                return;
-
-            e.attributes["attr3"] = 10;
-            if (e.attributes["attr3"] != null)
-                return;
-
-            // Check person and fruit sub elements
-            if (person.parentNode.nodeName != "root")
-                return;
-
-            if (person.previousSibling != null)
-                return;
-
-            if (person.nextSibling.nodeName != "fruit")
-                return;
-
-            if (fruit.parentNode.nodeName != "root")
-                return;
-
-            if (fruit.previousSibling.nodeName != "person")
-                return;
-
-            if (fruit.nextSibling != null)
-                return;
-
-            xmlTest = true;
-        }
-
-        function checkXML(document)
-        {
-            checkElement(document.documentElement, 
-                         document.documentElement.childNodes[0], 
-                         document.documentElement.childNodes[1]);
-        }
-    }
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "element.xml");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-
-                dataOK = true;
-
-                if (x.responseXML != null)
-                    checkXML(x.responseXML);
-
-            }
-        }
-
-        x.send()
-    }
-}
-
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/element.xml b/tests/auto/declarative/qmlxmlhttprequest/data/element.xml
deleted file mode 100644
index 071ffae..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/element.xml
+++ /dev/null
@@ -1 +0,0 @@
-<root attr="value" attr2="value2"><person /><fruit /></root>
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders.qml
deleted file mode 100644
index 8d67fad..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool unsentException: false
-    property bool openedException: false
-
-    property bool readyState: false
-    property bool openedState: false
-
-    property bool headersReceivedState: false
-    property bool headersReceivedHeader: false
-
-    property bool doneState: false
-    property bool doneHeader: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-	try {
-	    x.getResponseHeader("Test-Header");
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		unsentException = true;
-	}
-
-        if (x.readyState == XMLHttpRequest.UNSENT)
-            readyState = true;
-
-        x.open("GET", url);
-
-        if (x.readyState  == XMLHttpRequest.OPENED)
-            openedState = true;
-
-	try {
-	    x.getResponseHeader("Test-Header");
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		openedException = true;
-	}
-
-        var headers = "connection: close\r\ncontent-type: text/html; charset=UTF-8\r\ntest-header: TestValue\r\nmultitest-header: TestValue, SecondTestValue\r\ncontent-length: 11";
-
-        // Test to the end
-        x.onreadystatechange = function() {
-	    if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
-		headersReceivedState = true;
-
-		headersReceivedHeader = (x.getAllResponseHeaders() == headers);
-	    } else if (x.readyState == XMLHttpRequest.DONE) {
-		doneState = headersReceivedState && true;
-
-		doneHeader = (x.getAllResponseHeaders() == headers);
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send()
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_args.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_args.qml
deleted file mode 100644
index 37124c7..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_args.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool exceptionThrown: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "testdocument.html");
-        x.send();
-
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                try {
-                    x.getAllResponseHeaders("Test-header");
-                } catch (e) {
-                    if (e.code == DOMException.SYNTAX_ERR)
-                        exceptionThrown = true;
-                }
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_sent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_sent.qml
deleted file mode 100644
index 505e4b1..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_sent.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool test: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "testdocument.html");
-        x.send();
-
-        try {
-            x.getAllResponseHeaders();
-        } catch (e) {
-            if (e.code == DOMException.INVALID_STATE_ERR)
-                test = true;
-        }
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_unsent.qml
deleted file mode 100644
index 20fb040..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_unsent.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool test: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        try {
-            x.getAllResponseHeaders();
-        } catch (e) {
-            if (e.code == DOMException.INVALID_STATE_ERR)
-                test = true;
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.expect b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.expect
deleted file mode 100644
index a740c79..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /testdocument.html HTTP/1.1
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.qml
deleted file mode 100644
index 2f949e1..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool unsentException: false
-    property bool openedException: false
-
-    property bool readyState: false
-    property bool openedState: false
-
-    property bool headersReceivedState: false
-    property bool headersReceivedNullHeader: false
-    property bool headersReceivedValidHeader: false
-    property bool headersReceivedMultiValidHeader: false
-    property bool headersReceivedCookieHeader: false
-
-    property bool doneState: false
-    property bool doneNullHeader: false
-    property bool doneValidHeader: false
-    property bool doneMultiValidHeader: false
-    property bool doneCookieHeader: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-	try {
-	    x.getResponseHeader("Test-Header");
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		unsentException = true;
-	}
-
-        if (x.readyState == XMLHttpRequest.UNSENT)
-            readyState = true;
-
-        x.open("GET", url);
-
-        if (x.readyState  == XMLHttpRequest.OPENED)
-            openedState = true;
-
-	try {
-	    x.getResponseHeader("Test-Header");
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		openedException = true;
-	}
-
-        // Test to the end
-        x.onreadystatechange = function() {
-	    if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
-		headersReceivedState = true;
-
-		headersReceivedNullHeader = (x.getResponseHeader("Nonexistant-header") == "");
-		headersReceivedValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue");
-		headersReceivedMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue");
-		headersReceivedCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == "");
-	    } else if (x.readyState == XMLHttpRequest.DONE) {
-		doneState = headersReceivedState && true;
-
-		doneNullHeader = (x.getResponseHeader("Nonexistant-header") == "");
-		doneValidHeader = (x.getResponseHeader("Test-HEAder") == "TestValue");
-		doneMultiValidHeader = (x.getResponseHeader("MultiTest-HEAder") == "TestValue, SecondTestValue");
-		doneCookieHeader = (x.getResponseHeader("Set-Cookie") == "" && x.getResponseHeader("Set-Cookie2") == "");
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send()
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.reply b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.reply
deleted file mode 100644
index c4b4bb2..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.reply
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.0 200 OK
-Connection: close
-Content-type: text/html; charset=UTF-8
-Test-Header: TestValue
-MultiTest-Header: TestValue
-MultiTest-Header: SecondTestValue
-Set-Cookie: mycook=Value
-Set-Cookie2: mycook=Value
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_args.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_args.qml
deleted file mode 100644
index d5aa4b1..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_args.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool exceptionThrown: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "testdocument.html");
-        x.send();
-
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                try {
-                    x.getResponseHeader();
-                } catch (e) {
-                    if (e.code == DOMException.SYNTAX_ERR)
-                        exceptionThrown = true;
-                }
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_sent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_sent.qml
deleted file mode 100644
index 7538ffd..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_sent.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool test: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "testdocument.html");
-        x.send();
-
-        try {
-            x.getResponseHeader("Test-header");
-        } catch (e) {
-            if (e.code == DOMException.INVALID_STATE_ERR)
-                test = true;
-        }
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_unsent.qml
deleted file mode 100644
index 3b55802..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_unsent.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool test: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        try {
-            x.getResponseHeader("Test-header");
-        } catch (e) {
-            if (e.code == DOMException.INVALID_STATE_ERR)
-                test = true;
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/instanceStateValues.qml b/tests/auto/declarative/qmlxmlhttprequest/data/instanceStateValues.qml
deleted file mode 100644
index b8d01c4..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/instanceStateValues.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int unsent
-    property int opened
-    property int headers_received
-    property int loading
-    property int done
-
-    Component.onCompleted: {
-        // Attempt to overwrite and delete values
-        var x = new XMLHttpRequest();
-
-        x.UNSENT = 9;
-        x.OPENED = 9;
-        x.HEADERS_RECEIVED = 9;
-        x.LOADING = 9;
-        x.DONE = 9;
-
-        delete x.UNSENT;
-        delete x.OPENED;
-        delete x.HEADERS_RECEIVED;
-        delete x.LOADING;
-        delete x.DONE;
-
-        unsent = x.UNSENT
-        opened = x.OPENED
-        headers_received = x.HEADERS_RECEIVED
-        loading = x.LOADING
-        done = x.DONE
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/invalidMethodUsage.qml b/tests/auto/declarative/qmlxmlhttprequest/data/invalidMethodUsage.qml
deleted file mode 100644
index b30989b..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/invalidMethodUsage.qml
+++ /dev/null
@@ -1,160 +0,0 @@
-import Qt 4.6 
-
-QtObject {
-    property bool onreadystatechange: false
-    property bool readyState: false
-    property bool status: false
-    property bool statusText: false
-    property bool responseText: false
-    property bool responseXML: false
-
-    property bool open: false
-    property bool setRequestHeader: false
-    property bool send: false
-    property bool abort: false
-    property bool getResponseHeader: false
-    property bool getAllResponseHeaders: false
-
-    Component.onCompleted: {
-        var o = 10;
-
-        try {
-            XMLHttpRequest.prototype.onreadystatechange
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            onreadystatechange = true;
-        }
-        try {
-            XMLHttpRequest.prototype.readyState
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            readyState = true;
-        }
-        try {
-            XMLHttpRequest.prototype.status
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            status = true;
-        }
-        try {
-            XMLHttpRequest.prototype.statusText
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            statusText = true;
-        }
-        try {
-            XMLHttpRequest.prototype.responseText
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            responseText = true;
-        }
-        try {
-            XMLHttpRequest.prototype.responseXML
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            responseXML = true;
-        }
-
-        try {
-            XMLHttpRequest.prototype.open.call(o);
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            open = true;
-        }
-
-        try {
-            XMLHttpRequest.prototype.setRequestHeader.call(o);
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            setRequestHeader = true;
-        }
-
-        try {
-            XMLHttpRequest.prototype.send.call(o);
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            send = true;
-        }
-
-        try {
-            XMLHttpRequest.prototype.abort.call(o);
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            abort = true;
-        }
-
-        try {
-            XMLHttpRequest.prototype.getResponseHeader.call(o);
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            getResponseHeader = true;
-        }
-
-        try {
-            XMLHttpRequest.prototype.getAllResponseHeaders.call(o);
-        } catch (e) {
-            if (!(e instanceof ReferenceError))
-                return;
-
-            if (e.message != "Not an XMLHttpRequest object")
-                return;
-
-            getAllResponseHeaders = true;
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open.qml
deleted file mode 100644
index c06bae3..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool readyState: false
-    property bool openedState: false
-
-    property bool status: false
-    property bool statusText: false
-    property bool responseText: false
-    property bool responseXML: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        if (x.readyState == XMLHttpRequest.UNSENT)
-            readyState = true;
-
-        x.open("GET", url);
-
-        if (x.readyState  == XMLHttpRequest.OPENED)
-            openedState = true;
-
-        try {
-            var a = x.status;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                status = true;
-        }
-        try {
-            var a = x.statusText;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                statusText = true;
-        }
-        responseText = (x.responseText == "");
-        responseXML = (x.responseXML == null);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-
-        x.send()
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.1.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.1.qml
deleted file mode 100644
index b6d4c32..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.1.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool exceptionThrown: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        try {
-            x.open("GET");
-        } catch (e) {
-            if (e.code == DOMException.SYNTAX_ERR)
-                exceptionThrown = true;
-        }
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.2.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.2.qml
deleted file mode 100644
index 8c86c20..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.2.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool exceptionThrown: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        try {
-            x.open("GET", "http://www.nokia.com", true, "user", "password", "extra");
-        } catch (e) {
-            if (e.code == DOMException.SYNTAX_ERR)
-                exceptionThrown = true;
-        }
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_invalid_method.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_invalid_method.qml
deleted file mode 100644
index 69f79ae..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_invalid_method.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool exceptionThrown: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        try {
-            x.open("BLAH", "http://www.nokia.com");
-        } catch (e) {
-            if (e.code == DOMException.SYNTAX_ERR)
-                exceptionThrown = true;
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.expect b/tests/auto/declarative/qmlxmlhttprequest/data/open_network.expect
deleted file mode 100644
index a740c79..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /testdocument.html HTTP/1.1
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.reply b/tests/auto/declarative/qmlxmlhttprequest/data/open_network.reply
deleted file mode 100644
index 7ae6951..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.reply
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP/1.0 200 OK
-Connection: close
-Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.wait b/tests/auto/declarative/qmlxmlhttprequest/data/open_network.wait
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_sync.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_sync.qml
deleted file mode 100644
index 1477279..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_sync.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool exceptionThrown: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        try {
-            x.open("GET", "http://www.nokia.com", false);
-        } catch (e) {
-            if (e.code == DOMException.NOT_SUPPORTED_ERR)
-                exceptionThrown = true;
-        }
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_user.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_user.qml
deleted file mode 100644
index 19e37fa..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_user.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool readyState: false
-    property bool openedState: false
-
-    property bool status: false
-    property bool statusText: false
-    property bool responseText: false
-    property bool responseXML: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        if (x.readyState == XMLHttpRequest.UNSENT)
-            readyState = true;
-
-        x.open("GET", url, true, "username", "password");
-
-        if (x.readyState  == XMLHttpRequest.OPENED)
-            openedState = true;
-
-        try {
-            var a = x.status;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                status = true;
-        }
-        try {
-            var a = x.statusText;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                statusText = true;
-        }
-        responseText = (x.responseText == "");
-        responseXML = (x.responseXML == null);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-
-        x.send()
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_username.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_username.qml
deleted file mode 100644
index 983ea14..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_username.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool readyState: false
-    property bool openedState: false
-
-    property bool status: false
-    property bool statusText: false
-    property bool responseText: false
-    property bool responseXML: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        if (x.readyState == XMLHttpRequest.UNSENT)
-            readyState = true;
-
-        x.open("GET", url, true, "sampleusername", "password");
-
-        if (x.readyState  == XMLHttpRequest.OPENED)
-            openedState = true;
-
-        try {
-            var a = x.status;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                status = true;
-        }
-        try {
-            var a = x.statusText;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                statusText = true;
-        }
-        responseText = (x.responseText == "");
-        responseXML = (x.responseXML == null);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-
-        x.send()
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/redirectError.qml b/tests/auto/declarative/qmlxmlhttprequest/data/redirectError.qml
deleted file mode 100644
index 6b345cc..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/redirectError.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-    property bool done: false
-        
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("GET", url);
-
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                done = true;
-                dataOK = x.status == 404;
-            }
-        }
-
-        x.send();
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/redirectRecur.qml b/tests/auto/declarative/qmlxmlhttprequest/data/redirectRecur.qml
deleted file mode 100644
index c0321dc..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/redirectRecur.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-    property bool done: false
-        
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("GET", url);
-
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                done = true;
-                dataOK = x.status == 302;
-            }
-        }
-
-        x.send();
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/redirects.qml b/tests/auto/declarative/qmlxmlhttprequest/data/redirects.qml
deleted file mode 100644
index f6fabdb..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/redirects.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-    property bool done: false
-        
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("GET", url);
-
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                done = true;
-                dataOK = x.responseText == "Redirected\n";
-            }
-        }
-
-        x.send();
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/redirecttarget.html b/tests/auto/declarative/qmlxmlhttprequest/data/redirecttarget.html
deleted file mode 100644
index 95f35e0..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/redirecttarget.html
+++ /dev/null
@@ -1 +0,0 @@
-Redirected
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/responseText.qml b/tests/auto/declarative/qmlxmlhttprequest/data/responseText.qml
deleted file mode 100644
index 4bb3a7a..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/responseText.qml
+++ /dev/null
@@ -1,52 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-    property string expectedText
-
-    property bool unsent: false
-    property bool opened: false
-    property bool sent: false
-    property bool headersReceived: false
-
-    property bool loading: false
-    property bool done: false
-
-    property bool reset: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        unsent = (x.responseText == "");
-
-        x.open("GET", url);
-
-        opened = (x.responseText == "");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
-                headersReceived = (x.responseText == "");
-            } else if (x.readyState == XMLHttpRequest.LOADING) {
-                if (x.responseText == expectedText)
-                    loading = true;
-            } else if (x.readyState == XMLHttpRequest.DONE) {
-                if (x.responseText == expectedText)
-                    done = true;
-
-                dataOK = (x.responseText == expectedText);
-
-                x.open("GET", url);
-
-                reset = (x.responseText == "");
-            }
-        }
-
-        x.send()
-
-        sent = (x.responseText == "");
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/responseXML_invalid.qml b/tests/auto/declarative/qmlxmlhttprequest/data/responseXML_invalid.qml
deleted file mode 100644
index 63f288e..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/responseXML_invalid.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool xmlNull: false
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "testdocument.html");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-                xmlNull = (x.responseXML == null);
-            }
-        }
-
-
-        x.send()
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/seconddocument.html b/tests/auto/declarative/qmlxmlhttprequest/data/seconddocument.html
deleted file mode 100644
index a33f44b..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/seconddocument.html
+++ /dev/null
@@ -1 +0,0 @@
-This should not be read!
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_alreadySent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_alreadySent.qml
deleted file mode 100644
index 0bad7df..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_alreadySent.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool dataOK: false
-    property bool test: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("GET", "testdocument.html");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send();
-
-        try {
-            x.send()        
-        } catch (e) {
-            if (e.code == DOMException.INVALID_STATE_ERR)
-                test = true;
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.expect
deleted file mode 100644
index 81dd4a0..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /testdocument.html HTTP/1.1
-Content-Type: text/plain;charset=UTF-8
-Content-Length: 12
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
-My Sent Data
\ No newline at end of file
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.qml
deleted file mode 100644
index 03543a9..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("POST", url);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send("My Sent Data");
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.2.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.2.qml
deleted file mode 100644
index 79a27b6..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.2.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("POST", url);
-        x.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send("My Sent Data");
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.3.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.3.qml
deleted file mode 100644
index e048769..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.3.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("POST", url);
-        x.setRequestHeader("Content-Type", "text/plain;charset=latin1");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send("My Sent Data");
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.expect
deleted file mode 100644
index 8fcf3ac..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /testdocument.html HTTP/1.1
-Content-Type: charset=UTF-8;text/plain
-Content-Length: 12
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
-My Sent Data
\ No newline at end of file
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.qml
deleted file mode 100644
index 7ab0b27..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("POST", url);
-        x.setRequestHeader("Content-Type", "charset=UTF-8;text/plain");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send("My Sent Data");
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.5.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.5.qml
deleted file mode 100644
index 29bf2c2..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.5.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("POST", url);
-        x.setRequestHeader("Content-Type", "charset=latin1;text/plain");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send("My Sent Data");
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.expect
deleted file mode 100644
index 97e6fac..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-PUT /testdocument.html HTTP/1.1
-Content-Type: text/plain;charset=UTF-8
-Content-Length: 12
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
-My Sent Data
\ No newline at end of file
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.qml
deleted file mode 100644
index 135f45c..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("PUT", url);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send("My Sent Data");
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.7.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.7.qml
deleted file mode 100644
index 4a09527..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.7.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open("POST", url);
-        x.setRequestHeader("Content-Type", "text/plain");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send("My Sent Data");
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.reply b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.reply
deleted file mode 100644
index 7ae6951..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.reply
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP/1.0 200 OK
-Connection: close
-Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.qml
deleted file mode 100644
index dd5fa46..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string reqType
-    property string url
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-        x.open(reqType, url);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                if (reqType == "HEAD")
-                    dataOK = (x.responseText == "");
-                else
-                    dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send("Data To Ignore");
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.reply b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.reply
deleted file mode 100644
index 7ae6951..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.reply
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP/1.0 200 OK
-Connection: close
-Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_GET.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_GET.expect
deleted file mode 100644
index a740c79..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_GET.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /testdocument.html HTTP/1.1
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_PUT.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_PUT.expect
deleted file mode 100644
index 991bd59..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_PUT.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-HEAD /testdocument.html HTTP/1.1
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_unsent.qml
deleted file mode 100644
index 7f51ecf..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_unsent.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool test: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        try {
-            x.send();
-        } catch (e) {
-            if (e.code == DOMException.INVALID_STATE_ERR)
-                test = true;
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.expect b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.expect
deleted file mode 100644
index 4600f2a..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-GET /testdocument.html HTTP/1.1
-TEST-HEADER: value
-TEST-HEADER2: value,value2
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.qml
deleted file mode 100644
index b0723aa..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", url);
-
-        x.setRequestHeader("Test-header", "value");
-        x.setRequestHeader("Test-header2", "value");
-        x.setRequestHeader("Test-header2", "value2");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send();
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.reply b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.reply
deleted file mode 100644
index 7ae6951..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.reply
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP/1.0 200 OK
-Connection: close
-Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_args.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_args.qml
deleted file mode 100644
index 8305ae1..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_args.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool exceptionThrown: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "testdocument.html");
-
-        try {
-            x.setRequestHeader("Test-header");
-        } catch (e) {
-            if (e.code == DOMException.SYNTAX_ERR)
-                exceptionThrown = true;
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_illegalName.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_illegalName.qml
deleted file mode 100644
index bf31eca..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_illegalName.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-    property string header
-
-    property bool readyState: false
-    property bool openedState: false
-
-    property bool status: false
-    property bool statusText: false
-    property bool responseText: false
-    property bool responseXML: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        if (x.readyState == XMLHttpRequest.UNSENT)
-            readyState = true;
-
-        x.open("GET", url);
-
-        x.setRequestHeader(header, "Value");
-
-        if (x.readyState  == XMLHttpRequest.OPENED)
-            openedState = true;
-
-        try {
-            var a = x.status;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                status = true;
-        }
-        try {
-            var a = x.statusText;
-        } catch (error) {
-            if (error.code == DOMException.INVALID_STATE_ERR)
-                statusText = true;
-        }
-        responseText = (x.responseText == "");
-        responseXML = (x.responseXML == null);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-
-        x.send()
-    }
-}
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_sent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_sent.qml
deleted file mode 100644
index c2bbc6e..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_sent.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-    property bool test: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", url);
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-                dataOK = (x.responseText == "QML Rocks!\n");
-            }
-        }
-
-        x.send();
-
-        try {
-            x.setRequestHeader("Test-header", "value");
-        } catch (e) {
-            if (e.code == DOMException.INVALID_STATE_ERR)
-                test = true;
-        }
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_unsent.qml
deleted file mode 100644
index 30bc93e..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_unsent.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool test: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        try {
-            x.setRequestHeader("Test-header", "value");
-        } catch (e) {
-            if (e.code == DOMException.INVALID_STATE_ERR)
-                test = true;
-        }
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/staticStateValues.qml b/tests/auto/declarative/qmlxmlhttprequest/data/staticStateValues.qml
deleted file mode 100644
index ec1c5d8..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/staticStateValues.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int unsent: XMLHttpRequest.UNSENT
-    property int opened: XMLHttpRequest.OPENED
-    property int headers_received: XMLHttpRequest.HEADERS_RECEIVED
-    property int loading: XMLHttpRequest.LOADING
-    property int done: XMLHttpRequest.DONE
-
-    Component.onCompleted: {
-        // Attempt to overwrite and delete values
-        XMLHttpRequest.UNSENT = 9;
-        XMLHttpRequest.OPENED = 9;
-        XMLHttpRequest.HEADERS_RECEIVED = 9;
-        XMLHttpRequest.LOADING = 9;
-        XMLHttpRequest.DONE = 9;
-
-        delete XMLHttpRequest.UNSENT;
-        delete XMLHttpRequest.OPENED;
-        delete XMLHttpRequest.HEADERS_RECEIVED;
-        delete XMLHttpRequest.LOADING;
-        delete XMLHttpRequest.DONE;
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/status.200.reply b/tests/auto/declarative/qmlxmlhttprequest/data/status.200.reply
deleted file mode 100644
index 7ae6951..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/status.200.reply
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP/1.0 200 OK
-Connection: close
-Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/status.404.reply b/tests/auto/declarative/qmlxmlhttprequest/data/status.404.reply
deleted file mode 100644
index 2e29f56..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/status.404.reply
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP/1.0 404 Document not found
-Connection: close
-Content-type: text/html; charset=UTF-8
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/status.expect b/tests/auto/declarative/qmlxmlhttprequest/data/status.expect
deleted file mode 100644
index a740c79..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/status.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /testdocument.html HTTP/1.1
-Connection: Keep-Alive
-Accept-Encoding: gzip
-Accept-Language: en-US,*
-User-Agent: Mozilla/5.0
-Host: 127.0.0.1:14445
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/status.qml b/tests/auto/declarative/qmlxmlhttprequest/data/status.qml
deleted file mode 100644
index 04202c4..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/status.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-    property int expectedStatus
-
-    property bool unsentException: false;
-    property bool openedException: false;
-    property bool sentException: false;
-
-    property bool headersReceived: false
-    property bool loading: false
-    property bool done: false
-
-    property bool resetException: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-	try {
-	    var a = x.status;
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		unsentException = true;
-	}
-
-        x.open("GET", url);
-
-	try {
-	    var a = x.status;
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		openedException = true;
-	}
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
-                if (x.status == expectedStatus)
-                    headersReceived = true;
-            } else if (x.readyState == XMLHttpRequest.LOADING) {
-                if (x.status == expectedStatus)
-                    loading = true;
-            } else if (x.readyState == XMLHttpRequest.DONE) {
-                if (x.status == expectedStatus)
-                    done = true;
-
-                if (expectedStatus == 404) {
-                    dataOK = (x.responseText == "");
-                } else {
-                    dataOK = (x.responseText == "QML Rocks!\n");
-                }
-
-                x.open("GET", url);
-
-                try {
-                    var a = x.status;
-                } catch (e) {
-                    if (e.code == DOMException.INVALID_STATE_ERR)
-                        resetException = true;
-                }
-
-            }
-        }
-
-        x.send()
-
-	try {
-	    var a = x.status;
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		sentException = true;
-	}
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/statusText.qml b/tests/auto/declarative/qmlxmlhttprequest/data/statusText.qml
deleted file mode 100644
index 8becc3b..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/statusText.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property string url
-    property string expectedStatus
-
-    property bool unsentException: false;
-    property bool openedException: false;
-    property bool sentException: false;
-
-    property bool headersReceived: false
-    property bool loading: false
-    property bool done: false
-
-    property bool resetException: false
-
-    property bool dataOK: false
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-	try {
-	    var a = x.statusText;
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		unsentException = true;
-	}
-
-        x.open("GET", url);
-
-	try {
-	    var a = x.statusText;
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		openedException = true;
-	}
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
-                if (x.statusText == expectedStatus)
-                    headersReceived = true;
-            } else if (x.readyState == XMLHttpRequest.LOADING) {
-                if (x.statusText == expectedStatus)
-                    loading = true;
-            } else if (x.readyState == XMLHttpRequest.DONE) {
-                if (x.statusText == expectedStatus)
-                    done = true;
-
-                if (expectedStatus != "OK") {
-                    dataOK = (x.responseText == "");
-                } else {
-                    dataOK = (x.responseText == "QML Rocks!\n");
-                }
-
-                x.open("GET", url);
-
-                try {
-                    var a = x.statusText;
-                } catch (e) {
-                    if (e.code == DOMException.INVALID_STATE_ERR)
-                        resetException = true;
-                }
-
-            }
-        }
-
-        x.send()
-
-	try {
-	    var a = x.statusText;
-	} catch (e) {
-	    if (e.code == DOMException.INVALID_STATE_ERR)
-		sentException = true;
-	}
-    }
-}
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/testdocument.html b/tests/auto/declarative/qmlxmlhttprequest/data/testdocument.html
deleted file mode 100644
index 8fe0f4b..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/testdocument.html
+++ /dev/null
@@ -1 +0,0 @@
-QML Rocks!
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/text.qml b/tests/auto/declarative/qmlxmlhttprequest/data/text.qml
deleted file mode 100644
index 4615a07..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/text.qml
+++ /dev/null
@@ -1,131 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property bool xmlTest: false
-    property bool dataOK: false
-
-    Script {
-        function checkText(text, whitespacetext)
-        {
-            if (text == null)
-                return;
-
-            if (text.nodeName != "#text")
-                return;
-
-            if (text.nodeValue != "Hello world!")
-                return;
-
-            if (text.nodeType != 3)
-                return;
-
-            if (text.parentNode.nodeName != "item")
-                return;
-
-            if (text.childNodes.length != 0)
-                return;
-
-            if (text.firstChild != null)
-                return;
-
-            if (text.lastChild != null)
-                return;
-
-            if (text.previousSibling != null)
-                return;
-
-            if (text.nextSibling != null)
-                return;
-
-            if (text.attributes != null)
-                return;
-
-            if (text.wholeText != "Hello world!")
-                return;
-
-            if (text.data != "Hello world!")
-                return;
-
-            if (text.length != 12)
-                return;
-
-            if (text.isElementContentWhitespace != false)
-                return;
-
-            if (whitespacetext.nodeName != "#text")
-                return;
-
-            if (whitespacetext.nodeValue != "   ")
-                return;
-
-            if (whitespacetext.nodeType != 3)
-                return;
-
-            if (whitespacetext.parentNode.nodeName != "item")
-                return;
-
-            if (whitespacetext.childNodes.length != 0)
-                return;
-
-            if (whitespacetext.firstChild != null)
-                return;
-
-            if (whitespacetext.lastChild != null)
-                return;
-
-            if (whitespacetext.previousSibling != null)
-                return;
-
-            if (whitespacetext.nextSibling != null)
-                return;
-
-            if (whitespacetext.attributes != null)
-                return;
-
-            if (whitespacetext.wholeText != "   ")
-                return;
-
-            if (whitespacetext.data != "   ")
-                return;
-
-            if (whitespacetext.length != 3)
-                return;
-
-            if (whitespacetext.isElementContentWhitespace != true)
-                return;
-
-            xmlTest = true;
-        }
-
-        function checkXML(document)
-        {
-            checkText(document.documentElement.childNodes[0].childNodes[0],
-                      document.documentElement.childNodes[1].childNodes[0]);
-
-        }
-    }
-
-    Component.onCompleted: {
-        var x = new XMLHttpRequest;
-
-        x.open("GET", "text.xml");
-
-        // Test to the end
-        x.onreadystatechange = function() {
-            if (x.readyState == XMLHttpRequest.DONE) {
-
-                dataOK = true;
-
-                if (x.responseXML != null)
-                    checkXML(x.responseXML);
-
-            }
-        }
-
-        x.send()
-    }
-}
-
-
-
-
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/text.xml b/tests/auto/declarative/qmlxmlhttprequest/data/text.xml
deleted file mode 100644
index e741688..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/data/text.xml
+++ /dev/null
@@ -1 +0,0 @@
-<root><item>Hello world!</item><item>   </item></root>
diff --git a/tests/auto/declarative/qmlxmlhttprequest/qmlxmlhttprequest.pro b/tests/auto/declarative/qmlxmlhttprequest/qmlxmlhttprequest.pro
deleted file mode 100644
index ed87b2a..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/qmlxmlhttprequest.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative network
-macx:CONFIG -= app_bundle
-
-INCLUDEPATH += ../shared/
-HEADERS += ../shared/testhttpserver.h
-
-SOURCES += tst_qmlxmlhttprequest.cpp \
-           ../shared/testhttpserver.cpp
-
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlxmlhttprequest/tst_qmlxmlhttprequest.cpp b/tests/auto/declarative/qmlxmlhttprequest/tst_qmlxmlhttprequest.cpp
deleted file mode 100644
index e675566..0000000
--- a/tests/auto/declarative/qmlxmlhttprequest/tst_qmlxmlhttprequest.cpp
+++ /dev/null
@@ -1,1315 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QDebug>
-#include <QNetworkCookieJar>
-#include "testhttpserver.h"
-
-#define SERVER_PORT 14445
-
-class tst_qmlxmlhttprequest : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlxmlhttprequest() {}
-
-private slots:
-    void initTestCase() {
-        if (QLocale::system().name().replace(QChar::fromAscii('_'),QChar::fromAscii('-')) != QLatin1String("en-US")) {
-            qWarning() << "Test will fail unless LANG is en_US";
-        }
-    }
-
-    void domExceptionCodes();
-    void callbackException();
-    void callbackException_data();
-    void staticStateValues();
-    void instanceStateValues();
-    void constructor();
-    void defaultState();
-    void open();
-    void open_invalid_method();
-    void open_sync();
-    void open_arg_count();
-    void setRequestHeader();
-    void setRequestHeader_unsent();
-    void setRequestHeader_illegalName_data();
-    void setRequestHeader_illegalName();
-    void setRequestHeader_sent();
-    void setRequestHeader_args();
-    void send_unsent();
-    void send_alreadySent();
-    void send_ignoreData();
-    void send_withdata();
-    void abort();
-    void abort_unsent();
-    void abort_opened();
-    void getResponseHeader();
-    void getResponseHeader_unsent();
-    void getResponseHeader_sent();
-    void getResponseHeader_args();
-    void getAllResponseHeaders();
-    void getAllResponseHeaders_unsent();
-    void getAllResponseHeaders_sent();
-    void getAllResponseHeaders_args();
-    void status();
-    void statusText();
-    void responseText();
-    void responseXML_invalid();
-    void invalidMethodUsage();
-    void redirects();
-
-    // Attributes
-    void document();
-    void element();
-    void attr();
-    void text();
-    void cdata();
-
-    // Crashes
-    // void outstanding_request_at_shutdown();
-
-    // void network_errors()
-    // void readyState()
-
-private:
-    QmlEngine engine;
-};
-
-inline QUrl TEST_FILE(const QString &filename)
-{
-    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
-}
-
-// Test that the dom exception codes are correct
-void tst_qmlxmlhttprequest::domExceptionCodes()
-{
-    QmlComponent component(&engine, TEST_FILE("domExceptionCodes.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("index_size_err").toInt(), 1);
-    QCOMPARE(object->property("domstring_size_err").toInt(), 2);
-    QCOMPARE(object->property("hierarchy_request_err").toInt(), 3);
-    QCOMPARE(object->property("wrong_document_err").toInt(), 4);
-    QCOMPARE(object->property("invalid_character_err").toInt(), 5);
-    QCOMPARE(object->property("no_data_allowed_err").toInt(), 6);
-    QCOMPARE(object->property("no_modification_allowed_err").toInt(), 7);
-    QCOMPARE(object->property("not_found_err").toInt(), 8);
-    QCOMPARE(object->property("not_supported_err").toInt(), 9);
-    QCOMPARE(object->property("inuse_attribute_err").toInt(), 10);
-    QCOMPARE(object->property("invalid_state_err").toInt(), 11);
-    QCOMPARE(object->property("syntax_err").toInt(), 12);
-    QCOMPARE(object->property("invalid_modification_err").toInt(), 13);
-    QCOMPARE(object->property("namespace_err").toInt(), 14);
-    QCOMPARE(object->property("invalid_access_err").toInt(), 15);
-    QCOMPARE(object->property("validation_err").toInt(), 16);
-    QCOMPARE(object->property("type_mismatch_err").toInt(), 17);
-
-    delete object;
-}
-
-#define TRY_WAIT(expr) \
-    do { \
-        for (int ii = 0; ii < 6; ++ii) { \
-            if ((expr)) break; \
-            QTest::qWait(50); \
-        } \
-        QVERIFY((expr)); \
-    } while (false) 
-
-
-void tst_qmlxmlhttprequest::callbackException_data()
-{
-    QTest::addColumn<QString>("which");
-    QTest::addColumn<int>("line");
-
-    QTest::newRow("on-opened") << "1" << 15;
-    QTest::newRow("on-loading") << "3" << 15;
-    QTest::newRow("on-done") << "4" << 15;
-}
-
-void tst_qmlxmlhttprequest::callbackException()
-{
-    // Test exception reporting for exceptions thrown at various points.
-
-    QFETCH(QString, which);
-    QFETCH(int, line);
-    
-    QString expect = TEST_FILE("callbackException.qml").toString() + ":"+QString::number(line)+": Error: Exception from Callback";
-    QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
-
-    QmlComponent component(&engine, TEST_FILE("callbackException.qml"));
-    QObject *object = component.beginCreate(engine.rootContext());
-    QVERIFY(object != 0);
-    object->setProperty("url", "testdocument.html");
-    object->setProperty("which", which);
-    component.completeCreate();
-
-    TRY_WAIT(object->property("threw").toBool() == true);
-
-    delete object;
-}
-
-// Test that the state value properties on the XMLHttpRequest constructor have the correct values.
-// ### WebKit does not do this, but it seems to fit the standard and QML better
-void tst_qmlxmlhttprequest::staticStateValues()
-{
-    QmlComponent component(&engine, TEST_FILE("staticStateValues.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("unsent").toInt(), 0);
-    QCOMPARE(object->property("opened").toInt(), 1);
-    QCOMPARE(object->property("headers_received").toInt(), 2);
-    QCOMPARE(object->property("loading").toInt(), 3);
-    QCOMPARE(object->property("done").toInt(), 4);
-
-    delete object;
-}
-
-// Test that the state value properties on instances have the correct values.
-void tst_qmlxmlhttprequest::instanceStateValues()
-{
-    QmlComponent component(&engine, TEST_FILE("instanceStateValues.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("unsent").toInt(), 0);
-    QCOMPARE(object->property("opened").toInt(), 1);
-    QCOMPARE(object->property("headers_received").toInt(), 2);
-    QCOMPARE(object->property("loading").toInt(), 3);
-    QCOMPARE(object->property("done").toInt(), 4);
-
-    delete object;
-}
-
-// Test calling constructor 
-void tst_qmlxmlhttprequest::constructor()
-{
-    QmlComponent component(&engine, TEST_FILE("constructor.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("calledAsConstructor").toBool(), true);
-    QCOMPARE(object->property("calledAsFunction").toBool(), true);
-
-    delete object;
-}
-
-// Test that all the properties are set correctly before any request is sent
-void tst_qmlxmlhttprequest::defaultState()
-{
-    QmlComponent component(&engine, TEST_FILE("defaultState.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("readState").toInt(), 0);
-    QCOMPARE(object->property("statusIsException").toBool(), true);
-    QCOMPARE(object->property("statusTextIsException").toBool(), true);
-    QCOMPARE(object->property("responseText").toString(), QString());
-    QCOMPARE(object->property("responseXMLIsNull").toBool(), true);
-
-    delete object;
-}
-
-// Test valid XMLHttpRequest.open() calls
-void tst_qmlxmlhttprequest::open()
-{
-    // Relative url
-    {
-        QmlComponent component(&engine, TEST_FILE("open.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "testdocument.html");
-        component.completeCreate();
-
-        QCOMPARE(object->property("readyState").toBool(), true);
-        QCOMPARE(object->property("openedState").toBool(), true);
-        QCOMPARE(object->property("status").toBool(), true);
-        QCOMPARE(object->property("statusText").toBool(), true);
-        QCOMPARE(object->property("responseText").toBool(), true);
-        QCOMPARE(object->property("responseXML").toBool(), true);
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-
-    // Absolute url
-    {
-        QmlComponent component(&engine, TEST_FILE("open.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", TEST_FILE("testdocument.html").toString());
-        component.completeCreate();
-
-        QCOMPARE(object->property("readyState").toBool(), true);
-        QCOMPARE(object->property("openedState").toBool(), true);
-        QCOMPARE(object->property("status").toBool(), true);
-        QCOMPARE(object->property("statusText").toBool(), true);
-        QCOMPARE(object->property("responseText").toBool(), true);
-        QCOMPARE(object->property("responseXML").toBool(), true);
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-
-    // Absolute network url
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("open_network.expect"), 
-                            TEST_FILE("open_network.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("open.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        QCOMPARE(object->property("readyState").toBool(), true);
-        QCOMPARE(object->property("openedState").toBool(), true);
-        QCOMPARE(object->property("status").toBool(), true);
-        QCOMPARE(object->property("statusText").toBool(), true);
-        QCOMPARE(object->property("responseText").toBool(), true);
-        QCOMPARE(object->property("responseXML").toBool(), true);
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-
-    // User/pass
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("open_network.expect"), 
-                            TEST_FILE("open_network.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("open_user.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        QCOMPARE(object->property("readyState").toBool(), true);
-        QCOMPARE(object->property("openedState").toBool(), true);
-        QCOMPARE(object->property("status").toBool(), true);
-        QCOMPARE(object->property("statusText").toBool(), true);
-        QCOMPARE(object->property("responseText").toBool(), true);
-        QCOMPARE(object->property("responseXML").toBool(), true);
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        // ### Check that the username/password were sent to the server
-
-        delete object;
-    }
-}
-
-// Test that calling XMLHttpRequest.open() with an invalid method raises an exception
-void tst_qmlxmlhttprequest::open_invalid_method()
-{
-    QmlComponent component(&engine, TEST_FILE("open_invalid_method.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("exceptionThrown").toBool(), true);
-
-    delete object;
-}
-
-// Test that calling XMLHttpRequest.open() with sync raises an exception
-void tst_qmlxmlhttprequest::open_sync()
-{
-    QmlComponent component(&engine, TEST_FILE("open_sync.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("exceptionThrown").toBool(), true);
-
-    delete object;
-}
-
-// Calling with incorrect arg count raises an exception
-void tst_qmlxmlhttprequest::open_arg_count()
-{
-    {
-        QmlComponent component(&engine, TEST_FILE("open_arg_count.1.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("exceptionThrown").toBool(), true);
-
-        delete object;
-    }
-
-    {
-        QmlComponent component(&engine, TEST_FILE("open_arg_count.2.qml"));
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QCOMPARE(object->property("exceptionThrown").toBool(), true);
-
-        delete object;
-    }
-}
-
-// Test valid setRequestHeader() calls
-void tst_qmlxmlhttprequest::setRequestHeader()
-{
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
-    QVERIFY(server.wait(TEST_FILE("setRequestHeader.expect"), 
-                        TEST_FILE("setRequestHeader.reply"), 
-                        TEST_FILE("testdocument.html")));
-
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader.qml"));
-    QObject *object = component.beginCreate(engine.rootContext());
-    QVERIFY(object != 0);
-    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-    component.completeCreate();
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    delete object;
-}
-
-// Test setting headers before open() throws exception
-void tst_qmlxmlhttprequest::setRequestHeader_unsent()
-{
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader_unsent.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toBool(), true);
-
-    delete object;
-}
-
-void tst_qmlxmlhttprequest::setRequestHeader_illegalName_data()
-{
-    QTest::addColumn<QString>("name");
-
-    QTest::newRow("Accept-Charset") << "AccePT-CHArset";
-    QTest::newRow("Accept-Encoding") << "AccEpt-EnCOding";
-    QTest::newRow("Connection") << "ConnECtion";
-    QTest::newRow("Content-Length") << "ContEnt-LenGth";
-    QTest::newRow("Cookie") << "CookIe";
-    QTest::newRow("Cookie2") << "CoOkie2";
-    QTest::newRow("Content-Transfer-Encoding") << "ConteNT-tRANSFER-eNCOding";
-    QTest::newRow("Date") << "DaTE";
-    QTest::newRow("Expect") << "ExPect";
-    QTest::newRow("Host") << "HoST";
-    QTest::newRow("Keep-Alive") << "KEEP-aLive";
-    QTest::newRow("Referer") << "ReferEr";
-    QTest::newRow("TE") << "Te";
-    QTest::newRow("Trailer") << "TraILEr";
-    QTest::newRow("Transfer-Encoding") << "tRANsfer-Encoding";
-    QTest::newRow("Upgrade") << "UpgrADe";
-    QTest::newRow("User-Agent") << "uSEr-Agent";
-    QTest::newRow("Via") << "vIa";
-    QTest::newRow("Proxy-") << "ProXy-";
-    QTest::newRow("Sec-") << "SeC-";
-    QTest::newRow("Proxy-*") << "Proxy-BLAH";
-    QTest::newRow("Sec-*") << "Sec-F";
-}
-
-// Tests that using illegal header names has no effect
-void tst_qmlxmlhttprequest::setRequestHeader_illegalName()
-{
-    QFETCH(QString, name);
-
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
-    QVERIFY(server.wait(TEST_FILE("open_network.expect"), 
-                        TEST_FILE("open_network.reply"), 
-                        TEST_FILE("testdocument.html")));
-
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader_illegalName.qml"));
-    QObject *object = component.beginCreate(engine.rootContext());
-    QVERIFY(object != 0);
-    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-    object->setProperty("header", name);
-    component.completeCreate();
-
-    QCOMPARE(object->property("readyState").toBool(), true);
-    QCOMPARE(object->property("openedState").toBool(), true);
-    QCOMPARE(object->property("status").toBool(), true);
-    QCOMPARE(object->property("statusText").toBool(), true);
-    QCOMPARE(object->property("responseText").toBool(), true);
-    QCOMPARE(object->property("responseXML").toBool(), true);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    delete object;
-}
-
-// Test that attempting to set a header after a request is sent throws an exception
-void tst_qmlxmlhttprequest::setRequestHeader_sent()
-{
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
-    QVERIFY(server.wait(TEST_FILE("open_network.expect"), 
-                        TEST_FILE("open_network.reply"), 
-                        TEST_FILE("testdocument.html")));
-
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader_sent.qml"));
-    QObject *object = component.beginCreate(engine.rootContext());
-    QVERIFY(object != 0);
-    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-    component.completeCreate();
-
-    QCOMPARE(object->property("test").toBool(), true);
-    
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    delete object;
-}
-
-// Invalid arg count throws exception
-void tst_qmlxmlhttprequest::setRequestHeader_args()
-{
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader_args.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("exceptionThrown").toBool(), true);
-
-    delete object;
-}
-
-// Test that calling send() in UNSENT state throws an exception
-void tst_qmlxmlhttprequest::send_unsent()
-{
-    QmlComponent component(&engine, TEST_FILE("send_unsent.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toBool(), true);
-
-    delete object;
-}
-
-// Test attempting to resend a sent request throws an exception
-void tst_qmlxmlhttprequest::send_alreadySent()
-{
-    QmlComponent component(&engine, TEST_FILE("send_alreadySent.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toBool(), true);
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    delete object;
-}
-
-// Test that send for a GET or HEAD ignores data
-void tst_qmlxmlhttprequest::send_ignoreData()
-{
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("send_ignoreData_GET.expect"), 
-                            TEST_FILE("send_ignoreData.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("send_ignoreData.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("reqType", "GET");
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("send_ignoreData_PUT.expect"), 
-                            TEST_FILE("send_ignoreData.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("send_ignoreData.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("reqType", "HEAD");
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-}
-
-// Test that send()'ing data works
-void tst_qmlxmlhttprequest::send_withdata()
-{
-    // No content-type
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("send_data.1.expect"), 
-                            TEST_FILE("send_data.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("send_data.1.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-
-    // Correct content-type
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("send_data.1.expect"), 
-                            TEST_FILE("send_data.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("send_data.2.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-
-    // Incorrect content-type
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("send_data.1.expect"), 
-                            TEST_FILE("send_data.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("send_data.3.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-    
-    // Correct content-type - out of order
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("send_data.4.expect"), 
-                            TEST_FILE("send_data.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("send_data.4.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-
-    // Incorrect content-type - out of order
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("send_data.4.expect"), 
-                            TEST_FILE("send_data.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("send_data.5.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-
-    // PUT
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("send_data.6.expect"), 
-                            TEST_FILE("send_data.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("send_data.6.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-
-    // Correct content-type - no charset
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("send_data.1.expect"), 
-                            TEST_FILE("send_data.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("send_data.7.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        delete object;
-    }
-}
-
-// Test abort() has no effect in unsent state
-void tst_qmlxmlhttprequest::abort_unsent()
-{
-    QmlComponent component(&engine, TEST_FILE("abort_unsent.qml"));
-    QObject *object = component.beginCreate(engine.rootContext());
-    QVERIFY(object != 0);
-    object->setProperty("url", "testdocument.html");
-    component.completeCreate();
-
-    QCOMPARE(object->property("readyState").toBool(), true);
-    QCOMPARE(object->property("openedState").toBool(), true);
-    QCOMPARE(object->property("status").toBool(), true);
-    QCOMPARE(object->property("statusText").toBool(), true);
-    QCOMPARE(object->property("responseText").toBool(), true);
-    QCOMPARE(object->property("responseXML").toBool(), true);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    delete object;
-}
-
-// Test abort() cancels an open (but unsent) request
-void tst_qmlxmlhttprequest::abort_opened()
-{
-    QmlComponent component(&engine, TEST_FILE("abort_opened.qml"));
-    QObject *object = component.beginCreate(engine.rootContext());
-    QVERIFY(object != 0);
-    object->setProperty("url", "testdocument.html");
-    component.completeCreate();
-
-    QCOMPARE(object->property("readyState").toBool(), true);
-    QCOMPARE(object->property("openedState").toBool(), true);
-    QCOMPARE(object->property("status").toBool(), true);
-    QCOMPARE(object->property("statusText").toBool(), true);
-    QCOMPARE(object->property("responseText").toBool(), true);
-    QCOMPARE(object->property("responseXML").toBool(), true);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    delete object;
-}
-
-// Test abort() aborts in progress send
-void tst_qmlxmlhttprequest::abort()
-{
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
-    QVERIFY(server.wait(TEST_FILE("abort.expect"), 
-                        TEST_FILE("abort.reply"), 
-                        TEST_FILE("testdocument.html")));
-
-    QmlComponent component(&engine, TEST_FILE("abort.qml"));
-    QObject *object = component.beginCreate(engine.rootContext());
-    QVERIFY(object != 0);
-    object->setProperty("urlDummy", "http://127.0.0.1:14449/testdocument.html");
-    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-    component.completeCreate();
-
-    QCOMPARE(object->property("seenDone").toBool(), true);
-    QCOMPARE(object->property("didNotSeeUnsent").toBool(), true);
-    QCOMPARE(object->property("endStateUnsent").toBool(), true);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    delete object;
-}
-
-void tst_qmlxmlhttprequest::getResponseHeader()
-{
-    QmlEngine engine; // Avoid cookie contamination
-
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
-    QVERIFY(server.wait(TEST_FILE("getResponseHeader.expect"), 
-                        TEST_FILE("getResponseHeader.reply"), 
-                        TEST_FILE("testdocument.html")));
-
-
-    QmlComponent component(&engine, TEST_FILE("getResponseHeader.qml"));
-    QObject *object = component.beginCreate(engine.rootContext());
-    QVERIFY(object != 0);
-    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-    component.completeCreate();
-
-    QCOMPARE(object->property("unsentException").toBool(), true);
-    QCOMPARE(object->property("openedException").toBool(), true);
-    QCOMPARE(object->property("readyState").toBool(), true);
-    QCOMPARE(object->property("openedState").toBool(), true);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    QCOMPARE(object->property("headersReceivedState").toBool(), true);
-    QCOMPARE(object->property("headersReceivedNullHeader").toBool(), true);
-    QCOMPARE(object->property("headersReceivedValidHeader").toBool(), true);
-    QCOMPARE(object->property("headersReceivedMultiValidHeader").toBool(), true);
-    QCOMPARE(object->property("headersReceivedCookieHeader").toBool(), true);
-
-    QCOMPARE(object->property("doneState").toBool(), true);
-    QCOMPARE(object->property("doneNullHeader").toBool(), true);
-    QCOMPARE(object->property("doneValidHeader").toBool(), true);
-    QCOMPARE(object->property("doneMultiValidHeader").toBool(), true);
-    QCOMPARE(object->property("doneCookieHeader").toBool(), true);
-
-    delete object;
-}
-
-// Test getResponseHeader throws an exception in an invalid state
-void tst_qmlxmlhttprequest::getResponseHeader_unsent()
-{
-    QmlComponent component(&engine, TEST_FILE("getResponseHeader_unsent.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toBool(), true);
-
-    delete object;
-}
-
-// Test getResponseHeader throws an exception in an invalid state
-void tst_qmlxmlhttprequest::getResponseHeader_sent()
-{
-    QmlComponent component(&engine, TEST_FILE("getResponseHeader_sent.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toBool(), true);
-
-    delete object;
-}
-
-// Invalid arg count throws exception
-void tst_qmlxmlhttprequest::getResponseHeader_args()
-{
-    QmlComponent component(&engine, TEST_FILE("getResponseHeader_args.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    TRY_WAIT(object->property("exceptionThrown").toBool() == true);
-
-    delete object;
-}
-
-void tst_qmlxmlhttprequest::getAllResponseHeaders()
-{
-    QmlEngine engine; // Avoid cookie contamination
-
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
-    QVERIFY(server.wait(TEST_FILE("getResponseHeader.expect"), 
-                        TEST_FILE("getResponseHeader.reply"), 
-                        TEST_FILE("testdocument.html")));
-
-    QmlComponent component(&engine, TEST_FILE("getAllResponseHeaders.qml"));
-    QObject *object = component.beginCreate(engine.rootContext());
-    QVERIFY(object != 0);
-    object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-    component.completeCreate();
-
-    QCOMPARE(object->property("unsentException").toBool(), true);
-    QCOMPARE(object->property("openedException").toBool(), true);
-    QCOMPARE(object->property("readyState").toBool(), true);
-    QCOMPARE(object->property("openedState").toBool(), true);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    QCOMPARE(object->property("headersReceivedState").toBool(), true);
-    QCOMPARE(object->property("headersReceivedHeader").toBool(), true);
-
-    QCOMPARE(object->property("doneState").toBool(), true);
-    QCOMPARE(object->property("doneHeader").toBool(), true);
-
-    delete object;
-}
-
-// Test getAllResponseHeaders throws an exception in an invalid state
-void tst_qmlxmlhttprequest::getAllResponseHeaders_unsent()
-{
-    QmlComponent component(&engine, TEST_FILE("getAllResponseHeaders_unsent.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toBool(), true);
-
-    delete object;
-}
-
-// Test getAllResponseHeaders throws an exception in an invalid state
-void tst_qmlxmlhttprequest::getAllResponseHeaders_sent()
-{
-    QmlComponent component(&engine, TEST_FILE("getAllResponseHeaders_sent.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("test").toBool(), true);
-
-    delete object;
-}
-
-// Invalid arg count throws exception
-void tst_qmlxmlhttprequest::getAllResponseHeaders_args()
-{
-    QmlComponent component(&engine, TEST_FILE("getAllResponseHeaders_args.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    TRY_WAIT(object->property("exceptionThrown").toBool() == true);
-
-    delete object;
-}
-
-void tst_qmlxmlhttprequest::status()
-{
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("status.expect"), 
-                            TEST_FILE("status.200.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("status.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        object->setProperty("expectedStatus", 200);
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        QCOMPARE(object->property("unsentException").toBool(), true);
-        QCOMPARE(object->property("openedException").toBool(), true);
-        QCOMPARE(object->property("sentException").toBool(), true);
-        QCOMPARE(object->property("headersReceived").toBool(), true);
-        QCOMPARE(object->property("loading").toBool(), true);
-        QCOMPARE(object->property("done").toBool(), true);
-        QCOMPARE(object->property("resetException").toBool(), true);
-
-        delete object;
-    }
-
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("status.expect"), 
-                            TEST_FILE("status.404.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("status.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        object->setProperty("expectedStatus", 404);
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        QCOMPARE(object->property("unsentException").toBool(), true);
-        QCOMPARE(object->property("openedException").toBool(), true);
-        QCOMPARE(object->property("sentException").toBool(), true);
-        QCOMPARE(object->property("headersReceived").toBool(), true);
-        QCOMPARE(object->property("loading").toBool(), true);
-        QCOMPARE(object->property("done").toBool(), true);
-        QCOMPARE(object->property("resetException").toBool(), true);
-
-        delete object;
-    }
-}
-
-void tst_qmlxmlhttprequest::statusText()
-{
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("status.expect"), 
-                            TEST_FILE("status.200.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("statusText.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        object->setProperty("expectedStatus", "OK");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        QCOMPARE(object->property("unsentException").toBool(), true);
-        QCOMPARE(object->property("openedException").toBool(), true);
-        QCOMPARE(object->property("sentException").toBool(), true);
-        QCOMPARE(object->property("headersReceived").toBool(), true);
-        QCOMPARE(object->property("loading").toBool(), true);
-        QCOMPARE(object->property("done").toBool(), true);
-        QCOMPARE(object->property("resetException").toBool(), true);
-
-        delete object;
-    }
-
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("status.expect"), 
-                            TEST_FILE("status.404.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("statusText.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        object->setProperty("expectedStatus", "Document not found");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        QCOMPARE(object->property("unsentException").toBool(), true);
-        QCOMPARE(object->property("openedException").toBool(), true);
-        QCOMPARE(object->property("sentException").toBool(), true);
-        QCOMPARE(object->property("headersReceived").toBool(), true);
-        QCOMPARE(object->property("loading").toBool(), true);
-        QCOMPARE(object->property("done").toBool(), true);
-        QCOMPARE(object->property("resetException").toBool(), true);
-
-        delete object;
-    }
-}
-
-void tst_qmlxmlhttprequest::responseText()
-{
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("status.expect"), 
-                            TEST_FILE("status.200.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("responseText.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        object->setProperty("expectedText", "QML Rocks!\n");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        QCOMPARE(object->property("unsent").toBool(), true);
-        QCOMPARE(object->property("opened").toBool(), true);
-        QCOMPARE(object->property("sent").toBool(), true);
-        QCOMPARE(object->property("headersReceived").toBool(), true);
-        QCOMPARE(object->property("loading").toBool(), true);
-        QCOMPARE(object->property("done").toBool(), true);
-        QCOMPARE(object->property("reset").toBool(), true);
-
-        delete object;
-    }
-
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("status.expect"), 
-                            TEST_FILE("status.200.reply"), 
-                            QUrl()));
-
-        QmlComponent component(&engine, TEST_FILE("responseText.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        object->setProperty("expectedText", "");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        QCOMPARE(object->property("unsent").toBool(), true);
-        QCOMPARE(object->property("opened").toBool(), true);
-        QCOMPARE(object->property("sent").toBool(), true);
-        QCOMPARE(object->property("headersReceived").toBool(), true);
-        QCOMPARE(object->property("loading").toBool(), true);
-        QCOMPARE(object->property("done").toBool(), true);
-        QCOMPARE(object->property("reset").toBool(), true);
-
-        delete object;
-    }
-
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        QVERIFY(server.wait(TEST_FILE("status.expect"), 
-                            TEST_FILE("status.404.reply"), 
-                            TEST_FILE("testdocument.html")));
-
-        QmlComponent component(&engine, TEST_FILE("responseText.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
-        object->setProperty("expectedText", "");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("dataOK").toBool() == true);
-
-        QCOMPARE(object->property("unsent").toBool(), true);
-        QCOMPARE(object->property("opened").toBool(), true);
-        QCOMPARE(object->property("sent").toBool(), true);
-        QCOMPARE(object->property("headersReceived").toBool(), true);
-        QCOMPARE(object->property("loading").toBool(), true);
-        QCOMPARE(object->property("done").toBool(), true);
-        QCOMPARE(object->property("reset").toBool(), true);
-
-        delete object;
-    }
-}
-
-// Test that calling hte XMLHttpRequest methods on a non-XMLHttpRequest object
-// throws an exception
-void tst_qmlxmlhttprequest::invalidMethodUsage()
-{
-    QmlComponent component(&engine, TEST_FILE("invalidMethodUsage.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    QCOMPARE(object->property("onreadystatechange").toBool(), true);
-    QCOMPARE(object->property("readyState").toBool(), true);
-    QCOMPARE(object->property("status").toBool(), true);
-    QCOMPARE(object->property("statusText").toBool(), true);
-    QCOMPARE(object->property("responseText").toBool(), true);
-    QCOMPARE(object->property("responseXML").toBool(), true);
-
-    QCOMPARE(object->property("open").toBool(), true);
-    QCOMPARE(object->property("setRequestHeader").toBool(), true);
-    QCOMPARE(object->property("send").toBool(), true);
-    QCOMPARE(object->property("abort").toBool(), true);
-    QCOMPARE(object->property("getResponseHeader").toBool(), true);
-    QCOMPARE(object->property("getAllResponseHeaders").toBool(), true);
-
-    delete object;
-}
-
-// Test that XMLHttpRequest transparently redirects
-void tst_qmlxmlhttprequest::redirects()
-{
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirecttarget.html");
-        server.serveDirectory("data");
-
-        QmlComponent component(&engine, TEST_FILE("redirects.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/redirect.html");
-        object->setProperty("expectedText", "");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("done").toBool() == true);
-        QCOMPARE(object->property("dataOK").toBool(), true);
-
-        delete object;
-    }
-
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirectmissing.html");
-        server.serveDirectory("data");
-
-        QmlComponent component(&engine, TEST_FILE("redirectError.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/redirect.html");
-        object->setProperty("expectedText", "");
-        component.completeCreate();
-
-        TRY_WAIT(object->property("done").toBool() == true);
-        QCOMPARE(object->property("dataOK").toBool(), true);
-
-        delete object;
-    }
-
-    {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
-        server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirect.html");
-        server.serveDirectory("data");
-
-        QmlComponent component(&engine, TEST_FILE("redirectRecur.qml"));
-        QObject *object = component.beginCreate(engine.rootContext());
-        QVERIFY(object != 0);
-        object->setProperty("url", "http://127.0.0.1:14445/redirect.html");
-        object->setProperty("expectedText", "");
-        component.completeCreate();
-
-        for (int ii = 0; ii < 60; ++ii) { 
-            if (object->property("done").toBool()) break; 
-            QTest::qWait(50); 
-        } 
-        QVERIFY(object->property("done").toBool() == true);
-
-        QCOMPARE(object->property("dataOK").toBool(), true);
-
-        delete object;
-    }
-}
-
-void tst_qmlxmlhttprequest::responseXML_invalid()
-{
-    QmlComponent component(&engine, TEST_FILE("responseXML_invalid.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    QCOMPARE(object->property("xmlNull").toBool(), true);
-
-    delete object;
-}
-
-// Test the Document DOM element
-void tst_qmlxmlhttprequest::document()
-{
-    QmlComponent component(&engine, TEST_FILE("document.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    QCOMPARE(object->property("xmlTest").toBool(), true);
-
-    delete object;
-}
-
-// Test the Element DOM element
-void tst_qmlxmlhttprequest::element()
-{
-    QmlComponent component(&engine, TEST_FILE("element.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    QCOMPARE(object->property("xmlTest").toBool(), true);
-
-    delete object;
-}
-
-// Test the Attr DOM element
-void tst_qmlxmlhttprequest::attr()
-{
-    QmlComponent component(&engine, TEST_FILE("attr.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    QCOMPARE(object->property("xmlTest").toBool(), true);
-
-    delete object;
-}
-
-// Test the Text DOM element
-void tst_qmlxmlhttprequest::text()
-{
-    QmlComponent component(&engine, TEST_FILE("text.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    QCOMPARE(object->property("xmlTest").toBool(), true);
-
-    delete object;
-}
-
-// Test the CDataSection DOM element
-void tst_qmlxmlhttprequest::cdata()
-{
-    QmlComponent component(&engine, TEST_FILE("cdata.qml"));
-    QObject *object = component.create();
-    QVERIFY(object != 0);
-
-    TRY_WAIT(object->property("dataOK").toBool() == true);
-
-    QCOMPARE(object->property("xmlTest").toBool(), true);
-
-    delete object;
-}
-
-QTEST_MAIN(tst_qmlxmlhttprequest)
-
-#include "tst_qmlxmlhttprequest.moc"
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/model.qml b/tests/auto/declarative/qmlxmllistmodel/data/model.qml
deleted file mode 100644
index 2cbb027..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/data/model.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-XmlListModel {
-    source: "model.xml"
-    query: "/Pets/Pet"
-    XmlRole { name: "name"; query: "name/string()" }
-    XmlRole { name: "type"; query: "type/string()" }
-    XmlRole { name: "age"; query: "age/number()" }
-    XmlRole { name: "size"; query: "size/string()" }
-}
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/model.xml b/tests/auto/declarative/qmlxmllistmodel/data/model.xml
deleted file mode 100644
index 40cd6d0..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/data/model.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Pets>
-    <Pet>
-        <name>Polly</name>
-        <type>Parrot</type>
-        <age>12</age>
-        <size>Small</size>
-    </Pet>
-    <Pet>
-        <name>Penny</name>
-        <type>Turtle</type>
-        <age>4</age>
-        <size>Small</size>
-    </Pet>
-    <Pet>
-        <name>Warren</name>
-        <type>Rabbit</type>
-        <age>2</age>
-        <size>Small</size>
-    </Pet>
-    <Pet>
-        <name>Spot</name>
-        <type>Dog</type>
-        <age>9</age>
-        <size>Medium</size>
-    </Pet>
-    <Pet>
-        <name>Whiskers</name>
-        <type>Cat</type>
-        <age>2</age>
-        <size>Medium</size>
-    </Pet>
-    <Pet>
-        <name>Joey</name>
-        <type>Kangaroo</type>
-        <age>1</age>
-    </Pet>
-    <Pet>
-        <name>Kimba</name>
-        <type>Bunny</type>
-        <age>65</age>
-        <size>Large</size>
-    </Pet>
-    <Pet>
-        <name>Rover</name>
-        <type>Dog</type>
-        <size>Large</size>
-    </Pet>
-    <Pet>
-        <name>Tiny</name>
-        <type>Elephant</type>
-        <age>15</age>
-        <size>Large</size>
-    </Pet>
-</Pets>
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/model2.qml b/tests/auto/declarative/qmlxmllistmodel/data/model2.qml
deleted file mode 100644
index 140e0ad..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/data/model2.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-XmlListModel {
-    source: "model.xml"
-    query: "/Pets/Pet"
-    XmlRole { name: "name"; query: "name/string()" }
-    XmlRole { name: "type"; query: "type/string()" }
-    XmlRole { name: "age"; query: "age/number()" }
-    XmlRole { name: "size"; query: "size/string()" }
-    XmlRole { name: "tricks"; query: "tricks/string()" }
-}
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/recipes.qml b/tests/auto/declarative/qmlxmllistmodel/data/recipes.qml
deleted file mode 100644
index 13dea91..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/data/recipes.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-XmlListModel {
-    source: "recipes.xml"
-    query: "/recipes/recipe"
-    XmlRole { name: "title"; query: "@title/string()" }
-    XmlRole { name: "picture"; query: "picture/string()" }
-    XmlRole { name: "ingredients"; query: "ingredients/string()" }
-    XmlRole { name: "preparation"; query: "method/string()" }
-}
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/recipes.xml b/tests/auto/declarative/qmlxmllistmodel/data/recipes.xml
deleted file mode 100644
index d71de60..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/data/recipes.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<recipes>
-    <recipe title="Pancakes">
-        <picture>content/pics/pancakes.jpg</picture>
-        <ingredients><![CDATA[<html>
-                       <ul>
-                        <li> 1 cup (150g) self-raising flour
-                        <li> 1 tbs caster sugar
-                        <li> 3/4 cup (185ml) milk
-                        <li> 1 egg
-                       </ul>
-                      </html>
-        ]]></ingredients>
-        <method><![CDATA[<html>
-                  <ol>
-                   <li> Sift flour and sugar together into a bowl. Add a pinch of salt.
-                   <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth.
-                   <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface.
-                   <li> Turn over and cook other side until golden.
-                  </ol>
-                 </html>
-        ]]></method>
-    </recipe>
-    <recipe title="Fruit Salad">
-        <picture>content/pics/fruit-salad.jpg</picture>
-        <ingredients><![CDATA[* Seasonal Fruit]]></ingredients>
-        <method><![CDATA[* Chop fruit and place in a bowl.]]></method>
-    </recipe>
-    <recipe title="Vegetable Soup">
-        <picture>content/pics/vegetable-soup.jpg</picture>
-        <ingredients><![CDATA[<html>
-                       <ul>
-                        <li> 1 onion
-                        <li> 1 turnip
-                        <li> 1 potato
-                        <li> 1 carrot
-                        <li> 1 head of celery
-                        <li> 1 1/2 litres of water
-                       </ul>
-                      </html>
-        ]]></ingredients>
-        <method><![CDATA[<html>
-                  <ol>
-                   <li> Chop vegetables.
-                   <li> Boil in water until vegetables soften.
-                   <li> Season with salt and pepper to taste.
-                  </ol>
-                 </html>
-        ]]></method>
-    </recipe>
-    <recipe title="Hamburger">
-        <picture>content/pics/hamburger.jpg</picture>
-        <ingredients><![CDATA[<html>
-                       <ul>
-                        <li> 500g minced beef
-                        <li> Seasoning
-                        <li> lettuce, tomato, onion, cheese
-                        <li> 1 hamburger bun for each burger
-                       </ul>
-                      </html>
-        ]]></ingredients>
-        <method><![CDATA[<html>
-                  <ol>
-                   <li> Mix the beef, together with seasoning, in a food processor.
-                   <li> Shape the beef into burgers.
-                   <li> Grill the burgers for about 5 mins on each side (until cooked through)
-                   <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion.
-                  </ol>
-                 </html>
-        ]]></method>
-    </recipe>
-    <recipe title="Lemonade">
-        <picture>content/pics/lemonade.jpg</picture>
-        <ingredients><![CDATA[<html>
-                       <ul>
-                        <li> 1 cup Lemon Juice
-                        <li> 1 cup Sugar
-                        <li> 6 Cups of Water (2 cups warm water, 4 cups cold water)
-                       </ul>
-                      </html>
-        ]]></ingredients>
-        <method><![CDATA[<html>
-                  <ol>
-                   <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves.
-                   <li> Pour in lemon juice, stir again, and add 4 cups of cold water.
-                   <li> Chill or serve over ice cubes.
-                  </ol>
-                 </html>
-        ]]></method>
-    </recipe>
-</recipes>
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/roleErrors.qml b/tests/auto/declarative/qmlxmllistmodel/data/roleErrors.qml
deleted file mode 100644
index 26c533f..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/data/roleErrors.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-XmlListModel {
-    source: "model.xml"
-    query: "/Pets/Pet"
-    XmlRole { name: "name"; query: "/name/string()" }   //starts with '/'
-    XmlRole { name: "type"; query: "type" }             //no type
-    XmlRole { name: "age"; query: "age/" }              //ends with '/'
-    XmlRole { name: "size"; query: "size/number()" }    //wrong type
-}
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml b/tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml
deleted file mode 100644
index b90e57e..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.6
-
-XmlListModel {
-    query: "/data/item"
-    XmlRole { id: nameRole; name: "name"; query: "name/string()"; isKey: true }
-    XmlRole { name: "age"; query: "age/number()"; isKey: true }
-    XmlRole { name: "sport"; query: "sport/string()" }
-
-    function disableNameKey() {
-        nameRole.isKey = false;
-    }
-}
-
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/unique.qml b/tests/auto/declarative/qmlxmllistmodel/data/unique.qml
deleted file mode 100644
index ed0f293..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/data/unique.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-XmlListModel {
-    source: "model.xml"
-    query: "/Pets/Pet"
-    XmlRole { name: "name"; query: "name/string()" }
-    XmlRole { name: "name"; query: "type/string()" }
-}
diff --git a/tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro b/tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro
deleted file mode 100644
index 8e58a32..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-contains(QT_CONFIG,xmlpatterns) {
-    QT += xmlpatterns
-    DEFINES += QTEST_XMLPATTERNS
-}
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlxmllistmodel.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp b/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp
deleted file mode 100644
index 477b661..0000000
--- a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp
+++ /dev/null
@@ -1,457 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtTest/qsignalspy.h>
-#include <QtCore/qtimer.h>
-
-#ifdef QTEST_XMLPATTERNS
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlxmllistmodel_p.h>
-#include "../../../shared/util.h"
-
-typedef QPair<int, int> QmlXmlListRange;
-typedef QList<QVariantList> QmlXmlModelData;
-
-Q_DECLARE_METATYPE(QList<QmlXmlListRange>)
-Q_DECLARE_METATYPE(QmlXmlModelData)
-
-class tst_qmlxmllistmodel : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qmlxmllistmodel() {}
-
-private slots:
-    void buildModel();
-    void missingFields();
-    void cdata();
-    void attributes();
-    void roles();
-    void roleErrors();
-    void uniqueRoleNames();
-    void useKeys();
-    void useKeys_data();
-    void noKeysValueChanges();
-    void keysChanged();
-
-private:
-    QString makeItemXmlAndData(const QString &data, QmlXmlModelData *modelData = 0) const
-    {
-        if (modelData)
-            modelData->clear();
-        QString xml;
-
-        if (!data.isEmpty()) {
-            QStringList items = data.split(";");
-            foreach(const QString &item, items) {
-                QVariantList variants;
-                xml += QLatin1String("<item>");
-                QStringList fields = item.split(",");
-                foreach(const QString &field, fields) {
-                    QStringList values = field.split("=");
-                    Q_ASSERT(values.count() == 2);
-                    xml += QString("<%1>%2</%1>").arg(values[0], values[1]);
-                    if (!modelData)
-                        continue;
-                    bool isNum = false;
-                    int number = values[1].toInt(&isNum);
-                    if (isNum)
-                        variants << number;
-                    else
-                        variants << values[1];
-                }
-                xml += QLatin1String("</item>");
-                if (modelData)
-                    modelData->append(variants);
-            }
-        }
-
-        QString decl = "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>";
-        return decl + QLatin1String("<data>") + xml + QLatin1String("</data>");
-    }
-
-    QmlEngine engine;
-};
-
-void tst_qmlxmllistmodel::buildModel()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(listModel != 0);
-    QTRY_COMPARE(listModel->count(), 9);
-
-    QList<int> roles;
-    roles << Qt::UserRole << Qt::UserRole + 1 << Qt::UserRole + 2 << Qt::UserRole + 3;
-    QHash<int, QVariant> data = listModel->data(3, roles);
-    QVERIFY(data.count() == 4);
-    QCOMPARE(data.value(Qt::UserRole).toString(), QLatin1String("Spot"));
-    QCOMPARE(data.value(Qt::UserRole+1).toString(), QLatin1String("Dog"));
-    QCOMPARE(data.value(Qt::UserRole+2).toInt(), 9);
-    QCOMPARE(data.value(Qt::UserRole+3).toString(), QLatin1String("Medium"));
-
-    delete listModel;
-}
-
-void tst_qmlxmllistmodel::missingFields()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model2.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(listModel != 0);
-    QTRY_COMPARE(listModel->count(), 9);
-
-    QList<int> roles;
-    roles << Qt::UserRole << Qt::UserRole + 1 << Qt::UserRole + 2 << Qt::UserRole + 3 << Qt::UserRole + 4;
-    QHash<int, QVariant> data = listModel->data(5, roles);
-    QVERIFY(data.count() == 5);
-    QCOMPARE(data.value(Qt::UserRole+3).toString(), QLatin1String(""));
-    QCOMPARE(data.value(Qt::UserRole+4).toString(), QLatin1String(""));
-
-    data = listModel->data(7, roles);
-    QVERIFY(data.count() == 5);
-    QCOMPARE(data.value(Qt::UserRole+2).toString(), QLatin1String(""));
-
-    delete listModel;
-}
-
-void tst_qmlxmllistmodel::cdata()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(listModel != 0);
-    QTRY_COMPARE(listModel->count(), 5);
-
-    QList<int> roles;
-    roles << Qt::UserRole + 2;
-    QHash<int, QVariant> data = listModel->data(2, roles);
-    QVERIFY(data.count() == 1);
-    QVERIFY(data.value(Qt::UserRole+2).toString().startsWith(QLatin1String("<html>")));
-
-    delete listModel;
-}
-
-void tst_qmlxmllistmodel::attributes()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(listModel != 0);
-    QTRY_COMPARE(listModel->count(), 5);
-
-    QList<int> roles;
-    roles << Qt::UserRole;
-    QHash<int, QVariant> data = listModel->data(2, roles);
-    QVERIFY(data.count() == 1);
-    QCOMPARE(data.value(Qt::UserRole).toString(), QLatin1String("Vegetable Soup"));
-
-    delete listModel;
-}
-
-void tst_qmlxmllistmodel::roles()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(listModel != 0);
-    QTRY_COMPARE(listModel->count(), 9);
-
-    QList<int> roles = listModel->roles();
-    QCOMPARE(roles.count(), 4);
-    QCOMPARE(listModel->toString(roles.at(0)), QLatin1String("name"));
-    QCOMPARE(listModel->toString(roles.at(1)), QLatin1String("type"));
-    QCOMPARE(listModel->toString(roles.at(2)), QLatin1String("age"));
-    QCOMPARE(listModel->toString(roles.at(3)), QLatin1String("size"));
-
-    delete listModel;
-}
-
-void tst_qmlxmllistmodel::roleErrors()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml"));
-    QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml").toString() + ":6:5) An XmlRole query must not start with '/'").toUtf8().constData());
-    //### make sure we receive all expected warning messages.
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(listModel != 0);
-    QTRY_COMPARE(listModel->count(), 9);
-
-    QList<int> roles;
-    roles << Qt::UserRole << Qt::UserRole + 1 << Qt::UserRole + 2 << Qt::UserRole + 3;
-    QHash<int, QVariant> data = listModel->data(3, roles);
-    QVERIFY(data.count() == 4);
-
-    //### should any of these return valid values?
-    QCOMPARE(data.value(Qt::UserRole), QVariant());
-    QCOMPARE(data.value(Qt::UserRole+1), QVariant());
-    QCOMPARE(data.value(Qt::UserRole+2), QVariant());
-
-    QEXPECT_FAIL("", "QT-2456", Continue);
-    QCOMPARE(data.value(Qt::UserRole+3), QVariant());
-
-    delete listModel;
-}
-
-void tst_qmlxmllistmodel::uniqueRoleNames()
-{
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/unique.qml"));
-    QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/unique.qml").toString() + ":7:5) \"name\" duplicates a previous role name and will be disabled.").toUtf8().constData());
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(listModel != 0);
-    QTRY_COMPARE(listModel->count(), 9);
-
-    QList<int> roles = listModel->roles();
-    QCOMPARE(roles.count(), 1);
-
-    delete listModel;
-}
-
-void tst_qmlxmllistmodel::useKeys()
-{
-    // If using incremental updates through keys, the model should only
-    // insert & remove some of the items, instead of throwing everything
-    // away and causing the view to repaint the whole view.
-
-    QFETCH(QString, oldXml);
-    QFETCH(int, oldCount);
-    QFETCH(QString, newXml);
-    QFETCH(QmlXmlModelData, newData);
-    QFETCH(QList<QmlXmlListRange>, insertRanges);
-    QFETCH(QList<QmlXmlListRange>, removeRanges);
-
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
-    QmlXmlListModel *model = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(model != 0);
-    
-    model->setXml(oldXml);
-    QTRY_COMPARE(model->count(), oldCount);
-
-    QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int)));
-    QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
-    QSignalSpy spyCount(model, SIGNAL(countChanged()));
-
-    model->setXml(newXml);
-
-    if (oldCount != newData.count()) {
-        QTRY_COMPARE(model->count(), newData.count());
-        QCOMPARE(spyCount.count(), 1);
-    } else {
-        QTRY_VERIFY(spyInsert.count() > 0 || spyRemove.count() > 0);
-        QCOMPARE(spyCount.count(), 0);
-    }
-
-    QList<int> roles = model->roles();
-    for (int i=0; i<model->count(); i++) {
-        for (int j=0; j<roles.count(); j++)
-            QCOMPARE(model->data(i, roles[j]), newData[i][j]);
-    }
-
-    QCOMPARE(spyInsert.count(), insertRanges.count());
-    for (int i=0; i<spyInsert.count(); i++) {
-        QCOMPARE(spyInsert[i][0].toInt(), insertRanges[i].first);
-        QCOMPARE(spyInsert[i][1].toInt(), insertRanges[i].second);
-    }
-
-    QCOMPARE(spyRemove.count(), removeRanges.count());
-    for (int i=0; i<spyRemove.count(); i++) {
-        QCOMPARE(spyRemove[i][0].toInt(), removeRanges[i].first);
-        QCOMPARE(spyRemove[i][1].toInt(), removeRanges[i].second);
-    }
-}
-
-void tst_qmlxmllistmodel::useKeys_data()
-{
-    QTest::addColumn<QString>("oldXml");
-    QTest::addColumn<int>("oldCount");
-    QTest::addColumn<QString>("newXml");
-    QTest::addColumn<QmlXmlModelData>("newData");
-    QTest::addColumn<QList<QmlXmlListRange> >("insertRanges");
-    QTest::addColumn<QList<QmlXmlListRange> >("removeRanges");
-
-    QmlXmlModelData modelData;
-
-    QTest::newRow("append 1")
-        << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics", &modelData)
-        << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(1, 1))
-        << QList<QmlXmlListRange>();
-
-    QTest::newRow("append multiple")
-        << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling", &modelData)
-        << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(1, 2))
-        << QList<QmlXmlListRange>();
-
-    QTest::newRow("insert in different spots")
-        << makeItemXmlAndData("name=B,age=35,sport=Athletics") << 1
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf", &modelData)
-        << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2))
-        << QList<QmlXmlListRange>();
-
-    QTest::newRow("insert in middle")
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=D,age=55,sport=Golf") << 2
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf", &modelData)
-        << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(1, 2))
-        << QList<QmlXmlListRange>();
-
-    QTest::newRow("remove first")
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics") << 2
-        << makeItemXmlAndData("name=B,age=35,sport=Athletics", &modelData)
-        << modelData
-        << QList<QmlXmlListRange>()
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1));
-
-    QTest::newRow("remove last")
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics") << 2
-        << makeItemXmlAndData("name=A,age=25,sport=Football", &modelData)
-        << modelData
-        << QList<QmlXmlListRange>()
-        << (QList<QmlXmlListRange>() << qMakePair(1, 1));
-
-    QTest::newRow("remove from multiple spots")
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf;name=E,age=65,sport=Fencing") << 5
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=C,age=45,sport=Curling", &modelData)
-        << modelData
-        << QList<QmlXmlListRange>()
-        << (QList<QmlXmlListRange>() << qMakePair(1, 1) << qMakePair(3,2));
-
-    QTest::newRow("remove all")
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling") << 3
-        << makeItemXmlAndData("", &modelData)
-        << modelData
-        << QList<QmlXmlListRange>()
-        << (QList<QmlXmlListRange>() << qMakePair(0, 3));
-
-    QTest::newRow("replace item")
-        << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
-        << makeItemXmlAndData("name=ZZZ,age=25,sport=Football", &modelData)
-        << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1))
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1));
-
-    QTest::newRow("add and remove simultaneously")
-        << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf") << 4
-        << makeItemXmlAndData("name=B,age=35,sport=Athletics;name=E,age=65,sport=Fencing", &modelData)
-        << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(1, 1))
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2));
-}
-
-void tst_qmlxmllistmodel::noKeysValueChanges()
-{
-    // The 'key' roles are 'name' and 'age', as defined in roleKeys.qml.
-    // If a 'sport' value is changed, the model should not be reloaded,
-    // since 'sport' is not marked as a key.
-
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
-    QmlXmlListModel *model = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(model != 0);
-    
-    QString xml;
-    
-    xml = makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics");
-    model->setXml(xml);
-    QTRY_COMPARE(model->count(), 2);
-
-    QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int)));
-    QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
-    QSignalSpy spyCount(model, SIGNAL(countChanged()));
-
-    xml = makeItemXmlAndData("name=A,age=25,sport=AussieRules;name=B,age=35,sport=Athletics");
-    model->setXml(xml);
-
-    // wait for the new xml data to be set, and verify no signals were emitted
-    for (int i=0; i<50; i++) {
-        QTest::qWait(100);
-        if (model->data(0, model->roles()[2]).toString() != QLatin1String("AussieRules"))
-            break;
-    }
-    QCOMPARE(model->data(0, model->roles()[2]).toString(), QLatin1String("AussieRules"));
-
-    QVERIFY(spyInsert.count() == 0);
-    QVERIFY(spyRemove.count() == 0);
-    QVERIFY(spyCount.count() == 0);
-    
-    QCOMPARE(model->count(), 2);
-}
-
-void tst_qmlxmllistmodel::keysChanged()
-{
-    // If the key roles change, the next time the data is reloaded, it should
-    // delete all its data and build a clean model (i.e. same behaviour as
-    // if no keys are set).
-
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
-    QmlXmlListModel *model = qobject_cast<QmlXmlListModel*>(component.create());
-    QVERIFY(model != 0);
-
-    QString xml = makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics");
-    model->setXml(xml);
-    QTRY_COMPARE(model->count(), 2);
-
-    QSignalSpy spyInsert(model, SIGNAL(itemsInserted(int,int)));
-    QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
-    QSignalSpy spyCount(model, SIGNAL(countChanged()));
-
-    QVERIFY(QMetaObject::invokeMethod(model, "disableNameKey"));
-    model->setXml(xml);
-
-    QTRY_VERIFY(spyInsert.count() > 0 && spyRemove.count() > 0);
-
-    QCOMPARE(spyInsert.count(), 1);
-    QCOMPARE(spyInsert[0][0].toInt(), 0);
-    QCOMPARE(spyInsert[0][1].toInt(), 2);
-
-    QCOMPARE(spyRemove.count(), 1);
-    QCOMPARE(spyRemove[0][0].toInt(), 0);
-    QCOMPARE(spyRemove[0][1].toInt(), 2);
-
-    QCOMPARE(spyCount.count(), 0);
-}
-
-QTEST_MAIN(tst_qmlxmllistmodel)
-
-#include "tst_qmlxmllistmodel.moc"
-
-#else
-QTEST_NOOP_MAIN
-#endif
diff --git a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
index 45947e3..2621d65 100644
--- a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -117,7 +117,7 @@ void tst_QPacketProtocol::setMaximumPacketSize()
         QByteArray b;
         b.fill('a', size + 1);
         out.send() << b.constData();
-        QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(invalidPacket())));
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(invalidPacket())));
     }
 }
 
@@ -149,7 +149,7 @@ void tst_QPacketProtocol::send()
         out.send(packet);
     }
 
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
     QPacket p = in.read();
     p >> ba >> num;
@@ -178,7 +178,7 @@ void tst_QPacketProtocol::packetsAvailable()
     for (int i=0; i<packetCount; i++)
         out.send() << "Hello";
 
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
     QCOMPARE(in.packetsAvailable(), qint64(packetCount));
 }
 
@@ -198,7 +198,7 @@ void tst_QPacketProtocol::clear()
 
     out.send() << 123;
     out.send() << 456;
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
     in.clear();
     QVERIFY(in.read().isEmpty());
@@ -213,7 +213,7 @@ void tst_QPacketProtocol::read()
 
     out.send() << 123;
     out.send() << 456;
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
     int num;
 
@@ -253,7 +253,7 @@ void tst_QPacketProtocol::tst_QPacket_clear()
     QByteArray ba;
     int num;
     QPacketProtocol in(m_serverConn);
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
     QPacket p1 = in.read();
     p1 >> ba >> num;
diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/shared/debugutil.cpp
index 864bb63..c12df4f 100644
--- a/tests/auto/declarative/shared/debugutil.cpp
+++ b/tests/auto/declarative/shared/debugutil.cpp
@@ -42,14 +42,14 @@
 #include <QEventLoop>
 #include <QTimer>
 
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
 
 #include "debugutil_p.h"
 
 #include <iostream>
 
-bool QmlDebugTest::waitForSignal(QObject *receiver, const char *member, int timeout) {
+bool QDeclarativeDebugTest::waitForSignal(QObject *receiver, const char *member, int timeout) {
     QEventLoop loop;
     QTimer timer;
     QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
@@ -60,17 +60,17 @@ bool QmlDebugTest::waitForSignal(QObject *receiver, const char *member, int time
 }
 
 
-QmlDebugTestData::QmlDebugTestData(QEventLoop *el)
+QDeclarativeDebugTestData::QDeclarativeDebugTestData(QEventLoop *el)
     : exitCode(-1), loop(el)
 {
 }
 
-QmlDebugTestData::~QmlDebugTestData()
+QDeclarativeDebugTestData::~QDeclarativeDebugTestData()
 {
     qDeleteAll(items);
 }
 
-void QmlDebugTestData::testsFinished(int code)
+void QDeclarativeDebugTestData::testsFinished(int code)
 {
     exitCode = code;
     loop->quit();
@@ -78,32 +78,32 @@ void QmlDebugTestData::testsFinished(int code)
 
 
 
-QmlDebugTestService::QmlDebugTestService(const QString &s, QObject *parent)
-    : QmlDebugService(s, parent), enabled(false)
+QDeclarativeDebugTestService::QDeclarativeDebugTestService(const QString &s, QObject *parent)
+    : QDeclarativeDebugService(s, parent), enabled(false)
 {
 }
 
-void QmlDebugTestService::messageReceived(const QByteArray &ba)
+void QDeclarativeDebugTestService::messageReceived(const QByteArray &ba)
 {
     sendMessage(ba);
 }
 
-void QmlDebugTestService::enabledChanged(bool e)
+void QDeclarativeDebugTestService::enabledChanged(bool e)
 {
     enabled = e;
     emit enabledStateChanged();
 }
 
 
-QmlDebugTestClient::QmlDebugTestClient(const QString &s, QmlDebugConnection *c)
-    : QmlDebugClient(s, c)
+QDeclarativeDebugTestClient::QDeclarativeDebugTestClient(const QString &s, QDeclarativeDebugConnection *c)
+    : QDeclarativeDebugClient(s, c)
 {
 }
 
-QByteArray QmlDebugTestClient::waitForResponse()
+QByteArray QDeclarativeDebugTestClient::waitForResponse()
 {
     lastMsg.clear();
-    QmlDebugTest::waitForSignal(this, SIGNAL(serverMessage(QByteArray)));
+    QDeclarativeDebugTest::waitForSignal(this, SIGNAL(serverMessage(QByteArray)));
     if (lastMsg.isEmpty()) {
         qWarning() << "tst_QmlDebugClient: no response from server!";
         return QByteArray();
@@ -111,14 +111,14 @@ QByteArray QmlDebugTestClient::waitForResponse()
     return lastMsg;
 }
 
-void QmlDebugTestClient::messageReceived(const QByteArray &ba)
+void QDeclarativeDebugTestClient::messageReceived(const QByteArray &ba)
 {
     lastMsg = ba;
     emit serverMessage(ba);
 }
 
 
-tst_QmlDebug_Thread::tst_QmlDebug_Thread(QmlDebugTestData *data, QmlTestFactory *factory)
+tst_QmlDebug_Thread::tst_QmlDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory)
     : m_data(data), m_factory(factory)
 {
 }
@@ -127,7 +127,7 @@ void tst_QmlDebug_Thread::run()
 {
     bool ok = false;
 
-    QmlDebugConnection conn;
+    QDeclarativeDebugConnection conn;
     conn.connectToHost("127.0.0.1", 3768);
     ok = conn.waitForConnected();
     Q_ASSERT(ok);
@@ -146,25 +146,25 @@ void tst_QmlDebug_Thread::run()
     emit testsFinished(code);
 }
 
-int QmlDebugTest::runTests(QmlTestFactory *factory, const QList<QByteArray> &qml)
+int QDeclarativeDebugTest::runTests(QDeclarativeTestFactory *factory, const QList<QByteArray> &qml)
 {
     qputenv("QML_DEBUG_SERVER_PORT", "3768");
 
     QEventLoop loop;
-    QmlDebugTestData data(&loop);
+    QDeclarativeDebugTestData data(&loop);
 
     tst_QmlDebug_Thread thread(&data, factory);
     QObject::connect(&thread, SIGNAL(testsFinished(int)), &data, SLOT(testsFinished(int)));
     
-    QmlDebugService::notifyOnServerStart(&thread, "start");
+    QDeclarativeDebugService::notifyOnServerStart(&thread, "start");
 
-    QmlEngine engine;  // blocks until client connects
+    QDeclarativeEngine engine;  // blocks until client connects
 
     foreach (const QByteArray &code, qml) {
-        QmlComponent c(&engine);
+        QDeclarativeComponent c(&engine);
         c.setData(code, QUrl::fromLocalFile(""));
         Q_ASSERT(c.isReady());  // fails if bad syntax
-        data.items << qobject_cast<QmlGraphicsItem*>(c.create());
+        data.items << qobject_cast<QDeclarativeItem*>(c.create());
     }
 
     // start the test
diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/shared/debugutil_p.h
index 6815b3c..3aaa9db 100644
--- a/tests/auto/declarative/shared/debugutil_p.h
+++ b/tests/auto/declarative/shared/debugutil_p.h
@@ -45,37 +45,37 @@
 #include <QThread>
 #include <QTest>
 
-#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qdeclarativeengine.h>
 
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-#include <private/qmlgraphicsitem_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
+#include <private/qdeclarativeitem_p.h>
 
-class QmlTestFactory;
+class QDeclarativeTestFactory;
 
-class QmlDebugTest
+class QDeclarativeDebugTest
 {
 public:
     static bool waitForSignal(QObject *receiver, const char *member, int timeout = 5000);
 
-    static int runTests(QmlTestFactory *factory, const QList<QByteArray> &qml = QList<QByteArray>());
+    static int runTests(QDeclarativeTestFactory *factory, const QList<QByteArray> &qml = QList<QByteArray>());
 };
 
-class QmlDebugTestData : public QObject
+class QDeclarativeDebugTestData : public QObject
 {
     Q_OBJECT
 public:
-    QmlDebugTestData(QEventLoop *el);
+    QDeclarativeDebugTestData(QEventLoop *el);
 
-    ~QmlDebugTestData();
+    ~QDeclarativeDebugTestData();
 
-    QmlDebugConnection *conn;
-    QmlEngine *engine;
+    QDeclarativeDebugConnection *conn;
+    QDeclarativeEngine *engine;
 
     int exitCode;
     QEventLoop *loop;
 
-    QList<QmlGraphicsItem *> items;
+    QList<QDeclarativeItem *> items;
 
 signals:
     void engineCreated();
@@ -84,24 +84,24 @@ public slots:
     void testsFinished(int code);
 
 private:
-    friend class QmlDebugTest;
+    friend class QDeclarativeDebugTest;
 };
 
 
-class QmlTestFactory
+class QDeclarativeTestFactory
 {
 public:
-    QmlTestFactory() {}
-    virtual ~QmlTestFactory() {}
+    QDeclarativeTestFactory() {}
+    virtual ~QDeclarativeTestFactory() {}
 
-    virtual QObject *createTest(QmlDebugTestData *data) = 0;
+    virtual QObject *createTest(QDeclarativeDebugTestData *data) = 0;
 };
 
-class QmlDebugTestService : public QmlDebugService
+class QDeclarativeDebugTestService : public QDeclarativeDebugService
 {
     Q_OBJECT
 public:
-    QmlDebugTestService(const QString &s, QObject *parent = 0);
+    QDeclarativeDebugTestService(const QString &s, QObject *parent = 0);
     bool enabled;
 
 signals:
@@ -113,11 +113,11 @@ protected:
     virtual void enabledChanged(bool e);
 };
 
-class QmlDebugTestClient : public QmlDebugClient
+class QDeclarativeDebugTestClient : public QDeclarativeDebugClient
 {
     Q_OBJECT
 public:
-    QmlDebugTestClient(const QString &s, QmlDebugConnection *c);
+    QDeclarativeDebugTestClient(const QString &s, QDeclarativeDebugConnection *c);
 
     QByteArray waitForResponse();
 
@@ -135,7 +135,7 @@ class tst_QmlDebug_Thread : public QThread
 {
     Q_OBJECT
 public:
-    tst_QmlDebug_Thread(QmlDebugTestData *data, QmlTestFactory *factory);
+    tst_QmlDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory);
 
     void run();
 
@@ -143,8 +143,8 @@ signals:
     void testsFinished(int);
 
 private:
-    QmlDebugTestData *m_data;
-    QmlTestFactory *m_factory;
+    QDeclarativeDebugTestData *m_data;
+    QDeclarativeTestFactory *m_factory;
 };
 
 
diff --git a/tests/auto/declarative/sql/tst_sql.cpp b/tests/auto/declarative/sql/tst_sql.cpp
index 2384101..e8a5e0c 100644
--- a/tests/auto/declarative/sql/tst_sql.cpp
+++ b/tests/auto/declarative/sql/tst_sql.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 #include <qtest.h>
 #include "../../../shared/util.h"
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmlengine_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetext_p.h>
+#include <private/qdeclarativeengine_p.h>
 #include <QtCore/qcryptographichash.h>
 #include <QtWebKit/qwebpage.h>
 #include <QtWebKit/qwebframe.h>
@@ -62,7 +62,7 @@ public:
         qApp->setApplicationName("tst_sql");
         qApp->setOrganizationName("Nokia");
         qApp->setOrganizationDomain("nokia.com");
-        engine = new QmlEngine;
+        engine = new QDeclarativeEngine;
     }
 
     ~tst_sql()
@@ -85,7 +85,7 @@ private slots:
 
 private:
     QString dbDir() const;
-    QmlEngine *engine;
+    QDeclarativeEngine *engine;
 };
 
 class QWebPageWithJavaScriptConsoleMessages : public QWebPage {
@@ -200,9 +200,9 @@ void tst_sql::testQml()
         "Text { Script { source: \""+jsfile+"\" } text: test() }";
 
     engine->setOfflineStoragePath(dbDir());
-    QmlComponent component(engine);
+    QDeclarativeComponent component(engine);
     component.setData(qml.toUtf8(), QUrl::fromLocalFile(SRCDIR "/empty.qml")); // just a file for relative local imports
-    QmlGraphicsText *text = qobject_cast<QmlGraphicsText*>(component.create());
+    QDeclarativeText *text = qobject_cast<QDeclarativeText*>(component.create());
     QVERIFY(text != 0);
     QCOMPARE(text->text(),QString("passed"));
 }
@@ -221,7 +221,7 @@ void tst_sql::testQml_cleanopen()
     // making it more like the tests are running in new processes.
     testQml();
 
-    QmlEnginePrivate::getScriptEngine(engine)->collectGarbage(); // close databases
+    QDeclarativeEnginePrivate::getScriptEngine(engine)->collectGarbage(); // close databases
     foreach (QString dbname, QSqlDatabase::connectionNames()) {
         QSqlDatabase::removeDatabase(dbname);
     }
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/animated-smooth.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/animated-smooth.qml
new file mode 100644
index 0000000..0ceaf49
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/animated-smooth.qml
@@ -0,0 +1,55 @@
+import Qt 4.6
+import "content"
+
+Rectangle {
+    id: page
+    color: "white"
+    width: 1030; height: 540
+
+    MyBorderImage {
+        x: 20; y: 20; minWidth: 120; maxWidth: 240
+        minHeight: 120; maxHeight: 240
+        source: "content/colors.png"; margin: 30; antialiased: true
+    }
+    MyBorderImage {
+        x: 270; y: 20; minWidth: 120; maxWidth: 240
+        minHeight: 120; maxHeight: 240; antialiased: true
+        source: "content/colors.png"; margin: 30
+        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+    }
+    MyBorderImage {
+        x: 520; y: 20; minWidth: 120; maxWidth: 240
+        minHeight: 120; maxHeight: 240; antialiased: true
+        source: "content/colors.png"; margin: 30
+        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+    }
+    MyBorderImage {
+        x: 770; y: 20; minWidth: 120; maxWidth: 240
+        minHeight: 120; maxHeight: 240; antialiased: true
+        source: "content/colors.png"; margin: 30
+        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+    }
+    MyBorderImage {
+        x: 20; y: 280; minWidth: 60; maxWidth: 200
+        minHeight: 40; maxHeight: 200; antialiased: true
+        source: "content/bw.png"; margin: 10
+    }
+    MyBorderImage {
+        x: 270; y: 280; minWidth: 60; maxWidth: 200
+        minHeight: 40; maxHeight: 200; antialiased: true
+        source: "content/bw.png"; margin: 10
+        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+    }
+    MyBorderImage {
+        x: 520; y: 280; minWidth: 60; maxWidth: 200
+        minHeight: 40; maxHeight: 200; antialiased: true
+        source: "content/bw.png"; margin: 10
+        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+    }
+    MyBorderImage {
+        x: 770; y: 280; minWidth: 60; maxWidth: 200
+        minHeight: 40; maxHeight: 200; antialiased: true
+        source: "content/bw.png"; margin: 10
+        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/animated.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/animated.qml
new file mode 100644
index 0000000..29c02b3
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/animated.qml
@@ -0,0 +1,55 @@
+import Qt 4.6
+import "content"
+
+Rectangle {
+    id: page
+    color: "white"
+    width: 1030; height: 540
+
+    MyBorderImage {
+        x: 20; y: 20; minWidth: 120; maxWidth: 240
+        minHeight: 120; maxHeight: 240
+        source: "content/colors.png"; margin: 30
+    }
+    MyBorderImage {
+        x: 270; y: 20; minWidth: 120; maxWidth: 240
+        minHeight: 120; maxHeight: 240
+        source: "content/colors.png"; margin: 30
+        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+    }
+    MyBorderImage {
+        x: 520; y: 20; minWidth: 120; maxWidth: 240
+        minHeight: 120; maxHeight: 240
+        source: "content/colors.png"; margin: 30
+        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+    }
+    MyBorderImage {
+        x: 770; y: 20; minWidth: 120; maxWidth: 240
+        minHeight: 120; maxHeight: 240
+        source: "content/colors.png"; margin: 30
+        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+    }
+    MyBorderImage {
+        x: 20; y: 280; minWidth: 60; maxWidth: 200
+        minHeight: 40; maxHeight: 200
+        source: "content/bw.png"; margin: 10
+    }
+    MyBorderImage {
+        x: 270; y: 280; minWidth: 60; maxWidth: 200
+        minHeight: 40; maxHeight: 200
+        source: "content/bw.png"; margin: 10
+        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+    }
+    MyBorderImage {
+        x: 520; y: 280; minWidth: 60; maxWidth: 200
+        minHeight: 40; maxHeight: 200
+        source: "content/bw.png"; margin: 10
+        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+    }
+    MyBorderImage {
+        x: 770; y: 280; minWidth: 60; maxWidth: 200
+        minHeight: 40; maxHeight: 200
+        source: "content/bw.png"; margin: 10
+        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/borders.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/borders.qml
new file mode 100644
index 0000000..9879416
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/borders.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Rectangle {
+    id: page
+    color: "white"
+    width: 520; height: 280
+
+    BorderImage {
+        x: 20; y: 20; width: 230; height: 240
+        smooth: true
+        source: "content/colors-stretch.sci"
+    }
+    BorderImage {
+        x: 270; y: 20; width: 230; height: 240
+        smooth: true
+        source: "content/colors-round.sci"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml
new file mode 100644
index 0000000..e268ce7
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml
@@ -0,0 +1,38 @@
+import Qt 4.6
+
+Item {
+    property alias horizontalMode: image.horizontalTileMode
+    property alias verticalMode: image.verticalTileMode
+    property alias source: image.source
+    property alias antialiased: image.smooth
+
+    property int minWidth
+    property int minHeight
+    property int maxWidth
+    property int maxHeight
+    property int margin
+
+    id: container
+    width: 240; height: 240
+
+    BorderImage {
+        id: image; x: container.width / 2 - width / 2; y: container.height / 2 - height / 2
+
+        width: SequentialAnimation {
+            repeat: true
+            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
+        }
+
+        height: SequentialAnimation {
+            repeat: true
+            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
+            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
+        }
+
+        border.top: container.margin
+        border.left: container.margin
+        border.bottom: container.margin
+        border.right: container.margin
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/bw.png b/tests/auto/declarative/visual/qdeclarativeborderimage/content/bw.png
new file mode 100644
index 0000000..486eaae
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/content/bw.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-round.sci b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-round.sci
new file mode 100644
index 0000000..506f6f5
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-round.sci
@@ -0,0 +1,7 @@
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
+horizontalTileRule:Round
+verticalTileRule:Round
+source:colors.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-stretch.sci b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-stretch.sci
new file mode 100644
index 0000000..e4989a7
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-stretch.sci
@@ -0,0 +1,5 @@
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
+source:colors.png
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors.png b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors.png
new file mode 100644
index 0000000..dfb62f3
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.0.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.0.png
new file mode 100644
index 0000000..9a6b079
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.1.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.1.png
new file mode 100644
index 0000000..1f960e5
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.2.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.2.png
new file mode 100644
index 0000000..85a2729
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.3.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.3.png
new file mode 100644
index 0000000..de6ff7c
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.4.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.4.png
new file mode 100644
index 0000000..fe7d3dd
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.5.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.5.png
new file mode 100644
index 0000000..e73bef5
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.6.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.6.png
new file mode 100644
index 0000000..0c75422
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.qml
new file mode 100644
index 0000000..043f5e2
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.qml
@@ -0,0 +1,1823 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 32
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 48
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 64
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 80
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 96
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 112
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 128
+        hash: "cd2180be80101c2aa4350b51b7a6f502"
+    }
+    Frame {
+        msec: 144
+        hash: "de471829f8ad3b43bf1b4df9d1d65a4d"
+    }
+    Frame {
+        msec: 160
+        hash: "ed9f2ca797894612600bc4b7fbaecb84"
+    }
+    Frame {
+        msec: 176
+        hash: "59470d71fa4426d0283e86371f2bfc2a"
+    }
+    Frame {
+        msec: 192
+        hash: "9a2f92efb51bcc6293d6a8e82d5314ea"
+    }
+    Frame {
+        msec: 208
+        hash: "7b66e21652a7d0982226e281a48411a9"
+    }
+    Frame {
+        msec: 224
+        hash: "a716c8d2c94433dee719f92f0822c8ec"
+    }
+    Frame {
+        msec: 240
+        hash: "f22a47b846cfee96ebdf39bbce2e6d51"
+    }
+    Frame {
+        msec: 256
+        hash: "5a8932d13d624932a65694fd19ec05cd"
+    }
+    Frame {
+        msec: 272
+        hash: "48e62dd171f5da82b5aa26c765e4042c"
+    }
+    Frame {
+        msec: 288
+        hash: "63d3c47f7dec1236440a05e0a8380900"
+    }
+    Frame {
+        msec: 304
+        hash: "323af110731b7af0c30f8862ff59b833"
+    }
+    Frame {
+        msec: 320
+        hash: "83c029e328e80af83158c37089cf0ece"
+    }
+    Frame {
+        msec: 336
+        hash: "3f9a09ae19be34348bb2552915360cf7"
+    }
+    Frame {
+        msec: 352
+        hash: "df624d70cae1bcefda8d69c0ff055d83"
+    }
+    Frame {
+        msec: 368
+        hash: "d671a3b971468e1d8aa30ab655e020a9"
+    }
+    Frame {
+        msec: 384
+        hash: "74c837b29f7f05b615123f0e608b523f"
+    }
+    Frame {
+        msec: 400
+        hash: "277ef98ea859fb7685fe6cd44a538a7d"
+    }
+    Frame {
+        msec: 416
+        hash: "0a8da7a3f57c3e06e4be5ea1d8a83ae9"
+    }
+    Frame {
+        msec: 432
+        hash: "456be9c208d690c479ba12bf6325dde0"
+    }
+    Frame {
+        msec: 448
+        hash: "10307beea6d99ab0ff5863f8e35555ed"
+    }
+    Frame {
+        msec: 464
+        hash: "170a1d5fe3422cf5223a78015a6a45fd"
+    }
+    Frame {
+        msec: 480
+        hash: "64ecb03aa538e74d0b99c6dec7751401"
+    }
+    Frame {
+        msec: 496
+        hash: "f3a7e74a1839f9366f9eeec4d2b80d1e"
+    }
+    Frame {
+        msec: 512
+        hash: "37c3f25e5cfdb48d7e3ab0cf8ffb9154"
+    }
+    Frame {
+        msec: 528
+        hash: "0af81ee0d76ff8335a0e347dc086ca37"
+    }
+    Frame {
+        msec: 544
+        hash: "061406edcbd2d4930ab89c3fcab63c7f"
+    }
+    Frame {
+        msec: 560
+        hash: "31d65134f340d82dd40f2401bda3fb7e"
+    }
+    Frame {
+        msec: 576
+        hash: "16c16c77c65b36d1e0954d5ead2642be"
+    }
+    Frame {
+        msec: 592
+        hash: "61c16009b65a55bffb63e27727e1615e"
+    }
+    Frame {
+        msec: 608
+        hash: "e1474c2cdd8768ca1ef45bf3bc5234ca"
+    }
+    Frame {
+        msec: 624
+        hash: "89c159ef00d273ecfe61332e1bf7244d"
+    }
+    Frame {
+        msec: 640
+        hash: "f4d0d3bca25e67908b38910f47b4757e"
+    }
+    Frame {
+        msec: 656
+        hash: "0e0c40f8e11a7bd499c80562ac6f8a82"
+    }
+    Frame {
+        msec: 672
+        hash: "4310a4c3037d845f088f21ad608f366a"
+    }
+    Frame {
+        msec: 688
+        hash: "3d518cd0348d6202243364af1dd6ce89"
+    }
+    Frame {
+        msec: 704
+        hash: "41987e6b4248d7944c0dbc6eb3862023"
+    }
+    Frame {
+        msec: 720
+        hash: "3e81338d38723d56f2d6c428271f81c1"
+    }
+    Frame {
+        msec: 736
+        hash: "902683d72f789399e9d99d1cea1bf177"
+    }
+    Frame {
+        msec: 752
+        hash: "efc119983701908a904deb24108c59cb"
+    }
+    Frame {
+        msec: 768
+        hash: "3a77785cfd7755f567619d8e04583f6a"
+    }
+    Frame {
+        msec: 784
+        hash: "fd85d1dd931033973283a408b5e328a8"
+    }
+    Frame {
+        msec: 800
+        hash: "5d3e85acabe5e5ff802eb7731676274f"
+    }
+    Frame {
+        msec: 816
+        hash: "ae12f1f37a746e16b06e6b869c89fac1"
+    }
+    Frame {
+        msec: 832
+        hash: "a15f19f374bbfb6a922b69d080a91eaa"
+    }
+    Frame {
+        msec: 848
+        hash: "84ef6dda8318b623832f58c46d762e89"
+    }
+    Frame {
+        msec: 864
+        hash: "b699285764f5e8866a9996f4a0dccc69"
+    }
+    Frame {
+        msec: 880
+        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
+    }
+    Frame {
+        msec: 896
+        hash: "177666cb3bb784c83196886b2c6cf6b6"
+    }
+    Frame {
+        msec: 912
+        hash: "9cd29b4b023a8b92573575fb3c3dda83"
+    }
+    Frame {
+        msec: 928
+        hash: "adc670a9aa0326744cb23e4f5912e6c7"
+    }
+    Frame {
+        msec: 944
+        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
+    }
+    Frame {
+        msec: 960
+        image: "animated-smooth.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "64b21b89576fdd0083f60a26f57b9c11"
+    }
+    Frame {
+        msec: 992
+        hash: "0d407ee07692d0e5a480a60952807b3c"
+    }
+    Frame {
+        msec: 1008
+        hash: "845170815a87565dc4229792032b3357"
+    }
+    Frame {
+        msec: 1024
+        hash: "8b8120cfc14de03e048632fdea61be21"
+    }
+    Frame {
+        msec: 1040
+        hash: "b0070117f1c24a4da87434725d4bb989"
+    }
+    Frame {
+        msec: 1056
+        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
+    }
+    Frame {
+        msec: 1072
+        hash: "3df54504f8891306fa8f1e9e2075a5e2"
+    }
+    Frame {
+        msec: 1088
+        hash: "853429387cc639496c7338244de7e1b7"
+    }
+    Frame {
+        msec: 1104
+        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
+    }
+    Frame {
+        msec: 1120
+        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
+    }
+    Frame {
+        msec: 1136
+        hash: "53f05993ba3b426949badd2e4cd66d84"
+    }
+    Frame {
+        msec: 1152
+        hash: "23291a0239c69ea07db959e709b1ff5f"
+    }
+    Frame {
+        msec: 1168
+        hash: "2192094410e2d7c8d9d4aa5f8deacff5"
+    }
+    Frame {
+        msec: 1184
+        hash: "d6615fc345831a3cc5b9a7196284b632"
+    }
+    Frame {
+        msec: 1200
+        hash: "92176cce4836dcae4dfca94e49b041a8"
+    }
+    Frame {
+        msec: 1216
+        hash: "2a1fcfb753ca237b518da26e67c928e5"
+    }
+    Frame {
+        msec: 1232
+        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+    }
+    Frame {
+        msec: 1248
+        hash: "bd045f4532d78bba0ef1b64118fd9f24"
+    }
+    Frame {
+        msec: 1264
+        hash: "7f9999a9c87af43b9703323efab31770"
+    }
+    Frame {
+        msec: 1280
+        hash: "0640fcb0b24d3ba4ab8695f78271a438"
+    }
+    Frame {
+        msec: 1296
+        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
+    }
+    Frame {
+        msec: 1312
+        hash: "fce2648975106bc5c0ca9a4530f7f748"
+    }
+    Frame {
+        msec: 1328
+        hash: "39cc17ee2e889f17dd07179fda99e431"
+    }
+    Frame {
+        msec: 1344
+        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
+    }
+    Frame {
+        msec: 1360
+        hash: "d65d50fbb920e683b041a1c72238225b"
+    }
+    Frame {
+        msec: 1376
+        hash: "49a1df977b0494c7c72ca0b65c394e13"
+    }
+    Frame {
+        msec: 1392
+        hash: "05cbce0eaa80b4610a9067af8c40f819"
+    }
+    Frame {
+        msec: 1408
+        hash: "00ab7798bcd77a99886dff0414f35382"
+    }
+    Frame {
+        msec: 1424
+        hash: "5cc90d798786c270ddd2616512f4459f"
+    }
+    Frame {
+        msec: 1440
+        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
+    }
+    Frame {
+        msec: 1456
+        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
+    }
+    Frame {
+        msec: 1472
+        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
+    }
+    Frame {
+        msec: 1488
+        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
+    }
+    Frame {
+        msec: 1504
+        hash: "2fede2f5d871654f3f8a6e9d890adeac"
+    }
+    Frame {
+        msec: 1520
+        hash: "deed4c06c9b713834490832b88e7acaf"
+    }
+    Frame {
+        msec: 1536
+        hash: "c2edb016cfdd47c192d1c48281ee76ed"
+    }
+    Frame {
+        msec: 1552
+        hash: "a261be47ae89e6b53e6bc1c1197154ae"
+    }
+    Frame {
+        msec: 1568
+        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
+    }
+    Frame {
+        msec: 1584
+        hash: "a087b532ecb2f28e4ee60819228c2522"
+    }
+    Frame {
+        msec: 1600
+        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
+    }
+    Frame {
+        msec: 1616
+        hash: "4520003d4b221a3de6834b2729b3026d"
+    }
+    Frame {
+        msec: 1632
+        hash: "d1110817827c318ceb0c112e8c2bfc1d"
+    }
+    Frame {
+        msec: 1648
+        hash: "83d49474db15d5779923972ff5f55917"
+    }
+    Frame {
+        msec: 1664
+        hash: "3bae40654ec551d69e7c8c72f631c7a5"
+    }
+    Frame {
+        msec: 1680
+        hash: "774740a393f3e9b8f12b81cce8da8280"
+    }
+    Frame {
+        msec: 1696
+        hash: "d8e398a1ce9ca45c19951e93bd5c932a"
+    }
+    Frame {
+        msec: 1712
+        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
+    }
+    Frame {
+        msec: 1728
+        hash: "47e920e3884ccf2f0f49e78070af6929"
+    }
+    Frame {
+        msec: 1744
+        hash: "fc913807eb1069d611495fbd5d43ee3d"
+    }
+    Frame {
+        msec: 1760
+        hash: "5d9ee853f083d514fbe51d6953d8e000"
+    }
+    Frame {
+        msec: 1776
+        hash: "5736362b42bc2d801e02edabb983663a"
+    }
+    Frame {
+        msec: 1792
+        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+    }
+    Frame {
+        msec: 1808
+        hash: "48952ffa5e300778eafa768b9fe7df0c"
+    }
+    Frame {
+        msec: 1824
+        hash: "fe04cae65aeec18697eca4f3f83a40e9"
+    }
+    Frame {
+        msec: 1840
+        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
+    }
+    Frame {
+        msec: 1856
+        hash: "89022a8e2feb3dcb845de69aafc333ad"
+    }
+    Frame {
+        msec: 1872
+        hash: "25506557c853a0020e98cf3992956989"
+    }
+    Frame {
+        msec: 1888
+        hash: "9a64706c52c9e962816953e32950b8ba"
+    }
+    Frame {
+        msec: 1904
+        hash: "3cbfded47413172ada64095e65c55e8a"
+    }
+    Frame {
+        msec: 1920
+        image: "animated-smooth.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "c5e399e29b988148913e62ee208b3326"
+    }
+    Frame {
+        msec: 1952
+        hash: "3991bc7760b7981d80665e3a7654c9f4"
+    }
+    Frame {
+        msec: 1968
+        hash: "05312f9529c94d3331ace7d73c544284"
+    }
+    Frame {
+        msec: 1984
+        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
+    }
+    Frame {
+        msec: 2000
+        hash: "723f87da7e5b002a2e9b0bcbc81f9458"
+    }
+    Frame {
+        msec: 2016
+        hash: "6b8ded0d9386a3fff0601a100c513080"
+    }
+    Frame {
+        msec: 2032
+        hash: "f976cd5046ef5391536859e63db905bd"
+    }
+    Frame {
+        msec: 2048
+        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
+    }
+    Frame {
+        msec: 2064
+        hash: "05312f9529c94d3331ace7d73c544284"
+    }
+    Frame {
+        msec: 2080
+        hash: "b980703c1d0018937e83a8ba8862469e"
+    }
+    Frame {
+        msec: 2096
+        hash: "c5e399e29b988148913e62ee208b3326"
+    }
+    Frame {
+        msec: 2112
+        hash: "3b7b83e97d17440b42e6ef4b962076d8"
+    }
+    Frame {
+        msec: 2128
+        hash: "3cbfded47413172ada64095e65c55e8a"
+    }
+    Frame {
+        msec: 2144
+        hash: "9a64706c52c9e962816953e32950b8ba"
+    }
+    Frame {
+        msec: 2160
+        hash: "25506557c853a0020e98cf3992956989"
+    }
+    Frame {
+        msec: 2176
+        hash: "89022a8e2feb3dcb845de69aafc333ad"
+    }
+    Frame {
+        msec: 2192
+        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
+    }
+    Frame {
+        msec: 2208
+        hash: "fe04cae65aeec18697eca4f3f83a40e9"
+    }
+    Frame {
+        msec: 2224
+        hash: "48952ffa5e300778eafa768b9fe7df0c"
+    }
+    Frame {
+        msec: 2240
+        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+    }
+    Frame {
+        msec: 2256
+        hash: "5736362b42bc2d801e02edabb983663a"
+    }
+    Frame {
+        msec: 2272
+        hash: "5d9ee853f083d514fbe51d6953d8e000"
+    }
+    Frame {
+        msec: 2288
+        hash: "fe899138116774df4c4441687e3019c5"
+    }
+    Frame {
+        msec: 2304
+        hash: "47e920e3884ccf2f0f49e78070af6929"
+    }
+    Frame {
+        msec: 2320
+        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
+    }
+    Frame {
+        msec: 2336
+        hash: "64cd225202ed6c91b02c368a9160a656"
+    }
+    Frame {
+        msec: 2352
+        hash: "774740a393f3e9b8f12b81cce8da8280"
+    }
+    Frame {
+        msec: 2368
+        hash: "3bae40654ec551d69e7c8c72f631c7a5"
+    }
+    Frame {
+        msec: 2384
+        hash: "83d49474db15d5779923972ff5f55917"
+    }
+    Frame {
+        msec: 2400
+        hash: "d1110817827c318ceb0c112e8c2bfc1d"
+    }
+    Frame {
+        msec: 2416
+        hash: "4520003d4b221a3de6834b2729b3026d"
+    }
+    Frame {
+        msec: 2432
+        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
+    }
+    Frame {
+        msec: 2448
+        hash: "a087b532ecb2f28e4ee60819228c2522"
+    }
+    Frame {
+        msec: 2464
+        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
+    }
+    Frame {
+        msec: 2480
+        hash: "a261be47ae89e6b53e6bc1c1197154ae"
+    }
+    Frame {
+        msec: 2496
+        hash: "c2edb016cfdd47c192d1c48281ee76ed"
+    }
+    Frame {
+        msec: 2512
+        hash: "deed4c06c9b713834490832b88e7acaf"
+    }
+    Frame {
+        msec: 2528
+        hash: "2fede2f5d871654f3f8a6e9d890adeac"
+    }
+    Frame {
+        msec: 2544
+        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
+    }
+    Frame {
+        msec: 2560
+        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
+    }
+    Frame {
+        msec: 2576
+        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
+    }
+    Frame {
+        msec: 2592
+        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
+    }
+    Frame {
+        msec: 2608
+        hash: "5cc90d798786c270ddd2616512f4459f"
+    }
+    Frame {
+        msec: 2624
+        hash: "00ab7798bcd77a99886dff0414f35382"
+    }
+    Frame {
+        msec: 2640
+        hash: "05cbce0eaa80b4610a9067af8c40f819"
+    }
+    Frame {
+        msec: 2656
+        hash: "a676f45d946aeb9fa577c0e862735b01"
+    }
+    Frame {
+        msec: 2672
+        hash: "d65d50fbb920e683b041a1c72238225b"
+    }
+    Frame {
+        msec: 2688
+        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
+    }
+    Frame {
+        msec: 2704
+        hash: "39cc17ee2e889f17dd07179fda99e431"
+    }
+    Frame {
+        msec: 2720
+        hash: "fce2648975106bc5c0ca9a4530f7f748"
+    }
+    Frame {
+        msec: 2736
+        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
+    }
+    Frame {
+        msec: 2752
+        hash: "0640fcb0b24d3ba4ab8695f78271a438"
+    }
+    Frame {
+        msec: 2768
+        hash: "2084ccc60ddd493399c128717816d33b"
+    }
+    Frame {
+        msec: 2784
+        hash: "bd045f4532d78bba0ef1b64118fd9f24"
+    }
+    Frame {
+        msec: 2800
+        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+    }
+    Frame {
+        msec: 2816
+        hash: "2a1fcfb753ca237b518da26e67c928e5"
+    }
+    Frame {
+        msec: 2832
+        hash: "92176cce4836dcae4dfca94e49b041a8"
+    }
+    Frame {
+        msec: 2848
+        hash: "d6615fc345831a3cc5b9a7196284b632"
+    }
+    Frame {
+        msec: 2864
+        hash: "85ef33fcb3f91e4fc20391bf94455984"
+    }
+    Frame {
+        msec: 2880
+        image: "animated-smooth.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "53f05993ba3b426949badd2e4cd66d84"
+    }
+    Frame {
+        msec: 2912
+        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
+    }
+    Frame {
+        msec: 2928
+        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
+    }
+    Frame {
+        msec: 2944
+        hash: "853429387cc639496c7338244de7e1b7"
+    }
+    Frame {
+        msec: 2960
+        hash: "3df54504f8891306fa8f1e9e2075a5e2"
+    }
+    Frame {
+        msec: 2976
+        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
+    }
+    Frame {
+        msec: 2992
+        hash: "b0070117f1c24a4da87434725d4bb989"
+    }
+    Frame {
+        msec: 3008
+        hash: "8b8120cfc14de03e048632fdea61be21"
+    }
+    Frame {
+        msec: 3024
+        hash: "845170815a87565dc4229792032b3357"
+    }
+    Frame {
+        msec: 3040
+        hash: "0d407ee07692d0e5a480a60952807b3c"
+    }
+    Frame {
+        msec: 3056
+        hash: "64b21b89576fdd0083f60a26f57b9c11"
+    }
+    Frame {
+        msec: 3072
+        hash: "d7e96278583f83ab636ed68fa130e4d2"
+    }
+    Frame {
+        msec: 3088
+        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
+    }
+    Frame {
+        msec: 3104
+        hash: "adc670a9aa0326744cb23e4f5912e6c7"
+    }
+    Frame {
+        msec: 3120
+        hash: "9cd29b4b023a8b92573575fb3c3dda83"
+    }
+    Frame {
+        msec: 3136
+        hash: "177666cb3bb784c83196886b2c6cf6b6"
+    }
+    Frame {
+        msec: 3152
+        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
+    }
+    Frame {
+        msec: 3168
+        hash: "b699285764f5e8866a9996f4a0dccc69"
+    }
+    Frame {
+        msec: 3184
+        hash: "84ef6dda8318b623832f58c46d762e89"
+    }
+    Frame {
+        msec: 3200
+        hash: "a15f19f374bbfb6a922b69d080a91eaa"
+    }
+    Frame {
+        msec: 3216
+        hash: "ae12f1f37a746e16b06e6b869c89fac1"
+    }
+    Frame {
+        msec: 3232
+        hash: "5d3e85acabe5e5ff802eb7731676274f"
+    }
+    Frame {
+        msec: 3248
+        hash: "fd85d1dd931033973283a408b5e328a8"
+    }
+    Frame {
+        msec: 3264
+        hash: "3a77785cfd7755f567619d8e04583f6a"
+    }
+    Frame {
+        msec: 3280
+        hash: "efc119983701908a904deb24108c59cb"
+    }
+    Frame {
+        msec: 3296
+        hash: "902683d72f789399e9d99d1cea1bf177"
+    }
+    Frame {
+        msec: 3312
+        hash: "3e81338d38723d56f2d6c428271f81c1"
+    }
+    Frame {
+        msec: 3328
+        hash: "41987e6b4248d7944c0dbc6eb3862023"
+    }
+    Frame {
+        msec: 3344
+        hash: "3d518cd0348d6202243364af1dd6ce89"
+    }
+    Frame {
+        msec: 3360
+        hash: "4310a4c3037d845f088f21ad608f366a"
+    }
+    Frame {
+        msec: 3376
+        hash: "0e0c40f8e11a7bd499c80562ac6f8a82"
+    }
+    Frame {
+        msec: 3392
+        hash: "f4d0d3bca25e67908b38910f47b4757e"
+    }
+    Frame {
+        msec: 3408
+        hash: "f602e3eda1889d1a7e49560f0dfb5d4c"
+    }
+    Frame {
+        msec: 3424
+        hash: "e1474c2cdd8768ca1ef45bf3bc5234ca"
+    }
+    Frame {
+        msec: 3440
+        hash: "c8312ede0998636a6bd6451d13636577"
+    }
+    Frame {
+        msec: 3456
+        hash: "16c16c77c65b36d1e0954d5ead2642be"
+    }
+    Frame {
+        msec: 3472
+        hash: "31d65134f340d82dd40f2401bda3fb7e"
+    }
+    Frame {
+        msec: 3488
+        hash: "061406edcbd2d4930ab89c3fcab63c7f"
+    }
+    Frame {
+        msec: 3504
+        hash: "0af81ee0d76ff8335a0e347dc086ca37"
+    }
+    Frame {
+        msec: 3520
+        hash: "0f347763f25350ebb62dda1536372b45"
+    }
+    Frame {
+        msec: 3536
+        hash: "f3a7e74a1839f9366f9eeec4d2b80d1e"
+    }
+    Frame {
+        msec: 3552
+        hash: "64ecb03aa538e74d0b99c6dec7751401"
+    }
+    Frame {
+        msec: 3568
+        hash: "170a1d5fe3422cf5223a78015a6a45fd"
+    }
+    Frame {
+        msec: 3584
+        hash: "10307beea6d99ab0ff5863f8e35555ed"
+    }
+    Frame {
+        msec: 3600
+        hash: "456be9c208d690c479ba12bf6325dde0"
+    }
+    Frame {
+        msec: 3616
+        hash: "0a8da7a3f57c3e06e4be5ea1d8a83ae9"
+    }
+    Frame {
+        msec: 3632
+        hash: "277ef98ea859fb7685fe6cd44a538a7d"
+    }
+    Frame {
+        msec: 3648
+        hash: "74c837b29f7f05b615123f0e608b523f"
+    }
+    Frame {
+        msec: 3664
+        hash: "d671a3b971468e1d8aa30ab655e020a9"
+    }
+    Frame {
+        msec: 3680
+        hash: "df624d70cae1bcefda8d69c0ff055d83"
+    }
+    Frame {
+        msec: 3696
+        hash: "3f9a09ae19be34348bb2552915360cf7"
+    }
+    Frame {
+        msec: 3712
+        hash: "83c029e328e80af83158c37089cf0ece"
+    }
+    Frame {
+        msec: 3728
+        hash: "323af110731b7af0c30f8862ff59b833"
+    }
+    Frame {
+        msec: 3744
+        hash: "63d3c47f7dec1236440a05e0a8380900"
+    }
+    Frame {
+        msec: 3760
+        hash: "48e62dd171f5da82b5aa26c765e4042c"
+    }
+    Frame {
+        msec: 3776
+        hash: "5a8932d13d624932a65694fd19ec05cd"
+    }
+    Frame {
+        msec: 3792
+        hash: "8419b295f67cae133760da79dfc26505"
+    }
+    Frame {
+        msec: 3808
+        hash: "a716c8d2c94433dee719f92f0822c8ec"
+    }
+    Frame {
+        msec: 3824
+        hash: "7b66e21652a7d0982226e281a48411a9"
+    }
+    Frame {
+        msec: 3840
+        image: "animated-smooth.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "59470d71fa4426d0283e86371f2bfc2a"
+    }
+    Frame {
+        msec: 3872
+        hash: "d56ba74d38c1889a278929d1c1b7f17a"
+    }
+    Frame {
+        msec: 3888
+        hash: "de471829f8ad3b43bf1b4df9d1d65a4d"
+    }
+    Frame {
+        msec: 3904
+        hash: "cd2180be80101c2aa4350b51b7a6f502"
+    }
+    Frame {
+        msec: 3920
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 3936
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 3952
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 3968
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 3984
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4000
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4016
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4032
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4048
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4064
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4080
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4096
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4112
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4128
+        hash: "cd2180be80101c2aa4350b51b7a6f502"
+    }
+    Frame {
+        msec: 4144
+        hash: "de471829f8ad3b43bf1b4df9d1d65a4d"
+    }
+    Frame {
+        msec: 4160
+        hash: "ed9f2ca797894612600bc4b7fbaecb84"
+    }
+    Frame {
+        msec: 4176
+        hash: "59470d71fa4426d0283e86371f2bfc2a"
+    }
+    Frame {
+        msec: 4192
+        hash: "9a2f92efb51bcc6293d6a8e82d5314ea"
+    }
+    Frame {
+        msec: 4208
+        hash: "7b66e21652a7d0982226e281a48411a9"
+    }
+    Frame {
+        msec: 4224
+        hash: "a716c8d2c94433dee719f92f0822c8ec"
+    }
+    Frame {
+        msec: 4240
+        hash: "f22a47b846cfee96ebdf39bbce2e6d51"
+    }
+    Frame {
+        msec: 4256
+        hash: "5a8932d13d624932a65694fd19ec05cd"
+    }
+    Frame {
+        msec: 4272
+        hash: "48e62dd171f5da82b5aa26c765e4042c"
+    }
+    Frame {
+        msec: 4288
+        hash: "63d3c47f7dec1236440a05e0a8380900"
+    }
+    Frame {
+        msec: 4304
+        hash: "323af110731b7af0c30f8862ff59b833"
+    }
+    Frame {
+        msec: 4320
+        hash: "83c029e328e80af83158c37089cf0ece"
+    }
+    Frame {
+        msec: 4336
+        hash: "3f9a09ae19be34348bb2552915360cf7"
+    }
+    Frame {
+        msec: 4352
+        hash: "df624d70cae1bcefda8d69c0ff055d83"
+    }
+    Frame {
+        msec: 4368
+        hash: "d671a3b971468e1d8aa30ab655e020a9"
+    }
+    Frame {
+        msec: 4384
+        hash: "74c837b29f7f05b615123f0e608b523f"
+    }
+    Frame {
+        msec: 4400
+        hash: "277ef98ea859fb7685fe6cd44a538a7d"
+    }
+    Frame {
+        msec: 4416
+        hash: "0a8da7a3f57c3e06e4be5ea1d8a83ae9"
+    }
+    Frame {
+        msec: 4432
+        hash: "456be9c208d690c479ba12bf6325dde0"
+    }
+    Frame {
+        msec: 4448
+        hash: "10307beea6d99ab0ff5863f8e35555ed"
+    }
+    Frame {
+        msec: 4464
+        hash: "170a1d5fe3422cf5223a78015a6a45fd"
+    }
+    Frame {
+        msec: 4480
+        hash: "64ecb03aa538e74d0b99c6dec7751401"
+    }
+    Frame {
+        msec: 4496
+        hash: "f3a7e74a1839f9366f9eeec4d2b80d1e"
+    }
+    Frame {
+        msec: 4512
+        hash: "37c3f25e5cfdb48d7e3ab0cf8ffb9154"
+    }
+    Frame {
+        msec: 4528
+        hash: "0af81ee0d76ff8335a0e347dc086ca37"
+    }
+    Frame {
+        msec: 4544
+        hash: "061406edcbd2d4930ab89c3fcab63c7f"
+    }
+    Frame {
+        msec: 4560
+        hash: "31d65134f340d82dd40f2401bda3fb7e"
+    }
+    Frame {
+        msec: 4576
+        hash: "16c16c77c65b36d1e0954d5ead2642be"
+    }
+    Frame {
+        msec: 4592
+        hash: "61c16009b65a55bffb63e27727e1615e"
+    }
+    Frame {
+        msec: 4608
+        hash: "e1474c2cdd8768ca1ef45bf3bc5234ca"
+    }
+    Frame {
+        msec: 4624
+        hash: "89c159ef00d273ecfe61332e1bf7244d"
+    }
+    Frame {
+        msec: 4640
+        hash: "f4d0d3bca25e67908b38910f47b4757e"
+    }
+    Frame {
+        msec: 4656
+        hash: "0e0c40f8e11a7bd499c80562ac6f8a82"
+    }
+    Frame {
+        msec: 4672
+        hash: "4310a4c3037d845f088f21ad608f366a"
+    }
+    Frame {
+        msec: 4688
+        hash: "3d518cd0348d6202243364af1dd6ce89"
+    }
+    Frame {
+        msec: 4704
+        hash: "41987e6b4248d7944c0dbc6eb3862023"
+    }
+    Frame {
+        msec: 4720
+        hash: "3e81338d38723d56f2d6c428271f81c1"
+    }
+    Frame {
+        msec: 4736
+        hash: "902683d72f789399e9d99d1cea1bf177"
+    }
+    Frame {
+        msec: 4752
+        hash: "efc119983701908a904deb24108c59cb"
+    }
+    Frame {
+        msec: 4768
+        hash: "3a77785cfd7755f567619d8e04583f6a"
+    }
+    Frame {
+        msec: 4784
+        hash: "fd85d1dd931033973283a408b5e328a8"
+    }
+    Frame {
+        msec: 4800
+        image: "animated-smooth.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "ae12f1f37a746e16b06e6b869c89fac1"
+    }
+    Frame {
+        msec: 4832
+        hash: "a15f19f374bbfb6a922b69d080a91eaa"
+    }
+    Frame {
+        msec: 4848
+        hash: "84ef6dda8318b623832f58c46d762e89"
+    }
+    Frame {
+        msec: 4864
+        hash: "b699285764f5e8866a9996f4a0dccc69"
+    }
+    Frame {
+        msec: 4880
+        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
+    }
+    Frame {
+        msec: 4896
+        hash: "177666cb3bb784c83196886b2c6cf6b6"
+    }
+    Frame {
+        msec: 4912
+        hash: "9cd29b4b023a8b92573575fb3c3dda83"
+    }
+    Frame {
+        msec: 4928
+        hash: "adc670a9aa0326744cb23e4f5912e6c7"
+    }
+    Frame {
+        msec: 4944
+        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
+    }
+    Frame {
+        msec: 4960
+        hash: "d7e96278583f83ab636ed68fa130e4d2"
+    }
+    Frame {
+        msec: 4976
+        hash: "64b21b89576fdd0083f60a26f57b9c11"
+    }
+    Frame {
+        msec: 4992
+        hash: "0d407ee07692d0e5a480a60952807b3c"
+    }
+    Frame {
+        msec: 5008
+        hash: "845170815a87565dc4229792032b3357"
+    }
+    Frame {
+        msec: 5024
+        hash: "8b8120cfc14de03e048632fdea61be21"
+    }
+    Frame {
+        msec: 5040
+        hash: "b0070117f1c24a4da87434725d4bb989"
+    }
+    Frame {
+        msec: 5056
+        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
+    }
+    Frame {
+        msec: 5072
+        hash: "3df54504f8891306fa8f1e9e2075a5e2"
+    }
+    Frame {
+        msec: 5088
+        hash: "853429387cc639496c7338244de7e1b7"
+    }
+    Frame {
+        msec: 5104
+        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
+    }
+    Frame {
+        msec: 5120
+        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
+    }
+    Frame {
+        msec: 5136
+        hash: "53f05993ba3b426949badd2e4cd66d84"
+    }
+    Frame {
+        msec: 5152
+        hash: "23291a0239c69ea07db959e709b1ff5f"
+    }
+    Frame {
+        msec: 5168
+        hash: "2192094410e2d7c8d9d4aa5f8deacff5"
+    }
+    Frame {
+        msec: 5184
+        hash: "d6615fc345831a3cc5b9a7196284b632"
+    }
+    Frame {
+        msec: 5200
+        hash: "92176cce4836dcae4dfca94e49b041a8"
+    }
+    Frame {
+        msec: 5216
+        hash: "2a1fcfb753ca237b518da26e67c928e5"
+    }
+    Frame {
+        msec: 5232
+        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+    }
+    Frame {
+        msec: 5248
+        hash: "bd045f4532d78bba0ef1b64118fd9f24"
+    }
+    Frame {
+        msec: 5264
+        hash: "7f9999a9c87af43b9703323efab31770"
+    }
+    Frame {
+        msec: 5280
+        hash: "0640fcb0b24d3ba4ab8695f78271a438"
+    }
+    Frame {
+        msec: 5296
+        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
+    }
+    Frame {
+        msec: 5312
+        hash: "fce2648975106bc5c0ca9a4530f7f748"
+    }
+    Frame {
+        msec: 5328
+        hash: "39cc17ee2e889f17dd07179fda99e431"
+    }
+    Frame {
+        msec: 5344
+        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
+    }
+    Frame {
+        msec: 5360
+        hash: "d65d50fbb920e683b041a1c72238225b"
+    }
+    Frame {
+        msec: 5376
+        hash: "49a1df977b0494c7c72ca0b65c394e13"
+    }
+    Frame {
+        msec: 5392
+        hash: "05cbce0eaa80b4610a9067af8c40f819"
+    }
+    Frame {
+        msec: 5408
+        hash: "00ab7798bcd77a99886dff0414f35382"
+    }
+    Frame {
+        msec: 5424
+        hash: "5cc90d798786c270ddd2616512f4459f"
+    }
+    Frame {
+        msec: 5440
+        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
+    }
+    Frame {
+        msec: 5456
+        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
+    }
+    Frame {
+        msec: 5472
+        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
+    }
+    Frame {
+        msec: 5488
+        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
+    }
+    Frame {
+        msec: 5504
+        hash: "2fede2f5d871654f3f8a6e9d890adeac"
+    }
+    Frame {
+        msec: 5520
+        hash: "deed4c06c9b713834490832b88e7acaf"
+    }
+    Frame {
+        msec: 5536
+        hash: "c2edb016cfdd47c192d1c48281ee76ed"
+    }
+    Frame {
+        msec: 5552
+        hash: "a261be47ae89e6b53e6bc1c1197154ae"
+    }
+    Frame {
+        msec: 5568
+        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
+    }
+    Frame {
+        msec: 5584
+        hash: "a087b532ecb2f28e4ee60819228c2522"
+    }
+    Frame {
+        msec: 5600
+        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
+    }
+    Frame {
+        msec: 5616
+        hash: "4520003d4b221a3de6834b2729b3026d"
+    }
+    Frame {
+        msec: 5632
+        hash: "d1110817827c318ceb0c112e8c2bfc1d"
+    }
+    Frame {
+        msec: 5648
+        hash: "83d49474db15d5779923972ff5f55917"
+    }
+    Frame {
+        msec: 5664
+        hash: "3bae40654ec551d69e7c8c72f631c7a5"
+    }
+    Frame {
+        msec: 5680
+        hash: "774740a393f3e9b8f12b81cce8da8280"
+    }
+    Frame {
+        msec: 5696
+        hash: "d8e398a1ce9ca45c19951e93bd5c932a"
+    }
+    Frame {
+        msec: 5712
+        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
+    }
+    Frame {
+        msec: 5728
+        hash: "47e920e3884ccf2f0f49e78070af6929"
+    }
+    Frame {
+        msec: 5744
+        hash: "fc913807eb1069d611495fbd5d43ee3d"
+    }
+    Frame {
+        msec: 5760
+        image: "animated-smooth.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "5736362b42bc2d801e02edabb983663a"
+    }
+    Frame {
+        msec: 5792
+        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+    }
+    Frame {
+        msec: 5808
+        hash: "48952ffa5e300778eafa768b9fe7df0c"
+    }
+    Frame {
+        msec: 5824
+        hash: "fe04cae65aeec18697eca4f3f83a40e9"
+    }
+    Frame {
+        msec: 5840
+        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
+    }
+    Frame {
+        msec: 5856
+        hash: "89022a8e2feb3dcb845de69aafc333ad"
+    }
+    Frame {
+        msec: 5872
+        hash: "25506557c853a0020e98cf3992956989"
+    }
+    Frame {
+        msec: 5888
+        hash: "9a64706c52c9e962816953e32950b8ba"
+    }
+    Frame {
+        msec: 5904
+        hash: "3cbfded47413172ada64095e65c55e8a"
+    }
+    Frame {
+        msec: 5920
+        hash: "ec7e1190dd4fe122545e6ce6c8740500"
+    }
+    Frame {
+        msec: 5936
+        hash: "c5e399e29b988148913e62ee208b3326"
+    }
+    Frame {
+        msec: 5952
+        hash: "3991bc7760b7981d80665e3a7654c9f4"
+    }
+    Frame {
+        msec: 5968
+        hash: "05312f9529c94d3331ace7d73c544284"
+    }
+    Frame {
+        msec: 5984
+        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
+    }
+    Frame {
+        msec: 6000
+        hash: "723f87da7e5b002a2e9b0bcbc81f9458"
+    }
+    Frame {
+        msec: 6016
+        hash: "6b8ded0d9386a3fff0601a100c513080"
+    }
+    Frame {
+        msec: 6032
+        hash: "f976cd5046ef5391536859e63db905bd"
+    }
+    Frame {
+        msec: 6048
+        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
+    }
+    Frame {
+        msec: 6064
+        hash: "05312f9529c94d3331ace7d73c544284"
+    }
+    Frame {
+        msec: 6080
+        hash: "b980703c1d0018937e83a8ba8862469e"
+    }
+    Frame {
+        msec: 6096
+        hash: "c5e399e29b988148913e62ee208b3326"
+    }
+    Frame {
+        msec: 6112
+        hash: "3b7b83e97d17440b42e6ef4b962076d8"
+    }
+    Frame {
+        msec: 6128
+        hash: "3cbfded47413172ada64095e65c55e8a"
+    }
+    Frame {
+        msec: 6144
+        hash: "9a64706c52c9e962816953e32950b8ba"
+    }
+    Frame {
+        msec: 6160
+        hash: "25506557c853a0020e98cf3992956989"
+    }
+    Frame {
+        msec: 6176
+        hash: "89022a8e2feb3dcb845de69aafc333ad"
+    }
+    Frame {
+        msec: 6192
+        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
+    }
+    Frame {
+        msec: 6208
+        hash: "fe04cae65aeec18697eca4f3f83a40e9"
+    }
+    Frame {
+        msec: 6224
+        hash: "48952ffa5e300778eafa768b9fe7df0c"
+    }
+    Frame {
+        msec: 6240
+        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+    }
+    Frame {
+        msec: 6256
+        hash: "5736362b42bc2d801e02edabb983663a"
+    }
+    Frame {
+        msec: 6272
+        hash: "5d9ee853f083d514fbe51d6953d8e000"
+    }
+    Frame {
+        msec: 6288
+        hash: "fe899138116774df4c4441687e3019c5"
+    }
+    Frame {
+        msec: 6304
+        hash: "47e920e3884ccf2f0f49e78070af6929"
+    }
+    Frame {
+        msec: 6320
+        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
+    }
+    Frame {
+        msec: 6336
+        hash: "64cd225202ed6c91b02c368a9160a656"
+    }
+    Frame {
+        msec: 6352
+        hash: "774740a393f3e9b8f12b81cce8da8280"
+    }
+    Frame {
+        msec: 6368
+        hash: "3bae40654ec551d69e7c8c72f631c7a5"
+    }
+    Frame {
+        msec: 6384
+        hash: "83d49474db15d5779923972ff5f55917"
+    }
+    Frame {
+        msec: 6400
+        hash: "d1110817827c318ceb0c112e8c2bfc1d"
+    }
+    Frame {
+        msec: 6416
+        hash: "4520003d4b221a3de6834b2729b3026d"
+    }
+    Frame {
+        msec: 6432
+        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
+    }
+    Frame {
+        msec: 6448
+        hash: "a087b532ecb2f28e4ee60819228c2522"
+    }
+    Frame {
+        msec: 6464
+        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
+    }
+    Frame {
+        msec: 6480
+        hash: "a261be47ae89e6b53e6bc1c1197154ae"
+    }
+    Frame {
+        msec: 6496
+        hash: "c2edb016cfdd47c192d1c48281ee76ed"
+    }
+    Frame {
+        msec: 6512
+        hash: "deed4c06c9b713834490832b88e7acaf"
+    }
+    Frame {
+        msec: 6528
+        hash: "2fede2f5d871654f3f8a6e9d890adeac"
+    }
+    Frame {
+        msec: 6544
+        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
+    }
+    Frame {
+        msec: 6560
+        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
+    }
+    Frame {
+        msec: 6576
+        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
+    }
+    Frame {
+        msec: 6592
+        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
+    }
+    Frame {
+        msec: 6608
+        hash: "5cc90d798786c270ddd2616512f4459f"
+    }
+    Frame {
+        msec: 6624
+        hash: "00ab7798bcd77a99886dff0414f35382"
+    }
+    Frame {
+        msec: 6640
+        hash: "05cbce0eaa80b4610a9067af8c40f819"
+    }
+    Frame {
+        msec: 6656
+        hash: "a676f45d946aeb9fa577c0e862735b01"
+    }
+    Frame {
+        msec: 6672
+        hash: "d65d50fbb920e683b041a1c72238225b"
+    }
+    Frame {
+        msec: 6688
+        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
+    }
+    Frame {
+        msec: 6704
+        hash: "39cc17ee2e889f17dd07179fda99e431"
+    }
+    Frame {
+        msec: 6720
+        image: "animated-smooth.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
+    }
+    Frame {
+        msec: 6752
+        hash: "0640fcb0b24d3ba4ab8695f78271a438"
+    }
+    Frame {
+        msec: 6768
+        hash: "2084ccc60ddd493399c128717816d33b"
+    }
+    Frame {
+        msec: 6784
+        hash: "bd045f4532d78bba0ef1b64118fd9f24"
+    }
+    Frame {
+        msec: 6800
+        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+    }
+    Frame {
+        msec: 6816
+        hash: "2a1fcfb753ca237b518da26e67c928e5"
+    }
+    Frame {
+        msec: 6832
+        hash: "92176cce4836dcae4dfca94e49b041a8"
+    }
+    Frame {
+        msec: 6848
+        hash: "d6615fc345831a3cc5b9a7196284b632"
+    }
+    Frame {
+        msec: 6864
+        hash: "85ef33fcb3f91e4fc20391bf94455984"
+    }
+    Frame {
+        msec: 6880
+        hash: "23291a0239c69ea07db959e709b1ff5f"
+    }
+    Frame {
+        msec: 6896
+        hash: "53f05993ba3b426949badd2e4cd66d84"
+    }
+    Frame {
+        msec: 6912
+        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
+    }
+    Frame {
+        msec: 6928
+        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
+    }
+    Frame {
+        msec: 6944
+        hash: "853429387cc639496c7338244de7e1b7"
+    }
+    Frame {
+        msec: 6960
+        hash: "3df54504f8891306fa8f1e9e2075a5e2"
+    }
+    Frame {
+        msec: 6976
+        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
+    }
+    Frame {
+        msec: 6992
+        hash: "b0070117f1c24a4da87434725d4bb989"
+    }
+    Frame {
+        msec: 7008
+        hash: "8b8120cfc14de03e048632fdea61be21"
+    }
+    Frame {
+        msec: 7024
+        hash: "845170815a87565dc4229792032b3357"
+    }
+    Frame {
+        msec: 7040
+        hash: "0d407ee07692d0e5a480a60952807b3c"
+    }
+    Frame {
+        msec: 7056
+        hash: "64b21b89576fdd0083f60a26f57b9c11"
+    }
+    Frame {
+        msec: 7072
+        hash: "d7e96278583f83ab636ed68fa130e4d2"
+    }
+    Frame {
+        msec: 7088
+        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7104
+        hash: "adc670a9aa0326744cb23e4f5912e6c7"
+    }
+    Frame {
+        msec: 7120
+        hash: "9cd29b4b023a8b92573575fb3c3dda83"
+    }
+    Frame {
+        msec: 7136
+        hash: "177666cb3bb784c83196886b2c6cf6b6"
+    }
+    Frame {
+        msec: 7152
+        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
+    }
+    Frame {
+        msec: 7168
+        hash: "b699285764f5e8866a9996f4a0dccc69"
+    }
+    Frame {
+        msec: 7184
+        hash: "84ef6dda8318b623832f58c46d762e89"
+    }
+    Frame {
+        msec: 7200
+        hash: "a15f19f374bbfb6a922b69d080a91eaa"
+    }
+    Frame {
+        msec: 7216
+        hash: "ae12f1f37a746e16b06e6b869c89fac1"
+    }
+    Frame {
+        msec: 7232
+        hash: "5d3e85acabe5e5ff802eb7731676274f"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.0.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.0.png
new file mode 100644
index 0000000..99228f9
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.1.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.1.png
new file mode 100644
index 0000000..a2dcd00
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.2.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.2.png
new file mode 100644
index 0000000..8a80020
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.3.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.3.png
new file mode 100644
index 0000000..02b57ef
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.4.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.4.png
new file mode 100644
index 0000000..df0f6cc
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.5.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.5.png
new file mode 100644
index 0000000..0add64d
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.6.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.6.png
new file mode 100644
index 0000000..0886207
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.7.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.7.png
new file mode 100644
index 0000000..bc1a7b0
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.qml
new file mode 100644
index 0000000..29e591a
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.qml
@@ -0,0 +1,2091 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 32
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 48
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 64
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 80
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 96
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 112
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 128
+        hash: "4c60d345821f515c7811f3b69eb94607"
+    }
+    Frame {
+        msec: 144
+        hash: "aacf9ae3c23d174a1c1cda493600e355"
+    }
+    Frame {
+        msec: 160
+        hash: "228d5312c261d1a5455faf69ec2f2520"
+    }
+    Frame {
+        msec: 176
+        hash: "465ec993948f7b75aeb5759976f4620d"
+    }
+    Frame {
+        msec: 192
+        hash: "755cfccc38bababc468fe6e1076804bb"
+    }
+    Frame {
+        msec: 208
+        hash: "b63e4d1686057828fd8781f1c33585f5"
+    }
+    Frame {
+        msec: 224
+        hash: "c5b3dede34b0d1d78135e39c41d117c6"
+    }
+    Frame {
+        msec: 240
+        hash: "4d45d70f997c2c67166905c97a900d2e"
+    }
+    Frame {
+        msec: 256
+        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
+    }
+    Frame {
+        msec: 272
+        hash: "08b9be66e23c7b6f6f629c7470394601"
+    }
+    Frame {
+        msec: 288
+        hash: "3dac1d9632378bd18c1c938a4868e3fb"
+    }
+    Frame {
+        msec: 304
+        hash: "406224b535b4425d2708df0083acdc8e"
+    }
+    Frame {
+        msec: 320
+        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
+    }
+    Frame {
+        msec: 336
+        hash: "8419f1d75b14130730bcfec4e3a9b058"
+    }
+    Frame {
+        msec: 352
+        hash: "a85ee8be6a47bbd1b14137803ce606ec"
+    }
+    Frame {
+        msec: 368
+        hash: "c1936628aec13e08e9581dcd2c6d5717"
+    }
+    Frame {
+        msec: 384
+        hash: "75c9bf83ca3fe24612c245698c089430"
+    }
+    Frame {
+        msec: 400
+        hash: "8c66a33d26eec2a1133f4362710a5fab"
+    }
+    Frame {
+        msec: 416
+        hash: "2266df495ab5265e7514a506d3bf5bc6"
+    }
+    Frame {
+        msec: 432
+        hash: "01947e631c3db43f7c5b4427229bc0c8"
+    }
+    Frame {
+        msec: 448
+        hash: "3f62f032239d412d3637198f5e3e83d6"
+    }
+    Frame {
+        msec: 464
+        hash: "06d8d8a1a41893d4e27725948a75caf4"
+    }
+    Frame {
+        msec: 480
+        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
+    }
+    Frame {
+        msec: 496
+        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
+    }
+    Frame {
+        msec: 512
+        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
+    }
+    Frame {
+        msec: 528
+        hash: "2a7bed775824968e318c3d40fbc5b1c2"
+    }
+    Frame {
+        msec: 544
+        hash: "3152e5f29015ece423fbdd11a2b382b8"
+    }
+    Frame {
+        msec: 560
+        hash: "f1a7a4a67a21f5025294af4bea3f8998"
+    }
+    Frame {
+        msec: 576
+        hash: "a40014d842471784e1222eb205395f6f"
+    }
+    Frame {
+        msec: 592
+        hash: "18c2f321a149e38b258ac264d40c2376"
+    }
+    Frame {
+        msec: 608
+        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
+    }
+    Frame {
+        msec: 624
+        hash: "19d05a96f3ae7388e854bbf1075b51c1"
+    }
+    Frame {
+        msec: 640
+        hash: "e418b5f54705515dce5ce3b4cbc45d19"
+    }
+    Frame {
+        msec: 656
+        hash: "554e1d360463871e7c05cfe6f8abe1dd"
+    }
+    Frame {
+        msec: 672
+        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
+    }
+    Frame {
+        msec: 688
+        hash: "60f158382f75103c78e2b9b408e0fe65"
+    }
+    Frame {
+        msec: 704
+        hash: "4e60300cfab8634e04dcd1b556251d31"
+    }
+    Frame {
+        msec: 720
+        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
+    }
+    Frame {
+        msec: 736
+        hash: "b74521d6ac531414aeeca0fb28379d11"
+    }
+    Frame {
+        msec: 752
+        hash: "a6f17da2dd581bdc249ff62f833dc025"
+    }
+    Frame {
+        msec: 768
+        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
+    }
+    Frame {
+        msec: 784
+        hash: "1ea07ee309ce2c52cbc36370b75a872f"
+    }
+    Frame {
+        msec: 800
+        hash: "593a8a45c3a0cd7ce1cb6bd1913136ba"
+    }
+    Frame {
+        msec: 816
+        hash: "c7eb7837dce71c914186326216214eeb"
+    }
+    Frame {
+        msec: 832
+        hash: "0cba07ca38c7f0483244832a42d9ac53"
+    }
+    Frame {
+        msec: 848
+        hash: "93cf31eabb454ec536c638a506be0648"
+    }
+    Frame {
+        msec: 864
+        hash: "e8a61d3858244127cb2b2812f04f5ce9"
+    }
+    Frame {
+        msec: 880
+        hash: "1ac8c393f084aa1894c26610b7f40ea6"
+    }
+    Frame {
+        msec: 896
+        hash: "8861bf848da5c96b35addff736b01520"
+    }
+    Frame {
+        msec: 912
+        hash: "f04e84ad3579d6334077abe73101d206"
+    }
+    Frame {
+        msec: 928
+        hash: "eac4600372f0fdfadee88896ac915a48"
+    }
+    Frame {
+        msec: 944
+        hash: "ff0928dfd16b2da9811a172c19817a97"
+    }
+    Frame {
+        msec: 960
+        image: "animated.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "7383209c80b403b93da3264eadbc047f"
+    }
+    Frame {
+        msec: 992
+        hash: "86360bd58bba5fdd901c105ddb2e3ade"
+    }
+    Frame {
+        msec: 1008
+        hash: "bc747167dfb3388ac63e9e68a86b9a03"
+    }
+    Frame {
+        msec: 1024
+        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
+    }
+    Frame {
+        msec: 1040
+        hash: "ae48da4a66f93c806725ce749700aac8"
+    }
+    Frame {
+        msec: 1056
+        hash: "c763f56728e17fc119539a4d45dfccc3"
+    }
+    Frame {
+        msec: 1072
+        hash: "956429472da133324c970774f77784f5"
+    }
+    Frame {
+        msec: 1088
+        hash: "a4ddb4956d71fd642d54757938100cf3"
+    }
+    Frame {
+        msec: 1104
+        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
+    }
+    Frame {
+        msec: 1120
+        hash: "68dae343cf324391ec6721cea14575f7"
+    }
+    Frame {
+        msec: 1136
+        hash: "81d2fc6727dc7449d1a87b4abea9b704"
+    }
+    Frame {
+        msec: 1152
+        hash: "c3a1f12febc979150028737722d6d045"
+    }
+    Frame {
+        msec: 1168
+        hash: "80ebac4d923f67fb8dba3d133ce657ba"
+    }
+    Frame {
+        msec: 1184
+        hash: "7c22fc3e30377cc14326833bdd23ddd8"
+    }
+    Frame {
+        msec: 1200
+        hash: "5359f5e45e5467c62c2d9521c8199c48"
+    }
+    Frame {
+        msec: 1216
+        hash: "30f84a7f67b13a945ba6d5935ea92da5"
+    }
+    Frame {
+        msec: 1232
+        hash: "08f55088cdce741c67539f73291e53ab"
+    }
+    Frame {
+        msec: 1248
+        hash: "93128906d054e44bfd126fc22bdc3102"
+    }
+    Frame {
+        msec: 1264
+        hash: "97f7a2175dcf9ac2581a92d614d72f88"
+    }
+    Frame {
+        msec: 1280
+        hash: "587cb6e05048579088e88e0180e3ad48"
+    }
+    Frame {
+        msec: 1296
+        hash: "985868869ef2c332da379460a2f3a71b"
+    }
+    Frame {
+        msec: 1312
+        hash: "94084ca4998fcda408f6987f52c34185"
+    }
+    Frame {
+        msec: 1328
+        hash: "e91bb914c1eb63cd4269b30a220a128a"
+    }
+    Frame {
+        msec: 1344
+        hash: "e880d93963c80e4fab5173554c9600fc"
+    }
+    Frame {
+        msec: 1360
+        hash: "84c94704c16e246df1048f958cc8cefb"
+    }
+    Frame {
+        msec: 1376
+        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
+    }
+    Frame {
+        msec: 1392
+        hash: "99de44f74f8e1f79652ab46afb4bb59e"
+    }
+    Frame {
+        msec: 1408
+        hash: "44072400ca3f0237d1aebae28a94becc"
+    }
+    Frame {
+        msec: 1424
+        hash: "a1bd4e995365e79389dba80f9e3b7af8"
+    }
+    Frame {
+        msec: 1440
+        hash: "95d776c84fe155617fc4ee51bdb45b7e"
+    }
+    Frame {
+        msec: 1456
+        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
+    }
+    Frame {
+        msec: 1472
+        hash: "826c7741ba0c51de407bb799e8f360b5"
+    }
+    Frame {
+        msec: 1488
+        hash: "11673a112566a64aca3c7010b9cc9c4d"
+    }
+    Frame {
+        msec: 1504
+        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
+    }
+    Frame {
+        msec: 1520
+        hash: "5b027815ea3c1ea54e1a02c798c468db"
+    }
+    Frame {
+        msec: 1536
+        hash: "65c514c9e926affe1da0b4826d2754c7"
+    }
+    Frame {
+        msec: 1552
+        hash: "73c5f23f51797a33f4d2898738e6356e"
+    }
+    Frame {
+        msec: 1568
+        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
+    }
+    Frame {
+        msec: 1584
+        hash: "fb17df681d99d5de05f6329bba697ea5"
+    }
+    Frame {
+        msec: 1600
+        hash: "1bf7a98884b506b38326f59f85a53f41"
+    }
+    Frame {
+        msec: 1616
+        hash: "0b1a741975e3d9ef8f5e78f371c89441"
+    }
+    Frame {
+        msec: 1632
+        hash: "a6937ee49648ed0cb409063bf1da3b87"
+    }
+    Frame {
+        msec: 1648
+        hash: "a790f0e884ab85f7802dd094e4ef550f"
+    }
+    Frame {
+        msec: 1664
+        hash: "3b644aac161f0a75bfb64f5075373190"
+    }
+    Frame {
+        msec: 1680
+        hash: "b12faa76c07adc21634cd8f8cb8436ae"
+    }
+    Frame {
+        msec: 1696
+        hash: "3fb20f9dbd40b4729235e13af9643afc"
+    }
+    Frame {
+        msec: 1712
+        hash: "f57727419bb51fb1e589b960ddeb20ae"
+    }
+    Frame {
+        msec: 1728
+        hash: "7b78cba247f2c209ed81e003ca25d0a5"
+    }
+    Frame {
+        msec: 1744
+        hash: "8172e076b05d95248d89e815fde820ef"
+    }
+    Frame {
+        msec: 1760
+        hash: "a88d6fc324ef48aa52c642a1662ec679"
+    }
+    Frame {
+        msec: 1776
+        hash: "74c1e71378b502bc1b732a55806a10f1"
+    }
+    Frame {
+        msec: 1792
+        hash: "6eae517ad33f0609c31ef1f8f80ba899"
+    }
+    Frame {
+        msec: 1808
+        hash: "a67e9a0f55512fb1c55f13c6b483923b"
+    }
+    Frame {
+        msec: 1824
+        hash: "4887cd34d9926a361f3ca2e75be53ea6"
+    }
+    Frame {
+        msec: 1840
+        hash: "13ca95adab171d9fad9ee8b75d0226bc"
+    }
+    Frame {
+        msec: 1856
+        hash: "affab9fb48c889a2680eb81458d400f9"
+    }
+    Frame {
+        msec: 1872
+        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
+    }
+    Frame {
+        msec: 1888
+        hash: "36c054064c9a76f4072492e55c70fb6c"
+    }
+    Frame {
+        msec: 1904
+        hash: "d1ed4916cb1ecff60277d74369ff311b"
+    }
+    Frame {
+        msec: 1920
+        image: "animated.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "29245946cbd811fe6bf6b2b41cc13002"
+    }
+    Frame {
+        msec: 1952
+        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
+    }
+    Frame {
+        msec: 1968
+        hash: "058c918e83bfdd665cd836566b53959b"
+    }
+    Frame {
+        msec: 1984
+        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
+    }
+    Frame {
+        msec: 2000
+        hash: "ed5d80c33dbf72624385b1cf43784626"
+    }
+    Frame {
+        msec: 2016
+        hash: "911591db1519ba264847f09868e38e0e"
+    }
+    Frame {
+        msec: 2032
+        hash: "ed5d80c33dbf72624385b1cf43784626"
+    }
+    Frame {
+        msec: 2048
+        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
+    }
+    Frame {
+        msec: 2064
+        hash: "058c918e83bfdd665cd836566b53959b"
+    }
+    Frame {
+        msec: 2080
+        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
+    }
+    Frame {
+        msec: 2096
+        hash: "29245946cbd811fe6bf6b2b41cc13002"
+    }
+    Frame {
+        msec: 2112
+        hash: "63ebaa4869728f5e2891d068e4b0091c"
+    }
+    Frame {
+        msec: 2128
+        hash: "d1ed4916cb1ecff60277d74369ff311b"
+    }
+    Frame {
+        msec: 2144
+        hash: "36c054064c9a76f4072492e55c70fb6c"
+    }
+    Frame {
+        msec: 2160
+        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
+    }
+    Frame {
+        msec: 2176
+        hash: "affab9fb48c889a2680eb81458d400f9"
+    }
+    Frame {
+        msec: 2192
+        hash: "13ca95adab171d9fad9ee8b75d0226bc"
+    }
+    Frame {
+        msec: 2208
+        hash: "4887cd34d9926a361f3ca2e75be53ea6"
+    }
+    Frame {
+        msec: 2224
+        hash: "a67e9a0f55512fb1c55f13c6b483923b"
+    }
+    Frame {
+        msec: 2240
+        hash: "6eae517ad33f0609c31ef1f8f80ba899"
+    }
+    Frame {
+        msec: 2256
+        hash: "74c1e71378b502bc1b732a55806a10f1"
+    }
+    Frame {
+        msec: 2272
+        hash: "a88d6fc324ef48aa52c642a1662ec679"
+    }
+    Frame {
+        msec: 2288
+        hash: "8172e076b05d95248d89e815fde820ef"
+    }
+    Frame {
+        msec: 2304
+        hash: "7b78cba247f2c209ed81e003ca25d0a5"
+    }
+    Frame {
+        msec: 2320
+        hash: "f57727419bb51fb1e589b960ddeb20ae"
+    }
+    Frame {
+        msec: 2336
+        hash: "3fb20f9dbd40b4729235e13af9643afc"
+    }
+    Frame {
+        msec: 2352
+        hash: "b12faa76c07adc21634cd8f8cb8436ae"
+    }
+    Frame {
+        msec: 2368
+        hash: "3b644aac161f0a75bfb64f5075373190"
+    }
+    Frame {
+        msec: 2384
+        hash: "a790f0e884ab85f7802dd094e4ef550f"
+    }
+    Frame {
+        msec: 2400
+        hash: "a6937ee49648ed0cb409063bf1da3b87"
+    }
+    Frame {
+        msec: 2416
+        hash: "0b1a741975e3d9ef8f5e78f371c89441"
+    }
+    Frame {
+        msec: 2432
+        hash: "1bf7a98884b506b38326f59f85a53f41"
+    }
+    Frame {
+        msec: 2448
+        hash: "fb17df681d99d5de05f6329bba697ea5"
+    }
+    Frame {
+        msec: 2464
+        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
+    }
+    Frame {
+        msec: 2480
+        hash: "73c5f23f51797a33f4d2898738e6356e"
+    }
+    Frame {
+        msec: 2496
+        hash: "65c514c9e926affe1da0b4826d2754c7"
+    }
+    Frame {
+        msec: 2512
+        hash: "5b027815ea3c1ea54e1a02c798c468db"
+    }
+    Frame {
+        msec: 2528
+        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
+    }
+    Frame {
+        msec: 2544
+        hash: "11673a112566a64aca3c7010b9cc9c4d"
+    }
+    Frame {
+        msec: 2560
+        hash: "826c7741ba0c51de407bb799e8f360b5"
+    }
+    Frame {
+        msec: 2576
+        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
+    }
+    Frame {
+        msec: 2592
+        hash: "95d776c84fe155617fc4ee51bdb45b7e"
+    }
+    Frame {
+        msec: 2608
+        hash: "a1bd4e995365e79389dba80f9e3b7af8"
+    }
+    Frame {
+        msec: 2624
+        hash: "44072400ca3f0237d1aebae28a94becc"
+    }
+    Frame {
+        msec: 2640
+        hash: "99de44f74f8e1f79652ab46afb4bb59e"
+    }
+    Frame {
+        msec: 2656
+        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
+    }
+    Frame {
+        msec: 2672
+        hash: "84c94704c16e246df1048f958cc8cefb"
+    }
+    Frame {
+        msec: 2688
+        hash: "e880d93963c80e4fab5173554c9600fc"
+    }
+    Frame {
+        msec: 2704
+        hash: "e91bb914c1eb63cd4269b30a220a128a"
+    }
+    Frame {
+        msec: 2720
+        hash: "94084ca4998fcda408f6987f52c34185"
+    }
+    Frame {
+        msec: 2736
+        hash: "985868869ef2c332da379460a2f3a71b"
+    }
+    Frame {
+        msec: 2752
+        hash: "587cb6e05048579088e88e0180e3ad48"
+    }
+    Frame {
+        msec: 2768
+        hash: "97f7a2175dcf9ac2581a92d614d72f88"
+    }
+    Frame {
+        msec: 2784
+        hash: "93128906d054e44bfd126fc22bdc3102"
+    }
+    Frame {
+        msec: 2800
+        hash: "08f55088cdce741c67539f73291e53ab"
+    }
+    Frame {
+        msec: 2816
+        hash: "30f84a7f67b13a945ba6d5935ea92da5"
+    }
+    Frame {
+        msec: 2832
+        hash: "5359f5e45e5467c62c2d9521c8199c48"
+    }
+    Frame {
+        msec: 2848
+        hash: "7c22fc3e30377cc14326833bdd23ddd8"
+    }
+    Frame {
+        msec: 2864
+        hash: "80ebac4d923f67fb8dba3d133ce657ba"
+    }
+    Frame {
+        msec: 2880
+        image: "animated.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "81d2fc6727dc7449d1a87b4abea9b704"
+    }
+    Frame {
+        msec: 2912
+        hash: "68dae343cf324391ec6721cea14575f7"
+    }
+    Frame {
+        msec: 2928
+        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
+    }
+    Frame {
+        msec: 2944
+        hash: "a4ddb4956d71fd642d54757938100cf3"
+    }
+    Frame {
+        msec: 2960
+        hash: "956429472da133324c970774f77784f5"
+    }
+    Frame {
+        msec: 2976
+        hash: "c763f56728e17fc119539a4d45dfccc3"
+    }
+    Frame {
+        msec: 2992
+        hash: "ae48da4a66f93c806725ce749700aac8"
+    }
+    Frame {
+        msec: 3008
+        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
+    }
+    Frame {
+        msec: 3024
+        hash: "bc747167dfb3388ac63e9e68a86b9a03"
+    }
+    Frame {
+        msec: 3040
+        hash: "86360bd58bba5fdd901c105ddb2e3ade"
+    }
+    Frame {
+        msec: 3056
+        hash: "7383209c80b403b93da3264eadbc047f"
+    }
+    Frame {
+        msec: 3072
+        hash: "280288a7988736e30a2a3e4289ac3b0c"
+    }
+    Frame {
+        msec: 3088
+        hash: "ff0928dfd16b2da9811a172c19817a97"
+    }
+    Frame {
+        msec: 3104
+        hash: "eac4600372f0fdfadee88896ac915a48"
+    }
+    Frame {
+        msec: 3120
+        hash: "f04e84ad3579d6334077abe73101d206"
+    }
+    Frame {
+        msec: 3136
+        hash: "8861bf848da5c96b35addff736b01520"
+    }
+    Frame {
+        msec: 3152
+        hash: "1ac8c393f084aa1894c26610b7f40ea6"
+    }
+    Frame {
+        msec: 3168
+        hash: "e8a61d3858244127cb2b2812f04f5ce9"
+    }
+    Frame {
+        msec: 3184
+        hash: "93cf31eabb454ec536c638a506be0648"
+    }
+    Frame {
+        msec: 3200
+        hash: "0cba07ca38c7f0483244832a42d9ac53"
+    }
+    Frame {
+        msec: 3216
+        hash: "c7eb7837dce71c914186326216214eeb"
+    }
+    Frame {
+        msec: 3232
+        hash: "593a8a45c3a0cd7ce1cb6bd1913136ba"
+    }
+    Frame {
+        msec: 3248
+        hash: "1ea07ee309ce2c52cbc36370b75a872f"
+    }
+    Frame {
+        msec: 3264
+        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
+    }
+    Frame {
+        msec: 3280
+        hash: "a6f17da2dd581bdc249ff62f833dc025"
+    }
+    Frame {
+        msec: 3296
+        hash: "b74521d6ac531414aeeca0fb28379d11"
+    }
+    Frame {
+        msec: 3312
+        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
+    }
+    Frame {
+        msec: 3328
+        hash: "4e60300cfab8634e04dcd1b556251d31"
+    }
+    Frame {
+        msec: 3344
+        hash: "60f158382f75103c78e2b9b408e0fe65"
+    }
+    Frame {
+        msec: 3360
+        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
+    }
+    Frame {
+        msec: 3376
+        hash: "554e1d360463871e7c05cfe6f8abe1dd"
+    }
+    Frame {
+        msec: 3392
+        hash: "e418b5f54705515dce5ce3b4cbc45d19"
+    }
+    Frame {
+        msec: 3408
+        hash: "19d05a96f3ae7388e854bbf1075b51c1"
+    }
+    Frame {
+        msec: 3424
+        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
+    }
+    Frame {
+        msec: 3440
+        hash: "18c2f321a149e38b258ac264d40c2376"
+    }
+    Frame {
+        msec: 3456
+        hash: "a40014d842471784e1222eb205395f6f"
+    }
+    Frame {
+        msec: 3472
+        hash: "f1a7a4a67a21f5025294af4bea3f8998"
+    }
+    Frame {
+        msec: 3488
+        hash: "3152e5f29015ece423fbdd11a2b382b8"
+    }
+    Frame {
+        msec: 3504
+        hash: "2a7bed775824968e318c3d40fbc5b1c2"
+    }
+    Frame {
+        msec: 3520
+        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
+    }
+    Frame {
+        msec: 3536
+        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
+    }
+    Frame {
+        msec: 3552
+        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
+    }
+    Frame {
+        msec: 3568
+        hash: "06d8d8a1a41893d4e27725948a75caf4"
+    }
+    Frame {
+        msec: 3584
+        hash: "3f62f032239d412d3637198f5e3e83d6"
+    }
+    Frame {
+        msec: 3600
+        hash: "01947e631c3db43f7c5b4427229bc0c8"
+    }
+    Frame {
+        msec: 3616
+        hash: "2266df495ab5265e7514a506d3bf5bc6"
+    }
+    Frame {
+        msec: 3632
+        hash: "8c66a33d26eec2a1133f4362710a5fab"
+    }
+    Frame {
+        msec: 3648
+        hash: "75c9bf83ca3fe24612c245698c089430"
+    }
+    Frame {
+        msec: 3664
+        hash: "c1936628aec13e08e9581dcd2c6d5717"
+    }
+    Frame {
+        msec: 3680
+        hash: "a85ee8be6a47bbd1b14137803ce606ec"
+    }
+    Frame {
+        msec: 3696
+        hash: "8419f1d75b14130730bcfec4e3a9b058"
+    }
+    Frame {
+        msec: 3712
+        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
+    }
+    Frame {
+        msec: 3728
+        hash: "406224b535b4425d2708df0083acdc8e"
+    }
+    Frame {
+        msec: 3744
+        hash: "3dac1d9632378bd18c1c938a4868e3fb"
+    }
+    Frame {
+        msec: 3760
+        hash: "08b9be66e23c7b6f6f629c7470394601"
+    }
+    Frame {
+        msec: 3776
+        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
+    }
+    Frame {
+        msec: 3792
+        hash: "4d45d70f997c2c67166905c97a900d2e"
+    }
+    Frame {
+        msec: 3808
+        hash: "c5b3dede34b0d1d78135e39c41d117c6"
+    }
+    Frame {
+        msec: 3824
+        hash: "b63e4d1686057828fd8781f1c33585f5"
+    }
+    Frame {
+        msec: 3840
+        image: "animated.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "465ec993948f7b75aeb5759976f4620d"
+    }
+    Frame {
+        msec: 3872
+        hash: "228d5312c261d1a5455faf69ec2f2520"
+    }
+    Frame {
+        msec: 3888
+        hash: "aacf9ae3c23d174a1c1cda493600e355"
+    }
+    Frame {
+        msec: 3904
+        hash: "4c60d345821f515c7811f3b69eb94607"
+    }
+    Frame {
+        msec: 3920
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 3936
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 3952
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 3968
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 3984
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4000
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4016
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4032
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4048
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4064
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4080
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4096
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4112
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 4128
+        hash: "4c60d345821f515c7811f3b69eb94607"
+    }
+    Frame {
+        msec: 4144
+        hash: "aacf9ae3c23d174a1c1cda493600e355"
+    }
+    Frame {
+        msec: 4160
+        hash: "228d5312c261d1a5455faf69ec2f2520"
+    }
+    Frame {
+        msec: 4176
+        hash: "465ec993948f7b75aeb5759976f4620d"
+    }
+    Frame {
+        msec: 4192
+        hash: "755cfccc38bababc468fe6e1076804bb"
+    }
+    Frame {
+        msec: 4208
+        hash: "b63e4d1686057828fd8781f1c33585f5"
+    }
+    Frame {
+        msec: 4224
+        hash: "c5b3dede34b0d1d78135e39c41d117c6"
+    }
+    Frame {
+        msec: 4240
+        hash: "4d45d70f997c2c67166905c97a900d2e"
+    }
+    Frame {
+        msec: 4256
+        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
+    }
+    Frame {
+        msec: 4272
+        hash: "08b9be66e23c7b6f6f629c7470394601"
+    }
+    Frame {
+        msec: 4288
+        hash: "3dac1d9632378bd18c1c938a4868e3fb"
+    }
+    Frame {
+        msec: 4304
+        hash: "406224b535b4425d2708df0083acdc8e"
+    }
+    Frame {
+        msec: 4320
+        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
+    }
+    Frame {
+        msec: 4336
+        hash: "8419f1d75b14130730bcfec4e3a9b058"
+    }
+    Frame {
+        msec: 4352
+        hash: "a85ee8be6a47bbd1b14137803ce606ec"
+    }
+    Frame {
+        msec: 4368
+        hash: "c1936628aec13e08e9581dcd2c6d5717"
+    }
+    Frame {
+        msec: 4384
+        hash: "75c9bf83ca3fe24612c245698c089430"
+    }
+    Frame {
+        msec: 4400
+        hash: "8c66a33d26eec2a1133f4362710a5fab"
+    }
+    Frame {
+        msec: 4416
+        hash: "2266df495ab5265e7514a506d3bf5bc6"
+    }
+    Frame {
+        msec: 4432
+        hash: "01947e631c3db43f7c5b4427229bc0c8"
+    }
+    Frame {
+        msec: 4448
+        hash: "3f62f032239d412d3637198f5e3e83d6"
+    }
+    Frame {
+        msec: 4464
+        hash: "06d8d8a1a41893d4e27725948a75caf4"
+    }
+    Frame {
+        msec: 4480
+        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
+    }
+    Frame {
+        msec: 4496
+        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
+    }
+    Frame {
+        msec: 4512
+        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
+    }
+    Frame {
+        msec: 4528
+        hash: "2a7bed775824968e318c3d40fbc5b1c2"
+    }
+    Frame {
+        msec: 4544
+        hash: "3152e5f29015ece423fbdd11a2b382b8"
+    }
+    Frame {
+        msec: 4560
+        hash: "f1a7a4a67a21f5025294af4bea3f8998"
+    }
+    Frame {
+        msec: 4576
+        hash: "a40014d842471784e1222eb205395f6f"
+    }
+    Frame {
+        msec: 4592
+        hash: "18c2f321a149e38b258ac264d40c2376"
+    }
+    Frame {
+        msec: 4608
+        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
+    }
+    Frame {
+        msec: 4624
+        hash: "19d05a96f3ae7388e854bbf1075b51c1"
+    }
+    Frame {
+        msec: 4640
+        hash: "e418b5f54705515dce5ce3b4cbc45d19"
+    }
+    Frame {
+        msec: 4656
+        hash: "554e1d360463871e7c05cfe6f8abe1dd"
+    }
+    Frame {
+        msec: 4672
+        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
+    }
+    Frame {
+        msec: 4688
+        hash: "60f158382f75103c78e2b9b408e0fe65"
+    }
+    Frame {
+        msec: 4704
+        hash: "4e60300cfab8634e04dcd1b556251d31"
+    }
+    Frame {
+        msec: 4720
+        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
+    }
+    Frame {
+        msec: 4736
+        hash: "b74521d6ac531414aeeca0fb28379d11"
+    }
+    Frame {
+        msec: 4752
+        hash: "a6f17da2dd581bdc249ff62f833dc025"
+    }
+    Frame {
+        msec: 4768
+        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
+    }
+    Frame {
+        msec: 4784
+        hash: "1ea07ee309ce2c52cbc36370b75a872f"
+    }
+    Frame {
+        msec: 4800
+        image: "animated.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "c7eb7837dce71c914186326216214eeb"
+    }
+    Frame {
+        msec: 4832
+        hash: "0cba07ca38c7f0483244832a42d9ac53"
+    }
+    Frame {
+        msec: 4848
+        hash: "93cf31eabb454ec536c638a506be0648"
+    }
+    Frame {
+        msec: 4864
+        hash: "e8a61d3858244127cb2b2812f04f5ce9"
+    }
+    Frame {
+        msec: 4880
+        hash: "1ac8c393f084aa1894c26610b7f40ea6"
+    }
+    Frame {
+        msec: 4896
+        hash: "8861bf848da5c96b35addff736b01520"
+    }
+    Frame {
+        msec: 4912
+        hash: "f04e84ad3579d6334077abe73101d206"
+    }
+    Frame {
+        msec: 4928
+        hash: "eac4600372f0fdfadee88896ac915a48"
+    }
+    Frame {
+        msec: 4944
+        hash: "ff0928dfd16b2da9811a172c19817a97"
+    }
+    Frame {
+        msec: 4960
+        hash: "280288a7988736e30a2a3e4289ac3b0c"
+    }
+    Frame {
+        msec: 4976
+        hash: "7383209c80b403b93da3264eadbc047f"
+    }
+    Frame {
+        msec: 4992
+        hash: "86360bd58bba5fdd901c105ddb2e3ade"
+    }
+    Frame {
+        msec: 5008
+        hash: "bc747167dfb3388ac63e9e68a86b9a03"
+    }
+    Frame {
+        msec: 5024
+        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
+    }
+    Frame {
+        msec: 5040
+        hash: "ae48da4a66f93c806725ce749700aac8"
+    }
+    Frame {
+        msec: 5056
+        hash: "c763f56728e17fc119539a4d45dfccc3"
+    }
+    Frame {
+        msec: 5072
+        hash: "956429472da133324c970774f77784f5"
+    }
+    Frame {
+        msec: 5088
+        hash: "a4ddb4956d71fd642d54757938100cf3"
+    }
+    Frame {
+        msec: 5104
+        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
+    }
+    Frame {
+        msec: 5120
+        hash: "68dae343cf324391ec6721cea14575f7"
+    }
+    Frame {
+        msec: 5136
+        hash: "81d2fc6727dc7449d1a87b4abea9b704"
+    }
+    Frame {
+        msec: 5152
+        hash: "c3a1f12febc979150028737722d6d045"
+    }
+    Frame {
+        msec: 5168
+        hash: "80ebac4d923f67fb8dba3d133ce657ba"
+    }
+    Frame {
+        msec: 5184
+        hash: "7c22fc3e30377cc14326833bdd23ddd8"
+    }
+    Frame {
+        msec: 5200
+        hash: "5359f5e45e5467c62c2d9521c8199c48"
+    }
+    Frame {
+        msec: 5216
+        hash: "30f84a7f67b13a945ba6d5935ea92da5"
+    }
+    Frame {
+        msec: 5232
+        hash: "08f55088cdce741c67539f73291e53ab"
+    }
+    Frame {
+        msec: 5248
+        hash: "93128906d054e44bfd126fc22bdc3102"
+    }
+    Frame {
+        msec: 5264
+        hash: "97f7a2175dcf9ac2581a92d614d72f88"
+    }
+    Frame {
+        msec: 5280
+        hash: "587cb6e05048579088e88e0180e3ad48"
+    }
+    Frame {
+        msec: 5296
+        hash: "985868869ef2c332da379460a2f3a71b"
+    }
+    Frame {
+        msec: 5312
+        hash: "94084ca4998fcda408f6987f52c34185"
+    }
+    Frame {
+        msec: 5328
+        hash: "e91bb914c1eb63cd4269b30a220a128a"
+    }
+    Frame {
+        msec: 5344
+        hash: "e880d93963c80e4fab5173554c9600fc"
+    }
+    Frame {
+        msec: 5360
+        hash: "84c94704c16e246df1048f958cc8cefb"
+    }
+    Frame {
+        msec: 5376
+        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
+    }
+    Frame {
+        msec: 5392
+        hash: "99de44f74f8e1f79652ab46afb4bb59e"
+    }
+    Frame {
+        msec: 5408
+        hash: "44072400ca3f0237d1aebae28a94becc"
+    }
+    Frame {
+        msec: 5424
+        hash: "a1bd4e995365e79389dba80f9e3b7af8"
+    }
+    Frame {
+        msec: 5440
+        hash: "95d776c84fe155617fc4ee51bdb45b7e"
+    }
+    Frame {
+        msec: 5456
+        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
+    }
+    Frame {
+        msec: 5472
+        hash: "826c7741ba0c51de407bb799e8f360b5"
+    }
+    Frame {
+        msec: 5488
+        hash: "11673a112566a64aca3c7010b9cc9c4d"
+    }
+    Frame {
+        msec: 5504
+        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
+    }
+    Frame {
+        msec: 5520
+        hash: "5b027815ea3c1ea54e1a02c798c468db"
+    }
+    Frame {
+        msec: 5536
+        hash: "65c514c9e926affe1da0b4826d2754c7"
+    }
+    Frame {
+        msec: 5552
+        hash: "73c5f23f51797a33f4d2898738e6356e"
+    }
+    Frame {
+        msec: 5568
+        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
+    }
+    Frame {
+        msec: 5584
+        hash: "fb17df681d99d5de05f6329bba697ea5"
+    }
+    Frame {
+        msec: 5600
+        hash: "1bf7a98884b506b38326f59f85a53f41"
+    }
+    Frame {
+        msec: 5616
+        hash: "0b1a741975e3d9ef8f5e78f371c89441"
+    }
+    Frame {
+        msec: 5632
+        hash: "a6937ee49648ed0cb409063bf1da3b87"
+    }
+    Frame {
+        msec: 5648
+        hash: "a790f0e884ab85f7802dd094e4ef550f"
+    }
+    Frame {
+        msec: 5664
+        hash: "3b644aac161f0a75bfb64f5075373190"
+    }
+    Frame {
+        msec: 5680
+        hash: "b12faa76c07adc21634cd8f8cb8436ae"
+    }
+    Frame {
+        msec: 5696
+        hash: "3fb20f9dbd40b4729235e13af9643afc"
+    }
+    Frame {
+        msec: 5712
+        hash: "f57727419bb51fb1e589b960ddeb20ae"
+    }
+    Frame {
+        msec: 5728
+        hash: "7b78cba247f2c209ed81e003ca25d0a5"
+    }
+    Frame {
+        msec: 5744
+        hash: "8172e076b05d95248d89e815fde820ef"
+    }
+    Frame {
+        msec: 5760
+        image: "animated.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "74c1e71378b502bc1b732a55806a10f1"
+    }
+    Frame {
+        msec: 5792
+        hash: "6eae517ad33f0609c31ef1f8f80ba899"
+    }
+    Frame {
+        msec: 5808
+        hash: "a67e9a0f55512fb1c55f13c6b483923b"
+    }
+    Frame {
+        msec: 5824
+        hash: "4887cd34d9926a361f3ca2e75be53ea6"
+    }
+    Frame {
+        msec: 5840
+        hash: "13ca95adab171d9fad9ee8b75d0226bc"
+    }
+    Frame {
+        msec: 5856
+        hash: "affab9fb48c889a2680eb81458d400f9"
+    }
+    Frame {
+        msec: 5872
+        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
+    }
+    Frame {
+        msec: 5888
+        hash: "36c054064c9a76f4072492e55c70fb6c"
+    }
+    Frame {
+        msec: 5904
+        hash: "d1ed4916cb1ecff60277d74369ff311b"
+    }
+    Frame {
+        msec: 5920
+        hash: "63ebaa4869728f5e2891d068e4b0091c"
+    }
+    Frame {
+        msec: 5936
+        hash: "29245946cbd811fe6bf6b2b41cc13002"
+    }
+    Frame {
+        msec: 5952
+        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
+    }
+    Frame {
+        msec: 5968
+        hash: "058c918e83bfdd665cd836566b53959b"
+    }
+    Frame {
+        msec: 5984
+        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
+    }
+    Frame {
+        msec: 6000
+        hash: "ed5d80c33dbf72624385b1cf43784626"
+    }
+    Frame {
+        msec: 6016
+        hash: "911591db1519ba264847f09868e38e0e"
+    }
+    Frame {
+        msec: 6032
+        hash: "ed5d80c33dbf72624385b1cf43784626"
+    }
+    Frame {
+        msec: 6048
+        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
+    }
+    Frame {
+        msec: 6064
+        hash: "058c918e83bfdd665cd836566b53959b"
+    }
+    Frame {
+        msec: 6080
+        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
+    }
+    Frame {
+        msec: 6096
+        hash: "29245946cbd811fe6bf6b2b41cc13002"
+    }
+    Frame {
+        msec: 6112
+        hash: "63ebaa4869728f5e2891d068e4b0091c"
+    }
+    Frame {
+        msec: 6128
+        hash: "d1ed4916cb1ecff60277d74369ff311b"
+    }
+    Frame {
+        msec: 6144
+        hash: "36c054064c9a76f4072492e55c70fb6c"
+    }
+    Frame {
+        msec: 6160
+        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
+    }
+    Frame {
+        msec: 6176
+        hash: "affab9fb48c889a2680eb81458d400f9"
+    }
+    Frame {
+        msec: 6192
+        hash: "13ca95adab171d9fad9ee8b75d0226bc"
+    }
+    Frame {
+        msec: 6208
+        hash: "4887cd34d9926a361f3ca2e75be53ea6"
+    }
+    Frame {
+        msec: 6224
+        hash: "a67e9a0f55512fb1c55f13c6b483923b"
+    }
+    Frame {
+        msec: 6240
+        hash: "6eae517ad33f0609c31ef1f8f80ba899"
+    }
+    Frame {
+        msec: 6256
+        hash: "74c1e71378b502bc1b732a55806a10f1"
+    }
+    Frame {
+        msec: 6272
+        hash: "a88d6fc324ef48aa52c642a1662ec679"
+    }
+    Frame {
+        msec: 6288
+        hash: "8172e076b05d95248d89e815fde820ef"
+    }
+    Frame {
+        msec: 6304
+        hash: "7b78cba247f2c209ed81e003ca25d0a5"
+    }
+    Frame {
+        msec: 6320
+        hash: "f57727419bb51fb1e589b960ddeb20ae"
+    }
+    Frame {
+        msec: 6336
+        hash: "3fb20f9dbd40b4729235e13af9643afc"
+    }
+    Frame {
+        msec: 6352
+        hash: "b12faa76c07adc21634cd8f8cb8436ae"
+    }
+    Frame {
+        msec: 6368
+        hash: "3b644aac161f0a75bfb64f5075373190"
+    }
+    Frame {
+        msec: 6384
+        hash: "a790f0e884ab85f7802dd094e4ef550f"
+    }
+    Frame {
+        msec: 6400
+        hash: "a6937ee49648ed0cb409063bf1da3b87"
+    }
+    Frame {
+        msec: 6416
+        hash: "0b1a741975e3d9ef8f5e78f371c89441"
+    }
+    Frame {
+        msec: 6432
+        hash: "1bf7a98884b506b38326f59f85a53f41"
+    }
+    Frame {
+        msec: 6448
+        hash: "fb17df681d99d5de05f6329bba697ea5"
+    }
+    Frame {
+        msec: 6464
+        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
+    }
+    Frame {
+        msec: 6480
+        hash: "73c5f23f51797a33f4d2898738e6356e"
+    }
+    Frame {
+        msec: 6496
+        hash: "65c514c9e926affe1da0b4826d2754c7"
+    }
+    Frame {
+        msec: 6512
+        hash: "5b027815ea3c1ea54e1a02c798c468db"
+    }
+    Frame {
+        msec: 6528
+        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
+    }
+    Frame {
+        msec: 6544
+        hash: "11673a112566a64aca3c7010b9cc9c4d"
+    }
+    Frame {
+        msec: 6560
+        hash: "826c7741ba0c51de407bb799e8f360b5"
+    }
+    Frame {
+        msec: 6576
+        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
+    }
+    Frame {
+        msec: 6592
+        hash: "95d776c84fe155617fc4ee51bdb45b7e"
+    }
+    Frame {
+        msec: 6608
+        hash: "a1bd4e995365e79389dba80f9e3b7af8"
+    }
+    Frame {
+        msec: 6624
+        hash: "44072400ca3f0237d1aebae28a94becc"
+    }
+    Frame {
+        msec: 6640
+        hash: "99de44f74f8e1f79652ab46afb4bb59e"
+    }
+    Frame {
+        msec: 6656
+        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
+    }
+    Frame {
+        msec: 6672
+        hash: "84c94704c16e246df1048f958cc8cefb"
+    }
+    Frame {
+        msec: 6688
+        hash: "e880d93963c80e4fab5173554c9600fc"
+    }
+    Frame {
+        msec: 6704
+        hash: "e91bb914c1eb63cd4269b30a220a128a"
+    }
+    Frame {
+        msec: 6720
+        image: "animated.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "985868869ef2c332da379460a2f3a71b"
+    }
+    Frame {
+        msec: 6752
+        hash: "587cb6e05048579088e88e0180e3ad48"
+    }
+    Frame {
+        msec: 6768
+        hash: "97f7a2175dcf9ac2581a92d614d72f88"
+    }
+    Frame {
+        msec: 6784
+        hash: "93128906d054e44bfd126fc22bdc3102"
+    }
+    Frame {
+        msec: 6800
+        hash: "08f55088cdce741c67539f73291e53ab"
+    }
+    Frame {
+        msec: 6816
+        hash: "30f84a7f67b13a945ba6d5935ea92da5"
+    }
+    Frame {
+        msec: 6832
+        hash: "5359f5e45e5467c62c2d9521c8199c48"
+    }
+    Frame {
+        msec: 6848
+        hash: "7c22fc3e30377cc14326833bdd23ddd8"
+    }
+    Frame {
+        msec: 6864
+        hash: "80ebac4d923f67fb8dba3d133ce657ba"
+    }
+    Frame {
+        msec: 6880
+        hash: "c3a1f12febc979150028737722d6d045"
+    }
+    Frame {
+        msec: 6896
+        hash: "81d2fc6727dc7449d1a87b4abea9b704"
+    }
+    Frame {
+        msec: 6912
+        hash: "68dae343cf324391ec6721cea14575f7"
+    }
+    Frame {
+        msec: 6928
+        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
+    }
+    Frame {
+        msec: 6944
+        hash: "a4ddb4956d71fd642d54757938100cf3"
+    }
+    Frame {
+        msec: 6960
+        hash: "956429472da133324c970774f77784f5"
+    }
+    Frame {
+        msec: 6976
+        hash: "c763f56728e17fc119539a4d45dfccc3"
+    }
+    Frame {
+        msec: 6992
+        hash: "ae48da4a66f93c806725ce749700aac8"
+    }
+    Frame {
+        msec: 7008
+        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
+    }
+    Frame {
+        msec: 7024
+        hash: "bc747167dfb3388ac63e9e68a86b9a03"
+    }
+    Frame {
+        msec: 7040
+        hash: "86360bd58bba5fdd901c105ddb2e3ade"
+    }
+    Frame {
+        msec: 7056
+        hash: "7383209c80b403b93da3264eadbc047f"
+    }
+    Frame {
+        msec: 7072
+        hash: "280288a7988736e30a2a3e4289ac3b0c"
+    }
+    Frame {
+        msec: 7088
+        hash: "ff0928dfd16b2da9811a172c19817a97"
+    }
+    Frame {
+        msec: 7104
+        hash: "eac4600372f0fdfadee88896ac915a48"
+    }
+    Frame {
+        msec: 7120
+        hash: "f04e84ad3579d6334077abe73101d206"
+    }
+    Frame {
+        msec: 7136
+        hash: "8861bf848da5c96b35addff736b01520"
+    }
+    Frame {
+        msec: 7152
+        hash: "1ac8c393f084aa1894c26610b7f40ea6"
+    }
+    Frame {
+        msec: 7168
+        hash: "e8a61d3858244127cb2b2812f04f5ce9"
+    }
+    Frame {
+        msec: 7184
+        hash: "93cf31eabb454ec536c638a506be0648"
+    }
+    Frame {
+        msec: 7200
+        hash: "0cba07ca38c7f0483244832a42d9ac53"
+    }
+    Frame {
+        msec: 7216
+        hash: "c7eb7837dce71c914186326216214eeb"
+    }
+    Frame {
+        msec: 7232
+        hash: "593a8a45c3a0cd7ce1cb6bd1913136ba"
+    }
+    Frame {
+        msec: 7248
+        hash: "1ea07ee309ce2c52cbc36370b75a872f"
+    }
+    Frame {
+        msec: 7264
+        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
+    }
+    Frame {
+        msec: 7280
+        hash: "a6f17da2dd581bdc249ff62f833dc025"
+    }
+    Frame {
+        msec: 7296
+        hash: "b74521d6ac531414aeeca0fb28379d11"
+    }
+    Frame {
+        msec: 7312
+        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
+    }
+    Frame {
+        msec: 7328
+        hash: "4e60300cfab8634e04dcd1b556251d31"
+    }
+    Frame {
+        msec: 7344
+        hash: "60f158382f75103c78e2b9b408e0fe65"
+    }
+    Frame {
+        msec: 7360
+        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
+    }
+    Frame {
+        msec: 7376
+        hash: "554e1d360463871e7c05cfe6f8abe1dd"
+    }
+    Frame {
+        msec: 7392
+        hash: "e418b5f54705515dce5ce3b4cbc45d19"
+    }
+    Frame {
+        msec: 7408
+        hash: "19d05a96f3ae7388e854bbf1075b51c1"
+    }
+    Frame {
+        msec: 7424
+        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
+    }
+    Frame {
+        msec: 7440
+        hash: "18c2f321a149e38b258ac264d40c2376"
+    }
+    Frame {
+        msec: 7456
+        hash: "a40014d842471784e1222eb205395f6f"
+    }
+    Frame {
+        msec: 7472
+        hash: "f1a7a4a67a21f5025294af4bea3f8998"
+    }
+    Frame {
+        msec: 7488
+        hash: "3152e5f29015ece423fbdd11a2b382b8"
+    }
+    Frame {
+        msec: 7504
+        hash: "2a7bed775824968e318c3d40fbc5b1c2"
+    }
+    Frame {
+        msec: 7520
+        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
+    }
+    Frame {
+        msec: 7536
+        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
+    }
+    Frame {
+        msec: 7552
+        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
+    }
+    Frame {
+        msec: 7568
+        hash: "06d8d8a1a41893d4e27725948a75caf4"
+    }
+    Frame {
+        msec: 7584
+        hash: "3f62f032239d412d3637198f5e3e83d6"
+    }
+    Frame {
+        msec: 7600
+        hash: "01947e631c3db43f7c5b4427229bc0c8"
+    }
+    Frame {
+        msec: 7616
+        hash: "2266df495ab5265e7514a506d3bf5bc6"
+    }
+    Frame {
+        msec: 7632
+        hash: "8c66a33d26eec2a1133f4362710a5fab"
+    }
+    Frame {
+        msec: 7648
+        hash: "75c9bf83ca3fe24612c245698c089430"
+    }
+    Frame {
+        msec: 7664
+        hash: "c1936628aec13e08e9581dcd2c6d5717"
+    }
+    Frame {
+        msec: 7680
+        image: "animated.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "8419f1d75b14130730bcfec4e3a9b058"
+    }
+    Frame {
+        msec: 7712
+        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
+    }
+    Frame {
+        msec: 7728
+        hash: "406224b535b4425d2708df0083acdc8e"
+    }
+    Frame {
+        msec: 7744
+        hash: "3dac1d9632378bd18c1c938a4868e3fb"
+    }
+    Frame {
+        msec: 7760
+        hash: "08b9be66e23c7b6f6f629c7470394601"
+    }
+    Frame {
+        msec: 7776
+        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
+    }
+    Frame {
+        msec: 7792
+        hash: "4d45d70f997c2c67166905c97a900d2e"
+    }
+    Frame {
+        msec: 7808
+        hash: "c5b3dede34b0d1d78135e39c41d117c6"
+    }
+    Frame {
+        msec: 7824
+        hash: "b63e4d1686057828fd8781f1c33585f5"
+    }
+    Frame {
+        msec: 7840
+        hash: "755cfccc38bababc468fe6e1076804bb"
+    }
+    Frame {
+        msec: 7856
+        hash: "465ec993948f7b75aeb5759976f4620d"
+    }
+    Frame {
+        msec: 7872
+        hash: "228d5312c261d1a5455faf69ec2f2520"
+    }
+    Frame {
+        msec: 7888
+        hash: "aacf9ae3c23d174a1c1cda493600e355"
+    }
+    Frame {
+        msec: 7904
+        hash: "4c60d345821f515c7811f3b69eb94607"
+    }
+    Frame {
+        msec: 7920
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 7936
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 7952
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 7968
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 7984
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 8000
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 8016
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 8032
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 8048
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 8064
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 8080
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 8096
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 8112
+        hash: "aec13bcab337e55832b0a02fb5c6b526"
+    }
+    Frame {
+        msec: 8128
+        hash: "4c60d345821f515c7811f3b69eb94607"
+    }
+    Frame {
+        msec: 8144
+        hash: "aacf9ae3c23d174a1c1cda493600e355"
+    }
+    Frame {
+        msec: 8160
+        hash: "228d5312c261d1a5455faf69ec2f2520"
+    }
+    Frame {
+        msec: 8176
+        hash: "465ec993948f7b75aeb5759976f4620d"
+    }
+    Frame {
+        msec: 8192
+        hash: "755cfccc38bababc468fe6e1076804bb"
+    }
+    Frame {
+        msec: 8208
+        hash: "b63e4d1686057828fd8781f1c33585f5"
+    }
+    Frame {
+        msec: 8224
+        hash: "c5b3dede34b0d1d78135e39c41d117c6"
+    }
+    Frame {
+        msec: 8240
+        hash: "4d45d70f997c2c67166905c97a900d2e"
+    }
+    Frame {
+        msec: 8256
+        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
+    }
+    Frame {
+        msec: 8272
+        hash: "08b9be66e23c7b6f6f629c7470394601"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8288
+        hash: "3dac1d9632378bd18c1c938a4868e3fb"
+    }
+    Frame {
+        msec: 8304
+        hash: "406224b535b4425d2708df0083acdc8e"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.0.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.0.png
new file mode 100644
index 0000000..80cbd26
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.1.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.1.png
new file mode 100644
index 0000000..80cbd26
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.2.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.2.png
new file mode 100644
index 0000000..80cbd26
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.3.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.3.png
new file mode 100644
index 0000000..80cbd26
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.4.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.4.png
new file mode 100644
index 0000000..80cbd26
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.qml
new file mode 100644
index 0000000..16cd5e9
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.qml
@@ -0,0 +1,1359 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 32
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 48
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 64
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 80
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 96
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 112
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 128
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 144
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 160
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 176
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 192
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 208
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 224
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 240
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 256
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 272
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 288
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 304
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 320
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 336
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 352
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 368
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 384
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 400
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 416
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 432
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 448
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 464
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 480
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 496
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 512
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 528
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 544
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 560
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 576
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 592
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 608
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 624
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 640
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 656
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 672
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 688
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 704
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 720
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 736
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 752
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 768
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 784
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 800
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 816
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 832
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 848
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 864
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 880
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 896
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 912
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 928
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 944
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 960
+        image: "borders.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 992
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1008
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1024
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1040
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1056
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1072
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1088
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1104
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1120
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1136
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1152
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1168
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1184
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1200
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1216
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1232
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1248
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1264
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1280
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1296
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1312
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1328
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1344
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1360
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1376
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1392
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1408
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1424
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1440
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1456
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1472
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1488
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1504
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1520
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1536
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1552
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1568
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1584
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1600
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1616
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1632
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1648
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1664
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1680
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1696
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1712
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1728
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1744
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1760
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1776
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1792
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1808
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1824
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1840
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1856
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1872
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1888
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1904
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1920
+        image: "borders.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1952
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1968
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 1984
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2000
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2016
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2032
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2048
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2064
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2080
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2096
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2112
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2128
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2144
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2160
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2176
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2192
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2208
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2224
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2240
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2256
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2272
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2288
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2304
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2320
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2336
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2352
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2368
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2384
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2400
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2416
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2432
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2448
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2464
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2480
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2496
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2512
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2528
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2544
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2560
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2576
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2592
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2608
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2624
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2640
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2656
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2672
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2688
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2704
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2720
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2736
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2752
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2768
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2784
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2800
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2816
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2832
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2848
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2864
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2880
+        image: "borders.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2912
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2928
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2944
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2960
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2976
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 2992
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3008
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3024
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3040
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3056
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3072
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3088
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3104
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3120
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3136
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3152
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3168
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3184
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3200
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3216
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3232
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3248
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3264
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3280
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3296
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3312
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3328
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3344
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3360
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3376
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3392
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3408
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3424
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3440
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3456
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3472
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3488
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3504
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3520
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3536
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3552
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3568
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3584
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3600
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3616
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3632
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3648
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3664
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3680
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3696
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3712
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3728
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3744
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3760
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3776
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3792
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3808
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3824
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3840
+        image: "borders.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3872
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3888
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3904
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3920
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3936
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3952
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3968
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 3984
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4000
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4016
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4032
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4048
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4064
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4080
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4096
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4112
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4128
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4144
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4160
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4176
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4192
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4208
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4224
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4240
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4256
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4272
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4288
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4304
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4320
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4336
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4352
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4368
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4384
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4400
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4416
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4432
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4448
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4464
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4480
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4496
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4512
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4528
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4544
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4560
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4576
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4592
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4608
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4624
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4640
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4656
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4672
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4688
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4704
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4720
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4736
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4752
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4768
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4784
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4800
+        image: "borders.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4832
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4848
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4864
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4880
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4896
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4912
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4928
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4944
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4960
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4976
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 4992
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5008
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5024
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5040
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5056
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5072
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5088
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5104
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5120
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5136
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5152
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5168
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5184
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5200
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5216
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5232
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5248
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5264
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5280
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5296
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5312
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5328
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5344
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5360
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5376
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5392
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+    Frame {
+        msec: 5408
+        hash: "ab9753116e289c932064144bb0845857"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.0.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.0.png
new file mode 100644
index 0000000..21b6afb
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.1.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.1.png
new file mode 100644
index 0000000..bb8a02b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.2.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.2.png
new file mode 100644
index 0000000..da60237
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.3.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.3.png
new file mode 100644
index 0000000..3e943e8
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.4.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.4.png
new file mode 100644
index 0000000..4fbaf26
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.5.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.5.png
new file mode 100644
index 0000000..c10d196
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.6.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.6.png
new file mode 100644
index 0000000..a672c06
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.qml b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.qml
new file mode 100644
index 0000000..029a2fc
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.qml
@@ -0,0 +1,1807 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "1f60efdb8704b92c9361daa468a25391"
+    }
+    Frame {
+        msec: 32
+        hash: "3bb6a87617e0e5d4922e573eec975886"
+    }
+    Frame {
+        msec: 48
+        hash: "268941737e6324d580890b151de621fb"
+    }
+    Frame {
+        msec: 64
+        hash: "99c674eccc082d7f0982257a748d93e5"
+    }
+    Frame {
+        msec: 80
+        hash: "2970467e8262c8a3f0b11be71245d048"
+    }
+    Frame {
+        msec: 96
+        hash: "63cbd06d6bb035d27c18dba49238d8b2"
+    }
+    Frame {
+        msec: 112
+        hash: "49f77bb3d323f882c0ec56e1f1040b3a"
+    }
+    Frame {
+        msec: 128
+        hash: "40263c5f9b5d2236536163785f832b4d"
+    }
+    Frame {
+        msec: 144
+        hash: "dc63b1c21a2027c4beb9c297a3677fbd"
+    }
+    Frame {
+        msec: 160
+        hash: "4fab52ea29a819fec032f19dbcbef012"
+    }
+    Frame {
+        msec: 176
+        hash: "60b48407a8f8ae2cce7d3e7c8b21991c"
+    }
+    Frame {
+        msec: 192
+        hash: "6e542c681092a5ebeef0534fa2bd2d6c"
+    }
+    Frame {
+        msec: 208
+        hash: "c7c6471969bbf81efdb86d1695548fc6"
+    }
+    Frame {
+        msec: 224
+        hash: "b7f4ad9a49feb400894209c02b94478a"
+    }
+    Frame {
+        msec: 240
+        hash: "3eb58b2f5233aead976183c13f241113"
+    }
+    Frame {
+        msec: 256
+        hash: "54f2036c50c6d8079fc0cadc01385980"
+    }
+    Frame {
+        msec: 272
+        hash: "f297659d75f6e724d72bd548821f4c9f"
+    }
+    Frame {
+        msec: 288
+        hash: "112798f080336fc9c603a7e9097dd8aa"
+    }
+    Frame {
+        msec: 304
+        hash: "c432e6ec2b53ca43cb7a7325d0cc379b"
+    }
+    Frame {
+        msec: 320
+        hash: "4a6d3db3efd665ad7f372bf3f2508ed7"
+    }
+    Frame {
+        msec: 336
+        hash: "0befa5dc4d2cc196fed0eb1a3aa75b8f"
+    }
+    Frame {
+        msec: 352
+        hash: "a34d010b50d59c362b54e44d69c2df91"
+    }
+    Frame {
+        msec: 368
+        hash: "cbdacced50186c87066ce1d46548b27e"
+    }
+    Frame {
+        msec: 384
+        hash: "a4060010ae4d3c0973bda48d68f7bd0a"
+    }
+    Frame {
+        msec: 400
+        hash: "47353437da587f732f986004c09884d0"
+    }
+    Frame {
+        msec: 416
+        hash: "080c348145167bbec671a04da6f7564f"
+    }
+    Frame {
+        msec: 432
+        hash: "69dead737c717a076ae3865680341fb4"
+    }
+    Frame {
+        msec: 448
+        hash: "1efdc31c5c8fa72fc848877deb6caaa4"
+    }
+    Frame {
+        msec: 464
+        hash: "28d7da1e933d0585d03acf4a529e7b42"
+    }
+    Frame {
+        msec: 480
+        hash: "bf85534124bf025b7ede0d6c80b8e443"
+    }
+    Frame {
+        msec: 496
+        hash: "cdbeb2d51541b1b1eff060efe993db91"
+    }
+    Frame {
+        msec: 512
+        hash: "52ad56ae16c8ab523adda8edc512dd87"
+    }
+    Frame {
+        msec: 528
+        hash: "61b1937f4c8dd2cb0ddd7031c5bfb3ab"
+    }
+    Frame {
+        msec: 544
+        hash: "1b109baba71b16827f90da654af093a3"
+    }
+    Frame {
+        msec: 560
+        hash: "d56621362802c8626868f36ba1e7db22"
+    }
+    Frame {
+        msec: 576
+        hash: "ee5555ec3ad8760f43bbf5958a925936"
+    }
+    Frame {
+        msec: 592
+        hash: "1ed2831144a453af1978605c0e42d17c"
+    }
+    Frame {
+        msec: 608
+        hash: "c74d5cdb3395a702269dfa88c8c9d975"
+    }
+    Frame {
+        msec: 624
+        hash: "ea98ddd9588cc23fd82a342ec2925ba8"
+    }
+    Frame {
+        msec: 640
+        hash: "e76b94d6d57f1a510f7649eaab892562"
+    }
+    Frame {
+        msec: 656
+        hash: "022f40b6fe9dbaf8019855234acb3461"
+    }
+    Frame {
+        msec: 672
+        hash: "467da4f48aa6aeb113f0797facf157e8"
+    }
+    Frame {
+        msec: 688
+        hash: "8df407aadd4d896eb6537e1555a0242f"
+    }
+    Frame {
+        msec: 704
+        hash: "122e4671881e31f54e617729f4fbb3b0"
+    }
+    Frame {
+        msec: 720
+        hash: "562718f101c3cd7525b890076413df5e"
+    }
+    Frame {
+        msec: 736
+        hash: "07feae99ecf4b70eb094fd3e10deca56"
+    }
+    Frame {
+        msec: 752
+        hash: "0980d133b1006cc07796023880415163"
+    }
+    Frame {
+        msec: 768
+        hash: "7112b6ac97678b3b942c64c5108f0329"
+    }
+    Frame {
+        msec: 784
+        hash: "bb9f893a9aaee60ab6c30918552828a4"
+    }
+    Frame {
+        msec: 800
+        hash: "65d1f29437aaaea33676757276f1e434"
+    }
+    Frame {
+        msec: 816
+        hash: "52adcf2509f3236ac8ef571708e77206"
+    }
+    Frame {
+        msec: 832
+        hash: "22df5e7eda8a813531d0e0366cbfbf64"
+    }
+    Frame {
+        msec: 848
+        hash: "fe9b7b7812dd2410b8ed2eb19aa78f4d"
+    }
+    Frame {
+        msec: 864
+        hash: "141e22de4469f316b5ef5471f3c7bba0"
+    }
+    Frame {
+        msec: 880
+        hash: "1125c0a105fc4a2cae36b798058ce23f"
+    }
+    Frame {
+        msec: 896
+        hash: "8c17c5da2ae867fb0016a485ba9e4166"
+    }
+    Frame {
+        msec: 912
+        hash: "d8da9fc7ec4dcefb894c5a6a71e9d001"
+    }
+    Frame {
+        msec: 928
+        hash: "00ff642bea89fd89de394d78f8c5db33"
+    }
+    Frame {
+        msec: 944
+        hash: "8549063d517a3ce1ffd44c56b3b6cf5e"
+    }
+    Frame {
+        msec: 960
+        image: "easefollow.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "95a642caa72bb31cc1e04ecc12d07cd0"
+    }
+    Frame {
+        msec: 992
+        hash: "e65c823476bf920d0386f62ca831e6a0"
+    }
+    Frame {
+        msec: 1008
+        hash: "91e8913dc693c91a674a10b5b088dd8f"
+    }
+    Frame {
+        msec: 1024
+        hash: "1a469ffa0d530f72c78dc14783891c78"
+    }
+    Frame {
+        msec: 1040
+        hash: "6e46a83d07f8bc034b421103ef0e4f8c"
+    }
+    Frame {
+        msec: 1056
+        hash: "8ddacab411a8b73b6c9e69576fa1b003"
+    }
+    Frame {
+        msec: 1072
+        hash: "41f419a85fe44efe27c9a526d83a1e9a"
+    }
+    Frame {
+        msec: 1088
+        hash: "73d4ece31b258f9caf4556ce20a5be1f"
+    }
+    Frame {
+        msec: 1104
+        hash: "ef3ebe0acb50386cf79b9f08fbba2fbc"
+    }
+    Frame {
+        msec: 1120
+        hash: "c11a84d2fa80f28adb1466409812e987"
+    }
+    Frame {
+        msec: 1136
+        hash: "2e9db854b02d28b38063ff2a8e821ed1"
+    }
+    Frame {
+        msec: 1152
+        hash: "48e073c0e6b19aea8314629a2179af87"
+    }
+    Frame {
+        msec: 1168
+        hash: "77e518b7428d93b67a8fb0d33d85ed97"
+    }
+    Frame {
+        msec: 1184
+        hash: "1d18323af9c62e015513451883f8b39f"
+    }
+    Frame {
+        msec: 1200
+        hash: "df49889ba157cdc1ca240d08d2760ad7"
+    }
+    Frame {
+        msec: 1216
+        hash: "7b8cd2bcf0a4c38ab870f27894a43d2f"
+    }
+    Frame {
+        msec: 1232
+        hash: "84f10e0c9fd57dd1799df7fc34c5ef01"
+    }
+    Frame {
+        msec: 1248
+        hash: "ead4e609bc4a0755032b1648485b9625"
+    }
+    Frame {
+        msec: 1264
+        hash: "9a9829c3bd4a3a4155383c37e21e8db8"
+    }
+    Frame {
+        msec: 1280
+        hash: "5008917f60256abad867f32c1caf954d"
+    }
+    Frame {
+        msec: 1296
+        hash: "c21455d66ed0754177af5ce44b7c7600"
+    }
+    Frame {
+        msec: 1312
+        hash: "e8332f2586d80a2700b610e8fe5c72d9"
+    }
+    Frame {
+        msec: 1328
+        hash: "0d0c8af138f98bae8a370ebec4a4796c"
+    }
+    Frame {
+        msec: 1344
+        hash: "04065e8feeb900d18deeb941572f7f10"
+    }
+    Frame {
+        msec: 1360
+        hash: "992a225b1f25bf5b21dd7f8a55dc4b70"
+    }
+    Frame {
+        msec: 1376
+        hash: "8ef739d91ee2a4337cbfc3dc94ce9845"
+    }
+    Frame {
+        msec: 1392
+        hash: "46744977a26b37ab65e65e1891ceafe7"
+    }
+    Frame {
+        msec: 1408
+        hash: "1b4c0d79eeb8d6b2e30172f3664407b9"
+    }
+    Frame {
+        msec: 1424
+        hash: "d572831ed34d14d1125570b8b8767bdb"
+    }
+    Frame {
+        msec: 1440
+        hash: "8b785c756d11e0fc18959d0897a45673"
+    }
+    Frame {
+        msec: 1456
+        hash: "164a71ffcea63ceb6c1ebeb8d0d07af1"
+    }
+    Frame {
+        msec: 1472
+        hash: "e128dc12d5117eed9f7c0a16e8348ba2"
+    }
+    Frame {
+        msec: 1488
+        hash: "4c7db5b12d83bf22b1c88ac06ca7c385"
+    }
+    Frame {
+        msec: 1504
+        hash: "c7283df8dbd78121e17a5893e3ea4f3c"
+    }
+    Frame {
+        msec: 1520
+        hash: "fea768e5bb43f6d86d88ced9f73915de"
+    }
+    Frame {
+        msec: 1536
+        hash: "b99b54f8e75452c539bb4e7b6a36e944"
+    }
+    Frame {
+        msec: 1552
+        hash: "b7274938d16f03b376ad9739e2e893f1"
+    }
+    Frame {
+        msec: 1568
+        hash: "e61601942193add8c1c8ebf5c5319932"
+    }
+    Frame {
+        msec: 1584
+        hash: "8fdc2181e0120391505706716ba7e5d7"
+    }
+    Frame {
+        msec: 1600
+        hash: "66f737ed28453da5175d6b5e807c374d"
+    }
+    Frame {
+        msec: 1616
+        hash: "2e00a7895d61edbe794f0a8000871b30"
+    }
+    Frame {
+        msec: 1632
+        hash: "1a279fc6b7c4105eccc4e3bc99481bef"
+    }
+    Frame {
+        msec: 1648
+        hash: "bc1dea4d23ca9bc29b72a8c2bde4787b"
+    }
+    Frame {
+        msec: 1664
+        hash: "8ef40e0be5fb82b32b365b3d4b85421d"
+    }
+    Frame {
+        msec: 1680
+        hash: "ee37c68bf38d5eed4e3e9a31306f6801"
+    }
+    Frame {
+        msec: 1696
+        hash: "303d760c87a7a833606c8e9f46cb5fc0"
+    }
+    Frame {
+        msec: 1712
+        hash: "cc2563b47c58efd39bec6b4e0f2995bb"
+    }
+    Frame {
+        msec: 1728
+        hash: "33f7daf09497510475283d6dc7c51228"
+    }
+    Frame {
+        msec: 1744
+        hash: "5b5e2de9934c80bd49e0eb7afd85151d"
+    }
+    Frame {
+        msec: 1760
+        hash: "5e6bf706336789ca6b60a82998b70113"
+    }
+    Frame {
+        msec: 1776
+        hash: "b4d4a860f49bfb88dd2079862b40b7ec"
+    }
+    Frame {
+        msec: 1792
+        hash: "07b571fa55327487e34a592c778beb67"
+    }
+    Frame {
+        msec: 1808
+        hash: "cb5b349a536cf75a83734181b3eab92b"
+    }
+    Frame {
+        msec: 1824
+        hash: "ce903bb58c5c86f2955e68412893aedf"
+    }
+    Frame {
+        msec: 1840
+        hash: "ffa89e879558c83ed538812a93e2fe29"
+    }
+    Frame {
+        msec: 1856
+        hash: "562aa66bf537853be82a654542c8b80e"
+    }
+    Frame {
+        msec: 1872
+        hash: "dc45dac0cc20220bcc81210fb5506ee2"
+    }
+    Frame {
+        msec: 1888
+        hash: "3b429eb827df0800a1ad8b906ea32ef9"
+    }
+    Frame {
+        msec: 1904
+        hash: "d6ebaf12515d9e24cdbf6d75080c0b28"
+    }
+    Frame {
+        msec: 1920
+        image: "easefollow.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "9f6d26224055c809dc2f3490cd0ff880"
+    }
+    Frame {
+        msec: 1952
+        hash: "5630cc8f0b401f7d81bdceaaae5cce68"
+    }
+    Frame {
+        msec: 1968
+        hash: "dafda60467e5e2b99c41543dd191ac2d"
+    }
+    Frame {
+        msec: 1984
+        hash: "e053cb07a734278cd111d612883c165e"
+    }
+    Frame {
+        msec: 2000
+        hash: "63870f3e99c11707004dab9439d61389"
+    }
+    Frame {
+        msec: 2016
+        hash: "14c311a6fab45f828c3a19535ea9edc8"
+    }
+    Frame {
+        msec: 2032
+        hash: "13e614446cbfcbfd2a7ecc5f0e8688df"
+    }
+    Frame {
+        msec: 2048
+        hash: "173c97f59da05b9347180a4824e60c06"
+    }
+    Frame {
+        msec: 2064
+        hash: "932e2a9bbcb7dc5befca8f63d8fa3c95"
+    }
+    Frame {
+        msec: 2080
+        hash: "4b8f232ffe0cbc7f900de5737c9f95be"
+    }
+    Frame {
+        msec: 2096
+        hash: "9686d294d4e931a5eed0e6b5bda63377"
+    }
+    Frame {
+        msec: 2112
+        hash: "969c569d92e3ec51dfbdd20d64432224"
+    }
+    Frame {
+        msec: 2128
+        hash: "0cef3550cca9fb5611b836098c517dd1"
+    }
+    Frame {
+        msec: 2144
+        hash: "6728080a09aa5d48462a3abb8e285e8a"
+    }
+    Frame {
+        msec: 2160
+        hash: "4b904dc671b7fc72db0b6e52543e96bd"
+    }
+    Frame {
+        msec: 2176
+        hash: "38232f89dffc9b16db6ea60b02f8d1be"
+    }
+    Frame {
+        msec: 2192
+        hash: "6b41f2a0f950eddad217a03e137f9a9b"
+    }
+    Frame {
+        msec: 2208
+        hash: "be576ea74c2c404da46fcf1d22de6df9"
+    }
+    Frame {
+        msec: 2224
+        hash: "3f44bad4b51ceff2944337064a5efa91"
+    }
+    Frame {
+        msec: 2240
+        hash: "e1ab98ac1366e9fd8af62a6a26878c73"
+    }
+    Frame {
+        msec: 2256
+        hash: "bd131e1725a54b3dbbb86a29ca8a56a9"
+    }
+    Frame {
+        msec: 2272
+        hash: "4d3e8af70f228643803f780c4e36f1a6"
+    }
+    Frame {
+        msec: 2288
+        hash: "853a5ab4271af7a7638454cfa883aa33"
+    }
+    Frame {
+        msec: 2304
+        hash: "ede9260157000f346900153ce2409278"
+    }
+    Frame {
+        msec: 2320
+        hash: "b2b16d8ce1ba89f0d9558ac387e25c3d"
+    }
+    Frame {
+        msec: 2336
+        hash: "387d338910453637c5cf80fa35528e56"
+    }
+    Frame {
+        msec: 2352
+        hash: "26deabf9cdd994455f2a8802eb0e04dc"
+    }
+    Frame {
+        msec: 2368
+        hash: "13939659a315dae1b81e3ea166102edf"
+    }
+    Frame {
+        msec: 2384
+        hash: "be92b55bb7562372401b25a9167abb2b"
+    }
+    Frame {
+        msec: 2400
+        hash: "ee7bf60d7ee97b7de5e909b9af88df80"
+    }
+    Frame {
+        msec: 2416
+        hash: "434313a3bcd1d7582b0d89b9a145ef09"
+    }
+    Frame {
+        msec: 2432
+        hash: "0857ca59a283897e3df62b9633488f83"
+    }
+    Frame {
+        msec: 2448
+        hash: "76718fc7e3d21b54930bc8307a57733a"
+    }
+    Frame {
+        msec: 2464
+        hash: "93a91588b38129053a462b920fd686e3"
+    }
+    Frame {
+        msec: 2480
+        hash: "2a2486c52fde915696fd8cbd3682e8db"
+    }
+    Frame {
+        msec: 2496
+        hash: "b1f4ab6cc5fb4a3a1b4885f2d1b29277"
+    }
+    Frame {
+        msec: 2512
+        hash: "4258afce8a85a2e9ead149e34b43d8fc"
+    }
+    Frame {
+        msec: 2528
+        hash: "6672c71b98e13d51ebb523aed9036a72"
+    }
+    Frame {
+        msec: 2544
+        hash: "eaa39af7eb78948f433e3b44a9454317"
+    }
+    Frame {
+        msec: 2560
+        hash: "0a766bc97bea67d4b848c703eaa6777a"
+    }
+    Frame {
+        msec: 2576
+        hash: "0b461ec1885ede1dd96b71cf38bfd3d6"
+    }
+    Frame {
+        msec: 2592
+        hash: "15efc929370a3864529080e30db1026a"
+    }
+    Frame {
+        msec: 2608
+        hash: "e1529e30ff1e4ea1b092a88e85f2f1f6"
+    }
+    Frame {
+        msec: 2624
+        hash: "f29bd9dbf7317e94b885da63f0cb7374"
+    }
+    Frame {
+        msec: 2640
+        hash: "e5294e087e2ce0d7d936c0129b6c37ae"
+    }
+    Frame {
+        msec: 2656
+        hash: "9c63129e774b391cc398cf5da5c9339c"
+    }
+    Frame {
+        msec: 2672
+        hash: "4371d85854419d4b00671176bb7c5a2b"
+    }
+    Frame {
+        msec: 2688
+        hash: "dd10b3f50e2fdc56c75f00321634b1cc"
+    }
+    Frame {
+        msec: 2704
+        hash: "aac6256b21152a5f1f8c576b667d275e"
+    }
+    Frame {
+        msec: 2720
+        hash: "c937c44037b2228590d334df4d56a86f"
+    }
+    Frame {
+        msec: 2736
+        hash: "f6c714db51cbd1bdb737afe612c33f9c"
+    }
+    Frame {
+        msec: 2752
+        hash: "0bba45af79f3201bc7cf042d5c648f73"
+    }
+    Frame {
+        msec: 2768
+        hash: "941b08ddbafea3bd46262c060b1e290b"
+    }
+    Frame {
+        msec: 2784
+        hash: "d898918dc2023de239b4ab38f7420960"
+    }
+    Frame {
+        msec: 2800
+        hash: "d1a16dc2282329113093d06862e7a871"
+    }
+    Frame {
+        msec: 2816
+        hash: "bba5359475f643fbeee240e71e843d4c"
+    }
+    Frame {
+        msec: 2832
+        hash: "03cf861f4b6bc767e723e47e95c2448b"
+    }
+    Frame {
+        msec: 2848
+        hash: "a64bf158c6199b88bc2db3b741d342f0"
+    }
+    Frame {
+        msec: 2864
+        hash: "cf0fe7cb42ba842f1c28c1211adb768d"
+    }
+    Frame {
+        msec: 2880
+        image: "easefollow.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "9b3c6414e4ef5a452a5c92bb0b893fc3"
+    }
+    Frame {
+        msec: 2912
+        hash: "7cc7ddec3ac2d8cac33c0b0f80a7544d"
+    }
+    Frame {
+        msec: 2928
+        hash: "7dd4e7d606e953c872c57fad786d64aa"
+    }
+    Frame {
+        msec: 2944
+        hash: "117cc903a39d99ca22f6556095e6f883"
+    }
+    Frame {
+        msec: 2960
+        hash: "c6c9304fd65fee1909473bdb21ac7806"
+    }
+    Frame {
+        msec: 2976
+        hash: "8e704fe81c040f49c4d80e7dcc46084d"
+    }
+    Frame {
+        msec: 2992
+        hash: "d202d5c0a058e1e088fdd280e59f17bb"
+    }
+    Frame {
+        msec: 3008
+        hash: "90c072dea32c056f8bd6d010df681929"
+    }
+    Frame {
+        msec: 3024
+        hash: "80b4e99f1b47e64084e295a2a3e1121e"
+    }
+    Frame {
+        msec: 3040
+        hash: "41d6307075ec9ae9e92d227921f71289"
+    }
+    Frame {
+        msec: 3056
+        hash: "f33de23cf4a5c4881310c6866261d387"
+    }
+    Frame {
+        msec: 3072
+        hash: "441faa0a1fc95d66b27479dfc1e40188"
+    }
+    Frame {
+        msec: 3088
+        hash: "2314b5f6ba3864abd5e87bc87bd621b0"
+    }
+    Frame {
+        msec: 3104
+        hash: "e71e3b0ad953258ceef3101e38283fdb"
+    }
+    Frame {
+        msec: 3120
+        hash: "890c3b0e727f136bf1ccc486531c9677"
+    }
+    Frame {
+        msec: 3136
+        hash: "2a0d23e6dcc6475c323dbf8eb36e8094"
+    }
+    Frame {
+        msec: 3152
+        hash: "692682e82347936f87a66484b428e959"
+    }
+    Frame {
+        msec: 3168
+        hash: "cf4005c08789762ad21be1a1d78755c9"
+    }
+    Frame {
+        msec: 3184
+        hash: "566184563091626bb20ae679e3ce3b91"
+    }
+    Frame {
+        msec: 3200
+        hash: "f88a24ad3bbc2699924bb9a7ff6490b3"
+    }
+    Frame {
+        msec: 3216
+        hash: "23f3f63d07b2bdc2b82ff4e8606a634d"
+    }
+    Frame {
+        msec: 3232
+        hash: "fe121c71ce469ec6f0bf957eb2f0447b"
+    }
+    Frame {
+        msec: 3248
+        hash: "ba217690a33c701afe11842aa8105cbb"
+    }
+    Frame {
+        msec: 3264
+        hash: "e5c7c1323108f13ba26f5198cc62c137"
+    }
+    Frame {
+        msec: 3280
+        hash: "664f76d3d0008b56be2790c470befc91"
+    }
+    Frame {
+        msec: 3296
+        hash: "b3f54070ba64b983ccd2a15941ef4c35"
+    }
+    Frame {
+        msec: 3312
+        hash: "8a0ba2ae36ad3811778f3a3bc55743f5"
+    }
+    Frame {
+        msec: 3328
+        hash: "bfdc71733ca45a2ba2e8abf751554a62"
+    }
+    Frame {
+        msec: 3344
+        hash: "686e4d7bb5ae148d37fc2a1f6004a33a"
+    }
+    Frame {
+        msec: 3360
+        hash: "29c553d9fe42fdbbd019d0ead61dffa0"
+    }
+    Frame {
+        msec: 3376
+        hash: "bfa2b72c6554a2ed80a3b86f2cbed986"
+    }
+    Frame {
+        msec: 3392
+        hash: "074ff90417a947f0a04926d5675d073b"
+    }
+    Frame {
+        msec: 3408
+        hash: "6f56f9e0aa40149156ca71d6f8d4476a"
+    }
+    Frame {
+        msec: 3424
+        hash: "950ce749bbf572021de2dd1688cb87e6"
+    }
+    Frame {
+        msec: 3440
+        hash: "2d0903bd71862dc6f28bd702d955ae99"
+    }
+    Frame {
+        msec: 3456
+        hash: "2733adae56728f1b744a4086ecb98052"
+    }
+    Frame {
+        msec: 3472
+        hash: "779859d739e799bba15beeb97d18e682"
+    }
+    Frame {
+        msec: 3488
+        hash: "9074386cfabe136b8839637e5cd58f57"
+    }
+    Frame {
+        msec: 3504
+        hash: "fa5bcbf20c6ad0a218f23d98961229a1"
+    }
+    Frame {
+        msec: 3520
+        hash: "5406c94da1717eaa5eb0010564216059"
+    }
+    Frame {
+        msec: 3536
+        hash: "27d0a3c3a33c04df843bebd72ef79824"
+    }
+    Frame {
+        msec: 3552
+        hash: "270df9c99c2679071b854b3d82337f79"
+    }
+    Frame {
+        msec: 3568
+        hash: "5b3945505443a67e7a91f66fe42b4fe3"
+    }
+    Frame {
+        msec: 3584
+        hash: "9a2f8565c354cb366725368ed323ccf4"
+    }
+    Frame {
+        msec: 3600
+        hash: "6702cb7ccd61c008b511932d7bd5d107"
+    }
+    Frame {
+        msec: 3616
+        hash: "f6b86c3a1cc88357f588b6dae11aae30"
+    }
+    Frame {
+        msec: 3632
+        hash: "b10c23937f420db72af8abaf126f71c2"
+    }
+    Frame {
+        msec: 3648
+        hash: "7d6b0810ffc6e488c8168e19bccb7358"
+    }
+    Frame {
+        msec: 3664
+        hash: "c01ef69ec46391909619434e9d9dd0ce"
+    }
+    Frame {
+        msec: 3680
+        hash: "a046464fccb0c5ba1f63f8b569821a44"
+    }
+    Frame {
+        msec: 3696
+        hash: "8763c526924d882438f9aa9bfb4fe87d"
+    }
+    Frame {
+        msec: 3712
+        hash: "dede7a62d6e5c10e8f30caa075bd8dfd"
+    }
+    Frame {
+        msec: 3728
+        hash: "3b408e5c986f5bb01d8c3949876b792f"
+    }
+    Frame {
+        msec: 3744
+        hash: "0a458f3b17cdd3ea85522779c9346af9"
+    }
+    Frame {
+        msec: 3760
+        hash: "fef521f0301cce90af88d37e6d441ec8"
+    }
+    Frame {
+        msec: 3776
+        hash: "3d083e0822242b3b37c6839ca91a1f68"
+    }
+    Frame {
+        msec: 3792
+        hash: "f8fe013a717e6e61830137bdc78a8b40"
+    }
+    Frame {
+        msec: 3808
+        hash: "0ae80ad65dd194043500fa50b5a547a6"
+    }
+    Frame {
+        msec: 3824
+        hash: "a53c67fa32ef971eaea202fa5d8a6ad6"
+    }
+    Frame {
+        msec: 3840
+        image: "easefollow.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "41f86bbf0658b127f01e8d46d7ec941b"
+    }
+    Frame {
+        msec: 3872
+        hash: "d20f21df127565f9eb87c5d759a638d9"
+    }
+    Frame {
+        msec: 3888
+        hash: "85ff94f03cea3e111807e90d062c1367"
+    }
+    Frame {
+        msec: 3904
+        hash: "aa637850fe5f05a71ac4c7d31dbb36ee"
+    }
+    Frame {
+        msec: 3920
+        hash: "c86a67096c5e62bb73b785cdf6a5b6b1"
+    }
+    Frame {
+        msec: 3936
+        hash: "9d53537f2c50a0016bf7bb522b2ec3d8"
+    }
+    Frame {
+        msec: 3952
+        hash: "b48630c27c27785ddce568a85d4dc58f"
+    }
+    Frame {
+        msec: 3968
+        hash: "01c1bdb6e261cc509f26712b13eeb554"
+    }
+    Frame {
+        msec: 3984
+        hash: "af8a44284695fd999acd5944434f0372"
+    }
+    Frame {
+        msec: 4000
+        hash: "b156d9d6d5163f007ac4a309d8927ae9"
+    }
+    Frame {
+        msec: 4016
+        hash: "2df3715416c3c005f04b66fe1258c0d8"
+    }
+    Frame {
+        msec: 4032
+        hash: "96b4a7c6b8542b50fc345b54d38ec82a"
+    }
+    Frame {
+        msec: 4048
+        hash: "7e62e757fafa06833444c3a7e1d96ce4"
+    }
+    Frame {
+        msec: 4064
+        hash: "5222a8f9366c7d974d0687d05d229069"
+    }
+    Frame {
+        msec: 4080
+        hash: "ec96169f4633c3bddfd582feeb8e9ad4"
+    }
+    Frame {
+        msec: 4096
+        hash: "cb10db893d1e1cb2a370507dc5679985"
+    }
+    Frame {
+        msec: 4112
+        hash: "d7e346c2ac77796bde639bd829b72e85"
+    }
+    Frame {
+        msec: 4128
+        hash: "ba5bea8857e4fb444bedd3873563e7db"
+    }
+    Frame {
+        msec: 4144
+        hash: "05556fba5d1714f70fd6c2bfb43d213b"
+    }
+    Frame {
+        msec: 4160
+        hash: "aeeabf35f9759f045a670a9b9f90dc68"
+    }
+    Frame {
+        msec: 4176
+        hash: "131bd453f4c7726e5fdd546252700e2e"
+    }
+    Frame {
+        msec: 4192
+        hash: "7c5c3b5bb7a4082e6b9b43640e29f4e2"
+    }
+    Frame {
+        msec: 4208
+        hash: "07515e21b7a7895f333e4a8bbd2202eb"
+    }
+    Frame {
+        msec: 4224
+        hash: "6cf136f223ac6edd39ba6ed9b4445884"
+    }
+    Frame {
+        msec: 4240
+        hash: "84264f5745add8a922101735ed8def84"
+    }
+    Frame {
+        msec: 4256
+        hash: "660863d1e4b361f2e5445b417be0d2ad"
+    }
+    Frame {
+        msec: 4272
+        hash: "7ceb86f4b16546370d72164d0ca3147c"
+    }
+    Frame {
+        msec: 4288
+        hash: "a13e97da9722545ad87ac3c5eb92c497"
+    }
+    Frame {
+        msec: 4304
+        hash: "5896b5307cbd609d2062d3607786d40c"
+    }
+    Frame {
+        msec: 4320
+        hash: "c8c511115394116e4544c67f615ea5d5"
+    }
+    Frame {
+        msec: 4336
+        hash: "59ca5fdf12a735e5c292901b54acccb2"
+    }
+    Frame {
+        msec: 4352
+        hash: "155cce2738d34e0eac86f5eb63d638f0"
+    }
+    Frame {
+        msec: 4368
+        hash: "83a840c3ae7dbd9a05c17fdd8be07d7a"
+    }
+    Frame {
+        msec: 4384
+        hash: "800a15de28b14d88f0ad58fc3f4a2520"
+    }
+    Frame {
+        msec: 4400
+        hash: "c8381439a3cd3f9e7f80061023723a6e"
+    }
+    Frame {
+        msec: 4416
+        hash: "e3d63000db4b9458b202dece49d1bdba"
+    }
+    Frame {
+        msec: 4432
+        hash: "c943e56781695798f3c221f8ab09681a"
+    }
+    Frame {
+        msec: 4448
+        hash: "1137ee66d7fbf5a84c33f5ffff15b3dd"
+    }
+    Frame {
+        msec: 4464
+        hash: "5a98013cc4462aad18cad8d941f77aa0"
+    }
+    Frame {
+        msec: 4480
+        hash: "d0b3748fb49a13c0ad9a68b0e2914921"
+    }
+    Frame {
+        msec: 4496
+        hash: "12113f71f9117670acbd7877edded7e0"
+    }
+    Frame {
+        msec: 4512
+        hash: "22983424da08cdae7a9c6a8905b37736"
+    }
+    Frame {
+        msec: 4528
+        hash: "b2db5618a025cefb2650124c81880c49"
+    }
+    Frame {
+        msec: 4544
+        hash: "84fb5e7edc5b42163a83e0cd362b3a46"
+    }
+    Frame {
+        msec: 4560
+        hash: "39d6f1ed0f60a0c366c22e1442c455ac"
+    }
+    Frame {
+        msec: 4576
+        hash: "702367f6e4aaa2a862e57f9e02a08758"
+    }
+    Frame {
+        msec: 4592
+        hash: "ecc75293bc156c560d55cb7d278a4e58"
+    }
+    Frame {
+        msec: 4608
+        hash: "e68af8e97ce65376fd7904e599440c92"
+    }
+    Frame {
+        msec: 4624
+        hash: "75fe9f766d6cf636cd72d8879a461439"
+    }
+    Frame {
+        msec: 4640
+        hash: "162aef147ef4bbb0cd92bd70e4f37f62"
+    }
+    Frame {
+        msec: 4656
+        hash: "d879aae8949976c7bad4d97f1e5b5549"
+    }
+    Frame {
+        msec: 4672
+        hash: "8a983d7228190721f988de2d72cb3aa2"
+    }
+    Frame {
+        msec: 4688
+        hash: "a4f3c63fde664d128cd35b129a4f9a23"
+    }
+    Frame {
+        msec: 4704
+        hash: "115fb5f3c9b7f1c28ab379596faba91c"
+    }
+    Frame {
+        msec: 4720
+        hash: "ea9600c4d6c77a3b32e59401aa84fe96"
+    }
+    Frame {
+        msec: 4736
+        hash: "bd6531fdd9cfd46af2df73bacb31f4c5"
+    }
+    Frame {
+        msec: 4752
+        hash: "33bdcf1df50eab5e7963c649fbd32226"
+    }
+    Frame {
+        msec: 4768
+        hash: "236e88fb72369a55f9eba4b50712ae85"
+    }
+    Frame {
+        msec: 4784
+        hash: "5eb3c14a6296fb3a1c58603b2fc937c8"
+    }
+    Frame {
+        msec: 4800
+        image: "easefollow.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "31d11a1ce6422524241c77603fe53e61"
+    }
+    Frame {
+        msec: 4832
+        hash: "44e8b9947026c10b922c84883dd8e889"
+    }
+    Frame {
+        msec: 4848
+        hash: "d049e4f7c4bc1849398859a4d630c1b3"
+    }
+    Frame {
+        msec: 4864
+        hash: "e83b4757898e4eeef74be8213619fbfa"
+    }
+    Frame {
+        msec: 4880
+        hash: "d08f40615f2d5abc6236e856a67575dd"
+    }
+    Frame {
+        msec: 4896
+        hash: "d9cb26bf1b8bbafb2aed8f74bd454077"
+    }
+    Frame {
+        msec: 4912
+        hash: "aa321b94a6cc53b2ebac80e834c0a908"
+    }
+    Frame {
+        msec: 4928
+        hash: "48da37164be156b67a4b3b14e50f2375"
+    }
+    Frame {
+        msec: 4944
+        hash: "f522ce7728a4a9e7fad86c72f29bd8f9"
+    }
+    Frame {
+        msec: 4960
+        hash: "9bc1d16b4bda596702a3d8a3fad8a5c5"
+    }
+    Frame {
+        msec: 4976
+        hash: "5275dccf18745dec6c59b846de17d9ef"
+    }
+    Frame {
+        msec: 4992
+        hash: "4eb6babc177b96f69b148d52f56d82d7"
+    }
+    Frame {
+        msec: 5008
+        hash: "ccdfb454070ac04c4fe4f3513c52f8c8"
+    }
+    Frame {
+        msec: 5024
+        hash: "07f6adad6e8ff4f0eff92c758636a951"
+    }
+    Frame {
+        msec: 5040
+        hash: "241e0ad9218d49be477509e008e45548"
+    }
+    Frame {
+        msec: 5056
+        hash: "151a482e821779da8a61063f1cc73f8c"
+    }
+    Frame {
+        msec: 5072
+        hash: "1499d207c5a3a9bc7bbb84d9c5e35578"
+    }
+    Frame {
+        msec: 5088
+        hash: "c253753f653157a5058ef071f16b8bbb"
+    }
+    Frame {
+        msec: 5104
+        hash: "ec9fea5a870724a106b952edef7fb466"
+    }
+    Frame {
+        msec: 5120
+        hash: "99b673f8ed049d31a2aecabcc46d841d"
+    }
+    Frame {
+        msec: 5136
+        hash: "61e77fea693ea55aafbdc94c40c3ab33"
+    }
+    Frame {
+        msec: 5152
+        hash: "53e44a3732ee6858d5bd596b4c5d5305"
+    }
+    Frame {
+        msec: 5168
+        hash: "5b25d3894a56dc4f4a0aa8f88cb69e23"
+    }
+    Frame {
+        msec: 5184
+        hash: "5683ad02f1b9126f4e4ff6b03044fdc6"
+    }
+    Frame {
+        msec: 5200
+        hash: "0a3ec255575ec1b70e0b10cf59c7c5fd"
+    }
+    Frame {
+        msec: 5216
+        hash: "0f5f46fe3fdf42d4651891f13c8afc7e"
+    }
+    Frame {
+        msec: 5232
+        hash: "b6955407245c73e356a460d99dad77be"
+    }
+    Frame {
+        msec: 5248
+        hash: "6018b53414921943b37c33fa04a29697"
+    }
+    Frame {
+        msec: 5264
+        hash: "ff184d349ce0b648f8c1fce91ae997f6"
+    }
+    Frame {
+        msec: 5280
+        hash: "9c112a3a785d970593887eeab72fa7fe"
+    }
+    Frame {
+        msec: 5296
+        hash: "00384fb20d4c6cd6236d519d2d734cc3"
+    }
+    Frame {
+        msec: 5312
+        hash: "601ea99400e5f50ee9a5a4b74b6f3017"
+    }
+    Frame {
+        msec: 5328
+        hash: "9afed04bf7eca24d9b6d31ac84ae59c2"
+    }
+    Frame {
+        msec: 5344
+        hash: "1983319c8043bfe403513af7ccb5b924"
+    }
+    Frame {
+        msec: 5360
+        hash: "b0244e4e1b61202ede78405415c22bca"
+    }
+    Frame {
+        msec: 5376
+        hash: "ec5516b1aaeace8784b04649c51ab40b"
+    }
+    Frame {
+        msec: 5392
+        hash: "8ff7d2001594abb588f769bab15406d7"
+    }
+    Frame {
+        msec: 5408
+        hash: "64d5fd96a1726aa5276f9b508566676f"
+    }
+    Frame {
+        msec: 5424
+        hash: "ab49497a6c825038354f076bdbbbc235"
+    }
+    Frame {
+        msec: 5440
+        hash: "6b821e43be932800b20af58a7b5a1ff7"
+    }
+    Frame {
+        msec: 5456
+        hash: "683a2902300f930e2a81a82dc37c583b"
+    }
+    Frame {
+        msec: 5472
+        hash: "86d7946d7fbb66369ccbf26430939225"
+    }
+    Frame {
+        msec: 5488
+        hash: "fb38f5fb6555fc14e95a47c595a6ea0c"
+    }
+    Frame {
+        msec: 5504
+        hash: "3878f685d9fa3299e9ffe78c22595387"
+    }
+    Frame {
+        msec: 5520
+        hash: "b48840a68ff007901b02332c7177f315"
+    }
+    Frame {
+        msec: 5536
+        hash: "9d847abc99220b04aceef12e5c09aac0"
+    }
+    Frame {
+        msec: 5552
+        hash: "9893ac89fda64d96ec4140c3c87e17a5"
+    }
+    Frame {
+        msec: 5568
+        hash: "cd94e1c36e6be9877cd9c12df42bd968"
+    }
+    Frame {
+        msec: 5584
+        hash: "c1ce5e53b74af022dc103ad74ff5f1af"
+    }
+    Frame {
+        msec: 5600
+        hash: "b3630e08eac02a9578a00b01baabaaba"
+    }
+    Frame {
+        msec: 5616
+        hash: "0eb9241aa1f9526c1e24ba76d630805c"
+    }
+    Frame {
+        msec: 5632
+        hash: "1b532ae7f9253469467522d4ca66c47b"
+    }
+    Frame {
+        msec: 5648
+        hash: "7e6e49079ed6330da2e337a5e4ffd730"
+    }
+    Frame {
+        msec: 5664
+        hash: "0391d668f4b906b244a5f5c1713573c2"
+    }
+    Frame {
+        msec: 5680
+        hash: "8070fa3280d0d64bf976d4a276359c4c"
+    }
+    Frame {
+        msec: 5696
+        hash: "f7d0d36a2d40c798f56ac7ecc1effca6"
+    }
+    Frame {
+        msec: 5712
+        hash: "9f8e35ee5080e811c670c480a9c2bd9f"
+    }
+    Frame {
+        msec: 5728
+        hash: "c7fea75a43a59a11aa504df32afcdaf8"
+    }
+    Frame {
+        msec: 5744
+        hash: "7e549a93ffc6ddcc3d8111f10c05b29e"
+    }
+    Frame {
+        msec: 5760
+        image: "easefollow.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "92d298262f610a2dafa095e3d67c80af"
+    }
+    Frame {
+        msec: 5792
+        hash: "db8826b0b2feece0999863b8827a6234"
+    }
+    Frame {
+        msec: 5808
+        hash: "12c7050e8094bb39212aed0163666d1a"
+    }
+    Frame {
+        msec: 5824
+        hash: "69531beace5c749bf90160a4b25f736a"
+    }
+    Frame {
+        msec: 5840
+        hash: "ce873e4dbc8853183b54d59991b2e030"
+    }
+    Frame {
+        msec: 5856
+        hash: "fa1078973634578d69527402b11fb7e0"
+    }
+    Frame {
+        msec: 5872
+        hash: "1e3b3db590567c0afd1913101192cda9"
+    }
+    Frame {
+        msec: 5888
+        hash: "7b9e097018278b784973a546da3d401a"
+    }
+    Frame {
+        msec: 5904
+        hash: "a7b0667093888480de6697280aeea9ba"
+    }
+    Frame {
+        msec: 5920
+        hash: "e381f2422ead86575abf643b0b0c9797"
+    }
+    Frame {
+        msec: 5936
+        hash: "44b08f5a0de2a6955e02f67753f409c8"
+    }
+    Frame {
+        msec: 5952
+        hash: "db04665e58448ecc7f95baa3e4ea79a5"
+    }
+    Frame {
+        msec: 5968
+        hash: "0e4aae728d8d543538a9446c41e18e91"
+    }
+    Frame {
+        msec: 5984
+        hash: "e3cd1bbb1d9963e5c74d36e526a871b0"
+    }
+    Frame {
+        msec: 6000
+        hash: "bcd893a0e200ddda4e1468c159018865"
+    }
+    Frame {
+        msec: 6016
+        hash: "9c5293356aa6312f909e655e9bcf961b"
+    }
+    Frame {
+        msec: 6032
+        hash: "0bab7b9166f6af554d4fa0badeec739e"
+    }
+    Frame {
+        msec: 6048
+        hash: "e74996581f0aaeced118c5cbfd977d90"
+    }
+    Frame {
+        msec: 6064
+        hash: "5d128eb20a2a23da8c2d9a35293e5769"
+    }
+    Frame {
+        msec: 6080
+        hash: "ebbbc343698287faf7ffa7526a726b54"
+    }
+    Frame {
+        msec: 6096
+        hash: "d812172192cc19590f9a2d7dbf970439"
+    }
+    Frame {
+        msec: 6112
+        hash: "60263addb1b4b5ac43f8199b8ed77e40"
+    }
+    Frame {
+        msec: 6128
+        hash: "702a1ff2876eaaa59359811bb6437c5b"
+    }
+    Frame {
+        msec: 6144
+        hash: "8f81dc43decce5094ee7a089f0009730"
+    }
+    Frame {
+        msec: 6160
+        hash: "efda5dd9edd83a0da089d0b28806c6b6"
+    }
+    Frame {
+        msec: 6176
+        hash: "7274a33a7a5272d7abdaf41f4b2bf664"
+    }
+    Frame {
+        msec: 6192
+        hash: "0cc80077476e721a3da85c17cc56a65e"
+    }
+    Frame {
+        msec: 6208
+        hash: "e65a534f0e7e70520a9c2cfa09ee8159"
+    }
+    Frame {
+        msec: 6224
+        hash: "b05b514c63bd8998785382e6a9cbd849"
+    }
+    Frame {
+        msec: 6240
+        hash: "10a04d641e0cc65c120d8bcf2f3e54c8"
+    }
+    Frame {
+        msec: 6256
+        hash: "68418e2206a496dd15a05b50fec6f87e"
+    }
+    Frame {
+        msec: 6272
+        hash: "6549e0989e1c86e3a7eb0dcc8dd31380"
+    }
+    Frame {
+        msec: 6288
+        hash: "bd0193c2cbc8958f674f4ec52a693b72"
+    }
+    Frame {
+        msec: 6304
+        hash: "746440b45a3688dbd32b34c57454e956"
+    }
+    Frame {
+        msec: 6320
+        hash: "6b54ee8af30be2178e8b3afab5dcb4c7"
+    }
+    Frame {
+        msec: 6336
+        hash: "ba2fbad3fe2fe25ec0c0c542659168dc"
+    }
+    Frame {
+        msec: 6352
+        hash: "84bd72703bd8200f8f090783d06ae451"
+    }
+    Frame {
+        msec: 6368
+        hash: "17c9fb063280c2ee4cb4a13273bbb199"
+    }
+    Frame {
+        msec: 6384
+        hash: "df28fd55719f5c2d164596d02c2faff2"
+    }
+    Frame {
+        msec: 6400
+        hash: "c2e280e78e892200d40022d17ce695b7"
+    }
+    Frame {
+        msec: 6416
+        hash: "c657caa0c5158e178ec5df80bbad6bcb"
+    }
+    Frame {
+        msec: 6432
+        hash: "d91f4f6ec6503fe8280f9b02dd11e64a"
+    }
+    Frame {
+        msec: 6448
+        hash: "0fb9400cdca9dbd4035fbf8af9952360"
+    }
+    Frame {
+        msec: 6464
+        hash: "cac0e1b4aa094306b95f90ede4705391"
+    }
+    Frame {
+        msec: 6480
+        hash: "e60a4bb14300a937a767effee931c60f"
+    }
+    Frame {
+        msec: 6496
+        hash: "8b461397e3f210ee7e9305dcab2af2db"
+    }
+    Frame {
+        msec: 6512
+        hash: "6ce9ec0942dd06c9f73929a7e176852c"
+    }
+    Frame {
+        msec: 6528
+        hash: "da36e254635eea854a6552ba008117f9"
+    }
+    Frame {
+        msec: 6544
+        hash: "0bec6402b5eb09d05ce8e9ff5253ea8d"
+    }
+    Frame {
+        msec: 6560
+        hash: "72f6610527d395ca590eda166ef6bc4e"
+    }
+    Frame {
+        msec: 6576
+        hash: "622ae3fd47adb2432e2a40d3c5539393"
+    }
+    Frame {
+        msec: 6592
+        hash: "0b18c49e2bbf9370216e06b555faf183"
+    }
+    Frame {
+        msec: 6608
+        hash: "0c090bb975fb883301b52479fd6f5fdf"
+    }
+    Frame {
+        msec: 6624
+        hash: "c4205d7ecb7327426d9591e77247acab"
+    }
+    Frame {
+        msec: 6640
+        hash: "f0e0075243e4b8aa97056248fe6033ed"
+    }
+    Frame {
+        msec: 6656
+        hash: "47f99b40a8764ee9d9e429061fb7acb2"
+    }
+    Frame {
+        msec: 6672
+        hash: "49e8c1e974b0716570d85109b53817a5"
+    }
+    Frame {
+        msec: 6688
+        hash: "72f981bad831b6ed858009527902f734"
+    }
+    Frame {
+        msec: 6704
+        hash: "e959a0493b06369a429f90f66cb65977"
+    }
+    Frame {
+        msec: 6720
+        image: "easefollow.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "93470d983282f24425558f47ad705154"
+    }
+    Frame {
+        msec: 6752
+        hash: "cdccbe1a7c7abd4a6a6ee754ed0c9759"
+    }
+    Frame {
+        msec: 6768
+        hash: "0e1b7b5332a9fcdb492db5314a2a0267"
+    }
+    Frame {
+        msec: 6784
+        hash: "1e1ffe3439aab51d0b325474e7d8dc28"
+    }
+    Frame {
+        msec: 6800
+        hash: "e8e7e9b5871caf77f15678616d6c9c8a"
+    }
+    Frame {
+        msec: 6816
+        hash: "9771fff3b7752154d093c038bea73d28"
+    }
+    Frame {
+        msec: 6832
+        hash: "1af851ea214cbddb0e3a743084a5cf6b"
+    }
+    Frame {
+        msec: 6848
+        hash: "1566182a7e29bbb738705a90c4909617"
+    }
+    Frame {
+        msec: 6864
+        hash: "feed650e1d948fe622234d212fb745f2"
+    }
+    Frame {
+        msec: 6880
+        hash: "3cd3d063275b91f9680717421c118ba4"
+    }
+    Frame {
+        msec: 6896
+        hash: "c1f088801334762cd499e7cc70e1e59a"
+    }
+    Frame {
+        msec: 6912
+        hash: "e8f8d153e7a027a5092a9209411d97f7"
+    }
+    Frame {
+        msec: 6928
+        hash: "f11747c3533b4b2fc77a64ca0cace8b0"
+    }
+    Frame {
+        msec: 6944
+        hash: "21618c67a2a8bbce86fc872060ad40e8"
+    }
+    Frame {
+        msec: 6960
+        hash: "02da96335db74b87ceefe91b1dfe72e6"
+    }
+    Frame {
+        msec: 6976
+        hash: "2b2e4143143ead8dea5865fd782f1775"
+    }
+    Frame {
+        msec: 6992
+        hash: "13e710900b05e26cdb030b1e2b2be715"
+    }
+    Frame {
+        msec: 7008
+        hash: "29e8995d17aac4d02034debcbb9fcb98"
+    }
+    Frame {
+        msec: 7024
+        hash: "1099db1b3e4c69e84c6ab1b7c311bf1e"
+    }
+    Frame {
+        msec: 7040
+        hash: "cc7cb720043334f1eeb385dce4389dc2"
+    }
+    Frame {
+        msec: 7056
+        hash: "34c7a62c1bc7261e2fd31c40068b37a7"
+    }
+    Frame {
+        msec: 7072
+        hash: "7fafbe05cbcaa21893e3aa0f1fcfb5a0"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7088
+        hash: "5b26c8cf047706633795a8ed3e703a89"
+    }
+    Frame {
+        msec: 7104
+        hash: "e0774bf9e74d0cde81c5cb216a9258fc"
+    }
+    Frame {
+        msec: 7120
+        hash: "0870262f643245e13f4fba79fd575897"
+    }
+    Frame {
+        msec: 7136
+        hash: "8faf0d050bb435ade8af5012c1a6b0dc"
+    }
+    Frame {
+        msec: 7152
+        hash: "382c037895cc39a6870db57b5016c01f"
+    }
+    Frame {
+        msec: 7168
+        hash: "f1f5a2cbc103ab1bee9f537fa8266e03"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml b/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml
new file mode 100644
index 0000000..bd3270f
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml
@@ -0,0 +1,40 @@
+import Qt 4.6
+
+Rectangle {
+    width: 800; height: 240; color: "gray"
+
+    Rectangle {
+        id: rect
+        width: 50; height: 20; y: 30; color: "black"
+        x: SequentialAnimation {
+            repeat: true
+            NumberAnimation { from: 50; to: 700; duration: 2000 }
+            NumberAnimation { from: 700; to: 50; duration: 2000 }
+        }
+    }
+
+    Rectangle {
+        width: 50; height: 20; y: 60; color: "red"
+        x: EaseFollow { source: rect.x; velocity: 400 }
+    }
+
+    Rectangle {
+        width: 50; height: 20; y: 90; color: "yellow"
+        x: EaseFollow { source: rect.x; velocity: 300; reversingMode: EaseFollow.Immediate }
+    }
+
+    Rectangle {
+        width: 50; height: 20; y: 120; color: "green"
+        x: EaseFollow { source: rect.x; reversingMode: EaseFollow.Sync }
+    }
+
+    Rectangle {
+        width: 50; height: 20; y: 150; color: "purple"
+        x: EaseFollow { source: rect.x; maximumEasingTime: 200 }
+    }
+
+    Rectangle {
+        width: 50; height: 20; y: 180; color: "blue"
+        x: EaseFollow { source: rect.x; duration: 300 }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.0.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.0.png
new file mode 100644
index 0000000..016902b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.1.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.1.png
new file mode 100644
index 0000000..a654936
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.2.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.2.png
new file mode 100644
index 0000000..cfd5517
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.3.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.3.png
new file mode 100644
index 0000000..016902b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.qml b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.qml
new file mode 100644
index 0000000..46086f9
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.qml
@@ -0,0 +1,1199 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 32
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 48
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 64
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 80
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 96
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 112
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 128
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 144
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 160
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 176
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 192
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 208
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 224
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 240
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 256
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 272
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 288
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 304
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 320
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 336
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 352
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 368
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 384
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 400
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 416
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 432
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 448
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 464
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 480
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 496
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 512
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 528
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 544
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 560
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 576
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 592
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 608
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 624
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 640
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 656
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 672
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 688
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 704
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 720
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 736
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 752
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 768
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 784
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 800
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 816
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 832
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 848
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 864
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 880
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 896
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 912
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 928
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 944
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 477; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 960
+        image: "flickable-horizontal.0.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 473; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 976
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 463; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 992
+        hash: "c4d91a9e7f785ccd50db55f697d75cb9"
+    }
+    Frame {
+        msec: 1008
+        hash: "c4d91a9e7f785ccd50db55f697d75cb9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 449; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1024
+        hash: "4f054038668f56cf3fc46dee08504b24"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 425; y: 172
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1040
+        hash: "e6ae6e2a8e5fb7204ae1f559b5dc4a63"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 393; y: 172
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 393; y: 172
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1056
+        hash: "3bfaaef12ca852421ad179d8598a306d"
+    }
+    Frame {
+        msec: 1072
+        hash: "e00ff5e13a9a97bc11e041f89e4782f5"
+    }
+    Frame {
+        msec: 1088
+        hash: "ae10ada837b21365936672e9a4b4b175"
+    }
+    Frame {
+        msec: 1104
+        hash: "63566d7f1707025c9ec37e398d0e69ef"
+    }
+    Frame {
+        msec: 1120
+        hash: "20e9d299cd867d680cf85f99e06cd200"
+    }
+    Frame {
+        msec: 1136
+        hash: "4d3a19b3c50a20ba1d93a8bcd178a424"
+    }
+    Frame {
+        msec: 1152
+        hash: "d373ab5240e438e8234ae05f935c1ef8"
+    }
+    Frame {
+        msec: 1168
+        hash: "2f9c00aa1f8a8cc5d10e6c6a0baee366"
+    }
+    Frame {
+        msec: 1184
+        hash: "0fd8203b0a33fd8243ecd878f04f9b42"
+    }
+    Frame {
+        msec: 1200
+        hash: "24a197df4209c7076d68031e5dd4fd9e"
+    }
+    Frame {
+        msec: 1216
+        hash: "9e4271eacdc875183e3c8e7a1eb098c2"
+    }
+    Frame {
+        msec: 1232
+        hash: "cdf7aac4ff7e5df806977eb38392f5bc"
+    }
+    Frame {
+        msec: 1248
+        hash: "1ace4a1312cad6f173a04c388624a97f"
+    }
+    Frame {
+        msec: 1264
+        hash: "193d6d6838ac1d5ddb941fbb340ec506"
+    }
+    Frame {
+        msec: 1280
+        hash: "ed82807a48f28610ba9bda0c7ab91ce4"
+    }
+    Frame {
+        msec: 1296
+        hash: "e1168bb9a88a972decb0c537d86d7758"
+    }
+    Frame {
+        msec: 1312
+        hash: "828ba428b04826687c6ef19b72318924"
+    }
+    Frame {
+        msec: 1328
+        hash: "7dae52c428253cf44045ffaabaadd2f4"
+    }
+    Frame {
+        msec: 1344
+        hash: "06e2a81e1a2421523642cfcf17ec22e4"
+    }
+    Frame {
+        msec: 1360
+        hash: "283997835a54e80c0ab8a0321bd03ce7"
+    }
+    Frame {
+        msec: 1376
+        hash: "6354f9379b7b25c8fabda4e5bc3cdf6a"
+    }
+    Frame {
+        msec: 1392
+        hash: "6bc87dfd21d59efd3397e3cfb0d00d25"
+    }
+    Frame {
+        msec: 1408
+        hash: "4f97fc9aa1f79a6b007a00459386b9ff"
+    }
+    Frame {
+        msec: 1424
+        hash: "2b5c711ede124c9e97d3ef83a3fdcc8b"
+    }
+    Frame {
+        msec: 1440
+        hash: "5a8cbd4ac3fcd920f2aea6e2cfa96467"
+    }
+    Frame {
+        msec: 1456
+        hash: "5b32961cb36e519f5b1d50386e796d3e"
+    }
+    Frame {
+        msec: 1472
+        hash: "c91f95cccd38cbd1a16ee65abffd40ab"
+    }
+    Frame {
+        msec: 1488
+        hash: "25108050298d3ffc850113971bcf54da"
+    }
+    Frame {
+        msec: 1504
+        hash: "6a236881f2a1cb487ee1945c279e020b"
+    }
+    Frame {
+        msec: 1520
+        hash: "2df1824df1cf20022595f64d26adb4ad"
+    }
+    Frame {
+        msec: 1536
+        hash: "4ca4a0a4b4fd9f9c4846adebcdc8fd67"
+    }
+    Frame {
+        msec: 1552
+        hash: "1696ef0862ff4772f960d203c43fbddf"
+    }
+    Frame {
+        msec: 1568
+        hash: "c5846835b8eb5d98c481ee5811344ea1"
+    }
+    Frame {
+        msec: 1584
+        hash: "fbcb044ee53302de573321b43f068e65"
+    }
+    Frame {
+        msec: 1600
+        hash: "d369e0a6c4a3e63102be29a7362ef9eb"
+    }
+    Frame {
+        msec: 1616
+        hash: "e93131b881805d4aa44949c69f486821"
+    }
+    Frame {
+        msec: 1632
+        hash: "b7aeee9e5065f1d4656e451b542ecf6a"
+    }
+    Frame {
+        msec: 1648
+        hash: "05521ca19960c070d5f3dd72c5ade0e4"
+    }
+    Frame {
+        msec: 1664
+        hash: "2c68cb3291cf1f892c8b8eb28b409e4d"
+    }
+    Frame {
+        msec: 1680
+        hash: "5a0908aea91df2b9e65d222829c2b0ba"
+    }
+    Frame {
+        msec: 1696
+        hash: "0d4ff147517eee8b3dbcd51a708b2aa7"
+    }
+    Frame {
+        msec: 1712
+        hash: "521e1075de1de89c6e25f469d2728ab7"
+    }
+    Frame {
+        msec: 1728
+        hash: "c543447f98ae608058c6c02c8c8665e6"
+    }
+    Frame {
+        msec: 1744
+        hash: "ac259db754b7dfb8cce8548527c72e4b"
+    }
+    Frame {
+        msec: 1760
+        hash: "bc5b68d5ecfb583ae41001e326b7aa9b"
+    }
+    Frame {
+        msec: 1776
+        hash: "e08051cb1ab2d8f979a52dc86411f78f"
+    }
+    Frame {
+        msec: 1792
+        hash: "b1746ad9563359f0d70a1aaee62e9bd8"
+    }
+    Frame {
+        msec: 1808
+        hash: "5d6bc33ff2857fb8db582362bf7c19c7"
+    }
+    Frame {
+        msec: 1824
+        hash: "83f2c3a7124f9be4dbe883a27ca7df8e"
+    }
+    Frame {
+        msec: 1840
+        hash: "189f7cfb5ede1f8380b1a05b7e3d942e"
+    }
+    Frame {
+        msec: 1856
+        hash: "07b1a4e5ca156e6aa1f3e76b825807ce"
+    }
+    Frame {
+        msec: 1872
+        hash: "48b25f0acfe6eb3bc2cb9eb16e6595d0"
+    }
+    Frame {
+        msec: 1888
+        hash: "15ae05f5ed098021073c4593587949ea"
+    }
+    Frame {
+        msec: 1904
+        hash: "b300f2c75f4aebcf84ed37ad424ca9fa"
+    }
+    Frame {
+        msec: 1920
+        image: "flickable-horizontal.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "7d8ea492fb1c664502e95e085896c569"
+    }
+    Frame {
+        msec: 1952
+        hash: "7513b077e073d78b387309b56e1fd44c"
+    }
+    Frame {
+        msec: 1968
+        hash: "ed1ac5cf6d4b081983a8e16258f431bf"
+    }
+    Frame {
+        msec: 1984
+        hash: "fbb31f23ba6e5d02011363abfb4b3f18"
+    }
+    Frame {
+        msec: 2000
+        hash: "6f01df424b38036b9921b4ee1491a1c1"
+    }
+    Frame {
+        msec: 2016
+        hash: "11f706dfacbec5c0be0c2f3c5442f717"
+    }
+    Frame {
+        msec: 2032
+        hash: "0a70348986f4987f43db3e55af63fca5"
+    }
+    Frame {
+        msec: 2048
+        hash: "6f8b7aaad846f83c6349836d7af34662"
+    }
+    Frame {
+        msec: 2064
+        hash: "44723b22aad6d2d814e074ff9324f3c4"
+    }
+    Frame {
+        msec: 2080
+        hash: "44723b22aad6d2d814e074ff9324f3c4"
+    }
+    Frame {
+        msec: 2096
+        hash: "44723b22aad6d2d814e074ff9324f3c4"
+    }
+    Frame {
+        msec: 2112
+        hash: "1c12d2c68223324f040b7a693cef2074"
+    }
+    Frame {
+        msec: 2128
+        hash: "0a70348986f4987f43db3e55af63fca5"
+    }
+    Frame {
+        msec: 2144
+        hash: "bf4de7baf2730cdaf83887d50d577986"
+    }
+    Frame {
+        msec: 2160
+        hash: "23ddb2c0793d7161a0d8c5b2a777dceb"
+    }
+    Frame {
+        msec: 2176
+        hash: "7513b077e073d78b387309b56e1fd44c"
+    }
+    Frame {
+        msec: 2192
+        hash: "83fa82362057466dff6a243a95d423db"
+    }
+    Frame {
+        msec: 2208
+        hash: "0e60b632ce511109cb01d2e5ff6945f8"
+    }
+    Frame {
+        msec: 2224
+        hash: "78c25194827c4243a16807491f798cdf"
+    }
+    Frame {
+        msec: 2240
+        hash: "4c9dc46794d4a32e654395bb9d78409e"
+    }
+    Frame {
+        msec: 2256
+        hash: "e996d4f3a0b3a4a4ed29ec23a1ad5615"
+    }
+    Frame {
+        msec: 2272
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2288
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2304
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2320
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2336
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2352
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2368
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2384
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2400
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2416
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2432
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2448
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2464
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2480
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2496
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2512
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2528
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2544
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2560
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2576
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2592
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2608
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2624
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2640
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2656
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2672
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2688
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2704
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2720
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2736
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2752
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2768
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 152; y: 189
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2784
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2800
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Frame {
+        msec: 2816
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 190
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2832
+        hash: "cd6770afe63f28517a93f0961cf9c26e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 169; y: 191
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2848
+        hash: "edd015434d7ead96c03a51a2b1c9e527"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 202; y: 192
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2864
+        hash: "ea0eda505daea4171e27aac358aa6a4a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 256; y: 192
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2880
+        image: "flickable-horizontal.2.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 331; y: 192
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2896
+        hash: "34f70dfe1c226e63300112aa9a4a6968"
+    }
+    Frame {
+        msec: 2912
+        hash: "34f70dfe1c226e63300112aa9a4a6968"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 395; y: 194
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 395; y: 194
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2928
+        hash: "dd61e0ae58d7a344908a10bb97cfcb39"
+    }
+    Frame {
+        msec: 2944
+        hash: "14a384c4bdd3e89808761d1e86976170"
+    }
+    Frame {
+        msec: 2960
+        hash: "0e82a4920a53239f117448cd0e0b27f2"
+    }
+    Frame {
+        msec: 2976
+        hash: "711e29bf6fbbeb7882064adb0619f4ac"
+    }
+    Frame {
+        msec: 2992
+        hash: "43307cbfe1688daf300fafc8df0082b8"
+    }
+    Frame {
+        msec: 3008
+        hash: "46d788d926c03d85a68b66252e73ae90"
+    }
+    Frame {
+        msec: 3024
+        hash: "a0042935ad2d5557c906050d4a3581c9"
+    }
+    Frame {
+        msec: 3040
+        hash: "b618a40490ca0aea310f08b452fa8c68"
+    }
+    Frame {
+        msec: 3056
+        hash: "e2aaad7f160a6d77dd788c76bb8cb8a7"
+    }
+    Frame {
+        msec: 3072
+        hash: "ab5c27fa790c67a6678db0bbae1ae477"
+    }
+    Frame {
+        msec: 3088
+        hash: "b43ed7af838cd6edd32393fc56cf8fb1"
+    }
+    Frame {
+        msec: 3104
+        hash: "88ac50602c9f27fb5b882ad32d14ff46"
+    }
+    Frame {
+        msec: 3120
+        hash: "259af2e080ed93e16cb633fa940c7c08"
+    }
+    Frame {
+        msec: 3136
+        hash: "d05bec2351068d552b7bbbf47cf82fad"
+    }
+    Frame {
+        msec: 3152
+        hash: "5354b8e07f1ed22950687187ee7a0290"
+    }
+    Frame {
+        msec: 3168
+        hash: "3bfaaef12ca852421ad179d8598a306d"
+    }
+    Frame {
+        msec: 3184
+        hash: "40d3a77fce7a9a9ca7ae6023fc4cfc10"
+    }
+    Frame {
+        msec: 3200
+        hash: "5837c0122aa6b28518f1b7043ead99a9"
+    }
+    Frame {
+        msec: 3216
+        hash: "9514d8530275e4642810ac441e8de353"
+    }
+    Frame {
+        msec: 3232
+        hash: "3b720882f52340549d8e1b9659443461"
+    }
+    Frame {
+        msec: 3248
+        hash: "4de5b95c8f4949a4f1ee9a119940e80a"
+    }
+    Frame {
+        msec: 3264
+        hash: "a35097c00483e0b481222e4ad220c7a4"
+    }
+    Frame {
+        msec: 3280
+        hash: "82ac348a63a4e358a877a2e45d48e2b1"
+    }
+    Frame {
+        msec: 3296
+        hash: "1322108409d1fa87d128f0c44c81ab4b"
+    }
+    Frame {
+        msec: 3312
+        hash: "f6b030effcca891ab20073f106b22d73"
+    }
+    Frame {
+        msec: 3328
+        hash: "a7ccd998ac2ff2777d9423d704ddef48"
+    }
+    Frame {
+        msec: 3344
+        hash: "b6d971a4f3321b7f3632e778ce733589"
+    }
+    Frame {
+        msec: 3360
+        hash: "b6d971a4f3321b7f3632e778ce733589"
+    }
+    Frame {
+        msec: 3376
+        hash: "b6d971a4f3321b7f3632e778ce733589"
+    }
+    Frame {
+        msec: 3392
+        hash: "82ef6700a513e39508fb6de5ef07f1e7"
+    }
+    Frame {
+        msec: 3408
+        hash: "9e4c4d479bc0b1a61566eae12416bea6"
+    }
+    Frame {
+        msec: 3424
+        hash: "f6b030effcca891ab20073f106b22d73"
+    }
+    Frame {
+        msec: 3440
+        hash: "8968acd022a9ba6fcc3ea52bdd7268c4"
+    }
+    Frame {
+        msec: 3456
+        hash: "de8f1a1fd680af475173d5f81e85b26c"
+    }
+    Frame {
+        msec: 3472
+        hash: "82e8c0c7cb7c2b1e8d7a5fc019533e6b"
+    }
+    Frame {
+        msec: 3488
+        hash: "f820d250252cd910af97e5c9be181457"
+    }
+    Frame {
+        msec: 3504
+        hash: "a40558c1fbf328d3c891b473b2454020"
+    }
+    Frame {
+        msec: 3520
+        hash: "0ef9e64bad67670102e1e4d9ef0e96f3"
+    }
+    Frame {
+        msec: 3536
+        hash: "1d8013765ac2d3fe09ccaa6db098a208"
+    }
+    Frame {
+        msec: 3552
+        hash: "1d8013765ac2d3fe09ccaa6db098a208"
+    }
+    Frame {
+        msec: 3568
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3584
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3600
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3616
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3632
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3648
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3664
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3680
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3696
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3712
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3728
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3744
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3760
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3776
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3792
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3808
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3824
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3840
+        image: "flickable-horizontal.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3872
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3888
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3904
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3920
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3936
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3952
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3968
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 3984
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4000
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4016
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4032
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4048
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4064
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4080
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4096
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4112
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4128
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4144
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4160
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4176
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4192
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4208
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4224
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4240
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+    Frame {
+        msec: 4256
+        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.0.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.0.png
new file mode 100644
index 0000000..18fef53
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.1.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.1.png
new file mode 100644
index 0000000..18fef53
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.10.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.10.png
new file mode 100644
index 0000000..b352c68
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.10.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.11.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.11.png
new file mode 100644
index 0000000..ce7ee68
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.11.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.12.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.12.png
new file mode 100644
index 0000000..d8cdacf
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.12.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.13.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.13.png
new file mode 100644
index 0000000..0c2fa7b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.13.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.14.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.14.png
new file mode 100644
index 0000000..e9b3028
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.14.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.15.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.15.png
new file mode 100644
index 0000000..2186a8b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.15.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.16.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.16.png
new file mode 100644
index 0000000..b4590af
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.16.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.17.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.17.png
new file mode 100644
index 0000000..fe29f19
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.17.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.18.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.18.png
new file mode 100644
index 0000000..fe29f19
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.18.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.19.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.19.png
new file mode 100644
index 0000000..4f8587f
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.19.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.2.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.2.png
new file mode 100644
index 0000000..0a7cc03
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.20.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.20.png
new file mode 100644
index 0000000..4f8587f
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.20.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.21.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.21.png
new file mode 100644
index 0000000..c0b0bdf
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.21.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.22.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.22.png
new file mode 100644
index 0000000..4168c3b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.22.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.23.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.23.png
new file mode 100644
index 0000000..18fef53
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.23.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.24.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.24.png
new file mode 100644
index 0000000..e69de29
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.3.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.3.png
new file mode 100644
index 0000000..fc6669d
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.4.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.4.png
new file mode 100644
index 0000000..c0b0bdf
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.5.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.5.png
new file mode 100644
index 0000000..2ffa96e
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.6.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.6.png
new file mode 100644
index 0000000..f550b89
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.7.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.7.png
new file mode 100644
index 0000000..f550b89
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.8.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.8.png
new file mode 100644
index 0000000..f550b89
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.9.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.9.png
new file mode 100644
index 0000000..f550b89
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.9.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.qml b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.qml
new file mode 100644
index 0000000..db70298
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.qml
@@ -0,0 +1,7037 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 32
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 48
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 64
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 80
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 96
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 112
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 128
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 144
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 160
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 176
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 192
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 208
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 224
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 240
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 256
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 272
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 288
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 304
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 320
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 336
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 352
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 368
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 384
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 400
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 416
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 432
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 448
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 464
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 480
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 496
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 512
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 528
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 544
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 560
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 576
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 592
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 608
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 624
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 640
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 656
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 672
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 688
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 704
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 720
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 736
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 752
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 768
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 784
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 800
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 816
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 832
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 848
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 864
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 880
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 896
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 912
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 928
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 944
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 960
+        image: "flickable-vertical.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 992
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1008
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1024
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1040
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1056
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1072
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1088
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1104
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1120
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1136
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1152
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1168
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1184
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1200
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1216
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1232
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1248
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1264
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1280
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1296
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1312
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1328
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1344
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1360
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1376
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1392
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1408
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1424
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1440
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1456
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1472
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1488
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1504
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1520
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1536
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1552
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1568
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1584
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1600
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1616
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1632
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1648
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1664
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1680
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1696
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1712
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1728
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1744
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1760
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1776
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1792
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1808
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1824
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1840
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1856
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1872
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1888
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1904
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1920
+        image: "flickable-vertical.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1952
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1968
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 1984
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2000
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2016
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2032
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2048
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2064
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2080
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2096
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2112
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2128
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2144
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2160
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2176
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2192
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2208
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2224
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2240
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2256
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2272
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2288
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2304
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2320
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2336
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2352
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 2368
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 143; y: 387
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2384
+        hash: "a21e65718bc7a0cdcbeb058d0cbd2977"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 386
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2400
+        hash: "a21e65718bc7a0cdcbeb058d0cbd2977"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 386
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 147; y: 380
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2416
+        hash: "a21e65718bc7a0cdcbeb058d0cbd2977"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 372
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2432
+        hash: "90d9c65705a006741671657d00ab9dba"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 346
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2448
+        hash: "8c6301fb7409a22fda85072d48e838c8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 328
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 304
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2464
+        hash: "f5121fd6b0f20844d13cd8625a1a5047"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 276
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 159; y: 276
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2480
+        hash: "0d64b804b3b7e3ee052395f612d62bcf"
+    }
+    Frame {
+        msec: 2496
+        hash: "17b68429dfaf80bb3313e78bb01d6c4e"
+    }
+    Frame {
+        msec: 2512
+        hash: "e86ea3b103a7d9f95f7484f3579a95b5"
+    }
+    Frame {
+        msec: 2528
+        hash: "884d3842f4aa2a38ff73511b143789a0"
+    }
+    Frame {
+        msec: 2544
+        hash: "646d1dd3003ccac06b7251e8ce1beb2f"
+    }
+    Frame {
+        msec: 2560
+        hash: "ff66db77c56bf6830bc39211b3441e69"
+    }
+    Frame {
+        msec: 2576
+        hash: "8ff9c081cf823adaf6b17014fc582f12"
+    }
+    Frame {
+        msec: 2592
+        hash: "7b1563aed6f030003e04f19bb6e91a51"
+    }
+    Frame {
+        msec: 2608
+        hash: "3661b26f082e44cbc38e6033c28e99cb"
+    }
+    Frame {
+        msec: 2624
+        hash: "8e0f117dc1f2527d6b2b3f0c849fbda1"
+    }
+    Frame {
+        msec: 2640
+        hash: "5a13b0045bc132ec6c917a6d7ddf9c7a"
+    }
+    Frame {
+        msec: 2656
+        hash: "06f332d287ed14b29dd0a252d59565a2"
+    }
+    Frame {
+        msec: 2672
+        hash: "7b1512aabac1fb17ecc8e0c771e2477f"
+    }
+    Frame {
+        msec: 2688
+        hash: "22b62a7b42df6bbafad76d99001616c7"
+    }
+    Frame {
+        msec: 2704
+        hash: "0f6588fc79fa06097b2ba9bf6b1d6d14"
+    }
+    Frame {
+        msec: 2720
+        hash: "c7849941c7572b3581a7eb9423838d90"
+    }
+    Frame {
+        msec: 2736
+        hash: "8ddd8e9dc33698ecca6e19f2318e1c2e"
+    }
+    Frame {
+        msec: 2752
+        hash: "1606eb49c73e60445d9eca11e23a33f9"
+    }
+    Frame {
+        msec: 2768
+        hash: "6a7e58d27492742bf3d853ee37144dae"
+    }
+    Frame {
+        msec: 2784
+        hash: "a55ba5b7ccdabd39385c6cb32e8e1b26"
+    }
+    Frame {
+        msec: 2800
+        hash: "afe5705e8ebc240babee4a88a4321189"
+    }
+    Frame {
+        msec: 2816
+        hash: "807d92ab4b8d2295f3abfd3508258dd5"
+    }
+    Frame {
+        msec: 2832
+        hash: "ae95ed79eee246c74535d9ca97878ce6"
+    }
+    Frame {
+        msec: 2848
+        hash: "c8cf5d07a06646552d5595603532b786"
+    }
+    Frame {
+        msec: 2864
+        hash: "45971fd130662a263fcd86513aee222d"
+    }
+    Frame {
+        msec: 2880
+        image: "flickable-vertical.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "8e78a9098ebd02cc828b76609c58d6b9"
+    }
+    Frame {
+        msec: 2912
+        hash: "7f4d7a1c8e0a5494bf7f37a0a165d02b"
+    }
+    Frame {
+        msec: 2928
+        hash: "881ed825133259e731b71cf6251ed862"
+    }
+    Frame {
+        msec: 2944
+        hash: "8fb86c54b4e0280de18eb2d4f1c55e68"
+    }
+    Frame {
+        msec: 2960
+        hash: "58ad7494c0bddc0de86bfd041f45a5d3"
+    }
+    Frame {
+        msec: 2976
+        hash: "87489ba1390ee152a7de023e8ba25c72"
+    }
+    Frame {
+        msec: 2992
+        hash: "b1f06b26110799e88837781cdf4688a7"
+    }
+    Frame {
+        msec: 3008
+        hash: "d23e94ef53ce3b8143a716028ab729f9"
+    }
+    Frame {
+        msec: 3024
+        hash: "1c5fdf8d85537836b698a50fcab58a4e"
+    }
+    Frame {
+        msec: 3040
+        hash: "bd9c6ea06278efa4d491519734d0032f"
+    }
+    Frame {
+        msec: 3056
+        hash: "b533e6543ca4efb34e187d540e4ed7e0"
+    }
+    Frame {
+        msec: 3072
+        hash: "65f4ff7328ce366671436512da44a094"
+    }
+    Frame {
+        msec: 3088
+        hash: "e7afcc4c29cd1868bcf1ebea1d19fca1"
+    }
+    Frame {
+        msec: 3104
+        hash: "ddaf80f4b1d98b07fe4bf8282e13b2a8"
+    }
+    Frame {
+        msec: 3120
+        hash: "d4888df20b11e30a7d613a32e603cea5"
+    }
+    Frame {
+        msec: 3136
+        hash: "ac74be483173b08cb41b8d63e3e4d073"
+    }
+    Frame {
+        msec: 3152
+        hash: "35c65757fe27f68e35c438269c00ba53"
+    }
+    Frame {
+        msec: 3168
+        hash: "b8a28356b50362f2dabd0ab4a0d1d621"
+    }
+    Frame {
+        msec: 3184
+        hash: "71205ebfcce9e3a018fe2c30f7f3ee92"
+    }
+    Frame {
+        msec: 3200
+        hash: "0ef526ebcc23342ba4b8dfa8ed41e7de"
+    }
+    Frame {
+        msec: 3216
+        hash: "9caaec9ca80b5da75e5e1231635c2f37"
+    }
+    Frame {
+        msec: 3232
+        hash: "bb6b951e8c2252d873828e9ef1c9b625"
+    }
+    Frame {
+        msec: 3248
+        hash: "15faa58fbb91f80a8c1256e5627e7777"
+    }
+    Frame {
+        msec: 3264
+        hash: "bf2d0f512ade00ee44adb6624573daf9"
+    }
+    Frame {
+        msec: 3280
+        hash: "5af713203ef673d40c69b014dcaf242f"
+    }
+    Frame {
+        msec: 3296
+        hash: "970972470176fbd64208a3b25d4f5f65"
+    }
+    Frame {
+        msec: 3312
+        hash: "135a4356d91e594ee2b71132ecf9a606"
+    }
+    Frame {
+        msec: 3328
+        hash: "8a6364c0e033d517180ec287e61b3c9d"
+    }
+    Frame {
+        msec: 3344
+        hash: "71c7d7eddd49b77e8f96f3b7a6e8470f"
+    }
+    Frame {
+        msec: 3360
+        hash: "59667814b3e1a2d832b895235a9cdaf6"
+    }
+    Frame {
+        msec: 3376
+        hash: "a324de5e8d115862b9908aba881df913"
+    }
+    Frame {
+        msec: 3392
+        hash: "300902de67507207465a74bf6404c1c4"
+    }
+    Frame {
+        msec: 3408
+        hash: "63f40e307d9f0c14bab111e833047ee1"
+    }
+    Frame {
+        msec: 3424
+        hash: "53f54f5a4745043ef616ac21583416ef"
+    }
+    Frame {
+        msec: 3440
+        hash: "851e6eebe48034d3185674f6908932af"
+    }
+    Frame {
+        msec: 3456
+        hash: "06ef04a044394ab55fe2806a50db2abf"
+    }
+    Frame {
+        msec: 3472
+        hash: "88c82d8bb518b18a174f55c647395de1"
+    }
+    Frame {
+        msec: 3488
+        hash: "e62b84c87e1d73028305b9038915c53d"
+    }
+    Frame {
+        msec: 3504
+        hash: "fdb38aa631cd6967585dd23e20f866a9"
+    }
+    Frame {
+        msec: 3520
+        hash: "edabcd9bee25b1abcabced3b0b3dff1e"
+    }
+    Frame {
+        msec: 3536
+        hash: "6f0a2dc3151c018846b13fd2e11d0fab"
+    }
+    Frame {
+        msec: 3552
+        hash: "5101944e7867260ffdd3134436c6373a"
+    }
+    Frame {
+        msec: 3568
+        hash: "a04f231f840571734f8dab609b2f82fd"
+    }
+    Frame {
+        msec: 3584
+        hash: "87c22f82c659b405fd4e81640ce0b166"
+    }
+    Frame {
+        msec: 3600
+        hash: "2273564228baea48cac343a4f30d6a59"
+    }
+    Frame {
+        msec: 3616
+        hash: "8a4d1fc12743e6153c0f47e1fce9d55f"
+    }
+    Frame {
+        msec: 3632
+        hash: "944cd812097868935a686211551ccd35"
+    }
+    Frame {
+        msec: 3648
+        hash: "a2f1a14510a1cfe3c2c45fa10b0442b4"
+    }
+    Frame {
+        msec: 3664
+        hash: "d754cc64c12ef8cc2db0ddf99381e88c"
+    }
+    Frame {
+        msec: 3680
+        hash: "168487c8ca6f3463b3aa4433cfc99792"
+    }
+    Frame {
+        msec: 3696
+        hash: "67a82c1516b0d8d953c7055f07a9fdc7"
+    }
+    Frame {
+        msec: 3712
+        hash: "0df1592631b8cc1986f905a049b40bf0"
+    }
+    Frame {
+        msec: 3728
+        hash: "8677472d35e17d7bd5fe40f7841bb01d"
+    }
+    Frame {
+        msec: 3744
+        hash: "4472a8412e41377e0795d51706fb9180"
+    }
+    Frame {
+        msec: 3760
+        hash: "84533717ec1419617895f2ec646fb1c0"
+    }
+    Frame {
+        msec: 3776
+        hash: "ad50bd7708be94c6b8e63077e589ae48"
+    }
+    Frame {
+        msec: 3792
+        hash: "a37fb5d7cec3fbff8e12157c88e08833"
+    }
+    Frame {
+        msec: 3808
+        hash: "df1ca02b5bb76338ff24a561876f89f2"
+    }
+    Frame {
+        msec: 3824
+        hash: "df1ca02b5bb76338ff24a561876f89f2"
+    }
+    Frame {
+        msec: 3840
+        image: "flickable-vertical.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "a37fb5d7cec3fbff8e12157c88e08833"
+    }
+    Frame {
+        msec: 3872
+        hash: "3c8a94d2e139a9e84eaa6bf522250756"
+    }
+    Frame {
+        msec: 3888
+        hash: "23647f577ee83bc500ca1078eea2be90"
+    }
+    Frame {
+        msec: 3904
+        hash: "c1a52221113c162e963a2a165b8d08a5"
+    }
+    Frame {
+        msec: 3920
+        hash: "993c57d4ed9026f8615c68ef5d8c5c16"
+    }
+    Frame {
+        msec: 3936
+        hash: "3d843eac108e047b6fe9ac21d8866fdd"
+    }
+    Frame {
+        msec: 3952
+        hash: "5be1fa7cb99fda017cd5cdcf91a18525"
+    }
+    Frame {
+        msec: 3968
+        hash: "c68ef5177f4568eb77c0f4135ba65e44"
+    }
+    Frame {
+        msec: 3984
+        hash: "f047939a56a0ecee5deefcd3d2bf1710"
+    }
+    Frame {
+        msec: 4000
+        hash: "4af748f59c6a62156a228ae635ec2d9c"
+    }
+    Frame {
+        msec: 4016
+        hash: "b69b045557a8eada80a24eb4caa7ea4e"
+    }
+    Frame {
+        msec: 4032
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4048
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4064
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4080
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4096
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4112
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4128
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4144
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4160
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4176
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4192
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4208
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4224
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4240
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4256
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4272
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4288
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4304
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4320
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4336
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4352
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4368
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4384
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4400
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4416
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4432
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4448
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4464
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4480
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4496
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4512
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4528
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4544
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4560
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4576
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4592
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4608
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4624
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4640
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4656
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4672
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4688
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4704
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4720
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4736
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4752
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4768
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4784
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4800
+        image: "flickable-vertical.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4832
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4848
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4864
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4880
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4896
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4912
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4928
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4944
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4960
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4976
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 4992
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5008
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5024
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5040
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5056
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5072
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5088
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5104
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5120
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5136
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5152
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5168
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5184
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5200
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5216
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5232
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5248
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5264
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 5280
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 173; y: 85
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5296
+        hash: "06472b42bc00fcaf7f84cd4ac613bbd2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 173; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5312
+        hash: "06472b42bc00fcaf7f84cd4ac613bbd2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 173; y: 89
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 173; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5328
+        hash: "0031f6edee383e97a3a31fe4268ff778"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 175; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 179; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5344
+        hash: "e594c62fe10165ae08e3dd8b33b9f584"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 183; y: 159
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 183
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5360
+        hash: "dd61c97aafee69eb7c54a47dceea5810"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5376
+        hash: "29d06473d4aac07c89041b4413ce421f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 227
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 243
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5392
+        hash: "7843b1bdb9efdbee0e6dd39ef8f1078a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 253
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 185; y: 253
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5408
+        hash: "f609350d3c3041998340c9a6ded9baec"
+    }
+    Frame {
+        msec: 5424
+        hash: "53b559ea9764ad466a0ffc1c55a596c2"
+    }
+    Frame {
+        msec: 5440
+        hash: "8ac64c07cb29adff5d8510f956f3c35d"
+    }
+    Frame {
+        msec: 5456
+        hash: "cb7ab2e7af067f1493197731515462fa"
+    }
+    Frame {
+        msec: 5472
+        hash: "a0509acbb96bb3ced08a7c968836bd69"
+    }
+    Frame {
+        msec: 5488
+        hash: "e4c5e681a275b4eff49eed39a6b544d6"
+    }
+    Frame {
+        msec: 5504
+        hash: "4403e91762ff703eb12dee1b47f4072c"
+    }
+    Frame {
+        msec: 5520
+        hash: "9f548a31dea71208c9f465e37bafc589"
+    }
+    Frame {
+        msec: 5536
+        hash: "c86dd18e63508adfdbd5b3b891fd0d99"
+    }
+    Frame {
+        msec: 5552
+        hash: "b182070ff0c1b579a9fd16d39f950079"
+    }
+    Frame {
+        msec: 5568
+        hash: "4308c4d6346e20ed89026c0ec216ae89"
+    }
+    Frame {
+        msec: 5584
+        hash: "2da84d83767e5ac1f7ce361bdcebe9c8"
+    }
+    Frame {
+        msec: 5600
+        hash: "a3ce932ebf10147f79a183e44a6f6eb7"
+    }
+    Frame {
+        msec: 5616
+        hash: "f5907789e23150c8dd0858d7c5098907"
+    }
+    Frame {
+        msec: 5632
+        hash: "98b76cfad574957f5b7633390c6788c8"
+    }
+    Frame {
+        msec: 5648
+        hash: "8c58d6511a7077cc386216a6227e8b52"
+    }
+    Frame {
+        msec: 5664
+        hash: "2ca5e16bfd83f933f32367aa49db0e1d"
+    }
+    Frame {
+        msec: 5680
+        hash: "ba387d0ab480eb9eaf6993c2ad168350"
+    }
+    Frame {
+        msec: 5696
+        hash: "ae9f3b3245ccf921967a178712566b55"
+    }
+    Frame {
+        msec: 5712
+        hash: "32cf742724558260447f61da03d5f321"
+    }
+    Frame {
+        msec: 5728
+        hash: "ad21273f37c1abac0719f532dd5530ac"
+    }
+    Frame {
+        msec: 5744
+        hash: "50e43629e0b8d0d651b9670241354cb1"
+    }
+    Frame {
+        msec: 5760
+        image: "flickable-vertical.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "e4f0192406831c8e0abe1b561120b9c0"
+    }
+    Frame {
+        msec: 5792
+        hash: "4c98e619b487d67d114ed0d7800f157e"
+    }
+    Frame {
+        msec: 5808
+        hash: "11ed6dc9464396eb790db236f3713164"
+    }
+    Frame {
+        msec: 5824
+        hash: "908febb1e344d6972d6df611e82792bd"
+    }
+    Frame {
+        msec: 5840
+        hash: "03536bb4d6ff84bf75d9ec3574bb7361"
+    }
+    Frame {
+        msec: 5856
+        hash: "f9946a44c2d4e91a947e6bda7415cf9b"
+    }
+    Frame {
+        msec: 5872
+        hash: "0e63e4b9dd6bc7d7b684cb461c6257bf"
+    }
+    Frame {
+        msec: 5888
+        hash: "1ffe88b771bed2aa27aafe6853b67c7a"
+    }
+    Frame {
+        msec: 5904
+        hash: "ff1b78113a710481273ecf01cc978a46"
+    }
+    Frame {
+        msec: 5920
+        hash: "e381553fa74436ca4b0d166bdca78cf7"
+    }
+    Frame {
+        msec: 5936
+        hash: "d9a6f9bfc011edb7da23091fe24e2717"
+    }
+    Frame {
+        msec: 5952
+        hash: "bd137e8b15f5c485d10b83461dedc67f"
+    }
+    Frame {
+        msec: 5968
+        hash: "8f5b5e19845aa537790b683ef37c8626"
+    }
+    Frame {
+        msec: 5984
+        hash: "5abbf0dccef8a3bb7b090a24d715a25f"
+    }
+    Frame {
+        msec: 6000
+        hash: "bf924dd11e226022c9c812b5c7e8229e"
+    }
+    Frame {
+        msec: 6016
+        hash: "c47b59ff7f3c4acfb296959f6eb14801"
+    }
+    Frame {
+        msec: 6032
+        hash: "b5c0ac4514d44a651a4ab817646f1d88"
+    }
+    Frame {
+        msec: 6048
+        hash: "86a9fba0e2ca761a4fb71e5edbf34cab"
+    }
+    Frame {
+        msec: 6064
+        hash: "5bf43304399bdc979afd2580b922fd30"
+    }
+    Frame {
+        msec: 6080
+        hash: "3696756d6250f23b1122d314df08b936"
+    }
+    Frame {
+        msec: 6096
+        hash: "49c7b24b1655a1b5a9b4cc2187f7cc58"
+    }
+    Frame {
+        msec: 6112
+        hash: "a387dce727804fb4ca1c3378ba130d08"
+    }
+    Frame {
+        msec: 6128
+        hash: "505150386afee9c5d89566c90778cf58"
+    }
+    Frame {
+        msec: 6144
+        hash: "a00ecae0150a069d306127ed54c4921f"
+    }
+    Frame {
+        msec: 6160
+        hash: "e556bfca052e4d8922a4b85d6e94a22a"
+    }
+    Frame {
+        msec: 6176
+        hash: "ac710b4796de4d0b7d275c5fffcefe1f"
+    }
+    Frame {
+        msec: 6192
+        hash: "2f0475e842083c93b0fa0b8a8a33117a"
+    }
+    Frame {
+        msec: 6208
+        hash: "6de0e820748df06e702a82f127d9f635"
+    }
+    Frame {
+        msec: 6224
+        hash: "b3748d7a26ea8289e2faa9dd624b23a3"
+    }
+    Frame {
+        msec: 6240
+        hash: "52be51e9a5bf6e6d0c2e64e584a4bf11"
+    }
+    Frame {
+        msec: 6256
+        hash: "9c4a08a51556d56f2809d27a1de0aae3"
+    }
+    Frame {
+        msec: 6272
+        hash: "4a151e94a39b68a47374cc45cb8969df"
+    }
+    Frame {
+        msec: 6288
+        hash: "a2c2926224103d6e0a679b891451f791"
+    }
+    Frame {
+        msec: 6304
+        hash: "c192adca5c3cf3741f6e7b33d53a722a"
+    }
+    Frame {
+        msec: 6320
+        hash: "8fa9d85c213243e0709e3e32f03cebd9"
+    }
+    Frame {
+        msec: 6336
+        hash: "20f516aa2c4ebc239a283176d83ade6f"
+    }
+    Frame {
+        msec: 6352
+        hash: "ac8ace61348c5500dd6e2d1f3b4b174b"
+    }
+    Frame {
+        msec: 6368
+        hash: "39cc6b136e17283ddc65425150cec7be"
+    }
+    Frame {
+        msec: 6384
+        hash: "b250cb3fd5a7ab5c76ae15d5a500a894"
+    }
+    Frame {
+        msec: 6400
+        hash: "f07e4f8b61c0ce514364e062867687a2"
+    }
+    Frame {
+        msec: 6416
+        hash: "caed510a4edc2830f885f9a8ff98c072"
+    }
+    Frame {
+        msec: 6432
+        hash: "2cfba2b8cd1cbc260edf390e17532afa"
+    }
+    Frame {
+        msec: 6448
+        hash: "f1d705e01521261f22b89aeefb146c7a"
+    }
+    Frame {
+        msec: 6464
+        hash: "9508799a0e28e60a65925b7c10fa2874"
+    }
+    Frame {
+        msec: 6480
+        hash: "accdad5176a0cdce92ed07a7ae818a13"
+    }
+    Frame {
+        msec: 6496
+        hash: "2748258d00cf2f0e5f94c94f97ed95ae"
+    }
+    Frame {
+        msec: 6512
+        hash: "994897c0842947675e2e2df4021c1b5e"
+    }
+    Frame {
+        msec: 6528
+        hash: "22936773b2fc5c555f14a8375da2a7a4"
+    }
+    Frame {
+        msec: 6544
+        hash: "22936773b2fc5c555f14a8375da2a7a4"
+    }
+    Frame {
+        msec: 6560
+        hash: "b58badc862e394bf5374554e019f90c0"
+    }
+    Frame {
+        msec: 6576
+        hash: "b58badc862e394bf5374554e019f90c0"
+    }
+    Frame {
+        msec: 6592
+        hash: "b58badc862e394bf5374554e019f90c0"
+    }
+    Frame {
+        msec: 6608
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6624
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6640
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6656
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6672
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6688
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6704
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6720
+        image: "flickable-vertical.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6752
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6768
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 31; y: 575
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6784
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6800
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6816
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6832
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6848
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6864
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 31; y: 575
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6880
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6896
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6912
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6928
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6944
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6960
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6976
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 6992
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7008
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7024
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7040
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7056
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7072
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7088
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7104
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7120
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7136
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7152
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7168
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7184
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7200
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7216
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7232
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7248
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7264
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7280
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 156; y: 403
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7296
+        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 402
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 396
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7312
+        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 386
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7328
+        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 376
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 360
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7344
+        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 344
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 322
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7360
+        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 298
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 278
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 168; y: 278
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7376
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7392
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7408
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7424
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7440
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7456
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7472
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7488
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7504
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7520
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7536
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7552
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7568
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7584
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7600
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7616
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7632
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7648
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7664
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7680
+        image: "flickable-vertical.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7712
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7728
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7744
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7760
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7776
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7792
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7808
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 154; y: 161
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7824
+        hash: "16eef219cc7d4e7589ea59ebc349973c"
+    }
+    Frame {
+        msec: 7840
+        hash: "16eef219cc7d4e7589ea59ebc349973c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 162
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7856
+        hash: "16eef219cc7d4e7589ea59ebc349973c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 167
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7872
+        hash: "16eef219cc7d4e7589ea59ebc349973c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 177
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7888
+        hash: "16eef219cc7d4e7589ea59ebc349973c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 150; y: 189
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7904
+        hash: "16eef219cc7d4e7589ea59ebc349973c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 229
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 140; y: 255
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7920
+        hash: "16eef219cc7d4e7589ea59ebc349973c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 134; y: 281
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 132; y: 313
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7936
+        hash: "16eef219cc7d4e7589ea59ebc349973c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 128; y: 343
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7952
+        hash: "16eef219cc7d4e7589ea59ebc349973c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 126; y: 373
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 126; y: 397
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 126; y: 397
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7968
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 7984
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8000
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8016
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8032
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8048
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8064
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8080
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8096
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8112
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8128
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8144
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8160
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8176
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8192
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8208
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8224
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8240
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8256
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8272
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8288
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8304
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8320
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8336
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8352
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8368
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8384
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8400
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8416
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8432
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8448
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8464
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8480
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8496
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8512
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8528
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8544
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8560
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8576
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8592
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8608
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8624
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8640
+        image: "flickable-vertical.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8672
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8688
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8704
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8720
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8736
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8752
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8768
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8784
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8800
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8816
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8832
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8848
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8864
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8880
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8896
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8912
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8928
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8944
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8960
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8976
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 8992
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9008
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9024
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9040
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9056
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9072
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9088
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9104
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 44; y: 574
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9120
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9136
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9152
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 44; y: 574
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9168
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9184
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9200
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9216
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9232
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9248
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9264
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9280
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9296
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9312
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9328
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9344
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9360
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9376
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9392
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9408
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9424
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9440
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9456
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9472
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9488
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9504
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9520
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9536
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9552
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9568
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9584
+        hash: "679369b924d719ae309a45034bdba40d"
+    }
+    Frame {
+        msec: 9600
+        image: "flickable-vertical.9.png"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 152; y: 444
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9616
+        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 442
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9632
+        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 440
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 438
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9648
+        hash: "843453070c3ac1bf26cfd84d3ab151eb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 429
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9664
+        hash: "3b0e0ed925b1c197cd94afd3d1a6d572"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 421
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 413
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9680
+        hash: "d7b3838ee1219816b76224c29c7ba2e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 403
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9696
+        hash: "9835b420f0c40a03f8f9fafe39e209f1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 393
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 162; y: 393
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9712
+        hash: "46fb2005a813fc2c278f1bfe83801c0e"
+    }
+    Frame {
+        msec: 9728
+        hash: "81dd9308e475548db21474c37cb9a5b0"
+    }
+    Frame {
+        msec: 9744
+        hash: "10043d74eef240abd2360d45845dd51e"
+    }
+    Frame {
+        msec: 9760
+        hash: "0f83b8f23ba42b22c10a2b68227db64e"
+    }
+    Frame {
+        msec: 9776
+        hash: "7a296e3702c9fef25cb53ac04053853b"
+    }
+    Frame {
+        msec: 9792
+        hash: "ae439daa32f76a368ab314c86c55a378"
+    }
+    Frame {
+        msec: 9808
+        hash: "42ac3503dfa462bf0b5d8c15f6f3b143"
+    }
+    Frame {
+        msec: 9824
+        hash: "b8bb92eb2de7ca0f5924b09f380f47db"
+    }
+    Frame {
+        msec: 9840
+        hash: "994e314d2d38005b6006e81468f10efa"
+    }
+    Frame {
+        msec: 9856
+        hash: "be6a32f3c82aeccebc7778ff5646637f"
+    }
+    Frame {
+        msec: 9872
+        hash: "2fb196f53d5e785e04a14d98d9dab8a1"
+    }
+    Frame {
+        msec: 9888
+        hash: "0926f8209f4f35f6e6fa92935d7408e4"
+    }
+    Frame {
+        msec: 9904
+        hash: "780450301d37ea2b94eb9386e7e5294c"
+    }
+    Frame {
+        msec: 9920
+        hash: "cd4e9629c767813c9a2a2fa30dc5114b"
+    }
+    Frame {
+        msec: 9936
+        hash: "409630d7b9c3c4231bccf74f7453f0af"
+    }
+    Frame {
+        msec: 9952
+        hash: "4c98e619b487d67d114ed0d7800f157e"
+    }
+    Frame {
+        msec: 9968
+        hash: "0a8157dc45764ab8e0e0b89e5c73a76b"
+    }
+    Frame {
+        msec: 9984
+        hash: "ecfc611b58e000df9f608c8889a2a84f"
+    }
+    Frame {
+        msec: 10000
+        hash: "5c6bc246446c75d57bcd40e86041892b"
+    }
+    Frame {
+        msec: 10016
+        hash: "fe1a3e688da126861b29a94b676b68f7"
+    }
+    Frame {
+        msec: 10032
+        hash: "f5feef892bf013916bacb63ff6460cb7"
+    }
+    Frame {
+        msec: 10048
+        hash: "665018efd991cab3acb4b80005fc2bd3"
+    }
+    Frame {
+        msec: 10064
+        hash: "bc7614e4a0e0724a9cb0981f09f8a7f6"
+    }
+    Frame {
+        msec: 10080
+        hash: "463a6da452a5a6267240992ad5284e89"
+    }
+    Frame {
+        msec: 10096
+        hash: "eca3f146e0143856f58b4f7aee42e6f8"
+    }
+    Frame {
+        msec: 10112
+        hash: "dec9b9845509c4d28d7faae043b292d1"
+    }
+    Frame {
+        msec: 10128
+        hash: "49452842cb2429cd465e40478638e0e3"
+    }
+    Frame {
+        msec: 10144
+        hash: "a7029d0090d3620ee21b9e3d55eefe78"
+    }
+    Frame {
+        msec: 10160
+        hash: "1041b18d422acba0b9a45ca89856e493"
+    }
+    Frame {
+        msec: 10176
+        hash: "d53038b688b920715b196dd4cc2b2587"
+    }
+    Frame {
+        msec: 10192
+        hash: "da59ffebb491ab5fa98429117c3bb8ac"
+    }
+    Frame {
+        msec: 10208
+        hash: "602269f78eaf0df36c66de72e005989a"
+    }
+    Frame {
+        msec: 10224
+        hash: "a311b6b35feb4096b0d01753a6695210"
+    }
+    Frame {
+        msec: 10240
+        hash: "cd303e8850c6aac58fcf2a98db418f1b"
+    }
+    Frame {
+        msec: 10256
+        hash: "6e9132dd840a136cc688676bce7640de"
+    }
+    Frame {
+        msec: 10272
+        hash: "a3818492bb4ebd91ce86675d34731c58"
+    }
+    Frame {
+        msec: 10288
+        hash: "b85a127895713234028641787312b717"
+    }
+    Frame {
+        msec: 10304
+        hash: "a030dc1543e84d8a0ec9f77fd6325060"
+    }
+    Frame {
+        msec: 10320
+        hash: "669cd28abe17d419e9cabe4d796a38c3"
+    }
+    Frame {
+        msec: 10336
+        hash: "bfdd15cf058050203561b5f935106263"
+    }
+    Frame {
+        msec: 10352
+        hash: "a39abc94fee93175a6a37b402750e4f7"
+    }
+    Frame {
+        msec: 10368
+        hash: "0c65e19e12d95ec8ee253219b0c3e472"
+    }
+    Frame {
+        msec: 10384
+        hash: "15debc234e70765a4510bfbda886a2c9"
+    }
+    Frame {
+        msec: 10400
+        hash: "9566a87437cb6e9025f9a3881a620823"
+    }
+    Frame {
+        msec: 10416
+        hash: "b66d89244cba537a21901dcb11387bf7"
+    }
+    Frame {
+        msec: 10432
+        hash: "03347ce314393bd84873026cd01c562f"
+    }
+    Frame {
+        msec: 10448
+        hash: "458fab2449dba089ae6f1e78a230564b"
+    }
+    Frame {
+        msec: 10464
+        hash: "7115f27574bfc68ff58a2e4fb65107dd"
+    }
+    Frame {
+        msec: 10480
+        hash: "66260c030dddda4b086bc98982a11934"
+    }
+    Frame {
+        msec: 10496
+        hash: "d5790ee5eb8ecf249cb1dcf58aefa4ee"
+    }
+    Frame {
+        msec: 10512
+        hash: "6bec07ba1e2ac637aab7a9038cbacc93"
+    }
+    Frame {
+        msec: 10528
+        hash: "a72f36cc18c8620a2bd85bac49f6771a"
+    }
+    Frame {
+        msec: 10544
+        hash: "65b178ae559ab0ba9c568718f287ff68"
+    }
+    Frame {
+        msec: 10560
+        image: "flickable-vertical.10.png"
+    }
+    Frame {
+        msec: 10576
+        hash: "b35a8e33f876921d477809b5adb7a201"
+    }
+    Frame {
+        msec: 10592
+        hash: "057b69ef8137f38c596432da547f1ead"
+    }
+    Frame {
+        msec: 10608
+        hash: "62f76f46857106010c2e862ed19baeea"
+    }
+    Frame {
+        msec: 10624
+        hash: "fbfc73e1b20b79d71953c298ca095047"
+    }
+    Frame {
+        msec: 10640
+        hash: "aea78988f875083660dd46d6afc71683"
+    }
+    Frame {
+        msec: 10656
+        hash: "60d8decd7ded420433256a94f1bf954f"
+    }
+    Frame {
+        msec: 10672
+        hash: "221f72cdf18e0b33e7f6a65356fcc61b"
+    }
+    Frame {
+        msec: 10688
+        hash: "221f72cdf18e0b33e7f6a65356fcc61b"
+    }
+    Frame {
+        msec: 10704
+        hash: "c2eac9c0d84c6b2f133d8751ac5f265f"
+    }
+    Frame {
+        msec: 10720
+        hash: "c2eac9c0d84c6b2f133d8751ac5f265f"
+    }
+    Frame {
+        msec: 10736
+        hash: "c2eac9c0d84c6b2f133d8751ac5f265f"
+    }
+    Frame {
+        msec: 10752
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10768
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10784
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10800
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10816
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10832
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10848
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10864
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10880
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 98; y: 573
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10896
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10912
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10928
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10944
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10960
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 98; y: 573
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10976
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 10992
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11008
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11024
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11040
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11056
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11072
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11088
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11104
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11120
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11136
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11152
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11168
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11184
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11200
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11216
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11232
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11248
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11264
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11280
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11296
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11312
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11328
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11344
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11360
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11376
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11392
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11408
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11424
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11440
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11456
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11472
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11488
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11504
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11520
+        image: "flickable-vertical.11.png"
+    }
+    Frame {
+        msec: 11536
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11552
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11568
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11584
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11600
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11616
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11632
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11648
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11664
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11680
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11696
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11712
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11728
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 170; y: 335
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11744
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Frame {
+        msec: 11760
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 336
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 338
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11776
+        hash: "28a06534a2e35250c67112dfb6c05095"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 346
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11792
+        hash: "12040d4dd56848fc93d6390005045188"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 359
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11808
+        hash: "caa70db5f31eb607c2de39734a42796c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 367
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 379
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11824
+        hash: "ca45ab832b5a8b041ba8bea1185a2b38"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 393
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 407
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11840
+        hash: "188042b1a045dc96a65a7fc0e90568c3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 419
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11856
+        hash: "714a3cf591beeeddbdc2df94f5cedef1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 443
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11872
+        hash: "e9978c24eef649d01cb2245f783cb562"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 461
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11888
+        hash: "bc8f32062afdfe33da7c99ee867bc2a3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 467
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11904
+        hash: "d788c09f4acba8197b2d8fef2e8ece51"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 470
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11920
+        hash: "b0a383eb416727c22451a30a997f48f1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 169; y: 472
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11936
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 11952
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 11968
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 11984
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12000
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12016
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12032
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12048
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12064
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 169; y: 472
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12080
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12096
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12112
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12128
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12144
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12160
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12176
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12192
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12208
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12224
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12240
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12256
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12272
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12288
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12304
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12320
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12336
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12352
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12368
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12384
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12400
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12416
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Frame {
+        msec: 12432
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 171; y: 452
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12448
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 172; y: 450
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 173; y: 448
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12464
+        hash: "6b81b365eb057ffa32d89e564bc92949"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 175; y: 434
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12480
+        image: "flickable-vertical.12.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 175; y: 431
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 177; y: 423
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12496
+        hash: "7e760a017ab10fe920074405248d1473"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 177; y: 415
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12512
+        hash: "eab43f1c2b6fb79aad578a164b8b7b28"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 181; y: 395
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 183; y: 383
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12528
+        hash: "a5446ca4c6650ffc9812845bdb8db088"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 371
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12544
+        hash: "71cb7dc7f9dbb9e17d7f44885ec71bdb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 357
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12560
+        hash: "ccf0908d968f658311a9787182de498a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 329
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12576
+        hash: "26b9c6379590bbda24d129bd4f19f7d3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 303
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 293
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12592
+        hash: "6c88a02ffdffee6d615ddc6a11c1b698"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 283
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12608
+        hash: "38175cb09b6e63353b478635b22dbb5b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 280
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 277
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12624
+        hash: "5084910bf204e8b688de31d4f9018a57"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 275
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 273
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12640
+        hash: "e984565312571ec144a1cd4cc11253e8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 272
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 271
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12656
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12672
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12688
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12704
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12720
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12736
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12752
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12768
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 187; y: 271
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12784
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12800
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12816
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12832
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12848
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12864
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12880
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12896
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12912
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12928
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12944
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12960
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12976
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 12992
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 13008
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13024
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13040
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13056
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13072
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13088
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13104
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13120
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13136
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13152
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13168
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13184
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13200
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13216
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13232
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13248
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13264
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13280
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13296
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13312
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13328
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13344
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 181; y: 242
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13360
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13376
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13392
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13408
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13424
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 181; y: 242
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13440
+        image: "flickable-vertical.13.png"
+    }
+    Frame {
+        msec: 13456
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13472
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13488
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13504
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13520
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13536
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13552
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13568
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13584
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13600
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13616
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13632
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13648
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13664
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13680
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13696
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13712
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13728
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13744
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13760
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13776
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13792
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13808
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13824
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13840
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13856
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13872
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13888
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13904
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13920
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13936
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 181; y: 242
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13952
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13968
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 13984
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 14000
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 14016
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 14032
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 14048
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 14064
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 14080
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 14096
+        hash: "4b86de37ae9bc630a2f3440811087617"
+    }
+    Frame {
+        msec: 14112
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14128
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14144
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14160
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14176
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14192
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14208
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14224
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14240
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14256
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14272
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14288
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14304
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14320
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14336
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14352
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14368
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14384
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14400
+        image: "flickable-vertical.14.png"
+    }
+    Frame {
+        msec: 14416
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14432
+        hash: "d96fb1b387b34f41f80e98c1feb05303"
+    }
+    Frame {
+        msec: 14448
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14464
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14480
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14496
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14512
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14528
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14544
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14560
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14576
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14592
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14608
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14624
+        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
+    }
+    Frame {
+        msec: 14640
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14656
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14672
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14688
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14704
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14720
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14736
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14752
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14768
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14784
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14800
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14816
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14832
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14848
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14864
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14880
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14896
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14912
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14928
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14944
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14960
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14976
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 14992
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 15008
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 15024
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 15040
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 181; y: 242
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 15056
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15072
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15088
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15104
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15120
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15136
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15152
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15168
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15184
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15200
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15216
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15232
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15248
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15264
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15280
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15296
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15312
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15328
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15344
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15360
+        image: "flickable-vertical.15.png"
+    }
+    Frame {
+        msec: 15376
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15392
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15408
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15424
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15440
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15456
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15472
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15488
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15504
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15520
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15536
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15552
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15568
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15584
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15600
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15616
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15632
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15648
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15664
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15680
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15696
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15712
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 192; y: 218
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 15728
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15744
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15760
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15776
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15792
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15808
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15824
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15840
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15856
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15872
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15888
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15904
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15920
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15936
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15952
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15968
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 15984
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16000
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16016
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16032
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16048
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16064
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16080
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16096
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16112
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16128
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16144
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16160
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16176
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16192
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16208
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16224
+        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
+    }
+    Frame {
+        msec: 16240
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16256
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16272
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16288
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16304
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16320
+        image: "flickable-vertical.16.png"
+    }
+    Frame {
+        msec: 16336
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16352
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16368
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16384
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16400
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16416
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16432
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16448
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16464
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16480
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16496
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16512
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16528
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16544
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16560
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16576
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16592
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16608
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16624
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16640
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Frame {
+        msec: 16656
+        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 222
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 224
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16672
+        hash: "c30bea2a73a8b5af4565ef3996f29416"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 228
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 230
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16688
+        hash: "9612c176ec3ecf76a367728f451522a4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 233
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16704
+        hash: "24f6feeeb1ff82c8d4262f74e4656602"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 238
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16720
+        hash: "5823b56f1e362fdfc216a82e2dcdec61"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 241
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16736
+        hash: "4ee243b91e847dabaceb21b5540c2a6d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 245
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16752
+        hash: "87f1dc2238577fc5be6b1bd941226f3e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 251
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16768
+        hash: "480c6fcf1b3862a41a7225c35d8080c3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 256
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16784
+        hash: "0ac819bd8e6ce19553bd954e466e7ac0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 199; y: 258
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16800
+        hash: "0636dd7c4eb0b56697fb59fb46f47f9c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 201; y: 267
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16816
+        hash: "62f76f46857106010c2e862ed19baeea"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 276
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16832
+        hash: "26b9c6379590bbda24d129bd4f19f7d3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 279
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 280
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16848
+        hash: "21baf0596553627c8e683a31c2e6d04f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 281
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 282
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16864
+        hash: "036679da5def5e696361f2373172a3f4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 283
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16880
+        hash: "e3fc6101bc6cccf309b3df6b194820ea"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 285
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16896
+        hash: "d9ee6d0a7455cfd724c1856549100756"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 286
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16912
+        hash: "caa70db5f31eb607c2de39734a42796c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 287
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16928
+        hash: "e2dc88b454e69cf92d6887a2f0629a94"
+    }
+    Frame {
+        msec: 16944
+        hash: "e2dc88b454e69cf92d6887a2f0629a94"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 288
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 16960
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 16976
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 16992
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17008
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17024
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17040
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17056
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17072
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17088
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 203; y: 288
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 17104
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17120
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17136
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17152
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17168
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17184
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17200
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17216
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17232
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17248
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17264
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17280
+        image: "flickable-vertical.17.png"
+    }
+    Frame {
+        msec: 17296
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17312
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17328
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17344
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17360
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17376
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17392
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17408
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17424
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17440
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17456
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17472
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17488
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17504
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17520
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17536
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17552
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17568
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17584
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17600
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17616
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17632
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17648
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17664
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17680
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17696
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17712
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17728
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17744
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17760
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17776
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17792
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17808
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17824
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17840
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17856
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17872
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17888
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17904
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17920
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17936
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17952
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17968
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 17984
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18000
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18016
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18032
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18048
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18064
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18080
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18096
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18112
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18128
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18144
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18160
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18176
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18192
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18208
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18224
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18240
+        image: "flickable-vertical.18.png"
+    }
+    Frame {
+        msec: 18256
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18272
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18288
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18304
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18320
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18336
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18352
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18368
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18384
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18400
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18416
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18432
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18448
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 102; y: 575
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 18464
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18480
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18496
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 102; y: 575
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 18512
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18528
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18544
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18560
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18576
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18592
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18608
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18624
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18640
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18656
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18672
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18688
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18704
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18720
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18736
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18752
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18768
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18784
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18800
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18816
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18832
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18848
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18864
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18880
+        hash: "fac8455a2707b04aabff25723375a78b"
+    }
+    Frame {
+        msec: 18896
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 18912
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 18928
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 18944
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 18960
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 18976
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 18992
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19008
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19024
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19040
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19056
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19072
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19088
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19104
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19120
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19136
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19152
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19168
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19184
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19200
+        image: "flickable-vertical.19.png"
+    }
+    Frame {
+        msec: 19216
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19232
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19248
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19264
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 164; y: 571
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 19280
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19296
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19312
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19328
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 164; y: 571
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 19344
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19360
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19376
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19392
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19408
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19424
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19440
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19456
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19472
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19488
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19504
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19520
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19536
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19552
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19568
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19584
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19600
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19616
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19632
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19648
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19664
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19680
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19696
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19712
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19728
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19744
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19760
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19776
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19792
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19808
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19824
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19840
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19856
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19872
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19888
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19904
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19920
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19936
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19952
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19968
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 19984
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20000
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20016
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20032
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20048
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20064
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20080
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20096
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20112
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20128
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20144
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20160
+        image: "flickable-vertical.20.png"
+    }
+    Frame {
+        msec: 20176
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20192
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20208
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Frame {
+        msec: 20224
+        hash: "cce4177eb20b7aa43a7383a16c43f473"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 170; y: 450
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 20240
+        hash: "b8e7a053fc023be42ab5136f6e7305fd"
+    }
+    Frame {
+        msec: 20256
+        hash: "b8e7a053fc023be42ab5136f6e7305fd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 448
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 20272
+        hash: "b8e7a053fc023be42ab5136f6e7305fd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 172; y: 438
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 20288
+        hash: "40cf6e4567c796d6ad83778fb1959d8a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 410
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 20304
+        hash: "9914584daf02407c1edc3b6a38b8302d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 388
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 366
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 20320
+        hash: "5aff2316a5e34f5e15b7cb36257a3d72"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 342
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 176; y: 342
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 20336
+        hash: "de1f9ff1abfa8cdc760bc84129fab40d"
+    }
+    Frame {
+        msec: 20352
+        hash: "032c4fd62a0a611207262d317d4ea103"
+    }
+    Frame {
+        msec: 20368
+        hash: "1db8a7b3899f5efea25ccf93285ee6bd"
+    }
+    Frame {
+        msec: 20384
+        hash: "3c106f68b755862346cddd21d75c0caf"
+    }
+    Frame {
+        msec: 20400
+        hash: "41d025dfe037b9cebe84e4c7200e9d15"
+    }
+    Frame {
+        msec: 20416
+        hash: "f347687313c88150a6f977ae8b1620fc"
+    }
+    Frame {
+        msec: 20432
+        hash: "4bb30faaec54e2a47dfd2b2988a6c231"
+    }
+    Frame {
+        msec: 20448
+        hash: "fede02600e790d4b6eb1f85563b37cbc"
+    }
+    Frame {
+        msec: 20464
+        hash: "0a949f7150b3709b9eda62c98f98fc62"
+    }
+    Frame {
+        msec: 20480
+        hash: "214e571c2346b0d6b5d1220e856a8e67"
+    }
+    Frame {
+        msec: 20496
+        hash: "f84207d20cfff984d1c79654a1074d02"
+    }
+    Frame {
+        msec: 20512
+        hash: "7dc3592294dcd88fbfff2f984fd2d4c3"
+    }
+    Frame {
+        msec: 20528
+        hash: "42829e78f62e692a093df267d2b673e2"
+    }
+    Frame {
+        msec: 20544
+        hash: "d264570c78e7d1ea283c72191953a2ce"
+    }
+    Frame {
+        msec: 20560
+        hash: "b69b045557a8eada80a24eb4caa7ea4e"
+    }
+    Frame {
+        msec: 20576
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20592
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20608
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20624
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20640
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20656
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20672
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20688
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20704
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20720
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20736
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20752
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20768
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20784
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20800
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20816
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20832
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20848
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20864
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20880
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20896
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20912
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20928
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20944
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20960
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20976
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 20992
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21008
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21024
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21040
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21056
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21072
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21088
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21104
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21120
+        image: "flickable-vertical.21.png"
+    }
+    Frame {
+        msec: 21136
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21152
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21168
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21184
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21200
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21216
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21232
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21248
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21264
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21280
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21296
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21312
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21328
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21344
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21360
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21376
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21392
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21408
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21424
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21440
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21456
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21472
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21488
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21504
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21520
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21536
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21552
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21568
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Frame {
+        msec: 21584
+        hash: "a76f069dfcb1af0794999c34507e190e"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 197; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 197; y: 132
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 21600
+        hash: "06472b42bc00fcaf7f84cd4ac613bbd2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 197; y: 146
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 197; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 21616
+        hash: "463fce69afc3dec181425c9adaa3e77c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 197; y: 190
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 195; y: 218
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 21632
+        hash: "9af34ff618e277eafad32e0377ecc94b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 250
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 21648
+        hash: "db4b2333630ccc4a7982361609a12837"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 183; y: 284
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 183; y: 284
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 21664
+        hash: "50335b19a1e210f87924d01bb343a0e0"
+    }
+    Frame {
+        msec: 21680
+        hash: "59b4f80a7cd6b732eb26f3b4147efe7e"
+    }
+    Frame {
+        msec: 21696
+        hash: "b99cc1f07bcb0480801d4d5403372525"
+    }
+    Frame {
+        msec: 21712
+        hash: "871040b0f921646609b79828bab38949"
+    }
+    Frame {
+        msec: 21728
+        hash: "2acb3d19eed000313872d5cd66765b53"
+    }
+    Frame {
+        msec: 21744
+        hash: "b5431a2d2e856a726ceac2066b128f8f"
+    }
+    Frame {
+        msec: 21760
+        hash: "04047c917a95a2a3df30c14bb20601dd"
+    }
+    Frame {
+        msec: 21776
+        hash: "fea7ac3d26975f438129e394c667e628"
+    }
+    Frame {
+        msec: 21792
+        hash: "4db41ff05865cabc4ef288478254e633"
+    }
+    Frame {
+        msec: 21808
+        hash: "e0d3737effd817a8f603eb393677b8b6"
+    }
+    Frame {
+        msec: 21824
+        hash: "d4f06941d213544ddcae714ddc0b47e9"
+    }
+    Frame {
+        msec: 21840
+        hash: "dbb21caf4a4c9b88563f1d0aad35f3d3"
+    }
+    Frame {
+        msec: 21856
+        hash: "eb9a052219c3f955f2c036834990089b"
+    }
+    Frame {
+        msec: 21872
+        hash: "40090a35caf674ed9c4bf1d10f9209ea"
+    }
+    Frame {
+        msec: 21888
+        hash: "064de0abec66d1ddcf0f6073ce7d91ef"
+    }
+    Frame {
+        msec: 21904
+        hash: "f407334d0b63a34657dc1306fd67aeb7"
+    }
+    Frame {
+        msec: 21920
+        hash: "1c0744be97c65c68ca92bd86d42c7b0e"
+    }
+    Frame {
+        msec: 21936
+        hash: "7469d4a06c5df073e22db3c905baefc1"
+    }
+    Frame {
+        msec: 21952
+        hash: "35912a7e2ecc0c387fc9fb9da7201bfd"
+    }
+    Frame {
+        msec: 21968
+        hash: "9f835091374f0d0d9a6996e6dad10e19"
+    }
+    Frame {
+        msec: 21984
+        hash: "afade1ecbaf5f920880eaff3b3de606e"
+    }
+    Frame {
+        msec: 22000
+        hash: "9c70e8a020c8c1101b9884529cb4527f"
+    }
+    Frame {
+        msec: 22016
+        hash: "3e7d4dc75f85dfeb065da18ef1c102c1"
+    }
+    Frame {
+        msec: 22032
+        hash: "16852d62a77eefccea9497ae1b09842d"
+    }
+    Frame {
+        msec: 22048
+        hash: "ea8afda6d837a98f408a7aa133494575"
+    }
+    Frame {
+        msec: 22064
+        hash: "666435dccf30c53eb09ea7ad8b5264a1"
+    }
+    Frame {
+        msec: 22080
+        image: "flickable-vertical.22.png"
+    }
+    Frame {
+        msec: 22096
+        hash: "2e959bf0470bac84e2220d9e8a8bbb97"
+    }
+    Frame {
+        msec: 22112
+        hash: "595b6cfd559f8362b010616de4947ec6"
+    }
+    Frame {
+        msec: 22128
+        hash: "976dd345cc7cb4e3c09a288530d3c8af"
+    }
+    Frame {
+        msec: 22144
+        hash: "9493e425d5cd3f9eef904a1be63f45f1"
+    }
+    Frame {
+        msec: 22160
+        hash: "0a2013afebb5e09d82633c8d8a393f01"
+    }
+    Frame {
+        msec: 22176
+        hash: "d8377c464bc59d95e0670d697888d804"
+    }
+    Frame {
+        msec: 22192
+        hash: "52f9416973da953bd6fe55b2fe22786a"
+    }
+    Frame {
+        msec: 22208
+        hash: "23b9af0f371b7817e9ceaa1a83995d35"
+    }
+    Frame {
+        msec: 22224
+        hash: "34b0e0333c91bc4533e0c01eaeb3d3f9"
+    }
+    Frame {
+        msec: 22240
+        hash: "1597b86afe2841c3bb77bb5dd6aa6803"
+    }
+    Frame {
+        msec: 22256
+        hash: "d74111814ff259fea47e1eb3b36e174b"
+    }
+    Frame {
+        msec: 22272
+        hash: "c64c46fe9cd75afbf2385241ea8e55d4"
+    }
+    Frame {
+        msec: 22288
+        hash: "1e8740a104643fe30b0e874bbbed44ab"
+    }
+    Frame {
+        msec: 22304
+        hash: "ef669a8d142947463084383a6c7c7f85"
+    }
+    Frame {
+        msec: 22320
+        hash: "2314c42b5994bdbfd73eb2c3ea54626b"
+    }
+    Frame {
+        msec: 22336
+        hash: "53a0694d8eee91b968bd43efe43f2c9e"
+    }
+    Frame {
+        msec: 22352
+        hash: "be4772528f30c18193e49ae04a290af8"
+    }
+    Frame {
+        msec: 22368
+        hash: "a0b0877ab92a0323e35fdb7beb602dee"
+    }
+    Frame {
+        msec: 22384
+        hash: "a0e299fb4ba811a0b22fb62c222cb86c"
+    }
+    Frame {
+        msec: 22400
+        hash: "2562bc9c9aa60a48b6ca00333f60d163"
+    }
+    Frame {
+        msec: 22416
+        hash: "486b45c385d88d6f054fa6308b55f2ac"
+    }
+    Frame {
+        msec: 22432
+        hash: "86502af668ed6336dce8fe329e3408a6"
+    }
+    Frame {
+        msec: 22448
+        hash: "2a79a6530a07f00810310117d00d28ed"
+    }
+    Frame {
+        msec: 22464
+        hash: "94a5fce3e0c3b219e0d807bfcade11e8"
+    }
+    Frame {
+        msec: 22480
+        hash: "94a5fce3e0c3b219e0d807bfcade11e8"
+    }
+    Frame {
+        msec: 22496
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22512
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22528
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22544
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22560
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22576
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22592
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22608
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22624
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22640
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22656
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22672
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22688
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22704
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22720
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22736
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22752
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22768
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22784
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22800
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22816
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22832
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22848
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22864
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22880
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22896
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22912
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22928
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22944
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22960
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22976
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 22992
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23008
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23024
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23040
+        image: "flickable-vertical.23.png"
+    }
+    Frame {
+        msec: 23056
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23072
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23088
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23104
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23120
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23136
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23152
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23168
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23184
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23200
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23216
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23232
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23248
+        hash: "8443c45791c906a9fe23831844f48a1c"
+    }
+    Frame {
+        msec: 23264
+        hash: "8443c45791c906a9fe23831844f48a1c
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml
new file mode 100644
index 0000000..1a7366d
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml
@@ -0,0 +1,37 @@
+import Qt 4.6
+
+Rectangle {
+    color: "lightSteelBlue"
+    width: 600; height: 300
+
+    ListModel {
+        id: list
+        ListElement { dayColor: "steelblue" }
+        ListElement { dayColor: "blue" }
+        ListElement { dayColor: "yellow" }
+        ListElement { dayColor: "purple" }
+        ListElement { dayColor: "red" }
+        ListElement { dayColor: "green" }
+        ListElement { dayColor: "orange" }
+    }
+
+    Flickable {
+        id: flickable
+        anchors.fill: parent; viewportWidth: row.width
+
+        Row {
+            id: row
+            Repeater {
+                model: list
+                Rectangle { width: 200; height: 300; color: dayColor }
+            }
+        }
+    }
+    Rectangle {
+        radius: 3
+        y: flickable.height-8
+        height: 8
+        x: flickable.visibleArea.xPosition * flickable.width
+        width: flickable.visibleArea.widthRatio * flickable.width
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml
new file mode 100644
index 0000000..6204aa9
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml
@@ -0,0 +1,91 @@
+import Qt 4.6
+
+Rectangle {
+    color: "lightSteelBlue"
+    width: 300; height: 600
+
+    ListModel {
+        id: list
+        ListElement { dayColor: "steelblue" }
+        ListElement { dayColor: "blue" }
+        ListElement { dayColor: "yellow" }
+        ListElement { dayColor: "purple" }
+        ListElement { dayColor: "red" }
+        ListElement { dayColor: "green" }
+        ListElement { dayColor: "orange" }
+    }
+
+    flickable {
+        id: flick
+        height: parent.height-50
+        width: parent.width; viewportHeight: column.height
+
+        Column {
+            id: column
+            Repeater {
+                model: list
+                Rectangle { width: 300; height: 200; color: mr.pressed ? "black" : dayColor
+                    MouseArea {
+                        id: mr
+                        anchors.fill: parent
+                    }
+                }
+            }
+        }
+        clip: true
+        reportedVelocitySmoothing: 1000
+    }
+    Rectangle {
+        radius: 3
+        x: flick.width-8
+        width: 8
+        y: flick.visibleArea.yPosition * flick.height
+        height: flick.visibleArea.heightRatio * flick.height
+    }
+
+    // click to toggle interactive flag
+    Rectangle {
+        width: 64
+        height: 48
+        y: parent.height - 50
+        color: "red"
+        MouseArea {
+            anchors.fill: parent
+            onClicked: flick.interactive = flick.interactive ? false : true
+        }
+    }
+
+    // click to toggle click delay
+    Rectangle {
+        width: 64
+        height: 48
+        x: 66
+        y: parent.height - 50
+        color: "green"
+        MouseArea {
+            anchors.fill: parent
+            onClicked: flick.pressDelay = flick.pressDelay > 0 ? 0 : 500
+        }
+    }
+
+    // click to toggle overshoot
+    Rectangle {
+        width: 64
+        height: 48
+        x: 130
+        y: parent.height - 50
+        color: "yellow"
+        MouseArea {
+            anchors.fill: parent
+            onClicked: flick.overShoot = flick.overShoot > 0 ? 0 : 30
+        }
+    }
+
+    Rectangle {
+        width: Math.abs(flick.verticalVelocity)/100
+        height: 50
+        x: 200
+        y: parent.height - 50
+        color: blue
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.0.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.0.png
new file mode 100644
index 0000000..53a8b42
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.1.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.1.png
new file mode 100644
index 0000000..b7efe8c
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.2.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.2.png
new file mode 100644
index 0000000..aa6d147
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.3.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.3.png
new file mode 100644
index 0000000..9d39713
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.4.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.4.png
new file mode 100644
index 0000000..98e8817
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.5.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.5.png
new file mode 100644
index 0000000..a3f9d8f
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.qml b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.qml
new file mode 100644
index 0000000..520d9a2
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.qml
@@ -0,0 +1,1623 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "7e16e6360fc2e9db67dbf11d58042745"
+    }
+    Frame {
+        msec: 32
+        hash: "7e16e6360fc2e9db67dbf11d58042745"
+    }
+    Frame {
+        msec: 48
+        hash: "7e16e6360fc2e9db67dbf11d58042745"
+    }
+    Frame {
+        msec: 64
+        hash: "06d7f0befa7e06972983ffe87c162750"
+    }
+    Frame {
+        msec: 80
+        hash: "51dff66a7767e3464fda60f2cf906700"
+    }
+    Frame {
+        msec: 96
+        hash: "f8038dc4b67b92ef776a97589240e8c5"
+    }
+    Frame {
+        msec: 112
+        hash: "692931f1db6ddf0b37eb64026ca830f8"
+    }
+    Frame {
+        msec: 128
+        hash: "f01b7368e42381dda5eadf56482ea993"
+    }
+    Frame {
+        msec: 144
+        hash: "9811f823e057882d384f36d7227fa12e"
+    }
+    Frame {
+        msec: 160
+        hash: "9b40b6c75af876567ff49688bc710f2a"
+    }
+    Frame {
+        msec: 176
+        hash: "e97a5d968da37789c28816608fa262a1"
+    }
+    Frame {
+        msec: 192
+        hash: "2cd0627fdc63bb91f8dcac789d7a93b2"
+    }
+    Frame {
+        msec: 208
+        hash: "ae2407f8da9a047d2725bcdcf8e568b2"
+    }
+    Frame {
+        msec: 224
+        hash: "da2a1e5e988c27577ceb453cb0383703"
+    }
+    Frame {
+        msec: 240
+        hash: "90fb4e4ba04ac32b52c10b3258431c04"
+    }
+    Frame {
+        msec: 256
+        hash: "90fb4e4ba04ac32b52c10b3258431c04"
+    }
+    Frame {
+        msec: 272
+        hash: "90fb4e4ba04ac32b52c10b3258431c04"
+    }
+    Frame {
+        msec: 288
+        hash: "73c06997014af4e008b546b53fe349fb"
+    }
+    Frame {
+        msec: 304
+        hash: "262404c6e55b93c4ab940582a49f7e18"
+    }
+    Frame {
+        msec: 320
+        hash: "451a9408b04826ab35749d9120efd6bb"
+    }
+    Frame {
+        msec: 336
+        hash: "451a9408b04826ab35749d9120efd6bb"
+    }
+    Frame {
+        msec: 352
+        hash: "2d112d040fd425c59b511066737e494d"
+    }
+    Frame {
+        msec: 368
+        hash: "769d2724656dbf0e793ecd8e42db3de2"
+    }
+    Frame {
+        msec: 384
+        hash: "9e375cb3815723a2c5dda39c79325e96"
+    }
+    Frame {
+        msec: 400
+        hash: "b21e92871bf63873b8ae48a2aff47be5"
+    }
+    Frame {
+        msec: 416
+        hash: "00d08f4257f35c6236cde0597b0005e4"
+    }
+    Frame {
+        msec: 432
+        hash: "8048f84221a02e7102cf3272445862a1"
+    }
+    Frame {
+        msec: 448
+        hash: "f0d7b45f0b01319494616c1893aa940e"
+    }
+    Frame {
+        msec: 464
+        hash: "457fad89140a1dda9e70549d451482e9"
+    }
+    Frame {
+        msec: 480
+        hash: "ee0feb79e843cdb2adea72fa37ecab67"
+    }
+    Frame {
+        msec: 496
+        hash: "ece02d3590147884e697dd5228dee8c4"
+    }
+    Frame {
+        msec: 512
+        hash: "91c4ec19716a0883c8f5c25b9a0d1f42"
+    }
+    Frame {
+        msec: 528
+        hash: "a7c9860dd4962b11b92c54370ba156ee"
+    }
+    Frame {
+        msec: 544
+        hash: "a28f2590be1e8cde4cde5219367015ac"
+    }
+    Frame {
+        msec: 560
+        hash: "3b641ba58f5e1f0e1f2f528acf38cb28"
+    }
+    Frame {
+        msec: 576
+        hash: "d0b0969ad165d4784f763683de42278e"
+    }
+    Frame {
+        msec: 592
+        hash: "93968dffda327a101e2bd07b80fff842"
+    }
+    Frame {
+        msec: 608
+        hash: "08f5db4cd7f27178c67e6d973e4bb023"
+    }
+    Frame {
+        msec: 624
+        hash: "0967cad0a3ae82307a049944e1bcdc3e"
+    }
+    Frame {
+        msec: 640
+        hash: "d70ffd02b434e607bc11a95ca536c19a"
+    }
+    Frame {
+        msec: 656
+        hash: "cd561b4d5e707bb6b9f6d493f9b99512"
+    }
+    Frame {
+        msec: 672
+        hash: "58355ca37c6e4e54061664180faa11fb"
+    }
+    Frame {
+        msec: 688
+        hash: "bd873f48c79286c50333c838e57d8ec7"
+    }
+    Frame {
+        msec: 704
+        hash: "db89bc0e04ebefe5440748fe85e0bdf7"
+    }
+    Frame {
+        msec: 720
+        hash: "c400bc1e6c02c792cc515a6dd8bbaa9b"
+    }
+    Frame {
+        msec: 736
+        hash: "accf3567a161239cd8c18dd9d4527aaf"
+    }
+    Frame {
+        msec: 752
+        hash: "2e3bcdf70f160bf8e3f1b77ee472b782"
+    }
+    Frame {
+        msec: 768
+        hash: "929da0d629253478c322360c9a8dfc9e"
+    }
+    Frame {
+        msec: 784
+        hash: "d5d4b7c52ba14e84bc9c34a8b55f84b7"
+    }
+    Frame {
+        msec: 800
+        hash: "063ce927e9e7c5afb9131302ea5a968c"
+    }
+    Frame {
+        msec: 816
+        hash: "b94b6fff850aacccdaf0f74d4e36ba67"
+    }
+    Frame {
+        msec: 832
+        hash: "bac2b9b9be4b71fafe59868506aa8ab9"
+    }
+    Frame {
+        msec: 848
+        hash: "a91fed41a5a07e84424e45477f463aa1"
+    }
+    Frame {
+        msec: 864
+        hash: "370eefd369ef366f1d5930b261340d0b"
+    }
+    Frame {
+        msec: 880
+        hash: "b04a87997d0eeb6ff2f91fc2f0d016f6"
+    }
+    Frame {
+        msec: 896
+        hash: "09c3602a08d6d3e2afb654c328606871"
+    }
+    Frame {
+        msec: 912
+        hash: "101e66b9d13b1b0872cfcc497c9d6ae3"
+    }
+    Frame {
+        msec: 928
+        hash: "b5eaf952e40cf90ef32e8cb64ccce7d3"
+    }
+    Frame {
+        msec: 944
+        hash: "b43b02133ebe5db93e5236c0307939c3"
+    }
+    Frame {
+        msec: 960
+        image: "test-flipable.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "7d1a0ff0eceb80ff64d828c34792a2d5"
+    }
+    Frame {
+        msec: 992
+        hash: "a7492d8ab6fddb5c1d7af2621078230b"
+    }
+    Frame {
+        msec: 1008
+        hash: "2ed3dc7f10cc8279a6fd926914cdb234"
+    }
+    Frame {
+        msec: 1024
+        hash: "e9f76e419f6f682bcc9052183bb50607"
+    }
+    Frame {
+        msec: 1040
+        hash: "fdee6990e101d4a628272e7b09a217a3"
+    }
+    Frame {
+        msec: 1056
+        hash: "05e028b2f37a433343d373bc05f73756"
+    }
+    Frame {
+        msec: 1072
+        hash: "a9ece04666d17979408dcd8690cd697c"
+    }
+    Frame {
+        msec: 1088
+        hash: "a5d8c9bee6ac10fb45cedf3bc4325539"
+    }
+    Frame {
+        msec: 1104
+        hash: "08f1ff1e515ec78f75efa13a39b21f56"
+    }
+    Frame {
+        msec: 1120
+        hash: "f0bc6c649a195e2c433cf84c1b4f5bcb"
+    }
+    Frame {
+        msec: 1136
+        hash: "2a548614a9b38867cd0fe44985ca443f"
+    }
+    Frame {
+        msec: 1152
+        hash: "8c8272fc028ce5b403e636b4061351d3"
+    }
+    Frame {
+        msec: 1168
+        hash: "df11678b255cc3f624fed24d7e6a24af"
+    }
+    Frame {
+        msec: 1184
+        hash: "7dd5ce1cce200d7eede0f248f150873c"
+    }
+    Frame {
+        msec: 1200
+        hash: "e5cb8e0e588854dce5e7572fd1e3a445"
+    }
+    Frame {
+        msec: 1216
+        hash: "71937cd7d319174232797d05fe28bda5"
+    }
+    Frame {
+        msec: 1232
+        hash: "021c3a598b008991114b25b26191e8ef"
+    }
+    Frame {
+        msec: 1248
+        hash: "b372131d6fc29e7dbffc2c5f4e269ad7"
+    }
+    Frame {
+        msec: 1264
+        hash: "2120fc188aed6888eba85e9d49139000"
+    }
+    Frame {
+        msec: 1280
+        hash: "0523499bb4f4c6d0c3d2cd28fbac7056"
+    }
+    Frame {
+        msec: 1296
+        hash: "19d1fc79802728d6b0af222050b59463"
+    }
+    Frame {
+        msec: 1312
+        hash: "f48686053780376c7ab2e6481e3fd0ad"
+    }
+    Frame {
+        msec: 1328
+        hash: "0f7c5ca70fec90e7e8b2fd50b791fd2e"
+    }
+    Frame {
+        msec: 1344
+        hash: "93cd129be7cfebaa2ea8a074a77aaa7c"
+    }
+    Frame {
+        msec: 1360
+        hash: "e6b149da031b1c0b842b1b7872bd2d91"
+    }
+    Frame {
+        msec: 1376
+        hash: "5481248e889fb4fe9f4cf54f69d9f614"
+    }
+    Frame {
+        msec: 1392
+        hash: "23bb444b6248901da3eb6a2e805438cb"
+    }
+    Frame {
+        msec: 1408
+        hash: "1c9feb1c3ae76d4015c99d005ecfed60"
+    }
+    Frame {
+        msec: 1424
+        hash: "41e5345dc90fd48476f35ceeab281948"
+    }
+    Frame {
+        msec: 1440
+        hash: "89682a955a00e68031571ac765f9f5e3"
+    }
+    Frame {
+        msec: 1456
+        hash: "8ff7cee41c6f19eeda417052c1b071d6"
+    }
+    Frame {
+        msec: 1472
+        hash: "67a73129d828e8a05b1efc768cf40146"
+    }
+    Frame {
+        msec: 1488
+        hash: "0800a78c97c92c697e44ded54fdcf934"
+    }
+    Frame {
+        msec: 1504
+        hash: "d5d51263367f0c53b8d94a03d83338d9"
+    }
+    Frame {
+        msec: 1520
+        hash: "ab749885f356683e17ca52f904ae582d"
+    }
+    Frame {
+        msec: 1536
+        hash: "7f5a56f30222a9886d1e9d014b4f5cab"
+    }
+    Frame {
+        msec: 1552
+        hash: "10c5e64eff104dce59f54f70c5564959"
+    }
+    Frame {
+        msec: 1568
+        hash: "38b00c7544648ef06705acc2e9eca1f5"
+    }
+    Frame {
+        msec: 1584
+        hash: "56bdfcb8fbb776b3799676ba7934a354"
+    }
+    Frame {
+        msec: 1600
+        hash: "ea5349d337e397b3ee5e0db0c296f5e5"
+    }
+    Frame {
+        msec: 1616
+        hash: "6bd784ca760edba5a6f0b4212237e1e8"
+    }
+    Frame {
+        msec: 1632
+        hash: "77e7888a37a7724bded817903cbe777e"
+    }
+    Frame {
+        msec: 1648
+        hash: "55213bdb2f1f2d25b5680db95e79bbac"
+    }
+    Frame {
+        msec: 1664
+        hash: "6d62c7f7f76cc1d4e33c152234000da0"
+    }
+    Frame {
+        msec: 1680
+        hash: "0f6aa29c172054887e4ddb6512ae43b1"
+    }
+    Frame {
+        msec: 1696
+        hash: "75fd94508b77bbdde34a61b74ff49e12"
+    }
+    Frame {
+        msec: 1712
+        hash: "0dfdd9a1d83a706a09318c83fd08b6fe"
+    }
+    Frame {
+        msec: 1728
+        hash: "4f895ee983424c164be3e2db488a4e51"
+    }
+    Frame {
+        msec: 1744
+        hash: "974fd5f390d33afb779ac754f0e30b2a"
+    }
+    Frame {
+        msec: 1760
+        hash: "fd40e22c7d3cfceeee7dc668d1cf0a12"
+    }
+    Frame {
+        msec: 1776
+        hash: "4e3c04b35bcc43a4295582da1674da2e"
+    }
+    Frame {
+        msec: 1792
+        hash: "629888aae80ea85db07a383df352214a"
+    }
+    Frame {
+        msec: 1808
+        hash: "9a92c68cfad54c313d24e38240ea072f"
+    }
+    Frame {
+        msec: 1824
+        hash: "3e27569d19670ec99f11bfa46099456a"
+    }
+    Frame {
+        msec: 1840
+        hash: "5d4be9ed8c4ba7faefde5427cdbffc73"
+    }
+    Frame {
+        msec: 1856
+        hash: "232d4e03a57edf0386b06884482f9730"
+    }
+    Frame {
+        msec: 1872
+        hash: "c45f959fd81ac08add219326cb6a8bfc"
+    }
+    Frame {
+        msec: 1888
+        hash: "349111e36190f77afd53c50ee2e9ba94"
+    }
+    Frame {
+        msec: 1904
+        hash: "ea5ed48b2bcdfd2a711a3a71a4ae37c3"
+    }
+    Frame {
+        msec: 1920
+        image: "test-flipable.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "ae4e35413e462221b8cb48dd0350f873"
+    }
+    Frame {
+        msec: 1952
+        hash: "63cc3851236d5de613c85a2971ef7145"
+    }
+    Frame {
+        msec: 1968
+        hash: "45d5fdb92107a7074d56d97bda34756f"
+    }
+    Frame {
+        msec: 1984
+        hash: "f74d9a3b53a629f7fccfdd255fdbba62"
+    }
+    Frame {
+        msec: 2000
+        hash: "60c6a30e15ed4ad61c14f15f9f1f3790"
+    }
+    Frame {
+        msec: 2016
+        hash: "b5f7c630f6e61c7ddac8493e17a1f53e"
+    }
+    Frame {
+        msec: 2032
+        hash: "98558c7135fa84fa08d457c6064b8653"
+    }
+    Frame {
+        msec: 2048
+        hash: "2858e39a9b39739bb5c0c1ce23e83b20"
+    }
+    Frame {
+        msec: 2064
+        hash: "0b174f04215131cfa32b5d1a32170ac3"
+    }
+    Frame {
+        msec: 2080
+        hash: "67e3618bab95519a034ed6c8c1543212"
+    }
+    Frame {
+        msec: 2096
+        hash: "2012c5310f198022a3878c9ded08523d"
+    }
+    Frame {
+        msec: 2112
+        hash: "1cb6a1f6d873d2bfde457828c17b4886"
+    }
+    Frame {
+        msec: 2128
+        hash: "be3f28bd56d9d985408e32cc0aab0623"
+    }
+    Frame {
+        msec: 2144
+        hash: "4aa07c4887f873f0f034930bd681f9dc"
+    }
+    Frame {
+        msec: 2160
+        hash: "adeae071187b590aa0a142c27098d2f4"
+    }
+    Frame {
+        msec: 2176
+        hash: "d777aaccd6143c2c1000bbfabdbefeb2"
+    }
+    Frame {
+        msec: 2192
+        hash: "7b4785b9e6610f02c52b4c824bea8ecd"
+    }
+    Frame {
+        msec: 2208
+        hash: "c539b3638272e46120edbe4a58e1d894"
+    }
+    Frame {
+        msec: 2224
+        hash: "ae466024a1dd731b6730dda255e68eb8"
+    }
+    Frame {
+        msec: 2240
+        hash: "f844a288b009cc4c6c28eb30d799c397"
+    }
+    Frame {
+        msec: 2256
+        hash: "4fc8ca1992802f97dd431783db89c725"
+    }
+    Frame {
+        msec: 2272
+        hash: "79b899461efae97b65b8c24c8820f348"
+    }
+    Frame {
+        msec: 2288
+        hash: "cb1ce87ddc372e24e37b60c013310549"
+    }
+    Frame {
+        msec: 2304
+        hash: "c8937aea34fd299c151706598828be6f"
+    }
+    Frame {
+        msec: 2320
+        hash: "ed5c3a904dc3b72937c6eea475514b2d"
+    }
+    Frame {
+        msec: 2336
+        hash: "09043e74a3ac60d05122675a1b253320"
+    }
+    Frame {
+        msec: 2352
+        hash: "57677a33d8c60a45c64aea10a695e8d0"
+    }
+    Frame {
+        msec: 2368
+        hash: "496fe0b0e420356e4205537fdf3adc2f"
+    }
+    Frame {
+        msec: 2384
+        hash: "f4146ce8db5cf2c3da15715820c9f62f"
+    }
+    Frame {
+        msec: 2400
+        hash: "b80bc46468695b874d401c4c9bd68932"
+    }
+    Frame {
+        msec: 2416
+        hash: "b0cf0021232ab917301206614f61f0bf"
+    }
+    Frame {
+        msec: 2432
+        hash: "b0abdf5b86e3fcb22a9254ac5b522380"
+    }
+    Frame {
+        msec: 2448
+        hash: "c1624cb7e90ea26ab0c37cfe9919ca36"
+    }
+    Frame {
+        msec: 2464
+        hash: "0ffd6a3b3e5f6db5a3a8df756caf713e"
+    }
+    Frame {
+        msec: 2480
+        hash: "1604ad8e7a4aa4fa8dff1f37fc8c51d7"
+    }
+    Frame {
+        msec: 2496
+        hash: "5bbca0b79c42e263162926e5c2fd3d82"
+    }
+    Frame {
+        msec: 2512
+        hash: "9436b4f2ab902673ed067de55da5003e"
+    }
+    Frame {
+        msec: 2528
+        hash: "3c7b5fa0970242a2ad308c72d761713b"
+    }
+    Frame {
+        msec: 2544
+        hash: "15e451c53e8f5c70614f87f33fe0a2e6"
+    }
+    Frame {
+        msec: 2560
+        hash: "7e8cbe203306d2f267a42fed1e4790ed"
+    }
+    Frame {
+        msec: 2576
+        hash: "db21ae28564614b58a7dd5ccd97082e6"
+    }
+    Frame {
+        msec: 2592
+        hash: "ff52e198874de749c46f9b34cfe40cfc"
+    }
+    Frame {
+        msec: 2608
+        hash: "916d92d24a81ced07a54d68c46299d4c"
+    }
+    Frame {
+        msec: 2624
+        hash: "2f6cf122e5f15fc5f5d3c92d92ca1384"
+    }
+    Frame {
+        msec: 2640
+        hash: "6f328038e5d505c402651423c44986a5"
+    }
+    Frame {
+        msec: 2656
+        hash: "6f328038e5d505c402651423c44986a5"
+    }
+    Frame {
+        msec: 2672
+        hash: "78e0dca60c04d3defbd90457685dbab3"
+    }
+    Frame {
+        msec: 2688
+        hash: "b915de1be0c1779e06fb9eea8237f91d"
+    }
+    Frame {
+        msec: 2704
+        hash: "0ff9fd6b09fc14abacb794353b9500f6"
+    }
+    Frame {
+        msec: 2720
+        hash: "5a1c9cd9da5492a61a3a1bc6ad37ef17"
+    }
+    Frame {
+        msec: 2736
+        hash: "4c4a72eb4105903802de56a4a62d86cc"
+    }
+    Frame {
+        msec: 2752
+        hash: "6d813ee777a5900c65aca5939c004d0c"
+    }
+    Frame {
+        msec: 2768
+        hash: "6d813ee777a5900c65aca5939c004d0c"
+    }
+    Frame {
+        msec: 2784
+        hash: "0acaa3ece071ad4461cf4a79d65a0f03"
+    }
+    Frame {
+        msec: 2800
+        hash: "0acaa3ece071ad4461cf4a79d65a0f03"
+    }
+    Frame {
+        msec: 2816
+        hash: "f5cf7e68edc5fcd9dd91882d3f9ba380"
+    }
+    Frame {
+        msec: 2832
+        hash: "51f8508eddffbac2fad22bd3e8040c69"
+    }
+    Frame {
+        msec: 2848
+        hash: "a09746c72df5330f6ca2a93d9b8e79f6"
+    }
+    Frame {
+        msec: 2864
+        hash: "b2ef52b66896649413b3852bcf642e1c"
+    }
+    Frame {
+        msec: 2880
+        image: "test-flipable.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "ae76d183491834e2b1d0371420d51ce5"
+    }
+    Frame {
+        msec: 2912
+        hash: "b19d89aa671cc3a773f64a7bae21adb6"
+    }
+    Frame {
+        msec: 2928
+        hash: "08eb7bd2e49fe600e922e49a3aa56e93"
+    }
+    Frame {
+        msec: 2944
+        hash: "1e3a7bdd0bd9d5b84c2cb5b646d7fb45"
+    }
+    Frame {
+        msec: 2960
+        hash: "be9f5091197899c0b89823e4403358f3"
+    }
+    Frame {
+        msec: 2976
+        hash: "1daeebce8e7eef80b135d2e4f83f780b"
+    }
+    Frame {
+        msec: 2992
+        hash: "1daeebce8e7eef80b135d2e4f83f780b"
+    }
+    Frame {
+        msec: 3008
+        hash: "1daeebce8e7eef80b135d2e4f83f780b"
+    }
+    Frame {
+        msec: 3024
+        hash: "1daeebce8e7eef80b135d2e4f83f780b"
+    }
+    Frame {
+        msec: 3040
+        hash: "1daeebce8e7eef80b135d2e4f83f780b"
+    }
+    Frame {
+        msec: 3056
+        hash: "1daeebce8e7eef80b135d2e4f83f780b"
+    }
+    Frame {
+        msec: 3072
+        hash: "be9f5091197899c0b89823e4403358f3"
+    }
+    Frame {
+        msec: 3088
+        hash: "be9f5091197899c0b89823e4403358f3"
+    }
+    Frame {
+        msec: 3104
+        hash: "1e3a7bdd0bd9d5b84c2cb5b646d7fb45"
+    }
+    Frame {
+        msec: 3120
+        hash: "b19d89aa671cc3a773f64a7bae21adb6"
+    }
+    Frame {
+        msec: 3136
+        hash: "e7ed4449b5ea3288d5e8fecb33a4a422"
+    }
+    Frame {
+        msec: 3152
+        hash: "186a2c1af03e7fa590ff3cd7422285e3"
+    }
+    Frame {
+        msec: 3168
+        hash: "373141f99bc88c40ead161502c9750e9"
+    }
+    Frame {
+        msec: 3184
+        hash: "0221e2ef4cf809ebfeba466206a77cce"
+    }
+    Frame {
+        msec: 3200
+        hash: "51f8508eddffbac2fad22bd3e8040c69"
+    }
+    Frame {
+        msec: 3216
+        hash: "f5cf7e68edc5fcd9dd91882d3f9ba380"
+    }
+    Frame {
+        msec: 3232
+        hash: "0acaa3ece071ad4461cf4a79d65a0f03"
+    }
+    Frame {
+        msec: 3248
+        hash: "0acaa3ece071ad4461cf4a79d65a0f03"
+    }
+    Frame {
+        msec: 3264
+        hash: "6d813ee777a5900c65aca5939c004d0c"
+    }
+    Frame {
+        msec: 3280
+        hash: "6d813ee777a5900c65aca5939c004d0c"
+    }
+    Frame {
+        msec: 3296
+        hash: "6d813ee777a5900c65aca5939c004d0c"
+    }
+    Frame {
+        msec: 3312
+        hash: "5a1c9cd9da5492a61a3a1bc6ad37ef17"
+    }
+    Frame {
+        msec: 3328
+        hash: "0ff9fd6b09fc14abacb794353b9500f6"
+    }
+    Frame {
+        msec: 3344
+        hash: "0ff9fd6b09fc14abacb794353b9500f6"
+    }
+    Frame {
+        msec: 3360
+        hash: "6f328038e5d505c402651423c44986a5"
+    }
+    Frame {
+        msec: 3376
+        hash: "6f328038e5d505c402651423c44986a5"
+    }
+    Frame {
+        msec: 3392
+        hash: "dd04a76df90f27358f4162fd85cfa4cd"
+    }
+    Frame {
+        msec: 3408
+        hash: "12df495b5e8bfd2c9dd13fbeccc69e08"
+    }
+    Frame {
+        msec: 3424
+        hash: "4b6f9dcde7d5d88b9c3eff3187378036"
+    }
+    Frame {
+        msec: 3440
+        hash: "712f3850c0efe45c60a3761f1354b90b"
+    }
+    Frame {
+        msec: 3456
+        hash: "22215981f00790d7a409230eb730abca"
+    }
+    Frame {
+        msec: 3472
+        hash: "a4a26f9736282ceb307f0f97735002eb"
+    }
+    Frame {
+        msec: 3488
+        hash: "b41d7a18d84a8b220e99464cab86882d"
+    }
+    Frame {
+        msec: 3504
+        hash: "c7c1961120f128cd0fcd6a7b61c98197"
+    }
+    Frame {
+        msec: 3520
+        hash: "e56e7ba603d2620afb0fab6b19aff33e"
+    }
+    Frame {
+        msec: 3536
+        hash: "1a258bed9a7a38452a746d7641016e73"
+    }
+    Frame {
+        msec: 3552
+        hash: "a237b9c187bbbcb79f624d74def15db2"
+    }
+    Frame {
+        msec: 3568
+        hash: "34a7afdebb7352ca65e0eaec61632d12"
+    }
+    Frame {
+        msec: 3584
+        hash: "a5a98e932a30418bae62bb006afc1048"
+    }
+    Frame {
+        msec: 3600
+        hash: "2ee25374cb9fef01e78d02c4131010b7"
+    }
+    Frame {
+        msec: 3616
+        hash: "7956b07b848ba89905e5c609657503e2"
+    }
+    Frame {
+        msec: 3632
+        hash: "0949a2b13f6475b3f11be04321c953a1"
+    }
+    Frame {
+        msec: 3648
+        hash: "5a1ff901ecc7c3cd7f39cd07e0273dd4"
+    }
+    Frame {
+        msec: 3664
+        hash: "44fcd7209b9f5b1c28c21e9aae408097"
+    }
+    Frame {
+        msec: 3680
+        hash: "bee94f395239aebb0bacca3dbbee95e5"
+    }
+    Frame {
+        msec: 3696
+        hash: "bd26b7e2b07bbcee3819fdacc35eea8d"
+    }
+    Frame {
+        msec: 3712
+        hash: "d3707b90c5cd0d1061db4b97b6fcb96a"
+    }
+    Frame {
+        msec: 3728
+        hash: "6f6ed6c7553b3f909d53e2146b3831d5"
+    }
+    Frame {
+        msec: 3744
+        hash: "a3a1a03617d1cb5660c51bf2f18088bc"
+    }
+    Frame {
+        msec: 3760
+        hash: "6d4646f0a53800ad60d173ab9cb9010a"
+    }
+    Frame {
+        msec: 3776
+        hash: "126cae232e2fe49e3188393c2798065b"
+    }
+    Frame {
+        msec: 3792
+        hash: "e1fa758d333ffe5208365c0babff33a0"
+    }
+    Frame {
+        msec: 3808
+        hash: "f2a6156f7d6013bd4234b35c21adb074"
+    }
+    Frame {
+        msec: 3824
+        hash: "0271f66eb6d9b91a3ab8da2d728b9581"
+    }
+    Frame {
+        msec: 3840
+        image: "test-flipable.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "e18635d7c6c5de361e7406c2db357aca"
+    }
+    Frame {
+        msec: 3872
+        hash: "56100e9ca8d1eb7e6334e5a05ef2b94d"
+    }
+    Frame {
+        msec: 3888
+        hash: "3d15b8d662d3df82dd78590c43794337"
+    }
+    Frame {
+        msec: 3904
+        hash: "9729b36fe9dbabf0c46e78b723885530"
+    }
+    Frame {
+        msec: 3920
+        hash: "ccb8b51084cc1ef3d201887b824fb1ac"
+    }
+    Frame {
+        msec: 3936
+        hash: "d9dc9d240a6f89603a54bccd66361530"
+    }
+    Frame {
+        msec: 3952
+        hash: "0e52d92455c263493d32ffe93f242739"
+    }
+    Frame {
+        msec: 3968
+        hash: "695ab932722844b975097779e26df55c"
+    }
+    Frame {
+        msec: 3984
+        hash: "da285cba2e11db1e87d1d180e376ff8e"
+    }
+    Frame {
+        msec: 4000
+        hash: "54bd12888fc4526d310fa0a66b5ba3be"
+    }
+    Frame {
+        msec: 4016
+        hash: "c3e3db473bdb96fd619b078f0f6b3ceb"
+    }
+    Frame {
+        msec: 4032
+        hash: "acfd8aaf0bb52ad3ef3116bb99f3656a"
+    }
+    Frame {
+        msec: 4048
+        hash: "c5a0877ce86c26b30b642818e83d6118"
+    }
+    Frame {
+        msec: 4064
+        hash: "b187fde9af2bad37f84f6324afcbb303"
+    }
+    Frame {
+        msec: 4080
+        hash: "0dfe035424d7f31dda88be3b4bb30c8a"
+    }
+    Frame {
+        msec: 4096
+        hash: "893bddc95fbf6e452ba61b06eab1a8c5"
+    }
+    Frame {
+        msec: 4112
+        hash: "35fb89ea579819f4b3416ff1c1b1cc9d"
+    }
+    Frame {
+        msec: 4128
+        hash: "316371649f9a1e12e336c5823408eaf9"
+    }
+    Frame {
+        msec: 4144
+        hash: "ade751c6e497c73a920baf18f0752908"
+    }
+    Frame {
+        msec: 4160
+        hash: "86720fa1eeae374c6cc67e107d27e23a"
+    }
+    Frame {
+        msec: 4176
+        hash: "1a6f080227f1ccd03b6c4093b9fdadb3"
+    }
+    Frame {
+        msec: 4192
+        hash: "f7d7398edba69716ec8c0699d5472dca"
+    }
+    Frame {
+        msec: 4208
+        hash: "9e62c9dd25abb203f5c06c7bff0d8363"
+    }
+    Frame {
+        msec: 4224
+        hash: "fd90404238b458fc86a4a17e6a976f9b"
+    }
+    Frame {
+        msec: 4240
+        hash: "e39668dc347318fc61a365f9006aab3c"
+    }
+    Frame {
+        msec: 4256
+        hash: "c40f41f635f10f5f9b04b42ba2dc5bb1"
+    }
+    Frame {
+        msec: 4272
+        hash: "c0f971c75b7237de7e9b2f25cc3f34b2"
+    }
+    Frame {
+        msec: 4288
+        hash: "a1c79481fd1632cfdc396aefb3592534"
+    }
+    Frame {
+        msec: 4304
+        hash: "6eee76f40fc7ec1a1e3d77c849321740"
+    }
+    Frame {
+        msec: 4320
+        hash: "0a36746ab17caef5946731c31af3823f"
+    }
+    Frame {
+        msec: 4336
+        hash: "863dedd22df4e1d14e73eaeb851e9b66"
+    }
+    Frame {
+        msec: 4352
+        hash: "318e8751f7056bb6a004c8a7ce7be870"
+    }
+    Frame {
+        msec: 4368
+        hash: "8fb2809a366f42c86fad7aa5db3ff22c"
+    }
+    Frame {
+        msec: 4384
+        hash: "8aaea666640cb3b27e3374f756fe411b"
+    }
+    Frame {
+        msec: 4400
+        hash: "1f552095d26a8d145584e36237630916"
+    }
+    Frame {
+        msec: 4416
+        hash: "cd5aa55715786cac0f7efc90c7c4b9d6"
+    }
+    Frame {
+        msec: 4432
+        hash: "7a3153d9309ec338dce3437ecf667646"
+    }
+    Frame {
+        msec: 4448
+        hash: "c7fa40e69148f1c5ec494ad159b6ce6c"
+    }
+    Frame {
+        msec: 4464
+        hash: "e131bc8ca25ddc4b7dd6582ff034fe14"
+    }
+    Frame {
+        msec: 4480
+        hash: "3174c672e62dae0341d5849e23031280"
+    }
+    Frame {
+        msec: 4496
+        hash: "0b25fb7d33708a3292ede7c66e25a3d7"
+    }
+    Frame {
+        msec: 4512
+        hash: "84b3cf92b3abc2f5acf07cfccf3c0202"
+    }
+    Frame {
+        msec: 4528
+        hash: "fafbd14d296e4954bce7816d811ddd89"
+    }
+    Frame {
+        msec: 4544
+        hash: "865018d8408863b741a7082a962236dc"
+    }
+    Frame {
+        msec: 4560
+        hash: "f626082691429565b55ce9e04b14a665"
+    }
+    Frame {
+        msec: 4576
+        hash: "8a02f7d3d53e98384d1f05dc7fc5fd37"
+    }
+    Frame {
+        msec: 4592
+        hash: "6af3a8305b25a9a769b8cf00479c6ab3"
+    }
+    Frame {
+        msec: 4608
+        hash: "b31470b0ac4a593317abc365acb2b281"
+    }
+    Frame {
+        msec: 4624
+        hash: "efd00c43b1b8bbc4bc5496dcfa58c6b0"
+    }
+    Frame {
+        msec: 4640
+        hash: "498cf6c20aeca609e9d9cea78f0cc6a3"
+    }
+    Frame {
+        msec: 4656
+        hash: "b55661b5d9632bc0d7fc7ff3a421a2e7"
+    }
+    Frame {
+        msec: 4672
+        hash: "2f1e402c5e4a0615528f91dd2e183ddd"
+    }
+    Frame {
+        msec: 4688
+        hash: "d1c166cc7932e72ba22a73637cad65d6"
+    }
+    Frame {
+        msec: 4704
+        hash: "374b703e0059fc80b67480113d584754"
+    }
+    Frame {
+        msec: 4720
+        hash: "e8de71d4a2a253e366b2edf5d475824d"
+    }
+    Frame {
+        msec: 4736
+        hash: "6a9d033b332f0c0285284fdaddf3bbdb"
+    }
+    Frame {
+        msec: 4752
+        hash: "640c227fb62e40c666035e7465ac5c4e"
+    }
+    Frame {
+        msec: 4768
+        hash: "9cf7dc6507befd6ae54f380a7d87a207"
+    }
+    Frame {
+        msec: 4784
+        hash: "d1c7b2160c08e03e7a98d7d2db0116f7"
+    }
+    Frame {
+        msec: 4800
+        image: "test-flipable.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "6e48e605ea1aed4028e02476328f182b"
+    }
+    Frame {
+        msec: 4832
+        hash: "2dfa5fdfd07e7000caee6abf5fe84378"
+    }
+    Frame {
+        msec: 4848
+        hash: "2b0c2f019b07f1f8b4e5af9a520ab061"
+    }
+    Frame {
+        msec: 4864
+        hash: "33cb1aaeb7dafc2475e4337be7cc7892"
+    }
+    Frame {
+        msec: 4880
+        hash: "91290d1435bedb5010ba135a7f99c0a2"
+    }
+    Frame {
+        msec: 4896
+        hash: "df7434eb6c6e5d45935d6c6fd03f06d1"
+    }
+    Frame {
+        msec: 4912
+        hash: "48dfe78dcdd65242132071454fb9ea33"
+    }
+    Frame {
+        msec: 4928
+        hash: "1b288012e123cb6051bfa180ea2a2bc0"
+    }
+    Frame {
+        msec: 4944
+        hash: "84b23d92987f59df336d9b269e3b7bbc"
+    }
+    Frame {
+        msec: 4960
+        hash: "c413ca53240df702c3ba0c7f4dacca3b"
+    }
+    Frame {
+        msec: 4976
+        hash: "339c06a2e1fc05ebfd3732097b9c5242"
+    }
+    Frame {
+        msec: 4992
+        hash: "f1e647e274ac8c8458d2c1e576623688"
+    }
+    Frame {
+        msec: 5008
+        hash: "a70dc2f51ecfc164595cfef61c1da245"
+    }
+    Frame {
+        msec: 5024
+        hash: "b69f034a71b53c885cd177da422d5fc7"
+    }
+    Frame {
+        msec: 5040
+        hash: "26c25a031944c677b30f69c8498ac6ce"
+    }
+    Frame {
+        msec: 5056
+        hash: "ebc2328766e8736eac989e309968d8f9"
+    }
+    Frame {
+        msec: 5072
+        hash: "41d55f53bfc74e614c906d3f6b813704"
+    }
+    Frame {
+        msec: 5088
+        hash: "135e97adb3f19aa19d746ece1b2b3d02"
+    }
+    Frame {
+        msec: 5104
+        hash: "85c4454dbe9a39b3005f32fd7a06b1b2"
+    }
+    Frame {
+        msec: 5120
+        hash: "7561e0dd6970f7c81bcb53c9371d4405"
+    }
+    Frame {
+        msec: 5136
+        hash: "c9961d5abf700a06ed294ce7aecb6147"
+    }
+    Frame {
+        msec: 5152
+        hash: "29acf87effa3c21322334080776c566e"
+    }
+    Frame {
+        msec: 5168
+        hash: "04990a79d5ff5cb41dcd48d3e3bf5b11"
+    }
+    Frame {
+        msec: 5184
+        hash: "f40c78c37a26249ecb161af778631f7b"
+    }
+    Frame {
+        msec: 5200
+        hash: "eddacaeae7c47d063db737f678896da1"
+    }
+    Frame {
+        msec: 5216
+        hash: "5ae523dc1115fd0904875718e05aa2a5"
+    }
+    Frame {
+        msec: 5232
+        hash: "f09c299412a9e2fd353c4937ad959f25"
+    }
+    Frame {
+        msec: 5248
+        hash: "9caeae0abd3bc665bd307997baea6a48"
+    }
+    Frame {
+        msec: 5264
+        hash: "e9d222c9d23773488b64b0a6323c1095"
+    }
+    Frame {
+        msec: 5280
+        hash: "ad34c46ab3d418a2af7bffc59e720868"
+    }
+    Frame {
+        msec: 5296
+        hash: "ff0d8cfd272fca5be34b663a7e52f283"
+    }
+    Frame {
+        msec: 5312
+        hash: "55f95277276217de16b6b43090bbb807"
+    }
+    Frame {
+        msec: 5328
+        hash: "387fadf4140d335c0b05cfee0c37a413"
+    }
+    Frame {
+        msec: 5344
+        hash: "10a1a5a91c11aa8279ae4e57e4d3946b"
+    }
+    Frame {
+        msec: 5360
+        hash: "414f7bf3a3ec05a9840cd104a13d5504"
+    }
+    Frame {
+        msec: 5376
+        hash: "e027716402ead36450732c8350e614b5"
+    }
+    Frame {
+        msec: 5392
+        hash: "0190f59275f01429ee6761b39ce99fc1"
+    }
+    Frame {
+        msec: 5408
+        hash: "7f99dd337561f006a7c56babe3c10c38"
+    }
+    Frame {
+        msec: 5424
+        hash: "4bbb76393e56b5da723c1f33a7694013"
+    }
+    Frame {
+        msec: 5440
+        hash: "00eedf86916629fe90f3c2f36e0c689e"
+    }
+    Frame {
+        msec: 5456
+        hash: "84d1f5a6604b75371f2fa7b60a59299b"
+    }
+    Frame {
+        msec: 5472
+        hash: "00488220a460746be6d7d1b66d15c392"
+    }
+    Frame {
+        msec: 5488
+        hash: "cae5a6d45425d641228210a47c5ee5f6"
+    }
+    Frame {
+        msec: 5504
+        hash: "670a2132e65564ca2cfd58ec9842ba93"
+    }
+    Frame {
+        msec: 5520
+        hash: "212b6cc9fa130bec9579cf218e1f7eeb"
+    }
+    Frame {
+        msec: 5536
+        hash: "b159e67541b5b1b5071f6cd041c62293"
+    }
+    Frame {
+        msec: 5552
+        hash: "8c4e62d26e19c32200772edefd329db3"
+    }
+    Frame {
+        msec: 5568
+        hash: "1ff120d0444e398cc79190012b548b4b"
+    }
+    Frame {
+        msec: 5584
+        hash: "1c75bccd5e19ee9a2644585b726db048"
+    }
+    Frame {
+        msec: 5600
+        hash: "bc16aff96b1f9cfe3807e95e371a8f26"
+    }
+    Frame {
+        msec: 5616
+        hash: "35a5fdb20bdbaf0122cac4cad60e7bb8"
+    }
+    Frame {
+        msec: 5632
+        hash: "ea7ac72c81abff8af260be508b6cf117"
+    }
+    Frame {
+        msec: 5648
+        hash: "2d112d040fd425c59b511066737e494d"
+    }
+    Frame {
+        msec: 5664
+        hash: "769d2724656dbf0e793ecd8e42db3de2"
+    }
+    Frame {
+        msec: 5680
+        hash: "1c25b3d65e8590f8c213afa76b722e97"
+    }
+    Frame {
+        msec: 5696
+        hash: "760a103d4524f8b665c6ff42185a8ce7"
+    }
+    Frame {
+        msec: 5712
+        hash: "451a9408b04826ab35749d9120efd6bb"
+    }
+    Frame {
+        msec: 5728
+        hash: "3fad6b23b0b78f844e02fe307e20d376"
+    }
+    Frame {
+        msec: 5744
+        hash: "451a9408b04826ab35749d9120efd6bb"
+    }
+    Frame {
+        msec: 5760
+        image: "test-flipable.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "90fb4e4ba04ac32b52c10b3258431c04"
+    }
+    Frame {
+        msec: 5792
+        hash: "90fb4e4ba04ac32b52c10b3258431c04"
+    }
+    Frame {
+        msec: 5808
+        hash: "da2a1e5e988c27577ceb453cb0383703"
+    }
+    Frame {
+        msec: 5824
+        hash: "ae2407f8da9a047d2725bcdcf8e568b2"
+    }
+    Frame {
+        msec: 5840
+        hash: "ae2407f8da9a047d2725bcdcf8e568b2"
+    }
+    Frame {
+        msec: 5856
+        hash: "e97a5d968da37789c28816608fa262a1"
+    }
+    Frame {
+        msec: 5872
+        hash: "9becb90d9f8a61f5afacdc53d137ebcb"
+    }
+    Frame {
+        msec: 5888
+        hash: "9811f823e057882d384f36d7227fa12e"
+    }
+    Frame {
+        msec: 5904
+        hash: "1e7a308d18851db0a430542178944c67"
+    }
+    Frame {
+        msec: 5920
+        hash: "692931f1db6ddf0b37eb64026ca830f8"
+    }
+    Frame {
+        msec: 5936
+        hash: "2117c775960234c297187ea2e9d51e73"
+    }
+    Frame {
+        msec: 5952
+        hash: "f8038dc4b67b92ef776a97589240e8c5"
+    }
+    Frame {
+        msec: 5968
+        hash: "51dff66a7767e3464fda60f2cf906700"
+    }
+    Frame {
+        msec: 5984
+        hash: "7e16e6360fc2e9db67dbf11d58042745"
+    }
+    Frame {
+        msec: 6000
+        hash: "7e16e6360fc2e9db67dbf11d58042745"
+    }
+    Frame {
+        msec: 6016
+        hash: "7e16e6360fc2e9db67dbf11d58042745"
+    }
+    Frame {
+        msec: 6032
+        hash: "7e16e6360fc2e9db67dbf11d58042745"
+    }
+    Frame {
+        msec: 6048
+        hash: "7e16e6360fc2e9db67dbf11d58042745"
+    }
+    Frame {
+        msec: 6064
+        hash: "51dff66a7767e3464fda60f2cf906700"
+    }
+    Frame {
+        msec: 6080
+        hash: "f8038dc4b67b92ef776a97589240e8c5"
+    }
+    Frame {
+        msec: 6096
+        hash: "2117c775960234c297187ea2e9d51e73"
+    }
+    Frame {
+        msec: 6112
+        hash: "692931f1db6ddf0b37eb64026ca830f8"
+    }
+    Frame {
+        msec: 6128
+        hash: "f01b7368e42381dda5eadf56482ea993"
+    }
+    Frame {
+        msec: 6144
+        hash: "9811f823e057882d384f36d7227fa12e"
+    }
+    Frame {
+        msec: 6160
+        hash: "9b40b6c75af876567ff49688bc710f2a"
+    }
+    Frame {
+        msec: 6176
+        hash: "e97a5d968da37789c28816608fa262a1"
+    }
+    Frame {
+        msec: 6192
+        hash: "2cd0627fdc63bb91f8dcac789d7a93b2"
+    }
+    Frame {
+        msec: 6208
+        hash: "ae2407f8da9a047d2725bcdcf8e568b2"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6224
+        hash: "90fb4e4ba04ac32b52c10b3258431c04"
+    }
+    Frame {
+        msec: 6240
+        hash: "90fb4e4ba04ac32b52c10b3258431c04"
+    }
+    Frame {
+        msec: 6256
+        hash: "90fb4e4ba04ac32b52c10b3258431c04"
+    }
+    Frame {
+        msec: 6272
+        hash: "90fb4e4ba04ac32b52c10b3258431c04"
+    }
+    Frame {
+        msec: 6288
+        hash: "73c06997014af4e008b546b53fe349fb"
+    }
+    Frame {
+        msec: 6304
+        hash: "451a9408b04826ab35749d9120efd6bb"
+    }
+    Frame {
+        msec: 6320
+        hash: "451a9408b04826ab35749d9120efd6bb"
+    }
+    Frame {
+        msec: 6336
+        hash: "3fad6b23b0b78f844e02fe307e20d376"
+    }
+    Frame {
+        msec: 6352
+        hash: "1c25b3d65e8590f8c213afa76b722e97"
+    }
+    Frame {
+        msec: 6368
+        hash: "769d2724656dbf0e793ecd8e42db3de2"
+    }
+    Frame {
+        msec: 6384
+        hash: "9e375cb3815723a2c5dda39c79325e96"
+    }
+    Frame {
+        msec: 6400
+        hash: "77a245991ed8e40163bd0224eb15f20e"
+    }
+    Frame {
+        msec: 6416
+        hash: "e6936f1122c8c0a76b0eb61ad086a9f1"
+    }
+    Frame {
+        msec: 6432
+        hash: "8048f84221a02e7102cf3272445862a1"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeflipable/test-flipable.qml b/tests/auto/declarative/visual/qdeclarativeflipable/test-flipable.qml
new file mode 100644
index 0000000..a27aa6e
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/test-flipable.qml
@@ -0,0 +1,79 @@
+import Qt 4.6
+
+Rectangle {
+    width: 400; height: 240
+    color: "white"
+
+    Timer {
+        interval: 3000; running: true; repeat: true; triggeredOnStart: true
+        onTriggered: {
+            if (flipable.state == '') flipable.state = 'back'; else flipable.state = ''
+            if (flipable2.state == '') flipable2.state = 'back'; else flipable2.state = ''
+        }
+    }
+
+    Flipable {
+        id: flipable
+        width: 200; height: 200
+
+        transform: Rotation {
+            id: rotation; angle: 0
+            origin.x: 100; origin.y: 100
+            axis.x: 0; axis.y: 1; axis.z: 0
+        }
+
+        front: Rectangle {
+            color: "steelblue"; width: 200; height: 200
+        }
+
+        back: Rectangle {
+            color: "deeppink"; width: 200; height: 200
+        }
+
+        states: State {
+            name: "back"
+            PropertyChanges { target: rotation; angle: 180 }
+        }
+
+        transitions: Transition {
+            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 3000 }
+        }
+    }
+
+    Flipable {
+        id: flipable2
+        x: 200; width: 200; height: 200
+
+        transform: Rotation {
+            id: rotation2; angle: 0
+            origin.x: 100; origin.y: 100
+            axis.x: 1; axis.z: 0
+        }
+
+        front: Rectangle {
+            color: "deeppink"; width: 200; height: 200
+        }
+
+        back: Rectangle {
+            color: "steelblue"; width: 200; height: 200
+        }
+
+        states: State {
+            name: "back"
+            PropertyChanges { target: rotation2; angle: 180 }
+        }
+
+        transitions: Transition {
+            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 3000 }
+        }
+    }
+
+    Rectangle {
+        x: 25; width: 150; y: 210; height: 20; color: "black"
+        visible: flipable.side == Flipable.Front
+    }
+    Rectangle {
+        x: 225; width: 150; y: 210; height: 20; color: "black"
+        visible: flipable2.side == Flipable.Back
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.0.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.0.png
new file mode 100644
index 0000000..6c82777
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.1.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.1.png
new file mode 100644
index 0000000..07b1f7c
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.2.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.2.png
new file mode 100644
index 0000000..f2f08c0
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.3.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.3.png
new file mode 100644
index 0000000..08649f9
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.4.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.4.png
new file mode 100644
index 0000000..f9c2f17
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.5.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.5.png
new file mode 100644
index 0000000..52ec0bd
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.6.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.6.png
new file mode 100644
index 0000000..3fe25be
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.7.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.7.png
new file mode 100644
index 0000000..4cc12a6
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.8.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.8.png
new file mode 100644
index 0000000..2267f23
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.9.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.9.png
new file mode 100644
index 0000000..6c82777
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.9.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.qml b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.qml
new file mode 100644
index 0000000..c7ac52d
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.qml
@@ -0,0 +1,2859 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 32
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 48
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 64
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 80
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 96
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 112
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 128
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 144
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 160
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 176
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 192
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 208
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 224
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 240
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 256
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 272
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 288
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 304
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 320
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 336
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 352
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 368
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 384
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 400
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 416
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Frame {
+        msec: 432
+        hash: "c33447c78ea64452ec3cd1696fb502eb"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "96ad89eafa7f99269518a192573af91b"
+    }
+    Frame {
+        msec: 464
+        hash: "735b00b968d0e2ea1f34cc0bdc028a8e"
+    }
+    Frame {
+        msec: 480
+        hash: "ce37c8e15fbb1aea72aff9629683fa96"
+    }
+    Frame {
+        msec: 496
+        hash: "a3f2471ef4ceac77a1c20ac327550d8d"
+    }
+    Frame {
+        msec: 512
+        hash: "28f120bd3bda9552dbc8cc908409c67d"
+    }
+    Frame {
+        msec: 528
+        hash: "f21cf0ed746fa48e67dc90c70c5bbae8"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "485d55730366b68e01582879f6970fa1"
+    }
+    Frame {
+        msec: 560
+        hash: "700e53c78b28993dce5dafb4035f4760"
+    }
+    Frame {
+        msec: 576
+        hash: "1e538e175a5e402e2334cf354392e8a7"
+    }
+    Frame {
+        msec: 592
+        hash: "0fbfba93eebaf05ae60067b365b6b4bc"
+    }
+    Frame {
+        msec: 608
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 624
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 640
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 656
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 672
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 688
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Frame {
+        msec: 704
+        hash: "7b1893397b76b0c95094eeca1dd21446"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 720
+        hash: "25e48099a8194ed2674651818d854c61"
+    }
+    Frame {
+        msec: 736
+        hash: "b75d02dfc238ba2292306ca1421279c3"
+    }
+    Frame {
+        msec: 752
+        hash: "7e48b7d9c1291b4e438c81f44228d8ad"
+    }
+    Frame {
+        msec: 768
+        hash: "fe4b009abe081a6eaeab6ef9e996f3fd"
+    }
+    Frame {
+        msec: 784
+        hash: "edea8c305fe88708dbafc03e427caa09"
+    }
+    Frame {
+        msec: 800
+        hash: "7b58803f12d0ab893acf539799d79e31"
+    }
+    Frame {
+        msec: 816
+        hash: "9b56c3d1d140114dcc57d0a8568e9b95"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 832
+        hash: "35e38e273dbc8e565917b21d00fc1530"
+    }
+    Frame {
+        msec: 848
+        hash: "116e294391333e8780daeca54c3d51ea"
+    }
+    Frame {
+        msec: 864
+        hash: "6219676215f82540d7a53b2a8aa60279"
+    }
+    Frame {
+        msec: 880
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 896
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 912
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 928
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 944
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 960
+        image: "gridview.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 992
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1008
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1024
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1040
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1056
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1072
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1088
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1104
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1120
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1136
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 1152
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1168
+        hash: "2667c2596de97dc15353158eba03495f"
+    }
+    Frame {
+        msec: 1184
+        hash: "6a7b64e1427dcb7e438aa09a739cbc7b"
+    }
+    Frame {
+        msec: 1200
+        hash: "5bad6dc745958f5827403ea593c78752"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1216
+        hash: "b393401219ada7d094a451dba8af3f1a"
+    }
+    Frame {
+        msec: 1232
+        hash: "ba656452f8adf3d1ca7db9286274c37f"
+    }
+    Frame {
+        msec: 1248
+        hash: "1e9725c8c364a491f34035fad1f77c63"
+    }
+    Frame {
+        msec: 1264
+        hash: "a0aef0b65446dec0673b5cec3a260390"
+    }
+    Frame {
+        msec: 1280
+        hash: "d60c11a5d376af0831d6f05f2a839a92"
+    }
+    Frame {
+        msec: 1296
+        hash: "1dd2c456c6ee9cc8f9be0e9f3617d44b"
+    }
+    Frame {
+        msec: 1312
+        hash: "56208e6551e2f4202bab2d62a1cf46a2"
+    }
+    Frame {
+        msec: 1328
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1344
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1360
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1376
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1392
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1408
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1424
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1440
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1456
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1472
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1488
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1504
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1520
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1536
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1552
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1568
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1584
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1600
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1616
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1632
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Frame {
+        msec: 1648
+        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1664
+        hash: "f0f00d22d15ed9828db7b5f3a3669fe9"
+    }
+    Frame {
+        msec: 1680
+        hash: "153e7984089530bbd052c9e4f62eb14c"
+    }
+    Frame {
+        msec: 1696
+        hash: "0525d40cc58d054a3abd7ee2486576f8"
+    }
+    Frame {
+        msec: 1712
+        hash: "8c23d5245774ab5252c98c19c33f8171"
+    }
+    Frame {
+        msec: 1728
+        hash: "5ca243794d1350f04cf973d4bfc8ab89"
+    }
+    Frame {
+        msec: 1744
+        hash: "d19b7f4c0897aba498e122d83b4cbbf1"
+    }
+    Frame {
+        msec: 1760
+        hash: "99e41460dd8efc6e5c3faf54b14c3d43"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1776
+        hash: "703469f8b133156ed3aabe02762d66c3"
+    }
+    Frame {
+        msec: 1792
+        hash: "1cc2c383e988048db76a80d8d7f5a0e2"
+    }
+    Frame {
+        msec: 1808
+        hash: "8e87117c19eb9d6e600c44e0f3869ae1"
+    }
+    Frame {
+        msec: 1824
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1840
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1856
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1872
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1888
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1904
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1920
+        image: "gridview.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1952
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1968
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Frame {
+        msec: 1984
+        hash: "8304d2432168a2ea8a887d9a135b40b4"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2000
+        hash: "4924037ce643d0748b8b2c666e61fd62"
+    }
+    Frame {
+        msec: 2016
+        hash: "ef9750584e669a8b2d415d13854e12a6"
+    }
+    Frame {
+        msec: 2032
+        hash: "69937eacef6e6b11ad1d5741c69a1faa"
+    }
+    Frame {
+        msec: 2048
+        hash: "a1bd870fffd95a0604dd8e170e571632"
+    }
+    Frame {
+        msec: 2064
+        hash: "a3a72386594aacc88977cdaa6441df48"
+    }
+    Frame {
+        msec: 2080
+        hash: "6d8e89de38d52f0f0f871dfa18361cb5"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2096
+        hash: "96cfb1eb6893fac86c9434d1ffb82fcb"
+    }
+    Frame {
+        msec: 2112
+        hash: "5e11df1660634ff317be474118174ec5"
+    }
+    Frame {
+        msec: 2128
+        hash: "2eb75858b50c3a9a80673ab89014ed63"
+    }
+    Frame {
+        msec: 2144
+        hash: "3ff5d66f7902af92d49ebebf04d16c26"
+    }
+    Frame {
+        msec: 2160
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2176
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2192
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2208
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2224
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2240
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2256
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2272
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2288
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2304
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2320
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Frame {
+        msec: 2336
+        hash: "570da61e2d48acd11474fe005110ab4b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2352
+        hash: "efeda5b2d97e1b7c22e2308250501cb7"
+    }
+    Frame {
+        msec: 2368
+        hash: "d6158379b699279f66b94a8418e53af1"
+    }
+    Frame {
+        msec: 2384
+        hash: "ab960b0669fa594e0552df623a9136ea"
+    }
+    Frame {
+        msec: 2400
+        hash: "0ebf6be1305ee1eb8740f4d0365ef4c5"
+    }
+    Frame {
+        msec: 2416
+        hash: "46cde47dffc6f2687c8c643eca09b95d"
+    }
+    Frame {
+        msec: 2432
+        hash: "2b8698ce02a6964115d960ae19f40c37"
+    }
+    Frame {
+        msec: 2448
+        hash: "ff1e7d800bb27b41710c50554adc1091"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2464
+        hash: "5837b3aca09038cae23dcb149acc8b0b"
+    }
+    Frame {
+        msec: 2480
+        hash: "dbe7c571cdbdb9de4fd01faa6d5374cf"
+    }
+    Frame {
+        msec: 2496
+        hash: "f431abcaf05f49ead909296d7649f8a9"
+    }
+    Frame {
+        msec: 2512
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2528
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2544
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2560
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2576
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2592
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2608
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2624
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2640
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2656
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2672
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2688
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2704
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2720
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2736
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2752
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2768
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Frame {
+        msec: 2784
+        hash: "043583b19c921740dbc990afd4f508ed"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2800
+        hash: "4f2fafdb59db544352e3067d67c0a714"
+    }
+    Frame {
+        msec: 2816
+        hash: "4dcd4cdf6f4e305732185ec52cd2f2f6"
+    }
+    Frame {
+        msec: 2832
+        hash: "dfd3c29b0520edbbee57dfacfa7e2b30"
+    }
+    Frame {
+        msec: 2848
+        hash: "257d3d8bcf78671d35a898befec091cb"
+    }
+    Frame {
+        msec: 2864
+        hash: "20e89c544284603943396694abe86756"
+    }
+    Frame {
+        msec: 2880
+        image: "gridview.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "b88c6af89423b32b3a4413035711df03"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2912
+        hash: "e34de13af44c449c9ecc86e06ce01ed2"
+    }
+    Frame {
+        msec: 2928
+        hash: "98ffe81129aa7cc7325764221f1dae59"
+    }
+    Frame {
+        msec: 2944
+        hash: "db2d545de9879362738e71a02a3d1d26"
+    }
+    Frame {
+        msec: 2960
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 2976
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 2992
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3008
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3024
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3040
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3056
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3072
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3088
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Frame {
+        msec: 3104
+        hash: "e67ae32a47213b360c1a445bf645dde2"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3120
+        hash: "02d8c90faf56c65252e4f938944bda7b"
+    }
+    Frame {
+        msec: 3136
+        hash: "a32994e2320e357241f63b956b6db236"
+    }
+    Frame {
+        msec: 3152
+        hash: "9ada466c26c217adbcd7a93df264ed75"
+    }
+    Frame {
+        msec: 3168
+        hash: "79d1a3489be95d113e8c611a2ba63456"
+    }
+    Frame {
+        msec: 3184
+        hash: "d3aa82455c4ae3ac25097354e132a30f"
+    }
+    Frame {
+        msec: 3200
+        hash: "62d12e5933ed4ed048ccafd229f4b2b7"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3216
+        hash: "5bc4ac94ae20e425084d0811dee1ba08"
+    }
+    Frame {
+        msec: 3232
+        hash: "6d5113e3732dc7a9172eea3667a01f7b"
+    }
+    Frame {
+        msec: 3248
+        hash: "e435a2588b25d3336f290331931f5981"
+    }
+    Frame {
+        msec: 3264
+        hash: "bce201adbeb319b181cce139f179d7f0"
+    }
+    Frame {
+        msec: 3280
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3296
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3312
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3328
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3344
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3360
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3376
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3392
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3408
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3424
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3440
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Frame {
+        msec: 3456
+        hash: "5fa3ec31176bed2de8cb076b87e0be74"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3472
+        hash: "8f0f3cd35ae92047f23084f447046eb8"
+    }
+    Frame {
+        msec: 3488
+        hash: "ceb12e6c5e9f0566039040d9f3ff587f"
+    }
+    Frame {
+        msec: 3504
+        hash: "dfd0c89c3ea73aceefcdafa71609c720"
+    }
+    Frame {
+        msec: 3520
+        hash: "8d8ed1a9dc6a9f74dfc81b79f02af4c5"
+    }
+    Frame {
+        msec: 3536
+        hash: "d450bd62e03e1e4c7cb66e98ece05f97"
+    }
+    Frame {
+        msec: 3552
+        hash: "d1ece2210cd24eedd5361e5c3a162236"
+    }
+    Frame {
+        msec: 3568
+        hash: "77589e48b9db95e702055753046319e5"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3584
+        hash: "7793263ecb831a1e63fbd76c8addde03"
+    }
+    Frame {
+        msec: 3600
+        hash: "bfa9675f981c37fed27dea100226f61a"
+    }
+    Frame {
+        msec: 3616
+        hash: "9780849fe8abd22c32ccafcdd46b0d65"
+    }
+    Frame {
+        msec: 3632
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3648
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3664
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3680
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3696
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3712
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3728
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3744
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3760
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3776
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3792
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3808
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3824
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3840
+        image: "gridview.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3872
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3888
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3904
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Frame {
+        msec: 3920
+        hash: "e63d987ba303a42046827f14941b444a"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3936
+        hash: "a61dbcb7d914afe34009085bf37fb8e2"
+    }
+    Frame {
+        msec: 3952
+        hash: "89175b83b4f7ee4b5d99219cdc97aa59"
+    }
+    Frame {
+        msec: 3968
+        hash: "f524421286503f6175e4ad71dd89145f"
+    }
+    Frame {
+        msec: 3984
+        hash: "ca5af7d98a008eccba1e21be0da61f3c"
+    }
+    Frame {
+        msec: 4000
+        hash: "77c19e7e17e00787ff0d7a4e7bad7bc8"
+    }
+    Frame {
+        msec: 4016
+        hash: "04c8db761e324101ad92e0ac9ceed7d4"
+    }
+    Frame {
+        msec: 4032
+        hash: "97a3dcb81349efab6b44d458e83ce5c4"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4048
+        hash: "e86ebc276b88705c97cc9efb66ccc6b2"
+    }
+    Frame {
+        msec: 4064
+        hash: "a134bbfd14879f13b288a04d23382348"
+    }
+    Frame {
+        msec: 4080
+        hash: "9530ad3f58ad1c66401572869f7d91bc"
+    }
+    Frame {
+        msec: 4096
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4112
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4128
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4144
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4160
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4176
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4192
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4208
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Frame {
+        msec: 4224
+        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4240
+        hash: "980e0fa84fd3bab496623936f5f220a2"
+    }
+    Frame {
+        msec: 4256
+        hash: "ed3268911723d664699bbc31317befc1"
+    }
+    Frame {
+        msec: 4272
+        hash: "3bfda4b3b0b2d2a97ec1c0b5b3f4da63"
+    }
+    Frame {
+        msec: 4288
+        hash: "1616c6def28659d51905564ff83cc112"
+    }
+    Frame {
+        msec: 4304
+        hash: "68342f34c18956d3a093f8eeeae6977e"
+    }
+    Frame {
+        msec: 4320
+        hash: "ac1b12959e9055a28fe2bda0a12b75bc"
+    }
+    Frame {
+        msec: 4336
+        hash: "009b85ff6b86e418c78ed33a5e88d3f1"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4352
+        hash: "59753bc7dc69767fe2109fdc41f20dae"
+    }
+    Frame {
+        msec: 4368
+        hash: "1c87d3d8c8d564d4d95a26f57fd28f38"
+    }
+    Frame {
+        msec: 4384
+        hash: "4e43b7b6787002c9013010dd74c83f49"
+    }
+    Frame {
+        msec: 4400
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4416
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4432
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4448
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4464
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4480
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4496
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4512
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4528
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4544
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4560
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4576
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Frame {
+        msec: 4592
+        hash: "2476aa1a7191b485a76c76e98c9be2b0"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4608
+        hash: "84de5b5e8b0fba190a783c72967661c7"
+    }
+    Frame {
+        msec: 4624
+        hash: "60b696f4913379d28f300fd1b531c6cb"
+    }
+    Frame {
+        msec: 4640
+        hash: "d01e651d9094332fd82ad1cea3e93e9d"
+    }
+    Frame {
+        msec: 4656
+        hash: "87be4cd7c894b03b2b64c996e915d71f"
+    }
+    Frame {
+        msec: 4672
+        hash: "b07fccb0c5565d2feed5a9fcdf8acead"
+    }
+    Frame {
+        msec: 4688
+        hash: "3dca3165fd34be549d21fb6c414c67d8"
+    }
+    Frame {
+        msec: 4704
+        hash: "5f69f3298f8ca73fa9b3b6e630c60186"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4720
+        hash: "d7f41e9a29d550a7d9a41bb947569abe"
+    }
+    Frame {
+        msec: 4736
+        hash: "4ede2e90ad216a2d44580c50a25dea23"
+    }
+    Frame {
+        msec: 4752
+        hash: "9b339845ee588b789dc9095c272e0bdf"
+    }
+    Frame {
+        msec: 4768
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4784
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4800
+        image: "gridview.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4832
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4848
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4864
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4880
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4896
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4912
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4928
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4944
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4960
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4976
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 4992
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5008
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5024
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5040
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5056
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5072
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5088
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5104
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5120
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5136
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Frame {
+        msec: 5152
+        hash: "9cdea4790972efaecabd52b435107e69"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5168
+        hash: "d6f0a6d7604bad811eeba13fd7c45368"
+    }
+    Frame {
+        msec: 5184
+        hash: "5f92e1531a3f6c21ec82e3c908167fc7"
+    }
+    Frame {
+        msec: 5200
+        hash: "5214e99ff052dcdc8f85bad29de92e03"
+    }
+    Frame {
+        msec: 5216
+        hash: "d4abed9f0f1115c9a45b0b9b4f54754e"
+    }
+    Frame {
+        msec: 5232
+        hash: "cfae8a0281e704b0e62f6bf31b32800f"
+    }
+    Frame {
+        msec: 5248
+        hash: "c203f0674596ae690bf19f2d49be62ac"
+    }
+    Frame {
+        msec: 5264
+        hash: "2e2c7e05aade104bdc4f6c489b6f0601"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5280
+        hash: "b4b2148b0557dcab3a441165e5e4de5f"
+    }
+    Frame {
+        msec: 5296
+        hash: "c5e791d27a42a63d25cdbd492b4af29a"
+    }
+    Frame {
+        msec: 5312
+        hash: "0f94ebcb407f8e6ae263bd954f2c8177"
+    }
+    Frame {
+        msec: 5328
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5344
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5360
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5376
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5392
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5408
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5424
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5440
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Frame {
+        msec: 5456
+        hash: "d9b56b817a411812789881697a28fe4c"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5472
+        hash: "6fdfe69e377da72e04dc130f5677ed2c"
+    }
+    Frame {
+        msec: 5488
+        hash: "c041d26d43766fa1735f2ada2a43225b"
+    }
+    Frame {
+        msec: 5504
+        hash: "aa62dbd6c6256665ee1b4ef468607978"
+    }
+    Frame {
+        msec: 5520
+        hash: "987fcdf6483a83b1242053f4e7fb7a26"
+    }
+    Frame {
+        msec: 5536
+        hash: "fbde70c34709b68eb22f5460a8815fba"
+    }
+    Frame {
+        msec: 5552
+        hash: "911ddc838ebaf5ade1bb026dff2741ba"
+    }
+    Frame {
+        msec: 5568
+        hash: "120bbf35b2a3b756bdeaea0df43e49b2"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5584
+        hash: "ea93e33c079d6dc5fb18c69fb4fed441"
+    }
+    Frame {
+        msec: 5600
+        hash: "b9ac8ab01cb59b1fee11967bdb6d2dd6"
+    }
+    Frame {
+        msec: 5616
+        hash: "3ff266bf29cbcaa30bc1e7af5dd9866b"
+    }
+    Frame {
+        msec: 5632
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5648
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5664
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5680
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5696
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5712
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5728
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5744
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5760
+        image: "gridview.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5792
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Frame {
+        msec: 5808
+        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5824
+        hash: "de1f83d25751639dff42f1755a6534c3"
+    }
+    Frame {
+        msec: 5840
+        hash: "edefdea8b2461d03fb97cf5ed66e9b6d"
+    }
+    Frame {
+        msec: 5856
+        hash: "cef1886397e3932a511f37571b5011f4"
+    }
+    Frame {
+        msec: 5872
+        hash: "05589ad354314d9e04ef90c1addd99f5"
+    }
+    Frame {
+        msec: 5888
+        hash: "ff88b52e3755b9b4785d2719ddd4f090"
+    }
+    Frame {
+        msec: 5904
+        hash: "f59edc3016b177a2e8faa6612d718b17"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5920
+        hash: "dc673a7cdd927f70b28ebcfe51cd3d89"
+    }
+    Frame {
+        msec: 5936
+        hash: "3abec0da85fb663e63ab22188e092827"
+    }
+    Frame {
+        msec: 5952
+        hash: "50c2c8ac68cafad7c47b576cd8f4a037"
+    }
+    Frame {
+        msec: 5968
+        hash: "06c31b861e2b96e6595b2244d7b3f4d5"
+    }
+    Frame {
+        msec: 5984
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6000
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6016
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6032
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6048
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6064
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6080
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6096
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6112
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6128
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6144
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6160
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6176
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6192
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6208
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6224
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6240
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6256
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6272
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6288
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6304
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6320
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6336
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6352
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6368
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6384
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6400
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Frame {
+        msec: 6416
+        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6432
+        hash: "7f52a770775c19e10784b4c5f7874210"
+    }
+    Frame {
+        msec: 6448
+        hash: "827cfb74286a2a80aca8b6c5277d6cfd"
+    }
+    Frame {
+        msec: 6464
+        hash: "8399231eda9b66821d43a3d8c4c7d645"
+    }
+    Frame {
+        msec: 6480
+        hash: "fc163583671f3c4023361460b436c895"
+    }
+    Frame {
+        msec: 6496
+        hash: "893dea6496c95c32095ad1d673e500c2"
+    }
+    Frame {
+        msec: 6512
+        hash: "808c7403b2cdcc882059da56a2f806fe"
+    }
+    Frame {
+        msec: 6528
+        hash: "7466b2e5b86ba8ad46be75818659786c"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6544
+        hash: "dd2561cd780e24401130305d47757a53"
+    }
+    Frame {
+        msec: 6560
+        hash: "bee89299532d43fc3e6c3e69c343b381"
+    }
+    Frame {
+        msec: 6576
+        hash: "94f8474aedee94098592c05d8fc7d868"
+    }
+    Frame {
+        msec: 6592
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6608
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6624
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6640
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6656
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6672
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6688
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Frame {
+        msec: 6704
+        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6720
+        image: "gridview.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "ccd58be20d47422121d6ef799b927a7a"
+    }
+    Frame {
+        msec: 6752
+        hash: "e090c7f39649786a1796870e25bd0f0d"
+    }
+    Frame {
+        msec: 6768
+        hash: "acf3dcd9f4a869169dbc1ae7fe60e9d0"
+    }
+    Frame {
+        msec: 6784
+        hash: "51795e9a720845e8305d23507785e1ca"
+    }
+    Frame {
+        msec: 6800
+        hash: "0d34a43e177e6b73e2ff9155747d0385"
+    }
+    Frame {
+        msec: 6816
+        hash: "1876c3cdffc1af01da1aaa0ac636d0a8"
+    }
+    Frame {
+        msec: 6832
+        hash: "3131296b6edf4190520e2cdb3f8b936e"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6848
+        hash: "ee92f0a764e5081b130e205a5c362b07"
+    }
+    Frame {
+        msec: 6864
+        hash: "8737ea2c60aeb215228c00a7fddd1baa"
+    }
+    Frame {
+        msec: 6880
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6896
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6912
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6928
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6944
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6960
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6976
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 6992
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7008
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7024
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7040
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7056
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7072
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7088
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7104
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7120
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7136
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7152
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7168
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7184
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7200
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7216
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7232
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7248
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7264
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7280
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7296
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7312
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7328
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7344
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7360
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7376
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7392
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7408
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7424
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7440
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7456
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7472
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7488
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7504
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7520
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7536
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7552
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7568
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7584
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7600
+        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
+    }
+    Frame {
+        msec: 7616
+        hash: "eb0d1be15f63af6eaf6634b02e5f240a"
+    }
+    Frame {
+        msec: 7632
+        hash: "2423c305bebb3449e87c78e8fb447c88"
+    }
+    Frame {
+        msec: 7648
+        hash: "f0ede6ea85647728db80878b3e525edc"
+    }
+    Frame {
+        msec: 7664
+        hash: "387d127b2b000dc344ee4768cf2d29b2"
+    }
+    Frame {
+        msec: 7680
+        image: "gridview.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "1d0d8100e994c16d7973ad9a97b0068f"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7712
+        hash: "95fb4a6d0331ffc4773e39ec8c3e6511"
+    }
+    Frame {
+        msec: 7728
+        hash: "34738f16150228d971972833d4bd5c8f"
+    }
+    Frame {
+        msec: 7744
+        hash: "9b71c8dacc530f32d7c6f409928caf5c"
+    }
+    Frame {
+        msec: 7760
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7776
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7792
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7808
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7824
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7840
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7856
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7872
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7888
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7904
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7920
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7936
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7952
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 7968
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 7984
+        hash: "831efd0970c5c29fbe10b3be7707f915"
+    }
+    Frame {
+        msec: 8000
+        hash: "0587fc809c38c3bbe1fbac2960596974"
+    }
+    Frame {
+        msec: 8016
+        hash: "d20eba806cf4730a850db4c095fa36f9"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8032
+        hash: "c1663e75ba05b341e1e970a451958ea0"
+    }
+    Frame {
+        msec: 8048
+        hash: "ea40cc33b689d6b42fc5a69fa30178e4"
+    }
+    Frame {
+        msec: 8064
+        hash: "a07a1c61de1813158ff743cd326ee427"
+    }
+    Frame {
+        msec: 8080
+        hash: "6dfddaa340df8999ca77f6a6e4c6c3ce"
+    }
+    Frame {
+        msec: 8096
+        hash: "76ca40bb169c1ddc291847d4be2d38d7"
+    }
+    Frame {
+        msec: 8112
+        hash: "e44778541b76208981a3944a64235cac"
+    }
+    Frame {
+        msec: 8128
+        hash: "fdf45ea650d31957cc675c3bec8bf53e"
+    }
+    Frame {
+        msec: 8144
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8160
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8176
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8192
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8208
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8224
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8240
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8256
+        hash: "b78cdb727535ab7e567af08abf25e64c"
+    }
+    Frame {
+        msec: 8272
+        hash: "338481e6390f2a61e975084c16427584"
+    }
+    Frame {
+        msec: 8288
+        hash: "8923c45c23b1f4250b7d1e483b07a4da"
+    }
+    Frame {
+        msec: 8304
+        hash: "b21de834906d0eecea985561e2e41e4f"
+    }
+    Frame {
+        msec: 8320
+        hash: "a8c9761cfb20631520ed890cd2648c4b"
+    }
+    Frame {
+        msec: 8336
+        hash: "abf96a042ef12190bc48ff49732ef55a"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8352
+        hash: "5b9506dfb038cd26dfc81ecd2406ada9"
+    }
+    Frame {
+        msec: 8368
+        hash: "be75b8d39f81b2fdaff01469bfc67d4a"
+    }
+    Frame {
+        msec: 8384
+        hash: "488aa2977f349df82b5f6ae5e3619d35"
+    }
+    Frame {
+        msec: 8400
+        hash: "d69f17f0ce8537511353d20b59d20de0"
+    }
+    Frame {
+        msec: 8416
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8432
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8448
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8464
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8480
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8496
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8512
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8528
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8544
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8560
+        hash: "7647efcc0152cc3d6544106f969ace26"
+    }
+    Frame {
+        msec: 8576
+        hash: "8f74d33bf95cbf37fdb4521c69373a64"
+    }
+    Frame {
+        msec: 8592
+        hash: "e33bb4cd12790c9d9992efdd3e23bee9"
+    }
+    Frame {
+        msec: 8608
+        hash: "36f32e34b4093091c4707f26c52896ad"
+    }
+    Frame {
+        msec: 8624
+        hash: "5ab5e142f8dc883287c116cedbacfd55"
+    }
+    Frame {
+        msec: 8640
+        image: "gridview.8.png"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8656
+        hash: "c74212e45a6c4b6a18caeb6a22350609"
+    }
+    Frame {
+        msec: 8672
+        hash: "8919643a7d13677dd902941860093209"
+    }
+    Frame {
+        msec: 8688
+        hash: "6f2ab4400fadf51b994351f0975e31fc"
+    }
+    Frame {
+        msec: 8704
+        hash: "4798559ce6f9bd7455ed5385d0030763"
+    }
+    Frame {
+        msec: 8720
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8736
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8752
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8768
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8784
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8800
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8816
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8832
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8848
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8864
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8880
+        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
+    }
+    Frame {
+        msec: 8896
+        hash: "fac81cf6f45cb47abc1fa36d23e39d34"
+    }
+    Frame {
+        msec: 8912
+        hash: "862f4deee01183fd38b094da59048b23"
+    }
+    Frame {
+        msec: 8928
+        hash: "2f3b147221da30d8857d25fc788b3eac"
+    }
+    Frame {
+        msec: 8944
+        hash: "5b295b187c6cfc6aefa51e5efc2c27e3"
+    }
+    Frame {
+        msec: 8960
+        hash: "fe3139ddc8fdbc1b0c25bd641f83e833"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8976
+        hash: "8f2a9585dc6248a403aafd0f151d6ba0"
+    }
+    Frame {
+        msec: 8992
+        hash: "39eca8cc6bb8ea30cc452dc24f8e46dc"
+    }
+    Frame {
+        msec: 9008
+        hash: "8dbbc6026942cb6e572f1cb7e2675713"
+    }
+    Frame {
+        msec: 9024
+        hash: "62dfa07b96dd18c6be89822654bf09f3"
+    }
+    Frame {
+        msec: 9040
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9056
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9072
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9088
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9104
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9120
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9136
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9152
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9168
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9184
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9200
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9216
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9232
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9248
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9264
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Key {
+        type: 6
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 9280
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9296
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9312
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9328
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9344
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9360
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9376
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Key {
+        type: 7
+        key: 16777235
+        modifiers: 536870912
+        text: "1e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 9392
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9408
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9424
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9440
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9456
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9472
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9488
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9504
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9520
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9536
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9552
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9568
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9584
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9600
+        image: "gridview.9.png"
+    }
+    Frame {
+        msec: 9616
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9632
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9648
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9664
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9680
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9696
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9712
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9728
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9744
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9760
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 9776
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9792
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9808
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9824
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+    Frame {
+        msec: 9840
+        hash: "02c632713d0dc64bff9d8e58f745df95"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.0.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.0.png
new file mode 100644
index 0000000..3021d58
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.1.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.1.png
new file mode 100644
index 0000000..baeb1a6
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.10.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.10.png
new file mode 100644
index 0000000..b0486e5
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.10.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.2.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.2.png
new file mode 100644
index 0000000..2d0c731
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.3.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.3.png
new file mode 100644
index 0000000..af9ed05
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.4.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.4.png
new file mode 100644
index 0000000..0b0945d
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.5.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.5.png
new file mode 100644
index 0000000..618ae0c
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.6.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.6.png
new file mode 100644
index 0000000..fc31262
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.7.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.7.png
new file mode 100644
index 0000000..22291ac
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.8.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.8.png
new file mode 100644
index 0000000..3021d58
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.9.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.9.png
new file mode 100644
index 0000000..2f2f5b9
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.9.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.qml b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.qml
new file mode 100644
index 0000000..fb5f1fb
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.qml
@@ -0,0 +1,2479 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "dba2f6f1c773bd4cd9523108fca861c4"
+    }
+    Frame {
+        msec: 32
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 48
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 64
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 80
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 96
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 112
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 128
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 144
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 160
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 176
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 192
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 208
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 224
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 240
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 256
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 272
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 288
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 304
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 320
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 336
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 352
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 368
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 384
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 400
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 416
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 432
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 448
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 464
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 480
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 496
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 512
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 528
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 544
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 560
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 576
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 592
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 608
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 624
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 640
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 656
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 672
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 688
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 704
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 720
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 736
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 752
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 768
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 784
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 800
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 816
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 832
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 848
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 864
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 880
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 896
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 912
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 928
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 944
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 960
+        image: "gridview2.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 992
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1008
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1024
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1040
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1056
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1072
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1088
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1104
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1120
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1136
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1152
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1168
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1184
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1200
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1216
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1232
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1248
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1264
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 1280
+        hash: "aaec7184a27e6700d96ffff376b8fa53"
+    }
+    Frame {
+        msec: 1296
+        hash: "3fa3a890a4ff4a59336a9a2d478d0dde"
+    }
+    Frame {
+        msec: 1312
+        hash: "3711c6c2f4f9aba7f2c72bd1f1d85016"
+    }
+    Frame {
+        msec: 1328
+        hash: "23da2f9a800b805ce7b77ff08218907d"
+    }
+    Frame {
+        msec: 1344
+        hash: "12e4bc953b06cdaad0720f87fb96a37e"
+    }
+    Frame {
+        msec: 1360
+        hash: "46e69658bda69bab202a2790a76ba1cd"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1376
+        hash: "44608e67c69b92ccbb45e119e1158fe3"
+    }
+    Frame {
+        msec: 1392
+        hash: "97a309b47017d38294644a486a7ce68e"
+    }
+    Frame {
+        msec: 1408
+        hash: "41f42b50b22e0496c8aca5019b24b9cb"
+    }
+    Frame {
+        msec: 1424
+        hash: "8603ea1cb60c804563f50bc41c0180fe"
+    }
+    Frame {
+        msec: 1440
+        hash: "e29777fa70daafe9640c6e9bb7bd63d6"
+    }
+    Frame {
+        msec: 1456
+        hash: "2c4c360320f527e99fee799e68c2c0aa"
+    }
+    Frame {
+        msec: 1472
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1488
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1504
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1520
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1536
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1552
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1568
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1584
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1600
+        hash: "0d30916c7e05ff8609af5894f47a89bb"
+    }
+    Frame {
+        msec: 1616
+        hash: "17027b7c099b11cb5382f30dbbd1e647"
+    }
+    Frame {
+        msec: 1632
+        hash: "0e17461a4ca843f9903b7f03e99a0b00"
+    }
+    Frame {
+        msec: 1648
+        hash: "a5e61901920553e59892fa405beea15a"
+    }
+    Frame {
+        msec: 1664
+        hash: "310eaf71fe8d3807606e58a666c65ccd"
+    }
+    Frame {
+        msec: 1680
+        hash: "76f556d05fb77082f33eb1836c10587a"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1696
+        hash: "4e7e4b7790a96396e7ea3533b5c32ed9"
+    }
+    Frame {
+        msec: 1712
+        hash: "b065287b6490f58ca6f0e9eb2027cf20"
+    }
+    Frame {
+        msec: 1728
+        hash: "907cd9dbdffa1d395caaabd466dc8e86"
+    }
+    Frame {
+        msec: 1744
+        hash: "3b144e5b4867328beafa3020ce931480"
+    }
+    Frame {
+        msec: 1760
+        hash: "b59b2b60b7d55424b61b1b0ed3e227b8"
+    }
+    Frame {
+        msec: 1776
+        hash: "4032e934871b315b68c7c2abea42efee"
+    }
+    Frame {
+        msec: 1792
+        hash: "8f80127b2f8d6fc10aa84062544cc381"
+    }
+    Frame {
+        msec: 1808
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1824
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1840
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1856
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1872
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1888
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1904
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1920
+        image: "gridview2.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1952
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1968
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 1984
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 2000
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 2016
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2032
+        hash: "77d5193bc5f53fe5cb98a236c55f841e"
+    }
+    Frame {
+        msec: 2048
+        hash: "a45d2630872a14541f39b862e15ff461"
+    }
+    Frame {
+        msec: 2064
+        hash: "714711d7382ef8bba5fb39e2e44bd59c"
+    }
+    Frame {
+        msec: 2080
+        hash: "63deed0356e761f94f88be18a7d10053"
+    }
+    Frame {
+        msec: 2096
+        hash: "d5b4fc1b568a4a1b63a91b422272c704"
+    }
+    Frame {
+        msec: 2112
+        hash: "b6d2c80925cc6b4b7b297bd6ee903c7c"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "38117482196360353586cb7ace593894"
+    }
+    Frame {
+        msec: 2144
+        hash: "2301f3a148bf4e311cc8ce011ddf65f8"
+    }
+    Frame {
+        msec: 2160
+        hash: "2a4982a0961f89a15618f8d4c2081f5a"
+    }
+    Frame {
+        msec: 2176
+        hash: "acf8666d6a8a29925f3895aa8e93f713"
+    }
+    Frame {
+        msec: 2192
+        hash: "967ed026bc92a6d2747c5227105543a6"
+    }
+    Frame {
+        msec: 2208
+        hash: "ff72f3fb95f25990c99c1c14cfef57da"
+    }
+    Frame {
+        msec: 2224
+        hash: "0874a4f863596c3860dcf5b1f7f6ceb2"
+    }
+    Frame {
+        msec: 2240
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2256
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2272
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2288
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2304
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2320
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2336
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2352
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2368
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2384
+        hash: "520445d8619ad9bdde0db0e61f17567c"
+    }
+    Frame {
+        msec: 2400
+        hash: "7c4bbf0423d63d7642d218cac56a6215"
+    }
+    Frame {
+        msec: 2416
+        hash: "e8c77dbc89721b51549f8d46453fe09d"
+    }
+    Frame {
+        msec: 2432
+        hash: "7953503590b639872ac12215695e8cea"
+    }
+    Frame {
+        msec: 2448
+        hash: "edaee946a2e25fed6de9acfda0d44a14"
+    }
+    Frame {
+        msec: 2464
+        hash: "4996ef39bb0122c10d65f8dd8674b386"
+    }
+    Frame {
+        msec: 2480
+        hash: "ede7c6ca9d6deb7819c3715e98755d6e"
+    }
+    Frame {
+        msec: 2496
+        hash: "e703fad2fcf9244ec9865200c7d17ce3"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2512
+        hash: "e2bfc16fd893bb3eb0e5df89a0169af3"
+    }
+    Frame {
+        msec: 2528
+        hash: "cfd0eb2bc378bd46644f3f7820150685"
+    }
+    Frame {
+        msec: 2544
+        hash: "442b05b04762c2bcda291aaa0341398e"
+    }
+    Frame {
+        msec: 2560
+        hash: "55842a6503057eea98e2075ef160873e"
+    }
+    Frame {
+        msec: 2576
+        hash: "730f80233dacf1119660a76d2a34c5fc"
+    }
+    Frame {
+        msec: 2592
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2608
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2624
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2640
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2656
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2672
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2688
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2704
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2720
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2736
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 536870912
+        text: "1c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2752
+        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
+    }
+    Frame {
+        msec: 2768
+        hash: "4d04c12bc7fab0b22df3135bf3a87a22"
+    }
+    Frame {
+        msec: 2784
+        hash: "fdca5a3f8312452feba7f37b1caa6419"
+    }
+    Frame {
+        msec: 2800
+        hash: "97b955e0f8cde30299b238d9ac0eb308"
+    }
+    Frame {
+        msec: 2816
+        hash: "19664de1a738458810896959ba4087ad"
+    }
+    Frame {
+        msec: 2832
+        hash: "4f9a4b6de6a2969e4639076a8f7c258e"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 536870912
+        text: "1c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2848
+        hash: "a10f18aa686be2681a48082ec9f01df7"
+    }
+    Frame {
+        msec: 2864
+        hash: "b8f39a6cca377dd573429d879286dd63"
+    }
+    Frame {
+        msec: 2880
+        image: "gridview2.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "3301e52a46efbc49882401c77853ffde"
+    }
+    Frame {
+        msec: 2912
+        hash: "0c614597f17496ebc701efe7b0c1fbb6"
+    }
+    Frame {
+        msec: 2928
+        hash: "6dda2d6b034c932e279cf216c9b3e6ad"
+    }
+    Frame {
+        msec: 2944
+        hash: "7bf08cd5fe3ad3f83bbef28f452e0545"
+    }
+    Frame {
+        msec: 2960
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 2976
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 2992
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 3008
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 3024
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3040
+        hash: "1b7ebcf0e3d68e429cb04966120985e5"
+    }
+    Frame {
+        msec: 3056
+        hash: "0fe7d46e7c18ce7bb5a098c5c662d557"
+    }
+    Frame {
+        msec: 3072
+        hash: "cd5df541cc1ed545bc27da9e4a937261"
+    }
+    Frame {
+        msec: 3088
+        hash: "35762467b83fee1870cff9b0436994d3"
+    }
+    Frame {
+        msec: 3104
+        hash: "75a620b42caabf5b1576041dbd4c2808"
+    }
+    Frame {
+        msec: 3120
+        hash: "f1b06290a6cbd48b8d3d4ce1e42ed754"
+    }
+    Frame {
+        msec: 3136
+        hash: "8e1a50dc082828587a4656117760a852"
+    }
+    Frame {
+        msec: 3152
+        hash: "aae8e5f166e736040138d8e222a844dd"
+    }
+    Frame {
+        msec: 3168
+        hash: "f69e5cf2bcb26fe49126776695b0b7e0"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3184
+        hash: "7b482fece0255ea07496ef0545b008a2"
+    }
+    Frame {
+        msec: 3200
+        hash: "3f96eaebfebe8d4eeb347b201b59ab11"
+    }
+    Frame {
+        msec: 3216
+        hash: "9943626d2226c3be711c8213906133f0"
+    }
+    Frame {
+        msec: 3232
+        hash: "fd5fd8177b3957c27f1de0d95621351a"
+    }
+    Frame {
+        msec: 3248
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3264
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3280
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3296
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3312
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3328
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3344
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3360
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3376
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3392
+        hash: "506283ccfe9670633ce0bf60b437b37b"
+    }
+    Frame {
+        msec: 3408
+        hash: "fb437f6c23561092a124e498f1604ff2"
+    }
+    Frame {
+        msec: 3424
+        hash: "402ba144bbb7260eec4553e68eb35cda"
+    }
+    Frame {
+        msec: 3440
+        hash: "76a983de9e85e0c81dfb8908252bd6c9"
+    }
+    Frame {
+        msec: 3456
+        hash: "09219f55fae47a0afed887ebf68a36bc"
+    }
+    Frame {
+        msec: 3472
+        hash: "344e81cc262093facef2f6a235a734dc"
+    }
+    Frame {
+        msec: 3488
+        hash: "8f1c5544eb537555b1c59a377b15e31d"
+    }
+    Frame {
+        msec: 3504
+        hash: "606b9bb549fe2e4bbd09d67b7dea0d1a"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3520
+        hash: "63e239c97bd01a61cb31ef2869e7f47c"
+    }
+    Frame {
+        msec: 3536
+        hash: "f7c176550c39f8a1ad64590cf33a60a4"
+    }
+    Frame {
+        msec: 3552
+        hash: "8581cb14ed81efdf9abb638b5e542cc3"
+    }
+    Frame {
+        msec: 3568
+        hash: "7a1e9354ecc49d8bc27d303c7bdc81f9"
+    }
+    Frame {
+        msec: 3584
+        hash: "610288b97276ee03702ed8a814ef333d"
+    }
+    Frame {
+        msec: 3600
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3616
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3632
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3648
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3664
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3680
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3696
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3712
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3728
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3744
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3760
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3776
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3792
+        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
+    }
+    Frame {
+        msec: 3808
+        hash: "9713c6b9aff051dd0cc45c545d34b688"
+    }
+    Frame {
+        msec: 3824
+        hash: "1f8fd4d759e343720a8681b6ad126b72"
+    }
+    Frame {
+        msec: 3840
+        image: "gridview2.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "8550d916d91a40b0c3a886b962e07ffc"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3872
+        hash: "df0c2e474139e79429bfc19c79a65ef8"
+    }
+    Frame {
+        msec: 3888
+        hash: "acfb99d081d754276e5ed59bd590aeab"
+    }
+    Frame {
+        msec: 3904
+        hash: "2b34cd101b442f7a3de2893fd5514c16"
+    }
+    Frame {
+        msec: 3920
+        hash: "df92ced66faa1d59354d8010278438ec"
+    }
+    Frame {
+        msec: 3936
+        hash: "dd39a8e6fa3784453461193a6da416cd"
+    }
+    Frame {
+        msec: 3952
+        hash: "5670e8f91ea2df451f0974a51cd77d7d"
+    }
+    Frame {
+        msec: 3968
+        hash: "74b97a09bfe7400872a2c6214e04a5ac"
+    }
+    Frame {
+        msec: 3984
+        hash: "cfd55b963506ab54cf09a7311e84bcc9"
+    }
+    Frame {
+        msec: 4000
+        hash: "59657ee9293c03f064d62de826931435"
+    }
+    Frame {
+        msec: 4016
+        hash: "31f6a4adf31be5ed0af0ea4097e3acee"
+    }
+    Frame {
+        msec: 4032
+        hash: "8f5bfc40c8cdb2f8ce69adb72e7efe76"
+    }
+    Frame {
+        msec: 4048
+        hash: "9dc38985113124130e2ca7950e0bd144"
+    }
+    Frame {
+        msec: 4064
+        hash: "786e6e8b9e74876a6f393d61a78b8fc7"
+    }
+    Frame {
+        msec: 4080
+        hash: "1f4d59a4e4684aab309363a711b30006"
+    }
+    Frame {
+        msec: 4096
+        hash: "a11e332de151b43051796e16dbcf75c3"
+    }
+    Frame {
+        msec: 4112
+        hash: "1a0e82029ae107cb2a018786752433ff"
+    }
+    Frame {
+        msec: 4128
+        hash: "b14c51977c7fbf51f9cf6fec309bff6a"
+    }
+    Frame {
+        msec: 4144
+        hash: "2b418f811992399c3f87c268db745632"
+    }
+    Frame {
+        msec: 4160
+        hash: "0e9a056207053ca98c4e9f42de244c62"
+    }
+    Frame {
+        msec: 4176
+        hash: "1945c3f9e3a1337e7d111e15adea345f"
+    }
+    Frame {
+        msec: 4192
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4208
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4224
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4240
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4256
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4272
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4288
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4304
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4320
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4336
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4352
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4368
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4384
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4400
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4416
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4432
+        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
+    }
+    Frame {
+        msec: 4448
+        hash: "1945c3f9e3a1337e7d111e15adea345f"
+    }
+    Frame {
+        msec: 4464
+        hash: "0e9a056207053ca98c4e9f42de244c62"
+    }
+    Frame {
+        msec: 4480
+        hash: "2b418f811992399c3f87c268db745632"
+    }
+    Frame {
+        msec: 4496
+        hash: "b14c51977c7fbf51f9cf6fec309bff6a"
+    }
+    Frame {
+        msec: 4512
+        hash: "1a0e82029ae107cb2a018786752433ff"
+    }
+    Frame {
+        msec: 4528
+        hash: "a11e332de151b43051796e16dbcf75c3"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4544
+        hash: "1f4d59a4e4684aab309363a711b30006"
+    }
+    Frame {
+        msec: 4560
+        hash: "786e6e8b9e74876a6f393d61a78b8fc7"
+    }
+    Frame {
+        msec: 4576
+        hash: "9dc38985113124130e2ca7950e0bd144"
+    }
+    Frame {
+        msec: 4592
+        hash: "8f5bfc40c8cdb2f8ce69adb72e7efe76"
+    }
+    Frame {
+        msec: 4608
+        hash: "31f6a4adf31be5ed0af0ea4097e3acee"
+    }
+    Frame {
+        msec: 4624
+        hash: "59657ee9293c03f064d62de826931435"
+    }
+    Frame {
+        msec: 4640
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4656
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4672
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4688
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4704
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4720
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4736
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4752
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4768
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4784
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4800
+        image: "gridview2.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4832
+        hash: "23aa652a0de7fced4a780d72f0940a1b"
+    }
+    Frame {
+        msec: 4848
+        hash: "d46eea049d6156a5e85d9c6811d9d367"
+    }
+    Frame {
+        msec: 4864
+        hash: "d5796ae85247cb8502f92f0d044e4e1f"
+    }
+    Frame {
+        msec: 4880
+        hash: "90987ac49c1a4e6b668436e3ff631e6c"
+    }
+    Frame {
+        msec: 4896
+        hash: "c38d69759ad80242b1fe83ba191cd421"
+    }
+    Frame {
+        msec: 4912
+        hash: "09d08aed76a04e492d8a39cc4dd2b8f5"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 536870912
+        text: "1d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4928
+        hash: "9671d2ff9a2ef46ce3c750a1965404a4"
+    }
+    Frame {
+        msec: 4944
+        hash: "f55857816d666ece4a7987a70883b3d1"
+    }
+    Frame {
+        msec: 4960
+        hash: "a2d80527b30316d9120b057bbfcfa666"
+    }
+    Frame {
+        msec: 4976
+        hash: "87ca69287c1469cbc7e65d1673016de7"
+    }
+    Frame {
+        msec: 4992
+        hash: "51588c7ebbe2dcd87a3c9bebf028aee3"
+    }
+    Frame {
+        msec: 5008
+        hash: "917a9a171273fe9fd4c450eeed6f58ed"
+    }
+    Frame {
+        msec: 5024
+        hash: "6e7ade250a9a9692caee2a220dd2ac53"
+    }
+    Frame {
+        msec: 5040
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5056
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5072
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5088
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5104
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5120
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5136
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5152
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5168
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5184
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5200
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5216
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5232
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5248
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5264
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5280
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5296
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5312
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5328
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5344
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5360
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5376
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5392
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5408
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5424
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5440
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5456
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5472
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5488
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5504
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5520
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5536
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5552
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5568
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5584
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5600
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5616
+        hash: "ca2dcb16d553889a3a57b48700c2a595"
+    }
+    Frame {
+        msec: 5632
+        hash: "c5c9aab9bea757f1c451e89df72bd836"
+    }
+    Frame {
+        msec: 5648
+        hash: "a8cf3085f8c3b743f3f15db1ad7b8801"
+    }
+    Frame {
+        msec: 5664
+        hash: "c25a92050eced1c304506572723273a3"
+    }
+    Frame {
+        msec: 5680
+        hash: "cff981039c1a3eb6c3c1a20f142fbae2"
+    }
+    Frame {
+        msec: 5696
+        hash: "930765587fe3355873bbdff66b812b74"
+    }
+    Frame {
+        msec: 5712
+        hash: "6a60f97c7b39add465e1bd366e9c644b"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 5728
+        hash: "7a1fd3c488d1064a75dc598c9a773291"
+    }
+    Frame {
+        msec: 5744
+        hash: "e2ecd7e68e27eb3d2dcb5e368d3ee5a0"
+    }
+    Frame {
+        msec: 5760
+        image: "gridview2.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "20f3aaca2efc3066076e73d1d95e5363"
+    }
+    Frame {
+        msec: 5792
+        hash: "b18d476cadc36e22dddc3185f595c123"
+    }
+    Frame {
+        msec: 5808
+        hash: "8cbc47555178c8ee355774eab17b4b19"
+    }
+    Frame {
+        msec: 5824
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5840
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5856
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5872
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5888
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5904
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5920
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5936
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5952
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5968
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 5984
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6000
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6016
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6032
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6048
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6064
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6080
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6096
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6112
+        hash: "e488fb76fb550fba51b95bee3fee80d5"
+    }
+    Frame {
+        msec: 6128
+        hash: "8c2fab0c73d1cfbeeb0ec937085d6b3b"
+    }
+    Frame {
+        msec: 6144
+        hash: "5d9353517177ef7c6314d8a65cb009ec"
+    }
+    Frame {
+        msec: 6160
+        hash: "ed8de504f7e2028cd369c1555314fd81"
+    }
+    Frame {
+        msec: 6176
+        hash: "8fe84d8badbe5bd08d097ba6bda10611"
+    }
+    Frame {
+        msec: 6192
+        hash: "d77419a55a3cf933505e793bb258e6af"
+    }
+    Frame {
+        msec: 6208
+        hash: "457ac82be02e2f5e08e51ccc78c94781"
+    }
+    Frame {
+        msec: 6224
+        hash: "e57e2852f065afff9c24c5bc9f29edee"
+    }
+    Frame {
+        msec: 6240
+        hash: "f72cd6ad3324936c3a18c264e23e05a9"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6256
+        hash: "a4bf7eae6fc7a05239d09421ae95304a"
+    }
+    Frame {
+        msec: 6272
+        hash: "423f3bd07df8bee25818644c07201a3c"
+    }
+    Frame {
+        msec: 6288
+        hash: "225e9c698424f287b9458b7839b4479b"
+    }
+    Frame {
+        msec: 6304
+        hash: "0f463db7e4acc184a4efb7b5e5c0d397"
+    }
+    Frame {
+        msec: 6320
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6336
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6352
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6368
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6384
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6400
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6416
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6432
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6448
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6464
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6480
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6496
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6512
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6528
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6544
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6560
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6576
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6592
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6608
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6624
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6640
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6656
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6672
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6688
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6704
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6720
+        image: "gridview2.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Key {
+        type: 6
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6752
+        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
+    }
+    Frame {
+        msec: 6768
+        hash: "738f6bcc043d221488285c7e529b1d1c"
+    }
+    Frame {
+        msec: 6784
+        hash: "cb0a4e8e79372dd67e8ecfea2143a47c"
+    }
+    Frame {
+        msec: 6800
+        hash: "544d1825b36f4e7950c1a62b26c1fd9b"
+    }
+    Frame {
+        msec: 6816
+        hash: "df99396622342b4f092b0db34a224c3d"
+    }
+    Frame {
+        msec: 6832
+        hash: "47391f51e5df2249a6ca1f1f6e8e80e0"
+    }
+    Key {
+        type: 7
+        key: 16777237
+        modifiers: 536870912
+        text: "1f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6848
+        hash: "d8079a874ca18d00aeeb611effcbeb8b"
+    }
+    Frame {
+        msec: 6864
+        hash: "4cfd9264af6935aca425da75ebb2d7cc"
+    }
+    Frame {
+        msec: 6880
+        hash: "aee6547cb653cd2d56d07285d836149d"
+    }
+    Frame {
+        msec: 6896
+        hash: "969720f17eae51258e2e143e14bfa737"
+    }
+    Frame {
+        msec: 6912
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6928
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6944
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6960
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6976
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 6992
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7008
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7024
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7040
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7056
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7072
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7088
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7104
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7120
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7136
+        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
+    }
+    Frame {
+        msec: 7152
+        hash: "beeaec4b983c970ae448e33047dfdfea"
+    }
+    Frame {
+        msec: 7168
+        hash: "7c415ab1b7d8e25b71af75d3eec8ee4a"
+    }
+    Frame {
+        msec: 7184
+        hash: "8913037e57b9a6a58b68f2d6e69b1bd1"
+    }
+    Frame {
+        msec: 7200
+        hash: "19e59e9409fdaf90ccf75606b58688b7"
+    }
+    Frame {
+        msec: 7216
+        hash: "1ae71ef5b1006f637bd8df0769af65a6"
+    }
+    Frame {
+        msec: 7232
+        hash: "1f0aa8b368b2dbccafd54b923d8cce95"
+    }
+    Frame {
+        msec: 7248
+        hash: "c5079fb25a8c80a995d7aa5fbbd91428"
+    }
+    Frame {
+        msec: 7264
+        hash: "59f41220fa5d23db298c9e94f115c17b"
+    }
+    Frame {
+        msec: 7280
+        hash: "48259dfe8b266d9e7f50b187be98c3cb"
+    }
+    Frame {
+        msec: 7296
+        hash: "f7554552598351c3b8dfcbe3ebc32b3b"
+    }
+    Frame {
+        msec: 7312
+        hash: "219e9cd84d7e5c5c0e6cb80100aa3ab5"
+    }
+    Frame {
+        msec: 7328
+        hash: "5578e870ee8ce00bce5a59bb25e3d0a9"
+    }
+    Frame {
+        msec: 7344
+        hash: "4d9cebbf750c03380694245e0e22ab94"
+    }
+    Frame {
+        msec: 7360
+        hash: "a60a8032e97ed0a3caa05012c1283de5"
+    }
+    Frame {
+        msec: 7376
+        hash: "3bee20b349a7e9d67f7770ede6da8673"
+    }
+    Frame {
+        msec: 7392
+        hash: "d8c34576c25fb8b5e4fa12680ac32e99"
+    }
+    Frame {
+        msec: 7408
+        hash: "cd1360aa7db7c3b2f2012dfc44de2198"
+    }
+    Frame {
+        msec: 7424
+        hash: "cd82782f63c9a7d21d51b3440c2f038b"
+    }
+    Frame {
+        msec: 7440
+        hash: "e59061967a841aa45607c0828b687527"
+    }
+    Frame {
+        msec: 7456
+        hash: "01962406c9aaf1aa8bf3ab49e30ddf5f"
+    }
+    Frame {
+        msec: 7472
+        hash: "5a5732a568189e598c7985ee806bc67e"
+    }
+    Frame {
+        msec: 7488
+        hash: "54775aed3a6283c1fa330d65de5bc70c"
+    }
+    Frame {
+        msec: 7504
+        hash: "66640b4a5c1e68924b25de24e3c3f008"
+    }
+    Frame {
+        msec: 7520
+        hash: "76999d3125f20ba47dbdff38ee722a8a"
+    }
+    Frame {
+        msec: 7536
+        hash: "5159c81533bee8825cff11910bcb90dc"
+    }
+    Frame {
+        msec: 7552
+        hash: "ac0295495345987d1e000f6bb2436927"
+    }
+    Frame {
+        msec: 7568
+        hash: "d56b4a04f1d2835a0852ea20e8e2f451"
+    }
+    Frame {
+        msec: 7584
+        hash: "ae41fe23e2ab508d7642973c0d9d35b0"
+    }
+    Frame {
+        msec: 7600
+        hash: "730ca01fbee6ec4928715ec52773c06c"
+    }
+    Frame {
+        msec: 7616
+        hash: "ad1fa52c617a2b119d61eb9fb7d58a82"
+    }
+    Frame {
+        msec: 7632
+        hash: "c74321a822b515a393e8e218bd45e8e3"
+    }
+    Frame {
+        msec: 7648
+        hash: "a9e2f3bee1d47166204c74bdf90cd8c8"
+    }
+    Frame {
+        msec: 7664
+        hash: "e10d4bf08980ea7d079a2f359ee62b95"
+    }
+    Frame {
+        msec: 7680
+        image: "gridview2.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "9f0ba6051e684e54ff4e36d980a7e600"
+    }
+    Frame {
+        msec: 7712
+        hash: "aa6268d8d7fb3d2b91db3e225e8c818a"
+    }
+    Frame {
+        msec: 7728
+        hash: "8e547e55279b1929f42bf51e753f142e"
+    }
+    Frame {
+        msec: 7744
+        hash: "5386c71f8d6701379e177f161d714da2"
+    }
+    Frame {
+        msec: 7760
+        hash: "a184e9e6012c72fc1aeaed9f98b0fb1e"
+    }
+    Frame {
+        msec: 7776
+        hash: "777a6b70ca77c45e2e5e3914cc328dcb"
+    }
+    Frame {
+        msec: 7792
+        hash: "424f73f25a1e91126f951838d45adc3b"
+    }
+    Frame {
+        msec: 7808
+        hash: "3f7f2eb6b9a5d19fbfcd700baf566dfb"
+    }
+    Frame {
+        msec: 7824
+        hash: "c3c4c72b25c2295b82a5fd7454942f77"
+    }
+    Frame {
+        msec: 7840
+        hash: "3b35e93d3eb9d28c5c03d6d353f805d2"
+    }
+    Frame {
+        msec: 7856
+        hash: "5dcad019a1c0eaaab381a7602e1914ff"
+    }
+    Frame {
+        msec: 7872
+        hash: "602a5c569555767413bf445af44c744f"
+    }
+    Frame {
+        msec: 7888
+        hash: "3e9facab95dae772f695b6f7c5175063"
+    }
+    Frame {
+        msec: 7904
+        hash: "0921220ec36ca7b25eaae699872a2006"
+    }
+    Frame {
+        msec: 7920
+        hash: "1d5fa7fd630af62bcc805bdc6686df37"
+    }
+    Frame {
+        msec: 7936
+        hash: "165c02de63604aa118d9f8995e6b45af"
+    }
+    Frame {
+        msec: 7952
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 7968
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 7984
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8000
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8016
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8032
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8048
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8064
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8080
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8096
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8112
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8128
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8144
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8160
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8176
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8192
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8208
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8224
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8240
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8256
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8272
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8288
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8304
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8320
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8336
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8352
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8368
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8384
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8400
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8416
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8432
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8448
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8464
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8480
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8496
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8512
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8528
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8544
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8560
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8576
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8592
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8608
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8624
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8640
+        image: "gridview2.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8672
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8688
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8704
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 8720
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8736
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8752
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8768
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8784
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8800
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8816
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8832
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8848
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8864
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8880
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8896
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8912
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8928
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8944
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8960
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8976
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 8992
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 9008
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+    Frame {
+        msec: 9024
+        hash: "33d81c39d16c6a326012499796e50e03"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/gridview.qml b/tests/auto/declarative/visual/qdeclarativegridview/gridview.qml
new file mode 100644
index 0000000..f8782a5
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativegridview/gridview.qml
@@ -0,0 +1,51 @@
+import Qt 4.6
+
+Rectangle {
+    width: 300; height: 400; color: "black"
+
+    ListModel {
+        id: appModel
+        ListElement { lColor: "red" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "orange" }
+        ListElement { lColor: "pink" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "gray" }
+        ListElement { lColor: "red" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "orange" }
+        ListElement { lColor: "pink" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "gray" }
+    }
+
+    Component {
+        id: appDelegate
+        Item {
+            width: 100; height: 100
+            Rectangle {
+                color: lColor; x: 4; y: 4
+            width: 92; height: 92
+        }
+        }
+    }
+
+    Component {
+        id: appHighlight
+        Rectangle { width: 100; height: 100; color: "white"; z: 3000 }
+    }
+
+    GridView {
+        anchors.fill: parent
+        cellWidth: 100; cellHeight: 100; cacheBuffer: 200
+        model: appModel; delegate: appDelegate
+        highlight: appHighlight
+        focus: true
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml b/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml
new file mode 100644
index 0000000..81d06cf
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml
@@ -0,0 +1,58 @@
+import Qt 4.6
+
+Rectangle {
+    width: 300; height: 400; color: "black"
+
+    ListModel {
+        id: appModel
+        ListElement { lColor: "red" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "orange" }
+        ListElement { lColor: "pink" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "gray" }
+        ListElement { lColor: "red" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "orange" }
+        ListElement { lColor: "pink" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "gray" }
+        ListElement { lColor: "red" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "green" }
+    }
+
+    Component {
+        id: appDelegate
+        Item {
+            width: 100; height: 100
+            Rectangle {
+                color: lColor; x: 4; y: 4
+                width: 92; height: 92
+            }
+        }
+    }
+
+    GridView {
+        id: gridView; anchors.fill: parent
+        cellWidth: 100; cellHeight: 100; cacheBuffer: 200
+        model: appModel; delegate: appDelegate; focus: true
+        keyNavigationWraps: true
+
+        flickableData: [
+            Rectangle {
+                color: "transparent"; border.color: "white"; border.width: 8; z: 3000
+                height: 100; width: 100; x: 4; y: 4
+                x: EaseFollow { source: gridView.currentItem.x; velocity: 500 }
+                y: EaseFollow { source: gridView.currentItem.y; velocity: 500 }
+            }
+        ]
+    }
+
+}
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.0.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.0.png
new file mode 100644
index 0000000..cf36d60
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.1.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.1.png
new file mode 100644
index 0000000..6069df8
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.2.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.2.png
new file mode 100644
index 0000000..b8bd5f3
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.3.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.3.png
new file mode 100644
index 0000000..cf36d60
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.4.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.4.png
new file mode 100644
index 0000000..831d6b4
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.5.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.5.png
new file mode 100644
index 0000000..f7079dc
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.6.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.6.png
new file mode 100644
index 0000000..a5f4451
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.7.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.7.png
new file mode 100644
index 0000000..e1261d0
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.8.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.8.png
new file mode 100644
index 0000000..653905e
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.qml b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.qml
new file mode 100644
index 0000000..5a131e9
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.qml
@@ -0,0 +1,5207 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 32
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 48
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 64
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 80
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 96
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 112
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 128
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 144
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 160
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 176
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 192
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 208
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 224
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 240
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 256
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 272
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 288
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 304
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 320
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 336
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 352
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 368
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 384
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 400
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 416
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 432
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 448
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 464
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 480
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 496
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 512
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 528
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 544
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 560
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 576
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 592
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 608
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 624
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 640
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 656
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 672
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 688
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 704
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 720
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 736
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 752
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 768
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 784
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 800
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 816
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 832
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 848
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 864
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 880
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 896
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 912
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 928
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 944
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 960
+        image: "drag.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 992
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1008
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1024
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1040
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1056
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1072
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1088
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1104
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1120
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1136
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1152
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1168
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1184
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1200
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1216
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1232
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1248
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1264
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1280
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1296
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1312
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1328
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1344
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1360
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1376
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1392
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1408
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1424
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1440
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1456
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1472
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1488
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1504
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1520
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1536
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1552
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1568
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1584
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1600
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1616
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1632
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1648
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1664
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1680
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1696
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1712
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1728
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1744
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1760
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1776
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1792
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 16; y: 54
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1808
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 1824
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 16; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1840
+        hash: "b6b4b2c7acddd23609caa9727911b981"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1856
+        hash: "b6b4b2c7acddd23609caa9727911b981"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 18; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1872
+        hash: "022610222cfbcf9e9a8991cdb60c7bbb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 19; y: 54
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1888
+        hash: "9b5201a3201a102b20592d81218b5e74"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 22; y: 49
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 29; y: 42
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1904
+        hash: "a6c6df34bb552249393ba208ad327691"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 37; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1920
+        image: "drag.1.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: 27
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1936
+        hash: "978543d8f9688605625f40b960d79c28"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 73; y: 15
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1952
+        hash: "6170ab3a7e51278ac4462b89fe7781b4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 87; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1968
+        hash: "32866f0aa5b13b3ab68661f49336439e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1984
+        hash: "26dc17c16eed46d37932cfe48d182b62"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 111; y: 1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 121; y: -3
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2000
+        hash: "ba70936fb44396fac184cc7ba0e94a90"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 130; y: -6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2016
+        hash: "bae13291d4f031c34d80428d83367ede"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 140; y: -8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2032
+        hash: "0a2fbfdc27bb6662553f637f1c325475"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2048
+        hash: "cdab85736dfcc4424d42e0e96094eded"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2064
+        hash: "76d51ce9ad69560d983d8d86d50f7bd0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2080
+        hash: "b5ada9e80f7f894aa141d5e3cfa5d69e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2096
+        hash: "446d35fc7b9c0fe4bf0bfe0182f994f6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 183; y: -5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2112
+        hash: "cced849d314835d43ebd93bcfe396c12"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 188; y: -3
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2128
+        hash: "09696d700944c373f82d7c6f75d51c51"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 193; y: 0
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2144
+        hash: "af56586db93c49637c9bfbb17cac9001"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 199; y: 2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2160
+        hash: "66fc1b30b4037aad3975036faccbb7a7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 209; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2176
+        hash: "3f443d9c89d6ba1b36ca9635bc32de1a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2192
+        hash: "df47db8cc7bb466b298749a6449d3d70"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 227; y: 15
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 234; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 241; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2208
+        hash: "c1146fdc0e628d050442606096e52b10"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 252; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2224
+        hash: "22f44c43f300fd7ff2b4d87d93756178"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 272; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2240
+        hash: "bf11dc9a9679692abde5d116a169eecf"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 299; y: 38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 329; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2256
+        hash: "e63f1960f342639ac412010ffcefb049"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 360; y: 57
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2272
+        hash: "ae0228419ec9358025c3026a39abd671"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 392; y: 65
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2288
+        hash: "6d2272e2bea21c280100ed8de5b95d4e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 422; y: 72
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 451; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2304
+        hash: "1628c6fa5feabd90924452bc9f55054d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 476; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2320
+        hash: "f696791eb0a317b0efb69407616bec9f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 497; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2336
+        hash: "f696791eb0a317b0efb69407616bec9f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 513; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 527; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2352
+        hash: "1628c6fa5feabd90924452bc9f55054d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 538; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2368
+        hash: "a5d3d247e22a2852a60fe07ab40345a5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 548; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2384
+        hash: "a453fb6bcdd87f819782d8d8c46b56ee"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 556; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 563; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2400
+        hash: "a5d3d247e22a2852a60fe07ab40345a5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 570; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2416
+        hash: "1628c6fa5feabd90924452bc9f55054d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 576; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2432
+        hash: "f696791eb0a317b0efb69407616bec9f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 582; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 585; y: 80
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2448
+        hash: "8f061986df633c21dcad767ee857988c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 589; y: 81
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2464
+        hash: "2cc110a6fb800171d7d752693ede1e4e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 592; y: 82
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2480
+        hash: "319fc3053e02a8b161f33a79d9839bb1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 595; y: 85
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 597; y: 89
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2496
+        hash: "42915c8866746316cf1083a2d55410fb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 601; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2512
+        hash: "5df34b3ae292de9a9cd8ff09347e7bd4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 606; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2528
+        hash: "1f9bc3c955983ea85f568797cb4f7365"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 609; y: 113
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 613; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2544
+        hash: "3f156dc64a12c672874acf5456ef4a31"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 618; y: 136
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2560
+        hash: "d4d9fe5b5f138e06a87039ebf8695d03"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 619; y: 142
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2576
+        hash: "383fe813021ee2791930200b2f88a802"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 620; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 622; y: 155
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2592
+        hash: "a235544bd5e791dfa329bd0b87358bfa"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 625; y: 163
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2608
+        hash: "a87497cf47db3209610b532efe7eb380"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 629; y: 174
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2624
+        hash: "abe69b4e4b7508028226f9b73c38058a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 634; y: 194
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 642; y: 225
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2640
+        hash: "51c72fa2fa4c8765d882fe65dc0d697d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 649; y: 260
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2656
+        hash: "79da7ed21bd6fc16b7264d4403e763cc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 655; y: 291
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2672
+        hash: "b2828b6340a57fa45416469b23b7cef0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 658; y: 316
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 659; y: 340
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2688
+        hash: "64a5351f2d746b338c34c7ea9ba6e1fe"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 660; y: 370
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2704
+        hash: "9eedb7a6875210084fd2ec95d3505512"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 661; y: 408
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2720
+        hash: "b88eb8fa8a0cfc263dc7b655ddc29db0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 661; y: 448
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2736
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 660; y: 487
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 659; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2752
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 658; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2768
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 658; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2784
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 658; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 658; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2800
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 657; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2816
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 656; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2832
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 654; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 652; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2848
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 651; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2864
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 650; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2880
+        image: "drag.2.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 650; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 648; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2896
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 647; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2912
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 646; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2928
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 645; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 644; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2944
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 643; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2960
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 642; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2976
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 641; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 640; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2992
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 640; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3008
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 639; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3024
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 639; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 638; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3040
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 636; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3056
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 625; y: 505
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3072
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 611; y: 505
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3088
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 582; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 546; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3104
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 505; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3120
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 460; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3136
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 408; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 354; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3152
+        hash: "c2997fdde10812f02791bfed5f158ac3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 300; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3168
+        hash: "23a6dfbd09e5b44d04f252cedaeb68af"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 250; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3184
+        hash: "f74422989711f86a0840ffc98e8a29e9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 206; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3200
+        hash: "fa922246d254a7c46d2d1d6ec91a2b02"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 140; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 122; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3216
+        hash: "ef216cb8c2bf58db7d58bd8a2e4eb38d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3232
+        hash: "a383228d22e64b8a7758c959288eaca8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3248
+        hash: "636ca2a8e91c49ef6c8b1c93b830f345"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 36; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 16; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3264
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -1; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3280
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3296
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3312
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3328
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3344
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3360
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3376
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 505
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3392
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 504
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 504
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3408
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 505
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3424
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3440
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3456
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3472
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3488
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3504
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3520
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3536
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3552
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Frame {
+        msec: 3568
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3584
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3600
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3616
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Frame {
+        msec: 3632
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 491
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3648
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 428
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3664
+        hash: "9fa1e3686467f28cb013fe093dab388c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 342
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3680
+        hash: "7ef97d10862f80d53e0b3b4446661deb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 264
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 203
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3696
+        hash: "c679866b3965b7b5f48b843d6efccf42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 160
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3712
+        hash: "de4bd9ad3cbb9bb19bf75f871b044072"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 144
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3728
+        hash: "c5349bbddc03edd5ee3537e2a738f1ad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 136
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 132
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3744
+        hash: "bcbe9ec2687a6030385f08d3dc17becf"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 130
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3760
+        hash: "3ad767f63eaccb9e64a9f704900f2530"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 129
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3776
+        hash: "421a1ffde15fda0e7846bc095ed2ea37"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 128
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 128
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3792
+        hash: "55c260da304a6b1119af83f6a4efcff0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 123
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3808
+        hash: "f231cc521db801b4ec71248812e12db8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 104
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3824
+        hash: "b489b6b604e7f7699cac9e42d0725323"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 68
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3840
+        image: "drag.3.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 13
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3856
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3872
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3888
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3904
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3920
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -65
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3936
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3952
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3968
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3984
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4000
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4016
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4032
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4048
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4064
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4080
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4096
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4112
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4128
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4144
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: -78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4160
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -3; y: -84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4176
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -2; y: -105
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 1; y: -151
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4192
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4208
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4224
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4240
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4256
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4272
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4288
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4304
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4320
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4336
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4352
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4368
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Frame {
+        msec: 4384
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 3; y: -151
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4400
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 4; y: -149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4416
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 5; y: -147
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4432
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 5; y: -143
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 6; y: -138
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4448
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 7; y: -130
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4464
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 9; y: -117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4480
+        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 13; y: -94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 20; y: -63
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4496
+        hash: "b1b54f7bf8ab9cf98d96f9b34192434b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 29; y: -24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4512
+        hash: "a6c6df34bb552249393ba208ad327691"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 39; y: 15
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4528
+        hash: "a05eb803b1f1f3574a2f2e08fe37bd35"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: 50
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 58; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4544
+        hash: "3c2f3db46673c2640a26832900b609cb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 65; y: 91
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4560
+        hash: "d0539a9791874f48634bb3cb9f78d9db"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 71; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4576
+        hash: "f2d862a0b81e2578799d64aef2e6bddc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 77; y: 112
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 81; y: 121
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4592
+        hash: "295ef097845e30064c4d810a7718896c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 86; y: 128
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4608
+        hash: "22a4a17d82ac402c0e8372861609ff1c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 92; y: 136
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4624
+        hash: "a70e81b1435afd77b9079c58685ef9d0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 98; y: 143
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 104; y: 151
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4640
+        hash: "d66fefd68fcd96834548c18797eee4bd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 111; y: 159
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4656
+        hash: "fcc435dc6f2643cd21a7cfac078880af"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 118; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4672
+        hash: "736edfcf33245d46aaea199634896c17"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 123; y: 173
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 129; y: 183
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4688
+        hash: "7b7ab312d0c6f4bfc87a2ae467324f4e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 137; y: 197
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4704
+        hash: "d78ce756fc27055eeee15001419b7fb5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 215
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4720
+        hash: "4f15a726939d7f489d1fe58ebb5bcd0a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 235
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 255
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4736
+        hash: "72184d71fd2fdc6786a43045db0be68f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 180; y: 274
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4752
+        hash: "3b3f3f34218bf238f310412cb8c4968d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 192; y: 293
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4768
+        hash: "24c00a7154471431d43b1db957ad6424"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 316
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 221; y: 343
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4784
+        hash: "30081a33ab007ff2c7ba6cc293a5aec3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 237; y: 371
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4800
+        image: "drag.4.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 253; y: 396
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4816
+        hash: "c0cadb7730838d553b146804c37506b0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 268; y: 419
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 276; y: 429
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 284; y: 438
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4832
+        hash: "101c007d0e2cf82331ba1cab4880e8a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 291; y: 448
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4848
+        hash: "72e46df7427420c5e942a97831723d3f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 307; y: 468
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4864
+        hash: "4b7a009b46982a1e9e31250d7ebf0a20"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 323; y: 492
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 341; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4880
+        hash: "a3ba70933b6452fad0cdc4192e04be23"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 359; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4896
+        hash: "c2ee16182222b403f914eb5550ac6f91"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 378; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4912
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 397; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 416; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4928
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 432; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4944
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 445; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4960
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 456; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 466; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4976
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 475; y: 506
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4992
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 482; y: 505
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5008
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 488; y: 504
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 492; y: 503
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5024
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 496; y: 503
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5040
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 500; y: 502
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5056
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 507; y: 501
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5072
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 512; y: 500
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 516; y: 498
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5088
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 521; y: 494
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5104
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 525; y: 486
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5120
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 532; y: 472
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 542; y: 445
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5136
+        hash: "9356ce797d12ae076af947cd0e658551"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 553; y: 414
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5152
+        hash: "76a8d3b8465f08fdc4586c7766667eff"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 563; y: 389
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5168
+        hash: "569e56ba99776d03dd3140e53bc77f56"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 569; y: 373
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 573; y: 363
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5184
+        hash: "7139c72a2458685006da79d9cf11bc44"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 577; y: 354
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5200
+        hash: "a83d5ef213edec4c8f938ab04afb5c4f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 580; y: 344
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5216
+        hash: "5533602bc8a473c162966142d4bddebd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 584; y: 321
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 586; y: 301
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5232
+        hash: "7a79d6e31874428233e9c141d70522fd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 588; y: 264
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5248
+        hash: "b14f4daeb25cd71baae36f4cec111813"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 591; y: 238
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5264
+        hash: "e2b2513d2918ffb85bab5fff5a8be644"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 592; y: 225
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 593; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5280
+        hash: "af0cbb3423491917db1fdaa8350d48b0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 594; y: 209
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5296
+        hash: "b9c107f0a13ad37ae05b4d5f9e5f5442"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 594; y: 200
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5312
+        hash: "0bbc0c7a4a40ee6b19565c04c23b565d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 594; y: 182
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 593; y: 146
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5328
+        hash: "49494e8526a1417c151c7cac7099b9e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 590; y: 107
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5344
+        hash: "5e0839c4414cc8ddc5241c658fd3bf88"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 585; y: 80
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5360
+        hash: "8f061986df633c21dcad767ee857988c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 582; y: 67
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5376
+        hash: "d78c0a4fa0ccad407a565fab3a5c95b9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 579; y: 61
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 576; y: 57
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5392
+        hash: "cee6816f84911bc2262afe28d8996719"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 573; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5408
+        hash: "2cc6cd514ef7299dd60bf1a735b81d36"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 569; y: 51
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5424
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 564; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 557; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5440
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 548; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5456
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 540; y: 14
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 532; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5472
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 524; y: -1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5488
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 517; y: -5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5504
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 510; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5520
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 501; y: -14
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 492; y: -18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5536
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 483; y: -21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5552
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 476; y: -21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5568
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 470; y: -19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 464; y: -15
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5584
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 458; y: -9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5600
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 452; y: -3
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5616
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 446; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 439; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5632
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 432; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5648
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 424; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5664
+        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 413; y: 42
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 400; y: 59
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5680
+        hash: "9bc8a652f43c0e3cae9492f5dff624e7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 392; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 385; y: 79
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5696
+        hash: "5465128afe72d9618cd9abc47f4ce72f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 378; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5712
+        hash: "ad739c2028caf8f89d8ae04d509c7854"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 366; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 353; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5728
+        hash: "97cd37f639a7bea76a2f68774c0753db"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 339; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5744
+        hash: "d24fc8a57dd34e6ddb726426247ec219"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 324; y: 140
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5760
+        image: "drag.5.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 308; y: 158
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 288; y: 181
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5776
+        hash: "7af87eb80fa9d87fe8d8b5e4a2fff5e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 266; y: 208
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5792
+        hash: "73623f4a857fd4d5150c2eeef1341540"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 243; y: 237
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5808
+        hash: "076c4b60d9ec197950ade51e3f1be791"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 265
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 191; y: 291
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5824
+        hash: "22b7d7765c634763fa86912ea262efca"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 167; y: 314
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5840
+        hash: "1267c017931bda0b88b4672f46d499e0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 147; y: 331
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "b6a545e4c14b809f4ebcffbcb59a8e4f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 132; y: 344
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 121; y: 354
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5872
+        hash: "b1085cb508d4613c76e99bc879c62cbf"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 111; y: 363
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5888
+        hash: "365fd1260c2109e6d5bd0a97ce3a7e4e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 370
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5904
+        hash: "3a7d001313b23cbbb7f3d842ab40f41b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 86; y: 377
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 385
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5920
+        hash: "c5bda48bb2eaee54d6d8416592830327"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: 394
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5936
+        hash: "5d0fd6d8a6ced4f197fe3b09e7e9155b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 29; y: 402
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5952
+        hash: "79e2825f98644c061ae5216ae1823e4b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 16; y: 410
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 6; y: 417
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5968
+        hash: "22a3978f2f3a0cde67f459527af3b3f2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 0; y: 422
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 427
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5984
+        hash: "1511bec94911dd272f78a726e15bf76e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 432
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6000
+        hash: "0f892f7e570cdc703e492248c9f54b6c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 439
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6016
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 447
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 452
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6032
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 457
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6048
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 459
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6064
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 464
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 465
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6080
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 467
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6096
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 468
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6112
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 468
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 468
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6128
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 468
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6144
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 468
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6160
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 469
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 470
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6176
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 470
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6192
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Frame {
+        msec: 6208
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 470
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6224
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -3; y: 470
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -3; y: 470
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6240
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -2; y: 470
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6256
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -1; y: 470
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6272
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -1; y: 468
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 0; y: 467
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6288
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 0; y: 464
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6304
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 0; y: 458
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6320
+        hash: "ec34aa6937d2c081bdf11660a5eb461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -3; y: 441
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 408
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6336
+        hash: "58413f9b01f1e0b49519d8b6a3011607"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 366
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6352
+        hash: "b3992d2f9c1383c710ee325a94117a8b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 327
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6368
+        hash: "bd415044fcf6218d8184cb0206105e65"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 300
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 288
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6384
+        hash: "e7296140fe8b28bed77e95e588c0e463"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 280
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6400
+        hash: "9ff532223ccccd663809187465e478c2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 276
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6416
+        hash: "4de9ca75503db05df5d8274d75c202e5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 271
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 259
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6432
+        hash: "a83b5bc409207e986055081b4ed3faa6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 227
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6448
+        hash: "7fdbd00dd3553241f30fd6568a8ab646"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 190
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6464
+        hash: "5ebaa67eaadc1ede8c46964fa1dffff1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -4; y: 169
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: -2; y: 160
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6480
+        hash: "de4bd9ad3cbb9bb19bf75f871b044072"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 1; y: 156
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6496
+        hash: "9d762cd4dd6508cf8b54c47b76f4ef37"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 5; y: 155
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6512
+        hash: "bdf17c384f4f824a89a06b88ba17c15f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 10; y: 154
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 25; y: 152
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6528
+        hash: "f279f28995785afd143726aef7673b50"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6544
+        hash: "53b6b82a61d017e12afb01a728d8d856"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 80; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6560
+        hash: "9a48039175cab1360a0cf5cc195e2082"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 98; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 112; y: 150
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6576
+        hash: "cfc3991e30eef6c2edb66cb6060b2bde"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 123; y: 153
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6592
+        hash: "737d8907f62768e623ba76866a509d1e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 134; y: 155
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6608
+        hash: "dea2a596f7d85f29728b33d126d997e5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 158
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 161
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6624
+        hash: "3969a0bbb284ab1d5efd20cf93b0422d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6640
+        hash: "071ff25e49f7f16a727ff58c42ff766e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 169
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6656
+        hash: "454abec991a4675763f379c256919fa7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 184; y: 173
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 189; y: 177
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6672
+        hash: "6de741c4e6057dc8580106155c4ac627"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 194; y: 184
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6688
+        hash: "e35853e99cd205b7ccabdf632b238584"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 199; y: 192
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6704
+        hash: "15a70a0196227c6bce50ed70cd6383c8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 204; y: 201
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 211; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6720
+        image: "drag.6.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 217
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6736
+        hash: "5e951eb6017a060287e398fcaf4aeba9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 224; y: 223
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6752
+        hash: "ddd0f27027e23a45aef131296c781865"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 235; y: 228
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 246; y: 232
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6768
+        hash: "715102a252756e5a8c4f459d808aec6a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 257; y: 235
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6784
+        hash: "42b9c1b894247ddbd85f4a4aca5695f1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 267; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6800
+        hash: "b67b4bdd412ed5160901803c60c6f19e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 275; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 280; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6816
+        hash: "3490cc41c2b1f9301c209bdb8f052add"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 281; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6832
+        hash: "df32868d564ebbc41c359409b5a69e7d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 282; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6848
+        hash: "b9cb430a6f677e67c87322e0aff53fb1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 282; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6864
+        hash: "b9cb430a6f677e67c87322e0aff53fb1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 281; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6880
+        hash: "df32868d564ebbc41c359409b5a69e7d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 280; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6896
+        hash: "3490cc41c2b1f9301c209bdb8f052add"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 279; y: 240
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6912
+        hash: "e23a88f49a73cd2a9326095dd380ab55"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 277; y: 240
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6928
+        hash: "ffffc1aed27fe77c2fe5c035eab706a9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 277; y: 240
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6944
+        hash: "ffffc1aed27fe77c2fe5c035eab706a9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 276; y: 240
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6960
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 276; y: 240
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6976
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 6992
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 276; y: 240
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7008
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7024
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7040
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7056
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7072
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7088
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7104
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7120
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7136
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7152
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7168
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7184
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7200
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7216
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7232
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7248
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7264
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7280
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7296
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7312
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7328
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7344
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7360
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7376
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7392
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7408
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7424
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7440
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7456
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7472
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7488
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7504
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7520
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7536
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7552
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7568
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7584
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7600
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7616
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7632
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7648
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7664
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7680
+        image: "drag.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7712
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7728
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7744
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7760
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7776
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7792
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7808
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7824
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7840
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7856
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7872
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7888
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7904
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7920
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7936
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7952
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7968
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 7984
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+    Frame {
+        msec: 8000
+        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.0.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.0.png
new file mode 100644
index 0000000..c249c21
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.1.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.1.png
new file mode 100644
index 0000000..a96bf1b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.10.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.10.png
new file mode 100644
index 0000000..7420ca7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.10.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.11.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.11.png
new file mode 100644
index 0000000..7420ca7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.11.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.12.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.12.png
new file mode 100644
index 0000000..7420ca7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.12.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.13.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.13.png
new file mode 100644
index 0000000..7420ca7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.13.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.14.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.14.png
new file mode 100644
index 0000000..7420ca7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.14.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.15.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.15.png
new file mode 100644
index 0000000..e797cc9
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.15.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.16.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.16.png
new file mode 100644
index 0000000..7951309
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.16.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.17.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.17.png
new file mode 100644
index 0000000..7951309
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.17.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.18.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.18.png
new file mode 100644
index 0000000..7951309
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.18.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.19.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.19.png
new file mode 100644
index 0000000..7951309
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.19.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.2.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.2.png
new file mode 100644
index 0000000..a96bf1b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.20.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.20.png
new file mode 100644
index 0000000..7951309
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.20.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.21.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.21.png
new file mode 100644
index 0000000..7951309
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.21.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.22.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.22.png
new file mode 100644
index 0000000..7951309
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.22.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.3.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.3.png
new file mode 100644
index 0000000..a96bf1b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.4.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.4.png
new file mode 100644
index 0000000..1fe365a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.5.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.5.png
new file mode 100644
index 0000000..1fe365a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.6.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.6.png
new file mode 100644
index 0000000..1fe365a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.7.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.7.png
new file mode 100644
index 0000000..1fe365a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.8.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.8.png
new file mode 100644
index 0000000..7420ca7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.9.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.9.png
new file mode 100644
index 0000000..7420ca7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.9.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.qml b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.qml
new file mode 100644
index 0000000..cc374fd
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.qml
@@ -0,0 +1,5867 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 32
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 48
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 64
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 80
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 96
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 112
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 128
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 144
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 160
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 176
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 192
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 208
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 224
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 240
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 256
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 272
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 288
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 304
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 320
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 336
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 352
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 368
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 384
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 400
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 416
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 432
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 448
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 464
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 480
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 496
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 512
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 528
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 544
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 560
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 576
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 592
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 608
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 624
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 640
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 656
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 672
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 688
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 704
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 720
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 736
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 752
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 768
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 784
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 800
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 816
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 832
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 848
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 864
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 880
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 896
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 912
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 928
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 944
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 960
+        image: "mouseregion.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 992
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1008
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1024
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1040
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1056
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1072
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1088
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1104
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1120
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1136
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1152
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1168
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1184
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1200
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1216
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1232
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1248
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1264
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1280
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1296
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1312
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1328
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1344
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1360
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1376
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1392
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1408
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1424
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1440
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1456
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1472
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1488
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1504
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1520
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1536
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1552
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1568
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1584
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1600
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1616
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1632
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1648
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Frame {
+        msec: 1664
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 2; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 7; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1680
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 19; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 33; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1696
+        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 49; y: 54
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1712
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1728
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 78; y: 57
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 81; y: 57
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1744
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1760
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 54
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1776
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 53
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1792
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Frame {
+        msec: 1808
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Frame {
+        msec: 1824
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Frame {
+        msec: 1840
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Frame {
+        msec: 1856
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Frame {
+        msec: 1872
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 52
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 51
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1888
+        hash: "337f0f4af627bbdf8807135ce39d5070"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 80; y: 50
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 78; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1904
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 75; y: 46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 73; y: 45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1920
+        image: "mouseregion.1.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 71; y: 43
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 68; y: 41
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1936
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 66; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1952
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 64; y: 39
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 37
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1968
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 61; y: 36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 60; y: 36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1984
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 58; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2000
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 56; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2016
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 55; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 54; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2032
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2048
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2064
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2080
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2096
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2112
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2128
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 54; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2144
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2160
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2176
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2192
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2208
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2224
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2240
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 54; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2256
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2272
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2288
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2304
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2320
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2336
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2352
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2368
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2384
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2400
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2416
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2432
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2448
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2464
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2480
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2496
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2512
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2528
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2544
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2560
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2576
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2592
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2608
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2624
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2640
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 2
+        button: 2
+        buttons: 2
+        x: 54; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2656
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2672
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2688
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2704
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2720
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2736
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2752
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 3
+        button: 2
+        buttons: 0
+        x: 54; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2768
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2784
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2800
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2816
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2832
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2848
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2864
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 2880
+        image: "mouseregion.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 55; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 58; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2912
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2928
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 75; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2944
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2960
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 107; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 113; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2976
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 119; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 124; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2992
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 128; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 131; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3008
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 132; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 132; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3024
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3040
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3056
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3072
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3088
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3104
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3120
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3136
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3152
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3168
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3184
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3200
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3216
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3232
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3248
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3264
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3280
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3296
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3312
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3328
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3344
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3360
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3376
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3392
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3408
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3424
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3440
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3456
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3472
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3488
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3504
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3520
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3536
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3552
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 133; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3568
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3584
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 133; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3600
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3616
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3632
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3648
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3664
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3680
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3696
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 133; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3712
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3728
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3744
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3760
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3776
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3792
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3808
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3824
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3840
+        image: "mouseregion.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3872
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3888
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3904
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3920
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3936
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3952
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3968
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 3984
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4000
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4016
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4032
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4048
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4064
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4080
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4096
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4112
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4128
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4144
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4160
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4176
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4192
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4208
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4224
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4240
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4256
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4272
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4288
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4304
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4320
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 2
+        button: 2
+        buttons: 2
+        x: 133; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4336
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4352
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4368
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4384
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4400
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4416
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Frame {
+        msec: 4432
+        hash: "73f1639b9e2164c7b974042934c0d151"
+    }
+    Mouse {
+        type: 3
+        button: 2
+        buttons: 0
+        x: 133; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4448
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4464
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4480
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4496
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4512
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4528
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4544
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4560
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4576
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4592
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4608
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4624
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4640
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4656
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4672
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4688
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4704
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4720
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4736
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 133; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 136; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4752
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 142; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 148; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4768
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 155; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 161; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4784
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 166; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4800
+        image: "mouseregion.4.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 168; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 170; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4816
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 171; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4832
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4848
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4864
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 4880
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 172; y: 28
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 175; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4896
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4912
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 182; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 187; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4928
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 191; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 195; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4944
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 200; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 206; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4960
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 211; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 215; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4976
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 218; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 221; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4992
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 224; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5008
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 225; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 226; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5024
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 227; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5040
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5056
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5072
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 228; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 229; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5088
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 231; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 232; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5104
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 233; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5120
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5136
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5152
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5168
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 233; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 234; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5184
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 237; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5200
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 239; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 242; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5216
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 244; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 245; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5232
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 247; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5248
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5264
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5280
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5296
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5312
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5328
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5344
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5360
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5376
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5392
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5408
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5424
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5440
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5456
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5472
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5488
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5504
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5520
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5536
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5552
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5568
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5584
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5600
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5616
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5632
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5648
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5664
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5680
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5696
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5712
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5728
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5744
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5760
+        image: "mouseregion.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5792
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5808
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5824
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5840
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 247; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5872
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5888
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5904
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5920
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5936
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 247; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5952
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5968
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 5984
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6000
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6016
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6032
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6048
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6064
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6080
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6096
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6112
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6128
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6144
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6160
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6176
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6192
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6208
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6224
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6240
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6256
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6272
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6288
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6304
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6320
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6336
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6352
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6368
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6384
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6400
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6416
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6432
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6448
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6464
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6480
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6496
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6512
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6528
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6544
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6560
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6576
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 247; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6592
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6608
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6624
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6640
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 247; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6656
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6672
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6688
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6704
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6720
+        image: "mouseregion.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 247; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6752
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6768
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6784
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6800
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6816
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6832
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 247; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6848
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6864
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6880
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6896
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6912
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6928
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6944
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6960
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6976
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 6992
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7008
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7024
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7040
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7056
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7072
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7088
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7104
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7120
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7136
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7152
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7168
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7184
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7200
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 247; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7216
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7232
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7248
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7264
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7280
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7296
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7312
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7328
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7344
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7360
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7376
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7392
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7408
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7424
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7440
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7456
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7472
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7488
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7504
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7520
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7536
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7552
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7568
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7584
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7600
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7616
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7632
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7648
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7664
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7680
+        image: "mouseregion.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7712
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7728
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7744
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7760
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7776
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7792
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7808
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7824
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7840
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7856
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7872
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7888
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7904
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7920
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7936
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7952
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7968
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 7984
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 8000
+        hash: "12edb0902e4d480c9052b00edc1a0a42"
+    }
+    Frame {
+        msec: 8016
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8032
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8048
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8064
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8080
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8096
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8112
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8128
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8144
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8160
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8176
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8192
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8208
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8224
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8240
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8256
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8272
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8288
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8304
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8320
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8336
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 247; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8352
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8368
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8384
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8400
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8416
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8432
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8448
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8464
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8480
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8496
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8512
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8528
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 248; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8544
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 254; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 259; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8560
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 264; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 268; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8576
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 273; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 277; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8592
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 281; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 284; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8608
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 287; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 289; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8624
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 292; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8640
+        image: "mouseregion.8.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 294; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 295; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8656
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 297; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 299; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8672
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 301; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 304; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8688
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 307; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8704
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 310; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 312; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8720
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 314; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 315; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8736
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 317; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 318; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8752
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 319; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8768
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 320; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8784
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 322; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 323; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8800
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 325; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 327; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8816
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 330; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 333; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8832
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 336; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 338; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8848
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 339; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8864
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 340; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8880
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 8896
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 340; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8912
+        hash: "d1f2fc2133f3d6554e41982196662c2a"
+    }
+    Frame {
+        msec: 8928
+        hash: "d1f2fc2133f3d6554e41982196662c2a"
+    }
+    Frame {
+        msec: 8944
+        hash: "d1f2fc2133f3d6554e41982196662c2a"
+    }
+    Frame {
+        msec: 8960
+        hash: "d1f2fc2133f3d6554e41982196662c2a"
+    }
+    Frame {
+        msec: 8976
+        hash: "d1f2fc2133f3d6554e41982196662c2a"
+    }
+    Frame {
+        msec: 8992
+        hash: "d1f2fc2133f3d6554e41982196662c2a"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 340; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9008
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9024
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9040
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9056
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9072
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9088
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9104
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9120
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9136
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9152
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9168
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9184
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9200
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9216
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9232
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9248
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9264
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9280
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9296
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9312
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9328
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9344
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9360
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9376
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9392
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9408
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9424
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9440
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9456
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9472
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9488
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9504
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9520
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9536
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9552
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9568
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9584
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 9600
+        image: "mouseregion.9.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 339; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9616
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 336; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9632
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 332; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 326; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9648
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 320; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 312; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9664
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 292; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 283; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9680
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 261; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9696
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 252; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 243; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9712
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 225; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 207; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9728
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 189; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 169; y: 39
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9744
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 161; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 145; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9760
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 138; y: 45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9776
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 133; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 127; y: 50
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9792
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 122; y: 52
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 118; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9808
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 114; y: 57
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 110; y: 60
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9824
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 109; y: 61
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9840
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 107; y: 62
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 106; y: 63
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9856
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 103; y: 63
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 100; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9872
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 64
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 92; y: 65
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9888
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 88; y: 65
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9904
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 85; y: 66
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 67
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9920
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 79; y: 69
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 77; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9936
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 72
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9952
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 64; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9968
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 9984
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 61; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 60; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10000
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10016
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10032
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 59; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10048
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 58; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10064
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 56; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10080
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10096
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10112
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10128
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10144
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10160
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10176
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10192
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10208
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10224
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Frame {
+        msec: 10240
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 76
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 59; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10256
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 75
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10272
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 69; y: 74
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10288
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 72; y: 73
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 76; y: 73
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10304
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 80; y: 72
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10320
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 87; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 90; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10336
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 93; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10352
+        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10368
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 102; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 106; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10384
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 108; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 110; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10400
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 113; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 115; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10416
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 118; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 121; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10432
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 123; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10448
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 126; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 128; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10464
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 130; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 132; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10480
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 133; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10496
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 134; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10512
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10528
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 135; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 136; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10544
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 137; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 138; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10560
+        image: "mouseregion.10.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 140; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 10576
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10592
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10608
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10624
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10640
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10656
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10672
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10688
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10704
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10720
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10736
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10752
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10768
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10784
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10800
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10816
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10832
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10848
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10864
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10880
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10896
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10912
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10928
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10944
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10960
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10976
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 10992
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11008
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11024
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11040
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11056
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11072
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11088
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11104
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11120
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11136
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11152
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11168
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11184
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11200
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11216
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11232
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11248
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11264
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11280
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11296
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11312
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11328
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11344
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11360
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11376
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11392
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11408
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11424
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11440
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11456
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11472
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11488
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11504
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11520
+        image: "mouseregion.11.png"
+    }
+    Frame {
+        msec: 11536
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11552
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11568
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11584
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11600
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11616
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11632
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11648
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11664
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11680
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11696
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11712
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 2
+        button: 2
+        buttons: 2
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11728
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11744
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11760
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11776
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11792
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11808
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11824
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 2
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 11840
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11856
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11872
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11888
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11904
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11920
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11936
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11952
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11968
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 11984
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12000
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12016
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12032
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12048
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 4
+        button: 2
+        buttons: 2
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12064
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12080
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12096
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12112
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12128
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12144
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12160
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12176
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12192
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12208
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 2
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12224
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12240
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12256
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12272
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12288
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12304
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12320
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12336
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12352
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12368
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12384
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12400
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12416
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12432
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12448
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 2
+        button: 2
+        buttons: 3
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12464
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12480
+        image: "mouseregion.12.png"
+    }
+    Frame {
+        msec: 12496
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12512
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12528
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 2
+        buttons: 1
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12544
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12560
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12576
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12592
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12608
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12624
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12640
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12656
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12672
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12688
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12704
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12720
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12736
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12752
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12768
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12784
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12800
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12816
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12832
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12848
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12864
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12880
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12896
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12912
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12928
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12944
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12960
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 12976
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 12992
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13008
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13024
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13040
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13056
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13072
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13088
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13104
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13120
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13136
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13152
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13168
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13184
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13200
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13216
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13232
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13248
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13264
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13280
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13296
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13312
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13328
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13344
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13360
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13376
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13392
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13408
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13424
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13440
+        image: "mouseregion.13.png"
+    }
+    Frame {
+        msec: 13456
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13472
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13488
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13504
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13520
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13536
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13552
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13568
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13584
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13600
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13616
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13632
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 2
+        button: 2
+        buttons: 2
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13648
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13664
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13680
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13696
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13712
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 2
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13728
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13744
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13760
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13776
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13792
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13808
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 4
+        button: 2
+        buttons: 2
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13824
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13840
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13856
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13872
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13888
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13904
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 3
+        button: 2
+        buttons: 0
+        x: 141; y: 71
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 13920
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13936
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13952
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13968
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 13984
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14000
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14016
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14032
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14048
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14064
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14080
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14096
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14112
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14128
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14144
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14160
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14176
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 141; y: 70
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 148; y: 68
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14192
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 152; y: 68
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 158; y: 68
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14208
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 164; y: 68
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14224
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 171; y: 66
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 187; y: 62
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 205; y: 60
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14240
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 223; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14256
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 239; y: 52
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 255; y: 46
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14272
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 269; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 285; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14288
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 299; y: 28
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 313; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14304
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 320; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 326; y: 15
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14320
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 340; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 14336
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14352
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14368
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14384
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14400
+        image: "mouseregion.14.png"
+    }
+    Frame {
+        msec: 14416
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14432
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14448
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14464
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14480
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14496
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14512
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14528
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14544
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14560
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14576
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14592
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14608
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14624
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14640
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14656
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14672
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14688
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14704
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14720
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14736
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14752
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14768
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14784
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14800
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14816
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14832
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14848
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14864
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14880
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14896
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14912
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+    Frame {
+        msec: 14928
+        hash: "194ebac4ae7d95bf427f8161885a13e1"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml b/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml
new file mode 100644
index 0000000..dbb2a24
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle{
+    width:400
+    height:440
+    color: "white"
+    Rectangle{
+        id: draggable
+        width:40; height:40; color: "lightsteelblue"
+            y:20
+        MouseArea{
+            anchors.fill: parent
+            drag.target: draggable
+            drag.axis: "XandYAxis"
+            drag.minimumX: 0
+            drag.maximumX: 360
+            drag.minimumY: 20
+            drag.maximumY: 400
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/mouseregion.qml b/tests/auto/declarative/visual/qdeclarativemouseregion/mouseregion.qml
new file mode 100644
index 0000000..3c722d0
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/mouseregion.qml
@@ -0,0 +1,124 @@
+import Qt 4.6
+
+Rectangle {
+    id: root
+    width: 400
+    height: 100
+
+    // Left click on me
+    Rectangle {
+        width: 98; height: 48
+        color: "red"
+        MouseArea {
+            id: mr1
+            anchors.fill: parent
+            enabled: false
+            onClicked: { parent.color = "blue"; root.error = "mr1 should ignore presses"; }
+        }
+    }
+
+    // Left click, then right click
+    Rectangle {
+        x: 100
+        width: 98; height: 48
+        color: "red"
+        MouseArea {
+            id: mr2
+            anchors.fill: parent
+            acceptedButtons: Qt.RightButton
+            onClicked: {
+                if (mouse.button == Qt.RightButton) {
+                    parent.color = "blue";
+                } else {
+                    parent.color = "green";
+                    root.error = "mr1 should ignore presses";
+                }
+            }
+        }
+    }
+
+    // press and hold me
+    Rectangle {
+        x: 200
+        width: 98; height: 48
+        color: "red"
+        MouseArea {
+            id: mr3
+            anchors.fill: parent
+            onPressAndHold: {
+                parent.color = "blue";
+            }
+        }
+    }
+
+    // click me
+    Rectangle {
+        x: 300
+        width: 98; height: 48
+        color: "red"
+        MouseArea {
+            id: mr4
+            anchors.fill: parent
+            onPressed: {
+                parent.color = "blue";
+            }
+            onReleased: {
+                parent.color = "red";
+            }
+        }
+    }
+
+    // move into and out of me
+    Rectangle {
+        x: 0
+        y: 50
+        width: 98; height: 48
+        color: "red"
+        MouseArea {
+            id: mr5
+            anchors.fill: parent
+            hoverEnabled: true
+            onEntered: {
+                parent.color = "blue";
+            }
+            onExited: {
+                parent.color = "green";
+            }
+        }
+    }
+
+    // click, then double click me
+    Rectangle {
+        x: 100
+        y: 50
+        width: 98; height: 48
+        color: "red"
+        MouseArea {
+            id: mr6
+            anchors.fill: parent
+            onClicked: {
+                parent.color = "blue";
+            }
+            onDoubleClicked: {
+                parent.color = "green";
+            }
+        }
+    }
+
+    // click, then double click me - nothing should happen
+    Rectangle {
+        x: 100
+        y: 50
+        width: 98; height: 48
+        color: "red"
+        MouseArea {
+            id: mr7
+            anchors.fill: parent
+            enabled: false
+            onClicked: { parent.color = "blue" }
+            onPressed: { parent.color = "yellow" }
+            onReleased: { parent.color = "cyan" }
+            onDoubleClicked: { parent.color = "green" }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.0.png b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.0.png
new file mode 100644
index 0000000..7321d95
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.1.png b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.1.png
new file mode 100644
index 0000000..49d2a5a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.2.png b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.2.png
new file mode 100644
index 0000000..6fe14b7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.qml b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.qml
new file mode 100644
index 0000000..d766dc6
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.qml
@@ -0,0 +1,775 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b4df49cbd7cf972af9879399808f6c53"
+    }
+    Frame {
+        msec: 32
+        hash: "43c0ad5826e8058260951f063f0851ab"
+    }
+    Frame {
+        msec: 48
+        hash: "55eb2c9939514338e7ef58c9276fc223"
+    }
+    Frame {
+        msec: 64
+        hash: "6a1bbb91bf450547d6100b6e61a98f6d"
+    }
+    Frame {
+        msec: 80
+        hash: "bdb9b8cab70c72d99aba830eb8e8913b"
+    }
+    Frame {
+        msec: 96
+        hash: "71a0e046bc68183b830df9dafd8fa147"
+    }
+    Frame {
+        msec: 112
+        hash: "e7228e0ed77e05c661282c2d2fe88b3e"
+    }
+    Frame {
+        msec: 128
+        hash: "93a4c3e501b05844f687a2dd1754aad2"
+    }
+    Frame {
+        msec: 144
+        hash: "1856ac86313c16bf4874130d9a48ff45"
+    }
+    Frame {
+        msec: 160
+        hash: "3637d8dad4f44c938f91b0800bd9fb2f"
+    }
+    Frame {
+        msec: 176
+        hash: "c5ace4ede38d29363d69c6b4b2f9349f"
+    }
+    Frame {
+        msec: 192
+        hash: "a5d832d02f4a635052817654df90caba"
+    }
+    Frame {
+        msec: 208
+        hash: "9ebf8bea8abe7ac209d47214a87f8fc0"
+    }
+    Frame {
+        msec: 224
+        hash: "35b8f5cb18284867be8d27d601394a2b"
+    }
+    Frame {
+        msec: 240
+        hash: "a2c4a6063f219af6f2b29b2d21a4265d"
+    }
+    Frame {
+        msec: 256
+        hash: "27f25ace7b8e93c55638ed99f49b821c"
+    }
+    Frame {
+        msec: 272
+        hash: "4f6511bfbbd8113195a7597eb6dfb219"
+    }
+    Frame {
+        msec: 288
+        hash: "6a696159cdbb51a67064c600124535d1"
+    }
+    Frame {
+        msec: 304
+        hash: "6cd667eb352256dbb728532634e7ffd0"
+    }
+    Frame {
+        msec: 320
+        hash: "28fa16c8936bf86a8426ded306aa2b8c"
+    }
+    Frame {
+        msec: 336
+        hash: "061fecdb88733e3e51c5823571bc4d19"
+    }
+    Frame {
+        msec: 352
+        hash: "f64530f638b3d18d56593e0b7c884f5d"
+    }
+    Frame {
+        msec: 368
+        hash: "8530cf40739890dc7401fad65a6325bf"
+    }
+    Frame {
+        msec: 384
+        hash: "0abc555552e7256dbc424b2eac5c95f2"
+    }
+    Frame {
+        msec: 400
+        hash: "64aeae59a8c958dfc62d92636b2f5217"
+    }
+    Frame {
+        msec: 416
+        hash: "3e0f50f5bee017220b129d06b2acde2c"
+    }
+    Frame {
+        msec: 432
+        hash: "e676c01ff2e35bdfe674be67d49945b1"
+    }
+    Frame {
+        msec: 448
+        hash: "bc060b480aab94fd440fd27f5beb7383"
+    }
+    Frame {
+        msec: 464
+        hash: "79c79f723de72315e63da8a7cbe1b425"
+    }
+    Frame {
+        msec: 480
+        hash: "7bf93c2697af75d0f862a47d57cd6a7f"
+    }
+    Frame {
+        msec: 496
+        hash: "7641b9e233f4aabd99bcd985ce1d51ae"
+    }
+    Frame {
+        msec: 512
+        hash: "b596a28cb67617d37408bd25d947d088"
+    }
+    Frame {
+        msec: 528
+        hash: "f2c5cdf15c27b05c0ea97675ddc41757"
+    }
+    Frame {
+        msec: 544
+        hash: "eae5eb8c41a1d6d75446618518490f20"
+    }
+    Frame {
+        msec: 560
+        hash: "0be5e9a6d857fe1a262524801c69490d"
+    }
+    Frame {
+        msec: 576
+        hash: "65478b8c4d932c10924f70462a662254"
+    }
+    Frame {
+        msec: 592
+        hash: "7b034f3c98e8eb38eec11cf3c2aa0804"
+    }
+    Frame {
+        msec: 608
+        hash: "5bbc8eed41500ccbc820cfb38794232f"
+    }
+    Frame {
+        msec: 624
+        hash: "1b39d555ca8932b40efd769c4ba74d3f"
+    }
+    Frame {
+        msec: 640
+        hash: "f9a38e12becbce400191e22f1d22427c"
+    }
+    Frame {
+        msec: 656
+        hash: "cbc27c72517d76edfc2d3692cd83f151"
+    }
+    Frame {
+        msec: 672
+        hash: "4a883a5aed05f0bbcefcefea6ef56df6"
+    }
+    Frame {
+        msec: 688
+        hash: "7a30ea30c0619c87c96bcaba916c64df"
+    }
+    Frame {
+        msec: 704
+        hash: "33cd0797b6d229592ed53117fcaaa898"
+    }
+    Frame {
+        msec: 720
+        hash: "21178ef9366c8a65ecb9e21d584573b0"
+    }
+    Frame {
+        msec: 736
+        hash: "fe75beac8681fdac8a2b79c9c7267128"
+    }
+    Frame {
+        msec: 752
+        hash: "df26a23d394e053417de86309683c5e0"
+    }
+    Frame {
+        msec: 768
+        hash: "411594a1ed7c351cb872e0a6f3081b1b"
+    }
+    Frame {
+        msec: 784
+        hash: "b4b639f204cfed9e1fec872e4de115c2"
+    }
+    Frame {
+        msec: 800
+        hash: "4d801e2f4848399c011d60264720b912"
+    }
+    Frame {
+        msec: 816
+        hash: "4f28c7b154853ff78cdefb5a5ac9d2b7"
+    }
+    Frame {
+        msec: 832
+        hash: "cc6d4283b0d7bf9f579637575d5e1fef"
+    }
+    Frame {
+        msec: 848
+        hash: "8edc371d23d01be547990074b5e640af"
+    }
+    Frame {
+        msec: 864
+        hash: "874845d7178e6cd8369f21379060f561"
+    }
+    Frame {
+        msec: 880
+        hash: "98fb6d79990775385603fb1a50ab5186"
+    }
+    Frame {
+        msec: 896
+        hash: "d15539efc27baabb5a74f464b152d266"
+    }
+    Frame {
+        msec: 912
+        hash: "fc44d091d6689e8870162a6d29b6d287"
+    }
+    Frame {
+        msec: 928
+        hash: "a3c964f4bf524e22092b1650df43375a"
+    }
+    Frame {
+        msec: 944
+        hash: "ca203fd630ec1eadea37cf36bd30ba40"
+    }
+    Frame {
+        msec: 960
+        image: "particles.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "2e0630818c04fc6c259eec8561c645cd"
+    }
+    Frame {
+        msec: 992
+        hash: "a7b1f6305ddcf4a338e1a96ea31a5341"
+    }
+    Frame {
+        msec: 1008
+        hash: "23a5013a8f9407d06ac6fd0c1e961743"
+    }
+    Frame {
+        msec: 1024
+        hash: "9de73decddaab4269bd33efdb21278a3"
+    }
+    Frame {
+        msec: 1040
+        hash: "7582c26b45dd11c262f51b387af89cb2"
+    }
+    Frame {
+        msec: 1056
+        hash: "650e0d395f1d1f2ddda8711089d85511"
+    }
+    Frame {
+        msec: 1072
+        hash: "9ff84e81219aa6bb7ab534b2a47a3930"
+    }
+    Frame {
+        msec: 1088
+        hash: "11e255273e8ca4716047fb52636f0c3e"
+    }
+    Frame {
+        msec: 1104
+        hash: "b2fcbefd13db3c765183b1eefc2ca0bc"
+    }
+    Frame {
+        msec: 1120
+        hash: "7150aff523c0d480702f6a326699cb65"
+    }
+    Frame {
+        msec: 1136
+        hash: "63886c15107a2a7d639069cd81c3cd07"
+    }
+    Frame {
+        msec: 1152
+        hash: "1ec1fc30bbb5f43a1d6d36bce345f569"
+    }
+    Frame {
+        msec: 1168
+        hash: "34060cbc31ce1fbf406cbb595312c609"
+    }
+    Frame {
+        msec: 1184
+        hash: "6f3a04c7f411785956e640aa630f7ac4"
+    }
+    Frame {
+        msec: 1200
+        hash: "d7bdb7e170b6f193eaf4b07c01b4dc6b"
+    }
+    Frame {
+        msec: 1216
+        hash: "6ca02c0d9cfeb4b1932f7ad1feac9850"
+    }
+    Frame {
+        msec: 1232
+        hash: "d446c7b185361de5c615a17ac1fee607"
+    }
+    Frame {
+        msec: 1248
+        hash: "bc2faf5b7b2972f155954e4e685e80ae"
+    }
+    Frame {
+        msec: 1264
+        hash: "2bf26cedc76aea4a6d9744b7dd935db8"
+    }
+    Frame {
+        msec: 1280
+        hash: "accbee9d0f8cf73ef72aa7bfb49b3fa5"
+    }
+    Frame {
+        msec: 1296
+        hash: "933eb2e46f42e212bdfc515d30f663d3"
+    }
+    Frame {
+        msec: 1312
+        hash: "7495318c893dbb22771b53e93c7614e8"
+    }
+    Frame {
+        msec: 1328
+        hash: "894fe23c1b3543451293c047b640c4bb"
+    }
+    Frame {
+        msec: 1344
+        hash: "9b7179ef059ee82ca4a383f536f47a42"
+    }
+    Frame {
+        msec: 1360
+        hash: "5ec1a5bfac2473efdcad7dba0da4015c"
+    }
+    Frame {
+        msec: 1376
+        hash: "2bd64528e83260a80e7f2843e2c34a19"
+    }
+    Frame {
+        msec: 1392
+        hash: "16bf64a9bf6b4bc09b108c65d074b5f2"
+    }
+    Frame {
+        msec: 1408
+        hash: "c33eaa717ba63655f375499058b1be55"
+    }
+    Frame {
+        msec: 1424
+        hash: "d080f4591f9fd59745bf850525590849"
+    }
+    Frame {
+        msec: 1440
+        hash: "921585c88ec133c83c07650745bb4441"
+    }
+    Frame {
+        msec: 1456
+        hash: "f037b28137b22a0c91fc71fc6626475a"
+    }
+    Frame {
+        msec: 1472
+        hash: "e10b3c432a230d5509c2fa7df48b56c9"
+    }
+    Frame {
+        msec: 1488
+        hash: "ac02c7b7e68ee8cfad1fe556020e93d8"
+    }
+    Frame {
+        msec: 1504
+        hash: "12d59e70dedfa0c741afed9b98cb9a3a"
+    }
+    Frame {
+        msec: 1520
+        hash: "a9aa635ccde26829d7e1cdc29fcce8d1"
+    }
+    Frame {
+        msec: 1536
+        hash: "f571b3da827b884ad036dade8ad2fe37"
+    }
+    Frame {
+        msec: 1552
+        hash: "1ffa8d7512e9001cbc78b28451133b44"
+    }
+    Frame {
+        msec: 1568
+        hash: "2ef4b10f2eafd71dfde15f7f00e923c6"
+    }
+    Frame {
+        msec: 1584
+        hash: "09b3bc232a134eae5ae14c0336f508ba"
+    }
+    Frame {
+        msec: 1600
+        hash: "ebadb5c6b4986c865f7f8ef232680b7e"
+    }
+    Frame {
+        msec: 1616
+        hash: "26621991073510e9a95e3b208e3ee56e"
+    }
+    Frame {
+        msec: 1632
+        hash: "f18e97f13c06f3c5368edf851f19f401"
+    }
+    Frame {
+        msec: 1648
+        hash: "3c322dbbf5ecfe1de56595dcb7d949e1"
+    }
+    Frame {
+        msec: 1664
+        hash: "50058d1bb992a6d0601c9d5490149936"
+    }
+    Frame {
+        msec: 1680
+        hash: "4cc78f56f13478ec21a4a0d6b22f956b"
+    }
+    Frame {
+        msec: 1696
+        hash: "d765cd86560dff3faa5a3c902512c74c"
+    }
+    Frame {
+        msec: 1712
+        hash: "ad983068c2149b0c06da3b89a5d94d24"
+    }
+    Frame {
+        msec: 1728
+        hash: "e6da7260001771fc00c472bccae641fe"
+    }
+    Frame {
+        msec: 1744
+        hash: "71778ad8a61ecb0f78f7234ecf0d1d97"
+    }
+    Frame {
+        msec: 1760
+        hash: "6b2209ea5f7f17c2cd868986f0c907d9"
+    }
+    Frame {
+        msec: 1776
+        hash: "6513c82829ef7e7c9461dcf5b50f675f"
+    }
+    Frame {
+        msec: 1792
+        hash: "0172c5bdf96c8bceab25a6c82bdbe527"
+    }
+    Frame {
+        msec: 1808
+        hash: "64b53bf1c1988d3a799b564089f8e63f"
+    }
+    Frame {
+        msec: 1824
+        hash: "a1bdea4771ec9719cfe88f4e827bd005"
+    }
+    Frame {
+        msec: 1840
+        hash: "263de376cee2ba7701a7ca116bc1be81"
+    }
+    Frame {
+        msec: 1856
+        hash: "9795dada7f09d7d4d40df858dea8bc70"
+    }
+    Frame {
+        msec: 1872
+        hash: "85ea4c63fc31f79423cb509f6c6d4faa"
+    }
+    Frame {
+        msec: 1888
+        hash: "c86d8c4460d1e3c2f26b723dc628fe84"
+    }
+    Frame {
+        msec: 1904
+        hash: "6bf6ef1fd377bfcf0b93baa7f28e1d3d"
+    }
+    Frame {
+        msec: 1920
+        image: "particles.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "57b8a48bed9375b74391950c28e611da"
+    }
+    Frame {
+        msec: 1952
+        hash: "70203655bc832998529071d7f665ecbe"
+    }
+    Frame {
+        msec: 1968
+        hash: "9ab9808d495f907a255d85fbd82491e2"
+    }
+    Frame {
+        msec: 1984
+        hash: "297570136b058ba43e883b0aef20d82f"
+    }
+    Frame {
+        msec: 2000
+        hash: "0c2f15ce83e2d961ec36299b13890709"
+    }
+    Frame {
+        msec: 2016
+        hash: "6d57b6dcb1dbfa35245d79ef36ca49b2"
+    }
+    Frame {
+        msec: 2032
+        hash: "12a71804fd71991706d8a39b676d1628"
+    }
+    Frame {
+        msec: 2048
+        hash: "f6a9e1b0b498fc576f3eadeb86c08fe9"
+    }
+    Frame {
+        msec: 2064
+        hash: "051c2ed34cbef82d44aec4841a33f086"
+    }
+    Frame {
+        msec: 2080
+        hash: "12b89590b20fff8d6c94dde40a5d6185"
+    }
+    Frame {
+        msec: 2096
+        hash: "7a29cd11ddb042203465a9522ff951ce"
+    }
+    Frame {
+        msec: 2112
+        hash: "4853f364261ab8e1c9d35cfe42efb385"
+    }
+    Frame {
+        msec: 2128
+        hash: "7149ab3ed649cac9cf662be7c434056f"
+    }
+    Frame {
+        msec: 2144
+        hash: "bbe199700474dda156355d31ac09be39"
+    }
+    Frame {
+        msec: 2160
+        hash: "a3f3fbbe844b8c6fb8cb8bbcc17120e3"
+    }
+    Frame {
+        msec: 2176
+        hash: "e9a04cfe9e8c50f74978fbd4ecce536a"
+    }
+    Frame {
+        msec: 2192
+        hash: "0df1d4211f770cdd7b8a98ea476c6f42"
+    }
+    Frame {
+        msec: 2208
+        hash: "a6837afb43663b9473db2378b1a9f989"
+    }
+    Frame {
+        msec: 2224
+        hash: "691ea67f3b84b8dda449c2a8e86b1087"
+    }
+    Frame {
+        msec: 2240
+        hash: "16d18947637c63662b9a502c493f06ec"
+    }
+    Frame {
+        msec: 2256
+        hash: "8f9207d404da08706e150f3b64d0088d"
+    }
+    Frame {
+        msec: 2272
+        hash: "48ad430e38cdc34845a834cfb9ea70ef"
+    }
+    Frame {
+        msec: 2288
+        hash: "1252cfb294ae99c40b03dd021160553f"
+    }
+    Frame {
+        msec: 2304
+        hash: "b1d5e752fbe03c95ee0dc7bbdf6fb9f6"
+    }
+    Frame {
+        msec: 2320
+        hash: "2282cb42ef0c812ba27e33ed0f962a84"
+    }
+    Frame {
+        msec: 2336
+        hash: "42fc82c8d40d383b3cf31a741a4358c5"
+    }
+    Frame {
+        msec: 2352
+        hash: "368c1ffa2deb1911929f1769e31c8017"
+    }
+    Frame {
+        msec: 2368
+        hash: "8693bdbde404e36970943ac6b650ca00"
+    }
+    Frame {
+        msec: 2384
+        hash: "57609613c336029b60da428d48842a4e"
+    }
+    Frame {
+        msec: 2400
+        hash: "b61dafe9e87421d3fcf8cb9ff0e7a41b"
+    }
+    Frame {
+        msec: 2416
+        hash: "c8c34d1d82bef418ef97f52cb9773cf4"
+    }
+    Frame {
+        msec: 2432
+        hash: "aa756c09717dc02e81e76511b4c58f60"
+    }
+    Frame {
+        msec: 2448
+        hash: "96e75c5ce1b5393f6cc46fbbe0a67689"
+    }
+    Frame {
+        msec: 2464
+        hash: "fb5febae411f43a6cd218b03b36f5018"
+    }
+    Frame {
+        msec: 2480
+        hash: "889870fa67784261e7b73b7d0a53324e"
+    }
+    Frame {
+        msec: 2496
+        hash: "fb124d4ebee6457f2137f07954619912"
+    }
+    Frame {
+        msec: 2512
+        hash: "258ae87f78805c555e0ed802c5123eeb"
+    }
+    Frame {
+        msec: 2528
+        hash: "2e730872c37f118a03864d23ebf7bab3"
+    }
+    Frame {
+        msec: 2544
+        hash: "381386302f210932bc7d44247a48f13c"
+    }
+    Frame {
+        msec: 2560
+        hash: "306f8e6d183eb080da3375d65f2491f0"
+    }
+    Frame {
+        msec: 2576
+        hash: "39862f236aabf362d0a07ba64eb212e1"
+    }
+    Frame {
+        msec: 2592
+        hash: "57452ecfea80ebd4d9fd23f8efbb34f2"
+    }
+    Frame {
+        msec: 2608
+        hash: "64bd12d4f6e32f19abef79289673c2fe"
+    }
+    Frame {
+        msec: 2624
+        hash: "56340d636f4df7e5f68e84c1d8388429"
+    }
+    Frame {
+        msec: 2640
+        hash: "795cd97d4be294fa6157f23793861ec3"
+    }
+    Frame {
+        msec: 2656
+        hash: "4be9fd5314ad6721a0ddf5a5dc51ccee"
+    }
+    Frame {
+        msec: 2672
+        hash: "3349b775c329db022bf0414b9ed57466"
+    }
+    Frame {
+        msec: 2688
+        hash: "587b7070836063f9d138c4a4ee8da8bb"
+    }
+    Frame {
+        msec: 2704
+        hash: "5bb078819bef7695c9af1bd4b544a26a"
+    }
+    Frame {
+        msec: 2720
+        hash: "799c05999713e8b29f7d2917f515d2c2"
+    }
+    Frame {
+        msec: 2736
+        hash: "41bb926661acd8e21300f4933734748a"
+    }
+    Frame {
+        msec: 2752
+        hash: "2ead23d38a2f1834c7688a9657d9d7cc"
+    }
+    Frame {
+        msec: 2768
+        hash: "196309eac81adea21630dda19947ef5e"
+    }
+    Frame {
+        msec: 2784
+        hash: "cf414b2004712581f11f27890745c761"
+    }
+    Frame {
+        msec: 2800
+        hash: "6b2a6837da878fa8f3811b2045e098b1"
+    }
+    Frame {
+        msec: 2816
+        hash: "7390cfdef1d4bc194b86854b1947f15d"
+    }
+    Frame {
+        msec: 2832
+        hash: "9e4543fcf65a56edfbcaf46805343071"
+    }
+    Frame {
+        msec: 2848
+        hash: "3a886e2ed813eb7d44d0cd67eb5dee31"
+    }
+    Frame {
+        msec: 2864
+        hash: "625baed6cbf3a58b32060810be53d0b6"
+    }
+    Frame {
+        msec: 2880
+        image: "particles.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "484666ad104cee644c6a7e8ec0c4b10e"
+    }
+    Frame {
+        msec: 2912
+        hash: "41abe2e2d92b293407141d0333d7d04a"
+    }
+    Frame {
+        msec: 2928
+        hash: "953c03834bd3b50798b77c0c6bb0f4a8"
+    }
+    Frame {
+        msec: 2944
+        hash: "a076463868003c62df3ee5147ffd4660"
+    }
+    Frame {
+        msec: 2960
+        hash: "b389b5c9ed31816dd562a8f1332d28c9"
+    }
+    Frame {
+        msec: 2976
+        hash: "246706829939a2619d64fad63e424fdb"
+    }
+    Frame {
+        msec: 2992
+        hash: "d5e644f16bde52c566191a054a1279e5"
+    }
+    Frame {
+        msec: 3008
+        hash: "10b2e99d2e08939b75c24a6bbf481858"
+    }
+    Frame {
+        msec: 3024
+        hash: "732a7bb0009f394f0039e09594362c75"
+    }
+    Frame {
+        msec: 3040
+        hash: "261f38ce42a8a8c86daadd497ecfad07"
+    }
+    Frame {
+        msec: 3056
+        hash: "8b66ae6261db386d6c4e88d0146db090"
+    }
+    Frame {
+        msec: 3072
+        hash: "dc8dba79e4466059c29725084cf801bb"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml b/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml
new file mode 100644
index 0000000..2d481c9
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml
@@ -0,0 +1,54 @@
+import Qt 4.6
+
+Rectangle {
+    width: 640; height: 480; color: "black"
+
+    Particles { id:particlesAnotEmitting
+        y:60; width: 260; height:30; source: "star.png";
+        lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
+        velocity:30; velocityDeviation:10; emissionRate: 0
+        ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
+    }
+    Particles { id:particlesA
+        y:0; width: 260; height:30; source: "star.png";
+        lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
+        velocity:30; velocityDeviation:10; emissionRate: 10
+        ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
+    }
+
+    Particles { id:particlesB
+        y:280; x:180; width:1; height:1; lifeSpan:1000; source: "star.png"
+        count: 100; angle:270; angleDeviation:45; velocity:50; velocityDeviation:30;
+        emissionRate: 0
+        ParticleMotionGravity { yattractor: 1000; xattractor:0; acceleration:25 }
+    }
+
+        Timer { running: true; interval: 1000; repeat: true; onTriggered: particlesB.burst(200, 2000); }
+
+    Column{
+        x: 340;
+        Repeater{
+            model: 5
+            delegate: Component{
+                Item{
+                    width: 100; height: 100
+                    Rectangle{
+                        color: "blue"
+                        width: 2; height: 2;
+                        x: 49; y:49;
+                    }
+                    Particles{
+                        x: 50; y:50; width: 0; height: 0;
+                        fadeInDuration: 0; fadeOutDuration: 0
+                        lifeSpan: 1000; lifeSpanDeviation:0;
+                        source: "star.png"
+                        count: -1; emissionRate: 120;
+                        emissionVariance: index/2;
+                        velocity: 250; velocityDeviation: 0;
+                        angle: 0; angleDeviation: 0;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativeparticles/star.png b/tests/auto/declarative/visual/qdeclarativeparticles/star.png
new file mode 100644
index 0000000..defbde5
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativeparticles/star.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.0.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.0.png
new file mode 100644
index 0000000..18c8a9e
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.1.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.1.png
new file mode 100644
index 0000000..e86acb4
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.2.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.2.png
new file mode 100644
index 0000000..17990b7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.3.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.3.png
new file mode 100644
index 0000000..18c8a9e
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.4.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.4.png
new file mode 100644
index 0000000..18c8a9e
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.5.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.5.png
new file mode 100644
index 0000000..8636f8f
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.6.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.6.png
new file mode 100644
index 0000000..fa7c4b6
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.qml b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.qml
new file mode 100644
index 0000000..b8ff925
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.qml
@@ -0,0 +1,2303 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 32
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 48
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 64
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 80
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 96
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 112
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 128
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 144
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 160
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 176
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 192
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 208
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 224
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 240
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 256
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 272
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 288
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 304
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 320
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 336
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 352
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 368
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 384
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 400
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 416
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 432
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 448
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 464
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 480
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 496
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 512
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 528
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 544
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 560
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 576
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 592
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 608
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 624
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 640
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 656
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 672
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 688
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 704
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 720
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 736
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 752
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 768
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 784
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 800
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 816
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 832
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 848
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 864
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 880
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 896
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 912
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 928
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 944
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 960
+        image: "test-pathview-2.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 992
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 1008
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 1024
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 1040
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 562; y: 250
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1056
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 557; y: 251
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1072
+        hash: "1ed6fa56736cf7cb2f99b5d362974463"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 544; y: 254
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1088
+        hash: "24f3dd6c49dd8b19cd0c387409405e18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 534; y: 258
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1104
+        hash: "08c828e7fdfba4252fa7a9fb06eb728e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 511; y: 267
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1120
+        hash: "b76110faf8520f52128b5e1af8f2b838"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 499; y: 272
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1136
+        hash: "5f56acb5f39ac291cc8e73c0268df214"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 473; y: 281
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1152
+        hash: "840ee0c0d8ea94e22e783a15687f979d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 459; y: 285
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1168
+        hash: "69827007bbdf5a360ccc34a016315113"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 446; y: 288
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1184
+        hash: "2437beb8f9cb39b125611fb186bad820"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 433; y: 290
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 433; y: 290
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1200
+        hash: "df07c389b26fc191234c70b97bfaa432"
+    }
+    Frame {
+        msec: 1216
+        hash: "8d4e23f4e91d0e0df9d87c3171d5971f"
+    }
+    Frame {
+        msec: 1232
+        hash: "dd79837aefeabffa7184be07f2a98969"
+    }
+    Frame {
+        msec: 1248
+        hash: "2d9bb2aaf4b882902f090ff0c89053c8"
+    }
+    Frame {
+        msec: 1264
+        hash: "b1ec9adbb026d8002a7f16fe9a8d56d2"
+    }
+    Frame {
+        msec: 1280
+        hash: "43b23d6e1aeeb36350c3530650e9156f"
+    }
+    Frame {
+        msec: 1296
+        hash: "03f231597c4d5010ee71c74217f2483d"
+    }
+    Frame {
+        msec: 1312
+        hash: "8607c7412a5a1b4ea1522f28c465a83e"
+    }
+    Frame {
+        msec: 1328
+        hash: "671e80e290bec997eb36320ff76fdccf"
+    }
+    Frame {
+        msec: 1344
+        hash: "5f6717112bd45e5ebe194e0f87d12be6"
+    }
+    Frame {
+        msec: 1360
+        hash: "ca8e33c7a5428d70ae13cb64e5098a48"
+    }
+    Frame {
+        msec: 1376
+        hash: "86e60eb395f66bbaa1ec07b3e07013c0"
+    }
+    Frame {
+        msec: 1392
+        hash: "342fa6ddc02d0a793e97a79ba8882415"
+    }
+    Frame {
+        msec: 1408
+        hash: "a907fbcc47807d4eb6d66e070ea7f2de"
+    }
+    Frame {
+        msec: 1424
+        hash: "04838f8b495bed6d050cbe54d00aad31"
+    }
+    Frame {
+        msec: 1440
+        hash: "d485534916473ea6c4612230c5a95421"
+    }
+    Frame {
+        msec: 1456
+        hash: "1d3da7cc5b9120724645558584f2f0f3"
+    }
+    Frame {
+        msec: 1472
+        hash: "c271f057d5f1745e910b2b407c52a4f3"
+    }
+    Frame {
+        msec: 1488
+        hash: "050d1814a9ced514db6cfd2732eb76be"
+    }
+    Frame {
+        msec: 1504
+        hash: "cfcd21aadfe3fd611caad83920fb2432"
+    }
+    Frame {
+        msec: 1520
+        hash: "472f900ef8eef74522da3338ce7fa93e"
+    }
+    Frame {
+        msec: 1536
+        hash: "f9d892a81c6ba3b9fc4c6e76082d4fa7"
+    }
+    Frame {
+        msec: 1552
+        hash: "a3febe1c3c4585e25a410a91cc34c1fa"
+    }
+    Frame {
+        msec: 1568
+        hash: "74cd765c9d9a6fb243070b4a56a07e87"
+    }
+    Frame {
+        msec: 1584
+        hash: "469d324abbef017a99bc587bfae622b3"
+    }
+    Frame {
+        msec: 1600
+        hash: "6054ff6e658f0a5f5e313f0a724d9610"
+    }
+    Frame {
+        msec: 1616
+        hash: "67cee7ebe428c9d35f1f28274f3049d5"
+    }
+    Frame {
+        msec: 1632
+        hash: "ce6c3a1dd726eacbba6306e56121beef"
+    }
+    Frame {
+        msec: 1648
+        hash: "a7d5f703c98c0c8cd32b189a79e1fd05"
+    }
+    Frame {
+        msec: 1664
+        hash: "41cfd9982767ba904843fb73a5a0ed71"
+    }
+    Frame {
+        msec: 1680
+        hash: "388dcde17a820800237d1185372d889f"
+    }
+    Frame {
+        msec: 1696
+        hash: "3bd72585388f04d55900ccd345cd576e"
+    }
+    Frame {
+        msec: 1712
+        hash: "0e5c63b066f2b70000eca7f3aaa3a195"
+    }
+    Frame {
+        msec: 1728
+        hash: "15199f3e9f00afc76279b5bbffb78d92"
+    }
+    Frame {
+        msec: 1744
+        hash: "596ad681a3b96afbc284e3af5fd173cb"
+    }
+    Frame {
+        msec: 1760
+        hash: "e5ae2d0245fc5d74c6ea3f7dddd1ca2a"
+    }
+    Frame {
+        msec: 1776
+        hash: "0d152716f9ebe5f0fae3f5cabb20630f"
+    }
+    Frame {
+        msec: 1792
+        hash: "74afbfa464b0d19b53432fa4d5ea2804"
+    }
+    Frame {
+        msec: 1808
+        hash: "c8aa3f4738a8c07cdf2450a24c885ce6"
+    }
+    Frame {
+        msec: 1824
+        hash: "2e4e0003f1b1cb10593075862b972643"
+    }
+    Frame {
+        msec: 1840
+        hash: "acea518c7da7330ae78daf5fbfd1a423"
+    }
+    Frame {
+        msec: 1856
+        hash: "0b8d4ea6947b522c6aa9a32d9f16723e"
+    }
+    Frame {
+        msec: 1872
+        hash: "19f2aef82586817ef574a70865060997"
+    }
+    Frame {
+        msec: 1888
+        hash: "115565eb0ba3024dbf15d00ed242c389"
+    }
+    Frame {
+        msec: 1904
+        hash: "7e59425c85acf93f5bf55e139c148737"
+    }
+    Frame {
+        msec: 1920
+        image: "test-pathview-2.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "ce96601476cf55f665bef09bb1b038e2"
+    }
+    Frame {
+        msec: 1952
+        hash: "dc6eaacefe37fc709ac0bef99110f796"
+    }
+    Frame {
+        msec: 1968
+        hash: "82ad9b84425bd8e385524cb052a8fdd4"
+    }
+    Frame {
+        msec: 1984
+        hash: "608000b44ade998e225010d5ea562316"
+    }
+    Frame {
+        msec: 2000
+        hash: "ec6b4d519b7bafcf5293c2b5e6585007"
+    }
+    Frame {
+        msec: 2016
+        hash: "9895792ffa929ba6fc600949f11766b6"
+    }
+    Frame {
+        msec: 2032
+        hash: "0d2b27c9ca22520b269f93c90de08df4"
+    }
+    Frame {
+        msec: 2048
+        hash: "78a61e4565db709215b419aa56f6efab"
+    }
+    Frame {
+        msec: 2064
+        hash: "d6f2aebed062d093c00b27a52f0b14b8"
+    }
+    Frame {
+        msec: 2080
+        hash: "21b7a438ad1e835b84e5576e52abbe84"
+    }
+    Frame {
+        msec: 2096
+        hash: "703e32f43e9a71b8677d6839a0eafe06"
+    }
+    Frame {
+        msec: 2112
+        hash: "b04bea8af558de4120723fc5abd0f36c"
+    }
+    Frame {
+        msec: 2128
+        hash: "ac8e91c3b55e058ce8ff08ad6e3af9b6"
+    }
+    Frame {
+        msec: 2144
+        hash: "54846c8c70b232d05ff5eaf144f6f7d3"
+    }
+    Frame {
+        msec: 2160
+        hash: "52281806f5c80512b4bcab7f61139f74"
+    }
+    Frame {
+        msec: 2176
+        hash: "a352657ff34ef8962162c00647df343a"
+    }
+    Frame {
+        msec: 2192
+        hash: "3a0b12d1f8bf5cae8ac06289dd30d52a"
+    }
+    Frame {
+        msec: 2208
+        hash: "2c6bbcd05719f69b9a67be18de2084a6"
+    }
+    Frame {
+        msec: 2224
+        hash: "ab091484522587412b0e8aceeb8987ce"
+    }
+    Frame {
+        msec: 2240
+        hash: "13682b0d45bcbad0f011d08899085b1d"
+    }
+    Frame {
+        msec: 2256
+        hash: "3c5d6f82eafd1b04edfbcbffbdbe2177"
+    }
+    Frame {
+        msec: 2272
+        hash: "151803d70b7c3327df32c8602fcd677a"
+    }
+    Frame {
+        msec: 2288
+        hash: "78613cec5364fe3f0df84188793d8eac"
+    }
+    Frame {
+        msec: 2304
+        hash: "fc05a3cad43af35230c5ba89f6fd13c5"
+    }
+    Frame {
+        msec: 2320
+        hash: "9f826733b300c89eeb80452129505e8b"
+    }
+    Frame {
+        msec: 2336
+        hash: "8565efc5c1fb1bdf5629e3bd495bb611"
+    }
+    Frame {
+        msec: 2352
+        hash: "3b8f6e8c526ab8cce170277c378a5a69"
+    }
+    Frame {
+        msec: 2368
+        hash: "07db3bc0ab19e0ca829e89558bacf1a1"
+    }
+    Frame {
+        msec: 2384
+        hash: "ed8843024c6ac28a8c782839b362149c"
+    }
+    Frame {
+        msec: 2400
+        hash: "381a9f6564c090613aa2cd0476b95210"
+    }
+    Frame {
+        msec: 2416
+        hash: "c3fabd891fa8e27fd71df175db383667"
+    }
+    Frame {
+        msec: 2432
+        hash: "9b441792fdaa9ba9d340fc0c6a9c11bd"
+    }
+    Frame {
+        msec: 2448
+        hash: "3209c9ba69fa016370e3d56e7e1e37a4"
+    }
+    Frame {
+        msec: 2464
+        hash: "34da0a01453fbb2571b370257fd35f8e"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 591; y: 245
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 588; y: 245
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2480
+        hash: "32e6204a07c493d0a0f9f50773fe8f32"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 585; y: 245
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2496
+        hash: "2a1814768ae500ba9c24bc2e3e4de1d5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 582; y: 245
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2512
+        hash: "7cf6e3c52d12d590beafd061979a49cb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 574; y: 245
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 565; y: 246
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2528
+        hash: "c66c36642ab7f6c32b45e27de38d23b6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 553; y: 246
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2544
+        hash: "6e003380cc6fd303ae3b499863225ba5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 538; y: 246
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2560
+        hash: "a790259cea2c247493be58c6018435b9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 523; y: 247
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 523; y: 247
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2576
+        hash: "e6cce7468a27b5063821df8dbaa15c18"
+    }
+    Frame {
+        msec: 2592
+        hash: "ff8386cbe89aeac184f4a75237ef4a14"
+    }
+    Frame {
+        msec: 2608
+        hash: "1a11a90853b025837b991be40efb78f8"
+    }
+    Frame {
+        msec: 2624
+        hash: "17da10de7e2d2fcf125207e2873bdee8"
+    }
+    Frame {
+        msec: 2640
+        hash: "dfbda435d05903cc3a31f4f8f31e8985"
+    }
+    Frame {
+        msec: 2656
+        hash: "1f3753e809099f20c6289f150a096935"
+    }
+    Frame {
+        msec: 2672
+        hash: "9454afc9d70103e1f1c00eb0ad2ca534"
+    }
+    Frame {
+        msec: 2688
+        hash: "860ab90e2421a0c8faab304915b5e6f2"
+    }
+    Frame {
+        msec: 2704
+        hash: "600258507426a8c3c89e3591ee9328f1"
+    }
+    Frame {
+        msec: 2720
+        hash: "0795a607b893da2bdc0970195f3039fd"
+    }
+    Frame {
+        msec: 2736
+        hash: "e300b9109e242d85537fc3f4461eaf8e"
+    }
+    Frame {
+        msec: 2752
+        hash: "dbb84b38e2bda694f210f133dc133180"
+    }
+    Frame {
+        msec: 2768
+        hash: "2455e9de47da4db88eef35fea1dc2abe"
+    }
+    Frame {
+        msec: 2784
+        hash: "5f0c3d7e089c921a68813a48f0fd8844"
+    }
+    Frame {
+        msec: 2800
+        hash: "e6d9e7d0fdc724a6a1804bc94629cab4"
+    }
+    Frame {
+        msec: 2816
+        hash: "d177183bcbaa27ad061fd88bd037277d"
+    }
+    Frame {
+        msec: 2832
+        hash: "78dd13fa6367abd14374462d89a3d066"
+    }
+    Frame {
+        msec: 2848
+        hash: "41d12e4c362ccc99a1a04b3a09f0e68c"
+    }
+    Frame {
+        msec: 2864
+        hash: "5112700bf72aacb176e63ef054fce244"
+    }
+    Frame {
+        msec: 2880
+        image: "test-pathview-2.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "0257e67512c62ffc42a272fd304e4ed3"
+    }
+    Frame {
+        msec: 2912
+        hash: "42cd0a98aa0f3768cf77aac284072fa9"
+    }
+    Frame {
+        msec: 2928
+        hash: "811d27f89b0c434fc49e4280f85c2f27"
+    }
+    Frame {
+        msec: 2944
+        hash: "887406c50c666d08e4d98c040efae9a5"
+    }
+    Frame {
+        msec: 2960
+        hash: "27e10fa9d82920c7f761465501d44564"
+    }
+    Frame {
+        msec: 2976
+        hash: "ba67dbe0010ba2aae3ca100886b11553"
+    }
+    Frame {
+        msec: 2992
+        hash: "8064db575e2c74c0faf7782adc527a08"
+    }
+    Frame {
+        msec: 3008
+        hash: "b7fd5446ad957610ab853e0c597b9a36"
+    }
+    Frame {
+        msec: 3024
+        hash: "092b53eb50e91d74db7899328899cfd3"
+    }
+    Frame {
+        msec: 3040
+        hash: "0346065ad603b41db9365987ebe81586"
+    }
+    Frame {
+        msec: 3056
+        hash: "705083f27a338fea544c9806f0d8fcb3"
+    }
+    Frame {
+        msec: 3072
+        hash: "fc29b4888e26deec4c983e487b9bd058"
+    }
+    Frame {
+        msec: 3088
+        hash: "0ff734e0509908eba292c1814f677e5b"
+    }
+    Frame {
+        msec: 3104
+        hash: "7181d9011ddd3ad49ee95fac2e146b12"
+    }
+    Frame {
+        msec: 3120
+        hash: "4478b07b0331bb30e60f23ee74475f73"
+    }
+    Frame {
+        msec: 3136
+        hash: "514aa7a4b1230ae1701004f479eeb5f2"
+    }
+    Frame {
+        msec: 3152
+        hash: "56e51f8f36e0f1a5a4b6b21c41151375"
+    }
+    Frame {
+        msec: 3168
+        hash: "f58216f12e507a91482ded5372f960c7"
+    }
+    Frame {
+        msec: 3184
+        hash: "18e8675ca5ea7ade7e32b29f1632e1ff"
+    }
+    Frame {
+        msec: 3200
+        hash: "13ec0166cc7dd82042e596739c598a1e"
+    }
+    Frame {
+        msec: 3216
+        hash: "5cebf9afa912b17ac3161619d238e5da"
+    }
+    Frame {
+        msec: 3232
+        hash: "f096b191e347b7e2eab51b6adc1a5aac"
+    }
+    Frame {
+        msec: 3248
+        hash: "81cffc13a615ab673172912760863c08"
+    }
+    Frame {
+        msec: 3264
+        hash: "e89c7acfc07bc0eb6e9740d545400064"
+    }
+    Frame {
+        msec: 3280
+        hash: "e681f06f57d43a38acb29a3cb45e4384"
+    }
+    Frame {
+        msec: 3296
+        hash: "945bfe7808fb620dc3f7ad887183244c"
+    }
+    Frame {
+        msec: 3312
+        hash: "4d1fc53701adce4e4af87c32e6c5a8de"
+    }
+    Frame {
+        msec: 3328
+        hash: "c42bbf27e800558fab33bc6e9a0f36b9"
+    }
+    Frame {
+        msec: 3344
+        hash: "5f48f59812b17a9be466f0601f0ed0df"
+    }
+    Frame {
+        msec: 3360
+        hash: "f3a3f645115077b7aeb66465280b7a16"
+    }
+    Frame {
+        msec: 3376
+        hash: "d1c295b2157001ff1020515f4b2aceaa"
+    }
+    Frame {
+        msec: 3392
+        hash: "e5f364e0e4bd75dd04280f6b6f48b8ba"
+    }
+    Frame {
+        msec: 3408
+        hash: "f439df4b5907ba0201c0dad934115721"
+    }
+    Frame {
+        msec: 3424
+        hash: "2e7eb0e999792f3aa87c63865f68d26b"
+    }
+    Frame {
+        msec: 3440
+        hash: "45d3ccb3b03adc8323445207d2dca502"
+    }
+    Frame {
+        msec: 3456
+        hash: "c345f92a25406e33256bfe47dc7f72f3"
+    }
+    Frame {
+        msec: 3472
+        hash: "dcb2663d27d644c0b50aa7386aa9d488"
+    }
+    Frame {
+        msec: 3488
+        hash: "ebe4b9eaf39676bcdd968f8517efa222"
+    }
+    Frame {
+        msec: 3504
+        hash: "deb3e3e6fdf8fe18de907f88822538e8"
+    }
+    Frame {
+        msec: 3520
+        hash: "30e8ab0e6cf32a45190c4b29e458d858"
+    }
+    Frame {
+        msec: 3536
+        hash: "059e6f57c2c78a25ab8b515c878231f9"
+    }
+    Frame {
+        msec: 3552
+        hash: "fa7621f338ae187edac5cb69b22e64b3"
+    }
+    Frame {
+        msec: 3568
+        hash: "bf287cbb0963fc8e575cd95808e1983d"
+    }
+    Frame {
+        msec: 3584
+        hash: "741dc09e0ae13d6afbdaae701cb699ef"
+    }
+    Frame {
+        msec: 3600
+        hash: "8dd52007df5585aed4b9737a8314a74d"
+    }
+    Frame {
+        msec: 3616
+        hash: "ddcd945a3a4467d8dd0b7a4197aafed5"
+    }
+    Frame {
+        msec: 3632
+        hash: "015deb5f228fa2f77978315ccca4f4c8"
+    }
+    Frame {
+        msec: 3648
+        hash: "e1c960e966873e694837fd98f231cfcb"
+    }
+    Frame {
+        msec: 3664
+        hash: "17a177d37b427d9488e36d19b345a397"
+    }
+    Frame {
+        msec: 3680
+        hash: "d4aded08d04f79d50536ecf539c0583d"
+    }
+    Frame {
+        msec: 3696
+        hash: "72890e9b84acf9df6083e23ab9270da1"
+    }
+    Frame {
+        msec: 3712
+        hash: "313859115de570f8d41f67c4db7cf49e"
+    }
+    Frame {
+        msec: 3728
+        hash: "98918d73b6d6b375db53470dd72c7b35"
+    }
+    Frame {
+        msec: 3744
+        hash: "ff706517a4d257747893c11a3b059926"
+    }
+    Frame {
+        msec: 3760
+        hash: "73e62664a31232c1a349568c8da6ce64"
+    }
+    Frame {
+        msec: 3776
+        hash: "bed046c6eae90d267e859cd76d3eacfb"
+    }
+    Frame {
+        msec: 3792
+        hash: "4643348fc1b47f0d3244e7e717247953"
+    }
+    Frame {
+        msec: 3808
+        hash: "0305bfc35b5618da19e9eabb3c1b5d2b"
+    }
+    Frame {
+        msec: 3824
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 3840
+        image: "test-pathview-2.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 3872
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 3888
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 3904
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 3920
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 3936
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 3952
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 3968
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 3984
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4000
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4016
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 305; y: 280
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4032
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 305; y: 281
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4048
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 306; y: 281
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4064
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 308; y: 281
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4080
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 310; y: 282
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4096
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 313; y: 283
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 317; y: 283
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4112
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 321; y: 283
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4128
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 328; y: 283
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4144
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 341; y: 283
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 347; y: 282
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4160
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 360; y: 281
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4176
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 385; y: 282
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4192
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 433; y: 292
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 486; y: 307
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4208
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 538; y: 322
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4224
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 588; y: 336
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4240
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 620; y: 343
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 677; y: 354
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4256
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 733; y: 362
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4272
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 785; y: 365
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4288
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 830; y: 365
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 861; y: 357
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4304
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 879; y: 346
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4320
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 888; y: 335
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4336
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 893; y: 326
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 893; y: 326
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4352
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4368
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4384
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4400
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4416
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4432
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4448
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4464
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4480
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4496
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4512
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4528
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4544
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4560
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4576
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4592
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4608
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4624
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4640
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4656
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4672
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4688
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4704
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4720
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4736
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4752
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4768
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4784
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4800
+        image: "test-pathview-2.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4832
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4848
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4864
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4880
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4896
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4912
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4928
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4944
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4960
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4976
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 4992
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5008
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5024
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5040
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5056
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5072
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5088
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5104
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5120
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5136
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5152
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5168
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5184
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5200
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5216
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5232
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5248
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5264
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5280
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5296
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5312
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5328
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5344
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5360
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Frame {
+        msec: 5376
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 242; y: 280
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5392
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 244; y: 280
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 246; y: 281
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5408
+        hash: "754f9689239e6154a762a6a1e9e0131b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 251; y: 282
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5424
+        hash: "ba4e61f8de7f078cfc1e5fc8dd3c65f3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 261; y: 282
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5440
+        hash: "00389598468dbd1a90cada9543715770"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 300; y: 279
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5456
+        hash: "ab020b76bc23554e176bd3a59712c3bc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 350; y: 282
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5472
+        hash: "96483c5c51cc851c55166b13617b12ea"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 417; y: 290
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5488
+        hash: "1ad679d1400a0f185a380a75840c6a50"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 500; y: 300
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 585; y: 309
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5504
+        hash: "b5ed338d402d16a831c0595311350789"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 669; y: 315
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 669; y: 315
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5520
+        hash: "bf51ff7b6f264170d9c5700559e03262"
+    }
+    Frame {
+        msec: 5536
+        hash: "0d62681e661aad7b67b880e13afeb4de"
+    }
+    Frame {
+        msec: 5552
+        hash: "3371739270c458d4ce8a08f2e12d4ba5"
+    }
+    Frame {
+        msec: 5568
+        hash: "db271b0ebfa0172d8386ac9afde9f296"
+    }
+    Frame {
+        msec: 5584
+        hash: "d64c064ab483c9636b2736c67b2b1a48"
+    }
+    Frame {
+        msec: 5600
+        hash: "20a8ccb0ff1c0d5ff606b343f1a32bff"
+    }
+    Frame {
+        msec: 5616
+        hash: "5547bb0a4d6b51733829597b9d8d141a"
+    }
+    Frame {
+        msec: 5632
+        hash: "1135177a5cb24aa11372653985599775"
+    }
+    Frame {
+        msec: 5648
+        hash: "5031ea6ca8ec59155edb7c1f10f77925"
+    }
+    Frame {
+        msec: 5664
+        hash: "7c5c1015af23f32c002a24a880201883"
+    }
+    Frame {
+        msec: 5680
+        hash: "c1dd3ad07775d74d2e81b830d07543e0"
+    }
+    Frame {
+        msec: 5696
+        hash: "ad6651f644be3c6f1ebf340809fe516f"
+    }
+    Frame {
+        msec: 5712
+        hash: "1eb69541ae67d9d9193b86a6592de4c2"
+    }
+    Frame {
+        msec: 5728
+        hash: "c9c40ec693a421243804efb8f99707f4"
+    }
+    Frame {
+        msec: 5744
+        hash: "832884a5102069ca085001156a04e74e"
+    }
+    Frame {
+        msec: 5760
+        image: "test-pathview-2.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "df0c7d73069e1087d34c7a703197cb2a"
+    }
+    Frame {
+        msec: 5792
+        hash: "4a8e1f548e48b86140aa1a5fa8b17bd3"
+    }
+    Frame {
+        msec: 5808
+        hash: "f79f47e3a0c16a1361fa287a594c4673"
+    }
+    Frame {
+        msec: 5824
+        hash: "c26da5ed2e4055f5c172b48163560143"
+    }
+    Frame {
+        msec: 5840
+        hash: "0e971cd0c2e25d52b689d4b22509a7d9"
+    }
+    Frame {
+        msec: 5856
+        hash: "40bae0ef35772c476cddccc034b7c872"
+    }
+    Frame {
+        msec: 5872
+        hash: "ce1fc0faae5e313bc21e024dac3097da"
+    }
+    Frame {
+        msec: 5888
+        hash: "ba614972cec0e9fa47cb09f1ba77eefb"
+    }
+    Frame {
+        msec: 5904
+        hash: "2266ae29490ae01ff8a2329956c124a7"
+    }
+    Frame {
+        msec: 5920
+        hash: "debae0194926cb5af0a8f7fdfb7f08b8"
+    }
+    Frame {
+        msec: 5936
+        hash: "10a7111367cfcbe24063b9ee6975e4fc"
+    }
+    Frame {
+        msec: 5952
+        hash: "3c0f9e0603e33506f31ff6569d007b97"
+    }
+    Frame {
+        msec: 5968
+        hash: "69d92abce3f093cc7610bd715a7396fa"
+    }
+    Frame {
+        msec: 5984
+        hash: "befad9882a6af920684d94c74d8d7f78"
+    }
+    Frame {
+        msec: 6000
+        hash: "10632052ac53504bd36687ba7aa7ebc1"
+    }
+    Frame {
+        msec: 6016
+        hash: "af4053320c12cbcc6f0e7e321dba1c83"
+    }
+    Frame {
+        msec: 6032
+        hash: "4560c5fcef9d630d744e80dc46947b9d"
+    }
+    Frame {
+        msec: 6048
+        hash: "012ee780ed98131321aaa241a2599c5f"
+    }
+    Frame {
+        msec: 6064
+        hash: "25d3fb9d44bc2be3b86a5451d8ffaec2"
+    }
+    Frame {
+        msec: 6080
+        hash: "09c5cbff81a5c9fae40ec29b936ee52b"
+    }
+    Frame {
+        msec: 6096
+        hash: "27a0b1d2ea2fc8729e5542c6462c1815"
+    }
+    Frame {
+        msec: 6112
+        hash: "c6f347c942aed190ebee077b5bd0888c"
+    }
+    Frame {
+        msec: 6128
+        hash: "029d78844bd72acb310bd2887489bdf0"
+    }
+    Frame {
+        msec: 6144
+        hash: "3af16ab398f1515e90e81460ac061a74"
+    }
+    Frame {
+        msec: 6160
+        hash: "0151ca050722645e2899919f79f6aa0b"
+    }
+    Frame {
+        msec: 6176
+        hash: "eead61dfc1851bc9fba3b4bca510af6a"
+    }
+    Frame {
+        msec: 6192
+        hash: "da822098c606556ad8683316f5a821ab"
+    }
+    Frame {
+        msec: 6208
+        hash: "ee47fc2bcf2264f5799a76308fbf2b65"
+    }
+    Frame {
+        msec: 6224
+        hash: "81b208b84ca887d35cda79b5c0e4cd4e"
+    }
+    Frame {
+        msec: 6240
+        hash: "fd52ccaddcb79a2dfa12bb57640a3610"
+    }
+    Frame {
+        msec: 6256
+        hash: "b187e8fcd0a777657a733c260aaaf557"
+    }
+    Frame {
+        msec: 6272
+        hash: "2cfe47a86bf9df3704002288b6249ed9"
+    }
+    Frame {
+        msec: 6288
+        hash: "b79b81706f62789a15557ac1a017addf"
+    }
+    Frame {
+        msec: 6304
+        hash: "77a84eb447fe7034783678f6903ff76d"
+    }
+    Frame {
+        msec: 6320
+        hash: "82529385d3072812fa737193914ece1c"
+    }
+    Frame {
+        msec: 6336
+        hash: "a7ccfa6c8aebf2016f2f12045d2f1abe"
+    }
+    Frame {
+        msec: 6352
+        hash: "486d38e7ea6a5cf13f2ecd1c6919ece7"
+    }
+    Frame {
+        msec: 6368
+        hash: "6c5bd377d2289ec88f969e961f1dcf65"
+    }
+    Frame {
+        msec: 6384
+        hash: "92e20565fbcf8c7c9a67726f3a0dd41f"
+    }
+    Frame {
+        msec: 6400
+        hash: "0fcd995a26262b875440d0d9f03d16c4"
+    }
+    Frame {
+        msec: 6416
+        hash: "f679759eddca739764bd2816ee53ef31"
+    }
+    Frame {
+        msec: 6432
+        hash: "adffd1da9b750df3d9f48820a2235c0b"
+    }
+    Frame {
+        msec: 6448
+        hash: "e0f8730acf7a6802ade228f95d700c08"
+    }
+    Frame {
+        msec: 6464
+        hash: "2c5209c3715bb9f39ac23a8b32a17ef9"
+    }
+    Frame {
+        msec: 6480
+        hash: "741694ef4cbd3477a8e13ba89fc9d607"
+    }
+    Frame {
+        msec: 6496
+        hash: "e88d6a61acb3fde6b441c2e718a0c2fb"
+    }
+    Frame {
+        msec: 6512
+        hash: "b91863800e6ab967616d68def388d5d5"
+    }
+    Frame {
+        msec: 6528
+        hash: "4c28a99236c351a2e3e3301c0b5bbba8"
+    }
+    Frame {
+        msec: 6544
+        hash: "6affb524d7f63fef94d29629a148be04"
+    }
+    Frame {
+        msec: 6560
+        hash: "f7823d25adf673117f010738d977b787"
+    }
+    Frame {
+        msec: 6576
+        hash: "dfb930f3db30ec53c8e9a1aa5d9056e4"
+    }
+    Frame {
+        msec: 6592
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6608
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6624
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6640
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6656
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6672
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6688
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6704
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6720
+        image: "test-pathview-2.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6752
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6768
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6784
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6800
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6816
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6832
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6848
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6864
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6880
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6896
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6912
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6928
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6944
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6960
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6976
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 6992
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7008
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7024
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7040
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7056
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7072
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7088
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7104
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7120
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7136
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7152
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7168
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7184
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7200
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7216
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7232
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7248
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+    Frame {
+        msec: 7264
+        hash: "57269234dc01b66f6aeb841c328c06b5"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.0.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.0.png
new file mode 100644
index 0000000..442ba9f
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.1.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.1.png
new file mode 100644
index 0000000..a9ff20f
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.2.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.2.png
new file mode 100644
index 0000000..157bb99
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.3.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.3.png
new file mode 100644
index 0000000..8c49acb
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.4.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.4.png
new file mode 100644
index 0000000..eb2bf54
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.qml b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.qml
new file mode 100644
index 0000000..8cff5c6
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.qml
@@ -0,0 +1,1495 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 32
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 48
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 64
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 80
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 96
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 112
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 128
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 144
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 160
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 176
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 192
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 208
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 224
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 240
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 256
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 272
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 288
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 304
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 320
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 336
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 352
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 368
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 384
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 400
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 416
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 432
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 448
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 464
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 480
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 496
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 512
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 528
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 544
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 560
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 576
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 592
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 608
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 624
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 640
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 656
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 672
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 688
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 704
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 720
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 736
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 752
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 768
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 784
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 800
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 816
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 832
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 848
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 864
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 880
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 896
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 912
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 928
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 944
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 960
+        image: "test-pathview.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 992
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1008
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1024
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1040
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1056
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1072
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1088
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1104
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1120
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1136
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 734; y: 177
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1152
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Frame {
+        msec: 1168
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 732; y: 177
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1184
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 726; y: 179
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1200
+        hash: "89bb697bb7b7fab38d3ff56e23e43959"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 716; y: 183
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1216
+        hash: "42c141399fda1cbb2ae117788d87092a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 700; y: 190
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1232
+        hash: "4d44343eb91838e3eb73e2e5326b5ac2"
+    }
+    Frame {
+        msec: 1248
+        hash: "4d44343eb91838e3eb73e2e5326b5ac2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 677; y: 200
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1264
+        hash: "15aaccb4f7961a4e3e6fe57260779d00"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 651; y: 209
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1280
+        hash: "5628fa3ac9893f5c9690013aad4b881a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 619; y: 219
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1296
+        hash: "384db58b6de773ac39ae81e6af4d547d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 579; y: 229
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1312
+        hash: "2a15a27a138b9d3d646b827d026e8843"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 535; y: 237
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 535; y: 237
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1328
+        hash: "098176f48a148eb2bc5ef67c307baa1c"
+    }
+    Frame {
+        msec: 1344
+        hash: "f838ab4301bf9d3106cec529f855cecd"
+    }
+    Frame {
+        msec: 1360
+        hash: "9725322067a04f83717b059d4970d610"
+    }
+    Frame {
+        msec: 1376
+        hash: "3605cfbebc3a9eb4460efb2d4b9b6da2"
+    }
+    Frame {
+        msec: 1392
+        hash: "4503a368d8db25d112503dbc3934541d"
+    }
+    Frame {
+        msec: 1408
+        hash: "80894cc06c82264bf527398ea235da12"
+    }
+    Frame {
+        msec: 1424
+        hash: "d4f9b90f886fc667309b33c9a296410c"
+    }
+    Frame {
+        msec: 1440
+        hash: "889d01025cff679b61bff182a1ac9cbc"
+    }
+    Frame {
+        msec: 1456
+        hash: "6147bc4455e7cb5ae55cd47be8dc4ad6"
+    }
+    Frame {
+        msec: 1472
+        hash: "ddd10a294eb6b19698c4e9fe4f1508fe"
+    }
+    Frame {
+        msec: 1488
+        hash: "748e8d9c1971f6258acee5133b7f114b"
+    }
+    Frame {
+        msec: 1504
+        hash: "1ef3f32ec9ef950588266bacbe3554a0"
+    }
+    Frame {
+        msec: 1520
+        hash: "57853ff47b65aba9e76f90b2efec4f8f"
+    }
+    Frame {
+        msec: 1536
+        hash: "3985fea21d89d223c1461d5e96364c76"
+    }
+    Frame {
+        msec: 1552
+        hash: "cb5f6a3caeeaed12e91efe43867f2c1f"
+    }
+    Frame {
+        msec: 1568
+        hash: "cdd4176776d5969373e0fc9a117e3c87"
+    }
+    Frame {
+        msec: 1584
+        hash: "3bac2e7506472db2ae11734240f1c3f4"
+    }
+    Frame {
+        msec: 1600
+        hash: "bb572659d79ebda7134c039e40cf2633"
+    }
+    Frame {
+        msec: 1616
+        hash: "e610181bfa17a85281f9c7417088f04f"
+    }
+    Frame {
+        msec: 1632
+        hash: "eb23ff021909589b6d8ce47ebff2c3ed"
+    }
+    Frame {
+        msec: 1648
+        hash: "c321dda3878c4b97cc63246c47368224"
+    }
+    Frame {
+        msec: 1664
+        hash: "6a65cdfd50e1455356040d4cbc09905e"
+    }
+    Frame {
+        msec: 1680
+        hash: "f2a44b12e4e5bae8283c4d227949e4e8"
+    }
+    Frame {
+        msec: 1696
+        hash: "55418d661f3257b5b79a7dbb172b5b70"
+    }
+    Frame {
+        msec: 1712
+        hash: "483d7111c86951918746d6ebe0dd9655"
+    }
+    Frame {
+        msec: 1728
+        hash: "85c83ac3a294a9320bb04a6721ecf7d5"
+    }
+    Frame {
+        msec: 1744
+        hash: "0d658b897b8e03397ddd8ffe475c2fc0"
+    }
+    Frame {
+        msec: 1760
+        hash: "6ed9d7ea344b3c1b1d9196ee36b2f89a"
+    }
+    Frame {
+        msec: 1776
+        hash: "6a1e7f6c03769c2c88e6343fb6c1a2a4"
+    }
+    Frame {
+        msec: 1792
+        hash: "9dc51f46e072eac4494d7318f2ecb39b"
+    }
+    Frame {
+        msec: 1808
+        hash: "59e833981c3fcd8a71f4a16d1c454b3a"
+    }
+    Frame {
+        msec: 1824
+        hash: "29b953efdda00548d8cf6fb49fa60d13"
+    }
+    Frame {
+        msec: 1840
+        hash: "fd4611f703f94ebefcc64781993ca85c"
+    }
+    Frame {
+        msec: 1856
+        hash: "aa4789ede618963157b40f099ce84987"
+    }
+    Frame {
+        msec: 1872
+        hash: "8a326b46ec536a67626ee2d2bc06aa9f"
+    }
+    Frame {
+        msec: 1888
+        hash: "011ff557672d47591e4f0f5c5ee418f1"
+    }
+    Frame {
+        msec: 1904
+        hash: "d72fba857bdc128ddcb5971b86aadcb2"
+    }
+    Frame {
+        msec: 1920
+        image: "test-pathview.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "49182b7ae9ef5fb4b9234969abd05960"
+    }
+    Frame {
+        msec: 1952
+        hash: "53de60f682574b7a9e6ffaee175fc9ff"
+    }
+    Frame {
+        msec: 1968
+        hash: "2de74fe5b8848c5c781b796146871f45"
+    }
+    Frame {
+        msec: 1984
+        hash: "33c87146d8c24dd9c2271d16a8ff5b53"
+    }
+    Frame {
+        msec: 2000
+        hash: "fdb29214e20d744d9776907061f50358"
+    }
+    Frame {
+        msec: 2016
+        hash: "8c7c920416c9b775e790e6da24c32927"
+    }
+    Frame {
+        msec: 2032
+        hash: "86b456059e4701379447fffaf9e072f0"
+    }
+    Frame {
+        msec: 2048
+        hash: "f92cc485ee03ef5bce3c4cdc35e00318"
+    }
+    Frame {
+        msec: 2064
+        hash: "2fad58883cb20273cfd79ebca345a66d"
+    }
+    Frame {
+        msec: 2080
+        hash: "84505ebbc6e12817f11f64aa6f61a0bf"
+    }
+    Frame {
+        msec: 2096
+        hash: "ded83cacb89838cc0f3ba14bcc69b66b"
+    }
+    Frame {
+        msec: 2112
+        hash: "5bb37e75bb45eaa6067c604b83ae13d7"
+    }
+    Frame {
+        msec: 2128
+        hash: "4ee9e4c90c40dbc25a0ce884d9c2c37f"
+    }
+    Frame {
+        msec: 2144
+        hash: "cb7148ff6f611038c29af36c8552b8c2"
+    }
+    Frame {
+        msec: 2160
+        hash: "a591d8cb42570272dd264d5f1ce595ab"
+    }
+    Frame {
+        msec: 2176
+        hash: "4e61657405d32dbcd39d3637f8af0958"
+    }
+    Frame {
+        msec: 2192
+        hash: "9c7c1411dd5d3c1c8fb78e63e14061fe"
+    }
+    Frame {
+        msec: 2208
+        hash: "ae83a37e99b578fa0872ed6bc2776bc0"
+    }
+    Frame {
+        msec: 2224
+        hash: "e8cb5a8a40c1e78c87c616f77d8de270"
+    }
+    Frame {
+        msec: 2240
+        hash: "9df093e4bcfa32be5924a0ca70bdaa3b"
+    }
+    Frame {
+        msec: 2256
+        hash: "40c358066d508143bee1446d12fe7b89"
+    }
+    Frame {
+        msec: 2272
+        hash: "a929ed6efc7fc68b38635f3c74242f52"
+    }
+    Frame {
+        msec: 2288
+        hash: "86ff721a3178b689ea47b6bc274a2b41"
+    }
+    Frame {
+        msec: 2304
+        hash: "ed1f680f6d05f54ceb75c9bae3a0716a"
+    }
+    Frame {
+        msec: 2320
+        hash: "3f09a565df2beb51f366a1b3fb6adfe9"
+    }
+    Frame {
+        msec: 2336
+        hash: "13468347bd26bab60f1db826fb17631c"
+    }
+    Frame {
+        msec: 2352
+        hash: "9f7d085fea5788a457098973f17c36cb"
+    }
+    Frame {
+        msec: 2368
+        hash: "4114b93246155b3434200831b2995330"
+    }
+    Frame {
+        msec: 2384
+        hash: "487171bd1430f74e3d51b5e215c34b5c"
+    }
+    Frame {
+        msec: 2400
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2416
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2432
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2448
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2464
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2480
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2496
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2512
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2528
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2544
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2560
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2576
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2592
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2608
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2624
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2640
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2656
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2672
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2688
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2704
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2720
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2736
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2752
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2768
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2784
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2800
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2816
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2832
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2848
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2864
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2880
+        image: "test-pathview.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2912
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2928
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2944
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2960
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2976
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 2992
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 3008
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 3024
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 3040
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 3056
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 3072
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 3088
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 728; y: 181
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3104
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 3120
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Frame {
+        msec: 3136
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 727; y: 181
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3152
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 723; y: 181
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3168
+        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 717; y: 184
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3184
+        hash: "6dcec6cdaa35eba74607ba64d6ea2ec0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 705; y: 188
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3200
+        hash: "16b7b4847fe86b25d8d6136106a4c400"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 686; y: 197
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3216
+        hash: "d946d55b19c99fa25bf1c04f2b71026a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 661; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3232
+        hash: "96f40f5071365cde769c733fd1ef5a24"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 626; y: 221
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3248
+        hash: "7004058b95b7eab3ebba5c80c0923982"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 582; y: 235
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3264
+        hash: "2c78880237c414182f97f1709f1eef0f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 532; y: 246
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3280
+        hash: "c90a15ec9f88008ca8b0ec0185444d71"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 532; y: 246
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3296
+        hash: "c90a15ec9f88008ca8b0ec0185444d71"
+    }
+    Frame {
+        msec: 3312
+        hash: "36461e2a4cd860cac32223b8ee73c657"
+    }
+    Frame {
+        msec: 3328
+        hash: "5f9b3ad9202fb02a4c6fea28c248ad22"
+    }
+    Frame {
+        msec: 3344
+        hash: "d0d23c4e1ddb2d9ffa0ecc38030ae15c"
+    }
+    Frame {
+        msec: 3360
+        hash: "8e2e2d3eaf557c453f34016b6614e495"
+    }
+    Frame {
+        msec: 3376
+        hash: "7402c747fa7276293a0a72d48d342782"
+    }
+    Frame {
+        msec: 3392
+        hash: "6090c30e4d722a32c083a25171fb11ff"
+    }
+    Frame {
+        msec: 3408
+        hash: "f770d940cf287fec4b0803f7310292a8"
+    }
+    Frame {
+        msec: 3424
+        hash: "558e4ce32df69357b70a8285b00fe347"
+    }
+    Frame {
+        msec: 3440
+        hash: "8814168503c9a72ea8d3fa1e503f33d9"
+    }
+    Frame {
+        msec: 3456
+        hash: "6f5513d22e545096fadc6f5c4112902e"
+    }
+    Frame {
+        msec: 3472
+        hash: "43f11d8ac16fd3e8199e555528817e14"
+    }
+    Frame {
+        msec: 3488
+        hash: "d64bafdbd26878a323dae918d5e0a36d"
+    }
+    Frame {
+        msec: 3504
+        hash: "1c70bdddfc3751ae3864f008170f8b06"
+    }
+    Frame {
+        msec: 3520
+        hash: "bb7a18691fcd371e9d382b5bba4a0573"
+    }
+    Frame {
+        msec: 3536
+        hash: "547e15f5dea2d9aa3ed44640b25028b9"
+    }
+    Frame {
+        msec: 3552
+        hash: "c11b86a256fac6be10b9a54564903d6f"
+    }
+    Frame {
+        msec: 3568
+        hash: "0ada2dc586894d5e37de2632d2b37b15"
+    }
+    Frame {
+        msec: 3584
+        hash: "0ae1a39ea196a0e734d80dbdea67b285"
+    }
+    Frame {
+        msec: 3600
+        hash: "3cb70e64f9ab8aad841326dc2d2f1615"
+    }
+    Frame {
+        msec: 3616
+        hash: "a8f8b5ff19df9163ea628b589b675a5e"
+    }
+    Frame {
+        msec: 3632
+        hash: "26fcc73f477db0ea731bc18b00b4c791"
+    }
+    Frame {
+        msec: 3648
+        hash: "8702e49f3f26e1e21970e78c8aa4040a"
+    }
+    Frame {
+        msec: 3664
+        hash: "1a482a39d02779d8733e348b713f2312"
+    }
+    Frame {
+        msec: 3680
+        hash: "c728cc4a8e4d0a8d983514f86a92eae0"
+    }
+    Frame {
+        msec: 3696
+        hash: "82360ab373b08bf6a5d9e9ea9d0d18aa"
+    }
+    Frame {
+        msec: 3712
+        hash: "6231a4bce6cfc1e26a9606cc041acdbc"
+    }
+    Frame {
+        msec: 3728
+        hash: "6e3b48862fc749f15aa2dec1c17d1de0"
+    }
+    Frame {
+        msec: 3744
+        hash: "6c9e79a5692a3810b2a9058790f54cd7"
+    }
+    Frame {
+        msec: 3760
+        hash: "0652c67fedda0d5e55858ddefff2da9e"
+    }
+    Frame {
+        msec: 3776
+        hash: "3b058c0efeb3a9da54a1de72a1792a83"
+    }
+    Frame {
+        msec: 3792
+        hash: "96e6fb39c8dbfe4a00bf116bf80aac4d"
+    }
+    Frame {
+        msec: 3808
+        hash: "979c0c78c41e0f337cfe1b384fbbe51a"
+    }
+    Frame {
+        msec: 3824
+        hash: "8be0d6987a6d12864f30336b249e4b16"
+    }
+    Frame {
+        msec: 3840
+        image: "test-pathview.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "31e665f804a52a4dc88eab5dba78ae5a"
+    }
+    Frame {
+        msec: 3872
+        hash: "b7d4cf5a6a3ac79da3be101b50b38bc2"
+    }
+    Frame {
+        msec: 3888
+        hash: "559b1b8467b611cdeb7f2ae660e3bf51"
+    }
+    Frame {
+        msec: 3904
+        hash: "66abb5af85e793569382efb04744d0de"
+    }
+    Frame {
+        msec: 3920
+        hash: "b64eff8bbea5a953d146333363825724"
+    }
+    Frame {
+        msec: 3936
+        hash: "47b794c971c4d47baf15e1d63d65ac03"
+    }
+    Frame {
+        msec: 3952
+        hash: "b3882fa14f3cb7428c660737656d7ea2"
+    }
+    Frame {
+        msec: 3968
+        hash: "a6bd71c7d3a0f3f53674ea8e1334e560"
+    }
+    Frame {
+        msec: 3984
+        hash: "0926d3cd53aabb789686e34d91ef23dc"
+    }
+    Frame {
+        msec: 4000
+        hash: "914c4fa7264111b4a42c82a60701d652"
+    }
+    Frame {
+        msec: 4016
+        hash: "84c1fa22440a61126b79c38605b6f9ca"
+    }
+    Frame {
+        msec: 4032
+        hash: "b684fcf9f4725cfc02af0187454dfaf8"
+    }
+    Frame {
+        msec: 4048
+        hash: "2e94c1ca74af4eb836a0c505d131f263"
+    }
+    Frame {
+        msec: 4064
+        hash: "5f04912674e1bcdb16176976d10ce995"
+    }
+    Frame {
+        msec: 4080
+        hash: "aaf0bcef4a15aa1c699eaa1ce817c8ed"
+    }
+    Frame {
+        msec: 4096
+        hash: "97fd5bdcfa367191fbd3689658ab3273"
+    }
+    Frame {
+        msec: 4112
+        hash: "d76d6c59411636a0e9ac2e0c847b3fe3"
+    }
+    Frame {
+        msec: 4128
+        hash: "9cb88a76c962623b1a9cf4e7093d6e54"
+    }
+    Frame {
+        msec: 4144
+        hash: "ec3d7075680296905b1bdd6fdd9fcc40"
+    }
+    Frame {
+        msec: 4160
+        hash: "43c70dabc45ed059e8b876eb2ba5c66e"
+    }
+    Frame {
+        msec: 4176
+        hash: "8f97ca5c3092a20009c5d00139105a22"
+    }
+    Frame {
+        msec: 4192
+        hash: "d0f225d4b03495218f7916698e254338"
+    }
+    Frame {
+        msec: 4208
+        hash: "f8725467353a8f27bc5570af157c93c7"
+    }
+    Frame {
+        msec: 4224
+        hash: "749c8ca5c0a7774c81805b792e6b70e3"
+    }
+    Frame {
+        msec: 4240
+        hash: "d353c4a8a5eecb1dce30f4a5b85b1ef4"
+    }
+    Frame {
+        msec: 4256
+        hash: "a7105f3f1ddace730d0b4a12a3560208"
+    }
+    Frame {
+        msec: 4272
+        hash: "918f480af8a35f6074ff1e202dae2660"
+    }
+    Frame {
+        msec: 4288
+        hash: "ed98d08eb30db1b41aaf2a58f3b59398"
+    }
+    Frame {
+        msec: 4304
+        hash: "c362cf053b3749a44d1fc33483f9952b"
+    }
+    Frame {
+        msec: 4320
+        hash: "9b01b2c771ef86ff4a8ee3f6a4676e3c"
+    }
+    Frame {
+        msec: 4336
+        hash: "70ccec3c9db95206b5589d43dcd52b13"
+    }
+    Frame {
+        msec: 4352
+        hash: "57e7397c6aadd0d4d5c9d9d5fcdd8fde"
+    }
+    Frame {
+        msec: 4368
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4384
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4400
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4416
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4432
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4448
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4464
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4480
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4496
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4512
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4528
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4544
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4560
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4576
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4592
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4608
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4624
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4640
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4656
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4672
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4688
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4704
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4720
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4736
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4752
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4768
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4784
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4800
+        image: "test-pathview.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4832
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4848
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4864
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4880
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4896
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4912
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4928
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4944
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4960
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4976
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 4992
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5008
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5024
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5040
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5056
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5072
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5088
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5104
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5120
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5136
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5152
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5168
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5184
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5200
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+    Frame {
+        msec: 5216
+        hash: "299b24eae7720e1711744b23335bca8c"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/test-pathview-2.qml b/tests/auto/declarative/visual/qdeclarativepathview/test-pathview-2.qml
new file mode 100644
index 0000000..c6d71d5
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativepathview/test-pathview-2.qml
@@ -0,0 +1,62 @@
+import Qt 4.6
+
+Rectangle {
+    width: 800; height: 450
+    //Same as test-pathview, but with pathItemCount < model.count
+    
+    ListModel {
+        id: rssModel
+        ListElement { lColor: "red" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "gray" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "thistle" }
+    }
+
+    Component {
+        id: photoDelegate
+        Rectangle {
+            id: wrapper
+            width: 85; height: 85; color: lColor
+            scale: wrapper.PathView.scale
+            
+            transform: Rotation {
+                id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
+                axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle
+            }
+        }
+    }
+
+    PathView {
+        id: pathView; model: rssModel; delegate: photoDelegate
+        y: 100; width: 800; height: 330; pathItemCount: 6; z: 1
+        focus: true
+        path: Path {
+            startX: -50; startY: 40;
+            
+            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "angle"; value: -45 }
+            
+            PathCubic {
+                x: 400; y: 220
+                control1X: 140; control1Y: 40
+                control2X: 210; control2Y: 220
+            }
+            
+            PathAttribute { name: "scale"; value: 1.2  }
+            PathAttribute { name: "angle"; value: 0 }
+            
+            PathCubic {
+                x: 850; y: 40
+                control2X: 660; control2Y: 40
+                control1X: 590; control1Y: 220
+            }
+            
+            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "angle"; value: 45 }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativepathview/test-pathview.qml b/tests/auto/declarative/visual/qdeclarativepathview/test-pathview.qml
new file mode 100644
index 0000000..0adfa02
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativepathview/test-pathview.qml
@@ -0,0 +1,62 @@
+import Qt 4.6
+
+Rectangle {
+    width: 800; height: 450
+    
+    ListModel {
+        id: rssModel
+        ListElement { lColor: "red" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "gray" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "thistle" }
+    }
+
+    Component {
+        id: photoDelegate
+        Rectangle {
+            id: wrapper
+            width: 85; height: 85; color: lColor
+            scale: wrapper.PathView.scale
+
+            MouseArea { anchors.fill: parent }
+            
+            transform: Rotation {
+                id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
+                axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle
+            }
+        }
+    }
+
+    PathView {
+        id: photoPathView; model: rssModel; delegate: photoDelegate
+        y: 100; width: 800; height: 330; pathItemCount: 10; z: 1
+        path: Path {
+            startX: -50; startY: 40;
+            
+            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "angle"; value: -45 }
+            
+            PathCubic {
+                x: 400; y: 220
+                control1X: 140; control1Y: 40
+                control2X: 210; control2Y: 220
+            }
+            
+            PathAttribute { name: "scale"; value: 1.2  }
+            PathAttribute { name: "angle"; value: 0 }
+            
+            PathCubic {
+                x: 850; y: 40
+                control2X: 660; control2Y: 40
+                control1X: 590; control1Y: 220
+            }
+            
+            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "angle"; value: 45 }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.0.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.0.png
new file mode 100644
index 0000000..f474afe
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.1.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.1.png
new file mode 100644
index 0000000..8b7ae74
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.2.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.2.png
new file mode 100644
index 0000000..9088bb4
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.3.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.3.png
new file mode 100644
index 0000000..18cd429
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.4.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.4.png
new file mode 100644
index 0000000..739afc1
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.5.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.5.png
new file mode 100644
index 0000000..93f0682
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.qml b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.qml
new file mode 100644
index 0000000..7091bb3
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.qml
@@ -0,0 +1,1603 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 32
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 48
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 64
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 80
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 96
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 112
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 128
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 144
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 160
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 176
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 192
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 208
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 224
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 240
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 256
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 272
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 288
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 304
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 320
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 336
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 352
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 368
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 384
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 400
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 416
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 432
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 448
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 464
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 480
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 496
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 512
+        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
+    }
+    Frame {
+        msec: 528
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 544
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 560
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 576
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 592
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 608
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 624
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 640
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 656
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 672
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 688
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 704
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 720
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 736
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 752
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 768
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 784
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 800
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 816
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 832
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 848
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 864
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 880
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 896
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 912
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 928
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 944
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 960
+        image: "dynamic.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 992
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 1008
+        hash: "62727b1025930e19bb03c8f533a12ced"
+    }
+    Frame {
+        msec: 1024
+        hash: "3e52e7d7d428cf1b850cb9c60dbb3c21"
+    }
+    Frame {
+        msec: 1040
+        hash: "64f75ab14c979d33d6e0c0d86b76cd35"
+    }
+    Frame {
+        msec: 1056
+        hash: "c198a48f4050f176465649d203d6e09a"
+    }
+    Frame {
+        msec: 1072
+        hash: "6dd8cee5a585a96e78f2cf7478c4da62"
+    }
+    Frame {
+        msec: 1088
+        hash: "09edfbce2ea4b8a547f769ce709dcb6b"
+    }
+    Frame {
+        msec: 1104
+        hash: "e93d01aa6e4f5d3fc82cf5a008e3ea17"
+    }
+    Frame {
+        msec: 1120
+        hash: "0e2e7b5eec0e62853972b0139b8c17c6"
+    }
+    Frame {
+        msec: 1136
+        hash: "26d4f54628ce20f5665bdc6ddc7f3b6a"
+    }
+    Frame {
+        msec: 1152
+        hash: "59836aa6eff85b0152be352b97076d89"
+    }
+    Frame {
+        msec: 1168
+        hash: "47cc9894096731a52ca342ab04df9aad"
+    }
+    Frame {
+        msec: 1184
+        hash: "ec95dd3b34a0f17f6fb9b5bedab73653"
+    }
+    Frame {
+        msec: 1200
+        hash: "e32c2b70882828b5082ca3ec889a0dde"
+    }
+    Frame {
+        msec: 1216
+        hash: "68d3f8e9c9d5388a6f8360368c8f4d2f"
+    }
+    Frame {
+        msec: 1232
+        hash: "17378b2bd8bde7f357fa5463f457c7b2"
+    }
+    Frame {
+        msec: 1248
+        hash: "03db786cd54ec34ce8db15953a5fc847"
+    }
+    Frame {
+        msec: 1264
+        hash: "9e22a82a622ed0287c44cc629059d5bd"
+    }
+    Frame {
+        msec: 1280
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1296
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1312
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1328
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1344
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1360
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1376
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1392
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1408
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1424
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1440
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1456
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1472
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1488
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1504
+        hash: "42955cd23747f7c37d0f0229c0955e90"
+    }
+    Frame {
+        msec: 1520
+        hash: "981fb1ee75e307b548a32df08a86f4cd"
+    }
+    Frame {
+        msec: 1536
+        hash: "f77568307e93d8cd9f0ae417cc19d6e3"
+    }
+    Frame {
+        msec: 1552
+        hash: "3bdd4468e26aceee0dad6b3b97b1c1ea"
+    }
+    Frame {
+        msec: 1568
+        hash: "252c9ebc2c32755b2289ee1b03877fe3"
+    }
+    Frame {
+        msec: 1584
+        hash: "64169b7eb7b7ae8573556c5f80230965"
+    }
+    Frame {
+        msec: 1600
+        hash: "4965dfa709a9ac7d8f7dfb4bf8303c65"
+    }
+    Frame {
+        msec: 1616
+        hash: "8c53cf92510154087341ac65a93aae5a"
+    }
+    Frame {
+        msec: 1632
+        hash: "4dd7502e3e238743d2f3cf038270491e"
+    }
+    Frame {
+        msec: 1648
+        hash: "cd9a58316837eb92f4ac92dbd86bdba3"
+    }
+    Frame {
+        msec: 1664
+        hash: "5de043e3ac8696b59293a2fa60ed7e65"
+    }
+    Frame {
+        msec: 1680
+        hash: "1bf42a6f6be5a3468d2f47cccfac761e"
+    }
+    Frame {
+        msec: 1696
+        hash: "ca05510c1ad25e5d3b002603f4379a09"
+    }
+    Frame {
+        msec: 1712
+        hash: "f6904a918a6475f1965d74372e52a4b1"
+    }
+    Frame {
+        msec: 1728
+        hash: "9e2312ddfc1648b615288107a06c9f9c"
+    }
+    Frame {
+        msec: 1744
+        hash: "95c470273b1cb08d4d602efcce339554"
+    }
+    Frame {
+        msec: 1760
+        hash: "dade96f707d4a21885480e13b258b7e9"
+    }
+    Frame {
+        msec: 1776
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1792
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1808
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1824
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1840
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1856
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1872
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1888
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1904
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1920
+        image: "dynamic.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1952
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1968
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 1984
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 2000
+        hash: "0bfbd46f1d4cf562253fb383776cb601"
+    }
+    Frame {
+        msec: 2016
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2032
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2048
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2064
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2080
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2096
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2112
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2128
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2144
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2160
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2176
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2192
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2208
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2224
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2240
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2256
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2272
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2288
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2304
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2320
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2336
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2352
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2368
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2384
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2400
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2416
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2432
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2448
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2464
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2480
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2496
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2512
+        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
+    }
+    Frame {
+        msec: 2528
+        hash: "fabf4e535bc4cc17497939d2eeae4a2d"
+    }
+    Frame {
+        msec: 2544
+        hash: "a7981035f46869f5ae824d0c58b263b2"
+    }
+    Frame {
+        msec: 2560
+        hash: "86d8e369bdceb499b244f84ed9e80ba3"
+    }
+    Frame {
+        msec: 2576
+        hash: "e28a7dc7ea8690da75670b5a6e93a26b"
+    }
+    Frame {
+        msec: 2592
+        hash: "bf4e815360a67bd80732bd8812269b21"
+    }
+    Frame {
+        msec: 2608
+        hash: "a6f8c56cb93da8acc0c90e35596a60d4"
+    }
+    Frame {
+        msec: 2624
+        hash: "1e60656f0758605169e51b57bd03af36"
+    }
+    Frame {
+        msec: 2640
+        hash: "c069b26b9fae47e0104070d702ba9562"
+    }
+    Frame {
+        msec: 2656
+        hash: "457eb2ca1adff6cbb158afa140b2f20b"
+    }
+    Frame {
+        msec: 2672
+        hash: "4e5e750b0d94b6777aebff85d38225d9"
+    }
+    Frame {
+        msec: 2688
+        hash: "96d9840c2354a8786a8470309be97544"
+    }
+    Frame {
+        msec: 2704
+        hash: "ac7570cc7eeff1acd8c47f2d9328f8be"
+    }
+    Frame {
+        msec: 2720
+        hash: "887f937bb263c54f29659f27f2b7a3e3"
+    }
+    Frame {
+        msec: 2736
+        hash: "616371183c82b97f69a4c6e2367b8066"
+    }
+    Frame {
+        msec: 2752
+        hash: "36de8ffa9abe850fb681b37aea45ef8b"
+    }
+    Frame {
+        msec: 2768
+        hash: "0505101f0edaaf7ff17deeaaddc6bbf9"
+    }
+    Frame {
+        msec: 2784
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2800
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2816
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2832
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2848
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2864
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2880
+        image: "dynamic.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2912
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2928
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2944
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2960
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2976
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 2992
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 3008
+        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
+    }
+    Frame {
+        msec: 3024
+        hash: "99e4d853d64a381e8db27707b5ff2b25"
+    }
+    Frame {
+        msec: 3040
+        hash: "ab0e62aeffc0d57a5e1d63e6cf49b809"
+    }
+    Frame {
+        msec: 3056
+        hash: "4ab11bbf1fb6adb0eec8895f78a24a41"
+    }
+    Frame {
+        msec: 3072
+        hash: "634ff2ceb39a3f263a3362238a4ae252"
+    }
+    Frame {
+        msec: 3088
+        hash: "7f4856873dc23a02297b2497101de9b9"
+    }
+    Frame {
+        msec: 3104
+        hash: "bca3919e9d8e6dc5badd8090401dc934"
+    }
+    Frame {
+        msec: 3120
+        hash: "824bfe40c3657cfe1368563640e4cfce"
+    }
+    Frame {
+        msec: 3136
+        hash: "f831c1600f68bda139697c406ca70c5e"
+    }
+    Frame {
+        msec: 3152
+        hash: "f8102ca251a9ff46a8fe5a24cff0d2d6"
+    }
+    Frame {
+        msec: 3168
+        hash: "f33407ad684aa16efc6615d1cf6fa4b9"
+    }
+    Frame {
+        msec: 3184
+        hash: "a73d27f776a6ebfc90309b34421700e5"
+    }
+    Frame {
+        msec: 3200
+        hash: "ff2a4e2663fc50dfec35152f0e79f935"
+    }
+    Frame {
+        msec: 3216
+        hash: "4935f5f58f2672e9d240625151044bda"
+    }
+    Frame {
+        msec: 3232
+        hash: "f3ad5c203f621fe4d5d321c3c1880743"
+    }
+    Frame {
+        msec: 3248
+        hash: "d4fb7cd2e1f6a533dae65ddbb50da8ac"
+    }
+    Frame {
+        msec: 3264
+        hash: "91705e9234c4f02d0a730f6270f9e95f"
+    }
+    Frame {
+        msec: 3280
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3296
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3312
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3328
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3344
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3360
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3376
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3392
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3408
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3424
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3440
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3456
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3472
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3488
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3504
+        hash: "41e177bec783497b996d6d5f6dac1a15"
+    }
+    Frame {
+        msec: 3520
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3536
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3552
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3568
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3584
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3600
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3616
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3632
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3648
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3664
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3680
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3696
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3712
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3728
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3744
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3760
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3776
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3792
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3808
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3824
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3840
+        image: "dynamic.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3872
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3888
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3904
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3920
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3936
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3952
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3968
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 3984
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4000
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4016
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4032
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4048
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4064
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4080
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4096
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4112
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4128
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4144
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4160
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4176
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4192
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4208
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4224
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4240
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4256
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4272
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4288
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4304
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4320
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4336
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4352
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4368
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4384
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4400
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4416
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4432
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4448
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4464
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4480
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4496
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4512
+        hash: "496dc6261695bcf04a8e574146544e98"
+    }
+    Frame {
+        msec: 4528
+        hash: "9681be99003f8a14cc5654d06d2c8255"
+    }
+    Frame {
+        msec: 4544
+        hash: "bcb592a2335aa2e35956881fd028f4e6"
+    }
+    Frame {
+        msec: 4560
+        hash: "f914b25fdcb02a02b71220d82b7b2a75"
+    }
+    Frame {
+        msec: 4576
+        hash: "63c82c08eb7f2bd50b54b94c952df3f2"
+    }
+    Frame {
+        msec: 4592
+        hash: "8a8dc82be81fa55605c6c2e749895120"
+    }
+    Frame {
+        msec: 4608
+        hash: "271f8d79b8052dfcd840ffa9ba9ffeec"
+    }
+    Frame {
+        msec: 4624
+        hash: "8f77bbd0585b57e69ac1919bd81ee3b1"
+    }
+    Frame {
+        msec: 4640
+        hash: "b974260a2f90e141ebc33ced98fbca88"
+    }
+    Frame {
+        msec: 4656
+        hash: "77ada180f8a45652a6fa636d7ece4d9d"
+    }
+    Frame {
+        msec: 4672
+        hash: "4c8dc2e33cd989cb3b0938c6c75b5f95"
+    }
+    Frame {
+        msec: 4688
+        hash: "a145954989508b925a444e14f0c27a20"
+    }
+    Frame {
+        msec: 4704
+        hash: "8d27ff203819174747ae4a5cee8d0ae8"
+    }
+    Frame {
+        msec: 4720
+        hash: "830f34b0dab780c6efe2294872ba8508"
+    }
+    Frame {
+        msec: 4736
+        hash: "5d70a4bbd815569cfe5735b596bad080"
+    }
+    Frame {
+        msec: 4752
+        hash: "964527bb82ea006e03b030c787a8597c"
+    }
+    Frame {
+        msec: 4768
+        hash: "1ad54954b818fa9e6032ac4b6114e7db"
+    }
+    Frame {
+        msec: 4784
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4800
+        image: "dynamic.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4832
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4848
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4864
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4880
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4896
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4912
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4928
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4944
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4960
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4976
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 4992
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 5008
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 5024
+        hash: "47865243cc252aef67774001af70c54c"
+    }
+    Frame {
+        msec: 5040
+        hash: "baeb8adffc13e230e797e0437f2ad5fa"
+    }
+    Frame {
+        msec: 5056
+        hash: "d2e440fcad0ee2b7b35d7e5c4e581f73"
+    }
+    Frame {
+        msec: 5072
+        hash: "fb8acb2f69234d3ee089281d0297ad7c"
+    }
+    Frame {
+        msec: 5088
+        hash: "7fda29a83dc535ed8d6b35e999400311"
+    }
+    Frame {
+        msec: 5104
+        hash: "6482e3eb10cfdbdeb57dd38ba3e3d67e"
+    }
+    Frame {
+        msec: 5120
+        hash: "4d222549bc2565c1598a532460aae4e6"
+    }
+    Frame {
+        msec: 5136
+        hash: "776d1b0f9945c0e1ceda0cf117264919"
+    }
+    Frame {
+        msec: 5152
+        hash: "f2c362b34a0982ee1a11dea6b063945e"
+    }
+    Frame {
+        msec: 5168
+        hash: "115f02b8893972b5b1d63525ce70762e"
+    }
+    Frame {
+        msec: 5184
+        hash: "7f2d53581fe2c6c45a628fa4cd9b5742"
+    }
+    Frame {
+        msec: 5200
+        hash: "b5ed1120c4edf842b15d5144adbd93b0"
+    }
+    Frame {
+        msec: 5216
+        hash: "3511938df57c4cdce316692de204b057"
+    }
+    Frame {
+        msec: 5232
+        hash: "99583918d068ab5d132fe7a699c2a7a6"
+    }
+    Frame {
+        msec: 5248
+        hash: "c0ce9df18479dbb57fb1dbc777f4f0e5"
+    }
+    Frame {
+        msec: 5264
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5280
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5296
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5312
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5328
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5344
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5360
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5376
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5392
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5408
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5424
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5440
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5456
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5472
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5488
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5504
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5520
+        hash: "b24db7b5c406328380fcf9927fb26c5c"
+    }
+    Frame {
+        msec: 5536
+        hash: "98cc64411264d8a635a6afe6b11cee6e"
+    }
+    Frame {
+        msec: 5552
+        hash: "b86434b7af8ad1db946c43a2791d69ab"
+    }
+    Frame {
+        msec: 5568
+        hash: "f45616f9e33658d1dddb537e842c8768"
+    }
+    Frame {
+        msec: 5584
+        hash: "e49d8955e27cdc19a37c331e56c81af1"
+    }
+    Frame {
+        msec: 5600
+        hash: "b2dbe764906b50195f65dc11a5842515"
+    }
+    Frame {
+        msec: 5616
+        hash: "71ce7c63d65c29cdffd83f5ae07f0b93"
+    }
+    Frame {
+        msec: 5632
+        hash: "901d01e1fc777ec185cd023ad0ace4c1"
+    }
+    Frame {
+        msec: 5648
+        hash: "a3f31de30fc2e92bae1f735504216216"
+    }
+    Frame {
+        msec: 5664
+        hash: "0fc52dd8102506e3e7671fa548551b23"
+    }
+    Frame {
+        msec: 5680
+        hash: "fb92809e728416035dbb91116ad8fe0e"
+    }
+    Frame {
+        msec: 5696
+        hash: "9003dc8ca4f781909035cb03dc45864f"
+    }
+    Frame {
+        msec: 5712
+        hash: "2bff1de793ad8521fd54413849c3cf29"
+    }
+    Frame {
+        msec: 5728
+        hash: "8362e4db7c4446282d844a4fc6632d19"
+    }
+    Frame {
+        msec: 5744
+        hash: "b874fa274c6ec77c106ff4a0288f9169"
+    }
+    Frame {
+        msec: 5760
+        image: "dynamic.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5792
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5808
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5824
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5840
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5856
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5872
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5888
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5904
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5920
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5936
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5952
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5968
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 5984
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 6000
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 6016
+        hash: "e64ac8e11e36cafb25c947c5802d54b9"
+    }
+    Frame {
+        msec: 6032
+        hash: "7621e64568058b82bcb6f6b46cee3ebc"
+    }
+    Frame {
+        msec: 6048
+        hash: "f77f6de6fc88813f49427b4888a59dbf"
+    }
+    Frame {
+        msec: 6064
+        hash: "d3a48f596219372ac25941e4c5ec5b2b"
+    }
+    Frame {
+        msec: 6080
+        hash: "d572d932b613f9ca1e0acf144f127dd1"
+    }
+    Frame {
+        msec: 6096
+        hash: "edf317eaf51d933bcd0f57f214921a81"
+    }
+    Frame {
+        msec: 6112
+        hash: "e0cee7959a5a8a08ad03d75e7b5c6ca1"
+    }
+    Frame {
+        msec: 6128
+        hash: "96877a15f44d4a2c8d9974cb28b9e1b6"
+    }
+    Frame {
+        msec: 6144
+        hash: "c0ffb0ef6dd9d007d201feebd2f68e44"
+    }
+    Frame {
+        msec: 6160
+        hash: "209fb930223243fa19c5dde9e85ec518"
+    }
+    Frame {
+        msec: 6176
+        hash: "ae98ac4dba0e78eb8fb7f7dbe29b2832"
+    }
+    Frame {
+        msec: 6192
+        hash: "c94a7d68ce007d83df77a595a5815a96"
+    }
+    Frame {
+        msec: 6208
+        hash: "4c28e409bf5a6c1289bcab8cd59a9e42"
+    }
+    Frame {
+        msec: 6224
+        hash: "ea1009f1a3446dd5ce937e6949794794"
+    }
+    Frame {
+        msec: 6240
+        hash: "940c16766c2f87feef48e1187672ca9b"
+    }
+    Frame {
+        msec: 6256
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6272
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6288
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6304
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6320
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6336
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6352
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6368
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+    Frame {
+        msec: 6384
+        hash: "93664c87c8dcfadc0345f646b2508625"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.0.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.0.png
new file mode 100644
index 0000000..f7018fd
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.qml b/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.qml
new file mode 100644
index 0000000..1eb115d
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.qml
@@ -0,0 +1,339 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 32
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 48
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 64
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 80
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 96
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 112
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 128
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 144
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 160
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 176
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 192
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 208
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 224
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 240
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 256
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 272
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 288
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 304
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 320
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 336
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 352
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 368
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 384
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 400
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 416
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 432
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 448
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 464
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 480
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 496
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 512
+        hash: "0273c293855f2b2bdbf579fc5cdce63f"
+    }
+    Frame {
+        msec: 528
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 544
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 560
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 576
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 592
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 608
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 624
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 640
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 656
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 672
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 688
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 704
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 720
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 736
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 752
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 768
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 784
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 800
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 816
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 832
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 848
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 864
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 880
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 896
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 912
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 928
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 944
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 960
+        image: "repeater.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 992
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1008
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1024
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1040
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1056
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1072
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1088
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1104
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1120
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1136
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1152
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1168
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1184
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1200
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1216
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1232
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1248
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1264
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1280
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1296
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1312
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+    Frame {
+        msec: 1328
+        hash: "53a01771047c8ec806a335a1a3d6af71"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/dynamic.qml b/tests/auto/declarative/visual/qdeclarativepositioners/dynamic.qml
new file mode 100644
index 0000000..f45e9a4
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/dynamic.qml
@@ -0,0 +1,65 @@
+import Qt 4.6
+
+Item {
+    width: 400; height: 400;
+    property int step: 0
+    function tick()
+    {
+        step++;
+        if(step == 1){
+            row1.destroy(); //Not dynamically created, so is this valid?
+        }else if(step == 2){
+            r2a.destroy();
+        }else if(step == 3){
+            r2b.destroy();
+        }else if(step == 4){
+            r2c.destroy();
+        }else if(step == 5){
+            r3a.parent = row2;
+        }else if(step == 6){
+            r3b.parent = row2;
+        }else if(step == 7){
+            r3c.parent = row2;
+        }else if(step == 8){
+            row3.destroy();
+        }else{
+            repeater.model++;
+        }
+    }
+
+    //Tests base positioner functionality, so just using row
+    Row{
+        id: row1
+        Rectangle{id: r1a; width:20; height:20; color: "red"}
+        Rectangle{id: r1b; width:20; height:20; color: "green"}
+        Rectangle{id: r1c; width:20; height:20; color: "blue"}
+    }
+    Row{
+        y:20
+        id: row2
+        move: Transition{NumberAnimation{properties:"x"}}
+        Repeater{ 
+            id: repeater 
+            model: 0; 
+            delegate: Component{ Rectangle { color: "yellow"; width:20; height:20;}}
+        }
+        Rectangle{id: r2a; width:20; height:20; color: "red"}
+        Rectangle{id: r2b; width:20; height:20; color: "green"}
+        Rectangle{id: r2c; width:20; height:20; color: "blue"}
+    }
+    Row{
+        move: Transition{NumberAnimation{properties:"x"}}
+        y:40
+        id: row3
+        Rectangle{id: r3a; width:20; height:20; color: "red"}
+        Rectangle{id: r3b; width:20; height:20; color: "green"}
+        Rectangle{id: r3c; width:20; height:20; color: "blue"}
+    }
+    Timer{
+        interval: 500;
+        running: true;
+        repeat: true;
+        onTriggered: tick();
+    }
+}
+
diff --git a/tests/auto/declarative/visual/qdeclarativepositioners/repeater.qml b/tests/auto/declarative/visual/qdeclarativepositioners/repeater.qml
new file mode 100644
index 0000000..ff60365
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/repeater.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+
+Item{
+    width: 200; height: 600
+    Column{
+        Rectangle{color:"Red"; width:40; height:40;}
+        Repeater{
+            id: rep
+            model: 3
+            delegate: Component{Rectangle{color:"Green"; width:40; height:40; radius: 20;}}
+        }
+        Rectangle{color:"Blue"; width:40; height:40;}
+    }
+    Timer{ interval: 500; running: true; onTriggered: rep.model=6;}
+}
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml
new file mode 100644
index 0000000..04bbabc
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml
@@ -0,0 +1,64 @@
+import Qt 4.6
+
+Rectangle {
+    id: clock
+    color: "gray"
+    width: 200; height: 200
+
+    property var hours: 10
+    property var minutes: 28
+    property var seconds: 0
+
+    Timer {
+        interval: 1000; running: true; repeat: true; triggeredOnStart: true
+        onTriggered: seconds++
+    }
+
+    Image { id: background; source: "content/clock.png" }
+
+    Image {
+        x: 92.5; y: 27
+        source: "content/hour.png"
+        smooth: true
+        transform: Rotation {
+            id: hourRotation
+            origin.x: 7.5; origin.y: 73; angle: 0
+            angle: SpringFollow {
+                spring: 2; damping: 0.2; modulus: 360
+                source: (clock.hours * 30) + (clock.minutes * 0.5)
+            }
+        }
+    }
+
+    Image {
+        x: 93.5; y: 17
+        source: "content/minute.png"
+        smooth: true
+        transform: Rotation {
+            id: minuteRotation
+            origin.x: 6.5; origin.y: 83; angle: 0
+            angle: SpringFollow {
+                spring: 2; damping: 0.2; modulus: 360
+                source: clock.minutes * 6
+            }
+        }
+    }
+
+    Image {
+        x: 97.5; y: 20
+        source: "content/second.png"
+        smooth: true
+        transform: Rotation {
+            id: secondRotation
+            origin.x: 2.5; origin.y: 80; angle: 0
+            angle: SpringFollow {
+                spring: 5; damping: 0.25; modulus: 360
+                source: clock.seconds * 6
+            }
+        }
+    }
+
+    Image {
+        anchors.centerIn: background; source: "content/center.png"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/background.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/background.png
new file mode 100644
index 0000000..a885950
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/content/background.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/center.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/center.png
new file mode 100755
index 0000000..7fbd802
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/content/center.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/clock.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/clock.png
new file mode 100755
index 0000000..462edac
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/content/clock.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/hour.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/hour.png
new file mode 100755
index 0000000..f8061a1
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/content/hour.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/minute.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/minute.png
new file mode 100755
index 0000000..1297ec7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/content/minute.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/content/second.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/second.png
new file mode 100755
index 0000000..4aa9fb5
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/content/second.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.0.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.0.png
new file mode 100644
index 0000000..baf1d45
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.1.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.1.png
new file mode 100644
index 0000000..932f63f
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.2.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.2.png
new file mode 100644
index 0000000..a5cb437
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.3.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.3.png
new file mode 100644
index 0000000..62e895c
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.qml
new file mode 100644
index 0000000..ffc6a5e
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.qml
@@ -0,0 +1,1135 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "d17c9cd015b065adf7e36ad0d4f6c00c"
+    }
+    Frame {
+        msec: 32
+        hash: "e759f652c69a06d01837302cc0369a58"
+    }
+    Frame {
+        msec: 48
+        hash: "392855ef490903121fb894858961dfb0"
+    }
+    Frame {
+        msec: 64
+        hash: "5ba4248f606a3a35d840cb98eff30b46"
+    }
+    Frame {
+        msec: 80
+        hash: "3b97e1ab4054c20d19c1d05f795b71de"
+    }
+    Frame {
+        msec: 96
+        hash: "81904d248125cf35249f79da7e94d8d7"
+    }
+    Frame {
+        msec: 112
+        hash: "474179152aad4b64904c8b7c63581a89"
+    }
+    Frame {
+        msec: 128
+        hash: "583a7906d1dc41d8ce8d0c8f28c9b8c5"
+    }
+    Frame {
+        msec: 144
+        hash: "341437083f858e2dca36a8bb39559a1e"
+    }
+    Frame {
+        msec: 160
+        hash: "ed75a933c176ed6ac3fa5b2986cbfade"
+    }
+    Frame {
+        msec: 176
+        hash: "5494c10d3984a9be607b8b5ee659ebfc"
+    }
+    Frame {
+        msec: 192
+        hash: "7af8dfca43036ee69012cbb100d110ad"
+    }
+    Frame {
+        msec: 208
+        hash: "356b8185889e560b5a1a2d6436dac834"
+    }
+    Frame {
+        msec: 224
+        hash: "f601a66de5dc1a388e515ba4ff14be6e"
+    }
+    Frame {
+        msec: 240
+        hash: "4cfb9f3a72070533288b2e50820cbbbd"
+    }
+    Frame {
+        msec: 256
+        hash: "ddcb670af0806dadf5897bcd3fd65cd7"
+    }
+    Frame {
+        msec: 272
+        hash: "3fedf4aa340d7632359273b1eb71c5a3"
+    }
+    Frame {
+        msec: 288
+        hash: "3dab7e1eaccb68b14e30741775db6ff7"
+    }
+    Frame {
+        msec: 304
+        hash: "015ab6c080c2ffab8ac763681bf3f95c"
+    }
+    Frame {
+        msec: 320
+        hash: "74f438510f0d8f64120cc45bca7f4f5d"
+    }
+    Frame {
+        msec: 336
+        hash: "e57666fb224cdbf869e5be4ef3391be9"
+    }
+    Frame {
+        msec: 352
+        hash: "ff8b3dddd4d10b111b38801470fcbfd0"
+    }
+    Frame {
+        msec: 368
+        hash: "e547ee9f1e509d5db980cb91fce5f6ee"
+    }
+    Frame {
+        msec: 384
+        hash: "aaa9fb71bd47ad3a1c753d7ac918e399"
+    }
+    Frame {
+        msec: 400
+        hash: "54a335aac86669138730c0735ea99c8b"
+    }
+    Frame {
+        msec: 416
+        hash: "ff8f30aaa7afd8abfdd147b830e9d6c4"
+    }
+    Frame {
+        msec: 432
+        hash: "07f8fca270953cf815cb0e77534da824"
+    }
+    Frame {
+        msec: 448
+        hash: "30799c12182b2c3eb2f28b05d81ed6fc"
+    }
+    Frame {
+        msec: 464
+        hash: "6244e3b740218aec56c81c92dc57abcb"
+    }
+    Frame {
+        msec: 480
+        hash: "cb10a34e3d234043704e633b49184607"
+    }
+    Frame {
+        msec: 496
+        hash: "66de73779b5f86a6a1692eb74be24201"
+    }
+    Frame {
+        msec: 512
+        hash: "4c4c0b5e75f0f587ace8002720d78309"
+    }
+    Frame {
+        msec: 528
+        hash: "88c774ec272c72457b35b60306c2bc21"
+    }
+    Frame {
+        msec: 544
+        hash: "28ce64adc1d35d6bc34174765beda553"
+    }
+    Frame {
+        msec: 560
+        hash: "37238c3d6dc0c34bf4e00ba2a82ce3aa"
+    }
+    Frame {
+        msec: 576
+        hash: "d14dd306fec80f1a1ff9a85aa51b9a57"
+    }
+    Frame {
+        msec: 592
+        hash: "bfa2ec6fa546c75ee85e2ebeb3af8e3c"
+    }
+    Frame {
+        msec: 608
+        hash: "d1ec3faab47065f34e9397fd73f9edce"
+    }
+    Frame {
+        msec: 624
+        hash: "0b59b5dba365fff38872b520afc84edb"
+    }
+    Frame {
+        msec: 640
+        hash: "3c4ae01b5e878b85a2eea403f3ad478a"
+    }
+    Frame {
+        msec: 656
+        hash: "329111f7079230e8b3cfda1217e8fcdf"
+    }
+    Frame {
+        msec: 672
+        hash: "97761329ac9ba03ec41e3d5b35f245df"
+    }
+    Frame {
+        msec: 688
+        hash: "9d26e3a3357530e903ee89f7bf439357"
+    }
+    Frame {
+        msec: 704
+        hash: "1cf4c130ea3565547ff74280211f10c9"
+    }
+    Frame {
+        msec: 720
+        hash: "d60284711cb557b1dab4d27072c95597"
+    }
+    Frame {
+        msec: 736
+        hash: "98195e02405ee26c0a6a3177cebe9eaa"
+    }
+    Frame {
+        msec: 752
+        hash: "f0a776c39363e340ebfb7736f368f609"
+    }
+    Frame {
+        msec: 768
+        hash: "5a146b4b76f93e3064d5dfa13107b1c3"
+    }
+    Frame {
+        msec: 784
+        hash: "7f7fef3a7ff2047f598bfca0fc7d5935"
+    }
+    Frame {
+        msec: 800
+        hash: "85a2fd48605f8a77764bf96542db14c3"
+    }
+    Frame {
+        msec: 816
+        hash: "89bdc99d16e6605e2106dfa5f53d7c8e"
+    }
+    Frame {
+        msec: 832
+        hash: "d03754d56d85508b7c77959d1ab7b34a"
+    }
+    Frame {
+        msec: 848
+        hash: "8d330472a376b47d65cec0b8e3df25cb"
+    }
+    Frame {
+        msec: 864
+        hash: "401adaeecfd2c0a5598194e9ead4dd5d"
+    }
+    Frame {
+        msec: 880
+        hash: "5c600e940e0a01fec15505fba595df3d"
+    }
+    Frame {
+        msec: 896
+        hash: "b7940b041fbd3df5e6969130bf97da10"
+    }
+    Frame {
+        msec: 912
+        hash: "62314bb115c307eeff4c4c7c91ee74a2"
+    }
+    Frame {
+        msec: 928
+        hash: "54745a8a7ed96a4d5e2d4ec2de605882"
+    }
+    Frame {
+        msec: 944
+        hash: "a4145b63f59d060ac0e0dc32dd22c815"
+    }
+    Frame {
+        msec: 960
+        image: "clock.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "c420b1298329c7eb0d3ec6a90a7eb802"
+    }
+    Frame {
+        msec: 992
+        hash: "e63a5384cde6287c3cd8bdb823f35dca"
+    }
+    Frame {
+        msec: 1008
+        hash: "af708b5e4a2a706385afd43896eeff16"
+    }
+    Frame {
+        msec: 1024
+        hash: "32011e16d4b1c14619820ade020f6416"
+    }
+    Frame {
+        msec: 1040
+        hash: "fbf9f8f075b15922f7306e469075d3cf"
+    }
+    Frame {
+        msec: 1056
+        hash: "bf0fab116eae6e7fb5b3209220a3a52a"
+    }
+    Frame {
+        msec: 1072
+        hash: "7a21aee4bcb99feb12a2a2c6bb3fd893"
+    }
+    Frame {
+        msec: 1088
+        hash: "d721462af9c94e13f12374b2590dad1e"
+    }
+    Frame {
+        msec: 1104
+        hash: "70385b585c2cbf1b2d64f1b9ebb5fb56"
+    }
+    Frame {
+        msec: 1120
+        hash: "fc7adc3dd2f42bfe6cd74c2ee1ea9aa8"
+    }
+    Frame {
+        msec: 1136
+        hash: "232884da74c9843d1349e82a7300cc19"
+    }
+    Frame {
+        msec: 1152
+        hash: "c6790d9c8cbea7bf97cbedf443da330c"
+    }
+    Frame {
+        msec: 1168
+        hash: "1847875f98555ef46a103c107bd5bc37"
+    }
+    Frame {
+        msec: 1184
+        hash: "d7b35992b44a0220bd83a00b7f75dcdd"
+    }
+    Frame {
+        msec: 1200
+        hash: "fc9e1db602c34863088d82ed8f601364"
+    }
+    Frame {
+        msec: 1216
+        hash: "404e2d071f8a6409ba6c6bfd8450693c"
+    }
+    Frame {
+        msec: 1232
+        hash: "dc2b6be9bc4c32460797e94ec617406c"
+    }
+    Frame {
+        msec: 1248
+        hash: "5077b6afd808f7a2c319e66f0aef3002"
+    }
+    Frame {
+        msec: 1264
+        hash: "07f07a04ec7c864196faeb44eff65b4c"
+    }
+    Frame {
+        msec: 1280
+        hash: "5d9089a68ef0b8b78b68c33d3082b597"
+    }
+    Frame {
+        msec: 1296
+        hash: "d955c9f66eaf123351a19947240e8847"
+    }
+    Frame {
+        msec: 1312
+        hash: "f1821cbcb3883a041f22a114f7158532"
+    }
+    Frame {
+        msec: 1328
+        hash: "77f17db09c5a7125c42359c304f274de"
+    }
+    Frame {
+        msec: 1344
+        hash: "bc38a4c859f596f6cf3c399d3a04b1cd"
+    }
+    Frame {
+        msec: 1360
+        hash: "982c43a4a1c9fae8bf3980b5885cee2f"
+    }
+    Frame {
+        msec: 1376
+        hash: "c15bb9b7dd77d505ee9918eb36b75c31"
+    }
+    Frame {
+        msec: 1392
+        hash: "bda534fd941a6f8289bfbec9b8dde717"
+    }
+    Frame {
+        msec: 1408
+        hash: "7ad5c54b481525ace42ae8926a5c0556"
+    }
+    Frame {
+        msec: 1424
+        hash: "2399778158f63481eb8514245277b917"
+    }
+    Frame {
+        msec: 1440
+        hash: "6c200d090b34a0152c7eb233c97c3886"
+    }
+    Frame {
+        msec: 1456
+        hash: "7ba4500e81df31e3e2c5d165bacf771a"
+    }
+    Frame {
+        msec: 1472
+        hash: "c7e13f3d9bdfe35eb905c1d4ed6b73ac"
+    }
+    Frame {
+        msec: 1488
+        hash: "808b72766f5dce71fc983ffa01945665"
+    }
+    Frame {
+        msec: 1504
+        hash: "899ac513755476db1e1304317524a755"
+    }
+    Frame {
+        msec: 1520
+        hash: "27190dce033171966981672e52f07107"
+    }
+    Frame {
+        msec: 1536
+        hash: "5d9ef583b6b3cb5257cb044cf376eff2"
+    }
+    Frame {
+        msec: 1552
+        hash: "77b648fe26a942b246eec0fa018ad86f"
+    }
+    Frame {
+        msec: 1568
+        hash: "744a61493816338113ba4ba7c05f76de"
+    }
+    Frame {
+        msec: 1584
+        hash: "2eb0da64d5937c1a38754fd55ca684d0"
+    }
+    Frame {
+        msec: 1600
+        hash: "6f799c2c0c0e1ed419af03f8bbb9fae1"
+    }
+    Frame {
+        msec: 1616
+        hash: "5b84344f31d5e4d15be6b53ad3bf9c84"
+    }
+    Frame {
+        msec: 1632
+        hash: "997b5967e3e3a35d02f10e1eae417dbf"
+    }
+    Frame {
+        msec: 1648
+        hash: "c522369c836e8d08c56e2e332dd005ac"
+    }
+    Frame {
+        msec: 1664
+        hash: "22f4072da05d261cfcca232ea54d2cb4"
+    }
+    Frame {
+        msec: 1680
+        hash: "7081a90c33785306800b7a57a4a9a75c"
+    }
+    Frame {
+        msec: 1696
+        hash: "32a8bea14c92ce61ede89182765f0759"
+    }
+    Frame {
+        msec: 1712
+        hash: "4bafe476d5301974c616311073763ab4"
+    }
+    Frame {
+        msec: 1728
+        hash: "291188ca795d455ae293437c2fb2303d"
+    }
+    Frame {
+        msec: 1744
+        hash: "99d2658f863c82dd71fde0f0b93b4d62"
+    }
+    Frame {
+        msec: 1760
+        hash: "8a7183e11fde2846d5435847ad9add45"
+    }
+    Frame {
+        msec: 1776
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1792
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1808
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1824
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1840
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1856
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1872
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1888
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1904
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1920
+        image: "clock.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1952
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1968
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 1984
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 2000
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 2016
+        hash: "34b6180b74f0653ce1f18c22022d333f"
+    }
+    Frame {
+        msec: 2032
+        hash: "150f511972394d8485979a6d9badcee5"
+    }
+    Frame {
+        msec: 2048
+        hash: "50b420f72479ec613fd443b5faa3cb94"
+    }
+    Frame {
+        msec: 2064
+        hash: "a51cbeea7ad5407b2784a3a3c8ca1ecf"
+    }
+    Frame {
+        msec: 2080
+        hash: "0f658f4c91f890cd252d0f9d9bbe064d"
+    }
+    Frame {
+        msec: 2096
+        hash: "c814c99815a91547eff01dc899c275f2"
+    }
+    Frame {
+        msec: 2112
+        hash: "f9dac59029008e52efe4225cf919f013"
+    }
+    Frame {
+        msec: 2128
+        hash: "b87bdcf09b425f2b2d6aed65f96ae8a3"
+    }
+    Frame {
+        msec: 2144
+        hash: "f353bf64e664166a542aa027dc625529"
+    }
+    Frame {
+        msec: 2160
+        hash: "12492b26c2f1c018e034c0fa936fa7b5"
+    }
+    Frame {
+        msec: 2176
+        hash: "33f04d25bced580f15590f12ddafef62"
+    }
+    Frame {
+        msec: 2192
+        hash: "cdd8ee656e4fec3ac6e72b6f7626de3b"
+    }
+    Frame {
+        msec: 2208
+        hash: "22a94ea46fb9ee78830eab79e4adc5c5"
+    }
+    Frame {
+        msec: 2224
+        hash: "64a10c9d4738c004c7f08f95b48a7a4d"
+    }
+    Frame {
+        msec: 2240
+        hash: "ff3300fb49a735e0a958362aead1905f"
+    }
+    Frame {
+        msec: 2256
+        hash: "8289dfdad12a8c13513175e5aad6a2d9"
+    }
+    Frame {
+        msec: 2272
+        hash: "49e5cbb94f7d8bc853ca3c9366d737c9"
+    }
+    Frame {
+        msec: 2288
+        hash: "76d2d8df4ad0359bb8ae102b225b3a68"
+    }
+    Frame {
+        msec: 2304
+        hash: "98d925b3306aa7dd1b1fb9e066cd8a02"
+    }
+    Frame {
+        msec: 2320
+        hash: "3911b53eb0346af1773ad991232e61ee"
+    }
+    Frame {
+        msec: 2336
+        hash: "8991c10234f9f286ebab39d72729525d"
+    }
+    Frame {
+        msec: 2352
+        hash: "ca2c8c6f23b30957a5cc20d9750a3ffe"
+    }
+    Frame {
+        msec: 2368
+        hash: "80abe9b146b31dbedf1fe2357d922dda"
+    }
+    Frame {
+        msec: 2384
+        hash: "0e34091d6bceab00bdabcec78e99e265"
+    }
+    Frame {
+        msec: 2400
+        hash: "ba04053c25e53b3dc790feac9a33e221"
+    }
+    Frame {
+        msec: 2416
+        hash: "cb6f7f2cce4f68ef1d35f765e00bbf7b"
+    }
+    Frame {
+        msec: 2432
+        hash: "1e63fb94f5fbf3b600ec9298cbb97c8a"
+    }
+    Frame {
+        msec: 2448
+        hash: "8991c10234f9f286ebab39d72729525d"
+    }
+    Frame {
+        msec: 2464
+        hash: "00531d4a5fe98bbb487ad835414e7d07"
+    }
+    Frame {
+        msec: 2480
+        hash: "7af9f861cb57c937c87b24eee9fbb558"
+    }
+    Frame {
+        msec: 2496
+        hash: "7ecd1a4a75753e70ad5937e5bc897e03"
+    }
+    Frame {
+        msec: 2512
+        hash: "557766fe964033f6a488574af7306cac"
+    }
+    Frame {
+        msec: 2528
+        hash: "bd0f7164dd0a84ce1a1b2a6acbc2157b"
+    }
+    Frame {
+        msec: 2544
+        hash: "d24ef664cf13519b99d6193bf98fcfd1"
+    }
+    Frame {
+        msec: 2560
+        hash: "6c3626248bbb41cab85ec2a908b7874b"
+    }
+    Frame {
+        msec: 2576
+        hash: "0f9bea8d474690164a09dfd3b13ff80b"
+    }
+    Frame {
+        msec: 2592
+        hash: "e5197674c91de893a970614e650547e5"
+    }
+    Frame {
+        msec: 2608
+        hash: "ce6861e9a7e75b809df026f078c8516b"
+    }
+    Frame {
+        msec: 2624
+        hash: "eb0539e30fd53fb905d7b28ff0bc6cfd"
+    }
+    Frame {
+        msec: 2640
+        hash: "45f70dda0d647119175457fb4d451e85"
+    }
+    Frame {
+        msec: 2656
+        hash: "ca6b75fa4ee612bf6bb1776ef4115b16"
+    }
+    Frame {
+        msec: 2672
+        hash: "c7d6bd687be6d5476300539411b97fc5"
+    }
+    Frame {
+        msec: 2688
+        hash: "27da9137b936d813d3c79a873053ed38"
+    }
+    Frame {
+        msec: 2704
+        hash: "4389a5758bf9df9553300c074aa7bb36"
+    }
+    Frame {
+        msec: 2720
+        hash: "30476b70a29716b359a046f99b6387e5"
+    }
+    Frame {
+        msec: 2736
+        hash: "b91c6f1e57d718e95ab05d1f386aedb9"
+    }
+    Frame {
+        msec: 2752
+        hash: "578b022173dcac39d227ffeb043e53d0"
+    }
+    Frame {
+        msec: 2768
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2784
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2800
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2816
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2832
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2848
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2864
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2880
+        image: "clock.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2912
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2928
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2944
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2960
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2976
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 2992
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 3008
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 3024
+        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
+    }
+    Frame {
+        msec: 3040
+        hash: "294d542f880356b4cbb171170c28dcd7"
+    }
+    Frame {
+        msec: 3056
+        hash: "946b5937974e28ffd996ce132c8fad15"
+    }
+    Frame {
+        msec: 3072
+        hash: "bb61994ff1dc36d3933084b874073832"
+    }
+    Frame {
+        msec: 3088
+        hash: "ec337c7ae77deeb41f38adb1851720e5"
+    }
+    Frame {
+        msec: 3104
+        hash: "7691c6c048b78e1551b46a37b6e95b16"
+    }
+    Frame {
+        msec: 3120
+        hash: "b3116620d319ae4b681f4ca76c068b32"
+    }
+    Frame {
+        msec: 3136
+        hash: "ed5a27e5be3dbde3867715f877da41db"
+    }
+    Frame {
+        msec: 3152
+        hash: "8dcc220cc652f57aa8ac33364edc96a3"
+    }
+    Frame {
+        msec: 3168
+        hash: "a7832d86283e27ee1523c4808b42fc43"
+    }
+    Frame {
+        msec: 3184
+        hash: "fc90d18b072638f2df1bacee12fe1743"
+    }
+    Frame {
+        msec: 3200
+        hash: "cdd7b5598155eba57783ebe1872db818"
+    }
+    Frame {
+        msec: 3216
+        hash: "b45e32d12bbc2e56f4a3e7e473528d3e"
+    }
+    Frame {
+        msec: 3232
+        hash: "5762a693ea6287e8987c604ef9fac361"
+    }
+    Frame {
+        msec: 3248
+        hash: "2e46a8df5ec0c7070a374186a313f2c6"
+    }
+    Frame {
+        msec: 3264
+        hash: "e612134417f3f901661b658801a72848"
+    }
+    Frame {
+        msec: 3280
+        hash: "5de468fac915894ef34f3fee1c637e01"
+    }
+    Frame {
+        msec: 3296
+        hash: "e29c8713573e49fc98387311d80c7510"
+    }
+    Frame {
+        msec: 3312
+        hash: "6fce67b704f613e6fd9181ccb9ee237f"
+    }
+    Frame {
+        msec: 3328
+        hash: "bf499add3d91d751ffa1cce28bece380"
+    }
+    Frame {
+        msec: 3344
+        hash: "7d50cad7b18a4a37be6aac7796014195"
+    }
+    Frame {
+        msec: 3360
+        hash: "6695208c8d39373ff0846c821c819cb2"
+    }
+    Frame {
+        msec: 3376
+        hash: "0140ec2286b0fb94340d2dd6d418f539"
+    }
+    Frame {
+        msec: 3392
+        hash: "9f92a99737aa6a7da48af7e7a4ed7a6a"
+    }
+    Frame {
+        msec: 3408
+        hash: "8e593e8192d17d07c2265d6fa840f281"
+    }
+    Frame {
+        msec: 3424
+        hash: "ea70e72eb12d5595d9bf0d9cc77efd4d"
+    }
+    Frame {
+        msec: 3440
+        hash: "faeeb9e6e6a260a266ac8965f204b542"
+    }
+    Frame {
+        msec: 3456
+        hash: "d50987082d056997a8e7fe5940cb7968"
+    }
+    Frame {
+        msec: 3472
+        hash: "44089138e01bfee916306ae66ba43e9f"
+    }
+    Frame {
+        msec: 3488
+        hash: "60256356ca6fe8bd323ef36bc149a3ea"
+    }
+    Frame {
+        msec: 3504
+        hash: "6caae71d6bd897d755aeb22f10862171"
+    }
+    Frame {
+        msec: 3520
+        hash: "8ba18bf5df010718f83d6bb25aa1858b"
+    }
+    Frame {
+        msec: 3536
+        hash: "a903996370fb7efcaf295f00b9b4c4b6"
+    }
+    Frame {
+        msec: 3552
+        hash: "cc0b736c8b4d46d3d809dcfe82068c88"
+    }
+    Frame {
+        msec: 3568
+        hash: "037b2f65d162d44c39706d322cd6b6e5"
+    }
+    Frame {
+        msec: 3584
+        hash: "92c2b4f346329ffbcae07db74332ebbe"
+    }
+    Frame {
+        msec: 3600
+        hash: "3f9b2b5aade31333568a7cccf89e3176"
+    }
+    Frame {
+        msec: 3616
+        hash: "b40f9cce4cddf9fa5245276a105a3e0d"
+    }
+    Frame {
+        msec: 3632
+        hash: "74eb3e8a282693bd6bc92f381e380d61"
+    }
+    Frame {
+        msec: 3648
+        hash: "43d85dd9e0de49c639db0d91047c88bb"
+    }
+    Frame {
+        msec: 3664
+        hash: "563a07f4aa618252933e0356cc300bba"
+    }
+    Frame {
+        msec: 3680
+        hash: "73d1e5745154996fd245a91a831d5462"
+    }
+    Frame {
+        msec: 3696
+        hash: "7b2785b605c64135ea6914ad8388eb8f"
+    }
+    Frame {
+        msec: 3712
+        hash: "b2d989af972715a86ca374753d32f757"
+    }
+    Frame {
+        msec: 3728
+        hash: "96311aac52bc9167a7350af29741f3dc"
+    }
+    Frame {
+        msec: 3744
+        hash: "56e4b98816896f7353dddeac090f70d1"
+    }
+    Frame {
+        msec: 3760
+        hash: "7bd8ac36107e9e5db39e1aa37f2c5ca8"
+    }
+    Frame {
+        msec: 3776
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3792
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3808
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3824
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3840
+        image: "clock.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3872
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3888
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3904
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3920
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3936
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3952
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3968
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 3984
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 4000
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 4016
+        hash: "b9545df89c8bec940678b65d5ef9ce04"
+    }
+    Frame {
+        msec: 4032
+        hash: "df3a1204f6243673d567724d27d07a9e"
+    }
+    Frame {
+        msec: 4048
+        hash: "7d0d3e92cb61d868d062bdf173924a4d"
+    }
+    Frame {
+        msec: 4064
+        hash: "29948b5d7807a6ed0076a9637ec3eb79"
+    }
+    Frame {
+        msec: 4080
+        hash: "2986b5e0a4a49bbe9f4ffada30433a48"
+    }
+    Frame {
+        msec: 4096
+        hash: "0d9e3813141a1ee15474380902d87815"
+    }
+    Frame {
+        msec: 4112
+        hash: "c5197a932430d498b7344c1f37454320"
+    }
+    Frame {
+        msec: 4128
+        hash: "c8ef8acf314486c157e74bdd2695ddb2"
+    }
+    Frame {
+        msec: 4144
+        hash: "adeb73de4b967912a9f2b04ba2b6fe4c"
+    }
+    Frame {
+        msec: 4160
+        hash: "da5fddd1e4ab8c096af0acc62114d69f"
+    }
+    Frame {
+        msec: 4176
+        hash: "5ef0784315603da196e66b4628524c5c"
+    }
+    Frame {
+        msec: 4192
+        hash: "1ff2a89c510953d71198056f5ac5b1a6"
+    }
+    Frame {
+        msec: 4208
+        hash: "f63d409e134e59b875099ab11b469d21"
+    }
+    Frame {
+        msec: 4224
+        hash: "e353748e0b0c49a217d6e2d06a9bfeb6"
+    }
+    Frame {
+        msec: 4240
+        hash: "a9d7470902a232d815bd2580e24fdc22"
+    }
+    Frame {
+        msec: 4256
+        hash: "eecbad718aa4eaf5bef7cd921b2ce9f9"
+    }
+    Frame {
+        msec: 4272
+        hash: "7a51cadbfb93eb4a66acc9cb150002ed"
+    }
+    Frame {
+        msec: 4288
+        hash: "2aa511fb96a51a50e3a45b784e349c15"
+    }
+    Frame {
+        msec: 4304
+        hash: "a1ad19593dc6b9f4c027f388e802dcbe"
+    }
+    Frame {
+        msec: 4320
+        hash: "ef6787f03bc1e33ea5f2a54aa1ba3a41"
+    }
+    Frame {
+        msec: 4336
+        hash: "3386337bbc1ab82374d9965b7b0ffdef"
+    }
+    Frame {
+        msec: 4352
+        hash: "c76afb4f412b4d5dd8eca74db6c54fb8"
+    }
+    Frame {
+        msec: 4368
+        hash: "f91ac74ec153152670d43f42b1e2a2db"
+    }
+    Frame {
+        msec: 4384
+        hash: "58f22723fa0c67379972238e0e7ed5e2"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4400
+        hash: "a4730b0a8d6e0dd9e7eb58b51fb631ec"
+    }
+    Frame {
+        msec: 4416
+        hash: "193bf624efefcad70af29f41eeab128e"
+    }
+    Frame {
+        msec: 4432
+        hash: "d692f262facf26c2be2b0f747903d476"
+    }
+    Frame {
+        msec: 4448
+        hash: "e59e43b5d4abebea0a55b1d072d148bc"
+    }
+    Frame {
+        msec: 4464
+        hash: "134ff829e91161146b5f048a50c7eef7"
+    }
+    Frame {
+        msec: 4480
+        hash: "07a80e45e70cb13f45e3858404c5f8dd"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.0.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.0.png
new file mode 100644
index 0000000..3f42e75
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.1.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.1.png
new file mode 100644
index 0000000..d661df6
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.10.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.10.png
new file mode 100644
index 0000000..e8c96e1
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.10.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.2.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.2.png
new file mode 100644
index 0000000..35bfa43
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.3.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.3.png
new file mode 100644
index 0000000..74141cf
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.4.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.4.png
new file mode 100644
index 0000000..9544054
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.5.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.5.png
new file mode 100644
index 0000000..4b02c79
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.6.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.6.png
new file mode 100644
index 0000000..8ea8345
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.7.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.7.png
new file mode 100644
index 0000000..76a73e8
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.8.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.8.png
new file mode 100644
index 0000000..8824940
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.9.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.9.png
new file mode 100644
index 0000000..f954cc5
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.9.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.qml
new file mode 100644
index 0000000..fec5428
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.qml
@@ -0,0 +1,1763 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "3561ebf22b19c7bd5a70947d36b50b63"
+    }
+    Frame {
+        msec: 32
+        hash: "3561ebf22b19c7bd5a70947d36b50b63"
+    }
+    Frame {
+        msec: 48
+        hash: "bd0006fc34f58ec1ea6aa4c4acbb0070"
+    }
+    Frame {
+        msec: 64
+        hash: "c25f9fb6aea93413bfef5eb176c02476"
+    }
+    Frame {
+        msec: 80
+        hash: "4ce0eb12fb41960e60e208dffb09ed3a"
+    }
+    Frame {
+        msec: 96
+        hash: "75b3375881969710b6eb21f2a93c36cc"
+    }
+    Frame {
+        msec: 112
+        hash: "91e9b13e332959e41a29c0b225675a05"
+    }
+    Frame {
+        msec: 128
+        hash: "8e04a31a953b42903dffe86b37b3f59f"
+    }
+    Frame {
+        msec: 144
+        hash: "837e0e646a2853d3fde571f9dd966fc7"
+    }
+    Frame {
+        msec: 160
+        hash: "7367e25ae1e3a3731d83da76d5795f8c"
+    }
+    Frame {
+        msec: 176
+        hash: "3621846fb85b286a886a02de442e76c4"
+    }
+    Frame {
+        msec: 192
+        hash: "ed20a4c3476b8bb5545d5343747c39c8"
+    }
+    Frame {
+        msec: 208
+        hash: "1fc73efb410e9beb3f791cbff8e814b3"
+    }
+    Frame {
+        msec: 224
+        hash: "199c99a4e3aa14fbc8c8a0d8baacf998"
+    }
+    Frame {
+        msec: 240
+        hash: "513ce5a2f57e40002a26b7722c8a10db"
+    }
+    Frame {
+        msec: 256
+        hash: "b80b51cd4e75bdc799bbe79e66b7d02b"
+    }
+    Frame {
+        msec: 272
+        hash: "e1531b6c5b3ac872563fdfaf49d32a27"
+    }
+    Frame {
+        msec: 288
+        hash: "6d7cfd78ebd56ae6adfc97aad5d11b13"
+    }
+    Frame {
+        msec: 304
+        hash: "4252ebb2fba165e39f025f631e0a676a"
+    }
+    Frame {
+        msec: 320
+        hash: "04d6ae51415b083bbb0eabd1b0304ca4"
+    }
+    Frame {
+        msec: 336
+        hash: "750df1f1626c8b84dd72a35bf081fe00"
+    }
+    Frame {
+        msec: 352
+        hash: "003d7a846e09ba23ee8a7ae6d473be9f"
+    }
+    Frame {
+        msec: 368
+        hash: "5cf3abdbb9a5b8cba6a8afe8abb60ced"
+    }
+    Frame {
+        msec: 384
+        hash: "0669f86043a0c84d0b4672cc5c1136b4"
+    }
+    Frame {
+        msec: 400
+        hash: "94f59435fe4f3ca06699c996b537ae8c"
+    }
+    Frame {
+        msec: 416
+        hash: "211c8ec42a6d6949253af71c6eeffa53"
+    }
+    Frame {
+        msec: 432
+        hash: "6de6c6d1b4a37a864b96c0293be8ebf5"
+    }
+    Frame {
+        msec: 448
+        hash: "468d67d069eaac1968a6ad52e56f3ab5"
+    }
+    Frame {
+        msec: 464
+        hash: "18d8de7a5c73d8c8188e6ae00a701820"
+    }
+    Frame {
+        msec: 480
+        hash: "4387c724ed49bfbbca238bf57a704a14"
+    }
+    Frame {
+        msec: 496
+        hash: "f317c59f65c7266765333048d8545748"
+    }
+    Frame {
+        msec: 512
+        hash: "6575d40c2f27f110443a2ede8a873c77"
+    }
+    Frame {
+        msec: 528
+        hash: "3e65cb675124dbd9db5116fa7584e223"
+    }
+    Frame {
+        msec: 544
+        hash: "df80612a74b33eca81db6f43aa33e411"
+    }
+    Frame {
+        msec: 560
+        hash: "6b2bc20397f3fb452ea14d81e9efd61d"
+    }
+    Frame {
+        msec: 576
+        hash: "e5b8a2476487f6cd9fd37e3b3f54f88d"
+    }
+    Frame {
+        msec: 592
+        hash: "e93f8156e2dc278a5e20d9e28b48d9fa"
+    }
+    Frame {
+        msec: 608
+        hash: "e524d5117888b0b68781ffaf1a3e7303"
+    }
+    Frame {
+        msec: 624
+        hash: "f3b777409534d87c59e60499fd6a3808"
+    }
+    Frame {
+        msec: 640
+        hash: "09d1fa8f1306eb6f51db97d04c2d7ad3"
+    }
+    Frame {
+        msec: 656
+        hash: "acebdcebe6880c8b3b94ad7606181b72"
+    }
+    Frame {
+        msec: 672
+        hash: "347945a94002cd44d7a2df47f82940a1"
+    }
+    Frame {
+        msec: 688
+        hash: "c716014d63ff2a22cab04dadc18b10c1"
+    }
+    Frame {
+        msec: 704
+        hash: "ced019e3f8b5ca079582d01f1f585a8e"
+    }
+    Frame {
+        msec: 720
+        hash: "d61d31de835ea8d1ffa56fd04c873ac1"
+    }
+    Frame {
+        msec: 736
+        hash: "2eec542c5af4c6eecc153cc0fcae7dd3"
+    }
+    Frame {
+        msec: 752
+        hash: "c13b9443e1c000a2877e4586428da308"
+    }
+    Frame {
+        msec: 768
+        hash: "c5c2e30b3dc3298afc201f6045e79e59"
+    }
+    Frame {
+        msec: 784
+        hash: "308f2ca66133d37c2fcb222e68698d25"
+    }
+    Frame {
+        msec: 800
+        hash: "bf820215986a35b56daf07c164fd2a79"
+    }
+    Frame {
+        msec: 816
+        hash: "a0bb21475100fb25b767d055d70b062f"
+    }
+    Frame {
+        msec: 832
+        hash: "bfb0927bcb23689820b0f96ea56426fc"
+    }
+    Frame {
+        msec: 848
+        hash: "8f294742ca9dd6ab10689f1f4ec2ed96"
+    }
+    Frame {
+        msec: 864
+        hash: "f60c232307570fb4ec6e74f18e243553"
+    }
+    Frame {
+        msec: 880
+        hash: "7411970ab72d8b2dbf48ee8d4e6503b3"
+    }
+    Frame {
+        msec: 896
+        hash: "d4d766038daeae2fbec290204ca3983b"
+    }
+    Frame {
+        msec: 912
+        hash: "f85525c3fd784ee7f9a3d9465e37d6f3"
+    }
+    Frame {
+        msec: 928
+        hash: "c5e63da86ddbd2a54c7cd3d03e5428a2"
+    }
+    Frame {
+        msec: 944
+        hash: "369a7405b1717ddf06c99ab1dd6d4cb0"
+    }
+    Frame {
+        msec: 960
+        image: "follow.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "18d5c4378f9daf63bf4cb76d76374548"
+    }
+    Frame {
+        msec: 992
+        hash: "f36e649db2e1ec9fbe15e7711ea13ab5"
+    }
+    Frame {
+        msec: 1008
+        hash: "f68515607dca1bda14b6afa6e05ebb6b"
+    }
+    Frame {
+        msec: 1024
+        hash: "bc5cc4c9050a5bd4c64debd12643fd73"
+    }
+    Frame {
+        msec: 1040
+        hash: "f053a18bca4d8c47a0f181fad8118e9a"
+    }
+    Frame {
+        msec: 1056
+        hash: "9a2218f51faed4fa891c507fe6828d2c"
+    }
+    Frame {
+        msec: 1072
+        hash: "ce671ff4dd1f343243f2fcc263d137f4"
+    }
+    Frame {
+        msec: 1088
+        hash: "8624f8d814094ad25a1482a11f424990"
+    }
+    Frame {
+        msec: 1104
+        hash: "324dad940b3adb54491d6cdd4e7d8aa7"
+    }
+    Frame {
+        msec: 1120
+        hash: "0cd7c53ec5b591053de6769967b8bad5"
+    }
+    Frame {
+        msec: 1136
+        hash: "e9e8f5e9c2dc179498943d0b5912af09"
+    }
+    Frame {
+        msec: 1152
+        hash: "5f1552ccd61f09335a88658ee1c4e97e"
+    }
+    Frame {
+        msec: 1168
+        hash: "866e01eed7e26dd1bd9af8aaddf4d7c0"
+    }
+    Frame {
+        msec: 1184
+        hash: "2efba3c33c4c7b6d89ce7efca2dc516a"
+    }
+    Frame {
+        msec: 1200
+        hash: "2de9d8a2ad64d2491b3444712be032dc"
+    }
+    Frame {
+        msec: 1216
+        hash: "84206972322eae033d05f71b178180c9"
+    }
+    Frame {
+        msec: 1232
+        hash: "8571d11da1a893edcbe5add1a9399d7a"
+    }
+    Frame {
+        msec: 1248
+        hash: "c0d65ecefa77ee7cb1c08a560e3ad572"
+    }
+    Frame {
+        msec: 1264
+        hash: "0f8a8523969713771a6c7984069b15e4"
+    }
+    Frame {
+        msec: 1280
+        hash: "2e80e4b54538b7b586f4a3be55eb6da3"
+    }
+    Frame {
+        msec: 1296
+        hash: "ae028381f311a60946ecd26eab95bb42"
+    }
+    Frame {
+        msec: 1312
+        hash: "ac5902d58bc116a002c093f55cf20278"
+    }
+    Frame {
+        msec: 1328
+        hash: "242f8617718048cfab9950b812eb1b26"
+    }
+    Frame {
+        msec: 1344
+        hash: "b642f2f0d3161f80a702b09a910c589b"
+    }
+    Frame {
+        msec: 1360
+        hash: "d1508034ecd908120c6f58cf08360c3c"
+    }
+    Frame {
+        msec: 1376
+        hash: "ad10a5ea8598616f2ffa633eecfbd43a"
+    }
+    Frame {
+        msec: 1392
+        hash: "1d2c3cfaac1cca868f31872bf4248de8"
+    }
+    Frame {
+        msec: 1408
+        hash: "28da57a6aec84318ff6aa029ac17f1dd"
+    }
+    Frame {
+        msec: 1424
+        hash: "6f9bf89843d5e40f6c282e69337e7d25"
+    }
+    Frame {
+        msec: 1440
+        hash: "1c5733ad9620805127372fb76f5b0228"
+    }
+    Frame {
+        msec: 1456
+        hash: "16f21041e9e475a37c478cf38cdc353b"
+    }
+    Frame {
+        msec: 1472
+        hash: "b39ea2e8a1991b3ea5be818a284ff69f"
+    }
+    Frame {
+        msec: 1488
+        hash: "4f5bdc935080707525a2b74936b41b2e"
+    }
+    Frame {
+        msec: 1504
+        hash: "a39426dc761df1d2ba398aa17d220ded"
+    }
+    Frame {
+        msec: 1520
+        hash: "2e965042273b377958b04190250d273e"
+    }
+    Frame {
+        msec: 1536
+        hash: "51f021c1d50291b425c98dee4894b330"
+    }
+    Frame {
+        msec: 1552
+        hash: "88fea2e6d6898084acb5897833adb182"
+    }
+    Frame {
+        msec: 1568
+        hash: "12f55e64c8ec9825bf6c5cfd5d50d2bb"
+    }
+    Frame {
+        msec: 1584
+        hash: "365b358eb7a678e1076774c36a82f452"
+    }
+    Frame {
+        msec: 1600
+        hash: "a992b326739bff87bf042c711a7fa65c"
+    }
+    Frame {
+        msec: 1616
+        hash: "083aa3c766a3b50492e51aab3ee128d0"
+    }
+    Frame {
+        msec: 1632
+        hash: "16a2db3b3a773e2612bc57f7a7d7fbbe"
+    }
+    Frame {
+        msec: 1648
+        hash: "32a28101a53d308b107d26a30ae7cdd9"
+    }
+    Frame {
+        msec: 1664
+        hash: "da3908e584542ff2f73cb22369f49c1c"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 195; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1680
+        hash: "8ad535bb0c5decd8c970aa36286d57e7"
+    }
+    Frame {
+        msec: 1696
+        hash: "5bfbcab7607622486c350a9117ab0884"
+    }
+    Frame {
+        msec: 1712
+        hash: "17e13c8bfd81081f6400d3e71daecb4c"
+    }
+    Frame {
+        msec: 1728
+        hash: "9411a66b6c3ef9a98bc62dea282d6a51"
+    }
+    Frame {
+        msec: 1744
+        hash: "423cded80165ee13f903460e5396526b"
+    }
+    Frame {
+        msec: 1760
+        hash: "709cc55316e6702c1359b66c06676603"
+    }
+    Frame {
+        msec: 1776
+        hash: "27232931c000a2edb5c3d480a6692e6b"
+    }
+    Frame {
+        msec: 1792
+        hash: "22311fd0903b53f50df824ba345ca350"
+    }
+    Frame {
+        msec: 1808
+        hash: "9bb066e60e7e5b3eaa0a221b8ba1a431"
+    }
+    Frame {
+        msec: 1824
+        hash: "517000255d372d384773dff8c80f5a65"
+    }
+    Frame {
+        msec: 1840
+        hash: "329dbd77ae53ea8e4beb669a976033a8"
+    }
+    Frame {
+        msec: 1856
+        hash: "2acd5d3e878e1db5413270c1a50ffc83"
+    }
+    Frame {
+        msec: 1872
+        hash: "8eb5946ac5d53dfc2813d1f1c6a2b6c5"
+    }
+    Frame {
+        msec: 1888
+        hash: "375299e5b1067e02d5de3238a37659f2"
+    }
+    Frame {
+        msec: 1904
+        hash: "f385c90e585db5555e873996165f55af"
+    }
+    Frame {
+        msec: 1920
+        image: "follow.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "6c13bb69b6483c72463437e102a9dabb"
+    }
+    Frame {
+        msec: 1952
+        hash: "c1b5d10688681c3b2363bb6d4173deca"
+    }
+    Frame {
+        msec: 1968
+        hash: "b434649e4c9b2c184d2f9036f9d041bf"
+    }
+    Frame {
+        msec: 1984
+        hash: "ca32e9f9080983803bb37b7231ed1c84"
+    }
+    Frame {
+        msec: 2000
+        hash: "976eab47b2d6445fdd8293f2c73564c1"
+    }
+    Frame {
+        msec: 2016
+        hash: "e63daea8f3bc79cea7a6b8dcfd31a094"
+    }
+    Frame {
+        msec: 2032
+        hash: "626cbe5e6b79f2fd0ef57c943666b571"
+    }
+    Frame {
+        msec: 2048
+        hash: "4e07255ce12a21966eec33c0cc623d96"
+    }
+    Frame {
+        msec: 2064
+        hash: "94045005de77725c63c62575a6b06852"
+    }
+    Frame {
+        msec: 2080
+        hash: "3b6dcf783c5e9fe99ce3d9ca02bceff6"
+    }
+    Frame {
+        msec: 2096
+        hash: "e901ed7e831e2d012b97b98b3ab6fa1b"
+    }
+    Frame {
+        msec: 2112
+        hash: "74ef03f72d032daaff13114fde02b824"
+    }
+    Frame {
+        msec: 2128
+        hash: "9eb334d7dda3801c1fe292844040e014"
+    }
+    Frame {
+        msec: 2144
+        hash: "82bf8fb5e3a9bf167f3f00b1f6ab3c06"
+    }
+    Frame {
+        msec: 2160
+        hash: "df3a2bc7758d00d595347e62c7e53c4a"
+    }
+    Frame {
+        msec: 2176
+        hash: "e77ac04a6ad9f97226b45d202a0d5196"
+    }
+    Frame {
+        msec: 2192
+        hash: "37411333a28ea840c59cabd96fd1deba"
+    }
+    Frame {
+        msec: 2208
+        hash: "8d1eb90ffd080bcd078b69c9635108d1"
+    }
+    Frame {
+        msec: 2224
+        hash: "68ee5d58b2edeb6b5a64a714115e4499"
+    }
+    Frame {
+        msec: 2240
+        hash: "003ddf0a5dd3d4bb947a34bdd22ad8c1"
+    }
+    Frame {
+        msec: 2256
+        hash: "bf3c89d0a09ed2159a78f10124f5d7bb"
+    }
+    Frame {
+        msec: 2272
+        hash: "6ec994f41d4540db988846416c2f7b4f"
+    }
+    Frame {
+        msec: 2288
+        hash: "9ca7e3ca6ea26e8259d34a8c0f80f7a9"
+    }
+    Frame {
+        msec: 2304
+        hash: "edf5cea581d46400914610213c8503ea"
+    }
+    Frame {
+        msec: 2320
+        hash: "9b96aac3f98cd37a361788be8b81e308"
+    }
+    Frame {
+        msec: 2336
+        hash: "5d304a8398512ebc85bebf973ed6a4f4"
+    }
+    Frame {
+        msec: 2352
+        hash: "cf2a27a395f23f7976a48d69f5e8e120"
+    }
+    Frame {
+        msec: 2368
+        hash: "458323a37208ea14972d8f84cebc66a5"
+    }
+    Frame {
+        msec: 2384
+        hash: "da9c8e4d168b9cd32d5ec3f5857d2942"
+    }
+    Frame {
+        msec: 2400
+        hash: "5d6663be8e02b0a7a4701595c9c26663"
+    }
+    Frame {
+        msec: 2416
+        hash: "4190712a39ca07f810a6d84e15488393"
+    }
+    Frame {
+        msec: 2432
+        hash: "26b22be0a1c2fecec1e25a6513b19484"
+    }
+    Frame {
+        msec: 2448
+        hash: "3e623bc2b9e8cec49671571291cf6afb"
+    }
+    Frame {
+        msec: 2464
+        hash: "3e623bc2b9e8cec49671571291cf6afb"
+    }
+    Frame {
+        msec: 2480
+        hash: "2cb2968d16323af4659b3197d391bb91"
+    }
+    Frame {
+        msec: 2496
+        hash: "5376b1285647950428b29e75f2e27c4f"
+    }
+    Frame {
+        msec: 2512
+        hash: "baaacc3940c8d36f715d90e046346bed"
+    }
+    Frame {
+        msec: 2528
+        hash: "277719afea4c119f17c34c59ef0b7984"
+    }
+    Frame {
+        msec: 2544
+        hash: "00a172ff8afd1e8444fb84249a3af0fd"
+    }
+    Frame {
+        msec: 2560
+        hash: "bf8a0f939a5602a0a9f5a3bc7c8d0d86"
+    }
+    Frame {
+        msec: 2576
+        hash: "b22860751790b3113b2cb299c9f628b8"
+    }
+    Frame {
+        msec: 2592
+        hash: "fdda1e520457974443720bd44f21d929"
+    }
+    Frame {
+        msec: 2608
+        hash: "538af31f9463cd07163d54adc2721345"
+    }
+    Frame {
+        msec: 2624
+        hash: "2ca50398746c8fb1c936fd412c7556b4"
+    }
+    Frame {
+        msec: 2640
+        hash: "63cd898c3e22a29846489e5c47f455a1"
+    }
+    Frame {
+        msec: 2656
+        hash: "1e69cc765c3f2c27c2b6e7f3e47f515a"
+    }
+    Frame {
+        msec: 2672
+        hash: "9d7ce0df7bee9a387917ef228fd50652"
+    }
+    Frame {
+        msec: 2688
+        hash: "afa0b735a9dd0734362b3f3f7d7177c3"
+    }
+    Frame {
+        msec: 2704
+        hash: "91bee07133319a0adbf9a31c430e58ad"
+    }
+    Frame {
+        msec: 2720
+        hash: "6aee88b6391e524bafc15524825ada74"
+    }
+    Frame {
+        msec: 2736
+        hash: "655ce421faa628b3389f084fe675ad53"
+    }
+    Frame {
+        msec: 2752
+        hash: "367fd34b54f12e896839b0ef4fb06925"
+    }
+    Frame {
+        msec: 2768
+        hash: "0b3ac04504bfe876c4338a4dc3721280"
+    }
+    Frame {
+        msec: 2784
+        hash: "c6cdb77888f1a3cbfe4cfec28bfad12d"
+    }
+    Frame {
+        msec: 2800
+        hash: "ef01302544f4da4575035d3e4f2443c9"
+    }
+    Frame {
+        msec: 2816
+        hash: "53f01d26a75f7e91d14b8975c81638d5"
+    }
+    Frame {
+        msec: 2832
+        hash: "10fc7b3f7e5dff21edef4123d252cba0"
+    }
+    Frame {
+        msec: 2848
+        hash: "10fc7b3f7e5dff21edef4123d252cba0"
+    }
+    Frame {
+        msec: 2864
+        hash: "10fc7b3f7e5dff21edef4123d252cba0"
+    }
+    Frame {
+        msec: 2880
+        image: "follow.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "143970d31598c017d7f24e8b09fd0f0a"
+    }
+    Frame {
+        msec: 2912
+        hash: "fc6c38bfdcd2df7a928e83d57dc0b18d"
+    }
+    Frame {
+        msec: 2928
+        hash: "647c09aae23ea5ec7979775d3022cacf"
+    }
+    Frame {
+        msec: 2944
+        hash: "f1ed5cd564be1eed3242997c14a99887"
+    }
+    Frame {
+        msec: 2960
+        hash: "aec3d7f18d6c4002229ef1d36727c4b0"
+    }
+    Frame {
+        msec: 2976
+        hash: "3552e5a3923593a2c66ecd5e2cb2ee25"
+    }
+    Frame {
+        msec: 2992
+        hash: "55a72327b726a3c75383cc5a28ba9503"
+    }
+    Frame {
+        msec: 3008
+        hash: "c25ff06944f8c92006245452e07215ef"
+    }
+    Frame {
+        msec: 3024
+        hash: "cc0187a10a7ccf087838a481f667af6e"
+    }
+    Frame {
+        msec: 3040
+        hash: "ae9d7ff04066eb998d052c2e21b58327"
+    }
+    Frame {
+        msec: 3056
+        hash: "91707fa1aaa267e6d1d56d173a063bde"
+    }
+    Frame {
+        msec: 3072
+        hash: "c076a33b8afcaf915387375f065e49df"
+    }
+    Frame {
+        msec: 3088
+        hash: "c24390ec788b5f34356e7a6507507a93"
+    }
+    Frame {
+        msec: 3104
+        hash: "e42c9800379de3076d00802c68cc99e8"
+    }
+    Frame {
+        msec: 3120
+        hash: "a2d3ba5353b1c967da93d96b61f7927f"
+    }
+    Frame {
+        msec: 3136
+        hash: "fe719953aa3468d373801bb80ae93eff"
+    }
+    Frame {
+        msec: 3152
+        hash: "e89b9bed1ebc7ebdd37d6975ecb0601c"
+    }
+    Frame {
+        msec: 3168
+        hash: "7f3d84f49a7dd4fe39a1ba0ed7f5da3e"
+    }
+    Frame {
+        msec: 3184
+        hash: "b16c9e05f72e7c8fa59f80422b987600"
+    }
+    Frame {
+        msec: 3200
+        hash: "bd0606da0f7bc6c47a361462b3b2dede"
+    }
+    Frame {
+        msec: 3216
+        hash: "88f81db6d705b745c4d2ffe470cb6966"
+    }
+    Frame {
+        msec: 3232
+        hash: "4ac6769d3f725720bba6c125b43885cd"
+    }
+    Frame {
+        msec: 3248
+        hash: "4ac6769d3f725720bba6c125b43885cd"
+    }
+    Frame {
+        msec: 3264
+        hash: "4ac6769d3f725720bba6c125b43885cd"
+    }
+    Frame {
+        msec: 3280
+        hash: "4ac6769d3f725720bba6c125b43885cd"
+    }
+    Frame {
+        msec: 3296
+        hash: "88f81db6d705b745c4d2ffe470cb6966"
+    }
+    Frame {
+        msec: 3312
+        hash: "88f81db6d705b745c4d2ffe470cb6966"
+    }
+    Frame {
+        msec: 3328
+        hash: "1f112ff43280a208e967e373db8e3f34"
+    }
+    Frame {
+        msec: 3344
+        hash: "6d966dafdfd2cf1927c14f749e24a99c"
+    }
+    Frame {
+        msec: 3360
+        hash: "8ab4ce88e52d7cd2ec9059cdb973590d"
+    }
+    Frame {
+        msec: 3376
+        hash: "62d877f18b8d3fcf6b076946f2ce05f7"
+    }
+    Frame {
+        msec: 3392
+        hash: "efe3729cdeddc4bcee105b27e4062dcd"
+    }
+    Frame {
+        msec: 3408
+        hash: "a2eb63f12d434925d0780f4992155556"
+    }
+    Frame {
+        msec: 3424
+        hash: "5eee7ec87bb399e1395a8d337ede021b"
+    }
+    Frame {
+        msec: 3440
+        hash: "59769ae407be01b016df8d7fbf484243"
+    }
+    Frame {
+        msec: 3456
+        hash: "bbadb689ec5b76f76340905252b2376a"
+    }
+    Frame {
+        msec: 3472
+        hash: "97cd4f34259ac8370e8557ef3ecf5a96"
+    }
+    Frame {
+        msec: 3488
+        hash: "17c1513fe4c0132e15355378c6a6ee11"
+    }
+    Frame {
+        msec: 3504
+        hash: "7b19041638fc7d1cf60512f579f388dd"
+    }
+    Frame {
+        msec: 3520
+        hash: "4d23bbf68cb8b32638b73ac20551ee50"
+    }
+    Frame {
+        msec: 3536
+        hash: "3f0326db5a851887a534e80cc29dc21d"
+    }
+    Frame {
+        msec: 3552
+        hash: "df5902d22a31c4deac1428d2758a0ffa"
+    }
+    Frame {
+        msec: 3568
+        hash: "21badb1464775fa935c2619b91aa6e6e"
+    }
+    Frame {
+        msec: 3584
+        hash: "e8cf87f4a65f6915addc16de29c90108"
+    }
+    Frame {
+        msec: 3600
+        hash: "d3d4487b887695b7bba8e0af7756a0f8"
+    }
+    Frame {
+        msec: 3616
+        hash: "d7f52590e4f51621ad2d62c975a5d1ef"
+    }
+    Frame {
+        msec: 3632
+        hash: "9ebdc2b3ef05748e2cc8988f968f7a37"
+    }
+    Frame {
+        msec: 3648
+        hash: "74bb7974f9315e70e976c21955390b9e"
+    }
+    Frame {
+        msec: 3664
+        hash: "59e16a89e523160f2a482c22f003f87f"
+    }
+    Frame {
+        msec: 3680
+        hash: "d8284c216df0fdd37525f26b88707572"
+    }
+    Frame {
+        msec: 3696
+        hash: "d8711b4444eea59acc544652cea3c4ce"
+    }
+    Frame {
+        msec: 3712
+        hash: "12148c3f2b5f41a4ac4801e990b20114"
+    }
+    Frame {
+        msec: 3728
+        hash: "34429cbdfe581a524b1f9072cc404539"
+    }
+    Frame {
+        msec: 3744
+        hash: "1f6a17b91d73e10bcbdd166d97546822"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 195; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3760
+        hash: "bccd4f135f27199b3a710576e0013c53"
+    }
+    Frame {
+        msec: 3776
+        hash: "6aa4db9ecb8fa4ad4d4f81434c369759"
+    }
+    Frame {
+        msec: 3792
+        hash: "a7f2951411d8f5322ce91b3da7e86d64"
+    }
+    Frame {
+        msec: 3808
+        hash: "25fe19f3398d3d1a74ad8ed4114149d7"
+    }
+    Frame {
+        msec: 3824
+        hash: "05c3dae68897a461de2923824bef9390"
+    }
+    Frame {
+        msec: 3840
+        image: "follow.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "db6265c30dd614720d1532ffc411a28f"
+    }
+    Frame {
+        msec: 3872
+        hash: "f5de8e4ba755bc0a1e4c3f36ed3e6a93"
+    }
+    Frame {
+        msec: 3888
+        hash: "ad68229e5fe9a2570074648005c5e5df"
+    }
+    Frame {
+        msec: 3904
+        hash: "02d894680766289fe659a86b02d6c9ca"
+    }
+    Frame {
+        msec: 3920
+        hash: "4f228534dd909207e8d149c74bd8fd90"
+    }
+    Frame {
+        msec: 3936
+        hash: "f0b5c64f6a50e156452caf6a352c11e1"
+    }
+    Frame {
+        msec: 3952
+        hash: "64d46ff443534dbdb3cca88b7fc3e758"
+    }
+    Frame {
+        msec: 3968
+        hash: "717ad4b8012a21c6ed38dee5ea978f36"
+    }
+    Frame {
+        msec: 3984
+        hash: "ed38c7b528bcbb3e291761104bf1e86e"
+    }
+    Frame {
+        msec: 4000
+        hash: "8cc8674d325a2c72c41654ffbe5bce1f"
+    }
+    Frame {
+        msec: 4016
+        hash: "ab66dd60cc0e58d23bef5c709fe901ad"
+    }
+    Frame {
+        msec: 4032
+        hash: "b3b824cae4ddaac4a224e84f0e282fa4"
+    }
+    Frame {
+        msec: 4048
+        hash: "ead7fe4bec7987c24c305e114797284c"
+    }
+    Frame {
+        msec: 4064
+        hash: "e5e9501f1ca61ea9f99aadfc5ca02214"
+    }
+    Frame {
+        msec: 4080
+        hash: "f74a00eb31e1604f13a6ffb29fbd91b7"
+    }
+    Frame {
+        msec: 4096
+        hash: "539aca62492408ccc1815c67b55cb399"
+    }
+    Frame {
+        msec: 4112
+        hash: "4f548ad0eb7c4ce88a777e3b7ce2d3a8"
+    }
+    Frame {
+        msec: 4128
+        hash: "b0190c5ed53ff812988dd7a2152ffa61"
+    }
+    Frame {
+        msec: 4144
+        hash: "48214bdfbdcba256043e2cec7f5e321b"
+    }
+    Frame {
+        msec: 4160
+        hash: "952614329111d1d83b0304aa919af177"
+    }
+    Frame {
+        msec: 4176
+        hash: "fd874a73062dedfe7b904ad4c9fbcbc9"
+    }
+    Frame {
+        msec: 4192
+        hash: "365b9a18cf37521718ef98589ac23933"
+    }
+    Frame {
+        msec: 4208
+        hash: "32bbbf93d78925ef12f830386f0dbe2b"
+    }
+    Frame {
+        msec: 4224
+        hash: "835d391a498b7d470b317e91453ba2f9"
+    }
+    Frame {
+        msec: 4240
+        hash: "07d0cd82a39bfea2567587745f1e330d"
+    }
+    Frame {
+        msec: 4256
+        hash: "9560a63581007038e1c463b906a4b346"
+    }
+    Frame {
+        msec: 4272
+        hash: "076d25daafe8b582aeff39e247653285"
+    }
+    Frame {
+        msec: 4288
+        hash: "f2e66dad3231250b951388396705c839"
+    }
+    Frame {
+        msec: 4304
+        hash: "f168773343e928b60aad5430b9ca739d"
+    }
+    Frame {
+        msec: 4320
+        hash: "99ed4dc4be1a0e8d98e1a54d51208da3"
+    }
+    Frame {
+        msec: 4336
+        hash: "23b3e73a966f52ce6166bc91955570a1"
+    }
+    Frame {
+        msec: 4352
+        hash: "00cdb999f3d2c6fcad708c37c3059c3d"
+    }
+    Frame {
+        msec: 4368
+        hash: "96f1bef93ba1768afcc42924145d49ff"
+    }
+    Frame {
+        msec: 4384
+        hash: "0a76f6d5ec710e4046f32f76be8e0d68"
+    }
+    Frame {
+        msec: 4400
+        hash: "98f97a6c7eac1a493e81e79956177668"
+    }
+    Frame {
+        msec: 4416
+        hash: "9424ca6ba64d0d0c0bd1ee9da1b5085a"
+    }
+    Frame {
+        msec: 4432
+        hash: "2049a22079ac590aad3c9f6496879bcb"
+    }
+    Frame {
+        msec: 4448
+        hash: "f70f9f6bd3abf3bdcb70038cda5ed311"
+    }
+    Frame {
+        msec: 4464
+        hash: "48d6d01e1d80fea8eb05572ca26b692c"
+    }
+    Frame {
+        msec: 4480
+        hash: "af152dc6de929a8231687611cc301f28"
+    }
+    Frame {
+        msec: 4496
+        hash: "2ec869cd61570b570586870f80ba3832"
+    }
+    Frame {
+        msec: 4512
+        hash: "42be0431c015dcd0f5f6dd59ba7c2d7d"
+    }
+    Frame {
+        msec: 4528
+        hash: "abc112f396c5e504a19dce255437720c"
+    }
+    Frame {
+        msec: 4544
+        hash: "a371c4f49af16bdacc5ab5abbfc99e99"
+    }
+    Frame {
+        msec: 4560
+        hash: "1ebfd139bfabbbaf522acd63e3f47462"
+    }
+    Frame {
+        msec: 4576
+        hash: "b36086718a3dd89500adbf67aa7b0f1d"
+    }
+    Frame {
+        msec: 4592
+        hash: "e3ea2ad4955cb2ab8d503b331b3594c3"
+    }
+    Frame {
+        msec: 4608
+        hash: "4214c9f474d7f11bed74e32f5b3a0e9f"
+    }
+    Frame {
+        msec: 4624
+        hash: "f290e1dbf13ae399a2644eea3715804a"
+    }
+    Frame {
+        msec: 4640
+        hash: "6538c60446e3303dc1126c3c9c47ae42"
+    }
+    Frame {
+        msec: 4656
+        hash: "5319667f181eb5647710ccc6eddf43c9"
+    }
+    Frame {
+        msec: 4672
+        hash: "b98b68ea99d5a107115b50c32aa45c35"
+    }
+    Frame {
+        msec: 4688
+        hash: "2cc38e2915f77a46082c32c9393ae0c5"
+    }
+    Frame {
+        msec: 4704
+        hash: "40c695b17834cbba86d4dde0729f620b"
+    }
+    Frame {
+        msec: 4720
+        hash: "e8d5a95cfc726ce2626951ef1c68a948"
+    }
+    Frame {
+        msec: 4736
+        hash: "ab96c1668890ceffba74219d83e15e99"
+    }
+    Frame {
+        msec: 4752
+        hash: "4d69a73b3940911940b419028dabd223"
+    }
+    Frame {
+        msec: 4768
+        hash: "281043e3c045df177cbfae1abf51a8d1"
+    }
+    Frame {
+        msec: 4784
+        hash: "8adf6d8154d7950efe6b5bd7e2b760b6"
+    }
+    Frame {
+        msec: 4800
+        image: "follow.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "7fba4249c76b7f81c2b88cf906ce8ce6"
+    }
+    Frame {
+        msec: 4832
+        hash: "50b3c89d4d783469843b3acacb9690dd"
+    }
+    Frame {
+        msec: 4848
+        hash: "29f950ab7e6299036e78c8f37d114990"
+    }
+    Frame {
+        msec: 4864
+        hash: "3f8aecc5453406c9d8160eeb9691ed91"
+    }
+    Frame {
+        msec: 4880
+        hash: "ad7ff48fed4ca9e236271d169c3bf696"
+    }
+    Frame {
+        msec: 4896
+        hash: "2a2f872e4ef5c062a61fb59238df8794"
+    }
+    Frame {
+        msec: 4912
+        hash: "87cf2e21d7e56a82437a8ff3fa2bdc8c"
+    }
+    Frame {
+        msec: 4928
+        hash: "c3b04bb24d86d2aebd8fde7845f114cf"
+    }
+    Frame {
+        msec: 4944
+        hash: "3ad95d59a1f1841e3ff2324055ca23c0"
+    }
+    Frame {
+        msec: 4960
+        hash: "b91068fdce1fb2be9a64902a3dfa6b0d"
+    }
+    Frame {
+        msec: 4976
+        hash: "30f0118eb0bba40927a8038da03b652b"
+    }
+    Frame {
+        msec: 4992
+        hash: "ce5f3d15d3536be16b960f02a7335b99"
+    }
+    Frame {
+        msec: 5008
+        hash: "85b853c3f48b915ed6e80815709e8ac2"
+    }
+    Frame {
+        msec: 5024
+        hash: "c3511a76aa6dc2f1422a473ca4d80d0f"
+    }
+    Frame {
+        msec: 5040
+        hash: "deb1df70b4e1801c635356c65c0a5a46"
+    }
+    Frame {
+        msec: 5056
+        hash: "d04983df9b0ffc45e629af55a8e5cc95"
+    }
+    Frame {
+        msec: 5072
+        hash: "2a55c97509819657f5f8604d4789d9d4"
+    }
+    Frame {
+        msec: 5088
+        hash: "94589d594fa2e5ed621459ec2c8bd7e8"
+    }
+    Frame {
+        msec: 5104
+        hash: "a8a1bd7c15a5bdfe15d6580d719bdba6"
+    }
+    Frame {
+        msec: 5120
+        hash: "b4e1a4b1b649820be217c46b5086c8a4"
+    }
+    Frame {
+        msec: 5136
+        hash: "4de7d7ce85717eb9a67c61745ea26c0a"
+    }
+    Frame {
+        msec: 5152
+        hash: "c8ee53b7e659e10c7dbcf44e1a45f794"
+    }
+    Frame {
+        msec: 5168
+        hash: "f46ce03bc5a932c39862577c5a5cd24c"
+    }
+    Frame {
+        msec: 5184
+        hash: "d417370ed6fb99ccfa443eb97e6de331"
+    }
+    Frame {
+        msec: 5200
+        hash: "336af06572992960c829d4a209048263"
+    }
+    Frame {
+        msec: 5216
+        hash: "4066e8eef292abf9b58bc89b4b5f3ce9"
+    }
+    Frame {
+        msec: 5232
+        hash: "360f037a02bf4a337b278886266ff2f1"
+    }
+    Frame {
+        msec: 5248
+        hash: "79e9f387b0ce164057640c0caab8d10d"
+    }
+    Frame {
+        msec: 5264
+        hash: "ee8741d1810303cfe5ecff39c7d52fdd"
+    }
+    Frame {
+        msec: 5280
+        hash: "4cba1c857f0af49d7fe68584f99c89d7"
+    }
+    Frame {
+        msec: 5296
+        hash: "c0ae482a2fbb9f15a2c2ff631cc85c2c"
+    }
+    Frame {
+        msec: 5312
+        hash: "3b6bf6d6a0aeebdc92eff4e336fd3b6e"
+    }
+    Frame {
+        msec: 5328
+        hash: "43033eb8aeba6b49c135a1702f6b8f47"
+    }
+    Frame {
+        msec: 5344
+        hash: "1319c7e3a84484723891ee43a80bc765"
+    }
+    Frame {
+        msec: 5360
+        hash: "838ec693c923565d77b060f262beb1e8"
+    }
+    Frame {
+        msec: 5376
+        hash: "74306669836425de03cec617d4ed849a"
+    }
+    Frame {
+        msec: 5392
+        hash: "c063f4951755c8939399d0d560a0f762"
+    }
+    Frame {
+        msec: 5408
+        hash: "512c739e0ff25f7d6b983a193f7fc2c3"
+    }
+    Frame {
+        msec: 5424
+        hash: "6c5f69cc2ce2992fd2ecb0ea3691e2b8"
+    }
+    Frame {
+        msec: 5440
+        hash: "f5dbc5ce0ba00eafb9379ee86de67150"
+    }
+    Frame {
+        msec: 5456
+        hash: "f62bb7d8d9749272ca3e2bd1931598fb"
+    }
+    Frame {
+        msec: 5472
+        hash: "052fdac05286edcdd7fcd4d6d9582f39"
+    }
+    Frame {
+        msec: 5488
+        hash: "ac4702306e5be156fe7b069cb90e1038"
+    }
+    Frame {
+        msec: 5504
+        hash: "127e94c79f4d33e5f223a0853629245f"
+    }
+    Frame {
+        msec: 5520
+        hash: "dd77216b0a90c46dd5c264d38ab0fd74"
+    }
+    Frame {
+        msec: 5536
+        hash: "a4e50b39aa367d4cd7650d088d186856"
+    }
+    Frame {
+        msec: 5552
+        hash: "6e14946b9b23f0fc137bd61c02af1ca5"
+    }
+    Frame {
+        msec: 5568
+        hash: "8c550d5e4cfbcee2c7bd6c20dba53f41"
+    }
+    Frame {
+        msec: 5584
+        hash: "9f2385fb614bdaafe022712148f786d2"
+    }
+    Frame {
+        msec: 5600
+        hash: "c87903c96ae5a4b91c5bda524bfd4a4f"
+    }
+    Frame {
+        msec: 5616
+        hash: "9a98de9b4237b7c0ccb4468344d410bc"
+    }
+    Frame {
+        msec: 5632
+        hash: "7ff448f395ff50cde1f6e6cfaf0c1541"
+    }
+    Frame {
+        msec: 5648
+        hash: "ab7a6998a5b26e3d58bd1d0a949f3709"
+    }
+    Frame {
+        msec: 5664
+        hash: "ab7a6998a5b26e3d58bd1d0a949f3709"
+    }
+    Frame {
+        msec: 5680
+        hash: "2e1b5636ab75af91bd5b0d48c04828f5"
+    }
+    Frame {
+        msec: 5696
+        hash: "0976b605c78f6f8512acdfb61b9d123a"
+    }
+    Frame {
+        msec: 5712
+        hash: "bb816bfd8bd3972c80c3a76c9ddf785e"
+    }
+    Frame {
+        msec: 5728
+        hash: "c3518990fc7aa5660a9e86034cf4c46f"
+    }
+    Frame {
+        msec: 5744
+        hash: "b27230d8aeb214e18b43de167213ef7b"
+    }
+    Frame {
+        msec: 5760
+        image: "follow.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "fc55f00ae456c2687ed05ab4b6906a33"
+    }
+    Frame {
+        msec: 5792
+        hash: "50051a48d1fae3bc9c9d1f0a964d9561"
+    }
+    Frame {
+        msec: 5808
+        hash: "279a38d7261241c744c2317ea9843567"
+    }
+    Frame {
+        msec: 5824
+        hash: "0b3ed3960713dbda36326b7de492c42e"
+    }
+    Frame {
+        msec: 5840
+        hash: "fff5737541317406c4a0ef06f1cdc041"
+    }
+    Frame {
+        msec: 5856
+        hash: "47aef0d79da45139a3981a75290cc9b8"
+    }
+    Frame {
+        msec: 5872
+        hash: "d79f9f9371c76a855ea4f2cdeed97acd"
+    }
+    Frame {
+        msec: 5888
+        hash: "66610a0d5b926d419da26e20b04b55a5"
+    }
+    Frame {
+        msec: 5904
+        hash: "9891ad954da8535b44cc234bb2588f30"
+    }
+    Frame {
+        msec: 5920
+        hash: "b53056146701fae1598ab49e6399db01"
+    }
+    Frame {
+        msec: 5936
+        hash: "064799027a3f60458a3797c6c87d3e29"
+    }
+    Frame {
+        msec: 5952
+        hash: "81ad252f10e6f8f2a08e7df1d25e8a47"
+    }
+    Frame {
+        msec: 5968
+        hash: "09fbd923da02844f50ad25059f82560c"
+    }
+    Frame {
+        msec: 5984
+        hash: "f41d8370afdce8a154ab42204ca8d92d"
+    }
+    Frame {
+        msec: 6000
+        hash: "748b2d020c28b3ac36b08377b4a2544b"
+    }
+    Frame {
+        msec: 6016
+        hash: "748b2d020c28b3ac36b08377b4a2544b"
+    }
+    Frame {
+        msec: 6032
+        hash: "d8c02a54c0d1df20127025d547c741af"
+    }
+    Frame {
+        msec: 6048
+        hash: "d8c02a54c0d1df20127025d547c741af"
+    }
+    Frame {
+        msec: 6064
+        hash: "d7fd0dab22fec0f68ed01cfd6d32e7f5"
+    }
+    Frame {
+        msec: 6080
+        hash: "f0b035eda10c07f5c3c825784ad96437"
+    }
+    Frame {
+        msec: 6096
+        hash: "54b83800f8a01e1a4d57b8b1d371fb09"
+    }
+    Frame {
+        msec: 6112
+        hash: "19ad51c31e9cfdb314c76f323574806c"
+    }
+    Frame {
+        msec: 6128
+        hash: "dcf269a115781eb4df232a527de87a87"
+    }
+    Frame {
+        msec: 6144
+        hash: "95053206702a6118c23b541ff7fbef0d"
+    }
+    Frame {
+        msec: 6160
+        hash: "933a158398ee746c0465c2e7af9b6b4d"
+    }
+    Frame {
+        msec: 6176
+        hash: "ade4a4aa03f5787dce1331ed27ff9c6e"
+    }
+    Frame {
+        msec: 6192
+        hash: "9ecc7d4cb5cf0dd815e208e13e2c932a"
+    }
+    Frame {
+        msec: 6208
+        hash: "98e40cba2e717e57a5dcd3413e166f65"
+    }
+    Frame {
+        msec: 6224
+        hash: "f68f45b71f6d596eaa76fa2bc46cfe1b"
+    }
+    Frame {
+        msec: 6240
+        hash: "9230c9b1013b83b073ccb90d2633043f"
+    }
+    Frame {
+        msec: 6256
+        hash: "5d0fc4842b75703d29816fa0330624ba"
+    }
+    Frame {
+        msec: 6272
+        hash: "5d0fc4842b75703d29816fa0330624ba"
+    }
+    Frame {
+        msec: 6288
+        hash: "5d0fc4842b75703d29816fa0330624ba"
+    }
+    Frame {
+        msec: 6304
+        hash: "96008d5b8446f67e07129d02300d122d"
+    }
+    Frame {
+        msec: 6320
+        hash: "96008d5b8446f67e07129d02300d122d"
+    }
+    Frame {
+        msec: 6336
+        hash: "96008d5b8446f67e07129d02300d122d"
+    }
+    Frame {
+        msec: 6352
+        hash: "96008d5b8446f67e07129d02300d122d"
+    }
+    Frame {
+        msec: 6368
+        hash: "96008d5b8446f67e07129d02300d122d"
+    }
+    Frame {
+        msec: 6384
+        hash: "478be760047d33bd66017bdd304ff3ae"
+    }
+    Frame {
+        msec: 6400
+        hash: "478be760047d33bd66017bdd304ff3ae"
+    }
+    Frame {
+        msec: 6416
+        hash: "478be760047d33bd66017bdd304ff3ae"
+    }
+    Frame {
+        msec: 6432
+        hash: "478be760047d33bd66017bdd304ff3ae"
+    }
+    Frame {
+        msec: 6448
+        hash: "478be760047d33bd66017bdd304ff3ae"
+    }
+    Frame {
+        msec: 6464
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6480
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6496
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6512
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6528
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6544
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6560
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6576
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6592
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6608
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6624
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6640
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6656
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6672
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6688
+        hash: "8ff11dfe2642dc099c240e8aef8285df"
+    }
+    Frame {
+        msec: 6704
+        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
+    }
+    Frame {
+        msec: 6720
+        image: "follow.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
+    }
+    Frame {
+        msec: 6752
+        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
+    }
+    Frame {
+        msec: 6768
+        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
+    }
+    Frame {
+        msec: 6784
+        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
+    }
+    Frame {
+        msec: 6800
+        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
+    }
+    Frame {
+        msec: 6816
+        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
+    }
+    Frame {
+        msec: 6832
+        hash: "96008d5b8446f67e07129d02300d122d"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 6848
+        hash: "5d0fc4842b75703d29816fa0330624ba"
+    }
+    Frame {
+        msec: 6864
+        hash: "5d0fc4842b75703d29816fa0330624ba"
+    }
+    Frame {
+        msec: 6880
+        hash: "5d0fc4842b75703d29816fa0330624ba"
+    }
+    Frame {
+        msec: 6896
+        hash: "5d0fc4842b75703d29816fa0330624ba"
+    }
+    Frame {
+        msec: 6912
+        hash: "5d0fc4842b75703d29816fa0330624ba"
+    }
+    Frame {
+        msec: 6928
+        hash: "5d0fc4842b75703d29816fa0330624ba"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml
new file mode 100644
index 0000000..62503e4
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml
@@ -0,0 +1,71 @@
+import Qt 4.6
+
+Rectangle {
+    color: "#ffffff"
+    width: 320; height: 240
+    Rectangle {
+        id: rect
+        color: "#00ff00"
+        y: 200; width: 60; height: 20
+        y: SequentialAnimation {
+            repeat: true
+            NumberAnimation {
+                to: 20; duration: 500
+                easing.type: "InOutQuad"
+            }
+            NumberAnimation {
+                to: 200; duration: 2000
+                easing.type: "OutBounce"
+            }
+            PauseAnimation { duration: 1000 }
+        }
+    }
+
+    // Velocity
+    Rectangle {
+        color: "#ff0000"
+        x: rect.width; width: rect.width; height: 20
+        y: 200
+        y: SpringFollow { source: rect.y; velocity: 200 }
+    }
+
+    // Spring
+    Rectangle {
+        color: "#ff0000"
+        x: rect.width * 2; width: rect.width/2; height: 20
+        y: 200
+        y: SpringFollow { source: rect.y; spring: 1.0; damping: 0.2 }
+    }
+    Rectangle {
+        color: "#880000"
+        x: rect.width * 2.5; width: rect.width/2; height: 20
+        y: 200
+        y: SpringFollow { source: rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
+    }
+
+    // Follow mouse
+    MouseArea {
+        id: mouseRegion
+        anchors.fill: parent
+        Rectangle {
+            id: ball
+            width: 20; height: 20
+            radius: 10
+            color: "#0000ff"
+            x: SpringFollow { id: f1; source: mouseRegion.mouseX-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
+            y: SpringFollow { id: f2; source: mouseRegion.mouseY-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
+            states: [
+                State {
+                    name: "following"
+                    when: !f1.inSync || !f2.inSync
+                    PropertyChanges { target: ball; color: "#ff0000" }
+                }
+            ]
+            transitions: [
+                Transition {
+                    ColorAnimation { duration: 200 }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/baseline/data-X11/parentanchor.qml b/tests/auto/declarative/visual/qdeclarativetext/baseline/data-X11/parentanchor.qml
new file mode 100644
index 0000000..56d616e
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/baseline/data-X11/parentanchor.qml
@@ -0,0 +1,131 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 32
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 48
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 64
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 80
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 96
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 112
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 128
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 144
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 160
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 176
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 192
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 208
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 224
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 240
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 256
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 272
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 288
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 304
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 320
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 336
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 352
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 368
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 384
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 400
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 416
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 432
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 448
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 464
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 480
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 496
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/baseline/data/parentanchor.qml b/tests/auto/declarative/visual/qdeclarativetext/baseline/data/parentanchor.qml
new file mode 100644
index 0000000..56d616e
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/baseline/data/parentanchor.qml
@@ -0,0 +1,131 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 32
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 48
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 64
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 80
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 96
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 112
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 128
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 144
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 160
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 176
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 192
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 208
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 224
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 240
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 256
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 272
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 288
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 304
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 320
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 336
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 352
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 368
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 384
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 400
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 416
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 432
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 448
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 464
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 480
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+    Frame {
+        msec: 496
+        hash: "3e022a120a2dbe688d53657508de36cf"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/baseline/parentanchor.qml b/tests/auto/declarative/visual/qdeclarativetext/baseline/parentanchor.qml
new file mode 100644
index 0000000..80f0f03
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/baseline/parentanchor.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Rectangle {
+    id: s; width: 600; height: 100; color: "lightsteelblue"
+    property string text: "The quick brown fox jumps over the lazy dog."
+    Text {
+        text: s.text
+        anchors.verticalCenter: s.verticalCenter
+    }
+    Text {
+        text: s.text
+        anchors.baseline: s.verticalCenter
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.0.png
new file mode 100644
index 0000000..eea3362
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.qml
new file mode 100644
index 0000000..1ccede4
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.qml
@@ -0,0 +1,279 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 32
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 48
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 64
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 80
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 96
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 112
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 128
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 144
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 160
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 176
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 192
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 208
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 224
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 240
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 256
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 272
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 288
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 304
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 320
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 336
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 352
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 368
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 384
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 400
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 416
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 432
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 448
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 464
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 480
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 496
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 512
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 528
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 544
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 560
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 576
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 592
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 608
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 624
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 640
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 656
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 672
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 688
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 704
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 720
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 736
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 752
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 768
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 784
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 800
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 816
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 832
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 848
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 864
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 880
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 896
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 912
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 928
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 944
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 960
+        image: "elide.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 992
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 1008
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 1024
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 1040
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+    Frame {
+        msec: 1056
+        hash: "1678890d66761a30100c37132ccec9a2"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.0.png
new file mode 100644
index 0000000..3dfade5
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.1.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.1.png
new file mode 100644
index 0000000..1ee2076
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.2.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.2.png
new file mode 100644
index 0000000..ae680be
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.3.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.3.png
new file mode 100644
index 0000000..c2859be
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.qml
new file mode 100644
index 0000000..07ad236
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.qml
@@ -0,0 +1,991 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 32
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 48
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 64
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 80
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 96
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 112
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 128
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 144
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 160
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 176
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 192
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 208
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 224
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 240
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 256
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 272
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 288
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 304
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 320
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 336
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 352
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 368
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 384
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 400
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 416
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 432
+        hash: "fc3a7e898d6bfa2af4d774b20609f967"
+    }
+    Frame {
+        msec: 448
+        hash: "fc3a7e898d6bfa2af4d774b20609f967"
+    }
+    Frame {
+        msec: 464
+        hash: "fc3a7e898d6bfa2af4d774b20609f967"
+    }
+    Frame {
+        msec: 480
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 496
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 512
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 528
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 544
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 560
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 576
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 592
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 608
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 624
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 640
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 656
+        hash: "3f362ad550db910f1d9f261557c65913"
+    }
+    Frame {
+        msec: 672
+        hash: "3f362ad550db910f1d9f261557c65913"
+    }
+    Frame {
+        msec: 688
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 704
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 720
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 736
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 752
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 768
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 784
+        hash: "a892c67199c23e5d9012a6a24cb45d16"
+    }
+    Frame {
+        msec: 800
+        hash: "a892c67199c23e5d9012a6a24cb45d16"
+    }
+    Frame {
+        msec: 816
+        hash: "a892c67199c23e5d9012a6a24cb45d16"
+    }
+    Frame {
+        msec: 832
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 848
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 864
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 880
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 896
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 912
+        hash: "a7dc1d7dde956d62834de0968261386f"
+    }
+    Frame {
+        msec: 928
+        hash: "a7dc1d7dde956d62834de0968261386f"
+    }
+    Frame {
+        msec: 944
+        hash: "a7dc1d7dde956d62834de0968261386f"
+    }
+    Frame {
+        msec: 960
+        image: "elide2.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "a7dc1d7dde956d62834de0968261386f"
+    }
+    Frame {
+        msec: 992
+        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
+    }
+    Frame {
+        msec: 1008
+        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
+    }
+    Frame {
+        msec: 1024
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1040
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1056
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1072
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1088
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1104
+        hash: "9424caee019aa9bccd4156b0b9ca2723"
+    }
+    Frame {
+        msec: 1120
+        hash: "9424caee019aa9bccd4156b0b9ca2723"
+    }
+    Frame {
+        msec: 1136
+        hash: "9424caee019aa9bccd4156b0b9ca2723"
+    }
+    Frame {
+        msec: 1152
+        hash: "000061a140ab71a44c0480a92ad3bc70"
+    }
+    Frame {
+        msec: 1168
+        hash: "000061a140ab71a44c0480a92ad3bc70"
+    }
+    Frame {
+        msec: 1184
+        hash: "000061a140ab71a44c0480a92ad3bc70"
+    }
+    Frame {
+        msec: 1200
+        hash: "5dec9638853165428cd15ae02e1d03ce"
+    }
+    Frame {
+        msec: 1216
+        hash: "5dec9638853165428cd15ae02e1d03ce"
+    }
+    Frame {
+        msec: 1232
+        hash: "5dec9638853165428cd15ae02e1d03ce"
+    }
+    Frame {
+        msec: 1248
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1264
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1280
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1296
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1312
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1328
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1344
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1360
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1376
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1392
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1408
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1424
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1440
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1456
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1472
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1488
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1504
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1520
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1536
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1552
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1568
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1584
+        hash: "dd412c6a2e5cb8890cb43142c84a5673"
+    }
+    Frame {
+        msec: 1600
+        hash: "dd412c6a2e5cb8890cb43142c84a5673"
+    }
+    Frame {
+        msec: 1616
+        hash: "dd412c6a2e5cb8890cb43142c84a5673"
+    }
+    Frame {
+        msec: 1632
+        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+    }
+    Frame {
+        msec: 1648
+        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+    }
+    Frame {
+        msec: 1664
+        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+    }
+    Frame {
+        msec: 1680
+        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+    }
+    Frame {
+        msec: 1696
+        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
+    }
+    Frame {
+        msec: 1712
+        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
+    }
+    Frame {
+        msec: 1728
+        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
+    }
+    Frame {
+        msec: 1744
+        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1760
+        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+    }
+    Frame {
+        msec: 1776
+        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+    }
+    Frame {
+        msec: 1792
+        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+    }
+    Frame {
+        msec: 1808
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1824
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1840
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1856
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1872
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1888
+        hash: "976dd5bc154522438f92790f28639512"
+    }
+    Frame {
+        msec: 1904
+        hash: "976dd5bc154522438f92790f28639512"
+    }
+    Frame {
+        msec: 1920
+        image: "elide2.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "976dd5bc154522438f92790f28639512"
+    }
+    Frame {
+        msec: 1952
+        hash: "976dd5bc154522438f92790f28639512"
+    }
+    Frame {
+        msec: 1968
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 1984
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 2000
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 2016
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 2032
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 2048
+        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
+    }
+    Frame {
+        msec: 2064
+        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
+    }
+    Frame {
+        msec: 2080
+        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
+    }
+    Frame {
+        msec: 2096
+        hash: "1a978ed6951afe40912efcfb54dcce65"
+    }
+    Frame {
+        msec: 2112
+        hash: "1a978ed6951afe40912efcfb54dcce65"
+    }
+    Frame {
+        msec: 2128
+        hash: "1a978ed6951afe40912efcfb54dcce65"
+    }
+    Frame {
+        msec: 2144
+        hash: "a57eea59fe6475164e24688489977869"
+    }
+    Frame {
+        msec: 2160
+        hash: "a57eea59fe6475164e24688489977869"
+    }
+    Frame {
+        msec: 2176
+        hash: "a57eea59fe6475164e24688489977869"
+    }
+    Frame {
+        msec: 2192
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2208
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2224
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2240
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2256
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2272
+        hash: "04c62a4d01e9309eaeea87902013c8b9"
+    }
+    Frame {
+        msec: 2288
+        hash: "04c62a4d01e9309eaeea87902013c8b9"
+    }
+    Frame {
+        msec: 2304
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2320
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2336
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2352
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2368
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2384
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2400
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2416
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2432
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2448
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2464
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2480
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2496
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2512
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2528
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2544
+        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+    }
+    Frame {
+        msec: 2560
+        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+    }
+    Frame {
+        msec: 2576
+        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+    }
+    Frame {
+        msec: 2592
+        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+    }
+    Frame {
+        msec: 2608
+        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
+    }
+    Frame {
+        msec: 2624
+        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
+    }
+    Frame {
+        msec: 2640
+        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
+    }
+    Frame {
+        msec: 2656
+        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+    }
+    Frame {
+        msec: 2672
+        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+    }
+    Frame {
+        msec: 2688
+        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+    }
+    Frame {
+        msec: 2704
+        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+    }
+    Frame {
+        msec: 2720
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2736
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2752
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2768
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2784
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2800
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2816
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2832
+        hash: "f44b88b80219497370b5d2ad380d03bf"
+    }
+    Frame {
+        msec: 2848
+        hash: "f44b88b80219497370b5d2ad380d03bf"
+    }
+    Frame {
+        msec: 2864
+        hash: "a093510751799f3466156f9775988044"
+    }
+    Frame {
+        msec: 2880
+        image: "elide2.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "a093510751799f3466156f9775988044"
+    }
+    Frame {
+        msec: 2912
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2928
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2944
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2960
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2976
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2992
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3008
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3024
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3040
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3056
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3072
+        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
+    }
+    Frame {
+        msec: 3088
+        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
+    }
+    Frame {
+        msec: 3104
+        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
+    }
+    Frame {
+        msec: 3120
+        hash: "df90afe882b18f3fd7b12e52ff36e66f"
+    }
+    Frame {
+        msec: 3136
+        hash: "df90afe882b18f3fd7b12e52ff36e66f"
+    }
+    Frame {
+        msec: 3152
+        hash: "5b84785ffe15c15c3b94c845db7a4a44"
+    }
+    Frame {
+        msec: 3168
+        hash: "5b84785ffe15c15c3b94c845db7a4a44"
+    }
+    Frame {
+        msec: 3184
+        hash: "5b84785ffe15c15c3b94c845db7a4a44"
+    }
+    Frame {
+        msec: 3200
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3216
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3232
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3248
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3264
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3280
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3296
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3312
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3328
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3344
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3360
+        hash: "4baf5c1227de45f9e620fe6eb0590014"
+    }
+    Frame {
+        msec: 3376
+        hash: "4baf5c1227de45f9e620fe6eb0590014"
+    }
+    Frame {
+        msec: 3392
+        hash: "4baf5c1227de45f9e620fe6eb0590014"
+    }
+    Frame {
+        msec: 3408
+        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
+    }
+    Frame {
+        msec: 3424
+        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
+    }
+    Frame {
+        msec: 3440
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3456
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3472
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3488
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3504
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3520
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3536
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3552
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3568
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3584
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3600
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3616
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3632
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3648
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3664
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3680
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3696
+        hash: "6bfd7cfd6369df1eb570fda103d9e009"
+    }
+    Frame {
+        msec: 3712
+        hash: "6bfd7cfd6369df1eb570fda103d9e009"
+    }
+    Frame {
+        msec: 3728
+        hash: "b6dba4a456cd8d1b62501039cb796625"
+    }
+    Frame {
+        msec: 3744
+        hash: "b6dba4a456cd8d1b62501039cb796625"
+    }
+    Frame {
+        msec: 3760
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3776
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3792
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3808
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3824
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3840
+        image: "elide2.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "d2e873e69aed3e0b6e53123cd63e386c"
+    }
+    Frame {
+        msec: 3872
+        hash: "d2e873e69aed3e0b6e53123cd63e386c"
+    }
+    Frame {
+        msec: 3888
+        hash: "baa8edfce77628c7a1ec83adce96e2c6"
+    }
+    Frame {
+        msec: 3904
+        hash: "baa8edfce77628c7a1ec83adce96e2c6"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.0.png
new file mode 100644
index 0000000..80549b4
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.qml
new file mode 100644
index 0000000..c2fd0d8
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.qml
@@ -0,0 +1,303 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "17f39c541a0b5bf958c3fdaa51b72fec"
+    }
+    Frame {
+        msec: 32
+        hash: "da61bb1afef532688045116bcce1da40"
+    }
+    Frame {
+        msec: 48
+        hash: "04ddcb158ce8ade4ea9ad16405c7d81a"
+    }
+    Frame {
+        msec: 64
+        hash: "7ca43ec7a6e630c9bc07478abf5c2686"
+    }
+    Frame {
+        msec: 80
+        hash: "ae2c4e73395cf4a5663110ba1b9996b2"
+    }
+    Frame {
+        msec: 96
+        hash: "5059426cced6ff6f92102100416b34d8"
+    }
+    Frame {
+        msec: 112
+        hash: "e816cb366ba9498d0ae194b789c25f12"
+    }
+    Frame {
+        msec: 128
+        hash: "fd8cd9b2916b7045086df92d19e8b436"
+    }
+    Frame {
+        msec: 144
+        hash: "965dfe4cad0a3d07c0b086d6351a43a1"
+    }
+    Frame {
+        msec: 160
+        hash: "56759a670c864d5f2ae392fa8545f3a4"
+    }
+    Frame {
+        msec: 176
+        hash: "8d3c2be4fcef526650cc84b5c2d29170"
+    }
+    Frame {
+        msec: 192
+        hash: "6d9f995bef186a69b259b8d18470f0e7"
+    }
+    Frame {
+        msec: 208
+        hash: "670c68a0943c5f037f8bf4c9ca0df501"
+    }
+    Frame {
+        msec: 224
+        hash: "6218cf02cb762aa6c33985fe1b2e47bb"
+    }
+    Frame {
+        msec: 240
+        hash: "6e3424f2b72d6582ceb5a6c1bfe3dba4"
+    }
+    Frame {
+        msec: 256
+        hash: "fb819344ab1d2966b043be790831e680"
+    }
+    Frame {
+        msec: 272
+        hash: "a729845b780cc708ddd578eab3bc0ab1"
+    }
+    Frame {
+        msec: 288
+        hash: "543f6566c4dfaecb70007848cc4f8525"
+    }
+    Frame {
+        msec: 304
+        hash: "5497699414bd8a428ead9703dc7273d5"
+    }
+    Frame {
+        msec: 320
+        hash: "e9230e525bb0ce33fe4bf3a2c948357d"
+    }
+    Frame {
+        msec: 336
+        hash: "ef6a6989f013d444547c0b98a65a34bf"
+    }
+    Frame {
+        msec: 352
+        hash: "ee89f5163fe269884d59acac7fc23336"
+    }
+    Frame {
+        msec: 368
+        hash: "0ffb11ceccdc607c1a072dde4aa40f93"
+    }
+    Frame {
+        msec: 384
+        hash: "97a51d7916e04815724506e289040e2a"
+    }
+    Frame {
+        msec: 400
+        hash: "a63d6d73827e1b40a7fec76e6555d7ab"
+    }
+    Frame {
+        msec: 416
+        hash: "d3eaf72442852317a48dc2b638ad48be"
+    }
+    Frame {
+        msec: 432
+        hash: "fa867a486d51089ddfeb60b9d44b329e"
+    }
+    Frame {
+        msec: 448
+        hash: "834ee944cfc63209bcba94153ccd2c4e"
+    }
+    Frame {
+        msec: 464
+        hash: "6d637d4763ae457233ab669f9f124bc1"
+    }
+    Frame {
+        msec: 480
+        hash: "66c60bd9de1870f46b726c404ab924d5"
+    }
+    Frame {
+        msec: 496
+        hash: "088499b53390e3a2c3ca7f42cac101a4"
+    }
+    Frame {
+        msec: 512
+        hash: "19d41f7696c86120460c4db7a0f9be1a"
+    }
+    Frame {
+        msec: 528
+        hash: "cd3ae14964e174db94e3e6c8609f366a"
+    }
+    Frame {
+        msec: 544
+        hash: "0c2172e091c2fb42d7c016779fa543d7"
+    }
+    Frame {
+        msec: 560
+        hash: "7534175e24b2cbab08518de8fc691003"
+    }
+    Frame {
+        msec: 576
+        hash: "a9ef64d20b4f93e60f25753e2d7dd2e0"
+    }
+    Frame {
+        msec: 592
+        hash: "d8e62a9fec27bfc892b0f3034bc73c3f"
+    }
+    Frame {
+        msec: 608
+        hash: "f8eee41f72e17693074a2ac250bb850e"
+    }
+    Frame {
+        msec: 624
+        hash: "3a08b62a8aa1f410415afbd7b8ee8728"
+    }
+    Frame {
+        msec: 640
+        hash: "0c4fba2bc8b7e440736f4a23d048c23c"
+    }
+    Frame {
+        msec: 656
+        hash: "521264dbeec0fbe3a467739f0c3f7b85"
+    }
+    Frame {
+        msec: 672
+        hash: "2c455560a624acfb7f316eae8926d765"
+    }
+    Frame {
+        msec: 688
+        hash: "c9fa632a0998cfae39d434b623b3060d"
+    }
+    Frame {
+        msec: 704
+        hash: "506ea16572fa0ee72cddcedfe5b4b9ea"
+    }
+    Frame {
+        msec: 720
+        hash: "83ae06a3ad24d2a6d49c71df2a287716"
+    }
+    Frame {
+        msec: 736
+        hash: "d4b11b45b4f97de0c0b878b97b804f09"
+    }
+    Frame {
+        msec: 752
+        hash: "868aac6c273b7cc90c31c14298ab9a3b"
+    }
+    Frame {
+        msec: 768
+        hash: "03d4222586194bb6513305d1837d3467"
+    }
+    Frame {
+        msec: 784
+        hash: "21e6cd89f06077bd5d346c7ccb8fa1e9"
+    }
+    Frame {
+        msec: 800
+        hash: "326092c4c29217f5afb5730ab3984353"
+    }
+    Frame {
+        msec: 816
+        hash: "4963d64093e65fe1973ffab5b7a15abc"
+    }
+    Frame {
+        msec: 832
+        hash: "3125e6e553bbf3f2fcf8fbf797a0c1f8"
+    }
+    Frame {
+        msec: 848
+        hash: "879b24c994d4a9854d08bda2bbf2ceda"
+    }
+    Frame {
+        msec: 864
+        hash: "03c4320dc2aa030c341d54899869b561"
+    }
+    Frame {
+        msec: 880
+        hash: "ae0e91975aecc6a416b4a23504fced32"
+    }
+    Frame {
+        msec: 896
+        hash: "e4150bdf0d4bab9bddc4605a9bde5b69"
+    }
+    Frame {
+        msec: 912
+        hash: "dc961cb82a0e58603b3914f16f0a3f52"
+    }
+    Frame {
+        msec: 928
+        hash: "5339507c303e42ecab853ca1688881f3"
+    }
+    Frame {
+        msec: 944
+        hash: "a7c616c57f98eb03c1501747ea1a8b45"
+    }
+    Frame {
+        msec: 960
+        image: "multilength.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "773ad6bc56f80bd5f6ce346ae0bc79c9"
+    }
+    Frame {
+        msec: 992
+        hash: "18b9ebfb9e5beac337143cc625fdfad7"
+    }
+    Frame {
+        msec: 1008
+        hash: "efb9f12a98ea137e2b50d344c21c4a89"
+    }
+    Frame {
+        msec: 1024
+        hash: "5b880958b3d20c09a10189cfc5f7b671"
+    }
+    Frame {
+        msec: 1040
+        hash: "edf2d8c174ac6e2e3a887336dc04df8c"
+    }
+    Frame {
+        msec: 1056
+        hash: "ad04b9e0e88695a13032abae8fef6f32"
+    }
+    Frame {
+        msec: 1072
+        hash: "e4ad91c9da3e954cac33ce98832fee1c"
+    }
+    Frame {
+        msec: 1088
+        hash: "a853212cf0ddc17cb0eb9be7f2ac5475"
+    }
+    Frame {
+        msec: 1104
+        hash: "a03f7ac2553fe114c4591ed98dab3ceb"
+    }
+    Frame {
+        msec: 1120
+        hash: "5de7491803582e0d13d2ff3e2eb3df82"
+    }
+    Frame {
+        msec: 1136
+        hash: "0685263ac468ce39b468d37a20f7e5f8"
+    }
+    Frame {
+        msec: 1152
+        hash: "14d4ab3f40dc6a0835c56c0f84256182"
+    }
+    Frame {
+        msec: 1168
+        hash: "6a8c61c31c3d00592863ad356c45b354"
+    }
+    Frame {
+        msec: 1184
+        hash: "08b3e3388469b1a62d3fc7f7a94f85a2"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.0.png
new file mode 100644
index 0000000..5631a46
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.qml
new file mode 100644
index 0000000..cfd832e
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.qml
@@ -0,0 +1,279 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 32
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 48
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 64
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 80
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 96
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 112
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 128
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 144
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 160
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 176
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 192
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 208
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 224
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 240
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 256
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 272
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 288
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 304
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 320
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 336
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 352
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 368
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 384
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 400
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 416
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 432
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 448
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 464
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 480
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 496
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 512
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 528
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 544
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 560
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 576
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 592
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 608
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 624
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 640
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 656
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 672
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 688
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 704
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 720
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 736
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 752
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 768
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 784
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 800
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 816
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 832
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 848
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 864
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 880
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 896
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 912
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 928
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 944
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 960
+        image: "elide.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 992
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 1008
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 1024
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 1040
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+    Frame {
+        msec: 1056
+        hash: "48e2da07fd229d9db6afc0eda494cd11"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.0.png
new file mode 100644
index 0000000..6e2b625
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.qml
new file mode 100644
index 0000000..0c06196
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.qml
@@ -0,0 +1,303 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "873e914454b7a040b05649ebd1a2f8c5"
+    }
+    Frame {
+        msec: 32
+        hash: "7682a4f1e361ca252da9713734a598e8"
+    }
+    Frame {
+        msec: 48
+        hash: "fa8884b550c8df872f96b61557163bcf"
+    }
+    Frame {
+        msec: 64
+        hash: "b84ecf9e38f126c3e32defee831d9462"
+    }
+    Frame {
+        msec: 80
+        hash: "21cc08f22d1f1fcb38b27a3a4259debe"
+    }
+    Frame {
+        msec: 96
+        hash: "93bdfeab813e25e85917f49c0d5f1314"
+    }
+    Frame {
+        msec: 112
+        hash: "5f03c252602e60fe19879945fa77c203"
+    }
+    Frame {
+        msec: 128
+        hash: "f0b2079f6c512bf80989ebfdbec4cfd8"
+    }
+    Frame {
+        msec: 144
+        hash: "9e7bb12d5b7605fc1d78ed9b2a549527"
+    }
+    Frame {
+        msec: 160
+        hash: "242bbbe6da87708c92fd47607ecb789d"
+    }
+    Frame {
+        msec: 176
+        hash: "f1db5c3a230b4d3e2e1dfefe6bf032a1"
+    }
+    Frame {
+        msec: 192
+        hash: "a416e820efd8e173cc52372218513e33"
+    }
+    Frame {
+        msec: 208
+        hash: "df711ab70c6087f8138fded16167f069"
+    }
+    Frame {
+        msec: 224
+        hash: "fb28eb2eeccfab28299640ef996c1115"
+    }
+    Frame {
+        msec: 240
+        hash: "c72c6d79a50dd7147f6b33784880eb36"
+    }
+    Frame {
+        msec: 256
+        hash: "4421027e65e95f98499ca53c57220ede"
+    }
+    Frame {
+        msec: 272
+        hash: "b7fbfb90d8cc167809e8e846d9021b4b"
+    }
+    Frame {
+        msec: 288
+        hash: "004614b1bf18e9aa78e78509c4f289aa"
+    }
+    Frame {
+        msec: 304
+        hash: "1792bbd8b69bae1d92fed2a6bcfe0187"
+    }
+    Frame {
+        msec: 320
+        hash: "957a8b95d6e85885d854b8eb1db10b04"
+    }
+    Frame {
+        msec: 336
+        hash: "d00c3e4d6d8e8d04b949840c28d73a33"
+    }
+    Frame {
+        msec: 352
+        hash: "2b79feaa62d773d92d8a684685b2004c"
+    }
+    Frame {
+        msec: 368
+        hash: "ef2f11b187028de0c56b23db3168fbc8"
+    }
+    Frame {
+        msec: 384
+        hash: "3a489a96aaeca80355313198b935691d"
+    }
+    Frame {
+        msec: 400
+        hash: "389f1798f900795a8686c38ace755974"
+    }
+    Frame {
+        msec: 416
+        hash: "34fc20be52fe3843420819b9adb90b22"
+    }
+    Frame {
+        msec: 432
+        hash: "fa715c5b6640eafe204bf3b8095c74b9"
+    }
+    Frame {
+        msec: 448
+        hash: "8e8315edcf23167ac58228b8c28b43e6"
+    }
+    Frame {
+        msec: 464
+        hash: "c18e82038f57dd869112cb1be14e4cfe"
+    }
+    Frame {
+        msec: 480
+        hash: "3f07e95b09e39f2e5d93216850f4a4d9"
+    }
+    Frame {
+        msec: 496
+        hash: "20f0e6eaeac04d6f93565adfab485218"
+    }
+    Frame {
+        msec: 512
+        hash: "e3f66d1dfe88dd868a54a8493828ef5f"
+    }
+    Frame {
+        msec: 528
+        hash: "d39d34f63e1b29c187249cb388552b38"
+    }
+    Frame {
+        msec: 544
+        hash: "5d2e8df5003732f3b53fff4aaddea06c"
+    }
+    Frame {
+        msec: 560
+        hash: "35c3aa2dae481a8f817d849b3f3151f2"
+    }
+    Frame {
+        msec: 576
+        hash: "966b78018879224948b4d85fe73d7985"
+    }
+    Frame {
+        msec: 592
+        hash: "0db067bf9debc3f36dd539cf83652fb8"
+    }
+    Frame {
+        msec: 608
+        hash: "ea1c3249ffd2439533907ceaeaafbc56"
+    }
+    Frame {
+        msec: 624
+        hash: "da85c0e14b95ca9a729984b67ebd52ad"
+    }
+    Frame {
+        msec: 640
+        hash: "5c26ae844ac52dbe131fed0638787aac"
+    }
+    Frame {
+        msec: 656
+        hash: "4b09c23ad624db80afcb2a6c1d5ddb96"
+    }
+    Frame {
+        msec: 672
+        hash: "9995deb3d22b418a19093b4b988b3fcc"
+    }
+    Frame {
+        msec: 688
+        hash: "77e53358f2d4392d0ba988187e7e272c"
+    }
+    Frame {
+        msec: 704
+        hash: "3fbbb73e790cf4a0583531fe1580f761"
+    }
+    Frame {
+        msec: 720
+        hash: "9d562e141095a258ee61463e644d9889"
+    }
+    Frame {
+        msec: 736
+        hash: "d05633ca49f96bf327bed5c9c0f6ac98"
+    }
+    Frame {
+        msec: 752
+        hash: "34c38e40e831dbede8fa83de31ed76aa"
+    }
+    Frame {
+        msec: 768
+        hash: "288e52c8be54f4914f687cef4ce1f24a"
+    }
+    Frame {
+        msec: 784
+        hash: "0b8b744aaf67e8b17fa459bb0ffb6db5"
+    }
+    Frame {
+        msec: 800
+        hash: "273dbe3e8c21bfeafa516d07778928c8"
+    }
+    Frame {
+        msec: 816
+        hash: "ef94ee1885287c72fa78038547d98b96"
+    }
+    Frame {
+        msec: 832
+        hash: "965e6387672319ac04fdc42768e581f1"
+    }
+    Frame {
+        msec: 848
+        hash: "95553d8aaece94c7017e57b03cd46c9a"
+    }
+    Frame {
+        msec: 864
+        hash: "bdaf35b920e5b08b8639d452afd2d51e"
+    }
+    Frame {
+        msec: 880
+        hash: "0ed16f00e89327dc8679bec42179c4ce"
+    }
+    Frame {
+        msec: 896
+        hash: "8c93e0ac399e09e98e34b90654e0e42a"
+    }
+    Frame {
+        msec: 912
+        hash: "93798fbb33adb6c813018757cfa34017"
+    }
+    Frame {
+        msec: 928
+        hash: "db4d7581e9a1f082a2c29ef7482a7893"
+    }
+    Frame {
+        msec: 944
+        hash: "67e074c1e083334de84a3549f4ee9ca4"
+    }
+    Frame {
+        msec: 960
+        image: "multilength.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "b1122c815a755c9988bcf03a3f7d7d6d"
+    }
+    Frame {
+        msec: 992
+        hash: "31148bae6653bdc3f1827d06de845663"
+    }
+    Frame {
+        msec: 1008
+        hash: "812428a944086ca46e102891964dac69"
+    }
+    Frame {
+        msec: 1024
+        hash: "ee7bb66bd7e8623325200ac994f8b41a"
+    }
+    Frame {
+        msec: 1040
+        hash: "6bd21a98e5c373a2c78334a0255e7750"
+    }
+    Frame {
+        msec: 1056
+        hash: "2e8e1eea14068b0e82464ed52ec1ab7a"
+    }
+    Frame {
+        msec: 1072
+        hash: "6dca5756e20eeb778e31d7b602ce77d7"
+    }
+    Frame {
+        msec: 1088
+        hash: "3cbb6700b9e30864a2b1e3d4d71d2a78"
+    }
+    Frame {
+        msec: 1104
+        hash: "c4d0230d2c4f73191a514e5df4c0b083"
+    }
+    Frame {
+        msec: 1120
+        hash: "a33df967fe43151dfc503d2ac78f8ca8"
+    }
+    Frame {
+        msec: 1136
+        hash: "0c7ff101efe60b600cacaf8d04d79053"
+    }
+    Frame {
+        msec: 1152
+        hash: "d246cfb75d89b9666877860aaf45ba60"
+    }
+    Frame {
+        msec: 1168
+        hash: "1130998aa2618a29ec6bc4b9219eedfa"
+    }
+    Frame {
+        msec: 1184
+        hash: "741dd83003633bbf8d28c2d4ddd8a2d0"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.0.png
new file mode 100644
index 0000000..1a8c89b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.qml
new file mode 100644
index 0000000..59f17f7
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.qml
@@ -0,0 +1,279 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 32
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 48
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 64
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 80
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 96
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 112
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 128
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 144
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 160
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 176
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 192
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 208
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 224
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 240
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 256
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 272
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 288
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 304
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 320
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 336
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 352
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 368
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 384
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 400
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 416
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 432
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 448
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 464
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 480
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 496
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 512
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 528
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 544
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 560
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 576
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 592
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 608
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 624
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 640
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 656
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 672
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 688
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 704
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 720
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 736
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 752
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 768
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 784
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 800
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 816
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 832
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 848
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 864
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 880
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 896
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 912
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 928
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 944
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 960
+        image: "elide.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 992
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 1008
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 1024
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 1040
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+    Frame {
+        msec: 1056
+        hash: "c80d2bcd4be99c73e6c628870206ce8c"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.0.png
new file mode 100644
index 0000000..3dfade5
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.1.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.1.png
new file mode 100644
index 0000000..1ee2076
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.2.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.2.png
new file mode 100644
index 0000000..ae680be
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.3.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.3.png
new file mode 100644
index 0000000..c2859be
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.qml
new file mode 100644
index 0000000..c592f18
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.qml
@@ -0,0 +1,991 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 32
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 48
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 64
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 80
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 96
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 112
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 128
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 144
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 160
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 176
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 192
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 208
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 224
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 240
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 256
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 272
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 288
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 304
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 320
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 336
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 352
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 368
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 384
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 400
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 416
+        hash: "086a46352aa1221b5e57f5624b0c256b"
+    }
+    Frame {
+        msec: 432
+        hash: "fc3a7e898d6bfa2af4d774b20609f967"
+    }
+    Frame {
+        msec: 448
+        hash: "fc3a7e898d6bfa2af4d774b20609f967"
+    }
+    Frame {
+        msec: 464
+        hash: "fc3a7e898d6bfa2af4d774b20609f967"
+    }
+    Frame {
+        msec: 480
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 496
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 512
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 528
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 544
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 560
+        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
+    }
+    Frame {
+        msec: 576
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 592
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 608
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 624
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 640
+        hash: "4daa612cd7e7ee455ff1a93329202865"
+    }
+    Frame {
+        msec: 656
+        hash: "3f362ad550db910f1d9f261557c65913"
+    }
+    Frame {
+        msec: 672
+        hash: "3f362ad550db910f1d9f261557c65913"
+    }
+    Frame {
+        msec: 688
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 704
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 720
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 736
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 752
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 768
+        hash: "f159011c2b85fe212a32a7b5d2a57016"
+    }
+    Frame {
+        msec: 784
+        hash: "a892c67199c23e5d9012a6a24cb45d16"
+    }
+    Frame {
+        msec: 800
+        hash: "a892c67199c23e5d9012a6a24cb45d16"
+    }
+    Frame {
+        msec: 816
+        hash: "a892c67199c23e5d9012a6a24cb45d16"
+    }
+    Frame {
+        msec: 832
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 848
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 864
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 880
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 896
+        hash: "532e01ed6ede95eca68e641e2edb7f1c"
+    }
+    Frame {
+        msec: 912
+        hash: "a7dc1d7dde956d62834de0968261386f"
+    }
+    Frame {
+        msec: 928
+        hash: "a7dc1d7dde956d62834de0968261386f"
+    }
+    Frame {
+        msec: 944
+        hash: "a7dc1d7dde956d62834de0968261386f"
+    }
+    Frame {
+        msec: 960
+        image: "elide2.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "a7dc1d7dde956d62834de0968261386f"
+    }
+    Frame {
+        msec: 992
+        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
+    }
+    Frame {
+        msec: 1008
+        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
+    }
+    Frame {
+        msec: 1024
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1040
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1056
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1072
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1088
+        hash: "778d34ca89b5db88fe26619576e9d337"
+    }
+    Frame {
+        msec: 1104
+        hash: "9424caee019aa9bccd4156b0b9ca2723"
+    }
+    Frame {
+        msec: 1120
+        hash: "9424caee019aa9bccd4156b0b9ca2723"
+    }
+    Frame {
+        msec: 1136
+        hash: "9424caee019aa9bccd4156b0b9ca2723"
+    }
+    Frame {
+        msec: 1152
+        hash: "000061a140ab71a44c0480a92ad3bc70"
+    }
+    Frame {
+        msec: 1168
+        hash: "000061a140ab71a44c0480a92ad3bc70"
+    }
+    Frame {
+        msec: 1184
+        hash: "000061a140ab71a44c0480a92ad3bc70"
+    }
+    Frame {
+        msec: 1200
+        hash: "5dec9638853165428cd15ae02e1d03ce"
+    }
+    Frame {
+        msec: 1216
+        hash: "5dec9638853165428cd15ae02e1d03ce"
+    }
+    Frame {
+        msec: 1232
+        hash: "5dec9638853165428cd15ae02e1d03ce"
+    }
+    Frame {
+        msec: 1248
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1264
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1280
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1296
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1312
+        hash: "ecb69bdbd13114715f738b1ace3ecf51"
+    }
+    Frame {
+        msec: 1328
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1344
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1360
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1376
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1392
+        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
+    }
+    Frame {
+        msec: 1408
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1424
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1440
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1456
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1472
+        hash: "d4230a476237f9e13a132e775f1b960c"
+    }
+    Frame {
+        msec: 1488
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1504
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1520
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1536
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1552
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1568
+        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
+    }
+    Frame {
+        msec: 1584
+        hash: "dd412c6a2e5cb8890cb43142c84a5673"
+    }
+    Frame {
+        msec: 1600
+        hash: "dd412c6a2e5cb8890cb43142c84a5673"
+    }
+    Frame {
+        msec: 1616
+        hash: "dd412c6a2e5cb8890cb43142c84a5673"
+    }
+    Frame {
+        msec: 1632
+        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+    }
+    Frame {
+        msec: 1648
+        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+    }
+    Frame {
+        msec: 1664
+        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+    }
+    Frame {
+        msec: 1680
+        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
+    }
+    Frame {
+        msec: 1696
+        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
+    }
+    Frame {
+        msec: 1712
+        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
+    }
+    Frame {
+        msec: 1728
+        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
+    }
+    Frame {
+        msec: 1744
+        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1760
+        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+    }
+    Frame {
+        msec: 1776
+        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+    }
+    Frame {
+        msec: 1792
+        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
+    }
+    Frame {
+        msec: 1808
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1824
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1840
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1856
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1872
+        hash: "4fa14ae57d170b16fd90d59d5ec83561"
+    }
+    Frame {
+        msec: 1888
+        hash: "976dd5bc154522438f92790f28639512"
+    }
+    Frame {
+        msec: 1904
+        hash: "976dd5bc154522438f92790f28639512"
+    }
+    Frame {
+        msec: 1920
+        image: "elide2.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "976dd5bc154522438f92790f28639512"
+    }
+    Frame {
+        msec: 1952
+        hash: "976dd5bc154522438f92790f28639512"
+    }
+    Frame {
+        msec: 1968
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 1984
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 2000
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 2016
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 2032
+        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
+    }
+    Frame {
+        msec: 2048
+        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
+    }
+    Frame {
+        msec: 2064
+        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
+    }
+    Frame {
+        msec: 2080
+        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
+    }
+    Frame {
+        msec: 2096
+        hash: "1a978ed6951afe40912efcfb54dcce65"
+    }
+    Frame {
+        msec: 2112
+        hash: "1a978ed6951afe40912efcfb54dcce65"
+    }
+    Frame {
+        msec: 2128
+        hash: "1a978ed6951afe40912efcfb54dcce65"
+    }
+    Frame {
+        msec: 2144
+        hash: "a57eea59fe6475164e24688489977869"
+    }
+    Frame {
+        msec: 2160
+        hash: "a57eea59fe6475164e24688489977869"
+    }
+    Frame {
+        msec: 2176
+        hash: "a57eea59fe6475164e24688489977869"
+    }
+    Frame {
+        msec: 2192
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2208
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2224
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2240
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2256
+        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
+    }
+    Frame {
+        msec: 2272
+        hash: "04c62a4d01e9309eaeea87902013c8b9"
+    }
+    Frame {
+        msec: 2288
+        hash: "04c62a4d01e9309eaeea87902013c8b9"
+    }
+    Frame {
+        msec: 2304
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2320
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2336
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2352
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2368
+        hash: "fac2f5730a600d6b69280d5e6962c1d2"
+    }
+    Frame {
+        msec: 2384
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2400
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2416
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2432
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2448
+        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
+    }
+    Frame {
+        msec: 2464
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2480
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2496
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2512
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2528
+        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
+    }
+    Frame {
+        msec: 2544
+        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+    }
+    Frame {
+        msec: 2560
+        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+    }
+    Frame {
+        msec: 2576
+        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+    }
+    Frame {
+        msec: 2592
+        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
+    }
+    Frame {
+        msec: 2608
+        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
+    }
+    Frame {
+        msec: 2624
+        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
+    }
+    Frame {
+        msec: 2640
+        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
+    }
+    Frame {
+        msec: 2656
+        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+    }
+    Frame {
+        msec: 2672
+        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+    }
+    Frame {
+        msec: 2688
+        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+    }
+    Frame {
+        msec: 2704
+        hash: "c13ec1d294921e6a56f6ac4198e084eb"
+    }
+    Frame {
+        msec: 2720
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2736
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2752
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2768
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2784
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2800
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2816
+        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
+    }
+    Frame {
+        msec: 2832
+        hash: "f44b88b80219497370b5d2ad380d03bf"
+    }
+    Frame {
+        msec: 2848
+        hash: "f44b88b80219497370b5d2ad380d03bf"
+    }
+    Frame {
+        msec: 2864
+        hash: "a093510751799f3466156f9775988044"
+    }
+    Frame {
+        msec: 2880
+        image: "elide2.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "a093510751799f3466156f9775988044"
+    }
+    Frame {
+        msec: 2912
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2928
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2944
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2960
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2976
+        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
+    }
+    Frame {
+        msec: 2992
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3008
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3024
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3040
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3056
+        hash: "d7da3826914ad1d2696803b659992e73"
+    }
+    Frame {
+        msec: 3072
+        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
+    }
+    Frame {
+        msec: 3088
+        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
+    }
+    Frame {
+        msec: 3104
+        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
+    }
+    Frame {
+        msec: 3120
+        hash: "df90afe882b18f3fd7b12e52ff36e66f"
+    }
+    Frame {
+        msec: 3136
+        hash: "df90afe882b18f3fd7b12e52ff36e66f"
+    }
+    Frame {
+        msec: 3152
+        hash: "5b84785ffe15c15c3b94c845db7a4a44"
+    }
+    Frame {
+        msec: 3168
+        hash: "5b84785ffe15c15c3b94c845db7a4a44"
+    }
+    Frame {
+        msec: 3184
+        hash: "5b84785ffe15c15c3b94c845db7a4a44"
+    }
+    Frame {
+        msec: 3200
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3216
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3232
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3248
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3264
+        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
+    }
+    Frame {
+        msec: 3280
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3296
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3312
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3328
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3344
+        hash: "39f1b201715413f13a60f449eef29706"
+    }
+    Frame {
+        msec: 3360
+        hash: "4baf5c1227de45f9e620fe6eb0590014"
+    }
+    Frame {
+        msec: 3376
+        hash: "4baf5c1227de45f9e620fe6eb0590014"
+    }
+    Frame {
+        msec: 3392
+        hash: "4baf5c1227de45f9e620fe6eb0590014"
+    }
+    Frame {
+        msec: 3408
+        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
+    }
+    Frame {
+        msec: 3424
+        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
+    }
+    Frame {
+        msec: 3440
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3456
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3472
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3488
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3504
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3520
+        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
+    }
+    Frame {
+        msec: 3536
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3552
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3568
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3584
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3600
+        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
+    }
+    Frame {
+        msec: 3616
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3632
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3648
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3664
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3680
+        hash: "b8853dc109d063d982952780aa80419a"
+    }
+    Frame {
+        msec: 3696
+        hash: "6bfd7cfd6369df1eb570fda103d9e009"
+    }
+    Frame {
+        msec: 3712
+        hash: "6bfd7cfd6369df1eb570fda103d9e009"
+    }
+    Frame {
+        msec: 3728
+        hash: "b6dba4a456cd8d1b62501039cb796625"
+    }
+    Frame {
+        msec: 3744
+        hash: "b6dba4a456cd8d1b62501039cb796625"
+    }
+    Frame {
+        msec: 3760
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3776
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3792
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3808
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3824
+        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
+    }
+    Frame {
+        msec: 3840
+        image: "elide2.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "d2e873e69aed3e0b6e53123cd63e386c"
+    }
+    Frame {
+        msec: 3872
+        hash: "d2e873e69aed3e0b6e53123cd63e386c"
+    }
+    Frame {
+        msec: 3888
+        hash: "baa8edfce77628c7a1ec83adce96e2c6"
+    }
+    Frame {
+        msec: 3904
+        hash: "baa8edfce77628c7a1ec83adce96e2c6"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/elide.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/elide.qml
new file mode 100644
index 0000000..fa6b5da
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/elide.qml
@@ -0,0 +1,31 @@
+import Qt 4.6
+
+Rectangle {
+    width: childrenRect.width
+    height: childrenRect.height
+    Column {
+        width: 80
+        height: myText.height*4
+        Text {
+            elide: "ElideLeft"
+            text: "aaa bbb ccc ddd eee fff"
+            width: 80
+            id: myText
+        }
+        Text {
+            elide: "ElideMiddle"
+            text: "aaa bbb ccc ddd eee fff"
+            width: 80
+        }
+        Text {
+            elide: "ElideRight"
+            text: "aaa bbb ccc ddd eee fff"
+            width: 80
+        }
+        Text {
+            elide: "ElideNone"
+            text: "aaa bbb ccc ddd eee fff"
+            width: 80
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml
new file mode 100644
index 0000000..c163e05
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+
+Rectangle {
+    width: 500
+    height: 100
+
+    Text {
+        width: NumberAnimation { from: 500; to: 0; repeat: true; duration: 5000 }
+        elide: Text.ElideRight
+        text: 'Here is some very long text that we should truncate when sizing window'
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml
new file mode 100644
index 0000000..ca41eab
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml
@@ -0,0 +1,19 @@
+import Qt 4.6
+
+Rectangle {
+    width: 500
+    height: 50
+    color: "lightBlue"
+    Rectangle {
+        width: myText.width
+        height: myText.height
+        color: "white"
+        anchors.centerIn: parent
+        Text {
+            id: myText
+            width: NumberAnimation { from: 500; to: 0; repeat: true; duration: 1000 }
+            elide: "ElideRight"
+            text: "Brevity is the soul of wit, and tediousness the limbs and outward flourishes.\x9CBrevity is a great charm of eloquence.\x9CBe concise!\x9CSHHHHHHHHHHHHHHHHHHHHHHHHHHHH"
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.0.png
new file mode 100644
index 0000000..67b497f
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.qml
new file mode 100644
index 0000000..ab17eb1
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.qml
@@ -0,0 +1,351 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 32
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 48
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 64
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 80
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 96
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 112
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 128
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 144
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 160
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 176
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 192
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 208
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 224
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 240
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 256
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 272
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 288
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 304
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 320
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 336
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 352
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 368
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 384
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 400
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 416
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 432
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 448
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 464
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 480
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 496
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 512
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 528
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 544
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 560
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 576
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 592
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 608
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 624
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 640
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 656
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 672
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 688
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 704
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 720
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 736
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 752
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 768
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 784
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 800
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 816
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 832
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 848
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 864
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 880
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 896
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 912
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 928
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 944
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 960
+        image: "plaintext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 992
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1008
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1024
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1040
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1056
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1072
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1088
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1104
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1120
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1136
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1152
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1168
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1184
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1200
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1216
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1232
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1248
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1264
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1280
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1296
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1312
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1328
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+    Frame {
+        msec: 1344
+        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.0.png b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.0.png
new file mode 100644
index 0000000..6379942
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.qml
new file mode 100644
index 0000000..72499b9
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.qml
@@ -0,0 +1,359 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 32
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 48
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 64
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 80
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 96
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 112
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 128
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 144
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 160
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 176
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 192
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 208
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 224
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 240
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 256
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 272
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 288
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 304
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 320
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 336
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 352
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 368
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 384
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 400
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 416
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 432
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 448
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 464
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 480
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 496
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 512
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 528
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 544
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 560
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 576
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 592
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 608
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 624
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 640
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 656
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 672
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 688
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 704
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 720
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 736
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 752
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 768
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 784
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 800
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 816
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 832
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 848
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 864
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 880
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 896
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 912
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 928
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 944
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 960
+        image: "richtext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 992
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1008
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1024
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1040
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1056
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1072
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1088
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1104
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1120
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1136
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1152
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1168
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1184
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1200
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1216
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1232
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1248
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1264
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1280
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1296
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1312
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1328
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1344
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1360
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+    Frame {
+        msec: 1376
+        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.0.png b/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.0.png
new file mode 100644
index 0000000..50d56dc
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.qml
new file mode 100644
index 0000000..f4cbcbd
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.qml
@@ -0,0 +1,351 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 32
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 48
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 64
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 80
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 96
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 112
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 128
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 144
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 160
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 176
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 192
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 208
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 224
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 240
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 256
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 272
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 288
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 304
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 320
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 336
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 352
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 368
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 384
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 400
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 416
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 432
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 448
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 464
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 480
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 496
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 512
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 528
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 544
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 560
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 576
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 592
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 608
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 624
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 640
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 656
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 672
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 688
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 704
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 720
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 736
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 752
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 768
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 784
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 800
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 816
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 832
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 848
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 864
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 880
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 896
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 912
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 928
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 944
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 960
+        image: "plaintext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 992
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1008
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1024
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1040
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1056
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1072
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1088
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1104
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1120
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1136
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1152
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1168
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1184
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1200
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1216
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1232
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1248
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1264
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1280
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1296
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1312
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1328
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1344
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.0.png b/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.0.png
new file mode 100644
index 0000000..2910670
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.qml
new file mode 100644
index 0000000..9f396c2
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.qml
@@ -0,0 +1,359 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 32
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 48
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 64
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 80
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 96
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 112
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 128
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 144
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 160
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 176
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 192
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 208
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 224
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 240
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 256
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 272
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 288
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 304
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 320
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 336
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 352
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 368
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 384
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 400
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 416
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 432
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 448
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 464
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 480
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 496
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 512
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 528
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 544
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 560
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 576
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 592
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 608
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 624
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 640
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 656
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 672
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 688
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 704
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 720
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 736
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 752
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 768
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 784
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 800
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 816
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 832
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 848
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 864
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 880
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 896
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 912
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 928
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 944
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 960
+        image: "richtext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 992
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1008
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1024
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1040
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1056
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1072
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1088
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1104
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1120
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1136
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1152
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1168
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1184
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1200
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1216
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1232
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1248
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1264
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1280
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1296
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1312
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1328
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1344
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1360
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1376
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/plaintext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/plaintext.qml
new file mode 100644
index 0000000..a3aa929
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/plaintext.qml
@@ -0,0 +1,85 @@
+import Qt 4.6
+
+Rectangle {
+    id: s; width: 800; height: 1000; color: "lightsteelblue"
+    property string text: "The quick brown fox jumps over the lazy dog."
+
+    Column {
+        spacing: 10
+        Text {
+            text: s.text
+        }
+        Text {
+            text: s.text; font.pixelSize: 18
+        }
+        Text {
+            text: s.text; font.pointSize: 25
+        }
+        Text {
+            text: s.text; color: "red"; smooth: true
+        }
+        Text {
+            text: s.text; font.capitalization: "AllUppercase"
+        }
+        Text {
+            text: s.text; font.underline: true
+        }
+        Text {
+            text: s.text; font.overline: true; smooth: true
+        }
+        Text {
+            text: s.text; font.strikeout: true
+        }
+        Text {
+            text: s.text; font.underline: true; font.overline: true; font.strikeout: true
+        }
+        Text {
+            text: s.text; font.letterSpacing: 200
+        }
+        Text {
+            text: s.text; font.underline: true; font.letterSpacing: 200; font.capitalization: "AllUppercase"; color: "blue"
+        }
+        Text {
+            text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideLeft; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideMiddle; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideRight; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideLeft; width: 200; wrap: true
+        }
+        Text {
+            text: s.text; elide: Text.ElideMiddle; width: 200; wrap: true
+        }
+        Text {
+            text: s.text; elide: Text.ElideRight; width: 200; wrap: true
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetext/font/richtext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/richtext.qml
new file mode 100644
index 0000000..35aa232
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/richtext.qml
@@ -0,0 +1,85 @@
+import Qt 4.6
+
+Rectangle {
+    id: s; width: 800; height: 1000; color: "lightsteelblue"
+    property string text: "<b>The</b> <i>quick</i> <u>brown</u> <o>fox</o> <big>jumps</big> <small>over</small> <tt>the</tt> <s>lazy</s> <em>dog</em>."
+
+    Column {
+        spacing: 10
+        Text {
+            text: s.text
+        }
+        Text {
+            text: s.text; font.pixelSize: 18
+        }
+        Text {
+            text: s.text; font.pointSize: 25
+        }
+        Text {
+            text: s.text; color: "red"; smooth: true
+        }
+        Text {
+            text: s.text; font.capitalization: "AllUppercase"
+        }
+        Text {
+            text: s.text; font.underline: true
+        }
+        Text {
+            text: s.text; font.overline: true; smooth: true
+        }
+        Text {
+            text: s.text; font.strikeout: true
+        }
+        Text {
+            text: s.text; font.underline: true; font.overline: true; font.strikeout: true
+        }
+        Text {
+            text: s.text; font.letterSpacing: 200
+        }
+        Text {
+            text: s.text; font.underline: true; font.letterSpacing: 200; font.capitalization: "AllUppercase"; color: "blue"
+        }
+        Text {
+            text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideLeft; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideMiddle; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideRight; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideLeft; width: 200; wrap: true
+        }
+        Text {
+            text: s.text; elide: Text.ElideMiddle; width: 200; wrap: true
+        }
+        Text {
+            text: s.text; elide: Text.ElideRight; width: 200; wrap: true
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextedit/cursorDelegate.qml
new file mode 100644
index 0000000..176a5b8
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/cursorDelegate.qml
@@ -0,0 +1,35 @@
+import Qt 4.6
+    Rectangle {
+    resources: [
+        Component { id: cursorA
+            Item { id: cPage;
+                x: Behavior { NumberAnimation { } }
+                y: Behavior { NumberAnimation { } }
+                height: Behavior { NumberAnimation { duration: 200 } }
+                Rectangle { id: cRectangle; color: "black"; y: 1; width: 1; height: parent.height-2;
+                    Rectangle { id:top; color: "black"; width: 3; height: 1; x: -1; y:0}
+                    Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
+                    opacity: 1
+                    opacity: SequentialAnimation { running: cPage.parent.focus == true; repeat: true;
+                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
+                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
+                             }
+                }
+                width: 1;
+            }
+        }
+    ]
+    width: 400
+    height: 200
+    color: "white"
+    TextEdit { id: mainText
+        text: "Hello World"
+        cursorDelegate: cursorA
+        focus: true
+        font.pixelSize: 28
+        selectionColor: "lightsteelblue"
+        selectedTextColor: "deeppink"
+        color: "forestgreen"
+        anchors.centerIn: parent
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png
new file mode 100644
index 0000000..464a578
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png
new file mode 100644
index 0000000..9beb1ca
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png
new file mode 100644
index 0000000..001be30
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png
new file mode 100644
index 0000000..fc3e4b3
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png
new file mode 100644
index 0000000..24f43e6
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png
new file mode 100644
index 0000000..001223b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png
new file mode 100644
index 0000000..7126e07
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png
new file mode 100644
index 0000000..f0bea88
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png
new file mode 100644
index 0000000..4381b8d
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
new file mode 100644
index 0000000..8ee92d7
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
@@ -0,0 +1,3555 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 32
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 48
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 64
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 80
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 96
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 112
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 128
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 144
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 160
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 176
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 192
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 208
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 224
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 240
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 256
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 272
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 288
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 304
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 320
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 336
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 352
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 368
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 384
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 400
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 416
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 432
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 448
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 464
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 480
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 496
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 512
+        hash: "e0366dbd264ca453f5dad3a7966f17a2"
+    }
+    Frame {
+        msec: 528
+        hash: "84cad44c4cccf8a0942865719d05c2eb"
+    }
+    Frame {
+        msec: 544
+        hash: "60d24c160adb8e074c04d4f40bf140a8"
+    }
+    Frame {
+        msec: 560
+        hash: "ff5fac70804eb01da28c2988aba520a4"
+    }
+    Frame {
+        msec: 576
+        hash: "a6bdf56b4f8783969935488e1955e59c"
+    }
+    Frame {
+        msec: 592
+        hash: "d0ad97647c5092a64426187406ec5316"
+    }
+    Frame {
+        msec: 608
+        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+    }
+    Frame {
+        msec: 624
+        hash: "0285340a2e03568810a76d840369f5c8"
+    }
+    Frame {
+        msec: 640
+        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+    }
+    Frame {
+        msec: 656
+        hash: "3caa36cc3857803248d12ec09ea357df"
+    }
+    Frame {
+        msec: 672
+        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+    }
+    Frame {
+        msec: 688
+        hash: "aadc71923926885ccce87e6be1c742d7"
+    }
+    Frame {
+        msec: 704
+        hash: "9b7503189ecf2999934716f227469463"
+    }
+    Frame {
+        msec: 720
+        hash: "874296e182abe96e58f9c0463a0f32c9"
+    }
+    Frame {
+        msec: 736
+        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+    }
+    Frame {
+        msec: 752
+        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+    }
+    Frame {
+        msec: 768
+        hash: "0034ef8851c9810ed5d50496aea367da"
+    }
+    Frame {
+        msec: 784
+        hash: "24cebf60ade86469a154abaa64f3b40d"
+    }
+    Frame {
+        msec: 800
+        hash: "1100ef4e2db234ea77ff4c70df6bfbe7"
+    }
+    Frame {
+        msec: 816
+        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
+    }
+    Frame {
+        msec: 832
+        hash: "5c1000fdc279742cbe46987045c0a92b"
+    }
+    Frame {
+        msec: 848
+        hash: "bcef4a0ff72330f05f2bf5042e414fde"
+    }
+    Frame {
+        msec: 864
+        hash: "228551c38b567f1550b44f9dac08786b"
+    }
+    Frame {
+        msec: 880
+        hash: "531c5ca6992c4a12927c61e22c02dd6b"
+    }
+    Frame {
+        msec: 896
+        hash: "127cc30967f95cb88f4238e0b33c741d"
+    }
+    Frame {
+        msec: 912
+        hash: "3c3fb1d8dbe7443f80550a30ada7f120"
+    }
+    Frame {
+        msec: 928
+        hash: "edca065d42bf9b63a79d1e97d1a1eed0"
+    }
+    Frame {
+        msec: 944
+        hash: "1e4424f1f40bfce3205e1d1401ab0dcf"
+    }
+    Frame {
+        msec: 960
+        image: "cursorDelegate.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1072
+        hash: "90ac5ad7ce23786fe838426605e737e1"
+    }
+    Frame {
+        msec: 1088
+        hash: "1e4424f1f40bfce3205e1d1401ab0dcf"
+    }
+    Frame {
+        msec: 1104
+        hash: "edca065d42bf9b63a79d1e97d1a1eed0"
+    }
+    Frame {
+        msec: 1120
+        hash: "3c3fb1d8dbe7443f80550a30ada7f120"
+    }
+    Frame {
+        msec: 1136
+        hash: "127cc30967f95cb88f4238e0b33c741d"
+    }
+    Frame {
+        msec: 1152
+        hash: "531c5ca6992c4a12927c61e22c02dd6b"
+    }
+    Frame {
+        msec: 1168
+        hash: "228551c38b567f1550b44f9dac08786b"
+    }
+    Frame {
+        msec: 1184
+        hash: "bcef4a0ff72330f05f2bf5042e414fde"
+    }
+    Frame {
+        msec: 1200
+        hash: "5c1000fdc279742cbe46987045c0a92b"
+    }
+    Frame {
+        msec: 1216
+        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
+    }
+    Frame {
+        msec: 1232
+        hash: "1100ef4e2db234ea77ff4c70df6bfbe7"
+    }
+    Frame {
+        msec: 1248
+        hash: "24cebf60ade86469a154abaa64f3b40d"
+    }
+    Frame {
+        msec: 1264
+        hash: "0034ef8851c9810ed5d50496aea367da"
+    }
+    Frame {
+        msec: 1280
+        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+    }
+    Frame {
+        msec: 1296
+        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+    }
+    Frame {
+        msec: 1312
+        hash: "874296e182abe96e58f9c0463a0f32c9"
+    }
+    Frame {
+        msec: 1328
+        hash: "9b7503189ecf2999934716f227469463"
+    }
+    Frame {
+        msec: 1344
+        hash: "aadc71923926885ccce87e6be1c742d7"
+    }
+    Frame {
+        msec: 1360
+        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+    }
+    Frame {
+        msec: 1376
+        hash: "3caa36cc3857803248d12ec09ea357df"
+    }
+    Key {
+        type: 6
+        key: 16777232
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+    }
+    Frame {
+        msec: 1408
+        hash: "0285340a2e03568810a76d840369f5c8"
+    }
+    Frame {
+        msec: 1424
+        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+    }
+    Frame {
+        msec: 1440
+        hash: "d0ad97647c5092a64426187406ec5316"
+    }
+    Frame {
+        msec: 1456
+        hash: "a6bdf56b4f8783969935488e1955e59c"
+    }
+    Key {
+        type: 7
+        key: 16777232
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1472
+        hash: "ff5fac70804eb01da28c2988aba520a4"
+    }
+    Frame {
+        msec: 1488
+        hash: "60d24c160adb8e074c04d4f40bf140a8"
+    }
+    Frame {
+        msec: 1504
+        hash: "84cad44c4cccf8a0942865719d05c2eb"
+    }
+    Frame {
+        msec: 1520
+        hash: "907c6363d1e524f391d001944febe1ac"
+    }
+    Frame {
+        msec: 1536
+        hash: "313a06d40274e46453342e66236f09f8"
+    }
+    Frame {
+        msec: 1552
+        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
+    }
+    Frame {
+        msec: 1568
+        hash: "a9911e076af337fe30e322f03d84a528"
+    }
+    Frame {
+        msec: 1584
+        hash: "4a8efcc341bba9ba621ce0f785a75432"
+    }
+    Frame {
+        msec: 1600
+        hash: "479f192c8cf7b8e4407655382402700f"
+    }
+    Frame {
+        msec: 1616
+        hash: "63dc16e66def35abba5159d5650f165d"
+    }
+    Frame {
+        msec: 1632
+        hash: "26e88aae512304c28d425c311febce1b"
+    }
+    Key {
+        type: 6
+        key: 16777233
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1648
+        hash: "8dca7a7912ddaa853dff9c09882082b1"
+    }
+    Frame {
+        msec: 1664
+        hash: "5c3ebee155e29a0ba4a45706dd87396a"
+    }
+    Frame {
+        msec: 1680
+        hash: "29a517a66867f6f527c6db5bb5651f92"
+    }
+    Frame {
+        msec: 1696
+        hash: "a4fde31f55f866224eca2b51586b601f"
+    }
+    Frame {
+        msec: 1712
+        hash: "9c9c7fb9fb8aab8c24f2eb03df791a00"
+    }
+    Frame {
+        msec: 1728
+        hash: "dd972e37166d1186a717a956343a7758"
+    }
+    Key {
+        type: 7
+        key: 16777233
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1744
+        hash: "1af5e24651ef422ff93dab7bd2a8f832"
+    }
+    Frame {
+        msec: 1760
+        hash: "885473be4e44bb1f4b014f9b3d4d2e74"
+    }
+    Frame {
+        msec: 1776
+        hash: "1f6e0407392322c34567caaecae5b449"
+    }
+    Frame {
+        msec: 1792
+        hash: "dcae85a4b05c450b6b1619f9fd7e17b0"
+    }
+    Frame {
+        msec: 1808
+        hash: "3b872e5030e34edf678ac2547df48699"
+    }
+    Frame {
+        msec: 1824
+        hash: "5d76b324496297d08cff57b4c21ce592"
+    }
+    Frame {
+        msec: 1840
+        hash: "4acfe3c4cf2f4e477f1a72817af556d2"
+    }
+    Frame {
+        msec: 1856
+        hash: "a04671fe8d28cfb629f2090e342747fb"
+    }
+    Frame {
+        msec: 1872
+        hash: "2474db802c7d8e0ec8fa7f958c04bf30"
+    }
+    Frame {
+        msec: 1888
+        hash: "11a1e1f38c407de4bc069aa192319fe4"
+    }
+    Frame {
+        msec: 1904
+        hash: "ec8aacc8d2280068dd7f020e8648afea"
+    }
+    Frame {
+        msec: 1920
+        image: "cursorDelegate.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "fbbe4d0fed6274968a89e02bb1ca5685"
+    }
+    Frame {
+        msec: 1952
+        hash: "13d478424a8f0cab8bab6a157efce318"
+    }
+    Frame {
+        msec: 1968
+        hash: "ea6bc9ec217fb80b86276a2675c08a0f"
+    }
+    Frame {
+        msec: 1984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2064
+        hash: "ea6bc9ec217fb80b86276a2675c08a0f"
+    }
+    Frame {
+        msec: 2080
+        hash: "13d478424a8f0cab8bab6a157efce318"
+    }
+    Frame {
+        msec: 2096
+        hash: "fbbe4d0fed6274968a89e02bb1ca5685"
+    }
+    Frame {
+        msec: 2112
+        hash: "00dedd48bd6861cb4bf4953162a67cc0"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "ec8aacc8d2280068dd7f020e8648afea"
+    }
+    Frame {
+        msec: 2144
+        hash: "11a1e1f38c407de4bc069aa192319fe4"
+    }
+    Frame {
+        msec: 2160
+        hash: "2474db802c7d8e0ec8fa7f958c04bf30"
+    }
+    Frame {
+        msec: 2176
+        hash: "a04671fe8d28cfb629f2090e342747fb"
+    }
+    Frame {
+        msec: 2192
+        hash: "4acfe3c4cf2f4e477f1a72817af556d2"
+    }
+    Frame {
+        msec: 2208
+        hash: "5d76b324496297d08cff57b4c21ce592"
+    }
+    Frame {
+        msec: 2224
+        hash: "3b872e5030e34edf678ac2547df48699"
+    }
+    Frame {
+        msec: 2240
+        hash: "dcae85a4b05c450b6b1619f9fd7e17b0"
+    }
+    Frame {
+        msec: 2256
+        hash: "1f6e0407392322c34567caaecae5b449"
+    }
+    Frame {
+        msec: 2272
+        hash: "885473be4e44bb1f4b014f9b3d4d2e74"
+    }
+    Frame {
+        msec: 2288
+        hash: "1af5e24651ef422ff93dab7bd2a8f832"
+    }
+    Frame {
+        msec: 2304
+        hash: "dd972e37166d1186a717a956343a7758"
+    }
+    Frame {
+        msec: 2320
+        hash: "9c9c7fb9fb8aab8c24f2eb03df791a00"
+    }
+    Key {
+        type: 6
+        key: 16777232
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2336
+        hash: "aec9683f3a677dab781bdf3bbf7cce5e"
+    }
+    Frame {
+        msec: 2352
+        hash: "63c6a7810dec832f1b8288807f1d932a"
+    }
+    Frame {
+        msec: 2368
+        hash: "70409eeee50fbb54097a3c430e1e1f21"
+    }
+    Frame {
+        msec: 2384
+        hash: "efc77b82c0ffd7f3fbe5fed06ea418bd"
+    }
+    Frame {
+        msec: 2400
+        hash: "26e88aae512304c28d425c311febce1b"
+    }
+    Frame {
+        msec: 2416
+        hash: "63dc16e66def35abba5159d5650f165d"
+    }
+    Frame {
+        msec: 2432
+        hash: "479f192c8cf7b8e4407655382402700f"
+    }
+    Key {
+        type: 7
+        key: 16777232
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "4a8efcc341bba9ba621ce0f785a75432"
+    }
+    Frame {
+        msec: 2464
+        hash: "a9911e076af337fe30e322f03d84a528"
+    }
+    Frame {
+        msec: 2480
+        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
+    }
+    Frame {
+        msec: 2496
+        hash: "313a06d40274e46453342e66236f09f8"
+    }
+    Frame {
+        msec: 2512
+        hash: "907c6363d1e524f391d001944febe1ac"
+    }
+    Frame {
+        msec: 2528
+        hash: "84cad44c4cccf8a0942865719d05c2eb"
+    }
+    Frame {
+        msec: 2544
+        hash: "60d24c160adb8e074c04d4f40bf140a8"
+    }
+    Frame {
+        msec: 2560
+        hash: "ff5fac70804eb01da28c2988aba520a4"
+    }
+    Frame {
+        msec: 2576
+        hash: "a6bdf56b4f8783969935488e1955e59c"
+    }
+    Frame {
+        msec: 2592
+        hash: "d0ad97647c5092a64426187406ec5316"
+    }
+    Frame {
+        msec: 2608
+        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+    }
+    Frame {
+        msec: 2624
+        hash: "0285340a2e03568810a76d840369f5c8"
+    }
+    Frame {
+        msec: 2640
+        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+    }
+    Frame {
+        msec: 2656
+        hash: "3caa36cc3857803248d12ec09ea357df"
+    }
+    Frame {
+        msec: 2672
+        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+    }
+    Frame {
+        msec: 2688
+        hash: "aadc71923926885ccce87e6be1c742d7"
+    }
+    Frame {
+        msec: 2704
+        hash: "9b7503189ecf2999934716f227469463"
+    }
+    Frame {
+        msec: 2720
+        hash: "874296e182abe96e58f9c0463a0f32c9"
+    }
+    Frame {
+        msec: 2736
+        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+    }
+    Frame {
+        msec: 2752
+        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+    }
+    Frame {
+        msec: 2768
+        hash: "0034ef8851c9810ed5d50496aea367da"
+    }
+    Frame {
+        msec: 2784
+        hash: "24cebf60ade86469a154abaa64f3b40d"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2800
+        hash: "1100ef4e2db234ea77ff4c70df6bfbe7"
+    }
+    Frame {
+        msec: 2816
+        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
+    }
+    Frame {
+        msec: 2832
+        hash: "5c1000fdc279742cbe46987045c0a92b"
+    }
+    Frame {
+        msec: 2848
+        hash: "bcef4a0ff72330f05f2bf5042e414fde"
+    }
+    Frame {
+        msec: 2864
+        hash: "228551c38b567f1550b44f9dac08786b"
+    }
+    Frame {
+        msec: 2880
+        image: "cursorDelegate.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "127cc30967f95cb88f4238e0b33c741d"
+    }
+    Frame {
+        msec: 2912
+        hash: "3c3fb1d8dbe7443f80550a30ada7f120"
+    }
+    Frame {
+        msec: 2928
+        hash: "edca065d42bf9b63a79d1e97d1a1eed0"
+    }
+    Frame {
+        msec: 2944
+        hash: "1e4424f1f40bfce3205e1d1401ab0dcf"
+    }
+    Frame {
+        msec: 2960
+        hash: "90ac5ad7ce23786fe838426605e737e1"
+    }
+    Frame {
+        msec: 2976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3072
+        hash: "90ac5ad7ce23786fe838426605e737e1"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3088
+        hash: "cf467854dfde9b2111bc6e7e4442aab5"
+    }
+    Frame {
+        msec: 3104
+        hash: "df6f025130dc82f4764def81cec5fa7b"
+    }
+    Frame {
+        msec: 3120
+        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
+    }
+    Frame {
+        msec: 3136
+        hash: "14b328c8ec6276e022643102af80fa44"
+    }
+    Frame {
+        msec: 3152
+        hash: "078d75d72bff036574b85ac0aeaaf2b6"
+    }
+    Frame {
+        msec: 3168
+        hash: "fbefb1e0801f4578ab93dd7ff4062e68"
+    }
+    Frame {
+        msec: 3184
+        hash: "eac8375d9b9cf0afbf232e27c6ceb037"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3200
+        hash: "3462a3e166120515e67430600e4653f8"
+    }
+    Frame {
+        msec: 3216
+        hash: "7f2d9959323f0707e36ecb2252c89727"
+    }
+    Frame {
+        msec: 3232
+        hash: "0a1c2eb8a7451a5e37fefb96a58a88a1"
+    }
+    Frame {
+        msec: 3248
+        hash: "4a02aaca12e3fd86ee3b516b3a307f86"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3264
+        hash: "0034ef8851c9810ed5d50496aea367da"
+    }
+    Frame {
+        msec: 3280
+        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+    }
+    Frame {
+        msec: 3296
+        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+    }
+    Frame {
+        msec: 3312
+        hash: "874296e182abe96e58f9c0463a0f32c9"
+    }
+    Frame {
+        msec: 3328
+        hash: "9b7503189ecf2999934716f227469463"
+    }
+    Frame {
+        msec: 3344
+        hash: "aadc71923926885ccce87e6be1c742d7"
+    }
+    Frame {
+        msec: 3360
+        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3376
+        hash: "3caa36cc3857803248d12ec09ea357df"
+    }
+    Frame {
+        msec: 3392
+        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+    }
+    Frame {
+        msec: 3408
+        hash: "0285340a2e03568810a76d840369f5c8"
+    }
+    Frame {
+        msec: 3424
+        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+    }
+    Frame {
+        msec: 3440
+        hash: "d0ad97647c5092a64426187406ec5316"
+    }
+    Frame {
+        msec: 3456
+        hash: "a6bdf56b4f8783969935488e1955e59c"
+    }
+    Frame {
+        msec: 3472
+        hash: "ff5fac70804eb01da28c2988aba520a4"
+    }
+    Frame {
+        msec: 3488
+        hash: "60d24c160adb8e074c04d4f40bf140a8"
+    }
+    Frame {
+        msec: 3504
+        hash: "84cad44c4cccf8a0942865719d05c2eb"
+    }
+    Frame {
+        msec: 3520
+        hash: "907c6363d1e524f391d001944febe1ac"
+    }
+    Frame {
+        msec: 3536
+        hash: "313a06d40274e46453342e66236f09f8"
+    }
+    Frame {
+        msec: 3552
+        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
+    }
+    Frame {
+        msec: 3568
+        hash: "a9911e076af337fe30e322f03d84a528"
+    }
+    Frame {
+        msec: 3584
+        hash: "4a8efcc341bba9ba621ce0f785a75432"
+    }
+    Frame {
+        msec: 3600
+        hash: "479f192c8cf7b8e4407655382402700f"
+    }
+    Frame {
+        msec: 3616
+        hash: "63dc16e66def35abba5159d5650f165d"
+    }
+    Frame {
+        msec: 3632
+        hash: "26e88aae512304c28d425c311febce1b"
+    }
+    Frame {
+        msec: 3648
+        hash: "efc77b82c0ffd7f3fbe5fed06ea418bd"
+    }
+    Frame {
+        msec: 3664
+        hash: "70409eeee50fbb54097a3c430e1e1f21"
+    }
+    Frame {
+        msec: 3680
+        hash: "63c6a7810dec832f1b8288807f1d932a"
+    }
+    Frame {
+        msec: 3696
+        hash: "aec9683f3a677dab781bdf3bbf7cce5e"
+    }
+    Frame {
+        msec: 3712
+        hash: "2e6dd79fc23acbf710e757f3d0999ab8"
+    }
+    Frame {
+        msec: 3728
+        hash: "4d9dd9e515a21478cb3364032acf8c15"
+    }
+    Frame {
+        msec: 3744
+        hash: "5dc2129cac6e667d39da3304a37a76f2"
+    }
+    Frame {
+        msec: 3760
+        hash: "ab5eb4750139875586a346b1c3a84f42"
+    }
+    Frame {
+        msec: 3776
+        hash: "96d3bd62d4a0bf39a672b97fcc050bd5"
+    }
+    Frame {
+        msec: 3792
+        hash: "546cec655631b5802eb4d7008093eb69"
+    }
+    Frame {
+        msec: 3808
+        hash: "85f33f1bf1b1e11be450ab85bf6dab3d"
+    }
+    Frame {
+        msec: 3824
+        hash: "44b195297acd1bf59e43751df8dc1c1d"
+    }
+    Frame {
+        msec: 3840
+        image: "cursorDelegate.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "47942253c07fd39894445ff5e5b9608c"
+    }
+    Frame {
+        msec: 3872
+        hash: "d26d71b1c03fb21550820dd1586a7a8e"
+    }
+    Frame {
+        msec: 3888
+        hash: "37ec2ed29006575e8bd41a1989b75e27"
+    }
+    Frame {
+        msec: 3904
+        hash: "5ad1ab34572f9ef339774134bc0ab407"
+    }
+    Frame {
+        msec: 3920
+        hash: "a4f68f6ee46642e7cc5a542b9f8a2464"
+    }
+    Frame {
+        msec: 3936
+        hash: "fce95d18a0efee74554209ca39637062"
+    }
+    Frame {
+        msec: 3952
+        hash: "1587fc2668f1f44e76f252bfd75f2708"
+    }
+    Frame {
+        msec: 3968
+        hash: "e0a6eb42de552281e297ca5c50c1df23"
+    }
+    Frame {
+        msec: 3984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4064
+        hash: "e0a6eb42de552281e297ca5c50c1df23"
+    }
+    Frame {
+        msec: 4080
+        hash: "1587fc2668f1f44e76f252bfd75f2708"
+    }
+    Frame {
+        msec: 4096
+        hash: "fce95d18a0efee74554209ca39637062"
+    }
+    Frame {
+        msec: 4112
+        hash: "a4f68f6ee46642e7cc5a542b9f8a2464"
+    }
+    Frame {
+        msec: 4128
+        hash: "5ad1ab34572f9ef339774134bc0ab407"
+    }
+    Frame {
+        msec: 4144
+        hash: "37ec2ed29006575e8bd41a1989b75e27"
+    }
+    Frame {
+        msec: 4160
+        hash: "d26d71b1c03fb21550820dd1586a7a8e"
+    }
+    Frame {
+        msec: 4176
+        hash: "47942253c07fd39894445ff5e5b9608c"
+    }
+    Frame {
+        msec: 4192
+        hash: "a62f1cbf43da0381c7c9099d47ded882"
+    }
+    Frame {
+        msec: 4208
+        hash: "44b195297acd1bf59e43751df8dc1c1d"
+    }
+    Frame {
+        msec: 4224
+        hash: "85f33f1bf1b1e11be450ab85bf6dab3d"
+    }
+    Frame {
+        msec: 4240
+        hash: "546cec655631b5802eb4d7008093eb69"
+    }
+    Frame {
+        msec: 4256
+        hash: "96d3bd62d4a0bf39a672b97fcc050bd5"
+    }
+    Frame {
+        msec: 4272
+        hash: "ab5eb4750139875586a346b1c3a84f42"
+    }
+    Frame {
+        msec: 4288
+        hash: "5dc2129cac6e667d39da3304a37a76f2"
+    }
+    Frame {
+        msec: 4304
+        hash: "4d9dd9e515a21478cb3364032acf8c15"
+    }
+    Frame {
+        msec: 4320
+        hash: "2e6dd79fc23acbf710e757f3d0999ab8"
+    }
+    Frame {
+        msec: 4336
+        hash: "aec9683f3a677dab781bdf3bbf7cce5e"
+    }
+    Frame {
+        msec: 4352
+        hash: "63c6a7810dec832f1b8288807f1d932a"
+    }
+    Frame {
+        msec: 4368
+        hash: "70409eeee50fbb54097a3c430e1e1f21"
+    }
+    Frame {
+        msec: 4384
+        hash: "efc77b82c0ffd7f3fbe5fed06ea418bd"
+    }
+    Frame {
+        msec: 4400
+        hash: "26e88aae512304c28d425c311febce1b"
+    }
+    Frame {
+        msec: 4416
+        hash: "63dc16e66def35abba5159d5650f165d"
+    }
+    Frame {
+        msec: 4432
+        hash: "479f192c8cf7b8e4407655382402700f"
+    }
+    Frame {
+        msec: 4448
+        hash: "4a8efcc341bba9ba621ce0f785a75432"
+    }
+    Frame {
+        msec: 4464
+        hash: "a9911e076af337fe30e322f03d84a528"
+    }
+    Frame {
+        msec: 4480
+        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
+    }
+    Frame {
+        msec: 4496
+        hash: "313a06d40274e46453342e66236f09f8"
+    }
+    Frame {
+        msec: 4512
+        hash: "907c6363d1e524f391d001944febe1ac"
+    }
+    Frame {
+        msec: 4528
+        hash: "84cad44c4cccf8a0942865719d05c2eb"
+    }
+    Frame {
+        msec: 4544
+        hash: "60d24c160adb8e074c04d4f40bf140a8"
+    }
+    Frame {
+        msec: 4560
+        hash: "ff5fac70804eb01da28c2988aba520a4"
+    }
+    Frame {
+        msec: 4576
+        hash: "a6bdf56b4f8783969935488e1955e59c"
+    }
+    Frame {
+        msec: 4592
+        hash: "d0ad97647c5092a64426187406ec5316"
+    }
+    Frame {
+        msec: 4608
+        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
+    }
+    Frame {
+        msec: 4624
+        hash: "0285340a2e03568810a76d840369f5c8"
+    }
+    Frame {
+        msec: 4640
+        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
+    }
+    Frame {
+        msec: 4656
+        hash: "3caa36cc3857803248d12ec09ea357df"
+    }
+    Frame {
+        msec: 4672
+        hash: "500f7b72acc877fc1662e4f4ceb090e1"
+    }
+    Frame {
+        msec: 4688
+        hash: "aadc71923926885ccce87e6be1c742d7"
+    }
+    Frame {
+        msec: 4704
+        hash: "9b7503189ecf2999934716f227469463"
+    }
+    Frame {
+        msec: 4720
+        hash: "874296e182abe96e58f9c0463a0f32c9"
+    }
+    Frame {
+        msec: 4736
+        hash: "4262c79b6844d4d62aa9fb02c335fb95"
+    }
+    Frame {
+        msec: 4752
+        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
+    }
+    Frame {
+        msec: 4768
+        hash: "0034ef8851c9810ed5d50496aea367da"
+    }
+    Frame {
+        msec: 4784
+        hash: "24cebf60ade86469a154abaa64f3b40d"
+    }
+    Frame {
+        msec: 4800
+        image: "cursorDelegate.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
+    }
+    Frame {
+        msec: 4832
+        hash: "5c1000fdc279742cbe46987045c0a92b"
+    }
+    Frame {
+        msec: 4848
+        hash: "bcef4a0ff72330f05f2bf5042e414fde"
+    }
+    Frame {
+        msec: 4864
+        hash: "228551c38b567f1550b44f9dac08786b"
+    }
+    Frame {
+        msec: 4880
+        hash: "531c5ca6992c4a12927c61e22c02dd6b"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 130; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4896
+        hash: "14b328c8ec6276e022643102af80fa44"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 130; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4912
+        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 131; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4928
+        hash: "df6f025130dc82f4764def81cec5fa7b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 132; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4944
+        hash: "cf467854dfde9b2111bc6e7e4442aab5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 133; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 134; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4960
+        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 135; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 136; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 137; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 139; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 140; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 141; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 143; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5072
+        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5088
+        hash: "cf467854dfde9b2111bc6e7e4442aab5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 149; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5104
+        hash: "7643fcfb740d33b87915300684e85a44"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 150; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5120
+        hash: "1bd041a5e8d2237b51720fed82250303"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5136
+        hash: "1a00c9d3ce747e3bc7ee5878d21260b4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5152
+        hash: "803896c1be68588ba2cddd7effbb8d62"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 153; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5168
+        hash: "282ab572698088fba3aba8e6a091aa38"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5184
+        hash: "24402d9e4fabd78bc8f3921db82e554e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5200
+        hash: "39a89e9ca7c4edd9c8503927d639df0f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5216
+        hash: "b984b7d032544acd4dab8901e0af1ef5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5232
+        hash: "e014414626407b0446939ad2ce38b7dd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5248
+        hash: "beccb93613279e2f48507ddc9a4418e8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5264
+        hash: "dd861f8dc89587301e860217fdf2a701"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5280
+        hash: "1ae0b7a18a7d3ebe4871a0045005e2b7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5296
+        hash: "071e1f8bcc0e541b23d134f32c19d20b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5312
+        hash: "e8ce2716f4595bc5bf68c24c8a63bbfe"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5328
+        hash: "d36a35503af76b12fe5cec65e3f22eda"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 178; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5344
+        hash: "cea0f90a56fd5789b3e166f09f2bfcec"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 179; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5360
+        hash: "151f5357d9c1a3f1fe09380a287abab0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 180; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5376
+        hash: "bdab9d7077734087cb7f9516e9c517bc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 182; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 183; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5392
+        hash: "6d6d929a7c7be1d2e7d1b2f98a6866be"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5408
+        hash: "3fbe3f45afc5aa40fff7f795ced8a05d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5424
+        hash: "b35b4dc480aeb76912d927b0ff8676c6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 189; y: 93
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 191; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5440
+        hash: "94e82e888280f20cce3ac38b353b79f4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 192; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5456
+        hash: "4674fbd35e467bed780a5ea2fe2e258b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 194; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5472
+        hash: "698827bfa7ff2eae6b0e0efa99bb15bb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 196; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5488
+        hash: "67c7adef5e41481d631f54d34423b93d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 199; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5504
+        hash: "097512c005127fa3ebfcbc52808264a8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 200; y: 91
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5520
+        hash: "ad64b5913350e6c6fda199ecb34278f4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 200; y: 91
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 201; y: 90
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5536
+        hash: "3237e88e0f40595d2fde62723c00b7fa"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 202; y: 89
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5552
+        hash: "18db89296849f22a7af0a1ffc9762a32"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5568
+        hash: "7f6ac84baaa2c5fcd22ba45172611840"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 204; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5584
+        hash: "7b887d3aa44229d9f25fdde8f5ccf471"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 207; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 208; y: 85
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5600
+        hash: "b0c08726d0f2a460d5862cd2d7ee6230"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 210; y: 85
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5616
+        hash: "d99389a3287d453b942f070d8c1e86e8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5632
+        hash: "a0751fa826b03cb25e615c6a1435d92a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 213; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 214; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5648
+        hash: "f33da88ae881c846bd86ab3dc4f12efc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5664
+        hash: "7049bee9a984a2c2d3101eb6d3cce31e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5680
+        hash: "72757a5099748b70241a0d4279e42313"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5696
+        hash: "705feb098ebb2d689526d9271098d6b5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5712
+        hash: "49de92770edb0aae82cf66ae42b31caa"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5728
+        hash: "70fe89f9dce556ec1859f325aa27b7db"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 219; y: 85
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 219; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 220; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5744
+        hash: "1ededcc625a0e9e317c5aefc238a175a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 221; y: 87
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5760
+        image: "cursorDelegate.5.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 87
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5776
+        hash: "f1ae53071836512830f7284c4ac884b3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5792
+        hash: "f73c2b66b61bdcb080f8be6607079729"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 224; y: 90
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5808
+        hash: "11da14806fbca5c7cd559286fb5d70ff"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 226; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5824
+        hash: "b3ad82e900925227fb020009ae619d28"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 228; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5840
+        hash: "d8cea4160f0044b09e595610ead01879"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 229; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 231; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "bdd0d1bea8590b40cdce2fb45e17901b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 232; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5872
+        hash: "007a5d123eea589264e22f862f1bcac6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 233; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5888
+        hash: "3a83635e8371f3e26baf83c285b7801d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 233; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5904
+        hash: "6615931007ab0f9da070b6316068ad12"
+    }
+    Frame {
+        msec: 5920
+        hash: "be695ab0dced25c1c498d977fc822cef"
+    }
+    Frame {
+        msec: 5936
+        hash: "46dea7348473bc6ce4ea696292e5aae0"
+    }
+    Frame {
+        msec: 5952
+        hash: "23ce0ba723ffe4253610fdc635df9ae2"
+    }
+    Frame {
+        msec: 5968
+        hash: "9d6243396fd98b7efd14ae8a67297e79"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 233; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 232; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 232; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 231; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 230; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 229; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 228; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 227; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6064
+        hash: "be488252ce6c39317c33706f7febe7b5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 225; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6080
+        hash: "16c38b5dcd8ffbadc533d4fea8a85b0d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 224; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6096
+        hash: "a3ca6fa1bbc5ca3ff4cf281ae112102d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 220; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6112
+        hash: "58e53a9cb886d6d90c0b5987d0693904"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 219; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6128
+        hash: "a7f3e07ad0335e2852a156b5a3e1bd3d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6144
+        hash: "bea9d0338212c01474b25ee637aa8fd0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6160
+        hash: "b509c0cdea6b1352ff1e146a8f243820"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 213; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6176
+        hash: "9c968354773878009af2f176b1e38d42"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6192
+        hash: "d8cea4160f0044b09e595610ead01879"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 210; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6208
+        hash: "b3ad82e900925227fb020009ae619d28"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 210; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6224
+        hash: "11da14806fbca5c7cd559286fb5d70ff"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 208; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 207; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6240
+        hash: "707f51caadf24d3ed88b69c290d56971"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 206; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6256
+        hash: "c23b2afed7fa0e3dbce1183cf8e8d724"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6272
+        hash: "653b2e2d711c1abc1893d0068f4c531c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 204; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 104
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6288
+        hash: "246a73b19421f0ea8ec444429bd6704e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 202; y: 104
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6304
+        hash: "3878df64c0cecb2051e04dafe16ad407"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 201; y: 104
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6320
+        hash: "1cf92a793a4d145acce08c61cca3ba4f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 200; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 199; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6336
+        hash: "6c5f70c941a04172aae855eed1516971"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 197; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6352
+        hash: "5f4b8d6ad49de0ea1a2ee057e783b363"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 196; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 194; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6368
+        hash: "dc185cf4a14801d7bcc24ceadffe312b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 191; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 188; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6384
+        hash: "6934c069d1b7daf1c2dd76739941c7c2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6400
+        hash: "415510947b49a08459523fa2221d3609"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6416
+        hash: "9586619df75f07cc1f01201abd0f1f43"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 182; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6432
+        hash: "d016b14c9d5e5cd2545f1c85aa1edc4f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6448
+        hash: "4100837adeaf1557534f5c243eeacc37"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 171; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6464
+        hash: "a9351f624dc7de55ca8e799cf4371e75"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6480
+        hash: "8f2f9ba7de4e01767dda2c6d8f09e218"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6496
+        hash: "fb9b7d7e1aa140efc7e39cbca7299d34"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6512
+        hash: "eb1c2399d5779cc3382f02e69e5a31f1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6528
+        hash: "3bd98dc8a8cfb7af8a5f2ab11f387065"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6544
+        hash: "1eea9af6e5f359b96df86d56d74f8375"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6560
+        hash: "74c68b948d8e1d3c716eba5f1a186464"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 153; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6576
+        hash: "7103ecc0c21208d210938b0cd86fa4e2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6592
+        hash: "187b7801be7cd9643c707016166fcb38"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 149; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6608
+        hash: "571fe7704d5d95e91d4bd411ab00edf0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6624
+        hash: "2b6fd25a47274ffa56c3d0020babfdfc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6640
+        hash: "febcd6b5fc1806ff57d1669c79aa4cb2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6656
+        hash: "5c731fc4a2aeccf55a0af2b7171f25ce"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6672
+        hash: "7d9df9dd9a99eabaa4b426438e44d612"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6688
+        hash: "48278540489142f8a63ed120f4b956c2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6704
+        hash: "d08abdfb587a7ec07872cb662526b6d8"
+    }
+    Frame {
+        msec: 6720
+        image: "cursorDelegate.6.png"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 144; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6736
+        hash: "4622738082ac75e00b6c63e846b7e98b"
+    }
+    Frame {
+        msec: 6752
+        hash: "87a9f2facbaba462c562f09947bb7ded"
+    }
+    Frame {
+        msec: 6768
+        hash: "77e730ece9f195c3627508d1c2a126fc"
+    }
+    Frame {
+        msec: 6784
+        hash: "4a02aaca12e3fd86ee3b516b3a307f86"
+    }
+    Frame {
+        msec: 6800
+        hash: "0a1c2eb8a7451a5e37fefb96a58a88a1"
+    }
+    Frame {
+        msec: 6816
+        hash: "7f2d9959323f0707e36ecb2252c89727"
+    }
+    Frame {
+        msec: 6832
+        hash: "3462a3e166120515e67430600e4653f8"
+    }
+    Frame {
+        msec: 6848
+        hash: "eac8375d9b9cf0afbf232e27c6ceb037"
+    }
+    Frame {
+        msec: 6864
+        hash: "fbefb1e0801f4578ab93dd7ff4062e68"
+    }
+    Frame {
+        msec: 6880
+        hash: "078d75d72bff036574b85ac0aeaaf2b6"
+    }
+    Frame {
+        msec: 6896
+        hash: "14b328c8ec6276e022643102af80fa44"
+    }
+    Frame {
+        msec: 6912
+        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
+    }
+    Frame {
+        msec: 6928
+        hash: "df6f025130dc82f4764def81cec5fa7b"
+    }
+    Frame {
+        msec: 6944
+        hash: "cf467854dfde9b2111bc6e7e4442aab5"
+    }
+    Frame {
+        msec: 6960
+        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
+    }
+    Frame {
+        msec: 6976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 7008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 7024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 7040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 7056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 7072
+        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
+    }
+    Frame {
+        msec: 7088
+        hash: "cf467854dfde9b2111bc6e7e4442aab5"
+    }
+    Frame {
+        msec: 7104
+        hash: "df6f025130dc82f4764def81cec5fa7b"
+    }
+    Frame {
+        msec: 7120
+        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
+    }
+    Frame {
+        msec: 7136
+        hash: "14b328c8ec6276e022643102af80fa44"
+    }
+    Frame {
+        msec: 7152
+        hash: "078d75d72bff036574b85ac0aeaaf2b6"
+    }
+    Frame {
+        msec: 7168
+        hash: "fbefb1e0801f4578ab93dd7ff4062e68"
+    }
+    Frame {
+        msec: 7184
+        hash: "eac8375d9b9cf0afbf232e27c6ceb037"
+    }
+    Frame {
+        msec: 7200
+        hash: "3462a3e166120515e67430600e4653f8"
+    }
+    Frame {
+        msec: 7216
+        hash: "7f2d9959323f0707e36ecb2252c89727"
+    }
+    Frame {
+        msec: 7232
+        hash: "0a1c2eb8a7451a5e37fefb96a58a88a1"
+    }
+    Frame {
+        msec: 7248
+        hash: "4a02aaca12e3fd86ee3b516b3a307f86"
+    }
+    Frame {
+        msec: 7264
+        hash: "77e730ece9f195c3627508d1c2a126fc"
+    }
+    Frame {
+        msec: 7280
+        hash: "87a9f2facbaba462c562f09947bb7ded"
+    }
+    Frame {
+        msec: 7296
+        hash: "4622738082ac75e00b6c63e846b7e98b"
+    }
+    Frame {
+        msec: 7312
+        hash: "9fcec7616e28cb8317709656fd94f480"
+    }
+    Frame {
+        msec: 7328
+        hash: "d08abdfb587a7ec07872cb662526b6d8"
+    }
+    Frame {
+        msec: 7344
+        hash: "48278540489142f8a63ed120f4b956c2"
+    }
+    Frame {
+        msec: 7360
+        hash: "7d9df9dd9a99eabaa4b426438e44d612"
+    }
+    Frame {
+        msec: 7376
+        hash: "5c731fc4a2aeccf55a0af2b7171f25ce"
+    }
+    Frame {
+        msec: 7392
+        hash: "febcd6b5fc1806ff57d1669c79aa4cb2"
+    }
+    Frame {
+        msec: 7408
+        hash: "4ad2c0877360b0e1bf2212f9455f741e"
+    }
+    Frame {
+        msec: 7424
+        hash: "4df1951aac4ed1957925c95e112b0766"
+    }
+    Frame {
+        msec: 7440
+        hash: "bfbb624abe63639f2a7cb826b6b47393"
+    }
+    Frame {
+        msec: 7456
+        hash: "538cf4ee98145b3801e198b036e24a46"
+    }
+    Frame {
+        msec: 7472
+        hash: "5602c039a304ac0b1fd99957970a825b"
+    }
+    Frame {
+        msec: 7488
+        hash: "9ddd7709269b9a008e15d942e156e13a"
+    }
+    Frame {
+        msec: 7504
+        hash: "91d7c43f5f985d624e77da43ba5fb90f"
+    }
+    Frame {
+        msec: 7520
+        hash: "9153b0419d28e3c8137b58f95451cd58"
+    }
+    Frame {
+        msec: 7536
+        hash: "c5aad5ea4db81cf72f1ff390ed1dc868"
+    }
+    Frame {
+        msec: 7552
+        hash: "47b52ce9e5c705017e94b419b53d20d9"
+    }
+    Frame {
+        msec: 7568
+        hash: "f968e3289a2a6343cdb64e37b83f142a"
+    }
+    Frame {
+        msec: 7584
+        hash: "6fe898a37b17b6b6fa9a2971b518d185"
+    }
+    Frame {
+        msec: 7600
+        hash: "90ced2e487b6e760f2ad2c7d6375a36f"
+    }
+    Frame {
+        msec: 7616
+        hash: "b2d87713d12a54d4d7b6fd6ba2671704"
+    }
+    Frame {
+        msec: 7632
+        hash: "edce9857bd0e93ab841ae62ffba0149f"
+    }
+    Frame {
+        msec: 7648
+        hash: "13ce69facee6bf01c9712db1781c5ef9"
+    }
+    Frame {
+        msec: 7664
+        hash: "64924e43e004f0d9e90c23f61813c732"
+    }
+    Frame {
+        msec: 7680
+        image: "cursorDelegate.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "9c384359c664a71b5b6b9f9d62dd38bf"
+    }
+    Frame {
+        msec: 7712
+        hash: "5998579d228bcf0efdbcee805796ec23"
+    }
+    Frame {
+        msec: 7728
+        hash: "fe69cab70ad5b25f757bc413b895ff94"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 227; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7744
+        hash: "1ededcc625a0e9e317c5aefc238a175a"
+    }
+    Frame {
+        msec: 7760
+        hash: "460a4cbee55ccdeda1941c8dccf08cbd"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 227; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7776
+        hash: "f1ae53071836512830f7284c4ac884b3"
+    }
+    Frame {
+        msec: 7792
+        hash: "f73c2b66b61bdcb080f8be6607079729"
+    }
+    Frame {
+        msec: 7808
+        hash: "11da14806fbca5c7cd559286fb5d70ff"
+    }
+    Frame {
+        msec: 7824
+        hash: "b3ad82e900925227fb020009ae619d28"
+    }
+    Frame {
+        msec: 7840
+        hash: "d8cea4160f0044b09e595610ead01879"
+    }
+    Frame {
+        msec: 7856
+        hash: "9c968354773878009af2f176b1e38d42"
+    }
+    Frame {
+        msec: 7872
+        hash: "b509c0cdea6b1352ff1e146a8f243820"
+    }
+    Frame {
+        msec: 7888
+        hash: "bea9d0338212c01474b25ee637aa8fd0"
+    }
+    Frame {
+        msec: 7904
+        hash: "a7f3e07ad0335e2852a156b5a3e1bd3d"
+    }
+    Frame {
+        msec: 7920
+        hash: "58e53a9cb886d6d90c0b5987d0693904"
+    }
+    Frame {
+        msec: 7936
+        hash: "a3ca6fa1bbc5ca3ff4cf281ae112102d"
+    }
+    Frame {
+        msec: 7952
+        hash: "16c38b5dcd8ffbadc533d4fea8a85b0d"
+    }
+    Frame {
+        msec: 7968
+        hash: "be488252ce6c39317c33706f7febe7b5"
+    }
+    Frame {
+        msec: 7984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 8000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 8016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 8032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 8048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 8064
+        hash: "be488252ce6c39317c33706f7febe7b5"
+    }
+    Frame {
+        msec: 8080
+        hash: "16c38b5dcd8ffbadc533d4fea8a85b0d"
+    }
+    Frame {
+        msec: 8096
+        hash: "a3ca6fa1bbc5ca3ff4cf281ae112102d"
+    }
+    Frame {
+        msec: 8112
+        hash: "58e53a9cb886d6d90c0b5987d0693904"
+    }
+    Frame {
+        msec: 8128
+        hash: "a7f3e07ad0335e2852a156b5a3e1bd3d"
+    }
+    Frame {
+        msec: 8144
+        hash: "bea9d0338212c01474b25ee637aa8fd0"
+    }
+    Frame {
+        msec: 8160
+        hash: "b509c0cdea6b1352ff1e146a8f243820"
+    }
+    Frame {
+        msec: 8176
+        hash: "9c968354773878009af2f176b1e38d42"
+    }
+    Frame {
+        msec: 8192
+        hash: "d8cea4160f0044b09e595610ead01879"
+    }
+    Frame {
+        msec: 8208
+        hash: "b3ad82e900925227fb020009ae619d28"
+    }
+    Frame {
+        msec: 8224
+        hash: "11da14806fbca5c7cd559286fb5d70ff"
+    }
+    Frame {
+        msec: 8240
+        hash: "f73c2b66b61bdcb080f8be6607079729"
+    }
+    Frame {
+        msec: 8256
+        hash: "f1ae53071836512830f7284c4ac884b3"
+    }
+    Frame {
+        msec: 8272
+        hash: "460a4cbee55ccdeda1941c8dccf08cbd"
+    }
+    Frame {
+        msec: 8288
+        hash: "1ededcc625a0e9e317c5aefc238a175a"
+    }
+    Frame {
+        msec: 8304
+        hash: "70fe89f9dce556ec1859f325aa27b7db"
+    }
+    Frame {
+        msec: 8320
+        hash: "49de92770edb0aae82cf66ae42b31caa"
+    }
+    Frame {
+        msec: 8336
+        hash: "705feb098ebb2d689526d9271098d6b5"
+    }
+    Frame {
+        msec: 8352
+        hash: "72757a5099748b70241a0d4279e42313"
+    }
+    Frame {
+        msec: 8368
+        hash: "7049bee9a984a2c2d3101eb6d3cce31e"
+    }
+    Frame {
+        msec: 8384
+        hash: "f33da88ae881c846bd86ab3dc4f12efc"
+    }
+    Frame {
+        msec: 8400
+        hash: "a0751fa826b03cb25e615c6a1435d92a"
+    }
+    Frame {
+        msec: 8416
+        hash: "d99389a3287d453b942f070d8c1e86e8"
+    }
+    Frame {
+        msec: 8432
+        hash: "e3219357e73a2dfd5b80dfbd6feb79e2"
+    }
+    Frame {
+        msec: 8448
+        hash: "c0953accd856883c813d4ecf99fb632b"
+    }
+    Frame {
+        msec: 8464
+        hash: "185743339cba9dfc1a2c2ff1efd23855"
+    }
+    Frame {
+        msec: 8480
+        hash: "30a4419de779037fd84bd70a99c4d6de"
+    }
+    Frame {
+        msec: 8496
+        hash: "1d9cbd0814831c518e9e8041fe8285c9"
+    }
+    Frame {
+        msec: 8512
+        hash: "81d660df1b0eab7c382991b600f88ba3"
+    }
+    Frame {
+        msec: 8528
+        hash: "7ee1467525b9fe3b6a32fba8c2454df1"
+    }
+    Frame {
+        msec: 8544
+        hash: "28dd72957652cf130d28d30203b36c59"
+    }
+    Frame {
+        msec: 8560
+        hash: "e9697d06a22958cea4f766dd3ec31ca9"
+    }
+    Frame {
+        msec: 8576
+        hash: "81970c31a0a1e42929c83ef5140401c2"
+    }
+    Frame {
+        msec: 8592
+        hash: "ebb5be43955725bef66bf99bd7288c04"
+    }
+    Frame {
+        msec: 8608
+        hash: "afbf0645ea651b2c459eeb43bdc65992"
+    }
+    Frame {
+        msec: 8624
+        hash: "42bf6ab3963652617f2feb96ee170af5"
+    }
+    Frame {
+        msec: 8640
+        image: "cursorDelegate.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "4a5966f600f9b27bf7a65fcc6c1c5d17"
+    }
+    Frame {
+        msec: 8672
+        hash: "ecdc1d89af1e76648c8298e2b9940549"
+    }
+    Frame {
+        msec: 8688
+        hash: "0ba1e105a7ae41926e2106b60eafdec9"
+    }
+    Frame {
+        msec: 8704
+        hash: "96e4f277d4ff76afe0c2d58b4aed3acb"
+    }
+    Frame {
+        msec: 8720
+        hash: "f41c6fd9e22354b8f5c940c04930a591"
+    }
+    Frame {
+        msec: 8736
+        hash: "00b522554cf6c0c09e5425f4d3c3fcf9"
+    }
+    Frame {
+        msec: 8752
+        hash: "e8549c0c361f20d167cab128dc996274"
+    }
+    Frame {
+        msec: 8768
+        hash: "976c61615250f9bfa3b4c02ee88bee03"
+    }
+    Frame {
+        msec: 8784
+        hash: "06c95d2fa5e2b4751e5693b179e76eb4"
+    }
+    Frame {
+        msec: 8800
+        hash: "a3d79197235c4717b1f9af3582118ca6"
+    }
+    Frame {
+        msec: 8816
+        hash: "68b23db8f519aa161278074aa318eaa1"
+    }
+    Frame {
+        msec: 8832
+        hash: "af967462be12d0b6ddd3571b00804c12"
+    }
+    Frame {
+        msec: 8848
+        hash: "46f5c0baa2b95fd418984eebe308157e"
+    }
+    Frame {
+        msec: 8864
+        hash: "0a7407c6c751b3f1380a99883e95f1dd"
+    }
+    Frame {
+        msec: 8880
+        hash: "9969c206488671c45c43f3a3dd3f5994"
+    }
+    Frame {
+        msec: 8896
+        hash: "89efa872ce2e71935b47cac101bf15c9"
+    }
+    Frame {
+        msec: 8912
+        hash: "a4545a0c50fb071d267b06bf2d114802"
+    }
+    Frame {
+        msec: 8928
+        hash: "f4df98459c18399e1c6b2d8a43bdd678"
+    }
+    Frame {
+        msec: 8944
+        hash: "027eb091eea8bf51d7ad3ff44120e075"
+    }
+    Frame {
+        msec: 8960
+        hash: "138ec35b850d20664f905a4eea6f7456"
+    }
+    Frame {
+        msec: 8976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 8992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9072
+        hash: "138ec35b850d20664f905a4eea6f7456"
+    }
+    Frame {
+        msec: 9088
+        hash: "027eb091eea8bf51d7ad3ff44120e075"
+    }
+    Frame {
+        msec: 9104
+        hash: "f4df98459c18399e1c6b2d8a43bdd678"
+    }
+    Frame {
+        msec: 9120
+        hash: "a4545a0c50fb071d267b06bf2d114802"
+    }
+    Frame {
+        msec: 9136
+        hash: "89efa872ce2e71935b47cac101bf15c9"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.0.png
new file mode 100644
index 0000000..cc1774f
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.1.png
new file mode 100644
index 0000000..60eba16
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.2.png
new file mode 100644
index 0000000..d4663f7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.3.png
new file mode 100644
index 0000000..dc1bb52
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.qml
new file mode 100644
index 0000000..84c16e1
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.qml
@@ -0,0 +1,1371 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 32
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 48
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 64
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 80
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 96
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 112
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 128
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 144
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 160
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 176
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 192
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 208
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 224
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 240
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 256
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 272
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 288
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 304
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 320
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 336
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 352
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 368
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 384
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 400
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 416
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 432
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 464
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 480
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 496
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 512
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 528
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 560
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 576
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 592
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 608
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 624
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 640
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 656
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 672
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 688
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 704
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 720
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 736
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 752
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 768
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 784
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 800
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 816
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 832
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 848
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 864
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 880
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 896
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 912
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 928
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 944
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 960
+        image: "qt-669.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 992
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 1008
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1024
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 1040
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 1056
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 1072
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 1088
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1104
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 1120
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 1136
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1152
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 1168
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 1184
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 1200
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 1216
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1232
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 1248
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 1264
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 1280
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1296
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 1312
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 1328
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 1344
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1360
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1376
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1392
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1408
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1424
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1440
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1456
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1472
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1488
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1504
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1520
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1536
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1552
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1568
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1584
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1600
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1616
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1632
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1648
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1664
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1680
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1696
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1712
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1728
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1744
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1760
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1776
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1792
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1808
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1824
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Frame {
+        msec: 1840
+        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1856
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1872
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1888
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1904
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1920
+        image: "qt-669.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1952
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1968
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 1984
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2000
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 2016
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 2032
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 2048
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Frame {
+        msec: 2064
+        hash: "2718ab36551a20d36664f26e408f8f24"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2080
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 2096
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 2112
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 2128
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 2144
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 2176
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 2192
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 2208
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Frame {
+        msec: 2224
+        hash: "823ccdc677997c96e4ae16891ffffa77"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2240
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 2256
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2272
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 2288
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 2304
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 2320
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Frame {
+        msec: 2336
+        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2352
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2368
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2384
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2400
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2416
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2432
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2448
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2464
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2480
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2496
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2512
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2528
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2544
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2560
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2576
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Frame {
+        msec: 2592
+        hash: "1295bd1d94fe518d5a871e90cab88e0c"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2608
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 2624
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 2640
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 2656
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 2672
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2688
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 2704
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 2720
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 2736
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Frame {
+        msec: 2752
+        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2768
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 2784
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 2800
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2816
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 2832
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 2848
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Frame {
+        msec: 2864
+        hash: "c602a6535ef86125615307d9d187eb3f"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2880
+        image: "qt-669.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 2912
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 2928
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2944
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 2960
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 2976
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 2992
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Frame {
+        msec: 3008
+        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3024
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3040
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3056
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3072
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3088
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3104
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3120
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3136
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3152
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3168
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3184
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3200
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3216
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3232
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3248
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3264
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3280
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3296
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3312
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3328
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3344
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3360
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3376
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3392
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3408
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3424
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3440
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3456
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3472
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3488
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3504
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3520
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3536
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3552
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3568
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3584
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3600
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3616
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3632
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3648
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3664
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3680
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Frame {
+        msec: 3696
+        hash: "e64c3246a0f81e2df29ac276ac6d411f"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3712
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3728
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3744
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3760
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3776
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3792
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3808
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3824
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3840
+        image: "qt-669.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3872
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3888
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3904
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3920
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3936
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3952
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3968
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 3984
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4000
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4016
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4032
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4048
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4064
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4080
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4096
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4112
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4128
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4144
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4160
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4176
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4192
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4208
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4224
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4240
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4256
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4272
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4288
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+    Frame {
+        msec: 4304
+        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.0.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.1.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.2.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.3.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.4.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.4.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.5.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.5.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.6.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.6.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.qml
new file mode 100644
index 0000000..4ff00f4
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.qml
@@ -0,0 +1,2467 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 33554432
+        text: "54"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 32
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 48
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 64
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 80
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 96
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 112
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 128
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 144
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 160
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 176
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 192
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 208
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 224
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 240
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 256
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 272
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 288
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 304
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 320
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 336
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 352
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 368
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 384
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 400
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 416
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 432
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 448
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 464
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 480
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 496
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 512
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 528
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 560
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 576
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 592
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 608
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 624
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 640
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 656
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 672
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 688
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 704
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 720
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 736
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 752
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 768
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 784
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 800
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 816
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 832
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 848
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 864
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 880
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 896
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 912
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 928
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 944
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 960
+        image: "wrap.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1072
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1088
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1104
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1120
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1136
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1152
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1168
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1184
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1200
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1216
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1232
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1248
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1264
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1280
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1296
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1312
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1328
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1344
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1360
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1376
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1408
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1424
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1440
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1456
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1472
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1488
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1504
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1520
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1536
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1552
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1568
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1584
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1600
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1616
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1632
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1648
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1664
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1680
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1696
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1712
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1728
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1744
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1760
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1776
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1808
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1824
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1840
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1856
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1872
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1888
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1904
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1920
+        image: "wrap.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1952
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1968
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2080
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2096
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2112
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2144
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2160
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2176
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2192
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2208
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 88
+        modifiers: 0
+        text: "78"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2224
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2240
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2256
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2272
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2288
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2304
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 88
+        modifiers: 0
+        text: "78"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2320
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2336
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2352
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2384
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2400
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2416
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2432
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2464
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2480
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2496
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2512
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2528
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2544
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2576
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2592
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2608
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2624
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2640
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2656
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2672
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2688
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2704
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2720
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2736
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2752
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2768
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2784
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2800
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2816
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2832
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2848
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2864
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2880
+        image: "wrap.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2912
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2928
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2944
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2960
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3072
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3088
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3104
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3120
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3136
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3152
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3168
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3184
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3200
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3216
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3232
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3248
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3264
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3280
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3296
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3312
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3328
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3344
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3360
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3376
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3392
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3408
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3424
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3440
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3456
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3472
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3488
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3504
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3520
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3536
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3552
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3568
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3584
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3600
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3616
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3632
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3648
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3664
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3680
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3696
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3712
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3728
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3744
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3760
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3776
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3792
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3808
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3824
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3840
+        image: "wrap.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3872
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3888
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3904
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3920
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3936
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3952
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3968
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4064
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4096
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4112
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4128
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4144
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4160
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4176
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4192
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4208
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4224
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4240
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4256
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4272
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4288
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4304
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4320
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4336
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4352
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4368
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4384
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4400
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4416
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4432
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4448
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4464
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4480
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4496
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4512
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4528
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4544
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4560
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4576
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4592
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4608
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4624
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4640
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4656
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4672
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4688
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4704
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4720
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4736
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4752
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4768
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4784
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4800
+        image: "wrap.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4832
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4848
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4864
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4880
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 46
+        modifiers: 0
+        text: "2e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4896
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4912
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4928
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4944
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 46
+        modifiers: 0
+        text: "2e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4960
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5072
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5088
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5104
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5120
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5136
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5152
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5168
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5184
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5200
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5216
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5232
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5248
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5264
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5280
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5296
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5312
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5328
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5344
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5360
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5376
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5392
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5408
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5424
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5440
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5456
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5472
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5488
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5504
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5520
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5536
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5552
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5568
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5584
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5600
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5616
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5632
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5648
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5664
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5680
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5696
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5712
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5728
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5744
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5760
+        image: "wrap.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5792
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5808
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5824
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5840
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5856
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5872
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5888
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5904
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5920
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5936
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5952
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5968
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6064
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6080
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6096
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6112
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6128
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6144
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6160
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6176
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6192
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6208
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6224
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6240
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6256
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6272
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6288
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6304
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6320
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6336
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6352
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6368
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6384
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6400
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6416
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6432
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6448
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6464
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6480
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6496
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6512
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6528
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6544
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6560
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6576
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6592
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6608
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6624
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6640
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6656
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6672
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6688
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6704
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6720
+        image: "wrap.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6752
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6768
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6784
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6800
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6816
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6832
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6848
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6864
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.0.png
new file mode 100644
index 0000000..555996a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.1.png
new file mode 100644
index 0000000..b705bad
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.2.png
new file mode 100644
index 0000000..094cd2a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.3.png
new file mode 100644
index 0000000..9c519c7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.4.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.4.png
new file mode 100644
index 0000000..3ec77b5
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.5.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.5.png
new file mode 100644
index 0000000..579a66e
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.6.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.6.png
new file mode 100644
index 0000000..9e5ac90
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.7.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.7.png
new file mode 100644
index 0000000..9f3acfc
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.8.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.8.png
new file mode 100644
index 0000000..f27518a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.qml
new file mode 100644
index 0000000..8578d48
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.qml
@@ -0,0 +1,3555 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 32
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 48
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 64
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 80
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 96
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 112
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 128
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 144
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 160
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 176
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 192
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 208
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 224
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 240
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 256
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 272
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 288
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 304
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 320
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 336
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 352
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 368
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 384
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 400
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 416
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 432
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 448
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 464
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 480
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 496
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 512
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 528
+        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
+    }
+    Frame {
+        msec: 544
+        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
+    }
+    Frame {
+        msec: 560
+        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
+    }
+    Frame {
+        msec: 576
+        hash: "eacfa8db605b9e386a55508e8943e7d1"
+    }
+    Frame {
+        msec: 592
+        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
+    }
+    Frame {
+        msec: 608
+        hash: "60a60e06237318bf005f87bbba386fef"
+    }
+    Frame {
+        msec: 624
+        hash: "97549f388c02adb8884c2e79510adc7e"
+    }
+    Frame {
+        msec: 640
+        hash: "d882fe91d9df9862d620cf984e27d0bd"
+    }
+    Frame {
+        msec: 656
+        hash: "6310b65572e39256122c7620f7e87442"
+    }
+    Frame {
+        msec: 672
+        hash: "4e7374a683050ff440056b6e7c971d2b"
+    }
+    Frame {
+        msec: 688
+        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
+    }
+    Frame {
+        msec: 704
+        hash: "8d71c418593eb3e4834d5e608ffd3f29"
+    }
+    Frame {
+        msec: 720
+        hash: "0da2c1cd0138172698a3bee5d19168c5"
+    }
+    Frame {
+        msec: 736
+        hash: "8ca757a4fd1987329488f63251b0f6b4"
+    }
+    Frame {
+        msec: 752
+        hash: "70c827f1b34b44cbd775b666913556d6"
+    }
+    Frame {
+        msec: 768
+        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
+    }
+    Frame {
+        msec: 784
+        hash: "38abc77b2361ce257d39c0cf268ba42b"
+    }
+    Frame {
+        msec: 800
+        hash: "59865194eb63465dd0f3925c7a500340"
+    }
+    Frame {
+        msec: 816
+        hash: "7bed5747d6b771db0fe5802153e54f2f"
+    }
+    Frame {
+        msec: 832
+        hash: "9ac1bf268749bc8e58bc4d04b55ef849"
+    }
+    Frame {
+        msec: 848
+        hash: "64ea5cb46782d250c46a7a2c8cceea20"
+    }
+    Frame {
+        msec: 864
+        hash: "d81037eb21bfcb434b6c7f3bbd21ad12"
+    }
+    Frame {
+        msec: 880
+        hash: "1079ea3a1a62e2cca9a8e907bc5aa4e1"
+    }
+    Frame {
+        msec: 896
+        hash: "96422f9bfbc11775cd7d1fae2ba357bd"
+    }
+    Frame {
+        msec: 912
+        hash: "0d247385059a6f68b37bc34f6b2214b1"
+    }
+    Frame {
+        msec: 928
+        hash: "7c513361e13a90eef229b42e68ffaa18"
+    }
+    Frame {
+        msec: 944
+        hash: "510b8441c613f0637dfc46e03c278112"
+    }
+    Frame {
+        msec: 960
+        image: "cursorDelegate.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "8d90112e2e1c6f226a1a5f4f75785939"
+    }
+    Frame {
+        msec: 992
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 1008
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 1024
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 1040
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 1056
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 1072
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 1088
+        hash: "8d90112e2e1c6f226a1a5f4f75785939"
+    }
+    Frame {
+        msec: 1104
+        hash: "85e6af1f5fd15338a15f984e24d5ec9d"
+    }
+    Frame {
+        msec: 1120
+        hash: "510b8441c613f0637dfc46e03c278112"
+    }
+    Frame {
+        msec: 1136
+        hash: "7c513361e13a90eef229b42e68ffaa18"
+    }
+    Frame {
+        msec: 1152
+        hash: "0d247385059a6f68b37bc34f6b2214b1"
+    }
+    Frame {
+        msec: 1168
+        hash: "96422f9bfbc11775cd7d1fae2ba357bd"
+    }
+    Frame {
+        msec: 1184
+        hash: "1079ea3a1a62e2cca9a8e907bc5aa4e1"
+    }
+    Frame {
+        msec: 1200
+        hash: "d81037eb21bfcb434b6c7f3bbd21ad12"
+    }
+    Frame {
+        msec: 1216
+        hash: "64ea5cb46782d250c46a7a2c8cceea20"
+    }
+    Frame {
+        msec: 1232
+        hash: "9ac1bf268749bc8e58bc4d04b55ef849"
+    }
+    Frame {
+        msec: 1248
+        hash: "7bed5747d6b771db0fe5802153e54f2f"
+    }
+    Frame {
+        msec: 1264
+        hash: "59865194eb63465dd0f3925c7a500340"
+    }
+    Frame {
+        msec: 1280
+        hash: "38abc77b2361ce257d39c0cf268ba42b"
+    }
+    Frame {
+        msec: 1296
+        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
+    }
+    Frame {
+        msec: 1312
+        hash: "70c827f1b34b44cbd775b666913556d6"
+    }
+    Frame {
+        msec: 1328
+        hash: "8ca757a4fd1987329488f63251b0f6b4"
+    }
+    Frame {
+        msec: 1344
+        hash: "0da2c1cd0138172698a3bee5d19168c5"
+    }
+    Frame {
+        msec: 1360
+        hash: "8d71c418593eb3e4834d5e608ffd3f29"
+    }
+    Frame {
+        msec: 1376
+        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
+    }
+    Key {
+        type: 6
+        key: 16777232
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "4e7374a683050ff440056b6e7c971d2b"
+    }
+    Frame {
+        msec: 1408
+        hash: "6310b65572e39256122c7620f7e87442"
+    }
+    Frame {
+        msec: 1424
+        hash: "d882fe91d9df9862d620cf984e27d0bd"
+    }
+    Frame {
+        msec: 1440
+        hash: "97549f388c02adb8884c2e79510adc7e"
+    }
+    Frame {
+        msec: 1456
+        hash: "60a60e06237318bf005f87bbba386fef"
+    }
+    Key {
+        type: 7
+        key: 16777232
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1472
+        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
+    }
+    Frame {
+        msec: 1488
+        hash: "eacfa8db605b9e386a55508e8943e7d1"
+    }
+    Frame {
+        msec: 1504
+        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
+    }
+    Frame {
+        msec: 1520
+        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
+    }
+    Frame {
+        msec: 1536
+        hash: "c0e72cdf776b0c62742aa9c3683cd523"
+    }
+    Frame {
+        msec: 1552
+        hash: "ea3f512181b3ee94d8cdd4d9f59ed962"
+    }
+    Frame {
+        msec: 1568
+        hash: "de924155855e76d0591217448f79bdb6"
+    }
+    Frame {
+        msec: 1584
+        hash: "51da770a75102de9ad1920f1f6c44146"
+    }
+    Frame {
+        msec: 1600
+        hash: "e3c0e8f6385ef2ab9b671be3243774c4"
+    }
+    Frame {
+        msec: 1616
+        hash: "eac6de65ea6726f0cc50b6d30c1b7ba5"
+    }
+    Frame {
+        msec: 1632
+        hash: "2ee111386bd646c4ee577405e490a2f7"
+    }
+    Key {
+        type: 6
+        key: 16777233
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1648
+        hash: "24c376d5a2b3555126b156c8bc7a7a0c"
+    }
+    Frame {
+        msec: 1664
+        hash: "d9c35de8b02f11db321d9bdcdcd65403"
+    }
+    Frame {
+        msec: 1680
+        hash: "0b32a66497ec3cdd05dc27c0ef9c5718"
+    }
+    Frame {
+        msec: 1696
+        hash: "9626f80ef170af2db135792337203265"
+    }
+    Frame {
+        msec: 1712
+        hash: "6e4ce7599da579f764ff10e982888889"
+    }
+    Frame {
+        msec: 1728
+        hash: "5ad4dd681be780c0068734ca5c722507"
+    }
+    Key {
+        type: 7
+        key: 16777233
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1744
+        hash: "7d620ef53049f9195cc832d6f9dfd52b"
+    }
+    Frame {
+        msec: 1760
+        hash: "0f54144c574af01958505eedd69162f6"
+    }
+    Frame {
+        msec: 1776
+        hash: "50f168354e3901283708a4ae9088783d"
+    }
+    Frame {
+        msec: 1792
+        hash: "c55fdf2fd0a4eeb9ca0e3072aa3e60c4"
+    }
+    Frame {
+        msec: 1808
+        hash: "d351de13e7bb5b273ec3aebb88dffbd5"
+    }
+    Frame {
+        msec: 1824
+        hash: "977d44194d1ef05801167157714891af"
+    }
+    Frame {
+        msec: 1840
+        hash: "ef3694ca78764709abbe2f8781578fb4"
+    }
+    Frame {
+        msec: 1856
+        hash: "77afbc0e0b828d03148ed7fe342dfbda"
+    }
+    Frame {
+        msec: 1872
+        hash: "0d94e37430d8b835e65750a6af525ef7"
+    }
+    Frame {
+        msec: 1888
+        hash: "e009a8d2cb7c7f1200055666cf2efd9c"
+    }
+    Frame {
+        msec: 1904
+        hash: "096a2742962d7b22dba768577373e656"
+    }
+    Frame {
+        msec: 1920
+        image: "cursorDelegate.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "905b6c7ab24fd1a12f17494fc1935e98"
+    }
+    Frame {
+        msec: 1952
+        hash: "9bc98b4a32ea933fcc3a40eaae9b3516"
+    }
+    Frame {
+        msec: 1968
+        hash: "70f0313540b3517f3b6d403c3ab1199c"
+    }
+    Frame {
+        msec: 1984
+        hash: "309ae1af1ef7dbaf0b892ad60fd3eb93"
+    }
+    Frame {
+        msec: 2000
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 2016
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 2032
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 2048
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 2064
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 2080
+        hash: "309ae1af1ef7dbaf0b892ad60fd3eb93"
+    }
+    Frame {
+        msec: 2096
+        hash: "70f0313540b3517f3b6d403c3ab1199c"
+    }
+    Frame {
+        msec: 2112
+        hash: "9bc98b4a32ea933fcc3a40eaae9b3516"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "905b6c7ab24fd1a12f17494fc1935e98"
+    }
+    Frame {
+        msec: 2144
+        hash: "31adf3a3bfbd1083c50cae7ed5d64334"
+    }
+    Frame {
+        msec: 2160
+        hash: "096a2742962d7b22dba768577373e656"
+    }
+    Frame {
+        msec: 2176
+        hash: "e009a8d2cb7c7f1200055666cf2efd9c"
+    }
+    Frame {
+        msec: 2192
+        hash: "0d94e37430d8b835e65750a6af525ef7"
+    }
+    Frame {
+        msec: 2208
+        hash: "77afbc0e0b828d03148ed7fe342dfbda"
+    }
+    Frame {
+        msec: 2224
+        hash: "ef3694ca78764709abbe2f8781578fb4"
+    }
+    Frame {
+        msec: 2240
+        hash: "977d44194d1ef05801167157714891af"
+    }
+    Frame {
+        msec: 2256
+        hash: "d351de13e7bb5b273ec3aebb88dffbd5"
+    }
+    Frame {
+        msec: 2272
+        hash: "c55fdf2fd0a4eeb9ca0e3072aa3e60c4"
+    }
+    Frame {
+        msec: 2288
+        hash: "50f168354e3901283708a4ae9088783d"
+    }
+    Frame {
+        msec: 2304
+        hash: "0f54144c574af01958505eedd69162f6"
+    }
+    Frame {
+        msec: 2320
+        hash: "7d620ef53049f9195cc832d6f9dfd52b"
+    }
+    Key {
+        type: 6
+        key: 16777232
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2336
+        hash: "03e906dfb3bf98f521d805331d3b5b9c"
+    }
+    Frame {
+        msec: 2352
+        hash: "c2376393ea9541b909b6b4fe188fa03e"
+    }
+    Frame {
+        msec: 2368
+        hash: "9b3935370412c75acdf6e91100cf2f53"
+    }
+    Frame {
+        msec: 2384
+        hash: "30ab7913bdfc51d2df5ab9f3863d28c7"
+    }
+    Frame {
+        msec: 2400
+        hash: "593656e93d6e01419002dbb581aa6cbd"
+    }
+    Frame {
+        msec: 2416
+        hash: "33800dd560e44ce39d6325bbdee689de"
+    }
+    Frame {
+        msec: 2432
+        hash: "c41a9c4f08053d5d18fb2d530ed8b5ad"
+    }
+    Key {
+        type: 7
+        key: 16777232
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "b3f2d4a2cb9a9d1304a2a2d07ad41ff2"
+    }
+    Frame {
+        msec: 2464
+        hash: "93cf7fe53bc1fd749c523d40b27d17b4"
+    }
+    Frame {
+        msec: 2480
+        hash: "6e9226d01dd93cff763e851148da8dfd"
+    }
+    Frame {
+        msec: 2496
+        hash: "79fdbda495bbc6c9ae8be03e1467de92"
+    }
+    Frame {
+        msec: 2512
+        hash: "c30fc0fa9351dbcdbe4f2a297cba9a52"
+    }
+    Frame {
+        msec: 2528
+        hash: "eaf26162fd5ce42262ea08ef39a7123d"
+    }
+    Frame {
+        msec: 2544
+        hash: "7bf0d6a5753a60eefae6d3c3819fabe4"
+    }
+    Frame {
+        msec: 2560
+        hash: "a2ee3a3b9cd22d7c0e54524cad32e647"
+    }
+    Frame {
+        msec: 2576
+        hash: "822298cfc4e2d64db1bf3e442dd891e6"
+    }
+    Frame {
+        msec: 2592
+        hash: "d075c64000b045eae1b42dce701787b7"
+    }
+    Frame {
+        msec: 2608
+        hash: "5ca7f15af781f896c83c81077f6b072e"
+    }
+    Frame {
+        msec: 2624
+        hash: "7d0f14896e67c56ed5238472dc127cb1"
+    }
+    Frame {
+        msec: 2640
+        hash: "dca161e8a9d786ba9d50aa655ccbecd3"
+    }
+    Frame {
+        msec: 2656
+        hash: "73bfcb0f5104efd056f25f7d73126369"
+    }
+    Frame {
+        msec: 2672
+        hash: "0090459043b05bf9504434f36230b32b"
+    }
+    Frame {
+        msec: 2688
+        hash: "f64315858f375c6ded480b2017fc18a5"
+    }
+    Frame {
+        msec: 2704
+        hash: "fe4c0ecfa9779c9fe052d4ffc9386d46"
+    }
+    Frame {
+        msec: 2720
+        hash: "849ad15f0ca893881165e956e8a26174"
+    }
+    Frame {
+        msec: 2736
+        hash: "c4373fa63ed00832c70a6b94cb729397"
+    }
+    Frame {
+        msec: 2752
+        hash: "0c7e08fb7f0dd954b0f171a37ef2a310"
+    }
+    Frame {
+        msec: 2768
+        hash: "505071572df7aa300a675f8a808bc7f4"
+    }
+    Frame {
+        msec: 2784
+        hash: "52839867e81d52746196f299a8371453"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2800
+        hash: "c4d214a7e0fc52c2a45fc6e3df12550a"
+    }
+    Frame {
+        msec: 2816
+        hash: "f1fa48d796667bd053fff4af7ec1d8ce"
+    }
+    Frame {
+        msec: 2832
+        hash: "081e46decc8aba911f018acfd761cda1"
+    }
+    Frame {
+        msec: 2848
+        hash: "fa417c9bfda1da66320a8e59fbaeb5b6"
+    }
+    Frame {
+        msec: 2864
+        hash: "83dfa353fd20f3bf7caa8e6ca9a9933c"
+    }
+    Frame {
+        msec: 2880
+        image: "cursorDelegate.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "c11459b1d3e51f3d2f5bd30049bcca42"
+    }
+    Frame {
+        msec: 2912
+        hash: "997ff3fa82ba2fb27a9c41ed9abe8991"
+    }
+    Frame {
+        msec: 2928
+        hash: "f8baaadde147266416c9ab3f9d9106ce"
+    }
+    Frame {
+        msec: 2944
+        hash: "79d1d34fd343d8de631aa3259167fe26"
+    }
+    Frame {
+        msec: 2960
+        hash: "8b1445ca6131a0fc4377ded24a60186a"
+    }
+    Frame {
+        msec: 2976
+        hash: "784cc01604ecadf74a45164f73f0336d"
+    }
+    Frame {
+        msec: 2992
+        hash: "b9aeac2be5c8e16e7938e141f32776be"
+    }
+    Frame {
+        msec: 3008
+        hash: "b9aeac2be5c8e16e7938e141f32776be"
+    }
+    Frame {
+        msec: 3024
+        hash: "b9aeac2be5c8e16e7938e141f32776be"
+    }
+    Frame {
+        msec: 3040
+        hash: "b9aeac2be5c8e16e7938e141f32776be"
+    }
+    Frame {
+        msec: 3056
+        hash: "b9aeac2be5c8e16e7938e141f32776be"
+    }
+    Frame {
+        msec: 3072
+        hash: "b9aeac2be5c8e16e7938e141f32776be"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3088
+        hash: "00dfc5f4468482cb5f74e62be235b1d2"
+    }
+    Frame {
+        msec: 3104
+        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
+    }
+    Frame {
+        msec: 3120
+        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
+    }
+    Frame {
+        msec: 3136
+        hash: "75e854ccaad087bfe776a843f0bd7284"
+    }
+    Frame {
+        msec: 3152
+        hash: "1e3f580f37a0dc063a383bdf435e85ea"
+    }
+    Frame {
+        msec: 3168
+        hash: "3d78320cb021944d7c6cee1a42056663"
+    }
+    Frame {
+        msec: 3184
+        hash: "fca865f762c1a6cc3e487e0e908eef73"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3200
+        hash: "fb7ad9156658f3866d19e43f006cf013"
+    }
+    Frame {
+        msec: 3216
+        hash: "6f7411363c66d0959ea5a16a9b610e61"
+    }
+    Frame {
+        msec: 3232
+        hash: "a33dce3c55b1b1541cfb9b85a75fcb53"
+    }
+    Frame {
+        msec: 3248
+        hash: "56b81435dc4ce193bb98c3d02c781242"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3264
+        hash: "59865194eb63465dd0f3925c7a500340"
+    }
+    Frame {
+        msec: 3280
+        hash: "38abc77b2361ce257d39c0cf268ba42b"
+    }
+    Frame {
+        msec: 3296
+        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
+    }
+    Frame {
+        msec: 3312
+        hash: "70c827f1b34b44cbd775b666913556d6"
+    }
+    Frame {
+        msec: 3328
+        hash: "8ca757a4fd1987329488f63251b0f6b4"
+    }
+    Frame {
+        msec: 3344
+        hash: "0da2c1cd0138172698a3bee5d19168c5"
+    }
+    Frame {
+        msec: 3360
+        hash: "8d71c418593eb3e4834d5e608ffd3f29"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3376
+        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
+    }
+    Frame {
+        msec: 3392
+        hash: "4e7374a683050ff440056b6e7c971d2b"
+    }
+    Frame {
+        msec: 3408
+        hash: "6310b65572e39256122c7620f7e87442"
+    }
+    Frame {
+        msec: 3424
+        hash: "d882fe91d9df9862d620cf984e27d0bd"
+    }
+    Frame {
+        msec: 3440
+        hash: "97549f388c02adb8884c2e79510adc7e"
+    }
+    Frame {
+        msec: 3456
+        hash: "60a60e06237318bf005f87bbba386fef"
+    }
+    Frame {
+        msec: 3472
+        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
+    }
+    Frame {
+        msec: 3488
+        hash: "eacfa8db605b9e386a55508e8943e7d1"
+    }
+    Frame {
+        msec: 3504
+        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
+    }
+    Frame {
+        msec: 3520
+        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
+    }
+    Frame {
+        msec: 3536
+        hash: "c0e72cdf776b0c62742aa9c3683cd523"
+    }
+    Frame {
+        msec: 3552
+        hash: "ea3f512181b3ee94d8cdd4d9f59ed962"
+    }
+    Frame {
+        msec: 3568
+        hash: "de924155855e76d0591217448f79bdb6"
+    }
+    Frame {
+        msec: 3584
+        hash: "51da770a75102de9ad1920f1f6c44146"
+    }
+    Frame {
+        msec: 3600
+        hash: "e3c0e8f6385ef2ab9b671be3243774c4"
+    }
+    Frame {
+        msec: 3616
+        hash: "eac6de65ea6726f0cc50b6d30c1b7ba5"
+    }
+    Frame {
+        msec: 3632
+        hash: "2ee111386bd646c4ee577405e490a2f7"
+    }
+    Frame {
+        msec: 3648
+        hash: "fe95122352effcf1815bc237fc6ce6ab"
+    }
+    Frame {
+        msec: 3664
+        hash: "e3bb1ec3b84df25712f06e0d6963efdd"
+    }
+    Frame {
+        msec: 3680
+        hash: "a10d3184acc85c46e171fe4cf82e1c23"
+    }
+    Frame {
+        msec: 3696
+        hash: "d566b2763312e5e823593806acd9e809"
+    }
+    Frame {
+        msec: 3712
+        hash: "7db073b7487ddea48e7c9df8b9bfdc00"
+    }
+    Frame {
+        msec: 3728
+        hash: "85c663b943f67d158367dba0508980a5"
+    }
+    Frame {
+        msec: 3744
+        hash: "6336ce0d912ee63773475c4c6c5d59be"
+    }
+    Frame {
+        msec: 3760
+        hash: "c75ba80484af36633b6a4d17b666b1c9"
+    }
+    Frame {
+        msec: 3776
+        hash: "08b7d4eef2d15bc717ff1a981a11f275"
+    }
+    Frame {
+        msec: 3792
+        hash: "0ab8bebb0e43786a7e51ea780745080c"
+    }
+    Frame {
+        msec: 3808
+        hash: "6fa1811f520eff9893b3c7b00e53fa7d"
+    }
+    Frame {
+        msec: 3824
+        hash: "6feb44655bfbec651cc2902676bd08b4"
+    }
+    Frame {
+        msec: 3840
+        image: "cursorDelegate.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "00b7714df163d8055514e0dbd8a83bac"
+    }
+    Frame {
+        msec: 3872
+        hash: "6ef2a330d70a7e0ce343bb352c46f126"
+    }
+    Frame {
+        msec: 3888
+        hash: "f4e26309fa3b8a6d55f44bf146544101"
+    }
+    Frame {
+        msec: 3904
+        hash: "dfa1e24149f2662a4a552da3bb64348c"
+    }
+    Frame {
+        msec: 3920
+        hash: "9ab9d6ef4aeb5863401a9e251f684e2d"
+    }
+    Frame {
+        msec: 3936
+        hash: "c9f7591a37a3743b3b48de5337fd2fa0"
+    }
+    Frame {
+        msec: 3952
+        hash: "2d38f17db530050574d9192c805c142d"
+    }
+    Frame {
+        msec: 3968
+        hash: "38a4ad2cf9fa3015eff67014900a44cc"
+    }
+    Frame {
+        msec: 3984
+        hash: "9d9ce4ac0de6caa2f0bb78eac414ba65"
+    }
+    Frame {
+        msec: 4000
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 4016
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 4032
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 4048
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 4064
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 4080
+        hash: "9d9ce4ac0de6caa2f0bb78eac414ba65"
+    }
+    Frame {
+        msec: 4096
+        hash: "38a4ad2cf9fa3015eff67014900a44cc"
+    }
+    Frame {
+        msec: 4112
+        hash: "2d38f17db530050574d9192c805c142d"
+    }
+    Frame {
+        msec: 4128
+        hash: "c9f7591a37a3743b3b48de5337fd2fa0"
+    }
+    Frame {
+        msec: 4144
+        hash: "9ab9d6ef4aeb5863401a9e251f684e2d"
+    }
+    Frame {
+        msec: 4160
+        hash: "dfa1e24149f2662a4a552da3bb64348c"
+    }
+    Frame {
+        msec: 4176
+        hash: "f4e26309fa3b8a6d55f44bf146544101"
+    }
+    Frame {
+        msec: 4192
+        hash: "6ef2a330d70a7e0ce343bb352c46f126"
+    }
+    Frame {
+        msec: 4208
+        hash: "00b7714df163d8055514e0dbd8a83bac"
+    }
+    Frame {
+        msec: 4224
+        hash: "ae46d672649a4b0fc5171f776af93a2c"
+    }
+    Frame {
+        msec: 4240
+        hash: "6feb44655bfbec651cc2902676bd08b4"
+    }
+    Frame {
+        msec: 4256
+        hash: "6fa1811f520eff9893b3c7b00e53fa7d"
+    }
+    Frame {
+        msec: 4272
+        hash: "0ab8bebb0e43786a7e51ea780745080c"
+    }
+    Frame {
+        msec: 4288
+        hash: "08b7d4eef2d15bc717ff1a981a11f275"
+    }
+    Frame {
+        msec: 4304
+        hash: "c75ba80484af36633b6a4d17b666b1c9"
+    }
+    Frame {
+        msec: 4320
+        hash: "6336ce0d912ee63773475c4c6c5d59be"
+    }
+    Frame {
+        msec: 4336
+        hash: "85c663b943f67d158367dba0508980a5"
+    }
+    Frame {
+        msec: 4352
+        hash: "7db073b7487ddea48e7c9df8b9bfdc00"
+    }
+    Frame {
+        msec: 4368
+        hash: "d566b2763312e5e823593806acd9e809"
+    }
+    Frame {
+        msec: 4384
+        hash: "a10d3184acc85c46e171fe4cf82e1c23"
+    }
+    Frame {
+        msec: 4400
+        hash: "e3bb1ec3b84df25712f06e0d6963efdd"
+    }
+    Frame {
+        msec: 4416
+        hash: "fe95122352effcf1815bc237fc6ce6ab"
+    }
+    Frame {
+        msec: 4432
+        hash: "2ee111386bd646c4ee577405e490a2f7"
+    }
+    Frame {
+        msec: 4448
+        hash: "eac6de65ea6726f0cc50b6d30c1b7ba5"
+    }
+    Frame {
+        msec: 4464
+        hash: "e3c0e8f6385ef2ab9b671be3243774c4"
+    }
+    Frame {
+        msec: 4480
+        hash: "51da770a75102de9ad1920f1f6c44146"
+    }
+    Frame {
+        msec: 4496
+        hash: "de924155855e76d0591217448f79bdb6"
+    }
+    Frame {
+        msec: 4512
+        hash: "ea3f512181b3ee94d8cdd4d9f59ed962"
+    }
+    Frame {
+        msec: 4528
+        hash: "c0e72cdf776b0c62742aa9c3683cd523"
+    }
+    Frame {
+        msec: 4544
+        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
+    }
+    Frame {
+        msec: 4560
+        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
+    }
+    Frame {
+        msec: 4576
+        hash: "eacfa8db605b9e386a55508e8943e7d1"
+    }
+    Frame {
+        msec: 4592
+        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
+    }
+    Frame {
+        msec: 4608
+        hash: "60a60e06237318bf005f87bbba386fef"
+    }
+    Frame {
+        msec: 4624
+        hash: "97549f388c02adb8884c2e79510adc7e"
+    }
+    Frame {
+        msec: 4640
+        hash: "d882fe91d9df9862d620cf984e27d0bd"
+    }
+    Frame {
+        msec: 4656
+        hash: "6310b65572e39256122c7620f7e87442"
+    }
+    Frame {
+        msec: 4672
+        hash: "4e7374a683050ff440056b6e7c971d2b"
+    }
+    Frame {
+        msec: 4688
+        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
+    }
+    Frame {
+        msec: 4704
+        hash: "8d71c418593eb3e4834d5e608ffd3f29"
+    }
+    Frame {
+        msec: 4720
+        hash: "0da2c1cd0138172698a3bee5d19168c5"
+    }
+    Frame {
+        msec: 4736
+        hash: "8ca757a4fd1987329488f63251b0f6b4"
+    }
+    Frame {
+        msec: 4752
+        hash: "70c827f1b34b44cbd775b666913556d6"
+    }
+    Frame {
+        msec: 4768
+        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
+    }
+    Frame {
+        msec: 4784
+        hash: "38abc77b2361ce257d39c0cf268ba42b"
+    }
+    Frame {
+        msec: 4800
+        image: "cursorDelegate.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "7bed5747d6b771db0fe5802153e54f2f"
+    }
+    Frame {
+        msec: 4832
+        hash: "9ac1bf268749bc8e58bc4d04b55ef849"
+    }
+    Frame {
+        msec: 4848
+        hash: "64ea5cb46782d250c46a7a2c8cceea20"
+    }
+    Frame {
+        msec: 4864
+        hash: "d81037eb21bfcb434b6c7f3bbd21ad12"
+    }
+    Frame {
+        msec: 4880
+        hash: "1079ea3a1a62e2cca9a8e907bc5aa4e1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 130; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4896
+        hash: "3d78320cb021944d7c6cee1a42056663"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 130; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4912
+        hash: "1e3f580f37a0dc063a383bdf435e85ea"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 131; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4928
+        hash: "75e854ccaad087bfe776a843f0bd7284"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 132; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4944
+        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 133; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 134; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4960
+        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 135; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4976
+        hash: "00dfc5f4468482cb5f74e62be235b1d2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 136; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4992
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 137; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5008
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 139; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5024
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 140; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5040
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 141; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 143; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5056
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5072
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5088
+        hash: "748dc58a3ad83d7b99d7b26ad2f82786"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 149; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5104
+        hash: "242cc0ee7c3bdb44e8933068d3a93b61"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 150; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5120
+        hash: "3be6f0a35fb085dcf6c9481cf1c23f9d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5136
+        hash: "a6f63267eaba9aefd2c9ab338571ef33"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5152
+        hash: "ba37dd9ba649e294465dc707f6b768ec"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 153; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5168
+        hash: "35b186609721ec0b8a121d15bc54ce49"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5184
+        hash: "700ff15e4e48af93362455a149d90363"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5200
+        hash: "1c51eb8d4d25d086bda4d595a49c3a86"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5216
+        hash: "2f085b047d24384d463163df7fac2bd3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5232
+        hash: "46d7aff6eb47e50e23c061ecb149fbf9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5248
+        hash: "48d7a8f749f7501dbaa4599ca41096a5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5264
+        hash: "4c2a085c69c118fedfa15fe46cdc508b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5280
+        hash: "25f25828a4d22fe85db0de5c562f658e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5296
+        hash: "e9fb14ec21e9ec1235d2fea6e055b69d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5312
+        hash: "66417881aeb85778be66566241c45f5a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5328
+        hash: "c8c136690ffd8e5cc3e58f7376693b4f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 178; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5344
+        hash: "c58c4fb5b7197cd8bd95742dc8715bbf"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 179; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5360
+        hash: "2e0c93380883fcf2d0e56024fecba605"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 180; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5376
+        hash: "5f169f09e3d868eb0425a331d4bc3144"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 182; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 183; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5392
+        hash: "ed648742be4b0ded04e713e83ed24b27"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5408
+        hash: "92131288bb38480469f4578282dedaf8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5424
+        hash: "e16773f750bb0f635552b1eeadb2d625"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 189; y: 93
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 191; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5440
+        hash: "6e653cd552d82f38f30b8027d1951534"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 192; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5456
+        hash: "cfc1d6efa8d1b3b86396704f0be031ad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 194; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5472
+        hash: "5848af73f5ab7c811639a6d01921d502"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 196; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5488
+        hash: "3823e7da05678f63e6761a81ed7233e2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 199; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5504
+        hash: "d095abe9814a60824914960a11663f12"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 200; y: 91
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5520
+        hash: "18922bb3269d903a36e0b690249b473a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 200; y: 91
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 201; y: 90
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5536
+        hash: "4d8400a3ca2b782e7b054bb2f71d4543"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 202; y: 89
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5552
+        hash: "24ed25d7a767f01fb02f545fc6c6931a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5568
+        hash: "55fb16784e3655ae70f97d6c32853cdc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 204; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5584
+        hash: "694e6979f0de62b61324dc4b144a2d5d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 207; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 208; y: 85
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5600
+        hash: "e61b8b03251f6312e3de4e0c8af684d5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 210; y: 85
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5616
+        hash: "6203321f87d53692dbb2b2aaf7dd3944"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5632
+        hash: "297b77029475d77cd8e481199b23da30"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 213; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 214; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5648
+        hash: "414615d772b4c80bf85eabfdca6fd0e0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5664
+        hash: "46d70882552a21267eebb3505da086f3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5680
+        hash: "372acafc63624307bcb384c48a803ab7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5696
+        hash: "1b98094dd4f192af8229b7058b8ce396"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5712
+        hash: "d627fa0ce696e46650225e43134643f5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 84
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5728
+        hash: "0410f4b504d768bc00940b20d3d942f9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 219; y: 85
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 219; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 220; y: 86
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5744
+        hash: "5f8011b44681d769800af8d205c757cb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 221; y: 87
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5760
+        image: "cursorDelegate.5.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 87
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5776
+        hash: "99f7a46f841f96445962b5fb3496d996"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5792
+        hash: "ed8bba2823ca2fe7cf138af0fcc52806"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 224; y: 90
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5808
+        hash: "c9007b7ae5038ba59bfc6fac15c80d5f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 226; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5824
+        hash: "2db81c955a99652bcfef958e870054af"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 228; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5840
+        hash: "1e3906d7f3ee5a29c3c90b8e1f6c1eb0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 229; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 231; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "fc59738903cc9e6f36ef4d27bfde9496"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 232; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5872
+        hash: "768aaf4ef2b13b40b75bdf15787966b6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 233; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5888
+        hash: "3085baedc0c58a6757b134bb4f80fa9e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 233; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5904
+        hash: "0a1b8cad167bf93801f4d0dd34bf872e"
+    }
+    Frame {
+        msec: 5920
+        hash: "6366e04808ee015feed44d95cc117e1e"
+    }
+    Frame {
+        msec: 5936
+        hash: "dd67a8542a243aac9462e25dc1586e6e"
+    }
+    Frame {
+        msec: 5952
+        hash: "e06c8788b2ef327d005b4048f0807334"
+    }
+    Frame {
+        msec: 5968
+        hash: "dda2beda1253bd477d04cada4ec4df27"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 233; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5984
+        hash: "d659d1724637d90497c8e417764d3477"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 232; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 232; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6000
+        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 231; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6016
+        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 230; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6032
+        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 229; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 228; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6048
+        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 227; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6064
+        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 225; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6080
+        hash: "bdc53613cad59416ed79287874eb59f8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 224; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6096
+        hash: "54efe0acb07fb69827024a566773a36e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 220; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6112
+        hash: "860530a5ac3d89193f3cf234e21f8f6a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 219; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6128
+        hash: "ade5f8e28159304b22866f688efdbb46"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6144
+        hash: "7d5f5cf34910527d899e89ea07fb7254"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6160
+        hash: "c201ed0f2419396a229d8396152aba01"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 213; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6176
+        hash: "b99135e2cb03ab252ff379c8001c26ad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6192
+        hash: "768aaf4ef2b13b40b75bdf15787966b6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 210; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6208
+        hash: "71a5bed1a87e16c986b2f4b245e956b8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 210; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6224
+        hash: "7155607add8c7254286097cda52b5888"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 208; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 207; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6240
+        hash: "e516e4d8a4ef0195ae04b3287f536ffd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 206; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6256
+        hash: "afa06d10b37d8ad8b57e392142ff50f2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6272
+        hash: "88c3fe68f7251d87a5bf197b9d59b899"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 204; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 104
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6288
+        hash: "b2687baf5148539ee2181b18077e0a3d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 202; y: 104
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6304
+        hash: "457aed68cee2b9f3ff3c7d5f0eb2b6aa"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 201; y: 104
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6320
+        hash: "48bb4683718a3b7c34baea29260fbe8c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 200; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 199; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6336
+        hash: "7c32fbf799bbfc10d0fbdd96bcfa9d95"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 197; y: 102
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6352
+        hash: "68cee3b8213a9d38e2ed431d06eb6756"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 196; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 194; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6368
+        hash: "596c732c40a86d16bc649f164b919457"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 191; y: 101
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 188; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6384
+        hash: "d9cb5bf69d4f8aaebefae6d680a99185"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6400
+        hash: "bb6759f3aff00f027f4f426efb775d2d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 185; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6416
+        hash: "a408d88f97c30ab8ab12a222b03571b4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 182; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6432
+        hash: "bb2e8994dc014eb6d4e4e33257269c2a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6448
+        hash: "190e9df0b8d20b0f37a198e9f3976416"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 171; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6464
+        hash: "aa7be52534c8550948deea6ae174330d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6480
+        hash: "533caac613ea1279a51a5b5b29acdccc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6496
+        hash: "288cc34879d9ed8ed381ba6cc31de3e7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6512
+        hash: "2a57602c47ab788f288daa81b985fc1d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6528
+        hash: "fa3540fafa1a9e3c5e796b598dce8fb1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6544
+        hash: "7e9b17ae7c10cb30153539911ac6eb13"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6560
+        hash: "9e62b16c858e80ff1294ec53e2390498"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 94
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 153; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6576
+        hash: "287470e6cf9bd4b9acfd1cd1512307e3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6592
+        hash: "4086c7c7a573a1b9f98d22ebf9b46c5f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 149; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6608
+        hash: "7d0868f000a1102916720a29a332543f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6624
+        hash: "bda3cfdca81f7cba54514c512eb6b12e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 96
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6640
+        hash: "923ff9fac39c3fba2c9cf7b52fc652ad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6656
+        hash: "269718e3586affbbdf0b9599e12f5677"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6672
+        hash: "d12e03b5da6ea7b162d7dec6930c1a54"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6688
+        hash: "96edf1f15c674c5d8c4e4ce9e1d34f1d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6704
+        hash: "70ce229fae6985dd49de8cca01c031e6"
+    }
+    Frame {
+        msec: 6720
+        image: "cursorDelegate.6.png"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 144; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6736
+        hash: "56215b7d24ac382ff1ed256c80d14091"
+    }
+    Frame {
+        msec: 6752
+        hash: "ac132304e072806431803d26e345b264"
+    }
+    Frame {
+        msec: 6768
+        hash: "a8f3e7fbb95ed8fe2b83871eb3d2c151"
+    }
+    Frame {
+        msec: 6784
+        hash: "43906030c2572af0f8f0577dbc86e346"
+    }
+    Frame {
+        msec: 6800
+        hash: "d64b58801430d5063225dceac1603bca"
+    }
+    Frame {
+        msec: 6816
+        hash: "56b81435dc4ce193bb98c3d02c781242"
+    }
+    Frame {
+        msec: 6832
+        hash: "a33dce3c55b1b1541cfb9b85a75fcb53"
+    }
+    Frame {
+        msec: 6848
+        hash: "6f7411363c66d0959ea5a16a9b610e61"
+    }
+    Frame {
+        msec: 6864
+        hash: "fb7ad9156658f3866d19e43f006cf013"
+    }
+    Frame {
+        msec: 6880
+        hash: "fca865f762c1a6cc3e487e0e908eef73"
+    }
+    Frame {
+        msec: 6896
+        hash: "3d78320cb021944d7c6cee1a42056663"
+    }
+    Frame {
+        msec: 6912
+        hash: "1e3f580f37a0dc063a383bdf435e85ea"
+    }
+    Frame {
+        msec: 6928
+        hash: "75e854ccaad087bfe776a843f0bd7284"
+    }
+    Frame {
+        msec: 6944
+        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
+    }
+    Frame {
+        msec: 6960
+        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
+    }
+    Frame {
+        msec: 6976
+        hash: "00dfc5f4468482cb5f74e62be235b1d2"
+    }
+    Frame {
+        msec: 6992
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 7008
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 7024
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 7040
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 7056
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 7072
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 7088
+        hash: "00dfc5f4468482cb5f74e62be235b1d2"
+    }
+    Frame {
+        msec: 7104
+        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
+    }
+    Frame {
+        msec: 7120
+        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
+    }
+    Frame {
+        msec: 7136
+        hash: "75e854ccaad087bfe776a843f0bd7284"
+    }
+    Frame {
+        msec: 7152
+        hash: "1e3f580f37a0dc063a383bdf435e85ea"
+    }
+    Frame {
+        msec: 7168
+        hash: "3d78320cb021944d7c6cee1a42056663"
+    }
+    Frame {
+        msec: 7184
+        hash: "fca865f762c1a6cc3e487e0e908eef73"
+    }
+    Frame {
+        msec: 7200
+        hash: "fb7ad9156658f3866d19e43f006cf013"
+    }
+    Frame {
+        msec: 7216
+        hash: "6f7411363c66d0959ea5a16a9b610e61"
+    }
+    Frame {
+        msec: 7232
+        hash: "a33dce3c55b1b1541cfb9b85a75fcb53"
+    }
+    Frame {
+        msec: 7248
+        hash: "56b81435dc4ce193bb98c3d02c781242"
+    }
+    Frame {
+        msec: 7264
+        hash: "d64b58801430d5063225dceac1603bca"
+    }
+    Frame {
+        msec: 7280
+        hash: "43906030c2572af0f8f0577dbc86e346"
+    }
+    Frame {
+        msec: 7296
+        hash: "a8f3e7fbb95ed8fe2b83871eb3d2c151"
+    }
+    Frame {
+        msec: 7312
+        hash: "ac132304e072806431803d26e345b264"
+    }
+    Frame {
+        msec: 7328
+        hash: "56215b7d24ac382ff1ed256c80d14091"
+    }
+    Frame {
+        msec: 7344
+        hash: "4d5c97925b21d699f1c3720a3f51ebbb"
+    }
+    Frame {
+        msec: 7360
+        hash: "70ce229fae6985dd49de8cca01c031e6"
+    }
+    Frame {
+        msec: 7376
+        hash: "96edf1f15c674c5d8c4e4ce9e1d34f1d"
+    }
+    Frame {
+        msec: 7392
+        hash: "d12e03b5da6ea7b162d7dec6930c1a54"
+    }
+    Frame {
+        msec: 7408
+        hash: "269718e3586affbbdf0b9599e12f5677"
+    }
+    Frame {
+        msec: 7424
+        hash: "42d19ea6dd328c505da5a4eee23a257d"
+    }
+    Frame {
+        msec: 7440
+        hash: "e4d9d77859759dd95cf3ffee8f142cd8"
+    }
+    Frame {
+        msec: 7456
+        hash: "445e4c6e9872b63a1461e3277dd8185c"
+    }
+    Frame {
+        msec: 7472
+        hash: "d6343c629acd987179eae0d158d2504c"
+    }
+    Frame {
+        msec: 7488
+        hash: "a5340087baa2c3694ed0cc2bbc3e2ad9"
+    }
+    Frame {
+        msec: 7504
+        hash: "205973c30aaca71d1f20e740ce971d82"
+    }
+    Frame {
+        msec: 7520
+        hash: "ed28c7e07755e177222c7e322116bfb4"
+    }
+    Frame {
+        msec: 7536
+        hash: "6cebfc407a985694c803940608ab1303"
+    }
+    Frame {
+        msec: 7552
+        hash: "87f825fc820d3942e4d9b5ece5be3714"
+    }
+    Frame {
+        msec: 7568
+        hash: "9aa56dfe90ed2eba58eee0ff6ff3822c"
+    }
+    Frame {
+        msec: 7584
+        hash: "c93acf87a918f21a55cf39ea255315a3"
+    }
+    Frame {
+        msec: 7600
+        hash: "f8ce1bec5d5016c56fc66d52c28e69d1"
+    }
+    Frame {
+        msec: 7616
+        hash: "a365dba2f7c4be77ea98b727813c2f03"
+    }
+    Frame {
+        msec: 7632
+        hash: "e8d1c35ee9ef74c4070adfce5e4560f1"
+    }
+    Frame {
+        msec: 7648
+        hash: "f5f2dbb041eeb4de1821761f4fbca506"
+    }
+    Frame {
+        msec: 7664
+        hash: "f4ea6e9dff51778e9b5d1321453617ec"
+    }
+    Frame {
+        msec: 7680
+        image: "cursorDelegate.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "f2869791dde1eb4c2ea24e04dc3ac653"
+    }
+    Frame {
+        msec: 7712
+        hash: "9bd70e91b765de22b70fe295adc4f87f"
+    }
+    Frame {
+        msec: 7728
+        hash: "c0338d0a5c72ba63bff666a76ab3242c"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 227; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7744
+        hash: "cb2a643eed9b5658260e04495820cd3d"
+    }
+    Frame {
+        msec: 7760
+        hash: "6dda51f2e611b1f589c75820fd8c7295"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 227; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7776
+        hash: "98d8692afd47c61421ddcae62414a72e"
+    }
+    Frame {
+        msec: 7792
+        hash: "2c533bcdd9df45c6f942d47509ebf20e"
+    }
+    Frame {
+        msec: 7808
+        hash: "d28f231fb1e128329e8985689deac882"
+    }
+    Frame {
+        msec: 7824
+        hash: "ea73450baf98a2f629ce1c203cfcd728"
+    }
+    Frame {
+        msec: 7840
+        hash: "959a31d38edc343b5e081fd0cddc81df"
+    }
+    Frame {
+        msec: 7856
+        hash: "9b1ae10ee8e9b3f176357733af9e6735"
+    }
+    Frame {
+        msec: 7872
+        hash: "89b0dd11f456bbb321e0bd2e1614c193"
+    }
+    Frame {
+        msec: 7888
+        hash: "a0a3aa6d8d4c677894e745ee432084e2"
+    }
+    Frame {
+        msec: 7904
+        hash: "f63207b8903085b19de1c9b6a9ff90e0"
+    }
+    Frame {
+        msec: 7920
+        hash: "c8f2126fece8c2b473c6511aa568dddb"
+    }
+    Frame {
+        msec: 7936
+        hash: "6ccd1f30e85dbad74468c228d92a9a3c"
+    }
+    Frame {
+        msec: 7952
+        hash: "bae09fe9f29e0f6ebda298cae753ddab"
+    }
+    Frame {
+        msec: 7968
+        hash: "cde4abae868488345fb124b927f46b45"
+    }
+    Frame {
+        msec: 7984
+        hash: "a88ccf9c8ae34ffcfd15af4e66102040"
+    }
+    Frame {
+        msec: 8000
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 8016
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 8032
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 8048
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 8064
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 8080
+        hash: "a88ccf9c8ae34ffcfd15af4e66102040"
+    }
+    Frame {
+        msec: 8096
+        hash: "cde4abae868488345fb124b927f46b45"
+    }
+    Frame {
+        msec: 8112
+        hash: "bae09fe9f29e0f6ebda298cae753ddab"
+    }
+    Frame {
+        msec: 8128
+        hash: "6ccd1f30e85dbad74468c228d92a9a3c"
+    }
+    Frame {
+        msec: 8144
+        hash: "c8f2126fece8c2b473c6511aa568dddb"
+    }
+    Frame {
+        msec: 8160
+        hash: "f63207b8903085b19de1c9b6a9ff90e0"
+    }
+    Frame {
+        msec: 8176
+        hash: "a0a3aa6d8d4c677894e745ee432084e2"
+    }
+    Frame {
+        msec: 8192
+        hash: "89b0dd11f456bbb321e0bd2e1614c193"
+    }
+    Frame {
+        msec: 8208
+        hash: "9b1ae10ee8e9b3f176357733af9e6735"
+    }
+    Frame {
+        msec: 8224
+        hash: "959a31d38edc343b5e081fd0cddc81df"
+    }
+    Frame {
+        msec: 8240
+        hash: "ea73450baf98a2f629ce1c203cfcd728"
+    }
+    Frame {
+        msec: 8256
+        hash: "d28f231fb1e128329e8985689deac882"
+    }
+    Frame {
+        msec: 8272
+        hash: "2c533bcdd9df45c6f942d47509ebf20e"
+    }
+    Frame {
+        msec: 8288
+        hash: "98d8692afd47c61421ddcae62414a72e"
+    }
+    Frame {
+        msec: 8304
+        hash: "6dda51f2e611b1f589c75820fd8c7295"
+    }
+    Frame {
+        msec: 8320
+        hash: "cb2a643eed9b5658260e04495820cd3d"
+    }
+    Frame {
+        msec: 8336
+        hash: "88afd2fa1182fbb2aab100d4587a1006"
+    }
+    Frame {
+        msec: 8352
+        hash: "bc657c5181a11a9ff9565f134bdccb8d"
+    }
+    Frame {
+        msec: 8368
+        hash: "a296634d814a6e12f9d09f4d8a9fa097"
+    }
+    Frame {
+        msec: 8384
+        hash: "f05a2deeb12722904c4f31d641dffeb4"
+    }
+    Frame {
+        msec: 8400
+        hash: "75823698247e39dd10a70fe224e13597"
+    }
+    Frame {
+        msec: 8416
+        hash: "244fa06c168f7a7401b8ec7f5ddb0e52"
+    }
+    Frame {
+        msec: 8432
+        hash: "a78e0f88d269290e9086d1d854618f0c"
+    }
+    Frame {
+        msec: 8448
+        hash: "57b1281d29d5c5fdc15d9cf1e3a5545c"
+    }
+    Frame {
+        msec: 8464
+        hash: "a24ac211ef29dcf7f22ac95991f1af3f"
+    }
+    Frame {
+        msec: 8480
+        hash: "361f978ea3597fd518c25c0069c22e8b"
+    }
+    Frame {
+        msec: 8496
+        hash: "ac8e2c01eb58aac0eb4feb6aba9b9628"
+    }
+    Frame {
+        msec: 8512
+        hash: "6099612934b5eb90296f1cc3cb5c1a84"
+    }
+    Frame {
+        msec: 8528
+        hash: "7c3f08291168065fc9c1d62108022d33"
+    }
+    Frame {
+        msec: 8544
+        hash: "8bf57ba445d668af5f3e59276c4f8800"
+    }
+    Frame {
+        msec: 8560
+        hash: "c8ed352cbfbc472ea4802a9e03d40052"
+    }
+    Frame {
+        msec: 8576
+        hash: "11e5546b30e47d2f3067c0364b9f0877"
+    }
+    Frame {
+        msec: 8592
+        hash: "9df0f136fca92d4a05f17ee68f0cd286"
+    }
+    Frame {
+        msec: 8608
+        hash: "39f47838a622ba328548cad57cca9e12"
+    }
+    Frame {
+        msec: 8624
+        hash: "c891d582be4b23c01e29032fe861081f"
+    }
+    Frame {
+        msec: 8640
+        image: "cursorDelegate.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "c3820dfd382c4568d9fbd2ee95889eda"
+    }
+    Frame {
+        msec: 8672
+        hash: "528cf8778318bf7216b54f983dadb2b4"
+    }
+    Frame {
+        msec: 8688
+        hash: "419518a3c63aa36f6070e95eb93e58a3"
+    }
+    Frame {
+        msec: 8704
+        hash: "11b22e2853c0a9ea6e4ac764348698c9"
+    }
+    Frame {
+        msec: 8720
+        hash: "8018329c4b57647942ae34a5f83c2b12"
+    }
+    Frame {
+        msec: 8736
+        hash: "c37e9fd5c3d664c2e4911c8cb9fcabf7"
+    }
+    Frame {
+        msec: 8752
+        hash: "4e7895f802c9fc249894ba0db25959f7"
+    }
+    Frame {
+        msec: 8768
+        hash: "5fed71d99ef70432bc6be8caaea36f17"
+    }
+    Frame {
+        msec: 8784
+        hash: "69976d074acbd7a5731c70b33c8f084b"
+    }
+    Frame {
+        msec: 8800
+        hash: "c88952348da3df0627b12b8bb05ca13e"
+    }
+    Frame {
+        msec: 8816
+        hash: "cc5222da7a17c66d4db146c406492701"
+    }
+    Frame {
+        msec: 8832
+        hash: "8915e752776da27cb86019c9decc8a8c"
+    }
+    Frame {
+        msec: 8848
+        hash: "d8a77ccc7c01cf187e846a2903e1c55e"
+    }
+    Frame {
+        msec: 8864
+        hash: "3cf3f02f98a199c81ef73e8905e7f7ee"
+    }
+    Frame {
+        msec: 8880
+        hash: "7a1d47e0109fc370bf63714040cbef96"
+    }
+    Frame {
+        msec: 8896
+        hash: "2ca8b8ddbe73b29327e474da34a14a87"
+    }
+    Frame {
+        msec: 8912
+        hash: "ee75214865fca848aa38cc05b6049d8f"
+    }
+    Frame {
+        msec: 8928
+        hash: "05ab7d8118a806f2215160f5f266a082"
+    }
+    Frame {
+        msec: 8944
+        hash: "31e63095b7be56d0bf75e9cff832feb7"
+    }
+    Frame {
+        msec: 8960
+        hash: "3ffda2c2f154f1eb806e9f0963057fa1"
+    }
+    Frame {
+        msec: 8976
+        hash: "4e805203b58e8f6f331f2e878704fa01"
+    }
+    Frame {
+        msec: 8992
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 9008
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 9024
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 9040
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 9056
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 9072
+        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
+    }
+    Frame {
+        msec: 9088
+        hash: "4e805203b58e8f6f331f2e878704fa01"
+    }
+    Frame {
+        msec: 9104
+        hash: "3ffda2c2f154f1eb806e9f0963057fa1"
+    }
+    Frame {
+        msec: 9120
+        hash: "31e63095b7be56d0bf75e9cff832feb7"
+    }
+    Frame {
+        msec: 9136
+        hash: "05ab7d8118a806f2215160f5f266a082"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.0.png
new file mode 100644
index 0000000..95a835a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.1.png
new file mode 100644
index 0000000..409192c
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.2.png
new file mode 100644
index 0000000..cd2f112
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.3.png
new file mode 100644
index 0000000..7191c1e
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.qml
new file mode 100644
index 0000000..352c890
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.qml
@@ -0,0 +1,1371 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 32
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 48
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 64
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 80
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 96
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 112
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 128
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 144
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 160
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 176
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 192
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 208
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 224
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 240
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 256
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 272
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 288
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 304
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 320
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 336
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 352
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 368
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 384
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 400
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 416
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 432
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 464
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 480
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 496
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 512
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 528
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 560
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 576
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 592
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 608
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 624
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 640
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 656
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 672
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 688
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 704
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 720
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 736
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 752
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 768
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 784
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 800
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 816
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 832
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 848
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 864
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 880
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 896
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 912
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 928
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 944
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 960
+        image: "qt-669.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 992
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 1008
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1024
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 1040
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 1056
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 1072
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 1088
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1104
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 1120
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 1136
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1152
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 1168
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 1184
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 1200
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 1216
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1232
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 1248
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 1264
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 1280
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1296
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 1312
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 1328
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 1344
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1360
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1376
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1392
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1408
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1424
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1440
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1456
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1472
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1488
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1504
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1520
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1536
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1552
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1568
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1584
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1600
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1616
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1632
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1648
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1664
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1680
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1696
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1712
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1728
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1744
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1760
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1776
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1792
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1808
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1824
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Frame {
+        msec: 1840
+        hash: "a3b98f215b2329e29d17b61eba0f9e45"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1856
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1872
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1888
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1904
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1920
+        image: "qt-669.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1952
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1968
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 1984
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2000
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 2016
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 2032
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 2048
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Frame {
+        msec: 2064
+        hash: "d85314199885fdf9cc8e666c3fb723fb"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2080
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 2096
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 2112
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 2128
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 2144
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 2176
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 2192
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 2208
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Frame {
+        msec: 2224
+        hash: "1313880b796ae7134f50fa8dafa4a974"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2240
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 2256
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2272
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 2288
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 2304
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 2320
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Frame {
+        msec: 2336
+        hash: "c899e9d181860f682ba7275fa36f82a1"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2352
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2368
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2384
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2400
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2416
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2432
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2448
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2464
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2480
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2496
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2512
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2528
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2544
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2560
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2576
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Frame {
+        msec: 2592
+        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2608
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 2624
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 2640
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 2656
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 2672
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2688
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 2704
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 2720
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 2736
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Frame {
+        msec: 2752
+        hash: "c87aaf72137c2b9e8c876879e7215072"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2768
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 2784
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 2800
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2816
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 2832
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 2848
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Frame {
+        msec: 2864
+        hash: "3c455f51fea0926576077d55d6fbfbb2"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2880
+        image: "qt-669.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 2912
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 2928
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2944
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 2960
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 2976
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 2992
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Frame {
+        msec: 3008
+        hash: "394360c0bff5ee3ad206d2911838d64e"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3024
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3040
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3056
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3072
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3088
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3104
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3120
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3136
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3152
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3168
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3184
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3200
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3216
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3232
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3248
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3264
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3280
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3296
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3312
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3328
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3344
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3360
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3376
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3392
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3408
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3424
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3440
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3456
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3472
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3488
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3504
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3520
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3536
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3552
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3568
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3584
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3600
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3616
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3632
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3648
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3664
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3680
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Frame {
+        msec: 3696
+        hash: "10573e4c9dab5bd6e46ec79949c098e5"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3712
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3728
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3744
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3760
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3776
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3792
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3808
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3824
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3840
+        image: "qt-669.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3872
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3888
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3904
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3920
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3936
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3952
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3968
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 3984
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4000
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4016
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4032
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4048
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4064
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4080
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4096
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4112
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4128
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4144
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4160
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4176
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4192
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4208
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4224
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4240
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4256
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4272
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4288
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+    Frame {
+        msec: 4304
+        hash: "4e0ce00bde70a96774a6477ef2305b7f"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.0.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.2.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.3.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.4.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.4.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.5.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.5.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.6.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.6.png
new file mode 100644
index 0000000..ec65f49
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.qml
new file mode 100644
index 0000000..f96daa9
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.qml
@@ -0,0 +1,2467 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 33554432
+        text: "54"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 32
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 48
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 64
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 80
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 96
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 112
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 128
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 144
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 160
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 176
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 192
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 208
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 224
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 240
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 256
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 272
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 288
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 304
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 320
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 336
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 352
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 368
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 384
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 400
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 416
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 432
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 448
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 464
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 480
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 496
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 512
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 528
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 560
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 576
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 592
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 608
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 624
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 640
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 656
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 672
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 688
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 704
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 720
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 736
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 752
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 768
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 784
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 800
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 816
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 832
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 848
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 864
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 880
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 896
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 912
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 928
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 944
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 960
+        image: "wrap.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1072
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1088
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1104
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1120
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1136
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1152
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1168
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1184
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1200
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1216
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1232
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1248
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1264
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1280
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1296
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1312
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1328
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1344
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1360
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1376
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1392
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1408
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1424
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1440
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1456
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1472
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1488
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1504
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1520
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1536
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1552
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1568
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1584
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1600
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1616
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1632
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 72
+        modifiers: 0
+        text: "68"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1648
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1664
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1680
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1696
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1712
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1728
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1744
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1760
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1776
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1808
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1824
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1840
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1856
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1872
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1888
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1904
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1920
+        image: "wrap.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1952
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1968
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2080
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2096
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2112
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2128
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2144
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2160
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2176
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2192
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2208
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 88
+        modifiers: 0
+        text: "78"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2224
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2240
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2256
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2272
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2288
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2304
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 88
+        modifiers: 0
+        text: "78"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2320
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2336
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2352
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2384
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2400
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2416
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2432
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2464
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2480
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2496
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2512
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2528
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2544
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2576
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2592
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2608
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2624
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2640
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2656
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2672
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2688
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2704
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2720
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2736
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2752
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2768
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2784
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2800
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2816
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2832
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 73
+        modifiers: 0
+        text: "69"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2848
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2864
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2880
+        image: "wrap.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2912
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2928
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2944
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2960
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3072
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3088
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3104
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3120
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3136
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3152
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3168
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3184
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3200
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3216
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3232
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3248
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3264
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3280
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3296
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3312
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3328
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3344
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3360
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3376
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3392
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3408
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3424
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3440
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3456
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3472
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3488
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3504
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3520
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3536
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 80
+        modifiers: 0
+        text: "70"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3552
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3568
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3584
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3600
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3616
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3632
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3648
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3664
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3680
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3696
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3712
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3728
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3744
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3760
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3776
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3792
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3808
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3824
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3840
+        image: "wrap.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3872
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3888
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3904
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 3920
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3936
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3952
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3968
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4064
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4096
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4112
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4128
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4144
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4160
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4176
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4192
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4208
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4224
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4240
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4256
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4272
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4288
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 82
+        modifiers: 0
+        text: "72"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4304
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4320
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4336
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4352
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4368
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4384
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4400
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4416
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4432
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4448
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4464
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4480
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4496
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4512
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4528
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4544
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4560
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4576
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4592
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4608
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 84
+        modifiers: 0
+        text: "74"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4624
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4640
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4656
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4672
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4688
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4704
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4720
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4736
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4752
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4768
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4784
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4800
+        image: "wrap.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4832
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4848
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4864
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4880
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 46
+        modifiers: 0
+        text: "2e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4896
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4912
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4928
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4944
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 7
+        key: 46
+        modifiers: 0
+        text: "2e"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4960
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5072
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5088
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5104
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5120
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5136
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5152
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5168
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5184
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5200
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5216
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5232
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5248
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5264
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5280
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5296
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5312
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5328
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5344
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5360
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5376
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5392
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5408
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5424
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5440
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5456
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5472
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5488
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5504
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5520
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5536
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5552
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5568
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5584
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5600
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5616
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5632
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5648
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5664
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5680
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5696
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5712
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5728
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5744
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5760
+        image: "wrap.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5792
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5808
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5824
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5840
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5856
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5872
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5888
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5904
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5920
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5936
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5952
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5968
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6064
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6080
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6096
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6112
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6128
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6144
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6160
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6176
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6192
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6208
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6224
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6240
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6256
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6272
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6288
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6304
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6320
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6336
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6352
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6368
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6384
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6400
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6416
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6432
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6448
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6464
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6480
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6496
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6512
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6528
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6544
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6560
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6576
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6592
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6608
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6624
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6640
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6656
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6672
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6688
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6704
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6720
+        image: "wrap.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6752
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6768
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6784
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6800
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6816
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6832
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6848
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6864
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/qt-669.qml b/tests/auto/declarative/visual/qdeclarativetextedit/qt-669.qml
new file mode 100644
index 0000000..b01ddf8
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/qt-669.qml
@@ -0,0 +1,19 @@
+import Qt 4.6
+
+Rectangle {
+    Component { id: testableCursor
+        //Doesn't blink
+        Rectangle {
+            color:"black"
+            width:1
+        }
+    }
+    color: "green"
+    width:400;
+    height:40;
+    TextEdit {
+        focus: true;
+        cursorDelegate: testableCursor
+        text: "Jackdaws love my big sphinx of Quartz"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/wrap.qml b/tests/auto/declarative/visual/qdeclarativetextedit/wrap.qml
new file mode 100644
index 0000000..f9fe025
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/wrap.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Item {
+    height:400
+    width: 200
+    TextEdit {
+        width: 200
+        height: 200
+        wrap: true
+        focus: true
+    }
+    //With QTBUG-6273 only the bottom one would be wrapped
+    TextEdit {
+        width: 200
+        height: 200
+        wrap: true
+        text: "This is a test that text edit wraps correctly."
+        y:200
+    }
+
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml
new file mode 100644
index 0000000..6a4e7fa
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml
@@ -0,0 +1,35 @@
+import Qt 4.6
+    Rectangle {
+    resources: [
+        Component { id: cursorA
+            Item { id: cPage;
+                x: Behavior { NumberAnimation { } }
+                y: Behavior { NumberAnimation { } }
+                height: Behavior { NumberAnimation { duration: 200 } }
+                Rectangle { id: cRectangle; color: "black"; y: 1; width: 1; height: parent.height-2;
+                    Rectangle { id:top; color: "black"; width: 3; height: 1; x: -1; y:0}
+                    Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
+                    opacity: 1
+                    opacity: SequentialAnimation { running: cPage.parent.focus == true; repeat: true;
+                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
+                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
+                             }
+                }
+                width: 1;
+            }
+        }
+    ]
+    width: 400
+    height: 200
+    color: "white"
+    TextInput { id: mainText
+        text: "Hello World"
+        cursorDelegate: cursorA
+        focus: true
+        font.pixelSize: 28
+        selectionColor: "lightsteelblue"
+        selectedTextColor: "deeppink"
+        color: "forestgreen"
+        anchors.centerIn: parent
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png
new file mode 100644
index 0000000..9d0bab2
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png
new file mode 100644
index 0000000..db66ff7
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png
new file mode 100644
index 0000000..cbcca68
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png
new file mode 100644
index 0000000..c22196b
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png
new file mode 100644
index 0000000..a1d051e
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png
new file mode 100644
index 0000000..9289dc0
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png
new file mode 100644
index 0000000..7331f89
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png
new file mode 100644
index 0000000..968bdd2
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png
new file mode 100644
index 0000000..9a3436a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
new file mode 100644
index 0000000..3b664b6
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
@@ -0,0 +1,3379 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 32
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 48
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 64
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 80
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 96
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 112
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 128
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 144
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 160
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 176
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 192
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 208
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 224
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 240
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 256
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 272
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 288
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 304
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 320
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 336
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 352
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 368
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 384
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 400
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 416
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 432
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 448
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 464
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 480
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 496
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Frame {
+        msec: 512
+        hash: "701d8c0f72330c0b72df071bd17749e6"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 528
+        hash: "438be260f19d04c9f98ed7dce1c7db40"
+    }
+    Frame {
+        msec: 544
+        hash: "6032aada2c48092000ecb93e52656414"
+    }
+    Frame {
+        msec: 560
+        hash: "d23bdd94019477d8378cde580d8765ad"
+    }
+    Frame {
+        msec: 576
+        hash: "d74f8e44d47710714d4197809fffb622"
+    }
+    Frame {
+        msec: 592
+        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
+    }
+    Frame {
+        msec: 608
+        hash: "4e875ba8703b690a17e445f2b3810435"
+    }
+    Frame {
+        msec: 624
+        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
+    }
+    Frame {
+        msec: 640
+        hash: "a2ea272b45d8de225826d9381015ff2e"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 656
+        hash: "5d112a3675ea4c010e7bc60e036d0262"
+    }
+    Frame {
+        msec: 672
+        hash: "788d8962f311adf57a3acc876b0e8804"
+    }
+    Frame {
+        msec: 688
+        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 704
+        hash: "91b2695e4915238ae8610a64e279b0f4"
+    }
+    Frame {
+        msec: 720
+        hash: "a97d90765f87b998eae6e9f603c61bff"
+    }
+    Frame {
+        msec: 736
+        hash: "48969edab07b942480d93ac2d383ca24"
+    }
+    Frame {
+        msec: 752
+        hash: "ecfd9d6d5873001f0c67806544a14983"
+    }
+    Frame {
+        msec: 768
+        hash: "a3a3bc1e2523d3e7f961893bcd1dd3a8"
+    }
+    Frame {
+        msec: 784
+        hash: "e337735ad0b42e60c54f16f3da7af3cf"
+    }
+    Frame {
+        msec: 800
+        hash: "c39db081130d269f25dbcb1a19afb8d0"
+    }
+    Frame {
+        msec: 816
+        hash: "c464d501e3935ec0f53eb780bd1a8289"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 832
+        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+    }
+    Frame {
+        msec: 848
+        hash: "d94054222fd37a350bd8abd592a332e3"
+    }
+    Frame {
+        msec: 864
+        hash: "46fed264c233490b477e3a7c22183e18"
+    }
+    Frame {
+        msec: 880
+        hash: "34bc703c915b49b0450ece1d18306df8"
+    }
+    Frame {
+        msec: 896
+        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+    }
+    Frame {
+        msec: 912
+        hash: "4f6dbc7b249c37390518cc263832b587"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 928
+        hash: "df09fa2fd138d1b480eec82db3872d6f"
+    }
+    Frame {
+        msec: 944
+        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+    }
+    Frame {
+        msec: 960
+        image: "cursorDelegate.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 1056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1072
+        hash: "35425ae3ccf3c8dcc1483479c57a3287"
+    }
+    Frame {
+        msec: 1088
+        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+    }
+    Frame {
+        msec: 1104
+        hash: "df09fa2fd138d1b480eec82db3872d6f"
+    }
+    Frame {
+        msec: 1120
+        hash: "4f6dbc7b249c37390518cc263832b587"
+    }
+    Frame {
+        msec: 1136
+        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+    }
+    Frame {
+        msec: 1152
+        hash: "34bc703c915b49b0450ece1d18306df8"
+    }
+    Frame {
+        msec: 1168
+        hash: "46fed264c233490b477e3a7c22183e18"
+    }
+    Frame {
+        msec: 1184
+        hash: "d94054222fd37a350bd8abd592a332e3"
+    }
+    Frame {
+        msec: 1200
+        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+    }
+    Frame {
+        msec: 1216
+        hash: "76fb2e1ad33affe33c0887f04caa7396"
+    }
+    Frame {
+        msec: 1232
+        hash: "0f500339c81ca3621d13910017b84b7b"
+    }
+    Frame {
+        msec: 1248
+        hash: "702864de569e6a5648ee174d5ef891f8"
+    }
+    Frame {
+        msec: 1264
+        hash: "01e937e1fcc0331b2541fa32c3479a24"
+    }
+    Frame {
+        msec: 1280
+        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
+    }
+    Frame {
+        msec: 1296
+        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
+    }
+    Frame {
+        msec: 1312
+        hash: "4a646d76b706698a02cead560b1f8d57"
+    }
+    Frame {
+        msec: 1328
+        hash: "48ec87bfc25471f6fa2d43f9db80b693"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1344
+        hash: "12b5e016bad990d1f2bf427ee8e3e6d9"
+    }
+    Frame {
+        msec: 1360
+        hash: "66a2ba3f9e005cd58aa50cfa0000cd15"
+    }
+    Frame {
+        msec: 1376
+        hash: "a2e9e42e09dadbd0791f52bb96e0e0dc"
+    }
+    Frame {
+        msec: 1392
+        hash: "ac68396566ea85a157e944e601dd8d18"
+    }
+    Frame {
+        msec: 1408
+        hash: "b9bfdebec8dd1a93de7ef2768b2542ba"
+    }
+    Frame {
+        msec: 1424
+        hash: "2e0a4b960803770acb34ef56ccf2be35"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1440
+        hash: "df1643f0f8b7aa2dc080958822aeb3d0"
+    }
+    Frame {
+        msec: 1456
+        hash: "15bb91195adfaf83e88fd93e41ff3e17"
+    }
+    Frame {
+        msec: 1472
+        hash: "dc0476c27bd7eef3a59637df9a3fecd8"
+    }
+    Frame {
+        msec: 1488
+        hash: "a271f69e9dc6d1e0362c3e10760895df"
+    }
+    Frame {
+        msec: 1504
+        hash: "7fe66bcc6bada354b4dd7baf8c977740"
+    }
+    Frame {
+        msec: 1520
+        hash: "6b502dbd5ac8ff010df326cb9b593dce"
+    }
+    Frame {
+        msec: 1536
+        hash: "a9dd21649a95a6a6e8daea91bc6e2a5f"
+    }
+    Frame {
+        msec: 1552
+        hash: "374686590eaa02b7b436caa40cc0b0a0"
+    }
+    Frame {
+        msec: 1568
+        hash: "09ac3c5d413b1f650407eaa971aade81"
+    }
+    Frame {
+        msec: 1584
+        hash: "39f84e04f1ae58600591c0de40558d2c"
+    }
+    Frame {
+        msec: 1600
+        hash: "0336ea1799835af2185c361e221a9661"
+    }
+    Frame {
+        msec: 1616
+        hash: "8c7ab13e499d7f31107cf0f899334259"
+    }
+    Frame {
+        msec: 1632
+        hash: "bad5899324e52c9e6eadb72f3e7c2150"
+    }
+    Frame {
+        msec: 1648
+        hash: "4b78f451ecb22cfbed9f5998d61018eb"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1664
+        hash: "6c913bc712eee18947a43dd1c0a6516b"
+    }
+    Frame {
+        msec: 1680
+        hash: "4e566abf1e0696e72b2a4beab5a53d6e"
+    }
+    Frame {
+        msec: 1696
+        hash: "6ad579c289c63a6b90a1517765fc041e"
+    }
+    Frame {
+        msec: 1712
+        hash: "cef43f349cf221a1aa6e6e70f1fa6339"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1728
+        hash: "d89f7e3e2510fcb34786584747633673"
+    }
+    Frame {
+        msec: 1744
+        hash: "eb23a3eac684808f73034f4e4ef8984d"
+    }
+    Frame {
+        msec: 1760
+        hash: "6f2c1f61e58940d9cc1a70c0db903446"
+    }
+    Frame {
+        msec: 1776
+        hash: "f036a5ecda518be198f3bdf2dbc5baab"
+    }
+    Frame {
+        msec: 1792
+        hash: "7411784774fdc3b324644395f7beb013"
+    }
+    Frame {
+        msec: 1808
+        hash: "abfdd1f8440998af2ff7903f49f1bd7c"
+    }
+    Frame {
+        msec: 1824
+        hash: "6edd29f2e8d3d81e912c6b279ecc1885"
+    }
+    Frame {
+        msec: 1840
+        hash: "8eb5ba22793c7cbfa97a64557f2a023f"
+    }
+    Frame {
+        msec: 1856
+        hash: "9a39470525e6f508228f7e0014e02d64"
+    }
+    Frame {
+        msec: 1872
+        hash: "b3ad10cf28151f5f7f5a4c3540f1660e"
+    }
+    Frame {
+        msec: 1888
+        hash: "816203df3cf42fa7a0e8d6730c186444"
+    }
+    Frame {
+        msec: 1904
+        hash: "a0a7e7ff7960dfe6149e526badf799a6"
+    }
+    Frame {
+        msec: 1920
+        image: "cursorDelegate.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "4d245b2285eadfd206409f74e03c7fc9"
+    }
+    Frame {
+        msec: 1952
+        hash: "e1d5e6c2e4df1454b5a256c3678ffdef"
+    }
+    Frame {
+        msec: 1968
+        hash: "781d7fb03a37cb3f297cc0d2df338fd7"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2064
+        hash: "781d7fb03a37cb3f297cc0d2df338fd7"
+    }
+    Frame {
+        msec: 2080
+        hash: "e1d5e6c2e4df1454b5a256c3678ffdef"
+    }
+    Frame {
+        msec: 2096
+        hash: "4d245b2285eadfd206409f74e03c7fc9"
+    }
+    Frame {
+        msec: 2112
+        hash: "5a647962e016d15daa417d88524d6061"
+    }
+    Frame {
+        msec: 2128
+        hash: "a0a7e7ff7960dfe6149e526badf799a6"
+    }
+    Frame {
+        msec: 2144
+        hash: "816203df3cf42fa7a0e8d6730c186444"
+    }
+    Frame {
+        msec: 2160
+        hash: "b3ad10cf28151f5f7f5a4c3540f1660e"
+    }
+    Frame {
+        msec: 2176
+        hash: "9a39470525e6f508228f7e0014e02d64"
+    }
+    Frame {
+        msec: 2192
+        hash: "8eb5ba22793c7cbfa97a64557f2a023f"
+    }
+    Frame {
+        msec: 2208
+        hash: "6edd29f2e8d3d81e912c6b279ecc1885"
+    }
+    Frame {
+        msec: 2224
+        hash: "abfdd1f8440998af2ff7903f49f1bd7c"
+    }
+    Frame {
+        msec: 2240
+        hash: "7411784774fdc3b324644395f7beb013"
+    }
+    Frame {
+        msec: 2256
+        hash: "f036a5ecda518be198f3bdf2dbc5baab"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2272
+        hash: "6f2c1f61e58940d9cc1a70c0db903446"
+    }
+    Frame {
+        msec: 2288
+        hash: "eb23a3eac684808f73034f4e4ef8984d"
+    }
+    Frame {
+        msec: 2304
+        hash: "d89f7e3e2510fcb34786584747633673"
+    }
+    Frame {
+        msec: 2320
+        hash: "cef43f349cf221a1aa6e6e70f1fa6339"
+    }
+    Frame {
+        msec: 2336
+        hash: "6ad579c289c63a6b90a1517765fc041e"
+    }
+    Frame {
+        msec: 2352
+        hash: "4e566abf1e0696e72b2a4beab5a53d6e"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "6c913bc712eee18947a43dd1c0a6516b"
+    }
+    Frame {
+        msec: 2384
+        hash: "2c518a32ca3b5ca924709cc6990fb039"
+    }
+    Frame {
+        msec: 2400
+        hash: "7f40db00bd3e6d0b39454eefa1403f44"
+    }
+    Frame {
+        msec: 2416
+        hash: "98db32e0d1812e9584105dc4dbceff80"
+    }
+    Frame {
+        msec: 2432
+        hash: "c2150a67391bb574141c16cb011847bf"
+    }
+    Frame {
+        msec: 2448
+        hash: "f9ea21d894fa2dace4d43ce99a580b90"
+    }
+    Frame {
+        msec: 2464
+        hash: "2f580c3244499fc6ecd2121693f463fd"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2480
+        hash: "2f7f421d3e6a895a9efa6b0e8feb81c4"
+    }
+    Frame {
+        msec: 2496
+        hash: "35a18447f319431ed0a645d05a1d03d1"
+    }
+    Frame {
+        msec: 2512
+        hash: "54e36fb4014be554d13709b48b9bdce7"
+    }
+    Frame {
+        msec: 2528
+        hash: "dbe3456536a729b268850a6ee5d1fb47"
+    }
+    Frame {
+        msec: 2544
+        hash: "4c148434cf3868db5dc98f426d9fb913"
+    }
+    Frame {
+        msec: 2560
+        hash: "2eb6da3ebfd531037523347603a805e2"
+    }
+    Frame {
+        msec: 2576
+        hash: "fefbb2f4671f8a36f9d2207ced8c0bfb"
+    }
+    Frame {
+        msec: 2592
+        hash: "1ab596339afc1f96136ee69c4b7688e1"
+    }
+    Frame {
+        msec: 2608
+        hash: "e07f59d729cb2790296e8c7cd3d0d3c9"
+    }
+    Frame {
+        msec: 2624
+        hash: "a7dccada1080487cab2d0a916676c5cb"
+    }
+    Frame {
+        msec: 2640
+        hash: "ac5939eb4379394fab829b307cbfe7ec"
+    }
+    Frame {
+        msec: 2656
+        hash: "9329d353c678d2bc61d08f63029d1b9b"
+    }
+    Frame {
+        msec: 2672
+        hash: "41263f56af7875028bb0c1e7eccf6f5d"
+    }
+    Frame {
+        msec: 2688
+        hash: "e2eb18af82c85ea78ba438163e922df3"
+    }
+    Frame {
+        msec: 2704
+        hash: "91b2695e4915238ae8610a64e279b0f4"
+    }
+    Frame {
+        msec: 2720
+        hash: "a97d90765f87b998eae6e9f603c61bff"
+    }
+    Frame {
+        msec: 2736
+        hash: "48969edab07b942480d93ac2d383ca24"
+    }
+    Frame {
+        msec: 2752
+        hash: "ecfd9d6d5873001f0c67806544a14983"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2768
+        hash: "01e937e1fcc0331b2541fa32c3479a24"
+    }
+    Frame {
+        msec: 2784
+        hash: "702864de569e6a5648ee174d5ef891f8"
+    }
+    Frame {
+        msec: 2800
+        hash: "0f500339c81ca3621d13910017b84b7b"
+    }
+    Frame {
+        msec: 2816
+        hash: "76fb2e1ad33affe33c0887f04caa7396"
+    }
+    Frame {
+        msec: 2832
+        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+    }
+    Frame {
+        msec: 2848
+        hash: "d94054222fd37a350bd8abd592a332e3"
+    }
+    Frame {
+        msec: 2864
+        hash: "46fed264c233490b477e3a7c22183e18"
+    }
+    Frame {
+        msec: 2880
+        image: "cursorDelegate.2.png"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2896
+        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+    }
+    Frame {
+        msec: 2912
+        hash: "4f6dbc7b249c37390518cc263832b587"
+    }
+    Frame {
+        msec: 2928
+        hash: "df09fa2fd138d1b480eec82db3872d6f"
+    }
+    Frame {
+        msec: 2944
+        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+    }
+    Frame {
+        msec: 2960
+        hash: "35425ae3ccf3c8dcc1483479c57a3287"
+    }
+    Frame {
+        msec: 2976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 2992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 3072
+        hash: "35425ae3ccf3c8dcc1483479c57a3287"
+    }
+    Frame {
+        msec: 3088
+        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+    }
+    Frame {
+        msec: 3104
+        hash: "df09fa2fd138d1b480eec82db3872d6f"
+    }
+    Frame {
+        msec: 3120
+        hash: "4f6dbc7b249c37390518cc263832b587"
+    }
+    Frame {
+        msec: 3136
+        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+    }
+    Frame {
+        msec: 3152
+        hash: "34bc703c915b49b0450ece1d18306df8"
+    }
+    Frame {
+        msec: 3168
+        hash: "46fed264c233490b477e3a7c22183e18"
+    }
+    Frame {
+        msec: 3184
+        hash: "d94054222fd37a350bd8abd592a332e3"
+    }
+    Frame {
+        msec: 3200
+        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+    }
+    Frame {
+        msec: 3216
+        hash: "76fb2e1ad33affe33c0887f04caa7396"
+    }
+    Frame {
+        msec: 3232
+        hash: "0f500339c81ca3621d13910017b84b7b"
+    }
+    Frame {
+        msec: 3248
+        hash: "702864de569e6a5648ee174d5ef891f8"
+    }
+    Frame {
+        msec: 3264
+        hash: "01e937e1fcc0331b2541fa32c3479a24"
+    }
+    Frame {
+        msec: 3280
+        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
+    }
+    Frame {
+        msec: 3296
+        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
+    }
+    Frame {
+        msec: 3312
+        hash: "4a646d76b706698a02cead560b1f8d57"
+    }
+    Frame {
+        msec: 3328
+        hash: "48ec87bfc25471f6fa2d43f9db80b693"
+    }
+    Frame {
+        msec: 3344
+        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
+    }
+    Frame {
+        msec: 3360
+        hash: "788d8962f311adf57a3acc876b0e8804"
+    }
+    Frame {
+        msec: 3376
+        hash: "5d112a3675ea4c010e7bc60e036d0262"
+    }
+    Frame {
+        msec: 3392
+        hash: "a2ea272b45d8de225826d9381015ff2e"
+    }
+    Frame {
+        msec: 3408
+        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
+    }
+    Frame {
+        msec: 3424
+        hash: "4e875ba8703b690a17e445f2b3810435"
+    }
+    Frame {
+        msec: 3440
+        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
+    }
+    Frame {
+        msec: 3456
+        hash: "d74f8e44d47710714d4197809fffb622"
+    }
+    Frame {
+        msec: 3472
+        hash: "d23bdd94019477d8378cde580d8765ad"
+    }
+    Frame {
+        msec: 3488
+        hash: "6032aada2c48092000ecb93e52656414"
+    }
+    Frame {
+        msec: 3504
+        hash: "438be260f19d04c9f98ed7dce1c7db40"
+    }
+    Frame {
+        msec: 3520
+        hash: "3af60972e7d5d4320a549e5df52a1228"
+    }
+    Frame {
+        msec: 3536
+        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
+    }
+    Frame {
+        msec: 3552
+        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
+    }
+    Frame {
+        msec: 3568
+        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
+    }
+    Frame {
+        msec: 3584
+        hash: "bdfb42dc3879099e402784238c2cdddb"
+    }
+    Frame {
+        msec: 3600
+        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
+    }
+    Frame {
+        msec: 3616
+        hash: "8159bda651d95a320ac09aa6feb377a1"
+    }
+    Frame {
+        msec: 3632
+        hash: "ceda37af96bd02baae218d3bfaed93f7"
+    }
+    Frame {
+        msec: 3648
+        hash: "4b81757a105aa7c5ac6148455eea66c3"
+    }
+    Frame {
+        msec: 3664
+        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
+    }
+    Frame {
+        msec: 3680
+        hash: "9b174cd9a87ff193ce646408946b310c"
+    }
+    Frame {
+        msec: 3696
+        hash: "89fa590b47ee77021dedf7938439ce69"
+    }
+    Frame {
+        msec: 3712
+        hash: "6e5680803184dfc76cbf1c2de804d6cc"
+    }
+    Frame {
+        msec: 3728
+        hash: "c6de6b9203673c77427ab84ce86daaf5"
+    }
+    Frame {
+        msec: 3744
+        hash: "198f8e912c19debd51f837627d1171e9"
+    }
+    Frame {
+        msec: 3760
+        hash: "3b380dcb6815698241f3dcccb52785c2"
+    }
+    Frame {
+        msec: 3776
+        hash: "254942e12b8a31420d2243b7e2529ae8"
+    }
+    Frame {
+        msec: 3792
+        hash: "ebf121910a5318c284f8e964d63aed40"
+    }
+    Frame {
+        msec: 3808
+        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
+    }
+    Frame {
+        msec: 3824
+        hash: "4a6596da390380dbafc1cdaceca1101e"
+    }
+    Frame {
+        msec: 3840
+        image: "cursorDelegate.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "c2be53ae5e2d5d3081df9af31426ec84"
+    }
+    Frame {
+        msec: 3872
+        hash: "52350ac5d10f8fe7571d12193b861d3f"
+    }
+    Frame {
+        msec: 3888
+        hash: "f286a35d7f4a022315f69a5db72da388"
+    }
+    Frame {
+        msec: 3904
+        hash: "aa329519eba4dad9589bff095528c535"
+    }
+    Frame {
+        msec: 3920
+        hash: "0beae60853afaaa0e7f7540fb50bcddf"
+    }
+    Frame {
+        msec: 3936
+        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
+    }
+    Frame {
+        msec: 3952
+        hash: "3655b992097b433071ec9dd69e086c70"
+    }
+    Frame {
+        msec: 3968
+        hash: "82cb92d7940d13deee97e4ccda9210fb"
+    }
+    Frame {
+        msec: 3984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4064
+        hash: "82cb92d7940d13deee97e4ccda9210fb"
+    }
+    Key {
+        type: 6
+        key: 16777232
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "3655b992097b433071ec9dd69e086c70"
+    }
+    Frame {
+        msec: 4096
+        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
+    }
+    Frame {
+        msec: 4112
+        hash: "0beae60853afaaa0e7f7540fb50bcddf"
+    }
+    Frame {
+        msec: 4128
+        hash: "aa329519eba4dad9589bff095528c535"
+    }
+    Key {
+        type: 7
+        key: 16777232
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4144
+        hash: "f286a35d7f4a022315f69a5db72da388"
+    }
+    Frame {
+        msec: 4160
+        hash: "52350ac5d10f8fe7571d12193b861d3f"
+    }
+    Frame {
+        msec: 4176
+        hash: "c2be53ae5e2d5d3081df9af31426ec84"
+    }
+    Frame {
+        msec: 4192
+        hash: "367391b2a124e2c818510567d0884d18"
+    }
+    Frame {
+        msec: 4208
+        hash: "4a6596da390380dbafc1cdaceca1101e"
+    }
+    Frame {
+        msec: 4224
+        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
+    }
+    Frame {
+        msec: 4240
+        hash: "ebf121910a5318c284f8e964d63aed40"
+    }
+    Frame {
+        msec: 4256
+        hash: "254942e12b8a31420d2243b7e2529ae8"
+    }
+    Frame {
+        msec: 4272
+        hash: "3b380dcb6815698241f3dcccb52785c2"
+    }
+    Frame {
+        msec: 4288
+        hash: "198f8e912c19debd51f837627d1171e9"
+    }
+    Frame {
+        msec: 4304
+        hash: "c6de6b9203673c77427ab84ce86daaf5"
+    }
+    Frame {
+        msec: 4320
+        hash: "6e5680803184dfc76cbf1c2de804d6cc"
+    }
+    Frame {
+        msec: 4336
+        hash: "89fa590b47ee77021dedf7938439ce69"
+    }
+    Frame {
+        msec: 4352
+        hash: "9b174cd9a87ff193ce646408946b310c"
+    }
+    Frame {
+        msec: 4368
+        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
+    }
+    Frame {
+        msec: 4384
+        hash: "4b81757a105aa7c5ac6148455eea66c3"
+    }
+    Frame {
+        msec: 4400
+        hash: "ceda37af96bd02baae218d3bfaed93f7"
+    }
+    Frame {
+        msec: 4416
+        hash: "8159bda651d95a320ac09aa6feb377a1"
+    }
+    Frame {
+        msec: 4432
+        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
+    }
+    Frame {
+        msec: 4448
+        hash: "bdfb42dc3879099e402784238c2cdddb"
+    }
+    Frame {
+        msec: 4464
+        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
+    }
+    Frame {
+        msec: 4480
+        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
+    }
+    Frame {
+        msec: 4496
+        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
+    }
+    Frame {
+        msec: 4512
+        hash: "3af60972e7d5d4320a549e5df52a1228"
+    }
+    Frame {
+        msec: 4528
+        hash: "438be260f19d04c9f98ed7dce1c7db40"
+    }
+    Frame {
+        msec: 4544
+        hash: "6032aada2c48092000ecb93e52656414"
+    }
+    Frame {
+        msec: 4560
+        hash: "d23bdd94019477d8378cde580d8765ad"
+    }
+    Frame {
+        msec: 4576
+        hash: "d74f8e44d47710714d4197809fffb622"
+    }
+    Key {
+        type: 6
+        key: 16777233
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4592
+        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
+    }
+    Frame {
+        msec: 4608
+        hash: "4e875ba8703b690a17e445f2b3810435"
+    }
+    Frame {
+        msec: 4624
+        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
+    }
+    Key {
+        type: 7
+        key: 16777233
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4640
+        hash: "a2ea272b45d8de225826d9381015ff2e"
+    }
+    Frame {
+        msec: 4656
+        hash: "5d112a3675ea4c010e7bc60e036d0262"
+    }
+    Frame {
+        msec: 4672
+        hash: "788d8962f311adf57a3acc876b0e8804"
+    }
+    Frame {
+        msec: 4688
+        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
+    }
+    Frame {
+        msec: 4704
+        hash: "48ec87bfc25471f6fa2d43f9db80b693"
+    }
+    Frame {
+        msec: 4720
+        hash: "4a646d76b706698a02cead560b1f8d57"
+    }
+    Frame {
+        msec: 4736
+        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
+    }
+    Frame {
+        msec: 4752
+        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
+    }
+    Frame {
+        msec: 4768
+        hash: "01e937e1fcc0331b2541fa32c3479a24"
+    }
+    Frame {
+        msec: 4784
+        hash: "702864de569e6a5648ee174d5ef891f8"
+    }
+    Frame {
+        msec: 4800
+        image: "cursorDelegate.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "76fb2e1ad33affe33c0887f04caa7396"
+    }
+    Frame {
+        msec: 4832
+        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+    }
+    Frame {
+        msec: 4848
+        hash: "d94054222fd37a350bd8abd592a332e3"
+    }
+    Frame {
+        msec: 4864
+        hash: "46fed264c233490b477e3a7c22183e18"
+    }
+    Frame {
+        msec: 4880
+        hash: "34bc703c915b49b0450ece1d18306df8"
+    }
+    Frame {
+        msec: 4896
+        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+    }
+    Frame {
+        msec: 4912
+        hash: "4f6dbc7b249c37390518cc263832b587"
+    }
+    Frame {
+        msec: 4928
+        hash: "df09fa2fd138d1b480eec82db3872d6f"
+    }
+    Frame {
+        msec: 4944
+        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+    }
+    Frame {
+        msec: 4960
+        hash: "35425ae3ccf3c8dcc1483479c57a3287"
+    }
+    Frame {
+        msec: 4976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 4992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 5072
+        hash: "35425ae3ccf3c8dcc1483479c57a3287"
+    }
+    Frame {
+        msec: 5088
+        hash: "b74cb1bfbb979a5e91853d9145d277d8"
+    }
+    Frame {
+        msec: 5104
+        hash: "df09fa2fd138d1b480eec82db3872d6f"
+    }
+    Frame {
+        msec: 5120
+        hash: "4f6dbc7b249c37390518cc263832b587"
+    }
+    Frame {
+        msec: 5136
+        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
+    }
+    Frame {
+        msec: 5152
+        hash: "34bc703c915b49b0450ece1d18306df8"
+    }
+    Frame {
+        msec: 5168
+        hash: "46fed264c233490b477e3a7c22183e18"
+    }
+    Frame {
+        msec: 5184
+        hash: "d94054222fd37a350bd8abd592a332e3"
+    }
+    Frame {
+        msec: 5200
+        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+    }
+    Frame {
+        msec: 5216
+        hash: "76fb2e1ad33affe33c0887f04caa7396"
+    }
+    Frame {
+        msec: 5232
+        hash: "0f500339c81ca3621d13910017b84b7b"
+    }
+    Frame {
+        msec: 5248
+        hash: "702864de569e6a5648ee174d5ef891f8"
+    }
+    Frame {
+        msec: 5264
+        hash: "01e937e1fcc0331b2541fa32c3479a24"
+    }
+    Frame {
+        msec: 5280
+        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
+    }
+    Frame {
+        msec: 5296
+        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
+    }
+    Frame {
+        msec: 5312
+        hash: "4a646d76b706698a02cead560b1f8d57"
+    }
+    Frame {
+        msec: 5328
+        hash: "48ec87bfc25471f6fa2d43f9db80b693"
+    }
+    Frame {
+        msec: 5344
+        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
+    }
+    Frame {
+        msec: 5360
+        hash: "788d8962f311adf57a3acc876b0e8804"
+    }
+    Frame {
+        msec: 5376
+        hash: "5d112a3675ea4c010e7bc60e036d0262"
+    }
+    Frame {
+        msec: 5392
+        hash: "a2ea272b45d8de225826d9381015ff2e"
+    }
+    Frame {
+        msec: 5408
+        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
+    }
+    Frame {
+        msec: 5424
+        hash: "4e875ba8703b690a17e445f2b3810435"
+    }
+    Frame {
+        msec: 5440
+        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
+    }
+    Frame {
+        msec: 5456
+        hash: "d74f8e44d47710714d4197809fffb622"
+    }
+    Frame {
+        msec: 5472
+        hash: "d23bdd94019477d8378cde580d8765ad"
+    }
+    Frame {
+        msec: 5488
+        hash: "6032aada2c48092000ecb93e52656414"
+    }
+    Frame {
+        msec: 5504
+        hash: "438be260f19d04c9f98ed7dce1c7db40"
+    }
+    Frame {
+        msec: 5520
+        hash: "3af60972e7d5d4320a549e5df52a1228"
+    }
+    Frame {
+        msec: 5536
+        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
+    }
+    Frame {
+        msec: 5552
+        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
+    }
+    Frame {
+        msec: 5568
+        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
+    }
+    Frame {
+        msec: 5584
+        hash: "bdfb42dc3879099e402784238c2cdddb"
+    }
+    Frame {
+        msec: 5600
+        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
+    }
+    Frame {
+        msec: 5616
+        hash: "8159bda651d95a320ac09aa6feb377a1"
+    }
+    Frame {
+        msec: 5632
+        hash: "ceda37af96bd02baae218d3bfaed93f7"
+    }
+    Frame {
+        msec: 5648
+        hash: "4b81757a105aa7c5ac6148455eea66c3"
+    }
+    Frame {
+        msec: 5664
+        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
+    }
+    Frame {
+        msec: 5680
+        hash: "9b174cd9a87ff193ce646408946b310c"
+    }
+    Frame {
+        msec: 5696
+        hash: "89fa590b47ee77021dedf7938439ce69"
+    }
+    Frame {
+        msec: 5712
+        hash: "6e5680803184dfc76cbf1c2de804d6cc"
+    }
+    Frame {
+        msec: 5728
+        hash: "c6de6b9203673c77427ab84ce86daaf5"
+    }
+    Frame {
+        msec: 5744
+        hash: "198f8e912c19debd51f837627d1171e9"
+    }
+    Frame {
+        msec: 5760
+        image: "cursorDelegate.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "254942e12b8a31420d2243b7e2529ae8"
+    }
+    Frame {
+        msec: 5792
+        hash: "ebf121910a5318c284f8e964d63aed40"
+    }
+    Frame {
+        msec: 5808
+        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
+    }
+    Frame {
+        msec: 5824
+        hash: "4a6596da390380dbafc1cdaceca1101e"
+    }
+    Frame {
+        msec: 5840
+        hash: "367391b2a124e2c818510567d0884d18"
+    }
+    Frame {
+        msec: 5856
+        hash: "c2be53ae5e2d5d3081df9af31426ec84"
+    }
+    Frame {
+        msec: 5872
+        hash: "52350ac5d10f8fe7571d12193b861d3f"
+    }
+    Frame {
+        msec: 5888
+        hash: "f286a35d7f4a022315f69a5db72da388"
+    }
+    Frame {
+        msec: 5904
+        hash: "aa329519eba4dad9589bff095528c535"
+    }
+    Frame {
+        msec: 5920
+        hash: "0beae60853afaaa0e7f7540fb50bcddf"
+    }
+    Frame {
+        msec: 5936
+        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
+    }
+    Frame {
+        msec: 5952
+        hash: "3655b992097b433071ec9dd69e086c70"
+    }
+    Frame {
+        msec: 5968
+        hash: "82cb92d7940d13deee97e4ccda9210fb"
+    }
+    Frame {
+        msec: 5984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 6064
+        hash: "82cb92d7940d13deee97e4ccda9210fb"
+    }
+    Frame {
+        msec: 6080
+        hash: "3655b992097b433071ec9dd69e086c70"
+    }
+    Frame {
+        msec: 6096
+        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
+    }
+    Frame {
+        msec: 6112
+        hash: "0beae60853afaaa0e7f7540fb50bcddf"
+    }
+    Frame {
+        msec: 6128
+        hash: "aa329519eba4dad9589bff095528c535"
+    }
+    Frame {
+        msec: 6144
+        hash: "f286a35d7f4a022315f69a5db72da388"
+    }
+    Frame {
+        msec: 6160
+        hash: "52350ac5d10f8fe7571d12193b861d3f"
+    }
+    Frame {
+        msec: 6176
+        hash: "c2be53ae5e2d5d3081df9af31426ec84"
+    }
+    Frame {
+        msec: 6192
+        hash: "367391b2a124e2c818510567d0884d18"
+    }
+    Frame {
+        msec: 6208
+        hash: "4a6596da390380dbafc1cdaceca1101e"
+    }
+    Frame {
+        msec: 6224
+        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
+    }
+    Frame {
+        msec: 6240
+        hash: "ebf121910a5318c284f8e964d63aed40"
+    }
+    Frame {
+        msec: 6256
+        hash: "254942e12b8a31420d2243b7e2529ae8"
+    }
+    Frame {
+        msec: 6272
+        hash: "3b380dcb6815698241f3dcccb52785c2"
+    }
+    Frame {
+        msec: 6288
+        hash: "198f8e912c19debd51f837627d1171e9"
+    }
+    Frame {
+        msec: 6304
+        hash: "c6de6b9203673c77427ab84ce86daaf5"
+    }
+    Frame {
+        msec: 6320
+        hash: "6e5680803184dfc76cbf1c2de804d6cc"
+    }
+    Frame {
+        msec: 6336
+        hash: "89fa590b47ee77021dedf7938439ce69"
+    }
+    Frame {
+        msec: 6352
+        hash: "9b174cd9a87ff193ce646408946b310c"
+    }
+    Frame {
+        msec: 6368
+        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
+    }
+    Frame {
+        msec: 6384
+        hash: "4b81757a105aa7c5ac6148455eea66c3"
+    }
+    Frame {
+        msec: 6400
+        hash: "ceda37af96bd02baae218d3bfaed93f7"
+    }
+    Frame {
+        msec: 6416
+        hash: "8159bda651d95a320ac09aa6feb377a1"
+    }
+    Frame {
+        msec: 6432
+        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
+    }
+    Frame {
+        msec: 6448
+        hash: "bdfb42dc3879099e402784238c2cdddb"
+    }
+    Frame {
+        msec: 6464
+        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
+    }
+    Frame {
+        msec: 6480
+        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
+    }
+    Frame {
+        msec: 6496
+        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
+    }
+    Frame {
+        msec: 6512
+        hash: "3af60972e7d5d4320a549e5df52a1228"
+    }
+    Frame {
+        msec: 6528
+        hash: "438be260f19d04c9f98ed7dce1c7db40"
+    }
+    Frame {
+        msec: 6544
+        hash: "6032aada2c48092000ecb93e52656414"
+    }
+    Frame {
+        msec: 6560
+        hash: "d23bdd94019477d8378cde580d8765ad"
+    }
+    Frame {
+        msec: 6576
+        hash: "d74f8e44d47710714d4197809fffb622"
+    }
+    Frame {
+        msec: 6592
+        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
+    }
+    Frame {
+        msec: 6608
+        hash: "4e875ba8703b690a17e445f2b3810435"
+    }
+    Frame {
+        msec: 6624
+        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
+    }
+    Frame {
+        msec: 6640
+        hash: "a2ea272b45d8de225826d9381015ff2e"
+    }
+    Frame {
+        msec: 6656
+        hash: "5d112a3675ea4c010e7bc60e036d0262"
+    }
+    Frame {
+        msec: 6672
+        hash: "788d8962f311adf57a3acc876b0e8804"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 271; y: 89
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6688
+        hash: "e2eb18af82c85ea78ba438163e922df3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 271; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6704
+        hash: "91b2695e4915238ae8610a64e279b0f4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 271; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 270; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6720
+        image: "cursorDelegate.6.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 269; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6736
+        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 268; y: 107
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6752
+        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 266; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6768
+        hash: "01e937e1fcc0331b2541fa32c3479a24"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 266; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6784
+        hash: "702864de569e6a5648ee174d5ef891f8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 265; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6800
+        hash: "0f500339c81ca3621d13910017b84b7b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 263; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 261; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6816
+        hash: "76fb2e1ad33affe33c0887f04caa7396"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 259; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6832
+        hash: "9dc01a69f2a6892d3c4203674c8bef72"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 256; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6848
+        hash: "58693aa1a3616310b7ae1e529c4c461a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 250; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 243; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6864
+        hash: "96afccd7ec697c9c10840f0effaa448d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 235; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6880
+        hash: "a00d49e2a9069b1be41f95f6ff4c0312"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 227; y: 121
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6896
+        hash: "a0ff4b93291fc12054d3989a20335a87"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 209; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6912
+        hash: "a86e1347bb25489547514955762d92d3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 200; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6928
+        hash: "e5cba3c1e41e38117508c84e894beb11"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 190; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6944
+        hash: "2560f53b8ac0a84fef895dbb8f0e393e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 181; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 172; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6960
+        hash: "c1b8bfc008319b793b6bd9345d34ccf5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 121
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 130; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 123; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 118; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 114; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 110; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7072
+        hash: "a9f2804ac7918971f237c4cfa6339c24"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 108; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7088
+        hash: "bc9c96855f048cb6c86d480e501322ab"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 107; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7104
+        hash: "706730602364bfb4d0193d1728a6d350"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 105; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7120
+        hash: "df80fe3e3ba35ab3fafca929b9101e13"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 104; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7136
+        hash: "aa8fa1baf61919004a4f14948826882e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 103; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 102; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7152
+        hash: "1829dfa3615d6ae430ba81a2df9a9e15"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7168
+        hash: "c4ea5c767192bbd3bfac58d07594016a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7184
+        hash: "319aede65b3473f28a4ca62a524e4a76"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7200
+        hash: "e1de653161e3348e083267c9082bc0f0"
+    }
+    Frame {
+        msec: 7216
+        hash: "de5f2d5147c600d2cb44072801c2338e"
+    }
+    Frame {
+        msec: 7232
+        hash: "6db41d704d2e28f36b206bdb317ee361"
+    }
+    Frame {
+        msec: 7248
+        hash: "a500b87efea241cdf8adf97ae86e10c3"
+    }
+    Frame {
+        msec: 7264
+        hash: "86c4eb0164a5b57eb22de4c9d58345f5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7280
+        hash: "2dbb1e3a1374b7c4aecd5a891be4573d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7296
+        hash: "07bcafdf5ca28a1416a20ed375ec3ea6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7312
+        hash: "e79def41bbf7e544d64cf19d74524d3a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 102; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 102; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7328
+        hash: "20aff98618d16c00dc9b76035e9523f5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 103; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7344
+        hash: "12b5e016bad990d1f2bf427ee8e3e6d9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 104; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 105; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7360
+        hash: "66a2ba3f9e005cd58aa50cfa0000cd15"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 107; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7376
+        hash: "a2e9e42e09dadbd0791f52bb96e0e0dc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 110; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7392
+        hash: "ac68396566ea85a157e944e601dd8d18"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 113; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 117; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7408
+        hash: "b9bfdebec8dd1a93de7ef2768b2542ba"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 124; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7424
+        hash: "2e0a4b960803770acb34ef56ccf2be35"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 131; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7440
+        hash: "df1643f0f8b7aa2dc080958822aeb3d0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7456
+        hash: "af8ce877d953727d37fd6f7e4962f45a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7472
+        hash: "b9de04c0d7532d67404a5a773d9fab99"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7488
+        hash: "7904312a7efe0b545070c5a5615011df"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7504
+        hash: "0069a8f088c83c6716bac15567a5b38d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7520
+        hash: "8c17c78d663097e275ed2f80d6479caf"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7536
+        hash: "9e8781569e07fca7def229b76189082d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 165; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7552
+        hash: "8dba2f259740d869bfa20205d2e14433"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7568
+        hash: "4e7ad066aadbad3f71a08962ba1379c0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 171; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7584
+        hash: "a5d1554a6fb311239acc077f01adc597"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7600
+        hash: "e91b45c430f7e10c2205af620350ddb6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 177; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 183; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7616
+        hash: "6c731f4dbdec441cd36b1e9727758d73"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 188; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7632
+        hash: "31634e757bdec45feb1f021e35746d65"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 193; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7648
+        hash: "846dcb42fa85719223eb19f7af3d0630"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 206; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7664
+        hash: "a5826c5d7d1b9161cc7fb76f59021fdd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 209; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7680
+        image: "cursorDelegate.7.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 211; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7696
+        hash: "bdfb9b949489744bc77905249eb647f9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7712
+        hash: "307d4fb47604c00e213f8d9616e0da13"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 213; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7728
+        hash: "74201a80a9032cb18b0c9e26bb67363f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 214; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7744
+        hash: "38ca918199552a525fb7f3a3773761d9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7760
+        hash: "d64c06c25229b3b64b779ca1bef7d2cb"
+    }
+    Frame {
+        msec: 7776
+        hash: "4ba0117db1ff431de20c06c79866d509"
+    }
+    Frame {
+        msec: 7792
+        hash: "ca56899ded0e5ea361aac24493793f58"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7808
+        hash: "ebce1d3b4d088278b6f36dac444c7ca6"
+    }
+    Frame {
+        msec: 7824
+        hash: "16c52065169bffc4648eda0226dba13a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7840
+        hash: "7a5a6a02f57545d9f2336ff18dd118d6"
+    }
+    Frame {
+        msec: 7856
+        hash: "328c8133c68fc2e86dc2193d1bee3259"
+    }
+    Frame {
+        msec: 7872
+        hash: "fcad1d2819e3cede6081b4dfbb5a4a65"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7888
+        hash: "85ff2968ba06443f300c9c0ef36c7054"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7904
+        hash: "871025c33fa769a790fc460a95b183ec"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7920
+        hash: "5b96f2673e0ccd2b198b9f99c65b4b12"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7936
+        hash: "5fc6f30a2dd019c4f2af056b51cfaa27"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 115
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 115
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7952
+        hash: "fc6bf3bcde1f89f0bff40e3e019aed33"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 219; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7968
+        hash: "703beec7b035080146131936da8c0fb3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 220; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7984
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 221; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 113
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8000
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 113
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8016
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 8032
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 8048
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8064
+        hash: "703beec7b035080146131936da8c0fb3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8080
+        hash: "fc6bf3bcde1f89f0bff40e3e019aed33"
+    }
+    Frame {
+        msec: 8096
+        hash: "5fc6f30a2dd019c4f2af056b51cfaa27"
+    }
+    Frame {
+        msec: 8112
+        hash: "5b96f2673e0ccd2b198b9f99c65b4b12"
+    }
+    Frame {
+        msec: 8128
+        hash: "871025c33fa769a790fc460a95b183ec"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 222; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8144
+        hash: "85ff2968ba06443f300c9c0ef36c7054"
+    }
+    Frame {
+        msec: 8160
+        hash: "fcad1d2819e3cede6081b4dfbb5a4a65"
+    }
+    Frame {
+        msec: 8176
+        hash: "328c8133c68fc2e86dc2193d1bee3259"
+    }
+    Frame {
+        msec: 8192
+        hash: "7a5a6a02f57545d9f2336ff18dd118d6"
+    }
+    Frame {
+        msec: 8208
+        hash: "16c52065169bffc4648eda0226dba13a"
+    }
+    Frame {
+        msec: 8224
+        hash: "ebce1d3b4d088278b6f36dac444c7ca6"
+    }
+    Frame {
+        msec: 8240
+        hash: "ca56899ded0e5ea361aac24493793f58"
+    }
+    Frame {
+        msec: 8256
+        hash: "4ba0117db1ff431de20c06c79866d509"
+    }
+    Frame {
+        msec: 8272
+        hash: "d64c06c25229b3b64b779ca1bef7d2cb"
+    }
+    Frame {
+        msec: 8288
+        hash: "38ca918199552a525fb7f3a3773761d9"
+    }
+    Frame {
+        msec: 8304
+        hash: "74201a80a9032cb18b0c9e26bb67363f"
+    }
+    Frame {
+        msec: 8320
+        hash: "307d4fb47604c00e213f8d9616e0da13"
+    }
+    Frame {
+        msec: 8336
+        hash: "9ad660f83ed62b964b676106f8aa7114"
+    }
+    Frame {
+        msec: 8352
+        hash: "457fc0df515f9813e98a6a86f4ab5231"
+    }
+    Frame {
+        msec: 8368
+        hash: "372cbc6ad4edc85319743627ced05671"
+    }
+    Frame {
+        msec: 8384
+        hash: "4e08beac6ee40acaa4de6963522d63d0"
+    }
+    Frame {
+        msec: 8400
+        hash: "5e790c2199a5e95fc17f8c0b49809cc9"
+    }
+    Frame {
+        msec: 8416
+        hash: "e36310e1866d4a95bac60084fa4aa2c1"
+    }
+    Frame {
+        msec: 8432
+        hash: "b7182b171316cc2db4de2b23de93dc41"
+    }
+    Frame {
+        msec: 8448
+        hash: "6aaf7f8e6e238973dfd4030eb146198b"
+    }
+    Frame {
+        msec: 8464
+        hash: "901ead3167e602dfe043c56c6c805d54"
+    }
+    Frame {
+        msec: 8480
+        hash: "5a97542680475b1382ad5b7c3f6fa96a"
+    }
+    Frame {
+        msec: 8496
+        hash: "fb34d93127f3c3ad0c7bacce0200753b"
+    }
+    Frame {
+        msec: 8512
+        hash: "993c97dc85e83e241538356e317b7767"
+    }
+    Frame {
+        msec: 8528
+        hash: "fb11a9edb3a613be5cb6949c76c5c715"
+    }
+    Frame {
+        msec: 8544
+        hash: "e68b7461f94adeaf330f67d36d0d3b3e"
+    }
+    Frame {
+        msec: 8560
+        hash: "7ed043cc027fdb467bd16847187cd48d"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 277; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8576
+        hash: "fefbb2f4671f8a36f9d2207ced8c0bfb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 277; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8592
+        hash: "1ab596339afc1f96136ee69c4b7688e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 276; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8608
+        hash: "e07f59d729cb2790296e8c7cd3d0d3c9"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 276; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8624
+        hash: "a7dccada1080487cab2d0a916676c5cb"
+    }
+    Frame {
+        msec: 8640
+        image: "cursorDelegate.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "9329d353c678d2bc61d08f63029d1b9b"
+    }
+    Frame {
+        msec: 8672
+        hash: "41263f56af7875028bb0c1e7eccf6f5d"
+    }
+    Frame {
+        msec: 8688
+        hash: "e2eb18af82c85ea78ba438163e922df3"
+    }
+    Frame {
+        msec: 8704
+        hash: "91b2695e4915238ae8610a64e279b0f4"
+    }
+    Frame {
+        msec: 8720
+        hash: "a97d90765f87b998eae6e9f603c61bff"
+    }
+    Frame {
+        msec: 8736
+        hash: "48969edab07b942480d93ac2d383ca24"
+    }
+    Frame {
+        msec: 8752
+        hash: "ecfd9d6d5873001f0c67806544a14983"
+    }
+    Frame {
+        msec: 8768
+        hash: "a3a3bc1e2523d3e7f961893bcd1dd3a8"
+    }
+    Frame {
+        msec: 8784
+        hash: "e337735ad0b42e60c54f16f3da7af3cf"
+    }
+    Frame {
+        msec: 8800
+        hash: "c39db081130d269f25dbcb1a19afb8d0"
+    }
+    Frame {
+        msec: 8816
+        hash: "c464d501e3935ec0f53eb780bd1a8289"
+    }
+    Frame {
+        msec: 8832
+        hash: "2be4fd986de19f6f76dfddec75b26804"
+    }
+    Frame {
+        msec: 8848
+        hash: "a1280e9fb86ca96b2340bb70aa774806"
+    }
+    Frame {
+        msec: 8864
+        hash: "cce4c17a387893478bcfa547f7561aba"
+    }
+    Frame {
+        msec: 8880
+        hash: "7094db3e04895d8d7f5f58caf0658592"
+    }
+    Frame {
+        msec: 8896
+        hash: "edb1f644757f9ba0a39549d77141c280"
+    }
+    Frame {
+        msec: 8912
+        hash: "cd381e847ecfce2db111bdf94a437cbc"
+    }
+    Frame {
+        msec: 8928
+        hash: "6a089603b641b683a744b88f2ebe82d1"
+    }
+    Frame {
+        msec: 8944
+        hash: "8c0e47f7c87a1a11cd733a453b31c780"
+    }
+    Frame {
+        msec: 8960
+        hash: "b53c892d62e787eb2565820d79739de6"
+    }
+    Frame {
+        msec: 8976
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 8992
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9008
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9024
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9040
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9056
+        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
+    }
+    Frame {
+        msec: 9072
+        hash: "b53c892d62e787eb2565820d79739de6"
+    }
+    Frame {
+        msec: 9088
+        hash: "8c0e47f7c87a1a11cd733a453b31c780"
+    }
+    Frame {
+        msec: 9104
+        hash: "6a089603b641b683a744b88f2ebe82d1"
+    }
+    Frame {
+        msec: 9120
+        hash: "cd381e847ecfce2db111bdf94a437cbc"
+    }
+    Frame {
+        msec: 9136
+        hash: "edb1f644757f9ba0a39549d77141c280"
+    }
+    Frame {
+        msec: 9152
+        hash: "7094db3e04895d8d7f5f58caf0658592"
+    }
+    Frame {
+        msec: 9168
+        hash: "cce4c17a387893478bcfa547f7561aba"
+    }
+    Frame {
+        msec: 9184
+        hash: "a1280e9fb86ca96b2340bb70aa774806"
+    }
+    Frame {
+        msec: 9200
+        hash: "2be4fd986de19f6f76dfddec75b26804"
+    }
+    Frame {
+        msec: 9216
+        hash: "c464d501e3935ec0f53eb780bd1a8289"
+    }
+    Frame {
+        msec: 9232
+        hash: "c39db081130d269f25dbcb1a19afb8d0"
+    }
+    Frame {
+        msec: 9248
+        hash: "e337735ad0b42e60c54f16f3da7af3cf"
+    }
+    Frame {
+        msec: 9264
+        hash: "a3a3bc1e2523d3e7f961893bcd1dd3a8"
+    }
+    Frame {
+        msec: 9280
+        hash: "ecfd9d6d5873001f0c67806544a14983"
+    }
+    Frame {
+        msec: 9296
+        hash: "48969edab07b942480d93ac2d383ca24"
+    }
+    Frame {
+        msec: 9312
+        hash: "a97d90765f87b998eae6e9f603c61bff"
+    }
+    Frame {
+        msec: 9328
+        hash: "91b2695e4915238ae8610a64e279b0f4"
+    }
+    Frame {
+        msec: 9344
+        hash: "e2eb18af82c85ea78ba438163e922df3"
+    }
+    Frame {
+        msec: 9360
+        hash: "41263f56af7875028bb0c1e7eccf6f5d"
+    }
+    Frame {
+        msec: 9376
+        hash: "9329d353c678d2bc61d08f63029d1b9b"
+    }
+    Frame {
+        msec: 9392
+        hash: "ac5939eb4379394fab829b307cbfe7ec"
+    }
+    Frame {
+        msec: 9408
+        hash: "a7dccada1080487cab2d0a916676c5cb"
+    }
+    Frame {
+        msec: 9424
+        hash: "e07f59d729cb2790296e8c7cd3d0d3c9"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.0.png
new file mode 100644
index 0000000..2b45a06
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.1.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.1.png
new file mode 100644
index 0000000..1f5bae0
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.2.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.2.png
new file mode 100644
index 0000000..cb2b5a4
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.3.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.3.png
new file mode 100644
index 0000000..aa24805
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.4.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.4.png
new file mode 100644
index 0000000..aa24805
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.qml
new file mode 100644
index 0000000..dd7b291
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.qml
@@ -0,0 +1,1043 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 32
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 48
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 64
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 80
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 96
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 112
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 128
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 144
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 160
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 176
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 192
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 208
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 224
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 240
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 256
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 272
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 288
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 304
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 320
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 336
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 352
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Key {
+        type: 6
+        key: 74
+        modifiers: 33554432
+        text: "4a"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 368
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 384
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 400
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 416
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 432
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Key {
+        type: 7
+        key: 74
+        modifiers: 33554432
+        text: "4a"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 464
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 480
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 496
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 512
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 528
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 560
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 576
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 592
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 608
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 624
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 640
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 656
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 672
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 688
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 704
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 720
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 736
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 752
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 768
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 784
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 800
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 816
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 832
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 848
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Key {
+        type: 6
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 864
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 880
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 896
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Key {
+        type: 7
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 912
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 928
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 944
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 960
+        image: "echoMode.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Key {
+        type: 6
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 992
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1008
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1024
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1040
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Key {
+        type: 7
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1056
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1072
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1088
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1104
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1120
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1136
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1152
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1168
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1184
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1200
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1216
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1232
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Key {
+        type: 6
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1248
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Frame {
+        msec: 1264
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Frame {
+        msec: 1280
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Key {
+        type: 7
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1296
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Frame {
+        msec: 1312
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Frame {
+        msec: 1328
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1344
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1360
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1376
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1392
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1408
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1424
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1440
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1456
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1472
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1488
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1504
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1520
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1536
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1552
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1568
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1584
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1600
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1616
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1632
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1648
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1664
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1680
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1696
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1712
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1728
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1744
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1760
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1776
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1792
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1808
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1824
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1840
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1856
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Key {
+        type: 6
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1872
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1888
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1904
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1920
+        image: "echoMode.1.png"
+    }
+    Key {
+        type: 7
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1936
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1952
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1968
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1984
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 2000
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 2016
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2032
+        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
+    }
+    Frame {
+        msec: 2048
+        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
+    }
+    Frame {
+        msec: 2080
+        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
+    }
+    Key {
+        type: 6
+        key: 86
+        modifiers: 0
+        text: "76"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2096
+        hash: "c82441813af6ff577687f29f6a09da38"
+    }
+    Frame {
+        msec: 2112
+        hash: "c82441813af6ff577687f29f6a09da38"
+    }
+    Frame {
+        msec: 2128
+        hash: "c82441813af6ff577687f29f6a09da38"
+    }
+    Frame {
+        msec: 2144
+        hash: "c82441813af6ff577687f29f6a09da38"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 86
+        modifiers: 0
+        text: "76"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2176
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2192
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2208
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2224
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2240
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2256
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2272
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2288
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2304
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2320
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2336
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Key {
+        type: 6
+        key: 77
+        modifiers: 0
+        text: "6d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2352
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2368
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2384
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2400
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2416
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2432
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Key {
+        type: 7
+        key: 77
+        modifiers: 0
+        text: "6d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2464
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2480
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2496
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2512
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2528
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2544
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2576
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2592
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2608
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2624
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2640
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2656
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2672
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2688
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2704
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2720
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2736
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2752
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2768
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2784
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2800
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2816
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2832
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2848
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2864
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2880
+        image: "echoMode.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2912
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2928
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2944
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2960
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2976
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2992
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 3008
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 3024
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 3040
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 3056
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.0.png
new file mode 100644
index 0000000..87c2e07
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.qml
new file mode 100644
index 0000000..e29ac56
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.qml
@@ -0,0 +1,107 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 32
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 48
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 64
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 80
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 96
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 112
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 128
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 144
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 160
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 176
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 192
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 208
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 224
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 240
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 256
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 272
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 288
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 304
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 320
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 336
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 352
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 368
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 384
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 400
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.0.png
new file mode 100644
index 0000000..f04f65e
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.1.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.1.png
new file mode 100644
index 0000000..46a703a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.2.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.2.png
new file mode 100644
index 0000000..e4a3877
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.3.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.3.png
new file mode 100644
index 0000000..9ef842a
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.4.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.4.png
new file mode 100644
index 0000000..706e2b3
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.5.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.5.png
new file mode 100644
index 0000000..bcc86cc
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.5.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.6.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.6.png
new file mode 100644
index 0000000..51ddd44
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.6.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.7.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.7.png
new file mode 100644
index 0000000..0a2fdda
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.7.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.8.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.8.png
new file mode 100644
index 0000000..9c88bff
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.8.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.qml
new file mode 100644
index 0000000..df2dd38
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.qml
@@ -0,0 +1,3379 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 32
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 48
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 64
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 80
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 96
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 112
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 128
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 144
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 160
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 176
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 192
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 208
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 224
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 240
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 256
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 272
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 288
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 304
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 320
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 336
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 352
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 368
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 384
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 400
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 416
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 432
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 448
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 464
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 480
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 496
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Frame {
+        msec: 512
+        hash: "cd442d6dc4d155f54ae24f03d080f50c"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 528
+        hash: "56db24ad686d34e75a2d184e5b1da2a9"
+    }
+    Frame {
+        msec: 544
+        hash: "c3487c7c7dcd392e7eacb74045dd4143"
+    }
+    Frame {
+        msec: 560
+        hash: "70aedcda6c93875d18ee111d8a19549e"
+    }
+    Frame {
+        msec: 576
+        hash: "47ad557d366536ad457f6866241dba93"
+    }
+    Frame {
+        msec: 592
+        hash: "e715c2a82745829665226df78598b819"
+    }
+    Frame {
+        msec: 608
+        hash: "2ff4bd5602c34c020162f0503d625049"
+    }
+    Frame {
+        msec: 624
+        hash: "a494b3b25a23daa858034ebccce0d1c7"
+    }
+    Frame {
+        msec: 640
+        hash: "59d2fb8e21802d256b11730b31919fb3"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 656
+        hash: "5e09b95292d6d0afe76a5015b0ccebf1"
+    }
+    Frame {
+        msec: 672
+        hash: "de3c911aec7e42557ece4bdcf02ce562"
+    }
+    Frame {
+        msec: 688
+        hash: "680f51f63c4b11a247a668eb7bbd2b62"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 704
+        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
+    }
+    Frame {
+        msec: 720
+        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
+    }
+    Frame {
+        msec: 736
+        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
+    }
+    Frame {
+        msec: 752
+        hash: "b4e273b6415e3951eab2f831100b0bb2"
+    }
+    Frame {
+        msec: 768
+        hash: "fd3fd655785c4e3c470f742451e3470f"
+    }
+    Frame {
+        msec: 784
+        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
+    }
+    Frame {
+        msec: 800
+        hash: "2a55b52db02d97963d382c9862307384"
+    }
+    Frame {
+        msec: 816
+        hash: "c6c90915393fc7cb0aaa464caefbadb0"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 832
+        hash: "4f097223462c8f619188b0b0c2ecb080"
+    }
+    Frame {
+        msec: 848
+        hash: "243be452ff0798538defc6a14cb8a08b"
+    }
+    Frame {
+        msec: 864
+        hash: "e5472ed9a8a43a64a0fea12540619940"
+    }
+    Frame {
+        msec: 880
+        hash: "90b0f5f1aa7b5f066fb1266ea63254eb"
+    }
+    Frame {
+        msec: 896
+        hash: "97d5f9fe02e4bd06ec30a7805945f167"
+    }
+    Frame {
+        msec: 912
+        hash: "eb381a1e2ad945e4cfa540c137edbda7"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 928
+        hash: "75252ff61682fd32117f0759ebe4b6a1"
+    }
+    Frame {
+        msec: 944
+        hash: "d724bdacc59bce29d0a42d72479be0b6"
+    }
+    Frame {
+        msec: 960
+        image: "cursorDelegate.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 992
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 1008
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 1024
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 1040
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 1056
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1072
+        hash: "d7703c18b69f485bba3abd655100b50d"
+    }
+    Frame {
+        msec: 1088
+        hash: "d724bdacc59bce29d0a42d72479be0b6"
+    }
+    Frame {
+        msec: 1104
+        hash: "75252ff61682fd32117f0759ebe4b6a1"
+    }
+    Frame {
+        msec: 1120
+        hash: "eb381a1e2ad945e4cfa540c137edbda7"
+    }
+    Frame {
+        msec: 1136
+        hash: "97d5f9fe02e4bd06ec30a7805945f167"
+    }
+    Frame {
+        msec: 1152
+        hash: "90b0f5f1aa7b5f066fb1266ea63254eb"
+    }
+    Frame {
+        msec: 1168
+        hash: "e5472ed9a8a43a64a0fea12540619940"
+    }
+    Frame {
+        msec: 1184
+        hash: "243be452ff0798538defc6a14cb8a08b"
+    }
+    Frame {
+        msec: 1200
+        hash: "4f097223462c8f619188b0b0c2ecb080"
+    }
+    Frame {
+        msec: 1216
+        hash: "e7346d8f223684143a0940def878b874"
+    }
+    Frame {
+        msec: 1232
+        hash: "512b9746ae4482557b8cef9f99905954"
+    }
+    Frame {
+        msec: 1248
+        hash: "4220dde85eb1c027366efd0798927e8d"
+    }
+    Frame {
+        msec: 1264
+        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
+    }
+    Frame {
+        msec: 1280
+        hash: "de09380dd57c58ae99fbdba169a19975"
+    }
+    Frame {
+        msec: 1296
+        hash: "bfc1b03df244839a012e8302dc07764f"
+    }
+    Frame {
+        msec: 1312
+        hash: "d5f220e5337837ec0d07eb118e2f948e"
+    }
+    Frame {
+        msec: 1328
+        hash: "7640c78a286b0b7bdf2ec9117ceced4a"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1344
+        hash: "c659fd76d632aac26d396809b57826dd"
+    }
+    Frame {
+        msec: 1360
+        hash: "b5ba335eca37416970dcab53157d7ae6"
+    }
+    Frame {
+        msec: 1376
+        hash: "df498dac81260d8867221612ff3b7619"
+    }
+    Frame {
+        msec: 1392
+        hash: "578c3a682278f4ead0ca894f029dbfb7"
+    }
+    Frame {
+        msec: 1408
+        hash: "5fe9b2365b091047df1b18bcaa5b1bb4"
+    }
+    Frame {
+        msec: 1424
+        hash: "c513b8df83f1d1cc3c05769c41741653"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1440
+        hash: "ee70a2002f52a3f4a9fa32db668db3d0"
+    }
+    Frame {
+        msec: 1456
+        hash: "3f299da38c2f3f9057df987d5d339e1f"
+    }
+    Frame {
+        msec: 1472
+        hash: "55f6adbd00910e5f39977162cfe8dcc5"
+    }
+    Frame {
+        msec: 1488
+        hash: "151fb386855954ae5143046cab314ddf"
+    }
+    Frame {
+        msec: 1504
+        hash: "d9ec76b2c07077b5b6d6c3777d116164"
+    }
+    Frame {
+        msec: 1520
+        hash: "ef3ba6c27d9b28de829360985505c185"
+    }
+    Frame {
+        msec: 1536
+        hash: "8eafd8f9aea08c172f40de3c4f2b3b59"
+    }
+    Frame {
+        msec: 1552
+        hash: "2329d5b8182794bb8375f0de204c9b16"
+    }
+    Frame {
+        msec: 1568
+        hash: "e6b25cf1a8c6858f6937e649b1315955"
+    }
+    Frame {
+        msec: 1584
+        hash: "3aeedff600509a138b0de31e10bbdd7b"
+    }
+    Frame {
+        msec: 1600
+        hash: "0636dee0ddc551ce8ecf3a6c6300b020"
+    }
+    Frame {
+        msec: 1616
+        hash: "77f5b0dfdf0c631cf863be60bd09db9c"
+    }
+    Frame {
+        msec: 1632
+        hash: "2e86762371ae933546e8b2154c78f74b"
+    }
+    Frame {
+        msec: 1648
+        hash: "1051ec29f94c31b257a5b1c922f8e93f"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1664
+        hash: "5c60da876c8cc9fa334905b5fc7c2a3d"
+    }
+    Frame {
+        msec: 1680
+        hash: "c0b0cddd62853ac3499b7ada200d206a"
+    }
+    Frame {
+        msec: 1696
+        hash: "5bd588d64917f942e0f5ea1553acbf63"
+    }
+    Frame {
+        msec: 1712
+        hash: "bc5744ef5c81b7d5b365bf977f909be5"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 100663296
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1728
+        hash: "892a1a8a5a9c198e5ae04cc19f0e1d0c"
+    }
+    Frame {
+        msec: 1744
+        hash: "708799d2d834302c659958701e217b37"
+    }
+    Frame {
+        msec: 1760
+        hash: "360d75bcc178bcfd4f93741d653fd821"
+    }
+    Frame {
+        msec: 1776
+        hash: "1cfe03528b1cd84e69efc02b9677c748"
+    }
+    Frame {
+        msec: 1792
+        hash: "6f45d7c37f1fb90138011b2af24aaf1e"
+    }
+    Frame {
+        msec: 1808
+        hash: "ba164375e7ac18cf2e1e613498158fbf"
+    }
+    Frame {
+        msec: 1824
+        hash: "14052b9da9e17a6f06fed05d4ed82b9c"
+    }
+    Frame {
+        msec: 1840
+        hash: "aac15ce22bfe38f44a46e4644913f144"
+    }
+    Frame {
+        msec: 1856
+        hash: "c63aa02ba29ea18334b188185690948d"
+    }
+    Frame {
+        msec: 1872
+        hash: "11ed187ccd4c2221f166851c08b6b467"
+    }
+    Frame {
+        msec: 1888
+        hash: "3543bd4e538981d4bb2c2313c9663a53"
+    }
+    Frame {
+        msec: 1904
+        hash: "a05fa618b094bde2b54b730f513bcabe"
+    }
+    Frame {
+        msec: 1920
+        image: "cursorDelegate.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "52fc4a32526a74f9a04d8795c7a47c6e"
+    }
+    Frame {
+        msec: 1952
+        hash: "17623e1b0ffca3b7736ce930f078dbe0"
+    }
+    Frame {
+        msec: 1968
+        hash: "75226dac5691627851d83c7370d7603c"
+    }
+    Key {
+        type: 7
+        key: 16777249
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1984
+        hash: "9e506ad52020e2913e80a13a7f3ac797"
+    }
+    Frame {
+        msec: 2000
+        hash: "9e506ad52020e2913e80a13a7f3ac797"
+    }
+    Frame {
+        msec: 2016
+        hash: "9e506ad52020e2913e80a13a7f3ac797"
+    }
+    Frame {
+        msec: 2032
+        hash: "9e506ad52020e2913e80a13a7f3ac797"
+    }
+    Frame {
+        msec: 2048
+        hash: "9e506ad52020e2913e80a13a7f3ac797"
+    }
+    Frame {
+        msec: 2064
+        hash: "75226dac5691627851d83c7370d7603c"
+    }
+    Frame {
+        msec: 2080
+        hash: "17623e1b0ffca3b7736ce930f078dbe0"
+    }
+    Frame {
+        msec: 2096
+        hash: "52fc4a32526a74f9a04d8795c7a47c6e"
+    }
+    Frame {
+        msec: 2112
+        hash: "89f2d3b4441faee557b8d5f44e1e1e18"
+    }
+    Frame {
+        msec: 2128
+        hash: "a05fa618b094bde2b54b730f513bcabe"
+    }
+    Frame {
+        msec: 2144
+        hash: "3543bd4e538981d4bb2c2313c9663a53"
+    }
+    Frame {
+        msec: 2160
+        hash: "11ed187ccd4c2221f166851c08b6b467"
+    }
+    Frame {
+        msec: 2176
+        hash: "c63aa02ba29ea18334b188185690948d"
+    }
+    Frame {
+        msec: 2192
+        hash: "aac15ce22bfe38f44a46e4644913f144"
+    }
+    Frame {
+        msec: 2208
+        hash: "14052b9da9e17a6f06fed05d4ed82b9c"
+    }
+    Frame {
+        msec: 2224
+        hash: "ba164375e7ac18cf2e1e613498158fbf"
+    }
+    Frame {
+        msec: 2240
+        hash: "6f45d7c37f1fb90138011b2af24aaf1e"
+    }
+    Frame {
+        msec: 2256
+        hash: "1cfe03528b1cd84e69efc02b9677c748"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2272
+        hash: "360d75bcc178bcfd4f93741d653fd821"
+    }
+    Frame {
+        msec: 2288
+        hash: "708799d2d834302c659958701e217b37"
+    }
+    Frame {
+        msec: 2304
+        hash: "892a1a8a5a9c198e5ae04cc19f0e1d0c"
+    }
+    Frame {
+        msec: 2320
+        hash: "bc5744ef5c81b7d5b365bf977f909be5"
+    }
+    Frame {
+        msec: 2336
+        hash: "5bd588d64917f942e0f5ea1553acbf63"
+    }
+    Frame {
+        msec: 2352
+        hash: "c0b0cddd62853ac3499b7ada200d206a"
+    }
+    Key {
+        type: 6
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2368
+        hash: "5c60da876c8cc9fa334905b5fc7c2a3d"
+    }
+    Frame {
+        msec: 2384
+        hash: "136a103a893991b97ec09f373c68c5b9"
+    }
+    Frame {
+        msec: 2400
+        hash: "b2181ce0165ee060e1a8b713027011a9"
+    }
+    Frame {
+        msec: 2416
+        hash: "e4836bbaf1834658e3ec4bf54a619b53"
+    }
+    Frame {
+        msec: 2432
+        hash: "3072492f5f72427c8d45cf3c5d3ff919"
+    }
+    Frame {
+        msec: 2448
+        hash: "d897cba896239c77df4f7adb93ad5def"
+    }
+    Frame {
+        msec: 2464
+        hash: "ec9867a95de6d6f4c0f92af567d73771"
+    }
+    Key {
+        type: 7
+        key: 16777236
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2480
+        hash: "06b72e3180eb946622e4592de0fa6f91"
+    }
+    Frame {
+        msec: 2496
+        hash: "33f109c026eaefed113cc12db5912a19"
+    }
+    Frame {
+        msec: 2512
+        hash: "ce72c4b4470394dc1c4efd4d9de9907f"
+    }
+    Frame {
+        msec: 2528
+        hash: "64ac1105ea10ae1f6401e8421731c606"
+    }
+    Frame {
+        msec: 2544
+        hash: "ef977bd74941d3506b8f3ee4b1f587ad"
+    }
+    Frame {
+        msec: 2560
+        hash: "9278de91e10788ae5a80399ff5372460"
+    }
+    Frame {
+        msec: 2576
+        hash: "ddaaf945a5f714b856ed5155f4e502b2"
+    }
+    Frame {
+        msec: 2592
+        hash: "f6bb6ba15d996345df04825da71c2cf3"
+    }
+    Frame {
+        msec: 2608
+        hash: "466c78a5a5052b39b113adeda761da6c"
+    }
+    Frame {
+        msec: 2624
+        hash: "db650537d773e0d8a737a7bf5f408a5e"
+    }
+    Frame {
+        msec: 2640
+        hash: "64be9f85869f19defada296343895a2b"
+    }
+    Frame {
+        msec: 2656
+        hash: "5ac6d9751bfadbc7aa064ca0b4d78b2b"
+    }
+    Frame {
+        msec: 2672
+        hash: "a088b351dcc6fc3a8d29256f3a2410c3"
+    }
+    Frame {
+        msec: 2688
+        hash: "a16a77170a6c969042024fa0868da12d"
+    }
+    Frame {
+        msec: 2704
+        hash: "3a2509d0d3a314d2ed72f811f4af741e"
+    }
+    Frame {
+        msec: 2720
+        hash: "484db4e1954048cad7eea48bfea08267"
+    }
+    Frame {
+        msec: 2736
+        hash: "ad0f84634c5f99ab62ab6d12ad8d8c6a"
+    }
+    Frame {
+        msec: 2752
+        hash: "d99b590307f6910963257a1c41c50120"
+    }
+    Key {
+        type: 6
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2768
+        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
+    }
+    Frame {
+        msec: 2784
+        hash: "4220dde85eb1c027366efd0798927e8d"
+    }
+    Frame {
+        msec: 2800
+        hash: "512b9746ae4482557b8cef9f99905954"
+    }
+    Frame {
+        msec: 2816
+        hash: "e7346d8f223684143a0940def878b874"
+    }
+    Frame {
+        msec: 2832
+        hash: "4f097223462c8f619188b0b0c2ecb080"
+    }
+    Frame {
+        msec: 2848
+        hash: "243be452ff0798538defc6a14cb8a08b"
+    }
+    Frame {
+        msec: 2864
+        hash: "e5472ed9a8a43a64a0fea12540619940"
+    }
+    Frame {
+        msec: 2880
+        image: "cursorDelegate.2.png"
+    }
+    Key {
+        type: 7
+        key: 16777234
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2896
+        hash: "97d5f9fe02e4bd06ec30a7805945f167"
+    }
+    Frame {
+        msec: 2912
+        hash: "eb381a1e2ad945e4cfa540c137edbda7"
+    }
+    Frame {
+        msec: 2928
+        hash: "75252ff61682fd32117f0759ebe4b6a1"
+    }
+    Frame {
+        msec: 2944
+        hash: "d724bdacc59bce29d0a42d72479be0b6"
+    }
+    Frame {
+        msec: 2960
+        hash: "d7703c18b69f485bba3abd655100b50d"
+    }
+    Frame {
+        msec: 2976
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 2992
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 3008
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 3024
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 3040
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 3056
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 3072
+        hash: "d7703c18b69f485bba3abd655100b50d"
+    }
+    Frame {
+        msec: 3088
+        hash: "d724bdacc59bce29d0a42d72479be0b6"
+    }
+    Frame {
+        msec: 3104
+        hash: "75252ff61682fd32117f0759ebe4b6a1"
+    }
+    Frame {
+        msec: 3120
+        hash: "eb381a1e2ad945e4cfa540c137edbda7"
+    }
+    Frame {
+        msec: 3136
+        hash: "97d5f9fe02e4bd06ec30a7805945f167"
+    }
+    Frame {
+        msec: 3152
+        hash: "90b0f5f1aa7b5f066fb1266ea63254eb"
+    }
+    Frame {
+        msec: 3168
+        hash: "e5472ed9a8a43a64a0fea12540619940"
+    }
+    Frame {
+        msec: 3184
+        hash: "243be452ff0798538defc6a14cb8a08b"
+    }
+    Frame {
+        msec: 3200
+        hash: "4f097223462c8f619188b0b0c2ecb080"
+    }
+    Frame {
+        msec: 3216
+        hash: "e7346d8f223684143a0940def878b874"
+    }
+    Frame {
+        msec: 3232
+        hash: "512b9746ae4482557b8cef9f99905954"
+    }
+    Frame {
+        msec: 3248
+        hash: "4220dde85eb1c027366efd0798927e8d"
+    }
+    Frame {
+        msec: 3264
+        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
+    }
+    Frame {
+        msec: 3280
+        hash: "de09380dd57c58ae99fbdba169a19975"
+    }
+    Frame {
+        msec: 3296
+        hash: "bfc1b03df244839a012e8302dc07764f"
+    }
+    Frame {
+        msec: 3312
+        hash: "d5f220e5337837ec0d07eb118e2f948e"
+    }
+    Frame {
+        msec: 3328
+        hash: "7640c78a286b0b7bdf2ec9117ceced4a"
+    }
+    Frame {
+        msec: 3344
+        hash: "680f51f63c4b11a247a668eb7bbd2b62"
+    }
+    Frame {
+        msec: 3360
+        hash: "de3c911aec7e42557ece4bdcf02ce562"
+    }
+    Frame {
+        msec: 3376
+        hash: "5e09b95292d6d0afe76a5015b0ccebf1"
+    }
+    Frame {
+        msec: 3392
+        hash: "59d2fb8e21802d256b11730b31919fb3"
+    }
+    Frame {
+        msec: 3408
+        hash: "a494b3b25a23daa858034ebccce0d1c7"
+    }
+    Frame {
+        msec: 3424
+        hash: "2ff4bd5602c34c020162f0503d625049"
+    }
+    Frame {
+        msec: 3440
+        hash: "e715c2a82745829665226df78598b819"
+    }
+    Frame {
+        msec: 3456
+        hash: "47ad557d366536ad457f6866241dba93"
+    }
+    Frame {
+        msec: 3472
+        hash: "70aedcda6c93875d18ee111d8a19549e"
+    }
+    Frame {
+        msec: 3488
+        hash: "c3487c7c7dcd392e7eacb74045dd4143"
+    }
+    Frame {
+        msec: 3504
+        hash: "56db24ad686d34e75a2d184e5b1da2a9"
+    }
+    Frame {
+        msec: 3520
+        hash: "436349a8371597a74404428983cd894c"
+    }
+    Frame {
+        msec: 3536
+        hash: "6e1bb59ec518614a0414092f4939d5ad"
+    }
+    Frame {
+        msec: 3552
+        hash: "f0aa02772df579b921e0c68f794d2327"
+    }
+    Frame {
+        msec: 3568
+        hash: "09ea1462da333c2aeaaa01e9e4f8d54b"
+    }
+    Frame {
+        msec: 3584
+        hash: "46d23d8472ce833591dcff548a644288"
+    }
+    Frame {
+        msec: 3600
+        hash: "a7566d5d35a89078bb378bf3f6c78e13"
+    }
+    Frame {
+        msec: 3616
+        hash: "4c5f7155b20e34a5627387cdc466e890"
+    }
+    Frame {
+        msec: 3632
+        hash: "e9b98922327c412db0116a56283d3c86"
+    }
+    Frame {
+        msec: 3648
+        hash: "29ffede9c16c34ead5f291e69e388084"
+    }
+    Frame {
+        msec: 3664
+        hash: "16958b8f0b1dbdc15333d99bd1349124"
+    }
+    Frame {
+        msec: 3680
+        hash: "3408f8d6e4d6ef34d4d5a0cb51090c4c"
+    }
+    Frame {
+        msec: 3696
+        hash: "b32b099b260789266d0a3c0edd61c04e"
+    }
+    Frame {
+        msec: 3712
+        hash: "4dd3617b25e8b95cf2ec31db8b3bb80f"
+    }
+    Frame {
+        msec: 3728
+        hash: "46b42a08c59909f067810d1984f7a04e"
+    }
+    Frame {
+        msec: 3744
+        hash: "ab8c505601c381e8a44fa7b6eea6579d"
+    }
+    Frame {
+        msec: 3760
+        hash: "73f56e6e1d2cbf3f559d679eb2c15529"
+    }
+    Frame {
+        msec: 3776
+        hash: "b230c56da330823d7d7f7e081c304acb"
+    }
+    Frame {
+        msec: 3792
+        hash: "9f3cbd0023dbd78ba4951c26f71c7d5d"
+    }
+    Frame {
+        msec: 3808
+        hash: "9e9b11cf2695dd02c1ab175ff194f491"
+    }
+    Frame {
+        msec: 3824
+        hash: "8fa6f8eb5deb0ab95c3454e5812ada1d"
+    }
+    Frame {
+        msec: 3840
+        image: "cursorDelegate.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "0b6b24ae8df7c3aa9abb48edb6619d8a"
+    }
+    Frame {
+        msec: 3872
+        hash: "45805295dd2482fdf21ac8c9bfe47869"
+    }
+    Frame {
+        msec: 3888
+        hash: "4893cd31a730d786f075edfd0afc0ad9"
+    }
+    Frame {
+        msec: 3904
+        hash: "a3fbfe732568f5cf6e63809fd7e0c32e"
+    }
+    Frame {
+        msec: 3920
+        hash: "21d3327710d51f714e84b5a28df13e4f"
+    }
+    Frame {
+        msec: 3936
+        hash: "ea065ab48f27f60505eab36debee3faa"
+    }
+    Frame {
+        msec: 3952
+        hash: "fe4c2e368d2110374b7ba9e30f330713"
+    }
+    Frame {
+        msec: 3968
+        hash: "723281f6c1a3f03cf170e4de93fa4dbf"
+    }
+    Frame {
+        msec: 3984
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 4000
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 4016
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 4032
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 4048
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 4064
+        hash: "723281f6c1a3f03cf170e4de93fa4dbf"
+    }
+    Key {
+        type: 6
+        key: 16777232
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "c779e46a89c3c9d0f8234a3192175b60"
+    }
+    Frame {
+        msec: 4096
+        hash: "f223cfeba468e161943b24ac960196de"
+    }
+    Frame {
+        msec: 4112
+        hash: "dd2f21f063d055edc23c874380149067"
+    }
+    Frame {
+        msec: 4128
+        hash: "af580b32b67117eb062bbcefe262c719"
+    }
+    Key {
+        type: 7
+        key: 16777232
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4144
+        hash: "991f76d483e033024932790f85bb3c5d"
+    }
+    Frame {
+        msec: 4160
+        hash: "3d8aa66ab9533d14a468f0869b457033"
+    }
+    Frame {
+        msec: 4176
+        hash: "a5540bd5d088ab1201b5f22b32579d7c"
+    }
+    Frame {
+        msec: 4192
+        hash: "e0844f30578fef2cdcee4e4ff28ab7cf"
+    }
+    Frame {
+        msec: 4208
+        hash: "710e7022b65a9b3fd3a7372bf7f37c7a"
+    }
+    Frame {
+        msec: 4224
+        hash: "db553c856b11db7e6feb38b9d562a804"
+    }
+    Frame {
+        msec: 4240
+        hash: "6ba56c4ec6e903b0d82235c230ed78cb"
+    }
+    Frame {
+        msec: 4256
+        hash: "786de35a11c3fc1a228392195f509c28"
+    }
+    Frame {
+        msec: 4272
+        hash: "cc6307597cea821b63391fc9bdbe038b"
+    }
+    Frame {
+        msec: 4288
+        hash: "73d49e4d0bef103e11820d888bef0368"
+    }
+    Frame {
+        msec: 4304
+        hash: "b2ed6ebf66252463326c2f220b3992fa"
+    }
+    Frame {
+        msec: 4320
+        hash: "129b5bc6d55621e2366fc0d80f105df2"
+    }
+    Frame {
+        msec: 4336
+        hash: "ae8fe55fa9b497cd6eff18a517c301d8"
+    }
+    Frame {
+        msec: 4352
+        hash: "535210bd848a20db2966b06278198e07"
+    }
+    Frame {
+        msec: 4368
+        hash: "1f4ea7783b5c60bfc424c73cea07a3a0"
+    }
+    Frame {
+        msec: 4384
+        hash: "5b61f2e9308c4de2864bb7cf133ce545"
+    }
+    Frame {
+        msec: 4400
+        hash: "f641f87e9556ecfd24f0f0a772295e52"
+    }
+    Frame {
+        msec: 4416
+        hash: "36f28574c0b042647bc064d75afa9fbc"
+    }
+    Frame {
+        msec: 4432
+        hash: "dba2ca165b8ab35113b8ec127b204ae9"
+    }
+    Frame {
+        msec: 4448
+        hash: "56324b95f63eabba718df588159f374d"
+    }
+    Frame {
+        msec: 4464
+        hash: "af65d67fef3c743e31acca03716040c4"
+    }
+    Frame {
+        msec: 4480
+        hash: "105481b5becd127af4c28961d900148c"
+    }
+    Frame {
+        msec: 4496
+        hash: "4859d6bf9c456e52fd463e4c2f68d7f6"
+    }
+    Frame {
+        msec: 4512
+        hash: "21c0958bd3c6a1056bb062165c9bc18b"
+    }
+    Frame {
+        msec: 4528
+        hash: "287d258a79f45c26c92c69cce6b1a2f3"
+    }
+    Frame {
+        msec: 4544
+        hash: "deabc5c7dd111adcb253eb833f118764"
+    }
+    Frame {
+        msec: 4560
+        hash: "4bad7380f6b645c551edbe06ff67cac9"
+    }
+    Frame {
+        msec: 4576
+        hash: "67fc71c16d0b9405c35590bafdc5ea40"
+    }
+    Key {
+        type: 6
+        key: 16777233
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4592
+        hash: "7aed794eae2f0c65342f190ed4d4f889"
+    }
+    Frame {
+        msec: 4608
+        hash: "23edee3af8f1904558863d37c520555a"
+    }
+    Frame {
+        msec: 4624
+        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
+    }
+    Key {
+        type: 7
+        key: 16777233
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4640
+        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
+    }
+    Frame {
+        msec: 4656
+        hash: "e189dc0dae9457a6af5082c6ccf451b6"
+    }
+    Frame {
+        msec: 4672
+        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
+    }
+    Frame {
+        msec: 4688
+        hash: "5a11ec8a0485a018ebe317e01136e4a5"
+    }
+    Frame {
+        msec: 4704
+        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
+    }
+    Frame {
+        msec: 4720
+        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
+    }
+    Frame {
+        msec: 4736
+        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
+    }
+    Frame {
+        msec: 4752
+        hash: "b4e273b6415e3951eab2f831100b0bb2"
+    }
+    Frame {
+        msec: 4768
+        hash: "fd3fd655785c4e3c470f742451e3470f"
+    }
+    Frame {
+        msec: 4784
+        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
+    }
+    Frame {
+        msec: 4800
+        image: "cursorDelegate.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "c6c90915393fc7cb0aaa464caefbadb0"
+    }
+    Frame {
+        msec: 4832
+        hash: "36b65658073ac2687dbd88ec7a408a98"
+    }
+    Frame {
+        msec: 4848
+        hash: "84e165f9f2c55c5c51a260b11ca195c2"
+    }
+    Frame {
+        msec: 4864
+        hash: "c11cfcfda6f161d058a3d9e93349b578"
+    }
+    Frame {
+        msec: 4880
+        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
+    }
+    Frame {
+        msec: 4896
+        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
+    }
+    Frame {
+        msec: 4912
+        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
+    }
+    Frame {
+        msec: 4928
+        hash: "3cc8791e419986e1e913d4e153243fb2"
+    }
+    Frame {
+        msec: 4944
+        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
+    }
+    Frame {
+        msec: 4960
+        hash: "d3ae969e538c642d82662d08ef05964e"
+    }
+    Frame {
+        msec: 4976
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 4992
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 5008
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 5024
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 5040
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 5056
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 5072
+        hash: "d3ae969e538c642d82662d08ef05964e"
+    }
+    Frame {
+        msec: 5088
+        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
+    }
+    Frame {
+        msec: 5104
+        hash: "3cc8791e419986e1e913d4e153243fb2"
+    }
+    Frame {
+        msec: 5120
+        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
+    }
+    Frame {
+        msec: 5136
+        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
+    }
+    Frame {
+        msec: 5152
+        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
+    }
+    Frame {
+        msec: 5168
+        hash: "c11cfcfda6f161d058a3d9e93349b578"
+    }
+    Frame {
+        msec: 5184
+        hash: "84e165f9f2c55c5c51a260b11ca195c2"
+    }
+    Frame {
+        msec: 5200
+        hash: "36b65658073ac2687dbd88ec7a408a98"
+    }
+    Frame {
+        msec: 5216
+        hash: "c6c90915393fc7cb0aaa464caefbadb0"
+    }
+    Frame {
+        msec: 5232
+        hash: "2a55b52db02d97963d382c9862307384"
+    }
+    Frame {
+        msec: 5248
+        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
+    }
+    Frame {
+        msec: 5264
+        hash: "fd3fd655785c4e3c470f742451e3470f"
+    }
+    Frame {
+        msec: 5280
+        hash: "b4e273b6415e3951eab2f831100b0bb2"
+    }
+    Frame {
+        msec: 5296
+        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
+    }
+    Frame {
+        msec: 5312
+        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
+    }
+    Frame {
+        msec: 5328
+        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
+    }
+    Frame {
+        msec: 5344
+        hash: "5a11ec8a0485a018ebe317e01136e4a5"
+    }
+    Frame {
+        msec: 5360
+        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
+    }
+    Frame {
+        msec: 5376
+        hash: "e189dc0dae9457a6af5082c6ccf451b6"
+    }
+    Frame {
+        msec: 5392
+        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
+    }
+    Frame {
+        msec: 5408
+        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
+    }
+    Frame {
+        msec: 5424
+        hash: "23edee3af8f1904558863d37c520555a"
+    }
+    Frame {
+        msec: 5440
+        hash: "7aed794eae2f0c65342f190ed4d4f889"
+    }
+    Frame {
+        msec: 5456
+        hash: "0fa12b48c08266f50e77506e4136dd56"
+    }
+    Frame {
+        msec: 5472
+        hash: "679ee2b26a118ab53a84fa116de09edf"
+    }
+    Frame {
+        msec: 5488
+        hash: "b9dcdd88fba70636cbcae160edcc0136"
+    }
+    Frame {
+        msec: 5504
+        hash: "90af75eeef63ae67e9f6ff1a61d7cca3"
+    }
+    Frame {
+        msec: 5520
+        hash: "29d80ae32451c24b655c4d1fd01d3aa1"
+    }
+    Frame {
+        msec: 5536
+        hash: "c73fe137644cbc006d0b5274b72faa46"
+    }
+    Frame {
+        msec: 5552
+        hash: "8a4d76ae60f5d720a382cced2f6a2b5e"
+    }
+    Frame {
+        msec: 5568
+        hash: "a1efa0d424d568d338c6db9fc095c2fb"
+    }
+    Frame {
+        msec: 5584
+        hash: "205cafcabb29b78a6db3dcaf44a74ab6"
+    }
+    Frame {
+        msec: 5600
+        hash: "7507a3d2158d4cc68454c85922526871"
+    }
+    Frame {
+        msec: 5616
+        hash: "7135a6a7999e82cb81e39228805332ee"
+    }
+    Frame {
+        msec: 5632
+        hash: "ac2b714b5f32d2b911f31690d7082dc1"
+    }
+    Frame {
+        msec: 5648
+        hash: "5cb1ae6d86aafdf11284480c81b939dc"
+    }
+    Frame {
+        msec: 5664
+        hash: "ac705840cc94eb4af7a52d62649d0157"
+    }
+    Frame {
+        msec: 5680
+        hash: "8c2ebcd80e26ac7b9d25be486f54c4ce"
+    }
+    Frame {
+        msec: 5696
+        hash: "12b84aa02dbbab3592d3eb3cb6884b41"
+    }
+    Frame {
+        msec: 5712
+        hash: "675043ddde6ed65a3ec4ed093be1e760"
+    }
+    Frame {
+        msec: 5728
+        hash: "478126aeef5ddae9c0a77d08294cf3f2"
+    }
+    Frame {
+        msec: 5744
+        hash: "0b43af73d91a500ccdf27b4347b9bc47"
+    }
+    Frame {
+        msec: 5760
+        image: "cursorDelegate.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "a6d8708d08bedf0cab5230d6f2936936"
+    }
+    Frame {
+        msec: 5792
+        hash: "02e0646024aeef6f01b7541b15267baa"
+    }
+    Frame {
+        msec: 5808
+        hash: "da6717c94b46ad7a647c445c06314b0d"
+    }
+    Frame {
+        msec: 5824
+        hash: "2ed12d49d72884160ebbf6b6d0e15a9d"
+    }
+    Frame {
+        msec: 5840
+        hash: "a1fbc3333b7f742a8336a6fcbad156c9"
+    }
+    Frame {
+        msec: 5856
+        hash: "25cac33299d58cdd7775e8b75410085e"
+    }
+    Frame {
+        msec: 5872
+        hash: "5d81833eb342f632945c0571e18cb1f9"
+    }
+    Frame {
+        msec: 5888
+        hash: "23f6f2a7d971494af43a0fb97dbf8fb5"
+    }
+    Frame {
+        msec: 5904
+        hash: "216b70d02a4685dc07258454bb4e7c85"
+    }
+    Frame {
+        msec: 5920
+        hash: "1e06742af58d6e63facdc599c46e11b1"
+    }
+    Frame {
+        msec: 5936
+        hash: "00f8ac72d3794ed8d66db987402ecde0"
+    }
+    Frame {
+        msec: 5952
+        hash: "42ab5f162acba94f563823f5be1e37d2"
+    }
+    Frame {
+        msec: 5968
+        hash: "3272b97fdc54eb9f3590e7bbe4ac457d"
+    }
+    Frame {
+        msec: 5984
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 6000
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 6016
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 6032
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 6048
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 6064
+        hash: "3272b97fdc54eb9f3590e7bbe4ac457d"
+    }
+    Frame {
+        msec: 6080
+        hash: "42ab5f162acba94f563823f5be1e37d2"
+    }
+    Frame {
+        msec: 6096
+        hash: "00f8ac72d3794ed8d66db987402ecde0"
+    }
+    Frame {
+        msec: 6112
+        hash: "1e06742af58d6e63facdc599c46e11b1"
+    }
+    Frame {
+        msec: 6128
+        hash: "216b70d02a4685dc07258454bb4e7c85"
+    }
+    Frame {
+        msec: 6144
+        hash: "23f6f2a7d971494af43a0fb97dbf8fb5"
+    }
+    Frame {
+        msec: 6160
+        hash: "5d81833eb342f632945c0571e18cb1f9"
+    }
+    Frame {
+        msec: 6176
+        hash: "25cac33299d58cdd7775e8b75410085e"
+    }
+    Frame {
+        msec: 6192
+        hash: "a1fbc3333b7f742a8336a6fcbad156c9"
+    }
+    Frame {
+        msec: 6208
+        hash: "2ed12d49d72884160ebbf6b6d0e15a9d"
+    }
+    Frame {
+        msec: 6224
+        hash: "da6717c94b46ad7a647c445c06314b0d"
+    }
+    Frame {
+        msec: 6240
+        hash: "02e0646024aeef6f01b7541b15267baa"
+    }
+    Frame {
+        msec: 6256
+        hash: "a6d8708d08bedf0cab5230d6f2936936"
+    }
+    Frame {
+        msec: 6272
+        hash: "68d459091a85f24ece39a207e395039b"
+    }
+    Frame {
+        msec: 6288
+        hash: "0b43af73d91a500ccdf27b4347b9bc47"
+    }
+    Frame {
+        msec: 6304
+        hash: "478126aeef5ddae9c0a77d08294cf3f2"
+    }
+    Frame {
+        msec: 6320
+        hash: "675043ddde6ed65a3ec4ed093be1e760"
+    }
+    Frame {
+        msec: 6336
+        hash: "12b84aa02dbbab3592d3eb3cb6884b41"
+    }
+    Frame {
+        msec: 6352
+        hash: "8c2ebcd80e26ac7b9d25be486f54c4ce"
+    }
+    Frame {
+        msec: 6368
+        hash: "ac705840cc94eb4af7a52d62649d0157"
+    }
+    Frame {
+        msec: 6384
+        hash: "5cb1ae6d86aafdf11284480c81b939dc"
+    }
+    Frame {
+        msec: 6400
+        hash: "ac2b714b5f32d2b911f31690d7082dc1"
+    }
+    Frame {
+        msec: 6416
+        hash: "7135a6a7999e82cb81e39228805332ee"
+    }
+    Frame {
+        msec: 6432
+        hash: "7507a3d2158d4cc68454c85922526871"
+    }
+    Frame {
+        msec: 6448
+        hash: "205cafcabb29b78a6db3dcaf44a74ab6"
+    }
+    Frame {
+        msec: 6464
+        hash: "a1efa0d424d568d338c6db9fc095c2fb"
+    }
+    Frame {
+        msec: 6480
+        hash: "8a4d76ae60f5d720a382cced2f6a2b5e"
+    }
+    Frame {
+        msec: 6496
+        hash: "c73fe137644cbc006d0b5274b72faa46"
+    }
+    Frame {
+        msec: 6512
+        hash: "29d80ae32451c24b655c4d1fd01d3aa1"
+    }
+    Frame {
+        msec: 6528
+        hash: "90af75eeef63ae67e9f6ff1a61d7cca3"
+    }
+    Frame {
+        msec: 6544
+        hash: "b9dcdd88fba70636cbcae160edcc0136"
+    }
+    Frame {
+        msec: 6560
+        hash: "679ee2b26a118ab53a84fa116de09edf"
+    }
+    Frame {
+        msec: 6576
+        hash: "0fa12b48c08266f50e77506e4136dd56"
+    }
+    Frame {
+        msec: 6592
+        hash: "7aed794eae2f0c65342f190ed4d4f889"
+    }
+    Frame {
+        msec: 6608
+        hash: "23edee3af8f1904558863d37c520555a"
+    }
+    Frame {
+        msec: 6624
+        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
+    }
+    Frame {
+        msec: 6640
+        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
+    }
+    Frame {
+        msec: 6656
+        hash: "e189dc0dae9457a6af5082c6ccf451b6"
+    }
+    Frame {
+        msec: 6672
+        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 271; y: 89
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6688
+        hash: "680f51f63c4b11a247a668eb7bbd2b62"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 271; y: 92
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6704
+        hash: "7640c78a286b0b7bdf2ec9117ceced4a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 271; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 270; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6720
+        image: "cursorDelegate.6.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 269; y: 103
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6736
+        hash: "bfc1b03df244839a012e8302dc07764f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 268; y: 107
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6752
+        hash: "de09380dd57c58ae99fbdba169a19975"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 266; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6768
+        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 266; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6784
+        hash: "4220dde85eb1c027366efd0798927e8d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 265; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6800
+        hash: "512b9746ae4482557b8cef9f99905954"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 263; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 261; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6816
+        hash: "e7346d8f223684143a0940def878b874"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 259; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6832
+        hash: "7e7382302681cd29a2c6959a3a704660"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 256; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6848
+        hash: "ef8f7dfdd4e70100ecaecca4055d8f52"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 250; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 243; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6864
+        hash: "f5cacabb78b88c31af1a1b1e6f60069b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 235; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6880
+        hash: "b016ef2306b0a721df86b6916e7953e4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 227; y: 121
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6896
+        hash: "a78e9b0b93569b77b0659c771336971a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 209; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6912
+        hash: "b957ab07bcbaeffca963d9148130a965"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 200; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6928
+        hash: "140bc4b078bac52d6903bdfdfc35a94c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 190; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6944
+        hash: "047c3a7403ae88cceb7fc875793d1ed8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 181; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 172; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6960
+        hash: "03d48446aaf94450a3a9a8f1e956493f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6976
+        hash: "6672e47aa6a975fbd82d2fe5bc99bbaf"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 126
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6992
+        hash: "3bc73489d06e446d4c96117756a59227"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 121
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7008
+        hash: "aed995a61df4a1c189ef2962000d02de"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 130; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7024
+        hash: "aed995a61df4a1c189ef2962000d02de"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 123; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7040
+        hash: "74f0bbe92a23146fbdbd365edd5741c8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 118; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 114; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7056
+        hash: "74f0bbe92a23146fbdbd365edd5741c8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 110; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7072
+        hash: "6456208c6367687b8dc701791eccd7d4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 108; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7088
+        hash: "376b59dc6e00a51bc9f2d4cfa2718e57"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 107; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7104
+        hash: "fb7bc3401f70ce6eee131c9c7510e1fe"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 105; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7120
+        hash: "675a419f0cd8351d6b2a65daf7d2707a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 104; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7136
+        hash: "2f7951abac64e0f10d3b66d04966b6e9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 103; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 102; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7152
+        hash: "1f8daa78c58ae11ec105bd87681c1762"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7168
+        hash: "23ab196ed43219c26d94431698f6ac8d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7184
+        hash: "9581e2695f4818e063ec032cb5bb6b7f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7200
+        hash: "6752cd7c5383e0ccc9b08f79db6ac310"
+    }
+    Frame {
+        msec: 7216
+        hash: "51f5675e0fb1410c5a8ec03a86b42681"
+    }
+    Frame {
+        msec: 7232
+        hash: "c3c23213b2649b5ccabd8e420a251e00"
+    }
+    Frame {
+        msec: 7248
+        hash: "02ceab31171fe983a10e862b53aea16f"
+    }
+    Frame {
+        msec: 7264
+        hash: "8a774dda9a1bc16bd270724e570daf20"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7280
+        hash: "2b6b892cebfcce14a9db485fecf16703"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7296
+        hash: "8b8e6d3362f018cbd9b487f03cfb7a22"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7312
+        hash: "a8477a9429633384073618cc60841e6c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 102; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 102; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7328
+        hash: "59558c6665b73f02809259e039b4423a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 103; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7344
+        hash: "93540071bab8a970a929d209f628970e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 104; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 105; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7360
+        hash: "78cdb0a05583150ea33040d32d95de47"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 107; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7376
+        hash: "4b1ee34985d3f5b8dd4355678ad39af4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 110; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7392
+        hash: "5484e7699c388eabf0311de49706397f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 113; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 117; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7408
+        hash: "dee6c2380f398323002ebb43a38d27e8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 124; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7424
+        hash: "d66a27728e7fd3c616842613a034c5a0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 131; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7440
+        hash: "5f851161f99fcf5b67cbe008a3faf411"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7456
+        hash: "013e949285cfa9edb34ab14e26753230"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7472
+        hash: "5b50acdcbd49969bcce2cfab6f9af380"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7488
+        hash: "d4aeb24211007cfc01512d289ae7aa01"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7504
+        hash: "6f1b7e12bbf54586e9a48989145f3274"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7520
+        hash: "0e09c7468bc03770c6cc7f0fba1ee9c0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7536
+        hash: "0fc4522bbf1a2e72002eb0a3c7224e1f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 165; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7552
+        hash: "91727292aaa314bf263c618a577b7f74"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7568
+        hash: "a78fb2545d11c521a50a10fd2d1700a7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 171; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7584
+        hash: "c207a291b47628921125acd4b8ed5ea8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7600
+        hash: "9a8e3df504ba36e82c51d71a3f5ce268"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 177; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 183; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7616
+        hash: "8cd9da94db91da50ae457d41866a32ba"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 188; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7632
+        hash: "9e52b6fdc3ce4ad9c5986e47ffa762fc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 193; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7648
+        hash: "a1aff55bffb76bd4e2ac9ee482a03978"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 206; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7664
+        hash: "ba52431b72683cfbf0cc795a2407630e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 209; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7680
+        image: "cursorDelegate.7.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 211; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7696
+        hash: "eb5a19fbfbdceef233ed3c86c782817c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 212; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7712
+        hash: "7c8f3f2e96fa6a63867cb716061c8c77"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 213; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7728
+        hash: "96b0007f857aa19b41d184a7c7931f69"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 214; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7744
+        hash: "96201712b9ffbd9bfbebb5a5b7e23aba"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7760
+        hash: "d75e13a7715d5c329a47fdb818dfdbe5"
+    }
+    Frame {
+        msec: 7776
+        hash: "c8fa0c2d9e6aa1f3a33e76a31534359d"
+    }
+    Frame {
+        msec: 7792
+        hash: "03b11cc517f84c58a681906fdda98347"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 215; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7808
+        hash: "74cdf8af5d56216ad422951a56661536"
+    }
+    Frame {
+        msec: 7824
+        hash: "fcac2575aad872eada547508f312f09c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 118
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7840
+        hash: "7d76aec1f29d2d6745585be8ef113be5"
+    }
+    Frame {
+        msec: 7856
+        hash: "2b4fe4f39433671a9bc440efa1c589a8"
+    }
+    Frame {
+        msec: 7872
+        hash: "55a166f920e76173e14121d848a11aa0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7888
+        hash: "f764df8ecd68161d3529800e922254f4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7904
+        hash: "749caf21947e915b163f72e6fd190032"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7920
+        hash: "c350910df8ae4fea573a20d334fd3401"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 116
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7936
+        hash: "d177da450f1d380a6d2406e2393b9582"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 115
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 218; y: 115
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7952
+        hash: "bf3da78d7cac19daf2d5150b77840b1e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 219; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7968
+        hash: "22e337b0b81b18045a205355da6981ad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 220; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7984
+        hash: "66c66927d2fc590fc43c146a403c1ccb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 221; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 113
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8000
+        hash: "66c66927d2fc590fc43c146a403c1ccb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 113
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8016
+        hash: "66c66927d2fc590fc43c146a403c1ccb"
+    }
+    Frame {
+        msec: 8032
+        hash: "66c66927d2fc590fc43c146a403c1ccb"
+    }
+    Frame {
+        msec: 8048
+        hash: "66c66927d2fc590fc43c146a403c1ccb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8064
+        hash: "22e337b0b81b18045a205355da6981ad"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8080
+        hash: "bf3da78d7cac19daf2d5150b77840b1e"
+    }
+    Frame {
+        msec: 8096
+        hash: "d177da450f1d380a6d2406e2393b9582"
+    }
+    Frame {
+        msec: 8112
+        hash: "c350910df8ae4fea573a20d334fd3401"
+    }
+    Frame {
+        msec: 8128
+        hash: "749caf21947e915b163f72e6fd190032"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 222; y: 114
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8144
+        hash: "f764df8ecd68161d3529800e922254f4"
+    }
+    Frame {
+        msec: 8160
+        hash: "55a166f920e76173e14121d848a11aa0"
+    }
+    Frame {
+        msec: 8176
+        hash: "2b4fe4f39433671a9bc440efa1c589a8"
+    }
+    Frame {
+        msec: 8192
+        hash: "7d76aec1f29d2d6745585be8ef113be5"
+    }
+    Frame {
+        msec: 8208
+        hash: "fcac2575aad872eada547508f312f09c"
+    }
+    Frame {
+        msec: 8224
+        hash: "74cdf8af5d56216ad422951a56661536"
+    }
+    Frame {
+        msec: 8240
+        hash: "03b11cc517f84c58a681906fdda98347"
+    }
+    Frame {
+        msec: 8256
+        hash: "c8fa0c2d9e6aa1f3a33e76a31534359d"
+    }
+    Frame {
+        msec: 8272
+        hash: "d75e13a7715d5c329a47fdb818dfdbe5"
+    }
+    Frame {
+        msec: 8288
+        hash: "96201712b9ffbd9bfbebb5a5b7e23aba"
+    }
+    Frame {
+        msec: 8304
+        hash: "96b0007f857aa19b41d184a7c7931f69"
+    }
+    Frame {
+        msec: 8320
+        hash: "bff5b731de7c93fa0cdcefbf99beeb5e"
+    }
+    Frame {
+        msec: 8336
+        hash: "ce76704964873be1bc6a324d8a3381be"
+    }
+    Frame {
+        msec: 8352
+        hash: "a31b4f2a3defc968098029328de9352d"
+    }
+    Frame {
+        msec: 8368
+        hash: "295e3f40a511bd30e1c6599ead93619a"
+    }
+    Frame {
+        msec: 8384
+        hash: "3cd74da8b04de8ec7446490dea0e4e6c"
+    }
+    Frame {
+        msec: 8400
+        hash: "78a7db5a316609136d1b873d20d5dd3e"
+    }
+    Frame {
+        msec: 8416
+        hash: "0f176fb11bfe26f872ef7103011df9e6"
+    }
+    Frame {
+        msec: 8432
+        hash: "47866013e79bc77607e0c40bf8457bed"
+    }
+    Frame {
+        msec: 8448
+        hash: "5f35467db5c5e0baf5caff90b97e2d0c"
+    }
+    Frame {
+        msec: 8464
+        hash: "fefa89763cc1ad8323fdf37b1f5f63d3"
+    }
+    Frame {
+        msec: 8480
+        hash: "b9823f88fa51944075ce6dedd695f097"
+    }
+    Frame {
+        msec: 8496
+        hash: "72521de21fcc57d6ccf16350b0df8eee"
+    }
+    Frame {
+        msec: 8512
+        hash: "fcd591a2e56ba5efa95b315b7bd10532"
+    }
+    Frame {
+        msec: 8528
+        hash: "5d437d59995741030e0975829712f85d"
+    }
+    Frame {
+        msec: 8544
+        hash: "e7189d174b181985b6aef10b8642726f"
+    }
+    Frame {
+        msec: 8560
+        hash: "cefadbae14e573f6c83d07ffc3a5152e"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 277; y: 97
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8576
+        hash: "0fa12b48c08266f50e77506e4136dd56"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 277; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8592
+        hash: "7aed794eae2f0c65342f190ed4d4f889"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 276; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8608
+        hash: "23edee3af8f1904558863d37c520555a"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 276; y: 98
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8624
+        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
+    }
+    Frame {
+        msec: 8640
+        image: "cursorDelegate.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "e189dc0dae9457a6af5082c6ccf451b6"
+    }
+    Frame {
+        msec: 8672
+        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
+    }
+    Frame {
+        msec: 8688
+        hash: "5a11ec8a0485a018ebe317e01136e4a5"
+    }
+    Frame {
+        msec: 8704
+        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
+    }
+    Frame {
+        msec: 8720
+        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
+    }
+    Frame {
+        msec: 8736
+        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
+    }
+    Frame {
+        msec: 8752
+        hash: "b4e273b6415e3951eab2f831100b0bb2"
+    }
+    Frame {
+        msec: 8768
+        hash: "fd3fd655785c4e3c470f742451e3470f"
+    }
+    Frame {
+        msec: 8784
+        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
+    }
+    Frame {
+        msec: 8800
+        hash: "2a55b52db02d97963d382c9862307384"
+    }
+    Frame {
+        msec: 8816
+        hash: "c6c90915393fc7cb0aaa464caefbadb0"
+    }
+    Frame {
+        msec: 8832
+        hash: "36b65658073ac2687dbd88ec7a408a98"
+    }
+    Frame {
+        msec: 8848
+        hash: "84e165f9f2c55c5c51a260b11ca195c2"
+    }
+    Frame {
+        msec: 8864
+        hash: "c11cfcfda6f161d058a3d9e93349b578"
+    }
+    Frame {
+        msec: 8880
+        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
+    }
+    Frame {
+        msec: 8896
+        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
+    }
+    Frame {
+        msec: 8912
+        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
+    }
+    Frame {
+        msec: 8928
+        hash: "3cc8791e419986e1e913d4e153243fb2"
+    }
+    Frame {
+        msec: 8944
+        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
+    }
+    Frame {
+        msec: 8960
+        hash: "d3ae969e538c642d82662d08ef05964e"
+    }
+    Frame {
+        msec: 8976
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 8992
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 9008
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 9024
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 9040
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 9056
+        hash: "e3948b393a3778066a90197b31c71e51"
+    }
+    Frame {
+        msec: 9072
+        hash: "d3ae969e538c642d82662d08ef05964e"
+    }
+    Frame {
+        msec: 9088
+        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
+    }
+    Frame {
+        msec: 9104
+        hash: "3cc8791e419986e1e913d4e153243fb2"
+    }
+    Frame {
+        msec: 9120
+        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
+    }
+    Frame {
+        msec: 9136
+        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
+    }
+    Frame {
+        msec: 9152
+        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
+    }
+    Frame {
+        msec: 9168
+        hash: "c11cfcfda6f161d058a3d9e93349b578"
+    }
+    Frame {
+        msec: 9184
+        hash: "84e165f9f2c55c5c51a260b11ca195c2"
+    }
+    Frame {
+        msec: 9200
+        hash: "36b65658073ac2687dbd88ec7a408a98"
+    }
+    Frame {
+        msec: 9216
+        hash: "c6c90915393fc7cb0aaa464caefbadb0"
+    }
+    Frame {
+        msec: 9232
+        hash: "2a55b52db02d97963d382c9862307384"
+    }
+    Frame {
+        msec: 9248
+        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
+    }
+    Frame {
+        msec: 9264
+        hash: "fd3fd655785c4e3c470f742451e3470f"
+    }
+    Frame {
+        msec: 9280
+        hash: "b4e273b6415e3951eab2f831100b0bb2"
+    }
+    Frame {
+        msec: 9296
+        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
+    }
+    Frame {
+        msec: 9312
+        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
+    }
+    Frame {
+        msec: 9328
+        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
+    }
+    Frame {
+        msec: 9344
+        hash: "5a11ec8a0485a018ebe317e01136e4a5"
+    }
+    Frame {
+        msec: 9360
+        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
+    }
+    Frame {
+        msec: 9376
+        hash: "e189dc0dae9457a6af5082c6ccf451b6"
+    }
+    Frame {
+        msec: 9392
+        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
+    }
+    Frame {
+        msec: 9408
+        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
+    }
+    Frame {
+        msec: 9424
+        hash: "23edee3af8f1904558863d37c520555a"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.0.png
new file mode 100644
index 0000000..2b45a06
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.1.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.1.png
new file mode 100644
index 0000000..1f5bae0
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.1.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.2.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.2.png
new file mode 100644
index 0000000..cb2b5a4
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.2.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.3.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.3.png
new file mode 100644
index 0000000..aa24805
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.3.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.4.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.4.png
new file mode 100644
index 0000000..aa24805
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.4.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.qml
new file mode 100644
index 0000000..873a86d
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.qml
@@ -0,0 +1,1043 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 32
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Key {
+        type: 6
+        key: 16777248
+        modifiers: 33554432
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 48
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 64
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 80
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 96
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 112
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 128
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 144
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 160
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 176
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 192
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 208
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 224
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 240
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 256
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 272
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 288
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 304
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 320
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 336
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Frame {
+        msec: 352
+        hash: "b73bd9c2fef8812591fff9f43b73da13"
+    }
+    Key {
+        type: 6
+        key: 74
+        modifiers: 33554432
+        text: "4a"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 368
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 384
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 400
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 416
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 432
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Key {
+        type: 7
+        key: 74
+        modifiers: 33554432
+        text: "4a"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 448
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 464
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 480
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 496
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 512
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 528
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Key {
+        type: 7
+        key: 16777248
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 544
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 560
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 576
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 592
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 608
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 624
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 640
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 656
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 672
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Frame {
+        msec: 688
+        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 704
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 720
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 736
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 752
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 768
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 784
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 800
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 816
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 832
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Frame {
+        msec: 848
+        hash: "fbc09d695e0b47aae6e977c13f535bfd"
+    }
+    Key {
+        type: 6
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 864
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 880
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 896
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Key {
+        type: 7
+        key: 67
+        modifiers: 0
+        text: "63"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 912
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 928
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 944
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Frame {
+        msec: 960
+        image: "echoMode.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "a4b81c526a5bf8902fde9b8721980977"
+    }
+    Key {
+        type: 6
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 992
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1008
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1024
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1040
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Key {
+        type: 7
+        key: 75
+        modifiers: 0
+        text: "6b"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1056
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1072
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1088
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1104
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1120
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1136
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1152
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1168
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1184
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1200
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1216
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Frame {
+        msec: 1232
+        hash: "d072aebc2314a149a856634786b208a0"
+    }
+    Key {
+        type: 6
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1248
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Frame {
+        msec: 1264
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Frame {
+        msec: 1280
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Key {
+        type: 7
+        key: 68
+        modifiers: 0
+        text: "64"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1296
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Frame {
+        msec: 1312
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Frame {
+        msec: 1328
+        hash: "94defec2865529f185d02cfcbfe166cc"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1344
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1360
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1376
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1392
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1408
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1424
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1440
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1456
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Frame {
+        msec: 1472
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1488
+        hash: "f625a2a82879df96141000e6931d4487"
+    }
+    Key {
+        type: 6
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1504
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1520
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1536
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1552
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Key {
+        type: 7
+        key: 87
+        modifiers: 0
+        text: "77"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1568
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1584
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1600
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1616
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1632
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Frame {
+        msec: 1648
+        hash: "1cf29837a4ea63bbb06c15382680d1b6"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1664
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1680
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1696
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1712
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1728
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1744
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1760
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1776
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1792
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1808
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1824
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1840
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Frame {
+        msec: 1856
+        hash: "6eabb6d168ecc9ac604dcf2db0075380"
+    }
+    Key {
+        type: 6
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1872
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1888
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1904
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1920
+        image: "echoMode.1.png"
+    }
+    Key {
+        type: 7
+        key: 76
+        modifiers: 0
+        text: "6c"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1936
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1952
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1968
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 1984
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 2000
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Frame {
+        msec: 2016
+        hash: "cb2dc1c4fc4e213841b873561f404a4f"
+    }
+    Key {
+        type: 6
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2032
+        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
+    }
+    Frame {
+        msec: 2048
+        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
+    }
+    Key {
+        type: 7
+        key: 79
+        modifiers: 0
+        text: "6f"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
+    }
+    Frame {
+        msec: 2080
+        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
+    }
+    Key {
+        type: 6
+        key: 86
+        modifiers: 0
+        text: "76"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2096
+        hash: "c82441813af6ff577687f29f6a09da38"
+    }
+    Frame {
+        msec: 2112
+        hash: "c82441813af6ff577687f29f6a09da38"
+    }
+    Frame {
+        msec: 2128
+        hash: "c82441813af6ff577687f29f6a09da38"
+    }
+    Frame {
+        msec: 2144
+        hash: "c82441813af6ff577687f29f6a09da38"
+    }
+    Key {
+        type: 6
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Key {
+        type: 7
+        key: 86
+        modifiers: 0
+        text: "76"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2160
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2176
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2192
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2208
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Key {
+        type: 6
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2224
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Key {
+        type: 7
+        key: 69
+        modifiers: 0
+        text: "65"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2240
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2256
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2272
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2288
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2304
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Key {
+        type: 7
+        key: 32
+        modifiers: 0
+        text: "20"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2320
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Frame {
+        msec: 2336
+        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
+    }
+    Key {
+        type: 6
+        key: 77
+        modifiers: 0
+        text: "6d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2352
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2368
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2384
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2400
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2416
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2432
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Key {
+        type: 7
+        key: 77
+        modifiers: 0
+        text: "6d"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2448
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2464
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2480
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Frame {
+        msec: 2496
+        hash: "8f36e26d8685fe55e7a1dd294188f649"
+    }
+    Key {
+        type: 6
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2512
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2528
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2544
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Key {
+        type: 7
+        key: 89
+        modifiers: 0
+        text: "79"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2560
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2576
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2592
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2608
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2624
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2640
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2656
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2672
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2688
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2704
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2720
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2736
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2752
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2768
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2784
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2800
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2816
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2832
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2848
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2864
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2880
+        image: "echoMode.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2912
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2928
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2944
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2960
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2976
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 2992
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 3008
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 3024
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 3040
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+    Frame {
+        msec: 3056
+        hash: "316f2ba46d059755576e6822dc77afb2"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.0.png
new file mode 100644
index 0000000..87c2e07
Binary files /dev/null and b/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.0.png differ
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.qml
new file mode 100644
index 0000000..e29ac56
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.qml
@@ -0,0 +1,107 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 32
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 48
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 64
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 80
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 96
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 112
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 128
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 144
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 160
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 176
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 192
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 208
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 224
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 240
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 256
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 272
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 288
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 304
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 320
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 336
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 352
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 368
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 384
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+    Frame {
+        msec: 400
+        hash: "7619ed68aca3544f373777e11a4bfefa"
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/echoMode.qml b/tests/auto/declarative/visual/qdeclarativetextinput/echoMode.qml
new file mode 100644
index 0000000..b0b50e4
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/echoMode.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+Item{
+    height: 50; width: 200
+    Column{
+        //Not an exhaustive echo mode test, that's in QLineEdit (since the functionality is in QLineControl)
+        TextInput{ id: main; focus: true; echoMode: TextInput.Password }
+        Text{ text: main.text }
+    }
+}
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/hAlign.qml b/tests/auto/declarative/visual/qdeclarativetextinput/hAlign.qml
new file mode 100644
index 0000000..2d65adf
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/hAlign.qml
@@ -0,0 +1,39 @@
+import Qt 4.6
+
+Item{
+    width:600;
+    height:300;
+    Column{
+        TextInput{ 
+            text: "Jackdaws love my big sphinx of quartz"; 
+            horizontalAlignment: TextInput.AlignLeft;
+        }
+        TextInput{ 
+            text: "Jackdaws love my big sphinx of quartz"; 
+            horizontalAlignment: TextInput.AlignHCenter;
+        }
+        TextInput{ 
+            text: "Jackdaws love my big sphinx of quartz"; 
+            horizontalAlignment: TextInput.AlignRight;
+        }
+        Rectangle{ width: 600; height: 10; color: "pink" }
+        TextInput{ 
+            height: 30;
+            width: 600;
+            text: "Jackdaws love my big sphinx of quartz"; 
+            horizontalAlignment: TextInput.AlignLeft;
+        }
+        TextInput{ 
+            height: 30;
+            width: 600;
+            text: "Jackdaws love my big sphinx of quartz"; 
+            horizontalAlignment: TextInput.AlignHCenter;
+        }
+        TextInput{ 
+            height: 30;
+            width: 600;
+            text: "Jackdaws love my big sphinx of quartz"; 
+            horizontalAlignment: TextInput.AlignRight;
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.0.png b/tests/auto/declarative/visual/qmleasefollow/data/easefollow.0.png
deleted file mode 100644
index 21b6afb..0000000
Binary files a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.1.png b/tests/auto/declarative/visual/qmleasefollow/data/easefollow.1.png
deleted file mode 100644
index bb8a02b..0000000
Binary files a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.2.png b/tests/auto/declarative/visual/qmleasefollow/data/easefollow.2.png
deleted file mode 100644
index da60237..0000000
Binary files a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.3.png b/tests/auto/declarative/visual/qmleasefollow/data/easefollow.3.png
deleted file mode 100644
index 3e943e8..0000000
Binary files a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.4.png b/tests/auto/declarative/visual/qmleasefollow/data/easefollow.4.png
deleted file mode 100644
index 4fbaf26..0000000
Binary files a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.5.png b/tests/auto/declarative/visual/qmleasefollow/data/easefollow.5.png
deleted file mode 100644
index c10d196..0000000
Binary files a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.6.png b/tests/auto/declarative/visual/qmleasefollow/data/easefollow.6.png
deleted file mode 100644
index a672c06..0000000
Binary files a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.qml b/tests/auto/declarative/visual/qmleasefollow/data/easefollow.qml
deleted file mode 100644
index 029a2fc..0000000
--- a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.qml
+++ /dev/null
@@ -1,1807 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "1f60efdb8704b92c9361daa468a25391"
-    }
-    Frame {
-        msec: 32
-        hash: "3bb6a87617e0e5d4922e573eec975886"
-    }
-    Frame {
-        msec: 48
-        hash: "268941737e6324d580890b151de621fb"
-    }
-    Frame {
-        msec: 64
-        hash: "99c674eccc082d7f0982257a748d93e5"
-    }
-    Frame {
-        msec: 80
-        hash: "2970467e8262c8a3f0b11be71245d048"
-    }
-    Frame {
-        msec: 96
-        hash: "63cbd06d6bb035d27c18dba49238d8b2"
-    }
-    Frame {
-        msec: 112
-        hash: "49f77bb3d323f882c0ec56e1f1040b3a"
-    }
-    Frame {
-        msec: 128
-        hash: "40263c5f9b5d2236536163785f832b4d"
-    }
-    Frame {
-        msec: 144
-        hash: "dc63b1c21a2027c4beb9c297a3677fbd"
-    }
-    Frame {
-        msec: 160
-        hash: "4fab52ea29a819fec032f19dbcbef012"
-    }
-    Frame {
-        msec: 176
-        hash: "60b48407a8f8ae2cce7d3e7c8b21991c"
-    }
-    Frame {
-        msec: 192
-        hash: "6e542c681092a5ebeef0534fa2bd2d6c"
-    }
-    Frame {
-        msec: 208
-        hash: "c7c6471969bbf81efdb86d1695548fc6"
-    }
-    Frame {
-        msec: 224
-        hash: "b7f4ad9a49feb400894209c02b94478a"
-    }
-    Frame {
-        msec: 240
-        hash: "3eb58b2f5233aead976183c13f241113"
-    }
-    Frame {
-        msec: 256
-        hash: "54f2036c50c6d8079fc0cadc01385980"
-    }
-    Frame {
-        msec: 272
-        hash: "f297659d75f6e724d72bd548821f4c9f"
-    }
-    Frame {
-        msec: 288
-        hash: "112798f080336fc9c603a7e9097dd8aa"
-    }
-    Frame {
-        msec: 304
-        hash: "c432e6ec2b53ca43cb7a7325d0cc379b"
-    }
-    Frame {
-        msec: 320
-        hash: "4a6d3db3efd665ad7f372bf3f2508ed7"
-    }
-    Frame {
-        msec: 336
-        hash: "0befa5dc4d2cc196fed0eb1a3aa75b8f"
-    }
-    Frame {
-        msec: 352
-        hash: "a34d010b50d59c362b54e44d69c2df91"
-    }
-    Frame {
-        msec: 368
-        hash: "cbdacced50186c87066ce1d46548b27e"
-    }
-    Frame {
-        msec: 384
-        hash: "a4060010ae4d3c0973bda48d68f7bd0a"
-    }
-    Frame {
-        msec: 400
-        hash: "47353437da587f732f986004c09884d0"
-    }
-    Frame {
-        msec: 416
-        hash: "080c348145167bbec671a04da6f7564f"
-    }
-    Frame {
-        msec: 432
-        hash: "69dead737c717a076ae3865680341fb4"
-    }
-    Frame {
-        msec: 448
-        hash: "1efdc31c5c8fa72fc848877deb6caaa4"
-    }
-    Frame {
-        msec: 464
-        hash: "28d7da1e933d0585d03acf4a529e7b42"
-    }
-    Frame {
-        msec: 480
-        hash: "bf85534124bf025b7ede0d6c80b8e443"
-    }
-    Frame {
-        msec: 496
-        hash: "cdbeb2d51541b1b1eff060efe993db91"
-    }
-    Frame {
-        msec: 512
-        hash: "52ad56ae16c8ab523adda8edc512dd87"
-    }
-    Frame {
-        msec: 528
-        hash: "61b1937f4c8dd2cb0ddd7031c5bfb3ab"
-    }
-    Frame {
-        msec: 544
-        hash: "1b109baba71b16827f90da654af093a3"
-    }
-    Frame {
-        msec: 560
-        hash: "d56621362802c8626868f36ba1e7db22"
-    }
-    Frame {
-        msec: 576
-        hash: "ee5555ec3ad8760f43bbf5958a925936"
-    }
-    Frame {
-        msec: 592
-        hash: "1ed2831144a453af1978605c0e42d17c"
-    }
-    Frame {
-        msec: 608
-        hash: "c74d5cdb3395a702269dfa88c8c9d975"
-    }
-    Frame {
-        msec: 624
-        hash: "ea98ddd9588cc23fd82a342ec2925ba8"
-    }
-    Frame {
-        msec: 640
-        hash: "e76b94d6d57f1a510f7649eaab892562"
-    }
-    Frame {
-        msec: 656
-        hash: "022f40b6fe9dbaf8019855234acb3461"
-    }
-    Frame {
-        msec: 672
-        hash: "467da4f48aa6aeb113f0797facf157e8"
-    }
-    Frame {
-        msec: 688
-        hash: "8df407aadd4d896eb6537e1555a0242f"
-    }
-    Frame {
-        msec: 704
-        hash: "122e4671881e31f54e617729f4fbb3b0"
-    }
-    Frame {
-        msec: 720
-        hash: "562718f101c3cd7525b890076413df5e"
-    }
-    Frame {
-        msec: 736
-        hash: "07feae99ecf4b70eb094fd3e10deca56"
-    }
-    Frame {
-        msec: 752
-        hash: "0980d133b1006cc07796023880415163"
-    }
-    Frame {
-        msec: 768
-        hash: "7112b6ac97678b3b942c64c5108f0329"
-    }
-    Frame {
-        msec: 784
-        hash: "bb9f893a9aaee60ab6c30918552828a4"
-    }
-    Frame {
-        msec: 800
-        hash: "65d1f29437aaaea33676757276f1e434"
-    }
-    Frame {
-        msec: 816
-        hash: "52adcf2509f3236ac8ef571708e77206"
-    }
-    Frame {
-        msec: 832
-        hash: "22df5e7eda8a813531d0e0366cbfbf64"
-    }
-    Frame {
-        msec: 848
-        hash: "fe9b7b7812dd2410b8ed2eb19aa78f4d"
-    }
-    Frame {
-        msec: 864
-        hash: "141e22de4469f316b5ef5471f3c7bba0"
-    }
-    Frame {
-        msec: 880
-        hash: "1125c0a105fc4a2cae36b798058ce23f"
-    }
-    Frame {
-        msec: 896
-        hash: "8c17c5da2ae867fb0016a485ba9e4166"
-    }
-    Frame {
-        msec: 912
-        hash: "d8da9fc7ec4dcefb894c5a6a71e9d001"
-    }
-    Frame {
-        msec: 928
-        hash: "00ff642bea89fd89de394d78f8c5db33"
-    }
-    Frame {
-        msec: 944
-        hash: "8549063d517a3ce1ffd44c56b3b6cf5e"
-    }
-    Frame {
-        msec: 960
-        image: "easefollow.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "95a642caa72bb31cc1e04ecc12d07cd0"
-    }
-    Frame {
-        msec: 992
-        hash: "e65c823476bf920d0386f62ca831e6a0"
-    }
-    Frame {
-        msec: 1008
-        hash: "91e8913dc693c91a674a10b5b088dd8f"
-    }
-    Frame {
-        msec: 1024
-        hash: "1a469ffa0d530f72c78dc14783891c78"
-    }
-    Frame {
-        msec: 1040
-        hash: "6e46a83d07f8bc034b421103ef0e4f8c"
-    }
-    Frame {
-        msec: 1056
-        hash: "8ddacab411a8b73b6c9e69576fa1b003"
-    }
-    Frame {
-        msec: 1072
-        hash: "41f419a85fe44efe27c9a526d83a1e9a"
-    }
-    Frame {
-        msec: 1088
-        hash: "73d4ece31b258f9caf4556ce20a5be1f"
-    }
-    Frame {
-        msec: 1104
-        hash: "ef3ebe0acb50386cf79b9f08fbba2fbc"
-    }
-    Frame {
-        msec: 1120
-        hash: "c11a84d2fa80f28adb1466409812e987"
-    }
-    Frame {
-        msec: 1136
-        hash: "2e9db854b02d28b38063ff2a8e821ed1"
-    }
-    Frame {
-        msec: 1152
-        hash: "48e073c0e6b19aea8314629a2179af87"
-    }
-    Frame {
-        msec: 1168
-        hash: "77e518b7428d93b67a8fb0d33d85ed97"
-    }
-    Frame {
-        msec: 1184
-        hash: "1d18323af9c62e015513451883f8b39f"
-    }
-    Frame {
-        msec: 1200
-        hash: "df49889ba157cdc1ca240d08d2760ad7"
-    }
-    Frame {
-        msec: 1216
-        hash: "7b8cd2bcf0a4c38ab870f27894a43d2f"
-    }
-    Frame {
-        msec: 1232
-        hash: "84f10e0c9fd57dd1799df7fc34c5ef01"
-    }
-    Frame {
-        msec: 1248
-        hash: "ead4e609bc4a0755032b1648485b9625"
-    }
-    Frame {
-        msec: 1264
-        hash: "9a9829c3bd4a3a4155383c37e21e8db8"
-    }
-    Frame {
-        msec: 1280
-        hash: "5008917f60256abad867f32c1caf954d"
-    }
-    Frame {
-        msec: 1296
-        hash: "c21455d66ed0754177af5ce44b7c7600"
-    }
-    Frame {
-        msec: 1312
-        hash: "e8332f2586d80a2700b610e8fe5c72d9"
-    }
-    Frame {
-        msec: 1328
-        hash: "0d0c8af138f98bae8a370ebec4a4796c"
-    }
-    Frame {
-        msec: 1344
-        hash: "04065e8feeb900d18deeb941572f7f10"
-    }
-    Frame {
-        msec: 1360
-        hash: "992a225b1f25bf5b21dd7f8a55dc4b70"
-    }
-    Frame {
-        msec: 1376
-        hash: "8ef739d91ee2a4337cbfc3dc94ce9845"
-    }
-    Frame {
-        msec: 1392
-        hash: "46744977a26b37ab65e65e1891ceafe7"
-    }
-    Frame {
-        msec: 1408
-        hash: "1b4c0d79eeb8d6b2e30172f3664407b9"
-    }
-    Frame {
-        msec: 1424
-        hash: "d572831ed34d14d1125570b8b8767bdb"
-    }
-    Frame {
-        msec: 1440
-        hash: "8b785c756d11e0fc18959d0897a45673"
-    }
-    Frame {
-        msec: 1456
-        hash: "164a71ffcea63ceb6c1ebeb8d0d07af1"
-    }
-    Frame {
-        msec: 1472
-        hash: "e128dc12d5117eed9f7c0a16e8348ba2"
-    }
-    Frame {
-        msec: 1488
-        hash: "4c7db5b12d83bf22b1c88ac06ca7c385"
-    }
-    Frame {
-        msec: 1504
-        hash: "c7283df8dbd78121e17a5893e3ea4f3c"
-    }
-    Frame {
-        msec: 1520
-        hash: "fea768e5bb43f6d86d88ced9f73915de"
-    }
-    Frame {
-        msec: 1536
-        hash: "b99b54f8e75452c539bb4e7b6a36e944"
-    }
-    Frame {
-        msec: 1552
-        hash: "b7274938d16f03b376ad9739e2e893f1"
-    }
-    Frame {
-        msec: 1568
-        hash: "e61601942193add8c1c8ebf5c5319932"
-    }
-    Frame {
-        msec: 1584
-        hash: "8fdc2181e0120391505706716ba7e5d7"
-    }
-    Frame {
-        msec: 1600
-        hash: "66f737ed28453da5175d6b5e807c374d"
-    }
-    Frame {
-        msec: 1616
-        hash: "2e00a7895d61edbe794f0a8000871b30"
-    }
-    Frame {
-        msec: 1632
-        hash: "1a279fc6b7c4105eccc4e3bc99481bef"
-    }
-    Frame {
-        msec: 1648
-        hash: "bc1dea4d23ca9bc29b72a8c2bde4787b"
-    }
-    Frame {
-        msec: 1664
-        hash: "8ef40e0be5fb82b32b365b3d4b85421d"
-    }
-    Frame {
-        msec: 1680
-        hash: "ee37c68bf38d5eed4e3e9a31306f6801"
-    }
-    Frame {
-        msec: 1696
-        hash: "303d760c87a7a833606c8e9f46cb5fc0"
-    }
-    Frame {
-        msec: 1712
-        hash: "cc2563b47c58efd39bec6b4e0f2995bb"
-    }
-    Frame {
-        msec: 1728
-        hash: "33f7daf09497510475283d6dc7c51228"
-    }
-    Frame {
-        msec: 1744
-        hash: "5b5e2de9934c80bd49e0eb7afd85151d"
-    }
-    Frame {
-        msec: 1760
-        hash: "5e6bf706336789ca6b60a82998b70113"
-    }
-    Frame {
-        msec: 1776
-        hash: "b4d4a860f49bfb88dd2079862b40b7ec"
-    }
-    Frame {
-        msec: 1792
-        hash: "07b571fa55327487e34a592c778beb67"
-    }
-    Frame {
-        msec: 1808
-        hash: "cb5b349a536cf75a83734181b3eab92b"
-    }
-    Frame {
-        msec: 1824
-        hash: "ce903bb58c5c86f2955e68412893aedf"
-    }
-    Frame {
-        msec: 1840
-        hash: "ffa89e879558c83ed538812a93e2fe29"
-    }
-    Frame {
-        msec: 1856
-        hash: "562aa66bf537853be82a654542c8b80e"
-    }
-    Frame {
-        msec: 1872
-        hash: "dc45dac0cc20220bcc81210fb5506ee2"
-    }
-    Frame {
-        msec: 1888
-        hash: "3b429eb827df0800a1ad8b906ea32ef9"
-    }
-    Frame {
-        msec: 1904
-        hash: "d6ebaf12515d9e24cdbf6d75080c0b28"
-    }
-    Frame {
-        msec: 1920
-        image: "easefollow.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "9f6d26224055c809dc2f3490cd0ff880"
-    }
-    Frame {
-        msec: 1952
-        hash: "5630cc8f0b401f7d81bdceaaae5cce68"
-    }
-    Frame {
-        msec: 1968
-        hash: "dafda60467e5e2b99c41543dd191ac2d"
-    }
-    Frame {
-        msec: 1984
-        hash: "e053cb07a734278cd111d612883c165e"
-    }
-    Frame {
-        msec: 2000
-        hash: "63870f3e99c11707004dab9439d61389"
-    }
-    Frame {
-        msec: 2016
-        hash: "14c311a6fab45f828c3a19535ea9edc8"
-    }
-    Frame {
-        msec: 2032
-        hash: "13e614446cbfcbfd2a7ecc5f0e8688df"
-    }
-    Frame {
-        msec: 2048
-        hash: "173c97f59da05b9347180a4824e60c06"
-    }
-    Frame {
-        msec: 2064
-        hash: "932e2a9bbcb7dc5befca8f63d8fa3c95"
-    }
-    Frame {
-        msec: 2080
-        hash: "4b8f232ffe0cbc7f900de5737c9f95be"
-    }
-    Frame {
-        msec: 2096
-        hash: "9686d294d4e931a5eed0e6b5bda63377"
-    }
-    Frame {
-        msec: 2112
-        hash: "969c569d92e3ec51dfbdd20d64432224"
-    }
-    Frame {
-        msec: 2128
-        hash: "0cef3550cca9fb5611b836098c517dd1"
-    }
-    Frame {
-        msec: 2144
-        hash: "6728080a09aa5d48462a3abb8e285e8a"
-    }
-    Frame {
-        msec: 2160
-        hash: "4b904dc671b7fc72db0b6e52543e96bd"
-    }
-    Frame {
-        msec: 2176
-        hash: "38232f89dffc9b16db6ea60b02f8d1be"
-    }
-    Frame {
-        msec: 2192
-        hash: "6b41f2a0f950eddad217a03e137f9a9b"
-    }
-    Frame {
-        msec: 2208
-        hash: "be576ea74c2c404da46fcf1d22de6df9"
-    }
-    Frame {
-        msec: 2224
-        hash: "3f44bad4b51ceff2944337064a5efa91"
-    }
-    Frame {
-        msec: 2240
-        hash: "e1ab98ac1366e9fd8af62a6a26878c73"
-    }
-    Frame {
-        msec: 2256
-        hash: "bd131e1725a54b3dbbb86a29ca8a56a9"
-    }
-    Frame {
-        msec: 2272
-        hash: "4d3e8af70f228643803f780c4e36f1a6"
-    }
-    Frame {
-        msec: 2288
-        hash: "853a5ab4271af7a7638454cfa883aa33"
-    }
-    Frame {
-        msec: 2304
-        hash: "ede9260157000f346900153ce2409278"
-    }
-    Frame {
-        msec: 2320
-        hash: "b2b16d8ce1ba89f0d9558ac387e25c3d"
-    }
-    Frame {
-        msec: 2336
-        hash: "387d338910453637c5cf80fa35528e56"
-    }
-    Frame {
-        msec: 2352
-        hash: "26deabf9cdd994455f2a8802eb0e04dc"
-    }
-    Frame {
-        msec: 2368
-        hash: "13939659a315dae1b81e3ea166102edf"
-    }
-    Frame {
-        msec: 2384
-        hash: "be92b55bb7562372401b25a9167abb2b"
-    }
-    Frame {
-        msec: 2400
-        hash: "ee7bf60d7ee97b7de5e909b9af88df80"
-    }
-    Frame {
-        msec: 2416
-        hash: "434313a3bcd1d7582b0d89b9a145ef09"
-    }
-    Frame {
-        msec: 2432
-        hash: "0857ca59a283897e3df62b9633488f83"
-    }
-    Frame {
-        msec: 2448
-        hash: "76718fc7e3d21b54930bc8307a57733a"
-    }
-    Frame {
-        msec: 2464
-        hash: "93a91588b38129053a462b920fd686e3"
-    }
-    Frame {
-        msec: 2480
-        hash: "2a2486c52fde915696fd8cbd3682e8db"
-    }
-    Frame {
-        msec: 2496
-        hash: "b1f4ab6cc5fb4a3a1b4885f2d1b29277"
-    }
-    Frame {
-        msec: 2512
-        hash: "4258afce8a85a2e9ead149e34b43d8fc"
-    }
-    Frame {
-        msec: 2528
-        hash: "6672c71b98e13d51ebb523aed9036a72"
-    }
-    Frame {
-        msec: 2544
-        hash: "eaa39af7eb78948f433e3b44a9454317"
-    }
-    Frame {
-        msec: 2560
-        hash: "0a766bc97bea67d4b848c703eaa6777a"
-    }
-    Frame {
-        msec: 2576
-        hash: "0b461ec1885ede1dd96b71cf38bfd3d6"
-    }
-    Frame {
-        msec: 2592
-        hash: "15efc929370a3864529080e30db1026a"
-    }
-    Frame {
-        msec: 2608
-        hash: "e1529e30ff1e4ea1b092a88e85f2f1f6"
-    }
-    Frame {
-        msec: 2624
-        hash: "f29bd9dbf7317e94b885da63f0cb7374"
-    }
-    Frame {
-        msec: 2640
-        hash: "e5294e087e2ce0d7d936c0129b6c37ae"
-    }
-    Frame {
-        msec: 2656
-        hash: "9c63129e774b391cc398cf5da5c9339c"
-    }
-    Frame {
-        msec: 2672
-        hash: "4371d85854419d4b00671176bb7c5a2b"
-    }
-    Frame {
-        msec: 2688
-        hash: "dd10b3f50e2fdc56c75f00321634b1cc"
-    }
-    Frame {
-        msec: 2704
-        hash: "aac6256b21152a5f1f8c576b667d275e"
-    }
-    Frame {
-        msec: 2720
-        hash: "c937c44037b2228590d334df4d56a86f"
-    }
-    Frame {
-        msec: 2736
-        hash: "f6c714db51cbd1bdb737afe612c33f9c"
-    }
-    Frame {
-        msec: 2752
-        hash: "0bba45af79f3201bc7cf042d5c648f73"
-    }
-    Frame {
-        msec: 2768
-        hash: "941b08ddbafea3bd46262c060b1e290b"
-    }
-    Frame {
-        msec: 2784
-        hash: "d898918dc2023de239b4ab38f7420960"
-    }
-    Frame {
-        msec: 2800
-        hash: "d1a16dc2282329113093d06862e7a871"
-    }
-    Frame {
-        msec: 2816
-        hash: "bba5359475f643fbeee240e71e843d4c"
-    }
-    Frame {
-        msec: 2832
-        hash: "03cf861f4b6bc767e723e47e95c2448b"
-    }
-    Frame {
-        msec: 2848
-        hash: "a64bf158c6199b88bc2db3b741d342f0"
-    }
-    Frame {
-        msec: 2864
-        hash: "cf0fe7cb42ba842f1c28c1211adb768d"
-    }
-    Frame {
-        msec: 2880
-        image: "easefollow.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "9b3c6414e4ef5a452a5c92bb0b893fc3"
-    }
-    Frame {
-        msec: 2912
-        hash: "7cc7ddec3ac2d8cac33c0b0f80a7544d"
-    }
-    Frame {
-        msec: 2928
-        hash: "7dd4e7d606e953c872c57fad786d64aa"
-    }
-    Frame {
-        msec: 2944
-        hash: "117cc903a39d99ca22f6556095e6f883"
-    }
-    Frame {
-        msec: 2960
-        hash: "c6c9304fd65fee1909473bdb21ac7806"
-    }
-    Frame {
-        msec: 2976
-        hash: "8e704fe81c040f49c4d80e7dcc46084d"
-    }
-    Frame {
-        msec: 2992
-        hash: "d202d5c0a058e1e088fdd280e59f17bb"
-    }
-    Frame {
-        msec: 3008
-        hash: "90c072dea32c056f8bd6d010df681929"
-    }
-    Frame {
-        msec: 3024
-        hash: "80b4e99f1b47e64084e295a2a3e1121e"
-    }
-    Frame {
-        msec: 3040
-        hash: "41d6307075ec9ae9e92d227921f71289"
-    }
-    Frame {
-        msec: 3056
-        hash: "f33de23cf4a5c4881310c6866261d387"
-    }
-    Frame {
-        msec: 3072
-        hash: "441faa0a1fc95d66b27479dfc1e40188"
-    }
-    Frame {
-        msec: 3088
-        hash: "2314b5f6ba3864abd5e87bc87bd621b0"
-    }
-    Frame {
-        msec: 3104
-        hash: "e71e3b0ad953258ceef3101e38283fdb"
-    }
-    Frame {
-        msec: 3120
-        hash: "890c3b0e727f136bf1ccc486531c9677"
-    }
-    Frame {
-        msec: 3136
-        hash: "2a0d23e6dcc6475c323dbf8eb36e8094"
-    }
-    Frame {
-        msec: 3152
-        hash: "692682e82347936f87a66484b428e959"
-    }
-    Frame {
-        msec: 3168
-        hash: "cf4005c08789762ad21be1a1d78755c9"
-    }
-    Frame {
-        msec: 3184
-        hash: "566184563091626bb20ae679e3ce3b91"
-    }
-    Frame {
-        msec: 3200
-        hash: "f88a24ad3bbc2699924bb9a7ff6490b3"
-    }
-    Frame {
-        msec: 3216
-        hash: "23f3f63d07b2bdc2b82ff4e8606a634d"
-    }
-    Frame {
-        msec: 3232
-        hash: "fe121c71ce469ec6f0bf957eb2f0447b"
-    }
-    Frame {
-        msec: 3248
-        hash: "ba217690a33c701afe11842aa8105cbb"
-    }
-    Frame {
-        msec: 3264
-        hash: "e5c7c1323108f13ba26f5198cc62c137"
-    }
-    Frame {
-        msec: 3280
-        hash: "664f76d3d0008b56be2790c470befc91"
-    }
-    Frame {
-        msec: 3296
-        hash: "b3f54070ba64b983ccd2a15941ef4c35"
-    }
-    Frame {
-        msec: 3312
-        hash: "8a0ba2ae36ad3811778f3a3bc55743f5"
-    }
-    Frame {
-        msec: 3328
-        hash: "bfdc71733ca45a2ba2e8abf751554a62"
-    }
-    Frame {
-        msec: 3344
-        hash: "686e4d7bb5ae148d37fc2a1f6004a33a"
-    }
-    Frame {
-        msec: 3360
-        hash: "29c553d9fe42fdbbd019d0ead61dffa0"
-    }
-    Frame {
-        msec: 3376
-        hash: "bfa2b72c6554a2ed80a3b86f2cbed986"
-    }
-    Frame {
-        msec: 3392
-        hash: "074ff90417a947f0a04926d5675d073b"
-    }
-    Frame {
-        msec: 3408
-        hash: "6f56f9e0aa40149156ca71d6f8d4476a"
-    }
-    Frame {
-        msec: 3424
-        hash: "950ce749bbf572021de2dd1688cb87e6"
-    }
-    Frame {
-        msec: 3440
-        hash: "2d0903bd71862dc6f28bd702d955ae99"
-    }
-    Frame {
-        msec: 3456
-        hash: "2733adae56728f1b744a4086ecb98052"
-    }
-    Frame {
-        msec: 3472
-        hash: "779859d739e799bba15beeb97d18e682"
-    }
-    Frame {
-        msec: 3488
-        hash: "9074386cfabe136b8839637e5cd58f57"
-    }
-    Frame {
-        msec: 3504
-        hash: "fa5bcbf20c6ad0a218f23d98961229a1"
-    }
-    Frame {
-        msec: 3520
-        hash: "5406c94da1717eaa5eb0010564216059"
-    }
-    Frame {
-        msec: 3536
-        hash: "27d0a3c3a33c04df843bebd72ef79824"
-    }
-    Frame {
-        msec: 3552
-        hash: "270df9c99c2679071b854b3d82337f79"
-    }
-    Frame {
-        msec: 3568
-        hash: "5b3945505443a67e7a91f66fe42b4fe3"
-    }
-    Frame {
-        msec: 3584
-        hash: "9a2f8565c354cb366725368ed323ccf4"
-    }
-    Frame {
-        msec: 3600
-        hash: "6702cb7ccd61c008b511932d7bd5d107"
-    }
-    Frame {
-        msec: 3616
-        hash: "f6b86c3a1cc88357f588b6dae11aae30"
-    }
-    Frame {
-        msec: 3632
-        hash: "b10c23937f420db72af8abaf126f71c2"
-    }
-    Frame {
-        msec: 3648
-        hash: "7d6b0810ffc6e488c8168e19bccb7358"
-    }
-    Frame {
-        msec: 3664
-        hash: "c01ef69ec46391909619434e9d9dd0ce"
-    }
-    Frame {
-        msec: 3680
-        hash: "a046464fccb0c5ba1f63f8b569821a44"
-    }
-    Frame {
-        msec: 3696
-        hash: "8763c526924d882438f9aa9bfb4fe87d"
-    }
-    Frame {
-        msec: 3712
-        hash: "dede7a62d6e5c10e8f30caa075bd8dfd"
-    }
-    Frame {
-        msec: 3728
-        hash: "3b408e5c986f5bb01d8c3949876b792f"
-    }
-    Frame {
-        msec: 3744
-        hash: "0a458f3b17cdd3ea85522779c9346af9"
-    }
-    Frame {
-        msec: 3760
-        hash: "fef521f0301cce90af88d37e6d441ec8"
-    }
-    Frame {
-        msec: 3776
-        hash: "3d083e0822242b3b37c6839ca91a1f68"
-    }
-    Frame {
-        msec: 3792
-        hash: "f8fe013a717e6e61830137bdc78a8b40"
-    }
-    Frame {
-        msec: 3808
-        hash: "0ae80ad65dd194043500fa50b5a547a6"
-    }
-    Frame {
-        msec: 3824
-        hash: "a53c67fa32ef971eaea202fa5d8a6ad6"
-    }
-    Frame {
-        msec: 3840
-        image: "easefollow.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "41f86bbf0658b127f01e8d46d7ec941b"
-    }
-    Frame {
-        msec: 3872
-        hash: "d20f21df127565f9eb87c5d759a638d9"
-    }
-    Frame {
-        msec: 3888
-        hash: "85ff94f03cea3e111807e90d062c1367"
-    }
-    Frame {
-        msec: 3904
-        hash: "aa637850fe5f05a71ac4c7d31dbb36ee"
-    }
-    Frame {
-        msec: 3920
-        hash: "c86a67096c5e62bb73b785cdf6a5b6b1"
-    }
-    Frame {
-        msec: 3936
-        hash: "9d53537f2c50a0016bf7bb522b2ec3d8"
-    }
-    Frame {
-        msec: 3952
-        hash: "b48630c27c27785ddce568a85d4dc58f"
-    }
-    Frame {
-        msec: 3968
-        hash: "01c1bdb6e261cc509f26712b13eeb554"
-    }
-    Frame {
-        msec: 3984
-        hash: "af8a44284695fd999acd5944434f0372"
-    }
-    Frame {
-        msec: 4000
-        hash: "b156d9d6d5163f007ac4a309d8927ae9"
-    }
-    Frame {
-        msec: 4016
-        hash: "2df3715416c3c005f04b66fe1258c0d8"
-    }
-    Frame {
-        msec: 4032
-        hash: "96b4a7c6b8542b50fc345b54d38ec82a"
-    }
-    Frame {
-        msec: 4048
-        hash: "7e62e757fafa06833444c3a7e1d96ce4"
-    }
-    Frame {
-        msec: 4064
-        hash: "5222a8f9366c7d974d0687d05d229069"
-    }
-    Frame {
-        msec: 4080
-        hash: "ec96169f4633c3bddfd582feeb8e9ad4"
-    }
-    Frame {
-        msec: 4096
-        hash: "cb10db893d1e1cb2a370507dc5679985"
-    }
-    Frame {
-        msec: 4112
-        hash: "d7e346c2ac77796bde639bd829b72e85"
-    }
-    Frame {
-        msec: 4128
-        hash: "ba5bea8857e4fb444bedd3873563e7db"
-    }
-    Frame {
-        msec: 4144
-        hash: "05556fba5d1714f70fd6c2bfb43d213b"
-    }
-    Frame {
-        msec: 4160
-        hash: "aeeabf35f9759f045a670a9b9f90dc68"
-    }
-    Frame {
-        msec: 4176
-        hash: "131bd453f4c7726e5fdd546252700e2e"
-    }
-    Frame {
-        msec: 4192
-        hash: "7c5c3b5bb7a4082e6b9b43640e29f4e2"
-    }
-    Frame {
-        msec: 4208
-        hash: "07515e21b7a7895f333e4a8bbd2202eb"
-    }
-    Frame {
-        msec: 4224
-        hash: "6cf136f223ac6edd39ba6ed9b4445884"
-    }
-    Frame {
-        msec: 4240
-        hash: "84264f5745add8a922101735ed8def84"
-    }
-    Frame {
-        msec: 4256
-        hash: "660863d1e4b361f2e5445b417be0d2ad"
-    }
-    Frame {
-        msec: 4272
-        hash: "7ceb86f4b16546370d72164d0ca3147c"
-    }
-    Frame {
-        msec: 4288
-        hash: "a13e97da9722545ad87ac3c5eb92c497"
-    }
-    Frame {
-        msec: 4304
-        hash: "5896b5307cbd609d2062d3607786d40c"
-    }
-    Frame {
-        msec: 4320
-        hash: "c8c511115394116e4544c67f615ea5d5"
-    }
-    Frame {
-        msec: 4336
-        hash: "59ca5fdf12a735e5c292901b54acccb2"
-    }
-    Frame {
-        msec: 4352
-        hash: "155cce2738d34e0eac86f5eb63d638f0"
-    }
-    Frame {
-        msec: 4368
-        hash: "83a840c3ae7dbd9a05c17fdd8be07d7a"
-    }
-    Frame {
-        msec: 4384
-        hash: "800a15de28b14d88f0ad58fc3f4a2520"
-    }
-    Frame {
-        msec: 4400
-        hash: "c8381439a3cd3f9e7f80061023723a6e"
-    }
-    Frame {
-        msec: 4416
-        hash: "e3d63000db4b9458b202dece49d1bdba"
-    }
-    Frame {
-        msec: 4432
-        hash: "c943e56781695798f3c221f8ab09681a"
-    }
-    Frame {
-        msec: 4448
-        hash: "1137ee66d7fbf5a84c33f5ffff15b3dd"
-    }
-    Frame {
-        msec: 4464
-        hash: "5a98013cc4462aad18cad8d941f77aa0"
-    }
-    Frame {
-        msec: 4480
-        hash: "d0b3748fb49a13c0ad9a68b0e2914921"
-    }
-    Frame {
-        msec: 4496
-        hash: "12113f71f9117670acbd7877edded7e0"
-    }
-    Frame {
-        msec: 4512
-        hash: "22983424da08cdae7a9c6a8905b37736"
-    }
-    Frame {
-        msec: 4528
-        hash: "b2db5618a025cefb2650124c81880c49"
-    }
-    Frame {
-        msec: 4544
-        hash: "84fb5e7edc5b42163a83e0cd362b3a46"
-    }
-    Frame {
-        msec: 4560
-        hash: "39d6f1ed0f60a0c366c22e1442c455ac"
-    }
-    Frame {
-        msec: 4576
-        hash: "702367f6e4aaa2a862e57f9e02a08758"
-    }
-    Frame {
-        msec: 4592
-        hash: "ecc75293bc156c560d55cb7d278a4e58"
-    }
-    Frame {
-        msec: 4608
-        hash: "e68af8e97ce65376fd7904e599440c92"
-    }
-    Frame {
-        msec: 4624
-        hash: "75fe9f766d6cf636cd72d8879a461439"
-    }
-    Frame {
-        msec: 4640
-        hash: "162aef147ef4bbb0cd92bd70e4f37f62"
-    }
-    Frame {
-        msec: 4656
-        hash: "d879aae8949976c7bad4d97f1e5b5549"
-    }
-    Frame {
-        msec: 4672
-        hash: "8a983d7228190721f988de2d72cb3aa2"
-    }
-    Frame {
-        msec: 4688
-        hash: "a4f3c63fde664d128cd35b129a4f9a23"
-    }
-    Frame {
-        msec: 4704
-        hash: "115fb5f3c9b7f1c28ab379596faba91c"
-    }
-    Frame {
-        msec: 4720
-        hash: "ea9600c4d6c77a3b32e59401aa84fe96"
-    }
-    Frame {
-        msec: 4736
-        hash: "bd6531fdd9cfd46af2df73bacb31f4c5"
-    }
-    Frame {
-        msec: 4752
-        hash: "33bdcf1df50eab5e7963c649fbd32226"
-    }
-    Frame {
-        msec: 4768
-        hash: "236e88fb72369a55f9eba4b50712ae85"
-    }
-    Frame {
-        msec: 4784
-        hash: "5eb3c14a6296fb3a1c58603b2fc937c8"
-    }
-    Frame {
-        msec: 4800
-        image: "easefollow.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "31d11a1ce6422524241c77603fe53e61"
-    }
-    Frame {
-        msec: 4832
-        hash: "44e8b9947026c10b922c84883dd8e889"
-    }
-    Frame {
-        msec: 4848
-        hash: "d049e4f7c4bc1849398859a4d630c1b3"
-    }
-    Frame {
-        msec: 4864
-        hash: "e83b4757898e4eeef74be8213619fbfa"
-    }
-    Frame {
-        msec: 4880
-        hash: "d08f40615f2d5abc6236e856a67575dd"
-    }
-    Frame {
-        msec: 4896
-        hash: "d9cb26bf1b8bbafb2aed8f74bd454077"
-    }
-    Frame {
-        msec: 4912
-        hash: "aa321b94a6cc53b2ebac80e834c0a908"
-    }
-    Frame {
-        msec: 4928
-        hash: "48da37164be156b67a4b3b14e50f2375"
-    }
-    Frame {
-        msec: 4944
-        hash: "f522ce7728a4a9e7fad86c72f29bd8f9"
-    }
-    Frame {
-        msec: 4960
-        hash: "9bc1d16b4bda596702a3d8a3fad8a5c5"
-    }
-    Frame {
-        msec: 4976
-        hash: "5275dccf18745dec6c59b846de17d9ef"
-    }
-    Frame {
-        msec: 4992
-        hash: "4eb6babc177b96f69b148d52f56d82d7"
-    }
-    Frame {
-        msec: 5008
-        hash: "ccdfb454070ac04c4fe4f3513c52f8c8"
-    }
-    Frame {
-        msec: 5024
-        hash: "07f6adad6e8ff4f0eff92c758636a951"
-    }
-    Frame {
-        msec: 5040
-        hash: "241e0ad9218d49be477509e008e45548"
-    }
-    Frame {
-        msec: 5056
-        hash: "151a482e821779da8a61063f1cc73f8c"
-    }
-    Frame {
-        msec: 5072
-        hash: "1499d207c5a3a9bc7bbb84d9c5e35578"
-    }
-    Frame {
-        msec: 5088
-        hash: "c253753f653157a5058ef071f16b8bbb"
-    }
-    Frame {
-        msec: 5104
-        hash: "ec9fea5a870724a106b952edef7fb466"
-    }
-    Frame {
-        msec: 5120
-        hash: "99b673f8ed049d31a2aecabcc46d841d"
-    }
-    Frame {
-        msec: 5136
-        hash: "61e77fea693ea55aafbdc94c40c3ab33"
-    }
-    Frame {
-        msec: 5152
-        hash: "53e44a3732ee6858d5bd596b4c5d5305"
-    }
-    Frame {
-        msec: 5168
-        hash: "5b25d3894a56dc4f4a0aa8f88cb69e23"
-    }
-    Frame {
-        msec: 5184
-        hash: "5683ad02f1b9126f4e4ff6b03044fdc6"
-    }
-    Frame {
-        msec: 5200
-        hash: "0a3ec255575ec1b70e0b10cf59c7c5fd"
-    }
-    Frame {
-        msec: 5216
-        hash: "0f5f46fe3fdf42d4651891f13c8afc7e"
-    }
-    Frame {
-        msec: 5232
-        hash: "b6955407245c73e356a460d99dad77be"
-    }
-    Frame {
-        msec: 5248
-        hash: "6018b53414921943b37c33fa04a29697"
-    }
-    Frame {
-        msec: 5264
-        hash: "ff184d349ce0b648f8c1fce91ae997f6"
-    }
-    Frame {
-        msec: 5280
-        hash: "9c112a3a785d970593887eeab72fa7fe"
-    }
-    Frame {
-        msec: 5296
-        hash: "00384fb20d4c6cd6236d519d2d734cc3"
-    }
-    Frame {
-        msec: 5312
-        hash: "601ea99400e5f50ee9a5a4b74b6f3017"
-    }
-    Frame {
-        msec: 5328
-        hash: "9afed04bf7eca24d9b6d31ac84ae59c2"
-    }
-    Frame {
-        msec: 5344
-        hash: "1983319c8043bfe403513af7ccb5b924"
-    }
-    Frame {
-        msec: 5360
-        hash: "b0244e4e1b61202ede78405415c22bca"
-    }
-    Frame {
-        msec: 5376
-        hash: "ec5516b1aaeace8784b04649c51ab40b"
-    }
-    Frame {
-        msec: 5392
-        hash: "8ff7d2001594abb588f769bab15406d7"
-    }
-    Frame {
-        msec: 5408
-        hash: "64d5fd96a1726aa5276f9b508566676f"
-    }
-    Frame {
-        msec: 5424
-        hash: "ab49497a6c825038354f076bdbbbc235"
-    }
-    Frame {
-        msec: 5440
-        hash: "6b821e43be932800b20af58a7b5a1ff7"
-    }
-    Frame {
-        msec: 5456
-        hash: "683a2902300f930e2a81a82dc37c583b"
-    }
-    Frame {
-        msec: 5472
-        hash: "86d7946d7fbb66369ccbf26430939225"
-    }
-    Frame {
-        msec: 5488
-        hash: "fb38f5fb6555fc14e95a47c595a6ea0c"
-    }
-    Frame {
-        msec: 5504
-        hash: "3878f685d9fa3299e9ffe78c22595387"
-    }
-    Frame {
-        msec: 5520
-        hash: "b48840a68ff007901b02332c7177f315"
-    }
-    Frame {
-        msec: 5536
-        hash: "9d847abc99220b04aceef12e5c09aac0"
-    }
-    Frame {
-        msec: 5552
-        hash: "9893ac89fda64d96ec4140c3c87e17a5"
-    }
-    Frame {
-        msec: 5568
-        hash: "cd94e1c36e6be9877cd9c12df42bd968"
-    }
-    Frame {
-        msec: 5584
-        hash: "c1ce5e53b74af022dc103ad74ff5f1af"
-    }
-    Frame {
-        msec: 5600
-        hash: "b3630e08eac02a9578a00b01baabaaba"
-    }
-    Frame {
-        msec: 5616
-        hash: "0eb9241aa1f9526c1e24ba76d630805c"
-    }
-    Frame {
-        msec: 5632
-        hash: "1b532ae7f9253469467522d4ca66c47b"
-    }
-    Frame {
-        msec: 5648
-        hash: "7e6e49079ed6330da2e337a5e4ffd730"
-    }
-    Frame {
-        msec: 5664
-        hash: "0391d668f4b906b244a5f5c1713573c2"
-    }
-    Frame {
-        msec: 5680
-        hash: "8070fa3280d0d64bf976d4a276359c4c"
-    }
-    Frame {
-        msec: 5696
-        hash: "f7d0d36a2d40c798f56ac7ecc1effca6"
-    }
-    Frame {
-        msec: 5712
-        hash: "9f8e35ee5080e811c670c480a9c2bd9f"
-    }
-    Frame {
-        msec: 5728
-        hash: "c7fea75a43a59a11aa504df32afcdaf8"
-    }
-    Frame {
-        msec: 5744
-        hash: "7e549a93ffc6ddcc3d8111f10c05b29e"
-    }
-    Frame {
-        msec: 5760
-        image: "easefollow.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "92d298262f610a2dafa095e3d67c80af"
-    }
-    Frame {
-        msec: 5792
-        hash: "db8826b0b2feece0999863b8827a6234"
-    }
-    Frame {
-        msec: 5808
-        hash: "12c7050e8094bb39212aed0163666d1a"
-    }
-    Frame {
-        msec: 5824
-        hash: "69531beace5c749bf90160a4b25f736a"
-    }
-    Frame {
-        msec: 5840
-        hash: "ce873e4dbc8853183b54d59991b2e030"
-    }
-    Frame {
-        msec: 5856
-        hash: "fa1078973634578d69527402b11fb7e0"
-    }
-    Frame {
-        msec: 5872
-        hash: "1e3b3db590567c0afd1913101192cda9"
-    }
-    Frame {
-        msec: 5888
-        hash: "7b9e097018278b784973a546da3d401a"
-    }
-    Frame {
-        msec: 5904
-        hash: "a7b0667093888480de6697280aeea9ba"
-    }
-    Frame {
-        msec: 5920
-        hash: "e381f2422ead86575abf643b0b0c9797"
-    }
-    Frame {
-        msec: 5936
-        hash: "44b08f5a0de2a6955e02f67753f409c8"
-    }
-    Frame {
-        msec: 5952
-        hash: "db04665e58448ecc7f95baa3e4ea79a5"
-    }
-    Frame {
-        msec: 5968
-        hash: "0e4aae728d8d543538a9446c41e18e91"
-    }
-    Frame {
-        msec: 5984
-        hash: "e3cd1bbb1d9963e5c74d36e526a871b0"
-    }
-    Frame {
-        msec: 6000
-        hash: "bcd893a0e200ddda4e1468c159018865"
-    }
-    Frame {
-        msec: 6016
-        hash: "9c5293356aa6312f909e655e9bcf961b"
-    }
-    Frame {
-        msec: 6032
-        hash: "0bab7b9166f6af554d4fa0badeec739e"
-    }
-    Frame {
-        msec: 6048
-        hash: "e74996581f0aaeced118c5cbfd977d90"
-    }
-    Frame {
-        msec: 6064
-        hash: "5d128eb20a2a23da8c2d9a35293e5769"
-    }
-    Frame {
-        msec: 6080
-        hash: "ebbbc343698287faf7ffa7526a726b54"
-    }
-    Frame {
-        msec: 6096
-        hash: "d812172192cc19590f9a2d7dbf970439"
-    }
-    Frame {
-        msec: 6112
-        hash: "60263addb1b4b5ac43f8199b8ed77e40"
-    }
-    Frame {
-        msec: 6128
-        hash: "702a1ff2876eaaa59359811bb6437c5b"
-    }
-    Frame {
-        msec: 6144
-        hash: "8f81dc43decce5094ee7a089f0009730"
-    }
-    Frame {
-        msec: 6160
-        hash: "efda5dd9edd83a0da089d0b28806c6b6"
-    }
-    Frame {
-        msec: 6176
-        hash: "7274a33a7a5272d7abdaf41f4b2bf664"
-    }
-    Frame {
-        msec: 6192
-        hash: "0cc80077476e721a3da85c17cc56a65e"
-    }
-    Frame {
-        msec: 6208
-        hash: "e65a534f0e7e70520a9c2cfa09ee8159"
-    }
-    Frame {
-        msec: 6224
-        hash: "b05b514c63bd8998785382e6a9cbd849"
-    }
-    Frame {
-        msec: 6240
-        hash: "10a04d641e0cc65c120d8bcf2f3e54c8"
-    }
-    Frame {
-        msec: 6256
-        hash: "68418e2206a496dd15a05b50fec6f87e"
-    }
-    Frame {
-        msec: 6272
-        hash: "6549e0989e1c86e3a7eb0dcc8dd31380"
-    }
-    Frame {
-        msec: 6288
-        hash: "bd0193c2cbc8958f674f4ec52a693b72"
-    }
-    Frame {
-        msec: 6304
-        hash: "746440b45a3688dbd32b34c57454e956"
-    }
-    Frame {
-        msec: 6320
-        hash: "6b54ee8af30be2178e8b3afab5dcb4c7"
-    }
-    Frame {
-        msec: 6336
-        hash: "ba2fbad3fe2fe25ec0c0c542659168dc"
-    }
-    Frame {
-        msec: 6352
-        hash: "84bd72703bd8200f8f090783d06ae451"
-    }
-    Frame {
-        msec: 6368
-        hash: "17c9fb063280c2ee4cb4a13273bbb199"
-    }
-    Frame {
-        msec: 6384
-        hash: "df28fd55719f5c2d164596d02c2faff2"
-    }
-    Frame {
-        msec: 6400
-        hash: "c2e280e78e892200d40022d17ce695b7"
-    }
-    Frame {
-        msec: 6416
-        hash: "c657caa0c5158e178ec5df80bbad6bcb"
-    }
-    Frame {
-        msec: 6432
-        hash: "d91f4f6ec6503fe8280f9b02dd11e64a"
-    }
-    Frame {
-        msec: 6448
-        hash: "0fb9400cdca9dbd4035fbf8af9952360"
-    }
-    Frame {
-        msec: 6464
-        hash: "cac0e1b4aa094306b95f90ede4705391"
-    }
-    Frame {
-        msec: 6480
-        hash: "e60a4bb14300a937a767effee931c60f"
-    }
-    Frame {
-        msec: 6496
-        hash: "8b461397e3f210ee7e9305dcab2af2db"
-    }
-    Frame {
-        msec: 6512
-        hash: "6ce9ec0942dd06c9f73929a7e176852c"
-    }
-    Frame {
-        msec: 6528
-        hash: "da36e254635eea854a6552ba008117f9"
-    }
-    Frame {
-        msec: 6544
-        hash: "0bec6402b5eb09d05ce8e9ff5253ea8d"
-    }
-    Frame {
-        msec: 6560
-        hash: "72f6610527d395ca590eda166ef6bc4e"
-    }
-    Frame {
-        msec: 6576
-        hash: "622ae3fd47adb2432e2a40d3c5539393"
-    }
-    Frame {
-        msec: 6592
-        hash: "0b18c49e2bbf9370216e06b555faf183"
-    }
-    Frame {
-        msec: 6608
-        hash: "0c090bb975fb883301b52479fd6f5fdf"
-    }
-    Frame {
-        msec: 6624
-        hash: "c4205d7ecb7327426d9591e77247acab"
-    }
-    Frame {
-        msec: 6640
-        hash: "f0e0075243e4b8aa97056248fe6033ed"
-    }
-    Frame {
-        msec: 6656
-        hash: "47f99b40a8764ee9d9e429061fb7acb2"
-    }
-    Frame {
-        msec: 6672
-        hash: "49e8c1e974b0716570d85109b53817a5"
-    }
-    Frame {
-        msec: 6688
-        hash: "72f981bad831b6ed858009527902f734"
-    }
-    Frame {
-        msec: 6704
-        hash: "e959a0493b06369a429f90f66cb65977"
-    }
-    Frame {
-        msec: 6720
-        image: "easefollow.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "93470d983282f24425558f47ad705154"
-    }
-    Frame {
-        msec: 6752
-        hash: "cdccbe1a7c7abd4a6a6ee754ed0c9759"
-    }
-    Frame {
-        msec: 6768
-        hash: "0e1b7b5332a9fcdb492db5314a2a0267"
-    }
-    Frame {
-        msec: 6784
-        hash: "1e1ffe3439aab51d0b325474e7d8dc28"
-    }
-    Frame {
-        msec: 6800
-        hash: "e8e7e9b5871caf77f15678616d6c9c8a"
-    }
-    Frame {
-        msec: 6816
-        hash: "9771fff3b7752154d093c038bea73d28"
-    }
-    Frame {
-        msec: 6832
-        hash: "1af851ea214cbddb0e3a743084a5cf6b"
-    }
-    Frame {
-        msec: 6848
-        hash: "1566182a7e29bbb738705a90c4909617"
-    }
-    Frame {
-        msec: 6864
-        hash: "feed650e1d948fe622234d212fb745f2"
-    }
-    Frame {
-        msec: 6880
-        hash: "3cd3d063275b91f9680717421c118ba4"
-    }
-    Frame {
-        msec: 6896
-        hash: "c1f088801334762cd499e7cc70e1e59a"
-    }
-    Frame {
-        msec: 6912
-        hash: "e8f8d153e7a027a5092a9209411d97f7"
-    }
-    Frame {
-        msec: 6928
-        hash: "f11747c3533b4b2fc77a64ca0cace8b0"
-    }
-    Frame {
-        msec: 6944
-        hash: "21618c67a2a8bbce86fc872060ad40e8"
-    }
-    Frame {
-        msec: 6960
-        hash: "02da96335db74b87ceefe91b1dfe72e6"
-    }
-    Frame {
-        msec: 6976
-        hash: "2b2e4143143ead8dea5865fd782f1775"
-    }
-    Frame {
-        msec: 6992
-        hash: "13e710900b05e26cdb030b1e2b2be715"
-    }
-    Frame {
-        msec: 7008
-        hash: "29e8995d17aac4d02034debcbb9fcb98"
-    }
-    Frame {
-        msec: 7024
-        hash: "1099db1b3e4c69e84c6ab1b7c311bf1e"
-    }
-    Frame {
-        msec: 7040
-        hash: "cc7cb720043334f1eeb385dce4389dc2"
-    }
-    Frame {
-        msec: 7056
-        hash: "34c7a62c1bc7261e2fd31c40068b37a7"
-    }
-    Frame {
-        msec: 7072
-        hash: "7fafbe05cbcaa21893e3aa0f1fcfb5a0"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7088
-        hash: "5b26c8cf047706633795a8ed3e703a89"
-    }
-    Frame {
-        msec: 7104
-        hash: "e0774bf9e74d0cde81c5cb216a9258fc"
-    }
-    Frame {
-        msec: 7120
-        hash: "0870262f643245e13f4fba79fd575897"
-    }
-    Frame {
-        msec: 7136
-        hash: "8faf0d050bb435ade8af5012c1a6b0dc"
-    }
-    Frame {
-        msec: 7152
-        hash: "382c037895cc39a6870db57b5016c01f"
-    }
-    Frame {
-        msec: 7168
-        hash: "f1f5a2cbc103ab1bee9f537fa8266e03"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmleasefollow/easefollow.qml b/tests/auto/declarative/visual/qmleasefollow/easefollow.qml
deleted file mode 100644
index bd3270f..0000000
--- a/tests/auto/declarative/visual/qmleasefollow/easefollow.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 800; height: 240; color: "gray"
-
-    Rectangle {
-        id: rect
-        width: 50; height: 20; y: 30; color: "black"
-        x: SequentialAnimation {
-            repeat: true
-            NumberAnimation { from: 50; to: 700; duration: 2000 }
-            NumberAnimation { from: 700; to: 50; duration: 2000 }
-        }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 60; color: "red"
-        x: EaseFollow { source: rect.x; velocity: 400 }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 90; color: "yellow"
-        x: EaseFollow { source: rect.x; velocity: 300; reversingMode: EaseFollow.Immediate }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 120; color: "green"
-        x: EaseFollow { source: rect.x; reversingMode: EaseFollow.Sync }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 150; color: "purple"
-        x: EaseFollow { source: rect.x; maximumEasingTime: 200 }
-    }
-
-    Rectangle {
-        width: 50; height: 20; y: 180; color: "blue"
-        x: EaseFollow { source: rect.x; duration: 300 }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/animated-smooth.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/animated-smooth.qml
deleted file mode 100644
index 0ceaf49..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/animated-smooth.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-import Qt 4.6
-import "content"
-
-Rectangle {
-    id: page
-    color: "white"
-    width: 1030; height: 540
-
-    MyBorderImage {
-        x: 20; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240
-        source: "content/colors.png"; margin: 30; antialiased: true
-    }
-    MyBorderImage {
-        x: 270; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240; antialiased: true
-        source: "content/colors.png"; margin: 30
-        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 520; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240; antialiased: true
-        source: "content/colors.png"; margin: 30
-        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 770; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240; antialiased: true
-        source: "content/colors.png"; margin: 30
-        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-    }
-    MyBorderImage {
-        x: 20; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200; antialiased: true
-        source: "content/bw.png"; margin: 10
-    }
-    MyBorderImage {
-        x: 270; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200; antialiased: true
-        source: "content/bw.png"; margin: 10
-        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 520; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200; antialiased: true
-        source: "content/bw.png"; margin: 10
-        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 770; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200; antialiased: true
-        source: "content/bw.png"; margin: 10
-        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/animated.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/animated.qml
deleted file mode 100644
index 29c02b3..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/animated.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-import Qt 4.6
-import "content"
-
-Rectangle {
-    id: page
-    color: "white"
-    width: 1030; height: 540
-
-    MyBorderImage {
-        x: 20; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240
-        source: "content/colors.png"; margin: 30
-    }
-    MyBorderImage {
-        x: 270; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240
-        source: "content/colors.png"; margin: 30
-        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 520; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240
-        source: "content/colors.png"; margin: 30
-        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 770; y: 20; minWidth: 120; maxWidth: 240
-        minHeight: 120; maxHeight: 240
-        source: "content/colors.png"; margin: 30
-        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-    }
-    MyBorderImage {
-        x: 20; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200
-        source: "content/bw.png"; margin: 10
-    }
-    MyBorderImage {
-        x: 270; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200
-        source: "content/bw.png"; margin: 10
-        horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 520; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200
-        source: "content/bw.png"; margin: 10
-        horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-    }
-    MyBorderImage {
-        x: 770; y: 280; minWidth: 60; maxWidth: 200
-        minHeight: 40; maxHeight: 200
-        source: "content/bw.png"; margin: 10
-        horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/borders.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/borders.qml
deleted file mode 100644
index 9879416..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/borders.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: page
-    color: "white"
-    width: 520; height: 280
-
-    BorderImage {
-        x: 20; y: 20; width: 230; height: 240
-        smooth: true
-        source: "content/colors-stretch.sci"
-    }
-    BorderImage {
-        x: 270; y: 20; width: 230; height: 240
-        smooth: true
-        source: "content/colors-round.sci"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
deleted file mode 100644
index e268ce7..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import Qt 4.6
-
-Item {
-    property alias horizontalMode: image.horizontalTileMode
-    property alias verticalMode: image.verticalTileMode
-    property alias source: image.source
-    property alias antialiased: image.smooth
-
-    property int minWidth
-    property int minHeight
-    property int maxWidth
-    property int maxHeight
-    property int margin
-
-    id: container
-    width: 240; height: 240
-
-    BorderImage {
-        id: image; x: container.width / 2 - width / 2; y: container.height / 2 - height / 2
-
-        width: SequentialAnimation {
-            repeat: true
-            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
-            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
-        }
-
-        height: SequentialAnimation {
-            repeat: true
-            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
-            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
-        }
-
-        border.top: container.margin
-        border.left: container.margin
-        border.bottom: container.margin
-        border.right: container.margin
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/bw.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/bw.png
deleted file mode 100644
index 486eaae..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/bw.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-round.sci b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-round.sci
deleted file mode 100644
index 506f6f5..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-round.sci
+++ /dev/null
@@ -1,7 +0,0 @@
-border.left:30
-border.top:30
-border.right:30
-border.bottom:30
-horizontalTileRule:Round
-verticalTileRule:Round
-source:colors.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-stretch.sci b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-stretch.sci
deleted file mode 100644
index e4989a7..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-stretch.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left:30
-border.top:30
-border.right:30
-border.bottom:30
-source:colors.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors.png
deleted file mode 100644
index dfb62f3..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.0.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.0.png
deleted file mode 100644
index 9a6b079..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.1.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.1.png
deleted file mode 100644
index 1f960e5..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.2.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.2.png
deleted file mode 100644
index 85a2729..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.3.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.3.png
deleted file mode 100644
index de6ff7c..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.4.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.4.png
deleted file mode 100644
index fe7d3dd..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.5.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.5.png
deleted file mode 100644
index e73bef5..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.6.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.6.png
deleted file mode 100644
index 0c75422..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.qml
deleted file mode 100644
index 043f5e2..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.qml
+++ /dev/null
@@ -1,1823 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 32
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 48
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 64
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 80
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 96
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 128
-        hash: "cd2180be80101c2aa4350b51b7a6f502"
-    }
-    Frame {
-        msec: 144
-        hash: "de471829f8ad3b43bf1b4df9d1d65a4d"
-    }
-    Frame {
-        msec: 160
-        hash: "ed9f2ca797894612600bc4b7fbaecb84"
-    }
-    Frame {
-        msec: 176
-        hash: "59470d71fa4426d0283e86371f2bfc2a"
-    }
-    Frame {
-        msec: 192
-        hash: "9a2f92efb51bcc6293d6a8e82d5314ea"
-    }
-    Frame {
-        msec: 208
-        hash: "7b66e21652a7d0982226e281a48411a9"
-    }
-    Frame {
-        msec: 224
-        hash: "a716c8d2c94433dee719f92f0822c8ec"
-    }
-    Frame {
-        msec: 240
-        hash: "f22a47b846cfee96ebdf39bbce2e6d51"
-    }
-    Frame {
-        msec: 256
-        hash: "5a8932d13d624932a65694fd19ec05cd"
-    }
-    Frame {
-        msec: 272
-        hash: "48e62dd171f5da82b5aa26c765e4042c"
-    }
-    Frame {
-        msec: 288
-        hash: "63d3c47f7dec1236440a05e0a8380900"
-    }
-    Frame {
-        msec: 304
-        hash: "323af110731b7af0c30f8862ff59b833"
-    }
-    Frame {
-        msec: 320
-        hash: "83c029e328e80af83158c37089cf0ece"
-    }
-    Frame {
-        msec: 336
-        hash: "3f9a09ae19be34348bb2552915360cf7"
-    }
-    Frame {
-        msec: 352
-        hash: "df624d70cae1bcefda8d69c0ff055d83"
-    }
-    Frame {
-        msec: 368
-        hash: "d671a3b971468e1d8aa30ab655e020a9"
-    }
-    Frame {
-        msec: 384
-        hash: "74c837b29f7f05b615123f0e608b523f"
-    }
-    Frame {
-        msec: 400
-        hash: "277ef98ea859fb7685fe6cd44a538a7d"
-    }
-    Frame {
-        msec: 416
-        hash: "0a8da7a3f57c3e06e4be5ea1d8a83ae9"
-    }
-    Frame {
-        msec: 432
-        hash: "456be9c208d690c479ba12bf6325dde0"
-    }
-    Frame {
-        msec: 448
-        hash: "10307beea6d99ab0ff5863f8e35555ed"
-    }
-    Frame {
-        msec: 464
-        hash: "170a1d5fe3422cf5223a78015a6a45fd"
-    }
-    Frame {
-        msec: 480
-        hash: "64ecb03aa538e74d0b99c6dec7751401"
-    }
-    Frame {
-        msec: 496
-        hash: "f3a7e74a1839f9366f9eeec4d2b80d1e"
-    }
-    Frame {
-        msec: 512
-        hash: "37c3f25e5cfdb48d7e3ab0cf8ffb9154"
-    }
-    Frame {
-        msec: 528
-        hash: "0af81ee0d76ff8335a0e347dc086ca37"
-    }
-    Frame {
-        msec: 544
-        hash: "061406edcbd2d4930ab89c3fcab63c7f"
-    }
-    Frame {
-        msec: 560
-        hash: "31d65134f340d82dd40f2401bda3fb7e"
-    }
-    Frame {
-        msec: 576
-        hash: "16c16c77c65b36d1e0954d5ead2642be"
-    }
-    Frame {
-        msec: 592
-        hash: "61c16009b65a55bffb63e27727e1615e"
-    }
-    Frame {
-        msec: 608
-        hash: "e1474c2cdd8768ca1ef45bf3bc5234ca"
-    }
-    Frame {
-        msec: 624
-        hash: "89c159ef00d273ecfe61332e1bf7244d"
-    }
-    Frame {
-        msec: 640
-        hash: "f4d0d3bca25e67908b38910f47b4757e"
-    }
-    Frame {
-        msec: 656
-        hash: "0e0c40f8e11a7bd499c80562ac6f8a82"
-    }
-    Frame {
-        msec: 672
-        hash: "4310a4c3037d845f088f21ad608f366a"
-    }
-    Frame {
-        msec: 688
-        hash: "3d518cd0348d6202243364af1dd6ce89"
-    }
-    Frame {
-        msec: 704
-        hash: "41987e6b4248d7944c0dbc6eb3862023"
-    }
-    Frame {
-        msec: 720
-        hash: "3e81338d38723d56f2d6c428271f81c1"
-    }
-    Frame {
-        msec: 736
-        hash: "902683d72f789399e9d99d1cea1bf177"
-    }
-    Frame {
-        msec: 752
-        hash: "efc119983701908a904deb24108c59cb"
-    }
-    Frame {
-        msec: 768
-        hash: "3a77785cfd7755f567619d8e04583f6a"
-    }
-    Frame {
-        msec: 784
-        hash: "fd85d1dd931033973283a408b5e328a8"
-    }
-    Frame {
-        msec: 800
-        hash: "5d3e85acabe5e5ff802eb7731676274f"
-    }
-    Frame {
-        msec: 816
-        hash: "ae12f1f37a746e16b06e6b869c89fac1"
-    }
-    Frame {
-        msec: 832
-        hash: "a15f19f374bbfb6a922b69d080a91eaa"
-    }
-    Frame {
-        msec: 848
-        hash: "84ef6dda8318b623832f58c46d762e89"
-    }
-    Frame {
-        msec: 864
-        hash: "b699285764f5e8866a9996f4a0dccc69"
-    }
-    Frame {
-        msec: 880
-        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
-    }
-    Frame {
-        msec: 896
-        hash: "177666cb3bb784c83196886b2c6cf6b6"
-    }
-    Frame {
-        msec: 912
-        hash: "9cd29b4b023a8b92573575fb3c3dda83"
-    }
-    Frame {
-        msec: 928
-        hash: "adc670a9aa0326744cb23e4f5912e6c7"
-    }
-    Frame {
-        msec: 944
-        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
-    }
-    Frame {
-        msec: 960
-        image: "animated-smooth.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "64b21b89576fdd0083f60a26f57b9c11"
-    }
-    Frame {
-        msec: 992
-        hash: "0d407ee07692d0e5a480a60952807b3c"
-    }
-    Frame {
-        msec: 1008
-        hash: "845170815a87565dc4229792032b3357"
-    }
-    Frame {
-        msec: 1024
-        hash: "8b8120cfc14de03e048632fdea61be21"
-    }
-    Frame {
-        msec: 1040
-        hash: "b0070117f1c24a4da87434725d4bb989"
-    }
-    Frame {
-        msec: 1056
-        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
-    }
-    Frame {
-        msec: 1072
-        hash: "3df54504f8891306fa8f1e9e2075a5e2"
-    }
-    Frame {
-        msec: 1088
-        hash: "853429387cc639496c7338244de7e1b7"
-    }
-    Frame {
-        msec: 1104
-        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
-    }
-    Frame {
-        msec: 1120
-        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
-    }
-    Frame {
-        msec: 1136
-        hash: "53f05993ba3b426949badd2e4cd66d84"
-    }
-    Frame {
-        msec: 1152
-        hash: "23291a0239c69ea07db959e709b1ff5f"
-    }
-    Frame {
-        msec: 1168
-        hash: "2192094410e2d7c8d9d4aa5f8deacff5"
-    }
-    Frame {
-        msec: 1184
-        hash: "d6615fc345831a3cc5b9a7196284b632"
-    }
-    Frame {
-        msec: 1200
-        hash: "92176cce4836dcae4dfca94e49b041a8"
-    }
-    Frame {
-        msec: 1216
-        hash: "2a1fcfb753ca237b518da26e67c928e5"
-    }
-    Frame {
-        msec: 1232
-        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
-    }
-    Frame {
-        msec: 1248
-        hash: "bd045f4532d78bba0ef1b64118fd9f24"
-    }
-    Frame {
-        msec: 1264
-        hash: "7f9999a9c87af43b9703323efab31770"
-    }
-    Frame {
-        msec: 1280
-        hash: "0640fcb0b24d3ba4ab8695f78271a438"
-    }
-    Frame {
-        msec: 1296
-        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
-    }
-    Frame {
-        msec: 1312
-        hash: "fce2648975106bc5c0ca9a4530f7f748"
-    }
-    Frame {
-        msec: 1328
-        hash: "39cc17ee2e889f17dd07179fda99e431"
-    }
-    Frame {
-        msec: 1344
-        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
-    }
-    Frame {
-        msec: 1360
-        hash: "d65d50fbb920e683b041a1c72238225b"
-    }
-    Frame {
-        msec: 1376
-        hash: "49a1df977b0494c7c72ca0b65c394e13"
-    }
-    Frame {
-        msec: 1392
-        hash: "05cbce0eaa80b4610a9067af8c40f819"
-    }
-    Frame {
-        msec: 1408
-        hash: "00ab7798bcd77a99886dff0414f35382"
-    }
-    Frame {
-        msec: 1424
-        hash: "5cc90d798786c270ddd2616512f4459f"
-    }
-    Frame {
-        msec: 1440
-        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
-    }
-    Frame {
-        msec: 1456
-        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
-    }
-    Frame {
-        msec: 1472
-        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
-    }
-    Frame {
-        msec: 1488
-        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
-    }
-    Frame {
-        msec: 1504
-        hash: "2fede2f5d871654f3f8a6e9d890adeac"
-    }
-    Frame {
-        msec: 1520
-        hash: "deed4c06c9b713834490832b88e7acaf"
-    }
-    Frame {
-        msec: 1536
-        hash: "c2edb016cfdd47c192d1c48281ee76ed"
-    }
-    Frame {
-        msec: 1552
-        hash: "a261be47ae89e6b53e6bc1c1197154ae"
-    }
-    Frame {
-        msec: 1568
-        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
-    }
-    Frame {
-        msec: 1584
-        hash: "a087b532ecb2f28e4ee60819228c2522"
-    }
-    Frame {
-        msec: 1600
-        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
-    }
-    Frame {
-        msec: 1616
-        hash: "4520003d4b221a3de6834b2729b3026d"
-    }
-    Frame {
-        msec: 1632
-        hash: "d1110817827c318ceb0c112e8c2bfc1d"
-    }
-    Frame {
-        msec: 1648
-        hash: "83d49474db15d5779923972ff5f55917"
-    }
-    Frame {
-        msec: 1664
-        hash: "3bae40654ec551d69e7c8c72f631c7a5"
-    }
-    Frame {
-        msec: 1680
-        hash: "774740a393f3e9b8f12b81cce8da8280"
-    }
-    Frame {
-        msec: 1696
-        hash: "d8e398a1ce9ca45c19951e93bd5c932a"
-    }
-    Frame {
-        msec: 1712
-        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
-    }
-    Frame {
-        msec: 1728
-        hash: "47e920e3884ccf2f0f49e78070af6929"
-    }
-    Frame {
-        msec: 1744
-        hash: "fc913807eb1069d611495fbd5d43ee3d"
-    }
-    Frame {
-        msec: 1760
-        hash: "5d9ee853f083d514fbe51d6953d8e000"
-    }
-    Frame {
-        msec: 1776
-        hash: "5736362b42bc2d801e02edabb983663a"
-    }
-    Frame {
-        msec: 1792
-        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
-    }
-    Frame {
-        msec: 1808
-        hash: "48952ffa5e300778eafa768b9fe7df0c"
-    }
-    Frame {
-        msec: 1824
-        hash: "fe04cae65aeec18697eca4f3f83a40e9"
-    }
-    Frame {
-        msec: 1840
-        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
-    }
-    Frame {
-        msec: 1856
-        hash: "89022a8e2feb3dcb845de69aafc333ad"
-    }
-    Frame {
-        msec: 1872
-        hash: "25506557c853a0020e98cf3992956989"
-    }
-    Frame {
-        msec: 1888
-        hash: "9a64706c52c9e962816953e32950b8ba"
-    }
-    Frame {
-        msec: 1904
-        hash: "3cbfded47413172ada64095e65c55e8a"
-    }
-    Frame {
-        msec: 1920
-        image: "animated-smooth.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "c5e399e29b988148913e62ee208b3326"
-    }
-    Frame {
-        msec: 1952
-        hash: "3991bc7760b7981d80665e3a7654c9f4"
-    }
-    Frame {
-        msec: 1968
-        hash: "05312f9529c94d3331ace7d73c544284"
-    }
-    Frame {
-        msec: 1984
-        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
-    }
-    Frame {
-        msec: 2000
-        hash: "723f87da7e5b002a2e9b0bcbc81f9458"
-    }
-    Frame {
-        msec: 2016
-        hash: "6b8ded0d9386a3fff0601a100c513080"
-    }
-    Frame {
-        msec: 2032
-        hash: "f976cd5046ef5391536859e63db905bd"
-    }
-    Frame {
-        msec: 2048
-        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
-    }
-    Frame {
-        msec: 2064
-        hash: "05312f9529c94d3331ace7d73c544284"
-    }
-    Frame {
-        msec: 2080
-        hash: "b980703c1d0018937e83a8ba8862469e"
-    }
-    Frame {
-        msec: 2096
-        hash: "c5e399e29b988148913e62ee208b3326"
-    }
-    Frame {
-        msec: 2112
-        hash: "3b7b83e97d17440b42e6ef4b962076d8"
-    }
-    Frame {
-        msec: 2128
-        hash: "3cbfded47413172ada64095e65c55e8a"
-    }
-    Frame {
-        msec: 2144
-        hash: "9a64706c52c9e962816953e32950b8ba"
-    }
-    Frame {
-        msec: 2160
-        hash: "25506557c853a0020e98cf3992956989"
-    }
-    Frame {
-        msec: 2176
-        hash: "89022a8e2feb3dcb845de69aafc333ad"
-    }
-    Frame {
-        msec: 2192
-        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
-    }
-    Frame {
-        msec: 2208
-        hash: "fe04cae65aeec18697eca4f3f83a40e9"
-    }
-    Frame {
-        msec: 2224
-        hash: "48952ffa5e300778eafa768b9fe7df0c"
-    }
-    Frame {
-        msec: 2240
-        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
-    }
-    Frame {
-        msec: 2256
-        hash: "5736362b42bc2d801e02edabb983663a"
-    }
-    Frame {
-        msec: 2272
-        hash: "5d9ee853f083d514fbe51d6953d8e000"
-    }
-    Frame {
-        msec: 2288
-        hash: "fe899138116774df4c4441687e3019c5"
-    }
-    Frame {
-        msec: 2304
-        hash: "47e920e3884ccf2f0f49e78070af6929"
-    }
-    Frame {
-        msec: 2320
-        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
-    }
-    Frame {
-        msec: 2336
-        hash: "64cd225202ed6c91b02c368a9160a656"
-    }
-    Frame {
-        msec: 2352
-        hash: "774740a393f3e9b8f12b81cce8da8280"
-    }
-    Frame {
-        msec: 2368
-        hash: "3bae40654ec551d69e7c8c72f631c7a5"
-    }
-    Frame {
-        msec: 2384
-        hash: "83d49474db15d5779923972ff5f55917"
-    }
-    Frame {
-        msec: 2400
-        hash: "d1110817827c318ceb0c112e8c2bfc1d"
-    }
-    Frame {
-        msec: 2416
-        hash: "4520003d4b221a3de6834b2729b3026d"
-    }
-    Frame {
-        msec: 2432
-        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
-    }
-    Frame {
-        msec: 2448
-        hash: "a087b532ecb2f28e4ee60819228c2522"
-    }
-    Frame {
-        msec: 2464
-        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
-    }
-    Frame {
-        msec: 2480
-        hash: "a261be47ae89e6b53e6bc1c1197154ae"
-    }
-    Frame {
-        msec: 2496
-        hash: "c2edb016cfdd47c192d1c48281ee76ed"
-    }
-    Frame {
-        msec: 2512
-        hash: "deed4c06c9b713834490832b88e7acaf"
-    }
-    Frame {
-        msec: 2528
-        hash: "2fede2f5d871654f3f8a6e9d890adeac"
-    }
-    Frame {
-        msec: 2544
-        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
-    }
-    Frame {
-        msec: 2560
-        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
-    }
-    Frame {
-        msec: 2576
-        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
-    }
-    Frame {
-        msec: 2592
-        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
-    }
-    Frame {
-        msec: 2608
-        hash: "5cc90d798786c270ddd2616512f4459f"
-    }
-    Frame {
-        msec: 2624
-        hash: "00ab7798bcd77a99886dff0414f35382"
-    }
-    Frame {
-        msec: 2640
-        hash: "05cbce0eaa80b4610a9067af8c40f819"
-    }
-    Frame {
-        msec: 2656
-        hash: "a676f45d946aeb9fa577c0e862735b01"
-    }
-    Frame {
-        msec: 2672
-        hash: "d65d50fbb920e683b041a1c72238225b"
-    }
-    Frame {
-        msec: 2688
-        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
-    }
-    Frame {
-        msec: 2704
-        hash: "39cc17ee2e889f17dd07179fda99e431"
-    }
-    Frame {
-        msec: 2720
-        hash: "fce2648975106bc5c0ca9a4530f7f748"
-    }
-    Frame {
-        msec: 2736
-        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
-    }
-    Frame {
-        msec: 2752
-        hash: "0640fcb0b24d3ba4ab8695f78271a438"
-    }
-    Frame {
-        msec: 2768
-        hash: "2084ccc60ddd493399c128717816d33b"
-    }
-    Frame {
-        msec: 2784
-        hash: "bd045f4532d78bba0ef1b64118fd9f24"
-    }
-    Frame {
-        msec: 2800
-        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
-    }
-    Frame {
-        msec: 2816
-        hash: "2a1fcfb753ca237b518da26e67c928e5"
-    }
-    Frame {
-        msec: 2832
-        hash: "92176cce4836dcae4dfca94e49b041a8"
-    }
-    Frame {
-        msec: 2848
-        hash: "d6615fc345831a3cc5b9a7196284b632"
-    }
-    Frame {
-        msec: 2864
-        hash: "85ef33fcb3f91e4fc20391bf94455984"
-    }
-    Frame {
-        msec: 2880
-        image: "animated-smooth.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "53f05993ba3b426949badd2e4cd66d84"
-    }
-    Frame {
-        msec: 2912
-        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
-    }
-    Frame {
-        msec: 2928
-        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
-    }
-    Frame {
-        msec: 2944
-        hash: "853429387cc639496c7338244de7e1b7"
-    }
-    Frame {
-        msec: 2960
-        hash: "3df54504f8891306fa8f1e9e2075a5e2"
-    }
-    Frame {
-        msec: 2976
-        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
-    }
-    Frame {
-        msec: 2992
-        hash: "b0070117f1c24a4da87434725d4bb989"
-    }
-    Frame {
-        msec: 3008
-        hash: "8b8120cfc14de03e048632fdea61be21"
-    }
-    Frame {
-        msec: 3024
-        hash: "845170815a87565dc4229792032b3357"
-    }
-    Frame {
-        msec: 3040
-        hash: "0d407ee07692d0e5a480a60952807b3c"
-    }
-    Frame {
-        msec: 3056
-        hash: "64b21b89576fdd0083f60a26f57b9c11"
-    }
-    Frame {
-        msec: 3072
-        hash: "d7e96278583f83ab636ed68fa130e4d2"
-    }
-    Frame {
-        msec: 3088
-        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
-    }
-    Frame {
-        msec: 3104
-        hash: "adc670a9aa0326744cb23e4f5912e6c7"
-    }
-    Frame {
-        msec: 3120
-        hash: "9cd29b4b023a8b92573575fb3c3dda83"
-    }
-    Frame {
-        msec: 3136
-        hash: "177666cb3bb784c83196886b2c6cf6b6"
-    }
-    Frame {
-        msec: 3152
-        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
-    }
-    Frame {
-        msec: 3168
-        hash: "b699285764f5e8866a9996f4a0dccc69"
-    }
-    Frame {
-        msec: 3184
-        hash: "84ef6dda8318b623832f58c46d762e89"
-    }
-    Frame {
-        msec: 3200
-        hash: "a15f19f374bbfb6a922b69d080a91eaa"
-    }
-    Frame {
-        msec: 3216
-        hash: "ae12f1f37a746e16b06e6b869c89fac1"
-    }
-    Frame {
-        msec: 3232
-        hash: "5d3e85acabe5e5ff802eb7731676274f"
-    }
-    Frame {
-        msec: 3248
-        hash: "fd85d1dd931033973283a408b5e328a8"
-    }
-    Frame {
-        msec: 3264
-        hash: "3a77785cfd7755f567619d8e04583f6a"
-    }
-    Frame {
-        msec: 3280
-        hash: "efc119983701908a904deb24108c59cb"
-    }
-    Frame {
-        msec: 3296
-        hash: "902683d72f789399e9d99d1cea1bf177"
-    }
-    Frame {
-        msec: 3312
-        hash: "3e81338d38723d56f2d6c428271f81c1"
-    }
-    Frame {
-        msec: 3328
-        hash: "41987e6b4248d7944c0dbc6eb3862023"
-    }
-    Frame {
-        msec: 3344
-        hash: "3d518cd0348d6202243364af1dd6ce89"
-    }
-    Frame {
-        msec: 3360
-        hash: "4310a4c3037d845f088f21ad608f366a"
-    }
-    Frame {
-        msec: 3376
-        hash: "0e0c40f8e11a7bd499c80562ac6f8a82"
-    }
-    Frame {
-        msec: 3392
-        hash: "f4d0d3bca25e67908b38910f47b4757e"
-    }
-    Frame {
-        msec: 3408
-        hash: "f602e3eda1889d1a7e49560f0dfb5d4c"
-    }
-    Frame {
-        msec: 3424
-        hash: "e1474c2cdd8768ca1ef45bf3bc5234ca"
-    }
-    Frame {
-        msec: 3440
-        hash: "c8312ede0998636a6bd6451d13636577"
-    }
-    Frame {
-        msec: 3456
-        hash: "16c16c77c65b36d1e0954d5ead2642be"
-    }
-    Frame {
-        msec: 3472
-        hash: "31d65134f340d82dd40f2401bda3fb7e"
-    }
-    Frame {
-        msec: 3488
-        hash: "061406edcbd2d4930ab89c3fcab63c7f"
-    }
-    Frame {
-        msec: 3504
-        hash: "0af81ee0d76ff8335a0e347dc086ca37"
-    }
-    Frame {
-        msec: 3520
-        hash: "0f347763f25350ebb62dda1536372b45"
-    }
-    Frame {
-        msec: 3536
-        hash: "f3a7e74a1839f9366f9eeec4d2b80d1e"
-    }
-    Frame {
-        msec: 3552
-        hash: "64ecb03aa538e74d0b99c6dec7751401"
-    }
-    Frame {
-        msec: 3568
-        hash: "170a1d5fe3422cf5223a78015a6a45fd"
-    }
-    Frame {
-        msec: 3584
-        hash: "10307beea6d99ab0ff5863f8e35555ed"
-    }
-    Frame {
-        msec: 3600
-        hash: "456be9c208d690c479ba12bf6325dde0"
-    }
-    Frame {
-        msec: 3616
-        hash: "0a8da7a3f57c3e06e4be5ea1d8a83ae9"
-    }
-    Frame {
-        msec: 3632
-        hash: "277ef98ea859fb7685fe6cd44a538a7d"
-    }
-    Frame {
-        msec: 3648
-        hash: "74c837b29f7f05b615123f0e608b523f"
-    }
-    Frame {
-        msec: 3664
-        hash: "d671a3b971468e1d8aa30ab655e020a9"
-    }
-    Frame {
-        msec: 3680
-        hash: "df624d70cae1bcefda8d69c0ff055d83"
-    }
-    Frame {
-        msec: 3696
-        hash: "3f9a09ae19be34348bb2552915360cf7"
-    }
-    Frame {
-        msec: 3712
-        hash: "83c029e328e80af83158c37089cf0ece"
-    }
-    Frame {
-        msec: 3728
-        hash: "323af110731b7af0c30f8862ff59b833"
-    }
-    Frame {
-        msec: 3744
-        hash: "63d3c47f7dec1236440a05e0a8380900"
-    }
-    Frame {
-        msec: 3760
-        hash: "48e62dd171f5da82b5aa26c765e4042c"
-    }
-    Frame {
-        msec: 3776
-        hash: "5a8932d13d624932a65694fd19ec05cd"
-    }
-    Frame {
-        msec: 3792
-        hash: "8419b295f67cae133760da79dfc26505"
-    }
-    Frame {
-        msec: 3808
-        hash: "a716c8d2c94433dee719f92f0822c8ec"
-    }
-    Frame {
-        msec: 3824
-        hash: "7b66e21652a7d0982226e281a48411a9"
-    }
-    Frame {
-        msec: 3840
-        image: "animated-smooth.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "59470d71fa4426d0283e86371f2bfc2a"
-    }
-    Frame {
-        msec: 3872
-        hash: "d56ba74d38c1889a278929d1c1b7f17a"
-    }
-    Frame {
-        msec: 3888
-        hash: "de471829f8ad3b43bf1b4df9d1d65a4d"
-    }
-    Frame {
-        msec: 3904
-        hash: "cd2180be80101c2aa4350b51b7a6f502"
-    }
-    Frame {
-        msec: 3920
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3936
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3952
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3968
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3984
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4000
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4016
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4032
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4048
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4064
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4080
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4096
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4128
-        hash: "cd2180be80101c2aa4350b51b7a6f502"
-    }
-    Frame {
-        msec: 4144
-        hash: "de471829f8ad3b43bf1b4df9d1d65a4d"
-    }
-    Frame {
-        msec: 4160
-        hash: "ed9f2ca797894612600bc4b7fbaecb84"
-    }
-    Frame {
-        msec: 4176
-        hash: "59470d71fa4426d0283e86371f2bfc2a"
-    }
-    Frame {
-        msec: 4192
-        hash: "9a2f92efb51bcc6293d6a8e82d5314ea"
-    }
-    Frame {
-        msec: 4208
-        hash: "7b66e21652a7d0982226e281a48411a9"
-    }
-    Frame {
-        msec: 4224
-        hash: "a716c8d2c94433dee719f92f0822c8ec"
-    }
-    Frame {
-        msec: 4240
-        hash: "f22a47b846cfee96ebdf39bbce2e6d51"
-    }
-    Frame {
-        msec: 4256
-        hash: "5a8932d13d624932a65694fd19ec05cd"
-    }
-    Frame {
-        msec: 4272
-        hash: "48e62dd171f5da82b5aa26c765e4042c"
-    }
-    Frame {
-        msec: 4288
-        hash: "63d3c47f7dec1236440a05e0a8380900"
-    }
-    Frame {
-        msec: 4304
-        hash: "323af110731b7af0c30f8862ff59b833"
-    }
-    Frame {
-        msec: 4320
-        hash: "83c029e328e80af83158c37089cf0ece"
-    }
-    Frame {
-        msec: 4336
-        hash: "3f9a09ae19be34348bb2552915360cf7"
-    }
-    Frame {
-        msec: 4352
-        hash: "df624d70cae1bcefda8d69c0ff055d83"
-    }
-    Frame {
-        msec: 4368
-        hash: "d671a3b971468e1d8aa30ab655e020a9"
-    }
-    Frame {
-        msec: 4384
-        hash: "74c837b29f7f05b615123f0e608b523f"
-    }
-    Frame {
-        msec: 4400
-        hash: "277ef98ea859fb7685fe6cd44a538a7d"
-    }
-    Frame {
-        msec: 4416
-        hash: "0a8da7a3f57c3e06e4be5ea1d8a83ae9"
-    }
-    Frame {
-        msec: 4432
-        hash: "456be9c208d690c479ba12bf6325dde0"
-    }
-    Frame {
-        msec: 4448
-        hash: "10307beea6d99ab0ff5863f8e35555ed"
-    }
-    Frame {
-        msec: 4464
-        hash: "170a1d5fe3422cf5223a78015a6a45fd"
-    }
-    Frame {
-        msec: 4480
-        hash: "64ecb03aa538e74d0b99c6dec7751401"
-    }
-    Frame {
-        msec: 4496
-        hash: "f3a7e74a1839f9366f9eeec4d2b80d1e"
-    }
-    Frame {
-        msec: 4512
-        hash: "37c3f25e5cfdb48d7e3ab0cf8ffb9154"
-    }
-    Frame {
-        msec: 4528
-        hash: "0af81ee0d76ff8335a0e347dc086ca37"
-    }
-    Frame {
-        msec: 4544
-        hash: "061406edcbd2d4930ab89c3fcab63c7f"
-    }
-    Frame {
-        msec: 4560
-        hash: "31d65134f340d82dd40f2401bda3fb7e"
-    }
-    Frame {
-        msec: 4576
-        hash: "16c16c77c65b36d1e0954d5ead2642be"
-    }
-    Frame {
-        msec: 4592
-        hash: "61c16009b65a55bffb63e27727e1615e"
-    }
-    Frame {
-        msec: 4608
-        hash: "e1474c2cdd8768ca1ef45bf3bc5234ca"
-    }
-    Frame {
-        msec: 4624
-        hash: "89c159ef00d273ecfe61332e1bf7244d"
-    }
-    Frame {
-        msec: 4640
-        hash: "f4d0d3bca25e67908b38910f47b4757e"
-    }
-    Frame {
-        msec: 4656
-        hash: "0e0c40f8e11a7bd499c80562ac6f8a82"
-    }
-    Frame {
-        msec: 4672
-        hash: "4310a4c3037d845f088f21ad608f366a"
-    }
-    Frame {
-        msec: 4688
-        hash: "3d518cd0348d6202243364af1dd6ce89"
-    }
-    Frame {
-        msec: 4704
-        hash: "41987e6b4248d7944c0dbc6eb3862023"
-    }
-    Frame {
-        msec: 4720
-        hash: "3e81338d38723d56f2d6c428271f81c1"
-    }
-    Frame {
-        msec: 4736
-        hash: "902683d72f789399e9d99d1cea1bf177"
-    }
-    Frame {
-        msec: 4752
-        hash: "efc119983701908a904deb24108c59cb"
-    }
-    Frame {
-        msec: 4768
-        hash: "3a77785cfd7755f567619d8e04583f6a"
-    }
-    Frame {
-        msec: 4784
-        hash: "fd85d1dd931033973283a408b5e328a8"
-    }
-    Frame {
-        msec: 4800
-        image: "animated-smooth.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "ae12f1f37a746e16b06e6b869c89fac1"
-    }
-    Frame {
-        msec: 4832
-        hash: "a15f19f374bbfb6a922b69d080a91eaa"
-    }
-    Frame {
-        msec: 4848
-        hash: "84ef6dda8318b623832f58c46d762e89"
-    }
-    Frame {
-        msec: 4864
-        hash: "b699285764f5e8866a9996f4a0dccc69"
-    }
-    Frame {
-        msec: 4880
-        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
-    }
-    Frame {
-        msec: 4896
-        hash: "177666cb3bb784c83196886b2c6cf6b6"
-    }
-    Frame {
-        msec: 4912
-        hash: "9cd29b4b023a8b92573575fb3c3dda83"
-    }
-    Frame {
-        msec: 4928
-        hash: "adc670a9aa0326744cb23e4f5912e6c7"
-    }
-    Frame {
-        msec: 4944
-        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
-    }
-    Frame {
-        msec: 4960
-        hash: "d7e96278583f83ab636ed68fa130e4d2"
-    }
-    Frame {
-        msec: 4976
-        hash: "64b21b89576fdd0083f60a26f57b9c11"
-    }
-    Frame {
-        msec: 4992
-        hash: "0d407ee07692d0e5a480a60952807b3c"
-    }
-    Frame {
-        msec: 5008
-        hash: "845170815a87565dc4229792032b3357"
-    }
-    Frame {
-        msec: 5024
-        hash: "8b8120cfc14de03e048632fdea61be21"
-    }
-    Frame {
-        msec: 5040
-        hash: "b0070117f1c24a4da87434725d4bb989"
-    }
-    Frame {
-        msec: 5056
-        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
-    }
-    Frame {
-        msec: 5072
-        hash: "3df54504f8891306fa8f1e9e2075a5e2"
-    }
-    Frame {
-        msec: 5088
-        hash: "853429387cc639496c7338244de7e1b7"
-    }
-    Frame {
-        msec: 5104
-        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
-    }
-    Frame {
-        msec: 5120
-        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
-    }
-    Frame {
-        msec: 5136
-        hash: "53f05993ba3b426949badd2e4cd66d84"
-    }
-    Frame {
-        msec: 5152
-        hash: "23291a0239c69ea07db959e709b1ff5f"
-    }
-    Frame {
-        msec: 5168
-        hash: "2192094410e2d7c8d9d4aa5f8deacff5"
-    }
-    Frame {
-        msec: 5184
-        hash: "d6615fc345831a3cc5b9a7196284b632"
-    }
-    Frame {
-        msec: 5200
-        hash: "92176cce4836dcae4dfca94e49b041a8"
-    }
-    Frame {
-        msec: 5216
-        hash: "2a1fcfb753ca237b518da26e67c928e5"
-    }
-    Frame {
-        msec: 5232
-        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
-    }
-    Frame {
-        msec: 5248
-        hash: "bd045f4532d78bba0ef1b64118fd9f24"
-    }
-    Frame {
-        msec: 5264
-        hash: "7f9999a9c87af43b9703323efab31770"
-    }
-    Frame {
-        msec: 5280
-        hash: "0640fcb0b24d3ba4ab8695f78271a438"
-    }
-    Frame {
-        msec: 5296
-        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
-    }
-    Frame {
-        msec: 5312
-        hash: "fce2648975106bc5c0ca9a4530f7f748"
-    }
-    Frame {
-        msec: 5328
-        hash: "39cc17ee2e889f17dd07179fda99e431"
-    }
-    Frame {
-        msec: 5344
-        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
-    }
-    Frame {
-        msec: 5360
-        hash: "d65d50fbb920e683b041a1c72238225b"
-    }
-    Frame {
-        msec: 5376
-        hash: "49a1df977b0494c7c72ca0b65c394e13"
-    }
-    Frame {
-        msec: 5392
-        hash: "05cbce0eaa80b4610a9067af8c40f819"
-    }
-    Frame {
-        msec: 5408
-        hash: "00ab7798bcd77a99886dff0414f35382"
-    }
-    Frame {
-        msec: 5424
-        hash: "5cc90d798786c270ddd2616512f4459f"
-    }
-    Frame {
-        msec: 5440
-        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
-    }
-    Frame {
-        msec: 5456
-        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
-    }
-    Frame {
-        msec: 5472
-        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
-    }
-    Frame {
-        msec: 5488
-        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
-    }
-    Frame {
-        msec: 5504
-        hash: "2fede2f5d871654f3f8a6e9d890adeac"
-    }
-    Frame {
-        msec: 5520
-        hash: "deed4c06c9b713834490832b88e7acaf"
-    }
-    Frame {
-        msec: 5536
-        hash: "c2edb016cfdd47c192d1c48281ee76ed"
-    }
-    Frame {
-        msec: 5552
-        hash: "a261be47ae89e6b53e6bc1c1197154ae"
-    }
-    Frame {
-        msec: 5568
-        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
-    }
-    Frame {
-        msec: 5584
-        hash: "a087b532ecb2f28e4ee60819228c2522"
-    }
-    Frame {
-        msec: 5600
-        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
-    }
-    Frame {
-        msec: 5616
-        hash: "4520003d4b221a3de6834b2729b3026d"
-    }
-    Frame {
-        msec: 5632
-        hash: "d1110817827c318ceb0c112e8c2bfc1d"
-    }
-    Frame {
-        msec: 5648
-        hash: "83d49474db15d5779923972ff5f55917"
-    }
-    Frame {
-        msec: 5664
-        hash: "3bae40654ec551d69e7c8c72f631c7a5"
-    }
-    Frame {
-        msec: 5680
-        hash: "774740a393f3e9b8f12b81cce8da8280"
-    }
-    Frame {
-        msec: 5696
-        hash: "d8e398a1ce9ca45c19951e93bd5c932a"
-    }
-    Frame {
-        msec: 5712
-        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
-    }
-    Frame {
-        msec: 5728
-        hash: "47e920e3884ccf2f0f49e78070af6929"
-    }
-    Frame {
-        msec: 5744
-        hash: "fc913807eb1069d611495fbd5d43ee3d"
-    }
-    Frame {
-        msec: 5760
-        image: "animated-smooth.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "5736362b42bc2d801e02edabb983663a"
-    }
-    Frame {
-        msec: 5792
-        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
-    }
-    Frame {
-        msec: 5808
-        hash: "48952ffa5e300778eafa768b9fe7df0c"
-    }
-    Frame {
-        msec: 5824
-        hash: "fe04cae65aeec18697eca4f3f83a40e9"
-    }
-    Frame {
-        msec: 5840
-        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
-    }
-    Frame {
-        msec: 5856
-        hash: "89022a8e2feb3dcb845de69aafc333ad"
-    }
-    Frame {
-        msec: 5872
-        hash: "25506557c853a0020e98cf3992956989"
-    }
-    Frame {
-        msec: 5888
-        hash: "9a64706c52c9e962816953e32950b8ba"
-    }
-    Frame {
-        msec: 5904
-        hash: "3cbfded47413172ada64095e65c55e8a"
-    }
-    Frame {
-        msec: 5920
-        hash: "ec7e1190dd4fe122545e6ce6c8740500"
-    }
-    Frame {
-        msec: 5936
-        hash: "c5e399e29b988148913e62ee208b3326"
-    }
-    Frame {
-        msec: 5952
-        hash: "3991bc7760b7981d80665e3a7654c9f4"
-    }
-    Frame {
-        msec: 5968
-        hash: "05312f9529c94d3331ace7d73c544284"
-    }
-    Frame {
-        msec: 5984
-        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
-    }
-    Frame {
-        msec: 6000
-        hash: "723f87da7e5b002a2e9b0bcbc81f9458"
-    }
-    Frame {
-        msec: 6016
-        hash: "6b8ded0d9386a3fff0601a100c513080"
-    }
-    Frame {
-        msec: 6032
-        hash: "f976cd5046ef5391536859e63db905bd"
-    }
-    Frame {
-        msec: 6048
-        hash: "a94de4e90a8f8eb4ec33fe902afd226c"
-    }
-    Frame {
-        msec: 6064
-        hash: "05312f9529c94d3331ace7d73c544284"
-    }
-    Frame {
-        msec: 6080
-        hash: "b980703c1d0018937e83a8ba8862469e"
-    }
-    Frame {
-        msec: 6096
-        hash: "c5e399e29b988148913e62ee208b3326"
-    }
-    Frame {
-        msec: 6112
-        hash: "3b7b83e97d17440b42e6ef4b962076d8"
-    }
-    Frame {
-        msec: 6128
-        hash: "3cbfded47413172ada64095e65c55e8a"
-    }
-    Frame {
-        msec: 6144
-        hash: "9a64706c52c9e962816953e32950b8ba"
-    }
-    Frame {
-        msec: 6160
-        hash: "25506557c853a0020e98cf3992956989"
-    }
-    Frame {
-        msec: 6176
-        hash: "89022a8e2feb3dcb845de69aafc333ad"
-    }
-    Frame {
-        msec: 6192
-        hash: "382d454f2366c1fb4ca472faa3bfa5e9"
-    }
-    Frame {
-        msec: 6208
-        hash: "fe04cae65aeec18697eca4f3f83a40e9"
-    }
-    Frame {
-        msec: 6224
-        hash: "48952ffa5e300778eafa768b9fe7df0c"
-    }
-    Frame {
-        msec: 6240
-        hash: "e3a2b5c7247acfc1b30825233fbfd56b"
-    }
-    Frame {
-        msec: 6256
-        hash: "5736362b42bc2d801e02edabb983663a"
-    }
-    Frame {
-        msec: 6272
-        hash: "5d9ee853f083d514fbe51d6953d8e000"
-    }
-    Frame {
-        msec: 6288
-        hash: "fe899138116774df4c4441687e3019c5"
-    }
-    Frame {
-        msec: 6304
-        hash: "47e920e3884ccf2f0f49e78070af6929"
-    }
-    Frame {
-        msec: 6320
-        hash: "2b7eb8a9fe26b032be8b4b9c00995912"
-    }
-    Frame {
-        msec: 6336
-        hash: "64cd225202ed6c91b02c368a9160a656"
-    }
-    Frame {
-        msec: 6352
-        hash: "774740a393f3e9b8f12b81cce8da8280"
-    }
-    Frame {
-        msec: 6368
-        hash: "3bae40654ec551d69e7c8c72f631c7a5"
-    }
-    Frame {
-        msec: 6384
-        hash: "83d49474db15d5779923972ff5f55917"
-    }
-    Frame {
-        msec: 6400
-        hash: "d1110817827c318ceb0c112e8c2bfc1d"
-    }
-    Frame {
-        msec: 6416
-        hash: "4520003d4b221a3de6834b2729b3026d"
-    }
-    Frame {
-        msec: 6432
-        hash: "64df51b4c1bf744b2aae1c6d908c2cc3"
-    }
-    Frame {
-        msec: 6448
-        hash: "a087b532ecb2f28e4ee60819228c2522"
-    }
-    Frame {
-        msec: 6464
-        hash: "e860e97ebd73b7d1d5d5d90458b34bfe"
-    }
-    Frame {
-        msec: 6480
-        hash: "a261be47ae89e6b53e6bc1c1197154ae"
-    }
-    Frame {
-        msec: 6496
-        hash: "c2edb016cfdd47c192d1c48281ee76ed"
-    }
-    Frame {
-        msec: 6512
-        hash: "deed4c06c9b713834490832b88e7acaf"
-    }
-    Frame {
-        msec: 6528
-        hash: "2fede2f5d871654f3f8a6e9d890adeac"
-    }
-    Frame {
-        msec: 6544
-        hash: "29ddde3300d0520a4c01b5536d8b9e7a"
-    }
-    Frame {
-        msec: 6560
-        hash: "c61d2aa7f934fb5a9f9f7883e063b51c"
-    }
-    Frame {
-        msec: 6576
-        hash: "ddf1f5c0b97fe4821719ec5bf4bd091b"
-    }
-    Frame {
-        msec: 6592
-        hash: "e5df07ea21e8e415c3ec82560f2d0f34"
-    }
-    Frame {
-        msec: 6608
-        hash: "5cc90d798786c270ddd2616512f4459f"
-    }
-    Frame {
-        msec: 6624
-        hash: "00ab7798bcd77a99886dff0414f35382"
-    }
-    Frame {
-        msec: 6640
-        hash: "05cbce0eaa80b4610a9067af8c40f819"
-    }
-    Frame {
-        msec: 6656
-        hash: "a676f45d946aeb9fa577c0e862735b01"
-    }
-    Frame {
-        msec: 6672
-        hash: "d65d50fbb920e683b041a1c72238225b"
-    }
-    Frame {
-        msec: 6688
-        hash: "39c46d85d20f7ef3eca1d09c7eb6a068"
-    }
-    Frame {
-        msec: 6704
-        hash: "39cc17ee2e889f17dd07179fda99e431"
-    }
-    Frame {
-        msec: 6720
-        image: "animated-smooth.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "7c9a98e2101c33e17c1bd7e6c2d921ff"
-    }
-    Frame {
-        msec: 6752
-        hash: "0640fcb0b24d3ba4ab8695f78271a438"
-    }
-    Frame {
-        msec: 6768
-        hash: "2084ccc60ddd493399c128717816d33b"
-    }
-    Frame {
-        msec: 6784
-        hash: "bd045f4532d78bba0ef1b64118fd9f24"
-    }
-    Frame {
-        msec: 6800
-        hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
-    }
-    Frame {
-        msec: 6816
-        hash: "2a1fcfb753ca237b518da26e67c928e5"
-    }
-    Frame {
-        msec: 6832
-        hash: "92176cce4836dcae4dfca94e49b041a8"
-    }
-    Frame {
-        msec: 6848
-        hash: "d6615fc345831a3cc5b9a7196284b632"
-    }
-    Frame {
-        msec: 6864
-        hash: "85ef33fcb3f91e4fc20391bf94455984"
-    }
-    Frame {
-        msec: 6880
-        hash: "23291a0239c69ea07db959e709b1ff5f"
-    }
-    Frame {
-        msec: 6896
-        hash: "53f05993ba3b426949badd2e4cd66d84"
-    }
-    Frame {
-        msec: 6912
-        hash: "b375e723b2396b13b8f55cfc0c81c3c3"
-    }
-    Frame {
-        msec: 6928
-        hash: "bd70500fbdfe5aa2fe4362a97a1dee2d"
-    }
-    Frame {
-        msec: 6944
-        hash: "853429387cc639496c7338244de7e1b7"
-    }
-    Frame {
-        msec: 6960
-        hash: "3df54504f8891306fa8f1e9e2075a5e2"
-    }
-    Frame {
-        msec: 6976
-        hash: "0239d697642ca1d1b1d1daa3ea048e1e"
-    }
-    Frame {
-        msec: 6992
-        hash: "b0070117f1c24a4da87434725d4bb989"
-    }
-    Frame {
-        msec: 7008
-        hash: "8b8120cfc14de03e048632fdea61be21"
-    }
-    Frame {
-        msec: 7024
-        hash: "845170815a87565dc4229792032b3357"
-    }
-    Frame {
-        msec: 7040
-        hash: "0d407ee07692d0e5a480a60952807b3c"
-    }
-    Frame {
-        msec: 7056
-        hash: "64b21b89576fdd0083f60a26f57b9c11"
-    }
-    Frame {
-        msec: 7072
-        hash: "d7e96278583f83ab636ed68fa130e4d2"
-    }
-    Frame {
-        msec: 7088
-        hash: "48db9a5e6aad9a9563a3cd35fb7fa9b6"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7104
-        hash: "adc670a9aa0326744cb23e4f5912e6c7"
-    }
-    Frame {
-        msec: 7120
-        hash: "9cd29b4b023a8b92573575fb3c3dda83"
-    }
-    Frame {
-        msec: 7136
-        hash: "177666cb3bb784c83196886b2c6cf6b6"
-    }
-    Frame {
-        msec: 7152
-        hash: "ddd8a006ef048c8d929144aa9fcd7c5a"
-    }
-    Frame {
-        msec: 7168
-        hash: "b699285764f5e8866a9996f4a0dccc69"
-    }
-    Frame {
-        msec: 7184
-        hash: "84ef6dda8318b623832f58c46d762e89"
-    }
-    Frame {
-        msec: 7200
-        hash: "a15f19f374bbfb6a922b69d080a91eaa"
-    }
-    Frame {
-        msec: 7216
-        hash: "ae12f1f37a746e16b06e6b869c89fac1"
-    }
-    Frame {
-        msec: 7232
-        hash: "5d3e85acabe5e5ff802eb7731676274f"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.0.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.0.png
deleted file mode 100644
index 99228f9..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.1.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.1.png
deleted file mode 100644
index a2dcd00..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.2.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.2.png
deleted file mode 100644
index 8a80020..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.3.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.3.png
deleted file mode 100644
index 02b57ef..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.4.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.4.png
deleted file mode 100644
index df0f6cc..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.5.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.5.png
deleted file mode 100644
index 0add64d..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.6.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.6.png
deleted file mode 100644
index 0886207..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.7.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.7.png
deleted file mode 100644
index bc1a7b0..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.qml
deleted file mode 100644
index 29e591a..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.qml
+++ /dev/null
@@ -1,2091 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 32
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 48
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 64
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 80
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 96
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 128
-        hash: "4c60d345821f515c7811f3b69eb94607"
-    }
-    Frame {
-        msec: 144
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
-    }
-    Frame {
-        msec: 160
-        hash: "228d5312c261d1a5455faf69ec2f2520"
-    }
-    Frame {
-        msec: 176
-        hash: "465ec993948f7b75aeb5759976f4620d"
-    }
-    Frame {
-        msec: 192
-        hash: "755cfccc38bababc468fe6e1076804bb"
-    }
-    Frame {
-        msec: 208
-        hash: "b63e4d1686057828fd8781f1c33585f5"
-    }
-    Frame {
-        msec: 224
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
-    }
-    Frame {
-        msec: 240
-        hash: "4d45d70f997c2c67166905c97a900d2e"
-    }
-    Frame {
-        msec: 256
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
-    }
-    Frame {
-        msec: 272
-        hash: "08b9be66e23c7b6f6f629c7470394601"
-    }
-    Frame {
-        msec: 288
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
-    }
-    Frame {
-        msec: 304
-        hash: "406224b535b4425d2708df0083acdc8e"
-    }
-    Frame {
-        msec: 320
-        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
-    }
-    Frame {
-        msec: 336
-        hash: "8419f1d75b14130730bcfec4e3a9b058"
-    }
-    Frame {
-        msec: 352
-        hash: "a85ee8be6a47bbd1b14137803ce606ec"
-    }
-    Frame {
-        msec: 368
-        hash: "c1936628aec13e08e9581dcd2c6d5717"
-    }
-    Frame {
-        msec: 384
-        hash: "75c9bf83ca3fe24612c245698c089430"
-    }
-    Frame {
-        msec: 400
-        hash: "8c66a33d26eec2a1133f4362710a5fab"
-    }
-    Frame {
-        msec: 416
-        hash: "2266df495ab5265e7514a506d3bf5bc6"
-    }
-    Frame {
-        msec: 432
-        hash: "01947e631c3db43f7c5b4427229bc0c8"
-    }
-    Frame {
-        msec: 448
-        hash: "3f62f032239d412d3637198f5e3e83d6"
-    }
-    Frame {
-        msec: 464
-        hash: "06d8d8a1a41893d4e27725948a75caf4"
-    }
-    Frame {
-        msec: 480
-        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
-    }
-    Frame {
-        msec: 496
-        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
-    }
-    Frame {
-        msec: 512
-        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
-    }
-    Frame {
-        msec: 528
-        hash: "2a7bed775824968e318c3d40fbc5b1c2"
-    }
-    Frame {
-        msec: 544
-        hash: "3152e5f29015ece423fbdd11a2b382b8"
-    }
-    Frame {
-        msec: 560
-        hash: "f1a7a4a67a21f5025294af4bea3f8998"
-    }
-    Frame {
-        msec: 576
-        hash: "a40014d842471784e1222eb205395f6f"
-    }
-    Frame {
-        msec: 592
-        hash: "18c2f321a149e38b258ac264d40c2376"
-    }
-    Frame {
-        msec: 608
-        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
-    }
-    Frame {
-        msec: 624
-        hash: "19d05a96f3ae7388e854bbf1075b51c1"
-    }
-    Frame {
-        msec: 640
-        hash: "e418b5f54705515dce5ce3b4cbc45d19"
-    }
-    Frame {
-        msec: 656
-        hash: "554e1d360463871e7c05cfe6f8abe1dd"
-    }
-    Frame {
-        msec: 672
-        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
-    }
-    Frame {
-        msec: 688
-        hash: "60f158382f75103c78e2b9b408e0fe65"
-    }
-    Frame {
-        msec: 704
-        hash: "4e60300cfab8634e04dcd1b556251d31"
-    }
-    Frame {
-        msec: 720
-        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
-    }
-    Frame {
-        msec: 736
-        hash: "b74521d6ac531414aeeca0fb28379d11"
-    }
-    Frame {
-        msec: 752
-        hash: "a6f17da2dd581bdc249ff62f833dc025"
-    }
-    Frame {
-        msec: 768
-        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
-    }
-    Frame {
-        msec: 784
-        hash: "1ea07ee309ce2c52cbc36370b75a872f"
-    }
-    Frame {
-        msec: 800
-        hash: "593a8a45c3a0cd7ce1cb6bd1913136ba"
-    }
-    Frame {
-        msec: 816
-        hash: "c7eb7837dce71c914186326216214eeb"
-    }
-    Frame {
-        msec: 832
-        hash: "0cba07ca38c7f0483244832a42d9ac53"
-    }
-    Frame {
-        msec: 848
-        hash: "93cf31eabb454ec536c638a506be0648"
-    }
-    Frame {
-        msec: 864
-        hash: "e8a61d3858244127cb2b2812f04f5ce9"
-    }
-    Frame {
-        msec: 880
-        hash: "1ac8c393f084aa1894c26610b7f40ea6"
-    }
-    Frame {
-        msec: 896
-        hash: "8861bf848da5c96b35addff736b01520"
-    }
-    Frame {
-        msec: 912
-        hash: "f04e84ad3579d6334077abe73101d206"
-    }
-    Frame {
-        msec: 928
-        hash: "eac4600372f0fdfadee88896ac915a48"
-    }
-    Frame {
-        msec: 944
-        hash: "ff0928dfd16b2da9811a172c19817a97"
-    }
-    Frame {
-        msec: 960
-        image: "animated.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "7383209c80b403b93da3264eadbc047f"
-    }
-    Frame {
-        msec: 992
-        hash: "86360bd58bba5fdd901c105ddb2e3ade"
-    }
-    Frame {
-        msec: 1008
-        hash: "bc747167dfb3388ac63e9e68a86b9a03"
-    }
-    Frame {
-        msec: 1024
-        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
-    }
-    Frame {
-        msec: 1040
-        hash: "ae48da4a66f93c806725ce749700aac8"
-    }
-    Frame {
-        msec: 1056
-        hash: "c763f56728e17fc119539a4d45dfccc3"
-    }
-    Frame {
-        msec: 1072
-        hash: "956429472da133324c970774f77784f5"
-    }
-    Frame {
-        msec: 1088
-        hash: "a4ddb4956d71fd642d54757938100cf3"
-    }
-    Frame {
-        msec: 1104
-        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
-    }
-    Frame {
-        msec: 1120
-        hash: "68dae343cf324391ec6721cea14575f7"
-    }
-    Frame {
-        msec: 1136
-        hash: "81d2fc6727dc7449d1a87b4abea9b704"
-    }
-    Frame {
-        msec: 1152
-        hash: "c3a1f12febc979150028737722d6d045"
-    }
-    Frame {
-        msec: 1168
-        hash: "80ebac4d923f67fb8dba3d133ce657ba"
-    }
-    Frame {
-        msec: 1184
-        hash: "7c22fc3e30377cc14326833bdd23ddd8"
-    }
-    Frame {
-        msec: 1200
-        hash: "5359f5e45e5467c62c2d9521c8199c48"
-    }
-    Frame {
-        msec: 1216
-        hash: "30f84a7f67b13a945ba6d5935ea92da5"
-    }
-    Frame {
-        msec: 1232
-        hash: "08f55088cdce741c67539f73291e53ab"
-    }
-    Frame {
-        msec: 1248
-        hash: "93128906d054e44bfd126fc22bdc3102"
-    }
-    Frame {
-        msec: 1264
-        hash: "97f7a2175dcf9ac2581a92d614d72f88"
-    }
-    Frame {
-        msec: 1280
-        hash: "587cb6e05048579088e88e0180e3ad48"
-    }
-    Frame {
-        msec: 1296
-        hash: "985868869ef2c332da379460a2f3a71b"
-    }
-    Frame {
-        msec: 1312
-        hash: "94084ca4998fcda408f6987f52c34185"
-    }
-    Frame {
-        msec: 1328
-        hash: "e91bb914c1eb63cd4269b30a220a128a"
-    }
-    Frame {
-        msec: 1344
-        hash: "e880d93963c80e4fab5173554c9600fc"
-    }
-    Frame {
-        msec: 1360
-        hash: "84c94704c16e246df1048f958cc8cefb"
-    }
-    Frame {
-        msec: 1376
-        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
-    }
-    Frame {
-        msec: 1392
-        hash: "99de44f74f8e1f79652ab46afb4bb59e"
-    }
-    Frame {
-        msec: 1408
-        hash: "44072400ca3f0237d1aebae28a94becc"
-    }
-    Frame {
-        msec: 1424
-        hash: "a1bd4e995365e79389dba80f9e3b7af8"
-    }
-    Frame {
-        msec: 1440
-        hash: "95d776c84fe155617fc4ee51bdb45b7e"
-    }
-    Frame {
-        msec: 1456
-        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
-    }
-    Frame {
-        msec: 1472
-        hash: "826c7741ba0c51de407bb799e8f360b5"
-    }
-    Frame {
-        msec: 1488
-        hash: "11673a112566a64aca3c7010b9cc9c4d"
-    }
-    Frame {
-        msec: 1504
-        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
-    }
-    Frame {
-        msec: 1520
-        hash: "5b027815ea3c1ea54e1a02c798c468db"
-    }
-    Frame {
-        msec: 1536
-        hash: "65c514c9e926affe1da0b4826d2754c7"
-    }
-    Frame {
-        msec: 1552
-        hash: "73c5f23f51797a33f4d2898738e6356e"
-    }
-    Frame {
-        msec: 1568
-        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
-    }
-    Frame {
-        msec: 1584
-        hash: "fb17df681d99d5de05f6329bba697ea5"
-    }
-    Frame {
-        msec: 1600
-        hash: "1bf7a98884b506b38326f59f85a53f41"
-    }
-    Frame {
-        msec: 1616
-        hash: "0b1a741975e3d9ef8f5e78f371c89441"
-    }
-    Frame {
-        msec: 1632
-        hash: "a6937ee49648ed0cb409063bf1da3b87"
-    }
-    Frame {
-        msec: 1648
-        hash: "a790f0e884ab85f7802dd094e4ef550f"
-    }
-    Frame {
-        msec: 1664
-        hash: "3b644aac161f0a75bfb64f5075373190"
-    }
-    Frame {
-        msec: 1680
-        hash: "b12faa76c07adc21634cd8f8cb8436ae"
-    }
-    Frame {
-        msec: 1696
-        hash: "3fb20f9dbd40b4729235e13af9643afc"
-    }
-    Frame {
-        msec: 1712
-        hash: "f57727419bb51fb1e589b960ddeb20ae"
-    }
-    Frame {
-        msec: 1728
-        hash: "7b78cba247f2c209ed81e003ca25d0a5"
-    }
-    Frame {
-        msec: 1744
-        hash: "8172e076b05d95248d89e815fde820ef"
-    }
-    Frame {
-        msec: 1760
-        hash: "a88d6fc324ef48aa52c642a1662ec679"
-    }
-    Frame {
-        msec: 1776
-        hash: "74c1e71378b502bc1b732a55806a10f1"
-    }
-    Frame {
-        msec: 1792
-        hash: "6eae517ad33f0609c31ef1f8f80ba899"
-    }
-    Frame {
-        msec: 1808
-        hash: "a67e9a0f55512fb1c55f13c6b483923b"
-    }
-    Frame {
-        msec: 1824
-        hash: "4887cd34d9926a361f3ca2e75be53ea6"
-    }
-    Frame {
-        msec: 1840
-        hash: "13ca95adab171d9fad9ee8b75d0226bc"
-    }
-    Frame {
-        msec: 1856
-        hash: "affab9fb48c889a2680eb81458d400f9"
-    }
-    Frame {
-        msec: 1872
-        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
-    }
-    Frame {
-        msec: 1888
-        hash: "36c054064c9a76f4072492e55c70fb6c"
-    }
-    Frame {
-        msec: 1904
-        hash: "d1ed4916cb1ecff60277d74369ff311b"
-    }
-    Frame {
-        msec: 1920
-        image: "animated.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "29245946cbd811fe6bf6b2b41cc13002"
-    }
-    Frame {
-        msec: 1952
-        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
-    }
-    Frame {
-        msec: 1968
-        hash: "058c918e83bfdd665cd836566b53959b"
-    }
-    Frame {
-        msec: 1984
-        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
-    }
-    Frame {
-        msec: 2000
-        hash: "ed5d80c33dbf72624385b1cf43784626"
-    }
-    Frame {
-        msec: 2016
-        hash: "911591db1519ba264847f09868e38e0e"
-    }
-    Frame {
-        msec: 2032
-        hash: "ed5d80c33dbf72624385b1cf43784626"
-    }
-    Frame {
-        msec: 2048
-        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
-    }
-    Frame {
-        msec: 2064
-        hash: "058c918e83bfdd665cd836566b53959b"
-    }
-    Frame {
-        msec: 2080
-        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
-    }
-    Frame {
-        msec: 2096
-        hash: "29245946cbd811fe6bf6b2b41cc13002"
-    }
-    Frame {
-        msec: 2112
-        hash: "63ebaa4869728f5e2891d068e4b0091c"
-    }
-    Frame {
-        msec: 2128
-        hash: "d1ed4916cb1ecff60277d74369ff311b"
-    }
-    Frame {
-        msec: 2144
-        hash: "36c054064c9a76f4072492e55c70fb6c"
-    }
-    Frame {
-        msec: 2160
-        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
-    }
-    Frame {
-        msec: 2176
-        hash: "affab9fb48c889a2680eb81458d400f9"
-    }
-    Frame {
-        msec: 2192
-        hash: "13ca95adab171d9fad9ee8b75d0226bc"
-    }
-    Frame {
-        msec: 2208
-        hash: "4887cd34d9926a361f3ca2e75be53ea6"
-    }
-    Frame {
-        msec: 2224
-        hash: "a67e9a0f55512fb1c55f13c6b483923b"
-    }
-    Frame {
-        msec: 2240
-        hash: "6eae517ad33f0609c31ef1f8f80ba899"
-    }
-    Frame {
-        msec: 2256
-        hash: "74c1e71378b502bc1b732a55806a10f1"
-    }
-    Frame {
-        msec: 2272
-        hash: "a88d6fc324ef48aa52c642a1662ec679"
-    }
-    Frame {
-        msec: 2288
-        hash: "8172e076b05d95248d89e815fde820ef"
-    }
-    Frame {
-        msec: 2304
-        hash: "7b78cba247f2c209ed81e003ca25d0a5"
-    }
-    Frame {
-        msec: 2320
-        hash: "f57727419bb51fb1e589b960ddeb20ae"
-    }
-    Frame {
-        msec: 2336
-        hash: "3fb20f9dbd40b4729235e13af9643afc"
-    }
-    Frame {
-        msec: 2352
-        hash: "b12faa76c07adc21634cd8f8cb8436ae"
-    }
-    Frame {
-        msec: 2368
-        hash: "3b644aac161f0a75bfb64f5075373190"
-    }
-    Frame {
-        msec: 2384
-        hash: "a790f0e884ab85f7802dd094e4ef550f"
-    }
-    Frame {
-        msec: 2400
-        hash: "a6937ee49648ed0cb409063bf1da3b87"
-    }
-    Frame {
-        msec: 2416
-        hash: "0b1a741975e3d9ef8f5e78f371c89441"
-    }
-    Frame {
-        msec: 2432
-        hash: "1bf7a98884b506b38326f59f85a53f41"
-    }
-    Frame {
-        msec: 2448
-        hash: "fb17df681d99d5de05f6329bba697ea5"
-    }
-    Frame {
-        msec: 2464
-        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
-    }
-    Frame {
-        msec: 2480
-        hash: "73c5f23f51797a33f4d2898738e6356e"
-    }
-    Frame {
-        msec: 2496
-        hash: "65c514c9e926affe1da0b4826d2754c7"
-    }
-    Frame {
-        msec: 2512
-        hash: "5b027815ea3c1ea54e1a02c798c468db"
-    }
-    Frame {
-        msec: 2528
-        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
-    }
-    Frame {
-        msec: 2544
-        hash: "11673a112566a64aca3c7010b9cc9c4d"
-    }
-    Frame {
-        msec: 2560
-        hash: "826c7741ba0c51de407bb799e8f360b5"
-    }
-    Frame {
-        msec: 2576
-        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
-    }
-    Frame {
-        msec: 2592
-        hash: "95d776c84fe155617fc4ee51bdb45b7e"
-    }
-    Frame {
-        msec: 2608
-        hash: "a1bd4e995365e79389dba80f9e3b7af8"
-    }
-    Frame {
-        msec: 2624
-        hash: "44072400ca3f0237d1aebae28a94becc"
-    }
-    Frame {
-        msec: 2640
-        hash: "99de44f74f8e1f79652ab46afb4bb59e"
-    }
-    Frame {
-        msec: 2656
-        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
-    }
-    Frame {
-        msec: 2672
-        hash: "84c94704c16e246df1048f958cc8cefb"
-    }
-    Frame {
-        msec: 2688
-        hash: "e880d93963c80e4fab5173554c9600fc"
-    }
-    Frame {
-        msec: 2704
-        hash: "e91bb914c1eb63cd4269b30a220a128a"
-    }
-    Frame {
-        msec: 2720
-        hash: "94084ca4998fcda408f6987f52c34185"
-    }
-    Frame {
-        msec: 2736
-        hash: "985868869ef2c332da379460a2f3a71b"
-    }
-    Frame {
-        msec: 2752
-        hash: "587cb6e05048579088e88e0180e3ad48"
-    }
-    Frame {
-        msec: 2768
-        hash: "97f7a2175dcf9ac2581a92d614d72f88"
-    }
-    Frame {
-        msec: 2784
-        hash: "93128906d054e44bfd126fc22bdc3102"
-    }
-    Frame {
-        msec: 2800
-        hash: "08f55088cdce741c67539f73291e53ab"
-    }
-    Frame {
-        msec: 2816
-        hash: "30f84a7f67b13a945ba6d5935ea92da5"
-    }
-    Frame {
-        msec: 2832
-        hash: "5359f5e45e5467c62c2d9521c8199c48"
-    }
-    Frame {
-        msec: 2848
-        hash: "7c22fc3e30377cc14326833bdd23ddd8"
-    }
-    Frame {
-        msec: 2864
-        hash: "80ebac4d923f67fb8dba3d133ce657ba"
-    }
-    Frame {
-        msec: 2880
-        image: "animated.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "81d2fc6727dc7449d1a87b4abea9b704"
-    }
-    Frame {
-        msec: 2912
-        hash: "68dae343cf324391ec6721cea14575f7"
-    }
-    Frame {
-        msec: 2928
-        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
-    }
-    Frame {
-        msec: 2944
-        hash: "a4ddb4956d71fd642d54757938100cf3"
-    }
-    Frame {
-        msec: 2960
-        hash: "956429472da133324c970774f77784f5"
-    }
-    Frame {
-        msec: 2976
-        hash: "c763f56728e17fc119539a4d45dfccc3"
-    }
-    Frame {
-        msec: 2992
-        hash: "ae48da4a66f93c806725ce749700aac8"
-    }
-    Frame {
-        msec: 3008
-        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
-    }
-    Frame {
-        msec: 3024
-        hash: "bc747167dfb3388ac63e9e68a86b9a03"
-    }
-    Frame {
-        msec: 3040
-        hash: "86360bd58bba5fdd901c105ddb2e3ade"
-    }
-    Frame {
-        msec: 3056
-        hash: "7383209c80b403b93da3264eadbc047f"
-    }
-    Frame {
-        msec: 3072
-        hash: "280288a7988736e30a2a3e4289ac3b0c"
-    }
-    Frame {
-        msec: 3088
-        hash: "ff0928dfd16b2da9811a172c19817a97"
-    }
-    Frame {
-        msec: 3104
-        hash: "eac4600372f0fdfadee88896ac915a48"
-    }
-    Frame {
-        msec: 3120
-        hash: "f04e84ad3579d6334077abe73101d206"
-    }
-    Frame {
-        msec: 3136
-        hash: "8861bf848da5c96b35addff736b01520"
-    }
-    Frame {
-        msec: 3152
-        hash: "1ac8c393f084aa1894c26610b7f40ea6"
-    }
-    Frame {
-        msec: 3168
-        hash: "e8a61d3858244127cb2b2812f04f5ce9"
-    }
-    Frame {
-        msec: 3184
-        hash: "93cf31eabb454ec536c638a506be0648"
-    }
-    Frame {
-        msec: 3200
-        hash: "0cba07ca38c7f0483244832a42d9ac53"
-    }
-    Frame {
-        msec: 3216
-        hash: "c7eb7837dce71c914186326216214eeb"
-    }
-    Frame {
-        msec: 3232
-        hash: "593a8a45c3a0cd7ce1cb6bd1913136ba"
-    }
-    Frame {
-        msec: 3248
-        hash: "1ea07ee309ce2c52cbc36370b75a872f"
-    }
-    Frame {
-        msec: 3264
-        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
-    }
-    Frame {
-        msec: 3280
-        hash: "a6f17da2dd581bdc249ff62f833dc025"
-    }
-    Frame {
-        msec: 3296
-        hash: "b74521d6ac531414aeeca0fb28379d11"
-    }
-    Frame {
-        msec: 3312
-        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
-    }
-    Frame {
-        msec: 3328
-        hash: "4e60300cfab8634e04dcd1b556251d31"
-    }
-    Frame {
-        msec: 3344
-        hash: "60f158382f75103c78e2b9b408e0fe65"
-    }
-    Frame {
-        msec: 3360
-        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
-    }
-    Frame {
-        msec: 3376
-        hash: "554e1d360463871e7c05cfe6f8abe1dd"
-    }
-    Frame {
-        msec: 3392
-        hash: "e418b5f54705515dce5ce3b4cbc45d19"
-    }
-    Frame {
-        msec: 3408
-        hash: "19d05a96f3ae7388e854bbf1075b51c1"
-    }
-    Frame {
-        msec: 3424
-        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
-    }
-    Frame {
-        msec: 3440
-        hash: "18c2f321a149e38b258ac264d40c2376"
-    }
-    Frame {
-        msec: 3456
-        hash: "a40014d842471784e1222eb205395f6f"
-    }
-    Frame {
-        msec: 3472
-        hash: "f1a7a4a67a21f5025294af4bea3f8998"
-    }
-    Frame {
-        msec: 3488
-        hash: "3152e5f29015ece423fbdd11a2b382b8"
-    }
-    Frame {
-        msec: 3504
-        hash: "2a7bed775824968e318c3d40fbc5b1c2"
-    }
-    Frame {
-        msec: 3520
-        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
-    }
-    Frame {
-        msec: 3536
-        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
-    }
-    Frame {
-        msec: 3552
-        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
-    }
-    Frame {
-        msec: 3568
-        hash: "06d8d8a1a41893d4e27725948a75caf4"
-    }
-    Frame {
-        msec: 3584
-        hash: "3f62f032239d412d3637198f5e3e83d6"
-    }
-    Frame {
-        msec: 3600
-        hash: "01947e631c3db43f7c5b4427229bc0c8"
-    }
-    Frame {
-        msec: 3616
-        hash: "2266df495ab5265e7514a506d3bf5bc6"
-    }
-    Frame {
-        msec: 3632
-        hash: "8c66a33d26eec2a1133f4362710a5fab"
-    }
-    Frame {
-        msec: 3648
-        hash: "75c9bf83ca3fe24612c245698c089430"
-    }
-    Frame {
-        msec: 3664
-        hash: "c1936628aec13e08e9581dcd2c6d5717"
-    }
-    Frame {
-        msec: 3680
-        hash: "a85ee8be6a47bbd1b14137803ce606ec"
-    }
-    Frame {
-        msec: 3696
-        hash: "8419f1d75b14130730bcfec4e3a9b058"
-    }
-    Frame {
-        msec: 3712
-        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
-    }
-    Frame {
-        msec: 3728
-        hash: "406224b535b4425d2708df0083acdc8e"
-    }
-    Frame {
-        msec: 3744
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
-    }
-    Frame {
-        msec: 3760
-        hash: "08b9be66e23c7b6f6f629c7470394601"
-    }
-    Frame {
-        msec: 3776
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
-    }
-    Frame {
-        msec: 3792
-        hash: "4d45d70f997c2c67166905c97a900d2e"
-    }
-    Frame {
-        msec: 3808
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
-    }
-    Frame {
-        msec: 3824
-        hash: "b63e4d1686057828fd8781f1c33585f5"
-    }
-    Frame {
-        msec: 3840
-        image: "animated.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "465ec993948f7b75aeb5759976f4620d"
-    }
-    Frame {
-        msec: 3872
-        hash: "228d5312c261d1a5455faf69ec2f2520"
-    }
-    Frame {
-        msec: 3888
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
-    }
-    Frame {
-        msec: 3904
-        hash: "4c60d345821f515c7811f3b69eb94607"
-    }
-    Frame {
-        msec: 3920
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3936
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3952
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3968
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 3984
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4000
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4016
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4032
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4048
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4064
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4080
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4096
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 4128
-        hash: "4c60d345821f515c7811f3b69eb94607"
-    }
-    Frame {
-        msec: 4144
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
-    }
-    Frame {
-        msec: 4160
-        hash: "228d5312c261d1a5455faf69ec2f2520"
-    }
-    Frame {
-        msec: 4176
-        hash: "465ec993948f7b75aeb5759976f4620d"
-    }
-    Frame {
-        msec: 4192
-        hash: "755cfccc38bababc468fe6e1076804bb"
-    }
-    Frame {
-        msec: 4208
-        hash: "b63e4d1686057828fd8781f1c33585f5"
-    }
-    Frame {
-        msec: 4224
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
-    }
-    Frame {
-        msec: 4240
-        hash: "4d45d70f997c2c67166905c97a900d2e"
-    }
-    Frame {
-        msec: 4256
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
-    }
-    Frame {
-        msec: 4272
-        hash: "08b9be66e23c7b6f6f629c7470394601"
-    }
-    Frame {
-        msec: 4288
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
-    }
-    Frame {
-        msec: 4304
-        hash: "406224b535b4425d2708df0083acdc8e"
-    }
-    Frame {
-        msec: 4320
-        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
-    }
-    Frame {
-        msec: 4336
-        hash: "8419f1d75b14130730bcfec4e3a9b058"
-    }
-    Frame {
-        msec: 4352
-        hash: "a85ee8be6a47bbd1b14137803ce606ec"
-    }
-    Frame {
-        msec: 4368
-        hash: "c1936628aec13e08e9581dcd2c6d5717"
-    }
-    Frame {
-        msec: 4384
-        hash: "75c9bf83ca3fe24612c245698c089430"
-    }
-    Frame {
-        msec: 4400
-        hash: "8c66a33d26eec2a1133f4362710a5fab"
-    }
-    Frame {
-        msec: 4416
-        hash: "2266df495ab5265e7514a506d3bf5bc6"
-    }
-    Frame {
-        msec: 4432
-        hash: "01947e631c3db43f7c5b4427229bc0c8"
-    }
-    Frame {
-        msec: 4448
-        hash: "3f62f032239d412d3637198f5e3e83d6"
-    }
-    Frame {
-        msec: 4464
-        hash: "06d8d8a1a41893d4e27725948a75caf4"
-    }
-    Frame {
-        msec: 4480
-        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
-    }
-    Frame {
-        msec: 4496
-        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
-    }
-    Frame {
-        msec: 4512
-        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
-    }
-    Frame {
-        msec: 4528
-        hash: "2a7bed775824968e318c3d40fbc5b1c2"
-    }
-    Frame {
-        msec: 4544
-        hash: "3152e5f29015ece423fbdd11a2b382b8"
-    }
-    Frame {
-        msec: 4560
-        hash: "f1a7a4a67a21f5025294af4bea3f8998"
-    }
-    Frame {
-        msec: 4576
-        hash: "a40014d842471784e1222eb205395f6f"
-    }
-    Frame {
-        msec: 4592
-        hash: "18c2f321a149e38b258ac264d40c2376"
-    }
-    Frame {
-        msec: 4608
-        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
-    }
-    Frame {
-        msec: 4624
-        hash: "19d05a96f3ae7388e854bbf1075b51c1"
-    }
-    Frame {
-        msec: 4640
-        hash: "e418b5f54705515dce5ce3b4cbc45d19"
-    }
-    Frame {
-        msec: 4656
-        hash: "554e1d360463871e7c05cfe6f8abe1dd"
-    }
-    Frame {
-        msec: 4672
-        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
-    }
-    Frame {
-        msec: 4688
-        hash: "60f158382f75103c78e2b9b408e0fe65"
-    }
-    Frame {
-        msec: 4704
-        hash: "4e60300cfab8634e04dcd1b556251d31"
-    }
-    Frame {
-        msec: 4720
-        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
-    }
-    Frame {
-        msec: 4736
-        hash: "b74521d6ac531414aeeca0fb28379d11"
-    }
-    Frame {
-        msec: 4752
-        hash: "a6f17da2dd581bdc249ff62f833dc025"
-    }
-    Frame {
-        msec: 4768
-        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
-    }
-    Frame {
-        msec: 4784
-        hash: "1ea07ee309ce2c52cbc36370b75a872f"
-    }
-    Frame {
-        msec: 4800
-        image: "animated.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "c7eb7837dce71c914186326216214eeb"
-    }
-    Frame {
-        msec: 4832
-        hash: "0cba07ca38c7f0483244832a42d9ac53"
-    }
-    Frame {
-        msec: 4848
-        hash: "93cf31eabb454ec536c638a506be0648"
-    }
-    Frame {
-        msec: 4864
-        hash: "e8a61d3858244127cb2b2812f04f5ce9"
-    }
-    Frame {
-        msec: 4880
-        hash: "1ac8c393f084aa1894c26610b7f40ea6"
-    }
-    Frame {
-        msec: 4896
-        hash: "8861bf848da5c96b35addff736b01520"
-    }
-    Frame {
-        msec: 4912
-        hash: "f04e84ad3579d6334077abe73101d206"
-    }
-    Frame {
-        msec: 4928
-        hash: "eac4600372f0fdfadee88896ac915a48"
-    }
-    Frame {
-        msec: 4944
-        hash: "ff0928dfd16b2da9811a172c19817a97"
-    }
-    Frame {
-        msec: 4960
-        hash: "280288a7988736e30a2a3e4289ac3b0c"
-    }
-    Frame {
-        msec: 4976
-        hash: "7383209c80b403b93da3264eadbc047f"
-    }
-    Frame {
-        msec: 4992
-        hash: "86360bd58bba5fdd901c105ddb2e3ade"
-    }
-    Frame {
-        msec: 5008
-        hash: "bc747167dfb3388ac63e9e68a86b9a03"
-    }
-    Frame {
-        msec: 5024
-        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
-    }
-    Frame {
-        msec: 5040
-        hash: "ae48da4a66f93c806725ce749700aac8"
-    }
-    Frame {
-        msec: 5056
-        hash: "c763f56728e17fc119539a4d45dfccc3"
-    }
-    Frame {
-        msec: 5072
-        hash: "956429472da133324c970774f77784f5"
-    }
-    Frame {
-        msec: 5088
-        hash: "a4ddb4956d71fd642d54757938100cf3"
-    }
-    Frame {
-        msec: 5104
-        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
-    }
-    Frame {
-        msec: 5120
-        hash: "68dae343cf324391ec6721cea14575f7"
-    }
-    Frame {
-        msec: 5136
-        hash: "81d2fc6727dc7449d1a87b4abea9b704"
-    }
-    Frame {
-        msec: 5152
-        hash: "c3a1f12febc979150028737722d6d045"
-    }
-    Frame {
-        msec: 5168
-        hash: "80ebac4d923f67fb8dba3d133ce657ba"
-    }
-    Frame {
-        msec: 5184
-        hash: "7c22fc3e30377cc14326833bdd23ddd8"
-    }
-    Frame {
-        msec: 5200
-        hash: "5359f5e45e5467c62c2d9521c8199c48"
-    }
-    Frame {
-        msec: 5216
-        hash: "30f84a7f67b13a945ba6d5935ea92da5"
-    }
-    Frame {
-        msec: 5232
-        hash: "08f55088cdce741c67539f73291e53ab"
-    }
-    Frame {
-        msec: 5248
-        hash: "93128906d054e44bfd126fc22bdc3102"
-    }
-    Frame {
-        msec: 5264
-        hash: "97f7a2175dcf9ac2581a92d614d72f88"
-    }
-    Frame {
-        msec: 5280
-        hash: "587cb6e05048579088e88e0180e3ad48"
-    }
-    Frame {
-        msec: 5296
-        hash: "985868869ef2c332da379460a2f3a71b"
-    }
-    Frame {
-        msec: 5312
-        hash: "94084ca4998fcda408f6987f52c34185"
-    }
-    Frame {
-        msec: 5328
-        hash: "e91bb914c1eb63cd4269b30a220a128a"
-    }
-    Frame {
-        msec: 5344
-        hash: "e880d93963c80e4fab5173554c9600fc"
-    }
-    Frame {
-        msec: 5360
-        hash: "84c94704c16e246df1048f958cc8cefb"
-    }
-    Frame {
-        msec: 5376
-        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
-    }
-    Frame {
-        msec: 5392
-        hash: "99de44f74f8e1f79652ab46afb4bb59e"
-    }
-    Frame {
-        msec: 5408
-        hash: "44072400ca3f0237d1aebae28a94becc"
-    }
-    Frame {
-        msec: 5424
-        hash: "a1bd4e995365e79389dba80f9e3b7af8"
-    }
-    Frame {
-        msec: 5440
-        hash: "95d776c84fe155617fc4ee51bdb45b7e"
-    }
-    Frame {
-        msec: 5456
-        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
-    }
-    Frame {
-        msec: 5472
-        hash: "826c7741ba0c51de407bb799e8f360b5"
-    }
-    Frame {
-        msec: 5488
-        hash: "11673a112566a64aca3c7010b9cc9c4d"
-    }
-    Frame {
-        msec: 5504
-        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
-    }
-    Frame {
-        msec: 5520
-        hash: "5b027815ea3c1ea54e1a02c798c468db"
-    }
-    Frame {
-        msec: 5536
-        hash: "65c514c9e926affe1da0b4826d2754c7"
-    }
-    Frame {
-        msec: 5552
-        hash: "73c5f23f51797a33f4d2898738e6356e"
-    }
-    Frame {
-        msec: 5568
-        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
-    }
-    Frame {
-        msec: 5584
-        hash: "fb17df681d99d5de05f6329bba697ea5"
-    }
-    Frame {
-        msec: 5600
-        hash: "1bf7a98884b506b38326f59f85a53f41"
-    }
-    Frame {
-        msec: 5616
-        hash: "0b1a741975e3d9ef8f5e78f371c89441"
-    }
-    Frame {
-        msec: 5632
-        hash: "a6937ee49648ed0cb409063bf1da3b87"
-    }
-    Frame {
-        msec: 5648
-        hash: "a790f0e884ab85f7802dd094e4ef550f"
-    }
-    Frame {
-        msec: 5664
-        hash: "3b644aac161f0a75bfb64f5075373190"
-    }
-    Frame {
-        msec: 5680
-        hash: "b12faa76c07adc21634cd8f8cb8436ae"
-    }
-    Frame {
-        msec: 5696
-        hash: "3fb20f9dbd40b4729235e13af9643afc"
-    }
-    Frame {
-        msec: 5712
-        hash: "f57727419bb51fb1e589b960ddeb20ae"
-    }
-    Frame {
-        msec: 5728
-        hash: "7b78cba247f2c209ed81e003ca25d0a5"
-    }
-    Frame {
-        msec: 5744
-        hash: "8172e076b05d95248d89e815fde820ef"
-    }
-    Frame {
-        msec: 5760
-        image: "animated.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "74c1e71378b502bc1b732a55806a10f1"
-    }
-    Frame {
-        msec: 5792
-        hash: "6eae517ad33f0609c31ef1f8f80ba899"
-    }
-    Frame {
-        msec: 5808
-        hash: "a67e9a0f55512fb1c55f13c6b483923b"
-    }
-    Frame {
-        msec: 5824
-        hash: "4887cd34d9926a361f3ca2e75be53ea6"
-    }
-    Frame {
-        msec: 5840
-        hash: "13ca95adab171d9fad9ee8b75d0226bc"
-    }
-    Frame {
-        msec: 5856
-        hash: "affab9fb48c889a2680eb81458d400f9"
-    }
-    Frame {
-        msec: 5872
-        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
-    }
-    Frame {
-        msec: 5888
-        hash: "36c054064c9a76f4072492e55c70fb6c"
-    }
-    Frame {
-        msec: 5904
-        hash: "d1ed4916cb1ecff60277d74369ff311b"
-    }
-    Frame {
-        msec: 5920
-        hash: "63ebaa4869728f5e2891d068e4b0091c"
-    }
-    Frame {
-        msec: 5936
-        hash: "29245946cbd811fe6bf6b2b41cc13002"
-    }
-    Frame {
-        msec: 5952
-        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
-    }
-    Frame {
-        msec: 5968
-        hash: "058c918e83bfdd665cd836566b53959b"
-    }
-    Frame {
-        msec: 5984
-        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
-    }
-    Frame {
-        msec: 6000
-        hash: "ed5d80c33dbf72624385b1cf43784626"
-    }
-    Frame {
-        msec: 6016
-        hash: "911591db1519ba264847f09868e38e0e"
-    }
-    Frame {
-        msec: 6032
-        hash: "ed5d80c33dbf72624385b1cf43784626"
-    }
-    Frame {
-        msec: 6048
-        hash: "fdf3b7a0391119e2fe77be8d6a17481d"
-    }
-    Frame {
-        msec: 6064
-        hash: "058c918e83bfdd665cd836566b53959b"
-    }
-    Frame {
-        msec: 6080
-        hash: "8a9dd7a2d10771633e6896f3f4a722ae"
-    }
-    Frame {
-        msec: 6096
-        hash: "29245946cbd811fe6bf6b2b41cc13002"
-    }
-    Frame {
-        msec: 6112
-        hash: "63ebaa4869728f5e2891d068e4b0091c"
-    }
-    Frame {
-        msec: 6128
-        hash: "d1ed4916cb1ecff60277d74369ff311b"
-    }
-    Frame {
-        msec: 6144
-        hash: "36c054064c9a76f4072492e55c70fb6c"
-    }
-    Frame {
-        msec: 6160
-        hash: "7aa0cbf73f7999be7cde4ec739efbc33"
-    }
-    Frame {
-        msec: 6176
-        hash: "affab9fb48c889a2680eb81458d400f9"
-    }
-    Frame {
-        msec: 6192
-        hash: "13ca95adab171d9fad9ee8b75d0226bc"
-    }
-    Frame {
-        msec: 6208
-        hash: "4887cd34d9926a361f3ca2e75be53ea6"
-    }
-    Frame {
-        msec: 6224
-        hash: "a67e9a0f55512fb1c55f13c6b483923b"
-    }
-    Frame {
-        msec: 6240
-        hash: "6eae517ad33f0609c31ef1f8f80ba899"
-    }
-    Frame {
-        msec: 6256
-        hash: "74c1e71378b502bc1b732a55806a10f1"
-    }
-    Frame {
-        msec: 6272
-        hash: "a88d6fc324ef48aa52c642a1662ec679"
-    }
-    Frame {
-        msec: 6288
-        hash: "8172e076b05d95248d89e815fde820ef"
-    }
-    Frame {
-        msec: 6304
-        hash: "7b78cba247f2c209ed81e003ca25d0a5"
-    }
-    Frame {
-        msec: 6320
-        hash: "f57727419bb51fb1e589b960ddeb20ae"
-    }
-    Frame {
-        msec: 6336
-        hash: "3fb20f9dbd40b4729235e13af9643afc"
-    }
-    Frame {
-        msec: 6352
-        hash: "b12faa76c07adc21634cd8f8cb8436ae"
-    }
-    Frame {
-        msec: 6368
-        hash: "3b644aac161f0a75bfb64f5075373190"
-    }
-    Frame {
-        msec: 6384
-        hash: "a790f0e884ab85f7802dd094e4ef550f"
-    }
-    Frame {
-        msec: 6400
-        hash: "a6937ee49648ed0cb409063bf1da3b87"
-    }
-    Frame {
-        msec: 6416
-        hash: "0b1a741975e3d9ef8f5e78f371c89441"
-    }
-    Frame {
-        msec: 6432
-        hash: "1bf7a98884b506b38326f59f85a53f41"
-    }
-    Frame {
-        msec: 6448
-        hash: "fb17df681d99d5de05f6329bba697ea5"
-    }
-    Frame {
-        msec: 6464
-        hash: "acd9a2e76b22ab0ff809fd3ec3a018ec"
-    }
-    Frame {
-        msec: 6480
-        hash: "73c5f23f51797a33f4d2898738e6356e"
-    }
-    Frame {
-        msec: 6496
-        hash: "65c514c9e926affe1da0b4826d2754c7"
-    }
-    Frame {
-        msec: 6512
-        hash: "5b027815ea3c1ea54e1a02c798c468db"
-    }
-    Frame {
-        msec: 6528
-        hash: "e1e6c7a7f51bcccd749710dbbf9e97f6"
-    }
-    Frame {
-        msec: 6544
-        hash: "11673a112566a64aca3c7010b9cc9c4d"
-    }
-    Frame {
-        msec: 6560
-        hash: "826c7741ba0c51de407bb799e8f360b5"
-    }
-    Frame {
-        msec: 6576
-        hash: "3b95eb8cbfc831e1ebee2e456b026ab4"
-    }
-    Frame {
-        msec: 6592
-        hash: "95d776c84fe155617fc4ee51bdb45b7e"
-    }
-    Frame {
-        msec: 6608
-        hash: "a1bd4e995365e79389dba80f9e3b7af8"
-    }
-    Frame {
-        msec: 6624
-        hash: "44072400ca3f0237d1aebae28a94becc"
-    }
-    Frame {
-        msec: 6640
-        hash: "99de44f74f8e1f79652ab46afb4bb59e"
-    }
-    Frame {
-        msec: 6656
-        hash: "4f1eace868a6688e5b24ce48a1f0fd18"
-    }
-    Frame {
-        msec: 6672
-        hash: "84c94704c16e246df1048f958cc8cefb"
-    }
-    Frame {
-        msec: 6688
-        hash: "e880d93963c80e4fab5173554c9600fc"
-    }
-    Frame {
-        msec: 6704
-        hash: "e91bb914c1eb63cd4269b30a220a128a"
-    }
-    Frame {
-        msec: 6720
-        image: "animated.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "985868869ef2c332da379460a2f3a71b"
-    }
-    Frame {
-        msec: 6752
-        hash: "587cb6e05048579088e88e0180e3ad48"
-    }
-    Frame {
-        msec: 6768
-        hash: "97f7a2175dcf9ac2581a92d614d72f88"
-    }
-    Frame {
-        msec: 6784
-        hash: "93128906d054e44bfd126fc22bdc3102"
-    }
-    Frame {
-        msec: 6800
-        hash: "08f55088cdce741c67539f73291e53ab"
-    }
-    Frame {
-        msec: 6816
-        hash: "30f84a7f67b13a945ba6d5935ea92da5"
-    }
-    Frame {
-        msec: 6832
-        hash: "5359f5e45e5467c62c2d9521c8199c48"
-    }
-    Frame {
-        msec: 6848
-        hash: "7c22fc3e30377cc14326833bdd23ddd8"
-    }
-    Frame {
-        msec: 6864
-        hash: "80ebac4d923f67fb8dba3d133ce657ba"
-    }
-    Frame {
-        msec: 6880
-        hash: "c3a1f12febc979150028737722d6d045"
-    }
-    Frame {
-        msec: 6896
-        hash: "81d2fc6727dc7449d1a87b4abea9b704"
-    }
-    Frame {
-        msec: 6912
-        hash: "68dae343cf324391ec6721cea14575f7"
-    }
-    Frame {
-        msec: 6928
-        hash: "ec0aea8dc8c269d1f0aee5817347ac55"
-    }
-    Frame {
-        msec: 6944
-        hash: "a4ddb4956d71fd642d54757938100cf3"
-    }
-    Frame {
-        msec: 6960
-        hash: "956429472da133324c970774f77784f5"
-    }
-    Frame {
-        msec: 6976
-        hash: "c763f56728e17fc119539a4d45dfccc3"
-    }
-    Frame {
-        msec: 6992
-        hash: "ae48da4a66f93c806725ce749700aac8"
-    }
-    Frame {
-        msec: 7008
-        hash: "bccb4b8a494bd45bd70c2524a02a9dc3"
-    }
-    Frame {
-        msec: 7024
-        hash: "bc747167dfb3388ac63e9e68a86b9a03"
-    }
-    Frame {
-        msec: 7040
-        hash: "86360bd58bba5fdd901c105ddb2e3ade"
-    }
-    Frame {
-        msec: 7056
-        hash: "7383209c80b403b93da3264eadbc047f"
-    }
-    Frame {
-        msec: 7072
-        hash: "280288a7988736e30a2a3e4289ac3b0c"
-    }
-    Frame {
-        msec: 7088
-        hash: "ff0928dfd16b2da9811a172c19817a97"
-    }
-    Frame {
-        msec: 7104
-        hash: "eac4600372f0fdfadee88896ac915a48"
-    }
-    Frame {
-        msec: 7120
-        hash: "f04e84ad3579d6334077abe73101d206"
-    }
-    Frame {
-        msec: 7136
-        hash: "8861bf848da5c96b35addff736b01520"
-    }
-    Frame {
-        msec: 7152
-        hash: "1ac8c393f084aa1894c26610b7f40ea6"
-    }
-    Frame {
-        msec: 7168
-        hash: "e8a61d3858244127cb2b2812f04f5ce9"
-    }
-    Frame {
-        msec: 7184
-        hash: "93cf31eabb454ec536c638a506be0648"
-    }
-    Frame {
-        msec: 7200
-        hash: "0cba07ca38c7f0483244832a42d9ac53"
-    }
-    Frame {
-        msec: 7216
-        hash: "c7eb7837dce71c914186326216214eeb"
-    }
-    Frame {
-        msec: 7232
-        hash: "593a8a45c3a0cd7ce1cb6bd1913136ba"
-    }
-    Frame {
-        msec: 7248
-        hash: "1ea07ee309ce2c52cbc36370b75a872f"
-    }
-    Frame {
-        msec: 7264
-        hash: "93d9f0a7c387cbe653a9a088f8f4ef2b"
-    }
-    Frame {
-        msec: 7280
-        hash: "a6f17da2dd581bdc249ff62f833dc025"
-    }
-    Frame {
-        msec: 7296
-        hash: "b74521d6ac531414aeeca0fb28379d11"
-    }
-    Frame {
-        msec: 7312
-        hash: "6a521f952e05d91b86ad78fd6f5de4f9"
-    }
-    Frame {
-        msec: 7328
-        hash: "4e60300cfab8634e04dcd1b556251d31"
-    }
-    Frame {
-        msec: 7344
-        hash: "60f158382f75103c78e2b9b408e0fe65"
-    }
-    Frame {
-        msec: 7360
-        hash: "153237f8cf37e29ad2f32f7a8a6aecdb"
-    }
-    Frame {
-        msec: 7376
-        hash: "554e1d360463871e7c05cfe6f8abe1dd"
-    }
-    Frame {
-        msec: 7392
-        hash: "e418b5f54705515dce5ce3b4cbc45d19"
-    }
-    Frame {
-        msec: 7408
-        hash: "19d05a96f3ae7388e854bbf1075b51c1"
-    }
-    Frame {
-        msec: 7424
-        hash: "4ae120bb6dc2bd5ff81cc99ae03c191e"
-    }
-    Frame {
-        msec: 7440
-        hash: "18c2f321a149e38b258ac264d40c2376"
-    }
-    Frame {
-        msec: 7456
-        hash: "a40014d842471784e1222eb205395f6f"
-    }
-    Frame {
-        msec: 7472
-        hash: "f1a7a4a67a21f5025294af4bea3f8998"
-    }
-    Frame {
-        msec: 7488
-        hash: "3152e5f29015ece423fbdd11a2b382b8"
-    }
-    Frame {
-        msec: 7504
-        hash: "2a7bed775824968e318c3d40fbc5b1c2"
-    }
-    Frame {
-        msec: 7520
-        hash: "dd4c9e63001bc6e0e63ea4db2d85301f"
-    }
-    Frame {
-        msec: 7536
-        hash: "ac8f096e8c7cc23bfb01de69cf3e266e"
-    }
-    Frame {
-        msec: 7552
-        hash: "6b48bfd0c7993f746d6301c2a0f61d23"
-    }
-    Frame {
-        msec: 7568
-        hash: "06d8d8a1a41893d4e27725948a75caf4"
-    }
-    Frame {
-        msec: 7584
-        hash: "3f62f032239d412d3637198f5e3e83d6"
-    }
-    Frame {
-        msec: 7600
-        hash: "01947e631c3db43f7c5b4427229bc0c8"
-    }
-    Frame {
-        msec: 7616
-        hash: "2266df495ab5265e7514a506d3bf5bc6"
-    }
-    Frame {
-        msec: 7632
-        hash: "8c66a33d26eec2a1133f4362710a5fab"
-    }
-    Frame {
-        msec: 7648
-        hash: "75c9bf83ca3fe24612c245698c089430"
-    }
-    Frame {
-        msec: 7664
-        hash: "c1936628aec13e08e9581dcd2c6d5717"
-    }
-    Frame {
-        msec: 7680
-        image: "animated.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "8419f1d75b14130730bcfec4e3a9b058"
-    }
-    Frame {
-        msec: 7712
-        hash: "482bb92d4f0ad5d7c7e379b9e1ad326e"
-    }
-    Frame {
-        msec: 7728
-        hash: "406224b535b4425d2708df0083acdc8e"
-    }
-    Frame {
-        msec: 7744
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
-    }
-    Frame {
-        msec: 7760
-        hash: "08b9be66e23c7b6f6f629c7470394601"
-    }
-    Frame {
-        msec: 7776
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
-    }
-    Frame {
-        msec: 7792
-        hash: "4d45d70f997c2c67166905c97a900d2e"
-    }
-    Frame {
-        msec: 7808
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
-    }
-    Frame {
-        msec: 7824
-        hash: "b63e4d1686057828fd8781f1c33585f5"
-    }
-    Frame {
-        msec: 7840
-        hash: "755cfccc38bababc468fe6e1076804bb"
-    }
-    Frame {
-        msec: 7856
-        hash: "465ec993948f7b75aeb5759976f4620d"
-    }
-    Frame {
-        msec: 7872
-        hash: "228d5312c261d1a5455faf69ec2f2520"
-    }
-    Frame {
-        msec: 7888
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
-    }
-    Frame {
-        msec: 7904
-        hash: "4c60d345821f515c7811f3b69eb94607"
-    }
-    Frame {
-        msec: 7920
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 7936
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 7952
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 7968
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 7984
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8000
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8016
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8032
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8048
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8064
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8080
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8096
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8112
-        hash: "aec13bcab337e55832b0a02fb5c6b526"
-    }
-    Frame {
-        msec: 8128
-        hash: "4c60d345821f515c7811f3b69eb94607"
-    }
-    Frame {
-        msec: 8144
-        hash: "aacf9ae3c23d174a1c1cda493600e355"
-    }
-    Frame {
-        msec: 8160
-        hash: "228d5312c261d1a5455faf69ec2f2520"
-    }
-    Frame {
-        msec: 8176
-        hash: "465ec993948f7b75aeb5759976f4620d"
-    }
-    Frame {
-        msec: 8192
-        hash: "755cfccc38bababc468fe6e1076804bb"
-    }
-    Frame {
-        msec: 8208
-        hash: "b63e4d1686057828fd8781f1c33585f5"
-    }
-    Frame {
-        msec: 8224
-        hash: "c5b3dede34b0d1d78135e39c41d117c6"
-    }
-    Frame {
-        msec: 8240
-        hash: "4d45d70f997c2c67166905c97a900d2e"
-    }
-    Frame {
-        msec: 8256
-        hash: "7b4d12e5a877507e7454aa1b8ed87c2d"
-    }
-    Frame {
-        msec: 8272
-        hash: "08b9be66e23c7b6f6f629c7470394601"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8288
-        hash: "3dac1d9632378bd18c1c938a4868e3fb"
-    }
-    Frame {
-        msec: 8304
-        hash: "406224b535b4425d2708df0083acdc8e"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.0.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.0.png
deleted file mode 100644
index 80cbd26..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.1.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.1.png
deleted file mode 100644
index 80cbd26..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.2.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.2.png
deleted file mode 100644
index 80cbd26..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.3.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.3.png
deleted file mode 100644
index 80cbd26..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.4.png b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.4.png
deleted file mode 100644
index 80cbd26..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.qml b/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.qml
deleted file mode 100644
index 16cd5e9..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.qml
+++ /dev/null
@@ -1,1359 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 32
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 48
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 64
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 80
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 96
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 112
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 128
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 144
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 160
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 176
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 192
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 208
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 224
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 240
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 256
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 272
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 288
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 304
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 320
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 336
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 352
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 368
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 384
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 400
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 416
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 432
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 448
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 464
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 480
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 496
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 512
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 528
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 544
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 560
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 576
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 592
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 608
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 624
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 640
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 656
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 672
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 688
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 704
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 720
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 736
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 752
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 768
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 784
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 800
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 816
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 832
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 848
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 864
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 880
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 896
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 912
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 928
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 944
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 960
-        image: "borders.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 992
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1008
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1024
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1040
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1056
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1072
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1088
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1104
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1120
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1136
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1152
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1168
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1184
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1200
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1216
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1232
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1248
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1264
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1280
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1296
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1312
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1328
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1344
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1360
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1376
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1392
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1408
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1424
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1440
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1456
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1472
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1488
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1504
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1520
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1536
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1552
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1568
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1584
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1600
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1616
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1632
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1648
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1664
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1680
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1696
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1712
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1728
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1744
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1760
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1776
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1792
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1808
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1824
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1840
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1856
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1872
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1888
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1904
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1920
-        image: "borders.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1952
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1968
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 1984
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2000
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2016
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2032
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2048
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2064
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2080
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2096
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2112
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2128
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2144
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2160
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2176
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2192
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2208
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2224
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2240
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2256
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2272
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2288
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2304
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2320
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2336
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2352
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2368
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2384
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2400
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2416
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2432
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2448
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2464
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2480
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2496
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2512
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2528
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2544
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2560
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2576
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2592
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2608
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2624
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2640
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2656
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2672
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2688
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2704
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2720
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2736
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2752
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2768
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2784
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2800
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2816
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2832
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2848
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2864
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2880
-        image: "borders.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2912
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2928
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2944
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2960
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2976
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 2992
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3008
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3024
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3040
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3056
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3072
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3088
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3104
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3120
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3136
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3152
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3168
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3184
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3200
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3216
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3232
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3248
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3264
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3280
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3296
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3312
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3328
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3344
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3360
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3376
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3392
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3408
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3424
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3440
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3456
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3472
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3488
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3504
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3520
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3536
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3552
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3568
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3584
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3600
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3616
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3632
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3648
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3664
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3680
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3696
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3712
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3728
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3744
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3760
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3776
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3792
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3808
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3824
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3840
-        image: "borders.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3872
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3888
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3904
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3920
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3936
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3952
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3968
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 3984
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4000
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4016
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4032
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4048
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4064
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4080
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4096
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4112
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4128
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4144
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4160
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4176
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4192
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4208
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4224
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4240
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4256
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4272
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4288
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4304
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4320
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4336
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4352
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4368
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4384
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4400
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4416
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4432
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4448
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4464
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4480
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4496
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4512
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4528
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4544
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4560
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4576
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4592
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4608
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4624
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4640
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4656
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4672
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4688
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4704
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4720
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4736
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4752
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4768
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4784
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4800
-        image: "borders.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4832
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4848
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4864
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4880
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4896
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4912
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4928
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4944
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4960
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4976
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 4992
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5008
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5024
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5040
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5056
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5072
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5088
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5104
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5120
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5136
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5152
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5168
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5184
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5200
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5216
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5232
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5248
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5264
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5280
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5296
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5312
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5328
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5344
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5360
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5376
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5392
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-    Frame {
-        msec: 5408
-        hash: "ab9753116e289c932064144bb0845857"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.png
deleted file mode 100644
index 016902b..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.png
deleted file mode 100644
index a654936..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.png
deleted file mode 100644
index cfd5517..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.png
deleted file mode 100644
index 016902b..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml
deleted file mode 100644
index 46086f9..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml
+++ /dev/null
@@ -1,1199 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 32
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 48
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 64
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 80
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 96
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 112
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 128
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 144
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 160
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 176
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 192
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 208
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 224
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 240
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 256
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 272
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 288
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 304
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 320
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 336
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 352
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 368
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 384
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 400
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 416
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 432
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 448
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 464
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 480
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 496
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 512
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 528
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 544
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 560
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 576
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 592
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 608
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 624
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 640
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 656
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 672
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 688
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 704
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 720
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 736
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 752
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 768
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 784
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 800
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 816
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 832
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 848
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 864
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 880
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 896
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 912
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 928
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 944
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 477; y: 171
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 960
-        image: "flickable-horizontal.0.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 473; y: 171
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 976
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 463; y: 171
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 992
-        hash: "c4d91a9e7f785ccd50db55f697d75cb9"
-    }
-    Frame {
-        msec: 1008
-        hash: "c4d91a9e7f785ccd50db55f697d75cb9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 449; y: 171
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1024
-        hash: "4f054038668f56cf3fc46dee08504b24"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 425; y: 172
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1040
-        hash: "e6ae6e2a8e5fb7204ae1f559b5dc4a63"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 393; y: 172
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 393; y: 172
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1056
-        hash: "3bfaaef12ca852421ad179d8598a306d"
-    }
-    Frame {
-        msec: 1072
-        hash: "e00ff5e13a9a97bc11e041f89e4782f5"
-    }
-    Frame {
-        msec: 1088
-        hash: "ae10ada837b21365936672e9a4b4b175"
-    }
-    Frame {
-        msec: 1104
-        hash: "63566d7f1707025c9ec37e398d0e69ef"
-    }
-    Frame {
-        msec: 1120
-        hash: "20e9d299cd867d680cf85f99e06cd200"
-    }
-    Frame {
-        msec: 1136
-        hash: "4d3a19b3c50a20ba1d93a8bcd178a424"
-    }
-    Frame {
-        msec: 1152
-        hash: "d373ab5240e438e8234ae05f935c1ef8"
-    }
-    Frame {
-        msec: 1168
-        hash: "2f9c00aa1f8a8cc5d10e6c6a0baee366"
-    }
-    Frame {
-        msec: 1184
-        hash: "0fd8203b0a33fd8243ecd878f04f9b42"
-    }
-    Frame {
-        msec: 1200
-        hash: "24a197df4209c7076d68031e5dd4fd9e"
-    }
-    Frame {
-        msec: 1216
-        hash: "9e4271eacdc875183e3c8e7a1eb098c2"
-    }
-    Frame {
-        msec: 1232
-        hash: "cdf7aac4ff7e5df806977eb38392f5bc"
-    }
-    Frame {
-        msec: 1248
-        hash: "1ace4a1312cad6f173a04c388624a97f"
-    }
-    Frame {
-        msec: 1264
-        hash: "193d6d6838ac1d5ddb941fbb340ec506"
-    }
-    Frame {
-        msec: 1280
-        hash: "ed82807a48f28610ba9bda0c7ab91ce4"
-    }
-    Frame {
-        msec: 1296
-        hash: "e1168bb9a88a972decb0c537d86d7758"
-    }
-    Frame {
-        msec: 1312
-        hash: "828ba428b04826687c6ef19b72318924"
-    }
-    Frame {
-        msec: 1328
-        hash: "7dae52c428253cf44045ffaabaadd2f4"
-    }
-    Frame {
-        msec: 1344
-        hash: "06e2a81e1a2421523642cfcf17ec22e4"
-    }
-    Frame {
-        msec: 1360
-        hash: "283997835a54e80c0ab8a0321bd03ce7"
-    }
-    Frame {
-        msec: 1376
-        hash: "6354f9379b7b25c8fabda4e5bc3cdf6a"
-    }
-    Frame {
-        msec: 1392
-        hash: "6bc87dfd21d59efd3397e3cfb0d00d25"
-    }
-    Frame {
-        msec: 1408
-        hash: "4f97fc9aa1f79a6b007a00459386b9ff"
-    }
-    Frame {
-        msec: 1424
-        hash: "2b5c711ede124c9e97d3ef83a3fdcc8b"
-    }
-    Frame {
-        msec: 1440
-        hash: "5a8cbd4ac3fcd920f2aea6e2cfa96467"
-    }
-    Frame {
-        msec: 1456
-        hash: "5b32961cb36e519f5b1d50386e796d3e"
-    }
-    Frame {
-        msec: 1472
-        hash: "c91f95cccd38cbd1a16ee65abffd40ab"
-    }
-    Frame {
-        msec: 1488
-        hash: "25108050298d3ffc850113971bcf54da"
-    }
-    Frame {
-        msec: 1504
-        hash: "6a236881f2a1cb487ee1945c279e020b"
-    }
-    Frame {
-        msec: 1520
-        hash: "2df1824df1cf20022595f64d26adb4ad"
-    }
-    Frame {
-        msec: 1536
-        hash: "4ca4a0a4b4fd9f9c4846adebcdc8fd67"
-    }
-    Frame {
-        msec: 1552
-        hash: "1696ef0862ff4772f960d203c43fbddf"
-    }
-    Frame {
-        msec: 1568
-        hash: "c5846835b8eb5d98c481ee5811344ea1"
-    }
-    Frame {
-        msec: 1584
-        hash: "fbcb044ee53302de573321b43f068e65"
-    }
-    Frame {
-        msec: 1600
-        hash: "d369e0a6c4a3e63102be29a7362ef9eb"
-    }
-    Frame {
-        msec: 1616
-        hash: "e93131b881805d4aa44949c69f486821"
-    }
-    Frame {
-        msec: 1632
-        hash: "b7aeee9e5065f1d4656e451b542ecf6a"
-    }
-    Frame {
-        msec: 1648
-        hash: "05521ca19960c070d5f3dd72c5ade0e4"
-    }
-    Frame {
-        msec: 1664
-        hash: "2c68cb3291cf1f892c8b8eb28b409e4d"
-    }
-    Frame {
-        msec: 1680
-        hash: "5a0908aea91df2b9e65d222829c2b0ba"
-    }
-    Frame {
-        msec: 1696
-        hash: "0d4ff147517eee8b3dbcd51a708b2aa7"
-    }
-    Frame {
-        msec: 1712
-        hash: "521e1075de1de89c6e25f469d2728ab7"
-    }
-    Frame {
-        msec: 1728
-        hash: "c543447f98ae608058c6c02c8c8665e6"
-    }
-    Frame {
-        msec: 1744
-        hash: "ac259db754b7dfb8cce8548527c72e4b"
-    }
-    Frame {
-        msec: 1760
-        hash: "bc5b68d5ecfb583ae41001e326b7aa9b"
-    }
-    Frame {
-        msec: 1776
-        hash: "e08051cb1ab2d8f979a52dc86411f78f"
-    }
-    Frame {
-        msec: 1792
-        hash: "b1746ad9563359f0d70a1aaee62e9bd8"
-    }
-    Frame {
-        msec: 1808
-        hash: "5d6bc33ff2857fb8db582362bf7c19c7"
-    }
-    Frame {
-        msec: 1824
-        hash: "83f2c3a7124f9be4dbe883a27ca7df8e"
-    }
-    Frame {
-        msec: 1840
-        hash: "189f7cfb5ede1f8380b1a05b7e3d942e"
-    }
-    Frame {
-        msec: 1856
-        hash: "07b1a4e5ca156e6aa1f3e76b825807ce"
-    }
-    Frame {
-        msec: 1872
-        hash: "48b25f0acfe6eb3bc2cb9eb16e6595d0"
-    }
-    Frame {
-        msec: 1888
-        hash: "15ae05f5ed098021073c4593587949ea"
-    }
-    Frame {
-        msec: 1904
-        hash: "b300f2c75f4aebcf84ed37ad424ca9fa"
-    }
-    Frame {
-        msec: 1920
-        image: "flickable-horizontal.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "7d8ea492fb1c664502e95e085896c569"
-    }
-    Frame {
-        msec: 1952
-        hash: "7513b077e073d78b387309b56e1fd44c"
-    }
-    Frame {
-        msec: 1968
-        hash: "ed1ac5cf6d4b081983a8e16258f431bf"
-    }
-    Frame {
-        msec: 1984
-        hash: "fbb31f23ba6e5d02011363abfb4b3f18"
-    }
-    Frame {
-        msec: 2000
-        hash: "6f01df424b38036b9921b4ee1491a1c1"
-    }
-    Frame {
-        msec: 2016
-        hash: "11f706dfacbec5c0be0c2f3c5442f717"
-    }
-    Frame {
-        msec: 2032
-        hash: "0a70348986f4987f43db3e55af63fca5"
-    }
-    Frame {
-        msec: 2048
-        hash: "6f8b7aaad846f83c6349836d7af34662"
-    }
-    Frame {
-        msec: 2064
-        hash: "44723b22aad6d2d814e074ff9324f3c4"
-    }
-    Frame {
-        msec: 2080
-        hash: "44723b22aad6d2d814e074ff9324f3c4"
-    }
-    Frame {
-        msec: 2096
-        hash: "44723b22aad6d2d814e074ff9324f3c4"
-    }
-    Frame {
-        msec: 2112
-        hash: "1c12d2c68223324f040b7a693cef2074"
-    }
-    Frame {
-        msec: 2128
-        hash: "0a70348986f4987f43db3e55af63fca5"
-    }
-    Frame {
-        msec: 2144
-        hash: "bf4de7baf2730cdaf83887d50d577986"
-    }
-    Frame {
-        msec: 2160
-        hash: "23ddb2c0793d7161a0d8c5b2a777dceb"
-    }
-    Frame {
-        msec: 2176
-        hash: "7513b077e073d78b387309b56e1fd44c"
-    }
-    Frame {
-        msec: 2192
-        hash: "83fa82362057466dff6a243a95d423db"
-    }
-    Frame {
-        msec: 2208
-        hash: "0e60b632ce511109cb01d2e5ff6945f8"
-    }
-    Frame {
-        msec: 2224
-        hash: "78c25194827c4243a16807491f798cdf"
-    }
-    Frame {
-        msec: 2240
-        hash: "4c9dc46794d4a32e654395bb9d78409e"
-    }
-    Frame {
-        msec: 2256
-        hash: "e996d4f3a0b3a4a4ed29ec23a1ad5615"
-    }
-    Frame {
-        msec: 2272
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2288
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2304
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2320
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2336
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2352
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2368
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2384
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2400
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2416
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2432
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2448
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2464
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2480
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2496
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2512
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2528
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2544
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2560
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2576
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2592
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2608
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2624
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2640
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2656
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2672
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2688
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2704
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2720
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2736
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2752
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2768
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 152; y: 189
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2784
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2800
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Frame {
-        msec: 2816
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 190
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2832
-        hash: "cd6770afe63f28517a93f0961cf9c26e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 169; y: 191
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2848
-        hash: "edd015434d7ead96c03a51a2b1c9e527"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2864
-        hash: "ea0eda505daea4171e27aac358aa6a4a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 256; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2880
-        image: "flickable-horizontal.2.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 331; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2896
-        hash: "34f70dfe1c226e63300112aa9a4a6968"
-    }
-    Frame {
-        msec: 2912
-        hash: "34f70dfe1c226e63300112aa9a4a6968"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 395; y: 194
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 395; y: 194
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2928
-        hash: "dd61e0ae58d7a344908a10bb97cfcb39"
-    }
-    Frame {
-        msec: 2944
-        hash: "14a384c4bdd3e89808761d1e86976170"
-    }
-    Frame {
-        msec: 2960
-        hash: "0e82a4920a53239f117448cd0e0b27f2"
-    }
-    Frame {
-        msec: 2976
-        hash: "711e29bf6fbbeb7882064adb0619f4ac"
-    }
-    Frame {
-        msec: 2992
-        hash: "43307cbfe1688daf300fafc8df0082b8"
-    }
-    Frame {
-        msec: 3008
-        hash: "46d788d926c03d85a68b66252e73ae90"
-    }
-    Frame {
-        msec: 3024
-        hash: "a0042935ad2d5557c906050d4a3581c9"
-    }
-    Frame {
-        msec: 3040
-        hash: "b618a40490ca0aea310f08b452fa8c68"
-    }
-    Frame {
-        msec: 3056
-        hash: "e2aaad7f160a6d77dd788c76bb8cb8a7"
-    }
-    Frame {
-        msec: 3072
-        hash: "ab5c27fa790c67a6678db0bbae1ae477"
-    }
-    Frame {
-        msec: 3088
-        hash: "b43ed7af838cd6edd32393fc56cf8fb1"
-    }
-    Frame {
-        msec: 3104
-        hash: "88ac50602c9f27fb5b882ad32d14ff46"
-    }
-    Frame {
-        msec: 3120
-        hash: "259af2e080ed93e16cb633fa940c7c08"
-    }
-    Frame {
-        msec: 3136
-        hash: "d05bec2351068d552b7bbbf47cf82fad"
-    }
-    Frame {
-        msec: 3152
-        hash: "5354b8e07f1ed22950687187ee7a0290"
-    }
-    Frame {
-        msec: 3168
-        hash: "3bfaaef12ca852421ad179d8598a306d"
-    }
-    Frame {
-        msec: 3184
-        hash: "40d3a77fce7a9a9ca7ae6023fc4cfc10"
-    }
-    Frame {
-        msec: 3200
-        hash: "5837c0122aa6b28518f1b7043ead99a9"
-    }
-    Frame {
-        msec: 3216
-        hash: "9514d8530275e4642810ac441e8de353"
-    }
-    Frame {
-        msec: 3232
-        hash: "3b720882f52340549d8e1b9659443461"
-    }
-    Frame {
-        msec: 3248
-        hash: "4de5b95c8f4949a4f1ee9a119940e80a"
-    }
-    Frame {
-        msec: 3264
-        hash: "a35097c00483e0b481222e4ad220c7a4"
-    }
-    Frame {
-        msec: 3280
-        hash: "82ac348a63a4e358a877a2e45d48e2b1"
-    }
-    Frame {
-        msec: 3296
-        hash: "1322108409d1fa87d128f0c44c81ab4b"
-    }
-    Frame {
-        msec: 3312
-        hash: "f6b030effcca891ab20073f106b22d73"
-    }
-    Frame {
-        msec: 3328
-        hash: "a7ccd998ac2ff2777d9423d704ddef48"
-    }
-    Frame {
-        msec: 3344
-        hash: "b6d971a4f3321b7f3632e778ce733589"
-    }
-    Frame {
-        msec: 3360
-        hash: "b6d971a4f3321b7f3632e778ce733589"
-    }
-    Frame {
-        msec: 3376
-        hash: "b6d971a4f3321b7f3632e778ce733589"
-    }
-    Frame {
-        msec: 3392
-        hash: "82ef6700a513e39508fb6de5ef07f1e7"
-    }
-    Frame {
-        msec: 3408
-        hash: "9e4c4d479bc0b1a61566eae12416bea6"
-    }
-    Frame {
-        msec: 3424
-        hash: "f6b030effcca891ab20073f106b22d73"
-    }
-    Frame {
-        msec: 3440
-        hash: "8968acd022a9ba6fcc3ea52bdd7268c4"
-    }
-    Frame {
-        msec: 3456
-        hash: "de8f1a1fd680af475173d5f81e85b26c"
-    }
-    Frame {
-        msec: 3472
-        hash: "82e8c0c7cb7c2b1e8d7a5fc019533e6b"
-    }
-    Frame {
-        msec: 3488
-        hash: "f820d250252cd910af97e5c9be181457"
-    }
-    Frame {
-        msec: 3504
-        hash: "a40558c1fbf328d3c891b473b2454020"
-    }
-    Frame {
-        msec: 3520
-        hash: "0ef9e64bad67670102e1e4d9ef0e96f3"
-    }
-    Frame {
-        msec: 3536
-        hash: "1d8013765ac2d3fe09ccaa6db098a208"
-    }
-    Frame {
-        msec: 3552
-        hash: "1d8013765ac2d3fe09ccaa6db098a208"
-    }
-    Frame {
-        msec: 3568
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3584
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3600
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3616
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3632
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3648
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3664
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3680
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3696
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3712
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3728
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3744
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3760
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3776
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3792
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3808
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3824
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3840
-        image: "flickable-horizontal.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3872
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3888
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3904
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3920
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3936
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3952
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3968
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 3984
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4000
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4016
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4032
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4048
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4064
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4080
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4096
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4112
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4128
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4144
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4160
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4176
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4192
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4208
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4224
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4240
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-    Frame {
-        msec: 4256
-        hash: "0fa60818532d1e5c20cd82ce3d61e3f7"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.png
deleted file mode 100644
index 18fef53..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.png
deleted file mode 100644
index 18fef53..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.10.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.10.png
deleted file mode 100644
index b352c68..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.10.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.11.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.11.png
deleted file mode 100644
index ce7ee68..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.11.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.12.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.12.png
deleted file mode 100644
index d8cdacf..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.12.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.13.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.13.png
deleted file mode 100644
index 0c2fa7b..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.13.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.14.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.14.png
deleted file mode 100644
index e9b3028..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.14.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.15.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.15.png
deleted file mode 100644
index 2186a8b..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.15.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.16.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.16.png
deleted file mode 100644
index b4590af..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.16.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.17.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.17.png
deleted file mode 100644
index fe29f19..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.17.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.18.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.18.png
deleted file mode 100644
index fe29f19..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.18.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.19.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.19.png
deleted file mode 100644
index 4f8587f..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.19.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.png
deleted file mode 100644
index 0a7cc03..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.20.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.20.png
deleted file mode 100644
index 4f8587f..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.20.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.21.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.21.png
deleted file mode 100644
index c0b0bdf..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.21.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.22.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.22.png
deleted file mode 100644
index 4168c3b..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.22.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.23.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.23.png
deleted file mode 100644
index 18fef53..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.23.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.24.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.24.png
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.3.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.3.png
deleted file mode 100644
index fc6669d..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.4.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.4.png
deleted file mode 100644
index c0b0bdf..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.5.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.5.png
deleted file mode 100644
index 2ffa96e..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.6.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.6.png
deleted file mode 100644
index f550b89..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.7.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.7.png
deleted file mode 100644
index f550b89..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.8.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.8.png
deleted file mode 100644
index f550b89..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.9.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.9.png
deleted file mode 100644
index f550b89..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.9.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml
deleted file mode 100644
index db70298..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml
+++ /dev/null
@@ -1,7037 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 32
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 48
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 64
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 80
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 96
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 112
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 128
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 144
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 160
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 176
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 192
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 208
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 224
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 240
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 256
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 272
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 288
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 304
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 320
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 336
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 352
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 368
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 384
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 400
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 416
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 432
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 448
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 464
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 480
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 496
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 512
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 528
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 544
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 560
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 576
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 592
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 608
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 624
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 640
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 656
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 672
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 688
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 704
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 720
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 736
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 752
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 768
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 784
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 800
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 816
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 832
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 848
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 864
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 880
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 896
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 912
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 928
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 944
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 960
-        image: "flickable-vertical.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 992
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1008
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1024
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1040
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1056
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1072
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1088
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1104
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1120
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1136
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1152
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1168
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1184
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1200
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1216
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1232
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1248
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1264
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1280
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1296
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1312
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1328
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1344
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1360
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1376
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1392
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1408
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1424
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1440
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1456
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1472
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1488
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1504
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1520
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1536
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1552
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1568
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1584
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1600
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1616
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1632
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1648
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1664
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1680
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1696
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1712
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1728
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1744
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1760
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1776
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1792
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1808
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1824
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1840
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1856
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1872
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1888
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1904
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1920
-        image: "flickable-vertical.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1952
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1968
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 1984
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2000
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2016
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2032
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2048
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2064
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2080
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2096
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2112
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2128
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2144
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2160
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2176
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2192
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2208
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2224
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2240
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2256
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2272
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2288
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2304
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2320
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2336
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2352
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 2368
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 143; y: 387
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2384
-        hash: "a21e65718bc7a0cdcbeb058d0cbd2977"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 386
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2400
-        hash: "a21e65718bc7a0cdcbeb058d0cbd2977"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 386
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 147; y: 380
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2416
-        hash: "a21e65718bc7a0cdcbeb058d0cbd2977"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 372
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2432
-        hash: "90d9c65705a006741671657d00ab9dba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 346
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2448
-        hash: "8c6301fb7409a22fda85072d48e838c8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 161; y: 328
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 161; y: 304
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2464
-        hash: "f5121fd6b0f20844d13cd8625a1a5047"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 276
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 159; y: 276
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2480
-        hash: "0d64b804b3b7e3ee052395f612d62bcf"
-    }
-    Frame {
-        msec: 2496
-        hash: "17b68429dfaf80bb3313e78bb01d6c4e"
-    }
-    Frame {
-        msec: 2512
-        hash: "e86ea3b103a7d9f95f7484f3579a95b5"
-    }
-    Frame {
-        msec: 2528
-        hash: "884d3842f4aa2a38ff73511b143789a0"
-    }
-    Frame {
-        msec: 2544
-        hash: "646d1dd3003ccac06b7251e8ce1beb2f"
-    }
-    Frame {
-        msec: 2560
-        hash: "ff66db77c56bf6830bc39211b3441e69"
-    }
-    Frame {
-        msec: 2576
-        hash: "8ff9c081cf823adaf6b17014fc582f12"
-    }
-    Frame {
-        msec: 2592
-        hash: "7b1563aed6f030003e04f19bb6e91a51"
-    }
-    Frame {
-        msec: 2608
-        hash: "3661b26f082e44cbc38e6033c28e99cb"
-    }
-    Frame {
-        msec: 2624
-        hash: "8e0f117dc1f2527d6b2b3f0c849fbda1"
-    }
-    Frame {
-        msec: 2640
-        hash: "5a13b0045bc132ec6c917a6d7ddf9c7a"
-    }
-    Frame {
-        msec: 2656
-        hash: "06f332d287ed14b29dd0a252d59565a2"
-    }
-    Frame {
-        msec: 2672
-        hash: "7b1512aabac1fb17ecc8e0c771e2477f"
-    }
-    Frame {
-        msec: 2688
-        hash: "22b62a7b42df6bbafad76d99001616c7"
-    }
-    Frame {
-        msec: 2704
-        hash: "0f6588fc79fa06097b2ba9bf6b1d6d14"
-    }
-    Frame {
-        msec: 2720
-        hash: "c7849941c7572b3581a7eb9423838d90"
-    }
-    Frame {
-        msec: 2736
-        hash: "8ddd8e9dc33698ecca6e19f2318e1c2e"
-    }
-    Frame {
-        msec: 2752
-        hash: "1606eb49c73e60445d9eca11e23a33f9"
-    }
-    Frame {
-        msec: 2768
-        hash: "6a7e58d27492742bf3d853ee37144dae"
-    }
-    Frame {
-        msec: 2784
-        hash: "a55ba5b7ccdabd39385c6cb32e8e1b26"
-    }
-    Frame {
-        msec: 2800
-        hash: "afe5705e8ebc240babee4a88a4321189"
-    }
-    Frame {
-        msec: 2816
-        hash: "807d92ab4b8d2295f3abfd3508258dd5"
-    }
-    Frame {
-        msec: 2832
-        hash: "ae95ed79eee246c74535d9ca97878ce6"
-    }
-    Frame {
-        msec: 2848
-        hash: "c8cf5d07a06646552d5595603532b786"
-    }
-    Frame {
-        msec: 2864
-        hash: "45971fd130662a263fcd86513aee222d"
-    }
-    Frame {
-        msec: 2880
-        image: "flickable-vertical.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "8e78a9098ebd02cc828b76609c58d6b9"
-    }
-    Frame {
-        msec: 2912
-        hash: "7f4d7a1c8e0a5494bf7f37a0a165d02b"
-    }
-    Frame {
-        msec: 2928
-        hash: "881ed825133259e731b71cf6251ed862"
-    }
-    Frame {
-        msec: 2944
-        hash: "8fb86c54b4e0280de18eb2d4f1c55e68"
-    }
-    Frame {
-        msec: 2960
-        hash: "58ad7494c0bddc0de86bfd041f45a5d3"
-    }
-    Frame {
-        msec: 2976
-        hash: "87489ba1390ee152a7de023e8ba25c72"
-    }
-    Frame {
-        msec: 2992
-        hash: "b1f06b26110799e88837781cdf4688a7"
-    }
-    Frame {
-        msec: 3008
-        hash: "d23e94ef53ce3b8143a716028ab729f9"
-    }
-    Frame {
-        msec: 3024
-        hash: "1c5fdf8d85537836b698a50fcab58a4e"
-    }
-    Frame {
-        msec: 3040
-        hash: "bd9c6ea06278efa4d491519734d0032f"
-    }
-    Frame {
-        msec: 3056
-        hash: "b533e6543ca4efb34e187d540e4ed7e0"
-    }
-    Frame {
-        msec: 3072
-        hash: "65f4ff7328ce366671436512da44a094"
-    }
-    Frame {
-        msec: 3088
-        hash: "e7afcc4c29cd1868bcf1ebea1d19fca1"
-    }
-    Frame {
-        msec: 3104
-        hash: "ddaf80f4b1d98b07fe4bf8282e13b2a8"
-    }
-    Frame {
-        msec: 3120
-        hash: "d4888df20b11e30a7d613a32e603cea5"
-    }
-    Frame {
-        msec: 3136
-        hash: "ac74be483173b08cb41b8d63e3e4d073"
-    }
-    Frame {
-        msec: 3152
-        hash: "35c65757fe27f68e35c438269c00ba53"
-    }
-    Frame {
-        msec: 3168
-        hash: "b8a28356b50362f2dabd0ab4a0d1d621"
-    }
-    Frame {
-        msec: 3184
-        hash: "71205ebfcce9e3a018fe2c30f7f3ee92"
-    }
-    Frame {
-        msec: 3200
-        hash: "0ef526ebcc23342ba4b8dfa8ed41e7de"
-    }
-    Frame {
-        msec: 3216
-        hash: "9caaec9ca80b5da75e5e1231635c2f37"
-    }
-    Frame {
-        msec: 3232
-        hash: "bb6b951e8c2252d873828e9ef1c9b625"
-    }
-    Frame {
-        msec: 3248
-        hash: "15faa58fbb91f80a8c1256e5627e7777"
-    }
-    Frame {
-        msec: 3264
-        hash: "bf2d0f512ade00ee44adb6624573daf9"
-    }
-    Frame {
-        msec: 3280
-        hash: "5af713203ef673d40c69b014dcaf242f"
-    }
-    Frame {
-        msec: 3296
-        hash: "970972470176fbd64208a3b25d4f5f65"
-    }
-    Frame {
-        msec: 3312
-        hash: "135a4356d91e594ee2b71132ecf9a606"
-    }
-    Frame {
-        msec: 3328
-        hash: "8a6364c0e033d517180ec287e61b3c9d"
-    }
-    Frame {
-        msec: 3344
-        hash: "71c7d7eddd49b77e8f96f3b7a6e8470f"
-    }
-    Frame {
-        msec: 3360
-        hash: "59667814b3e1a2d832b895235a9cdaf6"
-    }
-    Frame {
-        msec: 3376
-        hash: "a324de5e8d115862b9908aba881df913"
-    }
-    Frame {
-        msec: 3392
-        hash: "300902de67507207465a74bf6404c1c4"
-    }
-    Frame {
-        msec: 3408
-        hash: "63f40e307d9f0c14bab111e833047ee1"
-    }
-    Frame {
-        msec: 3424
-        hash: "53f54f5a4745043ef616ac21583416ef"
-    }
-    Frame {
-        msec: 3440
-        hash: "851e6eebe48034d3185674f6908932af"
-    }
-    Frame {
-        msec: 3456
-        hash: "06ef04a044394ab55fe2806a50db2abf"
-    }
-    Frame {
-        msec: 3472
-        hash: "88c82d8bb518b18a174f55c647395de1"
-    }
-    Frame {
-        msec: 3488
-        hash: "e62b84c87e1d73028305b9038915c53d"
-    }
-    Frame {
-        msec: 3504
-        hash: "fdb38aa631cd6967585dd23e20f866a9"
-    }
-    Frame {
-        msec: 3520
-        hash: "edabcd9bee25b1abcabced3b0b3dff1e"
-    }
-    Frame {
-        msec: 3536
-        hash: "6f0a2dc3151c018846b13fd2e11d0fab"
-    }
-    Frame {
-        msec: 3552
-        hash: "5101944e7867260ffdd3134436c6373a"
-    }
-    Frame {
-        msec: 3568
-        hash: "a04f231f840571734f8dab609b2f82fd"
-    }
-    Frame {
-        msec: 3584
-        hash: "87c22f82c659b405fd4e81640ce0b166"
-    }
-    Frame {
-        msec: 3600
-        hash: "2273564228baea48cac343a4f30d6a59"
-    }
-    Frame {
-        msec: 3616
-        hash: "8a4d1fc12743e6153c0f47e1fce9d55f"
-    }
-    Frame {
-        msec: 3632
-        hash: "944cd812097868935a686211551ccd35"
-    }
-    Frame {
-        msec: 3648
-        hash: "a2f1a14510a1cfe3c2c45fa10b0442b4"
-    }
-    Frame {
-        msec: 3664
-        hash: "d754cc64c12ef8cc2db0ddf99381e88c"
-    }
-    Frame {
-        msec: 3680
-        hash: "168487c8ca6f3463b3aa4433cfc99792"
-    }
-    Frame {
-        msec: 3696
-        hash: "67a82c1516b0d8d953c7055f07a9fdc7"
-    }
-    Frame {
-        msec: 3712
-        hash: "0df1592631b8cc1986f905a049b40bf0"
-    }
-    Frame {
-        msec: 3728
-        hash: "8677472d35e17d7bd5fe40f7841bb01d"
-    }
-    Frame {
-        msec: 3744
-        hash: "4472a8412e41377e0795d51706fb9180"
-    }
-    Frame {
-        msec: 3760
-        hash: "84533717ec1419617895f2ec646fb1c0"
-    }
-    Frame {
-        msec: 3776
-        hash: "ad50bd7708be94c6b8e63077e589ae48"
-    }
-    Frame {
-        msec: 3792
-        hash: "a37fb5d7cec3fbff8e12157c88e08833"
-    }
-    Frame {
-        msec: 3808
-        hash: "df1ca02b5bb76338ff24a561876f89f2"
-    }
-    Frame {
-        msec: 3824
-        hash: "df1ca02b5bb76338ff24a561876f89f2"
-    }
-    Frame {
-        msec: 3840
-        image: "flickable-vertical.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "a37fb5d7cec3fbff8e12157c88e08833"
-    }
-    Frame {
-        msec: 3872
-        hash: "3c8a94d2e139a9e84eaa6bf522250756"
-    }
-    Frame {
-        msec: 3888
-        hash: "23647f577ee83bc500ca1078eea2be90"
-    }
-    Frame {
-        msec: 3904
-        hash: "c1a52221113c162e963a2a165b8d08a5"
-    }
-    Frame {
-        msec: 3920
-        hash: "993c57d4ed9026f8615c68ef5d8c5c16"
-    }
-    Frame {
-        msec: 3936
-        hash: "3d843eac108e047b6fe9ac21d8866fdd"
-    }
-    Frame {
-        msec: 3952
-        hash: "5be1fa7cb99fda017cd5cdcf91a18525"
-    }
-    Frame {
-        msec: 3968
-        hash: "c68ef5177f4568eb77c0f4135ba65e44"
-    }
-    Frame {
-        msec: 3984
-        hash: "f047939a56a0ecee5deefcd3d2bf1710"
-    }
-    Frame {
-        msec: 4000
-        hash: "4af748f59c6a62156a228ae635ec2d9c"
-    }
-    Frame {
-        msec: 4016
-        hash: "b69b045557a8eada80a24eb4caa7ea4e"
-    }
-    Frame {
-        msec: 4032
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4048
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4064
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4080
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4096
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4112
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4128
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4144
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4160
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4176
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4192
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4208
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4224
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4240
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4256
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4272
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4288
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4304
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4320
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4336
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4352
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4368
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4384
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4400
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4416
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4432
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4448
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4464
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4480
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4496
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4512
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4528
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4544
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4560
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4576
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4592
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4608
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4624
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4640
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4656
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4672
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4688
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4704
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4720
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4736
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4752
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4768
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4784
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4800
-        image: "flickable-vertical.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4832
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4848
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4864
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4880
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4896
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4912
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4928
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4944
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4960
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4976
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 4992
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5008
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5024
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5040
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5056
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5072
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5088
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5104
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5120
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5136
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5152
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5168
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5184
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5200
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5216
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5232
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5248
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5264
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 5280
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 173; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5296
-        hash: "06472b42bc00fcaf7f84cd4ac613bbd2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 173; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5312
-        hash: "06472b42bc00fcaf7f84cd4ac613bbd2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 173; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 173; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5328
-        hash: "0031f6edee383e97a3a31fe4268ff778"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 175; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 179; y: 137
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5344
-        hash: "e594c62fe10165ae08e3dd8b33b9f584"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 159
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 183
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5360
-        hash: "dd61c97aafee69eb7c54a47dceea5810"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5376
-        hash: "29d06473d4aac07c89041b4413ce421f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 227
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 243
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5392
-        hash: "7843b1bdb9efdbee0e6dd39ef8f1078a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 253
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 185; y: 253
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5408
-        hash: "f609350d3c3041998340c9a6ded9baec"
-    }
-    Frame {
-        msec: 5424
-        hash: "53b559ea9764ad466a0ffc1c55a596c2"
-    }
-    Frame {
-        msec: 5440
-        hash: "8ac64c07cb29adff5d8510f956f3c35d"
-    }
-    Frame {
-        msec: 5456
-        hash: "cb7ab2e7af067f1493197731515462fa"
-    }
-    Frame {
-        msec: 5472
-        hash: "a0509acbb96bb3ced08a7c968836bd69"
-    }
-    Frame {
-        msec: 5488
-        hash: "e4c5e681a275b4eff49eed39a6b544d6"
-    }
-    Frame {
-        msec: 5504
-        hash: "4403e91762ff703eb12dee1b47f4072c"
-    }
-    Frame {
-        msec: 5520
-        hash: "9f548a31dea71208c9f465e37bafc589"
-    }
-    Frame {
-        msec: 5536
-        hash: "c86dd18e63508adfdbd5b3b891fd0d99"
-    }
-    Frame {
-        msec: 5552
-        hash: "b182070ff0c1b579a9fd16d39f950079"
-    }
-    Frame {
-        msec: 5568
-        hash: "4308c4d6346e20ed89026c0ec216ae89"
-    }
-    Frame {
-        msec: 5584
-        hash: "2da84d83767e5ac1f7ce361bdcebe9c8"
-    }
-    Frame {
-        msec: 5600
-        hash: "a3ce932ebf10147f79a183e44a6f6eb7"
-    }
-    Frame {
-        msec: 5616
-        hash: "f5907789e23150c8dd0858d7c5098907"
-    }
-    Frame {
-        msec: 5632
-        hash: "98b76cfad574957f5b7633390c6788c8"
-    }
-    Frame {
-        msec: 5648
-        hash: "8c58d6511a7077cc386216a6227e8b52"
-    }
-    Frame {
-        msec: 5664
-        hash: "2ca5e16bfd83f933f32367aa49db0e1d"
-    }
-    Frame {
-        msec: 5680
-        hash: "ba387d0ab480eb9eaf6993c2ad168350"
-    }
-    Frame {
-        msec: 5696
-        hash: "ae9f3b3245ccf921967a178712566b55"
-    }
-    Frame {
-        msec: 5712
-        hash: "32cf742724558260447f61da03d5f321"
-    }
-    Frame {
-        msec: 5728
-        hash: "ad21273f37c1abac0719f532dd5530ac"
-    }
-    Frame {
-        msec: 5744
-        hash: "50e43629e0b8d0d651b9670241354cb1"
-    }
-    Frame {
-        msec: 5760
-        image: "flickable-vertical.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "e4f0192406831c8e0abe1b561120b9c0"
-    }
-    Frame {
-        msec: 5792
-        hash: "4c98e619b487d67d114ed0d7800f157e"
-    }
-    Frame {
-        msec: 5808
-        hash: "11ed6dc9464396eb790db236f3713164"
-    }
-    Frame {
-        msec: 5824
-        hash: "908febb1e344d6972d6df611e82792bd"
-    }
-    Frame {
-        msec: 5840
-        hash: "03536bb4d6ff84bf75d9ec3574bb7361"
-    }
-    Frame {
-        msec: 5856
-        hash: "f9946a44c2d4e91a947e6bda7415cf9b"
-    }
-    Frame {
-        msec: 5872
-        hash: "0e63e4b9dd6bc7d7b684cb461c6257bf"
-    }
-    Frame {
-        msec: 5888
-        hash: "1ffe88b771bed2aa27aafe6853b67c7a"
-    }
-    Frame {
-        msec: 5904
-        hash: "ff1b78113a710481273ecf01cc978a46"
-    }
-    Frame {
-        msec: 5920
-        hash: "e381553fa74436ca4b0d166bdca78cf7"
-    }
-    Frame {
-        msec: 5936
-        hash: "d9a6f9bfc011edb7da23091fe24e2717"
-    }
-    Frame {
-        msec: 5952
-        hash: "bd137e8b15f5c485d10b83461dedc67f"
-    }
-    Frame {
-        msec: 5968
-        hash: "8f5b5e19845aa537790b683ef37c8626"
-    }
-    Frame {
-        msec: 5984
-        hash: "5abbf0dccef8a3bb7b090a24d715a25f"
-    }
-    Frame {
-        msec: 6000
-        hash: "bf924dd11e226022c9c812b5c7e8229e"
-    }
-    Frame {
-        msec: 6016
-        hash: "c47b59ff7f3c4acfb296959f6eb14801"
-    }
-    Frame {
-        msec: 6032
-        hash: "b5c0ac4514d44a651a4ab817646f1d88"
-    }
-    Frame {
-        msec: 6048
-        hash: "86a9fba0e2ca761a4fb71e5edbf34cab"
-    }
-    Frame {
-        msec: 6064
-        hash: "5bf43304399bdc979afd2580b922fd30"
-    }
-    Frame {
-        msec: 6080
-        hash: "3696756d6250f23b1122d314df08b936"
-    }
-    Frame {
-        msec: 6096
-        hash: "49c7b24b1655a1b5a9b4cc2187f7cc58"
-    }
-    Frame {
-        msec: 6112
-        hash: "a387dce727804fb4ca1c3378ba130d08"
-    }
-    Frame {
-        msec: 6128
-        hash: "505150386afee9c5d89566c90778cf58"
-    }
-    Frame {
-        msec: 6144
-        hash: "a00ecae0150a069d306127ed54c4921f"
-    }
-    Frame {
-        msec: 6160
-        hash: "e556bfca052e4d8922a4b85d6e94a22a"
-    }
-    Frame {
-        msec: 6176
-        hash: "ac710b4796de4d0b7d275c5fffcefe1f"
-    }
-    Frame {
-        msec: 6192
-        hash: "2f0475e842083c93b0fa0b8a8a33117a"
-    }
-    Frame {
-        msec: 6208
-        hash: "6de0e820748df06e702a82f127d9f635"
-    }
-    Frame {
-        msec: 6224
-        hash: "b3748d7a26ea8289e2faa9dd624b23a3"
-    }
-    Frame {
-        msec: 6240
-        hash: "52be51e9a5bf6e6d0c2e64e584a4bf11"
-    }
-    Frame {
-        msec: 6256
-        hash: "9c4a08a51556d56f2809d27a1de0aae3"
-    }
-    Frame {
-        msec: 6272
-        hash: "4a151e94a39b68a47374cc45cb8969df"
-    }
-    Frame {
-        msec: 6288
-        hash: "a2c2926224103d6e0a679b891451f791"
-    }
-    Frame {
-        msec: 6304
-        hash: "c192adca5c3cf3741f6e7b33d53a722a"
-    }
-    Frame {
-        msec: 6320
-        hash: "8fa9d85c213243e0709e3e32f03cebd9"
-    }
-    Frame {
-        msec: 6336
-        hash: "20f516aa2c4ebc239a283176d83ade6f"
-    }
-    Frame {
-        msec: 6352
-        hash: "ac8ace61348c5500dd6e2d1f3b4b174b"
-    }
-    Frame {
-        msec: 6368
-        hash: "39cc6b136e17283ddc65425150cec7be"
-    }
-    Frame {
-        msec: 6384
-        hash: "b250cb3fd5a7ab5c76ae15d5a500a894"
-    }
-    Frame {
-        msec: 6400
-        hash: "f07e4f8b61c0ce514364e062867687a2"
-    }
-    Frame {
-        msec: 6416
-        hash: "caed510a4edc2830f885f9a8ff98c072"
-    }
-    Frame {
-        msec: 6432
-        hash: "2cfba2b8cd1cbc260edf390e17532afa"
-    }
-    Frame {
-        msec: 6448
-        hash: "f1d705e01521261f22b89aeefb146c7a"
-    }
-    Frame {
-        msec: 6464
-        hash: "9508799a0e28e60a65925b7c10fa2874"
-    }
-    Frame {
-        msec: 6480
-        hash: "accdad5176a0cdce92ed07a7ae818a13"
-    }
-    Frame {
-        msec: 6496
-        hash: "2748258d00cf2f0e5f94c94f97ed95ae"
-    }
-    Frame {
-        msec: 6512
-        hash: "994897c0842947675e2e2df4021c1b5e"
-    }
-    Frame {
-        msec: 6528
-        hash: "22936773b2fc5c555f14a8375da2a7a4"
-    }
-    Frame {
-        msec: 6544
-        hash: "22936773b2fc5c555f14a8375da2a7a4"
-    }
-    Frame {
-        msec: 6560
-        hash: "b58badc862e394bf5374554e019f90c0"
-    }
-    Frame {
-        msec: 6576
-        hash: "b58badc862e394bf5374554e019f90c0"
-    }
-    Frame {
-        msec: 6592
-        hash: "b58badc862e394bf5374554e019f90c0"
-    }
-    Frame {
-        msec: 6608
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6624
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6640
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6656
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6672
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6688
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6704
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6720
-        image: "flickable-vertical.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6752
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6768
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 31; y: 575
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6784
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6800
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6816
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6832
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6848
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6864
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 31; y: 575
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6880
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6896
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6912
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6928
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6944
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6960
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6976
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 6992
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7008
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7024
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7040
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7056
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7072
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7088
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7104
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7120
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7136
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7152
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7168
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7184
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7200
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7216
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7232
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7248
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7264
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7280
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 156; y: 403
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7296
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 402
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 396
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7312
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 386
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7328
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 376
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 360
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7344
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 344
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 322
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7360
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 298
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 278
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 168; y: 278
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7376
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7392
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7408
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7424
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7440
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7456
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7472
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7488
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7504
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7520
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7536
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7552
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7568
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7584
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7600
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7616
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7632
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7648
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7664
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7680
-        image: "flickable-vertical.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7712
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7728
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7744
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7760
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7776
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7792
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7808
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 154; y: 161
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7824
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Frame {
-        msec: 7840
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 162
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7856
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 167
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7872
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 177
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7888
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 150; y: 189
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7904
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 229
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: 255
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7920
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 134; y: 281
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 132; y: 313
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7936
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 128; y: 343
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7952
-        hash: "16eef219cc7d4e7589ea59ebc349973c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 126; y: 373
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 126; y: 397
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 126; y: 397
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7968
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 7984
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8000
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8016
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8032
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8048
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8064
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8080
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8096
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8112
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8128
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8144
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8160
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8176
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8192
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8208
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8224
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8240
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8256
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8272
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8288
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8304
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8320
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8336
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8352
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8368
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8384
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8400
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8416
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8432
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8448
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8464
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8480
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8496
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8512
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8528
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8544
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8560
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8576
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8592
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8608
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8624
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8640
-        image: "flickable-vertical.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8672
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8688
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8704
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8720
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8736
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8752
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8768
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8784
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8800
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8816
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8832
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8848
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8864
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8880
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8896
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8912
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8928
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8944
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8960
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8976
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 8992
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9008
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9024
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9040
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9056
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9072
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9088
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9104
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 44; y: 574
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9120
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9136
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9152
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 44; y: 574
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9168
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9184
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9200
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9216
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9232
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9248
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9264
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9280
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9296
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9312
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9328
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9344
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9360
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9376
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9392
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9408
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9424
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9440
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9456
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9472
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9488
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9504
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9520
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9536
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9552
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9568
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9584
-        hash: "679369b924d719ae309a45034bdba40d"
-    }
-    Frame {
-        msec: 9600
-        image: "flickable-vertical.9.png"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 152; y: 444
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9616
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 442
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9632
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 440
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 438
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9648
-        hash: "843453070c3ac1bf26cfd84d3ab151eb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 429
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9664
-        hash: "3b0e0ed925b1c197cd94afd3d1a6d572"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 421
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 413
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9680
-        hash: "d7b3838ee1219816b76224c29c7ba2e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 403
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9696
-        hash: "9835b420f0c40a03f8f9fafe39e209f1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 162; y: 393
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 162; y: 393
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9712
-        hash: "46fb2005a813fc2c278f1bfe83801c0e"
-    }
-    Frame {
-        msec: 9728
-        hash: "81dd9308e475548db21474c37cb9a5b0"
-    }
-    Frame {
-        msec: 9744
-        hash: "10043d74eef240abd2360d45845dd51e"
-    }
-    Frame {
-        msec: 9760
-        hash: "0f83b8f23ba42b22c10a2b68227db64e"
-    }
-    Frame {
-        msec: 9776
-        hash: "7a296e3702c9fef25cb53ac04053853b"
-    }
-    Frame {
-        msec: 9792
-        hash: "ae439daa32f76a368ab314c86c55a378"
-    }
-    Frame {
-        msec: 9808
-        hash: "42ac3503dfa462bf0b5d8c15f6f3b143"
-    }
-    Frame {
-        msec: 9824
-        hash: "b8bb92eb2de7ca0f5924b09f380f47db"
-    }
-    Frame {
-        msec: 9840
-        hash: "994e314d2d38005b6006e81468f10efa"
-    }
-    Frame {
-        msec: 9856
-        hash: "be6a32f3c82aeccebc7778ff5646637f"
-    }
-    Frame {
-        msec: 9872
-        hash: "2fb196f53d5e785e04a14d98d9dab8a1"
-    }
-    Frame {
-        msec: 9888
-        hash: "0926f8209f4f35f6e6fa92935d7408e4"
-    }
-    Frame {
-        msec: 9904
-        hash: "780450301d37ea2b94eb9386e7e5294c"
-    }
-    Frame {
-        msec: 9920
-        hash: "cd4e9629c767813c9a2a2fa30dc5114b"
-    }
-    Frame {
-        msec: 9936
-        hash: "409630d7b9c3c4231bccf74f7453f0af"
-    }
-    Frame {
-        msec: 9952
-        hash: "4c98e619b487d67d114ed0d7800f157e"
-    }
-    Frame {
-        msec: 9968
-        hash: "0a8157dc45764ab8e0e0b89e5c73a76b"
-    }
-    Frame {
-        msec: 9984
-        hash: "ecfc611b58e000df9f608c8889a2a84f"
-    }
-    Frame {
-        msec: 10000
-        hash: "5c6bc246446c75d57bcd40e86041892b"
-    }
-    Frame {
-        msec: 10016
-        hash: "fe1a3e688da126861b29a94b676b68f7"
-    }
-    Frame {
-        msec: 10032
-        hash: "f5feef892bf013916bacb63ff6460cb7"
-    }
-    Frame {
-        msec: 10048
-        hash: "665018efd991cab3acb4b80005fc2bd3"
-    }
-    Frame {
-        msec: 10064
-        hash: "bc7614e4a0e0724a9cb0981f09f8a7f6"
-    }
-    Frame {
-        msec: 10080
-        hash: "463a6da452a5a6267240992ad5284e89"
-    }
-    Frame {
-        msec: 10096
-        hash: "eca3f146e0143856f58b4f7aee42e6f8"
-    }
-    Frame {
-        msec: 10112
-        hash: "dec9b9845509c4d28d7faae043b292d1"
-    }
-    Frame {
-        msec: 10128
-        hash: "49452842cb2429cd465e40478638e0e3"
-    }
-    Frame {
-        msec: 10144
-        hash: "a7029d0090d3620ee21b9e3d55eefe78"
-    }
-    Frame {
-        msec: 10160
-        hash: "1041b18d422acba0b9a45ca89856e493"
-    }
-    Frame {
-        msec: 10176
-        hash: "d53038b688b920715b196dd4cc2b2587"
-    }
-    Frame {
-        msec: 10192
-        hash: "da59ffebb491ab5fa98429117c3bb8ac"
-    }
-    Frame {
-        msec: 10208
-        hash: "602269f78eaf0df36c66de72e005989a"
-    }
-    Frame {
-        msec: 10224
-        hash: "a311b6b35feb4096b0d01753a6695210"
-    }
-    Frame {
-        msec: 10240
-        hash: "cd303e8850c6aac58fcf2a98db418f1b"
-    }
-    Frame {
-        msec: 10256
-        hash: "6e9132dd840a136cc688676bce7640de"
-    }
-    Frame {
-        msec: 10272
-        hash: "a3818492bb4ebd91ce86675d34731c58"
-    }
-    Frame {
-        msec: 10288
-        hash: "b85a127895713234028641787312b717"
-    }
-    Frame {
-        msec: 10304
-        hash: "a030dc1543e84d8a0ec9f77fd6325060"
-    }
-    Frame {
-        msec: 10320
-        hash: "669cd28abe17d419e9cabe4d796a38c3"
-    }
-    Frame {
-        msec: 10336
-        hash: "bfdd15cf058050203561b5f935106263"
-    }
-    Frame {
-        msec: 10352
-        hash: "a39abc94fee93175a6a37b402750e4f7"
-    }
-    Frame {
-        msec: 10368
-        hash: "0c65e19e12d95ec8ee253219b0c3e472"
-    }
-    Frame {
-        msec: 10384
-        hash: "15debc234e70765a4510bfbda886a2c9"
-    }
-    Frame {
-        msec: 10400
-        hash: "9566a87437cb6e9025f9a3881a620823"
-    }
-    Frame {
-        msec: 10416
-        hash: "b66d89244cba537a21901dcb11387bf7"
-    }
-    Frame {
-        msec: 10432
-        hash: "03347ce314393bd84873026cd01c562f"
-    }
-    Frame {
-        msec: 10448
-        hash: "458fab2449dba089ae6f1e78a230564b"
-    }
-    Frame {
-        msec: 10464
-        hash: "7115f27574bfc68ff58a2e4fb65107dd"
-    }
-    Frame {
-        msec: 10480
-        hash: "66260c030dddda4b086bc98982a11934"
-    }
-    Frame {
-        msec: 10496
-        hash: "d5790ee5eb8ecf249cb1dcf58aefa4ee"
-    }
-    Frame {
-        msec: 10512
-        hash: "6bec07ba1e2ac637aab7a9038cbacc93"
-    }
-    Frame {
-        msec: 10528
-        hash: "a72f36cc18c8620a2bd85bac49f6771a"
-    }
-    Frame {
-        msec: 10544
-        hash: "65b178ae559ab0ba9c568718f287ff68"
-    }
-    Frame {
-        msec: 10560
-        image: "flickable-vertical.10.png"
-    }
-    Frame {
-        msec: 10576
-        hash: "b35a8e33f876921d477809b5adb7a201"
-    }
-    Frame {
-        msec: 10592
-        hash: "057b69ef8137f38c596432da547f1ead"
-    }
-    Frame {
-        msec: 10608
-        hash: "62f76f46857106010c2e862ed19baeea"
-    }
-    Frame {
-        msec: 10624
-        hash: "fbfc73e1b20b79d71953c298ca095047"
-    }
-    Frame {
-        msec: 10640
-        hash: "aea78988f875083660dd46d6afc71683"
-    }
-    Frame {
-        msec: 10656
-        hash: "60d8decd7ded420433256a94f1bf954f"
-    }
-    Frame {
-        msec: 10672
-        hash: "221f72cdf18e0b33e7f6a65356fcc61b"
-    }
-    Frame {
-        msec: 10688
-        hash: "221f72cdf18e0b33e7f6a65356fcc61b"
-    }
-    Frame {
-        msec: 10704
-        hash: "c2eac9c0d84c6b2f133d8751ac5f265f"
-    }
-    Frame {
-        msec: 10720
-        hash: "c2eac9c0d84c6b2f133d8751ac5f265f"
-    }
-    Frame {
-        msec: 10736
-        hash: "c2eac9c0d84c6b2f133d8751ac5f265f"
-    }
-    Frame {
-        msec: 10752
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10768
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10784
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10800
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10816
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10832
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10848
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10864
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10880
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 98; y: 573
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10896
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10912
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10928
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10944
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10960
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 98; y: 573
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10976
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 10992
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11008
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11024
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11040
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11056
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11072
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11088
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11104
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11120
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11136
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11152
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11168
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11184
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11200
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11216
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11232
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11248
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11264
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11280
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11296
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11312
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11328
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11344
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11360
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11376
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11392
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11408
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11424
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11440
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11456
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11472
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11488
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11504
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11520
-        image: "flickable-vertical.11.png"
-    }
-    Frame {
-        msec: 11536
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11552
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11568
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11584
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11600
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11616
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11632
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11648
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11664
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11680
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11696
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11712
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11728
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 170; y: 335
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11744
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Frame {
-        msec: 11760
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 336
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 338
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11776
-        hash: "28a06534a2e35250c67112dfb6c05095"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 346
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11792
-        hash: "12040d4dd56848fc93d6390005045188"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 359
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11808
-        hash: "caa70db5f31eb607c2de39734a42796c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 367
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 379
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11824
-        hash: "ca45ab832b5a8b041ba8bea1185a2b38"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 393
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 407
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11840
-        hash: "188042b1a045dc96a65a7fc0e90568c3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 419
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11856
-        hash: "714a3cf591beeeddbdc2df94f5cedef1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 443
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11872
-        hash: "e9978c24eef649d01cb2245f783cb562"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 461
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11888
-        hash: "bc8f32062afdfe33da7c99ee867bc2a3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 467
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11904
-        hash: "d788c09f4acba8197b2d8fef2e8ece51"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 470
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11920
-        hash: "b0a383eb416727c22451a30a997f48f1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 169; y: 472
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11936
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 11952
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 11968
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 11984
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12000
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12016
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12032
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12048
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12064
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 169; y: 472
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12080
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12096
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12112
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12128
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12144
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12160
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12176
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12192
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12208
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12224
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12240
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12256
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12272
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12288
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12304
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12320
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12336
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12352
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12368
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12384
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12400
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12416
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Frame {
-        msec: 12432
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 171; y: 452
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12448
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 172; y: 450
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 173; y: 448
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12464
-        hash: "6b81b365eb057ffa32d89e564bc92949"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 175; y: 434
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12480
-        image: "flickable-vertical.12.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 175; y: 431
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 177; y: 423
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12496
-        hash: "7e760a017ab10fe920074405248d1473"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 177; y: 415
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12512
-        hash: "eab43f1c2b6fb79aad578a164b8b7b28"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 181; y: 395
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 383
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12528
-        hash: "a5446ca4c6650ffc9812845bdb8db088"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 371
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12544
-        hash: "71cb7dc7f9dbb9e17d7f44885ec71bdb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 357
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12560
-        hash: "ccf0908d968f658311a9787182de498a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 329
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12576
-        hash: "26b9c6379590bbda24d129bd4f19f7d3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 303
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 293
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12592
-        hash: "6c88a02ffdffee6d615ddc6a11c1b698"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 283
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12608
-        hash: "38175cb09b6e63353b478635b22dbb5b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 280
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 277
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12624
-        hash: "5084910bf204e8b688de31d4f9018a57"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 275
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 273
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12640
-        hash: "e984565312571ec144a1cd4cc11253e8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 272
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 271
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12656
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12672
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12688
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12704
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12720
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12736
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12752
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12768
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 187; y: 271
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12784
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12800
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12816
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12832
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12848
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12864
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12880
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12896
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12912
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12928
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12944
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12960
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12976
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 12992
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 13008
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13024
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13040
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13056
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13072
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13088
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13104
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13120
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13136
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13152
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13168
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13184
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13200
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13216
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13232
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13248
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13264
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13280
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13296
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13312
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13328
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13344
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 181; y: 242
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13360
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13376
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13392
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13408
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13424
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 181; y: 242
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13440
-        image: "flickable-vertical.13.png"
-    }
-    Frame {
-        msec: 13456
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13472
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13488
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13504
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13520
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13536
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13552
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13568
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13584
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13600
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13616
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13632
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13648
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13664
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13680
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13696
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13712
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13728
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13744
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13760
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13776
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13792
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13808
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13824
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13840
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13856
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13872
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13888
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13904
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13920
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13936
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 181; y: 242
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13952
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13968
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 13984
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 14000
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 14016
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 14032
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 14048
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 14064
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 14080
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 14096
-        hash: "4b86de37ae9bc630a2f3440811087617"
-    }
-    Frame {
-        msec: 14112
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14128
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14144
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14160
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14176
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14192
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14208
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14224
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14240
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14256
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14272
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14288
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14304
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14320
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14336
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14352
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14368
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14384
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14400
-        image: "flickable-vertical.14.png"
-    }
-    Frame {
-        msec: 14416
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14432
-        hash: "d96fb1b387b34f41f80e98c1feb05303"
-    }
-    Frame {
-        msec: 14448
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14464
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14480
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14496
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14512
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14528
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14544
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14560
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14576
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14592
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14608
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14624
-        hash: "ecd5db8e582e6d2e15943ffd9fcb32a7"
-    }
-    Frame {
-        msec: 14640
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14656
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14672
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14688
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14704
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14720
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14736
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14752
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14768
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14784
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14800
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14816
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14832
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14848
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14864
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14880
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14896
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14912
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14928
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14944
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14960
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14976
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 14992
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 15008
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 15024
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 15040
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 181; y: 242
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 15056
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15072
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15088
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15104
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15120
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15136
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15152
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15168
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15184
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15200
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15216
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15232
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15248
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15264
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15280
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15296
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15312
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15328
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15344
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15360
-        image: "flickable-vertical.15.png"
-    }
-    Frame {
-        msec: 15376
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15392
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15408
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15424
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15440
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15456
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15472
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15488
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15504
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15520
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15536
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15552
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15568
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15584
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15600
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15616
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15632
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15648
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15664
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15680
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15696
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15712
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 192; y: 218
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 15728
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15744
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15760
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15776
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15792
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15808
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15824
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15840
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15856
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15872
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15888
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15904
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15920
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15936
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15952
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15968
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 15984
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16000
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16016
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16032
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16048
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16064
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16080
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16096
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16112
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16128
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16144
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16160
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16176
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16192
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16208
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16224
-        hash: "e3069d9d3cbcd845b1e4763b0759dc38"
-    }
-    Frame {
-        msec: 16240
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16256
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16272
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16288
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16304
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16320
-        image: "flickable-vertical.16.png"
-    }
-    Frame {
-        msec: 16336
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16352
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16368
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16384
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16400
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16416
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16432
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16448
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16464
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16480
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16496
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16512
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16528
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16544
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16560
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16576
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16592
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16608
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16624
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16640
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Frame {
-        msec: 16656
-        hash: "53a0e69fe4816e6eed0b4e795bf90e19"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 222
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 224
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16672
-        hash: "c30bea2a73a8b5af4565ef3996f29416"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 228
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 230
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16688
-        hash: "9612c176ec3ecf76a367728f451522a4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 233
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16704
-        hash: "24f6feeeb1ff82c8d4262f74e4656602"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 238
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16720
-        hash: "5823b56f1e362fdfc216a82e2dcdec61"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 241
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16736
-        hash: "4ee243b91e847dabaceb21b5540c2a6d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 245
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16752
-        hash: "87f1dc2238577fc5be6b1bd941226f3e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 251
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16768
-        hash: "480c6fcf1b3862a41a7225c35d8080c3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 256
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16784
-        hash: "0ac819bd8e6ce19553bd954e466e7ac0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 258
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16800
-        hash: "0636dd7c4eb0b56697fb59fb46f47f9c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 201; y: 267
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16816
-        hash: "62f76f46857106010c2e862ed19baeea"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 276
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16832
-        hash: "26b9c6379590bbda24d129bd4f19f7d3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 279
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 280
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16848
-        hash: "21baf0596553627c8e683a31c2e6d04f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 281
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 282
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16864
-        hash: "036679da5def5e696361f2373172a3f4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 283
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16880
-        hash: "e3fc6101bc6cccf309b3df6b194820ea"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 285
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16896
-        hash: "d9ee6d0a7455cfd724c1856549100756"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 286
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16912
-        hash: "caa70db5f31eb607c2de39734a42796c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 287
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16928
-        hash: "e2dc88b454e69cf92d6887a2f0629a94"
-    }
-    Frame {
-        msec: 16944
-        hash: "e2dc88b454e69cf92d6887a2f0629a94"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 288
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 16960
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 16976
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 16992
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17008
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17024
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17040
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17056
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17072
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17088
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 203; y: 288
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 17104
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17120
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17136
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17152
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17168
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17184
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17200
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17216
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17232
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17248
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17264
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17280
-        image: "flickable-vertical.17.png"
-    }
-    Frame {
-        msec: 17296
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17312
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17328
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17344
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17360
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17376
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17392
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17408
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17424
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17440
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17456
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17472
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17488
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17504
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17520
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17536
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17552
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17568
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17584
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17600
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17616
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17632
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17648
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17664
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17680
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17696
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17712
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17728
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17744
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17760
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17776
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17792
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17808
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17824
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17840
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17856
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17872
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17888
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17904
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17920
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17936
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17952
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17968
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 17984
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18000
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18016
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18032
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18048
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18064
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18080
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18096
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18112
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18128
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18144
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18160
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18176
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18192
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18208
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18224
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18240
-        image: "flickable-vertical.18.png"
-    }
-    Frame {
-        msec: 18256
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18272
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18288
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18304
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18320
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18336
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18352
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18368
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18384
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18400
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18416
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18432
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18448
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 102; y: 575
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 18464
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18480
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18496
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 102; y: 575
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 18512
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18528
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18544
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18560
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18576
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18592
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18608
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18624
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18640
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18656
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18672
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18688
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18704
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18720
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18736
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18752
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18768
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18784
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18800
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18816
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18832
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18848
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18864
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18880
-        hash: "fac8455a2707b04aabff25723375a78b"
-    }
-    Frame {
-        msec: 18896
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 18912
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 18928
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 18944
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 18960
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 18976
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 18992
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19008
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19024
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19040
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19056
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19072
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19088
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19104
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19120
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19136
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19152
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19168
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19184
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19200
-        image: "flickable-vertical.19.png"
-    }
-    Frame {
-        msec: 19216
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19232
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19248
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19264
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 164; y: 571
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 19280
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19296
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19312
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19328
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 164; y: 571
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 19344
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19360
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19376
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19392
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19408
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19424
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19440
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19456
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19472
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19488
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19504
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19520
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19536
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19552
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19568
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19584
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19600
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19616
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19632
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19648
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19664
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19680
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19696
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19712
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19728
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19744
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19760
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19776
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19792
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19808
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19824
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19840
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19856
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19872
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19888
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19904
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19920
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19936
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19952
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19968
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 19984
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20000
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20016
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20032
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20048
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20064
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20080
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20096
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20112
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20128
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20144
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20160
-        image: "flickable-vertical.20.png"
-    }
-    Frame {
-        msec: 20176
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20192
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20208
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Frame {
-        msec: 20224
-        hash: "cce4177eb20b7aa43a7383a16c43f473"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 170; y: 450
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 20240
-        hash: "b8e7a053fc023be42ab5136f6e7305fd"
-    }
-    Frame {
-        msec: 20256
-        hash: "b8e7a053fc023be42ab5136f6e7305fd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 448
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 20272
-        hash: "b8e7a053fc023be42ab5136f6e7305fd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 172; y: 438
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 20288
-        hash: "40cf6e4567c796d6ad83778fb1959d8a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 410
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 20304
-        hash: "9914584daf02407c1edc3b6a38b8302d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 388
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 366
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 20320
-        hash: "5aff2316a5e34f5e15b7cb36257a3d72"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 342
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 176; y: 342
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 20336
-        hash: "de1f9ff1abfa8cdc760bc84129fab40d"
-    }
-    Frame {
-        msec: 20352
-        hash: "032c4fd62a0a611207262d317d4ea103"
-    }
-    Frame {
-        msec: 20368
-        hash: "1db8a7b3899f5efea25ccf93285ee6bd"
-    }
-    Frame {
-        msec: 20384
-        hash: "3c106f68b755862346cddd21d75c0caf"
-    }
-    Frame {
-        msec: 20400
-        hash: "41d025dfe037b9cebe84e4c7200e9d15"
-    }
-    Frame {
-        msec: 20416
-        hash: "f347687313c88150a6f977ae8b1620fc"
-    }
-    Frame {
-        msec: 20432
-        hash: "4bb30faaec54e2a47dfd2b2988a6c231"
-    }
-    Frame {
-        msec: 20448
-        hash: "fede02600e790d4b6eb1f85563b37cbc"
-    }
-    Frame {
-        msec: 20464
-        hash: "0a949f7150b3709b9eda62c98f98fc62"
-    }
-    Frame {
-        msec: 20480
-        hash: "214e571c2346b0d6b5d1220e856a8e67"
-    }
-    Frame {
-        msec: 20496
-        hash: "f84207d20cfff984d1c79654a1074d02"
-    }
-    Frame {
-        msec: 20512
-        hash: "7dc3592294dcd88fbfff2f984fd2d4c3"
-    }
-    Frame {
-        msec: 20528
-        hash: "42829e78f62e692a093df267d2b673e2"
-    }
-    Frame {
-        msec: 20544
-        hash: "d264570c78e7d1ea283c72191953a2ce"
-    }
-    Frame {
-        msec: 20560
-        hash: "b69b045557a8eada80a24eb4caa7ea4e"
-    }
-    Frame {
-        msec: 20576
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20592
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20608
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20624
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20640
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20656
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20672
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20688
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20704
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20720
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20736
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20752
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20768
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20784
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20800
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20816
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20832
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20848
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20864
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20880
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20896
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20912
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20928
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20944
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20960
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20976
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 20992
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21008
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21024
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21040
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21056
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21072
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21088
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21104
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21120
-        image: "flickable-vertical.21.png"
-    }
-    Frame {
-        msec: 21136
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21152
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21168
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21184
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21200
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21216
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21232
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21248
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21264
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21280
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21296
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21312
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21328
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21344
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21360
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21376
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21392
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21408
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21424
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21440
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21456
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21472
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21488
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21504
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21520
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21536
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21552
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21568
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Frame {
-        msec: 21584
-        hash: "a76f069dfcb1af0794999c34507e190e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 197; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 197; y: 132
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 21600
-        hash: "06472b42bc00fcaf7f84cd4ac613bbd2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 197; y: 146
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 197; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 21616
-        hash: "463fce69afc3dec181425c9adaa3e77c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 197; y: 190
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 195; y: 218
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 21632
-        hash: "9af34ff618e277eafad32e0377ecc94b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 250
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 21648
-        hash: "db4b2333630ccc4a7982361609a12837"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 284
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 183; y: 284
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 21664
-        hash: "50335b19a1e210f87924d01bb343a0e0"
-    }
-    Frame {
-        msec: 21680
-        hash: "59b4f80a7cd6b732eb26f3b4147efe7e"
-    }
-    Frame {
-        msec: 21696
-        hash: "b99cc1f07bcb0480801d4d5403372525"
-    }
-    Frame {
-        msec: 21712
-        hash: "871040b0f921646609b79828bab38949"
-    }
-    Frame {
-        msec: 21728
-        hash: "2acb3d19eed000313872d5cd66765b53"
-    }
-    Frame {
-        msec: 21744
-        hash: "b5431a2d2e856a726ceac2066b128f8f"
-    }
-    Frame {
-        msec: 21760
-        hash: "04047c917a95a2a3df30c14bb20601dd"
-    }
-    Frame {
-        msec: 21776
-        hash: "fea7ac3d26975f438129e394c667e628"
-    }
-    Frame {
-        msec: 21792
-        hash: "4db41ff05865cabc4ef288478254e633"
-    }
-    Frame {
-        msec: 21808
-        hash: "e0d3737effd817a8f603eb393677b8b6"
-    }
-    Frame {
-        msec: 21824
-        hash: "d4f06941d213544ddcae714ddc0b47e9"
-    }
-    Frame {
-        msec: 21840
-        hash: "dbb21caf4a4c9b88563f1d0aad35f3d3"
-    }
-    Frame {
-        msec: 21856
-        hash: "eb9a052219c3f955f2c036834990089b"
-    }
-    Frame {
-        msec: 21872
-        hash: "40090a35caf674ed9c4bf1d10f9209ea"
-    }
-    Frame {
-        msec: 21888
-        hash: "064de0abec66d1ddcf0f6073ce7d91ef"
-    }
-    Frame {
-        msec: 21904
-        hash: "f407334d0b63a34657dc1306fd67aeb7"
-    }
-    Frame {
-        msec: 21920
-        hash: "1c0744be97c65c68ca92bd86d42c7b0e"
-    }
-    Frame {
-        msec: 21936
-        hash: "7469d4a06c5df073e22db3c905baefc1"
-    }
-    Frame {
-        msec: 21952
-        hash: "35912a7e2ecc0c387fc9fb9da7201bfd"
-    }
-    Frame {
-        msec: 21968
-        hash: "9f835091374f0d0d9a6996e6dad10e19"
-    }
-    Frame {
-        msec: 21984
-        hash: "afade1ecbaf5f920880eaff3b3de606e"
-    }
-    Frame {
-        msec: 22000
-        hash: "9c70e8a020c8c1101b9884529cb4527f"
-    }
-    Frame {
-        msec: 22016
-        hash: "3e7d4dc75f85dfeb065da18ef1c102c1"
-    }
-    Frame {
-        msec: 22032
-        hash: "16852d62a77eefccea9497ae1b09842d"
-    }
-    Frame {
-        msec: 22048
-        hash: "ea8afda6d837a98f408a7aa133494575"
-    }
-    Frame {
-        msec: 22064
-        hash: "666435dccf30c53eb09ea7ad8b5264a1"
-    }
-    Frame {
-        msec: 22080
-        image: "flickable-vertical.22.png"
-    }
-    Frame {
-        msec: 22096
-        hash: "2e959bf0470bac84e2220d9e8a8bbb97"
-    }
-    Frame {
-        msec: 22112
-        hash: "595b6cfd559f8362b010616de4947ec6"
-    }
-    Frame {
-        msec: 22128
-        hash: "976dd345cc7cb4e3c09a288530d3c8af"
-    }
-    Frame {
-        msec: 22144
-        hash: "9493e425d5cd3f9eef904a1be63f45f1"
-    }
-    Frame {
-        msec: 22160
-        hash: "0a2013afebb5e09d82633c8d8a393f01"
-    }
-    Frame {
-        msec: 22176
-        hash: "d8377c464bc59d95e0670d697888d804"
-    }
-    Frame {
-        msec: 22192
-        hash: "52f9416973da953bd6fe55b2fe22786a"
-    }
-    Frame {
-        msec: 22208
-        hash: "23b9af0f371b7817e9ceaa1a83995d35"
-    }
-    Frame {
-        msec: 22224
-        hash: "34b0e0333c91bc4533e0c01eaeb3d3f9"
-    }
-    Frame {
-        msec: 22240
-        hash: "1597b86afe2841c3bb77bb5dd6aa6803"
-    }
-    Frame {
-        msec: 22256
-        hash: "d74111814ff259fea47e1eb3b36e174b"
-    }
-    Frame {
-        msec: 22272
-        hash: "c64c46fe9cd75afbf2385241ea8e55d4"
-    }
-    Frame {
-        msec: 22288
-        hash: "1e8740a104643fe30b0e874bbbed44ab"
-    }
-    Frame {
-        msec: 22304
-        hash: "ef669a8d142947463084383a6c7c7f85"
-    }
-    Frame {
-        msec: 22320
-        hash: "2314c42b5994bdbfd73eb2c3ea54626b"
-    }
-    Frame {
-        msec: 22336
-        hash: "53a0694d8eee91b968bd43efe43f2c9e"
-    }
-    Frame {
-        msec: 22352
-        hash: "be4772528f30c18193e49ae04a290af8"
-    }
-    Frame {
-        msec: 22368
-        hash: "a0b0877ab92a0323e35fdb7beb602dee"
-    }
-    Frame {
-        msec: 22384
-        hash: "a0e299fb4ba811a0b22fb62c222cb86c"
-    }
-    Frame {
-        msec: 22400
-        hash: "2562bc9c9aa60a48b6ca00333f60d163"
-    }
-    Frame {
-        msec: 22416
-        hash: "486b45c385d88d6f054fa6308b55f2ac"
-    }
-    Frame {
-        msec: 22432
-        hash: "86502af668ed6336dce8fe329e3408a6"
-    }
-    Frame {
-        msec: 22448
-        hash: "2a79a6530a07f00810310117d00d28ed"
-    }
-    Frame {
-        msec: 22464
-        hash: "94a5fce3e0c3b219e0d807bfcade11e8"
-    }
-    Frame {
-        msec: 22480
-        hash: "94a5fce3e0c3b219e0d807bfcade11e8"
-    }
-    Frame {
-        msec: 22496
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22512
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22528
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22544
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22560
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22576
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22592
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22608
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22624
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22640
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22656
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22672
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22688
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22704
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22720
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22736
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22752
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22768
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22784
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22800
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22816
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22832
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22848
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22864
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22880
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22896
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22912
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22928
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22944
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22960
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22976
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 22992
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23008
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23024
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23040
-        image: "flickable-vertical.23.png"
-    }
-    Frame {
-        msec: 23056
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23072
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23088
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23104
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23120
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23136
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23152
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23168
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23184
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23200
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23216
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23232
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23248
-        hash: "8443c45791c906a9fe23831844f48a1c"
-    }
-    Frame {
-        msec: 23264
-        hash: "8443c45791c906a9fe23831844f48a1c
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml
deleted file mode 100644
index 1a7366d..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    color: "lightSteelBlue"
-    width: 600; height: 300
-
-    ListModel {
-        id: list
-        ListElement { dayColor: "steelblue" }
-        ListElement { dayColor: "blue" }
-        ListElement { dayColor: "yellow" }
-        ListElement { dayColor: "purple" }
-        ListElement { dayColor: "red" }
-        ListElement { dayColor: "green" }
-        ListElement { dayColor: "orange" }
-    }
-
-    Flickable {
-        id: flickable
-        anchors.fill: parent; viewportWidth: row.width
-
-        Row {
-            id: row
-            Repeater {
-                model: list
-                Rectangle { width: 200; height: 300; color: dayColor }
-            }
-        }
-    }
-    Rectangle {
-        radius: 3
-        y: flickable.height-8
-        height: 8
-        x: flickable.visibleArea.xPosition * flickable.width
-        width: flickable.visibleArea.widthRatio * flickable.width
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
deleted file mode 100644
index 6204aa9..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
+++ /dev/null
@@ -1,91 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    color: "lightSteelBlue"
-    width: 300; height: 600
-
-    ListModel {
-        id: list
-        ListElement { dayColor: "steelblue" }
-        ListElement { dayColor: "blue" }
-        ListElement { dayColor: "yellow" }
-        ListElement { dayColor: "purple" }
-        ListElement { dayColor: "red" }
-        ListElement { dayColor: "green" }
-        ListElement { dayColor: "orange" }
-    }
-
-    flickable {
-        id: flick
-        height: parent.height-50
-        width: parent.width; viewportHeight: column.height
-
-        Column {
-            id: column
-            Repeater {
-                model: list
-                Rectangle { width: 300; height: 200; color: mr.pressed ? "black" : dayColor
-                    MouseArea {
-                        id: mr
-                        anchors.fill: parent
-                    }
-                }
-            }
-        }
-        clip: true
-        reportedVelocitySmoothing: 1000
-    }
-    Rectangle {
-        radius: 3
-        x: flick.width-8
-        width: 8
-        y: flick.visibleArea.yPosition * flick.height
-        height: flick.visibleArea.heightRatio * flick.height
-    }
-
-    // click to toggle interactive flag
-    Rectangle {
-        width: 64
-        height: 48
-        y: parent.height - 50
-        color: "red"
-        MouseArea {
-            anchors.fill: parent
-            onClicked: flick.interactive = flick.interactive ? false : true
-        }
-    }
-
-    // click to toggle click delay
-    Rectangle {
-        width: 64
-        height: 48
-        x: 66
-        y: parent.height - 50
-        color: "green"
-        MouseArea {
-            anchors.fill: parent
-            onClicked: flick.pressDelay = flick.pressDelay > 0 ? 0 : 500
-        }
-    }
-
-    // click to toggle overshoot
-    Rectangle {
-        width: 64
-        height: 48
-        x: 130
-        y: parent.height - 50
-        color: "yellow"
-        MouseArea {
-            anchors.fill: parent
-            onClicked: flick.overShoot = flick.overShoot > 0 ? 0 : 30
-        }
-    }
-
-    Rectangle {
-        width: Math.abs(flick.verticalVelocity)/100
-        height: 50
-        x: 200
-        y: parent.height - 50
-        color: blue
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.0.png b/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.0.png
deleted file mode 100644
index 53a8b42..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.1.png b/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.1.png
deleted file mode 100644
index b7efe8c..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.2.png b/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.2.png
deleted file mode 100644
index aa6d147..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.3.png b/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.3.png
deleted file mode 100644
index 9d39713..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.4.png b/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.4.png
deleted file mode 100644
index 98e8817..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.5.png b/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.5.png
deleted file mode 100644
index a3f9d8f..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.qml b/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.qml
deleted file mode 100644
index 520d9a2..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.qml
+++ /dev/null
@@ -1,1623 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "7e16e6360fc2e9db67dbf11d58042745"
-    }
-    Frame {
-        msec: 32
-        hash: "7e16e6360fc2e9db67dbf11d58042745"
-    }
-    Frame {
-        msec: 48
-        hash: "7e16e6360fc2e9db67dbf11d58042745"
-    }
-    Frame {
-        msec: 64
-        hash: "06d7f0befa7e06972983ffe87c162750"
-    }
-    Frame {
-        msec: 80
-        hash: "51dff66a7767e3464fda60f2cf906700"
-    }
-    Frame {
-        msec: 96
-        hash: "f8038dc4b67b92ef776a97589240e8c5"
-    }
-    Frame {
-        msec: 112
-        hash: "692931f1db6ddf0b37eb64026ca830f8"
-    }
-    Frame {
-        msec: 128
-        hash: "f01b7368e42381dda5eadf56482ea993"
-    }
-    Frame {
-        msec: 144
-        hash: "9811f823e057882d384f36d7227fa12e"
-    }
-    Frame {
-        msec: 160
-        hash: "9b40b6c75af876567ff49688bc710f2a"
-    }
-    Frame {
-        msec: 176
-        hash: "e97a5d968da37789c28816608fa262a1"
-    }
-    Frame {
-        msec: 192
-        hash: "2cd0627fdc63bb91f8dcac789d7a93b2"
-    }
-    Frame {
-        msec: 208
-        hash: "ae2407f8da9a047d2725bcdcf8e568b2"
-    }
-    Frame {
-        msec: 224
-        hash: "da2a1e5e988c27577ceb453cb0383703"
-    }
-    Frame {
-        msec: 240
-        hash: "90fb4e4ba04ac32b52c10b3258431c04"
-    }
-    Frame {
-        msec: 256
-        hash: "90fb4e4ba04ac32b52c10b3258431c04"
-    }
-    Frame {
-        msec: 272
-        hash: "90fb4e4ba04ac32b52c10b3258431c04"
-    }
-    Frame {
-        msec: 288
-        hash: "73c06997014af4e008b546b53fe349fb"
-    }
-    Frame {
-        msec: 304
-        hash: "262404c6e55b93c4ab940582a49f7e18"
-    }
-    Frame {
-        msec: 320
-        hash: "451a9408b04826ab35749d9120efd6bb"
-    }
-    Frame {
-        msec: 336
-        hash: "451a9408b04826ab35749d9120efd6bb"
-    }
-    Frame {
-        msec: 352
-        hash: "2d112d040fd425c59b511066737e494d"
-    }
-    Frame {
-        msec: 368
-        hash: "769d2724656dbf0e793ecd8e42db3de2"
-    }
-    Frame {
-        msec: 384
-        hash: "9e375cb3815723a2c5dda39c79325e96"
-    }
-    Frame {
-        msec: 400
-        hash: "b21e92871bf63873b8ae48a2aff47be5"
-    }
-    Frame {
-        msec: 416
-        hash: "00d08f4257f35c6236cde0597b0005e4"
-    }
-    Frame {
-        msec: 432
-        hash: "8048f84221a02e7102cf3272445862a1"
-    }
-    Frame {
-        msec: 448
-        hash: "f0d7b45f0b01319494616c1893aa940e"
-    }
-    Frame {
-        msec: 464
-        hash: "457fad89140a1dda9e70549d451482e9"
-    }
-    Frame {
-        msec: 480
-        hash: "ee0feb79e843cdb2adea72fa37ecab67"
-    }
-    Frame {
-        msec: 496
-        hash: "ece02d3590147884e697dd5228dee8c4"
-    }
-    Frame {
-        msec: 512
-        hash: "91c4ec19716a0883c8f5c25b9a0d1f42"
-    }
-    Frame {
-        msec: 528
-        hash: "a7c9860dd4962b11b92c54370ba156ee"
-    }
-    Frame {
-        msec: 544
-        hash: "a28f2590be1e8cde4cde5219367015ac"
-    }
-    Frame {
-        msec: 560
-        hash: "3b641ba58f5e1f0e1f2f528acf38cb28"
-    }
-    Frame {
-        msec: 576
-        hash: "d0b0969ad165d4784f763683de42278e"
-    }
-    Frame {
-        msec: 592
-        hash: "93968dffda327a101e2bd07b80fff842"
-    }
-    Frame {
-        msec: 608
-        hash: "08f5db4cd7f27178c67e6d973e4bb023"
-    }
-    Frame {
-        msec: 624
-        hash: "0967cad0a3ae82307a049944e1bcdc3e"
-    }
-    Frame {
-        msec: 640
-        hash: "d70ffd02b434e607bc11a95ca536c19a"
-    }
-    Frame {
-        msec: 656
-        hash: "cd561b4d5e707bb6b9f6d493f9b99512"
-    }
-    Frame {
-        msec: 672
-        hash: "58355ca37c6e4e54061664180faa11fb"
-    }
-    Frame {
-        msec: 688
-        hash: "bd873f48c79286c50333c838e57d8ec7"
-    }
-    Frame {
-        msec: 704
-        hash: "db89bc0e04ebefe5440748fe85e0bdf7"
-    }
-    Frame {
-        msec: 720
-        hash: "c400bc1e6c02c792cc515a6dd8bbaa9b"
-    }
-    Frame {
-        msec: 736
-        hash: "accf3567a161239cd8c18dd9d4527aaf"
-    }
-    Frame {
-        msec: 752
-        hash: "2e3bcdf70f160bf8e3f1b77ee472b782"
-    }
-    Frame {
-        msec: 768
-        hash: "929da0d629253478c322360c9a8dfc9e"
-    }
-    Frame {
-        msec: 784
-        hash: "d5d4b7c52ba14e84bc9c34a8b55f84b7"
-    }
-    Frame {
-        msec: 800
-        hash: "063ce927e9e7c5afb9131302ea5a968c"
-    }
-    Frame {
-        msec: 816
-        hash: "b94b6fff850aacccdaf0f74d4e36ba67"
-    }
-    Frame {
-        msec: 832
-        hash: "bac2b9b9be4b71fafe59868506aa8ab9"
-    }
-    Frame {
-        msec: 848
-        hash: "a91fed41a5a07e84424e45477f463aa1"
-    }
-    Frame {
-        msec: 864
-        hash: "370eefd369ef366f1d5930b261340d0b"
-    }
-    Frame {
-        msec: 880
-        hash: "b04a87997d0eeb6ff2f91fc2f0d016f6"
-    }
-    Frame {
-        msec: 896
-        hash: "09c3602a08d6d3e2afb654c328606871"
-    }
-    Frame {
-        msec: 912
-        hash: "101e66b9d13b1b0872cfcc497c9d6ae3"
-    }
-    Frame {
-        msec: 928
-        hash: "b5eaf952e40cf90ef32e8cb64ccce7d3"
-    }
-    Frame {
-        msec: 944
-        hash: "b43b02133ebe5db93e5236c0307939c3"
-    }
-    Frame {
-        msec: 960
-        image: "test-flipable.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "7d1a0ff0eceb80ff64d828c34792a2d5"
-    }
-    Frame {
-        msec: 992
-        hash: "a7492d8ab6fddb5c1d7af2621078230b"
-    }
-    Frame {
-        msec: 1008
-        hash: "2ed3dc7f10cc8279a6fd926914cdb234"
-    }
-    Frame {
-        msec: 1024
-        hash: "e9f76e419f6f682bcc9052183bb50607"
-    }
-    Frame {
-        msec: 1040
-        hash: "fdee6990e101d4a628272e7b09a217a3"
-    }
-    Frame {
-        msec: 1056
-        hash: "05e028b2f37a433343d373bc05f73756"
-    }
-    Frame {
-        msec: 1072
-        hash: "a9ece04666d17979408dcd8690cd697c"
-    }
-    Frame {
-        msec: 1088
-        hash: "a5d8c9bee6ac10fb45cedf3bc4325539"
-    }
-    Frame {
-        msec: 1104
-        hash: "08f1ff1e515ec78f75efa13a39b21f56"
-    }
-    Frame {
-        msec: 1120
-        hash: "f0bc6c649a195e2c433cf84c1b4f5bcb"
-    }
-    Frame {
-        msec: 1136
-        hash: "2a548614a9b38867cd0fe44985ca443f"
-    }
-    Frame {
-        msec: 1152
-        hash: "8c8272fc028ce5b403e636b4061351d3"
-    }
-    Frame {
-        msec: 1168
-        hash: "df11678b255cc3f624fed24d7e6a24af"
-    }
-    Frame {
-        msec: 1184
-        hash: "7dd5ce1cce200d7eede0f248f150873c"
-    }
-    Frame {
-        msec: 1200
-        hash: "e5cb8e0e588854dce5e7572fd1e3a445"
-    }
-    Frame {
-        msec: 1216
-        hash: "71937cd7d319174232797d05fe28bda5"
-    }
-    Frame {
-        msec: 1232
-        hash: "021c3a598b008991114b25b26191e8ef"
-    }
-    Frame {
-        msec: 1248
-        hash: "b372131d6fc29e7dbffc2c5f4e269ad7"
-    }
-    Frame {
-        msec: 1264
-        hash: "2120fc188aed6888eba85e9d49139000"
-    }
-    Frame {
-        msec: 1280
-        hash: "0523499bb4f4c6d0c3d2cd28fbac7056"
-    }
-    Frame {
-        msec: 1296
-        hash: "19d1fc79802728d6b0af222050b59463"
-    }
-    Frame {
-        msec: 1312
-        hash: "f48686053780376c7ab2e6481e3fd0ad"
-    }
-    Frame {
-        msec: 1328
-        hash: "0f7c5ca70fec90e7e8b2fd50b791fd2e"
-    }
-    Frame {
-        msec: 1344
-        hash: "93cd129be7cfebaa2ea8a074a77aaa7c"
-    }
-    Frame {
-        msec: 1360
-        hash: "e6b149da031b1c0b842b1b7872bd2d91"
-    }
-    Frame {
-        msec: 1376
-        hash: "5481248e889fb4fe9f4cf54f69d9f614"
-    }
-    Frame {
-        msec: 1392
-        hash: "23bb444b6248901da3eb6a2e805438cb"
-    }
-    Frame {
-        msec: 1408
-        hash: "1c9feb1c3ae76d4015c99d005ecfed60"
-    }
-    Frame {
-        msec: 1424
-        hash: "41e5345dc90fd48476f35ceeab281948"
-    }
-    Frame {
-        msec: 1440
-        hash: "89682a955a00e68031571ac765f9f5e3"
-    }
-    Frame {
-        msec: 1456
-        hash: "8ff7cee41c6f19eeda417052c1b071d6"
-    }
-    Frame {
-        msec: 1472
-        hash: "67a73129d828e8a05b1efc768cf40146"
-    }
-    Frame {
-        msec: 1488
-        hash: "0800a78c97c92c697e44ded54fdcf934"
-    }
-    Frame {
-        msec: 1504
-        hash: "d5d51263367f0c53b8d94a03d83338d9"
-    }
-    Frame {
-        msec: 1520
-        hash: "ab749885f356683e17ca52f904ae582d"
-    }
-    Frame {
-        msec: 1536
-        hash: "7f5a56f30222a9886d1e9d014b4f5cab"
-    }
-    Frame {
-        msec: 1552
-        hash: "10c5e64eff104dce59f54f70c5564959"
-    }
-    Frame {
-        msec: 1568
-        hash: "38b00c7544648ef06705acc2e9eca1f5"
-    }
-    Frame {
-        msec: 1584
-        hash: "56bdfcb8fbb776b3799676ba7934a354"
-    }
-    Frame {
-        msec: 1600
-        hash: "ea5349d337e397b3ee5e0db0c296f5e5"
-    }
-    Frame {
-        msec: 1616
-        hash: "6bd784ca760edba5a6f0b4212237e1e8"
-    }
-    Frame {
-        msec: 1632
-        hash: "77e7888a37a7724bded817903cbe777e"
-    }
-    Frame {
-        msec: 1648
-        hash: "55213bdb2f1f2d25b5680db95e79bbac"
-    }
-    Frame {
-        msec: 1664
-        hash: "6d62c7f7f76cc1d4e33c152234000da0"
-    }
-    Frame {
-        msec: 1680
-        hash: "0f6aa29c172054887e4ddb6512ae43b1"
-    }
-    Frame {
-        msec: 1696
-        hash: "75fd94508b77bbdde34a61b74ff49e12"
-    }
-    Frame {
-        msec: 1712
-        hash: "0dfdd9a1d83a706a09318c83fd08b6fe"
-    }
-    Frame {
-        msec: 1728
-        hash: "4f895ee983424c164be3e2db488a4e51"
-    }
-    Frame {
-        msec: 1744
-        hash: "974fd5f390d33afb779ac754f0e30b2a"
-    }
-    Frame {
-        msec: 1760
-        hash: "fd40e22c7d3cfceeee7dc668d1cf0a12"
-    }
-    Frame {
-        msec: 1776
-        hash: "4e3c04b35bcc43a4295582da1674da2e"
-    }
-    Frame {
-        msec: 1792
-        hash: "629888aae80ea85db07a383df352214a"
-    }
-    Frame {
-        msec: 1808
-        hash: "9a92c68cfad54c313d24e38240ea072f"
-    }
-    Frame {
-        msec: 1824
-        hash: "3e27569d19670ec99f11bfa46099456a"
-    }
-    Frame {
-        msec: 1840
-        hash: "5d4be9ed8c4ba7faefde5427cdbffc73"
-    }
-    Frame {
-        msec: 1856
-        hash: "232d4e03a57edf0386b06884482f9730"
-    }
-    Frame {
-        msec: 1872
-        hash: "c45f959fd81ac08add219326cb6a8bfc"
-    }
-    Frame {
-        msec: 1888
-        hash: "349111e36190f77afd53c50ee2e9ba94"
-    }
-    Frame {
-        msec: 1904
-        hash: "ea5ed48b2bcdfd2a711a3a71a4ae37c3"
-    }
-    Frame {
-        msec: 1920
-        image: "test-flipable.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "ae4e35413e462221b8cb48dd0350f873"
-    }
-    Frame {
-        msec: 1952
-        hash: "63cc3851236d5de613c85a2971ef7145"
-    }
-    Frame {
-        msec: 1968
-        hash: "45d5fdb92107a7074d56d97bda34756f"
-    }
-    Frame {
-        msec: 1984
-        hash: "f74d9a3b53a629f7fccfdd255fdbba62"
-    }
-    Frame {
-        msec: 2000
-        hash: "60c6a30e15ed4ad61c14f15f9f1f3790"
-    }
-    Frame {
-        msec: 2016
-        hash: "b5f7c630f6e61c7ddac8493e17a1f53e"
-    }
-    Frame {
-        msec: 2032
-        hash: "98558c7135fa84fa08d457c6064b8653"
-    }
-    Frame {
-        msec: 2048
-        hash: "2858e39a9b39739bb5c0c1ce23e83b20"
-    }
-    Frame {
-        msec: 2064
-        hash: "0b174f04215131cfa32b5d1a32170ac3"
-    }
-    Frame {
-        msec: 2080
-        hash: "67e3618bab95519a034ed6c8c1543212"
-    }
-    Frame {
-        msec: 2096
-        hash: "2012c5310f198022a3878c9ded08523d"
-    }
-    Frame {
-        msec: 2112
-        hash: "1cb6a1f6d873d2bfde457828c17b4886"
-    }
-    Frame {
-        msec: 2128
-        hash: "be3f28bd56d9d985408e32cc0aab0623"
-    }
-    Frame {
-        msec: 2144
-        hash: "4aa07c4887f873f0f034930bd681f9dc"
-    }
-    Frame {
-        msec: 2160
-        hash: "adeae071187b590aa0a142c27098d2f4"
-    }
-    Frame {
-        msec: 2176
-        hash: "d777aaccd6143c2c1000bbfabdbefeb2"
-    }
-    Frame {
-        msec: 2192
-        hash: "7b4785b9e6610f02c52b4c824bea8ecd"
-    }
-    Frame {
-        msec: 2208
-        hash: "c539b3638272e46120edbe4a58e1d894"
-    }
-    Frame {
-        msec: 2224
-        hash: "ae466024a1dd731b6730dda255e68eb8"
-    }
-    Frame {
-        msec: 2240
-        hash: "f844a288b009cc4c6c28eb30d799c397"
-    }
-    Frame {
-        msec: 2256
-        hash: "4fc8ca1992802f97dd431783db89c725"
-    }
-    Frame {
-        msec: 2272
-        hash: "79b899461efae97b65b8c24c8820f348"
-    }
-    Frame {
-        msec: 2288
-        hash: "cb1ce87ddc372e24e37b60c013310549"
-    }
-    Frame {
-        msec: 2304
-        hash: "c8937aea34fd299c151706598828be6f"
-    }
-    Frame {
-        msec: 2320
-        hash: "ed5c3a904dc3b72937c6eea475514b2d"
-    }
-    Frame {
-        msec: 2336
-        hash: "09043e74a3ac60d05122675a1b253320"
-    }
-    Frame {
-        msec: 2352
-        hash: "57677a33d8c60a45c64aea10a695e8d0"
-    }
-    Frame {
-        msec: 2368
-        hash: "496fe0b0e420356e4205537fdf3adc2f"
-    }
-    Frame {
-        msec: 2384
-        hash: "f4146ce8db5cf2c3da15715820c9f62f"
-    }
-    Frame {
-        msec: 2400
-        hash: "b80bc46468695b874d401c4c9bd68932"
-    }
-    Frame {
-        msec: 2416
-        hash: "b0cf0021232ab917301206614f61f0bf"
-    }
-    Frame {
-        msec: 2432
-        hash: "b0abdf5b86e3fcb22a9254ac5b522380"
-    }
-    Frame {
-        msec: 2448
-        hash: "c1624cb7e90ea26ab0c37cfe9919ca36"
-    }
-    Frame {
-        msec: 2464
-        hash: "0ffd6a3b3e5f6db5a3a8df756caf713e"
-    }
-    Frame {
-        msec: 2480
-        hash: "1604ad8e7a4aa4fa8dff1f37fc8c51d7"
-    }
-    Frame {
-        msec: 2496
-        hash: "5bbca0b79c42e263162926e5c2fd3d82"
-    }
-    Frame {
-        msec: 2512
-        hash: "9436b4f2ab902673ed067de55da5003e"
-    }
-    Frame {
-        msec: 2528
-        hash: "3c7b5fa0970242a2ad308c72d761713b"
-    }
-    Frame {
-        msec: 2544
-        hash: "15e451c53e8f5c70614f87f33fe0a2e6"
-    }
-    Frame {
-        msec: 2560
-        hash: "7e8cbe203306d2f267a42fed1e4790ed"
-    }
-    Frame {
-        msec: 2576
-        hash: "db21ae28564614b58a7dd5ccd97082e6"
-    }
-    Frame {
-        msec: 2592
-        hash: "ff52e198874de749c46f9b34cfe40cfc"
-    }
-    Frame {
-        msec: 2608
-        hash: "916d92d24a81ced07a54d68c46299d4c"
-    }
-    Frame {
-        msec: 2624
-        hash: "2f6cf122e5f15fc5f5d3c92d92ca1384"
-    }
-    Frame {
-        msec: 2640
-        hash: "6f328038e5d505c402651423c44986a5"
-    }
-    Frame {
-        msec: 2656
-        hash: "6f328038e5d505c402651423c44986a5"
-    }
-    Frame {
-        msec: 2672
-        hash: "78e0dca60c04d3defbd90457685dbab3"
-    }
-    Frame {
-        msec: 2688
-        hash: "b915de1be0c1779e06fb9eea8237f91d"
-    }
-    Frame {
-        msec: 2704
-        hash: "0ff9fd6b09fc14abacb794353b9500f6"
-    }
-    Frame {
-        msec: 2720
-        hash: "5a1c9cd9da5492a61a3a1bc6ad37ef17"
-    }
-    Frame {
-        msec: 2736
-        hash: "4c4a72eb4105903802de56a4a62d86cc"
-    }
-    Frame {
-        msec: 2752
-        hash: "6d813ee777a5900c65aca5939c004d0c"
-    }
-    Frame {
-        msec: 2768
-        hash: "6d813ee777a5900c65aca5939c004d0c"
-    }
-    Frame {
-        msec: 2784
-        hash: "0acaa3ece071ad4461cf4a79d65a0f03"
-    }
-    Frame {
-        msec: 2800
-        hash: "0acaa3ece071ad4461cf4a79d65a0f03"
-    }
-    Frame {
-        msec: 2816
-        hash: "f5cf7e68edc5fcd9dd91882d3f9ba380"
-    }
-    Frame {
-        msec: 2832
-        hash: "51f8508eddffbac2fad22bd3e8040c69"
-    }
-    Frame {
-        msec: 2848
-        hash: "a09746c72df5330f6ca2a93d9b8e79f6"
-    }
-    Frame {
-        msec: 2864
-        hash: "b2ef52b66896649413b3852bcf642e1c"
-    }
-    Frame {
-        msec: 2880
-        image: "test-flipable.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "ae76d183491834e2b1d0371420d51ce5"
-    }
-    Frame {
-        msec: 2912
-        hash: "b19d89aa671cc3a773f64a7bae21adb6"
-    }
-    Frame {
-        msec: 2928
-        hash: "08eb7bd2e49fe600e922e49a3aa56e93"
-    }
-    Frame {
-        msec: 2944
-        hash: "1e3a7bdd0bd9d5b84c2cb5b646d7fb45"
-    }
-    Frame {
-        msec: 2960
-        hash: "be9f5091197899c0b89823e4403358f3"
-    }
-    Frame {
-        msec: 2976
-        hash: "1daeebce8e7eef80b135d2e4f83f780b"
-    }
-    Frame {
-        msec: 2992
-        hash: "1daeebce8e7eef80b135d2e4f83f780b"
-    }
-    Frame {
-        msec: 3008
-        hash: "1daeebce8e7eef80b135d2e4f83f780b"
-    }
-    Frame {
-        msec: 3024
-        hash: "1daeebce8e7eef80b135d2e4f83f780b"
-    }
-    Frame {
-        msec: 3040
-        hash: "1daeebce8e7eef80b135d2e4f83f780b"
-    }
-    Frame {
-        msec: 3056
-        hash: "1daeebce8e7eef80b135d2e4f83f780b"
-    }
-    Frame {
-        msec: 3072
-        hash: "be9f5091197899c0b89823e4403358f3"
-    }
-    Frame {
-        msec: 3088
-        hash: "be9f5091197899c0b89823e4403358f3"
-    }
-    Frame {
-        msec: 3104
-        hash: "1e3a7bdd0bd9d5b84c2cb5b646d7fb45"
-    }
-    Frame {
-        msec: 3120
-        hash: "b19d89aa671cc3a773f64a7bae21adb6"
-    }
-    Frame {
-        msec: 3136
-        hash: "e7ed4449b5ea3288d5e8fecb33a4a422"
-    }
-    Frame {
-        msec: 3152
-        hash: "186a2c1af03e7fa590ff3cd7422285e3"
-    }
-    Frame {
-        msec: 3168
-        hash: "373141f99bc88c40ead161502c9750e9"
-    }
-    Frame {
-        msec: 3184
-        hash: "0221e2ef4cf809ebfeba466206a77cce"
-    }
-    Frame {
-        msec: 3200
-        hash: "51f8508eddffbac2fad22bd3e8040c69"
-    }
-    Frame {
-        msec: 3216
-        hash: "f5cf7e68edc5fcd9dd91882d3f9ba380"
-    }
-    Frame {
-        msec: 3232
-        hash: "0acaa3ece071ad4461cf4a79d65a0f03"
-    }
-    Frame {
-        msec: 3248
-        hash: "0acaa3ece071ad4461cf4a79d65a0f03"
-    }
-    Frame {
-        msec: 3264
-        hash: "6d813ee777a5900c65aca5939c004d0c"
-    }
-    Frame {
-        msec: 3280
-        hash: "6d813ee777a5900c65aca5939c004d0c"
-    }
-    Frame {
-        msec: 3296
-        hash: "6d813ee777a5900c65aca5939c004d0c"
-    }
-    Frame {
-        msec: 3312
-        hash: "5a1c9cd9da5492a61a3a1bc6ad37ef17"
-    }
-    Frame {
-        msec: 3328
-        hash: "0ff9fd6b09fc14abacb794353b9500f6"
-    }
-    Frame {
-        msec: 3344
-        hash: "0ff9fd6b09fc14abacb794353b9500f6"
-    }
-    Frame {
-        msec: 3360
-        hash: "6f328038e5d505c402651423c44986a5"
-    }
-    Frame {
-        msec: 3376
-        hash: "6f328038e5d505c402651423c44986a5"
-    }
-    Frame {
-        msec: 3392
-        hash: "dd04a76df90f27358f4162fd85cfa4cd"
-    }
-    Frame {
-        msec: 3408
-        hash: "12df495b5e8bfd2c9dd13fbeccc69e08"
-    }
-    Frame {
-        msec: 3424
-        hash: "4b6f9dcde7d5d88b9c3eff3187378036"
-    }
-    Frame {
-        msec: 3440
-        hash: "712f3850c0efe45c60a3761f1354b90b"
-    }
-    Frame {
-        msec: 3456
-        hash: "22215981f00790d7a409230eb730abca"
-    }
-    Frame {
-        msec: 3472
-        hash: "a4a26f9736282ceb307f0f97735002eb"
-    }
-    Frame {
-        msec: 3488
-        hash: "b41d7a18d84a8b220e99464cab86882d"
-    }
-    Frame {
-        msec: 3504
-        hash: "c7c1961120f128cd0fcd6a7b61c98197"
-    }
-    Frame {
-        msec: 3520
-        hash: "e56e7ba603d2620afb0fab6b19aff33e"
-    }
-    Frame {
-        msec: 3536
-        hash: "1a258bed9a7a38452a746d7641016e73"
-    }
-    Frame {
-        msec: 3552
-        hash: "a237b9c187bbbcb79f624d74def15db2"
-    }
-    Frame {
-        msec: 3568
-        hash: "34a7afdebb7352ca65e0eaec61632d12"
-    }
-    Frame {
-        msec: 3584
-        hash: "a5a98e932a30418bae62bb006afc1048"
-    }
-    Frame {
-        msec: 3600
-        hash: "2ee25374cb9fef01e78d02c4131010b7"
-    }
-    Frame {
-        msec: 3616
-        hash: "7956b07b848ba89905e5c609657503e2"
-    }
-    Frame {
-        msec: 3632
-        hash: "0949a2b13f6475b3f11be04321c953a1"
-    }
-    Frame {
-        msec: 3648
-        hash: "5a1ff901ecc7c3cd7f39cd07e0273dd4"
-    }
-    Frame {
-        msec: 3664
-        hash: "44fcd7209b9f5b1c28c21e9aae408097"
-    }
-    Frame {
-        msec: 3680
-        hash: "bee94f395239aebb0bacca3dbbee95e5"
-    }
-    Frame {
-        msec: 3696
-        hash: "bd26b7e2b07bbcee3819fdacc35eea8d"
-    }
-    Frame {
-        msec: 3712
-        hash: "d3707b90c5cd0d1061db4b97b6fcb96a"
-    }
-    Frame {
-        msec: 3728
-        hash: "6f6ed6c7553b3f909d53e2146b3831d5"
-    }
-    Frame {
-        msec: 3744
-        hash: "a3a1a03617d1cb5660c51bf2f18088bc"
-    }
-    Frame {
-        msec: 3760
-        hash: "6d4646f0a53800ad60d173ab9cb9010a"
-    }
-    Frame {
-        msec: 3776
-        hash: "126cae232e2fe49e3188393c2798065b"
-    }
-    Frame {
-        msec: 3792
-        hash: "e1fa758d333ffe5208365c0babff33a0"
-    }
-    Frame {
-        msec: 3808
-        hash: "f2a6156f7d6013bd4234b35c21adb074"
-    }
-    Frame {
-        msec: 3824
-        hash: "0271f66eb6d9b91a3ab8da2d728b9581"
-    }
-    Frame {
-        msec: 3840
-        image: "test-flipable.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "e18635d7c6c5de361e7406c2db357aca"
-    }
-    Frame {
-        msec: 3872
-        hash: "56100e9ca8d1eb7e6334e5a05ef2b94d"
-    }
-    Frame {
-        msec: 3888
-        hash: "3d15b8d662d3df82dd78590c43794337"
-    }
-    Frame {
-        msec: 3904
-        hash: "9729b36fe9dbabf0c46e78b723885530"
-    }
-    Frame {
-        msec: 3920
-        hash: "ccb8b51084cc1ef3d201887b824fb1ac"
-    }
-    Frame {
-        msec: 3936
-        hash: "d9dc9d240a6f89603a54bccd66361530"
-    }
-    Frame {
-        msec: 3952
-        hash: "0e52d92455c263493d32ffe93f242739"
-    }
-    Frame {
-        msec: 3968
-        hash: "695ab932722844b975097779e26df55c"
-    }
-    Frame {
-        msec: 3984
-        hash: "da285cba2e11db1e87d1d180e376ff8e"
-    }
-    Frame {
-        msec: 4000
-        hash: "54bd12888fc4526d310fa0a66b5ba3be"
-    }
-    Frame {
-        msec: 4016
-        hash: "c3e3db473bdb96fd619b078f0f6b3ceb"
-    }
-    Frame {
-        msec: 4032
-        hash: "acfd8aaf0bb52ad3ef3116bb99f3656a"
-    }
-    Frame {
-        msec: 4048
-        hash: "c5a0877ce86c26b30b642818e83d6118"
-    }
-    Frame {
-        msec: 4064
-        hash: "b187fde9af2bad37f84f6324afcbb303"
-    }
-    Frame {
-        msec: 4080
-        hash: "0dfe035424d7f31dda88be3b4bb30c8a"
-    }
-    Frame {
-        msec: 4096
-        hash: "893bddc95fbf6e452ba61b06eab1a8c5"
-    }
-    Frame {
-        msec: 4112
-        hash: "35fb89ea579819f4b3416ff1c1b1cc9d"
-    }
-    Frame {
-        msec: 4128
-        hash: "316371649f9a1e12e336c5823408eaf9"
-    }
-    Frame {
-        msec: 4144
-        hash: "ade751c6e497c73a920baf18f0752908"
-    }
-    Frame {
-        msec: 4160
-        hash: "86720fa1eeae374c6cc67e107d27e23a"
-    }
-    Frame {
-        msec: 4176
-        hash: "1a6f080227f1ccd03b6c4093b9fdadb3"
-    }
-    Frame {
-        msec: 4192
-        hash: "f7d7398edba69716ec8c0699d5472dca"
-    }
-    Frame {
-        msec: 4208
-        hash: "9e62c9dd25abb203f5c06c7bff0d8363"
-    }
-    Frame {
-        msec: 4224
-        hash: "fd90404238b458fc86a4a17e6a976f9b"
-    }
-    Frame {
-        msec: 4240
-        hash: "e39668dc347318fc61a365f9006aab3c"
-    }
-    Frame {
-        msec: 4256
-        hash: "c40f41f635f10f5f9b04b42ba2dc5bb1"
-    }
-    Frame {
-        msec: 4272
-        hash: "c0f971c75b7237de7e9b2f25cc3f34b2"
-    }
-    Frame {
-        msec: 4288
-        hash: "a1c79481fd1632cfdc396aefb3592534"
-    }
-    Frame {
-        msec: 4304
-        hash: "6eee76f40fc7ec1a1e3d77c849321740"
-    }
-    Frame {
-        msec: 4320
-        hash: "0a36746ab17caef5946731c31af3823f"
-    }
-    Frame {
-        msec: 4336
-        hash: "863dedd22df4e1d14e73eaeb851e9b66"
-    }
-    Frame {
-        msec: 4352
-        hash: "318e8751f7056bb6a004c8a7ce7be870"
-    }
-    Frame {
-        msec: 4368
-        hash: "8fb2809a366f42c86fad7aa5db3ff22c"
-    }
-    Frame {
-        msec: 4384
-        hash: "8aaea666640cb3b27e3374f756fe411b"
-    }
-    Frame {
-        msec: 4400
-        hash: "1f552095d26a8d145584e36237630916"
-    }
-    Frame {
-        msec: 4416
-        hash: "cd5aa55715786cac0f7efc90c7c4b9d6"
-    }
-    Frame {
-        msec: 4432
-        hash: "7a3153d9309ec338dce3437ecf667646"
-    }
-    Frame {
-        msec: 4448
-        hash: "c7fa40e69148f1c5ec494ad159b6ce6c"
-    }
-    Frame {
-        msec: 4464
-        hash: "e131bc8ca25ddc4b7dd6582ff034fe14"
-    }
-    Frame {
-        msec: 4480
-        hash: "3174c672e62dae0341d5849e23031280"
-    }
-    Frame {
-        msec: 4496
-        hash: "0b25fb7d33708a3292ede7c66e25a3d7"
-    }
-    Frame {
-        msec: 4512
-        hash: "84b3cf92b3abc2f5acf07cfccf3c0202"
-    }
-    Frame {
-        msec: 4528
-        hash: "fafbd14d296e4954bce7816d811ddd89"
-    }
-    Frame {
-        msec: 4544
-        hash: "865018d8408863b741a7082a962236dc"
-    }
-    Frame {
-        msec: 4560
-        hash: "f626082691429565b55ce9e04b14a665"
-    }
-    Frame {
-        msec: 4576
-        hash: "8a02f7d3d53e98384d1f05dc7fc5fd37"
-    }
-    Frame {
-        msec: 4592
-        hash: "6af3a8305b25a9a769b8cf00479c6ab3"
-    }
-    Frame {
-        msec: 4608
-        hash: "b31470b0ac4a593317abc365acb2b281"
-    }
-    Frame {
-        msec: 4624
-        hash: "efd00c43b1b8bbc4bc5496dcfa58c6b0"
-    }
-    Frame {
-        msec: 4640
-        hash: "498cf6c20aeca609e9d9cea78f0cc6a3"
-    }
-    Frame {
-        msec: 4656
-        hash: "b55661b5d9632bc0d7fc7ff3a421a2e7"
-    }
-    Frame {
-        msec: 4672
-        hash: "2f1e402c5e4a0615528f91dd2e183ddd"
-    }
-    Frame {
-        msec: 4688
-        hash: "d1c166cc7932e72ba22a73637cad65d6"
-    }
-    Frame {
-        msec: 4704
-        hash: "374b703e0059fc80b67480113d584754"
-    }
-    Frame {
-        msec: 4720
-        hash: "e8de71d4a2a253e366b2edf5d475824d"
-    }
-    Frame {
-        msec: 4736
-        hash: "6a9d033b332f0c0285284fdaddf3bbdb"
-    }
-    Frame {
-        msec: 4752
-        hash: "640c227fb62e40c666035e7465ac5c4e"
-    }
-    Frame {
-        msec: 4768
-        hash: "9cf7dc6507befd6ae54f380a7d87a207"
-    }
-    Frame {
-        msec: 4784
-        hash: "d1c7b2160c08e03e7a98d7d2db0116f7"
-    }
-    Frame {
-        msec: 4800
-        image: "test-flipable.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "6e48e605ea1aed4028e02476328f182b"
-    }
-    Frame {
-        msec: 4832
-        hash: "2dfa5fdfd07e7000caee6abf5fe84378"
-    }
-    Frame {
-        msec: 4848
-        hash: "2b0c2f019b07f1f8b4e5af9a520ab061"
-    }
-    Frame {
-        msec: 4864
-        hash: "33cb1aaeb7dafc2475e4337be7cc7892"
-    }
-    Frame {
-        msec: 4880
-        hash: "91290d1435bedb5010ba135a7f99c0a2"
-    }
-    Frame {
-        msec: 4896
-        hash: "df7434eb6c6e5d45935d6c6fd03f06d1"
-    }
-    Frame {
-        msec: 4912
-        hash: "48dfe78dcdd65242132071454fb9ea33"
-    }
-    Frame {
-        msec: 4928
-        hash: "1b288012e123cb6051bfa180ea2a2bc0"
-    }
-    Frame {
-        msec: 4944
-        hash: "84b23d92987f59df336d9b269e3b7bbc"
-    }
-    Frame {
-        msec: 4960
-        hash: "c413ca53240df702c3ba0c7f4dacca3b"
-    }
-    Frame {
-        msec: 4976
-        hash: "339c06a2e1fc05ebfd3732097b9c5242"
-    }
-    Frame {
-        msec: 4992
-        hash: "f1e647e274ac8c8458d2c1e576623688"
-    }
-    Frame {
-        msec: 5008
-        hash: "a70dc2f51ecfc164595cfef61c1da245"
-    }
-    Frame {
-        msec: 5024
-        hash: "b69f034a71b53c885cd177da422d5fc7"
-    }
-    Frame {
-        msec: 5040
-        hash: "26c25a031944c677b30f69c8498ac6ce"
-    }
-    Frame {
-        msec: 5056
-        hash: "ebc2328766e8736eac989e309968d8f9"
-    }
-    Frame {
-        msec: 5072
-        hash: "41d55f53bfc74e614c906d3f6b813704"
-    }
-    Frame {
-        msec: 5088
-        hash: "135e97adb3f19aa19d746ece1b2b3d02"
-    }
-    Frame {
-        msec: 5104
-        hash: "85c4454dbe9a39b3005f32fd7a06b1b2"
-    }
-    Frame {
-        msec: 5120
-        hash: "7561e0dd6970f7c81bcb53c9371d4405"
-    }
-    Frame {
-        msec: 5136
-        hash: "c9961d5abf700a06ed294ce7aecb6147"
-    }
-    Frame {
-        msec: 5152
-        hash: "29acf87effa3c21322334080776c566e"
-    }
-    Frame {
-        msec: 5168
-        hash: "04990a79d5ff5cb41dcd48d3e3bf5b11"
-    }
-    Frame {
-        msec: 5184
-        hash: "f40c78c37a26249ecb161af778631f7b"
-    }
-    Frame {
-        msec: 5200
-        hash: "eddacaeae7c47d063db737f678896da1"
-    }
-    Frame {
-        msec: 5216
-        hash: "5ae523dc1115fd0904875718e05aa2a5"
-    }
-    Frame {
-        msec: 5232
-        hash: "f09c299412a9e2fd353c4937ad959f25"
-    }
-    Frame {
-        msec: 5248
-        hash: "9caeae0abd3bc665bd307997baea6a48"
-    }
-    Frame {
-        msec: 5264
-        hash: "e9d222c9d23773488b64b0a6323c1095"
-    }
-    Frame {
-        msec: 5280
-        hash: "ad34c46ab3d418a2af7bffc59e720868"
-    }
-    Frame {
-        msec: 5296
-        hash: "ff0d8cfd272fca5be34b663a7e52f283"
-    }
-    Frame {
-        msec: 5312
-        hash: "55f95277276217de16b6b43090bbb807"
-    }
-    Frame {
-        msec: 5328
-        hash: "387fadf4140d335c0b05cfee0c37a413"
-    }
-    Frame {
-        msec: 5344
-        hash: "10a1a5a91c11aa8279ae4e57e4d3946b"
-    }
-    Frame {
-        msec: 5360
-        hash: "414f7bf3a3ec05a9840cd104a13d5504"
-    }
-    Frame {
-        msec: 5376
-        hash: "e027716402ead36450732c8350e614b5"
-    }
-    Frame {
-        msec: 5392
-        hash: "0190f59275f01429ee6761b39ce99fc1"
-    }
-    Frame {
-        msec: 5408
-        hash: "7f99dd337561f006a7c56babe3c10c38"
-    }
-    Frame {
-        msec: 5424
-        hash: "4bbb76393e56b5da723c1f33a7694013"
-    }
-    Frame {
-        msec: 5440
-        hash: "00eedf86916629fe90f3c2f36e0c689e"
-    }
-    Frame {
-        msec: 5456
-        hash: "84d1f5a6604b75371f2fa7b60a59299b"
-    }
-    Frame {
-        msec: 5472
-        hash: "00488220a460746be6d7d1b66d15c392"
-    }
-    Frame {
-        msec: 5488
-        hash: "cae5a6d45425d641228210a47c5ee5f6"
-    }
-    Frame {
-        msec: 5504
-        hash: "670a2132e65564ca2cfd58ec9842ba93"
-    }
-    Frame {
-        msec: 5520
-        hash: "212b6cc9fa130bec9579cf218e1f7eeb"
-    }
-    Frame {
-        msec: 5536
-        hash: "b159e67541b5b1b5071f6cd041c62293"
-    }
-    Frame {
-        msec: 5552
-        hash: "8c4e62d26e19c32200772edefd329db3"
-    }
-    Frame {
-        msec: 5568
-        hash: "1ff120d0444e398cc79190012b548b4b"
-    }
-    Frame {
-        msec: 5584
-        hash: "1c75bccd5e19ee9a2644585b726db048"
-    }
-    Frame {
-        msec: 5600
-        hash: "bc16aff96b1f9cfe3807e95e371a8f26"
-    }
-    Frame {
-        msec: 5616
-        hash: "35a5fdb20bdbaf0122cac4cad60e7bb8"
-    }
-    Frame {
-        msec: 5632
-        hash: "ea7ac72c81abff8af260be508b6cf117"
-    }
-    Frame {
-        msec: 5648
-        hash: "2d112d040fd425c59b511066737e494d"
-    }
-    Frame {
-        msec: 5664
-        hash: "769d2724656dbf0e793ecd8e42db3de2"
-    }
-    Frame {
-        msec: 5680
-        hash: "1c25b3d65e8590f8c213afa76b722e97"
-    }
-    Frame {
-        msec: 5696
-        hash: "760a103d4524f8b665c6ff42185a8ce7"
-    }
-    Frame {
-        msec: 5712
-        hash: "451a9408b04826ab35749d9120efd6bb"
-    }
-    Frame {
-        msec: 5728
-        hash: "3fad6b23b0b78f844e02fe307e20d376"
-    }
-    Frame {
-        msec: 5744
-        hash: "451a9408b04826ab35749d9120efd6bb"
-    }
-    Frame {
-        msec: 5760
-        image: "test-flipable.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "90fb4e4ba04ac32b52c10b3258431c04"
-    }
-    Frame {
-        msec: 5792
-        hash: "90fb4e4ba04ac32b52c10b3258431c04"
-    }
-    Frame {
-        msec: 5808
-        hash: "da2a1e5e988c27577ceb453cb0383703"
-    }
-    Frame {
-        msec: 5824
-        hash: "ae2407f8da9a047d2725bcdcf8e568b2"
-    }
-    Frame {
-        msec: 5840
-        hash: "ae2407f8da9a047d2725bcdcf8e568b2"
-    }
-    Frame {
-        msec: 5856
-        hash: "e97a5d968da37789c28816608fa262a1"
-    }
-    Frame {
-        msec: 5872
-        hash: "9becb90d9f8a61f5afacdc53d137ebcb"
-    }
-    Frame {
-        msec: 5888
-        hash: "9811f823e057882d384f36d7227fa12e"
-    }
-    Frame {
-        msec: 5904
-        hash: "1e7a308d18851db0a430542178944c67"
-    }
-    Frame {
-        msec: 5920
-        hash: "692931f1db6ddf0b37eb64026ca830f8"
-    }
-    Frame {
-        msec: 5936
-        hash: "2117c775960234c297187ea2e9d51e73"
-    }
-    Frame {
-        msec: 5952
-        hash: "f8038dc4b67b92ef776a97589240e8c5"
-    }
-    Frame {
-        msec: 5968
-        hash: "51dff66a7767e3464fda60f2cf906700"
-    }
-    Frame {
-        msec: 5984
-        hash: "7e16e6360fc2e9db67dbf11d58042745"
-    }
-    Frame {
-        msec: 6000
-        hash: "7e16e6360fc2e9db67dbf11d58042745"
-    }
-    Frame {
-        msec: 6016
-        hash: "7e16e6360fc2e9db67dbf11d58042745"
-    }
-    Frame {
-        msec: 6032
-        hash: "7e16e6360fc2e9db67dbf11d58042745"
-    }
-    Frame {
-        msec: 6048
-        hash: "7e16e6360fc2e9db67dbf11d58042745"
-    }
-    Frame {
-        msec: 6064
-        hash: "51dff66a7767e3464fda60f2cf906700"
-    }
-    Frame {
-        msec: 6080
-        hash: "f8038dc4b67b92ef776a97589240e8c5"
-    }
-    Frame {
-        msec: 6096
-        hash: "2117c775960234c297187ea2e9d51e73"
-    }
-    Frame {
-        msec: 6112
-        hash: "692931f1db6ddf0b37eb64026ca830f8"
-    }
-    Frame {
-        msec: 6128
-        hash: "f01b7368e42381dda5eadf56482ea993"
-    }
-    Frame {
-        msec: 6144
-        hash: "9811f823e057882d384f36d7227fa12e"
-    }
-    Frame {
-        msec: 6160
-        hash: "9b40b6c75af876567ff49688bc710f2a"
-    }
-    Frame {
-        msec: 6176
-        hash: "e97a5d968da37789c28816608fa262a1"
-    }
-    Frame {
-        msec: 6192
-        hash: "2cd0627fdc63bb91f8dcac789d7a93b2"
-    }
-    Frame {
-        msec: 6208
-        hash: "ae2407f8da9a047d2725bcdcf8e568b2"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6224
-        hash: "90fb4e4ba04ac32b52c10b3258431c04"
-    }
-    Frame {
-        msec: 6240
-        hash: "90fb4e4ba04ac32b52c10b3258431c04"
-    }
-    Frame {
-        msec: 6256
-        hash: "90fb4e4ba04ac32b52c10b3258431c04"
-    }
-    Frame {
-        msec: 6272
-        hash: "90fb4e4ba04ac32b52c10b3258431c04"
-    }
-    Frame {
-        msec: 6288
-        hash: "73c06997014af4e008b546b53fe349fb"
-    }
-    Frame {
-        msec: 6304
-        hash: "451a9408b04826ab35749d9120efd6bb"
-    }
-    Frame {
-        msec: 6320
-        hash: "451a9408b04826ab35749d9120efd6bb"
-    }
-    Frame {
-        msec: 6336
-        hash: "3fad6b23b0b78f844e02fe307e20d376"
-    }
-    Frame {
-        msec: 6352
-        hash: "1c25b3d65e8590f8c213afa76b722e97"
-    }
-    Frame {
-        msec: 6368
-        hash: "769d2724656dbf0e793ecd8e42db3de2"
-    }
-    Frame {
-        msec: 6384
-        hash: "9e375cb3815723a2c5dda39c79325e96"
-    }
-    Frame {
-        msec: 6400
-        hash: "77a245991ed8e40163bd0224eb15f20e"
-    }
-    Frame {
-        msec: 6416
-        hash: "e6936f1122c8c0a76b0eb61ad086a9f1"
-    }
-    Frame {
-        msec: 6432
-        hash: "8048f84221a02e7102cf3272445862a1"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml b/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
deleted file mode 100644
index a27aa6e..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400; height: 240
-    color: "white"
-
-    Timer {
-        interval: 3000; running: true; repeat: true; triggeredOnStart: true
-        onTriggered: {
-            if (flipable.state == '') flipable.state = 'back'; else flipable.state = ''
-            if (flipable2.state == '') flipable2.state = 'back'; else flipable2.state = ''
-        }
-    }
-
-    Flipable {
-        id: flipable
-        width: 200; height: 200
-
-        transform: Rotation {
-            id: rotation; angle: 0
-            origin.x: 100; origin.y: 100
-            axis.x: 0; axis.y: 1; axis.z: 0
-        }
-
-        front: Rectangle {
-            color: "steelblue"; width: 200; height: 200
-        }
-
-        back: Rectangle {
-            color: "deeppink"; width: 200; height: 200
-        }
-
-        states: State {
-            name: "back"
-            PropertyChanges { target: rotation; angle: 180 }
-        }
-
-        transitions: Transition {
-            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 3000 }
-        }
-    }
-
-    Flipable {
-        id: flipable2
-        x: 200; width: 200; height: 200
-
-        transform: Rotation {
-            id: rotation2; angle: 0
-            origin.x: 100; origin.y: 100
-            axis.x: 1; axis.z: 0
-        }
-
-        front: Rectangle {
-            color: "deeppink"; width: 200; height: 200
-        }
-
-        back: Rectangle {
-            color: "steelblue"; width: 200; height: 200
-        }
-
-        states: State {
-            name: "back"
-            PropertyChanges { target: rotation2; angle: 180 }
-        }
-
-        transitions: Transition {
-            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 3000 }
-        }
-    }
-
-    Rectangle {
-        x: 25; width: 150; y: 210; height: 20; color: "black"
-        visible: flipable.side == Flipable.Front
-    }
-    Rectangle {
-        x: 225; width: 150; y: 210; height: 20; color: "black"
-        visible: flipable2.side == Flipable.Back
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.0.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.0.png
deleted file mode 100644
index 6c82777..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.1.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.1.png
deleted file mode 100644
index 07b1f7c..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.2.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.2.png
deleted file mode 100644
index f2f08c0..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.3.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.3.png
deleted file mode 100644
index 08649f9..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.4.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.4.png
deleted file mode 100644
index f9c2f17..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.5.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.5.png
deleted file mode 100644
index 52ec0bd..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.6.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.6.png
deleted file mode 100644
index 3fe25be..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.7.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.7.png
deleted file mode 100644
index 4cc12a6..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.8.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.8.png
deleted file mode 100644
index 2267f23..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.9.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.9.png
deleted file mode 100644
index 6c82777..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.9.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.qml b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.qml
deleted file mode 100644
index c7ac52d..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.qml
+++ /dev/null
@@ -1,2859 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 32
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 48
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 64
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 80
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 96
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 112
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 128
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 144
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 160
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 176
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 192
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 208
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 224
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 240
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 256
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 272
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 288
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 304
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 320
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 336
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 352
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 368
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 384
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 400
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 416
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Frame {
-        msec: 432
-        hash: "c33447c78ea64452ec3cd1696fb502eb"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 448
-        hash: "96ad89eafa7f99269518a192573af91b"
-    }
-    Frame {
-        msec: 464
-        hash: "735b00b968d0e2ea1f34cc0bdc028a8e"
-    }
-    Frame {
-        msec: 480
-        hash: "ce37c8e15fbb1aea72aff9629683fa96"
-    }
-    Frame {
-        msec: 496
-        hash: "a3f2471ef4ceac77a1c20ac327550d8d"
-    }
-    Frame {
-        msec: 512
-        hash: "28f120bd3bda9552dbc8cc908409c67d"
-    }
-    Frame {
-        msec: 528
-        hash: "f21cf0ed746fa48e67dc90c70c5bbae8"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "485d55730366b68e01582879f6970fa1"
-    }
-    Frame {
-        msec: 560
-        hash: "700e53c78b28993dce5dafb4035f4760"
-    }
-    Frame {
-        msec: 576
-        hash: "1e538e175a5e402e2334cf354392e8a7"
-    }
-    Frame {
-        msec: 592
-        hash: "0fbfba93eebaf05ae60067b365b6b4bc"
-    }
-    Frame {
-        msec: 608
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 624
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 640
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 656
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 672
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 688
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Frame {
-        msec: 704
-        hash: "7b1893397b76b0c95094eeca1dd21446"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 720
-        hash: "25e48099a8194ed2674651818d854c61"
-    }
-    Frame {
-        msec: 736
-        hash: "b75d02dfc238ba2292306ca1421279c3"
-    }
-    Frame {
-        msec: 752
-        hash: "7e48b7d9c1291b4e438c81f44228d8ad"
-    }
-    Frame {
-        msec: 768
-        hash: "fe4b009abe081a6eaeab6ef9e996f3fd"
-    }
-    Frame {
-        msec: 784
-        hash: "edea8c305fe88708dbafc03e427caa09"
-    }
-    Frame {
-        msec: 800
-        hash: "7b58803f12d0ab893acf539799d79e31"
-    }
-    Frame {
-        msec: 816
-        hash: "9b56c3d1d140114dcc57d0a8568e9b95"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 832
-        hash: "35e38e273dbc8e565917b21d00fc1530"
-    }
-    Frame {
-        msec: 848
-        hash: "116e294391333e8780daeca54c3d51ea"
-    }
-    Frame {
-        msec: 864
-        hash: "6219676215f82540d7a53b2a8aa60279"
-    }
-    Frame {
-        msec: 880
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 896
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 912
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 928
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 944
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 960
-        image: "gridview.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 992
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1008
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1024
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1040
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1056
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1072
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1088
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1104
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1120
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1136
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 1152
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1168
-        hash: "2667c2596de97dc15353158eba03495f"
-    }
-    Frame {
-        msec: 1184
-        hash: "6a7b64e1427dcb7e438aa09a739cbc7b"
-    }
-    Frame {
-        msec: 1200
-        hash: "5bad6dc745958f5827403ea593c78752"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1216
-        hash: "b393401219ada7d094a451dba8af3f1a"
-    }
-    Frame {
-        msec: 1232
-        hash: "ba656452f8adf3d1ca7db9286274c37f"
-    }
-    Frame {
-        msec: 1248
-        hash: "1e9725c8c364a491f34035fad1f77c63"
-    }
-    Frame {
-        msec: 1264
-        hash: "a0aef0b65446dec0673b5cec3a260390"
-    }
-    Frame {
-        msec: 1280
-        hash: "d60c11a5d376af0831d6f05f2a839a92"
-    }
-    Frame {
-        msec: 1296
-        hash: "1dd2c456c6ee9cc8f9be0e9f3617d44b"
-    }
-    Frame {
-        msec: 1312
-        hash: "56208e6551e2f4202bab2d62a1cf46a2"
-    }
-    Frame {
-        msec: 1328
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1344
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1360
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1376
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1392
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1408
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1424
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1440
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1456
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1472
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1488
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1504
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1520
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1536
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1552
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1568
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1584
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1600
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1616
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1632
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Frame {
-        msec: 1648
-        hash: "caa3c1a106d549e6bb94a1746bd7a53c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1664
-        hash: "f0f00d22d15ed9828db7b5f3a3669fe9"
-    }
-    Frame {
-        msec: 1680
-        hash: "153e7984089530bbd052c9e4f62eb14c"
-    }
-    Frame {
-        msec: 1696
-        hash: "0525d40cc58d054a3abd7ee2486576f8"
-    }
-    Frame {
-        msec: 1712
-        hash: "8c23d5245774ab5252c98c19c33f8171"
-    }
-    Frame {
-        msec: 1728
-        hash: "5ca243794d1350f04cf973d4bfc8ab89"
-    }
-    Frame {
-        msec: 1744
-        hash: "d19b7f4c0897aba498e122d83b4cbbf1"
-    }
-    Frame {
-        msec: 1760
-        hash: "99e41460dd8efc6e5c3faf54b14c3d43"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1776
-        hash: "703469f8b133156ed3aabe02762d66c3"
-    }
-    Frame {
-        msec: 1792
-        hash: "1cc2c383e988048db76a80d8d7f5a0e2"
-    }
-    Frame {
-        msec: 1808
-        hash: "8e87117c19eb9d6e600c44e0f3869ae1"
-    }
-    Frame {
-        msec: 1824
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1840
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1856
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1872
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1888
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1904
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1920
-        image: "gridview.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1952
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1968
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Frame {
-        msec: 1984
-        hash: "8304d2432168a2ea8a887d9a135b40b4"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2000
-        hash: "4924037ce643d0748b8b2c666e61fd62"
-    }
-    Frame {
-        msec: 2016
-        hash: "ef9750584e669a8b2d415d13854e12a6"
-    }
-    Frame {
-        msec: 2032
-        hash: "69937eacef6e6b11ad1d5741c69a1faa"
-    }
-    Frame {
-        msec: 2048
-        hash: "a1bd870fffd95a0604dd8e170e571632"
-    }
-    Frame {
-        msec: 2064
-        hash: "a3a72386594aacc88977cdaa6441df48"
-    }
-    Frame {
-        msec: 2080
-        hash: "6d8e89de38d52f0f0f871dfa18361cb5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2096
-        hash: "96cfb1eb6893fac86c9434d1ffb82fcb"
-    }
-    Frame {
-        msec: 2112
-        hash: "5e11df1660634ff317be474118174ec5"
-    }
-    Frame {
-        msec: 2128
-        hash: "2eb75858b50c3a9a80673ab89014ed63"
-    }
-    Frame {
-        msec: 2144
-        hash: "3ff5d66f7902af92d49ebebf04d16c26"
-    }
-    Frame {
-        msec: 2160
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2176
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2192
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2208
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2224
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2240
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2256
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2272
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2288
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2304
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2320
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Frame {
-        msec: 2336
-        hash: "570da61e2d48acd11474fe005110ab4b"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2352
-        hash: "efeda5b2d97e1b7c22e2308250501cb7"
-    }
-    Frame {
-        msec: 2368
-        hash: "d6158379b699279f66b94a8418e53af1"
-    }
-    Frame {
-        msec: 2384
-        hash: "ab960b0669fa594e0552df623a9136ea"
-    }
-    Frame {
-        msec: 2400
-        hash: "0ebf6be1305ee1eb8740f4d0365ef4c5"
-    }
-    Frame {
-        msec: 2416
-        hash: "46cde47dffc6f2687c8c643eca09b95d"
-    }
-    Frame {
-        msec: 2432
-        hash: "2b8698ce02a6964115d960ae19f40c37"
-    }
-    Frame {
-        msec: 2448
-        hash: "ff1e7d800bb27b41710c50554adc1091"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2464
-        hash: "5837b3aca09038cae23dcb149acc8b0b"
-    }
-    Frame {
-        msec: 2480
-        hash: "dbe7c571cdbdb9de4fd01faa6d5374cf"
-    }
-    Frame {
-        msec: 2496
-        hash: "f431abcaf05f49ead909296d7649f8a9"
-    }
-    Frame {
-        msec: 2512
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2528
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2544
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2560
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2576
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2592
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2608
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2624
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2640
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2656
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2672
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2688
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2704
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2720
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2736
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2752
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2768
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Frame {
-        msec: 2784
-        hash: "043583b19c921740dbc990afd4f508ed"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2800
-        hash: "4f2fafdb59db544352e3067d67c0a714"
-    }
-    Frame {
-        msec: 2816
-        hash: "4dcd4cdf6f4e305732185ec52cd2f2f6"
-    }
-    Frame {
-        msec: 2832
-        hash: "dfd3c29b0520edbbee57dfacfa7e2b30"
-    }
-    Frame {
-        msec: 2848
-        hash: "257d3d8bcf78671d35a898befec091cb"
-    }
-    Frame {
-        msec: 2864
-        hash: "20e89c544284603943396694abe86756"
-    }
-    Frame {
-        msec: 2880
-        image: "gridview.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "b88c6af89423b32b3a4413035711df03"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2912
-        hash: "e34de13af44c449c9ecc86e06ce01ed2"
-    }
-    Frame {
-        msec: 2928
-        hash: "98ffe81129aa7cc7325764221f1dae59"
-    }
-    Frame {
-        msec: 2944
-        hash: "db2d545de9879362738e71a02a3d1d26"
-    }
-    Frame {
-        msec: 2960
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 2976
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 2992
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3008
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3024
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3040
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3056
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3072
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3088
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Frame {
-        msec: 3104
-        hash: "e67ae32a47213b360c1a445bf645dde2"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3120
-        hash: "02d8c90faf56c65252e4f938944bda7b"
-    }
-    Frame {
-        msec: 3136
-        hash: "a32994e2320e357241f63b956b6db236"
-    }
-    Frame {
-        msec: 3152
-        hash: "9ada466c26c217adbcd7a93df264ed75"
-    }
-    Frame {
-        msec: 3168
-        hash: "79d1a3489be95d113e8c611a2ba63456"
-    }
-    Frame {
-        msec: 3184
-        hash: "d3aa82455c4ae3ac25097354e132a30f"
-    }
-    Frame {
-        msec: 3200
-        hash: "62d12e5933ed4ed048ccafd229f4b2b7"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3216
-        hash: "5bc4ac94ae20e425084d0811dee1ba08"
-    }
-    Frame {
-        msec: 3232
-        hash: "6d5113e3732dc7a9172eea3667a01f7b"
-    }
-    Frame {
-        msec: 3248
-        hash: "e435a2588b25d3336f290331931f5981"
-    }
-    Frame {
-        msec: 3264
-        hash: "bce201adbeb319b181cce139f179d7f0"
-    }
-    Frame {
-        msec: 3280
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3296
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3312
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3328
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3344
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3360
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3376
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3392
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3408
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3424
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3440
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Frame {
-        msec: 3456
-        hash: "5fa3ec31176bed2de8cb076b87e0be74"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3472
-        hash: "8f0f3cd35ae92047f23084f447046eb8"
-    }
-    Frame {
-        msec: 3488
-        hash: "ceb12e6c5e9f0566039040d9f3ff587f"
-    }
-    Frame {
-        msec: 3504
-        hash: "dfd0c89c3ea73aceefcdafa71609c720"
-    }
-    Frame {
-        msec: 3520
-        hash: "8d8ed1a9dc6a9f74dfc81b79f02af4c5"
-    }
-    Frame {
-        msec: 3536
-        hash: "d450bd62e03e1e4c7cb66e98ece05f97"
-    }
-    Frame {
-        msec: 3552
-        hash: "d1ece2210cd24eedd5361e5c3a162236"
-    }
-    Frame {
-        msec: 3568
-        hash: "77589e48b9db95e702055753046319e5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3584
-        hash: "7793263ecb831a1e63fbd76c8addde03"
-    }
-    Frame {
-        msec: 3600
-        hash: "bfa9675f981c37fed27dea100226f61a"
-    }
-    Frame {
-        msec: 3616
-        hash: "9780849fe8abd22c32ccafcdd46b0d65"
-    }
-    Frame {
-        msec: 3632
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3648
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3664
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3680
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3696
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3712
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3728
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3744
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3760
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3776
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3792
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3808
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3824
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3840
-        image: "gridview.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3872
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3888
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3904
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Frame {
-        msec: 3920
-        hash: "e63d987ba303a42046827f14941b444a"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3936
-        hash: "a61dbcb7d914afe34009085bf37fb8e2"
-    }
-    Frame {
-        msec: 3952
-        hash: "89175b83b4f7ee4b5d99219cdc97aa59"
-    }
-    Frame {
-        msec: 3968
-        hash: "f524421286503f6175e4ad71dd89145f"
-    }
-    Frame {
-        msec: 3984
-        hash: "ca5af7d98a008eccba1e21be0da61f3c"
-    }
-    Frame {
-        msec: 4000
-        hash: "77c19e7e17e00787ff0d7a4e7bad7bc8"
-    }
-    Frame {
-        msec: 4016
-        hash: "04c8db761e324101ad92e0ac9ceed7d4"
-    }
-    Frame {
-        msec: 4032
-        hash: "97a3dcb81349efab6b44d458e83ce5c4"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4048
-        hash: "e86ebc276b88705c97cc9efb66ccc6b2"
-    }
-    Frame {
-        msec: 4064
-        hash: "a134bbfd14879f13b288a04d23382348"
-    }
-    Frame {
-        msec: 4080
-        hash: "9530ad3f58ad1c66401572869f7d91bc"
-    }
-    Frame {
-        msec: 4096
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4112
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4128
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4144
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4160
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4176
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4192
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4208
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Frame {
-        msec: 4224
-        hash: "db3d030de94b19ea1db5c60be7c7ca5c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4240
-        hash: "980e0fa84fd3bab496623936f5f220a2"
-    }
-    Frame {
-        msec: 4256
-        hash: "ed3268911723d664699bbc31317befc1"
-    }
-    Frame {
-        msec: 4272
-        hash: "3bfda4b3b0b2d2a97ec1c0b5b3f4da63"
-    }
-    Frame {
-        msec: 4288
-        hash: "1616c6def28659d51905564ff83cc112"
-    }
-    Frame {
-        msec: 4304
-        hash: "68342f34c18956d3a093f8eeeae6977e"
-    }
-    Frame {
-        msec: 4320
-        hash: "ac1b12959e9055a28fe2bda0a12b75bc"
-    }
-    Frame {
-        msec: 4336
-        hash: "009b85ff6b86e418c78ed33a5e88d3f1"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4352
-        hash: "59753bc7dc69767fe2109fdc41f20dae"
-    }
-    Frame {
-        msec: 4368
-        hash: "1c87d3d8c8d564d4d95a26f57fd28f38"
-    }
-    Frame {
-        msec: 4384
-        hash: "4e43b7b6787002c9013010dd74c83f49"
-    }
-    Frame {
-        msec: 4400
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4416
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4432
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4448
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4464
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4480
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4496
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4512
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4528
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4544
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4560
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4576
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Frame {
-        msec: 4592
-        hash: "2476aa1a7191b485a76c76e98c9be2b0"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4608
-        hash: "84de5b5e8b0fba190a783c72967661c7"
-    }
-    Frame {
-        msec: 4624
-        hash: "60b696f4913379d28f300fd1b531c6cb"
-    }
-    Frame {
-        msec: 4640
-        hash: "d01e651d9094332fd82ad1cea3e93e9d"
-    }
-    Frame {
-        msec: 4656
-        hash: "87be4cd7c894b03b2b64c996e915d71f"
-    }
-    Frame {
-        msec: 4672
-        hash: "b07fccb0c5565d2feed5a9fcdf8acead"
-    }
-    Frame {
-        msec: 4688
-        hash: "3dca3165fd34be549d21fb6c414c67d8"
-    }
-    Frame {
-        msec: 4704
-        hash: "5f69f3298f8ca73fa9b3b6e630c60186"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4720
-        hash: "d7f41e9a29d550a7d9a41bb947569abe"
-    }
-    Frame {
-        msec: 4736
-        hash: "4ede2e90ad216a2d44580c50a25dea23"
-    }
-    Frame {
-        msec: 4752
-        hash: "9b339845ee588b789dc9095c272e0bdf"
-    }
-    Frame {
-        msec: 4768
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4784
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4800
-        image: "gridview.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4832
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4848
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4864
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4880
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4896
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4912
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4928
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4944
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4960
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4976
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 4992
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5008
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5024
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5040
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5056
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5072
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5088
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5104
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5120
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5136
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Frame {
-        msec: 5152
-        hash: "9cdea4790972efaecabd52b435107e69"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5168
-        hash: "d6f0a6d7604bad811eeba13fd7c45368"
-    }
-    Frame {
-        msec: 5184
-        hash: "5f92e1531a3f6c21ec82e3c908167fc7"
-    }
-    Frame {
-        msec: 5200
-        hash: "5214e99ff052dcdc8f85bad29de92e03"
-    }
-    Frame {
-        msec: 5216
-        hash: "d4abed9f0f1115c9a45b0b9b4f54754e"
-    }
-    Frame {
-        msec: 5232
-        hash: "cfae8a0281e704b0e62f6bf31b32800f"
-    }
-    Frame {
-        msec: 5248
-        hash: "c203f0674596ae690bf19f2d49be62ac"
-    }
-    Frame {
-        msec: 5264
-        hash: "2e2c7e05aade104bdc4f6c489b6f0601"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5280
-        hash: "b4b2148b0557dcab3a441165e5e4de5f"
-    }
-    Frame {
-        msec: 5296
-        hash: "c5e791d27a42a63d25cdbd492b4af29a"
-    }
-    Frame {
-        msec: 5312
-        hash: "0f94ebcb407f8e6ae263bd954f2c8177"
-    }
-    Frame {
-        msec: 5328
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5344
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5360
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5376
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5392
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5408
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5424
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5440
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Frame {
-        msec: 5456
-        hash: "d9b56b817a411812789881697a28fe4c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5472
-        hash: "6fdfe69e377da72e04dc130f5677ed2c"
-    }
-    Frame {
-        msec: 5488
-        hash: "c041d26d43766fa1735f2ada2a43225b"
-    }
-    Frame {
-        msec: 5504
-        hash: "aa62dbd6c6256665ee1b4ef468607978"
-    }
-    Frame {
-        msec: 5520
-        hash: "987fcdf6483a83b1242053f4e7fb7a26"
-    }
-    Frame {
-        msec: 5536
-        hash: "fbde70c34709b68eb22f5460a8815fba"
-    }
-    Frame {
-        msec: 5552
-        hash: "911ddc838ebaf5ade1bb026dff2741ba"
-    }
-    Frame {
-        msec: 5568
-        hash: "120bbf35b2a3b756bdeaea0df43e49b2"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5584
-        hash: "ea93e33c079d6dc5fb18c69fb4fed441"
-    }
-    Frame {
-        msec: 5600
-        hash: "b9ac8ab01cb59b1fee11967bdb6d2dd6"
-    }
-    Frame {
-        msec: 5616
-        hash: "3ff266bf29cbcaa30bc1e7af5dd9866b"
-    }
-    Frame {
-        msec: 5632
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5648
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5664
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5680
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5696
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5712
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5728
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5744
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5760
-        image: "gridview.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5792
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Frame {
-        msec: 5808
-        hash: "edd6c3a9493a63674e2d7af5f3e8467e"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5824
-        hash: "de1f83d25751639dff42f1755a6534c3"
-    }
-    Frame {
-        msec: 5840
-        hash: "edefdea8b2461d03fb97cf5ed66e9b6d"
-    }
-    Frame {
-        msec: 5856
-        hash: "cef1886397e3932a511f37571b5011f4"
-    }
-    Frame {
-        msec: 5872
-        hash: "05589ad354314d9e04ef90c1addd99f5"
-    }
-    Frame {
-        msec: 5888
-        hash: "ff88b52e3755b9b4785d2719ddd4f090"
-    }
-    Frame {
-        msec: 5904
-        hash: "f59edc3016b177a2e8faa6612d718b17"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5920
-        hash: "dc673a7cdd927f70b28ebcfe51cd3d89"
-    }
-    Frame {
-        msec: 5936
-        hash: "3abec0da85fb663e63ab22188e092827"
-    }
-    Frame {
-        msec: 5952
-        hash: "50c2c8ac68cafad7c47b576cd8f4a037"
-    }
-    Frame {
-        msec: 5968
-        hash: "06c31b861e2b96e6595b2244d7b3f4d5"
-    }
-    Frame {
-        msec: 5984
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6000
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6016
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6032
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6048
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6064
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6080
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6096
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6112
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6128
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6144
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6160
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6176
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6192
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6208
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6224
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6240
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6256
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6272
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6288
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6304
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6320
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6336
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6352
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6368
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6384
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6400
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Frame {
-        msec: 6416
-        hash: "0aa7ce5ba9c875619a6e4629a0eb4065"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6432
-        hash: "7f52a770775c19e10784b4c5f7874210"
-    }
-    Frame {
-        msec: 6448
-        hash: "827cfb74286a2a80aca8b6c5277d6cfd"
-    }
-    Frame {
-        msec: 6464
-        hash: "8399231eda9b66821d43a3d8c4c7d645"
-    }
-    Frame {
-        msec: 6480
-        hash: "fc163583671f3c4023361460b436c895"
-    }
-    Frame {
-        msec: 6496
-        hash: "893dea6496c95c32095ad1d673e500c2"
-    }
-    Frame {
-        msec: 6512
-        hash: "808c7403b2cdcc882059da56a2f806fe"
-    }
-    Frame {
-        msec: 6528
-        hash: "7466b2e5b86ba8ad46be75818659786c"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6544
-        hash: "dd2561cd780e24401130305d47757a53"
-    }
-    Frame {
-        msec: 6560
-        hash: "bee89299532d43fc3e6c3e69c343b381"
-    }
-    Frame {
-        msec: 6576
-        hash: "94f8474aedee94098592c05d8fc7d868"
-    }
-    Frame {
-        msec: 6592
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6608
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6624
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6640
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6656
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6672
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6688
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Frame {
-        msec: 6704
-        hash: "b6ee51bfa4d4ab7a83cca5c18453f0b8"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6720
-        image: "gridview.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "ccd58be20d47422121d6ef799b927a7a"
-    }
-    Frame {
-        msec: 6752
-        hash: "e090c7f39649786a1796870e25bd0f0d"
-    }
-    Frame {
-        msec: 6768
-        hash: "acf3dcd9f4a869169dbc1ae7fe60e9d0"
-    }
-    Frame {
-        msec: 6784
-        hash: "51795e9a720845e8305d23507785e1ca"
-    }
-    Frame {
-        msec: 6800
-        hash: "0d34a43e177e6b73e2ff9155747d0385"
-    }
-    Frame {
-        msec: 6816
-        hash: "1876c3cdffc1af01da1aaa0ac636d0a8"
-    }
-    Frame {
-        msec: 6832
-        hash: "3131296b6edf4190520e2cdb3f8b936e"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6848
-        hash: "ee92f0a764e5081b130e205a5c362b07"
-    }
-    Frame {
-        msec: 6864
-        hash: "8737ea2c60aeb215228c00a7fddd1baa"
-    }
-    Frame {
-        msec: 6880
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6896
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6912
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6928
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6944
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6960
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6976
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 6992
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7008
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7024
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7040
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7056
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7072
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7088
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7104
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7120
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7136
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7152
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7168
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7184
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7200
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7216
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7232
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7248
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7264
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7280
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7296
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7312
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7328
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7344
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7360
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7376
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7392
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7408
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7424
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7440
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7456
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7472
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7488
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7504
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7520
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7536
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7552
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7568
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7584
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7600
-        hash: "ac036f1f5c5ae23ddfca3060dff83f15"
-    }
-    Frame {
-        msec: 7616
-        hash: "eb0d1be15f63af6eaf6634b02e5f240a"
-    }
-    Frame {
-        msec: 7632
-        hash: "2423c305bebb3449e87c78e8fb447c88"
-    }
-    Frame {
-        msec: 7648
-        hash: "f0ede6ea85647728db80878b3e525edc"
-    }
-    Frame {
-        msec: 7664
-        hash: "387d127b2b000dc344ee4768cf2d29b2"
-    }
-    Frame {
-        msec: 7680
-        image: "gridview.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "1d0d8100e994c16d7973ad9a97b0068f"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7712
-        hash: "95fb4a6d0331ffc4773e39ec8c3e6511"
-    }
-    Frame {
-        msec: 7728
-        hash: "34738f16150228d971972833d4bd5c8f"
-    }
-    Frame {
-        msec: 7744
-        hash: "9b71c8dacc530f32d7c6f409928caf5c"
-    }
-    Frame {
-        msec: 7760
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7776
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7792
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7808
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7824
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7840
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7856
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7872
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7888
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7904
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7920
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7936
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7952
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 7968
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 7984
-        hash: "831efd0970c5c29fbe10b3be7707f915"
-    }
-    Frame {
-        msec: 8000
-        hash: "0587fc809c38c3bbe1fbac2960596974"
-    }
-    Frame {
-        msec: 8016
-        hash: "d20eba806cf4730a850db4c095fa36f9"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8032
-        hash: "c1663e75ba05b341e1e970a451958ea0"
-    }
-    Frame {
-        msec: 8048
-        hash: "ea40cc33b689d6b42fc5a69fa30178e4"
-    }
-    Frame {
-        msec: 8064
-        hash: "a07a1c61de1813158ff743cd326ee427"
-    }
-    Frame {
-        msec: 8080
-        hash: "6dfddaa340df8999ca77f6a6e4c6c3ce"
-    }
-    Frame {
-        msec: 8096
-        hash: "76ca40bb169c1ddc291847d4be2d38d7"
-    }
-    Frame {
-        msec: 8112
-        hash: "e44778541b76208981a3944a64235cac"
-    }
-    Frame {
-        msec: 8128
-        hash: "fdf45ea650d31957cc675c3bec8bf53e"
-    }
-    Frame {
-        msec: 8144
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8160
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8176
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8192
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8208
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8224
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8240
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8256
-        hash: "b78cdb727535ab7e567af08abf25e64c"
-    }
-    Frame {
-        msec: 8272
-        hash: "338481e6390f2a61e975084c16427584"
-    }
-    Frame {
-        msec: 8288
-        hash: "8923c45c23b1f4250b7d1e483b07a4da"
-    }
-    Frame {
-        msec: 8304
-        hash: "b21de834906d0eecea985561e2e41e4f"
-    }
-    Frame {
-        msec: 8320
-        hash: "a8c9761cfb20631520ed890cd2648c4b"
-    }
-    Frame {
-        msec: 8336
-        hash: "abf96a042ef12190bc48ff49732ef55a"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8352
-        hash: "5b9506dfb038cd26dfc81ecd2406ada9"
-    }
-    Frame {
-        msec: 8368
-        hash: "be75b8d39f81b2fdaff01469bfc67d4a"
-    }
-    Frame {
-        msec: 8384
-        hash: "488aa2977f349df82b5f6ae5e3619d35"
-    }
-    Frame {
-        msec: 8400
-        hash: "d69f17f0ce8537511353d20b59d20de0"
-    }
-    Frame {
-        msec: 8416
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8432
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8448
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8464
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8480
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8496
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8512
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8528
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8544
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8560
-        hash: "7647efcc0152cc3d6544106f969ace26"
-    }
-    Frame {
-        msec: 8576
-        hash: "8f74d33bf95cbf37fdb4521c69373a64"
-    }
-    Frame {
-        msec: 8592
-        hash: "e33bb4cd12790c9d9992efdd3e23bee9"
-    }
-    Frame {
-        msec: 8608
-        hash: "36f32e34b4093091c4707f26c52896ad"
-    }
-    Frame {
-        msec: 8624
-        hash: "5ab5e142f8dc883287c116cedbacfd55"
-    }
-    Frame {
-        msec: 8640
-        image: "gridview.8.png"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8656
-        hash: "c74212e45a6c4b6a18caeb6a22350609"
-    }
-    Frame {
-        msec: 8672
-        hash: "8919643a7d13677dd902941860093209"
-    }
-    Frame {
-        msec: 8688
-        hash: "6f2ab4400fadf51b994351f0975e31fc"
-    }
-    Frame {
-        msec: 8704
-        hash: "4798559ce6f9bd7455ed5385d0030763"
-    }
-    Frame {
-        msec: 8720
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8736
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8752
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8768
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8784
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8800
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8816
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8832
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8848
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8864
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8880
-        hash: "72759bd1e2618c61c42bbe4de3ad3a96"
-    }
-    Frame {
-        msec: 8896
-        hash: "fac81cf6f45cb47abc1fa36d23e39d34"
-    }
-    Frame {
-        msec: 8912
-        hash: "862f4deee01183fd38b094da59048b23"
-    }
-    Frame {
-        msec: 8928
-        hash: "2f3b147221da30d8857d25fc788b3eac"
-    }
-    Frame {
-        msec: 8944
-        hash: "5b295b187c6cfc6aefa51e5efc2c27e3"
-    }
-    Frame {
-        msec: 8960
-        hash: "fe3139ddc8fdbc1b0c25bd641f83e833"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8976
-        hash: "8f2a9585dc6248a403aafd0f151d6ba0"
-    }
-    Frame {
-        msec: 8992
-        hash: "39eca8cc6bb8ea30cc452dc24f8e46dc"
-    }
-    Frame {
-        msec: 9008
-        hash: "8dbbc6026942cb6e572f1cb7e2675713"
-    }
-    Frame {
-        msec: 9024
-        hash: "62dfa07b96dd18c6be89822654bf09f3"
-    }
-    Frame {
-        msec: 9040
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9056
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9072
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9088
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9104
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9120
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9136
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9152
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9168
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9184
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9200
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9216
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9232
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9248
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9264
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Key {
-        type: 6
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9280
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9296
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9312
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9328
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9344
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9360
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9376
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Key {
-        type: 7
-        key: 16777235
-        modifiers: 536870912
-        text: "1e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9392
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9408
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9424
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9440
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9456
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9472
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9488
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9504
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9520
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9536
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9552
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9568
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9584
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9600
-        image: "gridview.9.png"
-    }
-    Frame {
-        msec: 9616
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9632
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9648
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9664
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9680
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9696
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9712
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9728
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9744
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9760
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 9776
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9792
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9808
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9824
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-    Frame {
-        msec: 9840
-        hash: "02c632713d0dc64bff9d8e58f745df95"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.0.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.0.png
deleted file mode 100644
index 3021d58..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.1.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.1.png
deleted file mode 100644
index baeb1a6..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.10.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.10.png
deleted file mode 100644
index b0486e5..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.10.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.2.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.2.png
deleted file mode 100644
index 2d0c731..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.3.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.3.png
deleted file mode 100644
index af9ed05..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.4.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.4.png
deleted file mode 100644
index 0b0945d..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.5.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.5.png
deleted file mode 100644
index 618ae0c..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.6.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.6.png
deleted file mode 100644
index fc31262..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.7.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.7.png
deleted file mode 100644
index 22291ac..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.8.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.8.png
deleted file mode 100644
index 3021d58..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.9.png b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.9.png
deleted file mode 100644
index 2f2f5b9..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.9.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.qml b/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.qml
deleted file mode 100644
index fb5f1fb..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.qml
+++ /dev/null
@@ -1,2479 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "dba2f6f1c773bd4cd9523108fca861c4"
-    }
-    Frame {
-        msec: 32
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 48
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 64
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 80
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 96
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 112
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 128
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 144
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 160
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 176
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 192
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 208
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 224
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 240
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 256
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 272
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 288
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 304
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 320
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 336
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 352
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 368
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 384
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 400
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 416
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 432
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 448
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 464
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 480
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 496
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 512
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 528
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 544
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 560
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 576
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 592
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 608
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 624
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 640
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 656
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 672
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 688
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 704
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 720
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 736
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 752
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 768
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 784
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 800
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 816
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 832
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 848
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 864
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 880
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 896
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 912
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 928
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 944
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 960
-        image: "gridview2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 992
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1008
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1024
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1040
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1056
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1072
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1088
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1104
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1120
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1136
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1152
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1168
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1184
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1200
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1216
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1232
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1248
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1264
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 1280
-        hash: "aaec7184a27e6700d96ffff376b8fa53"
-    }
-    Frame {
-        msec: 1296
-        hash: "3fa3a890a4ff4a59336a9a2d478d0dde"
-    }
-    Frame {
-        msec: 1312
-        hash: "3711c6c2f4f9aba7f2c72bd1f1d85016"
-    }
-    Frame {
-        msec: 1328
-        hash: "23da2f9a800b805ce7b77ff08218907d"
-    }
-    Frame {
-        msec: 1344
-        hash: "12e4bc953b06cdaad0720f87fb96a37e"
-    }
-    Frame {
-        msec: 1360
-        hash: "46e69658bda69bab202a2790a76ba1cd"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1376
-        hash: "44608e67c69b92ccbb45e119e1158fe3"
-    }
-    Frame {
-        msec: 1392
-        hash: "97a309b47017d38294644a486a7ce68e"
-    }
-    Frame {
-        msec: 1408
-        hash: "41f42b50b22e0496c8aca5019b24b9cb"
-    }
-    Frame {
-        msec: 1424
-        hash: "8603ea1cb60c804563f50bc41c0180fe"
-    }
-    Frame {
-        msec: 1440
-        hash: "e29777fa70daafe9640c6e9bb7bd63d6"
-    }
-    Frame {
-        msec: 1456
-        hash: "2c4c360320f527e99fee799e68c2c0aa"
-    }
-    Frame {
-        msec: 1472
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1488
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1504
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1520
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1536
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1552
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1568
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1584
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1600
-        hash: "0d30916c7e05ff8609af5894f47a89bb"
-    }
-    Frame {
-        msec: 1616
-        hash: "17027b7c099b11cb5382f30dbbd1e647"
-    }
-    Frame {
-        msec: 1632
-        hash: "0e17461a4ca843f9903b7f03e99a0b00"
-    }
-    Frame {
-        msec: 1648
-        hash: "a5e61901920553e59892fa405beea15a"
-    }
-    Frame {
-        msec: 1664
-        hash: "310eaf71fe8d3807606e58a666c65ccd"
-    }
-    Frame {
-        msec: 1680
-        hash: "76f556d05fb77082f33eb1836c10587a"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1696
-        hash: "4e7e4b7790a96396e7ea3533b5c32ed9"
-    }
-    Frame {
-        msec: 1712
-        hash: "b065287b6490f58ca6f0e9eb2027cf20"
-    }
-    Frame {
-        msec: 1728
-        hash: "907cd9dbdffa1d395caaabd466dc8e86"
-    }
-    Frame {
-        msec: 1744
-        hash: "3b144e5b4867328beafa3020ce931480"
-    }
-    Frame {
-        msec: 1760
-        hash: "b59b2b60b7d55424b61b1b0ed3e227b8"
-    }
-    Frame {
-        msec: 1776
-        hash: "4032e934871b315b68c7c2abea42efee"
-    }
-    Frame {
-        msec: 1792
-        hash: "8f80127b2f8d6fc10aa84062544cc381"
-    }
-    Frame {
-        msec: 1808
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1824
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1840
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1856
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1872
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1888
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1904
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1920
-        image: "gridview2.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1952
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1968
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 1984
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 2000
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 2016
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2032
-        hash: "77d5193bc5f53fe5cb98a236c55f841e"
-    }
-    Frame {
-        msec: 2048
-        hash: "a45d2630872a14541f39b862e15ff461"
-    }
-    Frame {
-        msec: 2064
-        hash: "714711d7382ef8bba5fb39e2e44bd59c"
-    }
-    Frame {
-        msec: 2080
-        hash: "63deed0356e761f94f88be18a7d10053"
-    }
-    Frame {
-        msec: 2096
-        hash: "d5b4fc1b568a4a1b63a91b422272c704"
-    }
-    Frame {
-        msec: 2112
-        hash: "b6d2c80925cc6b4b7b297bd6ee903c7c"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2128
-        hash: "38117482196360353586cb7ace593894"
-    }
-    Frame {
-        msec: 2144
-        hash: "2301f3a148bf4e311cc8ce011ddf65f8"
-    }
-    Frame {
-        msec: 2160
-        hash: "2a4982a0961f89a15618f8d4c2081f5a"
-    }
-    Frame {
-        msec: 2176
-        hash: "acf8666d6a8a29925f3895aa8e93f713"
-    }
-    Frame {
-        msec: 2192
-        hash: "967ed026bc92a6d2747c5227105543a6"
-    }
-    Frame {
-        msec: 2208
-        hash: "ff72f3fb95f25990c99c1c14cfef57da"
-    }
-    Frame {
-        msec: 2224
-        hash: "0874a4f863596c3860dcf5b1f7f6ceb2"
-    }
-    Frame {
-        msec: 2240
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2256
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2272
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2288
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2304
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2320
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2336
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2352
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2368
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2384
-        hash: "520445d8619ad9bdde0db0e61f17567c"
-    }
-    Frame {
-        msec: 2400
-        hash: "7c4bbf0423d63d7642d218cac56a6215"
-    }
-    Frame {
-        msec: 2416
-        hash: "e8c77dbc89721b51549f8d46453fe09d"
-    }
-    Frame {
-        msec: 2432
-        hash: "7953503590b639872ac12215695e8cea"
-    }
-    Frame {
-        msec: 2448
-        hash: "edaee946a2e25fed6de9acfda0d44a14"
-    }
-    Frame {
-        msec: 2464
-        hash: "4996ef39bb0122c10d65f8dd8674b386"
-    }
-    Frame {
-        msec: 2480
-        hash: "ede7c6ca9d6deb7819c3715e98755d6e"
-    }
-    Frame {
-        msec: 2496
-        hash: "e703fad2fcf9244ec9865200c7d17ce3"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2512
-        hash: "e2bfc16fd893bb3eb0e5df89a0169af3"
-    }
-    Frame {
-        msec: 2528
-        hash: "cfd0eb2bc378bd46644f3f7820150685"
-    }
-    Frame {
-        msec: 2544
-        hash: "442b05b04762c2bcda291aaa0341398e"
-    }
-    Frame {
-        msec: 2560
-        hash: "55842a6503057eea98e2075ef160873e"
-    }
-    Frame {
-        msec: 2576
-        hash: "730f80233dacf1119660a76d2a34c5fc"
-    }
-    Frame {
-        msec: 2592
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2608
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2624
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2640
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2656
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2672
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2688
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2704
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2720
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2736
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2752
-        hash: "d4a48ee79a18cc5c0bc123fbb40c3efd"
-    }
-    Frame {
-        msec: 2768
-        hash: "4d04c12bc7fab0b22df3135bf3a87a22"
-    }
-    Frame {
-        msec: 2784
-        hash: "fdca5a3f8312452feba7f37b1caa6419"
-    }
-    Frame {
-        msec: 2800
-        hash: "97b955e0f8cde30299b238d9ac0eb308"
-    }
-    Frame {
-        msec: 2816
-        hash: "19664de1a738458810896959ba4087ad"
-    }
-    Frame {
-        msec: 2832
-        hash: "4f9a4b6de6a2969e4639076a8f7c258e"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 536870912
-        text: "1c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2848
-        hash: "a10f18aa686be2681a48082ec9f01df7"
-    }
-    Frame {
-        msec: 2864
-        hash: "b8f39a6cca377dd573429d879286dd63"
-    }
-    Frame {
-        msec: 2880
-        image: "gridview2.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "3301e52a46efbc49882401c77853ffde"
-    }
-    Frame {
-        msec: 2912
-        hash: "0c614597f17496ebc701efe7b0c1fbb6"
-    }
-    Frame {
-        msec: 2928
-        hash: "6dda2d6b034c932e279cf216c9b3e6ad"
-    }
-    Frame {
-        msec: 2944
-        hash: "7bf08cd5fe3ad3f83bbef28f452e0545"
-    }
-    Frame {
-        msec: 2960
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 2976
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 2992
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 3008
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 3024
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3040
-        hash: "1b7ebcf0e3d68e429cb04966120985e5"
-    }
-    Frame {
-        msec: 3056
-        hash: "0fe7d46e7c18ce7bb5a098c5c662d557"
-    }
-    Frame {
-        msec: 3072
-        hash: "cd5df541cc1ed545bc27da9e4a937261"
-    }
-    Frame {
-        msec: 3088
-        hash: "35762467b83fee1870cff9b0436994d3"
-    }
-    Frame {
-        msec: 3104
-        hash: "75a620b42caabf5b1576041dbd4c2808"
-    }
-    Frame {
-        msec: 3120
-        hash: "f1b06290a6cbd48b8d3d4ce1e42ed754"
-    }
-    Frame {
-        msec: 3136
-        hash: "8e1a50dc082828587a4656117760a852"
-    }
-    Frame {
-        msec: 3152
-        hash: "aae8e5f166e736040138d8e222a844dd"
-    }
-    Frame {
-        msec: 3168
-        hash: "f69e5cf2bcb26fe49126776695b0b7e0"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3184
-        hash: "7b482fece0255ea07496ef0545b008a2"
-    }
-    Frame {
-        msec: 3200
-        hash: "3f96eaebfebe8d4eeb347b201b59ab11"
-    }
-    Frame {
-        msec: 3216
-        hash: "9943626d2226c3be711c8213906133f0"
-    }
-    Frame {
-        msec: 3232
-        hash: "fd5fd8177b3957c27f1de0d95621351a"
-    }
-    Frame {
-        msec: 3248
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3264
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3280
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3296
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3312
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3328
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3344
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3360
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3376
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3392
-        hash: "506283ccfe9670633ce0bf60b437b37b"
-    }
-    Frame {
-        msec: 3408
-        hash: "fb437f6c23561092a124e498f1604ff2"
-    }
-    Frame {
-        msec: 3424
-        hash: "402ba144bbb7260eec4553e68eb35cda"
-    }
-    Frame {
-        msec: 3440
-        hash: "76a983de9e85e0c81dfb8908252bd6c9"
-    }
-    Frame {
-        msec: 3456
-        hash: "09219f55fae47a0afed887ebf68a36bc"
-    }
-    Frame {
-        msec: 3472
-        hash: "344e81cc262093facef2f6a235a734dc"
-    }
-    Frame {
-        msec: 3488
-        hash: "8f1c5544eb537555b1c59a377b15e31d"
-    }
-    Frame {
-        msec: 3504
-        hash: "606b9bb549fe2e4bbd09d67b7dea0d1a"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3520
-        hash: "63e239c97bd01a61cb31ef2869e7f47c"
-    }
-    Frame {
-        msec: 3536
-        hash: "f7c176550c39f8a1ad64590cf33a60a4"
-    }
-    Frame {
-        msec: 3552
-        hash: "8581cb14ed81efdf9abb638b5e542cc3"
-    }
-    Frame {
-        msec: 3568
-        hash: "7a1e9354ecc49d8bc27d303c7bdc81f9"
-    }
-    Frame {
-        msec: 3584
-        hash: "610288b97276ee03702ed8a814ef333d"
-    }
-    Frame {
-        msec: 3600
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3616
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3632
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3648
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3664
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3680
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3696
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3712
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3728
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3744
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3760
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3776
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3792
-        hash: "8d36bc2f3ab614d19f3ec8821f3e81ed"
-    }
-    Frame {
-        msec: 3808
-        hash: "9713c6b9aff051dd0cc45c545d34b688"
-    }
-    Frame {
-        msec: 3824
-        hash: "1f8fd4d759e343720a8681b6ad126b72"
-    }
-    Frame {
-        msec: 3840
-        image: "gridview2.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "8550d916d91a40b0c3a886b962e07ffc"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3872
-        hash: "df0c2e474139e79429bfc19c79a65ef8"
-    }
-    Frame {
-        msec: 3888
-        hash: "acfb99d081d754276e5ed59bd590aeab"
-    }
-    Frame {
-        msec: 3904
-        hash: "2b34cd101b442f7a3de2893fd5514c16"
-    }
-    Frame {
-        msec: 3920
-        hash: "df92ced66faa1d59354d8010278438ec"
-    }
-    Frame {
-        msec: 3936
-        hash: "dd39a8e6fa3784453461193a6da416cd"
-    }
-    Frame {
-        msec: 3952
-        hash: "5670e8f91ea2df451f0974a51cd77d7d"
-    }
-    Frame {
-        msec: 3968
-        hash: "74b97a09bfe7400872a2c6214e04a5ac"
-    }
-    Frame {
-        msec: 3984
-        hash: "cfd55b963506ab54cf09a7311e84bcc9"
-    }
-    Frame {
-        msec: 4000
-        hash: "59657ee9293c03f064d62de826931435"
-    }
-    Frame {
-        msec: 4016
-        hash: "31f6a4adf31be5ed0af0ea4097e3acee"
-    }
-    Frame {
-        msec: 4032
-        hash: "8f5bfc40c8cdb2f8ce69adb72e7efe76"
-    }
-    Frame {
-        msec: 4048
-        hash: "9dc38985113124130e2ca7950e0bd144"
-    }
-    Frame {
-        msec: 4064
-        hash: "786e6e8b9e74876a6f393d61a78b8fc7"
-    }
-    Frame {
-        msec: 4080
-        hash: "1f4d59a4e4684aab309363a711b30006"
-    }
-    Frame {
-        msec: 4096
-        hash: "a11e332de151b43051796e16dbcf75c3"
-    }
-    Frame {
-        msec: 4112
-        hash: "1a0e82029ae107cb2a018786752433ff"
-    }
-    Frame {
-        msec: 4128
-        hash: "b14c51977c7fbf51f9cf6fec309bff6a"
-    }
-    Frame {
-        msec: 4144
-        hash: "2b418f811992399c3f87c268db745632"
-    }
-    Frame {
-        msec: 4160
-        hash: "0e9a056207053ca98c4e9f42de244c62"
-    }
-    Frame {
-        msec: 4176
-        hash: "1945c3f9e3a1337e7d111e15adea345f"
-    }
-    Frame {
-        msec: 4192
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4208
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4224
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4240
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4256
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4272
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4288
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4304
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4320
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4336
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4352
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4368
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4384
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4400
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4416
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4432
-        hash: "d8cf36b6cc15a01ead815d814ae81cb4"
-    }
-    Frame {
-        msec: 4448
-        hash: "1945c3f9e3a1337e7d111e15adea345f"
-    }
-    Frame {
-        msec: 4464
-        hash: "0e9a056207053ca98c4e9f42de244c62"
-    }
-    Frame {
-        msec: 4480
-        hash: "2b418f811992399c3f87c268db745632"
-    }
-    Frame {
-        msec: 4496
-        hash: "b14c51977c7fbf51f9cf6fec309bff6a"
-    }
-    Frame {
-        msec: 4512
-        hash: "1a0e82029ae107cb2a018786752433ff"
-    }
-    Frame {
-        msec: 4528
-        hash: "a11e332de151b43051796e16dbcf75c3"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4544
-        hash: "1f4d59a4e4684aab309363a711b30006"
-    }
-    Frame {
-        msec: 4560
-        hash: "786e6e8b9e74876a6f393d61a78b8fc7"
-    }
-    Frame {
-        msec: 4576
-        hash: "9dc38985113124130e2ca7950e0bd144"
-    }
-    Frame {
-        msec: 4592
-        hash: "8f5bfc40c8cdb2f8ce69adb72e7efe76"
-    }
-    Frame {
-        msec: 4608
-        hash: "31f6a4adf31be5ed0af0ea4097e3acee"
-    }
-    Frame {
-        msec: 4624
-        hash: "59657ee9293c03f064d62de826931435"
-    }
-    Frame {
-        msec: 4640
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4656
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4672
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4688
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4704
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4720
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4736
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4752
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4768
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4784
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4800
-        image: "gridview2.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4832
-        hash: "23aa652a0de7fced4a780d72f0940a1b"
-    }
-    Frame {
-        msec: 4848
-        hash: "d46eea049d6156a5e85d9c6811d9d367"
-    }
-    Frame {
-        msec: 4864
-        hash: "d5796ae85247cb8502f92f0d044e4e1f"
-    }
-    Frame {
-        msec: 4880
-        hash: "90987ac49c1a4e6b668436e3ff631e6c"
-    }
-    Frame {
-        msec: 4896
-        hash: "c38d69759ad80242b1fe83ba191cd421"
-    }
-    Frame {
-        msec: 4912
-        hash: "09d08aed76a04e492d8a39cc4dd2b8f5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 536870912
-        text: "1d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4928
-        hash: "9671d2ff9a2ef46ce3c750a1965404a4"
-    }
-    Frame {
-        msec: 4944
-        hash: "f55857816d666ece4a7987a70883b3d1"
-    }
-    Frame {
-        msec: 4960
-        hash: "a2d80527b30316d9120b057bbfcfa666"
-    }
-    Frame {
-        msec: 4976
-        hash: "87ca69287c1469cbc7e65d1673016de7"
-    }
-    Frame {
-        msec: 4992
-        hash: "51588c7ebbe2dcd87a3c9bebf028aee3"
-    }
-    Frame {
-        msec: 5008
-        hash: "917a9a171273fe9fd4c450eeed6f58ed"
-    }
-    Frame {
-        msec: 5024
-        hash: "6e7ade250a9a9692caee2a220dd2ac53"
-    }
-    Frame {
-        msec: 5040
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5056
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5072
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5088
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5104
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5120
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5136
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5152
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5168
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5184
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5200
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5216
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5232
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5248
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5264
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5280
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5296
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5312
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5328
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5344
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5360
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5376
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5392
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5408
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5424
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5440
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5456
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5472
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5488
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5504
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5520
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5536
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5552
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5568
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5584
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5600
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5616
-        hash: "ca2dcb16d553889a3a57b48700c2a595"
-    }
-    Frame {
-        msec: 5632
-        hash: "c5c9aab9bea757f1c451e89df72bd836"
-    }
-    Frame {
-        msec: 5648
-        hash: "a8cf3085f8c3b743f3f15db1ad7b8801"
-    }
-    Frame {
-        msec: 5664
-        hash: "c25a92050eced1c304506572723273a3"
-    }
-    Frame {
-        msec: 5680
-        hash: "cff981039c1a3eb6c3c1a20f142fbae2"
-    }
-    Frame {
-        msec: 5696
-        hash: "930765587fe3355873bbdff66b812b74"
-    }
-    Frame {
-        msec: 5712
-        hash: "6a60f97c7b39add465e1bd366e9c644b"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 5728
-        hash: "7a1fd3c488d1064a75dc598c9a773291"
-    }
-    Frame {
-        msec: 5744
-        hash: "e2ecd7e68e27eb3d2dcb5e368d3ee5a0"
-    }
-    Frame {
-        msec: 5760
-        image: "gridview2.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "20f3aaca2efc3066076e73d1d95e5363"
-    }
-    Frame {
-        msec: 5792
-        hash: "b18d476cadc36e22dddc3185f595c123"
-    }
-    Frame {
-        msec: 5808
-        hash: "8cbc47555178c8ee355774eab17b4b19"
-    }
-    Frame {
-        msec: 5824
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5840
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5856
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5872
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5888
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5904
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5920
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5936
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5952
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5968
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 5984
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6000
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6016
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6032
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6048
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6064
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6080
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6096
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6112
-        hash: "e488fb76fb550fba51b95bee3fee80d5"
-    }
-    Frame {
-        msec: 6128
-        hash: "8c2fab0c73d1cfbeeb0ec937085d6b3b"
-    }
-    Frame {
-        msec: 6144
-        hash: "5d9353517177ef7c6314d8a65cb009ec"
-    }
-    Frame {
-        msec: 6160
-        hash: "ed8de504f7e2028cd369c1555314fd81"
-    }
-    Frame {
-        msec: 6176
-        hash: "8fe84d8badbe5bd08d097ba6bda10611"
-    }
-    Frame {
-        msec: 6192
-        hash: "d77419a55a3cf933505e793bb258e6af"
-    }
-    Frame {
-        msec: 6208
-        hash: "457ac82be02e2f5e08e51ccc78c94781"
-    }
-    Frame {
-        msec: 6224
-        hash: "e57e2852f065afff9c24c5bc9f29edee"
-    }
-    Frame {
-        msec: 6240
-        hash: "f72cd6ad3324936c3a18c264e23e05a9"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6256
-        hash: "a4bf7eae6fc7a05239d09421ae95304a"
-    }
-    Frame {
-        msec: 6272
-        hash: "423f3bd07df8bee25818644c07201a3c"
-    }
-    Frame {
-        msec: 6288
-        hash: "225e9c698424f287b9458b7839b4479b"
-    }
-    Frame {
-        msec: 6304
-        hash: "0f463db7e4acc184a4efb7b5e5c0d397"
-    }
-    Frame {
-        msec: 6320
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6336
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6352
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6368
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6384
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6400
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6416
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6432
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6448
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6464
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6480
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6496
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6512
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6528
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6544
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6560
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6576
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6592
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6608
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6624
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6640
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6656
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6672
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6688
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6704
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6720
-        image: "gridview2.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Key {
-        type: 6
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6752
-        hash: "b92ad1c3be35c46c0d12bf7701c56f23"
-    }
-    Frame {
-        msec: 6768
-        hash: "738f6bcc043d221488285c7e529b1d1c"
-    }
-    Frame {
-        msec: 6784
-        hash: "cb0a4e8e79372dd67e8ecfea2143a47c"
-    }
-    Frame {
-        msec: 6800
-        hash: "544d1825b36f4e7950c1a62b26c1fd9b"
-    }
-    Frame {
-        msec: 6816
-        hash: "df99396622342b4f092b0db34a224c3d"
-    }
-    Frame {
-        msec: 6832
-        hash: "47391f51e5df2249a6ca1f1f6e8e80e0"
-    }
-    Key {
-        type: 7
-        key: 16777237
-        modifiers: 536870912
-        text: "1f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6848
-        hash: "d8079a874ca18d00aeeb611effcbeb8b"
-    }
-    Frame {
-        msec: 6864
-        hash: "4cfd9264af6935aca425da75ebb2d7cc"
-    }
-    Frame {
-        msec: 6880
-        hash: "aee6547cb653cd2d56d07285d836149d"
-    }
-    Frame {
-        msec: 6896
-        hash: "969720f17eae51258e2e143e14bfa737"
-    }
-    Frame {
-        msec: 6912
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6928
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6944
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6960
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6976
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 6992
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7008
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7024
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7040
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7056
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7072
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7088
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7104
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7120
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7136
-        hash: "b6a0ee0b24737bc0045ff3fb68cfe3ad"
-    }
-    Frame {
-        msec: 7152
-        hash: "beeaec4b983c970ae448e33047dfdfea"
-    }
-    Frame {
-        msec: 7168
-        hash: "7c415ab1b7d8e25b71af75d3eec8ee4a"
-    }
-    Frame {
-        msec: 7184
-        hash: "8913037e57b9a6a58b68f2d6e69b1bd1"
-    }
-    Frame {
-        msec: 7200
-        hash: "19e59e9409fdaf90ccf75606b58688b7"
-    }
-    Frame {
-        msec: 7216
-        hash: "1ae71ef5b1006f637bd8df0769af65a6"
-    }
-    Frame {
-        msec: 7232
-        hash: "1f0aa8b368b2dbccafd54b923d8cce95"
-    }
-    Frame {
-        msec: 7248
-        hash: "c5079fb25a8c80a995d7aa5fbbd91428"
-    }
-    Frame {
-        msec: 7264
-        hash: "59f41220fa5d23db298c9e94f115c17b"
-    }
-    Frame {
-        msec: 7280
-        hash: "48259dfe8b266d9e7f50b187be98c3cb"
-    }
-    Frame {
-        msec: 7296
-        hash: "f7554552598351c3b8dfcbe3ebc32b3b"
-    }
-    Frame {
-        msec: 7312
-        hash: "219e9cd84d7e5c5c0e6cb80100aa3ab5"
-    }
-    Frame {
-        msec: 7328
-        hash: "5578e870ee8ce00bce5a59bb25e3d0a9"
-    }
-    Frame {
-        msec: 7344
-        hash: "4d9cebbf750c03380694245e0e22ab94"
-    }
-    Frame {
-        msec: 7360
-        hash: "a60a8032e97ed0a3caa05012c1283de5"
-    }
-    Frame {
-        msec: 7376
-        hash: "3bee20b349a7e9d67f7770ede6da8673"
-    }
-    Frame {
-        msec: 7392
-        hash: "d8c34576c25fb8b5e4fa12680ac32e99"
-    }
-    Frame {
-        msec: 7408
-        hash: "cd1360aa7db7c3b2f2012dfc44de2198"
-    }
-    Frame {
-        msec: 7424
-        hash: "cd82782f63c9a7d21d51b3440c2f038b"
-    }
-    Frame {
-        msec: 7440
-        hash: "e59061967a841aa45607c0828b687527"
-    }
-    Frame {
-        msec: 7456
-        hash: "01962406c9aaf1aa8bf3ab49e30ddf5f"
-    }
-    Frame {
-        msec: 7472
-        hash: "5a5732a568189e598c7985ee806bc67e"
-    }
-    Frame {
-        msec: 7488
-        hash: "54775aed3a6283c1fa330d65de5bc70c"
-    }
-    Frame {
-        msec: 7504
-        hash: "66640b4a5c1e68924b25de24e3c3f008"
-    }
-    Frame {
-        msec: 7520
-        hash: "76999d3125f20ba47dbdff38ee722a8a"
-    }
-    Frame {
-        msec: 7536
-        hash: "5159c81533bee8825cff11910bcb90dc"
-    }
-    Frame {
-        msec: 7552
-        hash: "ac0295495345987d1e000f6bb2436927"
-    }
-    Frame {
-        msec: 7568
-        hash: "d56b4a04f1d2835a0852ea20e8e2f451"
-    }
-    Frame {
-        msec: 7584
-        hash: "ae41fe23e2ab508d7642973c0d9d35b0"
-    }
-    Frame {
-        msec: 7600
-        hash: "730ca01fbee6ec4928715ec52773c06c"
-    }
-    Frame {
-        msec: 7616
-        hash: "ad1fa52c617a2b119d61eb9fb7d58a82"
-    }
-    Frame {
-        msec: 7632
-        hash: "c74321a822b515a393e8e218bd45e8e3"
-    }
-    Frame {
-        msec: 7648
-        hash: "a9e2f3bee1d47166204c74bdf90cd8c8"
-    }
-    Frame {
-        msec: 7664
-        hash: "e10d4bf08980ea7d079a2f359ee62b95"
-    }
-    Frame {
-        msec: 7680
-        image: "gridview2.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "9f0ba6051e684e54ff4e36d980a7e600"
-    }
-    Frame {
-        msec: 7712
-        hash: "aa6268d8d7fb3d2b91db3e225e8c818a"
-    }
-    Frame {
-        msec: 7728
-        hash: "8e547e55279b1929f42bf51e753f142e"
-    }
-    Frame {
-        msec: 7744
-        hash: "5386c71f8d6701379e177f161d714da2"
-    }
-    Frame {
-        msec: 7760
-        hash: "a184e9e6012c72fc1aeaed9f98b0fb1e"
-    }
-    Frame {
-        msec: 7776
-        hash: "777a6b70ca77c45e2e5e3914cc328dcb"
-    }
-    Frame {
-        msec: 7792
-        hash: "424f73f25a1e91126f951838d45adc3b"
-    }
-    Frame {
-        msec: 7808
-        hash: "3f7f2eb6b9a5d19fbfcd700baf566dfb"
-    }
-    Frame {
-        msec: 7824
-        hash: "c3c4c72b25c2295b82a5fd7454942f77"
-    }
-    Frame {
-        msec: 7840
-        hash: "3b35e93d3eb9d28c5c03d6d353f805d2"
-    }
-    Frame {
-        msec: 7856
-        hash: "5dcad019a1c0eaaab381a7602e1914ff"
-    }
-    Frame {
-        msec: 7872
-        hash: "602a5c569555767413bf445af44c744f"
-    }
-    Frame {
-        msec: 7888
-        hash: "3e9facab95dae772f695b6f7c5175063"
-    }
-    Frame {
-        msec: 7904
-        hash: "0921220ec36ca7b25eaae699872a2006"
-    }
-    Frame {
-        msec: 7920
-        hash: "1d5fa7fd630af62bcc805bdc6686df37"
-    }
-    Frame {
-        msec: 7936
-        hash: "165c02de63604aa118d9f8995e6b45af"
-    }
-    Frame {
-        msec: 7952
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 7968
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 7984
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8000
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8016
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8032
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8048
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8064
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8080
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8096
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8112
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8128
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8144
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8160
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8176
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8192
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8208
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8224
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8240
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8256
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8272
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8288
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8304
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8320
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8336
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8352
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8368
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8384
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8400
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8416
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8432
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8448
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8464
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8480
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8496
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8512
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8528
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8544
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8560
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8576
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8592
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8608
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8624
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8640
-        image: "gridview2.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8672
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8688
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8704
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 8720
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8736
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8752
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8768
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8784
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8800
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8816
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8832
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8848
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8864
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8880
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8896
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8912
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8928
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8944
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8960
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8976
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 8992
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 9008
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-    Frame {
-        msec: 9024
-        hash: "33d81c39d16c6a326012499796e50e03"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/gridview.qml b/tests/auto/declarative/visual/qmlgraphicsgridview/gridview.qml
deleted file mode 100644
index f8782a5..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/gridview.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 300; height: 400; color: "black"
-
-    ListModel {
-        id: appModel
-        ListElement { lColor: "red" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "green" }
-        ListElement { lColor: "blue" }
-        ListElement { lColor: "purple" }
-        ListElement { lColor: "orange" }
-        ListElement { lColor: "pink" }
-        ListElement { lColor: "brown" }
-        ListElement { lColor: "gray" }
-        ListElement { lColor: "red" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "green" }
-        ListElement { lColor: "blue" }
-        ListElement { lColor: "purple" }
-        ListElement { lColor: "orange" }
-        ListElement { lColor: "pink" }
-        ListElement { lColor: "brown" }
-        ListElement { lColor: "gray" }
-    }
-
-    Component {
-        id: appDelegate
-        Item {
-            width: 100; height: 100
-            Rectangle {
-                color: lColor; x: 4; y: 4
-            width: 92; height: 92
-        }
-        }
-    }
-
-    Component {
-        id: appHighlight
-        Rectangle { width: 100; height: 100; color: "white"; z: 3000 }
-    }
-
-    GridView {
-        anchors.fill: parent
-        cellWidth: 100; cellHeight: 100; cacheBuffer: 200
-        model: appModel; delegate: appDelegate
-        highlight: appHighlight
-        focus: true
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/gridview2.qml b/tests/auto/declarative/visual/qmlgraphicsgridview/gridview2.qml
deleted file mode 100644
index 81d06cf..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/gridview2.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 300; height: 400; color: "black"
-
-    ListModel {
-        id: appModel
-        ListElement { lColor: "red" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "green" }
-        ListElement { lColor: "blue" }
-        ListElement { lColor: "purple" }
-        ListElement { lColor: "orange" }
-        ListElement { lColor: "pink" }
-        ListElement { lColor: "brown" }
-        ListElement { lColor: "gray" }
-        ListElement { lColor: "red" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "green" }
-        ListElement { lColor: "blue" }
-        ListElement { lColor: "purple" }
-        ListElement { lColor: "orange" }
-        ListElement { lColor: "pink" }
-        ListElement { lColor: "brown" }
-        ListElement { lColor: "gray" }
-        ListElement { lColor: "red" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "green" }
-    }
-
-    Component {
-        id: appDelegate
-        Item {
-            width: 100; height: 100
-            Rectangle {
-                color: lColor; x: 4; y: 4
-                width: 92; height: 92
-            }
-        }
-    }
-
-    GridView {
-        id: gridView; anchors.fill: parent
-        cellWidth: 100; cellHeight: 100; cacheBuffer: 200
-        model: appModel; delegate: appDelegate; focus: true
-        keyNavigationWraps: true
-
-        flickableData: [
-            Rectangle {
-                color: "transparent"; border.color: "white"; border.width: 8; z: 3000
-                height: 100; width: 100; x: 4; y: 4
-                x: EaseFollow { source: gridView.currentItem.x; velocity: 500 }
-                y: EaseFollow { source: gridView.currentItem.y; velocity: 500 }
-            }
-        ]
-    }
-
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.0.png b/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.0.png
deleted file mode 100644
index 7321d95..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.1.png b/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.1.png
deleted file mode 100644
index 49d2a5a..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.2.png b/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.2.png
deleted file mode 100644
index 6fe14b7..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.qml b/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.qml
deleted file mode 100644
index d766dc6..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.qml
+++ /dev/null
@@ -1,775 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "b4df49cbd7cf972af9879399808f6c53"
-    }
-    Frame {
-        msec: 32
-        hash: "43c0ad5826e8058260951f063f0851ab"
-    }
-    Frame {
-        msec: 48
-        hash: "55eb2c9939514338e7ef58c9276fc223"
-    }
-    Frame {
-        msec: 64
-        hash: "6a1bbb91bf450547d6100b6e61a98f6d"
-    }
-    Frame {
-        msec: 80
-        hash: "bdb9b8cab70c72d99aba830eb8e8913b"
-    }
-    Frame {
-        msec: 96
-        hash: "71a0e046bc68183b830df9dafd8fa147"
-    }
-    Frame {
-        msec: 112
-        hash: "e7228e0ed77e05c661282c2d2fe88b3e"
-    }
-    Frame {
-        msec: 128
-        hash: "93a4c3e501b05844f687a2dd1754aad2"
-    }
-    Frame {
-        msec: 144
-        hash: "1856ac86313c16bf4874130d9a48ff45"
-    }
-    Frame {
-        msec: 160
-        hash: "3637d8dad4f44c938f91b0800bd9fb2f"
-    }
-    Frame {
-        msec: 176
-        hash: "c5ace4ede38d29363d69c6b4b2f9349f"
-    }
-    Frame {
-        msec: 192
-        hash: "a5d832d02f4a635052817654df90caba"
-    }
-    Frame {
-        msec: 208
-        hash: "9ebf8bea8abe7ac209d47214a87f8fc0"
-    }
-    Frame {
-        msec: 224
-        hash: "35b8f5cb18284867be8d27d601394a2b"
-    }
-    Frame {
-        msec: 240
-        hash: "a2c4a6063f219af6f2b29b2d21a4265d"
-    }
-    Frame {
-        msec: 256
-        hash: "27f25ace7b8e93c55638ed99f49b821c"
-    }
-    Frame {
-        msec: 272
-        hash: "4f6511bfbbd8113195a7597eb6dfb219"
-    }
-    Frame {
-        msec: 288
-        hash: "6a696159cdbb51a67064c600124535d1"
-    }
-    Frame {
-        msec: 304
-        hash: "6cd667eb352256dbb728532634e7ffd0"
-    }
-    Frame {
-        msec: 320
-        hash: "28fa16c8936bf86a8426ded306aa2b8c"
-    }
-    Frame {
-        msec: 336
-        hash: "061fecdb88733e3e51c5823571bc4d19"
-    }
-    Frame {
-        msec: 352
-        hash: "f64530f638b3d18d56593e0b7c884f5d"
-    }
-    Frame {
-        msec: 368
-        hash: "8530cf40739890dc7401fad65a6325bf"
-    }
-    Frame {
-        msec: 384
-        hash: "0abc555552e7256dbc424b2eac5c95f2"
-    }
-    Frame {
-        msec: 400
-        hash: "64aeae59a8c958dfc62d92636b2f5217"
-    }
-    Frame {
-        msec: 416
-        hash: "3e0f50f5bee017220b129d06b2acde2c"
-    }
-    Frame {
-        msec: 432
-        hash: "e676c01ff2e35bdfe674be67d49945b1"
-    }
-    Frame {
-        msec: 448
-        hash: "bc060b480aab94fd440fd27f5beb7383"
-    }
-    Frame {
-        msec: 464
-        hash: "79c79f723de72315e63da8a7cbe1b425"
-    }
-    Frame {
-        msec: 480
-        hash: "7bf93c2697af75d0f862a47d57cd6a7f"
-    }
-    Frame {
-        msec: 496
-        hash: "7641b9e233f4aabd99bcd985ce1d51ae"
-    }
-    Frame {
-        msec: 512
-        hash: "b596a28cb67617d37408bd25d947d088"
-    }
-    Frame {
-        msec: 528
-        hash: "f2c5cdf15c27b05c0ea97675ddc41757"
-    }
-    Frame {
-        msec: 544
-        hash: "eae5eb8c41a1d6d75446618518490f20"
-    }
-    Frame {
-        msec: 560
-        hash: "0be5e9a6d857fe1a262524801c69490d"
-    }
-    Frame {
-        msec: 576
-        hash: "65478b8c4d932c10924f70462a662254"
-    }
-    Frame {
-        msec: 592
-        hash: "7b034f3c98e8eb38eec11cf3c2aa0804"
-    }
-    Frame {
-        msec: 608
-        hash: "5bbc8eed41500ccbc820cfb38794232f"
-    }
-    Frame {
-        msec: 624
-        hash: "1b39d555ca8932b40efd769c4ba74d3f"
-    }
-    Frame {
-        msec: 640
-        hash: "f9a38e12becbce400191e22f1d22427c"
-    }
-    Frame {
-        msec: 656
-        hash: "cbc27c72517d76edfc2d3692cd83f151"
-    }
-    Frame {
-        msec: 672
-        hash: "4a883a5aed05f0bbcefcefea6ef56df6"
-    }
-    Frame {
-        msec: 688
-        hash: "7a30ea30c0619c87c96bcaba916c64df"
-    }
-    Frame {
-        msec: 704
-        hash: "33cd0797b6d229592ed53117fcaaa898"
-    }
-    Frame {
-        msec: 720
-        hash: "21178ef9366c8a65ecb9e21d584573b0"
-    }
-    Frame {
-        msec: 736
-        hash: "fe75beac8681fdac8a2b79c9c7267128"
-    }
-    Frame {
-        msec: 752
-        hash: "df26a23d394e053417de86309683c5e0"
-    }
-    Frame {
-        msec: 768
-        hash: "411594a1ed7c351cb872e0a6f3081b1b"
-    }
-    Frame {
-        msec: 784
-        hash: "b4b639f204cfed9e1fec872e4de115c2"
-    }
-    Frame {
-        msec: 800
-        hash: "4d801e2f4848399c011d60264720b912"
-    }
-    Frame {
-        msec: 816
-        hash: "4f28c7b154853ff78cdefb5a5ac9d2b7"
-    }
-    Frame {
-        msec: 832
-        hash: "cc6d4283b0d7bf9f579637575d5e1fef"
-    }
-    Frame {
-        msec: 848
-        hash: "8edc371d23d01be547990074b5e640af"
-    }
-    Frame {
-        msec: 864
-        hash: "874845d7178e6cd8369f21379060f561"
-    }
-    Frame {
-        msec: 880
-        hash: "98fb6d79990775385603fb1a50ab5186"
-    }
-    Frame {
-        msec: 896
-        hash: "d15539efc27baabb5a74f464b152d266"
-    }
-    Frame {
-        msec: 912
-        hash: "fc44d091d6689e8870162a6d29b6d287"
-    }
-    Frame {
-        msec: 928
-        hash: "a3c964f4bf524e22092b1650df43375a"
-    }
-    Frame {
-        msec: 944
-        hash: "ca203fd630ec1eadea37cf36bd30ba40"
-    }
-    Frame {
-        msec: 960
-        image: "particles.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "2e0630818c04fc6c259eec8561c645cd"
-    }
-    Frame {
-        msec: 992
-        hash: "a7b1f6305ddcf4a338e1a96ea31a5341"
-    }
-    Frame {
-        msec: 1008
-        hash: "23a5013a8f9407d06ac6fd0c1e961743"
-    }
-    Frame {
-        msec: 1024
-        hash: "9de73decddaab4269bd33efdb21278a3"
-    }
-    Frame {
-        msec: 1040
-        hash: "7582c26b45dd11c262f51b387af89cb2"
-    }
-    Frame {
-        msec: 1056
-        hash: "650e0d395f1d1f2ddda8711089d85511"
-    }
-    Frame {
-        msec: 1072
-        hash: "9ff84e81219aa6bb7ab534b2a47a3930"
-    }
-    Frame {
-        msec: 1088
-        hash: "11e255273e8ca4716047fb52636f0c3e"
-    }
-    Frame {
-        msec: 1104
-        hash: "b2fcbefd13db3c765183b1eefc2ca0bc"
-    }
-    Frame {
-        msec: 1120
-        hash: "7150aff523c0d480702f6a326699cb65"
-    }
-    Frame {
-        msec: 1136
-        hash: "63886c15107a2a7d639069cd81c3cd07"
-    }
-    Frame {
-        msec: 1152
-        hash: "1ec1fc30bbb5f43a1d6d36bce345f569"
-    }
-    Frame {
-        msec: 1168
-        hash: "34060cbc31ce1fbf406cbb595312c609"
-    }
-    Frame {
-        msec: 1184
-        hash: "6f3a04c7f411785956e640aa630f7ac4"
-    }
-    Frame {
-        msec: 1200
-        hash: "d7bdb7e170b6f193eaf4b07c01b4dc6b"
-    }
-    Frame {
-        msec: 1216
-        hash: "6ca02c0d9cfeb4b1932f7ad1feac9850"
-    }
-    Frame {
-        msec: 1232
-        hash: "d446c7b185361de5c615a17ac1fee607"
-    }
-    Frame {
-        msec: 1248
-        hash: "bc2faf5b7b2972f155954e4e685e80ae"
-    }
-    Frame {
-        msec: 1264
-        hash: "2bf26cedc76aea4a6d9744b7dd935db8"
-    }
-    Frame {
-        msec: 1280
-        hash: "accbee9d0f8cf73ef72aa7bfb49b3fa5"
-    }
-    Frame {
-        msec: 1296
-        hash: "933eb2e46f42e212bdfc515d30f663d3"
-    }
-    Frame {
-        msec: 1312
-        hash: "7495318c893dbb22771b53e93c7614e8"
-    }
-    Frame {
-        msec: 1328
-        hash: "894fe23c1b3543451293c047b640c4bb"
-    }
-    Frame {
-        msec: 1344
-        hash: "9b7179ef059ee82ca4a383f536f47a42"
-    }
-    Frame {
-        msec: 1360
-        hash: "5ec1a5bfac2473efdcad7dba0da4015c"
-    }
-    Frame {
-        msec: 1376
-        hash: "2bd64528e83260a80e7f2843e2c34a19"
-    }
-    Frame {
-        msec: 1392
-        hash: "16bf64a9bf6b4bc09b108c65d074b5f2"
-    }
-    Frame {
-        msec: 1408
-        hash: "c33eaa717ba63655f375499058b1be55"
-    }
-    Frame {
-        msec: 1424
-        hash: "d080f4591f9fd59745bf850525590849"
-    }
-    Frame {
-        msec: 1440
-        hash: "921585c88ec133c83c07650745bb4441"
-    }
-    Frame {
-        msec: 1456
-        hash: "f037b28137b22a0c91fc71fc6626475a"
-    }
-    Frame {
-        msec: 1472
-        hash: "e10b3c432a230d5509c2fa7df48b56c9"
-    }
-    Frame {
-        msec: 1488
-        hash: "ac02c7b7e68ee8cfad1fe556020e93d8"
-    }
-    Frame {
-        msec: 1504
-        hash: "12d59e70dedfa0c741afed9b98cb9a3a"
-    }
-    Frame {
-        msec: 1520
-        hash: "a9aa635ccde26829d7e1cdc29fcce8d1"
-    }
-    Frame {
-        msec: 1536
-        hash: "f571b3da827b884ad036dade8ad2fe37"
-    }
-    Frame {
-        msec: 1552
-        hash: "1ffa8d7512e9001cbc78b28451133b44"
-    }
-    Frame {
-        msec: 1568
-        hash: "2ef4b10f2eafd71dfde15f7f00e923c6"
-    }
-    Frame {
-        msec: 1584
-        hash: "09b3bc232a134eae5ae14c0336f508ba"
-    }
-    Frame {
-        msec: 1600
-        hash: "ebadb5c6b4986c865f7f8ef232680b7e"
-    }
-    Frame {
-        msec: 1616
-        hash: "26621991073510e9a95e3b208e3ee56e"
-    }
-    Frame {
-        msec: 1632
-        hash: "f18e97f13c06f3c5368edf851f19f401"
-    }
-    Frame {
-        msec: 1648
-        hash: "3c322dbbf5ecfe1de56595dcb7d949e1"
-    }
-    Frame {
-        msec: 1664
-        hash: "50058d1bb992a6d0601c9d5490149936"
-    }
-    Frame {
-        msec: 1680
-        hash: "4cc78f56f13478ec21a4a0d6b22f956b"
-    }
-    Frame {
-        msec: 1696
-        hash: "d765cd86560dff3faa5a3c902512c74c"
-    }
-    Frame {
-        msec: 1712
-        hash: "ad983068c2149b0c06da3b89a5d94d24"
-    }
-    Frame {
-        msec: 1728
-        hash: "e6da7260001771fc00c472bccae641fe"
-    }
-    Frame {
-        msec: 1744
-        hash: "71778ad8a61ecb0f78f7234ecf0d1d97"
-    }
-    Frame {
-        msec: 1760
-        hash: "6b2209ea5f7f17c2cd868986f0c907d9"
-    }
-    Frame {
-        msec: 1776
-        hash: "6513c82829ef7e7c9461dcf5b50f675f"
-    }
-    Frame {
-        msec: 1792
-        hash: "0172c5bdf96c8bceab25a6c82bdbe527"
-    }
-    Frame {
-        msec: 1808
-        hash: "64b53bf1c1988d3a799b564089f8e63f"
-    }
-    Frame {
-        msec: 1824
-        hash: "a1bdea4771ec9719cfe88f4e827bd005"
-    }
-    Frame {
-        msec: 1840
-        hash: "263de376cee2ba7701a7ca116bc1be81"
-    }
-    Frame {
-        msec: 1856
-        hash: "9795dada7f09d7d4d40df858dea8bc70"
-    }
-    Frame {
-        msec: 1872
-        hash: "85ea4c63fc31f79423cb509f6c6d4faa"
-    }
-    Frame {
-        msec: 1888
-        hash: "c86d8c4460d1e3c2f26b723dc628fe84"
-    }
-    Frame {
-        msec: 1904
-        hash: "6bf6ef1fd377bfcf0b93baa7f28e1d3d"
-    }
-    Frame {
-        msec: 1920
-        image: "particles.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "57b8a48bed9375b74391950c28e611da"
-    }
-    Frame {
-        msec: 1952
-        hash: "70203655bc832998529071d7f665ecbe"
-    }
-    Frame {
-        msec: 1968
-        hash: "9ab9808d495f907a255d85fbd82491e2"
-    }
-    Frame {
-        msec: 1984
-        hash: "297570136b058ba43e883b0aef20d82f"
-    }
-    Frame {
-        msec: 2000
-        hash: "0c2f15ce83e2d961ec36299b13890709"
-    }
-    Frame {
-        msec: 2016
-        hash: "6d57b6dcb1dbfa35245d79ef36ca49b2"
-    }
-    Frame {
-        msec: 2032
-        hash: "12a71804fd71991706d8a39b676d1628"
-    }
-    Frame {
-        msec: 2048
-        hash: "f6a9e1b0b498fc576f3eadeb86c08fe9"
-    }
-    Frame {
-        msec: 2064
-        hash: "051c2ed34cbef82d44aec4841a33f086"
-    }
-    Frame {
-        msec: 2080
-        hash: "12b89590b20fff8d6c94dde40a5d6185"
-    }
-    Frame {
-        msec: 2096
-        hash: "7a29cd11ddb042203465a9522ff951ce"
-    }
-    Frame {
-        msec: 2112
-        hash: "4853f364261ab8e1c9d35cfe42efb385"
-    }
-    Frame {
-        msec: 2128
-        hash: "7149ab3ed649cac9cf662be7c434056f"
-    }
-    Frame {
-        msec: 2144
-        hash: "bbe199700474dda156355d31ac09be39"
-    }
-    Frame {
-        msec: 2160
-        hash: "a3f3fbbe844b8c6fb8cb8bbcc17120e3"
-    }
-    Frame {
-        msec: 2176
-        hash: "e9a04cfe9e8c50f74978fbd4ecce536a"
-    }
-    Frame {
-        msec: 2192
-        hash: "0df1d4211f770cdd7b8a98ea476c6f42"
-    }
-    Frame {
-        msec: 2208
-        hash: "a6837afb43663b9473db2378b1a9f989"
-    }
-    Frame {
-        msec: 2224
-        hash: "691ea67f3b84b8dda449c2a8e86b1087"
-    }
-    Frame {
-        msec: 2240
-        hash: "16d18947637c63662b9a502c493f06ec"
-    }
-    Frame {
-        msec: 2256
-        hash: "8f9207d404da08706e150f3b64d0088d"
-    }
-    Frame {
-        msec: 2272
-        hash: "48ad430e38cdc34845a834cfb9ea70ef"
-    }
-    Frame {
-        msec: 2288
-        hash: "1252cfb294ae99c40b03dd021160553f"
-    }
-    Frame {
-        msec: 2304
-        hash: "b1d5e752fbe03c95ee0dc7bbdf6fb9f6"
-    }
-    Frame {
-        msec: 2320
-        hash: "2282cb42ef0c812ba27e33ed0f962a84"
-    }
-    Frame {
-        msec: 2336
-        hash: "42fc82c8d40d383b3cf31a741a4358c5"
-    }
-    Frame {
-        msec: 2352
-        hash: "368c1ffa2deb1911929f1769e31c8017"
-    }
-    Frame {
-        msec: 2368
-        hash: "8693bdbde404e36970943ac6b650ca00"
-    }
-    Frame {
-        msec: 2384
-        hash: "57609613c336029b60da428d48842a4e"
-    }
-    Frame {
-        msec: 2400
-        hash: "b61dafe9e87421d3fcf8cb9ff0e7a41b"
-    }
-    Frame {
-        msec: 2416
-        hash: "c8c34d1d82bef418ef97f52cb9773cf4"
-    }
-    Frame {
-        msec: 2432
-        hash: "aa756c09717dc02e81e76511b4c58f60"
-    }
-    Frame {
-        msec: 2448
-        hash: "96e75c5ce1b5393f6cc46fbbe0a67689"
-    }
-    Frame {
-        msec: 2464
-        hash: "fb5febae411f43a6cd218b03b36f5018"
-    }
-    Frame {
-        msec: 2480
-        hash: "889870fa67784261e7b73b7d0a53324e"
-    }
-    Frame {
-        msec: 2496
-        hash: "fb124d4ebee6457f2137f07954619912"
-    }
-    Frame {
-        msec: 2512
-        hash: "258ae87f78805c555e0ed802c5123eeb"
-    }
-    Frame {
-        msec: 2528
-        hash: "2e730872c37f118a03864d23ebf7bab3"
-    }
-    Frame {
-        msec: 2544
-        hash: "381386302f210932bc7d44247a48f13c"
-    }
-    Frame {
-        msec: 2560
-        hash: "306f8e6d183eb080da3375d65f2491f0"
-    }
-    Frame {
-        msec: 2576
-        hash: "39862f236aabf362d0a07ba64eb212e1"
-    }
-    Frame {
-        msec: 2592
-        hash: "57452ecfea80ebd4d9fd23f8efbb34f2"
-    }
-    Frame {
-        msec: 2608
-        hash: "64bd12d4f6e32f19abef79289673c2fe"
-    }
-    Frame {
-        msec: 2624
-        hash: "56340d636f4df7e5f68e84c1d8388429"
-    }
-    Frame {
-        msec: 2640
-        hash: "795cd97d4be294fa6157f23793861ec3"
-    }
-    Frame {
-        msec: 2656
-        hash: "4be9fd5314ad6721a0ddf5a5dc51ccee"
-    }
-    Frame {
-        msec: 2672
-        hash: "3349b775c329db022bf0414b9ed57466"
-    }
-    Frame {
-        msec: 2688
-        hash: "587b7070836063f9d138c4a4ee8da8bb"
-    }
-    Frame {
-        msec: 2704
-        hash: "5bb078819bef7695c9af1bd4b544a26a"
-    }
-    Frame {
-        msec: 2720
-        hash: "799c05999713e8b29f7d2917f515d2c2"
-    }
-    Frame {
-        msec: 2736
-        hash: "41bb926661acd8e21300f4933734748a"
-    }
-    Frame {
-        msec: 2752
-        hash: "2ead23d38a2f1834c7688a9657d9d7cc"
-    }
-    Frame {
-        msec: 2768
-        hash: "196309eac81adea21630dda19947ef5e"
-    }
-    Frame {
-        msec: 2784
-        hash: "cf414b2004712581f11f27890745c761"
-    }
-    Frame {
-        msec: 2800
-        hash: "6b2a6837da878fa8f3811b2045e098b1"
-    }
-    Frame {
-        msec: 2816
-        hash: "7390cfdef1d4bc194b86854b1947f15d"
-    }
-    Frame {
-        msec: 2832
-        hash: "9e4543fcf65a56edfbcaf46805343071"
-    }
-    Frame {
-        msec: 2848
-        hash: "3a886e2ed813eb7d44d0cd67eb5dee31"
-    }
-    Frame {
-        msec: 2864
-        hash: "625baed6cbf3a58b32060810be53d0b6"
-    }
-    Frame {
-        msec: 2880
-        image: "particles.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "484666ad104cee644c6a7e8ec0c4b10e"
-    }
-    Frame {
-        msec: 2912
-        hash: "41abe2e2d92b293407141d0333d7d04a"
-    }
-    Frame {
-        msec: 2928
-        hash: "953c03834bd3b50798b77c0c6bb0f4a8"
-    }
-    Frame {
-        msec: 2944
-        hash: "a076463868003c62df3ee5147ffd4660"
-    }
-    Frame {
-        msec: 2960
-        hash: "b389b5c9ed31816dd562a8f1332d28c9"
-    }
-    Frame {
-        msec: 2976
-        hash: "246706829939a2619d64fad63e424fdb"
-    }
-    Frame {
-        msec: 2992
-        hash: "d5e644f16bde52c566191a054a1279e5"
-    }
-    Frame {
-        msec: 3008
-        hash: "10b2e99d2e08939b75c24a6bbf481858"
-    }
-    Frame {
-        msec: 3024
-        hash: "732a7bb0009f394f0039e09594362c75"
-    }
-    Frame {
-        msec: 3040
-        hash: "261f38ce42a8a8c86daadd497ecfad07"
-    }
-    Frame {
-        msec: 3056
-        hash: "8b66ae6261db386d6c4e88d0146db090"
-    }
-    Frame {
-        msec: 3072
-        hash: "dc8dba79e4466059c29725084cf801bb"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/particles.qml b/tests/auto/declarative/visual/qmlgraphicsparticles/particles.qml
deleted file mode 100644
index 2d481c9..0000000
--- a/tests/auto/declarative/visual/qmlgraphicsparticles/particles.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 640; height: 480; color: "black"
-
-    Particles { id:particlesAnotEmitting
-        y:60; width: 260; height:30; source: "star.png";
-        lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
-        velocity:30; velocityDeviation:10; emissionRate: 0
-        ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
-    }
-    Particles { id:particlesA
-        y:0; width: 260; height:30; source: "star.png";
-        lifeSpan:1000; count: 50; angle:70; angleDeviation:36;
-        velocity:30; velocityDeviation:10; emissionRate: 10
-        ParticleMotionWander { yvariance:5; xvariance:30; pace:100 }
-    }
-
-    Particles { id:particlesB
-        y:280; x:180; width:1; height:1; lifeSpan:1000; source: "star.png"
-        count: 100; angle:270; angleDeviation:45; velocity:50; velocityDeviation:30;
-        emissionRate: 0
-        ParticleMotionGravity { yattractor: 1000; xattractor:0; acceleration:25 }
-    }
-
-        Timer { running: true; interval: 1000; repeat: true; onTriggered: particlesB.burst(200, 2000); }
-
-    Column{
-        x: 340;
-        Repeater{
-            model: 5
-            delegate: Component{
-                Item{
-                    width: 100; height: 100
-                    Rectangle{
-                        color: "blue"
-                        width: 2; height: 2;
-                        x: 49; y:49;
-                    }
-                    Particles{
-                        x: 50; y:50; width: 0; height: 0;
-                        fadeInDuration: 0; fadeOutDuration: 0
-                        lifeSpan: 1000; lifeSpanDeviation:0;
-                        source: "star.png"
-                        count: -1; emissionRate: 120;
-                        emissionVariance: index/2;
-                        velocity: 250; velocityDeviation: 0;
-                        angle: 0; angleDeviation: 0;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/star.png b/tests/auto/declarative/visual/qmlgraphicsparticles/star.png
deleted file mode 100644
index defbde5..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicsparticles/star.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.0.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.0.png
deleted file mode 100644
index 18c8a9e..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.1.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.1.png
deleted file mode 100644
index e86acb4..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.2.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.2.png
deleted file mode 100644
index 17990b7..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.3.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.3.png
deleted file mode 100644
index 18c8a9e..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.4.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.4.png
deleted file mode 100644
index 18c8a9e..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.5.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.5.png
deleted file mode 100644
index 8636f8f..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.6.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.6.png
deleted file mode 100644
index fa7c4b6..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.qml b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.qml
deleted file mode 100644
index b8ff925..0000000
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.qml
+++ /dev/null
@@ -1,2303 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 32
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 48
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 64
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 80
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 96
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 112
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 128
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 144
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 160
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 176
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 192
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 208
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 224
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 240
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 256
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 272
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 288
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 304
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 320
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 336
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 352
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 368
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 384
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 400
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 416
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 432
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 448
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 464
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 480
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 496
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 512
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 528
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 544
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 560
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 576
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 592
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 608
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 624
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 640
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 656
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 672
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 688
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 704
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 720
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 736
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 752
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 768
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 784
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 800
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 816
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 832
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 848
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 864
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 880
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 896
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 912
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 928
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 944
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 960
-        image: "test-pathview-2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 992
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 1008
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 1024
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 1040
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 562; y: 250
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1056
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 557; y: 251
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1072
-        hash: "1ed6fa56736cf7cb2f99b5d362974463"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 544; y: 254
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1088
-        hash: "24f3dd6c49dd8b19cd0c387409405e18"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 534; y: 258
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1104
-        hash: "08c828e7fdfba4252fa7a9fb06eb728e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 511; y: 267
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1120
-        hash: "b76110faf8520f52128b5e1af8f2b838"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 499; y: 272
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1136
-        hash: "5f56acb5f39ac291cc8e73c0268df214"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 473; y: 281
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1152
-        hash: "840ee0c0d8ea94e22e783a15687f979d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 459; y: 285
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1168
-        hash: "69827007bbdf5a360ccc34a016315113"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 446; y: 288
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1184
-        hash: "2437beb8f9cb39b125611fb186bad820"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 433; y: 290
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 433; y: 290
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1200
-        hash: "df07c389b26fc191234c70b97bfaa432"
-    }
-    Frame {
-        msec: 1216
-        hash: "8d4e23f4e91d0e0df9d87c3171d5971f"
-    }
-    Frame {
-        msec: 1232
-        hash: "dd79837aefeabffa7184be07f2a98969"
-    }
-    Frame {
-        msec: 1248
-        hash: "2d9bb2aaf4b882902f090ff0c89053c8"
-    }
-    Frame {
-        msec: 1264
-        hash: "b1ec9adbb026d8002a7f16fe9a8d56d2"
-    }
-    Frame {
-        msec: 1280
-        hash: "43b23d6e1aeeb36350c3530650e9156f"
-    }
-    Frame {
-        msec: 1296
-        hash: "03f231597c4d5010ee71c74217f2483d"
-    }
-    Frame {
-        msec: 1312
-        hash: "8607c7412a5a1b4ea1522f28c465a83e"
-    }
-    Frame {
-        msec: 1328
-        hash: "671e80e290bec997eb36320ff76fdccf"
-    }
-    Frame {
-        msec: 1344
-        hash: "5f6717112bd45e5ebe194e0f87d12be6"
-    }
-    Frame {
-        msec: 1360
-        hash: "ca8e33c7a5428d70ae13cb64e5098a48"
-    }
-    Frame {
-        msec: 1376
-        hash: "86e60eb395f66bbaa1ec07b3e07013c0"
-    }
-    Frame {
-        msec: 1392
-        hash: "342fa6ddc02d0a793e97a79ba8882415"
-    }
-    Frame {
-        msec: 1408
-        hash: "a907fbcc47807d4eb6d66e070ea7f2de"
-    }
-    Frame {
-        msec: 1424
-        hash: "04838f8b495bed6d050cbe54d00aad31"
-    }
-    Frame {
-        msec: 1440
-        hash: "d485534916473ea6c4612230c5a95421"
-    }
-    Frame {
-        msec: 1456
-        hash: "1d3da7cc5b9120724645558584f2f0f3"
-    }
-    Frame {
-        msec: 1472
-        hash: "c271f057d5f1745e910b2b407c52a4f3"
-    }
-    Frame {
-        msec: 1488
-        hash: "050d1814a9ced514db6cfd2732eb76be"
-    }
-    Frame {
-        msec: 1504
-        hash: "cfcd21aadfe3fd611caad83920fb2432"
-    }
-    Frame {
-        msec: 1520
-        hash: "472f900ef8eef74522da3338ce7fa93e"
-    }
-    Frame {
-        msec: 1536
-        hash: "f9d892a81c6ba3b9fc4c6e76082d4fa7"
-    }
-    Frame {
-        msec: 1552
-        hash: "a3febe1c3c4585e25a410a91cc34c1fa"
-    }
-    Frame {
-        msec: 1568
-        hash: "74cd765c9d9a6fb243070b4a56a07e87"
-    }
-    Frame {
-        msec: 1584
-        hash: "469d324abbef017a99bc587bfae622b3"
-    }
-    Frame {
-        msec: 1600
-        hash: "6054ff6e658f0a5f5e313f0a724d9610"
-    }
-    Frame {
-        msec: 1616
-        hash: "67cee7ebe428c9d35f1f28274f3049d5"
-    }
-    Frame {
-        msec: 1632
-        hash: "ce6c3a1dd726eacbba6306e56121beef"
-    }
-    Frame {
-        msec: 1648
-        hash: "a7d5f703c98c0c8cd32b189a79e1fd05"
-    }
-    Frame {
-        msec: 1664
-        hash: "41cfd9982767ba904843fb73a5a0ed71"
-    }
-    Frame {
-        msec: 1680
-        hash: "388dcde17a820800237d1185372d889f"
-    }
-    Frame {
-        msec: 1696
-        hash: "3bd72585388f04d55900ccd345cd576e"
-    }
-    Frame {
-        msec: 1712
-        hash: "0e5c63b066f2b70000eca7f3aaa3a195"
-    }
-    Frame {
-        msec: 1728
-        hash: "15199f3e9f00afc76279b5bbffb78d92"
-    }
-    Frame {
-        msec: 1744
-        hash: "596ad681a3b96afbc284e3af5fd173cb"
-    }
-    Frame {
-        msec: 1760
-        hash: "e5ae2d0245fc5d74c6ea3f7dddd1ca2a"
-    }
-    Frame {
-        msec: 1776
-        hash: "0d152716f9ebe5f0fae3f5cabb20630f"
-    }
-    Frame {
-        msec: 1792
-        hash: "74afbfa464b0d19b53432fa4d5ea2804"
-    }
-    Frame {
-        msec: 1808
-        hash: "c8aa3f4738a8c07cdf2450a24c885ce6"
-    }
-    Frame {
-        msec: 1824
-        hash: "2e4e0003f1b1cb10593075862b972643"
-    }
-    Frame {
-        msec: 1840
-        hash: "acea518c7da7330ae78daf5fbfd1a423"
-    }
-    Frame {
-        msec: 1856
-        hash: "0b8d4ea6947b522c6aa9a32d9f16723e"
-    }
-    Frame {
-        msec: 1872
-        hash: "19f2aef82586817ef574a70865060997"
-    }
-    Frame {
-        msec: 1888
-        hash: "115565eb0ba3024dbf15d00ed242c389"
-    }
-    Frame {
-        msec: 1904
-        hash: "7e59425c85acf93f5bf55e139c148737"
-    }
-    Frame {
-        msec: 1920
-        image: "test-pathview-2.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "ce96601476cf55f665bef09bb1b038e2"
-    }
-    Frame {
-        msec: 1952
-        hash: "dc6eaacefe37fc709ac0bef99110f796"
-    }
-    Frame {
-        msec: 1968
-        hash: "82ad9b84425bd8e385524cb052a8fdd4"
-    }
-    Frame {
-        msec: 1984
-        hash: "608000b44ade998e225010d5ea562316"
-    }
-    Frame {
-        msec: 2000
-        hash: "ec6b4d519b7bafcf5293c2b5e6585007"
-    }
-    Frame {
-        msec: 2016
-        hash: "9895792ffa929ba6fc600949f11766b6"
-    }
-    Frame {
-        msec: 2032
-        hash: "0d2b27c9ca22520b269f93c90de08df4"
-    }
-    Frame {
-        msec: 2048
-        hash: "78a61e4565db709215b419aa56f6efab"
-    }
-    Frame {
-        msec: 2064
-        hash: "d6f2aebed062d093c00b27a52f0b14b8"
-    }
-    Frame {
-        msec: 2080
-        hash: "21b7a438ad1e835b84e5576e52abbe84"
-    }
-    Frame {
-        msec: 2096
-        hash: "703e32f43e9a71b8677d6839a0eafe06"
-    }
-    Frame {
-        msec: 2112
-        hash: "b04bea8af558de4120723fc5abd0f36c"
-    }
-    Frame {
-        msec: 2128
-        hash: "ac8e91c3b55e058ce8ff08ad6e3af9b6"
-    }
-    Frame {
-        msec: 2144
-        hash: "54846c8c70b232d05ff5eaf144f6f7d3"
-    }
-    Frame {
-        msec: 2160
-        hash: "52281806f5c80512b4bcab7f61139f74"
-    }
-    Frame {
-        msec: 2176
-        hash: "a352657ff34ef8962162c00647df343a"
-    }
-    Frame {
-        msec: 2192
-        hash: "3a0b12d1f8bf5cae8ac06289dd30d52a"
-    }
-    Frame {
-        msec: 2208
-        hash: "2c6bbcd05719f69b9a67be18de2084a6"
-    }
-    Frame {
-        msec: 2224
-        hash: "ab091484522587412b0e8aceeb8987ce"
-    }
-    Frame {
-        msec: 2240
-        hash: "13682b0d45bcbad0f011d08899085b1d"
-    }
-    Frame {
-        msec: 2256
-        hash: "3c5d6f82eafd1b04edfbcbffbdbe2177"
-    }
-    Frame {
-        msec: 2272
-        hash: "151803d70b7c3327df32c8602fcd677a"
-    }
-    Frame {
-        msec: 2288
-        hash: "78613cec5364fe3f0df84188793d8eac"
-    }
-    Frame {
-        msec: 2304
-        hash: "fc05a3cad43af35230c5ba89f6fd13c5"
-    }
-    Frame {
-        msec: 2320
-        hash: "9f826733b300c89eeb80452129505e8b"
-    }
-    Frame {
-        msec: 2336
-        hash: "8565efc5c1fb1bdf5629e3bd495bb611"
-    }
-    Frame {
-        msec: 2352
-        hash: "3b8f6e8c526ab8cce170277c378a5a69"
-    }
-    Frame {
-        msec: 2368
-        hash: "07db3bc0ab19e0ca829e89558bacf1a1"
-    }
-    Frame {
-        msec: 2384
-        hash: "ed8843024c6ac28a8c782839b362149c"
-    }
-    Frame {
-        msec: 2400
-        hash: "381a9f6564c090613aa2cd0476b95210"
-    }
-    Frame {
-        msec: 2416
-        hash: "c3fabd891fa8e27fd71df175db383667"
-    }
-    Frame {
-        msec: 2432
-        hash: "9b441792fdaa9ba9d340fc0c6a9c11bd"
-    }
-    Frame {
-        msec: 2448
-        hash: "3209c9ba69fa016370e3d56e7e1e37a4"
-    }
-    Frame {
-        msec: 2464
-        hash: "34da0a01453fbb2571b370257fd35f8e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 591; y: 245
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 588; y: 245
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2480
-        hash: "32e6204a07c493d0a0f9f50773fe8f32"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 585; y: 245
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2496
-        hash: "2a1814768ae500ba9c24bc2e3e4de1d5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 582; y: 245
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2512
-        hash: "7cf6e3c52d12d590beafd061979a49cb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 574; y: 245
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 565; y: 246
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2528
-        hash: "c66c36642ab7f6c32b45e27de38d23b6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 553; y: 246
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2544
-        hash: "6e003380cc6fd303ae3b499863225ba5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 538; y: 246
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2560
-        hash: "a790259cea2c247493be58c6018435b9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 523; y: 247
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 523; y: 247
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2576
-        hash: "e6cce7468a27b5063821df8dbaa15c18"
-    }
-    Frame {
-        msec: 2592
-        hash: "ff8386cbe89aeac184f4a75237ef4a14"
-    }
-    Frame {
-        msec: 2608
-        hash: "1a11a90853b025837b991be40efb78f8"
-    }
-    Frame {
-        msec: 2624
-        hash: "17da10de7e2d2fcf125207e2873bdee8"
-    }
-    Frame {
-        msec: 2640
-        hash: "dfbda435d05903cc3a31f4f8f31e8985"
-    }
-    Frame {
-        msec: 2656
-        hash: "1f3753e809099f20c6289f150a096935"
-    }
-    Frame {
-        msec: 2672
-        hash: "9454afc9d70103e1f1c00eb0ad2ca534"
-    }
-    Frame {
-        msec: 2688
-        hash: "860ab90e2421a0c8faab304915b5e6f2"
-    }
-    Frame {
-        msec: 2704
-        hash: "600258507426a8c3c89e3591ee9328f1"
-    }
-    Frame {
-        msec: 2720
-        hash: "0795a607b893da2bdc0970195f3039fd"
-    }
-    Frame {
-        msec: 2736
-        hash: "e300b9109e242d85537fc3f4461eaf8e"
-    }
-    Frame {
-        msec: 2752
-        hash: "dbb84b38e2bda694f210f133dc133180"
-    }
-    Frame {
-        msec: 2768
-        hash: "2455e9de47da4db88eef35fea1dc2abe"
-    }
-    Frame {
-        msec: 2784
-        hash: "5f0c3d7e089c921a68813a48f0fd8844"
-    }
-    Frame {
-        msec: 2800
-        hash: "e6d9e7d0fdc724a6a1804bc94629cab4"
-    }
-    Frame {
-        msec: 2816
-        hash: "d177183bcbaa27ad061fd88bd037277d"
-    }
-    Frame {
-        msec: 2832
-        hash: "78dd13fa6367abd14374462d89a3d066"
-    }
-    Frame {
-        msec: 2848
-        hash: "41d12e4c362ccc99a1a04b3a09f0e68c"
-    }
-    Frame {
-        msec: 2864
-        hash: "5112700bf72aacb176e63ef054fce244"
-    }
-    Frame {
-        msec: 2880
-        image: "test-pathview-2.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "0257e67512c62ffc42a272fd304e4ed3"
-    }
-    Frame {
-        msec: 2912
-        hash: "42cd0a98aa0f3768cf77aac284072fa9"
-    }
-    Frame {
-        msec: 2928
-        hash: "811d27f89b0c434fc49e4280f85c2f27"
-    }
-    Frame {
-        msec: 2944
-        hash: "887406c50c666d08e4d98c040efae9a5"
-    }
-    Frame {
-        msec: 2960
-        hash: "27e10fa9d82920c7f761465501d44564"
-    }
-    Frame {
-        msec: 2976
-        hash: "ba67dbe0010ba2aae3ca100886b11553"
-    }
-    Frame {
-        msec: 2992
-        hash: "8064db575e2c74c0faf7782adc527a08"
-    }
-    Frame {
-        msec: 3008
-        hash: "b7fd5446ad957610ab853e0c597b9a36"
-    }
-    Frame {
-        msec: 3024
-        hash: "092b53eb50e91d74db7899328899cfd3"
-    }
-    Frame {
-        msec: 3040
-        hash: "0346065ad603b41db9365987ebe81586"
-    }
-    Frame {
-        msec: 3056
-        hash: "705083f27a338fea544c9806f0d8fcb3"
-    }
-    Frame {
-        msec: 3072
-        hash: "fc29b4888e26deec4c983e487b9bd058"
-    }
-    Frame {
-        msec: 3088
-        hash: "0ff734e0509908eba292c1814f677e5b"
-    }
-    Frame {
-        msec: 3104
-        hash: "7181d9011ddd3ad49ee95fac2e146b12"
-    }
-    Frame {
-        msec: 3120
-        hash: "4478b07b0331bb30e60f23ee74475f73"
-    }
-    Frame {
-        msec: 3136
-        hash: "514aa7a4b1230ae1701004f479eeb5f2"
-    }
-    Frame {
-        msec: 3152
-        hash: "56e51f8f36e0f1a5a4b6b21c41151375"
-    }
-    Frame {
-        msec: 3168
-        hash: "f58216f12e507a91482ded5372f960c7"
-    }
-    Frame {
-        msec: 3184
-        hash: "18e8675ca5ea7ade7e32b29f1632e1ff"
-    }
-    Frame {
-        msec: 3200
-        hash: "13ec0166cc7dd82042e596739c598a1e"
-    }
-    Frame {
-        msec: 3216
-        hash: "5cebf9afa912b17ac3161619d238e5da"
-    }
-    Frame {
-        msec: 3232
-        hash: "f096b191e347b7e2eab51b6adc1a5aac"
-    }
-    Frame {
-        msec: 3248
-        hash: "81cffc13a615ab673172912760863c08"
-    }
-    Frame {
-        msec: 3264
-        hash: "e89c7acfc07bc0eb6e9740d545400064"
-    }
-    Frame {
-        msec: 3280
-        hash: "e681f06f57d43a38acb29a3cb45e4384"
-    }
-    Frame {
-        msec: 3296
-        hash: "945bfe7808fb620dc3f7ad887183244c"
-    }
-    Frame {
-        msec: 3312
-        hash: "4d1fc53701adce4e4af87c32e6c5a8de"
-    }
-    Frame {
-        msec: 3328
-        hash: "c42bbf27e800558fab33bc6e9a0f36b9"
-    }
-    Frame {
-        msec: 3344
-        hash: "5f48f59812b17a9be466f0601f0ed0df"
-    }
-    Frame {
-        msec: 3360
-        hash: "f3a3f645115077b7aeb66465280b7a16"
-    }
-    Frame {
-        msec: 3376
-        hash: "d1c295b2157001ff1020515f4b2aceaa"
-    }
-    Frame {
-        msec: 3392
-        hash: "e5f364e0e4bd75dd04280f6b6f48b8ba"
-    }
-    Frame {
-        msec: 3408
-        hash: "f439df4b5907ba0201c0dad934115721"
-    }
-    Frame {
-        msec: 3424
-        hash: "2e7eb0e999792f3aa87c63865f68d26b"
-    }
-    Frame {
-        msec: 3440
-        hash: "45d3ccb3b03adc8323445207d2dca502"
-    }
-    Frame {
-        msec: 3456
-        hash: "c345f92a25406e33256bfe47dc7f72f3"
-    }
-    Frame {
-        msec: 3472
-        hash: "dcb2663d27d644c0b50aa7386aa9d488"
-    }
-    Frame {
-        msec: 3488
-        hash: "ebe4b9eaf39676bcdd968f8517efa222"
-    }
-    Frame {
-        msec: 3504
-        hash: "deb3e3e6fdf8fe18de907f88822538e8"
-    }
-    Frame {
-        msec: 3520
-        hash: "30e8ab0e6cf32a45190c4b29e458d858"
-    }
-    Frame {
-        msec: 3536
-        hash: "059e6f57c2c78a25ab8b515c878231f9"
-    }
-    Frame {
-        msec: 3552
-        hash: "fa7621f338ae187edac5cb69b22e64b3"
-    }
-    Frame {
-        msec: 3568
-        hash: "bf287cbb0963fc8e575cd95808e1983d"
-    }
-    Frame {
-        msec: 3584
-        hash: "741dc09e0ae13d6afbdaae701cb699ef"
-    }
-    Frame {
-        msec: 3600
-        hash: "8dd52007df5585aed4b9737a8314a74d"
-    }
-    Frame {
-        msec: 3616
-        hash: "ddcd945a3a4467d8dd0b7a4197aafed5"
-    }
-    Frame {
-        msec: 3632
-        hash: "015deb5f228fa2f77978315ccca4f4c8"
-    }
-    Frame {
-        msec: 3648
-        hash: "e1c960e966873e694837fd98f231cfcb"
-    }
-    Frame {
-        msec: 3664
-        hash: "17a177d37b427d9488e36d19b345a397"
-    }
-    Frame {
-        msec: 3680
-        hash: "d4aded08d04f79d50536ecf539c0583d"
-    }
-    Frame {
-        msec: 3696
-        hash: "72890e9b84acf9df6083e23ab9270da1"
-    }
-    Frame {
-        msec: 3712
-        hash: "313859115de570f8d41f67c4db7cf49e"
-    }
-    Frame {
-        msec: 3728
-        hash: "98918d73b6d6b375db53470dd72c7b35"
-    }
-    Frame {
-        msec: 3744
-        hash: "ff706517a4d257747893c11a3b059926"
-    }
-    Frame {
-        msec: 3760
-        hash: "73e62664a31232c1a349568c8da6ce64"
-    }
-    Frame {
-        msec: 3776
-        hash: "bed046c6eae90d267e859cd76d3eacfb"
-    }
-    Frame {
-        msec: 3792
-        hash: "4643348fc1b47f0d3244e7e717247953"
-    }
-    Frame {
-        msec: 3808
-        hash: "0305bfc35b5618da19e9eabb3c1b5d2b"
-    }
-    Frame {
-        msec: 3824
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 3840
-        image: "test-pathview-2.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 3872
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 3888
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 3904
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 3920
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 3936
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 3952
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 3968
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 3984
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4000
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4016
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 305; y: 280
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4032
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 305; y: 281
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4048
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 306; y: 281
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4064
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 308; y: 281
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4080
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 310; y: 282
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4096
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 313; y: 283
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 317; y: 283
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4112
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 321; y: 283
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4128
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 328; y: 283
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4144
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 341; y: 283
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 347; y: 282
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4160
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 360; y: 281
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4176
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 385; y: 282
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4192
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 433; y: 292
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 486; y: 307
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4208
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 538; y: 322
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4224
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 588; y: 336
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4240
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 620; y: 343
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 677; y: 354
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4256
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 733; y: 362
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4272
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 785; y: 365
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4288
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 830; y: 365
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 861; y: 357
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4304
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 879; y: 346
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4320
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 888; y: 335
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4336
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 893; y: 326
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 893; y: 326
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4352
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4368
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4384
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4400
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4416
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4432
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4448
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4464
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4480
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4496
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4512
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4528
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4544
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4560
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4576
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4592
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4608
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4624
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4640
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4656
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4672
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4688
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4704
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4720
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4736
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4752
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4768
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4784
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4800
-        image: "test-pathview-2.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4832
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4848
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4864
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4880
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4896
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4912
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4928
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4944
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4960
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4976
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 4992
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5008
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5024
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5040
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5056
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5072
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5088
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5104
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5120
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5136
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5152
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5168
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5184
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5200
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5216
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5232
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5248
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5264
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5280
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5296
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5312
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5328
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5344
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5360
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Frame {
-        msec: 5376
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 242; y: 280
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5392
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 244; y: 280
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 246; y: 281
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5408
-        hash: "754f9689239e6154a762a6a1e9e0131b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 251; y: 282
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5424
-        hash: "ba4e61f8de7f078cfc1e5fc8dd3c65f3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 261; y: 282
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5440
-        hash: "00389598468dbd1a90cada9543715770"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 300; y: 279
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5456
-        hash: "ab020b76bc23554e176bd3a59712c3bc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 350; y: 282
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5472
-        hash: "96483c5c51cc851c55166b13617b12ea"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 417; y: 290
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5488
-        hash: "1ad679d1400a0f185a380a75840c6a50"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 500; y: 300
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 585; y: 309
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5504
-        hash: "b5ed338d402d16a831c0595311350789"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 669; y: 315
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 669; y: 315
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5520
-        hash: "bf51ff7b6f264170d9c5700559e03262"
-    }
-    Frame {
-        msec: 5536
-        hash: "0d62681e661aad7b67b880e13afeb4de"
-    }
-    Frame {
-        msec: 5552
-        hash: "3371739270c458d4ce8a08f2e12d4ba5"
-    }
-    Frame {
-        msec: 5568
-        hash: "db271b0ebfa0172d8386ac9afde9f296"
-    }
-    Frame {
-        msec: 5584
-        hash: "d64c064ab483c9636b2736c67b2b1a48"
-    }
-    Frame {
-        msec: 5600
-        hash: "20a8ccb0ff1c0d5ff606b343f1a32bff"
-    }
-    Frame {
-        msec: 5616
-        hash: "5547bb0a4d6b51733829597b9d8d141a"
-    }
-    Frame {
-        msec: 5632
-        hash: "1135177a5cb24aa11372653985599775"
-    }
-    Frame {
-        msec: 5648
-        hash: "5031ea6ca8ec59155edb7c1f10f77925"
-    }
-    Frame {
-        msec: 5664
-        hash: "7c5c1015af23f32c002a24a880201883"
-    }
-    Frame {
-        msec: 5680
-        hash: "c1dd3ad07775d74d2e81b830d07543e0"
-    }
-    Frame {
-        msec: 5696
-        hash: "ad6651f644be3c6f1ebf340809fe516f"
-    }
-    Frame {
-        msec: 5712
-        hash: "1eb69541ae67d9d9193b86a6592de4c2"
-    }
-    Frame {
-        msec: 5728
-        hash: "c9c40ec693a421243804efb8f99707f4"
-    }
-    Frame {
-        msec: 5744
-        hash: "832884a5102069ca085001156a04e74e"
-    }
-    Frame {
-        msec: 5760
-        image: "test-pathview-2.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "df0c7d73069e1087d34c7a703197cb2a"
-    }
-    Frame {
-        msec: 5792
-        hash: "4a8e1f548e48b86140aa1a5fa8b17bd3"
-    }
-    Frame {
-        msec: 5808
-        hash: "f79f47e3a0c16a1361fa287a594c4673"
-    }
-    Frame {
-        msec: 5824
-        hash: "c26da5ed2e4055f5c172b48163560143"
-    }
-    Frame {
-        msec: 5840
-        hash: "0e971cd0c2e25d52b689d4b22509a7d9"
-    }
-    Frame {
-        msec: 5856
-        hash: "40bae0ef35772c476cddccc034b7c872"
-    }
-    Frame {
-        msec: 5872
-        hash: "ce1fc0faae5e313bc21e024dac3097da"
-    }
-    Frame {
-        msec: 5888
-        hash: "ba614972cec0e9fa47cb09f1ba77eefb"
-    }
-    Frame {
-        msec: 5904
-        hash: "2266ae29490ae01ff8a2329956c124a7"
-    }
-    Frame {
-        msec: 5920
-        hash: "debae0194926cb5af0a8f7fdfb7f08b8"
-    }
-    Frame {
-        msec: 5936
-        hash: "10a7111367cfcbe24063b9ee6975e4fc"
-    }
-    Frame {
-        msec: 5952
-        hash: "3c0f9e0603e33506f31ff6569d007b97"
-    }
-    Frame {
-        msec: 5968
-        hash: "69d92abce3f093cc7610bd715a7396fa"
-    }
-    Frame {
-        msec: 5984
-        hash: "befad9882a6af920684d94c74d8d7f78"
-    }
-    Frame {
-        msec: 6000
-        hash: "10632052ac53504bd36687ba7aa7ebc1"
-    }
-    Frame {
-        msec: 6016
-        hash: "af4053320c12cbcc6f0e7e321dba1c83"
-    }
-    Frame {
-        msec: 6032
-        hash: "4560c5fcef9d630d744e80dc46947b9d"
-    }
-    Frame {
-        msec: 6048
-        hash: "012ee780ed98131321aaa241a2599c5f"
-    }
-    Frame {
-        msec: 6064
-        hash: "25d3fb9d44bc2be3b86a5451d8ffaec2"
-    }
-    Frame {
-        msec: 6080
-        hash: "09c5cbff81a5c9fae40ec29b936ee52b"
-    }
-    Frame {
-        msec: 6096
-        hash: "27a0b1d2ea2fc8729e5542c6462c1815"
-    }
-    Frame {
-        msec: 6112
-        hash: "c6f347c942aed190ebee077b5bd0888c"
-    }
-    Frame {
-        msec: 6128
-        hash: "029d78844bd72acb310bd2887489bdf0"
-    }
-    Frame {
-        msec: 6144
-        hash: "3af16ab398f1515e90e81460ac061a74"
-    }
-    Frame {
-        msec: 6160
-        hash: "0151ca050722645e2899919f79f6aa0b"
-    }
-    Frame {
-        msec: 6176
-        hash: "eead61dfc1851bc9fba3b4bca510af6a"
-    }
-    Frame {
-        msec: 6192
-        hash: "da822098c606556ad8683316f5a821ab"
-    }
-    Frame {
-        msec: 6208
-        hash: "ee47fc2bcf2264f5799a76308fbf2b65"
-    }
-    Frame {
-        msec: 6224
-        hash: "81b208b84ca887d35cda79b5c0e4cd4e"
-    }
-    Frame {
-        msec: 6240
-        hash: "fd52ccaddcb79a2dfa12bb57640a3610"
-    }
-    Frame {
-        msec: 6256
-        hash: "b187e8fcd0a777657a733c260aaaf557"
-    }
-    Frame {
-        msec: 6272
-        hash: "2cfe47a86bf9df3704002288b6249ed9"
-    }
-    Frame {
-        msec: 6288
-        hash: "b79b81706f62789a15557ac1a017addf"
-    }
-    Frame {
-        msec: 6304
-        hash: "77a84eb447fe7034783678f6903ff76d"
-    }
-    Frame {
-        msec: 6320
-        hash: "82529385d3072812fa737193914ece1c"
-    }
-    Frame {
-        msec: 6336
-        hash: "a7ccfa6c8aebf2016f2f12045d2f1abe"
-    }
-    Frame {
-        msec: 6352
-        hash: "486d38e7ea6a5cf13f2ecd1c6919ece7"
-    }
-    Frame {
-        msec: 6368
-        hash: "6c5bd377d2289ec88f969e961f1dcf65"
-    }
-    Frame {
-        msec: 6384
-        hash: "92e20565fbcf8c7c9a67726f3a0dd41f"
-    }
-    Frame {
-        msec: 6400
-        hash: "0fcd995a26262b875440d0d9f03d16c4"
-    }
-    Frame {
-        msec: 6416
-        hash: "f679759eddca739764bd2816ee53ef31"
-    }
-    Frame {
-        msec: 6432
-        hash: "adffd1da9b750df3d9f48820a2235c0b"
-    }
-    Frame {
-        msec: 6448
-        hash: "e0f8730acf7a6802ade228f95d700c08"
-    }
-    Frame {
-        msec: 6464
-        hash: "2c5209c3715bb9f39ac23a8b32a17ef9"
-    }
-    Frame {
-        msec: 6480
-        hash: "741694ef4cbd3477a8e13ba89fc9d607"
-    }
-    Frame {
-        msec: 6496
-        hash: "e88d6a61acb3fde6b441c2e718a0c2fb"
-    }
-    Frame {
-        msec: 6512
-        hash: "b91863800e6ab967616d68def388d5d5"
-    }
-    Frame {
-        msec: 6528
-        hash: "4c28a99236c351a2e3e3301c0b5bbba8"
-    }
-    Frame {
-        msec: 6544
-        hash: "6affb524d7f63fef94d29629a148be04"
-    }
-    Frame {
-        msec: 6560
-        hash: "f7823d25adf673117f010738d977b787"
-    }
-    Frame {
-        msec: 6576
-        hash: "dfb930f3db30ec53c8e9a1aa5d9056e4"
-    }
-    Frame {
-        msec: 6592
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6608
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6624
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6640
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6656
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6672
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6688
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6704
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6720
-        image: "test-pathview-2.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6752
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6768
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6784
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6800
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6816
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6832
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6848
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6864
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6880
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6896
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6912
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6928
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6944
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6960
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6976
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 6992
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7008
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7024
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7040
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7056
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7072
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7088
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7104
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7120
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7136
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7152
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7168
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7184
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7200
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7216
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7232
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7248
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-    Frame {
-        msec: 7264
-        hash: "57269234dc01b66f6aeb841c328c06b5"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.0.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.0.png
deleted file mode 100644
index 442ba9f..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.1.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.1.png
deleted file mode 100644
index a9ff20f..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.2.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.2.png
deleted file mode 100644
index 157bb99..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.3.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.3.png
deleted file mode 100644
index 8c49acb..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.4.png b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.4.png
deleted file mode 100644
index eb2bf54..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.qml b/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.qml
deleted file mode 100644
index 8cff5c6..0000000
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.qml
+++ /dev/null
@@ -1,1495 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 32
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 48
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 64
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 80
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 96
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 112
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 128
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 144
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 160
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 176
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 192
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 208
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 224
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 240
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 256
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 272
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 288
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 304
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 320
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 336
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 352
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 368
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 384
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 400
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 416
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 432
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 448
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 464
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 480
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 496
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 512
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 528
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 544
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 560
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 576
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 592
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 608
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 624
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 640
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 656
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 672
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 688
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 704
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 720
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 736
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 752
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 768
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 784
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 800
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 816
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 832
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 848
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 864
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 880
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 896
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 912
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 928
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 944
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 960
-        image: "test-pathview.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 992
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1008
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1024
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1040
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1056
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1072
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1088
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1104
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1120
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1136
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 734; y: 177
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1152
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Frame {
-        msec: 1168
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 732; y: 177
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1184
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 726; y: 179
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1200
-        hash: "89bb697bb7b7fab38d3ff56e23e43959"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 716; y: 183
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1216
-        hash: "42c141399fda1cbb2ae117788d87092a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 700; y: 190
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1232
-        hash: "4d44343eb91838e3eb73e2e5326b5ac2"
-    }
-    Frame {
-        msec: 1248
-        hash: "4d44343eb91838e3eb73e2e5326b5ac2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 677; y: 200
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1264
-        hash: "15aaccb4f7961a4e3e6fe57260779d00"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 651; y: 209
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1280
-        hash: "5628fa3ac9893f5c9690013aad4b881a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 619; y: 219
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1296
-        hash: "384db58b6de773ac39ae81e6af4d547d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 579; y: 229
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1312
-        hash: "2a15a27a138b9d3d646b827d026e8843"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 535; y: 237
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 535; y: 237
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1328
-        hash: "098176f48a148eb2bc5ef67c307baa1c"
-    }
-    Frame {
-        msec: 1344
-        hash: "f838ab4301bf9d3106cec529f855cecd"
-    }
-    Frame {
-        msec: 1360
-        hash: "9725322067a04f83717b059d4970d610"
-    }
-    Frame {
-        msec: 1376
-        hash: "3605cfbebc3a9eb4460efb2d4b9b6da2"
-    }
-    Frame {
-        msec: 1392
-        hash: "4503a368d8db25d112503dbc3934541d"
-    }
-    Frame {
-        msec: 1408
-        hash: "80894cc06c82264bf527398ea235da12"
-    }
-    Frame {
-        msec: 1424
-        hash: "d4f9b90f886fc667309b33c9a296410c"
-    }
-    Frame {
-        msec: 1440
-        hash: "889d01025cff679b61bff182a1ac9cbc"
-    }
-    Frame {
-        msec: 1456
-        hash: "6147bc4455e7cb5ae55cd47be8dc4ad6"
-    }
-    Frame {
-        msec: 1472
-        hash: "ddd10a294eb6b19698c4e9fe4f1508fe"
-    }
-    Frame {
-        msec: 1488
-        hash: "748e8d9c1971f6258acee5133b7f114b"
-    }
-    Frame {
-        msec: 1504
-        hash: "1ef3f32ec9ef950588266bacbe3554a0"
-    }
-    Frame {
-        msec: 1520
-        hash: "57853ff47b65aba9e76f90b2efec4f8f"
-    }
-    Frame {
-        msec: 1536
-        hash: "3985fea21d89d223c1461d5e96364c76"
-    }
-    Frame {
-        msec: 1552
-        hash: "cb5f6a3caeeaed12e91efe43867f2c1f"
-    }
-    Frame {
-        msec: 1568
-        hash: "cdd4176776d5969373e0fc9a117e3c87"
-    }
-    Frame {
-        msec: 1584
-        hash: "3bac2e7506472db2ae11734240f1c3f4"
-    }
-    Frame {
-        msec: 1600
-        hash: "bb572659d79ebda7134c039e40cf2633"
-    }
-    Frame {
-        msec: 1616
-        hash: "e610181bfa17a85281f9c7417088f04f"
-    }
-    Frame {
-        msec: 1632
-        hash: "eb23ff021909589b6d8ce47ebff2c3ed"
-    }
-    Frame {
-        msec: 1648
-        hash: "c321dda3878c4b97cc63246c47368224"
-    }
-    Frame {
-        msec: 1664
-        hash: "6a65cdfd50e1455356040d4cbc09905e"
-    }
-    Frame {
-        msec: 1680
-        hash: "f2a44b12e4e5bae8283c4d227949e4e8"
-    }
-    Frame {
-        msec: 1696
-        hash: "55418d661f3257b5b79a7dbb172b5b70"
-    }
-    Frame {
-        msec: 1712
-        hash: "483d7111c86951918746d6ebe0dd9655"
-    }
-    Frame {
-        msec: 1728
-        hash: "85c83ac3a294a9320bb04a6721ecf7d5"
-    }
-    Frame {
-        msec: 1744
-        hash: "0d658b897b8e03397ddd8ffe475c2fc0"
-    }
-    Frame {
-        msec: 1760
-        hash: "6ed9d7ea344b3c1b1d9196ee36b2f89a"
-    }
-    Frame {
-        msec: 1776
-        hash: "6a1e7f6c03769c2c88e6343fb6c1a2a4"
-    }
-    Frame {
-        msec: 1792
-        hash: "9dc51f46e072eac4494d7318f2ecb39b"
-    }
-    Frame {
-        msec: 1808
-        hash: "59e833981c3fcd8a71f4a16d1c454b3a"
-    }
-    Frame {
-        msec: 1824
-        hash: "29b953efdda00548d8cf6fb49fa60d13"
-    }
-    Frame {
-        msec: 1840
-        hash: "fd4611f703f94ebefcc64781993ca85c"
-    }
-    Frame {
-        msec: 1856
-        hash: "aa4789ede618963157b40f099ce84987"
-    }
-    Frame {
-        msec: 1872
-        hash: "8a326b46ec536a67626ee2d2bc06aa9f"
-    }
-    Frame {
-        msec: 1888
-        hash: "011ff557672d47591e4f0f5c5ee418f1"
-    }
-    Frame {
-        msec: 1904
-        hash: "d72fba857bdc128ddcb5971b86aadcb2"
-    }
-    Frame {
-        msec: 1920
-        image: "test-pathview.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "49182b7ae9ef5fb4b9234969abd05960"
-    }
-    Frame {
-        msec: 1952
-        hash: "53de60f682574b7a9e6ffaee175fc9ff"
-    }
-    Frame {
-        msec: 1968
-        hash: "2de74fe5b8848c5c781b796146871f45"
-    }
-    Frame {
-        msec: 1984
-        hash: "33c87146d8c24dd9c2271d16a8ff5b53"
-    }
-    Frame {
-        msec: 2000
-        hash: "fdb29214e20d744d9776907061f50358"
-    }
-    Frame {
-        msec: 2016
-        hash: "8c7c920416c9b775e790e6da24c32927"
-    }
-    Frame {
-        msec: 2032
-        hash: "86b456059e4701379447fffaf9e072f0"
-    }
-    Frame {
-        msec: 2048
-        hash: "f92cc485ee03ef5bce3c4cdc35e00318"
-    }
-    Frame {
-        msec: 2064
-        hash: "2fad58883cb20273cfd79ebca345a66d"
-    }
-    Frame {
-        msec: 2080
-        hash: "84505ebbc6e12817f11f64aa6f61a0bf"
-    }
-    Frame {
-        msec: 2096
-        hash: "ded83cacb89838cc0f3ba14bcc69b66b"
-    }
-    Frame {
-        msec: 2112
-        hash: "5bb37e75bb45eaa6067c604b83ae13d7"
-    }
-    Frame {
-        msec: 2128
-        hash: "4ee9e4c90c40dbc25a0ce884d9c2c37f"
-    }
-    Frame {
-        msec: 2144
-        hash: "cb7148ff6f611038c29af36c8552b8c2"
-    }
-    Frame {
-        msec: 2160
-        hash: "a591d8cb42570272dd264d5f1ce595ab"
-    }
-    Frame {
-        msec: 2176
-        hash: "4e61657405d32dbcd39d3637f8af0958"
-    }
-    Frame {
-        msec: 2192
-        hash: "9c7c1411dd5d3c1c8fb78e63e14061fe"
-    }
-    Frame {
-        msec: 2208
-        hash: "ae83a37e99b578fa0872ed6bc2776bc0"
-    }
-    Frame {
-        msec: 2224
-        hash: "e8cb5a8a40c1e78c87c616f77d8de270"
-    }
-    Frame {
-        msec: 2240
-        hash: "9df093e4bcfa32be5924a0ca70bdaa3b"
-    }
-    Frame {
-        msec: 2256
-        hash: "40c358066d508143bee1446d12fe7b89"
-    }
-    Frame {
-        msec: 2272
-        hash: "a929ed6efc7fc68b38635f3c74242f52"
-    }
-    Frame {
-        msec: 2288
-        hash: "86ff721a3178b689ea47b6bc274a2b41"
-    }
-    Frame {
-        msec: 2304
-        hash: "ed1f680f6d05f54ceb75c9bae3a0716a"
-    }
-    Frame {
-        msec: 2320
-        hash: "3f09a565df2beb51f366a1b3fb6adfe9"
-    }
-    Frame {
-        msec: 2336
-        hash: "13468347bd26bab60f1db826fb17631c"
-    }
-    Frame {
-        msec: 2352
-        hash: "9f7d085fea5788a457098973f17c36cb"
-    }
-    Frame {
-        msec: 2368
-        hash: "4114b93246155b3434200831b2995330"
-    }
-    Frame {
-        msec: 2384
-        hash: "487171bd1430f74e3d51b5e215c34b5c"
-    }
-    Frame {
-        msec: 2400
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2416
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2432
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2448
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2464
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2480
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2496
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2512
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2528
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2544
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2560
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2576
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2592
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2608
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2624
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2640
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2656
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2672
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2688
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2704
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2720
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2736
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2752
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2768
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2784
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2800
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2816
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2832
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2848
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2864
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2880
-        image: "test-pathview.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2912
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2928
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2944
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2960
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2976
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 2992
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 3008
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 3024
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 3040
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 3056
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 3072
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 3088
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 728; y: 181
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3104
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 3120
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Frame {
-        msec: 3136
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 727; y: 181
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3152
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 723; y: 181
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3168
-        hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 717; y: 184
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3184
-        hash: "6dcec6cdaa35eba74607ba64d6ea2ec0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 705; y: 188
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3200
-        hash: "16b7b4847fe86b25d8d6136106a4c400"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 686; y: 197
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3216
-        hash: "d946d55b19c99fa25bf1c04f2b71026a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 661; y: 207
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3232
-        hash: "96f40f5071365cde769c733fd1ef5a24"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 626; y: 221
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3248
-        hash: "7004058b95b7eab3ebba5c80c0923982"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 582; y: 235
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3264
-        hash: "2c78880237c414182f97f1709f1eef0f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 532; y: 246
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3280
-        hash: "c90a15ec9f88008ca8b0ec0185444d71"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 532; y: 246
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3296
-        hash: "c90a15ec9f88008ca8b0ec0185444d71"
-    }
-    Frame {
-        msec: 3312
-        hash: "36461e2a4cd860cac32223b8ee73c657"
-    }
-    Frame {
-        msec: 3328
-        hash: "5f9b3ad9202fb02a4c6fea28c248ad22"
-    }
-    Frame {
-        msec: 3344
-        hash: "d0d23c4e1ddb2d9ffa0ecc38030ae15c"
-    }
-    Frame {
-        msec: 3360
-        hash: "8e2e2d3eaf557c453f34016b6614e495"
-    }
-    Frame {
-        msec: 3376
-        hash: "7402c747fa7276293a0a72d48d342782"
-    }
-    Frame {
-        msec: 3392
-        hash: "6090c30e4d722a32c083a25171fb11ff"
-    }
-    Frame {
-        msec: 3408
-        hash: "f770d940cf287fec4b0803f7310292a8"
-    }
-    Frame {
-        msec: 3424
-        hash: "558e4ce32df69357b70a8285b00fe347"
-    }
-    Frame {
-        msec: 3440
-        hash: "8814168503c9a72ea8d3fa1e503f33d9"
-    }
-    Frame {
-        msec: 3456
-        hash: "6f5513d22e545096fadc6f5c4112902e"
-    }
-    Frame {
-        msec: 3472
-        hash: "43f11d8ac16fd3e8199e555528817e14"
-    }
-    Frame {
-        msec: 3488
-        hash: "d64bafdbd26878a323dae918d5e0a36d"
-    }
-    Frame {
-        msec: 3504
-        hash: "1c70bdddfc3751ae3864f008170f8b06"
-    }
-    Frame {
-        msec: 3520
-        hash: "bb7a18691fcd371e9d382b5bba4a0573"
-    }
-    Frame {
-        msec: 3536
-        hash: "547e15f5dea2d9aa3ed44640b25028b9"
-    }
-    Frame {
-        msec: 3552
-        hash: "c11b86a256fac6be10b9a54564903d6f"
-    }
-    Frame {
-        msec: 3568
-        hash: "0ada2dc586894d5e37de2632d2b37b15"
-    }
-    Frame {
-        msec: 3584
-        hash: "0ae1a39ea196a0e734d80dbdea67b285"
-    }
-    Frame {
-        msec: 3600
-        hash: "3cb70e64f9ab8aad841326dc2d2f1615"
-    }
-    Frame {
-        msec: 3616
-        hash: "a8f8b5ff19df9163ea628b589b675a5e"
-    }
-    Frame {
-        msec: 3632
-        hash: "26fcc73f477db0ea731bc18b00b4c791"
-    }
-    Frame {
-        msec: 3648
-        hash: "8702e49f3f26e1e21970e78c8aa4040a"
-    }
-    Frame {
-        msec: 3664
-        hash: "1a482a39d02779d8733e348b713f2312"
-    }
-    Frame {
-        msec: 3680
-        hash: "c728cc4a8e4d0a8d983514f86a92eae0"
-    }
-    Frame {
-        msec: 3696
-        hash: "82360ab373b08bf6a5d9e9ea9d0d18aa"
-    }
-    Frame {
-        msec: 3712
-        hash: "6231a4bce6cfc1e26a9606cc041acdbc"
-    }
-    Frame {
-        msec: 3728
-        hash: "6e3b48862fc749f15aa2dec1c17d1de0"
-    }
-    Frame {
-        msec: 3744
-        hash: "6c9e79a5692a3810b2a9058790f54cd7"
-    }
-    Frame {
-        msec: 3760
-        hash: "0652c67fedda0d5e55858ddefff2da9e"
-    }
-    Frame {
-        msec: 3776
-        hash: "3b058c0efeb3a9da54a1de72a1792a83"
-    }
-    Frame {
-        msec: 3792
-        hash: "96e6fb39c8dbfe4a00bf116bf80aac4d"
-    }
-    Frame {
-        msec: 3808
-        hash: "979c0c78c41e0f337cfe1b384fbbe51a"
-    }
-    Frame {
-        msec: 3824
-        hash: "8be0d6987a6d12864f30336b249e4b16"
-    }
-    Frame {
-        msec: 3840
-        image: "test-pathview.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "31e665f804a52a4dc88eab5dba78ae5a"
-    }
-    Frame {
-        msec: 3872
-        hash: "b7d4cf5a6a3ac79da3be101b50b38bc2"
-    }
-    Frame {
-        msec: 3888
-        hash: "559b1b8467b611cdeb7f2ae660e3bf51"
-    }
-    Frame {
-        msec: 3904
-        hash: "66abb5af85e793569382efb04744d0de"
-    }
-    Frame {
-        msec: 3920
-        hash: "b64eff8bbea5a953d146333363825724"
-    }
-    Frame {
-        msec: 3936
-        hash: "47b794c971c4d47baf15e1d63d65ac03"
-    }
-    Frame {
-        msec: 3952
-        hash: "b3882fa14f3cb7428c660737656d7ea2"
-    }
-    Frame {
-        msec: 3968
-        hash: "a6bd71c7d3a0f3f53674ea8e1334e560"
-    }
-    Frame {
-        msec: 3984
-        hash: "0926d3cd53aabb789686e34d91ef23dc"
-    }
-    Frame {
-        msec: 4000
-        hash: "914c4fa7264111b4a42c82a60701d652"
-    }
-    Frame {
-        msec: 4016
-        hash: "84c1fa22440a61126b79c38605b6f9ca"
-    }
-    Frame {
-        msec: 4032
-        hash: "b684fcf9f4725cfc02af0187454dfaf8"
-    }
-    Frame {
-        msec: 4048
-        hash: "2e94c1ca74af4eb836a0c505d131f263"
-    }
-    Frame {
-        msec: 4064
-        hash: "5f04912674e1bcdb16176976d10ce995"
-    }
-    Frame {
-        msec: 4080
-        hash: "aaf0bcef4a15aa1c699eaa1ce817c8ed"
-    }
-    Frame {
-        msec: 4096
-        hash: "97fd5bdcfa367191fbd3689658ab3273"
-    }
-    Frame {
-        msec: 4112
-        hash: "d76d6c59411636a0e9ac2e0c847b3fe3"
-    }
-    Frame {
-        msec: 4128
-        hash: "9cb88a76c962623b1a9cf4e7093d6e54"
-    }
-    Frame {
-        msec: 4144
-        hash: "ec3d7075680296905b1bdd6fdd9fcc40"
-    }
-    Frame {
-        msec: 4160
-        hash: "43c70dabc45ed059e8b876eb2ba5c66e"
-    }
-    Frame {
-        msec: 4176
-        hash: "8f97ca5c3092a20009c5d00139105a22"
-    }
-    Frame {
-        msec: 4192
-        hash: "d0f225d4b03495218f7916698e254338"
-    }
-    Frame {
-        msec: 4208
-        hash: "f8725467353a8f27bc5570af157c93c7"
-    }
-    Frame {
-        msec: 4224
-        hash: "749c8ca5c0a7774c81805b792e6b70e3"
-    }
-    Frame {
-        msec: 4240
-        hash: "d353c4a8a5eecb1dce30f4a5b85b1ef4"
-    }
-    Frame {
-        msec: 4256
-        hash: "a7105f3f1ddace730d0b4a12a3560208"
-    }
-    Frame {
-        msec: 4272
-        hash: "918f480af8a35f6074ff1e202dae2660"
-    }
-    Frame {
-        msec: 4288
-        hash: "ed98d08eb30db1b41aaf2a58f3b59398"
-    }
-    Frame {
-        msec: 4304
-        hash: "c362cf053b3749a44d1fc33483f9952b"
-    }
-    Frame {
-        msec: 4320
-        hash: "9b01b2c771ef86ff4a8ee3f6a4676e3c"
-    }
-    Frame {
-        msec: 4336
-        hash: "70ccec3c9db95206b5589d43dcd52b13"
-    }
-    Frame {
-        msec: 4352
-        hash: "57e7397c6aadd0d4d5c9d9d5fcdd8fde"
-    }
-    Frame {
-        msec: 4368
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4384
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4400
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4416
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4432
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4448
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4464
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4480
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4496
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4512
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4528
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4544
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4560
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4576
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4592
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4608
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4624
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4640
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4656
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4672
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4688
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4704
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4720
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4736
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4752
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4768
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4784
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4800
-        image: "test-pathview.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4832
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4848
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4864
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4880
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4896
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4912
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4928
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4944
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4960
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4976
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 4992
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5008
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5024
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5040
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5056
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5072
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5088
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5104
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5120
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5136
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5152
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5168
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5184
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5200
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-    Frame {
-        msec: 5216
-        hash: "299b24eae7720e1711744b23335bca8c"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview-2.qml b/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview-2.qml
deleted file mode 100644
index c6d71d5..0000000
--- a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview-2.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 800; height: 450
-    //Same as test-pathview, but with pathItemCount < model.count
-    
-    ListModel {
-        id: rssModel
-        ListElement { lColor: "red" }
-        ListElement { lColor: "green" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "blue" }
-        ListElement { lColor: "purple" }
-        ListElement { lColor: "gray" }
-        ListElement { lColor: "brown" }
-        ListElement { lColor: "thistle" }
-    }
-
-    Component {
-        id: photoDelegate
-        Rectangle {
-            id: wrapper
-            width: 85; height: 85; color: lColor
-            scale: wrapper.PathView.scale
-            
-            transform: Rotation {
-                id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
-                axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle
-            }
-        }
-    }
-
-    PathView {
-        id: pathView; model: rssModel; delegate: photoDelegate
-        y: 100; width: 800; height: 330; pathItemCount: 6; z: 1
-        focus: true
-        path: Path {
-            startX: -50; startY: 40;
-            
-            PathAttribute { name: "scale"; value: 0.5 }
-            PathAttribute { name: "angle"; value: -45 }
-            
-            PathCubic {
-                x: 400; y: 220
-                control1X: 140; control1Y: 40
-                control2X: 210; control2Y: 220
-            }
-            
-            PathAttribute { name: "scale"; value: 1.2  }
-            PathAttribute { name: "angle"; value: 0 }
-            
-            PathCubic {
-                x: 850; y: 40
-                control2X: 660; control2Y: 40
-                control1X: 590; control1Y: 220
-            }
-            
-            PathAttribute { name: "scale"; value: 0.5 }
-            PathAttribute { name: "angle"; value: 45 }
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml b/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml
deleted file mode 100644
index 0adfa02..0000000
--- a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 800; height: 450
-    
-    ListModel {
-        id: rssModel
-        ListElement { lColor: "red" }
-        ListElement { lColor: "green" }
-        ListElement { lColor: "yellow" }
-        ListElement { lColor: "blue" }
-        ListElement { lColor: "purple" }
-        ListElement { lColor: "gray" }
-        ListElement { lColor: "brown" }
-        ListElement { lColor: "thistle" }
-    }
-
-    Component {
-        id: photoDelegate
-        Rectangle {
-            id: wrapper
-            width: 85; height: 85; color: lColor
-            scale: wrapper.PathView.scale
-
-            MouseArea { anchors.fill: parent }
-            
-            transform: Rotation {
-                id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
-                axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle
-            }
-        }
-    }
-
-    PathView {
-        id: photoPathView; model: rssModel; delegate: photoDelegate
-        y: 100; width: 800; height: 330; pathItemCount: 10; z: 1
-        path: Path {
-            startX: -50; startY: 40;
-            
-            PathAttribute { name: "scale"; value: 0.5 }
-            PathAttribute { name: "angle"; value: -45 }
-            
-            PathCubic {
-                x: 400; y: 220
-                control1X: 140; control1Y: 40
-                control2X: 210; control2Y: 220
-            }
-            
-            PathAttribute { name: "scale"; value: 1.2  }
-            PathAttribute { name: "angle"; value: 0 }
-            
-            PathCubic {
-                x: 850; y: 40
-                control2X: 660; control2Y: 40
-                control1X: 590; control1Y: 220
-            }
-            
-            PathAttribute { name: "scale"; value: 0.5 }
-            PathAttribute { name: "angle"; value: 45 }
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.0.png b/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.0.png
deleted file mode 100644
index f474afe..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.1.png b/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.1.png
deleted file mode 100644
index 8b7ae74..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.2.png b/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.2.png
deleted file mode 100644
index 9088bb4..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.3.png b/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.3.png
deleted file mode 100644
index 18cd429..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.4.png b/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.4.png
deleted file mode 100644
index 739afc1..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.5.png b/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.5.png
deleted file mode 100644
index 93f0682..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.qml b/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.qml
deleted file mode 100644
index 7091bb3..0000000
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.qml
+++ /dev/null
@@ -1,1603 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 32
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 48
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 64
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 80
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 96
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 112
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 128
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 144
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 160
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 176
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 192
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 208
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 224
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 240
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 256
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 272
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 288
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 304
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 320
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 336
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 352
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 368
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 384
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 400
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 416
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 432
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 448
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 464
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 480
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 496
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 512
-        hash: "ee42cfa8cbbd67becb7d50998d26fe73"
-    }
-    Frame {
-        msec: 528
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 544
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 560
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 576
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 592
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 608
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 624
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 640
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 656
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 672
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 688
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 704
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 720
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 736
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 752
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 768
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 784
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 800
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 816
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 832
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 848
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 864
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 880
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 896
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 912
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 928
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 944
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 960
-        image: "dynamic.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 992
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 1008
-        hash: "62727b1025930e19bb03c8f533a12ced"
-    }
-    Frame {
-        msec: 1024
-        hash: "3e52e7d7d428cf1b850cb9c60dbb3c21"
-    }
-    Frame {
-        msec: 1040
-        hash: "64f75ab14c979d33d6e0c0d86b76cd35"
-    }
-    Frame {
-        msec: 1056
-        hash: "c198a48f4050f176465649d203d6e09a"
-    }
-    Frame {
-        msec: 1072
-        hash: "6dd8cee5a585a96e78f2cf7478c4da62"
-    }
-    Frame {
-        msec: 1088
-        hash: "09edfbce2ea4b8a547f769ce709dcb6b"
-    }
-    Frame {
-        msec: 1104
-        hash: "e93d01aa6e4f5d3fc82cf5a008e3ea17"
-    }
-    Frame {
-        msec: 1120
-        hash: "0e2e7b5eec0e62853972b0139b8c17c6"
-    }
-    Frame {
-        msec: 1136
-        hash: "26d4f54628ce20f5665bdc6ddc7f3b6a"
-    }
-    Frame {
-        msec: 1152
-        hash: "59836aa6eff85b0152be352b97076d89"
-    }
-    Frame {
-        msec: 1168
-        hash: "47cc9894096731a52ca342ab04df9aad"
-    }
-    Frame {
-        msec: 1184
-        hash: "ec95dd3b34a0f17f6fb9b5bedab73653"
-    }
-    Frame {
-        msec: 1200
-        hash: "e32c2b70882828b5082ca3ec889a0dde"
-    }
-    Frame {
-        msec: 1216
-        hash: "68d3f8e9c9d5388a6f8360368c8f4d2f"
-    }
-    Frame {
-        msec: 1232
-        hash: "17378b2bd8bde7f357fa5463f457c7b2"
-    }
-    Frame {
-        msec: 1248
-        hash: "03db786cd54ec34ce8db15953a5fc847"
-    }
-    Frame {
-        msec: 1264
-        hash: "9e22a82a622ed0287c44cc629059d5bd"
-    }
-    Frame {
-        msec: 1280
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1296
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1312
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1328
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1344
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1360
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1376
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1392
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1408
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1424
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1440
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1456
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1472
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1488
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1504
-        hash: "42955cd23747f7c37d0f0229c0955e90"
-    }
-    Frame {
-        msec: 1520
-        hash: "981fb1ee75e307b548a32df08a86f4cd"
-    }
-    Frame {
-        msec: 1536
-        hash: "f77568307e93d8cd9f0ae417cc19d6e3"
-    }
-    Frame {
-        msec: 1552
-        hash: "3bdd4468e26aceee0dad6b3b97b1c1ea"
-    }
-    Frame {
-        msec: 1568
-        hash: "252c9ebc2c32755b2289ee1b03877fe3"
-    }
-    Frame {
-        msec: 1584
-        hash: "64169b7eb7b7ae8573556c5f80230965"
-    }
-    Frame {
-        msec: 1600
-        hash: "4965dfa709a9ac7d8f7dfb4bf8303c65"
-    }
-    Frame {
-        msec: 1616
-        hash: "8c53cf92510154087341ac65a93aae5a"
-    }
-    Frame {
-        msec: 1632
-        hash: "4dd7502e3e238743d2f3cf038270491e"
-    }
-    Frame {
-        msec: 1648
-        hash: "cd9a58316837eb92f4ac92dbd86bdba3"
-    }
-    Frame {
-        msec: 1664
-        hash: "5de043e3ac8696b59293a2fa60ed7e65"
-    }
-    Frame {
-        msec: 1680
-        hash: "1bf42a6f6be5a3468d2f47cccfac761e"
-    }
-    Frame {
-        msec: 1696
-        hash: "ca05510c1ad25e5d3b002603f4379a09"
-    }
-    Frame {
-        msec: 1712
-        hash: "f6904a918a6475f1965d74372e52a4b1"
-    }
-    Frame {
-        msec: 1728
-        hash: "9e2312ddfc1648b615288107a06c9f9c"
-    }
-    Frame {
-        msec: 1744
-        hash: "95c470273b1cb08d4d602efcce339554"
-    }
-    Frame {
-        msec: 1760
-        hash: "dade96f707d4a21885480e13b258b7e9"
-    }
-    Frame {
-        msec: 1776
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1792
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1808
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1824
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1840
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1856
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1872
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1888
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1904
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1920
-        image: "dynamic.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1952
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1968
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 1984
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 2000
-        hash: "0bfbd46f1d4cf562253fb383776cb601"
-    }
-    Frame {
-        msec: 2016
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2032
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2048
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2064
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2080
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2096
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2112
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2128
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2144
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2160
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2176
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2192
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2208
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2224
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2240
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2256
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2272
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2288
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2304
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2320
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2336
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2352
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2368
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2384
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2400
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2416
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2432
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2448
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2464
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2480
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2496
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2512
-        hash: "6fc83e8d4ac99b34062c122a8f7f1850"
-    }
-    Frame {
-        msec: 2528
-        hash: "fabf4e535bc4cc17497939d2eeae4a2d"
-    }
-    Frame {
-        msec: 2544
-        hash: "a7981035f46869f5ae824d0c58b263b2"
-    }
-    Frame {
-        msec: 2560
-        hash: "86d8e369bdceb499b244f84ed9e80ba3"
-    }
-    Frame {
-        msec: 2576
-        hash: "e28a7dc7ea8690da75670b5a6e93a26b"
-    }
-    Frame {
-        msec: 2592
-        hash: "bf4e815360a67bd80732bd8812269b21"
-    }
-    Frame {
-        msec: 2608
-        hash: "a6f8c56cb93da8acc0c90e35596a60d4"
-    }
-    Frame {
-        msec: 2624
-        hash: "1e60656f0758605169e51b57bd03af36"
-    }
-    Frame {
-        msec: 2640
-        hash: "c069b26b9fae47e0104070d702ba9562"
-    }
-    Frame {
-        msec: 2656
-        hash: "457eb2ca1adff6cbb158afa140b2f20b"
-    }
-    Frame {
-        msec: 2672
-        hash: "4e5e750b0d94b6777aebff85d38225d9"
-    }
-    Frame {
-        msec: 2688
-        hash: "96d9840c2354a8786a8470309be97544"
-    }
-    Frame {
-        msec: 2704
-        hash: "ac7570cc7eeff1acd8c47f2d9328f8be"
-    }
-    Frame {
-        msec: 2720
-        hash: "887f937bb263c54f29659f27f2b7a3e3"
-    }
-    Frame {
-        msec: 2736
-        hash: "616371183c82b97f69a4c6e2367b8066"
-    }
-    Frame {
-        msec: 2752
-        hash: "36de8ffa9abe850fb681b37aea45ef8b"
-    }
-    Frame {
-        msec: 2768
-        hash: "0505101f0edaaf7ff17deeaaddc6bbf9"
-    }
-    Frame {
-        msec: 2784
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2800
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2816
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2832
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2848
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2864
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2880
-        image: "dynamic.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2912
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2928
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2944
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2960
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2976
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 2992
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 3008
-        hash: "e8c53dd8343d7d4c384c2f8507ff0631"
-    }
-    Frame {
-        msec: 3024
-        hash: "99e4d853d64a381e8db27707b5ff2b25"
-    }
-    Frame {
-        msec: 3040
-        hash: "ab0e62aeffc0d57a5e1d63e6cf49b809"
-    }
-    Frame {
-        msec: 3056
-        hash: "4ab11bbf1fb6adb0eec8895f78a24a41"
-    }
-    Frame {
-        msec: 3072
-        hash: "634ff2ceb39a3f263a3362238a4ae252"
-    }
-    Frame {
-        msec: 3088
-        hash: "7f4856873dc23a02297b2497101de9b9"
-    }
-    Frame {
-        msec: 3104
-        hash: "bca3919e9d8e6dc5badd8090401dc934"
-    }
-    Frame {
-        msec: 3120
-        hash: "824bfe40c3657cfe1368563640e4cfce"
-    }
-    Frame {
-        msec: 3136
-        hash: "f831c1600f68bda139697c406ca70c5e"
-    }
-    Frame {
-        msec: 3152
-        hash: "f8102ca251a9ff46a8fe5a24cff0d2d6"
-    }
-    Frame {
-        msec: 3168
-        hash: "f33407ad684aa16efc6615d1cf6fa4b9"
-    }
-    Frame {
-        msec: 3184
-        hash: "a73d27f776a6ebfc90309b34421700e5"
-    }
-    Frame {
-        msec: 3200
-        hash: "ff2a4e2663fc50dfec35152f0e79f935"
-    }
-    Frame {
-        msec: 3216
-        hash: "4935f5f58f2672e9d240625151044bda"
-    }
-    Frame {
-        msec: 3232
-        hash: "f3ad5c203f621fe4d5d321c3c1880743"
-    }
-    Frame {
-        msec: 3248
-        hash: "d4fb7cd2e1f6a533dae65ddbb50da8ac"
-    }
-    Frame {
-        msec: 3264
-        hash: "91705e9234c4f02d0a730f6270f9e95f"
-    }
-    Frame {
-        msec: 3280
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3296
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3312
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3328
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3344
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3360
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3376
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3392
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3408
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3424
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3440
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3456
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3472
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3488
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3504
-        hash: "41e177bec783497b996d6d5f6dac1a15"
-    }
-    Frame {
-        msec: 3520
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3536
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3552
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3568
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3584
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3600
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3616
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3632
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3648
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3664
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3680
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3696
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3712
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3728
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3744
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3760
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3776
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3792
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3808
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3824
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3840
-        image: "dynamic.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3872
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3888
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3904
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3920
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3936
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3952
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3968
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 3984
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4000
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4016
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4032
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4048
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4064
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4080
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4096
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4112
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4128
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4144
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4160
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4176
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4192
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4208
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4224
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4240
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4256
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4272
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4288
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4304
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4320
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4336
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4352
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4368
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4384
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4400
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4416
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4432
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4448
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4464
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4480
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4496
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4512
-        hash: "496dc6261695bcf04a8e574146544e98"
-    }
-    Frame {
-        msec: 4528
-        hash: "9681be99003f8a14cc5654d06d2c8255"
-    }
-    Frame {
-        msec: 4544
-        hash: "bcb592a2335aa2e35956881fd028f4e6"
-    }
-    Frame {
-        msec: 4560
-        hash: "f914b25fdcb02a02b71220d82b7b2a75"
-    }
-    Frame {
-        msec: 4576
-        hash: "63c82c08eb7f2bd50b54b94c952df3f2"
-    }
-    Frame {
-        msec: 4592
-        hash: "8a8dc82be81fa55605c6c2e749895120"
-    }
-    Frame {
-        msec: 4608
-        hash: "271f8d79b8052dfcd840ffa9ba9ffeec"
-    }
-    Frame {
-        msec: 4624
-        hash: "8f77bbd0585b57e69ac1919bd81ee3b1"
-    }
-    Frame {
-        msec: 4640
-        hash: "b974260a2f90e141ebc33ced98fbca88"
-    }
-    Frame {
-        msec: 4656
-        hash: "77ada180f8a45652a6fa636d7ece4d9d"
-    }
-    Frame {
-        msec: 4672
-        hash: "4c8dc2e33cd989cb3b0938c6c75b5f95"
-    }
-    Frame {
-        msec: 4688
-        hash: "a145954989508b925a444e14f0c27a20"
-    }
-    Frame {
-        msec: 4704
-        hash: "8d27ff203819174747ae4a5cee8d0ae8"
-    }
-    Frame {
-        msec: 4720
-        hash: "830f34b0dab780c6efe2294872ba8508"
-    }
-    Frame {
-        msec: 4736
-        hash: "5d70a4bbd815569cfe5735b596bad080"
-    }
-    Frame {
-        msec: 4752
-        hash: "964527bb82ea006e03b030c787a8597c"
-    }
-    Frame {
-        msec: 4768
-        hash: "1ad54954b818fa9e6032ac4b6114e7db"
-    }
-    Frame {
-        msec: 4784
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4800
-        image: "dynamic.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4832
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4848
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4864
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4880
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4896
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4912
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4928
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4944
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4960
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4976
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 4992
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 5008
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 5024
-        hash: "47865243cc252aef67774001af70c54c"
-    }
-    Frame {
-        msec: 5040
-        hash: "baeb8adffc13e230e797e0437f2ad5fa"
-    }
-    Frame {
-        msec: 5056
-        hash: "d2e440fcad0ee2b7b35d7e5c4e581f73"
-    }
-    Frame {
-        msec: 5072
-        hash: "fb8acb2f69234d3ee089281d0297ad7c"
-    }
-    Frame {
-        msec: 5088
-        hash: "7fda29a83dc535ed8d6b35e999400311"
-    }
-    Frame {
-        msec: 5104
-        hash: "6482e3eb10cfdbdeb57dd38ba3e3d67e"
-    }
-    Frame {
-        msec: 5120
-        hash: "4d222549bc2565c1598a532460aae4e6"
-    }
-    Frame {
-        msec: 5136
-        hash: "776d1b0f9945c0e1ceda0cf117264919"
-    }
-    Frame {
-        msec: 5152
-        hash: "f2c362b34a0982ee1a11dea6b063945e"
-    }
-    Frame {
-        msec: 5168
-        hash: "115f02b8893972b5b1d63525ce70762e"
-    }
-    Frame {
-        msec: 5184
-        hash: "7f2d53581fe2c6c45a628fa4cd9b5742"
-    }
-    Frame {
-        msec: 5200
-        hash: "b5ed1120c4edf842b15d5144adbd93b0"
-    }
-    Frame {
-        msec: 5216
-        hash: "3511938df57c4cdce316692de204b057"
-    }
-    Frame {
-        msec: 5232
-        hash: "99583918d068ab5d132fe7a699c2a7a6"
-    }
-    Frame {
-        msec: 5248
-        hash: "c0ce9df18479dbb57fb1dbc777f4f0e5"
-    }
-    Frame {
-        msec: 5264
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5280
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5296
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5312
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5328
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5344
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5360
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5376
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5392
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5408
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5424
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5440
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5456
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5472
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5488
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5504
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5520
-        hash: "b24db7b5c406328380fcf9927fb26c5c"
-    }
-    Frame {
-        msec: 5536
-        hash: "98cc64411264d8a635a6afe6b11cee6e"
-    }
-    Frame {
-        msec: 5552
-        hash: "b86434b7af8ad1db946c43a2791d69ab"
-    }
-    Frame {
-        msec: 5568
-        hash: "f45616f9e33658d1dddb537e842c8768"
-    }
-    Frame {
-        msec: 5584
-        hash: "e49d8955e27cdc19a37c331e56c81af1"
-    }
-    Frame {
-        msec: 5600
-        hash: "b2dbe764906b50195f65dc11a5842515"
-    }
-    Frame {
-        msec: 5616
-        hash: "71ce7c63d65c29cdffd83f5ae07f0b93"
-    }
-    Frame {
-        msec: 5632
-        hash: "901d01e1fc777ec185cd023ad0ace4c1"
-    }
-    Frame {
-        msec: 5648
-        hash: "a3f31de30fc2e92bae1f735504216216"
-    }
-    Frame {
-        msec: 5664
-        hash: "0fc52dd8102506e3e7671fa548551b23"
-    }
-    Frame {
-        msec: 5680
-        hash: "fb92809e728416035dbb91116ad8fe0e"
-    }
-    Frame {
-        msec: 5696
-        hash: "9003dc8ca4f781909035cb03dc45864f"
-    }
-    Frame {
-        msec: 5712
-        hash: "2bff1de793ad8521fd54413849c3cf29"
-    }
-    Frame {
-        msec: 5728
-        hash: "8362e4db7c4446282d844a4fc6632d19"
-    }
-    Frame {
-        msec: 5744
-        hash: "b874fa274c6ec77c106ff4a0288f9169"
-    }
-    Frame {
-        msec: 5760
-        image: "dynamic.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5792
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5808
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5824
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5840
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5856
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5872
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5888
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5904
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5920
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5936
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5952
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5968
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 5984
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 6000
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 6016
-        hash: "e64ac8e11e36cafb25c947c5802d54b9"
-    }
-    Frame {
-        msec: 6032
-        hash: "7621e64568058b82bcb6f6b46cee3ebc"
-    }
-    Frame {
-        msec: 6048
-        hash: "f77f6de6fc88813f49427b4888a59dbf"
-    }
-    Frame {
-        msec: 6064
-        hash: "d3a48f596219372ac25941e4c5ec5b2b"
-    }
-    Frame {
-        msec: 6080
-        hash: "d572d932b613f9ca1e0acf144f127dd1"
-    }
-    Frame {
-        msec: 6096
-        hash: "edf317eaf51d933bcd0f57f214921a81"
-    }
-    Frame {
-        msec: 6112
-        hash: "e0cee7959a5a8a08ad03d75e7b5c6ca1"
-    }
-    Frame {
-        msec: 6128
-        hash: "96877a15f44d4a2c8d9974cb28b9e1b6"
-    }
-    Frame {
-        msec: 6144
-        hash: "c0ffb0ef6dd9d007d201feebd2f68e44"
-    }
-    Frame {
-        msec: 6160
-        hash: "209fb930223243fa19c5dde9e85ec518"
-    }
-    Frame {
-        msec: 6176
-        hash: "ae98ac4dba0e78eb8fb7f7dbe29b2832"
-    }
-    Frame {
-        msec: 6192
-        hash: "c94a7d68ce007d83df77a595a5815a96"
-    }
-    Frame {
-        msec: 6208
-        hash: "4c28e409bf5a6c1289bcab8cd59a9e42"
-    }
-    Frame {
-        msec: 6224
-        hash: "ea1009f1a3446dd5ce937e6949794794"
-    }
-    Frame {
-        msec: 6240
-        hash: "940c16766c2f87feef48e1187672ca9b"
-    }
-    Frame {
-        msec: 6256
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6272
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6288
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6304
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6320
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6336
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6352
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6368
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-    Frame {
-        msec: 6384
-        hash: "93664c87c8dcfadc0345f646b2508625"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.0.png b/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.0.png
deleted file mode 100644
index f7018fd..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.qml b/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.qml
deleted file mode 100644
index 1eb115d..0000000
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.qml
+++ /dev/null
@@ -1,339 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 32
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 48
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 64
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 80
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 96
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 112
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 128
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 144
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 160
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 176
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 192
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 208
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 224
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 240
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 256
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 272
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 288
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 304
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 320
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 336
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 352
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 368
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 384
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 400
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 416
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 432
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 448
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 464
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 480
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 496
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 512
-        hash: "0273c293855f2b2bdbf579fc5cdce63f"
-    }
-    Frame {
-        msec: 528
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 544
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 560
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 576
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 592
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 608
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 624
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 640
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 656
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 672
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 688
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 704
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 720
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 736
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 752
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 768
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 784
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 800
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 816
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 832
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 848
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 864
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 880
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 896
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 912
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 928
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 944
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 960
-        image: "repeater.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 992
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1008
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1024
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1040
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1056
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1072
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1088
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1104
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1120
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1136
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1152
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1168
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1184
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1200
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1216
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1232
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1248
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1264
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1280
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1296
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1312
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-    Frame {
-        msec: 1328
-        hash: "53a01771047c8ec806a335a1a3d6af71"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/dynamic.qml b/tests/auto/declarative/visual/qmlgraphicspositioners/dynamic.qml
deleted file mode 100644
index f45e9a4..0000000
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/dynamic.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 400; height: 400;
-    property int step: 0
-    function tick()
-    {
-        step++;
-        if(step == 1){
-            row1.destroy(); //Not dynamically created, so is this valid?
-        }else if(step == 2){
-            r2a.destroy();
-        }else if(step == 3){
-            r2b.destroy();
-        }else if(step == 4){
-            r2c.destroy();
-        }else if(step == 5){
-            r3a.parent = row2;
-        }else if(step == 6){
-            r3b.parent = row2;
-        }else if(step == 7){
-            r3c.parent = row2;
-        }else if(step == 8){
-            row3.destroy();
-        }else{
-            repeater.model++;
-        }
-    }
-
-    //Tests base positioner functionality, so just using row
-    Row{
-        id: row1
-        Rectangle{id: r1a; width:20; height:20; color: "red"}
-        Rectangle{id: r1b; width:20; height:20; color: "green"}
-        Rectangle{id: r1c; width:20; height:20; color: "blue"}
-    }
-    Row{
-        y:20
-        id: row2
-        move: Transition{NumberAnimation{properties:"x"}}
-        Repeater{ 
-            id: repeater 
-            model: 0; 
-            delegate: Component{ Rectangle { color: "yellow"; width:20; height:20;}}
-        }
-        Rectangle{id: r2a; width:20; height:20; color: "red"}
-        Rectangle{id: r2b; width:20; height:20; color: "green"}
-        Rectangle{id: r2c; width:20; height:20; color: "blue"}
-    }
-    Row{
-        move: Transition{NumberAnimation{properties:"x"}}
-        y:40
-        id: row3
-        Rectangle{id: r3a; width:20; height:20; color: "red"}
-        Rectangle{id: r3b; width:20; height:20; color: "green"}
-        Rectangle{id: r3c; width:20; height:20; color: "blue"}
-    }
-    Timer{
-        interval: 500;
-        running: true;
-        repeat: true;
-        onTriggered: tick();
-    }
-}
-
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/repeater.qml b/tests/auto/declarative/visual/qmlgraphicspositioners/repeater.qml
deleted file mode 100644
index ff60365..0000000
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/repeater.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-
-Item{
-    width: 200; height: 600
-    Column{
-        Rectangle{color:"Red"; width:40; height:40;}
-        Repeater{
-            id: rep
-            model: 3
-            delegate: Component{Rectangle{color:"Green"; width:40; height:40; radius: 20;}}
-        }
-        Rectangle{color:"Blue"; width:40; height:40;}
-    }
-    Timer{ interval: 500; running: true; onTriggered: rep.model=6;}
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/baseline/data-X11/parentanchor.qml b/tests/auto/declarative/visual/qmlgraphicstext/baseline/data-X11/parentanchor.qml
deleted file mode 100644
index 56d616e..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/baseline/data-X11/parentanchor.qml
+++ /dev/null
@@ -1,131 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 32
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 48
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 64
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 80
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 96
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 112
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 128
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 144
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 160
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 176
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 192
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 208
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 224
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 240
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 256
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 272
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 288
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 304
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 320
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 336
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 352
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 368
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 384
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 400
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 416
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 432
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 448
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 464
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 480
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 496
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/baseline/data/parentanchor.qml b/tests/auto/declarative/visual/qmlgraphicstext/baseline/data/parentanchor.qml
deleted file mode 100644
index 56d616e..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/baseline/data/parentanchor.qml
+++ /dev/null
@@ -1,131 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 32
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 48
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 64
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 80
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 96
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 112
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 128
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 144
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 160
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 176
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 192
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 208
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 224
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 240
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 256
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 272
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 288
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 304
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 320
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 336
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 352
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 368
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 384
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 400
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 416
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 432
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 448
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 464
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 480
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-    Frame {
-        msec: 496
-        hash: "3e022a120a2dbe688d53657508de36cf"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/baseline/parentanchor.qml b/tests/auto/declarative/visual/qmlgraphicstext/baseline/parentanchor.qml
deleted file mode 100644
index 80f0f03..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/baseline/parentanchor.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: s; width: 600; height: 100; color: "lightsteelblue"
-    property string text: "The quick brown fox jumps over the lazy dog."
-    Text {
-        text: s.text
-        anchors.verticalCenter: s.verticalCenter
-    }
-    Text {
-        text: s.text
-        anchors.baseline: s.verticalCenter
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.0.png
deleted file mode 100644
index eea3362..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.qml
deleted file mode 100644
index 1ccede4..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.qml
+++ /dev/null
@@ -1,279 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 32
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 48
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 64
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 80
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 96
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 112
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 128
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 144
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 160
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 176
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 192
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 208
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 224
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 240
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 256
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 272
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 288
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 304
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 320
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 336
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 352
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 368
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 384
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 400
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 416
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 432
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 448
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 464
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 480
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 496
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 512
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 528
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 544
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 560
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 576
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 592
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 608
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 624
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 640
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 656
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 672
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 688
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 704
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 720
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 736
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 752
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 768
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 784
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 800
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 816
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 832
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 848
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 864
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 880
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 896
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 912
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 928
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 944
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 960
-        image: "elide.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 992
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 1008
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 1024
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 1040
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-    Frame {
-        msec: 1056
-        hash: "1678890d66761a30100c37132ccec9a2"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.0.png
deleted file mode 100644
index 3dfade5..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.1.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.1.png
deleted file mode 100644
index 1ee2076..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.2.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.2.png
deleted file mode 100644
index ae680be..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.3.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.3.png
deleted file mode 100644
index c2859be..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.qml
deleted file mode 100644
index 07ad236..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.qml
+++ /dev/null
@@ -1,991 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 32
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 48
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 64
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 80
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 96
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 112
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 128
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 144
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 160
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 176
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 192
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 208
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 224
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 240
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 256
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 272
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 288
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 304
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 320
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 336
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 352
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 368
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 384
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 400
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 416
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 432
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
-    }
-    Frame {
-        msec: 448
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
-    }
-    Frame {
-        msec: 464
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
-    }
-    Frame {
-        msec: 480
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 496
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 512
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 528
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 544
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 560
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 576
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 592
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 608
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 624
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 640
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 656
-        hash: "3f362ad550db910f1d9f261557c65913"
-    }
-    Frame {
-        msec: 672
-        hash: "3f362ad550db910f1d9f261557c65913"
-    }
-    Frame {
-        msec: 688
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 704
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 720
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 736
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 752
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 768
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 784
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
-    }
-    Frame {
-        msec: 800
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
-    }
-    Frame {
-        msec: 816
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
-    }
-    Frame {
-        msec: 832
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 848
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 864
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 880
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 896
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 912
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 928
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 944
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 960
-        image: "elide2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 992
-        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
-    }
-    Frame {
-        msec: 1008
-        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
-    }
-    Frame {
-        msec: 1024
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1040
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1056
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1072
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1088
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1104
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
-    }
-    Frame {
-        msec: 1120
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
-    }
-    Frame {
-        msec: 1136
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
-    }
-    Frame {
-        msec: 1152
-        hash: "000061a140ab71a44c0480a92ad3bc70"
-    }
-    Frame {
-        msec: 1168
-        hash: "000061a140ab71a44c0480a92ad3bc70"
-    }
-    Frame {
-        msec: 1184
-        hash: "000061a140ab71a44c0480a92ad3bc70"
-    }
-    Frame {
-        msec: 1200
-        hash: "5dec9638853165428cd15ae02e1d03ce"
-    }
-    Frame {
-        msec: 1216
-        hash: "5dec9638853165428cd15ae02e1d03ce"
-    }
-    Frame {
-        msec: 1232
-        hash: "5dec9638853165428cd15ae02e1d03ce"
-    }
-    Frame {
-        msec: 1248
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1264
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1280
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1296
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1312
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1328
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1344
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1360
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1376
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1392
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1408
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1424
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1440
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1456
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1472
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1488
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1504
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1520
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1536
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1552
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1568
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1584
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
-    }
-    Frame {
-        msec: 1600
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
-    }
-    Frame {
-        msec: 1616
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
-    }
-    Frame {
-        msec: 1632
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1648
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1664
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1680
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1696
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
-    }
-    Frame {
-        msec: 1712
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
-    }
-    Frame {
-        msec: 1728
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
-    }
-    Frame {
-        msec: 1744
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1760
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Frame {
-        msec: 1776
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Frame {
-        msec: 1792
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Frame {
-        msec: 1808
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1824
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1840
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1856
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1872
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1888
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1904
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1920
-        image: "elide2.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1952
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1968
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 1984
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2000
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2016
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2032
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2048
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
-    }
-    Frame {
-        msec: 2064
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
-    }
-    Frame {
-        msec: 2080
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
-    }
-    Frame {
-        msec: 2096
-        hash: "1a978ed6951afe40912efcfb54dcce65"
-    }
-    Frame {
-        msec: 2112
-        hash: "1a978ed6951afe40912efcfb54dcce65"
-    }
-    Frame {
-        msec: 2128
-        hash: "1a978ed6951afe40912efcfb54dcce65"
-    }
-    Frame {
-        msec: 2144
-        hash: "a57eea59fe6475164e24688489977869"
-    }
-    Frame {
-        msec: 2160
-        hash: "a57eea59fe6475164e24688489977869"
-    }
-    Frame {
-        msec: 2176
-        hash: "a57eea59fe6475164e24688489977869"
-    }
-    Frame {
-        msec: 2192
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2208
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2224
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2240
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2256
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2272
-        hash: "04c62a4d01e9309eaeea87902013c8b9"
-    }
-    Frame {
-        msec: 2288
-        hash: "04c62a4d01e9309eaeea87902013c8b9"
-    }
-    Frame {
-        msec: 2304
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2320
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2336
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2352
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2368
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2384
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2400
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2416
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2432
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2448
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2464
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2480
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2496
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2512
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2528
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2544
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2560
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2576
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2592
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2608
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
-    }
-    Frame {
-        msec: 2624
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
-    }
-    Frame {
-        msec: 2640
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
-    }
-    Frame {
-        msec: 2656
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2672
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2688
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2704
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2720
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2736
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2752
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2768
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2784
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2800
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2816
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2832
-        hash: "f44b88b80219497370b5d2ad380d03bf"
-    }
-    Frame {
-        msec: 2848
-        hash: "f44b88b80219497370b5d2ad380d03bf"
-    }
-    Frame {
-        msec: 2864
-        hash: "a093510751799f3466156f9775988044"
-    }
-    Frame {
-        msec: 2880
-        image: "elide2.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "a093510751799f3466156f9775988044"
-    }
-    Frame {
-        msec: 2912
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2928
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2944
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2960
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2976
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2992
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3008
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3024
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3040
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3056
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3072
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
-    }
-    Frame {
-        msec: 3088
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
-    }
-    Frame {
-        msec: 3104
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
-    }
-    Frame {
-        msec: 3120
-        hash: "df90afe882b18f3fd7b12e52ff36e66f"
-    }
-    Frame {
-        msec: 3136
-        hash: "df90afe882b18f3fd7b12e52ff36e66f"
-    }
-    Frame {
-        msec: 3152
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
-    }
-    Frame {
-        msec: 3168
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
-    }
-    Frame {
-        msec: 3184
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
-    }
-    Frame {
-        msec: 3200
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3216
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3232
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3248
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3264
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3280
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3296
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3312
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3328
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3344
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3360
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
-    }
-    Frame {
-        msec: 3376
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
-    }
-    Frame {
-        msec: 3392
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
-    }
-    Frame {
-        msec: 3408
-        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
-    }
-    Frame {
-        msec: 3424
-        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
-    }
-    Frame {
-        msec: 3440
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3456
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3472
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3488
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3504
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3520
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3536
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3552
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3568
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3584
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3600
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3616
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3632
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3648
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3664
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3680
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3696
-        hash: "6bfd7cfd6369df1eb570fda103d9e009"
-    }
-    Frame {
-        msec: 3712
-        hash: "6bfd7cfd6369df1eb570fda103d9e009"
-    }
-    Frame {
-        msec: 3728
-        hash: "b6dba4a456cd8d1b62501039cb796625"
-    }
-    Frame {
-        msec: 3744
-        hash: "b6dba4a456cd8d1b62501039cb796625"
-    }
-    Frame {
-        msec: 3760
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3776
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3792
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3808
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3824
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3840
-        image: "elide2.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "d2e873e69aed3e0b6e53123cd63e386c"
-    }
-    Frame {
-        msec: 3872
-        hash: "d2e873e69aed3e0b6e53123cd63e386c"
-    }
-    Frame {
-        msec: 3888
-        hash: "baa8edfce77628c7a1ec83adce96e2c6"
-    }
-    Frame {
-        msec: 3904
-        hash: "baa8edfce77628c7a1ec83adce96e2c6"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.0.png
deleted file mode 100644
index 80549b4..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.qml
deleted file mode 100644
index c2fd0d8..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.qml
+++ /dev/null
@@ -1,303 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "17f39c541a0b5bf958c3fdaa51b72fec"
-    }
-    Frame {
-        msec: 32
-        hash: "da61bb1afef532688045116bcce1da40"
-    }
-    Frame {
-        msec: 48
-        hash: "04ddcb158ce8ade4ea9ad16405c7d81a"
-    }
-    Frame {
-        msec: 64
-        hash: "7ca43ec7a6e630c9bc07478abf5c2686"
-    }
-    Frame {
-        msec: 80
-        hash: "ae2c4e73395cf4a5663110ba1b9996b2"
-    }
-    Frame {
-        msec: 96
-        hash: "5059426cced6ff6f92102100416b34d8"
-    }
-    Frame {
-        msec: 112
-        hash: "e816cb366ba9498d0ae194b789c25f12"
-    }
-    Frame {
-        msec: 128
-        hash: "fd8cd9b2916b7045086df92d19e8b436"
-    }
-    Frame {
-        msec: 144
-        hash: "965dfe4cad0a3d07c0b086d6351a43a1"
-    }
-    Frame {
-        msec: 160
-        hash: "56759a670c864d5f2ae392fa8545f3a4"
-    }
-    Frame {
-        msec: 176
-        hash: "8d3c2be4fcef526650cc84b5c2d29170"
-    }
-    Frame {
-        msec: 192
-        hash: "6d9f995bef186a69b259b8d18470f0e7"
-    }
-    Frame {
-        msec: 208
-        hash: "670c68a0943c5f037f8bf4c9ca0df501"
-    }
-    Frame {
-        msec: 224
-        hash: "6218cf02cb762aa6c33985fe1b2e47bb"
-    }
-    Frame {
-        msec: 240
-        hash: "6e3424f2b72d6582ceb5a6c1bfe3dba4"
-    }
-    Frame {
-        msec: 256
-        hash: "fb819344ab1d2966b043be790831e680"
-    }
-    Frame {
-        msec: 272
-        hash: "a729845b780cc708ddd578eab3bc0ab1"
-    }
-    Frame {
-        msec: 288
-        hash: "543f6566c4dfaecb70007848cc4f8525"
-    }
-    Frame {
-        msec: 304
-        hash: "5497699414bd8a428ead9703dc7273d5"
-    }
-    Frame {
-        msec: 320
-        hash: "e9230e525bb0ce33fe4bf3a2c948357d"
-    }
-    Frame {
-        msec: 336
-        hash: "ef6a6989f013d444547c0b98a65a34bf"
-    }
-    Frame {
-        msec: 352
-        hash: "ee89f5163fe269884d59acac7fc23336"
-    }
-    Frame {
-        msec: 368
-        hash: "0ffb11ceccdc607c1a072dde4aa40f93"
-    }
-    Frame {
-        msec: 384
-        hash: "97a51d7916e04815724506e289040e2a"
-    }
-    Frame {
-        msec: 400
-        hash: "a63d6d73827e1b40a7fec76e6555d7ab"
-    }
-    Frame {
-        msec: 416
-        hash: "d3eaf72442852317a48dc2b638ad48be"
-    }
-    Frame {
-        msec: 432
-        hash: "fa867a486d51089ddfeb60b9d44b329e"
-    }
-    Frame {
-        msec: 448
-        hash: "834ee944cfc63209bcba94153ccd2c4e"
-    }
-    Frame {
-        msec: 464
-        hash: "6d637d4763ae457233ab669f9f124bc1"
-    }
-    Frame {
-        msec: 480
-        hash: "66c60bd9de1870f46b726c404ab924d5"
-    }
-    Frame {
-        msec: 496
-        hash: "088499b53390e3a2c3ca7f42cac101a4"
-    }
-    Frame {
-        msec: 512
-        hash: "19d41f7696c86120460c4db7a0f9be1a"
-    }
-    Frame {
-        msec: 528
-        hash: "cd3ae14964e174db94e3e6c8609f366a"
-    }
-    Frame {
-        msec: 544
-        hash: "0c2172e091c2fb42d7c016779fa543d7"
-    }
-    Frame {
-        msec: 560
-        hash: "7534175e24b2cbab08518de8fc691003"
-    }
-    Frame {
-        msec: 576
-        hash: "a9ef64d20b4f93e60f25753e2d7dd2e0"
-    }
-    Frame {
-        msec: 592
-        hash: "d8e62a9fec27bfc892b0f3034bc73c3f"
-    }
-    Frame {
-        msec: 608
-        hash: "f8eee41f72e17693074a2ac250bb850e"
-    }
-    Frame {
-        msec: 624
-        hash: "3a08b62a8aa1f410415afbd7b8ee8728"
-    }
-    Frame {
-        msec: 640
-        hash: "0c4fba2bc8b7e440736f4a23d048c23c"
-    }
-    Frame {
-        msec: 656
-        hash: "521264dbeec0fbe3a467739f0c3f7b85"
-    }
-    Frame {
-        msec: 672
-        hash: "2c455560a624acfb7f316eae8926d765"
-    }
-    Frame {
-        msec: 688
-        hash: "c9fa632a0998cfae39d434b623b3060d"
-    }
-    Frame {
-        msec: 704
-        hash: "506ea16572fa0ee72cddcedfe5b4b9ea"
-    }
-    Frame {
-        msec: 720
-        hash: "83ae06a3ad24d2a6d49c71df2a287716"
-    }
-    Frame {
-        msec: 736
-        hash: "d4b11b45b4f97de0c0b878b97b804f09"
-    }
-    Frame {
-        msec: 752
-        hash: "868aac6c273b7cc90c31c14298ab9a3b"
-    }
-    Frame {
-        msec: 768
-        hash: "03d4222586194bb6513305d1837d3467"
-    }
-    Frame {
-        msec: 784
-        hash: "21e6cd89f06077bd5d346c7ccb8fa1e9"
-    }
-    Frame {
-        msec: 800
-        hash: "326092c4c29217f5afb5730ab3984353"
-    }
-    Frame {
-        msec: 816
-        hash: "4963d64093e65fe1973ffab5b7a15abc"
-    }
-    Frame {
-        msec: 832
-        hash: "3125e6e553bbf3f2fcf8fbf797a0c1f8"
-    }
-    Frame {
-        msec: 848
-        hash: "879b24c994d4a9854d08bda2bbf2ceda"
-    }
-    Frame {
-        msec: 864
-        hash: "03c4320dc2aa030c341d54899869b561"
-    }
-    Frame {
-        msec: 880
-        hash: "ae0e91975aecc6a416b4a23504fced32"
-    }
-    Frame {
-        msec: 896
-        hash: "e4150bdf0d4bab9bddc4605a9bde5b69"
-    }
-    Frame {
-        msec: 912
-        hash: "dc961cb82a0e58603b3914f16f0a3f52"
-    }
-    Frame {
-        msec: 928
-        hash: "5339507c303e42ecab853ca1688881f3"
-    }
-    Frame {
-        msec: 944
-        hash: "a7c616c57f98eb03c1501747ea1a8b45"
-    }
-    Frame {
-        msec: 960
-        image: "multilength.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "773ad6bc56f80bd5f6ce346ae0bc79c9"
-    }
-    Frame {
-        msec: 992
-        hash: "18b9ebfb9e5beac337143cc625fdfad7"
-    }
-    Frame {
-        msec: 1008
-        hash: "efb9f12a98ea137e2b50d344c21c4a89"
-    }
-    Frame {
-        msec: 1024
-        hash: "5b880958b3d20c09a10189cfc5f7b671"
-    }
-    Frame {
-        msec: 1040
-        hash: "edf2d8c174ac6e2e3a887336dc04df8c"
-    }
-    Frame {
-        msec: 1056
-        hash: "ad04b9e0e88695a13032abae8fef6f32"
-    }
-    Frame {
-        msec: 1072
-        hash: "e4ad91c9da3e954cac33ce98832fee1c"
-    }
-    Frame {
-        msec: 1088
-        hash: "a853212cf0ddc17cb0eb9be7f2ac5475"
-    }
-    Frame {
-        msec: 1104
-        hash: "a03f7ac2553fe114c4591ed98dab3ceb"
-    }
-    Frame {
-        msec: 1120
-        hash: "5de7491803582e0d13d2ff3e2eb3df82"
-    }
-    Frame {
-        msec: 1136
-        hash: "0685263ac468ce39b468d37a20f7e5f8"
-    }
-    Frame {
-        msec: 1152
-        hash: "14d4ab3f40dc6a0835c56c0f84256182"
-    }
-    Frame {
-        msec: 1168
-        hash: "6a8c61c31c3d00592863ad356c45b354"
-    }
-    Frame {
-        msec: 1184
-        hash: "08b3e3388469b1a62d3fc7f7a94f85a2"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png
deleted file mode 100644
index 5631a46..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml
deleted file mode 100644
index cfd832e..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml
+++ /dev/null
@@ -1,279 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 32
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 48
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 64
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 80
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 96
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 112
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 128
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 144
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 160
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 176
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 192
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 208
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 224
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 240
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 256
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 272
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 288
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 304
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 320
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 336
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 352
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 368
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 384
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 400
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 416
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 432
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 448
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 464
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 480
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 496
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 512
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 528
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 544
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 560
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 576
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 592
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 608
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 624
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 640
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 656
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 672
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 688
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 704
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 720
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 736
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 752
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 768
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 784
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 800
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 816
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 832
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 848
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 864
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 880
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 896
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 912
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 928
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 944
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 960
-        image: "elide.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 992
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 1008
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 1024
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 1040
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-    Frame {
-        msec: 1056
-        hash: "48e2da07fd229d9db6afc0eda494cd11"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png
deleted file mode 100644
index 6e2b625..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml
deleted file mode 100644
index 0c06196..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml
+++ /dev/null
@@ -1,303 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "873e914454b7a040b05649ebd1a2f8c5"
-    }
-    Frame {
-        msec: 32
-        hash: "7682a4f1e361ca252da9713734a598e8"
-    }
-    Frame {
-        msec: 48
-        hash: "fa8884b550c8df872f96b61557163bcf"
-    }
-    Frame {
-        msec: 64
-        hash: "b84ecf9e38f126c3e32defee831d9462"
-    }
-    Frame {
-        msec: 80
-        hash: "21cc08f22d1f1fcb38b27a3a4259debe"
-    }
-    Frame {
-        msec: 96
-        hash: "93bdfeab813e25e85917f49c0d5f1314"
-    }
-    Frame {
-        msec: 112
-        hash: "5f03c252602e60fe19879945fa77c203"
-    }
-    Frame {
-        msec: 128
-        hash: "f0b2079f6c512bf80989ebfdbec4cfd8"
-    }
-    Frame {
-        msec: 144
-        hash: "9e7bb12d5b7605fc1d78ed9b2a549527"
-    }
-    Frame {
-        msec: 160
-        hash: "242bbbe6da87708c92fd47607ecb789d"
-    }
-    Frame {
-        msec: 176
-        hash: "f1db5c3a230b4d3e2e1dfefe6bf032a1"
-    }
-    Frame {
-        msec: 192
-        hash: "a416e820efd8e173cc52372218513e33"
-    }
-    Frame {
-        msec: 208
-        hash: "df711ab70c6087f8138fded16167f069"
-    }
-    Frame {
-        msec: 224
-        hash: "fb28eb2eeccfab28299640ef996c1115"
-    }
-    Frame {
-        msec: 240
-        hash: "c72c6d79a50dd7147f6b33784880eb36"
-    }
-    Frame {
-        msec: 256
-        hash: "4421027e65e95f98499ca53c57220ede"
-    }
-    Frame {
-        msec: 272
-        hash: "b7fbfb90d8cc167809e8e846d9021b4b"
-    }
-    Frame {
-        msec: 288
-        hash: "004614b1bf18e9aa78e78509c4f289aa"
-    }
-    Frame {
-        msec: 304
-        hash: "1792bbd8b69bae1d92fed2a6bcfe0187"
-    }
-    Frame {
-        msec: 320
-        hash: "957a8b95d6e85885d854b8eb1db10b04"
-    }
-    Frame {
-        msec: 336
-        hash: "d00c3e4d6d8e8d04b949840c28d73a33"
-    }
-    Frame {
-        msec: 352
-        hash: "2b79feaa62d773d92d8a684685b2004c"
-    }
-    Frame {
-        msec: 368
-        hash: "ef2f11b187028de0c56b23db3168fbc8"
-    }
-    Frame {
-        msec: 384
-        hash: "3a489a96aaeca80355313198b935691d"
-    }
-    Frame {
-        msec: 400
-        hash: "389f1798f900795a8686c38ace755974"
-    }
-    Frame {
-        msec: 416
-        hash: "34fc20be52fe3843420819b9adb90b22"
-    }
-    Frame {
-        msec: 432
-        hash: "fa715c5b6640eafe204bf3b8095c74b9"
-    }
-    Frame {
-        msec: 448
-        hash: "8e8315edcf23167ac58228b8c28b43e6"
-    }
-    Frame {
-        msec: 464
-        hash: "c18e82038f57dd869112cb1be14e4cfe"
-    }
-    Frame {
-        msec: 480
-        hash: "3f07e95b09e39f2e5d93216850f4a4d9"
-    }
-    Frame {
-        msec: 496
-        hash: "20f0e6eaeac04d6f93565adfab485218"
-    }
-    Frame {
-        msec: 512
-        hash: "e3f66d1dfe88dd868a54a8493828ef5f"
-    }
-    Frame {
-        msec: 528
-        hash: "d39d34f63e1b29c187249cb388552b38"
-    }
-    Frame {
-        msec: 544
-        hash: "5d2e8df5003732f3b53fff4aaddea06c"
-    }
-    Frame {
-        msec: 560
-        hash: "35c3aa2dae481a8f817d849b3f3151f2"
-    }
-    Frame {
-        msec: 576
-        hash: "966b78018879224948b4d85fe73d7985"
-    }
-    Frame {
-        msec: 592
-        hash: "0db067bf9debc3f36dd539cf83652fb8"
-    }
-    Frame {
-        msec: 608
-        hash: "ea1c3249ffd2439533907ceaeaafbc56"
-    }
-    Frame {
-        msec: 624
-        hash: "da85c0e14b95ca9a729984b67ebd52ad"
-    }
-    Frame {
-        msec: 640
-        hash: "5c26ae844ac52dbe131fed0638787aac"
-    }
-    Frame {
-        msec: 656
-        hash: "4b09c23ad624db80afcb2a6c1d5ddb96"
-    }
-    Frame {
-        msec: 672
-        hash: "9995deb3d22b418a19093b4b988b3fcc"
-    }
-    Frame {
-        msec: 688
-        hash: "77e53358f2d4392d0ba988187e7e272c"
-    }
-    Frame {
-        msec: 704
-        hash: "3fbbb73e790cf4a0583531fe1580f761"
-    }
-    Frame {
-        msec: 720
-        hash: "9d562e141095a258ee61463e644d9889"
-    }
-    Frame {
-        msec: 736
-        hash: "d05633ca49f96bf327bed5c9c0f6ac98"
-    }
-    Frame {
-        msec: 752
-        hash: "34c38e40e831dbede8fa83de31ed76aa"
-    }
-    Frame {
-        msec: 768
-        hash: "288e52c8be54f4914f687cef4ce1f24a"
-    }
-    Frame {
-        msec: 784
-        hash: "0b8b744aaf67e8b17fa459bb0ffb6db5"
-    }
-    Frame {
-        msec: 800
-        hash: "273dbe3e8c21bfeafa516d07778928c8"
-    }
-    Frame {
-        msec: 816
-        hash: "ef94ee1885287c72fa78038547d98b96"
-    }
-    Frame {
-        msec: 832
-        hash: "965e6387672319ac04fdc42768e581f1"
-    }
-    Frame {
-        msec: 848
-        hash: "95553d8aaece94c7017e57b03cd46c9a"
-    }
-    Frame {
-        msec: 864
-        hash: "bdaf35b920e5b08b8639d452afd2d51e"
-    }
-    Frame {
-        msec: 880
-        hash: "0ed16f00e89327dc8679bec42179c4ce"
-    }
-    Frame {
-        msec: 896
-        hash: "8c93e0ac399e09e98e34b90654e0e42a"
-    }
-    Frame {
-        msec: 912
-        hash: "93798fbb33adb6c813018757cfa34017"
-    }
-    Frame {
-        msec: 928
-        hash: "db4d7581e9a1f082a2c29ef7482a7893"
-    }
-    Frame {
-        msec: 944
-        hash: "67e074c1e083334de84a3549f4ee9ca4"
-    }
-    Frame {
-        msec: 960
-        image: "multilength.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "b1122c815a755c9988bcf03a3f7d7d6d"
-    }
-    Frame {
-        msec: 992
-        hash: "31148bae6653bdc3f1827d06de845663"
-    }
-    Frame {
-        msec: 1008
-        hash: "812428a944086ca46e102891964dac69"
-    }
-    Frame {
-        msec: 1024
-        hash: "ee7bb66bd7e8623325200ac994f8b41a"
-    }
-    Frame {
-        msec: 1040
-        hash: "6bd21a98e5c373a2c78334a0255e7750"
-    }
-    Frame {
-        msec: 1056
-        hash: "2e8e1eea14068b0e82464ed52ec1ab7a"
-    }
-    Frame {
-        msec: 1072
-        hash: "6dca5756e20eeb778e31d7b602ce77d7"
-    }
-    Frame {
-        msec: 1088
-        hash: "3cbb6700b9e30864a2b1e3d4d71d2a78"
-    }
-    Frame {
-        msec: 1104
-        hash: "c4d0230d2c4f73191a514e5df4c0b083"
-    }
-    Frame {
-        msec: 1120
-        hash: "a33df967fe43151dfc503d2ac78f8ca8"
-    }
-    Frame {
-        msec: 1136
-        hash: "0c7ff101efe60b600cacaf8d04d79053"
-    }
-    Frame {
-        msec: 1152
-        hash: "d246cfb75d89b9666877860aaf45ba60"
-    }
-    Frame {
-        msec: 1168
-        hash: "1130998aa2618a29ec6bc4b9219eedfa"
-    }
-    Frame {
-        msec: 1184
-        hash: "741dd83003633bbf8d28c2d4ddd8a2d0"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png
deleted file mode 100644
index 1a8c89b..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml
deleted file mode 100644
index 59f17f7..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml
+++ /dev/null
@@ -1,279 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 32
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 48
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 64
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 80
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 96
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 112
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 128
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 144
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 160
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 176
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 192
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 208
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 224
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 240
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 256
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 272
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 288
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 304
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 320
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 336
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 352
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 368
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 384
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 400
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 416
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 432
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 448
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 464
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 480
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 496
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 512
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 528
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 544
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 560
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 576
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 592
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 608
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 624
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 640
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 656
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 672
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 688
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 704
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 720
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 736
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 752
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 768
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 784
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 800
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 816
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 832
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 848
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 864
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 880
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 896
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 912
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 928
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 944
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 960
-        image: "elide.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 992
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 1008
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 1024
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 1040
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-    Frame {
-        msec: 1056
-        hash: "c80d2bcd4be99c73e6c628870206ce8c"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.0.png
deleted file mode 100644
index 3dfade5..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.1.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.1.png
deleted file mode 100644
index 1ee2076..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.2.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.2.png
deleted file mode 100644
index ae680be..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.3.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.3.png
deleted file mode 100644
index c2859be..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.qml
deleted file mode 100644
index c592f18..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.qml
+++ /dev/null
@@ -1,991 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 32
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 48
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 64
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 80
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 96
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 112
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 128
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 144
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 160
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 176
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 192
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 208
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 224
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 240
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 256
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 272
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 288
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 304
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 320
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 336
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 352
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 368
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 384
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 400
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 416
-        hash: "086a46352aa1221b5e57f5624b0c256b"
-    }
-    Frame {
-        msec: 432
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
-    }
-    Frame {
-        msec: 448
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
-    }
-    Frame {
-        msec: 464
-        hash: "fc3a7e898d6bfa2af4d774b20609f967"
-    }
-    Frame {
-        msec: 480
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 496
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 512
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 528
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 544
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 560
-        hash: "3bcaa6426796bc9097e0aeba90dd5e39"
-    }
-    Frame {
-        msec: 576
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 592
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 608
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 624
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 640
-        hash: "4daa612cd7e7ee455ff1a93329202865"
-    }
-    Frame {
-        msec: 656
-        hash: "3f362ad550db910f1d9f261557c65913"
-    }
-    Frame {
-        msec: 672
-        hash: "3f362ad550db910f1d9f261557c65913"
-    }
-    Frame {
-        msec: 688
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 704
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 720
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 736
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 752
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 768
-        hash: "f159011c2b85fe212a32a7b5d2a57016"
-    }
-    Frame {
-        msec: 784
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
-    }
-    Frame {
-        msec: 800
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
-    }
-    Frame {
-        msec: 816
-        hash: "a892c67199c23e5d9012a6a24cb45d16"
-    }
-    Frame {
-        msec: 832
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 848
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 864
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 880
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 896
-        hash: "532e01ed6ede95eca68e641e2edb7f1c"
-    }
-    Frame {
-        msec: 912
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 928
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 944
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 960
-        image: "elide2.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "a7dc1d7dde956d62834de0968261386f"
-    }
-    Frame {
-        msec: 992
-        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
-    }
-    Frame {
-        msec: 1008
-        hash: "a590e1358fac567dda9fdfc6bfe4ab89"
-    }
-    Frame {
-        msec: 1024
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1040
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1056
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1072
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1088
-        hash: "778d34ca89b5db88fe26619576e9d337"
-    }
-    Frame {
-        msec: 1104
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
-    }
-    Frame {
-        msec: 1120
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
-    }
-    Frame {
-        msec: 1136
-        hash: "9424caee019aa9bccd4156b0b9ca2723"
-    }
-    Frame {
-        msec: 1152
-        hash: "000061a140ab71a44c0480a92ad3bc70"
-    }
-    Frame {
-        msec: 1168
-        hash: "000061a140ab71a44c0480a92ad3bc70"
-    }
-    Frame {
-        msec: 1184
-        hash: "000061a140ab71a44c0480a92ad3bc70"
-    }
-    Frame {
-        msec: 1200
-        hash: "5dec9638853165428cd15ae02e1d03ce"
-    }
-    Frame {
-        msec: 1216
-        hash: "5dec9638853165428cd15ae02e1d03ce"
-    }
-    Frame {
-        msec: 1232
-        hash: "5dec9638853165428cd15ae02e1d03ce"
-    }
-    Frame {
-        msec: 1248
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1264
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1280
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1296
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1312
-        hash: "ecb69bdbd13114715f738b1ace3ecf51"
-    }
-    Frame {
-        msec: 1328
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1344
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1360
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1376
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1392
-        hash: "923b4f4f4a3dbaefbf003859067b2ea9"
-    }
-    Frame {
-        msec: 1408
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1424
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1440
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1456
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1472
-        hash: "d4230a476237f9e13a132e775f1b960c"
-    }
-    Frame {
-        msec: 1488
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1504
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1520
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1536
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1552
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1568
-        hash: "504ad2ba8543f7ad6490bd45d86fbef9"
-    }
-    Frame {
-        msec: 1584
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
-    }
-    Frame {
-        msec: 1600
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
-    }
-    Frame {
-        msec: 1616
-        hash: "dd412c6a2e5cb8890cb43142c84a5673"
-    }
-    Frame {
-        msec: 1632
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1648
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1664
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1680
-        hash: "38b1fa7bd4e2f13b05caa62903c56ab6"
-    }
-    Frame {
-        msec: 1696
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
-    }
-    Frame {
-        msec: 1712
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
-    }
-    Frame {
-        msec: 1728
-        hash: "ffb2cb01c868c1dfa6b5154c4e8a7fd8"
-    }
-    Frame {
-        msec: 1744
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1760
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Frame {
-        msec: 1776
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Frame {
-        msec: 1792
-        hash: "9effd5fc19246cfe3d2f5968c5caaa4e"
-    }
-    Frame {
-        msec: 1808
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1824
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1840
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1856
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1872
-        hash: "4fa14ae57d170b16fd90d59d5ec83561"
-    }
-    Frame {
-        msec: 1888
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1904
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1920
-        image: "elide2.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1952
-        hash: "976dd5bc154522438f92790f28639512"
-    }
-    Frame {
-        msec: 1968
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 1984
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2000
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2016
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2032
-        hash: "4ae1d6ddb9a78cc2f4e81b58fcca6a20"
-    }
-    Frame {
-        msec: 2048
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
-    }
-    Frame {
-        msec: 2064
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
-    }
-    Frame {
-        msec: 2080
-        hash: "84bdf634cfd4de588f2b0984aa3e97bd"
-    }
-    Frame {
-        msec: 2096
-        hash: "1a978ed6951afe40912efcfb54dcce65"
-    }
-    Frame {
-        msec: 2112
-        hash: "1a978ed6951afe40912efcfb54dcce65"
-    }
-    Frame {
-        msec: 2128
-        hash: "1a978ed6951afe40912efcfb54dcce65"
-    }
-    Frame {
-        msec: 2144
-        hash: "a57eea59fe6475164e24688489977869"
-    }
-    Frame {
-        msec: 2160
-        hash: "a57eea59fe6475164e24688489977869"
-    }
-    Frame {
-        msec: 2176
-        hash: "a57eea59fe6475164e24688489977869"
-    }
-    Frame {
-        msec: 2192
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2208
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2224
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2240
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2256
-        hash: "69ac1d93bd51f495783dbc6a0f7b27be"
-    }
-    Frame {
-        msec: 2272
-        hash: "04c62a4d01e9309eaeea87902013c8b9"
-    }
-    Frame {
-        msec: 2288
-        hash: "04c62a4d01e9309eaeea87902013c8b9"
-    }
-    Frame {
-        msec: 2304
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2320
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2336
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2352
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2368
-        hash: "fac2f5730a600d6b69280d5e6962c1d2"
-    }
-    Frame {
-        msec: 2384
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2400
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2416
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2432
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2448
-        hash: "13f7ce73c0a2f1c7958294e4fbf3d30d"
-    }
-    Frame {
-        msec: 2464
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2480
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2496
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2512
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2528
-        hash: "96a5678ee5bcbf28df6a2bf66b2b6189"
-    }
-    Frame {
-        msec: 2544
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2560
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2576
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2592
-        hash: "abb220abcd579abd988b6f9f7e0bc2b7"
-    }
-    Frame {
-        msec: 2608
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
-    }
-    Frame {
-        msec: 2624
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
-    }
-    Frame {
-        msec: 2640
-        hash: "8a8585eb9a5cd1d6c38dc7076923e7f7"
-    }
-    Frame {
-        msec: 2656
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2672
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2688
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2704
-        hash: "c13ec1d294921e6a56f6ac4198e084eb"
-    }
-    Frame {
-        msec: 2720
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2736
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2752
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2768
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2784
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2800
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2816
-        hash: "53295720dbabe6fbfff56bea0e0ba7f1"
-    }
-    Frame {
-        msec: 2832
-        hash: "f44b88b80219497370b5d2ad380d03bf"
-    }
-    Frame {
-        msec: 2848
-        hash: "f44b88b80219497370b5d2ad380d03bf"
-    }
-    Frame {
-        msec: 2864
-        hash: "a093510751799f3466156f9775988044"
-    }
-    Frame {
-        msec: 2880
-        image: "elide2.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "a093510751799f3466156f9775988044"
-    }
-    Frame {
-        msec: 2912
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2928
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2944
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2960
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2976
-        hash: "6327bcbb2d78d3c33eb964643b0d09a5"
-    }
-    Frame {
-        msec: 2992
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3008
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3024
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3040
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3056
-        hash: "d7da3826914ad1d2696803b659992e73"
-    }
-    Frame {
-        msec: 3072
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
-    }
-    Frame {
-        msec: 3088
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
-    }
-    Frame {
-        msec: 3104
-        hash: "ad40dc153a57c35ea62d9d044f08c9ac"
-    }
-    Frame {
-        msec: 3120
-        hash: "df90afe882b18f3fd7b12e52ff36e66f"
-    }
-    Frame {
-        msec: 3136
-        hash: "df90afe882b18f3fd7b12e52ff36e66f"
-    }
-    Frame {
-        msec: 3152
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
-    }
-    Frame {
-        msec: 3168
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
-    }
-    Frame {
-        msec: 3184
-        hash: "5b84785ffe15c15c3b94c845db7a4a44"
-    }
-    Frame {
-        msec: 3200
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3216
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3232
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3248
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3264
-        hash: "f5ca71af8d9fa1809ab88b60f9170bb5"
-    }
-    Frame {
-        msec: 3280
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3296
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3312
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3328
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3344
-        hash: "39f1b201715413f13a60f449eef29706"
-    }
-    Frame {
-        msec: 3360
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
-    }
-    Frame {
-        msec: 3376
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
-    }
-    Frame {
-        msec: 3392
-        hash: "4baf5c1227de45f9e620fe6eb0590014"
-    }
-    Frame {
-        msec: 3408
-        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
-    }
-    Frame {
-        msec: 3424
-        hash: "e1ce9c06e59fb6348fff3ce650c7943e"
-    }
-    Frame {
-        msec: 3440
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3456
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3472
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3488
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3504
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3520
-        hash: "ad812bdef31b4f1f42c35f7d56b3af83"
-    }
-    Frame {
-        msec: 3536
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3552
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3568
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3584
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3600
-        hash: "c08c8bcfc8c23f5e0e89d7f632fde2ca"
-    }
-    Frame {
-        msec: 3616
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3632
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3648
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3664
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3680
-        hash: "b8853dc109d063d982952780aa80419a"
-    }
-    Frame {
-        msec: 3696
-        hash: "6bfd7cfd6369df1eb570fda103d9e009"
-    }
-    Frame {
-        msec: 3712
-        hash: "6bfd7cfd6369df1eb570fda103d9e009"
-    }
-    Frame {
-        msec: 3728
-        hash: "b6dba4a456cd8d1b62501039cb796625"
-    }
-    Frame {
-        msec: 3744
-        hash: "b6dba4a456cd8d1b62501039cb796625"
-    }
-    Frame {
-        msec: 3760
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3776
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3792
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3808
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3824
-        hash: "f43892fffe4a8ce005b60ec43ce0aa4a"
-    }
-    Frame {
-        msec: 3840
-        image: "elide2.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "d2e873e69aed3e0b6e53123cd63e386c"
-    }
-    Frame {
-        msec: 3872
-        hash: "d2e873e69aed3e0b6e53123cd63e386c"
-    }
-    Frame {
-        msec: 3888
-        hash: "baa8edfce77628c7a1ec83adce96e2c6"
-    }
-    Frame {
-        msec: 3904
-        hash: "baa8edfce77628c7a1ec83adce96e2c6"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml
deleted file mode 100644
index fa6b5da..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: childrenRect.width
-    height: childrenRect.height
-    Column {
-        width: 80
-        height: myText.height*4
-        Text {
-            elide: "ElideLeft"
-            text: "aaa bbb ccc ddd eee fff"
-            width: 80
-            id: myText
-        }
-        Text {
-            elide: "ElideMiddle"
-            text: "aaa bbb ccc ddd eee fff"
-            width: 80
-        }
-        Text {
-            elide: "ElideRight"
-            text: "aaa bbb ccc ddd eee fff"
-            width: 80
-        }
-        Text {
-            elide: "ElideNone"
-            text: "aaa bbb ccc ddd eee fff"
-            width: 80
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml
deleted file mode 100644
index c163e05..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 500
-    height: 100
-
-    Text {
-        width: NumberAnimation { from: 500; to: 0; repeat: true; duration: 5000 }
-        elide: Text.ElideRight
-        text: 'Here is some very long text that we should truncate when sizing window'
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml
deleted file mode 100644
index ca41eab..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 500
-    height: 50
-    color: "lightBlue"
-    Rectangle {
-        width: myText.width
-        height: myText.height
-        color: "white"
-        anchors.centerIn: parent
-        Text {
-            id: myText
-            width: NumberAnimation { from: 500; to: 0; repeat: true; duration: 1000 }
-            elide: "ElideRight"
-            text: "Brevity is the soul of wit, and tediousness the limbs and outward flourishes.\x9CBrevity is a great charm of eloquence.\x9CBe concise!\x9CSHHHHHHHHHHHHHHHHHHHHHHHHHHHH"
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png
deleted file mode 100644
index 67b497f..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml
deleted file mode 100644
index ab17eb1..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml
+++ /dev/null
@@ -1,351 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 32
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 48
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 64
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 80
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 96
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 112
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 128
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 144
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 160
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 176
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 192
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 208
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 224
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 240
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 256
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 272
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 288
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 304
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 320
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 336
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 352
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 368
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 384
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 400
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 416
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 432
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 448
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 464
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 480
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 496
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 512
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 528
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 544
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 560
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 576
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 592
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 608
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 624
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 640
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 656
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 672
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 688
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 704
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 720
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 736
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 752
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 768
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 784
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 800
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 816
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 832
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 848
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 864
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 880
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 896
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 912
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 928
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 944
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 960
-        image: "plaintext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 992
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1008
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1024
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1040
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1056
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1072
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1088
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1104
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1120
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1136
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1152
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1168
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1184
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1216
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1232
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1248
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1264
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1280
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1296
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1312
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1328
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-    Frame {
-        msec: 1344
-        hash: "cbf65bcb64a4781b79132b87f98d5fc7"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png
deleted file mode 100644
index 6379942..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml
deleted file mode 100644
index 72499b9..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml
+++ /dev/null
@@ -1,359 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 32
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 48
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 64
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 80
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 96
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 112
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 128
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 144
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 160
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 176
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 192
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 208
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 224
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 240
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 256
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 272
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 288
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 304
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 320
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 336
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 352
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 368
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 384
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 400
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 416
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 432
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 448
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 464
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 480
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 496
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 512
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 528
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 544
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 560
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 576
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 592
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 608
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 624
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 640
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 656
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 672
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 688
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 704
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 720
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 736
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 752
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 768
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 784
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 800
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 816
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 832
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 848
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 864
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 880
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 896
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 912
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 928
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 944
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 960
-        image: "richtext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 992
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1008
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1024
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1040
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1056
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1072
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1088
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1104
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1120
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1136
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1152
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1168
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1184
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1200
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1216
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1232
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1248
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1264
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1280
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1296
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1312
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1328
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1344
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1360
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-    Frame {
-        msec: 1376
-        hash: "b902ff73e7c943bb09b5d2ae6c7a760e"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png
deleted file mode 100644
index 50d56dc..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml
deleted file mode 100644
index f4cbcbd..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml
+++ /dev/null
@@ -1,351 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 32
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 48
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 64
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 80
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 96
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 112
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 128
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 144
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 160
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 176
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 192
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 208
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 224
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 240
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 256
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 272
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 288
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 304
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 320
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 336
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 352
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 368
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 384
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 400
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 416
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 432
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 448
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 464
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 480
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 496
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 512
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 528
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 544
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 560
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 576
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 592
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 608
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 624
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 640
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 656
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 672
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 688
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 704
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 720
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 736
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 752
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 768
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 784
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 800
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 816
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 832
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 848
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 864
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 880
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 896
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 912
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 928
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 944
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 960
-        image: "plaintext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 992
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1008
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1024
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1040
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1056
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1072
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1088
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1104
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1120
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1136
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1152
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1168
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1184
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1216
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1232
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1248
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1264
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1280
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1296
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1312
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1328
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-    Frame {
-        msec: 1344
-        hash: "d553014bc56a46787e30459b0f44f57a"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png
deleted file mode 100644
index 2910670..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml
deleted file mode 100644
index 9f396c2..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml
+++ /dev/null
@@ -1,359 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 32
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 48
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 64
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 80
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 96
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 112
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 128
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 144
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 160
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 176
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 192
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 208
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 224
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 240
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 256
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 272
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 288
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 304
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 320
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 336
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 352
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 368
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 384
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 400
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 416
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 432
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 448
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 464
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 480
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 496
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 512
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 528
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 544
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 560
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 576
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 592
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 608
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 624
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 640
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 656
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 672
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 688
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 704
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 720
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 736
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 752
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 768
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 784
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 800
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 816
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 832
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 848
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 864
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 880
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 896
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 912
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 928
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 944
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 960
-        image: "richtext.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 992
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1008
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1024
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1040
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1056
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1072
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1088
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1104
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1120
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1136
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1152
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1168
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1184
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1200
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1216
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1232
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1248
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1264
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1280
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1296
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1312
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1328
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1344
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1360
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-    Frame {
-        msec: 1376
-        hash: "dfea78484b840b8cab690e277b960723"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml
deleted file mode 100644
index a3aa929..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: s; width: 800; height: 1000; color: "lightsteelblue"
-    property string text: "The quick brown fox jumps over the lazy dog."
-
-    Column {
-        spacing: 10
-        Text {
-            text: s.text
-        }
-        Text {
-            text: s.text; font.pixelSize: 18
-        }
-        Text {
-            text: s.text; font.pointSize: 25
-        }
-        Text {
-            text: s.text; color: "red"; smooth: true
-        }
-        Text {
-            text: s.text; font.capitalization: "AllUppercase"
-        }
-        Text {
-            text: s.text; font.underline: true
-        }
-        Text {
-            text: s.text; font.overline: true; smooth: true
-        }
-        Text {
-            text: s.text; font.strikeout: true
-        }
-        Text {
-            text: s.text; font.underline: true; font.overline: true; font.strikeout: true
-        }
-        Text {
-            text: s.text; font.letterSpacing: 200
-        }
-        Text {
-            text: s.text; font.underline: true; font.letterSpacing: 200; font.capitalization: "AllUppercase"; color: "blue"
-        }
-        Text {
-            text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
-        }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
-        }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
-        }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
-        }
-        Text {
-            text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
-        }
-        Text {
-            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20
-        }
-        Text {
-            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20
-        }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideLeft; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideMiddle; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideRight; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideLeft; width: 200; wrap: true
-        }
-        Text {
-            text: s.text; elide: Text.ElideMiddle; width: 200; wrap: true
-        }
-        Text {
-            text: s.text; elide: Text.ElideRight; width: 200; wrap: true
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml
deleted file mode 100644
index 35aa232..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: s; width: 800; height: 1000; color: "lightsteelblue"
-    property string text: "<b>The</b> <i>quick</i> <u>brown</u> <o>fox</o> <big>jumps</big> <small>over</small> <tt>the</tt> <s>lazy</s> <em>dog</em>."
-
-    Column {
-        spacing: 10
-        Text {
-            text: s.text
-        }
-        Text {
-            text: s.text; font.pixelSize: 18
-        }
-        Text {
-            text: s.text; font.pointSize: 25
-        }
-        Text {
-            text: s.text; color: "red"; smooth: true
-        }
-        Text {
-            text: s.text; font.capitalization: "AllUppercase"
-        }
-        Text {
-            text: s.text; font.underline: true
-        }
-        Text {
-            text: s.text; font.overline: true; smooth: true
-        }
-        Text {
-            text: s.text; font.strikeout: true
-        }
-        Text {
-            text: s.text; font.underline: true; font.overline: true; font.strikeout: true
-        }
-        Text {
-            text: s.text; font.letterSpacing: 200
-        }
-        Text {
-            text: s.text; font.underline: true; font.letterSpacing: 200; font.capitalization: "AllUppercase"; color: "blue"
-        }
-        Text {
-            text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
-        }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
-        }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
-        }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
-        }
-        Text {
-            text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
-        }
-        Text {
-            text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20
-        }
-        Text {
-            text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20
-        }
-        Text {
-            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideLeft; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideMiddle; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideRight; width: 200
-        }
-        Text {
-            text: s.text; elide: Text.ElideLeft; width: 200; wrap: true
-        }
-        Text {
-            text: s.text; elide: Text.ElideMiddle; width: 200; wrap: true
-        }
-        Text {
-            text: s.text; elide: Text.ElideRight; width: 200; wrap: true
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
deleted file mode 100644
index 176a5b8..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import Qt 4.6
-    Rectangle {
-    resources: [
-        Component { id: cursorA
-            Item { id: cPage;
-                x: Behavior { NumberAnimation { } }
-                y: Behavior { NumberAnimation { } }
-                height: Behavior { NumberAnimation { duration: 200 } }
-                Rectangle { id: cRectangle; color: "black"; y: 1; width: 1; height: parent.height-2;
-                    Rectangle { id:top; color: "black"; width: 3; height: 1; x: -1; y:0}
-                    Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
-                    opacity: 1
-                    opacity: SequentialAnimation { running: cPage.parent.focus == true; repeat: true;
-                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
-                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
-                             }
-                }
-                width: 1;
-            }
-        }
-    ]
-    width: 400
-    height: 200
-    color: "white"
-    TextEdit { id: mainText
-        text: "Hello World"
-        cursorDelegate: cursorA
-        focus: true
-        font.pixelSize: 28
-        selectionColor: "lightsteelblue"
-        selectedTextColor: "deeppink"
-        color: "forestgreen"
-        anchors.centerIn: parent
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.0.png
deleted file mode 100644
index 464a578..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.1.png
deleted file mode 100644
index 9beb1ca..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.2.png
deleted file mode 100644
index 001be30..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.3.png
deleted file mode 100644
index fc3e4b3..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.4.png
deleted file mode 100644
index 24f43e6..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.5.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.5.png
deleted file mode 100644
index 001223b..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.6.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.6.png
deleted file mode 100644
index 7126e07..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.7.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.7.png
deleted file mode 100644
index f0bea88..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.8.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.8.png
deleted file mode 100644
index 4381b8d..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.qml
deleted file mode 100644
index 8ee92d7..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.qml
+++ /dev/null
@@ -1,3555 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 32
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 48
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 64
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 80
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 96
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 112
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 128
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 144
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 160
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 176
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 192
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 208
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 224
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 240
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 256
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 272
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 288
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 304
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 320
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 336
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 352
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 368
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 384
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 400
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 416
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 432
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 448
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 464
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 480
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 496
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 512
-        hash: "e0366dbd264ca453f5dad3a7966f17a2"
-    }
-    Frame {
-        msec: 528
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
-    }
-    Frame {
-        msec: 544
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
-    }
-    Frame {
-        msec: 560
-        hash: "ff5fac70804eb01da28c2988aba520a4"
-    }
-    Frame {
-        msec: 576
-        hash: "a6bdf56b4f8783969935488e1955e59c"
-    }
-    Frame {
-        msec: 592
-        hash: "d0ad97647c5092a64426187406ec5316"
-    }
-    Frame {
-        msec: 608
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
-    }
-    Frame {
-        msec: 624
-        hash: "0285340a2e03568810a76d840369f5c8"
-    }
-    Frame {
-        msec: 640
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
-    }
-    Frame {
-        msec: 656
-        hash: "3caa36cc3857803248d12ec09ea357df"
-    }
-    Frame {
-        msec: 672
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
-    }
-    Frame {
-        msec: 688
-        hash: "aadc71923926885ccce87e6be1c742d7"
-    }
-    Frame {
-        msec: 704
-        hash: "9b7503189ecf2999934716f227469463"
-    }
-    Frame {
-        msec: 720
-        hash: "874296e182abe96e58f9c0463a0f32c9"
-    }
-    Frame {
-        msec: 736
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
-    }
-    Frame {
-        msec: 752
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
-    }
-    Frame {
-        msec: 768
-        hash: "0034ef8851c9810ed5d50496aea367da"
-    }
-    Frame {
-        msec: 784
-        hash: "24cebf60ade86469a154abaa64f3b40d"
-    }
-    Frame {
-        msec: 800
-        hash: "1100ef4e2db234ea77ff4c70df6bfbe7"
-    }
-    Frame {
-        msec: 816
-        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
-    }
-    Frame {
-        msec: 832
-        hash: "5c1000fdc279742cbe46987045c0a92b"
-    }
-    Frame {
-        msec: 848
-        hash: "bcef4a0ff72330f05f2bf5042e414fde"
-    }
-    Frame {
-        msec: 864
-        hash: "228551c38b567f1550b44f9dac08786b"
-    }
-    Frame {
-        msec: 880
-        hash: "531c5ca6992c4a12927c61e22c02dd6b"
-    }
-    Frame {
-        msec: 896
-        hash: "127cc30967f95cb88f4238e0b33c741d"
-    }
-    Frame {
-        msec: 912
-        hash: "3c3fb1d8dbe7443f80550a30ada7f120"
-    }
-    Frame {
-        msec: 928
-        hash: "edca065d42bf9b63a79d1e97d1a1eed0"
-    }
-    Frame {
-        msec: 944
-        hash: "1e4424f1f40bfce3205e1d1401ab0dcf"
-    }
-    Frame {
-        msec: 960
-        image: "cursorDelegate.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1072
-        hash: "90ac5ad7ce23786fe838426605e737e1"
-    }
-    Frame {
-        msec: 1088
-        hash: "1e4424f1f40bfce3205e1d1401ab0dcf"
-    }
-    Frame {
-        msec: 1104
-        hash: "edca065d42bf9b63a79d1e97d1a1eed0"
-    }
-    Frame {
-        msec: 1120
-        hash: "3c3fb1d8dbe7443f80550a30ada7f120"
-    }
-    Frame {
-        msec: 1136
-        hash: "127cc30967f95cb88f4238e0b33c741d"
-    }
-    Frame {
-        msec: 1152
-        hash: "531c5ca6992c4a12927c61e22c02dd6b"
-    }
-    Frame {
-        msec: 1168
-        hash: "228551c38b567f1550b44f9dac08786b"
-    }
-    Frame {
-        msec: 1184
-        hash: "bcef4a0ff72330f05f2bf5042e414fde"
-    }
-    Frame {
-        msec: 1200
-        hash: "5c1000fdc279742cbe46987045c0a92b"
-    }
-    Frame {
-        msec: 1216
-        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
-    }
-    Frame {
-        msec: 1232
-        hash: "1100ef4e2db234ea77ff4c70df6bfbe7"
-    }
-    Frame {
-        msec: 1248
-        hash: "24cebf60ade86469a154abaa64f3b40d"
-    }
-    Frame {
-        msec: 1264
-        hash: "0034ef8851c9810ed5d50496aea367da"
-    }
-    Frame {
-        msec: 1280
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
-    }
-    Frame {
-        msec: 1296
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
-    }
-    Frame {
-        msec: 1312
-        hash: "874296e182abe96e58f9c0463a0f32c9"
-    }
-    Frame {
-        msec: 1328
-        hash: "9b7503189ecf2999934716f227469463"
-    }
-    Frame {
-        msec: 1344
-        hash: "aadc71923926885ccce87e6be1c742d7"
-    }
-    Frame {
-        msec: 1360
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
-    }
-    Frame {
-        msec: 1376
-        hash: "3caa36cc3857803248d12ec09ea357df"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1392
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
-    }
-    Frame {
-        msec: 1408
-        hash: "0285340a2e03568810a76d840369f5c8"
-    }
-    Frame {
-        msec: 1424
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
-    }
-    Frame {
-        msec: 1440
-        hash: "d0ad97647c5092a64426187406ec5316"
-    }
-    Frame {
-        msec: 1456
-        hash: "a6bdf56b4f8783969935488e1955e59c"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1472
-        hash: "ff5fac70804eb01da28c2988aba520a4"
-    }
-    Frame {
-        msec: 1488
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
-    }
-    Frame {
-        msec: 1504
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
-    }
-    Frame {
-        msec: 1520
-        hash: "907c6363d1e524f391d001944febe1ac"
-    }
-    Frame {
-        msec: 1536
-        hash: "313a06d40274e46453342e66236f09f8"
-    }
-    Frame {
-        msec: 1552
-        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
-    }
-    Frame {
-        msec: 1568
-        hash: "a9911e076af337fe30e322f03d84a528"
-    }
-    Frame {
-        msec: 1584
-        hash: "4a8efcc341bba9ba621ce0f785a75432"
-    }
-    Frame {
-        msec: 1600
-        hash: "479f192c8cf7b8e4407655382402700f"
-    }
-    Frame {
-        msec: 1616
-        hash: "63dc16e66def35abba5159d5650f165d"
-    }
-    Frame {
-        msec: 1632
-        hash: "26e88aae512304c28d425c311febce1b"
-    }
-    Key {
-        type: 6
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1648
-        hash: "8dca7a7912ddaa853dff9c09882082b1"
-    }
-    Frame {
-        msec: 1664
-        hash: "5c3ebee155e29a0ba4a45706dd87396a"
-    }
-    Frame {
-        msec: 1680
-        hash: "29a517a66867f6f527c6db5bb5651f92"
-    }
-    Frame {
-        msec: 1696
-        hash: "a4fde31f55f866224eca2b51586b601f"
-    }
-    Frame {
-        msec: 1712
-        hash: "9c9c7fb9fb8aab8c24f2eb03df791a00"
-    }
-    Frame {
-        msec: 1728
-        hash: "dd972e37166d1186a717a956343a7758"
-    }
-    Key {
-        type: 7
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1744
-        hash: "1af5e24651ef422ff93dab7bd2a8f832"
-    }
-    Frame {
-        msec: 1760
-        hash: "885473be4e44bb1f4b014f9b3d4d2e74"
-    }
-    Frame {
-        msec: 1776
-        hash: "1f6e0407392322c34567caaecae5b449"
-    }
-    Frame {
-        msec: 1792
-        hash: "dcae85a4b05c450b6b1619f9fd7e17b0"
-    }
-    Frame {
-        msec: 1808
-        hash: "3b872e5030e34edf678ac2547df48699"
-    }
-    Frame {
-        msec: 1824
-        hash: "5d76b324496297d08cff57b4c21ce592"
-    }
-    Frame {
-        msec: 1840
-        hash: "4acfe3c4cf2f4e477f1a72817af556d2"
-    }
-    Frame {
-        msec: 1856
-        hash: "a04671fe8d28cfb629f2090e342747fb"
-    }
-    Frame {
-        msec: 1872
-        hash: "2474db802c7d8e0ec8fa7f958c04bf30"
-    }
-    Frame {
-        msec: 1888
-        hash: "11a1e1f38c407de4bc069aa192319fe4"
-    }
-    Frame {
-        msec: 1904
-        hash: "ec8aacc8d2280068dd7f020e8648afea"
-    }
-    Frame {
-        msec: 1920
-        image: "cursorDelegate.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "fbbe4d0fed6274968a89e02bb1ca5685"
-    }
-    Frame {
-        msec: 1952
-        hash: "13d478424a8f0cab8bab6a157efce318"
-    }
-    Frame {
-        msec: 1968
-        hash: "ea6bc9ec217fb80b86276a2675c08a0f"
-    }
-    Frame {
-        msec: 1984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2064
-        hash: "ea6bc9ec217fb80b86276a2675c08a0f"
-    }
-    Frame {
-        msec: 2080
-        hash: "13d478424a8f0cab8bab6a157efce318"
-    }
-    Frame {
-        msec: 2096
-        hash: "fbbe4d0fed6274968a89e02bb1ca5685"
-    }
-    Frame {
-        msec: 2112
-        hash: "00dedd48bd6861cb4bf4953162a67cc0"
-    }
-    Key {
-        type: 6
-        key: 16777248
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2128
-        hash: "ec8aacc8d2280068dd7f020e8648afea"
-    }
-    Frame {
-        msec: 2144
-        hash: "11a1e1f38c407de4bc069aa192319fe4"
-    }
-    Frame {
-        msec: 2160
-        hash: "2474db802c7d8e0ec8fa7f958c04bf30"
-    }
-    Frame {
-        msec: 2176
-        hash: "a04671fe8d28cfb629f2090e342747fb"
-    }
-    Frame {
-        msec: 2192
-        hash: "4acfe3c4cf2f4e477f1a72817af556d2"
-    }
-    Frame {
-        msec: 2208
-        hash: "5d76b324496297d08cff57b4c21ce592"
-    }
-    Frame {
-        msec: 2224
-        hash: "3b872e5030e34edf678ac2547df48699"
-    }
-    Frame {
-        msec: 2240
-        hash: "dcae85a4b05c450b6b1619f9fd7e17b0"
-    }
-    Frame {
-        msec: 2256
-        hash: "1f6e0407392322c34567caaecae5b449"
-    }
-    Frame {
-        msec: 2272
-        hash: "885473be4e44bb1f4b014f9b3d4d2e74"
-    }
-    Frame {
-        msec: 2288
-        hash: "1af5e24651ef422ff93dab7bd2a8f832"
-    }
-    Frame {
-        msec: 2304
-        hash: "dd972e37166d1186a717a956343a7758"
-    }
-    Frame {
-        msec: 2320
-        hash: "9c9c7fb9fb8aab8c24f2eb03df791a00"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2336
-        hash: "aec9683f3a677dab781bdf3bbf7cce5e"
-    }
-    Frame {
-        msec: 2352
-        hash: "63c6a7810dec832f1b8288807f1d932a"
-    }
-    Frame {
-        msec: 2368
-        hash: "70409eeee50fbb54097a3c430e1e1f21"
-    }
-    Frame {
-        msec: 2384
-        hash: "efc77b82c0ffd7f3fbe5fed06ea418bd"
-    }
-    Frame {
-        msec: 2400
-        hash: "26e88aae512304c28d425c311febce1b"
-    }
-    Frame {
-        msec: 2416
-        hash: "63dc16e66def35abba5159d5650f165d"
-    }
-    Frame {
-        msec: 2432
-        hash: "479f192c8cf7b8e4407655382402700f"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2448
-        hash: "4a8efcc341bba9ba621ce0f785a75432"
-    }
-    Frame {
-        msec: 2464
-        hash: "a9911e076af337fe30e322f03d84a528"
-    }
-    Frame {
-        msec: 2480
-        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
-    }
-    Frame {
-        msec: 2496
-        hash: "313a06d40274e46453342e66236f09f8"
-    }
-    Frame {
-        msec: 2512
-        hash: "907c6363d1e524f391d001944febe1ac"
-    }
-    Frame {
-        msec: 2528
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
-    }
-    Frame {
-        msec: 2544
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
-    }
-    Frame {
-        msec: 2560
-        hash: "ff5fac70804eb01da28c2988aba520a4"
-    }
-    Frame {
-        msec: 2576
-        hash: "a6bdf56b4f8783969935488e1955e59c"
-    }
-    Frame {
-        msec: 2592
-        hash: "d0ad97647c5092a64426187406ec5316"
-    }
-    Frame {
-        msec: 2608
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
-    }
-    Frame {
-        msec: 2624
-        hash: "0285340a2e03568810a76d840369f5c8"
-    }
-    Frame {
-        msec: 2640
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
-    }
-    Frame {
-        msec: 2656
-        hash: "3caa36cc3857803248d12ec09ea357df"
-    }
-    Frame {
-        msec: 2672
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
-    }
-    Frame {
-        msec: 2688
-        hash: "aadc71923926885ccce87e6be1c742d7"
-    }
-    Frame {
-        msec: 2704
-        hash: "9b7503189ecf2999934716f227469463"
-    }
-    Frame {
-        msec: 2720
-        hash: "874296e182abe96e58f9c0463a0f32c9"
-    }
-    Frame {
-        msec: 2736
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
-    }
-    Frame {
-        msec: 2752
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
-    }
-    Frame {
-        msec: 2768
-        hash: "0034ef8851c9810ed5d50496aea367da"
-    }
-    Frame {
-        msec: 2784
-        hash: "24cebf60ade86469a154abaa64f3b40d"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2800
-        hash: "1100ef4e2db234ea77ff4c70df6bfbe7"
-    }
-    Frame {
-        msec: 2816
-        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
-    }
-    Frame {
-        msec: 2832
-        hash: "5c1000fdc279742cbe46987045c0a92b"
-    }
-    Frame {
-        msec: 2848
-        hash: "bcef4a0ff72330f05f2bf5042e414fde"
-    }
-    Frame {
-        msec: 2864
-        hash: "228551c38b567f1550b44f9dac08786b"
-    }
-    Frame {
-        msec: 2880
-        image: "cursorDelegate.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "127cc30967f95cb88f4238e0b33c741d"
-    }
-    Frame {
-        msec: 2912
-        hash: "3c3fb1d8dbe7443f80550a30ada7f120"
-    }
-    Frame {
-        msec: 2928
-        hash: "edca065d42bf9b63a79d1e97d1a1eed0"
-    }
-    Frame {
-        msec: 2944
-        hash: "1e4424f1f40bfce3205e1d1401ab0dcf"
-    }
-    Frame {
-        msec: 2960
-        hash: "90ac5ad7ce23786fe838426605e737e1"
-    }
-    Frame {
-        msec: 2976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3072
-        hash: "90ac5ad7ce23786fe838426605e737e1"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3088
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
-    }
-    Frame {
-        msec: 3104
-        hash: "df6f025130dc82f4764def81cec5fa7b"
-    }
-    Frame {
-        msec: 3120
-        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
-    }
-    Frame {
-        msec: 3136
-        hash: "14b328c8ec6276e022643102af80fa44"
-    }
-    Frame {
-        msec: 3152
-        hash: "078d75d72bff036574b85ac0aeaaf2b6"
-    }
-    Frame {
-        msec: 3168
-        hash: "fbefb1e0801f4578ab93dd7ff4062e68"
-    }
-    Frame {
-        msec: 3184
-        hash: "eac8375d9b9cf0afbf232e27c6ceb037"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3200
-        hash: "3462a3e166120515e67430600e4653f8"
-    }
-    Frame {
-        msec: 3216
-        hash: "7f2d9959323f0707e36ecb2252c89727"
-    }
-    Frame {
-        msec: 3232
-        hash: "0a1c2eb8a7451a5e37fefb96a58a88a1"
-    }
-    Frame {
-        msec: 3248
-        hash: "4a02aaca12e3fd86ee3b516b3a307f86"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3264
-        hash: "0034ef8851c9810ed5d50496aea367da"
-    }
-    Frame {
-        msec: 3280
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
-    }
-    Frame {
-        msec: 3296
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
-    }
-    Frame {
-        msec: 3312
-        hash: "874296e182abe96e58f9c0463a0f32c9"
-    }
-    Frame {
-        msec: 3328
-        hash: "9b7503189ecf2999934716f227469463"
-    }
-    Frame {
-        msec: 3344
-        hash: "aadc71923926885ccce87e6be1c742d7"
-    }
-    Frame {
-        msec: 3360
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3376
-        hash: "3caa36cc3857803248d12ec09ea357df"
-    }
-    Frame {
-        msec: 3392
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
-    }
-    Frame {
-        msec: 3408
-        hash: "0285340a2e03568810a76d840369f5c8"
-    }
-    Frame {
-        msec: 3424
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
-    }
-    Frame {
-        msec: 3440
-        hash: "d0ad97647c5092a64426187406ec5316"
-    }
-    Frame {
-        msec: 3456
-        hash: "a6bdf56b4f8783969935488e1955e59c"
-    }
-    Frame {
-        msec: 3472
-        hash: "ff5fac70804eb01da28c2988aba520a4"
-    }
-    Frame {
-        msec: 3488
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
-    }
-    Frame {
-        msec: 3504
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
-    }
-    Frame {
-        msec: 3520
-        hash: "907c6363d1e524f391d001944febe1ac"
-    }
-    Frame {
-        msec: 3536
-        hash: "313a06d40274e46453342e66236f09f8"
-    }
-    Frame {
-        msec: 3552
-        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
-    }
-    Frame {
-        msec: 3568
-        hash: "a9911e076af337fe30e322f03d84a528"
-    }
-    Frame {
-        msec: 3584
-        hash: "4a8efcc341bba9ba621ce0f785a75432"
-    }
-    Frame {
-        msec: 3600
-        hash: "479f192c8cf7b8e4407655382402700f"
-    }
-    Frame {
-        msec: 3616
-        hash: "63dc16e66def35abba5159d5650f165d"
-    }
-    Frame {
-        msec: 3632
-        hash: "26e88aae512304c28d425c311febce1b"
-    }
-    Frame {
-        msec: 3648
-        hash: "efc77b82c0ffd7f3fbe5fed06ea418bd"
-    }
-    Frame {
-        msec: 3664
-        hash: "70409eeee50fbb54097a3c430e1e1f21"
-    }
-    Frame {
-        msec: 3680
-        hash: "63c6a7810dec832f1b8288807f1d932a"
-    }
-    Frame {
-        msec: 3696
-        hash: "aec9683f3a677dab781bdf3bbf7cce5e"
-    }
-    Frame {
-        msec: 3712
-        hash: "2e6dd79fc23acbf710e757f3d0999ab8"
-    }
-    Frame {
-        msec: 3728
-        hash: "4d9dd9e515a21478cb3364032acf8c15"
-    }
-    Frame {
-        msec: 3744
-        hash: "5dc2129cac6e667d39da3304a37a76f2"
-    }
-    Frame {
-        msec: 3760
-        hash: "ab5eb4750139875586a346b1c3a84f42"
-    }
-    Frame {
-        msec: 3776
-        hash: "96d3bd62d4a0bf39a672b97fcc050bd5"
-    }
-    Frame {
-        msec: 3792
-        hash: "546cec655631b5802eb4d7008093eb69"
-    }
-    Frame {
-        msec: 3808
-        hash: "85f33f1bf1b1e11be450ab85bf6dab3d"
-    }
-    Frame {
-        msec: 3824
-        hash: "44b195297acd1bf59e43751df8dc1c1d"
-    }
-    Frame {
-        msec: 3840
-        image: "cursorDelegate.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "47942253c07fd39894445ff5e5b9608c"
-    }
-    Frame {
-        msec: 3872
-        hash: "d26d71b1c03fb21550820dd1586a7a8e"
-    }
-    Frame {
-        msec: 3888
-        hash: "37ec2ed29006575e8bd41a1989b75e27"
-    }
-    Frame {
-        msec: 3904
-        hash: "5ad1ab34572f9ef339774134bc0ab407"
-    }
-    Frame {
-        msec: 3920
-        hash: "a4f68f6ee46642e7cc5a542b9f8a2464"
-    }
-    Frame {
-        msec: 3936
-        hash: "fce95d18a0efee74554209ca39637062"
-    }
-    Frame {
-        msec: 3952
-        hash: "1587fc2668f1f44e76f252bfd75f2708"
-    }
-    Frame {
-        msec: 3968
-        hash: "e0a6eb42de552281e297ca5c50c1df23"
-    }
-    Frame {
-        msec: 3984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4064
-        hash: "e0a6eb42de552281e297ca5c50c1df23"
-    }
-    Frame {
-        msec: 4080
-        hash: "1587fc2668f1f44e76f252bfd75f2708"
-    }
-    Frame {
-        msec: 4096
-        hash: "fce95d18a0efee74554209ca39637062"
-    }
-    Frame {
-        msec: 4112
-        hash: "a4f68f6ee46642e7cc5a542b9f8a2464"
-    }
-    Frame {
-        msec: 4128
-        hash: "5ad1ab34572f9ef339774134bc0ab407"
-    }
-    Frame {
-        msec: 4144
-        hash: "37ec2ed29006575e8bd41a1989b75e27"
-    }
-    Frame {
-        msec: 4160
-        hash: "d26d71b1c03fb21550820dd1586a7a8e"
-    }
-    Frame {
-        msec: 4176
-        hash: "47942253c07fd39894445ff5e5b9608c"
-    }
-    Frame {
-        msec: 4192
-        hash: "a62f1cbf43da0381c7c9099d47ded882"
-    }
-    Frame {
-        msec: 4208
-        hash: "44b195297acd1bf59e43751df8dc1c1d"
-    }
-    Frame {
-        msec: 4224
-        hash: "85f33f1bf1b1e11be450ab85bf6dab3d"
-    }
-    Frame {
-        msec: 4240
-        hash: "546cec655631b5802eb4d7008093eb69"
-    }
-    Frame {
-        msec: 4256
-        hash: "96d3bd62d4a0bf39a672b97fcc050bd5"
-    }
-    Frame {
-        msec: 4272
-        hash: "ab5eb4750139875586a346b1c3a84f42"
-    }
-    Frame {
-        msec: 4288
-        hash: "5dc2129cac6e667d39da3304a37a76f2"
-    }
-    Frame {
-        msec: 4304
-        hash: "4d9dd9e515a21478cb3364032acf8c15"
-    }
-    Frame {
-        msec: 4320
-        hash: "2e6dd79fc23acbf710e757f3d0999ab8"
-    }
-    Frame {
-        msec: 4336
-        hash: "aec9683f3a677dab781bdf3bbf7cce5e"
-    }
-    Frame {
-        msec: 4352
-        hash: "63c6a7810dec832f1b8288807f1d932a"
-    }
-    Frame {
-        msec: 4368
-        hash: "70409eeee50fbb54097a3c430e1e1f21"
-    }
-    Frame {
-        msec: 4384
-        hash: "efc77b82c0ffd7f3fbe5fed06ea418bd"
-    }
-    Frame {
-        msec: 4400
-        hash: "26e88aae512304c28d425c311febce1b"
-    }
-    Frame {
-        msec: 4416
-        hash: "63dc16e66def35abba5159d5650f165d"
-    }
-    Frame {
-        msec: 4432
-        hash: "479f192c8cf7b8e4407655382402700f"
-    }
-    Frame {
-        msec: 4448
-        hash: "4a8efcc341bba9ba621ce0f785a75432"
-    }
-    Frame {
-        msec: 4464
-        hash: "a9911e076af337fe30e322f03d84a528"
-    }
-    Frame {
-        msec: 4480
-        hash: "0d410f7bfa3e4c58948a8f1e7c7695c4"
-    }
-    Frame {
-        msec: 4496
-        hash: "313a06d40274e46453342e66236f09f8"
-    }
-    Frame {
-        msec: 4512
-        hash: "907c6363d1e524f391d001944febe1ac"
-    }
-    Frame {
-        msec: 4528
-        hash: "84cad44c4cccf8a0942865719d05c2eb"
-    }
-    Frame {
-        msec: 4544
-        hash: "60d24c160adb8e074c04d4f40bf140a8"
-    }
-    Frame {
-        msec: 4560
-        hash: "ff5fac70804eb01da28c2988aba520a4"
-    }
-    Frame {
-        msec: 4576
-        hash: "a6bdf56b4f8783969935488e1955e59c"
-    }
-    Frame {
-        msec: 4592
-        hash: "d0ad97647c5092a64426187406ec5316"
-    }
-    Frame {
-        msec: 4608
-        hash: "77e7a4a4a9c38cd7b5ef734d39089e3f"
-    }
-    Frame {
-        msec: 4624
-        hash: "0285340a2e03568810a76d840369f5c8"
-    }
-    Frame {
-        msec: 4640
-        hash: "6ba6a1a05c5a9ec0d2897b3454affd09"
-    }
-    Frame {
-        msec: 4656
-        hash: "3caa36cc3857803248d12ec09ea357df"
-    }
-    Frame {
-        msec: 4672
-        hash: "500f7b72acc877fc1662e4f4ceb090e1"
-    }
-    Frame {
-        msec: 4688
-        hash: "aadc71923926885ccce87e6be1c742d7"
-    }
-    Frame {
-        msec: 4704
-        hash: "9b7503189ecf2999934716f227469463"
-    }
-    Frame {
-        msec: 4720
-        hash: "874296e182abe96e58f9c0463a0f32c9"
-    }
-    Frame {
-        msec: 4736
-        hash: "4262c79b6844d4d62aa9fb02c335fb95"
-    }
-    Frame {
-        msec: 4752
-        hash: "a5862eaf12cc342054fd3f8d1f4c91c3"
-    }
-    Frame {
-        msec: 4768
-        hash: "0034ef8851c9810ed5d50496aea367da"
-    }
-    Frame {
-        msec: 4784
-        hash: "24cebf60ade86469a154abaa64f3b40d"
-    }
-    Frame {
-        msec: 4800
-        image: "cursorDelegate.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "c40d8d42a55dde7dbbcae2dda9aaccb8"
-    }
-    Frame {
-        msec: 4832
-        hash: "5c1000fdc279742cbe46987045c0a92b"
-    }
-    Frame {
-        msec: 4848
-        hash: "bcef4a0ff72330f05f2bf5042e414fde"
-    }
-    Frame {
-        msec: 4864
-        hash: "228551c38b567f1550b44f9dac08786b"
-    }
-    Frame {
-        msec: 4880
-        hash: "531c5ca6992c4a12927c61e22c02dd6b"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 130; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4896
-        hash: "14b328c8ec6276e022643102af80fa44"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4912
-        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 131; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4928
-        hash: "df6f025130dc82f4764def81cec5fa7b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 132; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4944
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 133; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 134; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4960
-        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 135; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 136; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 137; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 139; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 141; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 143; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5072
-        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5088
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 149; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5104
-        hash: "7643fcfb740d33b87915300684e85a44"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 150; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5120
-        hash: "1bd041a5e8d2237b51720fed82250303"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5136
-        hash: "1a00c9d3ce747e3bc7ee5878d21260b4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5152
-        hash: "803896c1be68588ba2cddd7effbb8d62"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 153; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5168
-        hash: "282ab572698088fba3aba8e6a091aa38"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5184
-        hash: "24402d9e4fabd78bc8f3921db82e554e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5200
-        hash: "39a89e9ca7c4edd9c8503927d639df0f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5216
-        hash: "b984b7d032544acd4dab8901e0af1ef5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5232
-        hash: "e014414626407b0446939ad2ce38b7dd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 161; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5248
-        hash: "beccb93613279e2f48507ddc9a4418e8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5264
-        hash: "dd861f8dc89587301e860217fdf2a701"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5280
-        hash: "1ae0b7a18a7d3ebe4871a0045005e2b7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5296
-        hash: "071e1f8bcc0e541b23d134f32c19d20b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5312
-        hash: "e8ce2716f4595bc5bf68c24c8a63bbfe"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5328
-        hash: "d36a35503af76b12fe5cec65e3f22eda"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 178; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5344
-        hash: "cea0f90a56fd5789b3e166f09f2bfcec"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 179; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5360
-        hash: "151f5357d9c1a3f1fe09380a287abab0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 180; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5376
-        hash: "bdab9d7077734087cb7f9516e9c517bc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 182; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5392
-        hash: "6d6d929a7c7be1d2e7d1b2f98a6866be"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5408
-        hash: "3fbe3f45afc5aa40fff7f795ced8a05d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5424
-        hash: "b35b4dc480aeb76912d927b0ff8676c6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 189; y: 93
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5440
-        hash: "94e82e888280f20cce3ac38b353b79f4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 192; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5456
-        hash: "4674fbd35e467bed780a5ea2fe2e258b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 194; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5472
-        hash: "698827bfa7ff2eae6b0e0efa99bb15bb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 196; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5488
-        hash: "67c7adef5e41481d631f54d34423b93d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5504
-        hash: "097512c005127fa3ebfcbc52808264a8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 91
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5520
-        hash: "ad64b5913350e6c6fda199ecb34278f4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 91
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 201; y: 90
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5536
-        hash: "3237e88e0f40595d2fde62723c00b7fa"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5552
-        hash: "18db89296849f22a7af0a1ffc9762a32"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5568
-        hash: "7f6ac84baaa2c5fcd22ba45172611840"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 204; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5584
-        hash: "7b887d3aa44229d9f25fdde8f5ccf471"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 207; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 208; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5600
-        hash: "b0c08726d0f2a460d5862cd2d7ee6230"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5616
-        hash: "d99389a3287d453b942f070d8c1e86e8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5632
-        hash: "a0751fa826b03cb25e615c6a1435d92a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 214; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5648
-        hash: "f33da88ae881c846bd86ab3dc4f12efc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5664
-        hash: "7049bee9a984a2c2d3101eb6d3cce31e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5680
-        hash: "72757a5099748b70241a0d4279e42313"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5696
-        hash: "705feb098ebb2d689526d9271098d6b5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5712
-        hash: "49de92770edb0aae82cf66ae42b31caa"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5728
-        hash: "70fe89f9dce556ec1859f325aa27b7db"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5744
-        hash: "1ededcc625a0e9e317c5aefc238a175a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 221; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5760
-        image: "cursorDelegate.5.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5776
-        hash: "f1ae53071836512830f7284c4ac884b3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5792
-        hash: "f73c2b66b61bdcb080f8be6607079729"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 224; y: 90
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5808
-        hash: "11da14806fbca5c7cd559286fb5d70ff"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 226; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5824
-        hash: "b3ad82e900925227fb020009ae619d28"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 228; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5840
-        hash: "d8cea4160f0044b09e595610ead01879"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 229; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 231; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5856
-        hash: "bdd0d1bea8590b40cdce2fb45e17901b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5872
-        hash: "007a5d123eea589264e22f862f1bcac6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5888
-        hash: "3a83635e8371f3e26baf83c285b7801d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5904
-        hash: "6615931007ab0f9da070b6316068ad12"
-    }
-    Frame {
-        msec: 5920
-        hash: "be695ab0dced25c1c498d977fc822cef"
-    }
-    Frame {
-        msec: 5936
-        hash: "46dea7348473bc6ce4ea696292e5aae0"
-    }
-    Frame {
-        msec: 5952
-        hash: "23ce0ba723ffe4253610fdc635df9ae2"
-    }
-    Frame {
-        msec: 5968
-        hash: "9d6243396fd98b7efd14ae8a67297e79"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 231; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 230; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 229; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 228; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 227; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6064
-        hash: "be488252ce6c39317c33706f7febe7b5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 225; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6080
-        hash: "16c38b5dcd8ffbadc533d4fea8a85b0d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 224; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6096
-        hash: "a3ca6fa1bbc5ca3ff4cf281ae112102d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6112
-        hash: "58e53a9cb886d6d90c0b5987d0693904"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6128
-        hash: "a7f3e07ad0335e2852a156b5a3e1bd3d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6144
-        hash: "bea9d0338212c01474b25ee637aa8fd0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6160
-        hash: "b509c0cdea6b1352ff1e146a8f243820"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6176
-        hash: "9c968354773878009af2f176b1e38d42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6192
-        hash: "d8cea4160f0044b09e595610ead01879"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6208
-        hash: "b3ad82e900925227fb020009ae619d28"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6224
-        hash: "11da14806fbca5c7cd559286fb5d70ff"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 208; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 207; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6240
-        hash: "707f51caadf24d3ed88b69c290d56971"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 206; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6256
-        hash: "c23b2afed7fa0e3dbce1183cf8e8d724"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 205; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6272
-        hash: "653b2e2d711c1abc1893d0068f4c531c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 204; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6288
-        hash: "246a73b19421f0ea8ec444429bd6704e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6304
-        hash: "3878df64c0cecb2051e04dafe16ad407"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 201; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6320
-        hash: "1cf92a793a4d145acce08c61cca3ba4f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6336
-        hash: "6c5f70c941a04172aae855eed1516971"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 197; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6352
-        hash: "5f4b8d6ad49de0ea1a2ee057e783b363"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 196; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 194; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6368
-        hash: "dc185cf4a14801d7bcc24ceadffe312b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 188; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6384
-        hash: "6934c069d1b7daf1c2dd76739941c7c2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6400
-        hash: "415510947b49a08459523fa2221d3609"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6416
-        hash: "9586619df75f07cc1f01201abd0f1f43"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 182; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6432
-        hash: "d016b14c9d5e5cd2545f1c85aa1edc4f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6448
-        hash: "4100837adeaf1557534f5c243eeacc37"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 171; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6464
-        hash: "a9351f624dc7de55ca8e799cf4371e75"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6480
-        hash: "8f2f9ba7de4e01767dda2c6d8f09e218"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6496
-        hash: "fb9b7d7e1aa140efc7e39cbca7299d34"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6512
-        hash: "eb1c2399d5779cc3382f02e69e5a31f1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6528
-        hash: "3bd98dc8a8cfb7af8a5f2ab11f387065"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6544
-        hash: "1eea9af6e5f359b96df86d56d74f8375"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6560
-        hash: "74c68b948d8e1d3c716eba5f1a186464"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 153; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6576
-        hash: "7103ecc0c21208d210938b0cd86fa4e2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6592
-        hash: "187b7801be7cd9643c707016166fcb38"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 149; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6608
-        hash: "571fe7704d5d95e91d4bd411ab00edf0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6624
-        hash: "2b6fd25a47274ffa56c3d0020babfdfc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6640
-        hash: "febcd6b5fc1806ff57d1669c79aa4cb2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6656
-        hash: "5c731fc4a2aeccf55a0af2b7171f25ce"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6672
-        hash: "7d9df9dd9a99eabaa4b426438e44d612"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6688
-        hash: "48278540489142f8a63ed120f4b956c2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6704
-        hash: "d08abdfb587a7ec07872cb662526b6d8"
-    }
-    Frame {
-        msec: 6720
-        image: "cursorDelegate.6.png"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6736
-        hash: "4622738082ac75e00b6c63e846b7e98b"
-    }
-    Frame {
-        msec: 6752
-        hash: "87a9f2facbaba462c562f09947bb7ded"
-    }
-    Frame {
-        msec: 6768
-        hash: "77e730ece9f195c3627508d1c2a126fc"
-    }
-    Frame {
-        msec: 6784
-        hash: "4a02aaca12e3fd86ee3b516b3a307f86"
-    }
-    Frame {
-        msec: 6800
-        hash: "0a1c2eb8a7451a5e37fefb96a58a88a1"
-    }
-    Frame {
-        msec: 6816
-        hash: "7f2d9959323f0707e36ecb2252c89727"
-    }
-    Frame {
-        msec: 6832
-        hash: "3462a3e166120515e67430600e4653f8"
-    }
-    Frame {
-        msec: 6848
-        hash: "eac8375d9b9cf0afbf232e27c6ceb037"
-    }
-    Frame {
-        msec: 6864
-        hash: "fbefb1e0801f4578ab93dd7ff4062e68"
-    }
-    Frame {
-        msec: 6880
-        hash: "078d75d72bff036574b85ac0aeaaf2b6"
-    }
-    Frame {
-        msec: 6896
-        hash: "14b328c8ec6276e022643102af80fa44"
-    }
-    Frame {
-        msec: 6912
-        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
-    }
-    Frame {
-        msec: 6928
-        hash: "df6f025130dc82f4764def81cec5fa7b"
-    }
-    Frame {
-        msec: 6944
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
-    }
-    Frame {
-        msec: 6960
-        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
-    }
-    Frame {
-        msec: 6976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 7072
-        hash: "cfcdf63ca06c2b9ab197821bc1e48c7c"
-    }
-    Frame {
-        msec: 7088
-        hash: "cf467854dfde9b2111bc6e7e4442aab5"
-    }
-    Frame {
-        msec: 7104
-        hash: "df6f025130dc82f4764def81cec5fa7b"
-    }
-    Frame {
-        msec: 7120
-        hash: "bdcafed4ae9c890eec2e3e0cb2ff5a14"
-    }
-    Frame {
-        msec: 7136
-        hash: "14b328c8ec6276e022643102af80fa44"
-    }
-    Frame {
-        msec: 7152
-        hash: "078d75d72bff036574b85ac0aeaaf2b6"
-    }
-    Frame {
-        msec: 7168
-        hash: "fbefb1e0801f4578ab93dd7ff4062e68"
-    }
-    Frame {
-        msec: 7184
-        hash: "eac8375d9b9cf0afbf232e27c6ceb037"
-    }
-    Frame {
-        msec: 7200
-        hash: "3462a3e166120515e67430600e4653f8"
-    }
-    Frame {
-        msec: 7216
-        hash: "7f2d9959323f0707e36ecb2252c89727"
-    }
-    Frame {
-        msec: 7232
-        hash: "0a1c2eb8a7451a5e37fefb96a58a88a1"
-    }
-    Frame {
-        msec: 7248
-        hash: "4a02aaca12e3fd86ee3b516b3a307f86"
-    }
-    Frame {
-        msec: 7264
-        hash: "77e730ece9f195c3627508d1c2a126fc"
-    }
-    Frame {
-        msec: 7280
-        hash: "87a9f2facbaba462c562f09947bb7ded"
-    }
-    Frame {
-        msec: 7296
-        hash: "4622738082ac75e00b6c63e846b7e98b"
-    }
-    Frame {
-        msec: 7312
-        hash: "9fcec7616e28cb8317709656fd94f480"
-    }
-    Frame {
-        msec: 7328
-        hash: "d08abdfb587a7ec07872cb662526b6d8"
-    }
-    Frame {
-        msec: 7344
-        hash: "48278540489142f8a63ed120f4b956c2"
-    }
-    Frame {
-        msec: 7360
-        hash: "7d9df9dd9a99eabaa4b426438e44d612"
-    }
-    Frame {
-        msec: 7376
-        hash: "5c731fc4a2aeccf55a0af2b7171f25ce"
-    }
-    Frame {
-        msec: 7392
-        hash: "febcd6b5fc1806ff57d1669c79aa4cb2"
-    }
-    Frame {
-        msec: 7408
-        hash: "4ad2c0877360b0e1bf2212f9455f741e"
-    }
-    Frame {
-        msec: 7424
-        hash: "4df1951aac4ed1957925c95e112b0766"
-    }
-    Frame {
-        msec: 7440
-        hash: "bfbb624abe63639f2a7cb826b6b47393"
-    }
-    Frame {
-        msec: 7456
-        hash: "538cf4ee98145b3801e198b036e24a46"
-    }
-    Frame {
-        msec: 7472
-        hash: "5602c039a304ac0b1fd99957970a825b"
-    }
-    Frame {
-        msec: 7488
-        hash: "9ddd7709269b9a008e15d942e156e13a"
-    }
-    Frame {
-        msec: 7504
-        hash: "91d7c43f5f985d624e77da43ba5fb90f"
-    }
-    Frame {
-        msec: 7520
-        hash: "9153b0419d28e3c8137b58f95451cd58"
-    }
-    Frame {
-        msec: 7536
-        hash: "c5aad5ea4db81cf72f1ff390ed1dc868"
-    }
-    Frame {
-        msec: 7552
-        hash: "47b52ce9e5c705017e94b419b53d20d9"
-    }
-    Frame {
-        msec: 7568
-        hash: "f968e3289a2a6343cdb64e37b83f142a"
-    }
-    Frame {
-        msec: 7584
-        hash: "6fe898a37b17b6b6fa9a2971b518d185"
-    }
-    Frame {
-        msec: 7600
-        hash: "90ced2e487b6e760f2ad2c7d6375a36f"
-    }
-    Frame {
-        msec: 7616
-        hash: "b2d87713d12a54d4d7b6fd6ba2671704"
-    }
-    Frame {
-        msec: 7632
-        hash: "edce9857bd0e93ab841ae62ffba0149f"
-    }
-    Frame {
-        msec: 7648
-        hash: "13ce69facee6bf01c9712db1781c5ef9"
-    }
-    Frame {
-        msec: 7664
-        hash: "64924e43e004f0d9e90c23f61813c732"
-    }
-    Frame {
-        msec: 7680
-        image: "cursorDelegate.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "9c384359c664a71b5b6b9f9d62dd38bf"
-    }
-    Frame {
-        msec: 7712
-        hash: "5998579d228bcf0efdbcee805796ec23"
-    }
-    Frame {
-        msec: 7728
-        hash: "fe69cab70ad5b25f757bc413b895ff94"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 227; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "1ededcc625a0e9e317c5aefc238a175a"
-    }
-    Frame {
-        msec: 7760
-        hash: "460a4cbee55ccdeda1941c8dccf08cbd"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 227; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7776
-        hash: "f1ae53071836512830f7284c4ac884b3"
-    }
-    Frame {
-        msec: 7792
-        hash: "f73c2b66b61bdcb080f8be6607079729"
-    }
-    Frame {
-        msec: 7808
-        hash: "11da14806fbca5c7cd559286fb5d70ff"
-    }
-    Frame {
-        msec: 7824
-        hash: "b3ad82e900925227fb020009ae619d28"
-    }
-    Frame {
-        msec: 7840
-        hash: "d8cea4160f0044b09e595610ead01879"
-    }
-    Frame {
-        msec: 7856
-        hash: "9c968354773878009af2f176b1e38d42"
-    }
-    Frame {
-        msec: 7872
-        hash: "b509c0cdea6b1352ff1e146a8f243820"
-    }
-    Frame {
-        msec: 7888
-        hash: "bea9d0338212c01474b25ee637aa8fd0"
-    }
-    Frame {
-        msec: 7904
-        hash: "a7f3e07ad0335e2852a156b5a3e1bd3d"
-    }
-    Frame {
-        msec: 7920
-        hash: "58e53a9cb886d6d90c0b5987d0693904"
-    }
-    Frame {
-        msec: 7936
-        hash: "a3ca6fa1bbc5ca3ff4cf281ae112102d"
-    }
-    Frame {
-        msec: 7952
-        hash: "16c38b5dcd8ffbadc533d4fea8a85b0d"
-    }
-    Frame {
-        msec: 7968
-        hash: "be488252ce6c39317c33706f7febe7b5"
-    }
-    Frame {
-        msec: 7984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8064
-        hash: "be488252ce6c39317c33706f7febe7b5"
-    }
-    Frame {
-        msec: 8080
-        hash: "16c38b5dcd8ffbadc533d4fea8a85b0d"
-    }
-    Frame {
-        msec: 8096
-        hash: "a3ca6fa1bbc5ca3ff4cf281ae112102d"
-    }
-    Frame {
-        msec: 8112
-        hash: "58e53a9cb886d6d90c0b5987d0693904"
-    }
-    Frame {
-        msec: 8128
-        hash: "a7f3e07ad0335e2852a156b5a3e1bd3d"
-    }
-    Frame {
-        msec: 8144
-        hash: "bea9d0338212c01474b25ee637aa8fd0"
-    }
-    Frame {
-        msec: 8160
-        hash: "b509c0cdea6b1352ff1e146a8f243820"
-    }
-    Frame {
-        msec: 8176
-        hash: "9c968354773878009af2f176b1e38d42"
-    }
-    Frame {
-        msec: 8192
-        hash: "d8cea4160f0044b09e595610ead01879"
-    }
-    Frame {
-        msec: 8208
-        hash: "b3ad82e900925227fb020009ae619d28"
-    }
-    Frame {
-        msec: 8224
-        hash: "11da14806fbca5c7cd559286fb5d70ff"
-    }
-    Frame {
-        msec: 8240
-        hash: "f73c2b66b61bdcb080f8be6607079729"
-    }
-    Frame {
-        msec: 8256
-        hash: "f1ae53071836512830f7284c4ac884b3"
-    }
-    Frame {
-        msec: 8272
-        hash: "460a4cbee55ccdeda1941c8dccf08cbd"
-    }
-    Frame {
-        msec: 8288
-        hash: "1ededcc625a0e9e317c5aefc238a175a"
-    }
-    Frame {
-        msec: 8304
-        hash: "70fe89f9dce556ec1859f325aa27b7db"
-    }
-    Frame {
-        msec: 8320
-        hash: "49de92770edb0aae82cf66ae42b31caa"
-    }
-    Frame {
-        msec: 8336
-        hash: "705feb098ebb2d689526d9271098d6b5"
-    }
-    Frame {
-        msec: 8352
-        hash: "72757a5099748b70241a0d4279e42313"
-    }
-    Frame {
-        msec: 8368
-        hash: "7049bee9a984a2c2d3101eb6d3cce31e"
-    }
-    Frame {
-        msec: 8384
-        hash: "f33da88ae881c846bd86ab3dc4f12efc"
-    }
-    Frame {
-        msec: 8400
-        hash: "a0751fa826b03cb25e615c6a1435d92a"
-    }
-    Frame {
-        msec: 8416
-        hash: "d99389a3287d453b942f070d8c1e86e8"
-    }
-    Frame {
-        msec: 8432
-        hash: "e3219357e73a2dfd5b80dfbd6feb79e2"
-    }
-    Frame {
-        msec: 8448
-        hash: "c0953accd856883c813d4ecf99fb632b"
-    }
-    Frame {
-        msec: 8464
-        hash: "185743339cba9dfc1a2c2ff1efd23855"
-    }
-    Frame {
-        msec: 8480
-        hash: "30a4419de779037fd84bd70a99c4d6de"
-    }
-    Frame {
-        msec: 8496
-        hash: "1d9cbd0814831c518e9e8041fe8285c9"
-    }
-    Frame {
-        msec: 8512
-        hash: "81d660df1b0eab7c382991b600f88ba3"
-    }
-    Frame {
-        msec: 8528
-        hash: "7ee1467525b9fe3b6a32fba8c2454df1"
-    }
-    Frame {
-        msec: 8544
-        hash: "28dd72957652cf130d28d30203b36c59"
-    }
-    Frame {
-        msec: 8560
-        hash: "e9697d06a22958cea4f766dd3ec31ca9"
-    }
-    Frame {
-        msec: 8576
-        hash: "81970c31a0a1e42929c83ef5140401c2"
-    }
-    Frame {
-        msec: 8592
-        hash: "ebb5be43955725bef66bf99bd7288c04"
-    }
-    Frame {
-        msec: 8608
-        hash: "afbf0645ea651b2c459eeb43bdc65992"
-    }
-    Frame {
-        msec: 8624
-        hash: "42bf6ab3963652617f2feb96ee170af5"
-    }
-    Frame {
-        msec: 8640
-        image: "cursorDelegate.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "4a5966f600f9b27bf7a65fcc6c1c5d17"
-    }
-    Frame {
-        msec: 8672
-        hash: "ecdc1d89af1e76648c8298e2b9940549"
-    }
-    Frame {
-        msec: 8688
-        hash: "0ba1e105a7ae41926e2106b60eafdec9"
-    }
-    Frame {
-        msec: 8704
-        hash: "96e4f277d4ff76afe0c2d58b4aed3acb"
-    }
-    Frame {
-        msec: 8720
-        hash: "f41c6fd9e22354b8f5c940c04930a591"
-    }
-    Frame {
-        msec: 8736
-        hash: "00b522554cf6c0c09e5425f4d3c3fcf9"
-    }
-    Frame {
-        msec: 8752
-        hash: "e8549c0c361f20d167cab128dc996274"
-    }
-    Frame {
-        msec: 8768
-        hash: "976c61615250f9bfa3b4c02ee88bee03"
-    }
-    Frame {
-        msec: 8784
-        hash: "06c95d2fa5e2b4751e5693b179e76eb4"
-    }
-    Frame {
-        msec: 8800
-        hash: "a3d79197235c4717b1f9af3582118ca6"
-    }
-    Frame {
-        msec: 8816
-        hash: "68b23db8f519aa161278074aa318eaa1"
-    }
-    Frame {
-        msec: 8832
-        hash: "af967462be12d0b6ddd3571b00804c12"
-    }
-    Frame {
-        msec: 8848
-        hash: "46f5c0baa2b95fd418984eebe308157e"
-    }
-    Frame {
-        msec: 8864
-        hash: "0a7407c6c751b3f1380a99883e95f1dd"
-    }
-    Frame {
-        msec: 8880
-        hash: "9969c206488671c45c43f3a3dd3f5994"
-    }
-    Frame {
-        msec: 8896
-        hash: "89efa872ce2e71935b47cac101bf15c9"
-    }
-    Frame {
-        msec: 8912
-        hash: "a4545a0c50fb071d267b06bf2d114802"
-    }
-    Frame {
-        msec: 8928
-        hash: "f4df98459c18399e1c6b2d8a43bdd678"
-    }
-    Frame {
-        msec: 8944
-        hash: "027eb091eea8bf51d7ad3ff44120e075"
-    }
-    Frame {
-        msec: 8960
-        hash: "138ec35b850d20664f905a4eea6f7456"
-    }
-    Frame {
-        msec: 8976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9072
-        hash: "138ec35b850d20664f905a4eea6f7456"
-    }
-    Frame {
-        msec: 9088
-        hash: "027eb091eea8bf51d7ad3ff44120e075"
-    }
-    Frame {
-        msec: 9104
-        hash: "f4df98459c18399e1c6b2d8a43bdd678"
-    }
-    Frame {
-        msec: 9120
-        hash: "a4545a0c50fb071d267b06bf2d114802"
-    }
-    Frame {
-        msec: 9136
-        hash: "89efa872ce2e71935b47cac101bf15c9"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.0.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.0.png
deleted file mode 100644
index cc1774f..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.1.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.1.png
deleted file mode 100644
index 60eba16..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.2.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.2.png
deleted file mode 100644
index d4663f7..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.3.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.3.png
deleted file mode 100644
index dc1bb52..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.qml
deleted file mode 100644
index 84c16e1..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.qml
+++ /dev/null
@@ -1,1371 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 32
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 48
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 64
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 80
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 96
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 112
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 128
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 144
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 160
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 176
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 192
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 208
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 224
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 240
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 256
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 272
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 288
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 304
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 320
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 336
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 352
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 368
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 384
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 400
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 416
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 432
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 448
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 464
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 480
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 496
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 512
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 528
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 560
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 576
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 592
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 608
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 624
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 640
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 656
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 672
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 688
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 704
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 720
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 736
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 752
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 768
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 784
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 800
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 816
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 832
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 848
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 864
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 880
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 896
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 912
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 928
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 944
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 960
-        image: "qt-669.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 992
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 1008
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1024
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 1040
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 1056
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 1072
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 1088
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1104
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 1120
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 1136
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1152
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 1168
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 1184
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 1200
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 1216
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1232
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 1248
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 1264
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 1280
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1296
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 1312
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 1328
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 1344
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1360
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1376
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1392
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1408
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1424
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1440
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1456
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1472
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1488
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1504
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1520
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1536
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1552
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1568
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1584
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1600
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1616
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1632
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1648
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1664
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1680
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1696
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1712
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1728
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1744
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1760
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1776
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1792
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1808
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1824
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Frame {
-        msec: 1840
-        hash: "781a5a09fb6c6ca1fd38f63938f9c8d0"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1856
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1872
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1888
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1904
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1920
-        image: "qt-669.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1952
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1968
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 1984
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2000
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 2016
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 2032
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 2048
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Frame {
-        msec: 2064
-        hash: "2718ab36551a20d36664f26e408f8f24"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2080
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 2096
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 2112
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 2128
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 2144
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2160
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 2176
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 2192
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 2208
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Frame {
-        msec: 2224
-        hash: "823ccdc677997c96e4ae16891ffffa77"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2240
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 2256
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 2288
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 2304
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 2320
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Frame {
-        msec: 2336
-        hash: "f90403e0b62f9579b5c5f591e75e9eb5"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2352
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2368
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2384
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2400
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2416
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2432
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2448
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2464
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2480
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2496
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2512
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2528
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2544
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2560
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2576
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Frame {
-        msec: 2592
-        hash: "1295bd1d94fe518d5a871e90cab88e0c"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2608
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 2624
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 2640
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 2656
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 2672
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2688
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 2704
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 2720
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 2736
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Frame {
-        msec: 2752
-        hash: "c186352ed5d1539a45b3c9e1dfa408d6"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2768
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 2784
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 2800
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2816
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 2832
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 2848
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Frame {
-        msec: 2864
-        hash: "c602a6535ef86125615307d9d187eb3f"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2880
-        image: "qt-669.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 2912
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 2928
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2944
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 2960
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 2976
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 2992
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Frame {
-        msec: 3008
-        hash: "fbc07fa31ab2022f3155bd1fb591fe6c"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3024
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3040
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3056
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3072
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3088
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3104
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3120
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3136
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3152
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3168
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3184
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3200
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3216
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3232
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3248
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3264
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3280
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3296
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3312
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3328
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3344
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3360
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3376
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3392
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3408
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3424
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3440
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3456
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3472
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3488
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3504
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3520
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3536
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3552
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3568
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3584
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3600
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3616
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3632
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3648
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3664
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3680
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Frame {
-        msec: 3696
-        hash: "e64c3246a0f81e2df29ac276ac6d411f"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3712
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3728
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3744
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3760
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3776
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3792
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3808
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3824
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3840
-        image: "qt-669.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3872
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3888
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3904
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3920
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3936
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3952
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3968
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 3984
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4000
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4016
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4032
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4048
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4064
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4080
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4096
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4112
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4128
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4144
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4160
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4176
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4192
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4208
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4224
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4240
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4256
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4272
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4288
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-    Frame {
-        msec: 4304
-        hash: "c043ae4adb31cb53bfc089e7f2ed07b2"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.0.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.0.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.1.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.1.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.2.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.2.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.3.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.3.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.4.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.4.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.5.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.5.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.6.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.6.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.qml
deleted file mode 100644
index 4ff00f4..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.qml
+++ /dev/null
@@ -1,2467 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 33554432
-        text: "54"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 32
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 48
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 64
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 80
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 96
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 72
-        modifiers: 0
-        text: "68"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 72
-        modifiers: 0
-        text: "68"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 720
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 800
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 880
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 896
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 912
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 928
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 944
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 960
-        image: "wrap.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1072
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1088
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1104
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1120
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1136
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1152
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1168
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1184
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1216
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1232
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1248
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1264
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1280
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1296
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1312
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1328
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1344
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1360
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1376
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1392
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1408
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1424
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1440
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1456
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1472
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1488
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1504
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1520
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1536
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1552
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 72
-        modifiers: 0
-        text: "68"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1568
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1584
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1600
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1616
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1632
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 72
-        modifiers: 0
-        text: "68"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1648
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1664
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1680
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1696
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1712
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1728
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1744
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1760
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1776
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1792
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1808
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1824
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1840
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1856
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1872
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1888
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1904
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1920
-        image: "wrap.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1952
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1968
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2064
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2080
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2096
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 88
-        modifiers: 0
-        text: "78"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 88
-        modifiers: 0
-        text: "78"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 68
-        modifiers: 0
-        text: "64"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 68
-        modifiers: 0
-        text: "64"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2720
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2800
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2880
-        image: "wrap.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2912
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2928
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2944
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2960
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3072
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3088
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 87
-        modifiers: 0
-        text: "77"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3104
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3120
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3136
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3152
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3168
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 87
-        modifiers: 0
-        text: "77"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3184
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3200
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3216
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3232
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3248
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3264
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3280
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3296
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3312
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3328
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3344
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3360
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3376
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3392
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3408
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3424
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3440
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3456
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3472
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 80
-        modifiers: 0
-        text: "70"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3488
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3504
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3520
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3536
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 80
-        modifiers: 0
-        text: "70"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3552
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3568
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3584
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3600
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3616
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3632
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3648
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3664
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3680
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3696
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3712
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3728
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3744
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3760
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3776
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3792
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3808
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3824
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3840
-        image: "wrap.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3872
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3888
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3904
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3920
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3936
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3952
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3968
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 79
-        modifiers: 0
-        text: "6f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4064
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 79
-        modifiers: 0
-        text: "6f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4080
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4096
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 76
-        modifiers: 0
-        text: "6c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4720
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 76
-        modifiers: 0
-        text: "6c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 89
-        modifiers: 0
-        text: "79"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4800
-        image: "wrap.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 89
-        modifiers: 0
-        text: "79"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4880
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 46
-        modifiers: 0
-        text: "2e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4896
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4912
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4928
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4944
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 46
-        modifiers: 0
-        text: "2e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4960
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5072
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5088
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5104
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5120
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5136
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5152
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5168
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5184
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5200
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5216
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5232
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5248
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5264
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5280
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5296
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5312
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5328
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5344
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5360
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5376
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5392
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5408
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5424
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5440
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5456
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5472
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5488
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5504
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5520
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5536
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5552
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5568
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5584
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5600
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5616
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5632
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5648
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5664
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5680
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5696
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5712
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5728
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5744
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5760
-        image: "wrap.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5792
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5808
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5824
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5840
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5856
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5872
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5888
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5904
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5920
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5936
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5952
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5968
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6064
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6080
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6096
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6720
-        image: "wrap.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6800
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.0.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.0.png
deleted file mode 100644
index 555996a..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.1.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.1.png
deleted file mode 100644
index b705bad..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.2.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.2.png
deleted file mode 100644
index 094cd2a..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.3.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.3.png
deleted file mode 100644
index 9c519c7..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.4.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.4.png
deleted file mode 100644
index 3ec77b5..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.5.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.5.png
deleted file mode 100644
index 579a66e..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.6.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.6.png
deleted file mode 100644
index 9e5ac90..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.7.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.7.png
deleted file mode 100644
index 9f3acfc..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.8.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.8.png
deleted file mode 100644
index f27518a..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.qml
deleted file mode 100644
index 8578d48..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.qml
+++ /dev/null
@@ -1,3555 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 32
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 48
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 64
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 80
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 96
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 112
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 128
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 144
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 160
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 176
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 192
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 208
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 224
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 240
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 256
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 272
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 288
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 304
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 320
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 336
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 352
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 368
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 384
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 400
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 416
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 432
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 448
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 464
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 480
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 496
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 512
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 528
-        hash: "15da97430bcbac3a16d9897bbf2e4dbd"
-    }
-    Frame {
-        msec: 544
-        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
-    }
-    Frame {
-        msec: 560
-        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
-    }
-    Frame {
-        msec: 576
-        hash: "eacfa8db605b9e386a55508e8943e7d1"
-    }
-    Frame {
-        msec: 592
-        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
-    }
-    Frame {
-        msec: 608
-        hash: "60a60e06237318bf005f87bbba386fef"
-    }
-    Frame {
-        msec: 624
-        hash: "97549f388c02adb8884c2e79510adc7e"
-    }
-    Frame {
-        msec: 640
-        hash: "d882fe91d9df9862d620cf984e27d0bd"
-    }
-    Frame {
-        msec: 656
-        hash: "6310b65572e39256122c7620f7e87442"
-    }
-    Frame {
-        msec: 672
-        hash: "4e7374a683050ff440056b6e7c971d2b"
-    }
-    Frame {
-        msec: 688
-        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
-    }
-    Frame {
-        msec: 704
-        hash: "8d71c418593eb3e4834d5e608ffd3f29"
-    }
-    Frame {
-        msec: 720
-        hash: "0da2c1cd0138172698a3bee5d19168c5"
-    }
-    Frame {
-        msec: 736
-        hash: "8ca757a4fd1987329488f63251b0f6b4"
-    }
-    Frame {
-        msec: 752
-        hash: "70c827f1b34b44cbd775b666913556d6"
-    }
-    Frame {
-        msec: 768
-        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
-    }
-    Frame {
-        msec: 784
-        hash: "38abc77b2361ce257d39c0cf268ba42b"
-    }
-    Frame {
-        msec: 800
-        hash: "59865194eb63465dd0f3925c7a500340"
-    }
-    Frame {
-        msec: 816
-        hash: "7bed5747d6b771db0fe5802153e54f2f"
-    }
-    Frame {
-        msec: 832
-        hash: "9ac1bf268749bc8e58bc4d04b55ef849"
-    }
-    Frame {
-        msec: 848
-        hash: "64ea5cb46782d250c46a7a2c8cceea20"
-    }
-    Frame {
-        msec: 864
-        hash: "d81037eb21bfcb434b6c7f3bbd21ad12"
-    }
-    Frame {
-        msec: 880
-        hash: "1079ea3a1a62e2cca9a8e907bc5aa4e1"
-    }
-    Frame {
-        msec: 896
-        hash: "96422f9bfbc11775cd7d1fae2ba357bd"
-    }
-    Frame {
-        msec: 912
-        hash: "0d247385059a6f68b37bc34f6b2214b1"
-    }
-    Frame {
-        msec: 928
-        hash: "7c513361e13a90eef229b42e68ffaa18"
-    }
-    Frame {
-        msec: 944
-        hash: "510b8441c613f0637dfc46e03c278112"
-    }
-    Frame {
-        msec: 960
-        image: "cursorDelegate.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "8d90112e2e1c6f226a1a5f4f75785939"
-    }
-    Frame {
-        msec: 992
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 1008
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 1024
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 1040
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 1056
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 1072
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 1088
-        hash: "8d90112e2e1c6f226a1a5f4f75785939"
-    }
-    Frame {
-        msec: 1104
-        hash: "85e6af1f5fd15338a15f984e24d5ec9d"
-    }
-    Frame {
-        msec: 1120
-        hash: "510b8441c613f0637dfc46e03c278112"
-    }
-    Frame {
-        msec: 1136
-        hash: "7c513361e13a90eef229b42e68ffaa18"
-    }
-    Frame {
-        msec: 1152
-        hash: "0d247385059a6f68b37bc34f6b2214b1"
-    }
-    Frame {
-        msec: 1168
-        hash: "96422f9bfbc11775cd7d1fae2ba357bd"
-    }
-    Frame {
-        msec: 1184
-        hash: "1079ea3a1a62e2cca9a8e907bc5aa4e1"
-    }
-    Frame {
-        msec: 1200
-        hash: "d81037eb21bfcb434b6c7f3bbd21ad12"
-    }
-    Frame {
-        msec: 1216
-        hash: "64ea5cb46782d250c46a7a2c8cceea20"
-    }
-    Frame {
-        msec: 1232
-        hash: "9ac1bf268749bc8e58bc4d04b55ef849"
-    }
-    Frame {
-        msec: 1248
-        hash: "7bed5747d6b771db0fe5802153e54f2f"
-    }
-    Frame {
-        msec: 1264
-        hash: "59865194eb63465dd0f3925c7a500340"
-    }
-    Frame {
-        msec: 1280
-        hash: "38abc77b2361ce257d39c0cf268ba42b"
-    }
-    Frame {
-        msec: 1296
-        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
-    }
-    Frame {
-        msec: 1312
-        hash: "70c827f1b34b44cbd775b666913556d6"
-    }
-    Frame {
-        msec: 1328
-        hash: "8ca757a4fd1987329488f63251b0f6b4"
-    }
-    Frame {
-        msec: 1344
-        hash: "0da2c1cd0138172698a3bee5d19168c5"
-    }
-    Frame {
-        msec: 1360
-        hash: "8d71c418593eb3e4834d5e608ffd3f29"
-    }
-    Frame {
-        msec: 1376
-        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1392
-        hash: "4e7374a683050ff440056b6e7c971d2b"
-    }
-    Frame {
-        msec: 1408
-        hash: "6310b65572e39256122c7620f7e87442"
-    }
-    Frame {
-        msec: 1424
-        hash: "d882fe91d9df9862d620cf984e27d0bd"
-    }
-    Frame {
-        msec: 1440
-        hash: "97549f388c02adb8884c2e79510adc7e"
-    }
-    Frame {
-        msec: 1456
-        hash: "60a60e06237318bf005f87bbba386fef"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1472
-        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
-    }
-    Frame {
-        msec: 1488
-        hash: "eacfa8db605b9e386a55508e8943e7d1"
-    }
-    Frame {
-        msec: 1504
-        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
-    }
-    Frame {
-        msec: 1520
-        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
-    }
-    Frame {
-        msec: 1536
-        hash: "c0e72cdf776b0c62742aa9c3683cd523"
-    }
-    Frame {
-        msec: 1552
-        hash: "ea3f512181b3ee94d8cdd4d9f59ed962"
-    }
-    Frame {
-        msec: 1568
-        hash: "de924155855e76d0591217448f79bdb6"
-    }
-    Frame {
-        msec: 1584
-        hash: "51da770a75102de9ad1920f1f6c44146"
-    }
-    Frame {
-        msec: 1600
-        hash: "e3c0e8f6385ef2ab9b671be3243774c4"
-    }
-    Frame {
-        msec: 1616
-        hash: "eac6de65ea6726f0cc50b6d30c1b7ba5"
-    }
-    Frame {
-        msec: 1632
-        hash: "2ee111386bd646c4ee577405e490a2f7"
-    }
-    Key {
-        type: 6
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1648
-        hash: "24c376d5a2b3555126b156c8bc7a7a0c"
-    }
-    Frame {
-        msec: 1664
-        hash: "d9c35de8b02f11db321d9bdcdcd65403"
-    }
-    Frame {
-        msec: 1680
-        hash: "0b32a66497ec3cdd05dc27c0ef9c5718"
-    }
-    Frame {
-        msec: 1696
-        hash: "9626f80ef170af2db135792337203265"
-    }
-    Frame {
-        msec: 1712
-        hash: "6e4ce7599da579f764ff10e982888889"
-    }
-    Frame {
-        msec: 1728
-        hash: "5ad4dd681be780c0068734ca5c722507"
-    }
-    Key {
-        type: 7
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1744
-        hash: "7d620ef53049f9195cc832d6f9dfd52b"
-    }
-    Frame {
-        msec: 1760
-        hash: "0f54144c574af01958505eedd69162f6"
-    }
-    Frame {
-        msec: 1776
-        hash: "50f168354e3901283708a4ae9088783d"
-    }
-    Frame {
-        msec: 1792
-        hash: "c55fdf2fd0a4eeb9ca0e3072aa3e60c4"
-    }
-    Frame {
-        msec: 1808
-        hash: "d351de13e7bb5b273ec3aebb88dffbd5"
-    }
-    Frame {
-        msec: 1824
-        hash: "977d44194d1ef05801167157714891af"
-    }
-    Frame {
-        msec: 1840
-        hash: "ef3694ca78764709abbe2f8781578fb4"
-    }
-    Frame {
-        msec: 1856
-        hash: "77afbc0e0b828d03148ed7fe342dfbda"
-    }
-    Frame {
-        msec: 1872
-        hash: "0d94e37430d8b835e65750a6af525ef7"
-    }
-    Frame {
-        msec: 1888
-        hash: "e009a8d2cb7c7f1200055666cf2efd9c"
-    }
-    Frame {
-        msec: 1904
-        hash: "096a2742962d7b22dba768577373e656"
-    }
-    Frame {
-        msec: 1920
-        image: "cursorDelegate.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "905b6c7ab24fd1a12f17494fc1935e98"
-    }
-    Frame {
-        msec: 1952
-        hash: "9bc98b4a32ea933fcc3a40eaae9b3516"
-    }
-    Frame {
-        msec: 1968
-        hash: "70f0313540b3517f3b6d403c3ab1199c"
-    }
-    Frame {
-        msec: 1984
-        hash: "309ae1af1ef7dbaf0b892ad60fd3eb93"
-    }
-    Frame {
-        msec: 2000
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 2016
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 2032
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 2048
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 2064
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 2080
-        hash: "309ae1af1ef7dbaf0b892ad60fd3eb93"
-    }
-    Frame {
-        msec: 2096
-        hash: "70f0313540b3517f3b6d403c3ab1199c"
-    }
-    Frame {
-        msec: 2112
-        hash: "9bc98b4a32ea933fcc3a40eaae9b3516"
-    }
-    Key {
-        type: 6
-        key: 16777248
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2128
-        hash: "905b6c7ab24fd1a12f17494fc1935e98"
-    }
-    Frame {
-        msec: 2144
-        hash: "31adf3a3bfbd1083c50cae7ed5d64334"
-    }
-    Frame {
-        msec: 2160
-        hash: "096a2742962d7b22dba768577373e656"
-    }
-    Frame {
-        msec: 2176
-        hash: "e009a8d2cb7c7f1200055666cf2efd9c"
-    }
-    Frame {
-        msec: 2192
-        hash: "0d94e37430d8b835e65750a6af525ef7"
-    }
-    Frame {
-        msec: 2208
-        hash: "77afbc0e0b828d03148ed7fe342dfbda"
-    }
-    Frame {
-        msec: 2224
-        hash: "ef3694ca78764709abbe2f8781578fb4"
-    }
-    Frame {
-        msec: 2240
-        hash: "977d44194d1ef05801167157714891af"
-    }
-    Frame {
-        msec: 2256
-        hash: "d351de13e7bb5b273ec3aebb88dffbd5"
-    }
-    Frame {
-        msec: 2272
-        hash: "c55fdf2fd0a4eeb9ca0e3072aa3e60c4"
-    }
-    Frame {
-        msec: 2288
-        hash: "50f168354e3901283708a4ae9088783d"
-    }
-    Frame {
-        msec: 2304
-        hash: "0f54144c574af01958505eedd69162f6"
-    }
-    Frame {
-        msec: 2320
-        hash: "7d620ef53049f9195cc832d6f9dfd52b"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2336
-        hash: "03e906dfb3bf98f521d805331d3b5b9c"
-    }
-    Frame {
-        msec: 2352
-        hash: "c2376393ea9541b909b6b4fe188fa03e"
-    }
-    Frame {
-        msec: 2368
-        hash: "9b3935370412c75acdf6e91100cf2f53"
-    }
-    Frame {
-        msec: 2384
-        hash: "30ab7913bdfc51d2df5ab9f3863d28c7"
-    }
-    Frame {
-        msec: 2400
-        hash: "593656e93d6e01419002dbb581aa6cbd"
-    }
-    Frame {
-        msec: 2416
-        hash: "33800dd560e44ce39d6325bbdee689de"
-    }
-    Frame {
-        msec: 2432
-        hash: "c41a9c4f08053d5d18fb2d530ed8b5ad"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2448
-        hash: "b3f2d4a2cb9a9d1304a2a2d07ad41ff2"
-    }
-    Frame {
-        msec: 2464
-        hash: "93cf7fe53bc1fd749c523d40b27d17b4"
-    }
-    Frame {
-        msec: 2480
-        hash: "6e9226d01dd93cff763e851148da8dfd"
-    }
-    Frame {
-        msec: 2496
-        hash: "79fdbda495bbc6c9ae8be03e1467de92"
-    }
-    Frame {
-        msec: 2512
-        hash: "c30fc0fa9351dbcdbe4f2a297cba9a52"
-    }
-    Frame {
-        msec: 2528
-        hash: "eaf26162fd5ce42262ea08ef39a7123d"
-    }
-    Frame {
-        msec: 2544
-        hash: "7bf0d6a5753a60eefae6d3c3819fabe4"
-    }
-    Frame {
-        msec: 2560
-        hash: "a2ee3a3b9cd22d7c0e54524cad32e647"
-    }
-    Frame {
-        msec: 2576
-        hash: "822298cfc4e2d64db1bf3e442dd891e6"
-    }
-    Frame {
-        msec: 2592
-        hash: "d075c64000b045eae1b42dce701787b7"
-    }
-    Frame {
-        msec: 2608
-        hash: "5ca7f15af781f896c83c81077f6b072e"
-    }
-    Frame {
-        msec: 2624
-        hash: "7d0f14896e67c56ed5238472dc127cb1"
-    }
-    Frame {
-        msec: 2640
-        hash: "dca161e8a9d786ba9d50aa655ccbecd3"
-    }
-    Frame {
-        msec: 2656
-        hash: "73bfcb0f5104efd056f25f7d73126369"
-    }
-    Frame {
-        msec: 2672
-        hash: "0090459043b05bf9504434f36230b32b"
-    }
-    Frame {
-        msec: 2688
-        hash: "f64315858f375c6ded480b2017fc18a5"
-    }
-    Frame {
-        msec: 2704
-        hash: "fe4c0ecfa9779c9fe052d4ffc9386d46"
-    }
-    Frame {
-        msec: 2720
-        hash: "849ad15f0ca893881165e956e8a26174"
-    }
-    Frame {
-        msec: 2736
-        hash: "c4373fa63ed00832c70a6b94cb729397"
-    }
-    Frame {
-        msec: 2752
-        hash: "0c7e08fb7f0dd954b0f171a37ef2a310"
-    }
-    Frame {
-        msec: 2768
-        hash: "505071572df7aa300a675f8a808bc7f4"
-    }
-    Frame {
-        msec: 2784
-        hash: "52839867e81d52746196f299a8371453"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2800
-        hash: "c4d214a7e0fc52c2a45fc6e3df12550a"
-    }
-    Frame {
-        msec: 2816
-        hash: "f1fa48d796667bd053fff4af7ec1d8ce"
-    }
-    Frame {
-        msec: 2832
-        hash: "081e46decc8aba911f018acfd761cda1"
-    }
-    Frame {
-        msec: 2848
-        hash: "fa417c9bfda1da66320a8e59fbaeb5b6"
-    }
-    Frame {
-        msec: 2864
-        hash: "83dfa353fd20f3bf7caa8e6ca9a9933c"
-    }
-    Frame {
-        msec: 2880
-        image: "cursorDelegate.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "c11459b1d3e51f3d2f5bd30049bcca42"
-    }
-    Frame {
-        msec: 2912
-        hash: "997ff3fa82ba2fb27a9c41ed9abe8991"
-    }
-    Frame {
-        msec: 2928
-        hash: "f8baaadde147266416c9ab3f9d9106ce"
-    }
-    Frame {
-        msec: 2944
-        hash: "79d1d34fd343d8de631aa3259167fe26"
-    }
-    Frame {
-        msec: 2960
-        hash: "8b1445ca6131a0fc4377ded24a60186a"
-    }
-    Frame {
-        msec: 2976
-        hash: "784cc01604ecadf74a45164f73f0336d"
-    }
-    Frame {
-        msec: 2992
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
-    }
-    Frame {
-        msec: 3008
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
-    }
-    Frame {
-        msec: 3024
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
-    }
-    Frame {
-        msec: 3040
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
-    }
-    Frame {
-        msec: 3056
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
-    }
-    Frame {
-        msec: 3072
-        hash: "b9aeac2be5c8e16e7938e141f32776be"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3088
-        hash: "00dfc5f4468482cb5f74e62be235b1d2"
-    }
-    Frame {
-        msec: 3104
-        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
-    }
-    Frame {
-        msec: 3120
-        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
-    }
-    Frame {
-        msec: 3136
-        hash: "75e854ccaad087bfe776a843f0bd7284"
-    }
-    Frame {
-        msec: 3152
-        hash: "1e3f580f37a0dc063a383bdf435e85ea"
-    }
-    Frame {
-        msec: 3168
-        hash: "3d78320cb021944d7c6cee1a42056663"
-    }
-    Frame {
-        msec: 3184
-        hash: "fca865f762c1a6cc3e487e0e908eef73"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3200
-        hash: "fb7ad9156658f3866d19e43f006cf013"
-    }
-    Frame {
-        msec: 3216
-        hash: "6f7411363c66d0959ea5a16a9b610e61"
-    }
-    Frame {
-        msec: 3232
-        hash: "a33dce3c55b1b1541cfb9b85a75fcb53"
-    }
-    Frame {
-        msec: 3248
-        hash: "56b81435dc4ce193bb98c3d02c781242"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3264
-        hash: "59865194eb63465dd0f3925c7a500340"
-    }
-    Frame {
-        msec: 3280
-        hash: "38abc77b2361ce257d39c0cf268ba42b"
-    }
-    Frame {
-        msec: 3296
-        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
-    }
-    Frame {
-        msec: 3312
-        hash: "70c827f1b34b44cbd775b666913556d6"
-    }
-    Frame {
-        msec: 3328
-        hash: "8ca757a4fd1987329488f63251b0f6b4"
-    }
-    Frame {
-        msec: 3344
-        hash: "0da2c1cd0138172698a3bee5d19168c5"
-    }
-    Frame {
-        msec: 3360
-        hash: "8d71c418593eb3e4834d5e608ffd3f29"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3376
-        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
-    }
-    Frame {
-        msec: 3392
-        hash: "4e7374a683050ff440056b6e7c971d2b"
-    }
-    Frame {
-        msec: 3408
-        hash: "6310b65572e39256122c7620f7e87442"
-    }
-    Frame {
-        msec: 3424
-        hash: "d882fe91d9df9862d620cf984e27d0bd"
-    }
-    Frame {
-        msec: 3440
-        hash: "97549f388c02adb8884c2e79510adc7e"
-    }
-    Frame {
-        msec: 3456
-        hash: "60a60e06237318bf005f87bbba386fef"
-    }
-    Frame {
-        msec: 3472
-        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
-    }
-    Frame {
-        msec: 3488
-        hash: "eacfa8db605b9e386a55508e8943e7d1"
-    }
-    Frame {
-        msec: 3504
-        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
-    }
-    Frame {
-        msec: 3520
-        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
-    }
-    Frame {
-        msec: 3536
-        hash: "c0e72cdf776b0c62742aa9c3683cd523"
-    }
-    Frame {
-        msec: 3552
-        hash: "ea3f512181b3ee94d8cdd4d9f59ed962"
-    }
-    Frame {
-        msec: 3568
-        hash: "de924155855e76d0591217448f79bdb6"
-    }
-    Frame {
-        msec: 3584
-        hash: "51da770a75102de9ad1920f1f6c44146"
-    }
-    Frame {
-        msec: 3600
-        hash: "e3c0e8f6385ef2ab9b671be3243774c4"
-    }
-    Frame {
-        msec: 3616
-        hash: "eac6de65ea6726f0cc50b6d30c1b7ba5"
-    }
-    Frame {
-        msec: 3632
-        hash: "2ee111386bd646c4ee577405e490a2f7"
-    }
-    Frame {
-        msec: 3648
-        hash: "fe95122352effcf1815bc237fc6ce6ab"
-    }
-    Frame {
-        msec: 3664
-        hash: "e3bb1ec3b84df25712f06e0d6963efdd"
-    }
-    Frame {
-        msec: 3680
-        hash: "a10d3184acc85c46e171fe4cf82e1c23"
-    }
-    Frame {
-        msec: 3696
-        hash: "d566b2763312e5e823593806acd9e809"
-    }
-    Frame {
-        msec: 3712
-        hash: "7db073b7487ddea48e7c9df8b9bfdc00"
-    }
-    Frame {
-        msec: 3728
-        hash: "85c663b943f67d158367dba0508980a5"
-    }
-    Frame {
-        msec: 3744
-        hash: "6336ce0d912ee63773475c4c6c5d59be"
-    }
-    Frame {
-        msec: 3760
-        hash: "c75ba80484af36633b6a4d17b666b1c9"
-    }
-    Frame {
-        msec: 3776
-        hash: "08b7d4eef2d15bc717ff1a981a11f275"
-    }
-    Frame {
-        msec: 3792
-        hash: "0ab8bebb0e43786a7e51ea780745080c"
-    }
-    Frame {
-        msec: 3808
-        hash: "6fa1811f520eff9893b3c7b00e53fa7d"
-    }
-    Frame {
-        msec: 3824
-        hash: "6feb44655bfbec651cc2902676bd08b4"
-    }
-    Frame {
-        msec: 3840
-        image: "cursorDelegate.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "00b7714df163d8055514e0dbd8a83bac"
-    }
-    Frame {
-        msec: 3872
-        hash: "6ef2a330d70a7e0ce343bb352c46f126"
-    }
-    Frame {
-        msec: 3888
-        hash: "f4e26309fa3b8a6d55f44bf146544101"
-    }
-    Frame {
-        msec: 3904
-        hash: "dfa1e24149f2662a4a552da3bb64348c"
-    }
-    Frame {
-        msec: 3920
-        hash: "9ab9d6ef4aeb5863401a9e251f684e2d"
-    }
-    Frame {
-        msec: 3936
-        hash: "c9f7591a37a3743b3b48de5337fd2fa0"
-    }
-    Frame {
-        msec: 3952
-        hash: "2d38f17db530050574d9192c805c142d"
-    }
-    Frame {
-        msec: 3968
-        hash: "38a4ad2cf9fa3015eff67014900a44cc"
-    }
-    Frame {
-        msec: 3984
-        hash: "9d9ce4ac0de6caa2f0bb78eac414ba65"
-    }
-    Frame {
-        msec: 4000
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 4016
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 4032
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 4048
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 4064
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 4080
-        hash: "9d9ce4ac0de6caa2f0bb78eac414ba65"
-    }
-    Frame {
-        msec: 4096
-        hash: "38a4ad2cf9fa3015eff67014900a44cc"
-    }
-    Frame {
-        msec: 4112
-        hash: "2d38f17db530050574d9192c805c142d"
-    }
-    Frame {
-        msec: 4128
-        hash: "c9f7591a37a3743b3b48de5337fd2fa0"
-    }
-    Frame {
-        msec: 4144
-        hash: "9ab9d6ef4aeb5863401a9e251f684e2d"
-    }
-    Frame {
-        msec: 4160
-        hash: "dfa1e24149f2662a4a552da3bb64348c"
-    }
-    Frame {
-        msec: 4176
-        hash: "f4e26309fa3b8a6d55f44bf146544101"
-    }
-    Frame {
-        msec: 4192
-        hash: "6ef2a330d70a7e0ce343bb352c46f126"
-    }
-    Frame {
-        msec: 4208
-        hash: "00b7714df163d8055514e0dbd8a83bac"
-    }
-    Frame {
-        msec: 4224
-        hash: "ae46d672649a4b0fc5171f776af93a2c"
-    }
-    Frame {
-        msec: 4240
-        hash: "6feb44655bfbec651cc2902676bd08b4"
-    }
-    Frame {
-        msec: 4256
-        hash: "6fa1811f520eff9893b3c7b00e53fa7d"
-    }
-    Frame {
-        msec: 4272
-        hash: "0ab8bebb0e43786a7e51ea780745080c"
-    }
-    Frame {
-        msec: 4288
-        hash: "08b7d4eef2d15bc717ff1a981a11f275"
-    }
-    Frame {
-        msec: 4304
-        hash: "c75ba80484af36633b6a4d17b666b1c9"
-    }
-    Frame {
-        msec: 4320
-        hash: "6336ce0d912ee63773475c4c6c5d59be"
-    }
-    Frame {
-        msec: 4336
-        hash: "85c663b943f67d158367dba0508980a5"
-    }
-    Frame {
-        msec: 4352
-        hash: "7db073b7487ddea48e7c9df8b9bfdc00"
-    }
-    Frame {
-        msec: 4368
-        hash: "d566b2763312e5e823593806acd9e809"
-    }
-    Frame {
-        msec: 4384
-        hash: "a10d3184acc85c46e171fe4cf82e1c23"
-    }
-    Frame {
-        msec: 4400
-        hash: "e3bb1ec3b84df25712f06e0d6963efdd"
-    }
-    Frame {
-        msec: 4416
-        hash: "fe95122352effcf1815bc237fc6ce6ab"
-    }
-    Frame {
-        msec: 4432
-        hash: "2ee111386bd646c4ee577405e490a2f7"
-    }
-    Frame {
-        msec: 4448
-        hash: "eac6de65ea6726f0cc50b6d30c1b7ba5"
-    }
-    Frame {
-        msec: 4464
-        hash: "e3c0e8f6385ef2ab9b671be3243774c4"
-    }
-    Frame {
-        msec: 4480
-        hash: "51da770a75102de9ad1920f1f6c44146"
-    }
-    Frame {
-        msec: 4496
-        hash: "de924155855e76d0591217448f79bdb6"
-    }
-    Frame {
-        msec: 4512
-        hash: "ea3f512181b3ee94d8cdd4d9f59ed962"
-    }
-    Frame {
-        msec: 4528
-        hash: "c0e72cdf776b0c62742aa9c3683cd523"
-    }
-    Frame {
-        msec: 4544
-        hash: "2aec32493055ad17f4aac9b3c9b84c5f"
-    }
-    Frame {
-        msec: 4560
-        hash: "e0826ff09b628a5e3ddf6d9e5593f937"
-    }
-    Frame {
-        msec: 4576
-        hash: "eacfa8db605b9e386a55508e8943e7d1"
-    }
-    Frame {
-        msec: 4592
-        hash: "2dbe9b5bbb5baf12cd2cbfb4190be316"
-    }
-    Frame {
-        msec: 4608
-        hash: "60a60e06237318bf005f87bbba386fef"
-    }
-    Frame {
-        msec: 4624
-        hash: "97549f388c02adb8884c2e79510adc7e"
-    }
-    Frame {
-        msec: 4640
-        hash: "d882fe91d9df9862d620cf984e27d0bd"
-    }
-    Frame {
-        msec: 4656
-        hash: "6310b65572e39256122c7620f7e87442"
-    }
-    Frame {
-        msec: 4672
-        hash: "4e7374a683050ff440056b6e7c971d2b"
-    }
-    Frame {
-        msec: 4688
-        hash: "35c0d55cda3a02eb4c441a5832bcbbf4"
-    }
-    Frame {
-        msec: 4704
-        hash: "8d71c418593eb3e4834d5e608ffd3f29"
-    }
-    Frame {
-        msec: 4720
-        hash: "0da2c1cd0138172698a3bee5d19168c5"
-    }
-    Frame {
-        msec: 4736
-        hash: "8ca757a4fd1987329488f63251b0f6b4"
-    }
-    Frame {
-        msec: 4752
-        hash: "70c827f1b34b44cbd775b666913556d6"
-    }
-    Frame {
-        msec: 4768
-        hash: "2b91dcef1b3ca66059dd9db4c8e335f3"
-    }
-    Frame {
-        msec: 4784
-        hash: "38abc77b2361ce257d39c0cf268ba42b"
-    }
-    Frame {
-        msec: 4800
-        image: "cursorDelegate.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "7bed5747d6b771db0fe5802153e54f2f"
-    }
-    Frame {
-        msec: 4832
-        hash: "9ac1bf268749bc8e58bc4d04b55ef849"
-    }
-    Frame {
-        msec: 4848
-        hash: "64ea5cb46782d250c46a7a2c8cceea20"
-    }
-    Frame {
-        msec: 4864
-        hash: "d81037eb21bfcb434b6c7f3bbd21ad12"
-    }
-    Frame {
-        msec: 4880
-        hash: "1079ea3a1a62e2cca9a8e907bc5aa4e1"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 130; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4896
-        hash: "3d78320cb021944d7c6cee1a42056663"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4912
-        hash: "1e3f580f37a0dc063a383bdf435e85ea"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 131; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4928
-        hash: "75e854ccaad087bfe776a843f0bd7284"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 132; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4944
-        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 133; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 134; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4960
-        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 135; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4976
-        hash: "00dfc5f4468482cb5f74e62be235b1d2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 136; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4992
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 137; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5008
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 139; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5024
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5040
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 141; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 143; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5056
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5072
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5088
-        hash: "748dc58a3ad83d7b99d7b26ad2f82786"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 149; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5104
-        hash: "242cc0ee7c3bdb44e8933068d3a93b61"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 150; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5120
-        hash: "3be6f0a35fb085dcf6c9481cf1c23f9d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5136
-        hash: "a6f63267eaba9aefd2c9ab338571ef33"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5152
-        hash: "ba37dd9ba649e294465dc707f6b768ec"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 153; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5168
-        hash: "35b186609721ec0b8a121d15bc54ce49"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5184
-        hash: "700ff15e4e48af93362455a149d90363"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5200
-        hash: "1c51eb8d4d25d086bda4d595a49c3a86"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5216
-        hash: "2f085b047d24384d463163df7fac2bd3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 158; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5232
-        hash: "46d7aff6eb47e50e23c061ecb149fbf9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 161; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5248
-        hash: "48d7a8f749f7501dbaa4599ca41096a5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5264
-        hash: "4c2a085c69c118fedfa15fe46cdc508b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 164; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5280
-        hash: "25f25828a4d22fe85db0de5c562f658e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5296
-        hash: "e9fb14ec21e9ec1235d2fea6e055b69d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5312
-        hash: "66417881aeb85778be66566241c45f5a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5328
-        hash: "c8c136690ffd8e5cc3e58f7376693b4f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 178; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5344
-        hash: "c58c4fb5b7197cd8bd95742dc8715bbf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 179; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5360
-        hash: "2e0c93380883fcf2d0e56024fecba605"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 180; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5376
-        hash: "5f169f09e3d868eb0425a331d4bc3144"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 182; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5392
-        hash: "ed648742be4b0ded04e713e83ed24b27"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5408
-        hash: "92131288bb38480469f4578282dedaf8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5424
-        hash: "e16773f750bb0f635552b1eeadb2d625"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 189; y: 93
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5440
-        hash: "6e653cd552d82f38f30b8027d1951534"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 192; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5456
-        hash: "cfc1d6efa8d1b3b86396704f0be031ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 194; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5472
-        hash: "5848af73f5ab7c811639a6d01921d502"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 196; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5488
-        hash: "3823e7da05678f63e6761a81ed7233e2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5504
-        hash: "d095abe9814a60824914960a11663f12"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 91
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5520
-        hash: "18922bb3269d903a36e0b690249b473a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 91
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 201; y: 90
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5536
-        hash: "4d8400a3ca2b782e7b054bb2f71d4543"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5552
-        hash: "24ed25d7a767f01fb02f545fc6c6931a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5568
-        hash: "55fb16784e3655ae70f97d6c32853cdc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 204; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5584
-        hash: "694e6979f0de62b61324dc4b144a2d5d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 207; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 208; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5600
-        hash: "e61b8b03251f6312e3de4e0c8af684d5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5616
-        hash: "6203321f87d53692dbb2b2aaf7dd3944"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5632
-        hash: "297b77029475d77cd8e481199b23da30"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 214; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5648
-        hash: "414615d772b4c80bf85eabfdca6fd0e0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5664
-        hash: "46d70882552a21267eebb3505da086f3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5680
-        hash: "372acafc63624307bcb384c48a803ab7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5696
-        hash: "1b98094dd4f192af8229b7058b8ce396"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5712
-        hash: "d627fa0ce696e46650225e43134643f5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5728
-        hash: "0410f4b504d768bc00940b20d3d942f9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 86
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5744
-        hash: "5f8011b44681d769800af8d205c757cb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 221; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5760
-        image: "cursorDelegate.5.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 87
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5776
-        hash: "99f7a46f841f96445962b5fb3496d996"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5792
-        hash: "ed8bba2823ca2fe7cf138af0fcc52806"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 224; y: 90
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5808
-        hash: "c9007b7ae5038ba59bfc6fac15c80d5f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 226; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5824
-        hash: "2db81c955a99652bcfef958e870054af"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 228; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5840
-        hash: "1e3906d7f3ee5a29c3c90b8e1f6c1eb0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 229; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 231; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5856
-        hash: "fc59738903cc9e6f36ef4d27bfde9496"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5872
-        hash: "768aaf4ef2b13b40b75bdf15787966b6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5888
-        hash: "3085baedc0c58a6757b134bb4f80fa9e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5904
-        hash: "0a1b8cad167bf93801f4d0dd34bf872e"
-    }
-    Frame {
-        msec: 5920
-        hash: "6366e04808ee015feed44d95cc117e1e"
-    }
-    Frame {
-        msec: 5936
-        hash: "dd67a8542a243aac9462e25dc1586e6e"
-    }
-    Frame {
-        msec: 5952
-        hash: "e06c8788b2ef327d005b4048f0807334"
-    }
-    Frame {
-        msec: 5968
-        hash: "dda2beda1253bd477d04cada4ec4df27"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 233; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5984
-        hash: "d659d1724637d90497c8e417764d3477"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 232; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6000
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 231; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6016
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 230; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6032
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 229; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 228; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6048
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 227; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6064
-        hash: "91035aecf2ac15f3c2c3dbc4b73b540f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 225; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6080
-        hash: "bdc53613cad59416ed79287874eb59f8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 224; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6096
-        hash: "54efe0acb07fb69827024a566773a36e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6112
-        hash: "860530a5ac3d89193f3cf234e21f8f6a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6128
-        hash: "ade5f8e28159304b22866f688efdbb46"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6144
-        hash: "7d5f5cf34910527d899e89ea07fb7254"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6160
-        hash: "c201ed0f2419396a229d8396152aba01"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6176
-        hash: "b99135e2cb03ab252ff379c8001c26ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6192
-        hash: "768aaf4ef2b13b40b75bdf15787966b6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6208
-        hash: "71a5bed1a87e16c986b2f4b245e956b8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 210; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6224
-        hash: "7155607add8c7254286097cda52b5888"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 208; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 207; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6240
-        hash: "e516e4d8a4ef0195ae04b3287f536ffd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 206; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6256
-        hash: "afa06d10b37d8ad8b57e392142ff50f2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 205; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6272
-        hash: "88c3fe68f7251d87a5bf197b9d59b899"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 204; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6288
-        hash: "b2687baf5148539ee2181b18077e0a3d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 202; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6304
-        hash: "457aed68cee2b9f3ff3c7d5f0eb2b6aa"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 201; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6320
-        hash: "48bb4683718a3b7c34baea29260fbe8c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6336
-        hash: "7c32fbf799bbfc10d0fbdd96bcfa9d95"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 197; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6352
-        hash: "68cee3b8213a9d38e2ed431d06eb6756"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 196; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 194; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6368
-        hash: "596c732c40a86d16bc649f164b919457"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 101
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 188; y: 100
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6384
-        hash: "d9cb5bf69d4f8aaebefae6d680a99185"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 187; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6400
-        hash: "bb6759f3aff00f027f4f426efb775d2d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 185; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6416
-        hash: "a408d88f97c30ab8ab12a222b03571b4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 182; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6432
-        hash: "bb2e8994dc014eb6d4e4e33257269c2a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6448
-        hash: "190e9df0b8d20b0f37a198e9f3976416"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 171; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6464
-        hash: "aa7be52534c8550948deea6ae174330d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6480
-        hash: "533caac613ea1279a51a5b5b29acdccc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6496
-        hash: "288cc34879d9ed8ed381ba6cc31de3e7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6512
-        hash: "2a57602c47ab788f288daa81b985fc1d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6528
-        hash: "fa3540fafa1a9e3c5e796b598dce8fb1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 156; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6544
-        hash: "7e9b17ae7c10cb30153539911ac6eb13"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6560
-        hash: "9e62b16c858e80ff1294ec53e2390498"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 153; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6576
-        hash: "287470e6cf9bd4b9acfd1cd1512307e3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6592
-        hash: "4086c7c7a573a1b9f98d22ebf9b46c5f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 149; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6608
-        hash: "7d0868f000a1102916720a29a332543f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6624
-        hash: "bda3cfdca81f7cba54514c512eb6b12e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 96
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6640
-        hash: "923ff9fac39c3fba2c9cf7b52fc652ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6656
-        hash: "269718e3586affbbdf0b9599e12f5677"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6672
-        hash: "d12e03b5da6ea7b162d7dec6930c1a54"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6688
-        hash: "96edf1f15c674c5d8c4e4ce9e1d34f1d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6704
-        hash: "70ce229fae6985dd49de8cca01c031e6"
-    }
-    Frame {
-        msec: 6720
-        image: "cursorDelegate.6.png"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 144; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6736
-        hash: "56215b7d24ac382ff1ed256c80d14091"
-    }
-    Frame {
-        msec: 6752
-        hash: "ac132304e072806431803d26e345b264"
-    }
-    Frame {
-        msec: 6768
-        hash: "a8f3e7fbb95ed8fe2b83871eb3d2c151"
-    }
-    Frame {
-        msec: 6784
-        hash: "43906030c2572af0f8f0577dbc86e346"
-    }
-    Frame {
-        msec: 6800
-        hash: "d64b58801430d5063225dceac1603bca"
-    }
-    Frame {
-        msec: 6816
-        hash: "56b81435dc4ce193bb98c3d02c781242"
-    }
-    Frame {
-        msec: 6832
-        hash: "a33dce3c55b1b1541cfb9b85a75fcb53"
-    }
-    Frame {
-        msec: 6848
-        hash: "6f7411363c66d0959ea5a16a9b610e61"
-    }
-    Frame {
-        msec: 6864
-        hash: "fb7ad9156658f3866d19e43f006cf013"
-    }
-    Frame {
-        msec: 6880
-        hash: "fca865f762c1a6cc3e487e0e908eef73"
-    }
-    Frame {
-        msec: 6896
-        hash: "3d78320cb021944d7c6cee1a42056663"
-    }
-    Frame {
-        msec: 6912
-        hash: "1e3f580f37a0dc063a383bdf435e85ea"
-    }
-    Frame {
-        msec: 6928
-        hash: "75e854ccaad087bfe776a843f0bd7284"
-    }
-    Frame {
-        msec: 6944
-        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
-    }
-    Frame {
-        msec: 6960
-        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
-    }
-    Frame {
-        msec: 6976
-        hash: "00dfc5f4468482cb5f74e62be235b1d2"
-    }
-    Frame {
-        msec: 6992
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7008
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7024
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7040
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7056
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7072
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 7088
-        hash: "00dfc5f4468482cb5f74e62be235b1d2"
-    }
-    Frame {
-        msec: 7104
-        hash: "62bc9c57724f7ab6bcf7d75d8ff68097"
-    }
-    Frame {
-        msec: 7120
-        hash: "ad65de5a6887c0a31a9d8f72a2a651db"
-    }
-    Frame {
-        msec: 7136
-        hash: "75e854ccaad087bfe776a843f0bd7284"
-    }
-    Frame {
-        msec: 7152
-        hash: "1e3f580f37a0dc063a383bdf435e85ea"
-    }
-    Frame {
-        msec: 7168
-        hash: "3d78320cb021944d7c6cee1a42056663"
-    }
-    Frame {
-        msec: 7184
-        hash: "fca865f762c1a6cc3e487e0e908eef73"
-    }
-    Frame {
-        msec: 7200
-        hash: "fb7ad9156658f3866d19e43f006cf013"
-    }
-    Frame {
-        msec: 7216
-        hash: "6f7411363c66d0959ea5a16a9b610e61"
-    }
-    Frame {
-        msec: 7232
-        hash: "a33dce3c55b1b1541cfb9b85a75fcb53"
-    }
-    Frame {
-        msec: 7248
-        hash: "56b81435dc4ce193bb98c3d02c781242"
-    }
-    Frame {
-        msec: 7264
-        hash: "d64b58801430d5063225dceac1603bca"
-    }
-    Frame {
-        msec: 7280
-        hash: "43906030c2572af0f8f0577dbc86e346"
-    }
-    Frame {
-        msec: 7296
-        hash: "a8f3e7fbb95ed8fe2b83871eb3d2c151"
-    }
-    Frame {
-        msec: 7312
-        hash: "ac132304e072806431803d26e345b264"
-    }
-    Frame {
-        msec: 7328
-        hash: "56215b7d24ac382ff1ed256c80d14091"
-    }
-    Frame {
-        msec: 7344
-        hash: "4d5c97925b21d699f1c3720a3f51ebbb"
-    }
-    Frame {
-        msec: 7360
-        hash: "70ce229fae6985dd49de8cca01c031e6"
-    }
-    Frame {
-        msec: 7376
-        hash: "96edf1f15c674c5d8c4e4ce9e1d34f1d"
-    }
-    Frame {
-        msec: 7392
-        hash: "d12e03b5da6ea7b162d7dec6930c1a54"
-    }
-    Frame {
-        msec: 7408
-        hash: "269718e3586affbbdf0b9599e12f5677"
-    }
-    Frame {
-        msec: 7424
-        hash: "42d19ea6dd328c505da5a4eee23a257d"
-    }
-    Frame {
-        msec: 7440
-        hash: "e4d9d77859759dd95cf3ffee8f142cd8"
-    }
-    Frame {
-        msec: 7456
-        hash: "445e4c6e9872b63a1461e3277dd8185c"
-    }
-    Frame {
-        msec: 7472
-        hash: "d6343c629acd987179eae0d158d2504c"
-    }
-    Frame {
-        msec: 7488
-        hash: "a5340087baa2c3694ed0cc2bbc3e2ad9"
-    }
-    Frame {
-        msec: 7504
-        hash: "205973c30aaca71d1f20e740ce971d82"
-    }
-    Frame {
-        msec: 7520
-        hash: "ed28c7e07755e177222c7e322116bfb4"
-    }
-    Frame {
-        msec: 7536
-        hash: "6cebfc407a985694c803940608ab1303"
-    }
-    Frame {
-        msec: 7552
-        hash: "87f825fc820d3942e4d9b5ece5be3714"
-    }
-    Frame {
-        msec: 7568
-        hash: "9aa56dfe90ed2eba58eee0ff6ff3822c"
-    }
-    Frame {
-        msec: 7584
-        hash: "c93acf87a918f21a55cf39ea255315a3"
-    }
-    Frame {
-        msec: 7600
-        hash: "f8ce1bec5d5016c56fc66d52c28e69d1"
-    }
-    Frame {
-        msec: 7616
-        hash: "a365dba2f7c4be77ea98b727813c2f03"
-    }
-    Frame {
-        msec: 7632
-        hash: "e8d1c35ee9ef74c4070adfce5e4560f1"
-    }
-    Frame {
-        msec: 7648
-        hash: "f5f2dbb041eeb4de1821761f4fbca506"
-    }
-    Frame {
-        msec: 7664
-        hash: "f4ea6e9dff51778e9b5d1321453617ec"
-    }
-    Frame {
-        msec: 7680
-        image: "cursorDelegate.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "f2869791dde1eb4c2ea24e04dc3ac653"
-    }
-    Frame {
-        msec: 7712
-        hash: "9bd70e91b765de22b70fe295adc4f87f"
-    }
-    Frame {
-        msec: 7728
-        hash: "c0338d0a5c72ba63bff666a76ab3242c"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 227; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "cb2a643eed9b5658260e04495820cd3d"
-    }
-    Frame {
-        msec: 7760
-        hash: "6dda51f2e611b1f589c75820fd8c7295"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 227; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7776
-        hash: "98d8692afd47c61421ddcae62414a72e"
-    }
-    Frame {
-        msec: 7792
-        hash: "2c533bcdd9df45c6f942d47509ebf20e"
-    }
-    Frame {
-        msec: 7808
-        hash: "d28f231fb1e128329e8985689deac882"
-    }
-    Frame {
-        msec: 7824
-        hash: "ea73450baf98a2f629ce1c203cfcd728"
-    }
-    Frame {
-        msec: 7840
-        hash: "959a31d38edc343b5e081fd0cddc81df"
-    }
-    Frame {
-        msec: 7856
-        hash: "9b1ae10ee8e9b3f176357733af9e6735"
-    }
-    Frame {
-        msec: 7872
-        hash: "89b0dd11f456bbb321e0bd2e1614c193"
-    }
-    Frame {
-        msec: 7888
-        hash: "a0a3aa6d8d4c677894e745ee432084e2"
-    }
-    Frame {
-        msec: 7904
-        hash: "f63207b8903085b19de1c9b6a9ff90e0"
-    }
-    Frame {
-        msec: 7920
-        hash: "c8f2126fece8c2b473c6511aa568dddb"
-    }
-    Frame {
-        msec: 7936
-        hash: "6ccd1f30e85dbad74468c228d92a9a3c"
-    }
-    Frame {
-        msec: 7952
-        hash: "bae09fe9f29e0f6ebda298cae753ddab"
-    }
-    Frame {
-        msec: 7968
-        hash: "cde4abae868488345fb124b927f46b45"
-    }
-    Frame {
-        msec: 7984
-        hash: "a88ccf9c8ae34ffcfd15af4e66102040"
-    }
-    Frame {
-        msec: 8000
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8016
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8032
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8048
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8064
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 8080
-        hash: "a88ccf9c8ae34ffcfd15af4e66102040"
-    }
-    Frame {
-        msec: 8096
-        hash: "cde4abae868488345fb124b927f46b45"
-    }
-    Frame {
-        msec: 8112
-        hash: "bae09fe9f29e0f6ebda298cae753ddab"
-    }
-    Frame {
-        msec: 8128
-        hash: "6ccd1f30e85dbad74468c228d92a9a3c"
-    }
-    Frame {
-        msec: 8144
-        hash: "c8f2126fece8c2b473c6511aa568dddb"
-    }
-    Frame {
-        msec: 8160
-        hash: "f63207b8903085b19de1c9b6a9ff90e0"
-    }
-    Frame {
-        msec: 8176
-        hash: "a0a3aa6d8d4c677894e745ee432084e2"
-    }
-    Frame {
-        msec: 8192
-        hash: "89b0dd11f456bbb321e0bd2e1614c193"
-    }
-    Frame {
-        msec: 8208
-        hash: "9b1ae10ee8e9b3f176357733af9e6735"
-    }
-    Frame {
-        msec: 8224
-        hash: "959a31d38edc343b5e081fd0cddc81df"
-    }
-    Frame {
-        msec: 8240
-        hash: "ea73450baf98a2f629ce1c203cfcd728"
-    }
-    Frame {
-        msec: 8256
-        hash: "d28f231fb1e128329e8985689deac882"
-    }
-    Frame {
-        msec: 8272
-        hash: "2c533bcdd9df45c6f942d47509ebf20e"
-    }
-    Frame {
-        msec: 8288
-        hash: "98d8692afd47c61421ddcae62414a72e"
-    }
-    Frame {
-        msec: 8304
-        hash: "6dda51f2e611b1f589c75820fd8c7295"
-    }
-    Frame {
-        msec: 8320
-        hash: "cb2a643eed9b5658260e04495820cd3d"
-    }
-    Frame {
-        msec: 8336
-        hash: "88afd2fa1182fbb2aab100d4587a1006"
-    }
-    Frame {
-        msec: 8352
-        hash: "bc657c5181a11a9ff9565f134bdccb8d"
-    }
-    Frame {
-        msec: 8368
-        hash: "a296634d814a6e12f9d09f4d8a9fa097"
-    }
-    Frame {
-        msec: 8384
-        hash: "f05a2deeb12722904c4f31d641dffeb4"
-    }
-    Frame {
-        msec: 8400
-        hash: "75823698247e39dd10a70fe224e13597"
-    }
-    Frame {
-        msec: 8416
-        hash: "244fa06c168f7a7401b8ec7f5ddb0e52"
-    }
-    Frame {
-        msec: 8432
-        hash: "a78e0f88d269290e9086d1d854618f0c"
-    }
-    Frame {
-        msec: 8448
-        hash: "57b1281d29d5c5fdc15d9cf1e3a5545c"
-    }
-    Frame {
-        msec: 8464
-        hash: "a24ac211ef29dcf7f22ac95991f1af3f"
-    }
-    Frame {
-        msec: 8480
-        hash: "361f978ea3597fd518c25c0069c22e8b"
-    }
-    Frame {
-        msec: 8496
-        hash: "ac8e2c01eb58aac0eb4feb6aba9b9628"
-    }
-    Frame {
-        msec: 8512
-        hash: "6099612934b5eb90296f1cc3cb5c1a84"
-    }
-    Frame {
-        msec: 8528
-        hash: "7c3f08291168065fc9c1d62108022d33"
-    }
-    Frame {
-        msec: 8544
-        hash: "8bf57ba445d668af5f3e59276c4f8800"
-    }
-    Frame {
-        msec: 8560
-        hash: "c8ed352cbfbc472ea4802a9e03d40052"
-    }
-    Frame {
-        msec: 8576
-        hash: "11e5546b30e47d2f3067c0364b9f0877"
-    }
-    Frame {
-        msec: 8592
-        hash: "9df0f136fca92d4a05f17ee68f0cd286"
-    }
-    Frame {
-        msec: 8608
-        hash: "39f47838a622ba328548cad57cca9e12"
-    }
-    Frame {
-        msec: 8624
-        hash: "c891d582be4b23c01e29032fe861081f"
-    }
-    Frame {
-        msec: 8640
-        image: "cursorDelegate.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "c3820dfd382c4568d9fbd2ee95889eda"
-    }
-    Frame {
-        msec: 8672
-        hash: "528cf8778318bf7216b54f983dadb2b4"
-    }
-    Frame {
-        msec: 8688
-        hash: "419518a3c63aa36f6070e95eb93e58a3"
-    }
-    Frame {
-        msec: 8704
-        hash: "11b22e2853c0a9ea6e4ac764348698c9"
-    }
-    Frame {
-        msec: 8720
-        hash: "8018329c4b57647942ae34a5f83c2b12"
-    }
-    Frame {
-        msec: 8736
-        hash: "c37e9fd5c3d664c2e4911c8cb9fcabf7"
-    }
-    Frame {
-        msec: 8752
-        hash: "4e7895f802c9fc249894ba0db25959f7"
-    }
-    Frame {
-        msec: 8768
-        hash: "5fed71d99ef70432bc6be8caaea36f17"
-    }
-    Frame {
-        msec: 8784
-        hash: "69976d074acbd7a5731c70b33c8f084b"
-    }
-    Frame {
-        msec: 8800
-        hash: "c88952348da3df0627b12b8bb05ca13e"
-    }
-    Frame {
-        msec: 8816
-        hash: "cc5222da7a17c66d4db146c406492701"
-    }
-    Frame {
-        msec: 8832
-        hash: "8915e752776da27cb86019c9decc8a8c"
-    }
-    Frame {
-        msec: 8848
-        hash: "d8a77ccc7c01cf187e846a2903e1c55e"
-    }
-    Frame {
-        msec: 8864
-        hash: "3cf3f02f98a199c81ef73e8905e7f7ee"
-    }
-    Frame {
-        msec: 8880
-        hash: "7a1d47e0109fc370bf63714040cbef96"
-    }
-    Frame {
-        msec: 8896
-        hash: "2ca8b8ddbe73b29327e474da34a14a87"
-    }
-    Frame {
-        msec: 8912
-        hash: "ee75214865fca848aa38cc05b6049d8f"
-    }
-    Frame {
-        msec: 8928
-        hash: "05ab7d8118a806f2215160f5f266a082"
-    }
-    Frame {
-        msec: 8944
-        hash: "31e63095b7be56d0bf75e9cff832feb7"
-    }
-    Frame {
-        msec: 8960
-        hash: "3ffda2c2f154f1eb806e9f0963057fa1"
-    }
-    Frame {
-        msec: 8976
-        hash: "4e805203b58e8f6f331f2e878704fa01"
-    }
-    Frame {
-        msec: 8992
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9008
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9024
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9040
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9056
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9072
-        hash: "60edce44dd4ca7fac8d8093990ee5ec1"
-    }
-    Frame {
-        msec: 9088
-        hash: "4e805203b58e8f6f331f2e878704fa01"
-    }
-    Frame {
-        msec: 9104
-        hash: "3ffda2c2f154f1eb806e9f0963057fa1"
-    }
-    Frame {
-        msec: 9120
-        hash: "31e63095b7be56d0bf75e9cff832feb7"
-    }
-    Frame {
-        msec: 9136
-        hash: "05ab7d8118a806f2215160f5f266a082"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.0.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.0.png
deleted file mode 100644
index 95a835a..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.1.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.1.png
deleted file mode 100644
index 409192c..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.2.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.2.png
deleted file mode 100644
index cd2f112..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.3.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.3.png
deleted file mode 100644
index 7191c1e..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.qml
deleted file mode 100644
index 352c890..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.qml
+++ /dev/null
@@ -1,1371 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 32
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 48
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 64
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 80
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 96
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 112
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 128
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 144
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 160
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 176
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 192
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 208
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 224
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 240
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 256
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 272
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 288
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 304
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 320
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 336
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 352
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 368
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 384
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 400
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 416
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 432
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 448
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 464
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 480
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 496
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 512
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 528
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 560
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 576
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 592
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 608
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 624
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 640
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 656
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 672
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 688
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 704
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 720
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 736
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 752
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 768
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 784
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 800
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 816
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 832
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 848
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 864
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 880
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 896
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 912
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 928
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 944
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 960
-        image: "qt-669.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 992
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 1008
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1024
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 1040
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 1056
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 1072
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 1088
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1104
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 1120
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 1136
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1152
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 1168
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 1184
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 1200
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 1216
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1232
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 1248
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 1264
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 1280
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1296
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 1312
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 1328
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 1344
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1360
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1376
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1392
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1408
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1424
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1440
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1456
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1472
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1488
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1504
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1520
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1536
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1552
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1568
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1584
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1600
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1616
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1632
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1648
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1664
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1680
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1696
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1712
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1728
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1744
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1760
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1776
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1792
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1808
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1824
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Frame {
-        msec: 1840
-        hash: "a3b98f215b2329e29d17b61eba0f9e45"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1856
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1872
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1888
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1904
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1920
-        image: "qt-669.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1952
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1968
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 1984
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2000
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 2016
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 2032
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 2048
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Frame {
-        msec: 2064
-        hash: "d85314199885fdf9cc8e666c3fb723fb"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2080
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 2096
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 2112
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 2128
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 2144
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2160
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 2176
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 2192
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 2208
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Frame {
-        msec: 2224
-        hash: "1313880b796ae7134f50fa8dafa4a974"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2240
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 2256
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 2288
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 2304
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 2320
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Frame {
-        msec: 2336
-        hash: "c899e9d181860f682ba7275fa36f82a1"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2352
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2368
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2384
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2400
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2416
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2432
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2448
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2464
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2480
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2496
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2512
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2528
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2544
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2560
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2576
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Frame {
-        msec: 2592
-        hash: "2caf044acf7aaf0af6a03e7b8180fa16"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2608
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 2624
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 2640
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 2656
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 2672
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2688
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 2704
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 2720
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 2736
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Frame {
-        msec: 2752
-        hash: "c87aaf72137c2b9e8c876879e7215072"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2768
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 2784
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 2800
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2816
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 2832
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 2848
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Frame {
-        msec: 2864
-        hash: "3c455f51fea0926576077d55d6fbfbb2"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2880
-        image: "qt-669.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 2912
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 2928
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2944
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 2960
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 2976
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 2992
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Frame {
-        msec: 3008
-        hash: "394360c0bff5ee3ad206d2911838d64e"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3024
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3040
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3056
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3072
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3088
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3104
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3120
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3136
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3152
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3168
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3184
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3200
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3216
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3232
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3248
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3264
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3280
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3296
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3312
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3328
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3344
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3360
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3376
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3392
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3408
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3424
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3440
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3456
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3472
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3488
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3504
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3520
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3536
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3552
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3568
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3584
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3600
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3616
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3632
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3648
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3664
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3680
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Frame {
-        msec: 3696
-        hash: "10573e4c9dab5bd6e46ec79949c098e5"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3712
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3728
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3744
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3760
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3776
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3792
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3808
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3824
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3840
-        image: "qt-669.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3872
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3888
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3904
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3920
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3936
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3952
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3968
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 3984
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4000
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4016
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4032
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4048
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4064
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4080
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4096
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4112
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4128
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4144
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4160
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4176
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4192
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4208
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4224
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4240
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4256
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4272
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4288
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-    Frame {
-        msec: 4304
-        hash: "4e0ce00bde70a96774a6477ef2305b7f"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.0.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.0.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.1.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.1.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.2.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.2.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.3.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.3.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.4.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.4.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.5.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.5.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.6.png b/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.6.png
deleted file mode 100644
index ec65f49..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.qml
deleted file mode 100644
index f96daa9..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.qml
+++ /dev/null
@@ -1,2467 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 33554432
-        text: "54"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 32
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 48
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 64
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 80
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 96
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 72
-        modifiers: 0
-        text: "68"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 72
-        modifiers: 0
-        text: "68"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 720
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 800
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 880
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 896
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 912
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 928
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 944
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 960
-        image: "wrap.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1072
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1088
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1104
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1120
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1136
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1152
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1168
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1184
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1200
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1216
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1232
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1248
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1264
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1280
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1296
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1312
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1328
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1344
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1360
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1376
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1392
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1408
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1424
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1440
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1456
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1472
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1488
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1504
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1520
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1536
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1552
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 72
-        modifiers: 0
-        text: "68"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1568
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1584
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1600
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1616
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1632
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 72
-        modifiers: 0
-        text: "68"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1648
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1664
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1680
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1696
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1712
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1728
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1744
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1760
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1776
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1792
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1808
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1824
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1840
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1856
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1872
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1888
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1904
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1920
-        image: "wrap.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1952
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1968
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2064
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2080
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2096
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 88
-        modifiers: 0
-        text: "78"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 88
-        modifiers: 0
-        text: "78"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 68
-        modifiers: 0
-        text: "64"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 68
-        modifiers: 0
-        text: "64"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2720
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2800
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 73
-        modifiers: 0
-        text: "69"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2880
-        image: "wrap.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2912
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2928
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2944
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2960
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3072
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3088
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 87
-        modifiers: 0
-        text: "77"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3104
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3120
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3136
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3152
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3168
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 87
-        modifiers: 0
-        text: "77"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3184
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3200
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3216
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3232
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3248
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3264
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3280
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3296
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3312
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3328
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3344
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3360
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3376
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3392
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3408
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3424
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3440
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3456
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3472
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 80
-        modifiers: 0
-        text: "70"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3488
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3504
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3520
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3536
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 80
-        modifiers: 0
-        text: "70"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3552
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3568
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3584
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3600
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3616
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3632
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3648
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3664
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3680
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3696
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3712
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3728
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3744
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3760
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3776
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3792
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3808
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3824
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3840
-        image: "wrap.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3872
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3888
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3904
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 3920
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3936
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3952
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3968
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 79
-        modifiers: 0
-        text: "6f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4064
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 79
-        modifiers: 0
-        text: "6f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4080
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4096
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 82
-        modifiers: 0
-        text: "72"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 84
-        modifiers: 0
-        text: "74"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 76
-        modifiers: 0
-        text: "6c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4720
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 76
-        modifiers: 0
-        text: "6c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 89
-        modifiers: 0
-        text: "79"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4800
-        image: "wrap.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 89
-        modifiers: 0
-        text: "79"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4880
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 46
-        modifiers: 0
-        text: "2e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4896
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4912
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4928
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4944
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 7
-        key: 46
-        modifiers: 0
-        text: "2e"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4960
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5072
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5088
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5104
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5120
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5136
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5152
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5168
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5184
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5200
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5216
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5232
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5248
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5264
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5280
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5296
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5312
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5328
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5344
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5360
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5376
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5392
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5408
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5424
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5440
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5456
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5472
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5488
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5504
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5520
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5536
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5552
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5568
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5584
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5600
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5616
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5632
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5648
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5664
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5680
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5696
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5712
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5728
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5744
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5760
-        image: "wrap.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5792
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5808
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5824
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5840
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5856
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5872
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5888
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5904
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5920
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5936
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5952
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5968
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6064
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6080
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6096
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6112
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6128
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6144
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6160
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6176
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6192
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6208
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6224
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6240
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6256
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6272
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6288
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6304
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6320
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6336
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6352
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6368
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6384
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6400
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6416
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6432
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6448
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6464
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6480
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6496
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6512
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6528
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6544
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6560
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6576
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6592
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6608
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6624
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6640
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6656
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6672
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6688
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6704
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6720
-        image: "wrap.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6752
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6768
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6784
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6800
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6816
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6832
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6848
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6864
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml
deleted file mode 100644
index b01ddf8..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    Component { id: testableCursor
-        //Doesn't blink
-        Rectangle {
-            color:"black"
-            width:1
-        }
-    }
-    color: "green"
-    width:400;
-    height:40;
-    TextEdit {
-        focus: true;
-        cursorDelegate: testableCursor
-        text: "Jackdaws love my big sphinx of Quartz"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/wrap.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/wrap.qml
deleted file mode 100644
index f9fe025..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/wrap.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.6
-
-Item {
-    height:400
-    width: 200
-    TextEdit {
-        width: 200
-        height: 200
-        wrap: true
-        focus: true
-    }
-    //With QTBUG-6273 only the bottom one would be wrapped
-    TextEdit {
-        width: 200
-        height: 200
-        wrap: true
-        text: "This is a test that text edit wraps correctly."
-        y:200
-    }
-
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
deleted file mode 100644
index 6a4e7fa..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import Qt 4.6
-    Rectangle {
-    resources: [
-        Component { id: cursorA
-            Item { id: cPage;
-                x: Behavior { NumberAnimation { } }
-                y: Behavior { NumberAnimation { } }
-                height: Behavior { NumberAnimation { duration: 200 } }
-                Rectangle { id: cRectangle; color: "black"; y: 1; width: 1; height: parent.height-2;
-                    Rectangle { id:top; color: "black"; width: 3; height: 1; x: -1; y:0}
-                    Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
-                    opacity: 1
-                    opacity: SequentialAnimation { running: cPage.parent.focus == true; repeat: true;
-                                NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
-                                NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
-                             }
-                }
-                width: 1;
-            }
-        }
-    ]
-    width: 400
-    height: 200
-    color: "white"
-    TextInput { id: mainText
-        text: "Hello World"
-        cursorDelegate: cursorA
-        focus: true
-        font.pixelSize: 28
-        selectionColor: "lightsteelblue"
-        selectedTextColor: "deeppink"
-        color: "forestgreen"
-        anchors.centerIn: parent
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.0.png
deleted file mode 100644
index 9d0bab2..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.1.png
deleted file mode 100644
index db66ff7..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.2.png
deleted file mode 100644
index cbcca68..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.3.png
deleted file mode 100644
index c22196b..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.4.png
deleted file mode 100644
index a1d051e..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.5.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.5.png
deleted file mode 100644
index 9289dc0..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.6.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.6.png
deleted file mode 100644
index 7331f89..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.7.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.7.png
deleted file mode 100644
index 968bdd2..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.8.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.8.png
deleted file mode 100644
index 9a3436a..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.qml
deleted file mode 100644
index 3b664b6..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.qml
+++ /dev/null
@@ -1,3379 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 32
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 48
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 64
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 80
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 96
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 112
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 128
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 144
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 160
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 176
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 192
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 208
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 224
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 240
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 256
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 272
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 288
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 304
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 320
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 336
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 352
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 368
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 384
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 400
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 416
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 432
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 448
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 464
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 480
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 496
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Frame {
-        msec: 512
-        hash: "701d8c0f72330c0b72df071bd17749e6"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 528
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
-    }
-    Frame {
-        msec: 544
-        hash: "6032aada2c48092000ecb93e52656414"
-    }
-    Frame {
-        msec: 560
-        hash: "d23bdd94019477d8378cde580d8765ad"
-    }
-    Frame {
-        msec: 576
-        hash: "d74f8e44d47710714d4197809fffb622"
-    }
-    Frame {
-        msec: 592
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
-    }
-    Frame {
-        msec: 608
-        hash: "4e875ba8703b690a17e445f2b3810435"
-    }
-    Frame {
-        msec: 624
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
-    }
-    Frame {
-        msec: 640
-        hash: "a2ea272b45d8de225826d9381015ff2e"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 656
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
-    }
-    Frame {
-        msec: 672
-        hash: "788d8962f311adf57a3acc876b0e8804"
-    }
-    Frame {
-        msec: 688
-        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 704
-        hash: "91b2695e4915238ae8610a64e279b0f4"
-    }
-    Frame {
-        msec: 720
-        hash: "a97d90765f87b998eae6e9f603c61bff"
-    }
-    Frame {
-        msec: 736
-        hash: "48969edab07b942480d93ac2d383ca24"
-    }
-    Frame {
-        msec: 752
-        hash: "ecfd9d6d5873001f0c67806544a14983"
-    }
-    Frame {
-        msec: 768
-        hash: "a3a3bc1e2523d3e7f961893bcd1dd3a8"
-    }
-    Frame {
-        msec: 784
-        hash: "e337735ad0b42e60c54f16f3da7af3cf"
-    }
-    Frame {
-        msec: 800
-        hash: "c39db081130d269f25dbcb1a19afb8d0"
-    }
-    Frame {
-        msec: 816
-        hash: "c464d501e3935ec0f53eb780bd1a8289"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 832
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
-    }
-    Frame {
-        msec: 848
-        hash: "d94054222fd37a350bd8abd592a332e3"
-    }
-    Frame {
-        msec: 864
-        hash: "46fed264c233490b477e3a7c22183e18"
-    }
-    Frame {
-        msec: 880
-        hash: "34bc703c915b49b0450ece1d18306df8"
-    }
-    Frame {
-        msec: 896
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
-    }
-    Frame {
-        msec: 912
-        hash: "4f6dbc7b249c37390518cc263832b587"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 928
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
-    }
-    Frame {
-        msec: 944
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
-    }
-    Frame {
-        msec: 960
-        image: "cursorDelegate.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 1056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Key {
-        type: 6
-        key: 16777248
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1072
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
-    }
-    Frame {
-        msec: 1088
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
-    }
-    Frame {
-        msec: 1104
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
-    }
-    Frame {
-        msec: 1120
-        hash: "4f6dbc7b249c37390518cc263832b587"
-    }
-    Frame {
-        msec: 1136
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
-    }
-    Frame {
-        msec: 1152
-        hash: "34bc703c915b49b0450ece1d18306df8"
-    }
-    Frame {
-        msec: 1168
-        hash: "46fed264c233490b477e3a7c22183e18"
-    }
-    Frame {
-        msec: 1184
-        hash: "d94054222fd37a350bd8abd592a332e3"
-    }
-    Frame {
-        msec: 1200
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
-    }
-    Frame {
-        msec: 1216
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
-    }
-    Frame {
-        msec: 1232
-        hash: "0f500339c81ca3621d13910017b84b7b"
-    }
-    Frame {
-        msec: 1248
-        hash: "702864de569e6a5648ee174d5ef891f8"
-    }
-    Frame {
-        msec: 1264
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
-    }
-    Frame {
-        msec: 1280
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
-    }
-    Frame {
-        msec: 1296
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
-    }
-    Frame {
-        msec: 1312
-        hash: "4a646d76b706698a02cead560b1f8d57"
-    }
-    Frame {
-        msec: 1328
-        hash: "48ec87bfc25471f6fa2d43f9db80b693"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1344
-        hash: "12b5e016bad990d1f2bf427ee8e3e6d9"
-    }
-    Frame {
-        msec: 1360
-        hash: "66a2ba3f9e005cd58aa50cfa0000cd15"
-    }
-    Frame {
-        msec: 1376
-        hash: "a2e9e42e09dadbd0791f52bb96e0e0dc"
-    }
-    Frame {
-        msec: 1392
-        hash: "ac68396566ea85a157e944e601dd8d18"
-    }
-    Frame {
-        msec: 1408
-        hash: "b9bfdebec8dd1a93de7ef2768b2542ba"
-    }
-    Frame {
-        msec: 1424
-        hash: "2e0a4b960803770acb34ef56ccf2be35"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1440
-        hash: "df1643f0f8b7aa2dc080958822aeb3d0"
-    }
-    Frame {
-        msec: 1456
-        hash: "15bb91195adfaf83e88fd93e41ff3e17"
-    }
-    Frame {
-        msec: 1472
-        hash: "dc0476c27bd7eef3a59637df9a3fecd8"
-    }
-    Frame {
-        msec: 1488
-        hash: "a271f69e9dc6d1e0362c3e10760895df"
-    }
-    Frame {
-        msec: 1504
-        hash: "7fe66bcc6bada354b4dd7baf8c977740"
-    }
-    Frame {
-        msec: 1520
-        hash: "6b502dbd5ac8ff010df326cb9b593dce"
-    }
-    Frame {
-        msec: 1536
-        hash: "a9dd21649a95a6a6e8daea91bc6e2a5f"
-    }
-    Frame {
-        msec: 1552
-        hash: "374686590eaa02b7b436caa40cc0b0a0"
-    }
-    Frame {
-        msec: 1568
-        hash: "09ac3c5d413b1f650407eaa971aade81"
-    }
-    Frame {
-        msec: 1584
-        hash: "39f84e04f1ae58600591c0de40558d2c"
-    }
-    Frame {
-        msec: 1600
-        hash: "0336ea1799835af2185c361e221a9661"
-    }
-    Frame {
-        msec: 1616
-        hash: "8c7ab13e499d7f31107cf0f899334259"
-    }
-    Frame {
-        msec: 1632
-        hash: "bad5899324e52c9e6eadb72f3e7c2150"
-    }
-    Frame {
-        msec: 1648
-        hash: "4b78f451ecb22cfbed9f5998d61018eb"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1664
-        hash: "6c913bc712eee18947a43dd1c0a6516b"
-    }
-    Frame {
-        msec: 1680
-        hash: "4e566abf1e0696e72b2a4beab5a53d6e"
-    }
-    Frame {
-        msec: 1696
-        hash: "6ad579c289c63a6b90a1517765fc041e"
-    }
-    Frame {
-        msec: 1712
-        hash: "cef43f349cf221a1aa6e6e70f1fa6339"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1728
-        hash: "d89f7e3e2510fcb34786584747633673"
-    }
-    Frame {
-        msec: 1744
-        hash: "eb23a3eac684808f73034f4e4ef8984d"
-    }
-    Frame {
-        msec: 1760
-        hash: "6f2c1f61e58940d9cc1a70c0db903446"
-    }
-    Frame {
-        msec: 1776
-        hash: "f036a5ecda518be198f3bdf2dbc5baab"
-    }
-    Frame {
-        msec: 1792
-        hash: "7411784774fdc3b324644395f7beb013"
-    }
-    Frame {
-        msec: 1808
-        hash: "abfdd1f8440998af2ff7903f49f1bd7c"
-    }
-    Frame {
-        msec: 1824
-        hash: "6edd29f2e8d3d81e912c6b279ecc1885"
-    }
-    Frame {
-        msec: 1840
-        hash: "8eb5ba22793c7cbfa97a64557f2a023f"
-    }
-    Frame {
-        msec: 1856
-        hash: "9a39470525e6f508228f7e0014e02d64"
-    }
-    Frame {
-        msec: 1872
-        hash: "b3ad10cf28151f5f7f5a4c3540f1660e"
-    }
-    Frame {
-        msec: 1888
-        hash: "816203df3cf42fa7a0e8d6730c186444"
-    }
-    Frame {
-        msec: 1904
-        hash: "a0a7e7ff7960dfe6149e526badf799a6"
-    }
-    Frame {
-        msec: 1920
-        image: "cursorDelegate.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "4d245b2285eadfd206409f74e03c7fc9"
-    }
-    Frame {
-        msec: 1952
-        hash: "e1d5e6c2e4df1454b5a256c3678ffdef"
-    }
-    Frame {
-        msec: 1968
-        hash: "781d7fb03a37cb3f297cc0d2df338fd7"
-    }
-    Key {
-        type: 7
-        key: 16777249
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2064
-        hash: "781d7fb03a37cb3f297cc0d2df338fd7"
-    }
-    Frame {
-        msec: 2080
-        hash: "e1d5e6c2e4df1454b5a256c3678ffdef"
-    }
-    Frame {
-        msec: 2096
-        hash: "4d245b2285eadfd206409f74e03c7fc9"
-    }
-    Frame {
-        msec: 2112
-        hash: "5a647962e016d15daa417d88524d6061"
-    }
-    Frame {
-        msec: 2128
-        hash: "a0a7e7ff7960dfe6149e526badf799a6"
-    }
-    Frame {
-        msec: 2144
-        hash: "816203df3cf42fa7a0e8d6730c186444"
-    }
-    Frame {
-        msec: 2160
-        hash: "b3ad10cf28151f5f7f5a4c3540f1660e"
-    }
-    Frame {
-        msec: 2176
-        hash: "9a39470525e6f508228f7e0014e02d64"
-    }
-    Frame {
-        msec: 2192
-        hash: "8eb5ba22793c7cbfa97a64557f2a023f"
-    }
-    Frame {
-        msec: 2208
-        hash: "6edd29f2e8d3d81e912c6b279ecc1885"
-    }
-    Frame {
-        msec: 2224
-        hash: "abfdd1f8440998af2ff7903f49f1bd7c"
-    }
-    Frame {
-        msec: 2240
-        hash: "7411784774fdc3b324644395f7beb013"
-    }
-    Frame {
-        msec: 2256
-        hash: "f036a5ecda518be198f3bdf2dbc5baab"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "6f2c1f61e58940d9cc1a70c0db903446"
-    }
-    Frame {
-        msec: 2288
-        hash: "eb23a3eac684808f73034f4e4ef8984d"
-    }
-    Frame {
-        msec: 2304
-        hash: "d89f7e3e2510fcb34786584747633673"
-    }
-    Frame {
-        msec: 2320
-        hash: "cef43f349cf221a1aa6e6e70f1fa6339"
-    }
-    Frame {
-        msec: 2336
-        hash: "6ad579c289c63a6b90a1517765fc041e"
-    }
-    Frame {
-        msec: 2352
-        hash: "4e566abf1e0696e72b2a4beab5a53d6e"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2368
-        hash: "6c913bc712eee18947a43dd1c0a6516b"
-    }
-    Frame {
-        msec: 2384
-        hash: "2c518a32ca3b5ca924709cc6990fb039"
-    }
-    Frame {
-        msec: 2400
-        hash: "7f40db00bd3e6d0b39454eefa1403f44"
-    }
-    Frame {
-        msec: 2416
-        hash: "98db32e0d1812e9584105dc4dbceff80"
-    }
-    Frame {
-        msec: 2432
-        hash: "c2150a67391bb574141c16cb011847bf"
-    }
-    Frame {
-        msec: 2448
-        hash: "f9ea21d894fa2dace4d43ce99a580b90"
-    }
-    Frame {
-        msec: 2464
-        hash: "2f580c3244499fc6ecd2121693f463fd"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2480
-        hash: "2f7f421d3e6a895a9efa6b0e8feb81c4"
-    }
-    Frame {
-        msec: 2496
-        hash: "35a18447f319431ed0a645d05a1d03d1"
-    }
-    Frame {
-        msec: 2512
-        hash: "54e36fb4014be554d13709b48b9bdce7"
-    }
-    Frame {
-        msec: 2528
-        hash: "dbe3456536a729b268850a6ee5d1fb47"
-    }
-    Frame {
-        msec: 2544
-        hash: "4c148434cf3868db5dc98f426d9fb913"
-    }
-    Frame {
-        msec: 2560
-        hash: "2eb6da3ebfd531037523347603a805e2"
-    }
-    Frame {
-        msec: 2576
-        hash: "fefbb2f4671f8a36f9d2207ced8c0bfb"
-    }
-    Frame {
-        msec: 2592
-        hash: "1ab596339afc1f96136ee69c4b7688e1"
-    }
-    Frame {
-        msec: 2608
-        hash: "e07f59d729cb2790296e8c7cd3d0d3c9"
-    }
-    Frame {
-        msec: 2624
-        hash: "a7dccada1080487cab2d0a916676c5cb"
-    }
-    Frame {
-        msec: 2640
-        hash: "ac5939eb4379394fab829b307cbfe7ec"
-    }
-    Frame {
-        msec: 2656
-        hash: "9329d353c678d2bc61d08f63029d1b9b"
-    }
-    Frame {
-        msec: 2672
-        hash: "41263f56af7875028bb0c1e7eccf6f5d"
-    }
-    Frame {
-        msec: 2688
-        hash: "e2eb18af82c85ea78ba438163e922df3"
-    }
-    Frame {
-        msec: 2704
-        hash: "91b2695e4915238ae8610a64e279b0f4"
-    }
-    Frame {
-        msec: 2720
-        hash: "a97d90765f87b998eae6e9f603c61bff"
-    }
-    Frame {
-        msec: 2736
-        hash: "48969edab07b942480d93ac2d383ca24"
-    }
-    Frame {
-        msec: 2752
-        hash: "ecfd9d6d5873001f0c67806544a14983"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2768
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
-    }
-    Frame {
-        msec: 2784
-        hash: "702864de569e6a5648ee174d5ef891f8"
-    }
-    Frame {
-        msec: 2800
-        hash: "0f500339c81ca3621d13910017b84b7b"
-    }
-    Frame {
-        msec: 2816
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
-    }
-    Frame {
-        msec: 2832
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
-    }
-    Frame {
-        msec: 2848
-        hash: "d94054222fd37a350bd8abd592a332e3"
-    }
-    Frame {
-        msec: 2864
-        hash: "46fed264c233490b477e3a7c22183e18"
-    }
-    Frame {
-        msec: 2880
-        image: "cursorDelegate.2.png"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2896
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
-    }
-    Frame {
-        msec: 2912
-        hash: "4f6dbc7b249c37390518cc263832b587"
-    }
-    Frame {
-        msec: 2928
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
-    }
-    Frame {
-        msec: 2944
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
-    }
-    Frame {
-        msec: 2960
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
-    }
-    Frame {
-        msec: 2976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 2992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 3072
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
-    }
-    Frame {
-        msec: 3088
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
-    }
-    Frame {
-        msec: 3104
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
-    }
-    Frame {
-        msec: 3120
-        hash: "4f6dbc7b249c37390518cc263832b587"
-    }
-    Frame {
-        msec: 3136
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
-    }
-    Frame {
-        msec: 3152
-        hash: "34bc703c915b49b0450ece1d18306df8"
-    }
-    Frame {
-        msec: 3168
-        hash: "46fed264c233490b477e3a7c22183e18"
-    }
-    Frame {
-        msec: 3184
-        hash: "d94054222fd37a350bd8abd592a332e3"
-    }
-    Frame {
-        msec: 3200
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
-    }
-    Frame {
-        msec: 3216
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
-    }
-    Frame {
-        msec: 3232
-        hash: "0f500339c81ca3621d13910017b84b7b"
-    }
-    Frame {
-        msec: 3248
-        hash: "702864de569e6a5648ee174d5ef891f8"
-    }
-    Frame {
-        msec: 3264
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
-    }
-    Frame {
-        msec: 3280
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
-    }
-    Frame {
-        msec: 3296
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
-    }
-    Frame {
-        msec: 3312
-        hash: "4a646d76b706698a02cead560b1f8d57"
-    }
-    Frame {
-        msec: 3328
-        hash: "48ec87bfc25471f6fa2d43f9db80b693"
-    }
-    Frame {
-        msec: 3344
-        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
-    }
-    Frame {
-        msec: 3360
-        hash: "788d8962f311adf57a3acc876b0e8804"
-    }
-    Frame {
-        msec: 3376
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
-    }
-    Frame {
-        msec: 3392
-        hash: "a2ea272b45d8de225826d9381015ff2e"
-    }
-    Frame {
-        msec: 3408
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
-    }
-    Frame {
-        msec: 3424
-        hash: "4e875ba8703b690a17e445f2b3810435"
-    }
-    Frame {
-        msec: 3440
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
-    }
-    Frame {
-        msec: 3456
-        hash: "d74f8e44d47710714d4197809fffb622"
-    }
-    Frame {
-        msec: 3472
-        hash: "d23bdd94019477d8378cde580d8765ad"
-    }
-    Frame {
-        msec: 3488
-        hash: "6032aada2c48092000ecb93e52656414"
-    }
-    Frame {
-        msec: 3504
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
-    }
-    Frame {
-        msec: 3520
-        hash: "3af60972e7d5d4320a549e5df52a1228"
-    }
-    Frame {
-        msec: 3536
-        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
-    }
-    Frame {
-        msec: 3552
-        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
-    }
-    Frame {
-        msec: 3568
-        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
-    }
-    Frame {
-        msec: 3584
-        hash: "bdfb42dc3879099e402784238c2cdddb"
-    }
-    Frame {
-        msec: 3600
-        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
-    }
-    Frame {
-        msec: 3616
-        hash: "8159bda651d95a320ac09aa6feb377a1"
-    }
-    Frame {
-        msec: 3632
-        hash: "ceda37af96bd02baae218d3bfaed93f7"
-    }
-    Frame {
-        msec: 3648
-        hash: "4b81757a105aa7c5ac6148455eea66c3"
-    }
-    Frame {
-        msec: 3664
-        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
-    }
-    Frame {
-        msec: 3680
-        hash: "9b174cd9a87ff193ce646408946b310c"
-    }
-    Frame {
-        msec: 3696
-        hash: "89fa590b47ee77021dedf7938439ce69"
-    }
-    Frame {
-        msec: 3712
-        hash: "6e5680803184dfc76cbf1c2de804d6cc"
-    }
-    Frame {
-        msec: 3728
-        hash: "c6de6b9203673c77427ab84ce86daaf5"
-    }
-    Frame {
-        msec: 3744
-        hash: "198f8e912c19debd51f837627d1171e9"
-    }
-    Frame {
-        msec: 3760
-        hash: "3b380dcb6815698241f3dcccb52785c2"
-    }
-    Frame {
-        msec: 3776
-        hash: "254942e12b8a31420d2243b7e2529ae8"
-    }
-    Frame {
-        msec: 3792
-        hash: "ebf121910a5318c284f8e964d63aed40"
-    }
-    Frame {
-        msec: 3808
-        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
-    }
-    Frame {
-        msec: 3824
-        hash: "4a6596da390380dbafc1cdaceca1101e"
-    }
-    Frame {
-        msec: 3840
-        image: "cursorDelegate.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "c2be53ae5e2d5d3081df9af31426ec84"
-    }
-    Frame {
-        msec: 3872
-        hash: "52350ac5d10f8fe7571d12193b861d3f"
-    }
-    Frame {
-        msec: 3888
-        hash: "f286a35d7f4a022315f69a5db72da388"
-    }
-    Frame {
-        msec: 3904
-        hash: "aa329519eba4dad9589bff095528c535"
-    }
-    Frame {
-        msec: 3920
-        hash: "0beae60853afaaa0e7f7540fb50bcddf"
-    }
-    Frame {
-        msec: 3936
-        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
-    }
-    Frame {
-        msec: 3952
-        hash: "3655b992097b433071ec9dd69e086c70"
-    }
-    Frame {
-        msec: 3968
-        hash: "82cb92d7940d13deee97e4ccda9210fb"
-    }
-    Frame {
-        msec: 3984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4064
-        hash: "82cb92d7940d13deee97e4ccda9210fb"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4080
-        hash: "3655b992097b433071ec9dd69e086c70"
-    }
-    Frame {
-        msec: 4096
-        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
-    }
-    Frame {
-        msec: 4112
-        hash: "0beae60853afaaa0e7f7540fb50bcddf"
-    }
-    Frame {
-        msec: 4128
-        hash: "aa329519eba4dad9589bff095528c535"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4144
-        hash: "f286a35d7f4a022315f69a5db72da388"
-    }
-    Frame {
-        msec: 4160
-        hash: "52350ac5d10f8fe7571d12193b861d3f"
-    }
-    Frame {
-        msec: 4176
-        hash: "c2be53ae5e2d5d3081df9af31426ec84"
-    }
-    Frame {
-        msec: 4192
-        hash: "367391b2a124e2c818510567d0884d18"
-    }
-    Frame {
-        msec: 4208
-        hash: "4a6596da390380dbafc1cdaceca1101e"
-    }
-    Frame {
-        msec: 4224
-        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
-    }
-    Frame {
-        msec: 4240
-        hash: "ebf121910a5318c284f8e964d63aed40"
-    }
-    Frame {
-        msec: 4256
-        hash: "254942e12b8a31420d2243b7e2529ae8"
-    }
-    Frame {
-        msec: 4272
-        hash: "3b380dcb6815698241f3dcccb52785c2"
-    }
-    Frame {
-        msec: 4288
-        hash: "198f8e912c19debd51f837627d1171e9"
-    }
-    Frame {
-        msec: 4304
-        hash: "c6de6b9203673c77427ab84ce86daaf5"
-    }
-    Frame {
-        msec: 4320
-        hash: "6e5680803184dfc76cbf1c2de804d6cc"
-    }
-    Frame {
-        msec: 4336
-        hash: "89fa590b47ee77021dedf7938439ce69"
-    }
-    Frame {
-        msec: 4352
-        hash: "9b174cd9a87ff193ce646408946b310c"
-    }
-    Frame {
-        msec: 4368
-        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
-    }
-    Frame {
-        msec: 4384
-        hash: "4b81757a105aa7c5ac6148455eea66c3"
-    }
-    Frame {
-        msec: 4400
-        hash: "ceda37af96bd02baae218d3bfaed93f7"
-    }
-    Frame {
-        msec: 4416
-        hash: "8159bda651d95a320ac09aa6feb377a1"
-    }
-    Frame {
-        msec: 4432
-        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
-    }
-    Frame {
-        msec: 4448
-        hash: "bdfb42dc3879099e402784238c2cdddb"
-    }
-    Frame {
-        msec: 4464
-        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
-    }
-    Frame {
-        msec: 4480
-        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
-    }
-    Frame {
-        msec: 4496
-        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
-    }
-    Frame {
-        msec: 4512
-        hash: "3af60972e7d5d4320a549e5df52a1228"
-    }
-    Frame {
-        msec: 4528
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
-    }
-    Frame {
-        msec: 4544
-        hash: "6032aada2c48092000ecb93e52656414"
-    }
-    Frame {
-        msec: 4560
-        hash: "d23bdd94019477d8378cde580d8765ad"
-    }
-    Frame {
-        msec: 4576
-        hash: "d74f8e44d47710714d4197809fffb622"
-    }
-    Key {
-        type: 6
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4592
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
-    }
-    Frame {
-        msec: 4608
-        hash: "4e875ba8703b690a17e445f2b3810435"
-    }
-    Frame {
-        msec: 4624
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
-    }
-    Key {
-        type: 7
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4640
-        hash: "a2ea272b45d8de225826d9381015ff2e"
-    }
-    Frame {
-        msec: 4656
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
-    }
-    Frame {
-        msec: 4672
-        hash: "788d8962f311adf57a3acc876b0e8804"
-    }
-    Frame {
-        msec: 4688
-        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
-    }
-    Frame {
-        msec: 4704
-        hash: "48ec87bfc25471f6fa2d43f9db80b693"
-    }
-    Frame {
-        msec: 4720
-        hash: "4a646d76b706698a02cead560b1f8d57"
-    }
-    Frame {
-        msec: 4736
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
-    }
-    Frame {
-        msec: 4752
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
-    }
-    Frame {
-        msec: 4768
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
-    }
-    Frame {
-        msec: 4784
-        hash: "702864de569e6a5648ee174d5ef891f8"
-    }
-    Frame {
-        msec: 4800
-        image: "cursorDelegate.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
-    }
-    Frame {
-        msec: 4832
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
-    }
-    Frame {
-        msec: 4848
-        hash: "d94054222fd37a350bd8abd592a332e3"
-    }
-    Frame {
-        msec: 4864
-        hash: "46fed264c233490b477e3a7c22183e18"
-    }
-    Frame {
-        msec: 4880
-        hash: "34bc703c915b49b0450ece1d18306df8"
-    }
-    Frame {
-        msec: 4896
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
-    }
-    Frame {
-        msec: 4912
-        hash: "4f6dbc7b249c37390518cc263832b587"
-    }
-    Frame {
-        msec: 4928
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
-    }
-    Frame {
-        msec: 4944
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
-    }
-    Frame {
-        msec: 4960
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
-    }
-    Frame {
-        msec: 4976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 4992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 5072
-        hash: "35425ae3ccf3c8dcc1483479c57a3287"
-    }
-    Frame {
-        msec: 5088
-        hash: "b74cb1bfbb979a5e91853d9145d277d8"
-    }
-    Frame {
-        msec: 5104
-        hash: "df09fa2fd138d1b480eec82db3872d6f"
-    }
-    Frame {
-        msec: 5120
-        hash: "4f6dbc7b249c37390518cc263832b587"
-    }
-    Frame {
-        msec: 5136
-        hash: "e87f18da2fa5c91c9b2b5dea50f9c1e2"
-    }
-    Frame {
-        msec: 5152
-        hash: "34bc703c915b49b0450ece1d18306df8"
-    }
-    Frame {
-        msec: 5168
-        hash: "46fed264c233490b477e3a7c22183e18"
-    }
-    Frame {
-        msec: 5184
-        hash: "d94054222fd37a350bd8abd592a332e3"
-    }
-    Frame {
-        msec: 5200
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
-    }
-    Frame {
-        msec: 5216
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
-    }
-    Frame {
-        msec: 5232
-        hash: "0f500339c81ca3621d13910017b84b7b"
-    }
-    Frame {
-        msec: 5248
-        hash: "702864de569e6a5648ee174d5ef891f8"
-    }
-    Frame {
-        msec: 5264
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
-    }
-    Frame {
-        msec: 5280
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
-    }
-    Frame {
-        msec: 5296
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
-    }
-    Frame {
-        msec: 5312
-        hash: "4a646d76b706698a02cead560b1f8d57"
-    }
-    Frame {
-        msec: 5328
-        hash: "48ec87bfc25471f6fa2d43f9db80b693"
-    }
-    Frame {
-        msec: 5344
-        hash: "827fdd6a3d1006f4a9dd2faf208ea436"
-    }
-    Frame {
-        msec: 5360
-        hash: "788d8962f311adf57a3acc876b0e8804"
-    }
-    Frame {
-        msec: 5376
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
-    }
-    Frame {
-        msec: 5392
-        hash: "a2ea272b45d8de225826d9381015ff2e"
-    }
-    Frame {
-        msec: 5408
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
-    }
-    Frame {
-        msec: 5424
-        hash: "4e875ba8703b690a17e445f2b3810435"
-    }
-    Frame {
-        msec: 5440
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
-    }
-    Frame {
-        msec: 5456
-        hash: "d74f8e44d47710714d4197809fffb622"
-    }
-    Frame {
-        msec: 5472
-        hash: "d23bdd94019477d8378cde580d8765ad"
-    }
-    Frame {
-        msec: 5488
-        hash: "6032aada2c48092000ecb93e52656414"
-    }
-    Frame {
-        msec: 5504
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
-    }
-    Frame {
-        msec: 5520
-        hash: "3af60972e7d5d4320a549e5df52a1228"
-    }
-    Frame {
-        msec: 5536
-        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
-    }
-    Frame {
-        msec: 5552
-        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
-    }
-    Frame {
-        msec: 5568
-        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
-    }
-    Frame {
-        msec: 5584
-        hash: "bdfb42dc3879099e402784238c2cdddb"
-    }
-    Frame {
-        msec: 5600
-        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
-    }
-    Frame {
-        msec: 5616
-        hash: "8159bda651d95a320ac09aa6feb377a1"
-    }
-    Frame {
-        msec: 5632
-        hash: "ceda37af96bd02baae218d3bfaed93f7"
-    }
-    Frame {
-        msec: 5648
-        hash: "4b81757a105aa7c5ac6148455eea66c3"
-    }
-    Frame {
-        msec: 5664
-        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
-    }
-    Frame {
-        msec: 5680
-        hash: "9b174cd9a87ff193ce646408946b310c"
-    }
-    Frame {
-        msec: 5696
-        hash: "89fa590b47ee77021dedf7938439ce69"
-    }
-    Frame {
-        msec: 5712
-        hash: "6e5680803184dfc76cbf1c2de804d6cc"
-    }
-    Frame {
-        msec: 5728
-        hash: "c6de6b9203673c77427ab84ce86daaf5"
-    }
-    Frame {
-        msec: 5744
-        hash: "198f8e912c19debd51f837627d1171e9"
-    }
-    Frame {
-        msec: 5760
-        image: "cursorDelegate.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "254942e12b8a31420d2243b7e2529ae8"
-    }
-    Frame {
-        msec: 5792
-        hash: "ebf121910a5318c284f8e964d63aed40"
-    }
-    Frame {
-        msec: 5808
-        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
-    }
-    Frame {
-        msec: 5824
-        hash: "4a6596da390380dbafc1cdaceca1101e"
-    }
-    Frame {
-        msec: 5840
-        hash: "367391b2a124e2c818510567d0884d18"
-    }
-    Frame {
-        msec: 5856
-        hash: "c2be53ae5e2d5d3081df9af31426ec84"
-    }
-    Frame {
-        msec: 5872
-        hash: "52350ac5d10f8fe7571d12193b861d3f"
-    }
-    Frame {
-        msec: 5888
-        hash: "f286a35d7f4a022315f69a5db72da388"
-    }
-    Frame {
-        msec: 5904
-        hash: "aa329519eba4dad9589bff095528c535"
-    }
-    Frame {
-        msec: 5920
-        hash: "0beae60853afaaa0e7f7540fb50bcddf"
-    }
-    Frame {
-        msec: 5936
-        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
-    }
-    Frame {
-        msec: 5952
-        hash: "3655b992097b433071ec9dd69e086c70"
-    }
-    Frame {
-        msec: 5968
-        hash: "82cb92d7940d13deee97e4ccda9210fb"
-    }
-    Frame {
-        msec: 5984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 6064
-        hash: "82cb92d7940d13deee97e4ccda9210fb"
-    }
-    Frame {
-        msec: 6080
-        hash: "3655b992097b433071ec9dd69e086c70"
-    }
-    Frame {
-        msec: 6096
-        hash: "dc098a8b4d2f117a09cf1f2ced201a60"
-    }
-    Frame {
-        msec: 6112
-        hash: "0beae60853afaaa0e7f7540fb50bcddf"
-    }
-    Frame {
-        msec: 6128
-        hash: "aa329519eba4dad9589bff095528c535"
-    }
-    Frame {
-        msec: 6144
-        hash: "f286a35d7f4a022315f69a5db72da388"
-    }
-    Frame {
-        msec: 6160
-        hash: "52350ac5d10f8fe7571d12193b861d3f"
-    }
-    Frame {
-        msec: 6176
-        hash: "c2be53ae5e2d5d3081df9af31426ec84"
-    }
-    Frame {
-        msec: 6192
-        hash: "367391b2a124e2c818510567d0884d18"
-    }
-    Frame {
-        msec: 6208
-        hash: "4a6596da390380dbafc1cdaceca1101e"
-    }
-    Frame {
-        msec: 6224
-        hash: "0fcf416a80d22f077fcf4d23bddeb6c6"
-    }
-    Frame {
-        msec: 6240
-        hash: "ebf121910a5318c284f8e964d63aed40"
-    }
-    Frame {
-        msec: 6256
-        hash: "254942e12b8a31420d2243b7e2529ae8"
-    }
-    Frame {
-        msec: 6272
-        hash: "3b380dcb6815698241f3dcccb52785c2"
-    }
-    Frame {
-        msec: 6288
-        hash: "198f8e912c19debd51f837627d1171e9"
-    }
-    Frame {
-        msec: 6304
-        hash: "c6de6b9203673c77427ab84ce86daaf5"
-    }
-    Frame {
-        msec: 6320
-        hash: "6e5680803184dfc76cbf1c2de804d6cc"
-    }
-    Frame {
-        msec: 6336
-        hash: "89fa590b47ee77021dedf7938439ce69"
-    }
-    Frame {
-        msec: 6352
-        hash: "9b174cd9a87ff193ce646408946b310c"
-    }
-    Frame {
-        msec: 6368
-        hash: "ff7e2cdd006f9b76ab8c0416d81f0cb1"
-    }
-    Frame {
-        msec: 6384
-        hash: "4b81757a105aa7c5ac6148455eea66c3"
-    }
-    Frame {
-        msec: 6400
-        hash: "ceda37af96bd02baae218d3bfaed93f7"
-    }
-    Frame {
-        msec: 6416
-        hash: "8159bda651d95a320ac09aa6feb377a1"
-    }
-    Frame {
-        msec: 6432
-        hash: "5e483b0fd4808f2fb31aea90ccf86d3e"
-    }
-    Frame {
-        msec: 6448
-        hash: "bdfb42dc3879099e402784238c2cdddb"
-    }
-    Frame {
-        msec: 6464
-        hash: "f2ddf9d4fd3a2a2d354172714ce94d99"
-    }
-    Frame {
-        msec: 6480
-        hash: "c0dc1cf5ba7014e069c4d4bd7ac0f89d"
-    }
-    Frame {
-        msec: 6496
-        hash: "bf8459b99ca0bf568c58a3bb2a2fcc1f"
-    }
-    Frame {
-        msec: 6512
-        hash: "3af60972e7d5d4320a549e5df52a1228"
-    }
-    Frame {
-        msec: 6528
-        hash: "438be260f19d04c9f98ed7dce1c7db40"
-    }
-    Frame {
-        msec: 6544
-        hash: "6032aada2c48092000ecb93e52656414"
-    }
-    Frame {
-        msec: 6560
-        hash: "d23bdd94019477d8378cde580d8765ad"
-    }
-    Frame {
-        msec: 6576
-        hash: "d74f8e44d47710714d4197809fffb622"
-    }
-    Frame {
-        msec: 6592
-        hash: "4fbbb8447d80012bc6b5c24ddbfe498e"
-    }
-    Frame {
-        msec: 6608
-        hash: "4e875ba8703b690a17e445f2b3810435"
-    }
-    Frame {
-        msec: 6624
-        hash: "e4d7a59716cd704fe1cfa8ba91454e93"
-    }
-    Frame {
-        msec: 6640
-        hash: "a2ea272b45d8de225826d9381015ff2e"
-    }
-    Frame {
-        msec: 6656
-        hash: "5d112a3675ea4c010e7bc60e036d0262"
-    }
-    Frame {
-        msec: 6672
-        hash: "788d8962f311adf57a3acc876b0e8804"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 271; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6688
-        hash: "e2eb18af82c85ea78ba438163e922df3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 271; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6704
-        hash: "91b2695e4915238ae8610a64e279b0f4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 271; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 270; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6720
-        image: "cursorDelegate.6.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 269; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6736
-        hash: "ea2d610e9b41e72b2984a51f0d3f7587"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 268; y: 107
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6752
-        hash: "ee661e6cc1f86e755ff399adb6b11fd1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 266; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6768
-        hash: "01e937e1fcc0331b2541fa32c3479a24"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 266; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6784
-        hash: "702864de569e6a5648ee174d5ef891f8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 265; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6800
-        hash: "0f500339c81ca3621d13910017b84b7b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 263; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 261; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6816
-        hash: "76fb2e1ad33affe33c0887f04caa7396"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 259; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6832
-        hash: "9dc01a69f2a6892d3c4203674c8bef72"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 256; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6848
-        hash: "58693aa1a3616310b7ae1e529c4c461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 250; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 243; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6864
-        hash: "96afccd7ec697c9c10840f0effaa448d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 235; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6880
-        hash: "a00d49e2a9069b1be41f95f6ff4c0312"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 227; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6896
-        hash: "a0ff4b93291fc12054d3989a20335a87"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 209; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6912
-        hash: "a86e1347bb25489547514955762d92d3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6928
-        hash: "e5cba3c1e41e38117508c84e894beb11"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 190; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6944
-        hash: "2560f53b8ac0a84fef895dbb8f0e393e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 181; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 172; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6960
-        hash: "c1b8bfc008319b793b6bd9345d34ccf5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 123; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 118; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 114; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7072
-        hash: "a9f2804ac7918971f237c4cfa6339c24"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 108; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7088
-        hash: "bc9c96855f048cb6c86d480e501322ab"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7104
-        hash: "706730602364bfb4d0193d1728a6d350"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7120
-        hash: "df80fe3e3ba35ab3fafca929b9101e13"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7136
-        hash: "aa8fa1baf61919004a4f14948826882e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7152
-        hash: "1829dfa3615d6ae430ba81a2df9a9e15"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7168
-        hash: "c4ea5c767192bbd3bfac58d07594016a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7184
-        hash: "319aede65b3473f28a4ca62a524e4a76"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7200
-        hash: "e1de653161e3348e083267c9082bc0f0"
-    }
-    Frame {
-        msec: 7216
-        hash: "de5f2d5147c600d2cb44072801c2338e"
-    }
-    Frame {
-        msec: 7232
-        hash: "6db41d704d2e28f36b206bdb317ee361"
-    }
-    Frame {
-        msec: 7248
-        hash: "a500b87efea241cdf8adf97ae86e10c3"
-    }
-    Frame {
-        msec: 7264
-        hash: "86c4eb0164a5b57eb22de4c9d58345f5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7280
-        hash: "2dbb1e3a1374b7c4aecd5a891be4573d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7296
-        hash: "07bcafdf5ca28a1416a20ed375ec3ea6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7312
-        hash: "e79def41bbf7e544d64cf19d74524d3a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7328
-        hash: "20aff98618d16c00dc9b76035e9523f5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7344
-        hash: "12b5e016bad990d1f2bf427ee8e3e6d9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7360
-        hash: "66a2ba3f9e005cd58aa50cfa0000cd15"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7376
-        hash: "a2e9e42e09dadbd0791f52bb96e0e0dc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7392
-        hash: "ac68396566ea85a157e944e601dd8d18"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 113; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 117; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7408
-        hash: "b9bfdebec8dd1a93de7ef2768b2542ba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 124; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7424
-        hash: "2e0a4b960803770acb34ef56ccf2be35"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 131; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7440
-        hash: "df1643f0f8b7aa2dc080958822aeb3d0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7456
-        hash: "af8ce877d953727d37fd6f7e4962f45a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7472
-        hash: "b9de04c0d7532d67404a5a773d9fab99"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7488
-        hash: "7904312a7efe0b545070c5a5615011df"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7504
-        hash: "0069a8f088c83c6716bac15567a5b38d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 162; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7520
-        hash: "8c17c78d663097e275ed2f80d6479caf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7536
-        hash: "9e8781569e07fca7def229b76189082d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 165; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7552
-        hash: "8dba2f259740d869bfa20205d2e14433"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7568
-        hash: "4e7ad066aadbad3f71a08962ba1379c0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 171; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7584
-        hash: "a5d1554a6fb311239acc077f01adc597"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7600
-        hash: "e91b45c430f7e10c2205af620350ddb6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 177; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7616
-        hash: "6c731f4dbdec441cd36b1e9727758d73"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 188; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7632
-        hash: "31634e757bdec45feb1f021e35746d65"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 193; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7648
-        hash: "846dcb42fa85719223eb19f7af3d0630"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 206; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7664
-        hash: "a5826c5d7d1b9161cc7fb76f59021fdd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 209; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7680
-        image: "cursorDelegate.7.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 211; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7696
-        hash: "bdfb9b949489744bc77905249eb647f9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7712
-        hash: "307d4fb47604c00e213f8d9616e0da13"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7728
-        hash: "74201a80a9032cb18b0c9e26bb67363f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 214; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "38ca918199552a525fb7f3a3773761d9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7760
-        hash: "d64c06c25229b3b64b779ca1bef7d2cb"
-    }
-    Frame {
-        msec: 7776
-        hash: "4ba0117db1ff431de20c06c79866d509"
-    }
-    Frame {
-        msec: 7792
-        hash: "ca56899ded0e5ea361aac24493793f58"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7808
-        hash: "ebce1d3b4d088278b6f36dac444c7ca6"
-    }
-    Frame {
-        msec: 7824
-        hash: "16c52065169bffc4648eda0226dba13a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7840
-        hash: "7a5a6a02f57545d9f2336ff18dd118d6"
-    }
-    Frame {
-        msec: 7856
-        hash: "328c8133c68fc2e86dc2193d1bee3259"
-    }
-    Frame {
-        msec: 7872
-        hash: "fcad1d2819e3cede6081b4dfbb5a4a65"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7888
-        hash: "85ff2968ba06443f300c9c0ef36c7054"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7904
-        hash: "871025c33fa769a790fc460a95b183ec"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7920
-        hash: "5b96f2673e0ccd2b198b9f99c65b4b12"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7936
-        hash: "5fc6f30a2dd019c4f2af056b51cfaa27"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7952
-        hash: "fc6bf3bcde1f89f0bff40e3e019aed33"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7968
-        hash: "703beec7b035080146131936da8c0fb3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7984
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 221; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8000
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8016
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8032
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8048
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8064
-        hash: "703beec7b035080146131936da8c0fb3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8080
-        hash: "fc6bf3bcde1f89f0bff40e3e019aed33"
-    }
-    Frame {
-        msec: 8096
-        hash: "5fc6f30a2dd019c4f2af056b51cfaa27"
-    }
-    Frame {
-        msec: 8112
-        hash: "5b96f2673e0ccd2b198b9f99c65b4b12"
-    }
-    Frame {
-        msec: 8128
-        hash: "871025c33fa769a790fc460a95b183ec"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8144
-        hash: "85ff2968ba06443f300c9c0ef36c7054"
-    }
-    Frame {
-        msec: 8160
-        hash: "fcad1d2819e3cede6081b4dfbb5a4a65"
-    }
-    Frame {
-        msec: 8176
-        hash: "328c8133c68fc2e86dc2193d1bee3259"
-    }
-    Frame {
-        msec: 8192
-        hash: "7a5a6a02f57545d9f2336ff18dd118d6"
-    }
-    Frame {
-        msec: 8208
-        hash: "16c52065169bffc4648eda0226dba13a"
-    }
-    Frame {
-        msec: 8224
-        hash: "ebce1d3b4d088278b6f36dac444c7ca6"
-    }
-    Frame {
-        msec: 8240
-        hash: "ca56899ded0e5ea361aac24493793f58"
-    }
-    Frame {
-        msec: 8256
-        hash: "4ba0117db1ff431de20c06c79866d509"
-    }
-    Frame {
-        msec: 8272
-        hash: "d64c06c25229b3b64b779ca1bef7d2cb"
-    }
-    Frame {
-        msec: 8288
-        hash: "38ca918199552a525fb7f3a3773761d9"
-    }
-    Frame {
-        msec: 8304
-        hash: "74201a80a9032cb18b0c9e26bb67363f"
-    }
-    Frame {
-        msec: 8320
-        hash: "307d4fb47604c00e213f8d9616e0da13"
-    }
-    Frame {
-        msec: 8336
-        hash: "9ad660f83ed62b964b676106f8aa7114"
-    }
-    Frame {
-        msec: 8352
-        hash: "457fc0df515f9813e98a6a86f4ab5231"
-    }
-    Frame {
-        msec: 8368
-        hash: "372cbc6ad4edc85319743627ced05671"
-    }
-    Frame {
-        msec: 8384
-        hash: "4e08beac6ee40acaa4de6963522d63d0"
-    }
-    Frame {
-        msec: 8400
-        hash: "5e790c2199a5e95fc17f8c0b49809cc9"
-    }
-    Frame {
-        msec: 8416
-        hash: "e36310e1866d4a95bac60084fa4aa2c1"
-    }
-    Frame {
-        msec: 8432
-        hash: "b7182b171316cc2db4de2b23de93dc41"
-    }
-    Frame {
-        msec: 8448
-        hash: "6aaf7f8e6e238973dfd4030eb146198b"
-    }
-    Frame {
-        msec: 8464
-        hash: "901ead3167e602dfe043c56c6c805d54"
-    }
-    Frame {
-        msec: 8480
-        hash: "5a97542680475b1382ad5b7c3f6fa96a"
-    }
-    Frame {
-        msec: 8496
-        hash: "fb34d93127f3c3ad0c7bacce0200753b"
-    }
-    Frame {
-        msec: 8512
-        hash: "993c97dc85e83e241538356e317b7767"
-    }
-    Frame {
-        msec: 8528
-        hash: "fb11a9edb3a613be5cb6949c76c5c715"
-    }
-    Frame {
-        msec: 8544
-        hash: "e68b7461f94adeaf330f67d36d0d3b3e"
-    }
-    Frame {
-        msec: 8560
-        hash: "7ed043cc027fdb467bd16847187cd48d"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 277; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8576
-        hash: "fefbb2f4671f8a36f9d2207ced8c0bfb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 277; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8592
-        hash: "1ab596339afc1f96136ee69c4b7688e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 276; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8608
-        hash: "e07f59d729cb2790296e8c7cd3d0d3c9"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 276; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8624
-        hash: "a7dccada1080487cab2d0a916676c5cb"
-    }
-    Frame {
-        msec: 8640
-        image: "cursorDelegate.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "9329d353c678d2bc61d08f63029d1b9b"
-    }
-    Frame {
-        msec: 8672
-        hash: "41263f56af7875028bb0c1e7eccf6f5d"
-    }
-    Frame {
-        msec: 8688
-        hash: "e2eb18af82c85ea78ba438163e922df3"
-    }
-    Frame {
-        msec: 8704
-        hash: "91b2695e4915238ae8610a64e279b0f4"
-    }
-    Frame {
-        msec: 8720
-        hash: "a97d90765f87b998eae6e9f603c61bff"
-    }
-    Frame {
-        msec: 8736
-        hash: "48969edab07b942480d93ac2d383ca24"
-    }
-    Frame {
-        msec: 8752
-        hash: "ecfd9d6d5873001f0c67806544a14983"
-    }
-    Frame {
-        msec: 8768
-        hash: "a3a3bc1e2523d3e7f961893bcd1dd3a8"
-    }
-    Frame {
-        msec: 8784
-        hash: "e337735ad0b42e60c54f16f3da7af3cf"
-    }
-    Frame {
-        msec: 8800
-        hash: "c39db081130d269f25dbcb1a19afb8d0"
-    }
-    Frame {
-        msec: 8816
-        hash: "c464d501e3935ec0f53eb780bd1a8289"
-    }
-    Frame {
-        msec: 8832
-        hash: "2be4fd986de19f6f76dfddec75b26804"
-    }
-    Frame {
-        msec: 8848
-        hash: "a1280e9fb86ca96b2340bb70aa774806"
-    }
-    Frame {
-        msec: 8864
-        hash: "cce4c17a387893478bcfa547f7561aba"
-    }
-    Frame {
-        msec: 8880
-        hash: "7094db3e04895d8d7f5f58caf0658592"
-    }
-    Frame {
-        msec: 8896
-        hash: "edb1f644757f9ba0a39549d77141c280"
-    }
-    Frame {
-        msec: 8912
-        hash: "cd381e847ecfce2db111bdf94a437cbc"
-    }
-    Frame {
-        msec: 8928
-        hash: "6a089603b641b683a744b88f2ebe82d1"
-    }
-    Frame {
-        msec: 8944
-        hash: "8c0e47f7c87a1a11cd733a453b31c780"
-    }
-    Frame {
-        msec: 8960
-        hash: "b53c892d62e787eb2565820d79739de6"
-    }
-    Frame {
-        msec: 8976
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 8992
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9008
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9024
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9040
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9056
-        hash: "e165a0b90fdc1eef2c8244ad8545bd6f"
-    }
-    Frame {
-        msec: 9072
-        hash: "b53c892d62e787eb2565820d79739de6"
-    }
-    Frame {
-        msec: 9088
-        hash: "8c0e47f7c87a1a11cd733a453b31c780"
-    }
-    Frame {
-        msec: 9104
-        hash: "6a089603b641b683a744b88f2ebe82d1"
-    }
-    Frame {
-        msec: 9120
-        hash: "cd381e847ecfce2db111bdf94a437cbc"
-    }
-    Frame {
-        msec: 9136
-        hash: "edb1f644757f9ba0a39549d77141c280"
-    }
-    Frame {
-        msec: 9152
-        hash: "7094db3e04895d8d7f5f58caf0658592"
-    }
-    Frame {
-        msec: 9168
-        hash: "cce4c17a387893478bcfa547f7561aba"
-    }
-    Frame {
-        msec: 9184
-        hash: "a1280e9fb86ca96b2340bb70aa774806"
-    }
-    Frame {
-        msec: 9200
-        hash: "2be4fd986de19f6f76dfddec75b26804"
-    }
-    Frame {
-        msec: 9216
-        hash: "c464d501e3935ec0f53eb780bd1a8289"
-    }
-    Frame {
-        msec: 9232
-        hash: "c39db081130d269f25dbcb1a19afb8d0"
-    }
-    Frame {
-        msec: 9248
-        hash: "e337735ad0b42e60c54f16f3da7af3cf"
-    }
-    Frame {
-        msec: 9264
-        hash: "a3a3bc1e2523d3e7f961893bcd1dd3a8"
-    }
-    Frame {
-        msec: 9280
-        hash: "ecfd9d6d5873001f0c67806544a14983"
-    }
-    Frame {
-        msec: 9296
-        hash: "48969edab07b942480d93ac2d383ca24"
-    }
-    Frame {
-        msec: 9312
-        hash: "a97d90765f87b998eae6e9f603c61bff"
-    }
-    Frame {
-        msec: 9328
-        hash: "91b2695e4915238ae8610a64e279b0f4"
-    }
-    Frame {
-        msec: 9344
-        hash: "e2eb18af82c85ea78ba438163e922df3"
-    }
-    Frame {
-        msec: 9360
-        hash: "41263f56af7875028bb0c1e7eccf6f5d"
-    }
-    Frame {
-        msec: 9376
-        hash: "9329d353c678d2bc61d08f63029d1b9b"
-    }
-    Frame {
-        msec: 9392
-        hash: "ac5939eb4379394fab829b307cbfe7ec"
-    }
-    Frame {
-        msec: 9408
-        hash: "a7dccada1080487cab2d0a916676c5cb"
-    }
-    Frame {
-        msec: 9424
-        hash: "e07f59d729cb2790296e8c7cd3d0d3c9"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.0.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.0.png
deleted file mode 100644
index 2b45a06..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.1.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.1.png
deleted file mode 100644
index 1f5bae0..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.2.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.2.png
deleted file mode 100644
index cb2b5a4..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.3.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.3.png
deleted file mode 100644
index aa24805..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.4.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.4.png
deleted file mode 100644
index aa24805..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.qml
deleted file mode 100644
index dd7b291..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.qml
+++ /dev/null
@@ -1,1043 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 32
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Key {
-        type: 6
-        key: 16777248
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 48
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 64
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 80
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 96
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 112
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 128
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 144
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 160
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 176
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 192
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 208
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 224
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 240
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 256
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 272
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 288
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 304
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 320
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 336
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 352
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Key {
-        type: 6
-        key: 74
-        modifiers: 33554432
-        text: "4a"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 368
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 384
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 400
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 416
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 432
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Key {
-        type: 7
-        key: 74
-        modifiers: 33554432
-        text: "4a"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 448
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 464
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 480
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 496
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 512
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 528
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 560
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 576
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 592
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 608
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 624
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 640
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 656
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 672
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 688
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 704
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 720
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 736
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 752
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 768
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 784
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 800
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 816
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 832
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 848
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Key {
-        type: 6
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 864
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 880
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 896
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Key {
-        type: 7
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 912
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 928
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 944
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 960
-        image: "echoMode.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Key {
-        type: 6
-        key: 75
-        modifiers: 0
-        text: "6b"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 992
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1008
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1024
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1040
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Key {
-        type: 7
-        key: 75
-        modifiers: 0
-        text: "6b"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1056
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1072
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1088
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1104
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1120
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1136
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1152
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1168
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1184
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1200
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1216
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1232
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Key {
-        type: 6
-        key: 68
-        modifiers: 0
-        text: "64"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1248
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Frame {
-        msec: 1264
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Frame {
-        msec: 1280
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Key {
-        type: 7
-        key: 68
-        modifiers: 0
-        text: "64"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1296
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Frame {
-        msec: 1312
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Frame {
-        msec: 1328
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1344
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1360
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1376
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1392
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1408
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1424
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1440
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1456
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1472
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1488
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Key {
-        type: 6
-        key: 87
-        modifiers: 0
-        text: "77"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1504
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1520
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1536
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1552
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Key {
-        type: 7
-        key: 87
-        modifiers: 0
-        text: "77"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1568
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1584
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1600
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1616
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1632
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1648
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1664
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1680
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1696
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1712
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1728
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1744
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1760
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1776
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1792
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1808
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1824
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1840
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1856
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Key {
-        type: 6
-        key: 76
-        modifiers: 0
-        text: "6c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1872
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1888
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1904
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1920
-        image: "echoMode.1.png"
-    }
-    Key {
-        type: 7
-        key: 76
-        modifiers: 0
-        text: "6c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1936
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1952
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1968
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1984
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 2000
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 2016
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Key {
-        type: 6
-        key: 79
-        modifiers: 0
-        text: "6f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2032
-        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
-    }
-    Frame {
-        msec: 2048
-        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
-    }
-    Key {
-        type: 7
-        key: 79
-        modifiers: 0
-        text: "6f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2064
-        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
-    }
-    Frame {
-        msec: 2080
-        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
-    }
-    Key {
-        type: 6
-        key: 86
-        modifiers: 0
-        text: "76"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2096
-        hash: "c82441813af6ff577687f29f6a09da38"
-    }
-    Frame {
-        msec: 2112
-        hash: "c82441813af6ff577687f29f6a09da38"
-    }
-    Frame {
-        msec: 2128
-        hash: "c82441813af6ff577687f29f6a09da38"
-    }
-    Frame {
-        msec: 2144
-        hash: "c82441813af6ff577687f29f6a09da38"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 86
-        modifiers: 0
-        text: "76"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2160
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2176
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2192
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2208
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2224
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2240
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2256
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2272
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2288
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2304
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2320
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2336
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Key {
-        type: 6
-        key: 77
-        modifiers: 0
-        text: "6d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2352
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2368
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2384
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2400
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2416
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2432
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Key {
-        type: 7
-        key: 77
-        modifiers: 0
-        text: "6d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2448
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2464
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2480
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2496
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Key {
-        type: 6
-        key: 89
-        modifiers: 0
-        text: "79"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2512
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2528
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2544
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Key {
-        type: 7
-        key: 89
-        modifiers: 0
-        text: "79"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2560
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2576
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2592
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2608
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2624
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2640
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2656
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2672
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2688
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2704
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2720
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2736
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2752
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2768
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2784
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2800
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2816
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2832
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2848
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2864
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2880
-        image: "echoMode.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2912
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2928
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2944
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2960
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2976
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2992
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 3008
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 3024
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 3040
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 3056
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.0.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.0.png
deleted file mode 100644
index 87c2e07..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.qml
deleted file mode 100644
index e29ac56..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.qml
+++ /dev/null
@@ -1,107 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 32
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 48
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 64
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 80
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 96
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 112
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 128
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 144
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 160
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 176
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 192
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 208
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 224
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 240
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 256
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 272
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 288
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 304
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 320
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 336
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 352
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 368
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 384
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 400
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.0.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.0.png
deleted file mode 100644
index f04f65e..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.1.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.1.png
deleted file mode 100644
index 46a703a..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.2.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.2.png
deleted file mode 100644
index e4a3877..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.3.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.3.png
deleted file mode 100644
index 9ef842a..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.4.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.4.png
deleted file mode 100644
index 706e2b3..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.5.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.5.png
deleted file mode 100644
index bcc86cc..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.6.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.6.png
deleted file mode 100644
index 51ddd44..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.7.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.7.png
deleted file mode 100644
index 0a2fdda..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.8.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.8.png
deleted file mode 100644
index 9c88bff..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.qml
deleted file mode 100644
index df2dd38..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.qml
+++ /dev/null
@@ -1,3379 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 32
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 48
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 64
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 80
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 96
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 112
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 128
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 144
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 160
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 176
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 192
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 208
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 224
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 240
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 256
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 272
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 288
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 304
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 320
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 336
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 352
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 368
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 384
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 400
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 416
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 432
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 448
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 464
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 480
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 496
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Frame {
-        msec: 512
-        hash: "cd442d6dc4d155f54ae24f03d080f50c"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 528
-        hash: "56db24ad686d34e75a2d184e5b1da2a9"
-    }
-    Frame {
-        msec: 544
-        hash: "c3487c7c7dcd392e7eacb74045dd4143"
-    }
-    Frame {
-        msec: 560
-        hash: "70aedcda6c93875d18ee111d8a19549e"
-    }
-    Frame {
-        msec: 576
-        hash: "47ad557d366536ad457f6866241dba93"
-    }
-    Frame {
-        msec: 592
-        hash: "e715c2a82745829665226df78598b819"
-    }
-    Frame {
-        msec: 608
-        hash: "2ff4bd5602c34c020162f0503d625049"
-    }
-    Frame {
-        msec: 624
-        hash: "a494b3b25a23daa858034ebccce0d1c7"
-    }
-    Frame {
-        msec: 640
-        hash: "59d2fb8e21802d256b11730b31919fb3"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 656
-        hash: "5e09b95292d6d0afe76a5015b0ccebf1"
-    }
-    Frame {
-        msec: 672
-        hash: "de3c911aec7e42557ece4bdcf02ce562"
-    }
-    Frame {
-        msec: 688
-        hash: "680f51f63c4b11a247a668eb7bbd2b62"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 704
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
-    }
-    Frame {
-        msec: 720
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
-    }
-    Frame {
-        msec: 736
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
-    }
-    Frame {
-        msec: 752
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
-    }
-    Frame {
-        msec: 768
-        hash: "fd3fd655785c4e3c470f742451e3470f"
-    }
-    Frame {
-        msec: 784
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
-    }
-    Frame {
-        msec: 800
-        hash: "2a55b52db02d97963d382c9862307384"
-    }
-    Frame {
-        msec: 816
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 832
-        hash: "4f097223462c8f619188b0b0c2ecb080"
-    }
-    Frame {
-        msec: 848
-        hash: "243be452ff0798538defc6a14cb8a08b"
-    }
-    Frame {
-        msec: 864
-        hash: "e5472ed9a8a43a64a0fea12540619940"
-    }
-    Frame {
-        msec: 880
-        hash: "90b0f5f1aa7b5f066fb1266ea63254eb"
-    }
-    Frame {
-        msec: 896
-        hash: "97d5f9fe02e4bd06ec30a7805945f167"
-    }
-    Frame {
-        msec: 912
-        hash: "eb381a1e2ad945e4cfa540c137edbda7"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 928
-        hash: "75252ff61682fd32117f0759ebe4b6a1"
-    }
-    Frame {
-        msec: 944
-        hash: "d724bdacc59bce29d0a42d72479be0b6"
-    }
-    Frame {
-        msec: 960
-        image: "cursorDelegate.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 992
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 1008
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 1024
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 1040
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 1056
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Key {
-        type: 6
-        key: 16777248
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1072
-        hash: "d7703c18b69f485bba3abd655100b50d"
-    }
-    Frame {
-        msec: 1088
-        hash: "d724bdacc59bce29d0a42d72479be0b6"
-    }
-    Frame {
-        msec: 1104
-        hash: "75252ff61682fd32117f0759ebe4b6a1"
-    }
-    Frame {
-        msec: 1120
-        hash: "eb381a1e2ad945e4cfa540c137edbda7"
-    }
-    Frame {
-        msec: 1136
-        hash: "97d5f9fe02e4bd06ec30a7805945f167"
-    }
-    Frame {
-        msec: 1152
-        hash: "90b0f5f1aa7b5f066fb1266ea63254eb"
-    }
-    Frame {
-        msec: 1168
-        hash: "e5472ed9a8a43a64a0fea12540619940"
-    }
-    Frame {
-        msec: 1184
-        hash: "243be452ff0798538defc6a14cb8a08b"
-    }
-    Frame {
-        msec: 1200
-        hash: "4f097223462c8f619188b0b0c2ecb080"
-    }
-    Frame {
-        msec: 1216
-        hash: "e7346d8f223684143a0940def878b874"
-    }
-    Frame {
-        msec: 1232
-        hash: "512b9746ae4482557b8cef9f99905954"
-    }
-    Frame {
-        msec: 1248
-        hash: "4220dde85eb1c027366efd0798927e8d"
-    }
-    Frame {
-        msec: 1264
-        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
-    }
-    Frame {
-        msec: 1280
-        hash: "de09380dd57c58ae99fbdba169a19975"
-    }
-    Frame {
-        msec: 1296
-        hash: "bfc1b03df244839a012e8302dc07764f"
-    }
-    Frame {
-        msec: 1312
-        hash: "d5f220e5337837ec0d07eb118e2f948e"
-    }
-    Frame {
-        msec: 1328
-        hash: "7640c78a286b0b7bdf2ec9117ceced4a"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1344
-        hash: "c659fd76d632aac26d396809b57826dd"
-    }
-    Frame {
-        msec: 1360
-        hash: "b5ba335eca37416970dcab53157d7ae6"
-    }
-    Frame {
-        msec: 1376
-        hash: "df498dac81260d8867221612ff3b7619"
-    }
-    Frame {
-        msec: 1392
-        hash: "578c3a682278f4ead0ca894f029dbfb7"
-    }
-    Frame {
-        msec: 1408
-        hash: "5fe9b2365b091047df1b18bcaa5b1bb4"
-    }
-    Frame {
-        msec: 1424
-        hash: "c513b8df83f1d1cc3c05769c41741653"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1440
-        hash: "ee70a2002f52a3f4a9fa32db668db3d0"
-    }
-    Frame {
-        msec: 1456
-        hash: "3f299da38c2f3f9057df987d5d339e1f"
-    }
-    Frame {
-        msec: 1472
-        hash: "55f6adbd00910e5f39977162cfe8dcc5"
-    }
-    Frame {
-        msec: 1488
-        hash: "151fb386855954ae5143046cab314ddf"
-    }
-    Frame {
-        msec: 1504
-        hash: "d9ec76b2c07077b5b6d6c3777d116164"
-    }
-    Frame {
-        msec: 1520
-        hash: "ef3ba6c27d9b28de829360985505c185"
-    }
-    Frame {
-        msec: 1536
-        hash: "8eafd8f9aea08c172f40de3c4f2b3b59"
-    }
-    Frame {
-        msec: 1552
-        hash: "2329d5b8182794bb8375f0de204c9b16"
-    }
-    Frame {
-        msec: 1568
-        hash: "e6b25cf1a8c6858f6937e649b1315955"
-    }
-    Frame {
-        msec: 1584
-        hash: "3aeedff600509a138b0de31e10bbdd7b"
-    }
-    Frame {
-        msec: 1600
-        hash: "0636dee0ddc551ce8ecf3a6c6300b020"
-    }
-    Frame {
-        msec: 1616
-        hash: "77f5b0dfdf0c631cf863be60bd09db9c"
-    }
-    Frame {
-        msec: 1632
-        hash: "2e86762371ae933546e8b2154c78f74b"
-    }
-    Frame {
-        msec: 1648
-        hash: "1051ec29f94c31b257a5b1c922f8e93f"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1664
-        hash: "5c60da876c8cc9fa334905b5fc7c2a3d"
-    }
-    Frame {
-        msec: 1680
-        hash: "c0b0cddd62853ac3499b7ada200d206a"
-    }
-    Frame {
-        msec: 1696
-        hash: "5bd588d64917f942e0f5ea1553acbf63"
-    }
-    Frame {
-        msec: 1712
-        hash: "bc5744ef5c81b7d5b365bf977f909be5"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 100663296
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1728
-        hash: "892a1a8a5a9c198e5ae04cc19f0e1d0c"
-    }
-    Frame {
-        msec: 1744
-        hash: "708799d2d834302c659958701e217b37"
-    }
-    Frame {
-        msec: 1760
-        hash: "360d75bcc178bcfd4f93741d653fd821"
-    }
-    Frame {
-        msec: 1776
-        hash: "1cfe03528b1cd84e69efc02b9677c748"
-    }
-    Frame {
-        msec: 1792
-        hash: "6f45d7c37f1fb90138011b2af24aaf1e"
-    }
-    Frame {
-        msec: 1808
-        hash: "ba164375e7ac18cf2e1e613498158fbf"
-    }
-    Frame {
-        msec: 1824
-        hash: "14052b9da9e17a6f06fed05d4ed82b9c"
-    }
-    Frame {
-        msec: 1840
-        hash: "aac15ce22bfe38f44a46e4644913f144"
-    }
-    Frame {
-        msec: 1856
-        hash: "c63aa02ba29ea18334b188185690948d"
-    }
-    Frame {
-        msec: 1872
-        hash: "11ed187ccd4c2221f166851c08b6b467"
-    }
-    Frame {
-        msec: 1888
-        hash: "3543bd4e538981d4bb2c2313c9663a53"
-    }
-    Frame {
-        msec: 1904
-        hash: "a05fa618b094bde2b54b730f513bcabe"
-    }
-    Frame {
-        msec: 1920
-        image: "cursorDelegate.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "52fc4a32526a74f9a04d8795c7a47c6e"
-    }
-    Frame {
-        msec: 1952
-        hash: "17623e1b0ffca3b7736ce930f078dbe0"
-    }
-    Frame {
-        msec: 1968
-        hash: "75226dac5691627851d83c7370d7603c"
-    }
-    Key {
-        type: 7
-        key: 16777249
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1984
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
-    }
-    Frame {
-        msec: 2000
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
-    }
-    Frame {
-        msec: 2016
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
-    }
-    Frame {
-        msec: 2032
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
-    }
-    Frame {
-        msec: 2048
-        hash: "9e506ad52020e2913e80a13a7f3ac797"
-    }
-    Frame {
-        msec: 2064
-        hash: "75226dac5691627851d83c7370d7603c"
-    }
-    Frame {
-        msec: 2080
-        hash: "17623e1b0ffca3b7736ce930f078dbe0"
-    }
-    Frame {
-        msec: 2096
-        hash: "52fc4a32526a74f9a04d8795c7a47c6e"
-    }
-    Frame {
-        msec: 2112
-        hash: "89f2d3b4441faee557b8d5f44e1e1e18"
-    }
-    Frame {
-        msec: 2128
-        hash: "a05fa618b094bde2b54b730f513bcabe"
-    }
-    Frame {
-        msec: 2144
-        hash: "3543bd4e538981d4bb2c2313c9663a53"
-    }
-    Frame {
-        msec: 2160
-        hash: "11ed187ccd4c2221f166851c08b6b467"
-    }
-    Frame {
-        msec: 2176
-        hash: "c63aa02ba29ea18334b188185690948d"
-    }
-    Frame {
-        msec: 2192
-        hash: "aac15ce22bfe38f44a46e4644913f144"
-    }
-    Frame {
-        msec: 2208
-        hash: "14052b9da9e17a6f06fed05d4ed82b9c"
-    }
-    Frame {
-        msec: 2224
-        hash: "ba164375e7ac18cf2e1e613498158fbf"
-    }
-    Frame {
-        msec: 2240
-        hash: "6f45d7c37f1fb90138011b2af24aaf1e"
-    }
-    Frame {
-        msec: 2256
-        hash: "1cfe03528b1cd84e69efc02b9677c748"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2272
-        hash: "360d75bcc178bcfd4f93741d653fd821"
-    }
-    Frame {
-        msec: 2288
-        hash: "708799d2d834302c659958701e217b37"
-    }
-    Frame {
-        msec: 2304
-        hash: "892a1a8a5a9c198e5ae04cc19f0e1d0c"
-    }
-    Frame {
-        msec: 2320
-        hash: "bc5744ef5c81b7d5b365bf977f909be5"
-    }
-    Frame {
-        msec: 2336
-        hash: "5bd588d64917f942e0f5ea1553acbf63"
-    }
-    Frame {
-        msec: 2352
-        hash: "c0b0cddd62853ac3499b7ada200d206a"
-    }
-    Key {
-        type: 6
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2368
-        hash: "5c60da876c8cc9fa334905b5fc7c2a3d"
-    }
-    Frame {
-        msec: 2384
-        hash: "136a103a893991b97ec09f373c68c5b9"
-    }
-    Frame {
-        msec: 2400
-        hash: "b2181ce0165ee060e1a8b713027011a9"
-    }
-    Frame {
-        msec: 2416
-        hash: "e4836bbaf1834658e3ec4bf54a619b53"
-    }
-    Frame {
-        msec: 2432
-        hash: "3072492f5f72427c8d45cf3c5d3ff919"
-    }
-    Frame {
-        msec: 2448
-        hash: "d897cba896239c77df4f7adb93ad5def"
-    }
-    Frame {
-        msec: 2464
-        hash: "ec9867a95de6d6f4c0f92af567d73771"
-    }
-    Key {
-        type: 7
-        key: 16777236
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2480
-        hash: "06b72e3180eb946622e4592de0fa6f91"
-    }
-    Frame {
-        msec: 2496
-        hash: "33f109c026eaefed113cc12db5912a19"
-    }
-    Frame {
-        msec: 2512
-        hash: "ce72c4b4470394dc1c4efd4d9de9907f"
-    }
-    Frame {
-        msec: 2528
-        hash: "64ac1105ea10ae1f6401e8421731c606"
-    }
-    Frame {
-        msec: 2544
-        hash: "ef977bd74941d3506b8f3ee4b1f587ad"
-    }
-    Frame {
-        msec: 2560
-        hash: "9278de91e10788ae5a80399ff5372460"
-    }
-    Frame {
-        msec: 2576
-        hash: "ddaaf945a5f714b856ed5155f4e502b2"
-    }
-    Frame {
-        msec: 2592
-        hash: "f6bb6ba15d996345df04825da71c2cf3"
-    }
-    Frame {
-        msec: 2608
-        hash: "466c78a5a5052b39b113adeda761da6c"
-    }
-    Frame {
-        msec: 2624
-        hash: "db650537d773e0d8a737a7bf5f408a5e"
-    }
-    Frame {
-        msec: 2640
-        hash: "64be9f85869f19defada296343895a2b"
-    }
-    Frame {
-        msec: 2656
-        hash: "5ac6d9751bfadbc7aa064ca0b4d78b2b"
-    }
-    Frame {
-        msec: 2672
-        hash: "a088b351dcc6fc3a8d29256f3a2410c3"
-    }
-    Frame {
-        msec: 2688
-        hash: "a16a77170a6c969042024fa0868da12d"
-    }
-    Frame {
-        msec: 2704
-        hash: "3a2509d0d3a314d2ed72f811f4af741e"
-    }
-    Frame {
-        msec: 2720
-        hash: "484db4e1954048cad7eea48bfea08267"
-    }
-    Frame {
-        msec: 2736
-        hash: "ad0f84634c5f99ab62ab6d12ad8d8c6a"
-    }
-    Frame {
-        msec: 2752
-        hash: "d99b590307f6910963257a1c41c50120"
-    }
-    Key {
-        type: 6
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2768
-        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
-    }
-    Frame {
-        msec: 2784
-        hash: "4220dde85eb1c027366efd0798927e8d"
-    }
-    Frame {
-        msec: 2800
-        hash: "512b9746ae4482557b8cef9f99905954"
-    }
-    Frame {
-        msec: 2816
-        hash: "e7346d8f223684143a0940def878b874"
-    }
-    Frame {
-        msec: 2832
-        hash: "4f097223462c8f619188b0b0c2ecb080"
-    }
-    Frame {
-        msec: 2848
-        hash: "243be452ff0798538defc6a14cb8a08b"
-    }
-    Frame {
-        msec: 2864
-        hash: "e5472ed9a8a43a64a0fea12540619940"
-    }
-    Frame {
-        msec: 2880
-        image: "cursorDelegate.2.png"
-    }
-    Key {
-        type: 7
-        key: 16777234
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2896
-        hash: "97d5f9fe02e4bd06ec30a7805945f167"
-    }
-    Frame {
-        msec: 2912
-        hash: "eb381a1e2ad945e4cfa540c137edbda7"
-    }
-    Frame {
-        msec: 2928
-        hash: "75252ff61682fd32117f0759ebe4b6a1"
-    }
-    Frame {
-        msec: 2944
-        hash: "d724bdacc59bce29d0a42d72479be0b6"
-    }
-    Frame {
-        msec: 2960
-        hash: "d7703c18b69f485bba3abd655100b50d"
-    }
-    Frame {
-        msec: 2976
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 2992
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 3008
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 3024
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 3040
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 3056
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 3072
-        hash: "d7703c18b69f485bba3abd655100b50d"
-    }
-    Frame {
-        msec: 3088
-        hash: "d724bdacc59bce29d0a42d72479be0b6"
-    }
-    Frame {
-        msec: 3104
-        hash: "75252ff61682fd32117f0759ebe4b6a1"
-    }
-    Frame {
-        msec: 3120
-        hash: "eb381a1e2ad945e4cfa540c137edbda7"
-    }
-    Frame {
-        msec: 3136
-        hash: "97d5f9fe02e4bd06ec30a7805945f167"
-    }
-    Frame {
-        msec: 3152
-        hash: "90b0f5f1aa7b5f066fb1266ea63254eb"
-    }
-    Frame {
-        msec: 3168
-        hash: "e5472ed9a8a43a64a0fea12540619940"
-    }
-    Frame {
-        msec: 3184
-        hash: "243be452ff0798538defc6a14cb8a08b"
-    }
-    Frame {
-        msec: 3200
-        hash: "4f097223462c8f619188b0b0c2ecb080"
-    }
-    Frame {
-        msec: 3216
-        hash: "e7346d8f223684143a0940def878b874"
-    }
-    Frame {
-        msec: 3232
-        hash: "512b9746ae4482557b8cef9f99905954"
-    }
-    Frame {
-        msec: 3248
-        hash: "4220dde85eb1c027366efd0798927e8d"
-    }
-    Frame {
-        msec: 3264
-        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
-    }
-    Frame {
-        msec: 3280
-        hash: "de09380dd57c58ae99fbdba169a19975"
-    }
-    Frame {
-        msec: 3296
-        hash: "bfc1b03df244839a012e8302dc07764f"
-    }
-    Frame {
-        msec: 3312
-        hash: "d5f220e5337837ec0d07eb118e2f948e"
-    }
-    Frame {
-        msec: 3328
-        hash: "7640c78a286b0b7bdf2ec9117ceced4a"
-    }
-    Frame {
-        msec: 3344
-        hash: "680f51f63c4b11a247a668eb7bbd2b62"
-    }
-    Frame {
-        msec: 3360
-        hash: "de3c911aec7e42557ece4bdcf02ce562"
-    }
-    Frame {
-        msec: 3376
-        hash: "5e09b95292d6d0afe76a5015b0ccebf1"
-    }
-    Frame {
-        msec: 3392
-        hash: "59d2fb8e21802d256b11730b31919fb3"
-    }
-    Frame {
-        msec: 3408
-        hash: "a494b3b25a23daa858034ebccce0d1c7"
-    }
-    Frame {
-        msec: 3424
-        hash: "2ff4bd5602c34c020162f0503d625049"
-    }
-    Frame {
-        msec: 3440
-        hash: "e715c2a82745829665226df78598b819"
-    }
-    Frame {
-        msec: 3456
-        hash: "47ad557d366536ad457f6866241dba93"
-    }
-    Frame {
-        msec: 3472
-        hash: "70aedcda6c93875d18ee111d8a19549e"
-    }
-    Frame {
-        msec: 3488
-        hash: "c3487c7c7dcd392e7eacb74045dd4143"
-    }
-    Frame {
-        msec: 3504
-        hash: "56db24ad686d34e75a2d184e5b1da2a9"
-    }
-    Frame {
-        msec: 3520
-        hash: "436349a8371597a74404428983cd894c"
-    }
-    Frame {
-        msec: 3536
-        hash: "6e1bb59ec518614a0414092f4939d5ad"
-    }
-    Frame {
-        msec: 3552
-        hash: "f0aa02772df579b921e0c68f794d2327"
-    }
-    Frame {
-        msec: 3568
-        hash: "09ea1462da333c2aeaaa01e9e4f8d54b"
-    }
-    Frame {
-        msec: 3584
-        hash: "46d23d8472ce833591dcff548a644288"
-    }
-    Frame {
-        msec: 3600
-        hash: "a7566d5d35a89078bb378bf3f6c78e13"
-    }
-    Frame {
-        msec: 3616
-        hash: "4c5f7155b20e34a5627387cdc466e890"
-    }
-    Frame {
-        msec: 3632
-        hash: "e9b98922327c412db0116a56283d3c86"
-    }
-    Frame {
-        msec: 3648
-        hash: "29ffede9c16c34ead5f291e69e388084"
-    }
-    Frame {
-        msec: 3664
-        hash: "16958b8f0b1dbdc15333d99bd1349124"
-    }
-    Frame {
-        msec: 3680
-        hash: "3408f8d6e4d6ef34d4d5a0cb51090c4c"
-    }
-    Frame {
-        msec: 3696
-        hash: "b32b099b260789266d0a3c0edd61c04e"
-    }
-    Frame {
-        msec: 3712
-        hash: "4dd3617b25e8b95cf2ec31db8b3bb80f"
-    }
-    Frame {
-        msec: 3728
-        hash: "46b42a08c59909f067810d1984f7a04e"
-    }
-    Frame {
-        msec: 3744
-        hash: "ab8c505601c381e8a44fa7b6eea6579d"
-    }
-    Frame {
-        msec: 3760
-        hash: "73f56e6e1d2cbf3f559d679eb2c15529"
-    }
-    Frame {
-        msec: 3776
-        hash: "b230c56da330823d7d7f7e081c304acb"
-    }
-    Frame {
-        msec: 3792
-        hash: "9f3cbd0023dbd78ba4951c26f71c7d5d"
-    }
-    Frame {
-        msec: 3808
-        hash: "9e9b11cf2695dd02c1ab175ff194f491"
-    }
-    Frame {
-        msec: 3824
-        hash: "8fa6f8eb5deb0ab95c3454e5812ada1d"
-    }
-    Frame {
-        msec: 3840
-        image: "cursorDelegate.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "0b6b24ae8df7c3aa9abb48edb6619d8a"
-    }
-    Frame {
-        msec: 3872
-        hash: "45805295dd2482fdf21ac8c9bfe47869"
-    }
-    Frame {
-        msec: 3888
-        hash: "4893cd31a730d786f075edfd0afc0ad9"
-    }
-    Frame {
-        msec: 3904
-        hash: "a3fbfe732568f5cf6e63809fd7e0c32e"
-    }
-    Frame {
-        msec: 3920
-        hash: "21d3327710d51f714e84b5a28df13e4f"
-    }
-    Frame {
-        msec: 3936
-        hash: "ea065ab48f27f60505eab36debee3faa"
-    }
-    Frame {
-        msec: 3952
-        hash: "fe4c2e368d2110374b7ba9e30f330713"
-    }
-    Frame {
-        msec: 3968
-        hash: "723281f6c1a3f03cf170e4de93fa4dbf"
-    }
-    Frame {
-        msec: 3984
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 4000
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 4016
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 4032
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 4048
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 4064
-        hash: "723281f6c1a3f03cf170e4de93fa4dbf"
-    }
-    Key {
-        type: 6
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4080
-        hash: "c779e46a89c3c9d0f8234a3192175b60"
-    }
-    Frame {
-        msec: 4096
-        hash: "f223cfeba468e161943b24ac960196de"
-    }
-    Frame {
-        msec: 4112
-        hash: "dd2f21f063d055edc23c874380149067"
-    }
-    Frame {
-        msec: 4128
-        hash: "af580b32b67117eb062bbcefe262c719"
-    }
-    Key {
-        type: 7
-        key: 16777232
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4144
-        hash: "991f76d483e033024932790f85bb3c5d"
-    }
-    Frame {
-        msec: 4160
-        hash: "3d8aa66ab9533d14a468f0869b457033"
-    }
-    Frame {
-        msec: 4176
-        hash: "a5540bd5d088ab1201b5f22b32579d7c"
-    }
-    Frame {
-        msec: 4192
-        hash: "e0844f30578fef2cdcee4e4ff28ab7cf"
-    }
-    Frame {
-        msec: 4208
-        hash: "710e7022b65a9b3fd3a7372bf7f37c7a"
-    }
-    Frame {
-        msec: 4224
-        hash: "db553c856b11db7e6feb38b9d562a804"
-    }
-    Frame {
-        msec: 4240
-        hash: "6ba56c4ec6e903b0d82235c230ed78cb"
-    }
-    Frame {
-        msec: 4256
-        hash: "786de35a11c3fc1a228392195f509c28"
-    }
-    Frame {
-        msec: 4272
-        hash: "cc6307597cea821b63391fc9bdbe038b"
-    }
-    Frame {
-        msec: 4288
-        hash: "73d49e4d0bef103e11820d888bef0368"
-    }
-    Frame {
-        msec: 4304
-        hash: "b2ed6ebf66252463326c2f220b3992fa"
-    }
-    Frame {
-        msec: 4320
-        hash: "129b5bc6d55621e2366fc0d80f105df2"
-    }
-    Frame {
-        msec: 4336
-        hash: "ae8fe55fa9b497cd6eff18a517c301d8"
-    }
-    Frame {
-        msec: 4352
-        hash: "535210bd848a20db2966b06278198e07"
-    }
-    Frame {
-        msec: 4368
-        hash: "1f4ea7783b5c60bfc424c73cea07a3a0"
-    }
-    Frame {
-        msec: 4384
-        hash: "5b61f2e9308c4de2864bb7cf133ce545"
-    }
-    Frame {
-        msec: 4400
-        hash: "f641f87e9556ecfd24f0f0a772295e52"
-    }
-    Frame {
-        msec: 4416
-        hash: "36f28574c0b042647bc064d75afa9fbc"
-    }
-    Frame {
-        msec: 4432
-        hash: "dba2ca165b8ab35113b8ec127b204ae9"
-    }
-    Frame {
-        msec: 4448
-        hash: "56324b95f63eabba718df588159f374d"
-    }
-    Frame {
-        msec: 4464
-        hash: "af65d67fef3c743e31acca03716040c4"
-    }
-    Frame {
-        msec: 4480
-        hash: "105481b5becd127af4c28961d900148c"
-    }
-    Frame {
-        msec: 4496
-        hash: "4859d6bf9c456e52fd463e4c2f68d7f6"
-    }
-    Frame {
-        msec: 4512
-        hash: "21c0958bd3c6a1056bb062165c9bc18b"
-    }
-    Frame {
-        msec: 4528
-        hash: "287d258a79f45c26c92c69cce6b1a2f3"
-    }
-    Frame {
-        msec: 4544
-        hash: "deabc5c7dd111adcb253eb833f118764"
-    }
-    Frame {
-        msec: 4560
-        hash: "4bad7380f6b645c551edbe06ff67cac9"
-    }
-    Frame {
-        msec: 4576
-        hash: "67fc71c16d0b9405c35590bafdc5ea40"
-    }
-    Key {
-        type: 6
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4592
-        hash: "7aed794eae2f0c65342f190ed4d4f889"
-    }
-    Frame {
-        msec: 4608
-        hash: "23edee3af8f1904558863d37c520555a"
-    }
-    Frame {
-        msec: 4624
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Key {
-        type: 7
-        key: 16777233
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4640
-        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
-    }
-    Frame {
-        msec: 4656
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
-    }
-    Frame {
-        msec: 4672
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
-    }
-    Frame {
-        msec: 4688
-        hash: "5a11ec8a0485a018ebe317e01136e4a5"
-    }
-    Frame {
-        msec: 4704
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
-    }
-    Frame {
-        msec: 4720
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
-    }
-    Frame {
-        msec: 4736
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
-    }
-    Frame {
-        msec: 4752
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
-    }
-    Frame {
-        msec: 4768
-        hash: "fd3fd655785c4e3c470f742451e3470f"
-    }
-    Frame {
-        msec: 4784
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
-    }
-    Frame {
-        msec: 4800
-        image: "cursorDelegate.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
-    }
-    Frame {
-        msec: 4832
-        hash: "36b65658073ac2687dbd88ec7a408a98"
-    }
-    Frame {
-        msec: 4848
-        hash: "84e165f9f2c55c5c51a260b11ca195c2"
-    }
-    Frame {
-        msec: 4864
-        hash: "c11cfcfda6f161d058a3d9e93349b578"
-    }
-    Frame {
-        msec: 4880
-        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
-    }
-    Frame {
-        msec: 4896
-        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
-    }
-    Frame {
-        msec: 4912
-        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
-    }
-    Frame {
-        msec: 4928
-        hash: "3cc8791e419986e1e913d4e153243fb2"
-    }
-    Frame {
-        msec: 4944
-        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
-    }
-    Frame {
-        msec: 4960
-        hash: "d3ae969e538c642d82662d08ef05964e"
-    }
-    Frame {
-        msec: 4976
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 4992
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5008
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5024
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5040
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5056
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 5072
-        hash: "d3ae969e538c642d82662d08ef05964e"
-    }
-    Frame {
-        msec: 5088
-        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
-    }
-    Frame {
-        msec: 5104
-        hash: "3cc8791e419986e1e913d4e153243fb2"
-    }
-    Frame {
-        msec: 5120
-        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
-    }
-    Frame {
-        msec: 5136
-        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
-    }
-    Frame {
-        msec: 5152
-        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
-    }
-    Frame {
-        msec: 5168
-        hash: "c11cfcfda6f161d058a3d9e93349b578"
-    }
-    Frame {
-        msec: 5184
-        hash: "84e165f9f2c55c5c51a260b11ca195c2"
-    }
-    Frame {
-        msec: 5200
-        hash: "36b65658073ac2687dbd88ec7a408a98"
-    }
-    Frame {
-        msec: 5216
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
-    }
-    Frame {
-        msec: 5232
-        hash: "2a55b52db02d97963d382c9862307384"
-    }
-    Frame {
-        msec: 5248
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
-    }
-    Frame {
-        msec: 5264
-        hash: "fd3fd655785c4e3c470f742451e3470f"
-    }
-    Frame {
-        msec: 5280
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
-    }
-    Frame {
-        msec: 5296
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
-    }
-    Frame {
-        msec: 5312
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
-    }
-    Frame {
-        msec: 5328
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
-    }
-    Frame {
-        msec: 5344
-        hash: "5a11ec8a0485a018ebe317e01136e4a5"
-    }
-    Frame {
-        msec: 5360
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
-    }
-    Frame {
-        msec: 5376
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
-    }
-    Frame {
-        msec: 5392
-        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
-    }
-    Frame {
-        msec: 5408
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Frame {
-        msec: 5424
-        hash: "23edee3af8f1904558863d37c520555a"
-    }
-    Frame {
-        msec: 5440
-        hash: "7aed794eae2f0c65342f190ed4d4f889"
-    }
-    Frame {
-        msec: 5456
-        hash: "0fa12b48c08266f50e77506e4136dd56"
-    }
-    Frame {
-        msec: 5472
-        hash: "679ee2b26a118ab53a84fa116de09edf"
-    }
-    Frame {
-        msec: 5488
-        hash: "b9dcdd88fba70636cbcae160edcc0136"
-    }
-    Frame {
-        msec: 5504
-        hash: "90af75eeef63ae67e9f6ff1a61d7cca3"
-    }
-    Frame {
-        msec: 5520
-        hash: "29d80ae32451c24b655c4d1fd01d3aa1"
-    }
-    Frame {
-        msec: 5536
-        hash: "c73fe137644cbc006d0b5274b72faa46"
-    }
-    Frame {
-        msec: 5552
-        hash: "8a4d76ae60f5d720a382cced2f6a2b5e"
-    }
-    Frame {
-        msec: 5568
-        hash: "a1efa0d424d568d338c6db9fc095c2fb"
-    }
-    Frame {
-        msec: 5584
-        hash: "205cafcabb29b78a6db3dcaf44a74ab6"
-    }
-    Frame {
-        msec: 5600
-        hash: "7507a3d2158d4cc68454c85922526871"
-    }
-    Frame {
-        msec: 5616
-        hash: "7135a6a7999e82cb81e39228805332ee"
-    }
-    Frame {
-        msec: 5632
-        hash: "ac2b714b5f32d2b911f31690d7082dc1"
-    }
-    Frame {
-        msec: 5648
-        hash: "5cb1ae6d86aafdf11284480c81b939dc"
-    }
-    Frame {
-        msec: 5664
-        hash: "ac705840cc94eb4af7a52d62649d0157"
-    }
-    Frame {
-        msec: 5680
-        hash: "8c2ebcd80e26ac7b9d25be486f54c4ce"
-    }
-    Frame {
-        msec: 5696
-        hash: "12b84aa02dbbab3592d3eb3cb6884b41"
-    }
-    Frame {
-        msec: 5712
-        hash: "675043ddde6ed65a3ec4ed093be1e760"
-    }
-    Frame {
-        msec: 5728
-        hash: "478126aeef5ddae9c0a77d08294cf3f2"
-    }
-    Frame {
-        msec: 5744
-        hash: "0b43af73d91a500ccdf27b4347b9bc47"
-    }
-    Frame {
-        msec: 5760
-        image: "cursorDelegate.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "a6d8708d08bedf0cab5230d6f2936936"
-    }
-    Frame {
-        msec: 5792
-        hash: "02e0646024aeef6f01b7541b15267baa"
-    }
-    Frame {
-        msec: 5808
-        hash: "da6717c94b46ad7a647c445c06314b0d"
-    }
-    Frame {
-        msec: 5824
-        hash: "2ed12d49d72884160ebbf6b6d0e15a9d"
-    }
-    Frame {
-        msec: 5840
-        hash: "a1fbc3333b7f742a8336a6fcbad156c9"
-    }
-    Frame {
-        msec: 5856
-        hash: "25cac33299d58cdd7775e8b75410085e"
-    }
-    Frame {
-        msec: 5872
-        hash: "5d81833eb342f632945c0571e18cb1f9"
-    }
-    Frame {
-        msec: 5888
-        hash: "23f6f2a7d971494af43a0fb97dbf8fb5"
-    }
-    Frame {
-        msec: 5904
-        hash: "216b70d02a4685dc07258454bb4e7c85"
-    }
-    Frame {
-        msec: 5920
-        hash: "1e06742af58d6e63facdc599c46e11b1"
-    }
-    Frame {
-        msec: 5936
-        hash: "00f8ac72d3794ed8d66db987402ecde0"
-    }
-    Frame {
-        msec: 5952
-        hash: "42ab5f162acba94f563823f5be1e37d2"
-    }
-    Frame {
-        msec: 5968
-        hash: "3272b97fdc54eb9f3590e7bbe4ac457d"
-    }
-    Frame {
-        msec: 5984
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6000
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6016
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6032
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6048
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 6064
-        hash: "3272b97fdc54eb9f3590e7bbe4ac457d"
-    }
-    Frame {
-        msec: 6080
-        hash: "42ab5f162acba94f563823f5be1e37d2"
-    }
-    Frame {
-        msec: 6096
-        hash: "00f8ac72d3794ed8d66db987402ecde0"
-    }
-    Frame {
-        msec: 6112
-        hash: "1e06742af58d6e63facdc599c46e11b1"
-    }
-    Frame {
-        msec: 6128
-        hash: "216b70d02a4685dc07258454bb4e7c85"
-    }
-    Frame {
-        msec: 6144
-        hash: "23f6f2a7d971494af43a0fb97dbf8fb5"
-    }
-    Frame {
-        msec: 6160
-        hash: "5d81833eb342f632945c0571e18cb1f9"
-    }
-    Frame {
-        msec: 6176
-        hash: "25cac33299d58cdd7775e8b75410085e"
-    }
-    Frame {
-        msec: 6192
-        hash: "a1fbc3333b7f742a8336a6fcbad156c9"
-    }
-    Frame {
-        msec: 6208
-        hash: "2ed12d49d72884160ebbf6b6d0e15a9d"
-    }
-    Frame {
-        msec: 6224
-        hash: "da6717c94b46ad7a647c445c06314b0d"
-    }
-    Frame {
-        msec: 6240
-        hash: "02e0646024aeef6f01b7541b15267baa"
-    }
-    Frame {
-        msec: 6256
-        hash: "a6d8708d08bedf0cab5230d6f2936936"
-    }
-    Frame {
-        msec: 6272
-        hash: "68d459091a85f24ece39a207e395039b"
-    }
-    Frame {
-        msec: 6288
-        hash: "0b43af73d91a500ccdf27b4347b9bc47"
-    }
-    Frame {
-        msec: 6304
-        hash: "478126aeef5ddae9c0a77d08294cf3f2"
-    }
-    Frame {
-        msec: 6320
-        hash: "675043ddde6ed65a3ec4ed093be1e760"
-    }
-    Frame {
-        msec: 6336
-        hash: "12b84aa02dbbab3592d3eb3cb6884b41"
-    }
-    Frame {
-        msec: 6352
-        hash: "8c2ebcd80e26ac7b9d25be486f54c4ce"
-    }
-    Frame {
-        msec: 6368
-        hash: "ac705840cc94eb4af7a52d62649d0157"
-    }
-    Frame {
-        msec: 6384
-        hash: "5cb1ae6d86aafdf11284480c81b939dc"
-    }
-    Frame {
-        msec: 6400
-        hash: "ac2b714b5f32d2b911f31690d7082dc1"
-    }
-    Frame {
-        msec: 6416
-        hash: "7135a6a7999e82cb81e39228805332ee"
-    }
-    Frame {
-        msec: 6432
-        hash: "7507a3d2158d4cc68454c85922526871"
-    }
-    Frame {
-        msec: 6448
-        hash: "205cafcabb29b78a6db3dcaf44a74ab6"
-    }
-    Frame {
-        msec: 6464
-        hash: "a1efa0d424d568d338c6db9fc095c2fb"
-    }
-    Frame {
-        msec: 6480
-        hash: "8a4d76ae60f5d720a382cced2f6a2b5e"
-    }
-    Frame {
-        msec: 6496
-        hash: "c73fe137644cbc006d0b5274b72faa46"
-    }
-    Frame {
-        msec: 6512
-        hash: "29d80ae32451c24b655c4d1fd01d3aa1"
-    }
-    Frame {
-        msec: 6528
-        hash: "90af75eeef63ae67e9f6ff1a61d7cca3"
-    }
-    Frame {
-        msec: 6544
-        hash: "b9dcdd88fba70636cbcae160edcc0136"
-    }
-    Frame {
-        msec: 6560
-        hash: "679ee2b26a118ab53a84fa116de09edf"
-    }
-    Frame {
-        msec: 6576
-        hash: "0fa12b48c08266f50e77506e4136dd56"
-    }
-    Frame {
-        msec: 6592
-        hash: "7aed794eae2f0c65342f190ed4d4f889"
-    }
-    Frame {
-        msec: 6608
-        hash: "23edee3af8f1904558863d37c520555a"
-    }
-    Frame {
-        msec: 6624
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Frame {
-        msec: 6640
-        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
-    }
-    Frame {
-        msec: 6656
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
-    }
-    Frame {
-        msec: 6672
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 271; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6688
-        hash: "680f51f63c4b11a247a668eb7bbd2b62"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 271; y: 92
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6704
-        hash: "7640c78a286b0b7bdf2ec9117ceced4a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 271; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 270; y: 99
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6720
-        image: "cursorDelegate.6.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 269; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6736
-        hash: "bfc1b03df244839a012e8302dc07764f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 268; y: 107
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6752
-        hash: "de09380dd57c58ae99fbdba169a19975"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 266; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6768
-        hash: "54f7f94b5cdf1becb2ee61d7f6f02c0e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 266; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6784
-        hash: "4220dde85eb1c027366efd0798927e8d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 265; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6800
-        hash: "512b9746ae4482557b8cef9f99905954"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 263; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 261; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6816
-        hash: "e7346d8f223684143a0940def878b874"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 259; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6832
-        hash: "7e7382302681cd29a2c6959a3a704660"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 256; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6848
-        hash: "ef8f7dfdd4e70100ecaecca4055d8f52"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 250; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 243; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6864
-        hash: "f5cacabb78b88c31af1a1b1e6f60069b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 235; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6880
-        hash: "b016ef2306b0a721df86b6916e7953e4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 227; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6896
-        hash: "a78e9b0b93569b77b0659c771336971a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 209; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6912
-        hash: "b957ab07bcbaeffca963d9148130a965"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 200; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6928
-        hash: "140bc4b078bac52d6903bdfdfc35a94c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 190; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6944
-        hash: "047c3a7403ae88cceb7fc875793d1ed8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 181; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 172; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6960
-        hash: "03d48446aaf94450a3a9a8f1e956493f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 127
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6976
-        hash: "6672e47aa6a975fbd82d2fe5bc99bbaf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 154; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6992
-        hash: "3bc73489d06e446d4c96117756a59227"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7008
-        hash: "aed995a61df4a1c189ef2962000d02de"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7024
-        hash: "aed995a61df4a1c189ef2962000d02de"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 123; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7040
-        hash: "74f0bbe92a23146fbdbd365edd5741c8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 118; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 114; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7056
-        hash: "74f0bbe92a23146fbdbd365edd5741c8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7072
-        hash: "6456208c6367687b8dc701791eccd7d4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 108; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7088
-        hash: "376b59dc6e00a51bc9f2d4cfa2718e57"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 106; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7104
-        hash: "fb7bc3401f70ce6eee131c9c7510e1fe"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7120
-        hash: "675a419f0cd8351d6b2a65daf7d2707a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7136
-        hash: "2f7951abac64e0f10d3b66d04966b6e9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7152
-        hash: "1f8daa78c58ae11ec105bd87681c1762"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7168
-        hash: "23ab196ed43219c26d94431698f6ac8d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7184
-        hash: "9581e2695f4818e063ec032cb5bb6b7f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7200
-        hash: "6752cd7c5383e0ccc9b08f79db6ac310"
-    }
-    Frame {
-        msec: 7216
-        hash: "51f5675e0fb1410c5a8ec03a86b42681"
-    }
-    Frame {
-        msec: 7232
-        hash: "c3c23213b2649b5ccabd8e420a251e00"
-    }
-    Frame {
-        msec: 7248
-        hash: "02ceab31171fe983a10e862b53aea16f"
-    }
-    Frame {
-        msec: 7264
-        hash: "8a774dda9a1bc16bd270724e570daf20"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7280
-        hash: "2b6b892cebfcce14a9db485fecf16703"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7296
-        hash: "8b8e6d3362f018cbd9b487f03cfb7a22"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7312
-        hash: "a8477a9429633384073618cc60841e6c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 102; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7328
-        hash: "59558c6665b73f02809259e039b4423a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 103; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7344
-        hash: "93540071bab8a970a929d209f628970e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 105; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7360
-        hash: "78cdb0a05583150ea33040d32d95de47"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 107; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7376
-        hash: "4b1ee34985d3f5b8dd4355678ad39af4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 110; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7392
-        hash: "5484e7699c388eabf0311de49706397f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 113; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 117; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7408
-        hash: "dee6c2380f398323002ebb43a38d27e8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 124; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7424
-        hash: "d66a27728e7fd3c616842613a034c5a0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 131; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7440
-        hash: "5f851161f99fcf5b67cbe008a3faf411"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 138; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 144; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7456
-        hash: "013e949285cfa9edb34ab14e26753230"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 148; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 152; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7472
-        hash: "5b50acdcbd49969bcce2cfab6f9af380"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 155; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7488
-        hash: "d4aeb24211007cfc01512d289ae7aa01"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7504
-        hash: "6f1b7e12bbf54586e9a48989145f3274"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 159; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 162; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7520
-        hash: "0e09c7468bc03770c6cc7f0fba1ee9c0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7536
-        hash: "0fc4522bbf1a2e72002eb0a3c7224e1f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 165; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7552
-        hash: "91727292aaa314bf263c618a577b7f74"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 166; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7568
-        hash: "a78fb2545d11c521a50a10fd2d1700a7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 171; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7584
-        hash: "c207a291b47628921125acd4b8ed5ea8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7600
-        hash: "9a8e3df504ba36e82c51d71a3f5ce268"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 177; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7616
-        hash: "8cd9da94db91da50ae457d41866a32ba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 188; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7632
-        hash: "9e52b6fdc3ce4ad9c5986e47ffa762fc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 193; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7648
-        hash: "a1aff55bffb76bd4e2ac9ee482a03978"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 198; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 206; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7664
-        hash: "ba52431b72683cfbf0cc795a2407630e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 209; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7680
-        image: "cursorDelegate.7.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 211; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7696
-        hash: "eb5a19fbfbdceef233ed3c86c782817c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 119
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 212; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7712
-        hash: "7c8f3f2e96fa6a63867cb716061c8c77"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 213; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7728
-        hash: "96b0007f857aa19b41d184a7c7931f69"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 214; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7744
-        hash: "96201712b9ffbd9bfbebb5a5b7e23aba"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7760
-        hash: "d75e13a7715d5c329a47fdb818dfdbe5"
-    }
-    Frame {
-        msec: 7776
-        hash: "c8fa0c2d9e6aa1f3a33e76a31534359d"
-    }
-    Frame {
-        msec: 7792
-        hash: "03b11cc517f84c58a681906fdda98347"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 215; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7808
-        hash: "74cdf8af5d56216ad422951a56661536"
-    }
-    Frame {
-        msec: 7824
-        hash: "fcac2575aad872eada547508f312f09c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 118
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7840
-        hash: "7d76aec1f29d2d6745585be8ef113be5"
-    }
-    Frame {
-        msec: 7856
-        hash: "2b4fe4f39433671a9bc440efa1c589a8"
-    }
-    Frame {
-        msec: 7872
-        hash: "55a166f920e76173e14121d848a11aa0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7888
-        hash: "f764df8ecd68161d3529800e922254f4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7904
-        hash: "749caf21947e915b163f72e6fd190032"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 216; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7920
-        hash: "c350910df8ae4fea573a20d334fd3401"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 116
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7936
-        hash: "d177da450f1d380a6d2406e2393b9582"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 218; y: 115
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7952
-        hash: "bf3da78d7cac19daf2d5150b77840b1e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 219; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7968
-        hash: "22e337b0b81b18045a205355da6981ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 220; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7984
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 221; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8000
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8016
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Frame {
-        msec: 8032
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Frame {
-        msec: 8048
-        hash: "66c66927d2fc590fc43c146a403c1ccb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8064
-        hash: "22e337b0b81b18045a205355da6981ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8080
-        hash: "bf3da78d7cac19daf2d5150b77840b1e"
-    }
-    Frame {
-        msec: 8096
-        hash: "d177da450f1d380a6d2406e2393b9582"
-    }
-    Frame {
-        msec: 8112
-        hash: "c350910df8ae4fea573a20d334fd3401"
-    }
-    Frame {
-        msec: 8128
-        hash: "749caf21947e915b163f72e6fd190032"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 222; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8144
-        hash: "f764df8ecd68161d3529800e922254f4"
-    }
-    Frame {
-        msec: 8160
-        hash: "55a166f920e76173e14121d848a11aa0"
-    }
-    Frame {
-        msec: 8176
-        hash: "2b4fe4f39433671a9bc440efa1c589a8"
-    }
-    Frame {
-        msec: 8192
-        hash: "7d76aec1f29d2d6745585be8ef113be5"
-    }
-    Frame {
-        msec: 8208
-        hash: "fcac2575aad872eada547508f312f09c"
-    }
-    Frame {
-        msec: 8224
-        hash: "74cdf8af5d56216ad422951a56661536"
-    }
-    Frame {
-        msec: 8240
-        hash: "03b11cc517f84c58a681906fdda98347"
-    }
-    Frame {
-        msec: 8256
-        hash: "c8fa0c2d9e6aa1f3a33e76a31534359d"
-    }
-    Frame {
-        msec: 8272
-        hash: "d75e13a7715d5c329a47fdb818dfdbe5"
-    }
-    Frame {
-        msec: 8288
-        hash: "96201712b9ffbd9bfbebb5a5b7e23aba"
-    }
-    Frame {
-        msec: 8304
-        hash: "96b0007f857aa19b41d184a7c7931f69"
-    }
-    Frame {
-        msec: 8320
-        hash: "bff5b731de7c93fa0cdcefbf99beeb5e"
-    }
-    Frame {
-        msec: 8336
-        hash: "ce76704964873be1bc6a324d8a3381be"
-    }
-    Frame {
-        msec: 8352
-        hash: "a31b4f2a3defc968098029328de9352d"
-    }
-    Frame {
-        msec: 8368
-        hash: "295e3f40a511bd30e1c6599ead93619a"
-    }
-    Frame {
-        msec: 8384
-        hash: "3cd74da8b04de8ec7446490dea0e4e6c"
-    }
-    Frame {
-        msec: 8400
-        hash: "78a7db5a316609136d1b873d20d5dd3e"
-    }
-    Frame {
-        msec: 8416
-        hash: "0f176fb11bfe26f872ef7103011df9e6"
-    }
-    Frame {
-        msec: 8432
-        hash: "47866013e79bc77607e0c40bf8457bed"
-    }
-    Frame {
-        msec: 8448
-        hash: "5f35467db5c5e0baf5caff90b97e2d0c"
-    }
-    Frame {
-        msec: 8464
-        hash: "fefa89763cc1ad8323fdf37b1f5f63d3"
-    }
-    Frame {
-        msec: 8480
-        hash: "b9823f88fa51944075ce6dedd695f097"
-    }
-    Frame {
-        msec: 8496
-        hash: "72521de21fcc57d6ccf16350b0df8eee"
-    }
-    Frame {
-        msec: 8512
-        hash: "fcd591a2e56ba5efa95b315b7bd10532"
-    }
-    Frame {
-        msec: 8528
-        hash: "5d437d59995741030e0975829712f85d"
-    }
-    Frame {
-        msec: 8544
-        hash: "e7189d174b181985b6aef10b8642726f"
-    }
-    Frame {
-        msec: 8560
-        hash: "cefadbae14e573f6c83d07ffc3a5152e"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 277; y: 97
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8576
-        hash: "0fa12b48c08266f50e77506e4136dd56"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 277; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8592
-        hash: "7aed794eae2f0c65342f190ed4d4f889"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 276; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8608
-        hash: "23edee3af8f1904558863d37c520555a"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 276; y: 98
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8624
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Frame {
-        msec: 8640
-        image: "cursorDelegate.8.png"
-    }
-    Frame {
-        msec: 8656
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
-    }
-    Frame {
-        msec: 8672
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
-    }
-    Frame {
-        msec: 8688
-        hash: "5a11ec8a0485a018ebe317e01136e4a5"
-    }
-    Frame {
-        msec: 8704
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
-    }
-    Frame {
-        msec: 8720
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
-    }
-    Frame {
-        msec: 8736
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
-    }
-    Frame {
-        msec: 8752
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
-    }
-    Frame {
-        msec: 8768
-        hash: "fd3fd655785c4e3c470f742451e3470f"
-    }
-    Frame {
-        msec: 8784
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
-    }
-    Frame {
-        msec: 8800
-        hash: "2a55b52db02d97963d382c9862307384"
-    }
-    Frame {
-        msec: 8816
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
-    }
-    Frame {
-        msec: 8832
-        hash: "36b65658073ac2687dbd88ec7a408a98"
-    }
-    Frame {
-        msec: 8848
-        hash: "84e165f9f2c55c5c51a260b11ca195c2"
-    }
-    Frame {
-        msec: 8864
-        hash: "c11cfcfda6f161d058a3d9e93349b578"
-    }
-    Frame {
-        msec: 8880
-        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
-    }
-    Frame {
-        msec: 8896
-        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
-    }
-    Frame {
-        msec: 8912
-        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
-    }
-    Frame {
-        msec: 8928
-        hash: "3cc8791e419986e1e913d4e153243fb2"
-    }
-    Frame {
-        msec: 8944
-        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
-    }
-    Frame {
-        msec: 8960
-        hash: "d3ae969e538c642d82662d08ef05964e"
-    }
-    Frame {
-        msec: 8976
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 8992
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9008
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9024
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9040
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9056
-        hash: "e3948b393a3778066a90197b31c71e51"
-    }
-    Frame {
-        msec: 9072
-        hash: "d3ae969e538c642d82662d08ef05964e"
-    }
-    Frame {
-        msec: 9088
-        hash: "ff1b3ce85bc9f3dd3feb90fa31c3bc0a"
-    }
-    Frame {
-        msec: 9104
-        hash: "3cc8791e419986e1e913d4e153243fb2"
-    }
-    Frame {
-        msec: 9120
-        hash: "31b5b3d68e452ffd90e9804ff9e9a264"
-    }
-    Frame {
-        msec: 9136
-        hash: "b66fd97ac36ac395df74e9a0dd58d0c7"
-    }
-    Frame {
-        msec: 9152
-        hash: "0568f8c0e1fa51b7547790a7f4978ea3"
-    }
-    Frame {
-        msec: 9168
-        hash: "c11cfcfda6f161d058a3d9e93349b578"
-    }
-    Frame {
-        msec: 9184
-        hash: "84e165f9f2c55c5c51a260b11ca195c2"
-    }
-    Frame {
-        msec: 9200
-        hash: "36b65658073ac2687dbd88ec7a408a98"
-    }
-    Frame {
-        msec: 9216
-        hash: "c6c90915393fc7cb0aaa464caefbadb0"
-    }
-    Frame {
-        msec: 9232
-        hash: "2a55b52db02d97963d382c9862307384"
-    }
-    Frame {
-        msec: 9248
-        hash: "7a9b2057760e48d5f9cfdc79b08866d8"
-    }
-    Frame {
-        msec: 9264
-        hash: "fd3fd655785c4e3c470f742451e3470f"
-    }
-    Frame {
-        msec: 9280
-        hash: "b4e273b6415e3951eab2f831100b0bb2"
-    }
-    Frame {
-        msec: 9296
-        hash: "a0cb3f796fddf7100ca19aee3dedbea8"
-    }
-    Frame {
-        msec: 9312
-        hash: "a242c9d5ed7f9aef0a0622dcb66d0a7e"
-    }
-    Frame {
-        msec: 9328
-        hash: "9aa569f7b251371bdd1cb05c8d3aab28"
-    }
-    Frame {
-        msec: 9344
-        hash: "5a11ec8a0485a018ebe317e01136e4a5"
-    }
-    Frame {
-        msec: 9360
-        hash: "62d4bfa65bfdc50d24d9204f4df7bad8"
-    }
-    Frame {
-        msec: 9376
-        hash: "e189dc0dae9457a6af5082c6ccf451b6"
-    }
-    Frame {
-        msec: 9392
-        hash: "86ed2aa2428feb9c6c14ad2a74e97978"
-    }
-    Frame {
-        msec: 9408
-        hash: "2f9ed13e8a0d0edf098b05db02c04bdf"
-    }
-    Frame {
-        msec: 9424
-        hash: "23edee3af8f1904558863d37c520555a"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.0.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.0.png
deleted file mode 100644
index 2b45a06..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.1.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.1.png
deleted file mode 100644
index 1f5bae0..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.2.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.2.png
deleted file mode 100644
index cb2b5a4..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.3.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.3.png
deleted file mode 100644
index aa24805..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.4.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.4.png
deleted file mode 100644
index aa24805..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.qml
deleted file mode 100644
index 873a86d..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.qml
+++ /dev/null
@@ -1,1043 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 32
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Key {
-        type: 6
-        key: 16777248
-        modifiers: 33554432
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 48
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 64
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 80
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 96
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 112
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 128
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 144
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 160
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 176
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 192
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 208
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 224
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 240
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 256
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 272
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 288
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 304
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 320
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 336
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Frame {
-        msec: 352
-        hash: "b73bd9c2fef8812591fff9f43b73da13"
-    }
-    Key {
-        type: 6
-        key: 74
-        modifiers: 33554432
-        text: "4a"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 368
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 384
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 400
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 416
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 432
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Key {
-        type: 7
-        key: 74
-        modifiers: 33554432
-        text: "4a"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 448
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 464
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 480
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 496
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 512
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 528
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Key {
-        type: 7
-        key: 16777248
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 544
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 560
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 576
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 592
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 608
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 624
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 640
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 656
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 672
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Frame {
-        msec: 688
-        hash: "e8b6bdc7d552bb13c5dc2f50b8cf1125"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 704
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 720
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 736
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 752
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 768
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 784
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 800
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 816
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 832
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Frame {
-        msec: 848
-        hash: "fbc09d695e0b47aae6e977c13f535bfd"
-    }
-    Key {
-        type: 6
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 864
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 880
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 896
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Key {
-        type: 7
-        key: 67
-        modifiers: 0
-        text: "63"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 912
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 928
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 944
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Frame {
-        msec: 960
-        image: "echoMode.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "a4b81c526a5bf8902fde9b8721980977"
-    }
-    Key {
-        type: 6
-        key: 75
-        modifiers: 0
-        text: "6b"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 992
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1008
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1024
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1040
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Key {
-        type: 7
-        key: 75
-        modifiers: 0
-        text: "6b"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1056
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1072
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1088
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1104
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1120
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1136
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1152
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1168
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1184
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1200
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1216
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Frame {
-        msec: 1232
-        hash: "d072aebc2314a149a856634786b208a0"
-    }
-    Key {
-        type: 6
-        key: 68
-        modifiers: 0
-        text: "64"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1248
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Frame {
-        msec: 1264
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Frame {
-        msec: 1280
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Key {
-        type: 7
-        key: 68
-        modifiers: 0
-        text: "64"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1296
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Frame {
-        msec: 1312
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Frame {
-        msec: 1328
-        hash: "94defec2865529f185d02cfcbfe166cc"
-    }
-    Key {
-        type: 6
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1344
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1360
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1376
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1392
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1408
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1424
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1440
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1456
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Frame {
-        msec: 1472
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Key {
-        type: 7
-        key: 65
-        modifiers: 0
-        text: "61"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1488
-        hash: "f625a2a82879df96141000e6931d4487"
-    }
-    Key {
-        type: 6
-        key: 87
-        modifiers: 0
-        text: "77"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1504
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1520
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1536
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1552
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Key {
-        type: 7
-        key: 87
-        modifiers: 0
-        text: "77"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1568
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1584
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1600
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1616
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1632
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Frame {
-        msec: 1648
-        hash: "1cf29837a4ea63bbb06c15382680d1b6"
-    }
-    Key {
-        type: 6
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1664
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1680
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1696
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1712
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1728
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1744
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Key {
-        type: 7
-        key: 83
-        modifiers: 0
-        text: "73"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1760
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1776
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1792
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1808
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1824
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1840
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Frame {
-        msec: 1856
-        hash: "6eabb6d168ecc9ac604dcf2db0075380"
-    }
-    Key {
-        type: 6
-        key: 76
-        modifiers: 0
-        text: "6c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1872
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1888
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1904
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1920
-        image: "echoMode.1.png"
-    }
-    Key {
-        type: 7
-        key: 76
-        modifiers: 0
-        text: "6c"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 1936
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1952
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1968
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 1984
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 2000
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Frame {
-        msec: 2016
-        hash: "cb2dc1c4fc4e213841b873561f404a4f"
-    }
-    Key {
-        type: 6
-        key: 79
-        modifiers: 0
-        text: "6f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2032
-        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
-    }
-    Frame {
-        msec: 2048
-        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
-    }
-    Key {
-        type: 7
-        key: 79
-        modifiers: 0
-        text: "6f"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2064
-        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
-    }
-    Frame {
-        msec: 2080
-        hash: "c2aff1ebdee69cca7dc67a102fce5e8e"
-    }
-    Key {
-        type: 6
-        key: 86
-        modifiers: 0
-        text: "76"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2096
-        hash: "c82441813af6ff577687f29f6a09da38"
-    }
-    Frame {
-        msec: 2112
-        hash: "c82441813af6ff577687f29f6a09da38"
-    }
-    Frame {
-        msec: 2128
-        hash: "c82441813af6ff577687f29f6a09da38"
-    }
-    Frame {
-        msec: 2144
-        hash: "c82441813af6ff577687f29f6a09da38"
-    }
-    Key {
-        type: 6
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Key {
-        type: 7
-        key: 86
-        modifiers: 0
-        text: "76"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2160
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2176
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2192
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2208
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Key {
-        type: 6
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2224
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Key {
-        type: 7
-        key: 69
-        modifiers: 0
-        text: "65"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2240
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2256
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2272
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2288
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2304
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Key {
-        type: 7
-        key: 32
-        modifiers: 0
-        text: "20"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2320
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Frame {
-        msec: 2336
-        hash: "d7da9862980b99e97a1fcd1b5c4c976f"
-    }
-    Key {
-        type: 6
-        key: 77
-        modifiers: 0
-        text: "6d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2352
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2368
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2384
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2400
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2416
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2432
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Key {
-        type: 7
-        key: 77
-        modifiers: 0
-        text: "6d"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2448
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2464
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2480
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Frame {
-        msec: 2496
-        hash: "8f36e26d8685fe55e7a1dd294188f649"
-    }
-    Key {
-        type: 6
-        key: 89
-        modifiers: 0
-        text: "79"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2512
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2528
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2544
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Key {
-        type: 7
-        key: 89
-        modifiers: 0
-        text: "79"
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 2560
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2576
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2592
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2608
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2624
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2640
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2656
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2672
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2688
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2704
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2720
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2736
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2752
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2768
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2784
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2800
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2816
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2832
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2848
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2864
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2880
-        image: "echoMode.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2912
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2928
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2944
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2960
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2976
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 2992
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 3008
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 3024
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 3040
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-    Frame {
-        msec: 3056
-        hash: "316f2ba46d059755576e6822dc77afb2"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.0.png b/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.0.png
deleted file mode 100644
index 87c2e07..0000000
Binary files a/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.qml
deleted file mode 100644
index e29ac56..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.qml
+++ /dev/null
@@ -1,107 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 32
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 48
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 64
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 80
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 96
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 112
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 128
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 144
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 160
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 176
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 192
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 208
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 224
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 240
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 256
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 272
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 288
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 304
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 320
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 336
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 352
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 368
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 384
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-    Frame {
-        msec: 400
-        hash: "7619ed68aca3544f373777e11a4bfefa"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/echoMode.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/echoMode.qml
deleted file mode 100644
index b0b50e4..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/echoMode.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-Item{
-    height: 50; width: 200
-    Column{
-        //Not an exhaustive echo mode test, that's in QLineEdit (since the functionality is in QLineControl)
-        TextInput{ id: main; focus: true; echoMode: TextInput.Password }
-        Text{ text: main.text }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/hAlign.qml b/tests/auto/declarative/visual/qmlgraphicstextinput/hAlign.qml
deleted file mode 100644
index 2d65adf..0000000
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/hAlign.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-import Qt 4.6
-
-Item{
-    width:600;
-    height:300;
-    Column{
-        TextInput{ 
-            text: "Jackdaws love my big sphinx of quartz"; 
-            horizontalAlignment: TextInput.AlignLeft;
-        }
-        TextInput{ 
-            text: "Jackdaws love my big sphinx of quartz"; 
-            horizontalAlignment: TextInput.AlignHCenter;
-        }
-        TextInput{ 
-            text: "Jackdaws love my big sphinx of quartz"; 
-            horizontalAlignment: TextInput.AlignRight;
-        }
-        Rectangle{ width: 600; height: 10; color: "pink" }
-        TextInput{ 
-            height: 30;
-            width: 600;
-            text: "Jackdaws love my big sphinx of quartz"; 
-            horizontalAlignment: TextInput.AlignLeft;
-        }
-        TextInput{ 
-            height: 30;
-            width: 600;
-            text: "Jackdaws love my big sphinx of quartz"; 
-            horizontalAlignment: TextInput.AlignHCenter;
-        }
-        TextInput{ 
-            height: 30;
-            width: 600;
-            text: "Jackdaws love my big sphinx of quartz"; 
-            horizontalAlignment: TextInput.AlignRight;
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.0.png b/tests/auto/declarative/visual/qmlmouseregion/data/drag.0.png
deleted file mode 100644
index cf36d60..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/drag.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.1.png b/tests/auto/declarative/visual/qmlmouseregion/data/drag.1.png
deleted file mode 100644
index 6069df8..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/drag.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.2.png b/tests/auto/declarative/visual/qmlmouseregion/data/drag.2.png
deleted file mode 100644
index b8bd5f3..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/drag.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.3.png b/tests/auto/declarative/visual/qmlmouseregion/data/drag.3.png
deleted file mode 100644
index cf36d60..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/drag.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.4.png b/tests/auto/declarative/visual/qmlmouseregion/data/drag.4.png
deleted file mode 100644
index 831d6b4..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/drag.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.5.png b/tests/auto/declarative/visual/qmlmouseregion/data/drag.5.png
deleted file mode 100644
index f7079dc..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/drag.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.6.png b/tests/auto/declarative/visual/qmlmouseregion/data/drag.6.png
deleted file mode 100644
index a5f4451..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/drag.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.7.png b/tests/auto/declarative/visual/qmlmouseregion/data/drag.7.png
deleted file mode 100644
index e1261d0..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/drag.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.8.png b/tests/auto/declarative/visual/qmlmouseregion/data/drag.8.png
deleted file mode 100644
index 653905e..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/drag.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.qml b/tests/auto/declarative/visual/qmlmouseregion/data/drag.qml
deleted file mode 100644
index 5a131e9..0000000
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.qml
+++ /dev/null
@@ -1,5207 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 32
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 48
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 64
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 80
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 96
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 112
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 128
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 144
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 160
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 176
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 192
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 208
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 224
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 240
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 256
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 272
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 288
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 304
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 320
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 336
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 352
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 368
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 384
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 400
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 416
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 432
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 448
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 464
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 480
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 496
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 512
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 528
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 544
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 560
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 576
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 592
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 608
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 624
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 640
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 656
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 672
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 688
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 704
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 720
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 736
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 752
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 768
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 784
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 800
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 816
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 832
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 848
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 864
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 880
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 896
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 912
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 928
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 944
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 960
-        image: "drag.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 992
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1008
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1024
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1040
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1056
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1072
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1088
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1104
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1120
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1136
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1152
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1168
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1184
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1200
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1216
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1232
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1248
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1264
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1280
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1296
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1312
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1328
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1344
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1360
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1376
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1392
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1408
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1424
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1440
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1456
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1472
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1488
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1504
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1520
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1536
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1552
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1568
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1584
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1600
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1616
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1632
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1648
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1664
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1680
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1696
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1712
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1728
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1744
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1760
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1776
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1792
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 16; y: 54
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1808
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 1824
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 16; y: 55
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 17; y: 55
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1840
-        hash: "b6b4b2c7acddd23609caa9727911b981"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 17; y: 55
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1856
-        hash: "b6b4b2c7acddd23609caa9727911b981"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 18; y: 55
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1872
-        hash: "022610222cfbcf9e9a8991cdb60c7bbb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 19; y: 54
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1888
-        hash: "9b5201a3201a102b20592d81218b5e74"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 22; y: 49
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 29; y: 42
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1904
-        hash: "a6c6df34bb552249393ba208ad327691"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 37; y: 35
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1920
-        image: "drag.1.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 47; y: 27
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1936
-        hash: "978543d8f9688605625f40b960d79c28"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 59; y: 21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 73; y: 15
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1952
-        hash: "6170ab3a7e51278ac4462b89fe7781b4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 87; y: 9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1968
-        hash: "32866f0aa5b13b3ab68661f49336439e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 5
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1984
-        hash: "26dc17c16eed46d37932cfe48d182b62"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 1
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 121; y: -3
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2000
-        hash: "ba70936fb44396fac184cc7ba0e94a90"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 130; y: -6
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2016
-        hash: "bae13291d4f031c34d80428d83367ede"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: -8
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2032
-        hash: "0a2fbfdc27bb6662553f637f1c325475"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 151; y: -9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 160; y: -9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2048
-        hash: "cdab85736dfcc4424d42e0e96094eded"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 170; y: -9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2064
-        hash: "76d51ce9ad69560d983d8d86d50f7bd0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 174; y: -9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2080
-        hash: "b5ada9e80f7f894aa141d5e3cfa5d69e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: -9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2096
-        hash: "446d35fc7b9c0fe4bf0bfe0182f994f6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 183; y: -5
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2112
-        hash: "cced849d314835d43ebd93bcfe396c12"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 188; y: -3
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2128
-        hash: "09696d700944c373f82d7c6f75d51c51"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 193; y: 0
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2144
-        hash: "af56586db93c49637c9bfbb17cac9001"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 2
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 203; y: 5
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2160
-        hash: "66fc1b30b4037aad3975036faccbb7a7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 209; y: 8
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2176
-        hash: "3f443d9c89d6ba1b36ca9635bc32de1a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 11
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2192
-        hash: "df47db8cc7bb466b298749a6449d3d70"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 227; y: 15
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 234; y: 18
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 241; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2208
-        hash: "c1146fdc0e628d050442606096e52b10"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 252; y: 23
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2224
-        hash: "22f44c43f300fd7ff2b4d87d93756178"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 272; y: 30
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2240
-        hash: "bf11dc9a9679692abde5d116a169eecf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 299; y: 38
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 329; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2256
-        hash: "e63f1960f342639ac412010ffcefb049"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 360; y: 57
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2272
-        hash: "ae0228419ec9358025c3026a39abd671"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 392; y: 65
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2288
-        hash: "6d2272e2bea21c280100ed8de5b95d4e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 422; y: 72
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 451; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2304
-        hash: "1628c6fa5feabd90924452bc9f55054d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 476; y: 78
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2320
-        hash: "f696791eb0a317b0efb69407616bec9f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 497; y: 78
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2336
-        hash: "f696791eb0a317b0efb69407616bec9f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 513; y: 77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 527; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2352
-        hash: "1628c6fa5feabd90924452bc9f55054d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 538; y: 75
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2368
-        hash: "a5d3d247e22a2852a60fe07ab40345a5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 548; y: 74
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2384
-        hash: "a453fb6bcdd87f819782d8d8c46b56ee"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 556; y: 74
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 563; y: 75
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2400
-        hash: "a5d3d247e22a2852a60fe07ab40345a5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 570; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2416
-        hash: "1628c6fa5feabd90924452bc9f55054d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 576; y: 78
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2432
-        hash: "f696791eb0a317b0efb69407616bec9f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 582; y: 78
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 585; y: 80
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2448
-        hash: "8f061986df633c21dcad767ee857988c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 589; y: 81
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2464
-        hash: "2cc110a6fb800171d7d752693ede1e4e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 592; y: 82
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2480
-        hash: "319fc3053e02a8b161f33a79d9839bb1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 595; y: 85
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 597; y: 89
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2496
-        hash: "42915c8866746316cf1083a2d55410fb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 601; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2512
-        hash: "5df34b3ae292de9a9cd8ff09347e7bd4"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 606; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2528
-        hash: "1f9bc3c955983ea85f568797cb4f7365"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 609; y: 113
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 613; y: 124
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2544
-        hash: "3f156dc64a12c672874acf5456ef4a31"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 618; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2560
-        hash: "d4d9fe5b5f138e06a87039ebf8695d03"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 619; y: 142
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2576
-        hash: "383fe813021ee2791930200b2f88a802"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 620; y: 148
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 622; y: 155
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2592
-        hash: "a235544bd5e791dfa329bd0b87358bfa"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 625; y: 163
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2608
-        hash: "a87497cf47db3209610b532efe7eb380"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 629; y: 174
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2624
-        hash: "abe69b4e4b7508028226f9b73c38058a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 634; y: 194
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 642; y: 225
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2640
-        hash: "51c72fa2fa4c8765d882fe65dc0d697d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 649; y: 260
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2656
-        hash: "79da7ed21bd6fc16b7264d4403e763cc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 655; y: 291
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2672
-        hash: "b2828b6340a57fa45416469b23b7cef0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 658; y: 316
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 659; y: 340
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2688
-        hash: "64a5351f2d746b338c34c7ea9ba6e1fe"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 660; y: 370
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2704
-        hash: "9eedb7a6875210084fd2ec95d3505512"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 661; y: 408
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2720
-        hash: "b88eb8fa8a0cfc263dc7b655ddc29db0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 661; y: 448
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2736
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 660; y: 487
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 659; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2752
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 658; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2768
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 658; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2784
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 658; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 658; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2800
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 657; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2816
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 656; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2832
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 654; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 652; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2848
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 651; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2864
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 650; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2880
-        image: "drag.2.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 650; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 648; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2896
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 647; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2912
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 646; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2928
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 645; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 644; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2944
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 643; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2960
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 642; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2976
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 641; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 640; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2992
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 640; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3008
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 639; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3024
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 639; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 638; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3040
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 636; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3056
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 625; y: 505
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3072
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 611; y: 505
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3088
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 582; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 546; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3104
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 505; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3120
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 460; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3136
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 408; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 354; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3152
-        hash: "c2997fdde10812f02791bfed5f158ac3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 300; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3168
-        hash: "23a6dfbd09e5b44d04f252cedaeb68af"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 250; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3184
-        hash: "f74422989711f86a0840ffc98e8a29e9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 206; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 163; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3200
-        hash: "fa922246d254a7c46d2d1d6ec91a2b02"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 140; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 122; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3216
-        hash: "ef216cb8c2bf58db7d58bd8a2e4eb38d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 101; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3232
-        hash: "a383228d22e64b8a7758c959288eaca8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 64; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3248
-        hash: "636ca2a8e91c49ef6c8b1c93b830f345"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 36; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 16; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3264
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -1; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3280
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3296
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3312
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3328
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3344
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3360
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3376
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 505
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3392
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 504
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 504
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3408
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 505
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3424
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3440
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3456
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3472
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3488
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3504
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3520
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3536
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3552
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Frame {
-        msec: 3568
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3584
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3600
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3616
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Frame {
-        msec: 3632
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 491
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3648
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 428
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3664
-        hash: "9fa1e3686467f28cb013fe093dab388c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 342
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3680
-        hash: "7ef97d10862f80d53e0b3b4446661deb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 264
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 203
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3696
-        hash: "c679866b3965b7b5f48b843d6efccf42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 160
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3712
-        hash: "de4bd9ad3cbb9bb19bf75f871b044072"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 144
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3728
-        hash: "c5349bbddc03edd5ee3537e2a738f1ad"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 132
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3744
-        hash: "bcbe9ec2687a6030385f08d3dc17becf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 130
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3760
-        hash: "3ad767f63eaccb9e64a9f704900f2530"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 129
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3776
-        hash: "421a1ffde15fda0e7846bc095ed2ea37"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 128
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 128
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3792
-        hash: "55c260da304a6b1119af83f6a4efcff0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 123
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3808
-        hash: "f231cc521db801b4ec71248812e12db8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 104
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3824
-        hash: "b489b6b604e7f7699cac9e42d0725323"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 68
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 35
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3840
-        image: "drag.3.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 13
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3856
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 2
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3872
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -6
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -12
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3888
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3904
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3920
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -65
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -70
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3936
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -74
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3952
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3968
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3984
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4000
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4016
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -78
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4032
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4048
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -78
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4064
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4080
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4096
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4112
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4128
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4144
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: -78
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4160
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -3; y: -84
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4176
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -2; y: -105
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 1; y: -151
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4192
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4208
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4224
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4240
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4256
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4272
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4288
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4304
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4320
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4336
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4352
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4368
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Frame {
-        msec: 4384
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 3; y: -151
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4400
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 4; y: -149
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4416
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 5; y: -147
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4432
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 5; y: -143
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 6; y: -138
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4448
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 7; y: -130
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4464
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 9; y: -117
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4480
-        hash: "668cc6d9d699b947a7c0f3ff4b26853f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 13; y: -94
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 20; y: -63
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4496
-        hash: "b1b54f7bf8ab9cf98d96f9b34192434b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 29; y: -24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4512
-        hash: "a6c6df34bb552249393ba208ad327691"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 39; y: 15
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4528
-        hash: "a05eb803b1f1f3574a2f2e08fe37bd35"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 49; y: 50
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 58; y: 74
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4544
-        hash: "3c2f3db46673c2640a26832900b609cb"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 65; y: 91
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4560
-        hash: "d0539a9791874f48634bb3cb9f78d9db"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 71; y: 103
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4576
-        hash: "f2d862a0b81e2578799d64aef2e6bddc"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 77; y: 112
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 81; y: 121
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4592
-        hash: "295ef097845e30064c4d810a7718896c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 86; y: 128
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4608
-        hash: "22a4a17d82ac402c0e8372861609ff1c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 92; y: 136
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4624
-        hash: "a70e81b1435afd77b9079c58685ef9d0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 98; y: 143
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 104; y: 151
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4640
-        hash: "d66fefd68fcd96834548c18797eee4bd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 159
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4656
-        hash: "fcc435dc6f2643cd21a7cfac078880af"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 118; y: 166
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4672
-        hash: "736edfcf33245d46aaea199634896c17"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 123; y: 173
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 129; y: 183
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4688
-        hash: "7b7ab312d0c6f4bfc87a2ae467324f4e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 137; y: 197
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4704
-        hash: "d78ce756fc27055eeee15001419b7fb5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 146; y: 215
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4720
-        hash: "4f15a726939d7f489d1fe58ebb5bcd0a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 235
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 255
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4736
-        hash: "72184d71fd2fdc6786a43045db0be68f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 180; y: 274
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4752
-        hash: "3b3f3f34218bf238f310412cb8c4968d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 192; y: 293
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4768
-        hash: "24c00a7154471431d43b1db957ad6424"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 205; y: 316
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 221; y: 343
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4784
-        hash: "30081a33ab007ff2c7ba6cc293a5aec3"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 237; y: 371
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4800
-        image: "drag.4.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 253; y: 396
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4816
-        hash: "c0cadb7730838d553b146804c37506b0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 268; y: 419
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 276; y: 429
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 284; y: 438
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4832
-        hash: "101c007d0e2cf82331ba1cab4880e8a2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 291; y: 448
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4848
-        hash: "72e46df7427420c5e942a97831723d3f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 307; y: 468
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4864
-        hash: "4b7a009b46982a1e9e31250d7ebf0a20"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 323; y: 492
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 341; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4880
-        hash: "a3ba70933b6452fad0cdc4192e04be23"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 359; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4896
-        hash: "c2ee16182222b403f914eb5550ac6f91"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 378; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4912
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 397; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 416; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4928
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 432; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4944
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 445; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4960
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 456; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 466; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4976
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 475; y: 506
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4992
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 482; y: 505
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5008
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 488; y: 504
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 492; y: 503
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5024
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 496; y: 503
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5040
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 500; y: 502
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5056
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 507; y: 501
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5072
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 512; y: 500
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 516; y: 498
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5088
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 521; y: 494
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5104
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 525; y: 486
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5120
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 532; y: 472
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 542; y: 445
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5136
-        hash: "9356ce797d12ae076af947cd0e658551"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 553; y: 414
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5152
-        hash: "76a8d3b8465f08fdc4586c7766667eff"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 563; y: 389
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5168
-        hash: "569e56ba99776d03dd3140e53bc77f56"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 569; y: 373
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 573; y: 363
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5184
-        hash: "7139c72a2458685006da79d9cf11bc44"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 577; y: 354
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5200
-        hash: "a83d5ef213edec4c8f938ab04afb5c4f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 580; y: 344
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5216
-        hash: "5533602bc8a473c162966142d4bddebd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 584; y: 321
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 586; y: 301
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5232
-        hash: "7a79d6e31874428233e9c141d70522fd"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 588; y: 264
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5248
-        hash: "b14f4daeb25cd71baae36f4cec111813"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 591; y: 238
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5264
-        hash: "e2b2513d2918ffb85bab5fff5a8be644"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 592; y: 225
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 593; y: 216
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5280
-        hash: "af0cbb3423491917db1fdaa8350d48b0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 594; y: 209
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5296
-        hash: "b9c107f0a13ad37ae05b4d5f9e5f5442"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 594; y: 200
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5312
-        hash: "0bbc0c7a4a40ee6b19565c04c23b565d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 594; y: 182
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 593; y: 146
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5328
-        hash: "49494e8526a1417c151c7cac7099b9e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 590; y: 107
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5344
-        hash: "5e0839c4414cc8ddc5241c658fd3bf88"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 585; y: 80
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5360
-        hash: "8f061986df633c21dcad767ee857988c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 582; y: 67
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5376
-        hash: "d78c0a4fa0ccad407a565fab3a5c95b9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 579; y: 61
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 576; y: 57
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5392
-        hash: "cee6816f84911bc2262afe28d8996719"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 573; y: 55
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5408
-        hash: "2cc6cd514ef7299dd60bf1a735b81d36"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 569; y: 51
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5424
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 564; y: 44
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 557; y: 35
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5440
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 548; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5456
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 540; y: 14
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 532; y: 5
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5472
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 524; y: -1
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5488
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 517; y: -5
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5504
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 510; y: -9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5520
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 501; y: -14
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 492; y: -18
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5536
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 483; y: -21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5552
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 476; y: -21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5568
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 470; y: -19
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 464; y: -15
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5584
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 458; y: -9
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5600
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 452; y: -3
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5616
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 446; y: 4
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 439; y: 11
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5632
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 432; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5648
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 424; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5664
-        hash: "68c40f3551d7d10e61c5ffbb6948c7e6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 413; y: 42
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 400; y: 59
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5680
-        hash: "9bc8a652f43c0e3cae9492f5dff624e7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 392; y: 70
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 385; y: 79
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5696
-        hash: "5465128afe72d9618cd9abc47f4ce72f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 378; y: 88
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5712
-        hash: "ad739c2028caf8f89d8ae04d509c7854"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 366; y: 102
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 353; y: 114
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5728
-        hash: "97cd37f639a7bea76a2f68774c0753db"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 339; y: 126
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5744
-        hash: "d24fc8a57dd34e6ddb726426247ec219"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 324; y: 140
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5760
-        image: "drag.5.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 308; y: 158
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 288; y: 181
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5776
-        hash: "7af87eb80fa9d87fe8d8b5e4a2fff5e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 266; y: 208
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5792
-        hash: "73623f4a857fd4d5150c2eeef1341540"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 243; y: 237
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5808
-        hash: "076c4b60d9ec197950ade51e3f1be791"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 265
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 191; y: 291
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5824
-        hash: "22b7d7765c634763fa86912ea262efca"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 167; y: 314
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5840
-        hash: "1267c017931bda0b88b4672f46d499e0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 147; y: 331
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5856
-        hash: "b6a545e4c14b809f4ebcffbcb59a8e4f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 132; y: 344
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 121; y: 354
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5872
-        hash: "b1085cb508d4613c76e99bc879c62cbf"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 111; y: 363
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5888
-        hash: "365fd1260c2109e6d5bd0a97ce3a7e4e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 100; y: 370
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5904
-        hash: "3a7d001313b23cbbb7f3d842ab40f41b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 86; y: 377
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 66; y: 385
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5920
-        hash: "c5bda48bb2eaee54d6d8416592830327"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 45; y: 394
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5936
-        hash: "5d0fd6d8a6ced4f197fe3b09e7e9155b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 29; y: 402
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5952
-        hash: "79e2825f98644c061ae5216ae1823e4b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 16; y: 410
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 6; y: 417
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5968
-        hash: "22a3978f2f3a0cde67f459527af3b3f2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 0; y: 422
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 427
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5984
-        hash: "1511bec94911dd272f78a726e15bf76e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 432
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6000
-        hash: "0f892f7e570cdc703e492248c9f54b6c"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 439
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6016
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 447
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 452
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6032
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 457
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6048
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 459
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6064
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 464
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 465
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6080
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 467
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6096
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 468
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6112
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 468
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 468
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6128
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 468
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6144
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 468
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6160
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 469
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 470
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6176
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 470
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6192
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Frame {
-        msec: 6208
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 470
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6224
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -3; y: 470
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -3; y: 470
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6240
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -2; y: 470
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6256
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -1; y: 470
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6272
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -1; y: 468
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 0; y: 467
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6288
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 0; y: 464
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6304
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 0; y: 458
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6320
-        hash: "ec34aa6937d2c081bdf11660a5eb461a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -3; y: 441
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 408
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6336
-        hash: "58413f9b01f1e0b49519d8b6a3011607"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 366
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6352
-        hash: "b3992d2f9c1383c710ee325a94117a8b"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 327
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6368
-        hash: "bd415044fcf6218d8184cb0206105e65"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 300
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 288
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6384
-        hash: "e7296140fe8b28bed77e95e588c0e463"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 280
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6400
-        hash: "9ff532223ccccd663809187465e478c2"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 276
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6416
-        hash: "4de9ca75503db05df5d8274d75c202e5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 271
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 259
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6432
-        hash: "a83b5bc409207e986055081b4ed3faa6"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 227
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6448
-        hash: "7fdbd00dd3553241f30fd6568a8ab646"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 190
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6464
-        hash: "5ebaa67eaadc1ede8c46964fa1dffff1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -4; y: 169
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: -2; y: 160
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6480
-        hash: "de4bd9ad3cbb9bb19bf75f871b044072"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 1; y: 156
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6496
-        hash: "9d762cd4dd6508cf8b54c47b76f4ef37"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 5; y: 155
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6512
-        hash: "bdf17c384f4f824a89a06b88ba17c15f"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 10; y: 154
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 25; y: 152
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6528
-        hash: "f279f28995785afd143726aef7673b50"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 52; y: 149
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6544
-        hash: "53b6b82a61d017e12afb01a728d8d856"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 80; y: 148
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6560
-        hash: "9a48039175cab1360a0cf5cc195e2082"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 98; y: 148
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 112; y: 150
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6576
-        hash: "cfc3991e30eef6c2edb66cb6060b2bde"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 123; y: 153
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6592
-        hash: "737d8907f62768e623ba76866a509d1e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 134; y: 155
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6608
-        hash: "dea2a596f7d85f29728b33d126d997e5"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 145; y: 158
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 157; y: 161
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6624
-        hash: "3969a0bbb284ab1d5efd20cf93b0422d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 168; y: 164
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6640
-        hash: "071ff25e49f7f16a727ff58c42ff766e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 176; y: 169
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6656
-        hash: "454abec991a4675763f379c256919fa7"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 184; y: 173
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 189; y: 177
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6672
-        hash: "6de741c4e6057dc8580106155c4ac627"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 194; y: 184
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6688
-        hash: "e35853e99cd205b7ccabdf632b238584"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 199; y: 192
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6704
-        hash: "15a70a0196227c6bce50ed70cd6383c8"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 204; y: 201
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 211; y: 210
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6720
-        image: "drag.6.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 217; y: 217
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6736
-        hash: "5e951eb6017a060287e398fcaf4aeba9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 224; y: 223
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6752
-        hash: "ddd0f27027e23a45aef131296c781865"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 235; y: 228
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 246; y: 232
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6768
-        hash: "715102a252756e5a8c4f459d808aec6a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 257; y: 235
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6784
-        hash: "42b9c1b894247ddbd85f4a4aca5695f1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 267; y: 239
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6800
-        hash: "b67b4bdd412ed5160901803c60c6f19e"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 275; y: 239
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 280; y: 239
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6816
-        hash: "3490cc41c2b1f9301c209bdb8f052add"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 281; y: 239
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6832
-        hash: "df32868d564ebbc41c359409b5a69e7d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 282; y: 239
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6848
-        hash: "b9cb430a6f677e67c87322e0aff53fb1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 282; y: 239
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6864
-        hash: "b9cb430a6f677e67c87322e0aff53fb1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 281; y: 239
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6880
-        hash: "df32868d564ebbc41c359409b5a69e7d"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 280; y: 239
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6896
-        hash: "3490cc41c2b1f9301c209bdb8f052add"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 279; y: 240
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6912
-        hash: "e23a88f49a73cd2a9326095dd380ab55"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 277; y: 240
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6928
-        hash: "ffffc1aed27fe77c2fe5c035eab706a9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 277; y: 240
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6944
-        hash: "ffffc1aed27fe77c2fe5c035eab706a9"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 276; y: 240
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6960
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 1
-        x: 276; y: 240
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6976
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 6992
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 276; y: 240
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7008
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7024
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7040
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7056
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7072
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7088
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7104
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7120
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7136
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7152
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7168
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7184
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7200
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7216
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7232
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7248
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7264
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7280
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7296
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7312
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7328
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7344
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7360
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7376
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7392
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7408
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7424
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7440
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7456
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7472
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7488
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7504
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7520
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7536
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7552
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7568
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7584
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7600
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7616
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7632
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7648
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7664
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7680
-        image: "drag.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7712
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7728
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7744
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7760
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7776
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7792
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7808
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7824
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7840
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7856
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7872
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7888
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7904
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7920
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7936
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7952
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7968
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 7984
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-    Frame {
-        msec: 8000
-        hash: "2c1ce07ab6ce0072f6cb205f1e5297e0"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.0.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.0.png
deleted file mode 100644
index c249c21..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.1.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.1.png
deleted file mode 100644
index a96bf1b..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.10.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.10.png
deleted file mode 100644
index 7420ca7..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.10.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.11.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.11.png
deleted file mode 100644
index 7420ca7..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.11.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.12.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.12.png
deleted file mode 100644
index 7420ca7..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.12.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.13.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.13.png
deleted file mode 100644
index 7420ca7..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.13.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.14.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.14.png
deleted file mode 100644
index 7420ca7..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.14.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.15.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.15.png
deleted file mode 100644
index e797cc9..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.15.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.16.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.16.png
deleted file mode 100644
index 7951309..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.16.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.17.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.17.png
deleted file mode 100644
index 7951309..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.17.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.18.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.18.png
deleted file mode 100644
index 7951309..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.18.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.19.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.19.png
deleted file mode 100644
index 7951309..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.19.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.2.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.2.png
deleted file mode 100644
index a96bf1b..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.20.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.20.png
deleted file mode 100644
index 7951309..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.20.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.21.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.21.png
deleted file mode 100644
index 7951309..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.21.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.22.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.22.png
deleted file mode 100644
index 7951309..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.22.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.3.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.3.png
deleted file mode 100644
index a96bf1b..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.4.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.4.png
deleted file mode 100644
index 1fe365a..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.5.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.5.png
deleted file mode 100644
index 1fe365a..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.6.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.6.png
deleted file mode 100644
index 1fe365a..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.7.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.7.png
deleted file mode 100644
index 1fe365a..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.8.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.8.png
deleted file mode 100644
index 7420ca7..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.9.png b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.9.png
deleted file mode 100644
index 7420ca7..0000000
Binary files a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.9.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.qml b/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.qml
deleted file mode 100644
index cc374fd..0000000
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.qml
+++ /dev/null
@@ -1,5867 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 32
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 48
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 64
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 80
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 96
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 112
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 128
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 144
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 160
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 176
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 192
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 208
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 224
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 240
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 256
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 272
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 288
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 304
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 320
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 336
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 352
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 368
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 384
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 400
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 416
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 432
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 448
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 464
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 480
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 496
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 512
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 528
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 544
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 560
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 576
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 592
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 608
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 624
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 640
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 656
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 672
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 688
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 704
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 720
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 736
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 752
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 768
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 784
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 800
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 816
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 832
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 848
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 864
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 880
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 896
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 912
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 928
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 944
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 960
-        image: "mouseregion.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 992
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1008
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1024
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1040
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1056
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1072
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1088
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1104
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1120
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1136
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1152
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1168
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1184
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1200
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1216
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1232
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1248
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1264
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1280
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1296
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1312
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1328
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1344
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1360
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1376
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1392
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1408
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1424
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1440
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1456
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1472
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1488
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1504
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1520
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1536
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1552
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1568
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1584
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1600
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1616
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1632
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1648
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Frame {
-        msec: 1664
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 2; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 7; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1680
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 19; y: 40
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 33; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1696
-        hash: "1121bb51fc2d4c5c7ef3ae2c44794b49"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 49; y: 54
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1712
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 67; y: 56
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 74; y: 56
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1728
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 78; y: 57
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 81; y: 57
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1744
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 82; y: 56
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 55
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1760
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 54
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1776
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 53
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1792
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Frame {
-        msec: 1808
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Frame {
-        msec: 1824
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Frame {
-        msec: 1840
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Frame {
-        msec: 1856
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Frame {
-        msec: 1872
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 83; y: 52
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 82; y: 51
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1888
-        hash: "337f0f4af627bbdf8807135ce39d5070"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 80; y: 50
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 78; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1904
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 75; y: 46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 73; y: 45
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1920
-        image: "mouseregion.1.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 71; y: 43
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 68; y: 41
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1936
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 66; y: 40
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1952
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 64; y: 39
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 63; y: 37
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1968
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 61; y: 36
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 60; y: 36
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1984
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 58; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 33
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2000
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 56; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2016
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 55; y: 30
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 54; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2032
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2048
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2064
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2080
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2096
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2112
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2128
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 54; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2144
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2160
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2176
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2192
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2208
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2224
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2240
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 54; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2256
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2272
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2288
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2304
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2320
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2336
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2352
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2368
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2384
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2400
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2416
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2432
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2448
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2464
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2480
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2496
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2512
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2528
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2544
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2560
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2576
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2592
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2608
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2624
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2640
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 2
-        button: 2
-        buttons: 2
-        x: 54; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2656
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2672
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2688
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2704
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2720
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2736
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2752
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 3
-        button: 2
-        buttons: 0
-        x: 54; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2768
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2784
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2800
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2816
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2832
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2848
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2864
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 2880
-        image: "mouseregion.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 55; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 58; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2912
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 67; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2928
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 75; y: 30
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2944
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 91; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 99; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2960
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 107; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 113; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2976
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 119; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 124; y: 33
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 2992
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 128; y: 33
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 131; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3008
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 132; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 132; y: 31
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3024
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3040
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3056
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3072
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3088
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3104
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3120
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3136
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3152
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3168
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3184
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3200
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3216
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3232
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3248
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3264
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3280
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3296
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3312
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3328
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3344
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3360
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3376
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3392
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3408
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3424
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3440
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3456
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3472
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3488
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3504
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3520
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3536
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3552
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 133; y: 31
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3568
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3584
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 133; y: 31
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3600
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3616
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3632
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3648
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3664
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3680
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3696
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 133; y: 31
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3712
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3728
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3744
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3760
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3776
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3792
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3808
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3824
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3840
-        image: "mouseregion.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3872
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3888
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3904
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3920
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3936
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3952
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3968
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 3984
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4000
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4016
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4032
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4048
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4064
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4080
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4096
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4112
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4128
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4144
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4160
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4176
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4192
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4208
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4224
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4240
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4256
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4272
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4288
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4304
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4320
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 2
-        button: 2
-        buttons: 2
-        x: 133; y: 31
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4336
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4352
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4368
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4384
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4400
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4416
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Frame {
-        msec: 4432
-        hash: "73f1639b9e2164c7b974042934c0d151"
-    }
-    Mouse {
-        type: 3
-        button: 2
-        buttons: 0
-        x: 133; y: 31
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4448
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4464
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4480
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4496
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4512
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4528
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4544
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4560
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4576
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4592
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4608
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4624
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4640
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4656
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4672
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4688
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4704
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4720
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4736
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 133; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 136; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4752
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 142; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 148; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4768
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 155; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 161; y: 32
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4784
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 166; y: 31
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4800
-        image: "mouseregion.4.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 168; y: 31
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 170; y: 30
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4816
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 171; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4832
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4848
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4864
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 4880
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 172; y: 28
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 175; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4896
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 178; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4912
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 182; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 187; y: 22
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4928
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 191; y: 22
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 195; y: 21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4944
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 200; y: 21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 206; y: 21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4960
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 211; y: 21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 215; y: 21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4976
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 218; y: 21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 221; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 4992
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 224; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5008
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 225; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 226; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5024
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 227; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5040
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5056
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5072
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 228; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 229; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5088
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 231; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 232; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5104
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 233; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5120
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5136
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5152
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5168
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 233; y: 21
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 234; y: 22
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5184
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 237; y: 23
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5200
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 239; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 242; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5216
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 244; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 245; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5232
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 247; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5248
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5264
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5280
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5296
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5312
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5328
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5344
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5360
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5376
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5392
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5408
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5424
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5440
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5456
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5472
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5488
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5504
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5520
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5536
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5552
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5568
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5584
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5600
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5616
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5632
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5648
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5664
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5680
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5696
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5712
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5728
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5744
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5760
-        image: "mouseregion.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5792
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5808
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5824
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5840
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 247; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5856
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5872
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5888
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5904
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5920
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5936
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 247; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 5952
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5968
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 5984
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6000
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6016
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6032
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6048
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6064
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6080
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6096
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6112
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6128
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6144
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6160
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6176
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6192
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6208
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6224
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6240
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6256
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6272
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6288
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6304
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6320
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6336
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6352
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6368
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6384
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6400
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6416
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6432
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6448
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6464
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6480
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6496
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6512
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6528
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6544
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6560
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6576
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 247; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6592
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6608
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6624
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6640
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 247; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6656
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6672
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6688
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6704
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6720
-        image: "mouseregion.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 4
-        button: 1
-        buttons: 1
-        x: 247; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6752
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6768
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6784
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6800
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6816
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6832
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 247; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 6848
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6864
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6880
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6896
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6912
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6928
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6944
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6960
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6976
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 6992
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7008
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7024
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7040
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7056
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7072
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7088
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7104
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7120
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7136
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7152
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7168
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7184
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7200
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 247; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 7216
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7232
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7248
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7264
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7280
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7296
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7312
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7328
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7344
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7360
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7376
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7392
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7408
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7424
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7440
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7456
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7472
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7488
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7504
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7520
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7536
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7552
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7568
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7584
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7600
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7616
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7632
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7648
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7664
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7680
-        image: "mouseregion.7.png"
-    }
-    Frame {
-        msec: 7696
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7712
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7728
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7744
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7760
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7776
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7792
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7808
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7824
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7840
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7856
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7872
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7888
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7904
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7920
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7936
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7952
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7968
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 7984
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 8000
-        hash: "12edb0902e4d480c9052b00edc1a0a42"
-    }
-    Frame {
-        msec: 8016
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8032
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8048
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8064
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8080
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8096
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8112
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8128
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8144
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8160
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8176
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8192
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8208
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8224
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8240
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8256
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8272
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8288
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8304
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8320
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8336
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 247; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8352
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8368
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8384
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8400
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8416
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8432
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8448
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8464
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8480
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8496
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8512
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8528
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 248; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8544
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 254; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 259; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8560
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 264; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 268; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8576
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 273; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 277; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8592
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 281; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 284; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8608
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 287; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 289; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8624
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 292; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8640
-        image: "mouseregion.8.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 294; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 295; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8656
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 297; y: 24
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 299; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8672
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 301; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 304; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8688
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 307; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8704
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 310; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 312; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8720
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 314; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 315; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8736
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 317; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 318; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8752
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 319; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8768
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 320; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8784
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 322; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 323; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8800
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 325; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 327; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8816
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 330; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 333; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8832
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 336; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 338; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8848
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 339; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8864
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 340; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8880
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 8896
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 340; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 8912
-        hash: "d1f2fc2133f3d6554e41982196662c2a"
-    }
-    Frame {
-        msec: 8928
-        hash: "d1f2fc2133f3d6554e41982196662c2a"
-    }
-    Frame {
-        msec: 8944
-        hash: "d1f2fc2133f3d6554e41982196662c2a"
-    }
-    Frame {
-        msec: 8960
-        hash: "d1f2fc2133f3d6554e41982196662c2a"
-    }
-    Frame {
-        msec: 8976
-        hash: "d1f2fc2133f3d6554e41982196662c2a"
-    }
-    Frame {
-        msec: 8992
-        hash: "d1f2fc2133f3d6554e41982196662c2a"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 340; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9008
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9024
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9040
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9056
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9072
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9088
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9104
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9120
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9136
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9152
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9168
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9184
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9200
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9216
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9232
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9248
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9264
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9280
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9296
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9312
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9328
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9344
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9360
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9376
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9392
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9408
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9424
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9440
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9456
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9472
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9488
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9504
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9520
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9536
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9552
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9568
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9584
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 9600
-        image: "mouseregion.9.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 339; y: 26
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9616
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 336; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9632
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 332; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 326; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9648
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 320; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 312; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9664
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 292; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 283; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9680
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 261; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9696
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 252; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 243; y: 25
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9712
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 225; y: 29
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 207; y: 33
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9728
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 189; y: 35
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 169; y: 39
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9744
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 161; y: 40
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 145; y: 44
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9760
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 138; y: 45
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9776
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 133; y: 48
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 127; y: 50
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9792
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 122; y: 52
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 118; y: 56
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9808
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 114; y: 57
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 110; y: 60
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9824
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 109; y: 61
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9840
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 107; y: 62
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 106; y: 63
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9856
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 103; y: 63
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 100; y: 64
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9872
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 64
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 92; y: 65
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9888
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 88; y: 65
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9904
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 85; y: 66
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 82; y: 67
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9920
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 79; y: 69
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 77; y: 70
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9936
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 74; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 70; y: 72
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9952
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 67; y: 74
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 64; y: 75
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9968
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 9984
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 61; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 60; y: 77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10000
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10016
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10032
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 59; y: 77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10048
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 58; y: 77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 77
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10064
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 56; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10080
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10096
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10112
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10128
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10144
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10160
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10176
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10192
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10208
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10224
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Frame {
-        msec: 10240
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 57; y: 76
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 59; y: 75
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10256
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 62; y: 75
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10272
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 65; y: 74
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 69; y: 74
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10288
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 72; y: 73
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 76; y: 73
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10304
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 80; y: 72
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 84; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10320
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 87; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 90; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10336
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 93; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10352
-        hash: "6627c7a1a4da7e642f4b4b24ca5e8e7a"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 96; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 99; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10368
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 102; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 106; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10384
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 108; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 110; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10400
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 113; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 115; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10416
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 118; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 121; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10432
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 123; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10448
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 126; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 128; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10464
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 130; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 132; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10480
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 133; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10496
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 134; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10512
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10528
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 135; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 136; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10544
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 137; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 138; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10560
-        image: "mouseregion.10.png"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 140; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 10576
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10592
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10608
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10624
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10640
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10656
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10672
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10688
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10704
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10720
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10736
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10752
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10768
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10784
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10800
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10816
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10832
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10848
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10864
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10880
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10896
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10912
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10928
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10944
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10960
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10976
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 10992
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11008
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11024
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11040
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11056
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11072
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11088
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11104
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11120
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11136
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11152
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11168
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11184
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11200
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11216
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11232
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11248
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11264
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11280
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11296
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11312
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11328
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11344
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11360
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11376
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11392
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11408
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11424
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11440
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11456
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11472
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11488
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11504
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11520
-        image: "mouseregion.11.png"
-    }
-    Frame {
-        msec: 11536
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11552
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11568
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11584
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11600
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11616
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11632
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11648
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11664
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11680
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11696
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11712
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 2
-        button: 2
-        buttons: 2
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11728
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11744
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11760
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11776
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11792
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11808
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11824
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 2
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 11840
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11856
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11872
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11888
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11904
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11920
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11936
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11952
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11968
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 11984
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12000
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12016
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12032
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12048
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 4
-        button: 2
-        buttons: 2
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12064
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12080
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12096
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12112
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12128
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12144
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12160
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12176
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12192
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12208
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 2
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12224
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12240
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12256
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12272
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12288
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12304
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12320
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12336
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12352
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12368
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12384
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12400
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12416
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12432
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12448
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 2
-        button: 2
-        buttons: 3
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12464
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12480
-        image: "mouseregion.12.png"
-    }
-    Frame {
-        msec: 12496
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12512
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12528
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 2
-        buttons: 1
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12544
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12560
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12576
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12592
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12608
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12624
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12640
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12656
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12672
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12688
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12704
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12720
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12736
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12752
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12768
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12784
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12800
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12816
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12832
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 4
-        button: 1
-        buttons: 1
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12848
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12864
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12880
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12896
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12912
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12928
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12944
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12960
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 12976
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 12992
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13008
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13024
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13040
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13056
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13072
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13088
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 4
-        button: 1
-        buttons: 1
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13104
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13120
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13136
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13152
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13168
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13184
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13200
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13216
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13232
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13248
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13264
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13280
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13296
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13312
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13328
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13344
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13360
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13376
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13392
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13408
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13424
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13440
-        image: "mouseregion.13.png"
-    }
-    Frame {
-        msec: 13456
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13472
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13488
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13504
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13520
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13536
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13552
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13568
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13584
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13600
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13616
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13632
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 2
-        button: 2
-        buttons: 2
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13648
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13664
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13680
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13696
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13712
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 2
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13728
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13744
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13760
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13776
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13792
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13808
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 4
-        button: 2
-        buttons: 2
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13824
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13840
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13856
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13872
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13888
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13904
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 3
-        button: 2
-        buttons: 0
-        x: 141; y: 71
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 13920
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13936
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13952
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13968
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 13984
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14000
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14016
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14032
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14048
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14064
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14080
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14096
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14112
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14128
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14144
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14160
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14176
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 141; y: 70
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 148; y: 68
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14192
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 152; y: 68
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 158; y: 68
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14208
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 164; y: 68
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14224
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 171; y: 66
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 187; y: 62
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 205; y: 60
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14240
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 223; y: 56
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14256
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 239; y: 52
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 255; y: 46
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14272
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 269; y: 40
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 285; y: 34
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14288
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 299; y: 28
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 313; y: 20
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14304
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 320; y: 18
-        modifiers: 0
-        sendToViewport: true
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 326; y: 15
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14320
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Mouse {
-        type: 5
-        button: 0
-        buttons: 0
-        x: 340; y: 7
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 14336
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14352
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14368
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14384
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14400
-        image: "mouseregion.14.png"
-    }
-    Frame {
-        msec: 14416
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14432
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14448
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14464
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14480
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14496
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14512
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14528
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14544
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14560
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14576
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14592
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14608
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14624
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14640
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14656
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14672
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14688
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14704
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14720
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14736
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14752
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14768
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14784
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14800
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14816
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14832
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14848
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14864
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14880
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14896
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14912
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-    Frame {
-        msec: 14928
-        hash: "194ebac4ae7d95bf427f8161885a13e1"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlmouseregion/drag.qml b/tests/auto/declarative/visual/qmlmouseregion/drag.qml
deleted file mode 100644
index dbb2a24..0000000
--- a/tests/auto/declarative/visual/qmlmouseregion/drag.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.6
-
-Rectangle{
-    width:400
-    height:440
-    color: "white"
-    Rectangle{
-        id: draggable
-        width:40; height:40; color: "lightsteelblue"
-            y:20
-        MouseArea{
-            anchors.fill: parent
-            drag.target: draggable
-            drag.axis: "XandYAxis"
-            drag.minimumX: 0
-            drag.maximumX: 360
-            drag.minimumY: 20
-            drag.maximumY: 400
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml b/tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml
deleted file mode 100644
index 3c722d0..0000000
--- a/tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml
+++ /dev/null
@@ -1,124 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: root
-    width: 400
-    height: 100
-
-    // Left click on me
-    Rectangle {
-        width: 98; height: 48
-        color: "red"
-        MouseArea {
-            id: mr1
-            anchors.fill: parent
-            enabled: false
-            onClicked: { parent.color = "blue"; root.error = "mr1 should ignore presses"; }
-        }
-    }
-
-    // Left click, then right click
-    Rectangle {
-        x: 100
-        width: 98; height: 48
-        color: "red"
-        MouseArea {
-            id: mr2
-            anchors.fill: parent
-            acceptedButtons: Qt.RightButton
-            onClicked: {
-                if (mouse.button == Qt.RightButton) {
-                    parent.color = "blue";
-                } else {
-                    parent.color = "green";
-                    root.error = "mr1 should ignore presses";
-                }
-            }
-        }
-    }
-
-    // press and hold me
-    Rectangle {
-        x: 200
-        width: 98; height: 48
-        color: "red"
-        MouseArea {
-            id: mr3
-            anchors.fill: parent
-            onPressAndHold: {
-                parent.color = "blue";
-            }
-        }
-    }
-
-    // click me
-    Rectangle {
-        x: 300
-        width: 98; height: 48
-        color: "red"
-        MouseArea {
-            id: mr4
-            anchors.fill: parent
-            onPressed: {
-                parent.color = "blue";
-            }
-            onReleased: {
-                parent.color = "red";
-            }
-        }
-    }
-
-    // move into and out of me
-    Rectangle {
-        x: 0
-        y: 50
-        width: 98; height: 48
-        color: "red"
-        MouseArea {
-            id: mr5
-            anchors.fill: parent
-            hoverEnabled: true
-            onEntered: {
-                parent.color = "blue";
-            }
-            onExited: {
-                parent.color = "green";
-            }
-        }
-    }
-
-    // click, then double click me
-    Rectangle {
-        x: 100
-        y: 50
-        width: 98; height: 48
-        color: "red"
-        MouseArea {
-            id: mr6
-            anchors.fill: parent
-            onClicked: {
-                parent.color = "blue";
-            }
-            onDoubleClicked: {
-                parent.color = "green";
-            }
-        }
-    }
-
-    // click, then double click me - nothing should happen
-    Rectangle {
-        x: 100
-        y: 50
-        width: 98; height: 48
-        color: "red"
-        MouseArea {
-            id: mr7
-            anchors.fill: parent
-            enabled: false
-            onClicked: { parent.color = "blue" }
-            onPressed: { parent.color = "yellow" }
-            onReleased: { parent.color = "cyan" }
-            onDoubleClicked: { parent.color = "green" }
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlspringfollow/clock.qml b/tests/auto/declarative/visual/qmlspringfollow/clock.qml
deleted file mode 100644
index 04bbabc..0000000
--- a/tests/auto/declarative/visual/qmlspringfollow/clock.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: clock
-    color: "gray"
-    width: 200; height: 200
-
-    property var hours: 10
-    property var minutes: 28
-    property var seconds: 0
-
-    Timer {
-        interval: 1000; running: true; repeat: true; triggeredOnStart: true
-        onTriggered: seconds++
-    }
-
-    Image { id: background; source: "content/clock.png" }
-
-    Image {
-        x: 92.5; y: 27
-        source: "content/hour.png"
-        smooth: true
-        transform: Rotation {
-            id: hourRotation
-            origin.x: 7.5; origin.y: 73; angle: 0
-            angle: SpringFollow {
-                spring: 2; damping: 0.2; modulus: 360
-                source: (clock.hours * 30) + (clock.minutes * 0.5)
-            }
-        }
-    }
-
-    Image {
-        x: 93.5; y: 17
-        source: "content/minute.png"
-        smooth: true
-        transform: Rotation {
-            id: minuteRotation
-            origin.x: 6.5; origin.y: 83; angle: 0
-            angle: SpringFollow {
-                spring: 2; damping: 0.2; modulus: 360
-                source: clock.minutes * 6
-            }
-        }
-    }
-
-    Image {
-        x: 97.5; y: 20
-        source: "content/second.png"
-        smooth: true
-        transform: Rotation {
-            id: secondRotation
-            origin.x: 2.5; origin.y: 80; angle: 0
-            angle: SpringFollow {
-                spring: 5; damping: 0.25; modulus: 360
-                source: clock.seconds * 6
-            }
-        }
-    }
-
-    Image {
-        anchors.centerIn: background; source: "content/center.png"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/background.png b/tests/auto/declarative/visual/qmlspringfollow/content/background.png
deleted file mode 100644
index a885950..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/content/background.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/center.png b/tests/auto/declarative/visual/qmlspringfollow/content/center.png
deleted file mode 100755
index 7fbd802..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/content/center.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/clock.png b/tests/auto/declarative/visual/qmlspringfollow/content/clock.png
deleted file mode 100755
index 462edac..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/content/clock.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/hour.png b/tests/auto/declarative/visual/qmlspringfollow/content/hour.png
deleted file mode 100755
index f8061a1..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/content/hour.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/minute.png b/tests/auto/declarative/visual/qmlspringfollow/content/minute.png
deleted file mode 100755
index 1297ec7..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/content/minute.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/second.png b/tests/auto/declarative/visual/qmlspringfollow/content/second.png
deleted file mode 100755
index 4aa9fb5..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/content/second.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.0.png b/tests/auto/declarative/visual/qmlspringfollow/data/clock.0.png
deleted file mode 100644
index baf1d45..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/clock.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.1.png b/tests/auto/declarative/visual/qmlspringfollow/data/clock.1.png
deleted file mode 100644
index 932f63f..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/clock.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.2.png b/tests/auto/declarative/visual/qmlspringfollow/data/clock.2.png
deleted file mode 100644
index a5cb437..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/clock.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.3.png b/tests/auto/declarative/visual/qmlspringfollow/data/clock.3.png
deleted file mode 100644
index 62e895c..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/clock.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.qml b/tests/auto/declarative/visual/qmlspringfollow/data/clock.qml
deleted file mode 100644
index ffc6a5e..0000000
--- a/tests/auto/declarative/visual/qmlspringfollow/data/clock.qml
+++ /dev/null
@@ -1,1135 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "d17c9cd015b065adf7e36ad0d4f6c00c"
-    }
-    Frame {
-        msec: 32
-        hash: "e759f652c69a06d01837302cc0369a58"
-    }
-    Frame {
-        msec: 48
-        hash: "392855ef490903121fb894858961dfb0"
-    }
-    Frame {
-        msec: 64
-        hash: "5ba4248f606a3a35d840cb98eff30b46"
-    }
-    Frame {
-        msec: 80
-        hash: "3b97e1ab4054c20d19c1d05f795b71de"
-    }
-    Frame {
-        msec: 96
-        hash: "81904d248125cf35249f79da7e94d8d7"
-    }
-    Frame {
-        msec: 112
-        hash: "474179152aad4b64904c8b7c63581a89"
-    }
-    Frame {
-        msec: 128
-        hash: "583a7906d1dc41d8ce8d0c8f28c9b8c5"
-    }
-    Frame {
-        msec: 144
-        hash: "341437083f858e2dca36a8bb39559a1e"
-    }
-    Frame {
-        msec: 160
-        hash: "ed75a933c176ed6ac3fa5b2986cbfade"
-    }
-    Frame {
-        msec: 176
-        hash: "5494c10d3984a9be607b8b5ee659ebfc"
-    }
-    Frame {
-        msec: 192
-        hash: "7af8dfca43036ee69012cbb100d110ad"
-    }
-    Frame {
-        msec: 208
-        hash: "356b8185889e560b5a1a2d6436dac834"
-    }
-    Frame {
-        msec: 224
-        hash: "f601a66de5dc1a388e515ba4ff14be6e"
-    }
-    Frame {
-        msec: 240
-        hash: "4cfb9f3a72070533288b2e50820cbbbd"
-    }
-    Frame {
-        msec: 256
-        hash: "ddcb670af0806dadf5897bcd3fd65cd7"
-    }
-    Frame {
-        msec: 272
-        hash: "3fedf4aa340d7632359273b1eb71c5a3"
-    }
-    Frame {
-        msec: 288
-        hash: "3dab7e1eaccb68b14e30741775db6ff7"
-    }
-    Frame {
-        msec: 304
-        hash: "015ab6c080c2ffab8ac763681bf3f95c"
-    }
-    Frame {
-        msec: 320
-        hash: "74f438510f0d8f64120cc45bca7f4f5d"
-    }
-    Frame {
-        msec: 336
-        hash: "e57666fb224cdbf869e5be4ef3391be9"
-    }
-    Frame {
-        msec: 352
-        hash: "ff8b3dddd4d10b111b38801470fcbfd0"
-    }
-    Frame {
-        msec: 368
-        hash: "e547ee9f1e509d5db980cb91fce5f6ee"
-    }
-    Frame {
-        msec: 384
-        hash: "aaa9fb71bd47ad3a1c753d7ac918e399"
-    }
-    Frame {
-        msec: 400
-        hash: "54a335aac86669138730c0735ea99c8b"
-    }
-    Frame {
-        msec: 416
-        hash: "ff8f30aaa7afd8abfdd147b830e9d6c4"
-    }
-    Frame {
-        msec: 432
-        hash: "07f8fca270953cf815cb0e77534da824"
-    }
-    Frame {
-        msec: 448
-        hash: "30799c12182b2c3eb2f28b05d81ed6fc"
-    }
-    Frame {
-        msec: 464
-        hash: "6244e3b740218aec56c81c92dc57abcb"
-    }
-    Frame {
-        msec: 480
-        hash: "cb10a34e3d234043704e633b49184607"
-    }
-    Frame {
-        msec: 496
-        hash: "66de73779b5f86a6a1692eb74be24201"
-    }
-    Frame {
-        msec: 512
-        hash: "4c4c0b5e75f0f587ace8002720d78309"
-    }
-    Frame {
-        msec: 528
-        hash: "88c774ec272c72457b35b60306c2bc21"
-    }
-    Frame {
-        msec: 544
-        hash: "28ce64adc1d35d6bc34174765beda553"
-    }
-    Frame {
-        msec: 560
-        hash: "37238c3d6dc0c34bf4e00ba2a82ce3aa"
-    }
-    Frame {
-        msec: 576
-        hash: "d14dd306fec80f1a1ff9a85aa51b9a57"
-    }
-    Frame {
-        msec: 592
-        hash: "bfa2ec6fa546c75ee85e2ebeb3af8e3c"
-    }
-    Frame {
-        msec: 608
-        hash: "d1ec3faab47065f34e9397fd73f9edce"
-    }
-    Frame {
-        msec: 624
-        hash: "0b59b5dba365fff38872b520afc84edb"
-    }
-    Frame {
-        msec: 640
-        hash: "3c4ae01b5e878b85a2eea403f3ad478a"
-    }
-    Frame {
-        msec: 656
-        hash: "329111f7079230e8b3cfda1217e8fcdf"
-    }
-    Frame {
-        msec: 672
-        hash: "97761329ac9ba03ec41e3d5b35f245df"
-    }
-    Frame {
-        msec: 688
-        hash: "9d26e3a3357530e903ee89f7bf439357"
-    }
-    Frame {
-        msec: 704
-        hash: "1cf4c130ea3565547ff74280211f10c9"
-    }
-    Frame {
-        msec: 720
-        hash: "d60284711cb557b1dab4d27072c95597"
-    }
-    Frame {
-        msec: 736
-        hash: "98195e02405ee26c0a6a3177cebe9eaa"
-    }
-    Frame {
-        msec: 752
-        hash: "f0a776c39363e340ebfb7736f368f609"
-    }
-    Frame {
-        msec: 768
-        hash: "5a146b4b76f93e3064d5dfa13107b1c3"
-    }
-    Frame {
-        msec: 784
-        hash: "7f7fef3a7ff2047f598bfca0fc7d5935"
-    }
-    Frame {
-        msec: 800
-        hash: "85a2fd48605f8a77764bf96542db14c3"
-    }
-    Frame {
-        msec: 816
-        hash: "89bdc99d16e6605e2106dfa5f53d7c8e"
-    }
-    Frame {
-        msec: 832
-        hash: "d03754d56d85508b7c77959d1ab7b34a"
-    }
-    Frame {
-        msec: 848
-        hash: "8d330472a376b47d65cec0b8e3df25cb"
-    }
-    Frame {
-        msec: 864
-        hash: "401adaeecfd2c0a5598194e9ead4dd5d"
-    }
-    Frame {
-        msec: 880
-        hash: "5c600e940e0a01fec15505fba595df3d"
-    }
-    Frame {
-        msec: 896
-        hash: "b7940b041fbd3df5e6969130bf97da10"
-    }
-    Frame {
-        msec: 912
-        hash: "62314bb115c307eeff4c4c7c91ee74a2"
-    }
-    Frame {
-        msec: 928
-        hash: "54745a8a7ed96a4d5e2d4ec2de605882"
-    }
-    Frame {
-        msec: 944
-        hash: "a4145b63f59d060ac0e0dc32dd22c815"
-    }
-    Frame {
-        msec: 960
-        image: "clock.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "c420b1298329c7eb0d3ec6a90a7eb802"
-    }
-    Frame {
-        msec: 992
-        hash: "e63a5384cde6287c3cd8bdb823f35dca"
-    }
-    Frame {
-        msec: 1008
-        hash: "af708b5e4a2a706385afd43896eeff16"
-    }
-    Frame {
-        msec: 1024
-        hash: "32011e16d4b1c14619820ade020f6416"
-    }
-    Frame {
-        msec: 1040
-        hash: "fbf9f8f075b15922f7306e469075d3cf"
-    }
-    Frame {
-        msec: 1056
-        hash: "bf0fab116eae6e7fb5b3209220a3a52a"
-    }
-    Frame {
-        msec: 1072
-        hash: "7a21aee4bcb99feb12a2a2c6bb3fd893"
-    }
-    Frame {
-        msec: 1088
-        hash: "d721462af9c94e13f12374b2590dad1e"
-    }
-    Frame {
-        msec: 1104
-        hash: "70385b585c2cbf1b2d64f1b9ebb5fb56"
-    }
-    Frame {
-        msec: 1120
-        hash: "fc7adc3dd2f42bfe6cd74c2ee1ea9aa8"
-    }
-    Frame {
-        msec: 1136
-        hash: "232884da74c9843d1349e82a7300cc19"
-    }
-    Frame {
-        msec: 1152
-        hash: "c6790d9c8cbea7bf97cbedf443da330c"
-    }
-    Frame {
-        msec: 1168
-        hash: "1847875f98555ef46a103c107bd5bc37"
-    }
-    Frame {
-        msec: 1184
-        hash: "d7b35992b44a0220bd83a00b7f75dcdd"
-    }
-    Frame {
-        msec: 1200
-        hash: "fc9e1db602c34863088d82ed8f601364"
-    }
-    Frame {
-        msec: 1216
-        hash: "404e2d071f8a6409ba6c6bfd8450693c"
-    }
-    Frame {
-        msec: 1232
-        hash: "dc2b6be9bc4c32460797e94ec617406c"
-    }
-    Frame {
-        msec: 1248
-        hash: "5077b6afd808f7a2c319e66f0aef3002"
-    }
-    Frame {
-        msec: 1264
-        hash: "07f07a04ec7c864196faeb44eff65b4c"
-    }
-    Frame {
-        msec: 1280
-        hash: "5d9089a68ef0b8b78b68c33d3082b597"
-    }
-    Frame {
-        msec: 1296
-        hash: "d955c9f66eaf123351a19947240e8847"
-    }
-    Frame {
-        msec: 1312
-        hash: "f1821cbcb3883a041f22a114f7158532"
-    }
-    Frame {
-        msec: 1328
-        hash: "77f17db09c5a7125c42359c304f274de"
-    }
-    Frame {
-        msec: 1344
-        hash: "bc38a4c859f596f6cf3c399d3a04b1cd"
-    }
-    Frame {
-        msec: 1360
-        hash: "982c43a4a1c9fae8bf3980b5885cee2f"
-    }
-    Frame {
-        msec: 1376
-        hash: "c15bb9b7dd77d505ee9918eb36b75c31"
-    }
-    Frame {
-        msec: 1392
-        hash: "bda534fd941a6f8289bfbec9b8dde717"
-    }
-    Frame {
-        msec: 1408
-        hash: "7ad5c54b481525ace42ae8926a5c0556"
-    }
-    Frame {
-        msec: 1424
-        hash: "2399778158f63481eb8514245277b917"
-    }
-    Frame {
-        msec: 1440
-        hash: "6c200d090b34a0152c7eb233c97c3886"
-    }
-    Frame {
-        msec: 1456
-        hash: "7ba4500e81df31e3e2c5d165bacf771a"
-    }
-    Frame {
-        msec: 1472
-        hash: "c7e13f3d9bdfe35eb905c1d4ed6b73ac"
-    }
-    Frame {
-        msec: 1488
-        hash: "808b72766f5dce71fc983ffa01945665"
-    }
-    Frame {
-        msec: 1504
-        hash: "899ac513755476db1e1304317524a755"
-    }
-    Frame {
-        msec: 1520
-        hash: "27190dce033171966981672e52f07107"
-    }
-    Frame {
-        msec: 1536
-        hash: "5d9ef583b6b3cb5257cb044cf376eff2"
-    }
-    Frame {
-        msec: 1552
-        hash: "77b648fe26a942b246eec0fa018ad86f"
-    }
-    Frame {
-        msec: 1568
-        hash: "744a61493816338113ba4ba7c05f76de"
-    }
-    Frame {
-        msec: 1584
-        hash: "2eb0da64d5937c1a38754fd55ca684d0"
-    }
-    Frame {
-        msec: 1600
-        hash: "6f799c2c0c0e1ed419af03f8bbb9fae1"
-    }
-    Frame {
-        msec: 1616
-        hash: "5b84344f31d5e4d15be6b53ad3bf9c84"
-    }
-    Frame {
-        msec: 1632
-        hash: "997b5967e3e3a35d02f10e1eae417dbf"
-    }
-    Frame {
-        msec: 1648
-        hash: "c522369c836e8d08c56e2e332dd005ac"
-    }
-    Frame {
-        msec: 1664
-        hash: "22f4072da05d261cfcca232ea54d2cb4"
-    }
-    Frame {
-        msec: 1680
-        hash: "7081a90c33785306800b7a57a4a9a75c"
-    }
-    Frame {
-        msec: 1696
-        hash: "32a8bea14c92ce61ede89182765f0759"
-    }
-    Frame {
-        msec: 1712
-        hash: "4bafe476d5301974c616311073763ab4"
-    }
-    Frame {
-        msec: 1728
-        hash: "291188ca795d455ae293437c2fb2303d"
-    }
-    Frame {
-        msec: 1744
-        hash: "99d2658f863c82dd71fde0f0b93b4d62"
-    }
-    Frame {
-        msec: 1760
-        hash: "8a7183e11fde2846d5435847ad9add45"
-    }
-    Frame {
-        msec: 1776
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1792
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1808
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1824
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1840
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1856
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1872
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1888
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1904
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1920
-        image: "clock.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1952
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1968
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 1984
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 2000
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 2016
-        hash: "34b6180b74f0653ce1f18c22022d333f"
-    }
-    Frame {
-        msec: 2032
-        hash: "150f511972394d8485979a6d9badcee5"
-    }
-    Frame {
-        msec: 2048
-        hash: "50b420f72479ec613fd443b5faa3cb94"
-    }
-    Frame {
-        msec: 2064
-        hash: "a51cbeea7ad5407b2784a3a3c8ca1ecf"
-    }
-    Frame {
-        msec: 2080
-        hash: "0f658f4c91f890cd252d0f9d9bbe064d"
-    }
-    Frame {
-        msec: 2096
-        hash: "c814c99815a91547eff01dc899c275f2"
-    }
-    Frame {
-        msec: 2112
-        hash: "f9dac59029008e52efe4225cf919f013"
-    }
-    Frame {
-        msec: 2128
-        hash: "b87bdcf09b425f2b2d6aed65f96ae8a3"
-    }
-    Frame {
-        msec: 2144
-        hash: "f353bf64e664166a542aa027dc625529"
-    }
-    Frame {
-        msec: 2160
-        hash: "12492b26c2f1c018e034c0fa936fa7b5"
-    }
-    Frame {
-        msec: 2176
-        hash: "33f04d25bced580f15590f12ddafef62"
-    }
-    Frame {
-        msec: 2192
-        hash: "cdd8ee656e4fec3ac6e72b6f7626de3b"
-    }
-    Frame {
-        msec: 2208
-        hash: "22a94ea46fb9ee78830eab79e4adc5c5"
-    }
-    Frame {
-        msec: 2224
-        hash: "64a10c9d4738c004c7f08f95b48a7a4d"
-    }
-    Frame {
-        msec: 2240
-        hash: "ff3300fb49a735e0a958362aead1905f"
-    }
-    Frame {
-        msec: 2256
-        hash: "8289dfdad12a8c13513175e5aad6a2d9"
-    }
-    Frame {
-        msec: 2272
-        hash: "49e5cbb94f7d8bc853ca3c9366d737c9"
-    }
-    Frame {
-        msec: 2288
-        hash: "76d2d8df4ad0359bb8ae102b225b3a68"
-    }
-    Frame {
-        msec: 2304
-        hash: "98d925b3306aa7dd1b1fb9e066cd8a02"
-    }
-    Frame {
-        msec: 2320
-        hash: "3911b53eb0346af1773ad991232e61ee"
-    }
-    Frame {
-        msec: 2336
-        hash: "8991c10234f9f286ebab39d72729525d"
-    }
-    Frame {
-        msec: 2352
-        hash: "ca2c8c6f23b30957a5cc20d9750a3ffe"
-    }
-    Frame {
-        msec: 2368
-        hash: "80abe9b146b31dbedf1fe2357d922dda"
-    }
-    Frame {
-        msec: 2384
-        hash: "0e34091d6bceab00bdabcec78e99e265"
-    }
-    Frame {
-        msec: 2400
-        hash: "ba04053c25e53b3dc790feac9a33e221"
-    }
-    Frame {
-        msec: 2416
-        hash: "cb6f7f2cce4f68ef1d35f765e00bbf7b"
-    }
-    Frame {
-        msec: 2432
-        hash: "1e63fb94f5fbf3b600ec9298cbb97c8a"
-    }
-    Frame {
-        msec: 2448
-        hash: "8991c10234f9f286ebab39d72729525d"
-    }
-    Frame {
-        msec: 2464
-        hash: "00531d4a5fe98bbb487ad835414e7d07"
-    }
-    Frame {
-        msec: 2480
-        hash: "7af9f861cb57c937c87b24eee9fbb558"
-    }
-    Frame {
-        msec: 2496
-        hash: "7ecd1a4a75753e70ad5937e5bc897e03"
-    }
-    Frame {
-        msec: 2512
-        hash: "557766fe964033f6a488574af7306cac"
-    }
-    Frame {
-        msec: 2528
-        hash: "bd0f7164dd0a84ce1a1b2a6acbc2157b"
-    }
-    Frame {
-        msec: 2544
-        hash: "d24ef664cf13519b99d6193bf98fcfd1"
-    }
-    Frame {
-        msec: 2560
-        hash: "6c3626248bbb41cab85ec2a908b7874b"
-    }
-    Frame {
-        msec: 2576
-        hash: "0f9bea8d474690164a09dfd3b13ff80b"
-    }
-    Frame {
-        msec: 2592
-        hash: "e5197674c91de893a970614e650547e5"
-    }
-    Frame {
-        msec: 2608
-        hash: "ce6861e9a7e75b809df026f078c8516b"
-    }
-    Frame {
-        msec: 2624
-        hash: "eb0539e30fd53fb905d7b28ff0bc6cfd"
-    }
-    Frame {
-        msec: 2640
-        hash: "45f70dda0d647119175457fb4d451e85"
-    }
-    Frame {
-        msec: 2656
-        hash: "ca6b75fa4ee612bf6bb1776ef4115b16"
-    }
-    Frame {
-        msec: 2672
-        hash: "c7d6bd687be6d5476300539411b97fc5"
-    }
-    Frame {
-        msec: 2688
-        hash: "27da9137b936d813d3c79a873053ed38"
-    }
-    Frame {
-        msec: 2704
-        hash: "4389a5758bf9df9553300c074aa7bb36"
-    }
-    Frame {
-        msec: 2720
-        hash: "30476b70a29716b359a046f99b6387e5"
-    }
-    Frame {
-        msec: 2736
-        hash: "b91c6f1e57d718e95ab05d1f386aedb9"
-    }
-    Frame {
-        msec: 2752
-        hash: "578b022173dcac39d227ffeb043e53d0"
-    }
-    Frame {
-        msec: 2768
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2784
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2800
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2816
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2832
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2848
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2864
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2880
-        image: "clock.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2912
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2928
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2944
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2960
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2976
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 2992
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 3008
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 3024
-        hash: "fe8ffe202a5f58b184a65d0ebc9c5f32"
-    }
-    Frame {
-        msec: 3040
-        hash: "294d542f880356b4cbb171170c28dcd7"
-    }
-    Frame {
-        msec: 3056
-        hash: "946b5937974e28ffd996ce132c8fad15"
-    }
-    Frame {
-        msec: 3072
-        hash: "bb61994ff1dc36d3933084b874073832"
-    }
-    Frame {
-        msec: 3088
-        hash: "ec337c7ae77deeb41f38adb1851720e5"
-    }
-    Frame {
-        msec: 3104
-        hash: "7691c6c048b78e1551b46a37b6e95b16"
-    }
-    Frame {
-        msec: 3120
-        hash: "b3116620d319ae4b681f4ca76c068b32"
-    }
-    Frame {
-        msec: 3136
-        hash: "ed5a27e5be3dbde3867715f877da41db"
-    }
-    Frame {
-        msec: 3152
-        hash: "8dcc220cc652f57aa8ac33364edc96a3"
-    }
-    Frame {
-        msec: 3168
-        hash: "a7832d86283e27ee1523c4808b42fc43"
-    }
-    Frame {
-        msec: 3184
-        hash: "fc90d18b072638f2df1bacee12fe1743"
-    }
-    Frame {
-        msec: 3200
-        hash: "cdd7b5598155eba57783ebe1872db818"
-    }
-    Frame {
-        msec: 3216
-        hash: "b45e32d12bbc2e56f4a3e7e473528d3e"
-    }
-    Frame {
-        msec: 3232
-        hash: "5762a693ea6287e8987c604ef9fac361"
-    }
-    Frame {
-        msec: 3248
-        hash: "2e46a8df5ec0c7070a374186a313f2c6"
-    }
-    Frame {
-        msec: 3264
-        hash: "e612134417f3f901661b658801a72848"
-    }
-    Frame {
-        msec: 3280
-        hash: "5de468fac915894ef34f3fee1c637e01"
-    }
-    Frame {
-        msec: 3296
-        hash: "e29c8713573e49fc98387311d80c7510"
-    }
-    Frame {
-        msec: 3312
-        hash: "6fce67b704f613e6fd9181ccb9ee237f"
-    }
-    Frame {
-        msec: 3328
-        hash: "bf499add3d91d751ffa1cce28bece380"
-    }
-    Frame {
-        msec: 3344
-        hash: "7d50cad7b18a4a37be6aac7796014195"
-    }
-    Frame {
-        msec: 3360
-        hash: "6695208c8d39373ff0846c821c819cb2"
-    }
-    Frame {
-        msec: 3376
-        hash: "0140ec2286b0fb94340d2dd6d418f539"
-    }
-    Frame {
-        msec: 3392
-        hash: "9f92a99737aa6a7da48af7e7a4ed7a6a"
-    }
-    Frame {
-        msec: 3408
-        hash: "8e593e8192d17d07c2265d6fa840f281"
-    }
-    Frame {
-        msec: 3424
-        hash: "ea70e72eb12d5595d9bf0d9cc77efd4d"
-    }
-    Frame {
-        msec: 3440
-        hash: "faeeb9e6e6a260a266ac8965f204b542"
-    }
-    Frame {
-        msec: 3456
-        hash: "d50987082d056997a8e7fe5940cb7968"
-    }
-    Frame {
-        msec: 3472
-        hash: "44089138e01bfee916306ae66ba43e9f"
-    }
-    Frame {
-        msec: 3488
-        hash: "60256356ca6fe8bd323ef36bc149a3ea"
-    }
-    Frame {
-        msec: 3504
-        hash: "6caae71d6bd897d755aeb22f10862171"
-    }
-    Frame {
-        msec: 3520
-        hash: "8ba18bf5df010718f83d6bb25aa1858b"
-    }
-    Frame {
-        msec: 3536
-        hash: "a903996370fb7efcaf295f00b9b4c4b6"
-    }
-    Frame {
-        msec: 3552
-        hash: "cc0b736c8b4d46d3d809dcfe82068c88"
-    }
-    Frame {
-        msec: 3568
-        hash: "037b2f65d162d44c39706d322cd6b6e5"
-    }
-    Frame {
-        msec: 3584
-        hash: "92c2b4f346329ffbcae07db74332ebbe"
-    }
-    Frame {
-        msec: 3600
-        hash: "3f9b2b5aade31333568a7cccf89e3176"
-    }
-    Frame {
-        msec: 3616
-        hash: "b40f9cce4cddf9fa5245276a105a3e0d"
-    }
-    Frame {
-        msec: 3632
-        hash: "74eb3e8a282693bd6bc92f381e380d61"
-    }
-    Frame {
-        msec: 3648
-        hash: "43d85dd9e0de49c639db0d91047c88bb"
-    }
-    Frame {
-        msec: 3664
-        hash: "563a07f4aa618252933e0356cc300bba"
-    }
-    Frame {
-        msec: 3680
-        hash: "73d1e5745154996fd245a91a831d5462"
-    }
-    Frame {
-        msec: 3696
-        hash: "7b2785b605c64135ea6914ad8388eb8f"
-    }
-    Frame {
-        msec: 3712
-        hash: "b2d989af972715a86ca374753d32f757"
-    }
-    Frame {
-        msec: 3728
-        hash: "96311aac52bc9167a7350af29741f3dc"
-    }
-    Frame {
-        msec: 3744
-        hash: "56e4b98816896f7353dddeac090f70d1"
-    }
-    Frame {
-        msec: 3760
-        hash: "7bd8ac36107e9e5db39e1aa37f2c5ca8"
-    }
-    Frame {
-        msec: 3776
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3792
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3808
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3824
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3840
-        image: "clock.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3872
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3888
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3904
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3920
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3936
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3952
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3968
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 3984
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 4000
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 4016
-        hash: "b9545df89c8bec940678b65d5ef9ce04"
-    }
-    Frame {
-        msec: 4032
-        hash: "df3a1204f6243673d567724d27d07a9e"
-    }
-    Frame {
-        msec: 4048
-        hash: "7d0d3e92cb61d868d062bdf173924a4d"
-    }
-    Frame {
-        msec: 4064
-        hash: "29948b5d7807a6ed0076a9637ec3eb79"
-    }
-    Frame {
-        msec: 4080
-        hash: "2986b5e0a4a49bbe9f4ffada30433a48"
-    }
-    Frame {
-        msec: 4096
-        hash: "0d9e3813141a1ee15474380902d87815"
-    }
-    Frame {
-        msec: 4112
-        hash: "c5197a932430d498b7344c1f37454320"
-    }
-    Frame {
-        msec: 4128
-        hash: "c8ef8acf314486c157e74bdd2695ddb2"
-    }
-    Frame {
-        msec: 4144
-        hash: "adeb73de4b967912a9f2b04ba2b6fe4c"
-    }
-    Frame {
-        msec: 4160
-        hash: "da5fddd1e4ab8c096af0acc62114d69f"
-    }
-    Frame {
-        msec: 4176
-        hash: "5ef0784315603da196e66b4628524c5c"
-    }
-    Frame {
-        msec: 4192
-        hash: "1ff2a89c510953d71198056f5ac5b1a6"
-    }
-    Frame {
-        msec: 4208
-        hash: "f63d409e134e59b875099ab11b469d21"
-    }
-    Frame {
-        msec: 4224
-        hash: "e353748e0b0c49a217d6e2d06a9bfeb6"
-    }
-    Frame {
-        msec: 4240
-        hash: "a9d7470902a232d815bd2580e24fdc22"
-    }
-    Frame {
-        msec: 4256
-        hash: "eecbad718aa4eaf5bef7cd921b2ce9f9"
-    }
-    Frame {
-        msec: 4272
-        hash: "7a51cadbfb93eb4a66acc9cb150002ed"
-    }
-    Frame {
-        msec: 4288
-        hash: "2aa511fb96a51a50e3a45b784e349c15"
-    }
-    Frame {
-        msec: 4304
-        hash: "a1ad19593dc6b9f4c027f388e802dcbe"
-    }
-    Frame {
-        msec: 4320
-        hash: "ef6787f03bc1e33ea5f2a54aa1ba3a41"
-    }
-    Frame {
-        msec: 4336
-        hash: "3386337bbc1ab82374d9965b7b0ffdef"
-    }
-    Frame {
-        msec: 4352
-        hash: "c76afb4f412b4d5dd8eca74db6c54fb8"
-    }
-    Frame {
-        msec: 4368
-        hash: "f91ac74ec153152670d43f42b1e2a2db"
-    }
-    Frame {
-        msec: 4384
-        hash: "58f22723fa0c67379972238e0e7ed5e2"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 4400
-        hash: "a4730b0a8d6e0dd9e7eb58b51fb631ec"
-    }
-    Frame {
-        msec: 4416
-        hash: "193bf624efefcad70af29f41eeab128e"
-    }
-    Frame {
-        msec: 4432
-        hash: "d692f262facf26c2be2b0f747903d476"
-    }
-    Frame {
-        msec: 4448
-        hash: "e59e43b5d4abebea0a55b1d072d148bc"
-    }
-    Frame {
-        msec: 4464
-        hash: "134ff829e91161146b5f048a50c7eef7"
-    }
-    Frame {
-        msec: 4480
-        hash: "07a80e45e70cb13f45e3858404c5f8dd"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.0.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.0.png
deleted file mode 100644
index 3f42e75..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.0.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.1.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.1.png
deleted file mode 100644
index d661df6..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.1.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.10.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.10.png
deleted file mode 100644
index e8c96e1..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.10.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.2.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.2.png
deleted file mode 100644
index 35bfa43..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.2.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.3.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.3.png
deleted file mode 100644
index 74141cf..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.3.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.4.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.4.png
deleted file mode 100644
index 9544054..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.4.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.5.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.5.png
deleted file mode 100644
index 4b02c79..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.5.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.6.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.6.png
deleted file mode 100644
index 8ea8345..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.6.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.7.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.7.png
deleted file mode 100644
index 76a73e8..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.7.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.8.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.8.png
deleted file mode 100644
index 8824940..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.8.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.9.png b/tests/auto/declarative/visual/qmlspringfollow/data/follow.9.png
deleted file mode 100644
index f954cc5..0000000
Binary files a/tests/auto/declarative/visual/qmlspringfollow/data/follow.9.png and /dev/null differ
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.qml b/tests/auto/declarative/visual/qmlspringfollow/data/follow.qml
deleted file mode 100644
index fec5428..0000000
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.qml
+++ /dev/null
@@ -1,1763 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "3561ebf22b19c7bd5a70947d36b50b63"
-    }
-    Frame {
-        msec: 32
-        hash: "3561ebf22b19c7bd5a70947d36b50b63"
-    }
-    Frame {
-        msec: 48
-        hash: "bd0006fc34f58ec1ea6aa4c4acbb0070"
-    }
-    Frame {
-        msec: 64
-        hash: "c25f9fb6aea93413bfef5eb176c02476"
-    }
-    Frame {
-        msec: 80
-        hash: "4ce0eb12fb41960e60e208dffb09ed3a"
-    }
-    Frame {
-        msec: 96
-        hash: "75b3375881969710b6eb21f2a93c36cc"
-    }
-    Frame {
-        msec: 112
-        hash: "91e9b13e332959e41a29c0b225675a05"
-    }
-    Frame {
-        msec: 128
-        hash: "8e04a31a953b42903dffe86b37b3f59f"
-    }
-    Frame {
-        msec: 144
-        hash: "837e0e646a2853d3fde571f9dd966fc7"
-    }
-    Frame {
-        msec: 160
-        hash: "7367e25ae1e3a3731d83da76d5795f8c"
-    }
-    Frame {
-        msec: 176
-        hash: "3621846fb85b286a886a02de442e76c4"
-    }
-    Frame {
-        msec: 192
-        hash: "ed20a4c3476b8bb5545d5343747c39c8"
-    }
-    Frame {
-        msec: 208
-        hash: "1fc73efb410e9beb3f791cbff8e814b3"
-    }
-    Frame {
-        msec: 224
-        hash: "199c99a4e3aa14fbc8c8a0d8baacf998"
-    }
-    Frame {
-        msec: 240
-        hash: "513ce5a2f57e40002a26b7722c8a10db"
-    }
-    Frame {
-        msec: 256
-        hash: "b80b51cd4e75bdc799bbe79e66b7d02b"
-    }
-    Frame {
-        msec: 272
-        hash: "e1531b6c5b3ac872563fdfaf49d32a27"
-    }
-    Frame {
-        msec: 288
-        hash: "6d7cfd78ebd56ae6adfc97aad5d11b13"
-    }
-    Frame {
-        msec: 304
-        hash: "4252ebb2fba165e39f025f631e0a676a"
-    }
-    Frame {
-        msec: 320
-        hash: "04d6ae51415b083bbb0eabd1b0304ca4"
-    }
-    Frame {
-        msec: 336
-        hash: "750df1f1626c8b84dd72a35bf081fe00"
-    }
-    Frame {
-        msec: 352
-        hash: "003d7a846e09ba23ee8a7ae6d473be9f"
-    }
-    Frame {
-        msec: 368
-        hash: "5cf3abdbb9a5b8cba6a8afe8abb60ced"
-    }
-    Frame {
-        msec: 384
-        hash: "0669f86043a0c84d0b4672cc5c1136b4"
-    }
-    Frame {
-        msec: 400
-        hash: "94f59435fe4f3ca06699c996b537ae8c"
-    }
-    Frame {
-        msec: 416
-        hash: "211c8ec42a6d6949253af71c6eeffa53"
-    }
-    Frame {
-        msec: 432
-        hash: "6de6c6d1b4a37a864b96c0293be8ebf5"
-    }
-    Frame {
-        msec: 448
-        hash: "468d67d069eaac1968a6ad52e56f3ab5"
-    }
-    Frame {
-        msec: 464
-        hash: "18d8de7a5c73d8c8188e6ae00a701820"
-    }
-    Frame {
-        msec: 480
-        hash: "4387c724ed49bfbbca238bf57a704a14"
-    }
-    Frame {
-        msec: 496
-        hash: "f317c59f65c7266765333048d8545748"
-    }
-    Frame {
-        msec: 512
-        hash: "6575d40c2f27f110443a2ede8a873c77"
-    }
-    Frame {
-        msec: 528
-        hash: "3e65cb675124dbd9db5116fa7584e223"
-    }
-    Frame {
-        msec: 544
-        hash: "df80612a74b33eca81db6f43aa33e411"
-    }
-    Frame {
-        msec: 560
-        hash: "6b2bc20397f3fb452ea14d81e9efd61d"
-    }
-    Frame {
-        msec: 576
-        hash: "e5b8a2476487f6cd9fd37e3b3f54f88d"
-    }
-    Frame {
-        msec: 592
-        hash: "e93f8156e2dc278a5e20d9e28b48d9fa"
-    }
-    Frame {
-        msec: 608
-        hash: "e524d5117888b0b68781ffaf1a3e7303"
-    }
-    Frame {
-        msec: 624
-        hash: "f3b777409534d87c59e60499fd6a3808"
-    }
-    Frame {
-        msec: 640
-        hash: "09d1fa8f1306eb6f51db97d04c2d7ad3"
-    }
-    Frame {
-        msec: 656
-        hash: "acebdcebe6880c8b3b94ad7606181b72"
-    }
-    Frame {
-        msec: 672
-        hash: "347945a94002cd44d7a2df47f82940a1"
-    }
-    Frame {
-        msec: 688
-        hash: "c716014d63ff2a22cab04dadc18b10c1"
-    }
-    Frame {
-        msec: 704
-        hash: "ced019e3f8b5ca079582d01f1f585a8e"
-    }
-    Frame {
-        msec: 720
-        hash: "d61d31de835ea8d1ffa56fd04c873ac1"
-    }
-    Frame {
-        msec: 736
-        hash: "2eec542c5af4c6eecc153cc0fcae7dd3"
-    }
-    Frame {
-        msec: 752
-        hash: "c13b9443e1c000a2877e4586428da308"
-    }
-    Frame {
-        msec: 768
-        hash: "c5c2e30b3dc3298afc201f6045e79e59"
-    }
-    Frame {
-        msec: 784
-        hash: "308f2ca66133d37c2fcb222e68698d25"
-    }
-    Frame {
-        msec: 800
-        hash: "bf820215986a35b56daf07c164fd2a79"
-    }
-    Frame {
-        msec: 816
-        hash: "a0bb21475100fb25b767d055d70b062f"
-    }
-    Frame {
-        msec: 832
-        hash: "bfb0927bcb23689820b0f96ea56426fc"
-    }
-    Frame {
-        msec: 848
-        hash: "8f294742ca9dd6ab10689f1f4ec2ed96"
-    }
-    Frame {
-        msec: 864
-        hash: "f60c232307570fb4ec6e74f18e243553"
-    }
-    Frame {
-        msec: 880
-        hash: "7411970ab72d8b2dbf48ee8d4e6503b3"
-    }
-    Frame {
-        msec: 896
-        hash: "d4d766038daeae2fbec290204ca3983b"
-    }
-    Frame {
-        msec: 912
-        hash: "f85525c3fd784ee7f9a3d9465e37d6f3"
-    }
-    Frame {
-        msec: 928
-        hash: "c5e63da86ddbd2a54c7cd3d03e5428a2"
-    }
-    Frame {
-        msec: 944
-        hash: "369a7405b1717ddf06c99ab1dd6d4cb0"
-    }
-    Frame {
-        msec: 960
-        image: "follow.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "18d5c4378f9daf63bf4cb76d76374548"
-    }
-    Frame {
-        msec: 992
-        hash: "f36e649db2e1ec9fbe15e7711ea13ab5"
-    }
-    Frame {
-        msec: 1008
-        hash: "f68515607dca1bda14b6afa6e05ebb6b"
-    }
-    Frame {
-        msec: 1024
-        hash: "bc5cc4c9050a5bd4c64debd12643fd73"
-    }
-    Frame {
-        msec: 1040
-        hash: "f053a18bca4d8c47a0f181fad8118e9a"
-    }
-    Frame {
-        msec: 1056
-        hash: "9a2218f51faed4fa891c507fe6828d2c"
-    }
-    Frame {
-        msec: 1072
-        hash: "ce671ff4dd1f343243f2fcc263d137f4"
-    }
-    Frame {
-        msec: 1088
-        hash: "8624f8d814094ad25a1482a11f424990"
-    }
-    Frame {
-        msec: 1104
-        hash: "324dad940b3adb54491d6cdd4e7d8aa7"
-    }
-    Frame {
-        msec: 1120
-        hash: "0cd7c53ec5b591053de6769967b8bad5"
-    }
-    Frame {
-        msec: 1136
-        hash: "e9e8f5e9c2dc179498943d0b5912af09"
-    }
-    Frame {
-        msec: 1152
-        hash: "5f1552ccd61f09335a88658ee1c4e97e"
-    }
-    Frame {
-        msec: 1168
-        hash: "866e01eed7e26dd1bd9af8aaddf4d7c0"
-    }
-    Frame {
-        msec: 1184
-        hash: "2efba3c33c4c7b6d89ce7efca2dc516a"
-    }
-    Frame {
-        msec: 1200
-        hash: "2de9d8a2ad64d2491b3444712be032dc"
-    }
-    Frame {
-        msec: 1216
-        hash: "84206972322eae033d05f71b178180c9"
-    }
-    Frame {
-        msec: 1232
-        hash: "8571d11da1a893edcbe5add1a9399d7a"
-    }
-    Frame {
-        msec: 1248
-        hash: "c0d65ecefa77ee7cb1c08a560e3ad572"
-    }
-    Frame {
-        msec: 1264
-        hash: "0f8a8523969713771a6c7984069b15e4"
-    }
-    Frame {
-        msec: 1280
-        hash: "2e80e4b54538b7b586f4a3be55eb6da3"
-    }
-    Frame {
-        msec: 1296
-        hash: "ae028381f311a60946ecd26eab95bb42"
-    }
-    Frame {
-        msec: 1312
-        hash: "ac5902d58bc116a002c093f55cf20278"
-    }
-    Frame {
-        msec: 1328
-        hash: "242f8617718048cfab9950b812eb1b26"
-    }
-    Frame {
-        msec: 1344
-        hash: "b642f2f0d3161f80a702b09a910c589b"
-    }
-    Frame {
-        msec: 1360
-        hash: "d1508034ecd908120c6f58cf08360c3c"
-    }
-    Frame {
-        msec: 1376
-        hash: "ad10a5ea8598616f2ffa633eecfbd43a"
-    }
-    Frame {
-        msec: 1392
-        hash: "1d2c3cfaac1cca868f31872bf4248de8"
-    }
-    Frame {
-        msec: 1408
-        hash: "28da57a6aec84318ff6aa029ac17f1dd"
-    }
-    Frame {
-        msec: 1424
-        hash: "6f9bf89843d5e40f6c282e69337e7d25"
-    }
-    Frame {
-        msec: 1440
-        hash: "1c5733ad9620805127372fb76f5b0228"
-    }
-    Frame {
-        msec: 1456
-        hash: "16f21041e9e475a37c478cf38cdc353b"
-    }
-    Frame {
-        msec: 1472
-        hash: "b39ea2e8a1991b3ea5be818a284ff69f"
-    }
-    Frame {
-        msec: 1488
-        hash: "4f5bdc935080707525a2b74936b41b2e"
-    }
-    Frame {
-        msec: 1504
-        hash: "a39426dc761df1d2ba398aa17d220ded"
-    }
-    Frame {
-        msec: 1520
-        hash: "2e965042273b377958b04190250d273e"
-    }
-    Frame {
-        msec: 1536
-        hash: "51f021c1d50291b425c98dee4894b330"
-    }
-    Frame {
-        msec: 1552
-        hash: "88fea2e6d6898084acb5897833adb182"
-    }
-    Frame {
-        msec: 1568
-        hash: "12f55e64c8ec9825bf6c5cfd5d50d2bb"
-    }
-    Frame {
-        msec: 1584
-        hash: "365b358eb7a678e1076774c36a82f452"
-    }
-    Frame {
-        msec: 1600
-        hash: "a992b326739bff87bf042c711a7fa65c"
-    }
-    Frame {
-        msec: 1616
-        hash: "083aa3c766a3b50492e51aab3ee128d0"
-    }
-    Frame {
-        msec: 1632
-        hash: "16a2db3b3a773e2612bc57f7a7d7fbbe"
-    }
-    Frame {
-        msec: 1648
-        hash: "32a28101a53d308b107d26a30ae7cdd9"
-    }
-    Frame {
-        msec: 1664
-        hash: "da3908e584542ff2f73cb22369f49c1c"
-    }
-    Mouse {
-        type: 2
-        button: 1
-        buttons: 1
-        x: 195; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 1680
-        hash: "8ad535bb0c5decd8c970aa36286d57e7"
-    }
-    Frame {
-        msec: 1696
-        hash: "5bfbcab7607622486c350a9117ab0884"
-    }
-    Frame {
-        msec: 1712
-        hash: "17e13c8bfd81081f6400d3e71daecb4c"
-    }
-    Frame {
-        msec: 1728
-        hash: "9411a66b6c3ef9a98bc62dea282d6a51"
-    }
-    Frame {
-        msec: 1744
-        hash: "423cded80165ee13f903460e5396526b"
-    }
-    Frame {
-        msec: 1760
-        hash: "709cc55316e6702c1359b66c06676603"
-    }
-    Frame {
-        msec: 1776
-        hash: "27232931c000a2edb5c3d480a6692e6b"
-    }
-    Frame {
-        msec: 1792
-        hash: "22311fd0903b53f50df824ba345ca350"
-    }
-    Frame {
-        msec: 1808
-        hash: "9bb066e60e7e5b3eaa0a221b8ba1a431"
-    }
-    Frame {
-        msec: 1824
-        hash: "517000255d372d384773dff8c80f5a65"
-    }
-    Frame {
-        msec: 1840
-        hash: "329dbd77ae53ea8e4beb669a976033a8"
-    }
-    Frame {
-        msec: 1856
-        hash: "2acd5d3e878e1db5413270c1a50ffc83"
-    }
-    Frame {
-        msec: 1872
-        hash: "8eb5946ac5d53dfc2813d1f1c6a2b6c5"
-    }
-    Frame {
-        msec: 1888
-        hash: "375299e5b1067e02d5de3238a37659f2"
-    }
-    Frame {
-        msec: 1904
-        hash: "f385c90e585db5555e873996165f55af"
-    }
-    Frame {
-        msec: 1920
-        image: "follow.1.png"
-    }
-    Frame {
-        msec: 1936
-        hash: "6c13bb69b6483c72463437e102a9dabb"
-    }
-    Frame {
-        msec: 1952
-        hash: "c1b5d10688681c3b2363bb6d4173deca"
-    }
-    Frame {
-        msec: 1968
-        hash: "b434649e4c9b2c184d2f9036f9d041bf"
-    }
-    Frame {
-        msec: 1984
-        hash: "ca32e9f9080983803bb37b7231ed1c84"
-    }
-    Frame {
-        msec: 2000
-        hash: "976eab47b2d6445fdd8293f2c73564c1"
-    }
-    Frame {
-        msec: 2016
-        hash: "e63daea8f3bc79cea7a6b8dcfd31a094"
-    }
-    Frame {
-        msec: 2032
-        hash: "626cbe5e6b79f2fd0ef57c943666b571"
-    }
-    Frame {
-        msec: 2048
-        hash: "4e07255ce12a21966eec33c0cc623d96"
-    }
-    Frame {
-        msec: 2064
-        hash: "94045005de77725c63c62575a6b06852"
-    }
-    Frame {
-        msec: 2080
-        hash: "3b6dcf783c5e9fe99ce3d9ca02bceff6"
-    }
-    Frame {
-        msec: 2096
-        hash: "e901ed7e831e2d012b97b98b3ab6fa1b"
-    }
-    Frame {
-        msec: 2112
-        hash: "74ef03f72d032daaff13114fde02b824"
-    }
-    Frame {
-        msec: 2128
-        hash: "9eb334d7dda3801c1fe292844040e014"
-    }
-    Frame {
-        msec: 2144
-        hash: "82bf8fb5e3a9bf167f3f00b1f6ab3c06"
-    }
-    Frame {
-        msec: 2160
-        hash: "df3a2bc7758d00d595347e62c7e53c4a"
-    }
-    Frame {
-        msec: 2176
-        hash: "e77ac04a6ad9f97226b45d202a0d5196"
-    }
-    Frame {
-        msec: 2192
-        hash: "37411333a28ea840c59cabd96fd1deba"
-    }
-    Frame {
-        msec: 2208
-        hash: "8d1eb90ffd080bcd078b69c9635108d1"
-    }
-    Frame {
-        msec: 2224
-        hash: "68ee5d58b2edeb6b5a64a714115e4499"
-    }
-    Frame {
-        msec: 2240
-        hash: "003ddf0a5dd3d4bb947a34bdd22ad8c1"
-    }
-    Frame {
-        msec: 2256
-        hash: "bf3c89d0a09ed2159a78f10124f5d7bb"
-    }
-    Frame {
-        msec: 2272
-        hash: "6ec994f41d4540db988846416c2f7b4f"
-    }
-    Frame {
-        msec: 2288
-        hash: "9ca7e3ca6ea26e8259d34a8c0f80f7a9"
-    }
-    Frame {
-        msec: 2304
-        hash: "edf5cea581d46400914610213c8503ea"
-    }
-    Frame {
-        msec: 2320
-        hash: "9b96aac3f98cd37a361788be8b81e308"
-    }
-    Frame {
-        msec: 2336
-        hash: "5d304a8398512ebc85bebf973ed6a4f4"
-    }
-    Frame {
-        msec: 2352
-        hash: "cf2a27a395f23f7976a48d69f5e8e120"
-    }
-    Frame {
-        msec: 2368
-        hash: "458323a37208ea14972d8f84cebc66a5"
-    }
-    Frame {
-        msec: 2384
-        hash: "da9c8e4d168b9cd32d5ec3f5857d2942"
-    }
-    Frame {
-        msec: 2400
-        hash: "5d6663be8e02b0a7a4701595c9c26663"
-    }
-    Frame {
-        msec: 2416
-        hash: "4190712a39ca07f810a6d84e15488393"
-    }
-    Frame {
-        msec: 2432
-        hash: "26b22be0a1c2fecec1e25a6513b19484"
-    }
-    Frame {
-        msec: 2448
-        hash: "3e623bc2b9e8cec49671571291cf6afb"
-    }
-    Frame {
-        msec: 2464
-        hash: "3e623bc2b9e8cec49671571291cf6afb"
-    }
-    Frame {
-        msec: 2480
-        hash: "2cb2968d16323af4659b3197d391bb91"
-    }
-    Frame {
-        msec: 2496
-        hash: "5376b1285647950428b29e75f2e27c4f"
-    }
-    Frame {
-        msec: 2512
-        hash: "baaacc3940c8d36f715d90e046346bed"
-    }
-    Frame {
-        msec: 2528
-        hash: "277719afea4c119f17c34c59ef0b7984"
-    }
-    Frame {
-        msec: 2544
-        hash: "00a172ff8afd1e8444fb84249a3af0fd"
-    }
-    Frame {
-        msec: 2560
-        hash: "bf8a0f939a5602a0a9f5a3bc7c8d0d86"
-    }
-    Frame {
-        msec: 2576
-        hash: "b22860751790b3113b2cb299c9f628b8"
-    }
-    Frame {
-        msec: 2592
-        hash: "fdda1e520457974443720bd44f21d929"
-    }
-    Frame {
-        msec: 2608
-        hash: "538af31f9463cd07163d54adc2721345"
-    }
-    Frame {
-        msec: 2624
-        hash: "2ca50398746c8fb1c936fd412c7556b4"
-    }
-    Frame {
-        msec: 2640
-        hash: "63cd898c3e22a29846489e5c47f455a1"
-    }
-    Frame {
-        msec: 2656
-        hash: "1e69cc765c3f2c27c2b6e7f3e47f515a"
-    }
-    Frame {
-        msec: 2672
-        hash: "9d7ce0df7bee9a387917ef228fd50652"
-    }
-    Frame {
-        msec: 2688
-        hash: "afa0b735a9dd0734362b3f3f7d7177c3"
-    }
-    Frame {
-        msec: 2704
-        hash: "91bee07133319a0adbf9a31c430e58ad"
-    }
-    Frame {
-        msec: 2720
-        hash: "6aee88b6391e524bafc15524825ada74"
-    }
-    Frame {
-        msec: 2736
-        hash: "655ce421faa628b3389f084fe675ad53"
-    }
-    Frame {
-        msec: 2752
-        hash: "367fd34b54f12e896839b0ef4fb06925"
-    }
-    Frame {
-        msec: 2768
-        hash: "0b3ac04504bfe876c4338a4dc3721280"
-    }
-    Frame {
-        msec: 2784
-        hash: "c6cdb77888f1a3cbfe4cfec28bfad12d"
-    }
-    Frame {
-        msec: 2800
-        hash: "ef01302544f4da4575035d3e4f2443c9"
-    }
-    Frame {
-        msec: 2816
-        hash: "53f01d26a75f7e91d14b8975c81638d5"
-    }
-    Frame {
-        msec: 2832
-        hash: "10fc7b3f7e5dff21edef4123d252cba0"
-    }
-    Frame {
-        msec: 2848
-        hash: "10fc7b3f7e5dff21edef4123d252cba0"
-    }
-    Frame {
-        msec: 2864
-        hash: "10fc7b3f7e5dff21edef4123d252cba0"
-    }
-    Frame {
-        msec: 2880
-        image: "follow.2.png"
-    }
-    Frame {
-        msec: 2896
-        hash: "143970d31598c017d7f24e8b09fd0f0a"
-    }
-    Frame {
-        msec: 2912
-        hash: "fc6c38bfdcd2df7a928e83d57dc0b18d"
-    }
-    Frame {
-        msec: 2928
-        hash: "647c09aae23ea5ec7979775d3022cacf"
-    }
-    Frame {
-        msec: 2944
-        hash: "f1ed5cd564be1eed3242997c14a99887"
-    }
-    Frame {
-        msec: 2960
-        hash: "aec3d7f18d6c4002229ef1d36727c4b0"
-    }
-    Frame {
-        msec: 2976
-        hash: "3552e5a3923593a2c66ecd5e2cb2ee25"
-    }
-    Frame {
-        msec: 2992
-        hash: "55a72327b726a3c75383cc5a28ba9503"
-    }
-    Frame {
-        msec: 3008
-        hash: "c25ff06944f8c92006245452e07215ef"
-    }
-    Frame {
-        msec: 3024
-        hash: "cc0187a10a7ccf087838a481f667af6e"
-    }
-    Frame {
-        msec: 3040
-        hash: "ae9d7ff04066eb998d052c2e21b58327"
-    }
-    Frame {
-        msec: 3056
-        hash: "91707fa1aaa267e6d1d56d173a063bde"
-    }
-    Frame {
-        msec: 3072
-        hash: "c076a33b8afcaf915387375f065e49df"
-    }
-    Frame {
-        msec: 3088
-        hash: "c24390ec788b5f34356e7a6507507a93"
-    }
-    Frame {
-        msec: 3104
-        hash: "e42c9800379de3076d00802c68cc99e8"
-    }
-    Frame {
-        msec: 3120
-        hash: "a2d3ba5353b1c967da93d96b61f7927f"
-    }
-    Frame {
-        msec: 3136
-        hash: "fe719953aa3468d373801bb80ae93eff"
-    }
-    Frame {
-        msec: 3152
-        hash: "e89b9bed1ebc7ebdd37d6975ecb0601c"
-    }
-    Frame {
-        msec: 3168
-        hash: "7f3d84f49a7dd4fe39a1ba0ed7f5da3e"
-    }
-    Frame {
-        msec: 3184
-        hash: "b16c9e05f72e7c8fa59f80422b987600"
-    }
-    Frame {
-        msec: 3200
-        hash: "bd0606da0f7bc6c47a361462b3b2dede"
-    }
-    Frame {
-        msec: 3216
-        hash: "88f81db6d705b745c4d2ffe470cb6966"
-    }
-    Frame {
-        msec: 3232
-        hash: "4ac6769d3f725720bba6c125b43885cd"
-    }
-    Frame {
-        msec: 3248
-        hash: "4ac6769d3f725720bba6c125b43885cd"
-    }
-    Frame {
-        msec: 3264
-        hash: "4ac6769d3f725720bba6c125b43885cd"
-    }
-    Frame {
-        msec: 3280
-        hash: "4ac6769d3f725720bba6c125b43885cd"
-    }
-    Frame {
-        msec: 3296
-        hash: "88f81db6d705b745c4d2ffe470cb6966"
-    }
-    Frame {
-        msec: 3312
-        hash: "88f81db6d705b745c4d2ffe470cb6966"
-    }
-    Frame {
-        msec: 3328
-        hash: "1f112ff43280a208e967e373db8e3f34"
-    }
-    Frame {
-        msec: 3344
-        hash: "6d966dafdfd2cf1927c14f749e24a99c"
-    }
-    Frame {
-        msec: 3360
-        hash: "8ab4ce88e52d7cd2ec9059cdb973590d"
-    }
-    Frame {
-        msec: 3376
-        hash: "62d877f18b8d3fcf6b076946f2ce05f7"
-    }
-    Frame {
-        msec: 3392
-        hash: "efe3729cdeddc4bcee105b27e4062dcd"
-    }
-    Frame {
-        msec: 3408
-        hash: "a2eb63f12d434925d0780f4992155556"
-    }
-    Frame {
-        msec: 3424
-        hash: "5eee7ec87bb399e1395a8d337ede021b"
-    }
-    Frame {
-        msec: 3440
-        hash: "59769ae407be01b016df8d7fbf484243"
-    }
-    Frame {
-        msec: 3456
-        hash: "bbadb689ec5b76f76340905252b2376a"
-    }
-    Frame {
-        msec: 3472
-        hash: "97cd4f34259ac8370e8557ef3ecf5a96"
-    }
-    Frame {
-        msec: 3488
-        hash: "17c1513fe4c0132e15355378c6a6ee11"
-    }
-    Frame {
-        msec: 3504
-        hash: "7b19041638fc7d1cf60512f579f388dd"
-    }
-    Frame {
-        msec: 3520
-        hash: "4d23bbf68cb8b32638b73ac20551ee50"
-    }
-    Frame {
-        msec: 3536
-        hash: "3f0326db5a851887a534e80cc29dc21d"
-    }
-    Frame {
-        msec: 3552
-        hash: "df5902d22a31c4deac1428d2758a0ffa"
-    }
-    Frame {
-        msec: 3568
-        hash: "21badb1464775fa935c2619b91aa6e6e"
-    }
-    Frame {
-        msec: 3584
-        hash: "e8cf87f4a65f6915addc16de29c90108"
-    }
-    Frame {
-        msec: 3600
-        hash: "d3d4487b887695b7bba8e0af7756a0f8"
-    }
-    Frame {
-        msec: 3616
-        hash: "d7f52590e4f51621ad2d62c975a5d1ef"
-    }
-    Frame {
-        msec: 3632
-        hash: "9ebdc2b3ef05748e2cc8988f968f7a37"
-    }
-    Frame {
-        msec: 3648
-        hash: "74bb7974f9315e70e976c21955390b9e"
-    }
-    Frame {
-        msec: 3664
-        hash: "59e16a89e523160f2a482c22f003f87f"
-    }
-    Frame {
-        msec: 3680
-        hash: "d8284c216df0fdd37525f26b88707572"
-    }
-    Frame {
-        msec: 3696
-        hash: "d8711b4444eea59acc544652cea3c4ce"
-    }
-    Frame {
-        msec: 3712
-        hash: "12148c3f2b5f41a4ac4801e990b20114"
-    }
-    Frame {
-        msec: 3728
-        hash: "34429cbdfe581a524b1f9072cc404539"
-    }
-    Frame {
-        msec: 3744
-        hash: "1f6a17b91d73e10bcbdd166d97546822"
-    }
-    Mouse {
-        type: 3
-        button: 1
-        buttons: 0
-        x: 195; y: 95
-        modifiers: 0
-        sendToViewport: true
-    }
-    Frame {
-        msec: 3760
-        hash: "bccd4f135f27199b3a710576e0013c53"
-    }
-    Frame {
-        msec: 3776
-        hash: "6aa4db9ecb8fa4ad4d4f81434c369759"
-    }
-    Frame {
-        msec: 3792
-        hash: "a7f2951411d8f5322ce91b3da7e86d64"
-    }
-    Frame {
-        msec: 3808
-        hash: "25fe19f3398d3d1a74ad8ed4114149d7"
-    }
-    Frame {
-        msec: 3824
-        hash: "05c3dae68897a461de2923824bef9390"
-    }
-    Frame {
-        msec: 3840
-        image: "follow.3.png"
-    }
-    Frame {
-        msec: 3856
-        hash: "db6265c30dd614720d1532ffc411a28f"
-    }
-    Frame {
-        msec: 3872
-        hash: "f5de8e4ba755bc0a1e4c3f36ed3e6a93"
-    }
-    Frame {
-        msec: 3888
-        hash: "ad68229e5fe9a2570074648005c5e5df"
-    }
-    Frame {
-        msec: 3904
-        hash: "02d894680766289fe659a86b02d6c9ca"
-    }
-    Frame {
-        msec: 3920
-        hash: "4f228534dd909207e8d149c74bd8fd90"
-    }
-    Frame {
-        msec: 3936
-        hash: "f0b5c64f6a50e156452caf6a352c11e1"
-    }
-    Frame {
-        msec: 3952
-        hash: "64d46ff443534dbdb3cca88b7fc3e758"
-    }
-    Frame {
-        msec: 3968
-        hash: "717ad4b8012a21c6ed38dee5ea978f36"
-    }
-    Frame {
-        msec: 3984
-        hash: "ed38c7b528bcbb3e291761104bf1e86e"
-    }
-    Frame {
-        msec: 4000
-        hash: "8cc8674d325a2c72c41654ffbe5bce1f"
-    }
-    Frame {
-        msec: 4016
-        hash: "ab66dd60cc0e58d23bef5c709fe901ad"
-    }
-    Frame {
-        msec: 4032
-        hash: "b3b824cae4ddaac4a224e84f0e282fa4"
-    }
-    Frame {
-        msec: 4048
-        hash: "ead7fe4bec7987c24c305e114797284c"
-    }
-    Frame {
-        msec: 4064
-        hash: "e5e9501f1ca61ea9f99aadfc5ca02214"
-    }
-    Frame {
-        msec: 4080
-        hash: "f74a00eb31e1604f13a6ffb29fbd91b7"
-    }
-    Frame {
-        msec: 4096
-        hash: "539aca62492408ccc1815c67b55cb399"
-    }
-    Frame {
-        msec: 4112
-        hash: "4f548ad0eb7c4ce88a777e3b7ce2d3a8"
-    }
-    Frame {
-        msec: 4128
-        hash: "b0190c5ed53ff812988dd7a2152ffa61"
-    }
-    Frame {
-        msec: 4144
-        hash: "48214bdfbdcba256043e2cec7f5e321b"
-    }
-    Frame {
-        msec: 4160
-        hash: "952614329111d1d83b0304aa919af177"
-    }
-    Frame {
-        msec: 4176
-        hash: "fd874a73062dedfe7b904ad4c9fbcbc9"
-    }
-    Frame {
-        msec: 4192
-        hash: "365b9a18cf37521718ef98589ac23933"
-    }
-    Frame {
-        msec: 4208
-        hash: "32bbbf93d78925ef12f830386f0dbe2b"
-    }
-    Frame {
-        msec: 4224
-        hash: "835d391a498b7d470b317e91453ba2f9"
-    }
-    Frame {
-        msec: 4240
-        hash: "07d0cd82a39bfea2567587745f1e330d"
-    }
-    Frame {
-        msec: 4256
-        hash: "9560a63581007038e1c463b906a4b346"
-    }
-    Frame {
-        msec: 4272
-        hash: "076d25daafe8b582aeff39e247653285"
-    }
-    Frame {
-        msec: 4288
-        hash: "f2e66dad3231250b951388396705c839"
-    }
-    Frame {
-        msec: 4304
-        hash: "f168773343e928b60aad5430b9ca739d"
-    }
-    Frame {
-        msec: 4320
-        hash: "99ed4dc4be1a0e8d98e1a54d51208da3"
-    }
-    Frame {
-        msec: 4336
-        hash: "23b3e73a966f52ce6166bc91955570a1"
-    }
-    Frame {
-        msec: 4352
-        hash: "00cdb999f3d2c6fcad708c37c3059c3d"
-    }
-    Frame {
-        msec: 4368
-        hash: "96f1bef93ba1768afcc42924145d49ff"
-    }
-    Frame {
-        msec: 4384
-        hash: "0a76f6d5ec710e4046f32f76be8e0d68"
-    }
-    Frame {
-        msec: 4400
-        hash: "98f97a6c7eac1a493e81e79956177668"
-    }
-    Frame {
-        msec: 4416
-        hash: "9424ca6ba64d0d0c0bd1ee9da1b5085a"
-    }
-    Frame {
-        msec: 4432
-        hash: "2049a22079ac590aad3c9f6496879bcb"
-    }
-    Frame {
-        msec: 4448
-        hash: "f70f9f6bd3abf3bdcb70038cda5ed311"
-    }
-    Frame {
-        msec: 4464
-        hash: "48d6d01e1d80fea8eb05572ca26b692c"
-    }
-    Frame {
-        msec: 4480
-        hash: "af152dc6de929a8231687611cc301f28"
-    }
-    Frame {
-        msec: 4496
-        hash: "2ec869cd61570b570586870f80ba3832"
-    }
-    Frame {
-        msec: 4512
-        hash: "42be0431c015dcd0f5f6dd59ba7c2d7d"
-    }
-    Frame {
-        msec: 4528
-        hash: "abc112f396c5e504a19dce255437720c"
-    }
-    Frame {
-        msec: 4544
-        hash: "a371c4f49af16bdacc5ab5abbfc99e99"
-    }
-    Frame {
-        msec: 4560
-        hash: "1ebfd139bfabbbaf522acd63e3f47462"
-    }
-    Frame {
-        msec: 4576
-        hash: "b36086718a3dd89500adbf67aa7b0f1d"
-    }
-    Frame {
-        msec: 4592
-        hash: "e3ea2ad4955cb2ab8d503b331b3594c3"
-    }
-    Frame {
-        msec: 4608
-        hash: "4214c9f474d7f11bed74e32f5b3a0e9f"
-    }
-    Frame {
-        msec: 4624
-        hash: "f290e1dbf13ae399a2644eea3715804a"
-    }
-    Frame {
-        msec: 4640
-        hash: "6538c60446e3303dc1126c3c9c47ae42"
-    }
-    Frame {
-        msec: 4656
-        hash: "5319667f181eb5647710ccc6eddf43c9"
-    }
-    Frame {
-        msec: 4672
-        hash: "b98b68ea99d5a107115b50c32aa45c35"
-    }
-    Frame {
-        msec: 4688
-        hash: "2cc38e2915f77a46082c32c9393ae0c5"
-    }
-    Frame {
-        msec: 4704
-        hash: "40c695b17834cbba86d4dde0729f620b"
-    }
-    Frame {
-        msec: 4720
-        hash: "e8d5a95cfc726ce2626951ef1c68a948"
-    }
-    Frame {
-        msec: 4736
-        hash: "ab96c1668890ceffba74219d83e15e99"
-    }
-    Frame {
-        msec: 4752
-        hash: "4d69a73b3940911940b419028dabd223"
-    }
-    Frame {
-        msec: 4768
-        hash: "281043e3c045df177cbfae1abf51a8d1"
-    }
-    Frame {
-        msec: 4784
-        hash: "8adf6d8154d7950efe6b5bd7e2b760b6"
-    }
-    Frame {
-        msec: 4800
-        image: "follow.4.png"
-    }
-    Frame {
-        msec: 4816
-        hash: "7fba4249c76b7f81c2b88cf906ce8ce6"
-    }
-    Frame {
-        msec: 4832
-        hash: "50b3c89d4d783469843b3acacb9690dd"
-    }
-    Frame {
-        msec: 4848
-        hash: "29f950ab7e6299036e78c8f37d114990"
-    }
-    Frame {
-        msec: 4864
-        hash: "3f8aecc5453406c9d8160eeb9691ed91"
-    }
-    Frame {
-        msec: 4880
-        hash: "ad7ff48fed4ca9e236271d169c3bf696"
-    }
-    Frame {
-        msec: 4896
-        hash: "2a2f872e4ef5c062a61fb59238df8794"
-    }
-    Frame {
-        msec: 4912
-        hash: "87cf2e21d7e56a82437a8ff3fa2bdc8c"
-    }
-    Frame {
-        msec: 4928
-        hash: "c3b04bb24d86d2aebd8fde7845f114cf"
-    }
-    Frame {
-        msec: 4944
-        hash: "3ad95d59a1f1841e3ff2324055ca23c0"
-    }
-    Frame {
-        msec: 4960
-        hash: "b91068fdce1fb2be9a64902a3dfa6b0d"
-    }
-    Frame {
-        msec: 4976
-        hash: "30f0118eb0bba40927a8038da03b652b"
-    }
-    Frame {
-        msec: 4992
-        hash: "ce5f3d15d3536be16b960f02a7335b99"
-    }
-    Frame {
-        msec: 5008
-        hash: "85b853c3f48b915ed6e80815709e8ac2"
-    }
-    Frame {
-        msec: 5024
-        hash: "c3511a76aa6dc2f1422a473ca4d80d0f"
-    }
-    Frame {
-        msec: 5040
-        hash: "deb1df70b4e1801c635356c65c0a5a46"
-    }
-    Frame {
-        msec: 5056
-        hash: "d04983df9b0ffc45e629af55a8e5cc95"
-    }
-    Frame {
-        msec: 5072
-        hash: "2a55c97509819657f5f8604d4789d9d4"
-    }
-    Frame {
-        msec: 5088
-        hash: "94589d594fa2e5ed621459ec2c8bd7e8"
-    }
-    Frame {
-        msec: 5104
-        hash: "a8a1bd7c15a5bdfe15d6580d719bdba6"
-    }
-    Frame {
-        msec: 5120
-        hash: "b4e1a4b1b649820be217c46b5086c8a4"
-    }
-    Frame {
-        msec: 5136
-        hash: "4de7d7ce85717eb9a67c61745ea26c0a"
-    }
-    Frame {
-        msec: 5152
-        hash: "c8ee53b7e659e10c7dbcf44e1a45f794"
-    }
-    Frame {
-        msec: 5168
-        hash: "f46ce03bc5a932c39862577c5a5cd24c"
-    }
-    Frame {
-        msec: 5184
-        hash: "d417370ed6fb99ccfa443eb97e6de331"
-    }
-    Frame {
-        msec: 5200
-        hash: "336af06572992960c829d4a209048263"
-    }
-    Frame {
-        msec: 5216
-        hash: "4066e8eef292abf9b58bc89b4b5f3ce9"
-    }
-    Frame {
-        msec: 5232
-        hash: "360f037a02bf4a337b278886266ff2f1"
-    }
-    Frame {
-        msec: 5248
-        hash: "79e9f387b0ce164057640c0caab8d10d"
-    }
-    Frame {
-        msec: 5264
-        hash: "ee8741d1810303cfe5ecff39c7d52fdd"
-    }
-    Frame {
-        msec: 5280
-        hash: "4cba1c857f0af49d7fe68584f99c89d7"
-    }
-    Frame {
-        msec: 5296
-        hash: "c0ae482a2fbb9f15a2c2ff631cc85c2c"
-    }
-    Frame {
-        msec: 5312
-        hash: "3b6bf6d6a0aeebdc92eff4e336fd3b6e"
-    }
-    Frame {
-        msec: 5328
-        hash: "43033eb8aeba6b49c135a1702f6b8f47"
-    }
-    Frame {
-        msec: 5344
-        hash: "1319c7e3a84484723891ee43a80bc765"
-    }
-    Frame {
-        msec: 5360
-        hash: "838ec693c923565d77b060f262beb1e8"
-    }
-    Frame {
-        msec: 5376
-        hash: "74306669836425de03cec617d4ed849a"
-    }
-    Frame {
-        msec: 5392
-        hash: "c063f4951755c8939399d0d560a0f762"
-    }
-    Frame {
-        msec: 5408
-        hash: "512c739e0ff25f7d6b983a193f7fc2c3"
-    }
-    Frame {
-        msec: 5424
-        hash: "6c5f69cc2ce2992fd2ecb0ea3691e2b8"
-    }
-    Frame {
-        msec: 5440
-        hash: "f5dbc5ce0ba00eafb9379ee86de67150"
-    }
-    Frame {
-        msec: 5456
-        hash: "f62bb7d8d9749272ca3e2bd1931598fb"
-    }
-    Frame {
-        msec: 5472
-        hash: "052fdac05286edcdd7fcd4d6d9582f39"
-    }
-    Frame {
-        msec: 5488
-        hash: "ac4702306e5be156fe7b069cb90e1038"
-    }
-    Frame {
-        msec: 5504
-        hash: "127e94c79f4d33e5f223a0853629245f"
-    }
-    Frame {
-        msec: 5520
-        hash: "dd77216b0a90c46dd5c264d38ab0fd74"
-    }
-    Frame {
-        msec: 5536
-        hash: "a4e50b39aa367d4cd7650d088d186856"
-    }
-    Frame {
-        msec: 5552
-        hash: "6e14946b9b23f0fc137bd61c02af1ca5"
-    }
-    Frame {
-        msec: 5568
-        hash: "8c550d5e4cfbcee2c7bd6c20dba53f41"
-    }
-    Frame {
-        msec: 5584
-        hash: "9f2385fb614bdaafe022712148f786d2"
-    }
-    Frame {
-        msec: 5600
-        hash: "c87903c96ae5a4b91c5bda524bfd4a4f"
-    }
-    Frame {
-        msec: 5616
-        hash: "9a98de9b4237b7c0ccb4468344d410bc"
-    }
-    Frame {
-        msec: 5632
-        hash: "7ff448f395ff50cde1f6e6cfaf0c1541"
-    }
-    Frame {
-        msec: 5648
-        hash: "ab7a6998a5b26e3d58bd1d0a949f3709"
-    }
-    Frame {
-        msec: 5664
-        hash: "ab7a6998a5b26e3d58bd1d0a949f3709"
-    }
-    Frame {
-        msec: 5680
-        hash: "2e1b5636ab75af91bd5b0d48c04828f5"
-    }
-    Frame {
-        msec: 5696
-        hash: "0976b605c78f6f8512acdfb61b9d123a"
-    }
-    Frame {
-        msec: 5712
-        hash: "bb816bfd8bd3972c80c3a76c9ddf785e"
-    }
-    Frame {
-        msec: 5728
-        hash: "c3518990fc7aa5660a9e86034cf4c46f"
-    }
-    Frame {
-        msec: 5744
-        hash: "b27230d8aeb214e18b43de167213ef7b"
-    }
-    Frame {
-        msec: 5760
-        image: "follow.5.png"
-    }
-    Frame {
-        msec: 5776
-        hash: "fc55f00ae456c2687ed05ab4b6906a33"
-    }
-    Frame {
-        msec: 5792
-        hash: "50051a48d1fae3bc9c9d1f0a964d9561"
-    }
-    Frame {
-        msec: 5808
-        hash: "279a38d7261241c744c2317ea9843567"
-    }
-    Frame {
-        msec: 5824
-        hash: "0b3ed3960713dbda36326b7de492c42e"
-    }
-    Frame {
-        msec: 5840
-        hash: "fff5737541317406c4a0ef06f1cdc041"
-    }
-    Frame {
-        msec: 5856
-        hash: "47aef0d79da45139a3981a75290cc9b8"
-    }
-    Frame {
-        msec: 5872
-        hash: "d79f9f9371c76a855ea4f2cdeed97acd"
-    }
-    Frame {
-        msec: 5888
-        hash: "66610a0d5b926d419da26e20b04b55a5"
-    }
-    Frame {
-        msec: 5904
-        hash: "9891ad954da8535b44cc234bb2588f30"
-    }
-    Frame {
-        msec: 5920
-        hash: "b53056146701fae1598ab49e6399db01"
-    }
-    Frame {
-        msec: 5936
-        hash: "064799027a3f60458a3797c6c87d3e29"
-    }
-    Frame {
-        msec: 5952
-        hash: "81ad252f10e6f8f2a08e7df1d25e8a47"
-    }
-    Frame {
-        msec: 5968
-        hash: "09fbd923da02844f50ad25059f82560c"
-    }
-    Frame {
-        msec: 5984
-        hash: "f41d8370afdce8a154ab42204ca8d92d"
-    }
-    Frame {
-        msec: 6000
-        hash: "748b2d020c28b3ac36b08377b4a2544b"
-    }
-    Frame {
-        msec: 6016
-        hash: "748b2d020c28b3ac36b08377b4a2544b"
-    }
-    Frame {
-        msec: 6032
-        hash: "d8c02a54c0d1df20127025d547c741af"
-    }
-    Frame {
-        msec: 6048
-        hash: "d8c02a54c0d1df20127025d547c741af"
-    }
-    Frame {
-        msec: 6064
-        hash: "d7fd0dab22fec0f68ed01cfd6d32e7f5"
-    }
-    Frame {
-        msec: 6080
-        hash: "f0b035eda10c07f5c3c825784ad96437"
-    }
-    Frame {
-        msec: 6096
-        hash: "54b83800f8a01e1a4d57b8b1d371fb09"
-    }
-    Frame {
-        msec: 6112
-        hash: "19ad51c31e9cfdb314c76f323574806c"
-    }
-    Frame {
-        msec: 6128
-        hash: "dcf269a115781eb4df232a527de87a87"
-    }
-    Frame {
-        msec: 6144
-        hash: "95053206702a6118c23b541ff7fbef0d"
-    }
-    Frame {
-        msec: 6160
-        hash: "933a158398ee746c0465c2e7af9b6b4d"
-    }
-    Frame {
-        msec: 6176
-        hash: "ade4a4aa03f5787dce1331ed27ff9c6e"
-    }
-    Frame {
-        msec: 6192
-        hash: "9ecc7d4cb5cf0dd815e208e13e2c932a"
-    }
-    Frame {
-        msec: 6208
-        hash: "98e40cba2e717e57a5dcd3413e166f65"
-    }
-    Frame {
-        msec: 6224
-        hash: "f68f45b71f6d596eaa76fa2bc46cfe1b"
-    }
-    Frame {
-        msec: 6240
-        hash: "9230c9b1013b83b073ccb90d2633043f"
-    }
-    Frame {
-        msec: 6256
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6272
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6288
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6304
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6320
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6336
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6352
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6368
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Frame {
-        msec: 6384
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6400
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6416
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6432
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6448
-        hash: "478be760047d33bd66017bdd304ff3ae"
-    }
-    Frame {
-        msec: 6464
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6480
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6496
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6512
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6528
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6544
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6560
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6576
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6592
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6608
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6624
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6640
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6656
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6672
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6688
-        hash: "8ff11dfe2642dc099c240e8aef8285df"
-    }
-    Frame {
-        msec: 6704
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6720
-        image: "follow.6.png"
-    }
-    Frame {
-        msec: 6736
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6752
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6768
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6784
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6800
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6816
-        hash: "01ac8ff953f8f83c6fa2252fe6ff6698"
-    }
-    Frame {
-        msec: 6832
-        hash: "96008d5b8446f67e07129d02300d122d"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 67108864
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 6848
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6864
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6880
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6896
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6912
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-    Frame {
-        msec: 6928
-        hash: "5d0fc4842b75703d29816fa0330624ba"
-    }
-}
diff --git a/tests/auto/declarative/visual/qmlspringfollow/follow.qml b/tests/auto/declarative/visual/qmlspringfollow/follow.qml
deleted file mode 100644
index 62503e4..0000000
--- a/tests/auto/declarative/visual/qmlspringfollow/follow.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    color: "#ffffff"
-    width: 320; height: 240
-    Rectangle {
-        id: rect
-        color: "#00ff00"
-        y: 200; width: 60; height: 20
-        y: SequentialAnimation {
-            repeat: true
-            NumberAnimation {
-                to: 20; duration: 500
-                easing.type: "InOutQuad"
-            }
-            NumberAnimation {
-                to: 200; duration: 2000
-                easing.type: "OutBounce"
-            }
-            PauseAnimation { duration: 1000 }
-        }
-    }
-
-    // Velocity
-    Rectangle {
-        color: "#ff0000"
-        x: rect.width; width: rect.width; height: 20
-        y: 200
-        y: SpringFollow { source: rect.y; velocity: 200 }
-    }
-
-    // Spring
-    Rectangle {
-        color: "#ff0000"
-        x: rect.width * 2; width: rect.width/2; height: 20
-        y: 200
-        y: SpringFollow { source: rect.y; spring: 1.0; damping: 0.2 }
-    }
-    Rectangle {
-        color: "#880000"
-        x: rect.width * 2.5; width: rect.width/2; height: 20
-        y: 200
-        y: SpringFollow { source: rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
-    }
-
-    // Follow mouse
-    MouseArea {
-        id: mouseRegion
-        anchors.fill: parent
-        Rectangle {
-            id: ball
-            width: 20; height: 20
-            radius: 10
-            color: "#0000ff"
-            x: SpringFollow { id: f1; source: mouseRegion.mouseX-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
-            y: SpringFollow { id: f2; source: mouseRegion.mouseY-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
-            states: [
-                State {
-                    name: "following"
-                    when: !f1.inSync || !f2.inSync
-                    PropertyChanges { target: ball; color: "#ff0000" }
-                }
-            ]
-            transitions: [
-                Transition {
-                    ColorAnimation { duration: 200 }
-                }
-            ]
-        }
-    }
-}
diff --git a/tests/auto/declarative/visual/tst_visual.cpp b/tests/auto/declarative/visual/tst_visual.cpp
index 8f41bef..cd88e87 100644
--- a/tests/auto/declarative/visual/tst_visual.cpp
+++ b/tests/auto/declarative/visual/tst_visual.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QmlView>
+#include <QDeclarativeView>
 #include <QApplication>
 #include <QLibraryInfo>
 #include <QDir>
@@ -65,30 +65,30 @@ private slots:
     void visual();
 
 private:
-    QString qmlviewer;
+    QString qmlruntime;
 };
 
 
 tst_visual::tst_visual() 
 {
-    qmlviewer = viewer();
+    qmlruntime = viewer();
 }
 
 QString tst_visual::viewer()
 {
     QString binaries = QLibraryInfo::location(QLibraryInfo::BinariesPath);
 
-    QString qmlviewer;
+    QString qmlruntime;
 
 #if defined(Q_WS_MAC)
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.app/Contents/MacOS/qmlviewer");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml.app/Contents/MacOS/qml");
 #elif defined(Q_WS_WIN)
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.exe");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml.exe");
 #else
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml");
 #endif
 
-    return qmlviewer;
+    return qmlruntime;
 }
 
 void tst_visual::visual_data()
@@ -118,7 +118,7 @@ void tst_visual::visual()
               << "-scriptopts" << "play,testimages,testerror,exitoncomplete,exitonfailure" 
               << file;
     QProcess p;
-    p.start(qmlviewer, arguments);
+    p.start(qmlruntime, arguments);
     QVERIFY(p.waitForFinished());
     if (p.exitCode() != 0)
         qDebug() << p.readAllStandardError();
@@ -211,7 +211,7 @@ void action(Mode mode, const QString &file)
     QStringList arguments;
     switch (mode) {
         case Test:
-            // Don't run qmlviewer
+            // Don't run qml
             break;
         case Record:
             arguments << "-script" << testdata
diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
new file mode 100644
index 0000000..f3262ee
--- /dev/null
+++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+SOURCES += tst_qdeclarativeaudio.cpp
+
+QT += multimedia declarative
+requires(contains(QT_CONFIG, multimedia))
+requires(contains(QT_CONFIG, declarative))
diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
new file mode 100644
index 0000000..11439ce
--- /dev/null
+++ b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -0,0 +1,1200 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <QtMultimedia/private/qdeclarativeaudio_p.h>
+
+#include <QtGui/qapplication.h>
+#include <QtMultimedia/qmediaplayercontrol.h>
+#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimedia/qmetadatacontrol.h>
+
+
+class tst_QmlAudio : public QObject
+{
+    Q_OBJECT
+public slots:
+    void initTestCase();
+
+private slots:
+    void nullPlayerControl();
+    void nullMetaDataControl();
+    void nullService();
+
+    void source();
+    void playing();
+    void paused();
+    void duration();
+    void position();
+    void volume();
+    void muted();
+    void bufferProgress();
+    void seekable();
+    void playbackRate();
+    void status();
+    void metaData_data();
+    void metaData();
+    void error();
+};
+
+Q_DECLARE_METATYPE(QtMultimedia::MetaData);
+Q_DECLARE_METATYPE(QDeclarativeAudio::Error);
+
+class QtTestMediaPlayerControl : public QMediaPlayerControl
+{
+    Q_OBJECT
+public:
+    QtTestMediaPlayerControl(QObject *parent = 0)
+        : QMediaPlayerControl(parent)
+        , m_state(QMediaPlayer::StoppedState)
+        , m_mediaStatus(QMediaPlayer::NoMedia)
+        , m_duration(0)
+        , m_position(0)
+        , m_playbackRate(1.0)
+        , m_volume(50)
+        , m_bufferStatus(0)
+        , m_muted(false)
+        , m_audioAvailable(false)
+        , m_videoAvailable(false)
+        , m_seekable(false)
+    {
+    }
+
+    QMediaPlayer::State state() const { return m_state; }
+    void updateState(QMediaPlayer::State state) { emit stateChanged(m_state = state); }
+
+    QMediaPlayer::MediaStatus mediaStatus() const { return m_mediaStatus; }
+    void updateMediaStatus(QMediaPlayer::MediaStatus status) {
+        emit mediaStatusChanged(m_mediaStatus = status); }
+    void updateMediaStatus(QMediaPlayer::MediaStatus status, QMediaPlayer::State state)
+    {
+        m_mediaStatus = status;
+        m_state = state;
+
+        emit mediaStatusChanged(m_mediaStatus);
+        emit stateChanged(m_state);
+    }
+
+    qint64 duration() const { return m_duration; }
+    void setDuration(qint64 duration) { emit durationChanged(m_duration = duration); }
+
+    qint64 position() const { return m_position; }
+    void setPosition(qint64 position) { emit positionChanged(m_position = position); }
+
+    int volume() const { return m_volume; }
+    void setVolume(int volume) { emit volumeChanged(m_volume = volume); }
+
+    bool isMuted() const { return m_muted; }
+    void setMuted(bool muted) { emit mutedChanged(m_muted = muted); }
+
+    int bufferStatus() const { return m_bufferStatus; }
+    void setBufferStatus(int status) { emit bufferStatusChanged(m_bufferStatus = status); }
+
+    bool isAudioAvailable() const { return m_audioAvailable; }
+    void setAudioAvailable(bool available) {
+        emit audioAvailableChanged(m_audioAvailable = available); }
+    bool isVideoAvailable() const { return m_videoAvailable; }
+    void setVideoAvailable(bool available) {
+        emit videoAvailableChanged(m_videoAvailable = available); }
+
+    bool isSeekable() const { return m_seekable; }
+    void setSeekable(bool seekable) { emit seekableChanged(m_seekable = seekable); }
+
+    QMediaTimeRange availablePlaybackRanges() const { return QMediaTimeRange(); }
+
+    qreal playbackRate() const { return m_playbackRate; }
+    void setPlaybackRate(qreal rate) { emit playbackRateChanged(m_playbackRate = rate); }
+
+    QMediaContent media() const { return m_media; }
+    const QIODevice *mediaStream() const { return 0; }
+    void setMedia(const QMediaContent &media, QIODevice *)
+    {
+        m_media = media;
+
+        m_mediaStatus = m_media.isNull()
+                ? QMediaPlayer::NoMedia
+                : QMediaPlayer::LoadingMedia;
+
+        emit mediaChanged(m_media);
+        emit mediaStatusChanged(m_mediaStatus);
+    }
+
+    void play() { emit stateChanged(m_state = QMediaPlayer::PlayingState); }
+    void pause() { emit stateChanged(m_state = QMediaPlayer::PausedState); }
+    void stop() { emit stateChanged(m_state = QMediaPlayer::StoppedState); }
+
+    void emitError(QMediaPlayer::Error err, const QString &errorString) {
+        emit error(err, errorString); }
+
+private:
+    QMediaPlayer::State m_state;
+    QMediaPlayer::MediaStatus m_mediaStatus;
+    qint64 m_duration;
+    qint64 m_position;
+    qreal m_playbackRate;
+    int m_volume;
+    int m_bufferStatus;
+    bool m_muted;
+    bool m_audioAvailable;
+    bool m_videoAvailable;
+    bool m_seekable;
+    QMediaContent m_media;
+};
+
+class QtTestMetaDataControl : public QMetaDataControl
+{
+    Q_OBJECT
+public:
+    QtTestMetaDataControl(QObject *parent = 0)
+        : QMetaDataControl(parent)
+    {
+    }
+
+    bool isWritable() const { return true; }
+    bool isMetaDataAvailable() const { return true; }
+
+    QVariant metaData(QtMultimedia::MetaData key) const { return m_metaData.value(key); }
+    void setMetaData(QtMultimedia::MetaData key, const QVariant &value) {
+        m_metaData.insert(key, value); emit metaDataChanged(); }
+    void setMetaData(const QMap<QtMultimedia::MetaData, QVariant> &metaData) {
+        m_metaData = metaData; emit metaDataChanged(); }
+
+    QList<QtMultimedia::MetaData> availableMetaData() const { return m_metaData.keys(); }
+
+    QVariant extendedMetaData(const QString &) const { return QVariant(); }
+    void setExtendedMetaData(const QString &, const QVariant &) {}
+    QStringList availableExtendedMetaData() const { return QStringList(); }
+
+private:
+    QMap<QtMultimedia::MetaData, QVariant> m_metaData;
+};
+
+class QtTestMediaService : public QMediaService
+{
+    Q_OBJECT
+public:
+    QtTestMediaService(
+            QtTestMediaPlayerControl *playerControl,
+            QtTestMetaDataControl *metaDataControl,
+            QObject *parent)
+        : QMediaService(parent)
+        , playerControl(playerControl)
+        , metaDataControl(metaDataControl)
+    {
+    }
+
+    QMediaControl *control(const char *name) const
+    {
+        if (qstrcmp(name, QMediaPlayerControl_iid) == 0)
+            return playerControl;
+        else if (qstrcmp(name, QMetaDataControl_iid) == 0)
+            return metaDataControl;
+        else
+            return 0;
+    }
+
+    QtTestMediaPlayerControl *playerControl;
+    QtTestMetaDataControl *metaDataControl;
+};
+
+class QtTestMediaServiceProvider : public QMediaServiceProvider
+{
+    Q_OBJECT
+public:
+    QtTestMediaServiceProvider()
+        : service(new QtTestMediaService(
+                new QtTestMediaPlayerControl(this), new QtTestMetaDataControl(this), this))
+    {
+        setDefaultServiceProvider(this);
+    }
+
+    QtTestMediaServiceProvider(QtTestMediaService *service)
+        : service(service)
+    {
+        setDefaultServiceProvider(this);
+    }
+
+    QtTestMediaServiceProvider(
+            QtTestMediaPlayerControl *playerControl, QtTestMetaDataControl *metaDataControl)
+        : service(new QtTestMediaService(playerControl, metaDataControl, this))
+    {
+        setDefaultServiceProvider(this);
+    }
+
+    ~QtTestMediaServiceProvider()
+    {
+        setDefaultServiceProvider(0);
+    }
+
+    QMediaService *requestService(
+            const QByteArray &type,
+            const QMediaServiceProviderHint & = QMediaServiceProviderHint())
+    {
+        requestedService = type;
+
+        return service;
+    }
+
+    void releaseService(QMediaService *) {}
+
+    inline QtTestMediaPlayerControl *playerControl() { return service->playerControl; }
+    inline QtTestMetaDataControl *metaDataControl() { return service->metaDataControl; }
+
+    QtTestMediaService *service;
+    QByteArray requestedService;
+};
+
+
+void tst_QmlAudio::initTestCase()
+{
+    qRegisterMetaType<QDeclarativeAudio::Error>();
+}
+
+void tst_QmlAudio::nullPlayerControl()
+{
+    QtTestMetaDataControl metaDataControl;
+    QtTestMediaServiceProvider provider(0, &metaDataControl);
+
+    QDeclarativeAudio audio;
+
+    QCOMPARE(audio.source(), QUrl());
+    audio.setSource(QUrl("http://example.com"));
+    QCOMPARE(audio.source(), QUrl());
+
+    QCOMPARE(audio.isPlaying(), false);
+    audio.setPlaying(true);
+    QCOMPARE(audio.isPlaying(), false);
+    audio.play();
+    QCOMPARE(audio.isPlaying(), false);
+
+    QCOMPARE(audio.isPaused(), false);
+    audio.pause();
+    QCOMPARE(audio.isPaused(), false);
+    audio.setPaused(true);
+    QCOMPARE(audio.isPaused(), true);
+
+    QCOMPARE(audio.duration(), 0);
+
+    QCOMPARE(audio.position(), 0);
+    audio.setPosition(10000);
+    QCOMPARE(audio.position(), 0);
+
+    QCOMPARE(audio.volume(), qreal(0));
+    audio.setVolume(50);
+    QCOMPARE(audio.volume(), qreal(0));
+
+    QCOMPARE(audio.isMuted(), false);
+    audio.setMuted(true);
+    QCOMPARE(audio.isMuted(), false);
+
+    QCOMPARE(audio.bufferProgress(), qreal(0));
+
+    QCOMPARE(audio.isSeekable(), false);
+
+    QCOMPARE(audio.playbackRate(), qreal(1.0));
+
+    QCOMPARE(audio.status(), QDeclarativeAudio::NoMedia);
+
+    QCOMPARE(audio.error(), QDeclarativeAudio::ServiceMissing);
+}
+
+void tst_QmlAudio::nullMetaDataControl()
+{
+    QtTestMediaPlayerControl playerControl;
+    QtTestMediaServiceProvider provider(&playerControl, 0);
+
+    QDeclarativeAudio audio;
+
+    QCOMPARE(audio.metaObject()->indexOfProperty("title"), -1);
+    QCOMPARE(audio.metaObject()->indexOfProperty("genre"), -1);
+    QCOMPARE(audio.metaObject()->indexOfProperty("description"), -1);
+}
+
+void tst_QmlAudio::nullService()
+{
+    QtTestMediaServiceProvider provider(0);
+
+    QDeclarativeAudio audio;
+
+    QCOMPARE(audio.source(), QUrl());
+    audio.setSource(QUrl("http://example.com"));
+    QCOMPARE(audio.source(), QUrl());
+
+    QCOMPARE(audio.isPlaying(), false);
+    audio.setPlaying(true);
+    QCOMPARE(audio.isPlaying(), false);
+    audio.play();
+    QCOMPARE(audio.isPlaying(), false);
+
+    QCOMPARE(audio.isPaused(), false);
+    audio.pause();
+    QCOMPARE(audio.isPaused(), false);
+    audio.setPaused(true);
+    QCOMPARE(audio.isPaused(), true);
+
+    QCOMPARE(audio.duration(), 0);
+
+    QCOMPARE(audio.position(), 0);
+    audio.setPosition(10000);
+    QCOMPARE(audio.position(), 0);
+
+    QCOMPARE(audio.volume(), qreal(0));
+    audio.setVolume(50);
+    QCOMPARE(audio.volume(), qreal(0));
+
+    QCOMPARE(audio.isMuted(), false);
+    audio.setMuted(true);
+    QCOMPARE(audio.isMuted(), false);
+
+    QCOMPARE(audio.bufferProgress(), qreal(0));
+
+    QCOMPARE(audio.isSeekable(), false);
+
+    QCOMPARE(audio.playbackRate(), qreal(1.0));
+
+    QCOMPARE(audio.status(), QDeclarativeAudio::NoMedia);
+
+    QCOMPARE(audio.error(), QDeclarativeAudio::ServiceMissing);
+
+    QCOMPARE(audio.metaObject()->indexOfProperty("title"), -1);
+    QCOMPARE(audio.metaObject()->indexOfProperty("genre"), -1);
+    QCOMPARE(audio.metaObject()->indexOfProperty("description"), -1);
+}
+
+void tst_QmlAudio::source()
+{
+    const QUrl url1("http://example.com");
+    const QUrl url2("file:///local/path");
+    const QUrl url3;
+
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy spy(&audio, SIGNAL(sourceChanged()));
+
+    audio.setSource(url1);
+    QCOMPARE(audio.source(), url1);
+    QCOMPARE(provider.playerControl()->media().canonicalUrl(), url1);
+    QCOMPARE(spy.count(), 1);
+
+    audio.setSource(url2);
+    QCOMPARE(audio.source(), url2);
+    QCOMPARE(provider.playerControl()->media().canonicalUrl(), url2);
+    QCOMPARE(spy.count(), 2);
+
+    audio.setSource(url3);
+    QCOMPARE(audio.source(), url3);
+    QCOMPARE(provider.playerControl()->media().canonicalUrl(), url3);
+    QCOMPARE(spy.count(), 3);
+}
+
+void tst_QmlAudio::playing()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy playingChangedSpy(&audio, SIGNAL(playingChanged()));
+    QSignalSpy startedSpy(&audio, SIGNAL(started()));
+    QSignalSpy stoppedSpy(&audio, SIGNAL(stopped()));
+
+    int playingChanged = 0;
+    int started = 0;
+    int stopped = 0;
+
+    QCOMPARE(audio.isPlaying(), false);
+
+    // setPlaying(true) when stopped.
+    audio.setPlaying(true);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when playing.
+    audio.setPlaying(false);
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // play() when stopped.
+    audio.play();
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // stop() when playing.
+    audio.stop();
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // stop() when stopped.
+    audio.stop();
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when stopped.
+    audio.setPlaying(false);
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    audio.setPlaying(true);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(true) when playing.
+    audio.setPlaying(true);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // play() when playing.
+    audio.play();
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+}
+
+void tst_QmlAudio::paused()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy playingChangedSpy(&audio, SIGNAL(playingChanged()));
+    QSignalSpy pausedChangedSpy(&audio, SIGNAL(pausedChanged()));
+    QSignalSpy startedSpy(&audio, SIGNAL(started()));
+    QSignalSpy pausedSpy(&audio, SIGNAL(paused()));
+    QSignalSpy resumedSpy(&audio, SIGNAL(resumed()));
+    QSignalSpy stoppedSpy(&audio, SIGNAL(stopped()));
+
+    int playingChanged = 0;
+    int pausedChanged = 0;
+    int started = 0;
+    int paused = 0;
+    int resumed = 0;
+    int stopped = 0;
+
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), false);
+
+    // setPlaying(true) when stopped.
+    audio.setPlaying(true);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(true) when playing.
+    audio.setPaused(true);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(true) when paused.
+    audio.setPaused(true);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // pause() when paused.
+    audio.pause();
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(false) when paused.
+    audio.setPaused(false);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),        ++resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(false) when playing.
+    audio.setPaused(false);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // pause() when playing.
+    audio.pause();
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when paused.
+    audio.setPlaying(false);
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // setPaused(true) when stopped and paused.
+    audio.setPaused(true);
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(false) when stopped and paused.
+    audio.setPaused(false);
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(true) when stopped.
+    audio.setPaused(true);
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(true) when stopped and paused.
+    audio.setPlaying(true);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // play() when paused.
+    audio.play();
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),        ++resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(true) when playing.
+    audio.setPaused(true);
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // stop() when paused.
+    audio.stop();
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // setPaused(true) when stopped.
+    audio.setPaused(true);
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // stop() when stopped and paused.
+    audio.stop();
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // pause() when stopped.
+    audio.pause();
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when paused.
+    audio.setPlaying(false);
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // pause() when stopped and paused.
+    audio.pause();
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when paused.
+    audio.setPlaying(false);
+    QCOMPARE(audio.isPlaying(), false);
+    QCOMPARE(audio.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // play() when stopped and paused.
+    audio.play();
+    QCOMPARE(audio.isPlaying(), true);
+    QCOMPARE(audio.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+}
+
+void tst_QmlAudio::duration()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy spy(&audio, SIGNAL(durationChanged()));
+
+    QCOMPARE(audio.duration(), 0);
+
+    provider.playerControl()->setDuration(4040);
+    QCOMPARE(audio.duration(), 4040);
+    QCOMPARE(spy.count(), 1);
+
+    provider.playerControl()->setDuration(-129);
+    QCOMPARE(audio.duration(), -129);
+    QCOMPARE(spy.count(), 2);
+
+    provider.playerControl()->setDuration(0);
+    QCOMPARE(audio.duration(), 0);
+    QCOMPARE(spy.count(), 3);
+
+    // Unnecessary duration changed signals aren't filtered.
+    provider.playerControl()->setDuration(0);
+    QCOMPARE(audio.duration(), 0);
+    QCOMPARE(spy.count(), 4);
+}
+
+void tst_QmlAudio::position()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy spy(&audio, SIGNAL(positionChanged()));
+
+    QCOMPARE(audio.position(), 0);
+
+    // QDeclarativeAudio won't bound set positions to the duration.  A media service may though.
+    QCOMPARE(audio.duration(), 0);
+
+    audio.setPosition(450);
+    QCOMPARE(audio.position(), 450);
+    QCOMPARE(provider.playerControl()->position(), qint64(450));
+    QCOMPARE(spy.count(), 1);
+
+    audio.setPosition(-5403);
+    QCOMPARE(audio.position(), -5403);
+    QCOMPARE(provider.playerControl()->position(), qint64(-5403));
+    QCOMPARE(spy.count(), 2);
+
+    audio.setPosition(-5403);
+    QCOMPARE(audio.position(), -5403);
+    QCOMPARE(provider.playerControl()->position(), qint64(-5403));
+    QCOMPARE(spy.count(), 3);
+
+    // Check the signal change signal is emitted if the change originates from the media service.
+    provider.playerControl()->setPosition(0);
+    QCOMPARE(audio.position(), 0);
+    QCOMPARE(spy.count(), 4);
+
+    connect(&audio, SIGNAL(positionChanged()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+
+    provider.playerControl()->updateState(QMediaPlayer::PlayingState);
+    QTestEventLoop::instance().enterLoop(1);
+    QVERIFY(spy.count() > 4 && spy.count() < 7); // 5 or 6
+
+    provider.playerControl()->updateState(QMediaPlayer::PausedState);
+    QTestEventLoop::instance().enterLoop(1);
+    QVERIFY(spy.count() < 7);
+}
+
+void tst_QmlAudio::volume()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy spy(&audio, SIGNAL(volumeChanged()));
+
+    QCOMPARE(audio.volume(), qreal(0.5));
+
+    audio.setVolume(0.7);
+    QCOMPARE(audio.volume(), qreal(0.7));
+    QCOMPARE(provider.playerControl()->volume(), 70);
+    QCOMPARE(spy.count(), 1);
+
+    audio.setVolume(0.7);
+    QCOMPARE(audio.volume(), qreal(0.7));
+    QCOMPARE(provider.playerControl()->volume(), 70);
+    QCOMPARE(spy.count(), 2);
+
+    provider.playerControl()->setVolume(30);
+    QCOMPARE(audio.volume(), qreal(0.3));
+    QCOMPARE(spy.count(), 3);
+}
+
+void tst_QmlAudio::muted()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy spy(&audio, SIGNAL(mutedChanged()));
+
+    QCOMPARE(audio.isMuted(), false);
+
+    audio.setMuted(true);
+    QCOMPARE(audio.isMuted(), true);
+    QCOMPARE(provider.playerControl()->isMuted(), true);
+    QCOMPARE(spy.count(), 1);
+
+    provider.playerControl()->setMuted(false);
+    QCOMPARE(audio.isMuted(), false);
+    QCOMPARE(spy.count(), 2);
+
+    audio.setMuted(false);
+    QCOMPARE(audio.isMuted(), false);
+    QCOMPARE(provider.playerControl()->isMuted(), false);
+    QCOMPARE(spy.count(), 3);
+}
+
+void tst_QmlAudio::bufferProgress()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy spy(&audio, SIGNAL(bufferProgressChanged()));
+
+    QCOMPARE(audio.bufferProgress(), qreal(0.0));
+
+    provider.playerControl()->setBufferStatus(20);
+    QCOMPARE(audio.bufferProgress(), qreal(0.2));
+    QCOMPARE(spy.count(), 1);
+
+    provider.playerControl()->setBufferStatus(20);
+    QCOMPARE(audio.bufferProgress(), qreal(0.2));
+    QCOMPARE(spy.count(), 2);
+
+    provider.playerControl()->setBufferStatus(40);
+    QCOMPARE(audio.bufferProgress(), qreal(0.4));
+    QCOMPARE(spy.count(), 3);
+
+    connect(&audio, SIGNAL(positionChanged()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+
+    provider.playerControl()->updateMediaStatus(
+            QMediaPlayer::BufferingMedia, QMediaPlayer::PlayingState);
+    QTestEventLoop::instance().enterLoop(1);
+    QVERIFY(spy.count() > 3 && spy.count() < 6); // 4 or 5
+
+    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferedMedia);
+    QTestEventLoop::instance().enterLoop(1);
+    QVERIFY(spy.count() < 6);
+}
+
+void tst_QmlAudio::seekable()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy spy(&audio, SIGNAL(seekableChanged()));
+
+    QCOMPARE(audio.isSeekable(), false);
+
+    provider.playerControl()->setSeekable(true);
+    QCOMPARE(audio.isSeekable(), true);
+    QCOMPARE(spy.count(), 1);
+
+    provider.playerControl()->setSeekable(true);
+    QCOMPARE(audio.isSeekable(), true);
+    QCOMPARE(spy.count(), 2);
+
+    provider.playerControl()->setSeekable(false);
+    QCOMPARE(audio.isSeekable(), false);
+    QCOMPARE(spy.count(), 3);
+}
+
+void tst_QmlAudio::playbackRate()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy spy(&audio, SIGNAL(playbackRateChanged()));
+
+    QCOMPARE(audio.playbackRate(), qreal(1.0));
+
+    audio.setPlaybackRate(0.5);
+    QCOMPARE(audio.playbackRate(), qreal(0.5));
+    QCOMPARE(provider.playerControl()->playbackRate(), qreal(0.5));
+    QCOMPARE(spy.count(), 1);
+
+    provider.playerControl()->setPlaybackRate(2.0);
+    QCOMPARE(provider.playerControl()->playbackRate(), qreal(2.0));
+    QCOMPARE(spy.count(), 2);
+
+    audio.setPlaybackRate(2.0);
+    QCOMPARE(audio.playbackRate(), qreal(2.0));
+    QCOMPARE(provider.playerControl()->playbackRate(), qreal(2.0));
+    QCOMPARE(spy.count(), 3);
+}
+
+void tst_QmlAudio::status()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy statusChangedSpy(&audio, SIGNAL(statusChanged()));
+    QSignalSpy loadedSpy(&audio, SIGNAL(loaded()));
+    QSignalSpy bufferingSpy(&audio, SIGNAL(buffering()));
+    QSignalSpy stalledSpy(&audio, SIGNAL(stalled()));
+    QSignalSpy bufferedSpy(&audio, SIGNAL(buffered()));
+    QSignalSpy endOfMediaSpy(&audio, SIGNAL(endOfMedia()));
+
+    QCOMPARE(audio.status(), QDeclarativeAudio::NoMedia);
+
+    // Set media, start loading.
+    provider.playerControl()->updateMediaStatus(QMediaPlayer::LoadingMedia);
+    QCOMPARE(audio.status(), QDeclarativeAudio::Loading);
+    QCOMPARE(statusChangedSpy.count(), 1);
+    QCOMPARE(loadedSpy.count(), 0);
+    QCOMPARE(bufferingSpy.count(), 0);
+    QCOMPARE(stalledSpy.count(), 0);
+    QCOMPARE(bufferedSpy.count(), 0);
+    QCOMPARE(endOfMediaSpy.count(), 0);
+
+    // Finish loading.
+    provider.playerControl()->updateMediaStatus(QMediaPlayer::LoadedMedia);
+    QCOMPARE(audio.status(), QDeclarativeAudio::Loaded);
+    QCOMPARE(statusChangedSpy.count(), 2);
+    QCOMPARE(loadedSpy.count(), 1);
+    QCOMPARE(bufferingSpy.count(), 0);
+    QCOMPARE(stalledSpy.count(), 0);
+    QCOMPARE(bufferedSpy.count(), 0);
+    QCOMPARE(endOfMediaSpy.count(), 0);
+
+    // Play, start buffering.
+    provider.playerControl()->updateMediaStatus(
+            QMediaPlayer::StalledMedia, QMediaPlayer::PlayingState);
+    QCOMPARE(audio.status(), QDeclarativeAudio::Stalled);
+    QCOMPARE(statusChangedSpy.count(), 3);
+    QCOMPARE(loadedSpy.count(), 1);
+    QCOMPARE(bufferingSpy.count(), 0);
+    QCOMPARE(stalledSpy.count(), 1);
+    QCOMPARE(bufferedSpy.count(), 0);
+    QCOMPARE(endOfMediaSpy.count(), 0);
+
+    // Enough data buffered to proceed.
+    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferingMedia);
+    QCOMPARE(audio.status(), QDeclarativeAudio::Buffering);
+    QCOMPARE(statusChangedSpy.count(), 4);
+    QCOMPARE(loadedSpy.count(), 1);
+    QCOMPARE(bufferingSpy.count(), 1);
+    QCOMPARE(stalledSpy.count(), 1);
+    QCOMPARE(bufferedSpy.count(), 0);
+    QCOMPARE(endOfMediaSpy.count(), 0);
+
+    // Errant second buffering status changed.
+    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferingMedia);
+    QCOMPARE(audio.status(), QDeclarativeAudio::Buffering);
+    QCOMPARE(statusChangedSpy.count(), 4);
+    QCOMPARE(loadedSpy.count(), 1);
+    QCOMPARE(bufferingSpy.count(), 1);
+    QCOMPARE(stalledSpy.count(), 1);
+    QCOMPARE(bufferedSpy.count(), 0);
+    QCOMPARE(endOfMediaSpy.count(), 0);
+
+    // Buffer full.
+    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferedMedia);
+    QCOMPARE(audio.status(), QDeclarativeAudio::Buffered);
+    QCOMPARE(statusChangedSpy.count(), 5);
+    QCOMPARE(loadedSpy.count(), 1);
+    QCOMPARE(bufferingSpy.count(), 1);
+    QCOMPARE(stalledSpy.count(), 1);
+    QCOMPARE(bufferedSpy.count(), 1);
+    QCOMPARE(endOfMediaSpy.count(), 0);
+
+    // Buffer getting low.
+    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferingMedia);
+    QCOMPARE(audio.status(), QDeclarativeAudio::Buffering);
+    QCOMPARE(statusChangedSpy.count(), 6);
+    QCOMPARE(loadedSpy.count(), 1);
+    QCOMPARE(bufferingSpy.count(), 2);
+    QCOMPARE(stalledSpy.count(), 1);
+    QCOMPARE(bufferedSpy.count(), 1);
+    QCOMPARE(endOfMediaSpy.count(), 0);
+
+    // Buffer full.
+    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferedMedia);
+    QCOMPARE(audio.status(), QDeclarativeAudio::Buffered);
+    QCOMPARE(statusChangedSpy.count(), 7);
+    QCOMPARE(loadedSpy.count(), 1);
+    QCOMPARE(bufferingSpy.count(), 2);
+    QCOMPARE(stalledSpy.count(), 1);
+    QCOMPARE(bufferedSpy.count(), 2);
+    QCOMPARE(endOfMediaSpy.count(), 0);
+
+    // Finished.
+    provider.playerControl()->updateMediaStatus(
+            QMediaPlayer::EndOfMedia, QMediaPlayer::StoppedState);
+    QCOMPARE(audio.status(), QDeclarativeAudio::EndOfMedia);
+    QCOMPARE(statusChangedSpy.count(), 8);
+    QCOMPARE(loadedSpy.count(), 1);
+    QCOMPARE(bufferingSpy.count(), 2);
+    QCOMPARE(stalledSpy.count(), 1);
+    QCOMPARE(bufferedSpy.count(), 2);
+    QCOMPARE(endOfMediaSpy.count(), 1);
+}
+
+void tst_QmlAudio::metaData_data()
+{
+    QTest::addColumn<QByteArray>("propertyName");
+    QTest::addColumn<QtMultimedia::MetaData>("propertyKey");
+    QTest::addColumn<QVariant>("value1");
+    QTest::addColumn<QVariant>("value2");
+
+    QTest::newRow("title")
+            << QByteArray("title")
+            << QtMultimedia::Title
+            << QVariant(QString::fromLatin1("This is a title"))
+            << QVariant(QString::fromLatin1("This is another title"));
+
+    QTest::newRow("genre")
+            << QByteArray("genre")
+            << QtMultimedia::Genre
+            << QVariant(QString::fromLatin1("rock"))
+            << QVariant(QString::fromLatin1("pop"));
+
+    QTest::newRow("trackNumber")
+            << QByteArray("trackNumber")
+            << QtMultimedia::TrackNumber
+            << QVariant(8)
+            << QVariant(12);
+}
+
+void tst_QmlAudio::metaData()
+{
+    QFETCH(QByteArray, propertyName);
+    QFETCH(QtMultimedia::MetaData, propertyKey);
+    QFETCH(QVariant, value1);
+    QFETCH(QVariant, value2);
+
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy spy(&audio, SIGNAL(__metaDataChanged()));
+
+    const int index = audio.metaObject()->indexOfProperty(propertyName.constData());
+    QVERIFY(index != -1);
+
+    QMetaProperty property = audio.metaObject()->property(index);
+    QCOMPARE(property.read(&audio), QVariant());
+
+    property.write(&audio, value1);
+    QCOMPARE(property.read(&audio), value1);
+    QCOMPARE(provider.metaDataControl()->metaData(propertyKey), value1);
+    QCOMPARE(spy.count(), 1);
+
+    provider.metaDataControl()->setMetaData(propertyKey, value2);
+    QCOMPARE(property.read(&audio), value2);
+    QCOMPARE(spy.count(), 2);
+}
+
+void tst_QmlAudio::error()
+{
+    const QString errorString = QLatin1String("Failed to open device.");
+
+    QtTestMediaServiceProvider provider;
+    QDeclarativeAudio audio;
+
+    QSignalSpy errorSpy(&audio, SIGNAL(error(QDeclarativeAudio::Error,QString)));
+    QSignalSpy errorChangedSpy(&audio, SIGNAL(errorChanged()));
+
+    QCOMPARE(audio.error(), QDeclarativeAudio::NoError);
+    QCOMPARE(audio.errorString(), QString());
+
+    provider.playerControl()->emitError(QMediaPlayer::ResourceError, errorString);
+
+    QCOMPARE(audio.error(), QDeclarativeAudio::ResourceError);
+    QCOMPARE(audio.errorString(), errorString);
+    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorChangedSpy.count(), 1);
+
+    // Changing the source resets the error properties.
+    audio.setSource(QUrl("http://example.com"));
+    QCOMPARE(audio.error(), QDeclarativeAudio::NoError);
+    QCOMPARE(audio.errorString(), QString());
+    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorChangedSpy.count(), 2);
+
+    // But isn't noisy.
+    audio.setSource(QUrl("file:///file/path"));
+    QCOMPARE(audio.error(), QDeclarativeAudio::NoError);
+    QCOMPARE(audio.errorString(), QString());
+    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorChangedSpy.count(), 2);
+}
+
+
+QTEST_MAIN(tst_QmlAudio)
+
+#include "tst_qdeclarativeaudio.moc"
diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
new file mode 100644
index 0000000..0cd7879
--- /dev/null
+++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+SOURCES += tst_qdeclarativevideo.cpp
+
+QT += multimedia declarative
+requires(contains(QT_CONFIG, multimedia))
+requires(contains(QT_CONFIG, declarative))
diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
new file mode 100644
index 0000000..9fc1e70
--- /dev/null
+++ b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
@@ -0,0 +1,911 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <QtMultimedia/private/qdeclarativevideo_p.h>
+
+#include <QtGui/qapplication.h>
+#include <QtMultimedia/qabstractvideosurface.h>
+#include <QtMultimedia/qgraphicsvideoitem.h>
+#include <QtMultimedia/qmediaplayercontrol.h>
+#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimedia/qvideooutputcontrol.h>
+#include <QtMultimedia/qvideorenderercontrol.h>
+#include <QtMultimedia/qvideosurfaceformat.h>
+
+
+class tst_QmlGraphicsVideo : public QObject
+{
+    Q_OBJECT
+public slots:
+    void initTestCase();
+
+private slots:
+    void nullPlayerControl();
+    void nullService();
+
+    void playing();
+    void paused();
+    void error();
+
+    void hasAudio();
+    void hasVideo();
+    void fillMode();
+    void geometry();
+};
+
+Q_DECLARE_METATYPE(QtMultimedia::MetaData);
+Q_DECLARE_METATYPE(QDeclarativeVideo::Error);
+
+class QtTestMediaPlayerControl : public QMediaPlayerControl
+{
+    Q_OBJECT
+public:
+    QtTestMediaPlayerControl(QObject *parent = 0)
+        : QMediaPlayerControl(parent)
+        , m_state(QMediaPlayer::StoppedState)
+        , m_mediaStatus(QMediaPlayer::NoMedia)
+        , m_duration(0)
+        , m_position(0)
+        , m_playbackRate(1.0)
+        , m_volume(50)
+        , m_bufferStatus(0)
+        , m_muted(false)
+        , m_audioAvailable(false)
+        , m_videoAvailable(false)
+        , m_seekable(false)
+    {
+    }
+
+    QMediaPlayer::State state() const { return m_state; }
+    void updateState(QMediaPlayer::State state) { emit stateChanged(m_state = state); }
+
+    QMediaPlayer::MediaStatus mediaStatus() const { return m_mediaStatus; }
+    void updateMediaStatus(QMediaPlayer::MediaStatus status) {
+        emit mediaStatusChanged(m_mediaStatus = status); }
+    void updateMediaStatus(QMediaPlayer::MediaStatus status, QMediaPlayer::State state)
+    {
+        m_mediaStatus = status;
+        m_state = state;
+
+        emit mediaStatusChanged(m_mediaStatus);
+        emit stateChanged(m_state);
+    }
+
+    qint64 duration() const { return m_duration; }
+    void setDuration(qint64 duration) { emit durationChanged(m_duration = duration); }
+
+    qint64 position() const { return m_position; }
+    void setPosition(qint64 position) { emit positionChanged(m_position = position); }
+
+    int volume() const { return m_volume; }
+    void setVolume(int volume) { emit volumeChanged(m_volume = volume); }
+
+    bool isMuted() const { return m_muted; }
+    void setMuted(bool muted) { emit mutedChanged(m_muted = muted); }
+
+    int bufferStatus() const { return m_bufferStatus; }
+    void setBufferStatus(int status) { emit bufferStatusChanged(m_bufferStatus = status); }
+
+    bool isAudioAvailable() const { return m_audioAvailable; }
+    void setAudioAvailable(bool available) {
+        emit audioAvailableChanged(m_audioAvailable = available); }
+    bool isVideoAvailable() const { return m_videoAvailable; }
+    void setVideoAvailable(bool available) {
+        emit videoAvailableChanged(m_videoAvailable = available); }
+
+    bool isSeekable() const { return m_seekable; }
+    void setSeekable(bool seekable) { emit seekableChanged(m_seekable = seekable); }
+
+    QMediaTimeRange availablePlaybackRanges() const { return QMediaTimeRange(); }
+
+    qreal playbackRate() const { return m_playbackRate; }
+    void setPlaybackRate(qreal rate) { emit playbackRateChanged(m_playbackRate = rate); }
+
+    QMediaContent media() const { return m_media; }
+    const QIODevice *mediaStream() const { return 0; }
+    void setMedia(const QMediaContent &media, QIODevice *)
+    {
+        m_media = media;
+
+        m_mediaStatus = m_media.isNull()
+                ? QMediaPlayer::NoMedia
+                : QMediaPlayer::LoadingMedia;
+
+        emit mediaChanged(m_media);
+        emit mediaStatusChanged(m_mediaStatus);
+    }
+
+    void play() { emit stateChanged(m_state = QMediaPlayer::PlayingState); }
+    void pause() { emit stateChanged(m_state = QMediaPlayer::PausedState); }
+    void stop() { emit stateChanged(m_state = QMediaPlayer::StoppedState); }
+
+    void emitError(QMediaPlayer::Error err, const QString &errorString) {
+        emit error(err, errorString); }
+
+private:
+    QMediaPlayer::State m_state;
+    QMediaPlayer::MediaStatus m_mediaStatus;
+    qint64 m_duration;
+    qint64 m_position;
+    qreal m_playbackRate;
+    int m_volume;
+    int m_bufferStatus;
+    bool m_muted;
+    bool m_audioAvailable;
+    bool m_videoAvailable;
+    bool m_seekable;
+    QMediaContent m_media;
+};
+
+class QtTestOutputControl : public QVideoOutputControl
+{
+public:
+    QtTestOutputControl(QObject *parent) : QVideoOutputControl(parent), m_output(NoOutput) {}
+
+    QList<Output> availableOutputs() const { return m_outputs; }
+    void setAvailableOutputs(const QList<Output> outputs) { m_outputs = outputs; }
+
+    Output output() const { return m_output; }
+    virtual void setOutput(Output output) { m_output = output; }
+
+private:
+    Output m_output;
+    QList<Output> m_outputs;
+};
+
+class QtTestRendererControl : public QVideoRendererControl
+{
+public:
+    QtTestRendererControl(QObject *parent ) : QVideoRendererControl(parent), m_surface(0) {}
+
+    QAbstractVideoSurface *surface() const { return m_surface; }
+    void setSurface(QAbstractVideoSurface *surface) { m_surface = surface; }
+
+private:
+    QAbstractVideoSurface *m_surface;
+};
+
+class QtTestMediaService : public QMediaService
+{
+    Q_OBJECT
+public:
+    QtTestMediaService(
+            QtTestMediaPlayerControl *playerControl,
+            QtTestOutputControl *outputControl,
+            QtTestRendererControl *rendererControl,
+            QObject *parent)
+        : QMediaService(parent)
+        , playerControl(playerControl)
+        , outputControl(outputControl)
+        , rendererControl(rendererControl)
+    {
+    }
+
+    QMediaControl *control(const char *name) const
+    {
+        if (qstrcmp(name, QMediaPlayerControl_iid) == 0)
+            return playerControl;
+        else if (qstrcmp(name, QVideoOutputControl_iid) == 0)
+            return outputControl;
+        else if (qstrcmp(name, QVideoRendererControl_iid) == 0)
+            return rendererControl;
+        else
+            return 0;
+    }
+
+    QtTestMediaPlayerControl *playerControl;
+    QtTestOutputControl *outputControl;
+    QtTestRendererControl *rendererControl;
+};
+
+class QtTestMediaServiceProvider : public QMediaServiceProvider
+{
+    Q_OBJECT
+public:
+    QtTestMediaServiceProvider()
+        : service(new QtTestMediaService(
+                new QtTestMediaPlayerControl(this),
+                new QtTestOutputControl(this),
+                new QtTestRendererControl(this),
+                this))
+    {
+        setDefaultServiceProvider(this);
+    }
+
+    QtTestMediaServiceProvider(QtTestMediaService *service)
+        : service(service)
+    {
+        setDefaultServiceProvider(this);
+    }
+
+    QtTestMediaServiceProvider(
+            QtTestMediaPlayerControl *playerControl,
+            QtTestOutputControl *outputControl,
+            QtTestRendererControl *rendererControl)
+        : service(new QtTestMediaService(playerControl, outputControl, rendererControl, this))
+    {
+        setDefaultServiceProvider(this);
+    }
+
+    ~QtTestMediaServiceProvider()
+    {
+        setDefaultServiceProvider(0);
+    }
+
+    QMediaService *requestService(
+            const QByteArray &type,
+            const QMediaServiceProviderHint & = QMediaServiceProviderHint())
+    {
+        requestedService = type;
+
+        return service;
+    }
+
+    void releaseService(QMediaService *) {}
+
+    inline QtTestMediaPlayerControl *playerControl() { return service->playerControl; }
+    inline QtTestRendererControl *rendererControl() { return service->rendererControl; }
+
+    QtTestMediaService *service;
+    QByteArray requestedService;
+};
+
+
+void tst_QmlGraphicsVideo::initTestCase()
+{
+    qRegisterMetaType<QDeclarativeVideo::Error>();
+}
+
+void tst_QmlGraphicsVideo::nullPlayerControl()
+{
+    QtTestMediaServiceProvider provider(0, 0, 0);
+
+    QDeclarativeVideo video;
+
+    QCOMPARE(video.source(), QUrl());
+    video.setSource(QUrl("http://example.com"));
+    QCOMPARE(video.source(), QUrl());
+
+    QCOMPARE(video.isPlaying(), false);
+    video.setPlaying(true);
+    QCOMPARE(video.isPlaying(), false);
+    video.play();
+    QCOMPARE(video.isPlaying(), false);
+
+    QCOMPARE(video.isPaused(), false);
+    video.pause();
+    QCOMPARE(video.isPaused(), false);
+    video.setPaused(true);
+    QCOMPARE(video.isPaused(), true);
+
+    QCOMPARE(video.duration(), 0);
+
+    QCOMPARE(video.position(), 0);
+    video.setPosition(10000);
+    QCOMPARE(video.position(), 0);
+
+    QCOMPARE(video.volume(), qreal(0));
+    video.setVolume(50);
+    QCOMPARE(video.volume(), qreal(0));
+
+    QCOMPARE(video.isMuted(), false);
+    video.setMuted(true);
+    QCOMPARE(video.isMuted(), false);
+
+    QCOMPARE(video.bufferProgress(), qreal(0));
+
+    QCOMPARE(video.isSeekable(), false);
+
+    QCOMPARE(video.playbackRate(), qreal(1.0));
+
+    QCOMPARE(video.hasAudio(), false);
+    QCOMPARE(video.hasVideo(), false);
+
+    QCOMPARE(video.status(), QDeclarativeVideo::NoMedia);
+
+    QCOMPARE(video.error(), QDeclarativeVideo::ServiceMissing);
+}
+
+void tst_QmlGraphicsVideo::nullService()
+{
+    QtTestMediaServiceProvider provider(0);
+
+    QDeclarativeVideo video;
+
+    QCOMPARE(video.source(), QUrl());
+    video.setSource(QUrl("http://example.com"));
+    QCOMPARE(video.source(), QUrl());
+
+    QCOMPARE(video.isPlaying(), false);
+    video.setPlaying(true);
+    QCOMPARE(video.isPlaying(), false);
+    video.play();
+    QCOMPARE(video.isPlaying(), false);
+
+    QCOMPARE(video.isPaused(), false);
+    video.pause();
+    QCOMPARE(video.isPaused(), false);
+    video.setPaused(true);
+    QCOMPARE(video.isPaused(), true);
+
+    QCOMPARE(video.duration(), 0);
+
+    QCOMPARE(video.position(), 0);
+    video.setPosition(10000);
+    QCOMPARE(video.position(), 0);
+
+    QCOMPARE(video.volume(), qreal(0));
+    video.setVolume(50);
+    QCOMPARE(video.volume(), qreal(0));
+
+    QCOMPARE(video.isMuted(), false);
+    video.setMuted(true);
+    QCOMPARE(video.isMuted(), false);
+
+    QCOMPARE(video.bufferProgress(), qreal(0));
+
+    QCOMPARE(video.isSeekable(), false);
+
+    QCOMPARE(video.playbackRate(), qreal(1.0));
+
+    QCOMPARE(video.hasAudio(), false);
+    QCOMPARE(video.hasVideo(), false);
+
+    QCOMPARE(video.status(), QDeclarativeVideo::NoMedia);
+
+    QCOMPARE(video.error(), QDeclarativeVideo::ServiceMissing);
+
+    QCOMPARE(video.metaObject()->indexOfProperty("title"), -1);
+    QCOMPARE(video.metaObject()->indexOfProperty("genre"), -1);
+    QCOMPARE(video.metaObject()->indexOfProperty("description"), -1);
+}
+
+void tst_QmlGraphicsVideo::playing()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeVideo video;
+
+    QSignalSpy playingChangedSpy(&video, SIGNAL(playingChanged()));
+    QSignalSpy startedSpy(&video, SIGNAL(started()));
+    QSignalSpy stoppedSpy(&video, SIGNAL(stopped()));
+
+    int playingChanged = 0;
+    int started = 0;
+    int stopped = 0;
+
+    QCOMPARE(video.isPlaying(), false);
+
+    // setPlaying(true) when stopped.
+    video.setPlaying(true);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when playing.
+    video.setPlaying(false);
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // play() when stopped.
+    video.play();
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // stop() when playing.
+    video.stop();
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // stop() when stopped.
+    video.stop();
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when stopped.
+    video.setPlaying(false);
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    video.setPlaying(true);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(true) when playing.
+    video.setPlaying(true);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // play() when playing.
+    video.play();
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+}
+
+void tst_QmlGraphicsVideo::paused()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeVideo video;
+
+    QSignalSpy playingChangedSpy(&video, SIGNAL(playingChanged()));
+    QSignalSpy pausedChangedSpy(&video, SIGNAL(pausedChanged()));
+    QSignalSpy startedSpy(&video, SIGNAL(started()));
+    QSignalSpy pausedSpy(&video, SIGNAL(paused()));
+    QSignalSpy resumedSpy(&video, SIGNAL(resumed()));
+    QSignalSpy stoppedSpy(&video, SIGNAL(stopped()));
+
+    int playingChanged = 0;
+    int pausedChanged = 0;
+    int started = 0;
+    int paused = 0;
+    int resumed = 0;
+    int stopped = 0;
+
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), false);
+
+    // setPlaying(true) when stopped.
+    video.setPlaying(true);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(true) when playing.
+    video.setPaused(true);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(true) when paused.
+    video.setPaused(true);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // pause() when paused.
+    video.pause();
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(false) when paused.
+    video.setPaused(false);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),        ++resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(false) when playing.
+    video.setPaused(false);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // pause() when playing.
+    video.pause();
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when paused.
+    video.setPlaying(false);
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // setPaused(true) when stopped and paused.
+    video.setPaused(true);
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(false) when stopped and paused.
+    video.setPaused(false);
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(true) when stopped.
+    video.setPaused(true);
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(true) when stopped and paused.
+    video.setPlaying(true);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // play() when paused.
+    video.play();
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),        ++resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPaused(true) when playing.
+    video.setPaused(true);
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // stop() when paused.
+    video.stop();
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // setPaused(true) when stopped.
+    video.setPaused(true);
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // stop() when stopped and paused.
+    video.stop();
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(),   playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // pause() when stopped.
+    video.pause();
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when paused.
+    video.setPlaying(false);
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // pause() when stopped and paused.
+    video.pause();
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),         ++paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+
+    // setPlaying(false) when paused.
+    video.setPlaying(false);
+    QCOMPARE(video.isPlaying(), false);
+    QCOMPARE(video.isPaused(), true);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
+    QCOMPARE(startedSpy.count(),          started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),        ++stopped);
+
+    // play() when stopped and paused.
+    video.play();
+    QCOMPARE(video.isPlaying(), true);
+    QCOMPARE(video.isPaused(), false);
+    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
+    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
+    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
+    QCOMPARE(startedSpy.count(),        ++started);
+    QCOMPARE(pausedSpy.count(),           paused);
+    QCOMPARE(resumedSpy.count(),          resumed);
+    QCOMPARE(stoppedSpy.count(),          stopped);
+}
+
+void tst_QmlGraphicsVideo::error()
+{
+    const QString errorString = QLatin1String("Failed to open device.");
+
+    QtTestMediaServiceProvider provider;
+    QDeclarativeVideo video;
+
+    QSignalSpy errorSpy(&video, SIGNAL(error(QDeclarativeVideo::Error,QString)));
+    QSignalSpy errorChangedSpy(&video, SIGNAL(errorChanged()));
+
+    QCOMPARE(video.error(), QDeclarativeVideo::NoError);
+    QCOMPARE(video.errorString(), QString());
+
+    provider.playerControl()->emitError(QMediaPlayer::ResourceError, errorString);
+
+    QCOMPARE(video.error(), QDeclarativeVideo::ResourceError);
+    QCOMPARE(video.errorString(), errorString);
+    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorChangedSpy.count(), 1);
+
+    // Changing the source resets the error properties.
+    video.setSource(QUrl("http://example.com"));
+    QCOMPARE(video.error(), QDeclarativeVideo::NoError);
+    QCOMPARE(video.errorString(), QString());
+    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorChangedSpy.count(), 2);
+
+    // But isn't noisy.
+    video.setSource(QUrl("file:///file/path"));
+    QCOMPARE(video.error(), QDeclarativeVideo::NoError);
+    QCOMPARE(video.errorString(), QString());
+    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorChangedSpy.count(), 2);
+}
+
+
+void tst_QmlGraphicsVideo::hasAudio()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeVideo video;
+
+    QSignalSpy spy(&video, SIGNAL(hasAudioChanged()));
+
+    QCOMPARE(video.hasAudio(), false);
+
+    provider.playerControl()->setAudioAvailable(true);
+    QCOMPARE(video.hasAudio(), true);
+    QCOMPARE(spy.count(), 1);
+
+    provider.playerControl()->setAudioAvailable(true);
+    QCOMPARE(video.hasAudio(), true);
+    QCOMPARE(spy.count(), 2);
+
+    provider.playerControl()->setAudioAvailable(false);
+    QCOMPARE(video.hasAudio(), false);
+    QCOMPARE(spy.count(), 3);
+}
+
+void tst_QmlGraphicsVideo::hasVideo()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeVideo video;
+
+    QSignalSpy spy(&video, SIGNAL(hasVideoChanged()));
+
+    QCOMPARE(video.hasVideo(), false);
+
+    provider.playerControl()->setVideoAvailable(true);
+    QCOMPARE(video.hasVideo(), true);
+    QCOMPARE(spy.count(), 1);
+
+    provider.playerControl()->setVideoAvailable(true);
+    QCOMPARE(video.hasVideo(), true);
+    QCOMPARE(spy.count(), 2);
+
+    provider.playerControl()->setVideoAvailable(false);
+    QCOMPARE(video.hasVideo(), false);
+    QCOMPARE(spy.count(), 3);
+}
+
+void tst_QmlGraphicsVideo::fillMode()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeVideo video;
+
+    QList<QGraphicsItem *> children = video.childItems();
+    QCOMPARE(children.count(), 1);
+    QGraphicsVideoItem *videoItem = qgraphicsitem_cast<QGraphicsVideoItem *>(children.first());
+    QVERIFY(videoItem != 0);
+
+    QCOMPARE(video.fillMode(), QDeclarativeVideo::PreserveAspectFit);
+
+    video.setFillMode(QDeclarativeVideo::PreserveAspectCrop);
+    QCOMPARE(video.fillMode(), QDeclarativeVideo::PreserveAspectCrop);
+    QCOMPARE(videoItem->aspectRatioMode(), Qt::KeepAspectRatioByExpanding);
+
+    video.setFillMode(QDeclarativeVideo::Stretch);
+    QCOMPARE(video.fillMode(), QDeclarativeVideo::Stretch);
+    QCOMPARE(videoItem->aspectRatioMode(), Qt::IgnoreAspectRatio);
+
+    video.setFillMode(QDeclarativeVideo::PreserveAspectFit);
+    QCOMPARE(video.fillMode(), QDeclarativeVideo::PreserveAspectFit);
+    QCOMPARE(videoItem->aspectRatioMode(), Qt::KeepAspectRatio);
+}
+
+void tst_QmlGraphicsVideo::geometry()
+{
+    QtTestMediaServiceProvider provider;
+    QDeclarativeVideo video;
+
+    QAbstractVideoSurface *surface = provider.rendererControl()->surface();
+    QVERIFY(surface != 0);
+
+    QList<QGraphicsItem *> children = video.childItems();
+    QCOMPARE(children.count(), 1);
+    QGraphicsVideoItem *videoItem = qgraphicsitem_cast<QGraphicsVideoItem *>(children.first());
+    QVERIFY(videoItem != 0);
+
+    QVideoSurfaceFormat format(QSize(640, 480), QVideoFrame::Format_RGB32);
+
+    QVERIFY(surface->start(format));
+
+    QCOMPARE(video.implicitWidth(), qreal(640));
+    QCOMPARE(video.implicitHeight(), qreal(480));
+
+    video.setWidth(560);
+    video.setHeight(328);
+
+    QCOMPARE(videoItem->size().width(), qreal(560));
+    QCOMPARE(videoItem->size().height(), qreal(328));
+}
+
+QTEST_MAIN(tst_QmlGraphicsVideo)
+
+#include "tst_qdeclarativevideo.moc"
diff --git a/tests/auto/qmlaudio/qmlaudio.pro b/tests/auto/qmlaudio/qmlaudio.pro
deleted file mode 100644
index fe18761..0000000
--- a/tests/auto/qmlaudio/qmlaudio.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_qmlaudio.cpp
-
-QT += multimedia declarative
-requires(contains(QT_CONFIG, multimedia))
-requires(contains(QT_CONFIG, declarative))
diff --git a/tests/auto/qmlaudio/tst_qmlaudio.cpp b/tests/auto/qmlaudio/tst_qmlaudio.cpp
deleted file mode 100644
index 068317f..0000000
--- a/tests/auto/qmlaudio/tst_qmlaudio.cpp
+++ /dev/null
@@ -1,1200 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-
-#include <QtMultimedia/private/qmlaudio_p.h>
-
-#include <QtGui/qapplication.h>
-#include <QtMultimedia/qmediaplayercontrol.h>
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/qmetadatacontrol.h>
-
-
-class tst_QmlAudio : public QObject
-{
-    Q_OBJECT
-public slots:
-    void initTestCase();
-
-private slots:
-    void nullPlayerControl();
-    void nullMetaDataControl();
-    void nullService();
-
-    void source();
-    void playing();
-    void paused();
-    void duration();
-    void position();
-    void volume();
-    void muted();
-    void bufferProgress();
-    void seekable();
-    void playbackRate();
-    void status();
-    void metaData_data();
-    void metaData();
-    void error();
-};
-
-Q_DECLARE_METATYPE(QtMultimedia::MetaData);
-Q_DECLARE_METATYPE(QmlAudio::Error);
-
-class QtTestMediaPlayerControl : public QMediaPlayerControl
-{
-    Q_OBJECT
-public:
-    QtTestMediaPlayerControl(QObject *parent = 0)
-        : QMediaPlayerControl(parent)
-        , m_state(QMediaPlayer::StoppedState)
-        , m_mediaStatus(QMediaPlayer::NoMedia)
-        , m_duration(0)
-        , m_position(0)
-        , m_playbackRate(1.0)
-        , m_volume(50)
-        , m_bufferStatus(0)
-        , m_muted(false)
-        , m_audioAvailable(false)
-        , m_videoAvailable(false)
-        , m_seekable(false)
-    {
-    }
-
-    QMediaPlayer::State state() const { return m_state; }
-    void updateState(QMediaPlayer::State state) { emit stateChanged(m_state = state); }
-
-    QMediaPlayer::MediaStatus mediaStatus() const { return m_mediaStatus; }
-    void updateMediaStatus(QMediaPlayer::MediaStatus status) {
-        emit mediaStatusChanged(m_mediaStatus = status); }
-    void updateMediaStatus(QMediaPlayer::MediaStatus status, QMediaPlayer::State state)
-    {
-        m_mediaStatus = status;
-        m_state = state;
-
-        emit mediaStatusChanged(m_mediaStatus);
-        emit stateChanged(m_state);
-    }
-
-    qint64 duration() const { return m_duration; }
-    void setDuration(qint64 duration) { emit durationChanged(m_duration = duration); }
-
-    qint64 position() const { return m_position; }
-    void setPosition(qint64 position) { emit positionChanged(m_position = position); }
-
-    int volume() const { return m_volume; }
-    void setVolume(int volume) { emit volumeChanged(m_volume = volume); }
-
-    bool isMuted() const { return m_muted; }
-    void setMuted(bool muted) { emit mutedChanged(m_muted = muted); }
-
-    int bufferStatus() const { return m_bufferStatus; }
-    void setBufferStatus(int status) { emit bufferStatusChanged(m_bufferStatus = status); }
-
-    bool isAudioAvailable() const { return m_audioAvailable; }
-    void setAudioAvailable(bool available) {
-        emit audioAvailableChanged(m_audioAvailable = available); }
-    bool isVideoAvailable() const { return m_videoAvailable; }
-    void setVideoAvailable(bool available) {
-        emit videoAvailableChanged(m_videoAvailable = available); }
-
-    bool isSeekable() const { return m_seekable; }
-    void setSeekable(bool seekable) { emit seekableChanged(m_seekable = seekable); }
-
-    QMediaTimeRange availablePlaybackRanges() const { return QMediaTimeRange(); }
-
-    qreal playbackRate() const { return m_playbackRate; }
-    void setPlaybackRate(qreal rate) { emit playbackRateChanged(m_playbackRate = rate); }
-
-    QMediaContent media() const { return m_media; }
-    const QIODevice *mediaStream() const { return 0; }
-    void setMedia(const QMediaContent &media, QIODevice *)
-    {
-        m_media = media;
-
-        m_mediaStatus = m_media.isNull()
-                ? QMediaPlayer::NoMedia
-                : QMediaPlayer::LoadingMedia;
-
-        emit mediaChanged(m_media);
-        emit mediaStatusChanged(m_mediaStatus);
-    }
-
-    void play() { emit stateChanged(m_state = QMediaPlayer::PlayingState); }
-    void pause() { emit stateChanged(m_state = QMediaPlayer::PausedState); }
-    void stop() { emit stateChanged(m_state = QMediaPlayer::StoppedState); }
-
-    void emitError(QMediaPlayer::Error err, const QString &errorString) {
-        emit error(err, errorString); }
-
-private:
-    QMediaPlayer::State m_state;
-    QMediaPlayer::MediaStatus m_mediaStatus;
-    qint64 m_duration;
-    qint64 m_position;
-    qreal m_playbackRate;
-    int m_volume;
-    int m_bufferStatus;
-    bool m_muted;
-    bool m_audioAvailable;
-    bool m_videoAvailable;
-    bool m_seekable;
-    QMediaContent m_media;
-};
-
-class QtTestMetaDataControl : public QMetaDataControl
-{
-    Q_OBJECT
-public:
-    QtTestMetaDataControl(QObject *parent = 0)
-        : QMetaDataControl(parent)
-    {
-    }
-
-    bool isWritable() const { return true; }
-    bool isMetaDataAvailable() const { return true; }
-
-    QVariant metaData(QtMultimedia::MetaData key) const { return m_metaData.value(key); }
-    void setMetaData(QtMultimedia::MetaData key, const QVariant &value) {
-        m_metaData.insert(key, value); emit metaDataChanged(); }
-    void setMetaData(const QMap<QtMultimedia::MetaData, QVariant> &metaData) {
-        m_metaData = metaData; emit metaDataChanged(); }
-
-    QList<QtMultimedia::MetaData> availableMetaData() const { return m_metaData.keys(); }
-
-    QVariant extendedMetaData(const QString &) const { return QVariant(); }
-    void setExtendedMetaData(const QString &, const QVariant &) {}
-    QStringList availableExtendedMetaData() const { return QStringList(); }
-
-private:
-    QMap<QtMultimedia::MetaData, QVariant> m_metaData;
-};
-
-class QtTestMediaService : public QMediaService
-{
-    Q_OBJECT
-public:
-    QtTestMediaService(
-            QtTestMediaPlayerControl *playerControl,
-            QtTestMetaDataControl *metaDataControl,
-            QObject *parent)
-        : QMediaService(parent)
-        , playerControl(playerControl)
-        , metaDataControl(metaDataControl)
-    {
-    }
-
-    QMediaControl *control(const char *name) const
-    {
-        if (qstrcmp(name, QMediaPlayerControl_iid) == 0)
-            return playerControl;
-        else if (qstrcmp(name, QMetaDataControl_iid) == 0)
-            return metaDataControl;
-        else
-            return 0;
-    }
-
-    QtTestMediaPlayerControl *playerControl;
-    QtTestMetaDataControl *metaDataControl;
-};
-
-class QtTestMediaServiceProvider : public QMediaServiceProvider
-{
-    Q_OBJECT
-public:
-    QtTestMediaServiceProvider()
-        : service(new QtTestMediaService(
-                new QtTestMediaPlayerControl(this), new QtTestMetaDataControl(this), this))
-    {
-        setDefaultServiceProvider(this);
-    }
-
-    QtTestMediaServiceProvider(QtTestMediaService *service)
-        : service(service)
-    {
-        setDefaultServiceProvider(this);
-    }
-
-    QtTestMediaServiceProvider(
-            QtTestMediaPlayerControl *playerControl, QtTestMetaDataControl *metaDataControl)
-        : service(new QtTestMediaService(playerControl, metaDataControl, this))
-    {
-        setDefaultServiceProvider(this);
-    }
-
-    ~QtTestMediaServiceProvider()
-    {
-        setDefaultServiceProvider(0);
-    }
-
-    QMediaService *requestService(
-            const QByteArray &type,
-            const QMediaServiceProviderHint & = QMediaServiceProviderHint())
-    {
-        requestedService = type;
-
-        return service;
-    }
-
-    void releaseService(QMediaService *) {}
-
-    inline QtTestMediaPlayerControl *playerControl() { return service->playerControl; }
-    inline QtTestMetaDataControl *metaDataControl() { return service->metaDataControl; }
-
-    QtTestMediaService *service;
-    QByteArray requestedService;
-};
-
-
-void tst_QmlAudio::initTestCase()
-{
-    qRegisterMetaType<QmlAudio::Error>();
-}
-
-void tst_QmlAudio::nullPlayerControl()
-{
-    QtTestMetaDataControl metaDataControl;
-    QtTestMediaServiceProvider provider(0, &metaDataControl);
-
-    QmlAudio audio;
-
-    QCOMPARE(audio.source(), QUrl());
-    audio.setSource(QUrl("http://example.com"));
-    QCOMPARE(audio.source(), QUrl());
-
-    QCOMPARE(audio.isPlaying(), false);
-    audio.setPlaying(true);
-    QCOMPARE(audio.isPlaying(), false);
-    audio.play();
-    QCOMPARE(audio.isPlaying(), false);
-
-    QCOMPARE(audio.isPaused(), false);
-    audio.pause();
-    QCOMPARE(audio.isPaused(), false);
-    audio.setPaused(true);
-    QCOMPARE(audio.isPaused(), true);
-
-    QCOMPARE(audio.duration(), 0);
-
-    QCOMPARE(audio.position(), 0);
-    audio.setPosition(10000);
-    QCOMPARE(audio.position(), 0);
-
-    QCOMPARE(audio.volume(), qreal(0));
-    audio.setVolume(50);
-    QCOMPARE(audio.volume(), qreal(0));
-
-    QCOMPARE(audio.isMuted(), false);
-    audio.setMuted(true);
-    QCOMPARE(audio.isMuted(), false);
-
-    QCOMPARE(audio.bufferProgress(), qreal(0));
-
-    QCOMPARE(audio.isSeekable(), false);
-
-    QCOMPARE(audio.playbackRate(), qreal(1.0));
-
-    QCOMPARE(audio.status(), QmlAudio::NoMedia);
-
-    QCOMPARE(audio.error(), QmlAudio::ServiceMissing);
-}
-
-void tst_QmlAudio::nullMetaDataControl()
-{
-    QtTestMediaPlayerControl playerControl;
-    QtTestMediaServiceProvider provider(&playerControl, 0);
-
-    QmlAudio audio;
-
-    QCOMPARE(audio.metaObject()->indexOfProperty("title"), -1);
-    QCOMPARE(audio.metaObject()->indexOfProperty("genre"), -1);
-    QCOMPARE(audio.metaObject()->indexOfProperty("description"), -1);
-}
-
-void tst_QmlAudio::nullService()
-{
-    QtTestMediaServiceProvider provider(0);
-
-    QmlAudio audio;
-
-    QCOMPARE(audio.source(), QUrl());
-    audio.setSource(QUrl("http://example.com"));
-    QCOMPARE(audio.source(), QUrl());
-
-    QCOMPARE(audio.isPlaying(), false);
-    audio.setPlaying(true);
-    QCOMPARE(audio.isPlaying(), false);
-    audio.play();
-    QCOMPARE(audio.isPlaying(), false);
-
-    QCOMPARE(audio.isPaused(), false);
-    audio.pause();
-    QCOMPARE(audio.isPaused(), false);
-    audio.setPaused(true);
-    QCOMPARE(audio.isPaused(), true);
-
-    QCOMPARE(audio.duration(), 0);
-
-    QCOMPARE(audio.position(), 0);
-    audio.setPosition(10000);
-    QCOMPARE(audio.position(), 0);
-
-    QCOMPARE(audio.volume(), qreal(0));
-    audio.setVolume(50);
-    QCOMPARE(audio.volume(), qreal(0));
-
-    QCOMPARE(audio.isMuted(), false);
-    audio.setMuted(true);
-    QCOMPARE(audio.isMuted(), false);
-
-    QCOMPARE(audio.bufferProgress(), qreal(0));
-
-    QCOMPARE(audio.isSeekable(), false);
-
-    QCOMPARE(audio.playbackRate(), qreal(1.0));
-
-    QCOMPARE(audio.status(), QmlAudio::NoMedia);
-
-    QCOMPARE(audio.error(), QmlAudio::ServiceMissing);
-
-    QCOMPARE(audio.metaObject()->indexOfProperty("title"), -1);
-    QCOMPARE(audio.metaObject()->indexOfProperty("genre"), -1);
-    QCOMPARE(audio.metaObject()->indexOfProperty("description"), -1);
-}
-
-void tst_QmlAudio::source()
-{
-    const QUrl url1("http://example.com");
-    const QUrl url2("file:///local/path");
-    const QUrl url3;
-
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy spy(&audio, SIGNAL(sourceChanged()));
-
-    audio.setSource(url1);
-    QCOMPARE(audio.source(), url1);
-    QCOMPARE(provider.playerControl()->media().canonicalUrl(), url1);
-    QCOMPARE(spy.count(), 1);
-
-    audio.setSource(url2);
-    QCOMPARE(audio.source(), url2);
-    QCOMPARE(provider.playerControl()->media().canonicalUrl(), url2);
-    QCOMPARE(spy.count(), 2);
-
-    audio.setSource(url3);
-    QCOMPARE(audio.source(), url3);
-    QCOMPARE(provider.playerControl()->media().canonicalUrl(), url3);
-    QCOMPARE(spy.count(), 3);
-}
-
-void tst_QmlAudio::playing()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy playingChangedSpy(&audio, SIGNAL(playingChanged()));
-    QSignalSpy startedSpy(&audio, SIGNAL(started()));
-    QSignalSpy stoppedSpy(&audio, SIGNAL(stopped()));
-
-    int playingChanged = 0;
-    int started = 0;
-    int stopped = 0;
-
-    QCOMPARE(audio.isPlaying(), false);
-
-    // setPlaying(true) when stopped.
-    audio.setPlaying(true);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when playing.
-    audio.setPlaying(false);
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // play() when stopped.
-    audio.play();
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // stop() when playing.
-    audio.stop();
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // stop() when stopped.
-    audio.stop();
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when stopped.
-    audio.setPlaying(false);
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    audio.setPlaying(true);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(true) when playing.
-    audio.setPlaying(true);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // play() when playing.
-    audio.play();
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-}
-
-void tst_QmlAudio::paused()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy playingChangedSpy(&audio, SIGNAL(playingChanged()));
-    QSignalSpy pausedChangedSpy(&audio, SIGNAL(pausedChanged()));
-    QSignalSpy startedSpy(&audio, SIGNAL(started()));
-    QSignalSpy pausedSpy(&audio, SIGNAL(paused()));
-    QSignalSpy resumedSpy(&audio, SIGNAL(resumed()));
-    QSignalSpy stoppedSpy(&audio, SIGNAL(stopped()));
-
-    int playingChanged = 0;
-    int pausedChanged = 0;
-    int started = 0;
-    int paused = 0;
-    int resumed = 0;
-    int stopped = 0;
-
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), false);
-
-    // setPlaying(true) when stopped.
-    audio.setPlaying(true);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(true) when playing.
-    audio.setPaused(true);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(true) when paused.
-    audio.setPaused(true);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // pause() when paused.
-    audio.pause();
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(false) when paused.
-    audio.setPaused(false);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),        ++resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(false) when playing.
-    audio.setPaused(false);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // pause() when playing.
-    audio.pause();
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when paused.
-    audio.setPlaying(false);
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // setPaused(true) when stopped and paused.
-    audio.setPaused(true);
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(false) when stopped and paused.
-    audio.setPaused(false);
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(true) when stopped.
-    audio.setPaused(true);
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(true) when stopped and paused.
-    audio.setPlaying(true);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // play() when paused.
-    audio.play();
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),        ++resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(true) when playing.
-    audio.setPaused(true);
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // stop() when paused.
-    audio.stop();
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // setPaused(true) when stopped.
-    audio.setPaused(true);
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // stop() when stopped and paused.
-    audio.stop();
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // pause() when stopped.
-    audio.pause();
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when paused.
-    audio.setPlaying(false);
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // pause() when stopped and paused.
-    audio.pause();
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when paused.
-    audio.setPlaying(false);
-    QCOMPARE(audio.isPlaying(), false);
-    QCOMPARE(audio.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // play() when stopped and paused.
-    audio.play();
-    QCOMPARE(audio.isPlaying(), true);
-    QCOMPARE(audio.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-}
-
-void tst_QmlAudio::duration()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy spy(&audio, SIGNAL(durationChanged()));
-
-    QCOMPARE(audio.duration(), 0);
-
-    provider.playerControl()->setDuration(4040);
-    QCOMPARE(audio.duration(), 4040);
-    QCOMPARE(spy.count(), 1);
-
-    provider.playerControl()->setDuration(-129);
-    QCOMPARE(audio.duration(), -129);
-    QCOMPARE(spy.count(), 2);
-
-    provider.playerControl()->setDuration(0);
-    QCOMPARE(audio.duration(), 0);
-    QCOMPARE(spy.count(), 3);
-
-    // Unnecessary duration changed signals aren't filtered.
-    provider.playerControl()->setDuration(0);
-    QCOMPARE(audio.duration(), 0);
-    QCOMPARE(spy.count(), 4);
-}
-
-void tst_QmlAudio::position()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy spy(&audio, SIGNAL(positionChanged()));
-
-    QCOMPARE(audio.position(), 0);
-
-    // QmlAudio won't bound set positions to the duration.  A media service may though.
-    QCOMPARE(audio.duration(), 0);
-
-    audio.setPosition(450);
-    QCOMPARE(audio.position(), 450);
-    QCOMPARE(provider.playerControl()->position(), qint64(450));
-    QCOMPARE(spy.count(), 1);
-
-    audio.setPosition(-5403);
-    QCOMPARE(audio.position(), -5403);
-    QCOMPARE(provider.playerControl()->position(), qint64(-5403));
-    QCOMPARE(spy.count(), 2);
-
-    audio.setPosition(-5403);
-    QCOMPARE(audio.position(), -5403);
-    QCOMPARE(provider.playerControl()->position(), qint64(-5403));
-    QCOMPARE(spy.count(), 3);
-
-    // Check the signal change signal is emitted if the change originates from the media service.
-    provider.playerControl()->setPosition(0);
-    QCOMPARE(audio.position(), 0);
-    QCOMPARE(spy.count(), 4);
-
-    connect(&audio, SIGNAL(positionChanged()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-
-    provider.playerControl()->updateState(QMediaPlayer::PlayingState);
-    QTestEventLoop::instance().enterLoop(1);
-    QVERIFY(spy.count() > 4 && spy.count() < 7); // 5 or 6
-
-    provider.playerControl()->updateState(QMediaPlayer::PausedState);
-    QTestEventLoop::instance().enterLoop(1);
-    QVERIFY(spy.count() < 7);
-}
-
-void tst_QmlAudio::volume()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy spy(&audio, SIGNAL(volumeChanged()));
-
-    QCOMPARE(audio.volume(), qreal(0.5));
-
-    audio.setVolume(0.7);
-    QCOMPARE(audio.volume(), qreal(0.7));
-    QCOMPARE(provider.playerControl()->volume(), 70);
-    QCOMPARE(spy.count(), 1);
-
-    audio.setVolume(0.7);
-    QCOMPARE(audio.volume(), qreal(0.7));
-    QCOMPARE(provider.playerControl()->volume(), 70);
-    QCOMPARE(spy.count(), 2);
-
-    provider.playerControl()->setVolume(30);
-    QCOMPARE(audio.volume(), qreal(0.3));
-    QCOMPARE(spy.count(), 3);
-}
-
-void tst_QmlAudio::muted()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy spy(&audio, SIGNAL(mutedChanged()));
-
-    QCOMPARE(audio.isMuted(), false);
-
-    audio.setMuted(true);
-    QCOMPARE(audio.isMuted(), true);
-    QCOMPARE(provider.playerControl()->isMuted(), true);
-    QCOMPARE(spy.count(), 1);
-
-    provider.playerControl()->setMuted(false);
-    QCOMPARE(audio.isMuted(), false);
-    QCOMPARE(spy.count(), 2);
-
-    audio.setMuted(false);
-    QCOMPARE(audio.isMuted(), false);
-    QCOMPARE(provider.playerControl()->isMuted(), false);
-    QCOMPARE(spy.count(), 3);
-}
-
-void tst_QmlAudio::bufferProgress()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy spy(&audio, SIGNAL(bufferProgressChanged()));
-
-    QCOMPARE(audio.bufferProgress(), qreal(0.0));
-
-    provider.playerControl()->setBufferStatus(20);
-    QCOMPARE(audio.bufferProgress(), qreal(0.2));
-    QCOMPARE(spy.count(), 1);
-
-    provider.playerControl()->setBufferStatus(20);
-    QCOMPARE(audio.bufferProgress(), qreal(0.2));
-    QCOMPARE(spy.count(), 2);
-
-    provider.playerControl()->setBufferStatus(40);
-    QCOMPARE(audio.bufferProgress(), qreal(0.4));
-    QCOMPARE(spy.count(), 3);
-
-    connect(&audio, SIGNAL(positionChanged()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-
-    provider.playerControl()->updateMediaStatus(
-            QMediaPlayer::BufferingMedia, QMediaPlayer::PlayingState);
-    QTestEventLoop::instance().enterLoop(1);
-    QVERIFY(spy.count() > 3 && spy.count() < 6); // 4 or 5
-
-    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferedMedia);
-    QTestEventLoop::instance().enterLoop(1);
-    QVERIFY(spy.count() < 6);
-}
-
-void tst_QmlAudio::seekable()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy spy(&audio, SIGNAL(seekableChanged()));
-
-    QCOMPARE(audio.isSeekable(), false);
-
-    provider.playerControl()->setSeekable(true);
-    QCOMPARE(audio.isSeekable(), true);
-    QCOMPARE(spy.count(), 1);
-
-    provider.playerControl()->setSeekable(true);
-    QCOMPARE(audio.isSeekable(), true);
-    QCOMPARE(spy.count(), 2);
-
-    provider.playerControl()->setSeekable(false);
-    QCOMPARE(audio.isSeekable(), false);
-    QCOMPARE(spy.count(), 3);
-}
-
-void tst_QmlAudio::playbackRate()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy spy(&audio, SIGNAL(playbackRateChanged()));
-
-    QCOMPARE(audio.playbackRate(), qreal(1.0));
-
-    audio.setPlaybackRate(0.5);
-    QCOMPARE(audio.playbackRate(), qreal(0.5));
-    QCOMPARE(provider.playerControl()->playbackRate(), qreal(0.5));
-    QCOMPARE(spy.count(), 1);
-
-    provider.playerControl()->setPlaybackRate(2.0);
-    QCOMPARE(provider.playerControl()->playbackRate(), qreal(2.0));
-    QCOMPARE(spy.count(), 2);
-
-    audio.setPlaybackRate(2.0);
-    QCOMPARE(audio.playbackRate(), qreal(2.0));
-    QCOMPARE(provider.playerControl()->playbackRate(), qreal(2.0));
-    QCOMPARE(spy.count(), 3);
-}
-
-void tst_QmlAudio::status()
-{
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy statusChangedSpy(&audio, SIGNAL(statusChanged()));
-    QSignalSpy loadedSpy(&audio, SIGNAL(loaded()));
-    QSignalSpy bufferingSpy(&audio, SIGNAL(buffering()));
-    QSignalSpy stalledSpy(&audio, SIGNAL(stalled()));
-    QSignalSpy bufferedSpy(&audio, SIGNAL(buffered()));
-    QSignalSpy endOfMediaSpy(&audio, SIGNAL(endOfMedia()));
-
-    QCOMPARE(audio.status(), QmlAudio::NoMedia);
-
-    // Set media, start loading.
-    provider.playerControl()->updateMediaStatus(QMediaPlayer::LoadingMedia);
-    QCOMPARE(audio.status(), QmlAudio::Loading);
-    QCOMPARE(statusChangedSpy.count(), 1);
-    QCOMPARE(loadedSpy.count(), 0);
-    QCOMPARE(bufferingSpy.count(), 0);
-    QCOMPARE(stalledSpy.count(), 0);
-    QCOMPARE(bufferedSpy.count(), 0);
-    QCOMPARE(endOfMediaSpy.count(), 0);
-
-    // Finish loading.
-    provider.playerControl()->updateMediaStatus(QMediaPlayer::LoadedMedia);
-    QCOMPARE(audio.status(), QmlAudio::Loaded);
-    QCOMPARE(statusChangedSpy.count(), 2);
-    QCOMPARE(loadedSpy.count(), 1);
-    QCOMPARE(bufferingSpy.count(), 0);
-    QCOMPARE(stalledSpy.count(), 0);
-    QCOMPARE(bufferedSpy.count(), 0);
-    QCOMPARE(endOfMediaSpy.count(), 0);
-
-    // Play, start buffering.
-    provider.playerControl()->updateMediaStatus(
-            QMediaPlayer::StalledMedia, QMediaPlayer::PlayingState);
-    QCOMPARE(audio.status(), QmlAudio::Stalled);
-    QCOMPARE(statusChangedSpy.count(), 3);
-    QCOMPARE(loadedSpy.count(), 1);
-    QCOMPARE(bufferingSpy.count(), 0);
-    QCOMPARE(stalledSpy.count(), 1);
-    QCOMPARE(bufferedSpy.count(), 0);
-    QCOMPARE(endOfMediaSpy.count(), 0);
-
-    // Enough data buffered to proceed.
-    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferingMedia);
-    QCOMPARE(audio.status(), QmlAudio::Buffering);
-    QCOMPARE(statusChangedSpy.count(), 4);
-    QCOMPARE(loadedSpy.count(), 1);
-    QCOMPARE(bufferingSpy.count(), 1);
-    QCOMPARE(stalledSpy.count(), 1);
-    QCOMPARE(bufferedSpy.count(), 0);
-    QCOMPARE(endOfMediaSpy.count(), 0);
-
-    // Errant second buffering status changed.
-    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferingMedia);
-    QCOMPARE(audio.status(), QmlAudio::Buffering);
-    QCOMPARE(statusChangedSpy.count(), 4);
-    QCOMPARE(loadedSpy.count(), 1);
-    QCOMPARE(bufferingSpy.count(), 1);
-    QCOMPARE(stalledSpy.count(), 1);
-    QCOMPARE(bufferedSpy.count(), 0);
-    QCOMPARE(endOfMediaSpy.count(), 0);
-
-    // Buffer full.
-    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferedMedia);
-    QCOMPARE(audio.status(), QmlAudio::Buffered);
-    QCOMPARE(statusChangedSpy.count(), 5);
-    QCOMPARE(loadedSpy.count(), 1);
-    QCOMPARE(bufferingSpy.count(), 1);
-    QCOMPARE(stalledSpy.count(), 1);
-    QCOMPARE(bufferedSpy.count(), 1);
-    QCOMPARE(endOfMediaSpy.count(), 0);
-
-    // Buffer getting low.
-    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferingMedia);
-    QCOMPARE(audio.status(), QmlAudio::Buffering);
-    QCOMPARE(statusChangedSpy.count(), 6);
-    QCOMPARE(loadedSpy.count(), 1);
-    QCOMPARE(bufferingSpy.count(), 2);
-    QCOMPARE(stalledSpy.count(), 1);
-    QCOMPARE(bufferedSpy.count(), 1);
-    QCOMPARE(endOfMediaSpy.count(), 0);
-
-    // Buffer full.
-    provider.playerControl()->updateMediaStatus(QMediaPlayer::BufferedMedia);
-    QCOMPARE(audio.status(), QmlAudio::Buffered);
-    QCOMPARE(statusChangedSpy.count(), 7);
-    QCOMPARE(loadedSpy.count(), 1);
-    QCOMPARE(bufferingSpy.count(), 2);
-    QCOMPARE(stalledSpy.count(), 1);
-    QCOMPARE(bufferedSpy.count(), 2);
-    QCOMPARE(endOfMediaSpy.count(), 0);
-
-    // Finished.
-    provider.playerControl()->updateMediaStatus(
-            QMediaPlayer::EndOfMedia, QMediaPlayer::StoppedState);
-    QCOMPARE(audio.status(), QmlAudio::EndOfMedia);
-    QCOMPARE(statusChangedSpy.count(), 8);
-    QCOMPARE(loadedSpy.count(), 1);
-    QCOMPARE(bufferingSpy.count(), 2);
-    QCOMPARE(stalledSpy.count(), 1);
-    QCOMPARE(bufferedSpy.count(), 2);
-    QCOMPARE(endOfMediaSpy.count(), 1);
-}
-
-void tst_QmlAudio::metaData_data()
-{
-    QTest::addColumn<QByteArray>("propertyName");
-    QTest::addColumn<QtMultimedia::MetaData>("propertyKey");
-    QTest::addColumn<QVariant>("value1");
-    QTest::addColumn<QVariant>("value2");
-
-    QTest::newRow("title")
-            << QByteArray("title")
-            << QtMultimedia::Title
-            << QVariant(QString::fromLatin1("This is a title"))
-            << QVariant(QString::fromLatin1("This is another title"));
-
-    QTest::newRow("genre")
-            << QByteArray("genre")
-            << QtMultimedia::Genre
-            << QVariant(QString::fromLatin1("rock"))
-            << QVariant(QString::fromLatin1("pop"));
-
-    QTest::newRow("trackNumber")
-            << QByteArray("trackNumber")
-            << QtMultimedia::TrackNumber
-            << QVariant(8)
-            << QVariant(12);
-}
-
-void tst_QmlAudio::metaData()
-{
-    QFETCH(QByteArray, propertyName);
-    QFETCH(QtMultimedia::MetaData, propertyKey);
-    QFETCH(QVariant, value1);
-    QFETCH(QVariant, value2);
-
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy spy(&audio, SIGNAL(__metaDataChanged()));
-
-    const int index = audio.metaObject()->indexOfProperty(propertyName.constData());
-    QVERIFY(index != -1);
-
-    QMetaProperty property = audio.metaObject()->property(index);
-    QCOMPARE(property.read(&audio), QVariant());
-
-    property.write(&audio, value1);
-    QCOMPARE(property.read(&audio), value1);
-    QCOMPARE(provider.metaDataControl()->metaData(propertyKey), value1);
-    QCOMPARE(spy.count(), 1);
-
-    provider.metaDataControl()->setMetaData(propertyKey, value2);
-    QCOMPARE(property.read(&audio), value2);
-    QCOMPARE(spy.count(), 2);
-}
-
-void tst_QmlAudio::error()
-{
-    const QString errorString = QLatin1String("Failed to open device.");
-
-    QtTestMediaServiceProvider provider;
-    QmlAudio audio;
-
-    QSignalSpy errorSpy(&audio, SIGNAL(error(QmlAudio::Error,QString)));
-    QSignalSpy errorChangedSpy(&audio, SIGNAL(errorChanged()));
-
-    QCOMPARE(audio.error(), QmlAudio::NoError);
-    QCOMPARE(audio.errorString(), QString());
-
-    provider.playerControl()->emitError(QMediaPlayer::ResourceError, errorString);
-
-    QCOMPARE(audio.error(), QmlAudio::ResourceError);
-    QCOMPARE(audio.errorString(), errorString);
-    QCOMPARE(errorSpy.count(), 1);
-    QCOMPARE(errorChangedSpy.count(), 1);
-
-    // Changing the source resets the error properties.
-    audio.setSource(QUrl("http://example.com"));
-    QCOMPARE(audio.error(), QmlAudio::NoError);
-    QCOMPARE(audio.errorString(), QString());
-    QCOMPARE(errorSpy.count(), 1);
-    QCOMPARE(errorChangedSpy.count(), 2);
-
-    // But isn't noisy.
-    audio.setSource(QUrl("file:///file/path"));
-    QCOMPARE(audio.error(), QmlAudio::NoError);
-    QCOMPARE(audio.errorString(), QString());
-    QCOMPARE(errorSpy.count(), 1);
-    QCOMPARE(errorChangedSpy.count(), 2);
-}
-
-
-QTEST_MAIN(tst_QmlAudio)
-
-#include "tst_qmlaudio.moc"
diff --git a/tests/auto/qmlgraphicsvideo/qmlgraphicsvideo.pro b/tests/auto/qmlgraphicsvideo/qmlgraphicsvideo.pro
deleted file mode 100644
index 0a83124..0000000
--- a/tests/auto/qmlgraphicsvideo/qmlgraphicsvideo.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_qmlgraphicsvideo.cpp
-
-QT += multimedia declarative
-requires(contains(QT_CONFIG, multimedia))
-requires(contains(QT_CONFIG, declarative))
diff --git a/tests/auto/qmlgraphicsvideo/tst_qmlgraphicsvideo.cpp b/tests/auto/qmlgraphicsvideo/tst_qmlgraphicsvideo.cpp
deleted file mode 100644
index 0da094d..0000000
--- a/tests/auto/qmlgraphicsvideo/tst_qmlgraphicsvideo.cpp
+++ /dev/null
@@ -1,911 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-
-#include <QtMultimedia/private/qmlgraphicsvideo_p.h>
-
-#include <QtGui/qapplication.h>
-#include <QtMultimedia/qabstractvideosurface.h>
-#include <QtMultimedia/qgraphicsvideoitem.h>
-#include <QtMultimedia/qmediaplayercontrol.h>
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/qvideooutputcontrol.h>
-#include <QtMultimedia/qvideorenderercontrol.h>
-#include <QtMultimedia/qvideosurfaceformat.h>
-
-
-class tst_QmlGraphicsVideo : public QObject
-{
-    Q_OBJECT
-public slots:
-    void initTestCase();
-
-private slots:
-    void nullPlayerControl();
-    void nullService();
-
-    void playing();
-    void paused();
-    void error();
-
-    void hasAudio();
-    void hasVideo();
-    void fillMode();
-    void geometry();
-};
-
-Q_DECLARE_METATYPE(QtMultimedia::MetaData);
-Q_DECLARE_METATYPE(QmlGraphicsVideo::Error);
-
-class QtTestMediaPlayerControl : public QMediaPlayerControl
-{
-    Q_OBJECT
-public:
-    QtTestMediaPlayerControl(QObject *parent = 0)
-        : QMediaPlayerControl(parent)
-        , m_state(QMediaPlayer::StoppedState)
-        , m_mediaStatus(QMediaPlayer::NoMedia)
-        , m_duration(0)
-        , m_position(0)
-        , m_playbackRate(1.0)
-        , m_volume(50)
-        , m_bufferStatus(0)
-        , m_muted(false)
-        , m_audioAvailable(false)
-        , m_videoAvailable(false)
-        , m_seekable(false)
-    {
-    }
-
-    QMediaPlayer::State state() const { return m_state; }
-    void updateState(QMediaPlayer::State state) { emit stateChanged(m_state = state); }
-
-    QMediaPlayer::MediaStatus mediaStatus() const { return m_mediaStatus; }
-    void updateMediaStatus(QMediaPlayer::MediaStatus status) {
-        emit mediaStatusChanged(m_mediaStatus = status); }
-    void updateMediaStatus(QMediaPlayer::MediaStatus status, QMediaPlayer::State state)
-    {
-        m_mediaStatus = status;
-        m_state = state;
-
-        emit mediaStatusChanged(m_mediaStatus);
-        emit stateChanged(m_state);
-    }
-
-    qint64 duration() const { return m_duration; }
-    void setDuration(qint64 duration) { emit durationChanged(m_duration = duration); }
-
-    qint64 position() const { return m_position; }
-    void setPosition(qint64 position) { emit positionChanged(m_position = position); }
-
-    int volume() const { return m_volume; }
-    void setVolume(int volume) { emit volumeChanged(m_volume = volume); }
-
-    bool isMuted() const { return m_muted; }
-    void setMuted(bool muted) { emit mutedChanged(m_muted = muted); }
-
-    int bufferStatus() const { return m_bufferStatus; }
-    void setBufferStatus(int status) { emit bufferStatusChanged(m_bufferStatus = status); }
-
-    bool isAudioAvailable() const { return m_audioAvailable; }
-    void setAudioAvailable(bool available) {
-        emit audioAvailableChanged(m_audioAvailable = available); }
-    bool isVideoAvailable() const { return m_videoAvailable; }
-    void setVideoAvailable(bool available) {
-        emit videoAvailableChanged(m_videoAvailable = available); }
-
-    bool isSeekable() const { return m_seekable; }
-    void setSeekable(bool seekable) { emit seekableChanged(m_seekable = seekable); }
-
-    QMediaTimeRange availablePlaybackRanges() const { return QMediaTimeRange(); }
-
-    qreal playbackRate() const { return m_playbackRate; }
-    void setPlaybackRate(qreal rate) { emit playbackRateChanged(m_playbackRate = rate); }
-
-    QMediaContent media() const { return m_media; }
-    const QIODevice *mediaStream() const { return 0; }
-    void setMedia(const QMediaContent &media, QIODevice *)
-    {
-        m_media = media;
-
-        m_mediaStatus = m_media.isNull()
-                ? QMediaPlayer::NoMedia
-                : QMediaPlayer::LoadingMedia;
-
-        emit mediaChanged(m_media);
-        emit mediaStatusChanged(m_mediaStatus);
-    }
-
-    void play() { emit stateChanged(m_state = QMediaPlayer::PlayingState); }
-    void pause() { emit stateChanged(m_state = QMediaPlayer::PausedState); }
-    void stop() { emit stateChanged(m_state = QMediaPlayer::StoppedState); }
-
-    void emitError(QMediaPlayer::Error err, const QString &errorString) {
-        emit error(err, errorString); }
-
-private:
-    QMediaPlayer::State m_state;
-    QMediaPlayer::MediaStatus m_mediaStatus;
-    qint64 m_duration;
-    qint64 m_position;
-    qreal m_playbackRate;
-    int m_volume;
-    int m_bufferStatus;
-    bool m_muted;
-    bool m_audioAvailable;
-    bool m_videoAvailable;
-    bool m_seekable;
-    QMediaContent m_media;
-};
-
-class QtTestOutputControl : public QVideoOutputControl
-{
-public:
-    QtTestOutputControl(QObject *parent) : QVideoOutputControl(parent), m_output(NoOutput) {}
-
-    QList<Output> availableOutputs() const { return m_outputs; }
-    void setAvailableOutputs(const QList<Output> outputs) { m_outputs = outputs; }
-
-    Output output() const { return m_output; }
-    virtual void setOutput(Output output) { m_output = output; }
-
-private:
-    Output m_output;
-    QList<Output> m_outputs;
-};
-
-class QtTestRendererControl : public QVideoRendererControl
-{
-public:
-    QtTestRendererControl(QObject *parent ) : QVideoRendererControl(parent), m_surface(0) {}
-
-    QAbstractVideoSurface *surface() const { return m_surface; }
-    void setSurface(QAbstractVideoSurface *surface) { m_surface = surface; }
-
-private:
-    QAbstractVideoSurface *m_surface;
-};
-
-class QtTestMediaService : public QMediaService
-{
-    Q_OBJECT
-public:
-    QtTestMediaService(
-            QtTestMediaPlayerControl *playerControl,
-            QtTestOutputControl *outputControl,
-            QtTestRendererControl *rendererControl,
-            QObject *parent)
-        : QMediaService(parent)
-        , playerControl(playerControl)
-        , outputControl(outputControl)
-        , rendererControl(rendererControl)
-    {
-    }
-
-    QMediaControl *control(const char *name) const
-    {
-        if (qstrcmp(name, QMediaPlayerControl_iid) == 0)
-            return playerControl;
-        else if (qstrcmp(name, QVideoOutputControl_iid) == 0)
-            return outputControl;
-        else if (qstrcmp(name, QVideoRendererControl_iid) == 0)
-            return rendererControl;
-        else
-            return 0;
-    }
-
-    QtTestMediaPlayerControl *playerControl;
-    QtTestOutputControl *outputControl;
-    QtTestRendererControl *rendererControl;
-};
-
-class QtTestMediaServiceProvider : public QMediaServiceProvider
-{
-    Q_OBJECT
-public:
-    QtTestMediaServiceProvider()
-        : service(new QtTestMediaService(
-                new QtTestMediaPlayerControl(this),
-                new QtTestOutputControl(this),
-                new QtTestRendererControl(this),
-                this))
-    {
-        setDefaultServiceProvider(this);
-    }
-
-    QtTestMediaServiceProvider(QtTestMediaService *service)
-        : service(service)
-    {
-        setDefaultServiceProvider(this);
-    }
-
-    QtTestMediaServiceProvider(
-            QtTestMediaPlayerControl *playerControl,
-            QtTestOutputControl *outputControl,
-            QtTestRendererControl *rendererControl)
-        : service(new QtTestMediaService(playerControl, outputControl, rendererControl, this))
-    {
-        setDefaultServiceProvider(this);
-    }
-
-    ~QtTestMediaServiceProvider()
-    {
-        setDefaultServiceProvider(0);
-    }
-
-    QMediaService *requestService(
-            const QByteArray &type,
-            const QMediaServiceProviderHint & = QMediaServiceProviderHint())
-    {
-        requestedService = type;
-
-        return service;
-    }
-
-    void releaseService(QMediaService *) {}
-
-    inline QtTestMediaPlayerControl *playerControl() { return service->playerControl; }
-    inline QtTestRendererControl *rendererControl() { return service->rendererControl; }
-
-    QtTestMediaService *service;
-    QByteArray requestedService;
-};
-
-
-void tst_QmlGraphicsVideo::initTestCase()
-{
-    qRegisterMetaType<QmlGraphicsVideo::Error>();
-}
-
-void tst_QmlGraphicsVideo::nullPlayerControl()
-{
-    QtTestMediaServiceProvider provider(0, 0, 0);
-
-    QmlGraphicsVideo video;
-
-    QCOMPARE(video.source(), QUrl());
-    video.setSource(QUrl("http://example.com"));
-    QCOMPARE(video.source(), QUrl());
-
-    QCOMPARE(video.isPlaying(), false);
-    video.setPlaying(true);
-    QCOMPARE(video.isPlaying(), false);
-    video.play();
-    QCOMPARE(video.isPlaying(), false);
-
-    QCOMPARE(video.isPaused(), false);
-    video.pause();
-    QCOMPARE(video.isPaused(), false);
-    video.setPaused(true);
-    QCOMPARE(video.isPaused(), true);
-
-    QCOMPARE(video.duration(), 0);
-
-    QCOMPARE(video.position(), 0);
-    video.setPosition(10000);
-    QCOMPARE(video.position(), 0);
-
-    QCOMPARE(video.volume(), qreal(0));
-    video.setVolume(50);
-    QCOMPARE(video.volume(), qreal(0));
-
-    QCOMPARE(video.isMuted(), false);
-    video.setMuted(true);
-    QCOMPARE(video.isMuted(), false);
-
-    QCOMPARE(video.bufferProgress(), qreal(0));
-
-    QCOMPARE(video.isSeekable(), false);
-
-    QCOMPARE(video.playbackRate(), qreal(1.0));
-
-    QCOMPARE(video.hasAudio(), false);
-    QCOMPARE(video.hasVideo(), false);
-
-    QCOMPARE(video.status(), QmlGraphicsVideo::NoMedia);
-
-    QCOMPARE(video.error(), QmlGraphicsVideo::ServiceMissing);
-}
-
-void tst_QmlGraphicsVideo::nullService()
-{
-    QtTestMediaServiceProvider provider(0);
-
-    QmlGraphicsVideo video;
-
-    QCOMPARE(video.source(), QUrl());
-    video.setSource(QUrl("http://example.com"));
-    QCOMPARE(video.source(), QUrl());
-
-    QCOMPARE(video.isPlaying(), false);
-    video.setPlaying(true);
-    QCOMPARE(video.isPlaying(), false);
-    video.play();
-    QCOMPARE(video.isPlaying(), false);
-
-    QCOMPARE(video.isPaused(), false);
-    video.pause();
-    QCOMPARE(video.isPaused(), false);
-    video.setPaused(true);
-    QCOMPARE(video.isPaused(), true);
-
-    QCOMPARE(video.duration(), 0);
-
-    QCOMPARE(video.position(), 0);
-    video.setPosition(10000);
-    QCOMPARE(video.position(), 0);
-
-    QCOMPARE(video.volume(), qreal(0));
-    video.setVolume(50);
-    QCOMPARE(video.volume(), qreal(0));
-
-    QCOMPARE(video.isMuted(), false);
-    video.setMuted(true);
-    QCOMPARE(video.isMuted(), false);
-
-    QCOMPARE(video.bufferProgress(), qreal(0));
-
-    QCOMPARE(video.isSeekable(), false);
-
-    QCOMPARE(video.playbackRate(), qreal(1.0));
-
-    QCOMPARE(video.hasAudio(), false);
-    QCOMPARE(video.hasVideo(), false);
-
-    QCOMPARE(video.status(), QmlGraphicsVideo::NoMedia);
-
-    QCOMPARE(video.error(), QmlGraphicsVideo::ServiceMissing);
-
-    QCOMPARE(video.metaObject()->indexOfProperty("title"), -1);
-    QCOMPARE(video.metaObject()->indexOfProperty("genre"), -1);
-    QCOMPARE(video.metaObject()->indexOfProperty("description"), -1);
-}
-
-void tst_QmlGraphicsVideo::playing()
-{
-    QtTestMediaServiceProvider provider;
-    QmlGraphicsVideo video;
-
-    QSignalSpy playingChangedSpy(&video, SIGNAL(playingChanged()));
-    QSignalSpy startedSpy(&video, SIGNAL(started()));
-    QSignalSpy stoppedSpy(&video, SIGNAL(stopped()));
-
-    int playingChanged = 0;
-    int started = 0;
-    int stopped = 0;
-
-    QCOMPARE(video.isPlaying(), false);
-
-    // setPlaying(true) when stopped.
-    video.setPlaying(true);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when playing.
-    video.setPlaying(false);
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // play() when stopped.
-    video.play();
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // stop() when playing.
-    video.stop();
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // stop() when stopped.
-    video.stop();
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when stopped.
-    video.setPlaying(false);
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    video.setPlaying(true);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(true) when playing.
-    video.setPlaying(true);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // play() when playing.
-    video.play();
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-}
-
-void tst_QmlGraphicsVideo::paused()
-{
-    QtTestMediaServiceProvider provider;
-    QmlGraphicsVideo video;
-
-    QSignalSpy playingChangedSpy(&video, SIGNAL(playingChanged()));
-    QSignalSpy pausedChangedSpy(&video, SIGNAL(pausedChanged()));
-    QSignalSpy startedSpy(&video, SIGNAL(started()));
-    QSignalSpy pausedSpy(&video, SIGNAL(paused()));
-    QSignalSpy resumedSpy(&video, SIGNAL(resumed()));
-    QSignalSpy stoppedSpy(&video, SIGNAL(stopped()));
-
-    int playingChanged = 0;
-    int pausedChanged = 0;
-    int started = 0;
-    int paused = 0;
-    int resumed = 0;
-    int stopped = 0;
-
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), false);
-
-    // setPlaying(true) when stopped.
-    video.setPlaying(true);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(true) when playing.
-    video.setPaused(true);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(true) when paused.
-    video.setPaused(true);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // pause() when paused.
-    video.pause();
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(false) when paused.
-    video.setPaused(false);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),        ++resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(false) when playing.
-    video.setPaused(false);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // pause() when playing.
-    video.pause();
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when paused.
-    video.setPlaying(false);
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // setPaused(true) when stopped and paused.
-    video.setPaused(true);
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(false) when stopped and paused.
-    video.setPaused(false);
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(true) when stopped.
-    video.setPaused(true);
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(true) when stopped and paused.
-    video.setPlaying(true);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // play() when paused.
-    video.play();
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),        ++resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPaused(true) when playing.
-    video.setPaused(true);
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // stop() when paused.
-    video.stop();
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // setPaused(true) when stopped.
-    video.setPaused(true);
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // stop() when stopped and paused.
-    video.stop();
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(),   playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // pause() when stopped.
-    video.pause();
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when paused.
-    video.setPlaying(false);
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // pause() when stopped and paused.
-    video.pause();
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PausedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),         ++paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-
-    // setPlaying(false) when paused.
-    video.setPlaying(false);
-    QCOMPARE(video.isPlaying(), false);
-    QCOMPARE(video.isPaused(), true);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::StoppedState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),    pausedChanged);
-    QCOMPARE(startedSpy.count(),          started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),        ++stopped);
-
-    // play() when stopped and paused.
-    video.play();
-    QCOMPARE(video.isPlaying(), true);
-    QCOMPARE(video.isPaused(), false);
-    QCOMPARE(provider.playerControl()->state(), QMediaPlayer::PlayingState);
-    QCOMPARE(playingChangedSpy.count(), ++playingChanged);
-    QCOMPARE(pausedChangedSpy.count(),  ++pausedChanged);
-    QCOMPARE(startedSpy.count(),        ++started);
-    QCOMPARE(pausedSpy.count(),           paused);
-    QCOMPARE(resumedSpy.count(),          resumed);
-    QCOMPARE(stoppedSpy.count(),          stopped);
-}
-
-void tst_QmlGraphicsVideo::error()
-{
-    const QString errorString = QLatin1String("Failed to open device.");
-
-    QtTestMediaServiceProvider provider;
-    QmlGraphicsVideo video;
-
-    QSignalSpy errorSpy(&video, SIGNAL(error(QmlGraphicsVideo::Error,QString)));
-    QSignalSpy errorChangedSpy(&video, SIGNAL(errorChanged()));
-
-    QCOMPARE(video.error(), QmlGraphicsVideo::NoError);
-    QCOMPARE(video.errorString(), QString());
-
-    provider.playerControl()->emitError(QMediaPlayer::ResourceError, errorString);
-
-    QCOMPARE(video.error(), QmlGraphicsVideo::ResourceError);
-    QCOMPARE(video.errorString(), errorString);
-    QCOMPARE(errorSpy.count(), 1);
-    QCOMPARE(errorChangedSpy.count(), 1);
-
-    // Changing the source resets the error properties.
-    video.setSource(QUrl("http://example.com"));
-    QCOMPARE(video.error(), QmlGraphicsVideo::NoError);
-    QCOMPARE(video.errorString(), QString());
-    QCOMPARE(errorSpy.count(), 1);
-    QCOMPARE(errorChangedSpy.count(), 2);
-
-    // But isn't noisy.
-    video.setSource(QUrl("file:///file/path"));
-    QCOMPARE(video.error(), QmlGraphicsVideo::NoError);
-    QCOMPARE(video.errorString(), QString());
-    QCOMPARE(errorSpy.count(), 1);
-    QCOMPARE(errorChangedSpy.count(), 2);
-}
-
-
-void tst_QmlGraphicsVideo::hasAudio()
-{
-    QtTestMediaServiceProvider provider;
-    QmlGraphicsVideo video;
-
-    QSignalSpy spy(&video, SIGNAL(hasAudioChanged()));
-
-    QCOMPARE(video.hasAudio(), false);
-
-    provider.playerControl()->setAudioAvailable(true);
-    QCOMPARE(video.hasAudio(), true);
-    QCOMPARE(spy.count(), 1);
-
-    provider.playerControl()->setAudioAvailable(true);
-    QCOMPARE(video.hasAudio(), true);
-    QCOMPARE(spy.count(), 2);
-
-    provider.playerControl()->setAudioAvailable(false);
-    QCOMPARE(video.hasAudio(), false);
-    QCOMPARE(spy.count(), 3);
-}
-
-void tst_QmlGraphicsVideo::hasVideo()
-{
-    QtTestMediaServiceProvider provider;
-    QmlGraphicsVideo video;
-
-    QSignalSpy spy(&video, SIGNAL(hasVideoChanged()));
-
-    QCOMPARE(video.hasVideo(), false);
-
-    provider.playerControl()->setVideoAvailable(true);
-    QCOMPARE(video.hasVideo(), true);
-    QCOMPARE(spy.count(), 1);
-
-    provider.playerControl()->setVideoAvailable(true);
-    QCOMPARE(video.hasVideo(), true);
-    QCOMPARE(spy.count(), 2);
-
-    provider.playerControl()->setVideoAvailable(false);
-    QCOMPARE(video.hasVideo(), false);
-    QCOMPARE(spy.count(), 3);
-}
-
-void tst_QmlGraphicsVideo::fillMode()
-{
-    QtTestMediaServiceProvider provider;
-    QmlGraphicsVideo video;
-
-    QList<QGraphicsItem *> children = video.childItems();
-    QCOMPARE(children.count(), 1);
-    QGraphicsVideoItem *videoItem = qgraphicsitem_cast<QGraphicsVideoItem *>(children.first());
-    QVERIFY(videoItem != 0);
-
-    QCOMPARE(video.fillMode(), QmlGraphicsVideo::PreserveAspectFit);
-
-    video.setFillMode(QmlGraphicsVideo::PreserveAspectCrop);
-    QCOMPARE(video.fillMode(), QmlGraphicsVideo::PreserveAspectCrop);
-    QCOMPARE(videoItem->aspectRatioMode(), Qt::KeepAspectRatioByExpanding);
-
-    video.setFillMode(QmlGraphicsVideo::Stretch);
-    QCOMPARE(video.fillMode(), QmlGraphicsVideo::Stretch);
-    QCOMPARE(videoItem->aspectRatioMode(), Qt::IgnoreAspectRatio);
-
-    video.setFillMode(QmlGraphicsVideo::PreserveAspectFit);
-    QCOMPARE(video.fillMode(), QmlGraphicsVideo::PreserveAspectFit);
-    QCOMPARE(videoItem->aspectRatioMode(), Qt::KeepAspectRatio);
-}
-
-void tst_QmlGraphicsVideo::geometry()
-{
-    QtTestMediaServiceProvider provider;
-    QmlGraphicsVideo video;
-
-    QAbstractVideoSurface *surface = provider.rendererControl()->surface();
-    QVERIFY(surface != 0);
-
-    QList<QGraphicsItem *> children = video.childItems();
-    QCOMPARE(children.count(), 1);
-    QGraphicsVideoItem *videoItem = qgraphicsitem_cast<QGraphicsVideoItem *>(children.first());
-    QVERIFY(videoItem != 0);
-
-    QVideoSurfaceFormat format(QSize(640, 480), QVideoFrame::Format_RGB32);
-
-    QVERIFY(surface->start(format));
-
-    QCOMPARE(video.implicitWidth(), qreal(640));
-    QCOMPARE(video.implicitHeight(), qreal(480));
-
-    video.setWidth(560);
-    video.setHeight(328);
-
-    QCOMPARE(videoItem->size().width(), qreal(560));
-    QCOMPARE(videoItem->size().height(), qreal(328));
-}
-
-QTEST_MAIN(tst_QmlGraphicsVideo)
-
-#include "tst_qmlgraphicsvideo.moc"
diff --git a/tests/benchmarks/declarative/binding/testtypes.h b/tests/benchmarks/declarative/binding/testtypes.h
index a4f16d0..4b103ce 100644
--- a/tests/benchmarks/declarative/binding/testtypes.h
+++ b/tests/benchmarks/declarative/binding/testtypes.h
@@ -42,7 +42,7 @@
 #define TESTTYPES_H
 
 #include <QtCore/qobject.h>
-#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qdeclarative.h>
 
 class MyQmlObject : public QObject
 {
@@ -50,7 +50,7 @@ class MyQmlObject : public QObject
     Q_PROPERTY(int result READ result WRITE setResult);
     Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged);
     Q_PROPERTY(MyQmlObject *object READ object WRITE setObject NOTIFY objectChanged);
-    Q_PROPERTY(QmlList<QObject *> *data READ data);
+    Q_PROPERTY(QDeclarativeList<QObject *> *data READ data);
     Q_CLASSINFO("DefaultProperty", "data");
 public:
     MyQmlObject() : m_result(0), m_value(0), m_object(0) {}
@@ -61,7 +61,7 @@ public:
     int value() const { return m_value; }
     void setValue(int v) { m_value = v; emit valueChanged(); }
 
-    QmlList<QObject *> *data() { return &m_data; }
+    QDeclarativeList<QObject *> *data() { return &m_data; }
 
     MyQmlObject *object() const { return m_object; }
     void setObject(MyQmlObject *o) { m_object = o; emit objectChanged(); }
@@ -71,7 +71,7 @@ signals:
     void objectChanged();
 
 private:
-    QmlConcreteList<QObject *> m_data;
+    QDeclarativeConcreteList<QObject *> m_data;
     int m_result;
     int m_value;
     MyQmlObject *m_object;
diff --git a/tests/benchmarks/declarative/binding/tst_binding.cpp b/tests/benchmarks/declarative/binding/tst_binding.cpp
index 8fae924..ee529a7 100644
--- a/tests/benchmarks/declarative/binding/tst_binding.cpp
+++ b/tests/benchmarks/declarative/binding/tst_binding.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QFile>
 #include <QDebug>
 #include "testtypes.h"
@@ -67,7 +67,7 @@ private slots:
     void basicproperty();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_binding::tst_binding()
@@ -88,7 +88,7 @@ void tst_binding::cleanupTestCase()
 }
 
 #define COMPONENT(filename, binding) \
-    QmlComponent c(&engine); \
+    QDeclarativeComponent c(&engine); \
     { \
         QFile f(filename); \
         QVERIFY(f.open(QIODevice::ReadOnly)); \
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index b99031a..9c0fd27 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QmlMetaType>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QDeclarativeMetaType>
 #include <QDebug>
 #include <QGraphicsScene>
 #include <QGraphicsItem>
-#include <QmlGraphicsItem>
+#include <QDeclarativeItem>
 #include <private/qobject_p.h>
 
 #ifdef Q_OS_SYMBIAN
@@ -83,7 +83,7 @@ private slots:
     void itemtree_scene_cpp();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 inline QUrl TEST_FILE(const QString &filename)
@@ -101,7 +101,7 @@ void tst_creation::qobject_cpp()
 
 void tst_creation::qobject_qml()
 {
-    QmlComponent component(&engine, TEST_FILE("qobject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("qobject.qml"));
     QObject *obj = component.create();
     delete obj;
 
@@ -113,7 +113,7 @@ void tst_creation::qobject_qml()
 
 void tst_creation::qobject_qmltype()
 {
-    QmlType *t = QmlMetaType::qmlType("Qt/QtObject", 4, 6);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/QtObject", 4, 6);
 
     QBENCHMARK {
         QObject *obj = t->create();
@@ -154,7 +154,7 @@ void tst_creation::objects_qmltype_data()
 {
     QTest::addColumn<QByteArray>("type");
 
-    QList<QByteArray> types = QmlMetaType::qmlTypeNames();
+    QList<QByteArray> types = QDeclarativeMetaType::qmlTypeNames();
     foreach (QByteArray type, types)
         QTest::newRow(type.constData()) << type;
 }
@@ -162,7 +162,7 @@ void tst_creation::objects_qmltype_data()
 void tst_creation::objects_qmltype()
 {
     QFETCH(QByteArray, type);
-    QmlType *t = QmlMetaType::qmlType(type, 4, 6);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType(type, 4, 6);
 
     QBENCHMARK {
         QObject *obj = t->create();
@@ -281,7 +281,7 @@ void tst_creation::qgraphicsitem_tree14()
     }
 }
 
-struct QmlGraphics_DerivedObject : public QObject
+struct QDeclarativeGraphics_DerivedObject : public QObject
 {
     void setParent_noEvent(QObject *parent) {
         bool sce = d_ptr->sendChildEvents;
@@ -291,17 +291,17 @@ struct QmlGraphics_DerivedObject : public QObject
     }
 };
 
-inline void QmlGraphics_setParent_noEvent(QObject *object, QObject *parent)
+inline void QDeclarativeGraphics_setParent_noEvent(QObject *object, QObject *parent)
 {
-    static_cast<QmlGraphics_DerivedObject *>(object)->setParent_noEvent(parent);
+    static_cast<QDeclarativeGraphics_DerivedObject *>(object)->setParent_noEvent(parent);
 }
 
 void tst_creation::itemtree_notree_cpp()
 {
     QBENCHMARK {
-        QmlGraphicsItem *item = new QmlGraphicsItem;
+        QDeclarativeItem *item = new QDeclarativeItem;
         for (int i = 0; i < 30; ++i) {
-            QmlGraphicsItem *child = new QmlGraphicsItem;
+            QDeclarativeItem *child = new QDeclarativeItem;
         }
         delete item;
     }
@@ -310,10 +310,10 @@ void tst_creation::itemtree_notree_cpp()
 void tst_creation::itemtree_objtree_cpp()
 {
     QBENCHMARK {
-        QmlGraphicsItem *item = new QmlGraphicsItem;
+        QDeclarativeItem *item = new QDeclarativeItem;
         for (int i = 0; i < 30; ++i) {
-            QmlGraphicsItem *child = new QmlGraphicsItem;
-            QmlGraphics_setParent_noEvent(child,item);
+            QDeclarativeItem *child = new QDeclarativeItem;
+            QDeclarativeGraphics_setParent_noEvent(child,item);
         }
         delete item;
     }
@@ -322,10 +322,10 @@ void tst_creation::itemtree_objtree_cpp()
 void tst_creation::itemtree_cpp()
 {
     QBENCHMARK {
-        QmlGraphicsItem *item = new QmlGraphicsItem;
+        QDeclarativeItem *item = new QDeclarativeItem;
         for (int i = 0; i < 30; ++i) {
-            QmlGraphicsItem *child = new QmlGraphicsItem;
-            QmlGraphics_setParent_noEvent(child,item);
+            QDeclarativeItem *child = new QDeclarativeItem;
+            QDeclarativeGraphics_setParent_noEvent(child,item);
             child->setParentItem(item);
         }
         delete item;
@@ -335,10 +335,10 @@ void tst_creation::itemtree_cpp()
 void tst_creation::itemtree_data_cpp()
 {
     QBENCHMARK {
-        QmlGraphicsItem *item = new QmlGraphicsItem;
+        QDeclarativeItem *item = new QDeclarativeItem;
         for (int i = 0; i < 30; ++i) {
-            QmlGraphicsItem *child = new QmlGraphicsItem;
-            QmlGraphics_setParent_noEvent(child,item);
+            QDeclarativeItem *child = new QDeclarativeItem;
+            QDeclarativeGraphics_setParent_noEvent(child,item);
             item->data()->append(child);
         }
         delete item;
@@ -347,7 +347,7 @@ void tst_creation::itemtree_data_cpp()
 
 void tst_creation::itemtree_qml()
 {
-    QmlComponent component(&engine, TEST_FILE("item.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("item.qml"));
     QObject *obj = component.create();
     delete obj;
 
@@ -360,13 +360,13 @@ void tst_creation::itemtree_qml()
 void tst_creation::itemtree_scene_cpp()
 {
     QGraphicsScene scene;
-    QmlGraphicsItem *root = new QmlGraphicsItem;
+    QDeclarativeItem *root = new QDeclarativeItem;
     scene.addItem(root);
     QBENCHMARK {
-        QmlGraphicsItem *item = new QmlGraphicsItem;
+        QDeclarativeItem *item = new QDeclarativeItem;
         for (int i = 0; i < 30; ++i) {
-            QmlGraphicsItem *child = new QmlGraphicsItem;
-            QmlGraphics_setParent_noEvent(child,item);
+            QDeclarativeItem *child = new QDeclarativeItem;
+            QDeclarativeGraphics_setParent_noEvent(child,item);
             child->setParentItem(item);
         }
         item->setParentItem(root);
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
index 8433de5..8c0ed42 100644
--- a/tests/benchmarks/declarative/declarative.pro
+++ b/tests/benchmarks/declarative/declarative.pro
@@ -3,8 +3,8 @@ SUBDIRS += \
            binding \
            creation \
            pointers \
-           qmlcomponent \
-           qmlgraphicsimage \
-           qmlmetaproperty \
+           qdeclarativecomponent \
+           qdeclarativeimage \
+           qdeclarativemetaproperty \
            script \
-#           qmltime
+#           qdeclarativetime
diff --git a/tests/benchmarks/declarative/pointers/tst_pointers.cpp b/tests/benchmarks/declarative/pointers/tst_pointers.cpp
index 4fead9a..7257bee 100644
--- a/tests/benchmarks/declarative/pointers/tst_pointers.cpp
+++ b/tests/benchmarks/declarative/pointers/tst_pointers.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include "private/qmlguard_p.h"
+#include "private/qdeclarativeguard_p.h"
 #include <QWeakPointer>
 
 class tst_pointers : public QObject
@@ -59,7 +59,7 @@ void tst_pointers::qmlguard()
 {
     QObject *obj = new QObject;
     QBENCHMARK {
-        QmlGuard<QObject> guardedObject;
+        QDeclarativeGuard<QObject> guardedObject;
         guardedObject = obj;
     }
 }
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
new file mode 100644
index 0000000..9c3f7f8
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
@@ -0,0 +1,3 @@
+import Qt.test 4.6
+
+MyQmlObject {}
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
new file mode 100644
index 0000000..e6cc4cf
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
@@ -0,0 +1,6 @@
+import Qt.test 4.6
+
+MyQmlObject {
+    result: value
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
new file mode 100644
index 0000000..0d2d49b
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+QtObject {}
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
new file mode 100644
index 0000000..69114af
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+QtObject {
+    id: Blah
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
new file mode 100644
index 0000000..723e62a
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
@@ -0,0 +1,55 @@
+import Qt 4.6
+
+Item { id:block
+    property bool dying: false
+    property bool spawned: false
+    property int type: 0
+    property int targetX: 0
+    property int targetY: 0
+
+    x: SpringFollow { enabled: spawned; source: targetX; spring: 2; damping: 0.2 }
+    y: SpringFollow { source: targetY; spring: 2; damping: 0.2 }
+
+    Image { id: img
+        source: {
+            if(type == 0){
+                "pics/redStone.png";
+            } else if(type == 1) {
+                "pics/blueStone.png";
+            } else {
+                "pics/greenStone.png";
+            }
+        }
+        opacity: 0
+        opacity: Behavior { NumberAnimation { duration: 200 } }
+        anchors.fill: parent
+    }
+
+    Particles { id: particles
+        width:1; height:1; anchors.centerIn: parent;
+        emissionRate: 0;
+        lifeSpan: 700; lifeSpanDeviation: 600;
+        angle: 0; angleDeviation: 360;
+        velocity: 100; velocityDeviation:30;
+        source: {
+            if(type == 0){
+                "pics/redStar.png";
+            } else if (type == 1) {
+                "pics/blueStar.png";
+            } else {
+                "pics/greenStar.png";
+            }
+        }
+    }
+
+    states: [
+        State{ name: "AliveState"; when: spawned == true && dying == false
+            PropertyChanges { target: img; opacity: 1 }
+        },
+        State{ name: "DeathState"; when: dying == true
+            StateChangeScript { script: particles.burst(50); }
+            PropertyChanges { target: img; opacity: 0 }
+            StateChangeScript { script: block.destroy(1000); }
+        }
+    ]
+}
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStar.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStar.png
new file mode 100644
index 0000000..ff9588f
Binary files /dev/null and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStar.png differ
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png
new file mode 100644
index 0000000..bf342e0
Binary files /dev/null and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/blueStone.png differ
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStar.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStar.png
new file mode 100644
index 0000000..cd06854
Binary files /dev/null and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStar.png differ
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png
new file mode 100644
index 0000000..5ac14a5
Binary files /dev/null and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/greenStone.png differ
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStar.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStar.png
new file mode 100644
index 0000000..0a4dffe
Binary files /dev/null and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStar.png differ
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png
new file mode 100644
index 0000000..b099f60
Binary files /dev/null and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/redStone.png differ
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png
new file mode 100644
index 0000000..c56124a
Binary files /dev/null and b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/pics/yellowStone.png differ
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
new file mode 100644
index 0000000..27c5646
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+
+QtObject {
+    property int a
+    property bool b
+    property double c
+    property real d
+    property string e
+    property url f
+    property color g
+    property date h
+    property var i
+    property variant j
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
new file mode 100644
index 0000000..d08f35b
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+    property int a
+}
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
new file mode 100644
index 0000000..12fa9f4
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
@@ -0,0 +1,19 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_qdeclarativecomponent
+QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativecomponent.cpp testtypes.cpp
+HEADERS += testtypes.h
+
+symbian* {
+    data.sources = data/*
+    data.path = data
+    samegame.sources = data/samegame/*
+    samegame.path = data/samegame
+    samegame_pics.sources = data/samegame/pics/*
+    samegame_pics.path = data/samegame/pics
+    DEPLOYMENT += data samegame samegame_pics
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
new file mode 100644
index 0000000..acdc395
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "testtypes.h"
+
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Qt.test, 4, 6, MyQmlObject, MyQmlObject);
+}
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h
new file mode 100644
index 0000000..4b103ce
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef TESTTYPES_H
+#define TESTTYPES_H
+
+#include <QtCore/qobject.h>
+#include <QtDeclarative/qdeclarative.h>
+
+class MyQmlObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int result READ result WRITE setResult);
+    Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged);
+    Q_PROPERTY(MyQmlObject *object READ object WRITE setObject NOTIFY objectChanged);
+    Q_PROPERTY(QDeclarativeList<QObject *> *data READ data);
+    Q_CLASSINFO("DefaultProperty", "data");
+public:
+    MyQmlObject() : m_result(0), m_value(0), m_object(0) {}
+
+    int result() const { return m_result; }
+    void setResult(int r) { m_result = r; }
+
+    int value() const { return m_value; }
+    void setValue(int v) { m_value = v; emit valueChanged(); }
+
+    QDeclarativeList<QObject *> *data() { return &m_data; }
+
+    MyQmlObject *object() const { return m_object; }
+    void setObject(MyQmlObject *o) { m_object = o; emit objectChanged(); }
+
+signals:
+    void valueChanged();
+    void objectChanged();
+
+private:
+    QDeclarativeConcreteList<QObject *> m_data;
+    int m_result;
+    int m_value;
+    MyQmlObject *m_object;
+};
+QML_DECLARE_TYPE(MyQmlObject);
+
+void registerTypes();
+
+#endif // TESTTYPES_H
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
new file mode 100644
index 0000000..7065303
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QFile>
+#include <QDebug>
+#include "testtypes.h"
+
+//TESTED_FILES=
+
+
+class tst_qmlcomponent : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_qmlcomponent();
+    virtual ~tst_qmlcomponent();
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+private slots:
+    void creation_data();
+    void creation();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlcomponent::tst_qmlcomponent()
+{
+}
+
+tst_qmlcomponent::~tst_qmlcomponent()
+{
+}
+
+void tst_qmlcomponent::initTestCase()
+{
+    registerTypes();
+}
+
+void tst_qmlcomponent::cleanupTestCase()
+{
+}
+
+void tst_qmlcomponent::creation_data()
+{
+    QTest::addColumn<QString>("file");
+
+    QTest::newRow("Object") << "data/object.qml";
+    QTest::newRow("Object - Id") << "data/object_id.qml";
+    QTest::newRow("MyQmlObject") << "data/myqmlobject.qml";
+    QTest::newRow("MyQmlObject: basic binding") << "data/myqmlobject_binding.qml";
+    QTest::newRow("Synthesized properties") << "data/synthesized_properties.qml";
+    QTest::newRow("Synthesized properties.2") << "data/synthesized_properties.2.qml";
+    QTest::newRow("SameGame - BoomBlock") << "data/samegame/BoomBlock.qml";
+}
+
+void tst_qmlcomponent::creation()
+{
+    QFETCH(QString, file);
+
+    QDeclarativeComponent c(&engine, file);
+    QVERIFY(c.isReady());
+
+    QObject *obj = c.create();
+    delete obj;
+
+    QBENCHMARK {
+        QObject *obj = c.create();
+        delete obj;
+    }
+}
+
+QTEST_MAIN(tst_qmlcomponent)
+#include "tst_qdeclarativecomponent.moc"
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/image.png b/tests/benchmarks/declarative/qdeclarativeimage/image.png
new file mode 100644
index 0000000..623d362
Binary files /dev/null and b/tests/benchmarks/declarative/qdeclarativeimage/image.png differ
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
new file mode 100644
index 0000000..bbe4e8d
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
@@ -0,0 +1,16 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_qdeclarativeimage
+QT += declarative
+macx:CONFIG -= app_bundle
+CONFIG += release
+
+SOURCES += tst_qdeclarativeimage.cpp
+
+symbian* {
+    data.sources = image.png
+    data.path = .
+    DEPLOYMENT += data
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
new file mode 100644
index 0000000..4bba022
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <private/qdeclarativeimage_p.h>
+
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Application private dir is default serach path for files, so SRCDIR can be set to empty
+#define SRCDIR ""
+#endif
+
+class tst_qmlgraphicsimage : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qmlgraphicsimage() {}
+
+private slots:
+    void qmlgraphicsimage();
+    void qmlgraphicsimage_file();
+    void qmlgraphicsimage_url();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+void tst_qmlgraphicsimage::qmlgraphicsimage()
+{
+    int x = 0;
+    QUrl url("image.png");
+    QBENCHMARK {
+        QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
+        QDeclarativeImage *image = new QDeclarativeImage;
+        QDeclarativeEngine::setContextForObject(image, engine.rootContext());
+        delete image;
+    }
+}
+
+void tst_qmlgraphicsimage::qmlgraphicsimage_file()
+{
+    int x = 0;
+    QUrl url("image.png");
+    QBENCHMARK {
+        QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
+        QDeclarativeImage *image = new QDeclarativeImage;
+        QDeclarativeEngine::setContextForObject(image, engine.rootContext());
+        image->setSource(url);
+        delete image;
+    }
+}
+
+void tst_qmlgraphicsimage::qmlgraphicsimage_url()
+{
+    int x = 0;
+    QUrl url("image.png");
+    QBENCHMARK {
+        QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
+        QDeclarativeImage *image = new QDeclarativeImage;
+        QDeclarativeEngine::setContextForObject(image, engine.rootContext());
+        image->setSource(url2);
+        delete image;
+    }
+}
+
+QTEST_MAIN(tst_qmlgraphicsimage)
+
+#include "tst_qdeclarativeimage.moc"
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
new file mode 100644
index 0000000..11b95e1
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+Item {}
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
new file mode 100644
index 0000000..a923a0a
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Item {
+    property int blah
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
new file mode 100644
index 0000000..8070768
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_qdeclarativemetaproperty
+QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativemetaproperty.cpp 
+
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
new file mode 100644
index 0000000..dae1751
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QDeclarativeMetaProperty>
+#include <QFile>
+#include <QDebug>
+
+//TESTED_FILES=
+
+
+class tst_qmlmetaproperty : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_qmlmetaproperty();
+    virtual ~tst_qmlmetaproperty();
+
+public slots:
+    void init();
+    void cleanup();
+
+private slots:
+    void lookup_data();
+    void lookup();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qmlmetaproperty::tst_qmlmetaproperty()
+{
+}
+
+tst_qmlmetaproperty::~tst_qmlmetaproperty()
+{
+}
+
+void tst_qmlmetaproperty::init()
+{
+}
+
+void tst_qmlmetaproperty::cleanup()
+{
+}
+
+void tst_qmlmetaproperty::lookup_data()
+{
+    QTest::addColumn<QString>("file");
+
+    QTest::newRow("Simple Object") << "data/object.qml";
+    QTest::newRow("Synthesized Object") << "data/synthesized_object.qml";
+}
+
+void tst_qmlmetaproperty::lookup()
+{
+    QFETCH(QString, file);
+
+    QDeclarativeComponent c(&engine, file);
+    QVERIFY(c.isReady());
+
+    QObject *obj = c.create();
+
+    QBENCHMARK {
+        QDeclarativeMetaProperty p(obj, "x");
+    }
+
+    delete obj;
+}
+
+QTEST_MAIN(tst_qmlmetaproperty)
+#include "tst_qdeclarativemetaproperty.moc"
diff --git a/tests/benchmarks/declarative/qdeclarativetime/example.qml b/tests/benchmarks/declarative/qdeclarativetime/example.qml
new file mode 100644
index 0000000..dd6185d
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/example.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+
+    property string name: "Bob Smith"
+
+    QDeclarativeTime.Timer {
+        component: Item {
+            Text { text: name }
+        }
+    }
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp b/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
new file mode 100644
index 0000000..a924337
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
@@ -0,0 +1,231 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QDebug>
+#include <QApplication>
+#include <QTime>
+#include <QDeclarativeContext>
+#include <QGraphicsScene>
+#include <QGraphicsRectItem>
+
+class Timer : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDeclarativeComponent *component READ component WRITE setComponent);
+
+public:
+    Timer();
+
+    QDeclarativeComponent *component() const;
+    void setComponent(QDeclarativeComponent *);
+
+    static Timer *timerInstance();
+
+    void run(uint);
+
+    bool willParent() const;
+    void setWillParent(bool p);
+
+private:
+    void runTest(QDeclarativeContext *, uint);
+
+    QDeclarativeComponent *m_component;
+    static Timer *m_timer;
+
+    bool m_willparent;
+    QGraphicsScene m_scene;
+    QGraphicsRectItem m_item;
+};
+QML_DECLARE_TYPE(Timer);
+
+Timer *Timer::m_timer = 0;
+
+Timer::Timer()
+: m_component(0), m_willparent(false)
+{
+    if (m_timer)
+        qWarning("Timer: Timer already registered");
+    m_timer = this;
+
+    m_scene.setItemIndexMethod(QGraphicsScene::NoIndex);
+    m_scene.addItem(&m_item);
+}
+
+QDeclarativeComponent *Timer::component() const
+{
+    return m_component;
+}
+
+void Timer::setComponent(QDeclarativeComponent *c)
+{
+    m_component = c;
+}
+
+Timer *Timer::timerInstance()
+{
+    return m_timer;
+}
+
+void Timer::run(uint iterations)
+{
+    QDeclarativeContext context(qmlContext(this));
+
+    QObject *o = m_component->create(&context);
+    QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o);
+    if (m_willparent && go) 
+        go->setParentItem(&m_item);
+    delete o;
+    
+    runTest(&context, iterations);
+}
+
+bool Timer::willParent() const
+{
+    return m_willparent;
+}
+
+void Timer::setWillParent(bool p)
+{
+    m_willparent = p;
+}
+
+void Timer::runTest(QDeclarativeContext *context, uint iterations)
+{
+    QTime t;
+    t.start();
+    for (uint ii = 0; ii < iterations; ++ii) {
+        QObject *o = m_component->create(context);
+        QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o);
+        if (m_willparent && go) 
+            go->setParentItem(&m_item);
+        delete o;
+    }
+
+    int e = t.elapsed();
+
+    qWarning() << "Total:" << e << "ms, Per iteration:" << qreal(e) / qreal(iterations) << "ms";
+
+}
+
+void usage(const char *name)
+{
+    qWarning("Usage: %s [-iterations <count>] [-parent] <qml file>", name);
+    exit(-1);
+}
+
+int main(int argc, char ** argv)
+{
+    QApplication app(argc, argv);
+
+    QML_REGISTER_TYPE(QDeclarativeTime, 1, 0, Timer, Timer);
+
+    uint iterations = 1024;
+    QString filename;
+    bool willParent = false;
+
+    for (int ii = 1; ii < argc; ++ii) {
+        QByteArray arg(argv[ii]);
+
+        if (arg == "-iterations") {
+            if (ii + 1 < argc) {
+                ++ii;
+                QByteArray its(argv[ii]);
+                bool ok = false;
+                iterations = its.toUInt(&ok);
+                if (!ok)
+                    usage(argv[0]);
+            } else {
+                usage(argv[0]);
+            }
+        } else if (arg == "-parent") {
+            willParent = true;
+        } else {
+            filename = QLatin1String(argv[ii]);
+        }
+    }
+
+    if (filename.isEmpty())
+#ifdef Q_OS_SYMBIAN
+        filename = QLatin1String("./tests/item_creation/data.qml");
+#else
+        usage(argv[0]);
+#endif
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, filename);
+    if (component.isError()) {
+        qWarning() << component.errors();
+        return -1;
+    }
+
+    QObject *obj = component.create();
+    if (!obj) {
+        qWarning() << component.errors();
+        return -1;
+    }
+
+    Timer *timer = Timer::timerInstance();
+    if (!timer) {
+        qWarning() << "A Tester.Timer instance is required.";
+        return -1;
+    }
+
+#ifdef Q_OS_SYMBIAN
+    willParent = true;
+#endif
+    timer->setWillParent(willParent);
+
+    if (!timer->component()) {
+        qWarning() << "The timer has no component";
+        return -1;
+    }
+
+#ifdef Q_OS_SYMBIAN
+    iterations = 1024;
+#endif
+
+    timer->run(iterations);
+
+    return 0;
+}
+
+#include "qdeclarativetime.moc"
diff --git a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.pro b/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.pro
new file mode 100644
index 0000000..7902ee1
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.pro
@@ -0,0 +1,23 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = qdeclarativetime
+QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += qdeclarativetime.cpp 
+
+symbian* {
+    TARGET.CAPABILITY = "All -TCB"
+    example.sources = example.qml
+    esample.path = .
+    tests.sources = tests/*
+    tests.path = tests
+    anshors.sources = tests/anchors/*
+    anchors.path = tests/anchors
+    item_creation.sources = tests/item_creation/*
+    item_creation.path = tests/item_creation
+    positioner_creation.sources = tests/positioner_creation/*
+    positioner_creation.path = tests/positioner_creation
+    DEPLOYMENT += example tests anchors item_creation positioner_creation
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/empty.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/empty.qml
new file mode 100644
index 0000000..8d93594
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/empty.qml
@@ -0,0 +1,34 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.leftMargin: 0
+                }
+            }
+        }
+    }
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/fill.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/fill.qml
new file mode 100644
index 0000000..918c48a
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/fill.qml
@@ -0,0 +1,41 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+                Item {
+                    anchors.fill: parent
+                    anchors.leftMargin: 0
+                }
+            }
+        }
+    }
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/null.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/null.qml
new file mode 100644
index 0000000..bb84538
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/null.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+                Item {
+                }
+            }
+        }
+    }
+}
+
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/children.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/children.qml
new file mode 100644
index 0000000..3387a32
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/children.qml
@@ -0,0 +1,34 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+                children: [
+                    Rectangle { },
+                    Rectangle { },
+                    Item { },
+                    Image { },
+                    Text { },
+                    Item { },
+                    Item { },
+                    Image { },
+                    Image { },
+                    Row { },
+                    Image { },
+                    Image { },
+                    Column { },
+                    Row { },
+                    Text { },
+                    Text { },
+                    Text { },
+                    MouseArea { }
+                ]
+
+            }
+        }
+    }
+
+}
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/data.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/data.qml
new file mode 100644
index 0000000..a8b653c
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/data.qml
@@ -0,0 +1,34 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+                data: [
+                    Rectangle { },
+                    Rectangle { },
+                    Item { },
+                    Image { },
+                    Text { },
+                    Item { },
+                    Item { },
+                    Image { },
+                    Image { },
+                    Row { },
+                    Image { },
+                    Image { },
+                    Column { },
+                    Row { },
+                    Text { },
+                    Text { },
+                    Text { },
+                    MouseArea { }
+                ]
+
+            }
+        }
+    }
+
+}
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/no_creation.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/no_creation.qml
new file mode 100644
index 0000000..0a507d4
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/no_creation.qml
@@ -0,0 +1,12 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+            }
+        }
+    }
+}
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/resources.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/resources.qml
new file mode 100644
index 0000000..227d8ad
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/resources.qml
@@ -0,0 +1,34 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+                resources: [
+                    Rectangle { },
+                    Rectangle { },
+                    Item { },
+                    Image { },
+                    Text { },
+                    Item { },
+                    Item { },
+                    Image { },
+                    Image { },
+                    Row { },
+                    Image { },
+                    Image { },
+                    Column { },
+                    Row { },
+                    Text { },
+                    Text { },
+                    Text { },
+                    MouseArea { }
+                ]
+
+            }
+        }
+    }
+
+}
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/no_positioner.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/no_positioner.qml
new file mode 100644
index 0000000..c1f54a4
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/no_positioner.qml
@@ -0,0 +1,37 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+                Rectangle { }
+                Rectangle { }
+                Item {
+                    Image { }
+                    Text { }
+                }
+
+                Item {
+                    Item {
+                        Image { }
+                        Image { }
+                        Item {
+                            Image { }
+                            Image { }
+                        }
+                    }
+
+                    Item {
+                        Item {
+                            Text { }
+                            Text { }
+                        }
+                        Text { }
+                    }
+                }
+                MouseArea { }
+            }
+        }
+    }
+}
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/null_positioner.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/null_positioner.qml
new file mode 100644
index 0000000..d49ff78
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/null_positioner.qml
@@ -0,0 +1,34 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+                Rectangle { }
+                Rectangle { }
+                Item {
+                    Image { }
+                    Text { }
+                }
+
+                Item {
+                    Item {
+                        Image { }
+                        Image { }
+                        Row { }
+                        Image { }
+                        Image { }
+                    }
+
+                    Column { }
+                    Row { }
+                    Text { }
+                    Text { }
+                    Text { }
+                }
+                MouseArea { }
+            }
+        }
+    }
+}
diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/positioner.qml b/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/positioner.qml
new file mode 100644
index 0000000..05ca804
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/positioner.qml
@@ -0,0 +1,37 @@
+import Qt 4.6
+import QDeclarativeTime 1.0 as QDeclarativeTime
+
+Item {
+    QDeclarativeTime.Timer {
+        component: Component {
+            Item {
+                Rectangle { }
+                Rectangle { }
+                Item {
+                    Image { }
+                    Text { }
+                }
+
+                Item {
+                    Item {
+                        Image { }
+                        Image { }
+                        Row {
+                            Image { }
+                            Image { }
+                        }
+                    }
+
+                    Column {
+                        Row {
+                            Text { }
+                            Text { }
+                        }
+                        Text { }
+                    }
+                }
+                MouseArea { }
+            }
+        }
+    }
+}
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject.qml b/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject.qml
deleted file mode 100644
index 9c3f7f8..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt.test 4.6
-
-MyQmlObject {}
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject_binding.qml b/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject_binding.qml
deleted file mode 100644
index e6cc4cf..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/data/myqmlobject_binding.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt.test 4.6
-
-MyQmlObject {
-    result: value
-}
-
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/object.qml b/tests/benchmarks/declarative/qmlcomponent/data/object.qml
deleted file mode 100644
index 0d2d49b..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/data/object.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-QtObject {}
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/object_id.qml b/tests/benchmarks/declarative/qmlcomponent/data/object_id.qml
deleted file mode 100644
index 69114af..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/data/object_id.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    id: Blah
-}
-
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qmlcomponent/data/samegame/BoomBlock.qml
deleted file mode 100644
index 723e62a..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/data/samegame/BoomBlock.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-import Qt 4.6
-
-Item { id:block
-    property bool dying: false
-    property bool spawned: false
-    property int type: 0
-    property int targetX: 0
-    property int targetY: 0
-
-    x: SpringFollow { enabled: spawned; source: targetX; spring: 2; damping: 0.2 }
-    y: SpringFollow { source: targetY; spring: 2; damping: 0.2 }
-
-    Image { id: img
-        source: {
-            if(type == 0){
-                "pics/redStone.png";
-            } else if(type == 1) {
-                "pics/blueStone.png";
-            } else {
-                "pics/greenStone.png";
-            }
-        }
-        opacity: 0
-        opacity: Behavior { NumberAnimation { duration: 200 } }
-        anchors.fill: parent
-    }
-
-    Particles { id: particles
-        width:1; height:1; anchors.centerIn: parent;
-        emissionRate: 0;
-        lifeSpan: 700; lifeSpanDeviation: 600;
-        angle: 0; angleDeviation: 360;
-        velocity: 100; velocityDeviation:30;
-        source: {
-            if(type == 0){
-                "pics/redStar.png";
-            } else if (type == 1) {
-                "pics/blueStar.png";
-            } else {
-                "pics/greenStar.png";
-            }
-        }
-    }
-
-    states: [
-        State{ name: "AliveState"; when: spawned == true && dying == false
-            PropertyChanges { target: img; opacity: 1 }
-        },
-        State{ name: "DeathState"; when: dying == true
-            StateChangeScript { script: particles.burst(50); }
-            PropertyChanges { target: img; opacity: 0 }
-            StateChangeScript { script: block.destroy(1000); }
-        }
-    ]
-}
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStar.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStar.png
deleted file mode 100644
index ff9588f..0000000
Binary files a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStar.png and /dev/null differ
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStone.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStone.png
deleted file mode 100644
index bf342e0..0000000
Binary files a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/blueStone.png and /dev/null differ
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStar.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStar.png
deleted file mode 100644
index cd06854..0000000
Binary files a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStar.png and /dev/null differ
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStone.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStone.png
deleted file mode 100644
index 5ac14a5..0000000
Binary files a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/greenStone.png and /dev/null differ
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStar.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStar.png
deleted file mode 100644
index 0a4dffe..0000000
Binary files a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStar.png and /dev/null differ
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStone.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStone.png
deleted file mode 100644
index b099f60..0000000
Binary files a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/redStone.png and /dev/null differ
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/yellowStone.png b/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/yellowStone.png
deleted file mode 100644
index c56124a..0000000
Binary files a/tests/benchmarks/declarative/qmlcomponent/data/samegame/pics/yellowStone.png and /dev/null differ
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.2.qml b/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.2.qml
deleted file mode 100644
index 27c5646..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.2.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int a
-    property bool b
-    property double c
-    property real d
-    property string e
-    property url f
-    property color g
-    property date h
-    property var i
-    property variant j
-}
-
diff --git a/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.qml b/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.qml
deleted file mode 100644
index d08f35b..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/data/synthesized_properties.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property int a
-}
diff --git a/tests/benchmarks/declarative/qmlcomponent/qmlcomponent.pro b/tests/benchmarks/declarative/qmlcomponent/qmlcomponent.pro
deleted file mode 100644
index a77eebb..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/qmlcomponent.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_qmlcomponent
-QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlcomponent.cpp testtypes.cpp
-HEADERS += testtypes.h
-
-symbian* {
-    data.sources = data/*
-    data.path = data
-    samegame.sources = data/samegame/*
-    samegame.path = data/samegame
-    samegame_pics.sources = data/samegame/pics/*
-    samegame_pics.path = data/samegame/pics
-    DEPLOYMENT += data samegame samegame_pics
-}
-
diff --git a/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp b/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
deleted file mode 100644
index acdc395..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "testtypes.h"
-
-void registerTypes()
-{
-    QML_REGISTER_TYPE(Qt.test, 4, 6, MyQmlObject, MyQmlObject);
-}
diff --git a/tests/benchmarks/declarative/qmlcomponent/testtypes.h b/tests/benchmarks/declarative/qmlcomponent/testtypes.h
deleted file mode 100644
index a4f16d0..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/testtypes.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef TESTTYPES_H
-#define TESTTYPES_H
-
-#include <QtCore/qobject.h>
-#include <QtDeclarative/qml.h>
-
-class MyQmlObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int result READ result WRITE setResult);
-    Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged);
-    Q_PROPERTY(MyQmlObject *object READ object WRITE setObject NOTIFY objectChanged);
-    Q_PROPERTY(QmlList<QObject *> *data READ data);
-    Q_CLASSINFO("DefaultProperty", "data");
-public:
-    MyQmlObject() : m_result(0), m_value(0), m_object(0) {}
-
-    int result() const { return m_result; }
-    void setResult(int r) { m_result = r; }
-
-    int value() const { return m_value; }
-    void setValue(int v) { m_value = v; emit valueChanged(); }
-
-    QmlList<QObject *> *data() { return &m_data; }
-
-    MyQmlObject *object() const { return m_object; }
-    void setObject(MyQmlObject *o) { m_object = o; emit objectChanged(); }
-
-signals:
-    void valueChanged();
-    void objectChanged();
-
-private:
-    QmlConcreteList<QObject *> m_data;
-    int m_result;
-    int m_value;
-    MyQmlObject *m_object;
-};
-QML_DECLARE_TYPE(MyQmlObject);
-
-void registerTypes();
-
-#endif // TESTTYPES_H
diff --git a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp b/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
deleted file mode 100644
index afd1cdf..0000000
--- a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QFile>
-#include <QDebug>
-#include "testtypes.h"
-
-//TESTED_FILES=
-
-
-class tst_qmlcomponent : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_qmlcomponent();
-    virtual ~tst_qmlcomponent();
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-
-private slots:
-    void creation_data();
-    void creation();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlcomponent::tst_qmlcomponent()
-{
-}
-
-tst_qmlcomponent::~tst_qmlcomponent()
-{
-}
-
-void tst_qmlcomponent::initTestCase()
-{
-    registerTypes();
-}
-
-void tst_qmlcomponent::cleanupTestCase()
-{
-}
-
-void tst_qmlcomponent::creation_data()
-{
-    QTest::addColumn<QString>("file");
-
-    QTest::newRow("Object") << "data/object.qml";
-    QTest::newRow("Object - Id") << "data/object_id.qml";
-    QTest::newRow("MyQmlObject") << "data/myqmlobject.qml";
-    QTest::newRow("MyQmlObject: basic binding") << "data/myqmlobject_binding.qml";
-    QTest::newRow("Synthesized properties") << "data/synthesized_properties.qml";
-    QTest::newRow("Synthesized properties.2") << "data/synthesized_properties.2.qml";
-    QTest::newRow("SameGame - BoomBlock") << "data/samegame/BoomBlock.qml";
-}
-
-void tst_qmlcomponent::creation()
-{
-    QFETCH(QString, file);
-
-    QmlComponent c(&engine, file);
-    QVERIFY(c.isReady());
-
-    QObject *obj = c.create();
-    delete obj;
-
-    QBENCHMARK {
-        QObject *obj = c.create();
-        delete obj;
-    }
-}
-
-QTEST_MAIN(tst_qmlcomponent)
-#include "tst_qmlcomponent.moc"
diff --git a/tests/benchmarks/declarative/qmlgraphicsimage/image.png b/tests/benchmarks/declarative/qmlgraphicsimage/image.png
deleted file mode 100644
index 623d362..0000000
Binary files a/tests/benchmarks/declarative/qmlgraphicsimage/image.png and /dev/null differ
diff --git a/tests/benchmarks/declarative/qmlgraphicsimage/qmlgraphicsimage.pro b/tests/benchmarks/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
deleted file mode 100644
index f14931c..0000000
--- a/tests/benchmarks/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_qmlgraphicsimage
-QT += declarative
-macx:CONFIG -= app_bundle
-CONFIG += release
-
-SOURCES += tst_qmlgraphicsimage.cpp
-
-symbian* {
-    data.sources = image.png
-    data.path = .
-    DEPLOYMENT += data
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
diff --git a/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp b/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
deleted file mode 100644
index 6d1aa0e..0000000
--- a/tests/benchmarks/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <private/qmlgraphicsimage_p.h>
-
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-// Application private dir is default serach path for files, so SRCDIR can be set to empty
-#define SRCDIR ""
-#endif
-
-class tst_qmlgraphicsimage : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicsimage() {}
-
-private slots:
-    void qmlgraphicsimage();
-    void qmlgraphicsimage_file();
-    void qmlgraphicsimage_url();
-
-private:
-    QmlEngine engine;
-};
-
-void tst_qmlgraphicsimage::qmlgraphicsimage()
-{
-    int x = 0;
-    QUrl url("image.png");
-    QBENCHMARK {
-        QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
-        QmlGraphicsImage *image = new QmlGraphicsImage;
-        QmlEngine::setContextForObject(image, engine.rootContext());
-        delete image;
-    }
-}
-
-void tst_qmlgraphicsimage::qmlgraphicsimage_file()
-{
-    int x = 0;
-    QUrl url("image.png");
-    QBENCHMARK {
-        QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
-        QmlGraphicsImage *image = new QmlGraphicsImage;
-        QmlEngine::setContextForObject(image, engine.rootContext());
-        image->setSource(url);
-        delete image;
-    }
-}
-
-void tst_qmlgraphicsimage::qmlgraphicsimage_url()
-{
-    int x = 0;
-    QUrl url("image.png");
-    QBENCHMARK {
-        QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
-        QmlGraphicsImage *image = new QmlGraphicsImage;
-        QmlEngine::setContextForObject(image, engine.rootContext());
-        image->setSource(url2);
-        delete image;
-    }
-}
-
-QTEST_MAIN(tst_qmlgraphicsimage)
-
-#include "tst_qmlgraphicsimage.moc"
diff --git a/tests/benchmarks/declarative/qmlmetaproperty/data/object.qml b/tests/benchmarks/declarative/qmlmetaproperty/data/object.qml
deleted file mode 100644
index 11b95e1..0000000
--- a/tests/benchmarks/declarative/qmlmetaproperty/data/object.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-Item {}
diff --git a/tests/benchmarks/declarative/qmlmetaproperty/data/synthesized_object.qml b/tests/benchmarks/declarative/qmlmetaproperty/data/synthesized_object.qml
deleted file mode 100644
index a923a0a..0000000
--- a/tests/benchmarks/declarative/qmlmetaproperty/data/synthesized_object.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Item {
-    property int blah
-}
-
diff --git a/tests/benchmarks/declarative/qmlmetaproperty/qmlmetaproperty.pro b/tests/benchmarks/declarative/qmlmetaproperty/qmlmetaproperty.pro
deleted file mode 100644
index c18a56b..0000000
--- a/tests/benchmarks/declarative/qmlmetaproperty/qmlmetaproperty.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_qmlmetaproperty
-QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlmetaproperty.cpp 
-
diff --git a/tests/benchmarks/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/benchmarks/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
deleted file mode 100644
index 4c002f8..0000000
--- a/tests/benchmarks/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QmlMetaProperty>
-#include <QFile>
-#include <QDebug>
-
-//TESTED_FILES=
-
-
-class tst_qmlmetaproperty : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_qmlmetaproperty();
-    virtual ~tst_qmlmetaproperty();
-
-public slots:
-    void init();
-    void cleanup();
-
-private slots:
-    void lookup_data();
-    void lookup();
-
-private:
-    QmlEngine engine;
-};
-
-tst_qmlmetaproperty::tst_qmlmetaproperty()
-{
-}
-
-tst_qmlmetaproperty::~tst_qmlmetaproperty()
-{
-}
-
-void tst_qmlmetaproperty::init()
-{
-}
-
-void tst_qmlmetaproperty::cleanup()
-{
-}
-
-void tst_qmlmetaproperty::lookup_data()
-{
-    QTest::addColumn<QString>("file");
-
-    QTest::newRow("Simple Object") << "data/object.qml";
-    QTest::newRow("Synthesized Object") << "data/synthesized_object.qml";
-}
-
-void tst_qmlmetaproperty::lookup()
-{
-    QFETCH(QString, file);
-
-    QmlComponent c(&engine, file);
-    QVERIFY(c.isReady());
-
-    QObject *obj = c.create();
-
-    QBENCHMARK {
-        QmlMetaProperty p(obj, "x");
-    }
-
-    delete obj;
-}
-
-QTEST_MAIN(tst_qmlmetaproperty)
-#include "tst_qmlmetaproperty.moc"
diff --git a/tests/benchmarks/declarative/qmltime/example.qml b/tests/benchmarks/declarative/qmltime/example.qml
deleted file mode 100644
index 68889f0..0000000
--- a/tests/benchmarks/declarative/qmltime/example.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    property string name: "Bob Smith"
-
-    QmlTime.Timer {
-        component: Item {
-            Text { text: name }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.cpp b/tests/benchmarks/declarative/qmltime/qmltime.cpp
deleted file mode 100644
index b791934..0000000
--- a/tests/benchmarks/declarative/qmltime/qmltime.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QDebug>
-#include <QApplication>
-#include <QTime>
-#include <QmlContext>
-#include <QGraphicsScene>
-#include <QGraphicsRectItem>
-
-class Timer : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QmlComponent *component READ component WRITE setComponent);
-
-public:
-    Timer();
-
-    QmlComponent *component() const;
-    void setComponent(QmlComponent *);
-
-    static Timer *timerInstance();
-
-    void run(uint);
-
-    bool willParent() const;
-    void setWillParent(bool p);
-
-private:
-    void runTest(QmlContext *, uint);
-
-    QmlComponent *m_component;
-    static Timer *m_timer;
-
-    bool m_willparent;
-    QGraphicsScene m_scene;
-    QGraphicsRectItem m_item;
-};
-QML_DECLARE_TYPE(Timer);
-
-Timer *Timer::m_timer = 0;
-
-Timer::Timer()
-: m_component(0), m_willparent(false)
-{
-    if (m_timer)
-        qWarning("Timer: Timer already registered");
-    m_timer = this;
-
-    m_scene.setItemIndexMethod(QGraphicsScene::NoIndex);
-    m_scene.addItem(&m_item);
-}
-
-QmlComponent *Timer::component() const
-{
-    return m_component;
-}
-
-void Timer::setComponent(QmlComponent *c)
-{
-    m_component = c;
-}
-
-Timer *Timer::timerInstance()
-{
-    return m_timer;
-}
-
-void Timer::run(uint iterations)
-{
-    QmlContext context(qmlContext(this));
-
-    QObject *o = m_component->create(&context);
-    QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o);
-    if (m_willparent && go) 
-        go->setParentItem(&m_item);
-    delete o;
-    
-    runTest(&context, iterations);
-}
-
-bool Timer::willParent() const
-{
-    return m_willparent;
-}
-
-void Timer::setWillParent(bool p)
-{
-    m_willparent = p;
-}
-
-void Timer::runTest(QmlContext *context, uint iterations)
-{
-    QTime t;
-    t.start();
-    for (uint ii = 0; ii < iterations; ++ii) {
-        QObject *o = m_component->create(context);
-        QGraphicsObject *go = qobject_cast<QGraphicsObject *>(o);
-        if (m_willparent && go) 
-            go->setParentItem(&m_item);
-        delete o;
-    }
-
-    int e = t.elapsed();
-
-    qWarning() << "Total:" << e << "ms, Per iteration:" << qreal(e) / qreal(iterations) << "ms";
-
-}
-
-void usage(const char *name)
-{
-    qWarning("Usage: %s [-iterations <count>] [-parent] <qml file>", name);
-    exit(-1);
-}
-
-int main(int argc, char ** argv)
-{
-    QApplication app(argc, argv);
-
-    QML_REGISTER_TYPE(QmlTime, 1, 0, Timer, Timer);
-
-    uint iterations = 1024;
-    QString filename;
-    bool willParent = false;
-
-    for (int ii = 1; ii < argc; ++ii) {
-        QByteArray arg(argv[ii]);
-
-        if (arg == "-iterations") {
-            if (ii + 1 < argc) {
-                ++ii;
-                QByteArray its(argv[ii]);
-                bool ok = false;
-                iterations = its.toUInt(&ok);
-                if (!ok)
-                    usage(argv[0]);
-            } else {
-                usage(argv[0]);
-            }
-        } else if (arg == "-parent") {
-            willParent = true;
-        } else {
-            filename = QLatin1String(argv[ii]);
-        }
-    }
-
-    if (filename.isEmpty())
-#ifdef Q_OS_SYMBIAN
-        filename = QLatin1String("./tests/item_creation/data.qml");
-#else
-        usage(argv[0]);
-#endif
-
-    QmlEngine engine;
-    QmlComponent component(&engine, filename);
-    if (component.isError()) {
-        qWarning() << component.errors();
-        return -1;
-    }
-
-    QObject *obj = component.create();
-    if (!obj) {
-        qWarning() << component.errors();
-        return -1;
-    }
-
-    Timer *timer = Timer::timerInstance();
-    if (!timer) {
-        qWarning() << "A Tester.Timer instance is required.";
-        return -1;
-    }
-
-#ifdef Q_OS_SYMBIAN
-    willParent = true;
-#endif
-    timer->setWillParent(willParent);
-
-    if (!timer->component()) {
-        qWarning() << "The timer has no component";
-        return -1;
-    }
-
-#ifdef Q_OS_SYMBIAN
-    iterations = 1024;
-#endif
-
-    timer->run(iterations);
-
-    return 0;
-}
-
-#include "qmltime.moc"
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.pro b/tests/benchmarks/declarative/qmltime/qmltime.pro
deleted file mode 100644
index 9352f3b..0000000
--- a/tests/benchmarks/declarative/qmltime/qmltime.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-load(qttest_p4)
-TEMPLATE = app
-TARGET = qmltime
-QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += qmltime.cpp 
-
-symbian* {
-    TARGET.CAPABILITY = "All -TCB"
-    example.sources = example.qml
-    esample.path = .
-    tests.sources = tests/*
-    tests.path = tests
-    anshors.sources = tests/anchors/*
-    anchors.path = tests/anchors
-    item_creation.sources = tests/item_creation/*
-    item_creation.path = tests/item_creation
-    positioner_creation.sources = tests/positioner_creation/*
-    positioner_creation.path = tests/positioner_creation
-    DEPLOYMENT += example tests anchors item_creation positioner_creation
-}
-
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
deleted file mode 100644
index 31c879b..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.leftMargin: 0
-                }
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
deleted file mode 100644
index 23fe78e..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-                Item {
-                    anchors.fill: parent
-                    anchors.leftMargin: 0
-                }
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
deleted file mode 100644
index bc447ef..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-                Item {
-                }
-            }
-        }
-    }
-}
-
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
deleted file mode 100644
index 996602c..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                children: [
-                    Rectangle { },
-                    Rectangle { },
-                    Item { },
-                    Image { },
-                    Text { },
-                    Item { },
-                    Item { },
-                    Image { },
-                    Image { },
-                    Row { },
-                    Image { },
-                    Image { },
-                    Column { },
-                    Row { },
-                    Text { },
-                    Text { },
-                    Text { },
-                    MouseArea { }
-                ]
-
-            }
-        }
-    }
-
-}
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
deleted file mode 100644
index 9f79c34..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                data: [
-                    Rectangle { },
-                    Rectangle { },
-                    Item { },
-                    Image { },
-                    Text { },
-                    Item { },
-                    Item { },
-                    Image { },
-                    Image { },
-                    Row { },
-                    Image { },
-                    Image { },
-                    Column { },
-                    Row { },
-                    Text { },
-                    Text { },
-                    Text { },
-                    MouseArea { }
-                ]
-
-            }
-        }
-    }
-
-}
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
deleted file mode 100644
index f228c2a..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-            }
-        }
-    }
-}
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
deleted file mode 100644
index 335aeb8..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                resources: [
-                    Rectangle { },
-                    Rectangle { },
-                    Item { },
-                    Image { },
-                    Text { },
-                    Item { },
-                    Item { },
-                    Image { },
-                    Image { },
-                    Row { },
-                    Image { },
-                    Image { },
-                    Column { },
-                    Row { },
-                    Text { },
-                    Text { },
-                    Text { },
-                    MouseArea { }
-                ]
-
-            }
-        }
-    }
-
-}
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
deleted file mode 100644
index 97bad47..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Rectangle { }
-                Rectangle { }
-                Item {
-                    Image { }
-                    Text { }
-                }
-
-                Item {
-                    Item {
-                        Image { }
-                        Image { }
-                        Item {
-                            Image { }
-                            Image { }
-                        }
-                    }
-
-                    Item {
-                        Item {
-                            Text { }
-                            Text { }
-                        }
-                        Text { }
-                    }
-                }
-                MouseArea { }
-            }
-        }
-    }
-}
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
deleted file mode 100644
index 36dda15..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Rectangle { }
-                Rectangle { }
-                Item {
-                    Image { }
-                    Text { }
-                }
-
-                Item {
-                    Item {
-                        Image { }
-                        Image { }
-                        Row { }
-                        Image { }
-                        Image { }
-                    }
-
-                    Column { }
-                    Row { }
-                    Text { }
-                    Text { }
-                    Text { }
-                }
-                MouseArea { }
-            }
-        }
-    }
-}
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
deleted file mode 100644
index 396e27d..0000000
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import Qt 4.6
-import QmlTime 1.0 as QmlTime
-
-Item {
-    QmlTime.Timer {
-        component: Component {
-            Item {
-                Rectangle { }
-                Rectangle { }
-                Item {
-                    Image { }
-                    Text { }
-                }
-
-                Item {
-                    Item {
-                        Image { }
-                        Image { }
-                        Row {
-                            Image { }
-                            Image { }
-                        }
-                    }
-
-                    Column {
-                        Row {
-                            Text { }
-                            Text { }
-                        }
-                        Text { }
-                    }
-                }
-                MouseArea { }
-            }
-        }
-    }
-}
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index a11fe31..61f5fc8 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <private/qmlengine_p.h>
-#include <private/qmlobjectscriptclass_p.h>
-#include <private/qmlgraphicsrectangle_p.h>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <private/qdeclarativeengine_p.h>
+#include <private/qdeclarativeobjectscriptclass_p.h>
+#include <private/qdeclarativerectangle_p.h>
 #include <QScriptEngine>
 #include <QScriptValue>
 
@@ -301,12 +301,12 @@ void tst_script::property_qobject()
 
 void tst_script::property_qmlobject()
 {
-    QmlEngine qmlengine;
+    QDeclarativeEngine qmlengine;
 
-    QScriptEngine *engine = QmlEnginePrivate::getScriptEngine(&qmlengine);
+    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(&qmlengine);
     TestObject to;
 
-    QScriptValue v = QmlEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
+    QScriptValue v = QDeclarativeEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
 
     QScriptValueList args;
     args << v;
@@ -385,12 +385,12 @@ void tst_script::function_qobject()
 
 void tst_script::function_qmlobject()
 {
-    QmlEngine qmlengine;
+    QDeclarativeEngine qmlengine;
 
-    QScriptEngine *engine = QmlEnginePrivate::getScriptEngine(&qmlengine);
+    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(&qmlengine);
     TestObject to;
 
-    QScriptValue v = QmlEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
+    QScriptValue v = QDeclarativeEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
 
     QScriptValueList args;
     args << v;
@@ -469,12 +469,12 @@ void tst_script::function_args_qobject()
 
 void tst_script::function_args_qmlobject()
 {
-    QmlEngine qmlengine;
+    QDeclarativeEngine qmlengine;
 
-    QScriptEngine *engine = QmlEnginePrivate::getScriptEngine(&qmlengine);
+    QScriptEngine *engine = QDeclarativeEnginePrivate::getScriptEngine(&qmlengine);
     TestObject to;
 
-    QScriptValue v = QmlEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
+    QScriptValue v = QDeclarativeEnginePrivate::get(&qmlengine)->objectClass->newQObject(&to);
 
     QScriptValueList args;
     args << v;
@@ -488,8 +488,8 @@ void tst_script::function_args_qmlobject()
 
 void tst_script::signal_unconnected()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("signal_unconnected.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("signal_unconnected.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -502,8 +502,8 @@ void tst_script::signal_unconnected()
 
 void tst_script::signal_qml()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("signal_qml.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("signal_qml.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -516,8 +516,8 @@ void tst_script::signal_qml()
 
 void tst_script::signal_args()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("signal_args.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("signal_args.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -530,8 +530,8 @@ void tst_script::signal_args()
 
 void tst_script::signal_unusedArgs()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("signal_unusedArgs.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("signal_unusedArgs.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -544,8 +544,8 @@ void tst_script::signal_unusedArgs()
 
 void tst_script::slot_simple()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("slot_simple.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("slot_simple.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -558,8 +558,8 @@ void tst_script::slot_simple()
 
 void tst_script::slot_simple_js()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("slot_simple_js.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("slot_simple_js.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -572,8 +572,8 @@ void tst_script::slot_simple_js()
 
 void tst_script::slot_complex()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("slot_complex.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("slot_complex.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -586,8 +586,8 @@ void tst_script::slot_complex()
 
 void tst_script::slot_complex_js()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("slot_complex_js.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("slot_complex_js.qml"));
     TestObject *object = qobject_cast<TestObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -609,9 +609,9 @@ void tst_script::block_data()
 void tst_script::block()
 {
     QFETCH(QString, methodName);
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("block.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle *>(component.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("block.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle *>(component.create());
     QVERIFY(rect != 0);
 
     int index = rect->metaObject()->indexOfMethod(methodName.toUtf8());
diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
index 39b2244..d570bb3 100644
--- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
@@ -1395,7 +1395,7 @@ void tst_QPainter::drawTransformedImageRoundedRect()
     }
 }
 
-//code from QmlGraphicsRectangle for drawing rounded rects
+//code from QDeclarativeRectangle for drawing rounded rects
 void tst_QPainter::drawBorderPixmapRoundedRect()
 {
     //setup image
@@ -1446,7 +1446,7 @@ void tst_QPainter::drawScaledBorderPixmapRoundedRect_data()
     //    QTest::newRow(QString(QLatin1String("scale=%1; imagetype=ARGB8565_Pre")).arg(i).toLatin1()) << i << (int)QImage::Format_ARGB8565_Premultiplied;
 }
 
-//code from QmlGraphicsRectangle for drawing rounded rects
+//code from QDeclarativeRectangle for drawing rounded rects
 void tst_QPainter::drawScaledBorderPixmapRoundedRect()
 {
     QFETCH(float, scale);
@@ -1502,7 +1502,7 @@ void tst_QPainter::drawTransformedBorderPixmapRoundedRect_data()
 
 }
 
-//code from QmlGraphicsRectangle for drawing rounded rects
+//code from QDeclarativeRectangle for drawing rounded rects
 void tst_QPainter::drawTransformedBorderPixmapRoundedRect()
 {
     QFETCH(QTransform, transform);
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 8c2a015..3b5a10a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2067,7 +2067,7 @@ bool Configure::checkAvailability(const QString &part)
     } else if (part == "WEBKIT") {
         available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++");
     } else if (part == "DECLARATIVE") {
-        available = QFile::exists(sourcePath + "/src/declarative/qml/qmlcomponent.h");
+        available = QFile::exists(sourcePath + "/src/declarative/qml/qdeclarativecomponent.h");
     } else if (part == "AUDIO_BACKEND") {
         available = true;
         if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
diff --git a/tools/linguist/lupdate/lupdate.pro b/tools/linguist/lupdate/lupdate.pro
index 283d69f..1f88931 100644
--- a/tools/linguist/lupdate/lupdate.pro
+++ b/tools/linguist/lupdate/lupdate.pro
@@ -26,7 +26,7 @@ SOURCES += \
     cpp.cpp \
     java.cpp \
     qscript.cpp \
-    qml.cpp \
+    qdeclarative.cpp \
     ui.cpp
 
 HEADERS += \
diff --git a/tools/linguist/lupdate/qdeclarative.cpp b/tools/linguist/lupdate/qdeclarative.cpp
new file mode 100644
index 0000000..a734e99
--- /dev/null
+++ b/tools/linguist/lupdate/qdeclarative.cpp
@@ -0,0 +1,240 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "lupdate.h"
+
+#include <translator.h>
+
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QString>
+
+#include "parser/qdeclarativejsengine_p.h"
+#include "parser/qdeclarativejsparser_p.h"
+#include "parser/qdeclarativejslexer_p.h"
+#include "parser/qdeclarativejsnodepool_p.h"
+#include "parser/qdeclarativejsastvisitor_p.h"
+#include "parser/qdeclarativejsast_p.h"
+
+#include <QCoreApplication>
+#include <QFile>
+#include <QFileInfo>
+#include <QtDebug>
+#include <QStringList>
+
+#include <iostream>
+#include <cstdlib>
+
+QT_BEGIN_NAMESPACE
+
+using namespace QDeclarativeJS;
+
+class FindTrCalls: protected AST::Visitor
+{
+public:
+    void operator()(Translator *translator, const QString &fileName, AST::Node *node)
+    {
+        m_translator = translator;
+        m_fileName = fileName;
+        m_component = QFileInfo(fileName).baseName();   //matches qsTr usage in QScriptEngine
+        accept(node);
+    }
+
+protected:
+    using AST::Visitor::visit;
+    using AST::Visitor::endVisit;
+
+    void accept(AST::Node *node)
+    { AST::Node::acceptChild(node, this); }
+
+    virtual void endVisit(AST::CallExpression *node)
+    {
+        if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(node->base)) {
+            if (idExpr->name->asString() == QLatin1String("qsTr") ||
+                idExpr->name->asString() == QLatin1String("QT_TR_NOOP")) {
+                if (node->arguments && AST::cast<AST::StringLiteral *>(node->arguments->expression)) {
+                    AST::StringLiteral *literal = AST::cast<AST::StringLiteral *>(node->arguments->expression);
+                    const QString source = literal->value->asString();
+
+                    QString comment;
+                    bool plural = false;
+                    AST::ArgumentList *commentNode = node->arguments->next;
+                    if (commentNode) {
+                        literal = AST::cast<AST::StringLiteral *>(commentNode->expression);
+                        comment = literal->value->asString();
+
+                        AST::ArgumentList *nNode = commentNode->next;
+                        if (nNode) {
+                            AST::NumericLiteral *numLiteral = AST::cast<AST::NumericLiteral *>(nNode->expression);
+                            if (numLiteral) {
+                                plural = true;
+                            }
+                        }
+                    }
+
+                    TranslatorMessage msg(m_component, source,
+                        comment, QString(), m_fileName,
+                        node->firstSourceLocation().startLine, QStringList(),
+                        TranslatorMessage::Unfinished, plural);
+                    m_translator->extend(msg);
+                }
+            } else if (idExpr->name->asString() == QLatin1String("qsTranslate") ||
+                       idExpr->name->asString() == QLatin1String("QT_TRANSLATE_NOOP")) {
+                if (node->arguments && AST::cast<AST::StringLiteral *>(node->arguments->expression)) {
+                    AST::StringLiteral *literal = AST::cast<AST::StringLiteral *>(node->arguments->expression);
+                    const QString context = literal->value->asString();
+
+                    QString source;
+                    QString comment;
+                    bool plural = false;
+                    AST::ArgumentList *sourceNode = node->arguments->next;
+                    if (sourceNode) {
+                        literal = AST::cast<AST::StringLiteral *>(sourceNode->expression);
+                        source = literal->value->asString();
+                        AST::ArgumentList *commentNode = sourceNode->next;
+                        if (commentNode) {
+                            literal = AST::cast<AST::StringLiteral *>(commentNode->expression);
+                            comment = literal->value->asString();
+
+                            AST::ArgumentList *nNode = commentNode->next;
+                            if (nNode) {
+                                AST::NumericLiteral *numLiteral = AST::cast<AST::NumericLiteral *>(nNode->expression);
+                                if (numLiteral) {
+                                    plural = true;
+                                }
+                            }
+                        }
+                    }
+
+                    TranslatorMessage msg(context, source,
+                        comment, QString(), m_fileName,
+                        node->firstSourceLocation().startLine, QStringList(),
+                        TranslatorMessage::Unfinished, plural);
+                    m_translator->extend(msg);
+                }
+
+            }
+        }
+    }
+
+private:
+    Translator *m_translator;
+    QString m_fileName;
+    QString m_component;
+};
+
+QString createErrorString(const QString &filename, const QString &code, Parser &parser)
+{
+    // print out error
+    QStringList lines = code.split(QLatin1Char('\n'));
+    lines.append(QLatin1String("\n")); // sentinel.
+    QString errorString;
+
+    foreach (const DiagnosticMessage &m, parser.diagnosticMessages()) {
+
+        if (m.isWarning())
+            continue;
+
+        QString error = filename + QLatin1Char(':') + QString::number(m.loc.startLine)
+                        + QLatin1Char(':') + QString::number(m.loc.startColumn) + QLatin1String(": error: ")
+                        + m.message + QLatin1Char('\n');
+
+        int line = 0;
+        if (m.loc.startLine > 0)
+            line = m.loc.startLine - 1;
+
+        const QString textLine = lines.at(line);
+
+        error += textLine + QLatin1Char('\n');
+
+        int column = m.loc.startColumn - 1;
+        if (column < 0)
+            column = 0;
+
+        column = qMin(column, textLine.length());
+
+        for (int i = 0; i < column; ++i) {
+            const QChar ch = textLine.at(i);
+            if (ch.isSpace())
+                error += ch.unicode();
+            else
+                error += QLatin1Char(' ');
+        }
+        error += QLatin1String("^\n");
+        errorString += error;
+    }
+    return errorString;
+}
+
+bool loadQml(Translator &translator, const QString &filename, ConversionData &cd)
+{
+    cd.m_sourceFileName = filename;
+    QFile file(filename);
+    if (!file.open(QIODevice::ReadOnly)) {
+        cd.appendError(QString::fromLatin1("Cannot open %1: %2")
+            .arg(filename, file.errorString()));
+        return false;
+    }
+
+    const QString code = QTextStream(&file).readAll();
+
+    Engine driver;
+    Parser parser(&driver);
+
+    NodePool nodePool(filename, &driver);
+    driver.setNodePool(&nodePool);
+
+    Lexer lexer(&driver);
+    lexer.setCode(code, /*line = */ 1);
+    driver.setLexer(&lexer);
+
+    if (parser.parse()) {
+        FindTrCalls trCalls;
+        trCalls(&translator, filename, parser.ast());
+    } else {
+        QString error = createErrorString(filename, code, parser);
+        cd.appendError(error);
+        return false;
+    }
+    return true;
+}
+
+QT_END_NAMESPACE
diff --git a/tools/linguist/lupdate/qml.cpp b/tools/linguist/lupdate/qml.cpp
deleted file mode 100644
index cb35f47..0000000
--- a/tools/linguist/lupdate/qml.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Linguist of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "lupdate.h"
-
-#include <translator.h>
-
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QString>
-
-#include "parser/qmljsengine_p.h"
-#include "parser/qmljsparser_p.h"
-#include "parser/qmljslexer_p.h"
-#include "parser/qmljsnodepool_p.h"
-#include "parser/qmljsastvisitor_p.h"
-#include "parser/qmljsast_p.h"
-
-#include <QCoreApplication>
-#include <QFile>
-#include <QFileInfo>
-#include <QtDebug>
-#include <QStringList>
-
-#include <iostream>
-#include <cstdlib>
-
-QT_BEGIN_NAMESPACE
-
-using namespace QmlJS;
-
-class FindTrCalls: protected AST::Visitor
-{
-public:
-    void operator()(Translator *translator, const QString &fileName, AST::Node *node)
-    {
-        m_translator = translator;
-        m_fileName = fileName;
-        m_component = QFileInfo(fileName).baseName();   //matches qsTr usage in QScriptEngine
-        accept(node);
-    }
-
-protected:
-    using AST::Visitor::visit;
-    using AST::Visitor::endVisit;
-
-    void accept(AST::Node *node)
-    { AST::Node::acceptChild(node, this); }
-
-    virtual void endVisit(AST::CallExpression *node)
-    {
-        if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(node->base)) {
-            if (idExpr->name->asString() == QLatin1String("qsTr") ||
-                idExpr->name->asString() == QLatin1String("QT_TR_NOOP")) {
-                if (node->arguments && AST::cast<AST::StringLiteral *>(node->arguments->expression)) {
-                    AST::StringLiteral *literal = AST::cast<AST::StringLiteral *>(node->arguments->expression);
-                    const QString source = literal->value->asString();
-
-                    QString comment;
-                    bool plural = false;
-                    AST::ArgumentList *commentNode = node->arguments->next;
-                    if (commentNode) {
-                        literal = AST::cast<AST::StringLiteral *>(commentNode->expression);
-                        comment = literal->value->asString();
-
-                        AST::ArgumentList *nNode = commentNode->next;
-                        if (nNode) {
-                            AST::NumericLiteral *numLiteral = AST::cast<AST::NumericLiteral *>(nNode->expression);
-                            if (numLiteral) {
-                                plural = true;
-                            }
-                        }
-                    }
-
-                    TranslatorMessage msg(m_component, source,
-                        comment, QString(), m_fileName,
-                        node->firstSourceLocation().startLine, QStringList(),
-                        TranslatorMessage::Unfinished, plural);
-                    m_translator->extend(msg);
-                }
-            } else if (idExpr->name->asString() == QLatin1String("qsTranslate") ||
-                       idExpr->name->asString() == QLatin1String("QT_TRANSLATE_NOOP")) {
-                if (node->arguments && AST::cast<AST::StringLiteral *>(node->arguments->expression)) {
-                    AST::StringLiteral *literal = AST::cast<AST::StringLiteral *>(node->arguments->expression);
-                    const QString context = literal->value->asString();
-
-                    QString source;
-                    QString comment;
-                    bool plural = false;
-                    AST::ArgumentList *sourceNode = node->arguments->next;
-                    if (sourceNode) {
-                        literal = AST::cast<AST::StringLiteral *>(sourceNode->expression);
-                        source = literal->value->asString();
-                        AST::ArgumentList *commentNode = sourceNode->next;
-                        if (commentNode) {
-                            literal = AST::cast<AST::StringLiteral *>(commentNode->expression);
-                            comment = literal->value->asString();
-
-                            AST::ArgumentList *nNode = commentNode->next;
-                            if (nNode) {
-                                AST::NumericLiteral *numLiteral = AST::cast<AST::NumericLiteral *>(nNode->expression);
-                                if (numLiteral) {
-                                    plural = true;
-                                }
-                            }
-                        }
-                    }
-
-                    TranslatorMessage msg(context, source,
-                        comment, QString(), m_fileName,
-                        node->firstSourceLocation().startLine, QStringList(),
-                        TranslatorMessage::Unfinished, plural);
-                    m_translator->extend(msg);
-                }
-
-            }
-        }
-    }
-
-private:
-    Translator *m_translator;
-    QString m_fileName;
-    QString m_component;
-};
-
-QString createErrorString(const QString &filename, const QString &code, Parser &parser)
-{
-    // print out error
-    QStringList lines = code.split(QLatin1Char('\n'));
-    lines.append(QLatin1String("\n")); // sentinel.
-    QString errorString;
-
-    foreach (const DiagnosticMessage &m, parser.diagnosticMessages()) {
-
-        if (m.isWarning())
-            continue;
-
-        QString error = filename + QLatin1Char(':') + QString::number(m.loc.startLine)
-                        + QLatin1Char(':') + QString::number(m.loc.startColumn) + QLatin1String(": error: ")
-                        + m.message + QLatin1Char('\n');
-
-        int line = 0;
-        if (m.loc.startLine > 0)
-            line = m.loc.startLine - 1;
-
-        const QString textLine = lines.at(line);
-
-        error += textLine + QLatin1Char('\n');
-
-        int column = m.loc.startColumn - 1;
-        if (column < 0)
-            column = 0;
-
-        column = qMin(column, textLine.length());
-
-        for (int i = 0; i < column; ++i) {
-            const QChar ch = textLine.at(i);
-            if (ch.isSpace())
-                error += ch.unicode();
-            else
-                error += QLatin1Char(' ');
-        }
-        error += QLatin1String("^\n");
-        errorString += error;
-    }
-    return errorString;
-}
-
-bool loadQml(Translator &translator, const QString &filename, ConversionData &cd)
-{
-    cd.m_sourceFileName = filename;
-    QFile file(filename);
-    if (!file.open(QIODevice::ReadOnly)) {
-        cd.appendError(QString::fromLatin1("Cannot open %1: %2")
-            .arg(filename, file.errorString()));
-        return false;
-    }
-
-    const QString code = QTextStream(&file).readAll();
-
-    Engine driver;
-    Parser parser(&driver);
-
-    NodePool nodePool(filename, &driver);
-    driver.setNodePool(&nodePool);
-
-    Lexer lexer(&driver);
-    lexer.setCode(code, /*line = */ 1);
-    driver.setLexer(&lexer);
-
-    if (parser.parse()) {
-        FindTrCalls trCalls;
-        trCalls(&translator, filename, parser.ast());
-    } else {
-        QString error = createErrorString(filename, code, parser);
-        cd.appendError(error);
-        return false;
-    }
-    return true;
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/atom.cpp b/tools/qdoc3/atom.cpp
index 88f44ea..6920e9d 100644
--- a/tools/qdoc3/atom.cpp
+++ b/tools/qdoc3/atom.cpp
@@ -133,7 +133,7 @@ QString Atom::UPPERROMAN_    ("upperroman");
   \value ParaLeft
   \value ParaRight
   \value Qml
-  \value QmlText
+  \value QDeclarativeText
   \value QuotationLeft
   \value QuotationRight
   \value RawString
@@ -210,7 +210,7 @@ static const struct {
     { "ParaRight", Atom::ParaRight },
 #ifdef QDOC_QML
     { "Qml", Atom::Qml},
-    { "QmlText", Atom::QmlText },
+    { "QDeclarativeText", Atom::QDeclarativeText },
 #endif
     { "QuotationLeft", Atom::QuotationLeft },
     { "QuotationRight", Atom::QuotationRight },
diff --git a/tools/qdoc3/atom.h b/tools/qdoc3/atom.h
index 70fbae9..d13afbc 100644
--- a/tools/qdoc3/atom.h
+++ b/tools/qdoc3/atom.h
@@ -103,7 +103,7 @@ class Atom
         ParaRight, 
 #ifdef QDOC_QML
         Qml,
-        QmlText,
+        QDeclarativeText,
 #endif
         QuotationLeft, 
         QuotationRight,
diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp
index ee93080..d890758 100644
--- a/tools/qdoc3/codemarker.cpp
+++ b/tools/qdoc3/codemarker.cpp
@@ -290,13 +290,13 @@ QString CodeMarker::taggedQmlNode(const Node* node)
 {
     QString tag;
     switch (node->type()) {
-    case Node::QmlProperty:
+    case Node::QDeclarativeProperty:
         tag = QLatin1String("@property");
         break;
-    case Node::QmlSignal:
+    case Node::QDeclarativeSignal:
         tag = QLatin1String("@signal");
         break;
-    case Node::QmlMethod:
+    case Node::QDeclarativeMethod:
         tag = QLatin1String("@method");
         break;
     default:
@@ -369,7 +369,7 @@ void CodeMarker::insert(FastSection &fastSection,
     bool inheritedMember = false;
     if (!node->relates()) {
         if (node->parent() != (const InnerNode*)fastSection.innerNode) {
-            if (node->type() != Node::QmlProperty)
+            if (node->type() != Node::QDeclarativeProperty)
                 inheritedMember = true;
         }
     }
@@ -612,9 +612,9 @@ QString CodeMarker::macName(const Node *node, const QString &name)
 #ifdef QDOC_QML
 /*!
   Get the list of documentation sections for the children of
-  the specified QmlClassNode.
+  the specified QDeclarativeClassNode.
  */
-QList<Section> CodeMarker::qmlSections(const QmlClassNode* , SynopsisStyle )
+QList<Section> CodeMarker::qmlSections(const QDeclarativeClassNode* , SynopsisStyle )
 {
     return QList<Section>();
 }
diff --git a/tools/qdoc3/codemarker.h b/tools/qdoc3/codemarker.h
index 1b21753..9e754a2 100644
--- a/tools/qdoc3/codemarker.h
+++ b/tools/qdoc3/codemarker.h
@@ -138,7 +138,7 @@ class CodeMarker
                                     SynopsisStyle style, 
                                     Status status) = 0;
 #ifdef QDOC_QML
-    virtual QList<Section> qmlSections(const QmlClassNode* qmlClassNode,
+    virtual QList<Section> qmlSections(const QDeclarativeClassNode* qmlClassNode,
                                        SynopsisStyle style);
 #endif
     virtual const Node *resolveTarget(const QString& target, 
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index 657cfbb..ff09bb7 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -194,8 +194,8 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node,
 	synopsis = "class " + name;
 	break;
     case Node::Function:
-    case Node::QmlSignal:
-    case Node::QmlMethod:
+    case Node::QDeclarativeSignal:
+    case Node::QDeclarativeMethod:
 	func = (const FunctionNode *) node;
 	if (style != SeparateList && !func->returnType().isEmpty())
 	    synopsis = typified(func->returnType()) + " ";
@@ -355,15 +355,15 @@ QString CppCodeMarker::markedUpQmlItem(const Node* node, bool summary)
     QString name = taggedQmlNode(node);
     if (summary) {
 	name = linkTag(node,name);
-    } else if (node->type() == Node::QmlProperty) {
-        const QmlPropertyNode* pn = static_cast<const QmlPropertyNode*>(node);
+    } else if (node->type() == Node::QDeclarativeProperty) {
+        const QDeclarativePropertyNode* pn = static_cast<const QDeclarativePropertyNode*>(node);
         if (pn->isAttached())
             name.prepend(pn->element() + QLatin1Char('.'));
     }
     name = "<@name>" + name + "</@name>";
     QString synopsis = name;
-    if (node->type() == Node::QmlProperty) {
-        const QmlPropertyNode* pn = static_cast<const QmlPropertyNode*>(node);
+    if (node->type() == Node::QDeclarativeProperty) {
+        const QDeclarativePropertyNode* pn = static_cast<const QDeclarativePropertyNode*>(node);
         synopsis += " : " + typified(pn->dataType());
     }
 
@@ -1108,7 +1108,7 @@ QString CppCodeMarker::addMarkUp(const QString& protectedCode,
 
   Currently, it only handles QML property groups.
  */
-QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode,
+QList<Section> CppCodeMarker::qmlSections(const QDeclarativeClassNode* qmlClassNode,
                                           SynopsisStyle style)
 {
     QList<Section> sections;
@@ -1141,12 +1141,12 @@ QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode,
 
             NodeList::ConstIterator c = qmlClassNode->childNodes().begin();
             while (c != qmlClassNode->childNodes().end()) {
-                if ((*c)->subType() == Node::QmlPropertyGroup) {
-                    const QmlPropGroupNode* qpgn = static_cast<const QmlPropGroupNode*>(*c);
+                if ((*c)->subType() == Node::QDeclarativePropertyGroup) {
+                    const QDeclarativePropGroupNode* qpgn = static_cast<const QDeclarativePropGroupNode*>(*c);
                     NodeList::ConstIterator p = qpgn->childNodes().begin();
                     while (p != qpgn->childNodes().end()) {
-                        if ((*p)->type() == Node::QmlProperty) {
-                            const QmlPropertyNode* pn = static_cast<const QmlPropertyNode*>(*p);
+                        if ((*p)->type() == Node::QDeclarativeProperty) {
+                            const QDeclarativePropertyNode* pn = static_cast<const QDeclarativePropertyNode*>(*p);
                             if (pn->isAttached())
                                 insert(qmlattachedproperties,*p,style,Okay);
                             else
@@ -1155,14 +1155,14 @@ QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode,
                         ++p;
                     }
                 }
-                else if ((*c)->type() == Node::QmlSignal) {
+                else if ((*c)->type() == Node::QDeclarativeSignal) {
                     const FunctionNode* sn = static_cast<const FunctionNode*>(*c);
                     if (sn->isAttached())
                         insert(qmlattachedsignals,*c,style,Okay);
                     else
                         insert(qmlsignals,*c,style,Okay);
                 }
-                else if ((*c)->type() == Node::QmlMethod) {
+                else if ((*c)->type() == Node::QDeclarativeMethod) {
                     const FunctionNode* mn = static_cast<const FunctionNode*>(*c);
                     if (mn->isAttached())
                         insert(qmlattachedmethods,*c,style,Okay);
@@ -1187,21 +1187,21 @@ QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode,
 	    FastSection qmlattachedmethods(qmlClassNode,"Attached Method Documentation");
 	    NodeList::ConstIterator c = qmlClassNode->childNodes().begin();
 	    while (c != qmlClassNode->childNodes().end()) {
-                if ((*c)->subType() == Node::QmlPropertyGroup) {
-                    const QmlPropGroupNode* pgn = static_cast<const QmlPropGroupNode*>(*c);
+                if ((*c)->subType() == Node::QDeclarativePropertyGroup) {
+                    const QDeclarativePropGroupNode* pgn = static_cast<const QDeclarativePropGroupNode*>(*c);
                     if (pgn->isAttached())
                         insert(qmlattachedproperties,*c,style,Okay);
                     else
                         insert(qmlproperties,*c,style,Okay);
 	        }
-                else if ((*c)->type() == Node::QmlSignal) {
+                else if ((*c)->type() == Node::QDeclarativeSignal) {
                     const FunctionNode* sn = static_cast<const FunctionNode*>(*c);
                     if (sn->isAttached())
                         insert(qmlattachedsignals,*c,style,Okay);
                     else
                         insert(qmlsignals,*c,style,Okay);
                 }
-                else if ((*c)->type() == Node::QmlMethod) {
+                else if ((*c)->type() == Node::QDeclarativeMethod) {
                     const FunctionNode* mn = static_cast<const FunctionNode*>(*c);
                     if (mn->isAttached())
                         insert(qmlattachedmethods,*c,style,Okay);
diff --git a/tools/qdoc3/cppcodemarker.h b/tools/qdoc3/cppcodemarker.h
index 2dcf400..2f6471a 100644
--- a/tools/qdoc3/cppcodemarker.h
+++ b/tools/qdoc3/cppcodemarker.h
@@ -79,7 +79,7 @@ class CppCodeMarker : public CodeMarker
     QList<Section> sections(const InnerNode *innerNode, 
                             SynopsisStyle style, 
                             Status status);
-    QList<Section> qmlSections(const QmlClassNode* qmlClassNode,
+    QList<Section> qmlSections(const QDeclarativeClassNode* qmlClassNode,
                                SynopsisStyle style);
     const Node *resolveTarget(const QString& target, 
                               const Tree *tree, 
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index d9e9c3b..4d30f3a 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -728,7 +728,7 @@ Node *CppCodeParser::processTopicCommand(const Doc& doc,
             if (n)
                 classNode = static_cast<const ClassNode*>(n);
         }
-        return new QmlClassNode(tre->root(), names[0], classNode);
+        return new QDeclarativeClassNode(tre->root(), names[0], classNode);
     }
     else if (command == COMMAND_QMLBASICTYPE) {
 #if 0        
@@ -738,11 +738,11 @@ Node *CppCodeParser::processTopicCommand(const Doc& doc,
             FakeNode* pageNode = static_cast<FakeNode*>(tre->root()->findNode(parts[1], Node::Fake));
             if (pageNode) {
                 qDebug() << "FOUND";
-                return new QmlBasicTypeNode(pageNode, parts[0]);
+                return new QDeclarativeBasicTypeNode(pageNode, parts[0]);
             }
         }
 #endif        
-        return new QmlBasicTypeNode(tre->root(), arg);
+        return new QDeclarativeBasicTypeNode(tre->root(), arg);
     }
     else if ((command == COMMAND_QMLSIGNAL) ||
              (command == COMMAND_QMLMETHOD) ||
@@ -750,19 +750,19 @@ Node *CppCodeParser::processTopicCommand(const Doc& doc,
              (command == COMMAND_QMLATTACHEDMETHOD)) {
         QString element;
         QString type;
-        QmlClassNode* qmlClass = 0;
+        QDeclarativeClassNode* qmlClass = 0;
         if (splitQmlMethodArg(doc,arg,type,element)) {
             Node* n = tre->findNode(QStringList(element),Node::Fake);
-            if (n && n->subType() == Node::QmlClass) {
-                qmlClass = static_cast<QmlClassNode*>(n);
+            if (n && n->subType() == Node::QDeclarativeClass) {
+                qmlClass = static_cast<QDeclarativeClassNode*>(n);
                 if (command == COMMAND_QMLSIGNAL)
-                    return makeFunctionNode(doc,arg,qmlClass,Node::QmlSignal,false,COMMAND_QMLSIGNAL);
+                    return makeFunctionNode(doc,arg,qmlClass,Node::QDeclarativeSignal,false,COMMAND_QMLSIGNAL);
                 else if (command == COMMAND_QMLATTACHEDSIGNAL)
-                    return makeFunctionNode(doc,arg,qmlClass,Node::QmlSignal,true,COMMAND_QMLATTACHEDSIGNAL);
+                    return makeFunctionNode(doc,arg,qmlClass,Node::QDeclarativeSignal,true,COMMAND_QMLATTACHEDSIGNAL);
                 else if (command == COMMAND_QMLMETHOD)
-                    return makeFunctionNode(doc,arg,qmlClass,Node::QmlMethod,false,COMMAND_QMLMETHOD);
+                    return makeFunctionNode(doc,arg,qmlClass,Node::QDeclarativeMethod,false,COMMAND_QMLMETHOD);
                 else if (command == COMMAND_QMLATTACHEDMETHOD)
-                    return makeFunctionNode(doc,arg,qmlClass,Node::QmlMethod,true,COMMAND_QMLATTACHEDMETHOD);
+                    return makeFunctionNode(doc,arg,qmlClass,Node::QDeclarativeMethod,true,COMMAND_QMLATTACHEDMETHOD);
                 else
                     return 0; // never get here.
             }
@@ -850,7 +850,7 @@ Node *CppCodeParser::processTopicCommandGroup(const Doc& doc,
                                               const QString& command,
                                               const QStringList& args)
 {
-    QmlPropGroupNode* qmlPropGroup = 0;
+    QDeclarativePropGroupNode* qmlPropGroup = 0;
     if ((command == COMMAND_QMLPROPERTY) ||
         (command == COMMAND_QMLATTACHEDPROPERTY)) {
         QString type;
@@ -860,20 +860,20 @@ Node *CppCodeParser::processTopicCommandGroup(const Doc& doc,
         QStringList::ConstIterator arg = args.begin();
         if (splitQmlPropertyArg(doc,(*arg),type,element,property)) {
             Node* n = tre->findNode(QStringList(element),Node::Fake);
-            if (n && n->subType() == Node::QmlClass) {
-                QmlClassNode* qmlClass = static_cast<QmlClassNode*>(n);
+            if (n && n->subType() == Node::QDeclarativeClass) {
+                QDeclarativeClassNode* qmlClass = static_cast<QDeclarativeClassNode*>(n);
                 if (qmlClass)
-                    qmlPropGroup = new QmlPropGroupNode(qmlClass,
+                    qmlPropGroup = new QDeclarativePropGroupNode(qmlClass,
                                                         property,
                                                         attached);
             }
         }
         if (qmlPropGroup) {
-            const ClassNode *correspondingClass = static_cast<const QmlClassNode*>(qmlPropGroup->parent())->classNode();
+            const ClassNode *correspondingClass = static_cast<const QDeclarativeClassNode*>(qmlPropGroup->parent())->classNode();
             PropertyNode *correspondingProperty = 0;
             if (correspondingClass)
                 correspondingProperty = static_cast<PropertyNode*>((Node*)correspondingClass->findNode(property, Node::Property));
-            QmlPropertyNode *qmlPropNode = new QmlPropertyNode(qmlPropGroup,property,type,attached);
+            QDeclarativePropertyNode *qmlPropNode = new QDeclarativePropertyNode(qmlPropGroup,property,type,attached);
             if (correspondingProperty) {
                 bool writableList = type.startsWith("list") && correspondingProperty->dataType().endsWith('*');
                 qmlPropNode->setWritable(writableList || correspondingProperty->isWritable());
@@ -881,7 +881,7 @@ Node *CppCodeParser::processTopicCommandGroup(const Doc& doc,
             ++arg;
             while (arg != args.end()) {
                 if (splitQmlPropertyArg(doc,(*arg),type,element,property)) {
-                    QmlPropertyNode* qmlPropNode = new QmlPropertyNode(qmlPropGroup,
+                    QDeclarativePropertyNode* qmlPropNode = new QDeclarativePropertyNode(qmlPropGroup,
                                                                        property,
                                                                        type,
                                                                        attached);
@@ -1033,12 +1033,12 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
 #ifdef QDOC_QML
     else if (command == COMMAND_QMLINHERITS) {
         setLink(node, Node::InheritsLink, arg);
-        if (node->subType() == Node::QmlClass) {
-            QmlClassNode::addInheritedBy(arg,node);
+        if (node->subType() == Node::QDeclarativeClass) {
+            QDeclarativeClassNode::addInheritedBy(arg,node);
         }
    }
     else if (command == COMMAND_QMLDEFAULT) {
-        QmlPropGroupNode* qpgn = static_cast<QmlPropGroupNode*>(node);
+        QDeclarativePropGroupNode* qpgn = static_cast<QDeclarativePropGroupNode*>(node);
         qpgn->setDefault();
     }
 #endif
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index ad4cdde..78b5d1f 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -553,7 +553,7 @@ void DocParser::parse(const QString& source,
                         append(Atom::Qml, getCode(CMD_QML, marker));
                         break;
                     case CMD_QMLTEXT:
-                        append(Atom::QmlText);
+                        append(Atom::QDeclarativeText);
                         break;
 #endif                        
                     case CMD_CODELINE:
@@ -2842,7 +2842,7 @@ void Doc::initialize(const Config& config)
     DocParser::quoting = config.getBool(CONFIG_QUOTINGINFORMATION);
 
 #ifdef QDOC_QML
-    QmlClassNode::qmlOnly = config.getBool(CONFIG_QMLONLY);
+    QDeclarativeClassNode::qmlOnly = config.getBool(CONFIG_QMLONLY);
 #endif
 
     QStringMap reverseAliasMap;
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index a7ab453..8766696 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -301,7 +301,7 @@ bool Generator::generateQmlText(const Text& text,
 
     startText(relative, marker);
     while (atom) {
-        if (atom->type() != Atom::QmlText)
+        if (atom->type() != Atom::QDeclarativeText)
             atom = atom->next();
         else {
             atom = atom->next();
@@ -520,7 +520,7 @@ void Generator::generateInherits(const ClassNode *classe, CodeMarker *marker)
 #ifdef QDOC_QML
 /*!
  */
-void Generator::generateQmlInherits(const QmlClassNode* , CodeMarker* )
+void Generator::generateQmlInherits(const QDeclarativeClassNode* , CodeMarker* )
 {
     // stub.
 }
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index 50ffb0a..8e8eed8 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -101,7 +101,7 @@ class Generator
                                  const Node *relative,
                                  CodeMarker *marker,
                                  const QString& qmlName);
-    virtual void generateQmlInherits(const QmlClassNode* cn, 
+    virtual void generateQmlInherits(const QDeclarativeClassNode* cn, 
                                      CodeMarker* marker);
 #endif
     virtual void generateBody(const Node *node, CodeMarker *marker);
diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp
index 2189e02..628fd0f 100644
--- a/tools/qdoc3/helpprojectwriter.cpp
+++ b/tools/qdoc3/helpprojectwriter.cpp
@@ -127,7 +127,7 @@ void HelpProjectWriter::readSelectors(SubProject &subproject, const QStringList
     subTypeHash["page"] = Node::Page;
     subTypeHash["externalpage"] = Node::ExternalPage;
 #ifdef QDOC_QML
-    subTypeHash["qmlclass"] = Node::QmlClass;
+    subTypeHash["qmlclass"] = Node::QDeclarativeClass;
 #endif
 
     QSet<Node::SubType> allSubTypes = QSet<Node::SubType>::fromList(subTypeHash.values());
@@ -188,8 +188,8 @@ QStringList HelpProjectWriter::keywordDetails(const Node *node) const
     } else if (node->type() == Node::Fake) {
         const FakeNode *fake = static_cast<const FakeNode *>(node);
 #ifdef QDOC_QML
-        if (fake->subType() == Node::QmlClass) {
-            details << (QmlClassNode::qmlOnly ? fake->name() : fake->fullTitle());
+        if (fake->subType() == Node::QDeclarativeClass) {
+            details << (QDeclarativeClassNode::qmlOnly ? fake->name() : fake->fullTitle());
             details << "QML." + fake->name();
         } else
 #endif
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 0477ebb..7db5828 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -701,8 +701,8 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                     const Node* node = n.value();
                     switch (node->type()) {
                       case Node::Fake:
-                          if (node->subType() == Node::QmlClass)
-                              sections[QmlClass].appendMember((Node*)node);
+                          if (node->subType() == Node::QDeclarativeClass)
+                              sections[QDeclarativeClass].appendMember((Node*)node);
                           break;
                       case Node::Namespace:
                           sections[Namespace].appendMember((Node*)node);
@@ -745,14 +745,14 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                       case Node::Variable: 
                           sections[Variable].appendMember((Node*)node);
                           break;
-                      case Node::QmlProperty:
-                          sections[QmlProperty].appendMember((Node*)node);
+                      case Node::QDeclarativeProperty:
+                          sections[QDeclarativeProperty].appendMember((Node*)node);
                           break;
-                      case Node::QmlSignal:
-                          sections[QmlSignal].appendMember((Node*)node);
+                      case Node::QDeclarativeSignal:
+                          sections[QDeclarativeSignal].appendMember((Node*)node);
                           break;
-                      case Node::QmlMethod:
-                          sections[QmlMethod].appendMember((Node*)node);
+                      case Node::QDeclarativeMethod:
+                          sections[QDeclarativeMethod].appendMember((Node*)node);
                           break;
                       default:
                           break;
@@ -789,7 +789,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                         out() << "<h3>" << protectEnc((*s).name) << "</h3>\n";
                         if (idx == Class)
                             generateCompactList(0, marker, ncmap.value(), QString("Q"));
-                        else if (idx == QmlClass)
+                        else if (idx == QDeclarativeClass)
                             generateCompactList(0, marker, nqcmap.value(), QString("Q"));
                         else if (idx == MemberFunction) {
                             ParentMaps parentmaps;
@@ -1190,7 +1190,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
               << "</code></b></font>";
         break;
 #ifdef QDOC_QML
-    case Atom::QmlText:
+    case Atom::QDeclarativeText:
     case Atom::EndQmlText:
         // don't do anything with these. They are just tags.
         break;
@@ -1453,7 +1453,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         subTitleSize = SmallSubTitle;
         htmlTitle += " (" + fake->subTitle() + ")";
     }
-    else if (fake->subType() == Node::QmlBasicType) {
+    else if (fake->subType() == Node::QDeclarativeBasicType) {
         fullTitle = "QML Basic Type: " + fullTitle;
         htmlTitle = fullTitle;
     }
@@ -1527,8 +1527,8 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         }
     }
 #ifdef QDOC_QML
-    else if (fake->subType() == Node::QmlClass) {
-        const QmlClassNode* qml_cn = static_cast<const QmlClassNode*>(fake);
+    else if (fake->subType() == Node::QDeclarativeClass) {
+        const QDeclarativeClassNode* qml_cn = static_cast<const QDeclarativeClassNode*>(fake);
         const ClassNode* cn = qml_cn->classNode();
         generateQmlInherits(qml_cn, marker);
         generateQmlInstantiates(qml_cn, marker);
@@ -2342,7 +2342,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                         << linkForNode(it.value(), relative)
                         << "\">";
                     QStringList pieces;
-                    if (it.value()->subType() == Node::QmlClass)
+                    if (it.value()->subType() == Node::QDeclarativeClass)
                         pieces << it.value()->name();
                     else
                         pieces = fullName(it.value(), relative, marker).split("::");
@@ -3507,18 +3507,18 @@ QString HtmlGenerator::refForNode(const Node *node)
         break;
 #ifdef QDOC_QML        
     case Node::Fake:
-        if (node->subType() != Node::QmlPropertyGroup)
+        if (node->subType() != Node::QDeclarativePropertyGroup)
             break;
-    case Node::QmlProperty:
+    case Node::QDeclarativeProperty:
 #endif        
     case Node::Property:
         ref = node->name() + "-prop";
         break;
 #ifdef QDOC_QML
-    case Node::QmlSignal:
+    case Node::QDeclarativeSignal:
         ref = node->name() + "-signal";
         break;
-    case Node::QmlMethod:
+    case Node::QDeclarativeMethod:
         ref = node->name() + "-method";
         break;
 #endif        
@@ -3555,7 +3555,7 @@ QString HtmlGenerator::linkForNode(const Node *node, const Node *relative)
 #endif
     link += fn;
 
-    if (!node->isInnerNode() || node->subType() == Node::QmlPropertyGroup) {
+    if (!node->isInnerNode() || node->subType() == Node::QDeclarativePropertyGroup) {
         ref = refForNode(node);
         if (relative && fn == fileName(relative) && ref == refForNode(relative))
             return QString();
@@ -3758,7 +3758,7 @@ void HtmlGenerator::findAllSince(const InnerNode *node)
                     nsmap.value().insert(className,(*child));
                     ncmap.value().insert(className,(*child));
                 }
-                else if ((*child)->subType() == Node::QmlClass) {
+                else if ((*child)->subType() == Node::QDeclarativeClass) {
                     QString className = (*child)->name();
                     if ((*child)->parent() &&
                         (*child)->parent()->type() == Node::Namespace &&
@@ -3865,9 +3865,9 @@ void HtmlGenerator::findAllQmlClasses(const InnerNode *node)
     while (c != node->childNodes().constEnd()) {
         if ((*c)->type() == Node::Fake) {
             const FakeNode* fakeNode = static_cast<const FakeNode *>(*c);
-            if (fakeNode->subType() == Node::QmlClass) {
-                const QmlClassNode* qmlNode =
-                    static_cast<const QmlClassNode*>(fakeNode);
+            if (fakeNode->subType() == Node::QDeclarativeClass) {
+                const QDeclarativeClassNode* qmlNode =
+                    static_cast<const QDeclarativeClassNode*>(fakeNode);
                 const Node* n = qmlNode->classNode();
             }
             qmlClasses.insert(fakeNode->name(),*c);
@@ -4203,7 +4203,7 @@ void HtmlGenerator::generateQmlSummary(const Section& section,
         NodeList::ConstIterator m;
         int count = section.members.size();
         bool twoColumn = false;
-        if (section.members.first()->type() == Node::QmlProperty) {
+        if (section.members.first()->type() == Node::QDeclarativeProperty) {
             twoColumn = (count >= 5);
         }
         if (twoColumn)
@@ -4237,18 +4237,18 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
                                               const InnerNode *relative,
                                               CodeMarker *marker)
 {
-    const QmlPropertyNode* qpn = 0;
+    const QDeclarativePropertyNode* qpn = 0;
     generateMacRef(node, marker);
     out() << "<div class=\"qmlitem\">";
-    if (node->subType() == Node::QmlPropertyGroup) {
-        const QmlPropGroupNode* qpgn = static_cast<const QmlPropGroupNode*>(node);
+    if (node->subType() == Node::QDeclarativePropertyGroup) {
+        const QDeclarativePropGroupNode* qpgn = static_cast<const QDeclarativePropGroupNode*>(node);
         NodeList::ConstIterator p = qpgn->childNodes().begin();
         out() << "<div class=\"qmlproto\">";
         out() << "<table width=\"100%\" class=\"qmlname\">";
 
         while (p != qpgn->childNodes().end()) {
-            if ((*p)->type() == Node::QmlProperty) {
-                qpn = static_cast<const QmlPropertyNode*>(*p);
+            if ((*p)->type() == Node::QDeclarativeProperty) {
+                qpn = static_cast<const QDeclarativePropertyNode*>(*p);
                 out() << "<tr><td>";
                 out() << "<a name=\"" + refForNode(qpn) + "\"></a>";
                 if (!qpn->isWritable())
@@ -4270,7 +4270,7 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
         out() << "</table>";
         out() << "</div>";
     }
-    else if (node->type() == Node::QmlSignal) {
+    else if (node->type() == Node::QDeclarativeSignal) {
         const FunctionNode* qsn = static_cast<const FunctionNode*>(node);
         out() << "<div class=\"qmlproto\">";
         out() << "<table class=\"qmlname\">";
@@ -4282,7 +4282,7 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
         out() << "</table>";
         out() << "</div>";
     }
-    else if (node->type() == Node::QmlMethod) {
+    else if (node->type() == Node::QDeclarativeMethod) {
         const FunctionNode* qmn = static_cast<const FunctionNode*>(node);
         out() << "<div class=\"qmlproto\">";
         out() << "<table class=\"qmlname\">";
@@ -4307,7 +4307,7 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
   Output the "Inherits" line for the QML element,
   if there should be one.
  */
-void HtmlGenerator::generateQmlInherits(const QmlClassNode* cn,
+void HtmlGenerator::generateQmlInherits(const QDeclarativeClassNode* cn,
                                         CodeMarker* marker)
 {
     if (cn && !cn->links().empty()) {
@@ -4316,8 +4316,8 @@ void HtmlGenerator::generateQmlInherits(const QmlClassNode* cn,
             linkPair = cn->links()[Node::InheritsLink];
             QStringList strList(linkPair.first);
             const Node* n = myTree->findNode(strList,Node::Fake);
-            if (n && n->subType() == Node::QmlClass) {
-                const QmlClassNode* qcn = static_cast<const QmlClassNode*>(n);
+            if (n && n->subType() == Node::QDeclarativeClass) {
+                const QDeclarativeClassNode* qcn = static_cast<const QDeclarativeClassNode*>(n);
                 out() << "<p style=\"text-align: center\">";
                 Text text;
                 text << "[Inherits ";
@@ -4337,12 +4337,12 @@ void HtmlGenerator::generateQmlInherits(const QmlClassNode* cn,
   Output the "Inherit by" list for the QML element,
   if it is inherited by any other elements.
  */
-void HtmlGenerator::generateQmlInheritedBy(const QmlClassNode* cn,
+void HtmlGenerator::generateQmlInheritedBy(const QDeclarativeClassNode* cn,
                                            CodeMarker* marker)
 {
     if (cn) {
         NodeList subs;
-        QmlClassNode::subclasses(cn->name(),subs);
+        QDeclarativeClassNode::subclasses(cn->name(),subs);
         if (!subs.isEmpty()) {
             Text text;
             text << Atom::ParaLeft << "Inherited by ";
@@ -4354,13 +4354,13 @@ void HtmlGenerator::generateQmlInheritedBy(const QmlClassNode* cn,
 }
 
 /*!
-  Output the "[Xxx instantiates the C++ class QmlGraphicsXxx]"
+  Output the "[Xxx instantiates the C++ class QDeclarativeXxx]"
   line for the QML element, if there should be one.
 
   If there is no class node, or if the class node status
   is set to Node::Internal, do nothing. 
  */
-void HtmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
+void HtmlGenerator::generateQmlInstantiates(const QDeclarativeClassNode* qcn,
                                             CodeMarker* marker)
 {
     const ClassNode* cn = qcn->classNode();
@@ -4384,7 +4384,7 @@ void HtmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
 }
 
 /*!
-  Output the "[QmlGraphicsXxx is instantiated by QML element Xxx]"
+  Output the "[QDeclarativeXxx is instantiated by QML element Xxx]"
   line for the class, if there should be one.
 
   If there is no QML element, or if the class node status
@@ -4395,7 +4395,7 @@ void HtmlGenerator::generateInstantiatedBy(const ClassNode* cn,
 {
     if (cn &&  cn->status() != Node::Internal && !cn->qmlElement().isEmpty()) {
         const Node* n = myTree->root()->findNode(cn->qmlElement(),Node::Fake);
-        if (n && n->subType() == Node::QmlClass) {
+        if (n && n->subType() == Node::QDeclarativeClass) {
             out() << "<p style=\"text-align: center\">";
             Text text;
             text << "[";
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 8fe0331..42c94cd 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -90,10 +90,10 @@ class HtmlGenerator : public PageGenerator
         Typedef, 
         Property,
         Variable, 
-        QmlClass,
-        QmlProperty,
-        QmlSignal,
-        QmlMethod,
+        QDeclarativeClass,
+        QDeclarativeProperty,
+        QDeclarativeSignal,
+        QDeclarativeMethod,
         LastSinceType
     };
 
@@ -185,9 +185,9 @@ class HtmlGenerator : public PageGenerator
     void generateDetailedQmlMember(const Node *node,
                                    const InnerNode *relative,
                                    CodeMarker *marker);
-    void generateQmlInherits(const QmlClassNode* cn, CodeMarker* marker);
-    void generateQmlInheritedBy(const QmlClassNode* cn, CodeMarker* marker);
-    void generateQmlInstantiates(const QmlClassNode* qcn, CodeMarker* marker);
+    void generateQmlInherits(const QDeclarativeClassNode* cn, CodeMarker* marker);
+    void generateQmlInheritedBy(const QDeclarativeClassNode* cn, CodeMarker* marker);
+    void generateQmlInstantiates(const QDeclarativeClassNode* qcn, CodeMarker* marker);
     void generateInstantiatedBy(const ClassNode* cn, CodeMarker* marker);
 #endif
 #ifdef QDOC_NAME_ALIGNMENT
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 5357597..0ceda39 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -580,7 +580,7 @@ bool InnerNode::isSameSignature(const FunctionNode *f1, const FunctionNode *f2)
 void InnerNode::addChild(Node *child)
 {
     children.append(child);
-    if ((child->type() == Function) || (child->type() == QmlMethod)) {
+    if ((child->type() == Function) || (child->type() == QDeclarativeMethod)) {
         FunctionNode *func = (FunctionNode *) child;
         if (!primaryFunctionMap.contains(func->name())) {
             primaryFunctionMap.insert(func->name(), func);
@@ -806,8 +806,8 @@ FakeNode::FakeNode(InnerNode *parent, const QString& name, SubType subtype)
     case Group:
         setPageType(ArticlePage);
         break;
-    case QmlClass:
-    case QmlBasicType:
+    case QDeclarativeClass:
+    case QDeclarativeBasicType:
         setPageType(ApiPage);
         break;
     case Example:
@@ -1256,20 +1256,20 @@ bool TargetNode::isInnerNode() const
 }
 
 #ifdef QDOC_QML
-bool QmlClassNode::qmlOnly = false;
-QMultiMap<QString,Node*> QmlClassNode::inheritedBy;
+bool QDeclarativeClassNode::qmlOnly = false;
+QMultiMap<QString,Node*> QDeclarativeClassNode::inheritedBy;
 
 /*!
   Constructs a Qml class node (i.e. a Fake node with the
-  subtype QmlClass. The new node has the given \a parent
+  subtype QDeclarativeClass. The new node has the given \a parent
   and \a name and is associated with the C++ class node
   specified by \a cn which may be null if the the Qml
   class node is not associated with a C++ class node.
  */
-QmlClassNode::QmlClassNode(InnerNode *parent,
+QDeclarativeClassNode::QDeclarativeClassNode(InnerNode *parent,
                            const QString& name,
                            const ClassNode* cn)
-    : FakeNode(parent, name, QmlClass), cnode(cn)
+    : FakeNode(parent, name, QDeclarativeClass), cnode(cn)
 {
     setTitle((qmlOnly ? "" : "QML ") + name + " Element Reference");
 }
@@ -1280,7 +1280,7 @@ QmlClassNode::QmlClassNode(InnerNode *parent,
 
   But not yet. Still testing.
  */
-QString QmlClassNode::fileBase() const
+QString QDeclarativeClassNode::fileBase() const
 {
 #if 0    
     if (Node::fileBase() == "item")
@@ -1294,7 +1294,7 @@ QString QmlClassNode::fileBase() const
   Record the fact that QML class \a base is inherited by
   QML class \a sub.
  */
-void QmlClassNode::addInheritedBy(const QString& base, Node* sub)
+void QDeclarativeClassNode::addInheritedBy(const QString& base, Node* sub)
 {
     inheritedBy.insert(base,sub);
 }
@@ -1302,7 +1302,7 @@ void QmlClassNode::addInheritedBy(const QString& base, Node* sub)
 /*!
   Loads the list \a subs with the nodes of all the subclasses of \a base.
  */
-void QmlClassNode::subclasses(const QString& base, NodeList& subs)
+void QDeclarativeClassNode::subclasses(const QString& base, NodeList& subs)
 {
     subs.clear();
     if (inheritedBy.contains(base))
@@ -1311,24 +1311,24 @@ void QmlClassNode::subclasses(const QString& base, NodeList& subs)
 
 /*!
   Constructs a Qml basic type node (i.e. a Fake node with
-  the subtype QmlBasicType. The new node has the given
+  the subtype QDeclarativeBasicType. The new node has the given
   \a parent and \a name.
  */
-QmlBasicTypeNode::QmlBasicTypeNode(InnerNode *parent,
+QDeclarativeBasicTypeNode::QDeclarativeBasicTypeNode(InnerNode *parent,
                                    const QString& name)
-    : FakeNode(parent, name, QmlBasicType)
+    : FakeNode(parent, name, QDeclarativeBasicType)
 {
     setTitle(name);
 }
 
 /*!
   Constructor for the Qml property group node. \a parent is
-  always a QmlClassNode. 
+  always a QDeclarativeClassNode. 
  */
-QmlPropGroupNode::QmlPropGroupNode(QmlClassNode* parent,
+QDeclarativePropGroupNode::QDeclarativePropGroupNode(QDeclarativeClassNode* parent,
                                    const QString& name,
                                    bool attached)
-    : FakeNode(parent, name, QmlPropertyGroup),
+    : FakeNode(parent, name, QDeclarativePropertyGroup),
       isdefault(false),
       att(attached)
 {
@@ -1338,11 +1338,11 @@ QmlPropGroupNode::QmlPropGroupNode(QmlClassNode* parent,
 /*!
   Constructor for the QML property node.
  */
-QmlPropertyNode::QmlPropertyNode(QmlPropGroupNode *parent,
+QDeclarativePropertyNode::QDeclarativePropertyNode(QDeclarativePropGroupNode *parent,
                                  const QString& name,
                                  const QString& type,
                                  bool attached)
-    : LeafNode(QmlProperty, parent, name),
+    : LeafNode(QDeclarativeProperty, parent, name),
       dt(type),
       sto(Trool_Default),
       des(Trool_Default),
@@ -1354,7 +1354,7 @@ QmlPropertyNode::QmlPropertyNode(QmlPropGroupNode *parent,
 /*!
   I don't know what this is.
  */
-QmlPropertyNode::Trool QmlPropertyNode::toTrool(bool boolean)
+QDeclarativePropertyNode::Trool QDeclarativePropertyNode::toTrool(bool boolean)
 {
     return boolean ? Trool_True : Trool_False;
 }
@@ -1362,7 +1362,7 @@ QmlPropertyNode::Trool QmlPropertyNode::toTrool(bool boolean)
 /*!
   I don't know what this is either.
  */
-bool QmlPropertyNode::fromTrool(Trool troolean, bool defaultValue)
+bool QDeclarativePropertyNode::fromTrool(Trool troolean, bool defaultValue)
 {
     switch (troolean) {
     case Trool_True:
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index 3798e4e..5300efc 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -74,9 +74,9 @@ class Node
         Variable, 
 #ifdef QDOC_QML
         Target,
-        QmlProperty,
-        QmlSignal,
-        QmlMethod,
+        QDeclarativeProperty,
+        QDeclarativeSignal,
+        QDeclarativeMethod,
         LastType
 #else
         Target,
@@ -95,9 +95,9 @@ class Node
         Page,
 #ifdef QDOC_QML
         ExternalPage,
-        QmlClass,
-        QmlPropertyGroup,
-        QmlBasicType
+        QDeclarativeClass,
+        QDeclarativePropertyGroup,
+        QDeclarativeBasicType
 #else
         ExternalPage
 #endif
@@ -373,13 +373,13 @@ class FakeNode : public InnerNode
 };
 
 #ifdef QDOC_QML
-class QmlClassNode : public FakeNode
+class QDeclarativeClassNode : public FakeNode
 {
  public:
-    QmlClassNode(InnerNode *parent, 
+    QDeclarativeClassNode(InnerNode *parent, 
                  const QString& name, 
                  const ClassNode* cn);
-    virtual ~QmlClassNode() { }
+    virtual ~QDeclarativeClassNode() { }
 
     const ClassNode* classNode() const { return cnode; }
     virtual QString fileBase() const;
@@ -394,21 +394,21 @@ class QmlClassNode : public FakeNode
     const ClassNode*    cnode;
 };
 
-class QmlBasicTypeNode : public FakeNode
+class QDeclarativeBasicTypeNode : public FakeNode
 {
  public:
-    QmlBasicTypeNode(InnerNode *parent, 
+    QDeclarativeBasicTypeNode(InnerNode *parent, 
                      const QString& name);
-    virtual ~QmlBasicTypeNode() { }
+    virtual ~QDeclarativeBasicTypeNode() { }
 };
 
-class QmlPropGroupNode : public FakeNode
+class QDeclarativePropGroupNode : public FakeNode
 {
  public:
-    QmlPropGroupNode(QmlClassNode* parent, 
+    QDeclarativePropGroupNode(QDeclarativeClassNode* parent, 
                      const QString& name,
                      bool attached);
-    virtual ~QmlPropGroupNode() { }
+    virtual ~QDeclarativePropGroupNode() { }
 
     const QString& element() const { return parent()->name(); }
     void setDefault() { isdefault = true; }
@@ -420,14 +420,14 @@ class QmlPropGroupNode : public FakeNode
     bool    att;
 };
 
-class QmlPropertyNode : public LeafNode
+class QDeclarativePropertyNode : public LeafNode
 {
  public:
-    QmlPropertyNode(QmlPropGroupNode* parent, 
+    QDeclarativePropertyNode(QDeclarativePropGroupNode* parent, 
                     const QString& name,
                     const QString& type,
                     bool attached);
-    virtual ~QmlPropertyNode() { }
+    virtual ~QDeclarativePropertyNode() { }
 
     void setDataType(const QString& dataType) { dt = dataType; }
     void setStored(bool stored) { sto = toTrool(stored); }
@@ -441,7 +441,7 @@ class QmlPropertyNode : public LeafNode
     bool isWritable() const { return fromTrool(wri,true); }
     bool isAttached() const { return att; }
 
-    const QString& element() const { return static_cast<QmlPropGroupNode*>(parent())->element(); }
+    const QString& element() const { return static_cast<QDeclarativePropGroupNode*>(parent())->element(); }
 
  private:
     enum Trool { Trool_True, Trool_False, Trool_Default };
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp
index 2cad9ed..f129d3a 100644
--- a/tools/qdoc3/pagegenerator.cpp
+++ b/tools/qdoc3/pagegenerator.cpp
@@ -84,7 +84,7 @@ QString PageGenerator::fileBase(const Node *node) const
     else if (!node->isInnerNode())
 	node = node->parent();
 #ifdef QDOC_QML
-    if (node->subType() == Node::QmlPropertyGroup) {
+    if (node->subType() == Node::QDeclarativePropertyGroup) {
         node = node->parent();
     }
 #endif        
@@ -104,8 +104,8 @@ QString PageGenerator::fileBase(const Node *node) const
           we prepend "qml-" to the file name of QML element doc
           files.
          */
-        if ((p->subType() == Node::QmlClass) ||
-            (p->subType() == Node::QmlBasicType)) {
+        if ((p->subType() == Node::QDeclarativeClass) ||
+            (p->subType() == Node::QDeclarativeBasicType)) {
             base.prepend("qml-");
         }
 #endif        
@@ -207,7 +207,7 @@ void PageGenerator::generateInnerNode(const InnerNode *node,
         if (fakeNode->subType() == Node::ExternalPage)
             return;
 #ifdef QDOC_QML            
-        if (fakeNode->subType() == Node::QmlPropertyGroup)
+        if (fakeNode->subType() == Node::QDeclarativePropertyGroup)
             return;
 #endif            
         if (fakeNode->subType() == Node::Page) {
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp
index 6c2502d..96af8d6 100644
--- a/tools/qdoc3/tree.cpp
+++ b/tools/qdoc3/tree.cpp
@@ -1914,8 +1914,8 @@ QString Tree::fullDocumentLocation(const Node *node) const
     }
     else if (node->type() == Node::Fake) {
 #ifdef QDOC_QML
-        if ((node->subType() == Node::QmlClass) ||
-            (node->subType() == Node::QmlBasicType))
+        if ((node->subType() == Node::QDeclarativeClass) ||
+            (node->subType() == Node::QDeclarativeBasicType))
             return "qml-" + node->fileBase() + ".html";
         else
 #endif
diff --git a/tools/qml/content/Browser.qml b/tools/qml/content/Browser.qml
new file mode 100644
index 0000000..35120bc
--- /dev/null
+++ b/tools/qml/content/Browser.qml
@@ -0,0 +1,243 @@
+import Qt 4.6
+
+Rectangle {
+    id: root
+    property bool keyPressed: false
+    property var folders: folders1
+    property var view: view1
+    width: 320
+    height: 480
+    color: palette.window
+
+    FolderListModel {
+        id: folders1
+        nameFilters: [ "*.qml" ]
+        folder: qmlViewerFolder
+    }
+    FolderListModel {
+        id: folders2
+        nameFilters: [ "*.qml" ]
+        folder: qmlViewerFolder
+    }
+
+    SystemPalette { id: palette }
+
+    Script {
+        function down(path) {
+            if (folders == folders1) {
+                view = view2
+                folders = folders2;
+                view1.state = "exitLeft";
+            } else {
+                view = view1
+                folders = folders1;
+                view2.state = "exitLeft";
+            }
+            view.x = root.width;
+            view.state = "current";
+            view.focus = true;
+            folders.folder = path;
+        }
+        function up() {
+            var path = folders.parentFolder;
+            if (folders == folders1) {
+                view = view2
+                folders = folders2;
+                view1.state = "exitRight";
+            } else {
+                view = view1
+                folders = folders1;
+                view2.state = "exitRight";
+            }
+            view.x = -root.width;
+            view.state = "current";
+            view.focus = true;
+            folders.folder = path;
+        }
+    }
+
+    Component {
+        id: folderDelegate
+        Rectangle {
+            id: wrapper
+            function launch() {
+                if (folders.isFolder(index)) {
+                    down(filePath);
+                } else {
+                    qmlViewer.launch(filePath);
+                }
+            }
+            width: root.width
+            height: 52
+            color: "transparent"
+            Rectangle {
+                id: highlight; visible: false
+                anchors.fill: parent
+                gradient: Gradient {
+                    GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                    GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+                }
+            }
+            Item {
+                width: 48; height: 48
+                Image { source: "images/folder.png"; anchors.centerIn: parent; visible: folders.isFolder(index)}
+            }
+            Text {
+                id: nameText
+                anchors.fill: parent; verticalAlignment: Text.AlignVCenter
+                text: fileName
+                anchors.leftMargin: 54
+                font.pixelSize: 32
+                color: (wrapper.ListView.isCurrentItem && root.keyPressed) ? palette.highlightedText : palette.windowText
+            }
+            MouseArea {
+                id: mouseRegion
+                anchors.fill: parent
+                onClicked: { launch() }
+            }
+            states: [
+                State {
+                    name: "pressed"
+                    when: mouseRegion.pressed
+                    PropertyChanges { target: highlight; visible: true }
+                    PropertyChanges { target: nameText; color: palette.highlightedText }
+                }
+            ]
+        }
+    }
+
+    ListView {
+        id: view1
+        anchors.top: titleBar.bottom
+        anchors.bottom: parent.bottom
+        x: 0
+        width: parent.width
+        model: folders1
+        delegate: folderDelegate
+        highlight: Rectangle { color: palette.highlight; visible: root.keyPressed && view1.count != 0 }
+        highlightMoveSpeed: 1000
+        pressDelay: 100
+        focus: true
+        state: "current"
+        states: [
+            State {
+                name: "current"
+                PropertyChanges { target: view1; x: 0 }
+            },
+            State {
+                name: "exitLeft"
+                PropertyChanges { target: view1; x: -root.width }
+            },
+            State {
+                name: "exitRight"
+                PropertyChanges { target: view1; x: root.width }
+            }
+        ]
+        transitions: [
+            Transition {
+                to: "current"
+                SequentialAnimation {
+                    NumberAnimation { matchProperties: "x"; duration: 250 }
+                }
+            },
+            Transition {
+                NumberAnimation { matchProperties: "x"; duration: 250 }
+                NumberAnimation { matchProperties: "x"; duration: 250 }
+            }
+        ]
+        Keys.onPressed: { root.keyPressed = true; }
+    }
+
+    ListView {
+        id: view2
+        anchors.top: titleBar.bottom
+        anchors.bottom: parent.bottom
+        x: parent.width
+        width: parent.width
+        model: folders2
+        delegate: folderDelegate
+        highlight: Rectangle { color: palette.highlight; visible: root.keyPressed && view2.count != 0 }
+        highlightMoveSpeed: 1000
+        pressDelay: 100
+        states: [
+            State {
+                name: "current"
+                PropertyChanges { target: view2; x: 0 }
+            },
+            State {
+                name: "exitLeft"
+                PropertyChanges { target: view2; x: -root.width }
+            },
+            State {
+                name: "exitRight"
+                PropertyChanges { target: view2; x: root.width }
+            }
+        ]
+        transitions: [
+            Transition {
+                to: "current"
+                SequentialAnimation {
+                    NumberAnimation { matchProperties: "x"; duration: 250 }
+                }
+            },
+            Transition {
+                NumberAnimation { matchProperties: "x"; duration: 250 }
+            }
+        ]
+        Keys.onPressed: { root.keyPressed = true; }
+    }
+
+    Keys.onPressed: {
+        root.keyPressed = true;
+        if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) {
+            view.currentItem.launch();
+            event.accepted = true;
+        } else if (event.key == Qt.Key_Left) {
+            up();
+        }
+    }
+
+    BorderImage {
+        source: "images/titlebar.sci";
+        width: parent.width;
+        height: 52
+        y: -7
+        id: titleBar
+
+        Rectangle {
+            id: upButton
+            width: 48
+            height: titleBar.height - 7
+            color: "transparent"
+
+            Image { anchors.centerIn: parent; source: "images/up.png" }
+            MouseArea { id: upRegion; anchors.centerIn: parent
+                width: 56
+                height: 56
+                onClicked: if (folders.parentFolder != "") up()
+            }
+            states: [
+                State {
+                    name: "pressed"
+                    when: upRegion.pressed
+                    PropertyChanges { target: upButton; color: palette.highlight }
+                }
+            ]
+        }
+        Rectangle {
+            color: "gray"
+            x: 48
+            width: 1
+            height: 44
+        }
+
+        Text {
+            anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
+            anchors.leftMargin: 4; anchors.rightMargin: 4
+            text: folders.folder
+            color: "white"
+            elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter
+            font.pixelSize: 32
+        }
+    }
+}
diff --git a/tools/qml/content/images/folder.png b/tools/qml/content/images/folder.png
new file mode 100644
index 0000000..e53e2ad
Binary files /dev/null and b/tools/qml/content/images/folder.png differ
diff --git a/tools/qml/content/images/titlebar.png b/tools/qml/content/images/titlebar.png
new file mode 100644
index 0000000..51c9008
Binary files /dev/null and b/tools/qml/content/images/titlebar.png differ
diff --git a/tools/qml/content/images/titlebar.sci b/tools/qml/content/images/titlebar.sci
new file mode 100644
index 0000000..0418d94
--- /dev/null
+++ b/tools/qml/content/images/titlebar.sci
@@ -0,0 +1,5 @@
+border.left: 10
+border.top: 12
+border.bottom: 12
+border.right: 10
+source: titlebar.png
diff --git a/tools/qml/content/images/up.png b/tools/qml/content/images/up.png
new file mode 100644
index 0000000..b05f802
Binary files /dev/null and b/tools/qml/content/images/up.png differ
diff --git a/tools/qml/deviceorientation.cpp b/tools/qml/deviceorientation.cpp
new file mode 100644
index 0000000..e7c70d5
--- /dev/null
+++ b/tools/qml/deviceorientation.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "deviceorientation.h"
+
+QT_USE_NAMESPACE
+
+class DefaultDeviceOrientation : public DeviceOrientation
+{
+    Q_OBJECT
+public:
+    DefaultDeviceOrientation() : DeviceOrientation(), m_orientation(DeviceOrientation::Portrait) {}
+
+    Orientation orientation() const {
+        return m_orientation;
+    }
+
+    void setOrientation(Orientation o) {
+        if (o != m_orientation) {
+            m_orientation = o;
+            emit orientationChanged();
+        }
+    }
+
+    Orientation m_orientation;
+};
+
+DeviceOrientation* DeviceOrientation::instance()
+{
+    static DefaultDeviceOrientation *o = 0;
+    if (!o)
+        o = new DefaultDeviceOrientation;
+    return o;
+}
+
+#include "deviceorientation.moc"
+
diff --git a/tools/qml/deviceorientation.h b/tools/qml/deviceorientation.h
new file mode 100644
index 0000000..c8125cd
--- /dev/null
+++ b/tools/qml/deviceorientation.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ORIENTATION_H
+#define ORIENTATION_H
+
+#include <QObject>
+
+QT_BEGIN_NAMESPACE
+
+class DeviceOrientationPrivate;
+class DeviceOrientation : public QObject
+{
+    Q_OBJECT
+public:
+    enum Orientation { UnknownOrientation, Portrait, Landscape };
+    virtual Orientation orientation() const = 0;
+    virtual void setOrientation(Orientation) = 0;
+
+    static DeviceOrientation *instance();
+
+signals:
+    void orientationChanged();
+
+protected:
+    DeviceOrientation() {}
+
+private:
+    DeviceOrientationPrivate *d_ptr;
+    friend class DeviceOrientationPrivate;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/tools/qml/deviceorientation_maemo.cpp b/tools/qml/deviceorientation_maemo.cpp
new file mode 100644
index 0000000..fa2c6e5
--- /dev/null
+++ b/tools/qml/deviceorientation_maemo.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "deviceorientation.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+class MaemoOrientation : public DeviceOrientation
+{
+    Q_OBJECT
+public:
+    MaemoOrientation()
+        : DeviceOrientation(),m_current(Portrait), m_lastSeen(Portrait), m_lastSeenCount(0)
+    {
+        startTimer(100);
+    }
+
+    Orientation orientation() const {
+        return m_current;
+    }
+
+    void setOrientation(Orientation orient) {
+        //XXX maybe better to just ignore
+        if (orient != m_current) {
+            m_current = orient;
+            emit orientationChanged();
+        }
+    }
+
+
+protected:
+    virtual void timerEvent(QTimerEvent *)
+    {
+        Orientation c = get();
+
+        if (c == m_lastSeen) {
+            m_lastSeenCount++;
+        } else {
+            m_lastSeenCount = 0;
+            m_lastSeen = c;
+        }
+
+        if (m_lastSeen != UnknownOrientation && m_lastSeen != m_current && m_lastSeenCount > 4) {
+            m_current = m_lastSeen;
+            emit orientationChanged();
+            printf("%d\n", m_current);
+        }
+    }
+
+signals:
+    void changed();
+
+private:
+    Orientation m_current;
+    Orientation m_lastSeen;
+    int m_lastSeenCount;
+
+    Orientation get()
+    {
+        Orientation o = UnknownOrientation;
+
+        int ax, ay, az;
+
+        read(&ax, &ay, &az);
+
+        if (abs(az) > 850) {
+            o = UnknownOrientation;
+        } else if (ax < -750) {
+            o = Portrait;
+        } else if (ay < -750) {
+            o = Landscape;
+        }
+
+        return o;
+    }
+
+    int read(int *ax,int *ay,int *az)
+    {
+        static const char *accel_filename = "/sys/class/i2c-adapter/i2c-3/3-001d/coord";
+
+        FILE *fd;
+        int rs;
+        fd = fopen(accel_filename, "r");
+        if(fd==NULL){ printf("liqaccel, cannot open for reading\n"); return -1;}
+        rs=fscanf((FILE*) fd,"%i %i %i",ax,ay,az);
+        fclose(fd);
+        if(rs != 3){ printf("liqaccel, cannot read information\n"); return -2;}
+        return 0;
+    }
+};
+
+
+DeviceOrientation* DeviceOrientation::instance()
+{
+    static MaemoOrientation *o = 0;
+    if (!o)
+        o = new MaemoOrientation;
+    return o;
+}
+
+#include "deviceorientation_maemo.moc"
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
new file mode 100644
index 0000000..9ef02ac
--- /dev/null
+++ b/tools/qml/main.cpp
@@ -0,0 +1,356 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarative.h"
+#include "qmlruntime.h"
+#include <QWidget>
+#include <QDir>
+#include <QApplication>
+#include <QTranslator>
+#include <QDebug>
+#include "qfxtester.h"
+#include "qdeclarativefolderlistmodel.h"
+
+QT_USE_NAMESPACE
+
+#if defined (Q_OS_SYMBIAN)
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+void myMessageOutput(QtMsgType type, const char *msg)
+{
+    static int fd = -1;
+    if (fd == -1)
+        fd = ::open("E:\\qml.log", O_WRONLY | O_CREAT);
+
+    ::write(fd, msg, strlen(msg));
+    ::write(fd, "\n", 1);
+    ::fsync(fd);
+
+    switch (type) {
+    case QtFatalMsg:
+        abort();
+    }
+}
+#endif
+
+void usage()
+{
+    qWarning("Usage: qml [options] <filename>");
+    qWarning(" ");
+    qWarning(" options:");
+    qWarning("  -v, -version ............................. display version");
+    qWarning("  -frameless ............................... run with no window frame");
+    qWarning("  -maximized................................ run maximized");
+    qWarning("  -fullscreen............................... run fullscreen");
+    qWarning("  -stayontop................................ keep viewer window on top");
+    qWarning("  -skin <qvfbskindir> ...................... run with a skin window frame");
+    qWarning("                                             \"list\" for a list of built-ins");
+    qWarning("  -resizeview .............................. resize the view, not the skin");
+    qWarning("  -qmlbrowser .............................. use a QML-based file browser");
+    qWarning("  -recordfile <output> ..................... set video recording file");
+    qWarning("                                              - ImageMagick 'convert' for GIF)");
+    qWarning("                                              - png file for raw frames");
+    qWarning("                                              - 'ffmpeg' for other formats");
+    qWarning("  -recorddither ordered|threshold|floyd .... set GIF dither recording mode");
+    qWarning("  -recordrate <fps> ........................ set recording frame rate");
+    qWarning("  -record arg .............................. add a recording process argument");
+    qWarning("  -autorecord [from-]<tomilliseconds> ...... set recording to start and stop");
+    qWarning("  -devicekeys .............................. use numeric keys (see F1)");
+    qWarning("  -dragthreshold <size> .................... set mouse drag threshold size");
+    qWarning("  -netcache <size> ......................... set disk cache to size bytes");
+    qWarning("  -translation <translationfile> ........... set the language to run in");
+    qWarning("  -L <directory> ........................... prepend to the library search path");
+    qWarning("  -opengl .................................. use a QGLWidget for the viewport");
+    qWarning("  -script <path> ........................... set the script to use");
+    qWarning("  -scriptopts <options>|help ............... set the script options to use");
+
+    qWarning(" ");
+    qWarning(" Press F1 for interactive help");
+    exit(1);
+}
+
+void scriptOptsUsage()
+{
+    qWarning("Usage: qml -scriptopts <option>[,<option>...] ...");
+    qWarning(" options:");
+    qWarning("  record ................................... record a new script");
+    qWarning("  play ..................................... playback an existing script");
+    qWarning("  testimages ............................... record images or compare images on playback");
+    qWarning("  testerror ................................ test 'error' property of root item on playback");
+    qWarning("  exitoncomplete ........................... cleanly exit the viewer on script completion");
+    qWarning("  exitonfailure ............................ immediately exit the viewer on script failure");
+    qWarning("  saveonexit ............................... save recording on viewer exit");
+    qWarning(" ");
+    qWarning(" One of record, play or both must be specified.");
+    exit(1);
+}
+
+int main(int argc, char ** argv)
+{
+#if defined (Q_OS_SYMBIAN)
+    qInstallMsgHandler(myMessageOutput);
+#endif
+
+#if defined (Q_WS_X11)
+    //### default to using raster graphics backend for now
+    bool gsSpecified = false;
+    for (int i = 0; i < argc; ++i) {
+        QString arg = argv[i];
+        if (arg == "-graphicssystem") {
+            gsSpecified = true;
+            break;
+        }
+    }
+
+    if (!gsSpecified)
+        QApplication::setGraphicsSystem("raster");
+#endif
+
+    QApplication app(argc, argv);
+    app.setApplicationName("viewer");
+    app.setOrganizationName("Nokia");
+    app.setOrganizationDomain("nokia.com");
+
+    QDeclarativeViewer::registerTypes();
+    QDeclarativeTester::registerTypes();
+    QDeclarativeFolderListModel::registerTypes();
+
+    bool frameless = false;
+    bool resizeview = false;
+    QString fileName;
+    double fps = 0;
+    int autorecord_from = 0;
+    int autorecord_to = 0;
+    QString dither = "none";
+    QString recordfile;
+    QStringList recordargs;
+    QStringList libraries;
+    QString skin;
+    QString script;
+    QString scriptopts;
+    bool runScript = false;
+    bool devkeys = false;
+    int cache = 0;
+    QString translationFile;
+    bool useGL = false;
+    bool fullScreen = false;
+    bool stayOnTop = false;
+    bool maximized = false;
+    bool useNativeFileBrowser = true;
+
+#if defined(Q_OS_SYMBIAN)
+    maximized = true;
+    useNativeFileBrowser = false;
+#endif
+
+    for (int i = 1; i < argc; ++i) {
+        bool lastArg = (i == argc - 1);
+        QString arg = argv[i];
+        if (arg == "-frameless") {
+            frameless = true;
+        } else if (arg == "-maximized") {
+            maximized = true;
+        } else if (arg == "-fullscreen") {
+            fullScreen = true;
+        } else if (arg == "-stayontop") {
+            stayOnTop = true;
+        } else if (arg == "-skin") {
+            if (lastArg) usage();
+            skin = QString(argv[++i]);
+        } else if (arg == "-resizeview") {
+            resizeview = true;
+        } else if (arg == "-netcache") {
+            if (lastArg) usage();
+            cache = QString(argv[++i]).toInt();
+        } else if (arg == "-recordrate") {
+            if (lastArg) usage();
+            fps = QString(argv[++i]).toDouble();
+        } else if (arg == "-recordfile") {
+            if (lastArg) usage();
+            recordfile = QString(argv[++i]);
+        } else if (arg == "-record") {
+            if (lastArg) usage();
+            recordargs << QString(argv[++i]);
+        } else if (arg == "-recorddither") {
+            if (lastArg) usage();
+            dither = QString(argv[++i]);
+        } else if (arg == "-autorecord") {
+            if (lastArg) usage();
+            QString range = QString(argv[++i]);
+            int dash = range.indexOf('-');
+            if (dash > 0)
+                autorecord_from = range.left(dash).toInt();
+            autorecord_to = range.mid(dash+1).toInt();
+        } else if (arg == "-devicekeys") {
+            devkeys = true;
+        } else if (arg == "-dragthreshold") {
+            if (lastArg) usage();
+            app.setStartDragDistance(QString(argv[++i]).toInt());
+        } else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) {
+            fprintf(stderr, "Qt Declarative UI Viewer version %s\n", QT_VERSION_STR);
+            return 0;
+        } else if (arg == "-translation") {
+            if (lastArg) usage();
+            translationFile = argv[++i];
+        } else if (arg == "-opengl") {
+            useGL = true;
+        } else if (arg == "-qmlbrowser") {
+            useNativeFileBrowser = false;
+        } else if (arg == "-L") {
+            if (lastArg) usage();
+            libraries << QString(argv[++i]);
+        } else if (arg == "-script") {
+            if (lastArg) usage();
+            script = QString(argv[++i]);
+        } else if (arg == "-scriptopts") {
+            if (lastArg) usage();
+            scriptopts = QString(argv[++i]);
+        } else if (arg == "-savescript") {
+            if (lastArg) usage();
+            script = QString(argv[++i]);
+            runScript = false;
+        } else if (arg == "-playscript") {
+            if (lastArg) usage();
+            script = QString(argv[++i]);
+            runScript = true;
+        } else if (arg[0] != '-') {
+            fileName = arg;
+        } else if (1 || arg == "-help") {
+            usage();
+        }
+    }
+
+    QTranslator qmlTranslator;
+    if (!translationFile.isEmpty()) {
+        qmlTranslator.load(translationFile);
+        app.installTranslator(&qmlTranslator);
+    }
+
+    Qt::WFlags wflags = (frameless ? Qt::FramelessWindowHint : Qt::Widget);
+    if (stayOnTop)
+        wflags |= Qt::WindowStaysOnTopHint;
+
+    QDeclarativeViewer viewer(0, wflags);
+    if (!scriptopts.isEmpty()) {
+        QStringList options = 
+            scriptopts.split(QLatin1Char(','), QString::SkipEmptyParts);
+
+        QDeclarativeViewer::ScriptOptions scriptOptions = 0;
+        for (int i = 0; i < options.count(); ++i) {
+            const QString &option = options.at(i);
+            if (option == QLatin1String("help")) {
+                scriptOptsUsage();
+            } else if (option == QLatin1String("play")) {
+                scriptOptions |= QDeclarativeViewer::Play;
+            } else if (option == QLatin1String("record")) {
+                scriptOptions |= QDeclarativeViewer::Record;
+            } else if (option == QLatin1String("testimages")) {
+                scriptOptions |= QDeclarativeViewer::TestImages;
+            } else if (option == QLatin1String("testerror")) {
+                scriptOptions |= QDeclarativeViewer::TestErrorProperty;
+            } else if (option == QLatin1String("exitoncomplete")) {
+                scriptOptions |= QDeclarativeViewer::ExitOnComplete;
+            } else if (option == QLatin1String("exitonfailure")) {
+                scriptOptions |= QDeclarativeViewer::ExitOnFailure;
+            } else if (option == QLatin1String("saveonexit")) {
+                scriptOptions |= QDeclarativeViewer::SaveOnExit;
+            } else {
+                scriptOptsUsage();
+            }
+        }
+
+        if (script.isEmpty())
+            usage();
+
+        if (!(scriptOptions & QDeclarativeViewer::Record) && !(scriptOptions & QDeclarativeViewer::Play))
+            scriptOptsUsage();
+        viewer.setScriptOptions(scriptOptions);
+        viewer.setScript(script);
+    }  else if (!script.isEmpty()) {
+        usage();
+    }
+
+    foreach (QString lib, libraries)
+        viewer.addLibraryPath(lib);
+    viewer.setNetworkCacheSize(cache);
+    viewer.setRecordFile(recordfile);
+    if (resizeview)
+        viewer.setScaleView();
+    if (fps>0)
+        viewer.setRecordRate(fps);
+    if (autorecord_to)
+        viewer.setAutoRecord(autorecord_from,autorecord_to);
+    if (!skin.isEmpty()) {
+        if (skin == "list") {
+            foreach (QString s, viewer.builtinSkins())
+                qWarning(s.toUtf8());
+            exit(0);
+        } else {
+            viewer.setSkin(skin);
+        }
+    }
+    if (devkeys)
+        viewer.setDeviceKeys(true);
+    viewer.setRecordDither(dither);
+    if (recordargs.count())
+        viewer.setRecordArgs(recordargs);
+
+    viewer.setUseNativeFileBrowser(useNativeFileBrowser);
+    if (fullScreen && maximized)
+        qWarning() << "Both -fullscreen and -maximized specified. Using -fullscreen.";
+    if (!fileName.isEmpty()) {
+        viewer.open(fileName);
+        fullScreen ? viewer.showFullScreen() : maximized ? viewer.showMaximized() : viewer.show();
+    } else {
+        if (!useNativeFileBrowser)
+            viewer.openFile();
+        fullScreen ? viewer.showFullScreen() : maximized ? viewer.showMaximized() : viewer.show();
+        if (useNativeFileBrowser)
+            viewer.openFile();
+    }
+    viewer.setUseGL(useGL);
+    viewer.raise();
+
+    return app.exec();
+}
diff --git a/tools/qml/proxysettings.cpp b/tools/qml/proxysettings.cpp
new file mode 100644
index 0000000..3255e42
--- /dev/null
+++ b/tools/qml/proxysettings.cpp
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QIntValidator>
+#include <QSettings>
+
+#include "proxysettings.h"
+
+QT_BEGIN_NAMESPACE
+
+ProxySettings::ProxySettings (QWidget * parent)
+        : QDialog (parent), Ui::ProxySettings()
+{
+    setupUi (this);
+
+    proxyServerEdit->setInputMask ("000.000.000.000;_");
+    QIntValidator *validator = new QIntValidator (0, 9999, this);
+    proxyPortEdit->setValidator (validator);
+
+    QSettings settings;
+    proxyCheckBox->setChecked (settings.value ("http_proxy/use", 0).toBool ());
+    proxyServerEdit->insert (settings.value ("http_proxy/hostname", "").toString ());
+    proxyPortEdit->insert (settings.value ("http_proxy/port", "80").toString ());
+    usernameEdit->insert (settings.value ("http_proxy/username", "").toString ());
+    passwordEdit->insert (settings.value ("http_proxy/password", "").toString ());
+}
+
+ProxySettings::~ProxySettings()
+{
+}
+
+void ProxySettings::accept ()
+{
+    QSettings settings;
+
+    settings.setValue ("http_proxy/use", proxyCheckBox->isChecked ());
+    settings.setValue ("http_proxy/hostname", proxyServerEdit->text ());
+    settings.setValue ("http_proxy/port", proxyPortEdit->text ());
+    settings.setValue ("http_proxy/username", usernameEdit->text ());
+    settings.setValue ("http_proxy/password", passwordEdit->text ());
+
+    QDialog::accept ();
+}
+
+QNetworkProxy ProxySettings::httpProxy ()
+{
+    QSettings settings;
+    QNetworkProxy proxy;
+
+    bool proxyInUse = settings.value ("http_proxy/use", 0).toBool ();
+    if (proxyInUse) {
+        proxy.setType (QNetworkProxy::HttpProxy);
+        proxy.setHostName (settings.value ("http_proxy/hostname", "").toString ());// "192.168.220.5"
+        proxy.setPort (settings.value ("http_proxy/port", 80).toInt ());  // 8080
+        proxy.setUser (settings.value ("http_proxy/username", "").toString ());
+        proxy.setPassword (settings.value ("http_proxy/password", "").toString ());
+        //QNetworkProxy::setApplicationProxy (proxy);
+    }
+    else {
+        proxy.setType (QNetworkProxy::NoProxy);
+    }
+    return proxy;
+}
+
+bool ProxySettings::httpProxyInUse()
+{
+    QSettings settings;
+    return settings.value ("http_proxy/use", 0).toBool ();
+}
+
+QT_END_NAMESPACE
diff --git a/tools/qml/proxysettings.h b/tools/qml/proxysettings.h
new file mode 100644
index 0000000..325929a
--- /dev/null
+++ b/tools/qml/proxysettings.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PROXYSETTINGS_H
+#define PROXYSETTINGS_H
+
+#include <QDialog>
+#include <QNetworkProxy>
+#include "ui_proxysettings.h"
+
+QT_BEGIN_NAMESPACE
+/**
+*/
+class ProxySettings : public QDialog, public Ui::ProxySettings
+{
+
+Q_OBJECT
+
+public:
+    ProxySettings(QWidget * parent = 0);
+
+    ~ProxySettings();
+
+    static QNetworkProxy httpProxy ();
+    static bool httpProxyInUse ();
+
+public slots:
+    virtual void accept ();
+};
+
+QT_END_NAMESPACE
+
+#endif // PROXYSETTINGS_H
diff --git a/tools/qml/proxysettings.ui b/tools/qml/proxysettings.ui
new file mode 100644
index 0000000..84e39fe
--- /dev/null
+++ b/tools/qml/proxysettings.ui
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProxySettings</class>
+ <widget class="QDialog" name="ProxySettings">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>318</width>
+    <height>199</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QCheckBox" name="proxyCheckBox">
+     <property name="text">
+      <string>Use http proxy</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="serverAddressLabel">
+     <property name="text">
+      <string>Server Address:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="proxyServerEdit"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Port:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="proxyPortEdit"/>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="usernameLabel">
+     <property name="text">
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLineEdit" name="usernameEdit"/>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="passwordLabel">
+     <property name="text">
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QLineEdit" name="passwordEdit">
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ProxySettings</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ProxySettings</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tools/qml/qdeclarativefolderlistmodel.cpp b/tools/qml/qdeclarativefolderlistmodel.cpp
new file mode 100644
index 0000000..58bf59b
--- /dev/null
+++ b/tools/qml/qdeclarativefolderlistmodel.cpp
@@ -0,0 +1,420 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativefolderlistmodel.h"
+#include <QDirModel>
+#include <QDebug>
+#include <qdeclarativecontext.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeFolderListModelPrivate
+{
+public:
+    QDeclarativeFolderListModelPrivate()
+        : sortField(QDeclarativeFolderListModel::Name), sortReversed(false), count(0) {
+        nameFilters << QLatin1String("*");
+    }
+
+    void updateSorting() {
+        QDir::SortFlags flags = 0;
+        switch(sortField) {
+        case QDeclarativeFolderListModel::Unsorted:
+            flags |= QDir::Unsorted;
+            break;
+        case QDeclarativeFolderListModel::Name:
+            flags |= QDir::Name;
+            break;
+        case QDeclarativeFolderListModel::Time:
+            flags |= QDir::Time;
+            break;
+        case QDeclarativeFolderListModel::Size:
+            flags |= QDir::Size;
+            break;
+        case QDeclarativeFolderListModel::Type:
+            flags |= QDir::Type;
+            break;
+        }
+
+        if (sortReversed)
+            flags |= QDir::Reversed;
+
+        model.setSorting(flags);
+    }
+
+    QDirModel model;
+    QUrl folder;
+    QStringList nameFilters;
+    QModelIndex folderIndex;
+    QDeclarativeFolderListModel::SortField sortField;
+    bool sortReversed;
+    int count;
+};
+
+/*!
+    \qmlclass FolderListModel
+    \brief The FolderListModel provides a model of the contents of a folder in a filesystem.
+
+    FolderListModel provides access to the local filesystem.  The \e folder property
+    specifies the folder to list.
+
+    Qt uses "/" as a universal directory separator in the same way that "/" is
+    used as a path separator in URLs. If you always use "/" as a directory
+    separator, Qt will translate your paths to conform to the underlying
+    operating system.
+
+    The roles available are:
+    \list
+    \o fileName
+    \o filePath
+    \endlist
+
+    Additionally a file entry can be differentiated from a folder entry
+    via the \l isFolder() method.
+*/
+
+QDeclarativeFolderListModel::QDeclarativeFolderListModel(QObject *parent)
+    : QListModelInterface(parent)
+{
+    d = new QDeclarativeFolderListModelPrivate;
+    d->model.setFilter(QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot);
+    connect(&d->model, SIGNAL(rowsInserted(const QModelIndex&,int,int))
+            , this, SLOT(inserted(const QModelIndex&,int,int)));
+    connect(&d->model, SIGNAL(rowsRemoved(const QModelIndex&,int,int))
+            , this, SLOT(removed(const QModelIndex&,int,int)));
+    connect(&d->model, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&))
+            , this, SLOT(dataChanged(const QModelIndex&,const QModelIndex&)));
+    connect(&d->model, SIGNAL(modelReset()), this, SLOT(refresh()));
+    connect(&d->model, SIGNAL(layoutChanged()), this, SLOT(refresh()));
+}
+
+QDeclarativeFolderListModel::~QDeclarativeFolderListModel()
+{
+    delete d;
+}
+
+QHash<int,QVariant> QDeclarativeFolderListModel::data(int index, const QList<int> &roles) const
+{
+    Q_UNUSED(roles);
+    QHash<int,QVariant> folderData;
+    QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex);
+    if (modelIndex.isValid()) {
+        folderData[QDirModel::FileNameRole] = d->model.data(modelIndex, QDirModel::FileNameRole);
+        folderData[QDirModel::FilePathRole] = QUrl::fromLocalFile(d->model.data(modelIndex, QDirModel::FilePathRole).toString());
+    }
+
+    return folderData;
+}
+
+QVariant QDeclarativeFolderListModel::data(int index, int role) const
+{
+    QVariant rv;
+    QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex);
+    if (modelIndex.isValid()) {
+        if (role == QDirModel::FileNameRole)
+            rv = d->model.data(modelIndex, QDirModel::FileNameRole);
+        else if (role == QDirModel::FilePathRole)
+            rv = QUrl::fromLocalFile(d->model.data(modelIndex, QDirModel::FilePathRole).toString());
+    }
+
+    return rv;
+}
+
+int QDeclarativeFolderListModel::count() const
+{
+    return d->count;
+}
+
+QList<int> QDeclarativeFolderListModel::roles() const
+{
+    QList<int> r;
+    r << QDirModel::FileNameRole;
+    r << QDirModel::FilePathRole;
+    return r;
+}
+
+QString QDeclarativeFolderListModel::toString(int role) const
+{
+    switch (role) {
+    case QDirModel::FileNameRole:
+        return QLatin1String("fileName");
+    case QDirModel::FilePathRole:
+        return QLatin1String("filePath");
+    }
+
+    return QString();
+}
+
+/*!
+    \qmlproperty string FolderListModel::folder
+
+    The \a folder property holds the folder the model is currently providing.
+
+    It is a URL, but must be a file: or qrc: URL (or relative to such a URL).
+*/
+QUrl QDeclarativeFolderListModel::folder() const
+{
+    return d->folder;
+}
+
+void QDeclarativeFolderListModel::setFolder(const QUrl &folder)
+{
+    if (folder == d->folder)
+        return;
+    QModelIndex index = d->model.index(folder.toLocalFile());
+    if (index.isValid() && d->model.isDir(index)) {
+        d->folder = folder;
+        QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
+        emit folderChanged();
+    }
+}
+
+QUrl QDeclarativeFolderListModel::parentFolder() const
+{
+    QUrl r;
+    QString localFile = d->folder.toLocalFile();
+    if (!localFile.isEmpty()) {
+        QDir dir(localFile);
+#if defined(Q_OS_SYMBIAN)
+        if (dir.isRoot())
+            dir.setPath("");
+        else
+#endif
+            dir.cdUp();
+        r = d->folder;
+        r.setPath(dir.path());
+    } else {
+        int pos = d->folder.path().lastIndexOf(QLatin1Char('/'));
+        if (pos == -1)
+            return QUrl();
+        r = d->folder;
+        r.setPath(d->folder.path().left(pos));
+    }
+    return r;
+}
+
+/*!
+    \qmlproperty list<string> FolderListModel::nameFilters
+
+    The \a nameFilters property contains a list of filename filters.
+    The filters may include the ? and * wildcards.
+
+    The example below filters on PNG and JPEG files:
+
+    \code
+    FolderListModel {
+        nameFilters: [ "*.png", "*.jpg" ]
+    }
+    \endcode
+*/
+QStringList QDeclarativeFolderListModel::nameFilters() const
+{
+    return d->nameFilters;
+}
+
+void QDeclarativeFolderListModel::setNameFilters(const QStringList &filters)
+{
+    d->nameFilters = filters;
+    d->model.setNameFilters(d->nameFilters);
+}
+
+void QDeclarativeFolderListModel::componentComplete()
+{
+    if (!d->folder.isValid() || !QDir().exists(d->folder.toLocalFile()))
+        setFolder(QUrl(QLatin1String("file://")+QDir::currentPath()));
+
+    if (!d->folderIndex.isValid())
+        QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
+}
+
+QDeclarativeFolderListModel::SortField QDeclarativeFolderListModel::sortField() const
+{
+    return d->sortField;
+}
+
+void QDeclarativeFolderListModel::setSortField(SortField field)
+{
+    if (field != d->sortField) {
+        d->sortField = field;
+        d->updateSorting();
+    }
+}
+
+bool QDeclarativeFolderListModel::sortReversed() const
+{
+    return d->sortReversed;
+}
+
+void QDeclarativeFolderListModel::setSortReversed(bool rev)
+{
+    if (rev != d->sortReversed) {
+        d->sortReversed = rev;
+        d->updateSorting();
+    }
+}
+
+/*!
+    \qmlmethod bool FolderListModel::isFolder(int index)
+
+    Returns true if the entry \a index is a folder; otherwise
+    returns false.
+*/
+bool QDeclarativeFolderListModel::isFolder(int index) const
+{
+    if (index != -1) {
+        QModelIndex idx = d->model.index(index, 0, d->folderIndex);
+        if (idx.isValid())
+            return d->model.isDir(idx);
+    }
+    return false;
+}
+
+void QDeclarativeFolderListModel::refresh()
+{
+    d->folderIndex = QModelIndex();
+    if (d->count) {
+        int tmpCount = d->count;
+        d->count = 0;
+        emit itemsRemoved(0, tmpCount);
+    }
+    d->folderIndex = d->model.index(d->folder.toLocalFile());
+    d->count = d->model.rowCount(d->folderIndex);
+    if (d->count) {
+        emit itemsInserted(0, d->count);
+    }
+}
+
+void QDeclarativeFolderListModel::inserted(const QModelIndex &index, int start, int end)
+{
+    if (index == d->folderIndex) {
+        d->count = d->model.rowCount(d->folderIndex);
+        emit itemsInserted(start, end - start + 1);
+    }
+}
+
+void QDeclarativeFolderListModel::removed(const QModelIndex &index, int start, int end)
+{
+    if (index == d->folderIndex) {
+        d->count = d->model.rowCount(d->folderIndex);
+        emit itemsRemoved(start, end - start + 1);
+    }
+}
+
+void QDeclarativeFolderListModel::dataChanged(const QModelIndex &start, const QModelIndex &end)
+{
+    qDebug() << "data changed";
+    if (start.parent() == d->folderIndex)
+        emit itemsChanged(start.row(), end.row() - start.row() + 1, roles());
+}
+
+/*!
+    \qmlproperty bool FolderListModel::showDirs
+
+    If true (the default), directories are included in the model.
+
+    Note that the nameFilters are ignored for directories.
+*/
+bool QDeclarativeFolderListModel::showDirs() const
+{
+    return d->model.filter() & QDir::AllDirs;
+}
+
+void  QDeclarativeFolderListModel::setShowDirs(bool on)
+{
+    if (!(d->model.filter() & QDir::AllDirs) == !on)
+        return;
+    if (on)
+        d->model.setFilter(d->model.filter() | QDir::AllDirs | QDir::Drives);
+    else
+        d->model.setFilter(d->model.filter() & ~(QDir::AllDirs | QDir::Drives));
+}
+
+/*!
+    \qmlproperty bool FolderListModel::showDotAndDotDot
+
+    If true, the "." and ".." directories are included in the model.
+
+    The default is false.
+*/
+bool QDeclarativeFolderListModel::showDotAndDotDot() const
+{
+    return !(d->model.filter() & QDir::NoDotAndDotDot);
+}
+
+void  QDeclarativeFolderListModel::setShowDotAndDotDot(bool on)
+{
+    if (!(d->model.filter() & QDir::NoDotAndDotDot) == on)
+        return;
+    if (on)
+        d->model.setFilter(d->model.filter() & ~QDir::NoDotAndDotDot);
+    else
+        d->model.setFilter(d->model.filter() | QDir::NoDotAndDotDot);
+}
+
+/*!
+    \qmlproperty bool FolderListModel::showOnlyReadable
+
+    If true, only readable files and directories are shown.
+
+    The default is false.
+*/
+bool QDeclarativeFolderListModel::showOnlyReadable() const
+{
+    return d->model.filter() & QDir::Readable;
+}
+
+void QDeclarativeFolderListModel::setShowOnlyReadable(bool on)
+{
+    if (!(d->model.filter() & QDir::Readable) == !on)
+        return;
+    if (on)
+        d->model.setFilter(d->model.filter() | QDir::Readable);
+    else
+        d->model.setFilter(d->model.filter() & ~QDir::Readable);
+}
+
+void QDeclarativeFolderListModel::registerTypes()
+{
+    QML_REGISTER_TYPE(Qt,4,6,FolderListModel,QDeclarativeFolderListModel);
+}
+
+QT_END_NAMESPACE
+
diff --git a/tools/qml/qdeclarativefolderlistmodel.h b/tools/qml/qdeclarativefolderlistmodel.h
new file mode 100644
index 0000000..c16b44c
--- /dev/null
+++ b/tools/qml/qdeclarativefolderlistmodel.h
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEFOLDERLISTMODEL_H
+#define QDECLARATIVEFOLDERLISTMODEL_H
+
+#include <qdeclarative.h>
+#include "../../src/declarative/3rdparty/qlistmodelinterface_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeContext;
+class QModelIndex;
+
+class QDeclarativeFolderListModelPrivate;
+class QDeclarativeFolderListModel : public QListModelInterface, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativeParserStatus)
+
+    Q_PROPERTY(QUrl folder READ folder WRITE setFolder NOTIFY folderChanged)
+    Q_PROPERTY(QUrl parentFolder READ parentFolder NOTIFY folderChanged)
+    Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters)
+    Q_PROPERTY(SortField sortField READ sortField WRITE setSortField)
+    Q_PROPERTY(bool sortReversed READ sortReversed WRITE setSortReversed)
+    Q_PROPERTY(bool showDirs READ showDirs WRITE setShowDirs)
+    Q_PROPERTY(bool showDotAndDotDot READ showDotAndDotDot WRITE setShowDotAndDotDot)
+    Q_PROPERTY(bool showOnlyReadable READ showOnlyReadable WRITE setShowOnlyReadable)
+
+public:
+    QDeclarativeFolderListModel(QObject *parent = 0);
+    ~QDeclarativeFolderListModel();
+
+    static void registerTypes();
+
+    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
+    virtual QVariant data(int index, int role) const;
+    virtual int count() const;
+    virtual QList<int> roles() const;
+    virtual QString toString(int role) const;
+
+    QUrl folder() const;
+    void setFolder(const QUrl &folder);
+
+    QUrl parentFolder() const;
+
+    QStringList nameFilters() const;
+    void setNameFilters(const QStringList &filters);
+
+    virtual void componentComplete();
+
+    Q_INVOKABLE bool isFolder(int index) const;
+
+    enum SortField { Unsorted, Name, Time, Size, Type };
+    SortField sortField() const;
+    void setSortField(SortField field);
+    Q_ENUMS(SortField)
+
+    bool sortReversed() const;
+    void setSortReversed(bool rev);
+
+    bool showDirs() const;
+    void  setShowDirs(bool);
+    bool showDotAndDotDot() const;
+    void  setShowDotAndDotDot(bool);
+    bool showOnlyReadable() const;
+    void  setShowOnlyReadable(bool);
+
+Q_SIGNALS:
+    void folderChanged();
+
+private Q_SLOTS:
+    void refresh();
+    void inserted(const QModelIndex &index, int start, int end);
+    void removed(const QModelIndex &index, int start, int end);
+    void dataChanged(const QModelIndex &start, const QModelIndex &end);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeFolderListModel)
+    QDeclarativeFolderListModelPrivate *d;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeFolderListModel)
+
+#endif // QDECLARATIVEFOLDERLISTMODEL_H
diff --git a/tools/qml/qfxtester.cpp b/tools/qml/qfxtester.cpp
new file mode 100644
index 0000000..7344f58
--- /dev/null
+++ b/tools/qml/qfxtester.cpp
@@ -0,0 +1,382 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qfxtester.h>
+#include <QDebug>
+#include <QApplication>
+#include <qdeclarativeview.h>
+#include <QFile>
+#include <QDeclarativeComponent>
+#include <QDir>
+#include <QCryptographicHash>
+#include <private/qabstractanimation_p.h>
+#include <private/qdeclarativeitem_p.h>
+
+QT_BEGIN_NAMESPACE
+
+
+QDeclarativeTester::QDeclarativeTester(const QString &script, QDeclarativeViewer::ScriptOptions opts, 
+                     QDeclarativeView *parent)
+: QAbstractAnimation(parent), m_script(script), m_view(parent), filterEvents(true), options(opts), 
+  testscript(0), hasCompleted(false), hasFailed(false)
+{
+    parent->viewport()->installEventFilter(this);
+    parent->installEventFilter(this);
+    QUnifiedTimer::instance()->setConsistentTiming(true);
+    if (options & QDeclarativeViewer::Play)
+        this->run();
+    start();
+}
+
+QDeclarativeTester::~QDeclarativeTester()
+{
+    if (!hasFailed && 
+        options & QDeclarativeViewer::Record && 
+        options & QDeclarativeViewer::SaveOnExit)
+        save();
+}
+
+int QDeclarativeTester::duration() const
+{
+    return -1;
+}
+
+void QDeclarativeTester::addMouseEvent(Destination dest, QMouseEvent *me)
+{
+    MouseEvent e(me);
+    e.destination = dest;
+    m_mouseEvents << e;
+}
+
+void QDeclarativeTester::addKeyEvent(Destination dest, QKeyEvent *ke)
+{
+    KeyEvent e(ke);
+    e.destination = dest;
+    m_keyEvents << e;
+}
+
+bool QDeclarativeTester::eventFilter(QObject *o, QEvent *e)
+{
+    if (!filterEvents)
+        return false;
+
+    Destination destination;
+    if (o == m_view) {
+        destination = View;
+    } else if (o == m_view->viewport()) {
+        destination = ViewPort;
+    } else {
+        return false;
+    }
+
+    switch (e->type()) {
+        case QEvent::KeyPress:
+        case QEvent::KeyRelease:
+            addKeyEvent(destination, (QKeyEvent *)e);
+            return true;
+        case QEvent::MouseButtonPress:
+        case QEvent::MouseButtonRelease:
+        case QEvent::MouseMove:
+        case QEvent::MouseButtonDblClick:
+            addMouseEvent(destination, (QMouseEvent *)e);
+            return true;
+        default:
+            break;
+    }
+    return false;
+}
+
+void QDeclarativeTester::executefailure()
+{
+    hasFailed = true;
+
+    if (options & QDeclarativeViewer::ExitOnFailure)
+        exit(-1);
+}
+
+void QDeclarativeTester::imagefailure()
+{
+    hasFailed = true;
+
+    if (options & QDeclarativeViewer::ExitOnFailure)
+        exit(-1);
+}
+
+void QDeclarativeTester::complete()
+{
+    if ((options & QDeclarativeViewer::TestErrorProperty) && !hasFailed) {
+        QString e = m_view->rootObject()->property("error").toString();
+        if (!e.isEmpty()) {
+            qWarning() << "Test failed:" << e;
+            hasFailed = true;
+        }
+    }
+    if (options & QDeclarativeViewer::ExitOnComplete) 
+        QApplication::exit(hasFailed?-1:0);
+
+    if (hasCompleted)
+        return;
+    hasCompleted = true;
+
+    if (options & QDeclarativeViewer::Play)
+        qWarning("Script playback complete");
+}
+
+void QDeclarativeTester::run()
+{
+    QDeclarativeComponent c(m_view->engine(), m_script + QLatin1String(".qml"));
+
+    testscript = qobject_cast<QDeclarativeVisualTest *>(c.create());
+    if (testscript) testscript->setParent(this);
+    else { executefailure(); exit(-1); }
+    testscriptidx = 0;
+}
+
+void QDeclarativeTester::save()
+{
+    QString filename = m_script + QLatin1String(".qml");
+    QFileInfo filenameInfo(filename);
+    QDir saveDir = filenameInfo.absoluteDir();
+    saveDir.mkpath(".");
+
+    QFile file(filename);
+    file.open(QIODevice::WriteOnly);
+    QTextStream ts(&file);
+
+    ts << "import Qt.VisualTest 4.6\n\n";
+    ts << "VisualTest {\n";
+
+    int imgCount = 0;
+    QList<KeyEvent> keyevents = m_savedKeyEvents;
+    QList<MouseEvent> mouseevents = m_savedMouseEvents;
+    for (int ii = 0; ii < m_savedFrameEvents.count(); ++ii) {
+        const FrameEvent &fe = m_savedFrameEvents.at(ii);
+        ts << "    Frame {\n";
+        ts << "        msec: " << fe.msec << "\n";
+        if (!fe.hash.isEmpty()) {
+            ts << "        hash: \"" << fe.hash.toHex() << "\"\n";
+        } else if (!fe.image.isNull()) {
+            QString filename = filenameInfo.baseName() + "." + QString::number(imgCount) + ".png";
+            fe.image.save(m_script + "." + QString::number(imgCount) + ".png");
+            imgCount++;
+            ts << "        image: \"" << filename << "\"\n";
+        }
+        ts << "    }\n";
+
+        while (!mouseevents.isEmpty() && 
+               mouseevents.first().msec == fe.msec) {
+            MouseEvent me = mouseevents.takeFirst();
+
+            ts << "    Mouse {\n";
+            ts << "        type: " << me.type << "\n";
+            ts << "        button: " << me.button << "\n";
+            ts << "        buttons: " << me.buttons << "\n";
+            ts << "        x: " << me.pos.x() << "; y: " << me.pos.y() << "\n";
+            ts << "        modifiers: " << me.modifiers << "\n";
+            if (me.destination == ViewPort)
+                ts << "        sendToViewport: true\n";
+            ts << "    }\n";
+        }
+
+        while (!keyevents.isEmpty() &&
+               keyevents.first().msec == fe.msec) {
+            KeyEvent ke = keyevents.takeFirst();
+
+            ts << "    Key {\n";
+            ts << "        type: " << ke.type << "\n";
+            ts << "        key: " << ke.key << "\n";
+            ts << "        modifiers: " << ke.modifiers << "\n";
+            ts << "        text: \"" << ke.text.toUtf8().toHex() << "\"\n";
+            ts << "        autorep: " << (ke.autorep?"true":"false") << "\n";
+            ts << "        count: " << ke.count << "\n";
+            if (ke.destination == ViewPort)
+                ts << "        sendToViewport: true\n";
+            ts << "    }\n";
+        }
+    }
+
+    ts << "}\n";
+    file.close();
+}
+
+void QDeclarativeTester::updateCurrentTime(int msec)
+{
+    QDeclarativeItemPrivate::setConsistentTime(msec);
+
+    QImage img(m_view->width(), m_view->height(), QImage::Format_RGB32);
+
+    if (options & QDeclarativeViewer::TestImages) {
+        img.fill(qRgb(255,255,255));
+        QPainter p(&img);
+        m_view->render(&p);
+    }
+
+    FrameEvent fe;
+    fe.msec = msec;
+    if (msec == 0 || !(options & QDeclarativeViewer::TestImages)) {
+        // Skip first frame, skip if not doing images
+    } else if (0 == (m_savedFrameEvents.count() % 60)) {
+        fe.image = img;
+    } else {
+        QCryptographicHash hash(QCryptographicHash::Md5);
+        hash.addData((const char *)img.bits(), img.bytesPerLine() * img.height());
+        fe.hash = hash.result();
+    }
+    m_savedFrameEvents.append(fe);
+
+    // Deliver mouse events
+    filterEvents = false;
+
+    if (!testscript) {
+        for (int ii = 0; ii < m_mouseEvents.count(); ++ii) {
+            MouseEvent &me = m_mouseEvents[ii];
+            me.msec = msec;
+            QMouseEvent event(me.type, me.pos, me.button, me.buttons, me.modifiers);
+
+            if (me.destination == View) {
+                QCoreApplication::sendEvent(m_view, &event);
+            } else {
+                QCoreApplication::sendEvent(m_view->viewport(), &event);
+            }
+        }
+
+        for (int ii = 0; ii < m_keyEvents.count(); ++ii) {
+            KeyEvent &ke = m_keyEvents[ii];
+            ke.msec = msec;
+            QKeyEvent event(ke.type, ke.key, ke.modifiers, ke.text, ke.autorep, ke.count);
+
+            if (ke.destination == View) {
+                QCoreApplication::sendEvent(m_view, &event);
+            } else {
+                QCoreApplication::sendEvent(m_view->viewport(), &event);
+            }
+        }
+        m_savedMouseEvents.append(m_mouseEvents);
+        m_savedKeyEvents.append(m_keyEvents);
+    }
+
+    m_mouseEvents.clear();
+    m_keyEvents.clear();
+
+    // Advance test script
+    static int imgCount = 0;
+    while (testscript && testscript->count() > testscriptidx) {
+
+        QObject *event = testscript->event(testscriptidx);
+
+        if (QDeclarativeVisualTestFrame *frame = qobject_cast<QDeclarativeVisualTestFrame *>(event)) {
+            if (frame->msec() < msec) {
+                if (options & QDeclarativeViewer::TestImages && !(options & QDeclarativeViewer::Record)) {
+                    qWarning() << "QDeclarativeTester: Extra frame.  Seen:" 
+                               << msec << "Expected:" << frame->msec();
+                    imagefailure();
+                }
+            } else if (frame->msec() == msec) {
+                if (!frame->hash().isEmpty() && frame->hash().toUtf8() != fe.hash.toHex()) {
+                    if (options & QDeclarativeViewer::TestImages && !(options & QDeclarativeViewer::Record)) {
+                        qWarning() << "QDeclarativeTester: Mismatched frame hash.  Seen:" 
+                                   << fe.hash.toHex() << "Expected:" 
+                                   << frame->hash().toUtf8();
+                        imagefailure();
+                    }
+                }
+            } else if (frame->msec() > msec) {
+                break;
+            }
+
+            if (options & QDeclarativeViewer::TestImages && !(options & QDeclarativeViewer::Record) && !frame->image().isEmpty()) {
+                QImage goodImage(frame->image().toLocalFile());
+                if (goodImage != img) {
+                    QString reject(frame->image().toLocalFile() + ".reject.png");
+                    qWarning() << "QDeclarativeTester: Image mismatch.  Reject saved to:" 
+                               << reject;
+                    img.save(reject);
+                    imagefailure();
+                }
+            }
+        } else if (QDeclarativeVisualTestMouse *mouse = qobject_cast<QDeclarativeVisualTestMouse *>(event)) {
+            QPoint pos(mouse->x(), mouse->y());
+            QPoint globalPos = m_view->mapToGlobal(QPoint(0, 0)) + pos;
+            QMouseEvent event((QEvent::Type)mouse->type(), pos, globalPos, (Qt::MouseButton)mouse->button(), (Qt::MouseButtons)mouse->buttons(), (Qt::KeyboardModifiers)mouse->modifiers());
+
+            MouseEvent me(&event);
+            me.msec = msec;
+            if (!mouse->sendToViewport()) {
+                QCoreApplication::sendEvent(m_view, &event);
+                me.destination = View;
+            } else {
+                QCoreApplication::sendEvent(m_view->viewport(), &event);
+                me.destination = ViewPort;
+            }
+            m_savedMouseEvents.append(me);
+        } else if (QDeclarativeVisualTestKey *key = qobject_cast<QDeclarativeVisualTestKey *>(event)) {
+
+            QKeyEvent event((QEvent::Type)key->type(), key->key(), (Qt::KeyboardModifiers)key->modifiers(), QString::fromUtf8(QByteArray::fromHex(key->text().toUtf8())), key->autorep(), key->count());
+
+            KeyEvent ke(&event);
+            ke.msec = msec;
+            if (!key->sendToViewport()) {
+                QCoreApplication::sendEvent(m_view, &event);
+                ke.destination = View;
+            } else {
+                QCoreApplication::sendEvent(m_view->viewport(), &event);
+                ke.destination = ViewPort;
+            }
+            m_savedKeyEvents.append(ke);
+        } 
+        testscriptidx++;
+    }
+
+    filterEvents = true;
+
+    if (testscript && testscript->count() <= testscriptidx)
+        complete();
+}
+
+void QDeclarativeTester::registerTypes()
+{
+    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, VisualTest, QDeclarativeVisualTest);
+    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, Frame, QDeclarativeVisualTestFrame);
+    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, Mouse, QDeclarativeVisualTestMouse);
+    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, Key, QDeclarativeVisualTestKey);
+}
+
+QT_END_NAMESPACE
diff --git a/tools/qml/qfxtester.h b/tools/qml/qfxtester.h
new file mode 100644
index 0000000..3b935d8
--- /dev/null
+++ b/tools/qml/qfxtester.h
@@ -0,0 +1,284 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QFXTESTER_H
+#define QFXTESTER_H
+
+#include <QEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <qmlruntime.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeVisualTest : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QList<QObject *>* events READ events CONSTANT)
+    Q_CLASSINFO("DefaultProperty", "events")
+public:
+    QDeclarativeVisualTest() {}
+
+    QList<QObject *> *events() { return &m_events; }
+
+    int count() const { return m_events.count(); }
+    QObject *event(int idx) { return m_events.at(idx); }
+
+private:
+    QList<QObject *> m_events;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeVisualTest)
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeVisualTestFrame : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int msec READ msec WRITE setMsec)
+    Q_PROPERTY(QString hash READ hash WRITE setHash)
+    Q_PROPERTY(QUrl image READ image WRITE setImage)
+public:
+    QDeclarativeVisualTestFrame() : m_msec(-1) {}
+
+    int msec() const { return m_msec; }
+    void setMsec(int m) { m_msec = m; }
+
+    QString hash() const { return m_hash; }
+    void setHash(const QString &hash) { m_hash = hash; }
+
+    QUrl image() const { return m_image; }
+    void setImage(const QUrl &image) { m_image = image; }
+
+private:
+    int m_msec;
+    QString m_hash;
+    QUrl m_image;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeVisualTestFrame)
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeVisualTestMouse : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int type READ type WRITE setType)
+    Q_PROPERTY(int button READ button WRITE setButton)
+    Q_PROPERTY(int buttons READ buttons WRITE setButtons)
+    Q_PROPERTY(int x READ x WRITE setX)
+    Q_PROPERTY(int y READ y WRITE setY)
+    Q_PROPERTY(int modifiers READ modifiers WRITE setModifiers)
+    Q_PROPERTY(bool sendToViewport READ sendToViewport WRITE setSendToViewport)
+public:
+    QDeclarativeVisualTestMouse() : m_type(0), m_button(0), m_buttons(0), m_x(0), m_y(0), m_modifiers(0), m_viewport(false) {}
+
+    int type() const { return m_type; }
+    void setType(int t) { m_type = t; }
+    
+    int button() const { return m_button; }
+    void setButton(int b) { m_button = b; }
+
+    int buttons() const { return m_buttons; }
+    void setButtons(int b) { m_buttons = b; }
+
+    int x() const { return m_x; }
+    void setX(int x) { m_x = x; }
+
+    int y() const { return m_y; }
+    void setY(int y) { m_y = y; }
+
+    int modifiers() const { return m_modifiers; }
+    void setModifiers(int modifiers) { m_modifiers = modifiers; }
+
+    bool sendToViewport() const { return m_viewport; }
+    void setSendToViewport(bool v) { m_viewport = v; }
+private:
+    int m_type;
+    int m_button;
+    int m_buttons;
+    int m_x;
+    int m_y;
+    int m_modifiers;
+    bool m_viewport;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeVisualTestMouse)
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeVisualTestKey : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int type READ type WRITE setType)
+    Q_PROPERTY(int key READ key WRITE setKey)
+    Q_PROPERTY(int modifiers READ modifiers WRITE setModifiers)
+    Q_PROPERTY(QString text READ text WRITE setText)
+    Q_PROPERTY(bool autorep READ autorep WRITE setAutorep)
+    Q_PROPERTY(int count READ count WRITE setCount)
+    Q_PROPERTY(bool sendToViewport READ sendToViewport WRITE setSendToViewport)
+public:
+    QDeclarativeVisualTestKey() : m_type(0), m_key(0), m_modifiers(0), m_autorep(false), m_count(0), m_viewport(false) {}
+
+    int type() const { return m_type; }
+    void setType(int t) { m_type = t; }
+
+    int key() const { return m_key; }
+    void setKey(int k) { m_key = k; }
+
+    int modifiers() const { return m_modifiers; }
+    void setModifiers(int m) { m_modifiers = m; }
+
+    QString text() const { return m_text; }
+    void setText(const QString &t) { m_text = t; }
+
+    bool autorep() const { return m_autorep; }
+    void setAutorep(bool a) { m_autorep = a; }
+
+    int count() const { return m_count; }
+    void setCount(int c) { m_count = c; }
+
+    bool sendToViewport() const { return m_viewport; }
+    void setSendToViewport(bool v) { m_viewport = v; }
+private:
+    int m_type;
+    int m_key;
+    int m_modifiers;
+    QString m_text;
+    bool m_autorep;
+    int m_count;
+    bool m_viewport;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeVisualTestKey)
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeTester : public QAbstractAnimation
+{
+public:
+    QDeclarativeTester(const QString &script, QDeclarativeViewer::ScriptOptions options, QDeclarativeView *parent);
+    ~QDeclarativeTester();
+
+    static void registerTypes();
+
+    virtual int duration() const;
+
+    void run();
+    void save();
+
+    void executefailure();
+protected:
+    virtual void updateCurrentTime(int msecs);
+    virtual bool eventFilter(QObject *, QEvent *);
+
+private:
+    QString m_script;
+
+    void imagefailure();
+    void complete();
+
+    enum Destination { View, ViewPort };
+    void addKeyEvent(Destination, QKeyEvent *);
+    void addMouseEvent(Destination, QMouseEvent *);
+    QDeclarativeView *m_view;
+
+    struct MouseEvent {
+        MouseEvent(QMouseEvent *e)
+            : type(e->type()), button(e->button()), buttons(e->buttons()), 
+              pos(e->pos()), modifiers(e->modifiers()), destination(View) {}
+
+        QEvent::Type type;
+        Qt::MouseButton button;
+        Qt::MouseButtons buttons;
+        QPoint pos;
+        Qt::KeyboardModifiers modifiers;
+        Destination destination;
+
+        int msec;
+    };
+    struct KeyEvent {
+        KeyEvent(QKeyEvent *e)
+            : type(e->type()), key(e->key()), modifiers(e->modifiers()), text(e->text()),
+              autorep(e->isAutoRepeat()), count(e->count()), destination(View) {}
+        QEvent::Type type;
+        int key;
+        Qt::KeyboardModifiers modifiers;
+        QString text;
+        bool autorep;
+        ushort count;
+        Destination destination;
+
+        int msec;
+    };
+    struct FrameEvent {
+        QImage image;
+        QByteArray hash;
+        int msec;
+    };
+    QList<MouseEvent> m_mouseEvents;
+    QList<KeyEvent> m_keyEvents;
+
+    QList<MouseEvent> m_savedMouseEvents;
+    QList<KeyEvent> m_savedKeyEvents;
+    QList<FrameEvent> m_savedFrameEvents;
+    bool filterEvents;
+
+    QDeclarativeViewer::ScriptOptions options;
+    int testscriptidx;
+    QDeclarativeVisualTest *testscript;
+
+    bool hasCompleted;
+    bool hasFailed;
+};
+
+
+QT_END_NAMESPACE
+
+#endif // QFXTESTER_H
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
new file mode 100644
index 0000000..9c9c398
--- /dev/null
+++ b/tools/qml/qml.pro
@@ -0,0 +1,58 @@
+TEMPLATE = app
+CONFIG += qt \
+    uic
+DESTDIR = ../../bin
+QT += declarative \
+    script \
+    network \
+    sql
+
+contains(QT_CONFIG, opengl) {
+    QT += opengl
+    DEFINES += GL_SUPPORTED
+}
+
+# Input
+HEADERS += qmlruntime.h \
+           proxysettings.h \
+           qfxtester.h \
+           deviceorientation.h \
+           qdeclarativefolderlistmodel.h
+SOURCES += main.cpp \
+           qmlruntime.cpp \
+           proxysettings.cpp \
+           qfxtester.cpp \
+           qdeclarativefolderlistmodel.cpp
+RESOURCES = qmlruntime.qrc
+maemo5 {
+    SOURCES += deviceorientation_maemo.cpp
+} else {
+    SOURCES += deviceorientation.cpp
+}
+FORMS = recopts.ui \
+    proxysettings.ui
+INCLUDEPATH += ../../include/QtDeclarative
+INCLUDEPATH += ../../src/declarative/util
+INCLUDEPATH += ../../src/declarative/graphicsitems
+include(../shared/deviceskin/deviceskin.pri)
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
+
+wince* {
+QT += scripttools \
+    xml \
+    xmlpatterns \
+    phonon
+
+    contains(QT_CONFIG, webkit) {
+        QT += webkit 
+    }
+}
+symbian {
+#    TARGET.UID3 =
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+    HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
+    LIBS += -lesock  -lconnmon -linsock
+    TARGET.CAPABILITY = "All -TCB"
+}
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
new file mode 100644
index 0000000..7da3f5a
--- /dev/null
+++ b/tools/qml/qmlruntime.cpp
@@ -0,0 +1,1468 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qdeclarativeview.h>
+
+#ifdef hz
+#undef hz
+#endif
+#include "ui_recopts.h"
+
+#include "qmlruntime.h"
+#include <qdeclarativecontext.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativenetworkaccessmanagerfactory.h>
+#include "qdeclarative.h"
+#include <private/qperformancelog_p_p.h>
+#include <private/qabstractanimation_p.h>
+#include <QAbstractAnimation>
+#include "deviceskin.h"
+
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 3))
+#include <private/qzipreader_p.h>
+#define QDECLARATIVEVIEWER_ZIP_SUPPORT
+#endif
+
+#include <QSettings>
+#include <QXmlStreamReader>
+#include <QBuffer>
+#include <QNetworkReply>
+#include <QNetworkCookieJar>
+#include <QNetworkDiskCache>
+#include <QNetworkAccessManager>
+#include <QSignalMapper>
+#include <QDeclarativeComponent>
+#include <QWidget>
+#include <QApplication>
+#include <QDir>
+#include <QTextBrowser>
+#include <QFile>
+#include <QFileInfo>
+#include <QVBoxLayout>
+#include <QProgressDialog>
+#include <QProcess>
+#include <QMenuBar>
+#include <QMenu>
+#include <QAction>
+#include <QFileDialog>
+#include <QTimer>
+#include <QGraphicsObject>
+#include <QNetworkProxyFactory>
+#include <QKeyEvent>
+#include <QMutex>
+#include <QMutexLocker>
+#include "proxysettings.h"
+#include "deviceorientation.h"
+
+#ifdef GL_SUPPORTED
+#include <QGLWidget>
+#endif
+
+#include <qfxtester.h>
+
+#if defined (Q_OS_SYMBIAN)
+#define SYMBIAN_NETWORK_INIT
+#endif
+
+#if defined (SYMBIAN_NETWORK_INIT)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <QTextCodec>
+#include "sym_iap_util.h"
+#endif
+
+QT_BEGIN_NAMESPACE
+
+class Screen : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(Orientation orientation READ orientation NOTIFY orientationChanged)
+    Q_ENUMS(Orientation)
+
+public:
+    Screen(QObject *parent=0) : QObject(parent) {
+        connect(DeviceOrientation::instance(), SIGNAL(orientationChanged()),
+                this, SIGNAL(orientationChanged()));
+    }
+
+    enum Orientation { UnknownOrientation = DeviceOrientation::UnknownOrientation,
+                       Portrait = DeviceOrientation::Portrait,
+                       Landscape = DeviceOrientation::Landscape };
+    Orientation orientation() const { return Orientation(DeviceOrientation::instance()->orientation()); }
+
+signals:
+    void orientationChanged();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(Screen)
+
+QT_BEGIN_NAMESPACE
+
+class SizedMenuBar : public QMenuBar
+{
+    Q_OBJECT
+public:
+    SizedMenuBar(QWidget *parent, QWidget *referenceWidget)
+        : QMenuBar(parent), refWidget(referenceWidget)
+    {
+    }
+
+    virtual QSize sizeHint() const
+    {
+        return QSize(refWidget->sizeHint().width(), QMenuBar::sizeHint().height());
+    }
+
+private:
+    QWidget *refWidget;
+};
+
+
+class PreviewDeviceSkin : public DeviceSkin
+{
+    Q_OBJECT
+public:
+    explicit PreviewDeviceSkin(const DeviceSkinParameters &parameters, QWidget *parent);
+
+    void setPreview(QWidget *formWidget);
+    void setPreviewAndScale(QWidget *formWidget);
+
+    void setScreenSize(const QSize& size)
+    {
+        QMatrix fit;
+        fit = fit.scale(qreal(size.width())/m_screenSize.width(),
+            qreal(size.height())/m_screenSize.height());
+        setTransform(fit);
+        QApplication::syncX();
+    }
+
+    QSize standardScreenSize() const { return m_screenSize; }
+
+    QMenu* menu;
+
+private slots:
+    void slotSkinKeyPressEvent(int code, const QString& text, bool autorep);
+    void slotSkinKeyReleaseEvent(int code, const QString& text, bool autorep);
+    void slotPopupMenu();
+
+private:
+    const QSize m_screenSize;
+};
+
+
+PreviewDeviceSkin::PreviewDeviceSkin(const DeviceSkinParameters &parameters, QWidget *parent) :
+    DeviceSkin(parameters, parent),
+    m_screenSize(parameters.screenSize())
+{
+    menu = new QMenu(this);
+    connect(this, SIGNAL(skinKeyPressEvent(int,QString,bool)),
+            this, SLOT(slotSkinKeyPressEvent(int,QString,bool)));
+    connect(this, SIGNAL(skinKeyReleaseEvent(int,QString,bool)),
+            this, SLOT(slotSkinKeyReleaseEvent(int,QString,bool)));
+    connect(this, SIGNAL(popupMenu()), this, SLOT(slotPopupMenu()));
+}
+
+void PreviewDeviceSkin::setPreview(QWidget *formWidget)
+{
+    formWidget->setFixedSize(m_screenSize);
+    formWidget->setParent(this, Qt::SubWindow);
+    formWidget->setAutoFillBackground(true);
+    setView(formWidget);
+}
+
+void PreviewDeviceSkin::setPreviewAndScale(QWidget *formWidget)
+{
+    setScreenSize(formWidget->sizeHint());
+    formWidget->setParent(this, Qt::SubWindow);
+    formWidget->setAutoFillBackground(true);
+    setView(formWidget);
+}
+
+void PreviewDeviceSkin::slotSkinKeyPressEvent(int code, const QString& text, bool autorep)
+{
+    if (QWidget *focusWidget =  QApplication::focusWidget()) {
+        QKeyEvent e(QEvent::KeyPress,code,0,text,autorep);
+        QApplication::sendEvent(focusWidget, &e);
+    }
+
+}
+
+void PreviewDeviceSkin::slotSkinKeyReleaseEvent(int code, const QString& text, bool autorep)
+{
+    if (QWidget *focusWidget =  QApplication::focusWidget()) {
+        QKeyEvent e(QEvent::KeyRelease,code,0,text,autorep);
+        QApplication::sendEvent(focusWidget, &e);
+    }
+}
+
+void PreviewDeviceSkin::slotPopupMenu()
+{
+    menu->exec(QCursor::pos());
+}
+
+static struct { const char *name, *args; } ffmpegprofiles[] = {
+    {"Maximum Quality", "-sameq"},
+    {"High Quality", "-qmax 2"},
+    {"Medium Quality", "-qmax 6"},
+    {"Low Quality", "-qmax 16"},
+    {"Custom ffmpeg arguments", ""},
+    {0,0}
+};
+
+class RecordingDialog : public QDialog, public Ui::RecordingOptions {
+    Q_OBJECT
+
+public:
+    RecordingDialog(QWidget *parent) : QDialog(parent)
+    {
+        setupUi(this);
+        hz->setValidator(new QDoubleValidator(hz));
+        for (int i=0; ffmpegprofiles[i].name; ++i) {
+            profile->addItem(ffmpegprofiles[i].name);
+        }
+    }
+
+    void setArguments(QString a)
+    {
+        int i;
+        for (i=0; ffmpegprofiles[i].args[0]; ++i) {
+            if (ffmpegprofiles[i].args == a) {
+                profile->setCurrentIndex(i);
+                args->setText(QLatin1String(ffmpegprofiles[i].args));
+                return;
+            }
+        }
+        customargs = a;
+        args->setText(a);
+        profile->setCurrentIndex(i);
+    }
+
+    QString arguments() const
+    {
+        int i = profile->currentIndex();
+        return ffmpegprofiles[i].args[0] ? QLatin1String(ffmpegprofiles[i].args) : customargs;
+    }
+
+private slots:
+    void pickProfile(int i)
+    {
+        if (ffmpegprofiles[i].args[0]) {
+            args->setText(QLatin1String(ffmpegprofiles[i].args));
+        } else {
+            args->setText(customargs);
+        }
+    }
+
+    void storeCustomArgs(QString s)
+    {
+        setArguments(s);
+    }
+
+private:
+    QString customargs;
+};
+
+class PersistentCookieJar : public QNetworkCookieJar {
+public:
+    PersistentCookieJar(QObject *parent) : QNetworkCookieJar(parent) { load(); }
+    ~PersistentCookieJar() { save(); }
+
+    virtual QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const
+    {
+        QMutexLocker lock(&mutex);
+        return QNetworkCookieJar::cookiesForUrl(url);
+    }
+
+    virtual bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
+    {
+        QMutexLocker lock(&mutex);
+        return QNetworkCookieJar::setCookiesFromUrl(cookieList, url);
+    }
+
+private:
+    void save()
+    {
+        QMutexLocker lock(&mutex);
+        QList<QNetworkCookie> list = allCookies();
+        QByteArray data;
+        foreach (QNetworkCookie cookie, list) {
+            if (!cookie.isSessionCookie()) {
+                data.append(cookie.toRawForm());
+                data.append("\n");
+            }
+        }
+        QSettings settings("Nokia", "QtQmlViewer");
+        settings.setValue("Cookies",data);
+    }
+
+    void load()
+    {
+        QMutexLocker lock(&mutex);
+        QSettings settings("Nokia", "QtQmlViewer");
+        QByteArray data = settings.value("Cookies").toByteArray();
+        setAllCookies(QNetworkCookie::parseCookies(data));
+    }
+
+    mutable QMutex mutex;
+};
+
+class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
+{
+public:
+    NetworkAccessManagerFactory() : cookieJar(0), cacheSize(0) {}
+    ~NetworkAccessManagerFactory() {
+        delete cookieJar;
+    }
+
+    QNetworkAccessManager *create(QObject *parent) {
+        QMutexLocker lock(&mutex);
+        QNetworkAccessManager *manager = new QNetworkAccessManager(parent);
+        if (!cookieJar)
+            cookieJar = new PersistentCookieJar(0);
+        manager->setCookieJar(cookieJar);
+        cookieJar->setParent(0);
+        setupProxy(manager);
+        if (cacheSize > 0) {
+            QNetworkDiskCache *cache = new QNetworkDiskCache;
+            cache->setCacheDirectory(QDir::tempPath()+QLatin1String("/qml-duiviewer-network-cache"));
+            cache->setMaximumCacheSize(cacheSize);
+            manager->setCache(cache);
+        } else {
+            manager->setCache(0);
+        }
+        qDebug() << "created new network access manager for" << parent;
+        return manager;
+    }
+
+    void setupProxy(QNetworkAccessManager *nam)
+    {
+        class SystemProxyFactory : public QNetworkProxyFactory
+        {
+        public:
+            virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query)
+            {
+                QString protocolTag = query.protocolTag();
+                if (httpProxyInUse && (protocolTag == "http" || protocolTag == "https")) {
+                    QList<QNetworkProxy> ret;
+                    ret << httpProxy;
+                    return ret;
+                }
+                return QNetworkProxyFactory::systemProxyForQuery(query);
+            }
+            void setHttpProxy (QNetworkProxy proxy)
+            {
+                httpProxy = proxy;
+                httpProxyInUse = true;
+            }
+            void unsetHttpProxy ()
+            {
+                httpProxyInUse = false;
+            }
+        private:
+            bool httpProxyInUse;
+            QNetworkProxy httpProxy;
+        };
+
+        SystemProxyFactory *proxyFactory = new SystemProxyFactory;
+        if (ProxySettings::httpProxyInUse())
+            proxyFactory->setHttpProxy(ProxySettings::httpProxy());
+        else
+            proxyFactory->unsetHttpProxy();
+        nam->setProxyFactory(proxyFactory);
+    }
+
+    void setCacheSize(int size) {
+        if (size != cacheSize) {
+            cacheSize = size;
+        }
+    }
+
+    PersistentCookieJar *cookieJar;
+    QMutex mutex;
+    int cacheSize;
+};
+
+
+QString QDeclarativeViewer::getVideoFileName()
+{
+    QString title = convertAvailable || ffmpegAvailable ? tr("Save Video File") : tr("Save PNG Frames");
+    QStringList types;
+    if (ffmpegAvailable) types += tr("Common Video files")+QLatin1String(" (*.avi *.mpeg *.mov)");
+    if (convertAvailable) types += tr("GIF Animation")+QLatin1String(" (*.gif)");
+    types += tr("Individual PNG frames")+QLatin1String(" (*.png)");
+    if (ffmpegAvailable) types += tr("All ffmpeg formats (*.*)");
+    return QFileDialog::getSaveFileName(this, title, "", types.join(";; "));
+}
+
+
+QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
+#if defined(Q_OS_SYMBIAN)
+    : QMainWindow(parent, flags)
+#else
+    : QWidget(parent, flags)
+#endif
+      , frame_stream(0), scaleSkin(true), mb(0)
+      , portraitOrientation(0), landscapeOrientation(0)
+      , m_scriptOptions(0), tester(0), useQmlFileBrowser(true)
+{
+    devicemode = false;
+    skin = 0;
+    canvas = 0;
+    record_autotime = 0;
+    record_rate = 50;
+    record_args += QLatin1String("-sameq");
+
+    recdlg = new RecordingDialog(this);
+    connect(recdlg->pickfile, SIGNAL(clicked()), this, SLOT(pickRecordingFile()));
+    senseFfmpeg();
+    senseImageMagick();
+    if (!ffmpegAvailable)
+        recdlg->ffmpegOptions->hide();
+    if (!ffmpegAvailable && !convertAvailable)
+        recdlg->rateOptions->hide();
+    QString warn;
+    if (!ffmpegAvailable) {
+        if (!convertAvailable)
+            warn = tr("ffmpeg and ImageMagick not available - no video output");
+        else
+            warn = tr("ffmpeg not available - GIF and PNG outputs only");
+        recdlg->warning->setText(warn);
+    } else {
+        recdlg->warning->hide();
+    }
+
+    canvas = new QDeclarativeView(this);
+    canvas->setAttribute(Qt::WA_OpaquePaintEvent);
+    canvas->setAttribute(Qt::WA_NoSystemBackground);
+    canvas->setResizeMode((!skin || !scaleSkin) ? QDeclarativeView::SizeRootObjectToView : QDeclarativeView::SizeViewToRootObject);
+    canvas->setFocus();
+
+    QObject::connect(canvas, SIGNAL(sceneResized(QSize)), this, SLOT(sceneResized(QSize)));
+    QObject::connect(canvas, SIGNAL(statusChanged(QDeclarativeView::Status)), this, SLOT(statusChanged()));
+    QObject::connect(canvas->engine(), SIGNAL(quit()), QCoreApplication::instance (), SLOT(quit()));
+
+    if (!(flags & Qt::FramelessWindowHint)) {
+        createMenu(menuBar(),0);
+        setPortrait();
+    }
+
+#if !defined(Q_OS_SYMBIAN)
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setMargin(0);
+    layout->setSpacing(0);
+    setLayout(layout);
+    if (mb)
+        layout->addWidget(mb);
+    layout->addWidget(canvas);
+#else
+    setCentralWidget(canvas);
+#endif
+
+    namFactory = new NetworkAccessManagerFactory;
+    canvas->engine()->setNetworkAccessManagerFactory(namFactory);
+
+    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);
+}
+
+QDeclarativeViewer::~QDeclarativeViewer()
+{
+    canvas->engine()->setNetworkAccessManagerFactory(0);
+    delete namFactory;
+}
+
+QMenuBar *QDeclarativeViewer::menuBar() const
+{
+#if !defined(Q_OS_SYMBIAN)
+    if (!mb)
+        mb = new SizedMenuBar((QWidget*)this, canvas);
+#else
+    mb = QMainWindow::menuBar();
+#endif
+
+    return mb;
+}
+
+void QDeclarativeViewer::createMenu(QMenuBar *menu, QMenu *flatmenu)
+{
+    QObject *parent = flatmenu ? (QObject*)flatmenu : (QObject*)menu;
+
+    QMenu *fileMenu = flatmenu ? flatmenu : menu->addMenu(tr("&File"));
+
+    QAction *openAction = new QAction(tr("&Open..."), parent);
+    openAction->setShortcut(QKeySequence("Ctrl+O"));
+    connect(openAction, SIGNAL(triggered()), this, SLOT(openFile()));
+    fileMenu->addAction(openAction);
+
+    QAction *reloadAction = new QAction(tr("&Reload"), parent);
+    reloadAction->setShortcut(QKeySequence("Ctrl+R"));
+    connect(reloadAction, SIGNAL(triggered()), this, SLOT(reload()));
+    fileMenu->addAction(reloadAction);
+
+#if defined(Q_OS_SYMBIAN)
+    QAction *networkAction = new QAction(tr("Start &Network"), parent);
+    connect(networkAction, SIGNAL(triggered()), this, SLOT(startNetwork()));
+    fileMenu->addAction(networkAction);
+#endif
+
+#if !defined(Q_OS_SYMBIAN)
+    if (flatmenu) flatmenu->addSeparator();
+
+    QMenu *recordMenu = flatmenu ? flatmenu : menu->addMenu(tr("&Recording"));
+
+    QAction *snapshotAction = new QAction(tr("&Take Snapshot\tF3"), parent);
+    connect(snapshotAction, SIGNAL(triggered()), this, SLOT(takeSnapShot()));
+    recordMenu->addAction(snapshotAction);
+
+    recordAction = new QAction(tr("Start Recording &Video\tF9"), parent);
+    connect(recordAction, SIGNAL(triggered()), this, SLOT(toggleRecordingWithSelection()));
+    recordMenu->addAction(recordAction);
+
+    QAction *recordOptions = new QAction(tr("Video &Options..."), parent);
+    connect(recordOptions, SIGNAL(triggered()), this, SLOT(chooseRecordingOptions()));
+
+    if (flatmenu)
+        flatmenu->addAction(recordOptions);
+
+    if (flatmenu) flatmenu->addSeparator();
+
+    QMenu *debugMenu = flatmenu ? flatmenu->addMenu(tr("&Debugging")) : menu->addMenu(tr("&Debugging"));
+
+    QAction *slowAction = new QAction(tr("&Slow Down Animations"), parent);
+    slowAction->setShortcut(QKeySequence("Ctrl+."));
+    slowAction->setCheckable(true);
+    connect(slowAction, SIGNAL(triggered(bool)), this, SLOT(setSlowMode(bool)));
+    debugMenu->addAction(slowAction);
+
+    if (flatmenu) flatmenu->addSeparator();
+
+    QMenu *skinMenu = flatmenu ? flatmenu->addMenu(tr("&Skin")) : menu->addMenu(tr("&Skin"));
+
+    QActionGroup *skinActions;
+    QAction *skinAction;
+
+    skinActions = new QActionGroup(parent);
+    skinAction = new QAction(tr("Scale skin"), parent);
+    skinAction->setCheckable(true);
+    skinAction->setChecked(scaleSkin);
+    skinActions->addAction(skinAction);
+    skinMenu->addAction(skinAction);
+    connect(skinAction, SIGNAL(triggered()), this, SLOT(setScaleSkin()));
+    skinAction = new QAction(tr("Resize view"), parent);
+    skinAction->setCheckable(true);
+    skinAction->setChecked(!scaleSkin);
+    skinActions->addAction(skinAction);
+    skinMenu->addAction(skinAction);
+    connect(skinAction, SIGNAL(triggered()), this, SLOT(setScaleView()));
+    skinMenu->addSeparator();
+
+    skinActions = new QActionGroup(parent);
+    QSignalMapper *mapper = new QSignalMapper(parent);
+    skinAction = new QAction(tr("None"), parent);
+    skinAction->setCheckable(true);
+    if (currentSkin.isEmpty())
+        skinAction->setChecked(true);
+    skinActions->addAction(skinAction);
+    skinMenu->addAction(skinAction);
+    mapper->setMapping(skinAction, "");
+    connect(skinAction, SIGNAL(triggered()), mapper, SLOT(map()));
+    skinMenu->addSeparator();
+
+    foreach (QString name, builtinSkins()) {
+        skinAction = new QAction(name, parent);
+        skinActions->addAction(skinAction);
+        skinMenu->addAction(skinAction);
+        skinAction->setCheckable(true);
+        if (":skin/"+name+".skin" == currentSkin)
+            skinAction->setChecked(true);
+        mapper->setMapping(skinAction, name);
+        connect(skinAction, SIGNAL(triggered()), mapper, SLOT(map()));
+    }
+    connect(mapper, SIGNAL(mapped(QString)), this, SLOT(setSkin(QString)));
+
+    if (flatmenu) flatmenu->addSeparator();
+#endif // Q_OS_SYMBIAN
+
+    QMenu *settingsMenu = flatmenu ? flatmenu : menu->addMenu(tr("S&ettings"));
+    QAction *proxyAction = new QAction(tr("Http &proxy..."), parent);
+    connect(proxyAction, SIGNAL(triggered()), this, SLOT(showProxySettings()));
+    settingsMenu->addAction(proxyAction);
+#if !defined(Q_OS_SYMBIAN)
+    if (!flatmenu)
+        settingsMenu->addAction(recordOptions);
+#else
+    QAction *fullscreenAction = new QAction(tr("Full Screen"), parent);
+    fullscreenAction->setCheckable(true);
+    connect(fullscreenAction, SIGNAL(triggered()), this, SLOT(toggleFullScreen()));
+    settingsMenu->addAction(fullscreenAction);
+#endif
+
+    QMenu *propertiesMenu = settingsMenu->addMenu(tr("Properties"));
+    QActionGroup *orientation = new QActionGroup(parent);
+
+    QAction *toggleOrientation = new QAction(tr("&Toggle Orientation"), parent);
+    toggleOrientation->setCheckable(true);
+    toggleOrientation->setShortcut(QKeySequence("Ctrl+T"));
+    settingsMenu->addAction(toggleOrientation);
+    connect(toggleOrientation, SIGNAL(triggered()), this, SLOT(toggleOrientation()));
+
+    orientation->setExclusive(true);
+    portraitOrientation = new QAction(tr("orientation: Portrait"), parent);
+    portraitOrientation->setCheckable(true);
+    connect(portraitOrientation, SIGNAL(triggered()), this, SLOT(setPortrait()));
+    orientation->addAction(portraitOrientation);
+    propertiesMenu->addAction(portraitOrientation);
+
+    landscapeOrientation = new QAction(tr("orientation: Landscape"), parent);
+    landscapeOrientation->setCheckable(true);
+    connect(landscapeOrientation, SIGNAL(triggered()), this, SLOT(setLandscape()));
+    orientation->addAction(landscapeOrientation);
+    propertiesMenu->addAction(landscapeOrientation);
+
+    if (flatmenu) flatmenu->addSeparator();
+
+    QMenu *helpMenu = flatmenu ? flatmenu : menu->addMenu(tr("&Help"));
+    QAction *aboutAction = new QAction(tr("&About Qt..."), parent);
+    connect(aboutAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+    helpMenu->addAction(aboutAction);
+
+    QAction *quitAction = new QAction(tr("&Quit"), parent);
+    quitAction->setShortcut(QKeySequence("Ctrl+Q"));
+    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    fileMenu->addSeparator();
+    fileMenu->addAction(quitAction);
+    if (menu) {
+        menu->setFixedHeight(menu->sizeHint().height());
+        menu->setMinimumWidth(10);
+    }
+}
+
+void QDeclarativeViewer::showProxySettings()
+{
+    ProxySettings settingsDlg (this);
+
+    connect (&settingsDlg, SIGNAL (accepted()), this, SLOT (proxySettingsChanged ()));
+
+    settingsDlg.exec();
+}
+
+void QDeclarativeViewer::proxySettingsChanged()
+{
+    reload ();
+}
+
+void QDeclarativeViewer::setPortrait()
+{
+    DeviceOrientation::instance()->setOrientation(DeviceOrientation::Portrait);
+    portraitOrientation->setChecked(true);
+}
+
+void QDeclarativeViewer::setLandscape()
+{
+    DeviceOrientation::instance()->setOrientation(DeviceOrientation::Landscape);
+    landscapeOrientation->setChecked(true);
+}
+
+void QDeclarativeViewer::toggleOrientation()
+{
+    DeviceOrientation::instance()->setOrientation(DeviceOrientation::instance()->orientation()==DeviceOrientation::Portrait?DeviceOrientation::Landscape:DeviceOrientation::Portrait);
+}
+
+void QDeclarativeViewer::toggleFullScreen()
+{
+    if (isFullScreen())
+        showMaximized();
+    else
+        showFullScreen();
+}
+
+void QDeclarativeViewer::setScaleSkin()
+{
+    if (scaleSkin)
+        return;
+    scaleSkin = true;
+    canvas->setResizeMode((!skin || !scaleSkin) ? QDeclarativeView::SizeRootObjectToView : QDeclarativeView::SizeViewToRootObject);
+    if (skin) {
+        canvas->setFixedSize(canvas->sizeHint());
+        skin->setScreenSize(canvas->sizeHint());
+    }
+}
+
+void QDeclarativeViewer::setScaleView()
+{
+    if (!scaleSkin)
+        return;
+    scaleSkin = false;
+    if (skin) {
+        canvas->setResizeMode((!skin || !scaleSkin) ? QDeclarativeView::SizeRootObjectToView : QDeclarativeView::SizeViewToRootObject);
+        canvas->setMinimumSize(QSize(0,0));
+        canvas->setMaximumSize(QSize(16777215,16777215));
+        canvas->resize(skin->standardScreenSize());
+        skin->setScreenSize(skin->standardScreenSize());
+    }
+}
+
+
+void QDeclarativeViewer::takeSnapShot()
+{
+    static int snapshotcount = 1;
+    QString snapFileName = QString(QLatin1String("snapshot%1.png")).arg(snapshotcount);
+    QPixmap::grabWidget(canvas).save(snapFileName);
+    qDebug() << "Wrote" << snapFileName;
+    ++snapshotcount;
+}
+
+void QDeclarativeViewer::pickRecordingFile()
+{
+    QString fileName = getVideoFileName();
+    if (!fileName.isEmpty())
+        recdlg->file->setText(fileName);
+}
+
+void QDeclarativeViewer::chooseRecordingOptions()
+{
+    // File
+    recdlg->file->setText(record_file);
+
+    // Size
+    recdlg->sizeOriginal->setText(tr("Original (%1x%2)").arg(canvas->width()).arg(canvas->height()));
+    if (recdlg->sizeWidth->value()<=1) {
+        recdlg->sizeWidth->setValue(canvas->width());
+        recdlg->sizeHeight->setValue(canvas->height());
+    }
+
+    // Rate
+    if (record_rate == 24)
+        recdlg->hz24->setChecked(true);
+    else if (record_rate == 25)
+        recdlg->hz25->setChecked(true);
+    else if (record_rate == 50)
+        recdlg->hz50->setChecked(true);
+    else if (record_rate == 60)
+        recdlg->hz60->setChecked(true);
+    else {
+        recdlg->hzCustom->setChecked(true);
+        recdlg->hz->setText(QString::number(record_rate));
+    }
+
+    // Profile
+    recdlg->setArguments(record_args.join(" "));
+    if (recdlg->exec()) {
+        // File
+        record_file = recdlg->file->text();
+        // Size
+        if (recdlg->sizeOriginal->isChecked())
+            record_outsize = QSize();
+        else if (recdlg->size720p->isChecked())
+            record_outsize = QSize(1280,720);
+        else if (recdlg->sizeVGA->isChecked())
+            record_outsize = QSize(640,480);
+        else if (recdlg->sizeQVGA->isChecked())
+            record_outsize = QSize(320,240);
+        else
+            record_outsize = QSize(recdlg->sizeWidth->value(),recdlg->sizeHeight->value());
+        // Rate
+        if (recdlg->hz24->isChecked())
+            record_rate = 24;
+        else if (recdlg->hz25->isChecked())
+            record_rate = 25;
+        else if (recdlg->hz50->isChecked())
+            record_rate = 50;
+        else if (recdlg->hz60->isChecked())
+            record_rate = 60;
+        else {
+            record_rate = recdlg->hz->text().toDouble();
+        }
+        // Profile
+        record_args = recdlg->arguments().split(" ",QString::SkipEmptyParts);
+    }
+}
+
+void QDeclarativeViewer::toggleRecordingWithSelection()
+{
+    if (!recordTimer.isRunning()) {
+        if (record_file.isEmpty()) {
+            QString fileName = getVideoFileName();
+            if (fileName.isEmpty())
+                return;
+            if (!fileName.contains(QRegExp(".[^\\/]*$")))
+                fileName += ".avi";
+            setRecordFile(fileName);
+        }
+    }
+    toggleRecording();
+}
+
+void QDeclarativeViewer::toggleRecording()
+{
+    if (record_file.isEmpty()) {
+        toggleRecordingWithSelection();
+        return;
+    }
+    bool recording = !recordTimer.isRunning();
+    recordAction->setText(recording ? tr("&Stop Recording Video\tF9") : tr("&Start Recording Video\tF9"));
+    setRecording(recording);
+}
+
+void QDeclarativeViewer::setSlowMode(bool enable)
+{
+    QUnifiedTimer::instance()->setSlowModeEnabled(enable);
+}
+
+void QDeclarativeViewer::addLibraryPath(const QString& lib)
+{
+    canvas->engine()->addImportPath(lib);
+}
+
+void QDeclarativeViewer::reload()
+{
+    openQml(currentFileOrUrl);
+}
+
+void QDeclarativeViewer::open(const QString& doc)
+{
+#ifdef QDECLARATIVEVIEWER_ZIP_SUPPORT
+    if (doc.endsWith(".wgt",Qt::CaseInsensitive)
+     || doc.endsWith(".wgz",Qt::CaseInsensitive)
+     || doc.endsWith(".zip",Qt::CaseInsensitive))
+        openWgt(doc);
+    else
+#endif
+        openQml(doc);
+}
+
+void QDeclarativeViewer::openWgt(const QString& doc)
+{
+#ifdef QDECLARATIVEVIEWER_ZIP_SUPPORT
+    // XXX This functionality could be migrated to QDeclarativeView once refined
+
+    QUrl url(doc);
+    if (url.isRelative())
+        url = QUrl::fromLocalFile(doc);
+    delete canvas->rootObject();
+    canvas->engine()->clearComponentCache();
+    QNetworkAccessManager * nam = canvas->engine()->networkAccessManager();
+    wgtreply = nam->get(QNetworkRequest(url));
+    connect(wgtreply,SIGNAL(finished()),this,SLOT(unpackWgt()));
+#endif
+}
+
+#ifdef QDECLARATIVEVIEWER_ZIP_SUPPORT
+static void removeRecursive(const QString& dirname)
+{
+    QDir dir(dirname);
+    QFileInfoList entries(dir.entryInfoList(QDir::Dirs|QDir::Files|QDir::NoDotAndDotDot));
+    for (int i = 0; i < entries.count(); ++i)
+        if (entries[i].isDir())
+            removeRecursive(entries[i].filePath());
+        else
+            dir.remove(entries[i].fileName());
+    QDir().rmdir(dirname);
+}
+#endif
+
+void QDeclarativeViewer::unpackWgt()
+{
+#ifdef QDECLARATIVEVIEWER_ZIP_SUPPORT
+    QByteArray all = wgtreply->readAll();
+    QBuffer buf(&all);
+    buf.open(QIODevice::ReadOnly);
+    QZipReader zip(&buf);
+    /*
+    for (int i=0; i<zip.count(); ++i) {
+        QZipReader::FileInfo info = zip.entryInfoAt(i);
+        qDebug() << "zip:" << info.filePath;
+    }
+    */
+    wgtdir = QDir::tempPath()+QDir::separator()+QLatin1String("qml-wgt");
+    removeRecursive(wgtdir);
+    QDir().mkpath(wgtdir);
+    zip.extractAll(wgtdir);
+
+    QString rootfile;
+
+    if (wgtreply->header(QNetworkRequest::ContentTypeHeader).toString() == "application/widget" || wgtreply->url().path().endsWith(".wgt",Qt::CaseInsensitive)) {
+        // W3C Draft http://www.w3.org/TR/2009/CR-widgets-20091201
+        QFile configfile(wgtdir+QDir::separator()+"config.xml");
+        if (configfile.open(QIODevice::ReadOnly)) {
+            QXmlStreamReader config(&configfile);
+            if (config.readNextStartElement() && config.name() == "widget") {
+                while (config.readNextStartElement()) {
+                    if (config.name() == "content") {
+                        rootfile = wgtdir + QDir::separator();
+                        rootfile += config.attributes().value(QLatin1String("src"));
+                    }
+                    // XXX process other config
+
+                    config.skipCurrentElement();
+                }
+            }
+        } else {
+            qWarning("No config.xml found - non-standard WGT file");
+        }
+        if (rootfile.isEmpty()) {
+            QString def = wgtdir+QDir::separator()+"index.qml";
+            if (QFile::exists(def))
+                rootfile = def;
+        }
+    } else {
+        // Just find index.qml, preferably at the root
+        for (int i=0; i<zip.count(); ++i) {
+            QZipReader::FileInfo info = zip.entryInfoAt(i);
+            if (info.filePath.compare(QLatin1String("index.qml"),Qt::CaseInsensitive)==0)
+                rootfile = wgtdir+QDir::separator()+info.filePath;
+            if (rootfile.isEmpty() && info.filePath.endsWith("/index.qml",Qt::CaseInsensitive))
+                rootfile = wgtdir+QDir::separator()+info.filePath;
+        }
+    }
+
+    openQml(rootfile);
+#endif
+}
+
+void QDeclarativeViewer::openFile()
+{
+    QString cur = canvas->source().toLocalFile();
+    if (useQmlFileBrowser) {
+        openQml("qrc:/content/Browser.qml");
+    } else {
+        QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), cur, tr("QML Files (*.qml)"));
+        if (!fileName.isEmpty()) {
+            QFileInfo fi(fileName);
+            openQml(fi.absoluteFilePath());
+        }
+    }
+}
+
+void QDeclarativeViewer::statusChanged()
+{
+    if (canvas->status() == QDeclarativeView::Error && tester)
+        tester->executefailure();
+
+    if (canvas->status() == QDeclarativeView::Ready)
+        resize(sizeHint());
+}
+
+void QDeclarativeViewer::launch(const QString& file_or_url)
+{
+    QMetaObject::invokeMethod(this, "openQml", Qt::QueuedConnection, Q_ARG(QString, file_or_url));
+}
+
+void QDeclarativeViewer::openQml(const QString& file_or_url)
+{
+    currentFileOrUrl = file_or_url;
+
+    QUrl url;
+    QFileInfo fi(file_or_url);
+    if (fi.exists())
+        url = QUrl::fromLocalFile(fi.absoluteFilePath());
+    else
+        url = QUrl(file_or_url);
+    setWindowTitle(tr("%1 - Qt Declarative UI Viewer").arg(file_or_url));
+
+    if (!m_script.isEmpty()) 
+        tester = new QDeclarativeTester(m_script, m_scriptOptions, canvas);
+
+    delete canvas->rootObject();
+    canvas->engine()->clearComponentCache();
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("qmlViewer", this);
+#ifdef Q_OS_SYMBIAN
+    ctxt->setContextProperty("qmlViewerFolder", "E:\\"); // Documents on your S60 phone
+#else
+    ctxt->setContextProperty("qmlViewerFolder", QDir::currentPath());
+#endif
+
+    QString fileName = url.toLocalFile();
+    if (!fileName.isEmpty()) {
+        QFileInfo fi(fileName);
+        if (fi.exists()) {
+            if (fi.suffix().toLower() != QLatin1String("qml")) {
+                qWarning() << "qml cannot open non-QML file" << fileName;
+                return;
+            }
+
+            QDir dir(fi.path()+"/dummydata", "*.qml");
+            QStringList list = dir.entryList();
+            for (int i = 0; i < list.size(); ++i) {
+                QString qml = list.at(i);
+                QFile f(dir.filePath(qml));
+                f.open(QIODevice::ReadOnly);
+                QByteArray data = f.readAll();
+                QDeclarativeComponent comp(canvas->engine());
+                comp.setData(data, QUrl());
+                QObject *dummyData = comp.create();
+
+                if(comp.isError()) {
+                    QList<QDeclarativeError> errors = comp.errors();
+                    foreach (const QDeclarativeError &error, errors) {
+                        qWarning() << error;
+                    }
+                    if (tester) tester->executefailure();
+                }
+
+                if (dummyData) {
+                    qWarning() << "Loaded dummy data:" << dir.filePath(qml);
+                    qml.truncate(qml.length()-4);
+                    ctxt->setContextProperty(qml, dummyData);
+                    dummyData->setParent(this);
+                }
+            }
+        } else {
+            qWarning() << "qml cannot find file:" << fileName;
+            return;
+        }
+    }
+
+    QTime t;
+    t.start();
+
+    canvas->setSource(url);
+
+    qWarning() << "Wall startup time:" << t.elapsed();
+
+    if (!skin) {
+        canvas->updateGeometry();
+        if (mb)
+            mb->updateGeometry();
+        if (!isFullScreen() && !isMaximized())
+            resize(sizeHint());
+    } else {
+        if (scaleSkin)
+            canvas->resize(canvas->sizeHint());
+        else {
+            canvas->setFixedSize(skin->standardScreenSize());
+            canvas->resize(skin->standardScreenSize());
+        }
+    }
+
+#ifdef QTOPIA
+    show();
+#endif
+}
+
+void QDeclarativeViewer::startNetwork()
+{
+#if defined(SYMBIAN_NETWORK_INIT)
+    qt_SetDefaultIap();
+#endif
+}
+
+QStringList QDeclarativeViewer::builtinSkins() const
+{
+    QDir dir(":/skins/","*.skin");
+    const QFileInfoList l = dir.entryInfoList();
+    QStringList r;
+    for (QFileInfoList::const_iterator it = l.begin(); it != l.end(); ++it) {
+        r += (*it).baseName();
+    }
+    return r;
+}
+
+void QDeclarativeViewer::setSkin(const QString& skinDirOrName)
+{
+    QString skinDirectory = skinDirOrName;
+
+    if (!QDir(skinDirOrName).exists() && QDir(":/skins/"+skinDirOrName+".skin").exists())
+        skinDirectory = ":/skins/"+skinDirOrName+".skin";
+
+    if (currentSkin == skinDirectory)
+        return;
+
+    currentSkin = skinDirectory;
+
+    // XXX QWidget::setMask does not handle changes well, and we may
+    // XXX have been signalled from an item in a menu we're replacing,
+    // XXX hence some rather convoluted resetting here...
+
+    QString err;
+    if (skin) {
+        skin->hide();
+        skin->deleteLater();
+    }
+
+    canvas->setResizeMode((!skin || !scaleSkin) ? QDeclarativeView::SizeRootObjectToView : QDeclarativeView::SizeViewToRootObject);
+
+    DeviceSkinParameters parameters;
+    if (!skinDirectory.isEmpty() && parameters.read(skinDirectory,DeviceSkinParameters::ReadAll,&err)) {
+        layout()->setEnabled(false);
+        //setMenuBar(0);
+        if (mb)
+            mb->hide();
+        if (!err.isEmpty())
+            qWarning() << err;
+        skin = new PreviewDeviceSkin(parameters,this);
+        canvas->resize(canvas->sizeHint());
+        if (scaleSkin)
+            skin->setPreviewAndScale(canvas);
+        else
+            skin->setPreview(canvas);
+        createMenu(0,skin->menu);
+        skin->show();
+    } else {
+        skin = 0;
+        clearMask();
+        menuBar()->clear();
+        canvas->setParent(this, Qt::SubWindow);
+        createMenu(menuBar(),0);
+        mb->show();
+        setMinimumSize(QSize(0,0));
+        setMaximumSize(QSize(16777215,16777215));
+        canvas->setMinimumSize(QSize(0,0));
+        canvas->setMaximumSize(QSize(16777215,16777215));
+        QRect g = geometry();
+        g.setSize(sizeHint());
+        setParent(0,windowFlags()); // recreate
+        canvas->move(0,menuBar()->sizeHint().height());
+        setGeometry(g);
+        layout()->setEnabled(true);
+        show();
+    }
+    canvas->show();
+}
+
+void QDeclarativeViewer::setAutoRecord(int from, int to)
+{
+    if (from==0) from=1; // ensure resized
+    record_autotime = to-from;
+    autoStartTimer.setInterval(from);
+    autoStartTimer.setRunning(true);
+}
+
+void QDeclarativeViewer::setRecordArgs(const QStringList& a)
+{
+    record_args = a;
+}
+
+void QDeclarativeViewer::setRecordFile(const QString& f)
+{
+    record_file = f;
+}
+
+void QDeclarativeViewer::setRecordRate(int fps)
+{
+    record_rate = fps;
+}
+
+void QDeclarativeViewer::sceneResized(QSize size)
+{
+    if (size.width() > 0 && size.height() > 0) {
+        if (skin && scaleSkin)
+            skin->setScreenSize(size);
+    }
+}
+
+void QDeclarativeViewer::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_0 && devicemode)
+        exit(0);
+    else if (event->key() == Qt::Key_F1 || (event->key() == Qt::Key_1 && devicemode)) {
+        qDebug() << "F1 - help\n"
+                 << "F2 - save test script\n"
+                 << "F3 - take PNG snapshot\n"
+                 << "F4 - show items and state\n"
+                 << "F5 - reload QML\n"
+                 << "F6 - show object tree\n"
+                 << "F7 - show timing\n"
+                 << "F8 - show performance (if available)\n"
+                 << "F9 - toggle video recording\n"
+                 << "F10 - toggle orientation\n"
+                 << "device keys: 0=quit, 1..8=F1..F8"
+                ;
+    } else if (event->key() == Qt::Key_F2 || (event->key() == Qt::Key_2 && devicemode)) {
+        if (tester && m_scriptOptions & Record)
+            tester->save();
+    } else if (event->key() == Qt::Key_F3 || (event->key() == Qt::Key_3 && devicemode)) {
+        takeSnapShot();
+    } else if (event->key() == Qt::Key_F5 || (event->key() == Qt::Key_5 && devicemode)) {
+        reload();
+    } else if (event->key() == Qt::Key_F8 || (event->key() == Qt::Key_8 && devicemode)) {
+        QPerformanceLog::displayData();
+        QPerformanceLog::clear();
+    } else if (event->key() == Qt::Key_F9 || (event->key() == Qt::Key_9 && devicemode)) {
+        toggleRecording();
+    } else if (event->key() == Qt::Key_F10) {
+        if (portraitOrientation) {
+            if (portraitOrientation->isChecked())
+                setLandscape();
+            else
+                setPortrait();
+        }
+    }
+
+    QWidget::keyPressEvent(event);
+}
+
+void QDeclarativeViewer::senseImageMagick()
+{
+    QProcess proc;
+    proc.start("convert", QStringList() << "-h");
+    proc.waitForFinished(2000);
+    QString help = proc.readAllStandardOutput();
+    convertAvailable = help.contains("ImageMagick");
+}
+
+void QDeclarativeViewer::senseFfmpeg()
+{
+    QProcess proc;
+    proc.start("ffmpeg", QStringList() << "-h");
+    proc.waitForFinished(2000);
+    QString ffmpegHelp = proc.readAllStandardOutput();
+    ffmpegAvailable = ffmpegHelp.contains("-s ");
+    ffmpegHelp = tr("Video recording uses ffmpeg:")+"\n\n"+ffmpegHelp;
+
+    QDialog *d = new QDialog(recdlg);
+    QVBoxLayout *l = new QVBoxLayout(d);
+    QTextBrowser *b = new QTextBrowser(d);
+    QFont f = b->font();
+    f.setFamily("courier");
+    b->setFont(f);
+    b->setText(ffmpegHelp);
+    l->addWidget(b);
+    d->setLayout(l);
+    ffmpegHelpWindow = d;
+    connect(recdlg->ffmpegHelp,SIGNAL(clicked()), ffmpegHelpWindow, SLOT(show()));
+}
+
+void QDeclarativeViewer::setRecording(bool on)
+{
+    if (on == recordTimer.isRunning())
+        return;
+
+    int period = int(1000/record_rate+0.5);
+    QUnifiedTimer::instance()->setTimingInterval(on ? period:16);
+    QUnifiedTimer::instance()->setConsistentTiming(on);
+    if (on) {
+        canvas->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+        recordTimer.setInterval(period);
+        recordTimer.setRunning(true);
+        frame_fmt = record_file.right(4).toLower();
+        frame = QImage(canvas->width(),canvas->height(),QImage::Format_RGB32);
+        if (frame_fmt != ".png" && (!convertAvailable || frame_fmt != ".gif")) {
+            // Stream video to ffmpeg
+
+            QProcess *proc = new QProcess(this);
+            connect(proc, SIGNAL(finished(int)), this, SLOT(ffmpegFinished(int)));
+            frame_stream = proc;
+
+            QStringList args;
+            args << "-y";
+            args << "-r" << QString::number(record_rate);
+            args << "-f" << "rawvideo";
+            args << "-pix_fmt" << (frame_fmt == ".gif" ? "rgb24" : "rgb32");
+            args << "-s" << QString("%1x%2").arg(canvas->width()).arg(canvas->height());
+            args << "-i" << "-";
+            if (record_outsize.isValid()) {
+                args << "-s" << QString("%1x%2").arg(record_outsize.width()).arg(record_outsize.height());
+                args << "-aspect" << QString::number(double(canvas->width())/canvas->height());
+            }
+            args += record_args;
+            args << record_file;
+            proc->start("ffmpeg",args);
+
+        } else {
+            // Store frames, save to GIF/PNG
+            frame_stream = 0;
+        }
+    } else {
+        canvas->setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
+        recordTimer.setRunning(false);
+        if (frame_stream) {
+            qDebug() << "Saving video...";
+            frame_stream->close();
+            qDebug() << "Wrote" << record_file;
+        } else {
+            QProgressDialog progress(tr("Saving frames..."), tr("Cancel"), 0, frames.count()+10, this);
+            progress.setWindowModality(Qt::WindowModal);
+
+            int frame=0;
+            QStringList inputs;
+            qDebug() << "Saving frames...";
+
+            QString framename;
+            bool png_output = false;
+            if (record_file.right(4).toLower()==".png") {
+                if (record_file.contains('%'))
+                    framename = record_file;
+                else
+                    framename = record_file.left(record_file.length()-4)+"%04d"+record_file.right(4);
+                png_output = true;
+            } else {
+                framename = "tmp-frame%04d.png";
+                png_output = false;
+            }
+            foreach (QImage* img, frames) {
+                progress.setValue(progress.value()+1);
+                if (progress.wasCanceled())
+                    break;
+                QString name;
+                name.sprintf(framename.toLocal8Bit(),frame++);
+                if (record_outsize.isValid())
+                    *img = img->scaled(record_outsize,Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
+                if (record_dither=="ordered")
+                    img->convertToFormat(QImage::Format_Indexed8,Qt::PreferDither|Qt::OrderedDither).save(name);
+                else if (record_dither=="threshold")
+                    img->convertToFormat(QImage::Format_Indexed8,Qt::PreferDither|Qt::ThresholdDither).save(name);
+                else if (record_dither=="floyd")
+                    img->convertToFormat(QImage::Format_Indexed8,Qt::PreferDither).save(name);
+                else
+                    img->save(name);
+                inputs << name;
+                delete img;
+            }
+
+            if (!progress.wasCanceled()) {
+                if (png_output) {
+                    framename.replace(QRegExp("%\\d*."),"*");
+                    qDebug() << "Wrote frames" << framename;
+                    inputs.clear(); // don't remove them
+                } else {
+                    // ImageMagick and gifsicle for GIF encoding
+                    progress.setLabelText(tr("Converting frames to GIF file..."));
+                    QStringList args;
+                    args << "-delay" << QString::number(period/10);
+                    args << inputs;
+                    args << record_file;
+                    qDebug() << "Converting..." << record_file << "(this may take a while)";
+                    if (0!=QProcess::execute("convert", args)) {
+                        qWarning() << "Cannot run ImageMagick 'convert' - recorded frames not converted";
+                        inputs.clear(); // don't remove them
+                        qDebug() << "Wrote frames tmp-frame*.png";
+                    } else {
+                        if (record_file.right(4).toLower() == ".gif") {
+                            qDebug() << "Compressing..." << record_file;
+                            if (0!=QProcess::execute("gifsicle", QStringList() << "-O2" << "-o" << record_file << record_file))
+                                qWarning() << "Cannot run 'gifsicle' - not compressed";
+                        }
+                        qDebug() << "Wrote" << record_file;
+                    }
+                }
+            }
+
+            progress.setValue(progress.maximum()-1);
+            foreach (QString name, inputs)
+                QFile::remove(name);
+
+            frames.clear();
+        }
+    }
+    qDebug() << "Recording: " << (recordTimer.isRunning()?"ON":"OFF");
+}
+
+void QDeclarativeViewer::ffmpegFinished(int code)
+{
+    qDebug() << "ffmpeg returned" << code << frame_stream->readAllStandardError();
+}
+
+void QDeclarativeViewer::autoStartRecording()
+{
+    setRecording(true);
+    autoStopTimer.setInterval(record_autotime);
+    autoStopTimer.setRunning(true);
+}
+
+void QDeclarativeViewer::autoStopRecording()
+{
+    setRecording(false);
+}
+
+void QDeclarativeViewer::recordFrame()
+{
+    canvas->QWidget::render(&frame);
+    if (frame_stream) {
+        if (frame_fmt == ".gif") {
+            // ffmpeg can't do 32bpp with gif
+            QImage rgb24 = frame.convertToFormat(QImage::Format_RGB888);
+            frame_stream->write((char*)rgb24.bits(),rgb24.numBytes());
+        } else {
+            frame_stream->write((char*)frame.bits(),frame.numBytes());
+        }
+    } else {
+        frames.append(new QImage(frame));
+    }
+}
+
+void QDeclarativeViewer::setDeviceKeys(bool on)
+{
+    devicemode = on;
+}
+
+void QDeclarativeViewer::setNetworkCacheSize(int size)
+{
+    namFactory->setCacheSize(size);
+}
+
+void QDeclarativeViewer::setUseGL(bool useGL)
+{
+#ifdef GL_SUPPORTED
+    if (useGL) {
+        QGLFormat format = QGLFormat::defaultFormat();
+        format.setSampleBuffers(false);
+
+        QGLWidget *glWidget = new QGLWidget(format);
+        glWidget->setAutoFillBackground(false);
+        canvas->setViewport(glWidget);
+    }
+#endif
+}
+
+void QDeclarativeViewer::setUseNativeFileBrowser(bool use)
+{
+    useQmlFileBrowser = !use;
+}
+
+void QDeclarativeViewer::registerTypes()
+{
+    QML_REGISTER_TYPE(QDeclarativeViewer, 1, 0, Screen, Screen);
+}
+
+QT_END_NAMESPACE
+
+#include "qmlruntime.moc"
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
new file mode 100644
index 0000000..01777bd
--- /dev/null
+++ b/tools/qml/qmlruntime.h
@@ -0,0 +1,195 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEVIEWER_H
+#define QDECLARATIVEVIEWER_H
+
+#include <QMainWindow>
+#include <QMenuBar>
+#include <private/qdeclarativetimer_p.h>
+#include <QTime>
+#include <QList>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeView;
+class PreviewDeviceSkin;
+class QDeclarativeTestEngine;
+class QProcess;
+class RecordingDialog;
+class QDeclarativeTester;
+class QNetworkReply;
+class QNetworkCookieJar;
+class NetworkAccessManagerFactory;
+
+class QDeclarativeViewer
+#if defined(Q_OS_SYMBIAN)
+    : public QMainWindow
+#else
+    : public QWidget
+#endif
+{
+Q_OBJECT
+public:
+    QDeclarativeViewer(QWidget *parent=0, Qt::WindowFlags flags=0);
+    ~QDeclarativeViewer();
+
+    static void registerTypes();
+
+    enum ScriptOption {
+        Play = 0x00000001,
+        Record = 0x00000002,
+        TestImages = 0x00000004,
+        TestErrorProperty = 0x00000008,
+        SaveOnExit = 0x00000010,
+        ExitOnComplete = 0x00000020,
+        ExitOnFailure = 0x00000040
+    };
+    Q_DECLARE_FLAGS(ScriptOptions, ScriptOption)
+    void setScript(const QString &s) { m_script = s; }
+    void setScriptOptions(ScriptOptions opt) { m_scriptOptions = opt; }
+    void setRecordDither(const QString& s) { record_dither = s; }
+    void setRecordRate(int fps);
+    void setRecordFile(const QString&);
+    void setRecordArgs(const QStringList&);
+    void setRecording(bool on);
+    bool isRecording() const { return recordTimer.isRunning(); }
+    void setAutoRecord(int from, int to);
+    void setDeviceKeys(bool);
+    void setNetworkCacheSize(int size);
+    void addLibraryPath(const QString& lib);
+    void setUseGL(bool use);
+    void setUseNativeFileBrowser(bool);
+
+    QStringList builtinSkins() const;
+
+    QMenuBar *menuBar() const;
+
+public slots:
+    void sceneResized(QSize size);
+    void open(const QString&);
+    void openWgt(const QString&);
+    void openQml(const QString&);
+    void openFile();
+    void reload();
+    void takeSnapShot();
+    void toggleRecording();
+    void toggleRecordingWithSelection();
+    void ffmpegFinished(int code);
+    void setSkin(const QString& skinDirectory);
+    void showProxySettings ();
+    void proxySettingsChanged ();
+    void setScaleView();
+    void statusChanged();
+    void setSlowMode(bool);
+    void launch(const QString &);
+
+protected:
+    virtual void keyPressEvent(QKeyEvent *);
+
+    void createMenu(QMenuBar *menu, QMenu *flatmenu);
+
+private slots:
+    void autoStartRecording();
+    void autoStopRecording();
+    void recordFrame();
+    void chooseRecordingOptions();
+    void pickRecordingFile();
+    void setScaleSkin();
+    void setPortrait();
+    void setLandscape();
+    void toggleOrientation();
+    void startNetwork();
+    void toggleFullScreen();
+    void unpackWgt();
+
+private:
+    QString getVideoFileName();
+
+    PreviewDeviceSkin *skin;
+    QSize skinscreensize;
+    QDeclarativeView *canvas;
+    QString currentFileOrUrl;
+    QDeclarativeTimer recordTimer;
+    QString frame_fmt;
+    QImage frame;
+    QList<QImage*> frames;
+    QProcess* frame_stream;
+    QDeclarativeTimer autoStartTimer;
+    QDeclarativeTimer autoStopTimer;
+    QString record_dither;
+    QString record_file;
+    QSize record_outsize;
+    QStringList record_args;
+    int record_rate;
+    int record_autotime;
+    bool devicemode;
+    QAction *recordAction;
+    QString currentSkin;
+    bool scaleSkin;
+    mutable QMenuBar *mb;
+    RecordingDialog *recdlg;
+
+    void senseImageMagick();
+    void senseFfmpeg();
+    QWidget *ffmpegHelpWindow;
+    bool ffmpegAvailable;
+    bool convertAvailable;
+
+    QAction *portraitOrientation;
+    QAction *landscapeOrientation;
+
+    QString m_script;
+    ScriptOptions m_scriptOptions;
+    QDeclarativeTester *tester;
+
+    QNetworkReply *wgtreply;
+    QString wgtdir;
+
+    NetworkAccessManagerFactory *namFactory;
+
+    bool useQmlFileBrowser;
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeViewer::ScriptOptions)
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/tools/qml/qmlruntime.qrc b/tools/qml/qmlruntime.qrc
new file mode 100644
index 0000000..3a9e608
--- /dev/null
+++ b/tools/qml/qmlruntime.qrc
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>content/Browser.qml</file>
+        <file>content/images/up.png</file>
+        <file>content/images/folder.png</file>
+        <file>content/images/titlebar.sci</file>
+        <file>content/images/titlebar.png</file>
+    </qresource>
+</RCC>
diff --git a/tools/qml/recopts.ui b/tools/qml/recopts.ui
new file mode 100644
index 0000000..ce2da30
--- /dev/null
+++ b/tools/qml/recopts.ui
@@ -0,0 +1,513 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>RecordingOptions</class>
+ <widget class="QDialog" name="RecordingOptions">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>316</width>
+    <height>436</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Video options</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>File:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="file"/>
+     </item>
+     <item>
+      <widget class="QToolButton" name="pickfile">
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Size</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="sizeOriginal">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="sizeVGA">
+        <property name="text">
+         <string>VGA</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QRadioButton" name="size720p">
+        <property name="text">
+         <string>720p</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QRadioButton" name="sizeQVGA">
+        <property name="text">
+         <string>QVGA</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="3">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="sizeCustom">
+          <property name="text">
+           <string>Width:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="sizeWidth">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>9999</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Height:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="sizeHeight">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>9999</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::MinimumExpanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::MinimumExpanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="rateOptions">
+     <property name="title">
+      <string>Rate</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="hz60">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>60Hz</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QRadioButton" name="hz50">
+        <property name="text">
+         <string>50Hz</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QRadioButton" name="hz25">
+        <property name="text">
+         <string>25Hz</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="4">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QRadioButton" name="hzCustom">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="hz">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>60</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>100</width>
+            <height>16777215</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string>Hz</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::MinimumExpanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="2">
+       <widget class="QRadioButton" name="hz24">
+        <property name="text">
+         <string>24Hz</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::MinimumExpanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="ffmpegOptions">
+     <property name="title">
+      <string>Profile</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0" colspan="3">
+       <widget class="QComboBox" name="profile"/>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <widget class="QLineEdit" name="args"/>
+      </item>
+      <item row="1" column="2">
+       <widget class="QToolButton" name="ffmpegHelp">
+        <property name="text">
+         <string>Help</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="warning">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>file</tabstop>
+  <tabstop>pickfile</tabstop>
+  <tabstop>sizeOriginal</tabstop>
+  <tabstop>sizeVGA</tabstop>
+  <tabstop>size720p</tabstop>
+  <tabstop>sizeQVGA</tabstop>
+  <tabstop>sizeCustom</tabstop>
+  <tabstop>sizeWidth</tabstop>
+  <tabstop>sizeHeight</tabstop>
+  <tabstop>hz60</tabstop>
+  <tabstop>hz25</tabstop>
+  <tabstop>hz50</tabstop>
+  <tabstop>hz24</tabstop>
+  <tabstop>hzCustom</tabstop>
+  <tabstop>hz</tabstop>
+  <tabstop>profile</tabstop>
+  <tabstop>args</tabstop>
+  <tabstop>ffmpegHelp</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>hzCustom</sender>
+   <signal>clicked()</signal>
+   <receiver>hz</receiver>
+   <slot>setFocus()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>43</x>
+     <y>257</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>129</x>
+     <y>262</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>hz</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>hzCustom</receiver>
+   <slot>toggle()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>143</x>
+     <y>262</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>43</x>
+     <y>257</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>hz</sender>
+   <signal>selectionChanged()</signal>
+   <receiver>hzCustom</receiver>
+   <slot>toggle()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>143</x>
+     <y>262</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>43</x>
+     <y>257</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>RecordingOptions</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>258</x>
+     <y>424</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>60</x>
+     <y>219</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>RecordingOptions</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>258</x>
+     <y>424</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>92</x>
+     <y>219</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>profile</sender>
+   <signal>activated(int)</signal>
+   <receiver>RecordingOptions</receiver>
+   <slot>pickProfile(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>92</x>
+     <y>329</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>48</x>
+     <y>194</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>args</sender>
+   <signal>textEdited(QString)</signal>
+   <receiver>RecordingOptions</receiver>
+   <slot>storeCustomArgs(QString)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>128</x>
+     <y>357</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>102</x>
+     <y>189</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>sizeWidth</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>sizeCustom</receiver>
+   <slot>toggle()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>108</x>
+     <y>133</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>48</x>
+     <y>133</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>sizeHeight</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>sizeCustom</receiver>
+   <slot>toggle()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>212</x>
+     <y>133</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>64</x>
+     <y>129</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+ <slots>
+  <signal>filePicked(QString)</signal>
+  <signal>argumentsPicked(QString)</signal>
+  <slot>pickFile()</slot>
+  <slot>pickProfile(int)</slot>
+  <slot>storeCustomArgs(QString)</slot>
+ </slots>
+</ui>
diff --git a/tools/qmlviewer/content/Browser.qml b/tools/qmlviewer/content/Browser.qml
deleted file mode 100644
index 35120bc..0000000
--- a/tools/qmlviewer/content/Browser.qml
+++ /dev/null
@@ -1,243 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: root
-    property bool keyPressed: false
-    property var folders: folders1
-    property var view: view1
-    width: 320
-    height: 480
-    color: palette.window
-
-    FolderListModel {
-        id: folders1
-        nameFilters: [ "*.qml" ]
-        folder: qmlViewerFolder
-    }
-    FolderListModel {
-        id: folders2
-        nameFilters: [ "*.qml" ]
-        folder: qmlViewerFolder
-    }
-
-    SystemPalette { id: palette }
-
-    Script {
-        function down(path) {
-            if (folders == folders1) {
-                view = view2
-                folders = folders2;
-                view1.state = "exitLeft";
-            } else {
-                view = view1
-                folders = folders1;
-                view2.state = "exitLeft";
-            }
-            view.x = root.width;
-            view.state = "current";
-            view.focus = true;
-            folders.folder = path;
-        }
-        function up() {
-            var path = folders.parentFolder;
-            if (folders == folders1) {
-                view = view2
-                folders = folders2;
-                view1.state = "exitRight";
-            } else {
-                view = view1
-                folders = folders1;
-                view2.state = "exitRight";
-            }
-            view.x = -root.width;
-            view.state = "current";
-            view.focus = true;
-            folders.folder = path;
-        }
-    }
-
-    Component {
-        id: folderDelegate
-        Rectangle {
-            id: wrapper
-            function launch() {
-                if (folders.isFolder(index)) {
-                    down(filePath);
-                } else {
-                    qmlViewer.launch(filePath);
-                }
-            }
-            width: root.width
-            height: 52
-            color: "transparent"
-            Rectangle {
-                id: highlight; visible: false
-                anchors.fill: parent
-                gradient: Gradient {
-                    GradientStop { id: t1; position: 0.0; color: palette.highlight }
-                    GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
-                }
-            }
-            Item {
-                width: 48; height: 48
-                Image { source: "images/folder.png"; anchors.centerIn: parent; visible: folders.isFolder(index)}
-            }
-            Text {
-                id: nameText
-                anchors.fill: parent; verticalAlignment: Text.AlignVCenter
-                text: fileName
-                anchors.leftMargin: 54
-                font.pixelSize: 32
-                color: (wrapper.ListView.isCurrentItem && root.keyPressed) ? palette.highlightedText : palette.windowText
-            }
-            MouseArea {
-                id: mouseRegion
-                anchors.fill: parent
-                onClicked: { launch() }
-            }
-            states: [
-                State {
-                    name: "pressed"
-                    when: mouseRegion.pressed
-                    PropertyChanges { target: highlight; visible: true }
-                    PropertyChanges { target: nameText; color: palette.highlightedText }
-                }
-            ]
-        }
-    }
-
-    ListView {
-        id: view1
-        anchors.top: titleBar.bottom
-        anchors.bottom: parent.bottom
-        x: 0
-        width: parent.width
-        model: folders1
-        delegate: folderDelegate
-        highlight: Rectangle { color: palette.highlight; visible: root.keyPressed && view1.count != 0 }
-        highlightMoveSpeed: 1000
-        pressDelay: 100
-        focus: true
-        state: "current"
-        states: [
-            State {
-                name: "current"
-                PropertyChanges { target: view1; x: 0 }
-            },
-            State {
-                name: "exitLeft"
-                PropertyChanges { target: view1; x: -root.width }
-            },
-            State {
-                name: "exitRight"
-                PropertyChanges { target: view1; x: root.width }
-            }
-        ]
-        transitions: [
-            Transition {
-                to: "current"
-                SequentialAnimation {
-                    NumberAnimation { matchProperties: "x"; duration: 250 }
-                }
-            },
-            Transition {
-                NumberAnimation { matchProperties: "x"; duration: 250 }
-                NumberAnimation { matchProperties: "x"; duration: 250 }
-            }
-        ]
-        Keys.onPressed: { root.keyPressed = true; }
-    }
-
-    ListView {
-        id: view2
-        anchors.top: titleBar.bottom
-        anchors.bottom: parent.bottom
-        x: parent.width
-        width: parent.width
-        model: folders2
-        delegate: folderDelegate
-        highlight: Rectangle { color: palette.highlight; visible: root.keyPressed && view2.count != 0 }
-        highlightMoveSpeed: 1000
-        pressDelay: 100
-        states: [
-            State {
-                name: "current"
-                PropertyChanges { target: view2; x: 0 }
-            },
-            State {
-                name: "exitLeft"
-                PropertyChanges { target: view2; x: -root.width }
-            },
-            State {
-                name: "exitRight"
-                PropertyChanges { target: view2; x: root.width }
-            }
-        ]
-        transitions: [
-            Transition {
-                to: "current"
-                SequentialAnimation {
-                    NumberAnimation { matchProperties: "x"; duration: 250 }
-                }
-            },
-            Transition {
-                NumberAnimation { matchProperties: "x"; duration: 250 }
-            }
-        ]
-        Keys.onPressed: { root.keyPressed = true; }
-    }
-
-    Keys.onPressed: {
-        root.keyPressed = true;
-        if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) {
-            view.currentItem.launch();
-            event.accepted = true;
-        } else if (event.key == Qt.Key_Left) {
-            up();
-        }
-    }
-
-    BorderImage {
-        source: "images/titlebar.sci";
-        width: parent.width;
-        height: 52
-        y: -7
-        id: titleBar
-
-        Rectangle {
-            id: upButton
-            width: 48
-            height: titleBar.height - 7
-            color: "transparent"
-
-            Image { anchors.centerIn: parent; source: "images/up.png" }
-            MouseArea { id: upRegion; anchors.centerIn: parent
-                width: 56
-                height: 56
-                onClicked: if (folders.parentFolder != "") up()
-            }
-            states: [
-                State {
-                    name: "pressed"
-                    when: upRegion.pressed
-                    PropertyChanges { target: upButton; color: palette.highlight }
-                }
-            ]
-        }
-        Rectangle {
-            color: "gray"
-            x: 48
-            width: 1
-            height: 44
-        }
-
-        Text {
-            anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
-            anchors.leftMargin: 4; anchors.rightMargin: 4
-            text: folders.folder
-            color: "white"
-            elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter
-            font.pixelSize: 32
-        }
-    }
-}
diff --git a/tools/qmlviewer/content/images/folder.png b/tools/qmlviewer/content/images/folder.png
deleted file mode 100644
index e53e2ad..0000000
Binary files a/tools/qmlviewer/content/images/folder.png and /dev/null differ
diff --git a/tools/qmlviewer/content/images/titlebar.png b/tools/qmlviewer/content/images/titlebar.png
deleted file mode 100644
index 51c9008..0000000
Binary files a/tools/qmlviewer/content/images/titlebar.png and /dev/null differ
diff --git a/tools/qmlviewer/content/images/titlebar.sci b/tools/qmlviewer/content/images/titlebar.sci
deleted file mode 100644
index 0418d94..0000000
--- a/tools/qmlviewer/content/images/titlebar.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 12
-border.bottom: 12
-border.right: 10
-source: titlebar.png
diff --git a/tools/qmlviewer/content/images/up.png b/tools/qmlviewer/content/images/up.png
deleted file mode 100644
index b05f802..0000000
Binary files a/tools/qmlviewer/content/images/up.png and /dev/null differ
diff --git a/tools/qmlviewer/deviceorientation.cpp b/tools/qmlviewer/deviceorientation.cpp
deleted file mode 100644
index e7c70d5..0000000
--- a/tools/qmlviewer/deviceorientation.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "deviceorientation.h"
-
-QT_USE_NAMESPACE
-
-class DefaultDeviceOrientation : public DeviceOrientation
-{
-    Q_OBJECT
-public:
-    DefaultDeviceOrientation() : DeviceOrientation(), m_orientation(DeviceOrientation::Portrait) {}
-
-    Orientation orientation() const {
-        return m_orientation;
-    }
-
-    void setOrientation(Orientation o) {
-        if (o != m_orientation) {
-            m_orientation = o;
-            emit orientationChanged();
-        }
-    }
-
-    Orientation m_orientation;
-};
-
-DeviceOrientation* DeviceOrientation::instance()
-{
-    static DefaultDeviceOrientation *o = 0;
-    if (!o)
-        o = new DefaultDeviceOrientation;
-    return o;
-}
-
-#include "deviceorientation.moc"
-
diff --git a/tools/qmlviewer/deviceorientation.h b/tools/qmlviewer/deviceorientation.h
deleted file mode 100644
index c8125cd..0000000
--- a/tools/qmlviewer/deviceorientation.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ORIENTATION_H
-#define ORIENTATION_H
-
-#include <QObject>
-
-QT_BEGIN_NAMESPACE
-
-class DeviceOrientationPrivate;
-class DeviceOrientation : public QObject
-{
-    Q_OBJECT
-public:
-    enum Orientation { UnknownOrientation, Portrait, Landscape };
-    virtual Orientation orientation() const = 0;
-    virtual void setOrientation(Orientation) = 0;
-
-    static DeviceOrientation *instance();
-
-signals:
-    void orientationChanged();
-
-protected:
-    DeviceOrientation() {}
-
-private:
-    DeviceOrientationPrivate *d_ptr;
-    friend class DeviceOrientationPrivate;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qmlviewer/deviceorientation_maemo.cpp b/tools/qmlviewer/deviceorientation_maemo.cpp
deleted file mode 100644
index fa2c6e5..0000000
--- a/tools/qmlviewer/deviceorientation_maemo.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "deviceorientation.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-class MaemoOrientation : public DeviceOrientation
-{
-    Q_OBJECT
-public:
-    MaemoOrientation()
-        : DeviceOrientation(),m_current(Portrait), m_lastSeen(Portrait), m_lastSeenCount(0)
-    {
-        startTimer(100);
-    }
-
-    Orientation orientation() const {
-        return m_current;
-    }
-
-    void setOrientation(Orientation orient) {
-        //XXX maybe better to just ignore
-        if (orient != m_current) {
-            m_current = orient;
-            emit orientationChanged();
-        }
-    }
-
-
-protected:
-    virtual void timerEvent(QTimerEvent *)
-    {
-        Orientation c = get();
-
-        if (c == m_lastSeen) {
-            m_lastSeenCount++;
-        } else {
-            m_lastSeenCount = 0;
-            m_lastSeen = c;
-        }
-
-        if (m_lastSeen != UnknownOrientation && m_lastSeen != m_current && m_lastSeenCount > 4) {
-            m_current = m_lastSeen;
-            emit orientationChanged();
-            printf("%d\n", m_current);
-        }
-    }
-
-signals:
-    void changed();
-
-private:
-    Orientation m_current;
-    Orientation m_lastSeen;
-    int m_lastSeenCount;
-
-    Orientation get()
-    {
-        Orientation o = UnknownOrientation;
-
-        int ax, ay, az;
-
-        read(&ax, &ay, &az);
-
-        if (abs(az) > 850) {
-            o = UnknownOrientation;
-        } else if (ax < -750) {
-            o = Portrait;
-        } else if (ay < -750) {
-            o = Landscape;
-        }
-
-        return o;
-    }
-
-    int read(int *ax,int *ay,int *az)
-    {
-        static const char *accel_filename = "/sys/class/i2c-adapter/i2c-3/3-001d/coord";
-
-        FILE *fd;
-        int rs;
-        fd = fopen(accel_filename, "r");
-        if(fd==NULL){ printf("liqaccel, cannot open for reading\n"); return -1;}
-        rs=fscanf((FILE*) fd,"%i %i %i",ax,ay,az);
-        fclose(fd);
-        if(rs != 3){ printf("liqaccel, cannot read information\n"); return -2;}
-        return 0;
-    }
-};
-
-
-DeviceOrientation* DeviceOrientation::instance()
-{
-    static MaemoOrientation *o = 0;
-    if (!o)
-        o = new MaemoOrientation;
-    return o;
-}
-
-#include "deviceorientation_maemo.moc"
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
deleted file mode 100644
index 0f51da2..0000000
--- a/tools/qmlviewer/main.cpp
+++ /dev/null
@@ -1,356 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qml.h"
-#include "qmlviewer.h"
-#include <QWidget>
-#include <QDir>
-#include <QApplication>
-#include <QTranslator>
-#include <QDebug>
-#include "qfxtester.h"
-#include "qmlfolderlistmodel.h"
-
-QT_USE_NAMESPACE
-
-#if defined (Q_OS_SYMBIAN)
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-void myMessageOutput(QtMsgType type, const char *msg)
-{
-    static int fd = -1;
-    if (fd == -1)
-        fd = ::open("E:\\qmlviewer.log", O_WRONLY | O_CREAT);
-
-    ::write(fd, msg, strlen(msg));
-    ::write(fd, "\n", 1);
-    ::fsync(fd);
-
-    switch (type) {
-    case QtFatalMsg:
-        abort();
-    }
-}
-#endif
-
-void usage()
-{
-    qWarning("Usage: qmlviewer [options] <filename>");
-    qWarning(" ");
-    qWarning(" options:");
-    qWarning("  -v, -version ............................. display version");
-    qWarning("  -frameless ............................... run with no window frame");
-    qWarning("  -maximized................................ run maximized");
-    qWarning("  -fullscreen............................... run fullscreen");
-    qWarning("  -stayontop................................ keep viewer window on top");
-    qWarning("  -skin <qvfbskindir> ...................... run with a skin window frame");
-    qWarning("                                             \"list\" for a list of built-ins");
-    qWarning("  -resizeview .............................. resize the view, not the skin");
-    qWarning("  -qmlbrowser .............................. use a QML-based file browser");
-    qWarning("  -recordfile <output> ..................... set video recording file");
-    qWarning("                                              - ImageMagick 'convert' for GIF)");
-    qWarning("                                              - png file for raw frames");
-    qWarning("                                              - 'ffmpeg' for other formats");
-    qWarning("  -recorddither ordered|threshold|floyd .... set GIF dither recording mode");
-    qWarning("  -recordrate <fps> ........................ set recording frame rate");
-    qWarning("  -record arg .............................. add a recording process argument");
-    qWarning("  -autorecord [from-]<tomilliseconds> ...... set recording to start and stop");
-    qWarning("  -devicekeys .............................. use numeric keys (see F1)");
-    qWarning("  -dragthreshold <size> .................... set mouse drag threshold size");
-    qWarning("  -netcache <size> ......................... set disk cache to size bytes");
-    qWarning("  -translation <translationfile> ........... set the language to run in");
-    qWarning("  -L <directory> ........................... prepend to the library search path");
-    qWarning("  -opengl .................................. use a QGLWidget for the viewport");
-    qWarning("  -script <path> ........................... set the script to use");
-    qWarning("  -scriptopts <options>|help ............... set the script options to use");
-
-    qWarning(" ");
-    qWarning(" Press F1 for interactive help");
-    exit(1);
-}
-
-void scriptOptsUsage()
-{
-    qWarning("Usage: qmlviewer -scriptopts <option>[,<option>...] ...");
-    qWarning(" options:");
-    qWarning("  record ................................... record a new script");
-    qWarning("  play ..................................... playback an existing script");
-    qWarning("  testimages ............................... record images or compare images on playback");
-    qWarning("  testerror ................................ test 'error' property of root item on playback");
-    qWarning("  exitoncomplete ........................... cleanly exit the viewer on script completion");
-    qWarning("  exitonfailure ............................ immediately exit the viewer on script failure");
-    qWarning("  saveonexit ............................... save recording on viewer exit");
-    qWarning(" ");
-    qWarning(" One of record, play or both must be specified.");
-    exit(1);
-}
-
-int main(int argc, char ** argv)
-{
-#if defined (Q_OS_SYMBIAN)
-    qInstallMsgHandler(myMessageOutput);
-#endif
-
-#if defined (Q_WS_X11)
-    //### default to using raster graphics backend for now
-    bool gsSpecified = false;
-    for (int i = 0; i < argc; ++i) {
-        QString arg = argv[i];
-        if (arg == "-graphicssystem") {
-            gsSpecified = true;
-            break;
-        }
-    }
-
-    if (!gsSpecified)
-        QApplication::setGraphicsSystem("raster");
-#endif
-
-    QApplication app(argc, argv);
-    app.setApplicationName("viewer");
-    app.setOrganizationName("Nokia");
-    app.setOrganizationDomain("nokia.com");
-
-    QmlViewer::registerTypes();
-    QmlGraphicsTester::registerTypes();
-    QmlFolderListModel::registerTypes();
-
-    bool frameless = false;
-    bool resizeview = false;
-    QString fileName;
-    double fps = 0;
-    int autorecord_from = 0;
-    int autorecord_to = 0;
-    QString dither = "none";
-    QString recordfile;
-    QStringList recordargs;
-    QStringList libraries;
-    QString skin;
-    QString script;
-    QString scriptopts;
-    bool runScript = false;
-    bool devkeys = false;
-    int cache = 0;
-    QString translationFile;
-    bool useGL = false;
-    bool fullScreen = false;
-    bool stayOnTop = false;
-    bool maximized = false;
-    bool useNativeFileBrowser = true;
-
-#if defined(Q_OS_SYMBIAN)
-    maximized = true;
-    useNativeFileBrowser = false;
-#endif
-
-    for (int i = 1; i < argc; ++i) {
-        bool lastArg = (i == argc - 1);
-        QString arg = argv[i];
-        if (arg == "-frameless") {
-            frameless = true;
-        } else if (arg == "-maximized") {
-            maximized = true;
-        } else if (arg == "-fullscreen") {
-            fullScreen = true;
-        } else if (arg == "-stayontop") {
-            stayOnTop = true;
-        } else if (arg == "-skin") {
-            if (lastArg) usage();
-            skin = QString(argv[++i]);
-        } else if (arg == "-resizeview") {
-            resizeview = true;
-        } else if (arg == "-netcache") {
-            if (lastArg) usage();
-            cache = QString(argv[++i]).toInt();
-        } else if (arg == "-recordrate") {
-            if (lastArg) usage();
-            fps = QString(argv[++i]).toDouble();
-        } else if (arg == "-recordfile") {
-            if (lastArg) usage();
-            recordfile = QString(argv[++i]);
-        } else if (arg == "-record") {
-            if (lastArg) usage();
-            recordargs << QString(argv[++i]);
-        } else if (arg == "-recorddither") {
-            if (lastArg) usage();
-            dither = QString(argv[++i]);
-        } else if (arg == "-autorecord") {
-            if (lastArg) usage();
-            QString range = QString(argv[++i]);
-            int dash = range.indexOf('-');
-            if (dash > 0)
-                autorecord_from = range.left(dash).toInt();
-            autorecord_to = range.mid(dash+1).toInt();
-        } else if (arg == "-devicekeys") {
-            devkeys = true;
-        } else if (arg == "-dragthreshold") {
-            if (lastArg) usage();
-            app.setStartDragDistance(QString(argv[++i]).toInt());
-        } else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) {
-            fprintf(stderr, "Qt Declarative UI Viewer version %s\n", QT_VERSION_STR);
-            return 0;
-        } else if (arg == "-translation") {
-            if (lastArg) usage();
-            translationFile = argv[++i];
-        } else if (arg == "-opengl") {
-            useGL = true;
-        } else if (arg == "-qmlbrowser") {
-            useNativeFileBrowser = false;
-        } else if (arg == "-L") {
-            if (lastArg) usage();
-            libraries << QString(argv[++i]);
-        } else if (arg == "-script") {
-            if (lastArg) usage();
-            script = QString(argv[++i]);
-        } else if (arg == "-scriptopts") {
-            if (lastArg) usage();
-            scriptopts = QString(argv[++i]);
-        } else if (arg == "-savescript") {
-            if (lastArg) usage();
-            script = QString(argv[++i]);
-            runScript = false;
-        } else if (arg == "-playscript") {
-            if (lastArg) usage();
-            script = QString(argv[++i]);
-            runScript = true;
-        } else if (arg[0] != '-') {
-            fileName = arg;
-        } else if (1 || arg == "-help") {
-            usage();
-        }
-    }
-
-    QTranslator qmlTranslator;
-    if (!translationFile.isEmpty()) {
-        qmlTranslator.load(translationFile);
-        app.installTranslator(&qmlTranslator);
-    }
-
-    Qt::WFlags wflags = (frameless ? Qt::FramelessWindowHint : Qt::Widget);
-    if (stayOnTop)
-        wflags |= Qt::WindowStaysOnTopHint;
-
-    QmlViewer viewer(0, wflags);
-    if (!scriptopts.isEmpty()) {
-        QStringList options = 
-            scriptopts.split(QLatin1Char(','), QString::SkipEmptyParts);
-
-        QmlViewer::ScriptOptions scriptOptions = 0;
-        for (int i = 0; i < options.count(); ++i) {
-            const QString &option = options.at(i);
-            if (option == QLatin1String("help")) {
-                scriptOptsUsage();
-            } else if (option == QLatin1String("play")) {
-                scriptOptions |= QmlViewer::Play;
-            } else if (option == QLatin1String("record")) {
-                scriptOptions |= QmlViewer::Record;
-            } else if (option == QLatin1String("testimages")) {
-                scriptOptions |= QmlViewer::TestImages;
-            } else if (option == QLatin1String("testerror")) {
-                scriptOptions |= QmlViewer::TestErrorProperty;
-            } else if (option == QLatin1String("exitoncomplete")) {
-                scriptOptions |= QmlViewer::ExitOnComplete;
-            } else if (option == QLatin1String("exitonfailure")) {
-                scriptOptions |= QmlViewer::ExitOnFailure;
-            } else if (option == QLatin1String("saveonexit")) {
-                scriptOptions |= QmlViewer::SaveOnExit;
-            } else {
-                scriptOptsUsage();
-            }
-        }
-
-        if (script.isEmpty())
-            usage();
-
-        if (!(scriptOptions & QmlViewer::Record) && !(scriptOptions & QmlViewer::Play))
-            scriptOptsUsage();
-        viewer.setScriptOptions(scriptOptions);
-        viewer.setScript(script);
-    }  else if (!script.isEmpty()) {
-        usage();
-    }
-
-    foreach (QString lib, libraries)
-        viewer.addLibraryPath(lib);
-    viewer.setNetworkCacheSize(cache);
-    viewer.setRecordFile(recordfile);
-    if (resizeview)
-        viewer.setScaleView();
-    if (fps>0)
-        viewer.setRecordRate(fps);
-    if (autorecord_to)
-        viewer.setAutoRecord(autorecord_from,autorecord_to);
-    if (!skin.isEmpty()) {
-        if (skin == "list") {
-            foreach (QString s, viewer.builtinSkins())
-                qWarning(s.toUtf8());
-            exit(0);
-        } else {
-            viewer.setSkin(skin);
-        }
-    }
-    if (devkeys)
-        viewer.setDeviceKeys(true);
-    viewer.setRecordDither(dither);
-    if (recordargs.count())
-        viewer.setRecordArgs(recordargs);
-
-    viewer.setUseNativeFileBrowser(useNativeFileBrowser);
-    if (fullScreen && maximized)
-        qWarning() << "Both -fullscreen and -maximized specified. Using -fullscreen.";
-    if (!fileName.isEmpty()) {
-        viewer.open(fileName);
-        fullScreen ? viewer.showFullScreen() : maximized ? viewer.showMaximized() : viewer.show();
-    } else {
-        if (!useNativeFileBrowser)
-            viewer.openFile();
-        fullScreen ? viewer.showFullScreen() : maximized ? viewer.showMaximized() : viewer.show();
-        if (useNativeFileBrowser)
-            viewer.openFile();
-    }
-    viewer.setUseGL(useGL);
-    viewer.raise();
-
-    return app.exec();
-}
diff --git a/tools/qmlviewer/proxysettings.cpp b/tools/qmlviewer/proxysettings.cpp
deleted file mode 100644
index 3255e42..0000000
--- a/tools/qmlviewer/proxysettings.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QIntValidator>
-#include <QSettings>
-
-#include "proxysettings.h"
-
-QT_BEGIN_NAMESPACE
-
-ProxySettings::ProxySettings (QWidget * parent)
-        : QDialog (parent), Ui::ProxySettings()
-{
-    setupUi (this);
-
-    proxyServerEdit->setInputMask ("000.000.000.000;_");
-    QIntValidator *validator = new QIntValidator (0, 9999, this);
-    proxyPortEdit->setValidator (validator);
-
-    QSettings settings;
-    proxyCheckBox->setChecked (settings.value ("http_proxy/use", 0).toBool ());
-    proxyServerEdit->insert (settings.value ("http_proxy/hostname", "").toString ());
-    proxyPortEdit->insert (settings.value ("http_proxy/port", "80").toString ());
-    usernameEdit->insert (settings.value ("http_proxy/username", "").toString ());
-    passwordEdit->insert (settings.value ("http_proxy/password", "").toString ());
-}
-
-ProxySettings::~ProxySettings()
-{
-}
-
-void ProxySettings::accept ()
-{
-    QSettings settings;
-
-    settings.setValue ("http_proxy/use", proxyCheckBox->isChecked ());
-    settings.setValue ("http_proxy/hostname", proxyServerEdit->text ());
-    settings.setValue ("http_proxy/port", proxyPortEdit->text ());
-    settings.setValue ("http_proxy/username", usernameEdit->text ());
-    settings.setValue ("http_proxy/password", passwordEdit->text ());
-
-    QDialog::accept ();
-}
-
-QNetworkProxy ProxySettings::httpProxy ()
-{
-    QSettings settings;
-    QNetworkProxy proxy;
-
-    bool proxyInUse = settings.value ("http_proxy/use", 0).toBool ();
-    if (proxyInUse) {
-        proxy.setType (QNetworkProxy::HttpProxy);
-        proxy.setHostName (settings.value ("http_proxy/hostname", "").toString ());// "192.168.220.5"
-        proxy.setPort (settings.value ("http_proxy/port", 80).toInt ());  // 8080
-        proxy.setUser (settings.value ("http_proxy/username", "").toString ());
-        proxy.setPassword (settings.value ("http_proxy/password", "").toString ());
-        //QNetworkProxy::setApplicationProxy (proxy);
-    }
-    else {
-        proxy.setType (QNetworkProxy::NoProxy);
-    }
-    return proxy;
-}
-
-bool ProxySettings::httpProxyInUse()
-{
-    QSettings settings;
-    return settings.value ("http_proxy/use", 0).toBool ();
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qmlviewer/proxysettings.h b/tools/qmlviewer/proxysettings.h
deleted file mode 100644
index 325929a..0000000
--- a/tools/qmlviewer/proxysettings.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef PROXYSETTINGS_H
-#define PROXYSETTINGS_H
-
-#include <QDialog>
-#include <QNetworkProxy>
-#include "ui_proxysettings.h"
-
-QT_BEGIN_NAMESPACE
-/**
-*/
-class ProxySettings : public QDialog, public Ui::ProxySettings
-{
-
-Q_OBJECT
-
-public:
-    ProxySettings(QWidget * parent = 0);
-
-    ~ProxySettings();
-
-    static QNetworkProxy httpProxy ();
-    static bool httpProxyInUse ();
-
-public slots:
-    virtual void accept ();
-};
-
-QT_END_NAMESPACE
-
-#endif // PROXYSETTINGS_H
diff --git a/tools/qmlviewer/proxysettings.ui b/tools/qmlviewer/proxysettings.ui
deleted file mode 100644
index 84e39fe..0000000
--- a/tools/qmlviewer/proxysettings.ui
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProxySettings</class>
- <widget class="QDialog" name="ProxySettings">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>318</width>
-    <height>199</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
-    <widget class="QCheckBox" name="proxyCheckBox">
-     <property name="text">
-      <string>Use http proxy</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="serverAddressLabel">
-     <property name="text">
-      <string>Server Address:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QLineEdit" name="proxyServerEdit"/>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Port:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="proxyPortEdit"/>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="usernameLabel">
-     <property name="text">
-      <string>Username:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QLineEdit" name="usernameEdit"/>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="passwordLabel">
-     <property name="text">
-      <string>Password:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QLineEdit" name="passwordEdit">
-     <property name="echoMode">
-      <enum>QLineEdit::Password</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ProxySettings</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>ProxySettings</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/tools/qmlviewer/qfxtester.cpp b/tools/qmlviewer/qfxtester.cpp
deleted file mode 100644
index b2e4054..0000000
--- a/tools/qmlviewer/qfxtester.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qfxtester.h>
-#include <QDebug>
-#include <QApplication>
-#include <qmlview.h>
-#include <QFile>
-#include <QmlComponent>
-#include <QDir>
-#include <QCryptographicHash>
-#include <private/qabstractanimation_p.h>
-#include <private/qmlgraphicsitem_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-QmlGraphicsTester::QmlGraphicsTester(const QString &script, QmlViewer::ScriptOptions opts, 
-                     QmlView *parent)
-: QAbstractAnimation(parent), m_script(script), m_view(parent), filterEvents(true), options(opts), 
-  testscript(0), hasCompleted(false), hasFailed(false)
-{
-    parent->viewport()->installEventFilter(this);
-    parent->installEventFilter(this);
-    QUnifiedTimer::instance()->setConsistentTiming(true);
-    if (options & QmlViewer::Play)
-        this->run();
-    start();
-}
-
-QmlGraphicsTester::~QmlGraphicsTester()
-{
-    if (!hasFailed && 
-        options & QmlViewer::Record && 
-        options & QmlViewer::SaveOnExit)
-        save();
-}
-
-int QmlGraphicsTester::duration() const
-{
-    return -1;
-}
-
-void QmlGraphicsTester::addMouseEvent(Destination dest, QMouseEvent *me)
-{
-    MouseEvent e(me);
-    e.destination = dest;
-    m_mouseEvents << e;
-}
-
-void QmlGraphicsTester::addKeyEvent(Destination dest, QKeyEvent *ke)
-{
-    KeyEvent e(ke);
-    e.destination = dest;
-    m_keyEvents << e;
-}
-
-bool QmlGraphicsTester::eventFilter(QObject *o, QEvent *e)
-{
-    if (!filterEvents)
-        return false;
-
-    Destination destination;
-    if (o == m_view) {
-        destination = View;
-    } else if (o == m_view->viewport()) {
-        destination = ViewPort;
-    } else {
-        return false;
-    }
-
-    switch (e->type()) {
-        case QEvent::KeyPress:
-        case QEvent::KeyRelease:
-            addKeyEvent(destination, (QKeyEvent *)e);
-            return true;
-        case QEvent::MouseButtonPress:
-        case QEvent::MouseButtonRelease:
-        case QEvent::MouseMove:
-        case QEvent::MouseButtonDblClick:
-            addMouseEvent(destination, (QMouseEvent *)e);
-            return true;
-        default:
-            break;
-    }
-    return false;
-}
-
-void QmlGraphicsTester::executefailure()
-{
-    hasFailed = true;
-
-    if (options & QmlViewer::ExitOnFailure)
-        exit(-1);
-}
-
-void QmlGraphicsTester::imagefailure()
-{
-    hasFailed = true;
-
-    if (options & QmlViewer::ExitOnFailure)
-        exit(-1);
-}
-
-void QmlGraphicsTester::complete()
-{
-    if ((options & QmlViewer::TestErrorProperty) && !hasFailed) {
-        QString e = m_view->rootObject()->property("error").toString();
-        if (!e.isEmpty()) {
-            qWarning() << "Test failed:" << e;
-            hasFailed = true;
-        }
-    }
-    if (options & QmlViewer::ExitOnComplete) 
-        QApplication::exit(hasFailed?-1:0);
-
-    if (hasCompleted)
-        return;
-    hasCompleted = true;
-
-    if (options & QmlViewer::Play)
-        qWarning("Script playback complete");
-}
-
-void QmlGraphicsTester::run()
-{
-    QmlComponent c(m_view->engine(), m_script + QLatin1String(".qml"));
-
-    testscript = qobject_cast<QmlGraphicsVisualTest *>(c.create());
-    if (testscript) testscript->setParent(this);
-    else { executefailure(); exit(-1); }
-    testscriptidx = 0;
-}
-
-void QmlGraphicsTester::save()
-{
-    QString filename = m_script + QLatin1String(".qml");
-    QFileInfo filenameInfo(filename);
-    QDir saveDir = filenameInfo.absoluteDir();
-    saveDir.mkpath(".");
-
-    QFile file(filename);
-    file.open(QIODevice::WriteOnly);
-    QTextStream ts(&file);
-
-    ts << "import Qt.VisualTest 4.6\n\n";
-    ts << "VisualTest {\n";
-
-    int imgCount = 0;
-    QList<KeyEvent> keyevents = m_savedKeyEvents;
-    QList<MouseEvent> mouseevents = m_savedMouseEvents;
-    for (int ii = 0; ii < m_savedFrameEvents.count(); ++ii) {
-        const FrameEvent &fe = m_savedFrameEvents.at(ii);
-        ts << "    Frame {\n";
-        ts << "        msec: " << fe.msec << "\n";
-        if (!fe.hash.isEmpty()) {
-            ts << "        hash: \"" << fe.hash.toHex() << "\"\n";
-        } else if (!fe.image.isNull()) {
-            QString filename = filenameInfo.baseName() + "." + QString::number(imgCount) + ".png";
-            fe.image.save(m_script + "." + QString::number(imgCount) + ".png");
-            imgCount++;
-            ts << "        image: \"" << filename << "\"\n";
-        }
-        ts << "    }\n";
-
-        while (!mouseevents.isEmpty() && 
-               mouseevents.first().msec == fe.msec) {
-            MouseEvent me = mouseevents.takeFirst();
-
-            ts << "    Mouse {\n";
-            ts << "        type: " << me.type << "\n";
-            ts << "        button: " << me.button << "\n";
-            ts << "        buttons: " << me.buttons << "\n";
-            ts << "        x: " << me.pos.x() << "; y: " << me.pos.y() << "\n";
-            ts << "        modifiers: " << me.modifiers << "\n";
-            if (me.destination == ViewPort)
-                ts << "        sendToViewport: true\n";
-            ts << "    }\n";
-        }
-
-        while (!keyevents.isEmpty() &&
-               keyevents.first().msec == fe.msec) {
-            KeyEvent ke = keyevents.takeFirst();
-
-            ts << "    Key {\n";
-            ts << "        type: " << ke.type << "\n";
-            ts << "        key: " << ke.key << "\n";
-            ts << "        modifiers: " << ke.modifiers << "\n";
-            ts << "        text: \"" << ke.text.toUtf8().toHex() << "\"\n";
-            ts << "        autorep: " << (ke.autorep?"true":"false") << "\n";
-            ts << "        count: " << ke.count << "\n";
-            if (ke.destination == ViewPort)
-                ts << "        sendToViewport: true\n";
-            ts << "    }\n";
-        }
-    }
-
-    ts << "}\n";
-    file.close();
-}
-
-void QmlGraphicsTester::updateCurrentTime(int msec)
-{
-    QmlGraphicsItemPrivate::setConsistentTime(msec);
-
-    QImage img(m_view->width(), m_view->height(), QImage::Format_RGB32);
-
-    if (options & QmlViewer::TestImages) {
-        img.fill(qRgb(255,255,255));
-        QPainter p(&img);
-        m_view->render(&p);
-    }
-
-    FrameEvent fe;
-    fe.msec = msec;
-    if (msec == 0 || !(options & QmlViewer::TestImages)) {
-        // Skip first frame, skip if not doing images
-    } else if (0 == (m_savedFrameEvents.count() % 60)) {
-        fe.image = img;
-    } else {
-        QCryptographicHash hash(QCryptographicHash::Md5);
-        hash.addData((const char *)img.bits(), img.bytesPerLine() * img.height());
-        fe.hash = hash.result();
-    }
-    m_savedFrameEvents.append(fe);
-
-    // Deliver mouse events
-    filterEvents = false;
-
-    if (!testscript) {
-        for (int ii = 0; ii < m_mouseEvents.count(); ++ii) {
-            MouseEvent &me = m_mouseEvents[ii];
-            me.msec = msec;
-            QMouseEvent event(me.type, me.pos, me.button, me.buttons, me.modifiers);
-
-            if (me.destination == View) {
-                QCoreApplication::sendEvent(m_view, &event);
-            } else {
-                QCoreApplication::sendEvent(m_view->viewport(), &event);
-            }
-        }
-
-        for (int ii = 0; ii < m_keyEvents.count(); ++ii) {
-            KeyEvent &ke = m_keyEvents[ii];
-            ke.msec = msec;
-            QKeyEvent event(ke.type, ke.key, ke.modifiers, ke.text, ke.autorep, ke.count);
-
-            if (ke.destination == View) {
-                QCoreApplication::sendEvent(m_view, &event);
-            } else {
-                QCoreApplication::sendEvent(m_view->viewport(), &event);
-            }
-        }
-        m_savedMouseEvents.append(m_mouseEvents);
-        m_savedKeyEvents.append(m_keyEvents);
-    }
-
-    m_mouseEvents.clear();
-    m_keyEvents.clear();
-
-    // Advance test script
-    static int imgCount = 0;
-    while (testscript && testscript->count() > testscriptidx) {
-
-        QObject *event = testscript->event(testscriptidx);
-
-        if (QmlGraphicsVisualTestFrame *frame = qobject_cast<QmlGraphicsVisualTestFrame *>(event)) {
-            if (frame->msec() < msec) {
-                if (options & QmlViewer::TestImages && !(options & QmlViewer::Record)) {
-                    qWarning() << "QmlGraphicsTester: Extra frame.  Seen:" 
-                               << msec << "Expected:" << frame->msec();
-                    imagefailure();
-                }
-            } else if (frame->msec() == msec) {
-                if (!frame->hash().isEmpty() && frame->hash().toUtf8() != fe.hash.toHex()) {
-                    if (options & QmlViewer::TestImages && !(options & QmlViewer::Record)) {
-                        qWarning() << "QmlGraphicsTester: Mismatched frame hash.  Seen:" 
-                                   << fe.hash.toHex() << "Expected:" 
-                                   << frame->hash().toUtf8();
-                        imagefailure();
-                    }
-                }
-            } else if (frame->msec() > msec) {
-                break;
-            }
-
-            if (options & QmlViewer::TestImages && !(options & QmlViewer::Record) && !frame->image().isEmpty()) {
-                QImage goodImage(frame->image().toLocalFile());
-                if (goodImage != img) {
-                    QString reject(frame->image().toLocalFile() + ".reject.png");
-                    qWarning() << "QmlGraphicsTester: Image mismatch.  Reject saved to:" 
-                               << reject;
-                    img.save(reject);
-                    imagefailure();
-                }
-            }
-        } else if (QmlGraphicsVisualTestMouse *mouse = qobject_cast<QmlGraphicsVisualTestMouse *>(event)) {
-            QPoint pos(mouse->x(), mouse->y());
-            QPoint globalPos = m_view->mapToGlobal(QPoint(0, 0)) + pos;
-            QMouseEvent event((QEvent::Type)mouse->type(), pos, globalPos, (Qt::MouseButton)mouse->button(), (Qt::MouseButtons)mouse->buttons(), (Qt::KeyboardModifiers)mouse->modifiers());
-
-            MouseEvent me(&event);
-            me.msec = msec;
-            if (!mouse->sendToViewport()) {
-                QCoreApplication::sendEvent(m_view, &event);
-                me.destination = View;
-            } else {
-                QCoreApplication::sendEvent(m_view->viewport(), &event);
-                me.destination = ViewPort;
-            }
-            m_savedMouseEvents.append(me);
-        } else if (QmlGraphicsVisualTestKey *key = qobject_cast<QmlGraphicsVisualTestKey *>(event)) {
-
-            QKeyEvent event((QEvent::Type)key->type(), key->key(), (Qt::KeyboardModifiers)key->modifiers(), QString::fromUtf8(QByteArray::fromHex(key->text().toUtf8())), key->autorep(), key->count());
-
-            KeyEvent ke(&event);
-            ke.msec = msec;
-            if (!key->sendToViewport()) {
-                QCoreApplication::sendEvent(m_view, &event);
-                ke.destination = View;
-            } else {
-                QCoreApplication::sendEvent(m_view->viewport(), &event);
-                ke.destination = ViewPort;
-            }
-            m_savedKeyEvents.append(ke);
-        } 
-        testscriptidx++;
-    }
-
-    filterEvents = true;
-
-    if (testscript && testscript->count() <= testscriptidx)
-        complete();
-}
-
-void QmlGraphicsTester::registerTypes()
-{
-    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, VisualTest, QmlGraphicsVisualTest);
-    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, Frame, QmlGraphicsVisualTestFrame);
-    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, Mouse, QmlGraphicsVisualTestMouse);
-    QML_REGISTER_TYPE(Qt.VisualTest, 4,6, Key, QmlGraphicsVisualTestKey);
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qmlviewer/qfxtester.h b/tools/qmlviewer/qfxtester.h
deleted file mode 100644
index bae807b..0000000
--- a/tools/qmlviewer/qfxtester.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QFXTESTER_H
-#define QFXTESTER_H
-
-#include <QEvent>
-#include <QMouseEvent>
-#include <QKeyEvent>
-#include <qmlviewer.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsVisualTest : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QList<QObject *>* events READ events CONSTANT)
-    Q_CLASSINFO("DefaultProperty", "events")
-public:
-    QmlGraphicsVisualTest() {}
-
-    QList<QObject *> *events() { return &m_events; }
-
-    int count() const { return m_events.count(); }
-    QObject *event(int idx) { return m_events.at(idx); }
-
-private:
-    QList<QObject *> m_events;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsVisualTest)
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsVisualTestFrame : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int msec READ msec WRITE setMsec)
-    Q_PROPERTY(QString hash READ hash WRITE setHash)
-    Q_PROPERTY(QUrl image READ image WRITE setImage)
-public:
-    QmlGraphicsVisualTestFrame() : m_msec(-1) {}
-
-    int msec() const { return m_msec; }
-    void setMsec(int m) { m_msec = m; }
-
-    QString hash() const { return m_hash; }
-    void setHash(const QString &hash) { m_hash = hash; }
-
-    QUrl image() const { return m_image; }
-    void setImage(const QUrl &image) { m_image = image; }
-
-private:
-    int m_msec;
-    QString m_hash;
-    QUrl m_image;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsVisualTestFrame)
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsVisualTestMouse : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int type READ type WRITE setType)
-    Q_PROPERTY(int button READ button WRITE setButton)
-    Q_PROPERTY(int buttons READ buttons WRITE setButtons)
-    Q_PROPERTY(int x READ x WRITE setX)
-    Q_PROPERTY(int y READ y WRITE setY)
-    Q_PROPERTY(int modifiers READ modifiers WRITE setModifiers)
-    Q_PROPERTY(bool sendToViewport READ sendToViewport WRITE setSendToViewport)
-public:
-    QmlGraphicsVisualTestMouse() : m_type(0), m_button(0), m_buttons(0), m_x(0), m_y(0), m_modifiers(0), m_viewport(false) {}
-
-    int type() const { return m_type; }
-    void setType(int t) { m_type = t; }
-    
-    int button() const { return m_button; }
-    void setButton(int b) { m_button = b; }
-
-    int buttons() const { return m_buttons; }
-    void setButtons(int b) { m_buttons = b; }
-
-    int x() const { return m_x; }
-    void setX(int x) { m_x = x; }
-
-    int y() const { return m_y; }
-    void setY(int y) { m_y = y; }
-
-    int modifiers() const { return m_modifiers; }
-    void setModifiers(int modifiers) { m_modifiers = modifiers; }
-
-    bool sendToViewport() const { return m_viewport; }
-    void setSendToViewport(bool v) { m_viewport = v; }
-private:
-    int m_type;
-    int m_button;
-    int m_buttons;
-    int m_x;
-    int m_y;
-    int m_modifiers;
-    bool m_viewport;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsVisualTestMouse)
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsVisualTestKey : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int type READ type WRITE setType)
-    Q_PROPERTY(int key READ key WRITE setKey)
-    Q_PROPERTY(int modifiers READ modifiers WRITE setModifiers)
-    Q_PROPERTY(QString text READ text WRITE setText)
-    Q_PROPERTY(bool autorep READ autorep WRITE setAutorep)
-    Q_PROPERTY(int count READ count WRITE setCount)
-    Q_PROPERTY(bool sendToViewport READ sendToViewport WRITE setSendToViewport)
-public:
-    QmlGraphicsVisualTestKey() : m_type(0), m_key(0), m_modifiers(0), m_autorep(false), m_count(0), m_viewport(false) {}
-
-    int type() const { return m_type; }
-    void setType(int t) { m_type = t; }
-
-    int key() const { return m_key; }
-    void setKey(int k) { m_key = k; }
-
-    int modifiers() const { return m_modifiers; }
-    void setModifiers(int m) { m_modifiers = m; }
-
-    QString text() const { return m_text; }
-    void setText(const QString &t) { m_text = t; }
-
-    bool autorep() const { return m_autorep; }
-    void setAutorep(bool a) { m_autorep = a; }
-
-    int count() const { return m_count; }
-    void setCount(int c) { m_count = c; }
-
-    bool sendToViewport() const { return m_viewport; }
-    void setSendToViewport(bool v) { m_viewport = v; }
-private:
-    int m_type;
-    int m_key;
-    int m_modifiers;
-    QString m_text;
-    bool m_autorep;
-    int m_count;
-    bool m_viewport;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsVisualTestKey)
-
-QT_BEGIN_NAMESPACE
-
-class QmlGraphicsTester : public QAbstractAnimation
-{
-public:
-    QmlGraphicsTester(const QString &script, QmlViewer::ScriptOptions options, QmlView *parent);
-    ~QmlGraphicsTester();
-
-    static void registerTypes();
-
-    virtual int duration() const;
-
-    void run();
-    void save();
-
-    void executefailure();
-protected:
-    virtual void updateCurrentTime(int msecs);
-    virtual bool eventFilter(QObject *, QEvent *);
-
-private:
-    QString m_script;
-
-    void imagefailure();
-    void complete();
-
-    enum Destination { View, ViewPort };
-    void addKeyEvent(Destination, QKeyEvent *);
-    void addMouseEvent(Destination, QMouseEvent *);
-    QmlView *m_view;
-
-    struct MouseEvent {
-        MouseEvent(QMouseEvent *e)
-            : type(e->type()), button(e->button()), buttons(e->buttons()), 
-              pos(e->pos()), modifiers(e->modifiers()), destination(View) {}
-
-        QEvent::Type type;
-        Qt::MouseButton button;
-        Qt::MouseButtons buttons;
-        QPoint pos;
-        Qt::KeyboardModifiers modifiers;
-        Destination destination;
-
-        int msec;
-    };
-    struct KeyEvent {
-        KeyEvent(QKeyEvent *e)
-            : type(e->type()), key(e->key()), modifiers(e->modifiers()), text(e->text()),
-              autorep(e->isAutoRepeat()), count(e->count()), destination(View) {}
-        QEvent::Type type;
-        int key;
-        Qt::KeyboardModifiers modifiers;
-        QString text;
-        bool autorep;
-        ushort count;
-        Destination destination;
-
-        int msec;
-    };
-    struct FrameEvent {
-        QImage image;
-        QByteArray hash;
-        int msec;
-    };
-    QList<MouseEvent> m_mouseEvents;
-    QList<KeyEvent> m_keyEvents;
-
-    QList<MouseEvent> m_savedMouseEvents;
-    QList<KeyEvent> m_savedKeyEvents;
-    QList<FrameEvent> m_savedFrameEvents;
-    bool filterEvents;
-
-    QmlViewer::ScriptOptions options;
-    int testscriptidx;
-    QmlGraphicsVisualTest *testscript;
-
-    bool hasCompleted;
-    bool hasFailed;
-};
-
-
-QT_END_NAMESPACE
-
-#endif // QFXTESTER_H
diff --git a/tools/qmlviewer/qmlfolderlistmodel.cpp b/tools/qmlviewer/qmlfolderlistmodel.cpp
deleted file mode 100644
index aec7756..0000000
--- a/tools/qmlviewer/qmlfolderlistmodel.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlfolderlistmodel.h"
-#include <QDirModel>
-#include <QDebug>
-#include <qmlcontext.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlFolderListModelPrivate
-{
-public:
-    QmlFolderListModelPrivate()
-        : sortField(QmlFolderListModel::Name), sortReversed(false), count(0) {
-        nameFilters << QLatin1String("*");
-    }
-
-    void updateSorting() {
-        QDir::SortFlags flags = 0;
-        switch(sortField) {
-        case QmlFolderListModel::Unsorted:
-            flags |= QDir::Unsorted;
-            break;
-        case QmlFolderListModel::Name:
-            flags |= QDir::Name;
-            break;
-        case QmlFolderListModel::Time:
-            flags |= QDir::Time;
-            break;
-        case QmlFolderListModel::Size:
-            flags |= QDir::Size;
-            break;
-        case QmlFolderListModel::Type:
-            flags |= QDir::Type;
-            break;
-        }
-
-        if (sortReversed)
-            flags |= QDir::Reversed;
-
-        model.setSorting(flags);
-    }
-
-    QDirModel model;
-    QUrl folder;
-    QStringList nameFilters;
-    QModelIndex folderIndex;
-    QmlFolderListModel::SortField sortField;
-    bool sortReversed;
-    int count;
-};
-
-/*!
-    \qmlclass FolderListModel
-    \brief The FolderListModel provides a model of the contents of a folder in a filesystem.
-
-    FolderListModel provides access to the local filesystem.  The \e folder property
-    specifies the folder to list.
-
-    Qt uses "/" as a universal directory separator in the same way that "/" is
-    used as a path separator in URLs. If you always use "/" as a directory
-    separator, Qt will translate your paths to conform to the underlying
-    operating system.
-
-    The roles available are:
-    \list
-    \o fileName
-    \o filePath
-    \endlist
-
-    Additionally a file entry can be differentiated from a folder entry
-    via the \l isFolder() method.
-*/
-
-QmlFolderListModel::QmlFolderListModel(QObject *parent)
-    : QListModelInterface(parent)
-{
-    d = new QmlFolderListModelPrivate;
-    d->model.setFilter(QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot);
-    connect(&d->model, SIGNAL(rowsInserted(const QModelIndex&,int,int))
-            , this, SLOT(inserted(const QModelIndex&,int,int)));
-    connect(&d->model, SIGNAL(rowsRemoved(const QModelIndex&,int,int))
-            , this, SLOT(removed(const QModelIndex&,int,int)));
-    connect(&d->model, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&))
-            , this, SLOT(dataChanged(const QModelIndex&,const QModelIndex&)));
-    connect(&d->model, SIGNAL(modelReset()), this, SLOT(refresh()));
-    connect(&d->model, SIGNAL(layoutChanged()), this, SLOT(refresh()));
-}
-
-QmlFolderListModel::~QmlFolderListModel()
-{
-    delete d;
-}
-
-QHash<int,QVariant> QmlFolderListModel::data(int index, const QList<int> &roles) const
-{
-    Q_UNUSED(roles);
-    QHash<int,QVariant> folderData;
-    QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex);
-    if (modelIndex.isValid()) {
-        folderData[QDirModel::FileNameRole] = d->model.data(modelIndex, QDirModel::FileNameRole);
-        folderData[QDirModel::FilePathRole] = QUrl::fromLocalFile(d->model.data(modelIndex, QDirModel::FilePathRole).toString());
-    }
-
-    return folderData;
-}
-
-QVariant QmlFolderListModel::data(int index, int role) const
-{
-    QVariant rv;
-    QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex);
-    if (modelIndex.isValid()) {
-        if (role == QDirModel::FileNameRole)
-            rv = d->model.data(modelIndex, QDirModel::FileNameRole);
-        else if (role == QDirModel::FilePathRole)
-            rv = QUrl::fromLocalFile(d->model.data(modelIndex, QDirModel::FilePathRole).toString());
-    }
-
-    return rv;
-}
-
-int QmlFolderListModel::count() const
-{
-    return d->count;
-}
-
-QList<int> QmlFolderListModel::roles() const
-{
-    QList<int> r;
-    r << QDirModel::FileNameRole;
-    r << QDirModel::FilePathRole;
-    return r;
-}
-
-QString QmlFolderListModel::toString(int role) const
-{
-    switch (role) {
-    case QDirModel::FileNameRole:
-        return QLatin1String("fileName");
-    case QDirModel::FilePathRole:
-        return QLatin1String("filePath");
-    }
-
-    return QString();
-}
-
-/*!
-    \qmlproperty string FolderListModel::folder
-
-    The \a folder property holds the folder the model is currently providing.
-
-    It is a URL, but must be a file: or qrc: URL (or relative to such a URL).
-*/
-QUrl QmlFolderListModel::folder() const
-{
-    return d->folder;
-}
-
-void QmlFolderListModel::setFolder(const QUrl &folder)
-{
-    if (folder == d->folder)
-        return;
-    QModelIndex index = d->model.index(folder.toLocalFile());
-    if (index.isValid() && d->model.isDir(index)) {
-        d->folder = folder;
-        QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
-        emit folderChanged();
-    }
-}
-
-QUrl QmlFolderListModel::parentFolder() const
-{
-    QUrl r;
-    QString localFile = d->folder.toLocalFile();
-    if (!localFile.isEmpty()) {
-        QDir dir(localFile);
-#if defined(Q_OS_SYMBIAN)
-        if (dir.isRoot())
-            dir.setPath("");
-        else
-#endif
-            dir.cdUp();
-        r = d->folder;
-        r.setPath(dir.path());
-    } else {
-        int pos = d->folder.path().lastIndexOf(QLatin1Char('/'));
-        if (pos == -1)
-            return QUrl();
-        r = d->folder;
-        r.setPath(d->folder.path().left(pos));
-    }
-    return r;
-}
-
-/*!
-    \qmlproperty list<string> FolderListModel::nameFilters
-
-    The \a nameFilters property contains a list of filename filters.
-    The filters may include the ? and * wildcards.
-
-    The example below filters on PNG and JPEG files:
-
-    \code
-    FolderListModel {
-        nameFilters: [ "*.png", "*.jpg" ]
-    }
-    \endcode
-*/
-QStringList QmlFolderListModel::nameFilters() const
-{
-    return d->nameFilters;
-}
-
-void QmlFolderListModel::setNameFilters(const QStringList &filters)
-{
-    d->nameFilters = filters;
-    d->model.setNameFilters(d->nameFilters);
-}
-
-void QmlFolderListModel::componentComplete()
-{
-    if (!d->folder.isValid() || !QDir().exists(d->folder.toLocalFile()))
-        setFolder(QUrl(QLatin1String("file://")+QDir::currentPath()));
-
-    if (!d->folderIndex.isValid())
-        QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
-}
-
-QmlFolderListModel::SortField QmlFolderListModel::sortField() const
-{
-    return d->sortField;
-}
-
-void QmlFolderListModel::setSortField(SortField field)
-{
-    if (field != d->sortField) {
-        d->sortField = field;
-        d->updateSorting();
-    }
-}
-
-bool QmlFolderListModel::sortReversed() const
-{
-    return d->sortReversed;
-}
-
-void QmlFolderListModel::setSortReversed(bool rev)
-{
-    if (rev != d->sortReversed) {
-        d->sortReversed = rev;
-        d->updateSorting();
-    }
-}
-
-/*!
-    \qmlmethod bool FolderListModel::isFolder(int index)
-
-    Returns true if the entry \a index is a folder; otherwise
-    returns false.
-*/
-bool QmlFolderListModel::isFolder(int index) const
-{
-    if (index != -1) {
-        QModelIndex idx = d->model.index(index, 0, d->folderIndex);
-        if (idx.isValid())
-            return d->model.isDir(idx);
-    }
-    return false;
-}
-
-void QmlFolderListModel::refresh()
-{
-    d->folderIndex = QModelIndex();
-    if (d->count) {
-        int tmpCount = d->count;
-        d->count = 0;
-        emit itemsRemoved(0, tmpCount);
-    }
-    d->folderIndex = d->model.index(d->folder.toLocalFile());
-    d->count = d->model.rowCount(d->folderIndex);
-    if (d->count) {
-        emit itemsInserted(0, d->count);
-    }
-}
-
-void QmlFolderListModel::inserted(const QModelIndex &index, int start, int end)
-{
-    if (index == d->folderIndex) {
-        d->count = d->model.rowCount(d->folderIndex);
-        emit itemsInserted(start, end - start + 1);
-    }
-}
-
-void QmlFolderListModel::removed(const QModelIndex &index, int start, int end)
-{
-    if (index == d->folderIndex) {
-        d->count = d->model.rowCount(d->folderIndex);
-        emit itemsRemoved(start, end - start + 1);
-    }
-}
-
-void QmlFolderListModel::dataChanged(const QModelIndex &start, const QModelIndex &end)
-{
-    qDebug() << "data changed";
-    if (start.parent() == d->folderIndex)
-        emit itemsChanged(start.row(), end.row() - start.row() + 1, roles());
-}
-
-/*!
-    \qmlproperty bool FolderListModel::showDirs
-
-    If true (the default), directories are included in the model.
-
-    Note that the nameFilters are ignored for directories.
-*/
-bool QmlFolderListModel::showDirs() const
-{
-    return d->model.filter() & QDir::AllDirs;
-}
-
-void  QmlFolderListModel::setShowDirs(bool on)
-{
-    if (!(d->model.filter() & QDir::AllDirs) == !on)
-        return;
-    if (on)
-        d->model.setFilter(d->model.filter() | QDir::AllDirs | QDir::Drives);
-    else
-        d->model.setFilter(d->model.filter() & ~(QDir::AllDirs | QDir::Drives));
-}
-
-/*!
-    \qmlproperty bool FolderListModel::showDotAndDotDot
-
-    If true, the "." and ".." directories are included in the model.
-
-    The default is false.
-*/
-bool QmlFolderListModel::showDotAndDotDot() const
-{
-    return !(d->model.filter() & QDir::NoDotAndDotDot);
-}
-
-void  QmlFolderListModel::setShowDotAndDotDot(bool on)
-{
-    if (!(d->model.filter() & QDir::NoDotAndDotDot) == on)
-        return;
-    if (on)
-        d->model.setFilter(d->model.filter() & ~QDir::NoDotAndDotDot);
-    else
-        d->model.setFilter(d->model.filter() | QDir::NoDotAndDotDot);
-}
-
-/*!
-    \qmlproperty bool FolderListModel::showOnlyReadable
-
-    If true, only readable files and directories are shown.
-
-    The default is false.
-*/
-bool QmlFolderListModel::showOnlyReadable() const
-{
-    return d->model.filter() & QDir::Readable;
-}
-
-void QmlFolderListModel::setShowOnlyReadable(bool on)
-{
-    if (!(d->model.filter() & QDir::Readable) == !on)
-        return;
-    if (on)
-        d->model.setFilter(d->model.filter() | QDir::Readable);
-    else
-        d->model.setFilter(d->model.filter() & ~QDir::Readable);
-}
-
-void QmlFolderListModel::registerTypes()
-{
-    QML_REGISTER_TYPE(Qt,4,6,FolderListModel,QmlFolderListModel);
-}
-
-QT_END_NAMESPACE
-
diff --git a/tools/qmlviewer/qmlfolderlistmodel.h b/tools/qmlviewer/qmlfolderlistmodel.h
deleted file mode 100644
index 1a1c299..0000000
--- a/tools/qmlviewer/qmlfolderlistmodel.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLFOLDERLISTMODEL_H
-#define QMLFOLDERLISTMODEL_H
-
-#include <qml.h>
-#include "../../src/declarative/3rdparty/qlistmodelinterface_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlContext;
-class QModelIndex;
-
-class QmlFolderListModelPrivate;
-class QmlFolderListModel : public QListModelInterface, public QmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QmlParserStatus)
-
-    Q_PROPERTY(QUrl folder READ folder WRITE setFolder NOTIFY folderChanged)
-    Q_PROPERTY(QUrl parentFolder READ parentFolder NOTIFY folderChanged)
-    Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters)
-    Q_PROPERTY(SortField sortField READ sortField WRITE setSortField)
-    Q_PROPERTY(bool sortReversed READ sortReversed WRITE setSortReversed)
-    Q_PROPERTY(bool showDirs READ showDirs WRITE setShowDirs)
-    Q_PROPERTY(bool showDotAndDotDot READ showDotAndDotDot WRITE setShowDotAndDotDot)
-    Q_PROPERTY(bool showOnlyReadable READ showOnlyReadable WRITE setShowOnlyReadable)
-
-public:
-    QmlFolderListModel(QObject *parent = 0);
-    ~QmlFolderListModel();
-
-    static void registerTypes();
-
-    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
-    virtual QVariant data(int index, int role) const;
-    virtual int count() const;
-    virtual QList<int> roles() const;
-    virtual QString toString(int role) const;
-
-    QUrl folder() const;
-    void setFolder(const QUrl &folder);
-
-    QUrl parentFolder() const;
-
-    QStringList nameFilters() const;
-    void setNameFilters(const QStringList &filters);
-
-    virtual void componentComplete();
-
-    Q_INVOKABLE bool isFolder(int index) const;
-
-    enum SortField { Unsorted, Name, Time, Size, Type };
-    SortField sortField() const;
-    void setSortField(SortField field);
-    Q_ENUMS(SortField)
-
-    bool sortReversed() const;
-    void setSortReversed(bool rev);
-
-    bool showDirs() const;
-    void  setShowDirs(bool);
-    bool showDotAndDotDot() const;
-    void  setShowDotAndDotDot(bool);
-    bool showOnlyReadable() const;
-    void  setShowOnlyReadable(bool);
-
-Q_SIGNALS:
-    void folderChanged();
-
-private Q_SLOTS:
-    void refresh();
-    void inserted(const QModelIndex &index, int start, int end);
-    void removed(const QModelIndex &index, int start, int end);
-    void dataChanged(const QModelIndex &start, const QModelIndex &end);
-
-private:
-    Q_DISABLE_COPY(QmlFolderListModel)
-    QmlFolderListModelPrivate *d;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlFolderListModel)
-
-#endif // QMLFOLDERLISTMODEL_H
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
deleted file mode 100644
index 789c960..0000000
--- a/tools/qmlviewer/qmlviewer.cpp
+++ /dev/null
@@ -1,1468 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qmlview.h>
-
-#ifdef hz
-#undef hz
-#endif
-#include "ui_recopts.h"
-
-#include "qmlviewer.h"
-#include <qmlcontext.h>
-#include <qmlengine.h>
-#include <qmlnetworkaccessmanagerfactory.h>
-#include "qml.h"
-#include <private/qperformancelog_p_p.h>
-#include <private/qabstractanimation_p.h>
-#include <QAbstractAnimation>
-#include "deviceskin.h"
-
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 3))
-#include <private/qzipreader_p.h>
-#define QMLVIEWER_ZIP_SUPPORT
-#endif
-
-#include <QSettings>
-#include <QXmlStreamReader>
-#include <QBuffer>
-#include <QNetworkReply>
-#include <QNetworkCookieJar>
-#include <QNetworkDiskCache>
-#include <QNetworkAccessManager>
-#include <QSignalMapper>
-#include <QmlComponent>
-#include <QWidget>
-#include <QApplication>
-#include <QDir>
-#include <QTextBrowser>
-#include <QFile>
-#include <QFileInfo>
-#include <QVBoxLayout>
-#include <QProgressDialog>
-#include <QProcess>
-#include <QMenuBar>
-#include <QMenu>
-#include <QAction>
-#include <QFileDialog>
-#include <QTimer>
-#include <QGraphicsObject>
-#include <QNetworkProxyFactory>
-#include <QKeyEvent>
-#include <QMutex>
-#include <QMutexLocker>
-#include "proxysettings.h"
-#include "deviceorientation.h"
-
-#ifdef GL_SUPPORTED
-#include <QGLWidget>
-#endif
-
-#include <qfxtester.h>
-
-#if defined (Q_OS_SYMBIAN)
-#define SYMBIAN_NETWORK_INIT
-#endif
-
-#if defined (SYMBIAN_NETWORK_INIT)
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <QTextCodec>
-#include "sym_iap_util.h"
-#endif
-
-QT_BEGIN_NAMESPACE
-
-class Screen : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(Orientation orientation READ orientation NOTIFY orientationChanged)
-    Q_ENUMS(Orientation)
-
-public:
-    Screen(QObject *parent=0) : QObject(parent) {
-        connect(DeviceOrientation::instance(), SIGNAL(orientationChanged()),
-                this, SIGNAL(orientationChanged()));
-    }
-
-    enum Orientation { UnknownOrientation = DeviceOrientation::UnknownOrientation,
-                       Portrait = DeviceOrientation::Portrait,
-                       Landscape = DeviceOrientation::Landscape };
-    Orientation orientation() const { return Orientation(DeviceOrientation::instance()->orientation()); }
-
-signals:
-    void orientationChanged();
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(Screen)
-
-QT_BEGIN_NAMESPACE
-
-class SizedMenuBar : public QMenuBar
-{
-    Q_OBJECT
-public:
-    SizedMenuBar(QWidget *parent, QWidget *referenceWidget)
-        : QMenuBar(parent), refWidget(referenceWidget)
-    {
-    }
-
-    virtual QSize sizeHint() const
-    {
-        return QSize(refWidget->sizeHint().width(), QMenuBar::sizeHint().height());
-    }
-
-private:
-    QWidget *refWidget;
-};
-
-
-class PreviewDeviceSkin : public DeviceSkin
-{
-    Q_OBJECT
-public:
-    explicit PreviewDeviceSkin(const DeviceSkinParameters &parameters, QWidget *parent);
-
-    void setPreview(QWidget *formWidget);
-    void setPreviewAndScale(QWidget *formWidget);
-
-    void setScreenSize(const QSize& size)
-    {
-        QMatrix fit;
-        fit = fit.scale(qreal(size.width())/m_screenSize.width(),
-            qreal(size.height())/m_screenSize.height());
-        setTransform(fit);
-        QApplication::syncX();
-    }
-
-    QSize standardScreenSize() const { return m_screenSize; }
-
-    QMenu* menu;
-
-private slots:
-    void slotSkinKeyPressEvent(int code, const QString& text, bool autorep);
-    void slotSkinKeyReleaseEvent(int code, const QString& text, bool autorep);
-    void slotPopupMenu();
-
-private:
-    const QSize m_screenSize;
-};
-
-
-PreviewDeviceSkin::PreviewDeviceSkin(const DeviceSkinParameters &parameters, QWidget *parent) :
-    DeviceSkin(parameters, parent),
-    m_screenSize(parameters.screenSize())
-{
-    menu = new QMenu(this);
-    connect(this, SIGNAL(skinKeyPressEvent(int,QString,bool)),
-            this, SLOT(slotSkinKeyPressEvent(int,QString,bool)));
-    connect(this, SIGNAL(skinKeyReleaseEvent(int,QString,bool)),
-            this, SLOT(slotSkinKeyReleaseEvent(int,QString,bool)));
-    connect(this, SIGNAL(popupMenu()), this, SLOT(slotPopupMenu()));
-}
-
-void PreviewDeviceSkin::setPreview(QWidget *formWidget)
-{
-    formWidget->setFixedSize(m_screenSize);
-    formWidget->setParent(this, Qt::SubWindow);
-    formWidget->setAutoFillBackground(true);
-    setView(formWidget);
-}
-
-void PreviewDeviceSkin::setPreviewAndScale(QWidget *formWidget)
-{
-    setScreenSize(formWidget->sizeHint());
-    formWidget->setParent(this, Qt::SubWindow);
-    formWidget->setAutoFillBackground(true);
-    setView(formWidget);
-}
-
-void PreviewDeviceSkin::slotSkinKeyPressEvent(int code, const QString& text, bool autorep)
-{
-    if (QWidget *focusWidget =  QApplication::focusWidget()) {
-        QKeyEvent e(QEvent::KeyPress,code,0,text,autorep);
-        QApplication::sendEvent(focusWidget, &e);
-    }
-
-}
-
-void PreviewDeviceSkin::slotSkinKeyReleaseEvent(int code, const QString& text, bool autorep)
-{
-    if (QWidget *focusWidget =  QApplication::focusWidget()) {
-        QKeyEvent e(QEvent::KeyRelease,code,0,text,autorep);
-        QApplication::sendEvent(focusWidget, &e);
-    }
-}
-
-void PreviewDeviceSkin::slotPopupMenu()
-{
-    menu->exec(QCursor::pos());
-}
-
-static struct { const char *name, *args; } ffmpegprofiles[] = {
-    {"Maximum Quality", "-sameq"},
-    {"High Quality", "-qmax 2"},
-    {"Medium Quality", "-qmax 6"},
-    {"Low Quality", "-qmax 16"},
-    {"Custom ffmpeg arguments", ""},
-    {0,0}
-};
-
-class RecordingDialog : public QDialog, public Ui::RecordingOptions {
-    Q_OBJECT
-
-public:
-    RecordingDialog(QWidget *parent) : QDialog(parent)
-    {
-        setupUi(this);
-        hz->setValidator(new QDoubleValidator(hz));
-        for (int i=0; ffmpegprofiles[i].name; ++i) {
-            profile->addItem(ffmpegprofiles[i].name);
-        }
-    }
-
-    void setArguments(QString a)
-    {
-        int i;
-        for (i=0; ffmpegprofiles[i].args[0]; ++i) {
-            if (ffmpegprofiles[i].args == a) {
-                profile->setCurrentIndex(i);
-                args->setText(QLatin1String(ffmpegprofiles[i].args));
-                return;
-            }
-        }
-        customargs = a;
-        args->setText(a);
-        profile->setCurrentIndex(i);
-    }
-
-    QString arguments() const
-    {
-        int i = profile->currentIndex();
-        return ffmpegprofiles[i].args[0] ? QLatin1String(ffmpegprofiles[i].args) : customargs;
-    }
-
-private slots:
-    void pickProfile(int i)
-    {
-        if (ffmpegprofiles[i].args[0]) {
-            args->setText(QLatin1String(ffmpegprofiles[i].args));
-        } else {
-            args->setText(customargs);
-        }
-    }
-
-    void storeCustomArgs(QString s)
-    {
-        setArguments(s);
-    }
-
-private:
-    QString customargs;
-};
-
-class PersistentCookieJar : public QNetworkCookieJar {
-public:
-    PersistentCookieJar(QObject *parent) : QNetworkCookieJar(parent) { load(); }
-    ~PersistentCookieJar() { save(); }
-
-    virtual QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const
-    {
-        QMutexLocker lock(&mutex);
-        return QNetworkCookieJar::cookiesForUrl(url);
-    }
-
-    virtual bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
-    {
-        QMutexLocker lock(&mutex);
-        return QNetworkCookieJar::setCookiesFromUrl(cookieList, url);
-    }
-
-private:
-    void save()
-    {
-        QMutexLocker lock(&mutex);
-        QList<QNetworkCookie> list = allCookies();
-        QByteArray data;
-        foreach (QNetworkCookie cookie, list) {
-            if (!cookie.isSessionCookie()) {
-                data.append(cookie.toRawForm());
-                data.append("\n");
-            }
-        }
-        QSettings settings("Nokia", "QtQmlViewer");
-        settings.setValue("Cookies",data);
-    }
-
-    void load()
-    {
-        QMutexLocker lock(&mutex);
-        QSettings settings("Nokia", "QtQmlViewer");
-        QByteArray data = settings.value("Cookies").toByteArray();
-        setAllCookies(QNetworkCookie::parseCookies(data));
-    }
-
-    mutable QMutex mutex;
-};
-
-class NetworkAccessManagerFactory : public QmlNetworkAccessManagerFactory
-{
-public:
-    NetworkAccessManagerFactory() : cookieJar(0), cacheSize(0) {}
-    ~NetworkAccessManagerFactory() {
-        delete cookieJar;
-    }
-
-    QNetworkAccessManager *create(QObject *parent) {
-        QMutexLocker lock(&mutex);
-        QNetworkAccessManager *manager = new QNetworkAccessManager(parent);
-        if (!cookieJar)
-            cookieJar = new PersistentCookieJar(0);
-        manager->setCookieJar(cookieJar);
-        cookieJar->setParent(0);
-        setupProxy(manager);
-        if (cacheSize > 0) {
-            QNetworkDiskCache *cache = new QNetworkDiskCache;
-            cache->setCacheDirectory(QDir::tempPath()+QLatin1String("/qml-duiviewer-network-cache"));
-            cache->setMaximumCacheSize(cacheSize);
-            manager->setCache(cache);
-        } else {
-            manager->setCache(0);
-        }
-        qDebug() << "created new network access manager for" << parent;
-        return manager;
-    }
-
-    void setupProxy(QNetworkAccessManager *nam)
-    {
-        class SystemProxyFactory : public QNetworkProxyFactory
-        {
-        public:
-            virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query)
-            {
-                QString protocolTag = query.protocolTag();
-                if (httpProxyInUse && (protocolTag == "http" || protocolTag == "https")) {
-                    QList<QNetworkProxy> ret;
-                    ret << httpProxy;
-                    return ret;
-                }
-                return QNetworkProxyFactory::systemProxyForQuery(query);
-            }
-            void setHttpProxy (QNetworkProxy proxy)
-            {
-                httpProxy = proxy;
-                httpProxyInUse = true;
-            }
-            void unsetHttpProxy ()
-            {
-                httpProxyInUse = false;
-            }
-        private:
-            bool httpProxyInUse;
-            QNetworkProxy httpProxy;
-        };
-
-        SystemProxyFactory *proxyFactory = new SystemProxyFactory;
-        if (ProxySettings::httpProxyInUse())
-            proxyFactory->setHttpProxy(ProxySettings::httpProxy());
-        else
-            proxyFactory->unsetHttpProxy();
-        nam->setProxyFactory(proxyFactory);
-    }
-
-    void setCacheSize(int size) {
-        if (size != cacheSize) {
-            cacheSize = size;
-        }
-    }
-
-    PersistentCookieJar *cookieJar;
-    QMutex mutex;
-    int cacheSize;
-};
-
-
-QString QmlViewer::getVideoFileName()
-{
-    QString title = convertAvailable || ffmpegAvailable ? tr("Save Video File") : tr("Save PNG Frames");
-    QStringList types;
-    if (ffmpegAvailable) types += tr("Common Video files")+QLatin1String(" (*.avi *.mpeg *.mov)");
-    if (convertAvailable) types += tr("GIF Animation")+QLatin1String(" (*.gif)");
-    types += tr("Individual PNG frames")+QLatin1String(" (*.png)");
-    if (ffmpegAvailable) types += tr("All ffmpeg formats (*.*)");
-    return QFileDialog::getSaveFileName(this, title, "", types.join(";; "));
-}
-
-
-QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
-#if defined(Q_OS_SYMBIAN)
-    : QMainWindow(parent, flags)
-#else
-    : QWidget(parent, flags)
-#endif
-      , frame_stream(0), scaleSkin(true), mb(0)
-      , portraitOrientation(0), landscapeOrientation(0)
-      , m_scriptOptions(0), tester(0), useQmlFileBrowser(true)
-{
-    devicemode = false;
-    skin = 0;
-    canvas = 0;
-    record_autotime = 0;
-    record_rate = 50;
-    record_args += QLatin1String("-sameq");
-
-    recdlg = new RecordingDialog(this);
-    connect(recdlg->pickfile, SIGNAL(clicked()), this, SLOT(pickRecordingFile()));
-    senseFfmpeg();
-    senseImageMagick();
-    if (!ffmpegAvailable)
-        recdlg->ffmpegOptions->hide();
-    if (!ffmpegAvailable && !convertAvailable)
-        recdlg->rateOptions->hide();
-    QString warn;
-    if (!ffmpegAvailable) {
-        if (!convertAvailable)
-            warn = tr("ffmpeg and ImageMagick not available - no video output");
-        else
-            warn = tr("ffmpeg not available - GIF and PNG outputs only");
-        recdlg->warning->setText(warn);
-    } else {
-        recdlg->warning->hide();
-    }
-
-    canvas = new QmlView(this);
-    canvas->setAttribute(Qt::WA_OpaquePaintEvent);
-    canvas->setAttribute(Qt::WA_NoSystemBackground);
-    canvas->setResizeMode((!skin || !scaleSkin) ? QmlView::SizeRootObjectToView : QmlView::SizeViewToRootObject);
-    canvas->setFocus();
-
-    QObject::connect(canvas, SIGNAL(sceneResized(QSize)), this, SLOT(sceneResized(QSize)));
-    QObject::connect(canvas, SIGNAL(statusChanged(QmlView::Status)), this, SLOT(statusChanged()));
-    QObject::connect(canvas->engine(), SIGNAL(quit()), QCoreApplication::instance (), SLOT(quit()));
-
-    if (!(flags & Qt::FramelessWindowHint)) {
-        createMenu(menuBar(),0);
-        setPortrait();
-    }
-
-#if !defined(Q_OS_SYMBIAN)
-    QVBoxLayout *layout = new QVBoxLayout;
-    layout->setMargin(0);
-    layout->setSpacing(0);
-    setLayout(layout);
-    if (mb)
-        layout->addWidget(mb);
-    layout->addWidget(canvas);
-#else
-    setCentralWidget(canvas);
-#endif
-
-    namFactory = new NetworkAccessManagerFactory;
-    canvas->engine()->setNetworkAccessManagerFactory(namFactory);
-
-    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);
-}
-
-QmlViewer::~QmlViewer()
-{
-    canvas->engine()->setNetworkAccessManagerFactory(0);
-    delete namFactory;
-}
-
-QMenuBar *QmlViewer::menuBar() const
-{
-#if !defined(Q_OS_SYMBIAN)
-    if (!mb)
-        mb = new SizedMenuBar((QWidget*)this, canvas);
-#else
-    mb = QMainWindow::menuBar();
-#endif
-
-    return mb;
-}
-
-void QmlViewer::createMenu(QMenuBar *menu, QMenu *flatmenu)
-{
-    QObject *parent = flatmenu ? (QObject*)flatmenu : (QObject*)menu;
-
-    QMenu *fileMenu = flatmenu ? flatmenu : menu->addMenu(tr("&File"));
-
-    QAction *openAction = new QAction(tr("&Open..."), parent);
-    openAction->setShortcut(QKeySequence("Ctrl+O"));
-    connect(openAction, SIGNAL(triggered()), this, SLOT(openFile()));
-    fileMenu->addAction(openAction);
-
-    QAction *reloadAction = new QAction(tr("&Reload"), parent);
-    reloadAction->setShortcut(QKeySequence("Ctrl+R"));
-    connect(reloadAction, SIGNAL(triggered()), this, SLOT(reload()));
-    fileMenu->addAction(reloadAction);
-
-#if defined(Q_OS_SYMBIAN)
-    QAction *networkAction = new QAction(tr("Start &Network"), parent);
-    connect(networkAction, SIGNAL(triggered()), this, SLOT(startNetwork()));
-    fileMenu->addAction(networkAction);
-#endif
-
-#if !defined(Q_OS_SYMBIAN)
-    if (flatmenu) flatmenu->addSeparator();
-
-    QMenu *recordMenu = flatmenu ? flatmenu : menu->addMenu(tr("&Recording"));
-
-    QAction *snapshotAction = new QAction(tr("&Take Snapshot\tF3"), parent);
-    connect(snapshotAction, SIGNAL(triggered()), this, SLOT(takeSnapShot()));
-    recordMenu->addAction(snapshotAction);
-
-    recordAction = new QAction(tr("Start Recording &Video\tF9"), parent);
-    connect(recordAction, SIGNAL(triggered()), this, SLOT(toggleRecordingWithSelection()));
-    recordMenu->addAction(recordAction);
-
-    QAction *recordOptions = new QAction(tr("Video &Options..."), parent);
-    connect(recordOptions, SIGNAL(triggered()), this, SLOT(chooseRecordingOptions()));
-
-    if (flatmenu)
-        flatmenu->addAction(recordOptions);
-
-    if (flatmenu) flatmenu->addSeparator();
-
-    QMenu *debugMenu = flatmenu ? flatmenu->addMenu(tr("&Debugging")) : menu->addMenu(tr("&Debugging"));
-
-    QAction *slowAction = new QAction(tr("&Slow Down Animations"), parent);
-    slowAction->setShortcut(QKeySequence("Ctrl+."));
-    slowAction->setCheckable(true);
-    connect(slowAction, SIGNAL(triggered(bool)), this, SLOT(setSlowMode(bool)));
-    debugMenu->addAction(slowAction);
-
-    if (flatmenu) flatmenu->addSeparator();
-
-    QMenu *skinMenu = flatmenu ? flatmenu->addMenu(tr("&Skin")) : menu->addMenu(tr("&Skin"));
-
-    QActionGroup *skinActions;
-    QAction *skinAction;
-
-    skinActions = new QActionGroup(parent);
-    skinAction = new QAction(tr("Scale skin"), parent);
-    skinAction->setCheckable(true);
-    skinAction->setChecked(scaleSkin);
-    skinActions->addAction(skinAction);
-    skinMenu->addAction(skinAction);
-    connect(skinAction, SIGNAL(triggered()), this, SLOT(setScaleSkin()));
-    skinAction = new QAction(tr("Resize view"), parent);
-    skinAction->setCheckable(true);
-    skinAction->setChecked(!scaleSkin);
-    skinActions->addAction(skinAction);
-    skinMenu->addAction(skinAction);
-    connect(skinAction, SIGNAL(triggered()), this, SLOT(setScaleView()));
-    skinMenu->addSeparator();
-
-    skinActions = new QActionGroup(parent);
-    QSignalMapper *mapper = new QSignalMapper(parent);
-    skinAction = new QAction(tr("None"), parent);
-    skinAction->setCheckable(true);
-    if (currentSkin.isEmpty())
-        skinAction->setChecked(true);
-    skinActions->addAction(skinAction);
-    skinMenu->addAction(skinAction);
-    mapper->setMapping(skinAction, "");
-    connect(skinAction, SIGNAL(triggered()), mapper, SLOT(map()));
-    skinMenu->addSeparator();
-
-    foreach (QString name, builtinSkins()) {
-        skinAction = new QAction(name, parent);
-        skinActions->addAction(skinAction);
-        skinMenu->addAction(skinAction);
-        skinAction->setCheckable(true);
-        if (":skin/"+name+".skin" == currentSkin)
-            skinAction->setChecked(true);
-        mapper->setMapping(skinAction, name);
-        connect(skinAction, SIGNAL(triggered()), mapper, SLOT(map()));
-    }
-    connect(mapper, SIGNAL(mapped(QString)), this, SLOT(setSkin(QString)));
-
-    if (flatmenu) flatmenu->addSeparator();
-#endif // Q_OS_SYMBIAN
-
-    QMenu *settingsMenu = flatmenu ? flatmenu : menu->addMenu(tr("S&ettings"));
-    QAction *proxyAction = new QAction(tr("Http &proxy..."), parent);
-    connect(proxyAction, SIGNAL(triggered()), this, SLOT(showProxySettings()));
-    settingsMenu->addAction(proxyAction);
-#if !defined(Q_OS_SYMBIAN)
-    if (!flatmenu)
-        settingsMenu->addAction(recordOptions);
-#else
-    QAction *fullscreenAction = new QAction(tr("Full Screen"), parent);
-    fullscreenAction->setCheckable(true);
-    connect(fullscreenAction, SIGNAL(triggered()), this, SLOT(toggleFullScreen()));
-    settingsMenu->addAction(fullscreenAction);
-#endif
-
-    QMenu *propertiesMenu = settingsMenu->addMenu(tr("Properties"));
-    QActionGroup *orientation = new QActionGroup(parent);
-
-    QAction *toggleOrientation = new QAction(tr("&Toggle Orientation"), parent);
-    toggleOrientation->setCheckable(true);
-    toggleOrientation->setShortcut(QKeySequence("Ctrl+T"));
-    settingsMenu->addAction(toggleOrientation);
-    connect(toggleOrientation, SIGNAL(triggered()), this, SLOT(toggleOrientation()));
-
-    orientation->setExclusive(true);
-    portraitOrientation = new QAction(tr("orientation: Portrait"), parent);
-    portraitOrientation->setCheckable(true);
-    connect(portraitOrientation, SIGNAL(triggered()), this, SLOT(setPortrait()));
-    orientation->addAction(portraitOrientation);
-    propertiesMenu->addAction(portraitOrientation);
-
-    landscapeOrientation = new QAction(tr("orientation: Landscape"), parent);
-    landscapeOrientation->setCheckable(true);
-    connect(landscapeOrientation, SIGNAL(triggered()), this, SLOT(setLandscape()));
-    orientation->addAction(landscapeOrientation);
-    propertiesMenu->addAction(landscapeOrientation);
-
-    if (flatmenu) flatmenu->addSeparator();
-
-    QMenu *helpMenu = flatmenu ? flatmenu : menu->addMenu(tr("&Help"));
-    QAction *aboutAction = new QAction(tr("&About Qt..."), parent);
-    connect(aboutAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
-    helpMenu->addAction(aboutAction);
-
-    QAction *quitAction = new QAction(tr("&Quit"), parent);
-    quitAction->setShortcut(QKeySequence("Ctrl+Q"));
-    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
-    fileMenu->addSeparator();
-    fileMenu->addAction(quitAction);
-    if (menu) {
-        menu->setFixedHeight(menu->sizeHint().height());
-        menu->setMinimumWidth(10);
-    }
-}
-
-void QmlViewer::showProxySettings()
-{
-    ProxySettings settingsDlg (this);
-
-    connect (&settingsDlg, SIGNAL (accepted()), this, SLOT (proxySettingsChanged ()));
-
-    settingsDlg.exec();
-}
-
-void QmlViewer::proxySettingsChanged()
-{
-    reload ();
-}
-
-void QmlViewer::setPortrait()
-{
-    DeviceOrientation::instance()->setOrientation(DeviceOrientation::Portrait);
-    portraitOrientation->setChecked(true);
-}
-
-void QmlViewer::setLandscape()
-{
-    DeviceOrientation::instance()->setOrientation(DeviceOrientation::Landscape);
-    landscapeOrientation->setChecked(true);
-}
-
-void QmlViewer::toggleOrientation()
-{
-    DeviceOrientation::instance()->setOrientation(DeviceOrientation::instance()->orientation()==DeviceOrientation::Portrait?DeviceOrientation::Landscape:DeviceOrientation::Portrait);
-}
-
-void QmlViewer::toggleFullScreen()
-{
-    if (isFullScreen())
-        showMaximized();
-    else
-        showFullScreen();
-}
-
-void QmlViewer::setScaleSkin()
-{
-    if (scaleSkin)
-        return;
-    scaleSkin = true;
-    canvas->setResizeMode((!skin || !scaleSkin) ? QmlView::SizeRootObjectToView : QmlView::SizeViewToRootObject);
-    if (skin) {
-        canvas->setFixedSize(canvas->sizeHint());
-        skin->setScreenSize(canvas->sizeHint());
-    }
-}
-
-void QmlViewer::setScaleView()
-{
-    if (!scaleSkin)
-        return;
-    scaleSkin = false;
-    if (skin) {
-        canvas->setResizeMode((!skin || !scaleSkin) ? QmlView::SizeRootObjectToView : QmlView::SizeViewToRootObject);
-        canvas->setMinimumSize(QSize(0,0));
-        canvas->setMaximumSize(QSize(16777215,16777215));
-        canvas->resize(skin->standardScreenSize());
-        skin->setScreenSize(skin->standardScreenSize());
-    }
-}
-
-
-void QmlViewer::takeSnapShot()
-{
-    static int snapshotcount = 1;
-    QString snapFileName = QString(QLatin1String("snapshot%1.png")).arg(snapshotcount);
-    QPixmap::grabWidget(canvas).save(snapFileName);
-    qDebug() << "Wrote" << snapFileName;
-    ++snapshotcount;
-}
-
-void QmlViewer::pickRecordingFile()
-{
-    QString fileName = getVideoFileName();
-    if (!fileName.isEmpty())
-        recdlg->file->setText(fileName);
-}
-
-void QmlViewer::chooseRecordingOptions()
-{
-    // File
-    recdlg->file->setText(record_file);
-
-    // Size
-    recdlg->sizeOriginal->setText(tr("Original (%1x%2)").arg(canvas->width()).arg(canvas->height()));
-    if (recdlg->sizeWidth->value()<=1) {
-        recdlg->sizeWidth->setValue(canvas->width());
-        recdlg->sizeHeight->setValue(canvas->height());
-    }
-
-    // Rate
-    if (record_rate == 24)
-        recdlg->hz24->setChecked(true);
-    else if (record_rate == 25)
-        recdlg->hz25->setChecked(true);
-    else if (record_rate == 50)
-        recdlg->hz50->setChecked(true);
-    else if (record_rate == 60)
-        recdlg->hz60->setChecked(true);
-    else {
-        recdlg->hzCustom->setChecked(true);
-        recdlg->hz->setText(QString::number(record_rate));
-    }
-
-    // Profile
-    recdlg->setArguments(record_args.join(" "));
-    if (recdlg->exec()) {
-        // File
-        record_file = recdlg->file->text();
-        // Size
-        if (recdlg->sizeOriginal->isChecked())
-            record_outsize = QSize();
-        else if (recdlg->size720p->isChecked())
-            record_outsize = QSize(1280,720);
-        else if (recdlg->sizeVGA->isChecked())
-            record_outsize = QSize(640,480);
-        else if (recdlg->sizeQVGA->isChecked())
-            record_outsize = QSize(320,240);
-        else
-            record_outsize = QSize(recdlg->sizeWidth->value(),recdlg->sizeHeight->value());
-        // Rate
-        if (recdlg->hz24->isChecked())
-            record_rate = 24;
-        else if (recdlg->hz25->isChecked())
-            record_rate = 25;
-        else if (recdlg->hz50->isChecked())
-            record_rate = 50;
-        else if (recdlg->hz60->isChecked())
-            record_rate = 60;
-        else {
-            record_rate = recdlg->hz->text().toDouble();
-        }
-        // Profile
-        record_args = recdlg->arguments().split(" ",QString::SkipEmptyParts);
-    }
-}
-
-void QmlViewer::toggleRecordingWithSelection()
-{
-    if (!recordTimer.isRunning()) {
-        if (record_file.isEmpty()) {
-            QString fileName = getVideoFileName();
-            if (fileName.isEmpty())
-                return;
-            if (!fileName.contains(QRegExp(".[^\\/]*$")))
-                fileName += ".avi";
-            setRecordFile(fileName);
-        }
-    }
-    toggleRecording();
-}
-
-void QmlViewer::toggleRecording()
-{
-    if (record_file.isEmpty()) {
-        toggleRecordingWithSelection();
-        return;
-    }
-    bool recording = !recordTimer.isRunning();
-    recordAction->setText(recording ? tr("&Stop Recording Video\tF9") : tr("&Start Recording Video\tF9"));
-    setRecording(recording);
-}
-
-void QmlViewer::setSlowMode(bool enable)
-{
-    QUnifiedTimer::instance()->setSlowModeEnabled(enable);
-}
-
-void QmlViewer::addLibraryPath(const QString& lib)
-{
-    canvas->engine()->addImportPath(lib);
-}
-
-void QmlViewer::reload()
-{
-    openQml(currentFileOrUrl);
-}
-
-void QmlViewer::open(const QString& doc)
-{
-#ifdef QMLVIEWER_ZIP_SUPPORT
-    if (doc.endsWith(".wgt",Qt::CaseInsensitive)
-     || doc.endsWith(".wgz",Qt::CaseInsensitive)
-     || doc.endsWith(".zip",Qt::CaseInsensitive))
-        openWgt(doc);
-    else
-#endif
-        openQml(doc);
-}
-
-void QmlViewer::openWgt(const QString& doc)
-{
-#ifdef QMLVIEWER_ZIP_SUPPORT
-    // XXX This functionality could be migrated to QmlView once refined
-
-    QUrl url(doc);
-    if (url.isRelative())
-        url = QUrl::fromLocalFile(doc);
-    delete canvas->rootObject();
-    canvas->engine()->clearComponentCache();
-    QNetworkAccessManager * nam = canvas->engine()->networkAccessManager();
-    wgtreply = nam->get(QNetworkRequest(url));
-    connect(wgtreply,SIGNAL(finished()),this,SLOT(unpackWgt()));
-#endif
-}
-
-#ifdef QMLVIEWER_ZIP_SUPPORT
-static void removeRecursive(const QString& dirname)
-{
-    QDir dir(dirname);
-    QFileInfoList entries(dir.entryInfoList(QDir::Dirs|QDir::Files|QDir::NoDotAndDotDot));
-    for (int i = 0; i < entries.count(); ++i)
-        if (entries[i].isDir())
-            removeRecursive(entries[i].filePath());
-        else
-            dir.remove(entries[i].fileName());
-    QDir().rmdir(dirname);
-}
-#endif
-
-void QmlViewer::unpackWgt()
-{
-#ifdef QMLVIEWER_ZIP_SUPPORT
-    QByteArray all = wgtreply->readAll();
-    QBuffer buf(&all);
-    buf.open(QIODevice::ReadOnly);
-    QZipReader zip(&buf);
-    /*
-    for (int i=0; i<zip.count(); ++i) {
-        QZipReader::FileInfo info = zip.entryInfoAt(i);
-        qDebug() << "zip:" << info.filePath;
-    }
-    */
-    wgtdir = QDir::tempPath()+QDir::separator()+QLatin1String("qmlviewer-wgt");
-    removeRecursive(wgtdir);
-    QDir().mkpath(wgtdir);
-    zip.extractAll(wgtdir);
-
-    QString rootfile;
-
-    if (wgtreply->header(QNetworkRequest::ContentTypeHeader).toString() == "application/widget" || wgtreply->url().path().endsWith(".wgt",Qt::CaseInsensitive)) {
-        // W3C Draft http://www.w3.org/TR/2009/CR-widgets-20091201
-        QFile configfile(wgtdir+QDir::separator()+"config.xml");
-        if (configfile.open(QIODevice::ReadOnly)) {
-            QXmlStreamReader config(&configfile);
-            if (config.readNextStartElement() && config.name() == "widget") {
-                while (config.readNextStartElement()) {
-                    if (config.name() == "content") {
-                        rootfile = wgtdir + QDir::separator();
-                        rootfile += config.attributes().value(QLatin1String("src"));
-                    }
-                    // XXX process other config
-
-                    config.skipCurrentElement();
-                }
-            }
-        } else {
-            qWarning("No config.xml found - non-standard WGT file");
-        }
-        if (rootfile.isEmpty()) {
-            QString def = wgtdir+QDir::separator()+"index.qml";
-            if (QFile::exists(def))
-                rootfile = def;
-        }
-    } else {
-        // Just find index.qml, preferably at the root
-        for (int i=0; i<zip.count(); ++i) {
-            QZipReader::FileInfo info = zip.entryInfoAt(i);
-            if (info.filePath.compare(QLatin1String("index.qml"),Qt::CaseInsensitive)==0)
-                rootfile = wgtdir+QDir::separator()+info.filePath;
-            if (rootfile.isEmpty() && info.filePath.endsWith("/index.qml",Qt::CaseInsensitive))
-                rootfile = wgtdir+QDir::separator()+info.filePath;
-        }
-    }
-
-    openQml(rootfile);
-#endif
-}
-
-void QmlViewer::openFile()
-{
-    QString cur = canvas->source().toLocalFile();
-    if (useQmlFileBrowser) {
-        openQml("qrc:/content/Browser.qml");
-    } else {
-        QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), cur, tr("QML Files (*.qml)"));
-        if (!fileName.isEmpty()) {
-            QFileInfo fi(fileName);
-            openQml(fi.absoluteFilePath());
-        }
-    }
-}
-
-void QmlViewer::statusChanged()
-{
-    if (canvas->status() == QmlView::Error && tester)
-        tester->executefailure();
-
-    if (canvas->status() == QmlView::Ready)
-        resize(sizeHint());
-}
-
-void QmlViewer::launch(const QString& file_or_url)
-{
-    QMetaObject::invokeMethod(this, "openQml", Qt::QueuedConnection, Q_ARG(QString, file_or_url));
-}
-
-void QmlViewer::openQml(const QString& file_or_url)
-{
-    currentFileOrUrl = file_or_url;
-
-    QUrl url;
-    QFileInfo fi(file_or_url);
-    if (fi.exists())
-        url = QUrl::fromLocalFile(fi.absoluteFilePath());
-    else
-        url = QUrl(file_or_url);
-    setWindowTitle(tr("%1 - Qt Declarative UI Viewer").arg(file_or_url));
-
-    if (!m_script.isEmpty()) 
-        tester = new QmlGraphicsTester(m_script, m_scriptOptions, canvas);
-
-    delete canvas->rootObject();
-    canvas->engine()->clearComponentCache();
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("qmlViewer", this);
-#ifdef Q_OS_SYMBIAN
-    ctxt->setContextProperty("qmlViewerFolder", "E:\\"); // Documents on your S60 phone
-#else
-    ctxt->setContextProperty("qmlViewerFolder", QDir::currentPath());
-#endif
-
-    QString fileName = url.toLocalFile();
-    if (!fileName.isEmpty()) {
-        QFileInfo fi(fileName);
-        if (fi.exists()) {
-            if (fi.suffix().toLower() != QLatin1String("qml")) {
-                qWarning() << "qmlviewer cannot open non-QML file" << fileName;
-                return;
-            }
-
-            QDir dir(fi.path()+"/dummydata", "*.qml");
-            QStringList list = dir.entryList();
-            for (int i = 0; i < list.size(); ++i) {
-                QString qml = list.at(i);
-                QFile f(dir.filePath(qml));
-                f.open(QIODevice::ReadOnly);
-                QByteArray data = f.readAll();
-                QmlComponent comp(canvas->engine());
-                comp.setData(data, QUrl());
-                QObject *dummyData = comp.create();
-
-                if(comp.isError()) {
-                    QList<QmlError> errors = comp.errors();
-                    foreach (const QmlError &error, errors) {
-                        qWarning() << error;
-                    }
-                    if (tester) tester->executefailure();
-                }
-
-                if (dummyData) {
-                    qWarning() << "Loaded dummy data:" << dir.filePath(qml);
-                    qml.truncate(qml.length()-4);
-                    ctxt->setContextProperty(qml, dummyData);
-                    dummyData->setParent(this);
-                }
-            }
-        } else {
-            qWarning() << "qmlviewer cannot find file:" << fileName;
-            return;
-        }
-    }
-
-    QTime t;
-    t.start();
-
-    canvas->setSource(url);
-
-    qWarning() << "Wall startup time:" << t.elapsed();
-
-    if (!skin) {
-        canvas->updateGeometry();
-        if (mb)
-            mb->updateGeometry();
-        if (!isFullScreen() && !isMaximized())
-            resize(sizeHint());
-    } else {
-        if (scaleSkin)
-            canvas->resize(canvas->sizeHint());
-        else {
-            canvas->setFixedSize(skin->standardScreenSize());
-            canvas->resize(skin->standardScreenSize());
-        }
-    }
-
-#ifdef QTOPIA
-    show();
-#endif
-}
-
-void QmlViewer::startNetwork()
-{
-#if defined(SYMBIAN_NETWORK_INIT)
-    qt_SetDefaultIap();
-#endif
-}
-
-QStringList QmlViewer::builtinSkins() const
-{
-    QDir dir(":/skins/","*.skin");
-    const QFileInfoList l = dir.entryInfoList();
-    QStringList r;
-    for (QFileInfoList::const_iterator it = l.begin(); it != l.end(); ++it) {
-        r += (*it).baseName();
-    }
-    return r;
-}
-
-void QmlViewer::setSkin(const QString& skinDirOrName)
-{
-    QString skinDirectory = skinDirOrName;
-
-    if (!QDir(skinDirOrName).exists() && QDir(":/skins/"+skinDirOrName+".skin").exists())
-        skinDirectory = ":/skins/"+skinDirOrName+".skin";
-
-    if (currentSkin == skinDirectory)
-        return;
-
-    currentSkin = skinDirectory;
-
-    // XXX QWidget::setMask does not handle changes well, and we may
-    // XXX have been signalled from an item in a menu we're replacing,
-    // XXX hence some rather convoluted resetting here...
-
-    QString err;
-    if (skin) {
-        skin->hide();
-        skin->deleteLater();
-    }
-
-    canvas->setResizeMode((!skin || !scaleSkin) ? QmlView::SizeRootObjectToView : QmlView::SizeViewToRootObject);
-
-    DeviceSkinParameters parameters;
-    if (!skinDirectory.isEmpty() && parameters.read(skinDirectory,DeviceSkinParameters::ReadAll,&err)) {
-        layout()->setEnabled(false);
-        //setMenuBar(0);
-        if (mb)
-            mb->hide();
-        if (!err.isEmpty())
-            qWarning() << err;
-        skin = new PreviewDeviceSkin(parameters,this);
-        canvas->resize(canvas->sizeHint());
-        if (scaleSkin)
-            skin->setPreviewAndScale(canvas);
-        else
-            skin->setPreview(canvas);
-        createMenu(0,skin->menu);
-        skin->show();
-    } else {
-        skin = 0;
-        clearMask();
-        menuBar()->clear();
-        canvas->setParent(this, Qt::SubWindow);
-        createMenu(menuBar(),0);
-        mb->show();
-        setMinimumSize(QSize(0,0));
-        setMaximumSize(QSize(16777215,16777215));
-        canvas->setMinimumSize(QSize(0,0));
-        canvas->setMaximumSize(QSize(16777215,16777215));
-        QRect g = geometry();
-        g.setSize(sizeHint());
-        setParent(0,windowFlags()); // recreate
-        canvas->move(0,menuBar()->sizeHint().height());
-        setGeometry(g);
-        layout()->setEnabled(true);
-        show();
-    }
-    canvas->show();
-}
-
-void QmlViewer::setAutoRecord(int from, int to)
-{
-    if (from==0) from=1; // ensure resized
-    record_autotime = to-from;
-    autoStartTimer.setInterval(from);
-    autoStartTimer.setRunning(true);
-}
-
-void QmlViewer::setRecordArgs(const QStringList& a)
-{
-    record_args = a;
-}
-
-void QmlViewer::setRecordFile(const QString& f)
-{
-    record_file = f;
-}
-
-void QmlViewer::setRecordRate(int fps)
-{
-    record_rate = fps;
-}
-
-void QmlViewer::sceneResized(QSize size)
-{
-    if (size.width() > 0 && size.height() > 0) {
-        if (skin && scaleSkin)
-            skin->setScreenSize(size);
-    }
-}
-
-void QmlViewer::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_0 && devicemode)
-        exit(0);
-    else if (event->key() == Qt::Key_F1 || (event->key() == Qt::Key_1 && devicemode)) {
-        qDebug() << "F1 - help\n"
-                 << "F2 - save test script\n"
-                 << "F3 - take PNG snapshot\n"
-                 << "F4 - show items and state\n"
-                 << "F5 - reload QML\n"
-                 << "F6 - show object tree\n"
-                 << "F7 - show timing\n"
-                 << "F8 - show performance (if available)\n"
-                 << "F9 - toggle video recording\n"
-                 << "F10 - toggle orientation\n"
-                 << "device keys: 0=quit, 1..8=F1..F8"
-                ;
-    } else if (event->key() == Qt::Key_F2 || (event->key() == Qt::Key_2 && devicemode)) {
-        if (tester && m_scriptOptions & Record)
-            tester->save();
-    } else if (event->key() == Qt::Key_F3 || (event->key() == Qt::Key_3 && devicemode)) {
-        takeSnapShot();
-    } else if (event->key() == Qt::Key_F5 || (event->key() == Qt::Key_5 && devicemode)) {
-        reload();
-    } else if (event->key() == Qt::Key_F8 || (event->key() == Qt::Key_8 && devicemode)) {
-        QPerformanceLog::displayData();
-        QPerformanceLog::clear();
-    } else if (event->key() == Qt::Key_F9 || (event->key() == Qt::Key_9 && devicemode)) {
-        toggleRecording();
-    } else if (event->key() == Qt::Key_F10) {
-        if (portraitOrientation) {
-            if (portraitOrientation->isChecked())
-                setLandscape();
-            else
-                setPortrait();
-        }
-    }
-
-    QWidget::keyPressEvent(event);
-}
-
-void QmlViewer::senseImageMagick()
-{
-    QProcess proc;
-    proc.start("convert", QStringList() << "-h");
-    proc.waitForFinished(2000);
-    QString help = proc.readAllStandardOutput();
-    convertAvailable = help.contains("ImageMagick");
-}
-
-void QmlViewer::senseFfmpeg()
-{
-    QProcess proc;
-    proc.start("ffmpeg", QStringList() << "-h");
-    proc.waitForFinished(2000);
-    QString ffmpegHelp = proc.readAllStandardOutput();
-    ffmpegAvailable = ffmpegHelp.contains("-s ");
-    ffmpegHelp = tr("Video recording uses ffmpeg:")+"\n\n"+ffmpegHelp;
-
-    QDialog *d = new QDialog(recdlg);
-    QVBoxLayout *l = new QVBoxLayout(d);
-    QTextBrowser *b = new QTextBrowser(d);
-    QFont f = b->font();
-    f.setFamily("courier");
-    b->setFont(f);
-    b->setText(ffmpegHelp);
-    l->addWidget(b);
-    d->setLayout(l);
-    ffmpegHelpWindow = d;
-    connect(recdlg->ffmpegHelp,SIGNAL(clicked()), ffmpegHelpWindow, SLOT(show()));
-}
-
-void QmlViewer::setRecording(bool on)
-{
-    if (on == recordTimer.isRunning())
-        return;
-
-    int period = int(1000/record_rate+0.5);
-    QUnifiedTimer::instance()->setTimingInterval(on ? period:16);
-    QUnifiedTimer::instance()->setConsistentTiming(on);
-    if (on) {
-        canvas->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
-        recordTimer.setInterval(period);
-        recordTimer.setRunning(true);
-        frame_fmt = record_file.right(4).toLower();
-        frame = QImage(canvas->width(),canvas->height(),QImage::Format_RGB32);
-        if (frame_fmt != ".png" && (!convertAvailable || frame_fmt != ".gif")) {
-            // Stream video to ffmpeg
-
-            QProcess *proc = new QProcess(this);
-            connect(proc, SIGNAL(finished(int)), this, SLOT(ffmpegFinished(int)));
-            frame_stream = proc;
-
-            QStringList args;
-            args << "-y";
-            args << "-r" << QString::number(record_rate);
-            args << "-f" << "rawvideo";
-            args << "-pix_fmt" << (frame_fmt == ".gif" ? "rgb24" : "rgb32");
-            args << "-s" << QString("%1x%2").arg(canvas->width()).arg(canvas->height());
-            args << "-i" << "-";
-            if (record_outsize.isValid()) {
-                args << "-s" << QString("%1x%2").arg(record_outsize.width()).arg(record_outsize.height());
-                args << "-aspect" << QString::number(double(canvas->width())/canvas->height());
-            }
-            args += record_args;
-            args << record_file;
-            proc->start("ffmpeg",args);
-
-        } else {
-            // Store frames, save to GIF/PNG
-            frame_stream = 0;
-        }
-    } else {
-        canvas->setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
-        recordTimer.setRunning(false);
-        if (frame_stream) {
-            qDebug() << "Saving video...";
-            frame_stream->close();
-            qDebug() << "Wrote" << record_file;
-        } else {
-            QProgressDialog progress(tr("Saving frames..."), tr("Cancel"), 0, frames.count()+10, this);
-            progress.setWindowModality(Qt::WindowModal);
-
-            int frame=0;
-            QStringList inputs;
-            qDebug() << "Saving frames...";
-
-            QString framename;
-            bool png_output = false;
-            if (record_file.right(4).toLower()==".png") {
-                if (record_file.contains('%'))
-                    framename = record_file;
-                else
-                    framename = record_file.left(record_file.length()-4)+"%04d"+record_file.right(4);
-                png_output = true;
-            } else {
-                framename = "tmp-frame%04d.png";
-                png_output = false;
-            }
-            foreach (QImage* img, frames) {
-                progress.setValue(progress.value()+1);
-                if (progress.wasCanceled())
-                    break;
-                QString name;
-                name.sprintf(framename.toLocal8Bit(),frame++);
-                if (record_outsize.isValid())
-                    *img = img->scaled(record_outsize,Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
-                if (record_dither=="ordered")
-                    img->convertToFormat(QImage::Format_Indexed8,Qt::PreferDither|Qt::OrderedDither).save(name);
-                else if (record_dither=="threshold")
-                    img->convertToFormat(QImage::Format_Indexed8,Qt::PreferDither|Qt::ThresholdDither).save(name);
-                else if (record_dither=="floyd")
-                    img->convertToFormat(QImage::Format_Indexed8,Qt::PreferDither).save(name);
-                else
-                    img->save(name);
-                inputs << name;
-                delete img;
-            }
-
-            if (!progress.wasCanceled()) {
-                if (png_output) {
-                    framename.replace(QRegExp("%\\d*."),"*");
-                    qDebug() << "Wrote frames" << framename;
-                    inputs.clear(); // don't remove them
-                } else {
-                    // ImageMagick and gifsicle for GIF encoding
-                    progress.setLabelText(tr("Converting frames to GIF file..."));
-                    QStringList args;
-                    args << "-delay" << QString::number(period/10);
-                    args << inputs;
-                    args << record_file;
-                    qDebug() << "Converting..." << record_file << "(this may take a while)";
-                    if (0!=QProcess::execute("convert", args)) {
-                        qWarning() << "Cannot run ImageMagick 'convert' - recorded frames not converted";
-                        inputs.clear(); // don't remove them
-                        qDebug() << "Wrote frames tmp-frame*.png";
-                    } else {
-                        if (record_file.right(4).toLower() == ".gif") {
-                            qDebug() << "Compressing..." << record_file;
-                            if (0!=QProcess::execute("gifsicle", QStringList() << "-O2" << "-o" << record_file << record_file))
-                                qWarning() << "Cannot run 'gifsicle' - not compressed";
-                        }
-                        qDebug() << "Wrote" << record_file;
-                    }
-                }
-            }
-
-            progress.setValue(progress.maximum()-1);
-            foreach (QString name, inputs)
-                QFile::remove(name);
-
-            frames.clear();
-        }
-    }
-    qDebug() << "Recording: " << (recordTimer.isRunning()?"ON":"OFF");
-}
-
-void QmlViewer::ffmpegFinished(int code)
-{
-    qDebug() << "ffmpeg returned" << code << frame_stream->readAllStandardError();
-}
-
-void QmlViewer::autoStartRecording()
-{
-    setRecording(true);
-    autoStopTimer.setInterval(record_autotime);
-    autoStopTimer.setRunning(true);
-}
-
-void QmlViewer::autoStopRecording()
-{
-    setRecording(false);
-}
-
-void QmlViewer::recordFrame()
-{
-    canvas->QWidget::render(&frame);
-    if (frame_stream) {
-        if (frame_fmt == ".gif") {
-            // ffmpeg can't do 32bpp with gif
-            QImage rgb24 = frame.convertToFormat(QImage::Format_RGB888);
-            frame_stream->write((char*)rgb24.bits(),rgb24.numBytes());
-        } else {
-            frame_stream->write((char*)frame.bits(),frame.numBytes());
-        }
-    } else {
-        frames.append(new QImage(frame));
-    }
-}
-
-void QmlViewer::setDeviceKeys(bool on)
-{
-    devicemode = on;
-}
-
-void QmlViewer::setNetworkCacheSize(int size)
-{
-    namFactory->setCacheSize(size);
-}
-
-void QmlViewer::setUseGL(bool useGL)
-{
-#ifdef GL_SUPPORTED
-    if (useGL) {
-        QGLFormat format = QGLFormat::defaultFormat();
-        format.setSampleBuffers(false);
-
-        QGLWidget *glWidget = new QGLWidget(format);
-        glWidget->setAutoFillBackground(false);
-        canvas->setViewport(glWidget);
-    }
-#endif
-}
-
-void QmlViewer::setUseNativeFileBrowser(bool use)
-{
-    useQmlFileBrowser = !use;
-}
-
-void QmlViewer::registerTypes()
-{
-    QML_REGISTER_TYPE(QmlViewer, 1, 0, Screen, Screen);
-}
-
-QT_END_NAMESPACE
-
-#include "qmlviewer.moc"
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
deleted file mode 100644
index ac7b9a0..0000000
--- a/tools/qmlviewer/qmlviewer.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLVIEWER_H
-#define QMLVIEWER_H
-
-#include <QMainWindow>
-#include <QMenuBar>
-#include <private/qmltimer_p.h>
-#include <QTime>
-#include <QList>
-
-QT_BEGIN_NAMESPACE
-
-class QmlView;
-class PreviewDeviceSkin;
-class QmlGraphicsTestEngine;
-class QProcess;
-class RecordingDialog;
-class QmlGraphicsTester;
-class QNetworkReply;
-class QNetworkCookieJar;
-class NetworkAccessManagerFactory;
-
-class QmlViewer
-#if defined(Q_OS_SYMBIAN)
-    : public QMainWindow
-#else
-    : public QWidget
-#endif
-{
-Q_OBJECT
-public:
-    QmlViewer(QWidget *parent=0, Qt::WindowFlags flags=0);
-    ~QmlViewer();
-
-    static void registerTypes();
-
-    enum ScriptOption {
-        Play = 0x00000001,
-        Record = 0x00000002,
-        TestImages = 0x00000004,
-        TestErrorProperty = 0x00000008,
-        SaveOnExit = 0x00000010,
-        ExitOnComplete = 0x00000020,
-        ExitOnFailure = 0x00000040
-    };
-    Q_DECLARE_FLAGS(ScriptOptions, ScriptOption)
-    void setScript(const QString &s) { m_script = s; }
-    void setScriptOptions(ScriptOptions opt) { m_scriptOptions = opt; }
-    void setRecordDither(const QString& s) { record_dither = s; }
-    void setRecordRate(int fps);
-    void setRecordFile(const QString&);
-    void setRecordArgs(const QStringList&);
-    void setRecording(bool on);
-    bool isRecording() const { return recordTimer.isRunning(); }
-    void setAutoRecord(int from, int to);
-    void setDeviceKeys(bool);
-    void setNetworkCacheSize(int size);
-    void addLibraryPath(const QString& lib);
-    void setUseGL(bool use);
-    void setUseNativeFileBrowser(bool);
-
-    QStringList builtinSkins() const;
-
-    QMenuBar *menuBar() const;
-
-public slots:
-    void sceneResized(QSize size);
-    void open(const QString&);
-    void openWgt(const QString&);
-    void openQml(const QString&);
-    void openFile();
-    void reload();
-    void takeSnapShot();
-    void toggleRecording();
-    void toggleRecordingWithSelection();
-    void ffmpegFinished(int code);
-    void setSkin(const QString& skinDirectory);
-    void showProxySettings ();
-    void proxySettingsChanged ();
-    void setScaleView();
-    void statusChanged();
-    void setSlowMode(bool);
-    void launch(const QString &);
-
-protected:
-    virtual void keyPressEvent(QKeyEvent *);
-
-    void createMenu(QMenuBar *menu, QMenu *flatmenu);
-
-private slots:
-    void autoStartRecording();
-    void autoStopRecording();
-    void recordFrame();
-    void chooseRecordingOptions();
-    void pickRecordingFile();
-    void setScaleSkin();
-    void setPortrait();
-    void setLandscape();
-    void toggleOrientation();
-    void startNetwork();
-    void toggleFullScreen();
-    void unpackWgt();
-
-private:
-    QString getVideoFileName();
-
-    PreviewDeviceSkin *skin;
-    QSize skinscreensize;
-    QmlView *canvas;
-    QString currentFileOrUrl;
-    QmlTimer recordTimer;
-    QString frame_fmt;
-    QImage frame;
-    QList<QImage*> frames;
-    QProcess* frame_stream;
-    QmlTimer autoStartTimer;
-    QmlTimer autoStopTimer;
-    QString record_dither;
-    QString record_file;
-    QSize record_outsize;
-    QStringList record_args;
-    int record_rate;
-    int record_autotime;
-    bool devicemode;
-    QAction *recordAction;
-    QString currentSkin;
-    bool scaleSkin;
-    mutable QMenuBar *mb;
-    RecordingDialog *recdlg;
-
-    void senseImageMagick();
-    void senseFfmpeg();
-    QWidget *ffmpegHelpWindow;
-    bool ffmpegAvailable;
-    bool convertAvailable;
-
-    QAction *portraitOrientation;
-    QAction *landscapeOrientation;
-
-    QString m_script;
-    ScriptOptions m_scriptOptions;
-    QmlGraphicsTester *tester;
-
-    QNetworkReply *wgtreply;
-    QString wgtdir;
-
-    NetworkAccessManagerFactory *namFactory;
-
-    bool useQmlFileBrowser;
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QmlViewer::ScriptOptions)
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro
deleted file mode 100644
index 2da244c..0000000
--- a/tools/qmlviewer/qmlviewer.pro
+++ /dev/null
@@ -1,58 +0,0 @@
-TEMPLATE = app
-CONFIG += qt \
-    uic
-DESTDIR = ../../bin
-QT += declarative \
-    script \
-    network \
-    sql
-
-contains(QT_CONFIG, opengl) {
-    QT += opengl
-    DEFINES += GL_SUPPORTED
-}
-
-# Input
-HEADERS += qmlviewer.h \
-           proxysettings.h \
-           qfxtester.h \
-           deviceorientation.h \
-           qmlfolderlistmodel.h
-SOURCES += main.cpp \
-           qmlviewer.cpp \
-           proxysettings.cpp \
-           qfxtester.cpp \
-           qmlfolderlistmodel.cpp
-RESOURCES = qmlviewer.qrc
-maemo5 {
-    SOURCES += deviceorientation_maemo.cpp
-} else {
-    SOURCES += deviceorientation.cpp
-}
-FORMS = recopts.ui \
-    proxysettings.ui
-INCLUDEPATH += ../../include/QtDeclarative
-INCLUDEPATH += ../../src/declarative/util
-INCLUDEPATH += ../../src/declarative/graphicsitems
-include(../shared/deviceskin/deviceskin.pri)
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
-
-wince* {
-QT += scripttools \
-    xml \
-    xmlpatterns \
-    phonon
-
-    contains(QT_CONFIG, webkit) {
-        QT += webkit 
-    }
-}
-symbian {
-#    TARGET.UID3 =
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-    HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
-    LIBS += -lesock  -lconnmon -linsock
-    TARGET.CAPABILITY = "All -TCB"
-}
diff --git a/tools/qmlviewer/qmlviewer.qrc b/tools/qmlviewer/qmlviewer.qrc
deleted file mode 100644
index 3a9e608..0000000
--- a/tools/qmlviewer/qmlviewer.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<RCC>
-    <qresource prefix="/" >
-        <file>content/Browser.qml</file>
-        <file>content/images/up.png</file>
-        <file>content/images/folder.png</file>
-        <file>content/images/titlebar.sci</file>
-        <file>content/images/titlebar.png</file>
-    </qresource>
-</RCC>
diff --git a/tools/qmlviewer/recopts.ui b/tools/qmlviewer/recopts.ui
deleted file mode 100644
index ce2da30..0000000
--- a/tools/qmlviewer/recopts.ui
+++ /dev/null
@@ -1,513 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>RecordingOptions</class>
- <widget class="QDialog" name="RecordingOptions">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>316</width>
-    <height>436</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Video options</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>File:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="file"/>
-     </item>
-     <item>
-      <widget class="QToolButton" name="pickfile">
-       <property name="text">
-        <string>...</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Size</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="sizeOriginal">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QRadioButton" name="sizeVGA">
-        <property name="text">
-         <string>VGA</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QRadioButton" name="size720p">
-        <property name="text">
-         <string>720p</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QRadioButton" name="sizeQVGA">
-        <property name="text">
-         <string>QVGA</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="3">
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QRadioButton" name="sizeCustom">
-          <property name="text">
-           <string>Width:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="sizeWidth">
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>9999</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Height:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="sizeHeight">
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>9999</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer_4">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::MinimumExpanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="rateOptions">
-     <property name="title">
-      <string>Rate</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_4">
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="hz60">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>60Hz</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QRadioButton" name="hz50">
-        <property name="text">
-         <string>50Hz</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QRadioButton" name="hz25">
-        <property name="text">
-         <string>25Hz</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="4">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QRadioButton" name="hzCustom">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="hz">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>60</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>100</width>
-            <height>16777215</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>Hz</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item row="1" column="2">
-       <widget class="QRadioButton" name="hz24">
-        <property name="text">
-         <string>24Hz</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::MinimumExpanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="1">
-       <spacer name="horizontalSpacer_5">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="ffmpegOptions">
-     <property name="title">
-      <string>Profile</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0" colspan="3">
-       <widget class="QComboBox" name="profile"/>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QLineEdit" name="args"/>
-      </item>
-      <item row="1" column="2">
-       <widget class="QToolButton" name="ffmpegHelp">
-        <property name="text">
-         <string>Help</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="warning">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>file</tabstop>
-  <tabstop>pickfile</tabstop>
-  <tabstop>sizeOriginal</tabstop>
-  <tabstop>sizeVGA</tabstop>
-  <tabstop>size720p</tabstop>
-  <tabstop>sizeQVGA</tabstop>
-  <tabstop>sizeCustom</tabstop>
-  <tabstop>sizeWidth</tabstop>
-  <tabstop>sizeHeight</tabstop>
-  <tabstop>hz60</tabstop>
-  <tabstop>hz25</tabstop>
-  <tabstop>hz50</tabstop>
-  <tabstop>hz24</tabstop>
-  <tabstop>hzCustom</tabstop>
-  <tabstop>hz</tabstop>
-  <tabstop>profile</tabstop>
-  <tabstop>args</tabstop>
-  <tabstop>ffmpegHelp</tabstop>
-  <tabstop>buttonBox</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>hzCustom</sender>
-   <signal>clicked()</signal>
-   <receiver>hz</receiver>
-   <slot>setFocus()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>43</x>
-     <y>257</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>129</x>
-     <y>262</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>hz</sender>
-   <signal>textChanged(QString)</signal>
-   <receiver>hzCustom</receiver>
-   <slot>toggle()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>143</x>
-     <y>262</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>43</x>
-     <y>257</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>hz</sender>
-   <signal>selectionChanged()</signal>
-   <receiver>hzCustom</receiver>
-   <slot>toggle()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>143</x>
-     <y>262</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>43</x>
-     <y>257</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>RecordingOptions</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>258</x>
-     <y>424</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>60</x>
-     <y>219</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>RecordingOptions</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>258</x>
-     <y>424</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>92</x>
-     <y>219</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>profile</sender>
-   <signal>activated(int)</signal>
-   <receiver>RecordingOptions</receiver>
-   <slot>pickProfile(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>92</x>
-     <y>329</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>48</x>
-     <y>194</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>args</sender>
-   <signal>textEdited(QString)</signal>
-   <receiver>RecordingOptions</receiver>
-   <slot>storeCustomArgs(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>128</x>
-     <y>357</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>102</x>
-     <y>189</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>sizeWidth</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>sizeCustom</receiver>
-   <slot>toggle()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>108</x>
-     <y>133</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>48</x>
-     <y>133</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>sizeHeight</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>sizeCustom</receiver>
-   <slot>toggle()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>212</x>
-     <y>133</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>64</x>
-     <y>129</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <signal>filePicked(QString)</signal>
-  <signal>argumentsPicked(QString)</signal>
-  <slot>pickFile()</slot>
-  <slot>pickProfile(int)</slot>
-  <slot>storeCustomArgs(QString)</slot>
- </slots>
-</ui>
diff --git a/tools/tools.pro b/tools/tools.pro
index d5569b6..3ed07b1 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -26,7 +26,7 @@ mac {
 
 embedded:SUBDIRS += kmap2qmap
 
-contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer
+contains(QT_CONFIG, declarative):SUBDIRS += qml
 contains(QT_CONFIG, dbus):SUBDIRS += qdbus
 !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
 embedded: SUBDIRS += makeqpf
-- 
cgit v0.12


From 274f5d95393aa6db857921675e306ea77d974ab4 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Wed, 24 Feb 2010 11:00:06 +1000
Subject: Compile warning-- for qmlviewer

---
 tools/qml/qfxtester.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/qml/qfxtester.cpp b/tools/qml/qfxtester.cpp
index 7344f58..638a3c9 100644
--- a/tools/qml/qfxtester.cpp
+++ b/tools/qml/qfxtester.cpp
@@ -297,7 +297,6 @@ void QDeclarativeTester::updateCurrentTime(int msec)
     m_keyEvents.clear();
 
     // Advance test script
-    static int imgCount = 0;
     while (testscript && testscript->count() > testscriptidx) {
 
         QObject *event = testscript->event(testscriptidx);
-- 
cgit v0.12


From a2a8cea2835ef24104fe784b6ce0f508cc5637c0 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Wed, 24 Feb 2010 15:06:56 +1000
Subject: Automatically connect to a notify signal if the requested signal is
 in the "onFooChanged" form, even if the notify signal is not called
 "fooChanged".

Task-number: QT-2783
---
 src/declarative/qml/qdeclarativecompiler.cpp            | 10 ++++++++++
 .../qdeclarativelanguage/data/autoNotifyConnection.qml  |  6 ++++++
 tests/auto/declarative/qdeclarativelanguage/testtypes.h |  6 ++++++
 .../qdeclarativelanguage/tst_qdeclarativelanguage.cpp   | 17 +++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/autoNotifyConnection.qml

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 0593a5d..b6ebd60 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1326,6 +1326,16 @@ int QDeclarativeCompiler::findSignalByName(const QMetaObject *mo, const QByteArr
         if (methodName == name)
             return ii;
     }
+
+    // If no signal is found, but the signal is of the form "onBlahChanged",
+    // return the notify signal for the property "Blah"
+    if (name.endsWith("Changed")) {
+        QByteArray propName = name.mid(0, name.length() - 7);
+        int propIdx = mo->indexOfProperty(propName.constData());
+        if (propIdx >= 0)
+            return mo->property(propIdx).notifySignalIndex();
+    }
+
     return -1;
 }
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/autoNotifyConnection.qml b/tests/auto/declarative/qdeclarativelanguage/data/autoNotifyConnection.qml
new file mode 100644
index 0000000..640fb54
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/autoNotifyConnection.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+MyQmlObject {
+    property bool receivedNotify : false
+    onPropertyWithNotifyChanged: { receivedNotify = true; }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index 21f3e70..fa62eb4 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -102,6 +102,7 @@ class MyQmlObject : public QObject, public MyInterface, public QDeclarativeParse
     Q_PROPERTY(int onLiteralSignal READ onLiteralSignal WRITE setOnLiteralSignal);
     Q_PROPERTY(MyCustomVariantType customType READ customType WRITE setCustomType);
     Q_PROPERTY(MyQmlObject *qmlobjectProperty READ qmlobject WRITE setQmlobject)
+    Q_PROPERTY(int propertyWithNotify READ propertyWithNotify WRITE setPropertyWithNotify NOTIFY oddlyNamedNotifySignal)
 
     Q_INTERFACES(MyInterface QDeclarativeParserStatus)
 public:
@@ -137,6 +138,9 @@ public:
 
     MyCustomVariantType customType() const { return m_custom; }
     void setCustomType(const MyCustomVariantType &v)  { m_custom = v; }
+
+    int propertyWithNotify() const { return m_propertyWithNotify; }
+    void setPropertyWithNotify(int i) { m_propertyWithNotify = i; emit oddlyNamedNotifySignal(); }
 public slots:
     void basicSlot() { qWarning("MyQmlObject::basicSlot"); }
     void basicSlotWithArgs(int v) { qWarning("MyQmlObject::basicSlotWithArgs(%d)", v); }
@@ -144,6 +148,7 @@ public slots:
 signals:
     void basicSignal();
     void basicParameterizedSignal(int parameter);
+    void oddlyNamedNotifySignal();
 
 private:
     friend class tst_qmllanguage;
@@ -151,6 +156,7 @@ private:
     MyInterface *m_interface;
     MyQmlObject *m_qmlobject;
     MyCustomVariantType m_custom;
+    int m_propertyWithNotify;
 };
 QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
 QML_DECLARE_TYPE(MyQmlObject);
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index cb59f47..b177636 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -88,6 +88,7 @@ private slots:
     void rootAsQmlComponent();
     void inlineQmlComponents();
     void idProperty();
+    void autoNotifyConnection();
     void assignSignal();
     void dynamicProperties();
     void dynamicPropertiesNested();
@@ -511,6 +512,22 @@ void tst_qmllanguage::idProperty()
     QCOMPARE(object->property("object"), QVariant::fromValue((QObject *)child));
 }
 
+// Tests automatic connection to notify signals if "onBlahChanged" syntax is used
+// even if the notify signal for "blah" is not called "blahChanged"
+void tst_qmllanguage::autoNotifyConnection()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("autoNotifyConnection.qml"));
+    VERIFY_ERRORS(0);
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+    QMetaProperty prop = object->metaObject()->property(object->metaObject()->indexOfProperty("receivedNotify"));
+    QVERIFY(prop.isValid());
+
+    QCOMPARE(prop.read(object), QVariant::fromValue(false));
+    object->setPropertyWithNotify(1);
+    QCOMPARE(prop.read(object), QVariant::fromValue(true));
+}
+
 // Tests that signals can be assigned to
 void tst_qmllanguage::assignSignal()
 {
-- 
cgit v0.12


From 42e493f397436607d219edfc76a2e04fbb8c2a18 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Wed, 24 Feb 2010 14:40:09 +1000
Subject: Fix declarative failing auto-test, missing rename of the test file

---
 .../qdeclarativeecmascript/data/declarativeToString.qml       | 11 +++++++++++
 .../qdeclarativeecmascript/data/qdeclarativeToString.qml      | 11 -----------
 .../qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp     |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/declarativeToString.qml
 delete mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/declarativeToString.qml b/tests/auto/declarative/qdeclarativeecmascript/data/declarativeToString.qml
new file mode 100644
index 0000000..ac296ce
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/declarativeToString.qml
@@ -0,0 +1,11 @@
+import Qt.test 1.0
+
+MyQmlObject{
+    id: obj
+    objectName: "objName"
+    function testToString()
+    {
+        obj.stringProperty = obj.toString();
+    }
+
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml
deleted file mode 100644
index ac296ce..0000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt.test 1.0
-
-MyQmlObject{
-    id: obj
-    objectName: "objName"
-    function testToString()
-    {
-        obj.stringProperty = obj.toString();
-    }
-
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 0c8dcb5..bbdb5cd 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -870,7 +870,7 @@ void tst_qmlecmascript::dynamicDestruction()
 */
 void tst_qmlecmascript::objectToString()
 {
-    QDeclarativeComponent component(&engine, TEST_FILE("qmlToString.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("declarativeToString.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
     QVERIFY(object != 0);
     QMetaObject::invokeMethod(object, "testToString");
-- 
cgit v0.12


From b9c5c6b562ffbaeb509cffd300898018357834f3 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Wed, 24 Feb 2010 15:06:13 +1000
Subject: Change autotest class prefix from QmlXXX to QDeclarativeXXX,
 QmlGraphicsXXX to QDeclarativeXXX.

---
 tests/auto/declarative/layouts/tst_layouts.cpp     |  14 +--
 .../tst_qdeclarativeanchors.cpp                    |  34 +++---
 .../tst_qdeclarativeanimatedimage.cpp              |  22 ++--
 .../tst_qdeclarativeanimations.cpp                 |  40 +++----
 .../tst_qdeclarativebehaviors.cpp                  |  34 +++---
 .../tst_qdeclarativebinding.cpp                    |  12 +--
 .../tst_qdeclarativeborderimage.cpp                |  32 +++---
 .../tst_qdeclarativeconnection.cpp                 |  16 +--
 .../tst_qdeclarativecontext.cpp                    |  20 ++--
 .../tst_qdeclarativedatetimeformatter.cpp          |  12 +--
 .../qdeclarativedebug/tst_qdeclarativedebug.cpp    |  76 +++++++-------
 .../tst_qdeclarativedebugclient.cpp                |  42 ++++----
 .../tst_qdeclarativedebugservice.cpp               |  42 ++++----
 .../qdeclarativedom/tst_qdeclarativedom.cpp        |  42 ++++----
 .../tst_qdeclarativeeasefollow.cpp                 |  14 +--
 .../declarative/qdeclarativeecmascript/testtypes.h |   2 +-
 .../tst_qdeclarativeecmascript.cpp                 | 102 +++++++++---------
 .../qdeclarativeengine/tst_qdeclarativeengine.cpp  |  20 ++--
 .../qdeclarativeerror/tst_qdeclarativeerror.cpp    |  18 ++--
 .../tst_qdeclarativeflickable.cpp                  |  24 ++---
 .../tst_qdeclarativeflipable.cpp                   |  14 +--
 .../tst_qdeclarativefontloader.cpp                 |  20 ++--
 .../tst_qdeclarativegridview.cpp                   |  36 +++----
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp    |  22 ++--
 .../tst_qdeclarativeimageprovider.cpp              |  12 +--
 .../qdeclarativeinfo/tst_qdeclarativeinfo.cpp      |  16 +--
 .../tst_qdeclarativeinstruction.cpp                |   8 +-
 .../qdeclarativeitem/tst_qdeclarativeitem.cpp      |  18 ++--
 .../declarative/qdeclarativelanguage/testtypes.h   |   2 +-
 .../tst_qdeclarativelanguage.cpp                   | 116 ++++++++++-----------
 .../tst_qdeclarativelistmodel.cpp                  |  24 ++---
 .../tst_qdeclarativelistreference.cpp              |  42 ++++----
 .../tst_qdeclarativelistview.cpp                   |  66 ++++++------
 .../qdeclarativeloader/tst_qdeclarativeloader.cpp  |  38 +++----
 .../tst_qdeclarativemetaproperty.cpp               |  34 +++---
 .../tst_qdeclarativemetatype.cpp                   |  20 ++--
 .../tst_qdeclarativemoduleplugin.cpp               |   8 +-
 .../tst_qdeclarativemousearea.cpp                  |   8 +-
 .../tst_qdeclarativenumberformatter.cpp            |  12 +--
 .../tst_qdeclarativeparticles.cpp                  |  18 ++--
 .../tst_qdeclarativepathview.cpp                   |  28 ++---
 .../tst_qdeclarativepixmapcache.cpp                |  14 +--
 .../tst_qdeclarativepositioners.cpp                |  32 +++---
 .../tst_qdeclarativepropertymap.cpp                |  18 ++--
 .../qdeclarativeqt/tst_qdeclarativeqt.cpp          |  40 +++----
 .../tst_qdeclarativerepeater.cpp                   |  24 ++---
 .../tst_qdeclarativespringfollow.cpp               |  14 +--
 .../qdeclarativestates/tst_qdeclarativestates.cpp  |  56 +++++-----
 .../tst_qdeclarativestyledtext.cpp                 |  10 +-
 .../tst_qdeclarativesystempalette.cpp              |  16 +--
 .../qdeclarativetext/tst_qdeclarativetext.cpp      |  46 ++++----
 .../tst_qdeclarativetextedit.cpp                   |  48 ++++-----
 .../tst_qdeclarativetextinput.cpp                  |  38 +++----
 .../qdeclarativetimer/tst_qdeclarativetimer.cpp    |  24 ++---
 .../tst_qdeclarativevaluetypes.cpp                 |  50 ++++-----
 .../tst_qdeclarativewebview.cpp                    |  40 +++----
 .../tst_qdeclarativexmlhttprequest.cpp             |  92 ++++++++--------
 .../tst_qdeclarativexmllistmodel.cpp               |  28 ++---
 tests/auto/declarative/shared/debugutil.cpp        |   8 +-
 tests/auto/declarative/shared/debugutil_p.h        |   4 +-
 60 files changed, 891 insertions(+), 891 deletions(-)

diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp
index b580336..942125f 100644
--- a/tests/auto/declarative/layouts/tst_layouts.cpp
+++ b/tests/auto/declarative/layouts/tst_layouts.cpp
@@ -45,11 +45,11 @@
 #include <qdeclarativeexpression.h>
 #include <QStyle>
 
-class tst_QmlGraphicsLayouts : public QObject
+class tst_QDeclarativeLayouts : public QObject
 {
     Q_OBJECT
 public:
-    tst_QmlGraphicsLayouts();
+    tst_QDeclarativeLayouts();
 
 private slots:
     void test_qml();//GraphicsLayout set up in Qml
@@ -59,11 +59,11 @@ private:
     QDeclarativeView *createView(const QString &filename);
 };
 
-tst_QmlGraphicsLayouts::tst_QmlGraphicsLayouts()
+tst_QDeclarativeLayouts::tst_QDeclarativeLayouts()
 {
 }
 
-void tst_QmlGraphicsLayouts::test_qml()
+void tst_QDeclarativeLayouts::test_qml()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/layouts.qml");
 
@@ -128,12 +128,12 @@ void tst_QmlGraphicsLayouts::test_qml()
     delete canvas;
 }
 
-void tst_QmlGraphicsLayouts::test_cpp()
+void tst_QDeclarativeLayouts::test_cpp()
 {
     //TODO: Waiting on QT-2407 to write this test
 }
 
-QDeclarativeView *tst_QmlGraphicsLayouts::createView(const QString &filename)
+QDeclarativeView *tst_QDeclarativeLayouts::createView(const QString &filename)
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setSource(QUrl::fromLocalFile(filename));
@@ -142,6 +142,6 @@ QDeclarativeView *tst_QmlGraphicsLayouts::createView(const QString &filename)
 }
 
 
-QTEST_MAIN(tst_QmlGraphicsLayouts)
+QTEST_MAIN(tst_QDeclarativeLayouts)
 
 #include "tst_layouts.moc"
diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
index ccc0ec7..9d8ba6c 100644
--- a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
+++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
@@ -51,11 +51,11 @@ Q_DECLARE_METATYPE(QDeclarativeAnchors::UsedAnchor)
 Q_DECLARE_METATYPE(QDeclarativeAnchorLine::AnchorLine)
 
 
-class tst_qmlgraphicsanchors : public QObject
+class tst_qdeclarativeanchors : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicsanchors() {}
+    tst_qdeclarativeanchors() {}
 
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &id);
@@ -80,7 +80,7 @@ private slots:
    Find an item with the specified id.
 */
 template<typename T>
-T *tst_qmlgraphicsanchors::findItem(QGraphicsObject *parent, const QString &objectName)
+T *tst_qdeclarativeanchors::findItem(QGraphicsObject *parent, const QString &objectName)
 {
     const QMetaObject &mo = T::staticMetaObject;
     QList<QGraphicsItem *> children = parent->childItems();
@@ -99,7 +99,7 @@ T *tst_qmlgraphicsanchors::findItem(QGraphicsObject *parent, const QString &obje
     return 0;
 }
 
-void tst_qmlgraphicsanchors::basicAnchors()
+void tst_qdeclarativeanchors::basicAnchors()
 {
     QDeclarativeView *view = new QDeclarativeView;
     view->setSource(QUrl::fromLocalFile(SRCDIR "/data/anchors.qml"));
@@ -167,7 +167,7 @@ void tst_qmlgraphicsanchors::basicAnchors()
 }
 
 // mostly testing that we don't crash
-void tst_qmlgraphicsanchors::loops()
+void tst_qdeclarativeanchors::loops()
 {
     {
         QUrl source(QUrl::fromLocalFile(SRCDIR "/data/loop1.qml"));
@@ -198,7 +198,7 @@ void tst_qmlgraphicsanchors::loops()
     }
 }
 
-void tst_qmlgraphicsanchors::illegalSets()
+void tst_qdeclarativeanchors::illegalSets()
 {
     QFETCH(QString, qml);
     QFETCH(QString, warning);
@@ -215,7 +215,7 @@ void tst_qmlgraphicsanchors::illegalSets()
     delete o;
 }
 
-void tst_qmlgraphicsanchors::illegalSets_data()
+void tst_qdeclarativeanchors::illegalSets_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("warning");
@@ -273,7 +273,7 @@ void tst_qmlgraphicsanchors::illegalSets_data()
         << "QML Rectangle (file::2:45) Cannot anchor to an item that isn't a parent or sibling.";
 }
 
-void tst_qmlgraphicsanchors::reset()
+void tst_qdeclarativeanchors::reset()
 {
     QFETCH(QString, side);
     QFETCH(QDeclarativeAnchorLine::AnchorLine, anchorLine);
@@ -300,7 +300,7 @@ void tst_qmlgraphicsanchors::reset()
     delete baseItem;
 }
 
-void tst_qmlgraphicsanchors::reset_data()
+void tst_qdeclarativeanchors::reset_data()
 {
     QTest::addColumn<QString>("side");
     QTest::addColumn<QDeclarativeAnchorLine::AnchorLine>("anchorLine");
@@ -316,7 +316,7 @@ void tst_qmlgraphicsanchors::reset_data()
     QTest::newRow("baseline") << "baseline" << QDeclarativeAnchorLine::Baseline << QDeclarativeAnchors::HasBaselineAnchor;
 }
 
-void tst_qmlgraphicsanchors::resetConvenience()
+void tst_qdeclarativeanchors::resetConvenience()
 {
     QDeclarativeItem *baseItem = new QDeclarativeItem;
     QDeclarativeItem *item = new QDeclarativeItem;
@@ -337,7 +337,7 @@ void tst_qmlgraphicsanchors::resetConvenience()
     delete baseItem;
 }
 
-void tst_qmlgraphicsanchors::nullItem()
+void tst_qdeclarativeanchors::nullItem()
 {
     QFETCH(QString, side);
 
@@ -353,7 +353,7 @@ void tst_qmlgraphicsanchors::nullItem()
     delete item;
 }
 
-void tst_qmlgraphicsanchors::nullItem_data()
+void tst_qdeclarativeanchors::nullItem_data()
 {
     QTest::addColumn<QString>("side");
 
@@ -367,7 +367,7 @@ void tst_qmlgraphicsanchors::nullItem_data()
     QTest::newRow("baseline") << "baseline";
 }
 
-void tst_qmlgraphicsanchors::crash1()
+void tst_qdeclarativeanchors::crash1()
 {
     QUrl source(QUrl::fromLocalFile(SRCDIR "/data/crash1.qml"));
 
@@ -381,7 +381,7 @@ void tst_qmlgraphicsanchors::crash1()
     delete view;
 }
 
-void tst_qmlgraphicsanchors::fill()
+void tst_qdeclarativeanchors::fill()
 {
     QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/fill.qml"));
 
@@ -404,7 +404,7 @@ void tst_qmlgraphicsanchors::fill()
     delete view;
 }
 
-void tst_qmlgraphicsanchors::centerIn()
+void tst_qdeclarativeanchors::centerIn()
 {
     QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/centerin.qml"));
 
@@ -421,7 +421,7 @@ void tst_qmlgraphicsanchors::centerIn()
     delete view;
 }
 
-void tst_qmlgraphicsanchors::margins()
+void tst_qdeclarativeanchors::margins()
 {
     QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/margins.qml"));
 
@@ -443,6 +443,6 @@ void tst_qmlgraphicsanchors::margins()
     delete view;
 }
 
-QTEST_MAIN(tst_qmlgraphicsanchors)
+QTEST_MAIN(tst_qdeclarativeanchors)
 
 #include "tst_qdeclarativeanchors.moc"
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
index cb56813..31efc64 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
@@ -58,11 +58,11 @@
     } while (false)
 
 
-class tst_qmlgraphicsanimatedimage : public QObject
+class tst_qdeclarativeanimatedimage : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicsanimatedimage() {}
+    tst_qdeclarativeanimatedimage() {}
 
 private slots:
     void play();
@@ -75,7 +75,7 @@ private slots:
     void invalidSource();
 };
 
-void tst_qmlgraphicsanimatedimage::play()
+void tst_qdeclarativeanimatedimage::play()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickman.qml"));
@@ -86,7 +86,7 @@ void tst_qmlgraphicsanimatedimage::play()
     delete anim;
 }
 
-void tst_qmlgraphicsanimatedimage::pause()
+void tst_qdeclarativeanimatedimage::pause()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
@@ -98,7 +98,7 @@ void tst_qmlgraphicsanimatedimage::pause()
     delete anim;
 }
 
-void tst_qmlgraphicsanimatedimage::stopped()
+void tst_qdeclarativeanimatedimage::stopped()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanstopped.qml"));
@@ -110,7 +110,7 @@ void tst_qmlgraphicsanimatedimage::stopped()
     delete anim;
 }
 
-void tst_qmlgraphicsanimatedimage::setFrame()
+void tst_qdeclarativeanimatedimage::setFrame()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
@@ -122,7 +122,7 @@ void tst_qmlgraphicsanimatedimage::setFrame()
     delete anim;
 }
 
-void tst_qmlgraphicsanimatedimage::frameCount()
+void tst_qdeclarativeanimatedimage::frameCount()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/colors.qml"));
@@ -134,7 +134,7 @@ void tst_qmlgraphicsanimatedimage::frameCount()
     delete anim;
 }
 
-void tst_qmlgraphicsanimatedimage::remote()
+void tst_qdeclarativeanimatedimage::remote()
 {
     QFETCH(QString, fileName);
     QFETCH(bool, paused);
@@ -159,7 +159,7 @@ void tst_qmlgraphicsanimatedimage::remote()
     delete anim;
 }
 
-void tst_qmlgraphicsanimatedimage::remote_data()
+void tst_qdeclarativeanimatedimage::remote_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<bool>("paused");
@@ -168,7 +168,7 @@ void tst_qmlgraphicsanimatedimage::remote_data()
     QTest::newRow("paused") << "stickmanpause.qml" << true;
 }
 
-void tst_qmlgraphicsanimatedimage::invalidSource()
+void tst_qdeclarativeanimatedimage::invalidSource()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -186,6 +186,6 @@ void tst_qmlgraphicsanimatedimage::invalidSource()
     QCOMPARE(anim->frameCount(), 0);
 }
 
-QTEST_MAIN(tst_qmlgraphicsanimatedimage)
+QTEST_MAIN(tst_qdeclarativeanimatedimage)
 
 #include "tst_qdeclarativeanimatedimage.moc"
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index 9894fe0..53c63b5 100644
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -47,11 +47,11 @@
 #include <QVariantAnimation>
 #include <QEasingCurve>
 
-class tst_qmlanimations : public QObject
+class tst_qdeclarativeanimations : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlanimations() {}
+    tst_qdeclarativeanimations() {}
 
 private slots:
     void initTestCase() { QDeclarativeEngine engine; } // ensure types are registered
@@ -84,7 +84,7 @@ private slots:
     QCOMPARE(lhs, rhs); \
 } while (false)
 
-void tst_qmlanimations::simpleProperty()
+void tst_qdeclarativeanimations::simpleProperty()
 {
     QDeclarativeRectangle rect;
     QDeclarativePropertyAnimation animation;
@@ -109,7 +109,7 @@ void tst_qmlanimations::simpleProperty()
     QCOMPARE(rect.pos(), QPointF(100,100));
 }
 
-void tst_qmlanimations::simpleNumber()
+void tst_qdeclarativeanimations::simpleNumber()
 {
     QDeclarativeRectangle rect;
     QDeclarativeNumberAnimation animation;
@@ -134,7 +134,7 @@ void tst_qmlanimations::simpleNumber()
     QCOMPARE(rect.x(), qreal(100));
 }
 
-void tst_qmlanimations::simpleColor()
+void tst_qdeclarativeanimations::simpleColor()
 {
     QDeclarativeRectangle rect;
     QDeclarativeColorAnimation animation;
@@ -168,7 +168,7 @@ void tst_qmlanimations::simpleColor()
     QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1));
 }
 
-void tst_qmlanimations::alwaysRunToEnd()
+void tst_qdeclarativeanimations::alwaysRunToEnd()
 {
     QDeclarativeRectangle rect;
     QDeclarativePropertyAnimation animation;
@@ -188,7 +188,7 @@ void tst_qmlanimations::alwaysRunToEnd()
     QTIMED_COMPARE(rect.x(), qreal(200));
 }
 
-void tst_qmlanimations::complete()
+void tst_qdeclarativeanimations::complete()
 {
     QDeclarativeRectangle rect;
     QDeclarativePropertyAnimation animation;
@@ -209,7 +209,7 @@ void tst_qmlanimations::complete()
     QCOMPARE(rect.x(), qreal(200));
 }
 
-void tst_qmlanimations::resume()
+void tst_qdeclarativeanimations::resume()
 {
     QDeclarativeRectangle rect;
     QDeclarativePropertyAnimation animation;
@@ -236,7 +236,7 @@ void tst_qmlanimations::resume()
     QVERIFY(rect.x() > x);
 }
 
-void tst_qmlanimations::dotProperty()
+void tst_qdeclarativeanimations::dotProperty()
 {
     QDeclarativeRectangle rect;
     QDeclarativeNumberAnimation animation;
@@ -255,7 +255,7 @@ void tst_qmlanimations::dotProperty()
     QCOMPARE(rect.border()->width(), 5);
 }
 
-void tst_qmlanimations::badTypes()
+void tst_qdeclarativeanimations::badTypes()
 {
     //don't crash
     {
@@ -304,7 +304,7 @@ void tst_qmlanimations::badTypes()
     }
 }
 
-void tst_qmlanimations::badProperties()
+void tst_qdeclarativeanimations::badProperties()
 {
     //make sure we get a runtime error
     {
@@ -329,7 +329,7 @@ void tst_qmlanimations::badProperties()
 
 //test animating mixed types with property animation in a transition
 //for example, int + real; color + real; etc
-void tst_qmlanimations::mixedTypes()
+void tst_qdeclarativeanimations::mixedTypes()
 {
     //assumes border.width stays a real -- not real robust
     {
@@ -365,7 +365,7 @@ void tst_qmlanimations::mixedTypes()
     }
 }
 
-void tst_qmlanimations::properties()
+void tst_qdeclarativeanimations::properties()
 {
     const int waitDuration = 300;
     {
@@ -431,7 +431,7 @@ void tst_qmlanimations::properties()
     }
 }
 
-void tst_qmlanimations::propertiesTransition()
+void tst_qdeclarativeanimations::propertiesTransition()
 {
     const int waitDuration = 300;
     {
@@ -518,7 +518,7 @@ void tst_qmlanimations::propertiesTransition()
     }*/
 }
 
-void tst_qmlanimations::invalidDuration()
+void tst_qdeclarativeanimations::invalidDuration()
 {
     QDeclarativePropertyAnimation *animation = new QDeclarativePropertyAnimation;
     QTest::ignoreMessage(QtWarningMsg, "QML PropertyAnimation (unknown location) Cannot set a duration of < 0");
@@ -531,7 +531,7 @@ void tst_qmlanimations::invalidDuration()
     QCOMPARE(pauseAnimation->duration(), 250);
 }
 
-void tst_qmlanimations::attached()
+void tst_qdeclarativeanimations::attached()
 {
     QDeclarativeEngine engine;
 
@@ -542,7 +542,7 @@ void tst_qmlanimations::attached()
     QVERIFY(rect);
 }
 
-void tst_qmlanimations::propertyValueSourceDefaultStart()
+void tst_qdeclarativeanimations::propertyValueSourceDefaultStart()
 {
     {
         QDeclarativeEngine engine;
@@ -585,7 +585,7 @@ void tst_qmlanimations::propertyValueSourceDefaultStart()
 }
 
 
-void tst_qmlanimations::dontStart()
+void tst_qdeclarativeanimations::dontStart()
 {
     {
         QDeclarativeEngine engine;
@@ -616,7 +616,7 @@ void tst_qmlanimations::dontStart()
     }
 }
 
-void tst_qmlanimations::easingProperties()
+void tst_qdeclarativeanimations::easingProperties()
 {
     {
         QDeclarativeEngine engine;
@@ -667,6 +667,6 @@ void tst_qmlanimations::easingProperties()
     }
 }
 
-QTEST_MAIN(tst_qmlanimations)
+QTEST_MAIN(tst_qdeclarativeanimations)
 
 #include "tst_qdeclarativeanimations.moc"
diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
index a177247..f87330d 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
+++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
@@ -46,11 +46,11 @@
 #include <private/qdeclarativebehavior_p.h>
 #include <private/qdeclarativeanimation_p.h>
 
-class tst_qmlbehaviors : public QObject
+class tst_qdeclarativebehaviors : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlbehaviors() {}
+    tst_qdeclarativebehaviors() {}
 
 private slots:
     void simpleBehavior();
@@ -70,7 +70,7 @@ private slots:
     void dontStart();
 };
 
-void tst_qmlbehaviors::simpleBehavior()
+void tst_qdeclarativebehaviors::simpleBehavior()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/simple.qml"));
@@ -84,7 +84,7 @@ void tst_qmlbehaviors::simpleBehavior()
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
 }
 
-void tst_qmlbehaviors::scriptTriggered()
+void tst_qdeclarativebehaviors::scriptTriggered()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/scripttrigger.qml"));
@@ -97,7 +97,7 @@ void tst_qmlbehaviors::scriptTriggered()
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
 }
 
-void tst_qmlbehaviors::cppTriggered()
+void tst_qdeclarativebehaviors::cppTriggered()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/cpptrigger.qml"));
@@ -113,7 +113,7 @@ void tst_qmlbehaviors::cppTriggered()
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
 }
 
-void tst_qmlbehaviors::loop()
+void tst_qdeclarativebehaviors::loop()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/loop.qml"));
@@ -124,7 +124,7 @@ void tst_qmlbehaviors::loop()
     rect->setState("moved");
 }
 
-void tst_qmlbehaviors::colorBehavior()
+void tst_qdeclarativebehaviors::colorBehavior()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/color.qml"));
@@ -137,7 +137,7 @@ void tst_qmlbehaviors::colorBehavior()
     QVERIFY(color != QColor("red") && color != QColor("green"));  //i.e. the behavior has been triggered
 }
 
-void tst_qmlbehaviors::parentBehavior()
+void tst_qdeclarativebehaviors::parentBehavior()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/parent.qml"));
@@ -154,7 +154,7 @@ void tst_qmlbehaviors::parentBehavior()
     QVERIFY(parent == newParent);
 }
 
-void tst_qmlbehaviors::replaceBinding()
+void tst_qdeclarativebehaviors::replaceBinding()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/binding.qml"));
@@ -188,7 +188,7 @@ void tst_qmlbehaviors::replaceBinding()
     QCOMPARE(innerRect->x(), (qreal)20);
 }
 
-void tst_qmlbehaviors::group()
+void tst_qdeclarativebehaviors::group()
 {
     {
         QDeclarativeEngine engine;
@@ -215,7 +215,7 @@ void tst_qmlbehaviors::group()
     }
 }
 
-void tst_qmlbehaviors::emptyBehavior()
+void tst_qdeclarativebehaviors::emptyBehavior()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/empty.qml"));
@@ -227,7 +227,7 @@ void tst_qmlbehaviors::emptyBehavior()
     QCOMPARE(x, qreal(200));    //should change immediately
 }
 
-void tst_qmlbehaviors::explicitSelection()
+void tst_qdeclarativebehaviors::explicitSelection()
 {
     {
         QDeclarativeEngine engine;
@@ -242,7 +242,7 @@ void tst_qmlbehaviors::explicitSelection()
     }
 }
 
-void tst_qmlbehaviors::nonSelectingBehavior()
+void tst_qdeclarativebehaviors::nonSelectingBehavior()
 {
     {
         QDeclarativeEngine engine;
@@ -256,7 +256,7 @@ void tst_qmlbehaviors::nonSelectingBehavior()
     }
 }
 
-void tst_qmlbehaviors::reassignedAnimation()
+void tst_qdeclarativebehaviors::reassignedAnimation()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml"));
@@ -268,7 +268,7 @@ void tst_qmlbehaviors::reassignedAnimation()
                      rect->findChild<QDeclarativeBehavior*>("MyBehavior"))->animation())->duration(), 200);
 }
 
-void tst_qmlbehaviors::disabled()
+void tst_qdeclarativebehaviors::disabled()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/disabled.qml"));
@@ -281,7 +281,7 @@ void tst_qmlbehaviors::disabled()
     QCOMPARE(x, qreal(200));    //should change immediately
 }
 
-void tst_qmlbehaviors::dontStart()
+void tst_qdeclarativebehaviors::dontStart()
 {
     QDeclarativeEngine engine;
 
@@ -296,6 +296,6 @@ void tst_qmlbehaviors::dontStart()
     QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
 }
 
-QTEST_MAIN(tst_qmlbehaviors)
+QTEST_MAIN(tst_qdeclarativebehaviors)
 
 #include "tst_qdeclarativebehaviors.moc"
diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
index 36d8483..826df4f 100644
--- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
+++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
@@ -45,12 +45,12 @@
 #include <private/qdeclarativerectangle_p.h>
 #include "../../../shared/util.h"
 
-class tst_qmlbinding : public QObject
+class tst_qdeclarativebinding : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlbinding();
+    tst_qdeclarativebinding();
 
 private slots:
     void binding();
@@ -60,11 +60,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlbinding::tst_qmlbinding()
+tst_qdeclarativebinding::tst_qdeclarativebinding()
 {
 }
 
-void tst_qmlbinding::binding()
+void tst_qdeclarativebinding::binding()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding.qml"));
@@ -86,7 +86,7 @@ void tst_qmlbinding::binding()
     delete rect;
 }
 
-void tst_qmlbinding::whenAfterValue()
+void tst_qdeclarativebinding::whenAfterValue()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding2.qml"));
@@ -102,6 +102,6 @@ void tst_qmlbinding::whenAfterValue()
     delete rect;
 }
 
-QTEST_MAIN(tst_qmlbinding)
+QTEST_MAIN(tst_qdeclarativebinding)
 
 #include "tst_qdeclarativebinding.moc"
diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
index b220f00..b2ef16b 100644
--- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
+++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
@@ -68,12 +68,12 @@
     } while (false)
 
 
-class tst_qmlgraphicsborderimage : public QObject
+class tst_qdeclarativeborderimage : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicsborderimage();
+    tst_qdeclarativeborderimage();
 
 private slots:
     void noSource();
@@ -93,11 +93,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlgraphicsborderimage::tst_qmlgraphicsborderimage()
+tst_qdeclarativeborderimage::tst_qdeclarativeborderimage()
 {
 }
 
-void tst_qmlgraphicsborderimage::noSource()
+void tst_qdeclarativeborderimage::noSource()
 {
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"\" }";
     QDeclarativeComponent component(&engine);
@@ -113,7 +113,7 @@ void tst_qmlgraphicsborderimage::noSource()
     delete obj;
 }
 
-void tst_qmlgraphicsborderimage::imageSource_data()
+void tst_qdeclarativeborderimage::imageSource_data()
 {
     QTest::addColumn<QString>("source");
     QTest::addColumn<bool>("remote");
@@ -127,7 +127,7 @@ void tst_qmlgraphicsborderimage::imageSource_data()
         << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
 }
 
-void tst_qmlgraphicsborderimage::imageSource()
+void tst_qdeclarativeborderimage::imageSource()
 {
     QFETCH(QString, source);
     QFETCH(bool, remote);
@@ -168,7 +168,7 @@ void tst_qmlgraphicsborderimage::imageSource()
     delete server;
 }
 
-void tst_qmlgraphicsborderimage::clearSource()
+void tst_qdeclarativeborderimage::clearSource()
 {
     QString componentStr = "import Qt 4.6\nBorderImage { source: srcImage }";
     QDeclarativeContext *ctxt = engine.rootContext();
@@ -188,7 +188,7 @@ void tst_qmlgraphicsborderimage::clearSource()
     QCOMPARE(obj->height(), 0.);
 }
 
-void tst_qmlgraphicsborderimage::resized()
+void tst_qdeclarativeborderimage::resized()
 {
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() + "\"; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
@@ -203,7 +203,7 @@ void tst_qmlgraphicsborderimage::resized()
     delete obj;
 }
 
-void tst_qmlgraphicsborderimage::smooth()
+void tst_qdeclarativeborderimage::smooth()
 {
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
@@ -219,7 +219,7 @@ void tst_qmlgraphicsborderimage::smooth()
     delete obj;
 }
 
-void tst_qmlgraphicsborderimage::tileModes()
+void tst_qdeclarativeborderimage::tileModes()
 {
     {
         QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 100; height: 300; horizontalTileMode: BorderImage.Repeat; verticalTileMode: BorderImage.Repeat }";
@@ -249,7 +249,7 @@ void tst_qmlgraphicsborderimage::tileModes()
     }
 }
 
-void tst_qmlgraphicsborderimage::sciSource()
+void tst_qdeclarativeborderimage::sciSource()
 {
     QFETCH(QString, source);
     QFETCH(bool, valid);
@@ -291,7 +291,7 @@ void tst_qmlgraphicsborderimage::sciSource()
     delete server;
 }
 
-void tst_qmlgraphicsborderimage::sciSource_data()
+void tst_qdeclarativeborderimage::sciSource_data()
 {
     QTest::addColumn<QString>("source");
     QTest::addColumn<bool>("valid");
@@ -302,7 +302,7 @@ void tst_qmlgraphicsborderimage::sciSource_data()
     QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.sci" << false;
 }
 
-void tst_qmlgraphicsborderimage::invalidSciFile()
+void tst_qdeclarativeborderimage::invalidSciFile()
 {
     QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Roun"
     QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Repea"
@@ -321,7 +321,7 @@ void tst_qmlgraphicsborderimage::invalidSciFile()
     delete obj;
 }
 
-void tst_qmlgraphicsborderimage::pendingRemoteRequest()
+void tst_qdeclarativeborderimage::pendingRemoteRequest()
 {
     QFETCH(QString, source);
 
@@ -338,7 +338,7 @@ void tst_qmlgraphicsborderimage::pendingRemoteRequest()
     QTest::qWait(50);
 }
 
-void tst_qmlgraphicsborderimage::pendingRemoteRequest_data()
+void tst_qdeclarativeborderimage::pendingRemoteRequest_data()
 {
     QTest::addColumn<QString>("source");
 
@@ -346,6 +346,6 @@ void tst_qmlgraphicsborderimage::pendingRemoteRequest_data()
     QTest::newRow("sci file") << "http://no-such-qt-server-like-this/none.sci";
 }
 
-QTEST_MAIN(tst_qmlgraphicsborderimage)
+QTEST_MAIN(tst_qdeclarativeborderimage)
 
 #include "tst_qdeclarativeborderimage.moc"
diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
index 5e3de5e..adf343f 100644
--- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
+++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -46,12 +46,12 @@
 #include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativescriptstring.h>
 
-class tst_qmlconnection : public QObject
+class tst_qdeclarativeconnection : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlconnection();
+    tst_qdeclarativeconnection();
 
 private slots:
     void defaultValues();
@@ -63,11 +63,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlconnection::tst_qmlconnection()
+tst_qdeclarativeconnection::tst_qdeclarativeconnection()
 {
 }
 
-void tst_qmlconnection::defaultValues()
+void tst_qdeclarativeconnection::defaultValues()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
@@ -81,7 +81,7 @@ void tst_qmlconnection::defaultValues()
     delete item;
 }
 
-void tst_qmlconnection::properties()
+void tst_qdeclarativeconnection::properties()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
@@ -97,7 +97,7 @@ void tst_qmlconnection::properties()
     delete item;
 }
 
-void tst_qmlconnection::connection()
+void tst_qdeclarativeconnection::connection()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
@@ -114,7 +114,7 @@ void tst_qmlconnection::connection()
     delete item;
 }
 
-void tst_qmlconnection::trimming()
+void tst_qdeclarativeconnection::trimming()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
@@ -134,6 +134,6 @@ void tst_qmlconnection::trimming()
     delete item;
 }
 
-QTEST_MAIN(tst_qmlconnection)
+QTEST_MAIN(tst_qdeclarativeconnection)
 
 #include "tst_qdeclarativeconnection.moc"
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index c1d6bdb..5f03989 100644
--- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -46,11 +46,11 @@
 #include <QDeclarativeComponent>
 #include <QDeclarativeExpression>
 
-class tst_qmlcontext : public QObject
+class tst_qdeclarativecontext : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlcontext() {}
+    tst_qdeclarativecontext() {}
 
 private slots:
     void baseUrl();
@@ -65,7 +65,7 @@ private:
     QDeclarativeEngine engine;
 };
 
-void tst_qmlcontext::baseUrl()
+void tst_qdeclarativecontext::baseUrl()
 {
     QDeclarativeContext ctxt(&engine);
 
@@ -76,7 +76,7 @@ void tst_qmlcontext::baseUrl()
     QCOMPARE(ctxt.baseUrl(), QUrl("http://www.nokia.com/"));
 }
 
-void tst_qmlcontext::resolvedUrl()
+void tst_qdeclarativecontext::resolvedUrl()
 {
     // Relative to the component
     {
@@ -123,7 +123,7 @@ void tst_qmlcontext::resolvedUrl()
     }
 }
 
-void tst_qmlcontext::engineMethod()
+void tst_qdeclarativecontext::engineMethod()
 {
     QDeclarativeEngine *engine = new QDeclarativeEngine;
 
@@ -145,7 +145,7 @@ void tst_qmlcontext::engineMethod()
     QCOMPARE(ctxt4.engine(), engine);
 }
 
-void tst_qmlcontext::parentContext()
+void tst_qdeclarativecontext::parentContext()
 {
     QDeclarativeEngine *engine = new QDeclarativeEngine;
 
@@ -253,7 +253,7 @@ private:
     delete obj; \
 } 
 
-void tst_qmlcontext::setContextProperty()
+void tst_qdeclarativecontext::setContextProperty()
 {
     QDeclarativeContext ctxt(&engine);
     QDeclarativeContext ctxt2(&ctxt);
@@ -366,7 +366,7 @@ void tst_qmlcontext::setContextProperty()
     }
 }
 
-void tst_qmlcontext::addDefaultObject()
+void tst_qdeclarativecontext::addDefaultObject()
 {
     QDeclarativeContext ctxt(&engine);
 
@@ -412,7 +412,7 @@ void tst_qmlcontext::addDefaultObject()
     }
 }
 
-void tst_qmlcontext::destruction()
+void tst_qdeclarativecontext::destruction()
 {
     QDeclarativeContext *ctxt = new QDeclarativeContext(&engine);
 
@@ -429,6 +429,6 @@ void tst_qmlcontext::destruction()
     QCOMPARE(ctxt, expr.context());
 }
 
-QTEST_MAIN(tst_qmlcontext)
+QTEST_MAIN(tst_qdeclarativecontext)
 
 #include "tst_qdeclarativecontext.moc"
diff --git a/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp b/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp
index 5970cc2..69d7900 100644
--- a/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp
+++ b/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp
@@ -44,11 +44,11 @@
 #include <private/qdeclarativedatetimeformatter_p.h>
 #include <QDebug>
 
-class tst_qmldatetimeformatter : public QObject
+class tst_qdeclarativedatetimeformatter : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmldatetimeformatter() {}
+    tst_qdeclarativedatetimeformatter() {}
 
 private slots:
     void date();
@@ -56,7 +56,7 @@ private slots:
     void dateTime();
 };
 
-void tst_qmldatetimeformatter::date()
+void tst_qdeclarativedatetimeformatter::date()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent formatterComponent(&engine);
@@ -86,7 +86,7 @@ void tst_qmldatetimeformatter::date()
     delete formatter;
 }
 
-void tst_qmldatetimeformatter::time()
+void tst_qdeclarativedatetimeformatter::time()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent formatterComponent(&engine);
@@ -119,7 +119,7 @@ void tst_qmldatetimeformatter::time()
     delete formatter;
 }
 
-void tst_qmldatetimeformatter::dateTime()
+void tst_qdeclarativedatetimeformatter::dateTime()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent formatterComponent(&engine);
@@ -145,6 +145,6 @@ void tst_qmldatetimeformatter::dateTime()
     delete formatter;
 }
 
-QTEST_MAIN(tst_qmldatetimeformatter)
+QTEST_MAIN(tst_qdeclarativedatetimeformatter)
 
 #include "tst_qdeclarativedatetimeformatter.moc"
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index b23bddc..1c8cbbc 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -64,12 +64,12 @@
 Q_DECLARE_METATYPE(QDeclarativeDebugWatch::State)
 
 
-class tst_QmlDebug : public QObject
+class tst_QDeclarativeDebug : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QmlDebug(QDeclarativeDebugTestData *data)
+    tst_QDeclarativeDebug(QDeclarativeDebugTestData *data)
     {
         m_conn = data->conn;
         m_engine = data->engine;
@@ -109,14 +109,14 @@ private slots:
     void queryExpressionResult();
     void queryExpressionResult_data();
 
-    void tst_QmlDebugFileReference();
-    void tst_QmlDebugEngineReference();
-    void tst_QmlDebugObjectReference();
-    void tst_QmlDebugContextReference();
-    void tst_QmlDebugPropertyReference();
+    void tst_QDeclarativeDebugFileReference();
+    void tst_QDeclarativeDebugEngineReference();
+    void tst_QDeclarativeDebugObjectReference();
+    void tst_QDeclarativeDebugContextReference();
+    void tst_QDeclarativeDebugPropertyReference();
 };
 
-QDeclarativeDebugObjectReference tst_QmlDebug::findRootObject()
+QDeclarativeDebugObjectReference tst_QDeclarativeDebug::findRootObject()
 {
     QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
@@ -140,7 +140,7 @@ QDeclarativeDebugObjectReference tst_QmlDebug::findRootObject()
     return result;
 }
 
-QDeclarativeDebugPropertyReference tst_QmlDebug::findProperty(const QList<QDeclarativeDebugPropertyReference> &props, const QString &name) const
+QDeclarativeDebugPropertyReference tst_QDeclarativeDebug::findProperty(const QList<QDeclarativeDebugPropertyReference> &props, const QString &name) const
 {
     foreach(const QDeclarativeDebugPropertyReference &p, props) {
         if (p.name() == name)
@@ -149,7 +149,7 @@ QDeclarativeDebugPropertyReference tst_QmlDebug::findProperty(const QList<QDecla
     return QDeclarativeDebugPropertyReference();
 }
 
-void tst_QmlDebug::waitForQuery(QDeclarativeDebugQuery *query)
+void tst_QDeclarativeDebug::waitForQuery(QDeclarativeDebugQuery *query)
 {
     QVERIFY(query);
     QCOMPARE(query->parent(), this);
@@ -158,7 +158,7 @@ void tst_QmlDebug::waitForQuery(QDeclarativeDebugQuery *query)
         QFAIL("query timed out");
 }
 
-void tst_QmlDebug::recursiveObjectTest(QObject *o, const QDeclarativeDebugObjectReference &oref, bool recursive) const
+void tst_QDeclarativeDebug::recursiveObjectTest(QObject *o, const QDeclarativeDebugObjectReference &oref, bool recursive) const
 {
     const QMetaObject *meta = o->metaObject();
 
@@ -226,7 +226,7 @@ void tst_QmlDebug::recursiveObjectTest(QObject *o, const QDeclarativeDebugObject
     }
 }
 
-void tst_QmlDebug::recursiveCompareObjects(const QDeclarativeDebugObjectReference &a, const QDeclarativeDebugObjectReference &b) const
+void tst_QDeclarativeDebug::recursiveCompareObjects(const QDeclarativeDebugObjectReference &a, const QDeclarativeDebugObjectReference &b) const
 {
     QCOMPARE(a.debugId(), b.debugId());
     QCOMPARE(a.className(), b.className());
@@ -250,7 +250,7 @@ void tst_QmlDebug::recursiveCompareObjects(const QDeclarativeDebugObjectReferenc
         recursiveCompareObjects(a.children()[i], b.children()[i]);
 }
 
-void tst_QmlDebug::recursiveCompareContexts(const QDeclarativeDebugContextReference &a, const QDeclarativeDebugContextReference &b) const
+void tst_QDeclarativeDebug::recursiveCompareContexts(const QDeclarativeDebugContextReference &a, const QDeclarativeDebugContextReference &b) const
 {
     QCOMPARE(a.debugId(), b.debugId());
     QCOMPARE(a.name(), b.name());
@@ -264,7 +264,7 @@ void tst_QmlDebug::recursiveCompareContexts(const QDeclarativeDebugContextRefere
         recursiveCompareContexts(a.contexts()[i], b.contexts()[i]);
 }
 
-void tst_QmlDebug::compareProperties(const QDeclarativeDebugPropertyReference &a, const QDeclarativeDebugPropertyReference &b) const
+void tst_QDeclarativeDebug::compareProperties(const QDeclarativeDebugPropertyReference &a, const QDeclarativeDebugPropertyReference &b) const
 {
     QCOMPARE(a.objectDebugId(), b.objectDebugId());
     QCOMPARE(a.name(), b.name());
@@ -274,14 +274,14 @@ void tst_QmlDebug::compareProperties(const QDeclarativeDebugPropertyReference &a
     QCOMPARE(a.hasNotifySignal(), b.hasNotifySignal());
 }
 
-void tst_QmlDebug::initTestCase()
+void tst_QDeclarativeDebug::initTestCase()
 {
     m_dbg = new QDeclarativeEngineDebug(m_conn, this);
 
     qRegisterMetaType<QDeclarativeDebugWatch::State>();
 }
 
-void tst_QmlDebug::watch_property()
+void tst_QDeclarativeDebug::watch_property()
 {
     QDeclarativeDebugObjectReference obj = findRootObject();
     QDeclarativeDebugPropertyReference prop = findProperty(obj.properties(), "width");
@@ -326,7 +326,7 @@ void tst_QmlDebug::watch_property()
     QCOMPARE(spy.at(0).at(1).value<QVariant>(), qVariantFromValue(origWidth*2));
 }
 
-void tst_QmlDebug::watch_object()
+void tst_QDeclarativeDebug::watch_object()
 {
     QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
@@ -399,7 +399,7 @@ void tst_QmlDebug::watch_object()
     QCOMPARE(newHeight, origHeight * 2);
 }
 
-void tst_QmlDebug::watch_expression()
+void tst_QDeclarativeDebug::watch_expression()
 {
     QFETCH(QString, expr);
     QFETCH(int, increment);
@@ -462,7 +462,7 @@ void tst_QmlDebug::watch_expression()
     }
 }
 
-void tst_QmlDebug::watch_expression_data()
+void tst_QDeclarativeDebug::watch_expression_data()
 {
     QTest::addColumn<QString>("expr");
     QTest::addColumn<int>("increment");
@@ -472,21 +472,21 @@ void tst_QmlDebug::watch_expression_data()
     QTest::newRow("width+10") << "width + 10" << 10 << 5;
 }
 
-void tst_QmlDebug::watch_context()
+void tst_QDeclarativeDebug::watch_context()
 {
     QDeclarativeDebugContextReference c;
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngineDebug::addWatch(): Not implemented");
     QVERIFY(!m_dbg->addWatch(c, QString(), this));
 }
 
-void tst_QmlDebug::watch_file()
+void tst_QDeclarativeDebug::watch_file()
 {
     QDeclarativeDebugFileReference f;
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngineDebug::addWatch(): Not implemented");
     QVERIFY(!m_dbg->addWatch(f, this));
 }
 
-void tst_QmlDebug::queryAvailableEngines()
+void tst_QDeclarativeDebug::queryAvailableEngines()
 {
     QDeclarativeDebugEnginesQuery *q_engines;
 
@@ -515,7 +515,7 @@ void tst_QmlDebug::queryAvailableEngines()
     delete q_engines;
 }
 
-void tst_QmlDebug::queryRootContexts()
+void tst_QDeclarativeDebug::queryRootContexts()
 {
     QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
@@ -549,13 +549,13 @@ void tst_QmlDebug::queryRootContexts()
 
     QCOMPARE(context.contexts().count(), 1);
     QVERIFY(context.contexts()[0].debugId() >= 0);
-    QCOMPARE(context.contexts()[0].name(), QString("tst_QmlDebug_childContext"));
+    QCOMPARE(context.contexts()[0].name(), QString("tst_QDeclarativeDebug_childContext"));
 
     delete q_engines;
     delete q_context;
 }
 
-void tst_QmlDebug::queryObject()
+void tst_QDeclarativeDebug::queryObject()
 {
     QFETCH(bool, recursive);
 
@@ -621,7 +621,7 @@ void tst_QmlDebug::queryObject()
     }
 }
 
-void tst_QmlDebug::queryObject_data()
+void tst_QDeclarativeDebug::queryObject_data()
 {
     QTest::addColumn<bool>("recursive");
 
@@ -629,7 +629,7 @@ void tst_QmlDebug::queryObject_data()
     QTest::newRow("recursive") << true;
 }
 
-void tst_QmlDebug::queryExpressionResult()
+void tst_QDeclarativeDebug::queryExpressionResult()
 {
     QFETCH(QString, expr);
     QFETCH(QVariant, result);
@@ -663,7 +663,7 @@ void tst_QmlDebug::queryExpressionResult()
     delete q_expr;
 }
 
-void tst_QmlDebug::queryExpressionResult_data()
+void tst_QDeclarativeDebug::queryExpressionResult_data()
 {
     QTest::addColumn<QString>("expr");
     QTest::addColumn<QVariant>("result");
@@ -673,7 +673,7 @@ void tst_QmlDebug::queryExpressionResult_data()
     QTest::newRow("bad expr") << "aeaef" << qVariantFromValue(QString("<undefined>"));
 }
 
-void tst_QmlDebug::tst_QmlDebugFileReference()
+void tst_QDeclarativeDebug::tst_QDeclarativeDebugFileReference()
 {
     QDeclarativeDebugFileReference ref;
     QVERIFY(ref.url().isEmpty());
@@ -697,7 +697,7 @@ void tst_QmlDebug::tst_QmlDebugFileReference()
     }
 }
 
-void tst_QmlDebug::tst_QmlDebugEngineReference()
+void tst_QDeclarativeDebug::tst_QDeclarativeDebugEngineReference()
 {
     QDeclarativeDebugEngineReference ref;
     QCOMPARE(ref.debugId(), -1);
@@ -721,7 +721,7 @@ void tst_QmlDebug::tst_QmlDebugEngineReference()
     }
 }
 
-void tst_QmlDebug::tst_QmlDebugObjectReference()
+void tst_QDeclarativeDebug::tst_QDeclarativeDebugObjectReference()
 {
     QDeclarativeDebugObjectReference ref;
     QCOMPARE(ref.debugId(), -1);
@@ -754,7 +754,7 @@ void tst_QmlDebug::tst_QmlDebugObjectReference()
         recursiveCompareObjects(r, ref);
 }
 
-void tst_QmlDebug::tst_QmlDebugContextReference()
+void tst_QDeclarativeDebug::tst_QDeclarativeDebugContextReference()
 {
     QDeclarativeDebugContextReference ref;
     QCOMPARE(ref.debugId(), -1);
@@ -779,7 +779,7 @@ void tst_QmlDebug::tst_QmlDebugContextReference()
         recursiveCompareContexts(r, ref);
 }
 
-void tst_QmlDebug::tst_QmlDebugPropertyReference()
+void tst_QDeclarativeDebug::tst_QDeclarativeDebugPropertyReference()
 {
     QDeclarativeDebugObjectReference rootObject = findRootObject();
     QDeclarativeDebugObjectQuery *query = m_dbg->queryObject(rootObject, this);
@@ -803,14 +803,14 @@ void tst_QmlDebug::tst_QmlDebugPropertyReference()
 }
 
 
-class tst_QmlDebug_Factory : public QDeclarativeTestFactory
+class tst_QDeclarativeDebug_Factory : public QDeclarativeTestFactory
 {
 public:
     QObject *createTest(QDeclarativeDebugTestData *data)
     {
-        tst_QmlDebug *test = new tst_QmlDebug(data);
+        tst_QDeclarativeDebug *test = new tst_QDeclarativeDebug(data);
         QDeclarativeContext *c = new QDeclarativeContext(data->engine->rootContext(), test);
-        c->setObjectName("tst_QmlDebug_childContext");
+        c->setObjectName("tst_QDeclarativeDebug_childContext");
         return test;
     }
 };
@@ -832,10 +832,10 @@ int main(int argc, char *argv[])
     // add second component to test multiple root contexts
     qml << "import Qt 4.6\n"
             "Item {}";
-    tst_QmlDebug_Factory factory;
+    tst_QDeclarativeDebug_Factory factory;
     return QDeclarativeDebugTest::runTests(&factory, qml);
 }
 
-//QTEST_MAIN(tst_QmlDebug)
+//QTEST_MAIN(tst_QDeclarativeDebug)
 
 #include "tst_qdeclarativedebug.moc"
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index 7e68ae8..d3679a7 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -54,12 +54,12 @@
 
 #include "../shared/debugutil_p.h"
 
-class tst_QmlDebugClient : public QObject
+class tst_QDeclarativeDebugClient : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QmlDebugClient(QDeclarativeDebugTestData *data)
+    tst_QDeclarativeDebugClient(QDeclarativeDebugTestData *data)
     {
         m_conn = data->conn;
     }
@@ -74,24 +74,24 @@ private slots:
     void sendMessage();
 };
 
-void tst_QmlDebugClient::name()
+void tst_QDeclarativeDebugClient::name()
 {
-    QString name = "tst_QmlDebugClient::name()";
+    QString name = "tst_QDeclarativeDebugClient::name()";
 
     QDeclarativeDebugClient client(name, m_conn);
     QCOMPARE(client.name(), name);
 }
 
-void tst_QmlDebugClient::isEnabled()
+void tst_QDeclarativeDebugClient::isEnabled()
 {
-    QDeclarativeDebugClient client("tst_QmlDebugClient::isEnabled()", m_conn);
+    QDeclarativeDebugClient client("tst_QDeclarativeDebugClient::isEnabled()", m_conn);
     QCOMPARE(client.isEnabled(), false);
 }
 
-void tst_QmlDebugClient::setEnabled()
+void tst_QDeclarativeDebugClient::setEnabled()
 {
-    QDeclarativeDebugTestService service("tst_QmlDebugClient::setEnabled()");
-    QDeclarativeDebugTestClient client("tst_QmlDebugClient::setEnabled()", m_conn);
+    QDeclarativeDebugTestService service("tst_QDeclarativeDebugClient::setEnabled()");
+    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugClient::setEnabled()", m_conn);
 
     QCOMPARE(service.isEnabled(), false);
 
@@ -106,28 +106,28 @@ void tst_QmlDebugClient::setEnabled()
     QCOMPARE(service.isEnabled(), false);
 }
 
-void tst_QmlDebugClient::isConnected()
+void tst_QDeclarativeDebugClient::isConnected()
 {
-    QDeclarativeDebugClient client1("tst_QmlDebugClient::isConnected() A", m_conn);
+    QDeclarativeDebugClient client1("tst_QDeclarativeDebugClient::isConnected() A", m_conn);
     QCOMPARE(client1.isConnected(), true);
 
     QDeclarativeDebugConnection conn;
-    QDeclarativeDebugClient client2("tst_QmlDebugClient::isConnected() B", &conn);
+    QDeclarativeDebugClient client2("tst_QDeclarativeDebugClient::isConnected() B", &conn);
     QCOMPARE(client2.isConnected(), false);
 
-    QDeclarativeDebugClient client3("tst_QmlDebugClient::isConnected() C", 0);
+    QDeclarativeDebugClient client3("tst_QDeclarativeDebugClient::isConnected() C", 0);
     QCOMPARE(client3.isConnected(), false);
 
     // duplicate plugin name
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugClient: Conflicting plugin name \"tst_QmlDebugClient::isConnected() A\" ");
-    QDeclarativeDebugClient client4("tst_QmlDebugClient::isConnected() A", m_conn);
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugClient: Conflicting plugin name \"tst_QDeclarativeDebugClient::isConnected() A\" ");
+    QDeclarativeDebugClient client4("tst_QDeclarativeDebugClient::isConnected() A", m_conn);
     QCOMPARE(client4.isConnected(), false);
 }
 
-void tst_QmlDebugClient::sendMessage()
+void tst_QDeclarativeDebugClient::sendMessage()
 {
-    QDeclarativeDebugTestService service("tst_QmlDebugClient::sendMessage()");
-    QDeclarativeDebugTestClient client("tst_QmlDebugClient::sendMessage()", m_conn);
+    QDeclarativeDebugTestService service("tst_QDeclarativeDebugClient::sendMessage()");
+    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugClient::sendMessage()", m_conn);
 
     QByteArray msg = "hello!";
 
@@ -137,10 +137,10 @@ void tst_QmlDebugClient::sendMessage()
 }
 
 
-class tst_QmlDebugClient_Factory : public QDeclarativeTestFactory
+class tst_QDeclarativeDebugClient_Factory : public QDeclarativeTestFactory
 {
 public:
-    QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QmlDebugClient(data); }
+    QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QDeclarativeDebugClient(data); }
 };
 
 
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    tst_QmlDebugClient_Factory factory;
+    tst_QDeclarativeDebugClient_Factory factory;
     return QDeclarativeDebugTest::runTests(&factory);
 }
 
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 69def9a..c8fc001 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -54,12 +54,12 @@
 
 #include "../shared/debugutil_p.h"
 
-class tst_QmlDebugService : public QObject
+class tst_QDeclarativeDebugService : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QmlDebugService(QDeclarativeDebugTestData *data)
+    tst_QDeclarativeDebugService(QDeclarativeDebugTestData *data)
     {
         m_conn = data->conn;
     }
@@ -76,33 +76,33 @@ private slots:
     void objectToString();
 };
 
-void tst_QmlDebugService::name()
+void tst_QDeclarativeDebugService::name()
 {
-    QString name = "tst_QmlDebugService::name()";
+    QString name = "tst_QDeclarativeDebugService::name()";
 
     QDeclarativeDebugService service(name);
     QCOMPARE(service.name(), name);
 }
 
-void tst_QmlDebugService::isEnabled()
+void tst_QDeclarativeDebugService::isEnabled()
 {
-    QDeclarativeDebugTestService service("tst_QmlDebugService::isEnabled()", m_conn);
+    QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::isEnabled()", m_conn);
     QCOMPARE(service.isEnabled(), false);
 
-    QDeclarativeDebugTestClient client("tst_QmlDebugService::isEnabled()", m_conn);
+    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::isEnabled()", m_conn);
     client.setEnabled(true);
     QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
     QCOMPARE(service.isEnabled(), true);
 
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QmlDebugService::isEnabled()\" ");
-    QDeclarativeDebugService duplicate("tst_QmlDebugService::isEnabled()", m_conn);
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::isEnabled()\" ");
+    QDeclarativeDebugService duplicate("tst_QDeclarativeDebugService::isEnabled()", m_conn);
     QCOMPARE(duplicate.isEnabled(), false);
 }
 
-void tst_QmlDebugService::enabledChanged()
+void tst_QDeclarativeDebugService::enabledChanged()
 {
-    QDeclarativeDebugTestService service("tst_QmlDebugService::enabledChanged()");
-    QDeclarativeDebugTestClient client("tst_QmlDebugService::enabledChanged()", m_conn);
+    QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::enabledChanged()");
+    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::enabledChanged()", m_conn);
 
     QCOMPARE(service.enabled, false);
 
@@ -111,10 +111,10 @@ void tst_QmlDebugService::enabledChanged()
     QCOMPARE(service.enabled, true);
 }
 
-void tst_QmlDebugService::sendMessage()
+void tst_QDeclarativeDebugService::sendMessage()
 {
-    QDeclarativeDebugTestService service("tst_QmlDebugService::sendMessage()");
-    QDeclarativeDebugTestClient client("tst_QmlDebugService::sendMessage()", m_conn);
+    QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::sendMessage()");
+    QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::sendMessage()", m_conn);
 
     QByteArray msg = "hello!";
 
@@ -123,7 +123,7 @@ void tst_QmlDebugService::sendMessage()
     QCOMPARE(resp, msg);
 }
 
-void tst_QmlDebugService::idForObject()
+void tst_QDeclarativeDebugService::idForObject()
 {
     QCOMPARE(QDeclarativeDebugService::idForObject(0), -1);
 
@@ -145,7 +145,7 @@ void tst_QmlDebugService::idForObject()
     delete objB;
 }
 
-void tst_QmlDebugService::objectForId()
+void tst_QDeclarativeDebugService::objectForId()
 {
     QCOMPARE(QDeclarativeDebugService::objectForId(-1), static_cast<QObject*>(0));
     QCOMPARE(QDeclarativeDebugService::objectForId(1), static_cast<QObject*>(0));
@@ -158,7 +158,7 @@ void tst_QmlDebugService::objectForId()
     QCOMPARE(QDeclarativeDebugService::objectForId(id), static_cast<QObject*>(0));
 }
 
-void tst_QmlDebugService::objectToString()
+void tst_QDeclarativeDebugService::objectToString()
 {
     QCOMPARE(QDeclarativeDebugService::objectToString(0), QString("NULL"));
 
@@ -171,10 +171,10 @@ void tst_QmlDebugService::objectToString()
 }
 
 
-class tst_QmlDebugService_Factory : public QDeclarativeTestFactory
+class tst_QDeclarativeDebugService_Factory : public QDeclarativeTestFactory
 {
 public:
-    QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QmlDebugService(data); }
+    QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QDeclarativeDebugService(data); }
 };
 
 // This does not use QTEST_MAIN because the test has to be created and run
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    tst_QmlDebugService_Factory factory;
+    tst_QDeclarativeDebugService_Factory factory;
     return QDeclarativeDebugTest::runTests(&factory);
 }
 
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
index a92a240..9543280 100644
--- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -46,11 +46,11 @@
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 
-class tst_qmldom : public QObject
+class tst_qdeclarativedom : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmldom() {}
+    tst_qdeclarativedom() {}
 
 private slots:
     void loadSimple();
@@ -79,7 +79,7 @@ private:
 };
 
 
-void tst_qmldom::loadSimple()
+void tst_qdeclarativedom::loadSimple()
 {
     QByteArray qml = "import Qt 4.6\n"
                       "Item {}";
@@ -98,7 +98,7 @@ void tst_qmldom::loadSimple()
 }
 
 // Test regular properties
-void tst_qmldom::loadProperties()
+void tst_qdeclarativedom::loadProperties()
 {
     QByteArray qml = "import Qt 4.6\n"
                      "Item { id : item; x : 300; visible : true }";
@@ -131,7 +131,7 @@ void tst_qmldom::loadProperties()
 }
 
 // Test grouped properties
-void tst_qmldom::loadGroupedProperties()
+void tst_qdeclarativedom::loadGroupedProperties()
 {
     {
         QByteArray qml = "import Qt 4.6\n"
@@ -226,7 +226,7 @@ void tst_qmldom::loadGroupedProperties()
 
 }
 
-void tst_qmldom::loadChildObject()
+void tst_qdeclarativedom::loadChildObject()
 {
     QByteArray qml = "import Qt 4.6\n"
                      "Item { Item {} }";
@@ -250,7 +250,7 @@ void tst_qmldom::loadChildObject()
     QVERIFY(childItem.objectType() == "Qt/Item");
 }
 
-void tst_qmldom::loadComposite()
+void tst_qdeclarativedom::loadComposite()
 {
     QFile file(SRCDIR  "/data/top.qml");
     QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
@@ -271,7 +271,7 @@ void tst_qmldom::loadComposite()
     QVERIFY(heightProperty.value().isLiteral());
 }
 
-void tst_qmldom::testValueSource()
+void tst_qdeclarativedom::testValueSource()
 {
     QByteArray qml = "import Qt 4.6\n"
                      "Rectangle { height: SpringFollow { spring: 1.4; damping: .15; source: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
@@ -303,7 +303,7 @@ void tst_qmldom::testValueSource()
     QVERIFY(sourceValue.toBinding().binding() == "Math.min(Math.max(-130, value*2.2 - 130), 133)");
 }
 
-void tst_qmldom::testValueInterceptor()
+void tst_qdeclarativedom::testValueInterceptor()
 {
     QByteArray qml = "import Qt 4.6\n"
                      "Rectangle { height: Behavior { NumberAnimation { duration: 100 } } }";
@@ -330,7 +330,7 @@ void tst_qmldom::testValueInterceptor()
 }
 
 // Test QDeclarativeDomDocument::imports()
-void tst_qmldom::loadImports()
+void tst_qdeclarativedom::loadImports()
 {
     QByteArray qml = "import Qt 4.6\n"
                      "import importlib.sublib 4.7\n"
@@ -378,7 +378,7 @@ void tst_qmldom::loadImports()
 }
 
 // Test loading a file with errors
-void tst_qmldom::loadErrors()
+void tst_qdeclarativedom::loadErrors()
 {
     QByteArray qml = "import Qt 4.6\n"
                      "Item {\n"
@@ -398,7 +398,7 @@ void tst_qmldom::loadErrors()
 }
 
 // Test loading a file with syntax errors
-void tst_qmldom::loadSyntaxErrors()
+void tst_qdeclarativedom::loadSyntaxErrors()
 {
     QByteArray qml = "import Qt 4.6\n"
                      "asdf";
@@ -416,7 +416,7 @@ void tst_qmldom::loadSyntaxErrors()
 }
 
 // Test attempting to load a file with remote references 
-void tst_qmldom::loadRemoteErrors()
+void tst_qdeclarativedom::loadRemoteErrors()
 {
     QByteArray qml = "import Qt 4.6\n"
                      "Item {\n"
@@ -437,7 +437,7 @@ void tst_qmldom::loadRemoteErrors()
 }
 
 // Test dynamic property declarations
-void tst_qmldom::loadDynamicProperty()
+void tst_qdeclarativedom::loadDynamicProperty()
 {
     {
         QByteArray qml = "import Qt 4.6\n"
@@ -530,7 +530,7 @@ void tst_qmldom::loadDynamicProperty()
 }
 
 // Test inline components
-void tst_qmldom::loadComponent()
+void tst_qdeclarativedom::loadComponent()
 {
     // Explicit component
     {
@@ -620,7 +620,7 @@ void tst_qmldom::loadComponent()
 }
 
 // Test QDeclarativeDomObject::dynamicProperty() method
-void tst_qmldom::object_dynamicProperty()
+void tst_qdeclarativedom::object_dynamicProperty()
 {
     // Invalid object
     {
@@ -674,7 +674,7 @@ void tst_qmldom::object_dynamicProperty()
 }
 
 // Test QDeclarativeObject::property() method
-void tst_qmldom::object_property()
+void tst_qdeclarativedom::object_property()
 {
     // Invalid object
     {
@@ -776,7 +776,7 @@ void tst_qmldom::object_property()
 }
 
 // Tests the QDeclarativeDomObject::url() method
-void tst_qmldom::object_url()
+void tst_qdeclarativedom::object_url()
 {
     // Invalid object
     {
@@ -815,7 +815,7 @@ void tst_qmldom::object_url()
 }
 
 // Test copy constructors and operators
-void tst_qmldom::copy()
+void tst_qdeclarativedom::copy()
 {
     QByteArray qml = "import Qt 4.6\n"
                      "MyItem {\n"
@@ -1190,7 +1190,7 @@ void tst_qmldom::copy()
 }
 
 // Tests the position/length of various elements
-void tst_qmldom::position()
+void tst_qdeclarativedom::position()
 {
     QByteArray qml = "import Qt 4.6\n"
          /*14*/      "Item {\n"
@@ -1308,6 +1308,6 @@ void tst_qmldom::position()
     qWarning("QDeclarativeListValue position test required");
 }
 
-QTEST_MAIN(tst_qmldom)
+QTEST_MAIN(tst_qdeclarativedom)
 
 #include "tst_qdeclarativedom.moc"
diff --git a/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp b/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp
index 60c74ef..036eec0 100644
--- a/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp
+++ b/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp
@@ -45,11 +45,11 @@
 #include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
-class tst_qmleasefollow : public QObject
+class tst_qdeclarativeeasefollow : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmleasefollow();
+    tst_qdeclarativeeasefollow();
 
 private slots:
     void defaultValues();
@@ -60,11 +60,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmleasefollow::tst_qmleasefollow()
+tst_qdeclarativeeasefollow::tst_qdeclarativeeasefollow()
 {
 }
 
-void tst_qmleasefollow::defaultValues()
+void tst_qdeclarativeeasefollow::defaultValues()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow1.qml"));
@@ -82,7 +82,7 @@ void tst_qmleasefollow::defaultValues()
     delete obj;
 }
 
-void tst_qmleasefollow::values()
+void tst_qdeclarativeeasefollow::values()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow2.qml"));
@@ -100,7 +100,7 @@ void tst_qmleasefollow::values()
     delete obj;
 }
 
-void tst_qmleasefollow::disabled()
+void tst_qdeclarativeeasefollow::disabled()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow3.qml"));
@@ -117,6 +117,6 @@ void tst_qmleasefollow::disabled()
     delete obj;
 }
 
-QTEST_MAIN(tst_qmleasefollow)
+QTEST_MAIN(tst_qdeclarativeeasefollow)
 
 #include "tst_qdeclarativeeasefollow.moc"
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
index 779e4e4..8fbd071 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
@@ -142,7 +142,7 @@ public slots:
     void setString(const QString &s) { m_string = s; }
 
 private:
-    friend class tst_qmlecmascript;
+    friend class tst_qdeclarativeecmascript;
     bool m_methodCalled;
     bool m_methodIntCalled;
 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index bbdb5cd..60c380c 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -69,11 +69,11 @@ inline QUrl TEST_FILE(const char *filename)
     return TEST_FILE(QLatin1String(filename));
 }
 
-class tst_qmlecmascript : public QObject
+class tst_qdeclarativeecmascript : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlecmascript() {}
+    tst_qdeclarativeecmascript() {}
 
 private slots:
     void initTestCase();
@@ -130,9 +130,9 @@ private:
     QDeclarativeEngine engine;
 };
 
-void tst_qmlecmascript::initTestCase() { registerTypes(); }
+void tst_qdeclarativeecmascript::initTestCase() { registerTypes(); }
 
-void tst_qmlecmascript::assignBasicTypes()
+void tst_qdeclarativeecmascript::assignBasicTypes()
 {
     {
     QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
@@ -192,7 +192,7 @@ void tst_qmlecmascript::assignBasicTypes()
     }
 }
 
-void tst_qmlecmascript::idShortcutInvalidates()
+void tst_qdeclarativeecmascript::idShortcutInvalidates()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml"));
@@ -213,7 +213,7 @@ void tst_qmlecmascript::idShortcutInvalidates()
     }
 }
 
-void tst_qmlecmascript::boolPropertiesEvaluateAsBool()
+void tst_qdeclarativeecmascript::boolPropertiesEvaluateAsBool()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml"));
@@ -229,7 +229,7 @@ void tst_qmlecmascript::boolPropertiesEvaluateAsBool()
     }
 }
 
-void tst_qmlecmascript::signalAssignment()
+void tst_qdeclarativeecmascript::signalAssignment()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("signalAssignment.1.qml"));
@@ -250,7 +250,7 @@ void tst_qmlecmascript::signalAssignment()
     }
 }
 
-void tst_qmlecmascript::methods()
+void tst_qdeclarativeecmascript::methods()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("methods.1.qml"));
@@ -298,7 +298,7 @@ void tst_qmlecmascript::methods()
     }
 }
 
-void tst_qmlecmascript::bindingLoop()
+void tst_qdeclarativeecmascript::bindingLoop()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("bindingLoop.qml"));
     QString warning = "QML MyQmlObject (" + component.url().toString() + ":9:9) Binding loop detected for property \"stringProperty\"";
@@ -307,7 +307,7 @@ void tst_qmlecmascript::bindingLoop()
     QVERIFY(object != 0);
 }
 
-void tst_qmlecmascript::basicExpressions_data()
+void tst_qdeclarativeecmascript::basicExpressions_data()
 {
     QTest::addColumn<QString>("expression");
     QTest::addColumn<QVariant>("result");
@@ -334,7 +334,7 @@ void tst_qmlecmascript::basicExpressions_data()
     QTest::newRow("Context property override default object property") << "millipedeLegs" << QVariant(100) << true;
 }
 
-void tst_qmlecmascript::basicExpressions()
+void tst_qdeclarativeecmascript::basicExpressions()
 {
     QFETCH(QString, expression);
     QFETCH(QVariant, result);
@@ -368,7 +368,7 @@ void tst_qmlecmascript::basicExpressions()
     QCOMPARE(expr.value(), result);
 }
 
-void tst_qmlecmascript::arrayExpressions()
+void tst_qdeclarativeecmascript::arrayExpressions()
 {
     QObject obj1;
     QObject obj2;
@@ -391,7 +391,7 @@ void tst_qmlecmascript::arrayExpressions()
 }
 
 // Tests that modifying a context property will reevaluate expressions
-void tst_qmlecmascript::contextPropertiesTriggerReeval()
+void tst_qdeclarativeecmascript::contextPropertiesTriggerReeval()
 {
     QDeclarativeContext context(engine.rootContext());
     MyQmlObject object1;
@@ -453,7 +453,7 @@ void tst_qmlecmascript::contextPropertiesTriggerReeval()
 
 }
 
-void tst_qmlecmascript::objectPropertiesTriggerReeval()
+void tst_qdeclarativeecmascript::objectPropertiesTriggerReeval()
 {
     QDeclarativeContext context(engine.rootContext());
     MyQmlObject object1;
@@ -507,7 +507,7 @@ void tst_qmlecmascript::objectPropertiesTriggerReeval()
     }
 }
 
-void tst_qmlecmascript::deferredProperties()
+void tst_qdeclarativeecmascript::deferredProperties()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("deferredProperties.qml"));
     MyDeferredObject *object = 
@@ -527,7 +527,7 @@ void tst_qmlecmascript::deferredProperties()
     QCOMPARE(qmlObject->value(), 19);
 }
 
-void tst_qmlecmascript::extensionObjects()
+void tst_qdeclarativeecmascript::extensionObjects()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("extensionObjects.qml"));
     MyExtendedObject *object = 
@@ -542,7 +542,7 @@ void tst_qmlecmascript::extensionObjects()
     QCOMPARE(object->baseProperty(), 92);
 }
 
-void tst_qmlecmascript::attachedProperties()
+void tst_qdeclarativeecmascript::attachedProperties()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("attachedProperty.qml"));
     QObject *object = component.create();
@@ -555,7 +555,7 @@ void tst_qmlecmascript::attachedProperties()
     // ### Need to test attached property assignment
 }
 
-void tst_qmlecmascript::enums()
+void tst_qdeclarativeecmascript::enums()
 {
     // Existant enums
     {
@@ -590,7 +590,7 @@ void tst_qmlecmascript::enums()
     }
 }
 
-void tst_qmlecmascript::valueTypeFunctions()
+void tst_qdeclarativeecmascript::valueTypeFunctions()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("valueTypeFunctions.qml"));
     MyTypeObject *obj = qobject_cast<MyTypeObject*>(component.create());
@@ -603,7 +603,7 @@ void tst_qmlecmascript::valueTypeFunctions()
 Tests that writing a constant to a property with a binding on it disables the
 binding.
 */
-void tst_qmlecmascript::constantsOverrideBindings()
+void tst_qdeclarativeecmascript::constantsOverrideBindings()
 {
     // From ECMAScript
     {
@@ -659,7 +659,7 @@ void tst_qmlecmascript::constantsOverrideBindings()
 Tests that assigning a binding to a property that already has a binding causes
 the original binding to be disabled.
 */
-void tst_qmlecmascript::outerBindingOverridesInnerBinding()
+void tst_qdeclarativeecmascript::outerBindingOverridesInnerBinding()
 {
     QDeclarativeComponent component(&engine, 
                            TEST_FILE("outerBindingOverridesInnerBinding.qml"));
@@ -686,7 +686,7 @@ Access a non-existent attached object.
 
 Tests for a regression where this used to crash.
 */
-void tst_qmlecmascript::nonExistantAttachedObject()
+void tst_qdeclarativeecmascript::nonExistantAttachedObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("nonExistantAttachedObject.qml"));
 
@@ -697,7 +697,7 @@ void tst_qmlecmascript::nonExistantAttachedObject()
     QVERIFY(object != 0);
 }
 
-void tst_qmlecmascript::scope()
+void tst_qdeclarativeecmascript::scope()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("scope.qml"));
@@ -734,7 +734,7 @@ void tst_qmlecmascript::scope()
 Tests that "any" type passes through a synthesized signal parameter.  This
 is essentially a test of QDeclarativeMetaType::copy()
 */
-void tst_qmlecmascript::signalParameterTypes()
+void tst_qdeclarativeecmascript::signalParameterTypes()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("signalParameterTypes.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
@@ -751,7 +751,7 @@ void tst_qmlecmascript::signalParameterTypes()
 /*
 Test that two JS objects for the same QObject compare as equal.
 */
-void tst_qmlecmascript::objectsCompareAsEqual()
+void tst_qdeclarativeecmascript::objectsCompareAsEqual()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("objectsCompareAsEqual.qml"));
     QObject *object = component.create();
@@ -769,7 +769,7 @@ Confirm bindings and alias properties can coexist.
 
 Tests for a regression where the binding would not reevaluate.
 */
-void tst_qmlecmascript::aliasPropertyAndBinding()
+void tst_qdeclarativeecmascript::aliasPropertyAndBinding()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("aliasPropertyAndBinding.qml"));
     QObject *object = component.create();
@@ -787,7 +787,7 @@ void tst_qmlecmascript::aliasPropertyAndBinding()
 /*
 Tests that only methods of Script {} blocks are exposed.
 */
-void tst_qmlecmascript::scriptAccess()
+void tst_qdeclarativeecmascript::scriptAccess()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("scriptAccess.qml"));
 
@@ -802,7 +802,7 @@ void tst_qmlecmascript::scriptAccess()
     QCOMPARE(object->property("test3").toInt(), 0);
 }
 
-void tst_qmlecmascript::dynamicCreation_data()
+void tst_qdeclarativeecmascript::dynamicCreation_data()
 {
     QTest::addColumn<QString>("method");
     QTest::addColumn<QString>("createdName");
@@ -816,7 +816,7 @@ void tst_qmlecmascript::dynamicCreation_data()
 Test using createQmlObject to dynamically generate an item
 Also using createComponent is tested.
 */
-void tst_qmlecmascript::dynamicCreation()
+void tst_qdeclarativeecmascript::dynamicCreation()
 {
     QFETCH(QString, method);
     QFETCH(QString, createdName);
@@ -834,7 +834,7 @@ void tst_qmlecmascript::dynamicCreation()
 /*
    Tests the destroy function
 */
-void tst_qmlecmascript::dynamicDestruction()
+void tst_qdeclarativeecmascript::dynamicDestruction()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("dynamicDeletion.qml"));
     QDeclarativeGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create());
@@ -868,7 +868,7 @@ void tst_qmlecmascript::dynamicDestruction()
 /*
    tests that id.toString() works
 */
-void tst_qmlecmascript::objectToString()
+void tst_qdeclarativeecmascript::objectToString()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("declarativeToString.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
@@ -883,7 +883,7 @@ Tests bindings that indirectly cause their own deletion work.
 
 This test is best run under valgrind to ensure no invalid memory access occur.
 */
-void tst_qmlecmascript::selfDeletingBinding()
+void tst_qdeclarativeecmascript::selfDeletingBinding()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("selfDeletingBinding.qml"));
@@ -907,7 +907,7 @@ This test a regression where this used to crash.  The issue was specificially
 for extended objects that did not include a synthesized meta object (so non-root
 and no synthesiszed properties).
 */
-void tst_qmlecmascript::extendedObjectPropertyLookup()
+void tst_qdeclarativeecmascript::extendedObjectPropertyLookup()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("extendedObjectPropertyLookup.qml"));
     QObject *object = component.create();
@@ -917,7 +917,7 @@ void tst_qmlecmascript::extendedObjectPropertyLookup()
 /*
 Test file/lineNumbers for binding/Script errors.
 */
-void tst_qmlecmascript::scriptErrors()
+void tst_qdeclarativeecmascript::scriptErrors()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("scriptErrors.qml"));
     QString url = component.url().toString();
@@ -953,7 +953,7 @@ void tst_qmlecmascript::scriptErrors()
 Test bindings still work when the reeval is triggered from within
 a signal script.
 */
-void tst_qmlecmascript::signalTriggeredBindings()
+void tst_qdeclarativeecmascript::signalTriggeredBindings()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("signalTriggeredBindings.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
@@ -979,7 +979,7 @@ void tst_qmlecmascript::signalTriggeredBindings()
 /*
 Test that list properties can be iterated from ECMAScript
 */
-void tst_qmlecmascript::listProperties()
+void tst_qdeclarativeecmascript::listProperties()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("listProperties.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
@@ -991,7 +991,7 @@ void tst_qmlecmascript::listProperties()
     QCOMPARE(object->property("test4").toBool(), true);
 }
 
-void tst_qmlecmascript::exceptionClearsOnReeval()
+void tst_qdeclarativeecmascript::exceptionClearsOnReeval()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml"));
     QString url = component.url().toString();
@@ -1012,7 +1012,7 @@ void tst_qmlecmascript::exceptionClearsOnReeval()
     QCOMPARE(object->property("test").toBool(), true);
 }
 
-void tst_qmlecmascript::exceptionSlotProducesWarning()
+void tst_qdeclarativeecmascript::exceptionSlotProducesWarning()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning.qml"));
     QString url = component.url().toString();
@@ -1024,7 +1024,7 @@ void tst_qmlecmascript::exceptionSlotProducesWarning()
     QVERIFY(object != 0);
 }
 
-void tst_qmlecmascript::exceptionBindingProducesWarning()
+void tst_qdeclarativeecmascript::exceptionBindingProducesWarning()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning2.qml"));
     QString url = component.url().toString();
@@ -1043,7 +1043,7 @@ static void transientErrorsMsgHandler(QtMsgType, const char *)
 }
 
 // Check that transient binding errors are not displayed
-void tst_qmlecmascript::transientErrors()
+void tst_qdeclarativeecmascript::transientErrors()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("transientErrors.qml"));
 
@@ -1059,7 +1059,7 @@ void tst_qmlecmascript::transientErrors()
 }
 
 // Check that errors during shutdown are minimized
-void tst_qmlecmascript::shutdownErrors()
+void tst_qdeclarativeecmascript::shutdownErrors()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("shutdownErrors.qml"));
     QObject *object = component.create();
@@ -1075,7 +1075,7 @@ void tst_qmlecmascript::shutdownErrors()
 }
 
 // Check that Script::source property works as expected
-void tst_qmlecmascript::externalScript()
+void tst_qdeclarativeecmascript::externalScript()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("externalScript.1.qml"));
@@ -1121,7 +1121,7 @@ void tst_qmlecmascript::externalScript()
     }
 }
 
-void tst_qmlecmascript::compositePropertyType()
+void tst_qdeclarativeecmascript::compositePropertyType()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("compositePropertyType.qml"));
     QTest::ignoreMessage(QtDebugMsg, "hello world");
@@ -1130,7 +1130,7 @@ void tst_qmlecmascript::compositePropertyType()
 }
 
 // QTBUG-5759
-void tst_qmlecmascript::jsObject()
+void tst_qdeclarativeecmascript::jsObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("jsObject.qml"));
     QObject *object = component.create();
@@ -1141,7 +1141,7 @@ void tst_qmlecmascript::jsObject()
     delete object;
 }
 
-void tst_qmlecmascript::undefinedResetsProperty()
+void tst_qdeclarativeecmascript::undefinedResetsProperty()
 {
     {
     QDeclarativeComponent component(&engine, TEST_FILE("undefinedResetsProperty.qml"));
@@ -1176,7 +1176,7 @@ void tst_qmlecmascript::undefinedResetsProperty()
 }
 
 // QTBUG-6781
-void tst_qmlecmascript::bug1()
+void tst_qdeclarativeecmascript::bug1()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("bug.1.qml"));
     QObject *object = component.create();
@@ -1195,7 +1195,7 @@ void tst_qmlecmascript::bug1()
     delete object;
 }
 
-void tst_qmlecmascript::callQtInvokables()
+void tst_qdeclarativeecmascript::callQtInvokables()
 {
     MyInvokableObject o;
 
@@ -1598,7 +1598,7 @@ void tst_qmlecmascript::callQtInvokables()
 }
 
 // QTBUG-5675
-void tst_qmlecmascript::listToVariant()
+void tst_qdeclarativeecmascript::listToVariant()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("listToVariant.qml"));
 
@@ -1618,7 +1618,7 @@ void tst_qmlecmascript::listToVariant()
 }
 
 // QTBUG-7957
-void tst_qmlecmascript::multiEngineObject()
+void tst_qdeclarativeecmascript::multiEngineObject()
 {
     MyQmlObject obj;
     obj.setStringProperty("Howdy planet");
@@ -1642,7 +1642,7 @@ void tst_qmlecmascript::multiEngineObject()
 }
 
 // Test that references to QObjects are cleanup when the object is destroyed
-void tst_qmlecmascript::deletedObject()
+void tst_qdeclarativeecmascript::deletedObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml"));
 
@@ -1657,6 +1657,6 @@ void tst_qmlecmascript::deletedObject()
     delete object;
 }
 
-QTEST_MAIN(tst_qmlecmascript)
+QTEST_MAIN(tst_qdeclarativeecmascript)
 
 #include "tst_qdeclarativeecmascript.moc"
diff --git a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
index ca48bd2..5dc5f19 100644
--- a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
+++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
@@ -50,11 +50,11 @@
 #include <QDeclarativeComponent>
 #include <QDeclarativeNetworkAccessManagerFactory>
 
-class tst_qmlengine : public QObject
+class tst_qdeclarativeengine : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlengine() {}
+    tst_qdeclarativeengine() {}
 
 private slots:
     void rootContext();
@@ -65,7 +65,7 @@ private slots:
     void clearComponentCache();
 };
 
-void tst_qmlengine::rootContext()
+void tst_qdeclarativeengine::rootContext()
 {
     QDeclarativeEngine engine;
 
@@ -88,7 +88,7 @@ public:
     QNetworkAccessManager *manager;
 };
 
-void tst_qmlengine::networkAccessManager()
+void tst_qdeclarativeengine::networkAccessManager()
 {
     QDeclarativeEngine *engine = new QDeclarativeEngine;
 
@@ -105,7 +105,7 @@ void tst_qmlengine::networkAccessManager()
     delete engine;
 }
 
-void tst_qmlengine::baseUrl()
+void tst_qdeclarativeengine::baseUrl()
 {
     QDeclarativeEngine engine;
 
@@ -129,7 +129,7 @@ void tst_qmlengine::baseUrl()
     QCOMPARE(engine.rootContext()->resolvedUrl(QUrl("main.qml")), cwd.resolved(QUrl("main.qml")));
 }
 
-void tst_qmlengine::contextForObject()
+void tst_qdeclarativeengine::contextForObject()
 {
     QDeclarativeEngine *engine = new QDeclarativeEngine;
 
@@ -162,11 +162,11 @@ void tst_qmlengine::contextForObject()
     QVERIFY(QDeclarativeEngine::contextForObject(&object) == 0);
 }
 
-void tst_qmlengine::offlineStoragePath()
+void tst_qdeclarativeengine::offlineStoragePath()
 {
     // Without these set, QDesktopServices::storageLocation returns
     // strings with extra "//" at the end. We set them to ignore this problem.
-    qApp->setApplicationName("tst_qmlengine");
+    qApp->setApplicationName("tst_qdeclarativeengine");
     qApp->setOrganizationName("Nokia");
     qApp->setOrganizationDomain("nokia.com");
 
@@ -184,7 +184,7 @@ void tst_qmlengine::offlineStoragePath()
     QCOMPARE(engine.offlineStoragePath(), QDir::homePath());
 }
 
-void tst_qmlengine::clearComponentCache()
+void tst_qdeclarativeengine::clearComponentCache()
 {
     QDeclarativeEngine engine;
 
@@ -235,6 +235,6 @@ void tst_qmlengine::clearComponentCache()
     }
 }
 
-QTEST_MAIN(tst_qmlengine)
+QTEST_MAIN(tst_qdeclarativeengine)
 
 #include "tst_qdeclarativeengine.moc"
diff --git a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
index 2df11d3..ba1ebae 100644
--- a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
+++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
@@ -43,7 +43,7 @@
 #include <QDeclarativeError>
 #include <QDebug>
 
-class tst_qmlerror : public QObject
+class tst_qdeclarativeerror : public QObject
 {
     Q_OBJECT
 private slots:
@@ -57,7 +57,7 @@ private slots:
     void debug();
 };
 
-void tst_qmlerror::url()
+void tst_qdeclarativeerror::url()
 {
     QDeclarativeError error;
 
@@ -77,7 +77,7 @@ void tst_qmlerror::url()
     QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
 }
 
-void tst_qmlerror::description()
+void tst_qdeclarativeerror::description()
 {
     QDeclarativeError error;
 
@@ -97,7 +97,7 @@ void tst_qmlerror::description()
     QCOMPARE(error2.description(), QString("An Error"));
 }
 
-void tst_qmlerror::line()
+void tst_qdeclarativeerror::line()
 {
     QDeclarativeError error;
 
@@ -117,7 +117,7 @@ void tst_qmlerror::line()
     QCOMPARE(error2.line(), 102);
 }
 
-void tst_qmlerror::column()
+void tst_qdeclarativeerror::column()
 {
     QDeclarativeError error;
 
@@ -137,7 +137,7 @@ void tst_qmlerror::column()
     QCOMPARE(error2.column(), 16);
 }
 
-void tst_qmlerror::toString()
+void tst_qdeclarativeerror::toString()
 {
     {
         QDeclarativeError error;
@@ -159,7 +159,7 @@ void tst_qmlerror::toString()
     }
 }
 
-void tst_qmlerror::copy()
+void tst_qdeclarativeerror::copy()
 {
     QDeclarativeError error;
     error.setUrl(QUrl("http://www.nokia.com/main.qml"));
@@ -193,7 +193,7 @@ void tst_qmlerror::copy()
 
 }
 
-void tst_qmlerror::debug()
+void tst_qdeclarativeerror::debug()
 {
     {
         QDeclarativeError error;
@@ -237,6 +237,6 @@ void tst_qmlerror::debug()
 
 
 
-QTEST_MAIN(tst_qmlerror)
+QTEST_MAIN(tst_qdeclarativeerror)
 
 #include "tst_qdeclarativeerror.moc"
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index 9e5238e..1c98c50 100644
--- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -46,11 +46,11 @@
 #include <private/qdeclarativevaluetype_p.h>
 #include <math.h>
 
-class tst_qmlgraphicsflickable : public QObject
+class tst_qdeclarativeflickable : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicsflickable();
+    tst_qdeclarativeflickable();
 
 private slots:
     void create();
@@ -66,11 +66,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlgraphicsflickable::tst_qmlgraphicsflickable()
+tst_qdeclarativeflickable::tst_qdeclarativeflickable()
 {
 }
 
-void tst_qmlgraphicsflickable::create()
+void tst_qdeclarativeflickable::create()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable01.qml"));
@@ -96,7 +96,7 @@ void tst_qmlgraphicsflickable::create()
     delete obj;
 }
 
-void tst_qmlgraphicsflickable::horizontalViewportSize()
+void tst_qdeclarativeflickable::horizontalViewportSize()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable02.qml"));
@@ -113,7 +113,7 @@ void tst_qmlgraphicsflickable::horizontalViewportSize()
     delete obj;
 }
 
-void tst_qmlgraphicsflickable::verticalViewportSize()
+void tst_qdeclarativeflickable::verticalViewportSize()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable03.qml"));
@@ -130,7 +130,7 @@ void tst_qmlgraphicsflickable::verticalViewportSize()
     delete obj;
 }
 
-void tst_qmlgraphicsflickable::properties()
+void tst_qdeclarativeflickable::properties()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable04.qml"));
@@ -145,7 +145,7 @@ void tst_qmlgraphicsflickable::properties()
     delete obj;
 }
 
-void tst_qmlgraphicsflickable::overShoot()
+void tst_qdeclarativeflickable::overShoot()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Flickable { overShoot: false; }", QUrl::fromLocalFile(""));
@@ -168,7 +168,7 @@ void tst_qmlgraphicsflickable::overShoot()
     QCOMPARE(spy.count(),2);
 }
 
-void tst_qmlgraphicsflickable::maximumFlickVelocity()
+void tst_qdeclarativeflickable::maximumFlickVelocity()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Flickable { maximumFlickVelocity: 1.0; }", QUrl::fromLocalFile(""));
@@ -185,7 +185,7 @@ void tst_qmlgraphicsflickable::maximumFlickVelocity()
     QCOMPARE(spy.count(),1);
 }
 
-void tst_qmlgraphicsflickable::flickDeceleration()
+void tst_qdeclarativeflickable::flickDeceleration()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Flickable { flickDeceleration: 1.0; }", QUrl::fromLocalFile(""));
@@ -202,7 +202,7 @@ void tst_qmlgraphicsflickable::flickDeceleration()
     QCOMPARE(spy.count(),1);
 }
 
-void tst_qmlgraphicsflickable::pressDelay()
+void tst_qdeclarativeflickable::pressDelay()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Flickable { pressDelay: 100; }", QUrl::fromLocalFile(""));
@@ -219,6 +219,6 @@ void tst_qmlgraphicsflickable::pressDelay()
     QCOMPARE(spy.count(),1);
 }
 
-QTEST_MAIN(tst_qmlgraphicsflickable)
+QTEST_MAIN(tst_qdeclarativeflickable)
 
 #include "tst_qdeclarativeflickable.moc"
diff --git a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
index f29ed18..ed37c43 100644
--- a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
+++ b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
@@ -47,11 +47,11 @@
 #include <private/qdeclarativerectangle_p.h>
 #include <math.h>
 
-class tst_qmlgraphicsflipable : public QObject
+class tst_qdeclarativeflipable : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicsflipable();
+    tst_qdeclarativeflipable();
 
 private slots:
     void create();
@@ -62,11 +62,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlgraphicsflipable::tst_qmlgraphicsflipable()
+tst_qdeclarativeflipable::tst_qdeclarativeflipable()
 {
 }
 
-void tst_qmlgraphicsflipable::create()
+void tst_qdeclarativeflipable::create()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
@@ -76,7 +76,7 @@ void tst_qmlgraphicsflipable::create()
     delete obj;
 }
 
-void tst_qmlgraphicsflipable::checkFrontAndBack()
+void tst_qdeclarativeflipable::checkFrontAndBack()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
@@ -88,7 +88,7 @@ void tst_qmlgraphicsflipable::checkFrontAndBack()
     delete obj;
 }
 
-void tst_qmlgraphicsflipable::setFrontAndBack()
+void tst_qdeclarativeflipable::setFrontAndBack()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
@@ -108,6 +108,6 @@ void tst_qmlgraphicsflipable::setFrontAndBack()
     delete obj;
 }
 
-QTEST_MAIN(tst_qmlgraphicsflipable)
+QTEST_MAIN(tst_qdeclarativeflipable)
 
 #include "tst_qdeclarativeflipable.moc"
diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
index 5a1259d..a9762df 100644
--- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
+++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -44,12 +44,12 @@
 #include <private/qdeclarativefontloader_p.h>
 #include "../../../shared/util.h"
 
-class tst_qmlfontloader : public QObject
+class tst_qdeclarativefontloader : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlfontloader();
+    tst_qdeclarativefontloader();
 
 private slots:
     void noFont();
@@ -65,11 +65,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlfontloader::tst_qmlfontloader()
+tst_qdeclarativefontloader::tst_qdeclarativefontloader()
 {
 }
 
-void tst_qmlfontloader::noFont()
+void tst_qdeclarativefontloader::noFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { }";
     QDeclarativeComponent component(&engine);
@@ -84,7 +84,7 @@ void tst_qmlfontloader::noFont()
     delete fontObject;
 }
 
-void tst_qmlfontloader::namedFont()
+void tst_qdeclarativefontloader::namedFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { name: \"Helvetica\" }";
     QDeclarativeComponent component(&engine);
@@ -97,7 +97,7 @@ void tst_qmlfontloader::namedFont()
     QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
 }
 
-void tst_qmlfontloader::localFont()
+void tst_qdeclarativefontloader::localFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR  "/data/tarzeau_ocr_a.ttf\" }";
     QDeclarativeComponent component(&engine);
@@ -110,7 +110,7 @@ void tst_qmlfontloader::localFont()
     QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
 }
 
-void tst_qmlfontloader::failLocalFont()
+void tst_qdeclarativefontloader::failLocalFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" }";
     QTest::ignoreMessage(QtWarningMsg, QString("Cannot load font:  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" )  ").toUtf8().constData());
@@ -124,7 +124,7 @@ void tst_qmlfontloader::failLocalFont()
     QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error);
 }
 
-void tst_qmlfontloader::webFont()
+void tst_qdeclarativefontloader::webFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://www.princexml.com/fonts/steffmann/Starburst.ttf\" }";
     QDeclarativeComponent component(&engine);
@@ -137,7 +137,7 @@ void tst_qmlfontloader::webFont()
     QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
 }
 
-void tst_qmlfontloader::failWebFont()
+void tst_qdeclarativefontloader::failWebFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://wrong.address.com/Starburst.ttf\" }";
     QTest::ignoreMessage(QtWarningMsg, "Cannot load font:  QUrl( \"http://wrong.address.com/Starburst.ttf\" )  ");
@@ -151,6 +151,6 @@ void tst_qmlfontloader::failWebFont()
     QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error);
 }
 
-QTEST_MAIN(tst_qmlfontloader)
+QTEST_MAIN(tst_qdeclarativefontloader)
 
 #include "tst_qdeclarativefontloader.moc"
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 0deb43d..9a7f517 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -49,11 +49,11 @@
 #include <qdeclarativecontext.h>
 #include <qdeclarativeexpression.h>
 
-class tst_QmlGraphicsGridView : public QObject
+class tst_QDeclarativeGridView : public QObject
 {
     Q_OBJECT
 public:
-    tst_QmlGraphicsGridView();
+    tst_QDeclarativeGridView();
 
 private slots:
     void items();
@@ -136,11 +136,11 @@ private:
     QList<QPair<QString,QString> > list;
 };
 
-tst_QmlGraphicsGridView::tst_QmlGraphicsGridView()
+tst_QDeclarativeGridView::tst_QDeclarativeGridView()
 {
 }
 
-void tst_QmlGraphicsGridView::items()
+void tst_QDeclarativeGridView::items()
 {
     QDeclarativeView *canvas = createView();
 
@@ -188,7 +188,7 @@ void tst_QmlGraphicsGridView::items()
     delete canvas;
 }
 
-void tst_QmlGraphicsGridView::changed()
+void tst_QDeclarativeGridView::changed()
 {
     QDeclarativeView *canvas = createView();
 
@@ -225,7 +225,7 @@ void tst_QmlGraphicsGridView::changed()
     delete canvas;
 }
 
-void tst_QmlGraphicsGridView::inserted()
+void tst_QDeclarativeGridView::inserted()
 {
     QDeclarativeView *canvas = createView();
 
@@ -307,7 +307,7 @@ void tst_QmlGraphicsGridView::inserted()
     delete canvas;
 }
 
-void tst_QmlGraphicsGridView::removed()
+void tst_QDeclarativeGridView::removed()
 {
     QDeclarativeView *canvas = createView();
 
@@ -467,7 +467,7 @@ void tst_QmlGraphicsGridView::removed()
     delete canvas;
 }
 
-void tst_QmlGraphicsGridView::moved()
+void tst_QDeclarativeGridView::moved()
 {
     QDeclarativeView *canvas = createView();
 
@@ -565,7 +565,7 @@ void tst_QmlGraphicsGridView::moved()
     delete canvas;
 }
 
-void tst_QmlGraphicsGridView::currentIndex()
+void tst_QDeclarativeGridView::currentIndex()
 {
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -687,7 +687,7 @@ void tst_QmlGraphicsGridView::currentIndex()
     delete canvas;
 }
 
-void tst_QmlGraphicsGridView::changeFlow()
+void tst_QDeclarativeGridView::changeFlow()
 {
     QDeclarativeView *canvas = createView();
 
@@ -746,7 +746,7 @@ void tst_QmlGraphicsGridView::changeFlow()
     delete canvas;
 }
 
-void tst_QmlGraphicsGridView::defaultValues()
+void tst_QDeclarativeGridView::defaultValues()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview3.qml"));
@@ -769,7 +769,7 @@ void tst_QmlGraphicsGridView::defaultValues()
     delete obj;
 }
 
-void tst_QmlGraphicsGridView::properties()
+void tst_QDeclarativeGridView::properties()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview2.qml"));
@@ -792,7 +792,7 @@ void tst_QmlGraphicsGridView::properties()
     delete obj;
 }
 
-void tst_QmlGraphicsGridView::positionViewAtIndex()
+void tst_QDeclarativeGridView::positionViewAtIndex()
 {
     QDeclarativeView *canvas = createView();
 
@@ -882,7 +882,7 @@ void tst_QmlGraphicsGridView::positionViewAtIndex()
     delete canvas;
 }
 
-QDeclarativeView *tst_QmlGraphicsGridView::createView()
+QDeclarativeView *tst_QDeclarativeGridView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
@@ -895,7 +895,7 @@ QDeclarativeView *tst_QmlGraphicsGridView::createView()
    item must also evaluate the {index} expression equal to index
 */
 template<typename T>
-T *tst_QmlGraphicsGridView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
+T *tst_QDeclarativeGridView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
 {
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
@@ -925,7 +925,7 @@ T *tst_QmlGraphicsGridView::findItem(QGraphicsObject *parent, const QString &obj
 }
 
 template<typename T>
-QList<T*> tst_QmlGraphicsGridView::findItems(QGraphicsObject *parent, const QString &objectName)
+QList<T*> tst_QDeclarativeGridView::findItems(QGraphicsObject *parent, const QString &objectName)
 {
     QList<T*> items;
     const QMetaObject &mo = T::staticMetaObject;
@@ -945,7 +945,7 @@ QList<T*> tst_QmlGraphicsGridView::findItems(QGraphicsObject *parent, const QStr
     return items;
 }
 
-void tst_QmlGraphicsGridView::dumpTree(QDeclarativeItem *parent, int depth)
+void tst_QDeclarativeGridView::dumpTree(QDeclarativeItem *parent, int depth)
 {
     static QString padding("                       ");
     for (int i = 0; i < parent->childItems().count(); ++i) {
@@ -959,6 +959,6 @@ void tst_QmlGraphicsGridView::dumpTree(QDeclarativeItem *parent, int depth)
 }
 
 
-QTEST_MAIN(tst_QmlGraphicsGridView)
+QTEST_MAIN(tst_QDeclarativeGridView)
 
 #include "tst_qdeclarativegridview.moc"
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index 097e5fc..f38fca9 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -67,12 +67,12 @@
     } while (false)
 
 
-class tst_qmlgraphicsimage : public QObject
+class tst_qdeclarativeimage : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicsimage();
+    tst_qdeclarativeimage();
 
 private slots:
     void noSource();
@@ -87,11 +87,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlgraphicsimage::tst_qmlgraphicsimage()
+tst_qdeclarativeimage::tst_qdeclarativeimage()
 {
 }
 
-void tst_qmlgraphicsimage::noSource()
+void tst_qdeclarativeimage::noSource()
 {
     QString componentStr = "import Qt 4.6\nImage { source: \"\" }";
     QDeclarativeComponent component(&engine);
@@ -108,7 +108,7 @@ void tst_qmlgraphicsimage::noSource()
     delete obj;
 }
 
-void tst_qmlgraphicsimage::imageSource_data()
+void tst_qdeclarativeimage::imageSource_data()
 {
     QTest::addColumn<QString>("source");
     QTest::addColumn<bool>("remote");
@@ -122,7 +122,7 @@ void tst_qmlgraphicsimage::imageSource_data()
         << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
 }
 
-void tst_qmlgraphicsimage::imageSource()
+void tst_qdeclarativeimage::imageSource()
 {
     QFETCH(QString, source);
     QFETCH(bool, remote);
@@ -161,7 +161,7 @@ void tst_qmlgraphicsimage::imageSource()
     delete obj;
 }
 
-void tst_qmlgraphicsimage::clearSource()
+void tst_qdeclarativeimage::clearSource()
 {
     QString componentStr = "import Qt 4.6\nImage { source: srcImage }";
     QDeclarativeContext *ctxt = engine.rootContext();
@@ -183,7 +183,7 @@ void tst_qmlgraphicsimage::clearSource()
     QCOMPARE(obj->progress(), 0.0);
 }
 
-void tst_qmlgraphicsimage::resized()
+void tst_qdeclarativeimage::resized()
 {
     QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
@@ -197,7 +197,7 @@ void tst_qmlgraphicsimage::resized()
     delete obj;
 }
 
-void tst_qmlgraphicsimage::smooth()
+void tst_qdeclarativeimage::smooth()
 {
     QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
     QDeclarativeComponent component(&engine);
@@ -212,7 +212,7 @@ void tst_qmlgraphicsimage::smooth()
     delete obj;
 }
 
-void tst_qmlgraphicsimage::pixmap()
+void tst_qdeclarativeimage::pixmap()
 {
     QString componentStr = "import Qt 4.6\nImage { pixmap: testPixmap }";
 
@@ -242,6 +242,6 @@ void tst_qmlgraphicsimage::pixmap()
     delete obj;
 }
 
-QTEST_MAIN(tst_qmlgraphicsimage)
+QTEST_MAIN(tst_qdeclarativeimage)
 
 #include "tst_qdeclarativeimage.moc"
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index 704899d..c5bdfc8 100644
--- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -56,11 +56,11 @@
     } while (false)
 
 
-class tst_qmlimageprovider : public QObject
+class tst_qdeclarativeimageprovider : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlimageprovider()
+    tst_qdeclarativeimageprovider()
     {
     }
 
@@ -83,7 +83,7 @@ public:
     }
 };
 
-void tst_qmlimageprovider::imageSource_data()
+void tst_qdeclarativeimageprovider::imageSource_data()
 {
     QTest::addColumn<QString>("source");
     QTest::addColumn<QString>("error");
@@ -95,7 +95,7 @@ void tst_qmlimageprovider::imageSource_data()
         << "\"Failed to get image from provider: image://bogus/exists.png\" ";
 }
     
-void tst_qmlimageprovider::imageSource()
+void tst_qdeclarativeimageprovider::imageSource()
 {
     QFETCH(QString, source);
     QFETCH(QString, error);
@@ -129,7 +129,7 @@ void tst_qmlimageprovider::imageSource()
     delete obj;
 }
 
-void tst_qmlimageprovider::removeProvider()
+void tst_qdeclarativeimageprovider::removeProvider()
 {
     engine.addImageProvider("test2", new TestProvider);
     QVERIFY(engine.imageProvider("test2") != 0);
@@ -161,6 +161,6 @@ void tst_qmlimageprovider::removeProvider()
 }
 
 
-QTEST_MAIN(tst_qmlimageprovider)
+QTEST_MAIN(tst_qdeclarativeimageprovider)
 
 #include "tst_qdeclarativeimageprovider.moc"
diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
index dc3e816..aa3f03b 100644
--- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
+++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
@@ -46,11 +46,11 @@
 #include <QDeclarativeContext>
 #include <qdeclarativeinfo.h>
 
-class tst_qmlinfo : public QObject
+class tst_qdeclarativeinfo : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlinfo() {}
+    tst_qdeclarativeinfo() {}
 
 private slots:
     void qmlObject();
@@ -68,7 +68,7 @@ inline QUrl TEST_FILE(const QString &filename)
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
 }
 
-void tst_qmlinfo::qmlObject()
+void tst_qdeclarativeinfo::qmlObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("qmlObject.qml"));
 
@@ -87,7 +87,7 @@ void tst_qmlinfo::qmlObject()
     qmlInfo(nested) << "Second Test Message";
 }
 
-void tst_qmlinfo::nestedQmlObject()
+void tst_qdeclarativeinfo::nestedQmlObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("nestedQmlObject.qml"));
 
@@ -108,7 +108,7 @@ void tst_qmlinfo::nestedQmlObject()
     qmlInfo(nested2) << "Inner Object";
 }
 
-void tst_qmlinfo::nonQmlObject()
+void tst_qdeclarativeinfo::nonQmlObject()
 {
     QObject object;
     QTest::ignoreMessage(QtWarningMsg, "QML QtObject (unknown location) Test Message");
@@ -119,13 +119,13 @@ void tst_qmlinfo::nonQmlObject()
     qmlInfo(&pbObject) << "Test Message";
 }
 
-void tst_qmlinfo::nullObject()
+void tst_qdeclarativeinfo::nullObject()
 {
     QTest::ignoreMessage(QtWarningMsg, "QML (unknown location) Null Object Test Message");
     qmlInfo(0) << "Null Object Test Message";
 }
 
-void tst_qmlinfo::nonQmlContextedObject()
+void tst_qdeclarativeinfo::nonQmlContextedObject()
 {
     QObject object;
     QDeclarativeContext context(&engine);
@@ -134,6 +134,6 @@ void tst_qmlinfo::nonQmlContextedObject()
     qmlInfo(&object) << "Test Message";
 }
 
-QTEST_MAIN(tst_qmlinfo)
+QTEST_MAIN(tst_qdeclarativeinfo)
 
 #include "tst_qdeclarativeinfo.moc"
diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
index 71495f3..636c5e3 100644
--- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
+++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
@@ -42,11 +42,11 @@
 #include <qtest.h>
 #include <private/qdeclarativecompiler_p.h>
 
-class tst_qmlinstruction : public QObject
+class tst_qdeclarativeinstruction : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlinstruction() {}
+    tst_qdeclarativeinstruction() {}
 
 private slots:
     void dump();
@@ -58,7 +58,7 @@ static void msgHandler(QtMsgType, const char *msg)
     messages << QLatin1String(msg);
 }
 
-void tst_qmlinstruction::dump()
+void tst_qdeclarativeinstruction::dump()
 {
     QDeclarativeCompiledData *data = new QDeclarativeCompiledData(0);
     {
@@ -580,6 +580,6 @@ void tst_qmlinstruction::dump()
     data->release();
 }
 
-QTEST_MAIN(tst_qmlinstruction)
+QTEST_MAIN(tst_qdeclarativeinstruction)
 
 #include "tst_qdeclarativeinstruction.moc"
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index 9feabdb..36dcf1f 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -46,12 +46,12 @@
 #include <QtDeclarative/qdeclarativeview.h>
 #include <QtDeclarative/qdeclarativeitem.h>
 
-class tst_QmlGraphicsItem : public QObject
+class tst_QDeclarativeItem : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_QmlGraphicsItem();
+    tst_QDeclarativeItem();
 
 private slots:
     void keys();
@@ -103,11 +103,11 @@ private:
 };
 
 
-tst_QmlGraphicsItem::tst_QmlGraphicsItem()
+tst_QDeclarativeItem::tst_QDeclarativeItem()
 {
 }
 
-void tst_QmlGraphicsItem::keys()
+void tst_QDeclarativeItem::keys()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
@@ -187,7 +187,7 @@ void tst_QmlGraphicsItem::keys()
     delete testObject;
 }
 
-void tst_QmlGraphicsItem::keyNavigation()
+void tst_QDeclarativeItem::keyNavigation()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
@@ -242,7 +242,7 @@ void tst_QmlGraphicsItem::keyNavigation()
     QVERIFY(item->hasFocus());
 }
 
-void tst_QmlGraphicsItem::smooth()
+void tst_QDeclarativeItem::smooth()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Item { smooth: false; }", QUrl::fromLocalFile(""));
@@ -265,7 +265,7 @@ void tst_QmlGraphicsItem::smooth()
     QCOMPARE(spy.count(),2);
 }
 
-void tst_QmlGraphicsItem::clip()
+void tst_QDeclarativeItem::clip()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6\nItem { clip: false\n }", QUrl::fromLocalFile(""));
@@ -289,7 +289,7 @@ void tst_QmlGraphicsItem::clip()
 }
 
 template<typename T>
-T *tst_QmlGraphicsItem::findItem(QGraphicsObject *parent, const QString &objectName)
+T *tst_QDeclarativeItem::findItem(QGraphicsObject *parent, const QString &objectName)
 {
     if (!parent)
         return 0;
@@ -313,6 +313,6 @@ T *tst_QmlGraphicsItem::findItem(QGraphicsObject *parent, const QString &objectN
 
 
 
-QTEST_MAIN(tst_QmlGraphicsItem)
+QTEST_MAIN(tst_QDeclarativeItem)
 
 #include "tst_qdeclarativeitem.moc"
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index 21f3e70..2c06416 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -146,7 +146,7 @@ signals:
     void basicParameterizedSignal(int parameter);
 
 private:
-    friend class tst_qmllanguage;
+    friend class tst_qdeclarativelanguage;
     int m_value;
     MyInterface *m_interface;
     MyQmlObject *m_qmlobject;
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index cb59f47..d6b5f0c 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -56,11 +56,11 @@ involve evaluating ECMAScript expressions and bindings.
 
 Evaluation of expressions and bindings is covered in qmlecmascript
 */
-class tst_qmllanguage : public QObject
+class tst_qdeclarativelanguage : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmllanguage() {
+    tst_qdeclarativelanguage() {
         QDeclarativeMetaType::registerCustomStringConverter(qMetaTypeId<MyCustomVariantType>(), myCustomVariantTypeConverter);
         QFileInfo fileInfo(__FILE__);
         engine.addImportPath(fileInfo.absoluteDir().filePath(QLatin1String("data/lib")));
@@ -180,12 +180,12 @@ inline QUrl TEST_FILE(const char *filename)
     return TEST_FILE(QLatin1String(filename));
 }
 
-void tst_qmllanguage::cleanupTestCase()
+void tst_qdeclarativelanguage::cleanupTestCase()
 {
     QVERIFY(QFile::remove(TEST_FILE(QString::fromUtf8("I18nType\303\201\303\242\303\243\303\244\303\245.qml")).toLocalFile()));
 }
 
-void tst_qmllanguage::errors_data()
+void tst_qdeclarativelanguage::errors_data()
 {
     QTest::addColumn<QString>("file");
     QTest::addColumn<QString>("errorFile");
@@ -306,7 +306,7 @@ void tst_qmllanguage::errors_data()
 }
 
 
-void tst_qmllanguage::errors()
+void tst_qdeclarativelanguage::errors()
 {
     QFETCH(QString, file);
     QFETCH(QString, errorFile);
@@ -325,7 +325,7 @@ void tst_qmllanguage::errors()
     VERIFY_ERRORS(errorFile.toLatin1().constData());
 }
 
-void tst_qmllanguage::simpleObject()
+void tst_qdeclarativelanguage::simpleObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("simpleObject.qml"));
     VERIFY_ERRORS(0);
@@ -333,7 +333,7 @@ void tst_qmllanguage::simpleObject()
     QVERIFY(object != 0);
 }
 
-void tst_qmllanguage::simpleContainer()
+void tst_qdeclarativelanguage::simpleContainer()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("simpleContainer.qml"));
     VERIFY_ERRORS(0);
@@ -342,7 +342,7 @@ void tst_qmllanguage::simpleContainer()
     QCOMPARE(container->getChildren()->count(),2);
 }
 
-void tst_qmllanguage::interfaceProperty()
+void tst_qdeclarativelanguage::interfaceProperty()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("interfaceProperty.qml"));
     VERIFY_ERRORS(0);
@@ -352,7 +352,7 @@ void tst_qmllanguage::interfaceProperty()
     QVERIFY(object->interface()->id == 913);
 }
 
-void tst_qmllanguage::interfaceQList()
+void tst_qdeclarativelanguage::interfaceQList()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("interfaceQList.qml"));
     VERIFY_ERRORS(0);
@@ -363,7 +363,7 @@ void tst_qmllanguage::interfaceQList()
         QVERIFY(container->getQListInterfaces()->at(ii)->id == 913);
 }
 
-void tst_qmllanguage::assignObjectToSignal()
+void tst_qdeclarativelanguage::assignObjectToSignal()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("assignObjectToSignal.qml"));
     VERIFY_ERRORS(0);
@@ -373,7 +373,7 @@ void tst_qmllanguage::assignObjectToSignal()
     emit object->basicSignal();
 }
 
-void tst_qmllanguage::assignObjectToVariant()
+void tst_qdeclarativelanguage::assignObjectToVariant()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("assignObjectToVariant.qml"));
     VERIFY_ERRORS(0);
@@ -383,7 +383,7 @@ void tst_qmllanguage::assignObjectToVariant()
     QVERIFY(v.userType() == qMetaTypeId<QObject *>());
 }
 
-void tst_qmllanguage::assignLiteralSignalProperty()
+void tst_qdeclarativelanguage::assignLiteralSignalProperty()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("assignLiteralSignalProperty.qml"));
     VERIFY_ERRORS(0);
@@ -393,7 +393,7 @@ void tst_qmllanguage::assignLiteralSignalProperty()
 }
 
 // Test is an external component can be loaded and assigned (to a qlist)
-void tst_qmllanguage::assignQmlComponent()
+void tst_qdeclarativelanguage::assignQmlComponent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("assignQmlComponent.qml"));
     VERIFY_ERRORS(0);
@@ -406,7 +406,7 @@ void tst_qmllanguage::assignQmlComponent()
 }
 
 // Test literal assignment to all the basic types 
-void tst_qmllanguage::assignBasicTypes()
+void tst_qdeclarativelanguage::assignBasicTypes()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
     VERIFY_ERRORS(0);
@@ -441,7 +441,7 @@ void tst_qmllanguage::assignBasicTypes()
 }
 
 // Test edge case type assignments
-void tst_qmllanguage::assignTypeExtremes()
+void tst_qdeclarativelanguage::assignTypeExtremes()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("assignTypeExtremes.qml"));
     VERIFY_ERRORS(0);
@@ -452,7 +452,7 @@ void tst_qmllanguage::assignTypeExtremes()
 }
 
 // Test that a composite type can assign to a property of its base type
-void tst_qmllanguage::assignCompositeToType()
+void tst_qdeclarativelanguage::assignCompositeToType()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("assignCompositeToType.qml"));
     VERIFY_ERRORS(0);
@@ -461,7 +461,7 @@ void tst_qmllanguage::assignCompositeToType()
 }
 
 // Tests that custom parser types can be instantiated
-void tst_qmllanguage::customParserTypes()
+void tst_qdeclarativelanguage::customParserTypes()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("customParserTypes.qml"));
     VERIFY_ERRORS(0);
@@ -471,7 +471,7 @@ void tst_qmllanguage::customParserTypes()
 }
 
 // Tests that the root item can be a custom component
-void tst_qmllanguage::rootAsQmlComponent()
+void tst_qdeclarativelanguage::rootAsQmlComponent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("rootAsQmlComponent.qml"));
     VERIFY_ERRORS(0);
@@ -482,7 +482,7 @@ void tst_qmllanguage::rootAsQmlComponent()
 }
 
 // Tests that components can be specified inline
-void tst_qmllanguage::inlineQmlComponents()
+void tst_qdeclarativelanguage::inlineQmlComponents()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("inlineQmlComponents.qml"));
     VERIFY_ERRORS(0);
@@ -497,7 +497,7 @@ void tst_qmllanguage::inlineQmlComponents()
 }
 
 // Tests that types that have an id property have it set
-void tst_qmllanguage::idProperty()
+void tst_qdeclarativelanguage::idProperty()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("idProperty.qml"));
     VERIFY_ERRORS(0);
@@ -512,7 +512,7 @@ void tst_qmllanguage::idProperty()
 }
 
 // Tests that signals can be assigned to
-void tst_qmllanguage::assignSignal()
+void tst_qdeclarativelanguage::assignSignal()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("assignSignal.qml"));
     VERIFY_ERRORS(0);
@@ -525,7 +525,7 @@ void tst_qmllanguage::assignSignal()
 }
 
 // Tests the creation and assignment of dynamic properties
-void tst_qmllanguage::dynamicProperties()
+void tst_qdeclarativelanguage::dynamicProperties()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("dynamicProperties.qml"));
     VERIFY_ERRORS(0);
@@ -544,7 +544,7 @@ void tst_qmllanguage::dynamicProperties()
 }
 
 // Test that nested types can use dynamic properties
-void tst_qmllanguage::dynamicPropertiesNested()
+void tst_qdeclarativelanguage::dynamicPropertiesNested()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("dynamicPropertiesNested.qml"));
     VERIFY_ERRORS(0);
@@ -560,7 +560,7 @@ void tst_qmllanguage::dynamicPropertiesNested()
 }
 
 // Tests the creation and assignment to dynamic list properties
-void tst_qmllanguage::listProperties()
+void tst_qdeclarativelanguage::listProperties()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("listProperties.qml"));
     VERIFY_ERRORS(0);
@@ -572,7 +572,7 @@ void tst_qmllanguage::listProperties()
 
 // Tests the creation and assignment of dynamic object properties
 // ### Not complete
-void tst_qmllanguage::dynamicObjectProperties()
+void tst_qdeclarativelanguage::dynamicObjectProperties()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("dynamicObjectProperties.qml"));
     VERIFY_ERRORS(0);
@@ -584,7 +584,7 @@ void tst_qmllanguage::dynamicObjectProperties()
 }
 
 // Tests the declaration of dynamic signals and slots
-void tst_qmllanguage::dynamicSignalsAndSlots()
+void tst_qdeclarativelanguage::dynamicSignalsAndSlots()
 {
     QTest::ignoreMessage(QtDebugMsg, "1921");
 
@@ -602,7 +602,7 @@ void tst_qmllanguage::dynamicSignalsAndSlots()
     QCOMPARE(object->property("test").toInt(), 10);
 }
 
-void tst_qmllanguage::simpleBindings()
+void tst_qdeclarativelanguage::simpleBindings()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("simpleBindings.qml"));
     VERIFY_ERRORS(0);
@@ -615,7 +615,7 @@ void tst_qmllanguage::simpleBindings()
     QCOMPARE(object->property("objectProperty"), QVariant::fromValue(object));
 }
 
-void tst_qmllanguage::autoComponentCreation()
+void tst_qdeclarativelanguage::autoComponentCreation()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("autoComponentCreation.qml"));
     VERIFY_ERRORS(0);
@@ -627,7 +627,7 @@ void tst_qmllanguage::autoComponentCreation()
     QCOMPARE(child->realProperty(), qreal(9));
 }
 
-void tst_qmllanguage::propertyValueSource()
+void tst_qdeclarativelanguage::propertyValueSource()
 {
     {
     QDeclarativeComponent component(&engine, TEST_FILE("propertyValueSource.qml"));
@@ -672,7 +672,7 @@ void tst_qmllanguage::propertyValueSource()
     }
 }
 
-void tst_qmllanguage::attachedProperties()
+void tst_qdeclarativelanguage::attachedProperties()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("attachedProperties.qml"));
     VERIFY_ERRORS(0);
@@ -685,7 +685,7 @@ void tst_qmllanguage::attachedProperties()
 }
 
 // Tests non-static object properties
-void tst_qmllanguage::dynamicObjects()
+void tst_qdeclarativelanguage::dynamicObjects()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("dynamicObject.1.qml"));
     VERIFY_ERRORS(0);
@@ -694,7 +694,7 @@ void tst_qmllanguage::dynamicObjects()
 }
 
 // Tests the registration of custom variant string converters
-void tst_qmllanguage::customVariantTypes()
+void tst_qdeclarativelanguage::customVariantTypes()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("customVariantTypes.qml"));
     VERIFY_ERRORS(0);
@@ -703,7 +703,7 @@ void tst_qmllanguage::customVariantTypes()
     QCOMPARE(object->customType().a, 10);
 }
 
-void tst_qmllanguage::valueTypes()
+void tst_qdeclarativelanguage::valueTypes()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("valueTypes.qml"));
     VERIFY_ERRORS(0);
@@ -739,7 +739,7 @@ void tst_qmllanguage::valueTypes()
 #endif
 }
 
-void tst_qmllanguage::cppnamespace()
+void tst_qdeclarativelanguage::cppnamespace()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("cppnamespace.qml"));
@@ -758,7 +758,7 @@ void tst_qmllanguage::cppnamespace()
     }
 }
 
-void tst_qmllanguage::aliasProperties()
+void tst_qdeclarativelanguage::aliasProperties()
 {
     // Simple "int" alias
     {
@@ -923,7 +923,7 @@ void tst_qmllanguage::aliasProperties()
 }
 
 // Test that the root element in a composite type can be a Component
-void tst_qmllanguage::componentCompositeType()
+void tst_qdeclarativelanguage::componentCompositeType()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("componentCompositeType.qml"));
     VERIFY_ERRORS(0);
@@ -943,7 +943,7 @@ public:
     TestType2(QObject *p=0) : QObject(p) {}
 };
 
-void tst_qmllanguage::i18n_data()
+void tst_qdeclarativelanguage::i18n_data()
 {
     QTest::addColumn<QString>("file");
     QTest::addColumn<QString>("stringProperty");
@@ -955,7 +955,7 @@ void tst_qmllanguage::i18n_data()
     QTest::newRow("i18nNameSpace") << "i18nNameSpace.qml" << QString::fromUtf8("Test \303\241\303\242\303\243\303\244\303\245: 40");
 }
 
-void tst_qmllanguage::i18n()
+void tst_qdeclarativelanguage::i18n()
 {
     QFETCH(QString, file);
     QFETCH(QString, stringProperty);
@@ -969,7 +969,7 @@ void tst_qmllanguage::i18n()
 }
 
 // Check that the Component::onCompleted attached property works
-void tst_qmllanguage::onCompleted()
+void tst_qdeclarativelanguage::onCompleted()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("onCompleted.qml"));
     VERIFY_ERRORS(0);
@@ -981,7 +981,7 @@ void tst_qmllanguage::onCompleted()
 }
 
 // Check that assignments to QDeclarativeScriptString properties work
-void tst_qmllanguage::scriptString()
+void tst_qdeclarativelanguage::scriptString()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("scriptString.qml"));
     VERIFY_ERRORS(0);
@@ -1000,7 +1000,7 @@ void tst_qmllanguage::scriptString()
 
 // Check that default property assignments are correctly spliced into explicit 
 // property assignments
-void tst_qmllanguage::defaultPropertyListOrder()
+void tst_qdeclarativelanguage::defaultPropertyListOrder()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("defaultPropertyListOrder.qml"));
     VERIFY_ERRORS(0);
@@ -1017,7 +1017,7 @@ void tst_qmllanguage::defaultPropertyListOrder()
     QCOMPARE(container->getChildren()->at(5)->property("index"), QVariant(5));
 }
 
-void tst_qmllanguage::declaredPropertyValues()
+void tst_qdeclarativelanguage::declaredPropertyValues()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("declaredPropertyValues.qml"));
     QEXPECT_FAIL("", "QTBUG-7860", Abort);
@@ -1025,7 +1025,7 @@ void tst_qmllanguage::declaredPropertyValues()
 }
 
 // Check that first child of qml is of given type. Empty type insists on error.
-void tst_qmllanguage::testType(const QString& qml, const QString& type)
+void tst_qdeclarativelanguage::testType(const QString& qml, const QString& type)
 {
     QDeclarativeComponent component(&engine);
     component.setData(qml.toUtf8(), TEST_FILE("empty.qml")); // just a file for relative local imports
@@ -1047,7 +1047,7 @@ QML_DECLARE_TYPE(TestType2)
 
 // Import tests (QT-558)
 
-void tst_qmllanguage::importsBuiltin_data()
+void tst_qdeclarativelanguage::importsBuiltin_data()
 {
     // QT-610
 
@@ -1136,14 +1136,14 @@ void tst_qmllanguage::importsBuiltin_data()
         << "TestType2";
 }
 
-void tst_qmllanguage::importsBuiltin()
+void tst_qdeclarativelanguage::importsBuiltin()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
     testType(qml,type);
 }
 
-void tst_qmllanguage::importsLocal_data()
+void tst_qdeclarativelanguage::importsLocal_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("type");
@@ -1183,14 +1183,14 @@ void tst_qmllanguage::importsLocal_data()
         << "TestType";
 }
 
-void tst_qmllanguage::importsLocal()
+void tst_qdeclarativelanguage::importsLocal()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
     testType(qml,type);
 }
 
-void tst_qmllanguage::importsRemote_data()
+void tst_qdeclarativelanguage::importsRemote_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("type");
@@ -1204,7 +1204,7 @@ void tst_qmllanguage::importsRemote_data()
 
 #include "testhttpserver.h"
 
-void tst_qmllanguage::importsRemote()
+void tst_qdeclarativelanguage::importsRemote()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
@@ -1215,7 +1215,7 @@ void tst_qmllanguage::importsRemote()
     testType(qml,type);
 }
 
-void tst_qmllanguage::importsInstalled_data()
+void tst_qdeclarativelanguage::importsInstalled_data()
 {
     // QT-610
 
@@ -1253,7 +1253,7 @@ void tst_qmllanguage::importsInstalled_data()
         << "";
 }
 
-void tst_qmllanguage::importsInstalled()
+void tst_qdeclarativelanguage::importsInstalled()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
@@ -1261,7 +1261,7 @@ void tst_qmllanguage::importsInstalled()
 }
 
 
-void tst_qmllanguage::importsOrder_data()
+void tst_qdeclarativelanguage::importsOrder_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("type");
@@ -1312,14 +1312,14 @@ void tst_qmllanguage::importsOrder_data()
         << "QDeclarativeImage";
 }
 
-void tst_qmllanguage::importsOrder()
+void tst_qdeclarativelanguage::importsOrder()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
     testType(qml,type);
 }
 
-void tst_qmllanguage::qmlAttachedPropertiesObjectMethod()
+void tst_qdeclarativelanguage::qmlAttachedPropertiesObjectMethod()
 {
     QObject object;
 
@@ -1347,19 +1347,19 @@ void tst_qmllanguage::qmlAttachedPropertiesObjectMethod()
     }
 }
 
-void tst_qmllanguage::crash1()
+void tst_qdeclarativelanguage::crash1()
 {
     QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6\nComponent {}", QUrl());
 }
 
-void tst_qmllanguage::crash2()
+void tst_qdeclarativelanguage::crash2()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("crash2.qml"));
 }
 
 
-void tst_qmllanguage::initTestCase()
+void tst_qdeclarativelanguage::initTestCase()
 {
     registerTypes();
 
@@ -1381,6 +1381,6 @@ void tst_qmllanguage::initTestCase()
     out.write(in.readAll());
 }
 
-QTEST_MAIN(tst_qmllanguage)
+QTEST_MAIN(tst_qdeclarativelanguage)
 
 #include "tst_qdeclarativelanguage.moc"
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 390ebe0..a1e6d6b 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -44,11 +44,11 @@
 #include <QDeclarativeComponent>
 #include <QDebug>
 
-class tst_QmlListModel : public QObject
+class tst_QDeclarativeListModel : public QObject
 {
     Q_OBJECT
 public:
-    tst_QmlListModel() {}
+    tst_QDeclarativeListModel() {}
 
 private slots:
     void static_types();
@@ -62,7 +62,7 @@ private slots:
     void error();
 };
 
-void tst_QmlListModel::static_i18n()
+void tst_QDeclarativeListModel::static_i18n()
 {
     QString expect = QString::fromUtf8("na\303\257ve");
     QString componentStr = "import Qt 4.6\nListModel { ListElement { prop1: \""+expect+"\" } }";
@@ -76,7 +76,7 @@ void tst_QmlListModel::static_i18n()
     delete obj;
 }
 
-void tst_QmlListModel::static_nestedElements()
+void tst_QDeclarativeListModel::static_nestedElements()
 {
     QFETCH(int, elementCount);
 
@@ -110,7 +110,7 @@ void tst_QmlListModel::static_nestedElements()
     delete obj;
 }
 
-void tst_QmlListModel::static_nestedElements_data()
+void tst_QDeclarativeListModel::static_nestedElements_data()
 {
     QTest::addColumn<int>("elementCount");
 
@@ -120,7 +120,7 @@ void tst_QmlListModel::static_nestedElements_data()
     QTest::newRow("many items") << 5;
 }
 
-void tst_QmlListModel::dynamic_data()
+void tst_QDeclarativeListModel::dynamic_data()
 {
     QTest::addColumn<QString>("script");
     QTest::addColumn<int>("result");
@@ -205,7 +205,7 @@ void tst_QmlListModel::dynamic_data()
     QTest::newRow("listprop2a") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.append({'a':4});get(0).bars.get(3).a}" << 4 << "";
 }
 
-void tst_QmlListModel::dynamic()
+void tst_QDeclarativeListModel::dynamic()
 {
     QFETCH(QString, script);
     QFETCH(int, result);
@@ -225,7 +225,7 @@ void tst_QmlListModel::dynamic()
     QCOMPARE(actual,result);
 }
 
-void tst_QmlListModel::static_types_data()
+void tst_QDeclarativeListModel::static_types_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QVariant>("value");
@@ -255,7 +255,7 @@ void tst_QmlListModel::static_types_data()
         << QVariant("QTBUG-5974:ListElement: constant script support for property value");
 }
 
-void tst_QmlListModel::static_types()
+void tst_QDeclarativeListModel::static_types()
 {
     QFETCH(QString, qml);
     QFETCH(QVariant, value);
@@ -286,7 +286,7 @@ void tst_QmlListModel::static_types()
     delete obj;
 }
 
-void tst_QmlListModel::error_data()
+void tst_QDeclarativeListModel::error_data()
 {
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("error");
@@ -320,7 +320,7 @@ void tst_QmlListModel::error_data()
         << "QTBUG-6082 ListElement should not allow child objects";
 }
 
-void tst_QmlListModel::error()
+void tst_QDeclarativeListModel::error()
 {
     QFETCH(QString, qml);
     QFETCH(QString, error);
@@ -341,6 +341,6 @@ void tst_QmlListModel::error()
     }
 }
 
-QTEST_MAIN(tst_QmlListModel)
+QTEST_MAIN(tst_QDeclarativeListModel)
 
 #include "tst_qdeclarativelistmodel.moc"
diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
index 9eafc7c..03d641d 100644
--- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
+++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
@@ -60,11 +60,11 @@ inline QUrl TEST_FILE(const char *filename)
     return TEST_FILE(QLatin1String(filename));
 }
 
-class tst_qmllistreference : public QObject
+class tst_qdeclarativelistreference : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmllistreference() {}
+    tst_qdeclarativelistreference() {}
 
 private slots:
     void initTestCase();
@@ -103,12 +103,12 @@ public:
 };
 QML_DECLARE_TYPE(TestType);
 
-void tst_qmllistreference::initTestCase()
+void tst_qdeclarativelistreference::initTestCase()
 {
     QML_REGISTER_NOCREATE_TYPE(TestType);
 }
 
-void tst_qmllistreference::qmllistreference()
+void tst_qdeclarativelistreference::qmllistreference()
 {
     TestType tt;
 
@@ -120,7 +120,7 @@ void tst_qmllistreference::qmllistreference()
     QCOMPARE(r.count(), 1);
 }
 
-void tst_qmllistreference::qmllistreference_invalid()
+void tst_qdeclarativelistreference::qmllistreference_invalid()
 {
     TestType tt;
 
@@ -170,7 +170,7 @@ void tst_qmllistreference::qmllistreference_invalid()
     }
 }
 
-void tst_qmllistreference::isValid()
+void tst_qdeclarativelistreference::isValid()
 {
     TestType *tt = new TestType;
 
@@ -192,7 +192,7 @@ void tst_qmllistreference::isValid()
     }
 }
 
-void tst_qmllistreference::object()
+void tst_qdeclarativelistreference::object()
 {
     TestType *tt = new TestType;
 
@@ -214,7 +214,7 @@ void tst_qmllistreference::object()
     }
 }
 
-void tst_qmllistreference::listElementType()
+void tst_qdeclarativelistreference::listElementType()
 {
     TestType *tt = new TestType;
 
@@ -236,7 +236,7 @@ void tst_qmllistreference::listElementType()
     }
 }
 
-void tst_qmllistreference::canAppend()
+void tst_qdeclarativelistreference::canAppend()
 {
     TestType *tt = new TestType;
 
@@ -265,7 +265,7 @@ void tst_qmllistreference::canAppend()
     }
 }
 
-void tst_qmllistreference::canAt()
+void tst_qdeclarativelistreference::canAt()
 {
     TestType *tt = new TestType;
 
@@ -294,7 +294,7 @@ void tst_qmllistreference::canAt()
     }
 }
 
-void tst_qmllistreference::canClear()
+void tst_qdeclarativelistreference::canClear()
 {
     TestType *tt = new TestType;
 
@@ -323,7 +323,7 @@ void tst_qmllistreference::canClear()
     }
 }
 
-void tst_qmllistreference::canCount()
+void tst_qdeclarativelistreference::canCount()
 {
     TestType *tt = new TestType;
 
@@ -352,7 +352,7 @@ void tst_qmllistreference::canCount()
     }
 }
 
-void tst_qmllistreference::append()
+void tst_qdeclarativelistreference::append()
 {
     TestType *tt = new TestType;
     QObject object;
@@ -391,7 +391,7 @@ void tst_qmllistreference::append()
     }
 }
 
-void tst_qmllistreference::at()
+void tst_qdeclarativelistreference::at()
 {
     TestType *tt = new TestType;
     tt->data.append(tt);
@@ -426,7 +426,7 @@ void tst_qmllistreference::at()
     }
 }
 
-void tst_qmllistreference::clear()
+void tst_qdeclarativelistreference::clear()
 {
     TestType *tt = new TestType;
     tt->data.append(tt);
@@ -459,7 +459,7 @@ void tst_qmllistreference::clear()
     }
 }
 
-void tst_qmllistreference::count()
+void tst_qdeclarativelistreference::count()
 {
     TestType *tt = new TestType;
     tt->data.append(tt);
@@ -494,7 +494,7 @@ void tst_qmllistreference::count()
     }
 }
 
-void tst_qmllistreference::copy()
+void tst_qdeclarativelistreference::copy()
 {
     TestType tt;
     tt.data.append(&tt);
@@ -522,7 +522,7 @@ void tst_qmllistreference::copy()
     QVERIFY(r3.count() == 2);
 }
 
-void tst_qmllistreference::qmlmetaproperty()
+void tst_qdeclarativelistreference::qmlmetaproperty()
 {
     TestType tt;
     tt.data.append(&tt);
@@ -537,7 +537,7 @@ void tst_qmllistreference::qmlmetaproperty()
     QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
 }
 
-void tst_qmllistreference::engineTypes()
+void tst_qdeclarativelistreference::engineTypes()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine, TEST_FILE("engineTypes.qml"));
@@ -560,7 +560,7 @@ void tst_qmllistreference::engineTypes()
     delete o;
 }
 
-void tst_qmllistreference::variantToList()
+void tst_qdeclarativelistreference::variantToList()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine, TEST_FILE("variantToList.qml"));
@@ -574,6 +574,6 @@ void tst_qmllistreference::variantToList()
     delete o;
 }
 
-QTEST_MAIN(tst_qmllistreference)
+QTEST_MAIN(tst_qdeclarativelistreference)
 
 #include "tst_qdeclarativelistreference.moc"
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index 2b6e7f0..daa40d1 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -47,11 +47,11 @@
 #include <qdeclarativecontext.h>
 #include <qdeclarativeexpression.h>
 
-class tst_QmlGraphicsListView : public QObject
+class tst_QDeclarativeListView : public QObject
 {
     Q_OBJECT
 public:
-    tst_QmlGraphicsListView();
+    tst_QDeclarativeListView();
 
 private slots:
     // Test both QListModelInterface and QAbstractItemModel model types
@@ -293,12 +293,12 @@ private:
     QList<QPair<QString,QString> > list;
 };
 
-tst_QmlGraphicsListView::tst_QmlGraphicsListView()
+tst_QDeclarativeListView::tst_QDeclarativeListView()
 {
 }
 
 template <class T>
-void tst_QmlGraphicsListView::items()
+void tst_QDeclarativeListView::items()
 {
     QDeclarativeView *canvas = createView();
 
@@ -378,7 +378,7 @@ void tst_QmlGraphicsListView::items()
 }
 
 template <class T>
-void tst_QmlGraphicsListView::changed()
+void tst_QDeclarativeListView::changed()
 {
     QDeclarativeView *canvas = createView();
 
@@ -414,7 +414,7 @@ void tst_QmlGraphicsListView::changed()
 }
 
 template <class T>
-void tst_QmlGraphicsListView::inserted()
+void tst_QDeclarativeListView::inserted()
 {
     QDeclarativeView *canvas = createView();
 
@@ -507,7 +507,7 @@ void tst_QmlGraphicsListView::inserted()
 }
 
 template <class T>
-void tst_QmlGraphicsListView::removed(bool animated)
+void tst_QDeclarativeListView::removed(bool animated)
 {
     QDeclarativeView *canvas = createView();
 
@@ -650,7 +650,7 @@ void tst_QmlGraphicsListView::removed(bool animated)
 }
 
 template <class T>
-void tst_QmlGraphicsListView::clear()
+void tst_QDeclarativeListView::clear()
 {
     QDeclarativeView *canvas = createView();
 
@@ -687,7 +687,7 @@ void tst_QmlGraphicsListView::clear()
 
 
 template <class T>
-void tst_QmlGraphicsListView::moved()
+void tst_QDeclarativeListView::moved()
 {
     QDeclarativeView *canvas = createView();
 
@@ -783,7 +783,7 @@ void tst_QmlGraphicsListView::moved()
     delete canvas;
 }
 
-void tst_QmlGraphicsListView::enforceRange()
+void tst_QDeclarativeListView::enforceRange()
 {
     QDeclarativeView *canvas = createView();
 
@@ -828,7 +828,7 @@ void tst_QmlGraphicsListView::enforceRange()
     delete canvas;
 }
 
-void tst_QmlGraphicsListView::spacing()
+void tst_QDeclarativeListView::spacing()
 {
     QDeclarativeView *canvas = createView();
 
@@ -886,7 +886,7 @@ void tst_QmlGraphicsListView::spacing()
     delete canvas;
 }
 
-void tst_QmlGraphicsListView::sections()
+void tst_QDeclarativeListView::sections()
 {
     QDeclarativeView *canvas = createView();
 
@@ -959,7 +959,7 @@ void tst_QmlGraphicsListView::sections()
     delete canvas;
 }
 
-void tst_QmlGraphicsListView::currentIndex()
+void tst_QDeclarativeListView::currentIndex()
 {
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -1052,7 +1052,7 @@ void tst_QmlGraphicsListView::currentIndex()
     delete canvas;
 }
 
-void tst_QmlGraphicsListView::itemList()
+void tst_QDeclarativeListView::itemList()
 {
     QDeclarativeView *canvas = createView();
 
@@ -1093,7 +1093,7 @@ void tst_QmlGraphicsListView::itemList()
     delete canvas;
 }
 
-void tst_QmlGraphicsListView::cacheBuffer()
+void tst_QDeclarativeListView::cacheBuffer()
 {
     QDeclarativeView *canvas = createView();
 
@@ -1145,7 +1145,7 @@ void tst_QmlGraphicsListView::cacheBuffer()
     delete canvas;
 }
 
-void tst_QmlGraphicsListView::positionViewAtIndex()
+void tst_QDeclarativeListView::positionViewAtIndex()
 {
     QDeclarativeView *canvas = createView();
 
@@ -1232,69 +1232,69 @@ void tst_QmlGraphicsListView::positionViewAtIndex()
     delete canvas;
 }
 
-void tst_QmlGraphicsListView::qListModelInterface_items()
+void tst_QDeclarativeListView::qListModelInterface_items()
 {
     items<TestModel>();
 }
 
-void tst_QmlGraphicsListView::qAbstractItemModel_items()
+void tst_QDeclarativeListView::qAbstractItemModel_items()
 {
     items<TestModel2>();
 }
 
-void tst_QmlGraphicsListView::qListModelInterface_changed()
+void tst_QDeclarativeListView::qListModelInterface_changed()
 {
     changed<TestModel>();
 }
 
-void tst_QmlGraphicsListView::qAbstractItemModel_changed()
+void tst_QDeclarativeListView::qAbstractItemModel_changed()
 {
     changed<TestModel2>();
 }
 
-void tst_QmlGraphicsListView::qListModelInterface_inserted()
+void tst_QDeclarativeListView::qListModelInterface_inserted()
 {
     inserted<TestModel>();
 }
 
-void tst_QmlGraphicsListView::qAbstractItemModel_inserted()
+void tst_QDeclarativeListView::qAbstractItemModel_inserted()
 {
     inserted<TestModel2>();
 }
 
-void tst_QmlGraphicsListView::qListModelInterface_removed()
+void tst_QDeclarativeListView::qListModelInterface_removed()
 {
     removed<TestModel>(false);
     removed<TestModel>(true);
 }
 
-void tst_QmlGraphicsListView::qAbstractItemModel_removed()
+void tst_QDeclarativeListView::qAbstractItemModel_removed()
 {
     removed<TestModel2>(false);
     removed<TestModel2>(true);
 }
 
-void tst_QmlGraphicsListView::qListModelInterface_moved()
+void tst_QDeclarativeListView::qListModelInterface_moved()
 {
     moved<TestModel>();
 }
 
-void tst_QmlGraphicsListView::qAbstractItemModel_moved()
+void tst_QDeclarativeListView::qAbstractItemModel_moved()
 {
     moved<TestModel2>();
 }
 
-void tst_QmlGraphicsListView::qListModelInterface_clear()
+void tst_QDeclarativeListView::qListModelInterface_clear()
 {
     clear<TestModel>();
 }
 
-void tst_QmlGraphicsListView::qAbstractItemModel_clear()
+void tst_QDeclarativeListView::qAbstractItemModel_clear()
 {
     clear<TestModel2>();
 }
 
-QDeclarativeView *tst_QmlGraphicsListView::createView()
+QDeclarativeView *tst_QDeclarativeListView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
@@ -1307,7 +1307,7 @@ QDeclarativeView *tst_QmlGraphicsListView::createView()
    item must also evaluate the {index} expression equal to index
 */
 template<typename T>
-T *tst_QmlGraphicsListView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
+T *tst_QDeclarativeListView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
 {
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
@@ -1334,7 +1334,7 @@ T *tst_QmlGraphicsListView::findItem(QGraphicsObject *parent, const QString &obj
 }
 
 template<typename T>
-QList<T*> tst_QmlGraphicsListView::findItems(QGraphicsObject *parent, const QString &objectName)
+QList<T*> tst_QDeclarativeListView::findItems(QGraphicsObject *parent, const QString &objectName)
 {
     QList<T*> items;
     const QMetaObject &mo = T::staticMetaObject;
@@ -1352,7 +1352,7 @@ QList<T*> tst_QmlGraphicsListView::findItems(QGraphicsObject *parent, const QStr
     return items;
 }
 
-void tst_QmlGraphicsListView::dumpTree(QDeclarativeItem *parent, int depth)
+void tst_QDeclarativeListView::dumpTree(QDeclarativeItem *parent, int depth)
 {
     static QString padding("                       ");
     for (int i = 0; i < parent->childItems().count(); ++i) {
@@ -1365,6 +1365,6 @@ void tst_QmlGraphicsListView::dumpTree(QDeclarativeItem *parent, int depth)
 }
 
 
-QTEST_MAIN(tst_QmlGraphicsListView)
+QTEST_MAIN(tst_QDeclarativeListView)
 
 #include "tst_qdeclarativelistview.moc"
diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
index 235487c..61b2800 100644
--- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -64,12 +64,12 @@ inline QUrl TEST_FILE(const QString &filename)
         QVERIFY((expr)); \
     } while (false)
 
-class tst_QmlGraphicsLoader : public QObject
+class tst_QDeclarativeLoader : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_QmlGraphicsLoader();
+    tst_QDeclarativeLoader();
 
 private slots:
     void url();
@@ -93,11 +93,11 @@ private:
 };
 
 
-tst_QmlGraphicsLoader::tst_QmlGraphicsLoader()
+tst_QDeclarativeLoader::tst_QDeclarativeLoader()
 {
 }
 
-void tst_QmlGraphicsLoader::url()
+void tst_QDeclarativeLoader::url()
 {
     QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), TEST_FILE(""));
@@ -112,7 +112,7 @@ void tst_QmlGraphicsLoader::url()
     delete loader;
 }
 
-void tst_QmlGraphicsLoader::component()
+void tst_QDeclarativeLoader::component()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
     QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
@@ -128,7 +128,7 @@ void tst_QmlGraphicsLoader::component()
     delete loader;
 }
 
-void tst_QmlGraphicsLoader::invalidUrl()
+void tst_QDeclarativeLoader::invalidUrl()
 {
     QTest::ignoreMessage(QtWarningMsg, QString("(:-1: File error for URL " + QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString() + ") ").toUtf8().constData());
 
@@ -144,7 +144,7 @@ void tst_QmlGraphicsLoader::invalidUrl()
     delete loader;
 }
 
-void tst_QmlGraphicsLoader::clear()
+void tst_QDeclarativeLoader::clear()
 {
     {
         QDeclarativeComponent component(&engine);
@@ -192,7 +192,7 @@ void tst_QmlGraphicsLoader::clear()
     }
 }
 
-void tst_QmlGraphicsLoader::urlToComponent()
+void tst_QDeclarativeLoader::urlToComponent()
 {
     QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\n"
@@ -215,7 +215,7 @@ void tst_QmlGraphicsLoader::urlToComponent()
     delete loader;
 }
 
-void tst_QmlGraphicsLoader::componentToUrl()
+void tst_QDeclarativeLoader::componentToUrl()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
     QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
@@ -237,7 +237,7 @@ void tst_QmlGraphicsLoader::componentToUrl()
     delete loader;
 }
 
-void tst_QmlGraphicsLoader::sizeLoaderToItem()
+void tst_QDeclarativeLoader::sizeLoaderToItem()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("/SizeToItem.qml"));
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
@@ -269,7 +269,7 @@ void tst_QmlGraphicsLoader::sizeLoaderToItem()
     QCOMPARE(spy.count(),1);
 }
 
-void tst_QmlGraphicsLoader::sizeItemToLoader()
+void tst_QDeclarativeLoader::sizeItemToLoader()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("/SizeToLoader.qml"));
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
@@ -297,7 +297,7 @@ void tst_QmlGraphicsLoader::sizeItemToLoader()
     QCOMPARE(loader->height(), 45.0);
 }
 
-void tst_QmlGraphicsLoader::noResize()
+void tst_QDeclarativeLoader::noResize()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("/NoResize.qml"));
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
@@ -311,7 +311,7 @@ void tst_QmlGraphicsLoader::noResize()
     QCOMPARE(rect->height(), 60.0);
 }
 
-void tst_QmlGraphicsLoader::sizeLoaderToGraphicsWidget()
+void tst_QDeclarativeLoader::sizeLoaderToGraphicsWidget()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("/SizeLoaderToGraphicsWidget.qml"));
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
@@ -338,7 +338,7 @@ void tst_QmlGraphicsLoader::sizeLoaderToGraphicsWidget()
     QCOMPARE(widget->size().height(), 30.0);
 }
 
-void tst_QmlGraphicsLoader::sizeGraphicsWidgetToLoader()
+void tst_QDeclarativeLoader::sizeGraphicsWidgetToLoader()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("/SizeGraphicsWidgetToLoader.qml"));
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
@@ -368,7 +368,7 @@ void tst_QmlGraphicsLoader::sizeGraphicsWidgetToLoader()
     QCOMPARE(loader->height(), 45.0);
 }
 
-void tst_QmlGraphicsLoader::noResizeGraphicsWidget()
+void tst_QDeclarativeLoader::noResizeGraphicsWidget()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("/NoResizeGraphicsWidget.qml"));
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
@@ -385,7 +385,7 @@ void tst_QmlGraphicsLoader::noResizeGraphicsWidget()
     QCOMPARE(widget->size().height(), 250.0);
 }
 
-void tst_QmlGraphicsLoader::networkRequestUrl()
+void tst_QDeclarativeLoader::networkRequestUrl()
 {
     TestHTTPServer server(SERVER_PORT);
     QVERIFY(server.isValid());
@@ -406,7 +406,7 @@ void tst_QmlGraphicsLoader::networkRequestUrl()
 }
 
 /* XXX Component waits until all dependencies are loaded.  Is this actually possible?
-void tst_QmlGraphicsLoader::networkComponent()
+void tst_QDeclarativeLoader::networkComponent()
 {
     TestHTTPServer server(SERVER_PORT);
     QVERIFY(server.isValid());
@@ -437,7 +437,7 @@ void tst_QmlGraphicsLoader::networkComponent()
 }
 */
 
-void tst_QmlGraphicsLoader::failNetworkRequest()
+void tst_QDeclarativeLoader::failNetworkRequest()
 {
     TestHTTPServer server(SERVER_PORT);
     QVERIFY(server.isValid());
@@ -459,6 +459,6 @@ void tst_QmlGraphicsLoader::failNetworkRequest()
     delete loader;
 }
 
-QTEST_MAIN(tst_QmlGraphicsLoader)
+QTEST_MAIN(tst_QDeclarativeLoader)
 
 #include "tst_qdeclarativeloader.moc"
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
index 0271c64..e19bea0 100644
--- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -89,11 +89,11 @@ private:
 QML_DECLARE_TYPE(MyContainer);
 QML_DECLARE_TYPEINFO(MyContainer, QML_HAS_ATTACHED_PROPERTIES)
 
-class tst_qmlmetaproperty : public QObject
+class tst_qdeclarativemetaproperty : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlmetaproperty() {}
+    tst_qdeclarativemetaproperty() {}
 
 private slots:
     void initTestCase();
@@ -125,7 +125,7 @@ private:
     QDeclarativeEngine engine;
 };
 
-void tst_qmlmetaproperty::qmlmetaproperty()
+void tst_qdeclarativemetaproperty::qmlmetaproperty()
 {
     QDeclarativeMetaProperty prop;
 
@@ -209,7 +209,7 @@ private:
 
 QML_DECLARE_TYPE(PropertyObject);
 
-void tst_qmlmetaproperty::qmlmetaproperty_object()
+void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
 {
     QObject object; // Has no default property
     PropertyObject dobject; // Has default property
@@ -310,7 +310,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object()
     }
 }
 
-void tst_qmlmetaproperty::qmlmetaproperty_object_string()
+void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
 {
     QObject object; 
     PropertyObject dobject; 
@@ -459,7 +459,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
     }
 }
 
-void tst_qmlmetaproperty::qmlmetaproperty_object_context()
+void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
 {
     QObject object; // Has no default property
     PropertyObject dobject; // Has default property
@@ -560,7 +560,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context()
     }
 }
 
-void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
+void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
 {
     QObject object; 
     PropertyObject dobject; 
@@ -709,7 +709,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
     }
 }
 
-void tst_qmlmetaproperty::name()
+void tst_qdeclarativemetaproperty::name()
 {
     { 
         QDeclarativeMetaProperty p;
@@ -770,7 +770,7 @@ void tst_qmlmetaproperty::name()
     }
 }
 
-void tst_qmlmetaproperty::read()
+void tst_qdeclarativemetaproperty::read()
 {
     // Invalid 
     {
@@ -872,7 +872,7 @@ void tst_qmlmetaproperty::read()
     }
 }
 
-void tst_qmlmetaproperty::write()
+void tst_qdeclarativemetaproperty::write()
 {
     // Invalid
     {
@@ -994,7 +994,7 @@ void tst_qmlmetaproperty::write()
     }
 }
 
-void tst_qmlmetaproperty::reset()
+void tst_qdeclarativemetaproperty::reset()
 {
     // Invalid
     {
@@ -1067,7 +1067,7 @@ void tst_qmlmetaproperty::reset()
     }
 }
 
-void tst_qmlmetaproperty::writeObjectToList()
+void tst_qdeclarativemetaproperty::writeObjectToList()
 {
     QDeclarativeComponent containerComponent(&engine);
     containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
@@ -1084,7 +1084,7 @@ void tst_qmlmetaproperty::writeObjectToList()
 }
 
 Q_DECLARE_METATYPE(QList<QObject *>);
-void tst_qmlmetaproperty::writeListToList()
+void tst_qdeclarativemetaproperty::writeListToList()
 {
     QDeclarativeComponent containerComponent(&engine);
     containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
@@ -1106,7 +1106,7 @@ void tst_qmlmetaproperty::writeListToList()
     QCOMPARE(container->children()->size(), 1);*/
 }
 
-void tst_qmlmetaproperty::crashOnValueProperty()
+void tst_qdeclarativemetaproperty::crashOnValueProperty()
 {
     QDeclarativeEngine *engine = new QDeclarativeEngine;
     QDeclarativeComponent component(engine);
@@ -1130,7 +1130,7 @@ void tst_qmlmetaproperty::crashOnValueProperty()
     QCOMPARE(p.read(), QVariant(20));
 }
 
-void tst_qmlmetaproperty::copy()
+void tst_qdeclarativemetaproperty::copy()
 {
     PropertyObject object;
 
@@ -1172,7 +1172,7 @@ void tst_qmlmetaproperty::copy()
     QCOMPARE(p2.propertyType(), (int)QVariant::Int);
 }
 
-void tst_qmlmetaproperty::initTestCase()
+void tst_qdeclarativemetaproperty::initTestCase()
 {
     QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
     QML_REGISTER_TYPE(Test,1,0,PropertyObject,PropertyObject);
@@ -1180,6 +1180,6 @@ void tst_qmlmetaproperty::initTestCase()
 }
 
 
-QTEST_MAIN(tst_qmlmetaproperty)
+QTEST_MAIN(tst_qdeclarativemetaproperty)
 
 #include "tst_qdeclarativemetaproperty.moc"
diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
index e7372d3..ca16214 100644
--- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
+++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
@@ -53,11 +53,11 @@
 #include <QQuaternion>
 #include <qdeclarative.h>
 
-class tst_qmlmetatype : public QObject
+class tst_qdeclarativemetatype : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlmetatype() {}
+    tst_qdeclarativemetatype() {}
 
 private slots:
     void initTestCase();
@@ -129,7 +129,7 @@ QML_DECLARE_TYPE(ValueInterceptorTestType);
     QVERIFY(v == (value)); \
 }
 
-void tst_qmlmetatype::initTestCase()
+void tst_qdeclarativemetatype::initTestCase()
 {
     QML_REGISTER_TYPE(Test, 1, 0, TestType, TestType);
     QML_REGISTER_TYPE(Test, 1, 0, ParserStatusTestType, ParserStatusTestType);
@@ -137,7 +137,7 @@ void tst_qmlmetatype::initTestCase()
     QML_REGISTER_TYPE(Test, 1, 0, ValueInterceptorTestType, ValueInterceptorTestType);
 }
 
-void tst_qmlmetatype::copy()
+void tst_qdeclarativemetatype::copy()
 {
     QVERIFY(QDeclarativeMetaType::copy(QMetaType::Void, 0, 0));
 
@@ -286,7 +286,7 @@ void tst_qmlmetatype::copy()
     }
 }
 
-void tst_qmlmetatype::qmlParserStatusCast()
+void tst_qdeclarativemetatype::qmlParserStatusCast()
 {
     QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0);
     QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
@@ -306,7 +306,7 @@ void tst_qmlmetatype::qmlParserStatusCast()
     QCOMPARE(status, &t);
 }
 
-void tst_qmlmetatype::qmlPropertyValueSourceCast()
+void tst_qdeclarativemetatype::qmlPropertyValueSourceCast()
 {
     QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0);
     QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
@@ -326,7 +326,7 @@ void tst_qmlmetatype::qmlPropertyValueSourceCast()
     QCOMPARE(source, &t);
 }
 
-void tst_qmlmetatype::qmlPropertyValueInterceptorCast()
+void tst_qdeclarativemetatype::qmlPropertyValueInterceptorCast()
 {
     QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0);
     QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
@@ -346,7 +346,7 @@ void tst_qmlmetatype::qmlPropertyValueInterceptorCast()
     QCOMPARE(interceptor, &t);
 }
 
-void tst_qmlmetatype::isList()
+void tst_qdeclarativemetatype::isList()
 {
     QCOMPARE(QDeclarativeMetaType::isList(QVariant::Invalid), false);
     QCOMPARE(QDeclarativeMetaType::isList(QVariant::Int), false);
@@ -356,7 +356,7 @@ void tst_qmlmetatype::isList()
     QCOMPARE(QDeclarativeMetaType::isList(qMetaTypeId<QDeclarativeListProperty<TestType> >()), true);
 }
 
-void tst_qmlmetatype::defaultObject()
+void tst_qdeclarativemetatype::defaultObject()
 {
     QVERIFY(QDeclarativeMetaType::defaultProperty(&QObject::staticMetaObject).name() == 0);
     QVERIFY(QDeclarativeMetaType::defaultProperty(&ParserStatusTestType::staticMetaObject).name() == 0);
@@ -372,6 +372,6 @@ void tst_qmlmetatype::defaultObject()
     QCOMPARE(QString(QDeclarativeMetaType::defaultProperty(&t).name()), QString("foo"));
 }
 
-QTEST_MAIN(tst_qmlmetatype)
+QTEST_MAIN(tst_qdeclarativemetatype)
 
 #include "tst_qdeclarativemetatype.moc"
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index 64c7499..f3caa7f 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -44,11 +44,11 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QDebug>
 
-class tst_qmlmoduleplugin : public QObject
+class tst_qdeclarativemoduleplugin : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlmoduleplugin() {
+    tst_qdeclarativemoduleplugin() {
         QCoreApplication::addLibraryPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin"));
 qDebug() << QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("plugin");
     }
@@ -100,7 +100,7 @@ inline QUrl TEST_FILE(const QString &filename)
 }
 
 
-void tst_qmlmoduleplugin::importsPlugin()
+void tst_qdeclarativemoduleplugin::importsPlugin()
 {
     QDeclarativeEngine engine;
     QTest::ignoreMessage(QtWarningMsg, "plugin created");
@@ -112,6 +112,6 @@ void tst_qmlmoduleplugin::importsPlugin()
     QCOMPARE(object->property("value").toInt(),123);
 }
 
-QTEST_MAIN(tst_qmlmoduleplugin)
+QTEST_MAIN(tst_qdeclarativemoduleplugin)
 
 #include "tst_qdeclarativemoduleplugin.moc"
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index 42a1e69..769cf32 100644
--- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -44,7 +44,7 @@
 #include <private/qdeclarativemousearea_p.h>
 #include <QtDeclarative/qdeclarativeview.h>
 
-class tst_QmlGraphicsMouseArea: public QObject
+class tst_QDeclarativeMouseArea: public QObject
 {
     Q_OBJECT
 private slots:
@@ -53,7 +53,7 @@ private:
     QDeclarativeView *createView(const QString &filename);
 };
 
-void tst_QmlGraphicsMouseArea::dragProperties()
+void tst_QDeclarativeMouseArea::dragProperties()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/dragproperties.qml");
     canvas->show();
@@ -123,7 +123,7 @@ void tst_QmlGraphicsMouseArea::dragProperties()
     QCOMPARE(ymaxSpy.count(),1);
 }
 
-QDeclarativeView *tst_QmlGraphicsMouseArea::createView(const QString &filename)
+QDeclarativeView *tst_QDeclarativeMouseArea::createView(const QString &filename)
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
@@ -133,6 +133,6 @@ QDeclarativeView *tst_QmlGraphicsMouseArea::createView(const QString &filename)
     return canvas;
 }
 
-QTEST_MAIN(tst_QmlGraphicsMouseArea)
+QTEST_MAIN(tst_QDeclarativeMouseArea)
 
 #include "tst_qdeclarativemousearea.moc"
diff --git a/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp b/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp
index 77ad442..26ff3d5 100644
--- a/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp
+++ b/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp
@@ -45,11 +45,11 @@
 #include <private/qnumberformat_p.h>
 #include <private/qdeclarativenumberformatter_p.h>
 
-class tst_qmlnumberformatter : public QObject
+class tst_qdeclarativenumberformatter : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlnumberformatter();
+    tst_qdeclarativenumberformatter();
 
     void init() {}
     void initTestCase() {}
@@ -67,7 +67,7 @@ private:
     QStringList texts;
 };
 
-tst_qmlnumberformatter::tst_qmlnumberformatter()
+tst_qdeclarativenumberformatter::tst_qdeclarativenumberformatter()
 {
     strings << "100.0"
             << "12345"
@@ -177,7 +177,7 @@ tst_qmlnumberformatter::tst_qmlnumberformatter()
              << "texts.size()" << texts.size();
 }
 
-void tst_qmlnumberformatter::text_data()
+void tst_qdeclarativenumberformatter::text_data()
 {
     QTest::addColumn<QString>("string");
     QTest::addColumn<QString>("format");
@@ -194,7 +194,7 @@ void tst_qmlnumberformatter::text_data()
 
 }
 
-void tst_qmlnumberformatter::text()
+void tst_qdeclarativenumberformatter::text()
 {
     QFETCH(QString, string);
     QFETCH(QString, format);
@@ -217,6 +217,6 @@ void tst_qmlnumberformatter::text()
     delete formatter;
 }
 
-QTEST_MAIN(tst_qmlnumberformatter)
+QTEST_MAIN(tst_qdeclarativenumberformatter)
 
 #include "tst_qdeclarativenumberformatter.moc"
diff --git a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
index 328a480..6090a07 100644
--- a/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
+++ b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
@@ -43,11 +43,11 @@
 #include <qdeclarativeview.h>
 #include <private/qdeclarativeparticles_p.h>
 
-class tst_QmlGraphicsParticles : public QObject
+class tst_QDeclarativeParticles : public QObject
 {
     Q_OBJECT
 public:
-    tst_QmlGraphicsParticles();
+    tst_QDeclarativeParticles();
 
 private slots:
     void properties();
@@ -59,11 +59,11 @@ private:
 
 };
 
-tst_QmlGraphicsParticles::tst_QmlGraphicsParticles()
+tst_QDeclarativeParticles::tst_QDeclarativeParticles()
 {
 }
 
-void tst_QmlGraphicsParticles::properties()
+void tst_QDeclarativeParticles::properties()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml");
     QVERIFY(canvas->rootObject());
@@ -101,7 +101,7 @@ void tst_QmlGraphicsParticles::properties()
     QCOMPARE(particles->emissionRate(), 12);
 }
 
-void tst_QmlGraphicsParticles::motionGravity()
+void tst_QDeclarativeParticles::motionGravity()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml");
     QVERIFY(canvas->rootObject());
@@ -140,7 +140,7 @@ void tst_QmlGraphicsParticles::motionGravity()
     QCOMPARE(accelerationSpy.count(), 1);
 }
 
-void tst_QmlGraphicsParticles::motionWander()
+void tst_QDeclarativeParticles::motionWander()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml");
     QVERIFY(canvas->rootObject());
@@ -186,7 +186,7 @@ void tst_QmlGraphicsParticles::motionWander()
     QCOMPARE(paceSpy.count(), 1);
 }
 
-void tst_QmlGraphicsParticles::runs()
+void tst_QDeclarativeParticles::runs()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml");
     QVERIFY(canvas->rootObject());
@@ -195,7 +195,7 @@ void tst_QmlGraphicsParticles::runs()
     QTest::qWait(1000);//Run for one second. Test passes if it doesn't crash.
 }
 
-QDeclarativeView *tst_QmlGraphicsParticles::createView(const QString &filename)
+QDeclarativeView *tst_QDeclarativeParticles::createView(const QString &filename)
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
@@ -204,6 +204,6 @@ QDeclarativeView *tst_QmlGraphicsParticles::createView(const QString &filename)
 
     return canvas;
 }
-QTEST_MAIN(tst_QmlGraphicsParticles)
+QTEST_MAIN(tst_QDeclarativeParticles)
 
 #include "tst_qdeclarativeparticles.moc"
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index 6873757..09f0f79 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -53,11 +53,11 @@
 #include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
-class tst_QmlGraphicsPathView : public QObject
+class tst_QDeclarativePathView : public QObject
 {
     Q_OBJECT
 public:
-    tst_QmlGraphicsPathView();
+    tst_QDeclarativePathView();
 
 private slots:
     void initValues();
@@ -167,11 +167,11 @@ private:
 };
 
 
-tst_QmlGraphicsPathView::tst_QmlGraphicsPathView()
+tst_QDeclarativePathView::tst_QDeclarativePathView()
 {
 }
 
-void tst_QmlGraphicsPathView::initValues()
+void tst_QDeclarativePathView::initValues()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview1.qml"));
@@ -189,7 +189,7 @@ void tst_QmlGraphicsPathView::initValues()
     QCOMPARE(obj->pathItemCount(), -1);
 }
 
-void tst_QmlGraphicsPathView::items()
+void tst_QDeclarativePathView::items()
 {
     QDeclarativeView *canvas = createView();
 
@@ -221,7 +221,7 @@ void tst_QmlGraphicsPathView::items()
     delete canvas;
 }
 
-void tst_QmlGraphicsPathView::pathview2()
+void tst_QDeclarativePathView::pathview2()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview2.qml"));
@@ -239,7 +239,7 @@ void tst_QmlGraphicsPathView::pathview2()
     QCOMPARE(obj->pathItemCount(), 10);
 }
 
-void tst_QmlGraphicsPathView::pathview3()
+void tst_QDeclarativePathView::pathview3()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview3.qml"));
@@ -257,7 +257,7 @@ void tst_QmlGraphicsPathView::pathview3()
     QCOMPARE(obj->pathItemCount(), 4);
 }
 
-void tst_QmlGraphicsPathView::path()
+void tst_QDeclarativePathView::path()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/path.qml"));
@@ -302,7 +302,7 @@ void tst_QmlGraphicsPathView::path()
     QCOMPARE(cubic->control2Y(), 90.);
 }
 
-void tst_QmlGraphicsPathView::dataModel()
+void tst_QDeclarativePathView::dataModel()
 {
     QDeclarativeView *canvas = createView();
 
@@ -382,7 +382,7 @@ void tst_QmlGraphicsPathView::dataModel()
     delete canvas;
 }
 
-void tst_QmlGraphicsPathView::pathMoved()
+void tst_QDeclarativePathView::pathMoved()
 {
     QDeclarativeView *canvas = createView();
 
@@ -425,7 +425,7 @@ void tst_QmlGraphicsPathView::pathMoved()
     delete canvas;
 }
 
-QDeclarativeView *tst_QmlGraphicsPathView::createView()
+QDeclarativeView *tst_QDeclarativePathView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
@@ -438,7 +438,7 @@ QDeclarativeView *tst_QmlGraphicsPathView::createView()
    item must also evaluate the {index} expression equal to index
  */
 template<typename T>
-T *tst_QmlGraphicsPathView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
+T *tst_QDeclarativePathView::findItem(QGraphicsObject *parent, const QString &objectName, int index)
 {
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
@@ -465,7 +465,7 @@ T *tst_QmlGraphicsPathView::findItem(QGraphicsObject *parent, const QString &obj
 }
 
 template<typename T>
-QList<T*> tst_QmlGraphicsPathView::findItems(QGraphicsObject *parent, const QString &objectName)
+QList<T*> tst_QDeclarativePathView::findItems(QGraphicsObject *parent, const QString &objectName)
 {
     QList<T*> items;
     const QMetaObject &mo = T::staticMetaObject;
@@ -483,6 +483,6 @@ QList<T*> tst_QmlGraphicsPathView::findItems(QGraphicsObject *parent, const QStr
     return items;
 }
 
-QTEST_MAIN(tst_QmlGraphicsPathView)
+QTEST_MAIN(tst_QDeclarativePathView)
 
 #include "tst_qdeclarativepathview.moc"
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index ccf41c6..223f54f 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -47,11 +47,11 @@
 // These don't let normal people run tests!
 //#include "../network-settings.h"
 
-class tst_qmlpixmapcache : public QObject
+class tst_qdeclarativepixmapcache : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlpixmapcache() :
+    tst_qdeclarativepixmapcache() :
         thisfile(QUrl::fromLocalFile(__FILE__))
     {
     }
@@ -97,7 +97,7 @@ static const bool localfile_optimized = true;
 static const bool localfile_optimized = false;
 #endif
 
-void tst_qmlpixmapcache::single_data()
+void tst_qdeclarativepixmapcache::single_data()
 {
     // Note, since QDeclarativePixmapCache is shared, tests affect each other!
     // so use different files fore all test functions.
@@ -114,7 +114,7 @@ void tst_qmlpixmapcache::single_data()
     QTest::newRow("remote") << QUrl("http://qt.nokia.com/thereisnologo.png") << false << false << true;
 }
 
-void tst_qmlpixmapcache::single()
+void tst_qdeclarativepixmapcache::single()
 {
     QFETCH(QUrl, target);
     QFETCH(bool, incache);
@@ -163,7 +163,7 @@ void tst_qmlpixmapcache::single()
     QCOMPARE(QDeclarativePixmapCache::pendingRequests(), 0);
 }
 
-void tst_qmlpixmapcache::parallel_data()
+void tst_qdeclarativepixmapcache::parallel_data()
 {
     // Note, since QDeclarativePixmapCache is shared, tests affect each other!
     // so use different files fore all test functions.
@@ -215,7 +215,7 @@ void tst_qmlpixmapcache::parallel_data()
             ;
 }
 
-void tst_qmlpixmapcache::parallel()
+void tst_qdeclarativepixmapcache::parallel()
 {
     QFETCH(QUrl, target1);
     QFETCH(QUrl, target2);
@@ -277,6 +277,6 @@ void tst_qmlpixmapcache::parallel()
     QCOMPARE(QDeclarativePixmapCache::pendingRequests(), 0);
 }
 
-QTEST_MAIN(tst_qmlpixmapcache)
+QTEST_MAIN(tst_qdeclarativepixmapcache)
 
 #include "tst_qdeclarativepixmapcache.moc"
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index a8de83b..3a8a892 100644
--- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -47,11 +47,11 @@
 #include <qdeclarativeexpression.h>
 #include "../../../shared/util.h"
 
-class tst_QmlGraphicsPositioners : public QObject
+class tst_QDeclarativePositioners : public QObject
 {
     Q_OBJECT
 public:
-    tst_QmlGraphicsPositioners();
+    tst_QDeclarativePositioners();
 
 private slots:
     void test_horizontal();
@@ -69,11 +69,11 @@ private:
     QDeclarativeView *createView(const QString &filename);
 };
 
-tst_QmlGraphicsPositioners::tst_QmlGraphicsPositioners()
+tst_QDeclarativePositioners::tst_QDeclarativePositioners()
 {
 }
 
-void tst_QmlGraphicsPositioners::test_horizontal()
+void tst_QDeclarativePositioners::test_horizontal()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal.qml");
 
@@ -94,7 +94,7 @@ void tst_QmlGraphicsPositioners::test_horizontal()
     QCOMPARE(three->y(), 0.0);
 }
 
-void tst_QmlGraphicsPositioners::test_horizontal_spacing()
+void tst_QDeclarativePositioners::test_horizontal_spacing()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
 
@@ -115,7 +115,7 @@ void tst_QmlGraphicsPositioners::test_horizontal_spacing()
     QCOMPARE(three->y(), 0.0);
 }
 
-void tst_QmlGraphicsPositioners::test_horizontal_animated()
+void tst_QDeclarativePositioners::test_horizontal_animated()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
 
@@ -155,7 +155,7 @@ void tst_QmlGraphicsPositioners::test_horizontal_animated()
     QTRY_COMPARE(three->x(), 100.0);
 }
 
-void tst_QmlGraphicsPositioners::test_vertical()
+void tst_QDeclarativePositioners::test_vertical()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/vertical.qml");
 
@@ -176,7 +176,7 @@ void tst_QmlGraphicsPositioners::test_vertical()
     QCOMPARE(three->y(), 60.0);
 }
 
-void tst_QmlGraphicsPositioners::test_vertical_spacing()
+void tst_QDeclarativePositioners::test_vertical_spacing()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/vertical-spacing.qml");
 
@@ -197,7 +197,7 @@ void tst_QmlGraphicsPositioners::test_vertical_spacing()
     QCOMPARE(three->y(), 80.0);
 }
 
-void tst_QmlGraphicsPositioners::test_vertical_animated()
+void tst_QDeclarativePositioners::test_vertical_animated()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/vertical-animated.qml");
 
@@ -237,7 +237,7 @@ void tst_QmlGraphicsPositioners::test_vertical_animated()
 
 }
 
-void tst_QmlGraphicsPositioners::test_grid()
+void tst_QDeclarativePositioners::test_grid()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/grid.qml");
 
@@ -264,7 +264,7 @@ void tst_QmlGraphicsPositioners::test_grid()
     QCOMPARE(five->y(), 50.0);
 }
 
-void tst_QmlGraphicsPositioners::test_grid_spacing()
+void tst_QDeclarativePositioners::test_grid_spacing()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/grid-spacing.qml");
 
@@ -291,7 +291,7 @@ void tst_QmlGraphicsPositioners::test_grid_spacing()
     QCOMPARE(five->y(), 54.0);
 }
 
-void tst_QmlGraphicsPositioners::test_grid_animated()
+void tst_QDeclarativePositioners::test_grid_animated()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/grid-animated.qml");
 
@@ -363,7 +363,7 @@ void tst_QmlGraphicsPositioners::test_grid_animated()
     QTRY_COMPARE(five->y(), 50.0);
 
 }
-void tst_QmlGraphicsPositioners::test_propertychanges()
+void tst_QDeclarativePositioners::test_propertychanges()
 {
     QDeclarativeView *canvas = createView("data/propertychanges.qml");
 
@@ -419,7 +419,7 @@ void tst_QmlGraphicsPositioners::test_propertychanges()
     QCOMPARE(rowsSpy.count(),2);
 }
 
-void tst_QmlGraphicsPositioners::test_repeater()
+void tst_QDeclarativePositioners::test_repeater()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/repeater.qml");
 
@@ -440,7 +440,7 @@ void tst_QmlGraphicsPositioners::test_repeater()
     QCOMPARE(three->y(), 0.0);
 }
 
-QDeclarativeView *tst_QmlGraphicsPositioners::createView(const QString &filename)
+QDeclarativeView *tst_QDeclarativePositioners::createView(const QString &filename)
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
 
@@ -450,6 +450,6 @@ QDeclarativeView *tst_QmlGraphicsPositioners::createView(const QString &filename
 }
 
 
-QTEST_MAIN(tst_QmlGraphicsPositioners)
+QTEST_MAIN(tst_QDeclarativePositioners)
 
 #include "tst_qdeclarativepositioners.moc"
diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
index 1a65bd9..22c5581 100644
--- a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
+++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
@@ -46,11 +46,11 @@
 #include <private/qdeclarativetext_p.h>
 #include <QSignalSpy>
 
-class tst_QmlPropertyMap : public QObject
+class tst_QDeclarativePropertyMap : public QObject
 {
     Q_OBJECT
 public:
-    tst_QmlPropertyMap() {}
+    tst_QDeclarativePropertyMap() {}
 
 private slots:
     void insert();
@@ -61,7 +61,7 @@ private slots:
     void count();
 };
 
-void tst_QmlPropertyMap::insert()
+void tst_QDeclarativePropertyMap::insert()
 {
     QDeclarativePropertyMap map;
     map.insert(QLatin1String("key1"),100);
@@ -76,7 +76,7 @@ void tst_QmlPropertyMap::insert()
     QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
 }
 
-void tst_QmlPropertyMap::operatorInsert()
+void tst_QDeclarativePropertyMap::operatorInsert()
 {
     QDeclarativePropertyMap map;
     map[QLatin1String("key1")] = 100;
@@ -90,7 +90,7 @@ void tst_QmlPropertyMap::operatorInsert()
     QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
 }
 
-void tst_QmlPropertyMap::operatorValue()
+void tst_QDeclarativePropertyMap::operatorValue()
 {
     QDeclarativePropertyMap map;
     map.insert(QLatin1String("key1"),100);
@@ -106,7 +106,7 @@ void tst_QmlPropertyMap::operatorValue()
     QCOMPARE(constMap[QLatin1String("key2")], constMap.value(QLatin1String("key2")));
 }
 
-void tst_QmlPropertyMap::clear()
+void tst_QDeclarativePropertyMap::clear()
 {
     QDeclarativePropertyMap map;
     map.insert(QLatin1String("key1"),100);
@@ -120,7 +120,7 @@ void tst_QmlPropertyMap::clear()
     QCOMPARE(map.value(QLatin1String("key1")), QVariant());
 }
 
-void tst_QmlPropertyMap::changed()
+void tst_QDeclarativePropertyMap::changed()
 {
     QDeclarativePropertyMap map;
     QSignalSpy spy(&map, SIGNAL(valueChanged(const QString&)));
@@ -148,7 +148,7 @@ void tst_QmlPropertyMap::changed()
     QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
 }
 
-void tst_QmlPropertyMap::count()
+void tst_QDeclarativePropertyMap::count()
 {
     QDeclarativePropertyMap map;
     QCOMPARE(map.isEmpty(), true);
@@ -166,6 +166,6 @@ void tst_QmlPropertyMap::count()
     QCOMPARE(map.size(), map.count());
 }
 
-QTEST_MAIN(tst_QmlPropertyMap)
+QTEST_MAIN(tst_QDeclarativePropertyMap)
 
 #include "tst_qdeclarativepropertymap.moc"
diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
index 9cbcaec..9ec6872 100644
--- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
+++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
@@ -49,11 +49,11 @@
 #include <QCryptographicHash>
 #include <QDeclarativeItem>
 
-class tst_qmlqt : public QObject
+class tst_qdeclarativeqt : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlqt() {}
+    tst_qdeclarativeqt() {}
 
 private slots:
     void enums();
@@ -83,7 +83,7 @@ inline QUrl TEST_FILE(const QString &filename)
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
 }
 
-void tst_qmlqt::enums()
+void tst_qdeclarativeqt::enums()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("enums.qml"));
     QObject *object = component.create();
@@ -97,7 +97,7 @@ void tst_qmlqt::enums()
     delete object;
 }
 
-void tst_qmlqt::rgba()
+void tst_qdeclarativeqt::rgba()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("rgba.qml"));
 
@@ -124,7 +124,7 @@ void tst_qmlqt::rgba()
     delete object;
 }
 
-void tst_qmlqt::hsla()
+void tst_qdeclarativeqt::hsla()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("hsla.qml"));
 
@@ -150,7 +150,7 @@ void tst_qmlqt::hsla()
     delete object;
 }
 
-void tst_qmlqt::rect()
+void tst_qdeclarativeqt::rect()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("rect.qml"));
     QObject *object = component.create();
@@ -165,7 +165,7 @@ void tst_qmlqt::rect()
     delete object;
 }
 
-void tst_qmlqt::point()
+void tst_qdeclarativeqt::point()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("point.qml"));
     QObject *object = component.create();
@@ -179,7 +179,7 @@ void tst_qmlqt::point()
     delete object;
 }
 
-void tst_qmlqt::size()
+void tst_qdeclarativeqt::size()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("size.qml"));
     QObject *object = component.create();
@@ -194,7 +194,7 @@ void tst_qmlqt::size()
     delete object;
 }
 
-void tst_qmlqt::vector()
+void tst_qdeclarativeqt::vector()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("vector.qml"));
     QObject *object = component.create();
@@ -208,7 +208,7 @@ void tst_qmlqt::vector()
     delete object;
 }
 
-void tst_qmlqt::lighter()
+void tst_qdeclarativeqt::lighter()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("lighter.qml"));
     QObject *object = component.create();
@@ -224,7 +224,7 @@ void tst_qmlqt::lighter()
     delete object;
 }
 
-void tst_qmlqt::darker()
+void tst_qdeclarativeqt::darker()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("darker.qml"));
     QObject *object = component.create();
@@ -240,7 +240,7 @@ void tst_qmlqt::darker()
     delete object;
 }
 
-void tst_qmlqt::tint()
+void tst_qdeclarativeqt::tint()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("tint.qml"));
 
@@ -262,7 +262,7 @@ void tst_qmlqt::tint()
     delete object;
 }
 
-void tst_qmlqt::closestAngle()
+void tst_qdeclarativeqt::closestAngle()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("closestangle.qml"));
     QObject *object = component.create();
@@ -279,19 +279,19 @@ void tst_qmlqt::closestAngle()
     delete object;
 }
 
-void tst_qmlqt::playSound()
+void tst_qdeclarativeqt::playSound()
 {
     QEXPECT_FAIL("", "How do we test this?", Abort);
     QVERIFY(false);
 }
 
-void tst_qmlqt::openUrlExternally()
+void tst_qdeclarativeqt::openUrlExternally()
 {
     QEXPECT_FAIL("", "How do we test this?", Abort);
     QVERIFY(false);
 }
 
-void tst_qmlqt::md5()
+void tst_qdeclarativeqt::md5()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("md5.qml"));
     QObject *object = component.create();
@@ -303,7 +303,7 @@ void tst_qmlqt::md5()
     delete object;
 }
 
-void tst_qmlqt::createComponent()
+void tst_qdeclarativeqt::createComponent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("createComponent.qml"));
     QObject *object = component.create();
@@ -319,7 +319,7 @@ void tst_qmlqt::createComponent()
     delete object;
 }
 
-void tst_qmlqt::createQmlObject()
+void tst_qdeclarativeqt::createQmlObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("createQmlObject.qml"));
 
@@ -354,7 +354,7 @@ void tst_qmlqt::createQmlObject()
     delete object;
 }
 
-void tst_qmlqt::consoleLog()
+void tst_qdeclarativeqt::consoleLog()
 {
     QTest::ignoreMessage(QtDebugMsg, "completed ok");
     QTest::ignoreMessage(QtDebugMsg, "completed ok");
@@ -364,6 +364,6 @@ void tst_qmlqt::consoleLog()
     delete object;
 }
 
-QTEST_MAIN(tst_qmlqt)
+QTEST_MAIN(tst_qdeclarativeqt)
 
 #include "tst_qdeclarativeqt.moc"
diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
index e442989..7a97e60 100644
--- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
+++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
@@ -53,11 +53,11 @@ inline QUrl TEST_FILE(const QString &filename)
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
 }
 
-class tst_QmlGraphicsRepeater : public QObject
+class tst_QDeclarativeRepeater : public QObject
 {
     Q_OBJECT
 public:
-    tst_QmlGraphicsRepeater();
+    tst_QDeclarativeRepeater();
 
 private slots:
     void numberModel();
@@ -158,11 +158,11 @@ private:
 };
 
 
-tst_QmlGraphicsRepeater::tst_QmlGraphicsRepeater()
+tst_QDeclarativeRepeater::tst_QDeclarativeRepeater()
 {
 }
 
-void tst_QmlGraphicsRepeater::numberModel()
+void tst_QDeclarativeRepeater::numberModel()
 {
     QDeclarativeView *canvas = createView();
 
@@ -184,7 +184,7 @@ void tst_QmlGraphicsRepeater::numberModel()
     delete canvas;
 }
 
-void tst_QmlGraphicsRepeater::objectList()
+void tst_QDeclarativeRepeater::objectList()
 {
     QDeclarativeView *canvas = createView();
 
@@ -211,7 +211,7 @@ The Repeater element creates children at its own position in its parent's
 stacking order.  In this test we insert a repeater between two other Text
 elements to test this.
 */
-void tst_QmlGraphicsRepeater::stringList()
+void tst_QDeclarativeRepeater::stringList()
 {
     QDeclarativeView *canvas = createView();
 
@@ -263,7 +263,7 @@ void tst_QmlGraphicsRepeater::stringList()
     delete canvas;
 }
 
-void tst_QmlGraphicsRepeater::dataModel()
+void tst_QDeclarativeRepeater::dataModel()
 {
     QDeclarativeView *canvas = createView();
     QDeclarativeContext *ctxt = canvas->rootContext();
@@ -295,7 +295,7 @@ void tst_QmlGraphicsRepeater::dataModel()
     QCOMPARE(container->childItems().count(), 4);
 }
 
-void tst_QmlGraphicsRepeater::itemModel()
+void tst_QDeclarativeRepeater::itemModel()
 {
     QDeclarativeView *canvas = createView();
     QDeclarativeContext *ctxt = canvas->rootContext();
@@ -326,7 +326,7 @@ void tst_QmlGraphicsRepeater::itemModel()
     delete canvas;
 }
 
-void tst_QmlGraphicsRepeater::properties()
+void tst_QDeclarativeRepeater::properties()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine, TEST_FILE("/properties.qml"));
@@ -354,7 +354,7 @@ void tst_QmlGraphicsRepeater::properties()
     QCOMPARE(delegateSpy.count(),1);
 }
 
-QDeclarativeView *tst_QmlGraphicsRepeater::createView()
+QDeclarativeView *tst_QDeclarativeRepeater::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
@@ -363,7 +363,7 @@ QDeclarativeView *tst_QmlGraphicsRepeater::createView()
 }
 
 template<typename T>
-T *tst_QmlGraphicsRepeater::findItem(QGraphicsObject *parent, const QString &objectName)
+T *tst_QDeclarativeRepeater::findItem(QGraphicsObject *parent, const QString &objectName)
 {
     const QMetaObject &mo = T::staticMetaObject;
     if (mo.cast(parent) && (objectName.isEmpty() || parent->objectName() == objectName))
@@ -380,6 +380,6 @@ T *tst_QmlGraphicsRepeater::findItem(QGraphicsObject *parent, const QString &obj
     return 0;
 }
 
-QTEST_MAIN(tst_QmlGraphicsRepeater)
+QTEST_MAIN(tst_QDeclarativeRepeater)
 
 #include "tst_qdeclarativerepeater.moc"
diff --git a/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp
index 594b9a0..7a60e78 100644
--- a/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp
+++ b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp
@@ -45,11 +45,11 @@
 #include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
-class tst_qmlspringfollow : public QObject
+class tst_qdeclarativespringfollow : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlspringfollow();
+    tst_qdeclarativespringfollow();
 
 private slots:
     void defaultValues();
@@ -60,11 +60,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlspringfollow::tst_qmlspringfollow()
+tst_qdeclarativespringfollow::tst_qdeclarativespringfollow()
 {
 }
 
-void tst_qmlspringfollow::defaultValues()
+void tst_qdeclarativespringfollow::defaultValues()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow1.qml"));
@@ -86,7 +86,7 @@ void tst_qmlspringfollow::defaultValues()
     delete obj;
 }
 
-void tst_qmlspringfollow::values()
+void tst_qdeclarativespringfollow::values()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow2.qml"));
@@ -109,7 +109,7 @@ void tst_qmlspringfollow::values()
     delete obj;
 }
 
-void tst_qmlspringfollow::disabled()
+void tst_qdeclarativespringfollow::disabled()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow3.qml"));
@@ -132,6 +132,6 @@ void tst_qmlspringfollow::disabled()
     delete obj;
 }
 
-QTEST_MAIN(tst_qmlspringfollow)
+QTEST_MAIN(tst_qdeclarativespringfollow)
 
 #include "tst_qdeclarativespringfollow.moc"
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index 1bc67e9..44fb51f 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -46,11 +46,11 @@
 #include <private/qdeclarativepropertychanges_p.h>
 #include <private/qdeclarativestategroup_p.h>
 
-class tst_qmlstates : public QObject
+class tst_qdeclarativestates : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlstates() {}
+    tst_qdeclarativestates() {}
 
 private:
     static QByteArray fullDataPath(const QString &path);
@@ -83,12 +83,12 @@ private slots:
     void nonExistantProperty();
 };
 
-QByteArray tst_qmlstates::fullDataPath(const QString &path)
+QByteArray tst_qdeclarativestates::fullDataPath(const QString &path)
 {
     return QUrl::fromLocalFile(SRCDIR + path).toString().toUtf8();    
 }
 
-void tst_qmlstates::basicChanges()
+void tst_qdeclarativestates::basicChanges()
 {
     QDeclarativeEngine engine;
 
@@ -158,7 +158,7 @@ void tst_qmlstates::basicChanges()
     }
 }
 
-void tst_qmlstates::basicExtension()
+void tst_qdeclarativestates::basicExtension()
 {
     QDeclarativeEngine engine;
 
@@ -222,7 +222,7 @@ void tst_qmlstates::basicExtension()
     }
 }
 
-void tst_qmlstates::basicBinding()
+void tst_qdeclarativestates::basicBinding()
 {
     QDeclarativeEngine engine;
 
@@ -347,12 +347,12 @@ Q_SIGNALS:
 
 QML_DECLARE_TYPE(MyRect)
 
-void tst_qmlstates::initTestCase()
+void tst_qdeclarativestates::initTestCase()
 {
     QML_REGISTER_TYPE(Qt.test, 1, 0, MyRectangle,MyRect);
 }
 
-void tst_qmlstates::signalOverride()
+void tst_qdeclarativestates::signalOverride()
 {
     QDeclarativeEngine engine;
 
@@ -389,7 +389,7 @@ void tst_qmlstates::signalOverride()
     }
 }
 
-void tst_qmlstates::signalOverrideCrash()
+void tst_qdeclarativestates::signalOverrideCrash()
 {
     QDeclarativeEngine engine;
 
@@ -401,7 +401,7 @@ void tst_qmlstates::signalOverrideCrash()
     rect->doSomething();
 }
 
-void tst_qmlstates::parentChange()
+void tst_qdeclarativestates::parentChange()
 {
     QDeclarativeEngine engine;
 
@@ -472,7 +472,7 @@ void tst_qmlstates::parentChange()
     }
 }
 
-void tst_qmlstates::parentChangeErrors()
+void tst_qdeclarativestates::parentChangeErrors()
 {
     QDeclarativeEngine engine;
 
@@ -509,7 +509,7 @@ void tst_qmlstates::parentChangeErrors()
     }
 }
 
-void tst_qmlstates::anchorChanges()
+void tst_qdeclarativestates::anchorChanges()
 {
     QDeclarativeEngine engine;
 
@@ -541,7 +541,7 @@ void tst_qmlstates::anchorChanges()
     delete rect;
 }
 
-void tst_qmlstates::anchorChanges2()
+void tst_qdeclarativestates::anchorChanges2()
 {
     QDeclarativeEngine engine;
 
@@ -562,7 +562,7 @@ void tst_qmlstates::anchorChanges2()
     delete rect;
 }
 
-void tst_qmlstates::anchorChanges3()
+void tst_qdeclarativestates::anchorChanges3()
 {
     QDeclarativeEngine engine;
 
@@ -612,7 +612,7 @@ void tst_qmlstates::anchorChanges3()
     delete rect;
 }
 
-void tst_qmlstates::anchorChanges4()
+void tst_qdeclarativestates::anchorChanges4()
 {
     QDeclarativeEngine engine;
 
@@ -647,7 +647,7 @@ void tst_qmlstates::anchorChanges4()
     delete rect;
 }
 
-void tst_qmlstates::anchorChanges5()
+void tst_qdeclarativestates::anchorChanges5()
 {
     QDeclarativeEngine engine;
 
@@ -682,7 +682,7 @@ void tst_qmlstates::anchorChanges5()
     delete rect;
 }
 
-void tst_qmlstates::script()
+void tst_qdeclarativestates::script()
 {
     QDeclarativeEngine engine;
 
@@ -701,7 +701,7 @@ void tst_qmlstates::script()
     }
 }
 
-void tst_qmlstates::restoreEntryValues()
+void tst_qdeclarativestates::restoreEntryValues()
 {
     QDeclarativeEngine engine;
 
@@ -718,7 +718,7 @@ void tst_qmlstates::restoreEntryValues()
     QCOMPARE(rect->color(),QColor("blue"));
 }
 
-void tst_qmlstates::explicitChanges()
+void tst_qdeclarativestates::explicitChanges()
 {
     QDeclarativeEngine engine;
 
@@ -752,7 +752,7 @@ void tst_qmlstates::explicitChanges()
     QCOMPARE(rect->color(),QColor("yellow"));
 }
 
-void tst_qmlstates::propertyErrors()
+void tst_qdeclarativestates::propertyErrors()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/propertyErrors.qml");
@@ -766,7 +766,7 @@ void tst_qmlstates::propertyErrors()
     rect->setState("blue");
 }
 
-void tst_qmlstates::incorrectRestoreBug()
+void tst_qdeclarativestates::incorrectRestoreBug()
 {
     QDeclarativeEngine engine;
 
@@ -792,7 +792,7 @@ void tst_qmlstates::incorrectRestoreBug()
     QCOMPARE(rect->color(),QColor("green"));
 }
 
-void tst_qmlstates::autoStateAtStartupRestoreBug()
+void tst_qdeclarativestates::autoStateAtStartupRestoreBug()
 {
     QDeclarativeEngine engine;
 
@@ -809,7 +809,7 @@ void tst_qmlstates::autoStateAtStartupRestoreBug()
     delete obj;
 }
 
-void tst_qmlstates::deletingChange()
+void tst_qdeclarativestates::deletingChange()
 {
     QDeclarativeEngine engine;
 
@@ -841,7 +841,7 @@ void tst_qmlstates::deletingChange()
     delete rect;
 }
 
-void tst_qmlstates::deletingState()
+void tst_qdeclarativestates::deletingState()
 {
     QDeclarativeEngine engine;
 
@@ -872,7 +872,7 @@ void tst_qmlstates::deletingState()
     delete rect;
 }
 
-void tst_qmlstates::tempState()
+void tst_qdeclarativestates::tempState()
 {
     QDeclarativeEngine engine;
 
@@ -886,7 +886,7 @@ void tst_qmlstates::tempState()
     QCOMPARE(rect->state(), QLatin1String("idle"));
 }
 
-void tst_qmlstates::illegalTempState()
+void tst_qdeclarativestates::illegalTempState()
 {
     QDeclarativeEngine engine;
 
@@ -899,7 +899,7 @@ void tst_qmlstates::illegalTempState()
     QCOMPARE(rect->state(), QLatin1String("placed"));
 }
 
-void tst_qmlstates::nonExistantProperty()
+void tst_qdeclarativestates::nonExistantProperty()
 {
     QDeclarativeEngine engine;
 
@@ -912,6 +912,6 @@ void tst_qmlstates::nonExistantProperty()
     QCOMPARE(rect->state(), QLatin1String("blue"));
 }
 
-QTEST_MAIN(tst_qmlstates)
+QTEST_MAIN(tst_qdeclarativestates)
 
 #include "tst_qdeclarativestates.moc"
diff --git a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
index 1968300..7b1293e 100644
--- a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
+++ b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
@@ -43,11 +43,11 @@
 #include <QtGui/QTextLayout>
 #include <private/qdeclarativestyledtext_p.h>
 
-class tst_qmlstyledtext : public QObject
+class tst_qdeclarativestyledtext : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlstyledtext()
+    tst_qdeclarativestyledtext()
     {
     }
 
@@ -58,7 +58,7 @@ private slots:
 
 // For malformed input all we test is that we get the expected text out.
 // 
-void tst_qmlstyledtext::textOutput_data()
+void tst_qdeclarativestyledtext::textOutput_data()
 {
     QTest::addColumn<QString>("input");
     QTest::addColumn<QString>("output");
@@ -79,7 +79,7 @@ void tst_qmlstyledtext::textOutput_data()
     QTest::newRow("empty") << "" << "";
 }
 
-void tst_qmlstyledtext::textOutput()
+void tst_qdeclarativestyledtext::textOutput()
 {
     QFETCH(QString, input);
     QFETCH(QString, output);
@@ -91,6 +91,6 @@ void tst_qmlstyledtext::textOutput()
 }
 
 
-QTEST_MAIN(tst_qmlstyledtext)
+QTEST_MAIN(tst_qdeclarativestyledtext)
 
 #include "tst_qdeclarativestyledtext.moc"
diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
index 0f6383e..5c93952 100644
--- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
+++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
@@ -47,12 +47,12 @@
 #include <qpalette.h>
 #include "../../../shared/util.h"
 
-class tst_qmlsystempalette : public QObject
+class tst_qdeclarativesystempalette : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlsystempalette();
+    tst_qdeclarativesystempalette();
 
 private slots:
     void activePalette();
@@ -64,11 +64,11 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlsystempalette::tst_qmlsystempalette()
+tst_qdeclarativesystempalette::tst_qdeclarativesystempalette()
 {
 }
 
-void tst_qmlsystempalette::activePalette()
+void tst_qdeclarativesystempalette::activePalette()
 {
     QString componentStr = "import Qt 4.6\nSystemPalette { }";
     QDeclarativeComponent component(&engine);
@@ -97,7 +97,7 @@ void tst_qmlsystempalette::activePalette()
     delete object;
 }
 
-void tst_qmlsystempalette::inactivePalette()
+void tst_qdeclarativesystempalette::inactivePalette()
 {
     QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Inactive }";
     QDeclarativeComponent component(&engine);
@@ -127,7 +127,7 @@ void tst_qmlsystempalette::inactivePalette()
     delete object;
 }
 
-void tst_qmlsystempalette::disabledPalette()
+void tst_qdeclarativesystempalette::disabledPalette()
 {
     QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Disabled }";
     QDeclarativeComponent component(&engine);
@@ -157,7 +157,7 @@ void tst_qmlsystempalette::disabledPalette()
     delete object;
 }
 
-void tst_qmlsystempalette::paletteChanged()
+void tst_qdeclarativesystempalette::paletteChanged()
 {
     QString componentStr = "import Qt 4.6\nSystemPalette { }";
     QDeclarativeComponent component(&engine);
@@ -182,6 +182,6 @@ void tst_qmlsystempalette::paletteChanged()
     delete object;
 }
 
-QTEST_MAIN(tst_qmlsystempalette)
+QTEST_MAIN(tst_qdeclarativesystempalette)
 
 #include "tst_qdeclarativesystempalette.moc"
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index 8026f1a..bbbbd83 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -48,12 +48,12 @@
 #include <QGraphicsSceneMouseEvent>
 #include <qmath.h>
 
-class tst_qmlgraphicstext : public QObject
+class tst_qdeclarativetext : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicstext();
+    tst_qdeclarativetext();
 
 private slots:
     void text();
@@ -99,7 +99,7 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlgraphicstext::tst_qmlgraphicstext()
+tst_qdeclarativetext::tst_qdeclarativetext()
 {
     standard << "the quick brown fox jumped over the lazy dog"
             << "the quick brown fox\n jumped over the lazy dog";
@@ -152,7 +152,7 @@ tst_qmlgraphicstext::tst_qmlgraphicstext()
     //
 }
 
-void tst_qmlgraphicstext::text()
+void tst_qdeclarativetext::text()
 {
     {
         QDeclarativeComponent textComponent(&engine);
@@ -193,7 +193,7 @@ void tst_qmlgraphicstext::text()
     }
 }
 
-void tst_qmlgraphicstext::width()
+void tst_qdeclarativetext::width()
 {
     // uses Font metrics to find the width for standard and document to find the width for rich
     {
@@ -245,7 +245,7 @@ void tst_qmlgraphicstext::width()
     }
 }
 
-void tst_qmlgraphicstext::wrap()
+void tst_qdeclarativetext::wrap()
 {
     int textHeight = 0;
     // for specified width and wrap set true
@@ -290,7 +290,7 @@ void tst_qmlgraphicstext::wrap()
 
 }
 
-void tst_qmlgraphicstext::elide()
+void tst_qdeclarativetext::elide()
 {
     for (QDeclarativeText::TextElideMode m = QDeclarativeText::ElideLeft; m<=QDeclarativeText::ElideNone; m=QDeclarativeText::TextElideMode(int(m)+1)) {
         const char* elidename[]={"ElideLeft", "ElideRight", "ElideMiddle", "ElideNone"};
@@ -332,7 +332,7 @@ void tst_qmlgraphicstext::elide()
     }
 }
 
-void tst_qmlgraphicstext::textFormat()
+void tst_qdeclarativetext::textFormat()
 {
     {
         QDeclarativeComponent textComponent(&engine);
@@ -353,7 +353,7 @@ void tst_qmlgraphicstext::textFormat()
 }
 
 //the alignment tests may be trivial o.oa
-void tst_qmlgraphicstext::horizontalAlignment()
+void tst_qdeclarativetext::horizontalAlignment()
 {
     //test one align each, and then test if two align fails.
 
@@ -385,7 +385,7 @@ void tst_qmlgraphicstext::horizontalAlignment()
 
 }
 
-void tst_qmlgraphicstext::verticalAlignment()
+void tst_qdeclarativetext::verticalAlignment()
 {
     //test one align each, and then test if two align fails.
 
@@ -419,7 +419,7 @@ void tst_qmlgraphicstext::verticalAlignment()
 
 }
 
-void tst_qmlgraphicstext::font()
+void tst_qdeclarativetext::font()
 {
     //test size, then bold, then italic, then family
     {
@@ -485,7 +485,7 @@ void tst_qmlgraphicstext::font()
     }
 }
 
-void tst_qmlgraphicstext::style()
+void tst_qdeclarativetext::style()
 {
     //test style
     for (int i = 0; i < styles.size(); i++)
@@ -500,7 +500,7 @@ void tst_qmlgraphicstext::style()
     }
 }
 
-void tst_qmlgraphicstext::color()
+void tst_qdeclarativetext::color()
 {
     //test style
     for (int i = 0; i < colorStrings.size(); i++)
@@ -553,7 +553,7 @@ void tst_qmlgraphicstext::color()
     }
 }
 
-void tst_qmlgraphicstext::smooth()
+void tst_qdeclarativetext::smooth()
 {
     for (int i = 0; i < standard.size(); i++)
     {
@@ -591,7 +591,7 @@ void tst_qmlgraphicstext::smooth()
     }
 }
 
-void tst_qmlgraphicstext::weight()
+void tst_qdeclarativetext::weight()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
@@ -613,7 +613,7 @@ void tst_qmlgraphicstext::weight()
     }
 }
 
-void tst_qmlgraphicstext::underline()
+void tst_qdeclarativetext::underline()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
@@ -635,7 +635,7 @@ void tst_qmlgraphicstext::underline()
     }
 }
 
-void tst_qmlgraphicstext::overline()
+void tst_qdeclarativetext::overline()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
@@ -657,7 +657,7 @@ void tst_qmlgraphicstext::overline()
     }
 }
 
-void tst_qmlgraphicstext::strikeout()
+void tst_qdeclarativetext::strikeout()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
@@ -679,7 +679,7 @@ void tst_qmlgraphicstext::strikeout()
     }
 }
 
-void tst_qmlgraphicstext::capitalization()
+void tst_qdeclarativetext::capitalization()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
@@ -728,7 +728,7 @@ void tst_qmlgraphicstext::capitalization()
     }
 }
 
-void tst_qmlgraphicstext::letterSpacing()
+void tst_qdeclarativetext::letterSpacing()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
@@ -759,7 +759,7 @@ void tst_qmlgraphicstext::letterSpacing()
     }
 }
 
-void tst_qmlgraphicstext::wordSpacing()
+void tst_qdeclarativetext::wordSpacing()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
@@ -808,7 +808,7 @@ public slots:
     void linkClicked(QString l) { link = l; }
 };
 
-void tst_qmlgraphicstext::clickLink()
+void tst_qdeclarativetext::clickLink()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"<a href=\\\"http://qt.nokia.com\\\">Hello world!</a>\" }";
@@ -839,6 +839,6 @@ void tst_qmlgraphicstext::clickLink()
     }
 }
 
-QTEST_MAIN(tst_qmlgraphicstext)
+QTEST_MAIN(tst_qdeclarativetext)
 
 #include "tst_qdeclarativetext.moc"
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index e08783f..b677fec 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -54,12 +54,12 @@
 #include <QStyle>
 #include <QInputContext>
 
-class tst_qmlgraphicstextedit : public QObject
+class tst_qdeclarativetextedit : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicstextedit();
+    tst_qdeclarativetextedit();
 
 private slots:
     void text();
@@ -102,7 +102,7 @@ private:
     QDeclarativeEngine engine;
 };
 
-tst_qmlgraphicstextedit::tst_qmlgraphicstextedit()
+tst_qdeclarativetextedit::tst_qdeclarativetextedit()
 {
     standard << "the quick brown fox jumped over the lazy dog"
              << "the quick brown fox\n jumped over the lazy dog";
@@ -145,7 +145,7 @@ tst_qmlgraphicstextedit::tst_qmlgraphicstextedit()
                  // 
 }
 
-void tst_qmlgraphicstextedit::text()
+void tst_qdeclarativetextedit::text()
 {
     {
         QDeclarativeComponent texteditComponent(&engine);
@@ -184,7 +184,7 @@ void tst_qmlgraphicstextedit::text()
     }
 }
 
-void tst_qmlgraphicstextedit::width()
+void tst_qdeclarativetextedit::width()
 {
     // uses Font metrics to find the width for standard and document to find the width for rich
     {
@@ -230,7 +230,7 @@ void tst_qmlgraphicstextedit::width()
     }
 }
 
-void tst_qmlgraphicstextedit::wrap()
+void tst_qdeclarativetextedit::wrap()
 {
     // for specified width and wrap set true
     {
@@ -266,7 +266,7 @@ void tst_qmlgraphicstextedit::wrap()
 
 }
 
-void tst_qmlgraphicstextedit::textFormat()
+void tst_qdeclarativetextedit::textFormat()
 {
     {
         QDeclarativeComponent textComponent(&engine);
@@ -287,7 +287,7 @@ void tst_qmlgraphicstextedit::textFormat()
 }
 
 //the alignment tests may be trivial o.oa
-void tst_qmlgraphicstextedit::hAlign()
+void tst_qdeclarativetextedit::hAlign()
 {
     //test one align each, and then test if two align fails.
 
@@ -321,7 +321,7 @@ void tst_qmlgraphicstextedit::hAlign()
 
 }
 
-void tst_qmlgraphicstextedit::vAlign()
+void tst_qdeclarativetextedit::vAlign()
 {
     //test one align each, and then test if two align fails.
 
@@ -355,7 +355,7 @@ void tst_qmlgraphicstextedit::vAlign()
 
 }
 
-void tst_qmlgraphicstextedit::font()
+void tst_qdeclarativetextedit::font()
 {
     //test size, then bold, then italic, then family
     { 
@@ -415,7 +415,7 @@ void tst_qmlgraphicstextedit::font()
     }
 }
 
-void tst_qmlgraphicstextedit::color()
+void tst_qdeclarativetextedit::color()
 {
     //test normal
     for (int i = 0; i < colorStrings.size(); i++)
@@ -466,7 +466,7 @@ void tst_qmlgraphicstextedit::color()
     }
 }
 
-void tst_qmlgraphicstextedit::textMargin()
+void tst_qdeclarativetextedit::textMargin()
 {
     for(qreal i=0; i<=10; i+=0.3){
         QString componentStr = "import Qt 4.6\nTextEdit {  textMargin: " + QString::number(i) + "; text: \"Hello World\" }";
@@ -478,7 +478,7 @@ void tst_qmlgraphicstextedit::textMargin()
     }
 }
 
-void tst_qmlgraphicstextedit::persistentSelection()
+void tst_qdeclarativetextedit::persistentSelection()
 {
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  persistentSelection: true; text: \"Hello World\" }";
@@ -499,7 +499,7 @@ void tst_qmlgraphicstextedit::persistentSelection()
     }
 }
 
-void tst_qmlgraphicstextedit::focusOnPress()
+void tst_qdeclarativetextedit::focusOnPress()
 {
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  focusOnPress: true; text: \"Hello World\" }";
@@ -520,7 +520,7 @@ void tst_qmlgraphicstextedit::focusOnPress()
     }
 }
 
-void tst_qmlgraphicstextedit::selection()
+void tst_qdeclarativetextedit::selection()
 {
     QString testStr = standard[0];//TODO: What should happen for multiline/rich text?
     QString componentStr = "import Qt 4.6\nTextEdit {  text: \""+ testStr +"\"; }";
@@ -601,7 +601,7 @@ void tst_qmlgraphicstextedit::selection()
     QVERIFY(textEditObject->selectedText().size() == 10);
 }
 
-void tst_qmlgraphicstextedit::inputMethodHints()
+void tst_qdeclarativetextedit::inputMethodHints()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
     canvas->show();
@@ -615,7 +615,7 @@ void tst_qmlgraphicstextedit::inputMethodHints()
     QVERIFY(textEditObject->inputMethodHints() & Qt::ImhUppercaseOnly);
 }
 
-void tst_qmlgraphicstextedit::cursorDelegate()
+void tst_qdeclarativetextedit::cursorDelegate()
 {
     QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml");
     view->show();
@@ -641,7 +641,7 @@ void tst_qmlgraphicstextedit::cursorDelegate()
     QVERIFY(!textEditObject->findChild<QDeclarativeItem*>("cursorInstance"));
 }
 
-void tst_qmlgraphicstextedit::delegateLoading()
+void tst_qdeclarativetextedit::delegateLoading()
 {
     TestHTTPServer server(42332);
     server.serveDirectory(SRCDIR "/data/httpfail", TestHTTPServer::Disconnect);
@@ -680,7 +680,7 @@ void tst_qmlgraphicstextedit::delegateLoading()
 TextEdit element should only handle left/right keys until the cursor reaches
 the extent of the text, then they should ignore the keys.
 */
-void tst_qmlgraphicstextedit::navigation()
+void tst_qdeclarativetextedit::navigation()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml");
     canvas->show();
@@ -702,7 +702,7 @@ void tst_qmlgraphicstextedit::navigation()
     QVERIFY(input->hasFocus() == true);
 }
 
-void tst_qmlgraphicstextedit::readOnly()
+void tst_qdeclarativetextedit::readOnly()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml");
     canvas->show();
@@ -724,7 +724,7 @@ void tst_qmlgraphicstextedit::readOnly()
     QCOMPARE(edit->text(), initial);
 }
 
-void tst_qmlgraphicstextedit::simulateKey(QDeclarativeView *view, int key)
+void tst_qdeclarativetextedit::simulateKey(QDeclarativeView *view, int key)
 {
     QKeyEvent press(QKeyEvent::KeyPress, key, 0);
     QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
@@ -733,7 +733,7 @@ void tst_qmlgraphicstextedit::simulateKey(QDeclarativeView *view, int key)
     QApplication::sendEvent(view, &release);
 }
 
-QDeclarativeView *tst_qmlgraphicstextedit::createView(const QString &filename)
+QDeclarativeView *tst_qdeclarativetextedit::createView(const QString &filename)
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
 
@@ -763,7 +763,7 @@ public:
     bool softwareInputPanelEventReceived;
 };
 
-void tst_qmlgraphicstextedit::sendRequestSoftwareInputPanelEvent()
+void tst_qdeclarativetextedit::sendRequestSoftwareInputPanelEvent()
 {
     QGraphicsScene scene;
     QGraphicsView view(&scene);
@@ -786,6 +786,6 @@ void tst_qmlgraphicstextedit::sendRequestSoftwareInputPanelEvent()
     QApplication::processEvents();
     QCOMPARE(ic.softwareInputPanelEventReceived, true);
 }
-QTEST_MAIN(tst_qmlgraphicstextedit)
+QTEST_MAIN(tst_qdeclarativetextedit)
 
 #include "tst_qdeclarativetextedit.moc"
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 5b98455..8b513e8 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -48,12 +48,12 @@
 #include <QStyle>
 #include <QInputContext>
 
-class tst_qmlgraphicstextinput : public QObject
+class tst_qdeclarativetextinput : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicstextinput();
+    tst_qdeclarativetextinput();
 
 private slots:
     void text();
@@ -82,7 +82,7 @@ private:
     QStringList colorStrings;
 };
 
-tst_qmlgraphicstextinput::tst_qmlgraphicstextinput()
+tst_qdeclarativetextinput::tst_qdeclarativetextinput()
 {
     standard << "the quick brown fox jumped over the lazy dog"
         << "It's supercalifragisiticexpialidocious!"
@@ -102,7 +102,7 @@ tst_qmlgraphicstextinput::tst_qmlgraphicstextinput()
                  << "#2AC05F";
 }
 
-void tst_qmlgraphicstextinput::text()
+void tst_qdeclarativetextinput::text()
 {
     {
         QDeclarativeComponent textinputComponent(&engine);
@@ -126,7 +126,7 @@ void tst_qmlgraphicstextinput::text()
 
 }
 
-void tst_qmlgraphicstextinput::width()
+void tst_qdeclarativetextinput::width()
 {
     // uses Font metrics to find the width for standard
     {
@@ -154,7 +154,7 @@ void tst_qmlgraphicstextinput::width()
     }
 }
 
-void tst_qmlgraphicstextinput::font()
+void tst_qdeclarativetextinput::font()
 {
     //test size, then bold, then italic, then family
     { 
@@ -214,7 +214,7 @@ void tst_qmlgraphicstextinput::font()
     }
 }
 
-void tst_qmlgraphicstextinput::color()
+void tst_qdeclarativetextinput::color()
 {
     //test color
     for (int i = 0; i < colorStrings.size(); i++)
@@ -264,7 +264,7 @@ void tst_qmlgraphicstextinput::color()
     }
 }
 
-void tst_qmlgraphicstextinput::selection()
+void tst_qdeclarativetextinput::selection()
 {
     QString testStr = standard[0];
     QString componentStr = "import Qt 4.6\nTextInput {  text: \""+ testStr +"\"; }";
@@ -345,7 +345,7 @@ void tst_qmlgraphicstextinput::selection()
     QVERIFY(textinputObject->selectedText().size() == 10);
 }
 
-void tst_qmlgraphicstextinput::maxLength()
+void tst_qdeclarativetextinput::maxLength()
 {
     //QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
     QDeclarativeView *canvas = createView(SRCDIR "/data/maxLength.qml");
@@ -372,7 +372,7 @@ void tst_qmlgraphicstextinput::maxLength()
     }
 }
 
-void tst_qmlgraphicstextinput::masks()
+void tst_qdeclarativetextinput::masks()
 {
     //Not a comprehensive test of the possible masks, that's done elsewhere (QLineEdit)
     //QString componentStr = "import Qt 4.6\nTextInput {  inputMask: 'HHHHhhhh'; }";
@@ -394,7 +394,7 @@ void tst_qmlgraphicstextinput::masks()
     }
 }
 
-void tst_qmlgraphicstextinput::validators()
+void tst_qdeclarativetextinput::validators()
 {
     // Note that this test assumes that the validators are working properly
     // so you may need to run their tests first. All validators are checked
@@ -487,7 +487,7 @@ void tst_qmlgraphicstextinput::validators()
     QCOMPARE(strInput->hasAcceptableInput(), true);
 }
 
-void tst_qmlgraphicstextinput::inputMethodHints()
+void tst_qdeclarativetextinput::inputMethodHints()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
     canvas->show();
@@ -506,7 +506,7 @@ TextInput element should only handle left/right keys until the cursor reaches
 the extent of the text, then they should ignore the keys.
 
 */
-void tst_qmlgraphicstextinput::navigation()
+void tst_qdeclarativetextinput::navigation()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml");
     canvas->show();
@@ -538,7 +538,7 @@ void tst_qmlgraphicstextinput::navigation()
     QVERIFY(input->hasFocus() == true);
 }
 
-void tst_qmlgraphicstextinput::cursorDelegate()
+void tst_qdeclarativetextinput::cursorDelegate()
 {
     QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml");
     view->show();
@@ -565,7 +565,7 @@ void tst_qmlgraphicstextinput::cursorDelegate()
     QVERIFY(!textInputObject->findChild<QDeclarativeItem*>("cursorInstance"));
 }
 
-void tst_qmlgraphicstextinput::readOnly()
+void tst_qdeclarativetextinput::readOnly()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml");
     canvas->show();
@@ -587,7 +587,7 @@ void tst_qmlgraphicstextinput::readOnly()
     QCOMPARE(input->text(), initial);
 }
 
-void tst_qmlgraphicstextinput::simulateKey(QDeclarativeView *view, int key)
+void tst_qdeclarativetextinput::simulateKey(QDeclarativeView *view, int key)
 {
     QKeyEvent press(QKeyEvent::KeyPress, key, 0);
     QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
@@ -596,7 +596,7 @@ void tst_qmlgraphicstextinput::simulateKey(QDeclarativeView *view, int key)
     QApplication::sendEvent(view, &release);
 }
 
-QDeclarativeView *tst_qmlgraphicstextinput::createView(const QString &filename)
+QDeclarativeView *tst_qdeclarativetextinput::createView(const QString &filename)
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
 
@@ -627,7 +627,7 @@ public:
     bool softwareInputPanelEventReceived;
 };
 
-void tst_qmlgraphicstextinput::sendRequestSoftwareInputPanelEvent()
+void tst_qdeclarativetextinput::sendRequestSoftwareInputPanelEvent()
 {
     QGraphicsScene scene;
     QGraphicsView view(&scene);
@@ -651,6 +651,6 @@ void tst_qmlgraphicstextinput::sendRequestSoftwareInputPanelEvent()
     QCOMPARE(ic.softwareInputPanelEventReceived, true);
 }
 
-QTEST_MAIN(tst_qmlgraphicstextinput)
+QTEST_MAIN(tst_qdeclarativetextinput)
 
 #include "tst_qdeclarativetextinput.moc"
diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
index 62c9e91..b120d5d 100644
--- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
+++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
@@ -44,11 +44,11 @@
 #include <private/qdeclarativetimer_p.h>
 #include <QDebug>
 
-class tst_qmltimer : public QObject
+class tst_qdeclarativetimer : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmltimer();
+    tst_qdeclarativetimer();
 
 private slots:
     void notRepeating();
@@ -84,11 +84,11 @@ public slots:
 #define TIMEOUT_TIMEOUT 200
 #endif
 
-tst_qmltimer::tst_qmltimer()
+tst_qdeclarativetimer::tst_qdeclarativetimer()
 {
 }
 
-void tst_qmltimer::notRepeating()
+void tst_qdeclarativetimer::notRepeating()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -109,7 +109,7 @@ void tst_qmltimer::notRepeating()
     QVERIFY(timer->isRunning() == false);
 }
 
-void tst_qmltimer::notRepeatingStart()
+void tst_qdeclarativetimer::notRepeatingStart()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -134,7 +134,7 @@ void tst_qmltimer::notRepeatingStart()
     delete timer;
 }
 
-void tst_qmltimer::repeat()
+void tst_qdeclarativetimer::repeat()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -164,7 +164,7 @@ void tst_qmltimer::repeat()
     delete timer;
 }
 
-void tst_qmltimer::triggeredOnStart()
+void tst_qdeclarativetimer::triggeredOnStart()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -187,7 +187,7 @@ void tst_qmltimer::triggeredOnStart()
     delete timer;
 }
 
-void tst_qmltimer::triggeredOnStartRepeat()
+void tst_qdeclarativetimer::triggeredOnStartRepeat()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -210,7 +210,7 @@ void tst_qmltimer::triggeredOnStartRepeat()
     delete timer;
 }
 
-void tst_qmltimer::noTriggerIfNotRunning()
+void tst_qdeclarativetimer::noTriggerIfNotRunning()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -229,7 +229,7 @@ void tst_qmltimer::noTriggerIfNotRunning()
     delete item;
 }
 
-void tst_qmltimer::changeDuration()
+void tst_qdeclarativetimer::changeDuration()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -253,7 +253,7 @@ void tst_qmltimer::changeDuration()
     delete timer;
 }
 
-void tst_qmltimer::restart()
+void tst_qdeclarativetimer::restart()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
@@ -280,6 +280,6 @@ void tst_qmltimer::restart()
     delete timer;
 }
 
-QTEST_MAIN(tst_qmltimer)
+QTEST_MAIN(tst_qdeclarativetimer)
 
 #include "tst_qdeclarativetimer.moc"
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
index e53ac91..69646b9 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
@@ -46,11 +46,11 @@
 #include <private/qdeclarativevaluetype_p.h>
 #include "testtypes.h"
 
-class tst_qmlvaluetypes : public QObject
+class tst_qdeclarativevaluetypes : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlvaluetypes() {}
+    tst_qdeclarativevaluetypes() {}
 
 private slots:
     void initTestCase();
@@ -82,7 +82,7 @@ private:
     QDeclarativeEngine engine;
 };
 
-void tst_qmlvaluetypes::initTestCase()
+void tst_qdeclarativevaluetypes::initTestCase()
 {
     registerTypes();
 }
@@ -92,7 +92,7 @@ inline QUrl TEST_FILE(const QString &filename)
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
 }
 
-void tst_qmlvaluetypes::point()
+void tst_qdeclarativevaluetypes::point()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("point_read.qml"));
@@ -117,7 +117,7 @@ void tst_qmlvaluetypes::point()
     }
 }
 
-void tst_qmlvaluetypes::pointf()
+void tst_qdeclarativevaluetypes::pointf()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("pointf_read.qml"));
@@ -142,7 +142,7 @@ void tst_qmlvaluetypes::pointf()
     }
 }
 
-void tst_qmlvaluetypes::size()
+void tst_qdeclarativevaluetypes::size()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("size_read.qml"));
@@ -167,7 +167,7 @@ void tst_qmlvaluetypes::size()
     }
 }
 
-void tst_qmlvaluetypes::sizef()
+void tst_qdeclarativevaluetypes::sizef()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("sizef_read.qml"));
@@ -192,7 +192,7 @@ void tst_qmlvaluetypes::sizef()
     }
 }
 
-void tst_qmlvaluetypes::rect()
+void tst_qdeclarativevaluetypes::rect()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("rect_read.qml"));
@@ -219,7 +219,7 @@ void tst_qmlvaluetypes::rect()
     }
 }
 
-void tst_qmlvaluetypes::rectf()
+void tst_qdeclarativevaluetypes::rectf()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("rectf_read.qml"));
@@ -246,7 +246,7 @@ void tst_qmlvaluetypes::rectf()
     }
 }
 
-void tst_qmlvaluetypes::vector3d()
+void tst_qdeclarativevaluetypes::vector3d()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("vector3d_read.qml"));
@@ -272,7 +272,7 @@ void tst_qmlvaluetypes::vector3d()
     }
 }
 
-void tst_qmlvaluetypes::font()
+void tst_qdeclarativevaluetypes::font()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("font_read.qml"));
@@ -345,7 +345,7 @@ void tst_qmlvaluetypes::font()
 }
 
 // Test bindings can write to value types
-void tst_qmlvaluetypes::bindingAssignment()
+void tst_qdeclarativevaluetypes::bindingAssignment()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("bindingAssignment.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
@@ -361,7 +361,7 @@ void tst_qmlvaluetypes::bindingAssignment()
 }
 
 // Test bindings can read from value types
-void tst_qmlvaluetypes::bindingRead()
+void tst_qdeclarativevaluetypes::bindingRead()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("bindingRead.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
@@ -377,7 +377,7 @@ void tst_qmlvaluetypes::bindingRead()
 }
 
 // Test static values can assign to value types
-void tst_qmlvaluetypes::staticAssignment()
+void tst_qdeclarativevaluetypes::staticAssignment()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("staticAssignment.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
@@ -389,7 +389,7 @@ void tst_qmlvaluetypes::staticAssignment()
 }
 
 // Test scripts can read/write value types
-void tst_qmlvaluetypes::scriptAccess()
+void tst_qdeclarativevaluetypes::scriptAccess()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("scriptAccess.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
@@ -403,7 +403,7 @@ void tst_qmlvaluetypes::scriptAccess()
 }
 
 // Test that assigning a constant from script removes any binding
-void tst_qmlvaluetypes::autoBindingRemoval()
+void tst_qdeclarativevaluetypes::autoBindingRemoval()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.qml"));
@@ -474,7 +474,7 @@ void tst_qmlvaluetypes::autoBindingRemoval()
 }
 
 // Test that property value sources assign to value types
-void tst_qmlvaluetypes::valueSources()
+void tst_qdeclarativevaluetypes::valueSources()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("valueSources.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
@@ -497,7 +497,7 @@ static void checkNoErrors(QDeclarativeComponent& component)
 }
 
 // Test that property value interceptors can be applied to value types
-void tst_qmlvaluetypes::valueInterceptors()
+void tst_qdeclarativevaluetypes::valueInterceptors()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("valueInterceptors.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
@@ -515,7 +515,7 @@ void tst_qmlvaluetypes::valueInterceptors()
 }
 
 // Test that you can't assign a binding to the "root" value type, and a sub-property
-void tst_qmlvaluetypes::bindingConflict()
+void tst_qdeclarativevaluetypes::bindingConflict()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("bindingConflict.qml"));
     QCOMPARE(component.isError(), true);
@@ -532,7 +532,7 @@ void tst_qmlvaluetypes::bindingConflict()
 
 // Test that accessing a reference to a valuetype after the owning object is deleted
 // doesn't crash
-void tst_qmlvaluetypes::deletedObject()
+void tst_qdeclarativevaluetypes::deletedObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml"));
     QTest::ignoreMessage(QtDebugMsg, "Test: 2");
@@ -550,7 +550,7 @@ void tst_qmlvaluetypes::deletedObject()
 }
 
 // Test that value types can be assigned to another value type property in a binding
-void tst_qmlvaluetypes::bindingVariantCopy()
+void tst_qdeclarativevaluetypes::bindingVariantCopy()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("bindingVariantCopy.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
@@ -562,7 +562,7 @@ void tst_qmlvaluetypes::bindingVariantCopy()
 }
 
 // Test that value types can be assigned to another value type property in script
-void tst_qmlvaluetypes::scriptVariantCopy()
+void tst_qdeclarativevaluetypes::scriptVariantCopy()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("scriptVariantCopy.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
@@ -579,7 +579,7 @@ void tst_qmlvaluetypes::scriptVariantCopy()
 
 
 // Test that the value type classes can be used manually
-void tst_qmlvaluetypes::cppClasses()
+void tst_qdeclarativevaluetypes::cppClasses()
 {
     CPP_TEST(QDeclarativePointValueType, QPoint(19, 33));
     CPP_TEST(QDeclarativePointFValueType, QPointF(33.6, -23));
@@ -592,7 +592,7 @@ void tst_qmlvaluetypes::cppClasses()
 
 }
 
-void tst_qmlvaluetypes::enums()
+void tst_qdeclarativevaluetypes::enums()
 {
     {
     QDeclarativeComponent component(&engine, TEST_FILE("enums.1.qml"));
@@ -611,6 +611,6 @@ void tst_qmlvaluetypes::enums()
     }
 }
 
-QTEST_MAIN(tst_qmlvaluetypes)
+QTEST_MAIN(tst_qdeclarativevaluetypes)
 
 #include "tst_qdeclarativevaluetypes.moc"
diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
index aa5b8e3..2634825 100644
--- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
+++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -53,11 +53,11 @@
 #include <QtGui/qpainter.h>
 #include "testtypes.h"
 
-class tst_qmlgraphicswebview : public QObject
+class tst_qdeclarativewebview : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlgraphicswebview() {}
+    tst_qdeclarativewebview() {}
 
 private slots:
     void initTestCase();
@@ -81,13 +81,13 @@ private:
     QDeclarativeEngine engine;
     QString tmpDir() const
     {
-        static QString tmpd = QDir::tempPath()+"/tst_qmlgraphicswebview-"
+        static QString tmpd = QDir::tempPath()+"/tst_qdeclarativewebview-"
             + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
         return tmpd;
     }
 };
 
-void tst_qmlgraphicswebview::initTestCase()
+void tst_qdeclarativewebview::initTestCase()
 {
     registerTypes();
 }
@@ -118,12 +118,12 @@ static void removeRecursive(const QString& dirname)
     QDir().rmdir(dirname);
 }
 
-void tst_qmlgraphicswebview::cleanupTestCase()
+void tst_qdeclarativewebview::cleanupTestCase()
 {
     removeRecursive(tmpDir());
 }
 
-void tst_qmlgraphicswebview::checkNoErrors(const QDeclarativeComponent& component)
+void tst_qdeclarativewebview::checkNoErrors(const QDeclarativeComponent& component)
 {
     // Wait until the component is ready
     QTRY_VERIFY(component.isReady());
@@ -142,7 +142,7 @@ void tst_qmlgraphicswebview::checkNoErrors(const QDeclarativeComponent& componen
     QVERIFY(!component.isError());
 }
 
-void tst_qmlgraphicswebview::basicProperties()
+void tst_qdeclarativewebview::basicProperties()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
     checkNoErrors(component);
@@ -177,7 +177,7 @@ void tst_qmlgraphicswebview::basicProperties()
     QTRY_COMPARE(wv->progress(), 1.0);
 }
 
-void tst_qmlgraphicswebview::settings()
+void tst_qdeclarativewebview::settings()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
     checkNoErrors(component);
@@ -242,7 +242,7 @@ void tst_qmlgraphicswebview::settings()
     }
 }
 
-void tst_qmlgraphicswebview::historyNav()
+void tst_qdeclarativewebview::historyNav()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
     checkNoErrors(component);
@@ -307,7 +307,7 @@ void tst_qmlgraphicswebview::historyNav()
     QVERIFY(!wv->stopAction()->isEnabled());
 }
 
-void tst_qmlgraphicswebview::multipleWindows()
+void tst_qdeclarativewebview::multipleWindows()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/newwindows.qml"));
     checkNoErrors(component);
@@ -320,7 +320,7 @@ void tst_qmlgraphicswebview::multipleWindows()
     QTRY_COMPARE(popup->x(), 150.0);
 }
 
-void tst_qmlgraphicswebview::loadError()
+void tst_qdeclarativewebview::loadError()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/loadError.qml"));
     checkNoErrors(component);
@@ -339,7 +339,7 @@ void tst_qmlgraphicswebview::loadError()
     }
 }
 
-void tst_qmlgraphicswebview::setHtml()
+void tst_qdeclarativewebview::setHtml()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/sethtml.qml"));
     checkNoErrors(component);
@@ -352,7 +352,7 @@ void tst_qmlgraphicswebview::setHtml()
     QCOMPARE(spy.count(),1);
 }
 
-void tst_qmlgraphicswebview::elementAreaAt()
+void tst_qdeclarativewebview::elementAreaAt()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/elements.qml"));
     checkNoErrors(component);
@@ -367,7 +367,7 @@ void tst_qmlgraphicswebview::elementAreaAt()
     QCOMPARE(wv->elementAreaAt(130,30,400,400),QRect(0,0,310,100)); // Whole view
 }
 
-void tst_qmlgraphicswebview::javaScript()
+void tst_qdeclarativewebview::javaScript()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/javaScript.qml"));
     checkNoErrors(component);
@@ -379,7 +379,7 @@ void tst_qmlgraphicswebview::javaScript()
     QCOMPARE(wv->evaluateJavaScript("window.myjsname.qmlprop").toString(), QString("qmlvalue"));
 }
 
-void tst_qmlgraphicswebview::pixelCache()
+void tst_qdeclarativewebview::pixelCache()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/pixelCache.qml"));
     checkNoErrors(component);
@@ -406,7 +406,7 @@ void tst_qmlgraphicswebview::pixelCache()
     QCOMPARE(wv->pixelsPainted(), expected*3); // repainted
 }
 
-void tst_qmlgraphicswebview::newWindowParent()
+void tst_qdeclarativewebview::newWindowParent()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
     checkNoErrors(component);
@@ -434,7 +434,7 @@ void tst_qmlgraphicswebview::newWindowParent()
     QCOMPARE(newWindowParentSpy.count(),2);
 }
 
-void tst_qmlgraphicswebview::newWindowComponent()
+void tst_qdeclarativewebview::newWindowComponent()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
     checkNoErrors(component);
@@ -459,7 +459,7 @@ void tst_qmlgraphicswebview::newWindowComponent()
     QCOMPARE(newWindowComponentSpy.count(),2);
 }
 
-void tst_qmlgraphicswebview::renderingEnabled()
+void tst_qdeclarativewebview::renderingEnabled()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
     checkNoErrors(component);
@@ -483,7 +483,7 @@ void tst_qmlgraphicswebview::renderingEnabled()
     QCOMPARE(renderingEnabledSpy.count(),2);
 }
 
-void tst_qmlgraphicswebview::pressGrabTime()
+void tst_qdeclarativewebview::pressGrabTime()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
     checkNoErrors(component);
@@ -506,6 +506,6 @@ void tst_qmlgraphicswebview::pressGrabTime()
     QCOMPARE(pressGrabTimeSpy.count(),2);
 }
 
-QTEST_MAIN(tst_qmlgraphicswebview)
+QTEST_MAIN(tst_qdeclarativewebview)
 
 #include "tst_qdeclarativewebview.moc"
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
index c4ae90a..37d48fa 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
@@ -48,11 +48,11 @@
 
 #define SERVER_PORT 14445
 
-class tst_qmlxmlhttprequest : public QObject
+class tst_qdeclarativexmlhttprequest : public QObject
 {
     Q_OBJECT
 public:
-    tst_qmlxmlhttprequest() {}
+    tst_qdeclarativexmlhttprequest() {}
 
 private slots:
     void initTestCase() {
@@ -123,7 +123,7 @@ inline QUrl TEST_FILE(const QString &filename)
 }
 
 // Test that the dom exception codes are correct
-void tst_qmlxmlhttprequest::domExceptionCodes()
+void tst_qdeclarativexmlhttprequest::domExceptionCodes()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("domExceptionCodes.qml"));
     QObject *object = component.create();
@@ -160,7 +160,7 @@ void tst_qmlxmlhttprequest::domExceptionCodes()
     } while (false) 
 
 
-void tst_qmlxmlhttprequest::callbackException_data()
+void tst_qdeclarativexmlhttprequest::callbackException_data()
 {
     QTest::addColumn<QString>("which");
     QTest::addColumn<int>("line");
@@ -170,7 +170,7 @@ void tst_qmlxmlhttprequest::callbackException_data()
     QTest::newRow("on-done") << "4" << 15;
 }
 
-void tst_qmlxmlhttprequest::callbackException()
+void tst_qdeclarativexmlhttprequest::callbackException()
 {
     // Test exception reporting for exceptions thrown at various points.
 
@@ -194,7 +194,7 @@ void tst_qmlxmlhttprequest::callbackException()
 
 // Test that the state value properties on the XMLHttpRequest constructor have the correct values.
 // ### WebKit does not do this, but it seems to fit the standard and QML better
-void tst_qmlxmlhttprequest::staticStateValues()
+void tst_qdeclarativexmlhttprequest::staticStateValues()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("staticStateValues.qml"));
     QObject *object = component.create();
@@ -210,7 +210,7 @@ void tst_qmlxmlhttprequest::staticStateValues()
 }
 
 // Test that the state value properties on instances have the correct values.
-void tst_qmlxmlhttprequest::instanceStateValues()
+void tst_qdeclarativexmlhttprequest::instanceStateValues()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("instanceStateValues.qml"));
     QObject *object = component.create();
@@ -226,7 +226,7 @@ void tst_qmlxmlhttprequest::instanceStateValues()
 }
 
 // Test calling constructor 
-void tst_qmlxmlhttprequest::constructor()
+void tst_qdeclarativexmlhttprequest::constructor()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("constructor.qml"));
     QObject *object = component.create();
@@ -239,7 +239,7 @@ void tst_qmlxmlhttprequest::constructor()
 }
 
 // Test that all the properties are set correctly before any request is sent
-void tst_qmlxmlhttprequest::defaultState()
+void tst_qdeclarativexmlhttprequest::defaultState()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("defaultState.qml"));
     QObject *object = component.create();
@@ -255,7 +255,7 @@ void tst_qmlxmlhttprequest::defaultState()
 }
 
 // Test valid XMLHttpRequest.open() calls
-void tst_qmlxmlhttprequest::open()
+void tst_qdeclarativexmlhttprequest::open()
 {
     // Relative url
     {
@@ -353,7 +353,7 @@ void tst_qmlxmlhttprequest::open()
 }
 
 // Test that calling XMLHttpRequest.open() with an invalid method raises an exception
-void tst_qmlxmlhttprequest::open_invalid_method()
+void tst_qdeclarativexmlhttprequest::open_invalid_method()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("open_invalid_method.qml"));
     QObject *object = component.create();
@@ -365,7 +365,7 @@ void tst_qmlxmlhttprequest::open_invalid_method()
 }
 
 // Test that calling XMLHttpRequest.open() with sync raises an exception
-void tst_qmlxmlhttprequest::open_sync()
+void tst_qdeclarativexmlhttprequest::open_sync()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("open_sync.qml"));
     QObject *object = component.create();
@@ -377,7 +377,7 @@ void tst_qmlxmlhttprequest::open_sync()
 }
 
 // Calling with incorrect arg count raises an exception
-void tst_qmlxmlhttprequest::open_arg_count()
+void tst_qdeclarativexmlhttprequest::open_arg_count()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("open_arg_count.1.qml"));
@@ -401,7 +401,7 @@ void tst_qmlxmlhttprequest::open_arg_count()
 }
 
 // Test valid setRequestHeader() calls
-void tst_qmlxmlhttprequest::setRequestHeader()
+void tst_qdeclarativexmlhttprequest::setRequestHeader()
 {
     TestHTTPServer server(SERVER_PORT);
     QVERIFY(server.isValid());
@@ -421,7 +421,7 @@ void tst_qmlxmlhttprequest::setRequestHeader()
 }
 
 // Test setting headers before open() throws exception
-void tst_qmlxmlhttprequest::setRequestHeader_unsent()
+void tst_qdeclarativexmlhttprequest::setRequestHeader_unsent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_unsent.qml"));
     QObject *object = component.create();
@@ -432,7 +432,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_unsent()
     delete object;
 }
 
-void tst_qmlxmlhttprequest::setRequestHeader_illegalName_data()
+void tst_qdeclarativexmlhttprequest::setRequestHeader_illegalName_data()
 {
     QTest::addColumn<QString>("name");
 
@@ -461,7 +461,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_illegalName_data()
 }
 
 // Tests that using illegal header names has no effect
-void tst_qmlxmlhttprequest::setRequestHeader_illegalName()
+void tst_qdeclarativexmlhttprequest::setRequestHeader_illegalName()
 {
     QFETCH(QString, name);
 
@@ -491,7 +491,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_illegalName()
 }
 
 // Test that attempting to set a header after a request is sent throws an exception
-void tst_qmlxmlhttprequest::setRequestHeader_sent()
+void tst_qdeclarativexmlhttprequest::setRequestHeader_sent()
 {
     TestHTTPServer server(SERVER_PORT);
     QVERIFY(server.isValid());
@@ -513,7 +513,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_sent()
 }
 
 // Invalid arg count throws exception
-void tst_qmlxmlhttprequest::setRequestHeader_args()
+void tst_qdeclarativexmlhttprequest::setRequestHeader_args()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_args.qml"));
     QObject *object = component.create();
@@ -525,7 +525,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_args()
 }
 
 // Test that calling send() in UNSENT state throws an exception
-void tst_qmlxmlhttprequest::send_unsent()
+void tst_qdeclarativexmlhttprequest::send_unsent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("send_unsent.qml"));
     QObject *object = component.create();
@@ -537,7 +537,7 @@ void tst_qmlxmlhttprequest::send_unsent()
 }
 
 // Test attempting to resend a sent request throws an exception
-void tst_qmlxmlhttprequest::send_alreadySent()
+void tst_qdeclarativexmlhttprequest::send_alreadySent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("send_alreadySent.qml"));
     QObject *object = component.create();
@@ -550,7 +550,7 @@ void tst_qmlxmlhttprequest::send_alreadySent()
 }
 
 // Test that send for a GET or HEAD ignores data
-void tst_qmlxmlhttprequest::send_ignoreData()
+void tst_qdeclarativexmlhttprequest::send_ignoreData()
 {
     {
         TestHTTPServer server(SERVER_PORT);
@@ -592,7 +592,7 @@ void tst_qmlxmlhttprequest::send_ignoreData()
 }
 
 // Test that send()'ing data works
-void tst_qmlxmlhttprequest::send_withdata()
+void tst_qdeclarativexmlhttprequest::send_withdata()
 {
     // No content-type
     {
@@ -729,7 +729,7 @@ void tst_qmlxmlhttprequest::send_withdata()
 }
 
 // Test abort() has no effect in unsent state
-void tst_qmlxmlhttprequest::abort_unsent()
+void tst_qdeclarativexmlhttprequest::abort_unsent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("abort_unsent.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
@@ -750,7 +750,7 @@ void tst_qmlxmlhttprequest::abort_unsent()
 }
 
 // Test abort() cancels an open (but unsent) request
-void tst_qmlxmlhttprequest::abort_opened()
+void tst_qdeclarativexmlhttprequest::abort_opened()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("abort_opened.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
@@ -771,7 +771,7 @@ void tst_qmlxmlhttprequest::abort_opened()
 }
 
 // Test abort() aborts in progress send
-void tst_qmlxmlhttprequest::abort()
+void tst_qdeclarativexmlhttprequest::abort()
 {
     TestHTTPServer server(SERVER_PORT);
     QVERIFY(server.isValid());
@@ -795,7 +795,7 @@ void tst_qmlxmlhttprequest::abort()
     delete object;
 }
 
-void tst_qmlxmlhttprequest::getResponseHeader()
+void tst_qdeclarativexmlhttprequest::getResponseHeader()
 {
     QDeclarativeEngine engine; // Avoid cookie contamination
 
@@ -835,7 +835,7 @@ void tst_qmlxmlhttprequest::getResponseHeader()
 }
 
 // Test getResponseHeader throws an exception in an invalid state
-void tst_qmlxmlhttprequest::getResponseHeader_unsent()
+void tst_qdeclarativexmlhttprequest::getResponseHeader_unsent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_unsent.qml"));
     QObject *object = component.create();
@@ -847,7 +847,7 @@ void tst_qmlxmlhttprequest::getResponseHeader_unsent()
 }
 
 // Test getResponseHeader throws an exception in an invalid state
-void tst_qmlxmlhttprequest::getResponseHeader_sent()
+void tst_qdeclarativexmlhttprequest::getResponseHeader_sent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_sent.qml"));
     QObject *object = component.create();
@@ -859,7 +859,7 @@ void tst_qmlxmlhttprequest::getResponseHeader_sent()
 }
 
 // Invalid arg count throws exception
-void tst_qmlxmlhttprequest::getResponseHeader_args()
+void tst_qdeclarativexmlhttprequest::getResponseHeader_args()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_args.qml"));
     QObject *object = component.create();
@@ -870,7 +870,7 @@ void tst_qmlxmlhttprequest::getResponseHeader_args()
     delete object;
 }
 
-void tst_qmlxmlhttprequest::getAllResponseHeaders()
+void tst_qdeclarativexmlhttprequest::getAllResponseHeaders()
 {
     QDeclarativeEngine engine; // Avoid cookie contamination
 
@@ -903,7 +903,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders()
 }
 
 // Test getAllResponseHeaders throws an exception in an invalid state
-void tst_qmlxmlhttprequest::getAllResponseHeaders_unsent()
+void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_unsent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_unsent.qml"));
     QObject *object = component.create();
@@ -915,7 +915,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders_unsent()
 }
 
 // Test getAllResponseHeaders throws an exception in an invalid state
-void tst_qmlxmlhttprequest::getAllResponseHeaders_sent()
+void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_sent()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_sent.qml"));
     QObject *object = component.create();
@@ -927,7 +927,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders_sent()
 }
 
 // Invalid arg count throws exception
-void tst_qmlxmlhttprequest::getAllResponseHeaders_args()
+void tst_qdeclarativexmlhttprequest::getAllResponseHeaders_args()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_args.qml"));
     QObject *object = component.create();
@@ -938,7 +938,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders_args()
     delete object;
 }
 
-void tst_qmlxmlhttprequest::status()
+void tst_qdeclarativexmlhttprequest::status()
 {
     {
         TestHTTPServer server(SERVER_PORT);
@@ -995,7 +995,7 @@ void tst_qmlxmlhttprequest::status()
     }
 }
 
-void tst_qmlxmlhttprequest::statusText()
+void tst_qdeclarativexmlhttprequest::statusText()
 {
     {
         TestHTTPServer server(SERVER_PORT);
@@ -1052,7 +1052,7 @@ void tst_qmlxmlhttprequest::statusText()
     }
 }
 
-void tst_qmlxmlhttprequest::responseText()
+void tst_qdeclarativexmlhttprequest::responseText()
 {
     {
         TestHTTPServer server(SERVER_PORT);
@@ -1138,7 +1138,7 @@ void tst_qmlxmlhttprequest::responseText()
 
 // Test that calling hte XMLHttpRequest methods on a non-XMLHttpRequest object
 // throws an exception
-void tst_qmlxmlhttprequest::invalidMethodUsage()
+void tst_qdeclarativexmlhttprequest::invalidMethodUsage()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("invalidMethodUsage.qml"));
     QObject *object = component.create();
@@ -1162,7 +1162,7 @@ void tst_qmlxmlhttprequest::invalidMethodUsage()
 }
 
 // Test that XMLHttpRequest transparently redirects
-void tst_qmlxmlhttprequest::redirects()
+void tst_qdeclarativexmlhttprequest::redirects()
 {
     {
         TestHTTPServer server(SERVER_PORT);
@@ -1227,7 +1227,7 @@ void tst_qmlxmlhttprequest::redirects()
     }
 }
 
-void tst_qmlxmlhttprequest::responseXML_invalid()
+void tst_qdeclarativexmlhttprequest::responseXML_invalid()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("responseXML_invalid.qml"));
     QObject *object = component.create();
@@ -1241,7 +1241,7 @@ void tst_qmlxmlhttprequest::responseXML_invalid()
 }
 
 // Test the Document DOM element
-void tst_qmlxmlhttprequest::document()
+void tst_qdeclarativexmlhttprequest::document()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("document.qml"));
     QObject *object = component.create();
@@ -1255,7 +1255,7 @@ void tst_qmlxmlhttprequest::document()
 }
 
 // Test the Element DOM element
-void tst_qmlxmlhttprequest::element()
+void tst_qdeclarativexmlhttprequest::element()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("element.qml"));
     QObject *object = component.create();
@@ -1269,7 +1269,7 @@ void tst_qmlxmlhttprequest::element()
 }
 
 // Test the Attr DOM element
-void tst_qmlxmlhttprequest::attr()
+void tst_qdeclarativexmlhttprequest::attr()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("attr.qml"));
     QObject *object = component.create();
@@ -1283,7 +1283,7 @@ void tst_qmlxmlhttprequest::attr()
 }
 
 // Test the Text DOM element
-void tst_qmlxmlhttprequest::text()
+void tst_qdeclarativexmlhttprequest::text()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("text.qml"));
     QObject *object = component.create();
@@ -1297,7 +1297,7 @@ void tst_qmlxmlhttprequest::text()
 }
 
 // Test the CDataSection DOM element
-void tst_qmlxmlhttprequest::cdata()
+void tst_qdeclarativexmlhttprequest::cdata()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("cdata.qml"));
     QObject *object = component.create();
@@ -1310,6 +1310,6 @@ void tst_qmlxmlhttprequest::cdata()
     delete object;
 }
 
-QTEST_MAIN(tst_qmlxmlhttprequest)
+QTEST_MAIN(tst_qdeclarativexmlhttprequest)
 
 #include "tst_qdeclarativexmlhttprequest.moc"
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index 9ef1298..e19e03d 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -54,12 +54,12 @@ typedef QList<QVariantList> QDeclarativeXmlModelData;
 Q_DECLARE_METATYPE(QList<QDeclarativeXmlListRange>)
 Q_DECLARE_METATYPE(QDeclarativeXmlModelData)
 
-class tst_qmlxmllistmodel : public QObject
+class tst_qdeclarativexmllistmodel : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qmlxmllistmodel() {}
+    tst_qdeclarativexmllistmodel() {}
 
 private slots:
     void buildModel();
@@ -113,7 +113,7 @@ private:
     QDeclarativeEngine engine;
 };
 
-void tst_qmlxmllistmodel::buildModel()
+void tst_qdeclarativexmllistmodel::buildModel()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
     QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
@@ -132,7 +132,7 @@ void tst_qmlxmllistmodel::buildModel()
     delete listModel;
 }
 
-void tst_qmlxmllistmodel::missingFields()
+void tst_qdeclarativexmllistmodel::missingFields()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model2.qml"));
     QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
@@ -153,7 +153,7 @@ void tst_qmlxmllistmodel::missingFields()
     delete listModel;
 }
 
-void tst_qmlxmllistmodel::cdata()
+void tst_qdeclarativexmllistmodel::cdata()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
     QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
@@ -169,7 +169,7 @@ void tst_qmlxmllistmodel::cdata()
     delete listModel;
 }
 
-void tst_qmlxmllistmodel::attributes()
+void tst_qdeclarativexmllistmodel::attributes()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
     QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
@@ -185,7 +185,7 @@ void tst_qmlxmllistmodel::attributes()
     delete listModel;
 }
 
-void tst_qmlxmllistmodel::roles()
+void tst_qdeclarativexmllistmodel::roles()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
     QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
@@ -202,7 +202,7 @@ void tst_qmlxmllistmodel::roles()
     delete listModel;
 }
 
-void tst_qmlxmllistmodel::roleErrors()
+void tst_qdeclarativexmllistmodel::roleErrors()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml"));
     QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml").toString() + ":6:5) An XmlRole query must not start with '/'").toUtf8().constData());
@@ -227,7 +227,7 @@ void tst_qmlxmllistmodel::roleErrors()
     delete listModel;
 }
 
-void tst_qmlxmllistmodel::uniqueRoleNames()
+void tst_qdeclarativexmllistmodel::uniqueRoleNames()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/unique.qml"));
     QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/unique.qml").toString() + ":7:5) \"name\" duplicates a previous role name and will be disabled.").toUtf8().constData());
@@ -241,7 +241,7 @@ void tst_qmlxmllistmodel::uniqueRoleNames()
     delete listModel;
 }
 
-void tst_qmlxmllistmodel::useKeys()
+void tst_qdeclarativexmllistmodel::useKeys()
 {
     // If using incremental updates through keys, the model should only
     // insert & remove some of the items, instead of throwing everything
@@ -294,7 +294,7 @@ void tst_qmlxmllistmodel::useKeys()
     }
 }
 
-void tst_qmlxmllistmodel::useKeys_data()
+void tst_qdeclarativexmllistmodel::useKeys_data()
 {
     QTest::addColumn<QString>("oldXml");
     QTest::addColumn<int>("oldCount");
@@ -376,7 +376,7 @@ void tst_qmlxmllistmodel::useKeys_data()
         << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2));
 }
 
-void tst_qmlxmllistmodel::noKeysValueChanges()
+void tst_qdeclarativexmllistmodel::noKeysValueChanges()
 {
     // The 'key' roles are 'name' and 'age', as defined in roleKeys.qml.
     // If a 'sport' value is changed, the model should not be reloaded,
@@ -414,7 +414,7 @@ void tst_qmlxmllistmodel::noKeysValueChanges()
     QCOMPARE(model->count(), 2);
 }
 
-void tst_qmlxmllistmodel::keysChanged()
+void tst_qdeclarativexmllistmodel::keysChanged()
 {
     // If the key roles change, the next time the data is reloaded, it should
     // delete all its data and build a clean model (i.e. same behaviour as
@@ -448,7 +448,7 @@ void tst_qmlxmllistmodel::keysChanged()
     QCOMPARE(spyCount.count(), 0);
 }
 
-QTEST_MAIN(tst_qmlxmllistmodel)
+QTEST_MAIN(tst_qdeclarativexmllistmodel)
 
 #include "tst_qdeclarativexmllistmodel.moc"
 
diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/shared/debugutil.cpp
index c12df4f..66f04e5 100644
--- a/tests/auto/declarative/shared/debugutil.cpp
+++ b/tests/auto/declarative/shared/debugutil.cpp
@@ -105,7 +105,7 @@ QByteArray QDeclarativeDebugTestClient::waitForResponse()
     lastMsg.clear();
     QDeclarativeDebugTest::waitForSignal(this, SIGNAL(serverMessage(QByteArray)));
     if (lastMsg.isEmpty()) {
-        qWarning() << "tst_QmlDebugClient: no response from server!";
+        qWarning() << "tst_QDeclarativeDebugClient: no response from server!";
         return QByteArray();
     }
     return lastMsg;
@@ -118,12 +118,12 @@ void QDeclarativeDebugTestClient::messageReceived(const QByteArray &ba)
 }
 
 
-tst_QmlDebug_Thread::tst_QmlDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory)
+tst_QDeclarativeDebug_Thread::tst_QDeclarativeDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory)
     : m_data(data), m_factory(factory)
 {
 }
 
-void tst_QmlDebug_Thread::run()
+void tst_QDeclarativeDebug_Thread::run()
 {
     bool ok = false;
 
@@ -153,7 +153,7 @@ int QDeclarativeDebugTest::runTests(QDeclarativeTestFactory *factory, const QLis
     QEventLoop loop;
     QDeclarativeDebugTestData data(&loop);
 
-    tst_QmlDebug_Thread thread(&data, factory);
+    tst_QDeclarativeDebug_Thread thread(&data, factory);
     QObject::connect(&thread, SIGNAL(testsFinished(int)), &data, SLOT(testsFinished(int)));
     
     QDeclarativeDebugService::notifyOnServerStart(&thread, "start");
diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/shared/debugutil_p.h
index 3aaa9db..c152b5a 100644
--- a/tests/auto/declarative/shared/debugutil_p.h
+++ b/tests/auto/declarative/shared/debugutil_p.h
@@ -131,11 +131,11 @@ private:
     QByteArray lastMsg;
 };
 
-class tst_QmlDebug_Thread : public QThread
+class tst_QDeclarativeDebug_Thread : public QThread
 {
     Q_OBJECT
 public:
-    tst_QmlDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory);
+    tst_QDeclarativeDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory);
 
     void run();
 
-- 
cgit v0.12


From fcfb08e40264c3417da91f4e187758d85f190a4f Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Wed, 24 Feb 2010 15:17:14 +1000
Subject: Make compile following renaming of class.

---
 .../auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 72e0437..9d68ba9 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -514,7 +514,7 @@ void tst_qdeclarativelanguage::idProperty()
 
 // Tests automatic connection to notify signals if "onBlahChanged" syntax is used
 // even if the notify signal for "blah" is not called "blahChanged"
-void tst_qmllanguage::autoNotifyConnection()
+void tst_qdeclarativelanguage::autoNotifyConnection()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("autoNotifyConnection.qml"));
     VERIFY_ERRORS(0);
-- 
cgit v0.12


From 915ab7d8c75a190003db97bc0a92656ee65f5b4b Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Wed, 24 Feb 2010 14:26:43 +1000
Subject: Removed unnecessary update calls in qmlgraphicsitem

Reviewed-by: akennedy
---
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 5dd44fa..3db60ee 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -2604,7 +2604,6 @@ void QDeclarativeItem::setWidth(qreal w)
 
     prepareGeometryChange();
     d->width = w;
-    update();
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), oldWidth, height()));
@@ -2641,7 +2640,6 @@ void QDeclarativeItem::setImplicitWidth(qreal w)
 
     prepareGeometryChange();
     d->width = w;
-    update();
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), oldWidth, height()));
@@ -2676,7 +2674,6 @@ void QDeclarativeItem::setHeight(qreal h)
 
     prepareGeometryChange();
     d->height = h;
-    update();
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), width(), oldHeight));
@@ -2713,7 +2710,6 @@ void QDeclarativeItem::setImplicitHeight(qreal h)
 
     prepareGeometryChange();
     d->height = h;
-    update();
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), width(), oldHeight));
-- 
cgit v0.12


From 8848b63187cf1b073891bdd6998273a8869bb033 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 24 Feb 2010 15:23:23 +1000
Subject: Add an "asynchonous" property to Image. Allows loading/decoding local
 images in an asynchronous thread (already the case for network images).

---
 examples/declarative/scrollbar/display.qml         |   1 +
 .../graphicsitems/qdeclarativeborderimage.cpp      |  60 +++++++++---
 .../graphicsitems/qdeclarativeborderimage_p.h      |   3 +
 .../graphicsitems/qdeclarativeimage.cpp            |  15 +++
 .../graphicsitems/qdeclarativeimagebase.cpp        |  42 +++++++--
 .../graphicsitems/qdeclarativeimagebase_p.h        |   7 ++
 .../graphicsitems/qdeclarativeimagebase_p_p.h      |   6 +-
 src/declarative/util/qdeclarativepixmapcache.cpp   | 101 ++++++++++++++-------
 src/declarative/util/qdeclarativepixmapcache_p.h   |   2 +-
 .../declarative/qdeclarativeimage/data/colors1.png | Bin 0 -> 1655 bytes
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp    |  18 ++--
 11 files changed, 191 insertions(+), 64 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativeimage/data/colors1.png

diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index 536a8b7..a96db6e 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -10,6 +10,7 @@ Rectangle {
         Image {
             id: picture
             source: "pics/niagara_falls.jpg"
+            asynchronous: true
         }
         viewportWidth: picture.width
         viewportHeight: picture.height
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 1f26338..de16668 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -168,18 +168,26 @@ void QDeclarativeBorderImage::setSource(const QUrl &url)
 
     d->url = url;
     d->sciurl = QUrl();
+    emit sourceChanged(d->url);
+
+    if (isComponentComplete())
+        load();
+}
+
+void QDeclarativeBorderImage::load()
+{
+    Q_D(QDeclarativeBorderImage);
     if (d->progress != 0.0) {
         d->progress = 0.0;
         emit progressChanged(d->progress);
     }
 
-    if (url.isEmpty()) {
+    if (d->url.isEmpty()) {
         d->pix = QPixmap();
         d->status = Null;
         setImplicitWidth(0);
         setImplicitHeight(0);
         emit statusChanged(d->status);
-        emit sourceChanged(d->url);
         update();
     } else {
         d->status = Loading;
@@ -195,11 +203,21 @@ void QDeclarativeBorderImage::setSource(const QUrl &url)
             {
                 QNetworkRequest req(d->url);
                 d->sciReply = qmlEngine(this)->networkAccessManager()->get(req);
-                QObject::connect(d->sciReply, SIGNAL(finished()),
-                                 this, SLOT(sciRequestFinished()));
+
+                static int sciReplyFinished = -1;
+                static int thisSciRequestFinished = -1;
+                if (sciReplyFinished == -1) {
+                    sciReplyFinished =
+                        QNetworkReply::staticMetaObject.indexOfSignal("finished()");
+                    thisSciRequestFinished =
+                        QDeclarativeBorderImage::staticMetaObject.indexOfSlot("sciRequestFinished()");
+                }
+
+                QMetaObject::connect(d->sciReply, sciReplyFinished, this,
+                                     thisSciRequestFinished, Qt::DirectConnection);
             }
         } else {
-            QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->url, &d->pix);
+            QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->url, &d->pix, d->async);
             if (status != QDeclarativePixmapReply::Ready && status != QDeclarativePixmapReply::Error) {
                 QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(qmlEngine(this), d->url);
                 d->pendingPixmapCache = true;
@@ -217,7 +235,6 @@ void QDeclarativeBorderImage::setSource(const QUrl &url)
                     d->status = Ready;
                 d->progress = 1.0;
                 emit statusChanged(d->status);
-                emit sourceChanged(d->url);
                 emit progressChanged(d->progress);
                 update();
             }
@@ -319,13 +336,30 @@ void QDeclarativeBorderImage::setGridScaledImage(const QDeclarativeGridScaledIma
         d->verticalTileMode = sci.verticalTileRule();
 
         d->sciurl = d->url.resolved(QUrl(sci.pixmapUrl()));
-        QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->sciurl, &d->pix);
+        QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->sciurl, &d->pix, d->async);
         if (status != QDeclarativePixmapReply::Ready && status != QDeclarativePixmapReply::Error) {
             QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(qmlEngine(this), d->sciurl);
             d->sciPendingPixmapCache = true;
-            connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
-            connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
-                    this, SLOT(requestProgress(qint64,qint64)));
+
+            static int replyDownloadProgress = -1;
+            static int replyFinished = -1;
+            static int thisRequestProgress = -1;
+            static int thisRequestFinished = -1;
+            if (replyDownloadProgress == -1) {
+                replyDownloadProgress =
+                    QDeclarativePixmapReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)");
+                replyFinished =
+                    QDeclarativePixmapReply::staticMetaObject.indexOfSignal("finished()");
+                thisRequestProgress =
+                    QDeclarativeBorderImage::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)");
+                thisRequestFinished =
+                    QDeclarativeBorderImage::staticMetaObject.indexOfSlot("requestFinished()");
+            }
+
+            QMetaObject::connect(reply, replyFinished, this,
+                                 thisRequestFinished, Qt::DirectConnection);
+            QMetaObject::connect(reply, replyDownloadProgress, this,
+                                 thisRequestProgress, Qt::DirectConnection);
         } else {
             //### should be unified with requestFinished
             setImplicitWidth(d->pix.width());
@@ -337,7 +371,6 @@ void QDeclarativeBorderImage::setGridScaledImage(const QDeclarativeGridScaledIma
                 d->status = Ready;
             d->progress = 1.0;
             emit statusChanged(d->status);
-            emit sourceChanged(d->url);
             emit progressChanged(1.0);
             update();
         }
@@ -350,10 +383,10 @@ void QDeclarativeBorderImage::requestFinished()
 
     if (d->url.path().endsWith(QLatin1String(".sci"))) {
         d->sciPendingPixmapCache = false;
-        QDeclarativePixmapCache::get(d->sciurl, &d->pix);
+        QDeclarativePixmapCache::get(d->sciurl, &d->pix, d->async);
     } else {
         d->pendingPixmapCache = false;
-        if (QDeclarativePixmapCache::get(d->url, &d->pix) != QDeclarativePixmapReply::Ready)
+        if (QDeclarativePixmapCache::get(d->url, &d->pix, d->async) != QDeclarativePixmapReply::Ready)
             d->status = Error;
     }
     setImplicitWidth(d->pix.width());
@@ -363,7 +396,6 @@ void QDeclarativeBorderImage::requestFinished()
         d->status = Ready;
     d->progress = 1.0;
     emit statusChanged(d->status);
-    emit sourceChanged(d->url);
     emit progressChanged(1.0);
     update();
 }
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
index db81fd8..a759e67 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
@@ -84,6 +84,9 @@ Q_SIGNALS:
     void horizontalTileModeChanged();
     void verticalTileModeChanged();
 
+protected:
+    virtual void load();
+
 private:
     void setGridScaledImage(const QDeclarativeGridScaledImage& sci);
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 33b38e0..338b086 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -300,6 +300,21 @@ void QDeclarativeImage::geometryChanged(const QRectF &newGeometry, const QRectF
     The URL may be absolute, or relative to the URL of the component.
 */
 
+/*!
+    \qmlproperty bool Image::asynchronous
+
+    Specifies that images on the local filesystem should be loaded
+    asynchronously in a separate thread.  The default value is
+    false, causing the user interface thread to block while the
+    image is loaded.  Setting \a asynchronous to true is useful where
+    maintaining a responsive user interface is more desireable
+    than having images immediately visible.
+
+    Note that this property is only valid for images read from the
+    local filesystem.  Images loaded via a network resource (e.g. HTTP)
+    are always loaded asynchonously.
+*/
+
 void QDeclarativeImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
 {
     Q_D(QDeclarativeImage);
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
index 18053d3..a8cce3f 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
@@ -75,6 +75,23 @@ qreal QDeclarativeImageBase::progress() const
     return d->progress;
 }
 
+
+bool QDeclarativeImageBase::asynchronous() const
+{
+    Q_D(const QDeclarativeImageBase);
+    return d->async;
+}
+
+void QDeclarativeImageBase::setAsynchronous(bool async)
+{
+    Q_D(QDeclarativeImageBase);
+    if (d->async != async) {
+        d->async = async;
+        emit asynchronousChanged();
+    }
+}
+
+
 QUrl QDeclarativeImageBase::source() const
 {
     Q_D(const QDeclarativeImageBase);
@@ -94,23 +111,31 @@ void QDeclarativeImageBase::setSource(const QUrl &url)
     }
 
     d->url = url;
+    emit sourceChanged(d->url);
+
+    if (isComponentComplete())
+        load();
+}
+
+void QDeclarativeImageBase::load()
+{
+    Q_D(QDeclarativeImageBase);
     if (d->progress != 0.0) {
         d->progress = 0.0;
         emit progressChanged(d->progress);
     }
 
-    if (url.isEmpty()) {
+    if (d->url.isEmpty()) {
         d->pix = QPixmap();
         d->status = Null;
         setImplicitWidth(0);
         setImplicitHeight(0);
         emit statusChanged(d->status);
-        emit sourceChanged(d->url);
         emit pixmapChanged();
         update();
     } else {
         d->status = Loading;
-        QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->url, &d->pix);
+        QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->url, &d->pix, d->async);
         if (status != QDeclarativePixmapReply::Ready && status != QDeclarativePixmapReply::Error) {
             QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(qmlEngine(this), d->url);
             d->pendingPixmapCache = true;
@@ -147,7 +172,6 @@ void QDeclarativeImageBase::setSource(const QUrl &url)
             }
             d->progress = 1.0;
             emit statusChanged(d->status);
-            emit sourceChanged(d->url);
             emit progressChanged(d->progress);
             emit pixmapChanged();
             update();
@@ -163,7 +187,7 @@ void QDeclarativeImageBase::requestFinished()
 
     d->pendingPixmapCache = false;
 
-    if (QDeclarativePixmapCache::get(d->url, &d->pix) != QDeclarativePixmapReply::Ready)
+    if (QDeclarativePixmapCache::get(d->url, &d->pix, d->async) != QDeclarativePixmapReply::Ready)
         d->status = Error;
     setImplicitWidth(d->pix.width());
     setImplicitHeight(d->pix.height());
@@ -172,7 +196,6 @@ void QDeclarativeImageBase::requestFinished()
         d->status = Ready;
     d->progress = 1.0;
     emit statusChanged(d->status);
-    emit sourceChanged(d->url);
     emit progressChanged(1.0);
     emit pixmapChanged();
     update();
@@ -187,5 +210,12 @@ void QDeclarativeImageBase::requestProgress(qint64 received, qint64 total)
     }
 }
 
+void QDeclarativeImageBase::componentComplete()
+{
+    Q_D(QDeclarativeImageBase);
+    QDeclarativeItem::componentComplete();
+    if (d->url.isValid())
+        load();
+}
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
index 47be139..c8c50ac 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
@@ -57,6 +57,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeImageBase : public QDeclarativeItem
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+    Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged)
 
 public:
     ~QDeclarativeImageBase();
@@ -67,13 +68,19 @@ public:
     QUrl source() const;
     virtual void setSource(const QUrl &url);
 
+    bool asynchronous() const;
+    void setAsynchronous(bool);
+
 Q_SIGNALS:
     void sourceChanged(const QUrl &);
     void statusChanged(Status);
     void progressChanged(qreal progress);
     void pixmapChanged();
+    void asynchronousChanged();
 
 protected:
+    virtual void load();
+    virtual void componentComplete();
     QDeclarativeImageBase(QDeclarativeImageBasePrivate &dd, QDeclarativeItem *parent);
 
 private Q_SLOTS:
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
index d540e40..2e062a8 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
@@ -68,7 +68,8 @@ public:
     QDeclarativeImageBasePrivate()
       : status(QDeclarativeImageBase::Null),
         progress(0.0),
-        pendingPixmapCache(false)
+        pendingPixmapCache(false),
+        async(false)
     {
     }
 
@@ -76,7 +77,8 @@ public:
     QDeclarativeImageBase::Status status;
     QUrl url;
     qreal progress;
-    bool pendingPixmapCache;
+    bool pendingPixmapCache : 1;
+    bool async : 1;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index c4b07cc..cfb25dd 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -79,6 +79,14 @@ inline uint qHash(const QUrl &uri)
 }
 #endif
 
+static QString toLocalFileOrQrc(const QUrl& url)
+{
+    QString r = url.toLocalFile();
+    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
+        r = QLatin1Char(':') + url.path();
+    return r;
+}
+
 class QDeclarativeImageReaderEvent : public QEvent
 {
 public:
@@ -208,6 +216,7 @@ bool QDeclarativeImageRequestHandler::event(QEvent *event)
 
             // fetch
             if (url.scheme() == QLatin1String("image")) {
+                // Use QmlImageProvider
                 QImage image = QDeclarativeEnginePrivate::get(engine)->getImageFromProvider(url);
                 QDeclarativeImageReaderEvent::ReadError errorCode = QDeclarativeImageReaderEvent::NoError;
                 QString errorStr;
@@ -217,14 +226,36 @@ bool QDeclarativeImageRequestHandler::event(QEvent *event)
                 }
                 QCoreApplication::postEvent(runningJob, new QDeclarativeImageReaderEvent(errorCode, errorStr, image));
             } else {
-                QNetworkRequest req(url);
-                req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
-                QNetworkReply *reply = networkAccessManager()->get(req);
+                QString lf = toLocalFileOrQrc(url);
+                if (!lf.isEmpty()) {
+                    // Image is local - load/decode immediately
+                    QImage image;
+                    QDeclarativeImageReaderEvent::ReadError errorCode = QDeclarativeImageReaderEvent::NoError;
+                    QString errorStr;
+                    QFile f(lf);
+                    if (f.open(QIODevice::ReadOnly)) {
+                        QImageReader imgio(&f);
+                        if (!imgio.read(&image)) {
+                            errorStr = QLatin1String("Error decoding: ") + url.toString()
+                                          + QLatin1String(" \"") + imgio.errorString() + QLatin1String("\"");
+                            errorCode = QDeclarativeImageReaderEvent::Loading;
+                        }
+                    } else {
+                        errorStr = QLatin1String("Cannot open: ") + url.toString();
+                        errorCode = QDeclarativeImageReaderEvent::Loading;
+                    }
+                    QCoreApplication::postEvent(runningJob, new QDeclarativeImageReaderEvent(errorCode, errorStr, image));
+                } else {
+                    // Network resource
+                    QNetworkRequest req(url);
+                    req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
+                    QNetworkReply *reply = networkAccessManager()->get(req);
 
-                QMetaObject::connect(reply, replyDownloadProgress, runningJob, downloadProgress);
-                QMetaObject::connect(reply, replyFinished, this, thisNetworkRequestDone);
+                    QMetaObject::connect(reply, replyDownloadProgress, runningJob, downloadProgress);
+                    QMetaObject::connect(reply, replyFinished, this, thisNetworkRequestDone);
 
-                replies.insert(reply, runningJob);
+                    replies.insert(reply, runningJob);
+                }
             }
         }
         return true;
@@ -381,14 +412,6 @@ static bool readImage(QIODevice *dev, QPixmap *pixmap, QString &errorString)
     This class is NOT reentrant.
  */
 
-static QString toLocalFileOrQrc(const QUrl& url)
-{
-    QString r = url.toLocalFile();
-    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
-        r = QLatin1Char(':') + url.path();
-    return r;
-}
-
 typedef QHash<QUrl, QDeclarativePixmapReply *> QDeclarativePixmapReplyHash;
 Q_GLOBAL_STATIC(QDeclarativePixmapReplyHash, qmlActivePixmapReplies);
 
@@ -500,40 +523,48 @@ bool QDeclarativePixmapReply::release(bool defer)
 
     Returns Ready, or Error if the image has been retrieved,
     otherwise the current retrieval status.
+
+    If \a async is false the image will be loaded and decoded immediately;
+    otherwise the image will be loaded and decoded in a separate thread.
+
+    Note that images sourced from the network will always be loaded and
+    decoded asynchonously.
 */
-QDeclarativePixmapReply::Status QDeclarativePixmapCache::get(const QUrl& url, QPixmap *pixmap)
+QDeclarativePixmapReply::Status QDeclarativePixmapCache::get(const QUrl& url, QPixmap *pixmap, bool async)
 {
     QDeclarativePixmapReply::Status status = QDeclarativePixmapReply::Unrequested;
+    QByteArray key = url.toEncoded(QUrl::FormattingOption(0x100));
+    QString strKey = QString::fromLatin1(key.constData(), key.count());
 
 #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
-    QString lf = toLocalFileOrQrc(url);
-    if (!lf.isEmpty()) {
-        status = QDeclarativePixmapReply::Ready;
-        if (!QPixmapCache::find(lf,pixmap)) {
-            QFile f(lf);
-            if (f.open(QIODevice::ReadOnly)) {
-                QString errorString;
-                if (!readImage(&f, pixmap, errorString)) {
-                    errorString = QLatin1String("Error decoding: ") + url.toString()
-                                  + QLatin1String(" \"") + errorString + QLatin1String("\"");
-                    qWarning() << errorString;
+    if (!async) {
+        QString lf = toLocalFileOrQrc(url);
+        if (!lf.isEmpty()) {
+            status = QDeclarativePixmapReply::Ready;
+            if (!QPixmapCache::find(strKey,pixmap)) {
+                QFile f(lf);
+                if (f.open(QIODevice::ReadOnly)) {
+                    QString errorString;
+                    if (!readImage(&f, pixmap, errorString)) {
+                        errorString = QLatin1String("Error decoding: ") + url.toString()
+                                      + QLatin1String(" \"") + errorString + QLatin1String("\"");
+                        qWarning() << errorString;
+                        *pixmap = QPixmap();
+                        status = QDeclarativePixmapReply::Error;
+                    }
+                } else {
+                    qWarning() << "Cannot open" << url;
                     *pixmap = QPixmap();
                     status = QDeclarativePixmapReply::Error;
                 }
-            } else {
-                qWarning() << "Cannot open" << url;
-                *pixmap = QPixmap();
-                status = QDeclarativePixmapReply::Error;
+                if (status == QDeclarativePixmapReply::Ready)
+                    QPixmapCache::insert(strKey, *pixmap);
             }
-            if (status == QDeclarativePixmapReply::Ready)
-                QPixmapCache::insert(lf, *pixmap);
+            return status;
         }
-        return status;
     }
 #endif
 
-    QByteArray key = url.toEncoded(QUrl::FormattingOption(0x100));
-    QString strKey = QString::fromLatin1(key.constData(), key.count());
     QDeclarativePixmapReplyHash::Iterator iter = qmlActivePixmapReplies()->find(url);
     if (iter != qmlActivePixmapReplies()->end() && (*iter)->status() == QDeclarativePixmapReply::Ready) {
         // Must check this, since QPixmapCache::insert may have failed.
diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/declarative/util/qdeclarativepixmapcache_p.h
index c615254..b8949db 100644
--- a/src/declarative/util/qdeclarativepixmapcache_p.h
+++ b/src/declarative/util/qdeclarativepixmapcache_p.h
@@ -92,7 +92,7 @@ private:
 class Q_DECLARATIVE_EXPORT QDeclarativePixmapCache
 {
 public:
-    static QDeclarativePixmapReply::Status get(const QUrl& url, QPixmap *pixmap);
+    static QDeclarativePixmapReply::Status get(const QUrl& url, QPixmap *pixmap, bool async=false);
     static QDeclarativePixmapReply *request(QDeclarativeEngine *, const QUrl& url);
     static void cancel(const QUrl& url, QObject *obj);
     static int pendingRequests();
diff --git a/tests/auto/declarative/qdeclarativeimage/data/colors1.png b/tests/auto/declarative/qdeclarativeimage/data/colors1.png
new file mode 100644
index 0000000..dfb62f3
Binary files /dev/null and b/tests/auto/declarative/qdeclarativeimage/data/colors1.png differ
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index f38fca9..62793e7 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -112,13 +112,17 @@ void tst_qdeclarativeimage::imageSource_data()
 {
     QTest::addColumn<QString>("source");
     QTest::addColumn<bool>("remote");
+    QTest::addColumn<bool>("async");
     QTest::addColumn<QString>("error");
 
-    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << false << "";
+    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << false << false << "";
+    QTest::newRow("local async") << QUrl::fromLocalFile(SRCDIR "/data/colors1.png").toString() << false << true << "";
     QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << false
-        << "Cannot open  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() + "\" )  ";
-    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << "";
-    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true
+        << false << "Cannot open  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() + "\" )  ";
+    QTest::newRow("local async not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString() << false
+        << true << "\"Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString() + "\" ";
+    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << false << "";
+    QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true << false
         << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
 }
 
@@ -126,6 +130,7 @@ void tst_qdeclarativeimage::imageSource()
 {
     QFETCH(QString, source);
     QFETCH(bool, remote);
+    QFETCH(bool, async);
     QFETCH(QString, error);
 
     TestHTTPServer server(SERVER_PORT);
@@ -137,13 +142,14 @@ void tst_qdeclarativeimage::imageSource()
     if (!error.isEmpty())
         QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
 
-    QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\" }";
+    QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\"; asynchronous: "
+        + (async ? QLatin1String("true") : QLatin1String("false")) + " }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
     
-    if (remote)
+    if (remote || async)
         TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
 
     QCOMPARE(obj->source(), remote ? source : QUrl(source));
-- 
cgit v0.12


From 0f93f08d1d2dd8cbaaf80d13244c1b655f122357 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 15:27:44 +1000
Subject: Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779

---
 .../declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp | 2 +-
 tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
index b2ef16b..8aeba6d 100644
--- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
+++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
@@ -60,7 +60,7 @@
 
 #define TRY_WAIT(expr) \
     do { \
-        for (int ii = 0; ii < 6; ++ii) { \
+        for (int ii = 0; ii < 60; ++ii) { \
             if ((expr)) break; \
             QTest::qWait(50); \
         } \
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index f38fca9..821386b 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -59,7 +59,7 @@
 
 #define TRY_WAIT(expr) \
     do { \
-        for (int ii = 0; ii < 6; ++ii) { \
+        for (int ii = 0; ii < 60; ++ii) { \
             if ((expr)) break; \
             QTest::qWait(50); \
         } \
-- 
cgit v0.12


From 800d6691c5fd9c7139ff8b32aab39eab72e443f8 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Wed, 24 Feb 2010 15:48:57 +1000
Subject: Uses Qt.widgets (still doesn't work yet...)

---
 tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml b/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml
index 70fafd6..c00173d 100644
--- a/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml
+++ b/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml
@@ -1,4 +1,5 @@
 import Qt 4.6
+import Qt.widgets 4.6
 
 QGraphicsView {
     objectName: "GView"
-- 
cgit v0.12


From 7eb5fc91a30a360507a65c19b6a3b96f757c2c4e Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 24 Feb 2010 17:03:42 +1000
Subject: Simplify QML element registration headers

---
 src/declarative/qml/qdeclarative.h                 | 212 +++++++++++++++++++--
 src/declarative/qml/qdeclarativebinding_p.h        |   1 +
 src/declarative/qml/qdeclarativeengine.cpp         |  12 ++
 src/declarative/qml/qdeclarativeengine_p.h         |   1 +
 src/declarative/qml/qdeclarativeguard_p.h          |   1 +
 src/declarative/qml/qdeclarativelist.h             |   6 +-
 src/declarative/qml/qdeclarativemetatype.cpp       | 127 ++++++------
 src/declarative/qml/qdeclarativemetatype.h         | 147 +-------------
 src/declarative/qml/qdeclarativeparser_p.h         |   6 +-
 src/declarative/qml/qdeclarativeprivate.cpp        |  48 -----
 src/declarative/qml/qdeclarativeprivate.h          |  68 +++----
 src/declarative/qml/qml.pri                        |   1 -
 src/declarative/util/qdeclarativeanimation.cpp     |   1 +
 src/declarative/util/qdeclarativebind.cpp          |   1 +
 src/declarative/util/qdeclarativeconnection.cpp    |   1 +
 src/declarative/util/qdeclarativefontloader.cpp    |   1 +
 src/declarative/util/qdeclarativefontloader_p.h    |   1 +
 src/declarative/util/qdeclarativestate_p.h         |   2 +-
 src/declarative/util/qdeclarativexmllistmodel.cpp  |   1 +
 src/declarative/util/qdeclarativexmllistmodel_p.h  |   2 +
 src/declarative/util/qnumberformat.cpp             |   1 +
 .../declarative/qdeclarativelanguage/testtypes.h   |   1 +
 .../tst_qdeclarativelanguage.cpp                   |   1 +
 .../tst_qdeclarativelistreference.cpp              |   1 +
 .../qdeclarativemoduleplugin/plugin/plugin.cpp     |   1 +
 .../declarative/qdeclarativevaluetypes/testtypes.h |   1 +
 tools/qml/qdeclarativefolderlistmodel.h            |   2 +
 tools/qml/qfxtester.h                              |   2 +
 28 files changed, 335 insertions(+), 315 deletions(-)
 delete mode 100644 src/declarative/qml/qdeclarativeprivate.cpp

diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index ee5a27a..3133d27 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -39,18 +39,16 @@
 **
 ****************************************************************************/
 
-#ifndef QML_H
-#define QML_H
+#ifndef QDECLARATIVE_H
+#define QDECLARATIVE_H
 
-#include "qdeclarativemetatype.h"
-#include "qdeclarativemetaproperty.h"
+#include "qdeclarativeprivate.h"
 #include "qdeclarativeparserstatus.h"
 #include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarativepropertyvalueinterceptor.h"
 #include "qdeclarativelist.h"
 
 #include <QtCore/qbytearray.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qurl.h>
 #include <QtCore/qmetaobject.h>
 
 QT_BEGIN_HEADER
@@ -88,6 +86,195 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+template<typename T>
+int qmlRegisterType(const char *typeName)
+{
+    QByteArray name(typeName);
+
+    QByteArray pointerName(name + '*');
+    QByteArray listName("QDeclarativeListProperty<" + name + ">");
+
+    QDeclarativePrivate::RegisterType type = {
+        0, 
+
+        qRegisterMetaType<T *>(pointerName.constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
+        0,
+
+        0, 0, 0, 0, &T::staticMetaObject,
+
+        QDeclarativePrivate::attachedPropertiesFunc<T>(),
+        QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+
+        0, 0,
+
+        0
+    };
+
+    return QDeclarativePrivate::registerType(type);
+}
+
+template<typename T>
+int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const char *typeName)
+{
+    QByteArray name(typeName);
+
+    QByteArray pointerName(name + '*');
+    QByteArray listName("QDeclarativeListProperty<" + name + ">");
+
+    QDeclarativePrivate::RegisterType type = {
+        0, 
+
+        qRegisterMetaType<T *>(pointerName.constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
+        QDeclarativePrivate::create<T>,
+
+        uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
+
+        QDeclarativePrivate::attachedPropertiesFunc<T>(),
+        QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+
+        0, 0,
+
+        0
+    };
+
+    return QDeclarativePrivate::registerType(type);
+}
+
+template<typename T, typename E>
+int qmlRegisterExtendedType(const char *typeName)
+{
+    QByteArray name(typeName);
+
+    QByteArray pointerName(name + '*');
+    QByteArray listName("QDeclarativeListProperty<" + name + ">");
+
+    QDeclarativePrivate::RegisterType type = {
+        0, 
+
+        qRegisterMetaType<T *>(pointerName.constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
+        0,
+
+        0, 0, 0, 0, &T::staticMetaObject,
+
+        QDeclarativePrivate::attachedPropertiesFunc<T>(),
+        QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+
+        QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
+
+        0
+    };
+
+    return QDeclarativePrivate::registerType(type);
+}
+
+template<typename T, typename E>
+int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor, 
+                            const char *qmlName, const char *typeName)
+{
+    QByteArray name(typeName);
+
+    QByteArray pointerName(name + '*');
+    QByteArray listName("QDeclarativeListProperty<" + name + ">");
+
+    QDeclarativeAttachedPropertiesFunc attached = QDeclarativePrivate::attachedPropertiesFunc<E>();
+    const QMetaObject * attachedMetaObject = QDeclarativePrivate::attachedPropertiesMetaObject<E>(); 
+    if (!attached) {
+        attached = QDeclarativePrivate::attachedPropertiesFunc<T>();
+        attachedMetaObject = QDeclarativePrivate::attachedPropertiesMetaObject<T>();
+    }
+
+    QDeclarativePrivate::RegisterType type = {
+        0, 
+
+        qRegisterMetaType<T *>(pointerName.constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
+        QDeclarativePrivate::create<T>,
+
+        uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
+
+        attached,
+        attachedMetaObject,
+
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+
+        QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
+
+        0
+    };
+
+    return QDeclarativePrivate::registerType(type);
+}
+
+template<typename T>
+int qmlRegisterInterface(const char *typeName)
+{
+    QByteArray name(typeName);
+
+    QByteArray pointerName(name + '*');
+    QByteArray listName("QDeclarativeListProperty<" + name + ">");
+
+    QDeclarativePrivate::RegisterInterface interface = {
+        0,
+
+        qRegisterMetaType<T *>(pointerName.constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
+
+        qobject_interface_iid<T *>()
+    };
+
+    return QDeclarativePrivate::registerType(interface);
+}
+
+template<typename T>
+int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, 
+                          const char *qmlName, const char *typeName, QDeclarativeCustomParser *parser)
+{
+    QByteArray name(typeName);
+
+    QByteArray pointerName(name + '*');
+    QByteArray listName("QDeclarativeListProperty<" + name + ">");
+
+    QDeclarativePrivate::RegisterType type = {
+        0, 
+
+        qRegisterMetaType<T *>(pointerName.constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
+        QDeclarativePrivate::create<T>,
+
+        uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
+
+        QDeclarativePrivate::attachedPropertiesFunc<T>(),
+        QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+
+        0, 0,
+
+        parser
+    };
+
+    return QDeclarativePrivate::registerType(type);
+}
+
 #define QML_REGISTER_INTERFACE(INTERFACE) \
     qmlRegisterInterface<INTERFACE>(#INTERFACE)
 
@@ -106,20 +293,13 @@ Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *);
 Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *);
 Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *);
 Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
+Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create);
 
 template<typename T>
 QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true)
 {
-    // ### is this threadsafe?
     static int idx = -1;
-
-    if (idx == -1)
-        idx = QDeclarativeMetaType::attachedPropertiesFuncId(&T::staticMetaObject);
-
-    if (idx == -1 || !obj)
-        return 0;
-
-    return qmlAttachedPropertiesObjectById(idx, obj, create);
+    return qmlAttachedPropertiesObject(&idx, obj, &T::staticMetaObject, create);
 }
 
 QT_END_NAMESPACE
@@ -129,4 +309,4 @@ Q_DECLARE_METATYPE(QVariant)
 
 QT_END_HEADER
 
-#endif // QML_H
+#endif // QDECLARATIVE_H
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index 432bf22..7c79b8c 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -56,6 +56,7 @@
 #include "qdeclarative.h"
 #include "qdeclarativepropertyvaluesource.h"
 #include "qdeclarativeexpression.h"
+#include "qdeclarativemetaproperty.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QMetaProperty>
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 4575536..39b8a22 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -721,6 +721,18 @@ QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool cre
     return rv;
 }
 
+QObject *qmlAttachedPropertiesObject(int *idCache, const QObject *object, 
+                                     const QMetaObject *attachedMetaObject, bool create)
+{
+    if (*idCache == -1)
+        *idCache = QDeclarativeMetaType::attachedPropertiesFuncId(attachedMetaObject);
+
+    if (*idCache == -1 || !object)
+        return 0;
+
+    return qmlAttachedPropertiesObjectById(*idCache, object, create);
+}
+
 void QDeclarativeDeclarativeData::destroyed(QObject *object)
 {
     if (deferredComponent)
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 7c9d833..1a858d4 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -67,6 +67,7 @@
 #include "qdeclarativeobjectscriptclass_p.h"
 #include "qdeclarativecontextscriptclass_p.h"
 #include "qdeclarativevaluetypescriptclass_p.h"
+#include "qdeclarativemetatype.h"
 
 #include <QtScript/QScriptClass>
 #include <QtScript/QScriptValue>
diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h
index 9d82d01..0861e9a 100644
--- a/src/declarative/qml/qdeclarativeguard_p.h
+++ b/src/declarative/qml/qdeclarativeguard_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h
index fb877b4..8d59384 100644
--- a/src/declarative/qml/qdeclarativelist.h
+++ b/src/declarative/qml/qdeclarativelist.h
@@ -42,7 +42,9 @@
 #ifndef QDECLARATIVELIST_H
 #define QDECLARATIVELIST_H
 
-#include "qdeclarativeprivate.h"
+#include <QtCore/qglobal.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_HEADER
 
@@ -50,6 +52,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class QObject;
+class QMetaObject;
 template<typename T>
 struct QDeclarativeListProperty {
     typedef void (*AppendFunction)(QDeclarativeListProperty<T> *, T*);
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 8f78843..7ae5a83 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -131,7 +131,7 @@ public:
     int m_parserStatusCast;
     int m_propertyValueSourceCast;
     int m_propertyValueInterceptorCast;
-    QDeclarativePrivate::CreateFunc m_extFunc;
+    QObject *(*m_extFunc)(QObject *);
     const QMetaObject *m_extMetaObject;
     int m_index;
     QDeclarativeCustomParser *m_customParser;
@@ -148,13 +148,13 @@ QDeclarativeTypePrivate::QDeclarativeTypePrivate()
 }
 
 
-QDeclarativeType::QDeclarativeType(int type, int listType, const char *iid, int index)
+QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::RegisterInterface &interface)
 : d(new QDeclarativeTypePrivate)
 {
     d->m_isInterface = true;
-    d->m_iid = iid;
-    d->m_typeId = type;
-    d->m_listId = listType;
+    d->m_iid = interface.iid;
+    d->m_typeId = interface.typeId;
+    d->m_listId = interface.listId;
     d->m_newFunc = 0;
     d->m_index = index;
     d->m_isSetup = true;
@@ -162,36 +162,31 @@ QDeclarativeType::QDeclarativeType(int type, int listType, const char *iid, int
     d->m_version_min = 0;
 }
 
-QDeclarativeType::QDeclarativeType(int type, int listType, 
-                 QObject *(*newFunc)(), const char *qmlName,
-                 int version_maj, int version_min,
-                 const QMetaObject *metaObject,
-                 QDeclarativeAttachedPropertiesFunc attachedPropertiesFunc,
-                 const QMetaObject *attachedType,
-                 int parserStatusCast, int propertyValueSourceCast, int propertyValueInterceptorCast,
-                 QDeclarativePrivate::CreateFunc extFunc,
-                 const QMetaObject *extMetaObject, int index,
-                 QDeclarativeCustomParser *customParser)
+QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::RegisterType &type)
 : d(new QDeclarativeTypePrivate)
 {
-    d->m_name = qmlName;
-    d->m_version_maj = version_maj;
-    d->m_version_min = version_min;
-    d->m_typeId = type;
-    d->m_listId = listType;
-    d->m_newFunc = newFunc;
-    d->m_baseMetaObject = metaObject;
-    d->m_attachedPropertiesFunc = attachedPropertiesFunc;
-    d->m_attachedPropertiesType = attachedType;
-    d->m_parserStatusCast = parserStatusCast;
-    d->m_propertyValueSourceCast = propertyValueSourceCast;
-    d->m_propertyValueInterceptorCast = propertyValueInterceptorCast;
-    d->m_extFunc = extFunc;
+    QByteArray name = type.uri;
+    if (type.uri) name += '/';
+    name += type.elementName;
+
+    d->m_name = name;
+    d->m_version_maj = type.versionMajor;
+    d->m_version_min = type.versionMinor;
+    d->m_typeId = type.typeId;
+    d->m_listId = type.listId;
+    d->m_newFunc = type.create;
+    d->m_baseMetaObject = type.metaObject;
+    d->m_attachedPropertiesFunc = type.attachedPropertiesFunction;
+    d->m_attachedPropertiesType = type.attachedPropertiesMetaObject;
+    d->m_parserStatusCast = type.parserStatusCast;
+    d->m_propertyValueSourceCast = type.valueSourceCast;
+    d->m_propertyValueInterceptorCast = type.valueInterceptorCast;
+    d->m_extFunc = type.extensionObjectCreate;
     d->m_index = index;
-    d->m_customParser = customParser;
+    d->m_customParser = type.customParser;
 
-    if (extMetaObject)
-        d->m_extMetaObject = extMetaObject;
+    if (type.extensionMetaObject)
+        d->m_extMetaObject = type.extensionMetaObject;
 }
 
 QDeclarativeType::~QDeclarativeType()
@@ -357,15 +352,19 @@ int QDeclarativeType::index() const
     return d->m_index;
 }
 
-int QDeclarativeMetaType::registerInterface(const QDeclarativePrivate::MetaTypeIds &id,
-                                    const char *iid)
+int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterface &interface)
 {
+    if (interface.version > 0) {
+        qWarning("Cannot mix incompatible QML versions.");
+        return -1;
+    }
+
     QWriteLocker lock(metaTypeDataLock());
     QDeclarativeMetaTypeData *data = metaTypeData();
 
     int index = data->types.count();
 
-    QDeclarativeType *type = new QDeclarativeType(id.typeId, id.listId, iid, index);
+    QDeclarativeType *type = new QDeclarativeType(index, interface);
 
     data->types.append(type);
     data->idToType.insert(type->typeId(), type);
@@ -374,27 +373,22 @@ int QDeclarativeMetaType::registerInterface(const QDeclarativePrivate::MetaTypeI
     if (!type->qmlTypeName().isEmpty())
         data->nameToType.insert(type->qmlTypeName(), type);
 
-    if (data->interfaces.size() <= id.typeId)
-        data->interfaces.resize(id.typeId + 16);
-    if (data->lists.size() <= id.listId)
-        data->lists.resize(id.listId + 16);
-    data->interfaces.setBit(id.typeId, true);
-    data->lists.setBit(id.listId, true);
+    if (data->interfaces.size() <= interface.typeId)
+        data->interfaces.resize(interface.typeId + 16);
+    if (data->lists.size() <= interface.listId)
+        data->lists.resize(interface.listId + 16);
+    data->interfaces.setBit(interface.typeId, true);
+    data->lists.setBit(interface.listId, true);
 
     return index;
 }
 
-int QDeclarativeMetaType::registerType(const QDeclarativePrivate::MetaTypeIds &id, QObject *(*func)(),
-        const char *uri, int version_maj, int version_min, const char *cname,
-        const QMetaObject *mo, QDeclarativeAttachedPropertiesFunc attach, const QMetaObject *attachMo,
-        int pStatus, int object, int valueSource, int valueInterceptor, QDeclarativePrivate::CreateFunc extFunc, const QMetaObject *extmo, QDeclarativeCustomParser *parser)
+int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterType &type)
 {
-    Q_UNUSED(object);
-
-    if (cname) {
-        for (int ii = 0; cname[ii]; ++ii) {
-            if (!isalnum(cname[ii])) {
-                qWarning("QDeclarativeMetaType: Invalid QML name %s", cname);
+    if (type.elementName) {
+        for (int ii = 0; type.elementName[ii]; ++ii) {
+            if (!isalnum(type.elementName[ii])) {
+                qWarning("QDeclarativeMetaType: Invalid QML element name %s", type.elementName);
                 return -1;
             }
         }
@@ -404,30 +398,23 @@ int QDeclarativeMetaType::registerType(const QDeclarativePrivate::MetaTypeIds &i
     QDeclarativeMetaTypeData *data = metaTypeData();
     int index = data->types.count();
 
-    QByteArray name = uri;
-    if (uri)
-        name += '/';
-    name += cname;
+    QDeclarativeType *dtype = new QDeclarativeType(index, type);
 
-    QDeclarativeType *type = new QDeclarativeType(id.typeId, id.listId, 
-                                func, name, version_maj, version_min, mo, attach, attachMo, pStatus,
-                                valueSource, valueInterceptor, extFunc, extmo, index, parser);
+    data->types.append(dtype);
+    data->idToType.insert(dtype->typeId(), dtype);
+    data->idToType.insert(dtype->qListTypeId(), dtype);
 
-    data->types.append(type);
-    data->idToType.insert(type->typeId(), type);
-    data->idToType.insert(type->qListTypeId(), type);
-
-    if (!type->qmlTypeName().isEmpty())
-        data->nameToType.insertMulti(type->qmlTypeName(), type);
+    if (!dtype->qmlTypeName().isEmpty())
+        data->nameToType.insertMulti(dtype->qmlTypeName(), dtype);
 
-    data->metaObjectToType.insert(type->baseMetaObject(), type);
+    data->metaObjectToType.insert(dtype->baseMetaObject(), dtype);
 
-    if (data->objects.size() <= id.typeId)
-        data->objects.resize(id.typeId + 16);
-    if (data->lists.size() <= id.listId)
-        data->lists.resize(id.listId + 16);
-    data->objects.setBit(id.typeId, true);
-    data->lists.setBit(id.listId, true);
+    if (data->objects.size() <= type.typeId)
+        data->objects.resize(type.typeId + 16);
+    if (data->lists.size() <= type.listId)
+        data->lists.resize(type.listId + 16);
+    data->objects.setBit(type.typeId, true);
+    data->lists.setBit(type.listId, true);
 
     return index;
 }
diff --git a/src/declarative/qml/qdeclarativemetatype.h b/src/declarative/qml/qdeclarativemetatype.h
index 0634939..4cddf1c 100644
--- a/src/declarative/qml/qdeclarativemetatype.h
+++ b/src/declarative/qml/qdeclarativemetatype.h
@@ -43,10 +43,6 @@
 #define QDECLARATIVEMETATYPE_H
 
 #include "qdeclarativeprivate.h"
-#include "qdeclarativeparserstatus.h"
-#include "qdeclarativepropertyvaluesource.h"
-#include "qdeclarativepropertyvalueinterceptor.h"
-#include "qdeclarativelist.h"
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
@@ -63,9 +59,6 @@ class QDeclarativeCustomParser;
 class Q_DECLARATIVE_EXPORT QDeclarativeMetaType
 {
 public:
-    static int registerType(const QDeclarativePrivate::MetaTypeIds &, QObject *(*)(), const char *, int vmaj, int vmin, const char *qmlName, const QMetaObject *, QDeclarativeAttachedPropertiesFunc, const QMetaObject *, int pStatus, int object, int valueSource, int valueInterceptor, QDeclarativePrivate::CreateFunc extFunc, const QMetaObject *extmo, QDeclarativeCustomParser *);
-    static int registerInterface(const QDeclarativePrivate::MetaTypeIds &, const char *);
-
     static bool copy(int type, void *data, const void *copy = 0);
 
     static QList<QByteArray> qmlTypeNames();
@@ -132,147 +125,17 @@ public:
 
     int index() const;
 private:
-    friend class QDeclarativeMetaType;
     friend class QDeclarativeTypePrivate;
-    friend struct QDeclarativeMetaTypeData;
-    QDeclarativeType(int, int, const char *, int);
-    QDeclarativeType(int, int, QObject *(*)(), const char *, int, int, const QMetaObject *, QDeclarativeAttachedPropertiesFunc, const QMetaObject *, int, int, int, QDeclarativePrivate::CreateFunc, const QMetaObject *, int, QDeclarativeCustomParser *);
+    friend class QDeclarativeMetaTypeData;
+    friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterface &);
+    friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterType &);
+    QDeclarativeType(int, const QDeclarativePrivate::RegisterInterface &);
+    QDeclarativeType(int, const QDeclarativePrivate::RegisterType &);
     ~QDeclarativeType();
 
     QDeclarativeTypePrivate *d;
 };
 
-template<typename T>
-int qmlRegisterType(const char *typeName)
-{
-    QByteArray name(typeName);
-    QDeclarativePrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
-    };
-
-    return QDeclarativeMetaType::registerType(ids, 0, 0, 0, 0, 0,
-            &T::staticMetaObject,
-            QDeclarativePrivate::attachedPropertiesFunc<T>(),
-            QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
-            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-            0, 0, 0);
-}
-
-template<typename T>
-int qmlRegisterType(const char *uri, int version_maj, int version_min, const char *qmlName, const char *typeName)
-{
-    QByteArray name(typeName);
-    QDeclarativePrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
-    };
-
-    return QDeclarativeMetaType::registerType(ids, QDeclarativePrivate::create<T>, 
-            uri, version_maj, version_min, qmlName, 
-            &T::staticMetaObject,
-            QDeclarativePrivate::attachedPropertiesFunc<T>(),
-            QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
-            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(), 
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-            0, 0, 0);
-}
-
-template<typename T, typename E>
-int qmlRegisterExtendedType(const char *typeName)
-{
-    QByteArray name(typeName);
-    QDeclarativePrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
-    };
-
-    QDeclarativeAttachedPropertiesFunc attached = 
-        QDeclarativePrivate::attachedPropertiesFunc<E>();
-    const QMetaObject * attachedMo = 
-        QDeclarativePrivate::attachedPropertiesMetaObject<E>();
-    if (!attached) {
-        attached = QDeclarativePrivate::attachedPropertiesFunc<T>();
-        attachedMo = QDeclarativePrivate::attachedPropertiesMetaObject<T>();
-    }
-
-    return QDeclarativeMetaType::registerType(ids, 0, 0, 0, 0, 0,
-            &T::staticMetaObject, attached, attachedMo,
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
-            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-            &QDeclarativePrivate::CreateParent<E>::create, &E::staticMetaObject, 0);
-}
-
-template<typename T, typename E>
-int qmlRegisterExtendedType(const char *uri, int version_maj, int version_min, const char *qmlName, const char *typeName)
-{
-    QByteArray name(typeName);
-    QDeclarativePrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
-    };
-
-    QDeclarativeAttachedPropertiesFunc attached = 
-        QDeclarativePrivate::attachedPropertiesFunc<E>();
-    const QMetaObject * attachedMo = 
-        QDeclarativePrivate::attachedPropertiesMetaObject<E>(); 
-    if (!attached) {
-        attached = QDeclarativePrivate::attachedPropertiesFunc<T>();
-        attachedMo = QDeclarativePrivate::attachedPropertiesMetaObject<T>();
-    }
-
-    return QDeclarativeMetaType::registerType(ids, QDeclarativePrivate::create<T>, 
-            uri, version_maj, version_min, qmlName, 
-            &T::staticMetaObject,
-            attached, attachedMo,
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
-            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-            &QDeclarativePrivate::CreateParent<E>::create, 
-            &E::staticMetaObject, 0);
-}
-
-template<typename T>
-int qmlRegisterInterface(const char *typeName)
-{
-    QByteArray name(typeName);
-    QDeclarativePrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
-    };
-
-    return QDeclarativeMetaType::registerInterface(ids, qobject_interface_iid<T *>());
-}
-
-template<typename T>
-int qmlRegisterCustomType(const char *uri, int version_maj, int version_min, const char *qmlName, const char *typeName, QDeclarativeCustomParser *parser)
-{
-    QByteArray name(typeName);
-    QDeclarativePrivate::MetaTypeIds ids = {
-        qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<QDeclarativeListProperty<T> >(QByteArray("QDeclarativeListProperty<" + name + ">").constData()),
-    };
-
-    return QDeclarativeMetaType::registerType(ids, QDeclarativePrivate::create<T>, 
-            uri, version_maj, version_min, qmlName, 
-            &T::staticMetaObject,
-            QDeclarativePrivate::attachedPropertiesFunc<T>(),
-            QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(), 
-            QDeclarativePrivate::StaticCastSelector<T,QObject>::cast(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
-            QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-            0, 0, parser);
-}
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h
index cfd0b87..aae507e 100644
--- a/src/declarative/qml/qdeclarativeparser_p.h
+++ b/src/declarative/qml/qdeclarativeparser_p.h
@@ -56,9 +56,11 @@
 #include "qdeclarative.h"
 #include "qdeclarativerefcount_p.h"
 
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
+#include <QtCore/qbytearray.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
+#include <QtCore/qstringlist.h>
 
 #include <private/qobject_p.h>
 
diff --git a/src/declarative/qml/qdeclarativeprivate.cpp b/src/declarative/qml/qdeclarativeprivate.cpp
deleted file mode 100644
index 444fe56..0000000
--- a/src/declarative/qml/qdeclarativeprivate.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativeprivate.h"
-
-QT_BEGIN_NAMESPACE
-
-QDeclarativePrivate::InstanceType::InstanceType(int) {}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index c8a8c74..e8bbff4 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -43,10 +43,6 @@
 #define QDECLARATIVEPRIVATE_H
 
 #include <QtCore/qglobal.h>
-
-#ifndef Q_OS_WIN
-#include <stdint.h>
-#endif
 #include <QtCore/qvariant.h>
 
 QT_BEGIN_HEADER
@@ -57,9 +53,6 @@ QT_MODULE(Declarative)
 
 typedef QObject *(*QDeclarativeAttachedPropertiesFunc)(QObject *);
 
-//template<typename T>
-//struct qml_hasAttached { static bool const value = false; };
-
 template <typename TYPE>
 class QDeclarativeTypeInfo
 {
@@ -70,11 +63,15 @@ public:
 };
 
 
+class QDeclarativeCustomParser;
 namespace QDeclarativePrivate
 {
     template<typename T>
     QObject *create() { return new T; }
 
+    template<typename T>
+    QObject *createParent(QObject *p) { return new T(p); }
+
     template<class From, class To, int N>
     struct StaticCastSelectorClass
     {
@@ -167,41 +164,44 @@ namespace QDeclarativePrivate
         return AttachedPropertySelector<T, has_attachedPropertiesMethod<T, has_attachedPropertiesMember<T>::value>::value>::metaObject();
     }
 
-    struct MetaTypeIds {
+    struct RegisterType {
+        int version;
+
         int typeId;
         int listId;
-    };
-    typedef QObject *(*CreateFunc)(QObject *);
+        QObject *(*create)();
 
-    template<typename T>
-    struct CreateParent {
-        static QObject *create(QObject *other) {
-            return new T(other);
-        }
-    };
+        const char *uri;
+        int versionMajor;
+        int versionMinor;
+        const char *elementName;
+        const QMetaObject *metaObject;
 
-    template<typename T>
-    struct CreateNoParent {
-        static QObject *create() {
-            return new T;
-        }
-    };
+        QDeclarativeAttachedPropertiesFunc attachedPropertiesFunction;
+        const QMetaObject *attachedPropertiesMetaObject;
 
-    struct Q_DECLARATIVE_EXPORT InstanceType {
-       InstanceType(int);
-    };
+        int parserStatusCast;
+        int valueSourceCast;
+        int valueInterceptorCast;
+
+        QObject *(*extensionObjectCreate)(QObject *);
+        const QMetaObject *extensionMetaObject;
 
-    template<typename T, int VMAJ, int VMIN>
-    struct Define {
-        static InstanceType instance;
+        QDeclarativeCustomParser *customParser;
     };
-  
-    template<typename T>
-    struct ExtCreate {
-        static QObject *create(QObject *other) {
-            return new T(other);
-        }
+
+    struct RegisterInterface {
+        int version;
+
+        int typeId;
+        int listId;
+
+        const char *iid;
     };
+
+    int Q_DECLARATIVE_EXPORT registerType(const RegisterType &);
+    int Q_DECLARATIVE_EXPORT registerType(const RegisterInterface &);
+
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 0d5fcb0..8285bb9 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -19,7 +19,6 @@ SOURCES += \
     $$PWD/qdeclarativeboundsignal.cpp \
     $$PWD/qdeclarativedom.cpp \
     $$PWD/qdeclarativerefcount.cpp \
-    $$PWD/qdeclarativeprivate.cpp \
     $$PWD/qdeclarativemetatype.cpp \
     $$PWD/qdeclarativestringconverters.cpp \
     $$PWD/qdeclarativeclassfactory.cpp \
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 82e0d02..88b64fd 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -51,6 +51,7 @@
 #include <qdeclarativeexpression.h>
 #include <qdeclarativestringconverters_p.h>
 #include <qdeclarativeglobal_p.h>
+#include <qdeclarativemetatype.h>
 
 #include <qvariant.h>
 #include <qcolor.h>
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index 934030c..d75e98d 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -45,6 +45,7 @@
 
 #include <qdeclarativeengine.h>
 #include <qdeclarativecontext.h>
+#include <qdeclarativemetaproperty.h>
 
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qdeclarativeconnection.cpp b/src/declarative/util/qdeclarativeconnection.cpp
index 89f8a77..a7cfc79 100644
--- a/src/declarative/util/qdeclarativeconnection.cpp
+++ b/src/declarative/util/qdeclarativeconnection.cpp
@@ -46,6 +46,7 @@
 #include <qdeclarativecontext.h>
 
 #include <QtCore/qdebug.h>
+#include <QtCore/qstringlist.h>
 
 #include <private/qobject_p.h>
 
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 391eadab..ac30384 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -44,6 +44,7 @@
 #include <qdeclarativecontext.h>
 #include <qdeclarativeengine.h>
 
+#include <QStringList>
 #include <QUrl>
 #include <QDebug>
 #include <QNetworkRequest>
diff --git a/src/declarative/util/qdeclarativefontloader_p.h b/src/declarative/util/qdeclarativefontloader_p.h
index 8a9131c..14335ab 100644
--- a/src/declarative/util/qdeclarativefontloader_p.h
+++ b/src/declarative/util/qdeclarativefontloader_p.h
@@ -45,6 +45,7 @@
 #include <qdeclarative.h>
 
 #include <QtCore/qobject.h>
+#include <QtCore/qurl.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index a370f18..4a62481 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVESTATE_H
 
 #include <qdeclarative.h>
-
+#include <qdeclarativemetaproperty.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 63bf02b..386df46 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -45,6 +45,7 @@
 #include <qdeclarativeengine.h>
 
 #include <QDebug>
+#include <QStringList>
 #include <QApplication>
 #include <QThread>
 #include <QMutex>
diff --git a/src/declarative/util/qdeclarativexmllistmodel_p.h b/src/declarative/util/qdeclarativexmllistmodel_p.h
index f23a85b..132a53c 100644
--- a/src/declarative/util/qdeclarativexmllistmodel_p.h
+++ b/src/declarative/util/qdeclarativexmllistmodel_p.h
@@ -45,6 +45,8 @@
 #include <qdeclarative.h>
 #include <qdeclarativeinfo.h>
 
+#include <QtCore/qurl.h>
+
 #include "../3rdparty/qlistmodelinterface_p.h"
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qnumberformat.cpp b/src/declarative/util/qnumberformat.cpp
index 2e83874..81d0b90 100644
--- a/src/declarative/util/qnumberformat.cpp
+++ b/src/declarative/util/qnumberformat.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qnumberformat_p.h"
+#include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index 1a8bd11..fc1ede7 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -52,6 +52,7 @@
 #include <QtDeclarative/qdeclarativeparserstatus.h>
 #include <QtDeclarative/qdeclarativepropertyvaluesource.h>
 #include <QtDeclarative/qdeclarativescriptstring.h>
+#include <QtDeclarative/qdeclarativemetaproperty.h>
 
 QVariant myCustomVariantTypeConverter(const QString &data);
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 9d68ba9..16af0d9 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -41,6 +41,7 @@
 #include <qtest.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativemetatype.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qfileinfo.h>
diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
index 03d641d..5c6ceef 100644
--- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
+++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
@@ -47,6 +47,7 @@
 #include <QDeclarativeComponent>
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativeprivate.h>
+#include <QtDeclarative/qdeclarativemetaproperty.h>
 #include <QDebug>
 
 inline QUrl TEST_FILE(const QString &filename)
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
index 6433791..154693c 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
@@ -38,6 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <QStringList>
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
 #include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
index c4a9187..8b80e16 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
@@ -52,6 +52,7 @@
 #include <QFont>
 #include <qdeclarative.h>
 #include <QDeclarativePropertyValueSource>
+#include <QDeclarativeMetaProperty>
 
 class MyTypeObject : public QObject
 {
diff --git a/tools/qml/qdeclarativefolderlistmodel.h b/tools/qml/qdeclarativefolderlistmodel.h
index c16b44c..57b7fe5 100644
--- a/tools/qml/qdeclarativefolderlistmodel.h
+++ b/tools/qml/qdeclarativefolderlistmodel.h
@@ -43,6 +43,8 @@
 #define QDECLARATIVEFOLDERLISTMODEL_H
 
 #include <qdeclarative.h>
+#include <QStringList>
+#include <QUrl>
 #include "../../src/declarative/3rdparty/qlistmodelinterface_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/tools/qml/qfxtester.h b/tools/qml/qfxtester.h
index 3b935d8..1a9f077 100644
--- a/tools/qml/qfxtester.h
+++ b/tools/qml/qfxtester.h
@@ -45,6 +45,8 @@
 #include <QEvent>
 #include <QMouseEvent>
 #include <QKeyEvent>
+#include <QImage>
+#include <QUrl>
 #include <qmlruntime.h>
 
 QT_BEGIN_NAMESPACE
-- 
cgit v0.12


From d38fdecaccd9d53127c26b8dc1a30b3aa4bdb9a0 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Wed, 24 Feb 2010 17:29:26 +1000
Subject: Fix wrong property name in qdeclarativeitem docs

---
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 3db60ee..d492dbd 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1321,7 +1321,7 @@ QDeclarativeItem::~QDeclarativeItem()
     Image {
         source: "myimage.png"
         transformOrigin: Item.BottomRight
-        rotate: 45
+        rotation: 45
     }
     \endqml
 
-- 
cgit v0.12


From 93353ce0cf416c53238eb908a8e4ccb3e68df73d Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 24 Feb 2010 17:37:48 +1000
Subject: Fixup tests after QDeclarative class renames

---
 src/declarative/qml/qdeclarativescriptparser.cpp                  | 2 +-
 .../auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml | 8 --------
 tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml        | 8 ++++++++
 .../data/qdeclarativeAttachedPropertiesObjectMethod.1.qml         | 5 -----
 .../data/qdeclarativeAttachedPropertiesObjectMethod.2.qml         | 6 ------
 .../data/qmlAttachedPropertiesObjectMethod.1.qml                  | 5 +++++
 .../data/qmlAttachedPropertiesObjectMethod.2.qml                  | 6 ++++++
 .../declarative/qdeclarativelanguage/data/script.12.errors.txt    | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml
 create mode 100644 tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml
 delete mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml
 delete mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml

diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
index 9636350..f4c9cdd 100644
--- a/src/declarative/qml/qdeclarativescriptparser.cpp
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -771,7 +771,7 @@ bool ProcessAST::visit(AST::UiSourceElement *node)
 
         } else {
             QDeclarativeError error;
-            error.setDescription(QCoreApplication::translate("QDeclarativeParser","QDeclarativeJS declaration outside Script element"));
+            error.setDescription(QCoreApplication::translate("QDeclarativeParser","JavaScript declaration outside Script element"));
             error.setLine(node->firstSourceLocation().startLine);
             error.setColumn(node->firstSourceLocation().startColumn);
             _parser->_errors << error;
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml
deleted file mode 100644
index ce05f89..0000000
--- a/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.6
-
-QtObject {
-    property var nested
-
-    nested: QtObject {
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml
new file mode 100644
index 0000000..ce05f89
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+QtObject {
+    property var nested
+
+    nested: QtObject {
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml
deleted file mode 100644
index 429c327..0000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test 1.0
-import Qt 4.6
-QtObject {
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml
deleted file mode 100644
index 0f57b61..0000000
--- a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Test 1.0
-import Qt 4.6
-QtObject {
-    MyQmlObject.value: 10
-}
-
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
new file mode 100644
index 0000000..429c327
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+import Qt 4.6
+QtObject {
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
new file mode 100644
index 0000000..0f57b61
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+import Qt 4.6
+QtObject {
+    MyQmlObject.value: 10
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt
index 85c8396..f8297f5 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt
@@ -1 +1 @@
-4:5:QmlJS declaration outside Script element
+4:5:JavaScript declaration outside Script element
-- 
cgit v0.12


From d3a0bd57c7c3cecdeeb4ad9af3cf6bb4ee39964b Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 24 Feb 2010 17:48:20 +1000
Subject: Don't crash if the currentIndex is set while creating a delegate.

Task-number: QTBUG-8456
---
 .../graphicsitems/qdeclarativegridview.cpp         |  4 ++-
 .../graphicsitems/qdeclarativelistview.cpp         |  2 ++
 .../qdeclarativegridview/data/setindex.qml         | 33 ++++++++++++++++++++++
 .../tst_qdeclarativegridview.cpp                   | 15 ++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qdeclarativegridview/data/setindex.qml

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index aae5571..2ef6305 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -321,7 +321,7 @@ FxGridItem *QDeclarativeGridViewPrivate::createItem(int modelIndex)
         listItem->item->setParent(q->viewport());
         unrequestedItems.remove(listItem->item);
     }
-    requestedIndex = 0;
+    requestedIndex = -1;
     return listItem;
 }
 
@@ -888,6 +888,8 @@ int QDeclarativeGridView::currentIndex() const
 void QDeclarativeGridView::setCurrentIndex(int index)
 {
     Q_D(QDeclarativeGridView);
+    if (d->requestedIndex >= 0) // currently creating item
+        return;
     if (isComponentComplete() && d->isValid() && index != d->currentIndex && index < d->model->count() && index >= 0) {
         d->moveReason = QDeclarativeGridViewPrivate::SetIndex;
         cancelFlick();
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index d471749..77e3a15 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1580,6 +1580,8 @@ int QDeclarativeListView::currentIndex() const
 void QDeclarativeListView::setCurrentIndex(int index)
 {
     Q_D(QDeclarativeListView);
+    if (d->requestedIndex >= 0)  // currently creating item
+        return;
     if (isComponentComplete() && d->isValid() && index != d->currentIndex && index < d->model->count() && index >= 0) {
         d->moveReason = QDeclarativeListViewPrivate::SetIndex;
         cancelFlick();
diff --git a/tests/auto/declarative/qdeclarativegridview/data/setindex.qml b/tests/auto/declarative/qdeclarativegridview/data/setindex.qml
new file mode 100644
index 0000000..908b365
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativegridview/data/setindex.qml
@@ -0,0 +1,33 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200
+    height: 200
+    Component {
+        id: appDelegate
+
+        Item {
+            id : wrapper
+            Script {
+                 function startupFunction()
+                 {
+                     if (index == 5) view.currentIndex = index;
+
+                 }
+            }
+            Component.onCompleted: startupFunction();
+            width: 30; height: 30
+            Text { text: index }
+        }
+    }
+
+    GridView {
+        id: view
+        objectName: "grid"
+        anchors.fill: parent
+        cellWidth: 30; cellHeight: 30
+        model: 35
+        delegate: appDelegate
+        focus: true
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 9a7f517..9c7468d 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -66,6 +66,7 @@ private slots:
     void defaultValues();
     void properties();
     void positionViewAtIndex();
+    void QTBUG_8456();
 
 private:
     QDeclarativeView *createView();
@@ -657,6 +658,7 @@ void tst_QDeclarativeGridView::currentIndex()
 
     gridview->setFlow(QDeclarativeGridView::TopToBottom);
 
+    QEXPECT_FAIL("", "QTBUG-8475", Abort);
     QTest::keyClick(canvas, Qt::Key_Right);
     QCOMPARE(gridview->currentIndex(), 5);
 
@@ -882,6 +884,19 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
     delete canvas;
 }
 
+void tst_QDeclarativeGridView::QTBUG_8456()
+{
+    QDeclarativeView *canvas = createView();
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/setindex.qml"));
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QCOMPARE(gridview->currentIndex(), 0);
+}
+
 QDeclarativeView *tst_QDeclarativeGridView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
-- 
cgit v0.12


From b0005461049e6d69f7e79e7d9311e9beabfe8c39 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 24 Feb 2010 17:50:08 +1000
Subject: Add subdirs .pro for examples/declarative/extending

Also fix up a compile error.
---
 examples/declarative/extending/extending.pro               | 13 +++++++++++++
 examples/declarative/extending/valuesource/happybirthday.h |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 examples/declarative/extending/extending.pro

diff --git a/examples/declarative/extending/extending.pro b/examples/declarative/extending/extending.pro
new file mode 100644
index 0000000..169c7ab
--- /dev/null
+++ b/examples/declarative/extending/extending.pro
@@ -0,0 +1,13 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    adding \
+    attached \
+    binding \
+    coercion \
+    default \
+    extended \
+    grouped \
+    properties \
+    signal \
+    valuesource
diff --git a/examples/declarative/extending/valuesource/happybirthday.h b/examples/declarative/extending/valuesource/happybirthday.h
index 44f55e4..3e68c35 100644
--- a/examples/declarative/extending/valuesource/happybirthday.h
+++ b/examples/declarative/extending/valuesource/happybirthday.h
@@ -42,6 +42,7 @@
 #define HAPPYBIRTHDAY_H
 
 #include <QDeclarativePropertyValueSource>
+#include <QDeclarativeMetaProperty>
 #include <qdeclarative.h>
 
 #include <QStringList>
-- 
cgit v0.12


From 9872dce1dcb74216cad30301502d1c77de2356ad Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 24 Feb 2010 18:36:33 +1000
Subject: Make QDeclarativeMetaType and QDeclarativeType private

---
 src/declarative/qml/qdeclarativeboundsignal.cpp    |   2 +-
 src/declarative/qml/qdeclarativecompiler.cpp       |   2 +-
 src/declarative/qml/qdeclarativecustomparser_p.h   |   2 +-
 src/declarative/qml/qdeclarativeengine.cpp         |   5 +-
 src/declarative/qml/qdeclarativeengine_p.h         |   2 +-
 src/declarative/qml/qdeclarativeenginedebug.cpp    |   2 +-
 src/declarative/qml/qdeclarativeinfo.cpp           |   2 +-
 src/declarative/qml/qdeclarativeintegercache.cpp   |   2 +-
 src/declarative/qml/qdeclarativemetatype.cpp       |   2 +-
 src/declarative/qml/qdeclarativemetatype.h         | 144 --------------------
 src/declarative/qml/qdeclarativemetatype_p.h       | 149 +++++++++++++++++++++
 src/declarative/qml/qml.pri                        |   2 +-
 src/declarative/util/qdeclarativeanimation.cpp     |   2 +-
 src/declarative/util/qdeclarativelistaccessor.cpp  |   4 +-
 .../qdeclarativedebug/tst_qdeclarativedebug.cpp    |   2 +-
 .../tst_qdeclarativelanguage.cpp                   |   4 +-
 .../tst_qdeclarativemetatype.cpp                   |   3 +-
 17 files changed, 169 insertions(+), 162 deletions(-)
 delete mode 100644 src/declarative/qml/qdeclarativemetatype.h
 create mode 100644 src/declarative/qml/qdeclarativemetatype_p.h

diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp
index c47df32..ce396fd 100644
--- a/src/declarative/qml/qdeclarativeboundsignal.cpp
+++ b/src/declarative/qml/qdeclarativeboundsignal.cpp
@@ -45,7 +45,7 @@
 #include "qdeclarativeengine_p.h"
 #include "qdeclarativeexpression_p.h"
 #include "qdeclarativecontext_p.h"
-#include "qdeclarativemetatype.h"
+#include "qdeclarativemetatype_p.h"
 #include "qdeclarative.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarativeglobal_p.h"
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index b6ebd60..9ac65f9 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -51,7 +51,7 @@
 #include "qdeclarativeengine_p.h"
 #include "qdeclarativeengine.h"
 #include "qdeclarativecontext.h"
-#include "qdeclarativemetatype.h"
+#include "qdeclarativemetatype_p.h"
 #include "qdeclarativecustomparser_p_p.h"
 #include "qdeclarativecontext_p.h"
 #include "qdeclarativecomponent_p.h"
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
index cef1f3c..99587a8 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qdeclarativemetatype.h"
+#include "qdeclarativemetatype_p.h"
 #include "qdeclarativeerror.h"
 #include "qdeclarativeparser_p.h"
 
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 39b8a22..3229570 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -68,6 +68,7 @@
 #include "qdeclarativedirparser_p.h"
 #include "qdeclarativeextensioninterface.h"
 #include "qdeclarativelist_p.h"
+#include "qdeclarativetypenamecache_p.h"
 
 #include <qfxperf_p_p.h>
 
@@ -1503,9 +1504,6 @@ QDeclarativeEnginePrivate::Imports::~Imports()
         delete d;
 }
 
-#include "qdeclarativemetatype.h"
-#include "qdeclarativetypenamecache_p.h"
-
 static QDeclarativeTypeNameCache *cacheForNamespace(QDeclarativeEngine *engine, const QDeclarativeEnginePrivate::ImportedNamespace &set, QDeclarativeTypeNameCache *cache)
 {
     if (!cache)
@@ -1667,6 +1665,7 @@ QString QDeclarativeEnginePrivate::resolvePlugin(const QDir &dir, const QString
                                         const QStringList &suffixes,
                                         const QString &prefix)
 {
+    qWarning() << baseName;
     foreach (const QString &suffix, suffixes) {
         QString pluginFileName = prefix;
 
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 1a858d4..c4a40c5 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -67,7 +67,7 @@
 #include "qdeclarativeobjectscriptclass_p.h"
 #include "qdeclarativecontextscriptclass_p.h"
 #include "qdeclarativevaluetypescriptclass_p.h"
-#include "qdeclarativemetatype.h"
+#include "qdeclarativemetatype_p.h"
 
 #include <QtScript/QScriptClass>
 #include <QtScript/QScriptValue>
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index e4579a6..6a81e52 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -43,7 +43,7 @@
 
 #include "qdeclarativeboundsignal_p.h"
 #include "qdeclarativeengine.h"
-#include "qdeclarativemetatype.h"
+#include "qdeclarativemetatype_p.h"
 #include "qdeclarativemetaproperty.h"
 #include "qdeclarativebinding_p.h"
 #include "qdeclarativecontext_p.h"
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index 41d09c4..7dc61fd 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -43,7 +43,7 @@
 
 #include "qdeclarativedeclarativedata_p.h"
 #include "qdeclarativecontext.h"
-#include "qdeclarativemetatype.h"
+#include "qdeclarativemetatype_p.h"
 
 #include <QCoreApplication>
 
diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp
index 7fa4b0c..8fa210f 100644
--- a/src/declarative/qml/qdeclarativeintegercache.cpp
+++ b/src/declarative/qml/qdeclarativeintegercache.cpp
@@ -42,7 +42,7 @@
 #include "qdeclarativeintegercache_p.h"
 
 #include "qdeclarativeengine_p.h"
-#include "qdeclarativemetatype.h"
+#include "qdeclarativemetatype_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 7ae5a83..e87f8ba 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativemetatype.h"
+#include "qdeclarativemetatype_p.h"
 
 #include "qdeclarativeproxymetaobject_p.h"
 #include "qdeclarativecustomparser_p.h"
diff --git a/src/declarative/qml/qdeclarativemetatype.h b/src/declarative/qml/qdeclarativemetatype.h
deleted file mode 100644
index 4cddf1c..0000000
--- a/src/declarative/qml/qdeclarativemetatype.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEMETATYPE_H
-#define QDECLARATIVEMETATYPE_H
-
-#include "qdeclarativeprivate.h"
-
-#include <QtCore/qglobal.h>
-#include <QtCore/qvariant.h>
-#include <QtCore/qbitarray.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QDeclarativeType;
-class QDeclarativeCustomParser;
-class Q_DECLARATIVE_EXPORT QDeclarativeMetaType
-{
-public:
-    static bool copy(int type, void *data, const void *copy = 0);
-
-    static QList<QByteArray> qmlTypeNames();
-    static QList<QDeclarativeType*> qmlTypes();
-
-    static QDeclarativeType *qmlType(const QByteArray &, int, int);
-    static QDeclarativeType *qmlType(const QMetaObject *);
-    static QDeclarativeType *qmlType(int);
-
-    static QMetaProperty defaultProperty(const QMetaObject *);
-    static QMetaProperty defaultProperty(QObject *);
-    static QMetaMethod defaultMethod(const QMetaObject *);
-    static QMetaMethod defaultMethod(QObject *);
-
-    static bool isQObject(int);
-    static QObject *toQObject(const QVariant &, bool *ok = 0);
-
-    static int listType(int);
-    static int attachedPropertiesFuncId(const QMetaObject *);
-    static QDeclarativeAttachedPropertiesFunc attachedPropertiesFuncById(int);
-
-    enum TypeCategory { Unknown, Object, List };
-    static TypeCategory typeCategory(int);
-        
-    static bool isInterface(int);
-    static const char *interfaceIId(int);
-    static bool isList(int);
-
-    typedef QVariant (*StringConverter)(const QString &);
-    static void registerCustomStringConverter(int, StringConverter);
-    static StringConverter customStringConverter(int);
-};
-
-class QDeclarativeTypePrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeType
-{
-public:
-    QByteArray typeName() const;
-    QByteArray qmlTypeName() const;
-
-    int majorVersion() const;
-    int minorVersion() const;
-    bool availableInVersion(int vmajor, int vminor) const;
-
-    QObject *create() const;
-
-    QDeclarativeCustomParser *customParser() const;
-
-    bool isInterface() const;
-    int typeId() const;
-    int qListTypeId() const;
-
-    const QMetaObject *metaObject() const;
-    const QMetaObject *baseMetaObject() const;
-
-    QDeclarativeAttachedPropertiesFunc attachedPropertiesFunction() const;
-    const QMetaObject *attachedPropertiesType() const;
-
-    int parserStatusCast() const;
-    QVariant fromObject(QObject *) const;
-    const char *interfaceIId() const;
-    int propertyValueSourceCast() const;
-    int propertyValueInterceptorCast() const;
-
-    int index() const;
-private:
-    friend class QDeclarativeTypePrivate;
-    friend class QDeclarativeMetaTypeData;
-    friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterface &);
-    friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterType &);
-    QDeclarativeType(int, const QDeclarativePrivate::RegisterInterface &);
-    QDeclarativeType(int, const QDeclarativePrivate::RegisterType &);
-    ~QDeclarativeType();
-
-    QDeclarativeTypePrivate *d;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QDECLARATIVEMETATYPE_H
-
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
new file mode 100644
index 0000000..ec5c045
--- /dev/null
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEMETATYPE_P_H
+#define QDECLARATIVEMETATYPE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarative.h"
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qvariant.h>
+#include <QtCore/qbitarray.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeType;
+class QDeclarativeCustomParser;
+class Q_DECLARATIVE_EXPORT QDeclarativeMetaType
+{
+public:
+    static bool copy(int type, void *data, const void *copy = 0);
+
+    static QList<QByteArray> qmlTypeNames();
+    static QList<QDeclarativeType*> qmlTypes();
+
+    static QDeclarativeType *qmlType(const QByteArray &, int, int);
+    static QDeclarativeType *qmlType(const QMetaObject *);
+    static QDeclarativeType *qmlType(int);
+
+    static QMetaProperty defaultProperty(const QMetaObject *);
+    static QMetaProperty defaultProperty(QObject *);
+    static QMetaMethod defaultMethod(const QMetaObject *);
+    static QMetaMethod defaultMethod(QObject *);
+
+    static bool isQObject(int);
+    static QObject *toQObject(const QVariant &, bool *ok = 0);
+
+    static int listType(int);
+    static int attachedPropertiesFuncId(const QMetaObject *);
+    static QDeclarativeAttachedPropertiesFunc attachedPropertiesFuncById(int);
+
+    enum TypeCategory { Unknown, Object, List };
+    static TypeCategory typeCategory(int);
+        
+    static bool isInterface(int);
+    static const char *interfaceIId(int);
+    static bool isList(int);
+
+    typedef QVariant (*StringConverter)(const QString &);
+    static void registerCustomStringConverter(int, StringConverter);
+    static StringConverter customStringConverter(int);
+};
+
+class QDeclarativeTypePrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeType
+{
+public:
+    QByteArray typeName() const;
+    QByteArray qmlTypeName() const;
+
+    int majorVersion() const;
+    int minorVersion() const;
+    bool availableInVersion(int vmajor, int vminor) const;
+
+    QObject *create() const;
+
+    QDeclarativeCustomParser *customParser() const;
+
+    bool isInterface() const;
+    int typeId() const;
+    int qListTypeId() const;
+
+    const QMetaObject *metaObject() const;
+    const QMetaObject *baseMetaObject() const;
+
+    QDeclarativeAttachedPropertiesFunc attachedPropertiesFunction() const;
+    const QMetaObject *attachedPropertiesType() const;
+
+    int parserStatusCast() const;
+    QVariant fromObject(QObject *) const;
+    const char *interfaceIId() const;
+    int propertyValueSourceCast() const;
+    int propertyValueInterceptorCast() const;
+
+    int index() const;
+private:
+    friend class QDeclarativeTypePrivate;
+    friend class QDeclarativeMetaTypeData;
+    friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterface &);
+    friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterType &);
+    QDeclarativeType(int, const QDeclarativePrivate::RegisterInterface &);
+    QDeclarativeType(int, const QDeclarativePrivate::RegisterType &);
+    ~QDeclarativeType();
+
+    QDeclarativeTypePrivate *d;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEMETATYPE_P_H
+
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 8285bb9..8a43cec 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -80,7 +80,7 @@ HEADERS += \
     $$PWD/qdeclarativedom_p.h \
     $$PWD/qdeclarativedom_p_p.h \
     $$PWD/qdeclarativerefcount_p.h \
-    $$PWD/qdeclarativemetatype.h \
+    $$PWD/qdeclarativemetatype_p.h \
     $$PWD/qdeclarativeengine.h \
     $$PWD/qdeclarativecontext.h \
     $$PWD/qdeclarativeexpression.h \
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 88b64fd..eb3a376 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -51,7 +51,7 @@
 #include <qdeclarativeexpression.h>
 #include <qdeclarativestringconverters_p.h>
 #include <qdeclarativeglobal_p.h>
-#include <qdeclarativemetatype.h>
+#include <qdeclarativemetatype_p.h>
 
 #include <qvariant.h>
 #include <qcolor.h>
diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp
index 346f3e4..4e56909 100644
--- a/src/declarative/util/qdeclarativelistaccessor.cpp
+++ b/src/declarative/util/qdeclarativelistaccessor.cpp
@@ -41,9 +41,9 @@
 
 #include "qdeclarativelistaccessor_p.h"
 
-#include <qdeclarativemetatype.h>
+#include <qdeclarativemetatype_p.h>
 
-#include <QStringList>
+#include <QtCore/qstringlist.h>
 #include <QtCore/qdebug.h>
 
 // ### Remove me
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index 1c8cbbc..40cd737 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -49,7 +49,6 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qdeclarativeexpression.h>
-#include <QtDeclarative/qdeclarativemetatype.h>
 #include <QtDeclarative/qdeclarativemetaproperty.h>
 
 #include <private/qdeclarativebinding_p.h>
@@ -58,6 +57,7 @@
 #include <private/qdeclarativedebugclient_p.h>
 #include <private/qdeclarativedebugservice_p.h>
 #include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativemetatype_p.h>
 
 #include "../shared/debugutil_p.h"
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 16af0d9..ae07112 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -41,12 +41,14 @@
 #include <qtest.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativemetatype.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qdir.h>
+
 #include <private/qdeclarativemetaproperty_p.h>
+#include <private/qdeclarativemetatype_p.h>
+
 #include "testtypes.h"
 
 #include "../../../shared/util.h"
diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
index ca16214..4333e02 100644
--- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
+++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDeclarativeMetaType>
 #include <QLocale>
 #include <QPixmap>
 #include <QBitmap>
@@ -53,6 +52,8 @@
 #include <QQuaternion>
 #include <qdeclarative.h>
 
+#include <private/qdeclarativemetatype_p.h>
+
 class tst_qdeclarativemetatype : public QObject
 {
     Q_OBJECT
-- 
cgit v0.12


From ff92c1cd2bf5171637b51d5eb646b165d6f11ec3 Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Wed, 24 Feb 2010 12:13:51 +0100
Subject: Build fix when using <QtDeclarative> include.

---
 src/declarative/qml/qdeclarativeprivate.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index e8bbff4..01369d4 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -44,6 +44,9 @@
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
+#ifndef Q_OS_WIN
+#include <stdint.h>
+#endif
 
 QT_BEGIN_HEADER
 
-- 
cgit v0.12


From a343544b0fcb245cf0a0edbbce153611a6342374 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Wed, 24 Feb 2010 15:41:59 +0100
Subject: Explain the onPropertyChanged pattern in the docs.

---
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index d492dbd..c282808 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1172,6 +1172,17 @@ QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObjec
 
     See the \l {Keys}{Keys} attached property for detailed documentation.
 
+    \section 1 Property Change Signals
+
+    Most properties on Item and Item derivatives have a signal
+    emitted when they change. By convention, the signals are
+    named <propertyName>Changed, e.g. xChanged will be emitted when an item's
+    x property changes. Note that these also have signal handers e.g.
+    the onXChanged signal handler will be called when an item's x property
+    changes. For many properties in Item or Item derivatives this can be used
+    to add a touch of imperative logic to your application (when absolutely
+    necessary).
+
     \ingroup group_coreitems
 */
 
-- 
cgit v0.12


From 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Wed, 24 Feb 2010 16:26:09 +0100
Subject: Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView

Could use to be renamed. Possibly to
-QDeclarativeViewGraphicsWidget
-QGraphicsDeclarativeViewWidget (Or QGraphicsD20, in the spirit of i18n)
But those aren't any shorter.

Task-number: QTBUG-7067
---
 doc/src/declarative/integrating.qdoc               |  10 +
 .../util/qdeclarativegraphicswidget.cpp            | 457 +++++++++++++++++++++
 src/declarative/util/qdeclarativegraphicswidget.h  | 113 +++++
 src/declarative/util/util.pri                      |   6 +-
 4 files changed, 584 insertions(+), 2 deletions(-)
 create mode 100644 src/declarative/util/qdeclarativegraphicswidget.cpp
 create mode 100644 src/declarative/util/qdeclarativegraphicswidget.h

diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index c685d3d..09ed178 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -86,6 +86,9 @@ QGraphicsObject *object =
 scene->addItem(object);
 \endcode
 
+There is a convenience QGraphicsWidget subclass, QDeclarativeGraphicsWidget, which takes care of the engine
+and component instantiation for you.
+
 The following QGraphicsView options are recommended for optimal performance
 of QML UIs:
 
@@ -95,6 +98,13 @@ of QML UIs:
 \o QGraphicsScene::setItemIndexMethod(QGraphicsScene::NoIndex);
 \endlist
 
+And the following QGraphicsView options are required for QML key handling to work:
+
+\list
+\o QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus);
+\o QGraphicsScene::setStickyFocus(true);
+\endlist
+
 \section1 Using existing QGraphicsWidgets in QML
 Another way of integrating with a QGraphicsView based UI is to expose your
 existing QGraphicsWidgets to QML, and constructing your scene in QML. Note that
diff --git a/src/declarative/util/qdeclarativegraphicswidget.cpp b/src/declarative/util/qdeclarativegraphicswidget.cpp
new file mode 100644
index 0000000..1d0d468
--- /dev/null
+++ b/src/declarative/util/qdeclarativegraphicswidget.cpp
@@ -0,0 +1,457 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativegraphicswidget.h"
+
+#include "qperformancelog_p_p.h"
+#include "qfxperf_p_p.h"
+
+#include <qdeclarative.h>
+#include <qdeclarativeitem.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativedebug_p.h>
+#include <qdeclarativedebugservice_p.h>
+#include <qdeclarativeglobal_p.h>
+#include <qdeclarativeerror.h>
+
+#include <qscriptvalueiterator.h>
+#include <qdebug.h>
+#include <qtimer.h>
+#include <qevent.h>
+#include <qdir.h>
+#include <qcoreapplication.h>
+#include <qfontdatabase.h>
+#include <qicon.h>
+#include <qurl.h>
+#include <qboxlayout.h>
+#include <qbasictimer.h>
+#include <QtCore/qabstractanimation.h>
+#include <private/qguard_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeGraphicsWidgetSharedQDeclarativeEngine
+{
+public:
+    QDeclarativeGraphicsWidgetSharedQDeclarativeEngine(){}
+
+    static QDeclarativeEngine* sharedEngine(){
+        if(!references)
+            return 0;
+        return &QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::m_instance->engine;
+    }
+    static void attach(){
+        if(!references++)
+            m_instance = new QDeclarativeGraphicsWidgetSharedQDeclarativeEngine();
+    }
+
+    static void detach(){
+        if(!--references)
+            delete m_instance;
+    }
+
+private:
+    static QDeclarativeGraphicsWidgetSharedQDeclarativeEngine* m_instance;
+    static int references;
+    QDeclarativeEngine engine;
+};
+
+int QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::references = 0;
+QDeclarativeGraphicsWidgetSharedQDeclarativeEngine* QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::m_instance = 0;
+
+class QDeclarativeGraphicsWidgetPrivate
+{
+public:
+    QDeclarativeGraphicsWidgetPrivate()
+        : root(0), component(0),
+          resizeMode(QDeclarativeGraphicsWidget::SizeViewToRootObject) 
+    {
+        QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::attach();
+        engine = QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::sharedEngine();
+    }
+
+    ~QDeclarativeGraphicsWidgetPrivate()
+    {
+        QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::detach();
+    }
+
+    QGuard<QGraphicsObject> root;
+    QGuard<QDeclarativeItem> declarativeRoot;
+
+    QUrl source;
+
+    QDeclarativeEngine* engine;
+    QDeclarativeComponent *component;
+    QBasicTimer resizetimer;
+
+    mutable QSize initialSize;
+    QDeclarativeGraphicsWidget::ResizeMode resizeMode;
+
+    void init();
+
+};
+
+/*!
+    \class QDeclarativeGraphicsWidget
+    \brief The QDeclarativeGraphicsWidget class provides a QGraphicsWidget for displaying a Qt Declarative user interface.
+
+    Any QGraphicsObject or QDeclarativeGraphicsItem
+    created via Qt Declarative can be placed on a standard QGraphicsScene and viewed with a standard
+    QGraphicsView.
+
+    QDeclarativeGraphicsWidget is a convenience class which handles QDeclarativeComponent loading and object creation.
+    It shares the same QDeclarativeEngine between all QDeclarativeGraphicsWidgets in the application, to minimize overhead.
+
+    QDeclarativeGraphicsWidget is ideal for when you have many small components styled with Qt Declarative, and want to integrate
+    them into a larger QGraphicsItem based scene. If your interface is primarily Qt Declarative based, consider using QDeclarativeView
+    instead.
+
+    Note that the following settings on your QGraphicsScene/View are recommended for optimal performance with Qt Declarative:
+        \list
+        \o QGraphicsView::setOptimizationFlags(QGraphicsView::DontSavePainterState);
+        \o QGraphicsView::setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+        \o QGraphicsScene::setItemIndexMethod(QGraphicsScene::NoIndex);
+        \endlist
+    Also note that the following settings on your QGraphicsScene/View are required for key handling in Qt Declarative to work:
+        \list
+        \o QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus);
+        \o QGraphicsScene::setStickyFocus(true);
+        \endlist
+
+    To receive errors related to loading and executing declarative files with QDeclarativeGraphicsWidget,
+    you can connect to the statusChanged() signal and monitor for QDeclarativeGraphicsWidget::Error.
+    The errors are available via QDeclarativeGraphicsWidget::errors().
+*/
+
+
+/*! \fn void QDeclarativeGraphicsWidget::sceneResized(QSize size)
+  This signal is emitted when the view is resized to \a size.
+*/
+
+/*! \fn void QDeclarativeGraphicsWidget::statusChanged(QDeclarativeGraphicsWidget::Status status)
+    This signal is emitted when the component's current \l{QDeclarativeGraphicsWidget::Status} {status} changes.
+*/
+
+/*!
+  \fn QDeclarativeGraphicsWidget::QDeclarativeGraphicsWidget(QGraphicsItem *parent)
+
+  Constructs a QDeclarativeGraphicsWidget with the given \a parent.
+*/
+QDeclarativeGraphicsWidget::QDeclarativeGraphicsWidget(QGraphicsItem *parent)
+: QGraphicsWidget(parent), d(new QDeclarativeGraphicsWidgetPrivate)
+{
+    setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
+    d->init();
+}
+
+void QDeclarativeGraphicsWidgetPrivate::init()
+{
+}
+
+/*!
+  The destructor clears the view's \l {QGraphicsObject} {items} and
+  deletes the internal representation.
+ */
+QDeclarativeGraphicsWidget::~QDeclarativeGraphicsWidget()
+{
+    delete d->root;
+    delete d;
+}
+
+/*!
+    Sets the source to the \a url.
+
+    Will also load the QML file and instantiate the component.
+
+ */
+void QDeclarativeGraphicsWidget::setSource(const QUrl& url)
+{
+    d->source = url;
+
+    //Execute
+    if(d->root)
+        delete d->root;
+    if(d->component)
+        delete d->component;
+    d->component = new QDeclarativeComponent(d->engine, d->source, this);
+
+    if (!d->component->isLoading()) {
+        continueExecute();
+    } else {
+        connect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
+    }
+}
+
+/*!
+  Returns the source URL, if set.
+
+  \sa setSource()
+ */
+QUrl QDeclarativeGraphicsWidget::source() const
+{
+    return d->source;
+}
+
+/*!
+  Returns a pointer to the QDeclarativeEngine used for instantiating
+  Qt Declarative Components.
+ */
+QDeclarativeEngine* QDeclarativeGraphicsWidget::engine()
+{
+    return d->engine;
+}
+
+/*!
+  This function returns the root of the context hierarchy.  Each declarative
+  component is instantiated in a QDeclarativeContext.  QDeclarativeContext's are
+  essential for passing data to declarative components.  In Qt Declarative, contexts are
+  arranged hierarchically and this hierarchy is managed by the
+  QDeclarativeEngine.
+ */
+QDeclarativeContext* QDeclarativeGraphicsWidget::rootContext()
+{
+    return d->engine->rootContext();
+}
+
+
+/*!
+  \enum QDeclarativeGraphicsWidget::Status
+
+    Specifies the loading status of the QDeclarativeGraphicsWidget.
+
+    \value Null This QDeclarativeGraphicsWidget has no source set.
+    \value Ready This QDeclarativeGraphicsWidget has loaded and created the declarative component.
+    \value Loading This QDeclarativeGraphicsWidget is loading network data.
+    \value Error An error has occured.  Calling errorDescription() to retrieve a description.
+*/
+
+/*!
+    \property QDeclarativeGraphicsWidget::status
+    The component's current \l{QDeclarativeGraphicsWidget::Status} {status}.
+*/
+
+QDeclarativeGraphicsWidget::Status QDeclarativeGraphicsWidget::status() const
+{
+    if (!d->component)
+        return QDeclarativeGraphicsWidget::Null;
+
+    return QDeclarativeGraphicsWidget::Status(d->component->status());
+}
+
+/*!
+    Return the list of errors that occured during the last compile or create
+    operation.  An empty list is returned if isError() is not set.
+*/
+QList<QDeclarativeError> QDeclarativeGraphicsWidget::errors() const
+{
+    if (d->component)
+        return d->component->errors();
+    return QList<QDeclarativeError>();
+}
+
+
+/*!
+    \property QDeclarativeGraphicsWidget::resizeMode
+    \brief whether the view should resize the canvas contents
+
+    If this property is set to SizeViewToRootObject (the default), the view
+    resizes with the root item in the declarative file.
+
+    If this property is set to SizeRootObjectToView, the view will
+    automatically resize the root item.
+
+    Regardless of this property, the sizeHint of the view
+    is the initial size of the root item. Note though that
+    since declarative files may load dynamically, that size may change.
+
+    \sa initialSize()
+*/
+
+void QDeclarativeGraphicsWidget::setResizeMode(ResizeMode mode)
+{
+    if (d->resizeMode == mode)
+        return;
+
+    d->resizeMode = mode;
+    if (d->declarativeRoot) {
+        if (d->resizeMode == SizeRootObjectToView) {
+            d->declarativeRoot->setWidth(size().width());
+            d->declarativeRoot->setHeight(size().height());
+        } else {
+            d->declarativeRoot->setWidth(d->initialSize.width());
+            d->declarativeRoot->setHeight(d->initialSize.height());
+        }
+    }
+}
+
+QDeclarativeGraphicsWidget::ResizeMode QDeclarativeGraphicsWidget::resizeMode() const
+{
+    return d->resizeMode;
+}
+
+/*!
+  \internal
+ */
+void QDeclarativeGraphicsWidget::continueExecute()
+{
+
+    disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
+
+    if (d->component->isError()) {
+        QList<QDeclarativeError> errorList = d->component->errors();
+        foreach (const QDeclarativeError &error, errorList) {
+            qWarning() << error;
+        }
+        emit statusChanged(status());
+        return;
+    }
+
+    QObject *obj = d->component->create();
+
+    if(d->component->isError()) {
+        QList<QDeclarativeError> errorList = d->component->errors();
+        foreach (const QDeclarativeError &error, errorList) {
+            qWarning() << error;
+        }
+        emit statusChanged(status());
+        return;
+    }
+
+    if (obj) {
+        if (QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(obj)) {
+
+            item->QGraphicsItem::setParentItem(this);
+            item->QObject::setParent(this);
+
+            d->root = item;
+            d->declarativeRoot = item;
+            connect(item, SIGNAL(widthChanged()), this, SLOT(sizeChanged()));
+            connect(item, SIGNAL(heightChanged()), this, SLOT(sizeChanged()));
+            if (d->initialSize.height() <= 0 && d->declarativeRoot->width() > 0)
+                d->initialSize.setWidth(d->declarativeRoot->width());
+            if (d->initialSize.height() <= 0 && d->declarativeRoot->height() > 0)
+                d->initialSize.setHeight(d->declarativeRoot->height());
+            resize(d->initialSize);
+
+            if (d->resizeMode == SizeRootObjectToView) {
+                d->declarativeRoot->setWidth(size().width());
+                d->declarativeRoot->setHeight(size().height());
+            } else {
+                QSizeF sz(d->declarativeRoot->width(),d->declarativeRoot->height());
+                emit sceneResized(sz);
+                resize(sz);
+            }
+            updateGeometry();
+        } else if (QGraphicsObject *item = qobject_cast<QGraphicsObject *>(obj)) {
+            item->setParent(this);
+            qWarning() << "QDeclarativeGraphicsWidget::resizeMode is not honored for components of type QGraphicsObject";
+        } else if (qobject_cast<QWidget *>(obj)) {
+            qWarning() << "QDeclarativeGraphicsWidget does not support loading QML files containing QWidgets";
+        }
+    }
+    emit statusChanged(status());
+}
+
+/*!
+  \internal
+ */
+void QDeclarativeGraphicsWidget::sizeChanged()
+{
+    // delay, so we catch both width and height changing.
+    d->resizetimer.start(0,this);
+}
+
+/*!
+  \internal
+  If the \l {QTimerEvent} {timer event} \a e is this
+  view's resize timer, sceneResized() is emitted.
+ */
+void QDeclarativeGraphicsWidget::timerEvent(QTimerEvent* e)
+{
+    if (!e || e->timerId() == d->resizetimer.timerId()) {
+        if (d->declarativeRoot) {
+            QSize sz(d->declarativeRoot->width(),d->declarativeRoot->height());
+            emit sceneResized(sz);
+        }
+        d->resizetimer.stop();
+        updateGeometry();
+    }
+}
+
+/*!
+    \internal
+    The size hint is the size of the root item.
+*/
+QSizeF QDeclarativeGraphicsWidget::sizeHint() const
+{
+    if (d->declarativeRoot) {
+        if (d->initialSize.width() <= 0)
+            d->initialSize.setWidth(d->declarativeRoot->width());
+        if (d->initialSize.height() <= 0)
+            d->initialSize.setHeight(d->declarativeRoot->height());
+    }
+    return d->initialSize;
+}
+
+/*!
+  Returns the view's root \l {QGraphicsObject} {item}.
+ */
+QGraphicsObject *QDeclarativeGraphicsWidget::rootObject() const
+{
+    return d->root;
+}
+
+/*!
+  \internal
+  This function handles the \l {QGraphicsSceneResizeEvent} {resize event}
+  \a e.
+ */
+void QDeclarativeGraphicsWidget::resizeEvent(QGraphicsSceneResizeEvent *e)
+{
+    if (d->resizeMode == SizeRootObjectToView && d->declarativeRoot) {
+        d->declarativeRoot->setWidth(size().width());
+        d->declarativeRoot->setHeight(size().height());
+    }
+    QGraphicsWidget::resizeEvent(e);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativegraphicswidget.h b/src/declarative/util/qdeclarativegraphicswidget.h
new file mode 100644
index 0000000..33ebc7b
--- /dev/null
+++ b/src/declarative/util/qdeclarativegraphicswidget.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEGRAPHICSWIDGET_H
+#define QDECLARATIVEGRAPHICSWIDGET_H
+
+#include <QtCore/qdatetime.h>
+#include <QtCore/qurl.h>
+#include <QtGui/qgraphicssceneevent.h>
+#include <QtGui/qgraphicswidget.h>
+#include <QtGui/qwidget.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QGraphicsObject;
+class QDeclarativeEngine;
+class QDeclarativeContext;
+class QDeclarativeError;
+
+class QDeclarativeGraphicsWidgetPrivate;
+
+class Q_DECLARATIVE_EXPORT QDeclarativeGraphicsWidget : public QGraphicsWidget
+{
+    Q_OBJECT
+    Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(QUrl source READ source WRITE setSource)
+
+public:
+    explicit QDeclarativeGraphicsWidget(QGraphicsItem *parent = 0);
+    virtual ~QDeclarativeGraphicsWidget();
+
+    QUrl source() const;
+    void setSource(const QUrl&);
+
+    QDeclarativeEngine* engine();
+    QDeclarativeContext* rootContext();
+
+    QGraphicsObject *rootObject() const;
+
+    enum ResizeMode { SizeViewToRootObject, SizeRootObjectToView };
+    ResizeMode resizeMode() const;
+    void setResizeMode(ResizeMode);
+    QSizeF sizeHint() const;
+
+    enum Status { Null, Ready, Loading, Error };
+    Status status() const;
+
+    QList<QDeclarativeError> errors() const;
+
+Q_SIGNALS:
+    void sceneResized(QSizeF size);
+    void statusChanged(QDeclarativeGraphicsWidget::Status);
+
+private Q_SLOTS:
+    void continueExecute();
+    void sizeChanged();
+
+protected:
+    virtual void resizeEvent(QGraphicsSceneResizeEvent *);
+    void timerEvent(QTimerEvent*);
+
+private:
+    QDeclarativeGraphicsWidgetPrivate* d;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEGRAPHICSWIDGET_H
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 610eb3f..46126e5 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -30,7 +30,8 @@ SOURCES += \
     $$PWD/qdeclarativedatetimeformatter.cpp \
     $$PWD/qdeclarativebehavior.cpp \
     $$PWD/qdeclarativefontloader.cpp \
-    $$PWD/qdeclarativestyledtext.cpp
+    $$PWD/qdeclarativestyledtext.cpp \
+    $$PWD/qdeclarativegraphicswidget.cpp
 
 HEADERS += \
     $$PWD/qdeclarativeutilmodule_p.h\
@@ -65,7 +66,8 @@ HEADERS += \
     $$PWD/qdeclarativedatetimeformatter_p.h \
     $$PWD/qdeclarativebehavior_p.h \
     $$PWD/qdeclarativefontloader_p.h \
-    $$PWD/qdeclarativestyledtext_p.h
+    $$PWD/qdeclarativestyledtext_p.h \
+    $$PWD/qdeclarativegraphicswidget.h
 
 contains(QT_CONFIG, xmlpatterns) {
     QT+=xmlpatterns
-- 
cgit v0.12


From 5867481c77e960a7d7b4cb3e9a7a4dffb9d68e92 Mon Sep 17 00:00:00 2001
From: mae <qt-info@nokia.com>
Date: Wed, 24 Feb 2010 17:03:30 +0100
Subject: Add support for qml imports directory in configure, qmake, and
 qmlengine

---
 configure                                  | 22 ++++++++++++++++++++++
 qmake/option.h                             |  3 ++-
 qmake/property.cpp                         |  3 +++
 src/corelib/global/qlibraryinfo.cpp        |  6 ++++++
 src/corelib/global/qlibraryinfo.h          |  3 ++-
 src/declarative/qml/qdeclarativeengine.cpp | 19 ++++++++++++-------
 tools/configure/configureapp.cpp           | 16 +++++++++++++++-
 7 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index f8a2e95..1c3c99b 100755
--- a/configure
+++ b/configure
@@ -792,6 +792,7 @@ QT_INSTALL_HEADERS=
 QT_INSTALL_LIBS=
 QT_INSTALL_BINS=
 QT_INSTALL_PLUGINS=
+QT_INSTALL_IMPORTS=
 QT_INSTALL_DATA=
 QT_INSTALL_TRANSLATIONS=
 QT_INSTALL_SETTINGS=
@@ -1140,6 +1141,9 @@ while [ "$#" -gt 0 ]; do
     plugindir)
         QT_INSTALL_PLUGINS="$VAL"
         ;;
+    importdir)
+        QT_INSTALL_IMPORTS="$VAL"
+        ;;
     datadir)
         QT_INSTALL_DATA="$VAL"
         ;;
@@ -3185,6 +3189,17 @@ if [ -z "$QT_INSTALL_PLUGINS" ]; then #default
 fi
 QT_INSTALL_PLUGINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PLUGINS"`
 
+#imports
+if [ -z "$QT_INSTALL_IMPORTS" ]; then #default
+    if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
+	if [ "$PLATFORM_MAC" = "yes" ]; then
+	    QT_INSTALL_IMPORTS="/Developer/Applications/Qt/imports"
+        fi
+    fi
+    [ -z "$QT_INSTALL_IMPORTS" ] && QT_INSTALL_IMPORTS="$QT_INSTALL_PREFIX/imports" #fallback
+fi
+QT_INSTALL_IMPORTS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_IMPORTS"`
+
 #data
 if [ -z "$QT_INSTALL_DATA" ]; then #default
     QT_INSTALL_DATA="$QT_INSTALL_PREFIX"
@@ -3347,6 +3362,8 @@ cat <<EOF
                             (default PREFIX/include)
     -plugindir <dir> ...... Plugins will be installed to <dir>
                             (default PREFIX/plugins)
+    -importdir <dir> ...... Imports for QML will be installed to <dir>
+                            (default PREFIX/imports)
     -datadir <dir> ........ Data used by Qt programs will be installed to <dir>
                             (default PREFIX)
     -translationdir <dir> . Translations of Qt programs will be installed to <dir>
@@ -4142,6 +4159,7 @@ HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_IN
 LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
 BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
 PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
+IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
 DATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_INSTALL_DATA"`
 TRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_INSTALL_TRANSLATIONS"`
 SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
@@ -4166,6 +4184,7 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then
     HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
     HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
     HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
+    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
     HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"`
     HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"`
     HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
@@ -4182,6 +4201,7 @@ static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_
 static const char qt_configure_libraries_path_str    [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
 static const char qt_configure_binaries_path_str     [256 + 12] = "$HOSTBINARIES_PATH_STR";
 static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
+static const char qt_configure_imports_path_str      [256 + 12] = "$HOSTIMPORTS_PATH_STR";
 static const char qt_configure_data_path_str         [256 + 12] = "$HOSTDATA_PATH_STR";
 static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
 static const char qt_configure_settings_path_str     [256 + 12] = "$HOSTSETTINGS_PATH_STR";
@@ -4199,6 +4219,7 @@ static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH
 static const char qt_configure_libraries_path_str    [256 + 12] = "$LIBRARIES_PATH_STR";
 static const char qt_configure_binaries_path_str     [256 + 12] = "$BINARIES_PATH_STR";
 static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
+static const char qt_configure_imports_path_str      [256 + 12] = "$IMPORTS_PATH_STR";
 static const char qt_configure_data_path_str         [256 + 12] = "$DATA_PATH_STR";
 static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR";
 static const char qt_configure_settings_path_str     [256 + 12] = "$SETTINGS_PATH_STR";
@@ -4223,6 +4244,7 @@ cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
 #define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
 #define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
 #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
+#define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
 #define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;
 #define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;
 #define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12;
diff --git a/qmake/option.h b/qmake/option.h
index 514e442..a2ca676 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -205,7 +205,8 @@ public:
         TranslationsPath,
         SettingsPath,
         DemosPath,
-        ExamplesPath
+        ExamplesPath,
+        ImportsPath
     };
     static QString location(LibraryLocation);
 };
diff --git a/qmake/property.cpp b/qmake/property.cpp
index cab034f..fde7c65 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -95,6 +95,8 @@ QMakeProperty::value(QString v, bool just_check)
         return QLibraryInfo::location(QLibraryInfo::BinariesPath);
     else if(v == "QT_INSTALL_PLUGINS")
         return QLibraryInfo::location(QLibraryInfo::PluginsPath);
+    else if(v == "QT_INSTALL_IMPORTS")
+        return QLibraryInfo::location(QLibraryInfo::ImportsPath);
     else if(v == "QT_INSTALL_TRANSLATIONS")
         return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
     else if(v == "QT_INSTALL_CONFIGURATION")
@@ -191,6 +193,7 @@ QMakeProperty::exec()
             specialProps.append("QT_INSTALL_LIBS");
             specialProps.append("QT_INSTALL_BINS");
             specialProps.append("QT_INSTALL_PLUGINS");
+            specialProps.append("QT_INSTALL_IMPORTS");
             specialProps.append("QT_INSTALL_TRANSLATIONS");
             specialProps.append("QT_INSTALL_CONFIGURATION");
             specialProps.append("QT_INSTALL_EXAMPLES");
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index a9ea44a..9690406 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -266,6 +266,11 @@ QLibraryInfo::location(LibraryLocation loc)
             path = QT_CONFIGURE_PLUGINS_PATH;
             break;
 #endif
+#ifdef QT_CONFIGURE_IMPORTS_PATH
+        case ImportsPath:
+            path = QT_CONFIGURE_IMPORTS_PATH;
+            break;
+#endif
 #ifdef QT_CONFIGURE_DATA_PATH
         case DataPath:
             path = QT_CONFIGURE_DATA_PATH;
@@ -470,6 +475,7 @@ QLibraryInfo::location(LibraryLocation loc)
     \value LibrariesPath The location of installed librarires.
     \value BinariesPath The location of installed Qt binaries (tools and applications).
     \value PluginsPath The location of installed Qt plugins.
+    \value ImportsPath The location of installed QML extensions to import.
     \value DataPath The location of general Qt data.
     \value TranslationsPath The location of translation information for Qt strings.
     \value SettingsPath The location for Qt settings.
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index e64b760..4a7ba06 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -76,7 +76,8 @@ public:
         TranslationsPath,
         SettingsPath,
         DemosPath,
-        ExamplesPath
+        ExamplesPath,
+        ImportsPath
     };
     static QString location(LibraryLocation); // ### Qt 5: consider renaming it to path()
 
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 3229570..4435a5b 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -170,7 +170,6 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e)
         QDeclarativeEnginePrivate::defineModule();
     }
     globalClass = new QDeclarativeGlobalScriptClass(&scriptEngine);
-    fileImportPath.append(QLibraryInfo::location(QLibraryInfo::DataPath)+QDir::separator()+QLatin1String("qml"));
 
     // env import paths
     QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
@@ -1384,6 +1383,9 @@ public:
             paths += QFileInfo(base.toLocalFile()).path();
             paths += importPath;
             paths += QDeclarativeEnginePrivate::get(engine)->environmentImportPath;
+            QString builtinPath = QLibraryInfo::location(QLibraryInfo::ImportsPath);
+            if (!builtinPath.isEmpty())
+                paths += builtinPath;
 
             foreach (const QString &p, paths) {
                 dir = p+QLatin1Char('/')+url;
@@ -1592,14 +1594,17 @@ QUrl QDeclarativeEnginePrivate::Imports::baseUrl() const
   Adds \a path as a directory where installed QML components are
   defined in a URL-based directory structure.
 
-  For example, if you add \c /opt/MyApp/lib/qml and then load QML
+  For example, if you add \c /opt/MyApp/lib/imports and then load QML
   that imports \c com.mycompany.Feature, then QDeclarativeEngine will look
-  in \c /opt/MyApp/lib/qml/com/mycompany/Feature/ for the components
-  provided by that module (and in the case of versioned imports,
-  for the \c qmldir file definiting the type version mapping.
+  in \c /opt/MyApp/lib/imports/com/mycompany/Feature/ for the components
+  provided by that module. A \c qmldir file is required for definiting the
+  type version mapping and possibly declarative extensions plugins.
+
+  The engine searches in the base directory of the qml file, then
+  the paths added via addImportPath(), then the paths specified in the
+  \c QML_IMPORT_PATH environment variable, then the builtin \c ImportsPath from
+  QLibraryInfo.
 
-  By default, only the "qml" subdirectory of QLibraryInfo::location(QLibraryInfo::DataPath)
-  is included on the import path.
 */
 void QDeclarativeEngine::addImportPath(const QString& path)
 {
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 3b5a10a..1fe4503 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1065,6 +1065,12 @@ void Configure::parseCmdLine()
             dictionary[ "QT_INSTALL_PLUGINS" ] = configCmdLine.at(i);
         }
 
+        else if( configCmdLine.at(i) == "-importdir" ) {
+            ++i;
+            if(i==argCount)
+                break;
+            dictionary[ "QT_INSTALL_IMPORTS" ] = configCmdLine.at(i);
+        }
         else if( configCmdLine.at(i) == "-datadir" ) {
             ++i;
             if(i==argCount)
@@ -1482,6 +1488,7 @@ void Configure::applySpecSpecifics()
         dictionary[ "QT_HOST_PREFIX" ]      = dictionary[ "QT_INSTALL_PREFIX" ];
         dictionary[ "QT_INSTALL_PREFIX" ]   = "";
         dictionary[ "QT_INSTALL_PLUGINS" ]  = "\\resource\\qt\\plugins";
+        dictionary[ "QT_INSTALL_IMPORTS" ]  = "\\resource\\qt\\imports";
         dictionary[ "ARM_FPU_TYPE" ]        = "softvfp";
         dictionary[ "SQL_SQLITE" ]          = "yes";
         dictionary[ "SQL_SQLITE_LIB" ]      = "system";
@@ -1558,7 +1565,7 @@ bool Configure::displayHelp()
         desc("Usage: configure [-buildkey <key>]\n"
 //      desc("Usage: configure [-prefix dir] [-bindir <dir>] [-libdir <dir>]\n"
 //                  "[-docdir <dir>] [-headerdir <dir>] [-plugindir <dir>]\n"
-//                  "[-datadir <dir>] [-translationdir <dir>]\n"
+//                  "[-importdir <dir>] [-datadir <dir>] [-translationdir <dir>]\n"
 //                  "[-examplesdir <dir>] [-demosdir <dir>][-buildkey <key>]\n"
                     "[-release] [-debug] [-debug-and-release] [-shared] [-static]\n"
                     "[-no-fast] [-fast] [-no-exceptions] [-exceptions]\n"
@@ -1598,6 +1605,7 @@ bool Configure::displayHelp()
         desc(                   "-docdir <dir>",        "Documentation will be installed to dir\n(default PREFIX/doc)");
         desc(                   "-headerdir <dir>",     "Headers will be installed to dir\n(default PREFIX/include)");
         desc(                   "-plugindir <dir>",     "Plugins will be installed to dir\n(default PREFIX/plugins)");
+        desc(                   "-importdir <dir>",     "Imports for QML will be installed to dir\n(default PREFIX/imports)");
         desc(                   "-datadir <dir>",       "Data used by Qt programs will be installed to dir\n(default PREFIX)");
         desc(                   "-translationdir <dir>","Translations of Qt programs will be installed to dir\n(default PREFIX/translations)\n");
         desc(                   "-examplesdir <dir>",   "Examples will be installed to dir\n(default PREFIX/examples)");
@@ -2646,6 +2654,8 @@ void Configure::generateOutputVars()
         dictionary[ "QT_INSTALL_BINS" ] = qipempty ? "" : fixSeparators( dictionary[ "QT_INSTALL_PREFIX" ] + "/bin" );
     if( !dictionary[ "QT_INSTALL_PLUGINS" ].size() )
         dictionary[ "QT_INSTALL_PLUGINS" ] = qipempty ? "" : fixSeparators( dictionary[ "QT_INSTALL_PREFIX" ] + "/plugins" );
+    if( !dictionary[ "QT_INSTALL_IMPORTS" ].size() )
+        dictionary[ "QT_INSTALL_IMPORTS" ] = qipempty ? "" : fixSeparators( dictionary[ "QT_INSTALL_PREFIX" ] + "/imports" );
     if( !dictionary[ "QT_INSTALL_DATA" ].size() )
         dictionary[ "QT_INSTALL_DATA" ] = qipempty ? "" : fixSeparators( dictionary[ "QT_INSTALL_PREFIX" ] );
     if( !dictionary[ "QT_INSTALL_TRANSLATIONS" ].size() )
@@ -3150,6 +3160,7 @@ void Configure::generateConfigfiles()
                   << "static const char qt_configure_libraries_path_str    [512 + 12] = \"qt_libspath=" << QString(dictionary["QT_INSTALL_LIBS"]).replace( "\\", "\\\\" ) << "\";"  << endl
                   << "static const char qt_configure_binaries_path_str     [512 + 12] = \"qt_binspath=" << QString(dictionary["QT_INSTALL_BINS"]).replace( "\\", "\\\\" ) << "\";"  << endl
                   << "static const char qt_configure_plugins_path_str      [512 + 12] = \"qt_plugpath=" << QString(dictionary["QT_INSTALL_PLUGINS"]).replace( "\\", "\\\\" ) << "\";"  << endl
+                  << "static const char qt_configure_imports_path_str      [512 + 12] = \"qt_impspath=" << QString(dictionary["QT_INSTALL_IMPORTS"]).replace( "\\", "\\\\" ) << "\";"  << endl
                   << "static const char qt_configure_data_path_str         [512 + 12] = \"qt_datapath=" << QString(dictionary["QT_INSTALL_DATA"]).replace( "\\", "\\\\" ) << "\";"  << endl
                   << "static const char qt_configure_translations_path_str [512 + 12] = \"qt_trnspath=" << QString(dictionary["QT_INSTALL_TRANSLATIONS"]).replace( "\\", "\\\\" ) << "\";" << endl
                   << "static const char qt_configure_examples_path_str     [512 + 12] = \"qt_xmplpath=" << QString(dictionary["QT_INSTALL_EXAMPLES"]).replace( "\\", "\\\\" ) << "\";"  << endl
@@ -3164,6 +3175,7 @@ void Configure::generateConfigfiles()
                        << "static const char qt_configure_libraries_path_str    [512 + 12] = \"qt_libspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/lib").replace( "\\", "\\\\" ) <<"\";"  << endl
                        << "static const char qt_configure_binaries_path_str     [512 + 12] = \"qt_binspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/bin").replace( "\\", "\\\\" ) <<"\";"  << endl
                        << "static const char qt_configure_plugins_path_str      [512 + 12] = \"qt_plugpath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/plugins").replace( "\\", "\\\\" ) <<"\";"  << endl
+                       << "static const char qt_configure_imports_path_str      [512 + 12] = \"qt_impspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/imports").replace( "\\", "\\\\" ) <<"\";"  << endl
                        << "static const char qt_configure_data_path_str         [512 + 12] = \"qt_datapath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ]).replace( "\\", "\\\\" ) <<"\";"  << endl
                        << "static const char qt_configure_translations_path_str [512 + 12] = \"qt_trnspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/translations").replace( "\\", "\\\\" ) <<"\";" << endl
                        << "static const char qt_configure_examples_path_str     [512 + 12] = \"qt_xmplpath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/example").replace( "\\", "\\\\" ) <<"\";"  << endl
@@ -3179,6 +3191,7 @@ void Configure::generateConfigfiles()
                   << "#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;" << endl
                   << "#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;" << endl
                   << "#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;" << endl
+                  << "#define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;" << endl
                   << "#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;" << endl
                   << "#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;" << endl
                   << "#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;" << endl
@@ -3325,6 +3338,7 @@ void Configure::displayConfig()
     cout << "Headers installed to........" << dictionary[ "QT_INSTALL_HEADERS" ] << endl;
     cout << "Libraries installed to......" << dictionary[ "QT_INSTALL_LIBS" ] << endl;
     cout << "Plugins installed to........" << dictionary[ "QT_INSTALL_PLUGINS" ] << endl;
+    cout << "Imports installed to........" << dictionary[ "QT_INSTALL_IMPORTS" ] << endl;
     cout << "Binaries installed to......." << dictionary[ "QT_INSTALL_BINS" ] << endl;
     cout << "Docs installed to..........." << dictionary[ "QT_INSTALL_DOCS" ] << endl;
     cout << "Data installed to..........." << dictionary[ "QT_INSTALL_DATA" ] << endl;
-- 
cgit v0.12


From 6ba32ca47e9f08d4d82befb3cc6632897b3b0f6a Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Wed, 24 Feb 2010 17:34:18 +0100
Subject: Fix building without the XmlPatterns Module

---
 src/declarative/util/qdeclarativeutilmodule.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index 1e4b963..ecaa607c 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -105,8 +105,10 @@ void QDeclarativeUtilModule::defineModule()
     QML_REGISTER_TYPE(Qt,4,6,Timer,QDeclarativeTimer);
     QML_REGISTER_TYPE(Qt,4,6,Transition,QDeclarativeTransition);
     QML_REGISTER_TYPE(Qt,4,6,Vector3dAnimation,QDeclarativeVector3dAnimation);
+#ifndef QT_NO_XMLPATTERNS
     QML_REGISTER_TYPE(Qt,4,6,XmlListModel,QDeclarativeXmlListModel);
     QML_REGISTER_TYPE(Qt,4,6,XmlRole,QDeclarativeXmlListModelRole);
+#endif
 
     QML_REGISTER_NOCREATE_TYPE(QDeclarativeAnchors);
     QML_REGISTER_NOCREATE_TYPE(QDeclarativeAbstractAnimation);
-- 
cgit v0.12


From 36af8113fc9b98c90c8fd0afd7a76f3bc23dc23b Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 24 Feb 2010 17:44:53 +0100
Subject: Install the QML extensions.

---
 imports/Qt/multimedia/qmldir                              |  1 +
 imports/Qt/widgets/qmldir                                 |  1 +
 src/plugins/qdeclarativemodules/multimedia/multimedia.pro | 10 +++++++---
 src/plugins/qdeclarativemodules/widgets/widgets.pro       |  9 +++++++--
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 imports/Qt/multimedia/qmldir
 create mode 100644 imports/Qt/widgets/qmldir

diff --git a/imports/Qt/multimedia/qmldir b/imports/Qt/multimedia/qmldir
new file mode 100644
index 0000000..0e6f656
--- /dev/null
+++ b/imports/Qt/multimedia/qmldir
@@ -0,0 +1 @@
+plugin multimedia
diff --git a/imports/Qt/widgets/qmldir b/imports/Qt/widgets/qmldir
new file mode 100644
index 0000000..6f19878
--- /dev/null
+++ b/imports/Qt/widgets/qmldir
@@ -0,0 +1 @@
+plugin widgets
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.pro b/src/plugins/qdeclarativemodules/multimedia/multimedia.pro
index 21382c5..d8ad18e 100644
--- a/src/plugins/qdeclarativemodules/multimedia/multimedia.pro
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.pro
@@ -5,7 +5,11 @@ QT += multimedia declarative
 
 SOURCES += multimedia.cpp
 
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qdeclarativemodules
-target.path = $$[QT_INSTALL_PLUGINS]/plugins/qdeclarativemodules
-INSTALLS += target
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/multimedia
+target.path = $$[QT_INSTALL_IMPORTS]/Qt/multimedia
+
+qmldir.files += $$QT_BUILD_TREE/imports/Qt/multimedia/qmldir
+qmldir.path +=  $$[QT_INSTALL_IMPORTS]/Qt/multimedia
+
+INSTALLS += target qmldir
 
diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.pro b/src/plugins/qdeclarativemodules/widgets/widgets.pro
index 03c4bf1..3ec38da 100644
--- a/src/plugins/qdeclarativemodules/widgets/widgets.pro
+++ b/src/plugins/qdeclarativemodules/widgets/widgets.pro
@@ -11,5 +11,10 @@ HEADERS += \
     graphicswidgets_p.h \
     graphicslayouts_p.h
 
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qdeclarativemodules
-target.path = $$[QT_INSTALL_PLUGINS]/plugins/qdeclarativemodules
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/widgets
+target.path = $$[QT_INSTALL_IMPORTS]/Qt/widgets
+
+qmldir.files += $$QT_BUILD_TREE/imports/Qt/widgets/qmldir
+qmldir.path +=  $$[QT_INSTALL_IMPORTS]/Qt/widgets
+
+INSTALLS += target qmldir
-- 
cgit v0.12


From f39bb2af2d81640d30222cd5abc31b076105dd8b Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 24 Feb 2010 18:39:52 +0100
Subject: Install the extensions in the given uri.

Reviewed-by: mae
---
 src/plugins/qdeclarativemodules/widgets/widgets.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.cpp b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
index a0a2597..dc45428 100644
--- a/src/plugins/qdeclarativemodules/widgets/widgets.cpp
+++ b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
@@ -121,19 +121,18 @@ public:
 
     virtual void initialize(QDeclarativeEngine *engine, const char *uri)
     {
-        Q_UNUSED(uri);
         Q_UNUSED(engine);
 
         Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.widgets"));
 
         QML_REGISTER_INTERFACE(QGraphicsLayoutItem);
         QML_REGISTER_INTERFACE(QGraphicsLayout);
-        QML_REGISTER_TYPE(Qt,4,6,QGraphicsLinearLayoutStretchItem,QGraphicsLinearLayoutStretchItemObject);
-        QML_REGISTER_TYPE(Qt,4,6,QGraphicsLinearLayout,QGraphicsLinearLayoutObject);
-        QML_REGISTER_TYPE(Qt,4,6,QGraphicsGridLayout,QGraphicsGridLayoutObject);
-        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI);
-        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI);
-        QML_REGISTER_EXTENDED_TYPE(Qt,4,6,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI);
+        qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>(uri,4,6,"QGraphicsLinearLayoutStretchItem","QGraphicsLinearLayoutStretchItemObject");
+        qmlRegisterType<QGraphicsLinearLayoutObject>(uri,4,6,"QGraphicsLinearLayout","QGraphicsLinearLayoutObject");
+        qmlRegisterType<QGraphicsGridLayoutObject>(uri,4,6,"QGraphicsGridLayout","QGraphicsGridLayoutObject");
+        qmlRegisterExtendedType<QGraphicsView, QGraphicsViewDeclarativeUI>(uri,4,6,"QGraphicsView","QGraphicsView");
+        qmlRegisterExtendedType<QGraphicsScene,QGraphicsSceneDeclarativeUI>(uri,4,6,"QGraphicsScene","QGraphicsScene");
+        qmlRegisterExtendedType<QGraphicsWidget,QGraphicsWidgetDeclarativeUI>(uri,4,6,"QGraphicsWidget","QGraphicsWidget");
         QML_REGISTER_INTERFACE(QGraphicsItem);
     }
 };
-- 
cgit v0.12


From 950f3849e3bd2edd6bcc2784dbeadcb604c38e2d Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 25 Feb 2010 10:21:52 +1000
Subject: React to QAbstractItemModel::modelReset() signal.

Task-number: QTBUG-8494
---
 .../graphicsitems/qdeclarativegridview.cpp         | 12 +++++
 .../graphicsitems/qdeclarativegridview_p.h         |  1 +
 .../graphicsitems/qdeclarativelistview.cpp         | 12 +++++
 .../graphicsitems/qdeclarativelistview_p.h         |  1 +
 .../graphicsitems/qdeclarativepathview.cpp         | 10 +++-
 .../graphicsitems/qdeclarativepathview_p.h         |  1 +
 .../graphicsitems/qdeclarativerepeater.cpp         |  7 +++
 .../graphicsitems/qdeclarativerepeater_p.h         |  1 +
 .../graphicsitems/qdeclarativevisualitemmodel.cpp  |  8 +++
 .../graphicsitems/qdeclarativevisualitemmodel_p.h  |  2 +
 .../qdeclarativegridview/data/displaygrid.qml      | 39 ++++++++++++++
 .../tst_qdeclarativegridview.cpp                   | 43 ++++++++++++++++
 .../qdeclarativelistview/data/displaylist.qml      | 43 ++++++++++++++++
 .../tst_qdeclarativelistview.cpp                   | 43 ++++++++++++++++
 .../qdeclarativepathview/data/displaypath.qml      | 60 ++++++++++++++++++++++
 .../tst_qdeclarativepathview.cpp                   | 41 +++++++++++++++
 16 files changed, 323 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qdeclarativegridview/data/displaygrid.qml
 create mode 100644 tests/auto/declarative/qdeclarativelistview/data/displaylist.qml
 create mode 100644 tests/auto/declarative/qdeclarativepathview/data/displaypath.qml

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 2ef6305..b378db2 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -787,6 +787,7 @@ void QDeclarativeGridView::setModel(const QVariant &model)
         disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
         disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
         disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        disconnect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset()));
         disconnect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
         disconnect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
     }
@@ -821,6 +822,7 @@ void QDeclarativeGridView::setModel(const QVariant &model)
         connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
         connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
         connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        connect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset()));
         connect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
         connect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
         emit countChanged();
@@ -1688,6 +1690,16 @@ void QDeclarativeGridView::itemsMoved(int from, int to, int count)
     d->layout(removedBeforeVisible);
 }
 
+void QDeclarativeGridView::modelReset()
+{
+    Q_D(QDeclarativeGridView);
+    d->clear();
+    refill();
+    d->moveReason = QDeclarativeGridViewPrivate::SetIndex;
+    d->updateCurrent(d->currentIndex);
+    emit countChanged();
+}
+
 void QDeclarativeGridView::createdItem(int index, QDeclarativeItem *item)
 {
     Q_D(QDeclarativeGridView);
diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
index b36c4aa..b488475 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -144,6 +144,7 @@ private Q_SLOTS:
     void itemsInserted(int index, int count);
     void itemsRemoved(int index, int count);
     void itemsMoved(int from, int to, int count);
+    void modelReset();
     void destroyRemoved();
     void createdItem(int index, QDeclarativeItem *item);
     void destroyingItem(QDeclarativeItem *item);
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 77e3a15..bd2f4fc 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1477,6 +1477,7 @@ void QDeclarativeListView::setModel(const QVariant &model)
         disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
         disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
         disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        disconnect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset()));
         disconnect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
         disconnect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
     }
@@ -1511,6 +1512,7 @@ void QDeclarativeListView::setModel(const QVariant &model)
         connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
         connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
         connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        connect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset()));
         connect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
         connect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
         emit countChanged();
@@ -2684,6 +2686,16 @@ void QDeclarativeListView::itemsMoved(int from, int to, int count)
     d->layout();
 }
 
+void QDeclarativeListView::modelReset()
+{
+    Q_D(QDeclarativeListView);
+    d->clear();
+    refill();
+    d->moveReason = QDeclarativeListViewPrivate::SetIndex;
+    d->updateCurrent(d->currentIndex);
+    emit countChanged();
+}
+
 void QDeclarativeListView::createdItem(int index, QDeclarativeItem *item)
 {
     Q_D(QDeclarativeListView);
diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h
index 1b6276e..5e3edb0 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h
@@ -221,6 +221,7 @@ private Q_SLOTS:
     void itemsInserted(int index, int count);
     void itemsRemoved(int index, int count);
     void itemsMoved(int from, int to, int count);
+    void modelReset();
     void destroyRemoved();
     void createdItem(int index, QDeclarativeItem *item);
     void destroyingItem(QDeclarativeItem *item);
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index b9e38ef..c131f4c 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -206,6 +206,7 @@ void QDeclarativePathView::setModel(const QVariant &model)
     if (d->model) {
         disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
         disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        disconnect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset()));
         disconnect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
         for (int i=0; i<d->items.count(); i++){
             QDeclarativeItem *p = d->items[i];
@@ -234,6 +235,7 @@ void QDeclarativePathView::setModel(const QVariant &model)
     if (d->model) {
         connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
         connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
+        connect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset()));
         connect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
     }
     d->firstIndex = 0;
@@ -782,7 +784,7 @@ void QDeclarativePathView::itemsRemoved(int modelIndex, int count)
     if (!d->isValid() || !isComponentComplete())
         return;
     if (d->pathItems == -1) {
-        for (int i = 0; i < count; ++i) {
+        for (int i = 0; i < count && d->items.count() > modelIndex; ++i) {
             QDeclarativeItem* p = d->items.takeAt(modelIndex);
             d->model->release(p);
         }
@@ -812,6 +814,12 @@ void QDeclarativePathView::itemsRemoved(int modelIndex, int count)
         d->moveOffset.setValue(targetOffset);
 }
 
+void QDeclarativePathView::modelReset()
+{
+    Q_D(QDeclarativePathView);
+    d->regenerate();
+}
+
 void QDeclarativePathView::createdItem(int index, QDeclarativeItem *item)
 {
     Q_D(QDeclarativePathView);
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h
index d351a4e..709a4fc 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h
@@ -115,6 +115,7 @@ private Q_SLOTS:
     void ticked();
     void itemsInserted(int index, int count);
     void itemsRemoved(int index, int count);
+    void modelReset();
     void createdItem(int index, QDeclarativeItem *item);
     void destroyingItem(QDeclarativeItem *item);
 
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index ca57d3c..e4cd499 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -166,6 +166,7 @@ void QDeclarativeRepeater::setModel(const QVariant &model)
         disconnect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
         disconnect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
         disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        disconnect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset()));
         /*
         disconnect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
         disconnect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
@@ -193,6 +194,7 @@ void QDeclarativeRepeater::setModel(const QVariant &model)
         connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int)));
         connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int)));
         connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int)));
+        connect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset()));
         /*
         connect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*)));
         connect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*)));
@@ -325,4 +327,9 @@ void QDeclarativeRepeater::itemsMoved(int,int,int)
     regenerate();
 }
 
+void QDeclarativeRepeater::modelReset()
+{
+    regenerate();
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater_p.h b/src/declarative/graphicsitems/qdeclarativerepeater_p.h
index f58d1b6..db46699 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater_p.h
+++ b/src/declarative/graphicsitems/qdeclarativerepeater_p.h
@@ -88,6 +88,7 @@ private Q_SLOTS:
     void itemsInserted(int,int);
     void itemsRemoved(int,int);
     void itemsMoved(int,int,int);
+    void modelReset();
 
 private:
     Q_DISABLE_COPY(QDeclarativeRepeater)
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index bfe8db9..8114f9b 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -660,6 +660,7 @@ void QDeclarativeVisualDataModel::setModel(const QVariant &model)
                             this, SLOT(_q_dataChanged(const QModelIndex&,const QModelIndex&)));
         QObject::disconnect(d->m_abstractItemModel, SIGNAL(rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)),
                             this, SLOT(_q_rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)));
+        QObject::disconnect(d->m_abstractItemModel, SIGNAL(modelReset()), this, SLOT(_q_modelReset()));
     } else if (d->m_visualItemModel) {
         QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsInserted(int,int)),
                          this, SIGNAL(itemsInserted(int,int)));
@@ -705,6 +706,7 @@ void QDeclarativeVisualDataModel::setModel(const QVariant &model)
                             this, SLOT(_q_dataChanged(const QModelIndex&,const QModelIndex&)));
         QObject::connect(d->m_abstractItemModel, SIGNAL(rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)),
                             this, SLOT(_q_rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)));
+        QObject::connect(d->m_abstractItemModel, SIGNAL(modelReset()), this, SLOT(_q_modelReset()));
         d->m_metaDataCacheable = true;
         return;
     }
@@ -1237,6 +1239,12 @@ void QDeclarativeVisualDataModel::_q_dataChanged(const QModelIndex &begin, const
         _q_itemsChanged(begin.row(), end.row() - begin.row() + 1, d->m_roles);
 }
 
+void QDeclarativeVisualDataModel::_q_modelReset()
+{
+    Q_D(QDeclarativeVisualDataModel);
+    emit modelReset();
+}
+
 void QDeclarativeVisualDataModel::_q_createdPackage(int index, QDeclarativePackage *package)
 {
     Q_D(QDeclarativeVisualDataModel);
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
index 76c8994..d34bcaf 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
@@ -93,6 +93,7 @@ Q_SIGNALS:
     void itemsInserted(int index, int count);
     void itemsRemoved(int index, int count);
     void itemsMoved(int from, int to, int count);
+    void modelReset();
     void createdItem(int index, QDeclarativeItem *item);
     void destroyingItem(QDeclarativeItem *item);
 
@@ -195,6 +196,7 @@ private Q_SLOTS:
     void _q_rowsRemoved(const QModelIndex &,int,int);
     void _q_rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
     void _q_dataChanged(const QModelIndex&,const QModelIndex&);
+    void _q_modelReset();
     void _q_createdPackage(int index, QDeclarativePackage *package);
     void _q_destroyingPackage(QDeclarativePackage *package);
 
diff --git a/tests/auto/declarative/qdeclarativegridview/data/displaygrid.qml b/tests/auto/declarative/qdeclarativegridview/data/displaygrid.qml
new file mode 100644
index 0000000..d3cdcd8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativegridview/data/displaygrid.qml
@@ -0,0 +1,39 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    resources: [
+        Component {
+            id: myDelegate
+            Rectangle {
+                id: wrapper
+                objectName: "wrapper"
+                width: 80
+                height: 60
+                border.color: "blue"
+                Text {
+                    text: index
+                }
+                Text {
+                    y: 20
+                    id: displayText
+                    objectName: "displayText"
+                    text: display
+                }
+                color: GridView.isCurrentItem ? "lightsteelblue" : "white"
+            }
+        }
+    ]
+    GridView {
+        id: grid
+        objectName: "grid"
+        width: 240
+        height: 320
+        cellWidth: 80
+        cellHeight: 60
+        model: testModel
+        delegate: myDelegate
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 9c7468d..9c9d1d3 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -41,6 +41,7 @@
 
 #include <qdeclarativeengine.h>
 #include <qdeclarativecomponent.h>
+#include <QStringListModel>
 #include <QtTest/QtTest>
 #include <private/qlistmodelinterface_p.h>
 #include <qdeclarativeview.h>
@@ -66,6 +67,7 @@ private slots:
     void defaultValues();
     void properties();
     void positionViewAtIndex();
+    void resetModel();
     void QTBUG_8456();
 
 private:
@@ -884,6 +886,47 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
     delete canvas;
 }
 
+void tst_QDeclarativeGridView::resetModel()
+{
+    QDeclarativeView *canvas = createView();
+
+    QStringList strings;
+    strings << "one" << "two" << "three";
+    QStringListModel model(strings);
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/displaygrid.qml"));
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QVERIFY(gridview != 0);
+
+    QDeclarativeItem *viewport = gridview->viewport();
+    QVERIFY(viewport != 0);
+
+    QCOMPARE(gridview->count(), model.rowCount());
+
+    for (int i = 0; i < model.rowCount(); ++i) {
+        QDeclarativeText *display = findItem<QDeclarativeText>(viewport, "displayText", i);
+        QVERIFY(display != 0);
+        QCOMPARE(display->text(), strings.at(i));
+    }
+
+    strings.clear();
+    strings << "four" << "five" << "six" << "seven";
+    model.setStringList(strings);
+
+    QCOMPARE(gridview->count(), model.rowCount());
+
+    for (int i = 0; i < model.rowCount(); ++i) {
+        QDeclarativeText *display = findItem<QDeclarativeText>(viewport, "displayText", i);
+        QVERIFY(display != 0);
+        QCOMPARE(display->text(), strings.at(i));
+    }
+}
+
 void tst_QDeclarativeGridView::QTBUG_8456()
 {
     QDeclarativeView *canvas = createView();
diff --git a/tests/auto/declarative/qdeclarativelistview/data/displaylist.qml b/tests/auto/declarative/qdeclarativelistview/data/displaylist.qml
new file mode 100644
index 0000000..7b124a5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/data/displaylist.qml
@@ -0,0 +1,43 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    resources: [
+        Component {
+            id: myDelegate
+            Rectangle {
+                id: wrapper
+                objectName: "wrapper"
+                height: 20
+                width: 240
+                Text {
+                    text: index
+                }
+                Text {
+                    x: 30
+                    objectName: "displayText"
+                    text: display
+                }
+                color: ListView.isCurrentItem ? "lightsteelblue" : "white"
+            }
+        },
+        Component {
+            id: myHighlight
+            Rectangle { color: "green" }
+        }
+    ]
+    ListView {
+        id: list
+        objectName: "list"
+        focus: true
+        width: 240
+        height: 320
+        model: testModel
+        delegate: myDelegate
+        highlight: myHighlight
+        highlightMoveSpeed: 1000
+        highlightResizeSpeed: 1000
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index daa40d1..9100522 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include <QtTest/QtTest>
+#include <QStringListModel>
 #include <private/qlistmodelinterface_p.h>
 #include <qdeclarativeview.h>
 #include <private/qdeclarativelistview_p.h>
@@ -80,6 +81,7 @@ private slots:
     void sections();
     void cacheBuffer();
     void positionViewAtIndex();
+    void resetModel();
 
 private:
     template <class T> void items();
@@ -1232,6 +1234,47 @@ void tst_QDeclarativeListView::positionViewAtIndex()
     delete canvas;
 }
 
+void tst_QDeclarativeListView::resetModel()
+{
+    QDeclarativeView *canvas = createView();
+
+    QStringList strings;
+    strings << "one" << "two" << "three";
+    QStringListModel model(strings);
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/displaylist.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    QCOMPARE(listview->count(), model.rowCount());
+
+    for (int i = 0; i < model.rowCount(); ++i) {
+        QDeclarativeText *display = findItem<QDeclarativeText>(viewport, "displayText", i);
+        QVERIFY(display != 0);
+        QCOMPARE(display->text(), strings.at(i));
+    }
+
+    strings.clear();
+    strings << "four" << "five" << "six" << "seven";
+    model.setStringList(strings);
+
+    QCOMPARE(listview->count(), model.rowCount());
+
+    for (int i = 0; i < model.rowCount(); ++i) {
+        QDeclarativeText *display = findItem<QDeclarativeText>(viewport, "displayText", i);
+        QVERIFY(display != 0);
+        QCOMPARE(display->text(), strings.at(i));
+    }
+}
+
 void tst_QDeclarativeListView::qListModelInterface_items()
 {
     items<TestModel>();
diff --git a/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml b/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml
new file mode 100644
index 0000000..627f38a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/displaypath.qml
@@ -0,0 +1,60 @@
+import Qt 4.6
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    resources: [
+        Component {
+            id: delegate
+            Rectangle {
+                id: wrapper
+                objectName: "wrapper"
+                height: 20
+                width: 60
+                color: "white"
+                border.color: "black"
+                Text {
+                    text: index
+                }
+                Text {
+                    x: 20
+                    id: displayText
+                    objectName: "displayText"
+                    text: display
+                }
+            }
+        }
+    ]
+    PathView {
+        id: view
+        objectName: "view"
+        width: 240
+        height: 320
+        model: testModel
+        delegate: delegate
+        snapPosition: 0.01
+        path: Path {
+            startY: 120
+            startX: 160
+            PathQuad {
+                y: 120
+                x: 80
+                controlY: 330
+                controlX: 100
+            }
+            PathLine {
+                y: 160
+                x: 20
+            }
+            PathCubic {
+                y: 120
+                x: 160
+                control1Y: 0
+                control1X: 100
+                control2Y: 000
+                control2X: 200
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index 09f0f79..79bc607 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -49,6 +49,7 @@
 #include <QtDeclarative/private/qdeclarativetext_p.h>
 #include <QtDeclarative/private/qdeclarativerectangle_p.h>
 #include <QAbstractListModel>
+#include <QStringListModel>
 #include <QFile>
 #include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
@@ -67,6 +68,7 @@ private slots:
     void pathview3();
     void path();
     void pathMoved();
+    void resetModel();
 
 private:
     QDeclarativeView *createView();
@@ -425,6 +427,45 @@ void tst_QDeclarativePathView::pathMoved()
     delete canvas;
 }
 
+void tst_QDeclarativePathView::resetModel()
+{
+    QDeclarativeView *canvas = createView();
+
+    QStringList strings;
+    strings << "one" << "two" << "three";
+    QStringListModel model(strings);
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/displaypath.qml"));
+    qApp->processEvents();
+
+    QDeclarativePathView *pathview = findItem<QDeclarativePathView>(canvas->rootObject(), "view");
+    QVERIFY(pathview != 0);
+
+    QCOMPARE(pathview->count(), model.rowCount());
+
+    for (int i = 0; i < model.rowCount(); ++i) {
+        QDeclarativeText *display = findItem<QDeclarativeText>(pathview, "displayText", i);
+        QVERIFY(display != 0);
+        QCOMPARE(display->text(), strings.at(i));
+    }
+
+    strings.clear();
+    strings << "four" << "five" << "six" << "seven";
+    model.setStringList(strings);
+
+    QCOMPARE(pathview->count(), model.rowCount());
+
+    for (int i = 0; i < model.rowCount(); ++i) {
+        QDeclarativeText *display = findItem<QDeclarativeText>(pathview, "displayText", i);
+        QVERIFY(display != 0);
+        QCOMPARE(display->text(), strings.at(i));
+    }
+}
+
+
 QDeclarativeView *tst_QDeclarativePathView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
-- 
cgit v0.12


From 8a6ac436b00de84501dba5968f960dd3f4561dd3 Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Thu, 25 Feb 2010 10:27:16 +1000
Subject: Change Multimedia declarative module in line with recent commits.

---
 src/multimedia/qml/multimediadeclarative.cpp              | 15 +++++++++------
 src/multimedia/qml/multimediadeclarative.h                |  4 +++-
 src/plugins/qdeclarativemodules/multimedia/multimedia.cpp |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/multimedia/qml/multimediadeclarative.cpp b/src/multimedia/qml/multimediadeclarative.cpp
index be49915..cfb8999 100644
--- a/src/multimedia/qml/multimediadeclarative.cpp
+++ b/src/multimedia/qml/multimediadeclarative.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/multimediaqml.h>
+#include <QtMultimedia/multimediadeclarative.h>
 #include <QtMultimedia/private/qsoundeffect_p.h>
-#include <QtMultimedia/private/qmlaudio_p.h>
-#include <QtMultimedia/private/qmlgraphicsvideo_p.h>
+#include <QtMultimedia/private/qdeclarativeaudio_p.h>
+#include <QtMultimedia/private/qdeclarativevideo_p.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -55,11 +55,14 @@ namespace QtMultimedia
     \internal
 */
 
-void qRegisterQmlElements()
+void qRegisterDeclarativeElements(QDeclarativeEngine *engine, const char *uri)
 {
+    Q_UNUSED(engine)
+    Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimedia"));
+
     qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect", "SoundEffect");
-    qmlRegisterType<QmlAudio>("Qt.multimedia", 4, 7, "Audio", "Audio");
-    qmlRegisterType<QmlGraphicsVideo>("Qt.multimedia", 4, 7, "Video", "Video");
+    qmlRegisterType<QDeclarativeAudio>("Qt.multimedia", 4, 7, "Audio", "Audio");
+    qmlRegisterType<QDeclarativeVideo>("Qt.multimedia", 4, 7, "Video", "Video");
 }
 
 }
diff --git a/src/multimedia/qml/multimediadeclarative.h b/src/multimedia/qml/multimediadeclarative.h
index 41274c8..befddb6 100644
--- a/src/multimedia/qml/multimediadeclarative.h
+++ b/src/multimedia/qml/multimediadeclarative.h
@@ -49,9 +49,11 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Multimedia)
 
+class QDeclarativeEngine;
+
 namespace QtMultimedia
 {
-extern void Q_MULTIMEDIA_EXPORT qRegisterQmlElements();
+extern void Q_MULTIMEDIA_EXPORT qRegisterDeclarativeElements(QDeclarativeEngine* engine, const char *uri);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
index 1158c88..e27dd8d 100644
--- a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
@@ -41,7 +41,7 @@
 
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtMultimedia/qdeclarative.h>
+#include <QtMultimedia/multimediadeclarative.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -51,7 +51,7 @@ class QMultimediaQmlModule : public QDeclarativeExtensionPlugin
 public:
     virtual void initialize(QDeclarativeEngine *engine, const char *uri)
     {
-        QtMultimedia::qRegisterQmlElements(engine, uri);
+        QtMultimedia::qRegisterDeclarativeElements(engine, uri);
     }
 };
 
-- 
cgit v0.12


From 88eb10ee9163777d7534e3c7bb297745e0ed102e Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Thu, 25 Feb 2010 10:28:30 +1000
Subject: Fix include of renamed header

---
 src/multimedia/qml/qdeclarativeaudio_p.h | 2 +-
 src/multimedia/qml/qdeclarativevideo_p.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/multimedia/qml/qdeclarativeaudio_p.h b/src/multimedia/qml/qdeclarativeaudio_p.h
index a3fe1e8..d1fb275 100644
--- a/src/multimedia/qml/qdeclarativeaudio_p.h
+++ b/src/multimedia/qml/qdeclarativeaudio_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtMultimedia/private/qmlmediabase_p.h>
+#include <QtMultimedia/private/qdeclarativemediabase_p.h>
 
 #include <QtCore/qbasictimer.h>
 #include <QtDeclarative/qdeclarativeitem.h>
diff --git a/src/multimedia/qml/qdeclarativevideo_p.h b/src/multimedia/qml/qdeclarativevideo_p.h
index 8d9ec20..d5ebde1 100644
--- a/src/multimedia/qml/qdeclarativevideo_p.h
+++ b/src/multimedia/qml/qdeclarativevideo_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtMultimedia/private/qmlmediabase_p.h>
+#include <QtMultimedia/private/qdeclarativemediabase_p.h>
 
 #include <QtMultimedia/qgraphicsvideoitem.h>
 
-- 
cgit v0.12


From b888a694c35fb0c291942a2aa4a056d7deec3245 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 25 Feb 2010 10:29:39 +1000
Subject: Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of
 QmlView"

This reverts commit 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5.
---
 doc/src/declarative/integrating.qdoc               |  10 -
 .../util/qdeclarativegraphicswidget.cpp            | 457 ---------------------
 src/declarative/util/qdeclarativegraphicswidget.h  | 113 -----
 src/declarative/util/util.pri                      |   6 +-
 4 files changed, 2 insertions(+), 584 deletions(-)
 delete mode 100644 src/declarative/util/qdeclarativegraphicswidget.cpp
 delete mode 100644 src/declarative/util/qdeclarativegraphicswidget.h

diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index 09ed178..c685d3d 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -86,9 +86,6 @@ QGraphicsObject *object =
 scene->addItem(object);
 \endcode
 
-There is a convenience QGraphicsWidget subclass, QDeclarativeGraphicsWidget, which takes care of the engine
-and component instantiation for you.
-
 The following QGraphicsView options are recommended for optimal performance
 of QML UIs:
 
@@ -98,13 +95,6 @@ of QML UIs:
 \o QGraphicsScene::setItemIndexMethod(QGraphicsScene::NoIndex);
 \endlist
 
-And the following QGraphicsView options are required for QML key handling to work:
-
-\list
-\o QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus);
-\o QGraphicsScene::setStickyFocus(true);
-\endlist
-
 \section1 Using existing QGraphicsWidgets in QML
 Another way of integrating with a QGraphicsView based UI is to expose your
 existing QGraphicsWidgets to QML, and constructing your scene in QML. Note that
diff --git a/src/declarative/util/qdeclarativegraphicswidget.cpp b/src/declarative/util/qdeclarativegraphicswidget.cpp
deleted file mode 100644
index 1d0d468..0000000
--- a/src/declarative/util/qdeclarativegraphicswidget.cpp
+++ /dev/null
@@ -1,457 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativegraphicswidget.h"
-
-#include "qperformancelog_p_p.h"
-#include "qfxperf_p_p.h"
-
-#include <qdeclarative.h>
-#include <qdeclarativeitem.h>
-#include <qdeclarativeengine.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarativedebug_p.h>
-#include <qdeclarativedebugservice_p.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativeerror.h>
-
-#include <qscriptvalueiterator.h>
-#include <qdebug.h>
-#include <qtimer.h>
-#include <qevent.h>
-#include <qdir.h>
-#include <qcoreapplication.h>
-#include <qfontdatabase.h>
-#include <qicon.h>
-#include <qurl.h>
-#include <qboxlayout.h>
-#include <qbasictimer.h>
-#include <QtCore/qabstractanimation.h>
-#include <private/qguard_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeGraphicsWidgetSharedQDeclarativeEngine
-{
-public:
-    QDeclarativeGraphicsWidgetSharedQDeclarativeEngine(){}
-
-    static QDeclarativeEngine* sharedEngine(){
-        if(!references)
-            return 0;
-        return &QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::m_instance->engine;
-    }
-    static void attach(){
-        if(!references++)
-            m_instance = new QDeclarativeGraphicsWidgetSharedQDeclarativeEngine();
-    }
-
-    static void detach(){
-        if(!--references)
-            delete m_instance;
-    }
-
-private:
-    static QDeclarativeGraphicsWidgetSharedQDeclarativeEngine* m_instance;
-    static int references;
-    QDeclarativeEngine engine;
-};
-
-int QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::references = 0;
-QDeclarativeGraphicsWidgetSharedQDeclarativeEngine* QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::m_instance = 0;
-
-class QDeclarativeGraphicsWidgetPrivate
-{
-public:
-    QDeclarativeGraphicsWidgetPrivate()
-        : root(0), component(0),
-          resizeMode(QDeclarativeGraphicsWidget::SizeViewToRootObject) 
-    {
-        QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::attach();
-        engine = QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::sharedEngine();
-    }
-
-    ~QDeclarativeGraphicsWidgetPrivate()
-    {
-        QDeclarativeGraphicsWidgetSharedQDeclarativeEngine::detach();
-    }
-
-    QGuard<QGraphicsObject> root;
-    QGuard<QDeclarativeItem> declarativeRoot;
-
-    QUrl source;
-
-    QDeclarativeEngine* engine;
-    QDeclarativeComponent *component;
-    QBasicTimer resizetimer;
-
-    mutable QSize initialSize;
-    QDeclarativeGraphicsWidget::ResizeMode resizeMode;
-
-    void init();
-
-};
-
-/*!
-    \class QDeclarativeGraphicsWidget
-    \brief The QDeclarativeGraphicsWidget class provides a QGraphicsWidget for displaying a Qt Declarative user interface.
-
-    Any QGraphicsObject or QDeclarativeGraphicsItem
-    created via Qt Declarative can be placed on a standard QGraphicsScene and viewed with a standard
-    QGraphicsView.
-
-    QDeclarativeGraphicsWidget is a convenience class which handles QDeclarativeComponent loading and object creation.
-    It shares the same QDeclarativeEngine between all QDeclarativeGraphicsWidgets in the application, to minimize overhead.
-
-    QDeclarativeGraphicsWidget is ideal for when you have many small components styled with Qt Declarative, and want to integrate
-    them into a larger QGraphicsItem based scene. If your interface is primarily Qt Declarative based, consider using QDeclarativeView
-    instead.
-
-    Note that the following settings on your QGraphicsScene/View are recommended for optimal performance with Qt Declarative:
-        \list
-        \o QGraphicsView::setOptimizationFlags(QGraphicsView::DontSavePainterState);
-        \o QGraphicsView::setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
-        \o QGraphicsScene::setItemIndexMethod(QGraphicsScene::NoIndex);
-        \endlist
-    Also note that the following settings on your QGraphicsScene/View are required for key handling in Qt Declarative to work:
-        \list
-        \o QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus);
-        \o QGraphicsScene::setStickyFocus(true);
-        \endlist
-
-    To receive errors related to loading and executing declarative files with QDeclarativeGraphicsWidget,
-    you can connect to the statusChanged() signal and monitor for QDeclarativeGraphicsWidget::Error.
-    The errors are available via QDeclarativeGraphicsWidget::errors().
-*/
-
-
-/*! \fn void QDeclarativeGraphicsWidget::sceneResized(QSize size)
-  This signal is emitted when the view is resized to \a size.
-*/
-
-/*! \fn void QDeclarativeGraphicsWidget::statusChanged(QDeclarativeGraphicsWidget::Status status)
-    This signal is emitted when the component's current \l{QDeclarativeGraphicsWidget::Status} {status} changes.
-*/
-
-/*!
-  \fn QDeclarativeGraphicsWidget::QDeclarativeGraphicsWidget(QGraphicsItem *parent)
-
-  Constructs a QDeclarativeGraphicsWidget with the given \a parent.
-*/
-QDeclarativeGraphicsWidget::QDeclarativeGraphicsWidget(QGraphicsItem *parent)
-: QGraphicsWidget(parent), d(new QDeclarativeGraphicsWidgetPrivate)
-{
-    setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
-    d->init();
-}
-
-void QDeclarativeGraphicsWidgetPrivate::init()
-{
-}
-
-/*!
-  The destructor clears the view's \l {QGraphicsObject} {items} and
-  deletes the internal representation.
- */
-QDeclarativeGraphicsWidget::~QDeclarativeGraphicsWidget()
-{
-    delete d->root;
-    delete d;
-}
-
-/*!
-    Sets the source to the \a url.
-
-    Will also load the QML file and instantiate the component.
-
- */
-void QDeclarativeGraphicsWidget::setSource(const QUrl& url)
-{
-    d->source = url;
-
-    //Execute
-    if(d->root)
-        delete d->root;
-    if(d->component)
-        delete d->component;
-    d->component = new QDeclarativeComponent(d->engine, d->source, this);
-
-    if (!d->component->isLoading()) {
-        continueExecute();
-    } else {
-        connect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
-    }
-}
-
-/*!
-  Returns the source URL, if set.
-
-  \sa setSource()
- */
-QUrl QDeclarativeGraphicsWidget::source() const
-{
-    return d->source;
-}
-
-/*!
-  Returns a pointer to the QDeclarativeEngine used for instantiating
-  Qt Declarative Components.
- */
-QDeclarativeEngine* QDeclarativeGraphicsWidget::engine()
-{
-    return d->engine;
-}
-
-/*!
-  This function returns the root of the context hierarchy.  Each declarative
-  component is instantiated in a QDeclarativeContext.  QDeclarativeContext's are
-  essential for passing data to declarative components.  In Qt Declarative, contexts are
-  arranged hierarchically and this hierarchy is managed by the
-  QDeclarativeEngine.
- */
-QDeclarativeContext* QDeclarativeGraphicsWidget::rootContext()
-{
-    return d->engine->rootContext();
-}
-
-
-/*!
-  \enum QDeclarativeGraphicsWidget::Status
-
-    Specifies the loading status of the QDeclarativeGraphicsWidget.
-
-    \value Null This QDeclarativeGraphicsWidget has no source set.
-    \value Ready This QDeclarativeGraphicsWidget has loaded and created the declarative component.
-    \value Loading This QDeclarativeGraphicsWidget is loading network data.
-    \value Error An error has occured.  Calling errorDescription() to retrieve a description.
-*/
-
-/*!
-    \property QDeclarativeGraphicsWidget::status
-    The component's current \l{QDeclarativeGraphicsWidget::Status} {status}.
-*/
-
-QDeclarativeGraphicsWidget::Status QDeclarativeGraphicsWidget::status() const
-{
-    if (!d->component)
-        return QDeclarativeGraphicsWidget::Null;
-
-    return QDeclarativeGraphicsWidget::Status(d->component->status());
-}
-
-/*!
-    Return the list of errors that occured during the last compile or create
-    operation.  An empty list is returned if isError() is not set.
-*/
-QList<QDeclarativeError> QDeclarativeGraphicsWidget::errors() const
-{
-    if (d->component)
-        return d->component->errors();
-    return QList<QDeclarativeError>();
-}
-
-
-/*!
-    \property QDeclarativeGraphicsWidget::resizeMode
-    \brief whether the view should resize the canvas contents
-
-    If this property is set to SizeViewToRootObject (the default), the view
-    resizes with the root item in the declarative file.
-
-    If this property is set to SizeRootObjectToView, the view will
-    automatically resize the root item.
-
-    Regardless of this property, the sizeHint of the view
-    is the initial size of the root item. Note though that
-    since declarative files may load dynamically, that size may change.
-
-    \sa initialSize()
-*/
-
-void QDeclarativeGraphicsWidget::setResizeMode(ResizeMode mode)
-{
-    if (d->resizeMode == mode)
-        return;
-
-    d->resizeMode = mode;
-    if (d->declarativeRoot) {
-        if (d->resizeMode == SizeRootObjectToView) {
-            d->declarativeRoot->setWidth(size().width());
-            d->declarativeRoot->setHeight(size().height());
-        } else {
-            d->declarativeRoot->setWidth(d->initialSize.width());
-            d->declarativeRoot->setHeight(d->initialSize.height());
-        }
-    }
-}
-
-QDeclarativeGraphicsWidget::ResizeMode QDeclarativeGraphicsWidget::resizeMode() const
-{
-    return d->resizeMode;
-}
-
-/*!
-  \internal
- */
-void QDeclarativeGraphicsWidget::continueExecute()
-{
-
-    disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
-
-    if (d->component->isError()) {
-        QList<QDeclarativeError> errorList = d->component->errors();
-        foreach (const QDeclarativeError &error, errorList) {
-            qWarning() << error;
-        }
-        emit statusChanged(status());
-        return;
-    }
-
-    QObject *obj = d->component->create();
-
-    if(d->component->isError()) {
-        QList<QDeclarativeError> errorList = d->component->errors();
-        foreach (const QDeclarativeError &error, errorList) {
-            qWarning() << error;
-        }
-        emit statusChanged(status());
-        return;
-    }
-
-    if (obj) {
-        if (QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(obj)) {
-
-            item->QGraphicsItem::setParentItem(this);
-            item->QObject::setParent(this);
-
-            d->root = item;
-            d->declarativeRoot = item;
-            connect(item, SIGNAL(widthChanged()), this, SLOT(sizeChanged()));
-            connect(item, SIGNAL(heightChanged()), this, SLOT(sizeChanged()));
-            if (d->initialSize.height() <= 0 && d->declarativeRoot->width() > 0)
-                d->initialSize.setWidth(d->declarativeRoot->width());
-            if (d->initialSize.height() <= 0 && d->declarativeRoot->height() > 0)
-                d->initialSize.setHeight(d->declarativeRoot->height());
-            resize(d->initialSize);
-
-            if (d->resizeMode == SizeRootObjectToView) {
-                d->declarativeRoot->setWidth(size().width());
-                d->declarativeRoot->setHeight(size().height());
-            } else {
-                QSizeF sz(d->declarativeRoot->width(),d->declarativeRoot->height());
-                emit sceneResized(sz);
-                resize(sz);
-            }
-            updateGeometry();
-        } else if (QGraphicsObject *item = qobject_cast<QGraphicsObject *>(obj)) {
-            item->setParent(this);
-            qWarning() << "QDeclarativeGraphicsWidget::resizeMode is not honored for components of type QGraphicsObject";
-        } else if (qobject_cast<QWidget *>(obj)) {
-            qWarning() << "QDeclarativeGraphicsWidget does not support loading QML files containing QWidgets";
-        }
-    }
-    emit statusChanged(status());
-}
-
-/*!
-  \internal
- */
-void QDeclarativeGraphicsWidget::sizeChanged()
-{
-    // delay, so we catch both width and height changing.
-    d->resizetimer.start(0,this);
-}
-
-/*!
-  \internal
-  If the \l {QTimerEvent} {timer event} \a e is this
-  view's resize timer, sceneResized() is emitted.
- */
-void QDeclarativeGraphicsWidget::timerEvent(QTimerEvent* e)
-{
-    if (!e || e->timerId() == d->resizetimer.timerId()) {
-        if (d->declarativeRoot) {
-            QSize sz(d->declarativeRoot->width(),d->declarativeRoot->height());
-            emit sceneResized(sz);
-        }
-        d->resizetimer.stop();
-        updateGeometry();
-    }
-}
-
-/*!
-    \internal
-    The size hint is the size of the root item.
-*/
-QSizeF QDeclarativeGraphicsWidget::sizeHint() const
-{
-    if (d->declarativeRoot) {
-        if (d->initialSize.width() <= 0)
-            d->initialSize.setWidth(d->declarativeRoot->width());
-        if (d->initialSize.height() <= 0)
-            d->initialSize.setHeight(d->declarativeRoot->height());
-    }
-    return d->initialSize;
-}
-
-/*!
-  Returns the view's root \l {QGraphicsObject} {item}.
- */
-QGraphicsObject *QDeclarativeGraphicsWidget::rootObject() const
-{
-    return d->root;
-}
-
-/*!
-  \internal
-  This function handles the \l {QGraphicsSceneResizeEvent} {resize event}
-  \a e.
- */
-void QDeclarativeGraphicsWidget::resizeEvent(QGraphicsSceneResizeEvent *e)
-{
-    if (d->resizeMode == SizeRootObjectToView && d->declarativeRoot) {
-        d->declarativeRoot->setWidth(size().width());
-        d->declarativeRoot->setHeight(size().height());
-    }
-    QGraphicsWidget::resizeEvent(e);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativegraphicswidget.h b/src/declarative/util/qdeclarativegraphicswidget.h
deleted file mode 100644
index 33ebc7b..0000000
--- a/src/declarative/util/qdeclarativegraphicswidget.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEGRAPHICSWIDGET_H
-#define QDECLARATIVEGRAPHICSWIDGET_H
-
-#include <QtCore/qdatetime.h>
-#include <QtCore/qurl.h>
-#include <QtGui/qgraphicssceneevent.h>
-#include <QtGui/qgraphicswidget.h>
-#include <QtGui/qwidget.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsObject;
-class QDeclarativeEngine;
-class QDeclarativeContext;
-class QDeclarativeError;
-
-class QDeclarativeGraphicsWidgetPrivate;
-
-class Q_DECLARATIVE_EXPORT QDeclarativeGraphicsWidget : public QGraphicsWidget
-{
-    Q_OBJECT
-    Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-    Q_PROPERTY(QUrl source READ source WRITE setSource)
-
-public:
-    explicit QDeclarativeGraphicsWidget(QGraphicsItem *parent = 0);
-    virtual ~QDeclarativeGraphicsWidget();
-
-    QUrl source() const;
-    void setSource(const QUrl&);
-
-    QDeclarativeEngine* engine();
-    QDeclarativeContext* rootContext();
-
-    QGraphicsObject *rootObject() const;
-
-    enum ResizeMode { SizeViewToRootObject, SizeRootObjectToView };
-    ResizeMode resizeMode() const;
-    void setResizeMode(ResizeMode);
-    QSizeF sizeHint() const;
-
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
-
-    QList<QDeclarativeError> errors() const;
-
-Q_SIGNALS:
-    void sceneResized(QSizeF size);
-    void statusChanged(QDeclarativeGraphicsWidget::Status);
-
-private Q_SLOTS:
-    void continueExecute();
-    void sizeChanged();
-
-protected:
-    virtual void resizeEvent(QGraphicsSceneResizeEvent *);
-    void timerEvent(QTimerEvent*);
-
-private:
-    QDeclarativeGraphicsWidgetPrivate* d;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QDECLARATIVEGRAPHICSWIDGET_H
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 46126e5..610eb3f 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -30,8 +30,7 @@ SOURCES += \
     $$PWD/qdeclarativedatetimeformatter.cpp \
     $$PWD/qdeclarativebehavior.cpp \
     $$PWD/qdeclarativefontloader.cpp \
-    $$PWD/qdeclarativestyledtext.cpp \
-    $$PWD/qdeclarativegraphicswidget.cpp
+    $$PWD/qdeclarativestyledtext.cpp
 
 HEADERS += \
     $$PWD/qdeclarativeutilmodule_p.h\
@@ -66,8 +65,7 @@ HEADERS += \
     $$PWD/qdeclarativedatetimeformatter_p.h \
     $$PWD/qdeclarativebehavior_p.h \
     $$PWD/qdeclarativefontloader_p.h \
-    $$PWD/qdeclarativestyledtext_p.h \
-    $$PWD/qdeclarativegraphicswidget.h
+    $$PWD/qdeclarativestyledtext_p.h
 
 contains(QT_CONFIG, xmlpatterns) {
     QT+=xmlpatterns
-- 
cgit v0.12


From d654f87319408e3d9754fa5a8ad376c3eaef4489 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 25 Feb 2010 10:38:43 +1000
Subject: Automatically connect to signals "onFooChanged" if property is "foo".
 This follows on from a2a8cea2835ef24104fe784b6ce0f508cc5637c0 to make it work
 for PropertyChanges and QDeclarativeMetaProperty as well.

Task-number: QT-2783
---
 src/declarative/qml/qdeclarativecompiler.cpp       |  16 ++-
 src/declarative/qml/qdeclarativecompiler_p.h       |   3 +-
 src/declarative/qml/qdeclarativemetaproperty.cpp   |  20 +--
 .../tst_qdeclarativemetaproperty.cpp               | 149 +++++++++++++++++++++
 .../qdeclarativestates/data/basicChanges4.qml      |  19 +++
 .../qdeclarativestates/tst_qdeclarativestates.cpp  |  67 ++++++---
 6 files changed, 232 insertions(+), 42 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index b6ebd60..0e54d45 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1314,8 +1314,9 @@ int QDeclarativeCompiler::componentTypeRef()
     return output->types.count() - 1;
 }
 
-int QDeclarativeCompiler::findSignalByName(const QMetaObject *mo, const QByteArray &name)
+QMetaMethod QDeclarativeCompiler::findSignalByName(const QMetaObject *mo, const QByteArray &name)
 {
+    Q_ASSERT(mo);
     int methods = mo->methodCount();
     for (int ii = methods - 1; ii >= 0; --ii) {
         QMetaMethod method = mo->method(ii);
@@ -1324,7 +1325,7 @@ int QDeclarativeCompiler::findSignalByName(const QMetaObject *mo, const QByteArr
         methodName = methodName.left(idx);
 
         if (methodName == name)
-            return ii;
+            return method;
     }
 
     // If no signal is found, but the signal is of the form "onBlahChanged",
@@ -1332,11 +1333,14 @@ int QDeclarativeCompiler::findSignalByName(const QMetaObject *mo, const QByteArr
     if (name.endsWith("Changed")) {
         QByteArray propName = name.mid(0, name.length() - 7);
         int propIdx = mo->indexOfProperty(propName.constData());
-        if (propIdx >= 0)
-            return mo->property(propIdx).notifySignalIndex();
+        if (propIdx >= 0) {
+            QMetaProperty prop = mo->property(propIdx);
+            if (prop.hasNotifySignal())
+                return prop.notifySignal();
+        }
     }
 
-    return -1;
+    return QMetaMethod();
 }
 
 bool QDeclarativeCompiler::buildSignal(QDeclarativeParser::Property *prop, QDeclarativeParser::Object *obj,
@@ -1351,7 +1355,7 @@ bool QDeclarativeCompiler::buildSignal(QDeclarativeParser::Property *prop, QDecl
     if(name[0] >= 'A' && name[0] <= 'Z')
         name[0] = name[0] - 'A' + 'a';
 
-    int sigIdx = findSignalByName(obj->metaObject(), name);
+    int sigIdx = findSignalByName(obj->metaObject(), name).methodIndex();
 
     if (sigIdx == -1) {
 
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index 627490d..2ea3366 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -159,6 +159,8 @@ public:
     static bool isAttachedPropertyName(const QByteArray &);
     static bool isSignalPropertyName(const QByteArray &);
 
+    static QMetaMethod findSignalByName(const QMetaObject *, const QByteArray &name);
+
 private:
     static void reset(QDeclarativeCompiledData *);
 
@@ -263,7 +265,6 @@ private:
 
     int componentTypeRef();
 
-    static int findSignalByName(const QMetaObject *, const QByteArray &name);
     static QDeclarativeType *toQmlType(QDeclarativeParser::Object *from);
     bool canCoerce(int to, QDeclarativeParser::Object *from);
     bool canCoerce(int to, int from);
diff --git a/src/declarative/qml/qdeclarativemetaproperty.cpp b/src/declarative/qml/qdeclarativemetaproperty.cpp
index e94ce8c..253174d 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.cpp
+++ b/src/declarative/qml/qdeclarativemetaproperty.cpp
@@ -53,6 +53,7 @@
 #include "qdeclarativedeclarativedata_p.h"
 #include "qdeclarativestringconverters_p.h"
 #include "qdeclarativelist_p.h"
+#include "qdeclarativecompiler_p.h"
 
 #include <QStringList>
 #include <QtCore/qdebug.h>
@@ -177,7 +178,7 @@ void QDeclarativeMetaPropertyPrivate::initProperty(QObject *obj, const QString &
         QString signalName = name.mid(2);
         signalName[0] = signalName.at(0).toLower();
 
-        QMetaMethod method = findSignal(obj, signalName);
+        QMetaMethod method = QDeclarativeCompiler::findSignalByName(obj->metaObject(), signalName.toLatin1().constData());
         if (method.signature()) {
             core.load(method);
             return;
@@ -631,23 +632,6 @@ QDeclarativeExpression *QDeclarativeMetaProperty::setSignalExpression(QDeclarati
     }
 }
 
-QMetaMethod QDeclarativeMetaPropertyPrivate::findSignal(QObject *obj, const QString &name)
-{
-    const QMetaObject *mo = obj->metaObject();
-
-    int methods = mo->methodCount();
-    for (int ii = methods - 1; ii >= 0; --ii) {
-        QMetaMethod method = mo->method(ii);
-        QString methodName = QString::fromUtf8(method.signature());
-        int idx = methodName.indexOf(QLatin1Char('('));
-        methodName = methodName.left(idx);
-
-        if (methodName == name) 
-            return method;
-    }
-    return QMetaMethod();
-}
-
 QObject *QDeclarativeMetaPropertyPrivate::attachedObject() const
 {
     if (attachedFunc == -1)
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
index e19bea0..028d8c4 100644
--- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -180,6 +180,7 @@ class PropertyObject : public QObject
     Q_PROPERTY(QRect wrectProperty READ wrectProperty WRITE setWRectProperty);
     Q_PROPERTY(QUrl url READ url WRITE setUrl);
     Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty);
+    Q_PROPERTY(int propertyWithNotify READ propertyWithNotify WRITE setPropertyWithNotify NOTIFY oddlyNamedNotifySignal)
 
     Q_CLASSINFO("DefaultProperty", "defaultProperty");
 public:
@@ -198,13 +199,18 @@ public:
     void setResettableProperty(int r) { m_resetProperty = r; }
     void resetProperty() { m_resetProperty = 9; }
 
+    int propertyWithNotify() const { return m_propertyWithNotify; }
+    void setPropertyWithNotify(int i) { m_propertyWithNotify = i; emit oddlyNamedNotifySignal(); }
+
 signals:
     void clicked();
+    void oddlyNamedNotifySignal();
 
 private:
     int m_resetProperty;
     QRect m_rect;
     QUrl m_url;
+    int m_propertyWithNotify;
 };
 
 QML_DECLARE_TYPE(PropertyObject);
@@ -457,6 +463,54 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
 
         delete obj;
     }
+
+    {
+        QDeclarativeMetaProperty prop(&dobject, QString("onPropertyWithNotifyChanged"));
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("onOddlyNamedNotifySignal"));
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant("Hello")), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(QString(prop.method().signature()), QString("oddlyNamedNotifySignal()"));
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QCOMPARE(prop.property().name(), (const char *)0);
+        QVERIFY(prop.binding() == 0);
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression != 0);
+        QVERIFY(prop.signalExpression() == expression);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("oddlyNamedNotifySignal()"));
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
 }
 
 void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
@@ -707,6 +761,54 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
 
         delete obj;
     }
+
+    {
+        QDeclarativeMetaProperty prop(&dobject, QString("onPropertyWithNotifyChanged"), engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("onOddlyNamedNotifySignal"));
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant("Hello")), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(QString(prop.method().signature()), QString("oddlyNamedNotifySignal()"));
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QCOMPARE(prop.property().name(), (const char *)0);
+        QVERIFY(prop.binding() == 0);
+        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(prop.signalExpression() == 0);
+        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(expression != 0);
+        QVERIFY(prop.signalExpression() == expression);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("oddlyNamedNotifySignal()"));
+        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+
+        delete obj;
+    }
 }
 
 void tst_qdeclarativemetaproperty::name()
@@ -741,6 +843,18 @@ void tst_qdeclarativemetaproperty::name()
     }
 
     {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+        QCOMPARE(p.name(), QString("onOddlyNamedNotifySignal"));
+    }
+
+    {
+        QObject o;
+        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+        QCOMPARE(p.name(), QString());
+    }
+
+    {
         QObject o;
         QDeclarativeMetaProperty p(&o, "foo");
         QCOMPARE(p.name(), QString());
@@ -830,6 +944,18 @@ void tst_qdeclarativemetaproperty::read()
         QCOMPARE(p.read(), QVariant());
     }
 
+    // Automatic signal property 
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+        QCOMPARE(p.read(), QVariant());
+
+        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
+        QVERIFY(0 != p.signalExpression());
+
+        QCOMPARE(p.read(), QVariant());
+    }
+
     // Deleted object
     {
         PropertyObject *o = new PropertyObject;
@@ -936,6 +1062,20 @@ void tst_qdeclarativemetaproperty::write()
         QVERIFY(0 != p.signalExpression());
     }
 
+    // Automatic signal property
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
+
+        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
+        QVERIFY(0 != p.signalExpression());
+
+        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
+
+        QVERIFY(0 != p.signalExpression());
+    }
+
     // Value-type property
     {
         PropertyObject o;
@@ -1065,6 +1205,15 @@ void tst_qdeclarativemetaproperty::reset()
         QCOMPARE(p.isResettable(), false);
         QCOMPARE(p.reset(), false);
     }
+
+    // Automatic signal property
+    {
+        PropertyObject o;
+        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
 }
 
 void tst_qdeclarativemetaproperty::writeObjectToList()
diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml
new file mode 100644
index 0000000..a373cfc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml
@@ -0,0 +1,19 @@
+import Qt.test 1.0
+import Qt 4.6
+
+MyRectangle {
+    id: rect
+    width: 100; height: 100
+    color: "red"
+
+    states: State {
+        name: "aBlueDay"
+        PropertyChanges {
+            target: rect
+            onPropertyWithNotifyChanged: { rect.color = "blue"; }
+        }
+    }
+
+    Component.onCompleted: rect.state = "aBlueDay"
+}
+
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index 44fb51f..feac9c2 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -46,6 +46,29 @@
 #include <private/qdeclarativepropertychanges_p.h>
 #include <private/qdeclarativestategroup_p.h>
 
+
+class MyRect : public QDeclarativeRectangle
+{
+   Q_OBJECT
+   Q_PROPERTY(int propertyWithNotify READ propertyWithNotify WRITE setPropertyWithNotify NOTIFY oddlyNamedNotifySignal)
+public:
+    MyRect() {}
+
+    void doSomething() { emit didSomething(); }
+    
+    int propertyWithNotify() const { return m_prop; }
+    void setPropertyWithNotify(int i) { m_prop = i; emit oddlyNamedNotifySignal(); }
+Q_SIGNALS:
+    void didSomething();
+    void oddlyNamedNotifySignal();
+
+private:
+    int m_prop;
+};
+
+QML_DECLARE_TYPE(MyRect)
+
+
 class tst_qdeclarativestates : public QObject
 {
     Q_OBJECT
@@ -83,6 +106,11 @@ private slots:
     void nonExistantProperty();
 };
 
+void tst_qdeclarativestates::initTestCase()
+{
+    QML_REGISTER_TYPE(Qt.test, 1, 0, MyRectangle,MyRect);
+}
+
 QByteArray tst_qdeclarativestates::fullDataPath(const QString &path)
 {
     return QUrl::fromLocalFile(SRCDIR + path).toString().toUtf8();    
@@ -156,6 +184,28 @@ void tst_qdeclarativestates::basicChanges()
         QCOMPARE(rect->border()->width(),1);
 
     }
+
+    {
+        // Test basicChanges4.qml can magically connect to propertyWithNotify's notify
+        // signal using 'onPropertyWithNotifyChanged' even though the signal name is
+        // actually 'oddlyNamedNotifySignal'
+
+        QDeclarativeComponent component(&engine, SRCDIR "/data/basicChanges4.qml");
+        QVERIFY(component.isReady());
+
+        MyRect *rect = qobject_cast<MyRect*>(component.create());
+        QVERIFY(rect != 0);
+
+        QMetaProperty prop = rect->metaObject()->property(rect->metaObject()->indexOfProperty("propertyWithNotify"));
+        QVERIFY(prop.hasNotifySignal());
+        QString notifySignal = QByteArray(prop.notifySignal().signature());
+        QVERIFY(!notifySignal.startsWith("propertyWithNotifyChanged("));
+
+        QCOMPARE(rect->color(), QColor(Qt::red));
+
+        rect->setPropertyWithNotify(100);
+        QCOMPARE(rect->color(), QColor(Qt::blue));
+    }
 }
 
 void tst_qdeclarativestates::basicExtension()
@@ -335,23 +385,6 @@ void tst_qdeclarativestates::basicBinding()
     }
 }
 
-class MyRect : public QDeclarativeRectangle
-{
-   Q_OBJECT
-public:
-    MyRect() {}
-    void doSomething() { emit didSomething(); }
-Q_SIGNALS:
-    void didSomething();
-};
-
-QML_DECLARE_TYPE(MyRect)
-
-void tst_qdeclarativestates::initTestCase()
-{
-    QML_REGISTER_TYPE(Qt.test, 1, 0, MyRectangle,MyRect);
-}
-
 void tst_qdeclarativestates::signalOverride()
 {
     QDeclarativeEngine engine;
-- 
cgit v0.12


From d46c4d5d32a14ae119d88c59c00ebe62ae8ce027 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Thu, 25 Feb 2010 11:49:31 +1000
Subject: QML Text item clipping logic was reversed

Task-number: QTBUG-8180
---
 src/declarative/graphicsitems/qdeclarativetext.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 307b674..ca253df 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -811,8 +811,8 @@ void QDeclarativeText::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWid
             break;
         }
 
-        bool needClip = !clip() && (d->imgCache.width() > width() ||
-                                    d->imgCache.height() > height());
+        bool needClip = clip() && (d->imgCache.width() > width() ||
+                                   d->imgCache.height() > height());
 
         if (needClip) {
             p->save();
-- 
cgit v0.12


From 43b1f81bc359a2c9d5c3d26f5110319803ef31c2 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 25 Feb 2010 11:56:59 +1000
Subject: Make QML_REGISTER...TYPE functions unnecessary (still exist for now).
 Fix multimedia plugin.

---
 src/declarative/qml/qdeclarative.h                 | 26 +++++++++++-----------
 src/multimedia/qml/multimediadeclarative.cpp       |  8 +++----
 .../qdeclarativemodules/multimedia/multimedia.cpp  |  4 ++--
 .../qdeclarativemodules/widgets/widgets.cpp        | 12 +++++-----
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index 3133d27..77b7484 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -87,9 +87,9 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 template<typename T>
-int qmlRegisterType(const char *typeName)
+int qmlRegisterType()
 {
-    QByteArray name(typeName);
+    QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
     QByteArray listName("QDeclarativeListProperty<" + name + ">");
@@ -119,9 +119,9 @@ int qmlRegisterType(const char *typeName)
 }
 
 template<typename T>
-int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const char *typeName)
+int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
 {
-    QByteArray name(typeName);
+    QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
     QByteArray listName("QDeclarativeListProperty<" + name + ">");
@@ -151,9 +151,9 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c
 }
 
 template<typename T, typename E>
-int qmlRegisterExtendedType(const char *typeName)
+int qmlRegisterExtendedType()
 {
-    QByteArray name(typeName);
+    QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
     QByteArray listName("QDeclarativeListProperty<" + name + ">");
@@ -184,9 +184,9 @@ int qmlRegisterExtendedType(const char *typeName)
 
 template<typename T, typename E>
 int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor, 
-                            const char *qmlName, const char *typeName)
+                            const char *qmlName)
 {
-    QByteArray name(typeName);
+    QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
     QByteArray listName("QDeclarativeListProperty<" + name + ">");
@@ -278,14 +278,14 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor,
 #define QML_REGISTER_INTERFACE(INTERFACE) \
     qmlRegisterInterface<INTERFACE>(#INTERFACE)
 
-#define QML_REGISTER_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \
-    qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE)
+#define QML_REGISTER_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, CLASS, EXTENSION) \
+    qmlRegisterExtendedType<CLASS,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME)
 
-#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,TYPE,CLASS) \
-    qmlRegisterType<CLASS>(#URI, VMAJ, VMIN, #TYPE, #CLASS)
+#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,NAME,CLASS) \
+    qmlRegisterType<CLASS>(#URI, VMAJ, VMIN, #NAME)
 
 #define QML_REGISTER_NOCREATE_TYPE(CLASS) \
-    qmlRegisterType<CLASS>(#CLASS)
+    qmlRegisterType<CLASS>()
 
 class QDeclarativeContext;
 class QDeclarativeEngine;
diff --git a/src/multimedia/qml/multimediadeclarative.cpp b/src/multimedia/qml/multimediadeclarative.cpp
index cfb8999..ba4036f 100644
--- a/src/multimedia/qml/multimediadeclarative.cpp
+++ b/src/multimedia/qml/multimediadeclarative.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/multimediadeclarative.h>
+#include <QtMultimedia/qdeclarative.h>
 #include <QtMultimedia/private/qsoundeffect_p.h>
 #include <QtMultimedia/private/qdeclarativeaudio_p.h>
 #include <QtMultimedia/private/qdeclarativevideo_p.h>
@@ -60,9 +60,9 @@ void qRegisterDeclarativeElements(QDeclarativeEngine *engine, const char *uri)
     Q_UNUSED(engine)
     Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimedia"));
 
-    qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect", "SoundEffect");
-    qmlRegisterType<QDeclarativeAudio>("Qt.multimedia", 4, 7, "Audio", "Audio");
-    qmlRegisterType<QDeclarativeVideo>("Qt.multimedia", 4, 7, "Video", "Video");
+    qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect");
+    qmlRegisterType<QDeclarativeAudio>("Qt.multimedia", 4, 7, "Audio");
+    qmlRegisterType<QDeclarativeVideo>("Qt.multimedia", 4, 7, "Video");
 }
 
 }
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
index e27dd8d..1158c88 100644
--- a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
@@ -41,7 +41,7 @@
 
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtMultimedia/multimediadeclarative.h>
+#include <QtMultimedia/qdeclarative.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -51,7 +51,7 @@ class QMultimediaQmlModule : public QDeclarativeExtensionPlugin
 public:
     virtual void initialize(QDeclarativeEngine *engine, const char *uri)
     {
-        QtMultimedia::qRegisterDeclarativeElements(engine, uri);
+        QtMultimedia::qRegisterQmlElements(engine, uri);
     }
 };
 
diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.cpp b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
index dc45428..7229d88 100644
--- a/src/plugins/qdeclarativemodules/widgets/widgets.cpp
+++ b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
@@ -127,12 +127,12 @@ public:
 
         QML_REGISTER_INTERFACE(QGraphicsLayoutItem);
         QML_REGISTER_INTERFACE(QGraphicsLayout);
-        qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>(uri,4,6,"QGraphicsLinearLayoutStretchItem","QGraphicsLinearLayoutStretchItemObject");
-        qmlRegisterType<QGraphicsLinearLayoutObject>(uri,4,6,"QGraphicsLinearLayout","QGraphicsLinearLayoutObject");
-        qmlRegisterType<QGraphicsGridLayoutObject>(uri,4,6,"QGraphicsGridLayout","QGraphicsGridLayoutObject");
-        qmlRegisterExtendedType<QGraphicsView, QGraphicsViewDeclarativeUI>(uri,4,6,"QGraphicsView","QGraphicsView");
-        qmlRegisterExtendedType<QGraphicsScene,QGraphicsSceneDeclarativeUI>(uri,4,6,"QGraphicsScene","QGraphicsScene");
-        qmlRegisterExtendedType<QGraphicsWidget,QGraphicsWidgetDeclarativeUI>(uri,4,6,"QGraphicsWidget","QGraphicsWidget");
+        qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>(uri,4,6,"QGraphicsLinearLayoutStretchItem");
+        qmlRegisterType<QGraphicsLinearLayoutObject>(uri,4,6,"QGraphicsLinearLayout");
+        qmlRegisterType<QGraphicsGridLayoutObject>(uri,4,6,"QGraphicsGridLayout");
+        qmlRegisterExtendedType<QGraphicsView, QGraphicsViewDeclarativeUI>(uri,4,6,"QGraphicsView");
+        qmlRegisterExtendedType<QGraphicsScene,QGraphicsSceneDeclarativeUI>(uri,4,6,"QGraphicsScene");
+        qmlRegisterExtendedType<QGraphicsWidget,QGraphicsWidgetDeclarativeUI>(uri,4,6,"QGraphicsWidget");
         QML_REGISTER_INTERFACE(QGraphicsItem);
     }
 };
-- 
cgit v0.12


From a645ab52a7ba10018419b552b8f50ce4b7ad9cd8 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 25 Feb 2010 12:45:38 +1000
Subject: Move private QDeclarativeMetaProperty functions into the private
 class

We don't want to allow manipulation of bindings and signal properties through
the public API.  Equivalents of the public functions now exist in
QDeclarativeMetaPropertyPrivate for internal use.
---
 src/declarative/qml/qdeclarativeenginedebug.cpp    |   4 +-
 src/declarative/qml/qdeclarativemetaproperty.cpp   |  43 ++++----
 src/declarative/qml/qdeclarativemetaproperty.h     |   7 --
 src/declarative/qml/qdeclarativemetaproperty_p.h   |  27 +++--
 src/declarative/qml/qdeclarativepropertycache_p.h  |   2 +-
 .../util/qdeclarativepropertychanges.cpp           |  11 +-
 src/declarative/util/qdeclarativestate.cpp         |   7 +-
 src/declarative/util/qdeclarativestate_p_p.h       |   3 +-
 src/declarative/util/qdeclarativestategroup.cpp    |   4 +-
 .../util/qdeclarativetransitionmanager.cpp         |  10 +-
 .../qdeclarativedebug/tst_qdeclarativedebug.cpp    |   4 +-
 .../tst_qdeclarativemetaproperty.cpp               | 111 +++++++++++----------
 12 files changed, 128 insertions(+), 105 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index 6a81e52..2ae0b54 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -45,6 +45,7 @@
 #include "qdeclarativeengine.h"
 #include "qdeclarativemetatype_p.h"
 #include "qdeclarativemetaproperty.h"
+#include "qdeclarativemetaproperty_p.h"
 #include "qdeclarativebinding_p.h"
 #include "qdeclarativecontext_p.h"
 #include "qdeclarativewatcher_p.h"
@@ -108,7 +109,8 @@ QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx)
     rv.valueTypeName = QString::fromUtf8(prop.typeName());
     rv.name = QString::fromUtf8(prop.name());
     rv.hasNotifySignal = prop.hasNotifySignal();
-    QDeclarativeAbstractBinding *binding = QDeclarativeMetaProperty(obj, rv.name).binding();
+    QDeclarativeAbstractBinding *binding = 
+        QDeclarativeMetaPropertyPrivate::binding(QDeclarativeMetaProperty(obj, rv.name));
     if (binding)
         rv.binding = binding->expression();
 
diff --git a/src/declarative/qml/qdeclarativemetaproperty.cpp b/src/declarative/qml/qdeclarativemetaproperty.cpp
index e94ce8c..3bbc337 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.cpp
+++ b/src/declarative/qml/qdeclarativemetaproperty.cpp
@@ -502,22 +502,23 @@ QMetaMethod QDeclarativeMetaProperty::method() const
     Returns the binding associated with this property, or 0 if no binding 
     exists.
 */
-QDeclarativeAbstractBinding *QDeclarativeMetaProperty::binding() const
+QDeclarativeAbstractBinding *
+QDeclarativeMetaPropertyPrivate::binding(const QDeclarativeMetaProperty &that) 
 {
-    if (!isProperty() || (type() & Attached) || !d->object)
+    if (!that.isProperty() || (that.type() & QDeclarativeMetaProperty::Attached) || !that.d->object)
         return 0;
 
-    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(d->object);
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(that.d->object);
     if (!data) 
         return 0;
 
-    if (!data->hasBindingBit(d->core.coreIndex))
+    if (!data->hasBindingBit(that.d->core.coreIndex))
         return 0;
 
     QDeclarativeAbstractBinding *binding = data->bindings;
     while (binding) {
         // ### This wont work for value types
-        if (binding->propertyIndex() == d->core.coreIndex)
+        if (binding->propertyIndex() == that.d->core.coreIndex)
             return binding; 
         binding = binding->m_nextBinding;
     }
@@ -538,15 +539,17 @@ QDeclarativeAbstractBinding *QDeclarativeMetaProperty::binding() const
     the binding sets the intial value, it will use these flags for the write).
 */
 QDeclarativeAbstractBinding *
-QDeclarativeMetaProperty::setBinding(QDeclarativeAbstractBinding *newBinding, QDeclarativeMetaProperty::WriteFlags flags) const
+QDeclarativeMetaPropertyPrivate::setBinding(const QDeclarativeMetaProperty &that,
+                                            QDeclarativeAbstractBinding *newBinding, 
+                                            QDeclarativeMetaProperty::WriteFlags flags) 
 {
-    if (!isProperty() || (type() & Attached) || !d->object) {
+    if (!that.isProperty() || (that.type() & QDeclarativeMetaProperty::Attached) || !that.d->object) {
         if (newBinding)
             newBinding->destroy();
         return 0;
     }
 
-    return d->setBinding(d->object, d->core, newBinding, flags);
+    return that.d->setBinding(that.d->object, that.d->core, newBinding, flags);
 }
 
 QDeclarativeAbstractBinding *
@@ -577,22 +580,24 @@ QDeclarativeMetaPropertyPrivate::setBinding(QObject *object, const QDeclarativeP
 
     return 0;
 }
+
 /*!
     Returns the expression associated with this signal property, or 0 if no 
     signal expression exists.
 */
-QDeclarativeExpression *QDeclarativeMetaProperty::signalExpression() const
+QDeclarativeExpression *
+QDeclarativeMetaPropertyPrivate::signalExpression(const QDeclarativeMetaProperty &that)
 {
-    if (!(type() & SignalProperty))
+    if (!(that.type() & QDeclarativeMetaProperty::SignalProperty))
         return 0;
 
-    const QObjectList &children = d->object->children();
+    const QObjectList &children = that.d->object->children();
     
     for (int ii = 0; ii < children.count(); ++ii) {
         QObject *child = children.at(ii);
 
         QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
-        if (signal && signal->index() == coreIndex()) 
+        if (signal && signal->index() == that.coreIndex()) 
             return signal->expression();
     }
 
@@ -606,25 +611,27 @@ QDeclarativeExpression *QDeclarativeMetaProperty::signalExpression() const
     Ownership of \a expr transfers to QML.  Ownership of the return value is
     assumed by the caller.
 */
-QDeclarativeExpression *QDeclarativeMetaProperty::setSignalExpression(QDeclarativeExpression *expr) const
+QDeclarativeExpression *
+QDeclarativeMetaPropertyPrivate::setSignalExpression(const QDeclarativeMetaProperty &that,
+                                                     QDeclarativeExpression *expr) 
 {
-    if (!(type() & SignalProperty)) {
+    if (!(that.type() & QDeclarativeMetaProperty::SignalProperty)) {
         delete expr;
         return 0;
     }
 
-    const QObjectList &children = d->object->children();
+    const QObjectList &children = that.d->object->children();
     
     for (int ii = 0; ii < children.count(); ++ii) {
         QObject *child = children.at(ii);
 
         QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
-        if (signal && signal->index() == coreIndex()) 
+        if (signal && signal->index() == that.coreIndex()) 
             return signal->setExpression(expr);
     }
 
     if (expr) {
-        QDeclarativeBoundSignal *signal = new QDeclarativeBoundSignal(d->object, method(), d->object);
+        QDeclarativeBoundSignal *signal = new QDeclarativeBoundSignal(that.d->object, that.method(), that.d->object);
         return signal->setExpression(expr);
     } else {
         return 0;
@@ -758,7 +765,7 @@ bool QDeclarativeMetaPropertyPrivate::writeValueProperty(const QVariant &value,
 {
     // Remove any existing bindings on this property
     if (!(flags & QDeclarativeMetaProperty::DontRemoveBinding)) {
-        QDeclarativeAbstractBinding *binding = q->setBinding(0);
+        QDeclarativeAbstractBinding *binding = setBinding(*q, 0);
         if (binding) binding->destroy();
     }
 
diff --git a/src/declarative/qml/qdeclarativemetaproperty.h b/src/declarative/qml/qdeclarativemetaproperty.h
index 4dd6668..9a3a793 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.h
+++ b/src/declarative/qml/qdeclarativemetaproperty.h
@@ -121,13 +121,6 @@ public:
 
     QMetaProperty property() const;
 
-    QDeclarativeAbstractBinding *binding() const;
-    QDeclarativeAbstractBinding *setBinding(QDeclarativeAbstractBinding *,
-                                   QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::DontRemoveBinding) const;
-
-    QDeclarativeExpression *signalExpression() const;
-    QDeclarativeExpression *setSignalExpression(QDeclarativeExpression *) const;
-
     static QDeclarativeMetaProperty createProperty(QObject *, const QString &, QDeclarativeContext *context=0);
 
     int coreIndex() const;
diff --git a/src/declarative/qml/qdeclarativemetaproperty_p.h b/src/declarative/qml/qdeclarativemetaproperty_p.h
index 9fd5ed2..b769e42 100644
--- a/src/declarative/qml/qdeclarativemetaproperty_p.h
+++ b/src/declarative/qml/qdeclarativemetaproperty_p.h
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeContext;
 class QDeclarativeEnginePrivate;
-class QDeclarativeMetaPropertyPrivate
+class Q_AUTOTEST_EXPORT QDeclarativeMetaPropertyPrivate
 {
 public:
     QDeclarativeMetaPropertyPrivate()
@@ -105,19 +105,32 @@ public:
     bool writeValueProperty(const QVariant &, QDeclarativeMetaProperty::WriteFlags);
 
     static const QMetaObject *rawMetaObjectForType(QDeclarativeEnginePrivate *, int);
-    static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags);
-    static bool write(QObject *, const QDeclarativePropertyCache::Data &, const QVariant &, QDeclarativeContext *,
-                      QDeclarativeMetaProperty::WriteFlags flags = 0);
-    static QDeclarativeAbstractBinding *setBinding(QObject *, const QDeclarativePropertyCache::Data &, QDeclarativeAbstractBinding *,
-                                          QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::DontRemoveBinding);
+    static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, 
+                                  const QVariant &value, int flags);
+    static bool write(QObject *, const QDeclarativePropertyCache::Data &, const QVariant &, 
+                      QDeclarativeContext *, QDeclarativeMetaProperty::WriteFlags flags = 0);
+    static QDeclarativeAbstractBinding *setBinding(QObject *, const QDeclarativePropertyCache::Data &, 
+                                                   QDeclarativeAbstractBinding *,
+                                                   QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::DontRemoveBinding);
 
     static QByteArray saveValueType(const QMetaObject *, int, 
                                     const QMetaObject *, int);
     static QByteArray saveProperty(const QMetaObject *, int);
-    static QDeclarativeMetaProperty restore(const QByteArray &, QObject *, QDeclarativeContext * = 0);
+    static QDeclarativeMetaProperty restore(const QByteArray &, QObject *, QDeclarativeContext *);
 
     static bool equal(const QMetaObject *, const QMetaObject *);
     static bool canConvert(const QMetaObject *from, const QMetaObject *to);
+
+
+    // "Public" (to QML) methods
+    static QDeclarativeAbstractBinding *binding(const QDeclarativeMetaProperty &that);
+    static QDeclarativeAbstractBinding *setBinding(const QDeclarativeMetaProperty &that,
+                                                   QDeclarativeAbstractBinding *,
+                                                   QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::DontRemoveBinding);
+    static QDeclarativeExpression *signalExpression(const QDeclarativeMetaProperty &that);
+    static QDeclarativeExpression *setSignalExpression(const QDeclarativeMetaProperty &that, 
+                                                       QDeclarativeExpression *) ;
+
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h
index 7f4b174..68e6e6b 100644
--- a/src/declarative/qml/qdeclarativepropertycache_p.h
+++ b/src/declarative/qml/qdeclarativepropertycache_p.h
@@ -58,7 +58,7 @@
 
 #include <QtCore/qvector.h>
 
-#include <private/qscriptdeclarativeclass_p.h>
+#include <QtScript/private/qscriptdeclarativeclass_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 5907ddb..ad39574 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -50,6 +50,7 @@
 #include <qdeclarativebinding_p.h>
 #include <qdeclarativecontext.h>
 #include <qdeclarativeguard_p.h>
+#include <qdeclarativemetaproperty_p.h>
 
 #include <QtCore/qdebug.h>
 
@@ -132,12 +133,12 @@ public:
     QDeclarativeGuard<QDeclarativeExpression> ownedExpression;
 
     virtual void execute() {
-        ownedExpression = property.setSignalExpression(expression);
+        ownedExpression = QDeclarativeMetaPropertyPrivate::setSignalExpression(property, expression);
     }
 
     virtual bool isReversable() { return true; }
     virtual void reverse() {
-        ownedExpression = property.setSignalExpression(reverseExpression);
+        ownedExpression = QDeclarativeMetaPropertyPrivate::setSignalExpression(property, reverseExpression);
     }
 
     virtual void saveOriginals() {
@@ -146,9 +147,11 @@ public:
     }
 
     virtual void rewind() {
-        ownedExpression = property.setSignalExpression(rewindExpression);
+        ownedExpression = QDeclarativeMetaPropertyPrivate::setSignalExpression(property, rewindExpression);
+    }
+    virtual void saveCurrentValues() { 
+        rewindExpression = QDeclarativeMetaPropertyPrivate::signalExpression(property); 
     }
-    virtual void saveCurrentValues() { rewindExpression = property.signalExpression(); }
 
     virtual bool override(QDeclarativeActionEvent*other) {
         if (other == this)
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 5c3b909..d1dd318 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -334,7 +334,7 @@ void QDeclarativeState::cancel()
 void QDeclarativeAction::deleteFromBinding()
 {
     if (fromBinding) {
-        property.setBinding(0);
+        QDeclarativeMetaPropertyPrivate::setBinding(property, 0);
         fromBinding->destroy();
         fromBinding = 0;
     }
@@ -388,7 +388,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit
             else if (action.event->isRewindable())
                 action.event->saveCurrentValues();
         } else {
-            action.fromBinding = action.property.binding();
+            action.fromBinding = QDeclarativeMetaPropertyPrivate::binding(action.property);
 
             for (jj = 0; jj < d->revertList.count(); ++jj) {
                 if (d->revertList.at(jj).property == action.property) {
@@ -436,7 +436,8 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit
         }
         if (!found) {
             QVariant cur = d->revertList.at(ii).property.read();
-            QDeclarativeAbstractBinding *delBinding = d->revertList.at(ii).property.setBinding(0);
+            QDeclarativeAbstractBinding *delBinding = 
+                QDeclarativeMetaPropertyPrivate::setBinding(d->revertList.at(ii).property, 0);
             if (delBinding)
                 delBinding->destroy();
 
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
index dd925f2..6b32f04 100644
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -58,6 +58,7 @@
 #include "qdeclarativeanimation_p_p.h"
 #include "qdeclarativetransitionmanager_p_p.h"
 
+#include <qdeclarativemetaproperty_p.h>
 #include <qdeclarativeguard_p.h>
 
 #include <private/qobject_p.h>
@@ -76,7 +77,7 @@ public:
         event = a.event;
         if (state == StartState) {
             value = a.fromValue;
-            binding = property.binding();
+            binding = QDeclarativeMetaPropertyPrivate::binding(property);
             reverseEvent = true;
         } else {
             value = a.toValue;
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index 0b81a53..1a7c256 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -59,7 +59,7 @@ class QDeclarativeStateGroupPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QDeclarativeStateGroup)
 public:
-    QDeclarativeStateGroupPrivate(QDeclarativeStateGroup *p)
+    QDeclarativeStateGroupPrivate()
     : nullState(0), componentComplete(true),
       ignoreTrans(false), applyingState(false) {}
 
@@ -111,7 +111,7 @@ public:
 */
 
 QDeclarativeStateGroup::QDeclarativeStateGroup(QObject *parent)
-    : QObject(*(new QDeclarativeStateGroupPrivate(this)), parent)
+    : QObject(*(new QDeclarativeStateGroupPrivate), parent)
 {
 }
 
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index b5841dc..9fa1488 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -98,7 +98,7 @@ void QDeclarativeTransitionManagerPrivate::applyBindings()
 {
     foreach(const QDeclarativeAction &action, bindingsList) {
         if (action.toBinding) {
-            action.property.setBinding(action.toBinding);
+            QDeclarativeMetaPropertyPrivate::setBinding(action.property, action.toBinding);
         } else if (action.event) {
             if (action.reverseEvent)
                 action.event->reverse();
@@ -122,7 +122,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
         if (action.toBinding)
             d->bindingsList << action;
         if (action.fromBinding)
-            action.property.setBinding(0); // Disable current binding
+            QDeclarativeMetaPropertyPrivate::setBinding(action.property, 0); // Disable current binding
         if (action.event && action.event->changesBindings()) {  //### assume isReversable()?
             d->bindingsList << action;
             if (action.reverseEvent)
@@ -149,7 +149,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
         for (int ii = 0; ii < applyList.size(); ++ii) {
             const QDeclarativeAction &action = applyList.at(ii);
             if (action.toBinding) {
-                action.property.setBinding(action.toBinding, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+                QDeclarativeMetaPropertyPrivate::setBinding(action.property, action.toBinding, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
             } else if (!action.event) {
                 action.property.write(action.toValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
             } else if (action.event->isReversable()) {
@@ -190,7 +190,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
             }
 
             if (action.toBinding)
-                action.property.setBinding(0); // Make sure this is disabled during the transition
+                QDeclarativeMetaPropertyPrivate::setBinding(action.property, 0); // Make sure this is disabled during the transition
 
             action.property.write(action.fromValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
         }
@@ -266,7 +266,7 @@ void QDeclarativeTransitionManager::cancel()
     for(int i = 0; i < d->bindingsList.count(); ++i) {
         QDeclarativeAction action = d->bindingsList[i];
         if (action.toBinding && action.deletableToBinding) {
-            action.property.setBinding(0);
+            QDeclarativeMetaPropertyPrivate::setBinding(action.property, 0);
             action.toBinding->destroy();
             action.toBinding = 0;
             action.deletableToBinding = false;
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index 40cd737..8d5a1f6 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -58,6 +58,7 @@
 #include <private/qdeclarativedebugservice_p.h>
 #include <private/qdeclarativerectangle_p.h>
 #include <private/qdeclarativemetatype_p.h>
+#include <private/qdeclarativemetaproperty_p.h>
 
 #include "../shared/debugutil_p.h"
 
@@ -216,7 +217,8 @@ void tst_QDeclarativeDebug::recursiveObjectTest(QObject *o, const QDeclarativeDe
         else
             QCOMPARE(p.valueTypeName(), QString::fromUtf8(pmeta.typeName()));
 
-        QDeclarativeAbstractBinding *binding = QDeclarativeMetaProperty(o, p.name()).binding();
+        QDeclarativeAbstractBinding *binding = 
+            QDeclarativeMetaPropertyPrivate::binding(QDeclarativeMetaProperty(o, p.name()));
         if (binding)
             QCOMPARE(binding->expression(), p.binding());
 
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
index e19bea0..42d77bb 100644
--- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -42,6 +42,7 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qdeclarativemetaproperty.h>
+#include <QtDeclarative/private/qdeclarativemetaproperty_p.h>
 #include <private/qguard_p.h>
 #include <private/qdeclarativebinding_p.h>
 #include <QtGui/QLineEdit>
@@ -160,11 +161,11 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty()
     QCOMPARE(prop.propertyType(), 0);
     QCOMPARE(prop.propertyTypeName(), (const char *)0);
     QVERIFY(prop.property().name() == 0);
-    QVERIFY(prop.binding() == 0);
-    QVERIFY(prop.setBinding(binding) == 0);
+    QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
+    QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
     QVERIFY(binding == 0);
-    QVERIFY(prop.signalExpression() == 0);
-    QVERIFY(prop.setSignalExpression(expression) == 0);
+    QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+    QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
     QVERIFY(expression == 0);
     QCOMPARE(prop.coreIndex(), -1);
     QCOMPARE(prop.valueTypeCoreIndex(), -1);
@@ -248,11 +249,11 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), -1);
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
@@ -295,13 +296,13 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(prop.binding() == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
         QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding != 0);
-        QVERIFY(prop.binding() == binding);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == binding);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
@@ -349,11 +350,11 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), -1);
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
@@ -396,13 +397,13 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(prop.binding() == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
         QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding != 0);
-        QVERIFY(prop.binding() == binding);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == binding);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
@@ -445,13 +446,13 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression != 0);
-        QVERIFY(prop.signalExpression() == expression);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == expression);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
 
@@ -498,11 +499,11 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), -1);
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
@@ -545,13 +546,13 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(prop.binding() == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
         QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding != 0);
-        QVERIFY(prop.binding() == binding);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == binding);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
@@ -599,11 +600,11 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), -1);
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
@@ -646,13 +647,13 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(prop.binding() == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
         QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding != 0);
-        QVERIFY(prop.binding() == binding);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == binding);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
@@ -695,13 +696,13 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression != 0);
-        QVERIFY(prop.signalExpression() == expression);
+        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == expression);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
         QCOMPARE(prop.valueTypeCoreIndex(), -1);
 
@@ -824,8 +825,8 @@ void tst_qdeclarativemetaproperty::read()
         QDeclarativeMetaProperty p(&o, "onClicked");
         QCOMPARE(p.read(), QVariant());
 
-        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
-        QVERIFY(0 != p.signalExpression());
+        QVERIFY(0 == QDeclarativeMetaPropertyPrivate::setSignalExpression(p, new QDeclarativeExpression()));
+        QVERIFY(0 != QDeclarativeMetaPropertyPrivate::signalExpression(p));
 
         QCOMPARE(p.read(), QVariant());
     }
@@ -928,12 +929,12 @@ void tst_qdeclarativemetaproperty::write()
         QDeclarativeMetaProperty p(&o, "onClicked");
         QCOMPARE(p.write(QVariant("console.log(1921)")), false);
 
-        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
-        QVERIFY(0 != p.signalExpression());
+        QVERIFY(0 == QDeclarativeMetaPropertyPrivate::setSignalExpression(p, new QDeclarativeExpression()));
+        QVERIFY(0 != QDeclarativeMetaPropertyPrivate::signalExpression(p));
 
         QCOMPARE(p.write(QVariant("console.log(1921)")), false);
 
-        QVERIFY(0 != p.signalExpression());
+        QVERIFY(0 != QDeclarativeMetaPropertyPrivate::signalExpression(p));
     }
 
     // Value-type property
-- 
cgit v0.12


From eed6afb54c48892b0f748d7d8accbecadf0680af Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Thu, 25 Feb 2010 12:51:42 +1000
Subject: Add import Qt.widgets 4.6 to loader auto test using graphics widgets

---
 tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
index 627c7df..4ebf366 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
@@ -1,4 +1,5 @@
 import Qt 4.6
+import Qt.widgets 4.6
 
 QGraphicsWidget {
     size: "250x250"
-- 
cgit v0.12


From e5f169eaff00b68a233a76ddbac97201d819bc28 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Thu, 25 Feb 2010 14:16:01 +1000
Subject: Connections example could be turned incorrectly

Task-number: QTBUG-8345
---
 examples/declarative/connections/connections.qml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/examples/declarative/connections/connections.qml b/examples/declarative/connections/connections.qml
index ef2cb54..c140017 100644
--- a/examples/declarative/connections/connections.qml
+++ b/examples/declarative/connections/connections.qml
@@ -5,15 +5,11 @@ Rectangle {
     id: window; color: "#646464"
     width: 640; height: 480
 
-    function turnLeft() {
-        image.rotation -= 90
-    }
-    function turnRight() {
-        image.rotation += 90
-    }
+    property int angle: 0
 
     Image {
         id: image; source: "content/bg1.jpg"; anchors.centerIn: parent; transformOrigin: Item.Center
+	rotation: window.angle
         rotation: Behavior { NumberAnimation { easing.type: "OutCubic"; duration: 300 } }
     }
 
@@ -26,6 +22,6 @@ Rectangle {
         anchors { right: parent.right; bottom: parent.bottom; rightMargin: 10; bottomMargin: 10 }
     }
 
-    Connection { sender: leftButton; signal: "clicked()"; script: window.turnLeft() }
-    Connection { sender: rightButton; signal: "clicked()"; script: window.turnRight() }
+    Connection { sender: leftButton; signal: "clicked()"; script: window.angle -= 90 }
+    Connection { sender: rightButton; signal: "clicked()"; script: window.angle += 90 }
 }
-- 
cgit v0.12


From 9c147ba5e39dffea91d492896cc836529715d7ac Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 25 Feb 2010 14:11:52 +1000
Subject: Remove QDeclarativeMetaProperty::createProperty() method

The behavior of createProperty() (to resolve dot properties) is now the
behavior of the constructors.
---
 src/declarative/qml/qdeclarativemetaproperty.cpp   | 190 ++++++++++-----------
 src/declarative/qml/qdeclarativemetaproperty.h     |   2 -
 src/declarative/util/qdeclarativeanimation.cpp     |   2 +-
 .../util/qdeclarativepropertychanges.cpp           |   2 +-
 src/declarative/util/qdeclarativestate.cpp         |   8 +-
 .../tst_qdeclarativelanguage.cpp                   |   2 +-
 .../tst_qdeclarativemetaproperty.cpp               |  26 +--
 7 files changed, 106 insertions(+), 126 deletions(-)

diff --git a/src/declarative/qml/qdeclarativemetaproperty.cpp b/src/declarative/qml/qdeclarativemetaproperty.cpp
index 3bbc337..477ef3a 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.cpp
+++ b/src/declarative/qml/qdeclarativemetaproperty.cpp
@@ -146,50 +146,111 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, const QString &
     if (!isValid()) { d->object = 0; d->context = 0; }
 }
 
+Q_GLOBAL_STATIC(QDeclarativeValueTypeFactory, qmlValueTypes);
+
 void QDeclarativeMetaPropertyPrivate::initProperty(QObject *obj, const QString &name)
 {
-    QDeclarativeEnginePrivate *enginePrivate = 0;
-    if (context && context->engine())
-        enginePrivate = QDeclarativeEnginePrivate::get(context->engine());
+    if (!obj) return;
 
-    object = obj;
+    QDeclarativeEngine *engine = context?context->engine():0;
+    QDeclarativeTypeNameCache *typeNameCache = context?QDeclarativeContextPrivate::get(context)->imports:0;
 
-    if (name.isEmpty() || !obj)
-        return;
+    QStringList path = name.split(QLatin1Char('.'));
+    if (path.isEmpty()) return;
+
+    QObject *currentObject = obj;
+
+    // Everything up to the last property must be an "object type" property
+    for (int ii = 0; ii < path.count() - 1; ++ii) {
+        const QString &pathName = path.at(ii);
+
+        if (QDeclarativeTypeNameCache::Data *data = typeNameCache?typeNameCache->data(pathName):0) {
+            if (data->type) {
+                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
+                if (!func) return; // Not an attachable type
+
+                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
+                if (!currentObject) return; // Something is broken with the attachable type
+            } else {
+                Q_ASSERT(data->typeNamespace);
+                if ((ii + 1) == path.count()) return; // No type following the namespace
+                
+                ++ii; data = data->typeNamespace->data(path.at(ii));
+                if (!data || !data->type) return; // Invalid type in namespace 
+
+                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
+                if (!func) return; // Not an attachable type
+
+                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
+                if (!currentObject) return; // Something is broken with the attachable type
+            }
+        } else {
+
+            QDeclarativePropertyCache::Data local;
+            QDeclarativePropertyCache::Data *property = 
+                QDeclarativePropertyCache::property(engine, obj, pathName, local);
+
+            if (!property) return; // Not a property
+            if (property->flags & QDeclarativePropertyCache::Data::IsFunction) 
+                return; // Not an object property 
+
+            if (ii == (path.count() - 2) && property->propType < (int)QVariant::UserType) {
+                // We're now at a value type property.  We can use a global valuetypes array as we 
+                // never actually use the objects, just look up their properties.
+                QObject *typeObject = qmlValueTypes()->valueTypes[property->propType];
+                if (!typeObject) return; // Not a value type
+
+                int idx = typeObject->metaObject()->indexOfProperty(path.last().toUtf8().constData());
+                if (idx == -1) return; // Value type property does not exist
+
+                QMetaProperty vtProp = typeObject->metaObject()->property(idx);
+
+                object = currentObject;
+                core = *property;
+                valueType.flags = QDeclarativePropertyCache::Data::flagsForProperty(vtProp);
+                valueType.valueTypeCoreIdx = idx;
+                valueType.valueTypePropType = vtProp.userType();
+
+                return; 
+            } else {
+                if (!(property->flags & QDeclarativePropertyCache::Data::IsQObjectDerived)) 
+                    return; // Not an object property
+
+                void *args[] = { &currentObject, 0 };
+                QMetaObject::metacall(currentObject, QMetaObject::ReadProperty, property->coreIndex, args);
+                if (!currentObject) return; // No value
 
-    if (enginePrivate && name.at(0).isUpper()) {
-        // Attached property
-        // ### What about qualified types?
-        QDeclarativeTypeNameCache *tnCache = QDeclarativeContextPrivate::get(context)->imports;
-        if (tnCache) {
-            QDeclarativeTypeNameCache::Data *d = tnCache->data(name);
-            if (d && d->type && d->type->attachedPropertiesFunction()) {
-                attachedFunc = d->type->index();
             }
         }
-        return;
 
-    } else if (name.count() >= 3 && 
-               name.at(0) == QChar(QLatin1Char('o')) && 
-               name.at(1) == QChar(QLatin1Char('n')) && 
-               name.at(2).isUpper()) {
-        // Signal
-        QString signalName = name.mid(2);
+    }
+
+    const QString &terminal = path.last();
+
+    if (terminal.count() >= 3 &&
+        terminal.at(0) == QLatin1Char('o') &&
+        terminal.at(1) == QLatin1Char('n') &&
+        terminal.at(2).isUpper()) {
+
+        QString signalName = terminal.mid(2);
         signalName[0] = signalName.at(0).toLower();
 
-        QMetaMethod method = findSignal(obj, signalName);
+        QMetaMethod method = findSignal(currentObject, signalName);
         if (method.signature()) {
+            object = currentObject;
             core.load(method);
             return;
         }
-    } 
+    }
 
     // Property
     QDeclarativePropertyCache::Data local;
     QDeclarativePropertyCache::Data *property = 
-        QDeclarativePropertyCache::property(context?context->engine():0, obj, name, local);
-    if (property && !(property->flags & QDeclarativePropertyCache::Data::IsFunction)) 
+        QDeclarativePropertyCache::property(context?context->engine():0, currentObject, terminal, local);
+    if (property && !(property->flags & QDeclarativePropertyCache::Data::IsFunction)) {
+        object = currentObject;
         core = *property;
+    }
 }
 
 /*!
@@ -1077,8 +1138,6 @@ int QDeclarativeMetaProperty::valueTypeCoreIndex() const
     return d->valueType.valueTypeCoreIdx;
 }
 
-Q_GLOBAL_STATIC(QDeclarativeValueTypeFactory, qmlValueTypes);
-
 
 struct SerializedData {
     QDeclarativeMetaProperty::Type type;
@@ -1141,83 +1200,6 @@ QDeclarativeMetaPropertyPrivate::restore(const QByteArray &data, QObject *object
 }
 
 /*!
-    \internal
-
-    Creates a QDeclarativeMetaProperty for the property \a name of \a obj. Unlike
-    the QDeclarativeMetaProperty(QObject*, QString, QDeclarativeContext*) constructor, this static function
-    will correctly handle dot properties, including value types and attached properties.
-*/
-QDeclarativeMetaProperty QDeclarativeMetaProperty::createProperty(QObject *obj, 
-                                                const QString &name,
-                                                QDeclarativeContext *context)
-{
-    QDeclarativeTypeNameCache *typeNameCache = context?QDeclarativeContextPrivate::get(context)->imports:0;
-
-    QStringList path = name.split(QLatin1Char('.'));
-    QObject *object = obj;
-
-    for (int jj = 0; jj < path.count() - 1; ++jj) {
-        const QString &pathName = path.at(jj);
-
-        if (QDeclarativeTypeNameCache::Data *data = typeNameCache?typeNameCache->data(pathName):0) {
-            if (data->type) {
-                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
-                if (!func) 
-                    return QDeclarativeMetaProperty();
-                object = qmlAttachedPropertiesObjectById(data->type->index(), object);
-                if (!object)
-                    return QDeclarativeMetaProperty();
-                continue;
-            } else {
-                Q_ASSERT(data->typeNamespace);
-                ++jj;
-                data = data->typeNamespace->data(path.at(jj));
-                if (!data || !data->type)
-                    return QDeclarativeMetaProperty();
-                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
-                if (!func) 
-                    return QDeclarativeMetaProperty();
-                object = qmlAttachedPropertiesObjectById(data->type->index(), object);
-                if (!object)
-                    return QDeclarativeMetaProperty();
-                continue;
-            }
-        }
-
-        QDeclarativeMetaProperty prop(object, pathName, context);
-
-        if (jj == path.count() - 2 && prop.propertyType() < (int)QVariant::UserType &&
-            qmlValueTypes()->valueTypes[prop.propertyType()]) {
-            // We're now at a value type property.  We can use a global valuetypes array as we 
-            // never actually use the objects, just look up their properties.
-            QObject *typeObject = 
-                qmlValueTypes()->valueTypes[prop.propertyType()];
-            int idx = typeObject->metaObject()->indexOfProperty(path.last().toUtf8().constData());
-            if (idx == -1)
-                return QDeclarativeMetaProperty();
-            QMetaProperty vtProp = typeObject->metaObject()->property(idx);
-
-            QDeclarativeMetaProperty p = prop;
-            p.d->valueType.valueTypeCoreIdx = idx;
-            p.d->valueType.valueTypePropType = vtProp.userType();
-            return p;
-        }
-
-        QObject *objVal = QDeclarativeMetaType::toQObject(prop.read());
-        if (!objVal)
-            return QDeclarativeMetaProperty();
-        object = objVal;
-    }
-
-    const QString &propName = path.last();
-    QDeclarativeMetaProperty prop(object, propName, context);
-    if (!prop.isValid())
-        return QDeclarativeMetaProperty();
-    else
-        return prop;
-}
-
-/*!
     Returns true if lhs and rhs refer to the same metaobject data
 */
 bool QDeclarativeMetaPropertyPrivate::equal(const QMetaObject *lhs, const QMetaObject *rhs)
diff --git a/src/declarative/qml/qdeclarativemetaproperty.h b/src/declarative/qml/qdeclarativemetaproperty.h
index 9a3a793..8ea3bcd 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.h
+++ b/src/declarative/qml/qdeclarativemetaproperty.h
@@ -121,8 +121,6 @@ public:
 
     QMetaProperty property() const;
 
-    static QDeclarativeMetaProperty createProperty(QObject *, const QString &, QDeclarativeContext *context=0);
-
     int coreIndex() const;
     int valueTypeCoreIndex() const;
 private:
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index eb3a376..9e777a0 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -156,7 +156,7 @@ void QDeclarativeAbstractAnimationPrivate::commence()
 
 QDeclarativeMetaProperty QDeclarativeAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj)
 {
-    QDeclarativeMetaProperty prop = QDeclarativeMetaProperty::createProperty(obj, str, qmlContext(infoObj));
+    QDeclarativeMetaProperty prop(obj, str, qmlContext(infoObj));
     if (!prop.isValid()) {
         qmlInfo(infoObj) << QDeclarativeAbstractAnimation::tr("Cannot animate non-existent property \"%1\"").arg(str);
         return QDeclarativeMetaProperty();
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index ad39574..6c2e256 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -348,7 +348,7 @@ QDeclarativeMetaProperty
 QDeclarativePropertyChangesPrivate::property(const QByteArray &property)
 {
     Q_Q(QDeclarativePropertyChanges);
-    QDeclarativeMetaProperty prop = QDeclarativeMetaProperty::createProperty(object, QString::fromUtf8(property));
+    QDeclarativeMetaProperty prop(object, QString::fromUtf8(property));
     if (!prop.isValid()) {
         qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(property));
         return QDeclarativeMetaProperty();
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index d1dd318..3b06e33 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -65,11 +65,11 @@ QDeclarativeAction::QDeclarativeAction()
 
 QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyName,
                const QVariant &value)
-: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), toValue(value), fromBinding(0),
-  toBinding(0), event(0), specifiedObject(target),
-  specifiedProperty(propertyName)
+: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), 
+  property(target, propertyName), toValue(value), 
+  fromBinding(0), toBinding(0), event(0), 
+  specifiedObject(target), specifiedProperty(propertyName)
 {
-    property = QDeclarativeMetaProperty::createProperty(target, propertyName);
     if (property.isValid())
         fromValue = property.read();
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index ae07112..2907757 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -747,7 +747,7 @@ void tst_qdeclarativelanguage::valueTypes()
 
     // ###
 #if 0
-    QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "rectProperty.x");
+    QDeclarativeMetaProperty p(object, "rectProperty.x");
     QCOMPARE(p.read(), QVariant(12));
     p.write(13);
     QCOMPARE(p.read(), QVariant(13));
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
index 42d77bb..0740d0f 100644
--- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -754,19 +754,19 @@ void tst_qdeclarativemetaproperty::name()
 
     {
         PropertyObject o;
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty");
+        QDeclarativeMetaProperty p(&o, "rectProperty");
         QCOMPARE(p.name(), QString("rectProperty"));
     }
 
     {
         PropertyObject o;
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.x");
+        QDeclarativeMetaProperty p(&o, "rectProperty.x");
         QCOMPARE(p.name(), QString("rectProperty.x"));
     }
 
     {
         PropertyObject o;
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.foo");
+        QDeclarativeMetaProperty p(&o, "rectProperty.foo");
         QCOMPARE(p.name(), QString());
     }
 }
@@ -808,14 +808,14 @@ void tst_qdeclarativemetaproperty::read()
     // Value-type prop
     {
         PropertyObject o;
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.x");
+        QDeclarativeMetaProperty p(&o, "rectProperty.x");
         QCOMPARE(p.read(), QVariant(10));
     }
 
     // Invalid value-type prop
     {
         PropertyObject o;
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.foo");
+        QDeclarativeMetaProperty p(&o, "rectProperty.foo");
         QCOMPARE(p.read(), QVariant());
     }
 
@@ -834,7 +834,7 @@ void tst_qdeclarativemetaproperty::read()
     // Deleted object
     {
         PropertyObject *o = new PropertyObject;
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(o, "rectProperty.x");
+        QDeclarativeMetaProperty p(o, "rectProperty.x");
         QCOMPARE(p.read(), QVariant(10));
         delete o;
         QCOMPARE(p.read(), QVariant());
@@ -847,7 +847,7 @@ void tst_qdeclarativemetaproperty::read()
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p(object, "MyContainer.foo", qmlContext(object));
         QCOMPARE(p.read(), QVariant(13));
         delete object;
     }
@@ -857,7 +857,7 @@ void tst_qdeclarativemetaproperty::read()
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p(object, "MyContainer.foo", qmlContext(object));
         QCOMPARE(p.read(), QVariant(10));
         delete object;
     }
@@ -867,7 +867,7 @@ void tst_qdeclarativemetaproperty::read()
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p(object, "Foo.MyContainer.foo", qmlContext(object));
         QCOMPARE(p.read(), QVariant(10));
         delete object;
     }
@@ -946,7 +946,7 @@ void tst_qdeclarativemetaproperty::write()
         QCOMPARE(p.write(QRect(1, 13, 99, 8)), true);
         QCOMPARE(o.wrectProperty(), QRect(1, 13, 99, 8));
 
-        QDeclarativeMetaProperty p2 = QDeclarativeMetaProperty::createProperty(&o, "wrectProperty.x");
+        QDeclarativeMetaProperty p2(&o, "wrectProperty.x");
         QCOMPARE(p2.read(), QVariant(1));
         QCOMPARE(p2.write(QVariant(6)), true);
         QCOMPARE(p2.read(), QVariant(6));
@@ -977,7 +977,7 @@ void tst_qdeclarativemetaproperty::write()
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p(object, "MyContainer.foo", qmlContext(object));
         p.write(QVariant(99));
         QCOMPARE(p.read(), QVariant(99));
         delete object;
@@ -988,7 +988,7 @@ void tst_qdeclarativemetaproperty::write()
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p(object, "Foo.MyContainer.foo", qmlContext(object));
         p.write(QVariant(99));
         QCOMPARE(p.read(), QVariant(99));
         delete object;
@@ -1116,7 +1116,7 @@ void tst_qdeclarativemetaproperty::crashOnValueProperty()
     PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
     QVERIFY(obj != 0);
 
-    QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(obj, "wrectProperty.x", qmlContext(obj));
+    QDeclarativeMetaProperty p(obj, "wrectProperty.x", qmlContext(obj));
     QCOMPARE(p.name(), QString("wrectProperty.x"));
 
     QCOMPARE(p.read(), QVariant(10));
-- 
cgit v0.12


From f29a6c8b9fbeb899997c1e4cc2a4be009a231502 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 25 Feb 2010 14:56:13 +1000
Subject: Remove QDeclarativeMetaProperty::Attached

We now prohibit QDeclarativeMetaProperty ever getting into a state where
it is pointing to the attached object itself.
---
 src/declarative/qml/qdeclarativemetaproperty.cpp | 40 ++++++------------------
 src/declarative/qml/qdeclarativemetaproperty.h   |  3 +-
 src/declarative/qml/qdeclarativemetaproperty_p.h | 10 ++----
 3 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/src/declarative/qml/qdeclarativemetaproperty.cpp b/src/declarative/qml/qdeclarativemetaproperty.cpp
index 477ef3a..b4e920c 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.cpp
+++ b/src/declarative/qml/qdeclarativemetaproperty.cpp
@@ -284,7 +284,6 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(const QDeclarativeMetaPropert
   \value Property The property is a regular Qt property.
   \value SignalProperty The property is a signal property.
   \value Default The property is the default property.
-  \value Attached The property is an attached property.
 */
 
 /*!
@@ -302,8 +301,6 @@ QDeclarativeMetaPropertyPrivate::propertyCategory() const
 
     if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
         return QDeclarativeMetaProperty::Normal;
-    } else if (type & QDeclarativeMetaProperty::Attached) {
-        return QDeclarativeMetaProperty::Object;
     } else if (type & QDeclarativeMetaProperty::Property) {
         int type = propertyType();
         if (type == QVariant::Invalid)
@@ -359,8 +356,7 @@ bool QDeclarativeMetaProperty::operator==(const QDeclarativeMetaProperty &other)
     // from the other members
     return d->object == other.d->object &&
            d->core == other.d->core &&
-           d->valueType == other.d->valueType &&
-           d->attachedFunc == other.d->attachedFunc;
+           d->valueType == other.d->valueType;
 }
 
 /*!
@@ -377,8 +373,6 @@ int QDeclarativeMetaPropertyPrivate::propertyType() const
     uint type = q->type();
     if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
         return valueType.valueTypePropType;
-    } else if (type & QDeclarativeMetaProperty::Attached) {
-        return qMetaTypeId<QObject *>();
     } else if (type & QDeclarativeMetaProperty::Property) {
         if (core.propType == (int)QVariant::LastType)
             return qMetaTypeId<QVariant>();
@@ -396,8 +390,6 @@ QDeclarativeMetaProperty::Type QDeclarativeMetaProperty::type() const
 {
     if (d->core.flags & QDeclarativePropertyCache::Data::IsFunction)
         return SignalProperty;
-    else if (d->attachedFunc != -1)
-        return Attached;
     else if (d->valueType.valueTypeCoreIdx != -1)
         return (Type)(Property | ValueTypeProperty);
     else if (d->core.isValid())
@@ -445,7 +437,6 @@ QDeclarativeMetaProperty &QDeclarativeMetaProperty::operator=(const QDeclarative
 
     d->valueType = other.d->valueType;
 
-    d->attachedFunc = other.d->attachedFunc;
     return *this;
 }
 
@@ -566,7 +557,7 @@ QMetaMethod QDeclarativeMetaProperty::method() const
 QDeclarativeAbstractBinding *
 QDeclarativeMetaPropertyPrivate::binding(const QDeclarativeMetaProperty &that) 
 {
-    if (!that.isProperty() || (that.type() & QDeclarativeMetaProperty::Attached) || !that.d->object)
+    if (!that.isProperty() || !that.d->object)
         return 0;
 
     QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(that.d->object);
@@ -604,7 +595,7 @@ QDeclarativeMetaPropertyPrivate::setBinding(const QDeclarativeMetaProperty &that
                                             QDeclarativeAbstractBinding *newBinding, 
                                             QDeclarativeMetaProperty::WriteFlags flags) 
 {
-    if (!that.isProperty() || (that.type() & QDeclarativeMetaProperty::Attached) || !that.d->object) {
+    if (!that.isProperty() || !that.d->object) {
         if (newBinding)
             newBinding->destroy();
         return 0;
@@ -716,14 +707,6 @@ QMetaMethod QDeclarativeMetaPropertyPrivate::findSignal(QObject *obj, const QStr
     return QMetaMethod();
 }
 
-QObject *QDeclarativeMetaPropertyPrivate::attachedObject() const
-{
-    if (attachedFunc == -1)
-        return 0;
-    else
-        return qmlAttachedPropertiesObjectById(attachedFunc, object);
-}
-
 /*!
     Returns the property value.
 */
@@ -736,7 +719,7 @@ QVariant QDeclarativeMetaProperty::read() const
 
         return QVariant();
 
-    } else if (type() & Property || type() & Attached) {
+    } else if (type() & Property) {
 
         return d->readValueProperty();
 
@@ -747,11 +730,7 @@ QVariant QDeclarativeMetaProperty::read() const
 QVariant QDeclarativeMetaPropertyPrivate::readValueProperty()
 {
     uint type = q->type();
-    if (type & QDeclarativeMetaProperty::Attached) {
-
-        return QVariant::fromValue(attachedObject());
-
-    } else if(type & QDeclarativeMetaProperty::ValueTypeProperty) {
+    if(type & QDeclarativeMetaProperty::ValueTypeProperty) {
 
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
         QDeclarativeValueType *valueType = 0;
@@ -1062,7 +1041,7 @@ bool QDeclarativeMetaProperty::write(const QVariant &value, QDeclarativeMetaProp
 */
 bool QDeclarativeMetaProperty::hasChangedNotifier() const
 {
-    if (type() & Property && !(type() & Attached) && d->object) {
+    if (type() & Property && d->object) {
         return d->object->metaObject()->property(d->core.coreIndex).hasNotifySignal();
     }
     return false;
@@ -1077,8 +1056,7 @@ bool QDeclarativeMetaProperty::hasChangedNotifier() const
 */
 bool QDeclarativeMetaProperty::needsChangedNotifier() const
 {
-    return type() & Property && !(type() & Attached) && 
-           !property().isConstant();
+    return type() & Property && !property().isConstant();
 }
 
 /*!
@@ -1091,7 +1069,7 @@ bool QDeclarativeMetaProperty::needsChangedNotifier() const
 */
 bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, int method) const
 {
-    if (!(type() & Property) || (type() & Attached) || !d->object)
+    if (!(type() & Property) || !d->object)
         return false;
 
     QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
@@ -1112,7 +1090,7 @@ bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, int method) const
 */
 bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, const char *slot) const
 {
-    if (!(type() & Property) || (type() & Attached) || !d->object)
+    if (!(type() & Property) || !d->object)
         return false;
 
     QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
diff --git a/src/declarative/qml/qdeclarativemetaproperty.h b/src/declarative/qml/qdeclarativemetaproperty.h
index 8ea3bcd..dce0b4f 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.h
+++ b/src/declarative/qml/qdeclarativemetaproperty.h
@@ -100,8 +100,7 @@ public:
                 Property = 0x01, 
                 SignalProperty = 0x02,
                 Default = 0x08,
-                Attached = 0x10,
-                ValueTypeProperty = 0x20 };
+                ValueTypeProperty = 0x10 };
 
     Type type() const;
     bool isProperty() const;
diff --git a/src/declarative/qml/qdeclarativemetaproperty_p.h b/src/declarative/qml/qdeclarativemetaproperty_p.h
index b769e42..5ebd2c5 100644
--- a/src/declarative/qml/qdeclarativemetaproperty_p.h
+++ b/src/declarative/qml/qdeclarativemetaproperty_p.h
@@ -68,14 +68,14 @@ class Q_AUTOTEST_EXPORT QDeclarativeMetaPropertyPrivate
 {
 public:
     QDeclarativeMetaPropertyPrivate()
-        : q(0), context(0), object(0), isDefaultProperty(false), isNameCached(false),
-          attachedFunc(-1) {}
+        : q(0), context(0), object(0), isDefaultProperty(false), isNameCached(false) {}
+          
 
     QDeclarativeMetaPropertyPrivate(const QDeclarativeMetaPropertyPrivate &other)
         : q(0), context(other.context), object(other.object), 
           isDefaultProperty(other.isDefaultProperty), isNameCached(other.isNameCached),
           core(other.core), nameCache(other.nameCache),
-          valueType(other.valueType), attachedFunc(other.attachedFunc) {}
+          valueType(other.valueType) {}
 
     QDeclarativeMetaProperty *q;
     QDeclarativeContext *context;
@@ -89,13 +89,9 @@ public:
     // Describes the "virtual" value-type sub-property.  
     QDeclarativePropertyCache::ValueTypeData valueType;
 
-    // The attached property accessor
-    int attachedFunc;
-
     void initProperty(QObject *obj, const QString &name);
     void initDefault(QObject *obj);
 
-    QObject *attachedObject() const;
     QMetaMethod findSignal(QObject *, const QString &);
 
     int propertyType() const;
-- 
cgit v0.12


From d022acd47350f61d3959b076d7bc92df86015b16 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 25 Feb 2010 15:45:44 +1000
Subject: Tweak QDeclarativeMetaProperty type category API

---
 src/declarative/qml/qdeclarativebinding.cpp        |  2 +-
 src/declarative/qml/qdeclarativemetaproperty.cpp   | 22 ++++++---------
 src/declarative/qml/qdeclarativemetaproperty.h     | 30 ++++++++++----------
 src/declarative/qml/qdeclarativemetaproperty_p.h   |  2 +-
 .../tst_qdeclarativelistreference.cpp              |  4 +--
 .../tst_qdeclarativemetaproperty.cpp               | 32 +++++++++++-----------
 6 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 5ac5701..bde01ae 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -128,7 +128,7 @@ void QDeclarativeBinding::update(QDeclarativeMetaProperty::WriteFlags flags)
     if (!data->updating) {
         data->updating = true;
 
-        if (data->property.propertyCategory() == QDeclarativeMetaProperty::Bindable) {
+        if (data->property.propertyType() == qMetaTypeId<QDeclarativeBinding *>()) {
 
             int idx = data->property.coreIndex();
             Q_ASSERT(idx != -1);
diff --git a/src/declarative/qml/qdeclarativemetaproperty.cpp b/src/declarative/qml/qdeclarativemetaproperty.cpp
index b4e920c..f4c930f 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.cpp
+++ b/src/declarative/qml/qdeclarativemetaproperty.cpp
@@ -263,13 +263,11 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(const QDeclarativeMetaPropert
 }
 
 /*!
-  \enum QDeclarativeMetaProperty::PropertyCategory
+  \enum QDeclarativeMetaProperty::PropertyTypeCategory
 
   This enum specifies a category of QML property.
 
-  \value Unknown The category is unknown.  This will never be returned from propertyCategory()
-  \value InvalidProperty The property is invalid.
-  \value Bindable The property is a QDeclarativeBinding.
+  \value InvalidCategory The property is invalid.
   \value List The property is a QList pointer
   \value Object The property is a QObject derived type pointer
   \value Normal The property is none of the above.
@@ -289,13 +287,13 @@ QDeclarativeMetaProperty::QDeclarativeMetaProperty(const QDeclarativeMetaPropert
 /*!
     Returns the property category.
 */
-QDeclarativeMetaProperty::PropertyCategory QDeclarativeMetaProperty::propertyCategory() const
+QDeclarativeMetaProperty::PropertyTypeCategory QDeclarativeMetaProperty::propertyTypeCategory() const
 {
-    return d->propertyCategory();
+    return d->propertyTypeCategory();
 }
 
-QDeclarativeMetaProperty::PropertyCategory 
-QDeclarativeMetaPropertyPrivate::propertyCategory() const
+QDeclarativeMetaProperty::PropertyTypeCategory 
+QDeclarativeMetaPropertyPrivate::propertyTypeCategory() const
 {
     uint type = q->type();
 
@@ -304,11 +302,9 @@ QDeclarativeMetaPropertyPrivate::propertyCategory() const
     } else if (type & QDeclarativeMetaProperty::Property) {
         int type = propertyType();
         if (type == QVariant::Invalid)
-            return QDeclarativeMetaProperty::InvalidProperty;
+            return QDeclarativeMetaProperty::InvalidCategory;
         else if ((uint)type < QVariant::UserType)
             return QDeclarativeMetaProperty::Normal;
-        else if (type == qMetaTypeId<QDeclarativeBinding *>())
-            return QDeclarativeMetaProperty::Bindable;
         else if (core.flags & QDeclarativePropertyCache::Data::IsQObjectDerived)
             return QDeclarativeMetaProperty::Object;
         else if (core.flags & QDeclarativePropertyCache::Data::IsQList)
@@ -316,7 +312,7 @@ QDeclarativeMetaPropertyPrivate::propertyCategory() const
         else 
             return QDeclarativeMetaProperty::Normal;
     } else {
-        return QDeclarativeMetaProperty::InvalidProperty;
+        return QDeclarativeMetaProperty::InvalidCategory;
     }
 }
 
@@ -445,7 +441,7 @@ QDeclarativeMetaProperty &QDeclarativeMetaProperty::operator=(const QDeclarative
 */
 bool QDeclarativeMetaProperty::isWritable() const
 {
-    QDeclarativeMetaProperty::PropertyCategory category = propertyCategory();
+    QDeclarativeMetaProperty::PropertyTypeCategory category = propertyTypeCategory();
 
     if (!d->object)
         return false;
diff --git a/src/declarative/qml/qdeclarativemetaproperty.h b/src/declarative/qml/qdeclarativemetaproperty.h
index dce0b4f..900d1cd 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.h
+++ b/src/declarative/qml/qdeclarativemetaproperty.h
@@ -63,22 +63,31 @@ class QDeclarativeMetaPropertyPrivate;
 class Q_DECLARATIVE_EXPORT QDeclarativeMetaProperty
 {
 public:
-    enum PropertyCategory {
-        Unknown,
-        InvalidProperty,
-        Bindable,
+    enum PropertyTypeCategory {
+        InvalidCategory,
         List,
         Object,
         Normal
     };
+
+    enum Type { Invalid = 0x00, 
+                Property = 0x01, 
+                SignalProperty = 0x02,
+                Default = 0x08,
+                ValueTypeProperty = 0x10 
+    };
+
     QDeclarativeMetaProperty();
+    ~QDeclarativeMetaProperty();
+
     QDeclarativeMetaProperty(QObject *);
-    QDeclarativeMetaProperty(QObject *, const QString &);
     QDeclarativeMetaProperty(QObject *, QDeclarativeContext *);
+
+    QDeclarativeMetaProperty(QObject *, const QString &);
     QDeclarativeMetaProperty(QObject *, const QString &, QDeclarativeContext *);
+
     QDeclarativeMetaProperty(const QDeclarativeMetaProperty &);
     QDeclarativeMetaProperty &operator=(const QDeclarativeMetaProperty &);
-    ~QDeclarativeMetaProperty();
 
     QString name() const;
 
@@ -96,12 +105,6 @@ public:
 
     QMetaMethod method() const;
 
-    enum Type { Invalid = 0x00, 
-                Property = 0x01, 
-                SignalProperty = 0x02,
-                Default = 0x08,
-                ValueTypeProperty = 0x10 };
-
     Type type() const;
     bool isProperty() const;
     bool isDefault() const;
@@ -111,9 +114,8 @@ public:
     bool isValid() const;
     QObject *object() const;
 
-    PropertyCategory propertyCategory() const;
-
     int propertyType() const;
+    PropertyTypeCategory propertyTypeCategory() const;
     const char *propertyTypeName() const;
 
     bool operator==(const QDeclarativeMetaProperty &) const;
diff --git a/src/declarative/qml/qdeclarativemetaproperty_p.h b/src/declarative/qml/qdeclarativemetaproperty_p.h
index 5ebd2c5..937cfd7 100644
--- a/src/declarative/qml/qdeclarativemetaproperty_p.h
+++ b/src/declarative/qml/qdeclarativemetaproperty_p.h
@@ -95,7 +95,7 @@ public:
     QMetaMethod findSignal(QObject *, const QString &);
 
     int propertyType() const;
-    QDeclarativeMetaProperty::PropertyCategory propertyCategory() const;
+    QDeclarativeMetaProperty::PropertyTypeCategory propertyTypeCategory() const;
 
     QVariant readValueProperty();
     bool writeValueProperty(const QVariant &, QDeclarativeMetaProperty::WriteFlags);
diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
index 5c6ceef..fdcb98a 100644
--- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
+++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
@@ -547,10 +547,10 @@ void tst_qdeclarativelistreference::engineTypes()
     QVERIFY(o);
 
     QDeclarativeMetaProperty p1(o, QLatin1String("myList"));
-    QVERIFY(p1.propertyCategory() == QDeclarativeMetaProperty::Normal);
+    QVERIFY(p1.propertyTypeCategory() == QDeclarativeMetaProperty::Normal);
 
     QDeclarativeMetaProperty p2(o, QLatin1String("myList"), engine.rootContext());
-    QVERIFY(p2.propertyCategory() == QDeclarativeMetaProperty::List);
+    QVERIFY(p2.propertyTypeCategory() == QDeclarativeMetaProperty::List);
     QVariant v = p2.read();
     QVERIFY(v.userType() == qMetaTypeId<QDeclarativeListReference>());
     QDeclarativeListReference ref = qvariant_cast<QDeclarativeListReference>(v);
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
index 0740d0f..4d07a19 100644
--- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -157,7 +157,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty()
     QCOMPARE(prop.isResettable(), false);
     QCOMPARE(prop.isValid(), false);
     QCOMPARE(prop.object(), (QObject *)0);
-    QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+    QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
     QCOMPARE(prop.propertyType(), 0);
     QCOMPARE(prop.propertyTypeName(), (const char *)0);
     QVERIFY(prop.property().name() == 0);
@@ -245,7 +245,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -292,7 +292,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -346,7 +346,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -393,7 +393,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -442,7 +442,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
@@ -495,7 +495,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -542,7 +542,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -596,7 +596,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -643,7 +643,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -692,7 +692,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
@@ -1139,14 +1139,14 @@ void tst_qdeclarativemetaproperty::copy()
     QCOMPARE(property->name(), QString("defaultProperty"));
     QCOMPARE(property->read(), QVariant(10));
     QCOMPARE(property->type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(property->propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(property->propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(property->propertyType(), (int)QVariant::Int);
 
     QDeclarativeMetaProperty p1(*property);
     QCOMPARE(p1.name(), QString("defaultProperty"));
     QCOMPARE(p1.read(), QVariant(10));
     QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p1.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p1.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p1.propertyType(), (int)QVariant::Int);
 
     QDeclarativeMetaProperty p2(&object, QLatin1String("url"));
@@ -1155,7 +1155,7 @@ void tst_qdeclarativemetaproperty::copy()
     QCOMPARE(p2.name(), QString("defaultProperty"));
     QCOMPARE(p2.read(), QVariant(10));
     QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p2.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p2.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p2.propertyType(), (int)QVariant::Int);
 
     delete property; property = 0;
@@ -1163,13 +1163,13 @@ void tst_qdeclarativemetaproperty::copy()
     QCOMPARE(p1.name(), QString("defaultProperty"));
     QCOMPARE(p1.read(), QVariant(10));
     QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p1.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p1.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p1.propertyType(), (int)QVariant::Int);
 
     QCOMPARE(p2.name(), QString("defaultProperty"));
     QCOMPARE(p2.read(), QVariant(10));
     QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p2.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p2.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p2.propertyType(), (int)QVariant::Int);
 }
 
-- 
cgit v0.12


From 9616583e19bb642da8f2d2f4305ddef8ee16feb3 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Thu, 25 Feb 2010 15:25:41 +1000
Subject: Fix QDeclarativePropertyAnimation to avoid property writes while
 stopped

Avoid changing the value of the property, while the animation is stopped.
This was triggered while changing the duration of the animation, while
it was stopped.

Task-number: QTBUG-8507
Reviewed-by: Michael Brasser
---
 src/declarative/util/qdeclarativeanimation_p_p.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index bb81fb3..65c9807 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -165,6 +165,9 @@ public:
 protected:
     virtual void updateCurrentValue(const QVariant &value)
     {
+        if (state() == QAbstractAnimation::Stopped)
+            return;
+
         if (animValue)
             animValue->setValue(value.toReal());
     }
-- 
cgit v0.12


From d16d34a90d20e326a38b890e3665b3b8656ee414 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Thu, 25 Feb 2010 15:51:14 +1000
Subject: Recfactor in declarative snake demo

Avoid having 2 'states' that have 'when' conditions that can be 'true'
at the same time.
---
 demos/declarative/snake/snake.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 3bec747..09b6b7f 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -172,14 +172,14 @@ Rectangle {
     states: [
         State {
             name: "starting"
-            when: startHeartbeatTimer.running;
+            when: startHeartbeatTimer.running
             PropertyChanges {target: progressIndicator; width: 200}
             PropertyChanges {target: title; opacity: 0}
             PropertyChanges {target: progressBar; opacity: 1}
         },
         State {
             name: "running"
-            when: heartbeat.running
+            when: (heartbeat.running && !startHeartbeatTimer.running)
             PropertyChanges {target: progressIndicator; width: 200}
             PropertyChanges {target: title; opacity: 0}
             PropertyChanges {target: skull; row: 0; column: 0; }
-- 
cgit v0.12


From b3613f3f3135afeaa9425b1791567185cbc38435 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 25 Feb 2010 16:05:19 +1000
Subject: Document Package

---
 doc/src/declarative/elements.qdoc                  |  1 +
 .../graphicsitems/qdeclarativevisualitemmodel.cpp  | 27 ++++++++++++++++++++++
 src/declarative/util/qdeclarativepackage.cpp       | 27 ++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 470a78c..da96b8e 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -89,6 +89,7 @@ The following table lists the QML elements provided by the Qt Declarative module
 \o \l ListModel, \l ListElement
 \o \l VisualItemModel
 \o \l VisualDataModel
+\o \l Package
 \o \l XmlListModel and XmlRole
 \o \l DateTimeFormatter
 \o \l NumberFormatter
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 8114f9b..2402648 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -929,6 +929,33 @@ QDeclarativeVisualDataModel::ReleaseFlags QDeclarativeVisualDataModel::release(Q
     return stat;
 }
 
+/*!
+    \qmlproperty object VisualDataModel::parts
+
+    The \a parts property selects a VisualDataModel which creates
+    delegates from the part named.  This is used in conjunction with
+    the Package element.
+
+    For example, the code below selects a model which creates
+    delegates named \e list from a Package:
+
+    \code
+    VisualDataModel {
+        id: visualModel
+        delegate: Package {
+            Item { Package.name: "list" }
+        }
+        model: myModel
+    }
+
+    ListView {
+        width: 200; height:200
+        model: visualModel.parts.list
+    }
+    \endcode
+
+    \sa Package
+*/
 QObject *QDeclarativeVisualDataModel::parts()
 {
     Q_D(QDeclarativeVisualDataModel);
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp
index 356d7a1..34ae466 100644
--- a/src/declarative/util/qdeclarativepackage.cpp
+++ b/src/declarative/util/qdeclarativepackage.cpp
@@ -46,6 +46,33 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \qmlclass Package QDeclarativePackage
+    \brief Package provides a collection of named items
+
+    The Package class is currently used in conjunction with
+    VisualDataModel to enable delegates with a shared context
+    to be provided to multiple views.
+
+    Any item within a Package may be assigned a name via the
+    \e {Package.name} attached property.
+
+    The example below creates a Package containing two named items;
+    \e list and \e grid.  The third element in the package is parented to whichever
+    delegate it should appear in.  This allows an item to move
+    between views.
+
+    \snippet examples/declarative/package/Delegate.qml 0
+
+    These named items are used as the delegates by the two views who
+    reference the special VisualDataModel.parts property to select
+    a model which provides the chosen delegate.
+
+    \snippet examples/declarative/package/view.qml 0
+
+*/
+
+
 class QDeclarativePackagePrivate : public QObjectPrivate
 {
 public:
-- 
cgit v0.12


From 7c589d3584045f2f3eaac7d9eb36c5a17f8f2067 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 25 Feb 2010 16:06:13 +1000
Subject: Add simple Package example.

---
 examples/declarative/package/Delegate.qml | 44 +++++++++++++++++++++++++++++++
 examples/declarative/package/view.qml     | 35 ++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 examples/declarative/package/Delegate.qml
 create mode 100644 examples/declarative/package/view.qml

diff --git a/examples/declarative/package/Delegate.qml b/examples/declarative/package/Delegate.qml
new file mode 100644
index 0000000..4109633
--- /dev/null
+++ b/examples/declarative/package/Delegate.qml
@@ -0,0 +1,44 @@
+import Qt 4.6
+
+//![0]
+Package {
+    Text { id: listDelegate; width: 200; height: 25; text: "Empty"; Package.name: "list" }
+    Text { id: gridDelegate; width: 100; height: 50; text: "Empty"; Package.name: "grid" }
+
+    Rectangle {
+        id: wrapper
+        width: 200; height: 25
+        color: "lightsteelblue"
+        Text { text: display; anchors.centerIn: parent }
+        MouseRegion {
+            anchors.fill: parent
+            onClicked: {
+                if (wrapper.state == "inList")
+                    wrapper.state = "inGrid";
+                else
+                    wrapper.state = "inList";
+            }
+        }
+        state: "inList"
+        states: [
+            State {
+                name: 'inList'
+                ParentChange { target: wrapper; parent: listDelegate }
+            },
+            State {
+                name: 'inGrid'
+                ParentChange { target: wrapper; parent: gridDelegate }
+                PropertyChanges { target: wrapper; x: 0; y: 0; width: gridDelegate.width; height: gridDelegate.height }
+            }
+        ]
+        transitions: [
+            Transition {
+                SequentialAnimation {
+                    ParentAction { target: wrapper }
+                    NumberAnimation { targets: wrapper; properties: 'x,y,width,height'; duration: 300 }
+                }
+            }
+        ]
+    }
+}
+//![0]
diff --git a/examples/declarative/package/view.qml b/examples/declarative/package/view.qml
new file mode 100644
index 0000000..07bba0c
--- /dev/null
+++ b/examples/declarative/package/view.qml
@@ -0,0 +1,35 @@
+import Qt 4.6
+
+Item {
+    width: 400
+    height: 200
+
+    ListModel {
+        id: myModel
+        ListElement { display: "One" }
+        ListElement { display: "Two" }
+        ListElement { display: "Three" }
+        ListElement { display: "Four" }
+        ListElement { display: "Five" }
+        ListElement { display: "Six" }
+        ListElement { display: "Seven" }
+        ListElement { display: "Eight" }
+    }
+    //![0]
+    VisualDataModel {
+        id: visualModel
+        delegate: Delegate {}
+        model: myModel
+    }
+
+    ListView {
+        width: 200; height:200
+        model: visualModel.parts.list
+    }
+    GridView {
+        x: 200; width: 200; height:200
+        cellHeight: 50
+        model: visualModel.parts.grid
+    }
+    //![0]
+}
-- 
cgit v0.12


From c58554711e678421cd70f103ad78506b3e1f8d85 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 25 Feb 2010 16:12:02 +1000
Subject: Fix documentation following MouseRegion -> MouseArea change

---
 .../graphicsitems/qdeclarativemousearea.cpp            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index ab6be1c..ec7aa62 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -143,7 +143,7 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
 
 
 /*!
-    \qmlclass MouseRegion QDeclarativeMouseRegion
+    \qmlclass MouseArea QDeclarativeMouseArea
     \since 4.7
     \brief The MouseArea item enables simple mouse handling.
     \inherits Item
@@ -172,7 +172,7 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
 /*!
     \qmlsignal MouseArea::onEntered()
 
-    This handler is called when the mouse enters the mouse region.
+    This handler is called when the mouse enters the mouse area.
 
     By default the onEntered handler is only called while a button is
     pressed.  Setting hoverEnabled to true enables handling of
@@ -184,7 +184,7 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
 /*!
     \qmlsignal MouseArea::onExited()
 
-    This handler is called when the mouse exists the mouse region.
+    This handler is called when the mouse exists the mouse area.
 
     By default the onExited handler is only called while a button is
     pressed.  Setting hoverEnabled to true enables handling of
@@ -295,12 +295,12 @@ QDeclarativeMouseArea::~QDeclarativeMouseArea()
 
     If the hoverEnabled property is false then these properties will only be valid
     while a button is pressed, and will remain valid as long as the button is held
-    even if the mouse is moved outside the region.
+    even if the mouse is moved outside the area.
 
     If hoverEnabled is true then these properties will be valid:
     \list
         \i when no button is pressed, but the mouse is within the MouseArea (containsMouse is true).
-        \i if a button is pressed and held, even if it has since moved out of the region.
+        \i if a button is pressed and held, even if it has since moved out of the area.
     \endlist
 
     The coordinates are relative to the MouseArea.
@@ -567,9 +567,9 @@ void QDeclarativeMouseArea::timerEvent(QTimerEvent *event)
 
 /*!
     \qmlproperty bool MouseArea::containsMouse
-    This property holds whether the mouse is currently inside the mouse region.
+    This property holds whether the mouse is currently inside the mouse area.
 
-    \warning This property is not updated if the region moves under the mouse: \e containsMouse will not change.
+    \warning This property is not updated if the area moves under the mouse: \e containsMouse will not change.
     In addition, if hoverEnabled is false, containsMouse will only be valid when the mouse is pressed.
 */
 bool QDeclarativeMouseArea::hovered() const
@@ -580,7 +580,7 @@ bool QDeclarativeMouseArea::hovered() const
 
 /*!
     \qmlproperty bool MouseArea::pressed
-    This property holds whether the mouse region is currently pressed.
+    This property holds whether the mouse area is currently pressed.
 */
 bool QDeclarativeMouseArea::pressed() const
 {
@@ -600,7 +600,7 @@ void QDeclarativeMouseArea::setHovered(bool h)
 
 /*!
     \qmlproperty Qt::MouseButtons MouseArea::acceptedButtons
-    This property holds the mouse buttons that the mouse region reacts to.
+    This property holds the mouse buttons that the mouse area reacts to.
 
     The available buttons are:
     \list
-- 
cgit v0.12


From 6721e5270b33e5e88c68ec426d482b9b633d8fd6 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 25 Feb 2010 14:03:56 +1000
Subject: doc

---
 src/declarative/util/qdeclarativeconnection.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/declarative/util/qdeclarativeconnection.cpp b/src/declarative/util/qdeclarativeconnection.cpp
index a7cfc79..e9ae74b 100644
--- a/src/declarative/util/qdeclarativeconnection.cpp
+++ b/src/declarative/util/qdeclarativeconnection.cpp
@@ -105,7 +105,7 @@ public:
     \endqml
 
     More generally, the Connection object can be a child of some other object than
-    the sender of the signal, and the script is the default attribute:
+    the sender of the signal:
 
     \qml
     MouseArea {
@@ -226,8 +226,6 @@ void QDeclarativeConnection::componentComplete()
 /*!
     \qmlproperty script Connection::script
     This property holds the JavaScript executed whenever the signal is sent.
-
-    This is the default attribute of Connection.
 */
 QDeclarativeScriptString QDeclarativeConnection::script() const
 {
-- 
cgit v0.12


From c8823023db4a280f3d12c983451a05f8da3780dd Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 25 Feb 2010 16:29:26 +1000
Subject: Make more private QDeclarativeMetaProperty methods private

---
 src/declarative/qml/qdeclarativebinding.cpp        |  8 +++---
 src/declarative/qml/qdeclarativebinding_p.h        | 15 +++++------
 .../qml/qdeclarativecompiledbindings.cpp           | 10 ++++----
 src/declarative/qml/qdeclarativecomponent.cpp      |  4 +--
 src/declarative/qml/qdeclarativemetaproperty.cpp   | 29 +++++++++++-----------
 src/declarative/qml/qdeclarativemetaproperty.h     | 10 ++------
 src/declarative/qml/qdeclarativemetaproperty_p.h   | 16 ++++++++----
 src/declarative/qml/qdeclarativevaluetype.cpp      | 18 +++++++-------
 src/declarative/qml/qdeclarativevaluetype_p.h      | 21 ++++++++--------
 src/declarative/qml/qdeclarativevme.cpp            |  7 +++---
 src/declarative/qml/qdeclarativevmemetaobject.cpp  |  2 +-
 src/declarative/util/qdeclarativeanimation.cpp     |  7 +++---
 src/declarative/util/qdeclarativebehavior.cpp      |  5 ++--
 .../util/qdeclarativetransitionmanager.cpp         |  7 +++---
 .../tst_qdeclarativemetaproperty.cpp               | 22 ++++++++--------
 .../declarative/qdeclarativevaluetypes/testtypes.h |  3 ++-
 16 files changed, 95 insertions(+), 89 deletions(-)

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index bde01ae..720c562 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -111,7 +111,7 @@ QDeclarativeMetaProperty QDeclarativeBinding::property() const
    return d->bindingData()->property; 
 }
 
-void QDeclarativeBinding::update(QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeBinding::update(QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     Q_D(QDeclarativeBinding);
 
@@ -161,7 +161,7 @@ void QDeclarativeBinding::update(QDeclarativeMetaProperty::WriteFlags flags)
                 data->error.setDescription(QLatin1String("Unable to assign [undefined] to ") + QLatin1String(QMetaType::typeName(data->property.propertyType())));
 
             } else if (!isUndefined && data->property.object() && 
-                       !data->property.write(value, flags)) {
+                       !QDeclarativeMetaPropertyPrivate::write(data->property, value, flags)) {
 
                 QUrl url = QUrl(data->url);
                 int line = data->line;
@@ -204,7 +204,7 @@ void QDeclarativeBindingPrivate::emitValueChanged()
     q->update();
 }
 
-void QDeclarativeBinding::setEnabled(bool e, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeBinding::setEnabled(bool e, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     Q_D(QDeclarativeBinding);
     d->bindingData()->enabled = e;
@@ -300,7 +300,7 @@ QString QDeclarativeAbstractBinding::expression() const
     return QLatin1String("<Unknown>");
 }
 
-void QDeclarativeAbstractBinding::setEnabled(bool e, QDeclarativeMetaProperty::WriteFlags)
+void QDeclarativeAbstractBinding::setEnabled(bool e, QDeclarativeMetaPropertyPrivate::WriteFlags)
 {
     if (e) m_mePtr = 0;
 }
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index 7c79b8c..ac174fa 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -57,6 +57,7 @@
 #include "qdeclarativepropertyvaluesource.h"
 #include "qdeclarativeexpression.h"
 #include "qdeclarativemetaproperty.h"
+#include "qdeclarativemetaproperty_p.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QMetaProperty>
@@ -73,12 +74,12 @@ public:
 
     virtual QString expression() const;
 
-    void setEnabled(bool e) { setEnabled(e, QDeclarativeMetaProperty::DontRemoveBinding); }
-    virtual void setEnabled(bool, QDeclarativeMetaProperty::WriteFlags) = 0;
+    void setEnabled(bool e) { setEnabled(e, QDeclarativeMetaPropertyPrivate::DontRemoveBinding); }
+    virtual void setEnabled(bool, QDeclarativeMetaPropertyPrivate::WriteFlags) = 0;
     virtual int propertyIndex() = 0;
 
-    void update() { update(QDeclarativeMetaProperty::DontRemoveBinding); }
-    virtual void update(QDeclarativeMetaProperty::WriteFlags) = 0;
+    void update() { update(QDeclarativeMetaPropertyPrivate::DontRemoveBinding); }
+    virtual void update(QDeclarativeMetaPropertyPrivate::WriteFlags) = 0;
 
     void addToObject(QObject *);
     void removeFromObject();
@@ -115,13 +116,13 @@ public:
     bool enabled() const;
 
     // Inherited from  QDeclarativeAbstractBinding
-    virtual void setEnabled(bool, QDeclarativeMetaProperty::WriteFlags flags);
+    virtual void setEnabled(bool, QDeclarativeMetaPropertyPrivate::WriteFlags flags);
     virtual int propertyIndex();
-    virtual void update(QDeclarativeMetaProperty::WriteFlags flags);
+    virtual void update(QDeclarativeMetaPropertyPrivate::WriteFlags flags);
     virtual QString expression() const;
 
 public Q_SLOTS:
-    void update() { update(QDeclarativeMetaProperty::DontRemoveBinding); }
+    void update() { update(QDeclarativeMetaPropertyPrivate::DontRemoveBinding); }
 
 protected:
     void emitValueChanged();
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index face22c..a88f02e 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -109,9 +109,9 @@ public:
                     scope(0), target(0), parent(0) {}
 
         // Inherited from QDeclarativeAbstractBinding
-        virtual void setEnabled(bool, QDeclarativeMetaProperty::WriteFlags flags);
+        virtual void setEnabled(bool, QDeclarativeMetaPropertyPrivate::WriteFlags flags);
         virtual int propertyIndex();
-        virtual void update(QDeclarativeMetaProperty::WriteFlags flags);
+        virtual void update(QDeclarativeMetaPropertyPrivate::WriteFlags flags);
         virtual void destroy();
 
         int index:30;
@@ -244,7 +244,7 @@ QDeclarativeAbstractBinding *QDeclarativeCompiledBindings::configBinding(int ind
     return rv;
 }
 
-void QDeclarativeCompiledBindingsPrivate::Binding::setEnabled(bool e, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeCompiledBindingsPrivate::Binding::setEnabled(bool e, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     if (e) {
         addToObject(target);
@@ -267,7 +267,7 @@ int QDeclarativeCompiledBindingsPrivate::Binding::propertyIndex()
     return property & 0xFFFF;
 }
 
-void QDeclarativeCompiledBindingsPrivate::Binding::update(QDeclarativeMetaProperty::WriteFlags)
+void QDeclarativeCompiledBindingsPrivate::Binding::update(QDeclarativeMetaPropertyPrivate::WriteFlags)
 {
     parent->run(this);
 }
@@ -324,7 +324,7 @@ void QDeclarativeCompiledBindingsPrivate::run(Binding *binding)
         run(binding->index, cp, binding, binding->scope, target);
 
         vt->write(binding->target, binding->property & 0xFFFF, 
-                  QDeclarativeMetaProperty::DontRemoveBinding);
+                  QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
     } else {
         run(binding->index, cp, binding, binding->scope, binding->target);
     }
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index beaba4a..aaf36e0 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -698,8 +698,8 @@ void QDeclarativeComponentPrivate::complete(QDeclarativeEnginePrivate *enginePri
                 state->bindValues.at(ii);
             for (int jj = 0; jj < bv.count; ++jj) {
                 if(bv.at(jj)) 
-                    bv.at(jj)->setEnabled(true, QDeclarativeMetaProperty::BypassInterceptor | 
-                                                QDeclarativeMetaProperty::DontRemoveBinding);
+                    bv.at(jj)->setEnabled(true, QDeclarativeMetaPropertyPrivate::BypassInterceptor | 
+                                                QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
             }
             QDeclarativeEnginePrivate::clear(bv);
         }
diff --git a/src/declarative/qml/qdeclarativemetaproperty.cpp b/src/declarative/qml/qdeclarativemetaproperty.cpp
index f4c930f..a976140 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.cpp
+++ b/src/declarative/qml/qdeclarativemetaproperty.cpp
@@ -589,7 +589,7 @@ QDeclarativeMetaPropertyPrivate::binding(const QDeclarativeMetaProperty &that)
 QDeclarativeAbstractBinding *
 QDeclarativeMetaPropertyPrivate::setBinding(const QDeclarativeMetaProperty &that,
                                             QDeclarativeAbstractBinding *newBinding, 
-                                            QDeclarativeMetaProperty::WriteFlags flags) 
+                                            WriteFlags flags) 
 {
     if (!that.isProperty() || !that.d->object) {
         if (newBinding)
@@ -602,7 +602,7 @@ QDeclarativeMetaPropertyPrivate::setBinding(const QDeclarativeMetaProperty &that
 
 QDeclarativeAbstractBinding *
 QDeclarativeMetaPropertyPrivate::setBinding(QObject *object, const QDeclarativePropertyCache::Data &core, 
-                                   QDeclarativeAbstractBinding *newBinding, QDeclarativeMetaProperty::WriteFlags flags)
+                                   QDeclarativeAbstractBinding *newBinding, WriteFlags flags)
 {
     QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object, 0 != newBinding);
 
@@ -796,11 +796,10 @@ bool QDeclarativeMetaPropertyPrivate::writeEnumProperty(const QMetaProperty &pro
     return status;
 }
 
-bool QDeclarativeMetaPropertyPrivate::writeValueProperty(const QVariant &value,
-                                                QDeclarativeMetaProperty::WriteFlags flags)
+bool QDeclarativeMetaPropertyPrivate::writeValueProperty(const QVariant &value, WriteFlags flags)
 {
     // Remove any existing bindings on this property
-    if (!(flags & QDeclarativeMetaProperty::DontRemoveBinding)) {
+    if (!(flags & DontRemoveBinding)) {
         QDeclarativeAbstractBinding *binding = setBinding(*q, 0);
         if (binding) binding->destroy();
     }
@@ -838,8 +837,8 @@ bool QDeclarativeMetaPropertyPrivate::writeValueProperty(const QVariant &value,
 }
 
 bool QDeclarativeMetaPropertyPrivate::write(QObject *object, const QDeclarativePropertyCache::Data &property, 
-                                   const QVariant &value, QDeclarativeContext *context, 
-                                   QDeclarativeMetaProperty::WriteFlags flags)
+                                            const QVariant &value, QDeclarativeContext *context, 
+                                            WriteFlags flags)
 {
     int coreIdx = property.coreIndex;
     int status = -1;    //for dbus
@@ -1007,7 +1006,7 @@ const QMetaObject *QDeclarativeMetaPropertyPrivate::rawMetaObjectForType(QDeclar
 */
 bool QDeclarativeMetaProperty::write(const QVariant &value) const
 {
-    return write(value, 0);
+    return QDeclarativeMetaPropertyPrivate::write(*this, value, 0);
 }
 
 /*!
@@ -1024,10 +1023,12 @@ bool QDeclarativeMetaProperty::reset() const
     }
 }
 
-bool QDeclarativeMetaProperty::write(const QVariant &value, QDeclarativeMetaProperty::WriteFlags flags) const
+bool QDeclarativeMetaPropertyPrivate::write(const QDeclarativeMetaProperty &that,
+                                            const QVariant &value, WriteFlags flags) 
 {
-    if (d->object && type() & Property && d->core.isValid() && isWritable()) 
-        return d->writeValueProperty(value, flags);
+    if (that.d->object && that.type() & QDeclarativeMetaProperty::Property && 
+        that.d->core.isValid() && that.isWritable()) 
+        return that.d->writeValueProperty(value, flags);
     else 
         return false;
 }
@@ -1106,13 +1107,11 @@ int QDeclarativeMetaProperty::coreIndex() const
     return d->core.coreIndex;
 }
 
-/*! \internal */
-int QDeclarativeMetaProperty::valueTypeCoreIndex() const
+int QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(const QDeclarativeMetaProperty &that)
 {
-    return d->valueType.valueTypeCoreIdx;
+    return that.d->valueType.valueTypeCoreIdx;
 }
 
-
 struct SerializedData {
     QDeclarativeMetaProperty::Type type;
     QDeclarativePropertyCache::Data core;
diff --git a/src/declarative/qml/qdeclarativemetaproperty.h b/src/declarative/qml/qdeclarativemetaproperty.h
index 900d1cd..828749f 100644
--- a/src/declarative/qml/qdeclarativemetaproperty.h
+++ b/src/declarative/qml/qdeclarativemetaproperty.h
@@ -93,9 +93,6 @@ public:
 
     QVariant read() const;
     bool write(const QVariant &) const;
-    enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02 };
-    Q_DECLARE_FLAGS(WriteFlags, WriteFlag)
-    bool write(const QVariant &, QDeclarativeMetaProperty::WriteFlags) const;
     bool reset() const;
 
     bool hasChangedNotifier() const;
@@ -103,8 +100,6 @@ public:
     bool connectNotifier(QObject *dest, const char *slot) const;
     bool connectNotifier(QObject *dest, int method) const;
 
-    QMetaMethod method() const;
-
     Type type() const;
     bool isProperty() const;
     bool isDefault() const;
@@ -120,17 +115,16 @@ public:
 
     bool operator==(const QDeclarativeMetaProperty &) const;
 
+    int coreIndex() const;
     QMetaProperty property() const;
+    QMetaMethod method() const;
 
-    int coreIndex() const;
-    int valueTypeCoreIndex() const;
 private:
     friend class QDeclarativeEnginePrivate;
     friend class QDeclarativeMetaPropertyPrivate;
     QDeclarativeMetaPropertyPrivate *d;
 };
 typedef QList<QDeclarativeMetaProperty> QDeclarativeMetaProperties;
- Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeMetaProperty::WriteFlags)
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativemetaproperty_p.h b/src/declarative/qml/qdeclarativemetaproperty_p.h
index 937cfd7..a171545 100644
--- a/src/declarative/qml/qdeclarativemetaproperty_p.h
+++ b/src/declarative/qml/qdeclarativemetaproperty_p.h
@@ -67,6 +67,9 @@ class QDeclarativeEnginePrivate;
 class Q_AUTOTEST_EXPORT QDeclarativeMetaPropertyPrivate
 {
 public:
+    enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02 };
+    Q_DECLARE_FLAGS(WriteFlags, WriteFlag)
+
     QDeclarativeMetaPropertyPrivate()
         : q(0), context(0), object(0), isDefaultProperty(false), isNameCached(false) {}
           
@@ -98,16 +101,16 @@ public:
     QDeclarativeMetaProperty::PropertyTypeCategory propertyTypeCategory() const;
 
     QVariant readValueProperty();
-    bool writeValueProperty(const QVariant &, QDeclarativeMetaProperty::WriteFlags);
+    bool writeValueProperty(const QVariant &, WriteFlags);
 
     static const QMetaObject *rawMetaObjectForType(QDeclarativeEnginePrivate *, int);
     static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, 
                                   const QVariant &value, int flags);
     static bool write(QObject *, const QDeclarativePropertyCache::Data &, const QVariant &, 
-                      QDeclarativeContext *, QDeclarativeMetaProperty::WriteFlags flags = 0);
+                      QDeclarativeContext *, WriteFlags flags = 0);
     static QDeclarativeAbstractBinding *setBinding(QObject *, const QDeclarativePropertyCache::Data &, 
                                                    QDeclarativeAbstractBinding *,
-                                                   QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::DontRemoveBinding);
+                                                   WriteFlags flags = DontRemoveBinding);
 
     static QByteArray saveValueType(const QMetaObject *, int, 
                                     const QMetaObject *, int);
@@ -122,13 +125,16 @@ public:
     static QDeclarativeAbstractBinding *binding(const QDeclarativeMetaProperty &that);
     static QDeclarativeAbstractBinding *setBinding(const QDeclarativeMetaProperty &that,
                                                    QDeclarativeAbstractBinding *,
-                                                   QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::DontRemoveBinding);
+                                                   WriteFlags flags = DontRemoveBinding);
     static QDeclarativeExpression *signalExpression(const QDeclarativeMetaProperty &that);
     static QDeclarativeExpression *setSignalExpression(const QDeclarativeMetaProperty &that, 
                                                        QDeclarativeExpression *) ;
-
+    static bool write(const QDeclarativeMetaProperty &that, const QVariant &, WriteFlags);
+    static int valueTypeCoreIndex(const QDeclarativeMetaProperty &that);
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeMetaPropertyPrivate::WriteFlags)
+
 QT_END_NAMESPACE
 
 #endif // QDECLARATIVEMETAPROPERTY_P_H
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index df83fa4..d35371f 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -100,7 +100,7 @@ void QDeclarativePointFValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativePointFValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativePointFValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &point, 0, &status, &flags };
@@ -148,7 +148,7 @@ void QDeclarativePointValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativePointValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativePointValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &point, 0, &status, &flags };
@@ -196,7 +196,7 @@ void QDeclarativeSizeFValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeSizeFValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeSizeFValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &size, 0, &status, &flags };
@@ -244,7 +244,7 @@ void QDeclarativeSizeValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeSizeValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeSizeValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &size, 0, &status, &flags };
@@ -292,7 +292,7 @@ void QDeclarativeRectFValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeRectFValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeRectFValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &rect, 0, &status, &flags };
@@ -360,7 +360,7 @@ void QDeclarativeRectValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeRectValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeRectValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &rect, 0, &status, &flags };
@@ -428,7 +428,7 @@ void QDeclarativeVector3DValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeVector3DValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeVector3DValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &vector, 0, &status, &flags };
@@ -486,7 +486,7 @@ void QDeclarativeEasingValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeEasingValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeEasingValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &easing, 0, &status, &flags };
@@ -554,7 +554,7 @@ void QDeclarativeFontValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeFontValueType::write(QObject *obj, int idx, QDeclarativeMetaProperty::WriteFlags flags)
+void QDeclarativeFontValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &font, 0, &status, &flags };
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index 995433b..792598b 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -54,6 +54,7 @@
 //
 
 #include "qdeclarativemetaproperty.h"
+#include "qdeclarativemetaproperty_p.h"
 
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
@@ -70,7 +71,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeValueType : public QObject
 public:
     QDeclarativeValueType(QObject *parent = 0);
     virtual void read(QObject *, int) = 0;
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags flags) = 0;
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags flags) = 0;
     virtual QVariant value() = 0;
     virtual void setValue(QVariant) = 0;
 };
@@ -95,7 +96,7 @@ public:
     QDeclarativePointFValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -117,7 +118,7 @@ public:
     QDeclarativePointValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -139,7 +140,7 @@ public:
     QDeclarativeSizeFValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -161,7 +162,7 @@ public:
     QDeclarativeSizeValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -185,7 +186,7 @@ public:
     QDeclarativeRectFValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -214,7 +215,7 @@ public:
     QDeclarativeRectValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -242,7 +243,7 @@ public:
     QDeclarativeVector3DValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -296,7 +297,7 @@ public:
     QDeclarativeEasingValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -347,7 +348,7 @@ public:
     QDeclarativeFontValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaProperty::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index d1140a6..f7af843 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -156,7 +156,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
     QDeclarativeContextPrivate *cp = (QDeclarativeContextPrivate *)QObjectPrivate::get(ctxt);
 
     int status = -1;    //for dbus
-    QDeclarativeMetaProperty::WriteFlags flags = QDeclarativeMetaProperty::BypassInterceptor;
+    QDeclarativeMetaPropertyPrivate::WriteFlags flags = QDeclarativeMetaPropertyPrivate::BypassInterceptor;
 
     for (int ii = start; !isError() && ii < (start + count); ++ii) {
         const QDeclarativeInstruction &instr = comp->bytecode.at(ii);
@@ -648,7 +648,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 obj->setParent(target);
                 vi->setTarget(prop);
                 QDeclarativeVMEMetaObject *mo = static_cast<QDeclarativeVMEMetaObject *>((QMetaObject*)target->metaObject());
-                mo->registerInterceptor(prop.coreIndex(), prop.valueTypeCoreIndex(), vi);
+                mo->registerInterceptor(prop.coreIndex(), QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), vi);
             }
             break;
 
@@ -806,7 +806,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 QDeclarativeValueType *valueHandler = 
                     static_cast<QDeclarativeValueType *>(stack.pop());
                 QObject *target = stack.top();
-                valueHandler->write(target, instr.fetchValue.property, QDeclarativeMetaProperty::BypassInterceptor);
+                valueHandler->write(target, instr.fetchValue.property, 
+                                    QDeclarativeMetaPropertyPrivate::BypassInterceptor);
             }
             break;
 
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
index 6811e13..6edb707 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject.cpp
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -105,7 +105,7 @@ int QDeclarativeVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a)
     int id = _id;
     if(c == QMetaObject::WriteProperty) {
         int flags = *reinterpret_cast<int*>(a[3]);
-        if (!(flags & QDeclarativeMetaProperty::BypassInterceptor)
+        if (!(flags & QDeclarativeMetaPropertyPrivate::BypassInterceptor)
             && !aInterceptors.isEmpty()
             && aInterceptors.testBit(id)) {
             QPair<int, QDeclarativePropertyValueInterceptor*> pair = interceptors.value(id);
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 9e777a0..a327ccb 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -52,6 +52,7 @@
 #include <qdeclarativestringconverters_p.h>
 #include <qdeclarativeglobal_p.h>
 #include <qdeclarativemetatype_p.h>
+#include <qdeclarativemetaproperty_p.h>
 
 #include <qvariant.h>
 #include <qcolor.h>
@@ -924,7 +925,7 @@ void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions,
         {
             for (int ii = 0; ii < actions.count(); ++ii) {
                 const QDeclarativeAction &action = actions.at(ii);
-                action.property.write(action.toValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+                QDeclarativeMetaPropertyPrivate::write(action.property, action.toValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
             }
         }
     };
@@ -2230,7 +2231,7 @@ struct PropertyUpdater : public QDeclarativeTimeLineValue
             QDeclarativeAction &action = actions[ii];
 
             if (v == 1.)
-                action.property.write(action.toValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+                QDeclarativeMetaPropertyPrivate::write(action.property, action.toValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
             else {
                 if (!fromSourced && !fromDefined) {
                     action.fromValue = action.property.read();
@@ -2245,7 +2246,7 @@ struct PropertyUpdater : public QDeclarativeTimeLineValue
                     }
                 }
                 if (interpolator)
-                    action.property.write(interpolator(action.fromValue.constData(), action.toValue.constData(), v), QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+                    QDeclarativeMetaPropertyPrivate::write(action.property, interpolator(action.fromValue.constData(), action.toValue.constData(), v), QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
             }
             if (deleted)
                 return;
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 303018d..b1f1677 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -46,6 +46,7 @@
 
 #include <qdeclarativecontext.h>
 #include <qdeclarativeinfo.h>
+#include <qdeclarativemetaproperty_p.h>
 
 #include <QtCore/qparallelanimationgroup.h>
 
@@ -156,7 +157,7 @@ void QDeclarativeBehavior::write(const QVariant &value)
 {
     Q_D(QDeclarativeBehavior);
     if (!d->animation || !d->enabled) {
-        d->property.write(value, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+        QDeclarativeMetaPropertyPrivate::write(d->property, value, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
         return;
     }
 
@@ -176,7 +177,7 @@ void QDeclarativeBehavior::write(const QVariant &value)
         d->animation->transition(actions, after, QDeclarativeAbstractAnimation::Forward);
     d->animation->qtAnimation()->start();
     if (!after.contains(d->property))
-        d->property.write(value, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+        QDeclarativeMetaPropertyPrivate::write(d->property, value, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
 }
 
 void QDeclarativeBehavior::setTarget(const QDeclarativeMetaProperty &property)
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 9fa1488..6429dab 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -45,6 +45,7 @@
 
 #include <qdeclarativebinding_p.h>
 #include <qdeclarativeglobal_p.h>
+#include <qdeclarativemetaproperty_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -149,9 +150,9 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
         for (int ii = 0; ii < applyList.size(); ++ii) {
             const QDeclarativeAction &action = applyList.at(ii);
             if (action.toBinding) {
-                QDeclarativeMetaPropertyPrivate::setBinding(action.property, action.toBinding, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+                QDeclarativeMetaPropertyPrivate::setBinding(action.property, action.toBinding, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
             } else if (!action.event) {
-                action.property.write(action.toValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+                QDeclarativeMetaPropertyPrivate::write(action.property, action.toValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
             } else if (action.event->isReversable()) {
                 if (action.reverseEvent)
                     action.event->reverse();
@@ -192,7 +193,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
             if (action.toBinding)
                 QDeclarativeMetaPropertyPrivate::setBinding(action.property, 0); // Make sure this is disabled during the transition
 
-            action.property.write(action.fromValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+            QDeclarativeMetaPropertyPrivate::write(action.property, action.fromValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
         }
     }
 
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
index 4d07a19..a7e9d0d 100644
--- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -168,7 +168,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty()
     QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
     QVERIFY(expression == 0);
     QCOMPARE(prop.coreIndex(), -1);
-    QCOMPARE(prop.valueTypeCoreIndex(), -1);
+    QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
     delete obj;
 }
@@ -256,7 +256,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
         QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -305,7 +305,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
         QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -357,7 +357,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -406,7 +406,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -454,7 +454,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QVERIFY(expression != 0);
         QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == expression);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -506,7 +506,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
         QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -555,7 +555,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
         QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -607,7 +607,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -656,7 +656,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -704,7 +704,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QVERIFY(expression != 0);
         QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == expression);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
index 8b80e16..82a9c8a 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
@@ -53,6 +53,7 @@
 #include <qdeclarative.h>
 #include <QDeclarativePropertyValueSource>
 #include <QDeclarativeMetaProperty>
+#include <private/qdeclarativemetaproperty_p.h>
 
 class MyTypeObject : public QObject
 {
@@ -143,7 +144,7 @@ class MyOffsetValueInterceptor : public QObject, public QDeclarativePropertyValu
     Q_OBJECT
 public:
     virtual void setTarget(const QDeclarativeMetaProperty &p) { prop = p; }
-    virtual void write(const QVariant &value) { prop.write(value.toInt() + 13, QDeclarativeMetaProperty::BypassInterceptor); }
+    virtual void write(const QVariant &value) { QDeclarativeMetaPropertyPrivate::write(prop, value.toInt() + 13, QDeclarativeMetaPropertyPrivate::BypassInterceptor); }
 
 private:
     QDeclarativeMetaProperty prop;
-- 
cgit v0.12


From e6c85641ddc6068b1d50a52b95b136f366cad15a Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 25 Feb 2010 10:07:11 +1000
Subject: Handle smooth reparenting where the item being reparented has a
 complex transform.

Fixes pathview <-> details transition in flickr demo.
---
 .../util/qdeclarativestateoperations.cpp           | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 6001a84..98edf85 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -80,7 +80,7 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
         //### for backwards direction, can we just restore original x, y, scale, rotation
         Q_Q(QDeclarativeParentChange);
         bool ok;
-        const QTransform &transform = target->itemTransform(targetParent, &ok);
+        const QTransform &transform = target->parentItem()->itemTransform(targetParent, &ok);
         if (transform.type() >= QTransform::TxShear || !ok) {
             qmlInfo(q) << QDeclarativeParentChange::tr("Unable to preserve appearance under complex transform");
             ok = false;
@@ -111,8 +111,9 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
             }
         }
 
-        qreal xt = transform.dx();
-        qreal yt = transform.dy();
+        const QPointF &point = transform.map(QPointF(target->x(),target->y()));
+        qreal x = point.x();
+        qreal y = point.y();
         if (ok && target->transformOrigin() != QDeclarativeItem::TopLeft) {
             qreal tempxt = target->transformOriginPoint().x();
             qreal tempyt = target->transformOriginPoint().y();
@@ -121,18 +122,18 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
             t.rotate(rotation);
             t.scale(scale, scale);
             t.translate(tempxt, tempyt);
-            QPointF offset = t.map(QPointF(0,0));
-            xt += offset.x();
-            yt += offset.y();
+            const QPointF &offset = t.map(QPointF(0,0));
+            x += offset.x();
+            y += offset.y();
         }
 
         target->setParentItem(targetParent);
         if (ok) {
-            //qDebug() << xt << yt << rotation << scale;
-            target->setX(xt);
-            target->setY(yt);
-            target->setRotation(rotation);
-            target->setScale(scale);
+            //qDebug() << x << y << rotation << scale;
+            target->setX(x);
+            target->setY(y);
+            target->setRotation(target->rotation() + rotation);
+            target->setScale(target->scale() * scale);
         }
     } else if (target) {
         target->setParentItem(targetParent);
-- 
cgit v0.12


From b469289a6ed067be92eb24239c59f5cd1f5f7956 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 25 Feb 2010 17:07:16 +1000
Subject: Document and test resetting properties in a state change.

Task-number: QT-1817
---
 .../util/qdeclarativepropertychanges.cpp           | 29 +++++++++++++++++++++-
 .../declarative/qdeclarativestates/data/reset.qml  | 20 +++++++++++++++
 .../qdeclarativestates/tst_qdeclarativestates.cpp  | 21 ++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/reset.qml

diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 6c2e256..454fb06 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass PropertyChanges QDeclarativePropertyChanges
-  \since 4.7
+    \since 4.7
     \brief The PropertyChanges element describes new property values for a state.
 
     PropertyChanges provides a state change that modifies the properties of an item.
@@ -98,6 +98,33 @@ QT_BEGIN_NAMESPACE
     }
     \endqml
 
+    You can reset a property in a state change by assigning \c undefined. In the following
+    example we reset \c theText's width when we enter state1. This will give the text its
+    natural width (which is the whole string on one line).
+
+    \qml
+    import Qt 4.6
+
+    Rectangle {
+        width: 640
+        height: 480
+        Text {
+            id: theText
+            width: 50
+            wrap: true
+            text: "a text string that is longer than 50 pixels"
+        }
+
+        states: State {
+            name: "state1"
+            PropertyChanges {
+                target: theText
+                width: undefined
+            }
+        }
+    }
+    \endqml
+
     Changes to an Item's parent or anchors should be done using the associated change elements
     (ParentChange and AnchorChanges, respectively) rather than PropertyChanges.
 
diff --git a/tests/auto/declarative/qdeclarativestates/data/reset.qml b/tests/auto/declarative/qdeclarativestates/data/reset.qml
new file mode 100644
index 0000000..a0a2b8c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/reset.qml
@@ -0,0 +1,20 @@
+import Qt 4.6
+
+Rectangle {
+    width: 640
+    height: 480
+    Text {
+        id: theText
+        width: 50
+        wrap: true
+        text: "a text string that is longer than 50 pixels"
+    }
+
+    states: State {
+        name: "state1"
+        PropertyChanges {
+            target: theText
+            width: undefined
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index 44fb51f..5ffce11 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -43,6 +43,7 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <private/qdeclarativeanchors_p_p.h>
 #include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativetext_p.h>
 #include <private/qdeclarativepropertychanges_p.h>
 #include <private/qdeclarativestategroup_p.h>
 
@@ -81,6 +82,7 @@ private slots:
     void tempState();
     void illegalTempState();
     void nonExistantProperty();
+    void reset();
 };
 
 QByteArray tst_qdeclarativestates::fullDataPath(const QString &path)
@@ -912,6 +914,25 @@ void tst_qdeclarativestates::nonExistantProperty()
     QCOMPARE(rect->state(), QLatin1String("blue"));
 }
 
+void tst_qdeclarativestates::reset()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, SRCDIR "/data/reset.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeText *text = rect->findChild<QDeclarativeText*>();
+    QVERIFY(text != 0);
+    QCOMPARE(text->width(), qreal(50.));
+    QVERIFY(text->width() < text->height());
+
+    rect->setState("state1");
+
+    QVERIFY(text->width() > 51);
+    QVERIFY(text->width() > text->height());
+}
+
 QTEST_MAIN(tst_qdeclarativestates)
 
 #include "tst_qdeclarativestates.moc"
-- 
cgit v0.12


From bd7ef8002b008816f5233fdd40742a12e0861b82 Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Thu, 25 Feb 2010 17:27:36 +1000
Subject: Fix up some rename confusion.

---
 src/multimedia/qml/multimediadeclarative.cpp       |  2 +-
 src/multimedia/qml/qdeclarative.cpp                | 70 ----------------------
 src/multimedia/qml/qdeclarative.h                  | 62 -------------------
 .../qdeclarativemodules/multimedia/multimedia.cpp  |  4 +-
 4 files changed, 3 insertions(+), 135 deletions(-)
 delete mode 100644 src/multimedia/qml/qdeclarative.cpp
 delete mode 100644 src/multimedia/qml/qdeclarative.h

diff --git a/src/multimedia/qml/multimediadeclarative.cpp b/src/multimedia/qml/multimediadeclarative.cpp
index ba4036f..086250a 100644
--- a/src/multimedia/qml/multimediadeclarative.cpp
+++ b/src/multimedia/qml/multimediadeclarative.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/qdeclarative.h>
+#include <QtMultimedia/multimediadeclarative.h>
 #include <QtMultimedia/private/qsoundeffect_p.h>
 #include <QtMultimedia/private/qdeclarativeaudio_p.h>
 #include <QtMultimedia/private/qdeclarativevideo_p.h>
diff --git a/src/multimedia/qml/qdeclarative.cpp b/src/multimedia/qml/qdeclarative.cpp
deleted file mode 100644
index b9c9186..0000000
--- a/src/multimedia/qml/qdeclarative.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtMultimedia/qdeclarative.h>
-#include <QtMultimedia/private/qsoundeffect_p.h>
-#include <QtMultimedia/private/qdeclarativeaudio_p.h>
-#include <QtMultimedia/private/qdeclarativevideo_p.h>
-
-
-QT_BEGIN_NAMESPACE
-
-namespace QtMultimedia
-{
-
-/*!
-    Register the Multimedia QML elements.
-    \internal
-*/
-
-void qRegisterQmlElements(QDeclarativeEngine *engine, const char *uri)
-{
-    Q_UNUSED(engine);
-
-    qmlRegisterType<QSoundEffect>(uri, 4, 7, "SoundEffect", "SoundEffect");
-    qmlRegisterType<QDeclarativeAudio>(uri, 4, 7, "Audio", "Audio");
-    qmlRegisterType<QDeclarativeVideo>(uri, 4, 7, "Video", "Video");
-}
-
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/multimedia/qml/qdeclarative.h b/src/multimedia/qml/qdeclarative.h
deleted file mode 100644
index f4579f4..0000000
--- a/src/multimedia/qml/qdeclarative.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTMULTIMEDIA_QML_H
-#define QTMULTIMEDIA_QML_H
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeEngine;
-
-QT_MODULE(Multimedia)
-
-namespace QtMultimedia
-{
-extern void Q_MULTIMEDIA_EXPORT qRegisterQmlElements(QDeclarativeEngine *engine, const char *uri);
-}
-
-QT_END_NAMESPACE
-QT_END_HEADER
-
-#endif  // ifndef QTMULTIMEDIA_QML_H
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
index 1158c88..e27dd8d 100644
--- a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
@@ -41,7 +41,7 @@
 
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtMultimedia/qdeclarative.h>
+#include <QtMultimedia/multimediadeclarative.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -51,7 +51,7 @@ class QMultimediaQmlModule : public QDeclarativeExtensionPlugin
 public:
     virtual void initialize(QDeclarativeEngine *engine, const char *uri)
     {
-        QtMultimedia::qRegisterQmlElements(engine, uri);
+        QtMultimedia::qRegisterDeclarativeElements(engine, uri);
     }
 };
 
-- 
cgit v0.12


From 0e4dd15a90c119cea4ada833d88b51e336f53ee7 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 25 Feb 2010 10:34:28 +0100
Subject: Introduced alternative syntax for defining QML bindings.

Now it is possible to define bindings using the `on' context keyword.
For example, you can write

  Behavior on opacity {
    NumberAnimation { duration: 500 }
  }

instead of

  opacity: Behavior {
    NumberAnimation { duration: 500 }
  }
---
 src/declarative/qml/parser/qdeclarativejs.g        |   21 +
 src/declarative/qml/parser/qdeclarativejsast_p.h   |   11 +-
 .../qml/parser/qdeclarativejsgrammar.cpp           | 1577 ++++++++++----------
 .../qml/parser/qdeclarativejsgrammar_p.h           |   33 +-
 src/declarative/qml/parser/qdeclarativejslexer.cpp |    2 +
 .../qml/parser/qdeclarativejsparser.cpp            |  424 +++---
 .../qml/parser/qdeclarativejsparser_p.h            |    4 +-
 7 files changed, 1072 insertions(+), 1000 deletions(-)

diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g
index e1cb5a5..4c77845 100644
--- a/src/declarative/qml/parser/qdeclarativejs.g
+++ b/src/declarative/qml/parser/qdeclarativejs.g
@@ -65,6 +65,7 @@
 %token T_PUBLIC "public"
 %token T_IMPORT "import"
 %token T_AS "as"
+%token T_ON "on"
 
 --- feed tokens
 %token T_FEED_UI_PROGRAM
@@ -773,6 +774,17 @@ case $rule_number: {
 } break;
 ./
 
+UiObjectMember: UiQualifiedId             T_ON UiQualifiedId  UiObjectInitializer ;
+/.
+case $rule_number: {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(3).UiQualifiedId, sym(1).UiQualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    node->hasOnToken = true;
+    sym(1).Node = node;
+} break;
+./
+
 UiObjectMember: UiQualifiedId T_COLON Block ;
 /.case $rule_number:./
 
@@ -1005,6 +1017,15 @@ case $rule_number: {
 }
 ./
 
+JsIdentifier: T_ON ;
+/.
+case $rule_number: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_READONLY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+./
+
 --------------------------------------------------------------------------------------------------------
 -- Expressions
 --------------------------------------------------------------------------------------------------------
diff --git a/src/declarative/qml/parser/qdeclarativejsast_p.h b/src/declarative/qml/parser/qdeclarativejsast_p.h
index 0a83fe2..c1945ce 100644
--- a/src/declarative/qml/parser/qdeclarativejsast_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsast_p.h
@@ -2599,11 +2599,17 @@ public:
                     UiObjectInitializer *initializer)
         : qualifiedId(qualifiedId),
           qualifiedTypeNameId(qualifiedTypeNameId),
-          initializer(initializer)
+          initializer(initializer),
+          hasOnToken(false)
     { kind = K; }
 
     virtual SourceLocation firstSourceLocation() const
-    { return qualifiedId->identifierToken; }
+    {
+        if (hasOnToken && qualifiedTypeNameId)
+            return qualifiedTypeNameId->identifierToken;
+
+        return qualifiedId->identifierToken;
+    }
 
     virtual SourceLocation lastSourceLocation() const
     { return initializer->rbraceToken; }
@@ -2615,6 +2621,7 @@ public:
     UiQualifiedId *qualifiedTypeNameId;
     UiObjectInitializer *initializer;
     SourceLocation colonToken;
+    bool hasOnToken;
 };
 
 class QML_PARSER_EXPORT UiScriptBinding: public UiObjectMember
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
index aadb432..18ae607 100644
--- a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
@@ -54,581 +54,595 @@ const char *const QDeclarativeJSGrammar::spell [] = {
   ")", ";", 0, "*", "*=", "string literal", "property", "signal", "readonly", "switch", 
   "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", 
   "^=", "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "comment", "public", 
-  "import", "as", 0, 0, 0, 0, 0, 0, 0, 0};
+  "import", "as", "on", 0, 0, 0, 0, 0, 0, 0, 
+  0};
 
 const short QDeclarativeJSGrammar::lhs [] = {
-  100, 100, 100, 100, 100, 100, 101, 107, 107, 110, 
-  110, 112, 111, 111, 111, 111, 111, 111, 111, 111, 
-  114, 109, 108, 117, 117, 118, 118, 119, 119, 116, 
-  105, 105, 105, 105, 105, 105, 105, 125, 125, 125, 
-  126, 126, 127, 127, 105, 105, 105, 105, 105, 105, 
-  105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-  105, 105, 115, 115, 115, 115, 130, 130, 130, 130, 
-  130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-  130, 130, 130, 130, 120, 132, 132, 132, 132, 131, 
-  131, 134, 134, 136, 136, 136, 136, 136, 136, 137, 
-  137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 
-  137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 
-  137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 
-  138, 138, 113, 113, 113, 113, 113, 141, 141, 142, 
-  142, 142, 142, 140, 140, 143, 143, 144, 144, 145, 
-  145, 145, 146, 146, 146, 146, 146, 146, 146, 146, 
-  146, 146, 147, 147, 147, 147, 148, 148, 148, 149, 
-  149, 149, 149, 150, 150, 150, 150, 150, 150, 150, 
-  151, 151, 151, 151, 151, 151, 152, 152, 152, 152, 
-  152, 153, 153, 153, 153, 153, 154, 154, 155, 155, 
+  101, 101, 101, 101, 101, 101, 102, 108, 108, 111, 
+  111, 113, 112, 112, 112, 112, 112, 112, 112, 112, 
+  115, 110, 109, 118, 118, 119, 119, 120, 120, 117, 
+  106, 106, 106, 106, 106, 106, 106, 106, 126, 126, 
+  126, 127, 127, 128, 128, 106, 106, 106, 106, 106, 
+  106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 
+  106, 106, 106, 116, 116, 116, 116, 116, 131, 131, 
+  131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 
+  131, 131, 131, 131, 131, 131, 121, 133, 133, 133, 
+  133, 132, 132, 135, 135, 137, 137, 137, 137, 137, 
+  137, 138, 138, 138, 138, 138, 138, 138, 138, 138, 
+  138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 
+  138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 
+  138, 138, 139, 139, 114, 114, 114, 114, 114, 142, 
+  142, 143, 143, 143, 143, 141, 141, 144, 144, 145, 
+  145, 146, 146, 146, 147, 147, 147, 147, 147, 147, 
+  147, 147, 147, 147, 148, 148, 148, 148, 149, 149, 
+  149, 150, 150, 150, 150, 151, 151, 151, 151, 151, 
+  151, 151, 152, 152, 152, 152, 152, 152, 153, 153, 
+  153, 153, 153, 154, 154, 154, 154, 154, 155, 155, 
   156, 156, 157, 157, 158, 158, 159, 159, 160, 160, 
   161, 161, 162, 162, 163, 163, 164, 164, 165, 165, 
-  135, 135, 166, 166, 167, 167, 167, 167, 167, 167, 
-  167, 167, 167, 167, 167, 167, 103, 103, 168, 168, 
-  169, 169, 170, 170, 102, 102, 102, 102, 102, 102, 
-  102, 102, 102, 102, 102, 102, 102, 102, 102, 121, 
-  182, 182, 181, 181, 129, 129, 183, 183, 184, 184, 
-  186, 186, 185, 187, 190, 188, 188, 191, 189, 189, 
-  122, 123, 123, 124, 124, 171, 171, 171, 171, 171, 
-  171, 171, 172, 172, 172, 172, 173, 173, 173, 173, 
-  174, 174, 175, 177, 192, 192, 195, 195, 193, 193, 
-  196, 194, 176, 176, 176, 178, 178, 179, 179, 179, 
-  197, 198, 180, 180, 128, 139, 202, 202, 199, 199, 
-  200, 200, 203, 106, 204, 204, 104, 104, 201, 201, 
-  133, 133, 205};
+  166, 166, 136, 136, 167, 167, 168, 168, 168, 168, 
+  168, 168, 168, 168, 168, 168, 168, 168, 104, 104, 
+  169, 169, 170, 170, 171, 171, 103, 103, 103, 103, 
+  103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 
+  103, 122, 183, 183, 182, 182, 130, 130, 184, 184, 
+  185, 185, 187, 187, 186, 188, 191, 189, 189, 192, 
+  190, 190, 123, 124, 124, 125, 125, 172, 172, 172, 
+  172, 172, 172, 172, 173, 173, 173, 173, 174, 174, 
+  174, 174, 175, 175, 176, 178, 193, 193, 196, 196, 
+  194, 194, 197, 195, 177, 177, 177, 179, 179, 180, 
+  180, 180, 198, 199, 181, 181, 129, 140, 203, 203, 
+  200, 200, 201, 201, 204, 107, 205, 205, 105, 105, 
+  202, 202, 134, 134, 206};
 
 const short QDeclarativeJSGrammar::rhs [] = {
   2, 2, 2, 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, 7, 7, 
-  4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 
+  1, 5, 4, 4, 3, 3, 3, 3, 1, 1, 
+  1, 0, 1, 2, 4, 6, 6, 3, 3, 7, 
+  7, 4, 4, 5, 5, 6, 6, 7, 7, 7, 
+  7, 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, 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, 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, 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, 1, 1, 1, 1, 1, 4, 3, 5, 1, 
+  2, 4, 4, 4, 3, 0, 1, 1, 3, 1, 
+  1, 1, 2, 2, 1, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 1, 3, 3, 3, 1, 3, 
+  3, 1, 3, 3, 3, 1, 3, 3, 3, 3, 
+  3, 3, 1, 3, 3, 3, 3, 3, 1, 3, 
+  3, 3, 3, 1, 3, 3, 3, 3, 1, 3, 
   1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 
-  1, 3, 1, 3, 1, 3, 1, 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, 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, 
-  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, 1, 2, 1, 1, 0, 1, 
-  0, 1, 2};
+  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, 1, 2, 1, 1, 
+  0, 1, 0, 1, 2};
 
 const short QDeclarativeJSGrammar::action_default [] = {
-  0, 0, 0, 0, 0, 0, 22, 0, 170, 237, 
-  201, 209, 205, 149, 221, 197, 3, 134, 68, 150, 
-  213, 217, 138, 167, 148, 153, 133, 187, 174, 0, 
-  75, 76, 71, 339, 63, 341, 0, 0, 0, 0, 
-  73, 0, 0, 69, 72, 0, 0, 64, 66, 65, 
-  74, 67, 0, 70, 0, 0, 163, 0, 0, 150, 
-  169, 152, 151, 0, 0, 0, 165, 166, 164, 168, 
-  0, 198, 0, 0, 0, 0, 188, 0, 0, 0, 
-  0, 0, 0, 178, 0, 0, 0, 172, 173, 171, 
-  176, 180, 179, 177, 175, 190, 189, 191, 0, 206, 
-  0, 202, 0, 0, 144, 131, 143, 132, 100, 101, 
-  102, 127, 103, 128, 104, 105, 106, 107, 108, 109, 
-  110, 111, 112, 113, 114, 115, 116, 129, 117, 118, 
-  119, 120, 121, 122, 123, 124, 125, 126, 130, 0, 
-  0, 142, 238, 145, 0, 146, 0, 147, 141, 0, 
-  234, 227, 225, 232, 233, 231, 230, 236, 229, 228, 
-  226, 235, 222, 0, 210, 0, 0, 214, 0, 0, 
-  218, 0, 0, 144, 136, 0, 135, 0, 140, 154, 
-  0, 340, 329, 330, 0, 327, 0, 328, 0, 331, 
-  245, 252, 251, 259, 247, 0, 248, 332, 0, 338, 
-  249, 250, 255, 253, 335, 333, 337, 256, 0, 267, 
-  0, 0, 0, 0, 339, 63, 0, 341, 64, 239, 
-  281, 65, 0, 0, 0, 268, 0, 0, 257, 258, 
-  0, 246, 254, 282, 283, 326, 336, 0, 297, 298, 
-  299, 300, 0, 293, 294, 295, 296, 323, 324, 0, 
-  0, 0, 0, 0, 286, 287, 243, 241, 203, 211, 
-  207, 223, 199, 244, 0, 150, 215, 219, 192, 181, 
-  0, 0, 200, 0, 0, 0, 0, 193, 0, 0, 
-  0, 0, 0, 185, 183, 186, 184, 182, 195, 194, 
-  196, 0, 208, 0, 204, 0, 242, 150, 0, 224, 
-  239, 240, 0, 239, 0, 0, 289, 0, 0, 0, 
-  291, 0, 212, 0, 0, 216, 0, 0, 220, 279, 
-  0, 271, 280, 274, 0, 278, 0, 239, 272, 0, 
-  239, 0, 0, 290, 0, 0, 0, 292, 340, 329, 
-  0, 0, 331, 0, 325, 0, 315, 0, 0, 0, 
-  285, 0, 284, 0, 342, 0, 99, 261, 264, 0, 
-  100, 267, 103, 128, 105, 106, 71, 110, 111, 63, 
-  112, 115, 69, 72, 64, 239, 65, 74, 118, 67, 
-  120, 70, 122, 123, 268, 125, 126, 130, 0, 92, 
-  0, 0, 94, 98, 96, 83, 95, 97, 0, 93, 
-  82, 262, 260, 138, 139, 144, 0, 137, 0, 314, 
-  0, 301, 302, 0, 313, 0, 0, 0, 304, 309, 
-  307, 310, 0, 0, 308, 309, 0, 305, 0, 306, 
-  263, 312, 0, 263, 311, 0, 316, 317, 0, 263, 
-  318, 319, 0, 0, 320, 0, 0, 0, 321, 322, 
-  156, 155, 0, 0, 0, 288, 0, 0, 0, 303, 
-  276, 269, 0, 277, 273, 0, 275, 265, 0, 266, 
-  270, 86, 0, 0, 90, 77, 0, 79, 88, 0, 
-  80, 89, 91, 81, 87, 78, 0, 84, 160, 158, 
-  162, 159, 157, 161, 6, 334, 4, 2, 61, 85, 
-  0, 0, 64, 66, 65, 31, 5, 0, 62, 0, 
-  40, 39, 38, 0, 0, 53, 0, 54, 0, 59, 
-  60, 0, 40, 0, 0, 0, 0, 0, 49, 50, 
-  0, 51, 0, 52, 0, 55, 56, 0, 0, 0, 
-  0, 0, 57, 58, 0, 47, 41, 48, 42, 0, 
-  0, 0, 0, 44, 0, 45, 46, 43, 0, 0, 
-  30, 34, 35, 36, 37, 138, 263, 0, 0, 100, 
-  267, 103, 128, 105, 106, 71, 110, 111, 63, 112, 
-  115, 69, 72, 64, 239, 65, 74, 118, 67, 120, 
-  70, 122, 123, 268, 125, 126, 130, 138, 0, 26, 
-  0, 0, 32, 27, 33, 28, 24, 0, 29, 25, 
-  8, 0, 10, 0, 9, 0, 1, 21, 12, 0, 
-  13, 0, 14, 0, 19, 20, 0, 15, 16, 0, 
-  17, 18, 11, 23, 7, 343};
+  0, 0, 0, 0, 0, 0, 22, 0, 172, 239, 
+  203, 211, 207, 151, 223, 199, 3, 136, 70, 152, 
+  215, 219, 140, 169, 150, 155, 135, 189, 176, 0, 
+  77, 78, 73, 341, 64, 343, 0, 0, 0, 0, 
+  75, 0, 0, 71, 74, 68, 0, 0, 65, 67, 
+  66, 76, 69, 0, 72, 0, 0, 165, 0, 0, 
+  152, 171, 154, 153, 0, 0, 0, 167, 168, 166, 
+  170, 0, 200, 0, 0, 0, 0, 190, 0, 0, 
+  0, 0, 0, 0, 180, 0, 0, 0, 174, 175, 
+  173, 178, 182, 181, 179, 177, 192, 191, 193, 0, 
+  208, 0, 204, 0, 0, 146, 133, 145, 134, 102, 
+  103, 104, 129, 105, 130, 106, 107, 108, 109, 110, 
+  111, 112, 113, 114, 115, 116, 117, 118, 131, 119, 
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 132, 
+  0, 0, 144, 240, 147, 0, 148, 0, 149, 143, 
+  0, 236, 229, 227, 234, 235, 233, 232, 238, 231, 
+  230, 228, 237, 224, 0, 212, 0, 0, 216, 0, 
+  0, 220, 0, 0, 146, 138, 0, 137, 0, 142, 
+  156, 0, 342, 331, 332, 0, 329, 0, 330, 0, 
+  333, 247, 254, 253, 261, 249, 0, 250, 334, 0, 
+  340, 251, 252, 257, 255, 337, 335, 339, 258, 0, 
+  269, 0, 0, 0, 0, 341, 64, 0, 343, 65, 
+  241, 283, 66, 0, 0, 0, 270, 0, 0, 259, 
+  260, 0, 248, 256, 284, 285, 328, 338, 0, 299, 
+  300, 301, 302, 0, 295, 296, 297, 298, 325, 326, 
+  0, 0, 0, 0, 0, 288, 289, 245, 243, 205, 
+  213, 209, 225, 201, 246, 0, 152, 217, 221, 194, 
+  183, 0, 0, 202, 0, 0, 0, 0, 195, 0, 
+  0, 0, 0, 0, 187, 185, 188, 186, 184, 197, 
+  196, 198, 0, 210, 0, 206, 0, 244, 152, 0, 
+  226, 241, 242, 0, 241, 0, 0, 291, 0, 0, 
+  0, 293, 0, 214, 0, 0, 218, 0, 0, 222, 
+  281, 0, 273, 282, 276, 0, 280, 0, 241, 274, 
+  0, 241, 0, 0, 292, 0, 0, 0, 294, 342, 
+  331, 0, 0, 333, 0, 327, 0, 317, 0, 0, 
+  0, 287, 0, 286, 0, 344, 0, 101, 263, 266, 
+  0, 102, 269, 105, 130, 107, 108, 73, 112, 113, 
+  64, 114, 117, 71, 74, 65, 241, 66, 76, 120, 
+  69, 122, 72, 124, 125, 270, 127, 128, 132, 0, 
+  94, 0, 0, 96, 100, 98, 85, 97, 99, 0, 
+  95, 84, 264, 262, 140, 141, 146, 0, 139, 0, 
+  316, 0, 303, 304, 0, 315, 0, 0, 0, 306, 
+  311, 309, 312, 0, 0, 310, 311, 0, 307, 0, 
+  308, 265, 314, 0, 265, 313, 0, 318, 319, 0, 
+  265, 320, 321, 0, 0, 322, 0, 0, 0, 323, 
+  324, 158, 157, 0, 0, 0, 290, 0, 0, 0, 
+  305, 278, 271, 0, 279, 275, 0, 277, 267, 0, 
+  268, 272, 88, 0, 0, 92, 79, 0, 81, 90, 
+  0, 82, 91, 93, 83, 89, 80, 0, 86, 162, 
+  160, 164, 161, 159, 163, 6, 336, 4, 2, 62, 
+  87, 0, 0, 65, 67, 66, 31, 5, 0, 63, 
+  0, 41, 40, 39, 0, 0, 54, 0, 55, 0, 
+  60, 61, 0, 41, 0, 0, 0, 0, 0, 50, 
+  51, 0, 52, 0, 53, 0, 56, 57, 0, 0, 
+  0, 0, 0, 58, 59, 0, 48, 42, 49, 43, 
+  0, 0, 0, 0, 45, 0, 46, 47, 44, 0, 
+  0, 0, 30, 35, 36, 37, 38, 140, 265, 0, 
+  0, 102, 269, 105, 130, 107, 108, 73, 112, 113, 
+  64, 114, 117, 71, 74, 65, 241, 66, 76, 120, 
+  69, 122, 72, 124, 125, 270, 127, 128, 132, 140, 
+  0, 26, 0, 0, 32, 27, 33, 28, 24, 0, 
+  29, 25, 0, 34, 8, 0, 10, 0, 9, 0, 
+  1, 21, 12, 0, 13, 0, 14, 0, 19, 20, 
+  0, 15, 16, 0, 17, 18, 11, 23, 7, 345};
 
 const short QDeclarativeJSGrammar::goto_default [] = {
-  7, 616, 206, 195, 204, 506, 494, 615, 634, 610, 
-  614, 612, 617, 22, 613, 18, 505, 607, 598, 560, 
-  507, 190, 194, 196, 200, 523, 549, 548, 199, 231, 
-  26, 473, 472, 355, 354, 9, 353, 356, 106, 17, 
-  144, 24, 13, 143, 19, 25, 56, 23, 8, 28, 
-  27, 268, 15, 262, 10, 258, 12, 260, 11, 259, 
-  20, 266, 21, 267, 14, 261, 257, 298, 410, 263, 
-  264, 201, 192, 191, 203, 232, 202, 207, 228, 229, 
-  193, 359, 358, 230, 462, 461, 320, 321, 464, 323, 
-  463, 322, 418, 422, 425, 421, 420, 440, 441, 184, 
-  198, 180, 183, 197, 205, 0};
+  7, 620, 207, 196, 205, 507, 495, 619, 638, 614, 
+  618, 616, 621, 22, 617, 18, 506, 609, 600, 562, 
+  508, 191, 195, 197, 201, 524, 550, 549, 200, 232, 
+  26, 474, 473, 356, 355, 9, 354, 357, 107, 17, 
+  145, 24, 13, 144, 19, 25, 57, 23, 8, 28, 
+  27, 269, 15, 263, 10, 259, 12, 261, 11, 260, 
+  20, 267, 21, 268, 14, 262, 258, 299, 411, 264, 
+  265, 202, 193, 192, 204, 233, 203, 208, 229, 230, 
+  194, 360, 359, 231, 463, 462, 321, 322, 465, 324, 
+  464, 323, 419, 423, 426, 422, 421, 441, 442, 185, 
+  199, 181, 184, 198, 206, 0};
 
 const short QDeclarativeJSGrammar::action_index [] = {
-  439, 1109, 2228, 2228, 2132, 814, -74, 18, 147, -100, 
-  31, -17, -49, 232, -100, 318, 85, -100, -100, 554, 
-  33, 94, 331, 215, -100, -100, -100, 448, 231, 1109, 
-  -100, -100, -100, 320, -100, 1940, 1472, 1109, 1109, 1109, 
-  -100, 724, 1109, -100, -100, 1109, 1109, -100, -100, -100, 
-  -100, -100, 1109, -100, 1109, 1109, -100, 1109, 1109, 129, 
-  157, -100, -100, 1109, 1109, 1109, -100, -100, -100, 200, 
-  1109, 293, 1109, 1109, 1109, 1109, 466, 1109, 1109, 1109, 
-  1109, 1109, 1109, 179, 1109, 1109, 1109, 119, 125, 95, 
-  188, 198, 184, 203, 178, 567, 567, 484, 1109, -5, 
-  1109, 67, 1844, 1109, 1109, -100, -100, -100, -100, -100, 
-  -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, 
-  -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, 
-  -100, -100, -100, -100, -100, -100, -100, -100, -100, 110, 
-  1109, -100, -100, 70, 61, -100, 1109, -100, -100, 1109, 
-  -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, 
-  -100, -100, -100, 1109, 55, 1109, 1109, 73, 63, 1109, 
-  -100, 1844, 1109, 1109, -100, 141, -100, 41, -100, -100, 
-  87, -100, 255, 80, 78, -100, 287, -100, 83, 2228, 
-  -100, -100, -100, -100, -100, 225, -100, -100, 52, -100, 
-  -100, -100, -100, -100, -100, 2228, -100, -100, 420, -100, 
-  408, 113, 2132, 50, 330, 65, 46, 2420, 72, 1109, 
-  -100, 74, 75, 1109, 77, -100, 53, 56, -100, -100, 
-  323, -100, -100, -100, -100, -100, -100, 96, -100, -100, 
-  -100, -100, 99, -100, -100, -100, -100, -100, -100, 60, 
-  47, 1109, 118, 93, -100, -100, 1291, -100, 79, 66, 
-  64, -100, 413, 76, 51, 664, 89, 97, 393, 183, 
-  337, 1109, 413, 1109, 1109, 1109, 1109, 411, 1109, 1109, 
-  1109, 1109, 1109, 252, 272, 212, 217, 221, 490, 490, 
-  383, 1109, 64, 1109, 84, 1109, -100, 536, 1109, -100, 
-  1109, 69, 68, 1109, 44, 2132, -100, 1109, 124, 2132, 
-  -100, 1109, 54, 1109, 1109, 71, 88, 1109, -100, 82, 
-  122, 154, -100, -100, 1109, -100, 343, 1109, -100, 81, 
-  1109, 90, 2132, -100, 1109, 112, 2132, -100, 86, 333, 
-  -39, -10, 2228, -33, -100, 2132, -100, 1109, 246, 2132, 
-  4, 2132, -100, 10, 16, -21, -100, -100, 2132, -26, 
-  480, 19, 462, 128, 1109, 2132, 6, -9, 400, 8, 
-  -22, 840, -3, -6, -100, 1202, -100, -7, -28, 5, 
-  1109, 2, -23, 1109, 0, 1109, -34, -30, 1109, -100, 
-  2036, 21, -100, -100, -100, -100, -100, -100, 1109, -100, 
-  -100, -100, -100, 209, -100, 1109, 40, -100, 2132, -100, 
-  101, -100, -100, 2132, -100, 1109, 120, 43, -100, 62, 
-  -100, 59, 109, 1109, -100, 57, 58, -100, 39, -100, 
-  2132, -100, 117, 2132, -100, 199, -100, -100, 107, 2132, 
-  34, -100, 24, 11, -100, 346, -19, 14, -100, -100, 
-  -100, -100, 1109, 133, 2132, -100, 1109, 126, 2132, -100, 
-  20, -100, 173, -100, -100, 1109, -100, -100, 303, -100, 
-  -100, -100, 100, 1656, -100, -100, 1564, -100, -100, 1748, 
-  -100, -100, -100, -100, -100, -100, 131, -100, -100, -100, 
-  -100, -100, -100, -100, -100, 2228, -100, -100, -100, 158, 
-  -20, 752, 165, -16, 22, -100, -100, 98, -100, 189, 
-  -100, -100, -100, 28, 170, -100, 1109, -100, 230, -100, 
-  -100, 247, 1, 13, 238, 37, -24, 106, -100, -100, 
-  273, -100, 1109, -100, 265, -100, -100, 242, -4, 12, 
-  1109, 241, -100, -100, 234, -100, 245, -100, 3, 9, 
-  311, 190, 316, -100, 134, -100, -100, -100, 1380, 1020, 
-  -100, -100, -100, -100, -100, 359, 2324, 1472, 15, 444, 
-  38, 394, 138, 1109, 2132, 36, 17, 397, 42, 23, 
-  840, 32, 29, -100, 1202, -100, 26, 35, 48, 1109, 
-  45, 25, 1109, 49, 1109, 27, 30, 314, 132, -100, 
-  7, 752, -100, -100, -100, -100, -100, 930, -100, -100, 
-  -100, 752, -100, 253, -87, 617, -100, -100, 102, 290, 
-  -100, 191, -100, 140, -100, -100, 275, -100, -100, 91, 
-  -100, -100, -100, -100, -100, -100, 
+  293, 1217, 2251, 2251, 2348, 945, -3, 88, 97, -101, 
+  85, 78, 70, 249, -101, 302, 82, -101, -101, 676, 
+  81, 132, 281, 248, -101, -101, -101, 494, 225, 1217, 
+  -101, -101, -101, 397, -101, 1960, 1584, 1217, 1217, 1217, 
+  -101, 765, 1217, -101, -101, -101, 1217, 1217, -101, -101, 
+  -101, -101, -101, 1217, -101, 1217, 1217, -101, 1217, 1217, 
+  92, 199, -101, -101, 1217, 1217, 1217, -101, -101, -101, 
+  179, 1217, 295, 1217, 1217, 1217, 1217, 467, 1217, 1217, 
+  1217, 1217, 1217, 1217, 191, 1217, 1217, 1217, 136, 121, 
+  144, 207, 182, 181, 261, 291, 477, 578, 578, 1217, 
+  86, 1217, 91, 2057, 1217, 1217, -101, -101, -101, -101, 
+  -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  108, 1217, -101, -101, 83, 75, -101, 1217, -101, -101, 
+  1217, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  -101, -101, -101, -101, 1217, 34, 1217, 1217, 62, 66, 
+  1217, -101, 2057, 1217, 1217, -101, 99, -101, 41, -101, 
+  -101, 68, -101, 328, 69, 35, -101, 349, -101, 39, 
+  2251, -101, -101, -101, -101, -101, 232, -101, -101, 21, 
+  -101, -101, -101, -101, -101, -101, 2251, -101, -101, 490, 
+  -101, 558, 116, 2348, 38, 385, 63, 49, 2542, 73, 
+  1217, -101, 74, 60, 1217, 65, -101, 61, 64, -101, 
+  -101, 381, -101, -101, -101, -101, -101, -101, 107, -101, 
+  -101, -101, -101, 101, -101, -101, -101, -101, -101, -101, 
+  59, 58, 1217, 94, 95, -101, -101, 1401, -101, 157, 
+  51, 52, -101, 314, 71, 56, 604, 76, 90, 422, 
+  242, 317, 1217, 335, 1217, 1217, 1217, 1217, 332, 1217, 
+  1217, 1217, 1217, 1217, 172, 176, 188, 206, 203, 500, 
+  395, 422, 1217, 52, 1217, 157, 1217, -101, 676, 1217, 
+  -101, 1217, 67, 44, 1217, 48, 2348, -101, 1217, 250, 
+  2348, -101, 1217, 84, 1217, 1217, 87, 77, 1217, -101, 
+  54, 135, 72, -101, -101, 1217, -101, 345, 1217, -101, 
+  80, 1217, 79, 2348, -101, 1217, 175, 2348, -101, -33, 
+  339, -53, -13, 2251, -30, -101, 2348, -101, 1217, 152, 
+  2348, 0, 2348, -101, 11, 57, -54, -101, -101, 2348, 
+  -38, 501, 1, 524, 127, 1217, 2348, -2, -27, 414, 
+  16, -23, 765, 5, 7, -101, 1311, -101, 4, -26, 
+  15, 1217, 14, -31, 1217, -1, 1217, -36, -32, 1217, 
+  -101, 2154, 19, -101, -101, -101, -101, -101, -101, 1217, 
+  -101, -101, -101, -101, 289, -101, 1217, -7, -101, 2348, 
+  -101, 131, -101, -101, 2348, -101, 1217, 130, -9, -101, 
+  47, -101, 40, 104, 1217, -101, 45, 42, -101, 13, 
+  -101, 2348, -101, 102, 2348, -101, 192, -101, -101, 100, 
+  2348, 43, -101, 20, 18, -101, 394, -29, 9, -101, 
+  -101, -101, -101, 1217, 138, 2348, -101, 1217, 134, 2348, 
+  -101, 24, -101, 215, -101, -101, 1217, -101, -101, 400, 
+  -101, -101, -101, 119, 1770, -101, -101, 1863, -101, -101, 
+  1677, -101, -101, -101, -101, -101, -101, 145, -101, -101, 
+  -101, -101, -101, -101, -101, -101, 2251, -101, -101, -101, 
+  96, -11, 854, 214, -19, -14, -101, -101, 344, -101, 
+  222, -101, -101, -101, 29, 220, -101, 1217, -101, 241, 
+  -101, -101, 292, -4, 6, 244, 3, 17, 118, -101, 
+  -101, 230, -101, 1217, -101, 177, -101, -101, 193, 8, 
+  32, 1217, 209, -101, -101, 185, -101, 173, -101, 46, 
+  -24, 404, 226, 333, -101, 112, -101, -101, -101, 1491, 
+  1127, 854, -101, -101, -101, -101, -101, 316, 2445, 1584, 
+  10, 454, 33, 482, 109, 1217, 2348, 37, 2, 474, 
+  27, -8, 765, 22, 25, -101, 1311, -101, 23, 12, 
+  50, 1217, 53, 36, 1217, 55, 1217, 31, 30, 309, 
+  125, -101, 28, 737, -101, -101, -101, -101, -101, 1036, 
+  -101, -101, 26, -101, -101, 654, -101, 275, -71, 854, 
+  -101, -101, 113, 305, -101, 204, -101, 89, -101, -101, 
+  336, -101, -101, 105, -101, -101, -101, -101, -101, -101, 
 
-  -106, 12, -87, 18, 17, 212, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -53, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, 162, 
-  -106, -106, -106, -4, -106, -106, -11, 24, 75, 76, 
-  -106, 83, 55, -106, -106, 157, 158, -106, -106, -106, 
-  -106, -106, 150, -106, 172, 176, -106, 168, 167, -106, 
-  -106, -106, -106, 173, 154, 115, -106, -106, -106, -106, 
-  147, -106, 121, 113, 112, 125, -106, 128, 143, 146, 
-  140, 139, 136, -106, 122, 138, 130, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, 149, -106, 
-  153, -106, 110, 82, 46, -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, 4, -103, -4, 2, 317, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -37, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, 68, 
+  -106, -106, -106, 21, -106, -106, -12, 17, 171, 175, 
+  -106, 200, 168, -106, -106, -106, 180, 141, -106, -106, 
+  -106, -106, -106, 155, -106, 159, 156, -106, 151, 150, 
+  -106, -106, -106, -106, 117, 162, 103, -106, -106, -106, 
+  -106, 178, -106, 95, 146, 118, 130, -106, 142, 140, 
+  176, 167, 174, 224, -106, 87, 88, 93, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, 90, 
+  -106, 138, -106, 92, 84, 56, -106, -106, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  35, -106, -106, -106, -106, -106, 37, -106, -106, 45, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, 92, -106, 88, 58, -106, -106, 51, 
-  -106, 209, 72, 78, -106, -106, -106, -106, -106, -106, 
-  -106, -106, 27, -106, -106, -106, 63, -106, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, 50, -106, -106, 28, -106, 
-  29, -106, 47, -106, 33, -106, -106, 66, -106, 73, 
-  -106, -106, -106, 81, 53, -106, -106, -106, -106, -106, 
-  -13, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, 9, -106, -106, -106, -106, -106, 36, -106, -106, 
+  55, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, 111, -106, 113, 50, -106, -106, 
+  42, -106, 212, 59, 116, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -10, -106, -106, -106, 49, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, 9, -106, -106, -106, -106, 111, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 54, -106, -106, 41, 
+  -106, 34, -106, 35, -106, 74, -106, -106, 72, -106, 
+  80, -106, -106, -106, 81, 65, -106, -106, -106, -106, 
+  -106, -9, -106, -106, -106, -106, -106, -106, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  3, 186, -106, 220, 228, 234, 204, -106, 90, 91, 
-  94, 97, 93, -106, -106, -106, -106, -106, -106, -106, 
-  -106, 210, -106, 187, -106, 214, -106, -106, 208, -106, 
-  207, -106, -106, 155, -106, 8, -106, 4, -106, -1, 
-  -106, 217, -106, 177, 185, -106, -106, 184, -106, -106, 
-  -106, -106, -106, -106, 183, -106, 194, 105, -106, -106, 
-  99, -106, 71, -106, 74, -106, 65, -106, -106, 114, 
-  -106, -106, -55, -106, -106, 64, -106, 44, -106, 30, 
-  -106, 31, -106, -106, -106, -106, -106, -106, 57, -106, 
-  36, -106, 40, -106, 70, 59, -106, -106, 42, -106, 
-  -106, 104, -106, -106, -106, 38, -106, -106, -106, -106, 
-  79, -106, 69, 108, -106, 84, -106, -106, 56, -106, 
-  68, -106, -106, -106, -106, -106, -106, -106, 52, -106, 
-  -106, -106, -106, -106, -106, 109, -106, -106, 77, -106, 
-  -106, -106, -106, 86, -106, 80, -106, -106, -106, -106, 
-  -106, -59, -106, 43, -106, -63, -106, -106, -106, -106, 
-  98, -106, -106, 95, -106, -106, -106, -106, -106, 60, 
-  -34, -106, -106, 32, -106, 41, -106, 39, -106, -106, 
-  -106, -106, 49, -106, 61, -106, 62, -106, 48, -106, 
-  -106, -106, -106, -106, -106, 23, -106, -106, 96, -106, 
-  -106, -106, -106, 34, -106, -106, 133, -106, -106, 54, 
+  -106, -106, 22, -106, -106, -106, -106, 109, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, 67, -106, -106, -106, -106, 
-  -106, 22, -106, -106, -106, -106, -106, -106, -106, -22, 
-  -106, -106, -106, -106, -106, -106, 2, -106, -106, -106, 
-  -106, -106, -106, -106, -19, -106, -106, -106, -106, -106, 
-  -106, -106, 100, -106, -106, -106, -106, -21, -106, -106, 
-  -3, -106, -106, -106, -106, -106, 13, -106, -106, -106, 
-  11, 14, 10, -106, -106, -106, -106, -106, 279, 283, 
-  -106, -106, -106, -106, -106, -106, 19, 273, 15, 16, 
-  -106, 21, -106, 224, 6, -106, -106, 25, -106, -106, 
-  85, -106, -106, -106, 26, -106, -106, -106, -106, 20, 
-  -106, 7, 87, -106, 107, -106, -106, -106, -106, -106, 
-  -106, 317, -106, -106, -106, -106, -106, 277, -106, -106, 
-  -106, 0, -106, -106, -2, 271, -106, -106, -106, 1, 
-  -106, -106, -106, -106, -106, -106, 5, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106};
+  -106, -7, 239, -106, 236, 235, 227, 223, -106, 110, 
+  99, 89, 78, 75, -106, -106, -106, -106, -106, -106, 
+  -106, -106, 203, -106, 214, -106, 187, -106, -106, 245, 
+  -106, 125, -106, -106, 98, -106, 25, -106, 12, -106, 
+  100, -106, 184, -106, 221, 196, -106, -106, 185, -106, 
+  -106, -106, -106, -106, -106, 193, -106, 101, 108, -106, 
+  -106, 102, -106, 77, -106, 73, -106, 76, -106, -106, 
+  105, -106, -106, -8, -106, -106, 86, -106, 45, -106, 
+  48, -106, 51, -106, -106, -106, -106, -106, -106, 39, 
+  -106, 28, -106, 30, -106, 163, 38, -106, -106, 52, 
+  -106, -106, 85, -106, -106, -106, 62, -106, -106, -106, 
+  -106, 66, -106, 40, 121, -106, 106, -106, -106, 46, 
+  -106, 44, -106, -106, -106, -106, -106, -106, -106, 47, 
+  -106, -106, -106, -106, -106, -106, 83, -106, -106, 57, 
+  -106, -106, -106, -106, 58, -106, 63, -106, -106, -106, 
+  -106, -106, -24, -106, 67, -106, -25, -106, -106, -106, 
+  -106, 91, -106, -106, 94, -106, -106, -106, -106, -106, 
+  61, -41, -106, -106, 33, -106, 32, -106, 31, -106, 
+  -106, -106, -106, 70, -106, 37, -106, 43, -106, 53, 
+  -106, -106, -106, -106, -106, -106, 16, -106, -106, 79, 
+  -106, -106, -106, -106, 64, -106, -106, 69, -106, -106, 
+  60, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 71, -106, -106, -106, 
+  -106, -106, 5, -106, -106, -106, -106, -106, -106, -106, 
+  -22, -106, -106, -106, -106, -106, -106, 29, -106, -106, 
+  -106, -106, -106, -106, -106, -16, -106, -106, -106, -106, 
+  -106, -106, -106, 7, -106, -106, -106, -106, -23, -106, 
+  -106, 26, -106, -106, -106, -106, -106, 8, -106, -106, 
+  -106, 27, 10, 23, -106, -106, -106, -106, -106, 285, 
+  290, 97, -106, -106, -106, -106, -106, -106, 24, 277, 
+  0, 1, -106, -1, -106, 137, 11, -106, -106, 6, 
+  -106, -106, 197, -106, -106, -106, 19, -106, -106, -106, 
+  -106, 14, -106, 3, 96, -106, 133, -106, -106, -106, 
+  -106, -106, -106, 219, -106, -106, -106, -106, -106, 286, 
+  -106, -106, 15, -106, -106, -2, -106, -106, 20, 241, 
+  -106, -106, -106, 13, -106, -106, -106, -106, -106, -106, 
+  -3, -106, -106, -106, -106, -106, -106, -106, -106, -106};
 
 const short QDeclarativeJSGrammar::action_info [] = {
-  -97, -98, 452, 611, -116, 527, 456, -124, 415, -121, 
-  439, 551, -119, -108, 347, -94, 611, 388, 635, 540, 
-  351, 341, 344, 342, 390, 539, -127, 256, 398, 402, 
-  100, 98, 70, -97, 400, 163, -98, 465, 524, -116, 
-  559, 447, 530, -108, 439, -127, 509, 439, 559, -94, 
-  537, 544, -121, 256, 443, -119, -124, 514, 439, 347, 
-  445, 526, 423, 452, 423, 430, 456, 423, 70, 554, 
-  169, 415, 345, 311, 100, 163, 419, 140, 146, 408, 
-  271, 413, 347, 251, 295, 271, 256, 0, 186, 452, 
-  0, 311, 456, 140, 429, 317, 0, 0, 0, 324, 
-  407, 178, 291, 98, 305, 558, 0, 235, 476, 0, 
-  439, 415, 300, 442, 291, 0, 189, 171, 140, 426, 
-  140, 148, 339, 182, 433, 140, 140, 443, 140, 303, 
-  326, 559, 140, 0, 140, 57, 172, 250, 188, 140, 
-  601, 140, 330, 293, 165, 0, 58, 313, 166, 140, 
-  332, 314, 631, 630, 255, 254, 477, 241, 240, 57, 
-  246, 245, 412, 411, 427, 57, 141, 529, 528, 63, 
-  58, 61, 336, 171, 248, 247, 58, 516, 253, 0, 
-  417, 468, 62, 327, 309, 334, 458, 57, 602, 248, 
-  247, 487, 172, 454, 522, 556, 555, 176, 58, 248, 
-  247, 625, 624, 84, 84, 85, 85, 140, 84, 84, 
-  85, 85, 63, 84, 64, 85, 86, 86, 510, 510, 
-  65, 86, 86, 84, 171, 85, 86, 63, 84, 0, 
-  85, 517, 515, 140, 469, 467, 86, 84, 140, 85, 
-  512, 86, 84, 172, 85, 405, 84, 102, 85, 140, 
-  86, 511, 628, 627, 140, 86, 84, 64, 85, 86, 
-  437, 436, 171, 65, 512, 512, 103, 510, 104, 86, 
-  546, 510, 64, 140, 510, 511, 511, 84, 65, 85, 
-  532, 172, 626, 405, 34, 0, 234, 233, 0, 0, 
-  86, 520, 519, 0, 0, 547, 545, 84, 0, 85, 
-  621, 0, 543, 542, 34, 0, 349, 0, 0, 0, 
-  86, 72, 73, 512, 622, 620, 34, 512, 0, 34, 
-  512, 47, 49, 48, 511, 0, 536, 535, 511, 171, 
-  0, 511, 34, 0, 533, 531, 72, 73, 74, 75, 
-  34, 47, 49, 48, 619, 34, 171, -85, 172, 34, 
-  173, 0, 34, 47, 49, 48, 47, 49, 48, 34, 
-  0, 0, 34, 74, 75, 172, 34, 173, 0, 47, 
-  49, 48, 34, 0, 171, 34, 0, 47, 49, 48, 
-  0, 0, 47, 49, 48, 0, 47, 49, 48, 47, 
-  49, 48, -85, 172, 0, 173, 47, 49, 48, 47, 
-  49, 48, 0, 47, 49, 48, 278, 279, 0, 47, 
-  49, 48, 47, 49, 48, 280, 278, 279, 281, 0, 
-  282, 0, 0, 34, 0, 280, 34, 0, 281, 34, 
-  282, 273, 274, -339, 278, 279, -339, 34, 0, 0, 
-  0, 0, 0, 280, 0, 0, 281, 0, 282, 34, 
-  0, 0, 0, 0, 0, 244, 243, 0, 275, 276, 
-  47, 49, 48, 47, 49, 48, 47, 49, 48, 244, 
-  243, 77, 78, 34, 47, 49, 48, 0, 0, 79, 
-  80, 239, 238, 81, 0, 82, 47, 49, 48, 77, 
-  78, 34, 0, 0, 0, 0, 0, 79, 80, 0, 
-  0, 81, 0, 82, 0, 239, 238, 77, 78, 34, 
-  47, 49, 48, 278, 279, 79, 80, 0, 0, 81, 
-  0, 82, 280, 244, 243, 281, 0, 282, 47, 49, 
-  48, 6, 5, 4, 1, 3, 2, 0, 0, 150, 
-  0, 239, 238, 0, 0, 0, 47, 49, 48, 151, 
-  0, 0, 0, 152, 0, 0, 0, 150, 0, 0, 
-  0, 0, 153, 0, 154, 0, 0, 151, 0, 0, 
-  0, 152, 0, 0, 0, 155, 0, 156, 61, 0, 
-  153, 0, 154, 0, 0, 157, 0, 0, 158, 62, 
-  77, 78, 0, 155, 159, 156, 61, 0, 79, 80, 
-  160, 0, 81, 157, 82, 0, 158, 62, 0, 0, 
-  0, 0, 159, 0, 0, 0, 161, 0, 160, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 
-  31, 0, 0, 0, 161, 0, 0, 0, 0, 33, 
+  453, 401, 440, 340, 457, -110, -126, 342, -129, 257, 
+  416, -99, -118, 348, -100, 545, 352, 403, 389, 615, 
+  343, -123, -121, -96, 420, 345, 399, 527, 348, -118, 
+  -99, 448, -100, 525, -96, 531, 555, 540, 257, 541, 
+  -129, 466, 440, 560, -110, 424, 528, 538, 416, 431, 
+  424, 440, 424, 408, 552, 510, 446, -121, 515, 560, 
+  -123, 560, -126, 444, 164, 391, 457, 453, 430, 440, 
+  346, 325, 190, 170, 257, 141, 236, 187, 312, 296, 
+  409, 414, 99, 164, 318, 348, 71, 615, 639, 312, 
+  141, 147, 71, 0, 252, 189, 416, 453, 440, 292, 
+  457, 179, 141, 335, 183, 304, 443, 141, 306, 434, 
+  141, 172, 0, 0, 427, 0, 141, 301, 0, 0, 
+  444, 0, 0, 0, 0, 0, 99, 477, 172, 0, 
+  173, 294, 292, 603, 62, 149, 251, 58, 141, 333, 
+  314, 331, 141, 327, 315, 63, 141, 173, 59, 101, 
+  629, 628, 0, 141, 254, 177, 256, 255, 272, 428, 
+  141, 58, 247, 246, 142, 101, 635, 634, 242, 241, 
+  249, 248, 59, 557, 556, 478, 58, 249, 248, 530, 
+  529, 604, 166, 141, 58, 141, 167, 59, 249, 248, 
+  418, 64, 413, 412, 459, 59, 328, 85, 455, 86, 
+  141, 85, 511, 86, 0, 488, 85, 85, 86, 86, 
+  87, 64, 350, 85, 87, 86, 85, 141, 86, 87, 
+  87, 547, 511, 469, 0, 0, 87, 517, 85, 87, 
+  86, 85, 85, 86, 86, 337, 65, 533, 537, 536, 
+  141, 87, 66, 523, 87, 87, 548, 546, 513, 141, 
+  85, 511, 86, 438, 437, 511, 65, 0, 141, 512, 
+  64, 0, 66, 87, 103, 632, 631, 85, 513, 86, 
+  544, 543, 0, 511, 0, 0, 470, 468, 0, 512, 
+  87, 518, 516, 104, 0, 105, 85, 0, 86, 513, 
+  0, 534, 532, 235, 234, 630, 172, 513, 0, 87, 
+  512, 513, 521, 520, 172, 65, 0, 172, 512, 0, 
+  310, 66, 512, 73, 74, 173, 85, 174, 86, 513, 
+  73, 74, 625, 173, 172, 406, 173, 0, 406, 87, 
+  512, 172, 274, 275, 34, 0, 626, 624, 0, 0, 
+  75, 76, -87, 173, 0, 174, 34, 75, 76, -87, 
+  173, 559, 174, 274, 275, 279, 280, 34, 0, 276, 
+  277, 0, 34, 0, 281, 34, 623, 282, 34, 283, 
+  0, 48, 50, 49, 34, 0, 0, 560, 34, 0, 
+  276, 277, 0, 48, 50, 49, 6, 5, 4, 1, 
+  3, 2, 0, 0, 48, 50, 49, 45, 0, 48, 
+  50, 49, 48, 50, 49, 48, 50, 49, 0, 45, 
+  34, 48, 50, 49, 34, 48, 50, 49, 279, 280, 
+  45, 0, 0, 34, 0, 45, 34, 281, 45, 34, 
+  282, 45, 283, 34, 0, 0, 561, 45, 0, 0, 
+  0, 45, 0, 34, 0, 279, 280, 48, 50, 49, 
+  -341, 48, 50, 49, 281, 0, 0, 282, 0, 283, 
+  48, 50, 49, 48, 50, 49, 48, 50, 49, 0, 
+  48, 50, 49, 45, 0, 0, 0, 45, 0, 0, 
+  48, 50, 49, 34, 0, 0, 45, 0, 0, 45, 
+  78, 79, 45, 0, 0, 0, 45, 0, 80, 81, 
+  78, 79, 82, 34, 83, 0, 45, 0, 80, 81, 
+  -341, 34, 82, 0, 83, 240, 239, 78, 79, 34, 
+  48, 50, 49, 279, 280, 80, 81, 0, 0, 82, 
+  34, 83, 281, 0, 0, 282, 0, 283, 0, 0, 
+  48, 50, 49, 245, 244, 0, 45, 0, 48, 50, 
+  49, 240, 239, 34, 0, 0, 48, 50, 49, 0, 
+  0, 0, 240, 239, 0, 0, 45, 48, 50, 49, 
+  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
+  0, 0, 45, 0, 0, 245, 244, 34, 0, 0, 
+  48, 50, 49, 45, 0, 0, 0, 0, 0, 0, 
+  0, 78, 79, 0, 0, 0, 0, 151, 0, 80, 
+  81, 0, 0, 82, 0, 83, 45, 152, 0, 245, 
+  244, 153, 0, 0, 48, 50, 49, 0, 0, 0, 
+  154, 0, 155, 0, 0, 308, 0, 0, 0, 0, 
+  0, 0, 0, 156, 0, 157, 62, 0, 0, 0, 
+  45, 0, 0, 158, 0, 0, 159, 63, 0, 0, 
+  0, 0, 160, 0, 0, 0, 30, 31, 161, 0, 
+  0, 0, 0, 0, 0, 0, 33, 0, 0, 151, 
+  0, 0, 0, 34, 162, 0, 0, 35, 36, 152, 
+  37, 0, 0, 153, 0, 0, 0, 502, 0, 0, 
+  0, 44, 154, 0, 155, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 156, 0, 157, 62, 51, 
+  48, 50, 49, 0, 52, 158, 0, 0, 159, 63, 
+  0, 0, 0, 0, 160, 43, 54, 32, 0, 0, 
+  161, 40, 0, 0, 0, 0, 45, 0, 0, 30, 
+  31, 0, 0, 0, 0, 0, 162, 0, 0, 33, 
   0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
-  35, 36, 0, 37, 0, 0, 0, 0, 0, 0, 
-  501, 0, 0, 0, 44, 0, 0, 150, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 151, 0, 0, 
-  0, 152, 50, 47, 49, 48, 0, 51, 0, 0, 
-  153, 0, 154, 0, 0, 307, 0, 0, 43, 53, 
-  32, 0, 0, 155, 40, 156, 61, 0, 0, 0, 
-  0, 0, 0, 157, 0, 0, 158, 62, 0, 0, 
-  0, 0, 159, 0, 0, 0, 0, 0, 160, 0, 
+  35, 36, 0, 37, 0, 0, 0, 30, 31, 0, 
+  502, 0, 0, 0, 44, 0, 0, 33, 0, 0, 
+  0, 0, 0, 0, 34, 0, 0, 0, 35, 36, 
+  0, 37, 51, 48, 50, 49, 0, 52, 41, 0, 
+  0, 0, 44, 0, 0, 0, 0, 0, 43, 54, 
+  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
+  51, 48, 50, 49, 0, 52, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 43, 54, 32, 0, 
+  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
   0, 0, 0, 0, 0, 0, 30, 31, 0, 0, 
-  0, 0, 0, 0, 161, 0, 33, 0, 0, 0, 
-  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
-  37, 0, 0, 0, 30, 31, 0, 41, 0, 0, 
-  0, 44, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 34, 0, 0, 0, 35, 36, 0, 37, 50, 
-  47, 49, 48, 0, 51, 501, 0, 0, 0, 44, 
-  0, 0, 0, 0, 0, 43, 53, 32, 0, 0, 
-  0, 40, 0, 0, 0, 0, 0, 50, 47, 49, 
-  48, 0, 51, 0, 500, 0, 30, 31, 0, 0, 
-  0, 0, 0, 43, 53, 32, 214, 0, 0, 40, 
+  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
   0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
-  37, 0, 30, 31, 0, 0, 0, 501, 0, 0, 
-  0, 44, 33, 0, 0, 0, 0, 0, 0, 34, 
-  0, 0, 0, 35, 36, 0, 37, 0, 0, 50, 
-  502, 504, 503, 41, 51, 0, 0, 44, 0, 225, 
-  0, 0, 0, 0, 0, 43, 53, 32, 209, 0, 
-  0, 40, 0, 0, 0, 50, 47, 49, 48, 0, 
-  51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  500, 0, 30, 31, 0, 0, 0, 0, 0, 0, 
-  0, 0, 214, 0, 0, 0, 0, 0, 0, 34, 
-  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
-  0, 0, 0, 501, 0, 0, 0, 44, 0, 0, 
-  0, 0, 0, 0, 0, 608, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 50, 502, 504, 503, 0, 
-  51, 0, 0, 0, 0, 225, 0, 0, 0, 0, 
-  0, 43, 53, 32, 209, 0, 0, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  500, 0, 30, 31, 0, 0, 0, 0, 0, 0, 
-  0, 0, 214, 0, 0, 0, 0, 0, 0, 34, 
-  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
-  0, 0, 0, 501, 0, 0, 0, 44, 0, 0, 
-  0, 0, 0, 0, 0, 605, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 50, 502, 504, 503, 0, 
-  51, 0, 0, 0, 0, 225, 0, 0, 0, 0, 
-  0, 43, 53, 32, 209, 0, 0, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  29, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
-  0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
-  0, 0, 35, 36, 0, 37, 0, 0, 0, 38, 
-  0, 39, 41, 42, 0, 0, 44, 0, 0, 0, 
-  45, 0, 46, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 50, 47, 49, 48, 0, 51, 
-  0, 52, 0, 54, 0, 55, 0, 0, 0, 0, 
-  43, 53, 32, 0, 0, 0, 40, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, -117, 
-  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 45, 0, 46, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 50, 47, 49, 
-  48, 0, 51, 0, 52, 0, 54, 0, 55, 0, 
-  0, 0, 0, 43, 53, 32, 0, 0, 0, 40, 
+  37, 0, 0, 0, 0, 0, 0, 502, 0, 0, 
+  0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 51, 
+  48, 50, 49, 0, 52, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
+  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 0, 0, 501, 0, 30, 31, 0, 
+  0, 0, 0, 0, 0, 0, 0, 215, 0, 0, 
+  0, 0, 0, 0, 34, 0, 0, 0, 35, 36, 
+  0, 37, 0, 0, 0, 0, 0, 0, 502, 0, 
+  0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  51, 503, 505, 504, 0, 52, 0, 0, 0, 0, 
+  226, 0, 0, 0, 0, 0, 43, 54, 32, 210, 
+  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
+  0, 0, 0, 0, 0, 0, 501, 0, 30, 31, 
+  0, 0, 0, 0, 0, 0, 0, 0, 215, 0, 
+  0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 
+  36, 0, 37, 0, 0, 0, 0, 0, 0, 502, 
+  0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 
+  0, 610, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 51, 503, 505, 504, 0, 52, 0, 0, 0, 
+  0, 226, 0, 0, 0, 0, 0, 43, 54, 32, 
+  210, 0, 0, 40, 0, 0, 0, 0, 45, 0, 
+  0, 0, 0, 0, 0, 0, 0, 501, 0, 30, 
+  31, 0, 0, 0, 0, 0, 0, 0, 0, 215, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 0, 0, 0, 0, 0, 0, 
+  502, 0, 0, 0, 44, 0, 0, 0, 0, 0, 
+  0, 0, 607, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 51, 503, 505, 504, 0, 52, 0, 0, 
+  0, 0, 226, 0, 0, 0, 0, 0, 43, 54, 
+  32, 210, 0, 0, 40, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 29, 30, 
+  31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 0, 0, 0, 38, 0, 39, 
+  41, 42, 0, 0, 44, 0, 0, 0, 46, 0, 
+  47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 51, 48, 50, 49, 0, 52, 0, 53, 
+  0, 55, 0, 56, 0, 0, 0, 0, 43, 54, 
+  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, -119, 0, 
   0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
   0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
   34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
   0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
-  0, 0, 45, 0, 46, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 50, 47, 49, 48, 
-  0, 51, 0, 52, 0, 54, 270, 55, 0, 0, 
-  0, 0, 43, 53, 32, 0, 0, 0, 40, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
-  0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 
-  216, 0, 0, 566, 567, 0, 37, 0, 0, 0, 
-  38, 0, 39, 41, 42, 0, 0, 44, 0, 0, 
-  0, 45, 0, 46, 0, 0, 0, 0, 0, 0, 
-  0, 220, 0, 0, 0, 50, 47, 49, 48, 0, 
-  51, 0, 52, 0, 54, 0, 55, 0, 0, 0, 
-  0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  474, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 45, 0, 46, 0, 0, 475, 0, 
-  0, 0, 0, 0, 0, 0, 0, 50, 47, 49, 
-  48, 0, 51, 0, 52, 0, 54, 0, 55, 0, 
-  0, 0, 0, 43, 53, 32, 0, 0, 0, 40, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 474, 0, 0, 29, 30, 31, 0, 0, 
+  0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 51, 48, 50, 49, 
+  0, 52, 0, 53, 0, 55, 0, 56, 0, 0, 
+  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
+  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
+  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
+  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
+  0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 51, 48, 50, 49, 
+  0, 52, 0, 53, 0, 55, 271, 56, 0, 0, 
+  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
+  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
+  34, 217, 0, 0, 568, 569, 0, 37, 0, 0, 
+  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
+  0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
+  0, 0, 221, 0, 0, 0, 51, 48, 50, 49, 
+  0, 52, 0, 53, 0, 55, 0, 56, 0, 0, 
+  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
+  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, 475, 0, 0, 29, 30, 31, 0, 0, 
   0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
   0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
   37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
-  0, 44, 0, 0, 0, 45, 0, 46, 0, 0, 
-  480, 0, 0, 0, 0, 0, 0, 0, 0, 50, 
-  47, 49, 48, 0, 51, 0, 52, 0, 54, 0, 
-  55, 0, 0, 0, 0, 43, 53, 32, 0, 0, 
-  0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 482, 0, 0, 29, 30, 31, 
-  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
-  0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 
-  36, 0, 37, 0, 0, 0, 38, 0, 39, 41, 
-  42, 0, 0, 44, 0, 0, 0, 45, 0, 46, 
-  0, 0, 485, 0, 0, 0, 0, 0, 0, 0, 
-  0, 50, 47, 49, 48, 0, 51, 0, 52, 0, 
-  54, 0, 55, 0, 0, 0, 0, 43, 53, 32, 
-  0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 482, 0, 0, 29, 
-  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
-  33, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
-  0, 35, 36, 0, 37, 0, 0, 0, 38, 0, 
-  39, 41, 42, 0, 0, 44, 0, 0, 0, 45, 
-  0, 46, 0, 0, 483, 0, 0, 0, 0, 0, 
-  0, 0, 0, 50, 47, 49, 48, 0, 51, 0, 
-  52, 0, 54, 0, 55, 0, 0, 0, 0, 43, 
-  53, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 108, 109, 
-  110, 0, 0, 112, 114, 115, 0, 0, 116, 0, 
-  117, 0, 0, 0, 119, 120, 121, 0, 0, 0, 
-  0, 0, 0, 34, 122, 123, 124, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 125, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 
-  47, 49, 48, 129, 130, 131, 0, 133, 134, 135, 
-  136, 137, 138, 0, 0, 126, 132, 118, 111, 113, 
-  127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 108, 109, 110, 0, 0, 112, 
-  114, 115, 0, 0, 116, 0, 117, 0, 0, 0, 
-  119, 120, 121, 0, 0, 0, 0, 0, 0, 392, 
-  122, 123, 124, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 125, 0, 0, 0, 393, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 
-  0, 0, 0, 0, 0, 397, 394, 396, 0, 129, 
-  130, 131, 0, 133, 134, 135, 136, 137, 138, 0, 
-  0, 126, 132, 118, 111, 113, 127, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  108, 109, 110, 0, 0, 112, 114, 115, 0, 0, 
-  116, 0, 117, 0, 0, 0, 119, 120, 121, 0, 
-  0, 0, 0, 0, 0, 392, 122, 123, 124, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 125, 
-  0, 0, 0, 393, 0, 0, 0, 0, 0, 0, 
-  0, 395, 0, 0, 0, 128, 0, 0, 0, 0, 
-  0, 397, 394, 396, 0, 129, 130, 131, 0, 133, 
-  134, 135, 136, 137, 138, 0, 0, 126, 132, 118, 
-  111, 113, 127, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 208, 0, 0, 0, 
-  0, 210, 0, 29, 30, 31, 212, 0, 0, 0, 
-  0, 0, 0, 213, 33, 0, 0, 0, 0, 0, 
-  0, 215, 216, 0, 0, 217, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 45, 0, 46, 0, 0, 0, 0, 
-  0, 219, 0, 220, 0, 0, 0, 50, 218, 221, 
-  48, 222, 51, 223, 52, 224, 54, 225, 55, 226, 
-  227, 0, 0, 43, 53, 32, 209, 211, 0, 40, 
+  0, 44, 0, 0, 0, 46, 0, 47, 0, 0, 
+  476, 0, 0, 0, 0, 0, 0, 0, 0, 51, 
+  48, 50, 49, 0, 52, 0, 53, 0, 55, 0, 
+  56, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
+  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 0, 0, 483, 0, 0, 29, 30, 
+  31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 0, 0, 0, 38, 0, 39, 
+  41, 42, 0, 0, 44, 0, 0, 0, 46, 0, 
+  47, 0, 0, 484, 0, 0, 0, 0, 0, 0, 
+  0, 0, 51, 48, 50, 49, 0, 52, 0, 53, 
+  0, 55, 0, 56, 0, 0, 0, 0, 43, 54, 
+  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 483, 0, 
+  0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
+  0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 
+  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
+  38, 0, 39, 41, 42, 0, 0, 44, 0, 0, 
+  0, 46, 0, 47, 0, 0, 486, 0, 0, 0, 
+  0, 0, 0, 0, 0, 51, 48, 50, 49, 0, 
+  52, 0, 53, 0, 55, 0, 56, 0, 0, 0, 
+  0, 43, 54, 32, 0, 0, 0, 40, 0, 0, 
+  0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
+  0, 475, 0, 0, 29, 30, 31, 0, 0, 0, 
+  0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 
+  0, 0, 34, 0, 0, 0, 35, 36, 0, 37, 
+  0, 0, 0, 38, 0, 39, 41, 42, 0, 0, 
+  44, 0, 0, 0, 46, 0, 47, 0, 0, 481, 
+  0, 0, 0, 0, 0, 0, 0, 0, 51, 48, 
+  50, 49, 0, 52, 0, 53, 0, 55, 0, 56, 
+  0, 0, 0, 0, 43, 54, 32, 0, 0, 0, 
+  40, 0, 0, 0, 0, 45, 0, 0, 0, 0, 
+  0, 0, 0, 0, 109, 110, 111, 0, 0, 113, 
+  115, 116, 0, 0, 117, 0, 118, 0, 0, 0, 
+  120, 121, 122, 0, 0, 0, 0, 0, 0, 393, 
+  123, 124, 125, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 126, 0, 0, 0, 394, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 129, 
+  0, 0, 0, 0, 0, 398, 395, 397, 0, 130, 
+  131, 132, 0, 134, 135, 136, 137, 138, 139, 0, 
+  0, 127, 133, 119, 112, 114, 128, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 208, 0, 0, 0, 0, 210, 0, 29, 
-  30, 31, 212, 0, 0, 0, 0, 0, 0, 213, 
-  214, 0, 0, 0, 0, 0, 0, 215, 216, 0, 
-  0, 217, 36, 0, 37, 0, 0, 0, 38, 0, 
-  39, 41, 42, 0, 0, 44, 0, 0, 0, 45, 
-  0, 46, 0, 0, 0, 0, 0, 219, 0, 220, 
-  0, 0, 0, 50, 218, 221, 48, 222, 51, 223, 
-  52, 224, 54, 225, 55, 226, 227, 0, 0, 43, 
-  53, 32, 209, 211, 0, 40, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 569, 109, 
-  110, 0, 0, 571, 114, 573, 30, 31, 574, 0, 
-  117, 0, 0, 0, 119, 576, 577, 0, 0, 0, 
-  0, 0, 0, 578, 579, 123, 124, 217, 36, 0, 
-  37, 0, 0, 0, 38, 0, 39, 580, 42, 0, 
-  0, 582, 0, 0, 0, 45, 0, 46, 0, 0, 
-  0, 0, 0, 584, 0, 220, 0, 0, 0, 586, 
-  583, 585, 48, 587, 588, 589, 52, 591, 592, 593, 
-  594, 595, 596, 0, 0, 581, 590, 575, 570, 572, 
-  127, 40, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 360, 109, 110, 0, 0, 362, 
-  114, 364, 30, 31, 365, 0, 117, 0, 0, 0, 
-  119, 367, 368, 0, 0, 0, 0, 0, 0, 369, 
-  370, 123, 124, 217, 36, 0, 37, 0, 0, 0, 
-  38, 0, 39, 371, 42, 0, 0, 373, 0, 0, 
-  0, 45, 0, 46, 0, -263, 0, 0, 0, 375, 
-  0, 220, 0, 0, 0, 377, 374, 376, 48, 378, 
-  379, 380, 52, 382, 383, 384, 385, 386, 387, 0, 
-  0, 372, 381, 366, 361, 363, 127, 40, 0, 0, 
+  0, 109, 110, 111, 0, 0, 113, 115, 116, 0, 
+  0, 117, 0, 118, 0, 0, 0, 120, 121, 122, 
+  0, 0, 0, 0, 0, 0, 34, 123, 124, 125, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 129, 0, 0, 0, 
+  0, 0, 0, 48, 50, 49, 130, 131, 132, 0, 
+  134, 135, 136, 137, 138, 139, 0, 0, 127, 133, 
+  119, 112, 114, 128, 0, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 109, 110, 
+  111, 0, 0, 113, 115, 116, 0, 0, 117, 0, 
+  118, 0, 0, 0, 120, 121, 122, 0, 0, 0, 
+  0, 0, 0, 393, 123, 124, 125, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 126, 0, 0, 
+  0, 394, 0, 0, 0, 0, 0, 0, 0, 396, 
+  0, 0, 0, 129, 0, 0, 0, 0, 0, 398, 
+  395, 397, 0, 130, 131, 132, 0, 134, 135, 136, 
+  137, 138, 139, 0, 0, 127, 133, 119, 112, 114, 
+  128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 209, 0, 0, 0, 0, 
+  211, 0, 29, 30, 31, 213, 0, 0, 0, 0, 
+  0, 0, 214, 215, 0, 0, 0, 0, 0, 0, 
+  216, 217, 0, 0, 218, 36, 0, 37, 0, 0, 
+  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
+  0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
+  220, 0, 221, 0, 0, 0, 51, 219, 222, 49, 
+  223, 52, 224, 53, 225, 55, 226, 56, 227, 228, 
+  0, 0, 43, 54, 32, 210, 212, 0, 40, 0, 
+  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, 209, 0, 0, 0, 0, 211, 0, 29, 
+  30, 31, 213, 0, 0, 0, 0, 0, 0, 214, 
+  33, 0, 0, 0, 0, 0, 0, 216, 217, 0, 
+  0, 218, 36, 0, 37, 0, 0, 0, 38, 0, 
+  39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
+  0, 47, 0, 0, 0, 0, 0, 220, 0, 221, 
+  0, 0, 0, 51, 219, 222, 49, 223, 52, 224, 
+  53, 225, 55, 226, 56, 227, 228, 0, 0, 43, 
+  54, 32, 210, 212, 0, 40, 0, 0, 0, 0, 
+  45, 0, 0, 0, 0, 0, 0, 0, 0, 571, 
+  110, 111, 0, 0, 573, 115, 575, 30, 31, 576, 
+  0, 118, 0, 0, 0, 120, 578, 579, 0, 0, 
+  0, 0, 0, 0, 580, 581, 124, 125, 218, 36, 
+  0, 37, 0, 0, 0, 38, 0, 39, 582, 42, 
+  0, 0, 584, 0, 0, 0, 46, 0, 47, 0, 
+  0, 0, 0, 0, 586, 0, 221, 0, 0, 0, 
+  588, 585, 587, 49, 589, 590, 591, 53, 593, 594, 
+  595, 596, 597, 598, 0, 0, 583, 592, 577, 572, 
+  574, 128, 40, 0, 0, 0, 0, 45, 0, 0, 
+  0, 0, 0, 0, 0, 0, 361, 110, 111, 0, 
+  0, 363, 115, 365, 30, 31, 366, 0, 118, 0, 
+  0, 0, 120, 368, 369, 0, 0, 0, 0, 0, 
+  0, 370, 371, 124, 125, 218, 36, 0, 37, 0, 
+  0, 0, 38, 0, 39, 372, 42, 0, 0, 374, 
+  0, 0, 0, 46, 0, 47, 0, -265, 0, 0, 
+  0, 376, 0, 221, 0, 0, 0, 378, 375, 377, 
+  49, 379, 380, 381, 53, 383, 384, 385, 386, 387, 
+  388, 0, 0, 373, 382, 367, 362, 364, 128, 40, 
+  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
+  0, 0, 0, 
 
-  541, 310, 460, 513, 538, 518, 525, 308, 249, 632, 
-  306, 181, 252, 618, 149, 16, 623, 495, 319, 497, 
-  629, 357, 496, 435, 471, 553, 557, 486, 438, 301, 
-  428, 237, 350, 352, 604, 521, 242, 424, 550, 552, 
-  181, 301, 185, 237, 242, 343, 432, 348, 338, 249, 
-  459, 237, 453, 449, 236, 242, 446, 181, 466, 401, 
-  448, 249, 357, 455, 444, 457, 346, 337, 357, 484, 
-  142, 236, 147, 333, 438, 175, 301, 335, 187, 409, 
-  162, 145, 435, 416, 435, 139, 170, 399, 414, 481, 
-  438, 389, 0, 168, 0, 0, 403, 357, 403, 59, 
-  357, 490, 301, 534, 391, 0, 0, 0, 301, 0, 
-  0, 460, 0, 145, 59, 0, 179, 403, 177, 59, 
-  59, 488, 489, 0, 404, 105, 404, 0, 59, 185, 
-  451, 59, 59, 450, 59, 59, 59, 59, 59, 283, 
-  284, 59, 287, 285, 145, 404, 286, 107, 167, 406, 
-  164, 59, 59, 451, 450, 265, 59, 59, 301, 59, 
-  269, 68, 96, 95, 479, 59, 59, 331, 478, 59, 
-  87, 76, 59, 329, 59, 97, 434, 83, 89, 431, 
-  59, 470, 59, 59, 59, 94, 88, 59, 93, 92, 
-  59, 59, 90, 59, 59, 91, 493, 59, 59, 71, 
-  67, 59, 59, 491, 492, 99, 59, 101, 179, 319, 
-  301, 59, 59, 340, 69, 60, 59, 59, 450, 66, 
-  59, 59, 451, 304, 105, 499, 269, 297, 297, 297, 
-  59, 59, 269, 269, 269, 269, 269, 0, 315, 272, 
-  498, 508, 294, 0, 0, 0, 107, 174, 59, 325, 
-  318, 316, 297, 269, 59, 290, 0, 269, 297, 269, 
-  0, 59, 0, 269, 59, 0, 269, 292, 59, 269, 
-  179, 277, 59, 0, 299, 302, 312, 269, 59, 288, 
-  296, 328, 609, 269, 499, 289, 597, 633, 606, 599, 
-  499, 600, 565, 600, 0, 0, 499, 0, 0, 568, 
-  561, 562, 563, 564, 0, 498, 508, 0, 471, 0, 
-  0, 498, 508, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  499, 0, 0, 603, 0, 0, 0, 600, 0, 0, 
+  497, 496, 539, 514, 498, 186, 461, 16, 320, 526, 
+  535, 622, 633, 250, 243, 309, 238, 436, 522, 606, 
+  487, 182, 302, 472, 439, 253, 358, 307, 627, 542, 
+  150, 636, 519, 551, 613, 553, 182, 250, 554, 456, 
+  250, 402, 558, 238, 143, 243, 458, 447, 349, 243, 
+  351, 467, 449, 353, 450, 460, 238, 445, 237, 410, 
+  415, 439, 176, 358, 188, 302, 417, 182, 429, 436, 
+  433, 148, 425, 454, 358, 237, 336, 171, 338, 334, 
+  392, 390, 400, 302, 436, 169, 439, 140, 347, 339, 
+  163, 146, 344, 358, 461, 482, 358, 0, 404, 485, 
+  480, 302, 311, 0, 479, 302, 0, 106, 0, 0, 
+  500, 302, 60, 0, 180, 0, 320, 612, 146, 60, 
+  186, 0, 60, 407, 288, 0, 405, 287, 302, 108, 
+  0, 60, 60, 60, 60, 88, 89, 60, 286, 60, 
+  60, 90, 451, 60, 0, 77, 100, 60, 285, 69, 
+  60, 146, 452, 266, 60, 60, 178, 60, 270, 284, 
+  0, 60, 60, 67, 471, 60, 305, 451, 97, 165, 
+  332, 0, 432, 168, 60, 435, 330, 60, 0, 452, 
+  98, 60, 60, 180, 60, 60, 60, 493, 329, 91, 
+  60, 84, 102, 303, 60, 60, 96, 70, 61, 60, 
+  60, 494, 452, 60, 341, 451, 60, 60, 68, 180, 
+  404, 60, 60, 404, 491, 60, 93, 489, 60, 60, 
+  60, 490, 60, 94, 60, 92, 492, 106, 60, 298, 
+  72, 298, 500, 270, 270, 605, 270, 298, 405, 602, 
+  298, 405, 270, 313, 0, 270, 0, 60, 0, 108, 
+  175, 319, 270, 297, 500, 0, 0, 637, 60, 326, 
+  293, 602, 317, 270, 0, 60, 0, 60, 60, 295, 
+  270, 60, 270, 95, 291, 0, 270, 0, 290, 60, 
+  60, 0, 316, 60, 270, 270, 289, 278, 270, 298, 
+  599, 611, 273, 601, 270, 608, 0, 602, 567, 500, 
+  0, 0, 0, 500, 0, 570, 563, 564, 565, 566, 
+  0, 300, 472, 0, 499, 509, 0, 0, 499, 509, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 499, 509, 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, 
@@ -639,136 +653,147 @@ const short QDeclarativeJSGrammar::action_info [] = {
   0, 0, 0};
 
 const short QDeclarativeJSGrammar::action_check [] = {
-  7, 7, 36, 90, 7, 29, 36, 7, 36, 7, 
-  33, 8, 7, 7, 36, 7, 90, 7, 0, 7, 
-  16, 60, 55, 33, 8, 29, 7, 36, 7, 55, 
-  79, 48, 1, 7, 55, 2, 7, 17, 37, 7, 
-  33, 60, 29, 7, 33, 7, 66, 33, 33, 7, 
-  66, 29, 7, 36, 20, 7, 7, 29, 33, 36, 
-  36, 24, 5, 36, 5, 7, 36, 5, 1, 60, 
-  7, 36, 7, 2, 79, 2, 33, 8, 8, 7, 
-  1, 7, 36, 36, 8, 1, 36, -1, 8, 36, 
-  -1, 2, 36, 8, 55, 7, -1, -1, -1, 17, 
-  60, 60, 48, 48, 60, 7, -1, 55, 8, -1, 
-  33, 36, 61, 6, 48, -1, 33, 15, 8, 10, 
-  8, 60, 36, 36, 7, 8, 8, 20, 8, 61, 
-  8, 33, 8, -1, 8, 40, 34, 77, 60, 8, 
-  8, 8, 61, 79, 50, -1, 51, 50, 54, 8, 
-  60, 54, 61, 62, 61, 62, 56, 61, 62, 40, 
-  61, 62, 61, 62, 55, 40, 56, 61, 62, 12, 
-  51, 42, 60, 15, 61, 62, 51, 7, 60, -1, 
-  60, 8, 53, 61, 60, 31, 60, 40, 56, 61, 
-  62, 60, 34, 60, 29, 61, 62, 56, 51, 61, 
-  62, 61, 62, 25, 25, 27, 27, 8, 25, 25, 
-  27, 27, 12, 25, 57, 27, 38, 38, 29, 29, 
-  63, 38, 38, 25, 15, 27, 38, 12, 25, -1, 
-  27, 61, 62, 8, 61, 62, 38, 25, 8, 27, 
-  75, 38, 25, 34, 27, 36, 25, 15, 27, 8, 
-  38, 86, 61, 62, 8, 38, 25, 57, 27, 38, 
-  61, 62, 15, 63, 75, 75, 34, 29, 36, 38, 
-  36, 29, 57, 8, 29, 86, 86, 25, 63, 27, 
-  7, 34, 91, 36, 29, -1, 61, 62, -1, -1, 
-  38, 61, 62, -1, -1, 61, 62, 25, -1, 27, 
-  47, -1, 61, 62, 29, -1, 60, -1, -1, -1, 
-  38, 18, 19, 75, 61, 62, 29, 75, -1, 29, 
-  75, 66, 67, 68, 86, -1, 61, 62, 86, 15, 
-  -1, 86, 29, -1, 61, 62, 18, 19, 45, 46, 
-  29, 66, 67, 68, 91, 29, 15, 33, 34, 29, 
-  36, -1, 29, 66, 67, 68, 66, 67, 68, 29, 
-  -1, -1, 29, 45, 46, 34, 29, 36, -1, 66, 
-  67, 68, 29, -1, 15, 29, -1, 66, 67, 68, 
-  -1, -1, 66, 67, 68, -1, 66, 67, 68, 66, 
-  67, 68, 33, 34, -1, 36, 66, 67, 68, 66, 
-  67, 68, -1, 66, 67, 68, 23, 24, -1, 66, 
-  67, 68, 66, 67, 68, 32, 23, 24, 35, -1, 
-  37, -1, -1, 29, -1, 32, 29, -1, 35, 29, 
-  37, 18, 19, 36, 23, 24, 36, 29, -1, -1, 
-  -1, -1, -1, 32, -1, -1, 35, -1, 37, 29, 
-  -1, -1, -1, -1, -1, 61, 62, -1, 45, 46, 
-  66, 67, 68, 66, 67, 68, 66, 67, 68, 61, 
-  62, 23, 24, 29, 66, 67, 68, -1, -1, 31, 
-  32, 61, 62, 35, -1, 37, 66, 67, 68, 23, 
-  24, 29, -1, -1, -1, -1, -1, 31, 32, -1, 
-  -1, 35, -1, 37, -1, 61, 62, 23, 24, 29, 
+  36, 55, 33, 36, 36, 7, 7, 60, 7, 36, 
+  36, 7, 7, 36, 7, 29, 16, 55, 7, 90, 
+  33, 7, 7, 7, 33, 55, 7, 24, 36, 7, 
+  7, 60, 7, 37, 7, 29, 60, 29, 36, 7, 
+  7, 17, 33, 33, 7, 5, 29, 66, 36, 7, 
+  5, 33, 5, 60, 8, 66, 36, 7, 29, 33, 
+  7, 33, 7, 20, 2, 8, 36, 36, 55, 33, 
+  7, 17, 33, 7, 36, 8, 55, 8, 2, 8, 
+  7, 7, 48, 2, 7, 36, 1, 90, 0, 2, 
+  8, 8, 1, -1, 36, 60, 36, 36, 33, 48, 
+  36, 60, 8, 31, 36, 61, 6, 8, 60, 7, 
+  8, 15, -1, -1, 10, -1, 8, 61, -1, -1, 
+  20, -1, -1, -1, -1, -1, 48, 8, 15, -1, 
+  34, 79, 48, 8, 42, 60, 77, 40, 8, 60, 
+  50, 61, 8, 8, 54, 53, 8, 34, 51, 79, 
+  61, 62, -1, 8, 60, 56, 61, 62, 1, 55, 
+  8, 40, 61, 62, 56, 79, 61, 62, 61, 62, 
+  61, 62, 51, 61, 62, 56, 40, 61, 62, 61, 
+  62, 56, 50, 8, 40, 8, 54, 51, 61, 62, 
+  60, 12, 61, 62, 60, 51, 61, 25, 60, 27, 
+  8, 25, 29, 27, -1, 60, 25, 25, 27, 27, 
+  38, 12, 60, 25, 38, 27, 25, 8, 27, 38, 
+  38, 36, 29, 8, -1, -1, 38, 7, 25, 38, 
+  27, 25, 25, 27, 27, 60, 57, 7, 61, 62, 
+  8, 38, 63, 29, 38, 38, 61, 62, 75, 8, 
+  25, 29, 27, 61, 62, 29, 57, -1, 8, 86, 
+  12, -1, 63, 38, 15, 61, 62, 25, 75, 27, 
+  61, 62, -1, 29, -1, -1, 61, 62, -1, 86, 
+  38, 61, 62, 34, -1, 36, 25, -1, 27, 75, 
+  -1, 61, 62, 61, 62, 91, 15, 75, -1, 38, 
+  86, 75, 61, 62, 15, 57, -1, 15, 86, -1, 
+  60, 63, 86, 18, 19, 34, 25, 36, 27, 75, 
+  18, 19, 47, 34, 15, 36, 34, -1, 36, 38, 
+  86, 15, 18, 19, 29, -1, 61, 62, -1, -1, 
+  45, 46, 33, 34, -1, 36, 29, 45, 46, 33, 
+  34, 7, 36, 18, 19, 23, 24, 29, -1, 45, 
+  46, -1, 29, -1, 32, 29, 91, 35, 29, 37, 
+  -1, 66, 67, 68, 29, -1, -1, 33, 29, -1, 
+  45, 46, -1, 66, 67, 68, 93, 94, 95, 96, 
+  97, 98, -1, -1, 66, 67, 68, 92, -1, 66, 
+  67, 68, 66, 67, 68, 66, 67, 68, -1, 92, 
+  29, 66, 67, 68, 29, 66, 67, 68, 23, 24, 
+  92, -1, -1, 29, -1, 92, 29, 32, 92, 29, 
+  35, 92, 37, 29, -1, -1, 92, 92, -1, -1, 
+  -1, 92, -1, 29, -1, 23, 24, 66, 67, 68, 
+  36, 66, 67, 68, 32, -1, -1, 35, -1, 37, 
+  66, 67, 68, 66, 67, 68, 66, 67, 68, -1, 
+  66, 67, 68, 92, -1, -1, -1, 92, -1, -1, 
+  66, 67, 68, 29, -1, -1, 92, -1, -1, 92, 
+  23, 24, 92, -1, -1, -1, 92, -1, 31, 32, 
+  23, 24, 35, 29, 37, -1, 92, -1, 31, 32, 
+  36, 29, 35, -1, 37, 61, 62, 23, 24, 29, 
   66, 67, 68, 23, 24, 31, 32, -1, -1, 35, 
-  -1, 37, 32, 61, 62, 35, -1, 37, 66, 67, 
-  68, 92, 93, 94, 95, 96, 97, -1, -1, 3, 
-  -1, 61, 62, -1, -1, -1, 66, 67, 68, 13, 
-  -1, -1, -1, 17, -1, -1, -1, 3, -1, -1, 
-  -1, -1, 26, -1, 28, -1, -1, 13, -1, -1, 
-  -1, 17, -1, -1, -1, 39, -1, 41, 42, -1, 
-  26, -1, 28, -1, -1, 49, -1, -1, 52, 53, 
-  23, 24, -1, 39, 58, 41, 42, -1, 31, 32, 
-  64, -1, 35, 49, 37, -1, 52, 53, -1, -1, 
-  -1, -1, 58, -1, -1, -1, 80, -1, 64, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 12, 
-  13, -1, -1, -1, 80, -1, -1, -1, -1, 22, 
+  29, 37, 32, -1, -1, 35, -1, 37, -1, -1, 
+  66, 67, 68, 61, 62, -1, 92, -1, 66, 67, 
+  68, 61, 62, 29, -1, -1, 66, 67, 68, -1, 
+  -1, -1, 61, 62, -1, -1, 92, 66, 67, 68, 
+  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
+  -1, -1, 92, -1, -1, 61, 62, 29, -1, -1, 
+  66, 67, 68, 92, -1, -1, -1, -1, -1, -1, 
+  -1, 23, 24, -1, -1, -1, -1, 3, -1, 31, 
+  32, -1, -1, 35, -1, 37, 92, 13, -1, 61, 
+  62, 17, -1, -1, 66, 67, 68, -1, -1, -1, 
+  26, -1, 28, -1, -1, 31, -1, -1, -1, -1, 
+  -1, -1, -1, 39, -1, 41, 42, -1, -1, -1, 
+  92, -1, -1, 49, -1, -1, 52, 53, -1, -1, 
+  -1, -1, 58, -1, -1, -1, 12, 13, 64, -1, 
+  -1, -1, -1, -1, -1, -1, 22, -1, -1, 3, 
+  -1, -1, -1, 29, 80, -1, -1, 33, 34, 13, 
+  36, -1, -1, 17, -1, -1, -1, 43, -1, -1, 
+  -1, 47, 26, -1, 28, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 39, -1, 41, 42, 65, 
+  66, 67, 68, -1, 70, 49, -1, -1, 52, 53, 
+  -1, -1, -1, -1, 58, 81, 82, 83, -1, -1, 
+  64, 87, -1, -1, -1, -1, 92, -1, -1, 12, 
+  13, -1, -1, -1, -1, -1, 80, -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, 3, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, 
-  -1, 17, 65, 66, 67, 68, -1, 70, -1, -1, 
-  26, -1, 28, -1, -1, 31, -1, -1, 81, 82, 
-  83, -1, -1, 39, 87, 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, 
+  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, 68, -1, 70, 43, -1, 
+  -1, -1, 47, -1, -1, -1, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
+  65, 66, 67, 68, -1, 70, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 81, 82, 83, -1, 
+  -1, -1, 87, -1, -1, -1, -1, 92, -1, -1, 
   -1, -1, -1, -1, -1, -1, 12, 13, -1, -1, 
-  -1, -1, -1, -1, 80, -1, 22, -1, -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, 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, 68, -1, 70, 43, -1, -1, -1, 47, 
+  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, 68, -1, 70, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, -1, 65, 66, 67, 
-  68, -1, 70, -1, 10, -1, 12, 13, -1, -1, 
-  -1, -1, -1, 81, 82, 83, 22, -1, -1, 87, 
-  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
-  36, -1, 12, 13, -1, -1, -1, 43, -1, -1, 
-  -1, 47, 22, -1, -1, -1, -1, -1, -1, 29, 
-  -1, -1, -1, 33, 34, -1, 36, -1, -1, 65, 
-  66, 67, 68, 43, 70, -1, -1, 47, -1, 75, 
-  -1, -1, -1, -1, -1, 81, 82, 83, 84, -1, 
-  -1, 87, -1, -1, -1, 65, 66, 67, 68, -1, 
-  70, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
-  -1, -1, -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, 68, -1, 
-  70, -1, -1, -1, -1, 75, -1, -1, -1, -1, 
-  -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, 
-  -1, -1, -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, 68, -1, 
-  70, -1, -1, -1, -1, 75, -1, -1, -1, -1, 
-  -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, 
-  -1, -1, -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, 68, -1, 70, 
-  -1, 72, -1, 74, -1, 76, -1, -1, -1, -1, 
-  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
-  -1, -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, 
-  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
-  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
+  -1, 87, -1, -1, -1, -1, 92, -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, 
+  65, 66, 67, 68, -1, 70, -1, -1, -1, -1, 
+  75, -1, -1, -1, -1, -1, 81, 82, 83, 84, 
+  -1, -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, -1, -1, 
+  -1, 75, -1, -1, -1, -1, -1, 81, 82, 83, 
+  84, -1, -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, -1, 
+  -1, -1, 75, -1, -1, -1, -1, -1, 81, 82, 
+  83, 84, -1, -1, 87, -1, -1, -1, -1, 92, 
+  -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, 68, -1, 70, -1, 72, 
+  -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
+  -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, 68, 
+  -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, 
+  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
+  -1, -1, -1, 92, -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, 
@@ -777,25 +802,16 @@ const short QDeclarativeJSGrammar::action_check [] = {
   -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
   -1, 70, -1, 72, -1, 74, 75, 76, -1, -1, 
   -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
-  -1, -1, -1, -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, 68, -1, 
-  70, -1, 72, -1, 74, -1, 76, -1, -1, -1, 
-  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  8, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
-  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
-  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
-  -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
-  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
-  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 92, -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, 68, 
+  -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, 
+  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
+  -1, -1, -1, 92, -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, 
@@ -804,35 +820,35 @@ const short QDeclarativeJSGrammar::action_check [] = {
   56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
   66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
   76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 8, -1, -1, 11, 12, 13, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
-  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
-  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
-  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
-  -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 
-  74, -1, 76, -1, -1, -1, -1, 81, 82, 83, 
-  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 8, -1, -1, 11, 
-  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
-  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
-  -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
-  42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
-  -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
-  72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
-  82, 83, -1, -1, -1, 87, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 59, -1, -1, -1, -1, -1, -1, 
-  66, 67, 68, 69, 70, 71, -1, 73, 74, 75, 
-  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
-  86, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, 72, 
+  -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
+  -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, 68, -1, 
+  70, -1, 72, -1, 74, -1, 76, -1, -1, -1, 
+  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
+  -1, -1, 92, -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, 68, -1, 70, -1, 72, -1, 74, -1, 76, 
+  -1, -1, -1, -1, 81, 82, 83, -1, -1, -1, 
+  87, -1, -1, -1, -1, 92, -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, 
@@ -843,25 +859,35 @@ const short QDeclarativeJSGrammar::action_check [] = {
   70, 71, -1, 73, 74, 75, 76, 77, 78, -1, 
   -1, 81, 82, 83, 84, 85, 86, -1, -1, -1, 
   -1, -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, -1, 69, 70, 71, -1, 73, 
-  74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
-  84, 85, 86, -1, -1, -1, -1, -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, 
-  78, -1, -1, 81, 82, 83, 84, 85, -1, 87, 
+  -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, 71, -1, 
+  73, 74, 75, 76, 77, 78, -1, -1, 81, 82, 
+  83, 84, 85, 86, -1, -1, -1, -1, -1, 92, 
+  -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, -1, 69, 70, 71, -1, 73, 74, 75, 
+  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
+  86, -1, -1, -1, -1, -1, -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, 78, 
+  -1, -1, 81, 82, 83, 84, 85, -1, 87, -1, 
+  -1, -1, -1, 92, -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, 
@@ -871,62 +897,63 @@ const short QDeclarativeJSGrammar::action_check [] = {
   -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 
   72, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
   82, 83, 84, 85, -1, 87, -1, -1, -1, -1, 
-  -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, 78, -1, -1, 81, 82, 83, 84, 85, 
-  86, 87, -1, -1, -1, -1, -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, 78, -1, 
-  -1, 81, 82, 83, 84, 85, 86, 87, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  92, -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, 78, -1, -1, 81, 82, 83, 84, 
+  85, 86, 87, -1, -1, -1, -1, 92, -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, 
+  78, -1, -1, 81, 82, 83, 84, 85, 86, 87, 
+  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 
 
-  3, 2, 15, 25, 25, 3, 25, 3, 2, 11, 
-  2, 15, 3, 13, 67, 3, 15, 104, 15, 2, 
-  15, 2, 4, 3, 35, 15, 15, 3, 21, 3, 
-  93, 15, 2, 2, 19, 13, 15, 96, 25, 25, 
-  15, 3, 15, 15, 15, 100, 3, 3, 15, 2, 
-  2, 15, 3, 21, 4, 15, 15, 15, 35, 2, 
-  21, 2, 2, 2, 98, 3, 2, 2, 2, 35, 
-  35, 4, 35, 2, 21, 3, 3, 3, 15, 2, 
-  35, 35, 3, 3, 3, 3, 35, 35, 2, 35, 
-  21, 35, -1, 35, -1, -1, 13, 2, 13, 44, 
-  2, 46, 3, 3, 36, -1, -1, -1, 3, -1, 
-  -1, 15, -1, 35, 44, -1, 46, 13, 40, 44, 
-  44, 46, 46, -1, 41, 15, 41, -1, 44, 15, 
-  46, 44, 44, 46, 44, 44, 44, 44, 44, 49, 
-  49, 44, 49, 49, 35, 41, 49, 37, 60, 40, 
-  58, 44, 44, 46, 46, 44, 44, 44, 3, 44, 
-  49, 46, 50, 50, 31, 44, 44, 68, 35, 44, 
-  48, 50, 44, 68, 44, 50, 81, 49, 48, 81, 
-  44, 85, 44, 44, 44, 49, 48, 44, 49, 49, 
-  44, 44, 49, 44, 44, 49, 46, 44, 44, 52, 
-  46, 44, 44, 46, 46, 56, 44, 54, 46, 15, 
-  3, 44, 44, 99, 47, 47, 44, 44, 46, 46, 
-  44, 44, 46, 68, 15, 13, 49, 44, 44, 44, 
-  44, 44, 49, 49, 49, 49, 49, -1, 61, 53, 
-  28, 29, 55, -1, -1, -1, 37, 38, 44, 66, 
-  66, 66, 44, 49, 44, 51, -1, 49, 44, 49, 
-  -1, 44, -1, 49, 44, -1, 49, 57, 44, 49, 
-  46, 51, 44, -1, 66, 68, 59, 49, 44, 51, 
-  66, 87, 5, 49, 13, 51, 13, 16, 5, 16, 
-  13, 20, 13, 20, -1, -1, 13, -1, -1, 20, 
-  21, 22, 23, 24, -1, 28, 29, -1, 35, -1, 
-  -1, 28, 29, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  13, -1, -1, 16, -1, -1, -1, 20, -1, -1, 
+  4, 104, 25, 25, 2, 15, 15, 3, 15, 25, 
+  3, 13, 15, 2, 15, 3, 15, 3, 13, 19, 
+  3, 15, 3, 35, 21, 3, 2, 2, 15, 3, 
+  67, 11, 3, 25, 19, 25, 15, 2, 15, 2, 
+  2, 2, 15, 15, 35, 15, 3, 15, 3, 15, 
+  2, 35, 21, 2, 21, 2, 15, 98, 4, 2, 
+  2, 21, 3, 2, 15, 3, 3, 15, 93, 3, 
+  3, 35, 96, 3, 2, 4, 3, 35, 2, 2, 
+  36, 35, 35, 3, 3, 35, 21, 3, 2, 15, 
+  35, 35, 100, 2, 15, 35, 2, -1, 13, 35, 
+  31, 3, 2, -1, 35, 3, -1, 15, -1, -1, 
+  13, 3, 44, -1, 46, -1, 15, 20, 35, 44, 
+  15, -1, 44, 40, 49, -1, 41, 49, 3, 37, 
+  -1, 44, 44, 44, 44, 48, 48, 44, 49, 44, 
+  44, 48, 46, 44, -1, 50, 56, 44, 49, 46, 
+  44, 35, 46, 44, 44, 44, 40, 44, 49, 49, 
+  -1, 44, 44, 46, 85, 44, 68, 46, 50, 58, 
+  68, -1, 81, 60, 44, 81, 68, 44, -1, 46, 
+  50, 44, 44, 46, 44, 44, 44, 46, 87, 49, 
+  44, 49, 54, 68, 44, 44, 50, 47, 47, 44, 
+  44, 46, 46, 44, 99, 46, 44, 44, 46, 46, 
+  13, 44, 44, 13, 46, 44, 49, 46, 44, 44, 
+  44, 46, 44, 49, 44, 49, 46, 15, 44, 44, 
+  52, 44, 13, 49, 49, 16, 49, 44, 41, 20, 
+  44, 41, 49, 59, -1, 49, -1, 44, -1, 37, 
+  38, 66, 49, 66, 13, -1, -1, 16, 44, 66, 
+  57, 20, 66, 49, -1, 44, -1, 44, 44, 55, 
+  49, 44, 49, 49, 51, -1, 49, -1, 51, 44, 
+  44, -1, 61, 44, 49, 49, 51, 51, 49, 44, 
+  13, 5, 53, 16, 49, 5, -1, 20, 13, 13, 
+  -1, -1, -1, 13, -1, 20, 21, 22, 23, 24, 
+  -1, 66, 35, -1, 28, 29, -1, -1, 28, 29, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  13, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 28, 29, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
index d6c3d6b..2da7946 100644
--- a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
@@ -61,10 +61,10 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeJSGrammar
 {
 public:
-  enum VariousConstants {
+  enum {
     EOF_SYMBOL = 0,
-    REDUCE_HERE = 99,
-    SHIFT_THERE = 98,
+    REDUCE_HERE = 100,
+    SHIFT_THERE = 99,
     T_AND = 1,
     T_AND_AND = 2,
     T_AND_EQ = 3,
@@ -90,12 +90,12 @@ public:
     T_EQ_EQ = 18,
     T_EQ_EQ_EQ = 19,
     T_FALSE = 83,
-    T_FEED_JS_EXPRESSION = 95,
-    T_FEED_JS_PROGRAM = 97,
-    T_FEED_JS_SOURCE_ELEMENT = 96,
-    T_FEED_JS_STATEMENT = 94,
-    T_FEED_UI_OBJECT_MEMBER = 93,
-    T_FEED_UI_PROGRAM = 92,
+    T_FEED_JS_EXPRESSION = 96,
+    T_FEED_JS_PROGRAM = 98,
+    T_FEED_JS_SOURCE_ELEMENT = 97,
+    T_FEED_JS_STATEMENT = 95,
+    T_FEED_UI_OBJECT_MEMBER = 94,
+    T_FEED_UI_PROGRAM = 93,
     T_FINALLY = 20,
     T_FOR = 21,
     T_FUNCTION = 22,
@@ -127,6 +127,7 @@ public:
     T_NOT_EQ_EQ = 46,
     T_NULL = 81,
     T_NUMERIC_LITERAL = 47,
+    T_ON = 92,
     T_OR = 48,
     T_OR_EQ = 49,
     T_OR_OR = 50,
@@ -163,15 +164,15 @@ public:
     T_XOR = 79,
     T_XOR_EQ = 80,
 
-    ACCEPT_STATE = 635,
-    RULE_COUNT = 343,
-    STATE_COUNT = 636,
-    TERMINAL_COUNT = 100,
+    ACCEPT_STATE = 639,
+    RULE_COUNT = 345,
+    STATE_COUNT = 640,
+    TERMINAL_COUNT = 101,
     NON_TERMINAL_COUNT = 106,
 
-    GOTO_INDEX_OFFSET = 636,
-    GOTO_INFO_OFFSET = 2520,
-    GOTO_CHECK_OFFSET = 2520
+    GOTO_INDEX_OFFSET = 640,
+    GOTO_INFO_OFFSET = 2643,
+    GOTO_CHECK_OFFSET = 2643
   };
 
   static const char  *const    spell [];
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp
index 384d00c..34163a4 100644
--- a/src/declarative/qml/parser/qdeclarativejslexer.cpp
+++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp
@@ -166,6 +166,8 @@ int Lexer::findReservedWord(const QChar *c, int size) const
             return QDeclarativeJSGrammar::T_IN;
         else if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('s'))
             return QDeclarativeJSGrammar::T_AS;
+        else if (c[0] == QLatin1Char('o') && c[1] == QLatin1Char('n'))
+            return QDeclarativeJSGrammar::T_ON;
     }   break;
 
     case 3: {
diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp
index 4aa4960..fd9e690 100644
--- a/src/declarative/qml/parser/qdeclarativejsparser.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp
@@ -356,7 +356,15 @@ case 32: {
     node->colonToken = loc(2);
     sym(1).Node = node;
 } break;
-case 33:case 34:case 35:case 36:
+
+case 33: {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(3).UiQualifiedId, sym(1).UiQualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    node->hasOnToken = true;
+    sym(1).Node = node;
+} break;
+case 34:case 35:case 36:case 37:
 {
     AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
         sym(1).UiQualifiedId, sym(3).Statement);
@@ -364,35 +372,35 @@ case 33:case 34:case 35:case 36:
     sym(1).Node = node;
 }   break;
 
-case 37:
+case 38:
 
-case 38: {
+case 39: {
     sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
     break;
 }
 
-case 40: {
+case 41: {
   sym(1).Node = 0;
 } break;
 
-case 41: {
+case 42: {
   sym(1).Node = sym(1).UiParameterList->finish ();
 } break;
 
-case 42: {
+case 43: {
   AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
   node->identifierToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 43: {
+case 44: {
   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 45: {
+case 46: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -403,7 +411,7 @@ case 45: {
     sym(1).Node = node;
 }   break;
 
-case 47: {
+case 48: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -413,7 +421,7 @@ case 47: {
     sym(1).Node = node;
 }   break;
 
-case 49: {
+case 50: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
     node->typeModifier = sym(2).sval;
     node->propertyToken = loc(1);
@@ -424,7 +432,7 @@ case 49: {
     sym(1).Node = node;
 }   break;
 
-case 51: {
+case 52: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -433,7 +441,7 @@ case 51: {
     sym(1).Node = node;
 }   break;
 
-case 53: {
+case 54: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
@@ -444,7 +452,7 @@ case 53: {
     sym(1).Node = node;
 }   break;
 
-case 55: {
+case 56: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
         sym(5).Expression);
     node->propertyToken = loc(1);
@@ -455,7 +463,7 @@ case 55: {
     sym(1).Node = node;
 }   break;
 
-case 57: {
+case 58: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
         sym(6).Expression);
     node->isReadonlyMember = true;
@@ -468,7 +476,7 @@ case 57: {
     sym(1).Node = node;
 }   break;
 
-case 59: {
+case 60: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
         sym(6).Expression);
     node->isDefaultMember = true;
@@ -481,75 +489,81 @@ case 59: {
     sym(1).Node = node;
 }   break;
 
-case 60: {
+case 61: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
 
-case 61: {
+case 62: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
 
-case 63: {
+case 64: {
     QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_PROPERTY]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 64: {
+case 65: {
     QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_SIGNAL]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 65: {
+case 66: {
     QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_READONLY]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 66: {
+case 67: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_READONLY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+
+case 68: {
   AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
   node->thisToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 67: {
+case 69: {
   AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 68: {
+case 70: {
   AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
   node->nullToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 69: {
+case 71: {
   AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
   node->trueToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 70: {
+case 72: {
   AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
   node->falseToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 71: {
+case 73: {
   AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
-case 72:
-case 73: {
+case 74:
+case 75: {
   AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 74: {
+case 76: {
   bool rx = lexer->scanRegExp(Lexer::NoPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -560,7 +574,7 @@ case 74: {
   sym(1).Node = node;
 } break;
 
-case 75: {
+case 77: {
   bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -571,28 +585,28 @@ case 75: {
   sym(1).Node = node;
 } break;
 
-case 76: {
+case 78: {
   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 77: {
+case 79: {
   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 78: {
+case 80: {
   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 79: {
+case 81: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     (AST::Elision *) 0);
   node->lbracketToken = loc(1);
@@ -601,7 +615,7 @@ case 79: {
   sym(1).Node = node;
 } break;
 
-case 80: {
+case 82: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     sym(4).Elision->finish());
   node->lbracketToken = loc(1);
@@ -610,7 +624,7 @@ case 80: {
   sym(1).Node = node;
 } break;
 
-case 81: {
+case 83: {
   AST::ObjectLiteral *node = 0;
   if (sym(2).Node)
     node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -622,7 +636,7 @@ case 81: {
   sym(1).Node = node;
 } break;
 
-case 82: {
+case 84: {
   AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
     sym(2).PropertyNameAndValueList->finish ());
   node->lbraceToken = loc(1);
@@ -630,14 +644,14 @@ case 82: {
   sym(1).Node = node;
 } break;
 
-case 83: {
+case 85: {
   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 84: {
+case 86: {
   if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
       QLatin1String("Ignored annotation")));
@@ -657,48 +671,48 @@ case 84: {
   }
 } break;
 
-case 85: {
+case 87: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
 } break;
 
-case 86: {
+case 88: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
 } break;
 
-case 87: {
+case 89: {
   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 88: {
+case 90: {
   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 89: {
+case 91: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
   node->commaToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 90: {
+case 92: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 91: {
+case 93: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyName, sym(3).Expression);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 92: {
+case 94: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
   node->commaToken = loc(2);
@@ -706,40 +720,36 @@ case 92: {
   sym(1).Node = node;
 } break;
 
-case 93: {
+case 95: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
-case 94:
-case 95: {
+case 96:
+case 97: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 96: {
+case 98: {
   AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 97: {
+case 99: {
   AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 98: {
+case 100: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 99:
-
-case 100:
-
 case 101:
 
 case 102:
@@ -797,25 +807,29 @@ case 127:
 case 128:
 
 case 129:
+
+case 130:
+
+case 131:
 {
   sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
 } break;
 
-case 134: {
+case 136: {
   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 135: {
+case 137: {
   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 136: {
+case 138: {
   AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
   node->newToken = loc(1);
   node->lparenToken = loc(3);
@@ -823,316 +837,309 @@ case 136: {
   sym(1).Node = node;
 } break;
 
-case 138: {
+case 140: {
   AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
   node->newToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 139: {
+case 141: {
   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 140: {
+case 142: {
   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 141: {
+case 143: {
   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 142: {
+case 144: {
   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 143: {
+case 145: {
   sym(1).Node = 0;
 } break;
 
-case 144: {
+case 146: {
   sym(1).Node = sym(1).ArgumentList->finish();
 } break;
 
-case 145: {
+case 147: {
   sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
 } break;
 
-case 146: {
+case 148: {
   AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 150: {
+case 152: {
   AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
   node->incrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 151: {
+case 153: {
   AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
   node->decrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 153: {
+case 155: {
   AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
   node->deleteToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 154: {
+case 156: {
   AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
   node->voidToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 155: {
+case 157: {
   AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
   node->typeofToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 156: {
+case 158: {
   AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
   node->incrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 157: {
+case 159: {
   AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
   node->decrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 158: {
+case 160: {
   AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
   node->plusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 159: {
+case 161: {
   AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
   node->minusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 160: {
+case 162: {
   AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
   node->tildeToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 161: {
+case 163: {
   AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
   node->notToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 163: {
+case 165: {
   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 164: {
+case 166: {
   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 165: {
+case 167: {
   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 167: {
+case 169: {
   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 168: {
+case 170: {
   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 170: {
+case 172: {
   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 171: {
+case 173: {
   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 172: {
+case 174: {
   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 174: {
+case 176: {
   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 175: {
+case 177: {
   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 176: {
+case 178: {
   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 177: {
+case 179: {
   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 178: {
+case 180: {
   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 179: {
+case 181: {
   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 181: {
+case 183: {
   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 182: {
+case 184: {
   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 183: {
+case 185: {
   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 184: {
+case 186: {
   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 185: {
+case 187: {
   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 189: {
   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 188: {
+case 190: {
   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 189: {
+case 191: {
   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 190: {
+case 192: {
   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 192: {
+case 194: {
   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 193: {
+case 195: {
   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 194: {
+case 196: {
   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 195: {
-  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 197: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
-    QSOperator::BitAnd, sym(3).Expression);
+    QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
@@ -1146,7 +1153,7 @@ case 199: {
 
 case 201: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
-    QSOperator::BitXor, sym(3).Expression);
+    QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
@@ -1160,7 +1167,7 @@ case 203: {
 
 case 205: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
-    QSOperator::BitOr, sym(3).Expression);
+    QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
@@ -1174,7 +1181,7 @@ case 207: {
 
 case 209: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
-    QSOperator::And, sym(3).Expression);
+    QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
@@ -1188,7 +1195,7 @@ case 211: {
 
 case 213: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
-    QSOperator::Or, sym(3).Expression);
+    QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
@@ -1201,6 +1208,13 @@ case 215: {
 } break;
 
 case 217: {
+  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 219: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1208,7 +1222,7 @@ case 217: {
   sym(1).Node = node;
 } break;
 
-case 219: {
+case 221: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1216,112 +1230,112 @@ case 219: {
   sym(1).Node = node;
 } break;
 
-case 221: {
+case 223: {
   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 223: {
+case 225: {
   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 224: {
+case 226: {
   sym(1).ival = QSOperator::Assign;
 } break;
 
-case 225: {
+case 227: {
   sym(1).ival = QSOperator::InplaceMul;
 } break;
 
-case 226: {
+case 228: {
   sym(1).ival = QSOperator::InplaceDiv;
 } break;
 
-case 227: {
+case 229: {
   sym(1).ival = QSOperator::InplaceMod;
 } break;
 
-case 228: {
+case 230: {
   sym(1).ival = QSOperator::InplaceAdd;
 } break;
 
-case 229: {
+case 231: {
   sym(1).ival = QSOperator::InplaceSub;
 } break;
 
-case 230: {
+case 232: {
   sym(1).ival = QSOperator::InplaceLeftShift;
 } break;
 
-case 231: {
+case 233: {
   sym(1).ival = QSOperator::InplaceRightShift;
 } break;
 
-case 232: {
+case 234: {
   sym(1).ival = QSOperator::InplaceURightShift;
 } break;
 
-case 233: {
+case 235: {
   sym(1).ival = QSOperator::InplaceAnd;
 } break;
 
-case 234: {
+case 236: {
   sym(1).ival = QSOperator::InplaceXor;
 } break;
 
-case 235: {
+case 237: {
   sym(1).ival = QSOperator::InplaceOr;
 } break;
 
-case 237: {
+case 239: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 238: {
+case 240: {
   sym(1).Node = 0;
 } break;
 
-case 241: {
+case 243: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 242: {
+case 244: {
   sym(1).Node = 0;
 } break;
 
-case 259: {
+case 261: {
   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 260: {
+case 262: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 261: {
+case 263: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
 } break;
 
-case 262: {
+case 264: {
   sym(1).Node = 0;
 } break;
 
-case 263: {
+case 265: {
   sym(1).Node = sym(1).StatementList->finish ();
 } break;
 
-case 265: {
+case 267: {
   AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
      sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
   node->declarationKindToken = loc(1);
@@ -1329,76 +1343,76 @@ case 265: {
   sym(1).Node = node;
 } break;
 
-case 266: {
+case 268: {
   sym(1).ival = T_CONST;
 } break;
 
-case 267: {
+case 269: {
   sym(1).ival = T_VAR;
 } break;
 
-case 268: {
+case 270: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 269: {
+case 271: {
   AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
     sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 270: {
+case 272: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 271: {
+case 273: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
 } break;
 
-case 272: {
+case 274: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 273: {
+case 275: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 274: {
+case 276: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 275: {
+case 277: {
   sym(1).Node = 0;
 } break;
 
-case 277: {
+case 279: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 278: {
+case 280: {
   sym(1).Node = 0;
 } break;
 
-case 280: {
+case 282: {
   AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
   node->semicolonToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 282: {
+case 284: {
   AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 283: {
+case 285: {
   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);
@@ -1407,7 +1421,7 @@ case 283: {
   sym(1).Node = node;
 } break;
 
-case 284: {
+case 286: {
   AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1415,7 +1429,7 @@ case 284: {
   sym(1).Node = node;
 } break;
 
-case 286: {
+case 288: {
   AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
   node->doToken = loc(1);
   node->whileToken = loc(3);
@@ -1425,7 +1439,7 @@ case 286: {
   sym(1).Node = node;
 } break;
 
-case 287: {
+case 289: {
   AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->whileToken = loc(1);
   node->lparenToken = loc(2);
@@ -1433,7 +1447,7 @@ case 287: {
   sym(1).Node = node;
 } break;
 
-case 288: {
+case 290: {
   AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Expression, sym(9).Statement);
   node->forToken = loc(1);
@@ -1444,7 +1458,7 @@ case 288: {
   sym(1).Node = node;
 } break;
 
-case 289: {
+case 291: {
   AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
      sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
      sym(8).Expression, sym(10).Statement);
@@ -1457,7 +1471,7 @@ case 289: {
   sym(1).Node = node;
 } break;
 
-case 290: {
+case 292: {
   AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Statement);
   node->forToken = loc(1);
@@ -1467,7 +1481,7 @@ case 290: {
   sym(1).Node = node;
 } break;
 
-case 291: {
+case 293: {
   AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
     sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
   node->forToken = loc(1);
@@ -1478,14 +1492,14 @@ case 291: {
   sym(1).Node = node;
 } break;
 
-case 293: {
+case 295: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
   node->continueToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 295: {
+case 297: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
   node->continueToken = loc(1);
   node->identifierToken = loc(2);
@@ -1493,14 +1507,14 @@ case 295: {
   sym(1).Node = node;
 } break;
 
-case 297: {
+case 299: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
   node->breakToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 299: {
+case 301: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
   node->breakToken = loc(1);
   node->identifierToken = loc(2);
@@ -1508,14 +1522,14 @@ case 299: {
   sym(1).Node = node;
 } break;
 
-case 301: {
+case 303: {
   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 302: {
+case 304: {
   AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->withToken = loc(1);
   node->lparenToken = loc(2);
@@ -1523,7 +1537,7 @@ case 302: {
   sym(1).Node = node;
 } break;
 
-case 303: {
+case 305: {
   AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
   node->switchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1531,90 +1545,90 @@ case 303: {
   sym(1).Node = node;
 } break;
 
-case 304: {
+case 306: {
   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 305: {
+case 307: {
   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 306: {
+case 308: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
 } break;
 
-case 307: {
+case 309: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
 } break;
 
-case 308: {
+case 310: {
   sym(1).Node = 0;
 } break;
 
-case 309: {
+case 311: {
   sym(1).Node = sym(1).CaseClauses->finish ();
 } break;
 
-case 310: {
+case 312: {
   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 311: {
+case 313: {
   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 312:
-case 313: {
+case 314:
+case 315: {
   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 314: {
+case 316: {
   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 316: {
+case 318: {
   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 317: {
+case 319: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 318: {
+case 320: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 319: {
+case 321: {
   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 320: {
+case 322: {
   AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
   node->catchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1623,20 +1637,20 @@ case 320: {
   sym(1).Node = node;
 } break;
 
-case 321: {
+case 323: {
   AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
   node->finallyToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 323: {
+case 325: {
   AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
   node->debuggerToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 324: {
+case 326: {
   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);
@@ -1647,7 +1661,7 @@ case 324: {
   sym(1).Node = node;
 } break;
 
-case 325: {
+case 327: {
   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)
@@ -1659,60 +1673,60 @@ case 325: {
   sym(1).Node = node;
 } break;
 
-case 326: {
+case 328: {
   AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 327: {
+case 329: {
   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 328: {
+case 330: {
   sym(1).Node = 0;
 } break;
 
-case 329: {
+case 331: {
   sym(1).Node = sym(1).FormalParameterList->finish ();
 } break;
 
-case 330: {
+case 332: {
   sym(1).Node = 0;
 } break;
 
-case 332: {
+case 334: {
   sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
 } break;
 
-case 333: {
+case 335: {
   sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
 } break;
 
-case 334: {
+case 336: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
 } break;
 
-case 335: {
+case 337: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
 } break;
 
-case 336: {
+case 338: {
   sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 337: {
+case 339: {
   sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
 } break;
 
-case 338: {
+case 340: {
   sym(1).sval = 0;
 } break;
 
-case 340: {
+case 342: {
   sym(1).Node = 0;
 } break;
 
diff --git a/src/declarative/qml/parser/qdeclarativejsparser_p.h b/src/declarative/qml/parser/qdeclarativejsparser_p.h
index c7e097a..3864398 100644
--- a/src/declarative/qml/parser/qdeclarativejsparser_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsparser_p.h
@@ -235,9 +235,9 @@ protected:
 
 
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 74
+#define J_SCRIPT_REGEXPLITERAL_RULE1 76
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 75
+#define J_SCRIPT_REGEXPLITERAL_RULE2 77
 
 QT_QML_END_NAMESPACE
 
-- 
cgit v0.12


From f5bb807d6938fbd39ea1f99ed45c817d538e4287 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 25 Feb 2010 20:01:25 +1000
Subject: Rename QDeclarativeMetaProperty -> QDeclarativeProperty

There's nothing meta about our properties.
---
 .../graphicsitems/qdeclarativegridview.cpp         |    4 +-
 .../graphicsitems/qdeclarativelistview.cpp         |    4 +-
 src/declarative/qml/qdeclarativebinding.cpp        |   12 +-
 src/declarative/qml/qdeclarativebinding_p.h        |   26 +-
 src/declarative/qml/qdeclarativebinding_p_p.h      |    4 +-
 .../qml/qdeclarativecompiledbindings.cpp           |   12 +-
 src/declarative/qml/qdeclarativecompiler.cpp       |   12 +-
 src/declarative/qml/qdeclarativecomponent.cpp      |    4 +-
 src/declarative/qml/qdeclarativeengine.cpp         |    3 +-
 src/declarative/qml/qdeclarativeengine_p.h         |    2 +-
 src/declarative/qml/qdeclarativeenginedebug.cpp    |    6 +-
 src/declarative/qml/qdeclarativelist.cpp           |    4 +-
 src/declarative/qml/qdeclarativemetaproperty.cpp   | 1200 --------------------
 src/declarative/qml/qdeclarativemetaproperty.h     |  133 ---
 src/declarative/qml/qdeclarativemetaproperty_p.h   |  140 ---
 src/declarative/qml/qdeclarativemetatype.cpp       |    2 +-
 .../qml/qdeclarativeobjectscriptclass.cpp          |    4 +-
 src/declarative/qml/qdeclarativeproperty.cpp       | 1200 ++++++++++++++++++++
 src/declarative/qml/qdeclarativeproperty.h         |  133 +++
 src/declarative/qml/qdeclarativeproperty_p.h       |  140 +++
 .../qml/qdeclarativepropertyvalueinterceptor.cpp   |    2 +-
 .../qml/qdeclarativepropertyvalueinterceptor.h     |    4 +-
 .../qml/qdeclarativepropertyvaluesource.cpp        |    2 +-
 .../qml/qdeclarativepropertyvaluesource.h          |    4 +-
 src/declarative/qml/qdeclarativevaluetype.cpp      |   18 +-
 src/declarative/qml/qdeclarativevaluetype_p.h      |   24 +-
 src/declarative/qml/qdeclarativevme.cpp            |   22 +-
 src/declarative/qml/qdeclarativevmemetaobject.cpp  |    2 +-
 src/declarative/qml/qml.pri                        |    6 +-
 src/declarative/util/qdeclarativeanimation.cpp     |   36 +-
 src/declarative/util/qdeclarativeanimation_p.h     |   18 +-
 src/declarative/util/qdeclarativeanimation_p_p.h   |    4 +-
 src/declarative/util/qdeclarativebehavior.cpp      |   12 +-
 src/declarative/util/qdeclarativebehavior_p.h      |    2 +-
 src/declarative/util/qdeclarativebind.cpp          |    4 +-
 src/declarative/util/qdeclarativeeasefollow.cpp    |    6 +-
 src/declarative/util/qdeclarativeeasefollow_p.h    |    4 +-
 .../util/qdeclarativepropertychanges.cpp           |   30 +-
 src/declarative/util/qdeclarativespringfollow.cpp  |    4 +-
 src/declarative/util/qdeclarativespringfollow_p.h  |    2 +-
 src/declarative/util/qdeclarativestate.cpp         |    6 +-
 src/declarative/util/qdeclarativestate_p.h         |    4 +-
 src/declarative/util/qdeclarativestate_p_p.h       |    8 +-
 .../util/qdeclarativestateoperations.cpp           |    8 +-
 src/declarative/util/qdeclarativetransition.cpp    |    2 +-
 src/declarative/util/qdeclarativetransition_p.h    |    2 +-
 .../util/qdeclarativetransitionmanager.cpp         |   22 +-
 tests/auto/declarative/declarative.pro             |    2 +-
 .../qdeclarativedebug/tst_qdeclarativedebug.cpp    |    6 +-
 .../declarative/qdeclarativelanguage/testtypes.h   |    6 +-
 .../tst_qdeclarativelanguage.cpp                   |   10 +-
 .../tst_qdeclarativelistreference.cpp              |   12 +-
 .../qdeclarativemetaproperty.pro                   |    5 -
 .../tst_qdeclarativemetaproperty.cpp               | 1186 -------------------
 .../tst_qdeclarativemetatype.cpp                   |    4 +-
 .../qdeclarativeproperty/qdeclarativeproperty.pro  |    5 +
 .../tst_qdeclarativeproperty.cpp                   | 1186 +++++++++++++++++++
 .../declarative/qdeclarativevaluetypes/testtypes.h |   12 +-
 58 files changed, 2868 insertions(+), 2869 deletions(-)
 delete mode 100644 src/declarative/qml/qdeclarativemetaproperty.cpp
 delete mode 100644 src/declarative/qml/qdeclarativemetaproperty.h
 delete mode 100644 src/declarative/qml/qdeclarativemetaproperty_p.h
 create mode 100644 src/declarative/qml/qdeclarativeproperty.cpp
 create mode 100644 src/declarative/qml/qdeclarativeproperty.h
 create mode 100644 src/declarative/qml/qdeclarativeproperty_p.h
 delete mode 100644 tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
 delete mode 100644 tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro
 create mode 100644 tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index b378db2..ab5022b 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -607,11 +607,11 @@ void QDeclarativeGridViewPrivate::createHighlight()
             item->setParent(q->viewport());
             highlight = new FxGridItem(item, q);
             highlightXAnimator = new QDeclarativeEaseFollow(q);
-            highlightXAnimator->setTarget(QDeclarativeMetaProperty(highlight->item, QLatin1String("x")));
+            highlightXAnimator->setTarget(QDeclarativeProperty(highlight->item, QLatin1String("x")));
             highlightXAnimator->setDuration(150);
             highlightXAnimator->setEnabled(autoHighlight);
             highlightYAnimator = new QDeclarativeEaseFollow(q);
-            highlightYAnimator->setTarget(QDeclarativeMetaProperty(highlight->item, QLatin1String("y")));
+            highlightYAnimator->setTarget(QDeclarativeProperty(highlight->item, QLatin1String("y")));
             highlightYAnimator->setDuration(150);
             highlightYAnimator->setEnabled(autoHighlight);
             changed = true;
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index bd2f4fc..e6b6f2a 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -804,13 +804,13 @@ void QDeclarativeListViewPrivate::createHighlight()
                 highlight->item->setWidth(currentItem->item->width());
             const QLatin1String posProp(orient == QDeclarativeListView::Vertical ? "y" : "x");
             highlightPosAnimator = new QDeclarativeEaseFollow(q);
-            highlightPosAnimator->setTarget(QDeclarativeMetaProperty(highlight->item, posProp));
+            highlightPosAnimator->setTarget(QDeclarativeProperty(highlight->item, posProp));
             highlightPosAnimator->setVelocity(highlightMoveSpeed);
             highlightPosAnimator->setEnabled(autoHighlight);
             const QLatin1String sizeProp(orient == QDeclarativeListView::Vertical ? "height" : "width");
             highlightSizeAnimator = new QDeclarativeEaseFollow(q);
             highlightSizeAnimator->setVelocity(highlightResizeSpeed);
-            highlightSizeAnimator->setTarget(QDeclarativeMetaProperty(highlight->item, sizeProp));
+            highlightSizeAnimator->setTarget(QDeclarativeProperty(highlight->item, sizeProp));
             highlightSizeAnimator->setEnabled(autoHighlight);
             changed = true;
         }
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 720c562..cecca65 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -97,7 +97,7 @@ QDeclarativeBinding::~QDeclarativeBinding()
 {
 }
 
-void QDeclarativeBinding::setTarget(const QDeclarativeMetaProperty &prop)
+void QDeclarativeBinding::setTarget(const QDeclarativeProperty &prop)
 {
     Q_D(QDeclarativeBinding);
     d->bindingData()->property = prop;
@@ -105,13 +105,13 @@ void QDeclarativeBinding::setTarget(const QDeclarativeMetaProperty &prop)
     update();
 }
 
-QDeclarativeMetaProperty QDeclarativeBinding::property() const 
+QDeclarativeProperty QDeclarativeBinding::property() const 
 {
    Q_D(const QDeclarativeBinding);
    return d->bindingData()->property; 
 }
 
-void QDeclarativeBinding::update(QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
 {
     Q_D(QDeclarativeBinding);
 
@@ -161,7 +161,7 @@ void QDeclarativeBinding::update(QDeclarativeMetaPropertyPrivate::WriteFlags fla
                 data->error.setDescription(QLatin1String("Unable to assign [undefined] to ") + QLatin1String(QMetaType::typeName(data->property.propertyType())));
 
             } else if (!isUndefined && data->property.object() && 
-                       !QDeclarativeMetaPropertyPrivate::write(data->property, value, flags)) {
+                       !QDeclarativePropertyPrivate::write(data->property, value, flags)) {
 
                 QUrl url = QUrl(data->url);
                 int line = data->line;
@@ -204,7 +204,7 @@ void QDeclarativeBindingPrivate::emitValueChanged()
     q->update();
 }
 
-void QDeclarativeBinding::setEnabled(bool e, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeBinding::setEnabled(bool e, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     Q_D(QDeclarativeBinding);
     d->bindingData()->enabled = e;
@@ -300,7 +300,7 @@ QString QDeclarativeAbstractBinding::expression() const
     return QLatin1String("<Unknown>");
 }
 
-void QDeclarativeAbstractBinding::setEnabled(bool e, QDeclarativeMetaPropertyPrivate::WriteFlags)
+void QDeclarativeAbstractBinding::setEnabled(bool e, QDeclarativePropertyPrivate::WriteFlags)
 {
     if (e) m_mePtr = 0;
 }
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index ac174fa..f66b9c7 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -56,8 +56,8 @@
 #include "qdeclarative.h"
 #include "qdeclarativepropertyvaluesource.h"
 #include "qdeclarativeexpression.h"
-#include "qdeclarativemetaproperty.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty.h"
+#include "qdeclarativeproperty_p.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QMetaProperty>
@@ -74,12 +74,12 @@ public:
 
     virtual QString expression() const;
 
-    void setEnabled(bool e) { setEnabled(e, QDeclarativeMetaPropertyPrivate::DontRemoveBinding); }
-    virtual void setEnabled(bool, QDeclarativeMetaPropertyPrivate::WriteFlags) = 0;
+    void setEnabled(bool e) { setEnabled(e, QDeclarativePropertyPrivate::DontRemoveBinding); }
+    virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags) = 0;
     virtual int propertyIndex() = 0;
 
-    void update() { update(QDeclarativeMetaPropertyPrivate::DontRemoveBinding); }
-    virtual void update(QDeclarativeMetaPropertyPrivate::WriteFlags) = 0;
+    void update() { update(QDeclarativePropertyPrivate::DontRemoveBinding); }
+    virtual void update(QDeclarativePropertyPrivate::WriteFlags) = 0;
 
     void addToObject(QObject *);
     void removeFromObject();
@@ -89,8 +89,8 @@ protected:
 
 private:
     friend class QDeclarativeDeclarativeData;
-    friend class QDeclarativeMetaProperty;
-    friend class QDeclarativeMetaPropertyPrivate;
+    friend class QDeclarativeProperty;
+    friend class QDeclarativePropertyPrivate;
     friend class QDeclarativeVME;
 
     QObject *m_object;
@@ -110,19 +110,19 @@ public:
                QObject *parent);
     ~QDeclarativeBinding();
 
-    void setTarget(const QDeclarativeMetaProperty &);
-    QDeclarativeMetaProperty property() const;
+    void setTarget(const QDeclarativeProperty &);
+    QDeclarativeProperty property() const;
 
     bool enabled() const;
 
     // Inherited from  QDeclarativeAbstractBinding
-    virtual void setEnabled(bool, QDeclarativeMetaPropertyPrivate::WriteFlags flags);
+    virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags flags);
     virtual int propertyIndex();
-    virtual void update(QDeclarativeMetaPropertyPrivate::WriteFlags flags);
+    virtual void update(QDeclarativePropertyPrivate::WriteFlags flags);
     virtual QString expression() const;
 
 public Q_SLOTS:
-    void update() { update(QDeclarativeMetaPropertyPrivate::DontRemoveBinding); }
+    void update() { update(QDeclarativePropertyPrivate::DontRemoveBinding); }
 
 protected:
     void emitValueChanged();
diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h
index ac88400..041103c 100644
--- a/src/declarative/qml/qdeclarativebinding_p_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p_p.h
@@ -55,7 +55,7 @@
 
 #include "qdeclarativebinding_p.h"
 
-#include "qdeclarativemetaproperty.h"
+#include "qdeclarativeproperty.h"
 #include "qdeclarativeexpression_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -69,7 +69,7 @@ public:
     bool updating:1;
     bool enabled:1;
 
-    QDeclarativeMetaProperty property;
+    QDeclarativeProperty property;
 
     virtual void refresh();
 };
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index a88f02e..17937fd 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -109,9 +109,9 @@ public:
                     scope(0), target(0), parent(0) {}
 
         // Inherited from QDeclarativeAbstractBinding
-        virtual void setEnabled(bool, QDeclarativeMetaPropertyPrivate::WriteFlags flags);
+        virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags flags);
         virtual int propertyIndex();
-        virtual void update(QDeclarativeMetaPropertyPrivate::WriteFlags flags);
+        virtual void update(QDeclarativePropertyPrivate::WriteFlags flags);
         virtual void destroy();
 
         int index:30;
@@ -244,7 +244,7 @@ QDeclarativeAbstractBinding *QDeclarativeCompiledBindings::configBinding(int ind
     return rv;
 }
 
-void QDeclarativeCompiledBindingsPrivate::Binding::setEnabled(bool e, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeCompiledBindingsPrivate::Binding::setEnabled(bool e, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     if (e) {
         addToObject(target);
@@ -267,7 +267,7 @@ int QDeclarativeCompiledBindingsPrivate::Binding::propertyIndex()
     return property & 0xFFFF;
 }
 
-void QDeclarativeCompiledBindingsPrivate::Binding::update(QDeclarativeMetaPropertyPrivate::WriteFlags)
+void QDeclarativeCompiledBindingsPrivate::Binding::update(QDeclarativePropertyPrivate::WriteFlags)
 {
     parent->run(this);
 }
@@ -324,7 +324,7 @@ void QDeclarativeCompiledBindingsPrivate::run(Binding *binding)
         run(binding->index, cp, binding, binding->scope, target);
 
         vt->write(binding->target, binding->property & 0xFFFF, 
-                  QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+                  QDeclarativePropertyPrivate::DontRemoveBinding);
     } else {
         run(binding->index, cp, binding, binding->scope, binding->target);
     }
@@ -1701,7 +1701,7 @@ bool QDeclarativeBindingCompilerPrivate::compile(QDeclarativeJS::AST::Node *node
             const QMetaObject *from = type.metaObject;
             const QMetaObject *to = engine->rawMetaObjectForType(destination->type);
 
-            if (QDeclarativeMetaPropertyPrivate::canConvert(from, to))
+            if (QDeclarativePropertyPrivate::canConvert(from, to))
                 type.type = destination->type;
         }
 
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 9ac65f9..9dc090b 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -58,7 +58,7 @@
 #include "parser/qdeclarativejsast_p.h"
 #include "qdeclarativevmemetaobject_p.h"
 #include "qdeclarativeexpression_p.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty_p.h"
 #include "qdeclarativerewrite_p.h"
 #include "qdeclarativescriptstring.h"
 #include "qdeclarativeglobal_p.h"
@@ -2036,7 +2036,7 @@ bool QDeclarativeCompiler::buildPropertyObjectAssignment(QDeclarativeParser::Pro
         if (propertyMetaObject) {
             const QMetaObject *c = v->object->metatype;
             while(c) {
-                isAssignable |= (QDeclarativeMetaPropertyPrivate::equal(c, propertyMetaObject));
+                isAssignable |= (QDeclarativePropertyPrivate::equal(c, propertyMetaObject));
                 c = c->superClass();
             }
         }
@@ -2619,7 +2619,7 @@ int QDeclarativeCompiler::genValueTypeData(QDeclarativeParser::Property *valueTy
                                   QDeclarativeParser::Property *prop)
 {
     QByteArray data =
-        QDeclarativeMetaPropertyPrivate::saveValueType(prop->parent->metaObject(), prop->index, 
+        QDeclarativePropertyPrivate::saveValueType(prop->parent->metaObject(), prop->index, 
                                               QDeclarativeEnginePrivate::get(engine)->valueTypes[prop->type]->metaObject(), 
                                               valueTypeProp->index);
 //                valueTypeProp->index, valueTypeProp->type);
@@ -2629,7 +2629,7 @@ int QDeclarativeCompiler::genValueTypeData(QDeclarativeParser::Property *valueTy
 
 int QDeclarativeCompiler::genPropertyData(QDeclarativeParser::Property *prop)
 {
-    return output->indexForByteArray(QDeclarativeMetaPropertyPrivate::saveProperty(prop->parent->metaObject(), prop->index));
+    return output->indexForByteArray(QDeclarativePropertyPrivate::saveProperty(prop->parent->metaObject(), prop->index));
 }
 
 bool QDeclarativeCompiler::completeComponentBuild()
@@ -2735,7 +2735,7 @@ bool QDeclarativeCompiler::canCoerce(int to, QDeclarativeParser::Object *from)
     const QMetaObject *fromMo = from->metaObject();
 
     while (fromMo) {
-        if (QDeclarativeMetaPropertyPrivate::equal(fromMo, toMo))
+        if (QDeclarativePropertyPrivate::equal(fromMo, toMo))
             return true;
         fromMo = fromMo->superClass();
     }
@@ -2754,7 +2754,7 @@ bool QDeclarativeCompiler::canCoerce(int to, int from)
         QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(from);
 
     while (fromMo) {
-        if (QDeclarativeMetaPropertyPrivate::equal(fromMo, toMo))
+        if (QDeclarativePropertyPrivate::equal(fromMo, toMo))
             return true;
         fromMo = fromMo->superClass();
     }
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index aaf36e0..fe63ad2 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -698,8 +698,8 @@ void QDeclarativeComponentPrivate::complete(QDeclarativeEnginePrivate *enginePri
                 state->bindValues.at(ii);
             for (int jj = 0; jj < bv.count; ++jj) {
                 if(bv.at(jj)) 
-                    bv.at(jj)->setEnabled(true, QDeclarativeMetaPropertyPrivate::BypassInterceptor | 
-                                                QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+                    bv.at(jj)->setEnabled(true, QDeclarativePropertyPrivate::BypassInterceptor | 
+                                                QDeclarativePropertyPrivate::DontRemoveBinding);
             }
             QDeclarativeEnginePrivate::clear(bv);
         }
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 4435a5b..8abea4e 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -49,7 +49,6 @@
 #include "qdeclarativecontext.h"
 #include "qdeclarativeexpression.h"
 #include "qdeclarativecomponent.h"
-#include "qdeclarativemetaproperty_p.h"
 #include "qdeclarativebinding_p_p.h"
 #include "qdeclarativevme_p.h"
 #include "qdeclarativeenginedebug_p.h"
@@ -110,7 +109,7 @@
 #define CSIDL_APPDATA		0x001a	// <username>\Application Data
 #endif
 
-Q_DECLARE_METATYPE(QDeclarativeMetaProperty)
+Q_DECLARE_METATYPE(QDeclarativeProperty)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index c4a40c5..2364315 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -62,7 +62,7 @@
 #include "qdeclarativevaluetype_p.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarativeexpression.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty_p.h"
 #include "qdeclarativepropertycache_p.h"
 #include "qdeclarativeobjectscriptclass_p.h"
 #include "qdeclarativecontextscriptclass_p.h"
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index 2ae0b54..09882cb 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -44,8 +44,8 @@
 #include "qdeclarativeboundsignal_p.h"
 #include "qdeclarativeengine.h"
 #include "qdeclarativemetatype_p.h"
-#include "qdeclarativemetaproperty.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty.h"
+#include "qdeclarativeproperty_p.h"
 #include "qdeclarativebinding_p.h"
 #include "qdeclarativecontext_p.h"
 #include "qdeclarativewatcher_p.h"
@@ -110,7 +110,7 @@ QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx)
     rv.name = QString::fromUtf8(prop.name());
     rv.hasNotifySignal = prop.hasNotifySignal();
     QDeclarativeAbstractBinding *binding = 
-        QDeclarativeMetaPropertyPrivate::binding(QDeclarativeMetaProperty(obj, rv.name));
+        QDeclarativePropertyPrivate::binding(QDeclarativeProperty(obj, rv.name));
     if (binding)
         rv.binding = binding->expression();
 
diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp
index 4c9586c..af720d7 100644
--- a/src/declarative/qml/qdeclarativelist.cpp
+++ b/src/declarative/qml/qdeclarativelist.cpp
@@ -42,7 +42,7 @@
 #include "qdeclarativelist.h"
 #include "qdeclarativelist_p.h"
 #include "qdeclarativeengine_p.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -174,7 +174,7 @@ bool QDeclarativeListReference::append(QObject *o) const
 {
     if (!canAppend()) return false;
 
-    if (o && !QDeclarativeMetaPropertyPrivate::canConvert(o->metaObject(), d->elementType))
+    if (o && !QDeclarativePropertyPrivate::canConvert(o->metaObject(), d->elementType))
         return false;
 
     d->property.append(&d->property, o);
diff --git a/src/declarative/qml/qdeclarativemetaproperty.cpp b/src/declarative/qml/qdeclarativemetaproperty.cpp
deleted file mode 100644
index a976140..0000000
--- a/src/declarative/qml/qdeclarativemetaproperty.cpp
+++ /dev/null
@@ -1,1200 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativemetaproperty.h"
-#include "qdeclarativemetaproperty_p.h"
-
-#include "qdeclarativecompositetypedata_p.h"
-#include "qdeclarative.h"
-#include "qdeclarativebinding_p.h"
-#include "qdeclarativecontext.h"
-#include "qdeclarativecontext_p.h"
-#include "qdeclarativeboundsignal_p.h"
-#include "qdeclarativeengine.h"
-#include "qdeclarativeengine_p.h"
-#include "qdeclarativedeclarativedata_p.h"
-#include "qdeclarativestringconverters_p.h"
-#include "qdeclarativelist_p.h"
-
-#include <QStringList>
-#include <QtCore/qdebug.h>
-
-#include <math.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QDeclarativeMetaProperty
-    \brief The QDeclarativeMetaProperty class abstracts accessing QML properties.
-    \internal
- */
-
-/*!
-    Create an invalid QDeclarativeMetaProperty.
-*/
-QDeclarativeMetaProperty::QDeclarativeMetaProperty()
-: d(new QDeclarativeMetaPropertyPrivate)
-{
-    d->q = this;
-}
-
-/*!  \internal */
-QDeclarativeMetaProperty::~QDeclarativeMetaProperty()
-{
-    delete d; d = 0;
-}
-
-/*!
-    Creates a QDeclarativeMetaProperty for the default property of \a obj. If there is no
-    default property, an invalid QDeclarativeMetaProperty will be created.
- */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj)
-: d(new QDeclarativeMetaPropertyPrivate)
-{
-    d->q = this;
-    d->initDefault(obj);
-}
-
-/*!
-    \internal
-    Creates a QDeclarativeMetaProperty for the default property of \a obj. If there is no
-    default property, an invalid QDeclarativeMetaProperty will be created.
- */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, QDeclarativeContext *ctxt)
-: d(new QDeclarativeMetaPropertyPrivate)
-{
-    d->q = this;
-    d->context = ctxt;
-    d->initDefault(obj);
-}
-
-/*!
-    Initialize from the default property of \a obj
-*/
-void QDeclarativeMetaPropertyPrivate::initDefault(QObject *obj)
-{
-    if (!obj)
-        return;
-
-    QMetaProperty p = QDeclarativeMetaType::defaultProperty(obj);
-    core.load(p);
-    if (core.isValid()) {
-        isDefaultProperty = true;
-        object = obj;
-    }
-}
-
-/*!
-    Creates a QDeclarativeMetaProperty for the property \a name of \a obj.
- */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, const QString &name)
-: d(new QDeclarativeMetaPropertyPrivate)
-{
-    d->q = this;
-    d->initProperty(obj, name);
-    if (!isValid()) d->object = 0;
-}
-
-/*!
-    \internal
-    Creates a QDeclarativeMetaProperty for the property \a name of \a obj.
- */
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(QObject *obj, const QString &name, QDeclarativeContext *ctxt)
-: d(new QDeclarativeMetaPropertyPrivate)
-{
-    d->q = this;
-    d->context = ctxt;
-    d->initProperty(obj, name);
-    if (!isValid()) { d->object = 0; d->context = 0; }
-}
-
-Q_GLOBAL_STATIC(QDeclarativeValueTypeFactory, qmlValueTypes);
-
-void QDeclarativeMetaPropertyPrivate::initProperty(QObject *obj, const QString &name)
-{
-    if (!obj) return;
-
-    QDeclarativeEngine *engine = context?context->engine():0;
-    QDeclarativeTypeNameCache *typeNameCache = context?QDeclarativeContextPrivate::get(context)->imports:0;
-
-    QStringList path = name.split(QLatin1Char('.'));
-    if (path.isEmpty()) return;
-
-    QObject *currentObject = obj;
-
-    // Everything up to the last property must be an "object type" property
-    for (int ii = 0; ii < path.count() - 1; ++ii) {
-        const QString &pathName = path.at(ii);
-
-        if (QDeclarativeTypeNameCache::Data *data = typeNameCache?typeNameCache->data(pathName):0) {
-            if (data->type) {
-                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
-                if (!func) return; // Not an attachable type
-
-                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
-                if (!currentObject) return; // Something is broken with the attachable type
-            } else {
-                Q_ASSERT(data->typeNamespace);
-                if ((ii + 1) == path.count()) return; // No type following the namespace
-                
-                ++ii; data = data->typeNamespace->data(path.at(ii));
-                if (!data || !data->type) return; // Invalid type in namespace 
-
-                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
-                if (!func) return; // Not an attachable type
-
-                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
-                if (!currentObject) return; // Something is broken with the attachable type
-            }
-        } else {
-
-            QDeclarativePropertyCache::Data local;
-            QDeclarativePropertyCache::Data *property = 
-                QDeclarativePropertyCache::property(engine, obj, pathName, local);
-
-            if (!property) return; // Not a property
-            if (property->flags & QDeclarativePropertyCache::Data::IsFunction) 
-                return; // Not an object property 
-
-            if (ii == (path.count() - 2) && property->propType < (int)QVariant::UserType) {
-                // We're now at a value type property.  We can use a global valuetypes array as we 
-                // never actually use the objects, just look up their properties.
-                QObject *typeObject = qmlValueTypes()->valueTypes[property->propType];
-                if (!typeObject) return; // Not a value type
-
-                int idx = typeObject->metaObject()->indexOfProperty(path.last().toUtf8().constData());
-                if (idx == -1) return; // Value type property does not exist
-
-                QMetaProperty vtProp = typeObject->metaObject()->property(idx);
-
-                object = currentObject;
-                core = *property;
-                valueType.flags = QDeclarativePropertyCache::Data::flagsForProperty(vtProp);
-                valueType.valueTypeCoreIdx = idx;
-                valueType.valueTypePropType = vtProp.userType();
-
-                return; 
-            } else {
-                if (!(property->flags & QDeclarativePropertyCache::Data::IsQObjectDerived)) 
-                    return; // Not an object property
-
-                void *args[] = { &currentObject, 0 };
-                QMetaObject::metacall(currentObject, QMetaObject::ReadProperty, property->coreIndex, args);
-                if (!currentObject) return; // No value
-
-            }
-        }
-
-    }
-
-    const QString &terminal = path.last();
-
-    if (terminal.count() >= 3 &&
-        terminal.at(0) == QLatin1Char('o') &&
-        terminal.at(1) == QLatin1Char('n') &&
-        terminal.at(2).isUpper()) {
-
-        QString signalName = terminal.mid(2);
-        signalName[0] = signalName.at(0).toLower();
-
-        QMetaMethod method = findSignal(currentObject, signalName);
-        if (method.signature()) {
-            object = currentObject;
-            core.load(method);
-            return;
-        }
-    }
-
-    // Property
-    QDeclarativePropertyCache::Data local;
-    QDeclarativePropertyCache::Data *property = 
-        QDeclarativePropertyCache::property(context?context->engine():0, currentObject, terminal, local);
-    if (property && !(property->flags & QDeclarativePropertyCache::Data::IsFunction)) {
-        object = currentObject;
-        core = *property;
-    }
-}
-
-/*!
-    Create a copy of \a other.
-*/
-QDeclarativeMetaProperty::QDeclarativeMetaProperty(const QDeclarativeMetaProperty &other)
-: d(new QDeclarativeMetaPropertyPrivate(*other.d))
-{
-    d->q = this;
-}
-
-/*!
-  \enum QDeclarativeMetaProperty::PropertyTypeCategory
-
-  This enum specifies a category of QML property.
-
-  \value InvalidCategory The property is invalid.
-  \value List The property is a QList pointer
-  \value Object The property is a QObject derived type pointer
-  \value Normal The property is none of the above.
- */
-
-/*!
-  \enum QDeclarativeMetaProperty::Type
-
-  This enum specifies a type of QML property.
-
-  \value Invalid The property is invalid.
-  \value Property The property is a regular Qt property.
-  \value SignalProperty The property is a signal property.
-  \value Default The property is the default property.
-*/
-
-/*!
-    Returns the property category.
-*/
-QDeclarativeMetaProperty::PropertyTypeCategory QDeclarativeMetaProperty::propertyTypeCategory() const
-{
-    return d->propertyTypeCategory();
-}
-
-QDeclarativeMetaProperty::PropertyTypeCategory 
-QDeclarativeMetaPropertyPrivate::propertyTypeCategory() const
-{
-    uint type = q->type();
-
-    if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
-        return QDeclarativeMetaProperty::Normal;
-    } else if (type & QDeclarativeMetaProperty::Property) {
-        int type = propertyType();
-        if (type == QVariant::Invalid)
-            return QDeclarativeMetaProperty::InvalidCategory;
-        else if ((uint)type < QVariant::UserType)
-            return QDeclarativeMetaProperty::Normal;
-        else if (core.flags & QDeclarativePropertyCache::Data::IsQObjectDerived)
-            return QDeclarativeMetaProperty::Object;
-        else if (core.flags & QDeclarativePropertyCache::Data::IsQList)
-            return QDeclarativeMetaProperty::List;
-        else 
-            return QDeclarativeMetaProperty::Normal;
-    } else {
-        return QDeclarativeMetaProperty::InvalidCategory;
-    }
-}
-
-/*!
-    Returns the type name of the property, or 0 if the property has no type
-    name.
-*/
-const char *QDeclarativeMetaProperty::propertyTypeName() const
-{
-    if (type() & ValueTypeProperty) {
-
-        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(d->context);
-        QDeclarativeValueType *valueType = 0;
-        if (ep) valueType = ep->valueTypes[d->core.propType];
-        else valueType = QDeclarativeValueTypeFactory::valueType(d->core.propType);
-        Q_ASSERT(valueType);
-
-        const char *rv = valueType->metaObject()->property(d->valueType.valueTypeCoreIdx).typeName();
-
-        if (!ep) delete valueType;
-
-        return rv;
-    } else if (d->object && type() & Property && d->core.isValid()) {
-        return d->object->metaObject()->property(d->core.coreIndex).typeName();
-    } else {
-        return 0;
-    }
-}
-
-/*!
-    Returns true if \a other and this QDeclarativeMetaProperty represent the same 
-    property.
-*/
-bool QDeclarativeMetaProperty::operator==(const QDeclarativeMetaProperty &other) const
-{
-    // category is intentially omitted here as it is generated 
-    // from the other members
-    return d->object == other.d->object &&
-           d->core == other.d->core &&
-           d->valueType == other.d->valueType;
-}
-
-/*!
-    Returns the QVariant type of the property, or QVariant::Invalid if the 
-    property has no QVariant type.
-*/
-int QDeclarativeMetaProperty::propertyType() const
-{
-    return d->propertyType();
-}
-
-int QDeclarativeMetaPropertyPrivate::propertyType() const
-{
-    uint type = q->type();
-    if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
-        return valueType.valueTypePropType;
-    } else if (type & QDeclarativeMetaProperty::Property) {
-        if (core.propType == (int)QVariant::LastType)
-            return qMetaTypeId<QVariant>();
-        else
-            return core.propType;
-    } else {
-        return QVariant::Invalid;
-    }
-}
-
-/*!
-    Returns the type of the property.
-*/
-QDeclarativeMetaProperty::Type QDeclarativeMetaProperty::type() const
-{
-    if (d->core.flags & QDeclarativePropertyCache::Data::IsFunction)
-        return SignalProperty;
-    else if (d->valueType.valueTypeCoreIdx != -1)
-        return (Type)(Property | ValueTypeProperty);
-    else if (d->core.isValid())
-        return (Type)(Property | ((d->isDefaultProperty)?Default:0));
-    else
-        return Invalid;
-}
-
-/*!
-    Returns true if this QDeclarativeMetaProperty represents a regular Qt property.
-*/
-bool QDeclarativeMetaProperty::isProperty() const
-{
-    return type() & Property;
-}
-
-/*!
-    Returns true if this QDeclarativeMetaProperty represents a default property.
-*/
-bool QDeclarativeMetaProperty::isDefault() const
-{
-    return type() & Default;
-}
-
-/*!
-    Returns the QDeclarativeMetaProperty's QObject.
-*/
-QObject *QDeclarativeMetaProperty::object() const
-{
-    return d->object;
-}
-
-/*!
-    Assign \a other to this QDeclarativeMetaProperty.
-*/
-QDeclarativeMetaProperty &QDeclarativeMetaProperty::operator=(const QDeclarativeMetaProperty &other)
-{
-    d->context = other.d->context;
-    d->object = other.d->object;
-
-    d->isDefaultProperty = other.d->isDefaultProperty;
-    d->isNameCached = other.d->isNameCached;
-    d->core = other.d->core;
-    d->nameCache = other.d->nameCache;
-
-    d->valueType = other.d->valueType;
-
-    return *this;
-}
-
-/*!
-    Returns true if the property is writable, otherwise false.
-*/
-bool QDeclarativeMetaProperty::isWritable() const
-{
-    QDeclarativeMetaProperty::PropertyTypeCategory category = propertyTypeCategory();
-
-    if (!d->object)
-        return false;
-    if (category == List)
-        return true;
-    else if (type() & SignalProperty)
-        return false;
-    else if (d->core.isValid() && d->object)
-        return d->core.flags & QDeclarativePropertyCache::Data::IsWritable;
-    else
-        return false;
-}
-
-/*!
-    Returns true if the property is designable, otherwise false.
-*/
-bool QDeclarativeMetaProperty::isDesignable() const
-{
-    if (type() & Property && d->core.isValid() && d->object)
-        return d->object->metaObject()->property(d->core.coreIndex).isDesignable();
-    else
-        return false;
-}
-
-/*!
-    Returns true if the property is resettable, otherwise false.
-*/
-bool QDeclarativeMetaProperty::isResettable() const
-{
-    if (type() & Property && d->core.isValid() && d->object)
-        return d->core.flags & QDeclarativePropertyCache::Data::IsResettable;
-    else
-        return false;
-}
-
-/*!
-    Returns true if the QDeclarativeMetaProperty refers to a valid property, otherwise
-    false.
-*/
-bool QDeclarativeMetaProperty::isValid() const
-{
-    return type() != Invalid;
-}
-
-/*!
-    Return the name of this QML property.
-*/
-QString QDeclarativeMetaProperty::name() const
-{
-    if (!d->isNameCached) {
-        // ###
-        if (!d->object) {
-        } else if (type() & ValueTypeProperty) {
-            QString rv = d->core.name(d->object) + QLatin1Char('.');
-
-            QDeclarativeEnginePrivate *ep = d->context?QDeclarativeEnginePrivate::get(d->context->engine()):0;
-            QDeclarativeValueType *valueType = 0;
-            if (ep) valueType = ep->valueTypes[d->core.propType];
-            else valueType = QDeclarativeValueTypeFactory::valueType(d->core.propType);
-            Q_ASSERT(valueType);
-
-            rv += QString::fromUtf8(valueType->metaObject()->property(d->valueType.valueTypeCoreIdx).name());
-
-            if (!ep) delete valueType;
-
-            d->nameCache = rv;
-        } else if (type() & SignalProperty) {
-            QString name = QLatin1String("on") + d->core.name(d->object);
-            name[2] = name.at(2).toUpper();
-            d->nameCache = name;
-        } else {
-            d->nameCache = d->core.name(d->object);
-        }
-        d->isNameCached = true;
-    }
-
-    return d->nameCache;
-}
-
-/*!
-  Returns the \l{QMetaProperty} {Qt property} associated with
-  this QML property.
- */
-QMetaProperty QDeclarativeMetaProperty::property() const
-{
-    if (type() & Property && d->core.isValid() && d->object)
-        return d->object->metaObject()->property(d->core.coreIndex);
-    else
-        return QMetaProperty();
-}
-
-/*!
-    Return the QMetaMethod for this property if it is a SignalProperty, 
-    otherwise returns an invalid QMetaMethod.
-*/
-QMetaMethod QDeclarativeMetaProperty::method() const
-{
-    if (type() & SignalProperty && d->object)
-        return d->object->metaObject()->method(d->core.coreIndex);
-    else
-        return QMetaMethod();
-}
-
-
-/*!
-    Returns the binding associated with this property, or 0 if no binding 
-    exists.
-*/
-QDeclarativeAbstractBinding *
-QDeclarativeMetaPropertyPrivate::binding(const QDeclarativeMetaProperty &that) 
-{
-    if (!that.isProperty() || !that.d->object)
-        return 0;
-
-    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(that.d->object);
-    if (!data) 
-        return 0;
-
-    if (!data->hasBindingBit(that.d->core.coreIndex))
-        return 0;
-
-    QDeclarativeAbstractBinding *binding = data->bindings;
-    while (binding) {
-        // ### This wont work for value types
-        if (binding->propertyIndex() == that.d->core.coreIndex)
-            return binding; 
-        binding = binding->m_nextBinding;
-    }
-    return 0;
-}
-
-/*!
-    Set the binding associated with this property to \a newBinding.  Returns
-    the existing binding (if any), otherwise 0.
-
-    \a newBinding will be enabled, and the returned binding (if any) will be
-    disabled.
-
-    Ownership of \a newBinding transfers to QML.  Ownership of the return value
-    is assumed by the caller.
-
-    \a flags is passed through to the binding and is used for the initial update (when
-    the binding sets the intial value, it will use these flags for the write).
-*/
-QDeclarativeAbstractBinding *
-QDeclarativeMetaPropertyPrivate::setBinding(const QDeclarativeMetaProperty &that,
-                                            QDeclarativeAbstractBinding *newBinding, 
-                                            WriteFlags flags) 
-{
-    if (!that.isProperty() || !that.d->object) {
-        if (newBinding)
-            newBinding->destroy();
-        return 0;
-    }
-
-    return that.d->setBinding(that.d->object, that.d->core, newBinding, flags);
-}
-
-QDeclarativeAbstractBinding *
-QDeclarativeMetaPropertyPrivate::setBinding(QObject *object, const QDeclarativePropertyCache::Data &core, 
-                                   QDeclarativeAbstractBinding *newBinding, WriteFlags flags)
-{
-    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object, 0 != newBinding);
-
-    if (data && data->hasBindingBit(core.coreIndex)) {
-        QDeclarativeAbstractBinding *binding = data->bindings;
-        while (binding) {
-            // ### This wont work for value types
-            if (binding->propertyIndex() == core.coreIndex) {
-                binding->setEnabled(false);
-
-                if (newBinding) 
-                    newBinding->setEnabled(true, flags);
-
-                return binding; // ### QDeclarativeAbstractBinding;
-            }
-
-            binding = binding->m_nextBinding;
-        }
-    } 
-
-    if (newBinding)
-        newBinding->setEnabled(true, flags);
-
-    return 0;
-}
-
-/*!
-    Returns the expression associated with this signal property, or 0 if no 
-    signal expression exists.
-*/
-QDeclarativeExpression *
-QDeclarativeMetaPropertyPrivate::signalExpression(const QDeclarativeMetaProperty &that)
-{
-    if (!(that.type() & QDeclarativeMetaProperty::SignalProperty))
-        return 0;
-
-    const QObjectList &children = that.d->object->children();
-    
-    for (int ii = 0; ii < children.count(); ++ii) {
-        QObject *child = children.at(ii);
-
-        QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
-        if (signal && signal->index() == that.coreIndex()) 
-            return signal->expression();
-    }
-
-    return 0;
-}
-
-/*!
-    Set the signal expression associated with this signal property to \a expr.
-    Returns the existing signal expression (if any), otherwise 0.
-
-    Ownership of \a expr transfers to QML.  Ownership of the return value is
-    assumed by the caller.
-*/
-QDeclarativeExpression *
-QDeclarativeMetaPropertyPrivate::setSignalExpression(const QDeclarativeMetaProperty &that,
-                                                     QDeclarativeExpression *expr) 
-{
-    if (!(that.type() & QDeclarativeMetaProperty::SignalProperty)) {
-        delete expr;
-        return 0;
-    }
-
-    const QObjectList &children = that.d->object->children();
-    
-    for (int ii = 0; ii < children.count(); ++ii) {
-        QObject *child = children.at(ii);
-
-        QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
-        if (signal && signal->index() == that.coreIndex()) 
-            return signal->setExpression(expr);
-    }
-
-    if (expr) {
-        QDeclarativeBoundSignal *signal = new QDeclarativeBoundSignal(that.d->object, that.method(), that.d->object);
-        return signal->setExpression(expr);
-    } else {
-        return 0;
-    }
-}
-
-QMetaMethod QDeclarativeMetaPropertyPrivate::findSignal(QObject *obj, const QString &name)
-{
-    const QMetaObject *mo = obj->metaObject();
-
-    int methods = mo->methodCount();
-    for (int ii = methods - 1; ii >= 0; --ii) {
-        QMetaMethod method = mo->method(ii);
-        QString methodName = QString::fromUtf8(method.signature());
-        int idx = methodName.indexOf(QLatin1Char('('));
-        methodName = methodName.left(idx);
-
-        if (methodName == name) 
-            return method;
-    }
-    return QMetaMethod();
-}
-
-/*!
-    Returns the property value.
-*/
-QVariant QDeclarativeMetaProperty::read() const
-{
-    if (!d->object)
-        return QVariant();
-
-    if (type() & SignalProperty) {
-
-        return QVariant();
-
-    } else if (type() & Property) {
-
-        return d->readValueProperty();
-
-    }
-    return QVariant();
-}
-
-QVariant QDeclarativeMetaPropertyPrivate::readValueProperty()
-{
-    uint type = q->type();
-    if(type & QDeclarativeMetaProperty::ValueTypeProperty) {
-
-        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
-        QDeclarativeValueType *valueType = 0;
-        if (ep) valueType = ep->valueTypes[core.propType];
-        else valueType = QDeclarativeValueTypeFactory::valueType(core.propType);
-        Q_ASSERT(valueType);
-
-        valueType->read(object, core.coreIndex);
-
-        QVariant rv =
-            valueType->metaObject()->property(this->valueType.valueTypeCoreIdx).read(valueType);
-
-        if (!ep) delete valueType;
-        return rv;
-
-    } else if(core.flags & QDeclarativePropertyCache::Data::IsQList) {
-
-        QDeclarativeListProperty<QObject> prop;
-        void *args[] = { &prop, 0 };
-        QMetaObject::metacall(object, QMetaObject::ReadProperty, core.coreIndex, args);
-        return QVariant::fromValue(QDeclarativeListReferencePrivate::init(prop, core.propType, context?context->engine():0));
-
-    } else {
-
-        return object->metaObject()->property(core.coreIndex).read(object.data());
-
-    }
-}
-
-//###
-//writeEnumProperty MIRRORS the relelvant bit of QMetaProperty::write AND MUST BE KEPT IN SYNC!
-//###
-bool QDeclarativeMetaPropertyPrivate::writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags)
-{
-    if (!object || !prop.isWritable())
-        return false;
-
-    QVariant v = value;
-    if (prop.isEnumType()) {
-        QMetaEnum menum = prop.enumerator();
-        if (v.userType() == QVariant::String
-#ifdef QT3_SUPPORT
-            || v.userType() == QVariant::CString
-#endif
-            ) {
-            if (prop.isFlagType())
-                v = QVariant(menum.keysToValue(value.toByteArray()));
-            else
-                v = QVariant(menum.keyToValue(value.toByteArray()));
-        } else if (v.userType() != QVariant::Int && v.userType() != QVariant::UInt) {
-            int enumMetaTypeId = QMetaType::type(QByteArray(menum.scope()) + "::" + menum.name());
-            if ((enumMetaTypeId == 0) || (v.userType() != enumMetaTypeId) || !v.constData())
-                return false;
-            v = QVariant(*reinterpret_cast<const int *>(v.constData()));
-        }
-        v.convert(QVariant::Int);
-    }
-
-    // the status variable is changed by qt_metacall to indicate what it did
-    // this feature is currently only used by QtDBus and should not be depended
-    // upon. Don't change it without looking into QDBusAbstractInterface first
-    // -1 (unchanged): normal qt_metacall, result stored in argv[0]
-    // changed: result stored directly in value, return the value of status
-    int status = -1;
-    void *argv[] = { v.data(), &v, &status, &flags };
-    QMetaObject::metacall(object, QMetaObject::WriteProperty, idx, argv);
-    return status;
-}
-
-bool QDeclarativeMetaPropertyPrivate::writeValueProperty(const QVariant &value, WriteFlags flags)
-{
-    // Remove any existing bindings on this property
-    if (!(flags & DontRemoveBinding)) {
-        QDeclarativeAbstractBinding *binding = setBinding(*q, 0);
-        if (binding) binding->destroy();
-    }
-
-    bool rv = false;
-    uint type = q->type();
-    if (type & QDeclarativeMetaProperty::ValueTypeProperty) {
-        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
-
-        QDeclarativeValueType *writeBack = 0;
-        if (ep) {
-            writeBack = ep->valueTypes[core.propType];
-        } else {
-            writeBack = QDeclarativeValueTypeFactory::valueType(core.propType);
-        }
-
-        writeBack->read(object, core.coreIndex);
-
-        QDeclarativePropertyCache::Data data = core;
-        data.flags = valueType.flags;
-        data.coreIndex = valueType.valueTypeCoreIdx;
-        data.propType = valueType.valueTypePropType;
-        rv = write(writeBack, data, value, context, flags);
-
-        writeBack->write(object, core.coreIndex, flags);
-        if (!ep) delete writeBack;
-
-    } else {
-
-        rv = write(object, core, value, context, flags);
-
-    }
-
-    return rv;
-}
-
-bool QDeclarativeMetaPropertyPrivate::write(QObject *object, const QDeclarativePropertyCache::Data &property, 
-                                            const QVariant &value, QDeclarativeContext *context, 
-                                            WriteFlags flags)
-{
-    int coreIdx = property.coreIndex;
-    int status = -1;    //for dbus
-
-    if (property.flags & QDeclarativePropertyCache::Data::IsEnumType) {
-        QMetaProperty prop = object->metaObject()->property(property.coreIndex);
-        QVariant v = value;
-        // Enum values come through the script engine as doubles
-        if (value.userType() == QVariant::Double) { 
-            double integral;
-            double fractional = modf(value.toDouble(), &integral);
-            if (qFuzzyIsNull(fractional))
-                v.convert(QVariant::Int);
-        }
-        return writeEnumProperty(prop, coreIdx, object, v, flags);
-    }
-
-    int propertyType = property.propType;
-    int variantType = value.userType();
-
-    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(context);
-
-    if (propertyType == QVariant::Url) {
-
-        QUrl u;
-        bool found = false;
-        if (variantType == QVariant::Url) {
-            u = value.toUrl();
-            found = true;
-        } else if (variantType == QVariant::ByteArray) {
-            u = QUrl(QString::fromUtf8(value.toByteArray()));
-            found = true;
-        } else if (variantType == QVariant::String) {
-            u = QUrl(value.toString());
-            found = true;
-        }
-
-        if (!found)
-            return false;
-
-        if (context && u.isRelative() && !u.isEmpty())
-            u = context->resolvedUrl(u);
-        int status = -1;
-        void *argv[] = { &u, 0, &status, &flags };
-        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, argv);
-
-    } else if (variantType == propertyType) {
-
-        void *a[] = { (void *)value.constData(), 0, &status, &flags };
-        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-
-    } else if (qMetaTypeId<QVariant>() == propertyType) {
-
-        void *a[] = { (void *)&value, 0, &status, &flags };
-        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-
-    } else if (property.flags & QDeclarativePropertyCache::Data::IsQObjectDerived) {
-
-        const QMetaObject *valMo = rawMetaObjectForType(enginePriv, value.userType());
-        
-        if (!valMo)
-            return false;
-
-        QObject *o = *(QObject **)value.constData();
-        const QMetaObject *propMo = rawMetaObjectForType(enginePriv, propertyType);
-
-        if (o) valMo = o->metaObject();
-
-        if (canConvert(valMo, propMo)) {
-            void *args[] = { &o, 0, &status, &flags };
-            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, 
-                                  args);
-        } else if (!o && canConvert(propMo, valMo)) {
-            // In the case of a null QObject, we assign the null if there is 
-            // any change that the null variant type could be up or down cast to 
-            // the property type.
-            void *args[] = { &o, 0, &status, &flags };
-            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, 
-                                  args);
-        } else {
-            return false;
-        }
-
-    } else if (property.flags & QDeclarativePropertyCache::Data::IsQList) {
-
-        const QMetaObject *listType = 0;
-        if (enginePriv) {
-            listType = enginePriv->rawMetaObjectForType(enginePriv->listType(property.propType));
-        } else {
-            QDeclarativeType *type = QDeclarativeMetaType::qmlType(QDeclarativeMetaType::listType(property.propType));
-            if (!type) return false;
-            listType = type->baseMetaObject();
-        }
-        if (!listType) return false;
-
-        QDeclarativeListProperty<void> prop;
-        void *args[] = { &prop, 0 };
-        QMetaObject::metacall(object, QMetaObject::ReadProperty, coreIdx, args);
-
-        if (!prop.clear) return false;
-
-        prop.clear(&prop);
-
-        if (value.userType() == qMetaTypeId<QList<QObject *> >()) {
-            const QList<QObject *> &list = qvariant_cast<QList<QObject *> >(value);
-
-            for (int ii = 0; ii < list.count(); ++ii) {
-                QObject *o = list.at(ii);
-                if (!canConvert(o->metaObject(), listType))
-                    o = 0;
-                prop.append(&prop, (void *)o);
-            }
-        } else {
-            QObject *o = enginePriv?enginePriv->toQObject(value):QDeclarativeMetaType::toQObject(value);
-            if (!canConvert(o->metaObject(), listType))
-                o = 0;
-            prop.append(&prop, (void *)o);
-        }
-
-    } else {
-        Q_ASSERT(variantType != propertyType);
-
-        QVariant v = value;
-        if (v.convert((QVariant::Type)propertyType)) {
-            void *a[] = { (void *)v.constData(), 0, &status, &flags};
-            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-        } else if ((uint)propertyType >= QVariant::UserType && variantType == QVariant::String) {
-            QDeclarativeMetaType::StringConverter con = QDeclarativeMetaType::customStringConverter(propertyType);
-            if (!con)
-                return false;
-
-            QVariant v = con(value.toString());
-            if (v.userType() == propertyType) {
-                void *a[] = { (void *)v.constData(), 0, &status, &flags};
-                QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-            }
-        } else if (variantType == QVariant::String) {
-            bool ok = false;
-            QVariant v = QDeclarativeStringConverters::variantFromString(value.toString(), propertyType, &ok);
-            if (!ok)
-                return false;
-
-            void *a[] = { (void *)v.constData(), 0, &status, &flags};
-            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
-        } else {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-const QMetaObject *QDeclarativeMetaPropertyPrivate::rawMetaObjectForType(QDeclarativeEnginePrivate *engine, int userType)
-{
-    if (engine) {
-        return engine->rawMetaObjectForType(userType);
-    } else {
-        QDeclarativeType *type = QDeclarativeMetaType::qmlType(userType);
-        return type?type->baseMetaObject():0;
-    }
-}
-
-/*!
-    Set the property value to \a value.
-*/
-bool QDeclarativeMetaProperty::write(const QVariant &value) const
-{
-    return QDeclarativeMetaPropertyPrivate::write(*this, value, 0);
-}
-
-/*!
-    Resets the property value.
-*/
-bool QDeclarativeMetaProperty::reset() const
-{
-    if (isResettable()) {
-        void *args[] = { 0 };
-        QMetaObject::metacall(d->object, QMetaObject::ResetProperty, d->core.coreIndex, args);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-bool QDeclarativeMetaPropertyPrivate::write(const QDeclarativeMetaProperty &that,
-                                            const QVariant &value, WriteFlags flags) 
-{
-    if (that.d->object && that.type() & QDeclarativeMetaProperty::Property && 
-        that.d->core.isValid() && that.isWritable()) 
-        return that.d->writeValueProperty(value, flags);
-    else 
-        return false;
-}
-
-/*!
-    Returns true if the property has a change notifier signal, otherwise false.
-*/
-bool QDeclarativeMetaProperty::hasChangedNotifier() const
-{
-    if (type() & Property && d->object) {
-        return d->object->metaObject()->property(d->core.coreIndex).hasNotifySignal();
-    }
-    return false;
-}
-
-/*!
-    Returns true if the property needs a change notifier signal for bindings
-    to remain upto date, false otherwise.
-
-    Some properties, such as attached properties or those whose value never 
-    changes, do not require a change notifier.
-*/
-bool QDeclarativeMetaProperty::needsChangedNotifier() const
-{
-    return type() & Property && !property().isConstant();
-}
-
-/*!
-    Connects the property's change notifier signal to the
-    specified \a method of the \a dest object and returns
-    true. Returns false if this metaproperty does not
-    represent a regular Qt property or if it has no
-    change notifier signal, or if the \a dest object does
-    not have the specified \a method.
-*/
-bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, int method) const
-{
-    if (!(type() & Property) || !d->object)
-        return false;
-
-    QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
-    if (prop.hasNotifySignal()) {
-        return QMetaObject::connect(d->object, prop.notifySignalIndex(), dest, method, Qt::DirectConnection);
-    } else {
-        return false;
-    }
-}
-
-/*!
-    Connects the property's change notifier signal to the
-    specified \a slot of the \a dest object and returns
-    true. Returns false if this metaproperty does not
-    represent a regular Qt property or if it has no
-    change notifier signal, or if the \a dest object does
-    not have the specified \a slot.
-*/
-bool QDeclarativeMetaProperty::connectNotifier(QObject *dest, const char *slot) const
-{
-    if (!(type() & Property) || !d->object)
-        return false;
-
-    QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
-    if (prop.hasNotifySignal()) {
-        QByteArray signal(QByteArray("2") + prop.notifySignal().signature());
-        return QObject::connect(d->object, signal.constData(), dest, slot);
-    } else  {
-        return false;
-    }
-}
-
-/*!
-    Return the Qt metaobject index of the property.
-*/
-int QDeclarativeMetaProperty::coreIndex() const
-{
-    return d->core.coreIndex;
-}
-
-int QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(const QDeclarativeMetaProperty &that)
-{
-    return that.d->valueType.valueTypeCoreIdx;
-}
-
-struct SerializedData {
-    QDeclarativeMetaProperty::Type type;
-    QDeclarativePropertyCache::Data core;
-};
-
-struct ValueTypeSerializedData : public SerializedData {
-    QDeclarativePropertyCache::ValueTypeData valueType;
-};
-
-QByteArray QDeclarativeMetaPropertyPrivate::saveValueType(const QMetaObject *metaObject, int index, 
-                                                 const QMetaObject *subObject, int subIndex)
-{
-    QMetaProperty prop = metaObject->property(index);
-    QMetaProperty subProp = subObject->property(subIndex);
-
-    ValueTypeSerializedData sd;
-    sd.type = QDeclarativeMetaProperty::ValueTypeProperty;
-    sd.core.load(metaObject->property(index));
-    sd.valueType.flags = QDeclarativePropertyCache::Data::flagsForProperty(subProp);
-    sd.valueType.valueTypeCoreIdx = subIndex;
-    sd.valueType.valueTypePropType = subProp.userType();
-
-    QByteArray rv((const char *)&sd, sizeof(sd));
-
-    return rv;
-}
-
-QByteArray QDeclarativeMetaPropertyPrivate::saveProperty(const QMetaObject *metaObject, int index)
-{
-    SerializedData sd;
-    sd.type = QDeclarativeMetaProperty::Property;
-    sd.core.load(metaObject->property(index));
-
-    QByteArray rv((const char *)&sd, sizeof(sd));
-    return rv;
-}
-
-QDeclarativeMetaProperty 
-QDeclarativeMetaPropertyPrivate::restore(const QByteArray &data, QObject *object, QDeclarativeContext *ctxt)
-{
-    QDeclarativeMetaProperty prop;
-
-    if (data.isEmpty())
-        return prop;
-
-    prop.d->object = object;
-    prop.d->context = ctxt;
-
-    const SerializedData *sd = (const SerializedData *)data.constData();
-    if (sd->type == QDeclarativeMetaProperty::Property) {
-        prop.d->core = sd->core;
-    } else if(sd->type == QDeclarativeMetaProperty::ValueTypeProperty) {
-        const ValueTypeSerializedData *vt = (const ValueTypeSerializedData *)sd;
-        prop.d->core = vt->core;
-        prop.d->valueType = vt->valueType;
-    }
-
-    return prop;
-}
-
-/*!
-    Returns true if lhs and rhs refer to the same metaobject data
-*/
-bool QDeclarativeMetaPropertyPrivate::equal(const QMetaObject *lhs, const QMetaObject *rhs)
-{
-    return lhs == rhs || (1 && lhs && rhs && lhs->d.stringdata == rhs->d.stringdata);
-}
-
-/*!
-    Returns true if from inherits to.
-*/
-bool QDeclarativeMetaPropertyPrivate::canConvert(const QMetaObject *from, const QMetaObject *to)
-{
-    if (from && to == &QObject::staticMetaObject)
-        return true;
-
-    while (from) {
-        if (equal(from, to))
-            return true;
-        from = from->superClass();
-    }
-    
-    return false;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativemetaproperty.h b/src/declarative/qml/qdeclarativemetaproperty.h
deleted file mode 100644
index 828749f..0000000
--- a/src/declarative/qml/qdeclarativemetaproperty.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEMETAPROPERTY_H
-#define QDECLARATIVEMETAPROPERTY_H
-
-#include <QtCore/qmetaobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QObject;
-class QDeclarativeAbstractBinding;
-class QDeclarativeExpression;
-class QStringList;
-class QVariant;
-struct QMetaObject;
-class QDeclarativeContext;
-class QDeclarativeEngine;
-
-class QDeclarativeMetaPropertyPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeMetaProperty
-{
-public:
-    enum PropertyTypeCategory {
-        InvalidCategory,
-        List,
-        Object,
-        Normal
-    };
-
-    enum Type { Invalid = 0x00, 
-                Property = 0x01, 
-                SignalProperty = 0x02,
-                Default = 0x08,
-                ValueTypeProperty = 0x10 
-    };
-
-    QDeclarativeMetaProperty();
-    ~QDeclarativeMetaProperty();
-
-    QDeclarativeMetaProperty(QObject *);
-    QDeclarativeMetaProperty(QObject *, QDeclarativeContext *);
-
-    QDeclarativeMetaProperty(QObject *, const QString &);
-    QDeclarativeMetaProperty(QObject *, const QString &, QDeclarativeContext *);
-
-    QDeclarativeMetaProperty(const QDeclarativeMetaProperty &);
-    QDeclarativeMetaProperty &operator=(const QDeclarativeMetaProperty &);
-
-    QString name() const;
-
-    QVariant read() const;
-    bool write(const QVariant &) const;
-    bool reset() const;
-
-    bool hasChangedNotifier() const;
-    bool needsChangedNotifier() const;
-    bool connectNotifier(QObject *dest, const char *slot) const;
-    bool connectNotifier(QObject *dest, int method) const;
-
-    Type type() const;
-    bool isProperty() const;
-    bool isDefault() const;
-    bool isWritable() const;
-    bool isDesignable() const;
-    bool isResettable() const;
-    bool isValid() const;
-    QObject *object() const;
-
-    int propertyType() const;
-    PropertyTypeCategory propertyTypeCategory() const;
-    const char *propertyTypeName() const;
-
-    bool operator==(const QDeclarativeMetaProperty &) const;
-
-    int coreIndex() const;
-    QMetaProperty property() const;
-    QMetaMethod method() const;
-
-private:
-    friend class QDeclarativeEnginePrivate;
-    friend class QDeclarativeMetaPropertyPrivate;
-    QDeclarativeMetaPropertyPrivate *d;
-};
-typedef QList<QDeclarativeMetaProperty> QDeclarativeMetaProperties;
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QDECLARATIVEMETAPROPERTY_H
diff --git a/src/declarative/qml/qdeclarativemetaproperty_p.h b/src/declarative/qml/qdeclarativemetaproperty_p.h
deleted file mode 100644
index a171545..0000000
--- a/src/declarative/qml/qdeclarativemetaproperty_p.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEMETAPROPERTY_P_H
-#define QDECLARATIVEMETAPROPERTY_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qdeclarativemetaproperty.h"
-
-#include "qdeclarativepropertycache_p.h"
-#include "qdeclarativeguard_p.h"
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeContext;
-class QDeclarativeEnginePrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeMetaPropertyPrivate
-{
-public:
-    enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02 };
-    Q_DECLARE_FLAGS(WriteFlags, WriteFlag)
-
-    QDeclarativeMetaPropertyPrivate()
-        : q(0), context(0), object(0), isDefaultProperty(false), isNameCached(false) {}
-          
-
-    QDeclarativeMetaPropertyPrivate(const QDeclarativeMetaPropertyPrivate &other)
-        : q(0), context(other.context), object(other.object), 
-          isDefaultProperty(other.isDefaultProperty), isNameCached(other.isNameCached),
-          core(other.core), nameCache(other.nameCache),
-          valueType(other.valueType) {}
-
-    QDeclarativeMetaProperty *q;
-    QDeclarativeContext *context;
-    QDeclarativeGuard<QObject> object;
-
-    bool isDefaultProperty:1;
-    bool isNameCached:1;
-    QDeclarativePropertyCache::Data core;
-    QString nameCache;
-
-    // Describes the "virtual" value-type sub-property.  
-    QDeclarativePropertyCache::ValueTypeData valueType;
-
-    void initProperty(QObject *obj, const QString &name);
-    void initDefault(QObject *obj);
-
-    QMetaMethod findSignal(QObject *, const QString &);
-
-    int propertyType() const;
-    QDeclarativeMetaProperty::PropertyTypeCategory propertyTypeCategory() const;
-
-    QVariant readValueProperty();
-    bool writeValueProperty(const QVariant &, WriteFlags);
-
-    static const QMetaObject *rawMetaObjectForType(QDeclarativeEnginePrivate *, int);
-    static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, 
-                                  const QVariant &value, int flags);
-    static bool write(QObject *, const QDeclarativePropertyCache::Data &, const QVariant &, 
-                      QDeclarativeContext *, WriteFlags flags = 0);
-    static QDeclarativeAbstractBinding *setBinding(QObject *, const QDeclarativePropertyCache::Data &, 
-                                                   QDeclarativeAbstractBinding *,
-                                                   WriteFlags flags = DontRemoveBinding);
-
-    static QByteArray saveValueType(const QMetaObject *, int, 
-                                    const QMetaObject *, int);
-    static QByteArray saveProperty(const QMetaObject *, int);
-    static QDeclarativeMetaProperty restore(const QByteArray &, QObject *, QDeclarativeContext *);
-
-    static bool equal(const QMetaObject *, const QMetaObject *);
-    static bool canConvert(const QMetaObject *from, const QMetaObject *to);
-
-
-    // "Public" (to QML) methods
-    static QDeclarativeAbstractBinding *binding(const QDeclarativeMetaProperty &that);
-    static QDeclarativeAbstractBinding *setBinding(const QDeclarativeMetaProperty &that,
-                                                   QDeclarativeAbstractBinding *,
-                                                   WriteFlags flags = DontRemoveBinding);
-    static QDeclarativeExpression *signalExpression(const QDeclarativeMetaProperty &that);
-    static QDeclarativeExpression *setSignalExpression(const QDeclarativeMetaProperty &that, 
-                                                       QDeclarativeExpression *) ;
-    static bool write(const QDeclarativeMetaProperty &that, const QVariant &, WriteFlags);
-    static int valueTypeCoreIndex(const QDeclarativeMetaProperty &that);
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeMetaPropertyPrivate::WriteFlags)
-
-QT_END_NAMESPACE
-
-#endif // QDECLARATIVEMETAPROPERTY_P_H
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index e87f8ba..abbb9d6 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -619,7 +619,7 @@ QDeclarativeType *QDeclarativeMetaType::qmlType(const QByteArray &name, int vers
 
     QList<QDeclarativeType*> types = data->nameToType.values(name);
     foreach (QDeclarativeType *t, types) {
-        // XXX version_major<0 just a kludge for QDeclarativeMetaPropertyPrivate::initProperty
+        // XXX version_major<0 just a kludge for QDeclarativePropertyPrivate::initProperty
         if (version_major<0 || t->availableInVersion(version_major,version_minor))
             return t;
     }
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index 50fe5c0..542f417 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -338,7 +338,7 @@ void QDeclarativeObjectScriptClass::setProperty(QObject *obj,
         }
     }
 
-    QDeclarativeAbstractBinding *delBinding = QDeclarativeMetaPropertyPrivate::setBinding(obj, *lastData, 0);
+    QDeclarativeAbstractBinding *delBinding = QDeclarativePropertyPrivate::setBinding(obj, *lastData, 0);
     if (delBinding)
         delBinding->destroy();
 
@@ -348,7 +348,7 @@ void QDeclarativeObjectScriptClass::setProperty(QObject *obj,
     } else {
         // ### Can well known types be optimized?
         QVariant v = QDeclarativeScriptClass::toVariant(engine, value);
-        QDeclarativeMetaPropertyPrivate::write(obj, *lastData, v, evalContext);
+        QDeclarativePropertyPrivate::write(obj, *lastData, v, evalContext);
     }
 }
 
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
new file mode 100644
index 0000000..88f356d
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -0,0 +1,1200 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeproperty.h"
+#include "qdeclarativeproperty_p.h"
+
+#include "qdeclarativecompositetypedata_p.h"
+#include "qdeclarative.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativeboundsignal_p.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativedeclarativedata_p.h"
+#include "qdeclarativestringconverters_p.h"
+#include "qdeclarativelist_p.h"
+
+#include <QStringList>
+#include <QtCore/qdebug.h>
+
+#include <math.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QDeclarativeProperty
+    \brief The QDeclarativeProperty class abstracts accessing QML properties.
+    \internal
+ */
+
+/*!
+    Create an invalid QDeclarativeProperty.
+*/
+QDeclarativeProperty::QDeclarativeProperty()
+: d(new QDeclarativePropertyPrivate)
+{
+    d->q = this;
+}
+
+/*!  \internal */
+QDeclarativeProperty::~QDeclarativeProperty()
+{
+    delete d; d = 0;
+}
+
+/*!
+    Creates a QDeclarativeProperty for the default property of \a obj. If there is no
+    default property, an invalid QDeclarativeProperty will be created.
+ */
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj)
+: d(new QDeclarativePropertyPrivate)
+{
+    d->q = this;
+    d->initDefault(obj);
+}
+
+/*!
+    \internal
+    Creates a QDeclarativeProperty for the default property of \a obj. If there is no
+    default property, an invalid QDeclarativeProperty will be created.
+ */
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj, QDeclarativeContext *ctxt)
+: d(new QDeclarativePropertyPrivate)
+{
+    d->q = this;
+    d->context = ctxt;
+    d->initDefault(obj);
+}
+
+/*!
+    Initialize from the default property of \a obj
+*/
+void QDeclarativePropertyPrivate::initDefault(QObject *obj)
+{
+    if (!obj)
+        return;
+
+    QMetaProperty p = QDeclarativeMetaType::defaultProperty(obj);
+    core.load(p);
+    if (core.isValid()) {
+        isDefaultProperty = true;
+        object = obj;
+    }
+}
+
+/*!
+    Creates a QDeclarativeProperty for the property \a name of \a obj.
+ */
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name)
+: d(new QDeclarativePropertyPrivate)
+{
+    d->q = this;
+    d->initProperty(obj, name);
+    if (!isValid()) d->object = 0;
+}
+
+/*!
+    \internal
+    Creates a QDeclarativeProperty for the property \a name of \a obj.
+ */
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QDeclarativeContext *ctxt)
+: d(new QDeclarativePropertyPrivate)
+{
+    d->q = this;
+    d->context = ctxt;
+    d->initProperty(obj, name);
+    if (!isValid()) { d->object = 0; d->context = 0; }
+}
+
+Q_GLOBAL_STATIC(QDeclarativeValueTypeFactory, qmlValueTypes);
+
+void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name)
+{
+    if (!obj) return;
+
+    QDeclarativeEngine *engine = context?context->engine():0;
+    QDeclarativeTypeNameCache *typeNameCache = context?QDeclarativeContextPrivate::get(context)->imports:0;
+
+    QStringList path = name.split(QLatin1Char('.'));
+    if (path.isEmpty()) return;
+
+    QObject *currentObject = obj;
+
+    // Everything up to the last property must be an "object type" property
+    for (int ii = 0; ii < path.count() - 1; ++ii) {
+        const QString &pathName = path.at(ii);
+
+        if (QDeclarativeTypeNameCache::Data *data = typeNameCache?typeNameCache->data(pathName):0) {
+            if (data->type) {
+                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
+                if (!func) return; // Not an attachable type
+
+                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
+                if (!currentObject) return; // Something is broken with the attachable type
+            } else {
+                Q_ASSERT(data->typeNamespace);
+                if ((ii + 1) == path.count()) return; // No type following the namespace
+                
+                ++ii; data = data->typeNamespace->data(path.at(ii));
+                if (!data || !data->type) return; // Invalid type in namespace 
+
+                QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
+                if (!func) return; // Not an attachable type
+
+                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
+                if (!currentObject) return; // Something is broken with the attachable type
+            }
+        } else {
+
+            QDeclarativePropertyCache::Data local;
+            QDeclarativePropertyCache::Data *property = 
+                QDeclarativePropertyCache::property(engine, obj, pathName, local);
+
+            if (!property) return; // Not a property
+            if (property->flags & QDeclarativePropertyCache::Data::IsFunction) 
+                return; // Not an object property 
+
+            if (ii == (path.count() - 2) && property->propType < (int)QVariant::UserType) {
+                // We're now at a value type property.  We can use a global valuetypes array as we 
+                // never actually use the objects, just look up their properties.
+                QObject *typeObject = qmlValueTypes()->valueTypes[property->propType];
+                if (!typeObject) return; // Not a value type
+
+                int idx = typeObject->metaObject()->indexOfProperty(path.last().toUtf8().constData());
+                if (idx == -1) return; // Value type property does not exist
+
+                QMetaProperty vtProp = typeObject->metaObject()->property(idx);
+
+                object = currentObject;
+                core = *property;
+                valueType.flags = QDeclarativePropertyCache::Data::flagsForProperty(vtProp);
+                valueType.valueTypeCoreIdx = idx;
+                valueType.valueTypePropType = vtProp.userType();
+
+                return; 
+            } else {
+                if (!(property->flags & QDeclarativePropertyCache::Data::IsQObjectDerived)) 
+                    return; // Not an object property
+
+                void *args[] = { &currentObject, 0 };
+                QMetaObject::metacall(currentObject, QMetaObject::ReadProperty, property->coreIndex, args);
+                if (!currentObject) return; // No value
+
+            }
+        }
+
+    }
+
+    const QString &terminal = path.last();
+
+    if (terminal.count() >= 3 &&
+        terminal.at(0) == QLatin1Char('o') &&
+        terminal.at(1) == QLatin1Char('n') &&
+        terminal.at(2).isUpper()) {
+
+        QString signalName = terminal.mid(2);
+        signalName[0] = signalName.at(0).toLower();
+
+        QMetaMethod method = findSignal(currentObject, signalName);
+        if (method.signature()) {
+            object = currentObject;
+            core.load(method);
+            return;
+        }
+    }
+
+    // Property
+    QDeclarativePropertyCache::Data local;
+    QDeclarativePropertyCache::Data *property = 
+        QDeclarativePropertyCache::property(context?context->engine():0, currentObject, terminal, local);
+    if (property && !(property->flags & QDeclarativePropertyCache::Data::IsFunction)) {
+        object = currentObject;
+        core = *property;
+    }
+}
+
+/*!
+    Create a copy of \a other.
+*/
+QDeclarativeProperty::QDeclarativeProperty(const QDeclarativeProperty &other)
+: d(new QDeclarativePropertyPrivate(*other.d))
+{
+    d->q = this;
+}
+
+/*!
+  \enum QDeclarativeProperty::PropertyTypeCategory
+
+  This enum specifies a category of QML property.
+
+  \value InvalidCategory The property is invalid.
+  \value List The property is a QList pointer
+  \value Object The property is a QObject derived type pointer
+  \value Normal The property is none of the above.
+ */
+
+/*!
+  \enum QDeclarativeProperty::Type
+
+  This enum specifies a type of QML property.
+
+  \value Invalid The property is invalid.
+  \value Property The property is a regular Qt property.
+  \value SignalProperty The property is a signal property.
+  \value Default The property is the default property.
+*/
+
+/*!
+    Returns the property category.
+*/
+QDeclarativeProperty::PropertyTypeCategory QDeclarativeProperty::propertyTypeCategory() const
+{
+    return d->propertyTypeCategory();
+}
+
+QDeclarativeProperty::PropertyTypeCategory 
+QDeclarativePropertyPrivate::propertyTypeCategory() const
+{
+    uint type = q->type();
+
+    if (type & QDeclarativeProperty::ValueTypeProperty) {
+        return QDeclarativeProperty::Normal;
+    } else if (type & QDeclarativeProperty::Property) {
+        int type = propertyType();
+        if (type == QVariant::Invalid)
+            return QDeclarativeProperty::InvalidCategory;
+        else if ((uint)type < QVariant::UserType)
+            return QDeclarativeProperty::Normal;
+        else if (core.flags & QDeclarativePropertyCache::Data::IsQObjectDerived)
+            return QDeclarativeProperty::Object;
+        else if (core.flags & QDeclarativePropertyCache::Data::IsQList)
+            return QDeclarativeProperty::List;
+        else 
+            return QDeclarativeProperty::Normal;
+    } else {
+        return QDeclarativeProperty::InvalidCategory;
+    }
+}
+
+/*!
+    Returns the type name of the property, or 0 if the property has no type
+    name.
+*/
+const char *QDeclarativeProperty::propertyTypeName() const
+{
+    if (type() & ValueTypeProperty) {
+
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(d->context);
+        QDeclarativeValueType *valueType = 0;
+        if (ep) valueType = ep->valueTypes[d->core.propType];
+        else valueType = QDeclarativeValueTypeFactory::valueType(d->core.propType);
+        Q_ASSERT(valueType);
+
+        const char *rv = valueType->metaObject()->property(d->valueType.valueTypeCoreIdx).typeName();
+
+        if (!ep) delete valueType;
+
+        return rv;
+    } else if (d->object && type() & Property && d->core.isValid()) {
+        return d->object->metaObject()->property(d->core.coreIndex).typeName();
+    } else {
+        return 0;
+    }
+}
+
+/*!
+    Returns true if \a other and this QDeclarativeProperty represent the same 
+    property.
+*/
+bool QDeclarativeProperty::operator==(const QDeclarativeProperty &other) const
+{
+    // category is intentially omitted here as it is generated 
+    // from the other members
+    return d->object == other.d->object &&
+           d->core == other.d->core &&
+           d->valueType == other.d->valueType;
+}
+
+/*!
+    Returns the QVariant type of the property, or QVariant::Invalid if the 
+    property has no QVariant type.
+*/
+int QDeclarativeProperty::propertyType() const
+{
+    return d->propertyType();
+}
+
+int QDeclarativePropertyPrivate::propertyType() const
+{
+    uint type = q->type();
+    if (type & QDeclarativeProperty::ValueTypeProperty) {
+        return valueType.valueTypePropType;
+    } else if (type & QDeclarativeProperty::Property) {
+        if (core.propType == (int)QVariant::LastType)
+            return qMetaTypeId<QVariant>();
+        else
+            return core.propType;
+    } else {
+        return QVariant::Invalid;
+    }
+}
+
+/*!
+    Returns the type of the property.
+*/
+QDeclarativeProperty::Type QDeclarativeProperty::type() const
+{
+    if (d->core.flags & QDeclarativePropertyCache::Data::IsFunction)
+        return SignalProperty;
+    else if (d->valueType.valueTypeCoreIdx != -1)
+        return (Type)(Property | ValueTypeProperty);
+    else if (d->core.isValid())
+        return (Type)(Property | ((d->isDefaultProperty)?Default:0));
+    else
+        return Invalid;
+}
+
+/*!
+    Returns true if this QDeclarativeProperty represents a regular Qt property.
+*/
+bool QDeclarativeProperty::isProperty() const
+{
+    return type() & Property;
+}
+
+/*!
+    Returns true if this QDeclarativeProperty represents a default property.
+*/
+bool QDeclarativeProperty::isDefault() const
+{
+    return type() & Default;
+}
+
+/*!
+    Returns the QDeclarativeProperty's QObject.
+*/
+QObject *QDeclarativeProperty::object() const
+{
+    return d->object;
+}
+
+/*!
+    Assign \a other to this QDeclarativeProperty.
+*/
+QDeclarativeProperty &QDeclarativeProperty::operator=(const QDeclarativeProperty &other)
+{
+    d->context = other.d->context;
+    d->object = other.d->object;
+
+    d->isDefaultProperty = other.d->isDefaultProperty;
+    d->isNameCached = other.d->isNameCached;
+    d->core = other.d->core;
+    d->nameCache = other.d->nameCache;
+
+    d->valueType = other.d->valueType;
+
+    return *this;
+}
+
+/*!
+    Returns true if the property is writable, otherwise false.
+*/
+bool QDeclarativeProperty::isWritable() const
+{
+    QDeclarativeProperty::PropertyTypeCategory category = propertyTypeCategory();
+
+    if (!d->object)
+        return false;
+    if (category == List)
+        return true;
+    else if (type() & SignalProperty)
+        return false;
+    else if (d->core.isValid() && d->object)
+        return d->core.flags & QDeclarativePropertyCache::Data::IsWritable;
+    else
+        return false;
+}
+
+/*!
+    Returns true if the property is designable, otherwise false.
+*/
+bool QDeclarativeProperty::isDesignable() const
+{
+    if (type() & Property && d->core.isValid() && d->object)
+        return d->object->metaObject()->property(d->core.coreIndex).isDesignable();
+    else
+        return false;
+}
+
+/*!
+    Returns true if the property is resettable, otherwise false.
+*/
+bool QDeclarativeProperty::isResettable() const
+{
+    if (type() & Property && d->core.isValid() && d->object)
+        return d->core.flags & QDeclarativePropertyCache::Data::IsResettable;
+    else
+        return false;
+}
+
+/*!
+    Returns true if the QDeclarativeProperty refers to a valid property, otherwise
+    false.
+*/
+bool QDeclarativeProperty::isValid() const
+{
+    return type() != Invalid;
+}
+
+/*!
+    Return the name of this QML property.
+*/
+QString QDeclarativeProperty::name() const
+{
+    if (!d->isNameCached) {
+        // ###
+        if (!d->object) {
+        } else if (type() & ValueTypeProperty) {
+            QString rv = d->core.name(d->object) + QLatin1Char('.');
+
+            QDeclarativeEnginePrivate *ep = d->context?QDeclarativeEnginePrivate::get(d->context->engine()):0;
+            QDeclarativeValueType *valueType = 0;
+            if (ep) valueType = ep->valueTypes[d->core.propType];
+            else valueType = QDeclarativeValueTypeFactory::valueType(d->core.propType);
+            Q_ASSERT(valueType);
+
+            rv += QString::fromUtf8(valueType->metaObject()->property(d->valueType.valueTypeCoreIdx).name());
+
+            if (!ep) delete valueType;
+
+            d->nameCache = rv;
+        } else if (type() & SignalProperty) {
+            QString name = QLatin1String("on") + d->core.name(d->object);
+            name[2] = name.at(2).toUpper();
+            d->nameCache = name;
+        } else {
+            d->nameCache = d->core.name(d->object);
+        }
+        d->isNameCached = true;
+    }
+
+    return d->nameCache;
+}
+
+/*!
+  Returns the \l{QMetaProperty} {Qt property} associated with
+  this QML property.
+ */
+QMetaProperty QDeclarativeProperty::property() const
+{
+    if (type() & Property && d->core.isValid() && d->object)
+        return d->object->metaObject()->property(d->core.coreIndex);
+    else
+        return QMetaProperty();
+}
+
+/*!
+    Return the QMetaMethod for this property if it is a SignalProperty, 
+    otherwise returns an invalid QMetaMethod.
+*/
+QMetaMethod QDeclarativeProperty::method() const
+{
+    if (type() & SignalProperty && d->object)
+        return d->object->metaObject()->method(d->core.coreIndex);
+    else
+        return QMetaMethod();
+}
+
+
+/*!
+    Returns the binding associated with this property, or 0 if no binding 
+    exists.
+*/
+QDeclarativeAbstractBinding *
+QDeclarativePropertyPrivate::binding(const QDeclarativeProperty &that) 
+{
+    if (!that.isProperty() || !that.d->object)
+        return 0;
+
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(that.d->object);
+    if (!data) 
+        return 0;
+
+    if (!data->hasBindingBit(that.d->core.coreIndex))
+        return 0;
+
+    QDeclarativeAbstractBinding *binding = data->bindings;
+    while (binding) {
+        // ### This wont work for value types
+        if (binding->propertyIndex() == that.d->core.coreIndex)
+            return binding; 
+        binding = binding->m_nextBinding;
+    }
+    return 0;
+}
+
+/*!
+    Set the binding associated with this property to \a newBinding.  Returns
+    the existing binding (if any), otherwise 0.
+
+    \a newBinding will be enabled, and the returned binding (if any) will be
+    disabled.
+
+    Ownership of \a newBinding transfers to QML.  Ownership of the return value
+    is assumed by the caller.
+
+    \a flags is passed through to the binding and is used for the initial update (when
+    the binding sets the intial value, it will use these flags for the write).
+*/
+QDeclarativeAbstractBinding *
+QDeclarativePropertyPrivate::setBinding(const QDeclarativeProperty &that,
+                                            QDeclarativeAbstractBinding *newBinding, 
+                                            WriteFlags flags) 
+{
+    if (!that.isProperty() || !that.d->object) {
+        if (newBinding)
+            newBinding->destroy();
+        return 0;
+    }
+
+    return that.d->setBinding(that.d->object, that.d->core, newBinding, flags);
+}
+
+QDeclarativeAbstractBinding *
+QDeclarativePropertyPrivate::setBinding(QObject *object, const QDeclarativePropertyCache::Data &core, 
+                                   QDeclarativeAbstractBinding *newBinding, WriteFlags flags)
+{
+    QDeclarativeDeclarativeData *data = QDeclarativeDeclarativeData::get(object, 0 != newBinding);
+
+    if (data && data->hasBindingBit(core.coreIndex)) {
+        QDeclarativeAbstractBinding *binding = data->bindings;
+        while (binding) {
+            // ### This wont work for value types
+            if (binding->propertyIndex() == core.coreIndex) {
+                binding->setEnabled(false);
+
+                if (newBinding) 
+                    newBinding->setEnabled(true, flags);
+
+                return binding; // ### QDeclarativeAbstractBinding;
+            }
+
+            binding = binding->m_nextBinding;
+        }
+    } 
+
+    if (newBinding)
+        newBinding->setEnabled(true, flags);
+
+    return 0;
+}
+
+/*!
+    Returns the expression associated with this signal property, or 0 if no 
+    signal expression exists.
+*/
+QDeclarativeExpression *
+QDeclarativePropertyPrivate::signalExpression(const QDeclarativeProperty &that)
+{
+    if (!(that.type() & QDeclarativeProperty::SignalProperty))
+        return 0;
+
+    const QObjectList &children = that.d->object->children();
+    
+    for (int ii = 0; ii < children.count(); ++ii) {
+        QObject *child = children.at(ii);
+
+        QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
+        if (signal && signal->index() == that.coreIndex()) 
+            return signal->expression();
+    }
+
+    return 0;
+}
+
+/*!
+    Set the signal expression associated with this signal property to \a expr.
+    Returns the existing signal expression (if any), otherwise 0.
+
+    Ownership of \a expr transfers to QML.  Ownership of the return value is
+    assumed by the caller.
+*/
+QDeclarativeExpression *
+QDeclarativePropertyPrivate::setSignalExpression(const QDeclarativeProperty &that,
+                                                     QDeclarativeExpression *expr) 
+{
+    if (!(that.type() & QDeclarativeProperty::SignalProperty)) {
+        delete expr;
+        return 0;
+    }
+
+    const QObjectList &children = that.d->object->children();
+    
+    for (int ii = 0; ii < children.count(); ++ii) {
+        QObject *child = children.at(ii);
+
+        QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
+        if (signal && signal->index() == that.coreIndex()) 
+            return signal->setExpression(expr);
+    }
+
+    if (expr) {
+        QDeclarativeBoundSignal *signal = new QDeclarativeBoundSignal(that.d->object, that.method(), that.d->object);
+        return signal->setExpression(expr);
+    } else {
+        return 0;
+    }
+}
+
+QMetaMethod QDeclarativePropertyPrivate::findSignal(QObject *obj, const QString &name)
+{
+    const QMetaObject *mo = obj->metaObject();
+
+    int methods = mo->methodCount();
+    for (int ii = methods - 1; ii >= 0; --ii) {
+        QMetaMethod method = mo->method(ii);
+        QString methodName = QString::fromUtf8(method.signature());
+        int idx = methodName.indexOf(QLatin1Char('('));
+        methodName = methodName.left(idx);
+
+        if (methodName == name) 
+            return method;
+    }
+    return QMetaMethod();
+}
+
+/*!
+    Returns the property value.
+*/
+QVariant QDeclarativeProperty::read() const
+{
+    if (!d->object)
+        return QVariant();
+
+    if (type() & SignalProperty) {
+
+        return QVariant();
+
+    } else if (type() & Property) {
+
+        return d->readValueProperty();
+
+    }
+    return QVariant();
+}
+
+QVariant QDeclarativePropertyPrivate::readValueProperty()
+{
+    uint type = q->type();
+    if(type & QDeclarativeProperty::ValueTypeProperty) {
+
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
+        QDeclarativeValueType *valueType = 0;
+        if (ep) valueType = ep->valueTypes[core.propType];
+        else valueType = QDeclarativeValueTypeFactory::valueType(core.propType);
+        Q_ASSERT(valueType);
+
+        valueType->read(object, core.coreIndex);
+
+        QVariant rv =
+            valueType->metaObject()->property(this->valueType.valueTypeCoreIdx).read(valueType);
+
+        if (!ep) delete valueType;
+        return rv;
+
+    } else if(core.flags & QDeclarativePropertyCache::Data::IsQList) {
+
+        QDeclarativeListProperty<QObject> prop;
+        void *args[] = { &prop, 0 };
+        QMetaObject::metacall(object, QMetaObject::ReadProperty, core.coreIndex, args);
+        return QVariant::fromValue(QDeclarativeListReferencePrivate::init(prop, core.propType, context?context->engine():0));
+
+    } else {
+
+        return object->metaObject()->property(core.coreIndex).read(object.data());
+
+    }
+}
+
+//###
+//writeEnumProperty MIRRORS the relelvant bit of QMetaProperty::write AND MUST BE KEPT IN SYNC!
+//###
+bool QDeclarativePropertyPrivate::writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags)
+{
+    if (!object || !prop.isWritable())
+        return false;
+
+    QVariant v = value;
+    if (prop.isEnumType()) {
+        QMetaEnum menum = prop.enumerator();
+        if (v.userType() == QVariant::String
+#ifdef QT3_SUPPORT
+            || v.userType() == QVariant::CString
+#endif
+            ) {
+            if (prop.isFlagType())
+                v = QVariant(menum.keysToValue(value.toByteArray()));
+            else
+                v = QVariant(menum.keyToValue(value.toByteArray()));
+        } else if (v.userType() != QVariant::Int && v.userType() != QVariant::UInt) {
+            int enumMetaTypeId = QMetaType::type(QByteArray(menum.scope()) + "::" + menum.name());
+            if ((enumMetaTypeId == 0) || (v.userType() != enumMetaTypeId) || !v.constData())
+                return false;
+            v = QVariant(*reinterpret_cast<const int *>(v.constData()));
+        }
+        v.convert(QVariant::Int);
+    }
+
+    // the status variable is changed by qt_metacall to indicate what it did
+    // this feature is currently only used by QtDBus and should not be depended
+    // upon. Don't change it without looking into QDBusAbstractInterface first
+    // -1 (unchanged): normal qt_metacall, result stored in argv[0]
+    // changed: result stored directly in value, return the value of status
+    int status = -1;
+    void *argv[] = { v.data(), &v, &status, &flags };
+    QMetaObject::metacall(object, QMetaObject::WriteProperty, idx, argv);
+    return status;
+}
+
+bool QDeclarativePropertyPrivate::writeValueProperty(const QVariant &value, WriteFlags flags)
+{
+    // Remove any existing bindings on this property
+    if (!(flags & DontRemoveBinding)) {
+        QDeclarativeAbstractBinding *binding = setBinding(*q, 0);
+        if (binding) binding->destroy();
+    }
+
+    bool rv = false;
+    uint type = q->type();
+    if (type & QDeclarativeProperty::ValueTypeProperty) {
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
+
+        QDeclarativeValueType *writeBack = 0;
+        if (ep) {
+            writeBack = ep->valueTypes[core.propType];
+        } else {
+            writeBack = QDeclarativeValueTypeFactory::valueType(core.propType);
+        }
+
+        writeBack->read(object, core.coreIndex);
+
+        QDeclarativePropertyCache::Data data = core;
+        data.flags = valueType.flags;
+        data.coreIndex = valueType.valueTypeCoreIdx;
+        data.propType = valueType.valueTypePropType;
+        rv = write(writeBack, data, value, context, flags);
+
+        writeBack->write(object, core.coreIndex, flags);
+        if (!ep) delete writeBack;
+
+    } else {
+
+        rv = write(object, core, value, context, flags);
+
+    }
+
+    return rv;
+}
+
+bool QDeclarativePropertyPrivate::write(QObject *object, const QDeclarativePropertyCache::Data &property, 
+                                            const QVariant &value, QDeclarativeContext *context, 
+                                            WriteFlags flags)
+{
+    int coreIdx = property.coreIndex;
+    int status = -1;    //for dbus
+
+    if (property.flags & QDeclarativePropertyCache::Data::IsEnumType) {
+        QMetaProperty prop = object->metaObject()->property(property.coreIndex);
+        QVariant v = value;
+        // Enum values come through the script engine as doubles
+        if (value.userType() == QVariant::Double) { 
+            double integral;
+            double fractional = modf(value.toDouble(), &integral);
+            if (qFuzzyIsNull(fractional))
+                v.convert(QVariant::Int);
+        }
+        return writeEnumProperty(prop, coreIdx, object, v, flags);
+    }
+
+    int propertyType = property.propType;
+    int variantType = value.userType();
+
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(context);
+
+    if (propertyType == QVariant::Url) {
+
+        QUrl u;
+        bool found = false;
+        if (variantType == QVariant::Url) {
+            u = value.toUrl();
+            found = true;
+        } else if (variantType == QVariant::ByteArray) {
+            u = QUrl(QString::fromUtf8(value.toByteArray()));
+            found = true;
+        } else if (variantType == QVariant::String) {
+            u = QUrl(value.toString());
+            found = true;
+        }
+
+        if (!found)
+            return false;
+
+        if (context && u.isRelative() && !u.isEmpty())
+            u = context->resolvedUrl(u);
+        int status = -1;
+        void *argv[] = { &u, 0, &status, &flags };
+        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, argv);
+
+    } else if (variantType == propertyType) {
+
+        void *a[] = { (void *)value.constData(), 0, &status, &flags };
+        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+
+    } else if (qMetaTypeId<QVariant>() == propertyType) {
+
+        void *a[] = { (void *)&value, 0, &status, &flags };
+        QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+
+    } else if (property.flags & QDeclarativePropertyCache::Data::IsQObjectDerived) {
+
+        const QMetaObject *valMo = rawMetaObjectForType(enginePriv, value.userType());
+        
+        if (!valMo)
+            return false;
+
+        QObject *o = *(QObject **)value.constData();
+        const QMetaObject *propMo = rawMetaObjectForType(enginePriv, propertyType);
+
+        if (o) valMo = o->metaObject();
+
+        if (canConvert(valMo, propMo)) {
+            void *args[] = { &o, 0, &status, &flags };
+            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, 
+                                  args);
+        } else if (!o && canConvert(propMo, valMo)) {
+            // In the case of a null QObject, we assign the null if there is 
+            // any change that the null variant type could be up or down cast to 
+            // the property type.
+            void *args[] = { &o, 0, &status, &flags };
+            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, 
+                                  args);
+        } else {
+            return false;
+        }
+
+    } else if (property.flags & QDeclarativePropertyCache::Data::IsQList) {
+
+        const QMetaObject *listType = 0;
+        if (enginePriv) {
+            listType = enginePriv->rawMetaObjectForType(enginePriv->listType(property.propType));
+        } else {
+            QDeclarativeType *type = QDeclarativeMetaType::qmlType(QDeclarativeMetaType::listType(property.propType));
+            if (!type) return false;
+            listType = type->baseMetaObject();
+        }
+        if (!listType) return false;
+
+        QDeclarativeListProperty<void> prop;
+        void *args[] = { &prop, 0 };
+        QMetaObject::metacall(object, QMetaObject::ReadProperty, coreIdx, args);
+
+        if (!prop.clear) return false;
+
+        prop.clear(&prop);
+
+        if (value.userType() == qMetaTypeId<QList<QObject *> >()) {
+            const QList<QObject *> &list = qvariant_cast<QList<QObject *> >(value);
+
+            for (int ii = 0; ii < list.count(); ++ii) {
+                QObject *o = list.at(ii);
+                if (!canConvert(o->metaObject(), listType))
+                    o = 0;
+                prop.append(&prop, (void *)o);
+            }
+        } else {
+            QObject *o = enginePriv?enginePriv->toQObject(value):QDeclarativeMetaType::toQObject(value);
+            if (!canConvert(o->metaObject(), listType))
+                o = 0;
+            prop.append(&prop, (void *)o);
+        }
+
+    } else {
+        Q_ASSERT(variantType != propertyType);
+
+        QVariant v = value;
+        if (v.convert((QVariant::Type)propertyType)) {
+            void *a[] = { (void *)v.constData(), 0, &status, &flags};
+            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+        } else if ((uint)propertyType >= QVariant::UserType && variantType == QVariant::String) {
+            QDeclarativeMetaType::StringConverter con = QDeclarativeMetaType::customStringConverter(propertyType);
+            if (!con)
+                return false;
+
+            QVariant v = con(value.toString());
+            if (v.userType() == propertyType) {
+                void *a[] = { (void *)v.constData(), 0, &status, &flags};
+                QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+            }
+        } else if (variantType == QVariant::String) {
+            bool ok = false;
+            QVariant v = QDeclarativeStringConverters::variantFromString(value.toString(), propertyType, &ok);
+            if (!ok)
+                return false;
+
+            void *a[] = { (void *)v.constData(), 0, &status, &flags};
+            QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a);
+        } else {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+const QMetaObject *QDeclarativePropertyPrivate::rawMetaObjectForType(QDeclarativeEnginePrivate *engine, int userType)
+{
+    if (engine) {
+        return engine->rawMetaObjectForType(userType);
+    } else {
+        QDeclarativeType *type = QDeclarativeMetaType::qmlType(userType);
+        return type?type->baseMetaObject():0;
+    }
+}
+
+/*!
+    Set the property value to \a value.
+*/
+bool QDeclarativeProperty::write(const QVariant &value) const
+{
+    return QDeclarativePropertyPrivate::write(*this, value, 0);
+}
+
+/*!
+    Resets the property value.
+*/
+bool QDeclarativeProperty::reset() const
+{
+    if (isResettable()) {
+        void *args[] = { 0 };
+        QMetaObject::metacall(d->object, QMetaObject::ResetProperty, d->core.coreIndex, args);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool QDeclarativePropertyPrivate::write(const QDeclarativeProperty &that,
+                                            const QVariant &value, WriteFlags flags) 
+{
+    if (that.d->object && that.type() & QDeclarativeProperty::Property && 
+        that.d->core.isValid() && that.isWritable()) 
+        return that.d->writeValueProperty(value, flags);
+    else 
+        return false;
+}
+
+/*!
+    Returns true if the property has a change notifier signal, otherwise false.
+*/
+bool QDeclarativeProperty::hasChangedNotifier() const
+{
+    if (type() & Property && d->object) {
+        return d->object->metaObject()->property(d->core.coreIndex).hasNotifySignal();
+    }
+    return false;
+}
+
+/*!
+    Returns true if the property needs a change notifier signal for bindings
+    to remain upto date, false otherwise.
+
+    Some properties, such as attached properties or those whose value never 
+    changes, do not require a change notifier.
+*/
+bool QDeclarativeProperty::needsChangedNotifier() const
+{
+    return type() & Property && !property().isConstant();
+}
+
+/*!
+    Connects the property's change notifier signal to the
+    specified \a method of the \a dest object and returns
+    true. Returns false if this metaproperty does not
+    represent a regular Qt property or if it has no
+    change notifier signal, or if the \a dest object does
+    not have the specified \a method.
+*/
+bool QDeclarativeProperty::connectNotifier(QObject *dest, int method) const
+{
+    if (!(type() & Property) || !d->object)
+        return false;
+
+    QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
+    if (prop.hasNotifySignal()) {
+        return QMetaObject::connect(d->object, prop.notifySignalIndex(), dest, method, Qt::DirectConnection);
+    } else {
+        return false;
+    }
+}
+
+/*!
+    Connects the property's change notifier signal to the
+    specified \a slot of the \a dest object and returns
+    true. Returns false if this metaproperty does not
+    represent a regular Qt property or if it has no
+    change notifier signal, or if the \a dest object does
+    not have the specified \a slot.
+*/
+bool QDeclarativeProperty::connectNotifier(QObject *dest, const char *slot) const
+{
+    if (!(type() & Property) || !d->object)
+        return false;
+
+    QMetaProperty prop = d->object->metaObject()->property(d->core.coreIndex);
+    if (prop.hasNotifySignal()) {
+        QByteArray signal(QByteArray("2") + prop.notifySignal().signature());
+        return QObject::connect(d->object, signal.constData(), dest, slot);
+    } else  {
+        return false;
+    }
+}
+
+/*!
+    Return the Qt metaobject index of the property.
+*/
+int QDeclarativeProperty::coreIndex() const
+{
+    return d->core.coreIndex;
+}
+
+int QDeclarativePropertyPrivate::valueTypeCoreIndex(const QDeclarativeProperty &that)
+{
+    return that.d->valueType.valueTypeCoreIdx;
+}
+
+struct SerializedData {
+    QDeclarativeProperty::Type type;
+    QDeclarativePropertyCache::Data core;
+};
+
+struct ValueTypeSerializedData : public SerializedData {
+    QDeclarativePropertyCache::ValueTypeData valueType;
+};
+
+QByteArray QDeclarativePropertyPrivate::saveValueType(const QMetaObject *metaObject, int index, 
+                                                 const QMetaObject *subObject, int subIndex)
+{
+    QMetaProperty prop = metaObject->property(index);
+    QMetaProperty subProp = subObject->property(subIndex);
+
+    ValueTypeSerializedData sd;
+    sd.type = QDeclarativeProperty::ValueTypeProperty;
+    sd.core.load(metaObject->property(index));
+    sd.valueType.flags = QDeclarativePropertyCache::Data::flagsForProperty(subProp);
+    sd.valueType.valueTypeCoreIdx = subIndex;
+    sd.valueType.valueTypePropType = subProp.userType();
+
+    QByteArray rv((const char *)&sd, sizeof(sd));
+
+    return rv;
+}
+
+QByteArray QDeclarativePropertyPrivate::saveProperty(const QMetaObject *metaObject, int index)
+{
+    SerializedData sd;
+    sd.type = QDeclarativeProperty::Property;
+    sd.core.load(metaObject->property(index));
+
+    QByteArray rv((const char *)&sd, sizeof(sd));
+    return rv;
+}
+
+QDeclarativeProperty 
+QDeclarativePropertyPrivate::restore(const QByteArray &data, QObject *object, QDeclarativeContext *ctxt)
+{
+    QDeclarativeProperty prop;
+
+    if (data.isEmpty())
+        return prop;
+
+    prop.d->object = object;
+    prop.d->context = ctxt;
+
+    const SerializedData *sd = (const SerializedData *)data.constData();
+    if (sd->type == QDeclarativeProperty::Property) {
+        prop.d->core = sd->core;
+    } else if(sd->type == QDeclarativeProperty::ValueTypeProperty) {
+        const ValueTypeSerializedData *vt = (const ValueTypeSerializedData *)sd;
+        prop.d->core = vt->core;
+        prop.d->valueType = vt->valueType;
+    }
+
+    return prop;
+}
+
+/*!
+    Returns true if lhs and rhs refer to the same metaobject data
+*/
+bool QDeclarativePropertyPrivate::equal(const QMetaObject *lhs, const QMetaObject *rhs)
+{
+    return lhs == rhs || (1 && lhs && rhs && lhs->d.stringdata == rhs->d.stringdata);
+}
+
+/*!
+    Returns true if from inherits to.
+*/
+bool QDeclarativePropertyPrivate::canConvert(const QMetaObject *from, const QMetaObject *to)
+{
+    if (from && to == &QObject::staticMetaObject)
+        return true;
+
+    while (from) {
+        if (equal(from, to))
+            return true;
+        from = from->superClass();
+    }
+    
+    return false;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h
new file mode 100644
index 0000000..be1065e
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeproperty.h
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPROPERTY_H
+#define QDECLARATIVEPROPERTY_H
+
+#include <QtCore/qmetaobject.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QObject;
+class QDeclarativeAbstractBinding;
+class QDeclarativeExpression;
+class QStringList;
+class QVariant;
+struct QMetaObject;
+class QDeclarativeContext;
+class QDeclarativeEngine;
+
+class QDeclarativePropertyPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeProperty
+{
+public:
+    enum PropertyTypeCategory {
+        InvalidCategory,
+        List,
+        Object,
+        Normal
+    };
+
+    enum Type { Invalid = 0x00, 
+                Property = 0x01, 
+                SignalProperty = 0x02,
+                Default = 0x08,
+                ValueTypeProperty = 0x10 
+    };
+
+    QDeclarativeProperty();
+    ~QDeclarativeProperty();
+
+    QDeclarativeProperty(QObject *);
+    QDeclarativeProperty(QObject *, QDeclarativeContext *);
+
+    QDeclarativeProperty(QObject *, const QString &);
+    QDeclarativeProperty(QObject *, const QString &, QDeclarativeContext *);
+
+    QDeclarativeProperty(const QDeclarativeProperty &);
+    QDeclarativeProperty &operator=(const QDeclarativeProperty &);
+
+    QString name() const;
+
+    QVariant read() const;
+    bool write(const QVariant &) const;
+    bool reset() const;
+
+    bool hasChangedNotifier() const;
+    bool needsChangedNotifier() const;
+    bool connectNotifier(QObject *dest, const char *slot) const;
+    bool connectNotifier(QObject *dest, int method) const;
+
+    Type type() const;
+    bool isProperty() const;
+    bool isDefault() const;
+    bool isWritable() const;
+    bool isDesignable() const;
+    bool isResettable() const;
+    bool isValid() const;
+    QObject *object() const;
+
+    int propertyType() const;
+    PropertyTypeCategory propertyTypeCategory() const;
+    const char *propertyTypeName() const;
+
+    bool operator==(const QDeclarativeProperty &) const;
+
+    int coreIndex() const;
+    QMetaProperty property() const;
+    QMetaMethod method() const;
+
+private:
+    friend class QDeclarativeEnginePrivate;
+    friend class QDeclarativePropertyPrivate;
+    QDeclarativePropertyPrivate *d;
+};
+typedef QList<QDeclarativeProperty> QDeclarativeProperties;
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPROPERTY_H
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h
new file mode 100644
index 0000000..d0ad09c
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeproperty_p.h
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEPROPERTY_P_H
+#define QDECLARATIVEPROPERTY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativeproperty.h"
+
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativeguard_p.h"
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeContext;
+class QDeclarativeEnginePrivate;
+class Q_AUTOTEST_EXPORT QDeclarativePropertyPrivate
+{
+public:
+    enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02 };
+    Q_DECLARE_FLAGS(WriteFlags, WriteFlag)
+
+    QDeclarativePropertyPrivate()
+        : q(0), context(0), object(0), isDefaultProperty(false), isNameCached(false) {}
+          
+
+    QDeclarativePropertyPrivate(const QDeclarativePropertyPrivate &other)
+        : q(0), context(other.context), object(other.object), 
+          isDefaultProperty(other.isDefaultProperty), isNameCached(other.isNameCached),
+          core(other.core), nameCache(other.nameCache),
+          valueType(other.valueType) {}
+
+    QDeclarativeProperty *q;
+    QDeclarativeContext *context;
+    QDeclarativeGuard<QObject> object;
+
+    bool isDefaultProperty:1;
+    bool isNameCached:1;
+    QDeclarativePropertyCache::Data core;
+    QString nameCache;
+
+    // Describes the "virtual" value-type sub-property.  
+    QDeclarativePropertyCache::ValueTypeData valueType;
+
+    void initProperty(QObject *obj, const QString &name);
+    void initDefault(QObject *obj);
+
+    QMetaMethod findSignal(QObject *, const QString &);
+
+    int propertyType() const;
+    QDeclarativeProperty::PropertyTypeCategory propertyTypeCategory() const;
+
+    QVariant readValueProperty();
+    bool writeValueProperty(const QVariant &, WriteFlags);
+
+    static const QMetaObject *rawMetaObjectForType(QDeclarativeEnginePrivate *, int);
+    static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, 
+                                  const QVariant &value, int flags);
+    static bool write(QObject *, const QDeclarativePropertyCache::Data &, const QVariant &, 
+                      QDeclarativeContext *, WriteFlags flags = 0);
+    static QDeclarativeAbstractBinding *setBinding(QObject *, const QDeclarativePropertyCache::Data &, 
+                                                   QDeclarativeAbstractBinding *,
+                                                   WriteFlags flags = DontRemoveBinding);
+
+    static QByteArray saveValueType(const QMetaObject *, int, 
+                                    const QMetaObject *, int);
+    static QByteArray saveProperty(const QMetaObject *, int);
+    static QDeclarativeProperty restore(const QByteArray &, QObject *, QDeclarativeContext *);
+
+    static bool equal(const QMetaObject *, const QMetaObject *);
+    static bool canConvert(const QMetaObject *from, const QMetaObject *to);
+
+
+    // "Public" (to QML) methods
+    static QDeclarativeAbstractBinding *binding(const QDeclarativeProperty &that);
+    static QDeclarativeAbstractBinding *setBinding(const QDeclarativeProperty &that,
+                                                   QDeclarativeAbstractBinding *,
+                                                   WriteFlags flags = DontRemoveBinding);
+    static QDeclarativeExpression *signalExpression(const QDeclarativeProperty &that);
+    static QDeclarativeExpression *setSignalExpression(const QDeclarativeProperty &that, 
+                                                       QDeclarativeExpression *) ;
+    static bool write(const QDeclarativeProperty &that, const QVariant &, WriteFlags);
+    static int valueTypeCoreIndex(const QDeclarativeProperty &that);
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativePropertyPrivate::WriteFlags)
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEPROPERTY_P_H
diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
index 7626d56..3f6d805 100644
--- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
@@ -66,7 +66,7 @@ QDeclarativePropertyValueInterceptor::~QDeclarativePropertyValueInterceptor()
 }
 
 /*!
-    \fn void QDeclarativePropertyValueInterceptor::setTarget(const QDeclarativeMetaProperty &property)
+    \fn void QDeclarativePropertyValueInterceptor::setTarget(const QDeclarativeProperty &property)
     Set the target \a property for the value interceptor.  This method will
     be called by the QML engine when assigning a value interceptor.
 */
diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
index 2a29d5b..3de5abc 100644
--- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QDeclarativeMetaProperty;
+class QDeclarativeProperty;
 class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor
 {
 public:
     QDeclarativePropertyValueInterceptor();
     virtual ~QDeclarativePropertyValueInterceptor();
-    virtual void setTarget(const QDeclarativeMetaProperty &property) = 0;
+    virtual void setTarget(const QDeclarativeProperty &property) = 0;
     virtual void write(const QVariant &value) = 0;
 };
 Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDeclarativePropertyValueInterceptor")
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
index 626e391..b106d4f 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
@@ -63,7 +63,7 @@ QDeclarativePropertyValueSource::~QDeclarativePropertyValueSource()
 }
 
 /*!
-    \fn void QDeclarativePropertyValueSource::setTarget(const QDeclarativeMetaProperty &property)
+    \fn void QDeclarativePropertyValueSource::setTarget(const QDeclarativeProperty &property)
     Set the target \a property for the value source.  This method will
     be called by the QML engine when assigning a value source.
 */
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h
index 99c80af..70d2c03 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.h
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h
@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QDeclarativeMetaProperty;
+class QDeclarativeProperty;
 class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueSource
 {
 public:
     QDeclarativePropertyValueSource();
     virtual ~QDeclarativePropertyValueSource();
-    virtual void setTarget(const QDeclarativeMetaProperty &) = 0;
+    virtual void setTarget(const QDeclarativeProperty &) = 0;
 };
 Q_DECLARE_INTERFACE(QDeclarativePropertyValueSource, "com.trolltech.qml.QDeclarativePropertyValueSource")
 
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index d35371f..01fa214 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -100,7 +100,7 @@ void QDeclarativePointFValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativePointFValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativePointFValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &point, 0, &status, &flags };
@@ -148,7 +148,7 @@ void QDeclarativePointValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativePointValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativePointValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &point, 0, &status, &flags };
@@ -196,7 +196,7 @@ void QDeclarativeSizeFValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeSizeFValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeSizeFValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &size, 0, &status, &flags };
@@ -244,7 +244,7 @@ void QDeclarativeSizeValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeSizeValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeSizeValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &size, 0, &status, &flags };
@@ -292,7 +292,7 @@ void QDeclarativeRectFValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeRectFValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeRectFValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &rect, 0, &status, &flags };
@@ -360,7 +360,7 @@ void QDeclarativeRectValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeRectValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeRectValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &rect, 0, &status, &flags };
@@ -428,7 +428,7 @@ void QDeclarativeVector3DValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeVector3DValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeVector3DValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &vector, 0, &status, &flags };
@@ -486,7 +486,7 @@ void QDeclarativeEasingValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeEasingValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeEasingValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &easing, 0, &status, &flags };
@@ -554,7 +554,7 @@ void QDeclarativeFontValueType::read(QObject *obj, int idx)
     QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a);
 }
 
-void QDeclarativeFontValueType::write(QObject *obj, int idx, QDeclarativeMetaPropertyPrivate::WriteFlags flags)
+void QDeclarativeFontValueType::write(QObject *obj, int idx, QDeclarativePropertyPrivate::WriteFlags flags)
 {
     int status = -1;
     void *a[] = { &font, 0, &status, &flags };
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index 792598b..cb153be 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qdeclarativemetaproperty.h"
-#include "qdeclarativemetaproperty_p.h"
+#include "qdeclarativeproperty.h"
+#include "qdeclarativeproperty_p.h"
 
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
@@ -71,7 +71,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeValueType : public QObject
 public:
     QDeclarativeValueType(QObject *parent = 0);
     virtual void read(QObject *, int) = 0;
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags flags) = 0;
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags flags) = 0;
     virtual QVariant value() = 0;
     virtual void setValue(QVariant) = 0;
 };
@@ -96,7 +96,7 @@ public:
     QDeclarativePointFValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -118,7 +118,7 @@ public:
     QDeclarativePointValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -140,7 +140,7 @@ public:
     QDeclarativeSizeFValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -162,7 +162,7 @@ public:
     QDeclarativeSizeValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -186,7 +186,7 @@ public:
     QDeclarativeRectFValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -215,7 +215,7 @@ public:
     QDeclarativeRectValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -243,7 +243,7 @@ public:
     QDeclarativeVector3DValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -297,7 +297,7 @@ public:
     QDeclarativeEasingValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
@@ -348,7 +348,7 @@ public:
     QDeclarativeFontValueType(QObject *parent = 0);
 
     virtual void read(QObject *, int);
-    virtual void write(QObject *, int, QDeclarativeMetaPropertyPrivate::WriteFlags);
+    virtual void write(QObject *, int, QDeclarativePropertyPrivate::WriteFlags);
     virtual QVariant value();
     virtual void setValue(QVariant value);
 
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index f7af843..baa98bd 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -156,7 +156,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
     QDeclarativeContextPrivate *cp = (QDeclarativeContextPrivate *)QObjectPrivate::get(ctxt);
 
     int status = -1;    //for dbus
-    QDeclarativeMetaPropertyPrivate::WriteFlags flags = QDeclarativeMetaPropertyPrivate::BypassInterceptor;
+    QDeclarativePropertyPrivate::WriteFlags flags = QDeclarativePropertyPrivate::BypassInterceptor;
 
     for (int ii = start; !isError() && ii < (start + count); ++ii) {
         const QDeclarativeInstruction &instr = comp->bytecode.at(ii);
@@ -515,8 +515,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 int sigIdx = instr.assignSignalObject.signal;
                 const QByteArray &pr = datas.at(sigIdx);
 
-                QDeclarativeMetaProperty prop(target, QString::fromUtf8(pr));
-                if (prop.type() & QDeclarativeMetaProperty::SignalProperty) {
+                QDeclarativeProperty prop(target, QString::fromUtf8(pr));
+                if (prop.type() & QDeclarativeProperty::SignalProperty) {
 
                     QMetaMethod method = QDeclarativeMetaType::defaultMethod(assign);
                     if (method.signature() == 0)
@@ -590,8 +590,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 QObject *context = 
                     stack.at(stack.count() - 1 - instr.assignBinding.context);
 
-                QDeclarativeMetaProperty mp = 
-                    QDeclarativeMetaPropertyPrivate::restore(datas.at(instr.assignBinding.property), target, ctxt);
+                QDeclarativeProperty mp = 
+                    QDeclarativePropertyPrivate::restore(datas.at(instr.assignBinding.property), target, ctxt);
 
                 int coreIndex = mp.coreIndex();
 
@@ -631,8 +631,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 QDeclarativePropertyValueSource *vs = reinterpret_cast<QDeclarativePropertyValueSource *>(reinterpret_cast<char *>(obj) + instr.assignValueSource.castValue);
                 QObject *target = stack.at(stack.count() - 1 - instr.assignValueSource.owner);
 
-                QDeclarativeMetaProperty prop = 
-                    QDeclarativeMetaPropertyPrivate::restore(datas.at(instr.assignValueSource.property), target, ctxt);
+                QDeclarativeProperty prop = 
+                    QDeclarativePropertyPrivate::restore(datas.at(instr.assignValueSource.property), target, ctxt);
                 obj->setParent(target);
                 vs->setTarget(prop);
             }
@@ -643,12 +643,12 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 QObject *obj = stack.pop();
                 QDeclarativePropertyValueInterceptor *vi = reinterpret_cast<QDeclarativePropertyValueInterceptor *>(reinterpret_cast<char *>(obj) + instr.assignValueInterceptor.castValue);
                 QObject *target = stack.at(stack.count() - 1 - instr.assignValueInterceptor.owner);
-                QDeclarativeMetaProperty prop = 
-                    QDeclarativeMetaPropertyPrivate::restore(datas.at(instr.assignValueInterceptor.property), target, ctxt);
+                QDeclarativeProperty prop = 
+                    QDeclarativePropertyPrivate::restore(datas.at(instr.assignValueInterceptor.property), target, ctxt);
                 obj->setParent(target);
                 vi->setTarget(prop);
                 QDeclarativeVMEMetaObject *mo = static_cast<QDeclarativeVMEMetaObject *>((QMetaObject*)target->metaObject());
-                mo->registerInterceptor(prop.coreIndex(), QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), vi);
+                mo->registerInterceptor(prop.coreIndex(), QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), vi);
             }
             break;
 
@@ -807,7 +807,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                     static_cast<QDeclarativeValueType *>(stack.pop());
                 QObject *target = stack.top();
                 valueHandler->write(target, instr.fetchValue.property, 
-                                    QDeclarativeMetaPropertyPrivate::BypassInterceptor);
+                                    QDeclarativePropertyPrivate::BypassInterceptor);
             }
             break;
 
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
index 6edb707..d67c834 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject.cpp
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -105,7 +105,7 @@ int QDeclarativeVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a)
     int id = _id;
     if(c == QMetaObject::WriteProperty) {
         int flags = *reinterpret_cast<int*>(a[3]);
-        if (!(flags & QDeclarativeMetaPropertyPrivate::BypassInterceptor)
+        if (!(flags & QDeclarativePropertyPrivate::BypassInterceptor)
             && !aInterceptors.isEmpty()
             && aInterceptors.testBit(id)) {
             QPair<int, QDeclarativePropertyValueInterceptor*> pair = interceptors.value(id);
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 8a43cec..aa1a34b 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -6,7 +6,7 @@ SOURCES += \
     $$PWD/qdeclarativeengine.cpp \
     $$PWD/qdeclarativeexpression.cpp \
     $$PWD/qdeclarativebinding.cpp \
-    $$PWD/qdeclarativemetaproperty.cpp \
+    $$PWD/qdeclarativeproperty.cpp \
     $$PWD/qdeclarativecomponent.cpp \
     $$PWD/qdeclarativecontext.cpp \
     $$PWD/qdeclarativecustomparser.cpp \
@@ -62,7 +62,7 @@ HEADERS += \
     $$PWD/qdeclarative.h \
     $$PWD/qdeclarativebinding_p.h \
     $$PWD/qdeclarativebinding_p_p.h \
-    $$PWD/qdeclarativemetaproperty.h \
+    $$PWD/qdeclarativeproperty.h \
     $$PWD/qdeclarativecomponent.h \
     $$PWD/qdeclarativecomponent_p.h \
     $$PWD/qdeclarativecustomparser_p.h \
@@ -87,7 +87,7 @@ HEADERS += \
     $$PWD/qdeclarativestringconverters_p.h \
     $$PWD/qdeclarativeclassfactory_p.h \
     $$PWD/qdeclarativeinfo.h \
-    $$PWD/qdeclarativemetaproperty_p.h \
+    $$PWD/qdeclarativeproperty_p.h \
     $$PWD/qdeclarativecontext_p.h \
     $$PWD/qdeclarativecompositetypedata_p.h \
     $$PWD/qdeclarativecompositetypemanager_p.h \
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index a327ccb..264b88c 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -52,7 +52,7 @@
 #include <qdeclarativestringconverters_p.h>
 #include <qdeclarativeglobal_p.h>
 #include <qdeclarativemetatype_p.h>
-#include <qdeclarativemetaproperty_p.h>
+#include <qdeclarativeproperty_p.h>
 
 #include <qvariant.h>
 #include <qcolor.h>
@@ -145,7 +145,7 @@ void QDeclarativeAbstractAnimationPrivate::commence()
     Q_Q(QDeclarativeAbstractAnimation);
 
     QDeclarativeStateActions actions;
-    QDeclarativeMetaProperties properties;
+    QDeclarativeProperties properties;
     q->transition(actions, properties, QDeclarativeAbstractAnimation::Forward);
 
     q->qtAnimation()->start();
@@ -155,15 +155,15 @@ void QDeclarativeAbstractAnimationPrivate::commence()
     }
 }
 
-QDeclarativeMetaProperty QDeclarativeAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj)
+QDeclarativeProperty QDeclarativeAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj)
 {
-    QDeclarativeMetaProperty prop(obj, str, qmlContext(infoObj));
+    QDeclarativeProperty prop(obj, str, qmlContext(infoObj));
     if (!prop.isValid()) {
         qmlInfo(infoObj) << QDeclarativeAbstractAnimation::tr("Cannot animate non-existent property \"%1\"").arg(str);
-        return QDeclarativeMetaProperty();
+        return QDeclarativeProperty();
     } else if (!prop.isWritable()) {
         qmlInfo(infoObj) << QDeclarativeAbstractAnimation::tr("Cannot animate read-only property \"%1\"").arg(str);
-        return QDeclarativeMetaProperty();
+        return QDeclarativeProperty();
     }
     return prop;
 }
@@ -466,7 +466,7 @@ void QDeclarativeAbstractAnimation::complete()
     }
 }
 
-void QDeclarativeAbstractAnimation::setTarget(const QDeclarativeMetaProperty &p)
+void QDeclarativeAbstractAnimation::setTarget(const QDeclarativeProperty &p)
 {
     Q_D(QDeclarativeAbstractAnimation);
     d->defaultProperty = p;
@@ -480,7 +480,7 @@ void QDeclarativeAbstractAnimation::setTarget(const QDeclarativeMetaProperty &p)
     so this function allows us to do the same thing as setTarget without
     that assumption
 */
-void QDeclarativeAbstractAnimation::setDefaultTarget(const QDeclarativeMetaProperty &p)
+void QDeclarativeAbstractAnimation::setDefaultTarget(const QDeclarativeProperty &p)
 {
     Q_D(QDeclarativeAbstractAnimation);
     d->defaultProperty = p;
@@ -498,7 +498,7 @@ void QDeclarativeAbstractAnimation::setDisableUserControl()
 }
 
 void QDeclarativeAbstractAnimation::transition(QDeclarativeStateActions &actions,
-                                      QDeclarativeMetaProperties &modified,
+                                      QDeclarativeProperties &modified,
                                       TransitionDirection direction)
 {
     Q_UNUSED(actions);
@@ -729,7 +729,7 @@ void QDeclarativeScriptActionPrivate::execute()
 }
 
 void QDeclarativeScriptAction::transition(QDeclarativeStateActions &actions,
-                                    QDeclarativeMetaProperties &modified,
+                                    QDeclarativeProperties &modified,
                                     TransitionDirection direction)
 {
     Q_D(QDeclarativeScriptAction);
@@ -912,7 +912,7 @@ QAbstractAnimation *QDeclarativePropertyAction::qtAnimation()
 }
 
 void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions,
-                                      QDeclarativeMetaProperties &modified,
+                                      QDeclarativeProperties &modified,
                                       TransitionDirection direction)
 {
     Q_D(QDeclarativePropertyAction);
@@ -925,7 +925,7 @@ void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions,
         {
             for (int ii = 0; ii < actions.count(); ++ii) {
                 const QDeclarativeAction &action = actions.at(ii);
-                QDeclarativeMetaPropertyPrivate::write(action.property, action.toValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+                QDeclarativePropertyPrivate::write(action.property, action.toValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
             }
         }
     };
@@ -1133,7 +1133,7 @@ QAbstractAnimation *QDeclarativeParentAction::qtAnimation()
 }
 
 void QDeclarativeParentAction::transition(QDeclarativeStateActions &actions,
-                                       QDeclarativeMetaProperties &modified,
+                                       QDeclarativeProperties &modified,
                                        TransitionDirection direction)
 {
     Q_D(QDeclarativeParentAction);
@@ -1582,7 +1582,7 @@ QAbstractAnimation *QDeclarativeSequentialAnimation::qtAnimation()
 }
 
 void QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actions,
-                                    QDeclarativeMetaProperties &modified,
+                                    QDeclarativeProperties &modified,
                                     TransitionDirection direction)
 {
     Q_D(QDeclarativeAnimationGroup);
@@ -1647,7 +1647,7 @@ QAbstractAnimation *QDeclarativeParallelAnimation::qtAnimation()
 }
 
 void QDeclarativeParallelAnimation::transition(QDeclarativeStateActions &actions,
-                                      QDeclarativeMetaProperties &modified,
+                                      QDeclarativeProperties &modified,
                                       TransitionDirection direction)
 {
     Q_D(QDeclarativeAnimationGroup);
@@ -2231,7 +2231,7 @@ struct PropertyUpdater : public QDeclarativeTimeLineValue
             QDeclarativeAction &action = actions[ii];
 
             if (v == 1.)
-                QDeclarativeMetaPropertyPrivate::write(action.property, action.toValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+                QDeclarativePropertyPrivate::write(action.property, action.toValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
             else {
                 if (!fromSourced && !fromDefined) {
                     action.fromValue = action.property.read();
@@ -2246,7 +2246,7 @@ struct PropertyUpdater : public QDeclarativeTimeLineValue
                     }
                 }
                 if (interpolator)
-                    QDeclarativeMetaPropertyPrivate::write(action.property, interpolator(action.fromValue.constData(), action.toValue.constData(), v), QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+                    QDeclarativePropertyPrivate::write(action.property, interpolator(action.fromValue.constData(), action.toValue.constData(), v), QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
             }
             if (deleted)
                 return;
@@ -2257,7 +2257,7 @@ struct PropertyUpdater : public QDeclarativeTimeLineValue
 };
 
 void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions,
-                                     QDeclarativeMetaProperties &modified,
+                                     QDeclarativeProperties &modified,
                                      TransitionDirection direction)
 {
     Q_D(QDeclarativePropertyAnimation);
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index 02dacb3..53afbb5 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -95,7 +95,7 @@ public:
     QDeclarativeAnimationGroup *group() const;
     void setGroup(QDeclarativeAnimationGroup *);
 
-    void setDefaultTarget(const QDeclarativeMetaProperty &);
+    void setDefaultTarget(const QDeclarativeProperty &);
     void setDisableUserControl();
 
     void classBegin();
@@ -123,7 +123,7 @@ protected:
 public:
     enum TransitionDirection { Forward, Backward };
     virtual void transition(QDeclarativeStateActions &actions,
-                            QDeclarativeMetaProperties &modified,
+                            QDeclarativeProperties &modified,
                             TransitionDirection direction);
     virtual QAbstractAnimation *qtAnimation() = 0;
 
@@ -131,7 +131,7 @@ private Q_SLOTS:
     void timelineComplete();
 
 private:
-    virtual void setTarget(const QDeclarativeMetaProperty &);
+    virtual void setTarget(const QDeclarativeProperty &);
 };
 
 class QDeclarativePauseAnimationPrivate;
@@ -177,7 +177,7 @@ public:
 
 protected:
     virtual void transition(QDeclarativeStateActions &actions,
-                            QDeclarativeMetaProperties &modified,
+                            QDeclarativeProperties &modified,
                             TransitionDirection direction);
     virtual QAbstractAnimation *qtAnimation();
 };
@@ -221,7 +221,7 @@ Q_SIGNALS:
 
 protected:
     virtual void transition(QDeclarativeStateActions &actions,
-                            QDeclarativeMetaProperties &modified,
+                            QDeclarativeProperties &modified,
                             TransitionDirection direction);
     virtual QAbstractAnimation *qtAnimation();
 };
@@ -248,7 +248,7 @@ public:
 
 protected:
     virtual void transition(QDeclarativeStateActions &actions,
-                            QDeclarativeMetaProperties &modified,
+                            QDeclarativeProperties &modified,
                             TransitionDirection direction);
     virtual QAbstractAnimation *qtAnimation();
 };
@@ -300,7 +300,7 @@ public:
 protected:
     QDeclarativePropertyAnimation(QDeclarativePropertyAnimationPrivate &dd, QObject *parent);
     virtual void transition(QDeclarativeStateActions &actions,
-                            QDeclarativeMetaProperties &modified,
+                            QDeclarativeProperties &modified,
                             TransitionDirection direction);
     virtual QAbstractAnimation *qtAnimation();
 
@@ -426,7 +426,7 @@ public:
 
 protected:
     virtual void transition(QDeclarativeStateActions &actions,
-                            QDeclarativeMetaProperties &modified,
+                            QDeclarativeProperties &modified,
                             TransitionDirection direction);
     virtual QAbstractAnimation *qtAnimation();
 };
@@ -442,7 +442,7 @@ public:
 
 protected:
     virtual void transition(QDeclarativeStateActions &actions,
-                            QDeclarativeMetaProperties &modified,
+                            QDeclarativeProperties &modified,
                             TransitionDirection direction);
     virtual QAbstractAnimation *qtAnimation();
 };
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index 65c9807..fc4e6e6 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -226,11 +226,11 @@ public:
 
     void commence();
 
-    QDeclarativeMetaProperty defaultProperty;
+    QDeclarativeProperty defaultProperty;
 
     QDeclarativeAnimationGroup *group;
 
-    static QDeclarativeMetaProperty createProperty(QObject *obj, const QString &str, QObject *infoObj);
+    static QDeclarativeProperty createProperty(QObject *obj, const QString &str, QObject *infoObj);
 };
 
 class QDeclarativePauseAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index b1f1677..e0189dc 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -46,7 +46,7 @@
 
 #include <qdeclarativecontext.h>
 #include <qdeclarativeinfo.h>
-#include <qdeclarativemetaproperty_p.h>
+#include <qdeclarativeproperty_p.h>
 
 #include <QtCore/qparallelanimationgroup.h>
 
@@ -62,7 +62,7 @@ class QDeclarativeBehaviorPrivate : public QObjectPrivate
 public:
     QDeclarativeBehaviorPrivate() : animation(0), enabled(true) {}
 
-    QDeclarativeMetaProperty property;
+    QDeclarativeProperty property;
     QVariant currentValue;
     QDeclarativeAbstractAnimation *animation;
     bool enabled;
@@ -157,7 +157,7 @@ void QDeclarativeBehavior::write(const QVariant &value)
 {
     Q_D(QDeclarativeBehavior);
     if (!d->animation || !d->enabled) {
-        QDeclarativeMetaPropertyPrivate::write(d->property, value, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+        QDeclarativePropertyPrivate::write(d->property, value, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
         return;
     }
 
@@ -172,15 +172,15 @@ void QDeclarativeBehavior::write(const QVariant &value)
     action.toValue = value;
     actions << action;
 
-    QList<QDeclarativeMetaProperty> after;
+    QList<QDeclarativeProperty> after;
     if (d->animation)
         d->animation->transition(actions, after, QDeclarativeAbstractAnimation::Forward);
     d->animation->qtAnimation()->start();
     if (!after.contains(d->property))
-        QDeclarativeMetaPropertyPrivate::write(d->property, value, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+        QDeclarativePropertyPrivate::write(d->property, value, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
 }
 
-void QDeclarativeBehavior::setTarget(const QDeclarativeMetaProperty &property)
+void QDeclarativeBehavior::setTarget(const QDeclarativeProperty &property)
 {
     Q_D(QDeclarativeBehavior);
     d->property = property;
diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h
index fbc19f8..a633b55 100644
--- a/src/declarative/util/qdeclarativebehavior_p.h
+++ b/src/declarative/util/qdeclarativebehavior_p.h
@@ -70,7 +70,7 @@ public:
     QDeclarativeBehavior(QObject *parent=0);
     ~QDeclarativeBehavior();
 
-    virtual void setTarget(const QDeclarativeMetaProperty &);
+    virtual void setTarget(const QDeclarativeProperty &);
     virtual void write(const QVariant &value);
 
     QDeclarativeAbstractAnimation *animation();
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index d75e98d..e95a03e 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -45,7 +45,7 @@
 
 #include <qdeclarativeengine.h>
 #include <qdeclarativecontext.h>
-#include <qdeclarativemetaproperty.h>
+#include <qdeclarativeproperty.h>
 
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
@@ -196,7 +196,7 @@ void QDeclarativeBind::eval()
     if (!d->obj || d->value.isNull || !d->when || !d->componentComplete)
         return;
 
-    QDeclarativeMetaProperty prop(d->obj, d->prop);
+    QDeclarativeProperty prop(d->obj, d->prop);
     prop.write(d->value.value);
 }
 
diff --git a/src/declarative/util/qdeclarativeeasefollow.cpp b/src/declarative/util/qdeclarativeeasefollow.cpp
index 0430a0b..232dc90 100644
--- a/src/declarative/util/qdeclarativeeasefollow.cpp
+++ b/src/declarative/util/qdeclarativeeasefollow.cpp
@@ -43,7 +43,7 @@
 
 #include "qdeclarativeanimation_p_p.h"
 
-#include <qdeclarativemetaproperty.h>
+#include <qdeclarativeproperty.h>
 
 #include <QtCore/qdebug.h>
 
@@ -77,7 +77,7 @@ public:
 
     qreal trackVelocity;
 
-    QDeclarativeMetaProperty target;
+    QDeclarativeProperty target;
 
     int clockOffset;
     int lastTick;
@@ -500,7 +500,7 @@ void QDeclarativeEaseFollow::setEnabled(bool enabled)
     emit enabledChanged();
 }
 
-void QDeclarativeEaseFollow::setTarget(const QDeclarativeMetaProperty &t)
+void QDeclarativeEaseFollow::setTarget(const QDeclarativeProperty &t)
 {
     Q_D(QDeclarativeEaseFollow);
     d->target = t;
diff --git a/src/declarative/util/qdeclarativeeasefollow_p.h b/src/declarative/util/qdeclarativeeasefollow_p.h
index 6d14eb5..83d1eff 100644
--- a/src/declarative/util/qdeclarativeeasefollow_p.h
+++ b/src/declarative/util/qdeclarativeeasefollow_p.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QDeclarativeMetaProperty;
+class QDeclarativeProperty;
 class QDeclarativeEaseFollowPrivate;
 class Q_DECLARATIVE_EXPORT QDeclarativeEaseFollow : public QObject, 
                                            public QDeclarativePropertyValueSource
@@ -94,7 +94,7 @@ public:
     qreal maximumEasingTime() const;
     void setMaximumEasingTime(qreal);
 
-    virtual void setTarget(const QDeclarativeMetaProperty &);
+    virtual void setTarget(const QDeclarativeProperty &);
 
 Q_SIGNALS:
     void sourceChanged();
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 454fb06..9c2b1e6 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -50,7 +50,7 @@
 #include <qdeclarativebinding_p.h>
 #include <qdeclarativecontext.h>
 #include <qdeclarativeguard_p.h>
-#include <qdeclarativemetaproperty_p.h>
+#include <qdeclarativeproperty_p.h>
 
 #include <QtCore/qdebug.h>
 
@@ -153,19 +153,19 @@ public:
 
     virtual QString typeName() const { return QLatin1String("ReplaceSignalHandler"); }
 
-    QDeclarativeMetaProperty property;
+    QDeclarativeProperty property;
     QDeclarativeExpression *expression;
     QDeclarativeExpression *reverseExpression;
     QDeclarativeExpression *rewindExpression;
     QDeclarativeGuard<QDeclarativeExpression> ownedExpression;
 
     virtual void execute() {
-        ownedExpression = QDeclarativeMetaPropertyPrivate::setSignalExpression(property, expression);
+        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, expression);
     }
 
     virtual bool isReversable() { return true; }
     virtual void reverse() {
-        ownedExpression = QDeclarativeMetaPropertyPrivate::setSignalExpression(property, reverseExpression);
+        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
     }
 
     virtual void saveOriginals() {
@@ -174,10 +174,10 @@ public:
     }
 
     virtual void rewind() {
-        ownedExpression = QDeclarativeMetaPropertyPrivate::setSignalExpression(property, rewindExpression);
+        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
     }
     virtual void saveCurrentValues() { 
-        rewindExpression = QDeclarativeMetaPropertyPrivate::signalExpression(property); 
+        rewindExpression = QDeclarativePropertyPrivate::signalExpression(property); 
     }
 
     virtual bool override(QDeclarativeActionEvent*other) {
@@ -212,7 +212,7 @@ public:
     QList<QPair<QByteArray, QDeclarativeExpression *> > expressions;
     QList<QDeclarativeReplaceSignalHandler*> signalReplacements;
 
-    QDeclarativeMetaProperty property(const QByteArray &);
+    QDeclarativeProperty property(const QByteArray &);
 };
 
 void
@@ -296,8 +296,8 @@ void QDeclarativePropertyChangesPrivate::decode()
         ds >> isScript;
         ds >> data;
 
-        QDeclarativeMetaProperty prop = property(name);      //### better way to check for signal property?
-        if (prop.type() & QDeclarativeMetaProperty::SignalProperty) {
+        QDeclarativeProperty prop = property(name);      //### better way to check for signal property?
+        if (prop.type() & QDeclarativeProperty::SignalProperty) {
             QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), data.toString(), object);
             QDeclarativeReplaceSignalHandler *handler = new QDeclarativeReplaceSignalHandler;
             handler->property = prop;
@@ -371,17 +371,17 @@ void QDeclarativePropertyChanges::setRestoreEntryValues(bool v)
     d->restore = v;
 }
 
-QDeclarativeMetaProperty
+QDeclarativeProperty
 QDeclarativePropertyChangesPrivate::property(const QByteArray &property)
 {
     Q_Q(QDeclarativePropertyChanges);
-    QDeclarativeMetaProperty prop(object, QString::fromUtf8(property));
+    QDeclarativeProperty prop(object, QString::fromUtf8(property));
     if (!prop.isValid()) {
         qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(property));
-        return QDeclarativeMetaProperty();
-    } else if (!(prop.type() & QDeclarativeMetaProperty::SignalProperty) && !prop.isWritable()) {
+        return QDeclarativeProperty();
+    } else if (!(prop.type() & QDeclarativeProperty::SignalProperty) && !prop.isWritable()) {
         qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(QString::fromUtf8(property));
-        return QDeclarativeMetaProperty();
+        return QDeclarativeProperty();
     }
     return prop;
 }
@@ -426,7 +426,7 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
     for (int ii = 0; ii < d->expressions.count(); ++ii) {
 
         QByteArray property = d->expressions.at(ii).first;
-        QDeclarativeMetaProperty prop = d->property(property);
+        QDeclarativeProperty prop = d->property(property);
 
         if (prop.isValid()) {
             QDeclarativeAction a;
diff --git a/src/declarative/util/qdeclarativespringfollow.cpp b/src/declarative/util/qdeclarativespringfollow.cpp
index b26a7e2..012e6a0 100644
--- a/src/declarative/util/qdeclarativespringfollow.cpp
+++ b/src/declarative/util/qdeclarativespringfollow.cpp
@@ -63,7 +63,7 @@ public:
         , mass(1.0), spring(0.), damping(0.), velocity(0), epsilon(0.01)
         , modulus(0.0), useMass(false), haveModulus(false), enabled(true), mode(Track), clock(this) {}
 
-    QDeclarativeMetaProperty property;
+    QDeclarativeProperty property;
     qreal currentValue;
     qreal sourceValue;
     qreal maxVelocity;
@@ -254,7 +254,7 @@ QDeclarativeSpringFollow::~QDeclarativeSpringFollow()
 {
 }
 
-void QDeclarativeSpringFollow::setTarget(const QDeclarativeMetaProperty &property)
+void QDeclarativeSpringFollow::setTarget(const QDeclarativeProperty &property)
 {
     Q_D(QDeclarativeSpringFollow);
     d->property = property;
diff --git a/src/declarative/util/qdeclarativespringfollow_p.h b/src/declarative/util/qdeclarativespringfollow_p.h
index 63d38a4..2ac0d82 100644
--- a/src/declarative/util/qdeclarativespringfollow_p.h
+++ b/src/declarative/util/qdeclarativespringfollow_p.h
@@ -74,7 +74,7 @@ public:
     QDeclarativeSpringFollow(QObject *parent=0);
     ~QDeclarativeSpringFollow();
 
-    virtual void setTarget(const QDeclarativeMetaProperty &);
+    virtual void setTarget(const QDeclarativeProperty &);
 
     qreal sourceValue() const;
     void setSourceValue(qreal value);
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 3b06e33..1d70d33 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -334,7 +334,7 @@ void QDeclarativeState::cancel()
 void QDeclarativeAction::deleteFromBinding()
 {
     if (fromBinding) {
-        QDeclarativeMetaPropertyPrivate::setBinding(property, 0);
+        QDeclarativePropertyPrivate::setBinding(property, 0);
         fromBinding->destroy();
         fromBinding = 0;
     }
@@ -388,7 +388,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit
             else if (action.event->isRewindable())
                 action.event->saveCurrentValues();
         } else {
-            action.fromBinding = QDeclarativeMetaPropertyPrivate::binding(action.property);
+            action.fromBinding = QDeclarativePropertyPrivate::binding(action.property);
 
             for (jj = 0; jj < d->revertList.count(); ++jj) {
                 if (d->revertList.at(jj).property == action.property) {
@@ -437,7 +437,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit
         if (!found) {
             QVariant cur = d->revertList.at(ii).property.read();
             QDeclarativeAbstractBinding *delBinding = 
-                QDeclarativeMetaPropertyPrivate::setBinding(d->revertList.at(ii).property, 0);
+                QDeclarativePropertyPrivate::setBinding(d->revertList.at(ii).property, 0);
             if (delBinding)
                 delBinding->destroy();
 
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index 4a62481..abdbec5 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVESTATE_H
 
 #include <qdeclarative.h>
-#include <qdeclarativemetaproperty.h>
+#include <qdeclarativeproperty.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
@@ -65,7 +65,7 @@ public:
     bool reverseEvent:1;
     bool deletableToBinding:1;
 
-    QDeclarativeMetaProperty property;
+    QDeclarativeProperty property;
     QVariant fromValue;
     QVariant toValue;
 
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
index 6b32f04..6f52219 100644
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -58,7 +58,7 @@
 #include "qdeclarativeanimation_p_p.h"
 #include "qdeclarativetransitionmanager_p_p.h"
 
-#include <qdeclarativemetaproperty_p.h>
+#include <qdeclarativeproperty_p.h>
 #include <qdeclarativeguard_p.h>
 
 #include <private/qobject_p.h>
@@ -77,7 +77,7 @@ public:
         event = a.event;
         if (state == StartState) {
             value = a.fromValue;
-            binding = QDeclarativeMetaPropertyPrivate::binding(property);
+            binding = QDeclarativePropertyPrivate::binding(property);
             reverseEvent = true;
         } else {
             value = a.toValue;
@@ -86,7 +86,7 @@ public:
         }
     }
 
-    QDeclarativeMetaProperty property;
+    QDeclarativeProperty property;
     QVariant value;
     QDeclarativeAbstractBinding *binding;
     QObject *specifiedObject;
@@ -139,7 +139,7 @@ public:
     QDeclarativeTransitionManager transitionManager;
 
     SimpleActionList revertList;
-    QList<QDeclarativeMetaProperty> reverting;
+    QList<QDeclarativeProperty> reverting;
     QString extends;
     mutable bool inState;
     QDeclarativeStateGroup *group;
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 98edf85..9df8658 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -661,19 +661,19 @@ QList<QDeclarativeAction> QDeclarativeAnchorChanges::extraActions()
     if (d->target) {
         QDeclarativeAction a;
         a.fromValue = d->fromX;
-        a.property = QDeclarativeMetaProperty(d->target, QLatin1String("x"));
+        a.property = QDeclarativeProperty(d->target, QLatin1String("x"));
         extra << a;
 
         a.fromValue = d->fromY;
-        a.property = QDeclarativeMetaProperty(d->target, QLatin1String("y"));
+        a.property = QDeclarativeProperty(d->target, QLatin1String("y"));
         extra << a;
 
         a.fromValue = d->fromWidth;
-        a.property = QDeclarativeMetaProperty(d->target, QLatin1String("width"));
+        a.property = QDeclarativeProperty(d->target, QLatin1String("width"));
         extra << a;
 
         a.fromValue = d->fromHeight;
-        a.property = QDeclarativeMetaProperty(d->target, QLatin1String("height"));
+        a.property = QDeclarativeProperty(d->target, QLatin1String("height"));
         extra << a;
     }
 
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index 3482814..ac07b10 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -148,7 +148,7 @@ void QDeclarativeTransition::setReversed(bool r)
 }
 
 void QDeclarativeTransition::prepare(QDeclarativeStateOperation::ActionList &actions,
-                            QList<QDeclarativeMetaProperty> &after,
+                            QList<QDeclarativeProperty> &after,
                             QDeclarativeTransitionManager *endState)
 {
     Q_D(QDeclarativeTransition);
diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h
index 96448b8..861111a 100644
--- a/src/declarative/util/qdeclarativetransition_p.h
+++ b/src/declarative/util/qdeclarativetransition_p.h
@@ -85,7 +85,7 @@ public:
     QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations();
 
     void prepare(QDeclarativeStateOperation::ActionList &actions,
-                 QList<QDeclarativeMetaProperty> &after,
+                 QList<QDeclarativeProperty> &after,
                  QDeclarativeTransitionManager *end);
 
     void setReversed(bool r);
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 6429dab..e1143fa 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -45,7 +45,7 @@
 
 #include <qdeclarativebinding_p.h>
 #include <qdeclarativeglobal_p.h>
-#include <qdeclarativemetaproperty_p.h>
+#include <qdeclarativeproperty_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -85,7 +85,7 @@ void QDeclarativeTransitionManager::complete()
     d->applyBindings();
 
     for (int ii = 0; ii < d->completeList.count(); ++ii) {
-        const QDeclarativeMetaProperty &prop = d->completeList.at(ii).property;
+        const QDeclarativeProperty &prop = d->completeList.at(ii).property;
         prop.write(d->completeList.at(ii).value);
     }
 
@@ -99,7 +99,7 @@ void QDeclarativeTransitionManagerPrivate::applyBindings()
 {
     foreach(const QDeclarativeAction &action, bindingsList) {
         if (action.toBinding) {
-            QDeclarativeMetaPropertyPrivate::setBinding(action.property, action.toBinding);
+            QDeclarativePropertyPrivate::setBinding(action.property, action.toBinding);
         } else if (action.event) {
             if (action.reverseEvent)
                 action.event->reverse();
@@ -123,7 +123,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
         if (action.toBinding)
             d->bindingsList << action;
         if (action.fromBinding)
-            QDeclarativeMetaPropertyPrivate::setBinding(action.property, 0); // Disable current binding
+            QDeclarativePropertyPrivate::setBinding(action.property, 0); // Disable current binding
         if (action.event && action.event->changesBindings()) {  //### assume isReversable()?
             d->bindingsList << action;
             if (action.reverseEvent)
@@ -150,9 +150,9 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
         for (int ii = 0; ii < applyList.size(); ++ii) {
             const QDeclarativeAction &action = applyList.at(ii);
             if (action.toBinding) {
-                QDeclarativeMetaPropertyPrivate::setBinding(action.property, action.toBinding, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+                QDeclarativePropertyPrivate::setBinding(action.property, action.toBinding, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
             } else if (!action.event) {
-                QDeclarativeMetaPropertyPrivate::write(action.property, action.toValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+                QDeclarativePropertyPrivate::write(action.property, action.toValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
             } else if (action.event->isReversable()) {
                 if (action.reverseEvent)
                     action.event->reverse();
@@ -167,7 +167,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
             QDeclarativeAction *action = &applyList[ii];
             if (action->event)
                 continue;
-            const QDeclarativeMetaProperty &prop = action->property;
+            const QDeclarativeProperty &prop = action->property;
             if (action->toBinding || !action->toValue.isValid()) {  //### is this always right (used for exta actions)
                 action->toValue = prop.read();
             }
@@ -191,14 +191,14 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
             }
 
             if (action.toBinding)
-                QDeclarativeMetaPropertyPrivate::setBinding(action.property, 0); // Make sure this is disabled during the transition
+                QDeclarativePropertyPrivate::setBinding(action.property, 0); // Make sure this is disabled during the transition
 
-            QDeclarativeMetaPropertyPrivate::write(action.property, action.fromValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
+            QDeclarativePropertyPrivate::write(action.property, action.fromValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
         }
     }
 
     if (transition) {
-        QList<QDeclarativeMetaProperty> touched;
+        QList<QDeclarativeProperty> touched;
         d->transition = transition;
         d->transition->prepare(applyList, touched, this);
 
@@ -267,7 +267,7 @@ void QDeclarativeTransitionManager::cancel()
     for(int i = 0; i < d->bindingsList.count(); ++i) {
         QDeclarativeAction action = d->bindingsList[i];
         if (action.toBinding && action.deletableToBinding) {
-            QDeclarativeMetaPropertyPrivate::setBinding(action.property, 0);
+            QDeclarativePropertyPrivate::setBinding(action.property, 0);
             action.toBinding->destroy();
             action.toBinding = 0;
             action.deletableToBinding = false;
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 669213c..42ff523 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -41,7 +41,7 @@ SUBDIRS += \
            qdeclarativelanguage \            # Cover
            qdeclarativelistreference \       # Cover
            qdeclarativelistmodel \           # Cover
-           qdeclarativemetaproperty \        # Cover
+           qdeclarativeproperty \        # Cover
            qdeclarativemetatype \            # Cover
            qdeclarativemoduleplugin \        # Cover
            qdeclarativenumberformatter \     # Cover
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index 8d5a1f6..0c3ca76 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -49,7 +49,7 @@
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qdeclarativeexpression.h>
-#include <QtDeclarative/qdeclarativemetaproperty.h>
+#include <QtDeclarative/qdeclarativeproperty.h>
 
 #include <private/qdeclarativebinding_p.h>
 #include <private/qdeclarativedebug_p.h>
@@ -58,7 +58,7 @@
 #include <private/qdeclarativedebugservice_p.h>
 #include <private/qdeclarativerectangle_p.h>
 #include <private/qdeclarativemetatype_p.h>
-#include <private/qdeclarativemetaproperty_p.h>
+#include <private/qdeclarativeproperty_p.h>
 
 #include "../shared/debugutil_p.h"
 
@@ -218,7 +218,7 @@ void tst_QDeclarativeDebug::recursiveObjectTest(QObject *o, const QDeclarativeDe
             QCOMPARE(p.valueTypeName(), QString::fromUtf8(pmeta.typeName()));
 
         QDeclarativeAbstractBinding *binding = 
-            QDeclarativeMetaPropertyPrivate::binding(QDeclarativeMetaProperty(o, p.name()));
+            QDeclarativePropertyPrivate::binding(QDeclarativeProperty(o, p.name()));
         if (binding)
             QCOMPARE(binding->expression(), p.binding());
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index fc1ede7..8ac7aa6 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -52,7 +52,7 @@
 #include <QtDeclarative/qdeclarativeparserstatus.h>
 #include <QtDeclarative/qdeclarativepropertyvaluesource.h>
 #include <QtDeclarative/qdeclarativescriptstring.h>
-#include <QtDeclarative/qdeclarativemetaproperty.h>
+#include <QtDeclarative/qdeclarativeproperty.h>
 
 QVariant myCustomVariantTypeConverter(const QString &data);
 
@@ -480,8 +480,8 @@ public:
     MyPropertyValueSource()
         : QDeclarativePropertyValueSource() {}
 
-    QDeclarativeMetaProperty prop;
-    virtual void setTarget(const QDeclarativeMetaProperty &p)
+    QDeclarativeProperty prop;
+    virtual void setTarget(const QDeclarativeProperty &p)
     {
         prop = p;
     }
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 2907757..1ba4454 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -46,7 +46,7 @@
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qdir.h>
 
-#include <private/qdeclarativemetaproperty_p.h>
+#include <private/qdeclarativeproperty_p.h>
 #include <private/qdeclarativemetatype_p.h>
 
 #include "testtypes.h"
@@ -747,14 +747,14 @@ void tst_qdeclarativelanguage::valueTypes()
 
     // ###
 #if 0
-    QDeclarativeMetaProperty p(object, "rectProperty.x");
+    QDeclarativeProperty p(object, "rectProperty.x");
     QCOMPARE(p.read(), QVariant(12));
     p.write(13);
     QCOMPARE(p.read(), QVariant(13));
 
-    quint32 r = QDeclarativeMetaPropertyPrivate::saveValueType(p.coreIndex(), p.valueTypeCoreIndex());
-    QDeclarativeMetaProperty p2;
-    QDeclarativeMetaPropertyPrivate::restore(p2, r, object);
+    quint32 r = QDeclarativePropertyPrivate::saveValueType(p.coreIndex(), p.valueTypeCoreIndex());
+    QDeclarativeProperty p2;
+    QDeclarativePropertyPrivate::restore(p2, r, object);
     QCOMPARE(p2.read(), QVariant(13));
 #endif
 }
diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
index fdcb98a..1b7af19 100644
--- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
+++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
@@ -47,7 +47,7 @@
 #include <QDeclarativeComponent>
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativeprivate.h>
-#include <QtDeclarative/qdeclarativemetaproperty.h>
+#include <QtDeclarative/qdeclarativeproperty.h>
 #include <QDebug>
 
 inline QUrl TEST_FILE(const QString &filename)
@@ -530,7 +530,7 @@ void tst_qdeclarativelistreference::qmlmetaproperty()
     tt.data.append(0);
     tt.data.append(&tt);
 
-    QDeclarativeMetaProperty prop(&tt, QLatin1String("data"));
+    QDeclarativeProperty prop(&tt, QLatin1String("data"));
     QVariant v = prop.read();
     QVERIFY(v.userType() == qMetaTypeId<QDeclarativeListReference>());
     QDeclarativeListReference ref = qvariant_cast<QDeclarativeListReference>(v);
@@ -546,11 +546,11 @@ void tst_qdeclarativelistreference::engineTypes()
     QObject *o = component.create();
     QVERIFY(o);
 
-    QDeclarativeMetaProperty p1(o, QLatin1String("myList"));
-    QVERIFY(p1.propertyTypeCategory() == QDeclarativeMetaProperty::Normal);
+    QDeclarativeProperty p1(o, QLatin1String("myList"));
+    QVERIFY(p1.propertyTypeCategory() == QDeclarativeProperty::Normal);
 
-    QDeclarativeMetaProperty p2(o, QLatin1String("myList"), engine.rootContext());
-    QVERIFY(p2.propertyTypeCategory() == QDeclarativeMetaProperty::List);
+    QDeclarativeProperty p2(o, QLatin1String("myList"), engine.rootContext());
+    QVERIFY(p2.propertyTypeCategory() == QDeclarativeProperty::List);
     QVariant v = p2.read();
     QVERIFY(v.userType() == qMetaTypeId<QDeclarativeListReference>());
     QDeclarativeListReference ref = qvariant_cast<QDeclarativeListReference>(v);
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
deleted file mode 100644
index 7170469..0000000
--- a/tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qdeclarativemetaproperty.cpp
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
deleted file mode 100644
index a7e9d0d..0000000
--- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ /dev/null
@@ -1,1186 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativemetaproperty.h>
-#include <QtDeclarative/private/qdeclarativemetaproperty_p.h>
-#include <private/qguard_p.h>
-#include <private/qdeclarativebinding_p.h>
-#include <QtGui/QLineEdit>
-
-class MyQmlObject : public QObject
-{
-    Q_OBJECT
-public:
-    MyQmlObject() {}
-};
-
-QML_DECLARE_TYPE(MyQmlObject);
-
-class MyAttached : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int foo READ foo WRITE setFoo)
-public:
-    MyAttached(QObject *parent) : QObject(parent), m_foo(13) {}
-
-    int foo() const { return m_foo; }
-    void setFoo(int f) { m_foo = f; }
-
-private:
-    int m_foo;
-};
-
-class MyContainer : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<MyQmlObject> children READ children)
-public:
-    MyContainer() {}
-
-    QDeclarativeListProperty<MyQmlObject> children() { return QDeclarativeListProperty<MyQmlObject>(this, m_children); }
-
-    static MyAttached *qmlAttachedProperties(QObject *o) {
-        return new MyAttached(o);
-    }
-
-private:
-    QList<MyQmlObject*> m_children;
-};
-
-QML_DECLARE_TYPE(MyContainer);
-QML_DECLARE_TYPEINFO(MyContainer, QML_HAS_ATTACHED_PROPERTIES)
-
-class tst_qdeclarativemetaproperty : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qdeclarativemetaproperty() {}
-
-private slots:
-    void initTestCase();
-
-    // Constructors
-    void qmlmetaproperty();
-    void qmlmetaproperty_object();
-    void qmlmetaproperty_object_string();
-    void qmlmetaproperty_object_context();
-    void qmlmetaproperty_object_string_context();
-
-    // Methods
-    void name();
-    void read();
-    void write();
-    void reset();
-
-    // Functionality
-    void writeObjectToList();
-    void writeListToList();
-
-    //writeToReadOnly();
-
-    // Bugs
-    void crashOnValueProperty();
-
-    void copy();
-private:
-    QDeclarativeEngine engine;
-};
-
-void tst_qdeclarativemetaproperty::qmlmetaproperty()
-{
-    QDeclarativeMetaProperty prop;
-
-    QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-    QVERIFY(binding != 0);
-    QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-    QVERIFY(expression != 0);
-
-    QObject *obj = new QObject;
-
-    QCOMPARE(prop.name(), QString());
-    QCOMPARE(prop.read(), QVariant());
-    QCOMPARE(prop.write(QVariant()), false);
-    QCOMPARE(prop.hasChangedNotifier(), false);
-    QCOMPARE(prop.needsChangedNotifier(), false);
-    QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-    QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-    QCOMPARE(prop.connectNotifier(obj, 0), false);
-    QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-    QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-    QCOMPARE(prop.connectNotifier(obj, -1), false);
-    QVERIFY(prop.method().signature() == 0);
-    QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
-    QCOMPARE(prop.isProperty(), false);
-    QCOMPARE(prop.isDefault(), false);
-    QCOMPARE(prop.isWritable(), false);
-    QCOMPARE(prop.isDesignable(), false);
-    QCOMPARE(prop.isResettable(), false);
-    QCOMPARE(prop.isValid(), false);
-    QCOMPARE(prop.object(), (QObject *)0);
-    QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
-    QCOMPARE(prop.propertyType(), 0);
-    QCOMPARE(prop.propertyTypeName(), (const char *)0);
-    QVERIFY(prop.property().name() == 0);
-    QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-    QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-    QVERIFY(binding == 0);
-    QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-    QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-    QVERIFY(expression == 0);
-    QCOMPARE(prop.coreIndex(), -1);
-    QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-    delete obj;
-}
-
-class PropertyObject : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int defaultProperty READ defaultProperty);
-    Q_PROPERTY(QRect rectProperty READ rectProperty);
-    Q_PROPERTY(QRect wrectProperty READ wrectProperty WRITE setWRectProperty);
-    Q_PROPERTY(QUrl url READ url WRITE setUrl);
-    Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty);
-
-    Q_CLASSINFO("DefaultProperty", "defaultProperty");
-public:
-    PropertyObject() : m_resetProperty(9) {}
-
-    int defaultProperty() { return 10; }
-    QRect rectProperty() { return QRect(10, 10, 1, 209); }
-
-    QRect wrectProperty() { return m_rect; }
-    void setWRectProperty(const QRect &r) { m_rect = r; }
-
-    QUrl url() { return m_url; }
-    void setUrl(const QUrl &u) { m_url = u; }
-
-    int resettableProperty() const { return m_resetProperty; }
-    void setResettableProperty(int r) { m_resetProperty = r; }
-    void resetProperty() { m_resetProperty = 9; }
-
-signals:
-    void clicked();
-
-private:
-    int m_resetProperty;
-    QRect m_rect;
-    QUrl m_url;
-};
-
-QML_DECLARE_TYPE(PropertyObject);
-
-void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
-{
-    QObject object; // Has no default property
-    PropertyObject dobject; // Has default property
-
-    {
-        QDeclarativeMetaProperty prop(&object);
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString());
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), false);
-        QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QVERIFY(prop.property().name() == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-
-    {
-        QDeclarativeMetaProperty prop(&dobject);
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("defaultProperty"));
-        QCOMPARE(prop.read(), QVariant(10));
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), (QDeclarativeMetaProperty::Type)(QDeclarativeMetaProperty::Property | QDeclarativeMetaProperty::Default));
-        QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), true);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), true);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
-        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
-        QCOMPARE(prop.propertyTypeName(), "int");
-        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding != 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == binding);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-}
-
-void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
-{
-    QObject object; 
-    PropertyObject dobject; 
-
-    {
-        QDeclarativeMetaProperty prop(&object, QString("defaultProperty"));
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString());
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), false);
-        QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QVERIFY(prop.property().name() == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-
-    {
-        QDeclarativeMetaProperty prop(&dobject, QString("defaultProperty"));
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("defaultProperty"));
-        QCOMPARE(prop.read(), QVariant(10));
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Property);
-        QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), true);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
-        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
-        QCOMPARE(prop.propertyTypeName(), "int");
-        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding != 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == binding);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-
-    {
-        QDeclarativeMetaProperty prop(&dobject, QString("onClicked"));
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("onClicked"));
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant("Hello")), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QCOMPARE(prop.property().name(), (const char *)0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression != 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == expression);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-}
-
-void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
-{
-    QObject object; // Has no default property
-    PropertyObject dobject; // Has default property
-
-    {
-        QDeclarativeMetaProperty prop(&object, engine.rootContext());
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString());
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), false);
-        QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QVERIFY(prop.property().name() == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-
-    {
-        QDeclarativeMetaProperty prop(&dobject, engine.rootContext());
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("defaultProperty"));
-        QCOMPARE(prop.read(), QVariant(10));
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), (QDeclarativeMetaProperty::Type)(QDeclarativeMetaProperty::Property | QDeclarativeMetaProperty::Default));
-        QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), true);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), true);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
-        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
-        QCOMPARE(prop.propertyTypeName(), "int");
-        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding != 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == binding);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-}
-
-void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
-{
-    QObject object; 
-    PropertyObject dobject; 
-
-    {
-        QDeclarativeMetaProperty prop(&object, QString("defaultProperty"), engine.rootContext());
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString());
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), false);
-        QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QVERIFY(prop.property().name() == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-
-    {
-        QDeclarativeMetaProperty prop(&dobject, QString("defaultProperty"), engine.rootContext());
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("defaultProperty"));
-        QCOMPARE(prop.read(), QVariant(10));
-        QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Property);
-        QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), true);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
-        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
-        QCOMPARE(prop.propertyTypeName(), "int");
-        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding != 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == binding);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-
-    {
-        QDeclarativeMetaProperty prop(&dobject, QString("onClicked"), engine.rootContext());
-
-        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
-        binding->setTarget(prop);
-        QVERIFY(binding != 0);
-        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
-        QVERIFY(expression != 0);
-
-        QObject *obj = new QObject;
-
-        QCOMPARE(prop.name(), QString("onClicked"));
-        QCOMPARE(prop.read(), QVariant());
-        QCOMPARE(prop.write(QVariant("Hello")), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
-        QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
-        QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
-        QCOMPARE(prop.isWritable(), false);
-        QCOMPARE(prop.isDesignable(), false);
-        QCOMPARE(prop.isResettable(), false);
-        QCOMPARE(prop.isValid(), true);
-        QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
-        QCOMPARE(prop.propertyType(), 0);
-        QCOMPARE(prop.propertyTypeName(), (const char *)0);
-        QCOMPARE(prop.property().name(), (const char *)0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::binding(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setBinding(prop, binding) == 0);
-        QVERIFY(binding == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0);
-        QVERIFY(expression != 0);
-        QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == expression);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
-        QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1);
-
-        delete obj;
-    }
-}
-
-void tst_qdeclarativemetaproperty::name()
-{
-    { 
-        QDeclarativeMetaProperty p;
-        QCOMPARE(p.name(), QString());
-    }
-
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o);
-        QCOMPARE(p.name(), QString("defaultProperty"));
-    }
-
-    {
-        QObject o;
-        QDeclarativeMetaProperty p(&o, QString("objectName"));
-        QCOMPARE(p.name(), QString("objectName"));
-    }
-
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "onClicked");
-        QCOMPARE(p.name(), QString("onClicked"));
-    }
-
-    {
-        QObject o;
-        QDeclarativeMetaProperty p(&o, "onClicked");
-        QCOMPARE(p.name(), QString());
-    }
-
-    {
-        QObject o;
-        QDeclarativeMetaProperty p(&o, "foo");
-        QCOMPARE(p.name(), QString());
-    }
-
-    {
-        QDeclarativeMetaProperty p(0, "foo");
-        QCOMPARE(p.name(), QString());
-    }
-
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "rectProperty");
-        QCOMPARE(p.name(), QString("rectProperty"));
-    }
-
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "rectProperty.x");
-        QCOMPARE(p.name(), QString("rectProperty.x"));
-    }
-
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "rectProperty.foo");
-        QCOMPARE(p.name(), QString());
-    }
-}
-
-void tst_qdeclarativemetaproperty::read()
-{
-    // Invalid 
-    {
-        QDeclarativeMetaProperty p;
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Default prop
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o);
-        QCOMPARE(p.read(), QVariant(10));
-    }
-
-    // Invalid default prop
-    {
-        QObject o;
-        QDeclarativeMetaProperty p(&o);
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Value prop by name
-    {
-        QObject o;
-
-        QDeclarativeMetaProperty p(&o, "objectName");
-        QCOMPARE(p.read(), QVariant(QString()));
-
-        o.setObjectName("myName");
-
-        QCOMPARE(p.read(), QVariant("myName"));
-    }
-
-    // Value-type prop
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "rectProperty.x");
-        QCOMPARE(p.read(), QVariant(10));
-    }
-
-    // Invalid value-type prop
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "rectProperty.foo");
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Signal property
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "onClicked");
-        QCOMPARE(p.read(), QVariant());
-
-        QVERIFY(0 == QDeclarativeMetaPropertyPrivate::setSignalExpression(p, new QDeclarativeExpression()));
-        QVERIFY(0 != QDeclarativeMetaPropertyPrivate::signalExpression(p));
-
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Deleted object
-    {
-        PropertyObject *o = new PropertyObject;
-        QDeclarativeMetaProperty p(o, "rectProperty.x");
-        QCOMPARE(p.read(), QVariant(10));
-        delete o;
-        QCOMPARE(p.read(), QVariant());
-    }
-
-    // Attached property
-    {
-        QDeclarativeComponent component(&engine);
-        component.setData("import Test 1.0\nMyContainer { }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QDeclarativeMetaProperty p(object, "MyContainer.foo", qmlContext(object));
-        QCOMPARE(p.read(), QVariant(13));
-        delete object;
-    }
-    {
-        QDeclarativeComponent component(&engine);
-        component.setData("import Test 1.0\nMyContainer { MyContainer.foo: 10 }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QDeclarativeMetaProperty p(object, "MyContainer.foo", qmlContext(object));
-        QCOMPARE(p.read(), QVariant(10));
-        delete object;
-    }
-    {
-        QDeclarativeComponent component(&engine);
-        component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QDeclarativeMetaProperty p(object, "Foo.MyContainer.foo", qmlContext(object));
-        QCOMPARE(p.read(), QVariant(10));
-        delete object;
-    }
-}
-
-void tst_qdeclarativemetaproperty::write()
-{
-    // Invalid
-    {
-        QDeclarativeMetaProperty p;
-        QCOMPARE(p.write(QVariant(10)), false);
-    }
-
-    // Read-only default prop
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o);
-        QCOMPARE(p.write(QVariant(10)), false);
-    }
-
-    // Invalid default prop
-    {
-        QObject o;
-        QDeclarativeMetaProperty p(&o);
-        QCOMPARE(p.write(QVariant(10)), false);
-    }
-
-    // Read-only prop by name
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, QString("defaultProperty"));
-        QCOMPARE(p.write(QVariant(10)), false);
-    }
-
-    // Writable prop by name
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, QString("objectName"));
-        QCOMPARE(o.objectName(), QString());
-        QCOMPARE(p.write(QVariant(QString("myName"))), true);
-        QCOMPARE(o.objectName(), QString("myName"));
-    }
-
-    // Deleted object
-    {
-        PropertyObject *o = new PropertyObject;
-        QDeclarativeMetaProperty p(o, QString("objectName"));
-        QCOMPARE(p.write(QVariant(QString("myName"))), true);
-        QCOMPARE(o->objectName(), QString("myName"));
-
-        delete o;
-
-        QCOMPARE(p.write(QVariant(QString("myName"))), false);
-    }
-
-    // Signal property
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "onClicked");
-        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
-
-        QVERIFY(0 == QDeclarativeMetaPropertyPrivate::setSignalExpression(p, new QDeclarativeExpression()));
-        QVERIFY(0 != QDeclarativeMetaPropertyPrivate::signalExpression(p));
-
-        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
-
-        QVERIFY(0 != QDeclarativeMetaPropertyPrivate::signalExpression(p));
-    }
-
-    // Value-type property
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "wrectProperty");
-
-        QCOMPARE(o.wrectProperty(), QRect());
-        QCOMPARE(p.write(QRect(1, 13, 99, 8)), true);
-        QCOMPARE(o.wrectProperty(), QRect(1, 13, 99, 8));
-
-        QDeclarativeMetaProperty p2(&o, "wrectProperty.x");
-        QCOMPARE(p2.read(), QVariant(1));
-        QCOMPARE(p2.write(QVariant(6)), true);
-        QCOMPARE(p2.read(), QVariant(6));
-        QCOMPARE(o.wrectProperty(), QRect(6, 13, 99, 8));
-    }
-
-    // URL-property
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "url");
-
-        QCOMPARE(p.write(QUrl("main.qml")), true);
-        QCOMPARE(o.url(), QUrl("main.qml"));
-
-        QDeclarativeMetaProperty p2(&o, "url", engine.rootContext());
-
-        QUrl result = engine.baseUrl().resolved(QUrl("main.qml"));
-        QVERIFY(result != QUrl("main.qml"));
-
-        QCOMPARE(p2.write(QUrl("main.qml")), true);
-        QCOMPARE(o.url(), result);
-    }
-
-    // Attached property
-    {
-        QDeclarativeComponent component(&engine);
-        component.setData("import Test 1.0\nMyContainer { }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QDeclarativeMetaProperty p(object, "MyContainer.foo", qmlContext(object));
-        p.write(QVariant(99));
-        QCOMPARE(p.read(), QVariant(99));
-        delete object;
-    }
-    {
-        QDeclarativeComponent component(&engine);
-        component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
-        QObject *object = component.create();
-        QVERIFY(object != 0);
-
-        QDeclarativeMetaProperty p(object, "Foo.MyContainer.foo", qmlContext(object));
-        p.write(QVariant(99));
-        QCOMPARE(p.read(), QVariant(99));
-        delete object;
-    }
-}
-
-void tst_qdeclarativemetaproperty::reset()
-{
-    // Invalid
-    {
-        QDeclarativeMetaProperty p;
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Read-only default prop
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o);
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Invalid default prop
-    {
-        QObject o;
-        QDeclarativeMetaProperty p(&o);
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Non-resettable-only prop by name
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, QString("defaultProperty"));
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Resettable prop by name
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, QString("resettableProperty"));
-
-        QCOMPARE(p.read(), QVariant(9));
-        QCOMPARE(p.write(QVariant(11)), true);
-        QCOMPARE(p.read(), QVariant(11));
-
-        QCOMPARE(p.isResettable(), true);
-        QCOMPARE(p.reset(), true);
-
-        QCOMPARE(p.read(), QVariant(9));
-    }
-
-    // Deleted object
-    {
-        PropertyObject *o = new PropertyObject;
-
-        QDeclarativeMetaProperty p(o, QString("resettableProperty"));
-
-        QCOMPARE(p.isResettable(), true);
-        QCOMPARE(p.reset(), true);
-
-        delete o;
-
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-
-    // Signal property
-    {
-        PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "onClicked");
-
-        QCOMPARE(p.isResettable(), false);
-        QCOMPARE(p.reset(), false);
-    }
-}
-
-void tst_qdeclarativemetaproperty::writeObjectToList()
-{
-    QDeclarativeComponent containerComponent(&engine);
-    containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
-    MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
-    QVERIFY(container != 0);
-    QDeclarativeListReference list(container, "children");
-    QVERIFY(list.count() == 1);
-
-    MyQmlObject *object = new MyQmlObject;
-    QDeclarativeMetaProperty prop(container, "children");
-    prop.write(qVariantFromValue(object));
-    QCOMPARE(list.count(), 1);
-    QCOMPARE(list.at(0), object);
-}
-
-Q_DECLARE_METATYPE(QList<QObject *>);
-void tst_qdeclarativemetaproperty::writeListToList()
-{
-    QDeclarativeComponent containerComponent(&engine);
-    containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
-    MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
-    QVERIFY(container != 0);
-    QDeclarativeListReference list(container, "children");
-    QVERIFY(list.count() == 1);
-
-    QList<QObject*> objList;
-    objList << new MyQmlObject() << new MyQmlObject() << new MyQmlObject() << new MyQmlObject();
-    QDeclarativeMetaProperty prop(container, "children");
-    prop.write(qVariantFromValue(objList));
-    QCOMPARE(list.count(), 4);
-
-    //XXX need to try this with read/write prop (for read-only it correctly doesn't write)
-    /*QList<MyQmlObject*> typedObjList;
-    typedObjList << new MyQmlObject();
-    prop.write(qVariantFromValue(&typedObjList));
-    QCOMPARE(container->children()->size(), 1);*/
-}
-
-void tst_qdeclarativemetaproperty::crashOnValueProperty()
-{
-    QDeclarativeEngine *engine = new QDeclarativeEngine;
-    QDeclarativeComponent component(engine);
-
-    component.setData("import Test 1.0\nPropertyObject { wrectProperty.x: 10 }", QUrl());
-    PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
-    QVERIFY(obj != 0);
-
-    QDeclarativeMetaProperty p(obj, "wrectProperty.x", qmlContext(obj));
-    QCOMPARE(p.name(), QString("wrectProperty.x"));
-
-    QCOMPARE(p.read(), QVariant(10));
-
-    //don't crash once the engine is deleted
-    delete engine;
-    engine = 0;
-
-    QCOMPARE(p.propertyTypeName(), "int");
-    QCOMPARE(p.read(), QVariant(10));
-    p.write(QVariant(20));
-    QCOMPARE(p.read(), QVariant(20));
-}
-
-void tst_qdeclarativemetaproperty::copy()
-{
-    PropertyObject object;
-
-    QDeclarativeMetaProperty *property = new QDeclarativeMetaProperty(&object, QLatin1String("defaultProperty"));
-    QCOMPARE(property->name(), QString("defaultProperty"));
-    QCOMPARE(property->read(), QVariant(10));
-    QCOMPARE(property->type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(property->propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
-    QCOMPARE(property->propertyType(), (int)QVariant::Int);
-
-    QDeclarativeMetaProperty p1(*property);
-    QCOMPARE(p1.name(), QString("defaultProperty"));
-    QCOMPARE(p1.read(), QVariant(10));
-    QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p1.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
-    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
-
-    QDeclarativeMetaProperty p2(&object, QLatin1String("url"));
-    QCOMPARE(p2.name(), QString("url"));
-    p2 = *property;
-    QCOMPARE(p2.name(), QString("defaultProperty"));
-    QCOMPARE(p2.read(), QVariant(10));
-    QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p2.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
-    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
-
-    delete property; property = 0;
-
-    QCOMPARE(p1.name(), QString("defaultProperty"));
-    QCOMPARE(p1.read(), QVariant(10));
-    QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p1.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
-    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
-
-    QCOMPARE(p2.name(), QString("defaultProperty"));
-    QCOMPARE(p2.read(), QVariant(10));
-    QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p2.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
-    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
-}
-
-void tst_qdeclarativemetaproperty::initTestCase()
-{
-    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
-    QML_REGISTER_TYPE(Test,1,0,PropertyObject,PropertyObject);
-    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
-}
-
-
-QTEST_MAIN(tst_qdeclarativemetaproperty)
-
-#include "tst_qdeclarativemetaproperty.moc"
diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
index 4333e02..818f108 100644
--- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
+++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
@@ -97,7 +97,7 @@ class ValueSourceTestType : public QObject, public QDeclarativePropertyValueSour
     Q_OBJECT
     Q_INTERFACES(QDeclarativePropertyValueSource)
 public:
-    virtual void setTarget(const QDeclarativeMetaProperty &) {}
+    virtual void setTarget(const QDeclarativeProperty &) {}
 };
 QML_DECLARE_TYPE(ValueSourceTestType);
 
@@ -106,7 +106,7 @@ class ValueInterceptorTestType : public QObject, public QDeclarativePropertyValu
     Q_OBJECT
     Q_INTERFACES(QDeclarativePropertyValueInterceptor)
 public:
-    virtual void setTarget(const QDeclarativeMetaProperty &) {}
+    virtual void setTarget(const QDeclarativeProperty &) {}
     virtual void write(const QVariant &) {}
 };
 QML_DECLARE_TYPE(ValueInterceptorTestType);
diff --git a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro
new file mode 100644
index 0000000..22e50cc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeproperty.cpp
diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
new file mode 100644
index 0000000..d4b0808
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
@@ -0,0 +1,1186 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeproperty.h>
+#include <QtDeclarative/private/qdeclarativeproperty_p.h>
+#include <private/qguard_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <QtGui/QLineEdit>
+
+class MyQmlObject : public QObject
+{
+    Q_OBJECT
+public:
+    MyQmlObject() {}
+};
+
+QML_DECLARE_TYPE(MyQmlObject);
+
+class MyAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int foo READ foo WRITE setFoo)
+public:
+    MyAttached(QObject *parent) : QObject(parent), m_foo(13) {}
+
+    int foo() const { return m_foo; }
+    void setFoo(int f) { m_foo = f; }
+
+private:
+    int m_foo;
+};
+
+class MyContainer : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDeclarativeListProperty<MyQmlObject> children READ children)
+public:
+    MyContainer() {}
+
+    QDeclarativeListProperty<MyQmlObject> children() { return QDeclarativeListProperty<MyQmlObject>(this, m_children); }
+
+    static MyAttached *qmlAttachedProperties(QObject *o) {
+        return new MyAttached(o);
+    }
+
+private:
+    QList<MyQmlObject*> m_children;
+};
+
+QML_DECLARE_TYPE(MyContainer);
+QML_DECLARE_TYPEINFO(MyContainer, QML_HAS_ATTACHED_PROPERTIES)
+
+class tst_qdeclarativeproperty : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativeproperty() {}
+
+private slots:
+    void initTestCase();
+
+    // Constructors
+    void qmlmetaproperty();
+    void qmlmetaproperty_object();
+    void qmlmetaproperty_object_string();
+    void qmlmetaproperty_object_context();
+    void qmlmetaproperty_object_string_context();
+
+    // Methods
+    void name();
+    void read();
+    void write();
+    void reset();
+
+    // Functionality
+    void writeObjectToList();
+    void writeListToList();
+
+    //writeToReadOnly();
+
+    // Bugs
+    void crashOnValueProperty();
+
+    void copy();
+private:
+    QDeclarativeEngine engine;
+};
+
+void tst_qdeclarativeproperty::qmlmetaproperty()
+{
+    QDeclarativeProperty prop;
+
+    QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+    QVERIFY(binding != 0);
+    QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+    QVERIFY(expression != 0);
+
+    QObject *obj = new QObject;
+
+    QCOMPARE(prop.name(), QString());
+    QCOMPARE(prop.read(), QVariant());
+    QCOMPARE(prop.write(QVariant()), false);
+    QCOMPARE(prop.hasChangedNotifier(), false);
+    QCOMPARE(prop.needsChangedNotifier(), false);
+    QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+    QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+    QCOMPARE(prop.connectNotifier(obj, 0), false);
+    QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+    QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+    QCOMPARE(prop.connectNotifier(obj, -1), false);
+    QVERIFY(prop.method().signature() == 0);
+    QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
+    QCOMPARE(prop.isProperty(), false);
+    QCOMPARE(prop.isDefault(), false);
+    QCOMPARE(prop.isWritable(), false);
+    QCOMPARE(prop.isDesignable(), false);
+    QCOMPARE(prop.isResettable(), false);
+    QCOMPARE(prop.isValid(), false);
+    QCOMPARE(prop.object(), (QObject *)0);
+    QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::InvalidCategory);
+    QCOMPARE(prop.propertyType(), 0);
+    QCOMPARE(prop.propertyTypeName(), (const char *)0);
+    QVERIFY(prop.property().name() == 0);
+    QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+    QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+    QVERIFY(binding == 0);
+    QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+    QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+    QVERIFY(expression == 0);
+    QCOMPARE(prop.coreIndex(), -1);
+    QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+    delete obj;
+}
+
+class PropertyObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int defaultProperty READ defaultProperty);
+    Q_PROPERTY(QRect rectProperty READ rectProperty);
+    Q_PROPERTY(QRect wrectProperty READ wrectProperty WRITE setWRectProperty);
+    Q_PROPERTY(QUrl url READ url WRITE setUrl);
+    Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty);
+
+    Q_CLASSINFO("DefaultProperty", "defaultProperty");
+public:
+    PropertyObject() : m_resetProperty(9) {}
+
+    int defaultProperty() { return 10; }
+    QRect rectProperty() { return QRect(10, 10, 1, 209); }
+
+    QRect wrectProperty() { return m_rect; }
+    void setWRectProperty(const QRect &r) { m_rect = r; }
+
+    QUrl url() { return m_url; }
+    void setUrl(const QUrl &u) { m_url = u; }
+
+    int resettableProperty() const { return m_resetProperty; }
+    void setResettableProperty(int r) { m_resetProperty = r; }
+    void resetProperty() { m_resetProperty = 9; }
+
+signals:
+    void clicked();
+
+private:
+    int m_resetProperty;
+    QRect m_rect;
+    QUrl m_url;
+};
+
+QML_DECLARE_TYPE(PropertyObject);
+
+void tst_qdeclarativeproperty::qmlmetaproperty_object()
+{
+    QObject object; // Has no default property
+    PropertyObject dobject; // Has default property
+
+    {
+        QDeclarativeProperty prop(&object);
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString());
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), false);
+        QCOMPARE(prop.object(), (QObject *)0);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::InvalidCategory);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QVERIFY(prop.property().name() == 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeProperty prop(&dobject);
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("defaultProperty"));
+        QCOMPARE(prop.read(), QVariant(10));
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), true);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), (QDeclarativeProperty::Type)(QDeclarativeProperty::Property | QDeclarativeProperty::Default));
+        QCOMPARE(prop.isProperty(), true);
+        QCOMPARE(prop.isDefault(), true);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), true);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::Normal);
+        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
+        QCOMPARE(prop.propertyTypeName(), "int");
+        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding != 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == binding);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+}
+
+void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
+{
+    QObject object; 
+    PropertyObject dobject; 
+
+    {
+        QDeclarativeProperty prop(&object, QString("defaultProperty"));
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString());
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), false);
+        QCOMPARE(prop.object(), (QObject *)0);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::InvalidCategory);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QVERIFY(prop.property().name() == 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeProperty prop(&dobject, QString("defaultProperty"));
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("defaultProperty"));
+        QCOMPARE(prop.read(), QVariant(10));
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), true);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeProperty::Property);
+        QCOMPARE(prop.isProperty(), true);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), true);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::Normal);
+        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
+        QCOMPARE(prop.propertyTypeName(), "int");
+        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding != 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == binding);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeProperty prop(&dobject, QString("onClicked"));
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("onClicked"));
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant("Hello")), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
+        QCOMPARE(prop.type(), QDeclarativeProperty::SignalProperty);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::InvalidCategory);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QCOMPARE(prop.property().name(), (const char *)0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression != 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == expression);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+}
+
+void tst_qdeclarativeproperty::qmlmetaproperty_object_context()
+{
+    QObject object; // Has no default property
+    PropertyObject dobject; // Has default property
+
+    {
+        QDeclarativeProperty prop(&object, engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString());
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), false);
+        QCOMPARE(prop.object(), (QObject *)0);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::InvalidCategory);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QVERIFY(prop.property().name() == 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeProperty prop(&dobject, engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("defaultProperty"));
+        QCOMPARE(prop.read(), QVariant(10));
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), true);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), (QDeclarativeProperty::Type)(QDeclarativeProperty::Property | QDeclarativeProperty::Default));
+        QCOMPARE(prop.isProperty(), true);
+        QCOMPARE(prop.isDefault(), true);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), true);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::Normal);
+        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
+        QCOMPARE(prop.propertyTypeName(), "int");
+        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding != 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == binding);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+}
+
+void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
+{
+    QObject object; 
+    PropertyObject dobject; 
+
+    {
+        QDeclarativeProperty prop(&object, QString("defaultProperty"), engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString());
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), false);
+        QCOMPARE(prop.object(), (QObject *)0);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::InvalidCategory);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QVERIFY(prop.property().name() == 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeProperty prop(&dobject, QString("defaultProperty"), engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("defaultProperty"));
+        QCOMPARE(prop.read(), QVariant(10));
+        QCOMPARE(prop.write(QVariant()), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), true);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QVERIFY(prop.method().signature() == 0);
+        QCOMPARE(prop.type(), QDeclarativeProperty::Property);
+        QCOMPARE(prop.isProperty(), true);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), true);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::Normal);
+        QCOMPARE(prop.propertyType(), (int)QVariant::Int);
+        QCOMPARE(prop.propertyTypeName(), "int");
+        QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:-1: Unable to assign null to int");
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding != 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == binding);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression == 0);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+
+    {
+        QDeclarativeProperty prop(&dobject, QString("onClicked"), engine.rootContext());
+
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
+        binding->setTarget(prop);
+        QVERIFY(binding != 0);
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
+        QVERIFY(expression != 0);
+
+        QObject *obj = new QObject;
+
+        QCOMPARE(prop.name(), QString("onClicked"));
+        QCOMPARE(prop.read(), QVariant());
+        QCOMPARE(prop.write(QVariant("Hello")), false);
+        QCOMPARE(prop.hasChangedNotifier(), false);
+        QCOMPARE(prop.needsChangedNotifier(), false);
+        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifier(obj, 0), false);
+        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
+        QCOMPARE(prop.type(), QDeclarativeProperty::SignalProperty);
+        QCOMPARE(prop.isProperty(), false);
+        QCOMPARE(prop.isDefault(), false);
+        QCOMPARE(prop.isWritable(), false);
+        QCOMPARE(prop.isDesignable(), false);
+        QCOMPARE(prop.isResettable(), false);
+        QCOMPARE(prop.isValid(), true);
+        QCOMPARE(prop.object(), &dobject);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::InvalidCategory);
+        QCOMPARE(prop.propertyType(), 0);
+        QCOMPARE(prop.propertyTypeName(), (const char *)0);
+        QCOMPARE(prop.property().name(), (const char *)0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
+        QVERIFY(binding == 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
+        QVERIFY(expression != 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == expression);
+        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
+
+        delete obj;
+    }
+}
+
+void tst_qdeclarativeproperty::name()
+{
+    { 
+        QDeclarativeProperty p;
+        QCOMPARE(p.name(), QString());
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o);
+        QCOMPARE(p.name(), QString("defaultProperty"));
+    }
+
+    {
+        QObject o;
+        QDeclarativeProperty p(&o, QString("objectName"));
+        QCOMPARE(p.name(), QString("objectName"));
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "onClicked");
+        QCOMPARE(p.name(), QString("onClicked"));
+    }
+
+    {
+        QObject o;
+        QDeclarativeProperty p(&o, "onClicked");
+        QCOMPARE(p.name(), QString());
+    }
+
+    {
+        QObject o;
+        QDeclarativeProperty p(&o, "foo");
+        QCOMPARE(p.name(), QString());
+    }
+
+    {
+        QDeclarativeProperty p(0, "foo");
+        QCOMPARE(p.name(), QString());
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "rectProperty");
+        QCOMPARE(p.name(), QString("rectProperty"));
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "rectProperty.x");
+        QCOMPARE(p.name(), QString("rectProperty.x"));
+    }
+
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "rectProperty.foo");
+        QCOMPARE(p.name(), QString());
+    }
+}
+
+void tst_qdeclarativeproperty::read()
+{
+    // Invalid 
+    {
+        QDeclarativeProperty p;
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Default prop
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o);
+        QCOMPARE(p.read(), QVariant(10));
+    }
+
+    // Invalid default prop
+    {
+        QObject o;
+        QDeclarativeProperty p(&o);
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Value prop by name
+    {
+        QObject o;
+
+        QDeclarativeProperty p(&o, "objectName");
+        QCOMPARE(p.read(), QVariant(QString()));
+
+        o.setObjectName("myName");
+
+        QCOMPARE(p.read(), QVariant("myName"));
+    }
+
+    // Value-type prop
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "rectProperty.x");
+        QCOMPARE(p.read(), QVariant(10));
+    }
+
+    // Invalid value-type prop
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "rectProperty.foo");
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Signal property
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "onClicked");
+        QCOMPARE(p.read(), QVariant());
+
+        QVERIFY(0 == QDeclarativePropertyPrivate::setSignalExpression(p, new QDeclarativeExpression()));
+        QVERIFY(0 != QDeclarativePropertyPrivate::signalExpression(p));
+
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Deleted object
+    {
+        PropertyObject *o = new PropertyObject;
+        QDeclarativeProperty p(o, "rectProperty.x");
+        QCOMPARE(p.read(), QVariant(10));
+        delete o;
+        QCOMPARE(p.read(), QVariant());
+    }
+
+    // Attached property
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0\nMyContainer { }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeProperty p(object, "MyContainer.foo", qmlContext(object));
+        QCOMPARE(p.read(), QVariant(13));
+        delete object;
+    }
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0\nMyContainer { MyContainer.foo: 10 }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeProperty p(object, "MyContainer.foo", qmlContext(object));
+        QCOMPARE(p.read(), QVariant(10));
+        delete object;
+    }
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeProperty p(object, "Foo.MyContainer.foo", qmlContext(object));
+        QCOMPARE(p.read(), QVariant(10));
+        delete object;
+    }
+}
+
+void tst_qdeclarativeproperty::write()
+{
+    // Invalid
+    {
+        QDeclarativeProperty p;
+        QCOMPARE(p.write(QVariant(10)), false);
+    }
+
+    // Read-only default prop
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o);
+        QCOMPARE(p.write(QVariant(10)), false);
+    }
+
+    // Invalid default prop
+    {
+        QObject o;
+        QDeclarativeProperty p(&o);
+        QCOMPARE(p.write(QVariant(10)), false);
+    }
+
+    // Read-only prop by name
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, QString("defaultProperty"));
+        QCOMPARE(p.write(QVariant(10)), false);
+    }
+
+    // Writable prop by name
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, QString("objectName"));
+        QCOMPARE(o.objectName(), QString());
+        QCOMPARE(p.write(QVariant(QString("myName"))), true);
+        QCOMPARE(o.objectName(), QString("myName"));
+    }
+
+    // Deleted object
+    {
+        PropertyObject *o = new PropertyObject;
+        QDeclarativeProperty p(o, QString("objectName"));
+        QCOMPARE(p.write(QVariant(QString("myName"))), true);
+        QCOMPARE(o->objectName(), QString("myName"));
+
+        delete o;
+
+        QCOMPARE(p.write(QVariant(QString("myName"))), false);
+    }
+
+    // Signal property
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "onClicked");
+        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
+
+        QVERIFY(0 == QDeclarativePropertyPrivate::setSignalExpression(p, new QDeclarativeExpression()));
+        QVERIFY(0 != QDeclarativePropertyPrivate::signalExpression(p));
+
+        QCOMPARE(p.write(QVariant("console.log(1921)")), false);
+
+        QVERIFY(0 != QDeclarativePropertyPrivate::signalExpression(p));
+    }
+
+    // Value-type property
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "wrectProperty");
+
+        QCOMPARE(o.wrectProperty(), QRect());
+        QCOMPARE(p.write(QRect(1, 13, 99, 8)), true);
+        QCOMPARE(o.wrectProperty(), QRect(1, 13, 99, 8));
+
+        QDeclarativeProperty p2(&o, "wrectProperty.x");
+        QCOMPARE(p2.read(), QVariant(1));
+        QCOMPARE(p2.write(QVariant(6)), true);
+        QCOMPARE(p2.read(), QVariant(6));
+        QCOMPARE(o.wrectProperty(), QRect(6, 13, 99, 8));
+    }
+
+    // URL-property
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "url");
+
+        QCOMPARE(p.write(QUrl("main.qml")), true);
+        QCOMPARE(o.url(), QUrl("main.qml"));
+
+        QDeclarativeProperty p2(&o, "url", engine.rootContext());
+
+        QUrl result = engine.baseUrl().resolved(QUrl("main.qml"));
+        QVERIFY(result != QUrl("main.qml"));
+
+        QCOMPARE(p2.write(QUrl("main.qml")), true);
+        QCOMPARE(o.url(), result);
+    }
+
+    // Attached property
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0\nMyContainer { }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeProperty p(object, "MyContainer.foo", qmlContext(object));
+        p.write(QVariant(99));
+        QCOMPARE(p.read(), QVariant(99));
+        delete object;
+    }
+    {
+        QDeclarativeComponent component(&engine);
+        component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+
+        QDeclarativeProperty p(object, "Foo.MyContainer.foo", qmlContext(object));
+        p.write(QVariant(99));
+        QCOMPARE(p.read(), QVariant(99));
+        delete object;
+    }
+}
+
+void tst_qdeclarativeproperty::reset()
+{
+    // Invalid
+    {
+        QDeclarativeProperty p;
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Read-only default prop
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o);
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Invalid default prop
+    {
+        QObject o;
+        QDeclarativeProperty p(&o);
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Non-resettable-only prop by name
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, QString("defaultProperty"));
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Resettable prop by name
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, QString("resettableProperty"));
+
+        QCOMPARE(p.read(), QVariant(9));
+        QCOMPARE(p.write(QVariant(11)), true);
+        QCOMPARE(p.read(), QVariant(11));
+
+        QCOMPARE(p.isResettable(), true);
+        QCOMPARE(p.reset(), true);
+
+        QCOMPARE(p.read(), QVariant(9));
+    }
+
+    // Deleted object
+    {
+        PropertyObject *o = new PropertyObject;
+
+        QDeclarativeProperty p(o, QString("resettableProperty"));
+
+        QCOMPARE(p.isResettable(), true);
+        QCOMPARE(p.reset(), true);
+
+        delete o;
+
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+
+    // Signal property
+    {
+        PropertyObject o;
+        QDeclarativeProperty p(&o, "onClicked");
+
+        QCOMPARE(p.isResettable(), false);
+        QCOMPARE(p.reset(), false);
+    }
+}
+
+void tst_qdeclarativeproperty::writeObjectToList()
+{
+    QDeclarativeComponent containerComponent(&engine);
+    containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
+    MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
+    QVERIFY(container != 0);
+    QDeclarativeListReference list(container, "children");
+    QVERIFY(list.count() == 1);
+
+    MyQmlObject *object = new MyQmlObject;
+    QDeclarativeProperty prop(container, "children");
+    prop.write(qVariantFromValue(object));
+    QCOMPARE(list.count(), 1);
+    QCOMPARE(list.at(0), object);
+}
+
+Q_DECLARE_METATYPE(QList<QObject *>);
+void tst_qdeclarativeproperty::writeListToList()
+{
+    QDeclarativeComponent containerComponent(&engine);
+    containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
+    MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
+    QVERIFY(container != 0);
+    QDeclarativeListReference list(container, "children");
+    QVERIFY(list.count() == 1);
+
+    QList<QObject*> objList;
+    objList << new MyQmlObject() << new MyQmlObject() << new MyQmlObject() << new MyQmlObject();
+    QDeclarativeProperty prop(container, "children");
+    prop.write(qVariantFromValue(objList));
+    QCOMPARE(list.count(), 4);
+
+    //XXX need to try this with read/write prop (for read-only it correctly doesn't write)
+    /*QList<MyQmlObject*> typedObjList;
+    typedObjList << new MyQmlObject();
+    prop.write(qVariantFromValue(&typedObjList));
+    QCOMPARE(container->children()->size(), 1);*/
+}
+
+void tst_qdeclarativeproperty::crashOnValueProperty()
+{
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
+    QDeclarativeComponent component(engine);
+
+    component.setData("import Test 1.0\nPropertyObject { wrectProperty.x: 10 }", QUrl());
+    PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
+    QVERIFY(obj != 0);
+
+    QDeclarativeProperty p(obj, "wrectProperty.x", qmlContext(obj));
+    QCOMPARE(p.name(), QString("wrectProperty.x"));
+
+    QCOMPARE(p.read(), QVariant(10));
+
+    //don't crash once the engine is deleted
+    delete engine;
+    engine = 0;
+
+    QCOMPARE(p.propertyTypeName(), "int");
+    QCOMPARE(p.read(), QVariant(10));
+    p.write(QVariant(20));
+    QCOMPARE(p.read(), QVariant(20));
+}
+
+void tst_qdeclarativeproperty::copy()
+{
+    PropertyObject object;
+
+    QDeclarativeProperty *property = new QDeclarativeProperty(&object, QLatin1String("defaultProperty"));
+    QCOMPARE(property->name(), QString("defaultProperty"));
+    QCOMPARE(property->read(), QVariant(10));
+    QCOMPARE(property->type(), QDeclarativeProperty::Property);
+    QCOMPARE(property->propertyTypeCategory(), QDeclarativeProperty::Normal);
+    QCOMPARE(property->propertyType(), (int)QVariant::Int);
+
+    QDeclarativeProperty p1(*property);
+    QCOMPARE(p1.name(), QString("defaultProperty"));
+    QCOMPARE(p1.read(), QVariant(10));
+    QCOMPARE(p1.type(), QDeclarativeProperty::Property);
+    QCOMPARE(p1.propertyTypeCategory(), QDeclarativeProperty::Normal);
+    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
+
+    QDeclarativeProperty p2(&object, QLatin1String("url"));
+    QCOMPARE(p2.name(), QString("url"));
+    p2 = *property;
+    QCOMPARE(p2.name(), QString("defaultProperty"));
+    QCOMPARE(p2.read(), QVariant(10));
+    QCOMPARE(p2.type(), QDeclarativeProperty::Property);
+    QCOMPARE(p2.propertyTypeCategory(), QDeclarativeProperty::Normal);
+    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
+
+    delete property; property = 0;
+
+    QCOMPARE(p1.name(), QString("defaultProperty"));
+    QCOMPARE(p1.read(), QVariant(10));
+    QCOMPARE(p1.type(), QDeclarativeProperty::Property);
+    QCOMPARE(p1.propertyTypeCategory(), QDeclarativeProperty::Normal);
+    QCOMPARE(p1.propertyType(), (int)QVariant::Int);
+
+    QCOMPARE(p2.name(), QString("defaultProperty"));
+    QCOMPARE(p2.read(), QVariant(10));
+    QCOMPARE(p2.type(), QDeclarativeProperty::Property);
+    QCOMPARE(p2.propertyTypeCategory(), QDeclarativeProperty::Normal);
+    QCOMPARE(p2.propertyType(), (int)QVariant::Int);
+}
+
+void tst_qdeclarativeproperty::initTestCase()
+{
+    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
+    QML_REGISTER_TYPE(Test,1,0,PropertyObject,PropertyObject);
+    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
+}
+
+
+QTEST_MAIN(tst_qdeclarativeproperty)
+
+#include "tst_qdeclarativeproperty.moc"
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
index 82a9c8a..dfc2829 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
@@ -52,8 +52,8 @@
 #include <QFont>
 #include <qdeclarative.h>
 #include <QDeclarativePropertyValueSource>
-#include <QDeclarativeMetaProperty>
-#include <private/qdeclarativemetaproperty_p.h>
+#include <QDeclarativeProperty>
+#include <private/qdeclarativeproperty_p.h>
 
 class MyTypeObject : public QObject
 {
@@ -135,7 +135,7 @@ class MyConstantValueSource : public QObject, public QDeclarativePropertyValueSo
 {
     Q_OBJECT
 public:
-    virtual void setTarget(const QDeclarativeMetaProperty &p) { p.write(3345); }
+    virtual void setTarget(const QDeclarativeProperty &p) { p.write(3345); }
 };
 QML_DECLARE_TYPE(MyConstantValueSource);
 
@@ -143,11 +143,11 @@ class MyOffsetValueInterceptor : public QObject, public QDeclarativePropertyValu
 {
     Q_OBJECT
 public:
-    virtual void setTarget(const QDeclarativeMetaProperty &p) { prop = p; }
-    virtual void write(const QVariant &value) { QDeclarativeMetaPropertyPrivate::write(prop, value.toInt() + 13, QDeclarativeMetaPropertyPrivate::BypassInterceptor); }
+    virtual void setTarget(const QDeclarativeProperty &p) { prop = p; }
+    virtual void write(const QVariant &value) { QDeclarativePropertyPrivate::write(prop, value.toInt() + 13, QDeclarativePropertyPrivate::BypassInterceptor); }
 
 private:
-    QDeclarativeMetaProperty prop;
+    QDeclarativeProperty prop;
 };
 QML_DECLARE_TYPE(MyOffsetValueInterceptor);
 
-- 
cgit v0.12


From 8df48c2c402873b55c037fb150594c6529e8f146 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 25 Feb 2010 11:41:42 +0100
Subject: Introduced QDeclarativeExtensionPlugin::registerTypes(uri).

Now, you have to reimplement registerTypes(uri) to expose native
QML types, and initializeEngine(engine,uri) to add instances to
the QML engine's root context.
---
 examples/declarative/plugins/plugin.cpp                  |  5 ++---
 src/declarative/qml/qdeclarativeengine.cpp               | 12 ++++++++++--
 src/declarative/qml/qdeclarativeengine_p.h               |  1 +
 src/declarative/qml/qdeclarativeextensioninterface.h     |  3 ++-
 src/declarative/qml/qdeclarativeextensionplugin.cpp      | 16 ++++++++++++++--
 src/declarative/qml/qdeclarativeextensionplugin.h        |  3 ++-
 src/multimedia/qml/multimediadeclarative.cpp             |  9 ++++-----
 src/multimedia/qml/multimediadeclarative.h               |  4 +---
 .../qdeclarativemodules/multimedia/multimedia.cpp        |  4 ++--
 src/plugins/qdeclarativemodules/widgets/widgets.cpp      |  9 +--------
 .../com/nokia/AutoTestQmlPluginType/qmldir               |  1 +
 .../qdeclarativemoduleplugin/plugin/plugin.cpp           |  9 ++-------
 .../qdeclarativemoduleplugin/plugin/plugin.pro           |  3 ++-
 .../tst_qdeclarativemoduleplugin.pro                     |  1 +
 14 files changed, 45 insertions(+), 35 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativemoduleplugin/com/nokia/AutoTestQmlPluginType/qmldir

diff --git a/examples/declarative/plugins/plugin.cpp b/examples/declarative/plugins/plugin.cpp
index f6385d0..741f68a 100644
--- a/examples/declarative/plugins/plugin.cpp
+++ b/examples/declarative/plugins/plugin.cpp
@@ -144,11 +144,10 @@ class QExampleQmlPlugin : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
-    void initialize(QDeclarativeEngine *engine, const char *uri)
+    void registerTypes(const char *uri)
     {
-        Q_UNUSED(engine);
         Q_ASSERT(uri == QLatin1String("com.nokia.TimeExample"));
-        qmlRegisterType<Time>(uri, 1, 0, "Time", "Time");
+        qmlRegisterType<Time>(uri, 1, 0, "Time");
     }
 };
 
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 8abea4e..b4850a9 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1624,7 +1624,16 @@ bool QDeclarativeEngine::importExtension(const QString &fileName, const QString
     QPluginLoader loader(fileName);
 
     if (QDeclarativeExtensionInterface *iface = qobject_cast<QDeclarativeExtensionInterface *>(loader.instance())) {
-        iface->initialize(this, uri.toUtf8().constData());
+        const QByteArray bytes = uri.toUtf8();
+        const char *moduleId = bytes.constData();
+
+        QDeclarativeEnginePrivate *d = QDeclarativeEnginePrivate::get(this);
+        if (! d->importedPlugins.contains(fileName)) {
+            d->importedPlugins.insert(fileName);
+            iface->registerTypes(moduleId);
+        }
+
+        iface->initializeEngine(this, moduleId);
         return true;
     }
 
@@ -1669,7 +1678,6 @@ QString QDeclarativeEnginePrivate::resolvePlugin(const QDir &dir, const QString
                                         const QStringList &suffixes,
                                         const QString &prefix)
 {
-    qWarning() << baseName;
     foreach (const QString &suffix, suffixes) {
         QString pluginFileName = prefix;
 
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 2364315..6ef2f93 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -267,6 +267,7 @@ public:
 
 
     QStringList environmentImportPath;
+    QSet<QString> importedPlugins;
 
     QString resolvePlugin(const QDir &dir, const QString &baseName,
                           const QStringList &suffixes,
diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h
index a8ae064..0fabd6d 100644
--- a/src/declarative/qml/qdeclarativeextensioninterface.h
+++ b/src/declarative/qml/qdeclarativeextensioninterface.h
@@ -55,7 +55,8 @@ class QDeclarativeEngine;
 struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface
 {
     virtual ~QDeclarativeExtensionInterface() {}
-    virtual void initialize(QDeclarativeEngine *engine, const char *uri) = 0;
+    virtual void registerTypes(const char *uri) = 0;
+    virtual void initializeEngine(QDeclarativeEngine *engine, const char *uri) = 0;
 };
 
 Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, "com.trolltech.Qt.QDeclarativeExtensionInterface/1.0")
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.cpp b/src/declarative/qml/qdeclarativeextensionplugin.cpp
index 6af3a6d..3d44d63 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.cpp
+++ b/src/declarative/qml/qdeclarativeextensionplugin.cpp
@@ -63,9 +63,9 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn void QDeclarativeExtensionPlugin::initialize(QDeclarativeEngine *engine)
+    \fn void QDeclarativeExtensionPlugin::registerTypes(const char *uri)
 
-    Initializes the extension specified in the given \a engine.
+    Registers the QML types in the given \a uri.
 */
 
 /*!
@@ -84,4 +84,16 @@ QDeclarativeExtensionPlugin::~QDeclarativeExtensionPlugin()
 {
 }
 
+/*!
+    \fn void QDeclarativeExtensionPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
+
+    Initializes the extension specified in the given \a engine.
+*/
+
+void QDeclarativeExtensionPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(uri);
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h
index 79df52b..c2ad798 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.h
+++ b/src/declarative/qml/qdeclarativeextensionplugin.h
@@ -62,7 +62,8 @@ public:
     explicit QDeclarativeExtensionPlugin(QObject *parent = 0);
     ~QDeclarativeExtensionPlugin();
 
-    virtual void initialize(QDeclarativeEngine *engine, const char *uri) = 0;
+    virtual void registerTypes(const char *uri) = 0;
+    virtual void initializeEngine(QDeclarativeEngine *engine, const char *uri);
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/qml/multimediadeclarative.cpp b/src/multimedia/qml/multimediadeclarative.cpp
index 086250a..7f5298f 100644
--- a/src/multimedia/qml/multimediadeclarative.cpp
+++ b/src/multimedia/qml/multimediadeclarative.cpp
@@ -55,14 +55,13 @@ namespace QtMultimedia
     \internal
 */
 
-void qRegisterDeclarativeElements(QDeclarativeEngine *engine, const char *uri)
+void qRegisterDeclarativeElements(const char *uri)
 {
-    Q_UNUSED(engine)
     Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimedia"));
 
-    qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect");
-    qmlRegisterType<QDeclarativeAudio>("Qt.multimedia", 4, 7, "Audio");
-    qmlRegisterType<QDeclarativeVideo>("Qt.multimedia", 4, 7, "Video");
+    qmlRegisterType<QSoundEffect>(uri, 4, 7, "SoundEffect");
+    qmlRegisterType<QDeclarativeAudio>(uri, 4, 7, "Audio");
+    qmlRegisterType<QDeclarativeVideo>(uri, 4, 7, "Video");
 }
 
 }
diff --git a/src/multimedia/qml/multimediadeclarative.h b/src/multimedia/qml/multimediadeclarative.h
index befddb6..29af65a 100644
--- a/src/multimedia/qml/multimediadeclarative.h
+++ b/src/multimedia/qml/multimediadeclarative.h
@@ -49,11 +49,9 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Multimedia)
 
-class QDeclarativeEngine;
-
 namespace QtMultimedia
 {
-extern void Q_MULTIMEDIA_EXPORT qRegisterDeclarativeElements(QDeclarativeEngine* engine, const char *uri);
+extern void Q_MULTIMEDIA_EXPORT qRegisterDeclarativeElements(const char *uri);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
index e27dd8d..8becbf3 100644
--- a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
@@ -49,9 +49,9 @@ class QMultimediaQmlModule : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
-    virtual void initialize(QDeclarativeEngine *engine, const char *uri)
+    virtual void registerTypes(const char *uri)
     {
-        QtMultimedia::qRegisterDeclarativeElements(engine, uri);
+        QtMultimedia::qRegisterDeclarativeElements(uri);
     }
 };
 
diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.cpp b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
index 7229d88..ec21cc4 100644
--- a/src/plugins/qdeclarativemodules/widgets/widgets.cpp
+++ b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
@@ -114,15 +114,8 @@ class QWidgetsQmlModule : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
-    QStringList keys() const
+    virtual void registerTypes(const char *uri)
     {
-        return QStringList() << QLatin1String("Qt.widgets");
-    }
-
-    virtual void initialize(QDeclarativeEngine *engine, const char *uri)
-    {
-        Q_UNUSED(engine);
-
         Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.widgets"));
 
         QML_REGISTER_INTERFACE(QGraphicsLayoutItem);
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/com/nokia/AutoTestQmlPluginType/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/com/nokia/AutoTestQmlPluginType/qmldir
new file mode 100644
index 0000000..0a8b5d4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/com/nokia/AutoTestQmlPluginType/qmldir
@@ -0,0 +1 @@
+plugin plugin
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
index 154693c..fd94cc6 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
@@ -73,15 +73,10 @@ public:
         qWarning("plugin created");
     }
 
-    QStringList keys() const
-    {
-        return QStringList() << QLatin1String("com.nokia.AutoTestQmlPluginType");
-    }
-
-    void initialize(QDeclarativeEngine*, const char *uri)
+    void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType");
-        QML_REGISTER_TYPE(com.nokia.AutoTestQmlPluginType,1,0,MyPluginType,MyPluginType);
+        qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType");
     }
 };
 
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
index 348080d..035cb7d 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
@@ -2,4 +2,5 @@ TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
 QT = core declarative
-DESTDIR = qdeclarativemodules
+DESTDIR = ../com/nokia/AutoTestQmlPluginType
+
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
index dd65511..d895ed0 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 SOURCES = tst_qdeclarativemoduleplugin.cpp
 QT += declarative
+CONFIG -= app_bundle
 DEFINES += SRCDIR=\\\"$$PWD\\\"
-- 
cgit v0.12


From d6197028818e51e78249b029a823fde1b0ffde03 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 25 Feb 2010 14:51:00 +0100
Subject: Don't look for contextual keywords when defining properties.

---
 src/declarative/qml/parser/qdeclarativejs.g        |   24 +-
 .../qml/parser/qdeclarativejsgrammar.cpp           | 1262 ++++++++++----------
 .../qml/parser/qdeclarativejsgrammar_p.h           |    4 +-
 3 files changed, 658 insertions(+), 632 deletions(-)

diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g
index 4c77845..7cf81b2 100644
--- a/src/declarative/qml/parser/qdeclarativejs.g
+++ b/src/declarative/qml/parser/qdeclarativejs.g
@@ -882,8 +882,8 @@ case $rule_number: {
 }   break;
 ./
 
-UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT T_IDENTIFIER T_SEMICOLON ;
+UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIdentifier T_SEMICOLON ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
@@ -897,8 +897,8 @@ case $rule_number: {
 }   break;
 ./
 
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_SEMICOLON ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
@@ -910,8 +910,8 @@ case $rule_number: {
 }   break;
 ./
 
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_SEMICOLON ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
@@ -925,8 +925,8 @@ case $rule_number: {
 }   break;
 ./
 
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_SEMICOLON ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
@@ -940,8 +940,8 @@ case $rule_number: {
 }   break;
 ./
 
-UiObjectMember: T_READONLY T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_READONLY T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_SEMICOLON ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
@@ -957,8 +957,8 @@ case $rule_number: {
 }   break;
 ./
 
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_SEMICOLON ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
index 18ae607..0677bc5 100644
--- a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
@@ -211,260 +211,275 @@ const short QDeclarativeJSGrammar::goto_default [] = {
   199, 181, 184, 198, 206, 0};
 
 const short QDeclarativeJSGrammar::action_index [] = {
-  293, 1217, 2251, 2251, 2348, 945, -3, 88, 97, -101, 
-  85, 78, 70, 249, -101, 302, 82, -101, -101, 676, 
-  81, 132, 281, 248, -101, -101, -101, 494, 225, 1217, 
-  -101, -101, -101, 397, -101, 1960, 1584, 1217, 1217, 1217, 
-  -101, 765, 1217, -101, -101, -101, 1217, 1217, -101, -101, 
-  -101, -101, -101, 1217, -101, 1217, 1217, -101, 1217, 1217, 
-  92, 199, -101, -101, 1217, 1217, 1217, -101, -101, -101, 
-  179, 1217, 295, 1217, 1217, 1217, 1217, 467, 1217, 1217, 
-  1217, 1217, 1217, 1217, 191, 1217, 1217, 1217, 136, 121, 
-  144, 207, 182, 181, 261, 291, 477, 578, 578, 1217, 
-  86, 1217, 91, 2057, 1217, 1217, -101, -101, -101, -101, 
+  314, 1273, 2404, 2404, 2307, 1001, 58, 98, 78, -101, 
+  95, 56, 4, 236, -101, 296, 86, -101, -101, 545, 
+  97, 115, 162, 197, -101, -101, -101, 447, 192, 1273, 
+  -101, -101, -101, 369, -101, 2113, 1919, 1273, 1273, 1273, 
+  -101, 732, 1273, -101, -101, -101, 1273, 1273, -101, -101, 
+  -101, -101, -101, 1273, -101, 1273, 1273, -101, 1273, 1273, 
+  81, 195, -101, -101, 1273, 1273, 1273, -101, -101, -101, 
+  185, 1273, 283, 1273, 1273, 1273, 1273, 447, 1273, 1273, 
+  1273, 1273, 1273, 1273, 297, 1273, 1273, 1273, 107, 85, 
+  116, 297, 297, 297, 297, 191, 447, 447, 447, 1273, 
+  74, 1273, 102, 2016, 1273, 1273, -101, -101, -101, -101, 
   -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
   -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
   -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
-  108, 1217, -101, -101, 83, 75, -101, 1217, -101, -101, 
-  1217, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
-  -101, -101, -101, -101, 1217, 34, 1217, 1217, 62, 66, 
-  1217, -101, 2057, 1217, 1217, -101, 99, -101, 41, -101, 
-  -101, 68, -101, 328, 69, 35, -101, 349, -101, 39, 
-  2251, -101, -101, -101, -101, -101, 232, -101, -101, 21, 
-  -101, -101, -101, -101, -101, -101, 2251, -101, -101, 490, 
-  -101, 558, 116, 2348, 38, 385, 63, 49, 2542, 73, 
-  1217, -101, 74, 60, 1217, 65, -101, 61, 64, -101, 
-  -101, 381, -101, -101, -101, -101, -101, -101, 107, -101, 
-  -101, -101, -101, 101, -101, -101, -101, -101, -101, -101, 
-  59, 58, 1217, 94, 95, -101, -101, 1401, -101, 157, 
-  51, 52, -101, 314, 71, 56, 604, 76, 90, 422, 
-  242, 317, 1217, 335, 1217, 1217, 1217, 1217, 332, 1217, 
-  1217, 1217, 1217, 1217, 172, 176, 188, 206, 203, 500, 
-  395, 422, 1217, 52, 1217, 157, 1217, -101, 676, 1217, 
-  -101, 1217, 67, 44, 1217, 48, 2348, -101, 1217, 250, 
-  2348, -101, 1217, 84, 1217, 1217, 87, 77, 1217, -101, 
-  54, 135, 72, -101, -101, 1217, -101, 345, 1217, -101, 
-  80, 1217, 79, 2348, -101, 1217, 175, 2348, -101, -33, 
-  339, -53, -13, 2251, -30, -101, 2348, -101, 1217, 152, 
-  2348, 0, 2348, -101, 11, 57, -54, -101, -101, 2348, 
-  -38, 501, 1, 524, 127, 1217, 2348, -2, -27, 414, 
-  16, -23, 765, 5, 7, -101, 1311, -101, 4, -26, 
-  15, 1217, 14, -31, 1217, -1, 1217, -36, -32, 1217, 
-  -101, 2154, 19, -101, -101, -101, -101, -101, -101, 1217, 
-  -101, -101, -101, -101, 289, -101, 1217, -7, -101, 2348, 
-  -101, 131, -101, -101, 2348, -101, 1217, 130, -9, -101, 
-  47, -101, 40, 104, 1217, -101, 45, 42, -101, 13, 
-  -101, 2348, -101, 102, 2348, -101, 192, -101, -101, 100, 
-  2348, 43, -101, 20, 18, -101, 394, -29, 9, -101, 
-  -101, -101, -101, 1217, 138, 2348, -101, 1217, 134, 2348, 
-  -101, 24, -101, 215, -101, -101, 1217, -101, -101, 400, 
-  -101, -101, -101, 119, 1770, -101, -101, 1863, -101, -101, 
-  1677, -101, -101, -101, -101, -101, -101, 145, -101, -101, 
-  -101, -101, -101, -101, -101, -101, 2251, -101, -101, -101, 
-  96, -11, 854, 214, -19, -14, -101, -101, 344, -101, 
-  222, -101, -101, -101, 29, 220, -101, 1217, -101, 241, 
-  -101, -101, 292, -4, 6, 244, 3, 17, 118, -101, 
-  -101, 230, -101, 1217, -101, 177, -101, -101, 193, 8, 
-  32, 1217, 209, -101, -101, 185, -101, 173, -101, 46, 
-  -24, 404, 226, 333, -101, 112, -101, -101, -101, 1491, 
-  1127, 854, -101, -101, -101, -101, -101, 316, 2445, 1584, 
-  10, 454, 33, 482, 109, 1217, 2348, 37, 2, 474, 
-  27, -8, 765, 22, 25, -101, 1311, -101, 23, 12, 
-  50, 1217, 53, 36, 1217, 55, 1217, 31, 30, 309, 
-  125, -101, 28, 737, -101, -101, -101, -101, -101, 1036, 
-  -101, -101, 26, -101, -101, 654, -101, 275, -71, 854, 
-  -101, -101, 113, 305, -101, 204, -101, 89, -101, -101, 
-  336, -101, -101, 105, -101, -101, -101, -101, -101, -101, 
+  112, 1273, -101, -101, 92, 61, -101, 1273, -101, -101, 
+  1273, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  -101, -101, -101, -101, 1273, 36, 1273, 1273, 65, 62, 
+  1273, -101, 2016, 1273, 1273, -101, 127, -101, 42, -101, 
+  -101, 57, -101, 294, 60, 35, -101, 259, -101, 32, 
+  2404, -101, -101, -101, -101, -101, 200, -101, -101, 33, 
+  -101, -101, -101, -101, -101, -101, 2404, -101, -101, 436, 
+  -101, 433, 100, 2307, 34, 369, 67, 45, 2598, 71, 
+  1273, -101, 72, 51, 1273, 59, -101, 54, 55, -101, 
+  -101, 324, -101, -101, -101, -101, -101, -101, 88, -101, 
+  -101, -101, -101, 76, -101, -101, -101, -101, -101, -101, 
+  5, 49, 1273, 104, 84, -101, -101, 1457, -101, 70, 
+  41, 1, -101, 287, 68, 46, 643, 73, 77, 364, 
+  297, 369, 1273, 238, 1273, 1273, 1273, 1273, 341, 1273, 
+  1273, 1273, 1273, 1273, 297, 175, 167, 161, 176, 348, 
+  315, 331, 1273, -13, 1273, 63, 1273, -101, 545, 1273, 
+  -101, 1273, 64, 40, 1273, 2, 2307, -101, 1273, 152, 
+  2307, -101, 1273, 69, 1273, 1273, 75, 79, 1273, -101, 
+  44, 149, 66, -101, -101, 1273, -101, 369, 1273, -101, 
+  52, 1273, -54, 2307, -101, 1273, 151, 2307, -101, -29, 
+  369, -41, -11, 2404, -46, -101, 2307, -101, 1273, 131, 
+  2307, -5, 2307, -101, 8, 13, -55, -101, -101, 2307, 
+  -51, 360, -2, 352, 119, 1273, 2307, 39, -19, 366, 
+  3, -24, 910, 6, 7, -101, 1367, -101, 11, -16, 
+  -4, 1273, -6, -31, 1273, 9, 1273, -12, 17, 1273, 
+  -101, 2210, 37, -101, -101, -101, -101, -101, -101, 1273, 
+  -101, -101, -101, -101, 258, -101, 1273, -15, -101, 2307, 
+  -101, 117, -101, -101, 2307, -101, 1273, 106, 16, -101, 
+  38, -101, 135, 96, 1273, -101, 135, 43, -101, 18, 
+  -101, 2307, -101, 101, 2307, -101, 179, -101, -101, 99, 
+  2307, 31, -101, -7, -8, -101, 369, -34, -1, -101, 
+  -101, -101, -101, 1273, 124, 2307, -101, 1273, 122, 2307, 
+  -101, 25, -101, 207, -101, -101, 1273, -101, -101, 290, 
+  -101, -101, -101, 114, 1733, -101, -101, 1826, -101, -101, 
+  1550, -101, -101, -101, -101, -101, -101, 103, -101, -101, 
+  -101, -101, -101, -101, -101, -101, 2404, -101, -101, -101, 
+  221, -43, 704, 164, -26, 12, -101, -101, 188, -101, 
+  196, -101, -101, -101, 369, 183, -101, 1273, -101, 165, 
+  -101, -101, 170, 0, 369, 160, 10, 369, 113, -101, 
+  -101, 215, -101, 1273, -101, 225, -101, -101, 203, 369, 
+  28, 1273, 229, -101, -101, 202, -101, 218, -101, 30, 
+  -21, 369, 199, 278, -101, 110, -101, -101, -101, 1640, 
+  1092, 583, -101, -101, -101, -101, -101, 284, 2501, 1919, 
+  14, 388, 29, 424, 93, 1273, 2307, 39, -9, 338, 
+  21, -3, 821, 24, 23, -101, 1367, -101, 48, 20, 
+  47, 1273, 50, 26, 1273, 53, 1273, 27, 22, 264, 
+  120, -101, 15, 813, -101, -101, -101, -101, -101, 1183, 
+  -101, -101, 19, -101, -101, 498, -101, 249, -82, 902, 
+  -101, -101, 118, 369, -101, 204, -101, 80, -101, -101, 
+  369, -101, -101, 82, -101, -101, -101, -101, -101, -101, 
 
-  -106, 4, -103, -4, 2, 317, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -37, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, 68, 
-  -106, -106, -106, 21, -106, -106, -12, 17, 171, 175, 
-  -106, 200, 168, -106, -106, -106, 180, 141, -106, -106, 
-  -106, -106, -106, 155, -106, 159, 156, -106, 151, 150, 
-  -106, -106, -106, -106, 117, 162, 103, -106, -106, -106, 
-  -106, 178, -106, 95, 146, 118, 130, -106, 142, 140, 
-  176, 167, 174, 224, -106, 87, 88, 93, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, 90, 
-  -106, 138, -106, 92, 84, 56, -106, -106, -106, -106, 
+  -106, 17, -83, 19, 24, 228, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -49, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, 101, 
+  -106, -106, -106, 2, -106, -106, -2, 29, 107, 166, 
+  -106, 204, 183, -106, -106, -106, 174, 169, -106, -106, 
+  -106, -106, -106, 145, -106, 141, 137, -106, 152, 161, 
+  -106, -106, -106, -106, 163, 158, 157, -106, -106, -106, 
+  -106, 132, -106, 142, 138, 187, 178, -106, 167, 181, 
+  81, 82, 85, 83, -106, 93, 114, 96, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, 170, 
+  -106, 74, -106, 109, 80, 51, -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, 9, -106, -106, -106, -106, -106, 36, -106, -106, 
-  55, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, 111, -106, 113, 50, -106, -106, 
-  42, -106, 212, 59, 116, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -10, -106, -106, -106, 49, -106, -106, 
+  -106, 25, -106, -106, -106, -106, -106, 41, -106, -106, 
+  50, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, 98, -106, 104, 43, -106, -106, 
+  42, -106, 221, 64, 117, -106, -106, -106, -106, -106, 
+  -106, -106, -106, 54, -106, -106, -106, 55, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, 54, -106, -106, 41, 
-  -106, 34, -106, 35, -106, 74, -106, -106, 72, -106, 
-  80, -106, -106, -106, 81, 65, -106, -106, -106, -106, 
-  -106, -9, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 47, -106, -106, 38, 
+  -106, 33, -106, 92, -106, 73, -106, -106, 88, -106, 
+  86, -106, -106, -106, 94, 23, -106, -106, -106, -106, 
+  -106, -11, -106, -106, -106, -106, -106, -106, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, 22, -106, -106, -106, -106, 109, -106, -106, 
+  -106, -106, 22, -106, -106, -106, -106, 105, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -7, 239, -106, 236, 235, 227, 223, -106, 110, 
-  99, 89, 78, 75, -106, -106, -106, -106, -106, -106, 
-  -106, -106, 203, -106, 214, -106, 187, -106, -106, 245, 
-  -106, 125, -106, -106, 98, -106, 25, -106, 12, -106, 
-  100, -106, 184, -106, 221, 196, -106, -106, 185, -106, 
-  -106, -106, -106, -106, -106, 193, -106, 101, 108, -106, 
-  -106, 102, -106, 77, -106, 73, -106, 76, -106, -106, 
-  105, -106, -106, -8, -106, -106, 86, -106, 45, -106, 
-  48, -106, 51, -106, -106, -106, -106, -106, -106, 39, 
-  -106, 28, -106, 30, -106, 163, 38, -106, -106, 52, 
-  -106, -106, 85, -106, -106, -106, 62, -106, -106, -106, 
-  -106, 66, -106, 40, 121, -106, 106, -106, -106, 46, 
-  -106, 44, -106, -106, -106, -106, -106, -106, -106, 47, 
-  -106, -106, -106, -106, -106, -106, 83, -106, -106, 57, 
-  -106, -106, -106, -106, 58, -106, 63, -106, -106, -106, 
-  -106, -106, -24, -106, 67, -106, -25, -106, -106, -106, 
-  -106, 91, -106, -106, 94, -106, -106, -106, -106, -106, 
-  61, -41, -106, -106, 33, -106, 32, -106, 31, -106, 
-  -106, -106, -106, 70, -106, 37, -106, 43, -106, 53, 
-  -106, -106, -106, -106, -106, -106, 16, -106, -106, 79, 
-  -106, -106, -106, -106, 64, -106, -106, 69, -106, -106, 
-  60, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, 71, -106, -106, -106, 
-  -106, -106, 5, -106, -106, -106, -106, -106, -106, -106, 
-  -22, -106, -106, -106, -106, -106, -106, 29, -106, -106, 
-  -106, -106, -106, -106, -106, -16, -106, -106, -106, -106, 
-  -106, -106, -106, 7, -106, -106, -106, -106, -23, -106, 
-  -106, 26, -106, -106, -106, -106, -106, 8, -106, -106, 
-  -106, 27, 10, 23, -106, -106, -106, -106, -106, 285, 
-  290, 97, -106, -106, -106, -106, -106, -106, 24, 277, 
-  0, 1, -106, -1, -106, 137, 11, -106, -106, 6, 
-  -106, -106, 197, -106, -106, -106, 19, -106, -106, -106, 
-  -106, 14, -106, 3, 96, -106, 133, -106, -106, -106, 
-  -106, -106, -106, 219, -106, -106, -106, -106, -106, 286, 
-  -106, -106, 15, -106, -106, -2, -106, -106, 20, 241, 
-  -106, -106, -106, 13, -106, -106, -106, -106, -106, -106, 
-  -3, -106, -106, -106, -106, -106, -106, -106, -106, -106};
+  -106, 7, 235, -106, 249, 219, 216, 222, -106, 124, 
+  125, 123, 122, 116, -106, -106, -106, -106, -106, -106, 
+  -106, -106, 191, -106, 232, -106, 225, -106, -106, 231, 
+  -106, 156, -106, -106, 130, -106, 91, -106, 5, -106, 
+  8, -106, 233, -106, 200, 189, -106, -106, 198, -106, 
+  -106, -106, -106, -106, -106, 245, -106, 108, 95, -106, 
+  -106, 298, -106, 195, -106, 89, -106, 71, -106, -106, 
+  120, -106, -106, -5, -106, -106, 52, -106, 53, -106, 
+  56, -106, 60, -106, -106, -106, -106, -106, -106, 39, 
+  -106, 37, -106, 49, -106, 133, 69, -106, -106, 59, 
+  -106, -106, 102, -106, -106, -106, 79, -106, -106, -106, 
+  -106, 62, -106, 45, 67, -106, 75, -106, -106, 44, 
+  -106, 1, -106, -106, -106, -106, -106, -106, -106, 46, 
+  -106, -106, -106, -106, -106, -106, 115, -106, -106, 66, 
+  -106, -106, -106, -106, 70, -106, 77, -106, -106, -106, 
+  -106, -106, -9, -106, 72, -106, -38, -106, -106, -106, 
+  -106, 97, -106, -106, 99, -106, -106, -106, -106, -106, 
+  40, -51, -106, -106, 36, -106, 34, -106, 63, -106, 
+  -106, -106, -106, 35, -106, 48, -106, 58, -106, 57, 
+  -106, -106, -106, -106, -106, -106, 28, -106, -106, 90, 
+  -106, -106, -106, -106, 65, -106, -106, 159, -106, -106, 
+  61, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 87, -106, -106, -106, 
+  -106, -106, -13, -106, -106, -106, -106, -106, -106, -106, 
+  -18, -106, -106, -106, -10, -106, -106, 0, -106, -106, 
+  -106, -106, -106, -106, -4, -12, -106, -6, -106, -106, 
+  -106, -106, -106, 3, -106, -106, -106, -106, -23, -14, 
+  -106, 11, -106, -106, -106, -106, -106, 15, -106, -106, 
+  -106, 16, 18, 14, -106, -106, -106, -106, -106, 292, 
+  399, 180, -106, -106, -106, -106, -106, -106, 26, 286, 
+  20, 21, -106, 30, -106, 177, 10, -106, -106, 31, 
+  -106, -106, 193, -106, -106, -106, 32, -106, -106, -106, 
+  -106, 27, -106, 13, 76, -106, 68, -106, -106, -106, 
+  -106, -106, -106, 230, -106, -106, -106, -106, -106, 290, 
+  -106, -106, -3, -106, -106, 6, -106, -106, 4, 270, 
+  -106, -106, -106, 9, -106, -106, -106, -106, -106, -106, 
+  12, -106, -106, -106, -106, -106, -106, -106, -106, -106};
 
 const short QDeclarativeJSGrammar::action_info [] = {
-  453, 401, 440, 340, 457, -110, -126, 342, -129, 257, 
-  416, -99, -118, 348, -100, 545, 352, 403, 389, 615, 
-  343, -123, -121, -96, 420, 345, 399, 527, 348, -118, 
-  -99, 448, -100, 525, -96, 531, 555, 540, 257, 541, 
-  -129, 466, 440, 560, -110, 424, 528, 538, 416, 431, 
-  424, 440, 424, 408, 552, 510, 446, -121, 515, 560, 
-  -123, 560, -126, 444, 164, 391, 457, 453, 430, 440, 
-  346, 325, 190, 170, 257, 141, 236, 187, 312, 296, 
-  409, 414, 99, 164, 318, 348, 71, 615, 639, 312, 
-  141, 147, 71, 0, 252, 189, 416, 453, 440, 292, 
-  457, 179, 141, 335, 183, 304, 443, 141, 306, 434, 
-  141, 172, 0, 0, 427, 0, 141, 301, 0, 0, 
-  444, 0, 0, 0, 0, 0, 99, 477, 172, 0, 
-  173, 294, 292, 603, 62, 149, 251, 58, 141, 333, 
-  314, 331, 141, 327, 315, 63, 141, 173, 59, 101, 
-  629, 628, 0, 141, 254, 177, 256, 255, 272, 428, 
-  141, 58, 247, 246, 142, 101, 635, 634, 242, 241, 
-  249, 248, 59, 557, 556, 478, 58, 249, 248, 530, 
-  529, 604, 166, 141, 58, 141, 167, 59, 249, 248, 
-  418, 64, 413, 412, 459, 59, 328, 85, 455, 86, 
-  141, 85, 511, 86, 0, 488, 85, 85, 86, 86, 
-  87, 64, 350, 85, 87, 86, 85, 141, 86, 87, 
-  87, 547, 511, 469, 0, 0, 87, 517, 85, 87, 
-  86, 85, 85, 86, 86, 337, 65, 533, 537, 536, 
-  141, 87, 66, 523, 87, 87, 548, 546, 513, 141, 
-  85, 511, 86, 438, 437, 511, 65, 0, 141, 512, 
-  64, 0, 66, 87, 103, 632, 631, 85, 513, 86, 
-  544, 543, 0, 511, 0, 0, 470, 468, 0, 512, 
-  87, 518, 516, 104, 0, 105, 85, 0, 86, 513, 
-  0, 534, 532, 235, 234, 630, 172, 513, 0, 87, 
-  512, 513, 521, 520, 172, 65, 0, 172, 512, 0, 
-  310, 66, 512, 73, 74, 173, 85, 174, 86, 513, 
-  73, 74, 625, 173, 172, 406, 173, 0, 406, 87, 
-  512, 172, 274, 275, 34, 0, 626, 624, 0, 0, 
-  75, 76, -87, 173, 0, 174, 34, 75, 76, -87, 
-  173, 559, 174, 274, 275, 279, 280, 34, 0, 276, 
-  277, 0, 34, 0, 281, 34, 623, 282, 34, 283, 
-  0, 48, 50, 49, 34, 0, 0, 560, 34, 0, 
-  276, 277, 0, 48, 50, 49, 6, 5, 4, 1, 
-  3, 2, 0, 0, 48, 50, 49, 45, 0, 48, 
-  50, 49, 48, 50, 49, 48, 50, 49, 0, 45, 
-  34, 48, 50, 49, 34, 48, 50, 49, 279, 280, 
-  45, 0, 0, 34, 0, 45, 34, 281, 45, 34, 
-  282, 45, 283, 34, 0, 0, 561, 45, 0, 0, 
-  0, 45, 0, 34, 0, 279, 280, 48, 50, 49, 
-  -341, 48, 50, 49, 281, 0, 0, 282, 0, 283, 
-  48, 50, 49, 48, 50, 49, 48, 50, 49, 0, 
-  48, 50, 49, 45, 0, 0, 0, 45, 0, 0, 
-  48, 50, 49, 34, 0, 0, 45, 0, 0, 45, 
-  78, 79, 45, 0, 0, 0, 45, 0, 80, 81, 
-  78, 79, 82, 34, 83, 0, 45, 0, 80, 81, 
-  -341, 34, 82, 0, 83, 240, 239, 78, 79, 34, 
-  48, 50, 49, 279, 280, 80, 81, 0, 0, 82, 
-  34, 83, 281, 0, 0, 282, 0, 283, 0, 0, 
-  48, 50, 49, 245, 244, 0, 45, 0, 48, 50, 
-  49, 240, 239, 34, 0, 0, 48, 50, 49, 0, 
-  0, 0, 240, 239, 0, 0, 45, 48, 50, 49, 
-  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
-  0, 0, 45, 0, 0, 245, 244, 34, 0, 0, 
-  48, 50, 49, 45, 0, 0, 0, 0, 0, 0, 
-  0, 78, 79, 0, 0, 0, 0, 151, 0, 80, 
-  81, 0, 0, 82, 0, 83, 45, 152, 0, 245, 
-  244, 153, 0, 0, 48, 50, 49, 0, 0, 0, 
-  154, 0, 155, 0, 0, 308, 0, 0, 0, 0, 
-  0, 0, 0, 156, 0, 157, 62, 0, 0, 0, 
-  45, 0, 0, 158, 0, 0, 159, 63, 0, 0, 
-  0, 0, 160, 0, 0, 0, 30, 31, 161, 0, 
-  0, 0, 0, 0, 0, 0, 33, 0, 0, 151, 
-  0, 0, 0, 34, 162, 0, 0, 35, 36, 152, 
-  37, 0, 0, 153, 0, 0, 0, 502, 0, 0, 
-  0, 44, 154, 0, 155, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 156, 0, 157, 62, 51, 
-  48, 50, 49, 0, 52, 158, 0, 0, 159, 63, 
-  0, 0, 0, 0, 160, 43, 54, 32, 0, 0, 
-  161, 40, 0, 0, 0, 0, 45, 0, 0, 30, 
-  31, 0, 0, 0, 0, 0, 162, 0, 0, 33, 
-  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
-  35, 36, 0, 37, 0, 0, 0, 30, 31, 0, 
-  502, 0, 0, 0, 44, 0, 0, 33, 0, 0, 
-  0, 0, 0, 0, 34, 0, 0, 0, 35, 36, 
-  0, 37, 51, 48, 50, 49, 0, 52, 41, 0, 
-  0, 0, 44, 0, 0, 0, 0, 0, 43, 54, 
-  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
-  51, 48, 50, 49, 0, 52, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 43, 54, 32, 0, 
-  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
+  401, -123, 440, -121, 403, -129, 333, 340, 615, 345, 
+  -96, 352, 348, -118, -100, 389, -126, 257, -99, 342, 
+  416, 391, 343, 510, 453, 440, 448, 257, -96, 446, 
+  -100, -118, 440, 348, 527, 541, -129, 525, 552, 555, 
+  538, 545, 466, 424, 399, 408, -110, 560, 560, 420, 
+  431, 444, 560, 457, -121, -99, 416, -123, 457, 440, 
+  -126, 325, 306, 453, 272, 190, 294, 164, 187, 170, 
+  257, 272, 141, 430, 346, 312, 296, 312, 409, 414, 
+  294, 348, 251, 101, 99, 252, 318, 416, 236, 292, 
+  453, 457, 440, 183, 141, 189, 71, 335, 639, 164, 
+  147, 304, 179, 71, 99, 443, 427, 301, 434, 141, 
+  0, 141, 141, 331, 141, 0, 0, 292, 58, 444, 
+  141, 149, 477, 62, 0, 58, 0, 314, 603, 59, 
+  141, 315, 141, 172, 63, 141, 59, 247, 246, 141, 
+  424, 629, 628, 635, 634, 256, 255, 58, 615, 242, 
+  241, 428, 173, 101, 249, 248, 58, 327, 59, 141, 
+  141, 249, 248, 488, 254, 166, 418, 59, 142, 167, 
+  478, 557, 556, 141, 530, 529, 604, 172, 413, 412, 
+  249, 248, 459, 177, 455, 172, 85, 141, 86, 511, 
+  517, 350, 85, 523, 86, 559, 173, 64, 174, 87, 
+  85, 85, 86, 86, 173, 87, 406, 64, 141, 64, 
+  328, 337, 310, 87, 87, 469, 85, 85, 86, 86, 
+  0, 560, 533, 0, 0, 511, 521, 520, 511, 87, 
+  87, 0, 511, 141, 0, 513, 172, 141, 547, 513, 
+  438, 437, 65, 0, 518, 516, 512, 511, 66, 0, 
+  512, 103, 65, 0, 65, 173, 274, 275, 66, 0, 
+  66, 235, 234, 548, 546, 632, 631, 0, 470, 468, 
+  104, 513, 105, 172, 513, 0, 534, 532, 513, 172, 
+  561, 0, 512, 276, 277, 512, 537, 536, 34, 512, 
+  544, 543, 173, 513, 406, 630, 625, -87, 173, 172, 
+  174, 73, 74, 0, 512, 274, 275, 34, 0, 0, 
+  626, 624, 0, 0, 73, 74, 0, -87, 173, 34, 
+  174, 0, 85, 34, 86, 48, 50, 49, 75, 76, 
+  0, 0, 276, 277, 0, 87, 0, 0, 279, 280, 
+  623, 75, 76, 0, 48, 50, 49, 281, 0, 0, 
+  282, 45, 283, 34, 279, 280, 48, 50, 49, 0, 
+  48, 50, 49, 281, 279, 280, 282, 34, 283, 0, 
+  45, 279, 280, 281, -341, 0, 282, 0, 283, 0, 
+  281, 34, 45, 282, 0, 283, 45, 279, 280, 34, 
+  48, 50, 49, 0, 0, 34, 281, 0, 34, 282, 
+  0, 283, -341, 0, 48, 50, 49, 6, 5, 4, 
+  1, 3, 2, 245, 244, 0, 45, 34, 48, 50, 
+  49, 240, 239, 0, 0, 0, 48, 50, 49, 0, 
+  45, 0, 48, 50, 49, 48, 50, 49, 0, 0, 
+  0, 0, 0, 0, 45, 0, 0, 0, 0, 240, 
+  239, 0, 45, 34, 48, 50, 49, 0, 45, 0, 
+  0, 45, 34, 0, 0, 34, 0, 0, 0, 0, 
+  78, 79, 0, 0, 0, 0, 0, 0, 80, 81, 
+  45, 0, 82, 0, 83, 245, 244, 0, 0, 0, 
+  48, 50, 49, 0, 245, 244, 0, 240, 239, 48, 
+  50, 49, 48, 50, 49, 0, 0, 0, 0, 0, 
+  30, 31, 0, 0, 0, 0, 45, 0, 0, 0, 
+  33, 0, 0, 0, 0, 45, 0, 34, 45, 0, 
+  0, 35, 36, 0, 37, 0, 0, 0, 0, 0, 
+  0, 502, 0, 0, 0, 44, 0, 0, 151, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 152, 0, 
+  0, 0, 153, 51, 48, 50, 49, 0, 52, 0, 
+  0, 154, 0, 155, 0, 0, 0, 0, 0, 43, 
+  54, 32, 0, 0, 156, 40, 157, 62, 0, 0, 
+  45, 0, 0, 0, 158, 30, 31, 159, 63, 0, 
+  0, 0, 0, 160, 0, 33, 0, 0, 0, 161, 
+  0, 0, 34, 0, 0, 0, 35, 36, 0, 37, 
+  0, 0, 0, 0, 0, 162, 502, 0, 0, 0, 
+  44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 151, 0, 51, 48, 
+  50, 49, 0, 52, 0, 0, 152, 0, 0, 0, 
+  153, 0, 0, 0, 43, 54, 32, 0, 0, 154, 
+  40, 155, 0, 0, 308, 45, 0, 0, 0, 0, 
+  0, 0, 156, 0, 157, 62, 0, 0, 0, 0, 
+  0, 0, 158, 0, 0, 159, 63, 0, 0, 0, 
+  0, 160, 0, 0, 0, 0, 0, 161, 0, 0, 
   0, 0, 0, 0, 0, 0, 30, 31, 0, 0, 
-  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
+  0, 0, 0, 162, 0, 0, 33, 0, 0, 0, 
   0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
-  37, 0, 0, 0, 0, 0, 0, 502, 0, 0, 
-  0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 51, 
-  48, 50, 49, 0, 52, 0, 0, 0, 0, 0, 
+  37, 0, 0, 0, 30, 31, 0, 502, 0, 0, 
+  0, 44, 0, 0, 33, 0, 0, 0, 0, 0, 
+  0, 34, 0, 0, 0, 35, 36, 0, 37, 51, 
+  48, 50, 49, 0, 52, 41, 0, 0, 0, 44, 
   0, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
-  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
-  0, 0, 0, 0, 0, 501, 0, 30, 31, 0, 
-  0, 0, 0, 0, 0, 0, 0, 215, 0, 0, 
-  0, 0, 0, 0, 34, 0, 0, 0, 35, 36, 
-  0, 37, 0, 0, 0, 0, 0, 0, 502, 0, 
-  0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 
+  0, 40, 0, 0, 0, 0, 45, 51, 48, 50, 
+  49, 0, 52, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 43, 54, 32, 0, 0, 0, 40, 
+  0, 0, 0, 0, 45, 30, 31, 0, 0, 0, 
+  0, 0, 0, 30, 31, 33, 0, 0, 0, 0, 
+  0, 0, 34, 33, 0, 0, 35, 36, 0, 37, 
+  34, 0, 0, 0, 35, 36, 502, 37, 0, 0, 
+  44, 0, 0, 0, 41, 0, 0, 0, 44, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 51, 48, 
+  50, 49, 0, 52, 0, 0, 51, 48, 50, 49, 
+  0, 52, 0, 0, 43, 54, 32, 0, 0, 0, 
+  40, 0, 43, 54, 32, 45, 0, 0, 40, 0, 
+  0, 0, 0, 45, 30, 31, 0, 0, 0, 0, 
+  0, 0, 30, 31, 33, 0, 0, 0, 0, 0, 
+  0, 34, 33, 0, 0, 35, 36, 0, 37, 34, 
+  0, 0, 0, 35, 36, 502, 37, 0, 0, 44, 
+  0, 0, 0, 41, 0, 0, 0, 44, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 51, 48, 50, 
+  49, 0, 52, 0, 0, 51, 48, 50, 49, 0, 
+  52, 0, 0, 43, 54, 32, 0, 0, 0, 40, 
+  0, 43, 54, 32, 45, 0, 0, 40, 0, 0, 
+  0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
+  0, 501, 0, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 215, 0, 0, 0, 0, 0, 0, 
+  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
+  0, 0, 0, 0, 502, 0, 0, 0, 44, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  51, 503, 505, 504, 0, 52, 0, 0, 0, 0, 
-  226, 0, 0, 0, 0, 0, 43, 54, 32, 210, 
-  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
-  0, 0, 0, 0, 0, 0, 501, 0, 30, 31, 
-  0, 0, 0, 0, 0, 0, 0, 0, 215, 0, 
-  0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 
-  36, 0, 37, 0, 0, 0, 0, 0, 0, 502, 
-  0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 
-  0, 610, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 51, 503, 505, 504, 0, 52, 0, 0, 0, 
-  0, 226, 0, 0, 0, 0, 0, 43, 54, 32, 
-  210, 0, 0, 40, 0, 0, 0, 0, 45, 0, 
-  0, 0, 0, 0, 0, 0, 0, 501, 0, 30, 
-  31, 0, 0, 0, 0, 0, 0, 0, 0, 215, 
-  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
-  35, 36, 0, 37, 0, 0, 0, 0, 0, 0, 
-  502, 0, 0, 0, 44, 0, 0, 0, 0, 0, 
-  0, 0, 607, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 51, 503, 505, 504, 0, 52, 0, 0, 
-  0, 0, 226, 0, 0, 0, 0, 0, 43, 54, 
-  32, 210, 0, 0, 40, 0, 0, 0, 0, 45, 
-  0, 0, 0, 0, 0, 0, 0, 0, 29, 30, 
+  0, 0, 0, 0, 0, 0, 51, 503, 505, 504, 
+  0, 52, 0, 0, 0, 0, 226, 0, 0, 0, 
+  0, 0, 43, 54, 32, 210, 0, 0, 40, 0, 
+  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, 501, 0, 30, 31, 0, 0, 0, 0, 
+  0, 0, 0, 0, 215, 0, 0, 0, 0, 0, 
+  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
+  0, 0, 0, 0, 0, 502, 0, 0, 0, 44, 
+  0, 0, 0, 0, 0, 0, 0, 607, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 51, 503, 505, 
+  504, 0, 52, 0, 0, 0, 0, 226, 0, 0, 
+  0, 0, 0, 43, 54, 32, 210, 0, 0, 40, 
+  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
+  0, 0, 0, 501, 0, 30, 31, 0, 0, 0, 
+  0, 0, 0, 0, 0, 215, 0, 0, 0, 0, 
+  0, 0, 34, 0, 0, 0, 35, 36, 0, 37, 
+  0, 0, 0, 0, 0, 0, 502, 0, 0, 0, 
+  44, 0, 0, 0, 0, 0, 0, 0, 610, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 51, 503, 
+  505, 504, 0, 52, 0, 0, 0, 0, 226, 0, 
+  0, 0, 0, 0, 43, 54, 32, 210, 0, 0, 
+  40, 0, 0, 0, 0, 45, 0, 0, 0, 0, 
+  0, 0, 0, 0, 29, 30, 31, 0, 0, 0, 
+  0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 
+  0, 0, 34, 0, 0, 0, 35, 36, 0, 37, 
+  0, 0, 0, 38, 0, 39, 41, 42, 0, 0, 
+  44, 0, 0, 0, 46, 0, 47, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 51, 48, 
+  50, 49, 0, 52, 0, 53, 0, 55, 0, 56, 
+  0, 0, 0, 0, 43, 54, 32, 0, 0, 0, 
+  40, 0, 0, 0, 0, 45, 0, 0, 0, 0, 
+  0, 0, 0, 0, -119, 0, 0, 0, 29, 30, 
   31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
   0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
   35, 36, 0, 37, 0, 0, 0, 38, 0, 39, 
@@ -473,309 +488,322 @@ const short QDeclarativeJSGrammar::action_info [] = {
   0, 0, 51, 48, 50, 49, 0, 52, 0, 53, 
   0, 55, 0, 56, 0, 0, 0, 0, 43, 54, 
   32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
-  0, 0, 0, 0, 0, 0, 0, 0, -119, 0, 
-  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
-  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
-  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
-  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
-  0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 51, 48, 50, 49, 
-  0, 52, 0, 53, 0, 55, 0, 56, 0, 0, 
-  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
-  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
-  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
-  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
-  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
-  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
-  0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 51, 48, 50, 49, 
-  0, 52, 0, 53, 0, 55, 271, 56, 0, 0, 
-  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
-  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
-  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
-  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
-  34, 217, 0, 0, 568, 569, 0, 37, 0, 0, 
-  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
-  0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
-  0, 0, 221, 0, 0, 0, 51, 48, 50, 49, 
-  0, 52, 0, 53, 0, 55, 0, 56, 0, 0, 
-  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
-  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
-  0, 0, 475, 0, 0, 29, 30, 31, 0, 0, 
-  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
-  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
-  37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
-  0, 44, 0, 0, 0, 46, 0, 47, 0, 0, 
-  476, 0, 0, 0, 0, 0, 0, 0, 0, 51, 
-  48, 50, 49, 0, 52, 0, 53, 0, 55, 0, 
-  56, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
-  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
-  0, 0, 0, 0, 0, 483, 0, 0, 29, 30, 
+  0, 0, 0, 0, 0, 0, 0, 0, 29, 30, 
   31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
   0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
   35, 36, 0, 37, 0, 0, 0, 38, 0, 39, 
   41, 42, 0, 0, 44, 0, 0, 0, 46, 0, 
-  47, 0, 0, 484, 0, 0, 0, 0, 0, 0, 
+  47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 51, 48, 50, 49, 0, 52, 0, 53, 
-  0, 55, 0, 56, 0, 0, 0, 0, 43, 54, 
+  0, 55, 271, 56, 0, 0, 0, 0, 43, 54, 
   32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
   0, 0, 0, 0, 0, 0, 0, 0, 483, 0, 
   0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
   0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 
   0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
   38, 0, 39, 41, 42, 0, 0, 44, 0, 0, 
-  0, 46, 0, 47, 0, 0, 486, 0, 0, 0, 
+  0, 46, 0, 47, 0, 0, 484, 0, 0, 0, 
   0, 0, 0, 0, 0, 51, 48, 50, 49, 0, 
   52, 0, 53, 0, 55, 0, 56, 0, 0, 0, 
   0, 43, 54, 32, 0, 0, 0, 40, 0, 0, 
   0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
-  0, 475, 0, 0, 29, 30, 31, 0, 0, 0, 
+  0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
+  0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 
+  217, 0, 0, 568, 569, 0, 37, 0, 0, 0, 
+  38, 0, 39, 41, 42, 0, 0, 44, 0, 0, 
+  0, 46, 0, 47, 0, 0, 0, 0, 0, 0, 
+  0, 221, 0, 0, 0, 51, 48, 50, 49, 0, 
+  52, 0, 53, 0, 55, 0, 56, 0, 0, 0, 
+  0, 43, 54, 32, 0, 0, 0, 40, 0, 0, 
+  0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
+  0, 483, 0, 0, 29, 30, 31, 0, 0, 0, 
   0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 
   0, 0, 34, 0, 0, 0, 35, 36, 0, 37, 
   0, 0, 0, 38, 0, 39, 41, 42, 0, 0, 
-  44, 0, 0, 0, 46, 0, 47, 0, 0, 481, 
+  44, 0, 0, 0, 46, 0, 47, 0, 0, 486, 
   0, 0, 0, 0, 0, 0, 0, 0, 51, 48, 
   50, 49, 0, 52, 0, 53, 0, 55, 0, 56, 
   0, 0, 0, 0, 43, 54, 32, 0, 0, 0, 
   40, 0, 0, 0, 0, 45, 0, 0, 0, 0, 
+  0, 0, 0, 0, 475, 0, 0, 29, 30, 31, 
+  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
+  0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 
+  36, 0, 37, 0, 0, 0, 38, 0, 39, 41, 
+  42, 0, 0, 44, 0, 0, 0, 46, 0, 47, 
+  0, 0, 481, 0, 0, 0, 0, 0, 0, 0, 
+  0, 51, 48, 50, 49, 0, 52, 0, 53, 0, 
+  55, 0, 56, 0, 0, 0, 0, 43, 54, 32, 
+  0, 0, 0, 40, 0, 0, 0, 0, 45, 0, 
+  0, 0, 0, 0, 0, 0, 0, 475, 0, 0, 
+  29, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
+  0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
+  0, 0, 35, 36, 0, 37, 0, 0, 0, 38, 
+  0, 39, 41, 42, 0, 0, 44, 0, 0, 0, 
+  46, 0, 47, 0, 0, 476, 0, 0, 0, 0, 
+  0, 0, 0, 0, 51, 48, 50, 49, 0, 52, 
+  0, 53, 0, 55, 0, 56, 0, 0, 0, 0, 
+  43, 54, 32, 0, 0, 0, 40, 0, 0, 0, 
+  0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 
+  109, 110, 111, 0, 0, 113, 115, 116, 0, 0, 
+  117, 0, 118, 0, 0, 0, 120, 121, 122, 0, 
+  0, 0, 0, 0, 0, 34, 123, 124, 125, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 129, 0, 0, 0, 0, 
+  0, 0, 48, 50, 49, 130, 131, 132, 0, 134, 
+  135, 136, 137, 138, 139, 0, 0, 127, 133, 119, 
+  112, 114, 128, 0, 0, 0, 0, 0, 45, 0, 
+  0, 0, 0, 0, 0, 0, 0, 109, 110, 111, 
+  0, 0, 113, 115, 116, 0, 0, 117, 0, 118, 
+  0, 0, 0, 120, 121, 122, 0, 0, 0, 0, 
+  0, 0, 393, 123, 124, 125, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 126, 0, 0, 0, 
+  394, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 129, 0, 0, 0, 0, 0, 398, 395, 
+  397, 0, 130, 131, 132, 0, 134, 135, 136, 137, 
+  138, 139, 0, 0, 127, 133, 119, 112, 114, 128, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 109, 110, 111, 0, 0, 113, 
   115, 116, 0, 0, 117, 0, 118, 0, 0, 0, 
   120, 121, 122, 0, 0, 0, 0, 0, 0, 393, 
   123, 124, 125, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 126, 0, 0, 0, 394, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 129, 
+  0, 0, 0, 0, 0, 396, 0, 0, 0, 129, 
   0, 0, 0, 0, 0, 398, 395, 397, 0, 130, 
   131, 132, 0, 134, 135, 136, 137, 138, 139, 0, 
   0, 127, 133, 119, 112, 114, 128, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 109, 110, 111, 0, 0, 113, 115, 116, 0, 
-  0, 117, 0, 118, 0, 0, 0, 120, 121, 122, 
-  0, 0, 0, 0, 0, 0, 34, 123, 124, 125, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 129, 0, 0, 0, 
-  0, 0, 0, 48, 50, 49, 130, 131, 132, 0, 
-  134, 135, 136, 137, 138, 139, 0, 0, 127, 133, 
-  119, 112, 114, 128, 0, 0, 0, 0, 0, 45, 
-  0, 0, 0, 0, 0, 0, 0, 0, 109, 110, 
-  111, 0, 0, 113, 115, 116, 0, 0, 117, 0, 
-  118, 0, 0, 0, 120, 121, 122, 0, 0, 0, 
-  0, 0, 0, 393, 123, 124, 125, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 126, 0, 0, 
-  0, 394, 0, 0, 0, 0, 0, 0, 0, 396, 
-  0, 0, 0, 129, 0, 0, 0, 0, 0, 398, 
-  395, 397, 0, 130, 131, 132, 0, 134, 135, 136, 
-  137, 138, 139, 0, 0, 127, 133, 119, 112, 114, 
-  128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 209, 0, 0, 0, 0, 
-  211, 0, 29, 30, 31, 213, 0, 0, 0, 0, 
-  0, 0, 214, 215, 0, 0, 0, 0, 0, 0, 
-  216, 217, 0, 0, 218, 36, 0, 37, 0, 0, 
-  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
+  0, 209, 0, 0, 0, 0, 211, 0, 29, 30, 
+  31, 213, 0, 0, 0, 0, 0, 0, 214, 33, 
+  0, 0, 0, 0, 0, 0, 216, 217, 0, 0, 
+  218, 36, 0, 37, 0, 0, 0, 38, 0, 39, 
+  41, 42, 0, 0, 44, 0, 0, 0, 46, 0, 
+  47, 0, 0, 0, 0, 0, 220, 0, 221, 0, 
+  0, 0, 51, 219, 222, 49, 223, 52, 224, 53, 
+  225, 55, 226, 56, 227, 228, 0, 0, 43, 54, 
+  32, 210, 212, 0, 40, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 209, 0, 
+  0, 0, 0, 211, 0, 29, 30, 31, 213, 0, 
+  0, 0, 0, 0, 0, 214, 215, 0, 0, 0, 
+  0, 0, 0, 216, 217, 0, 0, 218, 36, 0, 
+  37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
+  0, 44, 0, 0, 0, 46, 0, 47, 0, 0, 
+  0, 0, 0, 220, 0, 221, 0, 0, 0, 51, 
+  219, 222, 49, 223, 52, 224, 53, 225, 55, 226, 
+  56, 227, 228, 0, 0, 43, 54, 32, 210, 212, 
+  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 0, 0, 571, 110, 111, 0, 0, 
+  573, 115, 575, 30, 31, 576, 0, 118, 0, 0, 
+  0, 120, 578, 579, 0, 0, 0, 0, 0, 0, 
+  580, 581, 124, 125, 218, 36, 0, 37, 0, 0, 
+  0, 38, 0, 39, 582, 42, 0, 0, 584, 0, 
   0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
-  220, 0, 221, 0, 0, 0, 51, 219, 222, 49, 
-  223, 52, 224, 53, 225, 55, 226, 56, 227, 228, 
-  0, 0, 43, 54, 32, 210, 212, 0, 40, 0, 
+  586, 0, 221, 0, 0, 0, 588, 585, 587, 49, 
+  589, 590, 591, 53, 593, 594, 595, 596, 597, 598, 
+  0, 0, 583, 592, 577, 572, 574, 128, 40, 0, 
   0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
-  0, 0, 209, 0, 0, 0, 0, 211, 0, 29, 
-  30, 31, 213, 0, 0, 0, 0, 0, 0, 214, 
-  33, 0, 0, 0, 0, 0, 0, 216, 217, 0, 
-  0, 218, 36, 0, 37, 0, 0, 0, 38, 0, 
-  39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
-  0, 47, 0, 0, 0, 0, 0, 220, 0, 221, 
-  0, 0, 0, 51, 219, 222, 49, 223, 52, 224, 
-  53, 225, 55, 226, 56, 227, 228, 0, 0, 43, 
-  54, 32, 210, 212, 0, 40, 0, 0, 0, 0, 
-  45, 0, 0, 0, 0, 0, 0, 0, 0, 571, 
-  110, 111, 0, 0, 573, 115, 575, 30, 31, 576, 
-  0, 118, 0, 0, 0, 120, 578, 579, 0, 0, 
-  0, 0, 0, 0, 580, 581, 124, 125, 218, 36, 
-  0, 37, 0, 0, 0, 38, 0, 39, 582, 42, 
-  0, 0, 584, 0, 0, 0, 46, 0, 47, 0, 
-  0, 0, 0, 0, 586, 0, 221, 0, 0, 0, 
-  588, 585, 587, 49, 589, 590, 591, 53, 593, 594, 
-  595, 596, 597, 598, 0, 0, 583, 592, 577, 572, 
-  574, 128, 40, 0, 0, 0, 0, 45, 0, 0, 
-  0, 0, 0, 0, 0, 0, 361, 110, 111, 0, 
-  0, 363, 115, 365, 30, 31, 366, 0, 118, 0, 
-  0, 0, 120, 368, 369, 0, 0, 0, 0, 0, 
-  0, 370, 371, 124, 125, 218, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 372, 42, 0, 0, 374, 
-  0, 0, 0, 46, 0, 47, 0, -265, 0, 0, 
-  0, 376, 0, 221, 0, 0, 0, 378, 375, 377, 
-  49, 379, 380, 381, 53, 383, 384, 385, 386, 387, 
-  388, 0, 0, 373, 382, 367, 362, 364, 128, 40, 
-  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
-  0, 0, 0, 
+  0, 0, 361, 110, 111, 0, 0, 363, 115, 365, 
+  30, 31, 366, 0, 118, 0, 0, 0, 120, 368, 
+  369, 0, 0, 0, 0, 0, 0, 370, 371, 124, 
+  125, 218, 36, 0, 37, 0, 0, 0, 38, 0, 
+  39, 372, 42, 0, 0, 374, 0, 0, 0, 46, 
+  0, 47, 0, -265, 0, 0, 0, 376, 0, 221, 
+  0, 0, 0, 378, 375, 377, 49, 379, 380, 381, 
+  53, 383, 384, 385, 386, 387, 388, 0, 0, 373, 
+  382, 367, 362, 364, 128, 40, 0, 0, 0, 0, 
+  45, 0, 0, 0, 0, 0, 0, 0, 0, 
 
-  497, 496, 539, 514, 498, 186, 461, 16, 320, 526, 
-  535, 622, 633, 250, 243, 309, 238, 436, 522, 606, 
-  487, 182, 302, 472, 439, 253, 358, 307, 627, 542, 
-  150, 636, 519, 551, 613, 553, 182, 250, 554, 456, 
-  250, 402, 558, 238, 143, 243, 458, 447, 349, 243, 
-  351, 467, 449, 353, 450, 460, 238, 445, 237, 410, 
-  415, 439, 176, 358, 188, 302, 417, 182, 429, 436, 
-  433, 148, 425, 454, 358, 237, 336, 171, 338, 334, 
-  392, 390, 400, 302, 436, 169, 439, 140, 347, 339, 
-  163, 146, 344, 358, 461, 482, 358, 0, 404, 485, 
-  480, 302, 311, 0, 479, 302, 0, 106, 0, 0, 
-  500, 302, 60, 0, 180, 0, 320, 612, 146, 60, 
-  186, 0, 60, 407, 288, 0, 405, 287, 302, 108, 
-  0, 60, 60, 60, 60, 88, 89, 60, 286, 60, 
-  60, 90, 451, 60, 0, 77, 100, 60, 285, 69, 
-  60, 146, 452, 266, 60, 60, 178, 60, 270, 284, 
-  0, 60, 60, 67, 471, 60, 305, 451, 97, 165, 
-  332, 0, 432, 168, 60, 435, 330, 60, 0, 452, 
-  98, 60, 60, 180, 60, 60, 60, 493, 329, 91, 
-  60, 84, 102, 303, 60, 60, 96, 70, 61, 60, 
-  60, 494, 452, 60, 341, 451, 60, 60, 68, 180, 
-  404, 60, 60, 404, 491, 60, 93, 489, 60, 60, 
-  60, 490, 60, 94, 60, 92, 492, 106, 60, 298, 
-  72, 298, 500, 270, 270, 605, 270, 298, 405, 602, 
-  298, 405, 270, 313, 0, 270, 0, 60, 0, 108, 
-  175, 319, 270, 297, 500, 0, 0, 637, 60, 326, 
-  293, 602, 317, 270, 0, 60, 0, 60, 60, 295, 
-  270, 60, 270, 95, 291, 0, 270, 0, 290, 60, 
-  60, 0, 316, 60, 270, 270, 289, 278, 270, 298, 
-  599, 611, 273, 601, 270, 608, 0, 602, 567, 500, 
-  0, 0, 0, 500, 0, 570, 563, 564, 565, 566, 
-  0, 300, 472, 0, 499, 509, 0, 0, 499, 509, 
+  522, 540, 539, 519, 461, 515, 535, 514, 309, 528, 
+  311, 531, 250, 526, 542, 636, 613, 182, 150, 622, 
+  16, 496, 320, 497, 627, 253, 498, 633, 358, 554, 
+  436, 558, 487, 472, 439, 302, 238, 392, 454, 606, 
+  551, 402, 358, 553, 439, 243, 182, 445, 243, 447, 
+  456, 237, 238, 238, 347, 429, 349, 450, 351, 460, 
+  143, 458, 353, 467, 243, 436, 439, 176, 410, 186, 
+  188, 250, 415, 338, 182, 433, 148, 171, 169, 390, 
+  417, 400, 302, 140, 449, 163, 146, 425, 339, 302, 
+  358, 237, 336, 307, 250, 344, 482, 436, 302, 358, 
+  485, 358, 0, 0, 0, 461, 0, 0, 0, 0, 
+  0, 60, 60, 451, 452, 404, 0, 0, 60, 60, 
+  60, 452, 451, 320, 106, 60, 60, 60, 102, 60, 
+  92, 93, 95, 302, 94, 186, 0, 60, 0, 0, 
+  60, 88, 60, 405, 90, 60, 108, 180, 60, 266, 
+  146, 60, 146, 489, 270, 407, 165, 178, 60, 302, 
+  60, 0, 89, 330, 168, 288, 60, 60, 60, 60, 
+  0, 287, 286, 284, 285, 471, 60, 60, 432, 180, 
+  435, 60, 60, 452, 72, 60, 60, 451, 96, 60, 
+  480, 494, 77, 500, 479, 329, 60, 334, 305, 61, 
+  612, 60, 60, 69, 68, 60, 404, 60, 70, 67, 
+  60, 60, 490, 60, 60, 493, 84, 404, 60, 341, 
+  492, 60, 60, 180, 303, 60, 100, 60, 98, 491, 
+  91, 60, 0, 298, 405, 60, 106, 97, 270, 0, 
+  270, 500, 298, 500, 60, 405, 605, 270, 293, 270, 
+  602, 0, 0, 0, 0, 317, 499, 509, 108, 175, 
+  60, 316, 0, 60, 319, 270, 60, 290, 270, 298, 
+  289, 270, 0, 291, 270, 298, 60, 60, 0, 60, 
+  270, 270, 270, 500, 270, 0, 637, 295, 273, 298, 
+  602, 297, 313, 60, 270, 611, 0, 300, 270, 599, 
+  278, 302, 601, 500, 0, 567, 602, 0, 0, 0, 
+  0, 326, 570, 563, 564, 565, 566, 0, 499, 509, 
+  0, 472, 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, 
-  500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 499, 509, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 332, 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, 608, 0, 0, 0, 0, 0, 
+  0, 0, 500, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 499, 509, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0};
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0};
 
 const short QDeclarativeJSGrammar::action_check [] = {
-  36, 55, 33, 36, 36, 7, 7, 60, 7, 36, 
-  36, 7, 7, 36, 7, 29, 16, 55, 7, 90, 
-  33, 7, 7, 7, 33, 55, 7, 24, 36, 7, 
-  7, 60, 7, 37, 7, 29, 60, 29, 36, 7, 
-  7, 17, 33, 33, 7, 5, 29, 66, 36, 7, 
-  5, 33, 5, 60, 8, 66, 36, 7, 29, 33, 
-  7, 33, 7, 20, 2, 8, 36, 36, 55, 33, 
-  7, 17, 33, 7, 36, 8, 55, 8, 2, 8, 
-  7, 7, 48, 2, 7, 36, 1, 90, 0, 2, 
-  8, 8, 1, -1, 36, 60, 36, 36, 33, 48, 
-  36, 60, 8, 31, 36, 61, 6, 8, 60, 7, 
-  8, 15, -1, -1, 10, -1, 8, 61, -1, -1, 
-  20, -1, -1, -1, -1, -1, 48, 8, 15, -1, 
-  34, 79, 48, 8, 42, 60, 77, 40, 8, 60, 
-  50, 61, 8, 8, 54, 53, 8, 34, 51, 79, 
-  61, 62, -1, 8, 60, 56, 61, 62, 1, 55, 
-  8, 40, 61, 62, 56, 79, 61, 62, 61, 62, 
-  61, 62, 51, 61, 62, 56, 40, 61, 62, 61, 
-  62, 56, 50, 8, 40, 8, 54, 51, 61, 62, 
-  60, 12, 61, 62, 60, 51, 61, 25, 60, 27, 
-  8, 25, 29, 27, -1, 60, 25, 25, 27, 27, 
-  38, 12, 60, 25, 38, 27, 25, 8, 27, 38, 
-  38, 36, 29, 8, -1, -1, 38, 7, 25, 38, 
-  27, 25, 25, 27, 27, 60, 57, 7, 61, 62, 
-  8, 38, 63, 29, 38, 38, 61, 62, 75, 8, 
-  25, 29, 27, 61, 62, 29, 57, -1, 8, 86, 
-  12, -1, 63, 38, 15, 61, 62, 25, 75, 27, 
-  61, 62, -1, 29, -1, -1, 61, 62, -1, 86, 
-  38, 61, 62, 34, -1, 36, 25, -1, 27, 75, 
-  -1, 61, 62, 61, 62, 91, 15, 75, -1, 38, 
-  86, 75, 61, 62, 15, 57, -1, 15, 86, -1, 
-  60, 63, 86, 18, 19, 34, 25, 36, 27, 75, 
-  18, 19, 47, 34, 15, 36, 34, -1, 36, 38, 
-  86, 15, 18, 19, 29, -1, 61, 62, -1, -1, 
-  45, 46, 33, 34, -1, 36, 29, 45, 46, 33, 
-  34, 7, 36, 18, 19, 23, 24, 29, -1, 45, 
-  46, -1, 29, -1, 32, 29, 91, 35, 29, 37, 
-  -1, 66, 67, 68, 29, -1, -1, 33, 29, -1, 
-  45, 46, -1, 66, 67, 68, 93, 94, 95, 96, 
-  97, 98, -1, -1, 66, 67, 68, 92, -1, 66, 
-  67, 68, 66, 67, 68, 66, 67, 68, -1, 92, 
-  29, 66, 67, 68, 29, 66, 67, 68, 23, 24, 
-  92, -1, -1, 29, -1, 92, 29, 32, 92, 29, 
-  35, 92, 37, 29, -1, -1, 92, 92, -1, -1, 
-  -1, 92, -1, 29, -1, 23, 24, 66, 67, 68, 
-  36, 66, 67, 68, 32, -1, -1, 35, -1, 37, 
-  66, 67, 68, 66, 67, 68, 66, 67, 68, -1, 
-  66, 67, 68, 92, -1, -1, -1, 92, -1, -1, 
-  66, 67, 68, 29, -1, -1, 92, -1, -1, 92, 
-  23, 24, 92, -1, -1, -1, 92, -1, 31, 32, 
-  23, 24, 35, 29, 37, -1, 92, -1, 31, 32, 
-  36, 29, 35, -1, 37, 61, 62, 23, 24, 29, 
-  66, 67, 68, 23, 24, 31, 32, -1, -1, 35, 
-  29, 37, 32, -1, -1, 35, -1, 37, -1, -1, 
-  66, 67, 68, 61, 62, -1, 92, -1, 66, 67, 
-  68, 61, 62, 29, -1, -1, 66, 67, 68, -1, 
-  -1, -1, 61, 62, -1, -1, 92, 66, 67, 68, 
-  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
-  -1, -1, 92, -1, -1, 61, 62, 29, -1, -1, 
-  66, 67, 68, 92, -1, -1, -1, -1, -1, -1, 
-  -1, 23, 24, -1, -1, -1, -1, 3, -1, 31, 
-  32, -1, -1, 35, -1, 37, 92, 13, -1, 61, 
-  62, 17, -1, -1, 66, 67, 68, -1, -1, -1, 
-  26, -1, 28, -1, -1, 31, -1, -1, -1, -1, 
-  -1, -1, -1, 39, -1, 41, 42, -1, -1, -1, 
-  92, -1, -1, 49, -1, -1, 52, 53, -1, -1, 
-  -1, -1, 58, -1, -1, -1, 12, 13, 64, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, 3, 
-  -1, -1, -1, 29, 80, -1, -1, 33, 34, 13, 
-  36, -1, -1, 17, -1, -1, -1, 43, -1, -1, 
-  -1, 47, 26, -1, 28, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 39, -1, 41, 42, 65, 
-  66, 67, 68, -1, 70, 49, -1, -1, 52, 53, 
-  -1, -1, -1, -1, 58, 81, 82, 83, -1, -1, 
-  64, 87, -1, -1, -1, -1, 92, -1, -1, 12, 
-  13, -1, -1, -1, -1, -1, 80, -1, -1, 22, 
-  -1, -1, -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, 68, -1, 70, 43, -1, 
-  -1, -1, 47, -1, -1, -1, -1, -1, 81, 82, 
-  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
-  65, 66, 67, 68, -1, 70, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 81, 82, 83, -1, 
-  -1, -1, 87, -1, -1, -1, -1, 92, -1, -1, 
+  55, 7, 33, 7, 55, 7, 60, 36, 90, 55, 
+  7, 16, 36, 7, 7, 7, 7, 36, 7, 60, 
+  36, 8, 33, 66, 36, 33, 60, 36, 7, 36, 
+  7, 7, 33, 36, 24, 7, 7, 37, 8, 60, 
+  66, 29, 17, 5, 7, 60, 7, 33, 33, 33, 
+  7, 20, 33, 36, 7, 7, 36, 7, 36, 33, 
+  7, 17, 60, 36, 1, 33, 79, 2, 8, 7, 
+  36, 1, 8, 55, 7, 2, 8, 2, 7, 7, 
+  79, 36, 77, 79, 48, 36, 7, 36, 55, 48, 
+  36, 36, 33, 36, 8, 60, 1, 31, 0, 2, 
+  8, 61, 60, 1, 48, 6, 10, 61, 7, 8, 
+  -1, 8, 8, 61, 8, -1, -1, 48, 40, 20, 
+  8, 60, 8, 42, -1, 40, -1, 50, 8, 51, 
+  8, 54, 8, 15, 53, 8, 51, 61, 62, 8, 
+  5, 61, 62, 61, 62, 61, 62, 40, 90, 61, 
+  62, 55, 34, 79, 61, 62, 40, 8, 51, 8, 
+  8, 61, 62, 60, 60, 50, 60, 51, 56, 54, 
+  56, 61, 62, 8, 61, 62, 56, 15, 61, 62, 
+  61, 62, 60, 56, 60, 15, 25, 8, 27, 29, 
+  7, 60, 25, 29, 27, 7, 34, 12, 36, 38, 
+  25, 25, 27, 27, 34, 38, 36, 12, 8, 12, 
+  61, 60, 60, 38, 38, 8, 25, 25, 27, 27, 
+  -1, 33, 7, -1, -1, 29, 61, 62, 29, 38, 
+  38, -1, 29, 8, -1, 75, 15, 8, 36, 75, 
+  61, 62, 57, -1, 61, 62, 86, 29, 63, -1, 
+  86, 15, 57, -1, 57, 34, 18, 19, 63, -1, 
+  63, 61, 62, 61, 62, 61, 62, -1, 61, 62, 
+  34, 75, 36, 15, 75, -1, 61, 62, 75, 15, 
+  92, -1, 86, 45, 46, 86, 61, 62, 29, 86, 
+  61, 62, 34, 75, 36, 91, 47, 33, 34, 15, 
+  36, 18, 19, -1, 86, 18, 19, 29, -1, -1, 
+  61, 62, -1, -1, 18, 19, -1, 33, 34, 29, 
+  36, -1, 25, 29, 27, 66, 67, 68, 45, 46, 
+  -1, -1, 45, 46, -1, 38, -1, -1, 23, 24, 
+  91, 45, 46, -1, 66, 67, 68, 32, -1, -1, 
+  35, 92, 37, 29, 23, 24, 66, 67, 68, -1, 
+  66, 67, 68, 32, 23, 24, 35, 29, 37, -1, 
+  92, 23, 24, 32, 36, -1, 35, -1, 37, -1, 
+  32, 29, 92, 35, -1, 37, 92, 23, 24, 29, 
+  66, 67, 68, -1, -1, 29, 32, -1, 29, 35, 
+  -1, 37, 36, -1, 66, 67, 68, 93, 94, 95, 
+  96, 97, 98, 61, 62, -1, 92, 29, 66, 67, 
+  68, 61, 62, -1, -1, -1, 66, 67, 68, -1, 
+  92, -1, 66, 67, 68, 66, 67, 68, -1, -1, 
+  -1, -1, -1, -1, 92, -1, -1, -1, -1, 61, 
+  62, -1, 92, 29, 66, 67, 68, -1, 92, -1, 
+  -1, 92, 29, -1, -1, 29, -1, -1, -1, -1, 
+  23, 24, -1, -1, -1, -1, -1, -1, 31, 32, 
+  92, -1, 35, -1, 37, 61, 62, -1, -1, -1, 
+  66, 67, 68, -1, 61, 62, -1, 61, 62, 66, 
+  67, 68, 66, 67, 68, -1, -1, -1, -1, -1, 
+  12, 13, -1, -1, -1, -1, 92, -1, -1, -1, 
+  22, -1, -1, -1, -1, 92, -1, 29, 92, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, -1, -1, 
+  -1, 43, -1, -1, -1, 47, -1, -1, 3, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, 
+  -1, -1, 17, 65, 66, 67, 68, -1, 70, -1, 
+  -1, 26, -1, 28, -1, -1, -1, -1, -1, 81, 
+  82, 83, -1, -1, 39, 87, 41, 42, -1, -1, 
+  92, -1, -1, -1, 49, 12, 13, 52, 53, -1, 
+  -1, -1, -1, 58, -1, 22, -1, -1, -1, 64, 
+  -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, 
+  -1, -1, -1, -1, -1, 80, 43, -1, -1, -1, 
+  47, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 3, -1, 65, 66, 
+  67, 68, -1, 70, -1, -1, 13, -1, -1, -1, 
+  17, -1, -1, -1, 81, 82, 83, -1, -1, 26, 
+  87, 28, -1, -1, 31, 92, -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, 12, 13, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  -1, -1, -1, 80, -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, 68, -1, 70, -1, -1, -1, -1, -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, 68, -1, 70, 43, -1, -1, -1, 47, 
   -1, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, 92, -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, 87, -1, -1, -1, -1, 92, 65, 66, 67, 
+  68, -1, 70, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
+  -1, -1, -1, -1, 92, 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, 68, -1, 70, -1, -1, 65, 66, 67, 68, 
+  -1, 70, -1, -1, 81, 82, 83, -1, -1, -1, 
+  87, -1, 81, 82, 83, 92, -1, -1, 87, -1, 
+  -1, -1, -1, 92, 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, 
+  68, -1, 70, -1, -1, 65, 66, 67, 68, -1, 
+  70, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
+  -1, 81, 82, 83, 92, -1, -1, 87, -1, -1, 
+  -1, -1, 92, -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, 
-  65, 66, 67, 68, -1, 70, -1, -1, -1, -1, 
-  75, -1, -1, -1, -1, -1, 81, 82, 83, 84, 
-  -1, -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, -1, -1, 
-  -1, 75, -1, -1, -1, -1, -1, 81, 82, 83, 
-  84, -1, -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, -1, 
-  -1, -1, 75, -1, -1, -1, -1, -1, 81, 82, 
-  83, 84, -1, -1, 87, -1, -1, -1, -1, 92, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, 
+  -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
+  -1, 70, -1, -1, -1, -1, 75, -1, -1, -1, 
+  -1, -1, 81, 82, 83, 84, -1, -1, 87, -1, 
+  -1, -1, -1, 92, -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, 
+  68, -1, 70, -1, -1, -1, -1, 75, -1, -1, 
+  -1, -1, -1, 81, 82, 83, 84, -1, -1, 87, 
+  -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, -1, -1, -1, 75, -1, 
+  -1, -1, -1, -1, 81, 82, 83, 84, -1, -1, 
+  87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, 72, -1, 74, -1, 76, 
+  -1, -1, -1, -1, 81, 82, 83, -1, -1, -1, 
+  87, -1, -1, -1, -1, 92, -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, 
@@ -784,51 +812,14 @@ const short QDeclarativeJSGrammar::action_check [] = {
   -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, 
   -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 
   83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
-  -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, 68, 
-  -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, 
-  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
-  -1, -1, -1, 92, -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, 68, 
-  -1, 70, -1, 72, -1, 74, 75, 76, -1, -1, 
-  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
-  -1, -1, -1, 92, -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, 68, 
-  -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, 
-  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
-  -1, -1, -1, 92, -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, 68, -1, 70, -1, 72, -1, 74, -1, 
-  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, 92, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, 
   13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
   -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
   33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
   43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
-  53, -1, -1, 56, -1, -1, -1, -1, -1, -1, 
+  53, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, 
-  -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 
+  -1, 74, 75, 76, -1, -1, -1, -1, 81, 82, 
   83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
   -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, 
   -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, 
@@ -840,6 +831,15 @@ const short QDeclarativeJSGrammar::action_check [] = {
   70, -1, 72, -1, 74, -1, 76, -1, -1, -1, 
   -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
   -1, -1, 92, -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, 68, -1, 
+  70, -1, 72, -1, 74, -1, 76, -1, -1, -1, 
+  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
+  -1, -1, 92, -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, 
@@ -849,111 +849,137 @@ const short QDeclarativeJSGrammar::action_check [] = {
   67, 68, -1, 70, -1, 72, -1, 74, -1, 76, 
   -1, -1, -1, -1, 81, 82, 83, -1, -1, -1, 
   87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, 72, -1, 
+  74, -1, 76, -1, -1, -1, -1, 81, 82, 83, 
+  -1, -1, -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, 
+  -1, 72, -1, 74, -1, 76, -1, -1, -1, -1, 
+  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
+  -1, 92, -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, 71, -1, 73, 
+  74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
+  84, 85, 86, -1, -1, -1, -1, -1, 92, -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, -1, 69, 70, 71, -1, 73, 74, 75, 76, 
+  77, 78, -1, -1, 81, 82, 83, 84, 85, 86, 
+  -1, -1, -1, -1, -1, -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, 55, -1, -1, -1, 59, 
   -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, 
   70, 71, -1, 73, 74, 75, 76, 77, 78, -1, 
   -1, 81, 82, 83, 84, 85, 86, -1, -1, -1, 
   -1, -1, -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, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 59, -1, -1, -1, 
-  -1, -1, -1, 66, 67, 68, 69, 70, 71, -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, 78, -1, -1, 81, 82, 
-  83, 84, 85, 86, -1, -1, -1, -1, -1, 92, 
-  -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, -1, 69, 70, 71, -1, 73, 74, 75, 
+  83, 84, 85, -1, 87, -1, -1, -1, -1, 92, 
+  -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, 78, -1, -1, 81, 82, 83, 84, 85, 
-  86, -1, -1, -1, -1, -1, -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, 87, -1, -1, -1, -1, 92, -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, 78, 
-  -1, -1, 81, 82, 83, 84, 85, -1, 87, -1, 
+  -1, -1, 81, 82, 83, 84, 85, 86, 87, -1, 
   -1, -1, -1, 92, -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, 
+  -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, 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, 78, -1, -1, 81, 
-  82, 83, 84, 85, -1, 87, -1, -1, -1, -1, 
-  92, -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, 78, -1, -1, 81, 82, 83, 84, 
-  85, 86, 87, -1, -1, -1, -1, 92, -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, 
-  78, -1, -1, 81, 82, 83, 84, 85, 86, 87, 
-  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 
+  82, 83, 84, 85, 86, 87, -1, -1, -1, -1, 
+  92, -1, -1, -1, -1, -1, -1, -1, -1, 
 
-  4, 104, 25, 25, 2, 15, 15, 3, 15, 25, 
-  3, 13, 15, 2, 15, 3, 15, 3, 13, 19, 
-  3, 15, 3, 35, 21, 3, 2, 2, 15, 3, 
-  67, 11, 3, 25, 19, 25, 15, 2, 15, 2, 
-  2, 2, 15, 15, 35, 15, 3, 15, 3, 15, 
-  2, 35, 21, 2, 21, 2, 15, 98, 4, 2, 
-  2, 21, 3, 2, 15, 3, 3, 15, 93, 3, 
-  3, 35, 96, 3, 2, 4, 3, 35, 2, 2, 
-  36, 35, 35, 3, 3, 35, 21, 3, 2, 15, 
-  35, 35, 100, 2, 15, 35, 2, -1, 13, 35, 
-  31, 3, 2, -1, 35, 3, -1, 15, -1, -1, 
-  13, 3, 44, -1, 46, -1, 15, 20, 35, 44, 
-  15, -1, 44, 40, 49, -1, 41, 49, 3, 37, 
-  -1, 44, 44, 44, 44, 48, 48, 44, 49, 44, 
-  44, 48, 46, 44, -1, 50, 56, 44, 49, 46, 
-  44, 35, 46, 44, 44, 44, 40, 44, 49, 49, 
-  -1, 44, 44, 46, 85, 44, 68, 46, 50, 58, 
-  68, -1, 81, 60, 44, 81, 68, 44, -1, 46, 
-  50, 44, 44, 46, 44, 44, 44, 46, 87, 49, 
-  44, 49, 54, 68, 44, 44, 50, 47, 47, 44, 
-  44, 46, 46, 44, 99, 46, 44, 44, 46, 46, 
-  13, 44, 44, 13, 46, 44, 49, 46, 44, 44, 
-  44, 46, 44, 49, 44, 49, 46, 15, 44, 44, 
-  52, 44, 13, 49, 49, 16, 49, 44, 41, 20, 
-  44, 41, 49, 59, -1, 49, -1, 44, -1, 37, 
-  38, 66, 49, 66, 13, -1, -1, 16, 44, 66, 
-  57, 20, 66, 49, -1, 44, -1, 44, 44, 55, 
-  49, 44, 49, 49, 51, -1, 49, -1, 51, 44, 
-  44, -1, 61, 44, 49, 49, 51, 51, 49, 44, 
-  13, 5, 53, 16, 49, 5, -1, 20, 13, 13, 
-  -1, -1, -1, 13, -1, 20, 21, 22, 23, 24, 
-  -1, 66, 35, -1, 28, 29, -1, -1, 28, 29, 
+  13, 15, 25, 3, 15, 15, 3, 25, 3, 15, 
+  2, 15, 2, 25, 3, 11, 19, 15, 67, 13, 
+  3, 104, 15, 4, 15, 3, 2, 15, 2, 15, 
+  3, 15, 3, 35, 21, 3, 15, 36, 3, 19, 
+  25, 2, 2, 25, 21, 15, 15, 98, 15, 15, 
+  2, 4, 15, 15, 2, 93, 3, 21, 2, 2, 
+  35, 3, 2, 35, 15, 3, 21, 3, 2, 15, 
+  15, 2, 2, 2, 15, 3, 35, 35, 35, 35, 
+  3, 35, 3, 3, 21, 35, 35, 96, 15, 3, 
+  2, 4, 3, 2, 2, 100, 35, 3, 3, 2, 
+  35, 2, -1, -1, -1, 15, -1, -1, -1, -1, 
+  -1, 44, 44, 46, 46, 13, -1, -1, 44, 44, 
+  44, 46, 46, 15, 15, 44, 44, 44, 54, 44, 
+  49, 49, 49, 3, 49, 15, -1, 44, -1, -1, 
+  44, 48, 44, 41, 48, 44, 37, 46, 44, 44, 
+  35, 44, 35, 46, 49, 40, 58, 40, 44, 3, 
+  44, -1, 48, 68, 60, 49, 44, 44, 44, 44, 
+  -1, 49, 49, 49, 49, 85, 44, 44, 81, 46, 
+  81, 44, 44, 46, 52, 44, 44, 46, 50, 44, 
+  31, 46, 50, 13, 35, 87, 44, 2, 68, 47, 
+  20, 44, 44, 46, 46, 44, 13, 44, 47, 46, 
+  44, 44, 46, 44, 44, 46, 49, 13, 44, 99, 
+  46, 44, 44, 46, 68, 44, 56, 44, 50, 46, 
+  49, 44, -1, 44, 41, 44, 15, 50, 49, -1, 
+  49, 13, 44, 13, 44, 41, 16, 49, 57, 49, 
+  20, -1, -1, -1, -1, 66, 28, 29, 37, 38, 
+  44, 61, -1, 44, 66, 49, 44, 51, 49, 44, 
+  51, 49, -1, 51, 49, 44, 44, 44, -1, 44, 
+  49, 49, 49, 13, 49, -1, 16, 55, 53, 44, 
+  20, 66, 59, 44, 49, 5, -1, 66, 49, 13, 
+  51, 3, 16, 13, -1, 13, 20, -1, -1, -1, 
+  -1, 66, 20, 21, 22, 23, 24, -1, 28, 29, 
+  -1, 35, -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, 68, -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, 
-  13, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 28, 29, -1, -1, -1, 
+  -1, -1, -1, -1, 5, -1, -1, -1, -1, -1, 
+  -1, -1, 13, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 28, 29, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
@@ -961,6 +987,6 @@ const short QDeclarativeJSGrammar::action_check [] = {
   -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};
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
index 2da7946..2b2e3d1 100644
--- a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
@@ -171,8 +171,8 @@ public:
     NON_TERMINAL_COUNT = 106,
 
     GOTO_INDEX_OFFSET = 640,
-    GOTO_INFO_OFFSET = 2643,
-    GOTO_CHECK_OFFSET = 2643
+    GOTO_INFO_OFFSET = 2699,
+    GOTO_CHECK_OFFSET = 2699
   };
 
   static const char  *const    spell [];
-- 
cgit v0.12


From 11e9386c5704fe1a008370e032e6f114a458a473 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Thu, 25 Feb 2010 15:59:28 +0100
Subject: Fix compilation: intptr_t -> quintptr

---
 src/corelib/tools/qeasingcurve.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 89edb2d..64b4dca 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -861,7 +861,7 @@ QDebug operator<<(QDebug debug, const QEasingCurve &item)
 QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing)
 {
     stream << easing.d_ptr->type;
-    stream << quint64(intptr_t(easing.d_ptr->func));
+    stream << quint64(quintptr(easing.d_ptr->func));
 
     bool hasConfig = easing.d_ptr->config;
     stream << hasConfig;
@@ -893,7 +893,7 @@ QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing)
 
     quint64 ptr_func;
     stream >> ptr_func;
-    easing.d_ptr->func = QEasingCurve::EasingFunction(intptr_t(ptr_func));
+    easing.d_ptr->func = QEasingCurve::EasingFunction(quintptr(ptr_func));
 
     bool hasConfig;
     stream >> hasConfig;
-- 
cgit v0.12


From e572d707b92a5c8f3522a9d99579ca1352f7d961 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Thu, 25 Feb 2010 16:11:25 +0100
Subject: Fix compilation due to enabling of QStringBuilder throughout

---
 src/declarative/qml/qdeclarativeengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index b4850a9..717857b 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1408,7 +1408,7 @@ public:
                         qmldirParser.parse();
 
                         foreach (const QDeclarativeDirParser::Plugin &plugin, qmldirParser.plugins()) {
-                            QString resolvedFilePath = QDeclarativeEnginePrivate::get(engine)->resolvePlugin(dir + QDir::separator() + plugin.path,
+                            QString resolvedFilePath = QDeclarativeEnginePrivate::get(engine)->resolvePlugin(QDir(dir + QDir::separator() + plugin.path),
                                                                                                     plugin.name);
 
                             if (!resolvedFilePath.isEmpty())
-- 
cgit v0.12


From 20b761aeffdc6c1ad3eff2098d9ecd3f3a42bf40 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Wed, 24 Feb 2010 13:18:28 +0100
Subject: Compile on Linux: close(2) is defined in #include <unistd.h>

Reviewed-by: Trust Me
(cherry picked from commit 513395fa2e4ee8564a202a38584e1887c08f91db)
---
 src/plugins/bearer/generic/qgenericengine.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp
index a95b14b..e96b80c 100644
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@@ -60,6 +60,7 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <net/if_arp.h>
+#include <unistd.h>
 #endif
 
 
-- 
cgit v0.12


From 3752d188c46c6eed5d190900fe6654642b3b8c63 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 25 Feb 2010 17:09:46 +0100
Subject: Protect against double initialization.

---
 src/declarative/qml/qdeclarativeengine.cpp | 24 +++++++++++++++++++-----
 src/declarative/qml/qdeclarativeengine_p.h |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 717857b..af75e98 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -336,6 +336,7 @@ void QDeclarativeEnginePrivate::clear(SimpleList<QDeclarativeParserStatus> &pss)
 }
 
 Q_GLOBAL_STATIC(QDeclarativeEngineDebugServer, qmlEngineDebugServer);
+Q_GLOBAL_STATIC(QSet<QString>, qmlEnginePluginsWithRegisteredTypes);
 
 void QDeclarativeEnginePrivate::init()
 {
@@ -1621,19 +1622,32 @@ void QDeclarativeEngine::addImportPath(const QString& path)
 */
 bool QDeclarativeEngine::importExtension(const QString &fileName, const QString &uri)
 {
-    QPluginLoader loader(fileName);
+    QFileInfo fileInfo(fileName);
+    const QString absoluteFilePath = fileInfo.absoluteFilePath();
+    QPluginLoader loader(absoluteFilePath);
 
     if (QDeclarativeExtensionInterface *iface = qobject_cast<QDeclarativeExtensionInterface *>(loader.instance())) {
         const QByteArray bytes = uri.toUtf8();
         const char *moduleId = bytes.constData();
 
-        QDeclarativeEnginePrivate *d = QDeclarativeEnginePrivate::get(this);
-        if (! d->importedPlugins.contains(fileName)) {
-            d->importedPlugins.insert(fileName);
+        // ### this code should probably be protected with a mutex.
+        if (! qmlEnginePluginsWithRegisteredTypes()->contains(absoluteFilePath)) {
+            // types should only be registered once (they're global).
+
+            qmlEnginePluginsWithRegisteredTypes()->insert(absoluteFilePath);
             iface->registerTypes(moduleId);
         }
 
-        iface->initializeEngine(this, moduleId);
+        QDeclarativeEnginePrivate *d = QDeclarativeEnginePrivate::get(this);
+
+        if (! d->initializedPlugins.contains(absoluteFilePath)) {
+            // things on the engine (eg. adding new global objects) have to be done for every engine.
+
+            // protect against double initialization
+            d->initializedPlugins.insert(absoluteFilePath);
+            iface->initializeEngine(this, moduleId);
+        }
+
         return true;
     }
 
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 6ef2f93..0359f98 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -267,7 +267,7 @@ public:
 
 
     QStringList environmentImportPath;
-    QSet<QString> importedPlugins;
+    QSet<QString> initializedPlugins;
 
     QString resolvePlugin(const QDir &dir, const QString &baseName,
                           const QStringList &suffixes,
-- 
cgit v0.12


From 61811d9b43828c1cc53c773fd66b78313f4fb942 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 26 Feb 2010 07:59:08 +1000
Subject: Update test numbers after change to default transformOrigin.

Also make one comparison a bit more fuzzy.
---
 .../declarative/qdeclarativestates/tst_qdeclarativestates.cpp  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index 5ffce11..facf159 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -445,10 +445,8 @@ void tst_qdeclarativestates::parentChange()
         rect->setState("reparented");
         QCOMPARE(innerRect->rotation(), qreal(15));
         QCOMPARE(innerRect->scale(), qreal(.5));
-        QEXPECT_FAIL("", "QTBUG-2919", Continue);
-        QCOMPARE(QString("%1").arg(innerRect->x()), QString("%1").arg(12.4148145657));
-        QEXPECT_FAIL("", "QTBUG-2919", Continue);
-        QCOMPARE(QString("%1").arg(innerRect->y()), QString("%1").arg(10.6470476128));
+        QCOMPARE(QString("%1").arg(innerRect->x()), QString("%1").arg(-19.9075));
+        QCOMPARE(QString("%1").arg(innerRect->y()), QString("%1").arg(-8.73433));
     }
 
     {
@@ -469,8 +467,8 @@ void tst_qdeclarativestates::parentChange()
         QCOMPARE(innerRect->rotation(), qreal(0));
         QCOMPARE(innerRect->scale(), qreal(1));
         QCOMPARE(innerRect->x(), qreal(5));
-        QEXPECT_FAIL("", "QTBUG-2919", Continue);
-        QCOMPARE(innerRect->y(), qreal(0));
+        //do a non-qFuzzyCompare fuzzy compare
+        QVERIFY(innerRect->y() < qreal(0.00001) && innerRect->y() > qreal(-0.00001));
     }
 }
 
-- 
cgit v0.12


From 3218d437a13ac82f65abcea0db099f54504c8875 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Mon, 22 Feb 2010 17:27:11 +1000
Subject: Add ParentAnimation.

ParentAnimation will replace ParentAction. It provides two advantages:
* It will animate correctly when reversed.
* It allows reparenting via another item, which is useful in
  the presence of clips, for example.
---
 src/declarative/util/qdeclarativeanimation.cpp     | 242 ++++++++++++++++++++-
 src/declarative/util/qdeclarativeanimation_p.h     |  31 +++
 src/declarative/util/qdeclarativeanimation_p_p.h   |  28 ++-
 .../util/qdeclarativestateoperations.cpp           | 159 +++++++++++++-
 .../util/qdeclarativestateoperations_p.h           |  32 +++
 src/declarative/util/qdeclarativeutilmodule.cpp    |   1 +
 6 files changed, 486 insertions(+), 7 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 264b88c..8af8fc2 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -63,6 +63,7 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qsize.h>
+#include <QtCore/qmath.h>
 
 #include <private/qvariantanimation_p.h>
 
@@ -360,9 +361,6 @@ void QDeclarativeAbstractAnimation::setGroup(QDeclarativeAnimationGroup *g)
     if (d->group && !static_cast<QDeclarativeAnimationGroupPrivate *>(d->group->d_func())->animations.contains(this))
         static_cast<QDeclarativeAnimationGroupPrivate *>(d->group->d_func())->animations.append(this);
 
-    if (d->group)
-        ((QAnimationGroup*)d->group->qtAnimation())->addAnimation(qtAnimation());
-
     //if (g) //if removed from a group, then the group should no longer be the parent
         setParent(g);
 }
@@ -1517,6 +1515,7 @@ void QDeclarativeAnimationGroupPrivate::append_animation(QDeclarativeListPropert
     if (q) {
         q->d_func()->animations.append(a);
         a->setGroup(q);
+        q->d_func()->ag->addAnimation(a->qtAnimation());
     }
 }
 
@@ -2368,4 +2367,241 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions
 
 
 
+QDeclarativeParentAnimation::QDeclarativeParentAnimation(QObject *parent)
+    : QDeclarativeAnimationGroup(parent)
+{
+    Q_D(QDeclarativeParentAnimation);
+    d->topLevelGroup = new QSequentialAnimationGroup;
+    QDeclarativeGraphics_setParent_noEvent(d->topLevelGroup, this);
+
+    d->startAction = new QActionAnimation;
+    d->topLevelGroup->addAnimation(d->startAction);
+
+    d->ag = new QParallelAnimationGroup;
+    d->topLevelGroup->addAnimation(d->ag);
+
+    d->endAction = new QActionAnimation;
+    d->topLevelGroup->addAnimation(d->endAction);
+}
+
+QDeclarativeParentAnimation::~QDeclarativeParentAnimation()
+{
+}
+
+QDeclarativeItem *QDeclarativeParentAnimation::target() const
+{
+    Q_D(const QDeclarativeParentAnimation);
+    return d->target;
+}
+
+void QDeclarativeParentAnimation::setTarget(QDeclarativeItem *target)
+{
+    Q_D(QDeclarativeParentAnimation);
+    d->target = target;
+}
+
+QDeclarativeItem *QDeclarativeParentAnimation::newParent() const
+{
+    Q_D(const QDeclarativeParentAnimation);
+    return d->newParent;
+}
+
+void QDeclarativeParentAnimation::setNewParent(QDeclarativeItem *newParent)
+{
+    Q_D(QDeclarativeParentAnimation);
+    d->newParent = newParent;
+}
+
+QDeclarativeItem *QDeclarativeParentAnimation::via() const
+{
+    Q_D(const QDeclarativeParentAnimation);
+    return d->via;
+}
+
+void QDeclarativeParentAnimation::setVia(QDeclarativeItem *via)
+{
+    Q_D(QDeclarativeParentAnimation);
+    d->via = via;
+}
+
+//### mirrors same-named function in QDeclarativeItem
+QPointF QDeclarativeParentAnimationPrivate::computeTransformOrigin(QDeclarativeItem::TransformOrigin origin, qreal width, qreal height) const
+{
+    switch(origin) {
+    default:
+    case QDeclarativeItem::TopLeft:
+        return QPointF(0, 0);
+    case QDeclarativeItem::Top:
+        return QPointF(width / 2., 0);
+    case QDeclarativeItem::TopRight:
+        return QPointF(width, 0);
+    case QDeclarativeItem::Left:
+        return QPointF(0, height / 2.);
+    case QDeclarativeItem::Center:
+        return QPointF(width / 2., height / 2.);
+    case QDeclarativeItem::Right:
+        return QPointF(width, height / 2.);
+    case QDeclarativeItem::BottomLeft:
+        return QPointF(0, height);
+    case QDeclarativeItem::Bottom:
+        return QPointF(width / 2., height);
+    case QDeclarativeItem::BottomRight:
+        return QPointF(width, height);
+    }
+}
+
+void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
+                        QDeclarativeProperties &modified,
+                        TransitionDirection direction)
+{
+    Q_D(QDeclarativeParentAnimation);
+
+    struct QDeclarativeParentActionData : public QAbstractAnimationAction
+    {
+        QDeclarativeParentActionData(): pc(0) {}
+        ~QDeclarativeParentActionData() { delete pc; }
+
+        QDeclarativeStateActions actions;
+        bool reverse;
+        QDeclarativeParentChange *pc;
+        virtual void doAction()
+        {
+            for (int ii = 0; ii < actions.count(); ++ii) {
+                const QDeclarativeAction &action = actions.at(ii);
+                if (reverse)
+                    action.event->reverse();
+                else
+                    action.event->execute();
+            }
+        }
+    };
+
+    QDeclarativeParentActionData *data = new QDeclarativeParentActionData;
+    QDeclarativeParentActionData *viaData = new QDeclarativeParentActionData;
+    for (int i = 0; i < actions.size(); ++i) {
+        QDeclarativeAction &action = actions[i];
+        if (action.event && action.event->typeName() == QLatin1String("ParentChange")
+            && (!d->target || static_cast<QDeclarativeParentChange*>(action.event)->object() == d->target)) {
+
+            QDeclarativeParentChange *pc = static_cast<QDeclarativeParentChange*>(action.event);
+            QDeclarativeAction myAction = action;
+            data->reverse = action.reverseEvent;
+            action.actionDone = true;
+            data->actions << myAction;
+
+            if (d->via) {
+                viaData->reverse = false;
+                QDeclarativeAction myAction;
+                QDeclarativeParentChange *vpc = new QDeclarativeParentChange;
+                vpc->setObject(pc->object());
+                vpc->setParent(d->via);
+                myAction.event = vpc;
+                viaData->pc = vpc;
+                viaData->actions << myAction;
+                QDeclarativeAction dummyAction;
+                QDeclarativeAction &xAction = pc->xIsSet() ? actions[++i] : dummyAction;
+                QDeclarativeAction &yAction = pc->yIsSet() ? actions[++i] : dummyAction;
+                QDeclarativeAction &sAction = pc->scaleIsSet() ? actions[++i] : dummyAction;
+                QDeclarativeAction &rAction = pc->rotationIsSet() ? actions[++i] : dummyAction;
+                bool forward = (direction == QDeclarativeAbstractAnimation::Forward);
+                QDeclarativeItem *target = pc->object();
+                QDeclarativeItem *targetParent = forward ? pc->parent() : pc->originalParent();
+
+                //### this mirrors the logic in QDeclarativeParentChange.
+                bool ok;
+                const QTransform &transform = targetParent->itemTransform(d->via, &ok);
+                if (transform.type() >= QTransform::TxShear || !ok) {
+                    qmlInfo(this) << QDeclarativeParentAnimation::tr("Unable to preserve appearance under complex transform");
+                    ok = false;
+                }
+
+                qreal scale = 1;
+                qreal rotation = 0;
+                if (ok && transform.type() != QTransform::TxRotate) {
+                    if (transform.m11() == transform.m22())
+                        scale = transform.m11();
+                    else {
+                        qmlInfo(this) << QDeclarativeParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
+                        ok = false;
+                    }
+                } else if (ok && transform.type() == QTransform::TxRotate) {
+                    if (transform.m11() == transform.m22())
+                        scale = qSqrt(transform.m11()*transform.m11() + transform.m12()*transform.m12());
+                    else {
+                        qmlInfo(this) << QDeclarativeParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
+                        ok = false;
+                    }
+
+                    if (scale != 0)
+                        rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/M_PI;
+                    else {
+                        qmlInfo(this) << QDeclarativeParentAnimation::tr("Unable to preserve appearance under scale of 0");
+                        ok = false;
+                    }
+                }
+
+                const QPointF &point = transform.map(QPointF(xAction.toValue.toReal(),yAction.toValue.toReal()));
+                qreal x = point.x();
+                qreal y = point.y();
+                if (ok && target->transformOrigin() != QDeclarativeItem::TopLeft) {
+                    qreal w = target->width();
+                    qreal h = target->height();
+                    if (pc->widthIsSet())
+                        w = actions[++i].toValue.toReal();
+                    if (pc->heightIsSet())
+                        h = actions[++i].toValue.toReal();
+                    const QPointF &transformOrigin
+                            = d->computeTransformOrigin(target->transformOrigin(), w,h);
+                    qreal tempxt = transformOrigin.x();
+                    qreal tempyt = transformOrigin.y();
+                    QTransform t;
+                    t.translate(-tempxt, -tempyt);
+                    t.rotate(rotation);
+                    t.scale(scale, scale);
+                    t.translate(tempxt, tempyt);
+                    const QPointF &offset = t.map(QPointF(0,0));
+                    x += offset.x();
+                    y += offset.y();
+                }
+
+                if (ok) {
+                    //qDebug() << x << y << rotation << scale;
+                    xAction.toValue = x;
+                    yAction.toValue = y;
+                    sAction.toValue = sAction.toValue.toReal() * scale;
+                    rAction.toValue = rAction.toValue.toReal() + rotation;
+                }
+            }
+        }
+    }
+
+    if (data->actions.count()) {
+        if (direction == QDeclarativeAbstractAnimation::Forward) {
+            d->startAction->setAnimAction(d->via ? viaData : data, QActionAnimation::DeleteWhenStopped);
+            d->endAction->setAnimAction(d->via ? data : 0, QActionAnimation::DeleteWhenStopped);
+        } else {
+            d->endAction->setAnimAction(d->via ? viaData : data, QActionAnimation::DeleteWhenStopped);
+            d->startAction->setAnimAction(d->via ? data : 0, QActionAnimation::DeleteWhenStopped);
+        }
+    } else {
+        delete data;
+        delete viaData;
+    }
+
+    //take care of any child animations
+    bool valid = d->defaultProperty.isValid();
+    for (int ii = 0; ii < d->animations.count(); ++ii) {
+        if (valid)
+            d->animations.at(ii)->setDefaultTarget(d->defaultProperty);
+        d->animations.at(ii)->transition(actions, modified, direction);
+    }
+
+}
+
+QAbstractAnimation *QDeclarativeParentAnimation::qtAnimation()
+{
+    Q_D(QDeclarativeParentAnimation);
+    return d->topLevelGroup;
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index 53afbb5..b57bd9e 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -447,6 +447,36 @@ protected:
     virtual QAbstractAnimation *qtAnimation();
 };
 
+class QDeclarativeParentAnimationPrivate;
+class QDeclarativeParentAnimation : public QDeclarativeAnimationGroup
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeParentAnimation)
+
+    Q_PROPERTY(QDeclarativeItem *target READ target WRITE setTarget)
+    //Q_PROPERTY(QDeclarativeItem *newParent READ newParent WRITE setNewParent)
+    Q_PROPERTY(QDeclarativeItem *via READ via WRITE setVia)
+
+public:
+    QDeclarativeParentAnimation(QObject *parent=0);
+    virtual ~QDeclarativeParentAnimation();
+
+    QDeclarativeItem *target() const;
+    void setTarget(QDeclarativeItem *);
+
+    QDeclarativeItem *newParent() const;
+    void setNewParent(QDeclarativeItem *);
+
+    QDeclarativeItem *via() const;
+    void setVia(QDeclarativeItem *);
+
+protected:
+    virtual void transition(QDeclarativeStateActions &actions,
+                            QDeclarativeProperties &modified,
+                            TransitionDirection direction);
+    virtual QAbstractAnimation *qtAnimation();
+};
+
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeAbstractAnimation)
@@ -461,6 +491,7 @@ QML_DECLARE_TYPE(QDeclarativeSequentialAnimation)
 QML_DECLARE_TYPE(QDeclarativeParallelAnimation)
 QML_DECLARE_TYPE(QDeclarativeVector3dAnimation)
 QML_DECLARE_TYPE(QDeclarativeRotationAnimation)
+QML_DECLARE_TYPE(QDeclarativeParentAnimation)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index fc4e6e6..e582066 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -59,6 +59,7 @@
 #include "qdeclarativetimeline_p_p.h"
 
 #include <qdeclarative.h>
+#include <qdeclarativeitem.h>
 #include <qdeclarativecontext.h>
 
 #include <QtCore/QPauseAnimation>
@@ -104,6 +105,12 @@ public:
         : QAbstractAnimation(parent), animAction(action), policy(KeepWhenStopped), running(false) {}
     ~QActionAnimation() { if (policy == DeleteWhenStopped) { delete animAction; animAction = 0; } }
     virtual int duration() const { return 0; }
+    void clearAnimAction()
+    {
+        if (policy == DeleteWhenStopped)
+            delete animAction;
+        animAction = 0;
+    }
     void setAnimAction(QAbstractAnimationAction *action, DeletionPolicy p)
     {
         if (state() == Running)
@@ -311,8 +318,6 @@ public:
 
     static void append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *role);
     static void clear_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list);
-    static void removeAt_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, int i);
-    static void insert_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, int i, QDeclarativeAbstractAnimation *role);
     QList<QDeclarativeAbstractAnimation *> animations;
     QAnimationGroup *ag;
 };
@@ -362,6 +367,25 @@ public:
     QDeclarativeRotationAnimation::RotationDirection direction;
 };
 
+class QDeclarativeParentAnimationPrivate : public QDeclarativeAnimationGroupPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeParentAnimation)
+public:
+    QDeclarativeParentAnimationPrivate()
+    : QDeclarativeAnimationGroupPrivate(), target(0), newParent(0),
+       via(0), topLevelGroup(0), startAction(0), endAction(0) {}
+
+    QDeclarativeItem *target;
+    QDeclarativeItem *newParent;
+    QDeclarativeItem *via;
+
+    QSequentialAnimationGroup *topLevelGroup;
+    QActionAnimation *startAction;
+    QActionAnimation *endAction;
+
+    QPointF computeTransformOrigin(QDeclarativeItem::TransformOrigin origin, qreal width, qreal height) const;
+};
+
 QT_END_NAMESPACE
 
 #endif // QDECLARATIVEANIMATION_P_H
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 9df8658..cea9ad7 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -48,6 +48,7 @@
 #include <qdeclarativeanchors_p_p.h>
 #include <qdeclarativeitem_p.h>
 #include <qdeclarativeguard_p.h>
+#include <qdeclarativenullablevalue_p_p.h>
 
 #include <QtCore/qdebug.h>
 #include <QtGui/qgraphicsitem.h>
@@ -62,7 +63,7 @@ class QDeclarativeParentChangePrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QDeclarativeParentChange)
 public:
     QDeclarativeParentChangePrivate() : target(0), parent(0), origParent(0), origStackBefore(0),
-                               rewindParent(0), rewindStackBefore(0) {}
+        rewindParent(0), rewindStackBefore(0) {}
 
     QDeclarativeItem *target;
     QDeclarativeItem *parent;
@@ -71,6 +72,13 @@ public:
     QDeclarativeItem *rewindParent;
     QDeclarativeItem *rewindStackBefore;
 
+    QDeclarativeNullableValue<qreal> x;
+    QDeclarativeNullableValue<qreal> y;
+    QDeclarativeNullableValue<qreal> width;
+    QDeclarativeNullableValue<qreal> height;
+    QDeclarativeNullableValue<qreal> scale;
+    QDeclarativeNullableValue<qreal> rotation;
+
     void doChange(QDeclarativeItem *targetParent, QDeclarativeItem *stackBefore = 0);
 };
 
@@ -173,6 +181,120 @@ QDeclarativeParentChange::~QDeclarativeParentChange()
 {
 }
 
+qreal QDeclarativeParentChange::x() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->x.isNull ? qreal(0.) : d->x.value;
+}
+
+void QDeclarativeParentChange::setX(qreal x)
+{
+    Q_D(QDeclarativeParentChange);
+    d->x = x;
+}
+
+bool QDeclarativeParentChange::xIsSet() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->x.isValid();
+}
+
+qreal QDeclarativeParentChange::y() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->y.isNull ? qreal(0.) : d->y.value;
+}
+
+void QDeclarativeParentChange::setY(qreal y)
+{
+    Q_D(QDeclarativeParentChange);
+    d->y = y;
+}
+
+bool QDeclarativeParentChange::yIsSet() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->y.isValid();
+}
+
+qreal QDeclarativeParentChange::width() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->width.isNull ? qreal(0.) : d->width.value;
+}
+
+void QDeclarativeParentChange::setWidth(qreal width)
+{
+    Q_D(QDeclarativeParentChange);
+    d->width = width;
+}
+
+bool QDeclarativeParentChange::widthIsSet() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->width.isValid();
+}
+
+qreal QDeclarativeParentChange::height() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->height.isNull ? qreal(0.) : d->height.value;
+}
+
+void QDeclarativeParentChange::setHeight(qreal height)
+{
+    Q_D(QDeclarativeParentChange);
+    d->height = height;
+}
+
+bool QDeclarativeParentChange::heightIsSet() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->height.isValid();
+}
+
+qreal QDeclarativeParentChange::scale() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->scale.isNull ? qreal(1.) : d->scale.value;
+}
+
+void QDeclarativeParentChange::setScale(qreal scale)
+{
+    Q_D(QDeclarativeParentChange);
+    d->scale = scale;
+}
+
+bool QDeclarativeParentChange::scaleIsSet() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->scale.isValid();
+}
+
+qreal QDeclarativeParentChange::rotation() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->rotation.isNull ? qreal(0.) : d->rotation.value;
+}
+
+void QDeclarativeParentChange::setRotation(qreal rotation)
+{
+    Q_D(QDeclarativeParentChange);
+    d->rotation = rotation;
+}
+
+bool QDeclarativeParentChange::rotationIsSet() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->rotation.isValid();
+}
+
+QDeclarativeItem *QDeclarativeParentChange::originalParent() const
+{
+    Q_D(const QDeclarativeParentChange);
+    return d->origParent;
+}
+
 /*!
     \qmlproperty Item ParentChange::target
     This property holds the item to be reparented
@@ -213,10 +335,43 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     if (!d->target || !d->parent)
         return ActionList();
 
+    ActionList actions;
+
     QDeclarativeAction a;
     a.event = this;
+    actions << a;
 
-    return ActionList() << a;
+    if (d->x.isValid()) {
+        QDeclarativeAction xa(d->target, QLatin1String("x"), x());
+        actions << xa;
+    }
+
+    if (d->y.isValid()) {
+        QDeclarativeAction ya(d->target, QLatin1String("y"), y());
+        actions << ya;
+    }
+
+    if (d->scale.isValid()) {
+        QDeclarativeAction sa(d->target, QLatin1String("scale"), scale());
+        actions << sa;
+    }
+
+    if (d->rotation.isValid()) {
+        QDeclarativeAction ra(d->target, QLatin1String("rotation"), rotation());
+        actions << ra;
+    }
+
+    if (d->width.isValid()) {
+        QDeclarativeAction wa(d->target, QLatin1String("width"), width());
+        actions << wa;
+    }
+
+    if (d->height.isValid()) {
+        QDeclarativeAction ha(d->target, QLatin1String("height"), height());
+        actions << ha;
+    }
+
+    return actions;
 }
 
 class AccessibleFxItem : public QDeclarativeItem
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h
index 9204a58..026a64d 100644
--- a/src/declarative/util/qdeclarativestateoperations_p.h
+++ b/src/declarative/util/qdeclarativestateoperations_p.h
@@ -62,6 +62,12 @@ class Q_DECLARATIVE_EXPORT QDeclarativeParentChange : public QDeclarativeStateOp
 
     Q_PROPERTY(QDeclarativeItem *target READ object WRITE setObject)
     Q_PROPERTY(QDeclarativeItem *parent READ parent WRITE setParent)
+    Q_PROPERTY(qreal x READ x WRITE setX)
+    Q_PROPERTY(qreal y READ y WRITE setY)
+    Q_PROPERTY(qreal width READ width WRITE setWidth)
+    Q_PROPERTY(qreal height READ height WRITE setHeight)
+    Q_PROPERTY(qreal scale READ scale WRITE setScale)
+    Q_PROPERTY(qreal rotation READ rotation WRITE setRotation)
 public:
     QDeclarativeParentChange(QObject *parent=0);
     ~QDeclarativeParentChange();
@@ -72,6 +78,32 @@ public:
     QDeclarativeItem *parent() const;
     void setParent(QDeclarativeItem *);
 
+    QDeclarativeItem *originalParent() const;
+
+    qreal x() const;
+    void setX(qreal x);
+    bool xIsSet() const;
+
+    qreal y() const;
+    void setY(qreal y);
+    bool yIsSet() const;
+
+    qreal width() const;
+    void setWidth(qreal width);
+    bool widthIsSet() const;
+
+    qreal height() const;
+    void setHeight(qreal height);
+    bool heightIsSet() const;
+
+    qreal scale() const;
+    void setScale(qreal scale);
+    bool scaleIsSet() const;
+
+    qreal rotation() const;
+    void setRotation(qreal rotation);
+    bool rotationIsSet() const;
+
     virtual ActionList actions();
 
     virtual void saveOriginals();
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index ecaa607c..8d3d682 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -90,6 +90,7 @@ void QDeclarativeUtilModule::defineModule()
     QML_REGISTER_TYPE(Qt,4,6,Package,QDeclarativePackage);
     QML_REGISTER_TYPE(Qt,4,6,ParallelAnimation,QDeclarativeParallelAnimation);
     QML_REGISTER_TYPE(Qt,4,6,ParentAction,QDeclarativeParentAction);
+    QML_REGISTER_TYPE(Qt,4,6,ParentAnimation,QDeclarativeParentAnimation);
     QML_REGISTER_TYPE(Qt,4,6,ParentChange,QDeclarativeParentChange);
     QML_REGISTER_TYPE(Qt,4,6,PauseAnimation,QDeclarativePauseAnimation);
     QML_REGISTER_TYPE(Qt,4,6,PropertyAction,QDeclarativePropertyAction);
-- 
cgit v0.12


From bb6ec109475f68829bb7b62ba4c13e7486eed5cf Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 26 Feb 2010 10:54:05 +1000
Subject: Make compile following recent QDeclarativeProperty changes

---
 .../tst_qdeclarativeproperty.cpp                   | 56 +++++++++++-----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
index a3aefe3..c72c9e7 100644
--- a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
+++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
@@ -466,7 +466,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
     }
 
     {
-        QDeclarativeMetaProperty prop(&dobject, QString("onPropertyWithNotifyChanged"));
+        QDeclarativeProperty prop(&dobject, QString("onPropertyWithNotifyChanged"));
 
         QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
@@ -488,7 +488,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QCOMPARE(QString(prop.method().signature()), QString("oddlyNamedNotifySignal()"));
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
+        QCOMPARE(prop.type(), QDeclarativeProperty::SignalProperty);
         QCOMPARE(prop.isProperty(), false);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -496,19 +496,19 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression != 0);
-        QVERIFY(prop.signalExpression() == expression);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == expression);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("oddlyNamedNotifySignal()"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -764,7 +764,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
     }
 
     {
-        QDeclarativeMetaProperty prop(&dobject, QString("onPropertyWithNotifyChanged"), engine.rootContext());
+        QDeclarativeProperty prop(&dobject, QString("onPropertyWithNotifyChanged"), engine.rootContext());
 
         QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
@@ -786,7 +786,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QCOMPARE(QString(prop.method().signature()), QString("oddlyNamedNotifySignal()"));
-        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
+        QCOMPARE(prop.type(), QDeclarativeProperty::SignalProperty);
         QCOMPARE(prop.isProperty(), false);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -794,19 +794,19 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
-        QVERIFY(prop.binding() == 0);
-        QVERIFY(prop.setBinding(binding) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::binding(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setBinding(prop, binding) == 0);
         QVERIFY(binding == 0);
-        QVERIFY(prop.signalExpression() == 0);
-        QVERIFY(prop.setSignalExpression(expression) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
+        QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression != 0);
-        QVERIFY(prop.signalExpression() == expression);
+        QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == expression);
         QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("oddlyNamedNotifySignal()"));
-        QCOMPARE(prop.valueTypeCoreIndex(), -1);
+        QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
     }
@@ -845,13 +845,13 @@ void tst_qdeclarativeproperty::name()
 
     {
         PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+        QDeclarativeProperty p(&o, "onPropertyWithNotifyChanged");
         QCOMPARE(p.name(), QString("onOddlyNamedNotifySignal"));
     }
 
     {
         QObject o;
-        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+        QDeclarativeProperty p(&o, "onPropertyWithNotifyChanged");
         QCOMPARE(p.name(), QString());
     }
 
@@ -948,11 +948,11 @@ void tst_qdeclarativeproperty::read()
     // Automatic signal property 
     {
         PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+        QDeclarativeProperty p(&o, "onPropertyWithNotifyChanged");
         QCOMPARE(p.read(), QVariant());
 
-        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
-        QVERIFY(0 != p.signalExpression());
+        QVERIFY(0 == QDeclarativePropertyPrivate::setSignalExpression(p, new QDeclarativeExpression()));
+        QVERIFY(0 != QDeclarativePropertyPrivate::signalExpression(p));
 
         QCOMPARE(p.read(), QVariant());
     }
@@ -1066,15 +1066,15 @@ void tst_qdeclarativeproperty::write()
     // Automatic signal property
     {
         PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+        QDeclarativeProperty p(&o, "onPropertyWithNotifyChanged");
         QCOMPARE(p.write(QVariant("console.log(1921)")), false);
 
-        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
-        QVERIFY(0 != p.signalExpression());
+        QVERIFY(0 == QDeclarativePropertyPrivate::setSignalExpression(p, new QDeclarativeExpression()));
+        QVERIFY(0 != QDeclarativePropertyPrivate::signalExpression(p));
 
         QCOMPARE(p.write(QVariant("console.log(1921)")), false);
 
-        QVERIFY(0 != p.signalExpression());
+        QVERIFY(0 != QDeclarativePropertyPrivate::signalExpression(p));
     }
 
     // Value-type property
@@ -1210,7 +1210,7 @@ void tst_qdeclarativeproperty::reset()
     // Automatic signal property
     {
         PropertyObject o;
-        QDeclarativeMetaProperty p(&o, "onPropertyWithNotifyChanged");
+        QDeclarativeProperty p(&o, "onPropertyWithNotifyChanged");
 
         QCOMPARE(p.isResettable(), false);
         QCOMPARE(p.reset(), false);
-- 
cgit v0.12


From e1abb8b075c8fc24bc768619ca2dbe1204431101 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Fri, 26 Feb 2010 11:23:10 +1000
Subject: Fix qdatastream::compatibility_Qt3 autotest failure

---
 src/corelib/kernel/qvariant.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 384a3cd..227a60d 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1936,13 +1936,13 @@ static const ushort map_from_three[MapFromThreeCount] =
     QVariant::Date,
     QVariant::Time,
     QVariant::DateTime,
-    QVariant::EasingCurve,
     QVariant::ByteArray,
     QVariant::BitArray,
     QVariant::KeySequence,
     QVariant::Pen,
     QVariant::LongLong,
-    QVariant::ULongLong
+    QVariant::ULongLong,
+    QVariant::EasingCurve
 };
 
 /*!
-- 
cgit v0.12


From 71412e3d9b9152cbbc42245751fc197672fc7b08 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 26 Feb 2010 11:44:51 +1000
Subject: Remove unnecessary QDeclarativeProperty::Type enum values

---
 src/declarative/qml/qdeclarativeproperty.cpp | 61 +++++++++++++++++++---------
 src/declarative/qml/qdeclarativeproperty.h   |  3 +-
 src/declarative/qml/qdeclarativeproperty_p.h |  1 +
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index 7ead1b5..fbea6ac 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -63,10 +63,30 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QDeclarativeProperty
-    \brief The QDeclarativeProperty class abstracts accessing QML properties.
-    \internal
- */
+\class QDeclarativeProperty
+\brief The QDeclarativeProperty class abstracts accessing properties on objects created from  QML.
+
+As QML uses Qt's meta-type system all of the existing QMetaObject classes can be used to introspect
+and interact with objects created by QML.  However, some of the new features provided by QML - such 
+as type safety and attached properties - are most easily used through the QDeclarativeProperty class 
+that simplifies some of their natural complexity.
+
+Unlike QMetaProperty which represents a property on a class type, QDeclarativeProperty encapsulates 
+a property on a specific object instance.  To read a property's value, programmers create a 
+QDeclarativeProperty instance and call the read() method.  Likewise to write a property value the
+write() method is used.
+
+\code
+
+QObject *object = declarativeComponent.create();
+
+QDeclarativeProperty property(object, "font.pixelSize");
+qWarning() << "Current pixel size:" << property.read().toInt();
+property.write(24);
+qWarning() << "Pixel size should now be 24:" << property.read().toInt();
+
+\endcode
+*/
 
 /*!
     Create an invalid QDeclarativeProperty.
@@ -298,7 +318,7 @@ QDeclarativePropertyPrivate::propertyTypeCategory() const
 {
     uint type = q->type();
 
-    if (type & QDeclarativeProperty::ValueTypeProperty) {
+    if (isValueType()) {
         return QDeclarativeProperty::Normal;
     } else if (type & QDeclarativeProperty::Property) {
         int type = propertyType();
@@ -323,7 +343,7 @@ QDeclarativePropertyPrivate::propertyTypeCategory() const
 */
 const char *QDeclarativeProperty::propertyTypeName() const
 {
-    if (type() & ValueTypeProperty) {
+    if (d->isValueType()) {
 
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(d->context);
         QDeclarativeValueType *valueType = 0;
@@ -365,10 +385,15 @@ int QDeclarativeProperty::propertyType() const
     return d->propertyType();
 }
 
+bool QDeclarativePropertyPrivate::isValueType() const
+{
+    return valueType.valueTypeCoreIdx != -1;
+}
+
 int QDeclarativePropertyPrivate::propertyType() const
 {
     uint type = q->type();
-    if (type & QDeclarativeProperty::ValueTypeProperty) {
+    if (isValueType()) {
         return valueType.valueTypePropType;
     } else if (type & QDeclarativeProperty::Property) {
         if (core.propType == (int)QVariant::LastType)
@@ -387,8 +412,6 @@ QDeclarativeProperty::Type QDeclarativeProperty::type() const
 {
     if (d->core.flags & QDeclarativePropertyCache::Data::IsFunction)
         return SignalProperty;
-    else if (d->valueType.valueTypeCoreIdx != -1)
-        return (Type)(Property | ValueTypeProperty);
     else if (d->core.isValid())
         return (Type)(Property | ((d->isDefaultProperty)?Default:0));
     else
@@ -495,7 +518,7 @@ QString QDeclarativeProperty::name() const
     if (!d->isNameCached) {
         // ###
         if (!d->object) {
-        } else if (type() & ValueTypeProperty) {
+        } else if (d->isValueType()) {
             QString rv = d->core.name(d->object) + QLatin1Char('.');
 
             QDeclarativeEnginePrivate *ep = d->context?QDeclarativeEnginePrivate::get(d->context->engine()):0;
@@ -709,8 +732,7 @@ QVariant QDeclarativeProperty::read() const
 
 QVariant QDeclarativePropertyPrivate::readValueProperty()
 {
-    uint type = q->type();
-    if(type & QDeclarativeProperty::ValueTypeProperty) {
+    if(isValueType()) {
 
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
         QDeclarativeValueType *valueType = 0;
@@ -789,8 +811,7 @@ bool QDeclarativePropertyPrivate::writeValueProperty(const QVariant &value, Writ
     }
 
     bool rv = false;
-    uint type = q->type();
-    if (type & QDeclarativeProperty::ValueTypeProperty) {
+    if (isValueType()) {
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context);
 
         QDeclarativeValueType *writeBack = 0;
@@ -1097,7 +1118,7 @@ int QDeclarativePropertyPrivate::valueTypeCoreIndex(const QDeclarativeProperty &
 }
 
 struct SerializedData {
-    QDeclarativeProperty::Type type;
+    bool isValueType;
     QDeclarativePropertyCache::Data core;
 };
 
@@ -1112,7 +1133,7 @@ QByteArray QDeclarativePropertyPrivate::saveValueType(const QMetaObject *metaObj
     QMetaProperty subProp = subObject->property(subIndex);
 
     ValueTypeSerializedData sd;
-    sd.type = QDeclarativeProperty::ValueTypeProperty;
+    sd.isValueType = true;
     sd.core.load(metaObject->property(index));
     sd.valueType.flags = QDeclarativePropertyCache::Data::flagsForProperty(subProp);
     sd.valueType.valueTypeCoreIdx = subIndex;
@@ -1126,7 +1147,7 @@ QByteArray QDeclarativePropertyPrivate::saveValueType(const QMetaObject *metaObj
 QByteArray QDeclarativePropertyPrivate::saveProperty(const QMetaObject *metaObject, int index)
 {
     SerializedData sd;
-    sd.type = QDeclarativeProperty::Property;
+    sd.isValueType = false;
     sd.core.load(metaObject->property(index));
 
     QByteArray rv((const char *)&sd, sizeof(sd));
@@ -1145,12 +1166,12 @@ QDeclarativePropertyPrivate::restore(const QByteArray &data, QObject *object, QD
     prop.d->context = ctxt;
 
     const SerializedData *sd = (const SerializedData *)data.constData();
-    if (sd->type == QDeclarativeProperty::Property) {
-        prop.d->core = sd->core;
-    } else if(sd->type == QDeclarativeProperty::ValueTypeProperty) {
+    if (sd->isValueType) {
         const ValueTypeSerializedData *vt = (const ValueTypeSerializedData *)sd;
         prop.d->core = vt->core;
         prop.d->valueType = vt->valueType;
+    } else {
+        prop.d->core = sd->core;
     }
 
     return prop;
diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h
index be1065e..3504a15 100644
--- a/src/declarative/qml/qdeclarativeproperty.h
+++ b/src/declarative/qml/qdeclarativeproperty.h
@@ -73,8 +73,7 @@ public:
     enum Type { Invalid = 0x00, 
                 Property = 0x01, 
                 SignalProperty = 0x02,
-                Default = 0x08,
-                ValueTypeProperty = 0x10 
+                Default = 0x08
     };
 
     QDeclarativeProperty();
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h
index d0ad09c..eb5fa9a 100644
--- a/src/declarative/qml/qdeclarativeproperty_p.h
+++ b/src/declarative/qml/qdeclarativeproperty_p.h
@@ -97,6 +97,7 @@ public:
 
     QMetaMethod findSignal(QObject *, const QString &);
 
+    bool isValueType() const;
     int propertyType() const;
     QDeclarativeProperty::PropertyTypeCategory propertyTypeCategory() const;
 
-- 
cgit v0.12


From 5fb329228bd1cd1126428b045a41a4a9c1033dc5 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 26 Feb 2010 12:01:05 +1000
Subject: Renamed Flickable viewportXXX properties contentXXX A viewport is the
 thing you look through, not what you look at.

---
 demos/declarative/flickr/common/ImageDetails.qml   | 12 ++--
 demos/declarative/flickr/mobile/ImageDetails.qml   | 10 ++--
 .../webbrowser/content/FlickableWebView.qml        | 22 ++++----
 .../content/RetractingWebBrowserHeader.qml         |  8 +--
 demos/declarative/webbrowser/webbrowser.qml        |  8 +--
 examples/declarative/animations/easing.qml         |  2 +-
 examples/declarative/listview/recipes.qml          |  6 +-
 examples/declarative/parallax/qml/ParallaxView.qml |  4 +-
 examples/declarative/progressbar/progressbars.qml  |  2 +-
 examples/declarative/scrollbar/display.qml         |  4 +-
 examples/declarative/velocity/velocity.qml         |  2 +-
 .../declarative/webview/qdeclarative-in-html.qml   |  4 +-
 src/declarative/QmlChanges.txt                     |  5 ++
 .../graphicsitems/qdeclarativeflickable.cpp        | 64 ++++++++--------------
 .../graphicsitems/qdeclarativeflickable_p.h        | 37 ++++++-------
 .../graphicsitems/qdeclarativegridview.cpp         | 22 ++++----
 .../graphicsitems/qdeclarativelistview.cpp         | 14 ++---
 .../qdeclarativeflickable/data/flickable02.qml     |  2 +-
 .../qdeclarativeflickable/data/flickable03.qml     |  2 +-
 .../qdeclarativeflickable/data/flickable04.qml     |  2 +-
 .../tst_qdeclarativeflickable.cpp                  | 13 ++---
 .../tst_qdeclarativegridview.cpp                   | 30 +++++-----
 .../tst_qdeclarativelistview.cpp                   | 34 ++++++------
 .../qdeclarativeflickable/flickable-horizontal.qml |  2 +-
 .../qdeclarativeflickable/flickable-vertical.qml   |  2 +-
 25 files changed, 147 insertions(+), 166 deletions(-)

diff --git a/demos/declarative/flickr/common/ImageDetails.qml b/demos/declarative/flickr/common/ImageDetails.qml
index ab94d7a..f91b365 100644
--- a/demos/declarative/flickr/common/ImageDetails.qml
+++ b/demos/declarative/flickr/common/ImageDetails.qml
@@ -50,7 +50,7 @@ Flipable {
         LikeOMeter { x: 40; y: 250; rating: container.rating }
 
         Flickable { id: flickable; x: 220; width: 480; height: 210; y: 130; clip: true
-                    viewportWidth: 480; viewportHeight: descriptionText.height
+                    contentWidth: 480; contentHeight: descriptionText.height
 
             WebView { id: descriptionText; width: parent.width
                       html: "<style TYPE=\"text/css\">body {color: white;} a:link {color: cyan; text-decoration: underline; }</style>" + container.photoDescription }
@@ -84,7 +84,7 @@ Flipable {
         Flickable {
             id: flick; width: container.width - 10; height: container.height - 10
             x: 5; y: 5; clip: true;
-            viewportWidth: imageContainer.width; viewportHeight: imageContainer.height
+            contentWidth: imageContainer.width; contentHeight: imageContainer.height
 
             Item {
                 id: imageContainer
@@ -122,12 +122,12 @@ Flipable {
             id: slider; x: 25; y: 374; visible: { bigImage.status == 1 && maximum > minimum }
             onValueChanged: {
                 if (bigImage.width * value > flick.width) {
-                    var xoff = (flick.width/2 + flick.viewportX) * value / prevScale;
-                    flick.viewportX = xoff - flick.width/2;
+                    var xoff = (flick.width/2 + flick.contentX) * value / prevScale;
+                    flick.contentX = xoff - flick.width/2;
                 }
                 if (bigImage.height * value > flick.height) {
-                    var yoff = (flick.height/2 + flick.viewportY) * value / prevScale;
-                    flick.viewportY = yoff - flick.height/2;
+                    var yoff = (flick.height/2 + flick.contentY) * value / prevScale;
+                    flick.contentY = yoff - flick.height/2;
                 }
                 prevScale = value;
             }
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 415764e..8749b4c 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -57,7 +57,7 @@ Flipable {
         Common.Progress { anchors.centerIn: parent; width: 200; height: 18; progress: bigImage.progress; visible: bigImage.status!=1 }
         Flickable {
             id: flickable; anchors.fill: parent; clip: true
-            viewportWidth: imageContainer.width; viewportHeight: imageContainer.height
+            contentWidth: imageContainer.width; contentHeight: imageContainer.height
 
             Item {
                 id: imageContainer
@@ -97,12 +97,12 @@ Flipable {
             }
             onValueChanged: {
                 if (bigImage.width * value > flickable.width) {
-                    var xoff = (flickable.width/2 + flickable.viewportX) * value / prevScale;
-                    flickable.viewportX = xoff - flickable.width/2;
+                    var xoff = (flickable.width/2 + flickable.contentX) * value / prevScale;
+                    flickable.contentX = xoff - flickable.width/2;
                 }
                 if (bigImage.height * value > flickable.height) {
-                    var yoff = (flickable.height/2 + flickable.viewportY) * value / prevScale;
-                    flickable.viewportY = yoff - flickable.height/2;
+                    var yoff = (flickable.height/2 + flickable.contentY) * value / prevScale;
+                    flickable.contentY = yoff - flickable.height/2;
                 }
                 prevScale = value;
             }
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index b60a95f..e686d02 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -10,8 +10,8 @@ Flickable {
 
     id: flickable
     width: parent.width
-    viewportWidth: Math.max(parent.width,webView.width*webView.scale)
-    viewportHeight: Math.max(parent.height,webView.height*webView.scale)
+    contentWidth: Math.max(parent.width,webView.width*webView.scale)
+    contentHeight: Math.max(parent.height,webView.height*webView.scale)
     anchors.top: headerSpace.bottom
     anchors.bottom: footer.top
     anchors.left: parent.left
@@ -53,10 +53,10 @@ Flickable {
             if (centerX) {
                 var sc = zoom/contentsScale;
                 scaleAnim.to = sc;
-                flickVX.from = flickable.viewportX
+                flickVX.from = flickable.contentX
                 flickVX.to = Math.max(0,Math.min(centerX-flickable.width/2,webView.width*sc-flickable.width))
                 finalX.value = flickVX.to
-                flickVY.from = flickable.viewportY
+                flickVY.from = flickable.contentY
                 flickVY.to = Math.max(0,Math.min(centerY-flickable.height/2,webView.height*sc-flickable.height))
                 finalY.value = flickVY.to
                 finalZoom.value = zoom
@@ -76,8 +76,8 @@ Flickable {
         }
         onUrlChanged: {
             // got to topleft
-            flickable.viewportX = 0
-            flickable.viewportY = 0
+            flickable.contentX = 0
+            flickable.contentY = 0
             if (url != null) { header.editUrl = url.toString(); }
         }
         onDoubleClick: {
@@ -110,7 +110,7 @@ Flickable {
                 NumberAnimation {
                     id: flickVX
                     target: flickable
-                    property: "viewportX"
+                    property: "contentX"
                     easing.type: "Linear"
                     duration: 200
                     from: 0 // set before calling
@@ -119,7 +119,7 @@ Flickable {
                 NumberAnimation {
                     id: flickVY
                     target: flickable
-                    property: "viewportY"
+                    property: "contentY"
                     easing.type: "Linear"
                     duration: 200
                     from: 0 // set before calling
@@ -136,19 +136,19 @@ Flickable {
                 property: "scale"
                 value: 1.0
             }
-            // Have to set the viewportXY, since the above 2
+            // Have to set the contentXY, since the above 2
             // size changes may have started a correction if
             // contentsScale < 1.0.
             PropertyAction {
                 id: finalX
                 target: flickable
-                property: "viewportX"
+                property: "contentX"
                 value: 0 // set before calling
             }
             PropertyAction {
                 id: finalY
                 target: flickable
-                property: "viewportY"
+                property: "contentY"
                 value: 0 // set before calling
             }
             PropertyAction {
diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
index f905150..e8c9208 100644
--- a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
+++ b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
@@ -9,10 +9,10 @@ Image {
     source: "pics/header.png"
     width: parent.width
     height: 60
-    x: webView.viewportX < 0 ? -webView.viewportX : webView.viewportX > webView.viewportWidth-webView.width
-                             ? -webView.viewportX+webView.viewportWidth-webView.width : 0
-    y: webView.viewportY < 0 ? -webView.viewportY : progressOff*
-                            (webView.viewportY>height?-height:-webView.viewportY)
+    x: webView.contentX < 0 ? -webView.contentX : webView.contentX > webView.contentWidth-webView.width
+                             ? -webView.contentX+webView.contentWidth-webView.width : 0
+    y: webView.contentY < 0 ? -webView.contentY : progressOff*
+                            (webView.contentY>height?-height:-webView.contentY)
     Text {
         id: headerText
 
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index faafd5d..6a427f4 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -30,10 +30,10 @@ Item {
             anchors.bottom: footer.top
         }
         RectSoftShadow {
-            x: -webView.viewportX
-            y: -webView.viewportY
-            width: webView.viewportWidth
-            height: webView.viewportHeight+headerSpace.height
+            x: -webView.contentX
+            y: -webView.contentY
+            width: webView.contentWidth
+            height: webView.contentHeight+headerSpace.height
         }
         Item {
             id: headerSpace
diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animations/easing.qml
index a7ba1c5..8f2655e 100644
--- a/examples/declarative/animations/easing.qml
+++ b/examples/declarative/animations/easing.qml
@@ -89,7 +89,7 @@ Rectangle {
     }
 
     Flickable {
-        anchors.fill: parent; viewportHeight: layout.height
+        anchors.fill: parent; contentHeight: layout.height
         Column {
             id: layout
             anchors.left: parent.left; anchors.right: parent.right
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
index f848be0..b76a9ab 100644
--- a/examples/declarative/listview/recipes.qml
+++ b/examples/declarative/listview/recipes.qml
@@ -81,7 +81,7 @@ Rectangle {
                 Flickable {
                     id: flick
                     anchors.top: methodTitle.bottom; anchors.bottom: parent.bottom
-                    width: parent.width; viewportHeight: methodText.height; clip: true
+                    width: parent.width; contentHeight: methodText.height; clip: true
                     Text { id: methodText; text: method; wrap: true; width: details.width }
                 }
                 Image {
@@ -114,7 +114,7 @@ Rectangle {
                 // Make the detailed view fill the entire list area
                 PropertyChanges { target: wrapper; height: list.height }
                 // Move the list so that this item is at the top.
-                PropertyChanges { target: wrapper.ListView.view; explicit: true; viewportY: wrapper.y }
+                PropertyChanges { target: wrapper.ListView.view; explicit: true; contentY: wrapper.y }
                 // Disallow flicking while we're in detailed view
                 PropertyChanges { target: wrapper.ListView.view; interactive: false }
             }
@@ -124,7 +124,7 @@ Rectangle {
                 ParallelAnimation {
                     ColorAnimation { property: "color"; duration: 500 }
                     NumberAnimation {
-                        duration: 300; properties: "detailsOpacity,x,viewportY,height,width"
+                        duration: 300; properties: "detailsOpacity,x,contentY,height,width"
                     }
                 }
             }
diff --git a/examples/declarative/parallax/qml/ParallaxView.qml b/examples/declarative/parallax/qml/ParallaxView.qml
index 811891b..5e58100 100644
--- a/examples/declarative/parallax/qml/ParallaxView.qml
+++ b/examples/declarative/parallax/qml/ParallaxView.qml
@@ -10,8 +10,8 @@ Item {
     Image {
         id: background
         fillMode: Image.TileHorizontally
-        x: -list.viewportX / 2
-        width: Math.max(list.viewportWidth, parent.width)
+        x: -list.contentX / 2
+        width: Math.max(list.contentWidth, parent.width)
     }
 
     ListView {
diff --git a/examples/declarative/progressbar/progressbars.qml b/examples/declarative/progressbar/progressbars.qml
index fdd4ca7..6530c3d 100644
--- a/examples/declarative/progressbar/progressbars.qml
+++ b/examples/declarative/progressbar/progressbars.qml
@@ -6,7 +6,7 @@ Rectangle {
     width: 600; height: 405; color: "#edecec"
 
     Flickable {
-        anchors.fill: parent; viewportHeight: column.height + 20
+        anchors.fill: parent; contentHeight: column.height + 20
         Column {
             id: column; x: 10; y: 10; spacing: 10
             Repeater {
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index a96db6e..84763d2 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -12,8 +12,8 @@ Rectangle {
             source: "pics/niagara_falls.jpg"
             asynchronous: true
         }
-        viewportWidth: picture.width
-        viewportHeight: picture.height
+        contentWidth: picture.width
+        contentHeight: picture.height
         // Only show the scrollbars when the view is moving.
         states: [
             State {
diff --git a/examples/declarative/velocity/velocity.qml b/examples/declarative/velocity/velocity.qml
index 50d69d8..0d1881e 100644
--- a/examples/declarative/velocity/velocity.qml
+++ b/examples/declarative/velocity/velocity.qml
@@ -96,7 +96,7 @@ Rectangle {
     }
     Flickable {
         id: flickable
-        anchors.fill: parent; viewportWidth: lay.width
+        anchors.fill: parent; contentWidth: lay.width
         Row {
             id: lay
             Repeater {
diff --git a/examples/declarative/webview/qdeclarative-in-html.qml b/examples/declarative/webview/qdeclarative-in-html.qml
index a2f2f2a..77180ec 100644
--- a/examples/declarative/webview/qdeclarative-in-html.qml
+++ b/examples/declarative/webview/qdeclarative-in-html.qml
@@ -6,8 +6,8 @@ Rectangle {
     Flickable {
         width: parent.width
         height: parent.height/2
-        viewportWidth: web.width*web.scale
-        viewportHeight: web.height*web.scale
+        contentWidth: web.width*web.scale
+        contentHeight: web.height*web.scale
         WebView {
             id: web
             width: 250
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index cf1080b..25e0088 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -1,6 +1,11 @@
 =============================================================================
 The changes below are pre Qt 4.7.0 alpha
 
+Flickable: renamed viewportWidth -> contentWidth
+Flickable: renamed viewportHeight -> contentHeight
+Flickable: renamed viewportX -> contentX
+Flickable: renamed viewportY -> contentY
+Removed Flickable.reportedVelocitySmoothing
 Renamed MouseRegion -> MouseArea
 
 QmlView
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 9f19f53..3e595f1 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -142,8 +142,8 @@ void QDeclarativeFlickablePrivate::init()
     QObject::connect(&timeline, SIGNAL(completed()), q, SLOT(movementEnding()));
     q->setAcceptedMouseButtons(Qt::LeftButton);
     q->setFiltersChildEvents(true);
-    QObject::connect(viewport, SIGNAL(xChanged()), q, SIGNAL(positionXChanged()));
-    QObject::connect(viewport, SIGNAL(yChanged()), q, SIGNAL(positionYChanged()));
+    QObject::connect(viewport, SIGNAL(xChanged()), q, SIGNAL(contentXChanged()));
+    QObject::connect(viewport, SIGNAL(yChanged()), q, SIGNAL(contentYChanged()));
     QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(heightChange()));
     QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(widthChange()));
 }
@@ -343,7 +343,7 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
 
     \code
     Flickable {
-        width: 200; height: 200; viewportWidth: image.width; viewportHeight: image.height
+        width: 200; height: 200; contentWidth: image.width; contentHeight: image.height
         Image { id: image; source: "bigimage.png" }
     }
     \endcode
@@ -429,20 +429,20 @@ QDeclarativeFlickable::~QDeclarativeFlickable()
 }
 
 /*!
-    \qmlproperty int Flickable::viewportX
-    \qmlproperty int Flickable::viewportY
+    \qmlproperty int Flickable::contentX
+    \qmlproperty int Flickable::contentY
 
     These properties hold the surface coordinate currently at the top-left
     corner of the Flickable. For example, if you flick an image up 100 pixels,
-    \c yPosition will be 100.
+    \c contentY will be 100.
 */
-qreal QDeclarativeFlickable::viewportX() const
+qreal QDeclarativeFlickable::contentX() const
 {
     Q_D(const QDeclarativeFlickable);
     return -d->_moveX.value();
 }
 
-void QDeclarativeFlickable::setViewportX(qreal pos)
+void QDeclarativeFlickable::setContentX(qreal pos)
 {
     Q_D(QDeclarativeFlickable);
     pos = qRound(pos);
@@ -454,13 +454,13 @@ void QDeclarativeFlickable::setViewportX(qreal pos)
     }
 }
 
-qreal QDeclarativeFlickable::viewportY() const
+qreal QDeclarativeFlickable::contentY() const
 {
     Q_D(const QDeclarativeFlickable);
     return -d->_moveY.value();
 }
 
-void QDeclarativeFlickable::setViewportY(qreal pos)
+void QDeclarativeFlickable::setContentY(qreal pos)
 {
     Q_D(QDeclarativeFlickable);
     pos = qRound(pos);
@@ -506,12 +506,10 @@ void QDeclarativeFlickable::setInteractive(bool interactive)
 /*!
     \qmlproperty real Flickable::horizontalVelocity
     \qmlproperty real Flickable::verticalVelocity
-    \qmlproperty real Flickable::reportedVelocitySmoothing
 
     The instantaneous velocity of movement along the x and y axes, in pixels/sec.
 
     The reported velocity is smoothed to avoid erratic output.
-    reportedVelocitySmoothing determines how much smoothing is applied.
 */
 qreal QDeclarativeFlickable::horizontalVelocity() const
 {
@@ -584,8 +582,8 @@ QDeclarativeFlickableVisibleArea *QDeclarativeFlickable::visibleArea()
 
     \list
     \o AutoFlickDirection (default) - allows flicking vertically if the
-    \e viewportHeight is not equal to the \e height of the Flickable.
-    Allows flicking horizontally if the \e viewportWidth is not equal
+    \e contentHeight is not equal to the \e height of the Flickable.
+    Allows flicking horizontally if the \e contentWidth is not equal
     to the \e width of the Flickable.
     \o HorizontalFlick - allows flicking horizontally.
     \o VerticalFlick - allows flicking vertically.
@@ -992,26 +990,26 @@ void QDeclarativeFlickable::setOverShoot(bool o)
 }
 
 /*!
-    \qmlproperty int Flickable::viewportWidth
-    \qmlproperty int Flickable::viewportHeight
+    \qmlproperty int Flickable::contentWidth
+    \qmlproperty int Flickable::contentHeight
 
     The dimensions of the viewport (the surface controlled by Flickable). Typically this
     should be set to the combined size of the items placed in the Flickable.
 
     \code
     Flickable {
-        width: 320; height: 480; viewportWidth: image.width; viewportHeight: image.height
+        width: 320; height: 480; contentWidth: image.width; contentHeight: image.height
         Image { id: image; source: "bigimage.png" }
     }
     \endcode
 */
-qreal QDeclarativeFlickable::viewportWidth() const
+qreal QDeclarativeFlickable::contentWidth() const
 {
     Q_D(const QDeclarativeFlickable);
     return d->vWidth;
 }
 
-void QDeclarativeFlickable::setViewportWidth(qreal w)
+void QDeclarativeFlickable::setContentWidth(qreal w)
 {
     Q_D(QDeclarativeFlickable);
     if (d->vWidth == w)
@@ -1024,7 +1022,7 @@ void QDeclarativeFlickable::setViewportWidth(qreal w)
     // Make sure that we're entirely in view.
     if (!d->pressed)
         d->fixupX();
-    emit viewportWidthChanged();
+    emit contentWidthChanged();
     d->updateBeginningEnd();
 }
 
@@ -1033,7 +1031,7 @@ void QDeclarativeFlickable::widthChange()
     Q_D(QDeclarativeFlickable);
     if (d->vWidth < 0) {
         d->viewport->setWidth(width());
-        emit viewportWidthChanged();
+        emit contentWidthChanged();
     }
     d->updateBeginningEnd();
 }
@@ -1043,18 +1041,18 @@ void QDeclarativeFlickable::heightChange()
     Q_D(QDeclarativeFlickable);
     if (d->vHeight < 0) {
         d->viewport->setHeight(height());
-        emit viewportHeightChanged();
+        emit contentHeightChanged();
     }
     d->updateBeginningEnd();
 }
 
-qreal QDeclarativeFlickable::viewportHeight() const
+qreal QDeclarativeFlickable::contentHeight() const
 {
     Q_D(const QDeclarativeFlickable);
     return d->vHeight;
 }
 
-void QDeclarativeFlickable::setViewportHeight(qreal h)
+void QDeclarativeFlickable::setContentHeight(qreal h)
 {
     Q_D(QDeclarativeFlickable);
     if (d->vHeight == h)
@@ -1067,7 +1065,7 @@ void QDeclarativeFlickable::setViewportHeight(qreal h)
     // Make sure that we're entirely in view.
     if (!d->pressed)
         d->fixupY();
-    emit viewportHeightChanged();
+    emit contentHeightChanged();
     d->updateBeginningEnd();
 }
 
@@ -1259,22 +1257,6 @@ void QDeclarativeFlickable::setPressDelay(int delay)
     emit pressDelayChanged();
 }
 
-qreal QDeclarativeFlickable::reportedVelocitySmoothing() const
-{
-    Q_D(const QDeclarativeFlickable);
-    return d->reportedVelocitySmoothing;
-}
-
-void QDeclarativeFlickable::setReportedVelocitySmoothing(qreal reportedVelocitySmoothing)
-{
-    Q_D(QDeclarativeFlickable);
-    Q_ASSERT(reportedVelocitySmoothing >= 0);
-    if (reportedVelocitySmoothing == d->reportedVelocitySmoothing)
-        return;
-    d->reportedVelocitySmoothing = reportedVelocitySmoothing;
-    emit reportedVelocitySmoothingChanged(reportedVelocitySmoothing);
-}
-
 /*!
     \qmlproperty bool Flickable::moving
 
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
index 19fb2a9..4617688 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
@@ -56,14 +56,13 @@ class Q_DECLARATIVE_EXPORT QDeclarativeFlickable : public QDeclarativeItem
 {
     Q_OBJECT
 
-    Q_PROPERTY(qreal viewportWidth READ viewportWidth WRITE setViewportWidth NOTIFY viewportWidthChanged)
-    Q_PROPERTY(qreal viewportHeight READ viewportHeight WRITE setViewportHeight NOTIFY viewportHeightChanged)
-    Q_PROPERTY(qreal viewportX READ viewportX WRITE setViewportX NOTIFY positionXChanged)
-    Q_PROPERTY(qreal viewportY READ viewportY WRITE setViewportY NOTIFY positionYChanged)
+    Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged)
+    Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged)
+    Q_PROPERTY(qreal contentX READ contentX WRITE setContentX NOTIFY contentXChanged)
+    Q_PROPERTY(qreal contentY READ contentY WRITE setContentY NOTIFY contentYChanged)
 
     Q_PROPERTY(qreal horizontalVelocity READ horizontalVelocity NOTIFY horizontalVelocityChanged)
     Q_PROPERTY(qreal verticalVelocity READ verticalVelocity NOTIFY verticalVelocityChanged)
-    Q_PROPERTY(qreal reportedVelocitySmoothing READ reportedVelocitySmoothing WRITE setReportedVelocitySmoothing NOTIFY reportedVelocitySmoothingChanged)
 
     Q_PROPERTY(bool overShoot READ overShoot WRITE setOverShoot NOTIFY overShootChanged)
     Q_PROPERTY(qreal maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity NOTIFY maximumFlickVelocityChanged)
@@ -98,17 +97,17 @@ public:
     bool overShoot() const;
     void setOverShoot(bool);
 
-    qreal viewportWidth() const;
-    void setViewportWidth(qreal);
+    qreal contentWidth() const;
+    void setContentWidth(qreal);
 
-    qreal viewportHeight() const;
-    void setViewportHeight(qreal);
+    qreal contentHeight() const;
+    void setContentHeight(qreal);
 
-    qreal viewportX() const;
-    void setViewportX(qreal pos);
+    qreal contentX() const;
+    void setContentX(qreal pos);
 
-    qreal viewportY() const;
-    void setViewportY(qreal pos);
+    qreal contentY() const;
+    void setContentY(qreal pos);
 
     bool isMoving() const;
     bool isFlicking() const;
@@ -116,9 +115,6 @@ public:
     int pressDelay() const;
     void setPressDelay(int delay);
 
-    qreal reportedVelocitySmoothing() const;
-    void setReportedVelocitySmoothing(qreal);
-
     qreal maximumFlickVelocity() const;
     void setMaximumFlickVelocity(qreal);
 
@@ -143,17 +139,16 @@ public:
     void setFlickDirection(FlickDirection);
 
 Q_SIGNALS:
-    void viewportWidthChanged();
-    void viewportHeightChanged();
-    void positionXChanged();
-    void positionYChanged();
+    void contentWidthChanged();
+    void contentHeightChanged();
+    void contentXChanged();
+    void contentYChanged();
     void movingChanged();
     void flickingChanged();
     void movementStarted();
     void movementEnded();
     void flickStarted();
     void flickEnded();
-    void reportedVelocitySmoothingChanged(int);
     void horizontalVelocityChanged();
     void verticalVelocityChanged();
     void isAtBoundaryChanged();
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index ab5022b..0a103f3 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -133,14 +133,14 @@ public:
 
     qreal position() const {
         Q_Q(const QDeclarativeGridView);
-        return flow == QDeclarativeGridView::LeftToRight ? q->viewportY() : q->viewportX();
+        return flow == QDeclarativeGridView::LeftToRight ? q->contentY() : q->contentX();
     }
     void setPosition(qreal pos) {
         Q_Q(QDeclarativeGridView);
         if (flow == QDeclarativeGridView::LeftToRight)
-            q->setViewportY(pos);
+            q->setContentY(pos);
         else
-            q->setViewportX(pos);
+            q->setContentX(pos);
     }
     int size() const {
         Q_Q(const QDeclarativeGridView);
@@ -458,9 +458,9 @@ void QDeclarativeGridViewPrivate::refill(qreal from, qreal to, bool doBuffer)
     }
     if (changed) {
         if (flow == QDeclarativeGridView::LeftToRight)
-            q->setViewportHeight(endPosition() - startPosition());
+            q->setContentHeight(endPosition() - startPosition());
         else
-            q->setViewportWidth(endPosition() - startPosition());
+            q->setContentWidth(endPosition() - startPosition());
     } else if (!doBuffer && buffer && bufferMode != NoBuffer) {
         refill(from, to, true);
     }
@@ -473,9 +473,9 @@ void QDeclarativeGridViewPrivate::updateGrid()
     columns = (int)qMax((flow == QDeclarativeGridView::LeftToRight ? q->width() : q->height()) / colSize(), qreal(1.));
     if (isValid()) {
         if (flow == QDeclarativeGridView::LeftToRight)
-            q->setViewportHeight(endPosition() - startPosition());
+            q->setContentHeight(endPosition() - startPosition());
         else
-            q->setViewportWidth(endPosition() - startPosition());
+            q->setContentWidth(endPosition() - startPosition());
     }
 }
 
@@ -516,10 +516,10 @@ void QDeclarativeGridViewPrivate::layout(bool removed)
     updateHighlight();
     moveReason = Other;
     if (flow == QDeclarativeGridView::LeftToRight) {
-        q->setViewportHeight(endPosition() - startPosition());
+        q->setContentHeight(endPosition() - startPosition());
         fixupY();
     } else {
-        q->setViewportWidth(endPosition() - startPosition());
+        q->setContentWidth(endPosition() - startPosition());
         fixupX();
     }
     updateUnrequestedPositions();
@@ -1028,10 +1028,10 @@ void QDeclarativeGridView::setFlow(Flow flow)
     if (d->flow != flow) {
         d->flow = flow;
         if (d->flow == LeftToRight) {
-            setViewportWidth(-1);
+            setContentWidth(-1);
             setFlickDirection(QDeclarativeFlickable::VerticalFlick);
         } else {
-            setViewportHeight(-1);
+            setContentHeight(-1);
             setFlickDirection(QDeclarativeFlickable::HorizontalFlick);
         }
         d->clear();
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index e6b6f2a..6421018 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -203,14 +203,14 @@ public:
 
     qreal position() const {
         Q_Q(const QDeclarativeListView);
-        return orient == QDeclarativeListView::Vertical ? q->viewportY() : q->viewportX();
+        return orient == QDeclarativeListView::Vertical ? q->contentY() : q->contentX();
     }
     void setPosition(qreal pos) {
         Q_Q(QDeclarativeListView);
         if (orient == QDeclarativeListView::Vertical)
-            q->setViewportY(pos);
+            q->setContentY(pos);
         else
-            q->setViewportX(pos);
+            q->setContentX(pos);
     }
     qreal size() const {
         Q_Q(const QDeclarativeListView);
@@ -382,9 +382,9 @@ public:
     void updateViewport() {
         Q_Q(QDeclarativeListView);
         if (orient == QDeclarativeListView::Vertical) {
-            q->setViewportHeight(endPosition() - startPosition() + 1);
+            q->setContentHeight(endPosition() - startPosition() + 1);
         } else {
-            q->setViewportWidth(endPosition() - startPosition() + 1);
+            q->setContentWidth(endPosition() - startPosition() + 1);
         }
     }
 
@@ -1819,10 +1819,10 @@ void QDeclarativeListView::setOrientation(QDeclarativeListView::Orientation orie
     if (d->orient != orientation) {
         d->orient = orientation;
         if (d->orient == QDeclarativeListView::Vertical) {
-            setViewportWidth(-1);
+            setContentWidth(-1);
             setFlickDirection(VerticalFlick);
         } else {
-            setViewportHeight(-1);
+            setContentHeight(-1);
             setFlickDirection(HorizontalFlick);
         }
         d->clear();
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
index 3e08359..4b82d5c 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Flickable {
     width: 100; height: 100
-    viewportWidth: row.width; viewportHeight: row.height
+    contentWidth: row.width; contentHeight: row.height
 
     Row {
         id: row
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
index 3ed173d..49eed5a 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Flickable {
     width: 100; height: 100
-    viewportWidth: column.width; viewportHeight: column.height
+    contentWidth: column.width; contentHeight: column.height
 
     Column {
         id: column
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
index 1425d85..40c4606 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Flickable {
     width: 100; height: 100
-    viewportWidth: column.width; viewportHeight: column.height
+    contentWidth: column.width; contentHeight: column.height
     pressDelay: 200; overShoot: false; interactive: false
     maximumFlickVelocity: 2000
 
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index 1c98c50..cb87977 100644
--- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -81,12 +81,11 @@ void tst_qdeclarativeflickable::create()
     QCOMPARE(obj->isAtXEnd(), false);
     QCOMPARE(obj->isAtYBeginning(), true);
     QCOMPARE(obj->isAtYEnd(), false);
-    QCOMPARE(obj->viewportX(), 0.);
-    QCOMPARE(obj->viewportY(), 0.);
+    QCOMPARE(obj->contentX(), 0.);
+    QCOMPARE(obj->contentY(), 0.);
 
     QCOMPARE(obj->horizontalVelocity(), 0.);
     QCOMPARE(obj->verticalVelocity(), 0.);
-    QCOMPARE(obj->reportedVelocitySmoothing(), 100.);
 
     QCOMPARE(obj->isInteractive(), true);
     QCOMPARE(obj->overShoot(), true);
@@ -103,8 +102,8 @@ void tst_qdeclarativeflickable::horizontalViewportSize()
     QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
 
     QVERIFY(obj != 0);
-    QCOMPARE(obj->viewportWidth(), 800.);
-    QCOMPARE(obj->viewportHeight(), 300.);
+    QCOMPARE(obj->contentWidth(), 800.);
+    QCOMPARE(obj->contentHeight(), 300.);
     QCOMPARE(obj->isAtXBeginning(), true);
     QCOMPARE(obj->isAtXEnd(), false);
     QCOMPARE(obj->isAtYBeginning(), true);
@@ -120,8 +119,8 @@ void tst_qdeclarativeflickable::verticalViewportSize()
     QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
 
     QVERIFY(obj != 0);
-    QCOMPARE(obj->viewportWidth(), 200.);
-    QCOMPARE(obj->viewportHeight(), 1200.);
+    QCOMPARE(obj->contentWidth(), 200.);
+    QCOMPARE(obj->contentHeight(), 1200.);
     QCOMPARE(obj->isAtXBeginning(), true);
     QCOMPARE(obj->isAtXEnd(), false);
     QCOMPARE(obj->isAtYBeginning(), true);
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 9c9d1d3..2a60fee 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -298,14 +298,14 @@ void tst_QDeclarativeGridView::inserted()
         model.insertItem(i, "Hello", QString::number(i));
     QTest::qWait(300);
 
-    gridview->setViewportY(120);
+    gridview->setContentY(120);
     QTest::qWait(300);
 
     // Insert item outside visible area
     model.insertItem(1, "Hello", "1324");
     QTest::qWait(300);
 
-    QVERIFY(gridview->viewportY() == 120);
+    QVERIFY(gridview->contentY() == 120);
 
     delete canvas;
 }
@@ -392,7 +392,7 @@ void tst_QDeclarativeGridView::removed()
     }
 
     // Remove items before visible
-    gridview->setViewportY(120);
+    gridview->setContentY(120);
     QTest::qWait(500);
     gridview->setCurrentIndex(10);
 
@@ -400,7 +400,7 @@ void tst_QDeclarativeGridView::removed()
     QTest::qWait(300);
 
     // Setting currentIndex above shouldn't cause view to scroll
-    QCOMPARE(gridview->viewportY(), 120.0);
+    QCOMPARE(gridview->contentY(), 120.0);
 
     model.removeItem(1);
 
@@ -424,7 +424,7 @@ void tst_QDeclarativeGridView::removed()
     QCOMPARE(gridview->currentIndex(), 9);
     QVERIFY(gridview->currentItem() != oldCurrent);
 
-    gridview->setViewportY(0);
+    gridview->setContentY(0);
     // let transitions settle.
     QTest::qWait(300);
 
@@ -441,7 +441,7 @@ void tst_QDeclarativeGridView::removed()
     // remove item outside current view.
     gridview->setCurrentIndex(32);
     QTest::qWait(500);
-    gridview->setViewportY(240);
+    gridview->setContentY(240);
 
     model.removeItem(30);
     QVERIFY(gridview->currentIndex() == 31);
@@ -449,7 +449,7 @@ void tst_QDeclarativeGridView::removed()
     // remove current item beyond visible items.
     gridview->setCurrentIndex(20);
     QTest::qWait(500);
-    gridview->setViewportY(0);
+    gridview->setContentY(0);
     model.removeItem(20);
     QTest::qWait(500);
 
@@ -459,7 +459,7 @@ void tst_QDeclarativeGridView::removed()
     // remove item before current, but visible
     gridview->setCurrentIndex(8);
     QTest::qWait(500);
-    gridview->setViewportY(240);
+    gridview->setContentY(240);
     oldCurrent = gridview->currentItem();
     model.removeItem(6);
     QTest::qWait(500);
@@ -520,7 +520,7 @@ void tst_QDeclarativeGridView::moved()
         QVERIFY(item->y() == (i/3)*60);
     }
 
-    gridview->setViewportY(120);
+    gridview->setContentY(120);
 
     // move outside visible area
     model.moveItem(1, 25);
@@ -638,13 +638,13 @@ void tst_QDeclarativeGridView::currentIndex()
     QCOMPARE(gridview->currentIndex(), model.count()-1);
 
     QTest::qWait(500);
-    QCOMPARE(gridview->viewportY(), 279.0);
+    QCOMPARE(gridview->contentY(), 279.0);
 
     gridview->moveCurrentIndexRight();
     QCOMPARE(gridview->currentIndex(), 0);
 
     QTest::qWait(500);
-    QCOMPARE(gridview->viewportY(), 0.0);
+    QCOMPARE(gridview->contentY(), 0.0);
 
     // Test keys
     qApp->setActiveWindow(canvas);
@@ -829,7 +829,7 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
 
     // Position on a currently visible item
     gridview->positionViewAtIndex(4);
-    QCOMPARE(gridview->viewportY(), 60.);
+    QCOMPARE(gridview->contentY(), 60.);
 
     // Confirm items positioned correctly
     itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
@@ -843,7 +843,7 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
 
     // Position on an item beyond the visible items
     gridview->positionViewAtIndex(21);
-    QCOMPARE(gridview->viewportY(), 420.);
+    QCOMPARE(gridview->contentY(), 420.);
 
     // Confirm items positioned correctly
     itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
@@ -857,7 +857,7 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
 
     // Position on an item that would leave empty space if positioned at the top
     gridview->positionViewAtIndex(31);
-    QCOMPARE(gridview->viewportY(), 520.);
+    QCOMPARE(gridview->contentY(), 520.);
 
     // Confirm items positioned correctly
     itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
@@ -871,7 +871,7 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
 
     // Position at the beginning again
     gridview->positionViewAtIndex(0);
-    QCOMPARE(gridview->viewportY(), 0.);
+    QCOMPARE(gridview->contentY(), 0.);
 
     // Confirm items positioned correctly
     itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index 9100522..f15f26b 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -486,14 +486,14 @@ void tst_QDeclarativeListView::inserted()
         model.insertItem(i, "Hello", QString::number(i));
     QTest::qWait(500);
 
-    listview->setViewportY(80);
+    listview->setContentY(80);
     QTest::qWait(500);
 
     // Insert item outside visible area
     model.insertItem(1, "Hello", "1324");
     QTest::qWait(500);
 
-    QVERIFY(listview->viewportY() == 80);
+    QVERIFY(listview->contentY() == 80);
 
     // Confirm items positioned correctly
     for (int i = 5; i < 5+15; ++i) {
@@ -591,7 +591,7 @@ void tst_QDeclarativeListView::removed(bool animated)
     }
 
     // Remove items before visible
-    listview->setViewportY(80);
+    listview->setContentY(80);
     listview->setCurrentIndex(10);
 
     model.removeItem(1); // post: top item will be at 40
@@ -615,7 +615,7 @@ void tst_QDeclarativeListView::removed(bool animated)
     QCOMPARE(listview->currentIndex(), 9);
     QVERIFY(listview->currentItem() != oldCurrent);
 
-    listview->setViewportY(40); // That's the top now
+    listview->setContentY(40); // That's the top now
     // let transitions settle.
     QTest::qWait(500);
 
@@ -631,7 +631,7 @@ void tst_QDeclarativeListView::removed(bool animated)
     // remove current item beyond visible items.
     listview->setCurrentIndex(20);
     QTest::qWait(500);
-    listview->setViewportY(40);
+    listview->setContentY(40);
     model.removeItem(20);
     QTest::qWait(500);
 
@@ -682,7 +682,7 @@ void tst_QDeclarativeListView::clear()
 
     QVERIFY(listview->count() == 0);
     QVERIFY(listview->currentItem() == 0);
-    QVERIFY(listview->viewportY() == 0);
+    QVERIFY(listview->contentY() == 0);
 
     delete canvas;
 }
@@ -740,7 +740,7 @@ void tst_QDeclarativeListView::moved()
         QVERIFY(item->y() == i*20);
     }
 
-    listview->setViewportY(80);
+    listview->setContentY(80);
 
     // move outside visible area
     model.moveItem(1, 18);
@@ -812,7 +812,7 @@ void tst_QDeclarativeListView::enforceRange()
     // view should be positioned at the top of the range.
     QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", 0);
     QVERIFY(item);
-    QCOMPARE(listview->viewportY(), -100.0);
+    QCOMPARE(listview->contentY(), -100.0);
 
     QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 0);
     QVERIFY(name != 0);
@@ -822,7 +822,7 @@ void tst_QDeclarativeListView::enforceRange()
     QCOMPARE(number->text(), model.number(0));
 
     // Check currentIndex is updated when viewport moves
-    listview->setViewportY(20);
+    listview->setContentY(20);
     QTest::qWait(500);
 
     QCOMPARE(listview->currentIndex(), 6);
@@ -948,10 +948,10 @@ void tst_QDeclarativeListView::sections()
 
     QCOMPARE(listview->currentSection(), QString("0"));
 
-    listview->setViewportY(140);
+    listview->setContentY(140);
     QCOMPARE(listview->currentSection(), QString("1"));
 
-    listview->setViewportY(20);
+    listview->setContentY(20);
     QCOMPARE(listview->currentSection(), QString("0"));
 
     item = findItem<QDeclarativeItem>(viewport, "wrapper", 1);
@@ -1012,13 +1012,13 @@ void tst_QDeclarativeListView::currentIndex()
     QCOMPARE(listview->currentIndex(), model.count()-1);
 
     QTest::qWait(1000);
-    QCOMPARE(listview->viewportY(), 279.0);
+    QCOMPARE(listview->contentY(), 279.0);
 
     listview->incrementCurrentIndex();
     QCOMPARE(listview->currentIndex(), 0);
 
     QTest::qWait(1000);
-    QCOMPARE(listview->viewportY(), 0.0);
+    QCOMPARE(listview->contentY(), 0.0);
 
     // Test keys
     canvas->show();
@@ -1181,7 +1181,7 @@ void tst_QDeclarativeListView::positionViewAtIndex()
 
     // Position on a currently visible item
     listview->positionViewAtIndex(3);
-    QCOMPARE(listview->viewportY(), 60.);
+    QCOMPARE(listview->contentY(), 60.);
 
     // Confirm items positioned correctly
     itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
@@ -1194,7 +1194,7 @@ void tst_QDeclarativeListView::positionViewAtIndex()
 
     // Position on an item beyond the visible items
     listview->positionViewAtIndex(22);
-    QCOMPARE(listview->viewportY(), 440.);
+    QCOMPARE(listview->contentY(), 440.);
 
     // Confirm items positioned correctly
     itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
@@ -1207,7 +1207,7 @@ void tst_QDeclarativeListView::positionViewAtIndex()
 
     // Position on an item that would leave empty space if positioned at the top
     listview->positionViewAtIndex(28);
-    QCOMPARE(listview->viewportY(), 480.);
+    QCOMPARE(listview->contentY(), 480.);
 
     // Confirm items positioned correctly
     itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
@@ -1220,7 +1220,7 @@ void tst_QDeclarativeListView::positionViewAtIndex()
 
     // Position at the beginning again
     listview->positionViewAtIndex(0);
-    QCOMPARE(listview->viewportY(), 0.);
+    QCOMPARE(listview->contentY(), 0.);
 
     // Confirm items positioned correctly
     itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml
index 1a7366d..50ba9ad 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml
@@ -17,7 +17,7 @@ Rectangle {
 
     Flickable {
         id: flickable
-        anchors.fill: parent; viewportWidth: row.width
+        anchors.fill: parent; contentWidth: row.width
 
         Row {
             id: row
diff --git a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml
index 6204aa9..ebb963d 100644
--- a/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml
@@ -18,7 +18,7 @@ Rectangle {
     flickable {
         id: flick
         height: parent.height-50
-        width: parent.width; viewportHeight: column.height
+        width: parent.width; contentHeight: column.height
 
         Column {
             id: column
-- 
cgit v0.12


From e3d78a41a7d0533972169aeb6ca00b5655c5c404 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 26 Feb 2010 12:05:50 +1000
Subject: Rebuild since -declarative auto detection changed.

---
 configure.exe | Bin 1221632 -> 1223680 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/configure.exe b/configure.exe
index f937ea2..39a1747 100755
Binary files a/configure.exe and b/configure.exe differ
-- 
cgit v0.12


From 4d4ca01e59a151494e76d150ef8ad3fdab8aeea1 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 26 Feb 2010 12:13:15 +1000
Subject: Fix Flickable.overShoot doc - it is a bool not a real

---
 src/declarative/graphicsitems/qdeclarativeflickable.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 3e595f1..623398f 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -966,10 +966,10 @@ QDeclarativeListProperty<QDeclarativeItem> QDeclarativeFlickable::flickableChild
 
 /*!
     \qmlproperty bool Flickable::overShoot
-    This property holds the number of pixels the surface may overshoot the
+    This property holds whether the surface may overshoot the
     Flickable's boundaries when flicked.
 
-    If overShoot is non-zero the contents can be flicked beyond the boundary
+    If overShoot is true the contents can be flicked beyond the boundary
     of the Flickable before being moved back to the boundary.  This provides
     the feeling that the edges of the view are soft, rather than a hard
     physical boundary.
-- 
cgit v0.12


From b5700759da7bccf0ccd6e20b1727950532894ad2 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 26 Feb 2010 12:38:57 +1000
Subject: Some animation cleanup/refactoring.

---
 src/declarative/util/qdeclarativeanimation.cpp   | 11 ++++++-----
 src/declarative/util/qdeclarativeanimation_p_p.h | 21 ++++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 8af8fc2..6dc91de 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1567,7 +1567,8 @@ QDeclarativeSequentialAnimation::QDeclarativeSequentialAnimation(QObject *parent
     QDeclarativeAnimationGroup(parent)
 {
     Q_D(QDeclarativeAnimationGroup);
-    d->ag = new QSequentialAnimationGroup(this);
+    d->ag = new QSequentialAnimationGroup;
+    QDeclarativeGraphics_setParent_noEvent(d->ag, this);
 }
 
 QDeclarativeSequentialAnimation::~QDeclarativeSequentialAnimation()
@@ -1632,7 +1633,8 @@ QDeclarativeParallelAnimation::QDeclarativeParallelAnimation(QObject *parent) :
     QDeclarativeAnimationGroup(parent)
 {
     Q_D(QDeclarativeAnimationGroup);
-    d->ag = new QParallelAnimationGroup(this);
+    d->ag = new QParallelAnimationGroup;
+    QDeclarativeGraphics_setParent_noEvent(d->ag, this);
 }
 
 QDeclarativeParallelAnimation::~QDeclarativeParallelAnimation()
@@ -1791,7 +1793,7 @@ QDeclarativePropertyAnimation::~QDeclarativePropertyAnimation()
 void QDeclarativePropertyAnimationPrivate::init()
 {
     Q_Q(QDeclarativePropertyAnimation);
-    va = new QDeclarativeTimeLineValueAnimator;
+    va = new QDeclarativeBulkValueAnimator;
     QDeclarativeGraphics_setParent_noEvent(va, q);
 }
 
@@ -2207,7 +2209,7 @@ QAbstractAnimation *QDeclarativePropertyAnimation::qtAnimation()
     return d->va;
 }
 
-struct PropertyUpdater : public QDeclarativeTimeLineValue
+struct PropertyUpdater : public QDeclarativeBulkValueUpdater
 {
     QDeclarativeStateActions actions;
     int interpolatorType;       //for Number/ColorAnimation
@@ -2225,7 +2227,6 @@ struct PropertyUpdater : public QDeclarativeTimeLineValue
         wasDeleted = &deleted;
         if (reverse)    //QVariantAnimation sends us 1->0 when reversed, but we are expecting 0->1
             v = 1 - v;
-        QDeclarativeTimeLineValue::setValue(v);
         for (int ii = 0; ii < actions.count(); ++ii) {
             QDeclarativeAction &action = actions[ii];
 
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index e582066..ae82a90 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -149,14 +149,21 @@ private:
     bool running;
 };
 
-//animates QDeclarativeTimeLineValue (assumes start and end values will be reals or compatible)
-class QDeclarativeTimeLineValueAnimator : public QVariantAnimation
+class QDeclarativeBulkValueUpdater
+{
+public:
+    virtual ~QDeclarativeBulkValueUpdater() {}
+    virtual void setValue(qreal value) = 0;
+};
+
+//animates QDeclarativeBulkValueUpdater (assumes start and end values will be reals or compatible)
+class QDeclarativeBulkValueAnimator : public QVariantAnimation
 {
     Q_OBJECT
 public:
-    QDeclarativeTimeLineValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), fromSourced(0), policy(KeepWhenStopped) {}
-    ~QDeclarativeTimeLineValueAnimator() { if (policy == DeleteWhenStopped) { delete animValue; animValue = 0; } }
-    void setAnimValue(QDeclarativeTimeLineValue *value, DeletionPolicy p)
+    QDeclarativeBulkValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), fromSourced(0), policy(KeepWhenStopped) {}
+    ~QDeclarativeBulkValueAnimator() { if (policy == DeleteWhenStopped) { delete animValue; animValue = 0; } }
+    void setAnimValue(QDeclarativeBulkValueUpdater *value, DeletionPolicy p)
     {
         if (state() == Running)
             stop();
@@ -193,7 +200,7 @@ protected:
     }
 
 private:
-    QDeclarativeTimeLineValue *animValue;
+    QDeclarativeBulkValueUpdater *animValue;
     bool *fromSourced;
     DeletionPolicy policy;
 };
@@ -352,7 +359,7 @@ public:
     int interpolatorType;
     QVariantAnimation::Interpolator interpolator;
 
-    QDeclarativeTimeLineValueAnimator *va;
+    QDeclarativeBulkValueAnimator *va;
 
     static QVariant interpolateVariant(const QVariant &from, const QVariant &to, qreal progress);
     static void convertVariant(QVariant &variant, int type);
-- 
cgit v0.12


From 760235ef89fb72ce2559b8f0dbd267fe04fab2da Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Fri, 26 Feb 2010 12:02:15 +1000
Subject: Move QEasingCurve datastream autotest to qdatastream for more
 comprehensive tests

---
 tests/auto/qdatastream/tst_qdatastream.cpp   | 69 ++++++++++++++++++++++++++++
 tests/auto/qeasingcurve/tst_qeasingcurve.cpp | 54 ----------------------
 2 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp
index c94ea7b..31e12fe 100644
--- a/tests/auto/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/qdatastream/tst_qdatastream.cpp
@@ -162,6 +162,9 @@ private slots:
     void stream_QIcon_data();
     void stream_QIcon();
 
+    void stream_QEasingCurve_data();
+    void stream_QEasingCurve();
+
     void stream_atEnd_data();
     void stream_atEnd();
 
@@ -243,6 +246,7 @@ private:
     void writeqint64(QDataStream *s);
     void writeQWMatrix(QDataStream *s);
     void writeQIcon(QDataStream *s);
+    void writeQEasingCurve(QDataStream *s);
 
     void readbool(QDataStream *s);
     void readQBool(QDataStream *s);
@@ -272,6 +276,7 @@ private:
     void readqint64(QDataStream *s);
     void readQWMatrix(QDataStream *s);
     void readQIcon(QDataStream *s);
+    void readQEasingCurve(QDataStream *s);
 
 private:
     QString svgFile;
@@ -687,6 +692,70 @@ void tst_QDataStream::readHash(QDataStream *s)
 
 // ************************************
 
+static QEasingCurve QEasingCurveData(int index)
+{
+    QEasingCurve easing;
+
+    switch (index) {
+    case 0:
+        default:
+            break;
+    case 1:
+            easing.setType(QEasingCurve::Linear);
+            break;
+    case 2:
+            easing.setType(QEasingCurve::OutCubic);
+            break;
+    case 3:
+            easing.setType(QEasingCurve::InOutSine);
+            break;
+    case 4:
+            easing.setType(QEasingCurve::InOutElastic);
+            easing.setPeriod(1.5);
+            easing.setAmplitude(2.0);
+            break;
+    case 5:
+            easing.setType(QEasingCurve::OutInBack);
+            break;
+    case 6:
+            easing.setType(QEasingCurve::OutCurve);
+            break;
+    case 7:
+            easing.setType(QEasingCurve::InOutBack);
+            easing.setOvershoot(0.5);
+            break;
+    }
+    return easing;
+}
+#define MAX_EASING_DATA 8
+
+void tst_QDataStream::stream_QEasingCurve_data()
+{
+    stream_data(MAX_EASING_DATA);
+}
+
+void tst_QDataStream::stream_QEasingCurve()
+{
+    STREAM_IMPL(QEasingCurve);
+}
+
+void tst_QDataStream::writeQEasingCurve(QDataStream* s)
+{
+    QEasingCurve test(QEasingCurveData(dataIndex(QTest::currentDataTag())));
+    *s << test;
+}
+
+void tst_QDataStream::readQEasingCurve(QDataStream *s)
+{
+    QEasingCurve S;
+    QEasingCurve expected(QEasingCurveData(dataIndex(QTest::currentDataTag())));
+
+    *s >> S;
+    QCOMPARE(S, expected);
+}
+
+// ************************************
+
 // contains some quint64 testing as well
 
 #define MAX_qint64_DATA 4
diff --git a/tests/auto/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
index abb4014..124f900 100644
--- a/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
+++ b/tests/auto/qeasingcurve/tst_qeasingcurve.cpp
@@ -69,8 +69,6 @@ private slots:
     void valueForProgress();
     void setCustomType();
     void operators();
-    void dataStreamOperators_data();
-    void dataStreamOperators();
     void properties();
     void metaTypes();
 
@@ -509,58 +507,6 @@ void tst_QEasingCurve::operators()
     QVERIFY(curve2 == curve);
 }
 
-void tst_QEasingCurve::dataStreamOperators_data()
-{
-    QTest::addColumn<int>("type");
-    QTest::addColumn<qreal>("amplitude");
-    QTest::addColumn<qreal>("overshoot");
-    QTest::addColumn<qreal>("period");
-    QTest::addColumn<QEasingCurve>("easingCurve");
-    QTest::newRow("Linear") << int(QEasingCurve::Linear) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::Linear);
-    QTest::newRow("OutCubic") << int(QEasingCurve::OutCubic) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::OutCubic);
-    QTest::newRow("InOutSine") << int(QEasingCurve::InOutSine) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::InOutSine);
-    QEasingCurve inOutElastic(QEasingCurve::InOutElastic);
-    inOutElastic.setPeriod(1.5);
-    inOutElastic.setAmplitude(2.0);
-    QTest::newRow("InOutElastic") << int(QEasingCurve::InOutElastic) << 2.0 << -1.0 << 1.5 << inOutElastic;
-    QTest::newRow("OutInBack") << int(QEasingCurve::OutInBack) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::OutInBack);
-    QTest::newRow("OutCurve") << int(QEasingCurve::OutCurve) << -1.0 << -1.0 << -1.0 << QEasingCurve(QEasingCurve::OutCurve);
-    QEasingCurve inOutBack(QEasingCurve::InOutBack);
-    inOutBack.setOvershoot(0.5);
-    QTest::newRow("InOutBack") << int(QEasingCurve::InOutBack) << -1.0 << 0.5 << -1.0 << inOutBack;
-}
-
-void tst_QEasingCurve::dataStreamOperators()
-{
-    QFETCH(int, type);
-    QFETCH(qreal, amplitude);
-    QFETCH(qreal, overshoot);
-    QFETCH(qreal, period);
-    QFETCH(QEasingCurve, easingCurve);
-
-    // operator <<
-    QEasingCurve curve;
-    curve.setType(QEasingCurve::Type(type));
-    if (amplitude != -1.0)
-        curve.setAmplitude(amplitude);
-    if (overshoot != -1.0)
-        curve.setOvershoot(overshoot);
-    if (period != -1.0)
-        curve.setPeriod(period);
-
-    QVERIFY(easingCurve == curve);
-
-    QByteArray array;
-    QDataStream out(&array, QIODevice::WriteOnly);
-    out << curve;
-
-    QDataStream in(array);
-    QEasingCurve curve2;
-    in >> curve2;
-
-    QVERIFY(curve2 == curve);
-}
-
 class tst_QEasingProperties : public QObject
 {
     Q_OBJECT
-- 
cgit v0.12


From 8e5df27bbb61951a8ccce8b2a7c5af461966329c Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Fri, 26 Feb 2010 12:40:17 +1000
Subject: Add QEasingCurve to datastream format docs

---
 doc/src/files-and-resources/datastreamformat.qdoc | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/doc/src/files-and-resources/datastreamformat.qdoc b/doc/src/files-and-resources/datastreamformat.qdoc
index 1c2d887..bab2c2c 100644
--- a/doc/src/files-and-resources/datastreamformat.qdoc
+++ b/doc/src/files-and-resources/datastreamformat.qdoc
@@ -47,7 +47,7 @@
     The \l QDataStream allows you to serialize some of the Qt data types.
     The table below lists the data types that QDataStream can serialize
     and how they are represented. The format described below is
-    \l{QDataStream::setVersion()}{version 8}.
+    \l{QDataStream::setVersion()}{version 12}.
 
     It is always best to cast integers to a Qt integer type, such as
     qint16 or quint32, when reading and writing. This ensures that
@@ -57,9 +57,9 @@
 
     \table
     \row \o bool
-	 \o \list
-	    \o boolean
-	    \endlist
+         \o \list
+            \o boolean
+            \endlist
     \row \o qint8
          \o \list
             \o signed byte
@@ -145,6 +145,17 @@
             \o Time (QTime)
             \o 0 for Qt::LocalTime, 1 for Qt::UTC (quint8)
             \endlist
+    \row \o QEasingCurve
+         \o \list
+            \o type (quint8)
+            \o func (quint64)
+            \o hasConfig (bool)
+            \o If hasConfig is true then these fields follow:
+            \o list
+                \o period (double)
+                \o amplitude (double)
+                \o overshoot (double)
+            \endlist
     \row \o QFont
          \o \list
             \o The family (QString)
-- 
cgit v0.12


From a0278d4330e4aac8413055b5a34feb54ab74404d Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Fri, 26 Feb 2010 12:42:36 +1000
Subject: Make sure that QEasingCurve::type when streamed is a quint8, as
 documented

---
 src/corelib/tools/qeasingcurve.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 64b4dca..d4b2c27 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -860,7 +860,7 @@ QDebug operator<<(QDebug debug, const QEasingCurve &item)
 
 QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing)
 {
-    stream << easing.d_ptr->type;
+    stream << quint8(easing.d_ptr->type);
     stream << quint64(quintptr(easing.d_ptr->func));
 
     bool hasConfig = easing.d_ptr->config;
@@ -886,7 +886,7 @@ QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing)
 QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing)
 {
     QEasingCurve::Type type;
-    int int_type;
+    quint8 int_type;
     stream >> int_type;
     type = static_cast<QEasingCurve::Type>(int_type);
     easing.setType(type);
-- 
cgit v0.12


From 8a3eef027ffaeb69eeee89b7868c17c1f246edc8 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 26 Feb 2010 13:23:08 +1000
Subject: Work around requires() bug in qmake

when running `qmake -r -tp vc', if any project is encountered which is
disabled with requires(), the generated .sln file ends up missing many
unrelated projects.
---
 tests/auto/auto.pro                                | 5 +++--
 tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro | 2 --
 tests/auto/qdeclarativevideo/qdeclarativevideo.pro | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index e625c69..95c168a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -313,8 +313,6 @@ SUBDIRS += \
            qmediaserviceprovider \
            qmediatimerange \
            qvideowidget \
-           qdeclarativeaudio \
-           qdeclarativevideo \
            qspinbox \
            qsplitter \
            qsql \
@@ -485,6 +483,9 @@ contains(QT_CONFIG,opengl):SUBDIRS += qgl qglbuffer qgl_threads
 
 contains(QT_CONFIG,qt3support):!wince*:SUBDIRS += $$Q3SUBDIRS
 
+contains(QT_CONFIG,multimedia):contains(QT_CONFIG,declarative):SUBDIRS += qdeclarativeaudio \
+                                                                          qdeclarativevideo
+
 contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
 mac: {
     SUBDIRS += macgui \
diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
index f3262ee..13bf606 100644
--- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -2,5 +2,3 @@ load(qttest_p4)
 SOURCES += tst_qdeclarativeaudio.cpp
 
 QT += multimedia declarative
-requires(contains(QT_CONFIG, multimedia))
-requires(contains(QT_CONFIG, declarative))
diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
index 0cd7879..d946bb0 100644
--- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
@@ -2,5 +2,3 @@ load(qttest_p4)
 SOURCES += tst_qdeclarativevideo.cpp
 
 QT += multimedia declarative
-requires(contains(QT_CONFIG, multimedia))
-requires(contains(QT_CONFIG, declarative))
-- 
cgit v0.12


From 91b4b6ce6684503b117817fc72b30812ab0e7722 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 26 Feb 2010 13:43:54 +1000
Subject: Tiny doc tweak.

---
 src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 623398f..333ad60 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -993,7 +993,7 @@ void QDeclarativeFlickable::setOverShoot(bool o)
     \qmlproperty int Flickable::contentWidth
     \qmlproperty int Flickable::contentHeight
 
-    The dimensions of the viewport (the surface controlled by Flickable). Typically this
+    The dimensions of the content (the surface controlled by Flickable). Typically this
     should be set to the combined size of the items placed in the Flickable.
 
     \code
-- 
cgit v0.12


From 46340f1c5f8765276701a2831d6efd45607d8ff5 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 26 Feb 2010 13:46:05 +1000
Subject: Fix ParentAnimation crash.

---
 src/declarative/util/qdeclarativeanimation.cpp | 9 ++++++---
 src/declarative/util/qdeclarativeanimation_p.h | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 6dc91de..328f0e4 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1509,6 +1509,11 @@ QDeclarativeAnimationGroup::QDeclarativeAnimationGroup(QObject *parent)
 {
 }
 
+QDeclarativeAnimationGroup::QDeclarativeAnimationGroup(QDeclarativeAnimationGroupPrivate &dd, QObject *parent)
+    : QDeclarativeAbstractAnimation(dd, parent)
+{
+}
+
 void QDeclarativeAnimationGroupPrivate::append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *a)
 {
     QDeclarativeAnimationGroup *q = qobject_cast<QDeclarativeAnimationGroup *>(list->object);
@@ -2366,10 +2371,8 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions
     }
 }
 
-
-
 QDeclarativeParentAnimation::QDeclarativeParentAnimation(QObject *parent)
-    : QDeclarativeAnimationGroup(parent)
+    : QDeclarativeAnimationGroup(*(new QDeclarativeParentAnimationPrivate), parent)
 {
     Q_D(QDeclarativeParentAnimation);
     d->topLevelGroup = new QSequentialAnimationGroup;
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index b57bd9e..0f23f5c 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -413,6 +413,9 @@ public:
 
     QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations();
     friend class QDeclarativeAbstractAnimation;
+
+protected:
+    QDeclarativeAnimationGroup(QDeclarativeAnimationGroupPrivate &dd, QObject *parent);
 };
 
 class QDeclarativeSequentialAnimation : public QDeclarativeAnimationGroup
-- 
cgit v0.12


From 93b02976b7c9c3a36cac475c1935622ebc2f1fe1 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 26 Feb 2010 11:54:04 +1000
Subject: Test, demo, and work-around bug QTBUG-8535

---
 .../webbrowser/content/FlickableWebView.qml        |  1 +
 .../content/RetractingWebBrowserHeader.qml         | 45 +++++++++++++---------
 .../graphicsitems/qdeclarativewebview.cpp          |  3 ++
 .../qdeclarativewebview/data/forward.html          |  2 +-
 .../tst_qdeclarativewebview.cpp                    |  2 +
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index e686d02..76a5813 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -2,6 +2,7 @@ import Qt 4.6
 
 Flickable {
     property alias title: webView.title
+    property alias icon: webView.icon
     property alias progress: webView.progress
     property alias url: webView.url
     property alias back: webView.back
diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
index e8c9208..94c94f2 100644
--- a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
+++ b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
@@ -13,31 +13,40 @@ Image {
                              ? -webView.contentX+webView.contentWidth-webView.width : 0
     y: webView.contentY < 0 ? -webView.contentY : progressOff*
                             (webView.contentY>height?-height:-webView.contentY)
-    Text {
-        id: headerText
+    Row {
+        id: headerTitle
 
-        text: webView.title!='' || webView.progress == 1.0 ? webView.title : 'Loading...'
-        elide: Text.ElideRight
+        anchors.top: header.top
+        anchors.topMargin: 4
+        anchors.horizontalCenter: parent.horizontalCenter
+        spacing: 6
 
-        color: "white"
-        styleColor: "black"
-        style: Text.Raised
+        Image {
+            id: headerIcon
+            pixmap: webView.icon
+        }
 
-        font.family: "Helvetica"
-        font.pointSize: 10
-        font.bold: true
+        Text {
+            id: headerText
 
-        anchors.left: header.left
-        anchors.right: header.right
-        anchors.leftMargin: 4
-        anchors.rightMargin: 4
-        anchors.top: header.top
-        anchors.topMargin: 4
-        horizontalAlignment: Text.AlignHCenter
+            text: webView.title!='' || webView.progress == 1.0 ? webView.title : 'Loading...'
+            elide: Text.ElideRight
+            //width: parent.width - headerIcon.width-4
+
+            color: "white"
+            styleColor: "black"
+            style: Text.Raised
+
+            font.family: "Helvetica"
+            font.pointSize: 10
+            font.bold: true
+
+            horizontalAlignment: Text.AlignHCenter
+        }
     }
     Item {
         width: parent.width
-        anchors.top: headerText.bottom
+        anchors.top: headerTitle.bottom
         anchors.topMargin: 2
         anchors.bottom: parent.bottom
 
diff --git a/src/declarative/graphicsitems/qdeclarativewebview.cpp b/src/declarative/graphicsitems/qdeclarativewebview.cpp
index 61b5b56..a2b16ba 100644
--- a/src/declarative/graphicsitems/qdeclarativewebview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativewebview.cpp
@@ -177,6 +177,8 @@ void QDeclarativeWebView::init()
 {
     Q_D(QDeclarativeWebView);
 
+    QWebSettings::enablePersistentStorage();
+
     setAcceptHoverEvents(true);
     setAcceptedMouseButtons(Qt::LeftButton);
     setFlag(QGraphicsItem::ItemHasNoContents, false);
@@ -955,6 +957,7 @@ void QDeclarativeWebView::setPage(QWebPage *page)
     connect(d->page,SIGNAL(repaintRequested(QRect)),this,SLOT(paintPage(QRect)));
     connect(d->page->mainFrame(),SIGNAL(urlChanged(QUrl)),this,SLOT(pageUrlChanged()));
     connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));
+    connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(iconChanged()));
     connect(d->page->mainFrame(), SIGNAL(iconChanged()), this, SIGNAL(iconChanged()));
     connect(d->page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)), this, SLOT(noteContentsSizeChanged(QSize)));
     connect(d->page->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(initialLayout()));
diff --git a/tests/auto/declarative/qdeclarativewebview/data/forward.html b/tests/auto/declarative/qdeclarativewebview/data/forward.html
index 030446a..62ab62d 100644
--- a/tests/auto/declarative/qdeclarativewebview/data/forward.html
+++ b/tests/auto/declarative/qdeclarativewebview/data/forward.html
@@ -1,6 +1,6 @@
 <html>
 <head><title>Forward</title>
-<link rel="icon" sizes="48x48" href="basic.png">
+<link rel="icon" sizes="32x32" href="forward.png">
 </head>
 <body leftmargin="0" marginwidth="0">
 <table width="123">
diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
index 2634825..6d16056 100644
--- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
+++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -277,6 +277,8 @@ void tst_qdeclarativewebview::historyNav()
     wv->setUrl(QUrl::fromLocalFile(SRCDIR "/data/forward.html"));
     QTRY_COMPARE(wv->progress(), 1.0);
     QCOMPARE(wv->title(),QString("Forward"));
+    QTRY_COMPARE(wv->icon().width(), 32);
+    QCOMPARE(wv->icon(),QPixmap(SRCDIR "/data/forward.png"));
     QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/forward.html")), strippedHtml(wv->html()));
     QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/forward.html"));
     QCOMPARE(wv->status(), QDeclarativeWebView::Ready);
-- 
cgit v0.12


From 4c26e112f59d6f5305717b70886b845bc904b889 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 26 Feb 2010 14:48:11 +1000
Subject: Polish QDeclarativeProperty API

---
 src/declarative/qml/qdeclarativebinding.cpp        |   4 +-
 src/declarative/qml/qdeclarativeproperty.cpp       | 111 +++++++--
 src/declarative/qml/qdeclarativeproperty.h         |  54 +++--
 src/declarative/qml/qdeclarativeproperty_p.h       |   9 +-
 src/declarative/qml/qdeclarativevme.cpp            |   6 +-
 src/declarative/util/qdeclarativestate_p.h         |   2 +
 .../tst_qdeclarativeproperty.cpp                   | 251 ++++++++++-----------
 7 files changed, 247 insertions(+), 190 deletions(-)

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index cecca65..88ca5cd 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -130,7 +130,7 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
 
         if (data->property.propertyType() == qMetaTypeId<QDeclarativeBinding *>()) {
 
-            int idx = data->property.coreIndex();
+            int idx = data->property.index();
             Q_ASSERT(idx != -1);
 
 
@@ -223,7 +223,7 @@ void QDeclarativeBinding::setEnabled(bool e, QDeclarativePropertyPrivate::WriteF
 int QDeclarativeBinding::propertyIndex()
 {
     Q_D(QDeclarativeBinding);
-    return d->bindingData()->property.coreIndex();
+    return d->bindingData()->property.index();
 }
 
 bool QDeclarativeBinding::enabled() const
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index fbea6ac..9ed760e 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -115,7 +115,6 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj)
 }
 
 /*!
-    \internal
     Creates a QDeclarativeProperty for the default property of \a obj. If there is no
     default property, an invalid QDeclarativeProperty will be created.
  */
@@ -124,6 +123,20 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj, QDeclarativeContext *ct
 {
     d->q = this;
     d->context = ctxt;
+    d->engine = ctxt?ctxt->engine():0;
+    d->initDefault(obj);
+}
+
+/*!
+    Creates a QDeclarativeProperty for the default property of \a obj. If there is no
+    default property, an invalid QDeclarativeProperty will be created.
+ */
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj, QDeclarativeEngine *engine)
+: d(new QDeclarativePropertyPrivate)
+{
+    d->q = this;
+    d->context = 0;
+    d->engine = engine;
     d->initDefault(obj);
 }
 
@@ -137,10 +150,8 @@ void QDeclarativePropertyPrivate::initDefault(QObject *obj)
 
     QMetaProperty p = QDeclarativeMetaType::defaultProperty(obj);
     core.load(p);
-    if (core.isValid()) {
-        isDefaultProperty = true;
+    if (core.isValid()) 
         object = obj;
-    }
 }
 
 /*!
@@ -155,7 +166,6 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name)
 }
 
 /*!
-    \internal
     Creates a QDeclarativeProperty for the property \a name of \a obj.
  */
 QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QDeclarativeContext *ctxt)
@@ -163,8 +173,22 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QD
 {
     d->q = this;
     d->context = ctxt;
+    d->engine = ctxt?ctxt->engine():0;
+    d->initProperty(obj, name);
+    if (!isValid()) { d->object = 0; d->context = 0; d->engine = 0; }
+}
+
+/*!
+    Creates a QDeclarativeProperty for the property \a name of \a obj.
+ */
+QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QDeclarativeEngine *engine)
+: d(new QDeclarativePropertyPrivate)
+{
+    d->q = this;
+    d->context = 0;
+    d->engine = engine;
     d->initProperty(obj, name);
-    if (!isValid()) { d->object = 0; d->context = 0; }
+    if (!isValid()) { d->object = 0; d->context = 0; d->engine = 0; }
 }
 
 Q_GLOBAL_STATIC(QDeclarativeValueTypeFactory, qmlValueTypes);
@@ -173,7 +197,6 @@ void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name
 {
     if (!obj) return;
 
-    QDeclarativeEngine *engine = context?context->engine():0;
     QDeclarativeTypeNameCache *typeNameCache = context?QDeclarativeContextPrivate::get(context)->imports:0;
 
     QStringList path = name.split(QLatin1Char('.'));
@@ -267,7 +290,7 @@ void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name
     // Property
     QDeclarativePropertyCache::Data local;
     QDeclarativePropertyCache::Data *property = 
-        QDeclarativePropertyCache::property(context?context->engine():0, currentObject, terminal, local);
+        QDeclarativePropertyCache::property(engine, currentObject, terminal, local);
     if (property && !(property->flags & QDeclarativePropertyCache::Data::IsFunction)) {
         object = currentObject;
         core = *property;
@@ -302,7 +325,6 @@ QDeclarativeProperty::QDeclarativeProperty(const QDeclarativeProperty &other)
   \value Invalid The property is invalid.
   \value Property The property is a regular Qt property.
   \value SignalProperty The property is a signal property.
-  \value Default The property is the default property.
 */
 
 /*!
@@ -413,7 +435,7 @@ QDeclarativeProperty::Type QDeclarativeProperty::type() const
     if (d->core.flags & QDeclarativePropertyCache::Data::IsFunction)
         return SignalProperty;
     else if (d->core.isValid())
-        return (Type)(Property | ((d->isDefaultProperty)?Default:0));
+        return Property;
     else
         return Invalid;
 }
@@ -427,11 +449,11 @@ bool QDeclarativeProperty::isProperty() const
 }
 
 /*!
-    Returns true if this QDeclarativeProperty represents a default property.
+    Returns true if this QDeclarativeProperty represents a QML signal property.
 */
-bool QDeclarativeProperty::isDefault() const
+bool QDeclarativeProperty::isSignalProperty() const
 {
-    return type() & Default;
+    return type() & SignalProperty;
 }
 
 /*!
@@ -448,9 +470,9 @@ QObject *QDeclarativeProperty::object() const
 QDeclarativeProperty &QDeclarativeProperty::operator=(const QDeclarativeProperty &other)
 {
     d->context = other.d->context;
+    d->engine = other.d->engine;
     d->object = other.d->object;
 
-    d->isDefaultProperty = other.d->isDefaultProperty;
     d->isNameCached = other.d->isNameCached;
     d->core = other.d->core;
     d->nameCache = other.d->nameCache;
@@ -521,7 +543,7 @@ QString QDeclarativeProperty::name() const
         } else if (d->isValueType()) {
             QString rv = d->core.name(d->object) + QLatin1Char('.');
 
-            QDeclarativeEnginePrivate *ep = d->context?QDeclarativeEnginePrivate::get(d->context->engine()):0;
+            QDeclarativeEnginePrivate *ep = d->engine?QDeclarativeEnginePrivate::get(d->engine):0;
             QDeclarativeValueType *valueType = 0;
             if (ep) valueType = ep->valueTypes[d->core.propType];
             else valueType = QDeclarativeValueTypeFactory::valueType(d->core.propType);
@@ -669,7 +691,7 @@ QDeclarativePropertyPrivate::signalExpression(const QDeclarativeProperty &that)
         QObject *child = children.at(ii);
 
         QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
-        if (signal && signal->index() == that.coreIndex()) 
+        if (signal && signal->index() == that.index()) 
             return signal->expression();
     }
 
@@ -698,7 +720,7 @@ QDeclarativePropertyPrivate::setSignalExpression(const QDeclarativeProperty &tha
         QObject *child = children.at(ii);
 
         QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
-        if (signal && signal->index() == that.coreIndex()) 
+        if (signal && signal->index() == that.index()) 
             return signal->setExpression(expr);
     }
 
@@ -730,6 +752,24 @@ QVariant QDeclarativeProperty::read() const
     return QVariant();
 }
 
+QVariant QDeclarativeProperty::read(QObject *object, const QString &name)
+{
+    QDeclarativeProperty p(object, name);
+    return p.read();
+}
+
+QVariant QDeclarativeProperty::read(QObject *object, const QString &name, QDeclarativeContext *ctxt)
+{
+    QDeclarativeProperty p(object, name, ctxt);
+    return p.read();
+}
+
+QVariant QDeclarativeProperty::read(QObject *object, const QString &name, QDeclarativeEngine *engine)
+{
+    QDeclarativeProperty p(object, name, engine);
+    return p.read();
+}
+
 QVariant QDeclarativePropertyPrivate::readValueProperty()
 {
     if(isValueType()) {
@@ -753,7 +793,7 @@ QVariant QDeclarativePropertyPrivate::readValueProperty()
         QDeclarativeListProperty<QObject> prop;
         void *args[] = { &prop, 0 };
         QMetaObject::metacall(object, QMetaObject::ReadProperty, core.coreIndex, args);
-        return QVariant::fromValue(QDeclarativeListReferencePrivate::init(prop, core.propType, context?context->engine():0));
+        return QVariant::fromValue(QDeclarativeListReferencePrivate::init(prop, core.propType, engine)); 
 
     } else {
 
@@ -952,13 +992,13 @@ bool QDeclarativePropertyPrivate::write(QObject *object, const QDeclarativePrope
 
             for (int ii = 0; ii < list.count(); ++ii) {
                 QObject *o = list.at(ii);
-                if (!canConvert(o->metaObject(), listType))
+                if (o && !canConvert(o->metaObject(), listType))
                     o = 0;
                 prop.append(&prop, (void *)o);
             }
         } else {
             QObject *o = enginePriv?enginePriv->toQObject(value):QDeclarativeMetaType::toQObject(value);
-            if (!canConvert(o->metaObject(), listType))
+            if (o && !canConvert(o->metaObject(), listType))
                 o = 0;
             prop.append(&prop, (void *)o);
         }
@@ -1014,6 +1054,26 @@ bool QDeclarativeProperty::write(const QVariant &value) const
     return QDeclarativePropertyPrivate::write(*this, value, 0);
 }
 
+bool QDeclarativeProperty::write(QObject *object, const QString &name, const QVariant &value)
+{
+    QDeclarativeProperty p(object, name);
+    return p.write(value);
+}
+
+bool QDeclarativeProperty::write(QObject *object, const QString &name, const QVariant &value, 
+                                 QDeclarativeContext *ctxt)
+{
+    QDeclarativeProperty p(object, name, ctxt);
+    return p.write(value);
+}
+
+bool QDeclarativeProperty::write(QObject *object, const QString &name, const QVariant &value, 
+                                 QDeclarativeEngine *engine)
+{
+    QDeclarativeProperty p(object, name, engine);
+    return p.write(value);
+}
+
 /*!
     Resets the property value.
 */
@@ -1041,7 +1101,7 @@ bool QDeclarativePropertyPrivate::write(const QDeclarativeProperty &that,
 /*!
     Returns true if the property has a change notifier signal, otherwise false.
 */
-bool QDeclarativeProperty::hasChangedNotifier() const
+bool QDeclarativeProperty::hasNotifySignal() const
 {
     if (type() & Property && d->object) {
         return d->object->metaObject()->property(d->core.coreIndex).hasNotifySignal();
@@ -1056,7 +1116,7 @@ bool QDeclarativeProperty::hasChangedNotifier() const
     Some properties, such as attached properties or those whose value never 
     changes, do not require a change notifier.
 */
-bool QDeclarativeProperty::needsChangedNotifier() const
+bool QDeclarativeProperty::needsNotifySignal() const
 {
     return type() & Property && !property().isConstant();
 }
@@ -1069,7 +1129,7 @@ bool QDeclarativeProperty::needsChangedNotifier() const
     change notifier signal, or if the \a dest object does
     not have the specified \a method.
 */
-bool QDeclarativeProperty::connectNotifier(QObject *dest, int method) const
+bool QDeclarativeProperty::connectNotifySignal(QObject *dest, int method) const
 {
     if (!(type() & Property) || !d->object)
         return false;
@@ -1090,7 +1150,7 @@ bool QDeclarativeProperty::connectNotifier(QObject *dest, int method) const
     change notifier signal, or if the \a dest object does
     not have the specified \a slot.
 */
-bool QDeclarativeProperty::connectNotifier(QObject *dest, const char *slot) const
+bool QDeclarativeProperty::connectNotifySignal(QObject *dest, const char *slot) const
 {
     if (!(type() & Property) || !d->object)
         return false;
@@ -1107,7 +1167,7 @@ bool QDeclarativeProperty::connectNotifier(QObject *dest, const char *slot) cons
 /*!
     Return the Qt metaobject index of the property.
 */
-int QDeclarativeProperty::coreIndex() const
+int QDeclarativeProperty::index() const
 {
     return d->core.coreIndex;
 }
@@ -1164,6 +1224,7 @@ QDeclarativePropertyPrivate::restore(const QByteArray &data, QObject *object, QD
 
     prop.d->object = object;
     prop.d->context = ctxt;
+    prop.d->engine = ctxt?ctxt->engine():0;
 
     const SerializedData *sd = (const SerializedData *)data.constData();
     if (sd->isValueType) {
diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h
index 3504a15..73bccf3 100644
--- a/src/declarative/qml/qdeclarativeproperty.h
+++ b/src/declarative/qml/qdeclarativeproperty.h
@@ -51,11 +51,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QObject;
-class QDeclarativeAbstractBinding;
-class QDeclarativeExpression;
-class QStringList;
 class QVariant;
-struct QMetaObject;
 class QDeclarativeContext;
 class QDeclarativeEngine;
 
@@ -70,10 +66,10 @@ public:
         Normal
     };
 
-    enum Type { Invalid = 0x00, 
-                Property = 0x01, 
-                SignalProperty = 0x02,
-                Default = 0x08
+    enum Type { 
+        Invalid,
+        Property,
+        SignalProperty
     };
 
     QDeclarativeProperty();
@@ -81,45 +77,55 @@ public:
 
     QDeclarativeProperty(QObject *);
     QDeclarativeProperty(QObject *, QDeclarativeContext *);
+    QDeclarativeProperty(QObject *, QDeclarativeEngine *);
 
     QDeclarativeProperty(QObject *, const QString &);
     QDeclarativeProperty(QObject *, const QString &, QDeclarativeContext *);
+    QDeclarativeProperty(QObject *, const QString &, QDeclarativeEngine *);
 
     QDeclarativeProperty(const QDeclarativeProperty &);
     QDeclarativeProperty &operator=(const QDeclarativeProperty &);
 
+    bool operator==(const QDeclarativeProperty &) const;
+
+    Type type() const;
+    bool isValid() const;
+    bool isProperty() const;
+    bool isSignalProperty() const;
+
+    int propertyType() const;
+    PropertyTypeCategory propertyTypeCategory() const;
+    const char *propertyTypeName() const;
+
     QString name() const;
 
     QVariant read() const;
+    static QVariant read(QObject *, const QString &);
+    static QVariant read(QObject *, const QString &, QDeclarativeContext *);
+    static QVariant read(QObject *, const QString &, QDeclarativeEngine *);
+
     bool write(const QVariant &) const;
+    static bool write(QObject *, const QString &, const QVariant &);
+    static bool write(QObject *, const QString &, const QVariant &, QDeclarativeContext *);
+    static bool write(QObject *, const QString &, const QVariant &, QDeclarativeEngine *);
+
     bool reset() const;
 
-    bool hasChangedNotifier() const;
-    bool needsChangedNotifier() const;
-    bool connectNotifier(QObject *dest, const char *slot) const;
-    bool connectNotifier(QObject *dest, int method) const;
+    bool hasNotifySignal() const;
+    bool needsNotifySignal() const;
+    bool connectNotifySignal(QObject *dest, const char *slot) const;
+    bool connectNotifySignal(QObject *dest, int method) const;
 
-    Type type() const;
-    bool isProperty() const;
-    bool isDefault() const;
     bool isWritable() const;
     bool isDesignable() const;
     bool isResettable() const;
-    bool isValid() const;
     QObject *object() const;
 
-    int propertyType() const;
-    PropertyTypeCategory propertyTypeCategory() const;
-    const char *propertyTypeName() const;
-
-    bool operator==(const QDeclarativeProperty &) const;
-
-    int coreIndex() const;
+    int index() const;
     QMetaProperty property() const;
     QMetaMethod method() const;
 
 private:
-    friend class QDeclarativeEnginePrivate;
     friend class QDeclarativePropertyPrivate;
     QDeclarativePropertyPrivate *d;
 };
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h
index eb5fa9a..1fda7f4 100644
--- a/src/declarative/qml/qdeclarativeproperty_p.h
+++ b/src/declarative/qml/qdeclarativeproperty_p.h
@@ -64,6 +64,7 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeContext;
 class QDeclarativeEnginePrivate;
+class QDeclarativeExpression;
 class Q_AUTOTEST_EXPORT QDeclarativePropertyPrivate
 {
 public:
@@ -71,20 +72,20 @@ public:
     Q_DECLARE_FLAGS(WriteFlags, WriteFlag)
 
     QDeclarativePropertyPrivate()
-        : q(0), context(0), object(0), isDefaultProperty(false), isNameCached(false) {}
+        : q(0), context(0), engine(0), object(0), isNameCached(false) {}
           
 
     QDeclarativePropertyPrivate(const QDeclarativePropertyPrivate &other)
-        : q(0), context(other.context), object(other.object), 
-          isDefaultProperty(other.isDefaultProperty), isNameCached(other.isNameCached),
+        : q(0), context(other.context), engine(other.engine), object(other.object), 
+          isNameCached(other.isNameCached),
           core(other.core), nameCache(other.nameCache),
           valueType(other.valueType) {}
 
     QDeclarativeProperty *q;
     QDeclarativeContext *context;
+    QDeclarativeEngine *engine;
     QDeclarativeGuard<QObject> object;
 
-    bool isDefaultProperty:1;
     bool isNameCached:1;
     QDeclarativePropertyCache::Data core;
     QString nameCache;
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index baa98bd..720b496 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -525,7 +525,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                     if (!QMetaObject::checkConnectArgs(prop.method().signature(), method.signature()))
                         VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Cannot connect mismatched signal/slot %1 %vs. %2").arg(QString::fromLatin1(method.signature())).arg(QString::fromLatin1(prop.method().signature())));
 
-                    QMetaObject::connect(target, prop.coreIndex(), assign, method.methodIndex());
+                    QMetaObject::connect(target, prop.index(), assign, method.methodIndex());
 
                 } else {
                     VME_EXCEPTION(QCoreApplication::translate("QDeclarativeVME","Cannot assign an object to signal property %1").arg(QString::fromUtf8(pr)));
@@ -593,7 +593,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 QDeclarativeProperty mp = 
                     QDeclarativePropertyPrivate::restore(datas.at(instr.assignBinding.property), target, ctxt);
 
-                int coreIndex = mp.coreIndex();
+                int coreIndex = mp.index();
 
                 if (stack.count() == 1 && bindingSkipList.testBit(coreIndex))  
                     break;
@@ -648,7 +648,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
                 obj->setParent(target);
                 vi->setTarget(prop);
                 QDeclarativeVMEMetaObject *mo = static_cast<QDeclarativeVMEMetaObject *>((QMetaObject*)target->metaObject());
-                mo->registerInterceptor(prop.coreIndex(), QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), vi);
+                mo->registerInterceptor(prop.index(), QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), vi);
             }
             break;
 
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index abdbec5..0c6e7a3 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -53,7 +53,9 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeActionEvent;
+class QDeclarativeAbstractBinding;
 class QDeclarativeBinding;
+class QDeclarativeExpression;
 class Q_DECLARATIVE_EXPORT QDeclarativeAction
 {
 public:
diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
index c72c9e7..0333d98 100644
--- a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
+++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
@@ -140,18 +140,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty()
     QCOMPARE(prop.name(), QString());
     QCOMPARE(prop.read(), QVariant());
     QCOMPARE(prop.write(QVariant()), false);
-    QCOMPARE(prop.hasChangedNotifier(), false);
-    QCOMPARE(prop.needsChangedNotifier(), false);
-    QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-    QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-    QCOMPARE(prop.connectNotifier(obj, 0), false);
-    QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-    QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-    QCOMPARE(prop.connectNotifier(obj, -1), false);
+    QCOMPARE(prop.hasNotifySignal(), false);
+    QCOMPARE(prop.needsNotifySignal(), false);
+    QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+    QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+    QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+    QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+    QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+    QCOMPARE(prop.connectNotifySignal(obj, -1), false);
     QVERIFY(prop.method().signature() == 0);
     QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
     QCOMPARE(prop.isProperty(), false);
-    QCOMPARE(prop.isDefault(), false);
     QCOMPARE(prop.isWritable(), false);
     QCOMPARE(prop.isDesignable(), false);
     QCOMPARE(prop.isResettable(), false);
@@ -167,7 +166,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty()
     QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
     QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
     QVERIFY(expression == 0);
-    QCOMPARE(prop.coreIndex(), -1);
+    QCOMPARE(prop.index(), -1);
     QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
     delete obj;
@@ -234,18 +233,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object()
         QCOMPARE(prop.name(), QString());
         QCOMPARE(prop.read(), QVariant());
         QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), false);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
         QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
         QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), false);
         QCOMPARE(prop.isResettable(), false);
@@ -261,7 +259,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object()
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(prop.index(), -1);
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -281,18 +279,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object()
         QCOMPARE(prop.name(), QString("defaultProperty"));
         QCOMPARE(prop.read(), QVariant(10));
         QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), true);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), (QDeclarativeProperty::Type)(QDeclarativeProperty::Property | QDeclarativeProperty::Default));
+        QCOMPARE(prop.type(), QDeclarativeProperty::Property);
         QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), true);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), true);
         QCOMPARE(prop.isResettable(), false);
@@ -310,7 +307,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object()
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(prop.index(), dobject.metaObject()->indexOfProperty("defaultProperty"));
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -335,18 +332,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.name(), QString());
         QCOMPARE(prop.read(), QVariant());
         QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), false);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
         QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
         QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), false);
         QCOMPARE(prop.isResettable(), false);
@@ -362,7 +358,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(prop.index(), -1);
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -382,18 +378,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.name(), QString("defaultProperty"));
         QCOMPARE(prop.read(), QVariant(10));
         QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), true);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
         QCOMPARE(prop.type(), QDeclarativeProperty::Property);
         QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), true);
         QCOMPARE(prop.isResettable(), false);
@@ -411,7 +406,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(prop.index(), dobject.metaObject()->indexOfProperty("defaultProperty"));
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -431,18 +426,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.name(), QString("onClicked"));
         QCOMPARE(prop.read(), QVariant());
         QCOMPARE(prop.write(QVariant("Hello")), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), false);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
         QCOMPARE(prop.type(), QDeclarativeProperty::SignalProperty);
         QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), false);
         QCOMPARE(prop.isResettable(), false);
@@ -459,7 +453,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression != 0);
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == expression);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
+        QCOMPARE(prop.index(), dobject.metaObject()->indexOfMethod("clicked()"));
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -479,18 +473,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.name(), QString("onOddlyNamedNotifySignal"));
         QCOMPARE(prop.read(), QVariant());
         QCOMPARE(prop.write(QVariant("Hello")), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), false);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QCOMPARE(QString(prop.method().signature()), QString("oddlyNamedNotifySignal()"));
         QCOMPARE(prop.type(), QDeclarativeProperty::SignalProperty);
         QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), false);
         QCOMPARE(prop.isResettable(), false);
@@ -507,7 +500,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string()
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression != 0);
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == expression);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("oddlyNamedNotifySignal()"));
+        QCOMPARE(prop.index(), dobject.metaObject()->indexOfMethod("oddlyNamedNotifySignal()"));
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -532,18 +525,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.name(), QString());
         QCOMPARE(prop.read(), QVariant());
         QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), false);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
         QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
         QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), false);
         QCOMPARE(prop.isResettable(), false);
@@ -559,7 +551,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_context()
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(prop.index(), -1);
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -579,18 +571,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.name(), QString("defaultProperty"));
         QCOMPARE(prop.read(), QVariant(10));
         QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), true);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), (QDeclarativeProperty::Type)(QDeclarativeProperty::Property | QDeclarativeProperty::Default));
+        QCOMPARE(prop.type(), QDeclarativeProperty::Property);
         QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), true);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), true);
         QCOMPARE(prop.isResettable(), false);
@@ -608,7 +599,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_context()
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(prop.index(), dobject.metaObject()->indexOfProperty("defaultProperty"));
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -633,18 +624,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.name(), QString());
         QCOMPARE(prop.read(), QVariant());
         QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), false);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
         QCOMPARE(prop.type(), QDeclarativeProperty::Invalid);
         QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), false);
         QCOMPARE(prop.isResettable(), false);
@@ -660,7 +650,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), -1);
+        QCOMPARE(prop.index(), -1);
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -680,18 +670,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.name(), QString("defaultProperty"));
         QCOMPARE(prop.read(), QVariant(10));
         QCOMPARE(prop.write(QVariant()), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), true);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), true);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
         QCOMPARE(prop.type(), QDeclarativeProperty::Property);
         QCOMPARE(prop.isProperty(), true);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), true);
         QCOMPARE(prop.isResettable(), false);
@@ -709,7 +698,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == 0);
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression == 0);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty"));
+        QCOMPARE(prop.index(), dobject.metaObject()->indexOfProperty("defaultProperty"));
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -729,18 +718,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.name(), QString("onClicked"));
         QCOMPARE(prop.read(), QVariant());
         QCOMPARE(prop.write(QVariant("Hello")), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), false);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
         QCOMPARE(prop.type(), QDeclarativeProperty::SignalProperty);
         QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), false);
         QCOMPARE(prop.isResettable(), false);
@@ -757,7 +745,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression != 0);
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == expression);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()"));
+        QCOMPARE(prop.index(), dobject.metaObject()->indexOfMethod("clicked()"));
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
@@ -777,18 +765,17 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.name(), QString("onOddlyNamedNotifySignal"));
         QCOMPARE(prop.read(), QVariant());
         QCOMPARE(prop.write(QVariant("Hello")), false);
-        QCOMPARE(prop.hasChangedNotifier(), false);
-        QCOMPARE(prop.needsChangedNotifier(), false);
-        QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false);
-        QCOMPARE(prop.connectNotifier(obj, 0), false);
-        QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
-        QCOMPARE(prop.connectNotifier(obj, -1), false);
+        QCOMPARE(prop.hasNotifySignal(), false);
+        QCOMPARE(prop.needsNotifySignal(), false);
+        QCOMPARE(prop.connectNotifySignal(0, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, SLOT(deleteLater())), false);
+        QCOMPARE(prop.connectNotifySignal(obj, 0), false);
+        QCOMPARE(prop.connectNotifySignal(0, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
+        QCOMPARE(prop.connectNotifySignal(obj, -1), false);
         QCOMPARE(QString(prop.method().signature()), QString("oddlyNamedNotifySignal()"));
         QCOMPARE(prop.type(), QDeclarativeProperty::SignalProperty);
         QCOMPARE(prop.isProperty(), false);
-        QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
         QCOMPARE(prop.isDesignable(), false);
         QCOMPARE(prop.isResettable(), false);
@@ -805,7 +792,7 @@ void tst_qdeclarativeproperty::qmlmetaproperty_object_string_context()
         QVERIFY(QDeclarativePropertyPrivate::setSignalExpression(prop, expression) == 0);
         QVERIFY(expression != 0);
         QVERIFY(QDeclarativePropertyPrivate::signalExpression(prop) == expression);
-        QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("oddlyNamedNotifySignal()"));
+        QCOMPARE(prop.index(), dobject.metaObject()->indexOfMethod("oddlyNamedNotifySignal()"));
         QCOMPARE(QDeclarativePropertyPrivate::valueTypeCoreIndex(prop), -1);
 
         delete obj;
-- 
cgit v0.12


From dfda902012adee3869a1619ba96d9c0b1bf339f2 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 26 Feb 2010 16:21:39 +1000
Subject: Make Flickable overshoot behavior nicer.

---
 .../graphicsitems/qdeclarativeflickable.cpp        | 67 ++++++++++++++++------
 .../graphicsitems/qdeclarativeflickable_p_p.h      |  2 +
 .../graphicsitems/qdeclarativelistview.cpp         | 16 +++---
 3 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 333ad60..3f4a9ce 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -128,7 +128,7 @@ QDeclarativeFlickablePrivate::QDeclarativeFlickablePrivate()
     , vWidth(-1), vHeight(-1), overShoot(true), flicked(false), moving(false), stealMouse(false)
     , pressed(false), atXEnd(false), atXBeginning(true), atYEnd(false), atYBeginning(true)
     , interactive(true), deceleration(500), maxVelocity(2000), reportedVelocitySmoothing(100)
-    , delayedPressEvent(0), delayedPressTarget(0), pressDelay(0), fixupDuration(200)
+    , delayedPressEvent(0), delayedPressTarget(0), pressDelay(0), fixupDuration(600)
     , horizontalVelocity(this), verticalVelocity(this), vTime(0), visibleArea(0)
     , flickDirection(QDeclarativeFlickable::AutoFlickDirection)
 {
@@ -148,6 +148,23 @@ void QDeclarativeFlickablePrivate::init()
     QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(widthChange()));
 }
 
+/*
+    Returns the amount to overshoot by given a velocity.
+    Will be roughly in range 0 - size/4
+*/
+qreal QDeclarativeFlickablePrivate::overShootDistance(qreal velocity, qreal size)
+{
+    Q_Q(QDeclarativeFlickable);
+    if (maxVelocity <= 0)
+        return 0.0;
+
+    velocity = qAbs(velocity);
+    if (velocity > maxVelocity)
+        velocity = maxVelocity;
+    qreal dist = size / 4 * velocity / maxVelocity;
+    return dist;
+}
+
 void QDeclarativeFlickablePrivate::flickX(qreal velocity)
 {
     Q_Q(QDeclarativeFlickable);
@@ -156,12 +173,12 @@ void QDeclarativeFlickablePrivate::flickX(qreal velocity)
     if (velocity > 0) {
         const qreal minX = q->minXExtent();
         if (_moveX.value() < minX)
-            maxDistance = qAbs(minX -_moveX.value() + (overShoot?30:0));
+            maxDistance = qAbs(minX -_moveX.value() + (overShoot?overShootDistance(velocity,q->width()):0));
         flickTargetX = minX;
     } else {
         const qreal maxX = q->maxXExtent();
         if (_moveX.value() > maxX)
-            maxDistance = qAbs(maxX - _moveX.value()) + (overShoot?30:0);
+            maxDistance = qAbs(maxX - _moveX.value()) + (overShoot?overShootDistance(velocity,q->width()):0);
         flickTargetX = maxX;
     }
     if (maxDistance > 0) {
@@ -194,12 +211,12 @@ void QDeclarativeFlickablePrivate::flickY(qreal velocity)
     if (velocity > 0) {
         const qreal minY = q->minYExtent();
         if (_moveY.value() < minY)
-            maxDistance = qAbs(minY -_moveY.value() + (overShoot?30:0));
+            maxDistance = qAbs(minY -_moveY.value() + (overShoot?overShootDistance(velocity,q->height()):0));
         flickTargetY = minY;
     } else {
         const qreal maxY = q->maxYExtent();
         if (_moveY.value() > maxY)
-            maxDistance = qAbs(maxY - _moveY.value()) + (overShoot?30:0);
+            maxDistance = qAbs(maxY - _moveY.value()) + (overShoot?overShootDistance(velocity,q->height()):0);
         flickTargetY = maxY;
     }
     if (maxDistance > 0) {
@@ -233,18 +250,24 @@ void QDeclarativeFlickablePrivate::fixupX()
     if (_moveX.value() > q->minXExtent() || (q->maxXExtent() > q->minXExtent())) {
         timeline.reset(_moveX);
         if (_moveX.value() != q->minXExtent()) {
-            if (fixupDuration)
-                timeline.move(_moveX, q->minXExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-            else
-                _moveY.setValue(q->minYExtent());
+            if (fixupDuration) {
+                qreal dist = q->minXExtent() - _moveX;
+                timeline.move(_moveX, q->minXExtent() - dist/2, QEasingCurve(QEasingCurve::InQuad), fixupDuration/4);
+                timeline.move(_moveX, q->minXExtent(), QEasingCurve(QEasingCurve::OutQuint), 3*fixupDuration/4);
+            } else {
+                _moveX.setValue(q->minXExtent());
+            }
         }
         //emit flickingChanged();
     } else if (_moveX.value() < q->maxXExtent()) {
         timeline.reset(_moveX);
-        if (fixupDuration)
-            timeline.move(_moveX,  q->maxXExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-        else
-            _moveY.setValue(q->maxYExtent());
+        if (fixupDuration) {
+            qreal dist = q->maxXExtent() - _moveX;
+            timeline.move(_moveX, q->maxXExtent() - dist/2, QEasingCurve(QEasingCurve::InQuad), fixupDuration/4);
+            timeline.move(_moveX, q->maxXExtent(), QEasingCurve(QEasingCurve::OutQuint), 3*fixupDuration/4);
+        } else {
+            _moveX.setValue(q->maxXExtent());
+        }
         //emit flickingChanged();
     } else {
         flicked = false;
@@ -272,18 +295,24 @@ void QDeclarativeFlickablePrivate::fixupY()
     if (_moveY.value() > q->minYExtent() || (q->maxYExtent() > q->minYExtent())) {
         timeline.reset(_moveY);
         if (_moveY.value() != q->minYExtent()) {
-            if (fixupDuration)
-                timeline.move(_moveY, q->minYExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-            else
+            if (fixupDuration) {
+                qreal dist = q->minYExtent() - _moveY;
+                timeline.move(_moveY, q->minYExtent() - dist/2, QEasingCurve(QEasingCurve::InQuad), fixupDuration/4);
+                timeline.move(_moveY, q->minYExtent(), QEasingCurve(QEasingCurve::OutQuint), 3*fixupDuration/4);
+            } else {
                 _moveY.setValue(q->minYExtent());
+            }
         }
         //emit flickingChanged();
     } else if (_moveY.value() < q->maxYExtent()) {
         timeline.reset(_moveY);
-        if (fixupDuration)
-            timeline.move(_moveY,  q->maxYExtent(), QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
-        else
+        if (fixupDuration) {
+            qreal dist = q->maxYExtent() - _moveY;
+            timeline.move(_moveY, q->maxYExtent() - dist/2, QEasingCurve(QEasingCurve::InQuad), fixupDuration/4);
+            timeline.move(_moveY, q->maxYExtent(), QEasingCurve(QEasingCurve::OutQuint), 3*fixupDuration/4);
+        } else {
             _moveY.setValue(q->maxYExtent());
+        }
         //emit flickingChanged();
     } else {
         flicked = false;
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
index dc3a8a2..1ff4f92 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
@@ -85,6 +85,8 @@ public:
     void setRoundedViewportX(qreal x);
     void setRoundedViewportY(qreal y);
 
+    qreal overShootDistance(qreal velocity, qreal size);
+
 public:
     QDeclarativeItem *viewport;
     QDeclarativeTimeLineValueProxy<QDeclarativeFlickablePrivate> _moveX;
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 6421018..c496c97 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1073,7 +1073,7 @@ void QDeclarativeListViewPrivate::fixupY()
             qreal pos = currentItem->position() - highlightRangeStart;
             timeline.reset(_moveY);
             if (fixupDuration)
-                timeline.move(_moveY, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+                timeline.move(_moveY, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
             else
                 _moveY.setValue(-pos);
             vTime = timeline.time();
@@ -1085,7 +1085,7 @@ void QDeclarativeListViewPrivate::fixupY()
             if (dist > 0) {
                 timeline.reset(_moveY);
                 if (fixupDuration)
-                    timeline.move(_moveY, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration);
+                    timeline.move(_moveY, -pos, QEasingCurve(QEasingCurve::InOutQuad), fixupDuration/2);
                 else
                     _moveY.setValue(-pos);
                 vTime = timeline.time();
@@ -1155,7 +1155,7 @@ void QDeclarativeListViewPrivate::flickX(qreal velocity)
             if (FxListItem *item = firstVisibleItem())
                 maxDistance = qAbs(item->position() + _moveX.value());
         } else if (_moveX.value() < minX) {
-            maxDistance = qAbs(minX -_moveX.value() + (overShoot?30:0));
+            maxDistance = qAbs(minX -_moveX.value() + (overShoot?overShootDistance(velocity, q->width()):0));
         }
         if (snapMode != QDeclarativeListView::SnapToItem && highlightRange != QDeclarativeListView::StrictlyEnforceRange)
             flickTargetX = minX;
@@ -1164,7 +1164,7 @@ void QDeclarativeListViewPrivate::flickX(qreal velocity)
             if (FxListItem *item = nextVisibleItem())
                 maxDistance = qAbs(item->position() + _moveX.value());
         } else if (_moveX.value() > maxX) {
-            maxDistance = qAbs(maxX - _moveX.value()) + (overShoot?30:0);
+            maxDistance = qAbs(maxX - _moveX.value()) + (overShoot?overShootDistance(velocity, q->width()):0);
         }
         if (snapMode != QDeclarativeListView::SnapToItem && highlightRange != QDeclarativeListView::StrictlyEnforceRange)
             flickTargetX = maxX;
@@ -1196,7 +1196,7 @@ void QDeclarativeListViewPrivate::flickX(qreal velocity)
                 overshootDist = 0.0;
             } else {
                 flickTargetX = velocity > 0 ? minX : maxX;
-                overshootDist = overShoot ? 30 : 0;
+                overshootDist = overShoot ? overShootDistance(v, q->width()) : 0;
             }
             timeline.reset(_moveX);
             timeline.accel(_moveX, v, accel, maxDistance + overshootDist);
@@ -1253,7 +1253,7 @@ void QDeclarativeListViewPrivate::flickY(qreal velocity)
             if (FxListItem *item = firstVisibleItem())
                 maxDistance = qAbs(item->position() + _moveY.value());
         } else if (_moveY.value() < minY) {
-            maxDistance = qAbs(minY -_moveY.value() + (overShoot?30:0));
+            maxDistance = qAbs(minY -_moveY.value() + (overShoot?overShootDistance(velocity, q->height()):0));
         }
         if (snapMode != QDeclarativeListView::SnapToItem && highlightRange != QDeclarativeListView::StrictlyEnforceRange)
             flickTargetY = minY;
@@ -1262,7 +1262,7 @@ void QDeclarativeListViewPrivate::flickY(qreal velocity)
             if (FxListItem *item = nextVisibleItem())
                 maxDistance = qAbs(item->position() + _moveY.value());
         } else if (_moveY.value() > maxY) {
-            maxDistance = qAbs(maxY - _moveY.value()) + (overShoot?30:0);
+            maxDistance = qAbs(maxY - _moveY.value()) + (overShoot?overShootDistance(velocity, q->height()):0);
         }
         if (snapMode != QDeclarativeListView::SnapToItem && highlightRange != QDeclarativeListView::StrictlyEnforceRange)
             flickTargetY = maxY;
@@ -1294,7 +1294,7 @@ void QDeclarativeListViewPrivate::flickY(qreal velocity)
                 overshootDist = 0.0;
             } else {
                 flickTargetY = velocity > 0 ? minY : maxY;
-                overshootDist = overShoot ? 30 : 0;
+                overshootDist = overShoot ? overShootDistance(v, q->height()) : 0;
             }
             timeline.reset(_moveY);
             timeline.accel(_moveY, v, accel, maxDistance + overshootDist);
-- 
cgit v0.12


From 1156821731078b0f0b31066632de091754bc6d52 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Fri, 26 Feb 2010 16:29:43 +1000
Subject: update painted geometry on pixmapChanged rather than sourceChanged

---
 src/declarative/graphicsitems/qdeclarativeimage.cpp | 12 +++---------
 src/declarative/graphicsitems/qdeclarativeimage_p.h |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 338b086..99ab053 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -127,7 +127,7 @@ QT_BEGIN_NAMESPACE
 QDeclarativeImage::QDeclarativeImage(QDeclarativeItem *parent)
     : QDeclarativeImageBase(*(new QDeclarativeImagePrivate), parent)
 {
-    connect(this, SIGNAL(sourceChanged(QUrl)), this, SLOT(updatePaintedGeometry()));
+    connect(this, SIGNAL(pixmapChanged()), this, SLOT(updatePaintedGeometry()));
 }
 
 QDeclarativeImage::QDeclarativeImage(QDeclarativeImagePrivate &dd, QDeclarativeItem *parent)
@@ -139,12 +139,6 @@ QDeclarativeImage::~QDeclarativeImage()
 {
 }
 
-void QDeclarativeImage::setSource(const QUrl &url)
-{
-    QDeclarativeImageBase::setSource(url);
-    updatePaintedGeometry();
-}
-
 /*!
     \qmlproperty QPixmap Image::pixmap
 
@@ -268,10 +262,10 @@ void QDeclarativeImage::updatePaintedGeometry()
     Q_D(QDeclarativeImage);
 
     if (d->fillMode == PreserveAspectFit) {
-        qreal widthScale = width() / qreal(d->pix.width());
-        qreal heightScale = height() / qreal(d->pix.height());
         if (!d->pix.width() || !d->pix.height())
             return;
+        qreal widthScale = width() / qreal(d->pix.width());
+        qreal heightScale = height() / qreal(d->pix.height());
         if (widthScale <= heightScale) {
             d->paintedWidth = width();
             d->paintedHeight = widthScale * qreal(d->pix.height());
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p.h
index 5b365e7..fb77ac9 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimage_p.h
@@ -76,7 +76,6 @@ public:
     qreal paintedWidth() const;
     qreal paintedHeight() const;
 
-    void setSource(const QUrl &url);
     void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
 
 Q_SIGNALS:
-- 
cgit v0.12


From bd0f827713187c95df3a5cf0e496fe18a1489971 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 26 Feb 2010 16:47:50 +1000
Subject: Doc

---
 src/declarative/qml/qdeclarativelist.cpp     | 113 +++++++++++++++++++++++++--
 src/declarative/qml/qdeclarativeproperty.cpp |  50 ++++++++++--
 2 files changed, 150 insertions(+), 13 deletions(-)

diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp
index af720d7..9691f32 100644
--- a/src/declarative/qml/qdeclarativelist.cpp
+++ b/src/declarative/qml/qdeclarativelist.cpp
@@ -85,18 +85,57 @@ void QDeclarativeListReferencePrivate::release()
         delete this;
 }
 
+/*!
+\class QDeclarativeListReference
+\brief The QDeclarativeListReference class allows the manipulation of QDeclarativeListProperty properties.
+
+QDeclarativeListReference allows programs to read from, and assign values to a QML list property in a 
+simple and type safe way.  A QDeclarativeListReference can be created by passing an object and property
+name or through a QDeclarativeProperty instance.  These two are equivalant:
+
+\code
+QDeclarativeListReference ref1(object, "children");
+
+QDeclarativeProperty ref2(object, "children");
+QDeclarativeListReference ref2 = qvariant_cast<QDeclarativeListReference>(ref2.read());
+\endcode
+
+Not all QML list properties support all operations.  A set of methods, canAppend(), canAt(), canClear() and
+canCount() allow programs to query whether an operation is supported on a given property.
+
+QML list properties are typesafe.  Only QObject's that derive from the correct base class can be assigned to
+the list.  The listElementType() method can be used to query the QMetaObject of the QObject type supported.
+Attempting to add objects of the incorrect type to a list property will fail.
+
+Like with normal lists, when accessing a list element by index, it is the callers responsibility to ensure 
+that it does not request an out of range element using the count() method before calling at().
+*/
+
+/*!
+Constructs an invalid instance.
+*/
 QDeclarativeListReference::QDeclarativeListReference()
 : d(0)
 {
 }
 
-QDeclarativeListReference::QDeclarativeListReference(QObject *o, const char *property, QDeclarativeEngine *engine)
+/*!
+Constructs a QDeclarativeListReference for \a object's \a property.  If \a property is not a list
+property, an invalid QDeclarativeListReference is created.  If \a object is destroyed after 
+the reference is constructed, it will automatically become invalid.  That is, it is safe to hold
+QDeclarativeListReference instances even after \a object is deleted.
+
+Passing \a engine is required to access some QML created list properties.  If in doubt, and an engine
+is available, pass it.
+*/
+QDeclarativeListReference::QDeclarativeListReference(QObject *object, const char *property, QDeclarativeEngine *engine)
 : d(0)
 {
-    if (!o || !property) return;
+    if (!object || !property) return;
 
     QDeclarativePropertyCache::Data local;
-    QDeclarativePropertyCache::Data *data = QDeclarativePropertyCache::property(engine, o, QLatin1String(property), local);
+    QDeclarativePropertyCache::Data *data = 
+        QDeclarativePropertyCache::property(engine, object, QLatin1String(property), local);
 
     if (!data || !(data->flags & QDeclarativePropertyCache::Data::IsQList)) return;
 
@@ -106,20 +145,22 @@ QDeclarativeListReference::QDeclarativeListReference(QObject *o, const char *pro
     if (listType == -1) return;
 
     d = new QDeclarativeListReferencePrivate;
-    d->object = o;
+    d->object = object;
     d->elementType = p?p->rawMetaObjectForType(listType):QDeclarativeMetaType::qmlType(listType)->baseMetaObject();
     d->propertyType = data->propType;
 
     void *args[] = { &d->property, 0 };
-    QMetaObject::metacall(o, QMetaObject::ReadProperty, data->coreIndex, args);
+    QMetaObject::metacall(object, QMetaObject::ReadProperty, data->coreIndex, args);
 }
 
+/*! \internal */
 QDeclarativeListReference::QDeclarativeListReference(const QDeclarativeListReference &o)
 : d(o.d)
 {
     if (d) d->addref();
 }
 
+/*! \internal */
 QDeclarativeListReference &QDeclarativeListReference::operator=(const QDeclarativeListReference &o)
 {
     if (o.d) o.d->addref();
@@ -128,60 +169,108 @@ QDeclarativeListReference &QDeclarativeListReference::operator=(const QDeclarati
     return *this;
 }
 
+/*! \internal */
 QDeclarativeListReference::~QDeclarativeListReference()
 {
     if (d) d->release();
 }
 
+/*!
+Returns true if the instance refers to a valid list property, otherwise false.
+*/
 bool QDeclarativeListReference::isValid() const
 {
     return d && d->object;
 }
 
+/*!
+Returns the list property's object.  Returns 0 if the reference is invalid.
+*/
 QObject *QDeclarativeListReference::object() const
 {
     if (isValid()) return d->object;
     else return 0;
 }
 
+/*!
+Returns the QMetaObject for the elements stored in the list property.  Returns 0 if the reference
+is invalid.
+
+The QMetaObject can be used ahead of time to determine whether a given instance can be added
+to a list.
+*/
 const QMetaObject *QDeclarativeListReference::listElementType() const
 {
     if (isValid()) return d->elementType;
     else return 0;
 }
 
+/*!
+Returns true if the list property can be appended to, otherwise false.  Returns false if the
+reference is invalid.
+
+\sa append()
+*/
 bool QDeclarativeListReference::canAppend() const
 {
     return (isValid() && d->property.append);
 }
 
+/*!
+Returns true if the list property can queried by index, otherwise false.  Returns false if the
+reference is invalid.
+
+\sa at()
+*/
 bool QDeclarativeListReference::canAt() const
 {
     return (isValid() && d->property.at);
 }
 
+/*!
+Returns true if the list property can be cleared, otherwise false.  Returns false if the
+reference is invalid.
+
+\sa clear()
+*/
 bool QDeclarativeListReference::canClear() const
 {
     return (isValid() && d->property.clear);
 }
 
+/*!
+Returns true if the list property can be queried for its element count, otherwise false.  
+Returns false if the reference is invalid.
+
+\sa count()
+*/
 bool QDeclarativeListReference::canCount() const
 {
     return (isValid() && d->property.count);
 }
 
-bool QDeclarativeListReference::append(QObject *o) const
+/*!
+Appends \a object to the list.  Returns true if the operation succeeded, otherwise false.
+
+\sa canAppend()
+*/
+bool QDeclarativeListReference::append(QObject *object) const
 {
     if (!canAppend()) return false;
 
-    if (o && !QDeclarativePropertyPrivate::canConvert(o->metaObject(), d->elementType))
+    if (object && !QDeclarativePropertyPrivate::canConvert(object->metaObject(), d->elementType))
         return false;
 
-    d->property.append(&d->property, o);
+    d->property.append(&d->property, object);
 
     return true;
 }
 
+/*!
+Returns the list element at \a index, or 0 if the operation failed.
+
+\sa canAt()
+*/
 QObject *QDeclarativeListReference::at(int index) const
 {
     if (!canAt()) return 0;
@@ -189,6 +278,11 @@ QObject *QDeclarativeListReference::at(int index) const
     return d->property.at(&d->property, index);
 }
 
+/*!
+Clears the list.  Returns true if the operation succeeded, otherwise false.
+
+\sa canClear()
+*/
 bool QDeclarativeListReference::clear() const
 {
     if (!canClear()) return false;
@@ -198,6 +292,9 @@ bool QDeclarativeListReference::clear() const
     return true;
 }
 
+/*!
+Returns the number of objects in the list, or 0 if the operation failed.
+*/
 int QDeclarativeListReference::count() const
 {
     if (!canCount()) return 0;
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index 9ed760e..e1ec2cd 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -311,10 +311,10 @@ QDeclarativeProperty::QDeclarativeProperty(const QDeclarativeProperty &other)
 
   This enum specifies a category of QML property.
 
-  \value InvalidCategory The property is invalid.
-  \value List The property is a QList pointer
+  \value InvalidCategory The property is invalid, or is a signal property.
+  \value List The property is a QDeclarativeListProperty list property
   \value Object The property is a QObject derived type pointer
-  \value Normal The property is none of the above.
+  \value Normal The property is a normal value property.
  */
 
 /*!
@@ -752,18 +752,39 @@ QVariant QDeclarativeProperty::read() const
     return QVariant();
 }
 
+/*!
+Return the \a name property value of \a object.  This method is equivalent to:
+\code
+    QDeclarativeProperty p(object, name);
+    p.read();
+\endcode
+*/
 QVariant QDeclarativeProperty::read(QObject *object, const QString &name)
 {
     QDeclarativeProperty p(object, name);
     return p.read();
 }
 
+/*!
+Return the \a name property value of \a object.  This method is equivalent to:
+\code
+    QDeclarativeProperty p(object, name, context);
+    p.read();
+\endcode
+*/
 QVariant QDeclarativeProperty::read(QObject *object, const QString &name, QDeclarativeContext *ctxt)
 {
     QDeclarativeProperty p(object, name, ctxt);
     return p.read();
 }
 
+/*!
+Return the \a name property value of \a object.  This method is equivalent to:
+\code
+    QDeclarativeProperty p(object, name, engine);
+    p.read();
+\endcode
+*/
 QVariant QDeclarativeProperty::read(QObject *object, const QString &name, QDeclarativeEngine *engine)
 {
     QDeclarativeProperty p(object, name, engine);
@@ -802,9 +823,7 @@ QVariant QDeclarativePropertyPrivate::readValueProperty()
     }
 }
 
-//###
 //writeEnumProperty MIRRORS the relelvant bit of QMetaProperty::write AND MUST BE KEPT IN SYNC!
-//###
 bool QDeclarativePropertyPrivate::writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags)
 {
     if (!object || !prop.isWritable())
@@ -1054,12 +1073,26 @@ bool QDeclarativeProperty::write(const QVariant &value) const
     return QDeclarativePropertyPrivate::write(*this, value, 0);
 }
 
+/*!
+Writes \a value to the \a name property of \a object.  This method is equivalent to:
+\code
+    QDeclarativeProperty p(object, name);
+    p.write(value);
+\endcode
+*/
 bool QDeclarativeProperty::write(QObject *object, const QString &name, const QVariant &value)
 {
     QDeclarativeProperty p(object, name);
     return p.write(value);
 }
 
+/*!
+Writes \a value to the \a name property of \a object.  This method is equivalent to:
+\code
+    QDeclarativeProperty p(object, name, ctxt);
+    p.write(value);
+\endcode
+*/
 bool QDeclarativeProperty::write(QObject *object, const QString &name, const QVariant &value, 
                                  QDeclarativeContext *ctxt)
 {
@@ -1067,6 +1100,13 @@ bool QDeclarativeProperty::write(QObject *object, const QString &name, const QVa
     return p.write(value);
 }
 
+/*!
+Writes \a value to the \a name property of \a object.  This method is equivalent to:
+\code
+    QDeclarativeProperty p(object, name, engine);
+    p.write(value);
+\endcode
+*/
 bool QDeclarativeProperty::write(QObject *object, const QString &name, const QVariant &value, 
                                  QDeclarativeEngine *engine)
 {
-- 
cgit v0.12


From e1f33f2e4689a59de2814ffdea7ea246bbfe0283 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 26 Feb 2010 17:04:38 +1000
Subject: Change Connection syntax as per QT-2822.

---
 demos/declarative/flickr/flickr-desktop.qml        |   6 +-
 demos/declarative/flickr/flickr-mobile.qml         |   6 +-
 demos/declarative/flickr/mobile/GridDelegate.qml   |   6 +-
 doc/src/declarative/elements.qdoc                  |   2 +-
 doc/src/declarative/extending.qdoc                 |   5 +-
 examples/declarative/connections/connections.qml   |   4 +-
 src/declarative/QmlChanges.txt                     |   5 +
 src/declarative/util/qdeclarativeconnection.cpp    | 250 +++++++++------------
 src/declarative/util/qdeclarativeconnection_p.h    |  43 ++--
 src/declarative/util/qdeclarativeutilmodule.cpp    |   3 +-
 .../data/test-connection.qml                       |   2 +-
 .../data/test-connection2.qml                      |   2 +-
 .../data/test-connection3.qml                      |   2 +-
 .../qdeclarativeconnection/data/trimming.qml       |   2 +-
 .../tst_qdeclarativeconnection.cpp                 |  12 +-
 15 files changed, 157 insertions(+), 193 deletions(-)

diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml
index 3a86347..99216cb 100644
--- a/demos/declarative/flickr/flickr-desktop.qml
+++ b/demos/declarative/flickr/flickr-desktop.qml
@@ -21,9 +21,9 @@ Item {
                 angle: wrapper.PathView.angle ? wrapper.PathView.angle : 0
             }
 
-            Connection {
-                sender: imageDetails; signal: "closed()"
-                script: {
+            Connections {
+                target: imageDetails
+                onClosed: {
                     if (wrapper.state == 'Details') {
                         wrapper.state = '';
                         imageDetails.photoUrl = "";
diff --git a/demos/declarative/flickr/flickr-mobile.qml b/demos/declarative/flickr/flickr-mobile.qml
index 77ccd08..21e4c49 100644
--- a/demos/declarative/flickr/flickr-mobile.qml
+++ b/demos/declarative/flickr/flickr-mobile.qml
@@ -53,9 +53,9 @@ Item {
             onButton2Clicked: if (screen.inListView == true) screen.inListView = false; else screen.inListView = true
         }
 
-        Connection {
-            sender: imageDetails; signal: "closed()"
-            script: {
+        Connections {
+            target: imageDetails
+            onClosed: {
                 if (background.state == "DetailedView") {
                     background.state = '';
                     imageDetails.photoUrl = "";
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 5722f10..7634573 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -33,9 +33,9 @@
                  Image { source: "images/gloss.png" }
              }
 
-             Connection {
-                 sender: toolBar; signal: "button2Clicked()"
-                 script: if (scaleMe.state == 'Details' ) scaleMe.state = 'Show';
+             Connections {
+                 target: toolBar
+                 onButton2Clicked: if (scaleMe.state == 'Details' ) scaleMe.state = 'Show'
              }
 
              states: [
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index da96b8e..1fd4dad 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -98,7 +98,7 @@ The following table lists the QML elements provided by the Qt Declarative module
 \o
 \list
 \o \l Script
-\o \l Connection
+\o \l Connections
 \o \l Component
 \o \l Timer
 \o \l QtObject
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index d823bf6..5aaa7bd 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -421,9 +421,8 @@ C++ signature:
 \snippet examples/declarative/extending/signal/birthdayparty.h 0
 
 In classes with multiple signals with the same name, only the final signal
-is accessible as a signal property.  Although QML provides an element,
-\l Connection, for accessing the other signals it is less elegant.  For the best
-QML API, class developers should avoid overloading signal names.
+is accessible as a signal property.  Note that signals with the same name
+but different parameters cannot be distinguished.
 
 Signal parameters become accessible by name to the assigned script.  An
 unnamed parameter cannot be accessed, so care should be taken to name all the
diff --git a/examples/declarative/connections/connections.qml b/examples/declarative/connections/connections.qml
index c140017..4692343 100644
--- a/examples/declarative/connections/connections.qml
+++ b/examples/declarative/connections/connections.qml
@@ -22,6 +22,6 @@ Rectangle {
         anchors { right: parent.right; bottom: parent.bottom; rightMargin: 10; bottomMargin: 10 }
     }
 
-    Connection { sender: leftButton; signal: "clicked()"; script: window.angle -= 90 }
-    Connection { sender: rightButton; signal: "clicked()"; script: window.angle += 90 }
+    Connections { target: leftButton; onClicked: window.angle -= 90 }
+    Connections { target: rightButton; onClicked: window.angle += 90 }
 }
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 25e0088..34e4834 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -7,6 +7,11 @@ Flickable: renamed viewportX -> contentX
 Flickable: renamed viewportY -> contentY
 Removed Flickable.reportedVelocitySmoothing
 Renamed MouseRegion -> MouseArea
+Connection: syntax and rename:
+    Connection { sender: a; signal: foo(); script: xxx }
+    Connection { sender: a; signal: bar(); script: yyy }
+  becomes:
+    Connections { target: a; onFoo: xxx; onBar: yyy }
 
 QmlView
 -------
diff --git a/src/declarative/util/qdeclarativeconnection.cpp b/src/declarative/util/qdeclarativeconnection.cpp
index e9ae74b..a180509 100644
--- a/src/declarative/util/qdeclarativeconnection.cpp
+++ b/src/declarative/util/qdeclarativeconnection.cpp
@@ -42,8 +42,10 @@
 #include "qdeclarativeconnection_p.h"
 
 #include <qdeclarativeexpression.h>
+#include <qdeclarativeproperty_p.h>
 #include <qdeclarativeboundsignal_p.h>
 #include <qdeclarativecontext.h>
+#include <qdeclarativeinfo.h>
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
@@ -52,236 +54,192 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeConnectionPrivate : public QObjectPrivate
+class QDeclarativeConnectionsPrivate : public QObjectPrivate
 {
 public:
-    QDeclarativeConnectionPrivate() : boundsignal(0), signalSender(0), scriptset(false), componentcomplete(false) {}
+    QDeclarativeConnectionsPrivate() : target(0), componentcomplete(false) {}
+
+    QList<QDeclarativeBoundSignal*> boundsignals;
+    QObject *target;
 
-    QDeclarativeBoundSignal *boundsignal;
-    QObject *signalSender;
-    QDeclarativeScriptString script;
-    bool scriptset;
-    QString signal;
     bool componentcomplete;
+
+    QByteArray data;
 };
 
 /*!
-    \qmlclass Connection QDeclarativeConnection
+    \qmlclass Connections QDeclarativeConnections
   \since 4.7
-    \brief A Connection object describes generalized connections to signals.
+    \brief A Connections object describes generalized connections to signals.
 
     When connecting to signals in QML, the usual way is to create an
     "on<Signal>" handler that reacts when a signal is received, like this:
 
     \qml
     MouseArea {
-        onClicked: { foo(x+123,y+456) }
+        onClicked: { foo(...) }
     }
     \endqml
 
     However, in some cases, it is not possible to connect to a signal in this
-    way. For example, JavaScript-in-HTML style signal properties do not allow:
+    way, such as:
 
     \list
-        \i connecting to signals with the same name but different parameters
-        \i conformance checking that parameters are correctly named
         \i multiple connections to the same signal
         \i connections outside the scope of the signal sender
-        \i signals in classes with coincidentally-named on<Signal> properties
+        \i connections to targets not defined in QML
     \endlist
 
-    When any of these are needed, the Connection object can be used instead.
+    When any of these are needed, the Connections object can be used instead.
 
-    For example, the above code can be changed to use a Connection object,
+    For example, the above code can be changed to use a Connections object,
     like this:
 
     \qml
     MouseArea {
-        Connection {
-            signal: "clicked(x,y)"
-            script: { foo(x+123,y+456) }
+        Connections {
+            onClicked: foo(...)
         }
     }
     \endqml
 
-    More generally, the Connection object can be a child of some other object than
+    More generally, the Connections object can be a child of some other object than
     the sender of the signal:
 
     \qml
     MouseArea {
-        id: mr
+        id: area
     }
     ...
-    Connection {
-        sender: mr
-        signal: "clicked(x,y)"
-        script: { foo(x+123,y+456) }
+    Connections {
+        target: area
+        onClicked: foo(...)
     }
     \endqml
 */
 
 /*!
     \internal
-    \class QDeclarativeConnection
-    \brief The QDeclarativeConnection class describes generalized connections to signals.
+    \class QDeclarativeConnections
+    \brief The QDeclarativeConnections class describes generalized connections to signals.
 
 */
-QDeclarativeConnection::QDeclarativeConnection(QObject *parent) :
-    QObject(*(new QDeclarativeConnectionPrivate), parent)
+QDeclarativeConnections::QDeclarativeConnections(QObject *parent) :
+    QObject(*(new QDeclarativeConnectionsPrivate), parent)
 {
 }
 
-QDeclarativeConnection::~QDeclarativeConnection()
+QDeclarativeConnections::~QDeclarativeConnections()
 {
-    Q_D(QDeclarativeConnection);
-    delete d->boundsignal;
 }
 
 /*!
-    \qmlproperty Object Connection::sender
+    \qmlproperty Object Connections::target
     This property holds the object that sends the signal.
 
-    By default, the sender is assumed to be the parent of the Connection.
+    By default, the target is assumed to be the parent of the Connections.
 */
-QObject *QDeclarativeConnection::signalSender() const
+QObject *QDeclarativeConnections::target() const
 {
-    Q_D(const QDeclarativeConnection);
-    return d->signalSender ? d->signalSender : parent();
+    Q_D(const QDeclarativeConnections);
+    return d->target ? d->target : parent();
 }
 
-void QDeclarativeConnection::setSignalSender(QObject *obj)
+void QDeclarativeConnections::setTarget(QObject *obj)
 {
-    Q_D(QDeclarativeConnection);
-    if (d->signalSender == obj)
+    Q_D(QDeclarativeConnections);
+    if (d->target == obj)
         return;
-    disconnectIfValid();
-    d->signalSender = obj;
-    connectIfValid();
+    foreach (QDeclarativeBoundSignal *s, d->boundsignals)
+        delete s;
+    d->boundsignals.clear();
+    d->target = obj;
+    connectSignals();
+    emit targetChanged();
 }
 
-void QDeclarativeConnection::connectIfValid()
+
+QByteArray
+QDeclarativeConnectionsParser::compile(const QList<QDeclarativeCustomParserProperty> &props)
 {
-    Q_D(QDeclarativeConnection);
-    if (!d->componentcomplete)
-        return;
-    // boundsignal must not exist
-    if ((d->signalSender || parent()) && !d->signal.isEmpty() && d->scriptset) {
-        // create
-        // XXX scope?
-        int sigIdx = -1;
-        int lparen = d->signal.indexOf(QLatin1Char('('));
-        QList<QByteArray> sigparams;
-        if (lparen >= 0 && d->signal.length() > lparen+2) {
-            QStringList l = d->signal.mid(lparen+1,d->signal.length()-lparen-2).split(QLatin1Char(','));
-            foreach (const QString &s, l) {
-                sigparams.append(s.trimmed().toUtf8());
-            }
+    QByteArray rv;
+    QDataStream ds(&rv, QIODevice::WriteOnly);
+
+    for(int ii = 0; ii < props.count(); ++ii)
+    {
+        QString propName = QString::fromUtf8(props.at(ii).name());
+        if (!propName.startsWith(QLatin1String("on")) || !propName.at(2).isUpper()) {
+            error(props.at(ii), QDeclarativeConnections::tr("Cannot assign to non-existent property \"%1\"").arg(propName));
+            return QByteArray();
         }
-        QString signalname = d->signal.left(lparen);
-        QObject *sender = d->signalSender ? d->signalSender : parent();
-        const QMetaObject *mo = sender->metaObject();
-        int methods = mo->methodCount();
-        for (int ii = 0; ii < methods; ++ii) {
-            QMetaMethod method = mo->method(ii);
-            QString methodName = QString::fromUtf8(method.signature());
-            int idx = methodName.indexOf(QLatin1Char('('));
-            methodName = methodName.left(idx);
-            if (methodName == signalname && (lparen<0 || method.parameterNames() == sigparams)) {
-                sigIdx = ii;
-                break;
+
+        QList<QVariant> values = props.at(ii).assignedValues();
+
+        for (int i = 0; i < values.count(); ++i) {
+            const QVariant &value = values.at(i);
+
+            if (value.userType() == qMetaTypeId<QDeclarativeCustomParserNode>()) {
+                error(props.at(ii), QDeclarativeConnections::tr("Connections: nested objects not allowed"));
+                return QByteArray();
+            } else if (value.userType() == qMetaTypeId<QDeclarativeCustomParserProperty>()) {
+                error(props.at(ii), QDeclarativeConnections::tr("Connections: syntax error"));
+                return QByteArray();
+            } else {
+                QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(value);
+                if (v.isScript()) {
+                    ds << propName;
+                    ds << v.asScript();
+                } else {
+                    error(props.at(ii), QDeclarativeConnections::tr("Connections: script expected"));
+                    return QByteArray();
+                }
             }
         }
-        if (sigIdx < 0) {
-            // Cannot usefully warn, since could be in middle of
-            // changing sender and signal.
-            // XXX need state change transactions to do better
-            return;
-        }
-
-        d->boundsignal = new QDeclarativeBoundSignal(qmlContext(this), d->script.script(), sender, mo->method(sigIdx), this);
     }
-}
 
-void QDeclarativeConnection::disconnectIfValid()
-{
-    Q_D(QDeclarativeConnection);
-    if (!d->componentcomplete)
-        return;
-    if ((d->signalSender || parent()) && !d->signal.isEmpty() && d->scriptset) {
-        // boundsignal must exist
-        // destroy
-        delete d->boundsignal;
-        d->boundsignal = 0;
-    }
+    return rv;
 }
 
-void QDeclarativeConnection::componentComplete()
+void QDeclarativeConnectionsParser::setCustomData(QObject *object,
+                                            const QByteArray &data)
 {
-    Q_D(QDeclarativeConnection);
-    d->componentcomplete=true;
-    connectIfValid();
+    QDeclarativeConnectionsPrivate *p =
+        static_cast<QDeclarativeConnectionsPrivate *>(QObjectPrivate::get(object));
+    p->data = data;
 }
 
 
-/*!
-    \qmlproperty script Connection::script
-    This property holds the JavaScript executed whenever the signal is sent.
-*/
-QDeclarativeScriptString QDeclarativeConnection::script() const
+void QDeclarativeConnections::connectSignals()
 {
-    Q_D(const QDeclarativeConnection);
-    return d->script;
-}
+    Q_D(QDeclarativeConnections);
+    if (!d->componentcomplete)
+        return;
 
-void QDeclarativeConnection::setScript(const QDeclarativeScriptString& script)
-{
-    Q_D(QDeclarativeConnection);
-    if ((d->signalSender || parent()) && !d->signal.isEmpty()) {
-        if (!d->scriptset) {
-            // mustn't exist - create
-            d->scriptset = true;
-            d->script = script;
-            connectIfValid();
+    QDataStream ds(d->data);
+    while (!ds.atEnd()) {
+        QString propName;
+        ds >> propName;
+        QString script;
+        ds >> script;
+        QDeclarativeProperty prop(target(), propName);
+        if (!prop.isValid()) {
+            qmlInfo(this) << tr("Cannot assign to non-existent property \"%1\"").arg(propName);
+        } else if (prop.type() & QDeclarativeProperty::SignalProperty) {
+            QDeclarativeBoundSignal *signal =
+                new QDeclarativeBoundSignal(target(), prop.method(), this);
+            signal->setExpression(new QDeclarativeExpression(qmlContext(this), script, 0));
+            d->boundsignals += signal;
         } else {
-            // must exist - update
-            d->script = script;
-            d->boundsignal->expression()->setExpression(script.script());
+            qmlInfo(this) << tr("Cannot assign to non-existent property \"%1\"").arg(propName);
         }
-    } else {
-        d->scriptset = true;
-        d->script = script;
     }
 }
 
-/*!
-    \qmlproperty string Connection::signal
-    This property holds the signal from the sender to which the script is attached.
-
-    The signal's formal parameter names must be given in parentheses:
-
-    \qml
-Connection {
-    signal: "clicked(x,y)"
-    script: { ... }
-}
-    \endqml
-*/
-QString QDeclarativeConnection::signal() const
-{
-    Q_D(const QDeclarativeConnection);
-    return d->signal;
-}
-
-void QDeclarativeConnection::setSignal(const QString& sig)
+void QDeclarativeConnections::componentComplete()
 {
-    Q_D(QDeclarativeConnection);
-    if (d->signal == sig)
-        return;
-    disconnectIfValid();
-    d->signal =  sig;
-    connectIfValid();
+    Q_D(QDeclarativeConnections);
+    d->componentcomplete=true;
+    connectSignals();
 }
 
-
-
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeconnection_p.h b/src/declarative/util/qdeclarativeconnection_p.h
index ae2efe9..3eacf12 100644
--- a/src/declarative/util/qdeclarativeconnection_p.h
+++ b/src/declarative/util/qdeclarativeconnection_p.h
@@ -39,11 +39,12 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVECONNECTION_H
-#define QDECLARATIVECONNECTION_H
+#ifndef QDECLARATIVECONNECTIONS_H
+#define QDECLARATIVECONNECTIONS_H
 
 #include <qdeclarative.h>
 #include <qdeclarativescriptstring.h>
+#include <private/qdeclarativecustomparser_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
@@ -56,37 +57,41 @@ QT_MODULE(Declarative)
 
 class QDeclarativeBoundSignal;
 class QDeclarativeContext;
-class QDeclarativeConnectionPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeConnection : public QObject, public QDeclarativeParserStatus
+class QDeclarativeConnectionsPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeConnections : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeConnection)
+    Q_DECLARE_PRIVATE(QDeclarativeConnections)
 
     Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QObject *sender READ signalSender WRITE setSignalSender)
-    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript)
-    Q_PROPERTY(QString signal READ signal WRITE setSignal)
+    Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
 
 public:
-    QDeclarativeConnection(QObject *parent=0);
-    ~QDeclarativeConnection();
+    QDeclarativeConnections(QObject *parent=0);
+    ~QDeclarativeConnections();
 
-    QObject *signalSender() const;
-    void setSignalSender(QObject *);
-    QDeclarativeScriptString script() const;
-    void setScript(const QDeclarativeScriptString&);
-    QString signal() const;
-    void setSignal(const QString&);
+    QObject *target() const;
+    void setTarget(QObject *);
+
+Q_SIGNALS:
+    void targetChanged();
 
 private:
-    void disconnectIfValid();
-    void connectIfValid();
+    void connectSignals();
     void componentComplete();
 };
 
+class QDeclarativeConnectionsParser : public QDeclarativeCustomParser
+{
+public:
+    virtual QByteArray compile(const QList<QDeclarativeCustomParserProperty> &);
+    virtual void setCustomData(QObject *, const QByteArray &);
+};
+
+
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeConnection)
+QML_DECLARE_TYPE(QDeclarativeConnections)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index 8d3d682..3d34e33 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -80,7 +80,7 @@ void QDeclarativeUtilModule::defineModule()
     QML_REGISTER_TYPE(Qt,4,6,Behavior,QDeclarativeBehavior);
     QML_REGISTER_TYPE(Qt,4,6,Binding,QDeclarativeBind);
     QML_REGISTER_TYPE(Qt,4,6,ColorAnimation,QDeclarativeColorAnimation);
-    QML_REGISTER_TYPE(Qt,4,6,Connection,QDeclarativeConnection);
+    QML_REGISTER_TYPE(Qt,4,6,Connections,QDeclarativeConnections);
     QML_REGISTER_TYPE(Qt,4,6,DateTimeFormatter,QDeclarativeDateTimeFormatter);
     QML_REGISTER_TYPE(Qt,4,6,EaseFollow,QDeclarativeEaseFollow);;
     QML_REGISTER_TYPE(Qt,4,6,FontLoader,QDeclarativeFontLoader);
@@ -118,4 +118,5 @@ void QDeclarativeUtilModule::defineModule()
 
     QML_REGISTER_CUSTOM_TYPE(Qt, 4,6, ListModel, QDeclarativeListModel, QDeclarativeListModelParser);
     QML_REGISTER_CUSTOM_TYPE(Qt, 4,6, PropertyChanges, QDeclarativePropertyChanges, QDeclarativePropertyChangesParser);
+    QML_REGISTER_CUSTOM_TYPE(Qt, 4,6, Connections, QDeclarativeConnections, QDeclarativeConnectionsParser);
 }
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
index 9534621..81ab599 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
@@ -6,5 +6,5 @@ Item {
     property bool tested: false
     signal testMe
 
-    Connection { sender: screen; signal: "widthChanged()"; script: screen.tested = true }
+    Connections { target: screen; onWidthChanged: screen.tested = true }
 }
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
index 65fe23a..22e9422 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
@@ -1,3 +1,3 @@
 import Qt 4.6
 
-Connection { id: connection; sender: connection; signal: "widthChanged()"; script: 1 == 1 }
+Connections { id: connection; target: connection; onTargetChanged: 1 == 1 }
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
index 32133f9..6e396c0 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
@@ -1,3 +1,3 @@
 import Qt 4.6
 
-Connection {}
+Connections {}
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
index c27dc46..736d5e8 100644
--- a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
@@ -6,5 +6,5 @@ Item {
     property string tested
     signal testMe(int param1, string param2)
 
-    Connection { sender: screen; signal: "testMe(param1, param2)"; script: screen.tested = param2 + param1 }
+    Connections { target: screen; onTestMe: screen.tested = param2 + param1 }
 }
diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
index adf343f..f10217c 100644
--- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
+++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -71,12 +71,10 @@ void tst_qdeclarativeconnection::defaultValues()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
-    QDeclarativeConnection *item = qobject_cast<QDeclarativeConnection*>(c.create());
+    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
 
     QVERIFY(item != 0);
-    QVERIFY(item->signalSender() == 0);
-    QCOMPARE(item->script().script(), QString());
-    QCOMPARE(item->signal(), QString());
+    QVERIFY(item->target() == 0);
 
     delete item;
 }
@@ -85,14 +83,12 @@ void tst_qdeclarativeconnection::properties()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
-    QDeclarativeConnection *item = qobject_cast<QDeclarativeConnection*>(c.create());
+    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
 
     QVERIFY(item != 0);
 
     QVERIFY(item != 0);
-    QVERIFY(item->signalSender() == item);
-    QCOMPARE(item->script().script(), QString("1 == 1"));
-    QCOMPARE(item->signal(), QString("widthChanged()"));
+    QVERIFY(item->target() == item);
 
     delete item;
 }
-- 
cgit v0.12


From 63b4ded7451913e944e2b7e016746650cfc13fe6 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 26 Feb 2010 17:08:30 +1000
Subject: Rename files to follow class name.

Task-number: QT-2822
---
 src/declarative/util/qdeclarativeconnection.cpp    | 245 ---------------------
 src/declarative/util/qdeclarativeconnection_p.h    |  98 ---------
 src/declarative/util/qdeclarativeconnections.cpp   | 245 +++++++++++++++++++++
 src/declarative/util/qdeclarativeconnections_p.h   |  98 +++++++++
 src/declarative/util/qdeclarativeutilmodule.cpp    |   2 +-
 src/declarative/util/util.pri                      |   4 +-
 tests/auto/declarative/declarative.pro             |   2 +-
 .../data/test-connection.qml                       |  10 -
 .../data/test-connection2.qml                      |   3 -
 .../data/test-connection3.qml                      |   3 -
 .../qdeclarativeconnection/data/trimming.qml       |  10 -
 .../qdeclarativeconnection.pro                     |   8 -
 .../tst_qdeclarativeconnection.cpp                 | 135 ------------
 .../data/test-connection.qml                       |  10 +
 .../data/test-connection2.qml                      |   3 +
 .../data/test-connection3.qml                      |   3 +
 .../qdeclarativeconnections/data/trimming.qml      |  10 +
 .../qdeclarativeconnection.pro                     |   8 +
 .../tst_qdeclarativeconnection.cpp                 | 135 ++++++++++++
 19 files changed, 516 insertions(+), 516 deletions(-)
 delete mode 100644 src/declarative/util/qdeclarativeconnection.cpp
 delete mode 100644 src/declarative/util/qdeclarativeconnection_p.h
 create mode 100644 src/declarative/util/qdeclarativeconnections.cpp
 create mode 100644 src/declarative/util/qdeclarativeconnections_p.h
 delete mode 100644 tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
 delete mode 100644 tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
 delete mode 100644 tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
 delete mode 100644 tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
 delete mode 100644 tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
 delete mode 100644 tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
 create mode 100644 tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnections/data/trimming.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro
 create mode 100644 tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp

diff --git a/src/declarative/util/qdeclarativeconnection.cpp b/src/declarative/util/qdeclarativeconnection.cpp
deleted file mode 100644
index a180509..0000000
--- a/src/declarative/util/qdeclarativeconnection.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativeconnection_p.h"
-
-#include <qdeclarativeexpression.h>
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativeboundsignal_p.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarativeinfo.h>
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qstringlist.h>
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeConnectionsPrivate : public QObjectPrivate
-{
-public:
-    QDeclarativeConnectionsPrivate() : target(0), componentcomplete(false) {}
-
-    QList<QDeclarativeBoundSignal*> boundsignals;
-    QObject *target;
-
-    bool componentcomplete;
-
-    QByteArray data;
-};
-
-/*!
-    \qmlclass Connections QDeclarativeConnections
-  \since 4.7
-    \brief A Connections object describes generalized connections to signals.
-
-    When connecting to signals in QML, the usual way is to create an
-    "on<Signal>" handler that reacts when a signal is received, like this:
-
-    \qml
-    MouseArea {
-        onClicked: { foo(...) }
-    }
-    \endqml
-
-    However, in some cases, it is not possible to connect to a signal in this
-    way, such as:
-
-    \list
-        \i multiple connections to the same signal
-        \i connections outside the scope of the signal sender
-        \i connections to targets not defined in QML
-    \endlist
-
-    When any of these are needed, the Connections object can be used instead.
-
-    For example, the above code can be changed to use a Connections object,
-    like this:
-
-    \qml
-    MouseArea {
-        Connections {
-            onClicked: foo(...)
-        }
-    }
-    \endqml
-
-    More generally, the Connections object can be a child of some other object than
-    the sender of the signal:
-
-    \qml
-    MouseArea {
-        id: area
-    }
-    ...
-    Connections {
-        target: area
-        onClicked: foo(...)
-    }
-    \endqml
-*/
-
-/*!
-    \internal
-    \class QDeclarativeConnections
-    \brief The QDeclarativeConnections class describes generalized connections to signals.
-
-*/
-QDeclarativeConnections::QDeclarativeConnections(QObject *parent) :
-    QObject(*(new QDeclarativeConnectionsPrivate), parent)
-{
-}
-
-QDeclarativeConnections::~QDeclarativeConnections()
-{
-}
-
-/*!
-    \qmlproperty Object Connections::target
-    This property holds the object that sends the signal.
-
-    By default, the target is assumed to be the parent of the Connections.
-*/
-QObject *QDeclarativeConnections::target() const
-{
-    Q_D(const QDeclarativeConnections);
-    return d->target ? d->target : parent();
-}
-
-void QDeclarativeConnections::setTarget(QObject *obj)
-{
-    Q_D(QDeclarativeConnections);
-    if (d->target == obj)
-        return;
-    foreach (QDeclarativeBoundSignal *s, d->boundsignals)
-        delete s;
-    d->boundsignals.clear();
-    d->target = obj;
-    connectSignals();
-    emit targetChanged();
-}
-
-
-QByteArray
-QDeclarativeConnectionsParser::compile(const QList<QDeclarativeCustomParserProperty> &props)
-{
-    QByteArray rv;
-    QDataStream ds(&rv, QIODevice::WriteOnly);
-
-    for(int ii = 0; ii < props.count(); ++ii)
-    {
-        QString propName = QString::fromUtf8(props.at(ii).name());
-        if (!propName.startsWith(QLatin1String("on")) || !propName.at(2).isUpper()) {
-            error(props.at(ii), QDeclarativeConnections::tr("Cannot assign to non-existent property \"%1\"").arg(propName));
-            return QByteArray();
-        }
-
-        QList<QVariant> values = props.at(ii).assignedValues();
-
-        for (int i = 0; i < values.count(); ++i) {
-            const QVariant &value = values.at(i);
-
-            if (value.userType() == qMetaTypeId<QDeclarativeCustomParserNode>()) {
-                error(props.at(ii), QDeclarativeConnections::tr("Connections: nested objects not allowed"));
-                return QByteArray();
-            } else if (value.userType() == qMetaTypeId<QDeclarativeCustomParserProperty>()) {
-                error(props.at(ii), QDeclarativeConnections::tr("Connections: syntax error"));
-                return QByteArray();
-            } else {
-                QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(value);
-                if (v.isScript()) {
-                    ds << propName;
-                    ds << v.asScript();
-                } else {
-                    error(props.at(ii), QDeclarativeConnections::tr("Connections: script expected"));
-                    return QByteArray();
-                }
-            }
-        }
-    }
-
-    return rv;
-}
-
-void QDeclarativeConnectionsParser::setCustomData(QObject *object,
-                                            const QByteArray &data)
-{
-    QDeclarativeConnectionsPrivate *p =
-        static_cast<QDeclarativeConnectionsPrivate *>(QObjectPrivate::get(object));
-    p->data = data;
-}
-
-
-void QDeclarativeConnections::connectSignals()
-{
-    Q_D(QDeclarativeConnections);
-    if (!d->componentcomplete)
-        return;
-
-    QDataStream ds(d->data);
-    while (!ds.atEnd()) {
-        QString propName;
-        ds >> propName;
-        QString script;
-        ds >> script;
-        QDeclarativeProperty prop(target(), propName);
-        if (!prop.isValid()) {
-            qmlInfo(this) << tr("Cannot assign to non-existent property \"%1\"").arg(propName);
-        } else if (prop.type() & QDeclarativeProperty::SignalProperty) {
-            QDeclarativeBoundSignal *signal =
-                new QDeclarativeBoundSignal(target(), prop.method(), this);
-            signal->setExpression(new QDeclarativeExpression(qmlContext(this), script, 0));
-            d->boundsignals += signal;
-        } else {
-            qmlInfo(this) << tr("Cannot assign to non-existent property \"%1\"").arg(propName);
-        }
-    }
-}
-
-void QDeclarativeConnections::componentComplete()
-{
-    Q_D(QDeclarativeConnections);
-    d->componentcomplete=true;
-    connectSignals();
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeconnection_p.h b/src/declarative/util/qdeclarativeconnection_p.h
deleted file mode 100644
index 3eacf12..0000000
--- a/src/declarative/util/qdeclarativeconnection_p.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVECONNECTIONS_H
-#define QDECLARATIVECONNECTIONS_H
-
-#include <qdeclarative.h>
-#include <qdeclarativescriptstring.h>
-#include <private/qdeclarativecustomparser_p.h>
-
-#include <QtCore/qobject.h>
-#include <QtCore/qstring.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QDeclarativeBoundSignal;
-class QDeclarativeContext;
-class QDeclarativeConnectionsPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeConnections : public QObject, public QDeclarativeParserStatus
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeConnections)
-
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
-
-public:
-    QDeclarativeConnections(QObject *parent=0);
-    ~QDeclarativeConnections();
-
-    QObject *target() const;
-    void setTarget(QObject *);
-
-Q_SIGNALS:
-    void targetChanged();
-
-private:
-    void connectSignals();
-    void componentComplete();
-};
-
-class QDeclarativeConnectionsParser : public QDeclarativeCustomParser
-{
-public:
-    virtual QByteArray compile(const QList<QDeclarativeCustomParserProperty> &);
-    virtual void setCustomData(QObject *, const QByteArray &);
-};
-
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QDeclarativeConnections)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
new file mode 100644
index 0000000..0b9e3ab
--- /dev/null
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeconnections_p.h"
+
+#include <qdeclarativeexpression.h>
+#include <qdeclarativeproperty_p.h>
+#include <qdeclarativeboundsignal_p.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeinfo.h>
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qstringlist.h>
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeConnectionsPrivate : public QObjectPrivate
+{
+public:
+    QDeclarativeConnectionsPrivate() : target(0), componentcomplete(false) {}
+
+    QList<QDeclarativeBoundSignal*> boundsignals;
+    QObject *target;
+
+    bool componentcomplete;
+
+    QByteArray data;
+};
+
+/*!
+    \qmlclass Connections QDeclarativeConnections
+  \since 4.7
+    \brief A Connections object describes generalized connections to signals.
+
+    When connecting to signals in QML, the usual way is to create an
+    "on<Signal>" handler that reacts when a signal is received, like this:
+
+    \qml
+    MouseArea {
+        onClicked: { foo(...) }
+    }
+    \endqml
+
+    However, in some cases, it is not possible to connect to a signal in this
+    way, such as:
+
+    \list
+        \i multiple connections to the same signal
+        \i connections outside the scope of the signal sender
+        \i connections to targets not defined in QML
+    \endlist
+
+    When any of these are needed, the Connections object can be used instead.
+
+    For example, the above code can be changed to use a Connections object,
+    like this:
+
+    \qml
+    MouseArea {
+        Connections {
+            onClicked: foo(...)
+        }
+    }
+    \endqml
+
+    More generally, the Connections object can be a child of some other object than
+    the sender of the signal:
+
+    \qml
+    MouseArea {
+        id: area
+    }
+    ...
+    Connections {
+        target: area
+        onClicked: foo(...)
+    }
+    \endqml
+*/
+
+/*!
+    \internal
+    \class QDeclarativeConnections
+    \brief The QDeclarativeConnections class describes generalized connections to signals.
+
+*/
+QDeclarativeConnections::QDeclarativeConnections(QObject *parent) :
+    QObject(*(new QDeclarativeConnectionsPrivate), parent)
+{
+}
+
+QDeclarativeConnections::~QDeclarativeConnections()
+{
+}
+
+/*!
+    \qmlproperty Object Connections::target
+    This property holds the object that sends the signal.
+
+    By default, the target is assumed to be the parent of the Connections.
+*/
+QObject *QDeclarativeConnections::target() const
+{
+    Q_D(const QDeclarativeConnections);
+    return d->target ? d->target : parent();
+}
+
+void QDeclarativeConnections::setTarget(QObject *obj)
+{
+    Q_D(QDeclarativeConnections);
+    if (d->target == obj)
+        return;
+    foreach (QDeclarativeBoundSignal *s, d->boundsignals)
+        delete s;
+    d->boundsignals.clear();
+    d->target = obj;
+    connectSignals();
+    emit targetChanged();
+}
+
+
+QByteArray
+QDeclarativeConnectionsParser::compile(const QList<QDeclarativeCustomParserProperty> &props)
+{
+    QByteArray rv;
+    QDataStream ds(&rv, QIODevice::WriteOnly);
+
+    for(int ii = 0; ii < props.count(); ++ii)
+    {
+        QString propName = QString::fromUtf8(props.at(ii).name());
+        if (!propName.startsWith(QLatin1String("on")) || !propName.at(2).isUpper()) {
+            error(props.at(ii), QDeclarativeConnections::tr("Cannot assign to non-existent property \"%1\"").arg(propName));
+            return QByteArray();
+        }
+
+        QList<QVariant> values = props.at(ii).assignedValues();
+
+        for (int i = 0; i < values.count(); ++i) {
+            const QVariant &value = values.at(i);
+
+            if (value.userType() == qMetaTypeId<QDeclarativeCustomParserNode>()) {
+                error(props.at(ii), QDeclarativeConnections::tr("Connections: nested objects not allowed"));
+                return QByteArray();
+            } else if (value.userType() == qMetaTypeId<QDeclarativeCustomParserProperty>()) {
+                error(props.at(ii), QDeclarativeConnections::tr("Connections: syntax error"));
+                return QByteArray();
+            } else {
+                QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(value);
+                if (v.isScript()) {
+                    ds << propName;
+                    ds << v.asScript();
+                } else {
+                    error(props.at(ii), QDeclarativeConnections::tr("Connections: script expected"));
+                    return QByteArray();
+                }
+            }
+        }
+    }
+
+    return rv;
+}
+
+void QDeclarativeConnectionsParser::setCustomData(QObject *object,
+                                            const QByteArray &data)
+{
+    QDeclarativeConnectionsPrivate *p =
+        static_cast<QDeclarativeConnectionsPrivate *>(QObjectPrivate::get(object));
+    p->data = data;
+}
+
+
+void QDeclarativeConnections::connectSignals()
+{
+    Q_D(QDeclarativeConnections);
+    if (!d->componentcomplete)
+        return;
+
+    QDataStream ds(d->data);
+    while (!ds.atEnd()) {
+        QString propName;
+        ds >> propName;
+        QString script;
+        ds >> script;
+        QDeclarativeProperty prop(target(), propName);
+        if (!prop.isValid()) {
+            qmlInfo(this) << tr("Cannot assign to non-existent property \"%1\"").arg(propName);
+        } else if (prop.type() & QDeclarativeProperty::SignalProperty) {
+            QDeclarativeBoundSignal *signal =
+                new QDeclarativeBoundSignal(target(), prop.method(), this);
+            signal->setExpression(new QDeclarativeExpression(qmlContext(this), script, 0));
+            d->boundsignals += signal;
+        } else {
+            qmlInfo(this) << tr("Cannot assign to non-existent property \"%1\"").arg(propName);
+        }
+    }
+}
+
+void QDeclarativeConnections::componentComplete()
+{
+    Q_D(QDeclarativeConnections);
+    d->componentcomplete=true;
+    connectSignals();
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeconnections_p.h b/src/declarative/util/qdeclarativeconnections_p.h
new file mode 100644
index 0000000..3eacf12
--- /dev/null
+++ b/src/declarative/util/qdeclarativeconnections_p.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECONNECTIONS_H
+#define QDECLARATIVECONNECTIONS_H
+
+#include <qdeclarative.h>
+#include <qdeclarativescriptstring.h>
+#include <private/qdeclarativecustomparser_p.h>
+
+#include <QtCore/qobject.h>
+#include <QtCore/qstring.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeBoundSignal;
+class QDeclarativeContext;
+class QDeclarativeConnectionsPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeConnections : public QObject, public QDeclarativeParserStatus
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeConnections)
+
+    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
+
+public:
+    QDeclarativeConnections(QObject *parent=0);
+    ~QDeclarativeConnections();
+
+    QObject *target() const;
+    void setTarget(QObject *);
+
+Q_SIGNALS:
+    void targetChanged();
+
+private:
+    void connectSignals();
+    void componentComplete();
+};
+
+class QDeclarativeConnectionsParser : public QDeclarativeCustomParser
+{
+public:
+    virtual QByteArray compile(const QList<QDeclarativeCustomParserProperty> &);
+    virtual void setCustomData(QObject *, const QByteArray &);
+};
+
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeConnections)
+
+QT_END_HEADER
+
+#endif
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index 3d34e33..2b8c7de 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -45,7 +45,7 @@
 #include "qdeclarativeanimation_p_p.h"
 #include "qdeclarativebehavior_p.h"
 #include "qdeclarativebind_p.h"
-#include "qdeclarativeconnection_p.h"
+#include "qdeclarativeconnections_p.h"
 #include "qdeclarativedatetimeformatter_p.h"
 #include "qdeclarativeeasefollow_p.h"
 #include "qdeclarativefontloader_p.h"
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 610eb3f..198e9e5 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -5,7 +5,7 @@ SOURCES += \
     $$PWD/qdeclarativeview.cpp \
     $$PWD/qfxperf.cpp \
     $$PWD/qperformancelog.cpp \
-    $$PWD/qdeclarativeconnection.cpp \
+    $$PWD/qdeclarativeconnections.cpp \
     $$PWD/qdeclarativepackage.cpp \
     $$PWD/qdeclarativeanimation.cpp \
     $$PWD/qdeclarativesystempalette.cpp \
@@ -37,7 +37,7 @@ HEADERS += \
     $$PWD/qdeclarativeview.h \
     $$PWD/qfxperf_p_p.h \
     $$PWD/qperformancelog_p_p.h \
-    $$PWD/qdeclarativeconnection_p.h \
+    $$PWD/qdeclarativeconnections_p.h \
     $$PWD/qdeclarativepackage_p.h \
     $$PWD/qdeclarativeanimation_p.h \
     $$PWD/qdeclarativeanimation_p_p.h \
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 42ff523..4387875 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -7,7 +7,7 @@ SUBDIRS += \
            qdeclarativeanimations \          # Cover
            qdeclarativebehaviors \           # Cover
            qdeclarativebinding \             # Cover
-           qdeclarativeconnection \          # Cover
+           qdeclarativeconnections \          # Cover
            qdeclarativecontext \             # Cover
            qdeclarativedatetimeformatter \   # Cover
            qdeclarativedebug \               # Cover
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
deleted file mode 100644
index 81ab599..0000000
--- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: screen; width: 50
-
-    property bool tested: false
-    signal testMe
-
-    Connections { target: screen; onWidthChanged: screen.tested = true }
-}
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
deleted file mode 100644
index 22e9422..0000000
--- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-Connections { id: connection; target: connection; onTargetChanged: 1 == 1 }
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
deleted file mode 100644
index 6e396c0..0000000
--- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-Connections {}
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
deleted file mode 100644
index 736d5e8..0000000
--- a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: screen; width: 50
-
-    property string tested
-    signal testMe(int param1, string param2)
-
-    Connections { target: screen; onTestMe: screen.tested = param2 + param1 }
-}
diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
deleted file mode 100644
index a6adfa4..0000000
--- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qdeclarativeconnection.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
deleted file mode 100644
index f10217c..0000000
--- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <private/qdeclarativeconnection_p.h>
-#include <private/qdeclarativeitem_p.h>
-#include "../../../shared/util.h"
-#include <QtDeclarative/qdeclarativescriptstring.h>
-
-class tst_qdeclarativeconnection : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qdeclarativeconnection();
-
-private slots:
-    void defaultValues();
-    void properties();
-    void connection();
-    void trimming();
-
-private:
-    QDeclarativeEngine engine;
-};
-
-tst_qdeclarativeconnection::tst_qdeclarativeconnection()
-{
-}
-
-void tst_qdeclarativeconnection::defaultValues()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
-    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
-
-    QVERIFY(item != 0);
-    QVERIFY(item->target() == 0);
-
-    delete item;
-}
-
-void tst_qdeclarativeconnection::properties()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
-    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
-
-    QVERIFY(item != 0);
-
-    QVERIFY(item != 0);
-    QVERIFY(item->target() == item);
-
-    delete item;
-}
-
-void tst_qdeclarativeconnection::connection()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
-    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
-
-    QVERIFY(item != 0);
-
-    QCOMPARE(item->property("tested").toBool(), false);
-    QCOMPARE(item->width(), 50.);
-    emit item->setWidth(100.);
-    QCOMPARE(item->width(), 100.);
-    QCOMPARE(item->property("tested").toBool(), true);
-
-    delete item;
-}
-
-void tst_qdeclarativeconnection::trimming()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
-    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
-
-    QVERIFY(item != 0);
-
-    QCOMPARE(item->property("tested").toString(), QString(""));
-    int index = item->metaObject()->indexOfSignal("testMe(int,QString)");
-    QMetaMethod method = item->metaObject()->method(index);
-    method.invoke(item,
-                  Qt::DirectConnection,
-                  Q_ARG(int, 5),
-                  Q_ARG(QString, "worked"));
-    QCOMPARE(item->property("tested").toString(), QString("worked5"));
-
-    delete item;
-}
-
-QTEST_MAIN(tst_qdeclarativeconnection)
-
-#include "tst_qdeclarativeconnection.moc"
diff --git a/tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml b/tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml
new file mode 100644
index 0000000..81ab599
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+Item {
+    id: screen; width: 50
+
+    property bool tested: false
+    signal testMe
+
+    Connections { target: screen; onWidthChanged: screen.tested = true }
+}
diff --git a/tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml b/tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml
new file mode 100644
index 0000000..22e9422
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+Connections { id: connection; target: connection; onTargetChanged: 1 == 1 }
diff --git a/tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml b/tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml
new file mode 100644
index 0000000..6e396c0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+Connections {}
diff --git a/tests/auto/declarative/qdeclarativeconnections/data/trimming.qml b/tests/auto/declarative/qdeclarativeconnections/data/trimming.qml
new file mode 100644
index 0000000..736d5e8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnections/data/trimming.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+Item {
+    id: screen; width: 50
+
+    property string tested
+    signal testMe(int param1, string param2)
+
+    Connections { target: screen; onTestMe: screen.tested = param2 + param1 }
+}
diff --git a/tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro
new file mode 100644
index 0000000..a6adfa4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeconnection.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp
new file mode 100644
index 0000000..f10217c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeconnection_p.h>
+#include <private/qdeclarativeitem_p.h>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativescriptstring.h>
+
+class tst_qdeclarativeconnection : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativeconnection();
+
+private slots:
+    void defaultValues();
+    void properties();
+    void connection();
+    void trimming();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qdeclarativeconnection::tst_qdeclarativeconnection()
+{
+}
+
+void tst_qdeclarativeconnection::defaultValues()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
+    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
+
+    QVERIFY(item != 0);
+    QVERIFY(item->target() == 0);
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::properties()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
+    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QVERIFY(item != 0);
+    QVERIFY(item->target() == item);
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::connection()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QCOMPARE(item->property("tested").toBool(), false);
+    QCOMPARE(item->width(), 50.);
+    emit item->setWidth(100.);
+    QCOMPARE(item->width(), 100.);
+    QCOMPARE(item->property("tested").toBool(), true);
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::trimming()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QCOMPARE(item->property("tested").toString(), QString(""));
+    int index = item->metaObject()->indexOfSignal("testMe(int,QString)");
+    QMetaMethod method = item->metaObject()->method(index);
+    method.invoke(item,
+                  Qt::DirectConnection,
+                  Q_ARG(int, 5),
+                  Q_ARG(QString, "worked"));
+    QCOMPARE(item->property("tested").toString(), QString("worked5"));
+
+    delete item;
+}
+
+QTEST_MAIN(tst_qdeclarativeconnection)
+
+#include "tst_qdeclarativeconnection.moc"
-- 
cgit v0.12


From 543c4b82e6d6cc4a396b1c105d7321643b6ef4c6 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Fri, 26 Feb 2010 17:02:43 +1000
Subject: Revert "Some animation cleanup/refactoring."

This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2.
---
 src/declarative/util/qdeclarativeanimation.cpp   | 11 +++++------
 src/declarative/util/qdeclarativeanimation_p_p.h | 21 +++++++--------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 328f0e4..181ef0a 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1572,8 +1572,7 @@ QDeclarativeSequentialAnimation::QDeclarativeSequentialAnimation(QObject *parent
     QDeclarativeAnimationGroup(parent)
 {
     Q_D(QDeclarativeAnimationGroup);
-    d->ag = new QSequentialAnimationGroup;
-    QDeclarativeGraphics_setParent_noEvent(d->ag, this);
+    d->ag = new QSequentialAnimationGroup(this);
 }
 
 QDeclarativeSequentialAnimation::~QDeclarativeSequentialAnimation()
@@ -1638,8 +1637,7 @@ QDeclarativeParallelAnimation::QDeclarativeParallelAnimation(QObject *parent) :
     QDeclarativeAnimationGroup(parent)
 {
     Q_D(QDeclarativeAnimationGroup);
-    d->ag = new QParallelAnimationGroup;
-    QDeclarativeGraphics_setParent_noEvent(d->ag, this);
+    d->ag = new QParallelAnimationGroup(this);
 }
 
 QDeclarativeParallelAnimation::~QDeclarativeParallelAnimation()
@@ -1798,7 +1796,7 @@ QDeclarativePropertyAnimation::~QDeclarativePropertyAnimation()
 void QDeclarativePropertyAnimationPrivate::init()
 {
     Q_Q(QDeclarativePropertyAnimation);
-    va = new QDeclarativeBulkValueAnimator;
+    va = new QDeclarativeTimeLineValueAnimator;
     QDeclarativeGraphics_setParent_noEvent(va, q);
 }
 
@@ -2214,7 +2212,7 @@ QAbstractAnimation *QDeclarativePropertyAnimation::qtAnimation()
     return d->va;
 }
 
-struct PropertyUpdater : public QDeclarativeBulkValueUpdater
+struct PropertyUpdater : public QDeclarativeTimeLineValue
 {
     QDeclarativeStateActions actions;
     int interpolatorType;       //for Number/ColorAnimation
@@ -2232,6 +2230,7 @@ struct PropertyUpdater : public QDeclarativeBulkValueUpdater
         wasDeleted = &deleted;
         if (reverse)    //QVariantAnimation sends us 1->0 when reversed, but we are expecting 0->1
             v = 1 - v;
+        QDeclarativeTimeLineValue::setValue(v);
         for (int ii = 0; ii < actions.count(); ++ii) {
             QDeclarativeAction &action = actions[ii];
 
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index ae82a90..e582066 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -149,21 +149,14 @@ private:
     bool running;
 };
 
-class QDeclarativeBulkValueUpdater
-{
-public:
-    virtual ~QDeclarativeBulkValueUpdater() {}
-    virtual void setValue(qreal value) = 0;
-};
-
-//animates QDeclarativeBulkValueUpdater (assumes start and end values will be reals or compatible)
-class QDeclarativeBulkValueAnimator : public QVariantAnimation
+//animates QDeclarativeTimeLineValue (assumes start and end values will be reals or compatible)
+class QDeclarativeTimeLineValueAnimator : public QVariantAnimation
 {
     Q_OBJECT
 public:
-    QDeclarativeBulkValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), fromSourced(0), policy(KeepWhenStopped) {}
-    ~QDeclarativeBulkValueAnimator() { if (policy == DeleteWhenStopped) { delete animValue; animValue = 0; } }
-    void setAnimValue(QDeclarativeBulkValueUpdater *value, DeletionPolicy p)
+    QDeclarativeTimeLineValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), fromSourced(0), policy(KeepWhenStopped) {}
+    ~QDeclarativeTimeLineValueAnimator() { if (policy == DeleteWhenStopped) { delete animValue; animValue = 0; } }
+    void setAnimValue(QDeclarativeTimeLineValue *value, DeletionPolicy p)
     {
         if (state() == Running)
             stop();
@@ -200,7 +193,7 @@ protected:
     }
 
 private:
-    QDeclarativeBulkValueUpdater *animValue;
+    QDeclarativeTimeLineValue *animValue;
     bool *fromSourced;
     DeletionPolicy policy;
 };
@@ -359,7 +352,7 @@ public:
     int interpolatorType;
     QVariantAnimation::Interpolator interpolator;
 
-    QDeclarativeBulkValueAnimator *va;
+    QDeclarativeTimeLineValueAnimator *va;
 
     static QVariant interpolateVariant(const QVariant &from, const QVariant &to, qreal progress);
     static void convertVariant(QVariant &variant, int type);
-- 
cgit v0.12


From 076f623967c08a462fb80eb5ad5dd8b96ea48127 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 26 Feb 2010 17:44:18 +1000
Subject: missed rename

---
 .../declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp
index f10217c..f4914e1 100644
--- a/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp
+++ b/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp
@@ -41,7 +41,7 @@
 #include <qtest.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
-#include <private/qdeclarativeconnection_p.h>
+#include <private/qdeclarativeconnections_p.h>
 #include <private/qdeclarativeitem_p.h>
 #include "../../../shared/util.h"
 #include <QtDeclarative/qdeclarativescriptstring.h>
-- 
cgit v0.12


From 67bb989e11cf47431e419966bff7257c028ea958 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Fri, 26 Feb 2010 22:07:17 +1000
Subject: Fixed qdeclarativeconnection test.

.pro file name must match directory name.
---
 tests/auto/declarative/declarative.pro             |   2 +-
 .../data/test-connection.qml                       |  10 ++
 .../data/test-connection2.qml                      |   3 +
 .../data/test-connection3.qml                      |   3 +
 .../qdeclarativeconnection/data/trimming.qml       |  10 ++
 .../qdeclarativeconnection.pro                     |   8 ++
 .../tst_qdeclarativeconnection.cpp                 | 135 +++++++++++++++++++++
 .../data/test-connection.qml                       |  10 --
 .../data/test-connection2.qml                      |   3 -
 .../data/test-connection3.qml                      |   3 -
 .../qdeclarativeconnections/data/trimming.qml      |  10 --
 .../qdeclarativeconnection.pro                     |   8 --
 .../tst_qdeclarativeconnection.cpp                 | 135 ---------------------
 13 files changed, 170 insertions(+), 170 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
 create mode 100644 tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
 delete mode 100644 tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml
 delete mode 100644 tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml
 delete mode 100644 tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml
 delete mode 100644 tests/auto/declarative/qdeclarativeconnections/data/trimming.qml
 delete mode 100644 tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro
 delete mode 100644 tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 4387875..42ff523 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -7,7 +7,7 @@ SUBDIRS += \
            qdeclarativeanimations \          # Cover
            qdeclarativebehaviors \           # Cover
            qdeclarativebinding \             # Cover
-           qdeclarativeconnections \          # Cover
+           qdeclarativeconnection \          # Cover
            qdeclarativecontext \             # Cover
            qdeclarativedatetimeformatter \   # Cover
            qdeclarativedebug \               # Cover
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
new file mode 100644
index 0000000..81ab599
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+Item {
+    id: screen; width: 50
+
+    property bool tested: false
+    signal testMe
+
+    Connections { target: screen; onWidthChanged: screen.tested = true }
+}
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
new file mode 100644
index 0000000..22e9422
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+Connections { id: connection; target: connection; onTargetChanged: 1 == 1 }
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
new file mode 100644
index 0000000..6e396c0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
@@ -0,0 +1,3 @@
+import Qt 4.6
+
+Connections {}
diff --git a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
new file mode 100644
index 0000000..736d5e8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
@@ -0,0 +1,10 @@
+import Qt 4.6
+
+Item {
+    id: screen; width: 50
+
+    property string tested
+    signal testMe(int param1, string param2)
+
+    Connections { target: screen; onTestMe: screen.tested = param2 + param1 }
+}
diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
new file mode 100644
index 0000000..a6adfa4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeconnection.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
new file mode 100644
index 0000000..f4914e1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeconnections_p.h>
+#include <private/qdeclarativeitem_p.h>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativescriptstring.h>
+
+class tst_qdeclarativeconnection : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativeconnection();
+
+private slots:
+    void defaultValues();
+    void properties();
+    void connection();
+    void trimming();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qdeclarativeconnection::tst_qdeclarativeconnection()
+{
+}
+
+void tst_qdeclarativeconnection::defaultValues()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
+    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
+
+    QVERIFY(item != 0);
+    QVERIFY(item->target() == 0);
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::properties()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
+    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QVERIFY(item != 0);
+    QVERIFY(item->target() == item);
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::connection()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QCOMPARE(item->property("tested").toBool(), false);
+    QCOMPARE(item->width(), 50.);
+    emit item->setWidth(100.);
+    QCOMPARE(item->width(), 100.);
+    QCOMPARE(item->property("tested").toBool(), true);
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::trimming()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QCOMPARE(item->property("tested").toString(), QString(""));
+    int index = item->metaObject()->indexOfSignal("testMe(int,QString)");
+    QMetaMethod method = item->metaObject()->method(index);
+    method.invoke(item,
+                  Qt::DirectConnection,
+                  Q_ARG(int, 5),
+                  Q_ARG(QString, "worked"));
+    QCOMPARE(item->property("tested").toString(), QString("worked5"));
+
+    delete item;
+}
+
+QTEST_MAIN(tst_qdeclarativeconnection)
+
+#include "tst_qdeclarativeconnection.moc"
diff --git a/tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml b/tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml
deleted file mode 100644
index 81ab599..0000000
--- a/tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: screen; width: 50
-
-    property bool tested: false
-    signal testMe
-
-    Connections { target: screen; onWidthChanged: screen.tested = true }
-}
diff --git a/tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml b/tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml
deleted file mode 100644
index 22e9422..0000000
--- a/tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-Connections { id: connection; target: connection; onTargetChanged: 1 == 1 }
diff --git a/tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml b/tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml
deleted file mode 100644
index 6e396c0..0000000
--- a/tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml
+++ /dev/null
@@ -1,3 +0,0 @@
-import Qt 4.6
-
-Connections {}
diff --git a/tests/auto/declarative/qdeclarativeconnections/data/trimming.qml b/tests/auto/declarative/qdeclarativeconnections/data/trimming.qml
deleted file mode 100644
index 736d5e8..0000000
--- a/tests/auto/declarative/qdeclarativeconnections/data/trimming.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: screen; width: 50
-
-    property string tested
-    signal testMe(int param1, string param2)
-
-    Connections { target: screen; onTestMe: screen.tested = param2 + param1 }
-}
diff --git a/tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro
deleted file mode 100644
index a6adfa4..0000000
--- a/tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qdeclarativeconnection.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp
deleted file mode 100644
index f4914e1..0000000
--- a/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <private/qdeclarativeconnections_p.h>
-#include <private/qdeclarativeitem_p.h>
-#include "../../../shared/util.h"
-#include <QtDeclarative/qdeclarativescriptstring.h>
-
-class tst_qdeclarativeconnection : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_qdeclarativeconnection();
-
-private slots:
-    void defaultValues();
-    void properties();
-    void connection();
-    void trimming();
-
-private:
-    QDeclarativeEngine engine;
-};
-
-tst_qdeclarativeconnection::tst_qdeclarativeconnection()
-{
-}
-
-void tst_qdeclarativeconnection::defaultValues()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
-    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
-
-    QVERIFY(item != 0);
-    QVERIFY(item->target() == 0);
-
-    delete item;
-}
-
-void tst_qdeclarativeconnection::properties()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
-    QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create());
-
-    QVERIFY(item != 0);
-
-    QVERIFY(item != 0);
-    QVERIFY(item->target() == item);
-
-    delete item;
-}
-
-void tst_qdeclarativeconnection::connection()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
-    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
-
-    QVERIFY(item != 0);
-
-    QCOMPARE(item->property("tested").toBool(), false);
-    QCOMPARE(item->width(), 50.);
-    emit item->setWidth(100.);
-    QCOMPARE(item->width(), 100.);
-    QCOMPARE(item->property("tested").toBool(), true);
-
-    delete item;
-}
-
-void tst_qdeclarativeconnection::trimming()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
-    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
-
-    QVERIFY(item != 0);
-
-    QCOMPARE(item->property("tested").toString(), QString(""));
-    int index = item->metaObject()->indexOfSignal("testMe(int,QString)");
-    QMetaMethod method = item->metaObject()->method(index);
-    method.invoke(item,
-                  Qt::DirectConnection,
-                  Q_ARG(int, 5),
-                  Q_ARG(QString, "worked"));
-    QCOMPARE(item->property("tested").toString(), QString("worked5"));
-
-    delete item;
-}
-
-QTEST_MAIN(tst_qdeclarativeconnection)
-
-#include "tst_qdeclarativeconnection.moc"
-- 
cgit v0.12